diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2fbe37e918..3113545559 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -40,6 +40,7 @@ This is the section I read most carefully. I need to see that *you* tested this,
 
 ### Checklist
 
+- [ ] Plugin changes follow the [SDK import boundaries](../docs/plugins.md#sdk-import-boundaries) (if applicable)
 - [ ] One focused change
 - [ ] `npm run typecheck` passes
 - [ ] `npm run lint` passes
diff --git a/.github/ci-paths.yml b/.github/ci-paths.yml
index c156ec0a16..833820ff2d 100644
--- a/.github/ci-paths.yml
+++ b/.github/ci-paths.yml
@@ -34,6 +34,7 @@ hub:
   - "packages/server/src/server/hub/**"
 
 server:
+  - "plugins/**"
   - "packages/server/**"
   - "packages/app/e2e/support/fixtures/recording.*"
 
@@ -50,11 +51,26 @@ app:
   - "packages/expo-two-way-audio/**"
 
 sdk:
+  - "packages/plugin/**"
+  - "plugin-examples/**"
+  - "public-docs/plugins/**"
   - "packages/client/**"
   - "packages/highlight/**"
   - "packages/protocol/**"
 
 browser:
+  - "packages/server/src/server/agent/provider-snapshot-manager.ts"
+  - "packages/server/src/server/session/provider/provider-catalog-session.ts"
+  - "packages/client/src/compat/normalize-provider-models.ts"
+  - "packages/protocol/src/client-capabilities.ts"
+  - "packages/server/src/server/agent/provider-registry.ts"
+  - "packages/server/src/server/agent/agent-sdk-types.ts"
+  - "packages/server/src/server/agent/providers/codex-app-server-agent.ts"
+  - "packages/server/src/server/agent/providers/claude/agent.ts"
+  - "packages/server/src/server/agent/plugin-provider.ts"
+  - "packages/server/src/server/plugins/{index,plugin-process,plugin-process-protocol,runtime}.ts"
+  - "packages/server/src/executable-resolution/**"
+  - "packages/plugin/src/server/provider.ts"
   - "packages/app/src/!(desktop)/**"
   - "packages/app/e2e/browser/**"
   - "packages/app/e2e/support/**"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69689e9c13..0e3f65f336 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,15 +52,13 @@ jobs:
           filters: .github/ci-paths.yml
 
       - name: Validate CI contracts
-        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs
+        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs scripts/upload-release-assets.test.mjs
 
   format:
     name: format
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -80,8 +78,6 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -107,8 +103,6 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -123,9 +117,21 @@ jobs:
       - name: Build server stack
         run: npm run build:server
 
+      - name: Verify built-in plugins from built output
+        run: node --test scripts/builtin-plugins-dist.test.mjs
+
       - name: Typecheck all packages
         run: npm run typecheck
 
+      - name: Run website tests
+        run: npx vitest run packages/website/src --bail=1
+
+      - name: Install website test browsers
+        run: npx playwright install --with-deps chromium webkit
+
+      - name: Verify website mockups
+        run: npm run test:e2e --workspace=@getpaseo/website
+
       - name: Verify public package contents
         run: |
           npm pack --dry-run --ignore-scripts --workspace=@getpaseo/protocol
@@ -137,8 +143,6 @@ jobs:
     needs: changes
     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"
     steps: &server_test_steps
       - uses: actions/checkout@v4
         with:
@@ -171,6 +175,10 @@ jobs:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
 
+      - name: Run built-in plugin tests
+        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
+        run: npm run test --workspace=@getpaseo/builtin-plugins
+
       - 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
@@ -180,15 +188,44 @@ jobs:
     needs: changes
     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
 
+  # native-recursive.ts serves darwin and win32, but windows-latest above is the only
+  # runner that exercises it. macOS — the platform the reported watcher bug was on —
+  # otherwise has no server-test coverage. Scoped to the observer/watcher suites to
+  # bound runtime.
+  server-tests-macos:
+    name: server-tests (macos-14, file observation)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false') }}
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: node scripts/npm-retry.mjs ci
+
+      - name: Build server dependencies
+        run: npm run build:server-deps
+
+      - name: Run file observation tests
+        run: |
+          npm run test:unit --workspace=@getpaseo/server -- \
+            src/server/file-observer \
+            src/server/workspace-git-service.observation.test.ts \
+            src/server/workspace-git-service.observation.integration.test.ts \
+            --bail=1
+
   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
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     permissions:
       contents: read
@@ -211,12 +248,35 @@ jobs:
 
       - name: Install virtual display
         if: ${{ runner.os == 'Linux' }}
-        run: sudo apt-get update && sudo apt-get install -y xvfb xauth
+        run: sudo apt-get update && sudo apt-get install -y xvfb xauth xdotool
 
       - name: Install Playwright browser
         if: ${{ runner.os == 'Linux' }}
         run: npx playwright install chromium
 
+      - name: Verify Windows daemon process control
+        if: ${{ runner.os == 'Windows' }}
+        run: npx vitest run packages/cli/src/commands/daemon/lifecycle.e2e.test.ts --bail=1 --maxWorkers=1 -t "Windows unbound|managed two-home"
+
+      - name: Run desktop lifecycle E2E (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        run: xvfb-run -a --server-args="-screen 0 1280x800x24" npm run test:e2e:lifecycle --workspace=@getpaseo/desktop
+        env:
+          PASEO_DESKTOP_LIFECYCLE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-lifecycle
+
+      - name: Upload desktop lifecycle screenshots
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() && runner.os == 'Linux' }}
+        with:
+          name: desktop-lifecycle
+          path: ${{ runner.temp }}/desktop-lifecycle
+          if-no-files-found: ignore
+          retention-days: 7
+
+      - name: Run desktop lifecycle E2E (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        run: npm run test:e2e:lifecycle --workspace=@getpaseo/desktop
+
       - name: Run desktop renderer E2E
         if: ${{ runner.os == 'Linux' }}
         run: npm run test:e2e:renderer --workspace=@getpaseo/desktop
@@ -236,23 +296,6 @@ jobs:
           if-no-files-found: ignore
           retention-days: 7
 
-      - name: Build and smoke unpacked desktop app
-        if: ${{ runner.os == 'Linux' }}
-        run: npm run build:desktop -- --publish never --linux --x64 --dir
-        env:
-          EP_GH_IGNORE_TIME: true
-          PASEO_DESKTOP_SMOKE: "1"
-          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke
-
-      - name: Upload packaged smoke diagnostics
-        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
-
   desktop-tests-windows:
     name: desktop-tests (windows-latest)
     needs: changes
@@ -268,8 +311,6 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.app != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -296,8 +337,6 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -310,7 +349,13 @@ jobs:
         run: node scripts/npm-retry.mjs ci
 
       - name: Build client dependencies
-        run: npm run build:client
+        run: npm run build:relay && npm run build:client
+
+      - name: Build plugin SDK
+        run: npm run build:plugin
+
+      - name: Run plugin SDK tests
+        run: npm run test --workspace=@getpaseo/plugin
 
       - name: Run protocol tests
         run: npm run test --workspace=@getpaseo/protocol
@@ -330,7 +375,6 @@ jobs:
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
     env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
       PLAYWRIGHT_SHARD: "1/4"
       PLAYWRIGHT_ARTIFACT: "1"
     steps: &playwright_test_steps
@@ -361,6 +405,9 @@ jobs:
         run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ env.PLAYWRIGHT_SHARD }}
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          # Weight file groups by observed duration; raw test counts overload
+          # early agent/Changes specs. Required check names remain unchanged.
+          PWTEST_SHARD_WEIGHTS: "111:172:137:160"
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v4
@@ -378,7 +425,6 @@ jobs:
     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
@@ -389,7 +435,6 @@ jobs:
     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
@@ -400,7 +445,6 @@ jobs:
     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
@@ -410,8 +454,6 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
     runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -435,7 +477,6 @@ jobs:
     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"
@@ -452,14 +493,18 @@ jobs:
       - name: Install dependencies
         run: node scripts/npm-retry.mjs ci
 
-      - name: Build server stack
-        run: npm run build:server
-
       - name: Install agent CLIs for provider tests
         run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code @openai/codex@0.105.0 opencode-ai
 
-      - name: Run CLI tests
-        run: npm run test --workspace=@getpaseo/cli
+      # The local runner builds its dependencies and shards its own E2E files.
+      - name: Run CLI E2E tests
+        run: npm run test:local --workspace=@getpaseo/cli
+
+      # Source tests do not read PASEO_CLI_TEST_SHARD. Run them once, on the
+      # shortest E2E shard, after its runner has built the server stack.
+      - name: Run CLI source tests
+        if: ${{ env.PASEO_CLI_TEST_SHARD == '3' }}
+        run: npm run test:unit --workspace=@getpaseo/cli
 
   cli-tests-2:
     name: cli-tests (shard 2/3)
@@ -467,7 +512,6 @@ jobs:
     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"
@@ -481,7 +525,6 @@ jobs:
     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"
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
index cd20556182..f99dabaea9 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -7,6 +7,7 @@ on:
       - "CHANGELOG.md"
       - "public-docs/**"
       - "packages/website/**"
+      - "packages/protocol/**"
       - "package.json"
       - "package-lock.json"
       - "patches/**"
@@ -29,7 +30,10 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: node scripts/npm-retry.mjs ci --workspace=@getpaseo/website --include-workspace-root
+        run: node scripts/npm-retry.mjs ci --workspace=@getpaseo/website --workspace=@getpaseo/protocol --include-workspace-root
+
+      - name: Build protocol
+        run: npm run build:protocol
 
       - name: Typecheck
         run: npm run typecheck --workspace=@getpaseo/website
diff --git a/.github/workflows/desktop-packages.yml b/.github/workflows/desktop-packages.yml
new file mode 100644
index 0000000000..c30eea7da4
--- /dev/null
+++ b/.github/workflows/desktop-packages.yml
@@ -0,0 +1,91 @@
+name: Desktop Packages
+
+on:
+  push:
+    branches: [main]
+  # Packaging leaves ordinary PR CI, but a PR that changes what gets packaged
+  # or how it is smoked still proves the real artifacts before merge.
+  pull_request:
+    branches: [main]
+    paths:
+      - "packages/desktop/**"
+      - "plugins/**"
+      - "nix/**"
+      - ".github/workflows/desktop-packages.yml"
+
+concurrency:
+  group: desktop-packages-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+permissions:
+  contents: read
+
+env:
+  ONNXRUNTIME_NODE_INSTALL: skip
+
+jobs:
+  linux:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: node scripts/npm-retry.mjs ci
+
+      - name: Install package smoke dependencies
+        run: sudo apt-get update && sudo apt-get install -y xvfb xauth rpm
+
+      - name: Build Linux desktop artifacts
+        # Smoke package contents and installation without spending minutes on xz compression.
+        run: |
+          printf '{"extends":"%s/packages/desktop/electron-builder.yml","deb":{"compression":"gz"},"rpm":{"fpm":["--rpm-compression=gzip"]}}' "$GITHUB_WORKSPACE" > "$RUNNER_TEMP/desktop-smoke-builder.json"
+          npm run build:desktop -- --publish never --linux --x64 --config "$RUNNER_TEMP/desktop-smoke-builder.json"
+        env:
+          EP_GH_IGNORE_TIME: true
+          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke
+
+      - name: Smoke installed artifacts with restricted user namespaces
+        run: |
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=1
+          if unshare --user --map-root-user --net true; then
+            echo "Expected the launching user's namespace probe to be denied"
+            exit 1
+          fi
+          sudo apt-get install -y ./packages/desktop/release/*.deb
+          node packages/desktop/e2e/linux-artifact-smoke.js packages/desktop/release disabled
+        env:
+          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke/restricted
+
+      - name: Smoke sandbox-preserving portable launches
+        run: |
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+          unshare --user --map-root-user --net true
+          node packages/desktop/e2e/linux-artifact-smoke.js packages/desktop/release enabled
+        env:
+          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke/userns
+
+      - name: Smoke installed RPM with restricted user namespaces
+        run: |
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=1
+          sudo dpkg --remove paseo
+          # Ubuntu supplies the runtime libraries under Debian package names.
+          # RPM still performs the real payload installation and postinstall.
+          sudo rpm --install --nodeps packages/desktop/release/*.rpm
+          node packages/desktop/e2e/linux-artifact-smoke.js packages/desktop/release disabled --installed-only
+        env:
+          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke/rpm
+
+      - name: Upload packaged smoke diagnostics
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: ${{ !cancelled() }}
+        with:
+          name: desktop-packaged-smoke-linux-x64
+          path: ${{ runner.temp }}/desktop-smoke
+          if-no-files-found: ignore
+          retention-days: 7
diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml
index 89f2f83ae6..f6b07c8b37 100644
--- a/.github/workflows/desktop-release.yml
+++ b/.github/workflows/desktop-release.yml
@@ -102,8 +102,10 @@ jobs:
         include:
           - runner: macos-14
             electron_arch: arm64
+            node_heap_mb: 4096
           - runner: macos-15-intel
             electron_arch: x64
+            node_heap_mb: 8192
     permissions:
       contents: write
       packages: read
@@ -161,6 +163,10 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           PASEO_DESKTOP_SMOKE: "1"
           PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke
+          # Metro's jest workers OOM on the generated ws-outbound.aot.js validator,
+          # the last module in the web bundle. Node's default heap is sized from
+          # runner RAM, which is not enough on the Intel runner.
+          NODE_OPTIONS: --max-old-space-size=${{ matrix.node_heap_mb }}
         run: |
           set -euo pipefail
           build_args=(-- --publish never --mac --${{ matrix.electron_arch }})
@@ -185,16 +191,8 @@ jobs:
         run: |
           set -euo pipefail
           release_dir="${DESKTOP_PACKAGE_PATH}/release"
-          files=()
-          while IFS= read -r -d '' f; do
-            files+=("$f")
-          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
-          if (( ${#files[@]} == 0 )); then
-            echo "::error::No release artifacts found in $release_dir"
-            exit 1
-          fi
           release_lookup="$(node scripts/github-release.mjs --repo "${{ github.repository }}" --tag "$RELEASE_TAG")"
-          gh release upload "$release_lookup" "${files[@]}" --clobber --repo "${{ github.repository }}"
+          node scripts/upload-release-assets.mjs "$release_lookup" "$release_dir" "${{ github.repository }}"
 
       - name: Upload desktop artifacts to workflow
         if: env.SHOULD_PUBLISH != 'true'
@@ -261,7 +259,7 @@ jobs:
           NODE
 
       - name: Install Linux smoke display
-        run: sudo apt-get update && sudo apt-get install -y xvfb xauth
+        run: sudo apt-get update && sudo apt-get install -y xvfb xauth rpm
 
       - name: Build desktop release
         shell: bash
@@ -278,7 +276,7 @@ jobs:
           npm run build:desktop "${build_args[@]}"
 
       - name: Upload packaged smoke diagnostics
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: desktop-smoke-linux-x64
@@ -294,16 +292,8 @@ jobs:
         run: |
           set -euo pipefail
           release_dir="${DESKTOP_PACKAGE_PATH}/release"
-          files=()
-          while IFS= read -r -d '' f; do
-            files+=("$f")
-          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
-          if (( ${#files[@]} == 0 )); then
-            echo "::error::No release artifacts found in $release_dir"
-            exit 1
-          fi
           release_lookup="$(node scripts/github-release.mjs --repo "${{ github.repository }}" --tag "$RELEASE_TAG")"
-          gh release upload "$release_lookup" "${files[@]}" --clobber --repo "${{ github.repository }}"
+          node scripts/upload-release-assets.mjs "$release_lookup" "$release_dir" "${{ github.repository }}"
 
       - name: Upload desktop artifacts to workflow
         if: env.SHOULD_PUBLISH != 'true'
@@ -400,16 +390,8 @@ jobs:
         run: |
           set -euo pipefail
           release_dir="${DESKTOP_PACKAGE_PATH}/release"
-          files=()
-          while IFS= read -r -d '' f; do
-            files+=("$f")
-          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
-          if (( ${#files[@]} == 0 )); then
-            echo "::error::No release artifacts found in $release_dir"
-            exit 1
-          fi
           release_lookup="$(node scripts/github-release.mjs --repo "${{ github.repository }}" --tag "$RELEASE_TAG")"
-          gh release upload "$release_lookup" "${files[@]}" --clobber --repo "${{ github.repository }}"
+          node scripts/upload-release-assets.mjs "$release_lookup" "$release_dir" "${{ github.repository }}"
 
       - name: Upload desktop artifacts to workflow
         if: env.SHOULD_PUBLISH != 'true'
@@ -547,28 +529,10 @@ jobs:
           fi
           timestamp="$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")"
           node ../scripts/stamp-rollout.mjs --release-date "$timestamp" --rollout-hours "$ROLLOUT_HOURS" "${files[@]}"
-          # shellcheck disable=SC2016
-          ROLLOUT_HOURS_EXPECTED="$ROLLOUT_HOURS" RELEASE_DATE_EXPECTED="$timestamp" node -e '
-            const yaml = require("js-yaml");
-            const fs = require("fs");
-            const expectedHours = Number(process.env.ROLLOUT_HOURS_EXPECTED);
-            const expectedDate = process.env.RELEASE_DATE_EXPECTED;
-            if (!Number.isFinite(expectedHours) || expectedHours < 0) {
-              throw new Error(`expected non-negative rolloutHours, got ${process.env.ROLLOUT_HOURS_EXPECTED}`);
-            }
-            for (const f of process.argv.slice(1)) {
-              const m = yaml.load(fs.readFileSync(f, "utf8")) ?? {};
-              if (m.rolloutHours !== expectedHours) {
-                throw new Error(`${f}: rolloutHours=${m.rolloutHours}, expected ${expectedHours}`);
-              }
-              if (m.releaseDate !== expectedDate) {
-                throw new Error(`${f}: releaseDate=${m.releaseDate}, expected ${expectedDate}`);
-              }
-              if (typeof m.version !== "string" || m.version.length === 0) {
-                throw new Error(`${f}: missing or invalid version`);
-              }
-            }
-          ' "${files[@]}"
+          node ../scripts/validate-desktop-manifests.mjs \
+            --release-date "$timestamp" \
+            --rollout-hours "$ROLLOUT_HOURS" \
+            "${files[@]}"
           gh release upload "$release_lookup" "${files[@]}" --clobber --repo "${{ github.repository }}"
 
           failed_builds=()
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dc5221fa6e..aa53f3ec81 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,27 +1,6 @@
 name: Docker
 
 on:
-  pull_request:
-    branches: [main]
-    paths:
-      - "docker/**"
-      - ".dockerignore"
-      - ".github/workflows/docker.yml"
-      - "package.json"
-      - "package-lock.json"
-      - "patches/**"
-      - "scripts/**"
-      - "tsconfig.json"
-      - "tsconfig.base.json"
-      - "packages/app/**"
-      - "packages/cli/**"
-      - "packages/client/**"
-      - "packages/expo-two-way-audio/**"
-      - "packages/highlight/**"
-      - "packages/plugin/**"
-      - "packages/protocol/**"
-      - "packages/relay/**"
-      - "packages/server/**"
   push:
     branches: [main]
     tags:
@@ -51,7 +30,7 @@ on:
 
 concurrency:
   group: docker-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: false
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index bf198d1c94..f37a8b0cdf 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -1,27 +1,8 @@
 name: Nix
 
 on:
-  pull_request:
+  push:
     branches: [main]
-    paths:
-      - "nix/**"
-      - "flake.nix"
-      - "flake.lock"
-      - "package.json"
-      - "package-lock.json"
-      - "packages/app/**"
-      - "packages/expo-two-way-audio/**"
-      - "packages/highlight/**"
-      - "packages/plugin/**"
-      - "packages/protocol/**"
-      - "packages/client/**"
-      - "packages/server/**"
-      - "packages/relay/**"
-      - "packages/cli/**"
-      - "scripts/build-daemon-web-ui.mjs"
-      - "scripts/update-nix.sh"
-      - "scripts/fix-lockfile.mjs"
-      - ".github/workflows/nix.yml"
 
 permissions:
   contents: read
@@ -31,8 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - uses: actions/setup-node@v4
         with:
@@ -57,7 +36,7 @@ jobs:
           PASEO_HOME="$(mktemp -d)"
           export PASEO_LISTEN=127.0.0.1:6767
 
-          WRAPPER_LOG="$PASEO_HOME/paseo-server-wrapper.log"
+          WRAPPER_LOG="$PASEO_HOME/paseo-cli.log"
 
           cleanup() {
             if [[ -n "${DAEMON_PID:-}" ]] && kill -0 "$DAEMON_PID" 2>/dev/null; then
@@ -68,7 +47,7 @@ jobs:
           }
           trap cleanup EXIT
 
-          PASEO_WEB_UI_ENABLED=true ./result/bin/paseo-server --no-relay >"$WRAPPER_LOG" 2>&1 &
+          PASEO_WEB_UI_ENABLED=true PASEO_RELAY_ENABLED=false ./result/bin/paseo daemon run >"$WRAPPER_LOG" 2>&1 &
           DAEMON_PID=$!
 
           deadline=$((SECONDS + 30))
@@ -78,7 +57,22 @@ jobs:
               echo "$STATUS_JSON"
               curl --fail --silent --show-error http://127.0.0.1:6767/ >"$PASEO_HOME/web-ui.html"
               [[ -s "$PASEO_HOME/web-ui.html" ]]
-              exit 0
+              if ! TERMINAL_JSON="$(./result/bin/paseo terminal create --cwd "$PASEO_HOME" --name nix-smoke --json)"; then
+                break
+              fi
+              TERMINAL_ID="$(jq -er '.id' <<<"$TERMINAL_JSON")"
+              ./result/bin/paseo terminal send-keys "$TERMINAL_ID" 'PATH= "$PASEO_HOOK_CLI" --version && printf "nix-terminal-%s\n" ok' Enter
+              deadline=$((SECONDS + 15))
+              while (( SECONDS < deadline )); do
+                if ./result/bin/paseo terminal capture "$TERMINAL_ID" --json \
+                  | jq -e '.lines | any(. == "nix-terminal-ok")' >/dev/null; then
+                  ./result/bin/paseo terminal kill "$TERMINAL_ID"
+                  exit 0
+                fi
+                sleep 1
+              done
+              echo "Nix terminal did not execute the command."
+              break
             fi
 
             if ! kill -0 "$DAEMON_PID" 2>/dev/null; then
@@ -93,7 +87,7 @@ jobs:
           cat "$PASEO_HOME/daemon.log" 2>/dev/null || echo "<missing>"
           echo "::endgroup::"
 
-          echo "::group::paseo-server stdout/stderr"
+          echo "::group::paseo daemon run stdout/stderr"
           cat "$WRAPPER_LOG" 2>/dev/null || echo "<missing>"
           echo "::endgroup::"
 
@@ -110,8 +104,6 @@ jobs:
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - uses: cachix/install-nix-action@v31
         with:
diff --git a/.gitignore b/.gitignore
index 5298013fdc..6d6bb279b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,9 @@ packages/protocol/src/generated/validation/*.aot.ts
 packages/desktop/.cache/
 packages/desktop/src-tauri/resources/managed-runtime/
 app.json
+
+# Heap snapshots dumped by --heapsnapshot-near-heap-limit; keep them for debugging.
+*.heapsnapshot
+
+# Project-local Serena configuration and memories.
+.serena/
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 269097aab4..4582602a97 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -84,6 +84,45 @@
     "max-nested-callbacks": ["error", { "max": 3 }]
   },
   "overrides": [
+    {
+      "files": [
+        "plugins/*-provider/server/**/*.ts",
+        "packages/plugin/src/server/acp-internal/**/*.ts"
+      ],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "node:child_process",
+                "importNames": [
+                  "spawn",
+                  "exec",
+                  "execFile",
+                  "spawnSync",
+                  "execSync",
+                  "execFileSync"
+                ],
+                "message": "Use the plugin server process helpers so Windows command scripts and argv are handled consistently."
+              },
+              {
+                "name": "child_process",
+                "importNames": [
+                  "spawn",
+                  "exec",
+                  "execFile",
+                  "spawnSync",
+                  "execSync",
+                  "execFileSync"
+                ],
+                "message": "Use the plugin server process helpers so Windows command scripts and argv are handled consistently."
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "files": ["packages/app/src/**/*.{ts,tsx}"],
       "rules": {
@@ -213,7 +252,6 @@
         "packages/app/src/components/download-toast.tsx",
         "packages/app/src/components/draggable-list.native.tsx",
         "packages/app/src/components/headers/back-header.tsx",
-        "packages/app/src/components/headers/menu-header.tsx",
         "packages/app/src/components/headers/screen-header.tsx",
         "packages/app/src/components/host-status-dot.tsx",
         "packages/app/src/components/hosts/host-picker.tsx",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3349960bb..0e2b24ac5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,503 @@
 # Changelog
 
+## 0.11.2 - 2026-10-09
+
+### Fixed
+
+- Fixed intermittent text clipping in iOS chats and Markdown previews ([#6445](https://github.com/getpaseo/paseo/pull/6445))
+
+## 0.11.1 - 2026-10-07
+
+### Added
+
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer ([#6332](https://github.com/getpaseo/paseo/pull/6332))
+
+### Fixed
+
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents ([#6308](https://github.com/getpaseo/paseo/pull/6308))
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened ([#6316](https://github.com/getpaseo/paseo/pull/6316))
+- Fixed a Claude agent's history showing "No activity to display" after a daemon restart when its transcript is in another project folder, such as after moving the daemon or running Windows Claude Code from WSL ([#6301](https://github.com/getpaseo/paseo/pull/6301))
+
+## 0.11.0 - 2026-10-07
+
+Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Browse community plugins there, install one with `paseo plugin add owner/slug`, or [submit your own](https://paseo.sh/docs/plugins/publishing#plugin-registry).
+
+**Before upgrading:** `paseo plugin add owner/repo` now installs from the registry, so use `github:owner/repo` to install straight from GitHub and `./path` for a local directory.
+
+### Added
+
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls ([#5719](https://github.com/getpaseo/paseo/pull/5719), [#5775](https://github.com/getpaseo/paseo/pull/5775) by [@millerben95](https://github.com/millerben95))
+- Added Antigravity as a provider that drives the installed `agy` CLI, always in Full access ([#5714](https://github.com/getpaseo/paseo/pull/5714), [#5795](https://github.com/getpaseo/paseo/pull/5795))
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5685](https://github.com/getpaseo/paseo/pull/5685), [#5786](https://github.com/getpaseo/paseo/pull/5786), [#5805](https://github.com/getpaseo/paseo/pull/5805), [#5921](https://github.com/getpaseo/paseo/pull/5921), [#6216](https://github.com/getpaseo/paseo/pull/6216))
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin ([#5903](https://github.com/getpaseo/paseo/pull/5903), [#5975](https://github.com/getpaseo/paseo/pull/5975), [#6089](https://github.com/getpaseo/paseo/pull/6089))
+- Added Usage discovery of ChatGPT logins from Codex CLI, OpenCode, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
+- Added Usage discovery of Claude logins from the Claude Code credential file, the macOS keychain, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
+- Added OpenCode Go to Usage ([#5465](https://github.com/getpaseo/paseo/pull/5465))
+- Added the reason a Usage card is unavailable, such as an expired login with the command that refreshes it, listing each login's error when none works ([#5876](https://github.com/getpaseo/paseo/pull/5876), [#6156](https://github.com/getpaseo/paseo/pull/6156))
+- Added mid-turn steering to OMP agents ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@n24q02m](https://github.com/n24q02m))
+- Added Fast mode and an Auto thinking level to OMP ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@n24q02m](https://github.com/n24q02m), [@abhi-wan-kenobi](https://github.com/abhi-wan-kenobi))
+- Added MCP servers to OMP schedules and Hub runs ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@omercnet](https://github.com/omercnet))
+- Added a Content width setting for the maximum width of chat and Markdown files on wide screens ([#5680](https://github.com/getpaseo/paseo/pull/5680))
+- Added syntax highlighting for Vue files ([#6205](https://github.com/getpaseo/paseo/pull/6205) by [@Davnn1](https://github.com/Davnn1))
+- Added `agents.providers.<id>.options` in `config.json` as default options for every provider, with per-agent overrides ([#5780](https://github.com/getpaseo/paseo/pull/5780))
+- Added the terminal key bar and Paste to terminal panes on iPad and Android tablets ([#5712](https://github.com/getpaseo/paseo/pull/5712) by [@lardissone](https://github.com/lardissone))
+
+### Plugins
+
+- Changed `paseo plugin add owner/slug` to install the reviewed plugin from the plugin registry, so local directories need a path such as `./slug` and direct GitHub installs need `github:owner/repo` ([#6224](https://github.com/getpaseo/paseo/pull/6224))
+- Added [screens and sidebar header and footer items](https://paseo.sh/docs/plugins/reference#screens-and-sidebar-items) to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
+- Added usage sources to the plugin SDK ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5876](https://github.com/getpaseo/paseo/pull/5876))
+- Added `spawnProcess()`, `execCommand()`, and `terminateProcess()` to the plugin SDK for launching CLIs, including Windows `.cmd` and `.bat` scripts ([#6151](https://github.com/getpaseo/paseo/pull/6151))
+- Added `client.playAudio()` to the plugin SDK for playing audio on every client ([#5976](https://github.com/getpaseo/paseo/pull/5976))
+- Added an `agent.closed` plugin lifecycle event ([#5971](https://github.com/getpaseo/paseo/pull/5971) by [@ilteoood](https://github.com/ilteoood))
+- Added command and environment overrides and availability diagnostics for plugin providers ([#5707](https://github.com/getpaseo/paseo/pull/5707))
+- Added a display name, icon, screenshots, and videos to the plugin manifest ([#6263](https://github.com/getpaseo/paseo/pull/6263))
+- Added an `OVERVIEW.md` template to `paseo plugin init` for plugin registry listings ([#6226](https://github.com/getpaseo/paseo/pull/6226))
+
+### Changed
+
+- Changed the context window details to show usage for the account the agent runs under, including custom `CLAUDE_CONFIG_DIR` and `CODEX_HOME` homes ([#5465](https://github.com/getpaseo/paseo/pull/5465))
+- Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975), [#6185](https://github.com/getpaseo/paseo/pull/6185))
+- Changed the context window meter to show before an agent's first turn ([#6089](https://github.com/getpaseo/paseo/pull/6089))
+- Changed Codex Fast to a Speed menu listing the Normal, Fast, and Ultrafast speeds each model offers, shown as a lightning bolt on desktop that turns yellow while Fast or Ultrafast is selected ([#5708](https://github.com/getpaseo/paseo/pull/5708), [#6152](https://github.com/getpaseo/paseo/pull/6152) by [@Nurshot](https://github.com/Nurshot))
+- Changed Explorer tabs to work like workspace tabs, with a + menu, drag and drop, and Close for Files and Changes ([#5942](https://github.com/getpaseo/paseo/pull/5942))
+- Changed Pi and OMP extension context to show as expandable tool rows instead of assistant text, and to hide Pi messages marked hidden ([#6090](https://github.com/getpaseo/paseo/pull/6090))
+- Moved Import session from the sidebar footer to the New workspace screen ([#5805](https://github.com/getpaseo/paseo/pull/5805))
+- Changed the sidebar workspace row to show last activity by default on new installs ([#6087](https://github.com/getpaseo/paseo/pull/6087))
+- Changed compact sidebar footer buttons to 44×44 tap targets ([#6044](https://github.com/getpaseo/paseo/pull/6044))
+- Changed new workspaces branched from `origin/main` or another remote branch to fetch that branch first ([#5788](https://github.com/getpaseo/paseo/pull/5788) by [@odoo-mvds](https://github.com/odoo-mvds))
+- Changed Paseo's internal Claude agents for branch names, commit messages, and PR text to run with Claude hooks disabled ([#5750](https://github.com/getpaseo/paseo/pull/5750))
+- Changed OMP approval mode changes to apply on the next idle relaunch, and to be refused during a turn ([#5550](https://github.com/getpaseo/paseo/pull/5550))
+- Changed relative timestamps in agent, schedule, and Import session rows to keep advancing while on screen ([#5340](https://github.com/getpaseo/paseo/pull/5340))
+
+### Fixed
+
+- Fixed Claude agents never showing Thought rows on Claude Opus 4.7 and later ([#4355](https://github.com/getpaseo/paseo/pull/4355) by [@ThePharmer](https://github.com/ThePharmer))
+- Fixed a Claude agent showing as running while only its background helpers worked, and a send or Stop killing those helpers ([#6295](https://github.com/getpaseo/paseo/pull/6295) by [@IsakPersson](https://github.com/IsakPersson))
+- Fixed a Claude agent in Auto mode failing to switch modes when Claude Code uses Bedrock or Vertex ([#6272](https://github.com/getpaseo/paseo/pull/6272))
+- Fixed a Claude subagent's auto-mode report showing as a raw SubagentHandback tool card instead of markdown ([#6248](https://github.com/getpaseo/paseo/pull/6248))
+- Fixed background Claude subagent cards showing as a bare "Task" that stayed running, as "Agent" after a daemon restart, or unlabeled when two launch together ([#6067](https://github.com/getpaseo/paseo/pull/6067), [#6100](https://github.com/getpaseo/paseo/pull/6100), [#6268](https://github.com/getpaseo/paseo/pull/6268))
+- Fixed Claude Code terminals not showing as needing input when Claude is idle ([#6022](https://github.com/getpaseo/paseo/pull/6022))
+- Fixed Claude usage calling a rate-limited login again before its retry time ([#6089](https://github.com/getpaseo/paseo/pull/6089))
+- Fixed a Claude agent that entered plan mode on its own still showing and storing its previous mode ([#6074](https://github.com/getpaseo/paseo/pull/6074))
+- Fixed a resumed agent returning to its creation-time mode after its mode was changed in the session ([#5140](https://github.com/getpaseo/paseo/pull/5140) by [@ThePlenkov](https://github.com/ThePlenkov))
+- Fixed ACP plugin providers failing to launch a `.cmd` or `.bat` CLI on Windows ([#6151](https://github.com/getpaseo/paseo/pull/6151))
+- Fixed ACP agents running on their default model when the configured model is one the agent does not advertise ([#6273](https://github.com/getpaseo/paseo/pull/6273))
+- Fixed archiving an ACP agent leaving its provider running when the provider never answers close ([#6213](https://github.com/getpaseo/paseo/pull/6213) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed an archived ACP agent showing an empty chat after its worktree was removed ([#6228](https://github.com/getpaseo/paseo/pull/6228))
+- Fixed ACP agents rejecting every following message after a turn failed with a permission request open ([#6045](https://github.com/getpaseo/paseo/pull/6045))
+- Fixed the context window meter never appearing for ACP agents that report context usage ([#4848](https://github.com/getpaseo/paseo/pull/4848) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed schedule runs and workspace metadata recording `[object Object]` when an ACP agent rejects a session setting ([#5765](https://github.com/getpaseo/paseo/pull/5765))
+- Fixed OMP agents staying bound to a dead `omp` process after it crashed ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@viet-initx](https://github.com/viet-initx))
+- Fixed OMP multi-select questions showing radio buttons and asking once per choice ([#5550](https://github.com/getpaseo/paseo/pull/5550))
+- Fixed `/compact` on OMP reporting a failure after 60s while OMP kept compacting ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@Kh05ifr4nD](https://github.com/Kh05ifr4nD))
+- Fixed `paseo import --provider omp` starting the agent on the default model instead of the session's ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@alloevil](https://github.com/alloevil))
+- Fixed OMP-injected rows showing a `[custom_message]` prefix after a reload ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@jegork](https://github.com/jegork))
+- Fixed OMP tool rows showing raw objects or generic labels for failed tools, Task, Wait, web search, and fetch ([#5550](https://github.com/getpaseo/paseo/pull/5550))
+- Fixed results of OMP `xd://` writes disappearing from the timeline ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@kasrakhosravi](https://github.com/kasrakhosravi))
+- Fixed the composer showing the stale model after an OMP model fallback ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@gray-graff](https://github.com/gray-graff))
+- Fixed opening an archived OMP agent starting an `omp` process that stayed running ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@thomasvan](https://github.com/thomasvan))
+- Fixed an OMP turn staying running forever when the run contains a message Paseo does not show, such as an OMP rule reminder ([#6112](https://github.com/getpaseo/paseo/pull/6112))
+- Fixed a prompt OMP rejects, such as for a missing API key, ending as a completed turn with no error ([#6110](https://github.com/getpaseo/paseo/pull/6110), [#6115](https://github.com/getpaseo/paseo/pull/6115))
+- Fixed reopened OMP chats showing "Custom message" rows for compactions and other entries OMP writes on its own ([#6198](https://github.com/getpaseo/paseo/pull/6198), [#6215](https://github.com/getpaseo/paseo/pull/6215))
+- Fixed Pi and OMP sessions whose model was removed failing to import or reopen ([#6061](https://github.com/getpaseo/paseo/pull/6061))
+- Fixed Pi agents on Pi 0.99 starting without Paseo's MCP servers when `pi-mcp-adapter` is not installed ([#5762](https://github.com/getpaseo/paseo/pull/5762) by [@ArietidsZ](https://github.com/ArietidsZ))
+- Fixed a running Pi subagent showing an empty transcript until it finished ([#5755](https://github.com/getpaseo/paseo/pull/5755))
+- Fixed a grouped Tintinweb pi-subagents completion marking only its first agent completed and leaving the rest on working ([#5826](https://github.com/getpaseo/paseo/pull/5826))
+- Fixed OpenCode `ask` rules for `paseo_*` tools running the tool without a prompt ([#5801](https://github.com/getpaseo/paseo/pull/5801) by [@ymarcus93](https://github.com/ymarcus93))
+- Fixed the first OpenCode prompt waiting for the event stream timeout when the OpenCode server was slow to become ready ([#5873](https://github.com/getpaseo/paseo/pull/5873) by [@axsuul](https://github.com/axsuul))
+- Fixed OpenCode v2 agents staying running after a question is dismissed or a tool permission is denied ([#6177](https://github.com/getpaseo/paseo/pull/6177), [#6188](https://github.com/getpaseo/paseo/pull/6188))
+- Fixed the Nix packages failing to start the daemon and to open terminals ([#5523](https://github.com/getpaseo/paseo/pull/5523) by [@wongcallum](https://github.com/wongcallum))
+- Fixed OpenCode v2 agents failing to start on the Nix packages ([#5988](https://github.com/getpaseo/paseo/pull/5988))
+- Fixed each Paseo skill appearing twice in Codex's skill list ([#5827](https://github.com/getpaseo/paseo/pull/5827) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed a failed Codex image generation leaving no row in the chat ([#5810](https://github.com/getpaseo/paseo/pull/5810) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed a denied Codex command or file edit keeping a running spinner after the turn ended ([#5717](https://github.com/getpaseo/paseo/pull/5717) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed rewinding a legacy Codex chat failing with `unknown variant thread/rollback` on Codex 0.156 and newer ([#5711](https://github.com/getpaseo/paseo/pull/5711) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed Codex custom prompt arguments containing `$` sequences reaching Codex altered ([#5669](https://github.com/getpaseo/paseo/pull/5669) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed Codex structured output failing when the schema has a field named `properties` ([#5684](https://github.com/getpaseo/paseo/pull/5684))
+- Fixed a Codex agent created without a thinking option losing its default effort after a daemon restart ([#5686](https://github.com/getpaseo/paseo/pull/5686))
+- Fixed only one permission showing when Codex asks to approve two commands from one item ([#5758](https://github.com/getpaseo/paseo/pull/5758))
+- Fixed Codex terminal rows reading only "Terminal" without the command on current Codex ([#5774](https://github.com/getpaseo/paseo/pull/5774))
+- Fixed the composer showing the catalog default thinking level instead of the one the agent runs on ([#5804](https://github.com/getpaseo/paseo/pull/5804))
+- Fixed the composer showing another model's label when the agent's model is missing from the loaded catalog ([#5796](https://github.com/getpaseo/paseo/pull/5796))
+- Fixed the chat jumping back by several screens when scrolling up through older history on web and desktop ([#5945](https://github.com/getpaseo/paseo/pull/5945), [#5970](https://github.com/getpaseo/paseo/pull/5970), [#6172](https://github.com/getpaseo/paseo/pull/6172))
+- Fixed images in chat shifting the text below them when they finish loading ([#5970](https://github.com/getpaseo/paseo/pull/5970))
+- Fixed copying all the code in a chat code block sometimes including its ``` fence lines ([#6138](https://github.com/getpaseo/paseo/pull/6138))
+- Fixed copying across a code block nested in a numbered list item renumbering the next item ([#6158](https://github.com/getpaseo/paseo/pull/6158))
+- Fixed copying a chat selection across an image losing its alt text and source, or including the image when the selection started below it ([#6181](https://github.com/getpaseo/paseo/pull/6181), [#6195](https://github.com/getpaseo/paseo/pull/6195))
+- Fixed relative `path:line` file links in chat opening at the first line referenced for that file ([#5653](https://github.com/getpaseo/paseo/pull/5653) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed PR comments with linked pictures showing raw HTML tags and losing the image link ([#5968](https://github.com/getpaseo/paseo/pull/5968))
+- Fixed text typed by the browser tool appearing in your message box instead of the browser tab ([#6207](https://github.com/getpaseo/paseo/pull/6207))
+- Fixed Astro expressions losing their colors after a nested template string ([#6219](https://github.com/getpaseo/paseo/pull/6219))
+- Fixed downloading files whose names contain non-ASCII characters ([#6278](https://github.com/getpaseo/paseo/pull/6278), [#6281](https://github.com/getpaseo/paseo/pull/6281) by [@dillonzq](https://github.com/dillonzq), [@jasonhnd](https://github.com/jasonhnd))
+- Fixed the PR panel, sidebar workspace status, and "Worked for" line showing English in other app languages ([#6196](https://github.com/getpaseo/paseo/pull/6196), [#6208](https://github.com/getpaseo/paseo/pull/6208), [#6225](https://github.com/getpaseo/paseo/pull/6225) by [@dillonzq](https://github.com/dillonzq))
+- Fixed French translations that read as word-for-word machine translation ([#6004](https://github.com/getpaseo/paseo/pull/6004) by [@fxlelouarn](https://github.com/fxlelouarn))
+- Fixed the desktop window not dragging from the workspace header after scrolling a long chat ([#5233](https://github.com/getpaseo/paseo/pull/5233) by [@Zhou-Ruichen](https://github.com/Zhou-Ruichen))
+- Fixed opening an agent on a touch screen in the desktop layout raising the on-screen keyboard ([#5477](https://github.com/getpaseo/paseo/pull/5477) by [@dinhphieu](https://github.com/dinhphieu))
+- Fixed Option+arrow, Cmd+arrow, and Cmd+Backspace line editing in the macOS terminal ([#3339](https://github.com/getpaseo/paseo/pull/3339) by [@gpambrozio](https://github.com/gpambrozio))
+- Fixed the daemon freezing when an Add Project directory search reached a folder whose read never returns ([#6029](https://github.com/getpaseo/paseo/pull/6029), [#6041](https://github.com/getpaseo/paseo/pull/6041) by [@lardissone](https://github.com/lardissone))
+- Fixed a new worktree workspace being archived when its `paseo.json` cannot be parsed ([#6036](https://github.com/getpaseo/paseo/pull/6036) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed workspace script status not updating in other connected clients ([#6007](https://github.com/getpaseo/paseo/pull/6007) by [@swbiggart](https://github.com/swbiggart))
+- Fixed agents and terminals inheriting the voice library path, which truncated Git Bash's PATH on Windows ([#5987](https://github.com/getpaseo/paseo/pull/5987) by [@hanh9898](https://github.com/hanh9898))
+- Fixed dictation failing until the model was deleted by hand when the daemon stopped while extracting a local speech model ([#6210](https://github.com/getpaseo/paseo/pull/6210) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed macOS hosts showing as `UNKNOWN` when the network supplies no hostname ([#5922](https://github.com/getpaseo/paseo/pull/5922))
+- Fixed `paseo daemon status` reporting a daemon in a Linux VM as stopped after the host wakes from sleep ([#6279](https://github.com/getpaseo/paseo/pull/6279))
+- Fixed relay reconnects being ignored after a relay connection stalled before its handshake ([#5648](https://github.com/getpaseo/paseo/pull/5648) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed `paseo daemon run` exiting with "Daemon failed to start" when the program that launched it stops reading its output ([#6117](https://github.com/getpaseo/paseo/pull/6117))
+- Fixed CLI commands crashing with `EPIPE`, and the Windows desktop app showing an error dialog, when their output stops being read ([#6097](https://github.com/getpaseo/paseo/pull/6097))
+- Fixed daemon self-update on a linked global install giving the wrong reason for refusing ([#6095](https://github.com/getpaseo/paseo/pull/6095))
+- Fixed daemon self-update failing for an npm install under a prefix other than npm's global prefix ([#5649](https://github.com/getpaseo/paseo/pull/5649) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed opening an archived agent whose worktree was removed showing "Workspace unavailable" when the workspace had no recorded branch ([#5694](https://github.com/getpaseo/paseo/pull/5694))
+- Fixed a failed send to an archived agent whose directory was removed taking it out of History ([#6255](https://github.com/getpaseo/paseo/pull/6255))
+- Fixed a host's version staying stale on the host page after its daemon restarts ([#5351](https://github.com/getpaseo/paseo/pull/5351) by [@bashrusakh](https://github.com/bashrusakh))
+- Fixed Remote SSH hosts failing to connect to a password-protected daemon, with a new Daemon password field ([#6081](https://github.com/getpaseo/paseo/pull/6081) by [@royenheart](https://github.com/royenheart))
+- Fixed removing a host during its first connection attempt not stopping the connection ([#5722](https://github.com/getpaseo/paseo/pull/5722))
+- Fixed a file upload started while reconnecting failing with `Connection changed during file upload` ([#5585](https://github.com/getpaseo/paseo/pull/5585))
+- Fixed the centered New workspace form collapsing and overlapping when the keyboard opens on tablets ([#6093](https://github.com/getpaseo/paseo/pull/6093) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed the Android sidebar jumping back to the top when reopened after selecting a workspace ([#6058](https://github.com/getpaseo/paseo/pull/6058))
+- Fixed tapping the context ring and long-pressing a workspace tab doing nothing on native tablets ([#5713](https://github.com/getpaseo/paseo/pull/5713) by [@JichenZhang](https://github.com/JichenZhang))
+- Fixed iPad chat text keeping its old width after the pane resizes ([#5716](https://github.com/getpaseo/paseo/pull/5716))
+- Fixed the context ring filling from three o'clock instead of twelve on web and desktop ([#5598](https://github.com/getpaseo/paseo/pull/5598))
+- Fixed browser annotation screenshots capturing the wrong region when the app is zoomed ([#5703](https://github.com/getpaseo/paseo/pull/5703))
+- Fixed the desktop app launching a `daemon status` process every second when no local daemon runs ([#5636](https://github.com/getpaseo/paseo/pull/5636))
+- Fixed the `/` menu listing `/clear` and `/exit` in a draft before a project or model is chosen ([#5594](https://github.com/getpaseo/paseo/pull/5594) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed `paseo agent delete --all` and `--cwd` leaving archived agents behind ([#6027](https://github.com/getpaseo/paseo/pull/6027) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed `paseo agent` commands reporting a generic failure instead of `AGENT_NOT_FOUND` for an unknown agent ID ([#6053](https://github.com/getpaseo/paseo/pull/6053))
+- Fixed `paseo agent open` opening Desktop and exiting 0 for an agent that does not exist ([#5727](https://github.com/getpaseo/paseo/pull/5727))
+- Fixed `paseo restart` exiting with `RESTART_NOT_CONFIRMED` when provider checks take more than a second ([#6009](https://github.com/getpaseo/paseo/pull/6009))
+- Fixed `paseo schedule update --no-max-runs` and `--no-expires-in` failing before reaching the daemon ([#5973](https://github.com/getpaseo/paseo/pull/5973) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed `daemon.log` saying nothing when a resumed Claude agent's transcript is missing or cannot be read ([#5818](https://github.com/getpaseo/paseo/pull/5818) by [@gabrielgiordan](https://github.com/gabrielgiordan))
+- Fixed reloading a plugin adding `[System Error] Provider connection closed` to finished chats on its provider ([#5579](https://github.com/getpaseo/paseo/pull/5579))
+- Fixed `paseo plugin add .` looking for the plugin in the daemon's directory instead of the CLI's ([#6239](https://github.com/getpaseo/paseo/pull/6239))
+- Fixed plugin settings screens on desktop having no way back to the Plugins page ([#5620](https://github.com/getpaseo/paseo/pull/5620))
+- Fixed plugin client code failing to import npm packages that declare only `main` or `module` ([#5838](https://github.com/getpaseo/paseo/pull/5838))
+- Fixed the SDK's `send()` and `run()` rejecting `activeTurnBehavior` in TypeScript ([#5605](https://github.com/getpaseo/paseo/pull/5605) by [@wjxdy](https://github.com/wjxdy))
+- Fixed bundling `@getpaseo/client` from npm failing with `Could not resolve "@getpaseo/relay/e2ee"` ([#5815](https://github.com/getpaseo/paseo/pull/5815))
+
+## 0.10.3 - 2026-10-02
+
+### Added
+
+- Added a confirmation before a pairing link connects to a new host or to a saved host whose key or relay changed ([#5753](https://github.com/getpaseo/paseo/pull/5753))
+
+## 0.10.2 - 2026-09-30
+
+### Fixed
+
+- Fixed OpenCode v2 turns longer than five minutes failing with `UND_ERR_HEADERS_TIMEOUT` ([#5674](https://github.com/getpaseo/paseo/pull/5674))
+- Fixed the context meter staying empty during OpenCode v2 turns and disappearing after them ([#5710](https://github.com/getpaseo/paseo/pull/5710) by [@mcowger](https://github.com/mcowger))
+- Fixed OpenCode v2 question cards showing only the header and offering no typed answer ([#5679](https://github.com/getpaseo/paseo/pull/5679))
+- Fixed OpenCode v2 patch edits from GPT models showing as a raw Patch card instead of an edit diff ([#5696](https://github.com/getpaseo/paseo/pull/5696))
+- Fixed completed OpenCode v2 edits showing no diff ([#5609](https://github.com/getpaseo/paseo/pull/5609))
+
+## 0.10.1 - 2026-09-29
+
+### Added
+
+- Added Claude Sonnet 5.5 for Claude Code 2.1.284 and newer ([#5583](https://github.com/getpaseo/paseo/pull/5583) by [@yangqi](https://github.com/yangqi))
+
+### Fixed
+
+- Fixed OpenCode chats failing with "Variant unavailable" after switching to a model without the selected thinking level ([#5587](https://github.com/getpaseo/paseo/pull/5587))
+- Fixed rewinding a Codex chat dropping its custom provider and Paseo tools ([#5345](https://github.com/getpaseo/paseo/pull/5345) by [@zbaibg](https://github.com/zbaibg))
+- Fixed streamed replies joining lines of code blocks and Mermaid diagrams until the chat reloads ([#5577](https://github.com/getpaseo/paseo/pull/5577))
+- Fixed a subagent opened from a split pane opening in a different pane ([#5451](https://github.com/getpaseo/paseo/pull/5451))
+- Fixed archiving a custom Codex provider's agent leaving its session in Import session ([#5572](https://github.com/getpaseo/paseo/pull/5572))
+- Fixed the `/` menu of a custom Codex provider with its own `CODEX_HOME` listing the daemon's prompts instead of its own ([#5450](https://github.com/getpaseo/paseo/pull/5450))
+- Fixed a background `send_agent_prompt` returning `idle` for a prompt the agent accepted ([#5386](https://github.com/getpaseo/paseo/pull/5386))
+- Fixed Windows file-link tooltips showing the full path for files inside the workspace ([#1987](https://github.com/getpaseo/paseo/pull/1987))
+- Fixed terminal profiles that run `cursor-agent` showing the generic terminal icon ([#5379](https://github.com/getpaseo/paseo/pull/5379))
+
+## 0.10.0 - 2026-09-28
+
+### Added
+
+- Added OpenCode v2 support, selected automatically from the installed `opencode` version ([#5198](https://github.com/getpaseo/paseo/pull/5198), [#5526](https://github.com/getpaseo/paseo/pull/5526) by [@karrots](https://github.com/karrots), [@dsingal0](https://github.com/dsingal0), [@gszep](https://github.com/gszep))
+- Added task lists from rpiv-todo, pi-goal-x, and Pi's example todo extension to Pi chats ([#5309](https://github.com/getpaseo/paseo/pull/5309))
+- Added subagent runs from pi-subagents, Tintinweb pi-subagents, and Gotgenes pi-subagents to the Subagents track ([#5309](https://github.com/getpaseo/paseo/pull/5309))
+- Added rpiv-ask-user-question dialogs to Pi chats as one question form ([#5309](https://github.com/getpaseo/paseo/pull/5309))
+- Added password checks to relay connections, rejecting an incorrect daemon password; a follow-up release will require the password ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Added a password field to Add host, pairing links, and QR pairing for password-protected daemons ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Added `relay://` connection strings to `paseo daemon pair` ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Added OMP Ask option descriptions to question cards on OMP 17.4.2 and newer ([#3628](https://github.com/getpaseo/paseo/pull/3628) by [@joeshull](https://github.com/joeshull))
+
+### Changed
+
+- Changed the CLI and desktop app to connect to a password-protected daemon on the same machine without asking for the password ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Changed a host rejected for its password to show "Password required" or "Incorrect password" on the host and Connections pages ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Reorganized Settings into General, Sidebar, Chat, Terminal, Browser, and Open location pages ([#5459](https://github.com/getpaseo/paseo/pull/5459))
+
+### Fixed
+
+- Fixed direct connections failing when the daemon password contains spaces or characters such as `@` or `/` ([#5393](https://github.com/getpaseo/paseo/pull/5393))
+- Fixed existing OpenCode agents failing with `ECONNREFUSED` after the OpenCode server restarts ([#5338](https://github.com/getpaseo/paseo/pull/5338))
+- Fixed messages OpenCode adds on its own appearing in the chat as if the user typed them ([#5434](https://github.com/getpaseo/paseo/pull/5434))
+- Fixed the daemon stopping when `daemon.log` cannot be written, such as on a full disk ([#5445](https://github.com/getpaseo/paseo/pull/5445))
+- Fixed the daemon crashing when opening an archived ACP agent whose worktree was removed ([#5439](https://github.com/getpaseo/paseo/pull/5439) by [@qinkangdeid](https://github.com/qinkangdeid))
+- Fixed existing workspaces missing from the sidebar after the app starts, including after later restarts ([#5394](https://github.com/getpaseo/paseo/pull/5394))
+- Fixed agents on a custom Claude provider with its own `CLAUDE_CONFIG_DIR` opening with an empty chat after a daemon restart ([#5437](https://github.com/getpaseo/paseo/pull/5437))
+- Fixed a custom Codex provider's sessions missing from Import session ([#5446](https://github.com/getpaseo/paseo/pull/5446))
+- Fixed Update daemon and Restart in host settings failing when a provider's version check takes over 1.5s ([#5372](https://github.com/getpaseo/paseo/pull/5372))
+- Fixed `paseo --host <other daemon> run` failing with "Caller agent not found" from inside an agent session ([#5392](https://github.com/getpaseo/paseo/pull/5392))
+- Fixed a Pi chat rewind going back further than the picked message after an earlier rewind ([#5383](https://github.com/getpaseo/paseo/pull/5383))
+- Fixed a Pi chat rewind being undone when the daemon restarts ([#5432](https://github.com/getpaseo/paseo/pull/5432))
+- Fixed Pi agents started without a model ignoring Pi's configured default model ([#5343](https://github.com/getpaseo/paseo/pull/5343))
+- Fixed project skills in a new agent's `/` menu staying stale after the checkout switches branches ([#5415](https://github.com/getpaseo/paseo/pull/5415))
+- Fixed slash commands missing from a new agent's `/` menu on custom ACP providers ([#5411](https://github.com/getpaseo/paseo/pull/5411))
+- Fixed a parent agent receiving a child's finish notification twice after prompting the running child ([#5407](https://github.com/getpaseo/paseo/pull/5407))
+- Fixed a blocking `send_agent_prompt` that outlasts its 30s wait never notifying the caller when the child finishes ([#5347](https://github.com/getpaseo/paseo/pull/5347))
+- Fixed OSC 8 terminal links showing a navigation prompt and opening a blank Paseo window ([#5388](https://github.com/getpaseo/paseo/pull/5388) by [@liujin0506](https://github.com/liujin0506))
+- Fixed the Theme menu not scrolling when plugin themes overflow the window ([#5374](https://github.com/getpaseo/paseo/pull/5374))
+- Fixed a message from today's weekday last week showing only the weekday instead of its date ([#5341](https://github.com/getpaseo/paseo/pull/5341))
+- Fixed `paseo daemon set-password` exiting silently when stdin is not a terminal ([#5358](https://github.com/getpaseo/paseo/pull/5358))
+
+## 0.9.2 - 2026-09-24
+
+### Added
+
+- Added structured Claude Code launch arguments for session configuration and plugins ([#5206](https://github.com/getpaseo/paseo/pull/5206))
+
+### Improved
+
+- Reduced background Git polling for repositories the watcher cannot observe ([#5170](https://github.com/getpaseo/paseo/pull/5170))
+- Reduced Add Project directory search time on large home directories ([#5190](https://github.com/getpaseo/paseo/pull/5190))
+
+### Fixed
+
+- Fixed the daemon becoming unresponsive when ignored directories appear after a workspace opens ([c3e1e08](https://github.com/getpaseo/paseo/commit/c3e1e084a068e5895710c43b034ced8ebef256e8) by [@Marcus172](https://github.com/Marcus172))
+- Fixed daemon memory growing after client connections close ([9978988](https://github.com/getpaseo/paseo/commit/9978988e35409a018a52d0d7646f18b51e562346))
+- Fixed a project folder ending in a space crashing the app on load ([#5205](https://github.com/getpaseo/paseo/pull/5205) by [@L4XB](https://github.com/L4XB))
+- Fixed workspace labels missing when an agent screen opens before the sidebar ([#5079](https://github.com/getpaseo/paseo/pull/5079) by [@morven-ai](https://github.com/morven-ai))
+- Fixed workspaces disappearing when their disk or network share is unavailable ([#5227](https://github.com/getpaseo/paseo/pull/5227))
+- Fixed a failed session import making an archived worktree impossible to restore ([#5238](https://github.com/getpaseo/paseo/pull/5238))
+- Fixed archived agent logs failing after Paseo removes their worktree ([#5229](https://github.com/getpaseo/paseo/pull/5229))
+- Fixed a newly created branch pushing to the default branch through an inherited upstream ([#5249](https://github.com/getpaseo/paseo/pull/5249))
+- Fixed fork checkout pull requests disappearing from the workspace after refresh ([#5221](https://github.com/getpaseo/paseo/pull/5221))
+- Fixed agent-created local workspaces accepting a missing path or file ([#5322](https://github.com/getpaseo/paseo/pull/5322))
+- Fixed chat uploads replacing valid characters in original file names with underscores ([#5317](https://github.com/getpaseo/paseo/pull/5317))
+- Fixed multi-select questions dropping checked options or a typed Other answer ([#5320](https://github.com/getpaseo/paseo/pull/5320) by [@ThePharmer](https://github.com/ThePharmer))
+- Fixed Android Back leaving the screen while a bottom sheet is open ([#5245](https://github.com/getpaseo/paseo/pull/5245))
+- Fixed voice mode playing the thinking tone between spoken reply segments ([#5281](https://github.com/getpaseo/paseo/pull/5281))
+- Fixed a Claude slash command sent with an attachment reaching Claude as plain text ([#5240](https://github.com/getpaseo/paseo/pull/5240) by [@joecorkerton](https://github.com/joecorkerton))
+- Fixed Claude rewind after a turn that received no response ([#5285](https://github.com/getpaseo/paseo/pull/5285))
+- Fixed Claude rewind after a turn containing subagent messages ([#5289](https://github.com/getpaseo/paseo/pull/5289))
+- Fixed repeated agent history after refresh when a durable timeline store is configured ([#5286](https://github.com/getpaseo/paseo/pull/5286))
+- Fixed an OMP custom message ending a turn before the provider finished ([#3258](https://github.com/getpaseo/paseo/pull/3258))
+- Fixed a stopped OMP turn appearing as a failed turn ([#5243](https://github.com/getpaseo/paseo/pull/5243))
+- Fixed Stop refusing to settle a Pi or OMP agent whose runtime has exited ([#5235](https://github.com/getpaseo/paseo/pull/5235))
+- Fixed OpenCode agents ignoring their configured permission rules ([#5296](https://github.com/getpaseo/paseo/pull/5296) by [@gurvancampion](https://github.com/gurvancampion))
+- Fixed Codex Default and Read-only modes sending approval requests to Auto-review ([#5239](https://github.com/getpaseo/paseo/pull/5239) by [@HMWCS](https://github.com/HMWCS))
+- Fixed Cursor agent creation after switching from a Fast model to one without Fast ([#5274](https://github.com/getpaseo/paseo/pull/5274) by [@gengjiawen](https://github.com/gengjiawen))
+- Fixed the Fast control missing for GPT-6 Sol and GPT-6 Luna in Codex ([#5273](https://github.com/getpaseo/paseo/pull/5273) by [@basilk15](https://github.com/basilk15), [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed Claude's configured Fable model missing from the model picker ([#5326](https://github.com/getpaseo/paseo/pull/5326) by [@noahg9](https://github.com/noahg9))
+- Fixed ACP terminals started by the daemon using the wrong agent identity ([#5248](https://github.com/getpaseo/paseo/pull/5248))
+- Fixed an agent's completed plugin session appearing failed after a daemon restart ([#5253](https://github.com/getpaseo/paseo/pull/5253))
+- Fixed plugin reload crashing its subprocess while a provider session closes ([#5231](https://github.com/getpaseo/paseo/pull/5231))
+- Fixed a failed plugin provider request crashing the daemon ([#5298](https://github.com/getpaseo/paseo/pull/5298))
+- Fixed Hub executions being unable to title workspaces they create ([#5302](https://github.com/getpaseo/paseo/pull/5302))
+- Fixed an invalid schedule file preventing the daemon from starting ([#5301](https://github.com/getpaseo/paseo/pull/5301))
+- Fixed an empty `paseo.pid` preventing the daemon from starting ([#5306](https://github.com/getpaseo/paseo/pull/5306))
+- Fixed a recycled daemon PID preventing startup after a reboot ([#5277](https://github.com/getpaseo/paseo/pull/5277))
+- Fixed daemon startup failing on `config.json` saved with a UTF-8 byte order mark ([#5315](https://github.com/getpaseo/paseo/pull/5315))
+- Fixed background daemon startup errors missing from the reported log file ([#5332](https://github.com/getpaseo/paseo/pull/5332))
+- Fixed CLI errors for invalid `config.json` omitting the file and failing field ([#5337](https://github.com/getpaseo/paseo/pull/5337))
+- Fixed the CLI suggesting daemon startup after a password rejection ([#5310](https://github.com/getpaseo/paseo/pull/5310))
+- Fixed Open in editor missing for a password-protected desktop daemon ([#5335](https://github.com/getpaseo/paseo/pull/5335))
+- Fixed `paseo permit ls --json` shortening request IDs needed by `permit allow` and `permit deny` ([#5305](https://github.com/getpaseo/paseo/pull/5305))
+- Fixed a replica cache read spinning when its store keeps rejecting writes ([#5290](https://github.com/getpaseo/paseo/pull/5290))
+- Fixed the MiniMax card showing a raw error for an inactive token subscription ([#5258](https://github.com/getpaseo/paseo/pull/5258))
+- Fixed modified Backspace being rejected as a custom shortcut ([#5224](https://github.com/getpaseo/paseo/pull/5224))
+- Fixed multi-step shortcuts failing when the app updates between steps ([#5255](https://github.com/getpaseo/paseo/pull/5255) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed multi-step shortcuts failing when the second step holds a modifier ([#5272](https://github.com/getpaseo/paseo/pull/5272))
+- Fixed rebound pane-focus shortcuts failing while typing ([#5287](https://github.com/getpaseo/paseo/pull/5287))
+
+## 0.9.1 - 2026-09-22
+
+### Added
+
+- Added Opus 5.5 to the Claude catalog as its default model, with a 1M context window and Fast Mode, on Claude Code 2.1.280 and newer ([#5200](https://github.com/getpaseo/paseo/pull/5200) by [@leonardourci](https://github.com/leonardourci), [@sebgalind0](https://github.com/sebgalind0), [@rp4ri](https://github.com/rp4ri))
+
+### Fixed
+
+- Fixed the sidebar keeping only recently changed conversations after the app reconnects to a daemon ([#5189](https://github.com/getpaseo/paseo/pull/5189) by [@bagutzu](https://github.com/bagutzu))
+- Fixed Import session offering only the newest 100 Codex conversations ([#5174](https://github.com/getpaseo/paseo/pull/5174) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed a Claude model whose ID carries a minor version, such as Opus 5.5, reverting to its major version in the composer once a turn finished ([#5200](https://github.com/getpaseo/paseo/pull/5200))
+
+## 0.9.0 - 2026-09-22
+
+### Added
+
+- Added Cmd/Ctrl+F Find to file panes, with replacement in editable files ([#4589](https://github.com/getpaseo/paseo/pull/4589))
+- Added Cmd/Ctrl+F Find to terminal scrollback ([#4650](https://github.com/getpaseo/paseo/pull/4650))
+- Added Cmd/Ctrl+F Find to chat, including messages outside the loaded history window ([#4765](https://github.com/getpaseo/paseo/pull/4765))
+- Added Jump to file to mobile Changes, opening the changed-files tree in a sheet ([#4861](https://github.com/getpaseo/paseo/pull/4861))
+- Added automatic Pull request tab opening once per workspace when a PR is detected ([#4956](https://github.com/getpaseo/paseo/pull/4956))
+- Added expandable plan cards, with rejected plans collapsed by default ([#4756](https://github.com/getpaseo/paseo/pull/4756))
+- Added an attachment placeholder with a spinner while a selected file uploads ([#4958](https://github.com/getpaseo/paseo/pull/4958))
+- Added match highlighting to the workspace, agent, project, and branch fields in History search ([#4945](https://github.com/getpaseo/paseo/pull/4945))
+
+### Plugins
+
+- Added plugin installation from npm, including scoped packages, versions, tags, and ranges ([#4975](https://github.com/getpaseo/paseo/pull/4975))
+- Added `paseo plugin update` with `--all`, `--check`, and `--yes`, showing the current and proposed revision before approval ([#4975](https://github.com/getpaseo/paseo/pull/4975))
+- Added each plugin's description, source, and installed revision to Settings → Plugins ([#4975](https://github.com/getpaseo/paseo/pull/4975))
+- Added an optional `serverId` to `navigation.openAgent()` and `navigation.openWorkspace()` ([#4942](https://github.com/getpaseo/paseo/pull/4942))
+- Added host discovery through `useHosts()` and host-targeted SDK clients through `getPaseoClient(serverId)` ([#4971](https://github.com/getpaseo/paseo/pull/4971))
+- Added `openExternalUrl()` and `<ExternalLink>` for opening a URL outside Paseo ([#4972](https://github.com/getpaseo/paseo/pull/4972))
+- Added `navigation.openBrowser()` for opening a URL in a workspace browser on desktop ([#4972](https://github.com/getpaseo/paseo/pull/4972))
+- Added a server settings handle returned by `registerSettings()` with `read()` and `subscribe()` ([#4674](https://github.com/getpaseo/paseo/pull/4674) by [@mcowger](https://github.com/mcowger))
+- Changed `assistant_message` transformers to receive the whole accumulated message on each update ([#4675](https://github.com/getpaseo/paseo/pull/4675) by [@mcowger](https://github.com/mcowger), [@jegork](https://github.com/jegork))
+- Changed `tool_call` transformers to receive every original call before Overview groups them ([#4675](https://github.com/getpaseo/paseo/pull/4675))
+- Fixed a plugin session losing its host API permanently after its heartbeat lease expired ([#4912](https://github.com/getpaseo/paseo/pull/4912) by [@gpambrozio](https://github.com/gpambrozio))
+- Fixed plugin build commands failing with `spawn npm ENOENT` on Windows ([#4776](https://github.com/getpaseo/paseo/pull/4776) by [@ABorakati](https://github.com/ABorakati))
+- Fixed ACP text chunks without a `messageId` splitting one reply into a message per chunk ([#4701](https://github.com/getpaseo/paseo/pull/4701) by [@L4XB](https://github.com/L4XB))
+- Fixed nested provider subagents appearing as direct children of the root agent ([#4970](https://github.com/getpaseo/paseo/pull/4970))
+
+### Changed
+
+- Changed History search to keep results chronological in date buckets instead of reordering by relevance ([#4945](https://github.com/getpaseo/paseo/pull/4945))
+- Changed workspace Restore to keep the archived agent selected, with its own Unarchive action ([#4736](https://github.com/getpaseo/paseo/pull/4736))
+- Changed the workspace error screen's Retry to Reload, which reopens at the project picker ([#4598](https://github.com/getpaseo/paseo/pull/4598))
+- Changed closing the last content tab to leave the New launcher instead of an unusable pane ([#4844](https://github.com/getpaseo/paseo/pull/4844))
+- Changed `paseo daemon start` to read persistent configuration; removed configuration flags fail with migration instructions ([#4575](https://github.com/getpaseo/paseo/pull/4575))
+
+### Improved
+
+- Bold, italics, strikethrough, inline code, and link labels stay formatted while a reply streams ([#4742](https://github.com/getpaseo/paseo/pull/4742))
+- Reduced time to first voice audio from 4.80s to 0.95s on a three-sentence reply ([#4927](https://github.com/getpaseo/paseo/pull/4927))
+- Reduced cold diff generation from 11.45s to 2.65s on a 213-file workspace ([#4676](https://github.com/getpaseo/paseo/pull/4676))
+- Reduced desktop memory use, from 290.5 MiB to 152.1 MiB RSS in the Electron main process after loading daemon management ([#5007](https://github.com/getpaseo/paseo/pull/5007))
+- Kept open chats subscribed across view eviction, app backgrounding, and reconnect ([#4863](https://github.com/getpaseo/paseo/pull/4863))
+- Added reconnection and Updating messages status to the chat toast ([#4863](https://github.com/getpaseo/paseo/pull/4863))
+- Kept the app responsive during large uploads by yielding between 128 KiB chunks ([#4958](https://github.com/getpaseo/paseo/pull/4958))
+- Let resident browser pages idle between screenshots while the desktop window is hidden ([#4646](https://github.com/getpaseo/paseo/pull/4646))
+
+### Fixed
+
+- Fixed the daemon exhausting its heap in long conversations with cumulative tool output ([#4838](https://github.com/getpaseo/paseo/pull/4838))
+- Fixed repeated submissions creating several workspaces or agents for one intent ([#4442](https://github.com/getpaseo/paseo/pull/4442))
+- Fixed a crash loop after closing the last content tab in a workspace ([#4844](https://github.com/getpaseo/paseo/pull/4844))
+- Fixed New Agent crashing when an enabled provider published duplicate model IDs ([#4839](https://github.com/getpaseo/paseo/pull/4839))
+- Fixed long drafts growing behind the chat header on Android and iOS ([#4824](https://github.com/getpaseo/paseo/pull/4824))
+- Fixed the Android composer growing taller when the keyboard closed ([#4902](https://github.com/getpaseo/paseo/pull/4902))
+- Fixed the Android composer keeping its height after hold-to-delete emptied a draft ([#4946](https://github.com/getpaseo/paseo/pull/4946))
+- Fixed New workspace setup content not moving up as the composer grows ([#4973](https://github.com/getpaseo/paseo/pull/4973))
+- Fixed the Android timeline scrolling away when tapping or selecting text in a chat ([#5013](https://github.com/getpaseo/paseo/pull/5013))
+- Fixed Paste image failing before an attachment reached the composer on Android ([#4758](https://github.com/getpaseo/paseo/pull/4758))
+- Fixed provider and model pickers not responding on Android tablets ([#4845](https://github.com/getpaseo/paseo/pull/4845) by [@cjcrjc](https://github.com/cjcrjc), [@mkuhl](https://github.com/mkuhl))
+- Fixed Linux desktop packages launching without the Chromium sandbox ([#4447](https://github.com/getpaseo/paseo/pull/4447))
+- Fixed `paseo daemon stop` shutting down a daemon other than the selected one ([#4575](https://github.com/getpaseo/paseo/pull/4575))
+- Fixed restored archived workspaces showing empty Changes and Commits ([#4926](https://github.com/getpaseo/paseo/pull/4926))
+- Fixed a rejected plan appearing below the follow-up message that rejected it ([#4756](https://github.com/getpaseo/paseo/pull/4756))
+- Fixed Cmd/Ctrl+F not opening chat Find while the composer had focus ([#4991](https://github.com/getpaseo/paseo/pull/4991))
+- Fixed the linked pull request going undetected when a branch remote is a repository URL ([#4862](https://github.com/getpaseo/paseo/pull/4862))
+- Fixed a plugin's filtered agent list replacing the app's own directory subscription ([#4596](https://github.com/getpaseo/paseo/pull/4596))
+- Fixed an updated app rejecting daemons that lack independent subscriptions ([#4737](https://github.com/getpaseo/paseo/pull/4737))
+- Fixed workspace and agent creation failing or leaving agent titles at "Loading…" on 0.8.0 and older daemons ([#4895](https://github.com/getpaseo/paseo/pull/4895))
+- Fixed Cursor models showing another model's thinking options ([#4180](https://github.com/getpaseo/paseo/pull/4180) by [@fidelix](https://github.com/fidelix))
+- Fixed Pi model pickers offering thinking levels the model does not support ([#4413](https://github.com/getpaseo/paseo/pull/4413) by [@mcowger](https://github.com/mcowger), [@therainisme](https://github.com/therainisme))
+- Fixed Pi sessions reporting the requested thinking level instead of the one Pi applied ([#4413](https://github.com/getpaseo/paseo/pull/4413))
+- Fixed voice-chat user messages showing the internal prompt wrapper instead of the transcript ([#4927](https://github.com/getpaseo/paseo/pull/4927))
+- Fixed History and Command Center search matching a query assembled from letters in separate words ([#4945](https://github.com/getpaseo/paseo/pull/4945))
+- Fixed workspace titles truncating early on touch layouts behind hidden diff stats ([#4698](https://github.com/getpaseo/paseo/pull/4698))
+- Fixed the Explorer showing `+0 -0` and "No changes" while being dragged open ([#4861](https://github.com/getpaseo/paseo/pull/4861))
+- Fixed the reconnect toast restarting its entrance animation when opening a saved chat ([#4925](https://github.com/getpaseo/paseo/pull/4925))
+- Fixed raised shadows around Android file rows in the changed-files sheet ([#4898](https://github.com/getpaseo/paseo/pull/4898))
+
+## 0.8.0 - 2026-09-10
+
+Paseo 0.8 adds plugin header buttons, custom providers, and richer chat components, alongside fixes for desktop updates and mobile keyboards.
+
+**Before upgrading:** the macOS desktop app now requires macOS 13 or newer; Linux and Windows support is unchanged. Plugins written for 0.7 need the [0.8 migration guide](https://paseo.sh/docs/plugins/v0.8/migration), including separate client/server entries and the revised composer pill API.
+
+### Added
+
+- Added answer forms for Codex questions asked while the agent continues working ([#4587](https://github.com/getpaseo/paseo/pull/4587))
+- Added Mark as unread to finished workspaces in the sidebar menu ([#3603](https://github.com/getpaseo/paseo/pull/3603) by [@edihasaj](https://github.com/edihasaj))
+- Added an in-app What's new sheet in the help menu, Settings → About, and desktop update callout ([#4576](https://github.com/getpaseo/paseo/pull/4576))
+- Added Import session to the sidebar footer, History, and Command Center ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Added search, pagination, and workspace filtering to Import session ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Added sidebar item reordering and visibility controls in Appearance settings ([#4203](https://github.com/getpaseo/paseo/pull/4203))
+- Added provider notifications from Pi extensions and OpenCode to the timeline ([#3411](https://github.com/getpaseo/paseo/pull/3411) by [@trim21](https://github.com/trim21))
+- Added a fullscreen Mermaid viewer on web and desktop ([#4107](https://github.com/getpaseo/paseo/pull/4107) by [@gengjiawen](https://github.com/gengjiawen))
+- Added Copy, Copy line, and Select all to the web diff context menu ([#4229](https://github.com/getpaseo/paseo/pull/4229))
+- Added Gajae Code to the ACP provider catalog ([#3471](https://github.com/getpaseo/paseo/pull/3471) by [@Yeachan-Heo](https://github.com/Yeachan-Heo))
+- Added per-provider controls for disabling all or selected Paseo tools ([#4277](https://github.com/getpaseo/paseo/pull/4277) by [@mcowger](https://github.com/mcowger))
+- Added explicit approval before running setup, automatic terminals, or scripts in fork pull request workspaces ([#4215](https://github.com/getpaseo/paseo/pull/4215))
+- Added Hub follow-ups to existing agents, including archived workspace recovery ([#4354](https://github.com/getpaseo/paseo/pull/4354))
+- Added provider catalog discovery to Hub executions ([#4242](https://github.com/getpaseo/paseo/pull/4242))
+
+### Plugins
+
+- Added custom providers with their own icons, settings, permissions, and timeline rendering ([#4314](https://github.com/getpaseo/paseo/pull/4314))
+- Added provider session recovery after plugin reload ([#4629](https://github.com/getpaseo/paseo/pull/4629) by [@mcowger](https://github.com/mcowger))
+- Added custom timeline components and persisted timeline rows ([e34aea2](https://github.com/getpaseo/paseo/commit/e34aea206e6ec7ac2d5fa9766db28fb221ae990c))
+- Added client slash commands that run without a provider turn ([e34aea2](https://github.com/getpaseo/paseo/commit/e34aea206e6ec7ac2d5fa9766db28fb221ae990c))
+- Added plugin settings screens under Settings → Plugins ([#4357](https://github.com/getpaseo/paseo/pull/4357))
+- Added lifecycle hooks for agent creation, turns, permissions, and archive events ([#4435](https://github.com/getpaseo/paseo/pull/4435))
+- Added transforms for new agents' provider, model, environment, MCP servers, and workspace isolation ([#4435](https://github.com/getpaseo/paseo/pull/4435))
+- Added header buttons and composer pills with actions, menus, custom popovers, and live updates ([#4577](https://github.com/getpaseo/paseo/pull/4577))
+- Added custom modal bodies with scrolling, keyboard-aware inputs, and clipboard actions ([#4392](https://github.com/getpaseo/paseo/pull/4392))
+- Added terminal creation, input, capture, and management to the SDK ([#4358](https://github.com/getpaseo/paseo/pull/4358))
+- Added live project subscriptions through `paseo.projects.subscribe()` ([#3983](https://github.com/getpaseo/paseo/pull/3983) by [@omercnet](https://github.com/omercnet))
+- Added permission responses through `agent.respondToPermission()` ([#3985](https://github.com/getpaseo/paseo/pull/3985) by [@omercnet](https://github.com/omercnet))
+- Added provider usage queries through `providers.listUsage()` ([#4062](https://github.com/getpaseo/paseo/pull/4062) by [@ivanbrykov](https://github.com/ivanbrykov))
+- Added supported Paseo version requirements to plugin manifests ([#4430](https://github.com/getpaseo/paseo/pull/4430))
+- Changed plugins to separate client and server entries with runtime-specific SDK imports ([#4347](https://github.com/getpaseo/paseo/pull/4347) by [@liujin0506](https://github.com/liujin0506), [@panrafal](https://github.com/panrafal))
+- Changed composer pill registration to use `button`, `registration.update()`, and `registration.remove()` ([#4577](https://github.com/getpaseo/paseo/pull/4577))
+- Changed `paseo plugin ls` to show runtime state, installed commit, and load errors without contacting a remote ([#4265](https://github.com/getpaseo/paseo/pull/4265))
+- Fixed workspace plugin panels missing from the Explorer menu ([#4446](https://github.com/getpaseo/paseo/pull/4446))
+
+### Changed
+
+- Changed the desktop app to require macOS 13 or newer; macOS 12 stops receiving desktop updates ([#4322](https://github.com/getpaseo/paseo/pull/4322))
+- Changed `--host` to a global CLI option: `paseo --host <target> <command>` ([#4238](https://github.com/getpaseo/paseo/pull/4238))
+- Changed the sidebar footer Home button to Import session ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Changed `paseo hub init` and default `paseo hub deploy` to use organization triggers in `.paseo/triggers/` ([#4517](https://github.com/getpaseo/paseo/pull/4517))
+- Changed Codex Fast availability to the supported model list, including GPT-6 Astra ([#4640](https://github.com/getpaseo/paseo/pull/4640))
+- Changed CLI installs to resolve patched React 19.1.x releases ([#4100](https://github.com/getpaseo/paseo/pull/4100) by [@liujin0506](https://github.com/liujin0506))
+
+### Improved
+
+- Reconnected every host immediately when returning to the app ([#4160](https://github.com/getpaseo/paseo/pull/4160))
+- Smoothed mobile keyboard transitions by moving the timeline and composer together ([#4275](https://github.com/getpaseo/paseo/pull/4275))
+- Reduced stalls when opening large diffs ([#4574](https://github.com/getpaseo/paseo/pull/4574))
+- Reloaded only providers whose configuration changed ([#4332](https://github.com/getpaseo/paseo/pull/4332))
+- Removed unsolicited timeline and catalog traffic from idle SDK connections ([#4470](https://github.com/getpaseo/paseo/pull/4470))
+- Added macOS updater diagnostics to App Diagnostics ([#4322](https://github.com/getpaseo/paseo/pull/4322))
+
+### Fixed
+
+- Fixed macOS desktop updates closing the app without installing the new version ([#4322](https://github.com/getpaseo/paseo/pull/4322))
+- Fixed the desktop updater reporting up to date before release manifests were available ([#4201](https://github.com/getpaseo/paseo/pull/4201))
+- Fixed `paseo restart` failing from the desktop-installed CLI on Linux `.deb`, RPM, and tarball installs ([#4207](https://github.com/getpaseo/paseo/pull/4207))
+- Fixed the packaged macOS Dock icon rendering oversized ([#4389](https://github.com/getpaseo/paseo/pull/4389))
+- Fixed the mobile terminal keyboard closing and reopening when using toolbar keys or Enter ([#4469](https://github.com/getpaseo/paseo/pull/4469))
+- Fixed cached conversations and workspace lists failing to appear when live updates arrived during loading ([#4436](https://github.com/getpaseo/paseo/pull/4436))
+- Fixed queued messages not sending after a turn completed while the app was in the background ([#4160](https://github.com/getpaseo/paseo/pull/4160))
+- Fixed Codex reloads and follow-ups after workspace archive failing with an active-writer error ([#4353](https://github.com/getpaseo/paseo/pull/4353))
+- Fixed repeated Claude compaction updates leaving extra Compacting rows spinning ([#4391](https://github.com/getpaseo/paseo/pull/4391) by [@tomgrin10](https://github.com/tomgrin10))
+- Fixed Pi agents stuck running after an extension-triggered turn ([#3849](https://github.com/getpaseo/paseo/pull/3849) by [@mjakl](https://github.com/mjakl))
+- Fixed delayed workspace creation navigating away after you switched elsewhere ([#2986](https://github.com/getpaseo/paseo/pull/2986) by [@cleiter](https://github.com/cleiter))
+- Fixed New workspace losing the selected model after creating a workspace ([#4401](https://github.com/getpaseo/paseo/pull/4401))
+- Fixed a crash when the selected provider disappeared during workspace creation ([#4332](https://github.com/getpaseo/paseo/pull/4332))
+- Fixed Codex model rows staying on Loading in the model picker ([#4283](https://github.com/getpaseo/paseo/pull/4283) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed nested subagents appearing under the root agent instead of their actual parent ([#4321](https://github.com/getpaseo/paseo/pull/4321))
+- Fixed repeated tool-call IDs across autonomous turns producing duplicate timeline rows ([140b0bb](https://github.com/getpaseo/paseo/commit/140b0bb716205cf0e00c0ff5b6b3c20af6c79413))
+- Fixed Import session loading forever when one provider hung ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Fixed Import session ignoring Claude Code `/rename` titles ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Fixed importing a session creating a duplicate workspace for an already-open directory ([#4216](https://github.com/getpaseo/paseo/pull/4216))
+- Fixed empty ACP sessions appearing in Import session ([#4335](https://github.com/getpaseo/paseo/pull/4335))
+- Fixed restored terminal titles briefly showing Terminal before loading ([#4553](https://github.com/getpaseo/paseo/pull/4553))
+- Fixed diff file headers lagging behind while scrolling on web and desktop ([#4240](https://github.com/getpaseo/paseo/pull/4240))
+- Fixed Changes and its diff going out of sync when switching between Committed and Uncommitted ([#4199](https://github.com/getpaseo/paseo/pull/4199))
+- Fixed Mermaid diagrams shrinking during streaming or becoming corrupted on reload ([#4210](https://github.com/getpaseo/paseo/pull/4210))
+- Fixed Settings navigation retaining closed views in memory on desktop ([#4228](https://github.com/getpaseo/paseo/pull/4228))
+- Fixed the file watcher missing nested directory changes on Windows ([#4354](https://github.com/getpaseo/paseo/pull/4354))
+- Fixed daemon Git commands allowing a repository's `core.fsmonitor` to execute its own command ([#4208](https://github.com/getpaseo/paseo/pull/4208))
+- Fixed terminal activity reporting for OpenCode 2 sessions ([#4300](https://github.com/getpaseo/paseo/pull/4300) by [@mr-karan](https://github.com/mr-karan))
+- Fixed the website offering downloads for the wrong platform before loading ([#4222](https://github.com/getpaseo/paseo/pull/4222))
+
 ## 0.7.2 - 2026-09-02
 
 ### Added
diff --git a/CLAUDE.md b/CLAUDE.md
index b62a53d409..e1ac653338 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,7 +2,7 @@
 
 Paseo is a mobile app for monitoring and controlling your local AI coding agents from anywhere. Your dev environment, in your pocket. Connects directly to your actual development environment — your code stays on your machine.
 
-**Supported agents:** Claude Code, Codex, GitHub Copilot, OpenCode, and Pi.
+**Supported agents:** Claude Code, Codex, GitHub Copilot, OpenCode, Pi, Antigravity, and Muse Code.
 
 ## Repository map
 
@@ -106,6 +106,13 @@ Repo dev commands use checkout-local state by default. In this checkout, `PASEO_
 
 See [docs/development.md](docs/development.md) for full setup, build sync requirements, and debugging.
 
+## Release branches
+
+When the user says "this goes to next", create or
+retarget the PR to `next` and preserve that destination through delivery. Follow
+[release branch discipline](docs/release.md#release-branch-discipline) for creating
+and updating `next`, integrating it after a release, and releasing a hotfix from a tag.
+
 ## Critical rules
 
 - **NEVER restart the main Paseo daemon on port 6767 without permission** — it manages all running agents. If you're an agent, restarting it kills your own process.
@@ -118,6 +125,7 @@ See [docs/development.md](docs/development.md) for full setup, build sync requir
   - If you must run a broad suite, pipe output to a file and read it afterward: `npx vitest run <file> --bail=1 > /tmp/test-output.txt 2>&1` then read the file.
   - Never re-run a test suite that another agent already ran and reported green — trust the result.
   - For full suite verification, push to CI and check GitHub Actions instead.
+- Add tests to existing suites and reuse their npm scripts and CI jobs instead of creating feature-specific ones.
 - **Always run typecheck and lint after every change.**
 - **Build workspace packages before diagnosing cross-package type errors.** This repo consumes generated declarations across workspaces. If typecheck fails in a package that depends on another workspace, rebuild the owning stack first so `dist` declarations are current:
   - `npm run build:client` — rebuild protocol and client declarations.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8eaaf5c0c7..b25810262f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,140 +1,104 @@
 # Contributing to Paseo
 
-Thank you for taking the time to contribute to Paseo.
+This guide is here to save us both time and help you find a useful way to contribute.
+
+Paseo grows through bug reports, testing, workflow discussions, plugins, documentation, and people helping each other. The sections below explain where each contribution belongs and what to expect.
 
 ## Philosophy
 
-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).
+**Paseo has a lean, opinionated core built to be extended.**
 
-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.
+The goal is a low floor and a high ceiling: a polished default experience that is easy to understand, with the flexibility to choose your providers, run on your own infrastructure, and build your own workflows. Paseo should remain self-hosted and respectful of your privacy and control.
 
-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.
+The core continues to evolve through improvements to the shared experience. Specialized workflows and integrations belong in the extension ecosystem. Product, design, architecture, and workflow decisions remain with the maintainer.
 
-## Report bugs in GitHub issues or Discord
+Read the [product philosophy](docs/product.md) for the reasoning behind these choices and how Paseo develops.
 
-Open an [issue](https://github.com/getpaseo/paseo/issues) or post in [Discord](https://discord.gg/jz8T2uahpH).
+## Build a plugin
 
-> [!IMPORTANT]
-> Feature requests opened as issues will get closed automatically
+Most specialized workflows and integrations are better served by plugins.
 
-If you used an agent to investigate, paste the raw evidence and repro steps it collected, not its diagnosis.
+Plugins let you build what you need, share it, and maintain it independently. Start with the [plugin documentation](https://paseo.sh/docs/plugins). For applications and integrations built around Paseo, see the [SDK documentation](https://paseo.sh/docs/sdk).
 
-You may submit a PR to fix a bug, please read the PR guidelines below.
+If an extension point is missing, describe the workflow in [Discussions](https://github.com/getpaseo/paseo/discussions). A reusable capability that enables several plugins may be a better addition than implementing one particular workflow in core.
 
-## Product discussions go in GitHub Discussions or Discord
+## Report bugs
 
-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:
+Open a [GitHub issue](https://github.com/getpaseo/paseo/issues) and fill out the bug report template.
+
+Include:
+
+- What you did, what you expected, and what happened.
+- Reproduction steps, Paseo version, and platform.
+- Relevant logs, screenshots, or a recording.
+
+If an agent investigated, include the evidence and reproduction steps it collected. Its explanation of the cause still needs verification.
+
+Focused fixes for reproducible bugs are welcome. If you submit one, follow the pull request and QA guidance below.
+
+## Discuss workflows before proposing features
+
+Product discussions, including feature requests, belong in [GitHub Discussions](https://github.com/getpaseo/paseo/discussions). Feature requests opened as issues will be closed.
+
+Explain:
 
 - 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?
+- What would a better workflow look like?
 
-"Can you build X" is not useful because it doesn't tell me about your problem.
+This helps other people describe their needs and gives me useful context when deciding what to build.
 
-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.
+There is no feature request backlog or commitment to implement a discussion. I may read and learn from it without replying.
 
-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.
+## If you still want to submit a pull request
 
-## Pull requests
+After considering plugins and discussing the workflow, you may still want to propose a change to core. Focused fixes for reproducible bugs are also welcome.
 
-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.
+**Pull requests are closed by default.** I may reopen the ones I want to take forward. Submit one only if you are comfortable with it being closed without a detailed review or explanation.
 
-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.
+Paseo receives more pull requests than I can responsibly review. Reviewing every submission and explaining every decision would consume the time available for developing the product.
 
-Here is the criteria I use to decide:
+I can prompt an agent to write code just as you can. The bottlenecks are choosing what to build, shaping it, verifying its behavior, and taking responsibility for its maintenance. A finished implementation still leaves that work to do.
 
-✅ Likely to be accepted
+If you choose to submit a PR, these are the basics to cover.
 
-- 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
+### What I look for in a core feature
 
-⛔️ Will be rejected
+- **Demonstrated demand.** Link a discussion with concrete examples of other users needing the workflow. A feature for a small, specialized use case belongs in a plugin.
+- **Value across workflows.** The feature should improve how existing capabilities work together and benefit a broad set of users. A reusable improvement is more valuable than an isolated control for one task.
+- **A coherent design across platforms and providers.** Shared capabilities should work across platforms and providers wherever applicable. Do not reshape a shared abstraction around one provider while leaving the others unsupported or inconsistent.
+- **A finished experience.** Follow the [design guidelines](docs/design.md). The feature must look and feel right in Paseo, including loading states, layout stability, and interaction performance. PRs with janky or rushed interfaces will be closed. Design judgment remains with the maintainer.
 
-- 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
+### Keep the scope small
 
-### What to expect
+Submit one focused change. PRs adding more than roughly **3,000 lines of production code** are unlikely to be accepted. Prefer the smallest complete improvement that can be tested and understood on its own.
 
-- 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
+### QA evidence
 
-## QA evidence
+Run the changed application or service and test the affected workflow yourself. Include detailed QA evidence so I can see what you exercised and what happened. PRs without this verification and evidence will be closed, whether they fix a bug or add a feature.
 
-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.
+Explain the problem and link the relevant bug report or discussion. Include:
 
-Pull requests without evidence will be closed.
+- Automated tests that exercise the changed behavior. A bug fix needs a regression test that fails on the broken version.
+- The commands you ran and their output.
+- A recording for interactive UI changes, or before-and-after screenshots for static changes.
+- The platforms you tested and any affected platforms you could not test.
 
-What's accepted:
+The [QA guide](docs/qa.md) explains the expected evidence and available tooling.
 
-- 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
+Using an agent is welcome. Sending it to implement a change and submitting its output without trying the result yourself does not meet this bar.
 
-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.
+**Satisfying all of the above does not mean your pull request will be merged.**
 
-The [QA guide](docs/qa.md) covers what to check for each of these and the tooling to do it.
+### What happens to your contribution
 
-## I want to become a maintainer
+If I take a contribution forward, I may narrow it, reshape it, or use it as a reference for my own implementation. **You will be credited for your contribution, including when I reimplement it.**
 
-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.
+A closed PR does not necessarily mean the underlying problem was dismissed. It means I am not taking that submission forward. Detailed reviews, individual explanations, and follow-up discussions cannot be provided at this volume.
 
-## FAQ
+## Help the community
 
-### I'm blocked, where do I go?
+Testing betas, reproducing bugs, improving documentation, sharing plugins, and answering questions all help Paseo develop.
 
-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.
+There is no formal process for becoming a maintainer. Consistent involvement and good judgment build the shared context needed to take on more responsibility.
diff --git a/README.ja.md b/README.ja.md
index 6629ccc397..c2d1ad88a0 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -151,6 +151,12 @@ npm run build:server
 npm run typecheck
 ```
 
+## スポンサー
+
+Paseo は一人で開発しており、使ってくれる人たちの支援で成り立っています。[GitHub Sponsors](https://github.com/sponsors/boudra) で支援できます。企業として毎月[スポンサー](https://paseo.sh/sponsor#spot)になっていただくと、ロゴをここと paseo.sh のホームページに掲載します。
+
+<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+
 ## 関連プロジェクト
 
 - [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay) — Elixir 製の公式分散リレー
diff --git a/README.ko.md b/README.ko.md
index 66f74f45fa..60581767cd 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -161,6 +161,12 @@ npm run build:server
 npm run typecheck
 ```
 
+## 스폰서
+
+Paseo는 한 사람이 개발하며, 사용하는 분들의 후원으로 운영됩니다. [GitHub Sponsors](https://github.com/sponsors/boudra)로 후원할 수 있습니다. 회사는 매월 [Paseo를 후원](https://paseo.sh/sponsor#spot)하고 로고를 이곳과 paseo.sh 홈페이지에 게재할 수 있습니다.
+
+<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+
 ## 관련 프로젝트
 
 - [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay) — Elixir로 작성한 공식 분산형 릴레이
diff --git a/README.md b/README.md
index 3478e15e36..2fc0fc8f3d 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
   </a>
 </p>
 
-<p align="center">One interface for Claude Code, Codex, Copilot, OpenCode, and Pi agents.</p>
+<p align="center">One interface for Claude Code, Codex, Copilot, OpenCode, Pi, Antigravity, and Muse Code agents.</p>
 
 <p align="center">
   <img src="https://paseo.sh/hero-mockup.png" alt="Paseo app screenshot" width="100%">
@@ -39,14 +39,34 @@
   <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>
 
-Run agents in parallel on your own machines. Ship from your phone or your desk.
+Paseo is an open source agentic development environment for desktop, mobile, web, and CLI. Open the desktop app and work: agents, editor, terminals, diffs, pull requests, and a browser in one window. Run many agents at once, each in its own worktree, on one machine or several. The mobile app is the full app, native on iOS and Android.
 
+- **Parallel agents:** Run many agents at once, each in its own worktree.
+- **Built-in orchestration:** Agents in Paseo can create worktrees, launch other agents, and talk to them, across providers.
+- **Complete development workflow:** Edit files, review diffs, open pull requests, and run terminals, in split panes you arrange how you want.
 - **Self-hosted:** Agents run on your machine with your full dev environment. Use your tools, your configs, and your skills.
-- **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, and Pi through the same interface. Pick the right model for each job.
+- **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, Pi, Antigravity, and Muse Code through the same interface. Pick the right model for each job.
 - **Voice control:** Dictate tasks or talk through problems in voice mode. Hands-free when you need it.
 - **Cross-device:** iOS, Android, desktop, web, and CLI. Start work at your desk, check in from your phone, script it from the terminal.
 - **Privacy-first:** Paseo doesn't have any telemetry, tracking, or forced log-ins.
 
+[Run parallel tasks in Paseo](https://paseo.sh/docs/parallel-development): start agents in separate worktrees, review their diffs, run each app, and check it in the built-in browser.
+
+## Plugins
+
+Plugins run on the daemon and show up in every client you connect, with the same UI on desktop, web,
+iOS, and Android. Write a plugin once and it is on your phone.
+
+- **UI:** screens, sidebar items, workspace panels, Command Center items, slash commands, composer pills, attachment sources, timeline items, themes.
+- **Agent lifecycle:** change configuration, environment, and MCP servers, answer permissions, follow up when a turn ends.
+- **Providers:** add a coding agent as a provider.
+
+Install from the registry with `paseo plugin add owner/slug`, or from Git or a local directory.
+
+**[Browse plugins](https://paseo.sh/plugins)** · **[Plugin docs](https://paseo.sh/docs/plugins)**
+
+Plugins run with access to your daemon machine and inside connected clients; install only code you trust.
+
 ## Getting Started
 
 Paseo runs a local server called the daemon that manages your coding agents. Clients like the desktop app, mobile app, web app, and CLI connect to it.
@@ -60,6 +80,8 @@ You need at least one agent CLI installed and configured with your credentials:
 - [GitHub Copilot](https://github.com/features/copilot/cli/)
 - [OpenCode](https://github.com/anomalyco/opencode)
 - [Pi](https://pi.dev)
+- [Antigravity](https://paseo.sh/docs/supported-providers#antigravity)
+- [Muse Code](https://paseo.sh/docs/muse-code)
 
 ### Desktop app (recommended)
 
@@ -67,16 +89,16 @@ Download it from [paseo.sh/download](https://paseo.sh/download) or the [GitHub r
 
 To connect from your phone, open **Settings → your host → Pair Device**.
 
-### CLI / headless
+### Server
 
-Install the CLI and start Paseo:
+For a server, a VM, or any machine without the desktop app. Install the CLI and start the daemon:
 
 ```bash
 npm install -g @getpaseo/cli
 paseo
 ```
 
-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.
+Paseo starts, 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. The desktop, mobile, and web apps connect to this daemon like any other host.
 
 For full setup and configuration, see:
 
@@ -185,6 +207,12 @@ npm run build:server
 npm run typecheck
 ```
 
+## Sponsors
+
+Paseo is an independent project used by tens of thousands of developers daily, built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.
+
+<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+
 ## Related projects
 
 - [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay) — official distributed relay, written in Elixir
diff --git a/README.zh-CN.md b/README.zh-CN.md
index c9c643b48f..dfdf673b2e 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -151,6 +151,12 @@ npm run build:server
 npm run typecheck
 ```
 
+## 赞助
+
+Paseo 由一个人开发，靠使用它的人来资助。你可以通过 [GitHub Sponsors](https://github.com/sponsors/boudra) 支持这项工作。公司也可以按月[赞助 Paseo](https://paseo.sh/sponsor#spot)，logo 会展示在这里和 paseo.sh 首页上。
+
+<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+
 ## 相关项目
 
 - [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay) — 官方分布式 relay，使用 Elixir 编写
diff --git a/SECURITY.md b/SECURITY.md
index 1c95ca9a78..ea23984fa0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -42,11 +42,15 @@ The daemon requires a valid cryptographic handshake before processing any comman
 
 The QR code or pairing link is the trust anchor. It contains the daemon's public key, which is required to establish the encrypted connection. Treat it like a password — don't share it publicly.
 
+When a daemon password is configured, new relay clients send it in the encrypted `hello` message. This release still admits relay clients that send no credential so existing mobile builds continue to connect. A wrong password is rejected. The next release will require the password for relay connections after updated mobile builds are available.
+
 ## Local daemon trust boundary
 
-By default, the daemon binds to `127.0.0.1`. With no password configured, the local control plane is trusted by network reachability — anything that can reach the daemon socket can control the daemon. This is the same security model Docker documents for its daemon: the security boundary is access to the socket or listening address.
+By default, the daemon binds to `127.0.0.1`. With no password configured, anything that can reach the daemon socket can control the daemon. Loopback is reachable by other users on the machine and by some forwarding tools.
 
-The daemon also supports an optional shared-secret password (set via `auth.password` in `config.json` or the `PASEO_PASSWORD` env var; stored bcrypt-hashed). When configured, every HTTP request must carry `Authorization: Bearer <password>` and every WebSocket upgrade must include a `Sec-WebSocket-Protocol: paseo.bearer.<password>` subprotocol. Browser WebSocket cannot set custom headers, which is why the token rides in the subprotocol. Health (`GET /api/health`) and CORS preflight (`OPTIONS`) are exempt. The password is intended for direct-TCP exposure (e.g. `tcp://host:port?ssl=true&password=...`); it is **not** a substitute for the relay's E2E encryption when traversing untrusted networks.
+The daemon supports an optional shared-secret password (set via `auth.password` in `config.json` or the `PASEO_PASSWORD` env var; stored bcrypt-hashed). WebSocket clients send the password in `hello`; the daemon sends no session data before admission. Direct connections still accept bearer headers and WebSocket bearer subprotocols for older clients. HTTP stays bearer-header based. Health (`GET /api/health`) and CORS preflight (`OPTIONS`) are exempt; `/api/files/download` and `/mcp/agents` use their own capability tokens.
+
+The daemon writes a new `$PASEO_HOME/local-credential` on every run with mode `0600` and removes it on shutdown. The CLI and desktop main process read it only for the daemon whose PID lock `listen` matches their connection target. A same-user process can read this credential, so the password protects against network clients and other OS users, not processes running as the daemon user. Protect `$PASEO_HOME` accordingly. Relay traffic remains end-to-end encrypted independently of password admission.
 
 Connected clients are trusted operators of the daemon user. File previews follow that authority: a preview request may read any regular file the daemon process can read, while keeping path normalization and symlink checks in the daemon file service. Workspace-relative paths remain a UI convenience, not a security boundary.
 
diff --git a/docs/ad-hoc-daemon-testing.md b/docs/ad-hoc-daemon-testing.md
index 87176d24b4..c12f003df9 100644
--- a/docs/ad-hoc-daemon-testing.md
+++ b/docs/ad-hoc-daemon-testing.md
@@ -51,7 +51,7 @@ const client = new DaemonClient({
   appVersion: "0.1.70", // see gotcha #1
 });
 await client.connect();
-await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
+await client.fetchAgents({ subscribe: {} });
 
 // ... do your testing ...
 
@@ -81,7 +81,7 @@ const client = new DaemonClient({
   appVersion: "0.1.70",
 });
 await client.connect();
-await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
+await client.fetchAgents({ subscribe: {} });
 
 // ... test ...
 
diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index d9f9710599..ee763aa1f9 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -21,6 +21,10 @@ the agent runs through `ensureAgentLoaded()`, which resumes the durable provider
 same Paseo agent ID. Provider history is not appended again when the canonical timeline is already
 primed.
 
+Reload releases the old runtime before resuming its durable session: an idle provider process can
+still own an exclusive writer. A close failure retains that runtime for cleanup and blocks the
+replacement. Once closure succeeds, a failed resume leaves the durable agent closed and retryable.
+
 Idle agents remain resident indefinitely. Runtime closure happens only through an explicit lifecycle
 action such as archive, replacement, reload, workspace teardown, or daemon shutdown.
 
@@ -30,8 +34,8 @@ workflows all live in the CLI process, and the completion notification that woul
 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.
+Claude and OMP report exits between turns. OMP relaunches from its session file on the next prompt;
+the unfinished turn is lost.
 
 ### Cancellation
 
@@ -65,11 +69,11 @@ the marker. Closing a tab sets that client's label to `false`. Any `true` client
 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.
+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 reuses that workspace unless a new workspace is explicitly requested.
 
 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.
+`notifyOnFinish` defaults to `true` for agent-scoped creation and 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.
@@ -80,6 +84,32 @@ Some providers can create their own child sessions inside one provider runtime.
 
 The provider still owns the underlying runtime. Paseo keeps an agent record so the child can be opened, tracked, archived, and cascaded with the parent, but prompts and history hydration route through the provider adapter for that native child handle.
 
+## Background workspaces
+
+`workspace.background` controls discovery only. Background workspaces contain ordinary durable
+agents and terminals: provider history, plugin hooks, parentage, archive, and restart recovery
+keep their normal behavior. Visibility is creation-only; selecting an existing workspace cannot
+change it. New workspaces default to false, inherit the caller workspace's value when an agent
+creates one without an override, and accept explicit true or false.
+
+The daemon derives agent discovery from workspace ownership. Default workspace and agent lists,
+including History requests, exclude background work; `filter.includeBackground` includes it.
+Exact-ID operations bypass discovery filtering. The app replicates both kinds and filters only
+its sidebar with **Show background**, so direct navigation and restored tabs remain available.
+
+Sequenced directories keep complete canonical collections. A filtered read must never replace
+those collections with its subset. Inclusive and default observations have distinct cursor
+scopes, so changing scope requires a fresh snapshot rather than reusing an incomplete cache.
+Clients gate creation and inclusive discovery on `features.backgroundWorkspaces`.
+
+### Private daemon helpers
+
+Branch-name and commit-message generators still use private disposable internal runtimes.
+`AgentManager` does not persist them or their provider sessions, excludes them from public
+discovery and plugin hooks, and drops their timelines on archive. An archived helper retains
+its exact-ID result briefly to cover completion before a waiter attaches. This internal
+lifecycle is separate from public workspace visibility and is not a public creation option.
+
 ## Archive
 
 Archive is a **soft delete**: the agent record stays on disk with `archivedAt` set, the runtime is closed, and the agent disappears from active lists. Archive is **global** — it lives on the server and propagates to every connected client.
@@ -105,16 +135,28 @@ archived workspace. History navigation must not infer workspace lifecycle from `
 or mutate either lifecycle. The workspace route asks the daemon for authoritative recovery state;
 only the route's explicit Unarchive or Restore action changes the archived workspace.
 
-History navigation preserves the selected agent as an explicit recovery target. If both that agent
-and its workspace are archived, the workspace recovery action restores the workspace and unarchives
-the selected agent as one user action. Other archived agents in the restored workspace remain
-recoverable from History. Opening one pins its tab and renders the archived-agent callout. Authoritative
-timeline catch-up may load provider history with a runtime-only `history` resume purpose, which must
-leave both Paseo's `archivedAt` and the provider's native archive state unchanged. **Unarchive** remains
-the only transition back to an interactive runtime: it runs the provider's native unarchive hook
-(including Codex `thread/unarchive`) before the normal agent resume and timeline hydration flow. A
-provider session can be archived outside Paseo while its Paseo agent remains active. Interactive
-resume repairs that drift through the provider's native unarchive hook; history resume does not.
+History navigation opens the selected agent without changing either archive state. Workspace
+**Restore** recovers only the workspace; the selected archived agent stays open with its callout.
+The agent's **Unarchive** runs the provider's native unarchive hook before interactive resume and
+history hydration. Other archived agents stay archived.
+
+Opening an agent is a navigation choice, independent of whether its details are cached. The
+layout retains that choice across reload while the panel fetches the agent from the daemon.
+Once the daemon reports the agent active, its tab follows normal archive propagation again.
+An empty active list cannot cancel an explicit History selection. Agent-detail loading does
+not own selection or release the explicit open.
+
+Persisted resume, native restore, and both live and stored-only archive enter the same per-agent
+lifecycle queue. Resume chooses its history or interactive purpose from the durable record after
+entering that queue. Shutdown must finish before the manager releases runtime ownership; a failed
+close retains the runtime for cleanup and blocks replacement through that close operation.
+
+Authoritative timeline catch-up can use a runtime-only `history` resume purpose. For Codex, that
+purpose initializes a temporary app-server, reads the persisted thread and child histories, and
+releases the process before returning. It never loads, resumes, or unarchives a native thread,
+including legacy records whose native archive failed. The retained history session contains only
+the read results. Interactive resume remains responsible for repairing a provider session archived
+outside Paseo while its Paseo agent is active.
 
 Provider session connection owns every process it spawns until the session is registered with
 `AgentManager`. If initialization, persisted-session resume, or initial history hydration fails,
@@ -144,6 +186,17 @@ Workspace status is an aggregate activity signal computed **per `workspaceId`**.
 
 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.
 
+A finished workspace can be marked unread after it has been reviewed. The daemon restores
+`finished` attention on its newest eligible workspace-root agent without sending a new completion
+notification. Opening the workspace clears that attention through the normal focus flow.
+
+Attention is set by the agent finishing or failing and cleared by the client's
+`workspace.clear_attention`, which fires when the user reads the chat. Loading an agent's runtime is
+neither, so resuming carries the stored attention and the stored last-activity time through
+untouched. Forging either makes a background resume look like the user read a workspace and like the
+agent worked in it just now, which rewrites the sidebar timestamp permanently — persisted
+`updatedAt` is what workspace `statusEnteredAt` is re-derived from on the next daemon start.
+
 ## The subagents track
 
 The track is a pill at the foot of an agent's pane (`packages/app/src/subagents/track.tsx`): a count you can read at a glance, and a panel behind it — a popover on wide screens, a sheet on compact ones — holding the rows. It floats over the transcript rather than sitting in a band above the composer, so the timeline scrolls underneath it; `packages/app/src/panels/agent-tracks.tsx` owns that placement, and the pill frame is shared with the task list in `packages/app/src/composer/tracks.tsx`.
@@ -156,9 +209,9 @@ The rows combine two kinds of children:
 parentAgentId === thisAgent.id  AND  !archivedAt
 ```
 
-- **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track.
+- **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.
 
-Clicking either kind opens a workspace tab. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
+Clicking either kind opens a workspace tab. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
 
 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.
 
@@ -170,11 +223,13 @@ Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `ta
 
 - **Not every announced task belongs in the track.** Task subagents announce as `local_agent` and workflows as `local_workflow`; a backgrounded shell announces as `local_bash` with the same `tool_use_id` shape, and ambient housekeeping sets `skip_transcript`. The Claude provider normalizes a workflow to a generic provider-subagent descriptor titled `Workflow`, using Claude's summary as its description and timeline opener. Shared storage, protocol, and UI do not distinguish it from another provider subagent.
 - **A task that was never declared gets no descriptor, by any route.** Filtered tasks still emit `task_notification`s carrying a `tool_use_id`, and still emit frames carrying `parent_tool_use_id`. Attributing either produces a descriptor with no identity and a defaulted `running` status — a nameless row that never finishes. Status, presentation updates, and sidechain frames all route through the declaration table.
-- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `task_updated.patch.is_backgrounded`.
+- **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 `is_backgrounded` on `task_started` (set at spawn; a resumed subagent is always background) or, when moved there later, on `task_updated.patch`.
 - **A resumed task can be announced again with a new `tool_use_id`.** The first Task tool id remains the canonical descriptor and later ids are routing aliases for the same session-scoped task. The resumed prompt is added to that child timeline.
 - **Effort is only reachable through hooks.** It appears nowhere on the message stream at any depth, and the level Paseo requests is not necessarily the level that runs — a model that does not support it is silently downgraded. A hook firing inside a subagent reports the active post-downgrade level next to its `agent_id`, which is the same id `task_started` calls `task_id`.
 - **Backgrounded subagents emit no frames carrying `parent_tool_use_id` at all.** Everything keyed off that field sees nothing for one; they are visible only because the task protocol announces them.
-- **On replay, `<session>/subagents/` holds every descendant, not just this session's children.** `agent-<id>.meta.json` carries `spawnDepth`: `1` is a direct child, `2+` was spawned by another subagent and its `toolUseId` names a Task call made inside its parent's session, which nothing in this transcript can resolve. Replaying those adds rows the live stream never showed, each with no Task card and no recoverable outcome, so they render as running forever. One recorded session showed 10 subagents live and would have replayed 22.
+- **Only `system/init` and `result` bracket a main-session turn.** Background subagents emit neither on the main stream, while their task frames, their own background jobs' `task_notification`, and `rate_limit_event` arrive with no `parent_tool_use_id`, the same shape as main-session work. `session_state_changed` stays `running` for as long as any background subagent lives (Claude Code 2.1.280), so it cannot open a turn; its `idle` can close one.
+- **Nested ownership comes from the launching sidechain, not `spawn_depth` alone.** A sidechain's Agent or Bash tool call records the direct owner of that `tool_use_id`; the following `task_started` inherits it. This routes a grandchild descriptor and child-owned background notifications without relying on labels or flattening them into the managed parent.
+- **On replay, `<session>/subagents/` holds every descendant beside the root.** Resolve the tree one proven generation at a time: the root transcript admits direct children, then each admitted sidechain transcript admits its children by `toolUseId`. `spawnDepth` orders candidates but does not establish ownership. Unresolved sidecars remain excluded as ambient or unrelated work.
 - **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.
diff --git a/docs/agent-stream-performance.md b/docs/agent-stream-performance.md
index 0d2fd30fa6..b31a3fd9ee 100644
--- a/docs/agent-stream-performance.md
+++ b/docs/agent-stream-performance.md
@@ -12,7 +12,8 @@ provider deltas (every provider streams incrementally)
   → recordTimeline: one canonical row per flushed item
   → agent_stream ws message
   → reducer queue (app, one commit per frame) → session store
-  → paced reveal (app, per assistant/reasoning item) → markdown blocks → paint
+  → source-item plugin transforms → native Markdown blocks / tool grouping
+  → paced reveal (app, per displayed item) → paint
 ```
 
 Every provider delivers incremental text, so there is no provider that needs special handling: Claude via `includePartialMessages`, Codex via `agent_message_delta`, ACP agents via `agent_message_chunk`, Pi and OMP via `text_delta`.
@@ -28,6 +29,23 @@ So arrival sets a _target_ and the reveal rate is derived from the backlog inste
 - **The coalescer is leading + trailing.** The first delta after an idle window flushes synchronously; only the rest of the burst waits for the trailing timer. Reverting to trailing-only adds a full window to the first character of every turn. Same shape and the same reason as `TerminalOutputCoalescer`.
 - **The leading flush adds a canonical row, and that is fine.** A burst's first chunk lands as its own timeline row. `mergeAssistantChunks` / `mergeReasoningChunks` in `timeline-projection.ts` join contiguous same-turn rows, and clients read the projected timeline, so history is unaffected. Tests that assert on raw rows have to account for the extra row; tests that assert on what a client sees do not.
 - **The store holds the full text; only the rendered slice is paced.** Copy, selection, the chat outline, and scroll geometry all read the same string the user can see. Pacing the store instead would leave the bottom anchor chasing a content height that is ahead of the reveal.
+- **Markdown blocks belong to presentation, and every assistant message is a block group.**
+  `agent-stream/presentation.ts` splits a message into one display row per Markdown block, the same
+  way whether it arrived streaming or as fetched history. Splitting in the reducer instead would
+  discard paragraph separators and expose fragments to plugin callbacks, which need the whole source
+  text. Live-head work stays cheap by parsing only the growing last block during append, retaining
+  completed blocks by object identity, and caching the split per source item so a tail change does
+  not re-split history. History was once left whole to keep cross-block Markdown context; that gave
+  one message two shapes depending on how it arrived, and message-addressed features only worked on
+  one of them.
+- **A row id is never a message id.** Block rows are `${messageId}:block:${n}` with
+  `blockGroupId = messageId`, including single-block messages, so nothing can come to rely on the two
+  being equal. `getStreamItemMessageId` in `presentation.ts` is the only way to go from a row to its
+  message, and web rows carry it as `data-message-id` alongside `data-history-row-id`. Anything
+  addressing a message — chat find, scroll-to-message, history reveal, the find expansion that lifts
+  the render cap — uses the message id and must expect several rows to answer to it. Row ids stay for
+  React keys, virtualizer measurement, scroll anchors, and per-row caches like assistant image
+  occurrence keys.
 - **First sight of a text is revealed whole.** Only growth is paced. This is what makes history hydration, timeline replay, a virtualized row remounting on scroll, and an already-finished message all render complete on first paint without a special case for each.
 - **Leaving `phase: "streaming"` snaps the reveal.** A completed turn must never be left holding characters. `layoutStream` sets the phase, so anything outside the live head with an active turn is already complete.
 - **The reducer queue commits on a frame, with a timer as the ceiling.** A frame callback never fires in a hidden tab, so a timer races it and wins when nothing is painting — the store has to keep advancing either way.
diff --git a/docs/android.md b/docs/android.md
index b25e775cf0..f04ce945bb 100644
--- a/docs/android.md
+++ b/docs/android.md
@@ -120,6 +120,17 @@ REACT_NATIVE_PACKAGER_HOSTNAME=localhost \
 
 This is the Android counterpart of the iOS local-simulator flow in [development.md](development.md): on iOS the simulator shares the Mac's loopback so `localhost:<port>` works directly; on Android you need `10.0.2.2` or `adb reverse`.
 
+## Inverted timeline selection
+
+Android focus and selection visibility requests must not reposition inverted timelines. The
+`modules/paseo-scroll` package keeps React Native's scroll manager interface and returns zero for
+child-reveal scroll calculations when the vertical scale is inverted. Dragging and explicit scroll
+commands still work; non-inverted scroll views keep Android's default behavior.
+
+Register this package before React Native's core package through its Expo config plugin. Normal
+Android builds use the prebuilt `react-android` library, so patching Java under `node_modules` does
+not change the shipped scroll view. Keep this behavior in the app's compiled native module.
+
 ## F-Droid / source-only Android builds
 
 F-Droid builds should set `PASEO_FDROID_BUILD=1` when running Expo prebuild:
diff --git a/docs/architecture.md b/docs/architecture.md
index 0ed8c46ade..4ed25ba1c4 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -54,6 +54,15 @@ The heart of Paseo. A Node.js process that:
 
 All paths are under `packages/server/src/`.
 
+Desktop and CLI import server capabilities through explicit package subpaths such as
+`@getpaseo/server/daemon-control`, `/configuration`, and `/process`. The root export
+loads daemon bootstrap eagerly, even when a caller only uses a path or process helper.
+Keep process-management and configuration dependencies independent of bootstrap and
+WebSocket message schemas. Shared configuration schemas belong in protocol leaf modules;
+`messages` imports and re-exports them. This prevents every supervising process from
+retaining the daemon's runtime and wire-schema allocations. The server export tests guard
+these dependency trees with tree-shaking disabled to match unbundled production imports.
+
 Project identity is daemon-global rather than session-owned. After registry bootstrap, the daemon's
 project Git observer keeps one non-recursive watch on each lexically equivalent active project root
 and listens only for the root `.git` entry, with a slow rescan as a missed-event fallback. It runs
@@ -94,9 +103,10 @@ facade. App and CLI may import the low-level driver from
 `@getpaseo/client/internal/daemon-client` during migration, while new SDK-shaped
 code imports from `@getpaseo/client`.
 
-`PaseoApi` is the capability-only boundary over workspaces, agents, providers, and config.
+`PaseoApi` is the capability-only boundary over workspaces, agents, terminals, providers, and config.
 `PaseoClient` adds connection lifecycle. App plugin surfaces borrow an API over their selected
-host's client; plugin subprocesses use the same facade over a host-owned IPC transport.
+host's client; plugin subprocesses use the same facade over a host-owned IPC transport. Protocol capability ownership and subscription lifetimes follow
+[the client contract](protocol-compatibility.md#client-capability-ownership).
 
 ### `packages/app` — Mobile + web client (Expo)
 
@@ -144,7 +154,7 @@ traffic. Workspace assignments stay on the workspace directory sequence.
 Commander.js CLI with Docker-style commands. Common agent operations are also exposed at the top level (e.g. `paseo ls`, `paseo run`).
 
 - `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 daemon start/run/stop/restart/status/reload/config/pair/set-password`
 - `paseo terminal ls/create/capture/send-keys/kill`
 - `paseo script ls/start/stop`
 - `paseo schedule create/ls/inspect/update/pause/resume/run-once/logs/delete`
@@ -238,11 +248,22 @@ Server → Client:  status message with payload { status: "server_info",
                     serverId, hostname, version, capabilities?, features }
 ```
 
-There is no dedicated welcome message; the server emits a `status` session message after accepting the hello, then begins streaming. The session stores client capabilities from the hello and rehydrates them on reconnect, so the wire boundary can ask one question: `session.supports(...)`.
+There is no dedicated welcome message; the server emits one initial `status.server_info` after
+accepting hello. Modern clients negotiate `owned_subscriptions` against
+`features.ownedSubscriptions`. Connecting or attaching a local listener creates no application-data
+demand. A list is a snapshot; adding `subscribe: {}` creates an independent server ID. The client
+correlates the initial reply by request ID, then routes updates by subscription ID.
+
+A logical Session can contain several physical sockets. Each socket owns its capabilities,
+subscriptions and ongoing operations; the final JSON/binary send boundary requires that source's
+request or subscription provenance. Domain modules own filtering, bootstrap and resource teardown.
+The shared ownership boundary only tracks source and lifetime. Releasing a subscription acknowledges
+its teardown; reconnect creates new server IDs for surviving client handles. See
+[protocol compatibility](protocol-compatibility.md) for the legacy boundary.
 
 **Top-level WS envelopes** are `hello`, `recording_state`, `ping`/`pong`, and `session` (which wraps the rich union of session messages).
 
-Client liveness checks use the top-level JSON `ping`/`pong` envelope, not a session RPC or RFC6455 control ping. Current clients ping every 10 seconds, beginning one interval after connecting. The first ping claims an application-ownership lease for that physical socket, all later inbound activity renews it, and the daemon forcibly terminates the socket if the lease expires. A legacy or raw socket that never sends an application ping never enters this lease and is not closed for omitting one. Session RPC timeouts are operation failures and must not be treated as proof that the socket is dead.
+Client liveness checks use the top-level JSON `ping`/`pong` envelope, not a session RPC or RFC6455 control ping. Current clients ping every 10 seconds, beginning one interval after connecting. The first ping claims an application-ownership lease for that physical socket, all later inbound activity renews it, and the daemon forcibly terminates the socket if the lease expires. A legacy or raw socket that never sends an application ping never enters this lease and is not closed for omitting one. Session RPC timeouts are operation failures, not proof that the socket is dead. A subscription bootstrap timeout closes its source to clear any unknown server-owned registration; the failed handle is released before other surviving handles reconnect.
 
 Every physical send path enforces an 8 MiB outbound high-water mark, including JSON broadcasts, binary terminal frames, and the encrypted relay adapter's asynchronous queue. This sits above the terminal stream's 4 MiB soft backpressure threshold, leaving room for snapshot catch-up before the hard cutoff. JSON is serialized once per broadcast after sockets already at the limit are removed, then its exact byte length is checked for every remaining socket. A frame that would cross the limit is not sent; that physical socket is forcibly terminated without disturbing other sockets attached to the same logical session. Multiple tabs and simultaneous direct and relay paths may legitimately share a client id.
 
@@ -296,7 +317,7 @@ messages or transfers.
 
 - WebSocket schemas are append-only. Add fields, do not remove fields, and never make optional fields required.
 - New wire enum values must be gated at serialization with `session.supports(CLIENT_CAPS.someCapability)`.
-- `Session` stores client capabilities from the `hello` handshake and rehydrates them on reconnect, so the wire boundary can ask one question: `session.supports(...)`.
+- Capabilities belong to the physical source socket. `session.supports(...)` reads the requesting or observing source at the domain projection boundary; one socket must not borrow a sibling's capabilities.
 
 Example: adding a new enum value
 
@@ -307,6 +328,40 @@ Example: adding a new enum value
 // 4. Gate the new emitted value: session.supports(CLIENT_CAPS.newThing) ? "new_value" : "old_value"
 ```
 
+### Creation ownership
+
+Creation is owned by the daemon across socket lifetimes. A workspace request can include
+its initial agent and prompt. Workspace readiness is published before provider startup;
+the app keeps its existing disk-ready navigation and observes the remaining creation.
+Callbacks do not advance the workflow. Resource reservations in acknowledgement are
+identities, not ready workspace records.
+
+The creation journal (`server/creation/`) owns identity and execution for both legacy and
+modern creation RPCs. Requesting progress never selects a different journal. Existing
+agent receipts are imported at this boundary; message delivery receipts remain separate.
+It keeps cumulative milestones and permanent IDs under an operation kind and idempotency
+key. Reconnect subscribes to that key; retries
+join active work or reuse committed stages. A persisted resource alone cannot prove
+that a provider accepted its initial prompt. Interrupted side effects with no conclusive
+receipt return an unknown outcome instead of being repeated.
+
+Agent registration commits creation. Rejecting the first prompt is a turn error on that
+agent; reporting creation failure leaves an orphaned agent and invites another Create.
+Receipt replay must not resend the prompt.
+
+`packages/client/src/creation/` owns capability selection and legacy orchestration.
+Callers always pass the initial prompt to agent creation. On an older host, the client
+adapts keyed creation to the legacy create/send sequence; it cannot continue that
+sequence after the client process disappears. Explicitly requested IDs or receipts
+that an old host cannot honor produce an unsupported error. Keep these adapters inside
+the client package, as an exception to the default no-fallback feature policy.
+
+Creation executes through the existing Session capabilities. Connection-owned delivery
+controls observation only: detaching a socket or cleaning up its Session does not cancel
+accepted creation. Updates require an explicit subscription and go only to that socket;
+reconnect uses the shared subscription owner. Legacy consumers, including Hub, keep their
+existing response contract.
+
 ## Agent lifecycle
 
 The lifecycle states are defined in `shared/agent-lifecycle.ts`:
@@ -417,12 +472,16 @@ $PASEO_HOME/
 ├── config.json                                 # Daemon config (mutable)
 ├── daemon-keypair.json                         # Daemon identity for relay/E2EE
 ├── push-tokens.json                            # Mobile push tokens
-├── paseo.sock / paseo.pid                      # Local IPC socket and pidfile
+├── paseo.pid                                   # Supervisor identity and published bound endpoint
 └── daemon.log                                  # Daemon trace logs (rotated)
 ```
 
+The supervisor alone publishes its ready worker's endpoint in `paseo.pid`, clears it before respawn, and fails if any worker exits before first readiness. CLI home selection trusts only that live record; config expresses desired state, never an endpoint fallback. POSIX home stop signals the captured supervisor without TCP. Windows graceful stop and ordinary RPCs trust the published endpoint. This metadata is not cryptographic listener ownership: edited endpoints, copied identities, PID reuse, and address takeover races remain outside that guarantee. A stale heartbeat never permits reclaiming a live lock.
+
+Worker restart retains supervisor arguments/environment and rereads the configuration file. Updating a package and observing its new worker version do not refresh the running supervisor code; the launcher owns full-process replacement. See [CLI lifecycle contracts](../public-docs/cli.md#daemon-management).
+
 ## Deployment models
 
 1. **Local daemon** (default): `paseo daemon start` on `127.0.0.1:6767`
-2. **Managed desktop**: Electron app spawns daemon as subprocess, and stops it again on quit so that "restart the app" is a complete reset. Settings > Host > "Keep daemon running after quit" opts out. Only a daemon the desktop started is stopped — a daemon you started yourself with `paseo daemon start` is left alone (`paseo.pid` records `desktopManaged`).
+2. **Managed desktop**: Electron uses the server package’s local-instance lifecycle capability for sanitized launch, published readiness, and captured-PID stop. Only a matching `{pid, startedAt}` from a spawn in the current Desktop session authorizes automatic stop or binary replacement. Preexisting instances, including legacy `desktopManaged` records, are attach-only. Keep-running survivors attach in the next session. Explicit attached Stop requires a confirmation naming the captured home/PID. Ordinary Restart uses the worker RPC on every app platform.
 3. **Remote + relay**: Daemon behind firewall, relay bridges with E2E encryption
diff --git a/docs/browser-capture-harness.md b/docs/browser-capture-harness.md
index 734dda3c45..f760fafa67 100644
--- a/docs/browser-capture-harness.md
+++ b/docs/browser-capture-harness.md
@@ -12,8 +12,7 @@ It validates the compositor behavior that unit tests cannot see:
   by retrying until the frame appears;
 - both viewport `capturePage` and full-page CDP screenshots return real pixels from
   the permanent production parking state;
-- guest background throttling can be disabled once at attach without per-capture
-  renderer coordination;
+- parked guests remain capturable with Chromium background throttling enabled;
 - the real-Electron host-composer sentinel proves guest Enter cannot submit a focused
   host composer;
 - the automation group loads the compiled production keyboard boundary and guest
@@ -44,6 +43,18 @@ Run the shared browser profile fixture with:
 PASEO_CAPTURE_HARNESS_GROUP=browser-profile npm run capture-harness --workspace=@getpaseo/desktop
 ```
 
+On macOS, test native titlebar dragging after scrolling with:
+
+```bash
+PASEO_CAPTURE_HARNESS_GROUP=titlebar-drag npm run capture-harness --workspace=@getpaseo/desktop
+```
+
+This group needs Xcode Command Line Tools and Accessibility permission for the
+terminal running it. It sends real mouse input to its test window and checks
+window movement, including button clicks and a portal over the titlebar. Leave
+the mouse idle during this group. It reads the app's production CSS and writes
+screenshots and window bounds to the output directory.
+
 The browser profile group runs two Electron processes in sequence. It verifies that each
 renderer-side `did-attach` identity maps to the correct main-process guest, that two live
 tabs share cookies and local storage through one persistent session, and that the data is
@@ -73,11 +84,17 @@ The harness writes PNG evidence and `results.json` to:
 packages/desktop/capture-harness/out/
 ```
 
-A passing run prints `PASS` lines for the production P1 attach-off parking state,
+A passing run prints `PASS` lines for the production P1 default-throttling parking state,
 including fresh, settled, 75-second soak, multi-tab, viewport, and full-page checks. The
 PNG sizes may be device-pixel scaled; on a Retina display the 1280x800 logical viewport
 is usually saved as 2560x1600.
 
+The existing `npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop` journey
+verifies that a hidden window stops guest animation, captures fresh viewport pixels,
+and resumes animation after restoring the window. Its artifacts include the screenshot
+and animation measurements. Full-page content correctness remains separately tracked in
+[the full-page repetition bug](https://github.com/getpaseo/paseo/issues/3196).
+
 ## Mechanism
 
 Electron captures copy from the guest web contents' compositor surface. A resident
@@ -96,8 +113,11 @@ plane stays below the overlay plane regardless of body insertion order; menus ke
 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,
-invalidates before each attempt, and retries known first-frame failures within the
-5-second capture budget. Viewport screenshots use `capturePage({ stayHidden:false })`;
-full-page screenshots use the existing CDP path with layout metrics and screenshot clip.
+There is no renderer prep/restore handshake or lifetime background-throttling override.
+Screenshot capture temporarily enables frame production inside the shared serialized queue,
+restores the previous throttling policy on success or failure, and retains a 5-second capture budget.
+The browser tool takes one viewport frame through Electron's frame subscription and releases the
+subscription on completion or cancellation. A resized resident guest can produce fresh pixels
+while `capturePage()` leaves its surface-copy request pending; waiting for animation frames or
+retrying the copy does not repair that state. Full-page screenshots retain the CDP path with layout
+metrics and screenshot clip.
diff --git a/docs/coding-standards.md b/docs/coding-standards.md
index 9d932b32dc..27f9585236 100644
--- a/docs/coding-standards.md
+++ b/docs/coding-standards.md
@@ -92,7 +92,7 @@ For testing rules, see [testing.md](testing.md).
 - Subscribe narrowly: select primitives from stores, pass `status` not `agent`, use `useShallow` / deep-equal when returning derived arrays/objects.
 - Collection rows do not independently subscribe to a high-frequency global store. The collection owner selects structurally shared indexes once, derives a keyed row model with `useMemo`, and passes entries to rows. This keeps retained hidden collections current without running one selector per row on every store update.
 - Equality functions prevent React renders; they do not prevent selector callbacks from running. A selector attached to a hot store must be O(1) when its relevant source references have not changed.
-- Retained native panels use `RetainedPanel`. If an existing gesture/layout wrapper must own visibility, wrap its contents in `RetainedPanelActivity` instead. Keep keyed panel roots in a stable sibling order, include the newly active panel in the same render, centralize subscriptions, and gate genuine effects through `useRetainedPanelActive`. Do not use `Suspense` or render freezing for this on native: those techniques change native tree ownership instead of merely stopping work.
+- Retained native panels use `RetainedPanel`. If an existing gesture/layout wrapper must own visibility, wrap its contents in `RetainedPanelActivity` instead. Keep keyed panel roots in a stable sibling order, include the newly active panel in the same render, centralize subscriptions, and gate genuine effects through `useRetainedPanelActive`. Follow the [native ownership constraints and chat suspension boundary](mobile-panels.md) when stopping hidden rendering.
 - Infinite animations are subscriptions. Start them only while their retained panel is active, and cancel a shared clock when its final active consumer leaves. Synchronized animations use one clock per animation family and feed active instances through local shared values; retained hidden instances stay mounted but unsubscribed. Match state updates to the actual visual cadence; do not run every style worklet at 60 fps when the rendered value changes only a few times per second.
 - Stable references for props that cross `memo` boundaries or feed dependency arrays. Static literals at module scope `as const`; derived with `useMemo`; handlers with `useCallback` only when there's a memoized beneficiary.
 - Use stable ids for `key`, never array index for reorderable/filterable lists.
diff --git a/docs/custom-providers.md b/docs/custom-providers.md
index 90c4dc07c3..efc5fdf24f 100644
--- a/docs/custom-providers.md
+++ b/docs/custom-providers.md
@@ -31,6 +31,35 @@ agent catalog during startup, raise the limit in milliseconds:
 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.
 
+## Provider options
+
+Set provider defaults in `agents.providers.<id>.options`. At agent creation, use
+`providerOptions` on the wire or `config.options` in the SDK. Both are opaque
+`Record<string, unknown>` values: the provider owns validation and application.
+Claude, Codex, and OpenCode reject unknown keys with a key-specific creation error.
+Providers without option handling ignore the record.
+
+The daemon deep-merges the agent's options over the provider defaults at each
+session launch or resume. Plain objects merge recursively; arrays, scalars, and
+`null` replace the base value. Only the agent's own options are persisted, so edits
+to provider defaults apply on the next launch or resume. A profile inherits its
+base provider's options unless it sets its own options record.
+
+```json
+{
+  "agents": {
+    "providers": {
+      "codex": {
+        "options": { "sandbox_mode": "read-only", "approval_policy": "never" }
+      }
+    }
+  }
+}
+```
+
+See the [SDK provider options guide](../public-docs/sdk/provider-options.md) for
+per-agent examples and provider-specific keys.
+
 ---
 
 ## Table of Contents
@@ -391,7 +420,7 @@ Custom OMP profiles should extend `omp`. They inherit the OMP adapter's `rpc-ui`
           "XDG_CONFIG_HOME": "~/.config/omp-work",
           "XDG_STATE_HOME": "~/.local/state/omp-work"
         },
-        "params": {
+        "options": {
           "sessionDir": "~/.local/state/omp-work/omp/agent/sessions",
           "rpcTimeoutMs": 60000,
           "smolModel": "openai/gpt-5-mini",
@@ -404,7 +433,7 @@ Custom OMP profiles should extend `omp`. They inherit the OMP adapter's `rpc-ui`
 }
 ```
 
-`params.sessionDir` is used only for importing sessions that were started outside Paseo. If `command` or XDG env vars move OMP's state directory, set `params.sessionDir` to the resulting OMP JSONL session directory; launching and resuming still go through the configured command. OMP waits 20 seconds for its initial `ready` frame and 60 seconds for later control-plane RPCs by default. `params.rpcTimeoutMs` overrides both deadlines.
+`options.sessionDir` is used only for importing sessions that were started outside Paseo. If `command` or XDG env vars move OMP's state directory, set `options.sessionDir` to the resulting OMP JSONL session directory; launching and resuming still go through the configured command. OMP waits 20 seconds for its initial `ready` frame and 60 seconds for later control-plane RPCs by default. `options.rpcTimeoutMs` overrides both deadlines.
 
 For other providers that keep Pi's `--mode rpc` API but write sessions somewhere else, extend `pi`, replace the command, and provide the JSONL session directory:
 
@@ -416,7 +445,7 @@ For other providers that keep Pi's `--mode rpc` API but write sessions somewhere
         "extends": "pi",
         "label": "My Pi Fork",
         "command": ["my-pi-fork"],
-        "params": {
+        "options": {
           "sessionDir": "~/.my-pi-fork/sessions",
           "rpcTimeoutMs": 60000
         }
@@ -426,7 +455,7 @@ For other providers that keep Pi's `--mode rpc` API but write sessions somewhere
 }
 ```
 
-This session directory is also import-only. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`. `params.rpcTimeoutMs` overrides the 60-second Pi control-plane RPC deadline.
+This session directory is also import-only. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`. `options.rpcTimeoutMs` overrides the 60-second Pi control-plane RPC deadline.
 
 ---
 
@@ -484,7 +513,7 @@ Required fields for ACP providers:
 - `label`
 - `command` — the command to spawn the agent process (must support ACP over stdio)
 
-Paseo tools such as subagent creation come from the shared internal tool catalog. ACP providers receive those tools through the MCP fallback by default because ACP exposes `mcpServers`, not Paseo's native tool catalog. Some ACP adapters cannot create sessions when `mcpServers` is non-empty. Disable injected MCP for those providers with `params.supportsMcpServers: false`:
+Paseo tools such as subagent creation come from the shared internal tool catalog. ACP providers receive those tools through the MCP fallback by default because ACP exposes `mcpServers`, not Paseo's native tool catalog. Some ACP adapters cannot create sessions when `mcpServers` is non-empty. Disable injected MCP for those providers with `options.supportsMcpServers: false`:
 
 ```json
 {
@@ -494,7 +523,7 @@ Paseo tools such as subagent creation come from the shared internal tool catalog
         "extends": "acp",
         "label": "My Agent",
         "command": ["my-agent", "acp"],
-        "params": {
+        "options": {
           "supportsMcpServers": false
         }
       }
@@ -505,7 +534,7 @@ Paseo tools such as subagent creation come from the shared internal tool catalog
 
 ACP agents execute filesystem operations in their own environment by default,
 while terminal operations run through Paseo on the host. To customize which
-operations Paseo handles, configure client capabilities in provider params:
+operations Paseo handles, configure client capabilities in provider options:
 
 ```json
 {
@@ -515,7 +544,7 @@ operations Paseo handles, configure client capabilities in provider params:
         "extends": "acp",
         "label": "Container Agent",
         "command": ["container-agent", "acp"],
-        "params": {
+        "options": {
           "clientCapabilities": {
             "fs": {
               "readTextFile": false,
@@ -684,7 +713,7 @@ Every entry under `agents.providers` accepts these fields:
 | `description`      | `string`                  | No                | Short description shown in the UI                                  |
 | `command`          | `string[]`                | Yes (ACP only)    | Command to spawn the agent process                                 |
 | `env`              | `Record<string, string>`  | No                | Environment variables to set for the agent process                 |
-| `params`           | `Record<string, unknown>` | No                | Provider-specific options such as `supportsMcpServers: false`      |
+| `options`          | `Record<string, unknown>` | No                | Provider-specific options such as `supportsMcpServers: false`      |
 | `models`           | `ProviderProfileModel[]`  | No                | Static model list (overrides runtime discovery)                    |
 | `additionalModels` | `ProviderProfileModel[]`  | No                | Static model additions (merged with runtime discovery or `models`) |
 | `disallowedTools`  | `string[]`                | No                | Tool names to disable for this provider (e.g. `["WebSearch"]`)     |
@@ -714,7 +743,7 @@ Each entry in the `models` array:
 
 ### Claude settings.json model discovery
 
-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`.
+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_FABLE_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. 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.
 
diff --git a/docs/data-model.md b/docs/data-model.md
index 291c58f736..25a214b11c 100644
--- a/docs/data-model.md
+++ b/docs/data-model.md
@@ -48,6 +48,7 @@ $PASEO_HOME/
 ├── server-id                            # Stable daemon identifier (plain text, "srv_<base64url>")
 ├── daemon-keypair.json                  # E2EE keypair for relay (mode 0600)
 ├── paseo.pid                            # Daemon PID lock file
+├── local-credential                     # Per-run local client credential (mode 0600)
 ├── daemon.log                           # Default log file (path configurable)
 ├── agents/
 │   └── {sanitized-cwd}/
@@ -64,8 +65,8 @@ $PASEO_HOME/
 │   └── managed-processes/
 │       └── {recordId}.json              # Helper processes owned by Paseo; reconciled on daemon bootstrap
 ├── plugins/
-│   ├── sources.json                      # Git origin, ref, commit, and managed checkout ownership
-│   └── {pluginId}/{version}/checkout/    # Source checkout for one installed Git commit
+│   ├── sources.json                      # Managed kind and Git acquisition remote
+│   └── {pluginId}/{uuid}/                # Git checkout or npm package/lockfile/dependency tree
 └── push-tokens.json                     # Expo push notification tokens
 ```
 
@@ -181,8 +182,10 @@ Terminal activity contributes to the workspace status bucket **per `workspaceId`
 Single file, validated with `PersistedConfigSchema`.
 
 `agents.skills.selection` is the daemon host's orchestration-skill preference. Missing means
-`{ mode: "all" }`. Installed state is not persisted; the daemon derives it from its three managed
-skill directories and keeps config plus filesystem convergence behind one serialized owner.
+`{ mode: "all" }`. Installed state is not persisted; the daemon derives it from the shared
+`~/.agents/skills` and Claude skill directories and keeps config plus filesystem convergence behind
+one serialized owner. Codex discovers the shared directory. Updates retire unchanged files from
+Paseo-managed copies in `~/.codex/skills`, preserving user edits and untracked files.
 
 `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
@@ -254,11 +257,13 @@ snapshot so a mixed edit can apply its live subset and still name the paths that
 
 All fields are optional with sensible defaults.
 
-Git-managed plugins still appear as directory sources in `config.json`. This keeps the plugin
-runtime and protocol config compatible with directory-only clients. `plugins/sources.json` owns the
-Git-specific origin, tracking ref, installed commit, repository subdirectory, and checkout root.
-Paseo writes it atomically. An update creates and validates a new version directory before changing
-the configured directory path; successful activation removes the old version.
+Managed plugins appear as directory sources in `config.json`; it owns the active path and enabled
+state. `plugins/sources.json` is written atomically and stores only managed kind and the Git acquisition
+remote. Installed revision, package/subdirectory identity and ownership root come from retained
+artifacts and the fixed managed layout; [managed source ownership](plugins.md#managed-source-ownership)
+explains their authority. An update prepares a new directory before replacing the active path and
+removing the previous version. Old record fields are accepted at the store boundary and ignored;
+there is no startup migration or persistent update policy.
 
 ### Profile lists
 
@@ -275,6 +280,45 @@ rather than storing something it cannot describe. That is why the client gates t
 UI on `server_info.features.agentProfiles` instead of letting a save appear to succeed against an
 older daemon.
 
+### Agent provider Paseo tools
+
+`agents.providers` is keyed by the exact provider ID used to launch the agent. The built-in IDs are
+`claude`, `codex`, `copilot`, `opencode`, `pi`, and `omp`. Custom provider IDs are their literal
+configuration keys, such as `my-claude` or `zai`, not the provider named by `extends`.
+
+Each entry may include a Paseo-tool policy:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "my-claude": {
+        "extends": "claude",
+        "label": "My Claude",
+        "paseoTools": {
+          "enabled": true,
+          "disabledTools": ["browser_evaluate"]
+        }
+      }
+    }
+  }
+}
+```
+
+Absent `paseoTools`, or absent fields within it, means Paseo tools are enabled and all tools are
+allowed. `enabled: false` disables the provider's Paseo catalog; `disabledTools` lists exact tool
+IDs to omit. The policy covers the core and browser catalog, not the voice-only `speak` tool.
+Browser tools also require `daemon.browserTools.enabled` and a connected browser host.
+This policy controls the catalog presented to an agent. It is not an authorization boundary for
+agents that can access the host through a shell.
+
+`daemon.mcp.injectIntoAgents` is the global override. When it is `false`, no provider receives
+Paseo tools; otherwise the provider policy applies. Provider and global policy are resolved when a
+session is created, resumed, imported, or reloaded, so configuration changes affect the next
+session rather than an already-running one.
+
+`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.
+
 ### Git process limits
 
 Git process limits are global to one daemon. The start-rate limit defaults to `64` processes per
@@ -449,7 +493,7 @@ Array of workspace records. A workspace is a specific working directory within a
 | `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                                                                   |
+| `baseBranch`                   | `string \| null`                                             | Comparison base retained across archive and restore. Branch-off creation stores the resolved ref; legacy and PR-checkout records hold a bare name. Null means no recorded base.               |
 | `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)                                          |                                                                                                                                                                                               |
@@ -516,6 +560,7 @@ These small files are not validated as full Zod schemas but are persisted under
 | `server-id`           | Plain text, e.g. `srv_<base64url>`                             | Stable per-`$PASEO_HOME` daemon ID. Overridable via `PASEO_SERVER_ID` env.        |
 | `daemon-keypair.json` | `{ v: 2, publicKeyB64, secretKeyB64 }` (libsodium box keypair) | E2EE relay identity. Written with mode `0600`. Regenerated if file is unreadable. |
 | `paseo.pid`           | JSON `{ pid, startedAt, ... }`                                 | PID lock; prevents two daemons sharing one `$PASEO_HOME`.                         |
+| `local-credential`    | 32 random bytes encoded as base64url text                      | Rotated before each listen and deleted on shutdown; mode `0600`.                  |
 | `daemon.log`          | Pino log output                                                | Default location; path/rotation configurable via `log.file` in `config.json`.     |
 
 ---
@@ -535,8 +580,8 @@ Right-sidebar client state splits on whether it is determined by the directory o
 
 The durable client replica uses IndexedDB on browser/Electron and expo-sqlite on native. Rows use the
 compound key `(serverId, kind, id)`; kinds are `agent`, `workspace`, `project`, `timeline`, and
-`checkpoint`. Directory entities have individual rows. Timeline and checkpoint use the singleton id
-and have at most one row per host.
+`checkpoint`. Directory entities have individual rows, timelines use the agent id, and the checkpoint
+uses the singleton id.
 
 The store is a typed persistence boundary. It returns values to directory and timeline owners and
 accepts their explicit commits; it never reads or writes UI state. Reads are scoped to the requested
diff --git a/docs/design.md b/docs/design.md
index b98e06cb72..e21270c85d 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is
 
 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.
 
-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`).
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
 
 Before adding a new component, read `components/ui/`. The primitive usually exists.
 
@@ -120,7 +120,7 @@ Workspace and chat surfaces use the full width — these are working surfaces, n
 
 Sections sit apart. `<SettingsSection>` owns its own bottom margin; the next thing is wrapped in another `<SettingsSection>`. The agent-list `sectionHeading` carries the same `marginTop`/`marginBottom` rhythm (`packages/app/src/components/agent-list.tsx:511-517`). Adding `marginBottom` to a section is wrong.
 
-A section or group explains itself through the `info` prop on `<SettingsSection>` or `<SettingsGroup>` — an info icon beside the header that opens a tooltip (`packages/app/src/screens/settings/settings-info-tip.tsx`). A muted paragraph between the header and the card is wrong: it sits in the section's own gap, so it reads as a second heading rather than as prose belonging to the header. Explanatory copy that describes one row belongs to that row, as `settingsStyles.rowHint` inside the card.
+A section or group explains itself through the `info` prop on `<SettingsSection>` or `<SettingsGroup>` — an info icon beside the header that opens a tooltip (`packages/app/src/components/settings/headings/settings-info-tip.tsx`). A muted paragraph between the header and the card is wrong: it sits in the section's own gap, so it reads as a second heading rather than as prose belonging to the header. Explanatory copy that describes one row belongs to that row, as `settingsStyles.rowHint` inside the card.
 
 Cards inside a section sit closer than sections. Rows inside a card touch — only the divider separates them. The rhythm is page → spacious; section → spacious; card → tight.
 
@@ -193,7 +193,7 @@ Terminology:
 
 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.
 
-Empty states are short noun phrases. Centered, muted, one or two lines. Sessions screen pairs the empty noun with a single ghost button to navigate back (`packages/app/src/screens/sessions-screen.tsx:74-81`); that pairing is the maximum elaboration. Illustrations and CTAs disguised as empty states are wrong.
+Screen-level empty states use a centered, muted noun phrase and at most one ghost button (`packages/app/src/screens/sessions-screen.tsx`). Sidebar list empty states use a quiet bordered card with a left-aligned `sm` title, a muted `sm` description, and `xs` `<Button>` actions. Use `secondary` for the primary action and `outline` for a secondary action (`packages/app/src/components/sidebar/empty-states.tsx`). Keep both forms short and free of illustrations.
 
 Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under the field or inside the card it relates to (`packages/app/src/screens/settings/providers-section.tsx:115-119`).
 
@@ -217,7 +217,7 @@ Changing state must not move the layout. A row that grows when its badge arrives
 
 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`).
 
-Rows that drill into a detail lead with a chevron in the trailing slot (`ChevronRight`, `iconSize.sm`, `foregroundMuted`). The whole row is the `<Pressable>`. Pair-device row (`packages/app/src/screens/settings/host-page.tsx:644-668`), provider row (`packages/app/src/screens/settings/providers-section.tsx:92-132`), project row in the projects list. Chevron means navigation.
+Rows that drill into a detail lead with a chevron in the trailing slot (`ChevronRight`, `iconSize.sm`, `foregroundMuted`). The whole row is the `<Pressable>`. Pair-device row (`packages/app/src/screens/settings/host-page.tsx:644-668`), provider row (`packages/app/src/screens/settings/providers-section.tsx:92-132`), project row in the projects list. A fixed right chevron means navigation. An expandable row uses a trailing right chevron that rotates down when expanded (`SettingsCollapsibleRow`); pressing the row reveals its child rows in place.
 
 Kebab menus (`<DropdownMenu>` with `<MoreVertical size={14} />` trigger) are for actions on the row, not navigation. Trigger style: `padding: 2`, `borderRadius: 4`, hover background `surface2`. Menu position: `align="end"`. Items use `<DropdownMenuItem leading={<Icon size={14} color={foregroundMuted} />} ...>`. Visibility is `isHovered || isTouchPlatform` — hover-revealed on web, always visible on native (`packages/app/src/components/sidebar-workspace-list.tsx:684-770`).
 
diff --git a/docs/development.md b/docs/development.md
index 2d8d86aa79..437b635fec 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -311,6 +311,22 @@ frames non-stop, pinning ProMotion displays at 120Hz forever and draining the
 battery while the app is idle — so do not re-add it. The probe's visibility
 guards already prevent throttling from causing a false stall.
 
+### Desktop Linux hidden-window fallback
+
+On Wayland (seen on ChromeOS Linux) a window created with `show: false` can sit
+forever without a single compositor frame: the renderer loads and runs, but
+`ready-to-show` never fires, so the window is never shown and the app looks like
+it did not start while every process is alive. `showWindowWhenReady`
+(`packages/desktop/src/window/show-when-ready.ts`) shows the main window when
+the document finishes loading if the event has not arrived. The fallback is
+Linux-only; macOS and Windows keep waiting for `ready-to-show`.
+
+Run the startup regression on Linux with an isolated display:
+
+```bash
+xvfb-run -a npm run test:e2e:window-startup --workspace=@getpaseo/desktop
+```
+
 ### Daemon logs
 
 Check `$PASEO_HOME/daemon.log` for daemon logs. The default level is `info`; set
@@ -444,16 +460,17 @@ so the port may already be bound. `portScript` takes precedence when both values
 
 The daemon can optionally serve the browser web client from the same HTTP server. This is disabled by default.
 
-Enable it for a running daemon with:
+Enable it in persistent configuration:
 
 ```bash
-paseo daemon start --web-ui
+paseo daemon config set features.webUi.enabled true
+paseo daemon start
 ```
 
 Or set the environment variable:
 
 ```bash
-PASEO_WEB_UI_ENABLED=true paseo daemon start
+PASEO_WEB_UI_ENABLED=true paseo daemon run
 ```
 
 Or persist it in `config.json`:
@@ -564,7 +581,7 @@ npm run cli -- --host ssh://user@host ls -a
 ```
 
 Set `PASEO_HOST` to use the same target across invocations. An explicit
-`--host` overrides the environment variable.
+selector overrides both environment selectors. With both `PASEO_HOME` and `PASEO_HOST` set, pass an explicit selector. See [CLI target selection](../public-docs/cli.md#select-one-daemon).
 
 In an SSH URI, the URL port is the SSH server port. The remote daemon defaults to `127.0.0.1:6767`; use `?daemonPort=7777` to override it. The transport runs non-interactively through the local OpenSSH client and never installs, starts, or configures the remote daemon. User-facing setup and troubleshooting live in [public-docs/connectivity.md](../public-docs/connectivity.md#ssh).
 
diff --git a/docs/docker.md b/docs/docker.md
index 15e22081bb..058dee929a 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -22,6 +22,8 @@ the web UI. The served app receives a same-origin connection hint and connects
 back to that daemon. Static UI files load without daemon auth; API and
 WebSocket requests still require `PASEO_PASSWORD` when one is configured.
 
+Host-side CLI commands select the container explicitly, for example `paseo project ls --host 127.0.0.1:6767`. Without an endpoint selector the CLI looks for a local home’s supervisor. Container environment settings are deployment overrides; worker restart preserves them. Your container manager owns full supervisor replacement.
+
 ## Quick Start
 
 ```bash
diff --git a/docs/explorer-sidebar.md b/docs/explorer-sidebar.md
index 30d074a151..f1e27ac548 100644
--- a/docs/explorer-sidebar.md
+++ b/docs/explorer-sidebar.md
@@ -15,8 +15,10 @@ fixed-target labels and icons from that registration, filter by host, and never
 panel type for another. Tab moves reject unsupported destinations, and placement resolves only to
 a compatible pane.
 
-Files and Changes are the Explorer defaults and its singleton navigation views. Other compatible
-tabs, including agents, terminals, files, and diffs, can move between Explorer and main panes.
+Files and Changes are the Explorer defaults. Their panel manifests mark them as singletons,
+so a pane’s + menu omits each while that pane already contains it. Closing one makes its menu
+item available again. Other compatible tabs, including agents, terminals, files, and diffs,
+can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
 retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
 
@@ -30,7 +32,10 @@ never read or modify that width.
 `packages/app/src/workspace-tabs/open-supporting-view.ts` owns semantic Changes and pull-request
 opens. Compact and wide native layouts select the matching Explorer tab. Desktop Changes opens
 follow the shared diff preference. Desktop pull requests use their Main panel, On the side, or
-Explorer sidebar setting. Callers request the content and never choose the shell.
+Explorer sidebar setting. Automatic PR discovery follows that preference once per workspace without
+interrupting the user's work. Closing the tab opts that workspace out of future automatic opens,
+even for a different PR; moving or reordering it remains the user's choice.
+Callers request the content and never choose the shell.
 The composer Changes pill is a two-stage desktop action: it first reveals Explorer on Changes, then
 routes later presses to the working diff through the shared diff preference.
 
@@ -38,13 +43,16 @@ The persisted layout still contains the Explorer pane so tabs survive reloads. T
 that pane from the workspace split tree and docks it separately. Persisted identifiers retain the
 literal `"explorer"` pane id and `explorerPaneIdByWorkspace` key for compatibility.
 
-The tab rail has no inline add or close controls. Its context menu opens a New Tab launcher and
-toggles the singleton Files and Changes views. Individual tab menus close instances or move
-compatible tabs to main. Explorer tabs can be reordered, but the dock cannot be split. Selecting
-an Explorer tab does not change workspace focus.
+Explorer uses the shared workspace tab row and ordinary tab context menus. Files and Changes
+hide their close buttons through the panel manifest; close them from the tab context menu.
+Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock and
+omits Agent and terminal profiles. Agents and terminals can still be dragged into Explorer.
+Bulk-close actions apply only to the dock's tabs. Explorer tabs can be reordered and dragged
+between compatible panes, but the dock cannot be split or maximized. Selecting an Explorer tab
+does not change workspace focus.
 
 Cmd+E shows or hides Explorer without changing its selected view. Compact layouts use the combined
-full-screen Explorer overlay for Changes, Files, and pull requests, and close it after a file opens.
+full-screen Explorer overlay for Changes, Files, and pull requests, and close it after a file opens. Compact Changes has no tree rail; its overview is the Jump to file action (`packages/app/src/git/jump-to-file/`), a sheet over the same changed-files tree the desktop rail renders.
 Wide native layouts without pane splits use the same combined content in a resizable inline dock;
 opening a file leaves that dock visible. Both presentations keep their selection in the panel store
 and reuse the layout store's per-workspace Explorer width. They do not create a second Explorer
@@ -56,8 +64,11 @@ lifecycle.
 layout store remembers one ordinary pane per workspace. The first side open creates a full-height
 right split around the workspace root; later side opens reuse it.
 
-Closing the pane or moving away its final tab removes it normally and clears the remembered id. A
-later side open creates a new pane. There is no hidden side-pane lifecycle.
+Removing a pane clears its remembered id; a later side open creates a new pane. The last visible
+ordinary pane stays when its final tab closes and shows the New launcher. An empty workspace does
+not automatically create an agent draft tab; choosing Agent opens one. Explorer cannot replace the
+workspace canvas, even when visible. Restoring a saved layout enforces the same rule while preserving Explorer and saved
+tab content. There is no hidden side-pane lifecycle.
 
 Placement intent still controls existing tabs:
 
diff --git a/docs/expo-router.md b/docs/expo-router.md
index 835798426a..6ff9d14c9c 100644
--- a/docs/expo-router.md
+++ b/docs/expo-router.md
@@ -47,6 +47,15 @@ state.
 This split is deliberate. The host layout must mount first so native local
 dynamic params exist before any nested workspace leaf is selected.
 
+## Error Recovery
+
+The root error boundary lives above `ExpoRoot` in `src/root-app.tsx`. Reload
+remounts the router at `/open-project`, preserving saved workspace layouts and
+the remembered selection. Do not move the boundary inside the root layout:
+catching a render error there unmounts the navigator, so the recovery button
+cannot reliably dispatch a navigation reset. Starting recovery at `/` would
+restore the same workspace and could repeat the crash.
+
 ## App-Wide Route Hops
 
 When app-wide routes such as `/new`, `/settings`, or `/sessions` navigate back
@@ -64,7 +73,10 @@ root host route and pass the nested workspace screen when a host route is
 already mounted, or Expo Router can append extra hidden workspace deck entries.
 The workspace navigation helper inspects the mounted navigation state to make
 that decision; if no host route is mounted yet, it falls back to ordinary route
-navigation.
+navigation. Both paths wait for the root navigation container to be ready. The
+workspace navigation owner keeps the latest pending intent across ref
+re-registration and applies it on the container's `ready` event; routes must not
+add their own readiness retries.
 
 Those hidden entries are not harmless: composer floating panels can measure
 against the wrong deck and disappear offscreen. Follow the
@@ -77,6 +89,9 @@ only use local param fallback during cold mount (`/` or empty pathname), or a
 hidden workspace can overwrite the remembered workspace before Settings or
 History returns.
 
+Plugin settings use the distinct `settings/hosts/[serverId]/plugins/[pluginId]/[screenId]` leaf;
+Back returns to that host's Plugins page.
+
 Settings detail routes are separate siblings on purpose. Keep
 `settings/[section]`, the host routes, the projects index, and project detail as
 distinct route names. `router.dismissTo()` ultimately matches stack entries by
@@ -141,6 +156,14 @@ Do not read the active theme with `useUnistyles()` in a layout to build
 a small `withUnistyles` boundary without subscribing the route tree itself to
 every Unistyles runtime update.
 
+Navigators keep their identity across appearance changes. `ThemedStack` remounts
+each screen's content below the native stack when appearance tokens change; a
+keyed wrapper above a stack remounts the stack itself, and Android crashes when
+that happens while a FragmentManager transaction is running, which settings
+hydration at startup makes likely. A screen that mounts a nested navigator (the
+root stack's `h/[serverId]`) is passed in `nestedNavigatorScreens` so the nested
+stack owns its own screens. See [unistyles.md](unistyles.md).
+
 ## Regression Shape
 
 Pure helper tests are useful but not enough. The failure mode here is native
diff --git a/docs/file-observation.md b/docs/file-observation.md
index f246372f8a..d7d1d8f2f0 100644
--- a/docs/file-observation.md
+++ b/docs/file-observation.md
@@ -10,12 +10,12 @@ Closing an observation must remain safe after its root is renamed or removed. Wo
 
 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.
+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. Classification is admission-controlled to 32 concurrent `fs.stat` calls, since `fs.stat` runs on the libuv threadpool the whole daemon shares. 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. A repository that large is also expensive to poll, so degraded polling doubles its gap from 5 seconds to a 60-second ceiling while the workspace snapshot comes back unchanged, and resets to 5 seconds on the first change. Explicit reads still force a refresh; the ceiling only bounds how long an edit made outside Paseo stays undiscovered.
 
-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.
+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. `nativeTrackedFileCount` and other per-file counters are native-backend diagnostics only — the Linux backend keeps no per-file inventory and reports zero — so a cross-platform assertion belongs on delivered events, not those counters. 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.
+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, newly observed directories, and watcher recovery, never from a healthy-watcher timer. `git ls-files` reports an ignored directory only once it exists, so new directory topology is a trigger in its own right; the refresh is edge-triggered per directory and debounced so a dependency install collapses into a couple of Git runs.
 
 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.
diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index 9ffe03fddf..0d3983c343 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -11,7 +11,7 @@ canonical files and are trying to add or change one.
 | ---------------------------------------- | ----------------------------------------------------------------- |
 | `components/ui/combobox.tsx`             | Anchored picker with search; mobile falls back to bottom sheet    |
 | `components/ui/tooltip.tsx`              | Non-interactive hover/long-press tooltip                          |
-| `components/workspace-hover-card.tsx`    | Desktop-web hover card with measure + computePosition + Portal    |
+| `components/ui/hover-card.tsx`           | Desktop-web hover card the pointer can move onto; Portal          |
 | `components/ui/autocomplete-popover.tsx` | Slash-command autocomplete anchored to the focused composer input |
 
 Each handles a different mix of concerns: combobox owns input focus, tooltip is
@@ -58,7 +58,10 @@ Android touches sailed straight through to the chat scroll view behind it.
 Two escape hatches in the codebase:
 
 - **`Modal`** (combobox, dropdown menu and tooltip on native) — opens a new Android window, so
-  hit-testing starts fresh in that window. Side effect: a Modal opening on
+  hit-testing starts fresh in that window. If its children use gesture-handler,
+  the Modal owner must wrap its content in a full-height `GestureHandlerRootView`:
+  the app's root does not span Android windows. React context alone does not
+  establish a native gesture root. Side effect: a Modal opening on
   Android can detach the IME from an underlying TextInput. Fine for combobox
   (it has its own input) and tooltip (no input). **Not** fine for autocomplete
   (the composer's input must stay focused so the user keeps typing).
@@ -89,7 +92,7 @@ portal can cover them.
 Painting and keyboard ownership use the same relative layer model. Register
 desktop modal, combobox, and dropdown focus scopes with `useWebOverlayRegistration`; the
 highest painted scope alone receives overlay keys, traps focus, and restores
-focus when it closes. Do not add component-local global Escape listeners: two
+focus when it closes. Hover cards register with `manageFocus={false}`: they claim overlay keys without moving or trapping focus on pointer hover. Do not add component-local global Escape listeners: two
 stacked overlays would both close on one keypress.
 
 If an overlay is rendered by a global host rather than beneath its opener in
@@ -134,19 +137,90 @@ The fix for transforms is Gotcha 3. The fix for context is Gotcha 7.
 
 ## Gotcha 3 — Keyboard layout and portal anchors
 
-Move the chat surface with worklet-driven bottom padding from
-`KeyboardShiftProvider`. Padding keeps the stream, composer, visual position,
-and native hit testing in the same layout. Do not translate the stream and
-composer independently.
+`composer/dock` owns the stationary viewport, bottom-anchored surface, composer
+capacity, and keyboard motion for chat, workspace draft tabs, and New workspace.
+Render `<ComposerDock>{contentAbove}{composer}</ComposerDock>` below the header.
+The optional third child is an overlay that moves with the surface. New workspace
+uses `centered` for its existing desktop/tablet form. Hosts never reserve keyboard
+space or translate the composer themselves. Put the dismiss surface behind content
+as a sibling, with `pointerEvents="box-none"` on its content wrapper. A Pressable
+ancestor takes the JS responder on idle Android Fabric and intercepts the stream's
+MOVE events before its native scroll view reaches touch slop. Streaming can hide
+this failure by delaying the responder grant. Native scroll views retain their own
+tap-to-dismiss behavior; unclaimed empty-space taps reach the dismiss sibling.
+On iOS, decorative form containers also need `box-none` (and inert titles/spacers
+need `none`); otherwise their empty padding blocks hit testing of that sibling.
+The shared screen header uses the same dismiss surface. Keep the
+header escape available when a capped draft clips all content above it, since
+iPhone has no system keyboard-dismiss button. Child controls keep their touches,
+and the stream keeps its existing flick-to-dismiss gesture.
 
-Do not use the controller's raw keyboard progress for the padding. It can retain
-a nonzero value after the keyboard closes. The shared provider normalizes that
-state and reconciles native animation-end events.
+The dock's private viewport and capacity model are extracted from chat. The
+app-wide `@/keyboard/shift` module owns shared motion for the dock, portals, streams,
+terminal, explorer, and dialogs. Import only its public entry point: the provider,
+shift hooks, shift style, translate view, settled stream inset, and explorer padding
+policy. Its contexts and reconciliation stay private. Keep `KeyboardShiftProvider`
+at its root mount point outside the portal host when changing dock hosts.
 
-`measureInWindow` already includes the dock's current padding layout. When a
-portal opens, snapshot the current shift and apply only the subsequent shift
-delta to its animated `bottom`. Adding the full shift moves the portal twice and
-can place it over the composer controls.
+`KeyboardTranslateView` owns visual keyboard motion inside `@/keyboard/shift`. Android uses the
+controller's Reanimated signal. iOS uses its native-driver `Animated.event`
+signal because the stock iOS Reanimated value changes at move start, while
+writing a replacement Reanimated value every frame interrupts UIKit's hide
+animation. Keep this platform choice inside the keyboard module's private platform-specific translate files.
+
+`ComposerDock` always keeps the surface at full height and wraps it in
+`KeyboardTranslateView`. The panel root clips it at the header edge, so rows
+slide under the header on open and out from under it on close. Do not swap the
+dock to keyboard padding at rest. Changing its height creates either a blank
+band or a paused transition when the inverted list updates its viewport.
+
+Do not animate a layout prop through the keyboard transition. On Android
+Fabric, each animated layout update clones the shadow tree and runs Yoga over
+the dock subtree. This measured about 10 ms per frame on the emulator and the
+mounted layouts arrived in bursts every 2–4 frames. A transform does not dirty
+layout. Preserve the translated dock's history scroll range with a far-end
+content inset on the inverted stream list. Update that inset only when keyboard
+motion settles; never drive it per frame.
+
+The translated dock's height is not the composer's available height. Bound the
+composer against the stationary space below the header inside
+`composer/dock`, including its controls and attachments. Reserve the
+keyboard destination at move start on the UI thread. Waiting for a settled JS
+update lets a long draft disappear behind the header during opening. This is a
+boundary-time layout change, not an animated layout prop. Keep the input's
+native intrinsic sizing and internal scrolling. Keep the editing input's
+`defaultValue` current on every edit: Fabric re-measures the Android input from
+the JS text whenever its frame changed, so a stale prop inflates or collapses
+the input (see `packages/app/src/components/ui/text-input/text-input.native.tsx`).
+
+Closing the keyboard moves the composer; it does not enlarge its capacity. The
+viewport keeps the last keyboard reservation until the next opening replaces
+it, so a capped draft keeps one height through every keyboard transition
+instead of expanding on close and shrinking again on open.
+
+Keep setup fields out of the composer's shrink chain. New workspace supplies its
+setup fields as the first dock child so they move up under the header as the draft
+grows. Putting the fields and composer in one bounded, shrinkable column made
+Yoga split the shortage between them: rows vanished behind the composer while
+the input lost lines at the same time. Keep that separation inside the dock,
+shared by every phone host. The centered tablet form caps the complete block
+for header clearance, but reserves the composer's own capped height before
+shrinking the setup scroll view. The form must not take editing space from the
+composer.
+
+Move the stream and composer together through `ComposerDock`. Do not translate
+them independently.
+
+`KeyboardShiftProvider` owns the normalized shift used for settled insets and
+portal geometry, plus the `isMoving` worklet value. It reconciles native
+animation-end events because the controller can retain a nonzero value after
+the keyboard closes.
+
+Measure portal anchors while the dock is at rest. If a popover opens during
+motion, re-measure when `isMoving` settles. `measureInWindow` includes the
+dock's current layout and transform. Snapshot the shift at measurement time and
+apply only the subsequent shift delta to the animated `bottom`. Adding the full
+shift moves the portal twice and can place it over the composer controls.
 
 The provider also reconciles iOS from the controller's native `onEnd` event.
 The controller's stock iOS shared values update at move start and during an
@@ -155,10 +229,6 @@ leave the last height/progress pair stuck in either the open or closed state.
 Keep that terminal reconciliation on the UI thread; a later focus or blur must
 not be required to repair the offset.
 
-Re-measure on `Keyboard.addListener('keyboardDidShow'|'keyboardDidHide')` only
-to refresh the snapshot if the keyboard was mid-transition when the popover
-opened.
-
 ## Gotcha 4 — Host-relative positioning before platform offsets
 
 The generic anchored-overlay rule is:
@@ -232,6 +302,22 @@ 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.
 
+All sheets use the app-wide Gorhom modal provider through `IsolatedBottomSheetModal`. This
+includes native centered dialogs: separate React Native Modals cannot present a root-owned
+sibling dialog over an existing iOS presenter.
+
+The wrapper must give Gorhom an object ref. Gorhom accepts a callback ref at the React boundary
+but stores it in the modal queue and later reads `.current`; provider dismissal, replacement,
+and restoration then silently do nothing. Callers may use callback refs on the wrapper, which
+forwards commands to the current Gorhom handle.
+
+Request a backdrop with `backdropOpacity`; do not install a caller-owned backdrop. On web,
+Gorhom's default backdrop closes its own sheet, even when another modal is above it. Its animated
+pointer-event changes can expose a lower backdrop during a transition. The shared web backdrop
+keeps its press target until portal teardown and asks the provider to dismiss the top modal.
+Gorhom's presentation queue remains the authority; backdrop mount order is irrelevant. Native
+retains Gorhom's gesture backdrop and the same push/replace presentation semantics.
+
 ## Gotcha 7 — A sheet cannot read context from its call site
 
 React cannot copy contexts reflectively, so the only way across the teleport in
diff --git a/docs/forms.md b/docs/forms.md
index cbb1c2d951..073dde368f 100644
--- a/docs/forms.md
+++ b/docs/forms.md
@@ -78,6 +78,14 @@ complete`), keyed off the opened snapshot's serverId. Waiting for data is a
   timezone) once — never in a preview line AND a helper line.
 - `useUnistyles` is banned (see docs/unistyles.md); lint enforces.
 
+## Settings rows
+
+Use the named components from `@/components/settings` for settings cards and controls.
+`SettingsCard` owns row separators; `SettingsRow` accepts custom content. Heading-only screens
+can import `SettingsGroup` and `SettingsSection` directly from their modules in
+`@/components/settings/headings/`.
+The plugin UI entry exposes the same components; keep them independent of storage and routing.
+
 ## Data gating
 
 Aggregate hooks return a discriminated load state:
diff --git a/docs/glossary.md b/docs/glossary.md
index c542c32974..3ed97d1fc3 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -19,7 +19,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **MR** — GitLab merge request. UI label for GitLab change requests only; do not use MR for GitHub/Gitea/Forgejo.
 - **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. User-facing creation treats it as the `worktree` workspace isolation choice. Code and `paseo.json` retain worktree terminology for git lifecycle implementation. Forbidden: "Checkout" as a product synonym.
 - **Repository / Remote** — Internal Git observations. They may produce mutable kind, branch, and project-grouping metadata but never the host-local project ID, root, display name, or workspace membership. No UI label.
-- **Sidebar items** — The top-level rows at the head of the app sidebar: New workspace, History, Search, Schedules, and every plugin sidebar contribution. Order and visibility are one per-device preference (`AppSettings.sidebarNavItems`); all of them may be off. UI: the "Sidebar" section on the Appearance settings page. Code: `packages/app/src/sidebar-nav/model.ts` resolves the list, and both the sidebar (`components/sidebar/sidebar-nav-rows.tsx`) and the settings section (`screens/settings/appearance/sidebar-nav-section.tsx`) read it through `useSidebarNavItems`. Never hardcode one of these rows or add a second place that decides which ones show. Don't confuse with **Explorer sidebar**.
+- **Sidebar items** — The configurable entries of the app sidebar, in two sections. Header: the rows at the head of the sidebar — New workspace, History, Search, Schedules, and plugin header items. Footer: the full-width rows between Add project and the footer icon row — Usage and plugin footer items. Add project and the icon row (Hosts, Help and support, Settings) are fixed and are not sidebar items. A plugin item may render several rows, such as one per bot; it is still one item that moves and hides as a block. Each section's order and visibility is one per-device preference (`AppSettings.sidebarNavItems`, `AppSettings.sidebarFooterItems`); every item may be off. UI: the Header and Footer cards on the Sidebar settings page. Code: `packages/app/src/sidebar-nav/model.ts` resolves a section, and the sidebar (`components/sidebar/sidebar-nav-rows.tsx`, the footer in `components/left-sidebar.tsx`) and the settings page (`screens/settings/sidebar/sidebar-nav-section.tsx`) read it through `useSidebarNavItems(section)`. Never hardcode one of these entries or add a second place that decides which ones show. Don't confuse with **Explorer sidebar**.
 - **Explorer sidebar** — The dedicated navigation dock containing the Files and Changes trees. UI: "Explorer sidebar". Code: `packages/app/src/workspace-tabs/explorer-sidebar.ts`; persisted pane identifiers retain the `explorer` spelling. See [explorer-sidebar.md](explorer-sidebar.md).
 - **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
@@ -31,6 +31,10 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **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`).
+- **Usage source** — Plugin registration that discovers accounts and fetches plan usage. Code: `UsageSourceRegistration` (`packages/plugin/src/server/usage.ts`).
+- **Report ID** — Stable daemon-composed identity for one source account: `<sourceId>:<accountKey>`. The source owns the account key; clients treat the whole ID as opaque. Code: `UsageReportEntry.id` (`packages/protocol/src/messages.ts`).
+- **Usage report** — A source's normalized usage for one account, including status and optional windows, balances, and details. Its entry carries the Report ID, account label, and fetch time. Each report renders as one card in the Usage modal, in host Settings, and in an agent's context window details (a hover card on desktop web, a tooltip on native wide screens, a sheet on compact ones), which show only the account that agent runs under, without pins. The hover card and the sheet have Refresh; the native tooltip takes no presses. Code: `UsageReport` (`packages/plugin/src/server/usage.ts`), `UsageCard` (`packages/app/src/usage/card.tsx`), `AgentUsage` (`packages/app/src/usage/agent-usage.tsx`).
+- **Usage (sidebar item)** — The sidebar footer item showing each pinned window's source icon and percent, hidden while no pinned window has data (the footer's Usage icon remains available); both entry points open the Usage modal over the current screen: a dialog on wide layouts, a bottom sheet on compact ones. Usage has no route of its own. Off until the user turns on **Summary in sidebar** (Usage Settings) or the Usage row in Settings > Sidebar; window rows pin only while it is on, and saved pins come back when it is turned on again. A pin is `{ sourceId, windowId }` and shows once per account of that source. Pins and the used/remaining choice are one per-device preference (`AppSettings.usage`) that every usage surface follows. It reads the active workspace's host, else the first connected host with usage sources. Code: `packages/app/src/usage/sidebar-item.tsx`, `usage/usage-modal.tsx`, `usage/pinned.ts`, `usage/preferences.ts`.
 - **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`).
diff --git a/docs/hover.md b/docs/hover.md
index 46f16af578..fe8b539edc 100644
--- a/docs/hover.md
+++ b/docs/hover.md
@@ -135,7 +135,7 @@ Heuristic: if your hover state is going to be `useState`'d and read by anything
 
 Sometimes the revealed content can't live inside the trigger — a hover card portals into a different layer, a tooltip floats above other content, a popover renders into a `Portal`. There's a real visual gap the user has to cross with the cursor.
 
-For this case, use `useHoverSafeZone` (`packages/app/src/hooks/use-hover-safe-zone.ts`). It computes a rectangular "bridge" between the trigger and the content; while the pointer is inside trigger, content, or the bridge, the card stays open. A short grace timer absorbs jitter at the edges. The canonical caller is `packages/app/src/components/workspace-hover-card.tsx`.
+For a card whose content the user can point at or press, use `HoverCard` (`packages/app/src/components/ui/hover-card.tsx`). It is built on `useHoverSafeZone` (`packages/app/src/hooks/use-hover-safe-zone.ts`), which computes a rectangular "bridge" across the gap between the trigger and the content, whether the card sits beside, above, or below the trigger. While the pointer is inside trigger, content, or the bridge, the card stays open. A short grace timer absorbs jitter at the edges. `Tooltip` takes no pointer events and closes as soon as the pointer leaves the trigger. If the trigger has no focusable child, give `HoverCardTrigger` `focusable` and an accessible label so keyboard users can open the same content.
 
 Don't roll your own. The math is annoying, the edge cases (pointer leaves window, drag in progress, content unmounts) are subtle, and we already paid for the hook.
 
@@ -150,5 +150,5 @@ Before opening a PR that touches hover:
 - [ ] 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.
+- [ ] If the revealed content sits in a separate layer (portal, floating panel) and the user can point at it, it is a `HoverCard`.
 - [ ] 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.
diff --git a/docs/hub.md b/docs/hub.md
index e1686a873d..b4df317e76 100644
--- a/docs/hub.md
+++ b/docs/hub.md
@@ -4,7 +4,7 @@ Paseo Hub is an explicit opt-in connection from one Paseo daemon to one Hub. Run
 not register it with a Hub. The relationship begins only when a user runs
 `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`. Interactive login optionally connects the local daemon, then points to the Hub UI for trigger configuration; it does not scaffold or deploy configuration. `paseo hub init` remains the explicit triggers-as-code scaffold. `paseo hub export [directory]` writes the active organization's current triggers as one self-contained YAML file per trigger, using the active login unless another Hub or API key is selected. 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.
+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`. Interactive login optionally connects the local daemon, then points to the Hub UI for trigger configuration; it does not scaffold or deploy configuration. `paseo hub init` remains the explicit triggers-as-code scaffold: it writes one self-contained organization trigger under `.paseo/triggers/`, validates it through the trigger API, and optionally installs it. `paseo hub deploy` validates and installs every trigger in that directory; passing `--project` keeps deploying the legacy project bundle instead. `paseo hub export [directory]` writes the active organization's current triggers in the same layout, using the active login unless another Hub or API key is selected. 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
 
@@ -25,69 +25,55 @@ during interactive login or later with `paseo hub permissions grant hub.execute`
 created before this split migrate their legacy execution scope to `hub.execute`. Hub sessions cannot
 manage their own relationship or permissions.
 
-## Session grants and execution ownership
+## Session grants and agent operations
 
-Trusted clients and the Hub use the same `Session` implementation. The connection boundary supplies
-semantic permissions: trusted clients receive the owner permission set, while an enrolled Hub
-connection receives its persisted permissions. Legacy relationship files carrying
-`hub.execution.*` migrate once to `hub.execute` at the persistence boundary. A denied request returns
-the ordinary `rpc_error` shape. See [permissions.md](permissions.md).
+Hub uses the same authenticated, resumable Session protocol as other clients. Its persisted
+`hub.execute` permission authorizes ordinary agent creation, workspace titling, messaging,
+cancellation, archival, agent/workspace observation, timeline subscriptions, and workspace recovery. This authority is
+daemon-wide; it is not limited to agents created by that Hub. Daemon configuration, terminals,
+browser control, and permission management still require their own permissions. See
+[permissions.md](permissions.md).
 
-The Hub connection still has a narrow lifecycle boundary: it has no trusted-client hello/resume,
-browser, binary, retained-session, or broadcast state. Its outbound execution events include only
-agents owned by that daemon identity, so unrelated local agents remain outside the Hub surface.
+Creating an agent may create a directory workspace. The same `hub.execute` session can title that
+workspace through `workspace.title.set.request` without `workspace.manage`.
 
-Each Hub create carries an execution ID. The daemon stores that ID with the agent's relationship
-owner before acknowledging creation. Duplicate or replayed creates for the same daemon and
-execution resolve to the same durable agent. After a lost response, reconnect, or daemon restart,
-the Hub retries `hub.execution.agent.create.request` with the same execution ID. The idempotent
-response returns the existing agent and its current state; there is no separate reconciliation RPC.
-Transient stream frames are not durably replayed.
+Clients using this contract check `server_info.features.hubAgentRpc` and
+`server_info.features.agentRequestReceipts` once. An older host must be upgraded; do not silently
+fall back to creating a fresh agent when continuation was requested.
 
-Daemon restart preserves the Hub relationship and owned execution identity, but interrupts any
-active turn. The daemon persists that agent as `closed`; an idempotent create retry returns the same
-daemon, execution, and agent identity with that terminal state. Paseo never stores or automatically
-replays the original prompt. A duplicate create returns the existing agent without starting another
-turn.
+Hub owns conversation keys, trigger policy, execution records, and the mapping to workspace/agent
+IDs. None of these routing concepts are part of the generic daemon RPCs. Creation accepts ordinary
+provider configuration, exact MCP tool policy, environment, and workspace/worktree selection.
+Private session configuration is persisted for recovery and is not exposed in agent snapshots.
+Provider controls remain provider-native; see [providers.md](providers.md).
 
-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.
+`create_agent_request.idempotencyKey` identifies one creation operation. With a key, omit
+`initialPrompt`, persist the returned agent/workspace identity, then deliver the prompt using
+`send_agent_message_request` with a stable `messageId`. Request IDs correlate individual attempts;
+creation keys and message IDs identify the operation across attempts. A creation key is daemon-wide;
+a message ID is scoped to its agent. Reusing either with different arguments is a conflict.
+`workspace.create.request.idempotencyKey` provides the same creation guarantee for directory and
+worktree workspaces; check `server_info.features.workspaceRequestReceipts` before using it.
+Workspace creation keys and agent creation keys have separate namespaces. The app keeps these keys
+for the lifetime of a draft and reuses the first message ID after failures.
 
-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.
+The daemon journals the assigned agent ID before creation. Concurrent retries share one operation,
+and a retry after a lost acknowledgement or restart returns the durable agent without creating a
+workspace or starting a turn. Deleting that agent does not make its old creation key reusable.
+Confirmed message delivery is also journaled, so retrying its message ID does not submit it again.
+An unfinished delivery after restart reports `agent_request_outcome_unknown`: a provider can have
+accepted a prompt before the daemon recorded success, so automatic resubmission could duplicate
+work. Inspect the agent before choosing a new message ID. Receipts contain identity and request
+hashes, never prompts, environment values, or credentials.
 
-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.
+Before messaging an archived workspace, call `workspace.recovery.inspect.request`, then
+`workspace.recovery.restore.request` and await success. The native message handler unarchives the
+agent and loads its persisted provider session. `activeTurnBehavior: "steer"` uses the provider's
+native steering behavior, including Paseo's existing behavior when that provider cannot steer.
+Execution completion and arrival-specific output authority remain Hub responsibilities.
 
-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
-relationship plus that execution ID; callers cannot supply an agent ID or workspace path. Both
-actions are idempotent and continue to resolve from stored ownership after daemon restart.
-If no execution exists for that authenticated daemon and execution ID, interrupt and archive return
-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 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.
+The older `hub.execution.*` RPCs remain accepted for existing clients. Their execution ownership
+and create deduplication behavior are unchanged; new continuation work uses the ordinary RPCs.
 
 ## Disconnect and revocation
 
diff --git a/docs/menus.md b/docs/menus.md
index 3ac9b9fb60..50434b9e9d 100644
--- a/docs/menus.md
+++ b/docs/menus.md
@@ -179,6 +179,10 @@ its own.
 - **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.
+- **Animate only once placed.** The same snapshot carries top/left, and Reanimated writes it back
+  750ms after mount. `AnchoredSurface` remounts the surface when its position resolves so the
+  entering animation never ends at the off-screen measuring position; on a slow machine that
+  write moved the open menu back off-screen.
 - **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
@@ -187,7 +191,13 @@ its own.
   [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.
+- **Sheet stacking and backdrop dismissal belong to `IsolatedBottomSheetModal`.** Menus only
+  request a backdrop opacity. See [floating-panels.md](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth).
+- **Retained panels own visibility.** The shared menu surface unmounts when its panel becomes
+  inactive. An async action can navigate before its menu closes; a hidden panel must not leave a
+  portal backdrop blocking the destination. On web the chat suspends one commit after it goes
+  inactive, and that inactive commit is where the surface unmounts.
+- Anchoring, flipping, and edge clamping live in `components/ui/anchor.ts`, shared with the hover
+  card, 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).
diff --git a/docs/mobile-panels.md b/docs/mobile-panels.md
index 447b7108e4..6bd528e3e8 100644
--- a/docs/mobile-panels.md
+++ b/docs/mobile-panels.md
@@ -32,8 +32,12 @@ The UI worklet owns transient motion:
 
 React publishes the active panel only when the canonical target and the UI-thread position agree at
 the final anchor. Retained content never observes gesture previews, progress, or an unsettled target.
-The gesture hosts stay mounted; worklets reveal their retained overlays through native styles while
-React owns pointer events and accessibility.
+The gesture hosts stay mounted. Native worklets own overlay opacity and pointer events while
+React owns settled panel activity and accessibility. Keep hidden native overlays laid out: collapsing
+their scroll ranges makes Android spring retained offsets back to zero during touch cancellation or
+release. Native panel hosts and their dependent draggable lists
+also retain identity across appearance hydration and settings changes. Do not wrap those hosts in
+appearance keys; see [Unistyles appearance boundaries](unistyles.md#runtime-theme-patching-for-user-preferences).
 
 ## Why one position
 
@@ -114,6 +118,8 @@ definition, no longer eligible to begin.
 - Do not suspend retained native subtrees with `Suspense`/`react-freeze`. Suspension changes native
   ownership and can detach descendants. Keep the tree mounted, stabilize its subscriptions/selectors,
   and use the retained-panel active signal to stop timers, polling, and other genuine background work.
+  Hidden chat content is suspended on web only, through `retained-chat-content.web.tsx`, where DOM
+  nodes carry no Fabric ownership; the native file keeps the chat live.
 
 ## Tests
 
diff --git a/docs/mobile-testing.md b/docs/mobile-testing.md
index bd4bf1475b..93fa35aedd 100644
--- a/docs/mobile-testing.md
+++ b/docs/mobile-testing.md
@@ -35,6 +35,65 @@ 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.
 
+For Android keyboard continuity, run the current checkout in the app, open an idle terminal
+with an empty prompt, hide its keyboard, and run:
+
+```bash
+ANDROID_SERIAL=emulator-5554 node packages/app/e2e/mobile/terminal-keyboard/android.mjs
+```
+
+Use a real docked software keyboard. The harness taps Ctrl, Esc, and Enter and checks Android's
+focused input identity and IME hide/show events. It saves screenshots and logs under
+`.dev/agent-device-artifacts/terminal-keyboard-android`. Set `PASEO_TERMINAL_KEYBOARD_APP_ID=sh.paseo`
+to test an installed production build. It never submits a chat message.
+
+`npm run test:e2e:composer-keyboard:android` preserves the chat control and
+keyboard regression flow, then runs the same growth, retained-height, bounds, and
+hold-to-delete and background-tap dismissal scenario on chat, a workspace draft
+tab, and New workspace. It checks empty-content taps and header taps at the cap
+without changing the input height. Each
+host also opens command/file autocomplete, the model selector, the attachment
+menu, and the forge picker from both keyboard states. It then submits a long
+fixture from each host and checks native stream displacement twice: after the
+response settles, and after returning to the bottom and letting the scrollbar
+fade. The image comparison excludes the scrollbar; keyboard dismissal alone
+does not prove that native scrolling receives touches.
+Artifacts are grouped by host under
+`.dev/agent-device-artifacts/composer-keyboard-android`. Configure its daemon,
+Metro, and device through the `PASEO_COMPOSER_KEYBOARD_*` variables in
+`packages/app/e2e/mobile/composer-keyboard/android.sh`. Use a software keyboard;
+the headless input helper cannot verify the
+[visible composer constraints](floating-panels.md#gotcha-3--keyboard-layout-and-portal-anchors).
+
+The Android sidebar scroll-retention flow requires a connected host with enough
+workspaces to overflow the compact sidebar. Pass `TOP_WORKSPACE` and
+`SCROLLED_WORKSPACE` as the `serverId:workspaceId` suffixes of their sidebar row
+IDs. Choose one row near the top and one initially below the viewport. Replace
+the quoted example values below with those IDs. Start in a workspace with the
+sidebar closed and keep the list stable during the run. The same flow checks
+reopening by swipe and button:
+
+```bash
+agent-device replay packages/app/e2e/mobile/agent-device/native-sidebar-scroll-retention.android.yaml \
+  --maestro --platform android --serial emulator-5556 --metro-port 8099 \
+  --env TOP_WORKSPACE='server-id:top-workspace-id' \
+  --env SCROLLED_WORKSPACE='server-id:scrolled-workspace-id'
+```
+
+Pass this checkout's Metro port so the debug app uses the intended bundle.
+For iOS, compare the scrolled row's screen bounds and screenshots across reopening.
+Agent Device's iOS visibility lookup includes offscreen scroll descendants, so
+its `assertNotVisible` cannot establish the starting scroll position for this flow.
+
+On a Play-image emulator, disable Gmail and Calendar first. Their welcome
+screens launch on their own, take input focus, and the run fails with
+`IME did not become visible` while the app still looks focused:
+
+```bash
+adb shell pm disable-user --user 0 com.google.android.gm
+adb shell pm disable-user --user 0 com.google.android.calendar
+```
+
 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
diff --git a/docs/permissions.md b/docs/permissions.md
index 93f013b698..93a70d6fb4 100644
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -27,7 +27,7 @@ A pairing invitation is neither. It is an expiring, single-use exchange that cre
 | `workspace.write`   | Prompts, agent control, files, terminals, git operations, and scripts      |
 | `workspace.manage`  | Create, rename, archive, and remove projects and workspaces                |
 | `automation.manage` | Schedules, heartbeats, and loops                                           |
-| `hub.execute`       | The Hub-owned execution lifecycle                                          |
+| `hub.execute`       | Agent lifecycle, workspace titling, observation, and recovery              |
 
 Agents and terminals use workspace authority. Both can execute code and mutate the workspace, so separate write permissions would claim an isolation boundary the daemon cannot enforce.
 
diff --git a/docs/plugins.md b/docs/plugins.md
index b1051c3a7f..866c74128e 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -1,10 +1,10 @@
 # Plugins
 
 Local plugins contribute daemon RPCs, native app surfaces, workspace panels, Command Center items,
-client slash commands, timeline items, composer pills, app themes, and composer attachment sources.
+client slash commands, timeline items, header buttons, composer pills, app themes, composer attachment sources, and settings screens.
 Paseo executes `index.server.ts` in a subprocess and `index.client.tsx` in every connected app.
 
-> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Plugins are unsandboxed: server code and Git preparation commands run with the daemon user's access on the daemon host, and client contributions run inside Paseo. The repository's dependencies and future updates are part of that trust decision. With `--host`, preparation runs on that remote daemon host.
+> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Plugins are unsandboxed: server code and preparation commands run with the daemon user's access on the daemon host, and client contributions run inside Paseo. The repository's dependencies and future updates are part of that trust decision. With `--host`, preparation runs on that remote daemon host.
 
 ## Install a directory source
 
@@ -36,12 +36,13 @@ The daemon stores directory sources under the root `plugins` object:
 }
 ```
 
-The plugin system is disabled unless `pluginsEnabled` is `true`. Changing that root field is
+Installed plugins are disabled unless `pluginsEnabled` is `true`. Built-in plugins remain active.
+Changing that root field is
 runtime-safe: run `paseo reload` after editing `config.json`. Enabling starts every configured,
 enabled plugin; disabling tears them all down without restarting the daemon. Plugin source entries
 remain lifecycle-owned and do not reload from manual config edits.
 
-The directory contains an identity-only manifest, one optional entry per runtime, runtime-owned
+The directory contains a manifest declaring identity and Paseo requirements, one optional entry per runtime, runtime-owned
 directories, and local typechecking support. At least one entry is required.
 
 ```text
@@ -62,10 +63,15 @@ runtime modules, so consumers do not install these packages when adding the plug
 
 ```json
 {
-  "id": "my-plugin"
+  "id": "my-plugin",
+  "requirements": { "paseo": ">=0.8.0" }
 }
 ```
 
+Declare the supported Paseo range and keep it current when adopting newer APIs. See the
+[requirements contract](../public-docs/plugins/reference.md#requirements), including legacy
+manifests and prerelease matching.
+
 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
@@ -80,27 +86,102 @@ plugin before compiling and starting from disk. A failed reload stays failed; Pa
 the old code. Use `enable`, `disable`, and `remove` to manage one plugin. Removing a directory source
 never deletes it. The global `pluginsEnabled` switch remains available.
 
+## Built-in plugins
+
+Built-in plugins ship from `plugins/<id>/`, with `paseo-plugin.json`, `index.server.ts`,
+`server/`, and optional client entry and icon. Add the plugin ID to `builtinPlugins` in
+`packages/server/src/server/plugins/builtin/index.ts`; the workspace, build copy, and CI
+checks cover that registry. Unlisted directories do not load.
+
+Desktop packaging ships the entire built-in plugin directory as an external resource,
+including declarations. The external esbuild compiler cannot read Electron's `app.asar`
+filesystem, and packaging dependencies excludes `.d.ts` files needed for import validation.
+Built-ins can import only host modules (`@getpaseo/plugin/*`, `zod`) and Node built-ins:
+outside the archive, nothing resolves an npm dependency, and the dist build test cannot catch
+one because it resolves through the repository's `node_modules`.
+The packaged-app smoke check requires every listed built-in to start without relying on
+account credentials.
+
+Built-ins run in process and remain active independently of `pluginsEnabled`. They are
+absent from the installed plugin list and source configuration; their client bundles
+appear in the plugin catalog. Editing one in development requires a daemon restart.
+Directory, Git, and npm installs cannot use a built-in ID.
+
+Provider plugins use separate installation and provider IDs. `muse-provider` registers the
+selectable `muse` provider (Muse Code) and a usage source. Its `status({ launch })` reports
+availability and a diagnostic after the daemon resolves the executable. Configure command,
+environment, or enablement overrides under `agents.providers.muse`. Omit `extends` to keep
+the bundled integration; an entry with `extends` shadows it with a custom provider. See
+[provider contributions](#contribute-a-provider) for the contract and
+[Muse Code](../public-docs/muse-code.md) for setup, per-agent options, and version limitations.
+
+## Install from a registry
+
+`paseo plugin add owner/slug` installs the registry's reviewed artifact by default.
+Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
+Use `git:owner/repository` or a full Git URL for a Git source. Registry installs
+keep the registry URL and ID, so update checks use its approved pin. Explicit version/ref
+selection is unavailable for registry installs; install an explicit source to select your own.
+
+Registry overviews are untrusted author content, even before installation. Render them with
+`@getpaseo/protocol/plugin-overview`: no raw HTML, HTTPS-only links and images, no relative
+URLs, and isolated external links. The website adapter and corpus tests live in
+`packages/website/src/plugins/overview.tsx` and `overview.test.tsx`; the reusable corpus is
+`packages/protocol/tests/fixtures/plugin-overview.json`. A future app overview must share
+this policy. Installed-plugin descriptions in the app remain plain text.
+
+Use `host/owner/slug` for a registry at `https://host`, or set
+`PASEO_PLUGIN_REGISTRY` to change the default base (including a path prefix).
+Private registry credentials live in daemon config under
+`pluginRegistries: { "host": { "authorization": "Bearer token" } }`.
+Restart your daemon after changing these startup settings. Credentials go only to the registry,
+never artifact hosts or redirects. Git/npm use their own host authentication.
+
+The [open registry protocol](https://github.com/getpaseo/plugins/blob/main/PROTOCOL.md)
+owns static hosting, record shapes, pins, and advisory install counts.
+
 ## Install a Git source
 
-GitHub repositories use an `owner/repository` shorthand. Other hosts use a Git URL. An existing
-directory always wins over shorthand resolution.
+GitHub repositories use `git:owner/repository` or `github:owner/repository`. Other hosts use a Git
+URL.
 
 ```bash
-paseo plugin add owner/repository
-paseo plugin add https://gitlab.com/group/repository.git
-paseo plugin add https://git.example.com/owner/repository.git
-paseo plugin add owner/monorepo:plugins/review
-paseo plugin add owner/repository --ref main
-paseo plugin status
-paseo plugin update review
-paseo plugin update --all
+paseo plugin install git:owner/repository
+paseo plugin install https://gitlab.com/group/repository.git
+paseo plugin install git:owner/monorepo:plugins/review
+paseo plugin install github:owner/repository --ref main
 ```
 
-Append `:relative/path` to the source when the plugin lives below the repository root.
+Append `:relative/path` for a plugin below the repository root. `--ref` chooses the initial
+branch, tag, or commit once. Updates of explicit Git sources resolve the remote's default HEAD
+and ask for approval. `ls` reports the installed commit without contacting the remote.
 
-Omitting `--ref` tracks the remote's default branch. A branch passed with `--ref` also tracks;
-tags and commits stay pinned. `status` fetches tracked refs and reports the installed and available
-commits. Removing a Git source deletes Paseo's managed checkout.
+## Managed source ownership
+
+The [public source reference](../public-docs/plugins/reference.md#plugin-sources) owns identifier
+syntax and npm prerequisites; the [publishing guide](../public-docs/plugins/publishing.md) owns distribution. The CLI resolves directory sources before
+calling `installPluginSource`; see the public source reference for CLI and app path semantics.
+Only the daemon reads plugin files and acquires sources.
+
+`ManagedPluginSources` owns acquisition and offline source description. Config stores the active
+directory; sources.json stores managed kind and the Git acquisition remote. The remote is needed
+because authenticated clones may have a rewritten placeholder origin. Fixed owned directory layout
+provides the selected subdirectory, npm package name and cleanup root. Git HEAD and the installed
+npm package.json checked against package-lock.json provide the current revision. Keep the complete
+npm dependency tree and lockfile after staging activation. No install selector governs updates.
+
+The loader sees only the configured directory and never invokes npm. npm lifecycle scripts are
+disabled during acquisition; manifest preparation owns required commands before validation.
+
+List responses retain the closed `source: directory | git` enum. The optional `installation`
+projection carries identity and current revision. Old npm metadata remains accepted but is no longer
+emitted. Installation uses `features.pluginSourceInstallation`; reviewed preview/apply uses
+`features.pluginSourceUpdates`, gated by the SDK and CLI entry. The old immediate-update request
+returns update-client guidance. Basic management remains independently available.
+
+Preview returns exact targets and expected installed identity/root/revision. Apply validates those
+values, acquires the displayed artifact or commit, then rechecks state before activation. No review
+session is stored in the daemon. PluginService owns activation/recovery and independent bulk results.
 
 ### Declare Git preparation
 
@@ -111,6 +192,7 @@ step:
 ```json
 {
   "id": "review",
+  "requirements": { "paseo": ">=0.8.0" },
   "build": [
     ["npm", "ci"],
     ["npm", "run", "build"]
@@ -152,22 +234,46 @@ Do not put any other code modules in the plugin root.
 
 Shared files import contract helpers and types from `@getpaseo/plugin`. Server handler files import
 `PluginHandlerContext` from `@getpaseo/plugin/server`. Client files import Paseo UI from
-`@getpaseo/plugin/react-native`. Its `Icon` resolves a Lucide name using the client's installed icon
+`@getpaseo/plugin/client/react-native`. Its `Icon` resolves a Lucide name using the client's installed icon
 set; an unknown name renders nothing so it cannot break the plugin surface.
 Its controlled modal keeps presentation metadata on `<Modal title="…" icon={…}>` and body UI in
-`<Modal.Content>`.
+`<Modal.Content>`. Body layout, sheet-aware scrolling, and clipboard actions follow the
+[host UI contract](../public-docs/plugins/reference.md#host-ui).
 Plugin UI runs on desktop and mobile across multiple themes: color every `Text` from
 `theme.colors.foreground` or `theme.colors.foregroundMuted`, and size layout from `layout.compact`.
-See `public-docs/plugins/v0.8/reference.md`.
+See `public-docs/plugins/reference.md`.
 
-| Module                          | Use it for                                                                                |
-| ------------------------------- | ----------------------------------------------------------------------------------------- |
-| `@getpaseo/plugin`              | contribution contracts, shared definitions, RPC input/output types, and client data hooks |
-| `@getpaseo/plugin/react-native` | Paseo React Native components and UI hooks                                                |
-| `@getpaseo/plugin/server`       | handler-only types such as `PluginHandlerContext`                                         |
+### SDK import boundaries
 
-The compiler rejects a client import of `server/`, a server import of `client/`, and every `node:`
-import reachable from client code. Shared modules cannot import runtime-owned modules. A relative
+Classify every SDK export before adding it. All client entry points and implementations live under
+`client/`; all server entry points and implementations live under `server/`. The package root is shared code: plain data types,
+Zod schemas, and functions that run in both runtimes. A type-only import is still an architectural
+dependency; shared types must not refer to React components, hooks, Node APIs, or server contexts.
+
+| Entry                                                | Owns                                                                       | May depend on          |
+| ---------------------------------------------------- | -------------------------------------------------------------------------- | ---------------------- |
+| `@getpaseo/plugin`                                   | Shared data, schemas, RPC/settings definitions, runtime-neutral helpers    | Shared code only       |
+| `@getpaseo/plugin/server`                            | Server contexts, lifecycle contracts, and CLI process launch               | Shared and server code |
+| `@getpaseo/plugin/server/provider`, `/server/acp`    | Server provider contracts and adapters                                     | Shared and server code |
+| `@getpaseo/plugin/client`                            | Client contribution contexts, hooks, navigation, and UI contribution types | Shared and client code |
+| `@getpaseo/plugin/client/react-native`, `/client/ui` | Host-provided UI components                                                | Shared and client code |
+| `@getpaseo/plugin/client/host`                       | App-owned rendering integration; not a plugin-author entry                 | Shared and client code |
+
+Server code imports shared helpers from the root and server capabilities from `/server`. Client
+code imports shared helpers from the root and client capabilities from `/client`. Neither runtime
+imports the other. Re-exports follow the same rule; tree shaking does not establish a boundary.
+React, React Native, JSX runtimes, and client hooks must never be reachable from the root or any
+server entry. Node and platform-specific code must never be reachable from the shared root.
+
+The SDK boundary checks and real plugin-subprocess tests enforce these rules. Every SDK change
+must preserve them and update the public reference, migration guide, scaffold, and examples when
+an author-facing import changes. The plugin compiler enforces the same runtime entry rules for
+plugin-authored code. Keep the package export map and host-provided module maps consistent.
+
+The compiler rejects imports across runtime directories or SDK entries, React dependencies in
+server code, and Node imports in client code (including bare names such as `fs`). Shared modules
+cannot import runtime-owned modules. Forbidden imports fail compilation; never replace them with
+empty module stubs. A relative
 import to any other code file in the plugin root is also rejected; move it into `client/`, `server/`,
 or `shared/`. These are compile errors naming the importing file and boundary rule. Top-level React
 Native calls such as `StyleSheet.create` belong in `client/`.
@@ -176,12 +282,12 @@ The scaffold omits `"DOM"` from `tsconfig.json` and does not use `/// <reference
 browser globals are not available across the plugin. Put sanctioned web-only APIs in
 `client/web.ts`, declare only the globals that module uses, gate each export with
 `Platform.OS === "web"`, and provide a native implementation or no-op. See the
-[public plugin reference](../public-docs/plugins/v0.8/reference.md#works-on-mobile) for the complete
+[public plugin reference](../public-docs/plugins/reference.md#works-on-mobile) for the complete
 pattern.
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { createGreeting } from "./server/greeting";
 import { greetRpc } from "./shared/greeting";
 
@@ -193,12 +299,23 @@ export default function contribute(server: PluginServerContext) {
 
 ```tsx
 // index.client.tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
 import { Greeting } from "./client/greeting";
 
+function GreetingItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  return (
+    <SidebarRow
+      icon="MessageCircle"
+      active={currentScreen?.screenId === "main"}
+      onPress={() => openScreen({ screenId: "main" })}
+    />
+  );
+}
+
 export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", Greeting);
-  client.addSidebarItem({ id: "main", title: "Greeting", icon: "MessageCircle", surface: "main" });
+  client.addScreen({ id: "main", title: "Greeting", Component: Greeting });
+  client.addSidebarHeaderItem({ id: "main", title: "Greeting", Component: GreetingItem });
   return () => {};
 }
 ```
@@ -211,18 +328,41 @@ 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.
+The plugin owns the header's text through the screen's `title` (`resolvePluginScreenTitle` in
+`plugins/surface-contribution.ts`). A legacy `addSidebarItem` route (`/sidebar/<id>`) shows the
+item's title and icon instead, as before screens had titles; the `addSurface` alias titles its
+screen with the id. A `/sidebar/<id>` route with no legacy item of that id opens the screen with
+that id, so links saved before a plugin migrated keep working.
+
+Screen params ride in the screen route's query string (`plugins/routes.ts`), not in app state, so
+reload, history, links, and the host switcher keep them without a store. Expo Router merges the
+route's segments (`serverId`, `pluginId`, ...) into the same search params as the query, so param
+keys are stored under a `param.` prefix; plugins never see it and may use any key.
+`openScreen` validates its input once (`parsePluginOpenScreenInput`); code past it trusts the
+params.
 
 RPC contracts validate inputs and outputs in both the app and plugin subprocess. `useRpc` returns a
 typed async function. Use the host-provided `@tanstack/react-query` for request state and caching;
 Paseo gives each plugin installation its own query client.
 
 `usePaseo()` and the handler's `{ paseo }` context expose the same `PaseoApi`: projects,
-workspaces, agents, providers, and daemon config. They do not expose connection lifecycle. A surface borrows the
-selected host's existing connection; switching the screen's host changes both `usePaseo()` and
-`useRpc()` to that host. An offline selected host fails there and never falls through to another
+workspaces, agents, terminals, providers, and daemon config. They do not expose connection lifecycle.
+
+`usePaseo()` is the plugin's one client: `InstalledPlugin.paseo`, created with the installation in
+`packages/app/src/plugins/registry.ts` over the host's existing connection and passed to setup as
+`client.paseo`. Authors release their subscriptions in their own cleanup, and teardown (disable,
+reload, removal, host removal) disposes the client, which ends the rest; nothing is created or
+disposed per mounted surface. See the
+[public example](../public-docs/plugins/reference.md#use-the-paseo-sdk). Switching the screen's host
+changes both `usePaseo()` and `useRpc()` to that host's installation. An offline selected host fails there and never falls through to another
 installation. A server handler owns an IPC-backed daemon session for the life of its subprocess.
 Use plugin RPC for plugin-specific backend behavior that is not a normal Paseo operation.
 
+Host-targeted clients and discovery are owned by `packages/app/src/plugins/hosts`, with per-installation
+bindings supplied by the bundle loader. Bind the imperative getter to that installation; do not
+resolve ownership through a mutable current-plugin global. Keep observation ownership in this module
+and transport ownership in the app host runtime. See the [public host API contract](../public-docs/plugins/reference.md#discover-hosts-and-target-another-host).
+
 Each subprocess gets an exclusively owned `plugin:<id>` session. That identity is reserved from
 normal clients, never resumes another session, and is cleaned immediately on exit without reconnect
 grace. During daemon startup, plugin sessions may connect while application WebSockets remain
@@ -231,7 +371,7 @@ catalog is complete.
 
 When the same plugin contribution exists on multiple hosts, Paseo shows it once in the sidebar and
 adds a host picker to the screen header. The selected host supplies the bundle, RPC transport, and
-query cache. Plugin code cannot address another host.
+query cache. Explicit SDK targets follow the [host API contract](../public-docs/plugins/reference.md#discover-hosts-and-target-another-host).
 
 Workspace panels, Command Center items, and client slash commands are client contributions. The
 daemon transports their compiled bundle without interpreting placement or callbacks. Panel props
@@ -248,60 +388,181 @@ when moved between hosts. Explorer configuration can create workspace-context pa
 existing agent-context instances, but it cannot create an agent panel without an agent-aware command.
 
 Command Center callbacks use the selected host's existing `PaseoApi` for normal Paseo operations.
-They use typed plugin RPC only for plugin-specific backend work. Surface and panel props expose
-optional client-owned agent and workspace navigation; its absence is the compatibility gate for
-older clients. Other navigation remains limited to registered global surfaces and workspace panels.
-Plugins do not receive Expo Router or workspace-layout store access.
+They use typed plugin RPC only for plugin-specific backend work. Surface and panel navigation
+belongs to the app; plugins do not receive Expo Router or workspace-layout store access.
+See the public [navigation fields](../public-docs/plugins/reference.md#screens-and-sidebar-items)
+and [external links and workspace browsers](../public-docs/plugins/reference.md#external-links-and-workspace-browsers)
+for the author-facing contract.
 
-## Contribute composer pills
+## Lifecycle hooks
 
-Add and remove targeted pills from the client entry lifecycle. `index.client.tsx` runs once per
-plugin installation in each connected app and never runs in the daemon subprocess. It can subscribe
-to the client API, call plugin RPCs, and own arbitrary client state without mounting a panel or
-surface.
+Server entries register lifecycle observers with `server.on()` and request transforms with
+`server.before()`. The [public reference](../public-docs/plugins/reference.md#lifecycle-hooks)
+owns callback shapes, ordering, and failure behavior. `plugin-examples/lifecycle-logger` registers all
+eleven hooks; `plugin-examples/lifecycle-actions` demonstrates common automation callbacks.
 
-```tsx
-export function contributeClient(client: PluginClientContext) {
-  const pills = new Map<string, () => void>();
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
-    if (update.kind !== "upsert" || !update.agent.workspaceId) return;
-    const { id: agentId, workspaceId } = update.agent;
-    pills.get(agentId)?.();
-    pills.set(
-      agentId,
-      client.addComposerPill({
-        id: "review",
-        title: "Open review",
-        workspaceId,
-        agentId,
-        Component: ReviewPill,
-        async onPress() {
-          await client.rpc(refreshReview, { agentId });
-          client.openPanel("review", { workspaceId, agentId });
-        },
-      }),
-    );
-  });
-  return () => {
-    unsubscribe();
-    for (const remove of pills.values()) remove();
-  };
+Emit from the operation owner, not a client subscription. Provider history replay must not trigger
+live hooks. Observers must not be awaited inside agent mutations: a callback can send a prompt or
+answer a permission through its own daemon session. Awaiting it there deadlocks that command.
+
+## Contribute a provider
+
+Register a provider from `index.server.ts`. The provider connection is callback-based and owns all
+of its sessions; plugin RPC is not part of the provider data path.
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
+import { createProvider } from "./server/provider";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(createProvider() satisfies ProviderRegistration);
+  return () => {};
 }
 ```
 
-Call `contributeClient(client)` from `index.client.tsx`, or move its body into that entry.
-`addComposerPill` returns an idempotent removal function. A pill appears only in the
-matching workspace and agent track bar alongside Tasks and Subagents. Paseo owns the pressable,
-shared chrome, pending state, error reporting, and placement. The component owns its icon and text;
-the callback is client code by construction. Removing the pill, reloading the plugin, disconnecting
-the host, or unloading the app tears down the contribution.
+Declare `command: ["agent", "serve"]` when your provider launches an executable. The daemon applies
+`agents.providers.<id>.command` and `env`, resolves the executable against the effective PATH, and
+removes parent-session and daemon-control environment variables. `connect({ launch })` receives
+`{ command, args, env }`: an executable path, effective arguments, and the complete sanitized
+environment. Spawn with those values; do not merge the plugin process's environment back in.
+The launch travels as data through the same provider protocol for built-in and subprocess plugins.
+Without a declared command, existing providers keep their connection behavior and receive no launch.
+
+Implement optional `status({ launch })` to check credentials, versions, or other prerequisites using
+that effective launch. Return `{ available: true }` or
+`{ available: false, diagnostic: "Run agent login" }`. The daemon checks executable availability
+before calling status; it exposes your diagnostic through the normal provider diagnostic command.
+A command-backed provider without status is available when its executable resolves. Providers with
+neither command nor status retain connection-based availability.
+
+A same-ID config entry without `extends` overrides the plugin's `enabled`, `command`, `env`, label,
+description, and model configuration through the normal provider registry. `enabled: false` disables
+selection and discovery. An entry with `extends` defines the user's own provider, shadows the plugin,
+and logs a warning. Overrides validate before plugins load; an override for an absent plugin stays
+inactive and logs a warning naming the unmatched ID after built-in and configured plugin startup
+settles (including disabled plugins), then on each installed registry generation.
+Use IDs matching `/^[a-z][a-z0-9-]*$/` for configurable providers. Dots and underscores
+remain valid for plugin registration but cannot be used as config provider IDs.
+
+Provider config changes rebuild the affected registry entry and invalidate its catalogue; the next
+connection receives the new launch without restarting the daemon. Running sessions keep their
+current launch until refreshed, as native providers do.
+
+Implement optional `ProviderRegistration.getCatalogCacheKey(options)` to share equivalent catalogue
+probes. The callback runs in the plugin process before discovery and receives the actual global or
+workspace target plus the resolved `launch` when a command is declared. Return a key covering
+effective configuration and execution environment, or
+`undefined` for target-specific caching. Ignore `force` when choosing identity. Existing providers
+need no change. See [catalogue ownership](providers.md#provider-snapshot-refresh-contract).
+
+`send()` resolves after acceptance. Publish operation completion, prompt disposition, turn state,
+configuration, permissions, persistence, and complete timeline snapshots through `onEvent()`.
+Route messages, structured commands, steering, and command side effects through `session.prompt`.
+Provider settings are toggle/select data that Paseo renders in the composer. Keep private options in
+the opaque `ProviderSessionConfig.providerOptions` object on `session.open`.
+It contains the provider defaults and per-agent overrides merged by the daemon.
+Validate and apply it inside the provider; core does not know your option shape.
+See [provider options](custom-providers.md#provider-options) for configuration and
+merge semantics.
+
+Agent refresh closes the current provider session and opens it again with current configuration and
+persistence. Re-read credentials and provider-owned configuration on `session.open`; consume the
+daemon launch from `connect` and the per-session env and MCP servers from `session.open`. There is
+no provider reload input.
+
+For an ACP command, register `runAcpProvider({ id, label, command })` from
+`@getpaseo/plugin/server/acp`. Its transformer hooks cover narrow vendor differences; do not translate the
+whole provider event stream. The shim uses the resolved launch for every probe and session, overlaying
+only the supplied per-session env for sessions. The direct and ACP examples live in
+`plugin-examples/provider-direct`
+and `plugin-examples/provider-acp-transformer`.
+
+Provider-emitted plugin timeline items use the same renderer registration as transformed and
+daemon-appended plugin items. The direct example includes both sides. The renderer-only
+`plugin-examples/inline-thinking` example shows that timeline presentation remains independent of a
+provider implementation. The public [provider plugin guide](../public-docs/plugins/providers.md)
+owns author workflow, lifecycle, testing, and distribution guidance.
+
+`ProviderRegistration.icon` is a file path relative to the plugin directory, such as `icon.svg`.
+It must resolve inside that directory to a regular SVG file no larger than 64 KiB. The SVG must be
+self-contained: scripts, styles, `foreignObject`, event-handler attributes, JavaScript URLs, and
+external `href` or `xlink:href` references are rejected. Fragment references such as `#mark` are
+allowed. Paseo reads and sanitizes the file when the plugin starts; the string is never an inline
+SVG or URL.
+
+## Usage sources
+
+Register a usage source from `index.server.ts` with `server.registerUsageSource()`. Import `UsageSourceRegistration` and normalization helpers from `@getpaseo/plugin/server/usage`. The plugin owns account discovery, harness labels, and credential-store reads; the daemon owns account grouping and the fetch cache. Agent popovers use only the agent's own login. The host-wide Usage modal falls back across an account's logins; any success shows usage only, and all failures show every login's labeled error and remedy. Follow the [usage source discovery contract](../public-docs/plugins/reference.md#usage-sources). The resolved launch environment crosses into the trusted, unsandboxed plugin subprocess for session discovery. Usage queries never run lifecycle hooks. Inputs are validated in the plugin process and remain daemon-side. `icon` uses the same sanitized SVG file rules as provider icons.
+
+The daemon calls discovery for `usage.list_reports`; the client gates this RPC on `server_info.features.usageSources`. The old `provider.usage.list` RPC maps discovered reports for older clients.
+
+## Contribute sidebar items
+
+Sidebar header and footer items are plugin components, not descriptors. The
+[public reference](../public-docs/plugins/reference.md#sidebar-items) owns the author API. The host
+lives in `packages/app/src/plugins/sidebar-items/`; `packages/app/src/sidebar-nav/model.ts` resolves
+one section's order from built-ins, plugin groups, and the section's preference
+(`sidebarNavItems` or `sidebarFooterItems`).
+
+- The item's `Component` renders directly in the section, with no wrapper, so a fragment or array
+  of rows lays out like separate items while Settings keeps one entry for the block. Footer items
+  are rows between Add project and the footer's icon row. The icon row (Hosts,
+  Help and support, Settings) is fixed app code, not a contribution slot, so the kit has no icon
+  button.
+- `openPopover` opens through the same `PluginPopoverSurface` as header buttons
+  (`plugins/popover.tsx`). Any press inside a `SidebarRow`, including its `trailing` content, moves
+  the menu anchor to that row: a capture-phase `onStartShouldSetResponderCapture` runs before the
+  pressed child claims the touch on native and web, and returns false. Keyboard activation skips
+  the responder system, so the row's own press anchors too. Until a press, the first mounted row
+  holds the anchor. An item that renders no kit component
+  anchors to its section container.
+- `SidebarSeparator` reuses the app's separator and cancels the footer's horizontal padding, so
+  the line runs edge to edge in both sections.
+- `SidebarRow.trailing` sits in a second `Pressable` beside the row's button, since web cannot nest
+  buttons. Its `onPress` is the row's, so a press on non-interactive trailing content presses the
+  row; a button inside it wins its own press because only the innermost pressable responds.
+- A new-API item renders from the current route's host, else the host remembered under
+  `pluginScreensHostKey(pluginId)`, which the screen's host switcher and the item's `openScreen`
+  set. One key per plugin: switching host on any of its screens moves all its items.
+- `addSurface`, `openSurface`, and `addSidebarItem` are undocumented aliases, tagged
+  `COMPAT(pluginSidebarAliases)`. `addSidebarItem` is recorded only in `legacySidebarItems` and
+  groups as a `legacy` sidebar group, which the app draws as its own row: its registered icon, in
+  the sidebar and in Settings > Sidebar, opening `/plugin/<id>/sidebar/<item>` on the host it
+  remembers under its own key. It shares header ids and the `plugin:<pluginId>:<id>` settings key
+  with new-API items.
+
+## Contribute buttons
+
+Header buttons and composer pills share the client-only descriptor and registration lifecycle in
+`packages/app/src/plugins/buttons/`. The [public button reference](../public-docs/plugins/reference.md#header-buttons)
+owns the author API and placement rules. Keep presentation policy in this module so another
+placement can reuse behavior without copying registration or action state.
+
+Native sheets teleport their children. Button surfaces rebuild the installation's SDK, state,
+query, and toast providers inside the surface content, including overflow pages from different
+plugins. Providers only around the trigger do not reach those bodies.
+
+Request observation with `client.paseo.agents.list({ subscribe: {} })` and consume the returned
+`subscription` handle. Plain `list()` and agent/workspace directory `.subscribe(handler)` listeners create no daemon
+demand. Provider and project `subscribe()` calls establish their own demand. On capable daemons, each
+list-and-subscribe call has its own server ID, even for the same query. Older daemons retain
+[shared delivery behavior](protocol-compatibility.md#owned-observations). Handle snapshots
+also run after reconnect; replace your view before applying its subsequent updates. The installation
+owns every observation created through its API and releases them on unload, including setup failure.
+Mounted surfaces and command invocations have shorter API lifetimes.
+
+Keep the client entry synchronous: return its cleanup function immediately and start asynchronous
+work inside it. See the maintained [composer pill example](../plugin-examples/local-plugin/client/main.tsx).
 
 ## Contribute timeline items
 
 Timeline transformers and renderers are client contributions. The daemon's canonical rows and
 built-in projection stay unchanged. The app transforms each source item while building the render
-model, for both fetched history and live events. The input includes `phase: "streaming" | "complete"`.
-Paseo memoizes by source-item reference and derives every replacement ID from the source identity, so
+model, for both fetched history and live events, before native Markdown splitting and Overview
+tool grouping. Assistant callbacks receive the accumulated source text, never display fragments.
+Live assistant messages use `phase: "streaming"`; committing to history makes them `"complete"`.
+Paseo memoizes by source-item reference and phase and derives replacement IDs from source identity, so
 streaming updates preserve mounted component identity.
 
 `query.itemType` selects one public `AgentTimelineItem.type`. The callback owns any detailed
@@ -340,7 +601,7 @@ be rendered intact. The daemon advertises this RPC through
 
 `addSlashCommand` registers an agent- or workspace-context command in the composer. The
 callback runs in the app, receives the trimmed text after the command name as `args`, and receives
-the same `paseo`, `rpc`, `openSurface`, workspace, agent, and `openPanel` capabilities as the matching
+the same `paseo`, `rpc`, `openScreen`, workspace, agent, and `openPanel` capabilities as the matching
 Command Center callback.
 
 ```ts
@@ -368,7 +629,7 @@ credentials and vendor API calls stay in the daemon handler.
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { search } from "./server/issues";
 import { searchIssues } from "./shared/issues";
 
@@ -380,7 +641,7 @@ export default function contribute(server: PluginServerContext) {
 
 ```tsx
 // index.client.tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { issues } from "./shared/issues";
 
 export default function contribute(client: PluginClientContext) {
@@ -394,6 +655,22 @@ on several hosts are not coalesced. The selected snapshot submits as a text atta
 external-resource presentation, so it remains readable if the plugin is removed or an older peer
 drops the optional presentation fields.
 
+## Contribute settings
+
+Register ordinary components with `client.addSettingsScreen` and open them with `openSettings`.
+The host settings shell owns navigation and layout; plugin content must not add another page
+scroll view or header. See the [author contract](../public-docs/plugins/reference.md#settings-screens)
+and `plugin-examples/settings` for the named UI components and persistence API.
+
+Settings storage is scoped to the runtime installation ID, never the source path or manifest ID.
+Its writer lives with the plugin subprocess, while its directory lives outside managed sources,
+so updates and reloads retain values. Settings-change notifications must not enter the catalog
+reload path: that path disposes the plugin and would destroy open drafts after every save.
+
+`server.registerSettings(definition)` returns a server-side handle. Use `read()` for the current
+`ready` or `invalid` state and `subscribe()` for successful saves, resets, and migrations. The
+subscription cleanup belongs in the plugin's contribution cleanup when it outlives the entry.
+
 ## Contribute a theme
 
 `addTheme` takes a small light or dark palette and a display name. Paseo expands it through the
@@ -417,7 +694,7 @@ stable rather than arrival-ordered. The app resolves that id
 against the installed catalog on every change; an id nothing contributes falls back to the default
 preference instead of painting the reserved slot's placeholder colors.
 
-Existing plugin authors should follow the standalone [v0.8 runtime-entry migration guide](../public-docs/plugins/v0.8/migration.md).
+Existing plugin authors should follow the standalone [v0.8 runtime-entry migration guide](../public-docs/plugins/migration.md).
 
 See `plugin-examples/local-plugin` for a native surface, `plugin-examples/linear` for a complete
 attachment-source example, `plugin-examples/timeline-items` for timeline projection, and
diff --git a/docs/product.md b/docs/product.md
index ad47f5694a..fd93c881da 100644
--- a/docs/product.md
+++ b/docs/product.md
@@ -1,81 +1,102 @@
 # Product
 
-What Paseo is, who it's for, and where it's going.
+Paseo is an environment for running, monitoring, and interacting with coding agents across desktop, mobile, web, and the command line.
 
-## What is Paseo
+**Paseo has a lean, opinionated core built to be extended.** It should be easy to start using and leave room for people to build far beyond the default experience.
 
-Paseo is a next-generation development environment built around agents. One interface to run, monitor, and interact with coding agents across desktop, mobile, terminal, and web.
+## Agents are the focus
 
-The development workflow is shifting from manually editing files to orchestrating agents that do the editing. Paseo is built for that workflow.
+The central workflow is giving an agent a task, understanding what it is doing, providing direction, and reviewing the result. Files, terminals, diffs, and other supporting tools help you do that.
 
-## Core philosophy
+Paseo should make this workflow coherent across providers and devices. You should be able to use the agent that fits a task and keep working from another device without rebuilding your environment around it.
 
-Freedom and flexibility. Every design decision follows from this:
+This is the basis for product decisions. A familiar feature from another development tool earns its place by improving that experience. Familiarity alone does not make it a requirement for Paseo.
 
-- **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
-- **Open source** — Apache-2.0. Users can inspect, fork, and contribute.
-- **BYOK** — Bring your own keys. Use your subsidized plans and first-party provider pricing. Paseo adds zero cost on top.
+## A low floor and a high ceiling
 
-## How it works
+### Easy to start
 
-### Projects and workspaces
+The default experience should be lean, polished, and understandable to someone who has never run a server or configured a VPN.
 
-Projects are grouped in the sidebar, detected automatically from your filesystem and tagged by git remote when available.
+With a supported coding agent installed and authenticated, you can open the desktop app and start working. The app manages its local daemon. To connect your phone through the optional Paseo relay, enable pairing and scan a QR code. You do not need to configure a VPN or understand the networking behind it.
 
-Each project opens as a workspace. For git projects, the default workspace is the main checkout. Users can create additional workspaces, which are isolated copies (git worktrees) where agents work without affecting main.
+You should not need to know that plugins exist to get a useful, complete experience. Extra capability should become discoverable when it helps with something you want to do.
 
-### Inside a workspace
+Keeping this starting point approachable is an ongoing responsibility. A technically correct feature can still make the product harder to understand through extra choices, controls, or setup.
 
-A workspace is a flexible canvas:
+### Room to build your own setup
 
-- Launch multiple agents side by side in split panes
-- Open terminals alongside agents
-- Mix and match providers within the same workspace
+The same product should also work for someone running agents on a home server, using their own network, or building an automated workflow.
 
-### The daemon
+The daemon can run independently of the desktop app. Clients connect to it locally or remotely, and multiple clients can use the same daemon. This separation lets you choose where the work runs and how you interact with it.
 
-Paseo is a client-server system. The daemon (Node.js) runs on your machine, manages agent processes, and streams output in real time over WebSocket. Clients connect to the daemon — locally or remotely.
+For example, someone can use the relay to connect their phone with minimal setup. Someone else can run a daemon on their own infrastructure and connect through SSH or a VPN. Both use the same underlying system.
 
-This architecture means:
+Paseo should provide useful defaults while keeping these choices available. You should not have to adopt every part of the system to benefit from the parts you want.
 
-- The daemon can run on any machine: laptop, VM, remote server
-- Multiple clients can connect simultaneously
-- Agents keep running when a client disconnects — the daemon owns them, not the client
-- Quitting the desktop app stops the daemon it started, so "restart the app" is a real fix; a daemon you run yourself is unaffected
+See the [connectivity guide](https://paseo.sh/docs/connectivity) for supported connection methods and [architecture](architecture.md) for the system design.
 
-## Target user
+## Freedom, ownership, and privacy
 
-Anyone who builds software:
+Paseo's flexibility depends on keeping control with the user:
 
-- Care about owning their tools and their data
-- Use multiple AI providers and want to switch freely
-- Run agents on real tasks across real projects
-- Want to work from multiple devices
+- **Self-hosted:** Run agents on your own machines, with your own environment, files, and credentials.
+- **Provider choice:** Use supported agent harnesses and extend provider support through plugins. Your workflow should be able to evolve as your choice of provider changes.
+- **Cross-device:** Use desktop, mobile, web, and CLI clients according to the situation.
+- **Privacy:** No Paseo telemetry, tracking, or forced account. The relay is optional and end-to-end encrypted.
+- **Open source:** Paseo is Apache-2.0 licensed. You can inspect it, modify it, and build on it.
 
-## What compounds over time
+Convenience and ownership should work together. Offering a straightforward way to connect should preserve the option to operate your own setup.
 
-- **Trust** — Showing up daily, shipping in public, being open source. Earned slowly, lost quickly.
-- **Community contributions** — Code, packaging, skills, agent configs. Contributors become advocates.
-- **Ecosystem** — Skills, integrations, shared configs. Community-built content that makes the platform more valuable.
+## A lean core that keeps improving
 
-## Strategic bets
+The core provides the shared experience: starting work, interacting with agents, understanding their state, and moving between workspaces and devices.
 
-1. **Models commoditize.** Value moves to the orchestration layer. The best model changes monthly — the workflow layer stays.
-2. **Multi-provider wins.** No single provider stays on top. Developers want the best model for each task.
-3. **The daemon as infrastructure.** Server/client architecture enables deployment anywhere.
-4. **Open source outlasts funding.** Open source communities are resilient. Contributors become advocates.
+Core development continues through improvements to reliability, performance, interaction design, and workflows with broad value. A lean core takes ongoing work.
 
-## Current state (May 2026)
+Every addition also has a lasting cost. It needs a place in the interface, an understandable relationship with existing behavior, testing across affected platforms, and maintenance as the rest of the product changes. A feature can work exactly as intended and still be the wrong addition.
 
-- Desktop (Electron), mobile (iOS/Android), web, CLI
-- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi, OMP
-- One-click ACP provider catalog: CodeWhale, Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
-- Voice mode: dictate prompts or talk through problems hands-free
-- MCP server exposes the daemon to other agents (workspaces, create/detach agent, schedules, heartbeats, terminals, workspace renaming)
-- Scheduled agents (cron-style triggers) via app, CLI, and MCP
-- Frequent releases (multiple per week)
-- Community contributions across packaging, providers, and bug fixes
-- Key UX: split panes, keybinding customization, workspace model, in-app browser
+The preference is for a small number of well-shaped capabilities that work together. Before adding a specialized workflow, consider whether an existing capability can serve it or whether a reusable extension point would let people build it themselves.
+
+The boundary can evolve. Some built-in capabilities may eventually make more sense as plugins. Any such move needs to preserve a coherent default experience and account for people who already depend on it.
+
+## Extensibility and composition
+
+Plugins are a central part of how Paseo gains capability.
+
+Someone who needs a different agent provider, a specialized workspace panel, or a custom command should be able to build and share it independently. They can make the choices that fit their users and maintain the integration on their own schedule.
+
+Paseo's role is to provide interfaces that make those contributions possible across the daemon and connected clients. The [plugin documentation](https://paseo.sh/docs/plugins) describes what each released API supports.
+
+The [SDK](https://paseo.sh/docs/sdk) lets applications and services use the daemon directly. A separate dashboard, automation service, or client can build on the same agent infrastructure. Those projects do not all need to become features of the main app.
+
+Composition means useful pieces can be combined in ways the maintainer did not have to predict. Keeping the daemon independent, offering multiple connection methods, and exposing agent operations through APIs gives people room to choose those combinations.
+
+The extension interfaces need the same care as the core experience. They should be understandable, reusable, and maintainable. New extension points should follow concrete workflows that need them.
+
+## How Paseo develops
+
+Product, design, architecture, and workflow decisions remain with the maintainer.
+
+Those decisions draw on the history of the product: why a workflow has its current shape, what previous approaches taught us, how it interacts with the rest of the system, and where it is intended to go. Documentation shares that context, but familiarity also develops through sustained use and maintenance.
+
+Development starts with the smallest useful change that can make a substantial difference. After shipping it, leave room to learn:
+
+- Can people discover and understand it?
+- Does it work well in their actual workflows?
+- What friction or missing capability appears with repeated use?
+- Does the next addition improve the shared experience or belong in a plugin?
+
+That feedback guides the next step. Expanding a workflow too far before people use it creates commitments that are difficult to reverse. Users build habits and integrations around what ships, so removing features or changing interfaces has a real cost.
+
+Writing an implementation is one part of this process. Product judgment, design, QA, review, and learning from use determine how quickly a change can responsibly become part of Paseo.
+
+## An ecosystem people can build on
+
+People contribute through reproducible bug reports, testing, workflow discussions, documentation, plugins, integrations, and helping each other.
+
+A plugin can solve a problem for its users without adding that workflow to everyone's default experience. An alternative client can explore a different interface while using the same daemon. These projects let people take ownership of the experience they want.
+
+The aim is an ecosystem that can develop independently of the maintainer's ability to review core changes. Its value comes from useful things people build, maintain, and share.
+
+Paseo is an independent project. Sustainable development, a coherent product, and the freedom to keep building are priorities. See [Contributing](../CONTRIBUTING.md) for how to participate.
diff --git a/docs/protocol-compatibility.md b/docs/protocol-compatibility.md
index dddff2c107..a52b8f5064 100644
--- a/docs/protocol-compatibility.md
+++ b/docs/protocol-compatibility.md
@@ -10,6 +10,8 @@ Two contracts follow from it.
 
 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.
 
+`hello` carries an optional credential. The daemon accepts a client protocol version from its minimum through newer client versions, selects the lower of client and daemon maximum, and reports it as optional `server_info.protocolVersion`. A `hello.rejected` frame precedes an auth close only when the client sent `hello.auth` or advertised `hello_rejection`; older clients receive the existing WebSocket close code and reason. This avoids sending them a new top-level message their validator does not recognize.
+
 - 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.
@@ -38,6 +40,40 @@ The app checks for the capability and either runs the feature or tells the user
 
 Existing functionality keeps working across versions because of the protocol contract. Gating a new feature never substitutes for that.
 
+## Client capability ownership
+
+The client package advertises the protocol behavior it implements. Add each new capability to
+its exhaustive defaults and implement the associated subscription or decoding behavior there.
+The app, CLI, and plugins inherit those defaults; they supply only host resources such as browser
+automation, or explicit overrides. A schema accepting a message does not establish support for
+its delivery semantics.
+
+On capable daemons, connecting creates no timeline or event demand. Client subscriptions own their network membership,
+release it on unsubscribe, and restore it after reconnect. Raw message observers inspect traffic
+without requesting streams. Application caches and which agents are visible remain caller-owned.
+
+## Owned observations
+
+`owned_subscriptions` and `server_info.features.ownedSubscriptions` negotiate the source-owned
+contract described in [architecture](architecture.md#websocket-protocol). The client selects delivery
+behavior once at its connection boundary. App workflows use the same observation interface on both.
+
+With an older daemon, the client uses the existing connection and legacy RPCs. Directory subscriptions
+remain shared and last-query-wins. Local handle IDs identify listeners; they do not promise independent
+server filters. Timeline and event membership retain their existing shared behavior. Releasing a handle
+detaches its listener and uses the old unsubscribe operation where one exists. Broadcast-only hosts keep
+broadcasting; readiness there means local attachment, not a daemon acknowledgement. No extra sockets
+or multiplexing emulation are introduced.
+
+Preserve established workflows when changing delivery internals. Independent filters and quiet
+connections require a capable daemon; opening the app, reading history and using terminals do not.
+Pre-registry workspace grouping and legacy event normalization belong inside the client boundary.
+
+Old clients keep their existing wire shapes and slot behavior at the daemon's source boundary.
+The adapter keys legacy slots by physical socket, so an old connection cannot replace a modern
+sibling's observation even when both use the same logical client ID. Optional wire IDs stay accepted
+for parsing compatibility; modern requests cannot select their subscription ID.
+
 ## 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:
diff --git a/docs/providers.md b/docs/providers.md
index c7bde43cd7..298bee651b 100644
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -1,43 +1,40 @@
 # Adding a New Provider to Paseo
 
-This guide walks through adding a new agent provider end-to-end. There are two integration patterns, and this doc covers both.
+Add new providers through the plugin SDK. The core adapter patterns below describe the existing
+server integrations.
+
+## Plugin providers
+
+Keep a bundled provider in `plugins/<id>/` and register it through
+`@getpaseo/plugin/server/provider`. Antigravity and Muse Code follow this pattern. Built-in loading and SDK
+import rules belong to [plugins.md](plugins.md#built-in-plugins); the
+[public provider guide](../public-docs/plugins/providers.md) covers the provider contract.
+
+The plugin owns the CLI transport, session state, catalog, and capabilities. Launch CLI transports
+and probes through the [SDK process helpers](../public-docs/plugins/providers.md#launch-the-provider-cli),
+which share Windows launcher handling with core providers. The daemon owns
+executable resolution and applies `agents.providers.<provider-id>.command` and `env` before
+connecting. Register the provider's icon with the plugin rather than adding it to the app's
+provider icon map. You do not need a core manifest entry or provider factory.
+
+| Provider    | Transport                                  | Setup and limitations                                            |
+| ----------- | ------------------------------------------ | ---------------------------------------------------------------- |
+| Antigravity | Installed `agy` CLI                        | [Antigravity](../public-docs/supported-providers.md#antigravity) |
+| Muse Code   | MSP over one `muse serve` host per session | [Muse Code](../public-docs/muse-code.md)                         |
 
 ## 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.
+The provider owns validation and application of the opaque record in
+`AgentSessionConfig.providerOptions`. The registry supplies the effective options
+at session startup. See [provider configuration](custom-providers.md#provider-options)
+for defaults and merge rules, and the [SDK guide](../public-docs/sdk/provider-options.md)
+for native keys and examples.
 
-This Paseo version accepts these keys:
+Exact MCP preapproval is a separate daemon-owned contract. 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.
 
-- **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
+## Core adapter patterns
 
 ### ACP (Agent Client Protocol) -- recommended
 
@@ -49,23 +46,38 @@ Copilot custom agents are exposed through ACP session config, not the slash-comm
 
 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.
 
+ACP shims can own model discovery through `catalogModelResolver`; the shared client owns the probe
+process and refresh deadline. Keep vendor RPCs in the shim. Cursor uses
+`cursor/list_available_models` because switching models during discovery writes its saved CLI
+preferences and selection history. Cursor versions without that extension must be updated. Kimi
+still probes model selections in its own shim. The initial session supplies modes and the current
+model; it does not override the model list returned by a resolver.
+
 ### Direct
 
 Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.ts` yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.
 
-Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`), and `omp` (`providers/omp/agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
+Core direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode/runtime-client.ts`), `pi` (`providers/pi/agent.ts`), and `omp` (`providers/omp/agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
 
 Claude first-party model metadata lives in `packages/server/src/server/agent/providers/claude/model-manifest.ts`. When adding or updating a Claude model, update that manifest only; the model picker thinking options and Claude-specific feature gates are derived from the manifest. Do not add model-specific Claude capability lists in feature code.
 
-Paseo tools are not implemented as MCP tools internally. They live in a shared tool catalog under `packages/server/src/server/agent/tools/`; MCP is only the fallback adapter. A provider that can register runtime tools directly should set `supportsNativePaseoTools: true` and consume `launchContext.paseoTools` in `createSession`/`resumeSession`. When native tools are present, `AgentManager` strips the internal Paseo MCP server from the provider launch config so the provider does not receive the same tools twice. Providers that only know MCP should keep `supportsMcpServers: true` and let the daemon inject `/mcp/agents`.
+Keep the curated Claude catalog: `supportedModels()` has historically omitted older versions and carries less metadata. Discovery is only an opt-in visibility gate, not a replacement catalog or an entitlement guarantee. Claude Code v2.1.197 added `resolvedModel` to disambiguate alias rows; a bare family alias does not establish access to a particular version. Explicit user-configured models must remain selectable when discovery fails or omits them.
+
+Paseo tools are not implemented as MCP tools internally. They live in a shared tool catalog under `packages/server/src/server/agent/tools/`; MCP is only the fallback adapter. The daemon resolves `agents.providers.<provider>.paseoTools` by the exact provider ID. The catalog policy belongs to the caller: it filters the tools exposed to the current agent. When that agent calls `create_agent`, the child receives the policy for the child provider ID; the caller's policy is not inherited.
+
+A provider that can register runtime tools directly should set `supportsNativePaseoTools: true` and consume the already-filtered `launchContext.paseoTools` in `createSession`/`resumeSession`. When native tools are present, `AgentManager` strips the internal Paseo MCP server from the provider launch config so the provider does not receive the same tools twice. Providers that only know MCP should keep `supportsMcpServers: true` and let the daemon inject `/mcp/agents`; the MCP server builds the same policy-filtered catalog for that caller. Filtering is enforced at catalog registration in both paths. Browser tools remain subject to the daemon browser-tools setting and browser-host availability.
 
 Pi is a process-backed provider. Paseo requires the user to have the `pi` binary installed and talks to it through `pi --mode rpc`; the server package does not embed Pi's SDK/runtime packages.
 
+Pi extension adapters live under `packages/server/src/server/agent/providers/pi/extensions/<extension>/`. Each adapter turns Pi RPC facts into Paseo tool, timeline, subagent, or question mappings through the [extension contract](../packages/server/src/server/agent/providers/pi/extensions/contract.ts). To add one, create its directory, add one entry to `extensions/registry.ts`, and test it with fixtures captured from the real extension in Pi that record package, version, source commit, Pi version, and capture date. `agent.ts`, `history-mapper.ts`, and `tool-call-mapper.ts` never name an extension.
+
 Paseo's per-agent and daemon-wide system prompts are appended by its generated Pi integration extension. Paseo deliberately does not pass `--append-system-prompt`, because that flag replaces Pi's automatic `APPEND_SYSTEM.md` discovery instead of composing with it.
 
 Pi model records expose input capabilities through `model.input`. Only send raw RPC `images` when the current model explicitly includes `"image"` in that list. Text-only Pi/OMP models reject image content and persist the rejected image in JSONL history, so image prompts for those models must be materialized to a local file and passed as a text path hint instead.
 
-Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loaded for the agent cwd. Probe with Pi RPC `get_commands`; the adapter registers an extension command named `mcp` (often with `sourceInfo.source` containing `pi-mcp-adapter`). When Paseo injects MCP servers into Pi, write a per-agent MCP config and pass it with `--mcp-config` instead of modifying user or project MCP files. Because that flag replaces the Pi global config layer, preserve the existing `<Pi agent dir>/mcp.json` in the generated file before overlaying injected servers. For local HTTP servers such as Paseo's own `/mcp/agents` endpoint, explicitly disable adapter OAuth (`auth: false`, `oauth: false`) in the generated config.
+Probe Pi MCP support with Pi RPC `get_commands` for the agent cwd. Pi 0.99 and later ship MCP as a built-in extension, which registers an extension command named `mcp` with `sourceInfo.path` `builtin:mcp`. Register injected servers through `pi.registerMcpServer` in Paseo's generated extension; the built-in extension rejects SSE servers and names with characters other than letters, digits, `_`, and `-`, and a server of the same name in Pi's `mcp.json` takes precedence.
+
+The open-source `pi-mcp-adapter` extension replaces the built-in one and registers its own `mcp` command (often with `sourceInfo.source` containing `pi-mcp-adapter`). When it is loaded, write a per-agent MCP config and pass it with `--mcp-config` instead of modifying user or project MCP files. Because that flag replaces the Pi global config layer, preserve the existing `<Pi agent dir>/mcp.json` in the generated file before overlaying injected servers. For local HTTP servers such as Paseo's own `/mcp/agents` endpoint, explicitly disable adapter OAuth (`auth: false`, `oauth: false`) in the generated config.
 
 Pi control-plane RPCs wait 60 seconds by default. Override `params.rpcTimeoutMs` when extension or MCP startup on a slow host needs more time. Timeout errors name the pending RPC phase and report both elapsed time and the configured deadline. This setting does not govern long-running Pi compaction or Pi extension UI results. See [OMP profiles and Pi-compatible forks](custom-providers.md#omp-profiles-and-pi-compatible-forks) for OMP startup and RPC deadlines.
 
@@ -77,9 +89,15 @@ OMP supports native Paseo host tools. The adapter registers the full caller-scop
 
 Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Pi extensions such as `ask_user` may chain dialogs: for example, a `select` can be followed by an optional-comment `input`. When an `ask_user` tool call declares `allowComment: true`, Paseo presents the selection and optional comment as one question permission, answers Pi's initial `select` immediately, then auto-answers the follow-up optional `input` with the comment the user already supplied (or an empty string). Preserve placeholders and optional/skip semantics for standalone optional inputs so the app can still distinguish "skip this optional input" from "cancel the whole dialog." Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.
 
-OpenCode 1 keeps MCP and process environment outside the session boundary. Paseo shares one OpenCode server for ordinary agents and installs a daemon-owned plugin through `OPENCODE_CONFIG_CONTENT`. The plugin reads the exact agent environment and caller-scoped Paseo tool catalog from the daemon's private loopback bridge for each OpenCode session. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifact contains no session data or secrets.
+OpenCode adapters target v1.14.46 and v2.0.10. V2 rejects binaries older than the tested 2.0.10 SDK at runtime selection. Runtime selection uses the configured command and environment. A recognized version is cached until provider configuration reload; a failed, timed-out, or unrecognized probe retains the v1 path and retries detection on the next operation. Load v2 code and materialize its plugin only after positive v2 selection; v1 sessions remain undecorated. Keep upstream SDK types inside the version-specific adapter. OpenCode owns storage migration; a missing native session must fail resume rather than create a replacement. V2 has no native archive/unarchive operation: archiving affects Paseo only. V1 retains native archiving.
 
-An agent with custom environment variables or user-configured MCP servers gets a dedicated OpenCode server. Keep that isolation until OpenCode exposes those values as session-owned configuration. Configure custom MCP with `mcp.add`; do not follow it with `mcp.connect`, which only toggles config-backed servers.
+Use OpenCode v2 execution events to trigger turn completion, with active-state and durable-log reconciliation after admission, reconnect, and while a turn remains active. Do not use `session.wait`: a healthy turn exceeding Node's HTTP headers deadline produces a transport error while OpenCode keeps working. The live event feed has no replay, and shutdown interruption preserves the previous idle outcome, so the session snapshot alone cannot recover missed execution events. Quiet streams are healthy: v2 heartbeats are SSE comments, not application events.
+
+V2.0.4 also removed the activation endpoint that gated a cold location, and a cold location registers its config-derived commands, skills, and providers asynchronously. Wait until `plugin.list` returns a populated inventory before reading the catalog or commands; an empty inventory means the location is still warming. Fail when the readiness deadline expires, including when an inventory request stalls.
+
+Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.
+
+An agent with custom environment variables or user-configured MCP servers gets a dedicated OpenCode server. V2 supports session environment, but its MCP configuration remains location-scoped, so separate servers still prevent one agent from changing another agent's MCP setup. Configure custom MCP with `mcp.add`; do not follow it with `mcp.connect`, which only toggles config-backed servers.
 
 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.
 
@@ -87,7 +105,7 @@ OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prom
 
 Active-turn steering is an optional `AgentSession.steerActiveTurn` operation. The manager owns admission against its exact foreground turn, canonical user-message creation, echo reconciliation, and falls back to the normal interrupt-and-replace path only when the adapter reports `unavailable`. An adapter error leaves the steer's fate ambiguous and must surface without an interrupt or retry. Codex calls `turn/steer` with the native expected turn and Paseo client user-message ID. Claude pushes an admitted steer into the exact active SDK query input; isolated control commands remain unavailable. OpenCode calls `session/prompt_async` with an OpenCode-generated message ID; the server queues the prompt while busy and the next LLM call in the same Paseo turn includes it. Pi sends its native `steer` RPC, which queues the message for delivery after the in-flight assistant turn's tool calls. Slash-command inputs report `unavailable` because pi rejects extension commands on the steer path, and echo identity is correlated by message text because pi's steer RPC takes no message ID. A missing session reports `unavailable` and uses the normal interrupt fallback.
 
-A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.
+A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. It calls `query.interrupt()` only while a main-session turn is in flight (between `system/init` and that turn's `result`): with the main session idle, an interrupt reaches only background subagents and no result follows it, so the adapter withdraws its unstarted messages and stops there. The adapter also declares `perTaskStopAffordance`, because without it the CLI kills every background subagent on interrupt. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.
 
 `SteerActiveTurnOptions.clearPendingPermissions` makes permission release part of the provider contract. A provider that accepts such a steer queues it first, denies permissions blocking its delivery, and stops once the steer is read. Steers without the flag leave permissions open. A denied plan remains in the timeline because the pending card was the only other copy of its text.
 
@@ -113,7 +131,18 @@ Daemon bootstrap reconciles that ledger in the background, without blocking star
 
 ## Provider Snapshot Refresh Contract
 
-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.
+Provider snapshots are views of the catalogues needed for a target. Before looking up cached
+results or discovery in flight, the manager calls optional `AgentClient.getCatalogCacheKey(options)`.
+The provider owns equivalence: equal keys must mean the same availability, models and modes,
+including the effective configuration and execution environment. `force` does not change identity.
+Omitting the method or returning `undefined` keeps target-specific caching. Codex and Claude's
+current host clients share across directories; configured provider identities remain isolated.
+
+The key chooses storage, never execution. Availability and catalogue discovery receive the actual
+`{ scope: "global", force }` or `{ scope: "workspace", cwd, force }` request, including when another
+target can share its result. Runtime-aware adapters must use that target for both probing and key
+resolution. An explicit home-directory workspace is distinct from a semantic global request.
+Plugin callbacks follow the same contract; see [plugin providers](plugins.md#contribute-a-provider).
 
 `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
@@ -122,38 +151,50 @@ aborts the shared refresh signal at the deadline. Providers name active catalog
 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.
+Catalogue results stay cached by identity until explicit refresh or a change to that provider's configuration.
+Keys are resolved on each read so project configuration can select a different cached catalogue.
+Selector opening may read a loading or stale query, but does not force provider probing.
 
-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.
+Saved provider/model choices are user intent. Catalogue failure must not erase them or substitute
+another model. Creation reads the caller's host and directory directly; an earlier global snapshot
+must not settle a project form's initial selection.
 
-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.
+The server's provider keys never cross the wire. Clients advertising `provider_snapshot_references`
+receive directory-to-hash announcements; an unknown hash uses the existing snapshot request.
+The manager detaches each fresh result once and publishes its content identity with the entry;
+readers share these values read-only. Each target keeps its published snapshot until membership,
+content or discovery freshness changes. All affected targets commit before subscribers run;
+subscriber failures are logged without changing discovery or configuration outcomes.
+The session compares both sides of a committed transition under the client's current visibility
+policy and sends only visible changes. It combines result identities with the client's encoding
+and icon policy, without traversing models. Reference hashes exclude freshness;
+legacy embedded hashes include it. Only responses that send a body compact the catalogue.
+Per-provider `fetchedAt` travels separately for reference clients and still means when discovery succeeded. `generatedAt`
+remains the time the response or announcement was generated. Refresh keeps settled entries visible
+until the next result, so unchanged discovery sends freshness without another model body.
 
-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.
+The app's snapshot cache owns compact expansion and stores one body per server/hash, with separate
+directory/hash/freshness records under the same byte budget. Missing bodies share a React Query
+request; directory queries cancel superseded pulls before accepting pushes. Default SDK clients
+keep expanded entries and full updates. Only callers that own materialization opt into wire snapshots.
+Keep the full encoding for older clients; compact-snapshot support alone does not imply reference support.
 
-Boundary tests should assert observable behavior: cold reads may call provider availability/model/mode discovery for that scope; warm reads and registry replacement must not; explicit workspace refreshes affect only one cwd; settings refresh wipes all scopes but immediately refreshes only global.
+Settings refresh invalidates requested providers across known targets and refreshes them in their
+actual execution context, so every connected client receives the refreshed view. Discovery shares
+work by provider key and admits at most four concurrent catalogue probes per configured provider, so a stalled provider does not block discovery for others. Configuration replacement invalidates
+only changed providers; unchanged entries, clients, and discovery in flight survive. Preparation
+leaves installed reads untouched until commit. Plugin replacement uses registration runtime
+identity, so unchanged registrations and builtins keep their results. Await the refresh or warmup
+promise for completion: equal results, including equal discovery timestamps, emit no transition.
 
 ---
 
-## Provider Usage Fetchers
+## Usage sources
 
-Provider plan usage is fetch-on-demand, not a daemon push subscription. The app calls `provider.usage.list.request` through React Query when the usage tooltip or Host Usage settings screen is shown, and the daemon returns the normalized `ProviderUsage` list directly.
-
-To add plan usage for a provider, add `packages/server/src/services/quota-fetcher/providers/<provider>.ts` and register it in `packages/server/src/services/quota-fetcher/manifest.ts`. The provider file exports only its fetcher class; provider auth, endpoint constants, API schemas, and normalization helpers stay private in that file. A fetcher owns provider auth/API parsing and returns the generic shape:
-
-- `providerId`, `displayName`, `status`, and optional `planLabel`
-- any number of `windows` such as Session, Weekly, or Biweekly
-- optional `balances` for credits, USD, requests, or tokens
-- optional `details` for provider-specific rows
-
-Keep the protocol shape provider-agnostic. Do not add provider-specific renderers for new limit windows; labels and generic bars should carry the UI. API responses should be parsed and normalized with Zod inside the fetcher, while the protocol boundary stays strict so old/new client compatibility is explicit.
-
-Kimi Code usage follows the CLI-managed credential file at `KIMI_CODE_HOME` or `~/.kimi-code/credentials/kimi-code.json`; do not probe the legacy `~/.kimi` path as the primary source for current Kimi Code installs.
-
-Cursor usage reads the desktop `state.vscdb` token first, then `cursor-agent`'s `~/.config/cursor/auth.json`. Headless hosts only have the CLI file.
-
-### Usage fetchers are read-only on credentials
-
-A fetcher reads the provider's credential file and never writes it. On a 401 or 403 it returns `unavailable` and leaves refresh to the provider's own CLI: redeeming a refresh token in the fetcher invalidates the CLI's copy (refresh tokens are single-use), and rewriting the file through the fetcher's Zod schema drops any field the schema does not model, corrupting the file for the CLI.
+See the [public usage source reference](../public-docs/plugins/reference.md#usage-sources) for the
+contract, account and window identity, provider-derived period names, login fallback, and
+read-only credential rules. Usage adapters own the interpretation of provider fields; the app
+renders their names and resolves pins without provider-specific duration guesses.
 
 ---
 
@@ -241,7 +282,7 @@ export class CopilotACPAgentClient extends ACPAgentClient {
 
 ### 2. Add to the provider manifest
 
-In `packages/server/src/server/agent/provider-manifest.ts`, add mode definitions with UI metadata (icons, color tiers) and a provider definition entry.
+In `packages/protocol/src/provider-manifest.ts`, add mode definitions with UI metadata (icons, color tiers) and a provider definition entry.
 
 First, define the modes with visual metadata:
 
diff --git a/docs/qa-evidence/sidebar-empty-state-card/after-compact.png b/docs/qa-evidence/sidebar-empty-state-card/after-compact.png
new file mode 100644
index 0000000000..140bcf2052
Binary files /dev/null and b/docs/qa-evidence/sidebar-empty-state-card/after-compact.png differ
diff --git a/docs/qa-evidence/sidebar-empty-state-card/after-dark.png b/docs/qa-evidence/sidebar-empty-state-card/after-dark.png
new file mode 100644
index 0000000000..8a2c4bf8ae
Binary files /dev/null and b/docs/qa-evidence/sidebar-empty-state-card/after-dark.png differ
diff --git a/docs/qa-evidence/sidebar-empty-state-card/after-light.png b/docs/qa-evidence/sidebar-empty-state-card/after-light.png
new file mode 100644
index 0000000000..e283932a5b
Binary files /dev/null and b/docs/qa-evidence/sidebar-empty-state-card/after-light.png differ
diff --git a/docs/qa-evidence/sidebar-empty-state-card/before-dark.png b/docs/qa-evidence/sidebar-empty-state-card/before-dark.png
new file mode 100644
index 0000000000..0b5269331f
Binary files /dev/null and b/docs/qa-evidence/sidebar-empty-state-card/before-dark.png differ
diff --git a/docs/qa-evidence/sidebar-empty-state-card/before-light.png b/docs/qa-evidence/sidebar-empty-state-card/before-light.png
new file mode 100644
index 0000000000..95ce14ad3a
Binary files /dev/null and b/docs/qa-evidence/sidebar-empty-state-card/before-light.png differ
diff --git a/docs/qa.md b/docs/qa.md
index 25176f80fe..8eb5eb5247 100644
--- a/docs/qa.md
+++ b/docs/qa.md
@@ -11,6 +11,9 @@ The bar is four questions:
 
 Every pull request needs evidence for the questions its change touches. Pull requests without evidence get closed.
 
+For plugin changes, verify the [SDK import boundaries](plugins.md#sdk-import-boundaries) before
+exercising contributions. Include the boundary tests and both runtime loaders in the evidence.
+
 ## Evidence
 
 Evidence is something someone else can look at:
diff --git a/docs/release.md b/docs/release.md
index 6261d22980..cdac451f23 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -47,6 +47,36 @@ 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.
 
+## Release branch discipline
+
+While you finalize a release on `main`, use a temporary `next` branch for work intended for the following
+release. This applies to both beta and stable releases.
+
+- Create each new `next` from freshly fetched `origin/main`. Reuse it while active.
+- "This goes to next" means create the PR against `next` or retarget an existing
+  PR, and keep that destination through delivery.
+- Keep `next` current by merging `origin/main` into it as release fixes land.
+  Avoid rebasing this shared branch because agents and open PRs depend on its history.
+- After the release ships, bring `next` up to date and open a `next` → `main` PR.
+  Pass CI and merge without squashing away the individual PR commits needed for
+  the changelog. Retarget remaining PRs based on `next` to `main` and delete the integrated
+  `next`. Create it fresh when needed again.
+
+**Setup still needed:** CI, Docker, and Nix PR checks currently target only `main`,
+and GitHub permits only squash merges. Enable checks and required-check protection
+for `next`, CI on its pushes, and merge commits for the integration PR. Handle PR
+base changes (`edited` events) so retargeting runs checks against the new base;
+GitHub's default PR events do not cover this. Deployment triggers stay unchanged.
+
+### Hotfix from a release tag
+
+If `main` contains changes you do not want to release, branch from the affected
+release tag and cherry-pick only the required fixes. Run CI on that branch, then
+use the normal release flow with it as the explicit source, choosing a new patch
+or beta version. Ensure the fixes and changelog also reach `main` and any active
+`next`, preserving newer development and version changes there. This is a
+short-lived hotfix branch, not another maintained release track.
+
 ## ACP catalog updates
 
 ACP catalog work enters a release through an explicit user request:
@@ -64,8 +94,8 @@ release push as the changelog and version commit.
 
 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. 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`.
+1. **Direct stable release**: you are ready to ship the resolved release source to everyone immediately (default `origin/main`).
+2. **Beta flow**: release candidates on the `beta` channel. Each beta folds into the series' single 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:
@@ -162,8 +192,9 @@ npm run release:promote          # Promote X.Y.Z-beta.N to stable X.Y.Z
 - 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`
+- Require the Linux artifact CI checks with both restricted and usable user namespaces to pass before publication; see [packaged desktop smoke](testing.md#packaged-desktop-smoke). Keep the installed-package and AppImage checks together.
 - 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.
-- **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.
+- **A beta series has one changelog entry.** Each beta folds into it and renames its heading to the new `## X.Y.Z-beta.N`, which `Release Notes Sync` mirrors into that prerelease body. Promotion renames it to the stable heading. See the Changelog policy section.
 
 Use the beta path when you need to:
 
@@ -253,6 +284,15 @@ If you ship N+1 while N is still ramping, N+1 starts a fresh rollout from its ow
 
 If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+1> -f rollout_hours=0` after N+1 publishes so the users who already got N reach the fix fast.
 
+### macOS system floor
+
+The desktop app requires macOS 13 or newer. Keep both release guards when the floor changes:
+
+- `packages/desktop/electron-builder.yml` writes the macOS version to `LSMinimumSystemVersion` for new installs.
+- `scripts/merge-mac-manifest.mjs` writes the matching Darwin kernel version to `minimumSystemVersion` in the update manifest. Existing clients check this before downloading an update.
+
+macOS 13 maps to Darwin 22. The two values use different version domains; do not copy the macOS version into the update manifest.
+
 ### Limitations
 
 - **No pause / kill switch.** To stop new admissions, ship a superseding release. Clients revalidate on quit and will not install the superseded download, but a client that already completed installation cannot be recalled; ship a hotfix `+1` patch.
@@ -374,7 +414,7 @@ The GitHub Release body is populated automatically by the `Release Notes Sync` w
 - 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 download page's "What's new" link deep-links the **minor group** anchor (`/changelog#release-0.3`), not the exact entry: the beta entry is renamed on each beta and on promotion, 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 the `release: published` event emitted when a stable draft is published and on pushes to `main` that touch `CHANGELOG.md` or `packages/website/**`. Its job condition excludes beta prereleases.
 
 ## Fixing a failed release build
@@ -477,19 +517,24 @@ Release notes depend on the changelog heading format. The heading **must** be st
 
 No prefix (`v`), no extra text. `Release Notes Sync` matches the `## X.Y.Z` (or `## X.Y.Z-beta.N`) line for the pushed tag to extract the version. A malformed heading breaks the release-notes sync for that tag.
 
+`CHANGELOG.md` on `main` is also what the app's **What's new** sheet fetches and renders, so the file is a shipped product surface, not just a release input. `##` starts a release and `###` starts a section; the app reads section titles from the document, so renaming or adding one needs no app change. Everything under a section is rendered as Markdown: prose, lists, links, inline code, fenced code, block quotes, tables, and images. Raw HTML does not render — the shared Markdown parser runs with `html: false`, so a `<video>`, `<iframe>` or `<embed>` tag reaches the reader as visible markup. Keep media out of the changelog, or link to it. A GitHub callout renders as a block quote with its `[!NOTE]` marker still in the text. A release entry is what a user reads on a phone the moment they are offered the update — write it for them.
+
 ## Changelog policy
 
-- `CHANGELOG.md` includes stable releases and every entry in the current beta series.
+- `CHANGELOG.md` holds stable releases and at most one entry for 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 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.
+- Each subsequent beta rewrites that entry in place: the heading becomes the new beta number and date, and the body describes the full change from the previous stable release to this beta. Never add a second beta entry.
+- The entry is a list of changes, not of PRs. When a later beta reverts, reworks, or follows up on something an earlier beta added, rewrite the bullet to the current behavior or delete it. A stable user never saw the earlier beta behavior, so fixes to it are not "Fixed" bullets.
+- Anything that already shipped to stable through a patch release on an older line stays out of the beta entry.
+- Stable promotion renames the entry to `## 0.1.60 - YYYY-MM-DD` after a final review.
+
+Older prerelease bodies on GitHub keep the notes they were synced with; `Release Notes Sync` only writes the release whose tag matches the top entry.
 
 ## Changelog ownership
 
 - **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.
+- Every entry, beta or stable, is drafted from the previous stable release to the release source. For a later beta, read the PRs since the previous beta tag, then rework the existing entry so each bullet still describes current behavior. Review the result against the changelog policy below, show it to the user, and wait for approval before committing it.
 
 ## Changelog wording
 
@@ -521,7 +566,7 @@ that changed, the failure that was fixed, or the capability that was added? If t
 claims a general improvement, rewrite it with the concrete change.
 
 - **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.
+- **Collapse internal iterations within that scope.** Present a feature added and fixed in one range as working.
 - **Cut low-signal entries.** "Toolbar buttons have consistent sizing" is too granular. Combine small polish items or drop them.
 
 ## Changelog conciseness
@@ -589,12 +634,7 @@ Use `git diff <latest-release-tag>..<release-source-sha>` as the review input. T
 
 Changelog scope follows the release being described:
 
-- **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`
-
-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.
+Every entry covers `previous stable release → release source`: first beta, later beta, direct stable release, and promotion alike. The beta entry always reads as the stable entry would if the beta were promoted today.
 
 ## Completion checklist
 
@@ -602,7 +642,7 @@ Each beta entry records what its testers receive. Promotion produces the single
 
 - [ ] 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
+- [ ] Fold this beta into the series' single `CHANGELOG.md` entry (heading `## X.Y.Z-beta.N - YYYY-MM-DD`, previous stable → release source), 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
@@ -625,7 +665,7 @@ Each beta entry records what its testers receive. Promotion produces the single
 - [ ] 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). 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
+- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors). Promotion renames the series' `## X.Y.Z-beta.N` entry to `## X.Y.Z - YYYY-MM-DD` and re-checks it covers 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
@@ -634,6 +674,7 @@ Each beta entry records what its testers receive. Promotion produces the single
 - [ ] The GitHub Release was published only after the three stable manifests were uploaded, and it has 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`
+- [ ] `latest-mac.yml` contains the current `minimumSystemVersion` guard
 - [ ] 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
diff --git a/docs/rpc-namespacing.md b/docs/rpc-namespacing.md
index 5ddb7220e4..627a227eb5 100644
--- a/docs/rpc-namespacing.md
+++ b/docs/rpc-namespacing.md
@@ -25,7 +25,13 @@ checkout.forge.set_auto_merge.request;
 // -> checkout.forge.set_auto_merge.response
 ```
 
-Most new RPCs should follow this shape. If a request does not have a one-to-one response, call that out in the code near the schema.
+A finite streaming request can emit `.update` messages before its terminal `.response`.
+`usage.list_reports.request` uses this shape: each `.update` carries one settled report, and
+`.response` carries the request-level error or `null`. All three share `requestId`; no updates
+follow the response. An empty successful stream is an empty list. Register updates as replies
+of the originating request so source-owned delivery routes them to the requesting connection.
+
+Most new RPCs should follow these shapes. If a request does not have a one-to-one terminal response, call that out in the code near the schema.
 
 ## Message Shape
 
diff --git a/docs/service-proxy.md b/docs/service-proxy.md
index 3ec3144289..cab7f42774 100644
--- a/docs/service-proxy.md
+++ b/docs/service-proxy.md
@@ -4,7 +4,7 @@ Paseo proxies HTTP traffic to services running inside your workspaces. Localhost
 
 ## How it works
 
-When a `paseo.json` script of `"type": "service"` starts, Paseo assigns it a local port and registers a route in the service proxy. Incoming requests whose `Host` header matches the script's generated hostname are forwarded to that port.
+When a `paseo.json` script of `"type": "service"` starts, Paseo assigns it a local port and registers a route in the service proxy. Incoming requests whose `Host` header matches the script's generated hostname are forwarded to that port. HTTP requests, WebSocket upgrades, and service health checks select the reachable IPv4 or IPv6 loopback address. Services can bind to `127.0.0.1` or `::1` without changing their proxy URL.
 
 The generated hostname is built from the script name, branch, and project:
 
diff --git a/docs/terminal-activity.md b/docs/terminal-activity.md
index fd2df0e95f..ee1f411a7a 100644
--- a/docs/terminal-activity.md
+++ b/docs/terminal-activity.md
@@ -51,7 +51,7 @@ Claude hook mapping:
 
 - `UserPromptSubmit` → `running`
 - `Stop`, `StopFailure`, `SessionEnd` → `idle`
-- `Notification` with `reason` or `matcher` equal to `idle_prompt` → `needs-input`
+- `Notification` with `notification_type` 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
@@ -65,12 +65,18 @@ Codex hook mapping:
 - `PermissionRequest` → `needs-input`
 - `Stop` → `idle`
 
-OpenCode uses a server plugin instead of command hooks. The plugin listens to OpenCode bus events and emits these Paseo hook events:
+OpenCode uses a server plugin instead of command hooks. Both generations discover the same global plugin file. Their loaders select separate entrypoints: OpenCode 1 calls `server()` with `{ type, properties }` bus events; OpenCode 2 calls `setup()` and subscribes to decoded `{ type, data }` events. Do not share their status mapping: V1 publishes `session.status` snapshots, while V2 publishes `session.execution.*` transitions.
 
-- `session.status` with `busy` or `retry` → `running`
-- `session.status` with `idle` → `idle`
-- `permission.asked` → `needs-input`
-- `permission.replied` → `running`
+| OpenCode event                                              | Generation | Activity    |
+| ----------------------------------------------------------- | ---------- | ----------- |
+| `session.status` with `busy` or `retry`                     | 1          | running     |
+| `session.status` with `idle`                                | 1          | idle        |
+| `session.execution.started`                                 | 2          | running     |
+| `session.execution.succeeded`, `.failed`, or `.interrupted` | 2          | idle        |
+| `permission.asked`                                          | Both       | needs-input |
+| `permission.replied`                                        | Both       | running     |
+
+The plugin translates both event contracts into the existing Paseo hook events. OpenCode 2 disposes its event subscription when the plugin unloads.
 
 The daemon maps hook states onto terminal activity like an agent lifecycle plus unread attention: `running` → `state: working`, `idle` → `state: idle`, and `needs-input` → `state: idle` with `attentionReason: needs_input`. A `working` → `idle` transition records `state: idle` with `attentionReason: finished` until the user focuses that terminal; plain idle terminals still contribute no workspace status.
 
diff --git a/docs/terminal-performance.md b/docs/terminal-performance.md
index 7e65482add..3bb7c4d71c 100644
--- a/docs/terminal-performance.md
+++ b/docs/terminal-performance.md
@@ -26,6 +26,7 @@ Terminal frames share the daemon main event loop with all agent traffic. The `ev
 - **Snapshot catch-up is backpressure-gated.** A stream falls back to a full snapshot only when `outputBytesSinceSnapshot > MAX_TERMINAL_OUTPUT_FRAME_BYTES` (256KB) **and** the client transport reports `bufferedAmount > MAX_CLIENT_BUFFERED_BYTES` (4MB). A client that keeps draining streams continuously, no matter how much output is produced. Before this gate existed, every 256KB of build output dropped a frame and forced a full JSON cell-grid snapshot (~200k objects across IPC) — the historical source of spiky lag and GC hitches.
 - **Plugin daemon sessions report IPC queue bytes.** Their virtual socket increments `bufferedAmount` before `process.send` and decrements it only in the send callback. Text and binary frames share that ordered queue, so the normal snapshot catch-up and physical high-water gates remain valid for server-side plugin SDK traffic.
 - **Client output writes are not serialized per frame.** The emulator runtime drains contiguous plain writes straight into xterm (which buffers internally). Only barrier ops (`clear`, `snapshot`, `suppressInput` writes) wait — behind a zero-length sentinel write — so resets can't interleave with in-flight output.
+- **Find preserves the inspected xterm viewport, including at the live bottom.** Keep its output anchor inside the existing batched write path. Serializing output to preserve a search result would add terminal latency.
 - **Retained terminal tabs in the focused workspace keep their streams.** Hidden mounted terminals continue applying output, so switching tabs does not resubscribe or request a fresh snapshot. The retained-panel LRU bounds the number of live streams; terminals in an unfocused workspace detach.
 - **Terminal size has one daemon-owned claimant.** Focus and direct interaction send a `claim`; later geometry changes from that connection send `update`. A claim transfers ownership even when the dimensions are unchanged, while an update from any other connection is ignored. This lets an owning pane follow splits and keyboard insets without allowing an idle phone or browser to steal the PTY size.
 
diff --git a/docs/testing.md b/docs/testing.md
index 9b94de5038..8b1565d86d 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -107,14 +107,18 @@ When a test is labeled end-to-end, it calls the real service. No environment var
 
 The packaged desktop smoke is an external observer of the production launch path. It must not add a smoke-only branch to Electron main or start the daemon itself.
 
-The harness launches the unpacked packaged app with isolated user data and daemon state, connects to the real renderer over Chromium's debugging protocol, and requires all of these outcomes:
+The harness launches the packaged app with isolated user data and daemon state, connects to the real renderer over Chromium's debugging protocol, and requires all of these outcomes:
 
 - the `paseo://app/` renderer mounts into `#root`;
 - the sandboxed preload exposes the desktop bridge;
 - the renderer starts a fresh desktop-managed daemon through the normal startup bootstrap;
 - the bundled CLI can query that daemon and run a terminal command.
 
-Pull-request CI runs the Linux x64 smoke under Xvfb when the cumulative PR diff changes `packages/desktop/**`. The desktop release matrix runs the harness against each host-native packaged app before publishing. All smoke jobs upload renderer, desktop, and daemon diagnostics on failure.
+The Desktop Packages workflow runs the Linux x64 smoke under Xvfb on main pushes and on pull requests that change `packages/desktop/**`, `nix/**`, or the workflow itself. The Linux job is pinned to Ubuntu 24.04 and runs twice: with AppArmor user namespace restrictions enabled, then with user namespaces available. It installs the real `.deb`, launches the real AppImage via `--appimage-extract-and-run`, and launches the extracted tar archive. It also replaces the Debian installation with the generated RPM through `rpm --install --nodeps` and checks its sandboxed launch under restrictions. Ubuntu supplies the runtime libraries under Debian package names, so this verifies the RPM payload and postinstall rather than Fedora dependency resolution. Each launch verifies the reported sandbox decision; enabled renderers must also have `NoNewPrivs: 1` and `Seccomp: 2` in `/proc`. The desktop release matrix retains its host-native smokes. Linux release builds stay on Ubuntu 22.04 to preserve their native-library baseline; the restricted-host regression runs on Ubuntu 24.04 after merge.
+
+Never repair `chrome-sandbox` in the smoke harness. The old unpacked smoke set its mode to 4755 and concealed a broken package installer. Run installer tests as root and launch tests as an ordinary user: a root-run namespace probe does not reproduce Ubuntu's AppArmor policy for desktop users. Preserve both restricted and unrestricted cases; either one alone permits another sandbox regression.
+
+Smoke jobs upload renderer screenshots and desktop/daemon diagnostics, including successful Linux sandbox evidence.
 
 To exercise the smoke locally on Linux:
 
@@ -128,7 +132,7 @@ npm run build:desktop -- --publish never --linux --x64 --dir
 
 electron-builder packs `node_modules` by walking declared production `dependencies`. A package that imports something it only lists as a `peerDependency` resolves fine in this hoisted workspace, passes every test, and then throws `ERR_MODULE_NOT_FOUND` inside `app.asar` — killing the desktop daemon at startup. That shipped twice from `@replit/codemirror-lang-*` grammars, which are interactive editor extensions published as if they were bare parsers.
 
-The packaged smoke catches it but only runs when a PR touches the `desktop` filter in `.github/ci-paths.yml`. Both offenders landed under `packages/highlight/**`, which maps to `sdk`.
+The packaged smoke catches it after merge. PRs need the fast dependency-closure test below because packaging runs on main.
 
 `packages/highlight/src/__tests__/dependency-closure.test.ts` replicates the packer's traversal statically and runs with the normal unit tests. It is scoped to `@getpaseo/highlight` on purpose: that tree is small and pure, so the check is exact. Running the same walk over `@getpaseo/server` produces dozens of false positives from optional dependencies loaded behind `try`/`catch`.
 
@@ -200,7 +204,7 @@ PR checks are routed by the behavior each suite proves, using `.github/ci-paths.
 
 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.
+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 and real-Electron coverage together in the Ubuntu leg. Packaging runs on main in the Desktop Packages, Docker, and Nix workflows. CLI-side Hub changes select one focused test inside the existing required server jobs. The CLI source suite runs once in the third required CLI job; only the separate local E2E runner is sharded, and that runner owns its dependency build. Repository scripts and the shared Vitest configuration run every PR contract because they are cross-cutting toolchain inputs.
 
 ## Agent authentication in tests
 
diff --git a/docs/timeline-sync.md b/docs/timeline-sync.md
index 3f0b6e790a..d1a770f219 100644
--- a/docs/timeline-sync.md
+++ b/docs/timeline-sync.md
@@ -5,8 +5,10 @@ Agent chat delivery has two paths:
 1. **Live stream** — `agent_stream` WebSocket messages for immediacy. These may be delta-shaped lifecycle updates.
 2. **Authoritative history** — `fetch_agent_timeline_request` for correctness. This always returns full projected timeline items, never lifecycle deltas.
 
-The daemon keeps canonical rows only for its runtime. Provider history is the durable transcript
-authority and repopulates those rows when an agent resumes.
+The daemon retains projected items in memory. Each source event advances the stream sequence,
+then replaces the previous tool state or merges into the current text item. Intermediate payloads
+are never retained for history or catch-up. Provider history is the durable transcript authority
+and rebuilds the projection when an agent resumes.
 
 The invariants are:
 
@@ -67,15 +69,34 @@ Provider message IDs are not guaranteed for every displayed item. Paseo-generate
 
 Actions that address a point in chat history, such as Fork, use the daemon timeline `epoch` plus the projected item's `seqEnd`. The app carries that position on the rendered assistant item for both live and fetched history. When adjacent projected chunks merge, the merged item retains the newer chunk's position.
 
-The daemon validates that the epoch is current and the exact source sequence still exists before slicing rows. It slices before projection so later lifecycle updates cannot leak into the selected context.
+The daemon validates the epoch and locates the projected item at the selected position. A fork
+includes projected items through that checkpoint. If an item spans the checkpoint and changed
+afterward, the daemon refuses that fork with an actionable error: discarded historical payloads
+cannot be reconstructed from sequence metadata. Forking the current context remains available.
 
 ## Resume behavior
 
-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
+Opening, reconnecting, and returning from app background establish the current timeline through
+bounded catch-up. Switching between continuously subscribed open chats needs no fetch.
+Focus alone does not mutate timeline state; the response is compared with the local
 authoritative range first.
 
+Cached history remains readable during recovery. The chat shows Reconnecting to host while the host is
+offline, then Updating messages until authoritative catch-up completes. Socket connectivity alone cannot
+certify that the displayed conversation is current. The timeline owner publishes freshness; the
+view renders it without a toast timer or a separate resume workflow.
+
+The draft-create handoff has the same lifetime: the viewed-timeline owner releases it when the sync
+stops owing that chat a catch-up, not when the first authoritative page lands. Releasing it at the
+first page leaves a chat this client just created looking hydrated but still catching up, which
+shows Updating messages for a conversation that cannot be out of date. Closing the tab ends the
+obligation too, so a reopened chat starts from authoritative state instead of a stale optimistic
+one; disconnect and backgrounding keep it.
+
+Foregrounding probes a nominally connected session immediately. A healthy response preserves the
+socket; a failed three-second probe starts reconnecting without waiting for the background heartbeat
+or retry backoff. This cannot keep a mobile socket alive after the operating system suspends it.
+
 - 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
@@ -88,6 +109,25 @@ The installed tail carries `hasOlder`, so history skipped by a replacement remai
 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.
 
+A plan approval keeps the original proposal's tool-call identity through resolution and provider
+history replay. The pending approval UI can hide that tool from presentation, but the client model
+must retain its position. Creating a new history card on rejection places it after the prompt that
+rejected it; changing steer-event ordering would also put new assistant output before that prompt.
+
+## Provider child history
+
+Child transcripts use the same projected-page reconciliation as the main conversation. The client
+retains rendered items and sequence cursors, never a second cache of source events. Pagination
+uses the projected display anchor; live updates advance the source cursor without moving tools.
+
+Clients advertising `projected_subagent_timeline` receive child streams and projected fetches.
+Updated clients require `features.projectedSubagentTimeline` for child history; older hosts show
+an update-host notice for that pane.
+Older clients retain child names/status and receive an upgrade message when opening a child
+conversation. This gate affects only the child transcript; it does not gate the connection,
+main conversation, or current-context forks. A legacy `canonical` root request still receives
+projected items.
+
 ## Client replica lifetime
 
 The session projection remains host-scoped for as long as the host is registered. The viewed-timeline
@@ -95,6 +135,11 @@ owner wraps cached preparation, network catch-up, accepted timeline application,
 behind one interface. React supplies transport and projection operations without selecting a cache
 path or issuing a separate persistence notification.
 
+Active-agent list reconciliation does not own transcript lifetime. An archived agent's fresh
+history response can arrive before the active-list response that omits it. Clearing history there
+would discard accepted rows while the viewed owner still considers them synchronized. Entity
+deletion clears the transcript; list membership changes do not.
+
 Removing the host from the registry is the destructive boundary: it stops the runtime and clears the
 session and host-scoped setup state together.
 
@@ -128,14 +173,19 @@ replica cache.
 
 The app chooses one delivery policy from `server_info.features.selectiveAgentTimeline`:
 
-- 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.
+- Selective daemons receive the chats this session has opened, plus any visible agent pane. A chat
+  enters that set the first time the user opens it and leaves when its tab closes or the session
+  ends, independently of mounted or retained React views: switching workspaces, evicting a retained
+  view, app backgrounding, and reconnect all preserve the demand. There is no recent-agent limit.
+  Restored workspace layout is a release signal, never a source. It carries a tab for every chat the
+  user has ever opened on the host, and a catch-up fetch resumes its agent on the daemon, so
+  subscribing from layout spawns a provider session per historical tab at every launch and stamps
+  every one of those workspaces as just used (see
+  [agent lifecycle](agent-lifecycle.md#workspace-activity)). Visible chats get the first catch-up
+  attempt; the rest follow when those attempts settle, including failures, so a failed visible chat
+  does not starve background recovery. Split panes catch up together. Hidden chats update the
+  replica; on web their retained presentation stays suspended until revealed, on native it keeps
+  rendering. Revealing a chat reads the current store and preserves its local UI state.
 - Legacy daemons keep globally streaming agent timelines. Visibility still triggers the existing
   authoritative catch-up, but the app does not issue selective-subscription RPCs.
 
@@ -152,7 +202,7 @@ remaining page through the existing stream reducer. It must not append full proj
 live prefix.
 
 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
+send-now, and the host runtime's automatic queue drain — 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.
@@ -173,7 +223,7 @@ submission. Overlapping sends settle independently rather than collapsing to one
 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
+human 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
@@ -188,19 +238,33 @@ foreground control ownership remains a separate daemon concern. Cancellation req
 with that record rather than in a React component, so an old request cannot clear a newer one. Submissions
 remain a separate pre-turn registry and retire on canonical acknowledgement.
 
-Canonical turns and visible responses are different boundaries. System-injected prompts are absent from
-the Paseo timeline, so one visible response can span several canonical turns without a user message
-between them. Layout and copy group that response together; lifecycle, timing, tool sequences, and exact
+Canonical turns and visible responses are different boundaries. Agent-originated prompts and lifecycle
+notifications project into tool rows, so they do not create a human-message boundary. Legacy system
+prompts, including schedule injections, remain hidden. One visible response can span several canonical
+turns; layout and copy group that response together while lifecycle, timing, tool sequences, and exact
 fork positions retain the canonical `turnId` boundaries.
 
+Agent-message XML belongs to the daemon's `agent/agent-messages` boundary. Prompt delivery encodes
+provenance; acceptance, provider echoes, import, and replay share its projection. The delivery ID is
+also the projected call ID, so a provider echo cannot create a second row. Sender IDs are opaque and
+do not imply local ownership or authorization. Capture the sender title at delivery: archived or
+removed senders must remain understandable without a live directory lookup.
+
+The optional `agentMessage` payload carries event, sender, and delivered text. Shared client
+presentation (`protocol/agent-message-display`) owns its heading and expanded details. The daemon
+must not construct UI labels or prepend sender labels to the semantic message body. The existing
+`tool_call` / `plain_text` envelope is a compatibility adapter: older clients still parse the row and
+expand its body. New clients use the typed payload, never infer the event from a tool name or parse
+XML. Stream reduction and disk-cache serialization preserve the payload without rendering it.
+
 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.
+second running state. Disconnect preserves the last replicated turn until cache or network hydration
+advances it; replica removal remains the destructive close boundary. 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
+For human prompts, 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
diff --git a/docs/unistyles.md b/docs/unistyles.md
index af864cf000..3daae333df 100644
--- a/docs/unistyles.md
+++ b/docs/unistyles.md
@@ -346,7 +346,8 @@ 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 content size (`Math.round(theme.fontSize.content * 1.4)`); routing prose through `lineHeight.diff` clips text at small code sizes.
 - **High-churn draft values** (live-while-typing in the appearance preview) bypass the theme: apply them as inline styles marked with `inlineUnistylesStyle` so per-keystroke values don't grow the `#unistyles-web` CSS registry.
-- **The app shell uses one `AppearanceStyleBoundary`.** Runtime-patched numeric theme values are baked into Unistyles web classes rather than CSS variables, while parsed/memoized content also does not naturally re-run when appearance tokens change. The boundary sits below stable runtime providers in `app/_layout.tsx` and remounts the visual shell once. `applyAppearance` patches the active theme before inactive registry entries so its subscribers receive the committed values in the same update. Do not add local appearance keys or nested boundaries.
+- **Web numeric appearance tokens need a render; native tracked styles update in place.** On web, string tokens such as colors become CSS variables, but numeric tokens (font sizes, line heights) are baked into generated classes. `AppearanceStyleBoundary` remounts web shell chrome and explorer content to refresh those classes. Native sidebars and explorer hosts stay outside appearance keys: their gesture refs outlive detached dependents until Gesture Handler's passive cleanup, so remounting a related gesture can query an unmounted view. Their tracked native styles and existing themed leaf props update without replacing the gesture hosts or draggable lists. Parsed PR markdown uses its own `withUnistyles` style mapping.
+- **Appearance keys belong below native lifetime owners.** `ThemedStack` wraps screen content through `screenLayout`, preserving navigator identity; nested navigators are listed in `nestedNavigatorScreens` and own their own screen boundaries. The remaining shell surfaces retain their appearance refresh separately from native panel hosts. A key above a native stack can detach its screen container inside a FragmentManager transaction during settings hydration. Keep both navigators and retained panel gesture hosts outside those keys. `applyAppearance` patches the active theme before inactive registry entries so subscribers receive the committed values in the same update. Do not add local appearance keys or a boundary above a navigator.
 - **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`.
 
 ## Patching The Web Runtime
diff --git a/fastlane/metadata/android/en-US/changelogs/100001.txt b/fastlane/metadata/android/en-US/changelogs/100001.txt
new file mode 100644
index 0000000000..49521c547c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/100001.txt
@@ -0,0 +1,7 @@
+Added
+- Added OpenCode v2 support, selected automatically from the installed opencode version
+- Added task lists from rpiv-todo, pi-goal-x, and Pi's example todo extension to Pi chats
+- Added subagent runs from pi-subagents, Tintinweb pi-subagents, and Gotgenes pi-subagents to the Subagents track
+- Added rpiv-ask-user-question dialogs to Pi chats as one question form
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/100002.txt b/fastlane/metadata/android/en-US/changelogs/100002.txt
new file mode 100644
index 0000000000..49521c547c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/100002.txt
@@ -0,0 +1,7 @@
+Added
+- Added OpenCode v2 support, selected automatically from the installed opencode version
+- Added task lists from rpiv-todo, pi-goal-x, and Pi's example todo extension to Pi chats
+- Added subagent runs from pi-subagents, Tintinweb pi-subagents, and Gotgenes pi-subagents to the Subagents track
+- Added rpiv-ask-user-question dialogs to Pi chats as one question form
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/100003.txt b/fastlane/metadata/android/en-US/changelogs/100003.txt
new file mode 100644
index 0000000000..49521c547c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/100003.txt
@@ -0,0 +1,7 @@
+Added
+- Added OpenCode v2 support, selected automatically from the installed opencode version
+- Added task lists from rpiv-todo, pi-goal-x, and Pi's example todo extension to Pi chats
+- Added subagent runs from pi-subagents, Tintinweb pi-subagents, and Gotgenes pi-subagents to the Subagents track
+- Added rpiv-ask-user-question dialogs to Pi chats as one question form
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/100004.txt b/fastlane/metadata/android/en-US/changelogs/100004.txt
new file mode 100644
index 0000000000..49521c547c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/100004.txt
@@ -0,0 +1,7 @@
+Added
+- Added OpenCode v2 support, selected automatically from the installed opencode version
+- Added task lists from rpiv-todo, pi-goal-x, and Pi's example todo extension to Pi chats
+- Added subagent runs from pi-subagents, Tintinweb pi-subagents, and Gotgenes pi-subagents to the Subagents track
+- Added rpiv-ask-user-question dialogs to Pi chats as one question form
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110001.txt b/fastlane/metadata/android/en-US/changelogs/110001.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110001.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110002.txt b/fastlane/metadata/android/en-US/changelogs/110002.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110002.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110003.txt b/fastlane/metadata/android/en-US/changelogs/110003.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110003.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110004.txt b/fastlane/metadata/android/en-US/changelogs/110004.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110004.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110011.txt b/fastlane/metadata/android/en-US/changelogs/110011.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110011.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110012.txt b/fastlane/metadata/android/en-US/changelogs/110012.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110012.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110013.txt b/fastlane/metadata/android/en-US/changelogs/110013.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110013.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110014.txt b/fastlane/metadata/android/en-US/changelogs/110014.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110014.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110021.txt b/fastlane/metadata/android/en-US/changelogs/110021.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110021.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110022.txt b/fastlane/metadata/android/en-US/changelogs/110022.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110022.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110023.txt b/fastlane/metadata/android/en-US/changelogs/110023.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110023.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110024.txt b/fastlane/metadata/android/en-US/changelogs/110024.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110024.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/80001.txt b/fastlane/metadata/android/en-US/changelogs/80001.txt
new file mode 100644
index 0000000000..4b9ab7f0e8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/80001.txt
@@ -0,0 +1,5 @@
+Paseo 0.8 adds plugin header buttons, custom providers, and richer chat components, alongside fixes for desktop updates and mobile keyboards.
+
+Before upgrading: the macOS desktop app now requires macOS 13 or newer; Linux and Windows support is unchanged. Plugins written for 0.7 need the 0.8 migration guide, including separate client/server entries and the revised composer pill API.
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/80002.txt b/fastlane/metadata/android/en-US/changelogs/80002.txt
new file mode 100644
index 0000000000..4b9ab7f0e8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/80002.txt
@@ -0,0 +1,5 @@
+Paseo 0.8 adds plugin header buttons, custom providers, and richer chat components, alongside fixes for desktop updates and mobile keyboards.
+
+Before upgrading: the macOS desktop app now requires macOS 13 or newer; Linux and Windows support is unchanged. Plugins written for 0.7 need the 0.8 migration guide, including separate client/server entries and the revised composer pill API.
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/80003.txt b/fastlane/metadata/android/en-US/changelogs/80003.txt
new file mode 100644
index 0000000000..4b9ab7f0e8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/80003.txt
@@ -0,0 +1,5 @@
+Paseo 0.8 adds plugin header buttons, custom providers, and richer chat components, alongside fixes for desktop updates and mobile keyboards.
+
+Before upgrading: the macOS desktop app now requires macOS 13 or newer; Linux and Windows support is unchanged. Plugins written for 0.7 need the 0.8 migration guide, including separate client/server entries and the revised composer pill API.
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/80004.txt b/fastlane/metadata/android/en-US/changelogs/80004.txt
new file mode 100644
index 0000000000..4b9ab7f0e8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/80004.txt
@@ -0,0 +1,5 @@
+Paseo 0.8 adds plugin header buttons, custom providers, and richer chat components, alongside fixes for desktop updates and mobile keyboards.
+
+Before upgrading: the macOS desktop app now requires macOS 13 or newer; Linux and Windows support is unchanged. Plugins written for 0.7 need the 0.8 migration guide, including separate client/server entries and the revised composer pill API.
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90001.txt b/fastlane/metadata/android/en-US/changelogs/90001.txt
new file mode 100644
index 0000000000..1c3326f7ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90001.txt
@@ -0,0 +1,9 @@
+Added
+- Added Cmd/Ctrl+F Find to file panes, with replacement in editable files
+- Added Cmd/Ctrl+F Find to terminal scrollback
+- Added Cmd/Ctrl+F Find to chat, including messages outside the loaded history window
+- Added Jump to file to mobile Changes, opening the changed-files tree in a sheet
+- Added automatic Pull request tab opening once per workspace when a PR is detected
+- Added expandable plan cards, with rejected plans collapsed by default
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90002.txt b/fastlane/metadata/android/en-US/changelogs/90002.txt
new file mode 100644
index 0000000000..1c3326f7ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90002.txt
@@ -0,0 +1,9 @@
+Added
+- Added Cmd/Ctrl+F Find to file panes, with replacement in editable files
+- Added Cmd/Ctrl+F Find to terminal scrollback
+- Added Cmd/Ctrl+F Find to chat, including messages outside the loaded history window
+- Added Jump to file to mobile Changes, opening the changed-files tree in a sheet
+- Added automatic Pull request tab opening once per workspace when a PR is detected
+- Added expandable plan cards, with rejected plans collapsed by default
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90003.txt b/fastlane/metadata/android/en-US/changelogs/90003.txt
new file mode 100644
index 0000000000..1c3326f7ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90003.txt
@@ -0,0 +1,9 @@
+Added
+- Added Cmd/Ctrl+F Find to file panes, with replacement in editable files
+- Added Cmd/Ctrl+F Find to terminal scrollback
+- Added Cmd/Ctrl+F Find to chat, including messages outside the loaded history window
+- Added Jump to file to mobile Changes, opening the changed-files tree in a sheet
+- Added automatic Pull request tab opening once per workspace when a PR is detected
+- Added expandable plan cards, with rejected plans collapsed by default
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90004.txt b/fastlane/metadata/android/en-US/changelogs/90004.txt
new file mode 100644
index 0000000000..1c3326f7ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90004.txt
@@ -0,0 +1,9 @@
+Added
+- Added Cmd/Ctrl+F Find to file panes, with replacement in editable files
+- Added Cmd/Ctrl+F Find to terminal scrollback
+- Added Cmd/Ctrl+F Find to chat, including messages outside the loaded history window
+- Added Jump to file to mobile Changes, opening the changed-files tree in a sheet
+- Added automatic Pull request tab opening once per workspace when a PR is detected
+- Added expandable plan cards, with rejected plans collapsed by default
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90011.txt b/fastlane/metadata/android/en-US/changelogs/90011.txt
new file mode 100644
index 0000000000..c998686eb5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90011.txt
@@ -0,0 +1,8 @@
+Added
+- Added Opus 5.5 to the Claude catalog as its default model, with a 1M context window and Fast Mode, on Claude Code 2.1.280 and newer
+
+Fixed
+- Fixed the sidebar keeping only recently changed conversations after the app reconnects to a daemon
+- Fixed Import session offering only the newest 100 Codex conversations
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90012.txt b/fastlane/metadata/android/en-US/changelogs/90012.txt
new file mode 100644
index 0000000000..c998686eb5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90012.txt
@@ -0,0 +1,8 @@
+Added
+- Added Opus 5.5 to the Claude catalog as its default model, with a 1M context window and Fast Mode, on Claude Code 2.1.280 and newer
+
+Fixed
+- Fixed the sidebar keeping only recently changed conversations after the app reconnects to a daemon
+- Fixed Import session offering only the newest 100 Codex conversations
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90013.txt b/fastlane/metadata/android/en-US/changelogs/90013.txt
new file mode 100644
index 0000000000..c998686eb5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90013.txt
@@ -0,0 +1,8 @@
+Added
+- Added Opus 5.5 to the Claude catalog as its default model, with a 1M context window and Fast Mode, on Claude Code 2.1.280 and newer
+
+Fixed
+- Fixed the sidebar keeping only recently changed conversations after the app reconnects to a daemon
+- Fixed Import session offering only the newest 100 Codex conversations
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90014.txt b/fastlane/metadata/android/en-US/changelogs/90014.txt
new file mode 100644
index 0000000000..c998686eb5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90014.txt
@@ -0,0 +1,8 @@
+Added
+- Added Opus 5.5 to the Claude catalog as its default model, with a 1M context window and Fast Mode, on Claude Code 2.1.280 and newer
+
+Fixed
+- Fixed the sidebar keeping only recently changed conversations after the app reconnects to a daemon
+- Fixed Import session offering only the newest 100 Codex conversations
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90021.txt b/fastlane/metadata/android/en-US/changelogs/90021.txt
new file mode 100644
index 0000000000..830a25eea9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90021.txt
@@ -0,0 +1,12 @@
+Added
+- Added structured Claude Code launch arguments for session configuration and plugins
+
+Improved
+- Reduced background Git polling for repositories the watcher cannot observe
+- Reduced Add Project directory search time on large home directories
+
+Fixed
+- Fixed the daemon becoming unresponsive when ignored directories appear after a workspace opens
+- Fixed daemon memory growing after client connections close (9978988)
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90022.txt b/fastlane/metadata/android/en-US/changelogs/90022.txt
new file mode 100644
index 0000000000..830a25eea9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90022.txt
@@ -0,0 +1,12 @@
+Added
+- Added structured Claude Code launch arguments for session configuration and plugins
+
+Improved
+- Reduced background Git polling for repositories the watcher cannot observe
+- Reduced Add Project directory search time on large home directories
+
+Fixed
+- Fixed the daemon becoming unresponsive when ignored directories appear after a workspace opens
+- Fixed daemon memory growing after client connections close (9978988)
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90023.txt b/fastlane/metadata/android/en-US/changelogs/90023.txt
new file mode 100644
index 0000000000..830a25eea9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90023.txt
@@ -0,0 +1,12 @@
+Added
+- Added structured Claude Code launch arguments for session configuration and plugins
+
+Improved
+- Reduced background Git polling for repositories the watcher cannot observe
+- Reduced Add Project directory search time on large home directories
+
+Fixed
+- Fixed the daemon becoming unresponsive when ignored directories appear after a workspace opens
+- Fixed daemon memory growing after client connections close (9978988)
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/90024.txt b/fastlane/metadata/android/en-US/changelogs/90024.txt
new file mode 100644
index 0000000000..830a25eea9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90024.txt
@@ -0,0 +1,12 @@
+Added
+- Added structured Claude Code launch arguments for session configuration and plugins
+
+Improved
+- Reduced background Git polling for repositories the watcher cannot observe
+- Reduced Add Project directory search time on large home directories
+
+Fixed
+- Fixed the daemon becoming unresponsive when ignored directories appear after a workspace opens
+- Fixed daemon memory growing after client connections close (9978988)
+
+Full notes: https://paseo.sh/changelog
diff --git a/knip.json b/knip.json
index f61a8a33b7..e4f5cec73d 100644
--- a/knip.json
+++ b/knip.json
@@ -1,6 +1,10 @@
 {
   "$schema": "./node_modules/knip/schema.json",
   "workspaces": {
+    "plugins": {
+      "entry": ["**/index.{server,client}.{ts,tsx}", "**/*.test.ts"],
+      "project": ["**/*.{ts,tsx}"]
+    },
     ".": {
       "entry": ["scripts/**/*.{js,mjs,cjs,ts}"],
       "project": ["scripts/**/*.{js,mjs,cjs,ts}"]
diff --git a/nix/desktop-package.nix b/nix/desktop-package.nix
index d00b382083..dae45db386 100644
--- a/nix/desktop-package.nix
+++ b/nix/desktop-package.nix
@@ -157,6 +157,9 @@ buildNpmPackage {
         cp -a "$path" "$out/share/paseo-desktop/$path"
       done < desktop-files.txt
 
+      # Shell hooks invoke the retained CLI bin directly, without a system Node.
+      patchShebangs --build "$out/share/paseo-desktop"
+
       # 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
diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 4d257077c9..8906abc66b 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-R5NuJTwMOYPo0i60qhF0lZU+OMHwjnIKf9gI1fCJ9/M=
+sha256-CK96G7MWsmd/VDvkuaFJ23U04EGNmeiXdTYbmR8RDDQ=
diff --git a/nix/package.nix b/nix/package.nix
index 417f3d2ad1..b032d88396 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -120,6 +120,9 @@ buildNpmPackage rec {
       cp -a "$path" "$out/lib/paseo/$path"
     done < daemon-files.txt
 
+    # Shell hooks invoke the retained CLI bin directly, without a system Node.
+    patchShebangs --build "$out/lib/paseo"
+
     # Root package.json lets node resolve the workspace layout when the
     # CLI/server bin starts from $out.
     cp package.json $out/lib/paseo/
diff --git a/package-lock.json b/package-lock.json
index 6e9576aba6..c31951b1b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,16 @@
 {
   "name": "paseo",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
+        "plugins",
         "packages/expo-two-way-audio",
         "packages/highlight",
         "packages/plugin",
@@ -28,6 +29,7 @@
         "@vercel/nft": "^1.5.0",
         "concurrently": "^9.2.1",
         "cross-env": "^10.1.0",
+        "electron": "44.2.0",
         "get-port-cli": "^3.0.0",
         "js-yaml": "^4.1.1",
         "knip": "^5.82.1",
@@ -2883,6 +2885,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/@electron-internal/extract-zip": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.5.tgz",
+      "integrity": "sha512-+bqFCP98pLI0Tt0XQo1TmlXtwjWchISndDOxCkEcIuUgXWpBnLyRI+2DU+mesvnMMX6L1XDqYNA0lXNDHd/yiA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=22.12.0"
+      }
+    },
     "node_modules/@electron/asar": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
@@ -2989,70 +3001,37 @@
       }
     },
     "node_modules/@electron/get": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
-      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.1.0.tgz",
+      "integrity": "sha512-3kSBtG8ObcTVfXanm5vVJ6UnBLEVmVsRk1M+vGqCuMBV+XLCbJYuWQful+yIy0GQDsSlK0kHEriEHn7SPk4EnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "got": "^11.8.5",
+        "env-paths": "^3.0.0",
+        "graceful-fs": "^4.2.11",
         "progress": "^2.0.3",
-        "semver": "^6.2.0",
+        "semver": "^7.6.3",
         "sumchecker": "^3.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=22.12.0"
       },
       "optionalDependencies": {
-        "global-agent": "^3.0.0"
+        "undici": "^7.24.4"
       }
     },
-    "node_modules/@electron/get/node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/@electron/get/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "license": "MIT",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/get/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@electron/get/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+    "node_modules/@electron/get/node_modules/env-paths": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+      "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 4.0.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@electron/notarize": {
@@ -6351,10 +6330,23 @@
       "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
+    "node_modules/@fontsource-variable/geist": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource-variable/geist/-/geist-5.3.0.tgz",
+      "integrity": "sha512-j0m+vLQuG5XAYoHtGCVu0spvlGreR3EzpECUVzkFmI1mTVnAO38l/NEPDCFgZ177JxzYJCLSmTQibIiYPilGrA==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
     "node_modules/@getpaseo/app": {
       "resolved": "packages/app",
       "link": true
     },
+    "node_modules/@getpaseo/builtin-plugins": {
+      "resolved": "plugins",
+      "link": true
+    },
     "node_modules/@getpaseo/cli": {
       "resolved": "packages/cli",
       "link": true
@@ -8293,6 +8285,84 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.4.tgz",
+      "integrity": "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.4.tgz",
+      "integrity": "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.4.tgz",
+      "integrity": "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.4.tgz",
+      "integrity": "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.4.tgz",
+      "integrity": "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.4.tgz",
+      "integrity": "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz",
@@ -8666,6 +8736,48 @@
         "node": ">=20.0"
       }
     },
+    "node_modules/@opencode/client": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@opencode/client/-/client-2.0.10.tgz",
+      "integrity": "sha512-Pz4FD6jVtfZYX97AghVTM+cedi3HfI+U6gg/we5Luf08L85TewKsSXR4jHOZTCvggl0vACTquz1/hOjsJWE0Sg==",
+      "license": "MIT",
+      "dependencies": {
+        "@opencode/protocol": "2.0.10",
+        "@opencode/schema": "2.0.10"
+      },
+      "peerDependencies": {
+        "effect": "4.0.0-rc.112",
+        "solid-js": ">=1.9.0"
+      },
+      "peerDependenciesMeta": {
+        "effect": {
+          "optional": true
+        },
+        "solid-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@opencode/protocol": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@opencode/protocol/-/protocol-2.0.10.tgz",
+      "integrity": "sha512-cHr0aSK39Q9c3JwPDvG45FFlE6rU/ntTFDSaqm4LRl74tki88G4WpzKk6Q56G06K6hKIONrezcPdXtDKtnZzyw==",
+      "license": "MIT",
+      "dependencies": {
+        "@opencode/schema": "2.0.10",
+        "effect": "4.0.0-rc.112"
+      }
+    },
+    "node_modules/@opencode/schema": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@opencode/schema/-/schema-2.0.10.tgz",
+      "integrity": "sha512-RpRhRZFH1YFnM+OcrxOZc2ObIW3RQ63z/LkcHrZKa47kWF0OiaZVkbAOITeAoAoofcnS3O5ekZBvgT/7kBwRUA==",
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "1.1.0",
+        "effect": "4.0.0-rc.112"
+      }
+    },
     "node_modules/@opentelemetry/api": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
@@ -13081,6 +13193,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/semver": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.8.0.tgz",
+      "integrity": "sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/send": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
@@ -13187,17 +13306,6 @@
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "license": "MIT"
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.56.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
@@ -15813,16 +15921,6 @@
         "ieee754": "^1.2.1"
       }
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -18658,6 +18756,16 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "license": "MIT"
     },
+    "node_modules/effect": {
+      "version": "4.0.0-rc.112",
+      "resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-rc.112.tgz",
+      "integrity": "sha512-wXxwuh1Ywnv4cPRM3Wfa0vDwuOHnZ1TsTgHJkG9XgzND6inhBH9n1vBxhg3iIXOia/OrpmvVmd3lrD4vq6bF3A==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-check": "^4.9.0",
+        "msgpackr": "^2.0.5"
+      }
+    },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
@@ -18675,22 +18783,22 @@
       }
     },
     "node_modules/electron": {
-      "version": "41.2.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-41.2.0.tgz",
-      "integrity": "sha512-0OKLiymqfV0WK68RBXqAm3Myad2TpI5wwxLCBEUcH5Nugo3YfSk7p1Js/AL9266qTz5xZioUnxt9hG8FFwax0g==",
+      "version": "44.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-44.2.0.tgz",
+      "integrity": "sha512-oK1icjhapp3xsUZycO9WZaLmd3hJnA7ieobC4mpdtO1pEN+PPGWpA3m1Mgzzuc1wzSD2Wai4zcH4yfpGJqxFMA==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@electron/get": "^2.0.0",
-        "@types/node": "^24.9.0",
-        "extract-zip": "^2.0.1"
+        "@electron-internal/extract-zip": "^1.0.1",
+        "@electron/get": "^5.0.0",
+        "@types/node": "^24.9.0"
       },
       "bin": {
-        "electron": "cli.js"
+        "electron": "cli.js",
+        "install-electron": "install.js"
       },
       "engines": {
-        "node": ">= 12.20.55"
+        "node": ">= 22.12.0"
       }
     },
     "node_modules/electron-builder": {
@@ -18797,19 +18905,19 @@
       }
     },
     "node_modules/electron/node_modules/@types/node": {
-      "version": "24.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.2.tgz",
-      "integrity": "sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==",
+      "version": "24.13.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.3.tgz",
+      "integrity": "sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.16.0"
+        "undici-types": "~7.18.0"
       }
     },
     "node_modules/electron/node_modules/undici-types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
-      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT"
     },
@@ -21881,43 +21989,6 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/extsprintf": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
@@ -21939,6 +22010,28 @@
         "node": ">=18"
       }
     },
+    "node_modules/fast-check": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.10.0.tgz",
+      "integrity": "sha512-hhqQL+IJllZi3aM4TKvmCj3bywLEcycNTTLZeLhA9ttMxBrCqM07q7Di4kl+j9EWSTXvJH1+EpIgsDbF/+8H5Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "pure-rand": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.17.0"
+      }
+    },
     "node_modules/fast-copy": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-4.0.2.tgz",
@@ -22082,16 +22175,6 @@
         "walk-up-path": "^4.0.0"
       }
     },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -26187,17 +26270,6 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/lucide-react-native": {
-      "version": "0.546.0",
-      "resolved": "https://registry.npmjs.org/lucide-react-native/-/lucide-react-native-0.546.0.tgz",
-      "integrity": "sha512-v/qe5JnOHKIhccqfE7Ln78wd0mn5YgmCBvkTX2ca8sWeoym3ZYZcY/mapFsxssarutO4bMI/bRtTqiusGbpOUw==",
-      "license": "ISC",
-      "peerDependencies": {
-        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-native": "*",
-        "react-native-svg": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0"
-      }
-    },
     "node_modules/lz-string": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
@@ -28224,6 +28296,37 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
+    "node_modules/msgpackr": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-2.1.0.tgz",
+      "integrity": "sha512-p/pBCVO63CsvvpkomUnNNag6+n38rULuDA6HHe70o2gtC8ODI52foF/4ko2qQcp6OiErJXTmrZeXmsGGHsIQNQ==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.4"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.4.tgz",
+      "integrity": "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4"
+      }
+    },
     "node_modules/multipasta": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
@@ -28549,6 +28652,21 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
     "node_modules/node-gyp/node_modules/chownr": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
@@ -29636,13 +29754,6 @@
         "url": "https://github.com/sponsors/jet2jet"
       }
     },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -30231,6 +30342,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/pure-rand": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.2.tgz",
+      "integrity": "sha512-vvuOGgcuPJAirlHvuQw1TrOiw7ptaIXXmIbNuiNOY6lNGJJH49PQ1Kj4nd783nPdQhQdicgOjVI2yI/9BD6/Ng==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/qrcode": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
@@ -34564,7 +34691,6 @@
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -36137,17 +36263,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
@@ -36298,7 +36413,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -36363,13 +36478,14 @@
         "fast-deep-equal": "^3.1.3",
         "htmlparser2": "^12.0.0",
         "i18next": "^26.3.0",
-        "lucide-react-native": "^0.546.0",
+        "lucide-react-native": "^1.50.0",
         "markdown-it": "^10.0.0",
         "mermaid": "^11.16.0",
         "mnemonic-id": "^3.2.7",
         "qrcode": "^1.5.4",
         "react": "19.1.0",
         "react-dom": "19.1.0",
+        "react-freeze": "1.0.4",
         "react-i18next": "^17.0.8",
         "react-native": "0.81.5",
         "react-native-draggable-flatlist": "^4.0.3",
@@ -37217,6 +37333,23 @@
         "node": ">=20.19.0"
       }
     },
+    "packages/app/node_modules/lucide-react-native": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/lucide-react-native/-/lucide-react-native-1.50.0.tgz",
+      "integrity": "sha512-uMtIW3I6jfHbUp2FnUwxbDJc7XFJDz2g5YVcw6T/De8Sp9f21vTO7HlJNhxpBynDYlqLyWHaXeR0dBSiw6TqOw==",
+      "license": "ISC",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-native": "*",
+        "react-native-svg": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "packages/app/node_modules/miniflare": {
       "version": "4.20260625.0",
       "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260625.0.tgz",
@@ -37363,12 +37496,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.7.2",
-        "@getpaseo/protocol": "0.7.2",
-        "@getpaseo/server": "0.7.2",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/server": "0.11.2",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37615,10 +37748,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
-        "@getpaseo/protocol": "0.7.2",
-        "@getpaseo/relay": "0.7.2",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/relay": "0.11.2",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37629,7 +37762,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37640,9 +37773,10 @@
         "zod": "^4.4.3"
       },
       "devDependencies": {
+        "@electron/asar": "3.4.1",
         "@types/node": "24.6.0",
         "@types/ws": "^8.5.14",
-        "electron": "41.2.0",
+        "electron": "44.2.0",
         "electron-builder": "26.8.1",
         "typescript": "5.9.3",
         "unzip-crx-3": "^0.2.0",
@@ -37872,7 +38006,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38768,7 +38902,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38797,43 +38931,74 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
+        "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.7.2",
-        "@getpaseo/protocol": "0.7.2",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
+        "react-native": "0.81.5",
         "typescript": "^5.9.3",
         "vitest": "^4.1.6",
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.7.2",
-        "@getpaseo/protocol": "0.7.2",
-        "react": "19.1.0",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
+        "react": "~19.1.0",
+        "react-native": ">=0.81.5",
         "zod": "^4.4.3"
+      },
+      "peerDependenciesMeta": {
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "packages/plugin/node_modules/@agentclientprotocol/sdk": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.4.0.tgz",
+      "integrity": "sha512-/eufudw+aFY1LKLolT6yFE6UMmYRl7fMJ/DEONSIyR6wI3slHWITBsANRGqXEY8FRzqUxwh7QEaGiZHcJPVThg==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "zod": "^3.25.0 || ^4.0.0"
       }
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
+        "semver": "^7.8.5",
         "zod": "^4.4.3"
       },
       "devDependencies": {
         "@types/node": "^20.9.0",
+        "@types/semver": "^7.8.0",
         "typescript": "^5.2.2",
         "vitest": "^4.1.6",
         "zod-aot": "0.20.4"
       }
     },
+    "packages/protocol/node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39051,19 +39216,20 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.7.2",
-        "@getpaseo/highlight": "0.7.2",
-        "@getpaseo/plugin": "0.7.2",
-        "@getpaseo/protocol": "0.7.2",
-        "@getpaseo/relay": "0.7.2",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/highlight": "0.11.2",
+        "@getpaseo/plugin": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/relay": "0.11.2",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
+        "@opencode/client": "2.0.10",
         "@xterm/headless": "^6.0.0",
         "ai": "5.0.78",
         "ajv": "^8.20.0",
@@ -39073,6 +39239,7 @@
         "express": "^4.18.2",
         "fast-deep-equal": "^3.1.3",
         "lru-cache": "^11.5.1",
+        "markdown-it": "^10.0.0",
         "mnemonic-id": "^3.2.7",
         "node-pty": "1.2.0-beta.15",
         "openai": "^6.44.0",
@@ -39083,17 +39250,21 @@
         "pino-pretty": "^13.1.3",
         "qrcode": "^1.5.4",
         "rotating-file-stream": "^3.2.9",
+        "semver": "^7.8.5",
         "sherpa-onnx-node": "1.12.28",
         "strip-ansi": "^7.1.2",
         "tree-kill": "^1.2.2",
+        "typescript": "^5.9.3",
         "uuid": "^9.0.1",
         "which": "^5.0.0",
         "ws": "^8.14.2",
+        "yaml": "2.9.1",
         "zod": "^4.4.3"
       },
       "devDependencies": {
         "@playwright/test": "^1.56.1",
         "@types/express": "^4.17.20",
+        "@types/markdown-it": "^14.2.0",
         "@types/node": "^20.9.0",
         "@types/qrcode": "^1.5.6",
         "@types/uuid": "^9.0.7",
@@ -39101,7 +39272,6 @@
         "@vitest/ui": "^4.1.6",
         "cross-env": "^10.1.0",
         "tsx": "^4.6.0",
-        "typescript": "^5.2.2",
         "vitest": "^4.1.6"
       }
     },
@@ -39539,6 +39709,17 @@
         "cross-spawn": "7.0.6"
       }
     },
+    "packages/server/node_modules/@types/markdown-it": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.2.0.tgz",
+      "integrity": "sha512-NoQ2yGlLWj4wpxMs+TYmRKk3thDrQ97agr7sFqfLsAlvoS8SNQuTrlObhFqG9iugdTtgOE9jpJ6FNM4ZGsa5xQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
     "packages/server/node_modules/@vitest/expect": {
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.6.tgz",
@@ -39777,6 +39958,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/server/node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "packages/server/node_modules/strip-ansi": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
@@ -39924,6 +40117,21 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
+    "packages/server/node_modules/yaml": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.1.tgz",
+      "integrity": "sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
     "packages/server/node_modules/yocto-queue": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
@@ -39938,10 +40146,12 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.7.2",
+      "version": "0.11.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
+        "@fontsource-variable/geist": "^5.3.0",
+        "@getpaseo/protocol": "*",
         "@tanstack/react-router": "^1.170.16",
         "@tanstack/react-start": "^1.168.26",
         "framer-motion": "^12.35.2",
@@ -39964,6 +40174,7 @@
         "@types/react": "^19.1.6",
         "@types/react-dom": "^19.1.5",
         "@vitejs/plugin-react": "^4.5.1",
+        "parse5": "^7.3.0",
         "typescript": "^5.9.3",
         "vite": "^7.3.3",
         "vite-tsconfig-paths": "^5.1.4",
@@ -41540,6 +41751,18 @@
           "optional": true
         }
       }
+    },
+    "plugins": {
+      "name": "@getpaseo/builtin-plugins",
+      "version": "0.11.2",
+      "dependencies": {
+        "@getpaseo/plugin": "*",
+        "zod": "^4.4.3"
+      },
+      "devDependencies": {
+        "@types/node": "^20.9.0",
+        "vitest": "^4.1.6"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 375e5f0b82..ecbfd83891 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
@@ -21,6 +21,7 @@
     "url": "https://github.com/getpaseo/paseo.git"
   },
   "workspaces": [
+    "plugins",
     "packages/expo-two-way-audio",
     "packages/highlight",
     "packages/plugin",
@@ -66,7 +67,7 @@
     "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",
-    "typecheck:server": "npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run typecheck --workspace=@getpaseo/client && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli",
+    "typecheck:server": "npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run typecheck --workspace=@getpaseo/client && npm run typecheck --workspace=@getpaseo/builtin-plugins && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli",
     "test": "npm run test --workspaces --if-present",
     "format": "oxfmt .",
     "format:files": "oxfmt",
@@ -126,6 +127,7 @@
     "@vercel/nft": "^1.5.0",
     "concurrently": "^9.2.1",
     "cross-env": "^10.1.0",
+    "electron": "44.2.0",
     "get-port-cli": "^3.0.0",
     "js-yaml": "^4.1.1",
     "knip": "^5.82.1",
diff --git a/packages/app/app.config.js b/packages/app/app.config.js
index 1e13997956..e09a06f71d 100644
--- a/packages/app/app.config.js
+++ b/packages/app/app.config.js
@@ -2,9 +2,11 @@ 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 withAndroidOptionalCamera = require("./plugins/with-android-optional-camera");
 const withAndroidProfileable = require("./plugins/with-android-profileable");
 const withFdroidAutolinking = require("./plugins/with-fdroid-autolinking");
 const withPasteInput = require("./plugins/with-paste-input");
+const withAndroidScroll = require("./modules/paseo-scroll/app.plugin");
 const { getNativeReleaseVersion } = require("./native-release-version");
 const appVariant = process.env.APP_VARIANT ?? "production";
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
@@ -141,8 +143,10 @@ export default {
     plugins: [
       "expo-router",
       withPasteInput,
+      withAndroidScroll,
       [withAndroidAsyncStorageSize, 64],
       ...buildProfile.cameraPlugins,
+      withAndroidOptionalCamera,
       [
         "expo-splash-screen",
         {
diff --git a/packages/app/app.config.test.ts b/packages/app/app.config.test.ts
new file mode 100644
index 0000000000..b98258ff9a
--- /dev/null
+++ b/packages/app/app.config.test.ts
@@ -0,0 +1,61 @@
+import { createRequire } from "node:module";
+import { afterEach, describe, expect, it } from "vitest";
+
+// Load the copies the Expo CLI uses for prebuild, not older hoisted ones.
+const requireFromExpo = createRequire(require.resolve("expo/package.json"));
+const requireFromExpoCli = createRequire(requireFromExpo.resolve("@expo/cli/package.json"));
+const { getPrebuildConfigAsync } = requireFromExpoCli("@expo/prebuild-config");
+const { compileModsAsync } = requireFromExpoCli(
+  "@expo/config-plugins/build/plugins/mod-compiler.js",
+);
+
+interface ManifestEntry {
+  $: Record<string, string>;
+}
+
+const originalFdroidFlag = process.env.PASEO_FDROID_BUILD;
+
+async function resolveAndroidManifest() {
+  const { exp } = await getPrebuildConfigAsync(__dirname, { platforms: ["android"] });
+  await compileModsAsync(exp, {
+    projectRoot: __dirname,
+    introspect: true,
+    platforms: ["android"],
+    assertMissingModProviders: false,
+  });
+  return exp._internal.modResults.android.manifest.manifest;
+}
+
+describe("Android app config", () => {
+  afterEach(() => {
+    if (originalFdroidFlag === undefined) {
+      delete process.env.PASEO_FDROID_BUILD;
+    } else {
+      process.env.PASEO_FDROID_BUILD = originalFdroidFlag;
+    }
+  });
+
+  it.each([
+    ["Google Play", "0"],
+    ["F-Droid", "1"],
+  ])(
+    "%s build installs on devices without a camera",
+    async (_build, fdroidFlag) => {
+      process.env.PASEO_FDROID_BUILD = fdroidFlag;
+      const manifest = await resolveAndroidManifest();
+      const permissions = (manifest["uses-permission"] ?? []).map(
+        (entry: ManifestEntry) => entry.$["android:name"],
+      );
+      const features = (manifest["uses-feature"] ?? []).map((entry: ManifestEntry) => entry.$);
+
+      expect(permissions).toContain("android.permission.CAMERA");
+      expect(features).toEqual(
+        expect.arrayContaining([
+          { "android:name": "android.hardware.camera", "android:required": "false" },
+          { "android:name": "android.hardware.camera.autofocus", "android:required": "false" },
+        ]),
+      );
+    },
+    30_000,
+  );
+});
diff --git a/packages/app/e2e/browser/agent-message-submission.spec.ts b/packages/app/e2e/browser/agent-message-submission.spec.ts
index 295e07ba88..3bfda6b4b0 100644
--- a/packages/app/e2e/browser/agent-message-submission.spec.ts
+++ b/packages/app/e2e/browser/agent-message-submission.spec.ts
@@ -5,6 +5,7 @@ import {
   expectAgentIdle,
   expectAgentReadyToInterrupt,
   expectAgentSurfacesIdle,
+  expectInlineWorkingIndicator,
   expectRunningAgentChrome,
   expectVisibleAgentSurfacesIdle,
 } from "../support/helpers/agent-stream";
@@ -35,14 +36,18 @@ import { delayBrowserAgentCreatedStatus } from "../support/helpers/new-workspace
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import { gotoAppShell, openSettings, selectModel } from "../support/helpers/app";
 import { observeTimelineSubscriptions } from "../support/helpers/timeline-delivery";
+import { rememberTimelineRequestCounts } from "../support/helpers/timeline-resume";
 import {
-  expectResumeOverflowFallsBackToOneTail,
-  rememberTimelineRequestCounts,
-} from "../support/helpers/timeline-resume";
-import {
+  recordPanelToasts,
+  switchWorkspaceViaSidebar,
   waitForWorkspaceInSidebar,
   workspaceDeckEntryLocator,
 } from "../support/helpers/workspace-ui";
+import {
+  openSessions,
+  clickSessionRow,
+  expectWorkspaceTabVisible,
+} from "../support/helpers/archive-tab";
 import { expectInFlightForkAvailable } from "../support/helpers/assistant-fork";
 import {
   scrollTimelineToNewestLoadedEdge,
@@ -279,7 +284,6 @@ async function expectRejectedSubmissionRestored(
   await expectComposerDraft(page, input.prompt);
   await expectComposerEditable(page);
   await expectAttachmentPill(page, "composer-image-attachment-pill");
-  await expect(page.getByTestId("user-message").filter({ hasText: input.prompt })).toHaveCount(0);
   if (input.preservesActiveTurn) {
     await expect(page.getByTestId("turn-working-indicator")).toBeVisible();
     return;
@@ -290,13 +294,21 @@ async function expectRejectedSubmissionRestored(
 
 async function retryRestoredSubmission(page: Page, prompt: string): Promise<void> {
   await page.getByRole("textbox", { name: "Message agent..." }).first().press("Enter");
-  const userMessage = page.getByTestId("user-message").filter({ hasText: prompt });
-  await expect(userMessage).toHaveCount(1);
+  const attempts = page.getByTestId("user-message").filter({ hasText: prompt });
+  await expect(attempts).toHaveCount(2);
+  const userMessage = attempts.last();
   await expect(userMessage).toHaveAttribute("aria-busy", "false", { timeout: 30_000 });
   await expect(userMessage.getByRole("button", { name: "Open image attachment" })).toBeVisible();
   await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
 }
 
+async function expectRejectedPromptBeforeError(page: Page, prompt: string, errorMessage: string) {
+  const messages = page.getByTestId("user-message").or(page.getByTestId("assistant-message"));
+  await expect(messages).toHaveCount(2);
+  await expect(messages.nth(0)).toContainText(prompt);
+  await expect(messages.nth(1)).toContainText(`[System Error] ${errorMessage}`);
+}
+
 async function configureSteerInSettings(page: Page): Promise<void> {
   const modifier = process.platform === "darwin" ? "Meta" : "Control";
   await page.keyboard.press(`${modifier}+Comma`);
@@ -427,6 +439,18 @@ async function expectInterruptedTurnOrderAfterReconnect(
   }
 }
 
+async function visitEvictionWorkspaces(
+  page: Page,
+  agents: readonly { agentId: string }[],
+): Promise<void> {
+  for (const [index, agent] of agents.entries()) {
+    await openSessions(page);
+    await clickSessionRow(page, `Workspace eviction ${index + 1}.`);
+    await expectWorkspaceTabVisible(page, agent.agentId);
+    await expectComposerVisible(page);
+  }
+}
+
 async function expectHiddenStreamingSubmissionOrderAfterWorkspaceEviction(
   page: Page,
   testInfo: { workerIndex: number },
@@ -442,50 +466,76 @@ async function expectHiddenStreamingSubmissionOrderAfterWorkspaceEviction(
     Array.from({ length: WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES }, (_unused, index) =>
       seedMockAgentWorkspace({
         repoPrefix: `submission-workspace-eviction-${testInfo.workerIndex}-${index}-`,
-        title: `Workspace eviction ${index + 1}`,
+        title: `Workspace eviction ${index + 1}.`,
       }),
     ),
   );
   const prompt = "Keep this hidden image prompt before its streaming output.";
   const targetDeckEntry = workspaceDeckEntryLocator(page, getServerId(), target.workspaceId);
+  const openAgentIds = [target.agentId, ...evictionAgents.map((agent) => agent.agentId)];
 
   try {
     await openAgentRoute(page, target);
     await expectComposerVisible(page);
-    await subscriptions.waitForSubscribedAgents([target.agentId]);
+    // Open every chat before holding output. Adding chats replaces the timeline
+    // subscription and retires the IDs stamped on already-buffered frames.
+    await visitEvictionWorkspaces(page, evictionAgents);
+    await subscriptions.waitForSubscribedAgents(openAgentIds);
+    await switchWorkspaceViaSidebar({
+      page,
+      serverId: getServerId(),
+      workspaceId: target.workspaceId,
+    });
+    await expectWorkspaceTabVisible(page, target.agentId);
+    await expectComposerVisible(page);
+    const subscriptionRequests = gate.getClientRequestCount(
+      "agent.timeline.set_subscription.request",
+    );
 
     const userMessageCount = gate.getAgentStreamItemCount("user_message");
-    gate.setAgentStreamSuppressed(true);
+    gate.setAgentStreamItemSuppressed("user_message", true);
+    gate.holdNextAgentStreamEvent("turn_started");
     const promptRow = await submitMessageWithImage(page, prompt);
     await gate.waitForAgentStreamItem("user_message", userMessageCount + 1);
-
-    for (const evictionAgent of evictionAgents) {
-      await openAgentRoute(page, evictionAgent);
-      await expectComposerVisible(page);
-    }
-    await expect(targetDeckEntry).toHaveCount(0);
-    await subscriptions.waitForSubscribedAgents([
-      evictionAgents[WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES - 1]!.agentId,
-    ]);
-    gate.setAgentStreamSuppressed(false);
-
+    await gate.waitForHeldAgentStreamEvent("turn_started");
+    // Finish production before navigation so passing cannot depend on late
+    // chunks arriving after the final workspace switch.
     await target.client.waitForFinish(target.agentId, 30_000);
-    const requestsBeforeReturn = rememberTimelineRequestCounts(gate);
+
+    // Navigate inside the app: a document reload discards the retained deck and
+    // adds startup history fetches, so it cannot prove eviction/resume behavior.
+    await visitEvictionWorkspaces(page, evictionAgents);
+    await expect(targetDeckEntry).toHaveCount(0);
+    await subscriptions.waitForSubscribedAgents(openAgentIds);
+    expect(gate.getClientRequestCount("agent.timeline.set_subscription.request")).toBe(
+      subscriptionRequests,
+    );
+    gate.releaseHeldAgentStreamEvent("turn_started");
+    const requestsBeforeReturn = rememberTimelineRequestCounts(gate, target.agentId);
     await waitForWorkspaceInSidebar(page, {
       serverId: getServerId(),
       workspaceId: target.workspaceId,
     });
-    await openAgentRoute(page, target);
+    await switchWorkspaceViaSidebar({
+      page,
+      serverId: getServerId(),
+      workspaceId: target.workspaceId,
+    });
     await expectComposerVisible(page);
-    await subscriptions.waitForSubscribedAgents([target.agentId]);
+    await subscriptions.waitForSubscribedAgents(openAgentIds);
 
+    const responseStart = page.getByText("Cycle 1", { exact: true });
     const response = page.getByText("(end of synthetic stream)", { exact: true }).last();
     await expect(promptRow).toBeVisible();
+    await expect(responseStart).toBeVisible();
     await expect(response).toBeVisible();
+    await expectRenderedBefore(promptRow, responseStart);
     await expectRenderedBefore(promptRow, response);
-    expectResumeOverflowFallsBackToOneTail(gate, requestsBeforeReturn);
+    // Open chats stay subscribed when their workspace view is evicted. Returning
+    // uses that live timeline without another resume check or startup tail fetch.
+    expect(rememberTimelineRequestCounts(gate, target.agentId)).toEqual(requestsBeforeReturn);
   } finally {
-    gate.setAgentStreamSuppressed(false);
+    gate.setAgentStreamItemSuppressed("user_message", false);
     gate.restore();
     await Promise.all([...evictionAgents.map((agent) => agent.cleanup()), target.cleanup()]);
   }
@@ -549,9 +599,18 @@ async function expectProviderAcknowledgementBeforeRpcAcceptanceSettlesSubmission
     const userMessage = await submitMessageWithImage(page, prompt);
     await gate.waitForHeldServerMessage();
     await gate.waitForAgentStreamItem("user_message");
+    await gate.waitForAgentStreamEvent("turn_started");
     gate.releaseHeldServerMessage();
+    await expect(userMessage).toHaveAttribute("aria-busy", "false");
     await gate.drop();
-    await expect(page.getByTestId("turn-working-indicator")).toHaveCount(0);
+    await expectInlineWorkingIndicator(page);
+    await expect(userMessage).toHaveAttribute("aria-busy", "false");
+
+    await agent.client.waitForFinish(agent.agentId, 30_000);
+    gate.setServerMessageSuppressed("agent_status", false);
+    gate.setServerMessageSuppressed("agent_update", false);
+    gate.restoreFresh();
+    await expectVisibleAgentSurfacesIdle(page);
     await expect(userMessage).toHaveAttribute("aria-busy", "false");
   } finally {
     gate.restore();
@@ -858,7 +917,7 @@ test.describe("Agent message submission", () => {
     }
   });
 
-  test("keeps one canonical prompt when the provider echoes before accepting", async ({
+  test("keeps canonical prompts through early echoes, reload, and later turns", async ({
     page,
   }, testInfo) => {
     const workspace = await seedWorkspace({
@@ -879,6 +938,20 @@ test.describe("Agent message submission", () => {
       await expect(submittedPrompt).toHaveCount(1);
       await expect(submittedPrompt).toHaveAttribute("aria-busy", "false");
       await expectVisibleAgentSurfacesIdle(page);
+      for (const [index, nextPrompt] of [
+        "emit 1 coalesced agent stream updates for the second turn.",
+        "emit 1 coalesced agent stream updates for the third turn.",
+      ].entries()) {
+        await submitMessage(page, nextPrompt);
+        await expect(page.getByText(nextPrompt, { exact: true })).toBeVisible();
+        await expectVisibleAgentSurfacesIdle(page);
+        await expectComposerEditable(page);
+        await expect(page.getByTestId("user-message")).toHaveCount(index + 2);
+      }
+      await fillComposerDraft(page, "Keep this unsent draft.");
+      await composerLocator(page).blur();
+      await expect(page.getByTestId("user-message")).toHaveCount(3);
+      await expectComposerEditable(page);
     } finally {
       await workspace.cleanup();
     }
@@ -898,16 +971,12 @@ test.describe("Agent message submission", () => {
       await submitMessage(page, prompt);
       const submittedPrompt = page.getByTestId("user-message").filter({ hasText: prompt });
       await expect(submittedPrompt).toHaveAttribute("aria-busy", "false", { timeout: 30_000 });
-      const marker = `late-provider-identity-${Date.now()}`;
-      await submittedPrompt.evaluate((element, value) => {
-        element.dataset.lateProviderIdentity = value;
-      }, marker);
 
       await submittedPrompt.hover();
       await expect(submittedPrompt.getByTestId("rewind-menu-trigger")).toBeVisible({
         timeout: 5_000,
       });
-      await expect(page.locator(`[data-late-provider-identity="${marker}"]`)).toBeVisible();
+      await expect(submittedPrompt).toHaveCount(1);
       await page.getByRole("button", { name: "Stop agent", exact: true }).click();
       await expectVisibleAgentSurfacesIdle(page);
     } finally {
@@ -991,7 +1060,7 @@ test.describe("Agent message submission", () => {
       await openAgentRoute(page, agent);
       await expectComposerVisible(page);
       await submitMessage(page, "Keep running until the queued turn is ready.");
-      await expectAgentReadyToInterrupt(page);
+      await expectRunningAgentChrome(page, title);
       await queueMessage(page, secondPrompt);
       await expect(page.getByRole("button", { name: "Send queued message now" })).toBeVisible();
 
@@ -1104,17 +1173,21 @@ test.describe("Agent message submission", () => {
     draftCreateScenario,
   }) => {
     test.setTimeout(120_000);
+    const toasts = await recordPanelToasts(page);
     const pending = await beginDraftCreateSubmission(page, draftCreateScenario);
     await completeDraftCreateSubmission(page, draftCreateScenario, pending);
+    // A chat this client just created is current by construction; it is never out of date.
+    await toasts.expectNeverShown("agent-updating-toast");
   });
 
-  test("restores a rejected submission and accepts its retry", async ({
+  test("retains a rejected submission before its error and accepts its retry", async ({
     page,
     rejectionScenario,
   }) => {
     const prompt = "Restore this rejected submission.";
     await submitMessageThatWillBeRejected(page, prompt);
     await expectRejectedSubmissionRestored(page, { prompt, ...rejectionScenario });
+    await expectRejectedPromptBeforeError(page, prompt, rejectionScenario.errorMessage);
     await retryRestoredSubmission(page, prompt);
   });
 
@@ -1144,6 +1217,7 @@ test.describe("Agent message submission", () => {
         errorMessage: "Requested mock steer transport failure",
         preservesActiveTurn: true,
       });
+      await expect(page.getByTestId("user-message").filter({ hasText: prompt })).toHaveCount(0);
 
       expect(gate.getClientRequestCount("send_agent_message_request")).toBe(sendsBefore + 1);
       expect(gate.getClientRequestCount("cancel_agent_request")).toBe(cancelsBefore);
@@ -1177,6 +1251,7 @@ test.describe("Agent message submission", () => {
       await gate.waitForHeldServerMessage("send_agent_message_response");
       await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
       await expect(page.getByText(/^Worked for/)).toHaveCount(0);
+      await expectAgentReadyToInterrupt(page);
       gate.releaseHeldServerMessage("send_agent_message_response");
       await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
     } finally {
diff --git a/packages/app/e2e/browser/agent-profile-modeless-preferences.spec.ts b/packages/app/e2e/browser/agent-profile-modeless-preferences.spec.ts
index 2558d3b427..a10afd2cca 100644
--- a/packages/app/e2e/browser/agent-profile-modeless-preferences.spec.ts
+++ b/packages/app/e2e/browser/agent-profile-modeless-preferences.spec.ts
@@ -9,7 +9,7 @@ import {
   seedModelProvider,
 } from "../support/helpers/agent-profiles";
 import { gotoAppShell } from "../support/helpers/app";
-import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { captureWorkspaceAgentRequest } from "../support/helpers/creation";
 import {
   openGlobalNewWorkspaceComposer,
   selectNewWorkspaceProject,
@@ -22,53 +22,6 @@ 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 }) => {
@@ -143,7 +96,7 @@ test.describe("Agent profiles repair modeless provider preferences", () => {
       ],
     });
     await seedPoisonedModelessPreference(page);
-    const createAgentRecorder = await recordAndBlockCreateAgentRequest(page);
+    const createAgentRecorder = await captureWorkspaceAgentRequest(page, { block: true });
 
     try {
       await gotoAppShell(page);
@@ -206,7 +159,7 @@ test.describe("Agent profiles repair modeless provider preferences", () => {
         },
       ],
     });
-    const createAgentRecorder = await recordAndBlockCreateAgentRequest(page);
+    const createAgentRecorder = await captureWorkspaceAgentRequest(page, { block: true });
 
     try {
       await gotoAppShell(page);
diff --git a/packages/app/e2e/browser/agent-profiles-picker.spec.ts b/packages/app/e2e/browser/agent-profiles-picker.spec.ts
index d67de4da36..5dd5734710 100644
--- a/packages/app/e2e/browser/agent-profiles-picker.spec.ts
+++ b/packages/app/e2e/browser/agent-profiles-picker.spec.ts
@@ -6,13 +6,16 @@ import {
   expectAgentProfilesEmptyPrompt,
   expectProfileEditTooltip,
   expectComposerMode,
+  expectCreateProfileFromModelRow,
   expectComposerModel,
+  expectModelRowProfileActionBesideRow,
   expectModelRowSelected,
   expectProfileEditIsPencilOnly,
   expectProfileVisibleForProvider,
   openModelPicker,
   openAgentProfilesFromEmptyPrompt,
   seedAgentProfiles,
+  selectModelRow,
 } from "../support/helpers/agent-profiles";
 import { expectWorkspaceAgentConfiguration } from "../support/helpers/command-center-agent-controls";
 import { expectComposerVisible } from "../support/helpers/composer";
@@ -115,4 +118,34 @@ test.describe("Agent profiles in the model picker", () => {
       await seed.restore();
     }
   });
+
+  test("a model row and its create-profile action are separate buttons", async ({ page }) => {
+    const seed = await seedAgentProfiles([]);
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "agent-profiles-row-action-",
+      title: "Agent profiles row action",
+      model: "ten-second-stream",
+      modeId: "load-test",
+    });
+
+    try {
+      const oneMinute = {
+        provider: "mock",
+        modelId: "one-minute-stream",
+        modelLabel: "One minute stream",
+      };
+      await openAgentRoute(page, workspace);
+      await expectComposerVisible(page);
+      await openModelPicker(page);
+      await expectModelRowProfileActionBesideRow(page, oneMinute);
+      await expectCreateProfileFromModelRow(page, oneMinute);
+      await expectComposerModel(page, "Ten second stream");
+      await openModelPicker(page);
+      await selectModelRow(page, oneMinute);
+      await expectComposerModel(page, oneMinute.modelLabel);
+    } finally {
+      await workspace.cleanup();
+      await seed.restore();
+    }
+  });
 });
diff --git a/packages/app/e2e/browser/agent-relative-time.spec.ts b/packages/app/e2e/browser/agent-relative-time.spec.ts
new file mode 100644
index 0000000000..4fe1efe887
--- /dev/null
+++ b/packages/app/e2e/browser/agent-relative-time.spec.ts
@@ -0,0 +1,47 @@
+import { expect, test } from "../support/fixtures";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { getServerId } from "../support/helpers/server-id";
+import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { resetSeededPageState, openSessions } from "../support/helpers/archive-tab";
+
+test("agent list age advances and command center says just now for a fresh agent", async ({
+  page,
+}) => {
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "agent-relative-time-",
+    title: "Relative time agent",
+  });
+  try {
+    await session.client.waitForAgentUpsert(session.agentId, (agent) => agent.status === "idle");
+    await resetSeededPageState(page);
+    await page.clock.install({ time: Date.now() });
+    await openSessions(page);
+
+    const row = page.getByTestId(`agent-row-${getServerId()}-${session.agentId}`);
+    await expect(row).toContainText("just now", { timeout: 30_000 });
+
+    const commandCenter = await openCommandCenter(page);
+    await commandCenter.getByTestId("command-center-input").fill("Relative time agent");
+    const agentResult = commandCenter.getByTestId(
+      `command-center-agent-${getServerId()}:${session.agentId}`,
+    );
+    await expect(agentResult.getByTestId("command-center-agent-subtitle")).toContainText(
+      "just now",
+    );
+    await page.keyboard.press("Escape");
+
+    await page.clock.fastForward("03:00");
+    await expect(row).toContainText("3m ago");
+
+    await openAgentRoute(page, session);
+    await page.getByTestId(`workspace-tab-agent_${session.agentId}`).first().hover();
+    await expect(page.getByTestId(`workspace-tab-tooltip-agent_${session.agentId}`)).toContainText(
+      "3m ago",
+    );
+
+    await expect(page.getByTestId("sidebar-workspace-timestamp").first()).toHaveText("3m");
+  } finally {
+    await session.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/agent-stream-ui.spec.ts b/packages/app/e2e/browser/agent-stream-ui.spec.ts
index 229536893b..80832e5fe1 100644
--- a/packages/app/e2e/browser/agent-stream-ui.spec.ts
+++ b/packages/app/e2e/browser/agent-stream-ui.spec.ts
@@ -88,18 +88,12 @@ test.describe("Agent stream UI", () => {
       }
 
       await page.evaluate((block) => {
-        const evidence = {
-          addedNodes: 0,
-          characterDataMutations: 0,
-          removedNodes: 0,
-        };
+        const evidence = { addedNodes: 0, characterDataMutations: 0, removedNodes: 0 };
         const observer = new MutationObserver((records) => {
           for (const record of records) {
             evidence.addedNodes += record.addedNodes.length;
             evidence.removedNodes += record.removedNodes.length;
-            if (record.type === "characterData") {
-              evidence.characterDataMutations += 1;
-            }
+            if (record.type === "characterData") evidence.characterDataMutations += 1;
           }
         });
         observer.observe(block, { characterData: true, childList: true, subtree: true });
@@ -216,7 +210,9 @@ test.describe("Agent stream UI", () => {
     await expect(page.getByRole("button", { name: /stop|cancel/i }).first()).toBeVisible({
       timeout: 30_000,
     });
-    await awaitAssistantMessage(page);
+    // Reasoning rows collapse when the mock starts its next assistant response. Wait past
+    // that transition so their temporary height cannot satisfy the scroll-away setup.
+    await awaitAssistantMessage(page, "Now I have a clearer picture.");
     await waitForScrollableChat(page, {
       minScrollableDistance: SCROLL_AWAY_MIN_SCROLLABLE_DISTANCE,
       timeout: 45_000,
diff --git a/packages/app/e2e/browser/agent-timeline-pagination.spec.ts b/packages/app/e2e/browser/agent-timeline-pagination.spec.ts
index 980d3e3ab7..f2772b0b1b 100644
--- a/packages/app/e2e/browser/agent-timeline-pagination.spec.ts
+++ b/packages/app/e2e/browser/agent-timeline-pagination.spec.ts
@@ -1,6 +1,10 @@
 import { expect, test } from "../support/fixtures";
 import {
-  expectSameOlderHistoryLoadingOperation,
+  withSpokenTimeline,
+  captureSpokenTimeline,
+  reloadSpokenTimeline,
+  expectSpokenTimelinePrompt,
+  sendSpokenTimelinePrompt,
   expectStableHistoryStartGutter,
   expectTimelineAtHistoryStart,
   expectTimelinePromptCentered,
@@ -12,7 +16,6 @@ import {
   holdOlderHistoryPages,
   makeLoadedTimelineFitViewport,
   openAgentTimeline,
-  rememberOlderHistoryLoadingOperation,
   rememberTimelineViewport,
   rememberTimelinePromptPosition,
   reloadAgentTimelineFromPersistedReplica,
@@ -26,42 +29,28 @@ import {
   expectTimelineViewportAnchoredAfterPrepend,
   userNavigatesTimelineToHistoryStartWithKeyboard,
   userScrollsTimelineToHistoryStart,
-  waitForPersistedCanonicalTimelineRange,
 } from "../support/helpers/timeline-pagination";
-import { trackAgentTimelineRequests } from "../support/helpers/agent-timeline-gate";
-import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
 test.describe("Agent timeline pagination", () => {
-  test("resumes a persisted canonical timeline after its exact end", async ({ page }) => {
-    const prompt = "timeline persisted range resumes without tail replay";
-    const agent = await seedMockAgentWorkspace({
-      repoPrefix: "timeline-persisted-range-",
-      title: "Persisted timeline range",
-      initialPrompt: prompt,
-    });
-    try {
-      await agent.client.waitForFinish(agent.agentId, 15_000);
+  test("shows spoken words without voice instructions in history, live updates and after reload", async ({
+    page,
+  }, testInfo) => {
+    const historyText = "Please check the voice history.";
+    const liveText = "Now check the live voice message.";
+    await withSpokenTimeline(historyText, async (agent) => {
       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();
-    }
+      await expectSpokenTimelinePrompt(page, historyText);
+      await sendSpokenTimelinePrompt(agent, liveText);
+      await expectSpokenTimelinePrompt(page, liveText);
+      await captureSpokenTimeline(page, testInfo, "desktop");
+      await reloadSpokenTimeline(page);
+      await expectSpokenTimelinePrompt(page, liveText);
+      await captureSpokenTimeline(page, testInfo, "compact");
+      await expectSpokenTimelinePrompt(page, liveText);
+    });
   });
 
-  test("keeps a fixed history-start gutter before, during, and after pagination", async ({
+  test("keeps the history-start gutter and visible position stable through the final page", async ({
     page,
   }) => {
     const agent = await seedLongMockAgentTimeline({ turns: 40 });
@@ -73,8 +62,10 @@ test.describe("Agent timeline pagination", () => {
       await userScrollsTimelineToHistoryStart(page);
       await history.expectRequestedPages(1);
       await expectStableHistoryStartGutter(page);
+      const viewport = await rememberTimelineViewport(page);
 
       history.releasePage(1);
+      await expectTimelineViewportAnchoredAfterPrepend(page, viewport);
       await history.expectSettledWithRequestedPages(1);
       await expectStableHistoryStartGutter(page);
     } finally {
@@ -96,7 +87,9 @@ test.describe("Agent timeline pagination", () => {
       await userScrollsTimelineToHistoryStart(page);
       await expectTimelinePromptVisible(page, agent.initialTailOldestPrompt);
       await history.expectRequestedPages(1);
+      const viewport = await rememberTimelineViewport(page);
       history.releasePage(1);
+      await expectTimelineViewportAnchoredAfterPrepend(page, viewport);
       await history.expectSettledWithRequestedPages(1);
 
       await userScrollsTimelineToHistoryStart(page);
@@ -137,23 +130,6 @@ test.describe("Agent timeline pagination", () => {
     }
   });
 
-  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,
   }) => {
@@ -181,7 +157,8 @@ test.describe("Agent timeline pagination", () => {
 
   test("finishes loading an older page while live output continues", async ({ page }) => {
     test.setTimeout(120_000);
-    const agent = await seedLongMockAgentTimeline({ turns: 40 });
+    // The live turn streams for thirty minutes, so it is still running at every assertion.
+    const agent = await seedLongMockAgentTimeline({ turns: 40, liveTurns: "thirty-minute-stream" });
     try {
       const history = await holdOlderHistoryPages(page, agent);
       await openAgentTimeline(page, agent);
@@ -193,8 +170,11 @@ test.describe("Agent timeline pagination", () => {
         agent.agentId,
         (snapshot) => snapshot.status === "running",
       );
+      const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+      await expect(timeline.getByText("walking through").first()).toBeAttached();
       history.releasePage(1);
 
+      await expect(timeline.getByText(agent.newestOlderPagePrompt, { exact: true })).toBeAttached();
       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(
@@ -205,28 +185,7 @@ test.describe("Agent timeline pagination", () => {
     }
   });
 
-  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("keeps loading while older pages still leave history start exposed", async ({ page }) => {
     test.setTimeout(120_000);
     const agent = await seedLongMockAgentTimeline({ turns: 80 });
     try {
@@ -235,12 +194,12 @@ test.describe("Agent timeline pagination", () => {
       await openAgentTimeline(page, agent);
       await scrollTimelineToOldestLoadedEdge(page);
       await history.expectRequestedPages(1);
-      const loading = await rememberOlderHistoryLoadingOperation(page);
+      await expect(page.getByTestId("load-older-history-spinner")).toBeVisible();
 
       history.releasePage(1);
       await history.expectRequestedPages(2);
       await expectTimelineAtHistoryStart(page);
-      await expectSameOlderHistoryLoadingOperation(page, loading);
+      await expect(page.getByTestId("load-older-history-spinner")).toBeVisible();
     } finally {
       await agent.cleanup();
     }
diff --git a/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
new file mode 100644
index 0000000000..feceed7869
--- /dev/null
+++ b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
@@ -0,0 +1,152 @@
+import { test } from "../support/fixtures";
+import { expect } from "@playwright/test";
+import {
+  findScrollJumps,
+  expectImageSpaceReserved,
+  type ScrollFrame,
+  observeTimelinePages,
+  openOnlyTimelineTail,
+  recordUpwardTraversal,
+  reportScrollJumps,
+  scrollCadences,
+  withVariedTimeline,
+} from "../support/helpers/timeline-scroll-smoothness";
+
+test("scroll detector distinguishes entered image growth from a simultaneous viewport jump", () => {
+  const before: ScrollFrame = {
+    at: 1000,
+    scrollTop: 1000,
+    scrollHeight: 5000,
+    viewportHeight: 800,
+    virtualized: true,
+    loading: false,
+    rows: [
+      { id: "image", top: -150, height: 150 },
+      { id: "reading", top: 0, height: 100 },
+    ],
+    anchor: "reading",
+    wheelTotal: 0,
+    lastWheelAt: 0,
+    inputFinishedAt: null,
+    imageLoads: 0,
+    mounted: 0,
+    unmounted: 0,
+  };
+  const after: ScrollFrame = {
+    ...before,
+    at: 1400,
+    scrollTop: 900,
+    wheelTotal: 100,
+    lastWheelAt: 1050,
+    rows: [
+      { id: "image", top: -50, height: 1150 },
+      { id: "reading", top: 1100, height: 100 },
+    ],
+  };
+  expect(findScrollJumps([before, after])).toEqual([]);
+  expect(
+    findScrollJumps([
+      { ...before, scrollTop: 200 },
+      {
+        ...after,
+        wheelTotal: 1000,
+        scrollTop: 0,
+        rows: after.rows.map((row) => ({ ...row, top: row.top + 100 })),
+      },
+    ]),
+  ).toEqual([]);
+  expect(
+    findScrollJumps([
+      before,
+      { ...after, rows: after.rows.map((row) => ({ ...row, top: row.top - 500 })) },
+    ]),
+  ).toHaveLength(1);
+  expect(
+    findScrollJumps([
+      { ...before, anchor: "image", rows: [{ id: "image", top: 0, height: 150 }] },
+      { ...after, rows: [{ id: "image", top: 600, height: 1150 }] },
+    ]),
+  ).toHaveLength(1);
+});
+
+test("scroll detector accounts for delayed wheel input and growth below the new reader", () => {
+  const before: ScrollFrame = {
+    at: 1000,
+    scrollTop: 2000,
+    scrollHeight: 5000,
+    viewportHeight: 800,
+    virtualized: true,
+    loading: false,
+    rows: [
+      { id: "new-reader", top: -520, height: 278 },
+      { id: "image", top: -242, height: 184 },
+      { id: "old-reader", top: -58, height: 130 },
+    ],
+    anchor: "old-reader",
+    wheelTotal: 0,
+    lastWheelAt: 0,
+    inputFinishedAt: null,
+    imageLoads: 0,
+    mounted: 0,
+    unmounted: 0,
+  };
+  const wheel = { ...before, at: 1100, wheelTotal: 480, lastWheelAt: 1099 };
+  const after: ScrollFrame = {
+    ...wheel,
+    at: 1220,
+    scrollTop: 1520,
+    scrollHeight: 5041,
+    anchor: "new-reader",
+    rows: [
+      { id: "new-reader", top: -40, height: 278 },
+      { id: "image", top: 238, height: 225 },
+      { id: "old-reader", top: 463, height: 130 },
+    ],
+  };
+  expect(findScrollJumps([before, wheel, after])).toEqual([]);
+  // The previous 480 px input has already moved the viewport; the recent
+  // budget includes it, but only the next 480 px belongs to this frame.
+  const steadyBefore = { ...before, at: 1050, wheelTotal: 480, lastWheelAt: 1049 };
+  const steadyAfter = {
+    ...after,
+    at: 1100,
+    wheelTotal: 960,
+    lastWheelAt: 1099,
+    scrollHeight: 6000,
+    rows: [
+      { id: "new-reader", top: -40, height: 278 },
+      { id: "image", top: 238, height: 1184 },
+      { id: "old-reader", top: 1422, height: 130 },
+    ],
+  };
+  expect(findScrollJumps([steadyBefore, steadyAfter])).toEqual([]);
+
+  expect(
+    findScrollJumps([
+      before,
+      wheel,
+      {
+        ...after,
+        rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
+      },
+    ]),
+  ).toHaveLength(1);
+});
+
+for (const cadence of scrollCadences) {
+  test(`varied timeline preserves reading position during ${cadence.name} upward scrolling`, async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(180_000);
+    await withVariedTimeline(async (agent, newestPrompt) => {
+      const pages = observeTimelinePages(page, agent.agentId);
+      await openOnlyTimelineTail(page, agent, newestPrompt, pages);
+      const frames = await recordUpwardTraversal(page, cadence, testInfo);
+      await reportScrollJumps(page, testInfo, frames, pages);
+    });
+  });
+}
+
+test("reserves image space before its response arrives", async ({ page }, testInfo) => {
+  await expectImageSpaceReserved(page, testInfo);
+});
diff --git a/packages/app/e2e/browser/appearance-theme-picker.spec.ts b/packages/app/e2e/browser/appearance-theme-picker.spec.ts
index 8df71f0911..b0d86e164e 100644
--- a/packages/app/e2e/browser/appearance-theme-picker.spec.ts
+++ b/packages/app/e2e/browser/appearance-theme-picker.spec.ts
@@ -35,7 +35,7 @@ test("keeps the selected workspace visible in Light", async ({ page }, testInfo)
     await row.click();
 
     await expect(row).toHaveAttribute("aria-selected", "true");
-    await expect(row).toHaveCSS("background-color", "rgb(228, 228, 231)");
+    await expect(row).toHaveCSS("background-color", "rgb(212, 212, 216)");
     await page.screenshot({
       path: testInfo.outputPath("light-selected-workspace.png"),
       fullPage: true,
diff --git a/packages/app/e2e/browser/assistant-fork-menu.spec.ts b/packages/app/e2e/browser/assistant-fork-menu.spec.ts
index 2819347ab7..b5a0b0c27a 100644
--- a/packages/app/e2e/browser/assistant-fork-menu.spec.ts
+++ b/packages/app/e2e/browser/assistant-fork-menu.spec.ts
@@ -84,6 +84,7 @@ test.describe("Assistant fork menu", () => {
     await forkInFlightTurnToNewTab(page);
     await expectChatHistoryAttachment(page);
     expect(await forkAttachment.waitForText()).toContain(visibleBeforeFork);
+    await expect(page.getByRole("button", { name: "Menu backdrop", exact: true })).toHaveCount(0);
 
     await page.getByRole("button", { name: sourceAgentTitle }).click();
     await expectLiveAssistantText(page, visibleAfterFork);
diff --git a/packages/app/e2e/browser/assistant-selection-copy.spec.ts b/packages/app/e2e/browser/assistant-selection-copy.spec.ts
index d80401deb4..bf8e455c88 100644
--- a/packages/app/e2e/browser/assistant-selection-copy.spec.ts
+++ b/packages/app/e2e/browser/assistant-selection-copy.spec.ts
@@ -1,4 +1,4 @@
-import type { BrowserContext } from "@playwright/test";
+import type { BrowserContext, Locator } from "@playwright/test";
 import { expect, test, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
@@ -97,14 +97,20 @@ async function allowRichClipboard(context: BrowserContext): Promise<void> {
   await context.grantPermissions(["clipboard-read", "clipboard-write"]);
 }
 
+/**
+ * The rows of one assistant message. A message renders one row per Markdown block, so
+ * every locator and every text walk below covers the group, not a single block.
+ */
+function assistantMessageBlocks(page: Page): Locator {
+  return page.locator("[data-message-id]").filter({ has: page.getByTestId("assistant-message") });
+}
+
 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:",
-  });
+  const assistantMessage = assistantMessageBlocks(page);
   await assistantMessage.locator(selector).evaluate((element) => {
     const selection = window.getSelection();
     const range = document.createRange();
@@ -114,6 +120,84 @@ async function selectAssistantElement(page: Page, selector: string): Promise<voi
   });
 }
 
+/**
+ * Select an element from the end of the text before it. A drag that starts in the gap
+ * above a block anchors there, so nothing outside the element is highlighted.
+ */
+async function selectAssistantElementFromEndOf(
+  page: Page,
+  startText: string,
+  selector: string,
+): Promise<void> {
+  await assistantMessageBlocks(page).evaluateAll(
+    (blocks, selected) => {
+      let startNode: Text | null = null;
+      for (const block of blocks) {
+        const walker = document.createTreeWalker(block, NodeFilter.SHOW_TEXT);
+        while (walker.nextNode()) {
+          if (walker.currentNode.textContent?.endsWith(selected.startText)) {
+            startNode = walker.currentNode as Text;
+          }
+        }
+      }
+      const end = blocks.map((block) => block.querySelector(selected.selector)).find(Boolean);
+      if (!startNode || !end) {
+        throw new Error(`Could not find ${selected.startText} — ${selected.selector}`);
+      }
+      const range = document.createRange();
+      range.setStart(startNode, startNode.length);
+      range.setEnd(end, end.childNodes.length);
+      const selection = window.getSelection();
+      selection?.removeAllRanges();
+      selection?.addRange(range);
+    },
+    { startText, selector },
+  );
+}
+
+/** A drag over an image alone selects it inside its rendered frame. */
+async function selectAssistantImage(page: Page): Promise<void> {
+  await assistantMessageBlocks(page)
+    .locator("img")
+    .evaluate((element) => {
+      const range = document.createRange();
+      range.selectNode(element);
+      const selection = window.getSelection();
+      selection?.removeAllRanges();
+      selection?.addRange(range);
+    });
+}
+
+/** Press in the gap below the image and drag to the end of `text` in the block after it. */
+async function dragFromBelowImageTo(page: Page, text: string): Promise<void> {
+  const blocks = assistantMessageBlocks(page);
+  const target = blocks.getByText(text);
+  await target.scrollIntoViewIfNeeded();
+  const frame = await blocks.locator('[data-paseo-markdown-tag="img"]').boundingBox();
+  const end = await target.evaluate((element, selectedText) => {
+    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+    while (walker.nextNode()) {
+      const node = walker.currentNode as Text;
+      const offset = node.textContent?.indexOf(selectedText) ?? -1;
+      if (offset >= 0) {
+        const range = document.createRange();
+        range.setStart(node, offset);
+        range.setEnd(node, offset + selectedText.length);
+        const box = range.getBoundingClientRect();
+        return { x: box.right - 1, y: box.top + box.height / 2, left: box.left };
+      }
+    }
+    throw new Error(`Could not find ${selectedText}`);
+  }, text);
+  if (!frame) {
+    throw new Error("Expected a rendered image");
+  }
+  await page.mouse.move(end.left + 5, frame.y + frame.height + 4);
+  await page.mouse.down();
+  await page.mouse.move(end.x, end.y, { steps: 10 });
+  await page.mouse.up();
+}
+
 async function selectAssistantText(page: Page, text: string): Promise<void> {
   await selectAssistantTextRange(page, text, text);
 }
@@ -124,9 +208,7 @@ async function selectAssistantListItemFromMarker(
   itemText: string,
   endText: string,
 ): Promise<void> {
-  const assistantMessage = page.getByTestId("assistant-message").filter({
-    hasText: "Direct matches:",
-  });
+  const assistantMessage = assistantMessageBlocks(page);
   const item = assistantMessage
     .locator(`[data-paseo-markdown-tag="${listTag}"]`)
     .filter({ hasText: itemText })
@@ -170,9 +252,7 @@ async function doubleClickAssistantMarkdownText(
   tag: "code" | "strong",
   text: string,
 ): Promise<void> {
-  const assistantMessage = page.getByTestId("assistant-message").filter({
-    hasText: "Direct matches:",
-  });
+  const assistantMessage = assistantMessageBlocks(page);
   await assistantMessage
     .locator(`[data-paseo-markdown-tag="${tag}"]`)
     .filter({ hasText: text })
@@ -184,12 +264,20 @@ async function selectAssistantTextRange(
   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);
+  await assistantMessageBlocks(page).evaluateAll(
+    (blocks, selectedRange) => {
+      // The message's text nodes in reading order, across every block row.
+      const nodes: Text[] = [];
+      for (const block of blocks) {
+        const blockWalker = document.createTreeWalker(block, NodeFilter.SHOW_TEXT);
+        let found = blockWalker.nextNode();
+        while (found) {
+          nodes.push(found as Text);
+          found = blockWalker.nextNode();
+        }
+      }
+      let cursor = 0;
+      const walker = { nextNode: () => nodes[cursor++] ?? null };
       let startNode: Node | null = null;
       let startOffset = -1;
       let endNode: Node | null = null;
@@ -241,12 +329,20 @@ async function selectAssistantAcrossCodeLines(
   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);
+  await assistantMessageBlocks(page).evaluateAll(
+    (blocks, selectedRange) => {
+      // The message's text nodes in reading order, across every block row.
+      const nodes: Text[] = [];
+      for (const block of blocks) {
+        const blockWalker = document.createTreeWalker(block, NodeFilter.SHOW_TEXT);
+        let found = blockWalker.nextNode();
+        while (found) {
+          nodes.push(found as Text);
+          found = blockWalker.nextNode();
+        }
+      }
+      let cursor = 0;
+      const walker = { nextNode: () => nodes[cursor++] ?? null };
       let startNode: Node | null = null;
       let startOffset = -1;
       let textNode = walker.nextNode();
@@ -326,9 +422,7 @@ test("copying an assistant selection preserves Markdown structure and links", as
     );
     await openAgentRoute(page, agent);
 
-    const assistantMessage = page.getByTestId("assistant-message").filter({
-      hasText: "Direct matches:",
-    });
+    const assistantMessage = assistantMessageBlocks(page);
     for (const [tag, text] of [
       ["strong", "strong prose"],
       ["em", "emphasized prose"],
@@ -549,6 +643,19 @@ test("copying an assistant selection preserves Markdown structure and links", as
     const completeCodeClipboard = await readRichClipboard(page);
     expect(completeCodeClipboard.plainText).toBe('const answer = "yes";\n  return answer;');
 
+    // Touching the block before it without selecting any of its text is still a
+    // selection inside the code.
+    await selectAssistantElementFromEndOf(
+      page,
+      "not a generated link.",
+      '[data-paseo-markdown-language="typescript"] [data-paseo-markdown-tag="code"]',
+    );
+    await copySelection(page);
+
+    expect((await readRichClipboard(page)).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);
@@ -585,3 +692,55 @@ test("copying an assistant selection preserves Markdown structure and links", as
     await agent.cleanup();
   }
 });
+
+test("copying a selection across an assistant image keeps its Markdown source and alt text", async ({
+  context,
+  page,
+}) => {
+  const image =
+    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "assistant-selection-copy-image-",
+    title: "Assistant selection copy image",
+    initialPrompt: "Render the image fixture.",
+    featureValues: {
+      mockAssistantResponse: [
+        "Before the image.",
+        "",
+        `![chart](${image})`,
+        "",
+        "After the image.",
+      ].join("\n"),
+    },
+  });
+
+  try {
+    await allowRichClipboard(context);
+    await agent.client.waitForAgentUpsert(
+      agent.agentId,
+      (snapshot) => snapshot.status === "idle",
+      30_000,
+    );
+    await openAgentRoute(page, agent);
+    await expect(assistantMessageBlocks(page).locator("img")).toHaveCount(1);
+
+    await selectAssistantTextRange(page, "Before the image.", "After the image.");
+    await copySelection(page);
+
+    expect((await readRichClipboard(page)).plainText).toBe(
+      `Before the image.\n\n![chart](${image})\n\nAfter the image.`,
+    );
+
+    await selectAssistantImage(page);
+    await copySelection(page);
+
+    expect((await readRichClipboard(page)).plainText).toBe(`![chart](${image})`);
+
+    await dragFromBelowImageTo(page, "After the");
+    await copySelection(page);
+
+    expect((await readRichClipboard(page)).plainText).toBe("After the");
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/background-reconnect.spec.ts b/packages/app/e2e/browser/background-reconnect.spec.ts
new file mode 100644
index 0000000000..e9831c257d
--- /dev/null
+++ b/packages/app/e2e/browser/background-reconnect.spec.ts
@@ -0,0 +1,86 @@
+import { expect, test as base } from "../support/fixtures";
+import type { Page, TestInfo } from "@playwright/test";
+import {
+  startIsolatedHostDaemon,
+  type IsolatedHostDaemon,
+} from "../support/helpers/isolated-host-daemon";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
+
+const test = base.extend<{ reconnectHost: IsolatedHostDaemon }>({
+  reconnectHost: async ({ e2eWorker }, provide) => {
+    void e2eWorker;
+    const daemon = await startIsolatedHostDaemon("background-reconnect");
+    try {
+      await provide(daemon);
+    } finally {
+      await daemon.close();
+    }
+  },
+});
+
+test.describe.configure({ timeout: 120_000 });
+
+async function captureHost({
+  page,
+  testInfo,
+  name,
+}: {
+  page: Page;
+  testInfo: TestInfo;
+  name: string;
+}): Promise<void> {
+  await page.screenshot({ path: testInfo.outputPath(`${name}.png`) });
+}
+
+async function refocusConnectedTab(page: Page): Promise<void> {
+  await setTabVisibility(page, "visible");
+  await expect(page.getByText("Online", { exact: true })).toBeVisible();
+}
+
+async function setTabVisibility(page: Page, visibility: DocumentVisibilityState): Promise<void> {
+  await page.evaluate((state) => {
+    Object.defineProperty(document, "visibilityState", { configurable: true, get: () => state });
+    Object.defineProperty(document, "hidden", {
+      configurable: true,
+      get: () => state === "hidden",
+    });
+    document.dispatchEvent(new Event("visibilitychange"));
+  }, visibility);
+}
+
+async function openHostOverview(page: Page, daemon: IsolatedHostDaemon): Promise<void> {
+  await page.goto("/");
+  await seedSavedSettingsHosts(page, [
+    {
+      serverId: daemon.serverId,
+      label: "Reconnect QA",
+      endpoint: `127.0.0.1:${daemon.port}`,
+    },
+  ]);
+  await page.goto(`/settings/hosts/${daemon.serverId}/host`);
+  await expect(page.getByText("Online", { exact: true })).toBeVisible();
+}
+
+async function restartHostWhileHidden(page: Page, daemon: IsolatedHostDaemon): Promise<void> {
+  const reconnectedSocket = page.waitForEvent("websocket", {
+    timeout: 30_000,
+    predicate: (socket) => new URL(socket.url()).port === String(daemon.port),
+  });
+  await daemon.restart();
+  await reconnectedSocket;
+  await expect(page.getByText("Online", { exact: true })).toBeVisible({ timeout: 30_000 });
+  expect(await page.evaluate(() => document.visibilityState)).toBe("hidden");
+}
+
+test("a hidden tab reconnects after daemon restart and stays connected on refocus", async ({
+  page,
+  reconnectHost,
+}, testInfo) => {
+  await openHostOverview(page, reconnectHost);
+  await captureHost({ page, testInfo, name: "before-hide" });
+  await setTabVisibility(page, "hidden");
+  await restartHostWhileHidden(page, reconnectHost);
+  await captureHost({ page, testInfo, name: "reconnected-while-hidden" });
+  await refocusConnectedTab(page);
+  await captureHost({ page, testInfo, name: "reconnected-after-refocus" });
+});
diff --git a/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts b/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
index 967462f05b..89ee10af22 100644
--- a/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
+++ b/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
@@ -84,6 +84,18 @@ async function openModelSelector(page: Page) {
   await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible({ timeout: 10_000 });
 }
 
+async function dismissStackedModelPickerWithBackdrop(page: Page) {
+  await page
+    .getByTestId("agent-controls-settings-list")
+    .getByRole("button", { name: /Select model/ })
+    .click();
+  await expect(page.getByTestId("agent-controls-model-browser-sheet")).toBeVisible();
+  await page.mouse.click(MOBILE_VIEWPORT.width / 2, 24);
+  await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeVisible();
+  await expect(page.getByTestId("agent-controls-model-sheet")).toBeVisible();
+  await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible();
+}
+
 async function openAndCloseTabSwitcherTwice(page: Page) {
   await openTabSwitcher(page);
   await closeBottomSheetWithBackdrop(page);
@@ -114,6 +126,8 @@ test.describe("mobile bottom sheet reopen", () => {
         await openModelSelector(page);
         const sheet = page.getByTestId("agent-controls-model-sheet");
 
+        await dismissStackedModelPickerWithBackdrop(page);
+
         await page.getByTestId("model-search-all-input").click();
         const model = page.getByRole("button", { name: /^Ten second stream/ });
         await expect(model).toBeVisible({
diff --git a/packages/app/e2e/browser/changes-first-edit.spec.ts b/packages/app/e2e/browser/changes-first-edit.spec.ts
new file mode 100644
index 0000000000..72c3890936
--- /dev/null
+++ b/packages/app/e2e/browser/changes-first-edit.spec.ts
@@ -0,0 +1,122 @@
+import { appendFile } from "node:fs/promises";
+import path from "node:path";
+import type { Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { openChangesTreePanel } from "../support/helpers/workspace-tabs";
+
+function changesTree(page: Page) {
+  return page.getByTestId("changes-tree-panel").filter({ visible: true });
+}
+
+async function expectEmptyChanges(page: Page) {
+  await expect(changesTree(page).getByText("No changes to display", { exact: true })).toBeVisible();
+}
+
+async function editReadme(repoPath: string, text: string) {
+  await appendFile(path.join(repoPath, "README.md"), text);
+}
+
+async function expectReadmeChanges(page: Page, additions: number) {
+  await expect(changesTree(page).getByText("README.md", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(changesTree(page)).toContainText(`+${additions}`);
+}
+
+async function openEmptyDiff(page: Page) {
+  await changesTree(page).getByTestId("changes-options-menu").click();
+  await page.getByTestId("changes-open-tab").click();
+  await expect(
+    page
+      .getByTestId("working-diff-panel")
+      .filter({ visible: true })
+      .getByText("No changes to display", { exact: true }),
+  ).toBeVisible();
+}
+
+async function expectReadmeDiff(page: Page, additions: number) {
+  await expect(
+    page.getByTestId("working-diff-panel").filter({ visible: true }).getByTestId("diff-file-0"),
+  ).toHaveAccessibleName(`README.md, +${additions}, -0`, { timeout: 30_000 });
+}
+
+async function openDiffFromNewTabMenu(page: Page) {
+  await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).first().click();
+  await page.getByTestId("workspace-new-tab-menu-diff").filter({ visible: true }).first().click();
+  await expect(
+    page
+      .getByTestId("working-diff-panel")
+      .filter({ visible: true })
+      .getByText("No changes to display", { exact: true }),
+  ).toBeVisible();
+}
+
+async function refreshDiff(page: Page) {
+  await page
+    .getByTestId("working-diff-panel")
+    .filter({ visible: true })
+    .getByTestId("changes-refresh")
+    .click();
+}
+
+async function reloadWorkspace(page: Page) {
+  await page.reload();
+}
+
+test("Changes follows the first edit to a clean workspace without reloading", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openChangesTreePanel(page);
+  await expectEmptyChanges(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeChanges(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeChanges(page, 2);
+});
+
+test("the full diff follows the first edit to a clean workspace without reloading", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openChangesTreePanel(page);
+  await expectEmptyChanges(page);
+  await openEmptyDiff(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeDiff(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeDiff(page, 2);
+});
+
+test("a directly opened Diff tab follows the first edit without an active Changes tree", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openDiffFromNewTabMenu(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeDiff(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeDiff(page, 2);
+
+  await refreshDiff(page);
+  await expectReadmeDiff(page, 2);
+  await reloadWorkspace(page);
+  await expectReadmeDiff(page, 2);
+  await editReadme(workspace.repoPath, "third edit\n");
+  await expectReadmeDiff(page, 3);
+});
diff --git a/packages/app/e2e/browser/changes-pane.spec.ts b/packages/app/e2e/browser/changes-pane.spec.ts
index 998d292d44..377adbb3b6 100644
--- a/packages/app/e2e/browser/changes-pane.spec.ts
+++ b/packages/app/e2e/browser/changes-pane.spec.ts
@@ -311,8 +311,8 @@ test("an empty Changes comparison links to the populated comparison", async ({ p
   await mode.click();
   await page.getByTestId("changes-diff-mode-uncommitted").click();
 
-  await expect(tree.getByText("No uncommitted changes", { exact: true })).toBeVisible();
-  await expect(panel.getByText("No uncommitted changes", { exact: true })).toBeVisible();
+  await expect(tree.getByText("No changes to display", { exact: true })).toBeVisible();
+  await expect(panel.getByText("No changes to display", { exact: true })).toBeVisible();
   const seeCommitted = tree.getByRole("button", { name: "See committed changes" });
   await expect(seeCommitted).toBeVisible();
   await seeCommitted.click();
@@ -683,7 +683,7 @@ test("discarding a staged rename restores its source path", async ({ page }) =>
 
   const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
   const renamedHeader = diffHeaderForPath(panel, "src/zz-renamed.ts");
-  await expect(renamedHeader).toHaveAccessibleName("src/zz-renamed.ts, +1, -0");
+  await expect(renamedHeader).toHaveAccessibleName("src/zz-renamed.ts, +0, -0");
   const renamedToggle = renamedHeader.getByTestId(/^diff-file-\d+-toggle$/);
   const toggleTestId = await renamedToggle.getAttribute("data-testid");
   expect(toggleTestId).not.toBeNull();
@@ -876,6 +876,32 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
   ).toContainText("Scroll long lines");
 });
 
+test("compact Changes jumps to a file from the changed-files sheet", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
+  await useUnwrappedDiffLines(page);
+  const explorer = await openCompactChanges(page, workspace);
+
+  await openChangedFilesOverview(page);
+  await test.step("reopening the overview expands folders again", async () => {
+    await expectOverviewReopensExpanded(page, "zz-folder", "changed.ts");
+  });
+  await test.step("jumping to a nested file closes the overview and scrolls to its diff", async () => {
+    await jumpToOverviewFile(page, explorer, "src/zz-folder/nested/changed.ts");
+  });
+});
+
+test("Jump to file stays out of the desktop diff and of an empty comparison", async ({ page }) => {
+  const committed = await createWorkspaceWithCommittedDiff();
+  await openWorkspaceChangesSurface(page, committed, 90_000);
+  await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
+
+  const explorer = await openCompactChanges(page, committed);
+  await expect(explorer.getByRole("button", { name: "Jump to file" })).toBeVisible();
+
+  await selectEmptyUncommittedComparison(page, explorer);
+  await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
+});
+
 test("canvas diff stays sharp while its workspace pane is resized", async ({ page }) => {
   const workspace = await createWorkspaceWithMountedTabDiff();
   await useUnwrappedDiffLines(page);
@@ -954,11 +980,21 @@ test("canvas diff stays sharp while its workspace pane is resized", async ({ pag
     .toBe(true);
 });
 
-test("changes diff applies code size changes to gutter and code typography", async ({ page }) => {
+test("changes diff waits for configured fonts, then applies code typography changes", async ({
+  page,
+}) => {
   const workspace = await createWorkspaceWithMountedTabDiff();
   await useCodeFont(page, 12);
   await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
+  await holdBrowserFontLoads(page);
+  await navigateToWorkspaceChanges(page, workspace);
+
+  await test.step("commit no geometry before the configured fonts are ready", async () => {
+    await expect(page.getByTestId("git-diff-canvas")).toBeVisible();
+    await expect(page.getByTestId("diff-file-0-body")).toHaveCount(0);
+    await releaseBrowserFontLoads(page);
+    await expectExpandedMountedTabDiff(page);
+  });
   const before = await readDiffTypographyGeometry(page);
 
   await changeCodeTypographyFromSettings(page, {
@@ -977,63 +1013,31 @@ test("changes diff applies code size changes to gutter and code typography", asy
   expect(after.canvasPixels).not.toEqual(before.canvasPixels);
 });
 
-test("canvas diff does not commit geometry before configured fonts are ready", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await holdBrowserFontLoads(page);
-  await useUnwrappedDiffLines(page);
-  await page.setViewportSize({ width: 1400, height: 900 });
-  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
-  await waitForWorkspaceTabsVisible(page);
-  await openChangesPanel(page);
-
-  await expect(page.getByTestId("git-diff-canvas")).toBeVisible();
-  await expect(page.getByTestId("diff-file-0-body")).toHaveCount(0);
-  await releaseBrowserFontLoads(page);
-  await expectExpandedMountedTabDiff(page);
-});
-
-test("canvas diff creates, edits, and deletes an inline review without DOM code rows", async ({
+test("creates, cancels, edits, and deletes a review while keeping Changes focused", async ({
   page,
 }) => {
   const workspace = await createWorkspaceWithMountedTabDiff();
   await useUnwrappedDiffLines(page);
   await openWorkspaceChanges(page, workspace);
-
-  await startReviewOnFirstChangedLine(page);
-  await cancelInlineReview(page);
-  await startReviewOnFirstChangedLine(page);
-  await saveInlineReview(page, "Please keep this branch explicit");
-  await editInlineReview(page, "Please keep this branch named explicitly");
-  await deleteInlineReview(page);
-
-  await expect(page.locator('[data-testid^="diff-code-row-"]')).toHaveCount(0);
-});
-
-test("autofocusing an inline review keeps the Changes tab focused", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
   const changesTab = page.getByTestId("workspace-tab-working_diff").filter({ visible: true });
   const focusedBackground = await changesTab.evaluate(
     (element) => getComputedStyle(element).backgroundColor,
   );
 
-  await startReviewOnFirstChangedLine(page);
-  await expect(page.getByTestId("inline-review-editor-input")).toBeFocused();
-  await expect
-    .poll(() => changesTab.evaluate((element) => getComputedStyle(element).backgroundColor))
-    .toBe(focusedBackground);
-});
-
-test("inline reviews keep the browser text context menu", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await startReviewOnFirstChangedLine(page);
-  await page.getByTestId("inline-review-editor-input").click({ button: "right" });
-  await expect(page.getByTestId("diff-source-context-menu")).toHaveCount(0);
+  await test.step("start a focused review with the browser text menu", async () => {
+    await startReviewOnFirstChangedLine(page);
+    await expect(page.getByTestId("inline-review-editor-input")).toBeFocused();
+    await expect(changesTab).toHaveCSS("background-color", focusedBackground);
+    await page.getByTestId("inline-review-editor-input").click({ button: "right" });
+    await expect(page.getByTestId("diff-source-context-menu")).toHaveCount(0);
+    await cancelInlineReview(page);
+  });
+  await test.step("save, edit, and delete the review", async () => {
+    await startReviewOnFirstChangedLine(page);
+    await saveInlineReview(page, "Please keep this branch explicit");
+    await editInlineReview(page, "Please keep this branch named explicitly");
+    await deleteInlineReview(page);
+  });
 });
 
 test("split canvas creates a review on the changed side and keeps it in that column", async ({
@@ -1143,36 +1147,36 @@ test("the whole reviewable row reveals the gutter affordance and uses a text cur
   await expect(page.getByTestId("git-diff-scroll")).toHaveCSS("cursor", "text");
 });
 
-test("canvas diff copies a dragged character selection without opening a review", async ({
-  context,
+test("selects, preserves, copies, and dismisses diff text without opening a review", async ({
   page,
 }) => {
-  const workspace = await createWorkspaceWithExactSelectionDiff("ABCDEFGHIJ");
-  await context.grantPermissions(["clipboard-read", "clipboard-write"]);
-  await useUnwrappedDiffLines(page);
-  await openSelectionWorkspaceChanges(page, workspace);
-
+  await openCopyableSelectionDiff(page, "ABCDEFGHIJ");
   await dragExactAddedText(page, { startOffset: 2, endOffset: 8 });
-  await page.keyboard.press("ControlOrMeta+C");
 
-  await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe("CDEFGH");
-  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
-});
-
-test("canvas diff context menu copies selections and source lines", async ({ context, page }) => {
-  const workspace = await createWorkspaceWithExactSelectionDiff("ABCDEFGHIJ");
-  await context.grantPermissions(["clipboard-read", "clipboard-write"]);
-  await useUnwrappedDiffLines(page);
-  await openSelectionWorkspaceChanges(page, workspace);
-
-  await dragExactAddedText(page, { startOffset: 2, endOffset: 8 });
-  await rightClickFirstChangedLine(page);
-  await page.getByTestId("diff-source-copy-selection").click();
-  await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe("CDEFGH");
-
-  await rightClickFirstChangedLine(page);
-  await page.getByTestId("diff-source-copy-line").click();
-  await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe("ABCDEFGHIJ");
+  await test.step("copy the selected characters with the keyboard", async () => {
+    await copyDiffSelectionWithKeyboard(page);
+    await expectClipboardText(page, "CDEFGH");
+    await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
+  });
+  await test.step("copy the preserved selection after resizing", async () => {
+    await resizeDiffViewportHeight(page, 960);
+    await copyFromChangedLineMenu(page, "Copy");
+    await expectClipboardText(page, "CDEFGH");
+  });
+  await test.step("copy the complete source line", async () => {
+    await copyFromChangedLineMenu(page, "Copy line");
+    await expectClipboardText(page, "ABCDEFGHIJ");
+  });
+  await test.step("dismiss a new selection without starting a review", async () => {
+    await dragExactAddedText(page, { startOffset: 2, endOffset: 8 });
+    await clickFirstChangedLine(page);
+    await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
+    await rightClickFirstChangedLine(page);
+    await expect(page.getByTestId("diff-source-copy-selection")).toBeDisabled();
+    await page.keyboard.press("Escape");
+    await clickFirstChangedLine(page);
+    await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
+  });
 });
 
 test("canvas diff clears a selection when collapsing an earlier file", async ({ page }) => {
@@ -1186,19 +1190,6 @@ test("canvas diff clears a selection when collapsing an earlier file", async ({
   await expect(page.getByTestId("diff-source-copy-selection")).toBeDisabled();
 });
 
-test("clicking the canvas dismisses a selection without opening a review", async ({ page }) => {
-  const workspace = await createWorkspaceWithExactSelectionDiff("ABCDEFGHIJ");
-  await useUnwrappedDiffLines(page);
-  await openSelectionWorkspaceChanges(page, workspace);
-
-  await dragExactAddedText(page, { startOffset: 2, endOffset: 8 });
-  await clickFirstChangedLine(page);
-  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
-
-  await clickFirstChangedLine(page);
-  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
-});
-
 test("canvas diff replaces a selection with forward and backward drags", async ({
   context,
   page,
@@ -1393,14 +1384,17 @@ async function setOpenChangesPresentation(
   }
 }
 
+/** Holds every font load in the document until released; later loads pass through. */
 async function holdBrowserFontLoads(page: Page): Promise<void> {
   await page.addInitScript(() => {
     const fontSet = document.fonts;
     const originalLoad = fontSet.load.bind(fontSet);
     const pending: Array<() => void> = [];
+    let released = false;
     Object.defineProperty(fontSet, "load", {
       configurable: true,
       value(font: string, text?: string) {
+        if (released) return originalLoad(font, text);
         return new Promise<FontFace[]>((resolve, reject) => {
           pending.push(() => {
             originalLoad(font, text).then(resolve, reject);
@@ -1410,6 +1404,7 @@ async function holdBrowserFontLoads(page: Page): Promise<void> {
     });
     Object.assign(window, {
       __releasePaseoDiffFontLoads() {
+        released = true;
         for (const release of pending.splice(0)) release();
       },
     });
@@ -1659,12 +1654,72 @@ async function createWorkspaceWithStickyTransitionDiff(): Promise<DirtyWorkspace
 }
 
 async function openWorkspaceChanges(page: Page, workspace: DirtyWorkspace): Promise<void> {
+  await navigateToWorkspaceChanges(page, workspace);
+  await expectExpandedMountedTabDiff(page);
+}
+
+async function navigateToWorkspaceChanges(page: Page, workspace: DirtyWorkspace): Promise<void> {
   await page.setViewportSize({ width: 1400, height: 900 });
   await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
   await waitForWorkspaceTabsVisible(page);
   await page.getByTestId("workspace-explorer-toggle").first().click();
   await openChangesInVisibleExplorer(page);
-  await expectExpandedMountedTabDiff(page);
+}
+
+/** The Explorer overlay a phone-sized viewport shows, with its Changes tab selected. */
+async function openCompactChanges(page: Page, workspace: DirtyWorkspace): Promise<Locator> {
+  await page.setViewportSize({ width: 390, height: 844 });
+  // Reload at the compact size: panel selection starts at the center on a cold
+  // mount, independently of any desktop sidebar used earlier in the test.
+  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
+  await page.reload();
+  await page.getByTestId("workspace-explorer-toggle").first().click();
+  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
+  await expect(changesTab).toBeVisible({ timeout: 30_000 });
+  await changesTab.click();
+  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
+  await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
+  return explorer;
+}
+
+async function openChangedFilesOverview(page: Page): Promise<void> {
+  const jumpToFile = page.getByRole("button", { name: "Jump to file" });
+  await expect(jumpToFile).toBeVisible();
+  await jumpToFile.click();
+  await expect(page.getByTestId("changes-jump-to-file-sheet")).toContainText("Jump to file");
+}
+
+async function expectOverviewReopensExpanded(
+  page: Page,
+  folderName: string,
+  childFileName: string,
+): Promise<void> {
+  const sheet = page.getByTestId("changes-jump-to-file-sheet");
+  const tree = changesTree(page);
+  const folder = tree
+    .getByRole("button")
+    .filter({ has: page.getByText(folderName, { exact: true }) });
+  const child = tree.getByText(childFileName, { exact: true });
+  await expect(folder).toBeVisible();
+  await expect(child).toBeVisible();
+  await folder.click();
+  await expect(child).toHaveCount(0);
+  await sheet.getByRole("button", { name: "Close", exact: true }).click();
+  await openChangedFilesOverview(page);
+  await expect(child).toBeVisible();
+}
+
+async function jumpToOverviewFile(page: Page, explorer: Locator, filePath: string): Promise<void> {
+  const sheet = page.getByTestId("changes-jump-to-file-sheet");
+  await changesTree(page).getByText(path.basename(filePath), { exact: true }).click();
+  await expect(sheet).toHaveCount(0);
+  await expect(diffHeaderForPath(explorer, filePath)).toBeInViewport();
+}
+
+async function selectEmptyUncommittedComparison(page: Page, explorer: Locator): Promise<void> {
+  await explorer.getByRole("button", { name: "Diff mode", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Uncommitted", exact: true }).click();
+  await expect(explorer.getByText("No changes to display", { exact: true })).toBeVisible();
 }
 
 async function openWorkspaceChangesSurface(
@@ -1820,6 +1875,41 @@ async function clickFirstChangedLine(page: Page): Promise<void> {
   await page.mouse.click(bodyBounds.x + 120, bodyBounds.y + lineHeight * 1.5);
 }
 
+async function openCopyableSelectionDiff(page: Page, content: string): Promise<void> {
+  const workspace = await createWorkspaceWithExactSelectionDiff(content);
+  await page.context().grantPermissions(["clipboard-read", "clipboard-write"]);
+  await configureDiffPresentation(page, { layout: "unified", wrapLines: false });
+  await openSelectionWorkspaceChanges(page, workspace);
+}
+
+async function copyDiffSelectionWithKeyboard(page: Page): Promise<void> {
+  await page.evaluate(() => navigator.clipboard.writeText(""));
+  await page.keyboard.press("ControlOrMeta+C");
+}
+
+async function copyFromChangedLineMenu(page: Page, action: "Copy" | "Copy line"): Promise<void> {
+  await page.evaluate(() => navigator.clipboard.writeText(""));
+  await rightClickFirstChangedLine(page);
+  const item = page.getByRole("menuitem", { name: action, exact: true });
+  await expect(item).toBeEnabled();
+  await item.click();
+}
+
+async function expectClipboardText(page: Page, text: string): Promise<void> {
+  await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe(text);
+}
+
+async function resizeDiffViewportHeight(page: Page, height: number): Promise<void> {
+  const canvas = page.getByTestId("git-diff-canvas");
+  const previousViewport = page.viewportSize()!;
+  const previousHeight = await canvas.evaluate((element) => element.getBoundingClientRect().height);
+  await page.setViewportSize({ width: previousViewport.width, height });
+  await expect(canvas).toHaveCSS(
+    "height",
+    `${previousHeight + height - previousViewport.height}px`,
+  );
+}
+
 async function rightClickFirstChangedLine(page: Page, fileIndex = 0): Promise<void> {
   const body = page.getByTestId(`diff-file-${fileIndex}-body`);
   const canvas = page.getByTestId("git-diff-canvas");
diff --git a/packages/app/e2e/browser/changes-shortcut-placement.spec.ts b/packages/app/e2e/browser/changes-shortcut-placement.spec.ts
index 214a420e8f..74e6971c8d 100644
--- a/packages/app/e2e/browser/changes-shortcut-placement.spec.ts
+++ b/packages/app/e2e/browser/changes-shortcut-placement.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test } from "../support/fixtures";
-import { gotoWorkspace } from "../support/helpers/launcher";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
 
@@ -12,11 +12,12 @@ test("Changes shortcut reveals the Changes tree in Explorer", async ({ page }) =
     await page.setViewportSize({ width: 1400, height: 900 });
     await gotoWorkspace(page, workspace.workspaceId);
     await waitForWorkspaceTabsVisible(page);
+    await clickNewChat(page);
 
     await page.keyboard.press(CHANGES_SHORTCUT);
 
     const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
-    await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible({
+    await expect(explorer.getByTestId("workspace-tab-changes_tree")).toBeVisible({
       timeout: 30_000,
     });
     await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
diff --git a/packages/app/e2e/browser/chat-find.spec.ts b/packages/app/e2e/browser/chat-find.spec.ts
new file mode 100644
index 0000000000..0ce6c561ed
--- /dev/null
+++ b/packages/app/e2e/browser/chat-find.spec.ts
@@ -0,0 +1,539 @@
+import type { TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  openAgentRoute,
+  seedMockAgentWorkspace,
+  type MockAgentWorkspace,
+} from "../support/helpers/mock-agent";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import {
+  expectReconnectingToastGone,
+  expectReconnectingToastVisible,
+} from "../support/helpers/workspace-ui";
+import { trackPromptJumpRequests } from "../support/helpers/agent-timeline-gate";
+import {
+  composerLocator,
+  fillComposerDraft,
+  expectComposerDraft,
+  expectComposerFocused,
+} from "../support/helpers/composer";
+
+import { openCommandCenter, closeCommandCenter } from "../support/helpers/command-center";
+
+const MAC_USER_AGENT =
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36";
+
+const FILLER = Array.from({ length: 400 }, (_, index) => `filler${index}`).join(" ");
+const STREAMED_RESPONSE = [
+  "First paragraph with alpha-needle and pair-needle inside.",
+  "Second paragraph with beta-needle and pair-needle inside.",
+  `Third paragraph ${FILLER}`,
+].join("\n\n");
+
+const RESPONSE =
+  'İ😀hello **world**; hello *world*.\n\n[hello &amp; world](https://example.com/hidden-destination)\n\n```ts\nconst a = "a.b";\n```\n\n- first cell\n- second cell';
+
+// One message far taller than the viewport, so its first and last paragraph rows are
+// never in the virtualizer's window at the same time.
+const PARAGRAPH_PADDING = Array.from({ length: 40 }, (_, index) => `padding${index}`).join(" ");
+const TALL_RESPONSE = Array.from({ length: 30 }, (_, index) => {
+  if (index === 0) return `Opening paragraph with span-needle. ${PARAGRAPH_PADDING}`;
+  if (index === 29) return `Closing paragraph with span-needle. ${PARAGRAPH_PADDING}`;
+  return `Paragraph ${index}. ${PARAGRAPH_PADDING}`;
+}).join("\n\n");
+
+function query(page: Page) {
+  return page.getByRole("textbox", { name: "Find in pane", exact: true });
+}
+function status(page: Page) {
+  return page.getByRole("status", { name: "Find matches" });
+}
+async function openChatFind(page: Page) {
+  await page.getByTestId("assistant-message").filter({ visible: true }).last().click();
+  await page.keyboard.press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+}
+async function searchChat(page: Page, text: string) {
+  await openChatFind(page);
+  await query(page).fill(text);
+}
+async function expectHighlight(page: Page, text: string) {
+  await expect
+    .poll(() =>
+      page.evaluate(() => {
+        const entries = Array.from(CSS.highlights.entries()).filter(([name]) =>
+          name.startsWith("paseo-chat-find-"),
+        );
+        const texts: string[] = [];
+        for (const [, highlight] of entries) {
+          for (const range of highlight) texts.push(range.toString());
+        }
+        return texts;
+      }),
+    )
+    .toEqual([text]);
+  await expect
+    .poll(() =>
+      page.evaluate(() => {
+        const entry = Array.from(CSS.highlights.entries()).find(([name]) =>
+          name.startsWith("paseo-chat-find-"),
+        );
+        const range = entry && Array.from(entry[1])[0];
+        if (!(range instanceof Range)) return false;
+        const rect = range.getBoundingClientRect();
+        const row = range.startContainer.parentElement?.closest(
+          '[data-testid="agent-chat-scroll"]',
+        );
+        const viewport = row?.getBoundingClientRect();
+        return (
+          !!viewport && rect.height > 0 && rect.bottom > viewport.top && rect.top < viewport.bottom
+        );
+      }),
+    )
+    .toBe(true);
+}
+async function nextMatch(page: Page) {
+  await query(page).press("Enter");
+}
+async function previousMatch(page: Page) {
+  await query(page).press("Shift+Enter");
+}
+async function expectFindStatus(page: Page, search: string, matches: string) {
+  await query(page).fill(search);
+  await expect(status(page)).toHaveText(matches, { timeout: 15_000 });
+}
+async function expectNextMatch(page: Page, matches: string, highlighted: string) {
+  await nextMatch(page);
+  await expect(status(page)).toHaveText(matches);
+  await expectHighlight(page, highlighted);
+}
+async function closeFind(page: Page) {
+  await query(page).press("Escape");
+  await expect(query(page)).toHaveCount(0);
+  await expect
+    .poll(() =>
+      page.evaluate(() =>
+        Array.from(CSS.highlights.keys()).filter((key) => key.startsWith("paseo-chat-find-")),
+      ),
+    )
+    .toEqual([]);
+}
+
+test("loads older history through prompt navigation and finds repeated rendered Markdown", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-",
+    title: "Chat Find",
+    featureValues: { mockAssistantResponse: RESPONSE },
+  });
+  try {
+    for (let index = 0; index < 45; index++) {
+      await agent.client.sendAgentMessage(agent.agentId, `Prompt number ${index}`);
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    }
+    const jumps = await trackPromptJumpRequests(page, agent.agentId);
+    await openAgentRoute(page, agent);
+    await expect(page.getByText("Prompt number 44", { exact: true })).toBeVisible();
+    await expect(page.getByText("Prompt number 0", { exact: true })).toHaveCount(0);
+    await searchChat(page, "hello world");
+    await expectHighlight(page, "hello world");
+    await expect(status(page)).toHaveText("1 of 90");
+    await page.screenshot({ path: testInfo.outputPath("chat-find-highlight.png") });
+    expect(jumps.requests()[0]).toMatchObject({ limit: 40, mergeWindow: true });
+    await nextMatch(page);
+    await expect(status(page)).toHaveText("2 of 90");
+    await expectHighlight(page, "hello world");
+    await previousMatch(page);
+    await expect(status(page)).toHaveText("1 of 90");
+    await query(page).fill("hello & world");
+    await expectHighlight(page, "hello & world");
+    await query(page).fill("a.b");
+    await expectHighlight(page, "a.b");
+    await query(page).fill("Prompt number 0");
+    await expectHighlight(page, "Prompt number 0");
+    await closeFind(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+// The scope of the search is the whole chat, so the counter is the position across
+// every message that holds a hit, and Next walks off the end of one into the next.
+const ACROSS_PROMPT = "Find scope-needle in this chat";
+const ACROSS_RESPONSE = "Reply with scope-needle here.\n\nAnd scope-needle again there.";
+
+/** The test id of the message that holds the current match, so it can be watched crossing one. */
+async function highlightedMessage(page: Page) {
+  return page.evaluate(() => {
+    const entry = Array.from(CSS.highlights.entries()).find(([name]) =>
+      name.startsWith("paseo-chat-find-"),
+    );
+    const range = entry && Array.from(entry[1])[0];
+    if (!(range instanceof Range)) return null;
+    const message = range.startContainer.parentElement?.closest<HTMLElement>(
+      '[data-testid="user-message"], [data-testid="assistant-message"]',
+    );
+    return message?.dataset.testid ?? null;
+  });
+}
+async function expectHighlightedMessage(page: Page, testId: string) {
+  await expect.poll(() => highlightedMessage(page)).toBe(testId);
+}
+
+test("counts and steps through every match in the chat, not just the selected message", async ({
+  page,
+}, testInfo) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-across-",
+    title: "Chat Find across messages",
+    initialPrompt: ACROSS_PROMPT,
+    featureValues: { mockAssistantResponse: ACROSS_RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await openAgentRoute(page, agent);
+    await expect(page.getByTestId("assistant-message").first()).toBeVisible();
+    // One hit in the prompt and two in the reply: three across the chat.
+    await searchChat(page, "scope-needle");
+    await expect(status(page)).toHaveText("1 of 3");
+    await expectHighlight(page, "scope-needle");
+    await expectHighlightedMessage(page, "user-message");
+    await page.screenshot({ path: testInfo.outputPath("chat-find-across-messages.png") });
+    await expectNextMatch(page, "2 of 3", "scope-needle");
+    await expectHighlightedMessage(page, "assistant-message");
+    await expectNextMatch(page, "3 of 3", "scope-needle");
+    await expectHighlightedMessage(page, "assistant-message");
+    await page.screenshot({ path: testInfo.outputPath("chat-find-last-match.png") });
+    await expectNextMatch(page, "1 of 3", "scope-needle");
+    await expectHighlightedMessage(page, "user-message");
+    await previousMatch(page);
+    await expect(status(page)).toHaveText("3 of 3");
+    await expectHighlight(page, "scope-needle");
+    await expectHighlightedMessage(page, "assistant-message");
+    await closeFind(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("rejects invisible source matches and ignores a late reply after closing", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-cancel-",
+    title: "Chat Find cancellation",
+    initialPrompt: "Render the response",
+    featureValues: { mockAssistantResponse: RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    const gate = await installDaemonWebSocketGate(page);
+    await openAgentRoute(page, agent);
+    await expect(page.getByTestId("assistant-message").first()).toBeVisible();
+    await searchChat(page, "hidden-destination");
+    await expect(status(page)).toHaveText("No matches");
+    await query(page).fill("first cell second cell");
+    await expect(status(page)).toHaveText("No matches");
+    gate.holdNextServerMessage("agent.timeline.search.response");
+    await query(page).fill("hello world");
+    await expect(status(page)).toHaveText("Searching…");
+    await gate.waitForHeldServerMessage("agent.timeline.search.response");
+    await closeFind(page);
+    gate.releaseHeldServerMessage("agent.timeline.search.response");
+    await searchChat(page, "a.b");
+    await expectHighlight(page, "a.b");
+    await closeFind(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("shows a disconnected search failure and recovers with Retry", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-retry-",
+    title: "Chat Find retry",
+    initialPrompt: "Render the response",
+    featureValues: { mockAssistantResponse: RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    const gate = await installDaemonWebSocketGate(page);
+    await openAgentRoute(page, agent);
+    await expect(page.getByTestId("assistant-message").first()).toBeVisible();
+    await gate.drop();
+    await expectReconnectingToastVisible(page);
+    await searchChat(page, "hello world");
+    await expect(status(page)).toHaveText("Failed");
+    await expect(
+      page.getByText("Could not search this chat. Check the host connection and retry.", {
+        exact: true,
+      }),
+    ).toBeVisible();
+    await expect(page.getByRole("button", { name: "Retry", exact: true })).toBeVisible();
+    gate.restore();
+    await expectReconnectingToastGone(page);
+    await page.getByRole("button", { name: "Retry", exact: true }).click();
+    await expectHighlight(page, "hello world");
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+interface StreamedReplyChat extends MockAgentWorkspace {
+  /** Resolves once the streamed reply has finished arriving. */
+  replyFinished(): Promise<void>;
+}
+
+/**
+ * Opens the chat first, then streams a multi-block reply into it and waits for a
+ * later block, so the block holding the early needles is no longer the growing row.
+ */
+async function openChatStreamingMultiBlockReply(page: Page): Promise<StreamedReplyChat> {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-live-blocks-",
+    title: "Chat Find live blocks",
+    featureValues: {
+      mockStreamingAssistantResponse: STREAMED_RESPONSE,
+      mockStreamingAssistantIntervalMs: 60,
+    },
+  });
+  try {
+    await openAgentRoute(page, agent);
+    await agent.client.sendAgentMessage(agent.agentId, "Stream a multi block answer");
+    await expect(page.getByText("beta-needle", { exact: false }).last()).toBeVisible({
+      timeout: 30_000,
+    });
+    return {
+      ...agent,
+      replyFinished: async () => {
+        await agent.client.waitForFinish(agent.agentId, 60_000);
+      },
+    };
+  } catch (error) {
+    await agent.cleanup();
+    throw error;
+  }
+}
+
+test("finds a hit in a message that streamed while the chat was open", async ({ page }) => {
+  test.setTimeout(120_000);
+  const chat = await openChatStreamingMultiBlockReply(page);
+  try {
+    await openChatFind(page);
+    // The only hit is in the first paragraph, which is no longer the row that grows.
+    await expectFindStatus(page, "alpha-needle", "1 of 1");
+    await chat.replyFinished();
+    await expectFindStatus(page, "beta-needle", "1 of 1");
+    // One message, two Markdown blocks, one count across both.
+    await expectFindStatus(page, "pair-needle", "1 of 2");
+    await expectNextMatch(page, "2 of 2", "pair-needle");
+    await closeFind(page);
+  } finally {
+    await chat.cleanup();
+  }
+});
+
+/**
+ * Opens a chat whose newest reply is a single message far taller than the viewport,
+ * behind enough older turns that the oldest one is not hydrated yet.
+ */
+async function openChatWithVirtualizedTallMessage(page: Page): Promise<MockAgentWorkspace> {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-virtualized-",
+    title: "Chat Find virtualized message",
+    featureValues: { mockAssistantResponse: TALL_RESPONSE },
+  });
+  try {
+    for (let index = 0; index < 6; index++) {
+      await agent.client.sendAgentMessage(agent.agentId, `Prompt number ${index}`);
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    }
+    await openAgentRoute(page, agent);
+    await expect(page.getByText("Prompt number 5", { exact: true })).toBeVisible();
+    await expect(page.getByText("Prompt number 0", { exact: true })).toHaveCount(0);
+    return agent;
+  } catch (error) {
+    await agent.cleanup();
+    throw error;
+  }
+}
+
+// Every block row of the selected message must be mounted for Find to see it, whatever
+// the virtualizer's scroll window holds. Otherwise a hit in a far paragraph is missing
+// from the count and Next walks off to the next message instead.
+test("counts every occurrence of a virtualized message and steps between them", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const chat = await openChatWithVirtualizedTallMessage(page);
+  try {
+    await openChatFind(page);
+    await expectFindStatus(page, "span-needle", "1 of 12");
+    await expectHighlight(page, "span-needle");
+    await expectNextMatch(page, "2 of 12", "span-needle");
+    await closeFind(page);
+  } finally {
+    await chat.cleanup();
+  }
+});
+
+test("finds text beyond the normal render cap and restores the cap when Find closes", async ({
+  page,
+}) => {
+  const tail = "oversized-tail-needle";
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-cap-",
+    title: "Chat Find long message",
+    initialPrompt: "Render a long response",
+    // One paragraph, so the needle is past the render cap of the row that holds it.
+    featureValues: { mockAssistantResponse: `${"background ".repeat(3100)}${tail}` },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await openAgentRoute(page, agent);
+    const message = page.getByTestId("assistant-message");
+    await expect(message).toBeVisible();
+    await expect(message).not.toContainText(tail);
+    await searchChat(page, tail);
+    await expectHighlight(page, tail);
+    await closeFind(page);
+    await expect(message).not.toContainText(tail);
+    await expect(message.getByTestId("assistant-message-capped-notice")).toBeVisible();
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+async function findFromComposer(page: Page, shortcut: string, testInfo: TestInfo) {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-composer-",
+    title: "Chat Find from composer",
+    initialPrompt: "Render the response",
+    featureValues: { mockAssistantResponse: RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await openAgentRoute(page, agent);
+    await searchFromComposerWithoutLosingDraft(page, shortcut);
+    await refocusFindAndReplaceQuery(page, shortcut);
+    await page.screenshot({ path: testInfo.outputPath("find-from-composer.png") });
+    await closeFind(page);
+    await expectCommandCenterOwnsFindShortcut(page, shortcut);
+    await fillComposerDraft(page, "Draft after closing Find");
+    await expectComposerDraft(page, "Draft after closing Find");
+  } finally {
+    await agent.cleanup();
+  }
+}
+
+test("opens and refocuses Find with Control+f from the composer on Linux", async ({
+  page,
+}, testInfo) => {
+  // Chromium retains the host navigator.platform even when its user agent is overridden.
+  const session = await page.context().newCDPSession(page);
+  await session.send("Emulation.setUserAgentOverride", {
+    userAgent:
+      "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+    platform: "Linux x86_64",
+  });
+  await findFromComposer(page, "Control+f", testInfo);
+});
+
+test.describe("macOS", () => {
+  test.use({ userAgent: MAC_USER_AGENT });
+
+  test("opens and refocuses Find with Meta+f from the composer", async ({ page }, testInfo) => {
+    await findFromComposer(page, "Meta+f", testInfo);
+  });
+
+  // Control+F moves the caret forward on macOS, so chat Find must leave it alone.
+  test("leaves Control+f to the composer", async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "chat-find-mac-control-f-",
+      title: "Chat Find macOS Control+f",
+      initialPrompt: "Render the response",
+      featureValues: { mockAssistantResponse: RESPONSE },
+    });
+    try {
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      await openAgentRoute(page, agent);
+      await fillComposerDraft(page, "Keep this draft");
+      await expectComposerFocused(page);
+      await recordComposerKeydown(page);
+      await page.keyboard.press("Control+f");
+      await expect
+        .poll(() => recordedComposerFindKeydown(page))
+        .toEqual([{ key: "f", defaultPrevented: false }]);
+      await expect(query(page)).toHaveCount(0);
+      await expectComposerFocused(page);
+      await expectComposerDraft(page, "Keep this draft");
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
+
+interface RecordedKeydown {
+  key: string;
+  defaultPrevented: boolean;
+}
+
+/**
+ * Chat Find listens on `document` in the capture phase, so the composer only ever
+ * sees a Find keystroke after Find decided about it. That makes `defaultPrevented`
+ * on the composer the evidence of who owns the key.
+ */
+async function recordComposerKeydown(page: Page) {
+  await composerLocator(page).evaluate((element) => {
+    const store = window as unknown as { __findKeydown: RecordedKeydown[] };
+    store.__findKeydown = [];
+    element.addEventListener("keydown", (event) => {
+      store.__findKeydown.push({
+        key: (event as KeyboardEvent).key,
+        defaultPrevented: event.defaultPrevented,
+      });
+    });
+  });
+}
+
+async function recordedComposerFindKeydown(page: Page): Promise<RecordedKeydown[]> {
+  const recorded = await page.evaluate(
+    () => (window as unknown as { __findKeydown: RecordedKeydown[] }).__findKeydown,
+  );
+  return recorded.filter((entry) => entry.key.toLowerCase() === "f");
+}
+
+async function openFindFromComposer(page: Page, shortcut: string) {
+  await page.keyboard.press(shortcut);
+  await expect(query(page)).toBeFocused();
+}
+
+async function searchFromComposerWithoutLosingDraft(page: Page, shortcut: string) {
+  await fillComposerDraft(page, "Keep this draft");
+  await expectComposerFocused(page);
+  await openFindFromComposer(page, shortcut);
+  await expectComposerDraft(page, "Keep this draft");
+  await query(page).fill("hello world");
+  await expectHighlight(page, "hello world");
+}
+
+async function refocusFindAndReplaceQuery(page: Page, shortcut: string) {
+  await composerLocator(page).click();
+  await expectComposerFocused(page);
+  await openFindFromComposer(page, shortcut);
+  await expect(query(page)).toHaveValue("hello world");
+  await expectComposerDraft(page, "Keep this draft");
+  await page.keyboard.type("a.b");
+  await expect(query(page)).toHaveValue("a.b");
+  await expectHighlight(page, "a.b");
+}
+
+async function expectCommandCenterOwnsFindShortcut(page: Page, shortcut: string) {
+  await openCommandCenter(page);
+  await page.keyboard.press(shortcut);
+  await expect(page.getByTestId("command-center-panel")).toBeVisible();
+  await expect(query(page)).toHaveCount(0);
+  await closeCommandCenter(page);
+}
diff --git a/packages/app/e2e/browser/chat-outline.spec.ts b/packages/app/e2e/browser/chat-outline.spec.ts
index 8e4532ee4f..640b141f53 100644
--- a/packages/app/e2e/browser/chat-outline.spec.ts
+++ b/packages/app/e2e/browser/chat-outline.spec.ts
@@ -17,10 +17,20 @@ import {
   hoverChatOutlinePrompt,
   chatOutlineRail,
   movePointerOffChatOutline,
+  observePromptIndexRequests,
   pointAtChatOutlineRowEdge,
   pressEnterOnFocusedPrompt,
   splitCurrentPanelRight,
+  withStreamingMarkdownOutline,
+  expectReadingStreamedMarkdown,
 } from "../support/helpers/chat-outline";
+import { createCreationScenario } from "../support/helpers/creation";
+import {
+  attachPromptTimelineEvidence,
+  expectPromptsDrawnByPlugin,
+  expectVirtualizedPluginPromptVisible,
+  withPromptTimelinePlugin,
+} from "../support/helpers/plugin-timeline";
 import {
   expectTimelineAtMaximumScrollWithPromptVisible,
   expectTimelinePromptNotMounted,
@@ -41,6 +51,31 @@ const WIDE_VIEWPORT = { width: 1440, height: 900 };
 const LOADED_TURNS = 16;
 
 test.describe("desktop chat outline", () => {
+  test("keeps the prompt marked while reading split Markdown blocks and after completion", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+    const prompt = "Explain in several paragraphs.";
+    await withStreamingMarkdownOutline(async (agent) => {
+      await agent.client.sendAgentMessage(agent.agentId, "Earlier prompt.");
+      await agent.client.waitForFinish(agent.agentId, 30_000);
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await openAgentTimeline(page, agent);
+      await agent.client.sendAgentMessage(agent.agentId, prompt);
+      await expectChatOutlinePrompts(page, 2);
+
+      await expectReadingStreamedMarkdown(page, prompt);
+      await expectActiveChatOutlinePrompt(page, 2);
+      await agent.client.waitForFinish(agent.agentId, 30_000);
+      await expectActiveChatOutlinePrompt(page, 2);
+
+      await page.reload({ waitUntil: "domcontentloaded" });
+      await expectActiveChatOutlinePrompt(page, 2);
+      await clickChatOutlineRowEdge(page, 2);
+      await expectTimelinePromptLandedBelowTop(page, prompt);
+    });
+  });
+
   test("indexes unloaded prompts and jumps with one bounded merged page", async ({ page }) => {
     test.setTimeout(120_000);
     const agent = await seedLongMockAgentTimeline({ turns: 80 });
@@ -76,6 +111,60 @@ test.describe("desktop chat outline", () => {
     }
   });
 
+  test("jumps to prompts a timeline plugin draws", async ({ page }) => {
+    test.setTimeout(180_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await withPromptTimelinePlugin(async () => {
+        await page.setViewportSize(WIDE_VIEWPORT);
+        await openAgentTimeline(page, agent);
+        await expectChatOutlinePrompts(page, 80);
+        await expectPromptsDrawnByPlugin(page);
+        await expectTimelinePromptNotMounted(page, agent.prompts[39]);
+
+        // Unloaded, then loaded, then near the newest edge.
+        await clickChatOutlineRowEdge(page, 40);
+        await expectTimelinePromptLandedBelowTop(page, agent.prompts[39]);
+        await attachPromptTimelineEvidence(page, test.info());
+        await clickChatOutlineRowEdge(page, 45);
+        await expectTimelinePromptLandedBelowTop(page, agent.prompts[44]);
+        await clickChatOutlineRowEdge(page, 78);
+        await expectTimelineAtMaximumScrollWithPromptVisible(page, agent.prompts[77]);
+        await expectPromptsDrawnByPlugin(page);
+      });
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("jumps to a loaded virtualized prompt a timeline plugin draws without fetching", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    const prompt = agent.prompts[29]!;
+    try {
+      await withPromptTimelinePlugin(async () => {
+        const history = await holdOlderHistoryPages(page, agent);
+        await page.setViewportSize(WIDE_VIEWPORT);
+        await openAgentTimeline(page, agent);
+        await expectChatOutlinePrompts(page, 80);
+        await scrollThroughOlderHistoryPages(page, 2, history);
+        await scrollTimelineToNewestLoadedEdge(page);
+        await expectTimelinePromptNotMounted(page, prompt);
+        const requestsBeforeJump = history.requestCount();
+
+        await clickChatOutlineRowEdge(page, 30);
+        await expectTimelinePromptLandedBelowTop(page, prompt);
+        await expectVirtualizedPluginPromptVisible(page, prompt);
+        await attachPromptTimelineEvidence(page, test.info());
+        expect(history.requestCount()).toBe(requestsBeforeJump);
+      }, [prompt]);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
   test.describe("with the whole conversation loaded", () => {
     let agent: LongTimelineAgent;
 
@@ -239,3 +328,21 @@ test.describe("desktop chat outline", () => {
     }
   });
 });
+
+test("indexes a new agent's prompts only once the agent exists", async ({ page }) => {
+  const promptIndex = await observePromptIndexRequests(page);
+  const creation = await createCreationScenario(page);
+  try {
+    await page.setViewportSize(WIDE_VIEWPORT);
+    await creation.openAgentDraft();
+    await creation.submitPrompt("Start an agent with an outline.");
+    await creation.expectPromptVisible();
+
+    const agentIds = await creation.agentIds();
+    expect(agentIds).toHaveLength(1);
+    await promptIndex.waitForRequestFor(agentIds[0]!);
+    expect(promptIndex.requestedAgentIds()).toEqual(agentIds);
+  } finally {
+    await creation.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/codex-speed.spec.ts b/packages/app/e2e/browser/codex-speed.spec.ts
new file mode 100644
index 0000000000..ca8c3d8991
--- /dev/null
+++ b/packages/app/e2e/browser/codex-speed.spec.ts
@@ -0,0 +1,139 @@
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+
+// This fixture catalog advertises Ultrafast on Sol; another model offers Fast only.
+// The real daemon discovers both through the same Codex model/list boundary.
+test.use({
+  e2eDaemonConfig: {
+    version: 1,
+    agents: {
+      providers: {
+        codex: {
+          enabled: true,
+          command: [process.execPath, path.resolve("e2e/fixtures/catalog-codex.mjs")],
+        },
+        claude: { enabled: false },
+        copilot: { enabled: false },
+        opencode: { enabled: false },
+        pi: { enabled: false },
+        omp: { enabled: false },
+      },
+    },
+  },
+});
+
+// Rendered light-theme colors: palette yellow 400 for Fast and Ultrafast, muted foreground for Normal.
+const ACTIVE_SPEED_COLOR = "rgb(251, 191, 36)";
+const NORMAL_SPEED_COLOR = "rgb(113, 113, 122)";
+
+async function openSpeedSelector(page: Page): Promise<void> {
+  const speed = page.getByRole("button", { name: /^(Select speed|Speed: .+)$/ });
+  const features = page.getByRole("button", { name: "Open agent features", exact: true });
+  const modelSettings = page.getByRole("button", { name: /^Select model \(/ });
+  await expect(speed.or(features).or(modelSettings).filter({ visible: true }).first()).toBeVisible({
+    timeout: 30_000,
+  });
+  if (!(await speed.isVisible())) {
+    if (await features.isVisible()) await features.click();
+    else await modelSettings.click();
+  }
+  await expect(speed).toBeVisible({ timeout: 30_000 });
+  await speed.click();
+  await expect(page.getByText("Normal", { exact: true }).last()).toBeVisible();
+}
+
+async function selectSpeed(page: Page, label: string): Promise<void> {
+  await page.getByRole("button", { name: label, exact: true }).last().click();
+  const toolbarTrigger = page.getByRole("button", { name: `Speed: ${label}`, exact: true });
+  const sheetTrigger = page.getByRole("button", { name: "Select speed", exact: true });
+  await expect(toolbarTrigger.or(sheetTrigger)).toBeVisible();
+  if (await toolbarTrigger.isVisible()) await expect(toolbarTrigger).toHaveText("");
+  else await expect(sheetTrigger).toContainText(label);
+}
+
+async function expectSpeedIconColor(page: Page, color: string): Promise<void> {
+  const trigger = page
+    .getByRole("button", { name: /^(Speed: .+|Select speed)$/ })
+    .filter({ visible: true });
+  await expect(trigger.locator("svg").first()).toHaveCSS("stroke", color);
+}
+
+async function expectSpeedChoices(page: Page, choices: string[]): Promise<void> {
+  for (const choice of ["Normal", "Fast", "Ultrafast"]) {
+    const option = page.getByText(choice, { exact: true }).last();
+    if (choices.includes(choice)) {
+      await expect(option).toBeVisible();
+      await expect(option).toBeInViewport({ ratio: 1 });
+    } else await expect(option).not.toBeVisible();
+  }
+}
+
+async function switchAgentModel(agentId: string, modelId: string): Promise<void> {
+  const client = await connectDaemonClient<
+    Pick<DaemonClient, "setAgentModel" | "close" | "connect">
+  >({
+    clientIdPrefix: "codex-speed-model",
+  });
+  try {
+    await client.setAgentModel(agentId, modelId);
+  } finally {
+    await client.close();
+  }
+}
+
+for (const viewport of [
+  { name: "desktop", width: 1280, height: 850 },
+  { name: "compact", width: 390, height: 844 },
+]) {
+  test(`Codex catalog drives speed choices on ${viewport.name}`, async ({ page }, testInfo) => {
+    test.setTimeout(180_000);
+    await page.setViewportSize(viewport);
+    const workspace = await seedWorkspace({ repoPrefix: "codex-speed-" });
+    try {
+      const agent = await workspace.client.createAgent({
+        provider: "codex",
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "Speed settings",
+        model: "gpt-6.1-sol",
+        modeId: "full-access",
+        initialPrompt: "Get ready to work on this project.",
+      });
+      await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+      if (viewport.name === "desktop") {
+        const trigger = page.getByRole("button", { name: "Speed: Normal", exact: true });
+        await expect(trigger).toBeVisible({ timeout: 30_000 });
+        await expect(trigger).toHaveText("");
+        await page.screenshot({ path: testInfo.outputPath("desktop-normal-trigger.png") });
+      }
+      await openSpeedSelector(page);
+      await selectSpeed(page, "Fast");
+      await expectSpeedIconColor(page, ACTIVE_SPEED_COLOR);
+      await page.screenshot({ path: testInfo.outputPath(`${viewport.name}-fast-selected.png`) });
+      await openSpeedSelector(page);
+      await expectSpeedChoices(page, ["Normal", "Fast", "Ultrafast"]);
+      await page.screenshot({ path: testInfo.outputPath(`${viewport.name}-speed-options.png`) });
+      await selectSpeed(page, "Ultrafast");
+      await expectSpeedIconColor(page, ACTIVE_SPEED_COLOR);
+      await openSpeedSelector(page);
+      await expectSpeedChoices(page, ["Normal", "Fast", "Ultrafast"]);
+      await page.screenshot({
+        path: testInfo.outputPath(`${viewport.name}-ultrafast-selected.png`),
+      });
+      await selectSpeed(page, "Normal");
+      await expectSpeedIconColor(page, NORMAL_SPEED_COLOR);
+      if (viewport.name === "desktop") {
+        await switchAgentModel(agent.id, "gpt-6-sol");
+        await openSpeedSelector(page);
+        await expectSpeedChoices(page, ["Normal", "Fast"]);
+        await page.screenshot({ path: testInfo.outputPath("desktop-fast-only.png") });
+      }
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+}
diff --git a/packages/app/e2e/browser/command-center-agent-controls.spec.ts b/packages/app/e2e/browser/command-center-agent-controls.spec.ts
index 0748250302..658e0e1123 100644
--- a/packages/app/e2e/browser/command-center-agent-controls.spec.ts
+++ b/packages/app/e2e/browser/command-center-agent-controls.spec.ts
@@ -1,4 +1,4 @@
-import { test } from "../support/fixtures";
+import { expect, test } from "../support/fixtures";
 import type { FormPreferences } from "@/create-agent-preferences/preferences";
 import { closeCommandCenter, openCommandCenter } from "../support/helpers/command-center";
 import {
@@ -79,6 +79,27 @@ test.describe("Command Center agent controls", () => {
     }
   });
 
+  test("shows an existing agent's only supported thinking level", async ({ page }) => {
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "agent-controls-single-thinking-",
+      title: "Single thinking level",
+      model: "max-only-thinking-stream",
+      thinkingOptionId: "max",
+    });
+    try {
+      await openAgentRoute(page, {
+        workspaceId: workspace.workspaceId,
+        agentId: workspace.agentId,
+      });
+
+      await expect(
+        page.getByTestId("agent-thinking-selector").filter({ visible: true }),
+      ).toHaveAccessibleName("Select thinking option (Max)");
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
   test("activates the best-matching row, not the highest-ranked group", async ({ page }) => {
     // "Mode › Load Test" matches "load" at offset 0; every "Model › Mock Load Test › …" row
     // matches at offset 5. Models used to outrank modes by fixed group rank, so Enter picked a
diff --git a/packages/app/e2e/browser/command-center-host.spec.ts b/packages/app/e2e/browser/command-center-host.spec.ts
deleted file mode 100644
index be4dd9e830..0000000000
--- a/packages/app/e2e/browser/command-center-host.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { randomUUID } from "node:crypto";
-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 { expectAgentTabActive } from "../support/helpers/launcher";
-import { seedWorkspace } from "../support/helpers/seed-client";
-
-test.describe("Command center host labels", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("selecting an agent result opens its workspace tab", async ({ page }) => {
-    const seeded = await seedWorkspace({ repoPrefix: "command-center-agent-navigation-" });
-    const title = `cc-navigation-${randomUUID().slice(0, 8)}`;
-
-    try {
-      const agent = await createIdleAgent(seeded.client, {
-        cwd: seeded.repoPath,
-        workspaceId: seeded.workspaceId,
-        title,
-      });
-
-      await gotoAppShell(page);
-      const panel = await openCommandCenter(page);
-      await panel.getByTestId("command-center-input").fill(title);
-      await page.keyboard.press("Enter");
-
-      await expectAgentTabActive(page, agent.id);
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-});
diff --git a/packages/app/e2e/browser/command-center-workspaces.spec.ts b/packages/app/e2e/browser/command-center-workspaces.spec.ts
index 44892a4994..4b01b0c67d 100644
--- a/packages/app/e2e/browser/command-center-workspaces.spec.ts
+++ b/packages/app/e2e/browser/command-center-workspaces.spec.ts
@@ -3,6 +3,7 @@ import { expect } from "@playwright/test";
 import { test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { createIdleAgent } from "../support/helpers/archive-tab";
+import { expectAgentTabActive } from "../support/helpers/launcher";
 import { openCommandCenter } from "../support/helpers/command-center";
 import { addOfflineHostAndReload } from "../support/helpers/hosts";
 import { expectAppRoute } from "../support/helpers/route-assertions";
@@ -109,6 +110,13 @@ test.describe("Command center workspaces", () => {
       await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), seeded.workspaceId), {
         timeout: 30_000,
       });
+
+      await test.step("find an agent and open its workspace tab", async () => {
+        const agentPanel = await openCommandCenter(page);
+        await agentPanel.getByTestId("command-center-input").fill(AGENT_TITLE);
+        await page.keyboard.press("Enter");
+        await expectAgentTabActive(page, agent.id);
+      });
     } finally {
       await seeded.cleanup();
     }
diff --git a/packages/app/e2e/browser/commit-diff-panel.spec.ts b/packages/app/e2e/browser/commit-diff-panel.spec.ts
index d29e566f80..75387cbdfa 100644
--- a/packages/app/e2e/browser/commit-diff-panel.spec.ts
+++ b/packages/app/e2e/browser/commit-diff-panel.spec.ts
@@ -87,7 +87,25 @@ test("commit history shows dates and shares diff layout preferences", async ({
   await expect(panel.getByTestId("git-diff-canvas")).toBeVisible();
 });
 
-async function createFeatureCommit(repoPath: string): Promise<void> {
+test("a fresh commit says just now and its age advances", async ({ page, withWorkspace }) => {
+  const workspace = await withWorkspace({ prefix: "commit-relative-time-" });
+  const committedAt = new Date();
+  await createFeatureCommit(workspace.repoPath, committedAt.toISOString());
+  await page.clock.install({ time: committedAt });
+  await workspace.navigateTo();
+
+  await openChangesTreePanel(page);
+  await page.getByRole("button", { name: /Commits/i }).click();
+  const row = page.locator('[data-testid^="commit-row-"]').filter({ hasText: COMMIT_SUBJECT });
+  await expect(row).toContainText("just now", { timeout: 30_000 });
+  await page.clock.fastForward("03:00");
+  await expect(row).toContainText("3m ago");
+});
+
+async function createFeatureCommit(
+  repoPath: string,
+  authorDate = "2020-01-15T12:00:00Z",
+): Promise<void> {
   execFileSync("git", ["checkout", "-b", "feature"], { cwd: repoPath, stdio: "ignore" });
   await writeFile(path.join(repoPath, "feature.txt"), "before\nafter\n");
   execFileSync("git", ["add", "feature.txt"], { cwd: repoPath, stdio: "ignore" });
@@ -96,8 +114,8 @@ async function createFeatureCommit(repoPath: string): Promise<void> {
     stdio: "ignore",
     env: {
       ...process.env,
-      GIT_AUTHOR_DATE: "2020-01-15T12:00:00Z",
-      GIT_COMMITTER_DATE: "2020-01-15T12:00:00Z",
+      GIT_AUTHOR_DATE: authorDate,
+      GIT_COMMITTER_DATE: authorDate,
     },
   });
 }
diff --git a/packages/app/e2e/browser/compact-workspace-header.spec.ts b/packages/app/e2e/browser/compact-workspace-header.spec.ts
new file mode 100644
index 0000000000..c245d2ae10
--- /dev/null
+++ b/packages/app/e2e/browser/compact-workspace-header.spec.ts
@@ -0,0 +1,96 @@
+import type { Page, TestInfo } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+
+const labels = {
+  long: {
+    title: "workspace-with-a-very-long-release-and-investigation-name",
+    project: "project-with-a-very-long-customer-integration-name",
+  },
+  short: { title: "main", project: "Paseo" },
+};
+
+async function openNamedWorkspace(page: Page, names: typeof labels.long) {
+  const workspace = await seedWorkspace({ repoPrefix: "header-width-", title: names.title });
+  try {
+    await workspace.client.renameProject(workspace.projectId, names.project);
+    const agent = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Header layout check",
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+    });
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    await expect(page.getByTestId("workspace-header-title")).toHaveText(names.title);
+    await expect(page.getByTestId("workspace-header-subtitle")).toHaveText(names.project);
+    await expect(
+      page.getByTestId(`host-badge-${getServerId()}`).filter({ visible: true }),
+    ).toHaveCount(1);
+    return workspace;
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
+}
+
+async function expectHeaderContentsFit(page: Page, info: TestInfo, long: boolean) {
+  const title = page.getByTestId("workspace-header-title");
+  const project = page.getByTestId("workspace-header-subtitle");
+  const badge = page.getByTestId(`host-badge-${getServerId()}`).filter({ visible: true });
+  const trigger = page.getByRole("button", { name: /Switch tabs/ });
+  const measure = async () => ({
+    title: await title.boundingBox(),
+    project: await project.boundingBox(),
+    badge: await badge.boundingBox(),
+    icon: await badge.locator("svg").boundingBox(),
+    trigger: await trigger.boundingBox(),
+    titleTruncated: await title.evaluate((el) => el.scrollWidth > el.clientWidth),
+    projectTruncated: await project.evaluate((el) => el.scrollWidth > el.clientWidth),
+  });
+  await page.screenshot({ path: info.outputPath("header.png") });
+  await expect(async () => {
+    const bounds = await measure();
+    expect(bounds.title).not.toBeNull();
+    expect(bounds.project).not.toBeNull();
+    expect(bounds.badge).not.toBeNull();
+    expect(bounds.icon).not.toBeNull();
+    expect(bounds.trigger).not.toBeNull();
+    // Approved geometry: 12px outside margin, 46px leading island, 8px title gap.
+    expect(bounds.title!.x).toBe(66);
+    expect(bounds.project!.x).toBe(bounds.title!.x);
+    expect(bounds.trigger!.width).toBe(32);
+    expect(bounds.trigger!.height).toBe(32);
+    // The action frame starts 7px inside its island; preserve the 8px gap before it.
+    const contentRight = bounds.trigger!.x - 15;
+    for (const box of [bounds.title!, bounds.project!, bounds.badge!, bounds.icon!]) {
+      expect(box.x + box.width).toBeLessThanOrEqual(contentRight + 1);
+    }
+    expect(bounds.project!.width).toBeGreaterThan(20);
+    expect(bounds.icon!.width).toBe(12);
+    expect(bounds.badge!.x).toBeGreaterThan(bounds.project!.x + bounds.project!.width);
+    expect(bounds.titleTruncated).toBe(long);
+    expect(bounds.projectTruncated).toBe(long);
+  }).toPass({ timeout: 5_000 });
+  await info.attach("header-bounds", {
+    body: JSON.stringify(await measure(), null, 2),
+    contentType: "application/json",
+  });
+}
+
+for (const width of [320, 390]) {
+  for (const kind of ["long", "short"] as const) {
+    test(`compact header contains ${kind} labels at ${width}px`, async ({ page }, info) => {
+      await page.setViewportSize({ width, height: 844 });
+      const workspace = await openNamedWorkspace(page, labels[kind]);
+      try {
+        await expectHeaderContentsFit(page, info, kind === "long");
+      } finally {
+        await workspace.cleanup();
+      }
+    });
+  }
+}
diff --git a/packages/app/e2e/browser/composer-attachments.spec.ts b/packages/app/e2e/browser/composer-attachments.spec.ts
index acf1941c23..94a52ace16 100644
--- a/packages/app/e2e/browser/composer-attachments.spec.ts
+++ b/packages/app/e2e/browser/composer-attachments.spec.ts
@@ -38,6 +38,7 @@ import { seedWorkspace } from "../support/helpers/seed-client";
 import { hasGithubAuth, createTempGithubRepo } from "../support/helpers/github-fixtures";
 import { getServerId } from "../support/helpers/server-id";
 import { openFileExplorer } from "../support/helpers/file-explorer";
+import { attachFileFromMenu, controlFileUploadCompletion } from "../support/helpers/composer";
 
 const MINIMAL_PNG = Buffer.from(
   "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
@@ -52,17 +53,29 @@ const TEST_JSON = {
 };
 
 test.describe("Composer attachments", () => {
-  test("Plus menu shows image and GitHub options", async ({ page, withWorkspace }) => {
-    test.setTimeout(60_000);
-    const workspace = await withWorkspace({ prefix: "attach-plus-" });
+  test("selected file shows a loading attachment until upload is acknowledged", async ({
+    page,
+    withWorkspace,
+  }) => {
+    const upload = await controlFileUploadCompletion(page);
+    const workspace = await withWorkspace({ prefix: "attach-upload-pending-" });
     await workspace.navigateTo();
     await clickNewChat(page);
     await expectComposerVisible(page);
 
-    await openAttachmentMenu(page);
+    upload.hold();
+    await attachFileFromMenu(page, TEST_JSON);
+    await upload.waitForUpload();
 
-    await expect(page.getByTestId("message-input-attachment-menu-item-image")).toBeVisible();
-    await expect(page.getByTestId("message-input-attachment-menu-item-github")).toBeVisible();
+    const pending = page.getByTestId("composer-pending-file-attachment");
+    await expect(pending).toContainText(TEST_JSON.name);
+    await expect(pending.getByRole("progressbar")).toBeVisible();
+    await expect(page.getByTestId("composer-file-attachment-pill")).toHaveCount(0);
+
+    upload.complete();
+    await expect(pending).toHaveCount(0);
+    await expect(page.getByTestId("composer-file-attachment-pill")).toContainText(TEST_JSON.name);
+    await expectComposerEditable(page);
   });
 
   test("compact Plus menu aligns attachment rows with its sheet title", async ({
@@ -101,59 +114,27 @@ test.describe("Composer attachments", () => {
     ).toBeVisible({ timeout: 10_000 });
   });
 
-  test("GitHub issue attachment pill visible after search and selection", async ({ page }) => {
+  test("attaches an issue and a pull request from the repository picker", async ({ page }) => {
     test.setTimeout(120_000);
     if (!hasGithubAuth()) {
       test.skip(true, "GitHub auth not available in this environment");
     }
-
     const ghRepo = await createTempGithubRepo({
-      category: "attach-issue",
-      issues: [{ title: "fix: attach-issue-unique-alpha" }],
-      prs: [{ title: "feat: attach-issue-dummy-pr", state: "open" }],
+      category: "attachments",
+      issues: [{ title: "fix: attachment issue" }],
+      prs: [{ title: "feat: attachment pull request", state: "open" }],
     });
     const handle = await openGithubWorkspace(page, ghRepo.prs[0].localPath);
     try {
       await clickNewChat(page);
       await expectComposerVisible(page);
-
-      await selectGithubOption(
-        page,
-        "attach-issue-unique-alpha",
-        `issue:${ghRepo.issues[0].number}`,
-      );
-
-      await expectGithubAttachmentPill(page, {
-        number: ghRepo.issues[0].number,
-        title: ghRepo.issues[0].title,
-      });
-    } finally {
-      await handle.cleanup();
-      await ghRepo.cleanup();
-    }
-  });
-
-  test("GitHub PR attachment pill visible after search and selection", async ({ page }) => {
-    test.setTimeout(120_000);
-    if (!hasGithubAuth()) {
-      test.skip(true, "GitHub auth not available in this environment");
-    }
-
-    const ghRepo = await createTempGithubRepo({
-      category: "attach-pr",
-      prs: [{ title: "feat: attach-pr-unique-beta", state: "open" }],
-    });
-    const handle = await openGithubWorkspace(page, ghRepo.prs[0].localPath);
-    try {
-      await clickNewChat(page);
-      await expectComposerVisible(page);
-
-      await selectGithubOption(page, "attach-pr-unique-beta", `pr:${ghRepo.prs[0].number}`);
-
-      await expectGithubAttachmentPill(page, {
-        number: ghRepo.prs[0].number,
-        title: ghRepo.prs[0].title,
-      });
+      // Choose from the repository list. Newly created repositories are not
+      // necessarily available in GitHub's separate text-search index yet.
+      await selectGithubOption(page, "", `issue:${ghRepo.issues[0].number}`);
+      await expectGithubAttachmentPill(page, ghRepo.issues[0]);
+      await selectGithubOption(page, "", `change_request:${ghRepo.prs[0].number}`);
+      await expectGithubAttachmentPill(page, ghRepo.prs[0]);
+      await expectGithubAttachmentPill(page, ghRepo.issues[0]);
     } finally {
       await handle.cleanup();
       await ghRepo.cleanup();
@@ -168,7 +149,7 @@ test.describe("Composer attachments", () => {
     // needed before this can be exercised end-to-end.
   });
 
-  test("image lightbox opens on pill click and closes on Escape", async ({
+  test("attaches, previews, and removes an image before dropping a file", async ({
     page,
     withWorkspace,
   }) => {
@@ -178,38 +159,25 @@ test.describe("Composer attachments", () => {
     await clickNewChat(page);
     await expectComposerVisible(page);
 
+    await test.step("open the available attachment choices", async () => {
+      await openAttachmentMenu(page);
+      await expect(page.getByTestId("message-input-attachment-menu-item-image")).toBeVisible();
+      await expect(page.getByTestId("message-input-attachment-menu-item-github")).toBeVisible();
+      await page.keyboard.press("Escape");
+    });
+
     await attachImageFromMenu(page, TEST_IMAGE);
     await expectAttachmentPill(page, "composer-image-attachment-pill");
 
     await openImageLightbox(page);
     await closeImageLightbox(page);
-  });
 
-  test("image attachment pill renders after file is selected", async ({ page, withWorkspace }) => {
-    test.setTimeout(60_000);
-    const workspace = await withWorkspace({ prefix: "attach-pill-" });
-    await workspace.navigateTo();
-    await clickNewChat(page);
-    await expectComposerVisible(page);
-
-    await attachImageFromMenu(page, TEST_IMAGE);
-
-    await expectAttachmentPill(page, "composer-image-attachment-pill");
-  });
-
-  test("dropped JSON file renders as a file attachment in active chat", async ({
-    page,
-    withWorkspace,
-  }) => {
-    test.setTimeout(60_000);
-    const workspace = await withWorkspace({ prefix: "attach-drop-json-" });
-    await workspace.navigateTo();
-    await clickNewChat(page);
-    await expectComposerVisible(page);
-
-    await dropFileOnComposer(page, TEST_JSON);
-
-    await expectAttachmentPill(page, "composer-file-attachment-pill");
+    await test.step("remove the image and attach a dropped file", async () => {
+      await removeAttachmentPill(page, "composer-image-attachment-pill", "Remove image attachment");
+      await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
+      await dropFileOnComposer(page, TEST_JSON);
+      await expectAttachmentPill(page, "composer-file-attachment-pill");
+    });
   });
 
   test("dropped JSON file renders as a file attachment in New Workspace", async ({ page }) => {
@@ -238,23 +206,6 @@ test.describe("Composer attachments", () => {
     }
   });
 
-  test("clicking the X on an image pill removes it", async ({ page, withWorkspace }) => {
-    test.setTimeout(60_000);
-    const workspace = await withWorkspace({ prefix: "attach-remove-" });
-    await workspace.navigateTo();
-    await clickNewChat(page);
-    await expectComposerVisible(page);
-
-    await attachImageFromMenu(page, TEST_IMAGE);
-    await expectAttachmentPill(page, "composer-image-attachment-pill");
-
-    await removeAttachmentPill(page, "composer-image-attachment-pill", "Remove image attachment");
-
-    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0, {
-      timeout: 5_000,
-    });
-  });
-
   test("submitting while agent is running queues the message and clears the draft", async ({
     page,
   }) => {
diff --git a/packages/app/e2e/browser/composer-autocomplete.spec.ts b/packages/app/e2e/browser/composer-autocomplete.spec.ts
index 4119f7c692..d30e69b18c 100644
--- a/packages/app/e2e/browser/composer-autocomplete.spec.ts
+++ b/packages/app/e2e/browser/composer-autocomplete.spec.ts
@@ -9,6 +9,8 @@ import { expectWorkspaceTabVisible, openSessions } from "../support/helpers/arch
 import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import { getServerId } from "../support/helpers/server-id";
 import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
+import { expectMobileAgentSidebarVisible } from "../support/helpers/sidebar";
+import { expectNewWorkspaceProjectSelected } from "../support/helpers/new-workspace";
 
 const TEST_COMMANDS = [
   {
@@ -337,6 +339,16 @@ function expectPopoverFramesStable(frames: PopoverFrame[]): void {
   ).toBeUndefined();
 }
 
+function recordCommandRequestsByAgentId(page: Page): string[] {
+  const requests: string[] = [];
+  const record = ({ payload }: { payload: string | Buffer }) => {
+    if (typeof payload !== "string" || !payload.includes("list_commands_request")) return;
+    if (!payload.includes("draftConfig")) requests.push(payload);
+  };
+  page.on("websocket", (socket) => socket.on("framesent", record));
+  return requests;
+}
+
 function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]): void {
   const firstVisibleIndex = frames.findIndex(
     (frame) =>
@@ -358,6 +370,25 @@ function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]):
 }
 
 test.describe("Composer autocomplete", () => {
+  test("keeps New workspace off the running-agent command list before a project is chosen", async ({
+    page,
+  }) => {
+    const commandRequestsByAgentId = recordCommandRequestsByAgentId(page);
+
+    await page.goto("/new");
+    await expectNewWorkspaceProjectSelected(page, "Choose project");
+    await composerLocator(page).fill("/");
+
+    const popover = page
+      .getByTestId("composer-autocomplete-popover")
+      .filter({ visible: true })
+      .first();
+    await expect(popover).toContainText("Choose a project to see commands", { timeout: 30_000 });
+    await expect(popover).not.toContainText("/clear");
+    await expect(popover).not.toContainText("/exit");
+    expect(commandRequestsByAgentId).toEqual([]);
+  });
+
   test("stays visible after returning from app-wide routes", async ({ page }) => {
     await installListCommandsStub(page);
     const serverId = getServerId();
@@ -671,7 +702,7 @@ test.describe("Composer autocomplete", () => {
         });
 
         await page.getByRole("button", { name: "Open menu" }).click();
-        await expect(page.getByTestId("sidebar-sessions")).toBeInViewport({ timeout: 5_000 });
+        await expectMobileAgentSidebarVisible(page);
 
         const popoverBox = await popover.boundingBox();
         expect(popoverBox).not.toBeNull();
diff --git a/packages/app/e2e/browser/composer-control-density.spec.ts b/packages/app/e2e/browser/composer-control-density.spec.ts
index 95eb658cdf..9c81037526 100644
--- a/packages/app/e2e/browser/composer-control-density.spec.ts
+++ b/packages/app/e2e/browser/composer-control-density.spec.ts
@@ -70,6 +70,7 @@ test.describe("Composer control density across tab switches", () => {
       });
       await gotoWorkspace(page, workspace.workspaceId);
       await clickNewChat(page);
+      await clickNewChat(page);
 
       const draftTabs = page
         .locator('[data-testid^="workspace-tab-draft"]')
diff --git a/packages/app/e2e/browser/composer-diff-stat.spec.ts b/packages/app/e2e/browser/composer-diff-stat.spec.ts
index 5926f30c73..00705faccd 100644
--- a/packages/app/e2e/browser/composer-diff-stat.spec.ts
+++ b/packages/app/e2e/browser/composer-diff-stat.spec.ts
@@ -1,7 +1,14 @@
-import { rm, writeFile } from "node:fs/promises";
+import type { Locator } from "@playwright/test";
+import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { gateNextAgentMessage } from "../support/helpers/agent-message-gate";
+import {
+  fillComposerDraft,
+  expectComposerDraft,
+  attachFileFromMenu,
+} from "../support/helpers/composer";
 import { ensureExplorerSidebar, openFilesPanel } from "../support/helpers/workspace-tabs";
 
 const APP_SETTINGS_KEY = "@paseo:app-settings";
@@ -26,14 +33,22 @@ async function openComposerDiff(page: Page) {
   await composerChangesPill(page).click();
 }
 
-async function seedChangedAgent(repoPrefix: string) {
+async function seedChangedAgent(
+  repoPrefix: string,
+  featureValues?: Record<string, unknown>,
+  files: Array<{ path: string; content: string }> = [],
+) {
   const workspace = await seedMockAgentWorkspace({
     repoPrefix,
+    featureValues,
     title: "Composer diff stat",
-    repo: { withRemote: true },
+    repo: {
+      withRemote: true,
+      // Exclude the local remote before the daemon starts observing this checkout.
+      files: [{ path: ".gitignore", content: "/remote.git/\n" }, ...files],
+    },
   });
   try {
-    await rm(path.join(workspace.cwd, "remote.git"), { recursive: true });
     await writeFile(
       path.join(workspace.cwd, "README.md"),
       "# Temp Repo\nexport const one = 1;\nexport const two = 2;\n",
@@ -153,3 +168,691 @@ test("composer diff stat reveals Changes, then opens the diff in the focused pan
     await workspace.cleanup();
   }
 });
+
+async function tapFirstAddedDiffLine(
+  page: Page,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  const body = surface.getByTestId("diff-file-0-body");
+  await expect(body).toBeVisible({ timeout: 30000 });
+  const bounds = await body.boundingBox();
+  if (!bounds) throw new Error("Expanded diff body has no bounds");
+  const fontSize = await surface
+    .getByTestId("git-diff-canvas")
+    .evaluate((element) => Number.parseFloat(getComputedStyle(element).fontSize));
+  await page.touchscreen.tap(bounds.x + 120, bounds.y + Math.round(fontSize * 1.5) * 2.5);
+}
+
+async function openReviewDiff(page: Page, workspace: Awaited<ReturnType<typeof seedChangedAgent>>) {
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+  await expect(composerChangesPill(page)).toBeVisible({ timeout: 30000 });
+  if (await page.getByTestId("workspace-tab-working_diff").count()) {
+    await selectDiffTab(page);
+  } else {
+    await revealComposerChangesInExplorer(page);
+    await openComposerDiff(page);
+  }
+  await expect(page.getByTestId("diff-file-0-body")).toBeVisible();
+}
+
+async function saveReviewComment(page: Page, body: string) {
+  await page.getByRole("textbox", { name: "Review comment" }).fill(body);
+  await page.getByRole("button", { name: "Save review comment", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
+async function cancelReviewComment(page: Page) {
+  await page.getByRole("button", { name: "Cancel review comment", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
+test.describe("review comments", () => {
+  test.use({ hasTouch: true });
+
+  test("compact review comments open a sheet and preserve saved comments through save, edit, cancel and reload", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("compact-review-comment-");
+    try {
+      await test.step("Open a compact sheet with reachable input and actions", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await tapFirstAddedDiffLine(page);
+        await expectCompactCommentSheet(page);
+      });
+      await test.step("Save, discard an edit, then save an updated comment", async () => {
+        await saveReviewComment(page, "  Please simplify this.  ");
+        await expectSavedReview(page, "Please simplify this.");
+        await editSavedReview(page, "Please simplify this.");
+        await fillReviewComment(page, "Discard this edit");
+        await cancelReviewComment(page);
+        await expectSavedReview(page, "Please simplify this.");
+        await editSavedReview(page, "Please simplify this.");
+        await saveReviewComment(page, "Updated comment");
+        await expectSavedReview(page, "Updated comment");
+      });
+      await test.step("Discard a new comment and retain the saved one after reload", async () => {
+        await tapFirstAddedDiffLine(page);
+        await fillReviewComment(page, "Discard new comment");
+        await cancelReviewComment(page);
+        await expectReviewAbsent(page, "Discard new comment");
+        await reloadReview(page);
+        await expectSavedReview(page, "Updated comment");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("wide review comments retain inline editing", async ({ page }) => {
+    const workspace = await seedChangedAgent("wide-review-comment-");
+    try {
+      await test.step("Save and cancel an inline edit on a wide screen", async () => {
+        await openReviewDiff(page, workspace);
+        await tapFirstAddedDiffLine(page);
+        await expectInlineCommentEditor(page);
+        await saveReviewComment(page, "Wide comment");
+        await expectSavedReview(page, "Wide comment");
+        await editSavedReview(page, "Wide comment");
+        await expectInlineCommentEditor(page);
+        await cancelReviewComment(page);
+        await expectSavedReview(page, "Wide comment");
+      });
+      await test.step("The existing composer still sends the review", async () => {
+        await sendReviewThroughComposer(page, workspace.agentId);
+        await selectDiffTab(page);
+        await expectReviewAbsent(page, "Wide comment");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
+
+async function sendReviewThroughComposer(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click();
+  await expect(page.getByTestId("composer-review-attachment-pill")).toBeVisible();
+  await page.getByRole("textbox", { name: "Message agent..." }).fill("Address this review");
+  await page.getByRole("button", { name: "Send message", exact: true }).click();
+  await expect(page.getByText("Address this review", { exact: true }).first()).toBeVisible();
+  await expect(page.getByTestId("composer-review-attachment-pill")).toHaveCount(0);
+}
+
+async function addSavedReview(
+  page: Page,
+  body: string,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  await tapFirstAddedDiffLine(page, surface);
+  await saveReviewComment(page, body);
+  await expectSavedReview(page, body, surface);
+}
+
+async function expectSavedReview(
+  page: Page,
+  body: string,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  await expect(surface.getByText(body, { exact: true })).toBeVisible();
+}
+
+async function editSavedReview(page: Page, expectedBody: string) {
+  await page
+    .getByTestId("working-diff-panel")
+    .getByRole("button", { name: "Edit review comment", exact: true })
+    .click();
+  await expect(page.getByRole("textbox", { name: "Review comment" })).toHaveValue(expectedBody);
+}
+
+async function sendFeedback(page: Page, count: number) {
+  await page.getByRole("button", { name: `Send feedback (${count})`, exact: true }).click();
+}
+
+async function expectFeedbackSent(page: Page, recipient: string) {
+  await expect(page.getByText(`Feedback sent to ${recipient}`, { exact: true })).toBeVisible();
+  await expect(page.getByTestId("working-diff-panel")).toBeVisible();
+}
+
+test.describe("send review feedback", () => {
+  test.use({ hasTouch: true });
+
+  test("compact feedback sends directly to the only workspace agent and preserves its composer draft", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-single-");
+    try {
+      await test.step("Save a review without changing the chat draft", async () => {
+        await openReviewDiff(page, workspace);
+        await selectAgentTab(page, workspace.agentId);
+        await fillComposerDraft(page, "Keep this thought");
+        await attachFileFromMenu(page, {
+          name: "unrelated.txt",
+          mimeType: "text/plain",
+          buffer: Buffer.from("Unrelated draft attachment"),
+        });
+        await selectDiffTab(page);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Please simplify this.");
+      });
+      await test.step("Send directly and stay on the diff", async () => {
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Please simplify this.");
+        await captureFeedback(page, "single");
+      });
+      await test.step("Return to the untouched composer draft", async () => {
+        await showWideLayout(page);
+        await selectAgentTab(page, workspace.agentId);
+        await expectComposerDraft(page, "Keep this thought");
+        await expect(page.getByText("unrelated.txt", { exact: true })).toBeVisible();
+        await expect(page.getByTestId("composer-review-attachment-pill")).toHaveCount(0);
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+  test("feedback pending ownership follows the draft across Diff and compact Changes", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-shared-pending-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Send feedback from the Diff tab and hold its real request", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "One draft across surfaces");
+        await sendFeedback(page, 1);
+        await gate.waitForRequest();
+      });
+      await test.step("The compact Changes surface observes the same pending operation", async () => {
+        await revealCompactChanges(page);
+        await expect(
+          compactReviewSurface(page).getByRole("button", {
+            name: "Sending feedback (1)",
+            exact: true,
+          }),
+        ).toBeDisabled();
+        expect(gate.requestCount()).toBe(1);
+        gate.accept();
+        await expect(
+          compactReviewSurface(page).getByText("Feedback sent to Composer diff stat", {
+            exact: true,
+          }),
+        ).toBeVisible();
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("an unsaved review survives presentation changes and acknowledgement before Save", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-editor-ownership-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Carry unsaved inline text into the compact sheet and back", async () => {
+        await openReviewDiff(page, workspace);
+        await tapFirstAddedDiffLine(page);
+        await fillReviewComment(page, "Body across presentations");
+        await showCompactLayout(page);
+        await expectReviewEditorBody(page, "Body across presentations");
+        await showWideLayout(page);
+        await expectReviewEditorBody(page, "Body across presentations");
+        await saveReviewComment(page, "Body across presentations");
+      });
+      await test.step("Keep an open edit saveable after acknowledgement removes its original", async () => {
+        await sendFeedback(page, 1);
+        await gate.waitForRequest();
+        await editSavedReview(page, "Body across presentations");
+        await fillReviewComment(page, "Keep this unsaved edit");
+        gate.accept();
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewEditorBody(page, "Keep this unsaved edit");
+        await showCompactLayout(page);
+        await expectReviewEditorBody(page, "Keep this unsaved edit");
+        await saveReviewComment(page, "Keep this unsaved edit");
+        await expectSavedReview(page, "Keep this unsaved edit");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("saved feedback preserves navigation across multiple diff files", async ({ page }) => {
+    const workspace = await seedMultiFileReview();
+    try {
+      await test.step("Save compact feedback and retain both floating actions", async () => {
+        await openCompactReviewExplorer(page, workspace);
+        await addSavedReview(page, "Keep file navigation available", compactReviewSurface(page));
+        await expectReviewNavigationReachable(page);
+      });
+      await test.step("Jump to another file without covering the feedback action", async () => {
+        await jumpToReviewFile(page, "z-last.ts");
+        await scrollReviewToLastLine(page);
+        await expectReviewNavigationReachable(page);
+        await captureFeedback(page, "navigation-compact");
+      });
+      await test.step("Wide file navigation and feedback remain reachable", async () => {
+        await openReviewDiff(page, workspace);
+        await navigateWideReviewFile(page, "README.md");
+        await expectFeedbackReachable(page);
+        await expectSavedReview(page, "Keep file navigation available");
+        await captureFeedback(page, "navigation-wide");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("feedback sends only matching comments and preserves orphaned comments", async ({
+    page,
+  }) => {
+    const workspace = await seedMultiFileReview();
+    try {
+      await test.step("A saved comment whose diff disappears has no sendable context", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Retain this orphan");
+        await setReadmeDiff(workspace, false);
+        await expectUnmatchedFeedback(page);
+      });
+      await test.step("Send the matching subset with an accurate count", async () => {
+        await addSavedReview(page, "Send this matching comment");
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Send this matching comment");
+        await expectUnmatchedFeedback(page);
+      });
+      await test.step("Restoring the missing diff reveals the unsent comment", async () => {
+        await setReadmeDiff(workspace, true);
+        await expectSavedReview(page, "Retain this orphan");
+        await expectFeedbackReachable(page);
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("zero open agent tabs retain feedback with a disabled reason", async ({ page }) => {
+    const workspace = await seedChangedAgent("review-feedback-zero-");
+    try {
+      await test.step("Close the agent tab while keeping the review", async () => {
+        await openReviewDiff(page, workspace);
+        await addSavedReview(page, "Keep until an agent is opened");
+        await closeAgentTab(page, workspace.agentId);
+      });
+      await test.step("The disabled action explains why in wide and compact layouts", async () => {
+        await expectFeedbackUnavailable(page);
+        await captureFeedback(page, "zero-wide");
+        await showCompactLayout(page);
+        await expectFeedbackUnavailable(page);
+        await expectSavedReview(page, "Keep until an agent is opened");
+        await captureFeedback(page, "zero-compact");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("only open tabs in this workspace appear in compact and wide recipient menus", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-multiple-");
+    const other = await seedChangedAgent("review-feedback-other-");
+    try {
+      const second = await createReviewRecipient(workspace, "Second reviewer");
+      const historical = await createReviewRecipient(workspace, "Closed historical agent");
+      await test.step("Open two local tabs and a tab in another workspace", async () => {
+        await openReviewDiff(page, other);
+        await addSavedReview(page, "Other workspace review");
+        await openReviewDiff(page, workspace);
+        await closeAgentTab(page, historical.id);
+        await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: second.id });
+        await selectDiffTab(page);
+        await addSavedReview(page, "Review for second agent");
+      });
+      await test.step("The wide menu includes only local open agents", async () => {
+        await captureWideFeedbackAppearance(page);
+      });
+      await test.step("Escape returns keyboard focus to feedback so the chooser can reopen", async () => {
+        await openFeedbackWithKeyboard(page);
+        await dismissRecipientMenu(page);
+        await expectFeedbackFocused(page);
+        await reopenFeedbackWithKeyboard(page);
+        await dismissRecipientMenu(page);
+        await expectFeedbackFocused(page);
+      });
+      await test.step("Choose the second agent in the compact menu and stay on the diff", async () => {
+        await showCompactLayout(page);
+        await captureFeedback(page, "cta-compact");
+        await sendFeedback(page, 1);
+        await expectRecipientMenu(page);
+        await captureFeedback(page, "menu-compact");
+        await chooseFeedbackRecipient(page, "Second reviewer");
+        await expectFeedbackSent(page, "Second reviewer");
+        await expectReviewAbsent(page, "Review for second agent");
+      });
+      await test.step("The other workspace's saved review remains", async () => {
+        await openReviewDiff(page, other);
+        await expectSavedReview(page, "Other workspace review");
+      });
+    } finally {
+      await workspace.cleanup();
+      await other.cleanup();
+    }
+  });
+
+  test("failed feedback remains editable and retries through the real provider", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-retry-", { mockPromptRejections: 1 });
+    try {
+      await test.step("A provider rejection retains the saved review", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Initial feedback");
+        await sendFeedback(page, 1);
+        await expectFeedbackFailure(page);
+        await expectSavedReview(page, "Initial feedback");
+        await captureFeedback(page, "failure");
+      });
+      await test.step("Edit the retained feedback and retry successfully", async () => {
+        await editSavedReview(page, "Initial feedback");
+        await saveReviewComment(page, "Corrected feedback");
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Corrected feedback");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("pending feedback blocks repeat submission and preserves edits and additions", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-pending-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Hold the real request while feedback is pending", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Sent version");
+        await sendFeedback(page, 1);
+        const request = await gate.waitForRequest();
+        expect(request.agentId).toBe(workspace.agentId);
+        expect(request.text).toBe("Please address this code review.");
+        expect(request.attachments).toMatchObject([
+          {
+            type: "review",
+            cwd: workspace.cwd,
+            comments: [
+              {
+                filePath: "README.md",
+                lineNumber: 2,
+                body: "Sent version",
+                context: { targetLine: { content: "export const one = 1;", newLineNumber: 2 } },
+              },
+            ],
+          },
+        ]);
+        await expectFeedbackPending(page);
+      });
+      await test.step("Save an edit and another comment before acknowledgement", async () => {
+        await editSavedReview(page, "Sent version");
+        await saveReviewComment(page, "Edited during send");
+        await addSavedReview(page, "Added during send");
+        await expectFeedbackPending(page);
+        expect(gate.requestCount()).toBe(1);
+        await captureFeedback(page, "pending");
+      });
+      await test.step("A real acknowledgement preserves both new versions", async () => {
+        gate.accept();
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectSavedReview(page, "Edited during send");
+        await expectSavedReview(page, "Added during send");
+        await expectReviewAbsent(page, "Sent version");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
+
+async function showCompactLayout(page: Page) {
+  await page.setViewportSize({ width: 390, height: 844 });
+}
+async function showWideLayout(page: Page) {
+  await page.setViewportSize({ width: 1400, height: 900 });
+}
+async function selectAgentTab(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click({ position: { x: 12, y: 13 } });
+}
+async function selectDiffTab(page: Page) {
+  await page.getByTestId("workspace-tab-working_diff").click({ position: { x: 12, y: 13 } });
+}
+async function fillReviewComment(page: Page, body: string) {
+  await page.getByRole("textbox", { name: "Review comment" }).fill(body);
+}
+async function expectReviewAbsent(page: Page, body: string) {
+  await expect(page.getByTestId("working-diff-panel").getByText(body, { exact: true })).toHaveCount(
+    0,
+  );
+}
+async function reloadReview(page: Page) {
+  await page.reload();
+  await expect(page.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30000 });
+}
+async function expectInlineCommentEditor(page: Page) {
+  await expect(page.getByTestId("inline-review-editor")).toBeVisible();
+  await expect(page.getByTestId("review-comment-sheet")).toHaveCount(0);
+}
+async function expectCompactCommentSheet(page: Page) {
+  await expect(page.getByTestId("review-comment-sheet")).toBeVisible();
+  await expect(page.getByText("README.md · +2", { exact: true })).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Review comment" })).toBeInViewport({ ratio: 1 });
+  for (const action of ["Save", "Cancel"])
+    await expect(
+      page.getByRole("button", { name: `${action} review comment`, exact: true }),
+    ).toBeInViewport({ ratio: 1 });
+  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
+  await expect(
+    page.getByRole("button", { name: "Save review comment", exact: true }),
+  ).toBeDisabled();
+}
+function feedbackButton(page: Page) {
+  return page.getByRole("button", { name: "Send feedback (1)", exact: true });
+}
+async function openFeedbackWithKeyboard(page: Page) {
+  await feedbackButton(page).focus();
+  await expectFeedbackFocused(page);
+  await reopenFeedbackWithKeyboard(page);
+}
+async function reopenFeedbackWithKeyboard(page: Page) {
+  await page.keyboard.press("Enter");
+  await expectRecipientMenu(page);
+  const recipient = page.getByRole("menuitem", { name: "Composer diff stat", exact: true });
+  await recipient.focus();
+  await expect(recipient).toBeFocused();
+}
+async function expectFeedbackFocused(page: Page) {
+  await expect(feedbackButton(page)).toBeFocused();
+}
+
+async function captureWideFeedbackAppearance(page: Page) {
+  for (const colorScheme of ["light", "dark"] as const) {
+    await page.emulateMedia({ colorScheme });
+    await expectSavedReview(page, "Review for second agent");
+    await captureFeedback(page, `cta-wide-${colorScheme}-closed`);
+    await sendFeedback(page, 1);
+    await expectRecipientMenu(page);
+    await captureFeedback(page, `cta-wide-${colorScheme}-open`);
+    await dismissRecipientMenu(page);
+  }
+  await page.emulateMedia({ colorScheme: "light" });
+}
+
+async function captureFeedback(page: Page, name: string) {
+  await page.screenshot({ path: `/tmp/phase2-feedback-${name}.png` });
+}
+
+async function closeAgentTab(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click({ button: "right" });
+  await page.getByTestId(`workspace-tab-context-agent_${agentId}-close`).click();
+  await expect(page.getByTestId(`workspace-tab-agent_${agentId}`)).toHaveCount(0);
+}
+async function expectFeedbackUnavailable(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeDisabled();
+  await expect(
+    page.getByText("Open an agent tab in this workspace to send feedback.", { exact: true }),
+  ).toBeVisible();
+}
+async function createReviewRecipient(
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+  title: string,
+) {
+  return workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.cwd,
+    workspaceId: workspace.workspaceId,
+    title,
+    modeId: "load-test",
+    model: "e2e-fast-stream",
+  });
+}
+async function expectRecipientMenu(page: Page) {
+  for (const name of ["Composer diff stat", "Second reviewer"]) {
+    await expect(page.getByRole("menuitem", { name, exact: true })).toBeInViewport({ ratio: 1 });
+  }
+  await expect(page.getByRole("menuitem")).toHaveCount(2);
+}
+async function dismissRecipientMenu(page: Page) {
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("menuitem")).toHaveCount(0);
+}
+async function chooseFeedbackRecipient(page: Page, name: string) {
+  await page.getByRole("menuitem", { name, exact: true }).click();
+}
+async function expectFeedbackFailure(page: Page) {
+  await expect(
+    page.getByText("Requested mock prompt rejection", { exact: true }).first(),
+  ).toBeVisible();
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeEnabled();
+}
+async function expectFeedbackPending(page: Page, count = 1) {
+  await expect(
+    page.getByRole("button", { name: `Sending feedback (${count})`, exact: true }),
+  ).toBeDisabled();
+}
+
+async function seedMultiFileReview() {
+  const workspace = await seedChangedAgent("review-feedback-navigation-", undefined, [
+    { path: "z-last.ts", content: "export const final = 0;\n" },
+  ]);
+  await writeFile(
+    path.join(workspace.cwd, "z-last.ts"),
+    Array.from({ length: 120 }, (_, index) => `export const value${index} = ${index};`).join("\n") +
+      "\n",
+  );
+  await workspace.client.checkoutRefresh(workspace.cwd);
+  return workspace;
+}
+async function expectFeedbackReachable(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeInViewport(
+    { ratio: 1 },
+  );
+}
+async function expectReviewNavigationReachable(page: Page) {
+  await expectFeedbackReachable(page);
+  const jump = page.getByRole("button", { name: "Jump to file", exact: true });
+  await expect(jump).toBeInViewport({ ratio: 1 });
+  const navigationBounds = await jump.boundingBox();
+  const feedbackBounds = await page
+    .getByRole("button", { name: "Send feedback (1)", exact: true })
+    .boundingBox();
+  if (!navigationBounds || !feedbackBounds) throw new Error("Review actions have no bounds");
+  expect(feedbackBounds.y + feedbackBounds.height).toBeLessThanOrEqual(navigationBounds.y);
+}
+async function jumpToReviewFile(page: Page, name: string) {
+  await page.getByRole("button", { name: "Jump to file", exact: true }).click();
+  const sheet = page.getByTestId("changes-jump-to-file-sheet");
+  await page
+    .getByTestId("changes-file-tree")
+    .filter({ visible: true })
+    .getByText(name, { exact: true })
+    .click();
+  await expect(sheet).toHaveCount(0);
+  await expect(reviewFileHeader(compactReviewSurface(page), name)).toBeInViewport();
+}
+async function navigateWideReviewFile(page: Page, name: string) {
+  const explorer = await ensureExplorerSidebar(page);
+  await explorer.getByTestId("changes-tree-panel").getByText(name, { exact: true }).click();
+  await expect(reviewFileHeader(page.getByTestId("working-diff-panel"), name)).toBeInViewport();
+}
+
+async function setReadmeDiff(
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+  changed: boolean,
+) {
+  await writeFile(
+    path.join(workspace.cwd, "README.md"),
+    changed ? "# Temp Repo\nexport const one = 1;\nexport const two = 2;\n" : "# Temp Repo\n",
+  );
+  await workspace.client.checkoutRefresh(workspace.cwd);
+}
+async function expectUnmatchedFeedback(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (0)", exact: true })).toBeDisabled();
+  await expect(
+    page.getByText("Saved comments no longer match this diff.", { exact: true }),
+  ).toBeVisible();
+}
+
+function compactReviewSurface(page: Page) {
+  return page.getByTestId("explorer-content-area").filter({ visible: true });
+}
+async function openCompactReviewExplorer(
+  page: Page,
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+) {
+  await showWideLayout(page);
+  await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+  await selectAgentTab(page, workspace.agentId);
+  await showCompactLayout(page);
+  await composerChangesPill(page).click();
+  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
+}
+
+function reviewFileHeader(surface: Locator, name: string) {
+  return surface.locator(`[data-diff-header-path="${name}"]`).getByTestId(/^diff-file-\d+$/);
+}
+
+async function scrollReviewToLastLine(page: Page) {
+  const surface = compactReviewSurface(page);
+  const bounds = await surface.boundingBox();
+  if (!bounds) throw new Error("Compact review has no bounds");
+  await page.mouse.move(bounds.x + 120, bounds.y + 200);
+  await page.mouse.wheel(0, 10000);
+  await expect
+    .poll(async () => {
+      const body = await surface.getByTestId("diff-file-1-body").boundingBox();
+      const feedback = await page
+        .getByRole("button", { name: "Send feedback (1)", exact: true })
+        .boundingBox();
+      if (!body || !feedback) return false;
+      return body.y + body.height <= feedback.y;
+    })
+    .toBe(true);
+}
+
+async function revealCompactChanges(page: Page) {
+  await page.getByTestId("workspace-explorer-toggle").first().click();
+  await page.getByTestId("explorer-header").getByText("Changes", { exact: true }).click();
+  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
+}
+async function expectReviewEditorBody(page: Page, body: string) {
+  await expect(page.getByRole("textbox", { name: "Review comment", exact: true })).toHaveValue(
+    body,
+  );
+}
diff --git a/packages/app/e2e/browser/composer-email-mentions.spec.ts b/packages/app/e2e/browser/composer-email-mentions.spec.ts
new file mode 100644
index 0000000000..283fca26ca
--- /dev/null
+++ b/packages/app/e2e/browser/composer-email-mentions.spec.ts
@@ -0,0 +1,104 @@
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  composerLocator,
+  expectComposerDraft,
+  expectComposerVisible,
+  fillComposerDraft,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  resizeComposerViewport,
+  selectComposerDraftRange,
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+// The popover has no semantic role; its rows are React Native Pressables.
+function fileSuggestions(page: Page) {
+  return page.getByTestId("composer-autocomplete-popover");
+}
+
+async function selectReadmeMention(page: Page): Promise<void> {
+  await fillComposerDraft(page, "@README");
+  await expect(fileSuggestions(page).getByText("README.md", { exact: true })).toBeVisible();
+  await expect(fileSuggestions(page).getByText("example.com", { exact: true })).toHaveCount(0);
+  await composerLocator(page).press("Enter");
+  await expectComposerDraft(page, '"README.md"');
+}
+
+async function sendEmailIntact(page: Page, email: string): Promise<void> {
+  await fillComposerDraft(page, email);
+  await expect(fileSuggestions(page)).not.toBeVisible();
+  await composerLocator(page).press("Enter");
+  await expectComposerDraft(page, "");
+  await expect(page.getByText(email, { exact: true })).toBeVisible();
+}
+
+for (const email of [
+  "user <12345+user@noreply.example.com>",
+  "alice@example.com",
+  "noreply+@example.com",
+]) {
+  test(`Enter sends ${email} intact and still completes file mentions`, async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "composer-email-",
+      title: "Email mention regression",
+      repo: { files: [{ path: "example.com", content: "A file matching the email domain.\n" }] },
+    });
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      await test.step("complete a workspace file mention with Enter", async () => {
+        await selectReadmeMention(page);
+      });
+      await test.step("send an email without offering or inserting workspace files", async () => {
+        await sendEmailIntact(page, email);
+      });
+    } finally {
+      await agent.cleanup();
+    }
+  });
+}
+
+test("fullscreen mention keys edit the draft while inline keys still complete files", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-mention-",
+    title: "Fullscreen mention keys",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    const draft = "First line\nSecond line\n@README";
+    await fillComposerDraft(page, draft);
+    await expect(fileSuggestions(page).getByText("README.md", { exact: true })).toBeVisible();
+    await enterComposerFullscreen(page);
+    await expect(fileSuggestions(page)).not.toBeVisible();
+    await selectComposerDraftRange(page, draft.length, draft.length);
+    await composerLocator(page).press("ArrowUp");
+    await expect
+      .poll(() =>
+        composerLocator(page).evaluate((element) => {
+          const input = element as HTMLTextAreaElement;
+          return input.selectionStart === input.selectionEnd && input.selectionStart < 23;
+        }),
+      )
+      .toBe(true);
+    await selectComposerDraftRange(page, draft.length, draft.length);
+    await composerLocator(page).press("Enter");
+    await expectComposerDraft(page, `${draft}\n`);
+    await exitComposerFullscreen(page);
+    await selectReadmeMention(page);
+    const commandDraft = "/cl\nSecond line\nThird line";
+    await fillComposerDraft(page, commandDraft);
+    await selectComposerDraftRange(page, 2, 2);
+    await composerLocator(page).press("ArrowRight");
+    await expect(fileSuggestions(page).getByText("/clear", { exact: true }).first()).toBeVisible();
+    await enterComposerFullscreen(page);
+    await expect(fileSuggestions(page)).not.toBeVisible();
+    await composerLocator(page).press("Enter");
+    await expectComposerDraft(page, "/cl\n\nSecond line\nThird line");
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/composer-focus.spec.ts b/packages/app/e2e/browser/composer-focus.spec.ts
index 897e536340..b79cfd9255 100644
--- a/packages/app/e2e/browser/composer-focus.spec.ts
+++ b/packages/app/e2e/browser/composer-focus.spec.ts
@@ -1,7 +1,8 @@
-import { test } from "../support/fixtures";
+import { expect, test, type Page } from "../support/fixtures";
 import {
   expectComposerDraft,
   expectComposerFocused,
+  expectComposerNotFocused,
   expectComposerVisible,
   submitMessage,
   typeIntoFocusedComposer,
@@ -27,3 +28,51 @@ test("submitting a message leaves the composer ready for the next message", asyn
     await agent.cleanup();
   }
 });
+
+test("opening an agent focuses the composer when a mouse drives the UI", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-focus-open-",
+    title: "Composer focus on open",
+  });
+
+  try {
+    await openAgentRoute(page, agent);
+    await expectComposerFocused(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+async function waitForAnimationFrames(page: Page, count: number): Promise<void> {
+  await page.evaluate(async (frames) => {
+    for (let frame = 0; frame < frames; frame += 1) {
+      await new Promise((resolve) => requestAnimationFrame(resolve));
+    }
+  }, count);
+}
+
+test.describe("touch screen wide enough for the desktop layout", () => {
+  // A tablet or an unfolded foldable gets the desktop layout, but focusing the
+  // composer there raises the on-screen keyboard over the conversation.
+  test.use({ viewport: { width: 1024, height: 768 }, isMobile: true, hasTouch: true });
+
+  test("opening an agent leaves the composer unfocused", async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "composer-focus-touch-",
+      title: "Composer focus on touch",
+    });
+
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      expect(
+        await page.evaluate(() => window.matchMedia("(hover: hover) and (pointer: fine)").matches),
+      ).toBe(false);
+      // Autofocus makes its first attempt on the next animation frame.
+      await waitForAnimationFrames(page, 4);
+      await expectComposerNotFocused(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
diff --git a/packages/app/e2e/browser/composer-whitespace.spec.ts b/packages/app/e2e/browser/composer-whitespace.spec.ts
index f935676c3b..35611a32c0 100644
--- a/packages/app/e2e/browser/composer-whitespace.spec.ts
+++ b/packages/app/e2e/browser/composer-whitespace.spec.ts
@@ -1,3 +1,5 @@
+import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
+import { seedWorkspace } from "../support/helpers/seed-client";
 import { expect, test, type Page } from "../support/fixtures";
 import {
   expectNearBottom,
@@ -5,7 +7,27 @@ import {
   waitForScrollableChat,
 } from "../support/helpers/agent-bottom-anchor";
 import { awaitAssistantMessage } from "../support/helpers/agent-stream";
-import { composerLocator, expectComposerVisible } from "../support/helpers/composer";
+import {
+  attachComposerTestImage,
+  pasteComposerTestImage,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  resizeComposerViewport,
+  selectComposerDraftRange,
+  expectComposerDraftSelection,
+  expectComposerFullscreenControls,
+  sendComposerWithButton,
+  queueComposerWithButton,
+  configureComposerQueueSend,
+  activateRetainedComposerTab,
+  recordVisibleComposerGeometry,
+  expectNoCollapsedVisibleComposer,
+  expectAttachmentPill,
+  expectQueuedMessageButton,
+  startRunningMockAgent,
+  composerLocator,
+  expectComposerVisible,
+} from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
 async function composerHeight(page: Page): Promise<number> {
@@ -65,6 +87,19 @@ test("blank composer lines remain present and keep their measured height", async
     const blankLines = "\n\n\n\n\n";
     const collapsedHeight = await composerHeight(page);
 
+    await test.step("remeasure the current draft when the window narrows", async () => {
+      await page.setViewportSize({ width: 1280, height: 1200 });
+      const text = "A sentence that wraps when the editor becomes narrower. ".repeat(8);
+      await composer.fill(text);
+      await expect(composer).toHaveValue(text);
+      await expect.poll(() => composerHeight(page)).toBeGreaterThan(collapsedHeight);
+      const wideHeight = await composerHeight(page);
+      await page.setViewportSize({ width: 480, height: 1200 });
+      await expect.poll(() => composerHeight(page)).toBeGreaterThan(wideHeight);
+      await expect(composer).toHaveValue(text);
+      await page.setViewportSize({ width: 1280, height: 720 });
+    });
+
     await test.step("grow the composer with blank lines followed by text", async () => {
       await composer.fill(`${blankLines}x`);
       await expect(composer).toHaveValue(`${blankLines}x`);
@@ -120,3 +155,300 @@ test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }
     await agent.cleanup();
   }
 });
+
+async function writeCompactDraft(page: Page, text: string): Promise<void> {
+  await composerLocator(page).fill(text);
+  await expect(composerLocator(page)).toHaveValue(text);
+}
+
+test("compact long drafts stop growing before the header", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-cap-",
+    title: "Composer cap",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "A long draft line\n".repeat(40));
+    await expect.poll(() => composerHeight(page)).toBeLessThanOrEqual(160);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("compact fullscreen editing preserves the live draft and selection and stays open after send", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-",
+    title: "Fullscreen composer",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await attachComposerTestImage(page);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+    await writeCompactDraft(page, "First line\nSecond line");
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toHaveCount(0);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+    await writeCompactDraft(
+      page,
+      "A sentence with enough words to wrap across several rendered lines in a narrow input. ".repeat(
+        4,
+      ),
+    );
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+    await selectComposerDraftRange(page, 4, 17);
+    await enterComposerFullscreen(page);
+    await expectComposerFullscreenControls(page);
+    await expectComposerDraftSelection(page, 4, 17);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
+    await writeCompactDraft(page, "Edited fullscreen draft\nSecond line\nThird line");
+    await selectComposerDraftRange(page, 3, 12);
+    await exitComposerFullscreen(page);
+    await expect(composerLocator(page)).toHaveValue(
+      "Edited fullscreen draft\nSecond line\nThird line",
+    );
+    await expectComposerDraftSelection(page, 3, 12);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+    await expect(composerLocator(page)).toBeFocused();
+    await enterComposerFullscreen(page);
+    await writeCompactDraft(page, "Short draft");
+    await expectComposerFullscreenControls(page);
+    await selectComposerDraftRange(page, 0, 5);
+    await resizeComposerViewport(page, "landscape");
+    await expectComposerFullscreenControls(page);
+    await expectComposerDraftSelection(page, 0, 5);
+    await expect(composerLocator(page)).toHaveValue("Short draft");
+    await expect(composerLocator(page)).toBeFocused();
+    await resizeComposerViewport(page, "portrait");
+    await sendComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("fullscreen submit rejection retains the editable draft and supports retry", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-retry-",
+    title: "Fullscreen retry",
+    featureValues: { mockPromptRejections: 1 },
+  });
+  const draft = "First line\nSecond line\nThird line";
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await sendComposerWithButton(page);
+    await expect(page.getByTestId("composer-fullscreen").getByRole("alert")).toHaveText(
+      "Requested mock prompt rejection",
+    );
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expect(composerLocator(page)).toBeEditable();
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
+    await sendComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("fullscreen Send keeps the configured queue behavior while an agent runs", async ({
+  page,
+}) => {
+  await configureComposerQueueSend(page);
+  await resizeComposerViewport(page, "portrait");
+  const agent = await startRunningMockAgent(page, {
+    prefix: "composer-fullscreen-queue-",
+    model: "one-minute-stream",
+    prompt: "Stay running for fullscreen queue test.",
+  });
+  try {
+    await writeCompactDraft(page, "Queued first line\nSecond line\nThird line");
+    await enterComposerFullscreen(page);
+    await expectComposerFullscreenControls(page);
+    await queueComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+    await exitComposerFullscreen(page);
+    await expectQueuedMessageButton(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("image paste stays attached to the active editor across fullscreen entry and exit", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-paste-remount-",
+    title: "Composer paste",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(1);
+    await enterComposerFullscreen(page);
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await exitComposerFullscreen(page);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(2);
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(3);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("retained agent tabs preserve fullscreen editing and paste when switched away and back", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "composer-retained-fullscreen-" });
+  try {
+    const first = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "First retained chat",
+    });
+    const second = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Second retained chat",
+    });
+    await openWorkspaceWithAgents(page, [first, second]);
+    await resizeComposerViewport(page, "portrait");
+    const draft = "Live first line\nLive second line\nLive third line";
+    await writeCompactDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await selectComposerDraftRange(page, 4, 17);
+    await activateRetainedComposerTab(page, first.title);
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await writeCompactDraft(page, "Other tab draft");
+    await shrinkVisibleViewport(page);
+    await activateRetainedComposerTab(page, second.title);
+    await expectComposerFullscreenControls(page);
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerDraftSelection(page, 4, 17);
+    await expect(composerLocator(page)).toBeFocused();
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await exitComposerFullscreen(page);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("retained inline composers keep usable capacity through hidden tab geometry", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "composer-retained-capacity-" });
+  try {
+    const first = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "First capacity chat",
+    });
+    const second = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Second capacity chat",
+    });
+    await openWorkspaceWithAgents(page, [first, second]);
+    await resizeComposerViewport(page, "portrait");
+    const draft = "Retained long line\n".repeat(40);
+    await writeCompactDraft(page, draft);
+    await recordVisibleComposerGeometry(page);
+    await activateRetainedComposerTab(page, first.title);
+    await writeCompactDraft(page, "Other visible draft");
+    await activateRetainedComposerTab(page, second.title);
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expect.poll(() => composerHeight(page)).toBeLessThanOrEqual(160);
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeVisible();
+    await expectNoCollapsedVisibleComposer(page);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+async function shrinkVisibleViewport(page: Page): Promise<void> {
+  const cdp = await page.context().newCDPSession(page);
+  await cdp.send("Emulation.setPageScaleFactor", { pageScaleFactor: 2 });
+  await expect.poll(() => page.evaluate(() => window.visualViewport!.height)).toBe(422);
+  await cdp.detach();
+}
+
+async function panVisibleViewport(page: Page): Promise<void> {
+  const cdp = await page.context().newCDPSession(page);
+  await cdp.send("Input.dispatchTouchEvent", {
+    type: "touchStart",
+    touchPoints: [{ x: 4, y: 300 }],
+  });
+  for (let y = 290; y >= 100; y -= 10) {
+    await cdp.send("Input.dispatchTouchEvent", {
+      type: "touchMove",
+      touchPoints: [{ x: 4, y }],
+    });
+  }
+  await cdp.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] });
+  await expect.poll(() => page.evaluate(() => window.visualViewport!.offsetTop)).toBeGreaterThan(0);
+  await cdp.detach();
+}
+
+async function expectFullscreenInsideVisibleViewport(page: Page): Promise<void> {
+  await expect
+    .poll(() =>
+      page.getByTestId("composer-fullscreen").evaluate((element) => {
+        const viewport = window.visualViewport!;
+        const frame = element.getBoundingClientRect();
+        const send = element.querySelector('[aria-label="Send message"]')!.getBoundingClientRect();
+        return {
+          frameFits:
+            Math.abs(frame.top - viewport.offsetTop) < 1 &&
+            Math.abs(frame.left - viewport.offsetLeft) < 1 &&
+            Math.abs(frame.height - viewport.height) < 1 &&
+            Math.abs(frame.width - viewport.width) < 1,
+          sendFits:
+            send.top >= viewport.offsetTop &&
+            send.bottom <= viewport.offsetTop + viewport.height &&
+            send.left >= viewport.offsetLeft &&
+            send.right <= viewport.offsetLeft + viewport.width,
+        };
+      }),
+    )
+    .toEqual({ frameFits: true, sendFits: true });
+}
+
+test("fullscreen Send follows the visible viewport when it shrinks and pans", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-visible-viewport-",
+    title: "Visible viewport composer",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    await enterComposerFullscreen(page);
+    await expectFullscreenInsideVisibleViewport(page);
+    await shrinkVisibleViewport(page);
+    await expectFullscreenInsideVisibleViewport(page);
+    await panVisibleViewport(page);
+    await expectFullscreenInsideVisibleViewport(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/content-width.spec.ts b/packages/app/e2e/browser/content-width.spec.ts
new file mode 100644
index 0000000000..bd3cc4394f
--- /dev/null
+++ b/packages/app/e2e/browser/content-width.spec.ts
@@ -0,0 +1,70 @@
+import { test } from "../support/fixtures";
+import {
+  expectContentColumnWidth,
+  expectCustomContentWidthSetting,
+  expectDefaultContentWidthSetting,
+  openAppearanceSettings,
+  resetContentWidth,
+  setContentWidth,
+} from "../support/helpers/content-width";
+import { openFileExplorer, openFileFromExplorer } from "../support/helpers/file-explorer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+const ULTRAWIDE_VIEWPORT = { width: 2560, height: 1080 };
+
+test("widens chat and Markdown files to the chosen content width and resets to the default", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "content-width-",
+    title: "Content width",
+    initialPrompt: "Write a long paragraph.",
+  });
+
+  try {
+    await agent.client.waitForFinish(agent.agentId, 30_000);
+    await page.setViewportSize(ULTRAWIDE_VIEWPORT);
+    const assistantMessage = page.getByTestId("assistant-message").first();
+    const markdownPreview = page.getByTestId("markdown-preview-frame").first();
+
+    await test.step("chat starts at the default width", async () => {
+      await openAgentRoute(page, agent);
+      await expectContentColumnWidth(assistantMessage, { max: 820 });
+    });
+
+    await test.step("settings show the default without a reset", async () => {
+      await openAppearanceSettings(page);
+      await expectDefaultContentWidthSetting(page, 820);
+    });
+
+    await test.step("a custom width is saved and offers a reset", async () => {
+      await setContentWidth(page, 1600);
+      await expectCustomContentWidthSetting(page, 1600);
+      await page.screenshot({ path: testInfo.outputPath("settings-custom-width.png") });
+    });
+
+    await test.step("chat and Markdown files use the custom width", async () => {
+      await openAgentRoute(page, agent);
+      await expectContentColumnWidth(assistantMessage, { min: 1200, max: 1600 });
+      await page.screenshot({ path: testInfo.outputPath("chat-custom-width.png") });
+
+      await openFileExplorer(page);
+      await openFileFromExplorer(page, "README.md");
+      await expectContentColumnWidth(markdownPreview, { min: 1200, max: 1600 });
+      await page.screenshot({ path: testInfo.outputPath("markdown-custom-width.png") });
+    });
+
+    await test.step("reset returns to the default without storing it", async () => {
+      await openAppearanceSettings(page);
+      await resetContentWidth(page);
+      await expectDefaultContentWidthSetting(page, 820);
+
+      await openAgentRoute(page, agent);
+      await expectContentColumnWidth(assistantMessage, { max: 820 });
+      await page.screenshot({ path: testInfo.outputPath("chat-default-width.png") });
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/context-window-meter.spec.ts b/packages/app/e2e/browser/context-window-meter.spec.ts
new file mode 100644
index 0000000000..5d024de761
--- /dev/null
+++ b/packages/app/e2e/browser/context-window-meter.spec.ts
@@ -0,0 +1,455 @@
+import type { Locator, Page } from "@playwright/test";
+import { expect, test as base } from "../support/fixtures";
+import {
+  composerLocator,
+  expectComposerVisible,
+  submitMessageWithButton,
+} from "../support/helpers/composer";
+import {
+  type AgentUsageScript,
+  closeContextWindowSheet,
+  contextWindowDetails,
+  expectRefreshButtons,
+  expiredLogin,
+  gate,
+  hoverContextWindowMeter,
+  leaveContextWindowMeter,
+  type MockAgentSession,
+  moveOntoContextWindowDetails,
+  onPersonalLogin,
+  onWorkLogin,
+  openAgent,
+  pressContextWindowMeter,
+  qaScreenshot,
+  refreshUsageCard,
+  reloadAgent,
+  scriptAgentUsage,
+  seedAgentWithContextWindow,
+  usageCard,
+} from "../support/helpers/context-window";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { claudeAndCodexReports, expectUnpinnableRows } from "../support/helpers/usage-sidebar-item";
+import { installLoginUsage } from "../support/helpers/usage-login";
+
+const test = base.extend<{ agent: MockAgentSession }>({
+  agent: async ({ page: _page }, provide) => {
+    const agent = await seedAgentWithContextWindow();
+    try {
+      await provide(agent);
+    } finally {
+      await agent.cleanup();
+    }
+  },
+});
+
+// Where the progress arc is painted, as its centroid relative to the ring's centre in pixels.
+// Reads the rendered pixels, so any rotation that does not reach the screen counts as none.
+async function progressArcCentroid(meter: Locator): Promise<{ x: number; y: number }> {
+  const ring = meter.locator("svg");
+  const progressColor = await ring
+    .locator("circle")
+    .last()
+    .evaluate((circle) => getComputedStyle(circle).stroke);
+  const screenshot = await ring.screenshot();
+  return ring.evaluate(
+    async (_svg, { png, color }) => {
+      const image = await createImageBitmap(
+        await (await fetch(`data:image/png;base64,${png}`)).blob(),
+      );
+      const canvas = new OffscreenCanvas(image.width, image.height);
+      const context = canvas.getContext("2d")!;
+      context.drawImage(image, 0, 0);
+      const { data } = context.getImageData(0, 0, image.width, image.height);
+      const [r, g, b] = color.match(/\d+/g)!.map(Number);
+      let sumX = 0;
+      let sumY = 0;
+      let count = 0;
+      for (let y = 0; y < image.height; y += 1) {
+        for (let x = 0; x < image.width; x += 1) {
+          const i = (y * image.width + x) * 4;
+          const distance =
+            Math.abs(data[i] - r) + Math.abs(data[i + 1] - g) + Math.abs(data[i + 2] - b);
+          if (distance < 40) {
+            sumX += x;
+            sumY += y;
+            count += 1;
+          }
+        }
+      }
+      if (count === 0) {
+        throw new Error(`No pixels painted in the progress colour ${color}`);
+      }
+      return { x: sumX / count - image.width / 2, y: sumY / count - image.height / 2 };
+    },
+    { png: screenshot.toString("base64"), color: progressColor },
+  );
+}
+
+test.describe("context window meter", () => {
+  test("draws usage clockwise from twelve o'clock", async ({ page }) => {
+    test.setTimeout(180_000);
+    // 32,000 of the mock's 128,000-token window: a quarter, from twelve to three o'clock.
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "context-window-meter-",
+      title: "Context window meter e2e",
+      initialPrompt: "emit 32000 byte file agent stream payload",
+    });
+    try {
+      await openAgentRoute(page, session);
+      await expectComposerVisible(page);
+      const meter = page.getByTestId("context-window-meter");
+      await expect(meter).toHaveAccessibleName(/25%/, { timeout: 30_000 });
+
+      const centroid = await progressArcCentroid(meter);
+      expect(centroid.x).toBeGreaterThan(1);
+      expect(centroid.y).toBeLessThan(-1);
+    } finally {
+      await session.cleanup();
+    }
+  });
+});
+
+const DESKTOP = { width: 1440, height: 900 };
+const COMPACT = { width: 390, height: 844 };
+const LOGIN_EXPIRED = /^Login expired .*Run claude to refresh it\.$/;
+
+for (const layout of [
+  {
+    name: "desktop",
+    viewport: DESKTOP,
+    open: hoverContextWindowMeter,
+    close: leaveContextWindowMeter,
+  },
+  {
+    name: "compact",
+    viewport: COMPACT,
+    open: pressContextWindowMeter,
+    close: closeContextWindowSheet,
+  },
+]) {
+  test(`shows account usage before the first turn (${layout.name})`, async ({ page }) => {
+    test.setTimeout(180_000);
+    const source = await installLoginUsage({
+      status: "available",
+      windows: [{ id: "session", label: "Session", usedPct: 31 }],
+    });
+    try {
+      const agent = await seedMockAgentWorkspace({
+        repoPrefix: "context-window-empty-",
+        title: "Agent before its first turn",
+      });
+      try {
+        await page.setViewportSize(layout.viewport);
+        await openAgent(page, agent);
+
+        await test.step("the empty meter opens context details and account usage", async () => {
+          const details = await layout.open(page, "Context window: No context data");
+          await expect(details.getByText("No context data", { exact: true })).toBeVisible();
+          await expect(details.getByText("0% used", { exact: true })).toHaveCount(0);
+          await expect(details.getByText(/tokens$/)).toHaveCount(0);
+          const account = usageCard(details, "login-journey:account");
+          await expect(account.getByText("Session", { exact: true })).toBeVisible();
+          await expect(account.getByText("31%", { exact: true })).toBeVisible();
+          await qaScreenshot(page, `context-without-data-${layout.name}`);
+          await layout.close(page);
+        });
+
+        await test.step("the first context reading replaces the empty state", async () => {
+          await submitMessageWithButton(page, "emit 32000 byte file agent stream payload");
+          const details = await layout.open(page);
+          await expect(details.getByText("25% used", { exact: true })).toBeVisible();
+          await expect(details.getByText("32k / 128k tokens", { exact: true })).toBeVisible();
+          await expect(details.getByText("No context data", { exact: true })).toHaveCount(0);
+          await expect(
+            usageCard(details, "login-journey:account").getByText("31%", { exact: true }),
+          ).toBeVisible();
+        });
+      } finally {
+        await agent.cleanup();
+      }
+    } finally {
+      await source.cleanup();
+    }
+  });
+}
+
+type OpenDetails = (page: Page) => Promise<Locator>;
+type Shot = (state: string) => Promise<void>;
+
+/** Two reports on the agent's login stream in; the details show each card as it arrives. */
+async function expectCardsToStreamIn(
+  page: Page,
+  usage: AgentUsageScript,
+  openDetails: OpenDetails,
+  shot: Shot,
+): Promise<Locator> {
+  const [claude, codex] = claudeAndCodexReports();
+  const first = gate();
+  const second = gate();
+  usage.answerNext({
+    stream: [first.promise, onWorkLogin(claude!), second.promise, onWorkLogin(codex!)],
+  });
+  const details = await openDetails(page);
+  await expect(details.getByText("Loading usage...", { exact: true })).toBeVisible();
+  await shot("loading");
+
+  first.open();
+  await expect(
+    usageCard(details, "claude:work").getByText("work@example.com", { exact: true }),
+  ).toBeVisible();
+  await expect(details.getByText("Loading usage...", { exact: true })).toHaveCount(0);
+  await expect(usageCard(details, "codex:work")).toHaveCount(0);
+  await shot("streaming");
+
+  second.open();
+  await expect(
+    usageCard(details, "codex:work").getByText("Session", { exact: true }),
+  ).toBeVisible();
+  // Only the agent's login, never the host's default one, and no pins.
+  await expect(details.getByText("dev@example.com", { exact: true })).toHaveCount(0);
+  await expectUnpinnableRows(details);
+  return details;
+}
+
+async function expectFailedRequestSentence(
+  page: Page,
+  usage: AgentUsageScript,
+  openDetails: OpenDetails,
+  shot: Shot,
+): Promise<void> {
+  usage.answerNext({ error: "Unknown agent" });
+  await reloadAgent(page);
+  const details = await openDetails(page);
+  await expect(
+    details.getByText("Unable to load usage: Unknown agent", { exact: true }),
+  ).toBeVisible();
+  await shot("error");
+}
+
+async function expectOnlyContextWindowWithoutUsage(
+  page: Page,
+  usage: AgentUsageScript,
+  openDetails: OpenDetails,
+  shot: Shot,
+): Promise<void> {
+  usage.stopReportingUsage();
+  await reloadAgent(page);
+  const details = await openDetails(page);
+  await expect(details.getByText("25% used", { exact: true })).toBeVisible();
+  await expect(details.getByText("Loading usage...", { exact: true })).toHaveCount(0);
+  await expect(details.getByText("work@example.com", { exact: true })).toHaveCount(0);
+  await shot("unsupported");
+}
+
+for (const theme of ["light", "dark"] as const) {
+  test(`the context window hover card shows the agent's usage (${theme})`, async ({
+    page,
+    agent,
+  }) => {
+    test.setTimeout(240_000);
+    const [claude] = claudeAndCodexReports();
+    const usage = await scriptAgentUsage(page);
+    await page.emulateMedia({ colorScheme: theme });
+    await page.setViewportSize(DESKTOP);
+    await openAgent(page, agent);
+    const shot: Shot = (state) => qaScreenshot(page, `hover-card-desktop-${theme}-${state}`);
+
+    await test.step("reports stream in one card at a time, each with Refresh", async () => {
+      const card = await expectCardsToStreamIn(page, usage, hoverContextWindowMeter, shot);
+      await expectRefreshButtons(card, 2);
+      await shot("ready");
+      expect(usage.agentRequests()).toEqual([agent.agentId]);
+    });
+
+    await test.step("the card stays open while the pointer moves onto it", async () => {
+      const card = contextWindowDetails(page);
+      await moveOntoContextWindowDetails(page, card);
+      await page.waitForTimeout(300);
+      await expect(card).toBeVisible();
+    });
+
+    await test.step("Refresh keeps the card open and replaces it with the new report", async () => {
+      const refreshed = gate();
+      usage.answerNext({ stream: [refreshed.promise, expiredLogin(onWorkLogin(claude!))] });
+      const card = contextWindowDetails(page);
+      await refreshUsageCard(card, "Claude");
+      await expect(card.getByRole("button", { name: "Refresh Claude" })).toBeDisabled();
+      // Past the card's close grace, with the pointer still on the card.
+      await page.waitForTimeout(500);
+      await expect(card).toBeVisible();
+      refreshed.open();
+      await expect(card.getByText(LOGIN_EXPIRED)).toBeVisible();
+      expect(usage.refreshedAgents()).toEqual([agent.agentId]);
+    });
+
+    await test.step("after a resume under another login, only that login shows", async () => {
+      // Refresh can retain focus; return to the composer before testing pointer dismissal.
+      await composerLocator(page).focus();
+      // Closed while the old login's report is still on its way.
+      await leaveContextWindowMeter(page);
+      const slowSource = gate();
+      usage.answerNext({ stream: [slowSource.promise, onWorkLogin(claude!)] });
+      const closedEarly = await hoverContextWindowMeter(page);
+      await expect(closedEarly.getByText("Loading usage...", { exact: true })).toBeVisible();
+      await leaveContextWindowMeter(page);
+
+      const resumed = gate();
+      const finished = gate();
+      usage.answerNext({
+        stream: [resumed.promise, onPersonalLogin(claude!), finished.promise],
+      });
+      const card = await hoverContextWindowMeter(page);
+      await expect(card.getByText("Loading usage...", { exact: true })).toBeVisible();
+      await expect(card.getByText("work@example.com", { exact: true })).toHaveCount(0);
+
+      // The old login's report lands during the new request, before the new login's.
+      slowSource.open();
+      resumed.open();
+      await expect(
+        usageCard(card, "claude:personal").getByText("personal@example.com", { exact: true }),
+      ).toBeVisible();
+      await expect(card.getByText("work@example.com", { exact: true })).toHaveCount(0);
+      finished.open();
+    });
+
+    await test.step("a report with a problem shows it on the card", async () => {
+      usage.answerNext([expiredLogin(onWorkLogin(claude!))]);
+      await reloadAgent(page);
+      const card = await hoverContextWindowMeter(page);
+      await expect(card.getByText(LOGIN_EXPIRED)).toBeVisible();
+      await shot("problem");
+    });
+
+    await test.step("a failed request says so in a sentence", async () => {
+      await expectFailedRequestSentence(page, usage, hoverContextWindowMeter, shot);
+    });
+
+    await test.step("a host without usage reports shows only the context window", async () => {
+      await expectOnlyContextWindowWithoutUsage(page, usage, hoverContextWindowMeter, shot);
+      // One request per open that had usage; this one sends none.
+      expect(usage.agentRequests()).toHaveLength(6);
+    });
+  });
+
+  test(`the context window sheet shows the agent's usage and refreshes it (${theme})`, async ({
+    page,
+    agent,
+  }) => {
+    test.setTimeout(240_000);
+    const [claude] = claudeAndCodexReports();
+    const usage = await scriptAgentUsage(page);
+    await page.emulateMedia({ colorScheme: theme });
+    await page.setViewportSize(COMPACT);
+    await openAgent(page, agent);
+    const shot: Shot = (state) => qaScreenshot(page, `sheet-compact-${theme}-${state}`);
+
+    await test.step("reports stream in one card at a time, each with Refresh", async () => {
+      const sheet = await expectCardsToStreamIn(page, usage, pressContextWindowMeter, shot);
+      await expectRefreshButtons(sheet, 2);
+      // Without hover, each card prints its freshness instead of a Refresh tooltip.
+      await expect(sheet.getByText("Updated just now", { exact: true })).toHaveCount(2);
+      await shot("ready");
+      expect(usage.agentRequests()).toEqual([agent.agentId]);
+    });
+
+    await test.step("Refresh replaces the card with the source's new report", async () => {
+      usage.answerNext([expiredLogin(onWorkLogin(claude!))]);
+      const sheet = contextWindowDetails(page);
+      await refreshUsageCard(sheet, "Claude");
+      await expect(sheet.getByText(LOGIN_EXPIRED)).toBeVisible();
+      expect(usage.refreshedAgents()).toEqual([agent.agentId]);
+      await shot("problem");
+    });
+
+    await test.step("Close dismisses the sheet", async () => {
+      await closeContextWindowSheet(page);
+    });
+
+    await test.step("a failed request says so in a sentence", async () => {
+      await expectFailedRequestSentence(page, usage, pressContextWindowMeter, shot);
+    });
+
+    await test.step("a host without usage reports shows only the context window", async () => {
+      await expectOnlyContextWindowWithoutUsage(page, usage, pressContextWindowMeter, shot);
+      expect(usage.agentRequests()).toHaveLength(3);
+    });
+  });
+}
+
+test("context details support keyboard entry and dismiss when the viewport moves", async ({
+  page,
+  agent,
+}) => {
+  const usage = await scriptAgentUsage(page);
+  await page.setViewportSize(DESKTOP);
+  await openAgent(page, agent);
+  await submitMessageWithButton(page, "withhold synthetic user message until interrupted");
+  const stop = page.getByRole("button", { name: /stop|cancel/i }).first();
+  await expect(stop).toBeVisible();
+  const [claude] = claudeAndCodexReports();
+  usage.answerNext([onPersonalLogin(claude!)]);
+  const meter = page.getByTestId("context-window-meter");
+  const trigger = page.getByRole("button", {
+    name: (await meter.getAttribute("aria-label"))!,
+    exact: true,
+  });
+  await expect(trigger).toHaveAttribute("tabindex", "0");
+  await trigger.focus();
+  const details = contextWindowDetails(page);
+  await expect(details).toBeVisible();
+  await expect(details.getByRole("button", { name: "Refresh Claude", exact: true })).toBeVisible();
+  await trigger.press("ArrowDown");
+  await expect(details.getByRole("button", { name: "Refresh Claude", exact: true })).toBeFocused();
+  await page.keyboard.press("Escape");
+  await expect(details).toHaveCount(0);
+  await expect(stop).toBeVisible();
+  await expect(trigger).toBeFocused();
+  for (const key of ["Enter", " "]) {
+    usage.answerNext([onPersonalLogin(claude!)]);
+    await trigger.press(key);
+    await expect(details).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(details).toHaveCount(0);
+    await expect(stop).toBeVisible();
+    await expect(trigger).toBeFocused();
+  }
+  usage.answerNext([onPersonalLogin(claude!)]);
+  await trigger.press("ArrowDown");
+  await expect(details).toBeVisible();
+  await page.setViewportSize({ width: 1280, height: 850 });
+  await expect(details).toHaveCount(0);
+});
+
+test("pointer hovering context details preserves composer focus", async ({ page, agent }) => {
+  const usage = await scriptAgentUsage(page);
+  await page.setViewportSize(DESKTOP);
+  await openAgent(page, agent);
+  const [claude] = claudeAndCodexReports();
+  usage.answerNext([onPersonalLogin(claude!)]);
+  const input = composerLocator(page);
+  await input.focus();
+  await hoverContextWindowMeter(page);
+  await expect(input).toBeFocused();
+  await leaveContextWindowMeter(page);
+  await expect(input).toBeFocused();
+});
+
+test("Find remains available after dismissing context details", async ({ page, agent }) => {
+  const usage = await scriptAgentUsage(page);
+  await page.setViewportSize(DESKTOP);
+  await openAgent(page, agent);
+  const [claude] = claudeAndCodexReports();
+  usage.answerNext([onPersonalLogin(claude!)]);
+  const meter = page.getByTestId("context-window-meter");
+  const trigger = page.getByRole("button", {
+    name: (await meter.getAttribute("aria-label"))!,
+    exact: true,
+  });
+  await trigger.focus();
+  await expect(contextWindowDetails(page)).toBeVisible();
+  await page.keyboard.press("Escape");
+  await expect(contextWindowDetails(page)).toHaveCount(0);
+  await expect(trigger).toBeFocused();
+  await page.keyboard.press("ControlOrMeta+f");
+  await expect(page.getByRole("textbox", { name: "Find in pane", exact: true })).toBeFocused();
+});
diff --git a/packages/app/e2e/browser/creation-idempotency.spec.ts b/packages/app/e2e/browser/creation-idempotency.spec.ts
new file mode 100644
index 0000000000..7658addf72
--- /dev/null
+++ b/packages/app/e2e/browser/creation-idempotency.spec.ts
@@ -0,0 +1,173 @@
+import type { createCreationScenario } from "../support/helpers/creation";
+import { expect } from "../support/fixtures";
+import { test } from "../support/creation-fixtures";
+
+for (const isolation of ["local", "worktree"] as const) {
+  test(`repeated Create clicks before a render create only one ${isolation} workspace`, async ({
+    creation,
+  }) => {
+    await creation.openWorkspaceForm(isolation);
+    await creation.submitRepeatedly("Create");
+    await creation.expectOneCreatedWorkspace();
+  });
+}
+
+test("repeated Send clicks before a render create only one agent", async ({ creation }) => {
+  await creation.openAgentDraft();
+  await creation.submitRepeatedly("Send message", "Start exactly one agent for this prompt.");
+  await creation.expectPromptVisible();
+  await creation.expectAgentCount(1);
+});
+
+test("retrying the app's agent creation returns the same agent for every attempt", async ({
+  creation,
+  agentRetries,
+}) => {
+  await creation.openAgentDraft();
+  await creation.submitPrompt("Start exactly one agent for this prompt.");
+  expect(new Set(await agentRetries.completedAgentIds()).size).toBe(1);
+  await creation.expectAgentCount(1);
+});
+
+test("the first prompt still names an agent created with a receipt", async ({ creation }) => {
+  await creation.openAgentDraft();
+  await creation.submitPrompt("Name this new agent from its first prompt.");
+  await creation.expectPromptVisible();
+  await creation.expectAgentTitle("Name this new agent from its first prompt.");
+});
+
+test("reconnecting after a lost creation response recovers the agent and initial message", async ({
+  creation,
+  promptRetry,
+}) => {
+  await creation.openAgentDraft();
+  promptRetry.holdAcknowledgement();
+  await creation.submitPrompt("Deliver this initial prompt once.");
+  await promptRetry.waitForDeliveredPrompt();
+  await promptRetry.disconnectAndReconnect();
+  await promptRetry.expectSameAgentAndMessage();
+  await creation.expectAgentCount(1);
+});
+
+test("a remounted draft reconciles its original creation after reconnect", async ({
+  creation,
+  promptRetry,
+}) => {
+  await creation.openAgentDraft();
+  promptRetry.holdAcknowledgement();
+  await creation.submitPrompt("Deliver this initial prompt once.");
+  await promptRetry.waitForDeliveredPrompt();
+  await creation.evictAndReturnToDraft();
+  await creation.expectPromptVisible("Deliver this initial prompt once.");
+  await promptRetry.disconnectAndReconnect();
+  await promptRetry.expectSameAgentAndMessage();
+  await creation.expectAgentCount(1);
+});
+
+test("repeated new-workspace prompt submissions create one workspace and one agent", async ({
+  creation,
+}) => {
+  await creation.openWorkspaceForm("local");
+  await creation.submitRepeatedly("Create", "Start one agent in one new workspace.");
+  await creation.expectPromptVisible();
+  await creation.expectOneCreatedWorkspace();
+  await creation.expectAgentCount(1);
+});
+
+test("separate drafts can intentionally create two agents in the same workspace", async ({
+  creation,
+  delayedCreation,
+}) => {
+  await creation.openAgentDraft();
+  await creation.submitPrompt("Start the first agent.");
+  await creation.expectPromptVisible("Start the first agent.");
+  await delayedCreation.waitForDelayedCreatedStatus();
+  await creation.startAnotherDraft();
+  await creation.submitPrompt("Start the second agent.");
+  await creation.expectPromptVisible("Start the second agent.");
+  await delayedCreation.waitForDelayedCreatedStatus();
+  delayedCreation.release();
+  await creation.expectAgentCount(2);
+});
+
+test("new workspace navigation and optimistic prompt precede agent initialization", async ({
+  creation,
+  startup,
+  delayedCreation,
+}) => {
+  await creation.openWorkspaceForm("worktree");
+  await creation.submitPrompt("Show this prompt while the agent is starting.", "Create");
+  await creation.expectAgentStillStarting();
+  delayedCreation.expectSingleWorkspaceIntent();
+  delayedCreation.release();
+  await startup.release();
+  await creation.expectOneCreatedWorkspace();
+  await creation.expectAgentCount(1);
+});
+
+for (const scenario of [
+  { suffix: "", prepare: async () => {} },
+  {
+    suffix: " after remount",
+    prepare: async (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.evictAndReturnToDraft(),
+  },
+]) {
+  test(`retrying failed agent initialization preserves its workspace${scenario.suffix}`, async ({
+    creation,
+    startup,
+  }) => {
+    await creation.openWorkspaceForm("local");
+    await creation.submitPrompt("Retry this workspace and agent together.", "Create");
+    await creation.expectAgentStillStarting();
+    await startup.fail();
+    await creation.expectStartupFailure();
+    await creation.expectOneCreatedWorkspace();
+    await scenario.prepare(creation);
+    await creation.submitPrompt("Retry this workspace and agent together.");
+    await creation.expectAgentCount(1);
+  });
+}
+
+for (const entry of [
+  {
+    name: "agent draft",
+    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.openAgentDraft(),
+    button: "Send message",
+    settled: async (_creation: Awaited<ReturnType<typeof createCreationScenario>>) => {},
+  },
+  {
+    name: "new workspace",
+    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.openWorkspaceForm("local"),
+    button: "Create",
+    settled: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.expectOneCreatedWorkspace(),
+  },
+]) {
+  test(`${entry.name} becomes an agent tab when the first prompt is rejected`, async ({
+    creation,
+    promptRejection,
+    page,
+  }, testInfo) => {
+    void promptRejection;
+    const prompt =
+      "Continue the attached conversation.\n" + "Earlier conversation context.\n".repeat(100);
+    await entry.open(creation);
+    await creation.submitPrompt(prompt, entry.button);
+    await entry.settled(creation);
+    await creation.expectCreatedAgentError();
+    await creation.expectPromptBeforeError(prompt);
+    await page.screenshot({ path: testInfo.outputPath("created-agent-prompt-error.png") });
+    await creation.reloadAgent();
+    await creation.expectPromptBeforeError(prompt);
+    await creation.submitPrompt("emit 1 coalesced agent stream updates for a corrected prompt.");
+    await creation.expectPromptVisible(
+      "emit 1 coalesced agent stream updates for a corrected prompt.",
+    );
+    await creation.expectAssistantReply();
+    await creation.expectAgentCount(1);
+    await expect(page.getByText("agent_request_key_conflict", { exact: true })).toHaveCount(0);
+  });
+}
diff --git a/packages/app/e2e/browser/creation-old-daemon.spec.ts b/packages/app/e2e/browser/creation-old-daemon.spec.ts
new file mode 100644
index 0000000000..ff28d513ef
--- /dev/null
+++ b/packages/app/e2e/browser/creation-old-daemon.spec.ts
@@ -0,0 +1,230 @@
+/* eslint-disable no-empty-pattern -- Playwright reads fixture dependencies from destructured parameters. */
+import { randomUUID } from "node:crypto";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { metroTest, expect } from "../support/fixtures";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { withProjectOwnership } from "../support/helpers/project-ownership";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import type { Page } from "@playwright/test";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+import { buildSeededHost, buildCreateAgentPreferences } from "../support/helpers/daemon-registry";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import {
+  openNewWorkspaceComposer,
+  selectWorkspaceIsolation,
+  loadSessionMessageReaders,
+} from "../support/helpers/new-workspace";
+import { fillComposerDraft } from "../support/helpers/composer";
+import { pressSubmitBeforeTheNextRender } from "../support/helpers/creation";
+import { createAgentTabFromMenu } from "../support/helpers/workspace-tabs";
+
+for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
+  let daemon: Awaited<ReturnType<typeof startIsolatedHostDaemon>>;
+  const test = metroTest.extend<{
+    client: DaemonClient;
+    gate: Awaited<ReturnType<typeof holdLegacyAgentCreation>>;
+    repo: Awaited<ReturnType<typeof createTempGitRepo>>;
+    project: Awaited<ReturnType<typeof seedWorkspace>>;
+  }>({
+    gate: async ({ page }, provide) => {
+      const gate = await holdLegacyAgentCreation(page, daemon.port);
+      await provide(gate);
+      gate.release();
+    },
+    client: async ({}, provide) => {
+      const client = withProjectOwnership(
+        await connectDaemonClient<DaemonClient>({
+          clientIdPrefix: "legacy-creation",
+          port: daemon.port,
+        }),
+      );
+      await provide(client);
+      await client.close();
+    },
+    repo: async ({}, provide) => {
+      const repo = await createTempGitRepo("legacy-creation-");
+      await provide(repo);
+      await repo.cleanup();
+    },
+    project: async ({}, provide) => {
+      const project = await seedWorkspace({ repoPrefix: "legacy-app-", port: daemon.port });
+      await provide(project);
+      await project.cleanup();
+    },
+  });
+  test.describe(`published daemon ${version}`, () => {
+    test.beforeAll(async () => {
+      test.setTimeout(120_000);
+      daemon = await startIsolatedHostDaemon(`srv_creation_${randomUUID()}`, {
+        publishedVersion: version,
+      });
+    });
+    test.afterAll(async () => {
+      await daemon?.close();
+    });
+
+    for (const kind of ["workspace", "agent"] as const) {
+      test(`current client creates a keyed ${kind} and initial prompt on a published old daemon`, async ({
+        repo,
+        client,
+      }) => {
+        const prompt = `Create ${kind}: emit 1 coalesced agent stream updates`;
+        const features = client.getLastServerInfoMessage()?.features;
+        expect(features?.creationLifecycle).not.toBe(true);
+        expect(features?.workspaceRequestReceipts).not.toBe(true);
+        expect(features?.agentRequestReceipts === true).toBe(version === "0.8.0");
+
+        const create = await prepareCreation(client, kind, repo.path, prompt);
+        const [agent, duplicate] = await Promise.all([create(), create()]);
+        expect(duplicate.id).toBe(agent.id);
+        expect(agent.title).toBe(prompt);
+        await client.waitForFinish(agent.id, 20_000);
+        const agents = await client.fetchAgents();
+        expect(agents.entries).toHaveLength(1);
+        expect(agents.entries[0]!.agent.title).toBe(prompt);
+        const timeline = await client.fetchAgentTimeline(agent.id);
+        expect(
+          timeline.entries.filter(
+            ({ item }) => item.type === "user_message" && item.text === prompt,
+          ),
+        ).toHaveLength(1);
+      });
+    }
+
+    test("current app creates a workspace, navigates before agent startup, and creates another agent on an old daemon", async ({
+      page,
+      project,
+      client,
+      gate,
+    }) => {
+      await openOldHost(page, project.workspaceId);
+      await openNewWorkspaceComposer(page, project);
+      await selectWorkspaceIsolation(page, "worktree");
+      const prompt = "Create this workspace: emit 1 coalesced agent stream updates";
+      await fillComposerDraft(page, prompt);
+      await pressSubmitBeforeTheNextRender(page, "Create");
+      await gate.waitForRequest();
+      await expect(page).toHaveURL(/\/workspace\//);
+      await expect(
+        page.getByTestId("user-message").filter({ visible: true }).filter({ hasText: prompt }),
+      ).toBeVisible();
+      expect((await client.fetchAgents()).entries).toHaveLength(0);
+      const workspaces = (await client.fetchWorkspaces()).entries.filter(
+        (workspace) =>
+          workspace.projectId === project.projectId && workspace.id !== project.workspaceId,
+      );
+      expect(workspaces).toHaveLength(1);
+      gate.release();
+      await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(1);
+      const first = (await client.fetchAgents()).entries[0]!.agent;
+      await client.waitForFinish(first.id, 20_000);
+      await expectPromptOnce(client, first.id, prompt);
+      await expect(
+        page.getByTestId(`workspace-tab-agent_${first.id}`).filter({ visible: true }),
+      ).toHaveText(prompt);
+
+      await createAgentTabFromMenu(page);
+      const secondPrompt = "Create another agent: emit 1 coalesced agent stream updates";
+      await fillComposerDraft(page, secondPrompt);
+      await pressSubmitBeforeTheNextRender(page, "Send message");
+      await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(2);
+      const second = (await client.fetchAgents()).entries.find(
+        ({ agent }) => agent.id !== first.id,
+      )!.agent;
+      expect(second.workspaceId).toBe(first.workspaceId);
+      await client.waitForFinish(second.id, 20_000);
+      await expectPromptOnce(client, second.id, secondPrompt);
+      await expect(
+        page.getByTestId(`workspace-tab-agent_${second.id}`).filter({ visible: true }),
+      ).toHaveText(secondPrompt);
+      await expect(
+        page
+          .getByTestId("user-message")
+          .filter({ visible: true })
+          .filter({ hasText: secondPrompt }),
+      ).toBeVisible();
+      await page.screenshot({ path: test.info().outputPath("old-daemon-creation.png") });
+    });
+
+    async function expectPromptOnce(client: DaemonClient, agentId: string, text: string) {
+      const timeline = await client.fetchAgentTimeline(agentId);
+      expect(
+        timeline.entries.filter(({ item }) => item.type === "user_message" && item.text === text),
+      ).toHaveLength(1);
+    }
+
+    async function openOldHost(page: Page, workspaceId: string) {
+      const host = buildSeededHost({
+        serverId: daemon.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() },
+      );
+      await page.goto(buildHostWorkspaceRoute(daemon.serverId, workspaceId));
+    }
+
+    async function prepareCreation(
+      client: DaemonClient,
+      kind: "workspace" | "agent",
+      cwd: string,
+      prompt: string,
+    ) {
+      const input = { provider: "mock", cwd, initialPrompt: prompt };
+      if (kind === "workspace")
+        return async () => {
+          const result = await client.createWorkspace({
+            idempotencyKey: "workspace-intent",
+            source: { kind: "worktree", cwd, worktreeSlug: "created-once" },
+            agent: input,
+          });
+          expect(result.error).toBeNull();
+          expect(result.workspace?.workspaceDirectory).not.toBe(cwd);
+          return result.agent!;
+        };
+      const workspace = await client.createWorkspace({
+        idempotencyKey: "empty-workspace",
+        source: { kind: "directory", path: cwd },
+      });
+      return () =>
+        client.createAgent({
+          ...input,
+          workspaceId: workspace.workspace!.id,
+          idempotencyKey: "agent-intent",
+        });
+    }
+  });
+}
+
+async function holdLegacyAgentCreation(page: Page, port: number) {
+  const readers = await loadSessionMessageReaders();
+  const arrived = Promise.withResolvers<void>();
+  let release = () => {};
+  let holding = true;
+  await page.routeWebSocket(new RegExp(`:${port}/ws`), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((frame) => {
+      if (holding && readers.client(frame)?.type === "create_agent_request") {
+        holding = false;
+        release = () => server.send(frame);
+        arrived.resolve();
+      } else server.send(frame);
+    });
+    server.onMessage((frame) => browser.send(frame));
+  });
+  return {
+    waitForRequest: () => arrived.promise,
+    release() {
+      const send = release;
+      release = () => {};
+      send();
+    },
+  };
+}
diff --git a/packages/app/e2e/browser/daemon-lifecycle.spec.ts b/packages/app/e2e/browser/daemon-lifecycle.spec.ts
new file mode 100644
index 0000000000..bded30cb81
--- /dev/null
+++ b/packages/app/e2e/browser/daemon-lifecycle.spec.ts
@@ -0,0 +1,66 @@
+import { randomUUID } from "node:crypto";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "../support/fixtures";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import {
+  openDaemonOverview,
+  restartDaemonInSettings,
+  expectDaemonRestartComplete,
+  readWorkerPid,
+} from "../support/helpers/daemon-lifecycle";
+
+test("settings restart waits for a replacement worker while retaining the supervisor", async ({
+  page,
+}, testInfo) => {
+  const daemon = await startIsolatedHostDaemon(randomUUID());
+  try {
+    const supervisor = daemon.getPid();
+    const previousWorker = await readWorkerPid(daemon);
+    await openDaemonOverview(page, daemon);
+    await restartDaemonInSettings(page);
+    await expectDaemonRestartComplete(page);
+    expect(await readWorkerPid(daemon)).not.toBe(previousWorker);
+    expect(daemon.getPid()).toBe(supervisor);
+    await page.screenshot({ path: testInfo.outputPath("restart-confirmed.png"), fullPage: true });
+  } finally {
+    await daemon.close();
+  }
+});
+
+test("settings restart replaces the worker when a provider CLI answers --version slowly", async ({
+  page,
+}) => {
+  test.skip(process.platform === "win32", "The slow provider stub is a POSIX script");
+  const daemon = await startIsolatedHostDaemon(randomUUID(), {
+    paseoHome: await createHomeWithSlowProvider(1_800),
+  });
+  try {
+    const previousWorker = await readWorkerPid(daemon);
+    await openDaemonOverview(page, daemon);
+    await restartDaemonInSettings(page);
+    await expectDaemonRestartComplete(page);
+    expect(await readWorkerPid(daemon)).not.toBe(previousWorker);
+  } finally {
+    await daemon.close();
+  }
+});
+
+async function createHomeWithSlowProvider(versionDelayMs: number): Promise<string> {
+  const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-e2e-slow-provider-"));
+  const provider = path.join(paseoHome, "slow-provider");
+  await writeFile(
+    provider,
+    `#!${process.execPath}\nsetTimeout(() => console.log("provider 1.0.0"), ${versionDelayMs});\n`,
+    { mode: 0o700 },
+  );
+  await writeFile(
+    path.join(paseoHome, "config.json"),
+    `${JSON.stringify({
+      version: 1,
+      agents: { providers: { claude: { command: { mode: "replace", argv: [provider] } } } },
+    })}\n`,
+  );
+  return paseoHome;
+}
diff --git a/packages/app/e2e/browser/direct-terminal-shortcut-pane-placement.spec.ts b/packages/app/e2e/browser/direct-terminal-shortcut-pane-placement.spec.ts
index 194be40ef9..0c3787f46d 100644
--- a/packages/app/e2e/browser/direct-terminal-shortcut-pane-placement.spec.ts
+++ b/packages/app/e2e/browser/direct-terminal-shortcut-pane-placement.spec.ts
@@ -1,6 +1,10 @@
 import { expect, test } from "../support/fixtures";
 import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
-import { gotoWorkspace, pressDirectNewTabShortcut } from "../support/helpers/launcher";
+import {
+  clickNewChat,
+  gotoWorkspace,
+  pressDirectNewTabShortcut,
+} from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
 
@@ -11,6 +15,7 @@ test.describe("Direct terminal shortcut pane placement", () => {
     try {
       await gotoWorkspace(page, workspace.workspaceId);
       await waitForWorkspaceTabsVisible(page);
+      await clickNewChat(page);
 
       await runWorkspaceActionFromCommandCenter(page, "Split pane right");
       const focusedPaneChild = page
diff --git a/packages/app/e2e/browser/empty-pane-keyboard.spec.ts b/packages/app/e2e/browser/empty-pane-keyboard.spec.ts
index 0a90da72d8..46dc4cf47f 100644
--- a/packages/app/e2e/browser/empty-pane-keyboard.spec.ts
+++ b/packages/app/e2e/browser/empty-pane-keyboard.spec.ts
@@ -1,7 +1,7 @@
 import { expect, type Locator, type Page } from "@playwright/test";
 import { test } from "../support/fixtures";
 import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
-import { gotoWorkspace } from "../support/helpers/launcher";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
 
@@ -30,7 +30,7 @@ test.describe("New tab keyboard launcher", () => {
       await waitForWorkspaceTabsVisible(page);
 
       const explorer = await openExplorerWithKeyboard(page);
-      await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible();
+      await expect(explorer.getByTestId("workspace-tab-changes_tree")).toBeVisible();
       await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
     } finally {
       await workspace.cleanup();
@@ -43,6 +43,7 @@ test.describe("New tab keyboard launcher", () => {
     try {
       await gotoWorkspace(page, workspace.workspaceId);
       await waitForWorkspaceTabsVisible(page);
+      await clickNewChat(page);
       await runWorkspaceActionFromCommandCenter(page, "Split pane right");
 
       const launcher = visibleNewTabPanel(page);
diff --git a/packages/app/e2e/browser/explorer-pane-placement.spec.ts b/packages/app/e2e/browser/explorer-pane-placement.spec.ts
index 750a2f3dc5..55f96cc0cf 100644
--- a/packages/app/e2e/browser/explorer-pane-placement.spec.ts
+++ b/packages/app/e2e/browser/explorer-pane-placement.spec.ts
@@ -7,7 +7,7 @@
 import { expect, type Locator, type Page } from "@playwright/test";
 import { test } from "../support/fixtures";
 import { gotoWorkspace } from "../support/helpers/launcher";
-import { seedWorkspace } from "../support/helpers/seed-client";
+import { seedCorruptedWorkspaceLayout } from "../support/helpers/workspace-layout";
 import {
   openChangesTreePanel,
   waitForWorkspaceTabsVisible,
@@ -25,13 +25,16 @@ function draftTabChip(page: Page): Locator {
   return page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true });
 }
 
-/** The Explorer has its own fixed tab rail, separate from workspace pane rows. */
+/** Scope the shared tab row to the Explorer dock. */
 function explorerTabRow(page: Page): Locator {
-  return visible(page, "explorer-sidebar-tab-rail");
+  return visible(page, "workspace-explorer-sidebar").getByTestId("workspace-tabs-row");
 }
 
 function mainTabRow(page: Page): Locator {
-  return visible(page, "workspace-tabs-row");
+  return page
+    .locator('[data-testid^="workspace-pane-"]')
+    .getByTestId("workspace-tabs-row")
+    .filter({ visible: true });
 }
 
 async function selectExplorerChanges(page: Page): Promise<void> {
@@ -93,132 +96,221 @@ async function dragChipTo(
   await page.mouse.up();
 }
 
+function collectConsoleErrors(page: Page): string[] {
+  const errors: string[] = [];
+  page.on("console", (message) => {
+    if (message.type() === "error") errors.push(message.text());
+  });
+  page.on("pageerror", (error) => errors.push(`pageerror: ${String(error)}`));
+  return errors;
+}
+
 test.describe("explorer pane tab placement", () => {
   test("agents open in the main pane and New-tab splits keep the app usable", async ({
     page,
+    withWorkspace,
+    e2eWorkerClient,
   }, testInfo) => {
-    const consoleErrors: string[] = [];
-    page.on("console", (message) => {
-      if (message.type() === "error") consoleErrors.push(message.text());
-    });
-    page.on("pageerror", (error) => consoleErrors.push(`pageerror: ${String(error)}`));
+    const consoleErrors = collectConsoleErrors(page);
 
-    const workspace = await seedWorkspace({ repoPrefix: "explorer-pane-placement-" });
+    const workspace = await withWorkspace({ prefix: "explorer-pane-placement-" });
     let agentId = "";
 
-    try {
-      await test.step("empty workspace seeds a draft in the main pane", async () => {
-        await gotoWorkspace(page, workspace.workspaceId);
-        await waitForWorkspaceTabsVisible(page);
-        await expect(draftTabChip(page).first()).toBeVisible({ timeout: 30_000 });
+    await test.step("choose Agent from the empty workspace launcher", async () => {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await waitForWorkspaceTabsVisible(page);
+      await openAgentDraftFromLauncher(page);
+      await expect(draftTabChip(page).first()).toBeVisible({ timeout: 30_000 });
+    });
+
+    await test.step("select Changes in Explorer", async () => {
+      await selectExplorerChanges(page);
+    });
+
+    await test.step("an agent appearing now opens in the main pane, not the explorer pane", async () => {
+      const agent = await e2eWorkerClient.createAgent({
+        provider: "mock",
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "Explorer Placement Agent",
+        modeId: "load-test",
+        model: "ten-second-stream",
+        // Keep the agent streaming through the drag so pane contents are live,
+        // matching the reporter's "spinners were still going" environment.
+        initialPrompt: "stream please",
+      });
+      agentId = agent.id;
+      await expect(agentTabChip(page, agentId).first()).toBeVisible({ timeout: 30_000 });
+
+      await expect(
+        mainTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
+      ).toBeVisible();
+      await expect(
+        explorerTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
+      ).toHaveCount(0);
+      // The background open must not change the selected Explorer view.
+      await expect(visible(page, "changes-tree-panel").first()).toBeVisible();
+    });
+
+    await test.step("close the draft; the agent is the main pane's only tab", async () => {
+      await closeSeededDraftInMainPane(page);
+      await expect(mainTabRow(page).first().locator('[data-testid^="workspace-tab-"]')).toHaveCount(
+        1,
+      );
+      await testInfo.attach("before-drag", {
+        body: await page.screenshot(),
+        contentType: "image/png",
+      });
+    });
+
+    await test.step("split the agent out of the main pane, leaving it empty", async () => {
+      const chip = agentTabChip(page, agentId).first();
+      const mainBox = await paneBoxContainingChip(page, chip);
+      // Land inside the left 15% edge band of the main pane content.
+      await dragChipTo(page, chip, {
+        x: mainBox.x + mainBox.width * 0.06,
+        y: mainBox.y + mainBox.height * 0.6,
+      });
+      await testInfo.attach("after-split", {
+        body: await page.screenshot(),
+        contentType: "image/png",
+      });
+      // The split must have taken: agent pane + New main. Explorer keeps its own rail.
+      await expect(mainTabRow(page)).toHaveCount(2, { timeout: 10_000 });
+      await expect(explorerTabRow(page)).toHaveCount(1);
+      await expect(page.getByTestId("workspace-new-tab-panel")).toBeVisible();
+    });
+
+    await test.step("app must stay interactive after the split", async () => {
+      // JS main thread alive?
+      const pong = await page.evaluate("1 + 1");
+      expect(pong).toBe(2);
+
+      // Pointer interaction alive? Selecting the agent chip must still work.
+      const chip = agentTabChip(page, agentId).first();
+      await chip.click({ position: { x: 12, y: 13 }, timeout: 5_000 });
+      await expect(chip).toHaveAttribute("aria-selected", "true", { timeout: 5_000 });
+
+      // Clicking inside the New tab pane (focuses it) must not lock anything. Aim
+      // above the vertically centred launcher, which would open a tab instead.
+      const emptyPane = newTabPaneChild(page);
+      await emptyPane.click({ position: { x: 40, y: 120 }, timeout: 5_000 });
+
+      // A second drag must work: center-drop the agent tab back into the New pane.
+      const target = await emptyPaneBox(page);
+      await dragChipTo(page, chip, {
+        x: target.x + target.width / 2,
+        y: target.y + target.height / 2,
+      });
+      await testInfo.attach("after-center-drop", {
+        body: await page.screenshot(),
+        contentType: "image/png",
       });
 
-      await test.step("select Changes in Explorer", async () => {
-        await selectExplorerChanges(page);
+      // The agent chip must have replaced New in that pane and stay clickable.
+      await expect(page.getByTestId("workspace-new-tab-panel")).toHaveCount(0, {
+        timeout: 10_000,
       });
+      await agentTabChip(page, agentId)
+        .first()
+        .click({ position: { x: 12, y: 13 } });
 
-      await test.step("an agent appearing now opens in the main pane, not the explorer pane", async () => {
-        const agent = await workspace.client.createAgent({
-          provider: "mock",
-          cwd: workspace.repoPath,
-          workspaceId: workspace.workspaceId,
-          title: "Explorer Placement Agent",
-          modeId: "load-test",
-          model: "ten-second-stream",
-          // Keep the agent streaming through the drag so pane contents are live,
-          // matching the reporter's "spinners were still going" environment.
-          initialPrompt: "stream please",
-        });
-        agentId = agent.id;
-        await expect(agentTabChip(page, agentId).first()).toBeVisible({ timeout: 30_000 });
-
-        await expect(
-          mainTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
-        ).toBeVisible();
-        await expect(
-          explorerTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
-        ).toHaveCount(0);
-        // The background open must not change the selected Explorer view.
-        await expect(visible(page, "changes-tree-panel").first()).toBeVisible();
+      // The explorer toggle must still respond.
+      await visible(page, "workspace-explorer-toggle").first().click({ timeout: 5_000 });
+      await testInfo.attach("after-interactions", {
+        body: await page.screenshot(),
+        contentType: "image/png",
       });
+    });
 
-      await test.step("close the draft; the agent is the main pane's only tab", async () => {
-        await closeSeededDraftInMainPane(page);
-        await expect(
-          mainTabRow(page).first().locator('[data-testid^="workspace-tab-"]'),
-        ).toHaveCount(1);
-        await testInfo.attach("before-drag", {
-          body: await page.screenshot(),
-          contentType: "image/png",
-        });
-      });
-
-      await test.step("split the agent out of the main pane, leaving it empty", async () => {
-        const chip = agentTabChip(page, agentId).first();
-        const mainBox = await paneBoxContainingChip(page, chip);
-        // Land inside the left 15% edge band of the main pane content.
-        await dragChipTo(page, chip, {
-          x: mainBox.x + mainBox.width * 0.06,
-          y: mainBox.y + mainBox.height * 0.6,
-        });
-        await testInfo.attach("after-split", {
-          body: await page.screenshot(),
-          contentType: "image/png",
-        });
-        // The split must have taken: agent pane + New main. Explorer keeps its own rail.
-        await expect(visible(page, "workspace-tabs-row")).toHaveCount(2, { timeout: 10_000 });
-        await expect(explorerTabRow(page)).toHaveCount(1);
-        await expect(page.getByTestId("workspace-new-tab-panel")).toBeVisible();
-      });
-
-      await test.step("app must stay interactive after the split", async () => {
-        // JS main thread alive?
-        const pong = await page.evaluate("1 + 1");
-        expect(pong).toBe(2);
-
-        // Pointer interaction alive? Selecting the agent chip must still work.
-        const chip = agentTabChip(page, agentId).first();
-        await chip.click({ position: { x: 12, y: 13 }, timeout: 5_000 });
-        await expect(chip).toHaveAttribute("aria-selected", "true", { timeout: 5_000 });
-
-        // Clicking inside the New tab pane (focuses it) must not lock anything. Aim
-        // above the vertically centred launcher, which would open a tab instead.
-        const emptyPane = newTabPaneChild(page);
-        await emptyPane.click({ position: { x: 40, y: 120 }, timeout: 5_000 });
-
-        // A second drag must work: center-drop the agent tab back into the New pane.
-        const target = await emptyPaneBox(page);
-        await dragChipTo(page, chip, {
-          x: target.x + target.width / 2,
-          y: target.y + target.height / 2,
-        });
-        await testInfo.attach("after-center-drop", {
-          body: await page.screenshot(),
-          contentType: "image/png",
-        });
-
-        // The agent chip must have replaced New in that pane and stay clickable.
-        await expect(page.getByTestId("workspace-new-tab-panel")).toHaveCount(0, {
-          timeout: 10_000,
-        });
-        await agentTabChip(page, agentId)
-          .first()
-          .click({ position: { x: 12, y: 13 } });
-
-        // The explorer toggle must still respond.
-        await visible(page, "workspace-explorer-toggle").first().click({ timeout: 5_000 });
-        await testInfo.attach("after-interactions", {
-          body: await page.screenshot(),
-          contentType: "image/png",
-        });
-      });
-
-      await testInfo.attach("console-errors", {
-        body: JSON.stringify(consoleErrors, null, 2),
-        contentType: "application/json",
-      });
-    } finally {
-      await workspace.cleanup();
-    }
+    await testInfo.attach("console-errors", {
+      body: JSON.stringify(consoleErrors, null, 2),
+      contentType: "application/json",
+    });
   });
 });
+
+async function closeOnlyDraft(page: Page): Promise<void> {
+  await draftTabChip(page).hover();
+  await page.getByRole("button", { name: "Close", exact: true }).click();
+}
+
+async function moveOnlyDraftIntoRightSplit(page: Page): Promise<void> {
+  await mainTabRow(page).getByRole("button", { name: "More actions", exact: true }).click();
+  await page.getByRole("menuitem", { name: /^Split pane right/ }).click();
+  const target = await emptyPaneBox(page);
+  await dragChipTo(page, draftTabChip(page), {
+    x: target.x + target.width / 2,
+    y: target.y + target.height / 2,
+  });
+  await expect(mainTabRow(page)).toHaveCount(1);
+}
+
+async function expectNewLauncher(page: Page): Promise<void> {
+  await expect(
+    page.getByTestId("workspace-new-tab-panel").getByRole("button", { name: "Agent", exact: true }),
+  ).toBeVisible();
+  await expect(draftTabChip(page)).toHaveCount(0);
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveCount(0);
+  await expect(page.getByText("Paseo ran into a problem.", { exact: true })).toHaveCount(0);
+}
+
+async function openAgentDraftFromLauncher(page: Page): Promise<void> {
+  await expectNewLauncher(page);
+  await page
+    .getByTestId("workspace-new-tab-panel")
+    .getByRole("button", { name: "Agent", exact: true })
+    .click();
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+}
+
+// Explorer cannot replace the ordinary workspace canvas, including on restore.
+test("closing the last split-born tab with hidden Explorer keeps a usable workspace", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "last-pane-hidden-explorer-" });
+  await gotoWorkspace(page, workspace.workspaceId);
+  await openAgentDraftFromLauncher(page);
+  await closeOnlyDraft(page);
+  await expectNewLauncher(page);
+  await openAgentDraftFromLauncher(page);
+  await moveOnlyDraftIntoRightSplit(page);
+  await closeOnlyDraft(page);
+  await expectNewLauncher(page);
+  await page.reload();
+  await expectNewLauncher(page);
+});
+
+test("visible Explorer does not replace the last ordinary workspace pane", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "last-pane-visible-explorer-" });
+  await gotoWorkspace(page, workspace.workspaceId);
+  await page.getByRole("button", { name: "Open Explorer sidebar", exact: true }).click();
+  await openAgentDraftFromLauncher(page);
+  await moveOnlyDraftIntoRightSplit(page);
+  await closeOnlyDraft(page);
+  await expectNewLauncher(page);
+  await page.reload();
+  await expectNewLauncher(page);
+});
+
+test("reloading a saved hidden generated Explorer recovers a usable workspace", async ({
+  page,
+  withWorkspace,
+}) => {
+  const otherWorkspace = await withWorkspace({ prefix: "uncorrupted-explorer-" });
+  await gotoWorkspace(page, otherWorkspace.workspaceId);
+  await openAgentDraftFromLauncher(page);
+
+  const workspace = await withWorkspace({ prefix: "saved-hidden-explorer-" });
+  await gotoWorkspace(page, workspace.workspaceId);
+  await expectNewLauncher(page);
+  await seedCorruptedWorkspaceLayout(page, workspace.workspaceId);
+  await page.reload();
+  await expectNewLauncher(page);
+  await gotoWorkspace(page, otherWorkspace.workspaceId);
+  await expect(draftTabChip(page)).toHaveCount(1);
+});
diff --git a/packages/app/e2e/browser/explorer-plugin-menu.spec.ts b/packages/app/e2e/browser/explorer-plugin-menu.spec.ts
new file mode 100644
index 0000000000..a871718b88
--- /dev/null
+++ b/packages/app/e2e/browser/explorer-plugin-menu.spec.ts
@@ -0,0 +1,23 @@
+import { test } from "../support/fixtures";
+import {
+  withExplorerPanelPlugins,
+  expectWorkspacePanelsInExplorerLauncher,
+  openWorkspacePanelFromExplorerMenu,
+  expectIndependentExplorerPanelTabs,
+  expectExplorerPanelWithFocusedAgent,
+} from "../support/helpers/explorer-plugin-menu";
+
+test("Explorer opens and closes workspace panel tabs independently without inheriting agent context", async ({
+  page,
+}, testInfo) => {
+  await withExplorerPanelPlugins(page, async (workspace) => {
+    await test.step("the + menu offers compatible workspace panels", () =>
+      expectWorkspacePanelsInExplorerLauncher(page));
+    await test.step("the + menu opens a workspace panel in Explorer", () =>
+      openWorkspacePanelFromExplorerMenu(page, workspace, testInfo));
+    await test.step("different panels and plugins keep independent selection and closing", () =>
+      expectIndependentExplorerPanelTabs(page, workspace));
+    await test.step("focusing an agent does not add agent panels to Explorer", () =>
+      expectExplorerPanelWithFocusedAgent(page, workspace, testInfo));
+  });
+});
diff --git a/packages/app/e2e/browser/explorer-sidebar.spec.ts b/packages/app/e2e/browser/explorer-sidebar.spec.ts
index 0d8db71435..c8536c884a 100644
--- a/packages/app/e2e/browser/explorer-sidebar.spec.ts
+++ b/packages/app/e2e/browser/explorer-sidebar.spec.ts
@@ -1,5 +1,9 @@
 import { expect, test } from "../support/fixtures";
-import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  gotoWorkspace,
+  pressNewTabShortcut,
+  expectTabTitleFits,
+} from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import {
   ensureExplorerSidebar,
@@ -11,6 +15,25 @@ function explorerSidebar(page: Parameters<typeof ensureExplorerSidebar>[0]) {
   return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
 }
 
+async function expectExplorerActiveTabForeground(
+  page: Parameters<typeof ensureExplorerSidebar>[0],
+) {
+  await openFilesPanel(page);
+  const main = page.getByTestId("workspace-pane-main");
+  await main.hover();
+  const activeMainLabel = main
+    .getByTestId("workspace-tabs-row")
+    .locator('[aria-selected="true"]')
+    .getByText("New tab", { exact: true });
+  const foreground = await activeMainLabel.evaluate((element) => getComputedStyle(element).color);
+  const activeFiles = explorerSidebar(page).getByRole("button", {
+    name: "Browse workspace files",
+    exact: true,
+  });
+  await expect(activeFiles).toHaveAttribute("aria-selected", "true");
+  await expect(activeFiles.getByText("Files", { exact: true })).toHaveCSS("color", foreground);
+}
+
 test.describe("Explorer sidebar", () => {
   test("starts with Files and Changes, switches views, and toggles without changing main", async ({
     page,
@@ -26,14 +49,14 @@ test.describe("Explorer sidebar", () => {
         .count();
 
       const explorer = await ensureExplorerSidebar(page);
-      await expect(explorer.getByTestId("explorer-sidebar-tab-files")).toBeVisible();
-      await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible();
-      await expect(explorer.getByTestId("workspace-new-tab-button")).toHaveCount(0);
+      await expect(explorer.getByTestId("workspace-tab-files")).toBeVisible();
+      await expect(explorer.getByTestId("workspace-tab-changes_tree")).toBeVisible();
+      await expect(explorer.getByTestId("workspace-new-tab-button")).toHaveCount(1);
 
-      await openFilesPanel(page);
+      await expectExplorerActiveTabForeground(page);
       await expect(explorer.getByTestId("file-explorer-tree-scroll")).toBeVisible();
 
-      await explorer.getByTestId("explorer-sidebar-tab-changes_tree").click();
+      await explorer.getByTestId("workspace-tab-changes_tree").click();
       await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
 
       await page.getByTestId("workspace-explorer-toggle").first().click();
@@ -46,3 +69,181 @@ test.describe("Explorer sidebar", () => {
     }
   });
 });
+
+async function launchExplorerPanel(
+  page: Parameters<typeof ensureExplorerSidebar>[0],
+  name: string,
+) {
+  const explorer = explorerSidebar(page);
+  await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+  await page.getByRole("menuitem", { name: new RegExp(`^${name}`) }).click();
+  await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+  await expect(page.getByRole("menuitem", { name: new RegExp(`^${name}`) })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+}
+
+async function closeExplorerFilesFromContextMenu(
+  page: Parameters<typeof ensureExplorerSidebar>[0],
+) {
+  const explorer = explorerSidebar(page);
+  const files = explorer.getByRole("button", { name: "Browse workspace files", exact: true });
+  await files.hover();
+  await expect(explorer.getByTestId("workspace-files-close")).toHaveCount(0);
+  await explorer.getByTestId("workspace-tab-changes_tree").hover();
+  await expect(explorer.getByTestId("workspace-working-diff-close-changes_tree")).toHaveCount(0);
+  await files.click({ button: "right", position: { x: 12, y: 13 } });
+  await page.getByRole("menuitem", { name: "Close", exact: true }).click();
+  await expect(files).toHaveCount(0);
+}
+
+async function expectWorkspaceCloseOnHover(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  const main = page.getByTestId("workspace-pane-main");
+  const tab = main.locator('[data-testid^="workspace-tab-"][aria-selected="true"]');
+  const close = main.getByRole("button", { name: "Close", exact: true });
+  await explorerSidebar(page).hover();
+  await expect(close.locator("..")).toHaveCSS("opacity", "0");
+  await tab.hover();
+  await expect(close.locator("..")).toHaveCSS("opacity", "1");
+}
+
+async function closeOtherExplorerTabs(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  const files = explorerSidebar(page).getByRole("button", {
+    name: "Browse workspace files",
+    exact: true,
+  });
+  await files.click({ button: "right", position: { x: 12, y: 13 } });
+  const confirmation = page.waitForEvent("dialog").then((dialog) => {
+    expect(dialog.message()).toContain("close 1 tab");
+    return dialog.accept();
+  });
+  await page.getByRole("menuitem", { name: "Close other tabs", exact: true }).click();
+  await confirmation;
+}
+
+test("Explorer keeps Files and Changes close actions in the context menu", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-shared-tabs-" });
+  try {
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForWorkspaceTabsVisible(page);
+    const main = page.getByTestId("workspace-pane-main");
+    const mainTabsBefore = await main.getByTestId("workspace-tabs-row").getByRole("button").count();
+    const explorer = await ensureExplorerSidebar(page);
+    await expectTabTitleFits(page, "Files", { min: 64, max: 90 });
+
+    await test.step("Explorer's + menu excludes Agent and terminal profiles", async () => {
+      await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+      const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
+      await expect(menu).toBeVisible();
+      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
+      await expect(menu.getByRole("menuitem", { name: /^Files/ })).toHaveCount(0);
+      await expect(menu.getByRole("menuitem", { name: /^Changes/ })).toHaveCount(0);
+      await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
+      await expect(menu.getByRole("menuitem", { name: /^Terminal/ })).toBeVisible();
+      const entries = await menu.getByRole("menuitem").allTextContents();
+      expect(entries.findIndex((entry) => entry.startsWith("Terminal"))).toBeLessThan(
+        entries.findIndex((entry) => entry.startsWith("Diff")),
+      );
+      await page.keyboard.press("Escape");
+      await main.getByTestId("workspace-new-tab-button").click();
+      await expect(menu).toBeVisible();
+      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toBeVisible();
+      await expect(menu.getByText("Terminal profiles", { exact: true })).toBeVisible();
+      await page.keyboard.press("Escape");
+    });
+
+    await test.step("Files and Changes omit X, and + restores Files after context-menu close", async () => {
+      await expectWorkspaceCloseOnHover(page);
+      await closeExplorerFilesFromContextMenu(page);
+      await launchExplorerPanel(page, "Files");
+      await expect(
+        explorer.getByRole("button", { name: "Browse workspace files", exact: true }),
+      ).toBeVisible();
+      await expect(explorer.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+    });
+
+    await test.step("standard bulk-close menus affect only Explorer tabs", async () => {
+      await closeOtherExplorerTabs(page);
+      await expect(explorer.getByTestId("workspace-tab-changes_tree")).toHaveCount(0);
+      await expect(explorer.getByTestId("workspace-tab-files")).toBeVisible();
+      await expect(main.getByTestId("workspace-tabs-row").getByRole("button")).toHaveCount(
+        mainTabsBefore,
+      );
+      await launchExplorerPanel(page, "Changes");
+      await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
+    });
+
+    await test.step("Cmd+T still belongs to the focused workspace pane", async () => {
+      await pressNewTabShortcut(page);
+      await expect(
+        main.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
+      ).toBeVisible();
+      await expect(explorer.getByTestId("workspace-new-tab-panel")).toHaveCount(0);
+    });
+
+    await testInfo.attach("shared-explorer-tabs", {
+      body: await page.screenshot(),
+      contentType: "image/png",
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+async function dragAgentIntoExplorer(
+  page: Parameters<typeof ensureExplorerSidebar>[0],
+  agentId: string,
+) {
+  const source = page
+    .getByTestId("workspace-pane-main")
+    .getByTestId(`workspace-tab-agent_${agentId}`);
+  const destination = explorerSidebar(page).getByTestId("workspace-tab-files");
+  const sourceBox = await source.boundingBox();
+  const destinationBox = await destination.boundingBox();
+  if (!sourceBox || !destinationBox)
+    throw new Error("Tab drag requires visible source and destination");
+  const start = { x: sourceBox.x + 12, y: sourceBox.y + sourceBox.height / 2 };
+  await page.mouse.move(start.x, start.y);
+  await page.mouse.down();
+  await page.mouse.move(start.x + 12, start.y + 4);
+  await page.mouse.move(destinationBox.x + 12, destinationBox.y + destinationBox.height / 2, {
+    steps: 20,
+  });
+  await page.mouse.up();
+}
+
+test("agents can still be dragged into Explorer when absent from its + menu", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-agent-drag-" });
+  try {
+    await gotoWorkspace(page, workspace.workspaceId);
+    const explorer = await ensureExplorerSidebar(page);
+    const agent = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Dragged agent",
+      modeId: "load-test",
+      model: "ten-second-stream",
+    });
+    const main = page.getByTestId("workspace-pane-main");
+    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
+    await dragAgentIntoExplorer(page, agent.id);
+    await expect(explorer.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
+    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toHaveCount(0);
+    await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+    const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
+    await expect(menu).toBeVisible();
+    await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
+    await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
+    await page.keyboard.press("Escape");
+    await testInfo.attach("agent-in-explorer", {
+      body: await page.screenshot(),
+      contentType: "image/png",
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/explorer-surface-upgrade.spec.ts b/packages/app/e2e/browser/explorer-surface-upgrade.spec.ts
index 9e2e6a2378..95a5a62bc3 100644
--- a/packages/app/e2e/browser/explorer-surface-upgrade.spec.ts
+++ b/packages/app/e2e/browser/explorer-surface-upgrade.spec.ts
@@ -64,10 +64,8 @@ test.describe("explorer surface after upgrading from the docked sidebar", () =>
         const toggle = visible(page, "workspace-explorer-toggle").first();
         await toggle.click();
         await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
-        await expect(
-          explorerSidebar(page).getByTestId("explorer-sidebar-tab-changes_tree"),
-        ).toBeVisible();
+        await expect(explorerSidebar(page).getByTestId("workspace-tab-files")).toBeVisible();
+        await expect(explorerSidebar(page).getByTestId("workspace-tab-changes_tree")).toBeVisible();
 
         await toggle.click();
         await expect(explorerSidebar(page)).toHaveCount(0, { timeout: 15_000 });
@@ -102,7 +100,7 @@ test.describe("explorer surface after upgrading from the docked sidebar", () =>
       await test.step("open the explorer so both sides are showing", async () => {
         await toggle.click();
         await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
+        await expect(explorerSidebar(page).getByTestId("workspace-tab-files")).toBeVisible();
         await expect(agentList).toHaveCount(1);
       });
 
@@ -116,7 +114,7 @@ test.describe("explorer surface after upgrading from the docked sidebar", () =>
         await page.keyboard.press(`${modifier}+.`);
         await expect(agentList).toHaveCount(1, { timeout: 15_000 });
         await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
+        await expect(explorerSidebar(page).getByTestId("workspace-tab-files")).toBeVisible();
       });
     } finally {
       await workspace.cleanup();
diff --git a/packages/app/e2e/browser/file-editing.spec.ts b/packages/app/e2e/browser/file-editing.spec.ts
index bd834d6f75..7726c581f3 100644
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -2,12 +2,17 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import {
+  expandFolder,
   openFileExplorer,
   openFileFromExplorer,
   expectFileTabOpen,
 } from "../support/helpers/file-explorer";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { gotoAppShell } from "../support/helpers/app";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
 
 const APP_SETTINGS_KEY = "@paseo:app-settings";
 
@@ -66,6 +71,14 @@ async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<v
   await expect(option).toHaveAttribute("aria-selected", "true");
 }
 
+async function expectMarkdownImageLoaded(page: Page, name: string): Promise<void> {
+  const image = page.getByRole("img", { name, exact: true });
+  await expect(image).toBeVisible();
+  await expect
+    .poll(() => image.locator("img").evaluate((element: HTMLImageElement) => element.naturalWidth))
+    .toBeGreaterThan(0);
+}
+
 function watchRequestsTo(page: Page, origin: string): string[] {
   const requests: string[] = [];
   page.on("request", (request) => {
@@ -92,6 +105,128 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }
 
 test.describe("CodeMirror workspace file editing", () => {
+  test("opens the non-ASCII file named by an assistant markdown link", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "encoded-markdown-link-",
+      title: "Non-ASCII file link",
+      initialPrompt: "Show the report link",
+      featureValues: { mockAssistantResponse: "[报告](docs/reports/开户赠金.md)" },
+    });
+    try {
+      await mkdir(path.join(session.cwd, "docs/reports"), { recursive: true });
+      await writeFile(path.join(session.cwd, "docs/reports/开户赠金.md"), "# Report opened\n");
+      await openAgentRoute(page, session);
+      await openAssistantMarkdownLink(page, "报告");
+      await expectFileTabOpen(page, "docs/reports/开户赠金.md");
+      await expect(
+        page
+          .getByTestId("workspace-file-pane")
+          .filter({ visible: true })
+          .getByText("Report opened", { exact: true }),
+      ).toBeVisible();
+      await page.screenshot({ path: test.info().outputPath("non-ascii-file-opened.png") });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  for (const order of ["raw-first", "href-first"] as const) {
+    test(`opens literal and encoded percent filenames independently ${order}`, async ({ page }) => {
+      const session = await seedMockAgentWorkspace({
+        repoPrefix: "percent-link-cache-",
+        title: "Distinct file links",
+        initialPrompt: "Show both filenames",
+        featureValues: {
+          mockAssistantResponse: "Raw `literal%20.md`. [Decoded](literal%20.md).",
+        },
+      });
+      try {
+        await writeFile(path.join(session.cwd, "literal%20.md"), "# Literal filename\n");
+        await writeFile(path.join(session.cwd, "literal .md"), "# Decoded filename\n");
+        await openAgentRoute(page, session);
+        const links = order === "raw-first" ? ["raw", "href"] : ["href", "raw"];
+        for (const link of links) {
+          await returnToAssistant(page, session.agentId);
+          if (link === "raw") {
+            await openAssistantInlinePath(page, "literal%20.md");
+            await expectFileTabOpen(page, "literal%20.md");
+            await expectPreviewText(page, "Literal filename");
+          } else {
+            await openAssistantMarkdownLink(page, "Decoded");
+            await expectFileTabOpen(page, "literal .md");
+            await expectPreviewText(page, "Decoded filename");
+          }
+        }
+      } finally {
+        await session.cleanup();
+      }
+    });
+  }
+
+  test("jumps to each relative reference to the same file", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "relative-reference-qa-",
+      title: "Relative line references",
+      initialPrompt: "Show both references",
+      featureValues: {
+        mockAssistantResponse: "First `src/router.go:46`. Then `src/router.go:403`.",
+      },
+    });
+    try {
+      await mkdir(path.join(session.cwd, "src"));
+      await writeFile(
+        path.join(session.cwd, "src/router.go"),
+        Array.from({ length: 450 }, (_, n) => `// line ${n + 1}`).join("\n"),
+      );
+      await openAgentRoute(page, session);
+      for (const line of [46, 403, 46]) {
+        await page
+          .getByTestId(`workspace-tab-agent_${session.agentId}`)
+          .filter({ visible: true })
+          .click();
+        await page.getByText(`src/router.go:${line}`, { exact: true }).click();
+        await expect(page.getByLabel(`Line ${line}, column 1`)).toBeVisible();
+      }
+      await page.screenshot({ path: test.info().outputPath("relative-line-target.png") });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  test("shows an absolute POSIX assistant file link relative to the workspace on hover", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "file-link-tooltip-" });
+    const filePath = path.join(workspace.repoPath, "src", "target.ts");
+    try {
+      const agent = await workspace.client.createAgent({
+        provider: "mock",
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "Absolute file link tooltip",
+        modeId: "load-test",
+        model: "e2e-fast-stream",
+        initialPrompt: "Show the file link",
+        featureValues: { mockAssistantResponse: `[Open target](${filePath}:42-45)` },
+      });
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      const workspaceRow = page.getByTestId(
+        `sidebar-workspace-row-${getServerId()}:${workspace.workspaceId}`,
+      );
+      await expect(workspaceRow).toBeVisible({ timeout: 30_000 });
+      await workspaceRow.click();
+      await page.getByTestId(`workspace-tab-agent_${agent.id}`).filter({ visible: true }).click();
+
+      const fileLink = page.getByRole("link", { name: "Open target" }).first();
+      await expect(fileLink).toBeVisible({ timeout: 15_000 });
+      await fileLink.hover();
+      await expect(page.getByText("src/target.ts:42-45", { exact: true })).toBeVisible();
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
   test("renders a lockfile-sized read-only source with a bounded CodeMirror DOM", async ({
     page,
   }) => {
@@ -241,7 +376,12 @@ test.describe("CodeMirror workspace file editing", () => {
       await openAgentRoute(page, session);
 
       await openWorkspaceFile(page, "target.ts");
-      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(2);
+      await expect(
+        page
+          .locator('[data-testid^="workspace-pane-"]')
+          .getByTestId("workspace-tabs-row")
+          .filter({ visible: true }),
+      ).toHaveCount(2);
 
       await page
         .getByTestId(`workspace-tab-agent_${session.agentId}`)
@@ -553,6 +693,40 @@ test.describe("CodeMirror workspace file editing", () => {
     await expect.poll(() => image.getAttribute("src")).not.toBe(initialSource);
   });
 
+  test("renders local relative images inside Markdown preview", async ({ page, withWorkspace }) => {
+    test.setTimeout(90_000);
+    const workspace = await withWorkspace({ prefix: "file-md-relative-image-" });
+    await mkdir(path.join(workspace.repoPath, "docs"), { recursive: true });
+    await mkdir(path.join(workspace.repoPath, "data", "cache"), { recursive: true });
+    await writeFile(path.join(workspace.repoPath, "docs", "sibling.png"), RED_PIXEL);
+    await writeFile(path.join(workspace.repoPath, "data", "cache", "hero.png"), RED_PIXEL);
+    await writeFile(
+      path.join(workspace.repoPath, "docs", "guide.md"),
+      [
+        "# Guide",
+        "",
+        "![sibling](./sibling.png)",
+        "",
+        "![hero](../data/cache/hero.png?v=2#preview)",
+        "",
+      ].join("\n"),
+      "utf8",
+    );
+    await workspace.navigateTo();
+    await openFileExplorer(page);
+    await expandFolder(page, "docs");
+    await openFileFromExplorer(page, "guide.md");
+    await expectFileTabOpen(page, "docs/guide.md");
+
+    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
+    await expect(visibleFilePane.getByText("Guide", { exact: true })).toBeVisible();
+    await expectMarkdownImageLoaded(page, "sibling");
+    await expectMarkdownImageLoaded(page, "hero");
+    await visibleFilePane.screenshot({
+      path: test.info().outputPath("markdown-relative-images.png"),
+    });
+  });
+
   test("previews and refreshes an HTML plan while preserving source access", async ({
     page,
     withWorkspace,
@@ -684,3 +858,24 @@ test.describe("CodeMirror workspace file editing", () => {
     await expect(page.getByLabel("Vim mode NORMAL")).toBeVisible();
   });
 });
+
+async function openAssistantMarkdownLink(page: Page, name: string): Promise<void> {
+  await page.getByRole("link", { name, exact: true }).first().click();
+}
+
+async function returnToAssistant(page: Page, agentId: string): Promise<void> {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).filter({ visible: true }).click();
+}
+
+async function openAssistantInlinePath(page: Page, token: string): Promise<void> {
+  await page.getByText(token, { exact: true }).click();
+}
+
+async function expectPreviewText(page: Page, text: string): Promise<void> {
+  await expect(
+    page
+      .getByTestId("workspace-file-pane")
+      .filter({ visible: true })
+      .getByText(text, { exact: true }),
+  ).toBeVisible();
+}
diff --git a/packages/app/e2e/browser/file-explorer-context-actions.spec.ts b/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
index 3d19f77cf2..bbc73b797e 100644
--- a/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
+++ b/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
@@ -111,21 +111,6 @@ test.afterEach(async () => {
   await workspace?.cleanup();
 });
 
-test("file explorer rows share the workspace title opacity treatment", async ({ page }) => {
-  await gotoWorkspace(page, workspace.workspaceId);
-  await openFileExplorer(page);
-
-  const row = page
-    .getByTestId("file-explorer-tree-scroll")
-    .getByTestId(/^file-explorer-row-\d+$/)
-    .first();
-  const name = row.getByTestId(/-name$/);
-  await expect(row).toHaveCSS("opacity", "1");
-  await expect(name).toHaveCSS("opacity", "0.76");
-  await row.hover();
-  await expect(name).toHaveCSS("opacity", "1");
-});
-
 test("creates, renames, copies, and deletes entries through the file explorer", async ({
   context,
   page,
diff --git a/packages/app/e2e/browser/host-appearance.spec.ts b/packages/app/e2e/browser/host-appearance.spec.ts
index aed83103e9..cb6695c439 100644
--- a/packages/app/e2e/browser/host-appearance.spec.ts
+++ b/packages/app/e2e/browser/host-appearance.spec.ts
@@ -82,121 +82,66 @@ const test = base.extend<{ twoHostSidebar: TwoHostSidebar }>({
   },
 });
 
-test.describe("Host appearance", () => {
-  test.describe.configure({ timeout: 180_000 });
+test.describe.configure({ timeout: 180_000 });
 
-  test("renaming a host renames its sidebar badge", async ({ page, twoHostSidebar }) => {
-    const badge = {
-      serverId: twoHostSidebar.secondaryServerId,
-      workspaceId: twoHostSidebar.secondaryWorkspaceId,
-    };
+test("customizes a host badge and preserves its appearance after reload", async ({
+  page,
+  twoHostSidebar,
+}) => {
+  const badge = {
+    serverId: twoHostSidebar.secondaryServerId,
+    workspaceId: twoHostSidebar.secondaryWorkspaceId,
+  };
+  const hostName = "Developer MacBook Pro.local";
+
+  await test.step("rename the host and use its available sidebar width", async () => {
     await expectHostBadgeName(page, { ...badge, hostName: SECONDARY_HOST_LABEL });
-
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
-    await renameHostFromSettings(page, "Build Box");
-    await leaveHostAppearanceSettings(page);
-
-    await expectHostBadgeName(page, { ...badge, hostName: "Build Box" });
-  });
-
-  test("host names use the available metadata width", async ({ page, twoHostSidebar }) => {
-    const hostName = "Developer MacBook Pro.local";
-    const workspaceKey = `${twoHostSidebar.secondaryServerId}:${twoHostSidebar.secondaryWorkspaceId}`;
-
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
+    await openHostAppearanceSettings(page, badge.serverId);
     await renameHostFromSettings(page, hostName);
     await leaveHostAppearanceSettings(page);
+    await expectHostBadgeName(page, { ...badge, hostName });
 
-    const row = page.getByTestId(`sidebar-workspace-row-${workspaceKey}`);
-    const badge = row.getByTestId(`host-badge-${twoHostSidebar.secondaryServerId}`);
-    await expect(badge).toHaveText(hostName);
-    const [badgeBox, rowBox] = await Promise.all([badge.boundingBox(), row.boundingBox()]);
-
+    const row = page.getByTestId(`sidebar-workspace-row-${badge.serverId}:${badge.workspaceId}`);
+    const hostBadge = row.getByTestId(`host-badge-${badge.serverId}`);
+    const [badgeBox, rowBox] = await Promise.all([hostBadge.boundingBox(), row.boundingBox()]);
     expect(badgeBox).not.toBeNull();
     expect(rowBox).not.toBeNull();
     expect(badgeBox!.width).toBeGreaterThan(96);
     expect(badgeBox!.x + badgeBox!.width).toBeLessThanOrEqual(rowBox!.x + rowBox!.width);
-    const labelWidths = await badge.getByText(hostName, { exact: true }).evaluate((label) => ({
-      clientWidth: label.clientWidth,
-      scrollWidth: label.scrollWidth,
+    const widths = await hostBadge.getByText(hostName, { exact: true }).evaluate((label) => ({
+      client: label.clientWidth,
+      content: label.scrollWidth,
     }));
-    expect(labelWidths.scrollWidth).toBeLessThanOrEqual(labelWidths.clientWidth);
+    expect(widths.content).toBeLessThanOrEqual(widths.client);
   });
 
-  test("picking a color identifies the badge", async ({ page, twoHostSidebar }) => {
-    const badge = {
-      serverId: twoHostSidebar.secondaryServerId,
-      workspaceId: twoHostSidebar.secondaryWorkspaceId,
-      hostName: SECONDARY_HOST_LABEL,
-    };
-
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
+  await test.step("preview a color and apply it to the sidebar badge", async () => {
+    await openHostAppearanceSettings(page, badge.serverId);
     await chooseHostColor(page, "Teal");
+    await expectHostAppearancePreview(page, { serverId: badge.serverId, hostName, color: "teal" });
     await leaveHostAppearanceSettings(page);
-
-    await expectHostBadgeTinted(page, { ...badge, color: "teal" });
+    await expectHostBadgeTinted(page, { ...badge, hostName, color: "teal" });
   });
 
-  test("icon only keeps the badge and drops the name", async ({ page, twoHostSidebar }) => {
-    const badge = {
-      serverId: twoHostSidebar.secondaryServerId,
-      workspaceId: twoHostSidebar.secondaryWorkspaceId,
-      hostName: SECONDARY_HOST_LABEL,
-    };
-
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
+  await test.step("keep the icon-only preference through reload", async () => {
+    await openHostAppearanceSettings(page, badge.serverId);
     await chooseHostBadgeDisplay(page, "Icon only");
     await leaveHostAppearanceSettings(page);
-
-    await expectHostBadgeIconOnly(page, badge);
+    await expectHostBadgeIconOnly(page, { ...badge, hostName });
+    await reloadPreservingHostRegistry(page);
+    await waitForSidebarHydration(page);
+    await expectHostBadgeIconOnly(page, { ...badge, hostName });
   });
 
-  test("hiding one host leaves the other host's badge visible", async ({
-    page,
-    twoHostSidebar,
-  }) => {
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
+  await test.step("hide this badge without hiding the other host", async () => {
+    await openHostAppearanceSettings(page, badge.serverId);
     await chooseHostBadgeDisplay(page, "Hidden");
     await leaveHostAppearanceSettings(page);
-
-    await expectNoHostBadge(page, {
-      serverId: twoHostSidebar.secondaryServerId,
-      workspaceId: twoHostSidebar.secondaryWorkspaceId,
-      hostName: SECONDARY_HOST_LABEL,
-    });
+    await expectNoHostBadge(page, { ...badge, hostName });
     await expectHostBadgeName(page, {
       serverId: twoHostSidebar.primaryServerId,
       workspaceId: twoHostSidebar.primaryWorkspaceId,
       hostName: PRIMARY_HOST_LABEL,
     });
   });
-
-  test("name, color, and display survive a reload", async ({ page, twoHostSidebar }) => {
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
-    await renameHostFromSettings(page, "Build Box");
-    await chooseHostColor(page, "Amber");
-    await chooseHostBadgeDisplay(page, "Icon only");
-    await leaveHostAppearanceSettings(page);
-
-    await reloadPreservingHostRegistry(page);
-    await waitForSidebarHydration(page);
-
-    await expectHostBadgeIconOnly(page, {
-      serverId: twoHostSidebar.secondaryServerId,
-      workspaceId: twoHostSidebar.secondaryWorkspaceId,
-      hostName: "Build Box",
-    });
-  });
-
-  test("the settings preview shows the badge as configured", async ({ page, twoHostSidebar }) => {
-    await openHostAppearanceSettings(page, twoHostSidebar.secondaryServerId);
-    await renameHostFromSettings(page, "Build Box");
-    await chooseHostColor(page, "Emerald");
-
-    await expectHostAppearancePreview(page, {
-      serverId: twoHostSidebar.secondaryServerId,
-      hostName: "Build Box",
-      color: "emerald",
-    });
-  });
 });
diff --git a/packages/app/e2e/browser/host-confirmation.spec.ts b/packages/app/e2e/browser/host-confirmation.spec.ts
new file mode 100644
index 0000000000..6de8da14ce
--- /dev/null
+++ b/packages/app/e2e/browser/host-confirmation.spec.ts
@@ -0,0 +1,51 @@
+import { test, expect } from "../support/fixtures";
+import { openSettings } from "../support/helpers/app";
+import { expectAppRoute } from "../support/helpers/route-assertions";
+import {
+  buildPairingLink,
+  cancelHostConfirmation,
+  connectToConfirmedHost,
+  expectHostConfirmationFor,
+  expectHostInHostPicker,
+  hostConfirmation,
+  openPairingLink,
+  saveLinkedHostBeforeLoad,
+  type LinkedHost,
+} from "../support/helpers/host-confirmation";
+
+// An unreachable relay: the link saves the host without connecting first.
+const linkedHost: LinkedHost = {
+  serverId: "srv_link_confirmation",
+  relayEndpoint: "127.0.0.1:59998",
+  daemonPublicKeyB64: "bGlua0NvbmZpcm1hdGlvbktleQ",
+};
+
+test("a pairing link for a new host asks before saving it", async ({ page }) => {
+  const link = buildPairingLink(linkedHost);
+
+  await test.step("Cancel saves nothing and stays on the page", async () => {
+    await openPairingLink(page, link);
+    await expectHostConfirmationFor(page, linkedHost);
+    await cancelHostConfirmation(page);
+    await expectAppRoute(page, "/settings/general");
+    await expectHostInHostPicker(page, linkedHost.serverId, "not listed");
+  });
+
+  await test.step("Connect saves the host and opens a project", async () => {
+    await openPairingLink(page, link);
+    await expectHostConfirmationFor(page, linkedHost);
+    await connectToConfirmedHost(page);
+    await expectAppRoute(page, "/open-project");
+    await openSettings(page);
+    await expectHostInHostPicker(page, linkedHost.serverId, "listed");
+  });
+});
+
+test("a pairing link for a saved host connects without asking", async ({ page }) => {
+  await saveLinkedHostBeforeLoad(page, linkedHost);
+
+  await openPairingLink(page, buildPairingLink(linkedHost));
+
+  await expectAppRoute(page, "/open-project", { timeout: 30_000 });
+  await expect(hostConfirmation(page)).toHaveCount(0);
+});
diff --git a/packages/app/e2e/browser/host-version-after-daemon-restart.spec.ts b/packages/app/e2e/browser/host-version-after-daemon-restart.spec.ts
new file mode 100644
index 0000000000..2ee1b4c229
--- /dev/null
+++ b/packages/app/e2e/browser/host-version-after-daemon-restart.spec.ts
@@ -0,0 +1,111 @@
+import type { Page } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { addConnectedHostAndReload } from "../support/helpers/hosts";
+import { openHostSection, selectSettingsHost } from "../support/helpers/settings";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  startRestartableHostDaemon,
+  type RestartableHostDaemon,
+} from "../support/helpers/versioned-host-daemon";
+
+const PREVIOUS_VERSION = "0.8.0";
+const UPDATED_VERSION = "0.9.1";
+const HOST_LABEL = "Version restart QA";
+const NO_RELOAD_MARKER = "before-restart";
+
+interface ReloadMarkerWindow {
+  __paseoE2eHostVersionMarker?: string;
+}
+
+test.describe.configure({ timeout: 120_000 });
+
+let hostDaemon: RestartableHostDaemon | null = null;
+
+test.afterEach(async () => {
+  await hostDaemon?.dispose();
+  hostDaemon = null;
+});
+
+test("host page shows the restarted daemon's version without reloading", async ({ page }) => {
+  const host = await startRestartableHostDaemon(PREVIOUS_VERSION);
+  hostDaemon = host;
+  const otherHostVersion =
+    await test.step("the connected host reports its current daemon version", async () => {
+      await gotoAppShell(page);
+      await addConnectedHostAndReload(page, {
+        serverId: host.serverId,
+        label: HOST_LABEL,
+        port: host.port,
+      });
+      const version = await readHelpHostVersion(page, getServerId());
+      await expectHelpHostVersion(page, host.serverId, PREVIOUS_VERSION);
+      await openHostPage(page, host);
+      await expect(hostIdentity(page)).toContainText("Online");
+      await expect(hostVersionBadge(page, PREVIOUS_VERSION)).toBeVisible();
+      await markPageForNoReloadCheck(page, NO_RELOAD_MARKER);
+      return version;
+    });
+
+  await test.step("the last known version remains on the host page when the host stops", async () => {
+    await host.stop();
+    await expect(hostIdentity(page)).toContainText("Error");
+    await expect(hostVersionBadge(page, PREVIOUS_VERSION)).toBeVisible();
+  });
+
+  await test.step("the host daemon restarts on the new version", async () => {
+    await host.restartWithVersion(UPDATED_VERSION);
+  });
+
+  await test.step("the host page badge follows the new version", async () => {
+    await expect(hostVersionBadge(page, UPDATED_VERSION)).toBeVisible({ timeout: 30_000 });
+    await expect(hostVersionBadge(page, PREVIOUS_VERSION)).toHaveCount(0);
+    await page.getByRole("button", { name: "Back" }).click();
+    await expectHelpHostVersion(page, host.serverId, UPDATED_VERSION);
+    expect(await readHelpHostVersion(page, getServerId())).toBe(otherHostVersion);
+    await expectNoReloadSinceMarker(page);
+  });
+});
+
+async function readHelpHostVersion(page: Page, serverId: string): Promise<string> {
+  await page.getByTestId("sidebar-help").click();
+  const row = page.getByTestId(`sidebar-help-host-version-${serverId}`);
+  await expect(row).toBeVisible();
+  const text = await row.innerText();
+  await page.keyboard.press("Escape");
+  return text;
+}
+
+async function expectHelpHostVersion(page: Page, serverId: string, version: string): Promise<void> {
+  const text = await readHelpHostVersion(page, serverId);
+  expect(text).toContain(`v${version}`);
+}
+
+async function openHostPage(page: Page, host: RestartableHostDaemon): Promise<void> {
+  await openSettings(page);
+  await selectSettingsHost(page, host.serverId);
+  await openHostSection(page, host.serverId, "host");
+}
+
+function hostIdentity(page: Page) {
+  return page.getByTestId("host-page-identity");
+}
+
+function hostVersionBadge(page: Page, version: string) {
+  return hostIdentity(page).getByText(`v${version}`, { exact: true });
+}
+
+async function markPageForNoReloadCheck(page: Page, marker: string): Promise<void> {
+  // The marker has to cross into the page as an argument: the callback runs in the browser, so a
+  // captured Node-side constant is not defined there.
+  await page.evaluate((value) => {
+    (window as typeof window & ReloadMarkerWindow).__paseoE2eHostVersionMarker = value;
+  }, marker);
+}
+
+async function expectNoReloadSinceMarker(page: Page): Promise<void> {
+  const marker = await page.evaluate(
+    () => (window as typeof window & ReloadMarkerWindow).__paseoE2eHostVersionMarker ?? null,
+  );
+  expect(marker).toBe(NO_RELOAD_MARKER);
+}
diff --git a/packages/app/e2e/browser/import-session-flow.spec.ts b/packages/app/e2e/browser/import-session-flow.spec.ts
index 00322c86a3..788a6f93ec 100644
--- a/packages/app/e2e/browser/import-session-flow.spec.ts
+++ b/packages/app/e2e/browser/import-session-flow.spec.ts
@@ -4,7 +4,7 @@ import { copyFile, mkdir, rm, utimes, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import type { TestInfo } from "@playwright/test";
-import { test, type Page } from "../support/fixtures";
+import { expect, test, type Page } from "../support/fixtures";
 import { ImportSessionFlow } from "../support/helpers/import-session";
 import {
   connectNewWorkspaceDaemonClient,
@@ -49,6 +49,7 @@ interface ImportFlowScenario {
   worktreeDirectory: string;
   unrelatedDirectory: string;
   importSessionId: string;
+  importSessionTimestamp: number;
   repoCleanup(): Promise<void>;
   unrelatedCleanup(): Promise<void>;
 }
@@ -94,7 +95,7 @@ test.beforeAll(async () => {
   };
   const reuseTarget = await openProjectViaDaemon(client, unrelated.path);
   const importSessionId = "fixture-custom-title";
-  await seedClaudeSessions({
+  const importSessionTimestamp = await seedClaudeSessions({
     projectRoot: repo.path,
     worktreeDirectory,
     unrelatedDirectory: unrelated.path,
@@ -108,6 +109,7 @@ test.beforeAll(async () => {
     worktreeDirectory,
     unrelatedDirectory: unrelated.path,
     importSessionId,
+    importSessionTimestamp,
     repoCleanup: repo.cleanup,
     unrelatedCleanup: unrelated.cleanup,
   };
@@ -122,17 +124,29 @@ test.afterAll(async () => {
   await rm(claudeConfigDirectory, { recursive: true, force: true });
 });
 
+test("an open Import Session row keeps its age current", async ({ page }) => {
+  await page.clock.install({ time: scenario.importSessionTimestamp + 60_000 });
+  const flow = new ImportSessionFlow(page);
+  await flow.openWorkspace(scenario.project.workspaceId, { width: 390, height: 844 });
+  await flow.openGlobally();
+
+  const row = page.getByTestId(`import-session-session-claude-${scenario.importSessionId}`);
+  await expect(row).toContainText("1m ago");
+  await page.clock.fastForward("03:00");
+  await expect(row).toContainText("4m ago");
+});
+
 test("captures the compact import-session journey", async ({ page }, testInfo) => {
   const flow = new ImportSessionFlow(page);
   await flow.openWorkspace(scenario.project.workspaceId, { width: 390, height: 844 });
 
-  await test.step("the mobile sidebar exposes import in its footer", async () => {
-    await flow.revealMobileEntryPoint();
-    await capture(page, testInfo, "01-mobile-sidebar-footer.png");
+  await test.step("the new workspace screen offers import at the top", async () => {
+    await flow.revealNewWorkspaceEntryPoint();
+    await capture(page, testInfo, "01-mobile-new-workspace-import.png");
   });
 
   await test.step("the host-wide sheet is newest first and fits its provider filter", async () => {
-    await flow.openGlobally();
+    await flow.openFromNewWorkspace();
     await flow.expectScope("Sessions on", false);
     await flow.expectRows({
       first: [scenario.importSessionId, "fixture-worktree", "fixture-unrelated"],
@@ -225,7 +239,7 @@ async function seedClaudeSessions(input: {
   worktreeDirectory: string;
   unrelatedDirectory: string;
   importSessionId: string;
-}): Promise<void> {
+}): Promise<number> {
   const sessions = [
     {
       cwd: input.projectRoot,
@@ -290,4 +304,5 @@ async function seedClaudeSessions(input: {
     const timestamp = new Date(newest - index * 60_000);
     await utimes(sessionPath, timestamp, timestamp);
   }
+  return newest;
 }
diff --git a/packages/app/e2e/browser/keyboard-chord-modifier-step.spec.ts b/packages/app/e2e/browser/keyboard-chord-modifier-step.spec.ts
new file mode 100644
index 0000000000..7d55e4768b
--- /dev/null
+++ b/packages/app/e2e/browser/keyboard-chord-modifier-step.spec.ts
@@ -0,0 +1,44 @@
+import type { Page } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+
+// Where Settings → Keyboard shortcuts persists a rebound shortcut.
+const OVERRIDE_STORAGE_KEY = "@paseo:keyboard-shortcut-overrides";
+const COMMAND_CENTER_BINDING = "command-center-toggle-ctrl-k-non-mac";
+
+async function rebindCommandCenter(page: Page, combo: string): Promise<void> {
+  await page.addInitScript(
+    ([key, bindingId, value]) => {
+      window.localStorage.setItem(key, JSON.stringify({ [bindingId]: value }));
+    },
+    [OVERRIDE_STORAGE_KEY, COMMAND_CENTER_BINDING, combo] as const,
+  );
+  await gotoAppShell(page);
+  await expect(page.getByTestId("sidebar-search")).toBeVisible({ timeout: 30_000 });
+}
+
+async function expectCommandCenterOpen(page: Page): Promise<void> {
+  await expect(page.getByTestId("command-center-panel")).toBeVisible({ timeout: 10_000 });
+}
+
+test.describe("Multi-step shortcut", () => {
+  test("completes a chord whose second step is a bare key", async ({ page }) => {
+    await rebindCommandCenter(page, "Ctrl+K J");
+
+    await page.keyboard.press("Control+k");
+    await page.keyboard.press("j");
+
+    await expectCommandCenterOpen(page);
+  });
+
+  // Releasing Ctrl between the steps makes the browser emit a bare `Control`
+  // keydown before `Ctrl+J`, which used to reset the chord to its first step.
+  test("completes a chord whose second step carries a modifier", async ({ page }) => {
+    await rebindCommandCenter(page, "Ctrl+K Ctrl+J");
+
+    await page.keyboard.press("Control+k");
+    await page.keyboard.press("Control+j");
+
+    await expectCommandCenterOpen(page);
+  });
+});
diff --git a/packages/app/e2e/browser/keyboard-shortcut-sequence.spec.ts b/packages/app/e2e/browser/keyboard-shortcut-sequence.spec.ts
new file mode 100644
index 0000000000..fd24e1d63c
--- /dev/null
+++ b/packages/app/e2e/browser/keyboard-shortcut-sequence.spec.ts
@@ -0,0 +1,65 @@
+import { expect, test, type Page } from "../support/fixtures";
+
+// "Toggle command center" recorded as a two-key sequence. Both platform
+// bindings are overridden so the spec does not depend on the host OS.
+const COMMAND_CENTER_SEQUENCE = {
+  "command-center-toggle-cmd-k-mac": "Cmd+K J",
+  "command-center-toggle-ctrl-k-non-mac": "Ctrl+K J",
+};
+
+const SEQUENCE_PREFIX = process.platform === "darwin" ? "Meta+K" : "Control+K";
+const SEQUENCE_FINAL_KEY = "j";
+
+/** Record the sequence in Settings → Keyboard shortcuts, through its storage. */
+async function recordCommandCenterSequence(page: Page): Promise<void> {
+  await page.addInitScript((overrides) => {
+    localStorage.setItem("@paseo:keyboard-shortcut-overrides", JSON.stringify(overrides));
+  }, COMMAND_CENTER_SEQUENCE);
+}
+
+/**
+ * Resize the window and let the app render again, so the resize lands between
+ * the two keys of the sequence rather than after them.
+ */
+async function resizeWindowAndSettle(page: Page, width: number): Promise<void> {
+  await page.setViewportSize({ width, height: 800 });
+  await page.waitForFunction((expected) => window.innerWidth === expected, width);
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+      }),
+  );
+}
+
+async function expectCommandCenterOpen(page: Page): Promise<void> {
+  await expect(page.getByTestId("command-center-panel")).toBeVisible({ timeout: 30_000 });
+}
+
+test.describe("Multi-key shortcut sequences", () => {
+  test("a recorded sequence opens the command center", async ({ page, withWorkspace }) => {
+    await recordCommandCenterSequence(page);
+    const workspace = await withWorkspace({ prefix: "shortcut-sequence-" });
+    await workspace.navigateTo();
+
+    await page.keyboard.press(SEQUENCE_PREFIX);
+    await page.keyboard.press(SEQUENCE_FINAL_KEY);
+
+    await expectCommandCenterOpen(page);
+  });
+
+  test("a sequence completes when the window resizes between its keys", async ({
+    page,
+    withWorkspace,
+  }) => {
+    await recordCommandCenterSequence(page);
+    const workspace = await withWorkspace({ prefix: "shortcut-sequence-resize-" });
+    await workspace.navigateTo();
+
+    await page.keyboard.press(SEQUENCE_PREFIX);
+    await resizeWindowAndSettle(page, 1100);
+    await page.keyboard.press(SEQUENCE_FINAL_KEY);
+
+    await expectCommandCenterOpen(page);
+  });
+});
diff --git a/packages/app/e2e/browser/launcher-tab.spec.ts b/packages/app/e2e/browser/launcher-tab.spec.ts
index 9e2dc9de57..e9d43ced27 100644
--- a/packages/app/e2e/browser/launcher-tab.spec.ts
+++ b/packages/app/e2e/browser/launcher-tab.spec.ts
@@ -13,17 +13,13 @@ import {
   pressNewTabShortcut,
   pressDirectNewTabShortcut,
   getTabTestIds,
-  waitForTabWithTitle,
   measureTileTransition,
   sampleTabsDuringTransition,
   expectTabTitleFits,
   terminalSurfaceLocator,
 } from "../support/helpers/launcher";
 import { expectComposerVisible, composerLocator } from "../support/helpers/composer";
-import {
-  expectTerminalSurfaceVisible,
-  setupDeterministicPrompt,
-} from "../support/helpers/terminal-perf";
+import { expectTerminalSurfaceVisible } from "../support/helpers/terminal-perf";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
   expectTerminalOutputContains,
@@ -43,7 +39,7 @@ const EMPTY_PROMPT_PROFILE: TerminalProfile = {
   id: "e2e-empty-prompt",
   name: "Empty Prompt",
   command: "/bin/sh",
-  args: ["-c", 'echo prompt-args: "$#"; sleep 10', "profile-name", "{{{prompt}}}"],
+  args: ["-c", 'echo prompt-args: "$#"; exec cat', "profile-name", "{{{prompt}}}"],
 };
 
 async function tabTestIds(tabs: Locator): Promise<(string | null)[]> {
@@ -126,47 +122,40 @@ test.describe("Tab creation", () => {
     await expect.poll(() => countTabsOfKind(page, "new_tab")).toBe(newTabCountBefore);
   });
 
-  test("Cmd+T creates a New tab without creating an agent", async ({ page }) => {
+  test("opens the menu, then creates independent New tabs without creating agents", async ({
+    page,
+  }) => {
     await gotoWorkspace(page, workspace.workspaceId);
-    const countBefore = await countTabsOfKind(page, "draft");
-
-    await openNewTabMenuWithShortcut(page);
-
-    await expect.poll(() => countTabsOfKind(page, "draft")).toBe(countBefore);
-    await expect(
-      page.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
-    ).toBeVisible();
-  });
-
-  test("clicking + opens its menu without creating a New tab", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-    const countBefore = await countTabsOfKind(page, "new_tab");
-
-    await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
-
-    await expect(
-      page.getByTestId("workspace-new-tab-menu").filter({ visible: true }),
-    ).toBeVisible();
-    await expect.poll(() => countTabsOfKind(page, "new_tab")).toBe(countBefore);
-  });
-
-  test("opening two New tabs creates two independent tab identities", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-
+    await pressNewTabShortcut(page);
     const newTabs = page
       .locator('[data-testid^="workspace-tab-tab_"]')
       .filter({ hasText: "New tab" });
+    await expect(newTabs.first()).toBeVisible();
     const countBefore = await newTabs.count();
+    const draftCount = await countTabsOfKind(page, "draft");
 
-    await pressNewTabShortcut(page);
-    await expect(newTabs).toHaveCount(countBefore + 1);
-    const firstIds = await tabTestIds(newTabs);
-
-    await pressNewTabShortcut(page);
-    await expect(newTabs).toHaveCount(countBefore + 2);
-    const ids = await tabTestIds(newTabs);
-    expect(new Set(ids).size).toBe(ids.length);
-    expect(ids.filter((id) => !firstIds.includes(id))).toHaveLength(1);
+    await test.step("opening the plus menu leaves the current tabs intact", async () => {
+      await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
+      await expect(
+        page.getByTestId("workspace-new-tab-menu").filter({ visible: true }),
+      ).toBeVisible();
+      await expect(newTabs).toHaveCount(countBefore);
+      await page.keyboard.press("Escape");
+    });
+    await test.step("two shortcuts open two independent launchers", async () => {
+      await pressNewTabShortcut(page);
+      await expect(newTabs).toHaveCount(countBefore + 1);
+      const firstIds = await tabTestIds(newTabs);
+      await pressNewTabShortcut(page);
+      await expect(newTabs).toHaveCount(countBefore + 2);
+      const ids = await tabTestIds(newTabs);
+      expect(new Set(ids).size).toBe(ids.length);
+      expect(ids).toEqual(expect.arrayContaining(firstIds));
+      expect(await countTabsOfKind(page, "draft")).toBe(draftCount);
+      await expect(
+        page.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
+      ).toBeVisible();
+    });
   });
 
   test("New tab exposes shortcuts and supports arrow navigation after refocus", async ({
@@ -261,116 +250,58 @@ test.describe("Tab creation", () => {
     await expect(page).toHaveURL(/\/settings\/hosts\/[^/]+\/terminals$/);
   });
 
+  test("Cursor CLI profile uses the Cursor icon in New tab and host settings", async ({ page }) => {
+    const guessed: TerminalProfile = {
+      id: "e2e-cursor-guessed",
+      name: "Cursor guessed",
+      command: "cursor-agent",
+      args: ["{{{prompt}}}"],
+    };
+    const explicit: TerminalProfile = {
+      ...guessed,
+      id: "e2e-cursor-explicit",
+      name: "Cursor explicit",
+      icon: "cursor",
+    };
+    const profileSeed = await seedTerminalProfiles([guessed, explicit]);
+
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
+
+      const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
+      const menuIconPath = (name: string) =>
+        menu
+          .getByRole("menuitem", { name })
+          .evaluate((element) => element.querySelector("svg path")?.getAttribute("d") ?? null);
+      const guessedMenuPath = await menuIconPath(guessed.name);
+      const explicitMenuPath = await menuIconPath(explicit.name);
+
+      await menu.getByTestId("workspace-new-tab-menu-edit-terminal-profiles").click();
+      await expect(page).toHaveURL(/\/settings\/hosts\/[^/]+\/terminals$/);
+
+      const settingsIconPath = (id: string) =>
+        page
+          .getByTestId(`terminal-profile-row-${id}`)
+          .evaluate((element) => element.querySelector("svg path")?.getAttribute("d") ?? null);
+      const guessedSettingsPath = await settingsIconPath(guessed.id);
+      const explicitSettingsPath = await settingsIconPath(explicit.id);
+
+      expect(explicitMenuPath).not.toBeNull();
+      expect(explicitSettingsPath).not.toBeNull();
+      expect.soft(guessedMenuPath, "New tab Cursor profile icon").toBe(explicitMenuPath);
+      expect.soft(guessedSettingsPath, "Settings Cursor profile icon").toBe(explicitSettingsPath);
+    } finally {
+      await profileSeed.restore();
+    }
+  });
+
   test("tab bar shows action buttons per pane", async ({ page }) => {
     await gotoWorkspace(page, workspace.workspaceId);
     await assertSingleNewTabButton(page);
     await assertNewChatTileVisible(page);
     await assertNewTabMenuTriggerVisible(page);
   });
-
-  test("never shades the New tab button", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-
-    const tabRow = page.getByTestId("workspace-tabs-row").filter({ visible: true }).first();
-    const scrollArea = tabRow.getByTestId("workspace-tabs-scroll");
-    const newTabButtonInScroll = await scrollArea.getByTestId("workspace-new-tab-button").count();
-    const scrollShades = await tabRow
-      .locator('[data-testid^="workspace-tabs-scroll-shade-"]')
-      .count();
-
-    expect(newTabButtonInScroll === 0 || scrollShades === 0).toBe(true);
-    await expect(tabRow.getByTestId("workspace-new-tab-button")).toBeVisible();
-  });
-});
-
-// ═══════════════════════════════════════════════════════════════════════════
-// Terminal Title Tests
-// ═══════════════════════════════════════════════════════════════════════════
-
-test.describe("Terminal title propagation", () => {
-  // OSC title escape sequence propagation is inherently flaky — the terminal
-  // must process the sequence, emit a title change event, and the tab bar
-  // must re-render before the assertion deadline. Allow retries.
-  test.describe.configure({ retries: 2 });
-
-  test.skip("terminal tab title updates from OSC title escape sequence", async ({ page }) => {
-    test.setTimeout(60_000);
-
-    const result = await workspace.client.createTerminal(
-      workspace.repoPath,
-      "title-test",
-      undefined,
-      {
-        workspaceId: workspace.workspaceId,
-      },
-    );
-    if (!result.terminal) throw new Error(`Failed to create terminal: ${result.error}`);
-    const terminalId = result.terminal.id;
-
-    try {
-      // Navigate to workspace and open a terminal
-      await gotoWorkspace(page, workspace.workspaceId);
-      await clickNewTerminal(page);
-
-      await expectTerminalSurfaceVisible(page);
-      await terminalSurfaceLocator(page).click();
-
-      await setupDeterministicPrompt(page);
-
-      // Send OSC 0 (set window title) escape sequence
-      const testTitle = `E2E-Title-${Date.now()}`;
-      await terminalSurfaceLocator(page).pressSequentially(`printf '\\033]0;${testTitle}\\007'\n`, {
-        delay: 0,
-      });
-
-      // Wait for the tab to reflect the new title
-      await waitForTabWithTitle(page, testTitle, 15_000);
-    } finally {
-      await workspace.client.killTerminal(terminalId).catch(() => {});
-    }
-  });
-
-  test.skip("title debouncing coalesces rapid changes", async ({ page }) => {
-    test.setTimeout(60_000);
-
-    const result = await workspace.client.createTerminal(
-      workspace.repoPath,
-      "debounce-test",
-      undefined,
-      {
-        workspaceId: workspace.workspaceId,
-      },
-    );
-    if (!result.terminal) throw new Error(`Failed to create terminal: ${result.error}`);
-    const terminalId = result.terminal.id;
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await clickNewTerminal(page);
-
-      await expectTerminalSurfaceVisible(page);
-      await terminalSurfaceLocator(page).click();
-
-      await setupDeterministicPrompt(page);
-
-      // Fire many rapid title changes — only the last should stick
-      const finalTitle = `Final-${Date.now()}`;
-      for (let i = 0; i < 5; i++) {
-        await terminalSurfaceLocator(page).pressSequentially(`printf '\\033]0;Rapid-${i}\\007'\n`, {
-          delay: 0,
-        });
-      }
-      await terminalSurfaceLocator(page).pressSequentially(
-        `printf '\\033]0;${finalTitle}\\007'\n`,
-        { delay: 0 },
-      );
-
-      // The tab should eventually settle on the final title
-      await waitForTabWithTitle(page, finalTitle, 15_000);
-    } finally {
-      await workspace.client.killTerminal(terminalId).catch(() => {});
-    }
-  });
 });
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -406,7 +337,7 @@ test.describe("Tab transitions (no flash)", () => {
 
     expect(counts.every((count) => count === initialCount)).toBe(true);
     expect(new Set(snapshots.map(tabIdentityKey)).size).toBeLessThanOrEqual(2);
-    await expectTabTitleFits(page, "New Agent", { min: 96, max: 160 });
+    await expectTabTitleFits(page, "New Agent", { min: 64, max: 160 });
   });
 
   test("Terminal transition completes within visual budget", async ({ page }) => {
diff --git a/packages/app/e2e/browser/model-search-across-providers.spec.ts b/packages/app/e2e/browser/model-search-across-providers.spec.ts
index 4a4ab31ea2..c09de28199 100644
--- a/packages/app/e2e/browser/model-search-across-providers.spec.ts
+++ b/packages/app/e2e/browser/model-search-across-providers.spec.ts
@@ -1,4 +1,7 @@
-import { test } from "../support/fixtures";
+import path from "node:path";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { test, expect, type Page } from "../support/fixtures";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
 import {
   closeModelPicker,
   expectModelSearchEmptyState,
@@ -15,7 +18,7 @@ import {
   expectSearchResultsVirtualized,
 } from "../support/helpers/agent-profiles";
 import { expectComposerVisible } from "../support/helpers/composer";
-import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { clickNewChat, clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 
 const MOCK_PROVIDER_LABEL = "Mock Load Test";
@@ -158,3 +161,111 @@ test.describe("Cross-provider model search", () => {
     }
   });
 });
+
+async function setRuntimeCatalog(client: DaemonClient, count: number, cwd: string) {
+  await client.patchDaemonConfig({
+    providers: {
+      gemini: {
+        extends: "acp",
+        label: "Catalog provider",
+        enabled: true,
+        command: [
+          process.execPath,
+          path.resolve(__dirname, "../support/fixtures/catalog-acp.cjs"),
+          String(count),
+        ],
+      },
+    },
+  });
+  await expect
+    .poll(
+      async () =>
+        (await client.getProvidersSnapshot({ cwd })).entries.find(
+          (entry) => entry.provider === "gemini",
+        )?.status,
+      { timeout: 30_000 },
+    )
+    .toBe("ready");
+}
+async function reloadSavedDraft(page: Page) {
+  await page.evaluate(() =>
+    localStorage.setItem(
+      "@paseo:e2e-disable-default-seed-once",
+      localStorage.getItem("@paseo:e2e-seed-nonce")!,
+    ),
+  );
+  await page.reload();
+  await expectComposerVisible(page);
+}
+async function expectOneCatalogChoice(page: Page, label: string) {
+  await openModelPicker(page);
+  await page.getByRole("button", { name: "Back", exact: true }).click();
+  await searchAllModels(page, label);
+  await expect(page.getByTestId("model-row-gemini-gemini-3.5-flash")).toHaveCount(1);
+  await closeModelPicker(page);
+}
+
+async function configureModelOverride(client: DaemonClient, cwd: string) {
+  await client.patchDaemonConfig({
+    providers: {
+      gemini: {
+        additionalModels: [{ id: "gemini-3.5-flash", label: "Configured model", isDefault: true }],
+      },
+    },
+  });
+  await expect
+    .poll(
+      async () =>
+        (await client.getProvidersSnapshot({ cwd: cwd })).entries.find(
+          (entry) => entry.provider === "gemini",
+        )?.models,
+      { timeout: 30_000 },
+    )
+    .toMatchObject([{ id: "gemini-3.5-flash", label: "Configured model", isDefault: true }]);
+}
+
+const catalogTest = test.extend<{ catalogClient: DaemonClient }>({
+  catalogClient: async ({ e2eWorker }, provide) => {
+    void e2eWorker;
+    const client = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "catalog-models" });
+    try {
+      await provide(client);
+    } finally {
+      try {
+        await client.patchDaemonConfig({ removeProviders: ["gemini"] });
+      } finally {
+        await client.close();
+      }
+    }
+  },
+});
+
+catalogTest(
+  "New Agent and saved drafts stay usable with repeated runtime model rows",
+  async ({ page, withWorkspace, catalogClient: client }, testInfo) => {
+    const workspace = await withWorkspace({ prefix: "catalog-models-" });
+    await test.step("open a draft with a one-row runtime catalog", async () => {
+      await setRuntimeCatalog(client, 1, workspace.repoPath);
+      await gotoWorkspace(page, workspace.workspaceId);
+      await clickNewChat(page);
+      await expectComposerVisible(page);
+    });
+    await test.step("open New Agent after the provider publishes repeated model rows", async () => {
+      await clickNewTerminal(page);
+      await setRuntimeCatalog(client, 2, workspace.repoPath);
+      await clickNewChat(page);
+      await expectComposerVisible(page);
+      await expectOneCatalogChoice(page, "Gemini 3.5 Flash");
+      await page.screenshot({ path: testInfo.outputPath("duplicate-catalog-draft.png") });
+    });
+    await test.step("reopen the saved draft with the same catalog", async () => {
+      await reloadSavedDraft(page);
+      await expectOneCatalogChoice(page, "Gemini 3.5 Flash");
+    });
+    await test.step("retain configured model overrides when runtime IDs repeat", async () => {
+      await configureModelOverride(client, workspace.repoPath);
+      await reloadSavedDraft(page);
+      await expectOneCatalogChoice(page, "Configured model");
+    });
+  },
+);
diff --git a/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts b/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts
index ddd415ed97..956340db74 100644
--- a/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts
@@ -1,7 +1,10 @@
-import { expect, test, type Page } from "../support/fixtures";
+import { expect, type Page } from "../support/fixtures";
+import { test } from "../support/creation-fixtures";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
 import type { FormPreferences } from "@/create-agent-preferences/preferences";
 import { gotoAppShell } from "../support/helpers/app";
-import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { captureWorkspaceAgentRequest } from "../support/helpers/creation";
 import { openAgentRoute } from "../support/helpers/mock-agent";
 import {
   openGlobalNewWorkspaceComposer,
@@ -15,64 +18,52 @@ import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
 
 const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";
 
-type WebSocketMessage = string | Buffer;
-
-interface CreateAgentRequestMessage {
-  type: "create_agent_request";
-  config?: {
-    provider?: unknown;
-    modeId?: unknown;
-  };
-}
-
-function parseWebSocketJson(message: WebSocketMessage): unknown {
-  const rawMessage = typeof message === "string" ? message : message.toString("utf8");
+async function seedCodexDefaultPermissionPreferences(page: Page, cwd: string): Promise<string> {
+  const client = await connectDaemonClient<DaemonClient>({
+    clientIdPrefix: "codex-mode-preferences",
+  });
   try {
-    return JSON.parse(rawMessage);
-  } catch {
-    return null;
-  }
-}
-
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseWebSocketJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
-    return null;
-  }
-  if (typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
-async function seedCodexDefaultPermissionPreferences(page: Page): Promise<void> {
-  await page.addInitScript(
-    ({ preferencesKey }) => {
-      localStorage.setItem(
-        preferencesKey,
-        JSON.stringify({
-          provider: "codex",
-          providerPreferences: {
-            codex: {
-              model: "gpt-5.4-mini",
-              mode: "auto",
-              thinkingByModel: {
-                "gpt-5.4-mini": "low",
+    await expect
+      .poll(
+        async () =>
+          (await client.getProvidersSnapshot({ cwd })).entries.find(
+            (entry) => entry.provider === "codex",
+          )?.status,
+      )
+      .toBe("ready");
+    const snapshot = await client.getProvidersSnapshot({ cwd });
+    const model = snapshot.entries
+      .find((entry) => entry.provider === "codex")
+      ?.models?.find((candidate) => candidate.thinkingOptions?.length);
+    if (!model?.thinkingOptions?.[0])
+      throw new Error("Codex catalogue must expose a model with thinking options");
+    await page.addInitScript(
+      ({ preferencesKey, modelId, thinkingOptionId }) => {
+        localStorage.setItem(
+          preferencesKey,
+          JSON.stringify({
+            provider: "codex",
+            providerPreferences: {
+              codex: {
+                model: modelId,
+                mode: "auto",
+                thinkingByModel: { [modelId]: thinkingOptionId },
               },
+              mock: { model: "ten-second-stream" },
             },
-            mock: {
-              model: "ten-second-stream",
-            },
-          },
-        } satisfies FormPreferences),
-      );
-    },
-    { preferencesKey: CREATE_AGENT_PREFERENCES_KEY },
-  );
+          } satisfies FormPreferences),
+        );
+      },
+      {
+        preferencesKey: CREATE_AGENT_PREFERENCES_KEY,
+        modelId: model.id,
+        thinkingOptionId: model.thinkingOptions[0].id,
+      },
+    );
+    return model.id;
+  } finally {
+    await client.close();
+  }
 }
 
 async function readCodexModePreference(page: Page): Promise<unknown> {
@@ -118,47 +109,17 @@ async function expectThinkingOptionsFit(page: Page): Promise<void> {
   await expect(page.getByTestId("combobox-desktop-container")).toHaveCount(0, { timeout: 5_000 });
 }
 
-async function recordAndBlockCreateAgentRequests(page: Page): Promise<{
-  waitForCreateAgentRequest(): Promise<CreateAgentRequestMessage>;
-}> {
-  let resolveRequest: ((message: CreateAgentRequestMessage) => void) | null = null;
-  const createAgentSeen = new Promise<CreateAgentRequestMessage>((resolve) => {
-    resolveRequest = resolve;
-  });
-
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-
-    ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (sessionMessage?.type === "create_agent_request") {
-        resolveRequest?.(sessionMessage as unknown as CreateAgentRequestMessage);
-        return;
-      }
-      server.send(message);
-    });
-
-    server.onMessage((message) => {
-      ws.send(message);
-    });
-  });
-
-  return {
-    waitForCreateAgentRequest: () => createAgentSeen,
-  };
-}
-
 test.describe("New workspace Codex mode preferences", () => {
   test.describe.configure({ timeout: 240_000 });
 
   test("keeps Full Access as the global Codex mode after the workspace draft auto-submit handoff", async ({
     page,
+    startup,
   }) => {
     const seeded = await seedWorkspace({ repoPrefix: "codex-mode-preferences-" });
-    const createAgentRecorder = await recordAndBlockCreateAgentRequests(page);
-    await seedCodexDefaultPermissionPreferences(page);
-
+    const createAgentRecorder = await captureWorkspaceAgentRequest(page, { block: false });
     try {
+      await seedCodexDefaultPermissionPreferences(page, seeded.repoPath);
       await gotoAppShell(page);
       await waitForSidebarHydration(page);
       await openGlobalNewWorkspaceComposer(page);
@@ -177,8 +138,12 @@ test.describe("New workspace Codex mode preferences", () => {
       ).toBeVisible();
 
       await submitNewWorkspacePrompt(page, "Keep Codex full access selected globally.");
-      const createAgentRequest = await createAgentRecorder.waitForCreateAgentRequest();
+      const createAgentRequest = await createAgentRecorder.waitForRequest();
 
+      await expect(page).toHaveURL(/\/workspace\//);
+      await expect(
+        page.getByText("Keep Codex full access selected globally.", { exact: true }).first(),
+      ).toBeVisible();
       expect(createAgentRequest.config).toMatchObject({
         provider: "codex",
         modeId: "full-access",
@@ -186,6 +151,8 @@ test.describe("New workspace Codex mode preferences", () => {
       await expect
         .poll(() => readCodexModePreference(page), { timeout: 10_000 })
         .toBe("full-access");
+      await startup.fail();
+      await expect(page.getByText(/Creation startup failed for test/).first()).toBeVisible();
     } finally {
       await seeded.cleanup();
     }
@@ -193,16 +160,15 @@ test.describe("New workspace Codex mode preferences", () => {
 
   test("uses the live Codex agent mode as the next New Workspace default", async ({ page }) => {
     const seeded = await seedWorkspace({ repoPrefix: "codex-live-mode-preferences-" });
-    await seedCodexDefaultPermissionPreferences(page);
-
     try {
+      const model = await seedCodexDefaultPermissionPreferences(page, seeded.repoPath);
       const agent = await seeded.client.createAgent({
         provider: "codex",
         cwd: seeded.repoPath,
         workspaceId: seeded.workspaceId,
         title: "Codex live mode preference e2e",
         modeId: "auto",
-        model: "gpt-5.4-mini",
+        model,
       });
 
       await openAgentRoute(page, {
diff --git a/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts b/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
index d4444d6f22..22b2b8a6c5 100644
--- a/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
@@ -6,6 +6,15 @@ import {
   selectWorkspaceIsolation,
 } from "../support/helpers/new-workspace";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  composerLocator,
+  expectComposerVisible,
+  fillComposerDraft,
+  enterComposerFullscreen,
+  resizeComposerViewport,
+  expectComposerFullscreenControls,
+} from "../support/helpers/composer";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
 
 type WebSocketMessage = string | Buffer;
@@ -196,3 +205,52 @@ test.describe("New Workspace dictation submit", () => {
     }
   });
 });
+
+async function startDictationWithShortcut(page: Page): Promise<void> {
+  await composerLocator(page).press("Control+d");
+}
+
+test("dictation shortcut leaves retained fullscreen and exposes recording controls", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "fullscreen-dictation-",
+    title: "Fullscreen dictation shortcut",
+  });
+  await installSyntheticMicrophone(page);
+  const harness = await installDictationFailureHarness(page);
+  const draft = "First line\nSecond line\nThird line";
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await fillComposerDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await resizeComposerViewport(page, "landscape");
+    await expectComposerFullscreenControls(page);
+    await startDictationWithShortcut(page);
+    await harness.waitForAudio();
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await expect(page.getByRole("button", { name: "Cancel dictation", exact: true })).toBeVisible();
+    await expect(
+      page.getByRole("button", { name: "Insert transcription", exact: true }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole("button", { name: "Insert transcription and send", exact: true }),
+    ).toBeVisible();
+    await page.getByRole("button", { name: "Cancel dictation", exact: true }).click();
+    await expect(composerLocator(page)).toBeEditable();
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await resizeComposerViewport(page, "portrait");
+    await enterComposerFullscreen(page);
+    await resizeComposerViewport(page, "landscape");
+    await composerLocator(page).press("Control+Shift+d");
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await expect(
+      page.getByText("Realtime voice is disabled in this test.", { exact: true }),
+    ).toBeVisible();
+    await expect(composerLocator(page)).toHaveValue(draft);
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/new-workspace-launch-memory.spec.ts b/packages/app/e2e/browser/new-workspace-launch-memory.spec.ts
index 39b734d4f9..f2ee89c12f 100644
--- a/packages/app/e2e/browser/new-workspace-launch-memory.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-launch-memory.spec.ts
@@ -21,13 +21,13 @@ import {
   type TerminalProfileSeed,
 } from "../support/helpers/new-workspace-launch";
 
-// `sleep` keeps the terminal alive long enough for the UI to attach and
-// render output before the process exits — see new-workspace-launch-terminal.spec.ts.
+// Wait for input until project cleanup kills the terminal. A fixed lifetime
+// can expire before a busy browser attaches or finishes revisiting the composer.
 const PROMPT_PROFILE: TerminalProfile = {
   id: "e2e-memory-profile",
   name: "Memory Profile",
   command: "/bin/sh",
-  args: ["-c", 'echo remembered: "$0"; sleep 10', "{{{prompt}}}"],
+  args: ["-c", 'echo remembered: "$0"; exec cat', "{{{prompt}}}"],
 };
 
 function hasLeftNewWorkspaceRoute(url: URL): boolean {
diff --git a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
index dd249cb03a..a4fbd15edf 100644
--- a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
@@ -9,13 +9,12 @@ import {
   expectTerminalPreviewCommand,
   expectWorkspaceOpensWithTerminalTab,
   fillTerminalPrompt,
-  seedTerminalProfiles,
+  launchTrigger,
   selectLaunchOption,
   submitTerminalLaunch,
   terminalLaunchSubmit,
   terminalPromptInput,
   type TerminalProfile,
-  type TerminalProfileSeed,
 } from "../support/helpers/new-workspace-launch";
 
 // Someone who wants a terminal agent instead of a chat: they pick a profile
@@ -25,14 +24,13 @@ import {
 //
 // The sentinel becomes `$0` (a positional shell parameter, not string
 // interpolation into the script source), so the prompt reaches the process
-// exactly as typed with no injection risk. `sleep` keeps the terminal alive
-// long enough for the UI to attach and render the output before it exits —
-// a bare `echo` exits before the frontend subscribes to its output.
+// exactly as typed with no injection risk. `cat` waits for input until project
+// cleanup kills the terminal, so attachment does not race a fixed process lifetime.
 const PROMPT_PROFILE: TerminalProfile = {
   id: "e2e-echo-prompt",
   name: "Echo Prompt",
   command: "/bin/sh",
-  args: ["-c", 'echo captured: "$0"; sleep 10', "{{{prompt}}}"],
+  args: ["-c", 'echo captured: "$0"; exec cat', "{{{prompt}}}"],
 };
 
 // No sentinel anywhere: takes no prompt, composer goes read-only.
@@ -40,20 +38,21 @@ const BARE_PROFILE: TerminalProfile = {
   id: "e2e-echo-bare",
   name: "Bare Echo",
   command: "/bin/sh",
-  args: ["-c", "echo bare-launch-static-line; sleep 10"],
+  args: ["-c", "echo bare-launch-static-line; exec cat"],
 };
 
+test.use({
+  e2eDaemonConfig: { version: 1, daemon: { terminalProfiles: [PROMPT_PROFILE, BARE_PROFILE] } },
+});
+
 test.describe("New workspace: launching a terminal", () => {
   let workspace: SeededWorkspace;
-  let profileSeed: TerminalProfileSeed;
 
   test.beforeEach(async () => {
     workspace = await seedWorkspace({ repoPrefix: "launch-terminal-" });
-    profileSeed = await seedTerminalProfiles([PROMPT_PROFILE, BARE_PROFILE]);
   });
 
   test.afterEach(async () => {
-    await profileSeed.restore();
     await workspace?.cleanup();
   });
 
@@ -88,7 +87,7 @@ test.describe("New workspace: launching a terminal", () => {
       });
       await selectLaunchOption(page, BARE_PROFILE.id);
       await expect(terminalPromptInput(page)).toHaveCount(0);
-      await expectTerminalPreviewCommand(page, "/bin/sh -c echo bare-launch-static-line; sleep 10");
+      await expectTerminalPreviewCommand(page, "/bin/sh -c echo bare-launch-static-line; exec cat");
       await expect(terminalLaunchSubmit(page)).toHaveText("Launch");
     });
 
@@ -98,4 +97,51 @@ test.describe("New workspace: launching a terminal", () => {
       await expectTerminalOutputContains(page, "bare-launch-static-line");
     });
   });
+
+  test("switching terminal profiles restores the prompt and its fullscreen affordance", async ({
+    page,
+  }) => {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openNewWorkspaceComposer(page, {
+      projectKey: workspace.projectKey,
+      projectDisplayName: workspace.projectDisplayName,
+    });
+    await page.setViewportSize({ width: 390, height: 844 });
+    const prompt = "First replacement line\nSecond replacement line\nThird replacement line";
+    const selectProfile = async (profile: TerminalProfile) => {
+      await launchTrigger(page).click();
+      const option = page.getByRole("menuitem").filter({ hasText: profile.name });
+      await option.click();
+      await expect(option).not.toBeVisible();
+    };
+    const fullscreen = page.getByRole("button", { name: "Fullscreen", exact: true });
+
+    await test.step("restore a multiline prompt after a read-only profile", async () => {
+      await selectProfile(PROMPT_PROFILE);
+      await fillTerminalPrompt(page, prompt);
+      await expect(fullscreen).toBeVisible();
+      await selectProfile(BARE_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveCount(0);
+      await selectProfile(PROMPT_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveValue(prompt);
+      await expect(fullscreen).toBeVisible();
+    });
+
+    await test.step("restore the locally edited prompt and measure subsequent typing", async () => {
+      await fillTerminalPrompt(page, "Short draft");
+      await expect(fullscreen).toHaveCount(0);
+      await selectProfile(BARE_PROFILE);
+      await selectProfile(PROMPT_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveValue("Short draft");
+      await expect(fullscreen).toHaveCount(0);
+      await terminalPromptInput(page).press("End");
+      await terminalPromptInput(page).press("Shift+Enter");
+      await terminalPromptInput(page).pressSequentially("Second");
+      await terminalPromptInput(page).press("Shift+Enter");
+      await terminalPromptInput(page).pressSequentially("Third");
+      await expect(terminalPromptInput(page)).toHaveValue("Short draft\nSecond\nThird");
+      await expect(fullscreen).toBeVisible();
+    });
+  });
 });
diff --git a/packages/app/e2e/browser/new-workspace-model-memory.real.spec.ts b/packages/app/e2e/browser/new-workspace-model-memory.real.spec.ts
new file mode 100644
index 0000000000..39a0c9c495
--- /dev/null
+++ b/packages/app/e2e/browser/new-workspace-model-memory.real.spec.ts
@@ -0,0 +1,69 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { test, expect } from "../support/fixtures";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  chooseModel,
+  reselectModel,
+  startWithoutRememberedModel,
+  expectCreatedModelAgents,
+  expectRememberedModel,
+  expectSavedSelection,
+} from "../support/helpers/model-memory";
+import {
+  openGlobalNewWorkspaceComposer,
+  submitNewWorkspacePrompt,
+} from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+
+test("remembers real Codex GPT-6 Astra after repeated successful workspace creation", async ({
+  page,
+}) => {
+  test.setTimeout(180_000);
+  const workspace = await seedWorkspace({ repoPrefix: "codex-astra-memory-" });
+  const client = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "codex-astra-memory" });
+  try {
+    await expect
+      .poll(
+        async () =>
+          (await client.getProvidersSnapshot({ cwd: workspace.repoPath })).entries.find(
+            (entry) => entry.provider === "codex",
+          )?.status,
+        { timeout: 60_000 },
+      )
+      .toBe("ready");
+    const snapshot = await client.getProvidersSnapshot({ cwd: workspace.repoPath });
+    const codex = snapshot.entries.find((entry) => entry.provider === "codex");
+    expect(codex?.status).toBe("ready");
+    const astra = codex?.models?.find((model) => model.id === "gpt-6-astra");
+    expect(astra?.id).toBe("gpt-6-astra");
+    const label = astra!.label;
+    await startWithoutRememberedModel(page);
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForSidebarHydration(page);
+    await openGlobalNewWorkspaceComposer(page);
+    for (const [index, select] of [chooseModel, reselectModel].entries()) {
+      const count = index + 1;
+      await test.step(`create workspace ${count} and return`, async () => {
+        await select(page, "codex", label);
+        await expectSavedSelection(page, "codex", "gpt-6-astra");
+        await submitNewWorkspacePrompt(page, "Reply with OK. Do not use tools or change files.");
+        await expect(page).toHaveURL(/\/workspace\//);
+        await expectCreatedModelAgents(page, client, "codex", "gpt-6-astra", count);
+        await expect(
+          page.getByTestId("assistant-message").filter({ hasText: "OK", visible: true }),
+        ).toBeVisible({
+          timeout: 60_000,
+        });
+        await openGlobalNewWorkspaceComposer(page);
+        await expectSavedSelection(page, "codex", "gpt-6-astra");
+        await expectRememberedModel(page, label);
+      });
+    }
+    await page.screenshot({ path: test.info().outputPath("astra-remembered.png") });
+  } finally {
+    await client.close();
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/new-workspace-model-memory.spec.ts b/packages/app/e2e/browser/new-workspace-model-memory.spec.ts
new file mode 100644
index 0000000000..9e86b74ffb
--- /dev/null
+++ b/packages/app/e2e/browser/new-workspace-model-memory.spec.ts
@@ -0,0 +1,109 @@
+import { mkdtemp, rename, rm, symlink } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { test, expect } from "../support/fixtures";
+import { seedModelProvider } from "../support/helpers/agent-profiles";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  openGlobalNewWorkspaceComposer,
+  submitNewWorkspaceEmpty,
+  submitNewWorkspacePrompt,
+} from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+
+import {
+  chooseModel,
+  reselectModel,
+  startWithoutRememberedModel,
+  expectSavedSelection,
+  expectCreatedModelAgents,
+  expectRememberedModel,
+} from "../support/helpers/model-memory";
+
+const PROVIDER = "model-memory-diagnostic";
+const MODEL = "pi-profile-model";
+const LABEL = "Pi profile model";
+
+async function expectProviderStatus(client: DaemonClient, cwd: string | undefined, status: string) {
+  await expect
+    .poll(
+      async () =>
+        (await client.getProvidersSnapshot(cwd ? { cwd } : undefined)).entries.find(
+          (entry) => entry.provider === PROVIDER,
+        )?.status,
+      { timeout: 30_000 },
+    )
+    .toBe(status);
+}
+
+async function prepareCatalogState(
+  client: DaemonClient,
+  executable: string,
+  cwd: string,
+  hostStatus: "ready" | "unavailable",
+) {
+  await expectProviderStatus(client, undefined, "ready");
+  await expectProviderStatus(client, cwd, "ready");
+  await rename(executable, `${executable}.parked`);
+  await client.refreshProvidersSnapshot({ providers: [PROVIDER] });
+  await expectProviderStatus(client, undefined, "unavailable");
+  await rename(`${executable}.parked`, executable);
+  if (hostStatus === "ready") await client.refreshProvidersSnapshot({ providers: [PROVIDER] });
+  await client.refreshProvidersSnapshot({ cwd, providers: [PROVIDER] });
+  await expectProviderStatus(client, cwd, "ready");
+  await expectProviderStatus(client, undefined, hostStatus);
+}
+
+for (const hostStatus of ["ready", "unavailable"] as const) {
+  test(`remembers the manually selected model after two creations with a ${hostStatus} host catalog and ready project catalog`, async ({
+    page,
+  }) => {
+    test.setTimeout(150_000);
+    const workspace = await seedWorkspace({ repoPrefix: "model-memory-scope-" });
+    const binDir = await mkdtemp(path.join(tmpdir(), "paseo-model-memory-bin-"));
+    const executable = path.join(binDir, "provider-node");
+    await symlink(process.execPath, executable);
+    const provider = await seedModelProvider({
+      id: PROVIDER,
+      label: "Model memory diagnostic",
+      extends: "pi",
+      command: [executable, path.resolve("e2e/fixtures/fake-pi-rpc.mjs")],
+      models: [{ id: MODEL, label: LABEL, description: "Remembered selection diagnostic" }],
+    });
+    const client = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "model-memory" });
+    try {
+      await prepareCatalogState(client, executable, workspace.repoPath, hostStatus);
+
+      await startWithoutRememberedModel(page);
+      await gotoWorkspace(page, workspace.workspaceId);
+      await waitForSidebarHydration(page);
+      await openGlobalNewWorkspaceComposer(page);
+      for (const [index, select] of [chooseModel, reselectModel].entries()) {
+        const count = index + 1;
+        await test.step(`create workspace ${count} and return`, async () => {
+          await select(page, PROVIDER, LABEL);
+          await expectSavedSelection(page, PROVIDER, MODEL);
+          await submitNewWorkspacePrompt(page, "Remember this model on the next workspace");
+          await expect(page).toHaveURL(/\/workspace\//);
+          await expectCreatedModelAgents(page, client, PROVIDER, MODEL, count);
+          await openGlobalNewWorkspaceComposer(page);
+          await expectSavedSelection(page, PROVIDER, MODEL);
+          await expectRememberedModel(page, LABEL);
+        });
+      }
+      await submitNewWorkspaceEmpty(page);
+      await expect(page).toHaveURL(/\/workspace\//);
+      await openGlobalNewWorkspaceComposer(page);
+      await expectSavedSelection(page, PROVIDER, MODEL);
+      await expectRememberedModel(page, LABEL);
+    } finally {
+      await client.close();
+      await provider.restore();
+      await workspace.cleanup();
+      await rm(binDir, { recursive: true, force: true });
+    }
+  });
+}
diff --git a/packages/app/e2e/browser/new-workspace-model-recovery.spec.ts b/packages/app/e2e/browser/new-workspace-model-recovery.spec.ts
new file mode 100644
index 0000000000..ad291a715d
--- /dev/null
+++ b/packages/app/e2e/browser/new-workspace-model-recovery.spec.ts
@@ -0,0 +1,102 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { test, expect, type Page } from "../support/fixtures";
+import {
+  closeModelPicker,
+  drillIntoProvider,
+  openModelPicker,
+  seedModelProvider,
+} from "../support/helpers/agent-profiles";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { openGlobalNewWorkspaceComposer } from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { expectRememberedModel, expectSavedSelection } from "../support/helpers/model-memory";
+
+const PROVIDER = "remembered-model-recovery";
+const MODEL = "remembered-model";
+const LABEL = "Remembered model";
+
+async function rememberModel(page: Page) {
+  await page.addInitScript(
+    ({ provider, model }) => {
+      localStorage.setItem(
+        "@paseo:create-agent-preferences",
+        JSON.stringify({
+          provider,
+          providerPreferences: { [provider]: { model } },
+        }),
+      );
+    },
+    { provider: PROVIDER, model: MODEL },
+  );
+}
+
+async function expectRecoveredModelInPicker(page: Page) {
+  await openModelPicker(page);
+  await page.getByRole("dialog").getByRole("button", { name: "Back", exact: true }).click();
+  await drillIntoProvider(page, PROVIDER);
+  await expect(
+    page.getByTestId("combobox-desktop-container").getByText(LABEL, { exact: true }),
+  ).toBeVisible();
+  await closeModelPicker(page);
+}
+
+async function setProviderAvailability(client: DaemonClient, cwd: string, available: boolean) {
+  await client.patchDaemonConfig({
+    providers: {
+      [PROVIDER]: {
+        command: [available ? process.execPath : "/missing-paseo-diagnostic-provider"],
+      },
+    },
+  });
+  for (const scope of [undefined, cwd]) {
+    await expect
+      .poll(
+        async () => {
+          const snapshot = await client.getProvidersSnapshot(scope ? { cwd: scope } : undefined);
+          return snapshot.entries.find((entry) => entry.provider === PROVIDER)?.status;
+        },
+        { timeout: 30_000 },
+      )
+      .toBe(available ? "ready" : "unavailable");
+  }
+}
+
+test("restores the remembered model when a provider recovers after New workspace opens", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const workspace = await seedWorkspace({ repoPrefix: "model-recovery-" });
+  const provider = await seedModelProvider({
+    id: PROVIDER,
+    label: "Remembered provider",
+    models: [{ id: MODEL, label: LABEL, description: "Model restoration diagnostic" }],
+    command: [process.execPath],
+  });
+  const client = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "model-recovery" });
+  try {
+    await rememberModel(page);
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForSidebarHydration(page);
+    await openGlobalNewWorkspaceComposer(page);
+    await expectRememberedModel(page, LABEL);
+
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForSidebarHydration(page);
+    await setProviderAvailability(client, workspace.repoPath, false);
+    await openGlobalNewWorkspaceComposer(page);
+    await expect(
+      page.getByTestId("combined-model-selector").filter({ visible: true }),
+    ).not.toContainText("Loading...");
+
+    await setProviderAvailability(client, workspace.repoPath, true);
+    await expectSavedSelection(page, PROVIDER, MODEL);
+    await expectRecoveredModelInPicker(page);
+    await expectRememberedModel(page, LABEL);
+  } finally {
+    await client.close();
+    await provider.restore();
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/new-workspace-navigation-guard.spec.ts b/packages/app/e2e/browser/new-workspace-navigation-guard.spec.ts
new file mode 100644
index 0000000000..dde653ab65
--- /dev/null
+++ b/packages/app/e2e/browser/new-workspace-navigation-guard.spec.ts
@@ -0,0 +1,26 @@
+import { test } from "../support/fixtures";
+import { verifyDelayedWorkspaceCreation } from "../support/helpers/new-workspace-navigation";
+
+test.describe("Delayed workspace creation", () => {
+  test.describe.configure({ timeout: 120_000 });
+
+  // Exercise each submit handler's navigation guard. Checkout isolation shares
+  // those handlers; ordinary successful launches live in the creation journeys.
+  test("chat worktree creation keeps the workspace chosen while it was pending", async ({
+    page,
+  }) => {
+    await verifyDelayedWorkspaceCreation(page, "chat", "leave", "worktree");
+  });
+
+  test("terminal creation keeps the workspace chosen while it was pending", async ({ page }) => {
+    await verifyDelayedWorkspaceCreation(page, "terminal", "leave");
+  });
+
+  test("empty creation keeps the workspace chosen while it was pending", async ({ page }) => {
+    await verifyDelayedWorkspaceCreation(page, "empty", "leave");
+  });
+
+  test("preserves a newer draft opened while creation is pending", async ({ page }) => {
+    await verifyDelayedWorkspaceCreation(page, "chat", "new-draft");
+  });
+});
diff --git a/packages/app/e2e/browser/opencode-model-switch.real.spec.ts b/packages/app/e2e/browser/opencode-model-switch.real.spec.ts
new file mode 100644
index 0000000000..e83a962fb4
--- /dev/null
+++ b/packages/app/e2e/browser/opencode-model-switch.real.spec.ts
@@ -0,0 +1,78 @@
+import { mkdtempSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { test, expect, type Page } from "../support/fixtures";
+import { launchAgent, cleanupRewindFlow, type AgentHandle } from "../support/helpers/rewind-flow";
+import { submitMessage } from "../support/helpers/composer";
+
+const binary = process.env.OPENCODE_TEST_BINARY ?? "opencode";
+test.use({
+  e2eDaemonConfig: {
+    version: 1,
+    agents: { providers: { opencode: { enabled: true, command: [binary] } } },
+  },
+});
+
+async function selectMedium(page: Page) {
+  await page
+    .getByRole("button", { name: /^Select thinking option/ })
+    .filter({ visible: true })
+    .click();
+  await page.getByText("Medium", { exact: true }).filter({ visible: true }).click();
+  await expect(
+    page
+      .getByRole("button", { name: "Select thinking option (Medium)", exact: true })
+      .filter({ visible: true }),
+  ).toBeVisible();
+}
+async function selectLongcat(page: Page) {
+  await page
+    .getByRole("button", { name: /^Select model \(/ })
+    .filter({ visible: true })
+    .click();
+  await page
+    .getByText("LongCat 2.5 Preview Free", { exact: true })
+    .filter({ visible: true })
+    .click();
+}
+async function askForReply(handle: AgentHandle) {
+  await submitMessage(handle.page, "Reply exactly OK. Do not use tools.");
+  return handle.client.waitForFinish(handle.agentId, 120_000);
+}
+
+test("switching an existing OpenCode session clears unsupported thinking", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(240_000);
+  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-variant-ui-"));
+  let handle: AgentHandle | undefined;
+  try {
+    handle = await launchAgent({
+      page,
+      cwd,
+      provider: "opencode",
+      mode: "full-access",
+      providerConfig: { model: "opencode/space-bunny-free" },
+    });
+    await selectMedium(page);
+    expect((await askForReply(handle)).status).toBe("idle");
+    await selectLongcat(page);
+    await expect(
+      page.getByRole("button", { name: /^Select thinking option/ }).filter({ visible: true }),
+    ).toHaveCount(0);
+    const finish = await askForReply(handle);
+    const screenshot = testInfo.outputPath("model-switch.png");
+    await page.screenshot({ path: screenshot });
+    await testInfo.attach("After switching to Longcat", {
+      path: screenshot,
+      contentType: "image/png",
+    });
+    expect(finish.status).toBe("idle");
+    expect(finish.final?.lastError).toBeFalsy();
+    await expect(
+      page.getByTestId("assistant-message").filter({ visible: true }).last(),
+    ).toContainText("OK");
+  } finally {
+    await cleanupRewindFlow({ handle, cwd });
+  }
+});
diff --git a/packages/app/e2e/browser/agent-timeline-pagination-old-daemon.spec.ts b/packages/app/e2e/browser/owned-subscriptions-old-daemon.spec.ts
similarity index 56%
rename from packages/app/e2e/browser/agent-timeline-pagination-old-daemon.spec.ts
rename to packages/app/e2e/browser/owned-subscriptions-old-daemon.spec.ts
index 6ec68a2b1e..17f4db2e85 100644
--- a/packages/app/e2e/browser/agent-timeline-pagination-old-daemon.spec.ts
+++ b/packages/app/e2e/browser/owned-subscriptions-old-daemon.spec.ts
@@ -1,5 +1,12 @@
 import { randomUUID } from "node:crypto";
-import { metroTest as test } from "../support/fixtures";
+import { submitMessage, expectComposerEditable } from "../support/helpers/composer";
+import {
+  focusTerminalSurface,
+  typeInTerminal,
+  getTerminalBufferText,
+} from "../support/helpers/terminal-perf";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+import { metroTest as test, expect } 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";
@@ -17,6 +24,19 @@ test("does not repeat an assistant block when the current app paginates a publis
   test.setTimeout(120_000);
   const serverId = `srv_old_pagination_${randomUUID().replaceAll("-", "").slice(0, 12)}`;
   const daemon = await startIsolatedHostDaemon(serverId, { publishedVersion: "0.2.5" });
+  const observationSockets = new Set<unknown>();
+  page.on("websocket", (socket) => {
+    socket.on("framesent", ({ payload }) => {
+      if (typeof payload !== "string") return;
+      const frame = JSON.parse(payload);
+      if (
+        frame.type === "session" &&
+        frame.message.type === "fetch_agents_request" &&
+        frame.message.subscribe
+      )
+        observationSockets.add(socket);
+    });
+  });
   const workspace = await seedWorkspace({
     repoPrefix: "timeline-old-daemon-pagination-",
     port: daemon.port,
@@ -79,6 +99,40 @@ test("does not repeat an assistant block when the current app paginates a publis
 
     history.expectRepeatedEntries();
     await history.expectOwnedTextRendered("Now I have a clearer picture.");
+    expect(observationSockets.size).toBe(1);
+
+    await test.step("send a live turn after reconnecting the old daemon", async () => {
+      await daemon.restart();
+      await expect.poll(() => observationSockets.size, { timeout: 30_000 }).toBe(2);
+      await expectComposerEditable(page);
+      await submitMessage(
+        page,
+        "compatibility-after-reconnect: emit 1 coalesced agent stream updates",
+      );
+      await expectTimelinePromptVisible(
+        page,
+        "compatibility-after-reconnect: emit 1 coalesced agent stream updates",
+      );
+      // The browser and the seed client reconnect independently after the restart.
+      await agent.client.connect();
+      await agent.client.waitForFinish(agent.agentId, 20_000);
+      await page.screenshot({ path: test.info().outputPath("old-daemon-live-reconnect.png") });
+    });
+
+    await test.step("open a terminal and receive its output", async () => {
+      const terminal = await agent.client.createTerminal(agent.cwd, "Compatibility terminal");
+      expect(terminal.error).toBeNull();
+      const terminalId = terminal.terminal!.id;
+      const route = buildHostWorkspaceRoute(serverId, workspace.workspaceId);
+      await page.goto(`${route}?open=${encodeURIComponent(`terminal:${terminalId}`)}`);
+      await focusTerminalSurface(page);
+      await typeInTerminal(page, "printf 'compatibility-%s\\n' terminal-output\n");
+      await expect
+        .poll(() => getTerminalBufferText(page), { timeout: 15_000 })
+        .toContain("compatibility-terminal-output");
+      await page.screenshot({ path: test.info().outputPath("old-daemon-terminal.png") });
+      await agent.client.killTerminal(terminalId);
+    });
   } finally {
     await agent.cleanup();
     await daemon.close();
diff --git a/packages/app/e2e/browser/pane-find.spec.ts b/packages/app/e2e/browser/pane-find.spec.ts
new file mode 100644
index 0000000000..113a582e0e
--- /dev/null
+++ b/packages/app/e2e/browser/pane-find.spec.ts
@@ -0,0 +1,475 @@
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { openFileExplorer, openFileFromExplorer } from "../support/helpers/file-explorer";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+
+function source(page: Page) {
+  return page.getByTestId("file-source-editor").filter({ visible: true }).locator(".cm-content");
+}
+function query(page: Page) {
+  return page.getByRole("textbox", { name: "Find in pane", exact: true });
+}
+function status(page: Page) {
+  return page.getByRole("status", { name: "Find matches" });
+}
+async function openSource(page: Page, filename: string) {
+  await openFileExplorer(page);
+  await openFileFromExplorer(page, filename);
+  await expect(source(page)).toBeVisible();
+}
+async function findInSource(page: Page, text: string) {
+  await source(page).focus();
+  await source(page).press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+  await query(page).fill(text);
+}
+function querySelection(page: Page) {
+  return query(page).evaluate((input: HTMLInputElement) => [
+    input.selectionStart,
+    input.selectionEnd,
+  ]);
+}
+/** The query box keeps the caret where the user left it, with nothing reselected. */
+async function expectQueryCaretKept(page: Page, text: string) {
+  await expect.poll(() => querySelection(page)).toEqual([text.length, text.length]);
+  await expect(query(page)).toHaveValue(text);
+}
+async function expectQuerySelected(page: Page, text: string) {
+  await expect(query(page)).toBeFocused();
+  await expect(query(page)).toHaveValue(text);
+  await expect.poll(() => querySelection(page)).toEqual([0, text.length]);
+}
+async function closeFind(page: Page) {
+  await query(page).press("Escape");
+  await expect(source(page)).toBeFocused();
+}
+async function expectActiveMatchUncovered(page: Page) {
+  const match = page.locator(".cm-searchMatch-selected").filter({ visible: true }).first();
+  await expect(match).toBeVisible();
+  const widget = page.getByLabel("Find", { exact: true }).filter({ visible: true });
+  await expect
+    .poll(async () => {
+      const m = await match.boundingBox();
+      const w = await widget.boundingBox();
+      if (!m || !w) return "missing";
+      const covered =
+        m.x < w.x + w.width && m.x + m.width > w.x && m.y < w.y + w.height && m.y + m.height > w.y;
+      return covered ? "covered by Find" : "visible";
+    })
+    .toBe("visible");
+}
+
+async function findBoxes(page: Page) {
+  const pane = (await page
+    .getByTestId("workspace-file-pane")
+    .filter({ visible: true })
+    .boundingBox())!;
+  const widget = (await page
+    .getByLabel("Find", { exact: true })
+    .filter({ visible: true })
+    .boundingBox())!;
+  return { pane, widget };
+}
+
+async function expectFindInsidePane(page: Page) {
+  const { pane, widget } = await findBoxes(page);
+  expect(widget.x).toBeGreaterThanOrEqual(pane.x);
+  expect(widget.x + widget.width).toBeLessThanOrEqual(pane.x + pane.width);
+  expect(widget.y).toBeGreaterThanOrEqual(pane.y);
+  expect(widget.y + widget.height).toBeLessThanOrEqual(pane.y + pane.height + 1);
+}
+
+async function expectFindAtTopRight(page: Page) {
+  await expectFindInsidePane(page);
+  const { pane, widget } = await findBoxes(page);
+  expect(widget.y).toBeLessThan(pane.y + 70);
+}
+
+test("finds literal text at the top of editable source and returns focus at the inspected match", async ({
+  page,
+  withWorkspace,
+}, testInfo) => {
+  const workspace = await withWorkspace({ prefix: "pane-find-" });
+  const file = path.join(workspace.repoPath, "source.txt");
+  await writeFile(file, "first a.b\nsecond axb\nthird a.b\n");
+  await workspace.navigateTo();
+  await openSource(page, "source.txt");
+  await findInSource(page, "a.b");
+  await expect(status(page)).toHaveText("1 of 2");
+  await query(page).fill("A.B");
+  await expect(status(page)).toHaveText("1 of 2");
+  await query(page).fill("a.b");
+  await expectFindAtTopRight(page);
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("2 of 2");
+  await query(page).press("Shift+Enter");
+  await expect(status(page)).toHaveText("1 of 2");
+  await page.screenshot({ path: testInfo.outputPath("editable-find.png") });
+  await closeFind(page);
+  await expect(query(page)).toBeHidden();
+  await expect(page.getByLabel("Line 1, column 10")).toBeVisible();
+  await expect(page.getByRole("button", { name: "Find", exact: true })).toHaveCount(0);
+
+  await test.step("reopen with the shortcut, preserve replace and Undo/save", async () => {
+    await source(page).press("ControlOrMeta+f");
+    await expect(query(page)).toBeFocused();
+    await page.getByRole("button", { name: "Toggle replace" }).click();
+    await page.getByRole("textbox", { name: "Replace with" }).fill("literal");
+    await page.getByRole("button", { name: "Replace", exact: true }).click();
+    await expect(source(page)).toContainText("first literal");
+    await expect(status(page)).toHaveText("1 of 1");
+    await page.screenshot({ path: testInfo.outputPath("replace.png") });
+    await closeFind(page);
+    await source(page).press("ControlOrMeta+z");
+    await expect(source(page)).toContainText("first a.b");
+    await source(page).press("ControlOrMeta+s");
+    await expect.poll(() => readFile(file, "utf8")).toBe("first a.b\nsecond axb\nthird a.b\n");
+    await findInSource(page, "a.b");
+    await page.getByRole("button", { name: "Toggle replace" }).click();
+    await page.getByRole("textbox", { name: "Replace with" }).fill("all");
+    await page.getByRole("button", { name: "Replace all", exact: true }).click();
+    await expect(status(page)).toHaveText("No matches");
+    await closeFind(page);
+    await source(page).press("ControlOrMeta+s");
+    await expect.poll(() => readFile(file, "utf8")).toBe("first all\nsecond axb\nthird all\n");
+  });
+});
+
+test("searches the unsaved buffer while disconnected", async ({ page, withWorkspace }) => {
+  const gate = await installDaemonWebSocketGate(page);
+  const workspace = await withWorkspace({ prefix: "pane-find-draft-" });
+  const file = path.join(workspace.repoPath, "draft.txt");
+  await writeFile(file, "saved on disk\n");
+  await workspace.navigateTo();
+  await openSource(page, "draft.txt");
+  await gate.drop();
+  await source(page).fill("unsaved needle\nsecond needle\n");
+  await findInSource(page, "needle");
+  await expect(status(page)).toHaveText("1 of 2");
+  expect(await readFile(file, "utf8")).toBe("saved on disk\n");
+  gate.restore();
+});
+
+test("searches read-only source beyond the viewport without replace controls", async ({
+  page,
+  withWorkspace,
+}, testInfo) => {
+  const workspace = await withWorkspace({ prefix: "pane-find-readonly-" });
+  await writeFile(
+    path.join(workspace.repoPath, "large.txt"),
+    "needle first\n" + "plain source line\n".repeat(70_000) + "needle last\n",
+  );
+  await workspace.navigateTo();
+  await openSource(page, "large.txt");
+  await findInSource(page, "needle");
+  await expect(source(page)).toHaveAttribute("contenteditable", "false");
+  await expect(status(page)).toHaveText("1 of 2");
+  await expect(page.getByRole("button", { name: "Toggle replace" })).toHaveCount(0);
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("2 of 2");
+  await expect(source(page)).toContainText("needle last");
+  await page.screenshot({ path: testInfo.outputPath("readonly-find.png") });
+  await closeFind(page);
+  await source(page).press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+  await query(page).fill("plain");
+  await expect(status(page)).toHaveText("1 of 10000+");
+});
+
+test("targets the focused source in split panes and refocuses an open query", async ({
+  page,
+  withWorkspace,
+}, testInfo) => {
+  const workspace = await withWorkspace({ prefix: "pane-find-split-" });
+  await writeFile(path.join(workspace.repoPath, "left.txt"), "left needle\n");
+  await writeFile(path.join(workspace.repoPath, "right.txt"), "right needle\nright needle\n");
+  await workspace.navigateTo();
+  await openSource(page, "left.txt");
+  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+  await openFileFromExplorer(page, "right.txt");
+  const left = source(page).filter({ hasText: "left needle" });
+  const right = source(page).filter({ hasText: "right needle" });
+  await expect(left).toBeVisible();
+  await expect(right).toBeVisible();
+  await left.click();
+  await left.press("ControlOrMeta+f");
+  await query(page).fill("needle");
+  await expect(status(page)).toHaveText("1 of 1");
+  await query(page).press("Escape");
+  await right.click();
+  await right.press("ControlOrMeta+f");
+  await query(page).fill("needle");
+  await expect(status(page)).toHaveText("1 of 2");
+  await right.click();
+  await right.press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+  await expect(query(page)).toHaveValue("needle");
+  await page.screenshot({ path: testInfo.outputPath("split-find.png") });
+});
+
+test.describe("narrow touch browser", () => {
+  test.use({ hasTouch: true });
+  test("keeps Find controls inside a narrow source pane", async ({
+    page,
+    withWorkspace,
+  }, testInfo) => {
+    const workspace = await withWorkspace({ prefix: "pane-find-touch-" });
+    await writeFile(path.join(workspace.repoPath, "touch.txt"), "touch needle\nnext needle\n");
+    await workspace.navigateTo();
+    await openSource(page, "touch.txt");
+    await page.setViewportSize({ width: 390, height: 844 });
+    await expect(page.getByRole("button", { name: "Find", exact: true })).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath("touch-find-closed.png") });
+    await source(page).focus();
+    await source(page).press("ControlOrMeta+f");
+    await expect(query(page)).toBeFocused();
+    await query(page).fill("needle");
+    await page.getByRole("button", { name: "Next match" }).tap();
+    await expect(status(page)).toHaveText("2 of 2");
+    await expectFindInsidePane(page);
+    await page.screenshot({ path: testInfo.outputPath("touch-find.png") });
+    await page.getByRole("button", { name: "Close Find" }).tap();
+    await expect(source(page)).toBeFocused();
+  });
+});
+
+async function selectFirstTwoLines(page: Page) {
+  await source(page).focus();
+  await source(page).press("ControlOrMeta+Home");
+  await source(page).press("Shift+ArrowDown");
+  await source(page).press("Shift+End");
+}
+
+async function selectLastWord(page: Page) {
+  await source(page).focus();
+  await source(page).press("ControlOrMeta+End");
+  await source(page).press("ArrowUp");
+  await source(page).press("Home");
+  await source(page).press("Shift+End");
+}
+
+test("declines multiline selection seeds and keeps replacement aligned with the visible query", async ({
+  page,
+  withWorkspace,
+}, testInfo) => {
+  const workspace = await withWorkspace({ prefix: "pane-find-single-line-" });
+  const file = path.join(workspace.repoPath, "selection.txt");
+  await writeFile(file, "alpha\nbeta\nalphabeta\n");
+  await workspace.navigateTo();
+  await openSource(page, "selection.txt");
+
+  await selectFirstTwoLines(page);
+  await source(page).press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+  await expect(query(page)).toHaveValue("");
+  await expect(page.getByRole("button", { name: "Next match" })).toBeDisabled();
+  await query(page).press("Enter");
+  await expect(query(page)).toHaveValue("");
+  await closeFind(page);
+
+  await selectFirstTwoLines(page);
+  await source(page).press("ControlOrMeta+g");
+  await expect(query(page)).toHaveValue("");
+  await expect(page.getByRole("button", { name: "Next match" })).toBeDisabled();
+  await closeFind(page);
+
+  await selectLastWord(page);
+  await source(page).press("ControlOrMeta+f");
+  await expect(query(page)).toHaveValue("alphabeta");
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("1 of 1");
+  await closeFind(page);
+  await expect(page.getByLabel("Line 3, column 10")).toBeVisible();
+
+  await selectFirstTwoLines(page);
+  await source(page).press("ControlOrMeta+f");
+  await expect(query(page)).toHaveValue("alphabeta");
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("1 of 1");
+  await page.getByRole("button", { name: "Toggle replace" }).click();
+  await page.getByRole("textbox", { name: "Replace with" }).fill("replaced");
+  await page.getByRole("button", { name: "Replace", exact: true }).click();
+  await expect(source(page)).toContainText("alpha");
+  await expect(source(page)).toContainText("beta");
+  await expect(status(page)).toHaveText("No matches");
+  await page.screenshot({ path: testInfo.outputPath("single-line-query-replacement.png") });
+  await closeFind(page);
+  await source(page).press("ControlOrMeta+s");
+  await expect.poll(() => readFile(file, "utf8")).toBe("alpha\nbeta\nreplaced\n");
+});
+
+for (const startingField of ["Find in pane", "Replace with"] as const) {
+  test(`repeated Find from ${startingField} selects the query for new typing`, async ({
+    page,
+    withWorkspace,
+  }, testInfo) => {
+    const workspace = await withWorkspace({ prefix: "pane-find-repeat-input-" });
+    await writeFile(path.join(workspace.repoPath, "source.txt"), "needle first\nneedle second\n");
+    await workspace.navigateTo();
+    await openSource(page, "source.txt");
+    await findInSource(page, "needle");
+    await page.getByRole("button", { name: "Toggle replace" }).click();
+    const replacement = page.getByRole("textbox", { name: "Replace with" });
+    await replacement.fill("replacement");
+
+    await test.step("repeat Find from the input and type a fresh query", async () => {
+      const startingInput = page.getByRole("textbox", { name: startingField, exact: true });
+      await startingInput.press("End");
+      await startingInput.press("ControlOrMeta+f");
+      await expectQuerySelected(page, "needle");
+      await page.keyboard.type("first");
+      await expect(query(page)).toHaveValue("first");
+      await expect(replacement).toHaveValue("replacement");
+      await expect(status(page)).toHaveText("1 of 1");
+    });
+
+    await page.screenshot({ path: testInfo.outputPath("repeat-find-input.png") });
+    await closeFind(page);
+    await expect(page.getByLabel("Line 1, column 13")).toBeVisible();
+  });
+}
+
+test.describe("the active match stays visible under the floating widget", () => {
+  test.describe("narrow touch browser", () => {
+    test.use({ hasTouch: true });
+    test("reveals a short file's match that the widget would cover", async ({
+      page,
+      withWorkspace,
+    }, testInfo) => {
+      const workspace = await withWorkspace({ prefix: "pane-find-cover-touch-" });
+      await writeFile(path.join(workspace.repoPath, "touch.txt"), "touch needle\nnext needle\n");
+      await workspace.navigateTo();
+      await openSource(page, "touch.txt");
+      await page.setViewportSize({ width: 390, height: 844 });
+      await source(page).focus();
+      await source(page).press("ControlOrMeta+f");
+      await expect(query(page)).toBeFocused();
+      await query(page).fill("needle");
+      await expect(status(page)).toHaveText("1 of 2");
+      await expectActiveMatchUncovered(page);
+      await page.getByRole("button", { name: "Next match" }).tap();
+      await expect(status(page)).toHaveText("2 of 2");
+      await expectActiveMatchUncovered(page);
+      await page.screenshot({ path: testInfo.outputPath("touch-match-uncovered.png") });
+      await expect(query(page)).toHaveValue("needle");
+      await page.getByRole("button", { name: "Close Find" }).tap();
+      await expect(source(page)).toBeFocused();
+    });
+  });
+
+  test("reveals a match beneath the top-right widget in a narrow desktop pane", async ({
+    page,
+    withWorkspace,
+  }, testInfo) => {
+    const workspace = await withWorkspace({ prefix: "pane-find-cover-split-" });
+    await writeFile(path.join(workspace.repoPath, "left.txt"), "left filler\n");
+    await writeFile(path.join(workspace.repoPath, "right.txt"), "needle one\nplain\n");
+    await workspace.navigateTo();
+    await openSource(page, "left.txt");
+    await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+    await openFileFromExplorer(page, "right.txt");
+    const right = source(page).filter({ hasText: "needle one" });
+    await expect(right).toBeVisible();
+    await right.click();
+    await right.press("ControlOrMeta+f");
+    await query(page).fill("needle");
+    await expect(status(page)).toHaveText("1 of 1");
+    await expectActiveMatchUncovered(page);
+    await page.screenshot({ path: testInfo.outputPath("split-match-uncovered.png") });
+
+    await test.step("stays visible when Replace expands the widget", async () => {
+      await page.getByRole("button", { name: "Toggle replace" }).click();
+      await page.getByRole("textbox", { name: "Replace with" }).fill("hay");
+      await expectActiveMatchUncovered(page);
+      await page.screenshot({ path: testInfo.outputPath("split-replace-uncovered.png") });
+    });
+
+    await test.step("navigation and query focus still work", async () => {
+      await query(page).press("ControlOrMeta+f");
+      await expectQuerySelected(page, "needle");
+      await query(page).press("Enter");
+      await expect(status(page)).toHaveText("1 of 1");
+      await expectActiveMatchUncovered(page);
+    });
+    await query(page).press("Escape");
+    await expect(right).toBeFocused();
+  });
+});
+
+test("Go to line keeps its dialog with Find closed and open", async ({
+  page,
+  withWorkspace,
+}, testInfo) => {
+  const workspace = await withWorkspace({ prefix: "pane-find-goto-" });
+  const lines = Array.from({ length: 40 }, (_, index) => `line ${index + 1}`).join("\n");
+  await writeFile(path.join(workspace.repoPath, "lines.txt"), `${lines}\n`);
+  await workspace.navigateTo();
+  await openSource(page, "lines.txt");
+  const gotoInput = page.getByRole("textbox", { name: "Go to line" });
+
+  await test.step("with Find closed", async () => {
+    await source(page).focus();
+    await source(page).press("ControlOrMeta+Alt+g");
+    await expect(gotoInput).toBeVisible();
+    await page.screenshot({ path: testInfo.outputPath("goto-line-find-closed.png") });
+    await gotoInput.fill("12");
+    await gotoInput.press("Enter");
+    await expect(page.getByLabel("Line 12, column 1")).toBeVisible();
+    await expect(gotoInput).toBeHidden();
+  });
+
+  await test.step("with Find open", async () => {
+    await source(page).press("ControlOrMeta+f");
+    await expect(query(page)).toBeFocused();
+    await query(page).fill("line 3");
+    await source(page).focus();
+    await source(page).press("ControlOrMeta+Alt+g");
+    await expect(gotoInput).toBeVisible();
+    await page.screenshot({ path: testInfo.outputPath("goto-line-find-open.png") });
+    await gotoInput.fill("30");
+    await gotoInput.press("Enter");
+    await expect(page.getByLabel("Line 30, column 1")).toBeVisible();
+    await expect(query(page)).toHaveValue("line 3");
+    await expect(status(page)).toHaveText("11 matches");
+  });
+});
+
+test.describe("macOS", () => {
+  test.use({
+    userAgent:
+      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+  });
+
+  // Control+F moves the caret forward on macOS, so Find must only claim Command+F.
+  test("opens Find with Meta+f and leaves Control+f to text editing", async ({
+    page,
+    withWorkspace,
+  }, testInfo) => {
+    const workspace = await withWorkspace({ prefix: "pane-find-mac-" });
+    await writeFile(path.join(workspace.repoPath, "source.txt"), "needle first\nneedle second\n");
+    await workspace.navigateTo();
+    await openSource(page, "source.txt");
+
+    await source(page).focus();
+    await source(page).press("Control+f");
+    await expect(query(page)).toHaveCount(0);
+
+    await source(page).press("Meta+f");
+    await expect(query(page)).toBeFocused();
+    await query(page).fill("needle");
+    await expect(status(page)).toHaveText("1 of 2");
+
+    await test.step("Control+f inside the query box does not reclaim the field", async () => {
+      await query(page).press("End");
+      await query(page).press("Control+f");
+      await expectQueryCaretKept(page, "needle");
+    });
+
+    await page.screenshot({ path: testInfo.outputPath("mac-find.png") });
+    await query(page).press("Meta+f");
+    await expectQuerySelected(page, "needle");
+    await closeFind(page);
+  });
+});
diff --git a/packages/app/e2e/browser/permission-steer.real.spec.ts b/packages/app/e2e/browser/permission-steer.real.spec.ts
index 802ae763ac..e88027cd6c 100644
--- a/packages/app/e2e/browser/permission-steer.real.spec.ts
+++ b/packages/app/e2e/browser/permission-steer.real.spec.ts
@@ -1,4 +1,5 @@
 import { mkdtempSync, realpathSync } from "node:fs";
+import type { Page, TestInfo } from "@playwright/test";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { expect, test } from "../support/fixtures";
@@ -18,7 +19,7 @@ const scenarios = [
   },
   {
     provider: "codex" as const,
-    providerConfig: { featureValues: { plan_mode: true } },
+    providerConfig: { model: "gpt-5.6-sol", featureValues: { plan_mode: true } },
     planPrompt:
       "Produce a concise implementation plan with exactly these steps: Inspect permission steering; Implement permission steering; Verify permission steering. Do not implement it.",
     planText: "Inspect permission steering",
@@ -27,57 +28,151 @@ const scenarios = [
   },
 ];
 
-test.describe("composer steer supersedes plan approval", () => {
-  for (const scenario of scenarios) {
-    test(`${scenario.provider} keeps the rejected plan in the timeline`, async ({
+async function readConversationOrder(page: Page, prompt: string, reply: string) {
+  const plan = page.getByTestId("timeline-plan-card");
+  const question = page.getByTestId("user-message").filter({ hasText: prompt });
+  const answer = page.getByTestId("assistant-message").filter({ hasText: reply });
+  const boxes = await Promise.all([
+    plan.boundingBox(),
+    question.boundingBox(),
+    answer.boundingBox(),
+  ]);
+  return boxes
+    .map((box, index) => {
+      if (!box) throw new Error("Expected the plan, follow-up, and answer to be rendered");
+      return { role: ["plan", "question", "answer"][index], y: box.y };
+    })
+    .sort((a, b) => a.y - b.y)
+    .map((item) => item.role);
+}
+
+async function togglePlan(
+  page: Page,
+  testId: string,
+  name: string,
+  expanded: boolean,
+): Promise<void> {
+  const toggle = page.getByTestId(testId).getByRole("button", { name, exact: true });
+  await toggle.click();
+  await expect(toggle).toHaveAttribute("aria-expanded", String(expanded));
+}
+
+async function expectRejectedPlanCollapsed(page: Page): Promise<void> {
+  await expect(
+    page
+      .getByTestId("timeline-plan-card")
+      .getByRole("button", { name: "Rejected plan", exact: true }),
+  ).toHaveAttribute("aria-expanded", "false");
+}
+
+async function reopenConversation(page: Page, reply: string): Promise<void> {
+  await page.reload();
+  await expect(page.getByTestId("timeline-plan-card")).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByTestId("assistant-message").filter({ hasText: reply })).toBeVisible();
+}
+
+type PlanScenario = (typeof scenarios)[number];
+interface PlanSteer {
+  page: Page;
+  scenario: PlanScenario;
+  testInfo: TestInfo;
+}
+
+async function withPlanSteer(context: PlanSteer, journey: () => Promise<void>): Promise<void> {
+  const { page, scenario } = context;
+  const cwd = realpathSync(
+    mkdtempSync(path.join(tmpdir(), `paseo-permission-steer-${scenario.provider}-`)),
+  );
+  let handle: AgentHandle | undefined;
+  try {
+    handle = await launchAgent({
       page,
-    }, testInfo) => {
-      test.setTimeout(420_000);
-      const cwd = realpathSync(
-        mkdtempSync(path.join(tmpdir(), `paseo-permission-steer-${scenario.provider}-`)),
-      );
-      let handle: AgentHandle | undefined;
-
-      try {
-        handle = await launchAgent({
-          page,
-          provider: scenario.provider,
-          cwd,
-          mode: "full-access",
-          providerConfig: scenario.providerConfig,
-        });
-        await submitMessage(page, scenario.planPrompt);
-        await waitForPermissionPrompt(page, 180_000);
-
-        const pendingPlan = page.getByTestId("permission-plan-card");
-        await expect(pendingPlan).toContainText(scenario.planText);
-        const pendingScreenshot = testInfo.outputPath(`${scenario.provider}-pending-plan.png`);
-        await page.screenshot({ path: pendingScreenshot });
-        await testInfo.attach(`${scenario.provider} pending plan`, {
-          path: pendingScreenshot,
-          contentType: "image/png",
-        });
-
-        await submitMessage(page, scenario.steerPrompt);
-        await expect(pendingPlan).toHaveCount(0, { timeout: 30_000 });
-        const rejectedPlan = page.getByTestId("timeline-plan-card");
-        await expect(rejectedPlan).toBeVisible({ timeout: 30_000 });
-        await expect(rejectedPlan).toContainText(scenario.planText);
-        await expect(
-          page.getByTestId("assistant-message").filter({ hasText: scenario.reply }),
-        ).toBeVisible({
-          timeout: 180_000,
-        });
-
-        const rejectedScreenshot = testInfo.outputPath(`${scenario.provider}-rejected-plan.png`);
-        await page.screenshot({ path: rejectedScreenshot });
-        await testInfo.attach(`${scenario.provider} rejected plan`, {
-          path: rejectedScreenshot,
-          contentType: "image/png",
-        });
-      } finally {
-        await cleanupRewindFlow({ handle, cwd });
-      }
+      provider: scenario.provider,
+      cwd,
+      mode: "full-access",
+      providerConfig: scenario.providerConfig,
     });
+    await journey();
+  } finally {
+    await cleanupRewindFlow({ handle, cwd });
   }
-});
+}
+
+async function reviewCollapsibleProposal({ page, scenario, testInfo }: PlanSteer): Promise<void> {
+  await submitMessage(page, scenario.planPrompt);
+  await waitForPermissionPrompt(page, 180_000);
+
+  const pendingPlan = page.getByTestId("permission-plan-card");
+  await expect(pendingPlan).toContainText(scenario.planText);
+  await togglePlan(page, "permission-plan-card", "Plan", false);
+  await expect(page.getByTestId("permission-request-deny")).toBeVisible();
+  await togglePlan(page, "permission-plan-card", "Plan", true);
+  const pendingScreenshot = testInfo.outputPath(`${scenario.provider}-pending-plan.png`);
+  await page.screenshot({ path: pendingScreenshot });
+  await testInfo.attach(`${scenario.provider} pending plan`, {
+    path: pendingScreenshot,
+    contentType: "image/png",
+  });
+}
+
+async function rejectWithFollowUp({ page, scenario, testInfo }: PlanSteer): Promise<void> {
+  await submitMessage(page, scenario.steerPrompt);
+  await expect(page.getByTestId("permission-plan-card")).toHaveCount(0, { timeout: 30_000 });
+  const rejectedPlan = page.getByTestId("timeline-plan-card");
+  await expect(rejectedPlan).toBeVisible({ timeout: 30_000 });
+  await expectRejectedPlanCollapsed(page);
+  await expect(
+    page.getByTestId("assistant-message").filter({ hasText: scenario.reply }),
+  ).toBeVisible({
+    timeout: 180_000,
+  });
+
+  const rejectedScreenshot = testInfo.outputPath(`${scenario.provider}-rejected-plan.png`);
+  await page.screenshot({ path: rejectedScreenshot });
+  await testInfo.attach(`${scenario.provider} rejected plan`, {
+    path: rejectedScreenshot,
+    contentType: "image/png",
+  });
+  await expect(
+    page.getByTestId("user-message").filter({ hasText: scenario.steerPrompt }),
+  ).toBeVisible();
+  expect
+    .soft(await readConversationOrder(page, scenario.steerPrompt, scenario.reply))
+    .toEqual(["plan", "question", "answer"]);
+}
+
+async function rereadRejectedPlan({ page, scenario, testInfo }: PlanSteer): Promise<void> {
+  const rejectedPlan = page.getByTestId("timeline-plan-card");
+  await togglePlan(page, "timeline-plan-card", "Rejected plan", true);
+  await expect(rejectedPlan).toContainText(scenario.planText);
+  await rejectedPlan.screenshot({
+    path: testInfo.outputPath(`${scenario.provider}-expanded-rejected-plan.png`),
+  });
+  await togglePlan(page, "timeline-plan-card", "Rejected plan", false);
+}
+
+async function restoreConversationOrder({ page, scenario }: PlanSteer): Promise<void> {
+  await reopenConversation(page, scenario.reply);
+  await expectRejectedPlanCollapsed(page);
+  expect(await readConversationOrder(page, scenario.steerPrompt, scenario.reply)).toEqual([
+    "plan",
+    "question",
+    "answer",
+  ]);
+}
+
+for (const scenario of scenarios) {
+  test(`${scenario.provider} keeps the rejected plan in the timeline`, async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(420_000);
+    const context = { page, scenario, testInfo };
+    await withPlanSteer(context, async () => {
+      await test.step("Review a collapsible proposal", () => reviewCollapsibleProposal(context));
+      await test.step("Reject with a follow-up below the plan", () => rejectWithFollowUp(context));
+      await test.step("Reopen the rejected plan", () => rereadRejectedPlan(context));
+      await test.step("Keep conversation order after reload", () =>
+        restoreConversationOrder(context));
+    });
+  });
+}
diff --git a/packages/app/e2e/browser/plan-approval.claude.real.spec.ts b/packages/app/e2e/browser/plan-approval.claude.real.spec.ts
new file mode 100644
index 0000000000..2994c63caf
--- /dev/null
+++ b/packages/app/e2e/browser/plan-approval.claude.real.spec.ts
@@ -0,0 +1,164 @@
+import { mkdtempSync, readFileSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { Page, TestInfo } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import {
+  allowPermission,
+  denyPermission,
+  waitForPermissionPrompt,
+} from "../support/helpers/permissions";
+import {
+  assertComposerIdle,
+  cleanupRewindFlow,
+  launchAgent,
+  type AgentHandle,
+} from "../support/helpers/rewind-flow";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
+
+const PLAN_PROMPT =
+  "Propose a concise plan to append one line Hello to README.md. Present it for approval using ExitPlanMode. Do not ask questions. Only implement after approval. If the plan is rejected, reply PLAN_REJECTED and stop without proposing another plan. After implementing an approved plan, reply PLAN_IMPLEMENTED.";
+
+async function requestPlan(page: Page, prompt: string): Promise<void> {
+  await submitMessage(page, prompt);
+  await waitForPermissionPrompt(page, 180_000);
+  await expect(page.getByTestId("permission-plan-card")).toContainText("README.md");
+}
+
+function planWithOutcome(page: Page, label: string) {
+  return page
+    .getByTestId("timeline-plan-card")
+    .filter({ has: page.getByRole("button", { name: label, exact: true }) });
+}
+
+async function expectPlanOutcome(page: Page, label: string, expanded: boolean): Promise<void> {
+  const card = planWithOutcome(page, label);
+  await expect(card).toHaveCount(1);
+  await expect(card.getByRole("button", { name: label, exact: true })).toHaveAttribute(
+    "aria-expanded",
+    String(expanded),
+  );
+}
+
+async function toggleRecordedPlan(page: Page, label: string, expanded: boolean): Promise<void> {
+  await planWithOutcome(page, label).getByRole("button", { name: label, exact: true }).click();
+  await expectPlanOutcome(page, label, expanded);
+}
+
+async function expectClaudeReply(page: Page, marker: string): Promise<void> {
+  await expect(page.getByTestId("assistant-message").filter({ hasText: marker })).toBeVisible({
+    timeout: 180_000,
+  });
+  await assertComposerIdle({ page });
+}
+
+async function restartIsolatedDaemon(): Promise<void> {
+  const port = Number(getE2EDaemonPort());
+  expect([6767, 6768]).not.toContain(port);
+  const client = await connectDaemonClient<{
+    connect(): Promise<void>;
+    close(): Promise<void>;
+    getDaemonStatus(): Promise<{ pid: number }>;
+    restartServer(reason: string): Promise<unknown>;
+  }>({ port, clientIdPrefix: "plan-history-restart" });
+  try {
+    const before = (await client.getDaemonStatus()).pid;
+    await client.restartServer("Verify plan history replay in the isolated Playwright daemon");
+    await expect
+      .poll(
+        async () => {
+          try {
+            return (await client.getDaemonStatus()).pid;
+          } catch {
+            return before;
+          }
+        },
+        { timeout: 60_000 },
+      )
+      .not.toBe(before);
+  } finally {
+    await client.close();
+  }
+}
+
+async function expectRecordedPlans(page: Page): Promise<void> {
+  await expect(page.getByTestId("timeline-plan-card")).toHaveCount(2, { timeout: 60_000 });
+  await expectPlanOutcome(page, "Rejected plan", false);
+  await expectPlanOutcome(page, "Approved plan", true);
+}
+
+interface PlanReview {
+  page: Page;
+  cwd: string;
+  testInfo: TestInfo;
+}
+
+async function withPlanReview(
+  page: Page,
+  testInfo: TestInfo,
+  review: (context: PlanReview) => Promise<void>,
+): Promise<void> {
+  const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-plan-lifecycle-")));
+  let handle: AgentHandle | undefined;
+  try {
+    handle = await launchAgent({
+      page,
+      provider: "claude",
+      cwd,
+      mode: "full-access",
+      providerConfig: { model: "haiku", modeId: "plan" },
+    });
+    await review({ page, cwd, testInfo });
+  } finally {
+    await cleanupRewindFlow({ handle, cwd });
+  }
+}
+
+async function rejectPlanWithoutImplementing({ page, cwd, testInfo }: PlanReview): Promise<void> {
+  await requestPlan(page, PLAN_PROMPT);
+  await denyPermission(page);
+  await expectClaudeReply(page, "PLAN_REJECTED");
+  await expectPlanOutcome(page, "Rejected plan", false);
+  await toggleRecordedPlan(page, "Rejected plan", true);
+  await expect(planWithOutcome(page, "Rejected plan")).toContainText("README.md");
+  await page.screenshot({ path: testInfo.outputPath("button-rejected-plan-expanded.png") });
+  await toggleRecordedPlan(page, "Rejected plan", false);
+  expect(readFileSync(path.join(cwd, "README.md"), "utf8")).not.toContain("Hello");
+}
+
+async function approveFreshPlanAndImplement({ page, cwd, testInfo }: PlanReview): Promise<void> {
+  await requestPlan(page, `Propose the plan again for a fresh approval. ${PLAN_PROMPT}`);
+  await allowPermission(page);
+  await expectClaudeReply(page, "PLAN_IMPLEMENTED");
+  expect(readFileSync(path.join(cwd, "README.md"), "utf8")).toContain("Hello");
+  await expectRecordedPlans(page);
+  await toggleRecordedPlan(page, "Approved plan", false);
+  await toggleRecordedPlan(page, "Approved plan", true);
+  await page.screenshot({ path: testInfo.outputPath("approved-plan.png") });
+}
+
+async function restoreReadablePlanHistory({ page, testInfo }: PlanReview): Promise<void> {
+  await restartIsolatedDaemon();
+  await page.reload();
+  await expectRecordedPlans(page);
+  await toggleRecordedPlan(page, "Rejected plan", true);
+  await expect(planWithOutcome(page, "Rejected plan")).toContainText("README.md");
+  await toggleRecordedPlan(page, "Rejected plan", false);
+  await page.screenshot({ path: testInfo.outputPath("restored-plans.png") });
+}
+
+test("Claude button rejection and approval preserve collapsible plans after daemon restart", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(420_000);
+  await withPlanReview(page, testInfo, async (review) => {
+    await test.step("Reject a plan without implementing it", () =>
+      rejectPlanWithoutImplementing(review));
+    await test.step("Approve and implement a fresh plan", () =>
+      approveFreshPlanAndImplement(review));
+    await test.step("Restore readable plans after daemon restart", () =>
+      restoreReadablePlanHistory(review));
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-button-example.spec.ts b/packages/app/e2e/browser/plugin-button-example.spec.ts
new file mode 100644
index 0000000000..5e708a2cdd
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-button-example.spec.ts
@@ -0,0 +1,13 @@
+import { test } from "../support/fixtures";
+import { withButtonAuthorExample } from "../support/helpers/plugin-button-example";
+
+test("the button author example shows each capability without a competing overflow button", async ({
+  page,
+}, info) => {
+  test.setTimeout(120_000);
+  await withButtonAuthorExample(page, info, async (buttons) => {
+    await buttons.refreshFromHeaderAndComposer();
+    await buttons.useMenusAndToggleButtons();
+    await buttons.inspectLiveWorkspaceDetails();
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-buttons.spec.ts b/packages/app/e2e/browser/plugin-buttons.spec.ts
new file mode 100644
index 0000000000..22eb61910b
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-buttons.spec.ts
@@ -0,0 +1,15 @@
+import { test } from "../support/fixtures";
+import { withButtonShowcase } from "../support/helpers/plugin-buttons";
+
+test("plugin header and composer buttons share actions, menus, content, and updates", async ({
+  page,
+}) => {
+  test.setTimeout(180_000);
+  await withButtonShowcase(page, async (buttons) => {
+    await buttons.verifyObservationLifetime();
+    await buttons.openWideMenusAndPopovers();
+    await buttons.runAndUpdateActions();
+    await buttons.openCompactSheets();
+    await buttons.hideAndUnloadOpenButtons();
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-host-ui.spec.ts b/packages/app/e2e/browser/plugin-host-ui.spec.ts
index 7fcc72bdb7..84d786033a 100644
--- a/packages/app/e2e/browser/plugin-host-ui.spec.ts
+++ b/packages/app/e2e/browser/plugin-host-ui.spec.ts
@@ -1,4 +1,5 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
@@ -11,8 +12,8 @@ import {
 
 const PLUGIN_ID = "plugin-host-ui-e2e";
 
-const PLUGIN_SOURCE = `import { usePaseo } from "@getpaseo/plugin";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/react-native";
+const PLUGIN_SOURCE = `import { usePaseo } from "@getpaseo/plugin/client";
+import { Icon, Modal, useToast } from "@getpaseo/plugin/client/react-native";
 import { useQueryClient } from "@tanstack/react-query";
 import React, { useState } from "react";
 import { Pressable, Text, View } from "react-native";
@@ -35,9 +36,18 @@ function ModalBody({ onSaved }) {
   </View>;
 }
 
-function Surface() {
+function Surface({ playAudio }) {
+  const [audioStatus, setAudioStatus] = useState("Audio ready");
+  async function play(base64) {
+    setAudioStatus("Playing audio");
+    try { await playAudio({ base64, mimeType: "audio/wav" }); setAudioStatus("Audio finished"); }
+    catch { setAudioStatus("Audio rejected"); }
+  }
   const [open, setOpen] = useState(false);
   return <View>
+    <Text>{audioStatus}</Text>
+    <Pressable accessibilityRole="button" onPress={() => play(AUDIO_BASE64)}><Text>Play plugin audio</Text></Pressable>
+    <Pressable accessibilityRole="button" onPress={() => play("UklGRg==")}><Text>Play invalid audio</Text></Pressable>
     <Pressable accessibilityRole="button" onPress={() => setOpen(true)}>
       <View style={{ flexDirection: "row" }}>
         <Icon name="Pencil" size={18} />
@@ -58,7 +68,7 @@ function Surface() {
 }
 
 export default function contribute(plugin) {
-  plugin.addSurface("main", Surface);
+  plugin.addSurface("main", () => <Surface playAudio={plugin.playAudio} />);
   plugin.addSidebarItem({
     id: "main",
     title: "Host UI",
@@ -118,8 +128,15 @@ test("plugin modal adapts its presentation and preserves host contexts", async (
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-host-ui-e2e-"));
   const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
   const previousConfig = await client.getDaemonConfig();
-  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
-  await writeFile(path.join(directory, "index.client.tsx"), PLUGIN_SOURCE);
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+  );
+  const audio = await readFile(path.resolve(__dirname, "../../assets/audio/thinking-tone.wav"));
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    `const AUDIO_BASE64 = ${JSON.stringify(audio.toString("base64"))};\n${PLUGIN_SOURCE}`,
+  );
 
   try {
     await client.patchDaemonConfig({ pluginsEnabled: true });
@@ -127,6 +144,12 @@ test("plugin modal adapts its presentation and preserves host contexts", async (
     await useNonCompactLayout(page);
     await openHostUiPlugin(page);
 
+    await test.step("plugin audio finishes, rejects corrupt files, and recovers", async () => {
+      await playPluginAudio(page, "Play plugin audio", "Audio finished");
+      await playPluginAudio(page, "Play invalid audio", "Audio rejected");
+      await playPluginAudio(page, "Play plugin audio", "Audio finished");
+    });
+
     await test.step("non-compact layouts use a centered dialog", async () => {
       await openPluginModal(page);
       await expectCenteredPluginDialog(page);
@@ -149,3 +172,8 @@ test("plugin modal adapts its presentation and preserves host contexts", async (
     await rm(directory, { recursive: true, force: true });
   }
 });
+
+async function playPluginAudio(page: Page, button: string, result: string) {
+  await page.getByRole("button", { name: button, exact: true }).click();
+  await expect(page.getByText(result, { exact: true })).toBeVisible();
+}
diff --git a/packages/app/e2e/browser/plugin-hosts.spec.ts b/packages/app/e2e/browser/plugin-hosts.spec.ts
new file mode 100644
index 0000000000..69364d2c42
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-hosts.spec.ts
@@ -0,0 +1,31 @@
+import { test } from "../support/fixtures";
+import { installHostClientsScenario, readHost } from "../support/helpers/plugin-hosts";
+
+test("plugin discovers offline hosts and borrows another host without installing there", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const hosts = await installHostClientsScenario(page);
+  try {
+    await hosts.expectOnline();
+    await readHost(page, "selected", "selected:plugins=true");
+    await readHost(page, "Secondary", `${hosts.serverId}:plugins=false`);
+    await hosts.disposeSecondaryAndExpectObservationReleased();
+    await readHost(page, "Secondary", `${hosts.serverId}:plugins=false`);
+    await readHost(page, "missing", "Unknown Paseo host: missing");
+    await hosts.reloadAndExpectObservationReleased();
+    await readHost(page, "Secondary", `${hosts.serverId}:plugins=false`);
+    await page.screenshot({ path: test.info().outputPath("two-hosts.png") });
+    await hosts.restartSecondary();
+    await hosts.expectOnline();
+    await readHost(page, "Secondary", `${hosts.serverId}:plugins=false`);
+    await hosts.useCompactLayout();
+    await readHost(page, "Secondary", `${hosts.serverId}:plugins=false`);
+    await page.screenshot({ path: test.info().outputPath("two-hosts-compact.png") });
+    await hosts.disconnectSecondary();
+    await readHost(page, "Secondary", `Paseo host is disconnected: ${hosts.serverId}`);
+    await readHost(page, "selected", "selected:plugins=true");
+  } finally {
+    await hosts.close();
+  }
+});
diff --git a/packages/app/e2e/browser/plugin-management.spec.ts b/packages/app/e2e/browser/plugin-management.spec.ts
index 823b792a5d..84b4cc63a2 100644
--- a/packages/app/e2e/browser/plugin-management.spec.ts
+++ b/packages/app/e2e/browser/plugin-management.spec.ts
@@ -1,16 +1,110 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import overviewCorpus from "../../../protocol/tests/fixtures/plugin-overview.json";
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
+import { execFileSync } from "node:child_process";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, test, type Page } from "../support/fixtures";
+import { pathToFileURL } from "node:url";
+import type { TestInfo } from "@playwright/test";
+import { buildOpenProjectRoute } from "@/utils/host-routes";
+import { expect, test as base, type Page } from "../support/fixtures";
 import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import { getServerId } from "../support/helpers/server-id";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { waitForSettledPosition } from "../support/helpers/sheet-layout";
 import {
   expectSettingsHeader,
+  openCompactSettings,
   openHostSection,
   openSettingsHost,
 } from "../support/helpers/settings";
 
+import {
+  startNpmRegistry,
+  npmPluginPackages,
+} from "../../../../scripts/test-support/npm-registry.mjs";
+
+interface PluginEnvironment {
+  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
+  directory: string;
+}
+
+const test = base.extend<
+  { pluginEnvironment: PluginEnvironment },
+  { npmRegistry: Awaited<ReturnType<typeof startNpmRegistry>> }
+>({
+  pluginEnvironment: async ({ e2eWorker: _e2eWorker }, provide) => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugins-e2e-"));
+    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+    const previous = await client.getDaemonConfig();
+    try {
+      await provide({ client, directory });
+    } finally {
+      try {
+        const current = await client.getDaemonConfig();
+        const existingIds = new Set(Object.keys(previous.config.plugins ?? {}));
+        for (const id of Object.keys(current.config.plugins ?? {})) {
+          if (!existingIds.has(id)) await client.removePlugin(id);
+        }
+      } finally {
+        try {
+          await client.patchDaemonConfig({
+            pluginsEnabled: previous.config.pluginsEnabled ?? false,
+          });
+        } finally {
+          try {
+            await client.close();
+          } finally {
+            await rm(directory, { recursive: true, force: true });
+          }
+        }
+      }
+    }
+  },
+  npmRegistry: [
+    async ({ browserName: _browserName }, provide) => {
+      const registry = await startNpmRegistry(npmPluginPackages());
+      try {
+        await provide(registry);
+      } finally {
+        await registry.close();
+      }
+    },
+    { scope: "worker" },
+  ],
+  e2eDaemonEnvironment: [
+    async ({ npmRegistry }, provide) => {
+      await provide(npmRegistry.env);
+    },
+    { scope: "worker" },
+  ],
+});
+
+async function advertisePluginCapabilities(
+  page: Page,
+  features: Record<string, boolean | undefined>,
+): Promise<void> {
+  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((message) => server.send(message));
+    server.onMessage((message) => {
+      if (typeof message !== "string") {
+        browser.send(message);
+        return;
+      }
+      const envelope = JSON.parse(message);
+      if (
+        envelope.message?.type === "status" &&
+        envelope.message.payload?.status === "server_info"
+      ) {
+        Object.assign(envelope.message.payload.features, features);
+      }
+      browser.send(JSON.stringify(envelope));
+    });
+  });
+}
+
 function observePluginCatalog(page: Page) {
   let responses = 0;
   page.on("websocket", (socket) => {
@@ -71,11 +165,28 @@ async function openPluginSettings(page: Page): Promise<void> {
   await expectSettingsHeader(page, "Plugins");
 }
 
+async function openCompactPluginSettings(page: Page): Promise<void> {
+  const serverId = getServerId();
+  await openCompactSettings(page, buildOpenProjectRoute());
+  await openHostSection(page, serverId, "plugins");
+  await expect(page.getByRole("textbox", { name: "Plugin source", exact: true })).toBeVisible();
+}
+
 async function reloadPlugin(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Reload", exact: true }).click();
+  await selectPluginAction(page, "e2e-plugin", "Reload");
   await expect(page.getByText("Reloaded e2e-plugin", { exact: true })).toBeVisible();
 }
 
+async function openPluginActions(page: Page, pluginId: string): Promise<void> {
+  await page.getByRole("button", { name: `Actions for ${pluginId}`, exact: true }).click();
+  await expect(page.getByRole("menuitem").first()).toBeVisible();
+}
+
+async function selectPluginAction(page: Page, pluginId: string, action: string): Promise<void> {
+  await openPluginActions(page, pluginId);
+  await page.getByRole("menuitem", { name: action, exact: true }).click();
+}
+
 async function expectContributionBody(page: Page, expectedBody: string): Promise<void> {
   const body = page.getByText(expectedBody, { exact: true }).filter({ visible: true });
   await expect(body).toHaveCount(1);
@@ -114,96 +225,458 @@ async function expectContributionRemoved(page: Page, title: string): Promise<voi
   await expect(page.getByRole("button", { name: title, exact: true })).not.toBeVisible();
 }
 
+async function capturePluginInstallForm(
+  page: Page,
+  testInfo: TestInfo,
+  name: "wide" | "wide-menu" | "compact-error" | "compact-success" | "compact-menu",
+): Promise<void> {
+  await page.screenshot({
+    path: testInfo.outputPath(`plugin-source-install-${name}.png`),
+    fullPage: true,
+    animations: "disabled",
+  });
+}
+
+async function installPlugin(page: Page, source: string): Promise<void> {
+  await page.getByLabel("Plugin source").fill(source);
+  await page.getByRole("button", { name: "Install plugin" }).click();
+}
+
+async function expectPluginSourceDocsOpen(page: Page): Promise<void> {
+  const requestedPage = page
+    .context()
+    .waitForEvent(
+      "request",
+      (request) => request.isNavigationRequest() && request.url().startsWith("https://paseo.sh/"),
+    );
+  const docsPagePromise = page.context().waitForEvent("page");
+  await page.getByRole("link", { name: "Docs", exact: true }).click();
+  const request = await requestedPage;
+  const docsPage = await docsPagePromise;
+  try {
+    expect(new URL(request.url()).pathname).toBe("/docs/plugins/reference");
+    // The deployed site can redirect while the matching website change is still in this PR.
+    await docsPage.waitForURL(
+      (url) => url.origin === "https://paseo.sh" && url.hash === "#plugin-sources",
+      { waitUntil: "commit" },
+    );
+  } finally {
+    await docsPage.close();
+  }
+}
+
+async function createGitPluginRepository(root: string): Promise<string> {
+  const repository = path.join(root, "repository");
+  await mkdir(repository);
+  await writeFile(
+    path.join(repository, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "git-e2e-plugin",
+      description: "Adds review tools from a Git repository",
+      requirements: pluginRequirements,
+    }),
+  );
+  await writeFile(path.join(repository, "index.client.tsx"), pluginSource("Git plugin"));
+  execFileSync("git", ["init", "-b", "main"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Paseo Tests"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["config", "user.email", "paseo@example.test"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["add", "-A"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "initial"], { cwd: repository, stdio: "ignore" });
+  return repository;
+}
+
+async function createDirectoryPlugin(
+  root: string,
+  id: string,
+  description: string | undefined,
+  title: string,
+): Promise<string> {
+  const directory = await mkdtemp(path.join(root, "plugin-row-"));
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id, description, requirements: pluginRequirements }),
+  );
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    `import React from "react";
+import { Text } from "react-native";
+export default function contribute(plugin) {
+  function Surface() { return <Text>${title}</Text>; }
+  plugin.addSurface("main", Surface);
+  plugin.addSidebarItem({ id: "main", title: ${JSON.stringify(title)}, icon: "Blocks", surface: "main" });
+  return () => undefined;
+}`,
+  );
+  return directory;
+}
+
+async function installFailedPlugin(
+  page: Page,
+  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
+  directory: string,
+): Promise<void> {
+  await client.installPluginSource({ source: directory });
+  await writeFile(path.join(directory, "index.client.tsx"), "export default broken !!!");
+  await client.reloadPlugin("failed-preview-plugin");
+  await expect(page.getByLabel("failed-preview-plugin failed")).toBeVisible();
+}
+
 test("installs, reloads, recovers, disables, and removes a trusted local plugin", async ({
   page,
-}) => {
-  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-e2e-"));
-  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-  const previous = await client.getDaemonConfig();
-  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: "e2e-plugin" }));
+  pluginEnvironment,
+}, testInfo) => {
+  const directory = await installLocalPluginWithStatusExamples(page, pluginEnvironment, testInfo);
+  await reloadAndRecoverLocalPlugin(page, pluginEnvironment.client, directory);
+  await toggleRemoveAndReinstallLocalPlugin(page, directory);
+});
+
+test("installs a Git source after a failed source remains editable", async ({
+  page,
+  pluginEnvironment,
+}, testInfo) => {
+  const source = await prepareCompactGitInstall(page, pluginEnvironment);
+  await retryGitInstallAndInspectRows(page, source, testInfo);
+});
+
+for (const sourceSupport of [undefined, false]) {
+  test(`keeps installed plugins manageable without source capability (${sourceSupport})`, async ({
+    page,
+    pluginEnvironment,
+  }) => {
+    const directory = await prepareLegacyPluginHost(page, pluginEnvironment, sourceSupport);
+    await verifyLegacyPluginManagement(page, directory);
+  });
+}
+
+for (const viewport of [
+  { width: 1280, height: 900 },
+  { width: 390, height: 844 },
+]) {
+  test(`installs an npm source and manages its row at ${viewport.width}px`, async ({
+    page,
+    pluginEnvironment,
+  }, testInfo) => {
+    await prepareNpmPluginHost(page, pluginEnvironment, viewport);
+    await retryNpmInstallAndInspectRow(page, viewport.width, testInfo);
+    await reloadAndRemoveNpmPlugin(page);
+  });
+}
+
+async function openNpmPluginSettings(page: Page, width: number) {
+  if (width < 600) await openCompactPluginSettings(page);
+  else await openPluginSettings(page);
+}
+
+async function expectSourceHierarchy(page: Page, description: string, source: string) {
+  const descriptionText = page.getByText(description, { exact: false });
+  const sourceText = page.getByText(source, { exact: false });
+  const descriptionSize = await descriptionText.evaluate((element) =>
+    Number.parseFloat(getComputedStyle(element).fontSize),
+  );
+  const sourceSize = await sourceText.evaluate((element) =>
+    Number.parseFloat(getComputedStyle(element).fontSize),
+  );
+  expect(sourceSize).toBeLessThan(descriptionSize);
+  await expect(sourceText).toHaveCSS("color", "rgb(161, 161, 170)");
+  await expect(descriptionText).toHaveCSS("color", "rgb(113, 113, 122)");
+}
+
+async function installLocalPluginWithStatusExamples(
+  page: Page,
+  pluginEnvironment: PluginEnvironment,
+  testInfo: TestInfo,
+) {
+  const directory = await mkdtemp(path.join(pluginEnvironment.directory, "local-"));
+  const disabledDirectory = await createDirectoryPlugin(
+    pluginEnvironment.directory,
+    "disabled-preview-plugin-with-a-long-name",
+    "Keeps optional previews off until this plugin is enabled",
+    "Preview plugin",
+  );
+  const failedDirectory = await createDirectoryPlugin(
+    pluginEnvironment.directory,
+    "failed-preview-plugin",
+    "Demonstrates a plugin that needs attention",
+    "Failed preview plugin",
+  );
+  const { client } = pluginEnvironment;
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "e2e-plugin",
+      description: "Exercises the complete local plugin lifecycle",
+      requirements: pluginRequirements,
+    }),
+  );
   await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Plugin v1"));
 
-  try {
-    const catalog = observePluginCatalog(page);
-    await gotoAppShell(page);
-    await openPluginSettings(page);
-    await catalog.waitForInitialFetch();
-    await client.patchDaemonConfig({ pluginsEnabled: false });
-    await page.getByRole("switch", { name: "Enable plugins" }).click();
-    await expect(page.getByText("Plugins enabled", { exact: true })).toBeVisible();
-    await page.getByLabel("Plugin directory").fill(directory);
-    await page.getByLabel("Plugin installation ID").focus();
-    await expect(page.getByLabel("Plugin installation ID")).toHaveValue("e2e-plugin");
-    await page.getByRole("button", { name: "Install directory" }).click();
-    await expect(page.getByText("Installed e2e-plugin", { exact: true })).toBeVisible();
-    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
-    await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 0");
+  const catalog = observePluginCatalog(page);
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+  await catalog.waitForInitialFetch();
+  await expect(page.getByRole("textbox", { name: "Plugin installation ID" })).toHaveCount(0);
+  await expectPluginSourceDocsOpen(page);
+  await client.patchDaemonConfig({ pluginsEnabled: false });
+  await page.getByRole("switch", { name: "Enable plugins" }).click();
+  await expect(page.getByText("Plugins enabled", { exact: true })).toBeVisible();
+  await client.installPluginSource({ source: disabledDirectory });
+  await client.disablePlugin("disabled-preview-plugin-with-a-long-name");
+  await installFailedPlugin(page, client, failedDirectory);
+  await page.getByLabel("Plugin source").fill(directory);
+  await page.getByRole("button", { name: "Install plugin" }).click();
+  await expect(page.getByText("Installed e2e-plugin", { exact: true })).toBeVisible();
+  await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+  await expect(page.getByText("Exercises the complete local plugin lifecycle")).toBeVisible();
+  await expect(
+    page.getByText("Keeps optional previews off until this plugin is enabled"),
+  ).toBeVisible();
+  await expect(page.getByText("Demonstrates a plugin that needs attention")).toBeVisible();
+  await expect(page.getByLabel("disabled-preview-plugin-with-a-long-name disabled")).toBeVisible();
+  await expect(page.getByLabel("failed-preview-plugin failed")).toBeVisible();
+  await capturePluginInstallForm(page, testInfo, "wide");
+  await openPluginActions(page, "e2e-plugin");
+  await capturePluginInstallForm(page, testInfo, "wide-menu");
+  await page.getByRole("menuitem", { name: "Logs", exact: true }).click();
+  await expect(page.getByRole("dialog")).toContainText("Logs: e2e-plugin");
+  await page.getByRole("button", { name: "Close", exact: true }).click();
+  await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 0");
 
-    await openPluginSettings(page);
-    await reloadPlugin(page);
-    await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 1");
+  return directory;
+}
 
-    await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Plugin v2"));
-    await openPluginSettings(page);
-    await reloadPlugin(page);
-    await openContributionFromSettings(page, "Plugin v2", "Plugin v2 cleanup 2");
-    await expect(page.getByRole("button", { name: "Plugin v1", exact: true })).not.toBeVisible();
+async function reloadAndRecoverLocalPlugin(
+  page: Page,
+  client: PluginEnvironment["client"],
+  directory: string,
+) {
+  await openPluginSettings(page);
+  await reloadPlugin(page);
+  await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 1");
 
-    await writeFile(
-      path.join(directory, "index.client.tsx"),
-      pluginSource("Broken surface", "render exploded"),
-    );
-    await openPluginSettings(page);
-    await reloadPlugin(page);
-    await openContributionFromSettings(page, "Broken surface", "Plugin failed: render exploded");
-    await openContribution(page, "Healthy surface", "Healthy contribution");
-    await openContribution(page, "Broken surface", "Plugin failed: render exploded");
+  await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Plugin v2"));
+  await openPluginSettings(page);
+  await reloadPlugin(page);
+  await openContributionFromSettings(page, "Plugin v2", "Plugin v2 cleanup 2");
+  await expect(page.getByRole("button", { name: "Plugin v1", exact: true })).not.toBeVisible();
 
-    await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Recovered surface"));
-    await reloadActiveContribution(page, client, "Recovered surface cleanup 4");
-    await expect(
-      page.getByRole("button", { name: "Broken surface", exact: true }),
-    ).not.toBeVisible();
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    pluginSource("Broken surface", "render exploded"),
+  );
+  await openPluginSettings(page);
+  await reloadPlugin(page);
+  await openContributionFromSettings(page, "Broken surface", "Plugin failed: render exploded");
+  await openContribution(page, "Healthy surface", "Healthy contribution");
+  await openContribution(page, "Broken surface", "Plugin failed: render exploded");
 
-    await writeFile(path.join(directory, "index.client.tsx"), "export default broken syntax !!!");
-    await openPluginSettings(page);
-    await page.getByRole("button", { name: "Reload", exact: true }).click();
-    await expect(page.getByTestId("plugin-management-feedback")).toContainText("Request failed");
-    await expect(page.getByLabel("e2e-plugin failed")).toBeVisible();
-    await leavePluginSettings(page);
-    await expectContributionRemoved(page, "Recovered surface");
+  await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Recovered surface"));
+  await reloadActiveContribution(page, client, "Recovered surface cleanup 4");
+  await expect(page.getByRole("button", { name: "Broken surface", exact: true })).not.toBeVisible();
 
-    await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Plugin v3"));
-    await openPluginSettings(page);
-    await page.getByRole("button", { name: "Reload", exact: true }).click();
-    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
-    await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 5");
+  await writeFile(path.join(directory, "index.client.tsx"), "export default broken syntax !!!");
+  await openPluginSettings(page);
+  await selectPluginAction(page, "e2e-plugin", "Reload");
+  await expect(page.getByTestId("plugin-management-feedback")).toContainText("Request failed");
+  await expect(page.getByLabel("e2e-plugin failed")).toBeVisible();
+  await leavePluginSettings(page);
+  await expectContributionRemoved(page, "Recovered surface");
 
-    await openPluginSettings(page);
-    await page.getByRole("button", { name: "Disable", exact: true }).click();
-    await expect(page.getByLabel("e2e-plugin disabled")).toBeVisible();
-    await leavePluginSettings(page);
-    await expectContributionRemoved(page, "Plugin v3");
+  await writeFile(path.join(directory, "index.client.tsx"), pluginSource("Plugin v3"));
+  await openPluginSettings(page);
+  await selectPluginAction(page, "e2e-plugin", "Reload");
+  await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+  await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 5");
+}
 
-    await openPluginSettings(page);
-    await page.getByRole("button", { name: "Enable", exact: true }).click();
-    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
-    await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 6");
+async function toggleRemoveAndReinstallLocalPlugin(page: Page, directory: string) {
+  await openPluginSettings(page);
+  await page.getByRole("switch", { name: "e2e-plugin: Disable", exact: true }).click();
+  await expect(page.getByLabel("e2e-plugin disabled")).toBeVisible();
+  await leavePluginSettings(page);
+  await expectContributionRemoved(page, "Plugin v3");
 
-    await openPluginSettings(page);
-    page.once("dialog", (dialog) => dialog.accept());
-    await page.getByRole("button", { name: "Remove", exact: true }).click();
-    await expect(page.getByText("No plugins configured", { exact: true })).toBeVisible();
+  await openPluginSettings(page);
+  await page.getByRole("switch", { name: "e2e-plugin: Enable", exact: true }).click();
+  await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+  await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 6");
 
-    await page.getByLabel("Plugin directory").fill(directory);
-    await page.getByRole("button", { name: "Install directory" }).click();
-    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
-    await gotoAppShell(page);
-    await openContribution(page, "Plugin v3", "Plugin v3 cleanup 7");
-  } finally {
-    await client.removePlugin("e2e-plugin").catch(() => undefined);
-    await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
-    await client.close().catch(() => undefined);
-    await rm(directory, { recursive: true, force: true });
-  }
+  await openPluginSettings(page);
+  page.once("dialog", (dialog) => dialog.accept());
+  await selectPluginAction(page, "e2e-plugin", "Remove");
+  await expect(page.getByTestId("plugin-row-e2e-plugin")).toHaveCount(0);
+
+  await installPlugin(page, directory);
+  await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+  await gotoAppShell(page);
+  await openContribution(page, "Plugin v3", "Plugin v3 cleanup 7");
+}
+
+async function prepareCompactGitInstall(page: Page, pluginEnvironment: PluginEnvironment) {
+  const root = pluginEnvironment.directory;
+  const repository = await createGitPluginRepository(root);
+  const longDirectory = await createDirectoryPlugin(
+    pluginEnvironment.directory,
+    "compact-plugin-with-a-realistically-long-name",
+    "Shows how a realistically long plugin description wraps on a compact screen",
+    "Compact long plugin",
+  );
+  const disabledDirectory = await createDirectoryPlugin(
+    pluginEnvironment.directory,
+    "compact-disabled-plugin",
+    "Remains installed and ready to enable later",
+    "Compact disabled plugin",
+  );
+  const missingSource = path.join(root, "missing-plugin");
+  const { client } = pluginEnvironment;
+
+  await page.setViewportSize({ width: 390, height: 844 });
+  await client.installPluginSource({ source: longDirectory });
+  await client.installPluginSource({ source: disabledDirectory });
+  await client.disablePlugin("compact-disabled-plugin");
+  await gotoAppShell(page);
+  await openCompactPluginSettings(page);
+  await expect(page.getByRole("textbox", { name: "Plugin installation ID" })).toHaveCount(0);
+  await client.patchDaemonConfig({ pluginsEnabled: false });
+  await page.getByRole("switch", { name: "Enable plugins" }).click();
+  await expect(page.getByText("Plugins enabled", { exact: true })).toBeVisible();
+
+  return { repository, missingSource };
+}
+
+async function retryGitInstallAndInspectRows(
+  page: Page,
+  source: { repository: string; missingSource: string },
+  testInfo: TestInfo,
+) {
+  const { repository, missingSource } = source;
+
+  await installPlugin(page, missingSource);
+  await expect(page.getByTestId("plugin-management-feedback")).toContainText(
+    `Plugin directory does not exist: ${missingSource}`,
+  );
+  await expect(page.getByLabel("Plugin source")).toHaveValue(missingSource);
+  await capturePluginInstallForm(page, testInfo, "compact-error");
+
+  await installPlugin(page, pathToFileURL(repository).href);
+  await expect(page.getByText("Installed git-e2e-plugin", { exact: true })).toBeVisible();
+  await expect(page.getByLabel("git-e2e-plugin running")).toBeVisible();
+  await expect(
+    page.getByText("Shows how a realistically long plugin description wraps on a compact screen"),
+  ).toBeVisible();
+  await expect(page.getByLabel("compact-disabled-plugin disabled")).toBeVisible();
+  await expect(page.getByLabel("Plugin source")).toHaveValue("");
+  await capturePluginInstallForm(page, testInfo, "compact-success");
+  await openPluginActions(page, "git-e2e-plugin");
+  const removeAction = page.getByRole("menuitem", { name: "Remove", exact: true });
+  await expect(removeAction).toBeInViewport({ ratio: 1 });
+  await waitForSettledPosition(removeAction);
+  await capturePluginInstallForm(page, testInfo, "compact-menu");
+  await page.keyboard.press("Escape");
+}
+
+async function prepareLegacyPluginHost(
+  page: Page,
+  pluginEnvironment: PluginEnvironment,
+  sourceSupport: boolean | undefined,
+) {
+  const directory = await createDirectoryPlugin(
+    pluginEnvironment.directory,
+    "legacy-source-plugin",
+    undefined,
+    "Legacy plugin",
+  );
+  const { client } = pluginEnvironment;
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await client.installPluginSource({ source: directory });
+  await advertisePluginCapabilities(page, {
+    pluginSourceInstallation: sourceSupport,
+    pluginGitManagement: true,
+  });
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+
+  return directory;
+}
+
+async function verifyLegacyPluginManagement(page: Page, directory: string) {
+  await expect(
+    page.getByText("Update this host to install plugins", { exact: true }),
+  ).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Plugin source", exact: true })).toHaveCount(0);
+  await expect(page.getByText(directory, { exact: true })).toBeVisible();
+  await selectPluginAction(page, "legacy-source-plugin", "Reload");
+  await expect(page.getByText("Reloaded legacy-source-plugin", { exact: true })).toBeVisible();
+}
+
+async function prepareNpmPluginHost(
+  page: Page,
+  pluginEnvironment: PluginEnvironment,
+  viewport: { width: number; height: number },
+) {
+  const { client } = pluginEnvironment;
+  await page.setViewportSize(viewport);
+  await advertisePluginCapabilities(page, { pluginGitManagement: false });
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await gotoAppShell(page);
+  await openNpmPluginSettings(page, viewport.width);
+}
+
+async function retryNpmInstallAndInspectRow(page: Page, width: number, testInfo: TestInfo) {
+  await installPlugin(page, "npm:missing-plugin");
+  await expect(page.getByTestId("plugin-management-feedback")).toContainText("404");
+  await expect(page.getByLabel("Plugin source")).toHaveValue("npm:missing-plugin");
+  await installPlugin(page, "npm:@paseo-fixture/review@^2.0.0");
+  await expect(page.getByText("Installed npm-review", { exact: true })).toBeVisible();
+  await expect(page.getByLabel("npm-review running")).toBeVisible();
+  await expectSourceHierarchy(
+    page,
+    "Installed from the npm fixture registry",
+    "npm:@paseo-fixture/review · 2.0.0",
+  );
+  await expect(
+    page.getByText("Installed from the npm fixture registry", { exact: true }),
+  ).toBeVisible();
+  await page.screenshot({
+    path: testInfo.outputPath(`npm-plugin-${width}.png`),
+    animations: "disabled",
+  });
+}
+
+async function reloadAndRemoveNpmPlugin(page: Page) {
+  await selectPluginAction(page, "npm-review", "Reload");
+  await expect(page.getByText("Reloaded npm-review", { exact: true })).toBeVisible();
+  page.once("dialog", (dialog) => dialog.accept());
+  await selectPluginAction(page, "npm-review", "Remove");
+  await expect(page.getByText("Removed npm-review", { exact: true })).toBeVisible();
+  await expect(page.getByLabel("npm-review running")).toHaveCount(0);
+}
+
+test("renders installed-plugin descriptions as plain text", async ({ page, pluginEnvironment }) => {
+  const description = overviewCorpus.map(({ markdown }) => markdown).join("\n\n");
+  await installPluginWithUntrustedDescription(pluginEnvironment, description);
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+  const text = page.getByText(description, { exact: true });
+  await expect(text).toBeVisible();
+  // This field must remain a text node, with no Markdown links, images, or HTML children.
+  expect(await text.evaluate((element) => element.childElementCount)).toBe(0);
 });
+
+async function installPluginWithUntrustedDescription(
+  environment: PluginEnvironment,
+  description: string,
+) {
+  const directory = await createDirectoryPlugin(
+    environment.directory,
+    "plain-text-plugin",
+    description,
+    "Plain text plugin",
+  );
+  await environment.client.installPluginSource({ source: directory });
+}
diff --git a/packages/app/e2e/browser/plugin-modal-body.spec.ts b/packages/app/e2e/browser/plugin-modal-body.spec.ts
new file mode 100644
index 0000000000..bdd822b9c8
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-modal-body.spec.ts
@@ -0,0 +1,165 @@
+import { copyPluginExample } from "../support/helpers/plugin-fixture";
+import { expect, test as base, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  openMobileAgentSidebar,
+  expectMobileAgentSidebarVisible,
+} from "../support/helpers/sidebar";
+
+async function openExample(page: Page, example: string) {
+  await page.getByRole("button", { name: `Open ${example}`, exact: true }).click();
+  await expect(page.getByText(`Modal example: ${example}`, { exact: true })).toBeVisible();
+}
+
+async function closeExample(page: Page) {
+  await page.getByRole("button", { name: "Close", exact: true }).last().click();
+  // The launcher is visible behind a closing sheet; wait for dismissal before reopening.
+  await expect(page.getByText(/^Modal example:/)).toHaveCount(0);
+  await expect(page.getByRole("button", { name: "Open Form", exact: true })).toBeVisible();
+}
+
+async function copyAndPaste(page: Page) {
+  await page.getByRole("button", { name: "Copy text", exact: true }).click();
+  await expect(page.getByText("Text copied", { exact: true })).toBeVisible();
+  expect(await page.evaluate(() => navigator.clipboard.readText())).toBe("Copied from Paseo");
+  await page.getByRole("textbox", { name: "Paste here" }).focus();
+  await page.keyboard.press("ControlOrMeta+A");
+  await page.keyboard.press("ControlOrMeta+V");
+  await expect(page.getByRole("textbox", { name: "Paste here" })).toHaveValue("Copied from Paseo");
+}
+
+async function scrollToLastRow(page: Page) {
+  await page.getByRole("button", { name: "Row 1", exact: true }).hover();
+  await page.mouse.wheel(0, 7000);
+  await expect(page.getByRole("button", { name: "Row 100", exact: true })).toBeInViewport();
+  await page.getByRole("button", { name: "Row 100", exact: true }).click();
+}
+
+async function expectSingleInset(page: Page, left = "24px", bottom = "24px") {
+  const form = await page.getByTestId("modal-example-form").boundingBox();
+  const input = await page.getByRole("textbox", { name: "Paste here" }).boundingBox();
+  expect(form).not.toBeNull();
+  expect(input?.x).toBe(form?.x);
+  // The real content View owns the inset, not a third-party contentContainerStyle.
+  const padding = await page.getByTestId("modal-example-form").evaluate((node) => {
+    const content = node.parentElement!;
+    return {
+      left: getComputedStyle(content).paddingLeft,
+      bottom: getComputedStyle(content).paddingBottom,
+    };
+  });
+  expect(padding).toEqual({ left, bottom });
+}
+
+async function expectFullBleed(page: Page) {
+  const padding = await page
+    .getByRole("button", { name: "Row 1", exact: true })
+    .evaluate((node) => {
+      const content = node.parentElement!;
+      return {
+        left: getComputedStyle(content).paddingLeft,
+        bottom: getComputedStyle(content).paddingBottom,
+      };
+    });
+  expect(padding).toEqual({ left: "0px", bottom: "0px" });
+}
+
+async function exerciseBodies(page: Page) {
+  await openExample(page, "Form");
+  await expectSingleInset(page);
+  await copyAndPaste(page);
+  await closeExample(page);
+  await openExample(page, "Custom inset");
+  await expectSingleInset(page, "8px", "40px");
+  await closeExample(page);
+  await openExample(page, "Full bleed");
+  await expectFullBleed(page);
+  await scrollToLastRow(page);
+  await closeExample(page);
+  await openExample(page, "ScrollView");
+  await scrollToLastRow(page);
+  await closeExample(page);
+  await openExample(page, "FlatList");
+  await page.getByRole("button", { name: "Jump to last row", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Row 100", exact: true })).toBeInViewport();
+  await closeExample(page);
+  await openExample(page, "Horizontal");
+  await page.getByRole("button", { name: "Overview", exact: true }).hover();
+  await page.mouse.wheel(900, 0);
+  await expect(page.getByRole("button", { name: "System logs", exact: true })).toBeInViewport();
+  await page.getByRole("button", { name: "System logs", exact: true }).click();
+  await closeExample(page);
+  await expect(page.getByText("Selected: System logs", { exact: true })).toBeVisible();
+}
+
+const test = base.extend<{ modalExample: Page }>({
+  modalExample: async ({ page, context }, provide) => {
+    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+    const previous = await client.getDaemonConfig();
+    const example = await copyPluginExample("modal-ui");
+    try {
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(example.directory);
+      await context.grantPermissions(["clipboard-read", "clipboard-write"]);
+      await provide(page);
+    } finally {
+      await client.removePlugin("modal-ui-example").catch(() => undefined);
+      await client
+        .patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false })
+        .catch(() => undefined);
+      await client.close().catch(() => undefined);
+      await example.cleanup();
+    }
+  },
+});
+
+async function openWideExamples(page: Page) {
+  await page.setViewportSize({ width: 1100, height: 800 });
+  await gotoAppShell(page);
+  await page.getByRole("button", { name: "Modal examples", exact: true }).click();
+}
+
+async function openCompactExamples(page: Page) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openMobileAgentSidebar(page);
+  await expectMobileAgentSidebarVisible(page);
+  await page.getByRole("button", { name: "Modal examples", exact: true }).click();
+}
+
+async function expectDeniedCopyFeedback(page: Page) {
+  const cdp = await page.context().newCDPSession(page);
+  try {
+    const { targetInfo } = await cdp.send("Target.getTargetInfo");
+    await cdp.send("Browser.setPermission", {
+      browserContextId: targetInfo.browserContextId,
+      permission: { name: "clipboard-write" },
+      setting: "denied",
+      origin: new URL(page.url()).origin,
+    });
+    expect(
+      await page.evaluate(
+        async () =>
+          (await navigator.permissions.query({ name: "clipboard-write" as PermissionName })).state,
+      ),
+    ).toBe("denied");
+    await openExample(page, "Form");
+    await page.getByRole("button", { name: "Copy text", exact: true }).click();
+    await expect(
+      page.getByText("Could not copy text. Select the text and use Copy.", { exact: true }),
+    ).toBeVisible();
+    await closeExample(page);
+  } finally {
+    await cdp.detach();
+  }
+}
+
+test("plugin bodies support padding, scroll ownership, horizontal tabs and clipboard on wide and compact layouts", async ({
+  modalExample: page,
+}) => {
+  await openWideExamples(page);
+  await test.step("wide dialogs", () => exerciseBodies(page));
+  await openCompactExamples(page);
+  await test.step("compact sheets", () => exerciseBodies(page));
+  await test.step("denied clipboard writes report failure", () => expectDeniedCopyFeedback(page));
+});
diff --git a/packages/app/e2e/browser/plugin-provider-icons.spec.ts b/packages/app/e2e/browser/plugin-provider-icons.spec.ts
new file mode 100644
index 0000000000..32093cb275
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-provider-icons.spec.ts
@@ -0,0 +1,16 @@
+import {
+  test,
+  verifyProviderSettings,
+  verifyNewWorkspaceModelIcon,
+  verifyCompactModelIcon,
+  verifyExistingAgentModelIcon,
+} from "../support/helpers/plugin-provider-icons";
+
+test("plugin provider icons follow the model through settings and wide and compact composers", async ({
+  providerIcons,
+}) => {
+  await verifyProviderSettings(providerIcons);
+  await verifyNewWorkspaceModelIcon(providerIcons);
+  await verifyCompactModelIcon(providerIcons);
+  await verifyExistingAgentModelIcon(providerIcons);
+});
diff --git a/packages/app/e2e/browser/plugin-requirements.spec.ts b/packages/app/e2e/browser/plugin-requirements.spec.ts
new file mode 100644
index 0000000000..832e3f1611
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-requirements.spec.ts
@@ -0,0 +1,18 @@
+import {
+  test,
+  openRequirementHost,
+  expectAppMismatch,
+  correctRequirementAndReload,
+  rejectDaemonMismatch,
+} from "../support/helpers/plugin-requirements";
+
+test("shows which runtime is incompatible and recovers after the requirement is corrected", async ({
+  page,
+  requirementHost,
+}) => {
+  await openRequirementHost(page, requirementHost);
+  await expectAppMismatch(page);
+  await correctRequirementAndReload(page, requirementHost.directory);
+  await rejectDaemonMismatch(page, requirementHost.directory);
+  await correctRequirementAndReload(page, requirementHost.directory);
+});
diff --git a/packages/app/e2e/browser/plugin-settings.spec.ts b/packages/app/e2e/browser/plugin-settings.spec.ts
new file mode 100644
index 0000000000..6235cd647f
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-settings.spec.ts
@@ -0,0 +1,68 @@
+import {
+  test,
+  openDisplaySettings,
+  openCompactDisplaySettings,
+  groupByWorkspace,
+  hideMetadata,
+  reloadSavedDisplaySettings,
+  editTitle,
+  replaceTitle,
+  saveTitle,
+  expectTitleRequired,
+  expectSavedTitle,
+  changeMetadataFromAnotherClient,
+  expectConflictPreservesDraft,
+  discardTitle,
+  returnAndReopenSettings,
+  returnToPluginsPage,
+  expectSettingsUnavailable,
+} from "../support/helpers/plugin-settings";
+
+test("display preferences survive a reload", async ({ page }) => {
+  await openDisplaySettings(page);
+  await groupByWorkspace(page);
+  await hideMetadata(page);
+  await reloadSavedDisplaySettings(page);
+});
+
+test("invalid titles stay editable until a valid title is saved", async ({ page }) => {
+  await openDisplaySettings(page);
+  await editTitle(page, "");
+  await saveTitle(page);
+  await expectTitleRequired(page);
+  await replaceTitle(page, "My monitor");
+  await saveTitle(page);
+  await expectSavedTitle(page, "My monitor");
+});
+
+test("another client's save preserves a conflicting draft", async ({ page }) => {
+  await openDisplaySettings(page);
+  await editTitle(page, "Unsaved title");
+  await changeMetadataFromAnotherClient(page);
+  await saveTitle(page);
+  await expectConflictPreservesDraft(page, "Unsaved title");
+  await discardTitle(page);
+});
+
+test("Back to plugins returns from a plugin settings screen", async ({ page }) => {
+  await openDisplaySettings(page);
+  await returnToPluginsPage(page);
+});
+
+test.describe("compact plugin settings", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+
+  test("Back and plugin re-enable restore the settings screen", async ({
+    page,
+    settingsPlugin,
+  }) => {
+    await openCompactDisplaySettings(page);
+    await groupByWorkspace(page);
+    await hideMetadata(page);
+    await returnAndReopenSettings(page);
+    await settingsPlugin.disablePlugin("settings-example");
+    await expectSettingsUnavailable(page);
+    await settingsPlugin.enablePlugin("settings-example");
+    await reloadSavedDisplaySettings(page);
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-sidebar-items.spec.ts b/packages/app/e2e/browser/plugin-sidebar-items.spec.ts
new file mode 100644
index 0000000000..900fb42db9
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-sidebar-items.spec.ts
@@ -0,0 +1,483 @@
+import path from "node:path";
+import type { Locator, Page } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  BOTS_PLUGIN_ID,
+  COMPACT,
+  LEGACY_PLUGIN_ID,
+  SHOWCASE_PLUGIN_ID,
+  WIDE,
+  closeScreen,
+  expectRowActive,
+  footerItem,
+  headerRow,
+  installSidebarPlugins,
+  popoverBox,
+  runCommand,
+  visibleTestId,
+} from "../support/helpers/plugin-sidebar-items";
+import {
+  leaveSettings,
+  openSidebarNavSettings,
+  seedSidebarFooterPreferences,
+  setFooterItemVisible,
+} from "../support/helpers/sidebar-nav-settings";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { installUsageReportsFixture } from "../support/helpers/usage-reports";
+import { claudeAndCodexReports } from "../support/helpers/usage-sidebar-item";
+
+const APP_SETTINGS_KEY = "@paseo:app-settings";
+
+/** Set PASEO_QA_SCREENSHOT_DIR to keep QA screenshots of each state. */
+async function qaScreenshot(page: Page, name: string, area?: Locator) {
+  const directory = process.env.PASEO_QA_SCREENSHOT_DIR;
+  if (!directory) return;
+  // Let popover, sheet and drawer animations settle so the image shows the final state.
+  await page.waitForTimeout(600);
+  // Expo's fast-refresh indicator sits over the footer's Hosts icon.
+  await page.addStyleTag({ content: ".__expo_fast_refresh { display: none !important; }" });
+  const file = path.join(directory, `${name}.png`);
+  if (area) await area.screenshot({ path: file });
+  else await page.screenshot({ path: file });
+}
+
+/** Footer rows sit above the fixed bottom line, spanning it from Add project to Settings. */
+async function expectFooterRow(page: Page, row: Locator) {
+  // Polled: on compact the drawer is still sliding in when the row first shows.
+  await expect
+    .poll(async () => {
+      const addProject = (await visibleTestId(page, "sidebar-add-project").boundingBox())!;
+      const settings = (await visibleTestId(page, "sidebar-settings").boundingBox())!;
+      const box = (await row.boundingBox())!;
+      return {
+        aboveBottomLine: box.y + box.height <= addProject.y,
+        alignedLeft: Math.abs(box.x - addProject.x) < 1,
+        alignedRight: Math.abs(box.x + box.width - (settings.x + settings.width)) < 1,
+      };
+    })
+    .toEqual({ aboveBottomLine: true, alignedLeft: true, alignedRight: true });
+}
+
+function botRow(page: Page, rowId: string): Locator {
+  return headerRow(page, BOTS_PLUGIN_ID, `bots-${rowId}`);
+}
+
+async function boxOf(locator: Locator) {
+  const result = await locator.boundingBox();
+  expect(result).not.toBeNull();
+  return result!;
+}
+
+/** The open screen's header title; a pushed screen keeps the one below it mounted. */
+function screenTitle(page: Page): Locator {
+  return page.locator('[data-testid="plugin-surface-title"]:visible').last();
+}
+
+async function expectBotScreen(page: Page, botId: string) {
+  await expect(page).toHaveURL(
+    new RegExp(`/plugin/${BOTS_PLUGIN_ID}/surface/bot\\?param\\.botId=${botId}$`),
+  );
+  await expect(page.getByText(`Bot screen: ${botId}`, { exact: true })).toBeVisible();
+  // The plugin titles the screen from its params: the bot's name.
+  await expect(screenTitle(page)).toHaveText(botId === "bot-1" ? "Bot 1" : "Bot 2");
+  await expectRowActive(botRow(page, "bot-1"), botId === "bot-1");
+  await expectRowActive(botRow(page, "bot-2"), botId === "bot-2");
+  await expectRowActive(botRow(page, "status"), false);
+}
+
+/** The popover opens to the right of `row`, level with it, and away from `elsewhere`. */
+async function expectPopoverBeside(page: Page, text: string, row: Locator, elsewhere: Locator) {
+  const popover = await popoverBox(page, text);
+  const rowBox = await boxOf(row);
+  const otherBox = await boxOf(elsewhere);
+  expect(popover.x).toBeGreaterThanOrEqual(rowBox.x + rowBox.width);
+  expect(Math.abs(popover.y - rowBox.y)).toBeLessThan(40);
+  expect(Math.abs(popover.y - otherBox.y)).toBeGreaterThan(20);
+}
+
+/** Subscription ids the daemon confirms released, collected from the page's websocket. */
+function trackReleasedSubscriptions(page: Page): Set<string> {
+  const released = new Set<string>();
+  page.on("websocket", (socket) =>
+    socket.on("framereceived", ({ payload }) => collectRelease(released, payload)),
+  );
+  return released;
+}
+
+function collectRelease(released: Set<string>, payload: string | Buffer) {
+  if (typeof payload !== "string") return;
+  const frame = JSON.parse(payload);
+  if (frame.message?.type === "subscription.release.response")
+    released.add(frame.message.payload.subscriptionId);
+}
+
+async function expectReleased(released: Set<string>, subscriptionId: string) {
+  await expect.poll(() => released.has(subscriptionId)).toBe(true);
+}
+
+function readAlertsObservation(page: Page): Promise<string | null> {
+  return page.evaluate(
+    () => (globalThis as { __botAlertsObservation?: string }).__botAlertsObservation ?? null,
+  );
+}
+
+/** The id of the observation the Bot alerts item opened after `previous`. */
+async function nextAlertsObservation(page: Page, previous: string | null): Promise<string> {
+  await expect.poll(() => readAlertsObservation(page)).not.toBe(previous);
+  return (await readAlertsObservation(page))!;
+}
+
+function sidebarFooter(page: Page): Locator {
+  return visibleTestId(page, "sidebar-add-project").locator("xpath=..");
+}
+
+test.describe("Plugin sidebar items", () => {
+  let workspaceId: string;
+  let cleanup: () => Promise<void>;
+
+  test.beforeEach(async () => {
+    const workspace = await seedWorkspace({ repoPrefix: "plugin-sidebar-items-" });
+    const plugins = await installSidebarPlugins();
+    workspaceId = workspace.workspaceId;
+    cleanup = async () => {
+      await plugins.cleanup();
+      await workspace.cleanup();
+    };
+  });
+
+  test.afterEach(async () => {
+    await cleanup();
+  });
+
+  test("a plugin's screen, header row, footer popover and command work together", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+    // The Usage item shows only with summary data, once it is turned on.
+    await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+    await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    const row = headerRow(page, SHOWCASE_PLUGIN_ID, "deploys");
+    const sync = footerItem(page, SHOWCASE_PLUGIN_ID, "sync");
+    await expect(row).toBeVisible({ timeout: 30_000 });
+    await expect(sync).toBeVisible();
+
+    await test.step("a throwing item renders nothing and leaves the sidebar working", async () => {
+      await expect(visibleTestId(page, `plugin-sidebar-${SHOWCASE_PLUGIN_ID}-broken`)).toHaveCount(
+        0,
+      );
+      await expect(footerItem(page, SHOWCASE_PLUGIN_ID, "broken")).toHaveCount(0);
+      await expect(page.getByText("Plugin failed", { exact: false })).toHaveCount(0);
+      await expect(visibleTestId(page, "sidebar-settings")).toBeVisible();
+    });
+
+    await test.step("the header row highlights while its screen is open", async () => {
+      await expectRowActive(row, false);
+      await row.click();
+      await expect(page).toHaveURL(new RegExp(`/plugin/${SHOWCASE_PLUGIN_ID}/surface/deploys`));
+      await expect(page.getByText("Deploys screen body", { exact: true })).toBeVisible();
+      await expect(screenTitle(page)).toHaveText("Deploys");
+      await expectRowActive(row, true);
+      await qaScreenshot(page, "phase2-desktop-sidebar-screen");
+      await closeScreen(page);
+      await expectRowActive(row, false);
+    });
+
+    await test.step("the trailing button presses on its own", async () => {
+      await page.getByRole("button", { name: "Refresh deploys", exact: true }).click();
+      await expect(row).toHaveAccessibleName("Deploys (refreshed 1)");
+      await expect(page).not.toHaveURL(/\/plugin\//);
+      await expect(page.getByText("Deploys screen body", { exact: true })).toHaveCount(0);
+    });
+
+    await test.step("the footer row renders as a row above the bottom line", async () => {
+      await expect(sync).toHaveAccessibleName("Sync");
+      await expectFooterRow(page, sync);
+      await expect(visibleTestId(page, "sidebar-usage")).toBeVisible();
+      await qaScreenshot(page, "phase5-desktop-footer", sidebarFooter(page));
+    });
+
+    await test.step("the footer row opens a popover anchored to it", async () => {
+      await sync.click();
+      const popover = await popoverBox(page);
+      const button = (await sync.boundingBox())!;
+      await expect(page.getByText("Presentation: wide", { exact: true })).toBeVisible();
+      expect(popover.y + popover.height).toBeLessThanOrEqual(button.y);
+      expect(button.y - popover.y).toBeLessThan(300);
+      expect(Math.abs(popover.x - button.x)).toBeLessThan(80);
+      await qaScreenshot(page, "phase2-desktop-popover");
+      await page.getByRole("button", { name: "Open deploys from popover", exact: true }).click();
+      await expect(page.getByText("Deploys screen body", { exact: true })).toBeVisible();
+      await expect(page.getByText("Sync details", { exact: true })).toHaveCount(0);
+      await closeScreen(page);
+    });
+
+    await test.step("the command center item opens the screen", async () => {
+      await runCommand(page, "Open deploys");
+      await expect(page.getByText("Deploys screen body", { exact: true })).toBeVisible();
+      await expectRowActive(row, true);
+      await closeScreen(page);
+    });
+
+    await test.step("on a compact layout the popover is a bottom sheet", async () => {
+      await page.setViewportSize(COMPACT);
+      await page.getByRole("button", { name: "Open menu", exact: true }).first().click();
+      const compactSync = footerItem(page, SHOWCASE_PLUGIN_ID, "sync");
+      await expect(compactSync).toBeInViewport();
+      await expectFooterRow(page, compactSync);
+      await expect(headerRow(page, SHOWCASE_PLUGIN_ID, "deploys")).toBeInViewport();
+      await qaScreenshot(page, "phase2-compact-sidebar");
+      await qaScreenshot(page, "phase5-compact-footer", sidebarFooter(page));
+      await compactSync.click();
+      await expect(page.getByText("Presentation: compact", { exact: true })).toBeVisible();
+      const sheet = await popoverBox(page);
+      expect(sheet.y).toBeGreaterThan(COMPACT.height / 2);
+      await qaScreenshot(page, "phase2-compact-sheet");
+      await page.getByRole("button", { name: "Close sync details", exact: true }).click();
+      await expect(page.getByText("Sync details", { exact: true })).toHaveCount(0);
+    });
+  });
+
+  test("a header row's shortcut hint presses the row", async ({ page }) => {
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    const newWorkspace = visibleTestId(page, "sidebar-global-new-workspace");
+    await expect(newWorkspace).toBeVisible({ timeout: 30_000 });
+    await newWorkspace.hover();
+    const hint = page.getByText("Ctrl+N", { exact: true }).locator("visible=true");
+    await expect(hint).toBeVisible();
+    await qaScreenshot(page, "phase7-header-row-hint", newWorkspace.locator("xpath=../.."));
+    await hint.click();
+    await expect(page).toHaveURL(/\/new(\?|$)/);
+  });
+
+  test("a legacy plugin keeps its row, icon, order and visibility", async ({ page }) => {
+    test.setTimeout(180_000);
+    await page.addInitScript(
+      ({ key, sidebarNavItems }) => localStorage.setItem(key, JSON.stringify({ sidebarNavItems })),
+      {
+        key: APP_SETTINGS_KEY,
+        sidebarNavItems: [
+          { key: `plugin:${LEGACY_PLUGIN_ID}:entry`, visible: true },
+          { key: "new-workspace", visible: true },
+          { key: `plugin:${LEGACY_PLUGIN_ID}:hidden`, visible: false },
+        ],
+      },
+    );
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    const entry = headerRow(page, LEGACY_PLUGIN_ID, "entry");
+    await expect(entry).toBeVisible({ timeout: 30_000 });
+    let entryIcon = "";
+
+    await test.step("the saved order and visibility still apply", async () => {
+      await expect(entry).toHaveAccessibleName("Legacy entry");
+      await expect(entry.locator("svg")).toHaveCount(1);
+      entryIcon = await entry.locator("svg").innerHTML();
+      await expect(headerRow(page, LEGACY_PLUGIN_ID, "hidden")).toHaveCount(0);
+      const entryBox = (await entry.boundingBox())!;
+      const newWorkspaceBox = (await visibleTestId(
+        page,
+        "sidebar-global-new-workspace",
+      ).boundingBox())!;
+      expect(entryBox.y).toBeLessThan(newWorkspaceBox.y);
+    });
+
+    await test.step("the row opens its surface on its own sidebar route and highlights", async () => {
+      await entry.click();
+      await expect(page).toHaveURL(new RegExp(`/plugin/${LEGACY_PLUGIN_ID}/sidebar/entry$`));
+      await expect(page.getByText("Legacy screen body", { exact: true })).toBeVisible();
+      await expect(page.getByTestId("plugin-surface-close")).toBeVisible();
+      await expect(screenTitle(page)).toHaveText("Legacy entry");
+      await expectRowActive(entry, true);
+      await closeScreen(page);
+    });
+
+    await test.step("remembered sidebar routes keep resolving", async () => {
+      await page.goto(
+        `/h/${encodeURIComponent(getServerId())}/plugin/${LEGACY_PLUGIN_ID}/sidebar/entry`,
+      );
+      await expect(page.getByText("Legacy screen body", { exact: true })).toBeVisible();
+      await expectRowActive(headerRow(page, LEGACY_PLUGIN_ID, "entry"), true);
+    });
+
+    await test.step("links saved before a plugin moved to addScreen open the same-id screen", async () => {
+      const host = encodeURIComponent(getServerId());
+      await page.goto(`/h/${host}/plugin/${BOTS_PLUGIN_ID}/sidebar/bot?param.botId=bot-2`);
+      await expect(page.getByText("Bot screen: bot-2", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
+      await expect(screenTitle(page)).toHaveText("Bot 2");
+      await page.goto(`/h/${host}/plugin/${BOTS_PLUGIN_ID}/bot`);
+      await expect(page).toHaveURL(new RegExp(`/plugin/${BOTS_PLUGIN_ID}/sidebar/bot$`));
+      await expect(screenTitle(page)).toHaveText("Bot");
+    });
+
+    await test.step("settings shows a legacy row's own icon and one generic icon for the rest", async () => {
+      await openSidebarNavSettings(page);
+      const legacyIcon = page
+        .getByTestId(`sidebar-nav-item-plugin:${LEGACY_PLUGIN_ID}:entry`)
+        .locator("svg")
+        .first();
+      const showcaseIcon = page
+        .getByTestId(`sidebar-nav-item-plugin:${SHOWCASE_PLUGIN_ID}:deploys`)
+        .locator("svg")
+        .first();
+      const footerIcon = page
+        .getByTestId("sidebar-nav-section-footer")
+        .getByTestId(`sidebar-nav-item-plugin:${SHOWCASE_PLUGIN_ID}:sync`)
+        .locator("svg")
+        .first();
+      const markup = await showcaseIcon.innerHTML();
+      expect(await footerIcon.innerHTML()).toBe(markup);
+      expect(await legacyIcon.innerHTML()).not.toBe(markup);
+      // The same registered icon the sidebar row draws.
+      expect(await legacyIcon.innerHTML()).toBe(entryIcon);
+      await qaScreenshot(page, "phase2-desktop-settings-sidebar");
+      await qaScreenshot(
+        page,
+        "phase5-settings-sidebar-footer",
+        page.getByTestId("sidebar-nav-section-footer"),
+      );
+      await page.setViewportSize(COMPACT);
+      await expect(page.getByTestId("sidebar-nav-section-footer").first()).toBeAttached();
+      await qaScreenshot(page, "phase2-compact-settings-sidebar");
+    });
+  });
+  test("one item renders a group of rows, and each row opens its own screen params", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    const bot1 = botRow(page, "bot-1");
+    const bot2 = botRow(page, "bot-2");
+    const status = botRow(page, "status");
+    await expect(bot1).toBeVisible({ timeout: 30_000 });
+
+    await test.step("the rows and the separator render in order in the header", async () => {
+      await expect(bot1).toHaveAccessibleName("Bot 1");
+      await expect(bot2).toHaveAccessibleName("Bot 2");
+      await expect(status).toHaveAccessibleName("Bot status");
+      const [first, second, third] = [await boxOf(bot1), await boxOf(bot2), await boxOf(status)];
+      expect(second.y).toBeGreaterThan(first.y);
+      // The separator adds its line and margins between Bot 2 and the status row.
+      expect(third.y - (second.y + second.height)).toBeGreaterThan(8);
+      expect(second.y - (first.y + first.height)).toBeLessThan(4);
+    });
+
+    await test.step("pressing Bot 2 opens the bot screen and highlights only its row", async () => {
+      await bot2.click();
+      await expectBotScreen(page, "bot-2");
+      await qaScreenshot(page, "phase6-desktop-sidebar-bots");
+    });
+
+    await test.step("a reload keeps the screen and its params", async () => {
+      await page.reload();
+      await expectBotScreen(page, "bot-2");
+      await qaScreenshot(page, "phase6-bot-screen");
+    });
+
+    await test.step("Bot 1 replaces Bot 2 on the same screen, and back returns to Bot 2", async () => {
+      await bot1.click();
+      await expectBotScreen(page, "bot-1");
+      await page.goBack();
+      await expectBotScreen(page, "bot-2");
+    });
+
+    await test.step("a popover opened from a later row anchors to that row", async () => {
+      await status.click();
+      await expectPopoverBeside(page, "Bot status details", status, bot1);
+      await page.getByRole("button", { name: "Close bot status", exact: true }).click();
+      await expect(page.getByText("Bot status details", { exact: true })).toHaveCount(0);
+    });
+
+    await test.step("a trailing button's popover anchors to its own row, not the last pressed", async () => {
+      await page.getByRole("button", { name: "More for Bot 2", exact: true }).click();
+      await expectPopoverBeside(page, "Bot 2 options", bot2, status);
+      await qaScreenshot(page, "phase6-desktop-popover-row");
+      await page.getByRole("button", { name: "Close Bot 2 options", exact: true }).click();
+      await expect(page.getByText("Bot 2 options", { exact: true })).toHaveCount(0);
+    });
+
+    await test.step("a param named like a route segment reaches the screen", async () => {
+      await runCommand(page, "Open bot 3 on server x");
+      await expect(page.getByText("Bot screen: bot-3", { exact: true })).toBeVisible();
+      await expect(page.getByText("serverId param: x", { exact: true })).toBeVisible();
+      // No bot named bot-3, so the title function returns its own fallback.
+      await expect(screenTitle(page)).toHaveText("Bot");
+      await page.reload();
+      await expect(page.getByText("serverId param: x", { exact: true })).toBeVisible();
+    });
+
+    await test.step("Settings lists the group as one item", async () => {
+      await openSidebarNavSettings(page);
+      const header = page.getByTestId("sidebar-nav-section-header");
+      await expect(
+        header.getByTestId(`sidebar-nav-item-plugin:${BOTS_PLUGIN_ID}:bots`),
+      ).toHaveCount(1);
+      await expect(header.getByText("Bots", { exact: true })).toHaveCount(1);
+      await expect(header.getByText("Bot 1", { exact: true })).toHaveCount(0);
+      await leaveSettings(page);
+    });
+
+    await test.step("the compact sidebar shows the same group", async () => {
+      await page.setViewportSize(COMPACT);
+      await page.getByRole("button", { name: "Open menu", exact: true }).first().click();
+      await expect(botRow(page, "bot-1")).toBeInViewport();
+      await expect(botRow(page, "status")).toBeInViewport();
+      await qaScreenshot(page, "phase6-compact-sidebar-bots");
+    });
+  });
+
+  test("a plugin adds and removes a footer item after setup", async ({ page }) => {
+    test.setTimeout(120_000);
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    await expect(botRow(page, "bot-1")).toBeVisible({ timeout: 30_000 });
+    const alerts = footerItem(page, BOTS_PLUGIN_ID, "alerts");
+    await expect(alerts).toHaveCount(0);
+
+    await runCommand(page, "Add bot alerts");
+    await expect(alerts).toBeVisible();
+    await expect(alerts).toHaveAccessibleName("Bot alerts");
+    await expectFooterRow(page, alerts);
+
+    await runCommand(page, "Remove bot alerts");
+    await expect(alerts).toHaveCount(0);
+  });
+
+  test("a sidebar item's observations close when it is hidden or removed", async ({ page }) => {
+    test.setTimeout(120_000);
+    const released = trackReleasedSubscriptions(page);
+    const alerts = footerItem(page, BOTS_PLUGIN_ID, "alerts");
+    await page.setViewportSize(WIDE);
+    await gotoWorkspace(page, workspaceId);
+    await expect(botRow(page, "bot-1")).toBeVisible({ timeout: 30_000 });
+
+    await runCommand(page, "Add bot alerts");
+    await expect(alerts).toBeVisible();
+    const first = await nextAlertsObservation(page, null);
+    expect(released.has(first)).toBe(false);
+
+    await test.step("hiding the item in Settings closes its observation", async () => {
+      await openSidebarNavSettings(page);
+      await setFooterItemVisible(page, `plugin:${BOTS_PLUGIN_ID}:alerts`, false);
+      await expectReleased(released, first);
+      await setFooterItemVisible(page, `plugin:${BOTS_PLUGIN_ID}:alerts`, true);
+      await leaveSettings(page);
+    });
+
+    await test.step("removing the item through its remover closes its observation", async () => {
+      await expect(alerts).toBeVisible();
+      const second = await nextAlertsObservation(page, first);
+      expect(released.has(second)).toBe(false);
+      await runCommand(page, "Remove bot alerts");
+      await expect(alerts).toHaveCount(0);
+      await expectReleased(released, second);
+    });
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-theme.spec.ts b/packages/app/e2e/browser/plugin-theme.spec.ts
index aa579ae62c..a5ef533326 100644
--- a/packages/app/e2e/browser/plugin-theme.spec.ts
+++ b/packages/app/e2e/browser/plugin-theme.spec.ts
@@ -1,6 +1,8 @@
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import type { Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
 import { openSettingsSection } from "../support/helpers/settings";
@@ -53,7 +55,10 @@ test("applies a contributed theme and falls back when its plugin is gone", async
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-theme-e2e-"));
   const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
   const previousConfig = await client.getDaemonConfig();
-  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+  );
   await writeFile(path.join(directory, "index.client.ts"), PLUGIN_SOURCE);
 
   try {
@@ -116,3 +121,75 @@ test("applies a contributed theme and falls back when its plugin is gone", async
     await rm(directory, { recursive: true, force: true });
   }
 });
+
+const MANY_THEMES_PLUGIN_ID = "plugin-theme-many-e2e";
+const MANY_THEMES_COUNT = 40;
+const LAST_THEME_NAME = `Pack theme ${MANY_THEMES_COUNT}`;
+
+const MANY_THEMES_SOURCE = `export default function contribute(plugin) {
+  for (let index = 1; index <= ${MANY_THEMES_COUNT}; index += 1) {
+    plugin.addTheme({
+      id: "pack-" + index,
+      name: "Pack theme " + index,
+      appearance: "dark",
+      colors: {
+        background: "#1e1e2e",
+        foreground: "#cdd6f4",
+        raised: "#313244",
+        control: "#45475a",
+        border: "#45475a",
+        accent: "#cba6f7",
+        mutedForeground: "#a6adc8",
+        ring: "#6c7086",
+      },
+    });
+  }
+  return () => {};
+}`;
+
+async function scrollThemeMenuToLastTheme(page: Page) {
+  const firstTheme = page.getByText("Pack theme 1", { exact: true });
+  await expect(firstTheme).toBeVisible({ timeout: 30_000 });
+  await firstTheme.hover();
+  await page.mouse.wheel(0, 4000);
+  await expect(page.getByText(LAST_THEME_NAME, { exact: true })).toBeInViewport({ ratio: 1 });
+}
+
+test("scrolls to the last theme when a plugin contributes more themes than fit", async ({
+  page,
+}, testInfo) => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-theme-many-e2e-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previousConfig = await client.getDaemonConfig();
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: MANY_THEMES_PLUGIN_ID, requirements: pluginRequirements }),
+  );
+  await writeFile(path.join(directory, "index.client.ts"), MANY_THEMES_SOURCE);
+
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    await page.setViewportSize({ width: 1280, height: 720 });
+    await page.goto("/settings");
+    await expect(page.getByTestId("settings-sidebar")).toBeVisible();
+    await openSettingsSection(page, "appearance");
+
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    await scrollThemeMenuToLastTheme(page);
+    await page.screenshot({
+      path: testInfo.outputPath("plugin-theme-picker-scrolled.png"),
+      animations: "disabled",
+    });
+
+    await page.getByText(LAST_THEME_NAME, { exact: true }).click();
+    await expect(page.getByLabel(`Theme: ${LAST_THEME_NAME}`, { exact: true })).toBeVisible();
+  } finally {
+    await client.removePlugin(MANY_THEMES_PLUGIN_ID).catch(() => undefined);
+    await client
+      .patchDaemonConfig({ pluginsEnabled: previousConfig.config.pluginsEnabled ?? false })
+      .catch(() => undefined);
+    await client.close().catch(() => undefined);
+    await rm(directory, { recursive: true, force: true });
+  }
+});
diff --git a/packages/app/e2e/browser/plugin-timeline.spec.ts b/packages/app/e2e/browser/plugin-timeline.spec.ts
new file mode 100644
index 0000000000..a344611a4f
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-timeline.spec.ts
@@ -0,0 +1,35 @@
+import { test } from "../support/fixtures";
+import {
+  withTimelinePlugin,
+  requestPluginTimeline,
+  interactWithStreamingCard,
+  expectWholeCompletedCard,
+  expectBothConsecutiveTools,
+} from "../support/helpers/plugin-timeline";
+
+for (const width of [1100, 390]) {
+  test(`assistant plugin receives the whole streaming message at width ${width}`, async ({
+    page,
+  }, info) => {
+    await page.setViewportSize({ width, height: 900 });
+    await withTimelinePlugin(page, info, "assistant", async (agent) => {
+      await requestPluginTimeline(agent);
+      await interactWithStreamingCard(page);
+      await agent.client.waitForFinish(agent.agentId, 30_000);
+      await expectWholeCompletedCard(page);
+      // Local state is checked during growth; the viewport remounts on the history handoff.
+      await page.reload({ waitUntil: "domcontentloaded" });
+      await expectWholeCompletedCard(page);
+    });
+  });
+}
+
+test("Overview preserves both consecutive tool plugin cards", async ({ page }, info) => {
+  await withTimelinePlugin(page, info, "tools", async (agent) => {
+    await requestPluginTimeline(agent);
+    await agent.client.waitForFinish(agent.agentId, 30_000);
+    await expectBothConsecutiveTools(page);
+    await page.reload({ waitUntil: "domcontentloaded" });
+    await expectBothConsecutiveTools(page);
+  });
+});
diff --git a/packages/app/e2e/browser/plugin-workspace-panels.spec.ts b/packages/app/e2e/browser/plugin-workspace-panels.spec.ts
index 80f19ce1e4..8895f85acf 100644
--- a/packages/app/e2e/browser/plugin-workspace-panels.spec.ts
+++ b/packages/app/e2e/browser/plugin-workspace-panels.spec.ts
@@ -1,3 +1,4 @@
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -26,10 +27,18 @@ function isSettledWorkspaceUrl(url: URL): boolean {
   return url.pathname.includes("/workspace/") && !url.searchParams.has("open");
 }
 
-function pluginClientSource(input: { workspaceId: string; agentId: string }): string {
+function pluginClientSource(input: {
+  workspaceId: string;
+  agentId: string;
+  remoteServerId: string;
+  remoteWorkspaceId: string;
+  remoteAgentId: string;
+}): string {
   return `import React, { useRef } from "react";
 import { Pressable, Text, View } from "react-native";
-import { Icon, useAgent, useWorkspace } from "@getpaseo/plugin";
+import { Icon } from "@getpaseo/plugin/client/react-native";
+import { useAgent, useWorkspace, openExternalUrl } from "@getpaseo/plugin/client";
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
 import { recordComposerOpen } from "./shared/rpc";
 
 function WorkspacePanel({ workspaceId, host, layout }) {
@@ -48,9 +57,14 @@ function AgentPanel({ workspaceId, agentId, host, layout }) {
 function DirectCollisionSurface({ navigation }) {
   return <View>
     <Text>Direct collision surface</Text>
+    <Text>{navigation.openBrowser ? "Browser available" : "Browser unavailable"}</Text>
+    <ExternalLink href="https://example.com/">Plugin documentation</ExternalLink>
+    <Pressable accessibilityRole="button" onPress={() => openExternalUrl("https://example.com/")}><Text>Open external plugin URL</Text></Pressable>
     {navigation ? <>
       <Pressable accessibilityRole="button" onPress={() => navigation.openWorkspace({ workspaceId: ${JSON.stringify(input.workspaceId)} })}><Text>Open workspace from plugin</Text></Pressable>
       <Pressable accessibilityRole="button" onPress={() => navigation.openAgent({ agentId: ${JSON.stringify(input.agentId)} })}><Text>Open agent from plugin</Text></Pressable>
+      <Pressable accessibilityRole="button" onPress={() => navigation.openWorkspace({ serverId: ${JSON.stringify(input.remoteServerId)}, workspaceId: ${JSON.stringify(input.remoteWorkspaceId)} })}><Text>Open remote workspace from plugin</Text></Pressable>
+      <Pressable accessibilityRole="button" onPress={() => navigation.openAgent({ serverId: ${JSON.stringify(input.remoteServerId)}, agentId: ${JSON.stringify(input.remoteAgentId)} })}><Text>Open remote agent from plugin</Text></Pressable>
     </> : null}
   </View>;
 }
@@ -59,19 +73,13 @@ function SidebarCollisionSurface() {
   return <View><Text>Sidebar collision surface</Text></View>;
 }
 
-function ComposerPill({ theme, workspaceId, agentId }) {
-  const workspace = useWorkspace(workspaceId, (value) => ({ title: value.title }));
-  const agent = useAgent(agentId, (value) => ({ title: value.title }));
-  return <><Icon name="Scan" size={14} color={theme.colors.foregroundMuted} /><Text numberOfLines={1} style={{ color: theme.colors.foregroundMuted, flexShrink: 1 }}>Review {workspace?.title}:{agent?.title}</Text></>;
-}
-
 function contributeClient(client) {
   const pills = new Map();
   const remove = (agentId) => {
     pills.get(agentId)?.();
     pills.delete(agentId);
   };
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
+  const apply = (update) => {
     if (update.kind === "remove") {
       remove(update.agentId);
       return;
@@ -79,26 +87,39 @@ function contributeClient(client) {
     const agent = update.agent;
     if (agent.title !== "Plugin panel context agent" || !agent.workspaceId) return;
     remove(agent.id);
-    let removePill = () => {};
-    removePill = client.addComposerPill({
+    const pill = client.addComposerPill({
       id: "review",
-      title: "Open composer review",
       workspaceId: agent.workspaceId,
       agentId: agent.id,
-      Component: ComposerPill,
-      async onPress() {
+      button: {
+        title: "Open composer review",
+        icon: "Scan",
+        label: "Review",
+        behavior: { kind: "action", async onPress() {
         await client.rpc(recordComposerOpen, { workspaceId: agent.workspaceId });
-        removePill();
+        pill.remove();
         client.openPanel("agent", {
           workspaceId: agent.workspaceId,
           agentId: agent.id,
         });
+        } },
       },
     });
-    pills.set(agent.id, removePill);
-  });
+    pills.set(agent.id, () => pill.remove());
+  };
+  const lifetime = new AbortController();
+  void client.paseo.agents.list({ subscribe: {}, signal: lifetime.signal }).then(({ subscription }) => {
+    subscription.subscribe({
+      snapshot({ entries }) {
+        for (const removePill of pills.values()) removePill();
+        pills.clear();
+        for (const { agent } of entries) apply({ kind: "upsert", agent });
+      },
+      update(message) { if (message.type === "agent_update") apply(message.payload); },
+    });
+  }).catch((error) => { if (!lifetime.signal.aborted) console.error(error); });
   return () => {
-    unsubscribe();
+    lifetime.abort();
     for (const removePill of pills.values()) removePill();
     pills.clear();
   };
@@ -139,7 +160,13 @@ export default function contribute(server) {
 
 async function writePluginSources(
   directory: string,
-  input: { workspaceId: string; agentId: string },
+  input: {
+    workspaceId: string;
+    agentId: string;
+    remoteServerId: string;
+    remoteWorkspaceId: string;
+    remoteAgentId: string;
+  },
 ): Promise<void> {
   await mkdir(path.join(directory, "shared"), { recursive: true });
   await Promise.all([
@@ -173,6 +200,52 @@ async function runCommand(page: Page, title: string): Promise<void> {
   await expect(panel).not.toBeVisible();
 }
 
+async function openPluginExternalTab(page: Page, role: "link" | "button", name: string) {
+  const opened = page.context().waitForEvent("page");
+  await page.getByRole(role, { name, exact: true }).click();
+  const tab = await opened;
+  await tab.waitForURL("https://example.com/");
+  await tab.close();
+}
+
+interface RemoteNavigationTarget {
+  serverId: string;
+  workspaceId: string;
+  agentId: string;
+}
+
+function remoteWorkspaceRoute(target: RemoteNavigationTarget): RegExp {
+  return new RegExp(
+    `/h/${encodeURIComponent(target.serverId)}/workspace/${encodeURIComponent(target.workspaceId)}(?:\\?.*)?$`,
+  );
+}
+
+async function openRemoteWorkspaceFromPlugin(
+  page: Page,
+  target: RemoteNavigationTarget,
+): Promise<void> {
+  await page
+    .getByRole("button", { name: "Open remote workspace from plugin", exact: true })
+    .click();
+  await page.waitForURL(remoteWorkspaceRoute(target));
+  await expect(
+    page
+      .getByTestId(`workspace-deck-entry-${target.serverId}:${target.workspaceId}`)
+      .getByTestId("workspace-header-title"),
+  ).toBeVisible();
+}
+
+async function openRemoteAgentFromPlugin(
+  page: Page,
+  target: RemoteNavigationTarget,
+): Promise<void> {
+  await page.getByRole("button", { name: "Open remote agent from plugin", exact: true }).click();
+  await page.waitForURL(remoteWorkspaceRoute(target));
+  await expect(
+    page.getByTestId(`workspace-tab-agent_${target.agentId}`).filter({ visible: true }).first(),
+  ).toBeVisible();
+}
+
 async function openCompactSidebar(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Open menu", exact: true }).click();
   await expect(page.getByTestId("sidebar-search")).toBeVisible();
@@ -199,10 +272,24 @@ test.describe("plugin workspace panels and Command Center", () => {
       repoPrefix: "plugin-panel-secondary-",
       port: secondaryDaemon.port,
     });
-    await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
+    const secondaryAgent = await secondary.client.createAgent({
+      provider: "mock",
+      cwd: secondary.repoPath,
+      workspaceId: secondary.workspaceId,
+      title: "Remote plugin navigation agent",
+      model: "ten-second-stream",
+      modeId: "load-test",
+    });
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+    );
     await writePluginSources(directory, {
       workspaceId: primary.workspaceId,
       agentId: "missing-agent",
+      remoteServerId: secondaryDaemon.serverId,
+      remoteWorkspaceId: secondary.workspaceId,
+      remoteAgentId: secondaryAgent.id,
     });
 
     try {
@@ -251,6 +338,15 @@ test.describe("plugin workspace panels and Command Center", () => {
         await capture(page, testInfo, "plugin-workspace-panel-wide");
       });
 
+      await test.step("plugin links open browser tabs and in-app browsing is unavailable", async () => {
+        await runCommand(page, "Open direct collision surface");
+        await expect(page.getByText("Browser unavailable", { exact: true })).toBeVisible();
+        await openPluginExternalTab(page, "link", "Plugin documentation");
+        await openPluginExternalTab(page, "button", "Open external plugin URL");
+        await capture(page, testInfo, "plugin-external-links-web");
+        await page.getByTestId("plugin-surface-close").click();
+      });
+
       await test.step("direct and sidebar routes preserve same-id contribution kind", async () => {
         await runCommand(page, "Open direct collision surface");
         await expect(page.getByText("Direct collision surface", { exact: true })).toBeVisible();
@@ -282,6 +378,9 @@ test.describe("plugin workspace panels and Command Center", () => {
         await writePluginSources(directory, {
           workspaceId: primary.workspaceId,
           agentId: navigationAgentId,
+          remoteServerId: secondaryDaemon.serverId,
+          remoteWorkspaceId: secondary.workspaceId,
+          remoteAgentId: secondaryAgent.id,
         });
         await primaryClient.reloadPlugin(PLUGIN_ID);
 
@@ -296,6 +395,23 @@ test.describe("plugin workspace panels and Command Center", () => {
         ).toBeVisible();
       });
 
+      await test.step("surface navigation opens a workspace and agent on another host", async () => {
+        const remoteTarget = {
+          serverId: secondaryDaemon.serverId,
+          workspaceId: secondary.workspaceId,
+          agentId: secondaryAgent.id,
+        };
+        await runCommand(page, "Open direct collision surface");
+        await openRemoteWorkspaceFromPlugin(page, remoteTarget);
+        await switchWorkspaceViaSidebar({
+          page,
+          serverId: getServerId(),
+          workspaceId: primary.workspaceId,
+        });
+        await runCommand(page, "Open direct collision surface");
+        await openRemoteAgentFromPlugin(page, remoteTarget);
+      });
+
       await test.step("switching hosts removes commands from an uninstalled host", async () => {
         await switchWorkspaceViaSidebar({
           page,
@@ -328,9 +444,7 @@ test.describe("plugin workspace panels and Command Center", () => {
           timeout: 30_000,
         });
         const composerPill = page.getByRole("button", { name: "Open composer review" });
-        await expect(composerPill).toContainText(
-          "Review Unrelated title update:Plugin panel context agent",
-        );
+        await expect(composerPill).toContainText("Review");
         await capture(page, testInfo, "plugin-composer-pill-wide");
         await page.setViewportSize(COMPACT_VIEWPORT);
         await expect(page.getByRole("button", { name: "Open composer review" })).toBeVisible();
@@ -345,7 +459,9 @@ test.describe("plugin workspace panels and Command Center", () => {
 
         await page.goto(buildAgentRoute(primary.workspaceId, agent.id));
         await page.waitForURL(isSettledWorkspaceUrl, { timeout: 60_000 });
-        await expect(page.getByRole("button", { name: "Open composer review" })).toHaveCount(0);
+        // Pressing removed the pill from that page only. The reloaded page evaluates
+        // the plugin again, and its agents snapshot contributes the pill afresh.
+        await expect(page.getByRole("button", { name: "Open composer review" })).toBeVisible();
         await openCompactSidebar(page);
         // The sidebar's Search row dismisses the compact sidebar on its way to the
         // command center, so nothing has to close it after the command runs.
diff --git a/packages/app/e2e/browser/project-path-spaces.spec.ts b/packages/app/e2e/browser/project-path-spaces.spec.ts
new file mode 100644
index 0000000000..3b3478f5bb
--- /dev/null
+++ b/packages/app/e2e/browser/project-path-spaces.spec.ts
@@ -0,0 +1,64 @@
+import { execFileSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test as base } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { openChangesTreePanel } from "../support/helpers/workspace-tabs";
+
+const test = base.extend<{ projectWithTrailingSpace: string }>({
+  projectWithTrailingSpace: async ({ e2eWorkerClient: client }, provide) => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-project-path-spaces-"));
+    try {
+      const repoPath = path.join(root, "repo ");
+      execFileSync("git", ["init", "-b", "main", repoPath], { stdio: "pipe" });
+      execFileSync(
+        "git",
+        [
+          "-c",
+          "user.name=Paseo Test",
+          "-c",
+          "user.email=test@getpaseo.local",
+          "-c",
+          "commit.gpgsign=false",
+          "commit",
+          "--allow-empty",
+          "-m",
+          "initial",
+        ],
+        { cwd: repoPath, stdio: "pipe" },
+      );
+      await writeFile(path.join(repoPath, "visible-change.txt"), "a change\n");
+      const added = await client.addProject(repoPath);
+      expect(added.error).toBeNull();
+      const projectId = added.project!.projectId;
+      try {
+        const created = await client.createWorkspace({
+          source: { kind: "directory", path: repoPath, projectId },
+        });
+        expect(created.error).toBeNull();
+        await provide(created.workspace!.id);
+      } finally {
+        await client.removeProject(projectId);
+      }
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  },
+});
+
+test.skip(
+  process.platform === "win32",
+  "Windows does not preserve trailing spaces in folder names",
+);
+
+test("Changes shows files in a project whose folder ends in a space", async ({
+  page,
+  projectWithTrailingSpace,
+}, testInfo) => {
+  await gotoWorkspace(page, projectWithTrailingSpace);
+  await openChangesTreePanel(page);
+  await expect(page.getByText("visible-change.txt", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Not a git repository", { exact: true })).toHaveCount(0);
+  await page.screenshot({ path: testInfo.outputPath("changes.png") });
+});
diff --git a/packages/app/e2e/browser/provider-removal.spec.ts b/packages/app/e2e/browser/provider-removal.spec.ts
index 7e17a1fbe0..b72fb868d6 100644
--- a/packages/app/e2e/browser/provider-removal.spec.ts
+++ b/packages/app/e2e/browser/provider-removal.spec.ts
@@ -10,16 +10,29 @@ import {
   openSettingsHost,
   openSettingsHostSection,
 } from "../support/helpers/settings";
+import { copyPluginExample } from "../support/helpers/plugin-fixture";
 
 const CUSTOM_PROVIDER = {
   id: "junie",
   name: "Junie",
 } as const;
 
+const PLUGIN_PROVIDER = {
+  id: "direct-example",
+  name: "Direct provider example",
+  pluginId: "provider-direct-example",
+} as const;
+
 interface ProviderRemovalDaemonClient {
   connect(): Promise<void>;
   close(): Promise<void>;
-  patchDaemonConfig(config: { removeProviders?: string[] }): Promise<unknown>;
+  getDaemonConfig(): Promise<{ config: { pluginsEnabled?: boolean } }>;
+  patchDaemonConfig(config: {
+    removeProviders?: string[];
+    pluginsEnabled?: boolean;
+  }): Promise<unknown>;
+  installDirectoryPlugin(path: string): Promise<unknown>;
+  removePlugin(pluginId: string): Promise<void>;
   getProvidersSnapshot(): Promise<{
     entries: Array<{ provider: string; source?: "builtin" | "custom" }>;
   }>;
@@ -93,4 +106,45 @@ test.describe("provider removal", () => {
       await client.close().catch(() => undefined);
     }
   });
+
+  test("does not offer Remove for a plugin-registered provider", async ({ page }) => {
+    test.setTimeout(120_000);
+    const client = await connectDaemonClient<ProviderRemovalDaemonClient>({
+      clientIdPrefix: "provider-removal-e2e",
+    });
+
+    const plugin = await copyPluginExample("provider-direct");
+    try {
+      const previous = await client.getDaemonConfig();
+      try {
+        await client.patchDaemonConfig({ pluginsEnabled: true });
+        await client.installDirectoryPlugin(plugin.directory);
+
+        await gotoAppShell(page);
+        await openSettings(page);
+        await openSettingsHost(page, getServerId());
+        await openSettingsHostSection(page, getServerId(), "providers");
+
+        const pluginProviderRow = page.getByRole("button", {
+          name: `${PLUGIN_PROVIDER.name} provider details`,
+          exact: true,
+        });
+        await expect(pluginProviderRow).toBeVisible();
+        await expect(page.getByTestId(`provider-actions-${PLUGIN_PROVIDER.id}`)).toHaveCount(0);
+
+        // The provider survives a removeProviders patch pointed at it: the
+        // plugin, not config.json, owns the definition.
+        await client.patchDaemonConfig({ removeProviders: [PLUGIN_PROVIDER.id] });
+        await expect(pluginProviderRow).toBeVisible();
+      } finally {
+        await client.removePlugin(PLUGIN_PROVIDER.pluginId).catch(() => undefined);
+        await client
+          .patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled })
+          .catch(() => undefined);
+      }
+    } finally {
+      await client.close().catch(() => undefined);
+      await plugin.cleanup();
+    }
+  });
 });
diff --git a/packages/app/e2e/browser/provider-settings-refresh.spec.ts b/packages/app/e2e/browser/provider-settings-refresh.spec.ts
index 5f3555504f..efc4fc7f88 100644
--- a/packages/app/e2e/browser/provider-settings-refresh.spec.ts
+++ b/packages/app/e2e/browser/provider-settings-refresh.spec.ts
@@ -119,6 +119,25 @@ async function exerciseProviderSettingsStack(page: Page) {
 }
 
 test.describe("provider settings overlay stack", () => {
+  test("provider model update age says just now", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "provider-relative-time-",
+      title: "Provider relative time",
+    });
+    try {
+      await page.clock.install({ time: Date.now() });
+      await page.setViewportSize(MOBILE_VIEWPORT);
+      await openAgentRoute(page, session);
+      await expectComposerVisible(page);
+      await openProviderSettingsFromModelSelector(page);
+      await expect(page.getByText("Updated just now", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
   test("provider settings covers the desktop model selector without closing it", async ({
     page,
   }) => {
diff --git a/packages/app/e2e/browser/provider-subagents.real.spec.ts b/packages/app/e2e/browser/provider-subagents.real.spec.ts
index 46b9d80c3a..08d8a1afe1 100644
--- a/packages/app/e2e/browser/provider-subagents.real.spec.ts
+++ b/packages/app/e2e/browser/provider-subagents.real.spec.ts
@@ -9,6 +9,11 @@ import {
   type AgentHandle,
   type RewindFlowProvider,
 } from "../support/helpers/rewind-flow";
+import {
+  expectNestedProviderSubagentOwnership,
+  launchNestedProviderSubagentOwnershipScenario,
+  reopenNestedProviderSession,
+} from "../support/helpers/provider-subagents";
 import { openSubagentsTrack } from "../support/helpers/subagents";
 
 interface ProviderSubagentCase {
@@ -26,7 +31,7 @@ const cases: ProviderSubagentCase[] = [
     provider: "claude",
     sentinel: "CLAUDE_CHILD_SENTINEL",
     expectedName: "sentinel_child",
-    providerConfig: { model: "opus" },
+    providerConfig: { model: "claude-sonnet-5" },
     prompt:
       'Use Claude Code\'s native Task tool exactly once. Set its subagent_type input to "Explore" and its name input to "sentinel_child". Ask it to reply with exactly CLAUDE_CHILD_SENTINEL and do nothing else. Wait for it, then reply ROOT_DONE. Do not use Paseo tools.',
   },
@@ -147,3 +152,23 @@ test.describe("real provider subagent timelines", () => {
     });
   }
 });
+
+test.describe("real Claude nested subagent ownership", () => {
+  test.setTimeout(600_000);
+
+  test("keeps a grandchild and its background notification with their direct owners", async ({
+    page,
+  }, testInfo) => {
+    const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-claude-nested-ui-")));
+    let handle: AgentHandle | undefined;
+
+    try {
+      handle = await launchNestedProviderSubagentOwnershipScenario(page, cwd);
+      await expectNestedProviderSubagentOwnership(page, testInfo, "live");
+      await reopenNestedProviderSession(handle);
+      await expectNestedProviderSubagentOwnership(page, testInfo, "reopened");
+    } finally {
+      await cleanupRewindFlow({ handle, cwd });
+    }
+  });
+});
diff --git a/packages/app/e2e/browser/provider-usage-settings.spec.ts b/packages/app/e2e/browser/provider-usage-settings.spec.ts
deleted file mode 100644
index 0763233e10..0000000000
--- a/packages/app/e2e/browser/provider-usage-settings.spec.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import { gotoAppShell, openSettings } from "../support/helpers/app";
-import { installProviderUsageFixture } from "../support/helpers/provider-usage";
-import { getServerId } from "../support/helpers/server-id";
-import { openSettingsHostSection } from "../support/helpers/settings";
-
-test.describe("provider usage settings", () => {
-  test("renders every provider returned by the daemon usage RPC", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "claude",
-            displayName: "Claude",
-            status: "available",
-            planLabel: "Max 20x",
-            windows: [{ id: "session", label: "Session", usedPct: 7 }],
-          },
-          {
-            providerId: "codex",
-            displayName: "Codex",
-            status: "available",
-            planLabel: "Pro 20x",
-            windows: [{ id: "weekly", label: "Weekly", usedPct: 29 }],
-          },
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            sourceLabel: "OpenUsage 0.6.27",
-            windows: [
-              { id: "biweekly", label: "Biweekly", usedPct: 23 },
-              { id: "daily", label: "Daily", remainingPct: 30 },
-            ],
-            balances: [
-              { id: "credits", label: "Credits", remaining: 1234, unit: "credits" },
-              { id: "extra", label: "Extra usage", used: 5, limit: 20, unit: "usd" },
-            ],
-            details: [{ id: "valid", label: "Valid until", value: "2026-12-31" }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    expect(usageFixture.requestCount()).toBe(0);
-    await openSettingsHostSection(page, serverId, "usage");
-    await usageFixture.waitForRequestCount(1);
-
-    const card = page.getByTestId("provider-usage-card");
-    await expect(card).toBeVisible({ timeout: 10_000 });
-    await expect(card.getByText("Claude", { exact: true })).toBeVisible();
-    await expect(card.getByText("Codex", { exact: true })).toBeVisible();
-    await expect(card.getByText("GLM coding plan", { exact: true }).first()).toBeVisible();
-    await expect(card.getByText("Biweekly", { exact: true })).toBeVisible();
-    await expect(card.getByText("Daily", { exact: true })).toBeVisible();
-    await expect(card.getByText("70%")).toBeVisible();
-    await expect(card.getByText("Credits", { exact: true })).toBeVisible();
-    await expect(card.getByText("1,234 left", { exact: true })).toBeVisible();
-    await expect(card.getByText("Extra usage", { exact: true })).toBeVisible();
-    await expect(card.getByText("$5.00 / $20.00", { exact: true })).toBeVisible();
-    await expect(card.getByText("Valid until", { exact: true })).toBeVisible();
-    await expect(card.getByText("2026-12-31", { exact: true })).toBeVisible();
-    await expect(card.getByText(/OpenUsage 0\.6\.27/)).toBeVisible();
-  });
-
-  test("refresh invalidates and refetches usage", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            windows: [{ id: "biweekly", label: "Biweekly", usedPct: 23 }],
-          },
-        ],
-      },
-      {
-        fetchedAt: "2026-06-19T00:01:00.000Z",
-        providers: [
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            windows: [{ id: "biweekly", label: "Biweekly", usedPct: 64 }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHostSection(page, serverId, "usage");
-    await usageFixture.waitForRequestCount(1);
-    await expect(page.getByText("23%")).toBeVisible({ timeout: 10_000 });
-
-    await page.getByRole("button", { name: "Refresh", exact: true }).click();
-    await usageFixture.waitForRequestCount(2);
-
-    expect(usageFixture.requestCount()).toBe(2);
-    await expect(page.getByText("64%")).toBeVisible();
-  });
-
-  test("one provider error does not collapse the usage list", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "claude",
-            displayName: "Claude",
-            status: "error",
-            planLabel: null,
-            windows: [],
-            error: "Claude auth expired",
-          },
-          {
-            providerId: "codex",
-            displayName: "Codex",
-            status: "available",
-            planLabel: "Pro 20x",
-            windows: [{ id: "weekly", label: "Weekly", usedPct: 71 }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHostSection(page, serverId, "usage");
-
-    const card = page.getByTestId("provider-usage-card");
-    await expect(card).toBeVisible({ timeout: 10_000 });
-    await expect(card.getByText("Error", { exact: true })).toBeVisible();
-    await expect(card.getByText("Claude auth expired", { exact: true })).toBeVisible();
-    await expect(card.getByText("Codex", { exact: true })).toBeVisible();
-    await expect(card.getByText("71%")).toBeVisible();
-  });
-});
diff --git a/packages/app/e2e/browser/provider-usage-tooltip.spec.ts b/packages/app/e2e/browser/provider-usage-tooltip.spec.ts
deleted file mode 100644
index 680b7b4b80..0000000000
--- a/packages/app/e2e/browser/provider-usage-tooltip.spec.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { expect, test, type Page } from "../support/fixtures";
-import { expectComposerVisible } from "../support/helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-import { installProviderUsageFixture } from "../support/helpers/provider-usage";
-
-const MOBILE_VIEWPORT = { width: 390, height: 844 };
-
-async function openMockAgent(page: Page) {
-  await page.setViewportSize(MOBILE_VIEWPORT);
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "provider-usage-tooltip-",
-    title: "Provider usage tooltip e2e",
-    initialPrompt: "emit 1 coalesced agent stream update for provider usage tooltip.",
-  });
-  await openAgentRoute(page, session);
-  await expectComposerVisible(page);
-  await expect(page.getByTestId("context-window-meter")).toBeVisible({ timeout: 30_000 });
-  return session;
-}
-
-test.describe("provider usage tooltip", () => {
-  test("fetches usage when the context tooltip opens and renders the active provider", async ({
-    page,
-  }) => {
-    test.setTimeout(180_000);
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [
-              {
-                id: "session",
-                label: "Session",
-                usedPct: 42,
-                remainingPct: 58,
-                resetsAt: "2026-06-19T05:00:00.000Z",
-              },
-            ],
-          },
-        ],
-      },
-    ]);
-    const session = await openMockAgent(page);
-    try {
-      expect(usageFixture.requestCount()).toBe(0);
-
-      await page.getByTestId("context-window-meter").hover();
-      await usageFixture.waitForRequestCount(1);
-
-      await expect(page.getByText("Mock provider", { exact: true })).toBeVisible({
-        timeout: 10_000,
-      });
-      await expect(page.getByText("Test plan")).toBeVisible();
-      await expect(page.getByText("Session", { exact: true })).toBeVisible();
-      await expect(page.getByText("42%")).toBeVisible();
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("refreshes usage again each time the tooltip is shown", async ({ page }) => {
-    test.setTimeout(180_000);
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [{ id: "session", label: "Session", usedPct: 41 }],
-          },
-        ],
-      },
-      {
-        fetchedAt: "2026-06-19T00:01:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [{ id: "session", label: "Session", usedPct: 64 }],
-          },
-        ],
-      },
-    ]);
-    const session = await openMockAgent(page);
-    try {
-      const meter = page.getByTestId("context-window-meter");
-
-      await meter.hover();
-      await usageFixture.waitForRequestCount(1);
-      await expect(page.getByText("41%")).toBeVisible({ timeout: 10_000 });
-
-      await page.mouse.move(0, 0);
-      await expect(page.getByText("Mock provider", { exact: true })).toHaveCount(0);
-
-      await meter.hover();
-      await usageFixture.waitForRequestCount(2);
-      expect(usageFixture.requestCount()).toBe(2);
-      await expect(page.getByText("64%")).toBeVisible();
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
diff --git a/packages/app/e2e/browser/replica-cache-measurement.spec.ts b/packages/app/e2e/browser/replica-cache-measurement.spec.ts
deleted file mode 100644
index cc77f2260c..0000000000
--- a/packages/app/e2e/browser/replica-cache-measurement.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { expect, test } from "@playwright/test";
-import {
-  beginReplicaCacheObservation,
-  finishReplicaCacheObservation,
-  installReplicaCacheMeasurement,
-  measureReplicaCacheRestore,
-  type ReplicaCacheMeasurementReport,
-} from "../support/helpers/replica-cache-measurement";
-
-const RUN_MEASUREMENT = process.env.PASEO_REPLICA_CACHE_MEASUREMENT === "1";
-const TARGET_URL = process.env.PASEO_REPLICA_CACHE_MEASUREMENT_URL;
-const REPORT_PATH = process.env.PASEO_REPLICA_CACHE_MEASUREMENT_REPORT;
-const OBSERVATION_MS = Number(process.env.PASEO_REPLICA_CACHE_MEASUREMENT_MS ?? 60_000);
-const HYDRATED_SELECTOR =
-  process.env.PASEO_REPLICA_CACHE_HYDRATED_SELECTOR ??
-  '[data-testid="agent-chat-scroll"], [data-testid^="sidebar-workspace-row-"]';
-
-const measurementDescribe = RUN_MEASUREMENT ? test.describe : test.describe.skip;
-
-measurementDescribe("Replica cache live measurement", () => {
-  test("observes persistence and cached restore without mutating the daemon", async ({
-    page,
-  }, testInfo) => {
-    test.setTimeout(OBSERVATION_MS + 90_000);
-    expect(TARGET_URL, "PASEO_REPLICA_CACHE_MEASUREMENT_URL must be a full app URL").toBeTruthy();
-    expect(REPORT_PATH, "PASEO_REPLICA_CACHE_MEASUREMENT_REPORT must be set").toBeTruthy();
-
-    await installReplicaCacheMeasurement(page);
-    await page.goto(TARGET_URL!, { waitUntil: "domcontentloaded" });
-    await page.waitForLoadState("networkidle").catch(() => undefined);
-
-    const observation = await beginReplicaCacheObservation(page);
-    await page.waitForTimeout(OBSERVATION_MS);
-    const observed = await finishReplicaCacheObservation(page, observation, TARGET_URL!);
-    const restoreMs = await measureReplicaCacheRestore(page, TARGET_URL!, HYDRATED_SELECTOR);
-    const report: ReplicaCacheMeasurementReport = { ...observed, restoreMs };
-
-    await mkdir(path.dirname(REPORT_PATH!), { recursive: true });
-    await writeFile(REPORT_PATH!, `${JSON.stringify(report, null, 2)}\n`);
-    await testInfo.attach("replica-cache-measurement", {
-      body: JSON.stringify(report, null, 2),
-      contentType: "application/json",
-    });
-    console.log(`[measurement] Replica cache: ${JSON.stringify(report)}`);
-
-    expect(report.observationMs).toBeGreaterThanOrEqual(OBSERVATION_MS);
-  });
-});
diff --git a/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts b/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts
index 6ae16b62a7..e2c04aa315 100644
--- a/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts
+++ b/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts
@@ -26,6 +26,13 @@ async function expectUserMessageVisible(page: Page, text: string): Promise<void>
   await expect(userMessage(page, text)).toBeVisible();
 }
 
+async function selectRewindOption(page: Page, name: string): Promise<void> {
+  const option = page.getByRole("menuitem", { name, exact: true });
+  // Menus mount offscreen while their anchor and content are measured.
+  await expect(option).toBeInViewport({ ratio: 1 });
+  await option.click();
+}
+
 async function rewriteCachedMessageAsLegacyRow(
   page: Page,
   input: { prompt: string; agentId: string; workspaceId: string },
@@ -190,6 +197,7 @@ test.describe("Rewind sheet", () => {
       await expectUserMessageVisible(page, secondPrompt);
       await expect(page.getByText("Cycle 1", { exact: true })).toBeVisible();
       await expectUserMessageCount(page, 2);
+      await session.client.waitForFinish(session.agentId);
 
       await scrollChatAwayFromBottom(page, {
         deltaY: -900,
@@ -202,7 +210,7 @@ test.describe("Rewind sheet", () => {
       await expect(
         rewindSheet.getByText("This action cannot be undone", { exact: true }),
       ).toBeVisible();
-      await page.getByTestId("rewind-menu-conversation").click();
+      await selectRewindOption(page, "Rewind conversation");
 
       await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
       await expect(userMessage(page, secondPrompt)).toHaveCount(0);
@@ -221,7 +229,7 @@ test.describe("Rewind sheet", () => {
       await userMessage(page, replacementPrompt).hover();
       await page.getByTestId("rewind-menu-trigger").last().click();
       await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
-      await page.getByTestId("rewind-menu-files").click();
+      await selectRewindOption(page, "Rewind files");
       await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
       await expectComposerDraft(page, "");
       await expectUserMessageCount(page, 2);
@@ -232,7 +240,7 @@ test.describe("Rewind sheet", () => {
       await userMessage(page, replacementPrompt).hover();
       await page.getByTestId("rewind-menu-trigger").last().click();
       await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
-      await page.getByTestId("rewind-menu-files").click();
+      await selectRewindOption(page, "Rewind files");
       await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
       await expectComposerDraft(page, preservedDraft);
       await expectUserMessageCount(page, 2);
@@ -242,7 +250,7 @@ test.describe("Rewind sheet", () => {
       await userMessage(page, replacementPrompt).hover();
       await page.getByTestId("rewind-menu-trigger").last().click();
       await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
-      await page.getByTestId("rewind-menu-both").click();
+      await selectRewindOption(page, "Rewind conversation and files");
       await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
       await expectComposerDraft(page, replacementPrompt);
       await expectUserMessageCount(page, 1);
diff --git a/packages/app/e2e/browser/root-error-recovery.spec.ts b/packages/app/e2e/browser/root-error-recovery.spec.ts
new file mode 100644
index 0000000000..55f5f37b42
--- /dev/null
+++ b/packages/app/e2e/browser/root-error-recovery.spec.ts
@@ -0,0 +1,102 @@
+import { createServer, type Server } from "node:http";
+import { expect, test, type Page, type TestInfo } from "@playwright/test";
+
+let server: Server;
+let appUrl: string;
+test.beforeAll(async () => {
+  // Compile this separate fixture entrypoint in setup, like the main app warmup.
+  // Cold Metro compilation must not consume the recovery interaction's timeout.
+  test.setTimeout(120_000);
+  const metroPort = process.env.E2E_METRO_PORT;
+  if (!metroPort) throw new Error("E2E_METRO_PORT is required");
+  const bundle = `http://localhost:${metroPort}/packages/app/e2e/support/recovery-app.bundle?platform=web&dev=true&minify=false&hot=false&lazy=true&transform.engine=hermes&transform.routerRoot=src%2Fapp`;
+  const compiled = await fetch(bundle, { signal: AbortSignal.timeout(120_000) });
+  if (!compiled.ok) throw new Error(`Recovery fixture compilation failed: HTTP ${compiled.status}`);
+  await compiled.arrayBuffer();
+  server = createServer((_request, response) => {
+    response.setHeader("Content-Type", "text/html");
+    response.end(
+      `<!doctype html><html><head><meta name="viewport" content="width=device-width, initial-scale=1"><style>html,body,#root{height:100%;margin:0}#root{display:flex}</style></head><body><div id="root"></div><script src="${bundle}"></script></body></html>`,
+    );
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("Fixture server did not start");
+  appUrl = `http://127.0.0.1:${address.port}`;
+});
+
+test.afterAll(async () => {
+  await new Promise<void>((resolve, reject) =>
+    server.close((error) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve();
+    }),
+  );
+});
+
+async function openBrokenStartup(page: Page) {
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "workspace-layout-state",
+      JSON.stringify({ state: { layoutByWorkspace: {} }, version: 1 }),
+    );
+    localStorage.setItem(
+      "paseo:last-workspace-route-selection",
+      JSON.stringify({ serverId: "fixture-host", workspaceId: "broken" }),
+    );
+  });
+  await page.goto(appUrl);
+  await expect(page.getByText("Paseo ran into a problem.", { exact: true })).toBeVisible();
+}
+async function readSavedWorkspaceState(page: Page) {
+  return page.evaluate(() => ({
+    layout: localStorage.getItem("workspace-layout-state"),
+    selection: localStorage.getItem("paseo:last-workspace-route-selection"),
+  }));
+}
+async function reloadToPicker(page: Page) {
+  await page.getByRole("button", { name: "Reload", exact: true }).click();
+  await expect(page).toHaveURL(`${appUrl}/open-project`);
+  await expect(page.getByText("Project picker", { exact: true })).toBeVisible();
+  await expect(page.getByText("Paseo ran into a problem.", { exact: true })).toHaveCount(0);
+}
+async function openHealthyWorkspace(page: Page) {
+  await page.getByRole("link", { name: "Open healthy workspace" }).click();
+  await expect(page.getByText("Healthy workspace", { exact: true })).toBeVisible();
+}
+async function breakCurrentWorkspace(page: Page) {
+  await page.getByRole("button", { name: "Break this workspace" }).click();
+  await expect(page.getByText("Paseo ran into a problem.", { exact: true })).toBeVisible();
+}
+async function captureRecoveryScreen(page: Page, testInfo: TestInfo, name: string) {
+  const path = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path });
+  await testInfo.attach(name, { path, contentType: "image/png" });
+}
+
+test("Reload escapes a startup redirect and supports another recovery", async ({
+  page,
+}, testInfo) => {
+  await openBrokenStartup(page);
+  const saved = await readSavedWorkspaceState(page);
+  await captureRecoveryScreen(page, testInfo, "error-screen");
+  await reloadToPicker(page);
+  expect(await readSavedWorkspaceState(page)).toEqual(saved);
+  await captureRecoveryScreen(page, testInfo, "recovered-picker");
+  await openHealthyWorkspace(page);
+  await breakCurrentWorkspace(page);
+  await reloadToPicker(page);
+});
+
+test.describe("compact error recovery", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+  test("Reload remains reachable and returns to the picker", async ({ page }, testInfo) => {
+    await openBrokenStartup(page);
+    await captureRecoveryScreen(page, testInfo, "compact-error-screen");
+    await reloadToPicker(page);
+    await captureRecoveryScreen(page, testInfo, "compact-recovered-picker");
+  });
+});
diff --git a/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts b/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts
index 59b2e51696..de91c88569 100644
--- a/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts
+++ b/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts
@@ -1,12 +1,11 @@
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import {
-  addFakeScheduleHostAndReload,
-  buildFakeScheduleHostWorkspace,
-  FAKE_HOST_MODEL_ID,
-  FAKE_HOST_MODEL_LABEL,
-  installFakeScheduleHost,
-} from "../support/helpers/schedule-fake-host";
+  addScheduleHostAndReload,
+  createScheduleHost,
+  SECONDARY_MODEL_ID,
+  SECONDARY_MODEL_LABEL,
+} from "../support/helpers/schedule-host";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import { expectSettled, expectStableHeight } from "../support/helpers/settled";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
@@ -32,7 +31,11 @@ interface ScheduleSeedClient {
   scheduleDelete(input: { id: string }): Promise<{ error: string | null }>;
 }
 
-async function seedMockSchedule(workspace: SeededWorkspace, name: string): Promise<string> {
+async function seedMockSchedule(
+  workspace: SeededWorkspace,
+  name: string,
+  model = "ten-second-stream",
+): Promise<string> {
   const client = workspace.client as unknown as ScheduleSeedClient;
   const result = await client.scheduleCreate({
     prompt: "Say hello from the scheduled agent.",
@@ -43,7 +46,7 @@ async function seedMockSchedule(workspace: SeededWorkspace, name: string): Promi
       config: {
         provider: "mock",
         cwd: workspace.repoPath,
-        model: "ten-second-stream",
+        model,
         modeId: "load-test",
         title: name,
       },
@@ -66,42 +69,6 @@ async function deleteSeededSchedule(workspace: SeededWorkspace, id: string): Pro
     .catch(ignoreScheduleDeleteError);
 }
 
-type FakeScheduleHostSchedule = NonNullable<
-  Parameters<typeof installFakeScheduleHost>[0]["schedules"]
->[number];
-
-function buildFakeHostSchedule(input: {
-  id: string;
-  name: string;
-  cwd: string;
-}): FakeScheduleHostSchedule {
-  const now = "2026-07-01T00:00:00.000Z";
-  return {
-    id: input.id,
-    name: input.name,
-    prompt: "Run on the secondary host.",
-    cadence: { type: "cron", expression: "0 9 * * *" },
-    target: {
-      type: "new-agent",
-      config: {
-        provider: "mock",
-        cwd: input.cwd,
-        model: FAKE_HOST_MODEL_ID,
-        modeId: "load-test",
-        title: input.name,
-      },
-    },
-    status: "active",
-    createdAt: now,
-    updatedAt: now,
-    nextRunAt: now,
-    lastRunAt: null,
-    pausedAt: null,
-    expiresAt: null,
-    maxRuns: null,
-  };
-}
-
 test.describe("Schedules", () => {
   const cleanupTasks: Array<() => Promise<void>> = [];
 
@@ -154,34 +121,23 @@ test.describe("Schedules", () => {
   test("edit form hydrates a non-default host schedule after reload", async ({ page }) => {
     const workspace = await seedWorkspace({ repoPrefix: "schedule-host-b-hydration-" });
     cleanupTasks.push(() => workspace.cleanup());
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-    const scheduleId = "fake-host-schedule";
-    const scheduleName = "Secondary host schedule";
-
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-      project: fakeHost,
-      schedules: [
-        buildFakeHostSchedule({
-          id: scheduleId,
-          name: scheduleName,
-          cwd: String(fakeHost.workspace.workspaceDirectory),
-        }),
-      ],
-    });
+    const secondary = await createScheduleHost();
+    cleanupTasks.push(() => secondary.cleanup());
+    const scheduleId = await seedMockSchedule(
+      secondary,
+      "Secondary host schedule",
+      SECONDARY_MODEL_ID,
+    );
+    cleanupTasks.push(() => deleteSeededSchedule(secondary, scheduleId));
 
     await gotoAppShell(page);
     await waitForSidebarHydration(page);
     await page.goto(buildSchedulesRoute());
-    await addFakeScheduleHostAndReload({
+    await addScheduleHostAndReload({
       page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
+      serverId: secondary.serverId,
+      label: secondary.label,
+      port: secondary.port,
     });
     await page.reload();
 
@@ -197,14 +153,14 @@ test.describe("Schedules", () => {
     const modelTrigger = page.getByTestId("schedule-model-trigger");
     const modeTrigger = page.getByTestId("schedule-mode-trigger");
 
-    await expect(hostTrigger).toContainText("Fake host", { timeout: 30_000 });
+    await expect(hostTrigger).toContainText(secondary.label, { timeout: 30_000 });
     await expect(hostTrigger).toBeDisabled();
     await expectSettled(hostTrigger);
-    await expect(projectTrigger).toContainText(fakeHost.projectDisplayName, { timeout: 30_000 });
+    await expect(projectTrigger).toContainText(secondary.projectDisplayName, { timeout: 30_000 });
     await expectSettled(projectTrigger);
-    await expect(modelTrigger).toContainText(FAKE_HOST_MODEL_LABEL, { timeout: 30_000 });
+    await expect(modelTrigger).toContainText(SECONDARY_MODEL_LABEL, { timeout: 30_000 });
     await expectSettled(modelTrigger);
-    await expect(modeTrigger).toContainText("Load test", { timeout: 30_000 });
+    await expect(modeTrigger).toContainText("Load Test", { timeout: 30_000 });
     await expectSettled(modeTrigger);
     await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
     await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
diff --git a/packages/app/e2e/browser/schedules-project-target.spec.ts b/packages/app/e2e/browser/schedules-project-target.spec.ts
index 15d26dde56..4c36eb3985 100644
--- a/packages/app/e2e/browser/schedules-project-target.spec.ts
+++ b/packages/app/e2e/browser/schedules-project-target.spec.ts
@@ -1,10 +1,6 @@
 import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
-import {
-  addFakeScheduleHostAndReload,
-  buildFakeScheduleHostWorkspace,
-  installFakeScheduleHost,
-} from "../support/helpers/schedule-fake-host";
+import { addScheduleHostAndReload, createScheduleHost } from "../support/helpers/schedule-host";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
 import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
@@ -242,20 +238,13 @@ test.describe("Schedules project target", () => {
       cadenceExpression: "0 9 * * *",
     });
 
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-    await installFakeScheduleHost({
+    const secondary = await createScheduleHost();
+    cleanupTasks.push(() => secondary.cleanup());
+    await addScheduleHostAndReload({
       page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-      project: fakeHost,
-    });
-    await addFakeScheduleHostAndReload({
-      page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
+      serverId: secondary.serverId,
+      label: secondary.label,
+      port: secondary.port,
     });
 
     const hostFilterTrigger = page.getByTestId("schedules-host-filter-trigger");
@@ -274,25 +263,17 @@ test.describe("Schedules project target", () => {
     const workspace = await seedWorkspace({ repoPrefix: "schedule-project-host-model-" });
     cleanupTasks.push(() => workspace.cleanup());
     const serverId = getServerId();
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-      project: fakeHost,
-    });
+    const secondary = await createScheduleHost();
+    cleanupTasks.push(() => secondary.cleanup());
 
     await gotoAppShell(page);
     await waitForSidebarHydration(page);
     await page.goto(buildSchedulesRoute());
-    await addFakeScheduleHostAndReload({
+    await addScheduleHostAndReload({
       page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
+      serverId: secondary.serverId,
+      label: secondary.label,
+      port: secondary.port,
     });
     await expect(page.getByTestId("schedules-empty")).toBeVisible({ timeout: 30_000 });
     await page.getByTestId("schedules-empty-new").click();
@@ -334,8 +315,8 @@ test.describe("Schedules project target", () => {
     await expectSettled(modeTrigger);
 
     await hostTrigger.click();
-    await page.getByTestId(`schedule-host-option-${fakeHost.serverId}`).click();
-    await expect(hostTrigger).toContainText("Fake host");
+    await page.getByTestId(`schedule-host-option-${secondary.serverId}`).click();
+    await expect(hostTrigger).toContainText(secondary.label);
     await expect(projectTrigger).toContainText(/select project/i);
     await expect(modelTrigger).toHaveCount(0);
     await expect(thinkingTrigger).toHaveCount(0);
@@ -345,9 +326,9 @@ test.describe("Schedules project target", () => {
 
     await projectTrigger.click();
     await page
-      .getByTestId(`schedule-project-option-${projectEquivalenceViewKey(fakeHost.projectKey)}`)
+      .getByTestId(`schedule-project-option-${projectEquivalenceViewKey(secondary.projectKey)}`)
       .click();
-    await expect(projectTrigger).toContainText(fakeHost.projectDisplayName);
+    await expect(projectTrigger).toContainText(secondary.projectDisplayName);
     await expectSettled(projectTrigger);
     await expect(modelTrigger).toContainText(/select model/i);
     await expectSettled(modelTrigger);
@@ -355,7 +336,7 @@ test.describe("Schedules project target", () => {
     await expect(modeTrigger).toHaveCount(0);
 
     await page.getByLabel("Schedule name").fill(`Cross host model ${Date.now()}`);
-    await page.getByLabel("Prompt").fill("Run on the fake host project.");
+    await page.getByLabel("Prompt").fill("Run on the secondary host project.");
     await expect(page.getByRole("button", { name: "Create schedule" })).toBeDisabled();
   });
 
diff --git a/packages/app/e2e/browser/schedules-relative-time.spec.ts b/packages/app/e2e/browser/schedules-relative-time.spec.ts
new file mode 100644
index 0000000000..4c20f54042
--- /dev/null
+++ b/packages/app/e2e/browser/schedules-relative-time.spec.ts
@@ -0,0 +1,118 @@
+import { expect, test, type Page } from "../support/fixtures";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { buildSchedulesRoute } from "../../src/utils/host-routes";
+
+interface ScheduleSeedClient {
+  scheduleCreate(input: {
+    prompt: string;
+    name?: string;
+    cadence: { type: "cron"; expression: string };
+    target: {
+      type: "new-agent";
+      config: {
+        provider: "mock";
+        cwd: string;
+        model: string;
+        modeId: string;
+        title: string;
+      };
+    };
+    runOnCreate: boolean;
+  }): Promise<{ schedule: { id: string; createdAt: string } | null; error: string | null }>;
+  schedulePause(input: { id: string }): Promise<{ error: string | null }>;
+  scheduleDelete(input: { id: string }): Promise<{ error: string | null }>;
+}
+
+interface SeededSchedule {
+  id: string;
+  createdAt: number;
+}
+
+async function seedPausedSchedule(
+  workspace: SeededWorkspace,
+  name: string,
+): Promise<SeededSchedule> {
+  const client = workspace.client as unknown as ScheduleSeedClient;
+  const result = await client.scheduleCreate({
+    prompt: "Say hello from the scheduled agent.",
+    name,
+    cadence: { type: "cron", expression: "0 9 * * *" },
+    target: {
+      type: "new-agent",
+      config: {
+        provider: "mock",
+        cwd: workspace.repoPath,
+        model: "ten-second-stream",
+        modeId: "load-test",
+        title: name,
+      },
+    },
+    runOnCreate: false,
+  });
+  if (!result.schedule) {
+    throw new Error(result.error ?? "Failed to seed schedule");
+  }
+  const { id, createdAt } = result.schedule;
+  const paused = await client.schedulePause({ id });
+  if (paused.error) {
+    throw new Error(paused.error);
+  }
+  return { id, createdAt: Date.parse(createdAt) };
+}
+
+async function deleteSeededSchedule(workspace: SeededWorkspace, id: string): Promise<void> {
+  const client = workspace.client as unknown as ScheduleSeedClient;
+  const result = await client.scheduleDelete({ id });
+  if (result.error) {
+    throw new Error(result.error);
+  }
+}
+
+/** Opens Schedules with the browser clock frozen at `time`, so the page cannot age it. */
+async function openSchedulesAt(page: Page, time: number): Promise<void> {
+  await page.clock.install({ time });
+  await page.goto(buildSchedulesRoute());
+}
+
+async function letTimePass(page: Page, duration: string): Promise<void> {
+  await page.clock.fastForward(duration);
+}
+
+async function expectScheduleRowText(page: Page, scheduleId: string, text: string): Promise<void> {
+  await expect(page.getByTestId(`schedule-row-${scheduleId}`)).toContainText(text, {
+    timeout: 30_000,
+  });
+}
+
+test.describe("Schedule relative timestamps", () => {
+  const cleanupTasks: Array<() => Promise<void>> = [];
+
+  test.afterEach(async () => {
+    const failures: unknown[] = [];
+    for (const cleanup of cleanupTasks.toReversed()) {
+      try {
+        await cleanup();
+      } catch (error) {
+        failures.push(error);
+      }
+    }
+    cleanupTasks.length = 0;
+    if (failures.length > 0) {
+      throw new AggregateError(failures, "Test cleanup failed");
+    }
+  });
+
+  test("an idle schedule row keeps its created age current", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "schedule-relative-time-", git: false });
+    cleanupTasks.push(() => workspace.cleanup());
+    const schedule = await seedPausedSchedule(workspace, `Relative time ${Date.now()}`);
+    cleanupTasks.push(() => deleteSeededSchedule(workspace, schedule.id));
+
+    await openSchedulesAt(page, schedule.createdAt);
+    await expectScheduleRowText(page, schedule.id, "Created just now");
+
+    await letTimePass(page, "03:00");
+
+    await expectScheduleRowText(page, schedule.id, "Created 3m ago");
+  });
+});
diff --git a/packages/app/e2e/browser/sessions-search-hosts.spec.ts b/packages/app/e2e/browser/sessions-search-hosts.spec.ts
index e1518a946e..3192f513bc 100644
--- a/packages/app/e2e/browser/sessions-search-hosts.spec.ts
+++ b/packages/app/e2e/browser/sessions-search-hosts.spec.ts
@@ -12,7 +12,6 @@ import { getServerId } from "../support/helpers/server-id";
 // it — reaching through the `.tsx` picker would drag React Native into Node.
 import { ALL_HOSTS_OPTION_ID } from "@/components/hosts/host-picker-constants";
 
-const AGENT_ROW = '[data-testid^="agent-row-"]';
 const PRIMARY_LABEL = "Primary box";
 const SECONDARY_LABEL = "Secondary box";
 
@@ -28,21 +27,19 @@ async function selectHost(page: Page, serverId: string): Promise<void> {
   await page.getByTestId(`sessions-host-filter-item-${serverId}`).click();
 }
 
-async function expectRankedTitles(page: Page, titles: string[]): Promise<void> {
-  const rows = page.locator(AGENT_ROW).filter({ hasText: NONCE });
+async function expectChronologicalTitles(page: Page, titles: string[]): Promise<void> {
+  const rows = page.getByRole("button").filter({ hasText: NONCE });
   await expect(rows).toHaveCount(titles.length, { timeout: 30_000 });
   for (const [index, title] of titles.entries()) {
     await expect(rows.nth(index)).toContainText(title, { timeout: 30_000 });
   }
 }
 
-// Searching across hosts is the case a single-daemon spec cannot see: each host
-// ranks only its own sessions, so the merge is the only thing that can put the
-// best match first.
+// Searching across hosts merges each host's chronological matching sessions.
 test.describe("History search across hosts", () => {
   test.describe.configure({ timeout: 420_000 });
 
-  test("ranks matches from every host together and narrows to one host on demand", async ({
+  test("orders matches from every host chronologically and narrows to one host on demand", async ({
     page,
   }) => {
     const secondaryServerId = `srv_hist_${randomUUID().replaceAll("-", "").slice(0, 12)}`;
@@ -52,8 +49,7 @@ test.describe("History search across hosts", () => {
     let secondaryWorkspace: Awaited<ReturnType<typeof seedWorkspace>> | null = null;
 
     // The weak match is the newest session on the primary host and the strong
-    // match is the oldest on the secondary, so only a real cross-host merge on
-    // relevance can order them correctly.
+    // match is the oldest on the secondary; chronology must win over relevance.
     const weakTitle = `${NONCE} Unbilled usage report`;
     const strongTitle = `${NONCE} Bill the customer`;
     const unrelatedTitle = `${NONCE} Terminal resize fix`;
@@ -87,22 +83,21 @@ test.describe("History search across hosts", () => {
       });
       await openSessions(page);
 
-      // All hosts: the stronger match leads despite being the older session on
-      // the other daemon.
+      // All hosts: the newer partial match leads.
       await search(page, `${NONCE} bill`);
-      await expectRankedTitles(page, [strongTitle, weakTitle]);
+      await expectChronologicalTitles(page, [weakTitle, strongTitle]);
 
       // One host: the other daemon's stronger match drops out entirely.
       await selectHost(page, getServerId());
-      await expectRankedTitles(page, [weakTitle]);
+      await expectChronologicalTitles(page, [weakTitle]);
 
       await selectHost(page, secondaryDaemon.serverId);
-      await expectRankedTitles(page, [strongTitle]);
+      await expectChronologicalTitles(page, [strongTitle]);
 
       // Back to all hosts, and clearing the query returns every seeded session.
       await selectHost(page, ALL_HOSTS_OPTION_ID);
       await page.getByTestId("sessions-search-clear").click();
-      const rows = page.locator(AGENT_ROW).filter({ hasText: NONCE });
+      const rows = page.getByRole("button").filter({ hasText: NONCE });
       await expect(rows).toHaveCount(3, { timeout: 30_000 });
     } finally {
       await primaryWorkspace?.cleanup().catch(() => undefined);
@@ -140,7 +135,7 @@ test.describe("History search across hosts", () => {
       await expect(page.getByTestId("sessions-host-errors")).toContainText(SECONDARY_LABEL, {
         timeout: 30_000,
       });
-      await expectRankedTitles(page, [reachableTitle]);
+      await expectChronologicalTitles(page, [reachableTitle]);
     } finally {
       await workspace.cleanup().catch(() => undefined);
     }
diff --git a/packages/app/e2e/browser/sessions-search.spec.ts b/packages/app/e2e/browser/sessions-search.spec.ts
index eac218b264..7f54617304 100644
--- a/packages/app/e2e/browser/sessions-search.spec.ts
+++ b/packages/app/e2e/browser/sessions-search.spec.ts
@@ -9,8 +9,6 @@ import {
   resetSeededPageState,
 } from "../support/helpers/archive-tab";
 
-const AGENT_ROW = '[data-testid^="agent-row-"]';
-
 /**
  * Every seeded title opens with the same nonce, so a query of "<nonce> term"
  * can only reach this spec's sessions. The daemon is shared with the rest of
@@ -19,9 +17,9 @@ const AGENT_ROW = '[data-testid^="agent-row-"]';
 const NONCE = `hsq${randomUUID().replaceAll("-", "").slice(0, 8)}`;
 
 const TITLES = {
-  billing: `${NONCE} Add Stripe billing`,
-  unbilled: `${NONCE} Unbilled usage report`,
-  terminal: `${NONCE} Terminal resize fix`,
+  billing: `${NONCE} main Add Stripe billing`,
+  unbilled: `${NONCE} main Unbilled usage report`,
+  terminal: `${NONCE} main Terminal resize fix`,
 } as const;
 
 async function search(page: Page, query: string): Promise<void> {
@@ -29,7 +27,7 @@ async function search(page: Page, query: string): Promise<void> {
 }
 
 function rowTitles(page: Page) {
-  return page.locator(AGENT_ROW);
+  return page.getByRole("button");
 }
 
 async function expectVisibleTitles(page: Page, titles: string[]): Promise<void> {
@@ -40,6 +38,75 @@ async function expectVisibleTitles(page: Page, titles: string[]): Promise<void>
   }
 }
 
+async function verifyChronologicalFiltering(page: Page): Promise<void> {
+  await test.step("narrows history while preserving chronological grouping", async () => {
+    await expectVisibleTitles(page, [TITLES.unbilled, TITLES.billing, TITLES.terminal]);
+    await expect(page.getByText("Today", { exact: true })).toHaveCount(1, {
+      timeout: 30_000,
+    });
+
+    await search(page, `${NONCE} billing`);
+    await expectVisibleTitles(page, [TITLES.billing]);
+    await expect(page.getByText("Today", { exact: true })).toHaveCount(1, {
+      timeout: 30_000,
+    });
+
+    await page.getByTestId("sessions-search-clear").click();
+    await expect(page.getByTestId("sessions-search-input")).toHaveValue("");
+    await expectVisibleTitles(page, [TITLES.unbilled, TITLES.billing, TITLES.terminal]);
+    await expect(page.getByText("Today", { exact: true })).toHaveCount(1, {
+      timeout: 30_000,
+    });
+  });
+}
+
+async function verifyRecencyBeforeMatchStrength(page: Page): Promise<void> {
+  await test.step("keeps newer partial matches before older stronger matches", async () => {
+    await search(page, `${NONCE} bill`);
+    await expectVisibleTitles(page, [TITLES.unbilled, TITLES.billing]);
+  });
+}
+
+async function verifyExactAndTypoHighlights(page: Page): Promise<void> {
+  await test.step("highlights exact and typo-resolved matches", async () => {
+    await search(page, `${NONCE} billing`);
+    const row = page.getByRole("button").filter({ hasText: NONCE }).first();
+    await expect(row.getByText("billing", { exact: true })).toBeVisible({ timeout: 30_000 });
+
+    await search(page, `${NONCE} bulling`);
+    await expectVisibleTitles(page, [TITLES.billing]);
+    const typoRow = page.getByRole("button").filter({ hasText: NONCE }).first();
+    await expect(typoRow.getByText("billing", { exact: true })).toBeVisible({
+      timeout: 30_000,
+    });
+  });
+}
+
+async function verifyAllSearchFieldHighlights(page: Page): Promise<void> {
+  await test.step("highlights workspace, agent, project and branch independently", async () => {
+    await search(page, `${NONCE} main`);
+    await expectVisibleTitles(page, [TITLES.unbilled, TITLES.billing, TITLES.terminal]);
+    const row = rowTitles(page).filter({ hasText: NONCE }).first();
+    for (const field of ["workspace", "title", "project", "branch"]) {
+      await expect(
+        row.getByTestId(new RegExp(`^agent-row-${field}-`)).getByText(/^main$/i),
+      ).toBeVisible();
+    }
+    await expect(page.getByText("Yesterday", { exact: true })).toHaveCount(0);
+  });
+}
+
+async function verifyEmptySearchAndRecovery(page: Page): Promise<void> {
+  await test.step("distinguishes no matches from empty history", async () => {
+    await search(page, `${NONCE} kubernetes`);
+    await expect(page.getByTestId("sessions-empty")).toBeVisible({ timeout: 30_000 });
+    await expect(page.getByText("No sessions match")).toBeVisible({ timeout: 30_000 });
+
+    await page.getByText("Clear search").click();
+    await expectVisibleTitles(page, [TITLES.unbilled, TITLES.billing, TITLES.terminal]);
+  });
+}
+
 test.describe("History search", () => {
   let client: Awaited<ReturnType<typeof connectSeedClient>>;
   let tempRepo: { path: string; cleanup: () => Promise<void> };
@@ -48,10 +115,11 @@ test.describe("History search", () => {
   test.describe.configure({ timeout: 300_000 });
 
   test.beforeAll(async () => {
-    tempRepo = await createTempGitRepo("sessions-search-");
+    tempRepo = await createTempGitRepo("main-sessions-search-");
     client = await connectSeedClient();
     const created = await client.createWorkspace({
       source: { kind: "directory", path: tempRepo.path },
+      title: "Main history",
     });
     if (!created.workspace) {
       throw new Error(created.error ?? `Failed to create workspace ${tempRepo.path}`);
@@ -59,7 +127,7 @@ test.describe("History search", () => {
     projectId = created.workspace.projectId;
     const workspaceId = created.workspace.id;
 
-    for (const title of [TITLES.terminal, TITLES.unbilled, TITLES.billing]) {
+    for (const title of [TITLES.terminal, TITLES.billing, TITLES.unbilled]) {
       await createIdleAgent(client, { cwd: tempRepo.path, workspaceId, title });
     }
   });
@@ -70,55 +138,26 @@ test.describe("History search", () => {
     await tempRepo?.cleanup();
   });
 
-  test("searches, ranks, highlights, and clears session history", async ({ page }) => {
-    await resetSeededPageState(page);
-    await openSessions(page);
+  for (const viewport of [
+    { width: 1440, height: 1000 },
+    { width: 390, height: 844 },
+  ]) {
+    test(`filters chronological history and highlights matches at ${viewport.width}px`, async ({
+      page,
+    }) => {
+      await resetSeededPageState(page);
+      await openSessions(page);
+      await page.setViewportSize(viewport);
 
-    await test.step("narrows history and restores chronological grouping", async () => {
-      await expectVisibleTitles(page, [TITLES.billing, TITLES.unbilled, TITLES.terminal]);
-      await expect(page.getByText("Today", { exact: true })).toHaveCount(1, {
-        timeout: 30_000,
-      });
+      await verifyChronologicalFiltering(page);
 
-      await search(page, `${NONCE} billing`);
-      await expectVisibleTitles(page, [TITLES.billing]);
-      await expect(page.getByText("Today", { exact: true })).toHaveCount(0, {
-        timeout: 30_000,
-      });
+      await verifyRecencyBeforeMatchStrength(page);
 
-      await page.getByTestId("sessions-search-clear").click();
-      await expect(page.getByTestId("sessions-search-input")).toHaveValue("");
-      await expectVisibleTitles(page, [TITLES.billing, TITLES.unbilled, TITLES.terminal]);
-      await expect(page.getByText("Today", { exact: true })).toHaveCount(1, {
-        timeout: 30_000,
-      });
+      await verifyExactAndTypoHighlights(page);
+
+      await verifyAllSearchFieldHighlights(page);
+
+      await verifyEmptySearchAndRecovery(page);
     });
-
-    await test.step("ranks whole-word matches above substrings", async () => {
-      await search(page, `${NONCE} bill`);
-      await expectVisibleTitles(page, [TITLES.billing, TITLES.unbilled]);
-    });
-
-    await test.step("highlights exact and typo-resolved matches", async () => {
-      await search(page, `${NONCE} billing`);
-      const row = page.locator(AGENT_ROW).filter({ hasText: NONCE }).first();
-      await expect(row.getByText("billing", { exact: true })).toBeVisible({ timeout: 30_000 });
-
-      await search(page, `${NONCE} bulling`);
-      await expectVisibleTitles(page, [TITLES.billing]);
-      const typoRow = page.locator(AGENT_ROW).filter({ hasText: NONCE }).first();
-      await expect(typoRow.getByText("billing", { exact: true })).toBeVisible({
-        timeout: 30_000,
-      });
-    });
-
-    await test.step("distinguishes no matches from empty history", async () => {
-      await search(page, `${NONCE} kubernetes`);
-      await expect(page.getByTestId("sessions-empty")).toBeVisible({ timeout: 30_000 });
-      await expect(page.getByText("No sessions match")).toBeVisible({ timeout: 30_000 });
-
-      await page.getByText("Clear search").click();
-      await expectVisibleTitles(page, [TITLES.billing, TITLES.unbilled, TITLES.terminal]);
-    });
-  });
+  }
 });
diff --git a/packages/app/e2e/browser/settings-host-page.spec.ts b/packages/app/e2e/browser/settings-host-page.spec.ts
index 8a702f8c08..b531232615 100644
--- a/packages/app/e2e/browser/settings-host-page.spec.ts
+++ b/packages/app/e2e/browser/settings-host-page.spec.ts
@@ -2,6 +2,7 @@ import { expect, test } from "../support/fixtures";
 import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import { TEST_HOST_LABEL } from "../support/helpers/daemon-registry";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
 import { getServerId } from "../support/helpers/server-id";
 import {
   expectSettingsHeader,
@@ -18,55 +19,56 @@ import {
   expectRetiredSidebarSectionsAbsent,
   expectHostPageVisible,
   seedSavedSettingsHosts,
+  selectSettingsHost,
+  expectHostRejectedWithReAddGuidance,
+  expectNoHostPasswordControls,
+  removeHostFromHostPage,
+  addDirectHostFromSettings,
+  expectHostOnlineWithoutError,
 } from "../support/helpers/settings";
 
 test.describe("Settings host page", () => {
-  test("connections section shows the seeded connection endpoint", async ({ page }) => {
+  test("visits host settings and opens the label editor", async ({ page }) => {
     const serverId = getServerId();
     const port = getE2EDaemonPort();
-
     await gotoAppShell(page);
     await openSettings(page);
     await openSettingsHost(page, serverId);
+    await test.step("connections section shows the seeded connection endpoint", async () => {
+      await expectSettingsHeader(page, "Connections");
+      await expectHostConnectionsCard(page, port);
+    });
+    await test.step("agents section shows the inject MCP toggle", async () => {
+      await openHostSection(page, serverId, "agents");
+      await expectSettingsHeader(page, "Agents");
+      await expectHostInjectMcpCard(page);
+    });
+    await test.step("providers section shows the providers card", async () => {
+      await expectHostProvidersCard(page, serverId);
+      await expectSettingsHeader(page, "Providers");
+    });
+    await test.step("host section shows the host label and restart/remove action cards", async () => {
+      await openHostSection(page, serverId, "host");
+      await expectSettingsHeader(page, "Overview");
+      await expectHostLabelDisplayed(page);
+      await expectHostActionCards(page, serverId);
+    });
+    await test.step("clicking the label pencil reveals the inline editor", async () => {
+      await openHostSection(page, serverId, "host");
 
-    await expectSettingsHeader(page, "Connections");
-    await expectHostConnectionsCard(page, port);
-  });
+      await expectHostLabelDisplayed(page);
+      await clickEditHostLabel(page);
+      await expectHostLabelEditMode(page, TEST_HOST_LABEL);
+      await page.keyboard.press("Escape");
+    });
+    await test.step("host section does not render daemon lifecycle controls for a remote daemon", async () => {
+      await openHostSection(page, serverId, "host");
 
-  test("agents section shows the inject MCP toggle", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await openHostSection(page, serverId, "agents");
-    await expectSettingsHeader(page, "Agents");
-    await expectHostInjectMcpCard(page);
-  });
-
-  test("providers section shows the providers card", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await expectHostProvidersCard(page, serverId);
-    await expectSettingsHeader(page, "Providers");
-  });
-
-  test("host section shows the host label and restart/remove action cards", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await openHostSection(page, serverId, "host");
-    await expectSettingsHeader(page, "Overview");
-    await expectHostLabelDisplayed(page);
-    await expectHostActionCards(page, serverId);
+      await expectHostNoDaemonLifecycleRow(page);
+    });
+    await test.step("settings sidebar exposes the flat App and Host section rows", async () => {
+      await expectRetiredSidebarSectionsAbsent(page);
+    });
   });
 
   test("a failed remote daemon update remains visible in the host UI", async ({
@@ -94,38 +96,45 @@ test.describe("Settings host page", () => {
     await expect(updateButton).toBeEnabled();
   });
 
-  test("clicking the label pencil reveals the inline editor", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "host");
-
-    await expectHostLabelDisplayed(page);
-    await clickEditHostLabel(page);
-    await expectHostLabelEditMode(page, TEST_HOST_LABEL);
-  });
-
-  test("host section does not render daemon lifecycle controls for a remote daemon", async ({
+  test("a host rejected for its password reconnects after being removed and added again with it", async ({
     page,
   }) => {
-    const serverId = getServerId();
+    const password = "e2e host password";
+    const daemon = await startIsolatedHostDaemon("srv_e2e_password_host", {
+      environment: { ...process.env, PASEO_PASSWORD: password },
+    });
+    try {
+      await seedSavedSettingsHosts(page, [
+        {
+          serverId: getServerId(),
+          label: TEST_HOST_LABEL,
+          endpoint: `127.0.0.1:${getE2EDaemonPort()}`,
+        },
+        {
+          serverId: daemon.serverId,
+          label: "Password host",
+          endpoint: `127.0.0.1:${daemon.port}`,
+        },
+      ]);
+      await page.reload();
+      await openSettings(page);
+      await selectSettingsHost(page, daemon.serverId);
+      await openHostSection(page, daemon.serverId, "host");
 
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "host");
+      await test.step("the host page shows the reason and the re-add guidance, with no password UI", async () => {
+        await expectHostRejectedWithReAddGuidance(page, "Password required");
+        await expectNoHostPasswordControls(page);
+      });
 
-    // TODO: add a local-daemon fixture for positive daemon lifecycle coverage.
-    await expectHostNoDaemonLifecycleRow(page);
-  });
-
-  test("settings sidebar exposes the flat App and Host section rows", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-
-    await expectRetiredSidebarSectionsAbsent(page);
+      await test.step("removing the host and adding it again with the password brings it online", async () => {
+        await removeHostFromHostPage(page, daemon.serverId);
+        await addDirectHostFromSettings(page, { host: "127.0.0.1", port: daemon.port, password });
+        await openHostSection(page, daemon.serverId, "host");
+        await expectHostOnlineWithoutError(page);
+      });
+    } finally {
+      await daemon.close();
+    }
   });
 
   test("navigating to /settings/hosts/[serverId] redirects to the connections section", async ({
diff --git a/packages/app/e2e/browser/settings-navigation.spec.ts b/packages/app/e2e/browser/settings-navigation.spec.ts
index e13a29535c..bc8e1eedec 100644
--- a/packages/app/e2e/browser/settings-navigation.spec.ts
+++ b/packages/app/e2e/browser/settings-navigation.spec.ts
@@ -72,6 +72,9 @@ test.describe("Settings sidebar navigation", () => {
     await openSettingsSection(page, "appearance");
     await expectSettingsHeader(page, "Appearance");
     await expectAppearanceContent(page);
+
+    await clickSettingsBackToWorkspace(page);
+    await expect(page).not.toHaveURL(/\/settings(\/|$)/);
   });
 
   test("/h/[serverId]/settings redirects to the host connections section", async ({ page }) => {
@@ -79,19 +82,13 @@ test.describe("Settings sidebar navigation", () => {
     await verifyLegacyHostSettingsRedirect(page);
   });
 
-  test("the + Add host button opens the add-host method modal", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openAddHostFlow(page);
-    await expectAddHostMethodOptions(page);
-  });
-
   test("direct connection advanced URI round-trips SSL and password into the form", async ({
     page,
   }) => {
     await gotoAppShell(page);
     await openSettings(page);
     await openAddHostFlow(page);
+    await expectAddHostMethodOptions(page);
     await selectHostConnectionType(page, "direct");
 
     await toggleHostAdvanced(page);
@@ -115,20 +112,6 @@ test.describe("Settings sidebar navigation", () => {
     await expectDirectHostUriHidden(page);
   });
 
-  test("sidebar shows a Back to workspace row that leaves /settings", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await clickSettingsBackToWorkspace(page);
-    await expect(page).not.toHaveURL(/\/settings(\/|$)/);
-  });
-
-  test("pressing Escape closes settings", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await page.keyboard.press("Escape");
-    await expect(page).not.toHaveURL(/\/settings(\/|$)/);
-  });
-
   test("Escape lets settings dropdowns and modals close before leaving settings", async ({
     page,
   }) => {
@@ -155,66 +138,45 @@ test.describe("Settings sidebar navigation", () => {
       await expect(page.getByText("Add connection", { exact: true })).toHaveCount(0);
       await expect(page).toHaveURL(/\/settings(\/|$)/);
     });
+
+    await page.keyboard.press("Escape");
+    await expect(page).not.toHaveURL(/\/settings(\/|$)/);
   });
 });
 
 test.describe("Settings — compact master-detail", () => {
   test.use({ viewport: { width: 390, height: 844 } });
 
-  test("/settings renders only the sidebar list (no section content)", async ({ page }) => {
+  test("opens compact app and host details and returns through the settings list", async ({
+    page,
+  }) => {
     await gotoAppShell(page);
     await openCompactSettings(page, buildOpenProjectRoute());
 
     await expectSettingsSidebarSections(page, ["general", "diagnostics", "about"]);
     await expectCompactSettingsList(page);
 
-    await expectSettingsBackButton(page);
-    await goBackInSettings(page);
-    await expect(page).not.toHaveURL(/\/settings(\/|$)/);
-  });
+    await test.step("open app details and return to the list", async () => {
+      await openSettingsSection(page, "diagnostics");
+      await expectAppRoute(page, buildSettingsSectionRoute("diagnostics"));
+      await expectDiagnosticsContent(page);
+      await expectSettingsSidebarHidden(page);
+      await expectSettingsBackButton(page);
+      await goBackInSettings(page);
+      await expectCompactSettingsList(page);
+    });
 
-  test("tapping a section pushes /settings/[section] and shows a back button", async ({ page }) => {
-    await gotoAppShell(page);
-    await openCompactSettings(page, buildOpenProjectRoute());
-
-    await openSettingsSection(page, "diagnostics");
-    await expectAppRoute(page, buildSettingsSectionRoute("diagnostics"));
-    await expectDiagnosticsContent(page);
-    await expectSettingsSidebarHidden(page);
-    await expectSettingsBackButton(page);
-  });
-
-  test("back from a section detail returns to the /settings list", async ({ page }) => {
-    await gotoAppShell(page);
-    await openCompactSettings(page, buildOpenProjectRoute());
-
-    await openSettingsSection(page, "about");
-    await expectAppRoute(page, buildSettingsSectionRoute("about"));
-
-    await goBackInSettings(page);
-    await expectCompactSettingsList(page);
-    await expectSettingsBackButton(page);
-  });
-
-  test("tapping a host section row pushes /settings/hosts/[serverId]/connections", async ({
-    page,
-  }) => {
-    await gotoAppShell(page);
-    await openCompactSettings(page, buildOpenProjectRoute());
-
-    await openCompactSettingsHost(page);
-    await expectSettingsBackButton(page);
-    await expectSettingsSidebarHidden(page);
-  });
-
-  test("back from a host detail returns to the /settings list", async ({ page }) => {
-    await gotoAppShell(page);
-    await openCompactSettings(page, buildOpenProjectRoute());
-
-    await openCompactSettingsHost(page);
-    await goBackInSettings(page);
-    await expectAppRoute(page, buildSettingsRoute());
-    await expectSettingsSidebarVisible(page);
+    await test.step("open host details and return through the list", async () => {
+      await openCompactSettingsHost(page);
+      await expectSettingsBackButton(page);
+      await expectSettingsSidebarHidden(page);
+      await goBackInSettings(page);
+      await expectAppRoute(page, buildSettingsRoute());
+      await expectSettingsSidebarVisible(page);
+      await expectSettingsBackButton(page);
+      await goBackInSettings(page);
+      await expect(page).not.toHaveURL(/\/settings(\/|$)/);
+    });
   });
 
   test("host picker settings opens Overview and backs through the settings list", async ({
diff --git a/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts b/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts
index 5b52c7025d..2c1fd0cc24 100644
--- a/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts
+++ b/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts
@@ -1,6 +1,6 @@
 import { buildHostAgentDetailRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { expect, test } from "../support/fixtures";
-import { createIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
+import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
 import { waitForTabBar, expectAgentTabActive } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
@@ -104,12 +104,12 @@ test.describe("Settings toggle tab regression", () => {
     const workspace = await seedWorkspace({ repoPrefix: "settings-toggle-tab-" });
 
     try {
-      const firstAgent = await createIdleAgent(workspace.client, {
+      const firstAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `settings-toggle-a-${Date.now()}`,
       });
-      const secondAgent = await createIdleAgent(workspace.client, {
+      const secondAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `settings-toggle-b-${Date.now()}`,
@@ -165,12 +165,12 @@ test.describe("Settings toggle tab regression", () => {
     const workspace = await seedWorkspace({ repoPrefix: "settings-composer-height-" });
 
     try {
-      const firstAgent = await createIdleAgent(workspace.client, {
+      const firstAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `settings-composer-height-a-${Date.now()}`,
       });
-      const secondAgent = await createIdleAgent(workspace.client, {
+      const secondAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `settings-composer-height-b-${Date.now()}`,
@@ -225,12 +225,12 @@ test.describe("Settings toggle tab regression", () => {
     const workspace = await seedWorkspace({ repoPrefix: "agent-route-refresh-" });
 
     try {
-      const firstAgent = await createIdleAgent(workspace.client, {
+      const firstAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `agent-route-refresh-a-${Date.now()}`,
       });
-      const secondAgent = await createIdleAgent(workspace.client, {
+      const secondAgent = await createMockIdleAgent(workspace.client, {
         cwd: workspace.repoPath,
         workspaceId: workspace.workspaceId,
         title: `agent-route-refresh-b-${Date.now()}`,
diff --git a/packages/app/e2e/browser/sidebar-help.spec.ts b/packages/app/e2e/browser/sidebar-help.spec.ts
index 2d0c6ef25f..4c0162e8d8 100644
--- a/packages/app/e2e/browser/sidebar-help.spec.ts
+++ b/packages/app/e2e/browser/sidebar-help.spec.ts
@@ -1,6 +1,7 @@
 import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { openSettingsSection } from "../support/helpers/settings";
+import { openWhatsNew, release, serveChangelog } from "../support/helpers/changelog";
 
 const DISCORD_DESTINATION =
   /^https:\/\/(?:discord\.gg\/jz8T2uahpH|discord\.com\/invite\/jz8T2uahpH)(?:[/?#]|$)/;
@@ -41,7 +42,7 @@ async function expectExternalPage(
   await popup.close();
 }
 
-test("opens troubleshooting, support, and release destinations", async ({ page }) => {
+test("opens troubleshooting and support destinations", async ({ page }) => {
   await gotoAppShell(page);
   await expect(page.getByTestId("sidebar-help")).toBeVisible();
 
@@ -62,18 +63,60 @@ test("opens troubleshooting, support, and release destinations", async ({ page }
     await closeSheet(page, "keyboard-shortcuts-dialog");
   });
 
-  await test.step("opens support and release pages", async () => {
+  await test.step("opens support pages", async () => {
     await openHelpMenu(page);
     await expectExternalPage(page, "sidebar-help-discord", DISCORD_DESTINATION);
 
     await openHelpMenu(page);
     await expectExternalPage(page, "sidebar-help-github", GITHUB_ISSUE_DESTINATION);
-
-    await openHelpMenu(page);
-    await expectExternalPage(page, "sidebar-help-changelog", CHANGELOG_DESTINATION);
   });
 });
 
+test("renders the changelog in the app and links the website", async ({ page }) => {
+  // A callout, a section name the app has never seen, and a fenced sample whose
+  // contents look like a release heading.
+  await serveChangelog(page, [
+    "# Changelog",
+    "",
+    "## 9.1.0 - 2026-03-04",
+    "",
+    "Headline release note.",
+    "",
+    "> [!WARNING]",
+    "> Read this before upgrading.",
+    "",
+    "### Sparkles",
+    "",
+    "- Added a brand new thing",
+    "",
+    "```md",
+    "## 0.0.0 - 1999-01-01",
+    "```",
+    "",
+    "## 9.0.0 - 2026-02-01",
+    "",
+    "### Fixed",
+    "",
+    "- Fixed an older thing",
+    "",
+  ]);
+  await gotoAppShell(page);
+
+  const sheet = await openWhatsNew(page);
+  const latest = release(sheet, "9.1.0");
+
+  await expect(latest.getByText("March 4, 2026", { exact: true })).toBeVisible();
+  await expect(latest.getByText("Headline release note.")).toBeVisible();
+  await expect(latest.getByText("Read this before upgrading.")).toBeVisible();
+  await expect(latest.getByText("Sparkles", { exact: true })).toBeVisible();
+  await expect(latest.getByText("Added a brand new thing")).toBeVisible();
+  await expect(release(sheet, "9.0.0")).toBeVisible();
+  await expect(release(sheet, "0.0.0")).toHaveCount(0);
+
+  await expectExternalPage(page, "changelog-open-website", CHANGELOG_DESTINATION);
+  await closeSheet(page, "changelog-sheet");
+});
+
 test("searches keyboard shortcuts from the sidebar help menu", async ({ page }) => {
   await page.addInitScript(() => {
     Object.defineProperty(navigator, "platform", { get: () => "MacIntel" });
@@ -112,6 +155,18 @@ test("keeps diagnostics available from Settings after globalizing the sheet", as
 test.describe("compact sidebar help", () => {
   test.use({ viewport: { width: 390, height: 844 }, isMobile: true, hasTouch: true });
 
+  test("footer buttons provide finger-sized targets and accept taps beyond the glyph", async ({
+    page,
+  }) => {
+    await gotoAppShell(page);
+    await openCompactSidebar(page);
+    await expectFingerSizedFooterTargets(page);
+    await tapHelpNearTargetEdge(page);
+    await expect(page.getByTestId("sidebar-help-menu")).toBeVisible();
+    await page.getByTestId("sidebar-help-diagnostics").click();
+    await expectDiagnosticReport(page);
+  });
+
   test("offers diagnostics without advertising disabled keyboard shortcuts", async ({ page }) => {
     await gotoAppShell(page);
     await page.getByRole("button", { name: "Open menu", exact: true }).click();
@@ -122,3 +177,29 @@ test.describe("compact sidebar help", () => {
     await expectDiagnosticReport(page);
   });
 });
+
+async function openCompactSidebar(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Open menu", exact: true }).click();
+  await expect(page.getByTestId("sidebar-footer-bottom-line")).toBeVisible();
+}
+
+const MIN_TARGET_SIZE = 44;
+
+async function expectFingerSizedFooterTargets(page: Page): Promise<void> {
+  const buttons = page.getByTestId("sidebar-footer-bottom-line").getByRole("button");
+  await expect(buttons).toHaveCount(5);
+  for (const button of await buttons.all()) {
+    const bounds = await button.boundingBox();
+    // Layout can report a 44pt box as 43.99999, so compare at a hundredth of a point.
+    expect(bounds?.width).toBeGreaterThanOrEqual(MIN_TARGET_SIZE - 0.01);
+    expect(bounds?.height).toBeGreaterThanOrEqual(MIN_TARGET_SIZE - 0.01);
+    // Glyphs stay at the composer toolbar size (some optically smaller); only the target grows.
+    const glyphWidth = await button.locator("svg").first().getAttribute("width");
+    expect(Number(glyphWidth)).toBeLessThanOrEqual(20);
+  }
+}
+
+async function tapHelpNearTargetEdge(page: Page): Promise<void> {
+  const button = page.getByRole("button", { name: "Help and support", exact: true });
+  await button.tap({ position: { x: 40, y: 40 } });
+}
diff --git a/packages/app/e2e/browser/sidebar-model-b.spec.ts b/packages/app/e2e/browser/sidebar-model-b.spec.ts
index 33e6ff8ddc..336ed97245 100644
--- a/packages/app/e2e/browser/sidebar-model-b.spec.ts
+++ b/packages/app/e2e/browser/sidebar-model-b.spec.ts
@@ -7,7 +7,6 @@ import { getServerId } from "../support/helpers/server-id";
 import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
 import { selectSidebarStatusGrouping } from "../support/helpers/sidebar";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "../support/helpers/workspace-tabs";
 
 // Model B sidebar shape: every project — git or non-git, single- or
 // multi-workspace — renders as the same expandable parent, the deepest sidebar
@@ -96,8 +95,9 @@ test.describe("Model B sidebar shape", () => {
     try {
       // Open the workspace and materialize both an agent tab and a terminal tab.
       await gotoWorkspace(page, mock.workspaceId);
-      const agentTabs = await getVisibleWorkspaceAgentTabIds(page);
-      expect(agentTabs).toContain(`workspace-tab-agent_${mock.agentId}`);
+      await expect(
+        page.getByTestId(`workspace-tab-agent_${mock.agentId}`).filter({ visible: true }),
+      ).toBeVisible();
 
       await clickNewTerminal(page);
       await expect(
diff --git a/packages/app/e2e/browser/sidebar-nav-settings.spec.ts b/packages/app/e2e/browser/sidebar-nav-settings.spec.ts
index e327bbd0ca..a17480b740 100644
--- a/packages/app/e2e/browser/sidebar-nav-settings.spec.ts
+++ b/packages/app/e2e/browser/sidebar-nav-settings.spec.ts
@@ -1,18 +1,83 @@
 import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
+import { openAddProjectFlow, addProjectFlow } from "../support/helpers/add-project-flow";
+import { installUsageReportsFixture } from "../support/helpers/usage-reports";
 import {
+  claudeAndCodexReports,
+  expectPinnedUsage,
+  openCompactSidebar,
+} from "../support/helpers/usage-sidebar-item";
+import { gotoAppShell } from "../support/helpers/app";
+import { SHOWCASE_PLUGIN_ID, installSidebarPlugins } from "../support/helpers/plugin-sidebar-items";
+import {
+  expectFooterIconRow,
+  expectFooterSeparator,
+  hoverFooterAddProject,
+  footerScreenshot,
+  expectFooterItemHidden,
+  expectFooterOrder,
+  expectFooterSettingsKeys,
   expectSidebarItemHidden,
   expectSidebarNavSettingsOrder,
   expectSidebarNavSettingsRow,
   expectSidebarOrder,
   expectStoredSidebarNav,
   leaveSettings,
+  moveFooterItemUp,
   moveSidebarNavItemUp,
   openSidebarNavSettings,
+  seedSidebarFooterPreferences,
   seedSidebarNavPreferences,
+  setFooterItemVisible,
   setSidebarNavItemVisible,
 } from "../support/helpers/sidebar-nav-settings";
 
+test("fixed footer line keeps its five icons, Help and Settings at the end", async ({ page }) => {
+  test.setTimeout(120_000);
+  await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+  await seedSidebarFooterPreferences(page, [
+    { key: "add-project", visible: false },
+    { key: "usage", visible: true },
+  ]);
+  await page.setViewportSize({ width: 1440, height: 900 });
+  await gotoAppShell(page);
+  await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+  await expectFooterIconRow(page);
+  await expectFooterSeparator(page, true);
+  await footerScreenshot(page, "footer-desktop-with-rows");
+  await hoverFooterAddProject(page);
+  await footerScreenshot(page, "footer-desktop-add-project-tooltip");
+  await openAddProjectFlow(page);
+  await page.keyboard.press("Escape");
+  await expect(addProjectFlow(page)).toBeHidden();
+  await openSidebarNavSettings(page);
+  await expectFooterSettingsKeys(page, ["usage"]);
+  await setFooterItemVisible(page, "usage", false);
+  await leaveSettings(page);
+  await expectFooterSeparator(page, false);
+  await expectFooterIconRow(page);
+  await footerScreenshot(page, "footer-desktop-without-rows");
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openCompactSidebar(page);
+  await expectFooterSeparator(page, false);
+  await expectFooterIconRow(page);
+  await footerScreenshot(page, "footer-compact-without-rows");
+  await page.locator('[data-testid="sidebar-add-project"]:visible').hover();
+  await expect(page.getByTestId("sidebar-add-project-tooltip")).toHaveCount(0);
+  await footerScreenshot(page, "footer-compact-add-project-hover");
+  await openAddProjectFlow(page);
+  await page.keyboard.press("Escape");
+  await expect(addProjectFlow(page)).toBeHidden();
+  await page.setViewportSize({ width: 1440, height: 900 });
+  await openSidebarNavSettings(page);
+  await setFooterItemVisible(page, "usage", true);
+  await leaveSettings(page);
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openCompactSidebar(page);
+  await expectFooterSeparator(page, true);
+  await expectFooterIconRow(page);
+  await footerScreenshot(page, "footer-compact-with-rows");
+});
+
 test.describe("Sidebar items in Appearance settings", () => {
   test("owner reorders and hides top-level sidebar items", async ({ page }) => {
     await gotoAppShell(page);
@@ -24,8 +89,8 @@ test.describe("Sidebar items in Appearance settings", () => {
     await test.step("the Sidebar section lists every item in the same order", async () => {
       await openSidebarNavSettings(page);
       // The section explains itself through the header's info tooltip, not a paragraph.
-      await expect(page.getByTestId("sidebar-nav-section-info")).toHaveAccessibleName(
-        "About Sidebar",
+      await expect(page.getByTestId("sidebar-nav-section-header-info")).toHaveAccessibleName(
+        "About Header",
       );
       await expectSidebarNavSettingsOrder(page, [
         "new-workspace",
@@ -106,3 +171,69 @@ test.describe("Sidebar items in Appearance settings", () => {
     await expectSidebarItemHidden(page, "schedules");
   });
 });
+
+test.describe("Sidebar footer rows in Appearance settings", () => {
+  const syncKey = `plugin:${SHOWCASE_PLUGIN_ID}:sync`;
+  const brokenKey = `plugin:${SHOWCASE_PLUGIN_ID}:broken`;
+  let cleanup: () => Promise<void>;
+
+  test.beforeEach(async () => {
+    ({ cleanup } = await installSidebarPlugins());
+  });
+
+  test.afterEach(async () => {
+    await cleanup();
+  });
+
+  test("owner reorders and hides footer rows; the icon row stays fixed", async ({ page }) => {
+    test.setTimeout(120_000);
+    // The Usage item shows only with summary data.
+    await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+    // Keys for the fixed footer icon buttons are ignored.
+    await seedSidebarFooterPreferences(page, [
+      { key: "usage", visible: true },
+      { key: "help", visible: false },
+      { key: "hosts", visible: false },
+      { key: "import", visible: false },
+    ]);
+    await gotoAppShell(page);
+
+    await test.step("the Footer card lists only the footer rows", async () => {
+      await openSidebarNavSettings(page);
+      await expect(page.getByTestId("sidebar-nav-section-footer-info")).toHaveAccessibleName(
+        "About Footer",
+      );
+      await expectFooterSettingsKeys(page, ["usage", syncKey, brokenKey]);
+      await leaveSettings(page);
+      await expectFooterOrder(page, ["usage", syncKey]);
+      await expectFooterIconRow(page);
+      await expectFooterSeparator(page, true);
+    });
+
+    await test.step("moving Sync up and hiding the Usage item changes the rows", async () => {
+      await openSidebarNavSettings(page);
+      await moveFooterItemUp(page, syncKey);
+      await setFooterItemVisible(page, "usage", false);
+      await expectFooterSettingsKeys(page, [syncKey, "usage", brokenKey]);
+      await leaveSettings(page);
+      await expectFooterItemHidden(page, "usage");
+      await expect(
+        page.locator(`[data-testid="plugin-sidebar-footer-${SHOWCASE_PLUGIN_ID}-sync"]:visible`),
+      ).toBeVisible();
+      await expectFooterIconRow(page);
+      await expectFooterSeparator(page, true);
+    });
+
+    await test.step("the rows keep that shape across a reload", async () => {
+      await page.reload();
+      await expect(
+        page.locator(`[data-testid="plugin-sidebar-footer-${SHOWCASE_PLUGIN_ID}-sync"]:visible`),
+      ).toBeVisible({ timeout: 30_000 });
+      await expectFooterItemHidden(page, "usage");
+      await expectFooterIconRow(page);
+      await expectFooterSeparator(page, true);
+      await openSidebarNavSettings(page);
+      await expectFooterSettingsKeys(page, [syncKey, "usage", brokenKey]);
+    });
+  });
+});
diff --git a/packages/app/e2e/browser/sidebar-project-name-whitespace.spec.ts b/packages/app/e2e/browser/sidebar-project-name-whitespace.spec.ts
new file mode 100644
index 0000000000..3197cd060a
--- /dev/null
+++ b/packages/app/e2e/browser/sidebar-project-name-whitespace.spec.ts
@@ -0,0 +1,77 @@
+import { randomUUID } from "node:crypto";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { Page } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { connectSeedClient } from "../support/helpers/seed-client";
+
+interface SeededProject {
+  projectKey: string;
+  cleanup(): Promise<void>;
+}
+
+/**
+ * Adds a project whose directory name ends in a space, which `seedWorkspace`
+ * cannot produce because `mkdtemp` appends the random suffix. The project is
+ * owned until `cleanup`, which removes the daemon record before the directory.
+ */
+async function seedProjectNamedWithTrailingSpace(): Promise<SeededProject> {
+  const parentDirectory = await mkdtemp(path.join(tmpdir(), "paseo-e2e-trailing-space-"));
+  const directoryPath = path.join(parentDirectory, `Reklamation-${randomUUID().slice(0, 8)} `);
+  await mkdir(directoryPath);
+  await writeFile(path.join(directoryPath, "README.md"), "# Trailing space\n");
+
+  const client = await connectSeedClient();
+  const removeParentDirectory = () => rm(parentDirectory, { recursive: true, force: true });
+  try {
+    const added = await client.addProject(directoryPath);
+    expect(added.error).toBeNull();
+    expect(added.project?.projectRootPath).toBe(directoryPath);
+    const project = added.project;
+    if (!project?.projectKey) {
+      throw new Error(`The daemon added ${directoryPath} without a project key`);
+    }
+    return {
+      projectKey: project.projectKey,
+      cleanup: async () => {
+        await client.removeProject(project.projectId).catch(() => undefined);
+        await client.close().catch(() => undefined);
+        await removeParentDirectory().catch(() => undefined);
+      },
+    };
+  } catch (error) {
+    await client.close().catch(() => undefined);
+    await removeParentDirectory().catch(() => undefined);
+    throw error;
+  }
+}
+
+async function expectProjectRow(page: Page, projectKey: string): Promise<void> {
+  const row = page.getByTestId(`sidebar-project-row-${projectEquivalenceViewKey(projectKey)}`);
+  await expect(row).toBeVisible({ timeout: 60_000 });
+}
+
+async function expectAppShellRendered(page: Page): Promise<void> {
+  await expect(page.getByText("Paseo ran into a problem.")).toHaveCount(0);
+}
+
+// A project view key carries the project's path, so a directory whose name ends
+// in a space produces a key that ends in a space. The sidebar order store used
+// to trim it on write, which left the reconcile effect writing a new order on
+// every render until React tore the app down with "Maximum update depth
+// exceeded" on every load (#4880).
+test("a project whose folder name ends in a space renders in the sidebar", async ({ page }) => {
+  const project = await seedProjectNamedWithTrailingSpace();
+
+  try {
+    await gotoAppShell(page);
+
+    await expectProjectRow(page, project.projectKey);
+    await expectAppShellRendered(page);
+  } finally {
+    await project.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/sidebar-title-width.spec.ts b/packages/app/e2e/browser/sidebar-title-width.spec.ts
new file mode 100644
index 0000000000..77b5a99eb5
--- /dev/null
+++ b/packages/app/e2e/browser/sidebar-title-width.spec.ts
@@ -0,0 +1,155 @@
+import { rm, writeFile } from "node:fs/promises";
+import path from "node:path";
+import type { Locator, Page, TestInfo } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import {
+  closeSidebarDisplayPreferences,
+  openMobileAgentSidebar,
+  openSidebarDisplayPage,
+  selectSidebarStatusGrouping,
+} from "../support/helpers/sidebar";
+
+const TITLE = "Linux desktop sandbox launch support";
+
+async function seedChangedWorkspace() {
+  const workspace = await seedWorkspace({
+    repoPrefix: "sidebar-title-",
+    title: TITLE,
+    repo: { withRemote: true },
+  });
+  try {
+    await rm(path.join(workspace.repoPath, "remote.git"), { recursive: true });
+    await workspace.client.renameProject(workspace.projectId, "Paseo");
+    await writeFile(path.join(workspace.repoPath, "README.md"), "Changed line\n".repeat(12345));
+    await workspace.client.checkoutRefresh(workspace.repoPath);
+    await expect
+      .poll(async () => {
+        const { entries } = await workspace.client.fetchWorkspaces();
+        return entries.find((entry) => entry.id === workspace.workspaceId)?.diffStat?.additions;
+      })
+      .toBe(12345);
+    return workspace;
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
+}
+
+function workspaceRow(page: Page) {
+  return page.getByRole("button", { name: new RegExp(TITLE) }).filter({ visible: true });
+}
+
+async function titleWidth(row: Locator) {
+  return row
+    .getByText(TITLE, { exact: true })
+    .evaluate((element) => element.getBoundingClientRect().width);
+}
+
+async function toggleTrailing(page: Page, label: "Diff stats" | "Last activity", touch = false) {
+  await openSidebarDisplayPage(page, "sidebar-display-show");
+  await page.getByRole("menuitem", { name: label, exact: true }).click();
+  if (touch) {
+    await page
+      .getByRole("button", { name: "Bottom sheet backdrop", exact: true })
+      .click({ position: { x: 5, y: 5 } });
+    await expect(
+      page.getByRole("button", { name: "Bottom sheet backdrop", exact: true }),
+    ).toHaveCount(0);
+  } else {
+    await closeSidebarDisplayPreferences(page);
+  }
+  await page.mouse.move(0, 0);
+}
+
+async function expectTouchTitleWidth(page: Page) {
+  const row = workspaceRow(page);
+  const withDiff = await titleWidth(row);
+  await toggleTrailing(page, "Diff stats", true);
+  const withoutStats = await titleWidth(row);
+  expect(withDiff).toBeCloseTo(withoutStats, 0);
+  await toggleTrailing(page, "Last activity", true);
+  expect(await titleWidth(row)).toBeCloseTo(withoutStats, 0);
+  await toggleTrailing(page, "Diff stats", true);
+}
+
+let workspace: SeededWorkspace;
+test.beforeEach(async () => {
+  workspace = await seedChangedWorkspace();
+});
+test.afterEach(async () => {
+  await workspace?.cleanup();
+});
+
+async function openTouchWorkspaceList(page: Page, testInfo: TestInfo) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.emulateMedia({ colorScheme: "dark" });
+  await gotoAppShell(page);
+  await openMobileAgentSidebar(page);
+  await expect(workspaceRow(page)).toBeVisible();
+  await toggleTrailing(page, "Diff stats", true);
+  await page.mouse.move(0, 0);
+  await page.screenshot({ path: testInfo.outputPath("sidebar.png") });
+}
+
+async function pinWorkspaceForLayout(page: Page) {
+  await workspace.client.setWorkspacePinned(workspace.workspaceId, true);
+  await expect(page.getByTestId("sidebar-pinned-section")).toBeVisible();
+}
+
+async function moveWorkspaceToStatusGrouping(page: Page) {
+  await workspace.client.setWorkspacePinned(workspace.workspaceId, false);
+  await selectSidebarStatusGrouping(page);
+}
+
+async function openDesktopWorkspaceList(page: Page) {
+  await gotoAppShell(page);
+  const row = workspaceRow(page);
+  await expect(row).toBeVisible();
+  await toggleTrailing(page, "Diff stats");
+  await page.mouse.move(0, 0);
+  await expect(row.getByText("+12.3k", { exact: true })).toBeVisible();
+  return titleWidth(row);
+}
+
+async function expectHoverKeepsTitleWidth(page: Page, width: number, testInfo: TestInfo) {
+  const row = workspaceRow(page);
+  await row.hover();
+  await expect(row.getByLabel("Workspace actions", { exact: true })).toBeVisible();
+  expect(await titleWidth(row)).toBeCloseTo(width, 0);
+  await page.screenshot({ path: testInfo.outputPath("desktop-hover.png") });
+}
+
+async function expectShortcutHintsKeepTitleWidth(page: Page, width: number, testInfo: TestInfo) {
+  const row = workspaceRow(page);
+  await page.keyboard.down("Alt");
+  await expect(row.getByText("1", { exact: true })).toBeVisible();
+  expect(await titleWidth(row)).toBeCloseTo(width, 0);
+  await page.screenshot({ path: testInfo.outputPath("desktop-shortcuts.png") });
+  await page.keyboard.up("Alt");
+  await expect(row.getByText("1", { exact: true })).toHaveCount(0);
+}
+
+async function expectDisablingStatsExpandsTitle(page: Page, width: number) {
+  await toggleTrailing(page, "Diff stats");
+  expect(await titleWidth(workspaceRow(page))).toBeGreaterThan(width);
+}
+
+test("touch titles use the space occupied by hidden stats in every grouping", async ({
+  page,
+}, testInfo) => {
+  await openTouchWorkspaceList(page, testInfo);
+  await expectTouchTitleWidth(page);
+  await pinWorkspaceForLayout(page);
+  await expectTouchTitleWidth(page);
+  await moveWorkspaceToStatusGrouping(page);
+  await expectTouchTitleWidth(page);
+});
+
+test("desktop hover and shortcut hints preserve title width", async ({ page }, testInfo) => {
+  const width = await openDesktopWorkspaceList(page);
+  await expectHoverKeepsTitleWidth(page, width, testInfo);
+  await expectShortcutHintsKeepTitleWidth(page, width, testInfo);
+  await expectDisablingStatsExpandsTitle(page, width);
+});
diff --git a/packages/app/e2e/browser/sidebar-workspace-mark-unread.spec.ts b/packages/app/e2e/browser/sidebar-workspace-mark-unread.spec.ts
new file mode 100644
index 0000000000..bc3d4bbf95
--- /dev/null
+++ b/packages/app/e2e/browser/sidebar-workspace-mark-unread.spec.ts
@@ -0,0 +1,229 @@
+import type { Page } from "@playwright/test";
+import { test as base, expect } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  openAgentRoute,
+  seedMockAgentWorkspace,
+  type MockAgentWorkspace,
+} from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+import { closeMobileAgentSidebar, openMobileAgentSidebar } from "../support/helpers/sidebar";
+
+interface FinishedWorkspaces {
+  subject: MockAgentWorkspace;
+  other: MockAgentWorkspace;
+}
+
+const test = base.extend<{ workspaces: FinishedWorkspaces }>({
+  workspaces: async ({ browserName: _browserName }, provide) => {
+    const seeded: MockAgentWorkspace[] = [];
+    async function finishedWorkspace(title: string) {
+      const workspace = await seedMockAgentWorkspace({
+        repoPrefix: "workspace-mark-unread-",
+        title,
+        initialPrompt: "Finish this turn.",
+      });
+      seeded.push(workspace);
+      await workspace.client.waitForFinish(workspace.agentId, 20_000);
+      await workspace.client.clearWorkspaceAttention(workspace.workspaceId);
+      return workspace;
+    }
+    try {
+      await provide({
+        subject: await finishedWorkspace("Unread subject"),
+        other: await finishedWorkspace("Other workspace"),
+      });
+    } finally {
+      for (const workspace of seeded) await workspace.cleanup();
+    }
+  },
+});
+
+function workspaceRow(page: Page, workspaceId: string) {
+  return page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`);
+}
+
+async function openWorkspace(page: Page, workspaceId: string) {
+  await workspaceRow(page, workspaceId).click();
+  await expect(page).toHaveURL(new RegExp(`/workspace/${workspaceId}`));
+}
+
+async function chooseReadAction(page: Page, workspaceId: string, action: "read" | "unread") {
+  await workspaceRow(page, workspaceId).hover();
+  await page.getByTestId(`sidebar-workspace-kebab-${getServerId()}:${workspaceId}`).click();
+  const item = page.getByRole("menuitem", { name: `Mark as ${action}`, exact: true });
+  await expect(item).toBeVisible();
+  await item.click();
+}
+
+async function markAsUnread(page: Page, workspaceId: string) {
+  await chooseReadAction(page, workspaceId, "unread");
+  await expectStatus(page, workspaceId, "attention");
+}
+
+async function markAsRead(page: Page, workspaceId: string) {
+  await chooseReadAction(page, workspaceId, "read");
+  await expectStatus(page, workspaceId, "done");
+}
+
+async function expectStatus(page: Page, workspaceId: string, status: "done" | "attention") {
+  await expect(
+    workspaceRow(page, workspaceId).getByTestId(`workspace-status-indicator-${status}`),
+  ).toBeVisible();
+}
+
+async function markBackgroundWorkspaceAndReopen(page: Page, workspaceId: string) {
+  await test.step("background workspace gains green dot and clears when clicked", async () => {
+    await markAsUnread(page, workspaceId);
+    await openWorkspace(page, workspaceId);
+    await expectStatus(page, workspaceId, "done");
+  });
+}
+
+async function leaveMarkedWorkspaceAndRead(page: Page, { subject, other }: FinishedWorkspaces) {
+  await test.step("leaving preserves manual unread until Mark as read", async () => {
+    await markAsUnread(page, subject.workspaceId);
+    await openWorkspace(page, other.workspaceId);
+    await markAsRead(page, subject.workspaceId);
+    await openWorkspace(page, subject.workspaceId);
+  });
+}
+
+async function leaveMarkedWorkspaceAndReopen(page: Page, { subject, other }: FinishedWorkspaces) {
+  await test.step("leaving preserves manual unread until reopening", async () => {
+    await markAsUnread(page, subject.workspaceId);
+    await openWorkspace(page, other.workspaceId);
+    await expectStatus(page, subject.workspaceId, "attention");
+    await openWorkspace(page, subject.workspaceId);
+    await expectStatus(page, subject.workspaceId, "done");
+  });
+}
+
+async function completeTurnAndLeave(page: Page, { subject, other }: FinishedWorkspaces) {
+  await test.step("ordinary completion still clears on departure", async () => {
+    await subject.client.sendAgentMessage(subject.agentId, "Finish another turn.");
+    await subject.client.waitForFinish(subject.agentId, 20_000);
+    await expectStatus(page, subject.workspaceId, "attention");
+    await openWorkspace(page, other.workspaceId);
+    await expectStatus(page, subject.workspaceId, "done");
+  });
+}
+
+async function openWorkspaceOnCompact(page: Page, workspaceId: string) {
+  await openWorkspace(page, workspaceId);
+  await openMobileAgentSidebar(page);
+}
+
+async function leaveMarkedWorkspaceAndReadOnCompact(
+  page: Page,
+  { subject, other }: FinishedWorkspaces,
+) {
+  await test.step("leaving preserves manual unread until Mark as read", async () => {
+    await markAsUnread(page, subject.workspaceId);
+    await openWorkspaceOnCompact(page, other.workspaceId);
+    await markAsRead(page, subject.workspaceId);
+    await openWorkspaceOnCompact(page, subject.workspaceId);
+  });
+}
+
+async function leaveMarkedWorkspaceAndReopenOnCompact(
+  page: Page,
+  { subject, other }: FinishedWorkspaces,
+) {
+  await test.step("leaving preserves manual unread until reopening", async () => {
+    await markAsUnread(page, subject.workspaceId);
+    await openWorkspaceOnCompact(page, other.workspaceId);
+    await expectStatus(page, subject.workspaceId, "attention");
+    await openWorkspaceOnCompact(page, subject.workspaceId);
+    await expectStatus(page, subject.workspaceId, "done");
+  });
+}
+
+async function completeTurnAndLeaveOnCompact(page: Page, { subject, other }: FinishedWorkspaces) {
+  await test.step("ordinary completion still clears on departure", async () => {
+    await closeMobileAgentSidebar(page);
+    await subject.client.sendAgentMessage(subject.agentId, "Finish another turn.");
+    await subject.client.waitForFinish(subject.agentId, 20_000);
+    await openMobileAgentSidebar(page);
+    await expectStatus(page, subject.workspaceId, "attention");
+    await openWorkspaceOnCompact(page, other.workspaceId);
+    await expectStatus(page, subject.workspaceId, "done");
+  });
+}
+
+async function markBackgroundWorkspaceAndRead(page: Page, workspaceId: string) {
+  await test.step("explicit Mark as read clears a background workspace", async () => {
+    await markAsUnread(page, workspaceId);
+    await markAsRead(page, workspaceId);
+  });
+}
+
+async function expectSelectedAgent(page: Page, agentId: string) {
+  await expect(page.getByTestId(`workspace-tab-agent_${agentId}`).first()).toHaveAttribute(
+    "aria-selected",
+    "true",
+  );
+}
+
+async function addFinishedAgent(workspace: MockAgentWorkspace) {
+  return workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.cwd,
+    workspaceId: workspace.workspaceId,
+    title: "Newest agent",
+    modeId: "load-test",
+    model: "e2e-fast-stream",
+  });
+}
+
+async function openCompactWorkspace(page: Page, workspace: MockAgentWorkspace) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openAgentRoute(page, workspace);
+  await openMobileAgentSidebar(page);
+}
+
+async function markUnreadThenResumeChat(page: Page, workspaceId: string) {
+  await test.step("interacting with the visible chat clears manual unread", async () => {
+    await markAsUnread(page, workspaceId);
+    await closeMobileAgentSidebar(page);
+    await page.getByRole("textbox", { name: "Message agent..." }).click();
+    await openMobileAgentSidebar(page);
+    await expectStatus(page, workspaceId, "done");
+  });
+}
+
+test("manual unread survives departure and clears on reopening without changing normal completions", async ({
+  page,
+  workspaces,
+}) => {
+  await gotoAppShell(page);
+  await openWorkspace(page, workspaces.other.workspaceId);
+  await markBackgroundWorkspaceAndReopen(page, workspaces.subject.workspaceId);
+  await leaveMarkedWorkspaceAndRead(page, workspaces);
+  await leaveMarkedWorkspaceAndReopen(page, workspaces);
+  await completeTurnAndLeave(page, workspaces);
+  await markBackgroundWorkspaceAndRead(page, workspaces.subject.workspaceId);
+});
+
+test("clicking a multi-agent workspace reveals and clears its marked agent", async ({
+  page,
+  workspaces,
+}) => {
+  await openAgentRoute(page, workspaces.subject);
+  await expectSelectedAgent(page, workspaces.subject.agentId);
+  await openWorkspace(page, workspaces.other.workspaceId);
+  const newest = await addFinishedAgent(workspaces.subject);
+  await markBackgroundWorkspaceAndReopen(page, workspaces.subject.workspaceId);
+  await expectSelectedAgent(page, newest.id);
+});
+
+test("manual unread survives leaving the current workspace on compact layout", async ({
+  page,
+  workspaces,
+}) => {
+  await openCompactWorkspace(page, workspaces.subject);
+  await leaveMarkedWorkspaceAndReadOnCompact(page, workspaces);
+  await leaveMarkedWorkspaceAndReopenOnCompact(page, workspaces);
+  await markUnreadThenResumeChat(page, workspaces.subject.workspaceId);
+  await completeTurnAndLeaveOnCompact(page, workspaces);
+});
diff --git a/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts b/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
index 21ad51a6bb..6ed14d159a 100644
--- a/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
@@ -1,6 +1,7 @@
 import { test, expect, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute } from "../support/helpers/mock-agent";
 import { getServerId } from "../support/helpers/server-id";
 
 function workspaceRowTestId(workspaceId: string): string {
@@ -73,3 +74,75 @@ test.describe("Sidebar workspace rename", () => {
     }
   });
 });
+
+async function toggleBackgroundWorkspaces(page: Page): Promise<void> {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await page.getByRole("menuitem", { name: "Show background", exact: true }).click();
+  await page.keyboard.press("Escape");
+}
+
+async function expectWorkspaceInSidebar(page: Page, workspaceId: string): Promise<void> {
+  // Rows have no single accessible role: their nested title and actions share this container.
+  await expect(page.getByTestId(workspaceRowTestId(workspaceId))).toBeVisible({ timeout: 30_000 });
+}
+
+async function expectWorkspaceHidden(page: Page, workspaceId: string): Promise<void> {
+  await expect(page.getByTestId(workspaceRowTestId(workspaceId))).toHaveCount(0);
+}
+
+async function reconnectApp(page: Page): Promise<void> {
+  await page.reload();
+  await expect(page.getByLabel("Display preferences", { exact: true })).toBeVisible();
+}
+
+async function expectWorkerOpen(page: Page): Promise<void> {
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeEditable({
+    timeout: 30_000,
+  });
+  await expect(page.getByText("Background reviewer", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Background review prompt", { exact: true }).first()).toBeVisible();
+}
+
+test("background workspace stays directly accessible across sidebar toggles and reconnect", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({
+    repoPrefix: "sidebar-background-",
+    title: "Background review",
+    background: true,
+  });
+  try {
+    const worker = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Background reviewer",
+      initialPrompt: "Background review prompt",
+      model: "e2e-fast-stream",
+      modeId: "load-test",
+    });
+    await test.step("Default sidebar hides background work", async () => {
+      await gotoAppShell(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+    });
+    await test.step("Show background exposes the fully replicated workspace", async () => {
+      await toggleBackgroundWorkspaces(page);
+      await expectWorkspaceInSidebar(page, workspace.workspaceId);
+      await reconnectApp(page);
+      await expectWorkspaceInSidebar(page, workspace.workspaceId);
+    });
+    await test.step("Direct agent navigation survives hiding and reconnect", async () => {
+      await toggleBackgroundWorkspaces(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: worker.id });
+      await expectWorkerOpen(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await reconnectApp(page);
+      await expectWorkerOpen(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await page.screenshot({ path: testInfo.outputPath("background-direct-open.png") });
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/sidebar-workspace.spec.ts b/packages/app/e2e/browser/sidebar-workspace.spec.ts
index 14421f84ca..8071b3b4f3 100644
--- a/packages/app/e2e/browser/sidebar-workspace.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace.spec.ts
@@ -1,19 +1,27 @@
 import path from "node:path";
+import type { Page, TestInfo } from "@playwright/test";
 import { test, expect } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import {
   closeMobileAgentSidebar,
   expectMobileAgentSidebarHidden,
   expectMobileAgentSidebarVisible,
+  expectWorkspaceHoverCardClosed,
+  expectWorkspaceHoverCardOpen,
+  expectWorkspaceHoverCardStaysOpen,
+  focusWorkspaceRowWithKeyboard,
+  movePointerAwayFromWorkspaceHoverCard,
   openMobileAgentSidebar,
   pinWorkspaceFromSidebar,
 } from "../support/helpers/sidebar";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { expectWorkspaceHeader } from "../support/helpers/workspace-ui";
 import { getServerId } from "../support/helpers/server-id";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
 import { escapeRegex } from "../support/helpers/regex";
 import { openFilesPanel } from "../support/helpers/workspace-tabs";
+import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
 const GITHUB_REMOTE_URL = "https://github.com/test-owner/test-repo.git";
 
@@ -48,6 +56,20 @@ async function waitForSidebarWorkspace(page: import("@playwright/test").Page, wo
   return row;
 }
 
+async function openWorkspaceReadAction(
+  page: import("@playwright/test").Page,
+  workspaceId: string,
+  action: "read" | "unread",
+) {
+  const workspaceKey = `${getServerId()}:${workspaceId}`;
+  const row = await waitForSidebarWorkspace(page, workspaceId);
+  await row.hover();
+  await page.getByTestId(`sidebar-workspace-kebab-${workspaceKey}`).click();
+  const item = page.getByTestId(`sidebar-workspace-menu-mark-as-${action}-${workspaceKey}`);
+  await expect(item).toBeVisible({ timeout: 30_000 });
+  return item;
+}
+
 async function openWorkspaceHoverCard(page: import("@playwright/test").Page, workspaceId: string) {
   const row = await waitForSidebarWorkspace(page, workspaceId);
   await row.hover();
@@ -93,7 +115,207 @@ async function withPaseoOwnedWorktree(
   }
 }
 
+async function readCachedRowIds(
+  page: Page,
+  rowKind: "workspace" | "checkpoint",
+): Promise<string[]> {
+  return page.evaluate(
+    async ({ serverId, kind }) => {
+      const database = await new Promise<IDBDatabase>((resolve, reject) => {
+        const request = indexedDB.open("paseo-replica-row-store");
+        request.addEventListener("success", () => resolve(request.result));
+        request.addEventListener("error", () => reject(request.error));
+      });
+      try {
+        return await new Promise<string[]>((resolve, reject) => {
+          const transaction = database.transaction("rows", "readonly");
+          const request = transaction.objectStore("rows").getAll();
+          request.onsuccess = () =>
+            resolve(
+              request.result
+                .filter(
+                  (row: { serverId: string; kind: string }) =>
+                    row.serverId === serverId && row.kind === kind,
+                )
+                .map((row: { id: string }) => row.id)
+                .sort(),
+            );
+          request.addEventListener("error", () => reject(request.error));
+        });
+      } finally {
+        database.close();
+      }
+    },
+    { serverId: getServerId(), kind: rowKind },
+  );
+}
+
+async function simulateDamagedLegacyDirectoryCache(
+  page: Page,
+  workspaceIdToRemove: string,
+): Promise<void> {
+  // Stop the app before altering storage so no pending app write can repair the fixture.
+  const fixtureUrl = new URL("/__directory_cache_fixture", page.url()).href;
+  await page.route(fixtureUrl, (route) =>
+    route.fulfill({ contentType: "text/html", body: "<html><body>Cache fixture</body></html>" }),
+  );
+  await page.goto(fixtureUrl);
+  await page.evaluate(
+    async ({ serverId, missingWorkspaceId }) => {
+      const database = await new Promise<IDBDatabase>((resolve, reject) => {
+        const request = indexedDB.open("paseo-replica-row-store");
+        request.addEventListener("success", () => resolve(request.result));
+        request.addEventListener("error", () => reject(request.error));
+      });
+      try {
+        await new Promise<void>((resolve, reject) => {
+          const transaction = database.transaction("rows", "readwrite");
+          const store = transaction.objectStore("rows");
+          const request = store.getAll();
+          request.onsuccess = () => {
+            const rows = request.result as Array<{
+              serverId: string;
+              kind: string;
+              id: string;
+              payload: string;
+            }>;
+            const checkpoint = rows.find(
+              (row) => row.serverId === serverId && row.kind === "checkpoint",
+            );
+            if (!checkpoint) {
+              transaction.abort();
+              return;
+            }
+            const stored = JSON.parse(checkpoint.payload);
+            // Accept either writer so this fixture also reproduces on the unfixed client.
+            const cursors = stored.version === 1 ? stored.cursors : stored;
+            if (!cursors.workspaces?.generation) {
+              transaction.abort();
+              return;
+            }
+            store.put({ ...checkpoint, payload: JSON.stringify(cursors) });
+            for (const row of rows) {
+              if (
+                row.serverId === serverId &&
+                row.kind === "workspace" &&
+                row.id === missingWorkspaceId
+              )
+                store.delete([serverId, row.kind, row.id]);
+            }
+          };
+          transaction.addEventListener("complete", () => resolve());
+          transaction.addEventListener("abort", () =>
+            reject(transaction.error ?? new Error("Missing current directory checkpoint")),
+          );
+          transaction.addEventListener("error", () => reject(transaction.error));
+        });
+      } finally {
+        database.close();
+      }
+    },
+    { serverId: getServerId(), missingWorkspaceId: workspaceIdToRemove },
+  );
+  expect(await readCachedRowIds(page, "workspace")).not.toContain(workspaceIdToRemove);
+}
+
+async function holdHostResponsesUntilCacheIsVisible(page: Page): Promise<() => void> {
+  let release!: () => void;
+  const ready = new Promise<void>((resolve) => {
+    release = resolve;
+  });
+  await page.routeWebSocket(new RegExp(`:${getE2EDaemonPort()}(?:/|$)`), (socket) => {
+    const server = socket.connectToServer();
+    server.onMessage(async (message) => {
+      await ready;
+      socket.send(message);
+    });
+  });
+  return release;
+}
+
+async function createPinnedSiblingWorkspace(
+  project: Awaited<ReturnType<typeof seedWorkspace>>,
+): Promise<string> {
+  const sibling = await project.client.createWorkspace({
+    source: { kind: "directory", path: project.repoPath, projectId: project.projectId },
+    title: "Pinned sibling",
+  });
+  if (!sibling.workspace) throw new Error(sibling.error ?? "Sibling workspace was not created");
+  await project.client.setWorkspacePinned(sibling.workspace.id, true);
+  return sibling.workspace.id;
+}
+
+async function expectSidebarWorkspaces(page: Page, workspaceIds: string[]): Promise<void> {
+  for (const workspaceId of workspaceIds) {
+    await waitForSidebarWorkspace(page, workspaceId);
+  }
+}
+
+async function cacheWorkspaces(page: Page, workspaceIds: string[]): Promise<void> {
+  await gotoAppShell(page);
+  await expectSidebarWorkspaces(page, workspaceIds);
+  await expect.poll(() => readCachedRowIds(page, "workspace")).toEqual(workspaceIds);
+}
+
+async function reopenDamagedCacheBeforeHostResponds(
+  page: Page,
+  missingWorkspaceId: string,
+): Promise<() => void> {
+  await simulateDamagedLegacyDirectoryCache(page, missingWorkspaceId);
+  const releaseHost = await holdHostResponsesUntilCacheIsVisible(page);
+  await gotoAppShell(page);
+  return releaseHost;
+}
+
+async function expectDamagedCacheHydrated(
+  page: Page,
+  retainedWorkspaceId: string,
+  missingWorkspaceId: string,
+): Promise<void> {
+  await waitForSidebarWorkspace(page, retainedWorkspaceId);
+  await expect(page.getByTestId(getWorkspaceRowTestId(missingWorkspaceId))).toHaveCount(0);
+  await expect.poll(() => readCachedRowIds(page, "checkpoint")).toEqual([]);
+}
+
+async function expectRecoveredWorkspacesAfterReload(
+  page: Page,
+  workspaceIds: string[],
+  testInfo: TestInfo,
+): Promise<void> {
+  await expectSidebarWorkspaces(page, workspaceIds);
+  await expect.poll(() => readCachedRowIds(page, "workspace")).toEqual(workspaceIds);
+  await page.reload();
+  await expectSidebarWorkspaces(page, workspaceIds);
+  await page.screenshot({ path: testInfo.outputPath("recovered-workspaces.png") });
+  await testInfo.attach("recovered-workspaces", {
+    path: testInfo.outputPath("recovered-workspaces.png"),
+    contentType: "image/png",
+  });
+}
+
 test.describe("Sidebar workspace list", () => {
+  test("recovers missing workspaces from a damaged legacy cache after reload", async ({
+    page,
+  }, testInfo) => {
+    const project = await seedWorkspace({ repoPrefix: "directory-cache-recovery-" });
+    try {
+      const siblingId = await createPinnedSiblingWorkspace(project);
+      const ids = [project.workspaceId, siblingId].sort();
+      await test.step("cache both workspaces", () => cacheWorkspaces(page, ids));
+
+      const releaseHost = await test.step("reopen damaged cache before host responds", () =>
+        reopenDamagedCacheBeforeHostResponds(page, project.workspaceId));
+      await test.step("keep cached workspace and discard stale checkpoint", () =>
+        expectDamagedCacheHydrated(page, siblingId, project.workspaceId));
+
+      releaseHost();
+      await test.step("recover missing workspace and retain both after reload", () =>
+        expectRecoveredWorkspacesAfterReload(page, ids, testInfo));
+    } finally {
+      await project.cleanup();
+    }
+  });
+
   test("project with GitHub remote shows its selected folder name in sidebar", async ({ page }) => {
     const workspace = await seedWorkspace({
       repoPrefix: "sidebar-remote-",
@@ -187,6 +409,78 @@ test.describe("Sidebar workspace list", () => {
     }
   });
 
+  test("workspace hover card closes when the pointer leaves a clicked row", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "sidebar-hover-click-leave-" });
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarProject(page, path.basename(workspace.repoPath));
+      const row = await openWorkspaceFromSidebar(page, workspace.workspaceId);
+      await movePointerAwayFromWorkspaceHoverCard(page);
+      await expectWorkspaceHoverCardClosed(page);
+
+      await row.click();
+      await expect(row).toBeFocused();
+      await expectWorkspaceHoverCardOpen(page);
+      await movePointerAwayFromWorkspaceHoverCard(page);
+      await expectWorkspaceHoverCardClosed(page);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("workspace hover card follows keyboard focus on a row", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "sidebar-hover-keyboard-" });
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarProject(page, path.basename(workspace.repoPath));
+      await openWorkspaceFromSidebar(page, workspace.workspaceId);
+      await movePointerAwayFromWorkspaceHoverCard(page);
+      await expectWorkspaceHoverCardClosed(page);
+
+      await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
+      await expectWorkspaceHoverCardOpen(page);
+      await movePointerAwayFromWorkspaceHoverCard(page);
+      await expectWorkspaceHoverCardStaysOpen(page);
+      await page.keyboard.press("Escape");
+      await expectWorkspaceHoverCardClosed(page);
+
+      await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
+      await expectWorkspaceHoverCardOpen(page);
+      await page.keyboard.press("Tab");
+      await expectWorkspaceHoverCardClosed(page);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("marks a finished workspace unread until it is opened again", async ({ page }) => {
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "sidebar-mark-unread-",
+      title: "Mark unread",
+      initialPrompt: "Finish this test turn.",
+    });
+
+    try {
+      await workspace.client.waitForFinish(workspace.agentId, 20_000);
+      await workspace.client.clearWorkspaceAttention(workspace.workspaceId);
+      expect(workspace.client.getLastServerInfoMessage()?.features?.workspaceMarkUnread).toBe(true);
+      await gotoAppShell(page);
+
+      const row = await waitForSidebarWorkspace(page, workspace.workspaceId);
+      await expect(row.getByTestId("workspace-status-indicator-done")).toBeVisible();
+      await (await openWorkspaceReadAction(page, workspace.workspaceId, "unread")).click();
+      await openWorkspaceReadAction(page, workspace.workspaceId, "read");
+
+      await page.keyboard.press("Escape");
+      await openWorkspaceFromSidebar(page, workspace.workspaceId);
+      await openWorkspaceReadAction(page, workspace.workspaceId, "unread");
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
   test("Paseo-owned worktree hover card shows the worktree directory name", async ({ page }) => {
     await withPaseoOwnedWorktree(async ({ projectName, workspaceId, worktreeSlug }) => {
       await gotoAppShell(page);
@@ -329,18 +623,21 @@ test.describe("Half-screen desktop layout", () => {
 
       await openFilesPanel(page);
       const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
-      await expect(
-        page.getByTestId("explorer-sidebar-tab-files").filter({ visible: true }),
-      ).toBeVisible();
+      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible();
       await expect(explorerToggle).toHaveAccessibleName("Close Explorer sidebar");
       await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
-      await expect(page.getByTestId("explorer-sidebar-tab-rail")).toBeVisible();
-      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(1);
+      await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
+      await expect(
+        page
+          .locator('[data-testid^="workspace-pane-"]')
+          .getByTestId("workspace-tabs-row")
+          .filter({ visible: true }),
+      ).toHaveCount(1);
 
       await explorerToggle.click();
-      await expect(
-        page.getByTestId("explorer-sidebar-tab-files").filter({ visible: true }),
-      ).toHaveCount(0);
+      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toHaveCount(
+        0,
+      );
       await expect(explorerToggle).toHaveAccessibleName("Open Explorer sidebar");
       await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
     } finally {
diff --git a/packages/app/e2e/browser/startup-wire-metrics.spec.ts b/packages/app/e2e/browser/startup-wire-metrics.spec.ts
deleted file mode 100644
index d624d5e316..0000000000
--- a/packages/app/e2e/browser/startup-wire-metrics.spec.ts
+++ /dev/null
@@ -1,543 +0,0 @@
-import { Buffer } from "node:buffer";
-import type { CDPSession, Page, TestInfo } from "@playwright/test";
-import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-
-type WireDirection = "sent" | "received";
-type WirePhase = "startup" | "workspace_clicks";
-
-interface ParsedWireMessage {
-  type: string | null;
-  requestId: string | null;
-  entryCount: number | null;
-  hasMore: boolean | null;
-  providerEntries: ProviderSnapshotWireEntry[] | null;
-}
-
-type WireFrameRecord = ParsedWireMessage & {
-  phase: WirePhase;
-  direction: WireDirection;
-  bytes: number;
-};
-
-interface ProviderSnapshotWireEntry {
-  provider: string;
-  status: string | null;
-  modelCount: number;
-  modeCount: number;
-  bytes: number;
-}
-
-interface WebSocketFrameEvent {
-  requestId: string;
-  response: {
-    opcode: number;
-    payloadData: string;
-  };
-}
-
-interface WireSummary {
-  totalFrames: number;
-  totalBytes: number;
-  byDirection: Record<WireDirection, { frames: number; bytes: number }>;
-  byPhase: Record<
-    WirePhase,
-    {
-      frames: number;
-      bytes: number;
-      byType: Array<{ type: string; frames: number; bytes: number }>;
-      rpcCounts: Array<{ requestType: string; count: number }>;
-      rpcs: Array<{ requestType: string; requestId: string; responseType: string | null }>;
-    }
-  >;
-  fetchPages: Array<{
-    phase: WirePhase;
-    type: string;
-    requestId: string | null;
-    entries: number | null;
-    hasMore: boolean | null;
-    bytes: number;
-  }>;
-  clickedWorkspaces: Array<{ testId: string; frames: number; bytes: number }>;
-  providerSnapshots: Array<{
-    phase: WirePhase;
-    type: string;
-    requestId: string | null;
-    totalModels: number;
-    totalModes: number;
-    bytes: number;
-    providers: ProviderSnapshotWireEntry[];
-  }>;
-  providerSnapshotTotals: Array<{
-    phase: WirePhase;
-    provider: string;
-    frames: number;
-    bytes: number;
-    maxModels: number;
-    maxModes: number;
-    statuses: string[];
-  }>;
-  fork: {
-    sourceHome: string | null;
-    targetHome: string | null;
-    copiedFiles: number | null;
-    copiedBytes: number | null;
-  };
-}
-
-function extractWorkspaceTestIds(elements: Element[]): string[] {
-  const result: string[] = [];
-  for (const element of elements.slice(0, 3)) {
-    const value = element.getAttribute("data-testid");
-    if (value) {
-      result.push(value);
-    }
-  }
-  return result;
-}
-
-class WireMonitor {
-  private phase: WirePhase = "startup";
-  private session: CDPSession | null = null;
-  readonly records: WireFrameRecord[] = [];
-
-  async start(page: Page): Promise<void> {
-    this.session = await page.context().newCDPSession(page);
-    await this.session.send("Network.enable");
-    this.session.on("Network.webSocketFrameSent", (event: WebSocketFrameEvent) => {
-      this.record("sent", event);
-    });
-    this.session.on("Network.webSocketFrameReceived", (event: WebSocketFrameEvent) => {
-      this.record("received", event);
-    });
-  }
-
-  setPhase(phase: WirePhase): void {
-    this.phase = phase;
-  }
-
-  hasCompletedStartupFetches(): boolean {
-    return (
-      this.records.some(
-        (record) =>
-          record.direction === "received" &&
-          record.type === "fetch_agents_response" &&
-          record.hasMore === false,
-      ) &&
-      this.records.some(
-        (record) =>
-          record.direction === "received" &&
-          record.type === "fetch_workspaces_response" &&
-          record.hasMore === false,
-      )
-    );
-  }
-
-  summarize(clickedWorkspaces: WireSummary["clickedWorkspaces"]): WireSummary {
-    return {
-      totalFrames: this.records.length,
-      totalBytes: sumBytes(this.records),
-      byDirection: {
-        sent: summarizeDirection(this.records, "sent"),
-        received: summarizeDirection(this.records, "received"),
-      },
-      byPhase: {
-        startup: summarizePhase(this.records, "startup"),
-        workspace_clicks: summarizePhase(this.records, "workspace_clicks"),
-      },
-      fetchPages: this.records
-        .filter(
-          (record) =>
-            record.direction === "received" &&
-            (record.type === "fetch_agents_response" ||
-              record.type === "fetch_workspaces_response"),
-        )
-        .map((record) => ({
-          phase: record.phase,
-          type: record.type ?? "unknown",
-          requestId: record.requestId,
-          entries: record.entryCount,
-          hasMore: record.hasMore,
-          bytes: record.bytes,
-        })),
-      clickedWorkspaces,
-      providerSnapshots: this.records
-        .filter((record) => record.direction === "received" && record.providerEntries)
-        .map((record) => ({
-          phase: record.phase,
-          type: record.type ?? "unknown",
-          requestId: record.requestId,
-          totalModels: sumProviderModels(record.providerEntries ?? []),
-          totalModes: sumProviderModes(record.providerEntries ?? []),
-          bytes: record.bytes,
-          providers: record.providerEntries ?? [],
-        })),
-      providerSnapshotTotals: summarizeProviderSnapshots(this.records),
-      fork: {
-        sourceHome: process.env.E2E_FORK_SOURCE_PASEO_HOME ?? null,
-        targetHome: process.env.E2E_FORK_TARGET_PASEO_HOME ?? null,
-        copiedFiles: parseOptionalNumber(process.env.E2E_FORK_COPIED_FILES),
-        copiedBytes: parseOptionalNumber(process.env.E2E_FORK_COPIED_BYTES),
-      },
-    };
-  }
-
-  private record(direction: WireDirection, event: WebSocketFrameEvent): void {
-    if (event.response.opcode !== 1) {
-      this.records.push({
-        phase: this.phase,
-        direction,
-        bytes: Buffer.byteLength(event.response.payloadData),
-        type: `opcode:${event.response.opcode}`,
-        requestId: null,
-        entryCount: null,
-        hasMore: null,
-        providerEntries: null,
-      });
-      return;
-    }
-
-    this.records.push({
-      phase: this.phase,
-      direction,
-      bytes: Buffer.byteLength(event.response.payloadData, "utf8"),
-      ...parseWireMessage(event.response.payloadData),
-    });
-  }
-}
-
-function parseOptionalNumber(value: string | undefined): number | null {
-  if (!value) {
-    return null;
-  }
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : null;
-}
-
-function parseWireMessage(payloadData: string): ParsedWireMessage {
-  try {
-    const parsed = JSON.parse(payloadData) as unknown;
-    if (!parsed || typeof parsed !== "object") {
-      return emptyParsedWireMessage();
-    }
-    const envelope = parsed as {
-      type?: unknown;
-      message?: unknown;
-    };
-    const unwrapped =
-      envelope.type === "session" && envelope.message && typeof envelope.message === "object"
-        ? envelope.message
-        : parsed;
-    const message = unwrapped as {
-      type?: unknown;
-      requestId?: unknown;
-      payload?: {
-        requestId?: unknown;
-        entries?: unknown;
-        agents?: unknown;
-        pageInfo?: { hasMore?: unknown };
-      };
-    };
-    const entries = readMessageEntries(message.payload);
-    const hasMore = readMessageHasMore(message.payload);
-    const messageType = typeof message.type === "string" ? message.type : null;
-    const providerEntries = isProviderSnapshotMessage(messageType)
-      ? parseProviderSnapshotEntries(message.payload)
-      : null;
-    return {
-      type: messageType,
-      requestId: readMessageRequestId(message),
-      entryCount: entries ? entries.length : null,
-      hasMore,
-      providerEntries,
-    };
-  } catch {
-    return emptyParsedWireMessage();
-  }
-}
-
-function readMessageRequestId(message: {
-  requestId?: unknown;
-  payload?: { requestId?: unknown };
-}): string | null {
-  if (typeof message.requestId === "string") {
-    return message.requestId;
-  }
-  if (typeof message.payload?.requestId === "string") {
-    return message.payload.requestId;
-  }
-  return null;
-}
-
-function isProviderSnapshotMessage(messageType: string | null): boolean {
-  return (
-    messageType === "get_providers_snapshot_response" || messageType === "providers_snapshot_update"
-  );
-}
-
-function readMessageEntries(
-  payload:
-    | {
-        entries?: unknown;
-        agents?: unknown;
-      }
-    | undefined,
-): unknown[] | null {
-  if (Array.isArray(payload?.entries)) {
-    return payload.entries;
-  }
-  if (Array.isArray(payload?.agents)) {
-    return payload.agents;
-  }
-  return null;
-}
-
-function readMessageHasMore(
-  payload: { pageInfo?: { hasMore?: unknown } } | undefined,
-): boolean | null {
-  return typeof payload?.pageInfo?.hasMore === "boolean" ? payload.pageInfo.hasMore : null;
-}
-
-function emptyParsedWireMessage(): ParsedWireMessage {
-  return {
-    type: null,
-    requestId: null,
-    entryCount: null,
-    hasMore: null,
-    providerEntries: null,
-  };
-}
-
-function parseProviderSnapshotEntries(payload: unknown): ProviderSnapshotWireEntry[] | null {
-  if (!payload || typeof payload !== "object") {
-    return null;
-  }
-  const entries = (payload as { entries?: unknown }).entries;
-  if (!Array.isArray(entries)) {
-    return null;
-  }
-
-  const providerEntries: ProviderSnapshotWireEntry[] = [];
-  for (const entry of entries) {
-    if (!entry || typeof entry !== "object") {
-      continue;
-    }
-    const provider = (entry as { provider?: unknown }).provider;
-    if (typeof provider !== "string") {
-      continue;
-    }
-    const models = (entry as { models?: unknown }).models;
-    const modes = (entry as { modes?: unknown }).modes;
-    const status = (entry as { status?: unknown }).status;
-    providerEntries.push({
-      provider,
-      status: typeof status === "string" ? status : null,
-      modelCount: Array.isArray(models) ? models.length : 0,
-      modeCount: Array.isArray(modes) ? modes.length : 0,
-      bytes: Buffer.byteLength(JSON.stringify(entry), "utf8"),
-    });
-  }
-
-  return providerEntries.length > 0 ? providerEntries : null;
-}
-
-function sumBytes(records: WireFrameRecord[]): number {
-  return records.reduce((sum, record) => sum + record.bytes, 0);
-}
-
-function summarizeDirection(records: WireFrameRecord[], direction: WireDirection) {
-  const selected = records.filter((record) => record.direction === direction);
-  return {
-    frames: selected.length,
-    bytes: sumBytes(selected),
-  };
-}
-
-function summarizePhase(records: WireFrameRecord[], phase: WirePhase) {
-  const selected = records.filter((record) => record.phase === phase);
-  return {
-    frames: selected.length,
-    bytes: sumBytes(selected),
-    byType: summarizeByType(selected),
-    rpcCounts: summarizeRpcCounts(selected),
-    rpcs: summarizeRpcs(selected),
-  };
-}
-
-function summarizeByType(records: WireFrameRecord[]): Array<{
-  type: string;
-  frames: number;
-  bytes: number;
-}> {
-  const byType = new Map<string, { frames: number; bytes: number }>();
-  for (const record of records) {
-    const type = record.type ?? "unknown";
-    const current = byType.get(type) ?? { frames: 0, bytes: 0 };
-    current.frames += 1;
-    current.bytes += record.bytes;
-    byType.set(type, current);
-  }
-  return [...byType.entries()]
-    .map(([type, value]) => Object.assign({ type }, value))
-    .sort((left, right) => right.bytes - left.bytes);
-}
-
-function summarizeRpcs(records: WireFrameRecord[]): WireSummary["byPhase"][WirePhase]["rpcs"] {
-  const responsesByRequestId = new Map<string, string>();
-  for (const record of records) {
-    if (record.direction !== "received" || !record.requestId) {
-      continue;
-    }
-    responsesByRequestId.set(record.requestId, record.type ?? "unknown");
-  }
-
-  return records
-    .filter((record) => record.direction === "sent" && record.requestId && record.type)
-    .map((record) => ({
-      requestType: record.type ?? "unknown",
-      requestId: record.requestId ?? "",
-      responseType: responsesByRequestId.get(record.requestId ?? "") ?? null,
-    }));
-}
-
-function summarizeRpcCounts(
-  records: WireFrameRecord[],
-): Array<{ requestType: string; count: number }> {
-  const counts = new Map<string, number>();
-  for (const record of records) {
-    if (record.direction !== "sent" || !record.type || !record.requestId) {
-      continue;
-    }
-    counts.set(record.type, (counts.get(record.type) ?? 0) + 1);
-  }
-  return [...counts.entries()]
-    .map(([requestType, count]) => ({ requestType, count }))
-    .sort(
-      (left, right) =>
-        right.count - left.count || left.requestType.localeCompare(right.requestType),
-    );
-}
-
-function sumProviderModels(entries: ProviderSnapshotWireEntry[]): number {
-  return entries.reduce((sum, entry) => sum + entry.modelCount, 0);
-}
-
-function sumProviderModes(entries: ProviderSnapshotWireEntry[]): number {
-  return entries.reduce((sum, entry) => sum + entry.modeCount, 0);
-}
-
-function summarizeProviderSnapshots(
-  records: WireFrameRecord[],
-): WireSummary["providerSnapshotTotals"] {
-  const byProvider = new Map<
-    string,
-    {
-      phase: WirePhase;
-      provider: string;
-      frames: number;
-      bytes: number;
-      maxModels: number;
-      maxModes: number;
-      statuses: Set<string>;
-    }
-  >();
-
-  for (const record of records) {
-    if (record.direction !== "received" || !record.providerEntries) {
-      continue;
-    }
-    for (const entry of record.providerEntries) {
-      const key = `${record.phase}:${entry.provider}`;
-      const current = byProvider.get(key) ?? {
-        phase: record.phase,
-        provider: entry.provider,
-        frames: 0,
-        bytes: 0,
-        maxModels: 0,
-        maxModes: 0,
-        statuses: new Set<string>(),
-      };
-      current.frames += 1;
-      current.bytes += entry.bytes;
-      current.maxModels = Math.max(current.maxModels, entry.modelCount);
-      current.maxModes = Math.max(current.maxModes, entry.modeCount);
-      if (entry.status) {
-        current.statuses.add(entry.status);
-      }
-      byProvider.set(key, current);
-    }
-  }
-
-  return [...byProvider.values()]
-    .map((entry) => ({
-      phase: entry.phase,
-      provider: entry.provider,
-      frames: entry.frames,
-      bytes: entry.bytes,
-      maxModels: entry.maxModels,
-      maxModes: entry.maxModes,
-      statuses: [...entry.statuses].sort(),
-    }))
-    .sort((left, right) => right.bytes - left.bytes);
-}
-
-async function attachSummary(testInfo: TestInfo, summary: WireSummary): Promise<void> {
-  await testInfo.attach("startup-wire-metrics.json", {
-    body: JSON.stringify(summary, null, 2),
-    contentType: "application/json",
-  });
-}
-
-test.describe("ad hoc startup wire metrics", () => {
-  test.skip(
-    process.env.E2E_WIRE_METRICS !== "1",
-    "Set E2E_WIRE_METRICS=1 to run this ad hoc measurement.",
-  );
-
-  test("measures startup hydration and workspace navigation websocket traffic", async ({
-    page,
-  }, testInfo) => {
-    test.setTimeout(180_000);
-
-    const monitor = new WireMonitor();
-    await monitor.start(page);
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page, 120_000);
-    await expect.poll(() => monitor.hasCompletedStartupFetches(), { timeout: 120_000 }).toBe(true);
-    await page.waitForTimeout(1_000);
-
-    const workspaceTestIds = await page
-      .locator('[data-testid^="sidebar-workspace-row-"]:visible')
-      .evaluateAll(extractWorkspaceTestIds);
-
-    monitor.setPhase("workspace_clicks");
-    const clickedWorkspaces: WireSummary["clickedWorkspaces"] = [];
-    for (const testId of workspaceTestIds) {
-      const row = page.getByTestId(testId);
-      if (!(await row.isVisible().catch(() => false))) {
-        continue;
-      }
-      const beforeFrames = monitor.records.length;
-      const beforeBytes = sumBytes(monitor.records);
-      await row.click();
-      await expect(page).toHaveURL(/\/workspace\//, { timeout: 30_000 });
-      await page.waitForTimeout(1_000);
-      clickedWorkspaces.push({
-        testId,
-        frames: monitor.records.length - beforeFrames,
-        bytes: sumBytes(monitor.records) - beforeBytes,
-      });
-    }
-
-    const summary = monitor.summarize(clickedWorkspaces);
-    await attachSummary(testInfo, summary);
-    console.log("PASEO_STARTUP_WIRE_METRICS_BEGIN");
-    console.log(JSON.stringify(summary, null, 2));
-    console.log("PASEO_STARTUP_WIRE_METRICS_END");
-
-    expect(summary.byPhase.startup.byType.length).toBeGreaterThan(0);
-    expect(clickedWorkspaces.length).toBeGreaterThan(0);
-  });
-});
diff --git a/packages/app/e2e/browser/streaming-markdown.spec.ts b/packages/app/e2e/browser/streaming-markdown.spec.ts
new file mode 100644
index 0000000000..3a48e8b10a
--- /dev/null
+++ b/packages/app/e2e/browser/streaming-markdown.spec.ts
@@ -0,0 +1,42 @@
+import { test } from "../support/fixtures";
+import {
+  withAcpStreamingMarkdown,
+  requestAcpMarkdown,
+  expectAcpMarkdown,
+  reloadAcpMarkdown,
+} from "../support/helpers/acp-streaming-markdown";
+import {
+  expectFinishedMarkdown,
+  expectReloadedMarkdown,
+  expectUnfinishedBold,
+  expectUnfinishedLink,
+  requestStreamingMarkdown,
+  withStreamingMarkdown,
+} from "../support/helpers/streaming-markdown";
+
+test("formats unfinished Markdown while streaming and preserves the completed rendering", async ({
+  page,
+}, testInfo) => {
+  await withStreamingMarkdown(page, testInfo, async (agent) => {
+    await requestStreamingMarkdown(agent);
+    await expectUnfinishedBold(page);
+    await expectUnfinishedLink(page, agent, testInfo);
+    await expectFinishedMarkdown(page, agent, testInfo);
+    await expectReloadedMarkdown(page);
+  });
+});
+
+for (const width of [1100, 390]) {
+  test(`ACP plugin chunks preserve Markdown and separate turns at ${width}px`, async ({
+    page,
+  }, testInfo) => {
+    await page.setViewportSize({ width, height: 844 });
+    await withAcpStreamingMarkdown(page, async (agent) => {
+      await requestAcpMarkdown(agent);
+      await expectAcpMarkdown(page, 1);
+      await requestAcpMarkdown(agent);
+      await expectAcpMarkdown(page, 2);
+      await reloadAcpMarkdown(page, testInfo);
+    });
+  });
+}
diff --git a/packages/app/e2e/browser/subagent-origin-pane.spec.ts b/packages/app/e2e/browser/subagent-origin-pane.spec.ts
new file mode 100644
index 0000000000..47a0120da6
--- /dev/null
+++ b/packages/app/e2e/browser/subagent-origin-pane.spec.ts
@@ -0,0 +1,149 @@
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openSubagentsTrack, seedParentWithSubagent } from "../support/helpers/subagents";
+
+const SETTINGS_KEY = "@paseo:app-settings";
+
+async function openParentInRightPane(page: Page, parentId: string, workspaceId: string) {
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await openAgentRoute(page, { workspaceId, agentId: parentId });
+  await expect(page.getByTestId(`workspace-tab-agent_${parentId}`)).toBeVisible();
+  await page.getByTestId("workspace-pane-main").getByTestId("workspace-new-tab-button").click();
+  await page.getByTestId("workspace-new-tab-menu-agent").click();
+  await page.getByTestId(`workspace-tab-agent_${parentId}`).click();
+  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+  await page
+    .getByTestId("workspace-pane-main")
+    .getByTestId(`workspace-tab-agent_${parentId}`)
+    .click();
+  await page.keyboard.press("Meta+Alt+Shift+ArrowRight");
+
+  const left = page.getByTestId("workspace-pane-main");
+  const right = page
+    .locator('[data-testid^="workspace-pane-"]')
+    .filter({ has: page.getByTestId(`workspace-tab-agent_${parentId}`) });
+  await expect(left).toBeVisible();
+  await expect(right).toBeVisible();
+  await expect(right).not.toHaveAttribute("data-testid", "workspace-pane-main");
+  await left.locator('[data-testid^="workspace-tab-draft_"]').click();
+  return { left, right };
+}
+
+test.beforeEach(async ({ page }) => {
+  await page.addInitScript(() => {
+    Object.defineProperty(navigator, "platform", { get: () => "MacIntel" });
+  });
+});
+
+test("a subagent opened from a right-pane parent stays with its parent when left has focus", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "subagent-origin-pane-" });
+  try {
+    const pair = await seedParentWithSubagent(workspace, {
+      parentTitle: "Right parent",
+      childTitle: "Child agent",
+    });
+    const { left, right } = await openParentInRightPane(page, pair.parent.id, pair.workspaceId);
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${pair.child.id}`).click();
+
+    await expect(right.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toBeVisible();
+    await expect(left.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toHaveCount(0);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("the side preference opens a right-pane parent's subagent in the side pane", async ({
+  page,
+}) => {
+  await page.addInitScript((key) => {
+    localStorage.setItem(key, JSON.stringify({ openInSidePane: { subagents: true } }));
+  }, SETTINGS_KEY);
+  const workspace = await seedWorkspace({ repoPrefix: "subagent-side-preference-" });
+  try {
+    const pair = await seedParentWithSubagent(workspace, {
+      parentTitle: "Right parent",
+      childTitle: "Child agent",
+    });
+    const { left, right } = await openParentInRightPane(page, pair.parent.id, pair.workspaceId);
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${pair.child.id}`).click();
+
+    const childPane = page
+      .locator('[data-testid^="workspace-pane-"]')
+      .filter({ has: page.getByTestId(`workspace-tab-agent_${pair.child.id}`) });
+    await expect(childPane).toBeVisible();
+    expect(await childPane.getAttribute("data-testid")).not.toBe(
+      await right.getAttribute("data-testid"),
+    );
+    await expect(childPane).not.toHaveAttribute("data-testid", "workspace-pane-main");
+    await expect(left.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toHaveCount(0);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("opening an already-tabbed subagent reveals its left tab without a duplicate", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "subagent-existing-tab-" });
+  try {
+    const pair = await seedParentWithSubagent(workspace, {
+      parentTitle: "Right parent",
+      childTitle: "Child agent",
+    });
+    const { left, right } = await openParentInRightPane(page, pair.parent.id, pair.workspaceId);
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${pair.child.id}`).click();
+    await expect(right.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toBeVisible();
+    await page.keyboard.press("Meta+Alt+Shift+ArrowLeft");
+    await expect(left.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toBeVisible();
+    await right.getByTestId(`workspace-tab-agent_${pair.parent.id}`).click();
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${pair.child.id}`).click();
+
+    await expect(left.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toBeVisible();
+    await expect(right.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toHaveCount(0);
+    await expect(page.getByTestId(`workspace-tab-agent_${pair.child.id}`)).toHaveCount(1);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("a preferred chat file link still opens beside its right-pane agent", async ({ page }) => {
+  const target = "linked.ts:3";
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix: "chat-file-origin-pane-",
+    title: "File link parent",
+    initialPrompt: [
+      "Generate a title and a git branch name for a coding agent from the user prompt and attachments.",
+      "Return JSON only with fields 'title' and 'branch'.",
+      "",
+      "<user-prompt>",
+      `Open \`${target}\` now`,
+      "</user-prompt>",
+    ].join("\n"),
+  });
+  try {
+    await writeFile(path.join(workspace.cwd, "linked.ts"), "one\ntwo\nthree\n", "utf8");
+    const { left, right } = await openParentInRightPane(
+      page,
+      workspace.agentId,
+      workspace.workspaceId,
+    );
+    const fileLink = right.getByText(target, { exact: true });
+    await expect(fileLink).toBeVisible({ timeout: 15_000 });
+    await fileLink.click();
+
+    await expect(right.getByTestId("workspace-tab-file_linked.ts")).toBeVisible();
+    await expect(left.getByTestId("workspace-tab-file_linked.ts")).toHaveCount(0);
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/terminal-find.spec.ts b/packages/app/e2e/browser/terminal-find.spec.ts
new file mode 100644
index 0000000000..91e8e5826a
--- /dev/null
+++ b/packages/app/e2e/browser/terminal-find.spec.ts
@@ -0,0 +1,489 @@
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
+import { spawnSync } from "node:child_process";
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { TerminalE2EHarness } from "../support/helpers/terminal-dsl";
+import { getTerminalBufferText, buildTerminalWorkspaceUrl } from "../support/helpers/terminal-perf";
+
+function query(page: Page) {
+  return page.getByRole("textbox", { name: "Find in pane", exact: true }).filter({ visible: true });
+}
+function status(page: Page) {
+  return page.getByRole("status", { name: "Find matches" }).filter({ visible: true });
+}
+function input(page: Page) {
+  return page
+    .getByTestId("terminal-surface")
+    .filter({ visible: true })
+    .locator(".xterm-helper-textarea");
+}
+async function openFind(page: Page, text?: string) {
+  await input(page).press("ControlOrMeta+f");
+  await expect(query(page)).toBeFocused();
+  if (text !== undefined) await query(page).fill(text);
+}
+async function expectSelectedQuery(page: Page, text: string) {
+  await expect(query(page)).toBeFocused();
+  await expect(query(page)).toHaveValue(text);
+  await expect
+    .poll(() =>
+      query(page).evaluate((el: HTMLInputElement) => [el.selectionStart, el.selectionEnd]),
+    )
+    .toEqual([0, text.length]);
+}
+async function expectUncoveredMatch(page: Page) {
+  const widget = page.getByLabel("Find", { exact: true });
+  await expect
+    .poll(async () => {
+      const selected = await page.evaluate(() => {
+        const term = (
+          window as Window & {
+            __paseoTerminal?: {
+              rows: number;
+              cols: number;
+              buffer: { active: { viewportY: number } };
+              getSelectionPosition():
+                | { start: { x: number; y: number }; end: { x: number; y: number } }
+                | undefined;
+            };
+          }
+        ).__paseoTerminal;
+        const selection = term?.getSelectionPosition();
+        return term && selection
+          ? { selection, rows: term.rows, cols: term.cols, firstRow: term.buffer.active.viewportY }
+          : null;
+      });
+      const screen = await page.locator(".xterm-screen").filter({ visible: true }).boundingBox();
+      const w = await widget.boundingBox();
+      if (!selected || !screen || !w) return false;
+      const x = screen.x + (selected.selection.start.x * screen.width) / selected.cols;
+      const y =
+        screen.y +
+        ((selected.selection.start.y - selected.firstRow) * screen.height) / selected.rows;
+      const height = screen.height / selected.rows;
+      return (
+        y >= screen.y &&
+        y + height <= screen.y + screen.height + 1 &&
+        !(x >= w.x && x < w.x + w.width && y < w.y + w.height && y + height > w.y)
+      );
+    })
+    .toBe(true);
+}
+async function viewport(page: Page) {
+  return page.evaluate(
+    () =>
+      (window as Window & { __paseoTerminal?: { buffer: { active: { viewportY: number } } } })
+        .__paseoTerminal?.buffer.active.viewportY,
+  );
+}
+
+async function openControlCharacterTerminal(page: Page) {
+  await test.step("Run cat -v in a real bash terminal", async () => {
+    const terminal = await harness.createTerminal({
+      name: "Control characters",
+      command: "bash",
+      // Disable the tty's echo so ^F proves cat received the byte. Noncanonical
+      // input lets cat print it immediately, without waiting for Enter.
+      args: ["--noprofile", "--norc", "-c", "stty -echo -icanon; printf 'CAT_READY\\n'; cat -v"],
+    });
+    await harness.openTerminal(page, { terminalId: terminal.id });
+    await expect.poll(() => getTerminalBufferText(page)).toContain("CAT_READY");
+  });
+}
+
+async function pressTerminalShortcut(page: Page, shortcut: string) {
+  await test.step(`Press ${shortcut} in the terminal`, async () => {
+    await input(page).press(shortcut);
+  });
+}
+
+async function expectFindClosed(page: Page) {
+  await expect(query(page)).toBeHidden();
+  await expect(input(page)).toBeFocused();
+}
+
+async function recordTerminalEvidence(name: string, body: string) {
+  const evidencePath = test.info().outputPath(`${name}.txt`);
+  await writeFile(evidencePath, body);
+  await test.info().attach(name, { path: evidencePath, contentType: "text/plain" });
+}
+
+async function expectCatControlF(page: Page) {
+  await test.step("Cat displays ^F while Find stays closed", async () => {
+    await expect.poll(() => getTerminalBufferText(page)).toContain("^F");
+    await expectFindClosed(page);
+    await recordTerminalEvidence("cat-control-f", await getTerminalBufferText(page));
+  });
+}
+
+async function expectVimPageDown(page: Page, before: { topLine: number; lastLine: number }) {
+  await test.step("Vim pages down while Find stays closed", async () => {
+    try {
+      // Vim's Ctrl+F keeps two lines of overlap, so the new page starts before the old page ends.
+      await expect.poll(() => visibleTopLineNumber(page)).toBeGreaterThan(before.topLine);
+      await expect.poll(() => visibleTopLineNumber(page)).toBeGreaterThanOrEqual(40);
+      await expectFindClosed(page);
+    } finally {
+      await recordTerminalEvidence("vim-after-control-f", await getTerminalBufferText(page));
+      await recordTerminalEvidence(
+        "vim-page-down",
+        JSON.stringify({ before, after: { topLine: await visibleTopLineNumber(page) } }),
+      );
+    }
+  });
+}
+
+async function expectCatRoundTrip(page: Page) {
+  await test.step("Wait for cat to echo subsequent input from the pty", async () => {
+    await input(page).pressSequentially("PTY_ROUND_TRIP");
+    await input(page).press("Enter");
+    await expect.poll(() => getTerminalBufferText(page)).toContain("PTY_ROUND_TRIP");
+  });
+}
+
+async function openNumberedFileInVim(page: Page) {
+  return test.step("Open 300 numbered lines in vim without user configuration", async () => {
+    const terminal = await harness.createTerminal({
+      name: "Vim page down",
+      command: "bash",
+      args: [
+        "--noprofile",
+        "--norc",
+        "-c",
+        "seq 1 300 > numbered-lines.txt && vim -u NONE -i NONE numbered-lines.txt; printf 'VIM_EXITED\\n'; cat",
+      ],
+    });
+    await harness.openTerminal(page, { terminalId: terminal.id });
+    await expectVimFirstPage(page);
+    const screen = await readVimScreen(page);
+    await recordTerminalEvidence("vim-before-control-f", screen.text);
+    return { topLine: screen.numberedLines[0], lastLine: screen.numberedLines.at(-1)! };
+  });
+}
+
+async function readVimScreen(page: Page) {
+  const rows = await page.evaluate(
+    () => (window as Window & { __paseoTerminal: { rows: number } }).__paseoTerminal.rows,
+  );
+  const text = await getTerminalBufferText(page);
+  const numberedLines = text
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => /^\d+$/.test(line))
+    .map(Number);
+  return { rows, text, numberedLines };
+}
+
+async function expectVimFirstPage(page: Page) {
+  await expect(async () => {
+    const screen = await readVimScreen(page);
+    // The captured screen has one numbered file line per row, except Vim's
+    // bottom command row. Derive the last visible line from the fitted terminal.
+    expect(screen.numberedLines).toEqual(Array.from({ length: screen.rows - 1 }, (_, i) => i + 1));
+    expect(screen.text).not.toContain("300L");
+  }).toPass({ timeout: 10_000 });
+}
+
+async function visibleTopLineNumber(page: Page) {
+  // Vim uses the alternate screen, so its active buffer starts at the visible top row.
+  return Number((await getTerminalBufferText(page)).split("\n")[0].trim());
+}
+
+async function quitVim(page: Page) {
+  await test.step("Leave vim with Escape and :q!", async () => {
+    await input(page).press("Escape");
+    await input(page).pressSequentially(":q!");
+    await input(page).press("Enter");
+    await expect.poll(() => getTerminalBufferText(page)).toContain("VIM_EXITED");
+  });
+}
+
+interface TerminalChord {
+  key: string;
+  bytes: string;
+}
+
+async function openKeyboardCapture(page: Page) {
+  await test.step("Open a real terminal process that reports received bytes", async () => {
+    const terminal = await harness.createTerminal({
+      name: "Keyboard bytes",
+      command: process.execPath,
+      args: [
+        "-e",
+        `
+        process.stdin.setRawMode(true);
+        let received = Buffer.alloc(0);
+        process.stdin.on('data', chunk => {
+          received = Buffer.concat([received, chunk]);
+          process.stdout.write('\\r\\nBYTES:' + received.toString('hex') + ':END\\r\\n');
+        });
+        console.log('KEYBOARD_READY');
+      `,
+      ],
+    });
+    await harness.openTerminal(page, { terminalId: terminal.id });
+    await expect.poll(() => getTerminalBufferText(page)).toContain("KEYBOARD_READY");
+  });
+}
+
+async function expectTerminalChords(page: Page, chords: TerminalChord[]) {
+  let received = "";
+  for (const chord of chords) {
+    await test.step(`${chord.key} sends ${JSON.stringify(chord.bytes)}`, async () => {
+      await pressTerminalShortcut(page, chord.key);
+      // A printable sentinel proves delivery even for chords expected to send nothing.
+      await input(page).pressSequentially("x");
+      received += Buffer.from(chord.bytes + "x").toString("hex");
+      await expect.poll(() => getTerminalBufferText(page)).toContain(`BYTES:${received}:END`);
+    });
+  }
+  await recordTerminalEvidence("keyboard-bytes", await getTerminalBufferText(page));
+  await page.screenshot({ path: test.info().outputPath("keyboard-chords.png") });
+}
+
+let harness: TerminalE2EHarness;
+test.beforeEach(async () => {
+  harness = await TerminalE2EHarness.create({ tempPrefix: "terminal-find-" });
+});
+test.afterEach(async () => {
+  await harness.cleanup();
+});
+
+test.describe("macOS terminal shortcuts", () => {
+  test.use({
+    userAgent:
+      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+  });
+
+  test("encodes editing chords without confusing Control and Command", async ({ page }) => {
+    await openKeyboardCapture(page);
+    await expectTerminalChords(page, [
+      { key: "Meta+ArrowLeft", bytes: "\x01" },
+      { key: "Meta+ArrowRight", bytes: "\x05" },
+      { key: "Alt+ArrowLeft", bytes: "\x1bb" },
+      { key: "Alt+ArrowRight", bytes: "\x1bf" },
+      { key: "Meta+Backspace", bytes: "\x15" },
+      { key: "Control+c", bytes: "\x03" },
+      { key: "Control+a", bytes: "\x01" },
+      { key: "Control+e", bytes: "\x05" },
+      { key: "Control+v", bytes: "\x16" },
+      { key: "Control+f", bytes: "\x06" },
+      { key: "ArrowLeft", bytes: "\x1b[D" },
+      { key: "ArrowRight", bytes: "\x1b[C" },
+      { key: "Alt+Backspace", bytes: "\x1b\x7f" },
+      { key: "Control+Alt+ArrowLeft", bytes: "\x1b[1;7D" },
+    ]);
+    await pressTerminalShortcut(page, "Meta+f");
+    await expect(query(page)).toBeFocused();
+  });
+
+  test("sends Control+f to cat and opens Find with Meta+f", async ({ page }) => {
+    await openControlCharacterTerminal(page);
+    await pressTerminalShortcut(page, "Control+f");
+    await expectCatControlF(page);
+    await pressTerminalShortcut(page, "Meta+f");
+    await expect(query(page)).toBeFocused();
+  });
+
+  test("sends Control+f to vim to page down", async ({ page }) => {
+    const vim = spawnSync("which", ["vim"], { encoding: "utf8" });
+    await recordTerminalEvidence("which-vim", `status: ${vim.status}\n${vim.stdout}${vim.stderr}`);
+    test.skip(vim.status !== 0, "vim is not installed on this runner (which vim failed)");
+    const before = await openNumberedFileInVim(page);
+    await pressTerminalShortcut(page, "Control+f");
+    await expectVimPageDown(page, before);
+    await quitVim(page);
+  });
+});
+
+async function useLinuxKeyboardPlatform(page: Page) {
+  // A user agent alone leaves navigator.platform as MacIntel on macOS hosts.
+  // Emulate both browser identity fields before the app reads its keyboard policy.
+  const session = await page.context().newCDPSession(page);
+  await session.send("Emulation.setUserAgentOverride", {
+    userAgent:
+      "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+    platform: "Linux x86_64",
+  });
+}
+
+test("Linux terminal chords keep Control, Alt and Meta distinct", async ({ page }) => {
+  await useLinuxKeyboardPlatform(page);
+  await openKeyboardCapture(page);
+  await expectTerminalChords(page, [
+    { key: "Meta+ArrowLeft", bytes: "" },
+    { key: "Meta+ArrowRight", bytes: "" },
+    { key: "Alt+ArrowLeft", bytes: "\x1b[1;3D" },
+    { key: "Alt+ArrowRight", bytes: "\x1b[1;3C" },
+    { key: "Meta+Backspace", bytes: "\x7f" },
+    { key: "Control+c", bytes: "\x03" },
+    { key: "Control+a", bytes: "\x01" },
+    { key: "Control+e", bytes: "\x05" },
+    { key: "Control+ArrowLeft", bytes: "\x1b[1;5D" },
+    { key: "Control+ArrowRight", bytes: "\x1b[1;5C" },
+    { key: "Control+Backspace", bytes: "\x08" },
+    { key: "Alt+Backspace", bytes: "\x1b\x7f" },
+  ]);
+  await pressTerminalShortcut(page, "Control+f");
+  await expect(query(page)).toBeFocused();
+});
+
+test("opens Find with Control+f on Linux without sending ^F to cat", async ({ page }) => {
+  await useLinuxKeyboardPlatform(page);
+  await openControlCharacterTerminal(page);
+  await pressTerminalShortcut(page, "Control+f");
+  await expect(query(page)).toBeFocused();
+  await test.step("Close Find and return focus to the terminal", async () => {
+    await query(page).press("Escape");
+    await expectFindClosed(page);
+  });
+  await expectCatRoundTrip(page);
+  await test.step("Cat received subsequent input without any ^F", async () => {
+    const output = await getTerminalBufferText(page);
+    expect(output).not.toContain("^F");
+    await recordTerminalEvidence("cat-without-control-f", output);
+  });
+});
+
+test("searches retained output without sending Find input to the shell", async ({
+  page,
+}, testInfo) => {
+  const received = path.join(harness.tempRepo.path, "received.txt");
+  const trigger = path.join(harness.tempRepo.path, "output.trigger");
+  const bottomTrigger = path.join(harness.tempRepo.path, "bottom.trigger");
+  const script = `stty -echo; printf 'first a.b\\n'; for i in $(seq 1 90); do printf 'line %s\\n' "$i"; done; printf 'last A.B\\nREADY\\n'; (while [ ! -f output.trigger ]; do sleep 0.05; done; printf 'new output\\n'; while [ ! -f bottom.trigger ]; do sleep 0.05; done; for i in $(seq 1 30); do printf 'bottom output %s\\n' "$i"; done) & while IFS= read -r line; do printf '%s\\n' "$line" >> received.txt; done`;
+  await writeFile(received, "");
+  const terminal = await harness.createTerminal({
+    name: "Find fixture",
+    command: "bash",
+    args: ["--noprofile", "--norc", "-c", script],
+  });
+  await harness.openTerminal(page, { terminalId: terminal.id });
+  await expect.poll(() => getTerminalBufferText(page)).toContain("READY");
+  await openFind(page, "a.b");
+  await expect(status(page)).toHaveText("2 of 2");
+  await query(page).press("Shift+Enter");
+  await expect(status(page)).toHaveText("1 of 2");
+  await expectUncoveredMatch(page);
+  const findBox = await page.getByLabel("Find", { exact: true }).boundingBox();
+  const surfaceBox = await page.getByTestId("terminal-surface").boundingBox();
+  expect(findBox!.y).toBeLessThan(surfaceBox!.y + 70);
+  const inspected = await viewport(page);
+  await writeFile(trigger, "go");
+  await expect.poll(() => getTerminalBufferText(page)).toContain("new output");
+  await expect.poll(() => viewport(page)).toBe(inspected);
+  await page.screenshot({ path: testInfo.outputPath("scrollback-find.png") });
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("2 of 2");
+  const inspectedBottom = await viewport(page);
+  await writeFile(bottomTrigger, "go");
+  await expect.poll(() => getTerminalBufferText(page)).toContain("bottom output 30");
+  await expect.poll(() => viewport(page)).toBe(inspectedBottom);
+  await expectUncoveredMatch(page);
+  await query(page).press("Enter");
+  await expect(status(page)).toHaveText("1 of 2");
+  await query(page).press("ControlOrMeta+f");
+  await expectSelectedQuery(page, "a.b");
+  await query(page).fill("A.B");
+  await expect(status(page)).toHaveText("1 of 2");
+  await query(page).fill("absent[.*]");
+  await expect(status(page)).toHaveText("No matches");
+  await query(page).fill("a.b");
+  await query(page).press("Escape");
+  await expect(query(page)).toBeHidden();
+  await expect(input(page)).toBeFocused();
+  await expect(page.locator(".xterm-find-result-decoration")).toHaveCount(0);
+  await input(page).pressSequentially("only-shell-input");
+  await input(page).press("Enter");
+  await expect.poll(() => readFile(received, "utf8")).toBe("only-shell-input\n");
+  await input(page).pressSequentially("discard");
+  await input(page).press("Control+u");
+  await input(page).pressSequentially("ordinary-input");
+  await input(page).press("Enter");
+  await expect.poll(() => readFile(received, "utf8")).toBe("only-shell-input\nordinary-input\n");
+  await openFind(page);
+  await expectSelectedQuery(page, "a.b");
+  await expect(status(page)).toHaveText(/of 2/);
+  await expectUncoveredMatch(page);
+  await expect(page.getByRole("button", { name: "Toggle replace" })).toHaveCount(0);
+  await expect(page.getByRole("button", { name: "Find", exact: true })).toHaveCount(0);
+});
+
+test("keeps terminal Find owned by retained tabs and the focused split pane", async ({
+  page,
+}, testInfo) => {
+  const first = await harness.createTerminal({
+    name: "First search",
+    command: "bash",
+    args: ["-c", "printf 'first needle\\n'; cat"],
+  });
+  const second = await harness.createTerminal({
+    name: "Second search",
+    command: "bash",
+    args: ["-c", "printf 'second needle\\nsecond needle\\n'; cat"],
+  });
+  await harness.openTerminal(page, { terminalId: first.id });
+  await openFind(page, "needle");
+  await expect(status(page)).toHaveText("1 of 1");
+  await page.getByTestId(`workspace-tab-terminal_${second.id}`).first().click();
+  await openFind(page, "needle");
+  await expect(status(page).filter({ visible: true })).toHaveText("2 of 2");
+  await query(page).filter({ visible: true }).press("Escape");
+  await page.getByTestId(`workspace-tab-terminal_${first.id}`).first().click();
+  await input(page).press("ControlOrMeta+f");
+  await expectSelectedQuery(page, "needle");
+  await expect(status(page).filter({ visible: true })).toHaveText("1 of 1");
+  await query(page).filter({ visible: true }).press("Escape");
+  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+  await page.getByTestId(`workspace-tab-terminal_${second.id}`).first().click();
+  await runWorkspaceActionFromCommandCenter(page, "Move tab right");
+  const left = page
+    .getByTestId("split-group-child")
+    .filter({ has: page.getByTestId(`workspace-tab-terminal_${first.id}`) });
+  const right = page
+    .getByTestId("split-group-child")
+    .filter({ has: page.getByTestId(`workspace-tab-terminal_${second.id}`) });
+  await expect(left.locator(".xterm-helper-textarea")).toHaveCount(1);
+  await expect(right.locator(".xterm-helper-textarea")).toHaveCount(1);
+  await right.getByTestId("terminal-surface").click();
+  await right.locator(".xterm-helper-textarea").press("ControlOrMeta+f");
+  await expect(right.getByRole("textbox", { name: "Find in pane", exact: true })).toBeFocused();
+  await right.getByRole("textbox", { name: "Find in pane", exact: true }).fill("needle");
+  await expect(right.getByRole("status", { name: "Find matches" })).toHaveText(/of 2/);
+  await expect(left.getByRole("textbox", { name: "Find in pane", exact: true })).toHaveCount(0);
+  await right.getByRole("textbox", { name: "Find in pane", exact: true }).press("Escape");
+  await left.getByTestId("terminal-surface").click();
+  await left.locator(".xterm-helper-textarea").press("ControlOrMeta+f");
+  await expect(left.getByRole("textbox", { name: "Find in pane", exact: true })).toBeFocused();
+  await left.getByRole("textbox", { name: "Find in pane", exact: true }).fill("needle");
+  await expect(left.getByRole("status", { name: "Find matches" })).toHaveText("1 of 1");
+  await page.screenshot({ path: testInfo.outputPath("split-find.png") });
+});
+
+test("keeps the shared Find controls usable in a compact dark browser", async ({
+  page,
+}, testInfo) => {
+  await page.setViewportSize({ width: 390, height: 720 });
+  await page.emulateMedia({ colorScheme: "dark" });
+  const terminal = await harness.createTerminal({
+    name: "Compact search",
+    command: "bash",
+    args: ["-c", "printf 'needle\\nneedle\\n'; cat"],
+  });
+  await page.goto(buildTerminalWorkspaceUrl(harness.workspaceId, terminal.id));
+  await expect(page.getByTestId("terminal-surface")).toBeVisible();
+  await page.getByTestId("terminal-surface").click();
+  await openFind(page, "needle");
+  await expect(status(page)).toHaveText("2 of 2");
+  await page.getByRole("button", { name: "Previous match" }).click();
+  await expect(status(page)).toHaveText("1 of 2");
+  await page.getByRole("button", { name: "Next match" }).click();
+  await expect(status(page)).toHaveText("2 of 2");
+  const box = await page.getByLabel("Find", { exact: true }).boundingBox();
+  expect(box!.x).toBeGreaterThanOrEqual(0);
+  expect(box!.x + box!.width).toBeLessThanOrEqual(390);
+  await page.screenshot({ path: testInfo.outputPath("compact-find.png") });
+  await page.getByRole("button", { name: "Close Find" }).click();
+  await expect(input(page)).toBeFocused();
+});
diff --git a/packages/app/e2e/browser/terminal-tab-title-loading.spec.ts b/packages/app/e2e/browser/terminal-tab-title-loading.spec.ts
new file mode 100644
index 0000000000..93e9e72aed
--- /dev/null
+++ b/packages/app/e2e/browser/terminal-tab-title-loading.spec.ts
@@ -0,0 +1,86 @@
+import { test, expect, type Page } from "../support/fixtures";
+import { clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
+import { renameModalInput, renameModalSubmit } from "../support/helpers/rename";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { selectWorkspaceInSidebar } from "../support/helpers/sidebar";
+
+function terminalTab(page: Page, terminalId: string) {
+  // Terminal tab chips have no tab role; their persistent identity survives title loading.
+  return page.getByTestId(`workspace-tab-terminal_${terminalId}`).filter({ visible: true }).first();
+}
+
+async function createNamedTerminal(page: Page, workspace: SeededWorkspace, title: string) {
+  await gotoWorkspace(page, workspace.workspaceId);
+  await clickNewTerminal(page);
+  const list = () =>
+    workspace.client.listTerminals(workspace.repoPath, undefined, {
+      workspaceId: workspace.workspaceId,
+    });
+  await expect.poll(async () => (await list()).terminals.length).toBe(1);
+  const terminalId = (await list()).terminals[0]!.id;
+  await terminalTab(page, terminalId).click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Rename", exact: true }).click();
+  const modal = `workspace-tab-rename-modal-terminal-${terminalId}`;
+  await renameModalInput(page, modal).fill(title);
+  await renameModalSubmit(page, modal).click();
+  await expect(renameModalInput(page, modal)).toHaveCount(0);
+  await expect(terminalTab(page, terminalId)).toHaveText(title);
+  return terminalId;
+}
+
+async function recordRestoredTabText(page: Page, terminalId: string) {
+  // Install before the next document loads: a final-state assertion would miss the flash.
+  await page.addInitScript((id) => {
+    const samples: string[] = [];
+    Object.assign(window, { terminalTitleSamples: samples });
+    new MutationObserver(() => {
+      const tab = document.querySelector(`[data-testid="workspace-tab-terminal_${id}"]`);
+      if (!tab) return;
+      const text = (tab.textContent ?? "").trim();
+      if (samples.at(-1) !== text) samples.push(text);
+    }).observe(document, { subtree: true, childList: true, characterData: true });
+  }, terminalId);
+}
+
+async function expectRestoredTitle(page: Page, terminalId: string, title: string, stage: string) {
+  await expect(terminalTab(page, terminalId)).toHaveText(title, { timeout: 30_000 });
+  const samples = await page.evaluate(
+    () => (window as unknown as { terminalTitleSamples: string[] }).terminalTitleSamples,
+  );
+  await test.info().attach(`${stage}-tab-text`, {
+    body: JSON.stringify(samples),
+    contentType: "application/json",
+  });
+  expect(samples).toContain(title);
+  expect(samples).not.toContain("Terminal");
+}
+
+test("restored terminal titles do not flash a default name while loading", async ({ page }) => {
+  const workspace = await seedWorkspace({ repoPrefix: "terminal-title-loading-", git: false });
+  const other = await seedWorkspace({ repoPrefix: "terminal-title-other-", git: false });
+  try {
+    const title = "My named terminal";
+    const terminalId = await createNamedTerminal(page, workspace, title);
+    await recordRestoredTabText(page, terminalId);
+
+    await test.step("reload with a terminal tab restored", async () => {
+      await page.reload();
+      await expectRestoredTitle(page, terminalId, title, "reload");
+    });
+
+    await test.step("first workspace visit in a fresh page session", async () => {
+      await gotoWorkspace(page, other.workspaceId);
+      await selectWorkspaceInSidebar(page, workspace.workspaceId);
+      await expectRestoredTitle(page, terminalId, title, "first-visit");
+    });
+
+    await test.step("return to the workspace with its titles already loaded", async () => {
+      await selectWorkspaceInSidebar(page, other.workspaceId);
+      await selectWorkspaceInSidebar(page, workspace.workspaceId);
+      await expectRestoredTitle(page, terminalId, title, "return-visit");
+    });
+  } finally {
+    await workspace.cleanup();
+    await other.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/usage-modal.spec.ts b/packages/app/e2e/browser/usage-modal.spec.ts
new file mode 100644
index 0000000000..6f546078bf
--- /dev/null
+++ b/packages/app/e2e/browser/usage-modal.spec.ts
@@ -0,0 +1,544 @@
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
+import path from "node:path";
+import type { Page } from "@playwright/test";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { addConnectedHostAndReload } from "../support/helpers/hosts";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { getServerId } from "../support/helpers/server-id";
+import { seedSidebarFooterPreferences } from "../support/helpers/sidebar-nav-settings";
+import {
+  installUsageReportsFixture,
+  type UsageListRequest,
+  type UsageReportsFixture,
+} from "../support/helpers/usage-reports";
+import {
+  installLoginUsage,
+  installCodexWindowUsage,
+  expectCodexReportedWindows,
+  refreshLoginUsage,
+  hoverUsageWindow,
+} from "../support/helpers/usage-login";
+import {
+  claudeAndCodexReports,
+  expectPinnedUsage,
+  openCompactSidebar,
+  openUsageFromIcon,
+  openUsageFromItem,
+  pinRow,
+  openUsageOptions,
+  closeUsageOptions,
+  expectUsageOptionsFitContent,
+  showUsageAs,
+  refreshAllUsage,
+  togglePin,
+  usageItem,
+} from "../support/helpers/usage-sidebar-item";
+
+const emptyHome = path.join(tmpdir(), `paseo-usage-empty-${randomUUID()}`);
+test.use({
+  e2eDaemonEnvironment: {
+    HOME: emptyHome,
+    USERPROFILE: emptyHome,
+    CODEX_HOME: emptyHome,
+    CLAUDE_CONFIG_DIR: emptyHome,
+    XDG_DATA_HOME: emptyHome,
+    PI_CODING_AGENT_DIR: emptyHome,
+    COPILOT_TOKEN: "",
+    GITHUB_TOKEN: "",
+    GITHUB_PAT: "",
+    CURSOR_ACCESS_TOKEN: "",
+    CURSOR_TOKEN: "",
+    GROK_API_KEY: "",
+    GROK_TOKEN: "",
+    KIMI_TOKEN: "",
+    KIMI_API_KEY: "",
+    KIMI_CODE_HOME: emptyHome,
+    MINIMAX_API_KEY: "",
+    ZAI_API_KEY: "",
+    GLM_API_KEY: "",
+  },
+});
+
+// These tests read the sidebar summary and pin windows, which both need the Usage item on.
+test.beforeEach(async ({ page }) => {
+  await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+});
+
+function forcedRefreshes(usage: UsageReportsFixture): UsageListRequest[] {
+  return usage.listRequests().filter((request) => request.forceRefresh);
+}
+
+// Two hours reads "2h ago" for an hour, so the assertion cannot race the clock.
+function twoHoursAgo(): string {
+  return new Date(Date.now() - 2 * 60 * 60_000).toISOString();
+}
+
+/** Set PASEO_QA_SCREENSHOT_DIR to keep a QA screenshot. */
+async function qaScreenshot(page: Page, name: string) {
+  const directory = process.env.PASEO_QA_SCREENSHOT_DIR;
+  if (!directory) return;
+  await page.waitForTimeout(600);
+  await page.addStyleTag({ content: ".__expo_fast_refresh { display: none !important; }" });
+  await page.screenshot({ path: path.join(directory, `${name}.png`) });
+}
+
+function hostFilter(page: Page) {
+  return page.locator('[data-testid="usage-host-filter-trigger"]:visible');
+}
+
+function weeklyReport(sourceId: string, usedPct: number): UsageReportEntry {
+  return {
+    id: `${sourceId}:a`,
+    account: {},
+    fetchedAt: twoHoursAgo(),
+    sourceId,
+    sourceLabel: `${sourceId} plan`,
+    report: { status: "available", windows: [{ id: "weekly", label: "Weekly", usedPct }] },
+  };
+}
+
+test.describe("usage modal", () => {
+  test("opens from the sidebar on the host's reports, with no host filter for one host", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const usage = await installUsageReportsFixture(page, {
+      lists: [
+        [
+          {
+            id: "alpha:a",
+            account: {},
+            fetchedAt: twoHoursAgo(),
+            sourceId: "alpha",
+            sourceLabel: "Alpha plan",
+            report: {
+              status: "available",
+              windows: [{ id: "weekly", label: "Weekly", usedPct: 31 }],
+            },
+          },
+          {
+            id: "beta:b",
+            account: {},
+            fetchedAt: "2026-01-01T00:00:00.000Z",
+            sourceId: "beta",
+            sourceLabel: "Beta plan",
+            report: {
+              status: "unavailable",
+              problem: { kind: "no_quota", detail: "No active coding plan" },
+            },
+          },
+        ],
+      ],
+    });
+
+    await gotoAppShell(page);
+    await openUsageFromItem(page);
+    await usage.waitForListRequests(1);
+
+    const group = page.getByTestId(`usage-host-${serverId}`);
+    await expect(group.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
+    await expect(hostFilter(page)).toHaveCount(0);
+    await qaScreenshot(page, "usage-modal-one-host");
+    await expect(group.getByText("31%")).toBeVisible();
+    await expect(group.getByText("Beta plan", { exact: true })).toBeVisible();
+    await expect(group.getByText("Unavailable", { exact: true })).toBeVisible();
+
+    await group.getByTestId("usage-refresh").first().hover();
+    await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated 2h ago");
+    await expect(group.getByTestId("usage-freshness")).toHaveCount(0);
+  });
+
+  test("refreshes one report from its card", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const beta: UsageReportEntry = {
+      id: "beta:b",
+      account: {},
+      fetchedAt: twoHoursAgo(),
+      sourceId: "beta",
+      sourceLabel: "Beta plan",
+      report: {
+        status: "available",
+        windows: [{ id: "weekly", label: "Weekly", usedPct: 12 }],
+      },
+    };
+    const alpha = (usedPct: number, fetchedAt: string): UsageReportEntry => ({
+      id: "alpha:a",
+      account: {},
+      fetchedAt,
+      sourceId: "alpha",
+      sourceLabel: "Alpha plan",
+      report: {
+        status: "available",
+        windows: [{ id: "weekly", label: "Weekly", usedPct }],
+      },
+    });
+    // The sidebar summary and the modal each load reports; only a card's Refresh forces one.
+    const usage = await installUsageReportsFixture(page, {
+      lists: [
+        (request) =>
+          request.forceRefresh
+            ? [alpha(58, new Date().toISOString())]
+            : [alpha(31, twoHoursAgo()), beta],
+      ],
+    });
+
+    await gotoAppShell(page);
+    await openUsageFromItem(page);
+    const group = page.getByTestId(`usage-host-${serverId}`);
+    await expect(group.getByText("31%")).toBeVisible({ timeout: 10_000 });
+
+    const alphaRefresh = group.getByTestId("usage-refresh").first();
+    await alphaRefresh.click();
+    await expect
+      .poll(() => forcedRefreshes(usage))
+      .toEqual([{ forceRefresh: true, reportIds: ["alpha:a"] }]);
+    await expect(group.getByText("58%")).toBeVisible();
+    await expect(group.getByText("12%")).toBeVisible();
+
+    await group.getByTestId("usage-refresh").nth(1).hover();
+    await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated 2h ago");
+    await alphaRefresh.hover();
+    await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated just now");
+  });
+
+  test("shows the host once it connects after a cold load on a phone", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const usage = await installUsageReportsFixture(page, {
+      lists: [
+        [
+          {
+            id: "alpha:a",
+            account: {},
+            fetchedAt: twoHoursAgo(),
+            sourceId: "alpha",
+            sourceLabel: "Alpha plan",
+            report: { status: "available", windows: [] },
+          },
+        ],
+      ],
+    });
+
+    await page.setViewportSize({ width: 390, height: 844 });
+    await gotoAppShell(page);
+    await openCompactSidebar(page);
+    await openUsageFromIcon(page);
+    await usage.waitForListRequests(1);
+
+    const group = page.getByTestId(`usage-host-${serverId}`);
+    await expect(group.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
+    await expect(group.getByTestId("usage-freshness")).toHaveText("Updated 2h ago");
+  });
+
+  test("tells the user to update a host without usage support", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const usage = await installUsageReportsFixture(page, { usageSupported: false });
+
+    await gotoAppShell(page);
+    // Without reports the footer has no Usage item; its Usage icon opens Usage.
+    await openUsageFromIcon(page);
+
+    await expect(
+      page.getByTestId(`usage-host-${serverId}`).getByText(/^Update .+ to see usage$/),
+    ).toBeVisible({ timeout: 10_000 });
+    await qaScreenshot(page, "phase7-usage-update-host");
+    await expect(page.getByTestId("usage-options-menu")).toHaveCount(0);
+    await expect(page.getByTestId("usage-refresh-all")).toHaveCount(0);
+    expect(usage.listRequests()).toHaveLength(0);
+  });
+
+  test("a host picked in the Usage modal is the sidebar's host too, after a reload", async ({
+    page,
+  }) => {
+    test.setTimeout(420_000);
+    const primaryServerId = getServerId();
+    const secondary = await startIsolatedHostDaemon(
+      `srv_usage_${randomUUID().replaceAll("-", "").slice(0, 12)}`,
+    );
+    try {
+      await installUsageReportsFixture(page, { lists: [[weeklyReport("alpha", 31)]] });
+      await installUsageReportsFixture(page, {
+        port: secondary.port,
+        lists: [[weeklyReport("beta", 12)]],
+      });
+      await gotoAppShell(page);
+      await addConnectedHostAndReload(page, {
+        serverId: secondary.serverId,
+        label: "Secondary box",
+        port: secondary.port,
+      });
+
+      // Nothing picked and no workspace open: the first host.
+      await expectPinnedUsage(page, ["31% Weekly"]);
+      await openUsageFromItem(page);
+      await expect(page.getByTestId(`usage-host-${primaryServerId}`)).toBeVisible();
+
+      await hostFilter(page).click();
+      await page.getByTestId(`usage-host-filter-item-${secondary.serverId}`).click();
+      await expect(
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+      ).toBeVisible({ timeout: 30_000 });
+      await expect(hostFilter(page)).toContainText("Secondary box");
+      await qaScreenshot(page, "usage-modal-picked-host");
+      await expectPinnedUsage(page, ["12% Weekly"]);
+
+      // The e2e seed resets the host list on every load, so reopening re-adds the second host.
+      await addConnectedHostAndReload(page, {
+        serverId: secondary.serverId,
+        label: "Secondary box",
+        port: secondary.port,
+      });
+      await expectPinnedUsage(page, ["12% Weekly"]);
+      await openUsageFromItem(page);
+      await expect(
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+      ).toBeVisible({ timeout: 30_000 });
+    } finally {
+      await secondary.close().catch(() => undefined);
+    }
+  });
+});
+
+const loginWindows: UsageReportEntry["report"] = {
+  status: "available",
+  windows: [
+    { id: "five_hour", label: "Session", shortLabel: "5h", summary: true, usedPct: 31 },
+    { id: "weekly", label: "Weekly", shortLabel: "wk", summary: true, usedPct: 54 },
+  ],
+};
+
+test("expired login refreshes to windows with visible pin toggles", async ({ page }) => {
+  const fixture = await installLoginUsage({
+    status: "unavailable",
+    problem: {
+      kind: "expired",
+      expiresAt: new Date(Date.now() - 3_600_000).toISOString(),
+      refreshedBy: "claude",
+    },
+  });
+  try {
+    await gotoAppShell(page);
+    await openUsageFromIcon(page);
+    await expect(
+      page.getByText("Claude: Login expired 1h ago. Run claude to refresh it.", { exact: true }),
+    ).toBeVisible();
+    await expect(page.getByText("Unavailable", { exact: true })).toBeVisible();
+    await qaScreenshot(page, "usage-expired-login");
+    await fixture.setReport(loginWindows);
+    await refreshLoginUsage(page);
+    await expect(
+      page.getByText("Claude: Login expired 1h ago. Run claude to refresh it.", { exact: true }),
+    ).toHaveCount(0);
+    await expectPinnedUsage(page, ["31% 5h", "54% wk"]);
+    const row = page.getByRole("checkbox", { name: /^Pin Claude Weekly, / });
+    await expect(row).toBeChecked();
+    await expect(row.getByTestId("usage-pin-glyph-pinned")).toHaveCSS("opacity", "1");
+    await hoverUsageWindow(page, "Weekly");
+    await expect(page.getByText("Unpin", { exact: true })).toBeVisible();
+    await expect(row.getByTestId("usage-pin-glyph-pinned")).toHaveCSS("opacity", "1");
+    await expect(row.getByTestId("usage-pin-glyph-pinned").locator("svg")).not.toHaveAttribute(
+      "fill",
+      "none",
+    );
+    await qaScreenshot(page, "usage-pin-hover");
+    await togglePin(page.getByTestId("usage-report-login-journey:account"), "Claude", "Weekly");
+    await expect(row.getByTestId("usage-pin-glyph-unpinned")).toHaveCSS("opacity", "1");
+    await expect(row.getByTestId("usage-pin-glyph-unpinned").locator("svg")).toHaveAttribute(
+      "fill",
+      "none",
+    );
+    await hoverUsageWindow(page, "Weekly");
+    await expect(page.getByText("Pin", { exact: true })).toBeVisible();
+    await expectPinnedUsage(page, ["31% 5h"]);
+    await qaScreenshot(page, "usage-pin-unselected");
+    await togglePin(page.getByTestId("usage-report-login-journey:account"), "Claude", "Weekly");
+    await expect(row.getByTestId("usage-pin-glyph-pinned")).toHaveCSS("opacity", "1");
+    await expectPinnedUsage(page, ["31% 5h", "54% wk"]);
+  } finally {
+    await fixture.cleanup();
+  }
+});
+
+test("compact usage rows always show the pin glyph", async ({ page }) => {
+  const fixture = await installLoginUsage(loginWindows);
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await gotoAppShell(page);
+    await openCompactSidebar(page);
+    await openUsageFromIcon(page);
+    const card = page.getByTestId("usage-report-login-journey:account");
+    await expect(card.getByTestId("usage-pin-glyph-pinned")).toHaveCount(2);
+    await expect(card.getByTestId("usage-pin-glyph-pinned").nth(0)).toHaveCSS("opacity", "1");
+    await expect(card.getByTestId("usage-pin-glyph-pinned").nth(1)).toHaveCSS("opacity", "1");
+    await qaScreenshot(page, "usage-pin-compact");
+  } finally {
+    await fixture.cleanup();
+  }
+});
+
+for (const shape of ["seven-day-only", "Spark"] as const) {
+  test(`Codex ${shape} windows use provider durations on the card and sidebar`, async ({
+    page,
+  }) => {
+    const reset = Math.floor(Date.now() / 1000) + 5 * 86400;
+    const source = await installCodexWindowUsage({
+      rate_limit: {
+        primary_window: { used_percent: 11, limit_window_seconds: 604800, reset_at: reset },
+        secondary_window: null,
+      },
+      additional_rate_limits:
+        shape === "Spark"
+          ? [
+              {
+                limit_name: "GPT-5.3-Codex-Spark",
+                metered_feature: "codex_bengalfox",
+                rate_limit: {
+                  primary_window: {
+                    used_percent: 0,
+                    limit_window_seconds: 18000,
+                    reset_at: Math.floor(Date.now() / 1000) + 3600,
+                  },
+                  secondary_window: {
+                    used_percent: 0,
+                    limit_window_seconds: 604800,
+                    reset_at: reset,
+                  },
+                },
+              },
+            ]
+          : [],
+    });
+    try {
+      await page.setViewportSize({ width: 1440, height: 900 });
+      await gotoAppShell(page);
+      await expect(usageItem(page)).toBeVisible();
+      await openUsageFromItem(page);
+      await qaScreenshot(page, `codex-${shape}-card-and-summary`);
+      await expectCodexReportedWindows(page, shape);
+      await qaScreenshot(page, `codex-${shape}-pins`);
+    } finally {
+      await source.cleanup();
+    }
+  });
+}
+
+for (const theme of ["light", "dark"] as const) {
+  for (const [size, viewport] of Object.entries({
+    desktop: { width: 1440, height: 900 },
+    compact: { width: 390, height: 844 },
+  })) {
+    test(`Usage Settings cog ${size} ${theme}`, async ({ page }, testInfo) => {
+      test.setTimeout(120_000);
+      await page.addInitScript((value) => {
+        const key = "@paseo:app-settings";
+        const current = JSON.parse(localStorage.getItem(key) ?? "{}");
+        localStorage.setItem(key, JSON.stringify({ ...current, theme: value }));
+      }, theme);
+      const usage = await installUsageReportsFixture(page, {
+        lists: [() => claudeAndCodexReports()],
+      });
+      await page.setViewportSize(viewport);
+      await gotoAppShell(page);
+      if (size === "compact") await openCompactSidebar(page);
+      await openUsageFromIcon(page);
+      const screen = page.getByTestId(`usage-host-${getServerId()}`);
+      await expect(screen.getByText("Claude", { exact: true })).toBeVisible({ timeout: 30_000 });
+      const settings = page.getByTestId("usage-options-menu");
+      await expect(settings).toHaveAccessibleName("Settings");
+      await expect(page.getByTestId("usage-display-used")).toHaveCount(0);
+      await captureSettingsState(page, testInfo, `${size}-${theme}-cog`);
+
+      await openUsageOptions(page);
+      await expectUsageOptionsFitContent(page);
+      await expect(page.getByText("Pinned windows show in the sidebar footer")).toBeVisible();
+      await expect(page.getByTestId("usage-display-used")).toHaveAttribute("aria-selected", "true");
+      await captureSettingsState(page, testInfo, `${size}-${theme}-settings`);
+      await showUsageAs(page, "remaining");
+      await expect(screen.getByText("69% left")).toBeVisible();
+      await showUsageAs(page, "used");
+      await expect(pinRow(screen, "Claude", "Session")).toHaveAccessibleName(
+        /^Pin Claude Session, 31% · resets /,
+      );
+      await openUsageOptions(page);
+      await closeUsageOptions(page);
+      await refreshAllUsage(page);
+      await expect.poll(() => forcedRefreshes(usage)).toEqual([{ forceRefresh: true }]);
+    });
+  }
+}
+
+async function captureSettingsState(
+  page: Page,
+  testInfo: import("@playwright/test").TestInfo,
+  name: string,
+) {
+  await qaScreenshot(page, name);
+  await testInfo.attach(name, { body: await page.screenshot(), contentType: "image/png" });
+}
+
+test("an account with all logins failing shows each harness and remedy, then only usage when one succeeds", async ({
+  page,
+}) => {
+  const fixture = await installLoginUsage([
+    { harness: "Codex", report: { status: "error", error: "Usage API returned 500. Try again." } },
+    {
+      harness: "OpenCode",
+      report: {
+        status: "unavailable",
+        problem: { kind: "rejected", status: 401, refreshedBy: "opencode" },
+      },
+    },
+    {
+      harness: "Pi",
+      report: { status: "unavailable", problem: { kind: "no_quota", detail: "No active plan" } },
+    },
+    {
+      harness: "OMP",
+      report: {
+        status: "unavailable",
+        problem: { kind: "rejected", status: 403, refreshedBy: "omp" },
+      },
+    },
+  ]);
+  try {
+    await gotoAppShell(page);
+    await openUsageFromIcon(page);
+    await expectLoginErrors(page, [
+      "Codex: Usage API returned 500. Try again.",
+      "OpenCode: Login rejected (HTTP 401). Run opencode to refresh it.",
+      "Pi: No active plan",
+      "OMP: Login rejected (HTTP 403). Run omp to refresh it.",
+    ]);
+    await fixture.setReport([
+      {
+        harness: "Codex",
+        report: { status: "error", error: "Usage API returned 500. Try again." },
+      },
+      {
+        harness: "OpenCode",
+        report: { status: "available", windows: [{ id: "weekly", label: "Weekly", usedPct: 42 }] },
+      },
+    ]);
+    await refreshLoginUsage(page);
+    await expectLoginUsageOnly(page, "42%");
+  } finally {
+    await fixture.cleanup();
+  }
+});
+
+async function expectLoginErrors(page: Page, lines: string[]) {
+  const card = page.getByTestId("usage-report-login-journey:account");
+  await expect(card.getByTestId("usage-login-error")).toHaveText(lines.join("\n"));
+}
+
+async function expectLoginUsageOnly(page: Page, percentage: string) {
+  const card = page.getByTestId("usage-report-login-journey:account");
+  await expect(card.getByText(percentage, { exact: true })).toBeVisible();
+  await expect(card.getByTestId("usage-login-error")).toHaveCount(0);
+}
diff --git a/packages/app/e2e/browser/usage-settings.spec.ts b/packages/app/e2e/browser/usage-settings.spec.ts
new file mode 100644
index 0000000000..1b509f5640
--- /dev/null
+++ b/packages/app/e2e/browser/usage-settings.spec.ts
@@ -0,0 +1,156 @@
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getServerId } from "../support/helpers/server-id";
+import { openSettingsHostSection } from "../support/helpers/settings";
+import {
+  installUsageReportsFixture,
+  type UsageReportsFixture,
+} from "../support/helpers/usage-reports";
+import {
+  openUsageFromIcon,
+  refreshAllUsage,
+  showUsageAs,
+} from "../support/helpers/usage-sidebar-item";
+
+const ICON = '<svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="8" fill="currentColor"/></svg>';
+
+function forcedRefreshCount(usage: UsageReportsFixture): number {
+  return usage.listRequests().filter((request) => request.forceRefresh).length;
+}
+
+function report(input: {
+  sourceId: string;
+  sourceLabel: string;
+  report:
+    | Partial<Extract<UsageReportEntry["report"], { status: "available" }>>
+    | Exclude<UsageReportEntry["report"], { status: "available" }>;
+}): UsageReportEntry {
+  return {
+    id: `${input.sourceId}:account`,
+    account: { label: input.sourceId === "alpha" ? "dev@example.com" : undefined },
+    fetchedAt: "2026-01-01T00:00:00.000Z",
+    sourceId: input.sourceId,
+    sourceLabel: input.sourceLabel,
+    icon: ICON,
+    report:
+      input.report.status === "error" || input.report.status === "unavailable"
+        ? input.report
+        : {
+            status: "available",
+            windows: [],
+            ...input.report,
+          },
+  };
+}
+
+test.describe("usage settings", () => {
+  test("renders every report returned by usage.list_reports", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const usage = await installUsageReportsFixture(page, {
+      lists: [
+        [
+          report({
+            sourceId: "alpha",
+            sourceLabel: "Alpha plan",
+            report: {
+              planLabel: "Max",
+              windows: [{ id: "session", label: "Session", usedPct: 7 }],
+            },
+          }),
+          report({
+            sourceId: "beta",
+            sourceLabel: "Beta plan",
+            report: {
+              planLabel: "Coding plan",
+              windows: [
+                { id: "biweekly", label: "Biweekly", usedPct: 23 },
+                { id: "daily", label: "Daily", remainingPct: 30 },
+              ],
+              balances: [
+                { id: "credits", label: "Credits", remaining: 1234, unit: "credits" },
+                { id: "extra", label: "Extra usage", used: 5, limit: 20, unit: "usd" },
+              ],
+              details: [{ id: "valid", label: "Valid until", value: "2026-12-31" }],
+            },
+          }),
+          report({
+            sourceId: "gamma",
+            sourceLabel: "Gamma plan",
+            report: { status: "error", error: "Gamma auth expired" },
+          }),
+        ],
+      ],
+    });
+
+    await gotoAppShell(page);
+    await openSettings(page);
+    await openSettingsHostSection(page, serverId, "usage");
+    await usage.waitForListRequests(1);
+
+    const card = page.getByTestId("usage-card");
+    await expect(card.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
+    await expect(card.getByText("dev@example.com", { exact: true })).toBeVisible();
+    await expect(card.getByText("Beta plan", { exact: true })).toBeVisible();
+    await expect(card.getByText("70%")).toBeVisible();
+    await expect(card.getByText("1,234 left", { exact: true })).toBeVisible();
+    await expect(card.getByText("$5.00 / $20.00", { exact: true })).toBeVisible();
+    await expect(card.getByText("2026-12-31", { exact: true })).toBeVisible();
+    await expect(card.getByText("Gamma auth expired", { exact: true })).toBeVisible();
+
+    // The shared percentages setting applies to the host section.
+    await expect(page.getByTestId("usage-options-menu")).toBeVisible();
+    const hostUsageUrl = page.url();
+    await gotoAppShell(page);
+    await openUsageFromIcon(page);
+    await showUsageAs(page, "remaining");
+    await page.goto(hostUsageUrl);
+    await expect(card.getByText("30% left")).toBeVisible();
+    await expect(card.getByText("93% left")).toBeVisible();
+  });
+
+  test("refresh forces a fresh report", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const windows = (usedPct: number) => [{ id: "w", label: "Weekly", usedPct }];
+    // The sidebar summary and the section each load reports; only Refresh forces one.
+    const usage = await installUsageReportsFixture(page, {
+      lists: [
+        (request) => [
+          report({
+            sourceId: "alpha",
+            sourceLabel: "Alpha plan",
+            report: { windows: windows(request.forceRefresh ? 64 : 23) },
+          }),
+        ],
+      ],
+    });
+
+    await gotoAppShell(page);
+    await openSettings(page);
+    await openSettingsHostSection(page, serverId, "usage");
+    const card = page.getByTestId("usage-card");
+    await expect(card.getByText("23%")).toBeVisible({ timeout: 10_000 });
+
+    await refreshAllUsage(page);
+    await expect.poll(() => forcedRefreshCount(usage)).toBe(1);
+    await expect(card.getByText("64%")).toBeVisible();
+  });
+
+  test("asks to update a host without usage support and never calls it", async ({ page }) => {
+    test.setTimeout(120_000);
+    const serverId = getServerId();
+    const usage = await installUsageReportsFixture(page, { usageSupported: false });
+
+    await gotoAppShell(page);
+    await openSettings(page);
+    await openSettingsHostSection(page, serverId, "usage");
+
+    await expect(
+      // Names the host: "Update Laptop to see usage".
+      page.getByTestId("usage-card").getByText(/^Update (?!the host ).+ to see usage$/),
+    ).toBeVisible({ timeout: 10_000 });
+    expect(usage.listRequests()).toHaveLength(0);
+  });
+});
diff --git a/packages/app/e2e/browser/usage-sidebar-item.spec.ts b/packages/app/e2e/browser/usage-sidebar-item.spec.ts
new file mode 100644
index 0000000000..fb738b3cb5
--- /dev/null
+++ b/packages/app/e2e/browser/usage-sidebar-item.spec.ts
@@ -0,0 +1,441 @@
+import path from "node:path";
+import type { Locator, Page } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { gotoWorkspace, waitForTabBar } from "../support/helpers/launcher";
+import {
+  connectNewWorkspaceDaemonClient,
+  openProjectViaDaemon,
+} from "../support/helpers/new-workspace";
+import { getServerId } from "../support/helpers/server-id";
+import { openSettingsHostSection } from "../support/helpers/settings";
+import {
+  expectFooterItemSetting,
+  expectFooterSeparator,
+  leaveSettings,
+  openSidebarNavSettings,
+  setFooterItemVisible,
+} from "../support/helpers/sidebar-nav-settings";
+import { installUsageReportsFixture } from "../support/helpers/usage-reports";
+import {
+  claudeAndCodexReports,
+  closeUsage,
+  closeUsageFromBackdrop,
+  closeUsageOptions,
+  expectNoUsageItem,
+  expectPinnedUsage,
+  expectSummaryInSidebar,
+  expectUnpinnableRows,
+  openCompactSidebar,
+  openUsageFromIcon,
+  openUsageFromItem,
+  pinRow,
+  scrollUsage,
+  setSummaryInSidebar,
+  openUsageOptions,
+  showUsageAs,
+  togglePin,
+  usageItem,
+  usageModal,
+  installTallUsageSource,
+} from "../support/helpers/usage-sidebar-item";
+import { seedSidebarFooterPreferences } from "../support/helpers/sidebar-nav-settings";
+import { waitForSettledPosition } from "../support/helpers/sheet-layout";
+import { createTempGitRepo } from "../support/helpers/workspace";
+
+const WIDE = { width: 1440, height: 900 };
+const COMPACT = { width: 390, height: 844 };
+
+type ScreenshotArea = { kind: "page" } | { kind: "footer" } | { kind: "element"; locator: Locator };
+
+/** Set PASEO_QA_SCREENSHOT_DIR to keep QA screenshots of each state. */
+async function qaScreenshot(page: Page, name: string, area: ScreenshotArea = { kind: "page" }) {
+  const directory = process.env.PASEO_QA_SCREENSHOT_DIR;
+  if (!directory) return;
+  // Let sheet and drawer animations settle so the image shows the final state.
+  await page.waitForTimeout(600);
+  // Expo's fast-refresh indicator sits over the footer's Hosts icon.
+  await page.addStyleTag({ content: ".__expo_fast_refresh { display: none !important; }" });
+  const file = path.join(directory, `${name}.png`);
+  if (area.kind === "element") {
+    await area.locator.screenshot({ path: file });
+    return;
+  }
+  const clip = area.kind === "footer" ? await footerClip(page) : undefined;
+  await page.screenshot({ path: file, clip });
+}
+
+/** Includes summary rows above the fixed icon row. */
+async function footerClip(page: Page) {
+  return (await page.locator('[data-testid="sidebar-footer"]:visible').boundingBox())!;
+}
+
+test.describe("Usage item", () => {
+  test("both compact footer entry points open Usage as a sheet", async ({ page }) => {
+    await page.setViewportSize(COMPACT);
+    await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+    await seedSidebarFooterPreferences(page, [{ key: "usage", visible: false }]);
+    await gotoAppShell(page);
+    await openCompactSidebar(page);
+    const startingUrl = page.url();
+    await expectNoUsageItem(page);
+
+    await test.step("the icon opens a sheet without leaving the current screen", async () => {
+      await openUsageFromIcon(page);
+      await expect(usageModal(page).getByText("Claude", { exact: true })).toBeVisible();
+      await expect(page).toHaveURL(startingUrl);
+      await qaScreenshot(page, "compact-usage-icon-sheet");
+      await setSummaryInSidebar(page, true);
+      await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+      await closeUsageFromBackdrop(page);
+    });
+
+    await test.step("the summary opens the same sheet", async () => {
+      await openUsageFromItem(page);
+      await expect(usageModal(page).getByText("Codex", { exact: true })).toBeVisible();
+      await expect(page).toHaveURL(startingUrl);
+      await qaScreenshot(page, "compact-usage-summary-sheet");
+      await closeUsageFromBackdrop(page);
+    });
+  });
+
+  test("on desktop Usage opens as a dialog over the workspace and closes back to it", async ({
+    page,
+  }) => {
+    const repo = await createTempGitRepo("usage-modal-");
+    const client = await connectNewWorkspaceDaemonClient();
+    try {
+      const project = await openProjectViaDaemon(client, repo.path);
+      await page.setViewportSize(WIDE);
+      await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+      await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+      await gotoWorkspace(page, project.workspaceId);
+      const workspaceUrl = page.url();
+
+      await test.step("the summary opens a dialog over the workspace", async () => {
+        await openUsageFromItem(page);
+        const dialog = page.getByRole("dialog");
+        await expect(dialog.getByText("Claude", { exact: true })).toBeVisible();
+        await expect(
+          dialog.getByRole("button", { name: "Refresh all", exact: true }),
+        ).toBeVisible();
+        await expect(page).toHaveURL(workspaceUrl);
+        await qaScreenshot(page, "desktop-usage-dialog");
+      });
+
+      await test.step("Close returns to the same workspace", async () => {
+        await closeUsage(page);
+        await expect(page).toHaveURL(workspaceUrl);
+        await waitForTabBar(page);
+      });
+
+      await test.step("the icon opens it again, and Escape closes it", async () => {
+        await openUsageFromIcon(page);
+        await page.keyboard.press("Escape");
+        await expect(usageModal(page)).toHaveCount(0);
+        await expect(page).toHaveURL(workspaceUrl);
+      });
+    } finally {
+      await client.close().catch(() => undefined);
+      await repo.cleanup().catch(() => undefined);
+    }
+  });
+
+  const layouts = {
+    desktop: { viewport: WIDE, showSidebar: async (_page: Page) => {} },
+    compact: { viewport: COMPACT, showSidebar: openCompactSidebar },
+  };
+  for (const [size, { viewport, showSidebar }] of Object.entries(layouts)) {
+    test(`long usage reports scroll to the final window on ${size}`, async ({ page }) => {
+      test.setTimeout(120_000);
+      const source = await installTallUsageSource();
+      try {
+        await page.setViewportSize(viewport);
+        await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+        await gotoAppShell(page);
+        await showSidebar(page);
+        await expect(usageItem(page)).toBeInViewport();
+        await openUsageFromItem(page);
+        const content = usageModal(page);
+        await expect(content.getByText("Window 20", { exact: true })).toHaveCount(1);
+        await waitForSettledPosition(content);
+        await expect(content.getByText("Window 20", { exact: true })).not.toBeInViewport();
+        await qaScreenshot(page, `${size}-usage-scroll-top`);
+        await scrollUsage(page, 5_000);
+        await expect(content.getByText("Window 20", { exact: true })).toBeInViewport();
+        await qaScreenshot(page, `${size}-usage-scroll-bottom`);
+        await scrollUsage(page, -5_000);
+        await expect(content.getByText("Window 20", { exact: true })).not.toBeInViewport();
+      } finally {
+        await source.cleanup();
+      }
+    });
+  }
+  test("pinned windows show in the sidebar, follow the used/remaining toggle and persist", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+    const serverId = getServerId();
+    await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+    await page.setViewportSize(WIDE);
+    await gotoAppShell(page);
+    const screen = page.getByTestId(`usage-host-${serverId}`);
+
+    await test.step("a fresh device shows default windows once the Usage item is on", async () => {
+      // The Usage item starts off on every layout; turning it on stores the choice.
+      await expectNoUsageItem(page);
+      await openSidebarNavSettings(page);
+      await expectFooterItemSetting(page, "usage", false);
+      await setFooterItemVisible(page, "usage", true);
+      await qaScreenshot(page, "desktop-settings-sidebar-footer");
+      await page.setViewportSize(COMPACT);
+      await expectFooterItemSetting(page, "usage", true);
+      await qaScreenshot(page, "compact-settings-sidebar-footer");
+      await gotoAppShell(page);
+      await openCompactSidebar(page);
+      await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+      await qaScreenshot(page, "compact-footer-defaults");
+      await page.setViewportSize(WIDE);
+      await gotoAppShell(page);
+      await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+      await qaScreenshot(page, "desktop-footer-defaults", { kind: "footer" });
+      await openUsageFromItem(page);
+      await qaScreenshot(page, "default-pins-card");
+      await expect(pinRow(screen, "Claude", "Session")).toBeChecked();
+      await expect(pinRow(screen, "Claude", "Weekly")).toBeChecked();
+      await expect(pinRow(screen, "Codex", "Session")).toBeChecked();
+      await expect(pinRow(screen, "Codex", "Weekly")).toBeChecked();
+    });
+
+    await test.step("pinning Claude 5-hour and Codex weekly shows both in the Usage item", async () => {
+      await expect(screen.getByText("Claude", { exact: true })).toBeVisible({ timeout: 10_000 });
+      // One host: no host filter, as on History.
+      await expect(page.locator('[data-testid="usage-host-filter-trigger"]:visible')).toHaveCount(
+        0,
+      );
+      await togglePin(screen, "Claude", "Weekly");
+      await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
+      await expect(pinRow(screen, "Claude", "Session")).toBeChecked();
+      await expect(pinRow(screen, "Codex", "Session")).toBeChecked();
+      await expect(pinRow(screen, "Codex", "Weekly")).toBeChecked();
+      await qaScreenshot(page, "default-pins-after-one-toggle");
+      await togglePin(screen, "Codex", "Session");
+      await expectPinnedUsage(page, ["31% 5h", "12% wk"]);
+      await expect(usageItem(page)).not.toHaveText("Usage");
+      await qaScreenshot(page, "desktop-footer-pins", { kind: "footer" });
+      await expect(page.getByRole("button", { name: "Refresh all", exact: true })).toBeVisible();
+      await qaScreenshot(page, "usage-card-refresh", {
+        kind: "element",
+        locator: screen.getByTestId("usage-report-claude:default"),
+      });
+    });
+
+    await test.step("remaining flips the Usage item and the Usage modal", async () => {
+      await showUsageAs(page, "remaining");
+      await expectPinnedUsage(page, ["69% 5h", "88% wk"]);
+      await expect(usageItem(page)).toHaveAccessibleName(/Claude .*69% left, Codex .*88% left/);
+      await expect(
+        screen.getByTestId("usage-report-claude:default").getByText("69% left"),
+      ).toBeVisible();
+      await expect(
+        screen.getByTestId("usage-report-codex:default").getByText("88% left"),
+      ).toBeVisible();
+    });
+
+    await test.step("on a phone the Usage item opens a bottom sheet", async () => {
+      await closeUsage(page);
+      await page.setViewportSize(COMPACT);
+      await openCompactSidebar(page);
+      await expect(usageItem(page)).toBeInViewport();
+      await expectPinnedUsage(page, ["69% 5h", "88% wk"]);
+      await qaScreenshot(page, "compact-footer");
+      await openUsageFromItem(page);
+      const sheet = usageModal(page);
+      await expect(sheet.getByText("Codex", { exact: true })).toBeInViewport();
+      await expect(sheet.getByText("88% left")).toBeVisible();
+      await expect(pinRow(sheet, "Claude", "Session")).toBeChecked();
+      await expect(pinRow(sheet, "Claude", "Weekly")).not.toBeChecked();
+      // The row reads its window, percent and reset; the checkbox state says it is pinned.
+      await expect(pinRow(sheet, "Claude", "Session")).toHaveAccessibleName(
+        /^Pin Claude Session, \d+% left( · .+)?$/,
+      );
+      // Settings opens a second sheet; closing it restores the Usage sheet underneath.
+      await expect(page.locator('[data-testid="usage-options-menu"]:visible')).toBeVisible();
+      await expect(page.locator('[data-testid="usage-refresh-all"]:visible')).toBeVisible();
+      await openUsageOptions(page);
+      await expect(page.getByTestId("usage-display-remaining")).toHaveAttribute(
+        "aria-selected",
+        "true",
+      );
+      await qaScreenshot(page, "compact-settings-expanded");
+      await closeUsageOptions(page);
+      await expect(sheet.getByTestId("usage-display-used")).toHaveCount(0);
+      await expect(sheet).toBeVisible();
+      await waitForSettledPosition(sheet);
+      const sheetBox = (await sheet.boundingBox())!;
+      // The sheet leaves the screen above it as its backdrop.
+      expect(sheetBox.y).toBeGreaterThanOrEqual(COMPACT.height * 0.2);
+      expect(sheetBox.width).toBeGreaterThan(COMPACT.width * 0.8);
+      await qaScreenshot(page, "compact-sheet");
+      await closeUsageFromBackdrop(page);
+      await page.setViewportSize(WIDE);
+    });
+
+    await test.step("a reload keeps the pins and the toggle", async () => {
+      await page.reload();
+      await expectPinnedUsage(page, ["69% 5h", "88% wk"]);
+      await openUsageFromItem(page);
+      await openUsageOptions(page);
+      await expect(page.getByTestId("usage-display-remaining")).toHaveAttribute(
+        "aria-selected",
+        "true",
+      );
+      await qaScreenshot(page, "usage-settings-expanded");
+      await closeUsageOptions(page);
+    });
+
+    await test.step("the Settings usage section shares the pins and the toggle", async () => {
+      const workspaceUrl = page.url();
+      await closeUsage(page);
+      await openSettings(page);
+      await openSettingsHostSection(page, serverId, "usage");
+      const section = page.getByTestId("usage-card");
+      await expect(section.getByText("69% left")).toBeVisible({ timeout: 10_000 });
+      await expect(pinRow(section, "Codex", "Weekly")).toBeChecked();
+      await page.goto(workspaceUrl);
+      await openUsageFromItem(page);
+      await expect(screen.getByText("Claude", { exact: true })).toBeVisible({ timeout: 10_000 });
+    });
+
+    await test.step("unpinning everything stays empty after a reload", async () => {
+      await togglePin(screen, "Claude", "Session");
+      await togglePin(screen, "Codex", "Weekly");
+      await expectNoUsageItem(page);
+      await page.reload();
+      await openUsageFromIcon(page);
+      await expect(screen.getByText("88% left")).toBeVisible({ timeout: 10_000 });
+      await expectNoUsageItem(page);
+      await expect(pinRow(screen, "Claude", "Session")).not.toBeChecked();
+      await expect(pinRow(screen, "Claude", "Weekly")).not.toBeChecked();
+      await expect(pinRow(screen, "Codex", "Session")).not.toBeChecked();
+      await expect(pinRow(screen, "Codex", "Weekly")).not.toBeChecked();
+      await qaScreenshot(page, "explicit-empty-pins-after-reload");
+      await closeUsage(page);
+    });
+
+    await test.step("Settings > Sidebar lists the Usage item", async () => {
+      await openSidebarNavSettings(page);
+      const footer = page.getByTestId("sidebar-nav-section-footer");
+      await expect(
+        footer.getByTestId("sidebar-nav-item-usage").getByText("Usage", { exact: true }),
+      ).toBeVisible();
+      await qaScreenshot(page, "settings-sidebar-footer", { kind: "element", locator: footer });
+      await leaveSettings(page);
+    });
+  });
+});
+
+test("without summary data the footer drops the Usage item and keeps the Usage icon", async ({
+  page,
+}) => {
+  await installUsageReportsFixture(page, {
+    lists: [
+      [
+        {
+          id: "alpha:a",
+          account: {},
+          fetchedAt: new Date().toISOString(),
+          sourceId: "alpha",
+          sourceLabel: "Alpha plan",
+          report: {
+            status: "unavailable",
+            problem: { kind: "no_quota", detail: "No active coding plan" },
+          },
+        },
+      ],
+    ],
+  });
+  await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+  await page.setViewportSize(WIDE);
+  await gotoAppShell(page);
+  await expect(page.locator('[data-testid="sidebar-usage-icon"]:visible')).toBeVisible({
+    timeout: 30_000,
+  });
+  await expectNoUsageItem(page);
+  await expectFooterSeparator(page, false);
+  await qaScreenshot(page, "desktop-footer-no-summary", { kind: "footer" });
+  await openUsageFromIcon(page);
+});
+
+test("the Usage Settings switch turns on the sidebar summary and the pins with it", async ({
+  page,
+}) => {
+  const serverId = getServerId();
+  await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
+  await page.setViewportSize(WIDE);
+  await gotoAppShell(page);
+  const screen = page.getByTestId(`usage-host-${serverId}`);
+  const claude = screen.getByTestId("usage-report-claude:default");
+
+  await test.step("off by default: no Usage item, and rows that do not pin", async () => {
+    await openUsageFromIcon(page);
+    await expectNoUsageItem(page);
+    await expect(claude.getByText("Session", { exact: true })).toBeVisible({ timeout: 10_000 });
+    await expectUnpinnableRows(claude);
+    await expectUnpinnableRows(screen.getByTestId("usage-report-codex:default"));
+    await expectSummaryInSidebar(page, false);
+    await qaScreenshot(page, "usage-summary-off");
+  });
+
+  await test.step("on: the Usage item and the pins appear", async () => {
+    await setSummaryInSidebar(page, true);
+    await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+    await expect(pinRow(screen, "Claude", "Weekly")).toBeChecked();
+    await togglePin(screen, "Claude", "Weekly");
+    await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
+    await qaScreenshot(page, "usage-summary-on");
+  });
+
+  await test.step("off then on again, after a reload, brings back the saved pins", async () => {
+    await setSummaryInSidebar(page, false);
+    await expectNoUsageItem(page);
+    await expectUnpinnableRows(claude);
+    await page.reload();
+    await openUsageFromIcon(page);
+    await expectSummaryInSidebar(page, false);
+    await expect(claude.getByText("Session", { exact: true })).toBeVisible({ timeout: 10_000 });
+    await expectUnpinnableRows(claude);
+    await setSummaryInSidebar(page, true);
+    await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
+    await expect(pinRow(screen, "Claude", "Session")).toBeChecked();
+    await expect(pinRow(screen, "Claude", "Weekly")).not.toBeChecked();
+  });
+});
+
+test("released hosts supply source logos through the client conversion", async ({ page }) => {
+  await installUsageReportsFixture(page, {
+    lists: [() => claudeAndCodexReports()],
+    providerUsageListOnly: true,
+  });
+  await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
+  await page.setViewportSize(WIDE);
+  await gotoAppShell(page);
+  await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
+  // Source logos are decorative SVGs with no accessible role. Their path data distinguishes
+  // the source artwork from the fallback gauge.
+  const claudePath = /<path[^>]* d="([^"]+)"/.exec(claudeAndCodexReports()[0]!.icon!)![1]!;
+  const codexPath = /<path[^>]* d="([^"]+)"/.exec(claudeAndCodexReports()[1]!.icon!)![1]!;
+  const summary = usageItem(page).getByTestId("sidebar-usage-source");
+  await expect(summary.nth(0).locator("svg path").first()).toHaveAttribute("d", claudePath);
+  await expect(summary.nth(1).locator("svg path").first()).toHaveAttribute("d", codexPath);
+  await qaScreenshot(page, "released-host-footer", { kind: "footer" });
+  await openUsageFromItem(page);
+  const screen = page.getByTestId(`usage-host-${getServerId()}`);
+  await expect(
+    screen.getByTestId("usage-report-claude").locator("svg path").first(),
+  ).toHaveAttribute("d", claudePath);
+  await expect(
+    screen.getByTestId("usage-report-codex").locator("svg path").first(),
+  ).toHaveAttribute("d", codexPath);
+  await qaScreenshot(page, "released-host-usage-modal");
+});
diff --git a/packages/app/e2e/browser/user-message-contract.ui-contract.spec.ts b/packages/app/e2e/browser/user-message-contract.ui-contract.spec.ts
deleted file mode 100644
index 55a4df4ba2..0000000000
--- a/packages/app/e2e/browser/user-message-contract.ui-contract.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { expect, test, type Page } from "../support/fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-import {
-  composerLocator,
-  expectComposerEditable,
-  expectComposerVisible,
-  fillComposerDraft,
-  submitMessage,
-} from "../support/helpers/composer";
-
-async function expectUserMessageCount(page: Page, expected: number): Promise<void> {
-  await expect(page.getByTestId("user-message")).toHaveCount(expected, { timeout: 15_000 });
-}
-
-async function expectIdleComposer(page: Page): Promise<void> {
-  await expectComposerEditable(page);
-  await expect(page.getByRole("button", { name: /stop|cancel/i })).toHaveCount(0, {
-    timeout: 15_000,
-  });
-}
-
-async function expectNoLoadingRegressionAfterIdle(page: Page): Promise<void> {
-  await expectIdleComposer(page);
-  await page.waitForTimeout(1_000);
-  await expectIdleComposer(page);
-}
-
-test.describe("User message UI contract", () => {
-  test("dedupes mock provider user_message echoes across multi-turn sends", async ({ page }) => {
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "user-message-contract-e2e-",
-      title: "User message contract e2e",
-    });
-    const prompts = [
-      "emit 1 coalesced agent stream updates for user message contract turn one.",
-      "emit 1 coalesced agent stream updates for user message contract turn two.",
-      "emit 1 coalesced agent stream updates for user message contract turn three.",
-    ];
-
-    try {
-      await openAgentRoute(page, session);
-      await expectComposerVisible(page);
-
-      for (let index = 0; index < prompts.length; index += 1) {
-        const prompt = prompts[index]!;
-        await submitMessage(page, prompt);
-        await expect(page.getByText(prompt, { exact: true })).toBeVisible({ timeout: 15_000 });
-        await expect(page.getByText("stress-update-0", { exact: true }).first()).toBeVisible({
-          timeout: 15_000,
-        });
-        await expectUserMessageCount(page, index + 1);
-        await expectNoLoadingRegressionAfterIdle(page);
-      }
-
-      await fillComposerDraft(page, "append");
-      await composerLocator(page).evaluate((element) => element.blur());
-      await expectUserMessageCount(page, 3);
-      await expectIdleComposer(page);
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
diff --git a/packages/app/e2e/browser/viewed-agent-timelines.spec.ts b/packages/app/e2e/browser/viewed-agent-timelines.spec.ts
index 4a0d2755d6..5ef70cca61 100644
--- a/packages/app/e2e/browser/viewed-agent-timelines.spec.ts
+++ b/packages/app/e2e/browser/viewed-agent-timelines.spec.ts
@@ -5,6 +5,7 @@ import { seedWorkspace, type SeedDaemonClient } from "../support/helpers/seed-cl
 import { getServerId } from "../support/helpers/server-id";
 import { observeTimelineSubscriptions } from "../support/helpers/timeline-delivery";
 import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { selectWorkspaceInSidebar } from "../support/helpers/sidebar";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
 import {
@@ -20,6 +21,7 @@ import {
 interface ViewedTimelineScenario {
   client: SeedDaemonClient;
   workspaceId: string;
+  repoPath: string;
   firstAgentId: string;
   secondAgentId: string;
   cleanup(): Promise<void>;
@@ -45,14 +47,70 @@ async function seedViewedTimelineScenario(
   return {
     client: workspace.client,
     workspaceId: workspace.workspaceId,
+    repoPath: workspace.repoPath,
     firstAgentId: firstAgent.id,
     secondAgentId: secondAgent.id,
     cleanup: workspace.cleanup,
   };
 }
 
-async function openAgent(page: Page, scenario: ViewedTimelineScenario, agentId: string) {
-  await page.goto(buildHostAgentDetailRoute(getServerId(), agentId, scenario.workspaceId));
+interface RestoredLayoutChat {
+  workspaceId: string;
+  agentId: string;
+  title: string;
+}
+
+interface RestoredLayoutScenario {
+  chats: RestoredLayoutChat[];
+  cleanup(): Promise<void>;
+}
+
+/**
+ * Two workspaces with two chats each. Opening all four leaves the persisted workspace layout
+ * holding a tab per chat, which is the state a relaunch restores into.
+ */
+async function seedRestoredLayoutScenario(): Promise<RestoredLayoutScenario> {
+  const workspaces = await Promise.all([
+    seedWorkspace({ repoPrefix: "restored-layout-first-" }),
+    seedWorkspace({ repoPrefix: "restored-layout-second-" }),
+  ]);
+  try {
+    const chats = await Promise.all(
+      workspaces.flatMap((workspace, workspaceIndex) =>
+        [1, 2].map(async (chatIndex): Promise<RestoredLayoutChat> => {
+          const title = `Restored chat ${workspaceIndex + 1}-${chatIndex}`;
+          const agent = await workspace.client.createAgent({
+            provider: "mock",
+            cwd: workspace.repoPath,
+            workspaceId: workspace.workspaceId,
+            title,
+            modeId: "load-test",
+            model: "ten-second-stream",
+          });
+          return { workspaceId: workspace.workspaceId, agentId: agent.id, title };
+        }),
+      ),
+    );
+    return {
+      chats,
+      cleanup: async () => {
+        for (const workspace of workspaces) await workspace.cleanup();
+      },
+    };
+  } catch (error) {
+    for (const workspace of workspaces) await workspace.cleanup().catch(() => undefined);
+    throw error;
+  }
+}
+
+async function openAgent(
+  page: Page,
+  scenario: { workspaceId: string },
+  agentId: string,
+  options: { recordRenders?: boolean } = {},
+) {
+  const route = buildHostAgentDetailRoute(getServerId(), agentId, scenario.workspaceId);
+  await page.goto(options.recordRenders ? `${route}&renderProfile=1` : route);
   await page.waitForURL(
     (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
   );
@@ -63,6 +121,62 @@ async function selectAgent(page: Page, title: string) {
   await page.getByRole("button", { name: title, exact: true }).click();
 }
 
+async function expectForkFailureWithoutOverlappingStatus(page: Page) {
+  const expectContinuousToast = await observeToastReplacement(page);
+  await page.getByRole("button", { name: "Fork chat from here" }).last().click();
+  await page.getByRole("menuitem", { name: "Fork in a new tab", exact: true }).click();
+  await expect(
+    page.getByRole("alert").filter({ hasText: "Transport not connected" }),
+  ).toBeVisible();
+  await expectReconnectingToastGone(page, { timeout: 100 });
+  await expectReconnectingToastVisible(page);
+  await expectContinuousToast();
+}
+
+async function observeToastReplacement(page: Page) {
+  const observation = await page
+    .getByRole("alert")
+    .filter({ hasText: "Reconnecting to host" })
+    .evaluateHandle((toast) => {
+      const frames: Array<{ connected: boolean; opacity: number; transform: string }> = [];
+      let frame = 0;
+      const sample = () => {
+        const style = getComputedStyle(toast);
+        frames.push({
+          connected: toast.isConnected,
+          opacity: Number(style.opacity),
+          transform: style.transform,
+        });
+        frame = requestAnimationFrame(sample);
+      };
+      sample();
+      return {
+        stop() {
+          cancelAnimationFrame(frame);
+          return frames;
+        },
+      };
+    });
+  return async () => {
+    const frames = await observation.evaluate((recorder) => recorder.stop());
+    await observation.dispose();
+    expect(frames.length).toBeGreaterThan(1);
+    expect(frames.every((frame) => frame.connected)).toBe(true);
+    expect(Math.min(...frames.map((frame) => frame.opacity))).toBe(1);
+    expect(new Set(frames.map((frame) => frame.transform)).size).toBe(1);
+  };
+}
+
+async function countChatCommits(page: Page, agentId: string) {
+  return page.evaluate(
+    (id) =>
+      (globalThis.__PASEO_RENDER_PROFILE__ ?? []).filter(
+        (sample) => sample.id === `AgentStreamSection:${id}`,
+      ).length,
+    agentId,
+  );
+}
+
 async function enableMoveTabShortcut(page: Page) {
   await page.addInitScript(() => {
     Object.defineProperty(navigator, "platform", { get: () => "MacIntel" });
@@ -97,7 +211,96 @@ async function expectAgentConsistentlyIdle(page: Page, title: string): Promise<v
   await expectTurnCopyButton(page);
 }
 
+async function withViewedTimelineScenario(
+  run: (scenario: ViewedTimelineScenario) => Promise<void>,
+) {
+  const scenario = await seedViewedTimelineScenario();
+  try {
+    await run(scenario);
+  } finally {
+    await scenario.cleanup();
+  }
+}
+
+async function openSevenChats(page: Page, scenario: ViewedTimelineScenario) {
+  const subscriptions = observeTimelineSubscriptions(page);
+  const additional = [];
+  for (let index = 0; index < 5; index += 1) {
+    additional.push(
+      await scenario.client.createAgent({
+        provider: "mock",
+        cwd: scenario.repoPath,
+        workspaceId: scenario.workspaceId,
+        title: `Additional chat ${index + 1}`,
+        modeId: "load-test",
+        model: "ten-second-stream",
+      }),
+    );
+  }
+  await openAgent(page, scenario, scenario.firstAgentId);
+  await selectAgent(page, "Second viewed chat");
+  for (let index = 0; index < additional.length; index += 1) {
+    await selectAgent(page, `Additional chat ${index + 1}`);
+  }
+  await subscriptions.waitForSubscribedAgents([
+    scenario.firstAgentId,
+    scenario.secondAgentId,
+    ...additional.map((agent) => agent.id),
+  ]);
+}
+
+async function expectCurrentChatWithoutCatchUp(page: Page, message: string) {
+  await expect(page.getByText(message, { exact: true })).toBeVisible();
+  await expect(page.getByRole("alert").filter({ hasText: "Updating messages" })).toHaveCount(0);
+}
+
 test.describe("Viewed agent timelines", () => {
+  test("a reloaded layout subscribes only the chat it restores into", async ({ page }) => {
+    test.setTimeout(120_000);
+    const subscriptions = observeTimelineSubscriptions(page);
+    const scenario = await seedRestoredLayoutScenario();
+    try {
+      // One document load, then sidebar and tab clicks — the way a user reaches these chats.
+      // A `page.goto` per chat would restart the app and empty the session's set each time.
+      const [first, second, third, fourth] = scenario.chats;
+      await openAgent(page, first!, first!.agentId);
+      await selectAgent(page, second!.title);
+      await selectWorkspaceInSidebar(page, third!.workspaceId);
+      await selectAgent(page, third!.title);
+      await selectAgent(page, fourth!.title);
+      await subscriptions.waitForSubscribedAgents(scenario.chats.map((chat) => chat.agentId));
+
+      // Relaunch. Layout comes back from disk carrying a tab for every chat above; only the
+      // one on screen may be subscribed, because subscribing resumes the agent on the daemon.
+      const restored = scenario.chats.at(-1)!;
+      const sibling = scenario.chats.at(-2)!;
+      subscriptions.reset();
+      await page.reload();
+      await waitForWorkspaceTabsVisible(page);
+      await expect(page.getByRole("button", { name: restored.title, exact: true })).toHaveAttribute(
+        "aria-selected",
+        "true",
+      );
+      await expect(page.getByRole("button", { name: sibling.title, exact: true })).toBeVisible();
+      await subscriptions.waitForSubscribedAgents([restored.agentId]);
+
+      // Opening the restored sibling is what adds it, and it adds only itself.
+      await selectAgent(page, sibling.title);
+      await subscriptions.waitForSubscribedAgents([restored.agentId, sibling.agentId]);
+    } finally {
+      await scenario.cleanup();
+    }
+  });
+
+  test("open chats stay current after switching beyond five agents", async ({ page }) => {
+    await withViewedTimelineScenario(async (scenario) => {
+      await openSevenChats(page, scenario);
+      await commitMessage(scenario, scenario.firstAgentId, "Current after seven open chats.");
+      await selectAgent(page, "First viewed chat");
+      await expectCurrentChatWithoutCatchUp(page, "Current after seven open chats.");
+    });
+  });
+
   test("a turn that finishes while hidden reopens with consistently idle chrome", async ({
     page,
   }) => {
@@ -119,14 +322,18 @@ test.describe("Viewed agent timelines", () => {
     }
   });
 
-  test("a hidden hot chat stays current", async ({ page }) => {
+  test("a hidden retained chat stays current without rendering", async ({ page }) => {
     test.setTimeout(60_000);
     const subscriptions = observeTimelineSubscriptions(page);
     const scenario = await seedViewedTimelineScenario();
     try {
-      await openAgent(page, scenario, scenario.firstAgentId);
+      await openAgent(page, scenario, scenario.firstAgentId, { recordRenders: true });
+      const composer = page.getByRole("textbox", { name: "Message agent..." });
+      await composer.fill("Unsent draft survives hidden streaming");
       await selectAgent(page, "Second viewed chat");
       await subscriptions.waitForSubscribedAgents([scenario.firstAgentId, scenario.secondAgentId]);
+      const hiddenCommits = await countChatCommits(page, scenario.firstAgentId);
+      expect(hiddenCommits).toBeGreaterThan(0);
       await commitMessage(
         scenario,
         scenario.firstAgentId,
@@ -135,11 +342,15 @@ test.describe("Viewed agent timelines", () => {
       await expect(
         page.getByText("Committed while the first chat is hidden.", { exact: true }),
       ).toHaveCount(0);
+      expect(await countChatCommits(page, scenario.firstAgentId)).toBe(hiddenCommits);
       await selectAgent(page, "First viewed chat");
       await expect(
         page.getByText("Committed while the first chat is hidden.", { exact: true }),
       ).toBeVisible();
       await expect(page.getByText("(end of synthetic stream)", { exact: true })).toBeVisible();
+      await expect(composer).toHaveValue("Unsent draft survives hidden streaming");
+      await composer.fill("Draft edited after returning");
+      await expect(composer).toHaveValue("Draft edited after returning");
     } finally {
       await scenario.cleanup();
     }
@@ -170,28 +381,48 @@ test.describe("Viewed agent timelines", () => {
     }
   });
 
-  test("a visible chat catches up after reconnecting", async ({ page }) => {
+  test("a visible chat reports updating until reconnect catch-up completes", async ({
+    page,
+  }, testInfo) => {
     const gate = await installDaemonWebSocketGate(page);
     const scenario = await seedViewedTimelineScenario();
     try {
+      await commitMessage(scenario, scenario.firstAgentId, "Visible before the connection drops.");
       await openAgent(page, scenario, scenario.firstAgentId);
+      const previousMessage = page.getByText("Visible before the connection drops.", {
+        exact: true,
+      });
+      await expect(previousMessage).toBeVisible();
       await expect(page.getByRole("button", { name: "First viewed chat" })).toHaveAttribute(
         "aria-selected",
         "true",
       );
       await gate.drop();
       await gate.waitForBlockedConnection();
+      await expectReconnectingToastVisible(page);
+      await expect(page.getByTestId("agent-reconnecting-toast")).toHaveCSS("opacity", "1");
+      await page.screenshot({ path: testInfo.outputPath("reconnecting-chat.png") });
+      await expectForkFailureWithoutOverlappingStatus(page);
       await commitMessage(scenario, scenario.firstAgentId, "Committed while the chat reconnects.");
       await expect(
         page.getByText("Committed while the chat reconnects.", { exact: true }),
       ).toHaveCount(0);
-      // Hold the first authoritative catch-up response so the assertion observes
-      // the reconnect boundary instead of racing a socket that has not reopened yet.
-      gate.holdNextServerMessage("fetch_agent_timeline_response");
+      // Hold the visible response to observe the connected-but-updating state.
+      gate.holdTimelineResponses(scenario.firstAgentId);
+      const expectContinuousToast = await observeToastReplacement(page);
       gate.restore();
-      await gate.waitForHeldServerMessage("fetch_agent_timeline_response");
-      gate.releaseHeldServerMessage("fetch_agent_timeline_response");
+      await gate.waitForHeldTimelineResponse();
       await expectReconnectingToastGone(page);
+      await expect(page.getByRole("alert").filter({ hasText: "Updating messages" })).toBeVisible();
+      await expect(
+        page.getByTestId("app-toast-message").filter({ hasText: "Updating messages" }),
+      ).toBeVisible();
+      await expect(previousMessage).toBeVisible();
+      await expect(page.getByTestId("agent-updating-toast")).toHaveCSS("opacity", "1");
+      await expectContinuousToast();
+      await page.screenshot({ path: testInfo.outputPath("updating-chat.png") });
+      gate.releaseHeldTimelineResponses();
+      await expect(page.getByRole("alert").filter({ hasText: "Updating messages" })).toHaveCount(0);
       const recoveredMessage = page.getByText("Committed while the chat reconnects.", {
         exact: true,
       });
diff --git a/packages/app/e2e/browser/workspace-draft-thinking-preferences.spec.ts b/packages/app/e2e/browser/workspace-draft-thinking-preferences.spec.ts
index 27b0bb98bb..cd8f3b0c03 100644
--- a/packages/app/e2e/browser/workspace-draft-thinking-preferences.spec.ts
+++ b/packages/app/e2e/browser/workspace-draft-thinking-preferences.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test, type Page } from "../support/fixtures";
-import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import {
   chooseCommandCenterAgentControl,
@@ -7,13 +7,15 @@ import {
   waitForDraftComposer,
 } from "../support/helpers/command-center-agent-controls";
 import { openCommandCenter } from "../support/helpers/command-center";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
 import { selectModel } from "../support/helpers/app";
 
 const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
 const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
 
 async function openNewAgentTab(page: Page): Promise<void> {
-  await clickNewChat(page);
+  // Preference persistence does not depend on the animated tab-creation menu.
+  await runWorkspaceActionFromCommandCenter(page, "New agent");
   await waitForDraftComposer(page);
 }
 
diff --git a/packages/app/e2e/browser/workspace-navigation-regression.spec.ts b/packages/app/e2e/browser/workspace-navigation-regression.spec.ts
index 08a4604aec..fdc0529451 100644
--- a/packages/app/e2e/browser/workspace-navigation-regression.spec.ts
+++ b/packages/app/e2e/browser/workspace-navigation-regression.spec.ts
@@ -11,6 +11,7 @@ import {
   expectWorkspaceTabVisible,
   openWorkspaceWithAgents,
 } from "../support/helpers/archive-tab";
+import { clickNewChat } from "../support/helpers/launcher";
 import { expectComposerVisible } from "../support/helpers/composer";
 import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import { seedWorkspace } from "../support/helpers/seed-client";
@@ -132,13 +133,14 @@ test.describe("Workspace navigation regression", () => {
     await expect(page.getByText("Add a project", { exact: true })).toHaveCount(0);
   });
 
-  test("keeps one replacement draft after returning from settings and closing the last tab", async ({
+  test("shows the New launcher after returning from settings and closing the last agent draft tab", async ({
     page,
     withWorkspace,
   }) => {
     const workspace = await withWorkspace({ prefix: "workspace-settings-back-tab-" });
 
     await workspace.navigateTo();
+    await clickNewChat(page);
     await expect.poll(() => getVisibleDraftTabCount(page), { timeout: 30_000 }).toBe(1);
 
     await openSettings(page);
@@ -148,7 +150,12 @@ test.describe("Workspace navigation regression", () => {
 
     await closeFirstVisibleDraftTab(page);
 
-    await expect.poll(() => getVisibleDraftTabCount(page), { timeout: 30_000 }).toBe(1);
+    await expect.poll(() => getVisibleDraftTabCount(page), { timeout: 30_000 }).toBe(0);
+    await expect(
+      page
+        .getByTestId("workspace-new-tab-panel")
+        .getByRole("button", { name: "Agent", exact: true }),
+    ).toBeVisible();
   });
 
   test("keeps the workspace rendered while reconnecting to the host", async ({ page }) => {
@@ -178,6 +185,9 @@ test.describe("Workspace navigation regression", () => {
       });
       await waitForWorkspaceTabsVisible(page);
       await expectWorkspaceTabVisible(page, agent.id);
+      // The reconnect toast belongs to the visible agent panel, which mounts
+      // after the tab strip. Drop the connection only after that panel is ready.
+      await expectComposerVisible(page);
 
       await daemonGate.drop();
       await daemonGate.waitForBlockedConnection();
diff --git a/packages/app/e2e/browser/workspace-setup-streaming.spec.ts b/packages/app/e2e/browser/workspace-setup-streaming.spec.ts
index 0763bfb332..7fe8ce1814 100644
--- a/packages/app/e2e/browser/workspace-setup-streaming.spec.ts
+++ b/packages/app/e2e/browser/workspace-setup-streaming.spec.ts
@@ -87,8 +87,7 @@ test.describe("Workspace setup streaming", () => {
     try {
       await seedProjectForWorkspaceSetup(client, repo.path);
 
-      // Wait for setup completion via daemon (setup snapshots are per-session,
-      // so the browser session won't receive progress events).
+      // The setup client owns progress before creating the workspace.
       const completed = waitForWorkspaceSetupProgress(
         client,
         (payload) =>
@@ -204,6 +203,41 @@ test.describe("Workspace setup streaming", () => {
     }
   });
 
+  test("keeps a workspace usable when its setup config cannot be parsed", async ({ page }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-invalid-config-", {
+      files: [{ path: "paseo.json", content: "{ invalid json\n" }],
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const failed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "failed",
+      );
+      const workspace = await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "workspace-setup-invalid-config",
+      });
+      const failedPayload = await failed;
+      expect(failedPayload.error).toContain("Failed to parse paseo.json");
+      expect(failedPayload.detail.commands).toEqual([]);
+
+      await openHomeWithProject(page, repo.path);
+      await navigateToWorkspaceViaSidebar(page, workspace.id);
+      await expectFailedSetupTabSeededInMainPane(page, workspace.id);
+      await expect(page.getByText(/Failed to parse paseo\.json at/)).toBeVisible();
+      await closeSetupTab(page, workspace.id);
+      await clickNewChat(page);
+      await expectComposerVisible(page);
+      await openFileExplorer(page);
+      await expectExplorerEntryVisible(page, "paseo.json");
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
   daemonTest("emits a completed empty snapshot when no setup commands exist", async () => {
     const client = await connectWorkspaceSetupClient();
     const repo = await createTempGitRepo("setup-none-");
diff --git a/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts b/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
index 07e62131b0..72b5908446 100644
--- a/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
+++ b/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
@@ -1,3 +1,4 @@
+import type { Page, TestInfo } from "@playwright/test";
 import { randomUUID } from "node:crypto";
 import { test, expect } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
@@ -6,6 +7,31 @@ import type { SeedDaemonClient } from "../support/helpers/seed-client";
 
 const MOBILE_VIEWPORT = { width: 390, height: 844 };
 
+test.use({ viewport: MOBILE_VIEWPORT, deviceScaleFactor: 2 });
+
+async function openTabSwitcher(page: Page) {
+  await page.getByRole("button", { name: /Switch tabs/ }).click();
+  const footer = page.getByRole("button", { name: "New terminal", exact: true });
+  await expect(footer).toBeVisible();
+  // Visibility alone passes while the sheet is still travelling up from below the viewport.
+  await expect
+    .poll(async () => {
+      const bounds = await footer.boundingBox();
+      return bounds ? bounds.y + bounds.height : Number.POSITIVE_INFINITY;
+    })
+    .toBeLessThanOrEqual(MOBILE_VIEWPORT.height);
+}
+
+async function captureScreen(page: Page, testInfo: TestInfo, name: string) {
+  await page.screenshot({ path: testInfo.outputPath(name + ".png") });
+}
+
+async function createTabFromSwitcher(page: Page, kind: "New agent" | "New terminal") {
+  await openTabSwitcher(page);
+  await page.getByRole("button", { name: kind, exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
 async function fetchAgentTitle(client: SeedDaemonClient, agentId: string): Promise<string | null> {
   const result = await client.fetchAgents({ scope: "active" });
   return result.entries.find((entry) => entry.agent.id === agentId)?.agent.title ?? null;
@@ -20,7 +46,7 @@ async function fetchAgentTitle(client: SeedDaemonClient, agentId: string): Promi
 test.describe("Workspace session rename (compact tab switcher)", () => {
   test("renames an agent session from the switcher's per-session actions sheet", async ({
     page,
-  }) => {
+  }, testInfo) => {
     test.setTimeout(120_000);
 
     await page.setViewportSize(MOBILE_VIEWPORT);
@@ -36,8 +62,10 @@ test.describe("Workspace session rename (compact tab switcher)", () => {
         timeout: 30_000,
       });
 
+      await captureScreen(page, testInfo, "compact-chat-header");
+
       // Open the sessions dropdown (a bottom sheet on compact).
-      await page.getByRole("button", { name: /Switch tabs/ }).click();
+      await openTabSwitcher(page);
       await expect(page.getByRole("button", { name: "Bottom sheet backdrop" }).first()).toBeVisible(
         {
           timeout: 10_000,
@@ -65,12 +93,58 @@ test.describe("Workspace session rename (compact tab switcher)", () => {
       await renameModalSubmit(page, modalPrefix).click();
 
       await expect(input).toHaveCount(0, { timeout: 15_000 });
-      await expect(page.getByTestId("workspace-tab-switcher-trigger")).toContainText(renamed, {
+      await expect(page.getByText(renamed, { exact: true })).toBeVisible({
         timeout: 15_000,
       });
+      await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("1");
       await expect.poll(() => fetchAgentTitle(session.client, session.agentId)).toBe(renamed);
+      await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(1);
+      await expect(page.getByText("Rename agent", { exact: true })).toBeHidden();
+      await captureScreen(page, testInfo, "renamed-tab-in-switcher");
     } finally {
       await session.cleanup();
     }
   });
 });
+
+test("switcher footer creates tabs and returns to the existing chat", async ({
+  page,
+}, testInfo) => {
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "compact-header-actions-",
+    title: "Existing chat",
+  });
+  try {
+    await openAgentRoute(page, session);
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("1");
+
+    await createTabFromSwitcher(page, "New terminal");
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("2");
+    await expect(page.getByTestId("terminal-surface").filter({ visible: true })).toHaveCount(1);
+    await captureScreen(page, testInfo, "compact-terminal-header");
+
+    await createTabFromSwitcher(page, "New agent");
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("3");
+    await expect(
+      page.getByRole("textbox", { name: "Message agent..." }).filter({ visible: true }),
+    ).toHaveCount(1);
+    await captureScreen(page, testInfo, "compact-draft-header");
+
+    await openTabSwitcher(page);
+    await expect(page.getByText("Existing chat", { exact: true })).toBeVisible();
+    await captureScreen(page, testInfo, "switcher-three-tabs");
+    await page.getByText("Existing chat", { exact: true }).click();
+    await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("3");
+
+    await openTabSwitcher(page);
+    await expect(page.getByText("Existing chat", { exact: true })).toBeVisible();
+    await page
+      .getByRole("button", { name: "Bottom sheet backdrop" })
+      .click({ position: { x: 10, y: 10 } });
+    await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+    await captureScreen(page, testInfo, "returned-chat-header");
+  } finally {
+    await session.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/worktree-codex-restore.real.spec.ts b/packages/app/e2e/browser/worktree-codex-restore.real.spec.ts
new file mode 100644
index 0000000000..8b9010e742
--- /dev/null
+++ b/packages/app/e2e/browser/worktree-codex-restore.real.spec.ts
@@ -0,0 +1,63 @@
+import { test } from "../support/helpers/codex-workspace-restore";
+
+test.use({
+  e2eDaemonConfig: { version: 1, daemon: { mcp: { enabled: true } } },
+  trace: "on",
+  video: "on",
+});
+test.describe.configure({ timeout: 600_000 });
+
+test("a fresh client restores an archived Codex agent across a reload without agent cache", async ({
+  codexRestore,
+}) => {
+  await test.step("Create, finish, and archive Codex before this browser connects", async () => {
+    await codexRestore.createWorktreeWithCodex();
+    await codexRestore.archiveBeforeBrowserConnects();
+  });
+  await test.step("Connect the fresh browser, open History, and restore the workspace", async () => {
+    await codexRestore.connectFreshBrowser();
+    await codexRestore.openArchivedWorkspaceFromHistory();
+    await codexRestore.restoreWorkspace();
+    await codexRestore.expectArchivedAgentSelectedWithHistory();
+  });
+  await test.step("Reload without cached agent data and keep the selected archived agent", async () => {
+    await codexRestore.reloadWithoutAgentCache();
+    await codexRestore.waitForWorkspaceHydration();
+    await codexRestore.expectArchivedAgentSelectedWithHistory();
+  });
+  await test.step("Unarchive the agent and keep its idle composer after another cache-empty reload", async () => {
+    await codexRestore.unarchiveAgent();
+    await codexRestore.reloadWithoutAgentCache();
+    await codexRestore.expectIdleAgentWithVisibleComposer();
+  });
+});
+
+test("restore an archived worktree, then unarchive its completed Codex agent", async ({
+  codexRestore,
+}) => {
+  await test.step("1. Create a managed worktree with a real Codex agent through Paseo MCP", async () => {
+    await codexRestore.createWorktreeWithCodex();
+  });
+  await test.step("2. Wait for Codex to finish and show its reply", async () => {
+    await codexRestore.waitForCompletedReply();
+  });
+  await test.step("3. Archive the workspace from its sidebar menu", async () => {
+    await codexRestore.archiveWorkspaceFromSidebar();
+  });
+  await test.step("4. Assert workspace and agent are archived and the worktree is removed", async () => {
+    await codexRestore.expectWorkspaceAndAgentArchived();
+  });
+  await test.step("5. Open the archived workspace from History", async () => {
+    await codexRestore.openArchivedWorkspaceFromHistory();
+  });
+  await test.step("6. Restore the workspace", async () => {
+    await codexRestore.restoreWorkspace();
+    await codexRestore.expectWorktreeRestoredWithArchivedAgentSelected();
+  });
+  await test.step("7. Click Unarchive on the agent", async () => {
+    await codexRestore.unarchiveAgent();
+  });
+  await test.step("8. Expect an idle agent with a visible editable composer", async () => {
+    await codexRestore.expectIdleAgentWithVisibleComposer(60_000);
+  });
+});
diff --git a/packages/app/e2e/browser/worktree-restore-after-restart.spec.ts b/packages/app/e2e/browser/worktree-restore-after-restart.spec.ts
index 7061d14576..ea04da4a55 100644
--- a/packages/app/e2e/browser/worktree-restore-after-restart.spec.ts
+++ b/packages/app/e2e/browser/worktree-restore-after-restart.spec.ts
@@ -1,5 +1,11 @@
 import { randomUUID } from "node:crypto";
-import { existsSync } from "node:fs";
+import { existsSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { join } from "node:path";
+import {
+  restoreWorkspaceFromHistory,
+  expectCommittedFileAfterReload,
+} from "../support/helpers/workspace-recovery";
 import { expect, type Page } from "@playwright/test";
 import { metroTest as test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
@@ -80,7 +86,7 @@ test.describe("Worktree restore after daemon restart", () => {
     );
   }
 
-  test("after archiving a worktree and restarting the daemon, History shows the worktree branch (not main) before any restore", async ({
+  test("after archiving a worktree and restarting the daemon, History shows the worktree branch (not main) and restores its committed changes", async ({
     page,
   }) => {
     // A paseo worktree is cut on its own branch named after the slug, and the
@@ -97,6 +103,10 @@ test.describe("Worktree restore after daemon restart", () => {
     createdProjectIds.add(worktree.projectKey);
     createdWorktreeDirectories.add(worktree.workspaceDirectory);
 
+    writeFileSync(join(worktree.workspaceDirectory, "restart-change.txt"), "persisted base\n");
+    execFileSync("git", ["add", "restart-change.txt"], { cwd: worktree.workspaceDirectory });
+    execFileSync("git", ["commit", "-m", "Survive restart"], { cwd: worktree.workspaceDirectory });
+
     const agent = await createMockIdleAgent(client, {
       cwd: worktree.workspaceDirectory,
       workspaceId: worktree.workspaceId,
@@ -138,5 +148,7 @@ test.describe("Worktree restore after daemon restart", () => {
     await expect(branchCell).toBeVisible({ timeout: 60_000 });
     await expect(branchCell).toHaveText(worktreeSlug, { timeout: 60_000 });
     await expect(workspaceCell).toHaveText(worktree.workspaceName, { timeout: 60_000 });
+    await restoreWorkspaceFromHistory(page, serverId, agent.id);
+    await expectCommittedFileAfterReload(page, "restart-change.txt");
   });
 });
diff --git a/packages/app/e2e/browser/worktree-restore.spec.ts b/packages/app/e2e/browser/worktree-restore.spec.ts
index d8bac26fe4..6158906f3f 100644
--- a/packages/app/e2e/browser/worktree-restore.spec.ts
+++ b/packages/app/e2e/browser/worktree-restore.spec.ts
@@ -1,6 +1,14 @@
 import { randomUUID } from "node:crypto";
 import { execFileSync } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import {
+  restoreArchivedWorkspace,
+  expectCommittedFile,
+  expectCommittedFileAfterReload,
+} from "../support/helpers/workspace-recovery";
+import { archiveWorkspaceFromSidebar } from "../support/helpers/sidebar";
 import { rename } from "node:fs/promises";
 import type { Page } from "@playwright/test";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
@@ -139,6 +147,33 @@ test.describe("Worktree restore", () => {
     await tempRepo?.cleanup().catch(() => undefined);
   });
 
+  async function createWorkspaceWithCommittedChange() {
+    const worktree = await createWorktreeViaDaemon(worktreeClient, {
+      cwd: tempRepo.path,
+      slug: `restore-diff-${randomUUID().slice(0, 8)}`,
+    });
+    createdProjectIds.add(worktree.projectKey);
+    createdWorktreeDirectories.add(worktree.workspaceDirectory);
+    commitRestorableChange(worktree.workspaceDirectory);
+    const agent = await createIdleAgent(client, {
+      cwd: worktree.workspaceDirectory,
+      workspaceId: worktree.workspaceId,
+      title: "Restore committed changes",
+    });
+    const route = `${buildHostWorkspaceRoute(getServerId(), worktree.workspaceId)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
+
+    return { worktree, route };
+  }
+
+  test("committed changes survive archive, restore and page reload", async ({ page }) => {
+    const { worktree, route } = await createWorkspaceWithCommittedChange();
+    await openCommittedWorkspace(page, route);
+    await archiveCommittedWorkspace(page, worktree);
+    await restoreCommittedWorkspace(page, route);
+    await expectCommittedFileAfterReload(page, "restored-change.txt");
+    await expectRestoredCommitDiff(page);
+  });
+
   test("opening an active History agent navigates without restoring or unarchiving", async ({
     page,
   }) => {
@@ -205,7 +240,7 @@ test.describe("Worktree restore", () => {
       "restore-success",
     );
     await worktreeClient.fetchWorkspaces({
-      subscribe: { subscriptionId: `restore-secondary-${randomUUID()}` },
+      subscribe: {},
     });
     let updateTimeout: ReturnType<typeof setTimeout> | null = null;
     let unsubscribeSecondaryWorkspaceUpdate = () => {};
@@ -265,7 +300,7 @@ test.describe("Worktree restore", () => {
     ).toHaveText(switchedBranch, { timeout: 30_000 });
   });
 
-  test("recovers the selected agent with its workspace and later rescues another archived agent", async ({
+  test("restores the workspace before explicitly unarchiving each selected agent", async ({
     page,
   }) => {
     const { agents, worktree } = await createArchivedMissingWorktree("restore-agents", {
@@ -292,9 +327,16 @@ test.describe("Worktree restore", () => {
     await expect(
       page.getByTestId(`workspace-tab-agent_${firstAgent.id}`).filter({ visible: true }).first(),
     ).toBeVisible({ timeout: 30_000 });
+    await expect(
+      page.getByTestId(`workspace-tab-agent_${firstAgent.id}`).filter({ visible: true }).first(),
+    ).toHaveAttribute("aria-selected", "true");
+    expect(await fetchAgentArchivedAt(client, firstAgent.id)).not.toBeNull();
+    expect(await fetchAgentArchivedAt(client, secondAgent.id)).not.toBeNull();
+    await page.getByRole("button", { name: "Unarchive", exact: true }).click();
     await expect
       .poll(() => fetchAgentArchivedAt(client, firstAgent.id), { timeout: 30_000 })
       .toBeNull();
+    expect(await fetchAgentArchivedAt(client, secondAgent.id)).not.toBeNull();
     await expect(page.getByRole("button", { name: "Unarchive" })).toHaveCount(0, {
       timeout: 30_000,
     });
@@ -313,6 +355,88 @@ test.describe("Worktree restore", () => {
       .toBeNull();
   });
 
+  test("restores a branchless workspace so its archived agent can be used again", async ({
+    page,
+  }) => {
+    const project = await openProjectViaDaemon(worktreeClient, tempRepo.path);
+    createdProjectIds.add(project.projectKey);
+    const backingWorktree = await createWorktreeViaDaemon(worktreeClient, {
+      cwd: tempRepo.path,
+      slug: `branchless-${randomUUID().slice(0, 8)}`,
+    });
+    createdProjectIds.add(backingWorktree.projectKey);
+    createdWorktreeDirectories.add(backingWorktree.workspaceDirectory);
+
+    execFileSync("git", ["switch", "--detach", "main"], {
+      cwd: backingWorktree.workspaceDirectory,
+      stdio: "pipe",
+    });
+    const created = await worktreeClient.createWorkspace({
+      source: { kind: "directory", path: backingWorktree.workspaceDirectory },
+      title: "Sample workspace",
+    });
+    if (!created.workspace) {
+      throw new Error(created.error ?? "Could not create the branchless workspace");
+    }
+    const workspaceId = created.workspace.id;
+    const agent = await createIdleAgent(client, {
+      cwd: backingWorktree.workspaceDirectory,
+      workspaceId,
+      title: "Archived agent",
+    });
+
+    await archiveWorkspaceFromDaemon(worktreeClient, backingWorktree.workspaceDirectory, {
+      scope: "worktree",
+    });
+    await expect
+      .poll(() => existsSync(backingWorktree.workspaceDirectory), { timeout: 30_000 })
+      .toBe(false);
+    await expect.poll(() => fetchAgentArchivedAt(client, agent.id)).not.toBeNull();
+
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openSessions(page);
+    await page.getByTestId(`agent-row-${getServerId()}-${agent.id}`).click();
+    await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible();
+    await expect(
+      page.getByText(
+        "Restore Sample workspace to return to its agents. A new branch will start from the saved base or the repository default.",
+        { exact: true },
+      ),
+    ).toBeVisible();
+    await captureBranchlessRestoreStep(page, "01-restore-workspace.png");
+
+    await page.getByRole("button", { name: "Restore", exact: true }).click();
+    await expect
+      .poll(() => existsSync(backingWorktree.workspaceDirectory), { timeout: 30_000 })
+      .toBe(true);
+    await expect(page.getByRole("button", { name: "Unarchive", exact: true })).toBeVisible({
+      timeout: 30_000,
+    });
+    await captureBranchlessRestoreStep(page, "02-unarchive-agent.png");
+
+    await page.getByRole("button", { name: "Unarchive", exact: true }).click();
+    await expect.poll(() => fetchAgentArchivedAt(client, agent.id)).toBeNull();
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeEditable();
+    await captureBranchlessRestoreStep(page, "03-agent-ready.png");
+
+    const restoredHead = execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: backingWorktree.workspaceDirectory,
+      encoding: "utf8",
+    }).trim();
+    const defaultHead = execFileSync("git", ["rev-parse", "main"], {
+      cwd: tempRepo.path,
+      encoding: "utf8",
+    }).trim();
+    expect(restoredHead).toBe(defaultHead);
+    expect(
+      execFileSync("git", ["branch", "--show-current"], {
+        cwd: backingWorktree.workspaceDirectory,
+        encoding: "utf8",
+      }).trim(),
+    ).toMatch(/^restored\//);
+  });
+
   test("restore failure stays visible and permits a successful retry", async ({ page }) => {
     const { agent, worktree } = await openArchivedWorkspaceFromHistory(page, "restore-retry");
     const displacedProjectPath = `${tempRepo.path}-temporarily-unavailable`;
@@ -380,3 +504,46 @@ test.describe("Worktree restore", () => {
     }
   });
 });
+
+async function captureBranchlessRestoreStep(page: Page, filename: string): Promise<void> {
+  const screenshotDirectory = path.join(tmpdir(), "paseo-branchless-restore-evidence");
+  mkdirSync(screenshotDirectory, { recursive: true });
+  await page.screenshot({ path: path.join(screenshotDirectory, filename), fullPage: true });
+}
+
+function commitRestorableChange(cwd: string): void {
+  writeFileSync(path.join(cwd, "restored-change.txt"), "preserved after restore\n");
+  execFileSync("git", ["add", "restored-change.txt"], { cwd, stdio: "pipe" });
+  execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "Preserve restored diff"], {
+    cwd,
+    stdio: "pipe",
+  });
+}
+
+async function openCommittedWorkspace(page: Page, route: string): Promise<void> {
+  await page.goto(route);
+  await expectCommittedFile(page, "restored-change.txt");
+}
+
+async function archiveCommittedWorkspace(
+  page: Page,
+  worktree: { workspaceId: string; workspaceDirectory: string },
+): Promise<void> {
+  await archiveWorkspaceFromSidebar(page, worktree.workspaceId);
+  await expect.poll(() => existsSync(worktree.workspaceDirectory)).toBe(false);
+}
+
+async function restoreCommittedWorkspace(page: Page, route: string): Promise<void> {
+  await page.goto(route);
+  await restoreArchivedWorkspace(page);
+}
+
+async function expectRestoredCommitDiff(page: Page): Promise<void> {
+  await page.getByRole("button", { name: /Commits/i }).click();
+  await page.getByText("Preserve restored diff", { exact: true }).click();
+  // Diff file headers have no semantic role; their accessible names identify the file and counts.
+  await expect(
+    page.getByTestId("commit-diff-panel").filter({ visible: true }).getByTestId("diff-file-0"),
+  ).toHaveAccessibleName("restored-change.txt, +1, -0");
+  await page.screenshot({ path: test.info().outputPath("restored-commit.png") });
+}
diff --git a/packages/app/e2e/fixtures/catalog-codex.mjs b/packages/app/e2e/fixtures/catalog-codex.mjs
new file mode 100644
index 0000000000..1b3826cb30
--- /dev/null
+++ b/packages/app/e2e/fixtures/catalog-codex.mjs
@@ -0,0 +1,88 @@
+import readline from "node:readline";
+import { randomUUID } from "node:crypto";
+
+const fast = { id: "priority", name: "Fast", description: "Faster processing, increased usage" };
+const ultra = {
+  id: "ultrafast",
+  name: "Ultrafast",
+  description: "Lowest latency, increased usage",
+};
+const models = [
+  { id: "gpt-6.1-sol", displayName: "GPT-6.1 Sol", isDefault: true, serviceTiers: [fast, ultra] },
+  { id: "gpt-6-sol", displayName: "GPT-6 Sol", serviceTiers: [fast] },
+].map((model) =>
+  Object.assign(model, {
+    model: model.id,
+    defaultReasoningEffort: "medium",
+    supportedReasoningEfforts: [{ reasoningEffort: "medium", description: "Medium" }],
+  }),
+);
+
+function send(message) {
+  process.stdout.write(JSON.stringify(message) + "\n");
+}
+function respond(method, params) {
+  switch (method) {
+    case "initialize":
+      return {};
+    case "model/list":
+      return { data: models };
+    case "config/read":
+      return { config: { model: models[0].id, model_reasoning_effort: "medium" } };
+    case "collaborationMode/list":
+      return { data: [] };
+    case "skills/list":
+      return { data: [] };
+    case "thread/list":
+    case "thread/loaded/list":
+      return { data: [] };
+    case "thread/start":
+      return { thread: { id: randomUUID() }, model: params.model };
+    case "thread/resume":
+      return { thread: { id: params.threadId } };
+    case "thread/read":
+      return { thread: { id: params.threadId, turns: [] } };
+    case "turn/start": {
+      const turnId = randomUUID();
+      setTimeout(() => {
+        send({
+          method: "turn/started",
+          params: { threadId: params.threadId, turn: { id: turnId } },
+        });
+        send({
+          method: "item/completed",
+          params: {
+            threadId: params.threadId,
+            turnId,
+            item: {
+              id: randomUUID(),
+              type: "agentMessage",
+              text: "Ready to work on this project.",
+            },
+          },
+        });
+        send({
+          method: "turn/completed",
+          params: { threadId: params.threadId, turn: { id: turnId, status: "completed" } },
+        });
+      }, 50);
+      return { turn: { id: turnId } };
+    }
+    default:
+      throw new Error(`Unsupported Codex fixture request: ${method}`);
+  }
+}
+
+if (process.argv.includes("--version")) {
+  console.log("codex-cli 0.159.0");
+} else {
+  readline.createInterface({ input: process.stdin }).on("line", (line) => {
+    const request = JSON.parse(line);
+    if (request.id === undefined) return;
+    try {
+      send({ id: request.id, result: respond(request.method, request.params ?? {}) });
+    } catch (error) {
+      send({ id: request.id, error: { code: -32601, message: error.message } });
+    }
+  });
+}
diff --git a/packages/app/e2e/mobile/agent-device/native-sidebar-scroll-retention.android.yaml b/packages/app/e2e/mobile/agent-device/native-sidebar-scroll-retention.android.yaml
new file mode 100644
index 0000000000..dd144b2926
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-sidebar-scroll-retention.android.yaml
@@ -0,0 +1,4 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- runFlow: ../../../maestro/sidebar-scroll-retention.yaml
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
index 63f5fb0728..335f269b13 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-keyboard-toggle\"" 10000
 press "id=\"terminal-keyboard-toggle\""
 type "printf '__AD_%s__\\n' OUTPUT_OK" --delay-ms 0
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
index 4988c9afdd..2b5e5fcfdb 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-surface\"" 10000
 press "id=\"terminal-surface\""
 type "clear; yes SAME | head -41; echo AD_SCROLL_MARKER; yes SAME | head -38" --delay-ms 0
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
index 9ef099b5a7..11f75b62b3 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-keyboard-toggle\"" 10000
 press "id=\"terminal-keyboard-toggle\""
 type "clear; printf '                    PASEO_TARGET\\n'" --delay-ms 0
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.android.ad b/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.android.ad
new file mode 100644
index 0000000000..af7e25995e
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.android.ad
@@ -0,0 +1,24 @@
+context platform=android timeout=90000 retries=1
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-new-tab-button\"" 45000
+press "id=\"workspace-new-tab-button\""
+wait "id=\"workspace-new-tab-menu-terminal\"" 10000
+press "id=\"workspace-new-tab-menu-terminal\""
+wait "id=\"terminal-key-esc\"" 10000
+is visible "id=\"terminal-virtual-keyboard-native-wide\""
+is visible "id=\"terminal-key-esc\""
+is visible "id=\"terminal-key-ctrl\""
+is visible "id=\"terminal-key-enter\""
+is visible "id=\"terminal-paste\""
+press "id=\"terminal-keyboard-toggle\""
+type "printf '__AD_%s__\\n' NATIVE_WIDE_KEY_OK" --delay-ms 0
+press "id=\"terminal-key-enter\""
+wait "text" "__AD_NATIVE_WIDE_KEY_OK__" 10000
+press "id=\"terminal-key-ctrl\""
+type "c" --delay-ms 0
+type "printf '__AD_%s__\\n' MODIFIER_RESET_OK" --delay-ms 0
+press "id=\"terminal-key-enter\""
+wait "text" "__AD_MODIFIER_RESET_OK__" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.ios.ad
new file mode 100644
index 0000000000..31c4bba393
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.ios.ad
@@ -0,0 +1,17 @@
+context platform=ios timeout=90000 retries=1
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-new-tab-button\"" 30000
+press "id=\"workspace-new-tab-button\""
+wait "id=\"workspace-new-tab-menu-terminal\"" 10000
+press "id=\"workspace-new-tab-menu-terminal\""
+wait "id=\"terminal-virtual-keyboard-native-wide\"" 10000
+is visible "id=\"terminal-key-esc\""
+is visible "id=\"terminal-key-enter\""
+is visible "id=\"terminal-paste\""
+press "id=\"terminal-keyboard-toggle\""
+type "printf '__AD_IOS_%s__\\n' KEY_OK" --delay-ms 0
+press "id=\"terminal-key-enter\""
+wait "text" "__AD_IOS_KEY_OK__" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-wide-paste.ios.yaml b/packages/app/e2e/mobile/agent-device/native-terminal-wide-paste.ios.yaml
new file mode 100644
index 0000000000..2cf92faf3c
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-wide-paste.ios.yaml
@@ -0,0 +1,40 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- runFlow:
+    when:
+      visible: ".*getRegistrationInfoAsync.*"
+    commands:
+      - tapOn: ".*getRegistrationInfoAsync.*"
+      - tapOn: Dismiss
+- assertNotVisible: ".*getRegistrationInfoAsync.*"
+- extendedWaitUntil:
+    visible:
+      id: workspace-new-tab-button
+    timeout: 30000
+- tapOn:
+    id: workspace-new-tab-button
+- tapOn:
+    id: workspace-new-tab-menu-terminal
+- extendedWaitUntil:
+    visible:
+      id: terminal-virtual-keyboard-native-wide
+    timeout: 10000
+- assertVisible:
+    id: terminal-key-esc
+- assertVisible:
+    id: terminal-key-enter
+- assertVisible:
+    id: terminal-paste
+- tapOn:
+    id: terminal-paste
+- runFlow:
+    when:
+      visible: Allow Paste
+    commands:
+      - tapOn: Allow Paste
+- tapOn:
+    id: terminal-key-enter
+- extendedWaitUntil:
+    visible: __AD_IOS_PASTE_OK__
+    timeout: 10000
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-wide-preconditions.md b/packages/app/e2e/mobile/agent-device/native-terminal-wide-preconditions.md
new file mode 100644
index 0000000000..c19cedaaf9
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-wide-preconditions.md
@@ -0,0 +1,18 @@
+# Native wide terminal device flows
+
+Run these against a connected task-owned tablet with the current development app, Metro bundle, and a workspace whose terminal opens successfully. The flows assert `terminal-virtual-keyboard-native-wide`, which is emitted only for a native noncompact window. That assertion makes a compact phone fail before any PTY success marker. A landscape phone that reaches the noncompact breakpoint is excluded by the explicit tablet `--device` argument; do not rely on the runner's default device.
+
+Android Pixel Tablet API 36.1:
+
+```sh
+agent-device replay packages/app/e2e/mobile/agent-device/native-terminal-wide-keybar.android.ad --platform android --device paseo-tablet-p1-api36
+```
+
+iPad Pro 11-inch (M5), iOS 26.5: from the Namespace Mac checkout, prefill the simulator clipboard with the command below, then run the Maestro compatibility flow. Its `runFlow.when.visible` presses **Allow Paste** only if the iOS sheet appears; every other action and output assertion remains strict. The clipboard payload contains `PASTE_OK`, while only executed PTY output contains `__AD_IOS_PASTE_OK__`.
+
+```sh
+printf '%s' "printf '__AD_IOS_%s__\\n' PASTE_OK" | xcrun simctl pbcopy E49C88C3-9A60-4715-B63A-881498D1991A
+agent-device replay packages/app/e2e/mobile/agent-device/native-terminal-wide-paste.ios.yaml --maestro --platform ios --device 'iPad Pro 11-inch (M5)'
+```
+
+The unsigned simulator build used for phase 1 raises a known `getRegistrationInfoAsync` entitlement overlay on launch. The flow dismisses only that exact development error and asserts it is gone before touching terminal controls; another overlay still fails the flow. `native-terminal-wide-keybar.ios.ad` separately proves that the wide iPad bar sends Enter to the PTY. It needs no clipboard permission. The Maestro flow above is the paste gate for both first-run and already-granted states.
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.android.ad b/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.android.ad
new file mode 100644
index 0000000000..6a53573100
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.android.ad
@@ -0,0 +1,12 @@
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"workspace-tab-agent_${AGENT_ID}\"" 20000
+longpress "id=\"workspace-tab-agent_${AGENT_ID}\"" 900
+wait "id=\"workspace-tab-context-${TAB_ID}\"" 10000
+is visible "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\""
+press "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\""
+wait "id=\"workspace-tabs-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.ios.ad b/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.ios.ad
new file mode 100644
index 0000000000..fccfce679a
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.ios.ad
@@ -0,0 +1,14 @@
+context platform=ios timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"workspace-tab-agent_${AGENT_ID}\"" 20000
+longpress "id=\"workspace-tab-agent_${AGENT_ID}\"" 900
+wait "id=\"workspace-tab-context-${TAB_ID}\"" 10000
+is visible "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\""
+press "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\""
+wait "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\"" 10000
+press "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\""
+wait "id=\"agent-chat-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-context-meter.android.ad b/packages/app/e2e/mobile/agent-device/native-wide-context-meter.android.ad
new file mode 100644
index 0000000000..1c5de2da8b
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-context-meter.android.ad
@@ -0,0 +1,17 @@
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"context-window-meter\"" 20000
+press "id=\"context-window-meter\""
+wait "id=\"context-window-meter-tooltip\"" 10000
+press "id=\"tooltip-dismiss\""
+wait "id=\"context-window-meter\"" 10000
+press "id=\"context-window-meter\""
+wait "id=\"context-window-meter-tooltip\"" 10000
+press "id=\"tooltip-dismiss\""
+wait "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\"" 10000
+press "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\""
+wait "id=\"agent-chat-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-context-meter.ios.ad b/packages/app/e2e/mobile/agent-device/native-wide-context-meter.ios.ad
new file mode 100644
index 0000000000..3561b8b150
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-context-meter.ios.ad
@@ -0,0 +1,17 @@
+context platform=ios timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"context-window-meter\"" 20000
+press "id=\"context-window-meter\""
+wait "id=\"context-window-meter-tooltip\"" 10000
+press "id=\"tooltip-dismiss\""
+wait "id=\"context-window-meter\"" 10000
+press "id=\"context-window-meter\""
+wait "id=\"context-window-meter-tooltip\"" 10000
+press "id=\"tooltip-dismiss\""
+wait "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\"" 10000
+press "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\""
+wait "id=\"agent-chat-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-menu-preconditions.md b/packages/app/e2e/mobile/agent-device/native-wide-menu-preconditions.md
new file mode 100644
index 0000000000..cfb5c5f244
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-menu-preconditions.md
@@ -0,0 +1,33 @@
+# Native wide menu flows
+
+Run these on a connected task-owned tablet with the current development app and Metro bundle. `workspace-tabs-scroll` asserts the wide tab row; also pass an explicit tablet `--device` so a landscape phone above the breakpoint cannot stand in for tablet coverage. The context meter flow requires an agent tab with reported token usage selected. Its tooltip assertion uses a stable ID emitted only by the open content.
+
+The agent tab menu flow requires an existing agent tab. Set `AGENT_ID` to the ID of that agent and `TAB_ID` to its workspace tab ID (shown in the `workspace-tab-context-*` test ID) before replay. The flow long-presses the tab and selects **Copy agent id**. It does not claim that an arrow tap works.
+
+The sidebar Rename flow requires a selected workspace and its `WORKSPACE_KEY` (shown in the `sidebar-workspace-kebab-*` test ID). It opens the row's actions, opens Rename, then cancels without changing the workspace name. This covers the currently working row reported in #5226.
+
+For the native-wide tooltip dismissal flows, select an agent with reported token usage so `context-window-meter` exists. A fresh load-test stream can supply usage. The Maestro flows assert that the tooltip is absent after dismissal, then reopen it to prove the control is usable. The overlay dismissal flows assert that the tab menu and Rename dialog are absent after selection/cancel. On iPad the focused Rename input can consume the first Cancel tap; the iOS Maestro flow conditionally repeats that tap only while the dialog remains visible.
+
+For tab scrolling, first create enough tabs for actual horizontal overflow. The Android replay was validated with nine tabs and the Explorer sidebar open; the iPad replay was validated with six tabs. Set `DRAFT_ID` to a visible draft tab, `AGENT_ID` to the first visible agent tab, `OTHER_AGENT_ID` to another agent tab, and `TAB_ID` to the first agent's workspace tab ID. The short pan starts on an agent chip while a draft is selected; the draft composer must remain active. The flow then checks a stationary long press and an ordinary tap. Keep the tab row scrolled to its beginning before running the iPad flow.
+
+Android Pixel Tablet API 36.1:
+
+```sh
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-context-meter.android.ad --platform android --device paseo-tablet-p1-api36 --env OTHER_AGENT_ID=<other-agent-id>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.android.ad --platform android --device paseo-tablet-p1-api36 --env AGENT_ID=<existing-agent-id> --env TAB_ID=<existing-tab-id>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.android.ad --platform android --device paseo-tablet-p1-api36 --env WORKSPACE_KEY=<selected-workspace-key>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.android.yaml --maestro --platform android --device paseo-tablet-p1-api36
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.android.yaml --maestro --platform android --device paseo-tablet-p1-api36 --env AGENT_ID=<existing-agent-id> --env TAB_ID=<existing-tab-id> --env WORKSPACE_KEY=<selected-workspace-key>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.android.ad --platform android --device paseo-tablet-p1-api36 --env DRAFT_ID=<visible-draft-id> --env AGENT_ID=<existing-agent-id> --env OTHER_AGENT_ID=<other-agent-id> --env TAB_ID=<existing-tab-id>
+```
+
+iPad Pro 11-inch (M5), iOS 26.5, from the Namespace Mac checkout:
+
+```sh
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-context-meter.ios.ad --platform ios --device 'iPad Pro 11-inch (M5)' --env OTHER_AGENT_ID=<other-agent-id>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-agent-tab-menu.ios.ad --platform ios --device 'iPad Pro 11-inch (M5)' --env AGENT_ID=<existing-agent-id> --env OTHER_AGENT_ID=<other-agent-id> --env TAB_ID=<existing-tab-id>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.ios.ad --platform ios --device 'iPad Pro 11-inch (M5)' --env WORKSPACE_KEY=<selected-workspace-key>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.ios.yaml --maestro --platform ios --device 'iPad Pro 11-inch (M5)'
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.ios.yaml --maestro --platform ios --device 'iPad Pro 11-inch (M5)' --env WORKSPACE_KEY=<selected-workspace-key>
+agent-device replay packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.ios.ad --platform ios --device 'iPad Pro 11-inch (M5)' --env DRAFT_ID=<visible-draft-id> --env AGENT_ID=<existing-agent-id> --env OTHER_AGENT_ID=<other-agent-id> --env TAB_ID=<existing-tab-id>
+```
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.android.yaml b/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.android.yaml
new file mode 100644
index 0000000000..39b11fd1af
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.android.yaml
@@ -0,0 +1,40 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- extendedWaitUntil:
+    visible:
+      id: workspace-tabs-scroll
+    timeout: 30000
+- tapOn:
+    id: workspace-tab-agent_${AGENT_ID}
+- longPressOn:
+    id: workspace-tab-agent_${AGENT_ID}
+- assertVisible:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- tapOn:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- assertNotVisible:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- longPressOn:
+    id: workspace-tab-agent_${AGENT_ID}
+- assertVisible:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- tapOn:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- assertNotVisible:
+    id: workspace-tab-context-${TAB_ID}-copy-agent-id
+- tapOn:
+    id: sidebar-workspace-kebab-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-menu-rename-${WORKSPACE_KEY}
+- assertVisible:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel
+- assertNotVisible:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-kebab-${WORKSPACE_KEY}
+- assertVisible:
+    id: sidebar-workspace-menu-rename-${WORKSPACE_KEY}
+- stopApp
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.ios.yaml b/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.ios.yaml
new file mode 100644
index 0000000000..1504548142
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-overlay-dismissal.ios.yaml
@@ -0,0 +1,40 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- runFlow:
+    when:
+      visible: ".*getRegistrationInfoAsync.*"
+    commands:
+      - tapOn: ".*getRegistrationInfoAsync.*"
+      - tapOn: Dismiss
+- assertNotVisible: ".*getRegistrationInfoAsync.*"
+- extendedWaitUntil:
+    visible:
+      id: workspace-tabs-scroll
+    timeout: 30000
+- tapOn:
+    id: sidebar-workspace-kebab-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-menu-rename-${WORKSPACE_KEY}
+- assertVisible:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel
+- runFlow:
+    when:
+      visible:
+        id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+    commands:
+      - tapOn:
+          id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel
+- extendedWaitUntil:
+    notVisible:
+      id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+    timeout: 10000
+- assertNotVisible:
+    id: sidebar-workspace-rename-modal-${WORKSPACE_KEY}
+- tapOn:
+    id: sidebar-workspace-kebab-${WORKSPACE_KEY}
+- assertVisible:
+    id: sidebar-workspace-menu-rename-${WORKSPACE_KEY}
+- stopApp
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.android.ad b/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.android.ad
new file mode 100644
index 0000000000..49a070e02b
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.android.ad
@@ -0,0 +1,13 @@
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\"" 20000
+press "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\""
+wait "id=\"sidebar-workspace-menu-rename-${WORKSPACE_KEY}\"" 10000
+press "id=\"sidebar-workspace-menu-rename-${WORKSPACE_KEY}\""
+wait "id=\"sidebar-workspace-rename-modal-${WORKSPACE_KEY}\"" 10000
+press "id=\"sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel\""
+wait "id=\"workspace-tabs-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.ios.ad b/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.ios.ad
new file mode 100644
index 0000000000..ad637ca078
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-sidebar-rename.ios.ad
@@ -0,0 +1,16 @@
+context platform=ios timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+wait "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\"" 20000
+press "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\""
+wait "id=\"sidebar-workspace-menu-rename-${WORKSPACE_KEY}\"" 10000
+press "id=\"sidebar-workspace-menu-rename-${WORKSPACE_KEY}\""
+wait "id=\"sidebar-workspace-rename-modal-${WORKSPACE_KEY}\"" 10000
+press "id=\"sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel\""
+press "id=\"sidebar-workspace-rename-modal-${WORKSPACE_KEY}-cancel\""
+wait "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\"" 10000
+press "id=\"sidebar-workspace-kebab-${WORKSPACE_KEY}\""
+wait "id=\"sidebar-workspace-menu-rename-${WORKSPACE_KEY}\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.android.ad b/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.android.ad
new file mode 100644
index 0000000000..5016b8f576
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.android.ad
@@ -0,0 +1,17 @@
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+gesture pan 900 155 550 0 280
+press "id=\"workspace-tab-draft_${DRAFT_ID}\""
+wait "id=\"composer-import-agent-pill\"" 10000
+gesture pan 770 155 -310 0 280
+is visible "id=\"composer-import-agent-pill\""
+gesture pan 900 155 550 0 280
+longpress "id=\"workspace-tab-agent_${AGENT_ID}\"" 900
+wait "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\"" 10000
+press "label=\"Menu backdrop\""
+press "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\""
+wait "id=\"agent-chat-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.ios.ad b/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.ios.ad
new file mode 100644
index 0000000000..dcf10f72a1
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-tab-scroll.ios.ad
@@ -0,0 +1,16 @@
+context platform=ios timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"workspace-tabs-scroll\"" 20000
+press "id=\"workspace-tab-draft_${DRAFT_ID}\""
+wait "id=\"composer-import-agent-pill\"" 10000
+gesture pan 450 86 -210 0 280
+is visible "id=\"composer-import-agent-pill\""
+gesture pan 450 86 240 0 280
+longpress "id=\"workspace-tab-agent_${AGENT_ID}\"" 900
+wait "id=\"workspace-tab-context-${TAB_ID}-copy-agent-id\"" 10000
+press "label=\"Menu backdrop\""
+press "id=\"workspace-tab-agent_${OTHER_AGENT_ID}\""
+wait "id=\"agent-chat-scroll\"" 10000
+close
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.android.yaml b/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.android.yaml
new file mode 100644
index 0000000000..17413bf207
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.android.yaml
@@ -0,0 +1,23 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- extendedWaitUntil:
+    visible:
+      id: context-window-meter
+    timeout: 30000
+- tapOn:
+    id: context-window-meter
+- assertVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: tooltip-dismiss
+- assertNotVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: context-window-meter
+- assertVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: tooltip-dismiss
+- assertNotVisible:
+    id: context-window-meter-tooltip
diff --git a/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.ios.yaml b/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.ios.yaml
new file mode 100644
index 0000000000..d048bf61d3
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-wide-tooltip-dismissal.ios.yaml
@@ -0,0 +1,30 @@
+appId: sh.paseo.debug
+---
+- launchApp
+- runFlow:
+    when:
+      visible: ".*getRegistrationInfoAsync.*"
+    commands:
+      - tapOn: ".*getRegistrationInfoAsync.*"
+      - tapOn: Dismiss
+- assertNotVisible: ".*getRegistrationInfoAsync.*"
+- extendedWaitUntil:
+    visible:
+      id: context-window-meter
+    timeout: 30000
+- tapOn:
+    id: context-window-meter
+- assertVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: tooltip-dismiss
+- assertNotVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: context-window-meter
+- assertVisible:
+    id: context-window-meter-tooltip
+- tapOn:
+    id: tooltip-dismiss
+- assertNotVisible:
+    id: context-window-meter-tooltip
diff --git a/packages/app/e2e/mobile/clipboard-image.mjs b/packages/app/e2e/mobile/clipboard-image.mjs
new file mode 100644
index 0000000000..2a93f5ce20
--- /dev/null
+++ b/packages/app/e2e/mobile/clipboard-image.mjs
@@ -0,0 +1,96 @@
+// Run against a native dev app loaded from this checkout:
+// node packages/app/e2e/mobile/clipboard-image.mjs <metro-port> <app-id>
+// Exercises real native attachment persistence; Node's fetch(data:) hides this regression.
+import assert from "node:assert/strict";
+import { readFile } from "node:fs/promises";
+import { setTimeout as delay } from "node:timers/promises";
+import { WebSocket } from "ws";
+
+const [, , metroPort, appId] = process.argv;
+assert(metroPort && appId, "Pass the Metro port and native app ID");
+const targets = await fetch(`http://127.0.0.1:${Number(metroPort)}/json/list`).then((r) =>
+  r.json(),
+);
+const target = targets.find((candidate) => candidate.appId === appId);
+assert(target, `Missing Hermes target for ${appId}`);
+const png = await readFile(new URL("../../assets/images/icon.png", import.meta.url));
+const base64 = png.toString("base64");
+const socket = new WebSocket(target.webSocketDebuggerUrl);
+await new Promise((resolve, reject) => {
+  socket.once("open", resolve);
+  socket.once("error", reject);
+});
+
+let nextId = 0;
+function evaluate(expression) {
+  return new Promise((resolve, reject) => {
+    const id = ++nextId;
+    const timeout = setTimeout(() => {
+      socket.off("message", onMessage);
+      reject(new Error("Hermes evaluation timed out"));
+    }, 10000);
+    function onMessage(message) {
+      const response = JSON.parse(message.toString());
+      if (response.id !== id) return;
+      clearTimeout(timeout);
+      socket.off("message", onMessage);
+      if (response.error || response.result.exceptionDetails) {
+        reject(new Error(JSON.stringify(response.error ?? response.result.exceptionDetails)));
+      } else {
+        resolve(response.result.result.value);
+      }
+    }
+    socket.on("message", onMessage);
+    socket.send(
+      JSON.stringify({
+        id,
+        method: "Runtime.evaluate",
+        params: { expression, returnByValue: true },
+      }),
+    );
+  });
+}
+
+async function waitForNativeClipboardImage() {
+  const deadline = Date.now() + 15000;
+  do {
+    const result = await evaluate("globalThis.__clipboardImageTest");
+    if (result) return result;
+    await delay(100);
+  } while (Date.now() < deadline);
+  assert.fail("Native image persistence timed out");
+}
+
+try {
+  // Metro's debugger module table locates the same public service used by the composer.
+  // Hermes does not await promises through Runtime.evaluate, so collect the async result.
+  await evaluate(`(() => {
+    const entry = Array.from(__r.getModules().entries()).find(
+      ([, module]) => module.verboseName === "src/attachments/service.ts"
+    );
+    if (!entry) throw new Error("Open the composer before running this test");
+    const service = __r(entry[0]);
+    globalThis.__clipboardImageTest = null;
+    service.persistAttachmentFromDataUrl({
+      dataUrl: ${JSON.stringify(`data:image/png;base64,${base64}`)},
+      fileName: "clipboard.png"
+    }).then(attachment => {
+      return Promise.all([
+        service.encodeAttachmentsForSend([attachment]),
+        service.resolveAttachmentPreviewUrl(attachment)
+      ]).then(([encoded, preview]) => ({ attachment, encoded, preview }))
+        .finally(() => service.deleteAttachments([attachment]));
+    }).then(result => { globalThis.__clipboardImageTest = result; })
+      .catch(error => { globalThis.__clipboardImageTest = { error: String(error) }; });
+  })()`);
+  const result = await waitForNativeClipboardImage();
+  assert.equal(result.error, undefined, result.error);
+  assert.equal(result.attachment.storageType, "native-file");
+  assert.equal(result.attachment.byteSize, png.length);
+  assert.equal(result.attachment.fileName, "clipboard.png");
+  assert.match(result.preview, /^file:\/\//);
+  assert.deepEqual(result.encoded, [{ data: base64, mimeType: "image/png" }]);
+  console.log(`PASS: native clipboard PNG persisted, previewed, and encoded (${png.length} bytes)`);
+} finally {
+  await evaluate("delete globalThis.__clipboardImageTest").finally(() => socket.close());
+}
diff --git a/packages/app/e2e/mobile/composer-keyboard/android.sh b/packages/app/e2e/mobile/composer-keyboard/android.sh
index c6739b02b1..49c907dba9 100755
--- a/packages/app/e2e/mobile/composer-keyboard/android.sh
+++ b/packages/app/e2e/mobile/composer-keyboard/android.sh
@@ -17,6 +17,7 @@ DAEMON_HOME="${PASEO_COMPOSER_KEYBOARD_DAEMON_HOME:-${REPO_ROOT}/.dev/composer-e
 SERVER_ID="${PASEO_COMPOSER_KEYBOARD_SERVER_ID:-}"
 MESSAGE=$'keyboard invariant line one\nline two\nline three\nline four'
 LONG_MESSAGE="$(node -e 'process.stdout.write(Array.from({ length: 180 }, (_, index) => `line${index + 1}`).join(" "))')"
+BLANK_LINE_DRAFT="$(node -e 'process.stdout.write("\n".repeat(22) + "ddjdj")')"
 AGENT_TITLE="Keyboard dismiss QA $(date +%s)"
 
 if [[ -z "${SERVER_ID}" ]]; then
@@ -38,19 +39,22 @@ capture_screen() {
 
 snapshot_json() {
   local output_path="$1"
-  ad snapshot -i --json >"${output_path}"
+  local detail="${2:---raw}"
+  # A transient missing application window is a failed capture, never evidence.
+  for attempt in 1 2 3; do
+    if ad snapshot "${detail}" --json >"${output_path}"; then return; fi
+    sleep 1
+  done
+  return 1
 }
 
 capture_ui_xml() {
   local output_path="$1"
-  local device_path="/sdcard/paseo-composer-keyboard-window.xml"
-  # Android exposes one UI Automation connection at a time. Release the
-  # persistent agent-device snapshot helper before asking uiautomator for the
-  # app and IME windows; agent-device reconnects it on the next interaction.
-  adb shell am force-stop com.callstack.agentdevice.snapshothelper
-  sleep 0.2
-  adb shell uiautomator dump "${device_path}" >/dev/null
-  adb pull "${device_path}" "${output_path}" >/dev/null
+  # The helper reads current accessibility bounds without uiautomator's global
+  # idle wait (retained screens can keep that wait busy). It leaves Gboard open.
+  # Serialize those same physical bounds for the existing XML assertions.
+  snapshot_json "${output_path}.json" --raw
+  node "${ASSERT}" snapshot-xml "${output_path}.json" "${output_path}"
 }
 
 clear_input() {
@@ -68,7 +72,8 @@ wait_for_ime() {
   local expected="$1"
   local previous_top=""
   local stable_count=0
-  for _ in $(seq 1 30); do
+  # Gboard's first show after an IME switch can take several seconds on a loaded host.
+  for _ in $(seq 1 100); do
     local window_state
     window_state="$(adb shell dumpsys window)"
     if [[ "${expected}" == "true" ]]; then
@@ -86,6 +91,10 @@ wait_for_ime() {
         fi
       fi
     elif ! printf '%s' "${window_state}" | rg -q "type=ime .*visible=true"; then
+      # The window stops reporting visible when the hide animation starts. Android
+      # drops a show request made while it is still running, so let it finish
+      # before the next tap.
+      sleep 0.75
       return
     fi
     sleep 0.1
@@ -99,20 +108,26 @@ ime_is_visible() {
 }
 
 open_gboard() {
-  local x="$1"
-  local y="$2"
+  local x="$1" y="$2" height
   adb shell ime set "${GBOARD_IME}" >/dev/null
+  sleep 1
   if ime_is_visible; then
     adb shell input keyevent BACK
     wait_for_ime false
   fi
+  # IME switching can restore focus before accessibility reports its new frame.
+  # Locate the editor for each tap instead of translating a previous snapshot:
+  # an old editor position can now be a background that correctly dismisses it.
+  snapshot_json "${ARTIFACTS_DIR}/keyboard-target.json" --raw
+  read -r x y height < <(node "${ASSERT}" rect "${ARTIFACTS_DIR}/keyboard-target.json" editable right)
   adb shell input tap "${x}" "${y}"
   wait_for_ime true
-  local keyboard_shift
-  keyboard_shift="$(read_keyboard_shift)"
-  adb shell input tap "${x}" "$((y - keyboard_shift))"
+  snapshot_json "${ARTIFACTS_DIR}/keyboard-target-open.json" --raw
+  read -r x y height < <(node "${ASSERT}" rect "${ARTIFACTS_DIR}/keyboard-target-open.json" editable right)
+  adb shell input tap "${x}" "${y}"
 }
 
+
 read_keyboard_shift() {
   local ime_top
   local navigation_top
@@ -157,6 +172,7 @@ adb shell am start \
 sleep 3
 
 # Create the fixture while the client is connected so its directory replica observes the insert.
+ad wait 'id="message-input-root"' 90000
 run_json="$(env -u PASEO_CALLER_AGENT_ID -u PASEO_AGENT_ID -u PASEO_WORKSPACE_ID \
   npm run --silent cli -- run "Exercise the composer keyboard invariant flow" \
   --background \
@@ -275,6 +291,40 @@ node "${ASSERT}" xml-above-y \
   "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml" \
   "Add attachment" \
   "$(read_ime_top)"
+display_density="$(adb shell wm density | awk '/density:/ { density = $NF } END { print density }')"
+node "${ASSERT}" xml-composer-contained \
+  "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml" \
+  "$(read_ime_top)" \
+  "${display_density}"
+# Emptying a capped blank-line draft with Gboard's hold-to-delete must return the input to
+# its baseline height. Fabric only re-measures the Android input when its text prop changes,
+# so the editing input renders again after every edit
+# (packages/app/src/components/ui/text-input/text-input.native.tsx). The sequence mirrors the
+# report: grow to the cap, close and reopen the keyboard, hold delete from the middle of the
+# draft, jump to the end, hold delete again. The first hold-delete must start mid-draft: from
+# the end, the pre-fix input also returns to baseline. Backspace sits on Gboard's third key
+# row on the paseo-api35 layout.
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad fill 'editable=true' "${BLANK_LINE_DRAFT}" --settle
+open_gboard "${input_x}" "${input_y}"
+adb shell input keyevent BACK
+wait_for_ime false
+open_gboard "${input_x}" "${input_y}"
+adb shell input keycombination 113 122
+adb shell input keyevent 20 20 20 20 20 20 20 20
+screen_width="$(adb shell wm size | sed -n 's/.*: \([0-9]*\)x.*/\1/p' | tail -1)"
+backspace_x="$((screen_width - 85))"
+backspace_y="$(($(read_ime_top) + 507))"
+adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 8000
+adb shell input keycombination 113 123
+adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 12000
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad wait 'label="Message, @files, /commands"' 10000
+snapshot_json "${ARTIFACTS_DIR}/after-hold-delete.json"
+node "${ASSERT}" same-input-height \
+  "${ARTIFACTS_DIR}/baseline.json" \
+  "${ARTIFACTS_DIR}/after-hold-delete.json"
+
 adb shell ime set "${HELPER_IME}" >/dev/null
 ad fill 'editable=true' "${MESSAGE}" --settle
 open_gboard "${input_x}" "${input_y}"
@@ -337,4 +387,288 @@ node "${ASSERT}" same-region \
   1400 \
   430
 
+ad press 'id="menu-button"' --settle
+ad press 'id="sidebar-global-new-workspace"' --settle
+ad wait 'id="workspace-create-submit"' 10000
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad fill 'editable=true' "x" --settle
+snapshot_json "${ARTIFACTS_DIR}/new-workspace-short-draft.json"
+read -r new_input_x new_input_y _ < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-short-draft.json" "editable"
+)
+open_gboard "${new_input_x}" "${new_input_y}"
+capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml"
+# Typing more lines moves the setup fields up with the composer instead of
+# hiding their bottom rows behind it.
+adb shell input keycombination 113 123
+adb shell input keyevent 66 66 66
+adb shell input text grown
+sleep 1
+capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
+capture_screen "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.png"
+node "${ASSERT}" xml-fields-follow-growth \
+  "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml" \
+  "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
+
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad fill 'editable=true' "${LONG_MESSAGE}" --settle
+snapshot_json "${ARTIFACTS_DIR}/new-workspace-long-draft.json"
+read -r new_input_x new_input_y new_input_height < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-long-draft.json" "editable"
+)
+# The editor shrinks when the keyboard opens. Its bottom stays anchored, while
+# its old center can move into the setup fields after the height constraint.
+new_input_y="$((new_input_y + new_input_height / 2 - 8))"
+open_gboard "${new_input_x}" "${new_input_y}"
+capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml"
+capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.png"
+node "${ASSERT}" xml-composer-contained \
+  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
+  "$(read_ime_top)" \
+  "${display_density}"
+
+# Dismissing the keyboard moves the composer down at its editing height and
+# brings the setup fields back fully visible above it.
+adb shell input keyevent BACK
+wait_for_ime false
+capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.png"
+node "${ASSERT}" same-input-height \
+  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
+  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+node "${ASSERT}" xml-fields-above-composer \
+  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+
+# All hosts run the same scenario; only navigation differs.
+# For the shared scenario, tap the editor's blank right edge once. Tapping
+# text again after opening invokes Android's spelling menu for long drafts.
+open_editor_keyboard() {
+  local x="$1" y="$2"
+  local current_ime
+  current_ime="$(adb shell settings get secure default_input_method)"
+  if [[ "${current_ime}" != "${GBOARD_IME}" ]]; then
+    adb shell ime set "${GBOARD_IME}" >/dev/null
+    sleep 1
+  fi
+  if ! ime_is_visible; then adb shell input tap "${x}" "${y}"; fi
+  wait_for_ime true
+}
+
+prepare_composer() {
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  wait_for_ime false
+  clear_input
+  wait_for_ime false
+  snapshot_json "${ARTIFACTS_DIR}/overlay-input.json"
+  read -r overlay_x overlay_y overlay_h < <(node "${ASSERT}" rect "${ARTIFACTS_DIR}/overlay-input.json" editable right)
+  if [[ "$1" == open ]]; then open_editor_keyboard "${overlay_x}" "${overlay_y}"; fi
+}
+press_composer_control() {
+  local x y h
+  snapshot_json "${ARTIFACTS_DIR}/overlay-input.json"
+  read -r x y h < <(node "${ASSERT}" rect "${ARTIFACTS_DIR}/overlay-input.json" "$1")
+  adb shell input tap "${x}" "${y}"
+}
+
+run_host_overlays() {
+  local host="$1"
+  for mode in closed open; do
+    for query in / @README; do
+      prepare_composer closed
+      adb shell input text "${query}"
+      if [[ "${mode}" == open ]]; then open_editor_keyboard "${overlay_x}" "${overlay_y}"; fi
+      ad wait 'id="composer-autocomplete-popover"' 10000
+      local kind=commands
+      if [[ "${query}" == @* ]]; then kind=files; fi
+      capture_screen "${ARTIFACTS_DIR}/${host}-${kind}-${mode}.png"
+      clear_focused_input_with_adb
+      echo "PASS host=${host}: ${kind} popover keyboard=${mode}"
+    done
+    prepare_composer "${mode}"
+    press_composer_control combined-model-selector
+    ad wait 'id="compact-provider-list"' 10000
+    capture_screen "${ARTIFACTS_DIR}/${host}-model-${mode}.png"
+    ad press 'label="Close"' --settle
+    echo "PASS host=${host}: model selector keyboard=${mode}"
+    prepare_composer "${mode}"
+    press_composer_control message-input-attach-button
+    ad wait 'id="message-input-attachment-menu-content"' 10000
+    capture_screen "${ARTIFACTS_DIR}/${host}-attachments-${mode}.png"
+    ad press 'id="message-input-attachment-menu-item-github"' --settle
+    ad wait 'text="Attach issue or PR"' 10000
+    capture_screen "${ARTIFACTS_DIR}/${host}-forge-${mode}.png"
+    adb shell input tap 540 400
+    ad wait 'id="message-input-attach-button"' 10000
+    echo "PASS host=${host}: attachment menu and forge picker keyboard=${mode}"
+  done
+}
+
+run_host_scroll() {
+  local host="$1"
+  local prefix="${ARTIFACTS_DIR}/${host}-native-scroll"
+  prepare_composer closed
+  if [[ "${host}" == new-workspace ]]; then
+    ad press 'id="workspace-create-isolation-trigger"' --settle
+    ad press 'text="Local"' --settle
+  fi
+  # Submit through each real host; draft/workspace creation then mounts its chat.
+  # A selectable mock model keeps this test independent of provider credentials.
+  press_composer_control combined-model-selector
+  ad wait 'id="model-search-all-input"' 10000
+  ad fill 'id="model-search-all-input"' 'Ten second stream'
+  ad wait 'id="model-row-mock-ten-second-stream"' 10000
+  ad press 'id="model-row-mock-ten-second-stream"' --settle
+  ad press 'label="Close"' --settle
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  wait_for_ime false
+  local scroll_message
+  scroll_message="$(node -e 'process.stdout.write(Array.from({length: 50}, (_, i) => `Native scroll fixture ${i}: distinct history row after submitting from a dock host.`).join("\n"))')"
+  ad fill 'editable=true' "${scroll_message}"
+  if [[ "${host}" == new-workspace ]]; then
+    ad press 'id="workspace-create-submit"' --settle
+  else
+    ad press 'label="Send message"' --settle
+  fi
+  ad wait 'id="agent-chat-scroll"' 45000
+  sleep 15
+  ad wait 'text="(end of synthetic stream)"' 45000
+  if ime_is_visible; then adb shell input keyevent BACK; fi
+  wait_for_ime false
+  # Streaming/re-renders can mask responder interception. Exercise idle JS after
+  # submit, and again after returning to the bottom and letting the scrollbar fade.
+  sleep 5
+  capture_screen "${prefix}-submitted.png"
+  adb shell input swipe 540 800 540 1400 250
+  sleep 2
+  capture_screen "${prefix}-after-submit-swipe.png"
+  node "${ASSERT}" stream-moved "${prefix}-submitted.png" "${prefix}-after-submit-swipe.png"
+  for _ in 1 2 3 4 5 6; do adb shell input swipe 540 1400 540 600 120; done
+  sleep 5
+  capture_screen "${prefix}-bottom-idle.png"
+  adb shell input swipe 540 800 540 1400 250
+  sleep 2
+  capture_screen "${prefix}-after-idle-swipe.png"
+  node "${ASSERT}" stream-moved "${prefix}-bottom-idle.png" "${prefix}-after-idle-swipe.png"
+  echo "PASS host=${host}: native stream swipe after submit and after idle at bottom"
+}
+
+run_host_scenario() {
+  local host="$1"
+  local prefix="${ARTIFACTS_DIR}/${host}"
+  echo "BEGIN host=${host}"
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  wait_for_ime false
+  clear_input
+  ad keyboard dismiss || true
+  snapshot_json "${prefix}-empty.json"
+  capture_screen "${prefix}-empty.png"
+  local x y height
+  read -r x y height < <(node "${ASSERT}" rect "${prefix}-empty.json" editable right)
+  open_editor_keyboard "${x}" "${y}"
+  capture_ui_xml "${prefix}-empty-open.xml"
+  capture_screen "${prefix}-empty-open.png"
+  node "${ASSERT}" same-input-height "${prefix}-empty.json" "${prefix}-empty-open.xml"
+  # The left gutter above a one-line composer is empty on every host.
+  local dismiss_x dismiss_y
+  read -r dismiss_x dismiss_y < <(node "${ASSERT}" xml-background-point "${prefix}-empty-open.xml" content)
+  adb shell input tap "${dismiss_x}" "${dismiss_y}"
+  wait_for_ime false
+  capture_ui_xml "${prefix}-content-dismissed.xml"
+  node "${ASSERT}" same-input-height "${prefix}-empty-open.xml" "${prefix}-content-dismissed.xml"
+  open_editor_keyboard "${x}" "${y}"
+  adb shell input text short
+  capture_ui_xml "${prefix}-short.xml"
+  adb shell input keyevent 66 66 66
+  adb shell input text grown
+  capture_ui_xml "${prefix}-grown.xml"
+  capture_screen "${prefix}-grown.png"
+  node "${ASSERT}" xml-content-follow-growth "${prefix}-short.xml" "${prefix}-grown.xml"
+
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  wait_for_ime false
+  ad fill 'editable=true' "${LONG_MESSAGE}" --settle
+  snapshot_json "${prefix}-long.json"
+  read -r x y height < <(node "${ASSERT}" rect "${prefix}-long.json" editable right)
+  open_editor_keyboard "${x}" "${y}"
+  capture_ui_xml "${prefix}-long-open.xml"
+  capture_screen "${prefix}-long-open.png"
+  node "${ASSERT}" xml-composer-contained "${prefix}-long-open.xml" "$(read_ime_top)" "${display_density}"
+  # At the cap the header remains reachable even when all content is clipped.
+  read -r dismiss_x dismiss_y < <(node "${ASSERT}" xml-background-point "${prefix}-long-open.xml" header)
+  adb shell input tap "${dismiss_x}" "${dismiss_y}"
+  wait_for_ime false
+  capture_ui_xml "${prefix}-header-dismissed.xml"
+  node "${ASSERT}" same-input-height "${prefix}-long-open.xml" "${prefix}-header-dismissed.xml"
+  snapshot_json "${prefix}-header-dismissed.json"
+  read -r x y height < <(node "${ASSERT}" rect "${prefix}-header-dismissed.json" editable right)
+  open_editor_keyboard "${x}" "${y}"
+  adb shell input keyevent BACK
+  wait_for_ime false
+  capture_ui_xml "${prefix}-long-closed.xml"
+  capture_screen "${prefix}-long-closed.png"
+  node "${ASSERT}" same-input-height "${prefix}-long-open.xml" "${prefix}-long-closed.xml"
+  local navigation_top
+  navigation_top="$(adb shell dumpsys window | sed -n 's/.*type=navigationBars frame=\[0,\([0-9][0-9]*\)\].*/\1/p' | head -1)"
+  node "${ASSERT}" xml-composer-contained "${prefix}-long-closed.xml" "${navigation_top}" "${display_density}"
+  snapshot_json "${prefix}-long-closed.json"
+  read -r x y height < <(node "${ASSERT}" rect "${prefix}-long-closed.json" editable right)
+  open_editor_keyboard "${x}" "${y}"
+  capture_ui_xml "${prefix}-long-reopened.xml"
+  capture_screen "${prefix}-long-reopened.png"
+  node "${ASSERT}" same-input-height "${prefix}-long-open.xml" "${prefix}-long-reopened.xml"
+
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  wait_for_ime false
+  ad fill 'editable=true' "${BLANK_LINE_DRAFT}" --settle
+  open_editor_keyboard "${x}" "${y}"
+  adb shell input keyevent BACK
+  wait_for_ime false
+  open_editor_keyboard "${x}" "${y}"
+  adb shell input keycombination 113 122
+  adb shell input keyevent 20 20 20 20 20 20 20 20
+  local delete_y="$(($(read_ime_top) + 507))"
+  adb shell input swipe "${backspace_x}" "${delete_y}" "${backspace_x}" "${delete_y}" 8000
+  adb shell input keycombination 113 123
+  adb shell input swipe "${backspace_x}" "${delete_y}" "${backspace_x}" "${delete_y}" 12000
+  capture_ui_xml "${prefix}-cleared.xml"
+  capture_screen "${prefix}-cleared.png"
+  node "${ASSERT}" same-input-height "${prefix}-empty-open.xml" "${prefix}-cleared.xml"
+  adb shell input keyevent BACK
+  wait_for_ime false
+  snapshot_json "${prefix}-cleared-closed.json"
+  read -r x y height < <(node "${ASSERT}" rect "${prefix}-cleared-closed.json" editable right)
+  capture_screen "${prefix}-stall-baseline.png"
+  capture_screen "${prefix}-cleared-closed.png"
+  open_editor_keyboard "${x}" "${y}"
+  node "${STALL_HERMES}" "${METRO_PORT}" 3000 "${APP_ID}" &
+  local stall_pid="$!"
+  sleep 0.25
+  adb shell input keyevent BACK
+  wait_for_ime false
+  sleep 0.5
+  capture_screen "${prefix}-during-stall.png"
+  wait "${stall_pid}"
+  capture_screen "${prefix}-after-stall.png"
+  node "${ASSERT}" same-region "${prefix}-stall-baseline.png" "${prefix}-during-stall.png" 1400 430
+  node "${ASSERT}" same-region "${prefix}-stall-baseline.png" "${prefix}-after-stall.png" 1400 430
+  echo "PASS host=${host}: growth, header/keyboard/safe-area bounds, close/reopen height, hold-delete baseline, content/header dismissal, JS-stall motion"
+  run_host_overlays "${host}"
+  run_host_scroll "${host}"
+}
+
+adb shell am start -a android.intent.action.VIEW -d "paseo://h/${SERVER_ID}/agent/${agent_id}" "${APP_ID}" >/dev/null
+ad wait "text=\"${AGENT_TITLE}\"" 10000
+run_host_scenario chat
+ad keyboard dismiss || true
+ad press 'id="workspace-tab-switcher-trigger"' --settle
+ad wait 'id="workspace-tab-switcher-new-agent"' 10000
+ad press 'id="workspace-tab-switcher-new-agent"' --settle
+ad wait 'text="New Agent"' 10000
+run_host_scenario workspace-draft
+ad keyboard dismiss || true
+ad press 'id="menu-button"' --settle
+ad press 'id="sidebar-global-new-workspace"' --settle
+ad wait 'id="workspace-create-submit"' 10000
+run_host_scenario new-workspace
+
 echo "Composer keyboard invariants passed"
diff --git a/packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs b/packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs
index 3aaff5b2e0..6bd13a5da5 100644
--- a/packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs
+++ b/packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs
@@ -4,15 +4,129 @@ import sharp from "sharp";
 
 const [, , command, ...args] = process.argv;
 
-if (command === "rect") {
-  const [snapshotPath, identifier] = args;
+// uiautomator reports bounds clipped to the visible parent and omits nodes
+// that are entirely off screen.
+function xmlBounds(snapshot, attribute) {
+  const node = snapshot.match(new RegExp(`<node[^>]*${attribute}[^>]*>`));
+  if (!node) throw new Error(`Missing node: ${attribute}`);
+  const bounds = node[0].match(/bounds="\[(-?\d+),(-?\d+)\]\[(-?\d+),(-?\d+)\]"/);
+  if (!bounds) throw new Error(`Missing bounds: ${attribute}`);
+  return {
+    left: Number(bounds[1]),
+    top: Number(bounds[2]),
+    right: Number(bounds[3]),
+    bottom: Number(bounds[4]),
+  };
+}
+const xmlBoundsById = (snapshot, id) => xmlBounds(snapshot, `resource-id="${id}"`);
+const xmlEditTextBounds = (snapshot) => xmlBounds(snapshot, 'class="android.widget.EditText"');
+const boundsHeight = (bounds) => bounds.bottom - bounds.top;
+
+if (command === "stream-moved") {
+  const [beforePath, afterPath, topArgument = "330", heightArgument = "1000"] = args;
+  const { width } = await sharp(beforePath).metadata();
+  const region = {
+    left: 16,
+    top: Number(topArgument),
+    width: width - 32,
+    height: Number(heightArgument),
+  };
+  const [before, after] = await Promise.all(
+    [beforePath, afterPath].map((path) =>
+      sharp(path).extract(region).removeAlpha().raw().toBuffer(),
+    ),
+  );
+  let changed = 0;
+  for (let offset = 0; offset < before.length; offset += 3) {
+    if (
+      [0, 1, 2].some((channel) => Math.abs(before[offset + channel] - after[offset + channel]) > 8)
+    )
+      changed++;
+  }
+  const fraction = changed / (before.length / 3);
+  // Exclude the scrollbar rail and require more than incidental icon/antialias changes.
+  if (fraction < 0.01)
+    throw new Error(
+      `Native swipe did not move stream content: ${(fraction * 100).toFixed(2)}% changed`,
+    );
+  process.stdout.write(
+    `Native swipe moved stream content: ${(fraction * 100).toFixed(2)}% changed\n`,
+  );
+} else if (command === "snapshot-xml") {
+  const [inputPath, outputPath] = args;
+  const snapshot = JSON.parse(await fs.readFile(inputPath, "utf8"));
+  if (!snapshot.success || !snapshot.data.nodes.length) throw new Error("Empty device snapshot");
+  const escape = (value) =>
+    String(value ?? "")
+      .replaceAll("&", "&amp;")
+      .replaceAll('"', "&quot;")
+      .replaceAll("<", "&lt;")
+      .replaceAll(">", "&gt;");
+  const nodes = snapshot.data.nodes
+    .filter((node) => node.rect && node.visibleToUser !== false)
+    .map((node) => {
+      const { x, y, width, height } = node.rect;
+      return `<node class="${escape(node.type)}" resource-id="${escape(node.identifier)}" content-desc="${escape(node.label)}" bounds="[${Math.round(x)},${Math.round(y)}][${Math.round(x + width)},${Math.round(y + height)}]" />`;
+    });
+  await fs.writeFile(outputPath, `<hierarchy>${nodes.join("")}</hierarchy>`);
+} else if (command === "xml-background-point") {
+  const [snapshotPath, surface] = args;
+  const snapshot = await fs.readFile(snapshotPath, "utf8");
+  const bounds = xmlBoundsById(
+    snapshot,
+    surface === "header" ? "composer-dock-header" : "composer-dock-content",
+  );
+  process.stdout.write(
+    `${surface === "header" ? bounds.right - 4 : bounds.left + 4} ${bounds.bottom - 8}\n`,
+  );
+} else if (command === "xml-content-follow-growth") {
+  const [beforePath, afterPath] = args;
+  const before = await fs.readFile(beforePath, "utf8");
+  const after = await fs.readFile(afterPath, "utf8");
+  const growth = boundsHeight(xmlEditTextBounds(after)) - boundsHeight(xmlEditTextBounds(before));
+  const movement =
+    xmlBoundsById(before, "composer-dock-content").bottom -
+    xmlBoundsById(after, "composer-dock-content").bottom;
+  if (growth <= 0 || Math.abs(movement - growth) > 1)
+    throw new Error(`Content moved ${movement}px for ${growth}px input growth`);
+  process.stdout.write(`Content followed input growth: ${growth}px\n`);
+} else if (command === "xml-composer-contained") {
+  const [snapshotPath, imeTopArgument, densityArgument] = args;
+  const snapshot = await fs.readFile(snapshotPath, "utf8");
+  const boundsFor = (id) => xmlBoundsById(snapshot, id);
+  const viewport = boundsFor("composer-viewport");
+  const content = boundsFor("composer-viewport-content");
+  const composer = boundsFor("message-input-root");
+  const controls = boundsFor("message-input-attach-button");
+  const clearance = (5 * Number(densityArgument)) / 160;
+  const minimumTop = viewport.top + clearance;
+  // Android rounds layout units to physical pixels; allow one pixel of rounding.
+  if (content.top < minimumTop - 1 || composer.top < minimumTop - 1) {
+    throw new Error(
+      `Composer overlaps header: content=${content.top}, editor=${composer.top}, minimum=${minimumTop}`,
+    );
+  }
+  if (composer.bottom > Number(imeTopArgument) || controls.bottom > Number(imeTopArgument)) {
+    throw new Error(
+      `Composer extends behind keyboard: editor=${composer.bottom}, controls=${controls.bottom}, keyboard=${imeTopArgument}`,
+    );
+  }
+  process.stdout.write(
+    `Composer contained: top=${composer.top}, header=${viewport.top}, bottom=${composer.bottom}, keyboard=${imeTopArgument}\n`,
+  );
+} else if (command === "rect") {
+  const [snapshotPath, identifier, edge] = args;
   const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
   const node = snapshot.data.nodes.find(
-    (candidate) => candidate.identifier === identifier || candidate.label === identifier,
+    (candidate) =>
+      candidate.identifier === identifier ||
+      candidate.label === identifier ||
+      (identifier === "editable" && candidate.type.endsWith("EditText")),
   );
   if (!node) throw new Error(`Missing node: ${identifier}`);
   const { x, y, width, height } = node.rect;
-  process.stdout.write(`${Math.round(x + width / 2)} ${Math.round(y + height / 2)} ${height}\n`);
+  const targetX = edge === "right" ? x + width - 4 : x + width / 2;
+  process.stdout.write(`${Math.round(targetX)} ${Math.round(y + height / 2)} ${height}\n`);
 } else if (command === "above-y") {
   const [snapshotPath, upperIdentifier, lowerYArgument] = args;
   const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
@@ -58,9 +172,46 @@ if (command === "rect") {
   if (changedRatio > 0.01) {
     throw new Error(`Header changed while the keyboard opened (${changedRatio.toFixed(3)})`);
   }
+} else if (command === "xml-fields-follow-growth") {
+  // Growing the draft with the keyboard open moves the setup fields up by the
+  // same amount; the composer never eats their bottom rows.
+  const [beforePath, afterPath] = args;
+  const [before, after] = await Promise.all([
+    fs.readFile(beforePath, "utf8"),
+    fs.readFile(afterPath, "utf8"),
+  ]);
+  const growth = boundsHeight(xmlEditTextBounds(after)) - boundsHeight(xmlEditTextBounds(before));
+  if (growth <= 0) throw new Error(`Composer did not grow (${growth}px)`);
+  const fieldsBefore = xmlBoundsById(before, "new-workspace-launch-trigger");
+  const fieldsAfter = xmlBoundsById(after, "new-workspace-launch-trigger");
+  const moved = fieldsBefore.bottom - fieldsAfter.bottom;
+  if (Math.abs(moved - growth) > 2) {
+    throw new Error(`Setup fields moved ${moved}px while the composer grew ${growth}px`);
+  }
+  process.stdout.write(`Setup fields followed composer growth: ${growth}px\n`);
+} else if (command === "xml-fields-above-composer") {
+  // With the keyboard closed the setup fields sit fully visible above the composer.
+  const [snapshotPath] = args;
+  const snapshot = await fs.readFile(snapshotPath, "utf8");
+  const fields = xmlBoundsById(snapshot, "new-workspace-launch-trigger");
+  const content = xmlBoundsById(snapshot, "composer-viewport-content");
+  if (boundsHeight(fields) < 40) {
+    throw new Error(`Setup fields are clipped: launch row height=${boundsHeight(fields)}`);
+  }
+  if (fields.bottom > content.top) {
+    throw new Error(
+      `Setup fields overlap the composer: fields=${fields.bottom}, composer=${content.top}`,
+    );
+  }
+  process.stdout.write(
+    `Setup fields visible above the composer: ${fields.bottom} <= ${content.top}\n`,
+  );
 } else if (command === "same-input-height") {
   const [firstPath, secondPath] = args;
   const readInputHeight = async (snapshotPath) => {
+    if (snapshotPath.endsWith(".xml")) {
+      return boundsHeight(xmlEditTextBounds(await fs.readFile(snapshotPath, "utf8")));
+    }
     const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
     const input = snapshot.data.nodes.find((candidate) => candidate.type.endsWith("EditText"));
     if (!input) throw new Error(`Missing composer input in ${snapshotPath}`);
@@ -70,7 +221,9 @@ if (command === "rect") {
     readInputHeight(firstPath),
     readInputHeight(secondPath),
   ]);
-  if (firstHeight !== secondHeight) {
+  // Yoga rounds each edge to physical pixels; moving the same-sized input can
+  // change its reported height by one pixel when its origin is fractional.
+  if (Math.abs(firstHeight - secondHeight) > 1) {
     throw new Error(`Composer height drifted from ${firstHeight} to ${secondHeight}`);
   }
 } else if (command === "has-exact-text") {
diff --git a/packages/app/e2e/mobile/diff-tree/README.md b/packages/app/e2e/mobile/diff-tree/README.md
new file mode 100644
index 0000000000..6f73b89751
--- /dev/null
+++ b/packages/app/e2e/mobile/diff-tree/README.md
@@ -0,0 +1,32 @@
+# Mobile diff tree appearance
+
+## Reproduce the row shadow
+
+Use an Android emulator with a workspace containing 80 modified text files,
+named `file-000.txt` through `file-079.txt`. Each file changes `before` to `after`.
+
+1. Open the workspace's Changes sidebar, then **Jump to file**.
+2. Swipe upward through the tree until `file-079.txt` is visible.
+3. Inspect the row where the scroll gesture started. It must remain flat.
+4. Swipe back to the first file, then return to the last file and select it.
+   The sheet should close and show that file's diff.
+
+## Recorded verification
+
+Android API 35, 1080×1920. The baseline produced a raised gray shadow around
+`file-074.txt` after scrolling. The fixed build reached the same last row without
+the shadow. Baseline scrolling in both directions and selection of the last file
+passed; the fixed build also reached the last row and closed the sheet on selection.
+The fixed-build assertion for the selected diff header did not match, so it does
+not establish the final jump position.
+
+| Before                             | After                            |
+| ---------------------------------- | -------------------------------- |
+| ![Row shadow](evidence/before.png) | ![Flat rows](evidence/after.png) |
+
+| Light                             | Dark                            |
+| --------------------------------- | ------------------------------- |
+| ![Light diff](evidence/light.png) | ![Dark diff](evidence/dark.png) |
+
+The shadow check is visual; the existing header-interaction unit test does not
+test Android rendering. iOS, browser web, and Electron were not manually exercised.
diff --git a/packages/app/e2e/mobile/diff-tree/evidence/after.png b/packages/app/e2e/mobile/diff-tree/evidence/after.png
new file mode 100644
index 0000000000..8cb3f32a89
Binary files /dev/null and b/packages/app/e2e/mobile/diff-tree/evidence/after.png differ
diff --git a/packages/app/e2e/mobile/diff-tree/evidence/before.png b/packages/app/e2e/mobile/diff-tree/evidence/before.png
new file mode 100644
index 0000000000..81441a06dd
Binary files /dev/null and b/packages/app/e2e/mobile/diff-tree/evidence/before.png differ
diff --git a/packages/app/e2e/mobile/diff-tree/evidence/dark.png b/packages/app/e2e/mobile/diff-tree/evidence/dark.png
new file mode 100644
index 0000000000..8e50891183
Binary files /dev/null and b/packages/app/e2e/mobile/diff-tree/evidence/dark.png differ
diff --git a/packages/app/e2e/mobile/diff-tree/evidence/light.png b/packages/app/e2e/mobile/diff-tree/evidence/light.png
new file mode 100644
index 0000000000..fa4473c89b
Binary files /dev/null and b/packages/app/e2e/mobile/diff-tree/evidence/light.png differ
diff --git a/packages/app/e2e/mobile/modal-sheet/README.md b/packages/app/e2e/mobile/modal-sheet/README.md
new file mode 100644
index 0000000000..8a59b16883
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/README.md
@@ -0,0 +1,141 @@
+# Native modal and sheet gestures
+
+## Compact sheet gestures
+
+Use an Android emulator at 1080×1920, density 420, with the checkout's native app bundle loaded.
+Connect the app to an isolated daemon, enable plugins, and install `plugin-examples/modal-ui` there.
+Set `SHEET_QA_SERVER_ID` to that host's server ID, then run from the repository root:
+
+```sh
+agent-device test packages/app/e2e/mobile/modal-sheet/gestures.android.ad \
+  --env EXAMPLES_URL="paseo://h/${SHEET_QA_SERVER_ID}/plugin/modal-ui-example/surface/main" \
+  --record-video --artifacts-dir .dev/sheet-qa/plugin
+
+agent-device test packages/app/e2e/mobile/modal-sheet/model.android.ad \
+  --env FORM_URL="paseo://new?serverId=${SHEET_QA_SERVER_ID}" \
+  --record-video --artifacts-dir .dev/sheet-qa/model
+```
+
+The plugin journey checks body dismissal, reopening, expansion and last-row reachability with SDK
+ScrollView and FlatList, programmatic scrolling after expansion, downward list scrolling, and
+horizontal tab selection. The model journey checks body dismissal and the nested sheet's return to
+its parent without selecting a model or submitting a prompt. It does not assert catalog contents.
+
+These scripts live outside the default mobile suite because they require the installed example and
+an explicit connected host. See [mobile testing](../../../../../docs/mobile-testing.md) for device setup.
+
+### Recorded verification
+
+Android API 35, 1080×1920 at density 420, development binary 0.7.2 with this checkout's JavaScript.
+Plugin tests used an isolated daemon. Recordings show the same body drag
+[before](evidence/android-before.mp4) and [after](evidence/android-after.mp4) the fix.
+The [browser recording](evidence/browser.webm) covers the existing plugin modal journey at wide and
+compact sizes.
+
+```text
+Baseline dismissal regression:
+failed at step 6: wait timed out for selector: label="Open ScrollView"
+Current surface: Bottom sheet handle, Bottom Sheet, Close, Row 1.
+
+Fixed dismissal regression: 1 passed (6.47s)
+Full plugin gesture journey: 1 passed (44.3s)
+Model sheet dismissal/reopen journey: 1 passed (13.7s)
+Browser plugin-modal-body.spec.ts: 1 passed (33.4s)
+Root typecheck, lint and format: passed
+```
+
+The model form's catalog stayed on “Loading…” in the debug app even though the isolated daemon's
+provider API returned models. Its sheet dismissal/reopen was exercised; populated model selection
+was not. iOS and Electron were not exercised.
+
+## Tablet model selection
+
+`model-tablet.android.ad` exercises the New workspace popover. `model-tablet-agent.android.ad`
+exercises the modal used by an existing agent's narrow composer on a wide device. Both drill into
+a populated provider, select a real model, assert the updated trigger, reopen, and dismiss with
+Android Back. New workspace also pans beyond the short list viewport and flings back without
+selecting a row or dismissing the popover. They do not submit a prompt.
+
+Use an English-language Android tablet at 1600×2560, density 320 (800dp), with this checkout's
+JavaScript and a connected isolated daemon. On a Pixel Tablet AVD, rotate to portrait explicitly;
+its natural landscape orientation letterboxes this portrait-locked app into the compact layout:
+
+```sh
+adb -s "$ANDROID_SERIAL" shell settings put system accelerometer_rotation 0
+adb -s "$ANDROID_SERIAL" shell settings put system user_rotation 1
+adb -s "$ANDROID_SERIAL" shell wm density 320
+```
+
+Prepare an idle agent through the daemon's public `createAgent` API with a real provider/model and
+no initial prompt. Set `MODEL_QA_AGENT_ID` and `MODEL_QA_AGENT_TITLE` to that agent. In New workspace,
+remember a model first (the phone layout works on the broken baseline), then close the picker.
+Choose a model visible on the provider's first page and set its catalog ID and displayed label.
+Set `MODEL_QA_LAST_MODEL_ID` to its initially offscreen last model; use a short overflowing catalog
+(six rows during this verification) for the coordinate-based pan/fling regression:
+
+```sh
+agent-device test packages/app/e2e/mobile/modal-sheet/model-tablet.android.ad \
+  packages/app/e2e/mobile/modal-sheet/model-tablet-agent.android.ad \
+  --serial "$ANDROID_SERIAL" --metro-port "$MODEL_QA_METRO_PORT" \
+  --env FORM_URL="paseo://new?serverId=${SHEET_QA_SERVER_ID}" \
+  --env AGENT_URL="paseo://h/${SHEET_QA_SERVER_ID}/agent/${MODEL_QA_AGENT_ID}" \
+  --env AGENT_TITLE="$MODEL_QA_AGENT_TITLE" \
+  --env PROVIDER_ID=codex --env MODEL_ID="$MODEL_QA_MODEL_ID" \
+  --env MODEL_LABEL="$MODEL_QA_MODEL_LABEL" --env LAST_MODEL_ID="$MODEL_QA_LAST_MODEL_ID" \
+  --artifacts-dir /tmp/paseo-model-tablet-qa
+```
+
+The existing-agent journey needs the sidebar pinned so its composer stays narrow. Start each run with no modal open;
+a failed provider tap leaves its modal open, so dismiss it before the next run. These host-dependent
+journeys remain outside the default mobile suite, alongside the compact sheet journeys above.
+
+Keep generated screenshots, recordings, and run logs outside the repository.
+
+## Stacked adaptive sheets
+
+`stacked-pairing.ad` opens the welcome screen's pairing sheet and then the root-mounted host
+confirmation. It first types without tapping the input to verify autofocus, then cancels the
+confirmation, closes and reopens the underlying sheet, confirms again,
+and completes the password retry. `stacked-settings.ad` checks the same return and retry through
+Settings → add host → Direct connection → Advanced. Run both on phones and tablets so both the
+bottom sheet and centered dialog are exercised.
+
+These integration journeys require the host-confirmation flow in the test app. Include both the
+sheet fix and that flow in the QA checkout when verifying them; the production sheet component
+has no dependency on the host-confirmation feature.
+
+Use a fresh English app with notification permission granted and first-use keyboard prompts
+already dismissed. Load this checkout from an isolated Metro. Start an isolated password-protected
+daemon and a local Wrangler relay with `--var 'PASEO_RELAY_UPSTREAM:'`; the checked-in upstream
+setting otherwise forwards traffic to the hosted relay, which drops password rejection replies.
+Set `PAIRING_LINK` to the daemon's `relay://` URI with an intentionally incorrect `password` query
+parameter, and `PASSWORD` to its correct password. This exercises password retry even while the
+daemon accepts relay connections with no credential.
+
+```sh
+agent-device replay packages/app/e2e/mobile/modal-sheet/stacked-pairing.ad \
+  --state-dir "$SHEET_QA_DEVICE_STATE" --session stacked-ipad --platform ios \
+  --udid "$SHEET_QA_IOS_UDID" \
+  --env PAIRING_LINK="$SHEET_QA_LINK" --env PASSWORD="$SHEET_QA_PASSWORD" \
+  --env OUT="$SHEET_QA_OUTPUT"
+```
+
+For Settings, first open Settings with Add host visible. With a saved host, open Switch host
+first. Use a second loopback spelling
+(`localhost` instead of `127.0.0.1`) for the same local relay so the saved host asks for confirmation
+of its changed connection. Pass that link to `stacked-settings.ad` with the same arguments.
+For an app with no saved hosts, use the original link; Add host is visible directly in Settings.
+
+Android uses the same journeys: copy each script outside the repository, change its context's
+`platform=ios` to `platform=android`, and pass `--serial` instead of `--udid`. Reverse both Metro
+(including the port advertised by its manifest) and the local relay ports. Keep driver state,
+artifacts, and sessions separate from other runs. These host-dependent journeys remain outside the
+default mobile suite, alongside the existing modal-sheet scripts.
+
+On iPhone, bulk replacement or bulk keyboard entry of the advanced URI field triggers a
+repeated-update error with both the parent and stacked-sheet implementations. Entering the complete
+URI one character at a time passed with both implementations; faster typing remains unverified.
+On iPad, replacing the field a second time appends text. For this Settings journey, use the
+native clipboard Paste menu, then continue the assertions manually. Dismiss the password keyboard
+with Done to submit when the Connect button is below the keyboard. The welcome pairing regression
+runs end to end without these adjustments.
diff --git a/packages/app/e2e/mobile/modal-sheet/evidence/android-after.mp4 b/packages/app/e2e/mobile/modal-sheet/evidence/android-after.mp4
new file mode 100644
index 0000000000..d258f9da7f
Binary files /dev/null and b/packages/app/e2e/mobile/modal-sheet/evidence/android-after.mp4 differ
diff --git a/packages/app/e2e/mobile/modal-sheet/evidence/android-before.mp4 b/packages/app/e2e/mobile/modal-sheet/evidence/android-before.mp4
new file mode 100644
index 0000000000..3a878c9378
Binary files /dev/null and b/packages/app/e2e/mobile/modal-sheet/evidence/android-before.mp4 differ
diff --git a/packages/app/e2e/mobile/modal-sheet/evidence/browser.webm b/packages/app/e2e/mobile/modal-sheet/evidence/browser.webm
new file mode 100644
index 0000000000..14b6d05fc8
Binary files /dev/null and b/packages/app/e2e/mobile/modal-sheet/evidence/browser.webm differ
diff --git a/packages/app/e2e/mobile/modal-sheet/gestures.android.ad b/packages/app/e2e/mobile/modal-sheet/gestures.android.ad
new file mode 100644
index 0000000000..083e766bcf
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/gestures.android.ad
@@ -0,0 +1,52 @@
+# Install plugin-examples/modal-ui on the connected host and set EXAMPLES_URL to
+# paseo://h/<serverId>/plugin/modal-ui-example/surface/main.
+# Gesture coordinates target a 1080x1920 Android emulator at density 420.
+context platform=android timeout=120000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}" "${EXAMPLES_URL}"
+wait "label=\"Open ScrollView\"" 20000
+press "label=\"Open ScrollView\""
+wait "label=\"Row 1\"" 10000
+gesture pan 540 980 0 820 500
+wait "label=\"Open ScrollView\"" 3000
+
+# The caller-owned ScrollView expands with a body drag and reaches its final row.
+press "label=\"Open ScrollView\""
+wait "label=\"Row 1\"" 10000
+gesture pan 540 980 0 -600 500
+wait "label=\"Row 10\"" 3000
+scroll bottom
+wait "label=\"Row 100\"" 3000
+press "role=\"button\" label=\"Row 100\""
+press "label=\"Close\""
+wait "text=\"Selected: Row 100\"" 3000
+
+# FlatList has the same body dismissal, then supports refs after expansion.
+press "label=\"Open FlatList\""
+wait "label=\"Row 1\"" 10000
+gesture pan 540 1100 0 700 500
+wait "label=\"Open FlatList\"" 3000
+press "label=\"Open FlatList\""
+wait "label=\"Row 1\"" 10000
+gesture pan 540 1140 0 -750 500
+wait "label=\"Row 9\"" 3000
+press "label=\"Jump to last row\""
+wait "label=\"Row 100\"" 3000
+# Dragging down while scrolled moves the list, leaving the sheet open.
+gesture pan 540 650 0 900 500
+wait "label=\"Row 88\"" 3000
+is visible "label=\"Close\""
+press "label=\"Close\""
+wait "label=\"Open Horizontal\"" 3000
+
+# Horizontal tabs still receive gestures inside the host-owned vertical body.
+press "label=\"Open Horizontal\""
+wait "label=\"Overview\"" 10000
+gesture pan 960 980 -880 0 500
+wait stable 300 5000
+press "role=\"button\" label=\"System logs\""
+wait stable 300 5000
+press "label=\"Close\""
+wait "text=\"Selected: System logs\"" 3000
+close
diff --git a/packages/app/e2e/mobile/modal-sheet/model-tablet-agent.android.ad b/packages/app/e2e/mobile/modal-sheet/model-tablet-agent.android.ad
new file mode 100644
index 0000000000..b8a570c4fb
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/model-tablet-agent.android.ad
@@ -0,0 +1,23 @@
+# Idle existing agent in a narrow composer on a wide Android device (AdaptiveModalSheet).
+# AGENT_URL=paseo://h/<serverId>/agent/<agentId>; AGENT_TITLE identifies the loaded route.
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+env PROVIDER_ID=codex
+
+open "${APP_ID}" "${AGENT_URL}"
+wait "label=\"${AGENT_TITLE}\"" 20000
+wait "id=\"combined-model-selector\"" 10000
+press "id=\"combined-model-selector\""
+wait "id=\"model-provider-${PROVIDER_ID}\"" 10000
+press "id=\"model-provider-${PROVIDER_ID}\""
+wait "id=\"compact-model-list\"" 3000
+press "id=\"model-row-${PROVIDER_ID}-${MODEL_ID}\""
+wait "id=\"combined-model-selector\" label=\"Select model (${MODEL_LABEL})\"" 3000
+
+press "id=\"combined-model-selector\""
+wait "id=\"model-provider-${PROVIDER_ID}\"" 10000
+press "id=\"model-provider-${PROVIDER_ID}\""
+wait "id=\"model-row-${PROVIDER_ID}-${MODEL_ID}\"" 3000
+back
+wait "id=\"combined-model-selector\" label=\"Select model (${MODEL_LABEL})\"" 3000
+close
diff --git a/packages/app/e2e/mobile/modal-sheet/model-tablet.android.ad b/packages/app/e2e/mobile/modal-sheet/model-tablet.android.ad
new file mode 100644
index 0000000000..74564a13c6
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/model-tablet.android.ad
@@ -0,0 +1,30 @@
+# Connected host with a selected model, 1600x2560 at density 320. See README.md.
+# FORM_URL=paseo://new?serverId=<serverId>; MODEL_ID and MODEL_LABEL name a real catalog model.
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+env PROVIDER_ID=codex
+
+open "${APP_ID}" "${FORM_URL}"
+wait "label=\"Workspace project\"" 20000
+press "id=\"combined-model-selector\""
+wait "id=\"combobox-desktop-container\"" 10000
+# A remembered model opens its provider's list. Return to the provider page first.
+press "label=\"Back\""
+wait "id=\"model-provider-${PROVIDER_ID}\"" 10000
+press "id=\"model-provider-${PROVIDER_ID}\""
+wait "id=\"compact-model-list\"" 3000
+press "id=\"model-row-${PROVIDER_ID}-${MODEL_ID}\""
+wait "id=\"combined-model-selector\" label=\"Select model (${MODEL_LABEL})\"" 3000
+
+# A drag that leaves the short viewport must scroll without selecting or dismissing.
+press "id=\"combined-model-selector\""
+wait "id=\"model-row-${PROVIDER_ID}-${MODEL_ID}\"" 3000
+gesture pan 1000 1850 0 -700 600
+wait "id=\"compact-model-list\"" 3000
+wait "id=\"model-row-${PROVIDER_ID}-${LAST_MODEL_ID}\"" 3000
+gesture fling down 1000 1750 500
+wait "id=\"model-row-${PROVIDER_ID}-${MODEL_ID}\"" 3000
+# Android Back dismisses the whole popover without changing the remembered selection.
+back
+wait "id=\"combined-model-selector\" label=\"Select model (${MODEL_LABEL})\"" 3000
+close
diff --git a/packages/app/e2e/mobile/modal-sheet/model.android.ad b/packages/app/e2e/mobile/modal-sheet/model.android.ad
new file mode 100644
index 0000000000..8a2d534b7b
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/model.android.ad
@@ -0,0 +1,22 @@
+# FORM_URL is paseo://new?serverId=<connected-serverId>.
+# Gesture coordinates target a 1080x1920 Android emulator at density 420.
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}" "${FORM_URL}"
+wait "id=\"combined-model-selector\"" 20000
+press "id=\"combined-model-selector\""
+wait "id=\"agent-controls-model\"" 10000
+gesture pan 540 790 0 960 500
+wait "id=\"combined-model-selector\"" 3000
+
+# Reopen, dismiss the nested model browser, then dismiss its restored parent.
+press "id=\"combined-model-selector\""
+wait "id=\"agent-controls-model\"" 10000
+press "id=\"agent-controls-model\""
+wait stable 300 5000
+gesture pan 540 790 0 960 500
+wait "id=\"agent-controls-model\"" 3000
+gesture pan 540 790 0 960 500
+wait "id=\"combined-model-selector\"" 3000
+close
diff --git a/packages/app/e2e/mobile/modal-sheet/stacked-pairing.ad b/packages/app/e2e/mobile/modal-sheet/stacked-pairing.ad
new file mode 100644
index 0000000000..d51d3ce060
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/stacked-pairing.ad
@@ -0,0 +1,50 @@
+# Fresh English app at Welcome, local relay host with PASSWORD, see README.md.
+# Run on phones and tablets: the confirmation lives at the root, outside the pairing sheet.
+context platform=ios timeout=180000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "id=\"welcome-paste-pairing-link\"" 20000
+screenshot "${OUT}/01-welcome.png"
+press "id=\"welcome-paste-pairing-link\""
+wait stable
+# Type without tapping the input: opening the sheet must retain its autofocus.
+wait "id=\"pair-link-input\"" 10000
+type "relay://"
+wait "id=\"pair-link-input\" value=\"relay://\"" 5000
+screenshot "${OUT}/20-pairing-autofocus-without-tap.png"
+fill "id=\"pair-link-input\"" "${PAIRING_LINK}"
+wait stable
+screenshot "${OUT}/02-pairing-input.png"
+press "id=\"pair-link-submit\""
+wait stable
+wait "id=\"host-confirmation-connect\"" 10000
+screenshot "${OUT}/03-confirmation-on-top.png"
+press "id=\"host-confirmation-cancel\""
+wait stable
+wait "id=\"pair-link-submit\" enabled=true" 10000
+screenshot "${OUT}/04-cancel-returns-to-pairing.png"
+# Close and reopen the underlying sheet, then edit it and submit again.
+press "id=\"pair-link-cancel\""
+wait stable
+wait "id=\"welcome-paste-pairing-link\"" 10000
+screenshot "${OUT}/05-underlying-sheet-closes.png"
+press "id=\"welcome-paste-pairing-link\""
+wait stable
+wait "id=\"pair-link-input\"" 10000
+fill "id=\"pair-link-input\"" "${PAIRING_LINK}"
+wait stable
+press "id=\"pair-link-submit\""
+wait stable
+wait "id=\"host-confirmation-connect\"" 10000
+screenshot "${OUT}/06-confirmation-reopens.png"
+press "id=\"host-confirmation-connect\""
+wait stable
+wait "id=\"pair-link-password-input\"" 20000
+screenshot "${OUT}/07-password-after-connect.png"
+fill "id=\"pair-link-password-input\"" "${PASSWORD}"
+wait stable
+press "id=\"pair-link-submit\""
+wait stable
+wait text "Open a folder on your machine" 30000
+screenshot "${OUT}/08-connected.png"
diff --git a/packages/app/e2e/mobile/modal-sheet/stacked-settings.ad b/packages/app/e2e/mobile/modal-sheet/stacked-settings.ad
new file mode 100644
index 0000000000..da687d7e02
--- /dev/null
+++ b/packages/app/e2e/mobile/modal-sheet/stacked-settings.ad
@@ -0,0 +1,46 @@
+# Settings with Add host visible: no saved hosts, or the host picker already open.
+context platform=ios timeout=180000 retries=0
+env APP_ID=sh.paseo.debug
+open "${APP_ID}"
+wait "id=\"settings-add-host\"" 20000
+screenshot "${OUT}/09-settings.png"
+press "id=\"settings-add-host\""
+wait stable
+wait "id=\"add-host-method-direct\"" 10000
+screenshot "${OUT}/10-add-host-methods.png"
+press "id=\"add-host-method-direct\""
+wait stable
+press "id=\"direct-host-advanced-toggle\""
+wait stable
+fill "id=\"direct-host-uri-input\"" "${PAIRING_LINK}"
+wait stable
+screenshot "${OUT}/11-add-host-relay-input.png"
+press "id=\"direct-host-submit\""
+wait stable
+wait "id=\"host-confirmation-connect\"" 10000
+screenshot "${OUT}/12-add-host-confirmation-on-top.png"
+press "id=\"host-confirmation-cancel\""
+wait stable
+wait "id=\"direct-host-submit\" enabled=true" 10000
+screenshot "${OUT}/13-cancel-returns-to-add-host.png"
+# Editing the underlying sheet proves it still accepts input after closing the top sheet.
+fill "id=\"direct-host-uri-input\"" "${PAIRING_LINK}"
+wait stable
+press "id=\"direct-host-submit\""
+wait stable
+wait "id=\"host-confirmation-connect\"" 10000
+screenshot "${OUT}/14-add-host-confirmation-reopens.png"
+press "id=\"host-confirmation-connect\""
+wait stable
+wait "id=\"direct-password-input\"" 20000
+screenshot "${OUT}/15-add-host-password.png"
+fill "id=\"direct-password-input\"" "${PASSWORD}"
+wait stable
+press "id=\"direct-host-submit\""
+wait stable
+open "${APP_ID}" "paseo://settings"
+wait "label=\"Connections\"" 10000
+press "label=\"Connections\""
+wait stable
+wait "id=\"host-page-connections-card\"" 30000
+screenshot "${OUT}/16-settings-connected.png"
diff --git a/packages/app/e2e/mobile/system-bars/android.mjs b/packages/app/e2e/mobile/system-bars/android.mjs
new file mode 100644
index 0000000000..8201f3dc12
--- /dev/null
+++ b/packages/app/e2e/mobile/system-bars/android.mjs
@@ -0,0 +1,62 @@
+// Open Settings > Appearance in a native Android app loaded from this checkout.
+// AGENT_DEVICE_STATE_DIR=<state-dir> node packages/app/e2e/mobile/system-bars/android.mjs <session> <adb-serial> <app-id>
+// Requires English UI and a dedicated emulator. Leaves System theme and light OS appearance.
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { setTimeout as delay } from "node:timers/promises";
+
+const [, , session, serial, appId] = process.argv;
+assert(session && serial && appId, "Pass the agent-device session, adb serial, and app ID");
+
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+
+function windowState() {
+  const state = execFileSync("adb", ["-s", serial, "shell", "dumpsys", "window"], {
+    encoding: "utf8",
+    timeout: 10_000,
+  });
+  assert(state.match(/mCurrentFocus=.*\n/)?.[0].includes(`${appId}/`), "App must be focused");
+  const regions = state.match(/mLastStatusBarAppearanceRegions=\s*\n([^\n]+)/)?.[1];
+  assert(regions, "Android must report the status-bar appearance region");
+  return regions.includes("LIGHT_STATUS_BARS");
+}
+
+async function expectDarkIcons(expected, context) {
+  const deadline = Date.now() + 5_000;
+  do {
+    if (windowState() === expected) {
+      console.log(`PASS: ${context}`);
+      return;
+    }
+    await delay(100);
+  } while (Date.now() < deadline);
+  assert.equal(windowState(), expected, context);
+}
+
+function selectTheme(theme) {
+  const current = ad("snapshot", "-i").match(/"Theme: ([^"]+)"/)?.[1];
+  assert(current, "Start on Settings > Appearance");
+  ad("press", `label="Theme: ${current}"`, "--settle");
+  ad("press", `label="${theme}"`, "--settle");
+  ad("wait", "text", `Theme: ${theme}`, "5000");
+}
+
+ad("settings", "appearance", "light");
+selectTheme("Light");
+await expectDarkIcons(true, "Light app theme uses dark status icons");
+selectTheme("Dark");
+await expectDarkIcons(false, "Dark app theme uses light status icons");
+selectTheme("System");
+await expectDarkIcons(true, "System theme starts with dark icons on light OS appearance");
+ad("settings", "appearance", "dark");
+await expectDarkIcons(
+  false,
+  "System theme follows an OS change to dark without reopening settings",
+);
+ad("settings", "appearance", "light");
+await expectDarkIcons(true, "System theme follows an OS change back to light");
diff --git a/packages/app/e2e/mobile/terminal-keyboard/android.mjs b/packages/app/e2e/mobile/terminal-keyboard/android.mjs
new file mode 100644
index 0000000000..9a9f1962ae
--- /dev/null
+++ b/packages/app/e2e/mobile/terminal-keyboard/android.mjs
@@ -0,0 +1,117 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { setTimeout } from "node:timers/promises";
+
+// Open an idle terminal with an empty prompt and hide its keyboard before running.
+// The app must already run the checkout/build being verified against a real daemon.
+const appId = process.env.PASEO_TERMINAL_KEYBOARD_APP_ID ?? "sh.paseo.debug";
+const serial = process.env.ANDROID_SERIAL ?? "emulator-5554";
+const artifacts = resolve(".dev/agent-device-artifacts/terminal-keyboard-android");
+const session = "terminal-keyboard-android";
+const env = {
+  ...process.env,
+  AGENT_DEVICE_STATE_DIR: resolve(".dev/agent-device-terminal-keyboard"),
+};
+mkdirSync(artifacts, { recursive: true });
+
+function run(binary, args) {
+  return execFileSync(binary, args, { env, encoding: "utf8", timeout: 30_000 });
+}
+function ad(...args) {
+  return run("agent-device", [...args, "--session", session]);
+}
+function adb(...args) {
+  return run("adb", ["-s", serial, ...args]);
+}
+function keyboardState() {
+  const state = adb("shell", "dumpsys", "input_method");
+  const view = state.match(/^  mServedView=(.+)$/m)?.[1] ?? "";
+  return {
+    shown: /^  mInputShown=true$/m.test(state),
+    // The native object identity survives layout/flag changes but not a remount.
+    input: view.match(/ReactEditText\{(\w+)/)?.[1] ?? null,
+  };
+}
+async function waitForKeyboard(shown) {
+  let stable = 0;
+  const deadline = Date.now() + 10_000;
+  while (Date.now() < deadline) {
+    const state = keyboardState();
+    stable = state.shown === shown ? stable + 1 : 0;
+    if (stable === 3) return state;
+    await setTimeout(100);
+  }
+  throw new Error(`Keyboard did not settle at shown=${shown}`);
+}
+function keyboardShift() {
+  const state = adb("shell", "dumpsys", "window");
+  const ime = state.match(/type=ime frame=\[0,(\d+)\].*visible=true/);
+  const navigation = state.match(/type=navigationBars frame=\[0,(\d+)\]/);
+  assert.ok(ime && navigation, "Expected a docked keyboard and navigation bar");
+  return Number(navigation[1]) - Number(ime[1]);
+}
+function imeEvents() {
+  return adb("logcat", "-d", "-v", "threadtime", "ImeTracker:I", "*:S")
+    .split("\n")
+    .filter((line) => line.includes(`${appId}:`));
+}
+function tap(rect, shift) {
+  ad(
+    "press",
+    String(Math.round(rect.x + rect.width / 2)),
+    String(Math.round(rect.y + rect.height / 2 - shift)),
+  );
+}
+
+let toggle;
+try {
+  ad("open", appId, "--platform", "android", "--serial", serial, "--no-test-ime");
+  assert.equal(keyboardState().shown, false, "Start with the terminal keyboard hidden");
+  // Accessibility snapshots can hang with a real IME open. Measure the controls
+  // while hidden, then project them by Android's actual docked-keyboard inset.
+  const snapshot = JSON.parse(ad("snapshot", "-i", "--json"));
+  const rectFor = (id) => {
+    const node = snapshot.data.nodes.find((candidate) => candidate.identifier === id);
+    assert.ok(node?.rect, `Open a terminal first: missing ${id}`);
+    return node.rect;
+  };
+  toggle = rectFor("terminal-keyboard-toggle");
+  const controls = ["ctrl", "ctrl", "esc", "enter"].map((key) => ({
+    key,
+    rect: rectFor(`terminal-key-${key}`),
+  }));
+  tap(toggle, 0);
+  const baseline = await waitForKeyboard(true);
+  assert.notEqual(baseline.input, null, "Expected the native terminal input to own the IME");
+  const shift = keyboardShift();
+  const before = new Set(imeEvents());
+  ad("screenshot", resolve(artifacts, "before.png"));
+
+  for (const { key, rect } of controls) {
+    tap(rect, shift);
+    const after = await waitForKeyboard(true);
+    const events = imeEvents().filter((line) => !before.has(line));
+    writeFileSync(resolve(artifacts, "ime-events.log"), events.join("\n"));
+    writeFileSync(
+      resolve(artifacts, "focus.json"),
+      JSON.stringify({ key, baseline, after }, null, 2),
+    );
+    assert.equal(after.input, baseline.input, `${key} replaced the focused native input`);
+    assert.deepEqual(
+      events.filter((line) => /onRequestHide|onRequestShow/.test(line)),
+      [],
+      `${key} cycled the software keyboard`,
+    );
+  }
+  ad("screenshot", resolve(artifacts, "after.png"));
+  console.log("PASS: Ctrl, Esc and Enter preserve the native input without IME hide/show requests");
+} finally {
+  if (toggle && keyboardState().shown) {
+    tap(toggle, keyboardShift());
+    await waitForKeyboard(false);
+  }
+  ad("close");
+  run("agent-device", ["daemon", "stop", "--clean"]);
+}
diff --git a/packages/app/e2e/support/creation-fixtures.ts b/packages/app/e2e/support/creation-fixtures.ts
new file mode 100644
index 0000000000..9608a95a0c
--- /dev/null
+++ b/packages/app/e2e/support/creation-fixtures.ts
@@ -0,0 +1,127 @@
+import { writeFile, rm, rename } from "node:fs/promises";
+import path from "node:path";
+import { copyPluginExample } from "./helpers/plugin-fixture";
+import { connectNewWorkspaceDaemonClient } from "./helpers/new-workspace";
+import { test as base } from "./fixtures";
+import {
+  createCreationScenario,
+  createPromptRetryScenario,
+  retryNextAgentCreation,
+} from "./helpers/creation";
+import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
+
+export const test = base.extend<{
+  startup: { release(): Promise<void>; fail(): Promise<void> };
+  promptRejection: void;
+  creation: Awaited<ReturnType<typeof createCreationScenario>>;
+  promptRetry: ReturnType<typeof createPromptRetryScenario>;
+  agentRetries: Awaited<ReturnType<typeof retryNextAgentCreation>>;
+  delayedCreation: Awaited<ReturnType<typeof delayBrowserAgentCreatedStatus>>;
+}>({
+  startup: async ({ page }, provide) => {
+    void page;
+    const client = await connectNewWorkspaceDaemonClient();
+    const plugin = await copyPluginExample("lifecycle-logger");
+    const gate = path.join(plugin.directory, "startup.txt");
+    const failure = path.join(plugin.directory, "startup-failure.txt");
+    const previous = await client.getDaemonConfig();
+    try {
+      await writeFile(gate, "hold");
+      await writeFile(failure, "fail");
+      await writeFile(
+        path.join(plugin.directory, "index.server.ts"),
+        `
+import { readFile, rm } from "node:fs/promises";
+export default function contribute(server) {
+  return server.before("agent.session_open", async ({ request }) => {
+    if (request.reason !== "create") return request;
+    const gate = ${JSON.stringify(gate)};
+    let command = await readFile(gate, "utf8").catch(() => "release");
+    while (command === "hold") {
+      await new Promise(resolve => setTimeout(resolve, 20));
+      command = await readFile(gate, "utf8").catch(() => "release");
+    }
+    if (command === "fail") {
+      await rm(gate, { force: true });
+      throw new Error("Creation startup failed for test");
+    }
+    return request;
+  });
+}
+`,
+      );
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(plugin.directory);
+      await provide({
+        release: () => rm(gate, { force: true }),
+        // Replacing the command must not expose a truncated, empty file to the hook.
+        fail: () => rename(failure, gate),
+      });
+    } finally {
+      await rm(gate, { force: true });
+      await client.removePlugin("lifecycle-logger");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+      await plugin.cleanup();
+      await client.close();
+    }
+  },
+  promptRejection: async ({ page }, provide) => {
+    void page;
+    const client = await connectNewWorkspaceDaemonClient();
+    const plugin = await copyPluginExample("lifecycle-logger");
+    const previous = await client.getDaemonConfig();
+    try {
+      await writeFile(
+        path.join(plugin.directory, "index.server.ts"),
+        `
+export default function contribute(server) {
+  return server.before("agent.create", ({ request }) => ({
+    ...request,
+    config: {
+      ...request.config,
+      model: "e2e-fast-stream",
+      featureValues: { ...request.config.featureValues, mockPromptRejections: 1 },
+    },
+  }));
+}
+`,
+      );
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(plugin.directory);
+      await provide();
+    } finally {
+      await client.removePlugin("lifecycle-logger");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+      await plugin.cleanup();
+      await client.close();
+    }
+  },
+  creation: async ({ page }, provide) => {
+    const creation = await createCreationScenario(page);
+    try {
+      await provide(creation);
+    } finally {
+      await creation.cleanup();
+    }
+  },
+  promptRetry: async ({ page }, provide) => {
+    const gate = await installDaemonWebSocketGate(page);
+    try {
+      await provide(createPromptRetryScenario(page, gate));
+    } finally {
+      gate.restore();
+    }
+  },
+  agentRetries: async ({ page }, provide) => {
+    await provide(await retryNextAgentCreation(page));
+  },
+  delayedCreation: async ({ page }, provide) => {
+    const delayed = await delayBrowserAgentCreatedStatus(page);
+    try {
+      await provide(delayed);
+    } finally {
+      delayed.release();
+    }
+  },
+});
diff --git a/packages/app/e2e/support/fixtures/acp-chunks-plugin/index.server.ts b/packages/app/e2e/support/fixtures/acp-chunks-plugin/index.server.ts
new file mode 100644
index 0000000000..c98a04f2c1
--- /dev/null
+++ b/packages/app/e2e/support/fixtures/acp-chunks-plugin/index.server.ts
@@ -0,0 +1,46 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { runAcpProvider, type AcpStreamMessage } from "@getpaseo/plugin/server/acp";
+
+function connect() {
+  let controller: ReadableStreamDefaultController<AcpStreamMessage>;
+  return {
+    readable: new ReadableStream<AcpStreamMessage>({
+      start(value) {
+        controller = value;
+      },
+    }),
+    writable: new WritableStream<AcpStreamMessage>({
+      write(message) {
+        if (!("method" in message) || !("id" in message)) return;
+        let result: unknown = {};
+        if (message.method === "initialize") result = { protocolVersion: 1, agentCapabilities: {} };
+        if (message.method === "session/new") result = { sessionId: "chunks" };
+        if (message.method === "session/prompt") {
+          for (const text of [
+            "- **Current tem",
+            "perature**: 25°C. Read [Paseo ",
+            "docs](https://example.com/docs).",
+          ]) {
+            controller.enqueue({
+              jsonrpc: "2.0",
+              method: "session/update",
+              params: {
+                sessionId: "chunks",
+                update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text } },
+              },
+            });
+          }
+          result = { stopReason: "end_turn" };
+        }
+        controller.enqueue({ jsonrpc: "2.0", id: message.id, result });
+      },
+    }),
+  };
+}
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(
+    runAcpProvider({ id: "acp-chunks", label: "ACP chunks", connector: connect }),
+  );
+  return () => {};
+}
diff --git a/packages/app/e2e/support/fixtures/acp-chunks-plugin/paseo-plugin.json b/packages/app/e2e/support/fixtures/acp-chunks-plugin/paseo-plugin.json
new file mode 100644
index 0000000000..44e12e11c5
--- /dev/null
+++ b/packages/app/e2e/support/fixtures/acp-chunks-plugin/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "acp-chunks-test", "requirements": { "paseo": ">=0.8.0" } }
diff --git a/packages/app/e2e/support/fixtures/catalog-acp.cjs b/packages/app/e2e/support/fixtures/catalog-acp.cjs
new file mode 100644
index 0000000000..fc6eafee73
--- /dev/null
+++ b/packages/app/e2e/support/fixtures/catalog-acp.cjs
@@ -0,0 +1,18 @@
+const readline = require("node:readline");
+const model = { modelId: "gemini-3.5-flash", name: "Gemini 3.5 Flash" };
+readline.createInterface({ input: process.stdin }).on("line", (line) => {
+  const request = JSON.parse(line);
+  if (request.id === undefined) return;
+  let result = {};
+  if (request.method === "initialize")
+    result = { protocolVersion: 1, agentCapabilities: {}, authMethods: [] };
+  if (request.method === "session/new")
+    result = {
+      sessionId: "catalog-diagnostic",
+      models: {
+        currentModelId: model.modelId,
+        availableModels: Array.from({ length: Number(process.argv[2]) }, () => model),
+      },
+    };
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id: request.id, result }) + "\n");
+});
diff --git a/packages/app/e2e/support/global-setup.ts b/packages/app/e2e/support/global-setup.ts
index a7e25fb50b..29257af299 100644
--- a/packages/app/e2e/support/global-setup.ts
+++ b/packages/app/e2e/support/global-setup.ts
@@ -1,3 +1,5 @@
+import { warmMetro } from "./metro-warmup.mjs";
+export { warmMetro } from "./metro-warmup.mjs";
 import { spawn, type ChildProcess } from "node:child_process";
 import { killProcessTree } from "./helpers/spawn-node";
 import { existsSync } from "node:fs";
@@ -16,7 +18,8 @@ export interface WaitForServerOptions {
 type ServerProbe = (host: string, port: number) => Promise<void>;
 
 const RESERVED_LOCAL_PORTS = new Set([
-  6767, // Developer daemon.
+  6767, // Installed daemon.
+  6768, // Developer daemon.
   61680, // OpenCode's default local server.
 ]);
 
@@ -122,32 +125,6 @@ export async function waitForMetro(port: number, options: WaitForServerOptions):
   await waitForServer(port, options, probeMetro);
 }
 
-export async function warmMetro(port: number): Promise<void> {
-  const origin = `http://127.0.0.1:${port}`;
-  const documentResponse = await fetch(origin, { signal: AbortSignal.timeout(120_000) });
-  if (!documentResponse.ok) {
-    throw new Error(`Metro document warmup failed with HTTP ${documentResponse.status}`);
-  }
-  const document = await documentResponse.text();
-  const scriptSources = [...document.matchAll(/<script[^>]+src=["']([^"']+)["']/g)].map(
-    (match) => match[1],
-  );
-  if (scriptSources.length === 0) {
-    throw new Error("Metro document warmup found no scripts to compile");
-  }
-  for (const source of scriptSources) {
-    const scriptUrl = new URL(source, origin);
-    if (scriptUrl.origin !== origin) continue;
-    const response = await fetch(scriptUrl, { signal: AbortSignal.timeout(120_000) });
-    if (!response.ok) {
-      throw new Error(
-        `Metro bundle warmup failed for ${scriptUrl.pathname}: HTTP ${response.status}`,
-      );
-    }
-    await response.arrayBuffer();
-  }
-}
-
 function startMetro(port: number, buffer: ReturnType<typeof createLineBuffer>): ChildProcess {
   const appDir = path.resolve(__dirname, "../..");
   const expoCli = require.resolve("expo/bin/cli");
diff --git a/packages/app/e2e/support/helpers/acp-streaming-markdown.ts b/packages/app/e2e/support/helpers/acp-streaming-markdown.ts
new file mode 100644
index 0000000000..0ebe9c2b3d
--- /dev/null
+++ b/packages/app/e2e/support/helpers/acp-streaming-markdown.ts
@@ -0,0 +1,72 @@
+import path from "node:path";
+import { expect, type Page, type TestInfo } from "@playwright/test";
+import { seedWorkspace, type SeedDaemonClient } from "./seed-client";
+import { openAgentRoute } from "./mock-agent";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+
+interface AcpMarkdownAgent {
+  client: SeedDaemonClient;
+  agentId: string;
+}
+
+export async function withAcpStreamingMarkdown(
+  page: Page,
+  run: (agent: AcpMarkdownAgent) => Promise<void>,
+): Promise<void> {
+  const workspace = await seedWorkspace({ repoPrefix: "acp-markdown-" });
+  const { client } = workspace;
+  const pluginClient = await connectNewWorkspaceDaemonClient();
+  const previous = await pluginClient.getDaemonConfig();
+  try {
+    await pluginClient.patchDaemonConfig({ pluginsEnabled: true });
+    await pluginClient.installDirectoryPlugin(
+      path.resolve(__dirname, "../fixtures/acp-chunks-plugin"),
+    );
+    const agent = await client.createAgent({
+      provider: "acp-chunks",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "ACP Markdown",
+    });
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    await run({ client, agentId: agent.id });
+  } finally {
+    try {
+      await pluginClient.removePlugin("acp-chunks-test");
+      await pluginClient.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+    } finally {
+      await pluginClient.close();
+      await workspace.cleanup();
+    }
+  }
+}
+
+export async function requestAcpMarkdown(agent: AcpMarkdownAgent): Promise<void> {
+  await agent.client.sendAgentMessage(agent.agentId, "Show the temperature and docs.");
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+}
+
+export async function expectAcpMarkdown(page: Page, count: number): Promise<void> {
+  // The message container has no semantic role; text and links inside it are user-facing assertions.
+  const messages = page.getByTestId("assistant-message");
+  await expect(messages).toHaveCount(count);
+  for (let index = 0; index < count; index++) {
+    const message = messages.nth(index);
+    await expect(message).toHaveText("•Current temperature: 25°C. Read Paseo docs.");
+    await expect(
+      message.getByRole("link", { name: "Paseo docs" }).and(message.locator("a")),
+    ).toHaveAttribute("href", "https://example.com/docs");
+    await expect(message.locator('[data-paseo-markdown-tag="strong"]')).toHaveText(
+      "Current temperature",
+    );
+  }
+}
+
+export async function reloadAcpMarkdown(page: Page, testInfo: TestInfo): Promise<void> {
+  await page.reload({ waitUntil: "domcontentloaded" });
+  await expectAcpMarkdown(page, 2);
+  await testInfo.attach("acp-markdown-after-reload", {
+    body: await page.screenshot({ path: testInfo.outputPath("acp-markdown-after-reload.png") }),
+    contentType: "image/png",
+  });
+}
diff --git a/packages/app/e2e/support/helpers/add-project-flow.ts b/packages/app/e2e/support/helpers/add-project-flow.ts
index c7b15df456..bb88264d37 100644
--- a/packages/app/e2e/support/helpers/add-project-flow.ts
+++ b/packages/app/e2e/support/helpers/add-project-flow.ts
@@ -47,7 +47,7 @@ async function openAddProjectFlowSurface(
   page: Page,
   expectedPage: "host" | "method",
 ): Promise<void> {
-  await page.getByTestId("sidebar-add-project").click();
+  await page.locator('[data-testid="sidebar-add-project"]:visible').click();
   await expect(addProjectFlow(page)).toBeVisible({ timeout: 30_000 });
   await expectAddProjectPage(page, expectedPage);
 }
diff --git a/packages/app/e2e/support/helpers/agent-message-gate.ts b/packages/app/e2e/support/helpers/agent-message-gate.ts
index 7444fee796..9f5735d5ac 100644
--- a/packages/app/e2e/support/helpers/agent-message-gate.ts
+++ b/packages/app/e2e/support/helpers/agent-message-gate.ts
@@ -6,6 +6,8 @@ type WebSocketMessage = string | Buffer;
 interface SendAgentMessageRequest {
   type: "send_agent_message_request";
   requestId: string;
+  text: unknown;
+  attachments: unknown;
   agentId: string;
   /** Absent when the client sends into an idle agent. */
   activeTurnBehavior?: string;
@@ -29,6 +31,8 @@ function readSendRequest(message: WebSocketMessage): SendAgentMessageRequest | n
     return {
       type: "send_agent_message_request",
       requestId: request.requestId,
+      text: request.text,
+      attachments: request.attachments,
       agentId: request.agentId,
       activeTurnBehavior:
         typeof request.activeTurnBehavior === "string" ? request.activeTurnBehavior : undefined,
@@ -74,6 +78,7 @@ export async function gateNextAgentMessage(page: Page) {
 
   return {
     waitForRequest,
+    requestCount: () => requests.length,
     accept(index = 0) {
       const heldMessage = heldMessages[index];
       if (!serverSocket || !heldMessage) {
diff --git a/packages/app/e2e/support/helpers/agent-profiles.ts b/packages/app/e2e/support/helpers/agent-profiles.ts
index d9bd9c4044..a538d256c0 100644
--- a/packages/app/e2e/support/helpers/agent-profiles.ts
+++ b/packages/app/e2e/support/helpers/agent-profiles.ts
@@ -482,6 +482,50 @@ export async function expectModelRowSelected(
   ).toHaveAttribute("aria-selected", "true", { timeout: 30_000 });
 }
 
+function modelRow(page: Page, input: { provider: string; modelId: string }): Locator {
+  return pickerViewport(page).getByTestId(`model-row-${input.provider}-${input.modelId}`);
+}
+
+/**
+ * A model row's profile action is its own button. On web, a button inside the
+ * row's button is invalid HTML that React reports on every render.
+ */
+export async function expectModelRowProfileActionBesideRow(
+  page: Page,
+  input: { provider: string; modelId: string },
+): Promise<void> {
+  const row = modelRow(page, input);
+  await expect(row).toBeVisible({ timeout: 30_000 });
+  await expect(pickerViewport(page).locator("button button")).toHaveCount(0);
+  await expect(row.getByRole("button")).toHaveCount(0);
+}
+
+/** The hover-revealed plus on an unprofiled model row opens a seeded profile form. */
+export async function expectCreateProfileFromModelRow(
+  page: Page,
+  input: { provider: string; modelId: string; modelLabel: string },
+): Promise<void> {
+  await modelRow(page, input).hover();
+  await pickerViewport(page)
+    .getByTestId(`model-create-profile-${input.provider}-${input.modelId}`)
+    .click();
+  const modal = editModal(page);
+  await expect(modal).toBeVisible({ timeout: 30_000 });
+  await expect(modal.getByRole("textbox", { name: "Name", exact: true })).toHaveValue(
+    input.modelLabel,
+  );
+  await expect(modal.getByRole("button", { name: `Model (${input.modelLabel})` })).toBeVisible();
+  await modal.getByRole("button", { name: "Cancel", exact: true }).click();
+  await expect(modal).toHaveCount(0, { timeout: 30_000 });
+}
+
+export async function selectModelRow(
+  page: Page,
+  input: { provider: string; modelId: string },
+): Promise<void> {
+  await modelRow(page, input).click();
+}
+
 // ─── Cross-provider model search ───────────────────────────────────────────
 
 export async function searchAllModels(page: Page, query: string): Promise<void> {
diff --git a/packages/app/e2e/support/helpers/agent-skills.ts b/packages/app/e2e/support/helpers/agent-skills.ts
index 76c7a56d4a..5d8c15633c 100644
--- a/packages/app/e2e/support/helpers/agent-skills.ts
+++ b/packages/app/e2e/support/helpers/agent-skills.ts
@@ -22,7 +22,7 @@ type AgentSkillsClient = Pick<
   "close" | "connect" | "getAgentSkillsStatus" | "saveAgentSkillsSelection"
 >;
 
-export type SkillTargetName = "agents" | "claude" | "codex";
+export type SkillTargetName = "agents" | "claude";
 
 export interface AgentSkillsSandbox {
   available: string[];
@@ -30,6 +30,7 @@ export interface AgentSkillsSandbox {
   daemon: IsolatedHostDaemon;
   home: string;
   targets: Record<SkillTargetName, string>;
+  codexSkillsDir: string;
   blockAgentsDirectory(): Promise<void>;
   unblockAgentsDirectory(): Promise<void>;
   close(): Promise<void>;
@@ -63,8 +64,8 @@ export async function startAgentSkillsSandbox(): Promise<AgentSkillsSandbox> {
   const targets = {
     agents: path.join(home, ".agents", "skills"),
     claude: path.join(home, ".claude", "skills"),
-    codex: path.join(home, ".codex", "skills"),
   };
+  const codexSkillsDir = path.join(home, ".codex", "skills");
 
   return {
     available,
@@ -72,6 +73,7 @@ export async function startAgentSkillsSandbox(): Promise<AgentSkillsSandbox> {
     daemon,
     home,
     targets,
+    codexSkillsDir,
     blockAgentsDirectory: async () => {
       await mkdir(path.dirname(targets.agents), { recursive: true });
       await writeFile(targets.agents, "not a directory", "utf8");
@@ -196,6 +198,7 @@ export async function expectInstalledSkills(
   for (const directory of Object.values(sandbox.targets)) {
     await expect.poll(() => readInstalledSkills(directory)).toEqual([...expected].sort());
   }
+  await expect.poll(() => readInstalledSkills(sandbox.codexSkillsDir)).toEqual([]);
 }
 
 export async function expectSavedSelection(
diff --git a/packages/app/e2e/support/helpers/agent-timeline-gate.ts b/packages/app/e2e/support/helpers/agent-timeline-gate.ts
index 91b6867cf0..dd50ccfa3d 100644
--- a/packages/app/e2e/support/helpers/agent-timeline-gate.ts
+++ b/packages/app/e2e/support/helpers/agent-timeline-gate.ts
@@ -1,4 +1,5 @@
 import type { Page } from "@playwright/test";
+import { loadSessionMessageReaders } from "./new-workspace";
 import { daemonWsRoutePattern, wsRoutePatternForPort } from "./daemon-port";
 
 type WebSocketMessage = string | Buffer;
@@ -38,82 +39,6 @@ export interface PromptJumpRequestTracker {
   requests(): Array<{ cursorSeq: number | null; limit: number | null; mergeWindow: boolean }>;
 }
 
-export interface TimelineRequestTracker {
-  nextRequest(): Promise<{
-    direction: string | null;
-    cursor: { epoch: string; seq: number } | null;
-  }>;
-  requests(): Array<{
-    direction: string | null;
-    cursor: { epoch: string; seq: number } | null;
-  }>;
-  waitForResponse(): Promise<void>;
-}
-
-export async function trackAgentTimelineRequests(
-  page: Page,
-  agentId: string,
-): Promise<TimelineRequestTracker> {
-  type Request = ReturnType<TimelineRequestTracker["requests"]>[number];
-  const seen: Request[] = [];
-  const waiters: Array<(request: Request) => void> = [];
-  let responseSeen = false;
-  let resolveResponse: (() => void) | null = null;
-  const response = new Promise<void>((resolve) => {
-    resolveResponse = resolve;
-  });
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-    ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (
-        sessionMessage?.type === "fetch_agent_timeline_request" &&
-        sessionMessage.agentId === agentId
-      ) {
-        const rawCursor = sessionMessage.cursor;
-        const cursor =
-          rawCursor &&
-          typeof rawCursor === "object" &&
-          typeof (rawCursor as { epoch?: unknown }).epoch === "string" &&
-          typeof (rawCursor as { seq?: unknown }).seq === "number"
-            ? {
-                epoch: (rawCursor as { epoch: string }).epoch,
-                seq: (rawCursor as { seq: number }).seq,
-              }
-            : null;
-        const request = {
-          direction: typeof sessionMessage.direction === "string" ? sessionMessage.direction : null,
-          cursor,
-        };
-        seen.push(request);
-        waiters.shift()?.(request);
-      }
-      server.send(message);
-    });
-    server.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      const payload = sessionMessage ? getPayload(sessionMessage) : null;
-      if (
-        sessionMessage?.type === "fetch_agent_timeline_response" &&
-        payload?.agentId === agentId
-      ) {
-        responseSeen = true;
-        resolveResponse?.();
-      }
-      ws.send(message);
-    });
-  });
-  return {
-    nextRequest() {
-      const request = seen[0];
-      if (request) return Promise.resolve(request);
-      return new Promise((resolve) => waiters.push(resolve));
-    },
-    requests: () => [...seen],
-    waitForResponse: () => (responseSeen ? Promise.resolve() : response),
-  };
-}
-
 export async function trackPromptJumpRequests(
   page: Page,
   agentId: string,
@@ -292,11 +217,14 @@ export async function holdRewindCompletion(
       }
       if (
         !released &&
-        sessionMessage?.type === "agent.rewind.response" &&
+        (sessionMessage?.type === "agent.rewind.response" ||
+          sessionMessage?.type === "agent.timeline.replacement") &&
         payload?.agentId === agentId
       ) {
+        // The replacement also signals completion and removes the rewound row/menu.
+        // Hold it with the response so the pending-state assertion observes a pending rewind.
         delayedForwards.push(() => ws.send(message));
-        resolveDelayedResponse?.();
+        if (sessionMessage.type === "agent.rewind.response") resolveDelayedResponse?.();
         return;
       }
       ws.send(message);
@@ -321,6 +249,7 @@ export async function holdRewindCompletion(
 export async function delayCreatedAgentInitialTailResponse(
   page: Page,
 ): Promise<CreatedAgentTimelineGate> {
+  const frames = await loadSessionMessageReaders();
   let createdAgentId: string | null = null;
   let releaseRequested = false;
   let delayedResponseSeen = false;
@@ -350,19 +279,24 @@ export async function delayCreatedAgentInitialTailResponse(
     });
 
     server.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      const payload = sessionMessage ? getPayload(sessionMessage) : null;
-      if (sessionMessage?.type === "status" && payload?.status === "agent_created") {
-        const agentId = payload.agentId;
-        if (typeof agentId === "string") {
-          createdAgentId = agentId;
-          resolveCreatedAgent?.(agentId);
-        }
+      const sessionMessage = frames.server(message);
+      let createdId: unknown;
+      if (sessionMessage?.type === "agent.create.response") {
+        createdId = sessionMessage.payload.agent?.id;
+      } else if (
+        sessionMessage?.type === "status" &&
+        sessionMessage.payload.status === "agent_created"
+      ) {
+        createdId = sessionMessage.payload.agentId;
+      }
+      if (typeof createdId === "string") {
+        createdAgentId = createdId;
+        resolveCreatedAgent?.(createdId);
       }
 
       if (sessionMessage?.type === "fetch_agent_timeline_response") {
-        const agentId = payload?.agentId;
-        const direction = payload?.direction;
+        const agentId = sessionMessage.payload.agentId;
+        const direction = sessionMessage.payload.direction;
         if (
           !delayedResponseSeen &&
           typeof agentId === "string" &&
@@ -599,3 +533,71 @@ async function delayAgentTimelineResponse(
     waitForDelayedResponse: () => delayedResponse,
   };
 }
+
+/** Holds real incoming frames so intermediate rendering assertions do not race the producer. */
+export async function holdAssistantStream(page: Page, agentId: string) {
+  const pending: Array<{ forward(): void; text: string }> = [];
+  let holding = false;
+  let released = false;
+  let forwardedText = "";
+  let notifyFrame: (() => void) | undefined;
+  let notifyInitialTimeline!: () => void;
+  const initialTimeline = new Promise<void>((resolve) => {
+    notifyInitialTimeline = resolve;
+  });
+
+  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
+    const server = ws.connectToServer();
+    ws.onMessage((message) => server.send(message));
+    server.onMessage((message) => {
+      const session = getSessionMessage(message);
+      const payload = session ? getPayload(session) : null;
+      if (session?.type === "fetch_agent_timeline_response" && payload?.agentId === agentId) {
+        notifyInitialTimeline();
+      }
+      const event = payload?.event as
+        | { type?: string; item?: { type?: string; text?: string } }
+        | undefined;
+      const text =
+        session?.type === "agent_stream" &&
+        payload?.agentId === agentId &&
+        event?.type === "timeline" &&
+        event.item?.type === "assistant_message"
+          ? (event.item.text ?? "")
+          : "";
+      if (text) holding = true;
+      if (holding && !released) {
+        pending.push({ forward: () => ws.send(message), text });
+        notifyFrame?.();
+      } else {
+        ws.send(message);
+      }
+    });
+  });
+
+  return {
+    waitForInitialTimeline: () => initialTimeline,
+    async showThrough(prefix: string): Promise<void> {
+      while (forwardedText.length < prefix.length) {
+        const frame = pending.shift();
+        if (!frame) {
+          await new Promise<void>((resolve) => {
+            notifyFrame = resolve;
+          });
+          continue;
+        }
+        forwardedText += frame.text;
+        frame.forward();
+      }
+      if (forwardedText !== prefix) {
+        throw new Error(
+          `Stream did not stop at ${JSON.stringify(prefix)}: ${JSON.stringify(forwardedText)}`,
+        );
+      }
+    },
+    release() {
+      released = true;
+      for (const frame of pending.splice(0)) frame.forward();
+    },
+  };
+}
diff --git a/packages/app/e2e/support/helpers/assistant-images.ts b/packages/app/e2e/support/helpers/assistant-images.ts
index 00016f0c05..63bc182eaf 100644
--- a/packages/app/e2e/support/helpers/assistant-images.ts
+++ b/packages/app/e2e/support/helpers/assistant-images.ts
@@ -186,9 +186,15 @@ export async function userPagesUntilAssistantImageRenders(
     }
     const previous = await rememberTimelineViewport(page);
     await userScrollsTimelineToHistoryStart(page);
+    // Scrolling can bring an already loaded image into the virtualized window
+    // without increasing content height. Its rendering also satisfies this step.
     await expect
-      .poll(async () => (await rememberTimelineViewport(page)).scrollHeight)
-      .toBeGreaterThan(previous.scrollHeight);
+      .poll(
+        async () =>
+          (await rendered.count()) > 0 ||
+          (await rememberTimelineViewport(page)).scrollHeight > previous.scrollHeight,
+      )
+      .toBe(true);
   }
   await expectAssistantImageRendered(page, image);
 }
diff --git a/packages/app/e2e/support/helpers/changelog.ts b/packages/app/e2e/support/helpers/changelog.ts
new file mode 100644
index 0000000000..a2138920fb
--- /dev/null
+++ b/packages/app/e2e/support/helpers/changelog.ts
@@ -0,0 +1,29 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+
+const CHANGELOG_SOURCE_URL = "https://raw.githubusercontent.com/getpaseo/paseo/main/CHANGELOG.md";
+
+/**
+ * Serves a changelog to the app instead of the repository's.
+ *
+ * The sheet renders whatever the document contains, so a fixture is how a test
+ * states which authoring shapes it cares about.
+ */
+export async function serveChangelog(page: Page, lines: string[]): Promise<void> {
+  await page.route(CHANGELOG_SOURCE_URL, (route) =>
+    route.fulfill({ status: 200, contentType: "text/plain", body: lines.join("\n") }),
+  );
+}
+
+export async function openWhatsNew(page: Page): Promise<Locator> {
+  await page.getByTestId("sidebar-help").click();
+  await expect(page.getByTestId("sidebar-help-menu")).toBeVisible();
+  await page.getByTestId("sidebar-help-changelog").click();
+
+  const sheet = page.getByTestId("changelog-sheet");
+  await expect(sheet).toBeVisible();
+  return sheet;
+}
+
+export function release(sheet: Locator, version: string): Locator {
+  return sheet.getByTestId(`changelog-release-${version}`);
+}
diff --git a/packages/app/e2e/support/helpers/chat-outline.ts b/packages/app/e2e/support/helpers/chat-outline.ts
index b89f4e6e2a..d219979fcf 100644
--- a/packages/app/e2e/support/helpers/chat-outline.ts
+++ b/packages/app/e2e/support/helpers/chat-outline.ts
@@ -2,6 +2,42 @@ import { expect, type Locator, type Page } from "@playwright/test";
 import { openSettings } from "./app";
 import { openSettingsSection } from "./settings";
 import { runWorkspaceActionFromCommandCenter } from "./command-center-workspace-actions";
+import { seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+import { loadSessionMessageReaders } from "./new-workspace";
+
+export async function withStreamingMarkdownOutline(
+  run: (agent: MockAgentWorkspace) => Promise<void>,
+): Promise<void> {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-outline-markdown-",
+    title: "Streaming Markdown outline",
+    featureValues: {
+      mockStreamingAssistantResponse: Array.from(
+        { length: 60 },
+        (_, index) => `Paragraph ${index + 1}.`,
+      ).join("\n\n"),
+      mockStreamingAssistantIntervalMs: 80,
+    },
+  });
+  try {
+    await run(agent);
+  } finally {
+    await agent.cleanup();
+  }
+}
+
+export async function expectReadingStreamedMarkdown(page: Page, prompt: string): Promise<void> {
+  await expect(page.getByText("Paragraph 30.", { exact: true }).last()).toBeVisible();
+  const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  const promptRow = timeline.getByTestId("user-message").filter({ hasText: prompt });
+  await expect
+    .poll(async () => {
+      const [viewport, row] = await Promise.all([timeline.boundingBox(), promptRow.boundingBox()]);
+      return viewport && row ? row.y + row.height - viewport.y : Number.POSITIVE_INFINITY;
+    })
+    .toBeLessThan(0);
+  await expect(page.getByRole("button", { name: "Stop agent", exact: true })).toBeVisible();
+}
 
 export function chatOutlineRail(page: Page): Locator {
   return page.getByTestId("chat-outline-rail");
@@ -48,7 +84,7 @@ export async function splitCurrentPanelRight(page: Page): Promise<void> {
 export async function disableChatOutlineFromAppearance(page: Page): Promise<void> {
   const timelineUrl = page.url();
   await openSettings(page);
-  await openSettingsSection(page, "appearance");
+  await openSettingsSection(page, "chat");
   await page.getByRole("switch", { name: "Chat outline" }).click();
   await page.goto(timelineUrl);
 }
@@ -194,3 +230,22 @@ async function requireBoundingBox(
   }
   return box;
 }
+
+export async function observePromptIndexRequests(page: Page) {
+  const frames = await loadSessionMessageReaders();
+  const agentIds: string[] = [];
+  page.on("websocket", (socket) => {
+    socket.on("framesent", ({ payload }) => {
+      const request = frames.client(payload);
+      if (request?.type === "agent.timeline.list_prompts.request") {
+        agentIds.push(request.agentId);
+      }
+    });
+  });
+  return {
+    async waitForRequestFor(agentId: string) {
+      await expect.poll(() => agentIds).toContain(agentId);
+    },
+    requestedAgentIds: () => [...new Set(agentIds)],
+  };
+}
diff --git a/packages/app/e2e/support/helpers/codex-workspace-restore.ts b/packages/app/e2e/support/helpers/codex-workspace-restore.ts
new file mode 100644
index 0000000000..45bdc1aded
--- /dev/null
+++ b/packages/app/e2e/support/helpers/codex-workspace-restore.ts
@@ -0,0 +1,276 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { z } from "zod";
+import type { TestInfo } from "@playwright/test";
+import { test as base, expect, type Page } from "../fixtures";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { openSessions } from "./archive-tab";
+import { getE2EDaemonPort } from "./daemon-port";
+import { assertComposerIdle } from "./rewind-flow";
+import { getServerId } from "./server-id";
+import { archiveWorkspaceFromSidebar, expectWorkspaceAbsentFromSidebar } from "./sidebar";
+import { createTempGitRepo } from "./workspace";
+import { waitForSidebarHydration } from "./workspace-ui";
+import type { SeedDaemonClient } from "./seed-client";
+
+const REPLY = "CODEX_WORKTREE_RESTORE_READY";
+const workspaceSchema = z.object({
+  workspaceId: z.string(),
+  projectId: z.string(),
+  cwd: z.string(),
+  isolation: z.literal("worktree"),
+});
+
+async function callPaseoTool(
+  mcp: Client,
+  name: string,
+  args: Record<string, unknown>,
+): Promise<unknown> {
+  const result = await mcp.callTool({ name, arguments: args }, undefined, { timeout: 240_000 });
+  expect(result).not.toMatchObject({ isError: true });
+  return result.structuredContent;
+}
+
+async function defaultCodexModel(mcp: Client): Promise<string> {
+  const result = z
+    .object({ models: z.array(z.object({ id: z.string(), isDefault: z.boolean() })) })
+    .parse(await callPaseoTool(mcp, "list_models", { provider: "codex" }));
+  const model = result.models.find((entry) => entry.isDefault);
+  if (!model) throw new Error("Codex did not advertise a default model");
+  return model.id;
+}
+
+function recordTimelineWire(page: Page): string[] {
+  const wire: string[] = [];
+  page.on("websocket", (socket) => {
+    const recordFrame = (direction: string, message: string) => {
+      if (/agent.*timeline|fetch_agents|agent_update/.test(message)) {
+        wire.push(JSON.stringify({ at: Date.now(), direction, message }));
+      }
+    };
+    socket.on("framesent", ({ payload }) => recordFrame("sent", payload.toString()));
+    socket.on("framereceived", ({ payload }) => recordFrame("received", payload.toString()));
+  });
+  return wire;
+}
+
+async function createCodexRestoreJourney(page: Page, client: SeedDaemonClient, info: TestInfo) {
+  const repo = await createTempGitRepo("codex-worktree-restore-");
+  const mcp = new Client({ name: "worktree-codex-restore-playwright", version: "1.0.0" });
+  const wire = recordTimelineWire(page);
+  let workspace: z.infer<typeof workspaceSchema> | undefined;
+  let agentId: string | undefined;
+
+  function created() {
+    if (!workspace || !agentId) throw new Error("Create the Codex worktree before using it");
+    return { ...workspace, agentId };
+  }
+
+  async function expectSelected() {
+    await expect(page.getByTestId(`workspace-tab-agent_${created().agentId}`)).toHaveAttribute(
+      "aria-selected",
+      "true",
+    );
+  }
+
+  return {
+    async createWorktreeWithCodex() {
+      await mcp.connect(
+        new StreamableHTTPClientTransport(
+          new URL(`http://127.0.0.1:${getE2EDaemonPort()}/mcp/agents`),
+        ),
+      );
+      workspace = workspaceSchema.parse(
+        await callPaseoTool(mcp, "create_workspace", {
+          isolation: "worktree",
+          path: repo.path,
+          baseBranch: "main",
+          title: "Codex worktree restore reproduction",
+        }),
+      );
+      const agent = z.object({ agentId: z.string() }).parse(
+        await callPaseoTool(mcp, "create_agent", {
+          workspaceId: workspace.workspaceId,
+          provider: `codex/${await defaultCodexModel(mcp)}`,
+          settings: { modeId: "full-access", thinkingOptionId: "low" },
+          title: "Codex worktree restore reproduction",
+          initialPrompt: `Reply with exactly ${REPLY} and nothing else. Do not use tools.`,
+        }),
+      );
+      agentId = agent.agentId;
+    },
+    async waitForCompletedReply() {
+      const target = created();
+      await page.goto(buildHostAgentDetailRoute(getServerId(), target.agentId, target.workspaceId));
+      await waitForSidebarHydration(page);
+      await expect(page.getByTestId("assistant-message")).toContainText(REPLY, {
+        timeout: 240_000,
+      });
+      await expect
+        .poll(() => client.fetchAgent({ agentId: target.agentId }))
+        .toMatchObject({
+          agent: { status: "idle", archivedAt: null },
+        });
+      await assertComposerIdle({ page });
+    },
+    async archiveBeforeBrowserConnects() {
+      const target = created();
+      await client.waitForFinish(target.agentId, 240_000);
+      expect((await client.archiveWorkspace(target.workspaceId)).error).toBeNull();
+      await expect.poll(() => existsSync(target.cwd)).toBe(false);
+      await expect
+        .poll(() => client.fetchAgent({ agentId: target.agentId }))
+        .toMatchObject({
+          agent: { archivedAt: expect.any(String) },
+        });
+    },
+    async connectFreshBrowser() {
+      await page.goto("/");
+    },
+    async archiveWorkspaceFromSidebar() {
+      await archiveWorkspaceFromSidebar(page, created().workspaceId);
+    },
+    async expectWorkspaceAndAgentArchived() {
+      const target = created();
+      await expectWorkspaceAbsentFromSidebar(page, target.workspaceId);
+      await expect
+        .poll(() => client.fetchAgent({ agentId: target.agentId }))
+        .toMatchObject({
+          agent: { archivedAt: expect.any(String) },
+        });
+      await expect.poll(() => existsSync(target.cwd), { timeout: 30_000 }).toBe(false);
+      await expect
+        .poll(() => client.fetchWorkspaces())
+        .not.toMatchObject({
+          entries: expect.arrayContaining([expect.objectContaining({ id: target.workspaceId })]),
+        });
+    },
+    async openArchivedWorkspaceFromHistory() {
+      await openSessions(page);
+      const row = page.getByTestId(`agent-row-${getServerId()}-${created().agentId}`);
+      await expect(row).toContainText("Archived");
+      await row.click();
+      await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible();
+    },
+    async restoreWorkspace() {
+      await page.getByRole("button", { name: "Restore", exact: true }).click();
+      await expect(page.getByText("Workspace archived", { exact: true })).toHaveCount(0, {
+        timeout: 60_000,
+      });
+    },
+    async expectWorktreeRestoredWithArchivedAgentSelected() {
+      await expect.poll(() => existsSync(created().cwd), { timeout: 30_000 }).toBe(true);
+      await expectSelected();
+      await expect(page.getByText("This agent is archived", { exact: true })).toBeVisible();
+      await info.attach("after-workspace-restore", {
+        body: JSON.stringify(await client.fetchAgent({ agentId: created().agentId }), null, 2),
+        contentType: "application/json",
+      });
+    },
+    async expectArchivedAgentSelectedWithHistory() {
+      await expectSelected();
+      await expect(page.getByText("This agent is archived", { exact: true })).toBeVisible();
+      await expect(page.getByTestId("assistant-message")).toContainText(REPLY);
+    },
+    async reloadWithoutAgentCache() {
+      const url = page.url();
+      const cdp = await page.context().newCDPSession(page);
+      // Unmount first so an open connection cannot repopulate the cache while it is cleared.
+      await page.goto("about:blank");
+      await cdp.send("Storage.clearDataForOrigin", {
+        origin: new URL(url).origin,
+        storageTypes: "indexeddb,cache_storage",
+      });
+      await cdp.send("Network.clearBrowserCache");
+      await cdp.send("Network.setCacheDisabled", { cacheDisabled: true });
+      await page.goto(url);
+      await cdp.detach();
+    },
+    async waitForWorkspaceHydration() {
+      await waitForSidebarHydration(page);
+    },
+    async unarchiveAgent() {
+      await page.getByRole("button", { name: "Unarchive", exact: true }).click({ timeout: 30_000 });
+      await expect(page.getByText("This agent is archived", { exact: true })).toHaveCount(0, {
+        timeout: 60_000,
+      });
+    },
+    async expectIdleAgentWithVisibleComposer(statusTimeout?: number) {
+      await expect
+        .poll(() => client.fetchAgent({ agentId: created().agentId }), { timeout: statusTimeout })
+        .toMatchObject({ agent: { status: "idle", archivedAt: null } });
+      await expectSelected();
+      await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+      await assertComposerIdle({ page });
+      await info.attach("restored-agent-screen", {
+        body: await page.screenshot(),
+        contentType: "image/png",
+      });
+      await info.attach("restored-agent-accessibility", {
+        body: await page.locator("body").ariaSnapshot(),
+        contentType: "text/plain",
+      });
+    },
+    async dispose() {
+      const testFailed = info.status !== info.expectedStatus;
+      const errors: unknown[] = [];
+      try {
+        await info.attach("final-screen", {
+          body: await page.screenshot(),
+          contentType: "image/png",
+        });
+        await info.attach("timeline-wire", { body: wire.join("\n"), contentType: "text/plain" });
+        await info.attach("final-agent", {
+          body: JSON.stringify(agentId ? await client.fetchAgent({ agentId }) : null, null, 2),
+          contentType: "application/json",
+        });
+        await info.attach("daemon-log", {
+          body: await readFile(path.join(process.env.E2E_PASEO_HOME!, "daemon.log")),
+          contentType: "text/plain",
+        });
+      } catch (error) {
+        errors.push(error);
+      }
+      const cleanup: Array<() => Promise<unknown>> = [() => mcp.close()];
+      if (!testFailed || process.env.E2E_KEEP_PASEO_HOME !== "1") {
+        const projectId = workspace?.projectId;
+        if (projectId) cleanup.push(() => client.removeProject(projectId));
+        cleanup.push(() => repo.cleanup());
+      }
+      for (const release of cleanup) {
+        try {
+          await release();
+        } catch (error) {
+          errors.push(error);
+        }
+      }
+      if (errors.length > 0) {
+        const error = new AggregateError(errors, "Codex restore fixture teardown failed");
+        if (!testFailed) throw error;
+        // Keep the journey failure primary while reporting teardown failures in the test log.
+        console.error(error);
+      }
+    },
+  };
+}
+
+export const test = base.extend<{
+  codexRestore: Awaited<ReturnType<typeof createCodexRestoreJourney>>;
+}>({
+  // This fixture owns cleanup so a failed reproduction can retain its daemon state.
+  projectOwnership: async ({ e2eWorkerClient }, provide) => {
+    void e2eWorkerClient;
+    await provide();
+  },
+  codexRestore: async ({ page, e2eWorkerClient }, provide, info) => {
+    const journey = await createCodexRestoreJourney(page, e2eWorkerClient, info);
+    try {
+      await provide(journey);
+    } finally {
+      await journey.dispose();
+    }
+  },
+});
diff --git a/packages/app/e2e/support/helpers/command-center-workspace-actions.ts b/packages/app/e2e/support/helpers/command-center-workspace-actions.ts
index 5aba36208a..f3908dea28 100644
--- a/packages/app/e2e/support/helpers/command-center-workspace-actions.ts
+++ b/packages/app/e2e/support/helpers/command-center-workspace-actions.ts
@@ -28,7 +28,7 @@ export async function openWorkspaceFromCommandCenter(
 ): Promise<void> {
   const panel = await openCommandCenter(page);
   await panel.getByTestId("command-center-input").fill(title);
-  await page.keyboard.press("Enter");
+  await action(panel, title).click();
   await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), seeded.workspaceId), {
     timeout: 30_000,
   });
diff --git a/packages/app/e2e/support/helpers/composer.ts b/packages/app/e2e/support/helpers/composer.ts
index c7d2683284..01b9a39d58 100644
--- a/packages/app/e2e/support/helpers/composer.ts
+++ b/packages/app/e2e/support/helpers/composer.ts
@@ -8,6 +8,16 @@ import { selectWorkspaceInSidebar } from "./sidebar";
 import { getServerId } from "./server-id";
 import { waitForTabBar } from "./launcher";
 import { waitForSettledPosition } from "./sheet-layout";
+import { installDaemonWebSocketGate } from "./daemon-websocket-gate";
+
+export async function controlFileUploadCompletion(page: Page) {
+  const gate = await installDaemonWebSocketGate(page);
+  return {
+    hold: () => gate.holdNextServerMessage("file.upload.response"),
+    waitForUpload: () => gate.waitForHeldServerMessage("file.upload.response"),
+    complete: () => gate.releaseHeldServerMessage("file.upload.response"),
+  };
+}
 
 function composerInput(page: Page) {
   return page.getByRole("textbox", { name: "Message agent..." }).first();
@@ -42,6 +52,10 @@ export async function expectComposerFocused(page: Page): Promise<void> {
   await expect(composerInput(page)).toBeFocused();
 }
 
+export async function expectComposerNotFocused(page: Page): Promise<void> {
+  await expect(composerInput(page)).not.toBeFocused();
+}
+
 export async function submitMessage(page: Page, text: string): Promise<void> {
   const input = composerInput(page);
   await expect(input).toBeEditable({ timeout: 30_000 });
@@ -49,6 +63,12 @@ export async function submitMessage(page: Page, text: string): Promise<void> {
   await input.press("Enter");
 }
 
+/** The Send button works on compact screens, where Enter inserts a newline. */
+export async function submitMessageWithButton(page: Page, text: string): Promise<void> {
+  await fillComposerDraft(page, text);
+  await page.getByRole("button", { name: "Send message", exact: true }).click();
+}
+
 export async function fillComposerDraft(page: Page, text: string): Promise<void> {
   await composerInput(page).fill(text);
 }
@@ -125,6 +145,16 @@ export async function expectAttachmentPill(page: Page, testID: string): Promise<
   await expect(page.getByTestId(testID).first()).toBeVisible({ timeout: 10_000 });
 }
 
+export async function attachFileFromMenu(
+  page: Page,
+  file: { name: string; mimeType: string; buffer: Buffer },
+): Promise<void> {
+  await openAttachmentMenu(page);
+  const chooserPromise = page.waitForEvent("filechooser");
+  await page.getByRole("menuitem", { name: "Upload file", exact: true }).click();
+  await (await chooserPromise).setFiles(file);
+}
+
 export async function dropFileOnComposer(
   page: Page,
   file: { name: string; mimeType: string; buffer: Buffer },
@@ -166,7 +196,7 @@ export async function expectGithubAttachmentPill(
   page: Page,
   input: { number: number; title: string },
 ): Promise<void> {
-  const pill = page.getByTestId("composer-github-attachment-pill").first();
+  const pill = page.getByTestId("composer-github-attachment-pill").filter({ hasText: input.title });
   await expect(pill).toBeVisible({ timeout: 10_000 });
   await expect(pill).toContainText(`#${input.number}`);
   await expect(pill).toContainText(input.title);
@@ -188,7 +218,7 @@ export async function openGithubPickerFromMenu(page: Page): Promise<void> {
   await expect(page.getByTestId("combobox-desktop-container")).toBeVisible({ timeout: 5_000 });
 }
 
-/** Open picker, type a query, wait for the matching option by id (e.g. "issue:3", "pr:1"), and click it. */
+/** Open picker, type a query, wait for the matching option by id (e.g. "issue:3", "change_request:1"), and click it. */
 export async function selectGithubOption(
   page: Page,
   searchTerm: string,
@@ -286,3 +316,133 @@ export async function openGithubWorkspace(
     },
   };
 }
+
+const COMPOSER_TEST_IMAGE_BASE64 =
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+
+export async function attachComposerTestImage(page: Page): Promise<void> {
+  await attachImageFromMenu(page, {
+    name: "fullscreen.png",
+    mimeType: "image/png",
+    buffer: Buffer.from(COMPOSER_TEST_IMAGE_BASE64, "base64"),
+  });
+}
+
+export async function pasteComposerTestImage(page: Page): Promise<boolean> {
+  return composerInput(page).evaluate((input, base64) => {
+    const bytes = Uint8Array.from(atob(base64), (character) => character.charCodeAt(0));
+    const clipboardData = new DataTransfer();
+    clipboardData.items.add(new File([bytes], "pasted.png", { type: "image/png" }));
+    const event = new ClipboardEvent("paste", { clipboardData, bubbles: true, cancelable: true });
+    input.dispatchEvent(event);
+    return event.defaultPrevented;
+  }, COMPOSER_TEST_IMAGE_BASE64);
+}
+
+export async function enterComposerFullscreen(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Fullscreen", exact: true }).click();
+}
+export async function exitComposerFullscreen(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Exit fullscreen", exact: true }).click();
+}
+export async function resizeComposerViewport(
+  page: Page,
+  orientation: "portrait" | "landscape" | "short",
+): Promise<void> {
+  const sizes = {
+    portrait: { width: 390, height: 844 },
+    landscape: { width: 844, height: 390 },
+    short: { width: 390, height: 390 },
+  };
+  await page.setViewportSize(sizes[orientation]);
+}
+export async function selectComposerDraftRange(
+  page: Page,
+  start: number,
+  end: number,
+): Promise<void> {
+  await composerInput(page).focus();
+  await composerInput(page).evaluate(
+    (element, selection) => {
+      const input = element as HTMLTextAreaElement;
+      input.setSelectionRange(selection.start, selection.end);
+      input.dispatchEvent(new Event("select", { bubbles: true }));
+    },
+    { start, end },
+  );
+}
+export async function expectComposerDraftSelection(
+  page: Page,
+  start: number,
+  end: number,
+): Promise<void> {
+  await expect
+    .poll(() =>
+      composerInput(page).evaluate((element) => {
+        const input = element as HTMLTextAreaElement;
+        return [input.selectionStart, input.selectionEnd];
+      }),
+    )
+    .toEqual([start, end]);
+}
+export async function expectComposerFullscreenControls(page: Page): Promise<void> {
+  await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toBeVisible();
+  await expect(page.getByTestId("composer-fullscreen").getByRole("button")).toHaveCount(2);
+  await expect(composerInput(page)).toHaveCount(1);
+}
+export async function sendComposerWithButton(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Send message", exact: true }).click();
+}
+export async function queueComposerWithButton(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Queue message", exact: true }).click();
+}
+export async function configureComposerQueueSend(page: Page): Promise<void> {
+  await page.addInitScript(() =>
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ sendBehavior: "queue" })),
+  );
+}
+
+/** Drive the real tab chooser's commands even when fullscreen covers its pointer surface.
+ * This exercises retained activity changes, not a claim that covered chrome is clickable.
+ */
+export async function activateRetainedComposerTab(page: Page, title: string): Promise<void> {
+  await page
+    .getByTestId("workspace-tab-switcher-trigger")
+    .evaluate((element) => (element as HTMLElement).click());
+  const option = page.getByText(title, { exact: true }).filter({ visible: true }).last();
+  await expect(option).toBeVisible();
+  await option.evaluate((element) => (element as HTMLElement).click());
+}
+
+export async function recordVisibleComposerGeometry(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    const frames: { input: number; root: number }[] = [];
+    Reflect.set(window, "__composerGeometryFrames", frames);
+    let running = true;
+    const tick = () => {
+      if (!running) return;
+      for (const root of document.querySelectorAll('[data-testid="message-input-root"]')) {
+        if (root.getClientRects().length === 0) continue;
+        const input = root.querySelector("textarea");
+        if (input)
+          frames.push({
+            input: input.getBoundingClientRect().height,
+            root: root.getBoundingClientRect().height,
+          });
+      }
+      requestAnimationFrame(tick);
+    };
+    requestAnimationFrame(tick);
+    Reflect.set(window, "__stopComposerGeometry", () => {
+      running = false;
+    });
+  });
+}
+export async function expectNoCollapsedVisibleComposer(page: Page): Promise<void> {
+  const frames = await page.evaluate(() => {
+    Reflect.get(window, "__stopComposerGeometry")?.();
+    return Reflect.get(window, "__composerGeometryFrames") as { input: number; root: number }[];
+  });
+  expect(frames.length).toBeGreaterThan(0);
+  expect(frames.filter((frame) => frame.root < 42 || frame.input < 42)).toEqual([]);
+}
diff --git a/packages/app/e2e/support/helpers/content-width.ts b/packages/app/e2e/support/helpers/content-width.ts
new file mode 100644
index 0000000000..a99ee6a956
--- /dev/null
+++ b/packages/app/e2e/support/helpers/content-width.ts
@@ -0,0 +1,63 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+import { openSettings } from "./app";
+import { openSettingsSection } from "./settings";
+
+const APP_SETTINGS_KEY = "@paseo:app-settings";
+
+function contentWidthInput(page: Page): Locator {
+  return page.getByLabel("Content width in pixels", { exact: true });
+}
+
+function resetContentWidthButton(page: Page): Locator {
+  return page.getByRole("button", { name: "Reset content width to default", exact: true });
+}
+
+export async function openAppearanceSettings(page: Page): Promise<void> {
+  await openSettings(page);
+  await openSettingsSection(page, "appearance");
+}
+
+export async function setContentWidth(page: Page, width: number): Promise<void> {
+  const input = contentWidthInput(page);
+  await input.fill(String(width));
+  await input.press("Tab");
+}
+
+export async function resetContentWidth(page: Page): Promise<void> {
+  await resetContentWidthButton(page).click();
+}
+
+export async function expectDefaultContentWidthSetting(page: Page, width: number): Promise<void> {
+  await expect(contentWidthInput(page)).toHaveValue(String(width));
+  await expect(resetContentWidthButton(page)).toHaveCount(0);
+  await expect.poll(() => readStoredContentWidth(page)).toBeNull();
+}
+
+export async function expectCustomContentWidthSetting(page: Page, width: number): Promise<void> {
+  await expect(contentWidthInput(page)).toHaveValue(String(width));
+  await expect(resetContentWidthButton(page)).toBeVisible();
+  await expect.poll(() => readStoredContentWidth(page)).toBe(width);
+}
+
+/** Asserts the rendered width of a content-column element stays within `max` and above `min`. */
+export async function expectContentColumnWidth(
+  element: Locator,
+  bounds: { min?: number; max: number },
+): Promise<void> {
+  await expect(element).toBeVisible({ timeout: 30_000 });
+  await expect
+    .poll(async () => (await element.boundingBox())?.width ?? 0)
+    .toBeLessThanOrEqual(bounds.max);
+  await expect
+    .poll(async () => (await element.boundingBox())?.width ?? 0)
+    .toBeGreaterThan(bounds.min ?? 0);
+}
+
+async function readStoredContentWidth(page: Page): Promise<unknown> {
+  return page.evaluate((key) => {
+    const raw = localStorage.getItem(key);
+    return raw === null
+      ? undefined
+      : (JSON.parse(raw) as { contentMaxWidth?: unknown }).contentMaxWidth;
+  }, APP_SETTINGS_KEY);
+}
diff --git a/packages/app/e2e/support/helpers/context-window.ts b/packages/app/e2e/support/helpers/context-window.ts
new file mode 100644
index 0000000000..21341c7766
--- /dev/null
+++ b/packages/app/e2e/support/helpers/context-window.ts
@@ -0,0 +1,180 @@
+import path from "node:path";
+import { expect, type Locator, type Page } from "@playwright/test";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { expectComposerVisible } from "./composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "./mock-agent";
+import { installUsageReportsFixture, type UsageListResponse } from "./usage-reports";
+import { claudeAndCodexReports } from "./usage-sidebar-item";
+
+// 32,000 of the mock's 128,000-token window.
+const METER_NAME = "Context window 25% used";
+
+export type MockAgentSession = Awaited<ReturnType<typeof seedMockAgentWorkspace>>;
+
+/** An agent a quarter into its context window. */
+export function seedAgentWithContextWindow(): Promise<MockAgentSession> {
+  return seedMockAgentWorkspace({
+    repoPrefix: "context-window-usage-",
+    title: "Context window usage e2e",
+    initialPrompt: "emit 32000 byte file agent stream payload",
+  });
+}
+
+export async function openAgent(page: Page, session: MockAgentSession): Promise<void> {
+  await openAgentRoute(page, session);
+  await expectComposerVisible(page);
+}
+
+export async function reloadAgent(page: Page): Promise<void> {
+  // Reload must not reopen the card under a stationary pointer.
+  await page.mouse.move(0, 0);
+  await page.reload({ waitUntil: "domcontentloaded" });
+  await expectComposerVisible(page);
+}
+
+/** Wide screens show the meter's details in a hover card while the pointer is on it. */
+export async function hoverContextWindowMeter(page: Page, name = METER_NAME): Promise<Locator> {
+  await page.getByRole("img", { name, exact: true }).hover({ timeout: 30_000 });
+  const card = contextWindowDetails(page);
+  await expect(card).toBeVisible();
+  await expect(card).toBeInViewport();
+  return card;
+}
+
+/** Walks the pointer from the meter up onto its hover card, across the gap between them. */
+export async function moveOntoContextWindowDetails(page: Page, card: Locator): Promise<void> {
+  const meter = await page.getByRole("img", { name: METER_NAME }).boundingBox();
+  const box = await card.boundingBox();
+  if (!meter || !box) throw new Error("The meter and its hover card must be on screen.");
+  await page.mouse.move(meter.x + meter.width / 2, box.y + box.height / 2, { steps: 20 });
+}
+
+export async function leaveContextWindowMeter(page: Page): Promise<void> {
+  await page.mouse.move(0, 0);
+  await expect(contextWindowDetails(page)).toHaveCount(0);
+}
+
+/** Compact screens open the meter's details in a sheet. */
+export async function pressContextWindowMeter(page: Page, name = METER_NAME): Promise<Locator> {
+  await page.getByRole("button", { name, exact: true }).click({ timeout: 30_000 });
+  const sheet = contextWindowDetails(page);
+  await expect(sheet).toBeVisible();
+  return sheet;
+}
+
+export async function closeContextWindowSheet(page: Page): Promise<void> {
+  const sheet = contextWindowDetails(page);
+  await sheet.getByRole("button", { name: "Close", exact: true }).click();
+  await expect(sheet).toHaveCount(0);
+}
+
+/** The hover card on wide screens and the sheet on compact ones are both this dialog. */
+export function contextWindowDetails(page: Page): Locator {
+  return page.getByRole("dialog", { name: "Context window" });
+}
+
+/** One report card; cards have no role of their own. */
+export function usageCard(surface: Locator, reportId: string): Locator {
+  return surface.getByTestId(`usage-report-${reportId}`);
+}
+
+export async function refreshUsageCard(surface: Locator, source: string): Promise<void> {
+  await surface.getByRole("button", { name: `Refresh ${source}`, exact: true }).click();
+}
+
+export async function expectRefreshButtons(surface: Locator, count: number): Promise<void> {
+  await expect(surface.getByRole("button", { name: /^Refresh / })).toHaveCount(count);
+}
+
+/** A report on the agent's own login, which is not the host's default one. */
+export function onWorkLogin(report: UsageReportEntry): UsageReportEntry {
+  return onLogin(report, "work");
+}
+
+/** A report on the login an agent resumed under. */
+export function onPersonalLogin(report: UsageReportEntry): UsageReportEntry {
+  return onLogin(report, "personal");
+}
+
+function onLogin(report: UsageReportEntry, login: string): UsageReportEntry {
+  return {
+    ...report,
+    id: `${report.sourceId}:${login}`,
+    account: { label: `${login}@example.com` },
+  };
+}
+
+export function expiredLogin(report: UsageReportEntry): UsageReportEntry {
+  return {
+    ...report,
+    report: {
+      status: "unavailable",
+      problem: {
+        kind: "expired",
+        expiresAt: new Date(Date.now() - 2 * 60 * 60_000).toISOString(),
+        refreshedBy: "claude",
+      },
+    },
+  };
+}
+
+/** Holds a stream at a point until the test opens it, like a slow source. */
+export function gate(): { promise: Promise<void>; open: () => void } {
+  let open!: () => void;
+  const promise = new Promise<void>((resolve) => {
+    open = resolve;
+  });
+  return { promise, open };
+}
+
+export interface AgentUsageScript {
+  /** The answer to the next agent usage request or report Refresh. */
+  answerNext(response: UsageListResponse): void;
+  /** From the next reload the host no longer reports usage. */
+  stopReportingUsage(): void;
+  /** The agent of each agent usage request, in order. */
+  agentRequests(): string[];
+  /** Each scoped agent Refresh, by agent ID. */
+  refreshedAgents(): string[];
+}
+
+/**
+ * Scripts the host's usage: the host's own list is Claude and Codex on its default login; each
+ * agent request and each Refresh takes the next scripted answer.
+ */
+export async function scriptAgentUsage(page: Page): Promise<AgentUsageScript> {
+  let supported = true;
+  const answers: UsageListResponse[] = [];
+  const usage = await installUsageReportsFixture(page, {
+    usageSupported: () => supported,
+    lists: [
+      (request) => {
+        if (!request.agentId && !request.reportIds) return claudeAndCodexReports();
+        const next = answers.shift();
+        if (!next) throw new Error("The test scripts every agent usage request.");
+        return next;
+      },
+    ],
+  });
+  return {
+    answerNext: (response) => answers.push(response),
+    stopReportingUsage: () => {
+      supported = false;
+    },
+    agentRequests: () => usage.listRequests().flatMap((request) => request.agentId ?? []),
+    refreshedAgents: () =>
+      usage
+        .listRequests()
+        .flatMap((request) => (request.forceRefresh && request.agentId ? [request.agentId] : [])),
+  };
+}
+
+/** Set PASEO_QA_SCREENSHOT_DIR to keep a QA screenshot. */
+export async function qaScreenshot(page: Page, name: string): Promise<void> {
+  const directory = process.env.PASEO_QA_SCREENSHOT_DIR;
+  if (!directory) return;
+  // Let the sheet and hover card animations settle.
+  await page.waitForTimeout(600);
+  await page.addStyleTag({ content: ".__expo_fast_refresh { display: none !important; }" });
+  await page.screenshot({ path: path.join(directory, `${name}.png`) });
+}
diff --git a/packages/app/e2e/support/helpers/creation.ts b/packages/app/e2e/support/helpers/creation.ts
new file mode 100644
index 0000000000..9098068698
--- /dev/null
+++ b/packages/app/e2e/support/helpers/creation.ts
@@ -0,0 +1,325 @@
+import type { WorkspaceCreateRequest } from "@getpaseo/protocol/messages";
+import { expect, type Page } from "@playwright/test";
+import { daemonWsRoutePattern } from "./daemon-port";
+import { gotoAppShell } from "./app";
+import { gotoWorkspace } from "./launcher";
+import { fillComposerDraft } from "./composer";
+import { createAgentTabFromMenu } from "./workspace-tabs";
+import {
+  openNewWorkspaceComposer,
+  selectWorkspaceIsolation,
+  loadSessionMessageReaders,
+} from "./new-workspace";
+import { seedWorkspace } from "./seed-client";
+import {
+  waitForSidebarHydration,
+  switchWorkspaceViaSidebar,
+  workspaceDeckEntryLocator,
+} from "./workspace-ui";
+import { getServerId } from "./server-id";
+import { WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES } from "@/screens/workspace/workspace-deck-retention";
+import type { installDaemonWebSocketGate } from "./daemon-websocket-gate";
+
+/** Capture the submitted agent options; optionally stop provisioning for wire-only assertions. */
+export async function captureWorkspaceAgentRequest(page: Page, options: { block: boolean }) {
+  const frames = await loadSessionMessageReaders();
+  type AgentIntent = NonNullable<WorkspaceCreateRequest["agent"]>;
+  let resolveRequest!: (agent: AgentIntent) => void;
+  const request = new Promise<AgentIntent>((resolve) => {
+    resolveRequest = resolve;
+  });
+  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
+    const server = ws.connectToServer();
+    ws.onMessage((frame) => {
+      const message = frames.client(frame);
+      if (message?.type === "workspace.create.request" && message.agent) {
+        resolveRequest(message.agent);
+        if (options.block) return;
+      }
+      server.send(frame);
+    });
+    server.onMessage((frame) => ws.send(frame));
+  });
+  return { waitForRequest: () => request };
+}
+
+export async function pressSubmitBeforeTheNextRender(page: Page, name: string): Promise<void> {
+  const create = page.getByRole("button", { name, exact: true });
+  await expect(create).toBeEnabled();
+  // Dispatch the queued clicks in one JS task, before pending state can paint.
+  // Exercise DOM events rather than calling the app's submit handler directly.
+  await create.evaluate((button) => {
+    for (let click = 0; click < 3; click++) {
+      button.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    }
+  });
+}
+
+export async function observeCreationRequests(page: Page) {
+  const frames = await loadSessionMessageReaders();
+  const pending = new Set<string>();
+  page.on("websocket", (socket) => {
+    socket.on("framesent", ({ payload }) => {
+      const request = frames.client(payload);
+      if (
+        request?.type === "workspace.create.request" ||
+        request?.type === "agent.create.request"
+      ) {
+        pending.add(request.requestId);
+      }
+    });
+    socket.on("framereceived", ({ payload }) => {
+      const response = frames.server(payload);
+      if (
+        response?.type === "workspace.create.response" ||
+        response?.type === "agent.create.response" ||
+        (response?.type === "status" &&
+          (response.payload.status === "agent_created" ||
+            response.payload.status === "agent_create_failed"))
+      ) {
+        const requestId = response.payload.requestId;
+        if (typeof requestId === "string") pending.delete(requestId);
+      }
+    });
+  });
+  return {
+    async settled() {
+      await expect.poll(() => pending.size).toBe(0);
+    },
+  };
+}
+
+export async function retryNextAgentCreation(page: Page) {
+  const frames = await loadSessionMessageReaders();
+  const retryIds = new Set<string>();
+  const results: Array<{ status: string; agentId?: string }> = [];
+  let repeated = false;
+  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((frame) => {
+      const request = frames.client(frame);
+      if (!repeated && request?.type === "agent.create.request") {
+        repeated = true;
+        for (let attempt = 1; attempt <= 3; attempt++) {
+          const requestId = attempt === 1 ? request.requestId : `${request.requestId}-${attempt}`;
+          retryIds.add(requestId);
+          // Keep the app's operation key and payload; only RPC correlation changes.
+          server.send(JSON.stringify({ type: "session", message: { ...request, requestId } }));
+        }
+        return;
+      }
+      server.send(frame);
+    });
+    server.onMessage((frame) => {
+      const response = frames.server(frame);
+      if (
+        response?.type === "agent.create.response" &&
+        retryIds.delete(response.payload.requestId)
+      ) {
+        results.push({
+          status: response.payload.error ? "agent_create_failed" : "agent_created",
+          agentId: response.payload.agent?.id,
+        });
+      }
+      browser.send(frame);
+    });
+  });
+  return {
+    async completedAgentIds() {
+      await expect.poll(() => results.length).toBe(3);
+      expect(results.map((result) => result.status)).toEqual([
+        "agent_created",
+        "agent_created",
+        "agent_created",
+      ]);
+      return results.map((result) => result.agentId);
+    },
+  };
+}
+
+export async function createCreationScenario(page: Page) {
+  const requests = await observeCreationRequests(page);
+  const project = await seedWorkspace({ repoPrefix: "creation-idempotency-" });
+  let workspaceId = project.workspaceId;
+  return {
+    cleanup: project.cleanup,
+    async openWorkspaceForm(isolation: "local" | "worktree") {
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      await openNewWorkspaceComposer(page, project);
+      await selectWorkspaceIsolation(page, isolation);
+    },
+    async openAgentDraft() {
+      await gotoWorkspace(page, project.workspaceId);
+      await createAgentTabFromMenu(page);
+    },
+    async startAnotherDraft() {
+      await createAgentTabFromMenu(page);
+    },
+    async submitPrompt(prompt: string, button = "Send message") {
+      await fillComposerDraft(page, prompt);
+      await page.getByRole("button", { name: button, exact: true }).click();
+    },
+    async submitRepeatedly(button: string, prompt?: string) {
+      if (prompt) await fillComposerDraft(page, prompt);
+      await pressSubmitBeforeTheNextRender(page, button);
+    },
+    async expectPromptVisible(prompt?: string) {
+      // Inactive agent tabs retain their timeline DOM beside the visible draft.
+      const rows = page.getByTestId("user-message").filter({ visible: true });
+      await expect(prompt ? rows.filter({ hasText: prompt }) : rows.first()).toBeVisible();
+    },
+    async expectWorkspaceReadyBeforeAgentCompletion() {
+      await expect(page).toHaveURL(/\/workspace\//);
+      await expect(page.getByTestId("user-message").first()).toBeVisible();
+      await expect(
+        page
+          .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
+          .filter({ visible: true }),
+      ).toBeVisible();
+    },
+    async expectAgentStillStarting() {
+      await this.expectWorkspaceReadyBeforeAgentCompletion();
+      expect((await project.client.fetchAgents()).entries).toHaveLength(0);
+    },
+    async expectCreatedAgentError() {
+      await requests.settled();
+      await expect(
+        page
+          .getByTestId("assistant-message")
+          .filter({ hasText: "[System Error] Requested mock prompt rejection", visible: true }),
+      ).toBeVisible();
+      await expect(
+        page
+          .locator('[data-testid^="workspace-tab-agent_"][aria-selected="true"]')
+          .filter({ visible: true }),
+      ).toBeVisible();
+      await expect(
+        page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true }),
+      ).toHaveCount(0);
+      await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeEditable();
+      await expect(page.getByTestId("turn-working-indicator")).toHaveCount(0);
+    },
+    async expectPromptBeforeError(prompt: string) {
+      const messages = page
+        .getByTestId("user-message")
+        .or(page.getByTestId("assistant-message"))
+        .filter({ visible: true });
+      await expect(messages).toHaveCount(2);
+      await expect(messages.nth(0)).toContainText(prompt);
+      await expect(messages.nth(1)).toContainText("[System Error]");
+      await expect(messages.nth(1)).toBeInViewport();
+    },
+    async reloadAgent() {
+      await page.reload();
+      await expect(page.getByText("Updating messages", { exact: true })).toHaveCount(0);
+      await this.expectCreatedAgentError();
+    },
+    async expectAssistantReply() {
+      await expect(
+        page
+          .getByTestId("assistant-message")
+          .filter({ visible: true, hasNotText: "[System Error]" })
+          .first(),
+      ).toBeVisible();
+    },
+    async expectStartupFailure() {
+      await expect(page.getByText(/Creation startup failed for test/).first()).toBeVisible();
+    },
+    async expectOneCreatedWorkspace() {
+      await expect(page).toHaveURL(/\/workspace\//);
+      await requests.settled();
+      const workspaces = (await project.client.fetchWorkspaces()).entries.filter(
+        (workspace) =>
+          workspace.projectId === project.projectId && workspace.id !== project.workspaceId,
+      );
+      expect(workspaces).toHaveLength(1);
+      workspaceId = workspaces[0]!.id;
+    },
+    async expectAgentCount(count: number) {
+      await requests.settled();
+      await expect
+        .poll(
+          async () =>
+            (await project.client.fetchAgents()).entries.filter(
+              ({ agent }) => agent.workspaceId === workspaceId,
+            ).length,
+        )
+        .toBe(count);
+    },
+    async agentIds() {
+      await requests.settled();
+      return (await project.client.fetchAgents()).entries
+        .filter(({ agent }) => agent.workspaceId === workspaceId)
+        .map(({ agent }) => agent.id);
+    },
+    async expectAgentTitle(title: string) {
+      await expect
+        .poll(
+          async () =>
+            (await project.client.fetchAgents()).entries.find(
+              ({ agent }) => agent.workspaceId === workspaceId,
+            )?.agent.title,
+        )
+        .toBe(title);
+    },
+    async evictAndReturnToDraft() {
+      const draft = page
+        .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
+        .filter({ visible: true })
+        .first();
+      const draftTestId = await draft.getAttribute("data-testid");
+      expect(draftTestId).not.toBeNull();
+      for (let index = 0; index < WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES; index++) {
+        const result = await project.client.createWorkspace({
+          source: { kind: "directory", path: project.repoPath },
+        });
+        if (!result.workspace) throw new Error(result.error ?? "Failed to seed eviction workspace");
+        await switchWorkspaceViaSidebar({
+          page,
+          serverId: getServerId(),
+          workspaceId: result.workspace.id,
+        });
+      }
+      await expect(workspaceDeckEntryLocator(page, getServerId(), workspaceId)).toHaveCount(0);
+      await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId });
+      await page
+        .getByTestId(draftTestId!)
+        .filter({ visible: true })
+        .click({ position: { x: 12, y: 13 } });
+    },
+  };
+}
+
+export function createPromptRetryScenario(
+  page: Page,
+  gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>,
+) {
+  let firstMessage: ReturnType<typeof gate.getClientRequests>[number] | undefined;
+  return {
+    holdAcknowledgement() {
+      gate.holdNextServerMessage("agent.create.response");
+    },
+    async waitForDeliveredPrompt() {
+      await gate.waitForHeldServerMessage("agent.create.response");
+      firstMessage = gate.getClientRequests("agent.create.request").at(-1);
+    },
+    async disconnectAndReconnect() {
+      const fetches = gate.getClientRequestCount("fetch_agents_request");
+      await gate.drop();
+      gate.restore();
+      await expect
+        .poll(() => gate.getClientRequestCount("fetch_agents_request"))
+        .toBeGreaterThan(fetches);
+    },
+    async expectSameAgentAndMessage() {
+      expect(gate.getClientRequestCount("agent.create.request")).toBe(1);
+      await expect
+        .poll(() => gate.getClientRequestCount("creation.subscribe.request"))
+        .toBeGreaterThan(0);
+      expect(gate.getClientRequests("agent.create.request").at(-1)).toEqual(firstMessage);
+      expect(gate.getClientRequestCount("send_agent_message_request")).toBe(0);
+      await expect(page.getByTestId("user-message").filter({ visible: true })).toHaveCount(1);
+    },
+  };
+}
diff --git a/packages/app/e2e/support/helpers/daemon-client-loader.ts b/packages/app/e2e/support/helpers/daemon-client-loader.ts
index b36bbae32a..eee8cdaffb 100644
--- a/packages/app/e2e/support/helpers/daemon-client-loader.ts
+++ b/packages/app/e2e/support/helpers/daemon-client-loader.ts
@@ -64,3 +64,10 @@ function loadAppVersion(): string {
   }
   return packageJson.version;
 }
+
+export async function loadProtocolSchemas(): Promise<typeof import("@getpaseo/protocol/messages")> {
+  const moduleUrl = pathToFileURL(
+    path.resolve(__dirname, "../../../../../packages/protocol/dist/messages.js"),
+  ).href;
+  return import(moduleUrl);
+}
diff --git a/packages/app/e2e/support/helpers/daemon-lifecycle.ts b/packages/app/e2e/support/helpers/daemon-lifecycle.ts
new file mode 100644
index 0000000000..6779039f1f
--- /dev/null
+++ b/packages/app/e2e/support/helpers/daemon-lifecycle.ts
@@ -0,0 +1,42 @@
+import { expect, type Page } from "@playwright/test";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient } from "./daemon-client-loader";
+import { openSettings } from "./app";
+import { openHostSection, openSettingsHost, seedSavedSettingsHosts } from "./settings";
+import type { IsolatedHostDaemon } from "./isolated-host-daemon";
+
+export async function openDaemonOverview(page: Page, daemon: IsolatedHostDaemon) {
+  await seedSavedSettingsHosts(page, [
+    { serverId: daemon.serverId, label: "Lifecycle host", endpoint: `127.0.0.1:${daemon.port}` },
+  ]);
+  await page.reload();
+  await openSettings(page);
+  await openSettingsHost(page, daemon.serverId);
+  await openHostSection(page, daemon.serverId, "host");
+}
+
+export async function restartDaemonInSettings(page: Page) {
+  const button = page.getByRole("button", { name: "Restart", exact: true });
+  await expect(button).toBeEnabled();
+  page.once("dialog", (dialog) => dialog.accept());
+  await button.click();
+  await expect(page.getByRole("button", { name: "Restarting...", exact: true })).toBeDisabled();
+}
+
+export async function expectDaemonRestartComplete(page: Page) {
+  await expect(page.getByRole("button", { name: "Restart", exact: true })).toBeEnabled({
+    timeout: 30_000,
+  });
+}
+
+export async function readWorkerPid(daemon: IsolatedHostDaemon): Promise<number> {
+  const client = await connectDaemonClient<DaemonClient>({
+    port: daemon.port,
+    clientIdPrefix: "lifecycle-observer",
+  });
+  try {
+    return (await client.getDaemonStatus()).pid;
+  } finally {
+    await client.close();
+  }
+}
diff --git a/packages/app/e2e/support/helpers/daemon-websocket-gate.ts b/packages/app/e2e/support/helpers/daemon-websocket-gate.ts
index 2f3d6b22c6..bff52fc3f7 100644
--- a/packages/app/e2e/support/helpers/daemon-websocket-gate.ts
+++ b/packages/app/e2e/support/helpers/daemon-websocket-gate.ts
@@ -21,6 +21,7 @@ interface ClientRequest {
   mode?: unknown;
   path?: unknown;
   agentId?: unknown;
+  messageId?: unknown;
   text?: unknown;
   activeTurnBehavior?: unknown;
 }
@@ -848,7 +849,12 @@ export async function installDaemonWebSocketGate(page: Page) {
     getClientRequests(type: string): ReadonlyArray<ClientRequest> {
       return [...(clientRequests.get(type) ?? [])];
     },
-    getTimelineRequestCount(direction: "tail" | "before" | "after"): number {
+    getTimelineRequestCount(direction: "tail" | "before" | "after", agentId?: string): number {
+      if (agentId) {
+        return (clientRequests.get("fetch_agent_timeline_request") ?? []).filter(
+          (request) => request.agentId === agentId && request.direction === direction,
+        ).length;
+      }
       return timelineRequestCounts.get(direction) ?? 0;
     },
     getAgentStreamItemCount(type: string): number {
diff --git a/packages/app/e2e/support/helpers/explorer-plugin-menu.ts b/packages/app/e2e/support/helpers/explorer-plugin-menu.ts
new file mode 100644
index 0000000000..ccccac8570
--- /dev/null
+++ b/packages/app/e2e/support/helpers/explorer-plugin-menu.ts
@@ -0,0 +1,180 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, type Page, type TestInfo } from "@playwright/test";
+import { gotoWorkspace } from "./launcher";
+import { buildAgentRoute } from "./mock-agent";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { pluginRequirements } from "./plugin-fixture";
+import { seedWorkspace } from "./seed-client";
+import { ensureExplorerSidebar } from "./workspace-tabs";
+
+type ExplorerPanelWorkspace = Awaited<ReturnType<typeof seedWorkspace>>;
+
+async function writePanelPlugin(id: string, title: string) {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-explorer-menu-"));
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id, requirements: pluginRequirements }),
+  );
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    `
+import React from "react";
+import { Text } from "react-native";
+export default function contribute(client) {
+  client.addWorkspacePanel({ id: "review", title: ${JSON.stringify(title)}, icon: "Blocks", context: "workspace", locations: ["workspace", "explorer"], Component: ({ workspaceId }) => <Text>{${JSON.stringify(title)} + " workspace " + workspaceId}</Text> });
+  client.addWorkspacePanel({ id: "summary", title: ${JSON.stringify(`${title} summary`)}, icon: "Blocks", context: "workspace", locations: ["explorer"], Component: () => <Text>Summary content</Text> });
+  client.addWorkspacePanel({ id: "main", title: ${JSON.stringify(`${title} main only`)}, icon: "Blocks", context: "workspace", Component: () => null });
+  client.addWorkspacePanel({ id: "agent", title: ${JSON.stringify(`${title} agent`)}, icon: "Blocks", context: "agent", locations: ["explorer"], Component: () => null });
+  return () => {};
+}`,
+  );
+  return directory;
+}
+
+async function openExplorerMenu(page: Page) {
+  const explorer = await ensureExplorerSidebar(page);
+  await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+  const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
+  await expect(menu).toBeVisible();
+  await expect(menu).toHaveCSS("opacity", "1");
+  return menu;
+}
+
+async function launchExplorerView(page: Page, name: string | RegExp) {
+  const menu = await openExplorerMenu(page);
+  await menu.getByRole("menuitem", { name, exact: true }).click();
+  await expect(menu).not.toBeVisible();
+}
+
+export async function withExplorerPanelPlugins(
+  page: Page,
+  run: (workspace: ExplorerPanelWorkspace) => Promise<void>,
+) {
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previousConfig = await client.getDaemonConfig();
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-plugin-menu-" });
+  const first = await writePanelPlugin("explorer-review", "Review");
+  const second = await writePanelPlugin("explorer-other", "Other review");
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(first);
+    await client.installDirectoryPlugin(second);
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+
+    await run(workspace);
+  } finally {
+    await client.removePlugin("explorer-review");
+    await client.removePlugin("explorer-other");
+    await client.patchDaemonConfig({
+      pluginsEnabled: previousConfig.config.pluginsEnabled ?? false,
+    });
+    await client.close();
+    await workspace.cleanup();
+    await rm(first, { recursive: true, force: true });
+    await rm(second, { recursive: true, force: true });
+  }
+}
+
+export async function expectWorkspacePanelsInExplorerLauncher(page: Page) {
+  const menu = await openExplorerMenu(page);
+  await expect(menu.getByRole("menuitem", { name: "Review", exact: true })).toBeVisible();
+  await expect(menu.getByRole("menuitem", { name: "Review agent", exact: true })).toHaveCount(0);
+  await expect(menu.getByRole("menuitem", { name: "Review main only", exact: true })).toHaveCount(
+    0,
+  );
+  await page.keyboard.press("Escape");
+}
+
+export async function openWorkspacePanelFromExplorerMenu(
+  page: Page,
+  workspace: ExplorerPanelWorkspace,
+  testInfo: TestInfo,
+) {
+  const menu = await openExplorerMenu(page);
+  await testInfo.attach("explorer-panel-menu", {
+    body: await page.screenshot({ path: testInfo.outputPath("explorer-panel-menu.png") }),
+    contentType: "image/png",
+  });
+  await expect(menu.getByRole("menuitem", { name: "Review", exact: true })).toBeVisible();
+  await expect(menu.getByRole("menuitem", { name: "Other review", exact: true })).toBeVisible();
+  await expect(menu.getByRole("menuitem", { name: "Review summary", exact: true })).toBeVisible();
+  await expect(
+    menu.getByRole("menuitem", { name: "Other review summary", exact: true }),
+  ).toBeVisible();
+  await menu.getByRole("menuitem", { name: "Review", exact: true }).click();
+  await expect(
+    page.getByText(`Review workspace ${workspace.workspaceId}`, { exact: true }),
+  ).toBeVisible();
+}
+
+export async function expectIndependentExplorerPanelTabs(
+  page: Page,
+  workspace: ExplorerPanelWorkspace,
+) {
+  await launchExplorerView(page, "Other review");
+  await expect(
+    page.getByText(`Other review workspace ${workspace.workspaceId}`, { exact: true }),
+  ).toBeVisible();
+  await launchExplorerView(page, "Review summary");
+  const tabs = page.getByTestId("workspace-explorer-sidebar").getByTestId("workspace-tabs-row");
+  await expect(tabs.getByRole("button", { name: "Review", exact: true })).toBeVisible();
+  await expect(tabs.getByRole("button", { name: "Other review", exact: true })).toBeVisible();
+  await expect(tabs.getByRole("button", { name: "Review summary", exact: true })).toBeVisible();
+  await tabs
+    .getByRole("button", { name: "Review", exact: true })
+    .click({ button: "right", position: { x: 12, y: 13 } });
+  await page.getByRole("menuitem", { name: "Close", exact: true }).click();
+  await expect(tabs.getByRole("button", { name: "Review", exact: true })).toHaveCount(0);
+  await expect(tabs.getByRole("button", { name: "Other review", exact: true })).toBeVisible();
+  await expect(tabs.getByRole("button", { name: "Review summary", exact: true })).toBeVisible();
+  const files = tabs.getByRole("button", { name: "Browse workspace files", exact: true });
+  await expect(files).toHaveCount(1);
+  const menu = await openExplorerMenu(page);
+  await expect(menu.getByRole("menuitem", { name: /^Files/ })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+  await files.click({ button: "right", position: { x: 12, y: 13 } });
+  await page.getByRole("menuitem", { name: "Close", exact: true }).click();
+  await expect(files).toHaveCount(0);
+  await launchExplorerView(page, /^Files/);
+  await expect(files).toHaveCount(1);
+  const restoredMenu = await openExplorerMenu(page);
+  await expect(restoredMenu.getByRole("menuitem", { name: /^Files/ })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+}
+
+export async function expectExplorerPanelWithFocusedAgent(
+  page: Page,
+  workspace: ExplorerPanelWorkspace,
+  testInfo: TestInfo,
+) {
+  const agent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Focused agent",
+    model: "ten-second-stream",
+    modeId: "load-test",
+  });
+  await page.goto(buildAgentRoute(workspace.workspaceId, agent.id));
+  await expect(
+    page.getByTestId(`workspace-tab-agent_${agent.id}`).filter({ visible: true }),
+  ).toHaveAttribute("aria-selected", "true");
+  const menu = await openExplorerMenu(page);
+  await expect(menu.getByRole("menuitem", { name: "Review agent", exact: true })).toHaveCount(0);
+  await expect(menu.getByRole("menuitem", { name: "Other review agent", exact: true })).toHaveCount(
+    0,
+  );
+  await menu.getByRole("menuitem", { name: "Review", exact: true }).click();
+  await expect(
+    page.getByText(`Review workspace ${workspace.workspaceId}`, { exact: true }),
+  ).toBeVisible();
+  await testInfo.attach("workspace-panel-with-focused-agent", {
+    body: await page.screenshot({
+      path: testInfo.outputPath("workspace-panel-with-focused-agent.png"),
+    }),
+    contentType: "image/png",
+  });
+}
diff --git a/packages/app/e2e/support/helpers/host-confirmation.ts b/packages/app/e2e/support/helpers/host-confirmation.ts
new file mode 100644
index 0000000000..f6de576fc0
--- /dev/null
+++ b/packages/app/e2e/support/helpers/host-confirmation.ts
@@ -0,0 +1,95 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+
+const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
+
+export interface LinkedHost {
+  serverId: string;
+  relayEndpoint: string;
+  daemonPublicKeyB64: string;
+}
+
+/**
+ * A pairing link that opens on the settings page. `/` redirects to
+ * `/open-project` on its own, so starting in settings leaves the pairing link
+ * as the only thing that can move the app to `/open-project`.
+ */
+export function buildPairingLink(host: LinkedHost): string {
+  const offer = {
+    v: 2,
+    serverId: host.serverId,
+    daemonPublicKeyB64: host.daemonPublicKeyB64,
+    relay: { endpoint: host.relayEndpoint, useTls: false },
+  };
+  const encoded = Buffer.from(JSON.stringify(offer), "utf8").toString("base64url");
+  return `/settings/general#offer=${encoded}`;
+}
+
+/** Loads the app from a pairing link, the way opening the link in a browser does. */
+export async function openPairingLink(page: Page, link: string): Promise<void> {
+  // Leave the link's page first so the link always loads the app from scratch.
+  await page.goto("/");
+  await page.goto(link);
+}
+
+/** Saves a relay host before the app loads, as if it had been paired in an earlier session. */
+export async function saveLinkedHostBeforeLoad(page: Page, host: LinkedHost): Promise<void> {
+  await page.goto("/");
+  const nowIso = new Date().toISOString();
+  const connectionId = `relay:${host.relayEndpoint}`;
+  const savedHost = {
+    serverId: host.serverId,
+    label: host.serverId,
+    connections: [
+      {
+        id: connectionId,
+        type: "relay",
+        relayEndpoint: host.relayEndpoint,
+        useTls: false,
+        daemonPublicKeyB64: host.daemonPublicKeyB64,
+      },
+    ],
+    preferredConnectionId: connectionId,
+    createdAt: nowIso,
+    updatedAt: nowIso,
+  };
+  await page.evaluate(({ key, hosts }) => localStorage.setItem(key, JSON.stringify(hosts)), {
+    key: EXTRA_HOSTS_KEY,
+    hosts: [savedHost],
+  });
+}
+
+export function hostConfirmation(page: Page): Locator {
+  return page.getByTestId("host-confirmation");
+}
+
+export async function expectHostConfirmationFor(page: Page, host: LinkedHost): Promise<void> {
+  const sheet = hostConfirmation(page);
+  await expect(sheet.getByText("Connect to this host?", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(sheet.getByTestId("host-confirmation-server-id")).toHaveText(host.serverId);
+  await expect(sheet.getByTestId("host-confirmation-relay")).toHaveText(host.relayEndpoint);
+}
+
+export async function cancelHostConfirmation(page: Page): Promise<void> {
+  await hostConfirmation(page).getByRole("button", { name: "Cancel", exact: true }).click();
+  await expect(hostConfirmation(page)).toHaveCount(0);
+}
+
+export async function connectToConfirmedHost(page: Page): Promise<void> {
+  await hostConfirmation(page).getByRole("button", { name: "Connect", exact: true }).click();
+  await expect(hostConfirmation(page)).toHaveCount(0);
+}
+
+/** Checks the host picker on the settings page the app is already showing. */
+export async function expectHostInHostPicker(
+  page: Page,
+  serverId: string,
+  expected: "listed" | "not listed",
+): Promise<void> {
+  await page.getByTestId("settings-host-picker").click();
+  await expect(page.getByTestId(`settings-host-picker-item-${serverId}`)).toHaveCount(
+    expected === "listed" ? 1 : 0,
+  );
+  await page.keyboard.press("Escape");
+}
diff --git a/packages/app/e2e/support/helpers/import-session.ts b/packages/app/e2e/support/helpers/import-session.ts
index 86818f6f4e..718b0d5965 100644
--- a/packages/app/e2e/support/helpers/import-session.ts
+++ b/packages/app/e2e/support/helpers/import-session.ts
@@ -2,6 +2,7 @@ import { expect, type Page } from "@playwright/test";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { gotoAppShell } from "./app";
 import { openCommandCenter } from "./command-center";
+import { openGlobalNewWorkspaceComposer } from "./new-workspace";
 import { getServerId } from "./server-id";
 import { expectMobileAgentSidebarVisible, openMobileAgentSidebar } from "./sidebar";
 
@@ -18,17 +19,24 @@ export class ImportSessionFlow {
       timeout: 30_000,
     });
   }
-  async revealMobileEntryPoint() {
-    await openMobileAgentSidebar(this.page);
-    await expectMobileAgentSidebarVisible(this.page);
-    const button = this.page.getByTestId("sidebar-import-session");
+  /** The new workspace screen's Import session button, reached from the sidebar. */
+  async revealNewWorkspaceEntryPoint() {
+    const compact = (this.page.viewportSize()?.width ?? 0) < 768;
+    if (compact) {
+      await openMobileAgentSidebar(this.page);
+      await expectMobileAgentSidebarVisible(this.page);
+    }
+    await openGlobalNewWorkspaceComposer(this.page);
+    const button = this.page.getByTestId("new-workspace-import-session");
     await expect(button).toHaveAccessibleName("Import session");
-    await button.hover();
-    await expect(this.page.getByText("Import session", { exact: true })).toBeVisible();
+    await expect(button).toBeInViewport();
   }
   async openGlobally() {
-    await expect(this.page.getByTestId("sidebar-import-session")).toBeVisible();
-    await this.page.getByTestId("sidebar-import-session").click();
+    await this.revealNewWorkspaceEntryPoint();
+    await this.openFromNewWorkspace();
+  }
+  async openFromNewWorkspace() {
+    await this.page.getByTestId("new-workspace-import-session").click();
     await this.expectSheetReady();
   }
   async openFromWorkspaceHeader() {
@@ -49,6 +57,9 @@ export class ImportSessionFlow {
     before?: [string, string];
     folders?: Array<[string, string]>;
   }) {
+    for (const id of input.first ?? input.before ?? []) {
+      await expect(this.page.getByTestId(rowTestId(id))).toHaveCount(1);
+    }
     const ids = await this.rowIds();
     if (input.first) expect(ids.slice(0, input.first.length)).toEqual(input.first.map(rowTestId));
     if (input.before) {
@@ -106,8 +117,12 @@ export class ImportSessionFlow {
     });
   }
   async expectTranscript(userText: string, assistantText: string) {
-    await expect(this.page.getByTestId("user-message")).toContainText(userText);
-    await expect(this.page.getByTestId("assistant-message")).toContainText(assistantText);
+    await expect(this.page.getByTestId("user-message").filter({ visible: true })).toContainText(
+      userText,
+    );
+    await expect(
+      this.page.getByTestId("assistant-message").filter({ visible: true }),
+    ).toContainText(assistantText);
   }
   async showAll() {
     await this.page.getByTestId("import-session-show-all").click();
@@ -118,7 +133,9 @@ export class ImportSessionFlow {
       timeout: 30_000,
     });
     const workspace = this.page.getByTestId(`workspace-deck-entry-${getServerId()}:${workspaceId}`);
-    await expect(workspace.getByTestId("user-message")).toContainText(userText);
+    await expect(workspace.getByTestId("user-message").filter({ visible: true })).toContainText(
+      userText,
+    );
   }
   async close() {
     await this.page.keyboard.press("Escape");
diff --git a/packages/app/e2e/support/helpers/isolated-host-daemon.ts b/packages/app/e2e/support/helpers/isolated-host-daemon.ts
index da22a9ce16..01fe3a70c1 100644
--- a/packages/app/e2e/support/helpers/isolated-host-daemon.ts
+++ b/packages/app/e2e/support/helpers/isolated-host-daemon.ts
@@ -41,6 +41,13 @@ async function getAvailablePort(): Promise<number> {
   });
 }
 
+export async function getAvailableHostDaemonPort(): Promise<number> {
+  const primaryPort = Number(process.env.E2E_DAEMON_PORT ?? 0);
+  let port = await getAvailablePort();
+  while (port === 6767 || port === 6768 || port === primaryPort) port = await getAvailablePort();
+  return port;
+}
+
 async function waitForServer(port: number, child: ChildProcess): Promise<void> {
   const deadline = Date.now() + 90_000;
   let lastError: unknown = null;
@@ -81,9 +88,7 @@ export async function startIsolatedHostDaemon(
   serverId: string,
   options: IsolatedHostDaemonOptions = {},
 ): Promise<IsolatedHostDaemon> {
-  const primaryPort = Number(process.env.E2E_DAEMON_PORT ?? 0);
-  let port = await getAvailablePort();
-  while (port === 6767 || port === primaryPort) port = await getAvailablePort();
+  const port = await getAvailableHostDaemonPort();
 
   const metroPort = process.env.E2E_METRO_PORT;
   if (!metroPort) throw new Error("E2E_METRO_PORT is required to start an isolated host daemon");
diff --git a/packages/app/e2e/support/helpers/mock-agent.ts b/packages/app/e2e/support/helpers/mock-agent.ts
index d1447700a3..f6176b0f07 100644
--- a/packages/app/e2e/support/helpers/mock-agent.ts
+++ b/packages/app/e2e/support/helpers/mock-agent.ts
@@ -18,6 +18,7 @@ export interface MockAgentOptions {
   port?: number;
   initialPrompt?: string;
   model?: string;
+  thinkingOptionId?: string;
   modeId?: string;
   featureValues?: Record<string, unknown>;
 }
@@ -43,6 +44,7 @@ export async function seedMockAgentWorkspace(
       title: options.title,
       modeId: options.modeId ?? "load-test",
       model: options.model ?? "e2e-fast-stream",
+      thinkingOptionId: options.thinkingOptionId,
       initialPrompt: options.initialPrompt,
       featureValues: options.featureValues,
     });
diff --git a/packages/app/e2e/support/helpers/model-memory.ts b/packages/app/e2e/support/helpers/model-memory.ts
new file mode 100644
index 0000000000..7a41419db0
--- /dev/null
+++ b/packages/app/e2e/support/helpers/model-memory.ts
@@ -0,0 +1,71 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { expect, type Page } from "../fixtures";
+import { drillIntoProvider, openModelPicker } from "./agent-profiles";
+
+export async function startWithoutRememberedModel(page: Page) {
+  await page.addInitScript(() => localStorage.removeItem("@paseo:create-agent-preferences"));
+}
+
+export async function chooseModel(page: Page, provider: string, label: string) {
+  await openModelPicker(page);
+  await expect(
+    page.getByRole("dialog").getByRole("button", { name: "Back", exact: true }),
+  ).toHaveCount(0);
+  await selectProviderModel(page, provider, label);
+}
+
+export async function reselectModel(page: Page, provider: string, label: string) {
+  await expectRememberedModel(page, label);
+  await openModelPicker(page);
+  await page.getByRole("dialog").getByRole("button", { name: "Back", exact: true }).click();
+  await selectProviderModel(page, provider, label);
+}
+
+async function selectProviderModel(page: Page, provider: string, label: string) {
+  await drillIntoProvider(page, provider);
+  await page.getByTestId("combobox-desktop-container").getByText(label, { exact: true }).click();
+  await expect(
+    page
+      .getByRole("button", { name: `Select model (${label})`, exact: true })
+      .filter({ visible: true }),
+  ).toBeVisible();
+}
+
+export async function expectSavedSelection(page: Page, provider: string, model: string) {
+  await expect
+    .poll(() =>
+      page.evaluate(() =>
+        JSON.parse(localStorage.getItem("@paseo:create-agent-preferences") ?? "null"),
+      ),
+    )
+    .toMatchObject({ provider, providerPreferences: { [provider]: { model } } });
+}
+
+export async function expectCreatedModelAgents(
+  page: Page,
+  client: DaemonClient,
+  provider: string,
+  model: string,
+  count: number,
+) {
+  await expect
+    .poll(
+      async () => {
+        const result = await client.fetchAgents({ scope: "active" });
+        return result.entries
+          .filter(({ agent }) => agent.provider === provider)
+          .map(({ agent }) => agent.model);
+      },
+      { timeout: 60_000 },
+    )
+    .toEqual(Array(count).fill(model));
+  await expect(page.getByTestId(/^workspace-tab-agent_/).filter({ visible: true })).toHaveCount(1);
+}
+
+export async function expectRememberedModel(page: Page, label: string) {
+  await expect(
+    page
+      .getByRole("button", { name: `Select model (${label})`, exact: true })
+      .filter({ visible: true }),
+  ).toBeVisible();
+}
diff --git a/packages/app/e2e/support/helpers/new-workspace-navigation.ts b/packages/app/e2e/support/helpers/new-workspace-navigation.ts
new file mode 100644
index 0000000000..1b3106bdf7
--- /dev/null
+++ b/packages/app/e2e/support/helpers/new-workspace-navigation.ts
@@ -0,0 +1,202 @@
+import { expect, test, type Page } from "../fixtures";
+import { readFile } from "node:fs/promises";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
+import { gotoAppShell } from "./app";
+import { scrollTimelineToOldestLoadedEdge } from "./timeline-pagination";
+import {
+  archiveLocalWorkspaceFromDaemon,
+  archiveWorkspaceFromDaemon,
+  connectNewWorkspaceDaemonClient,
+  countWorkspaceAgents,
+  countWorkspaceTerminals,
+  delayBrowserWorkspaceCreatedResponse,
+  expectNewWorkspaceDraft,
+  fillNewWorkspaceDraft,
+  openNewWorkspaceComposer,
+  openProjectViaDaemon,
+  selectWorkspaceIsolation,
+  submitNewWorkspaceEmpty,
+  submitNewWorkspacePrompt,
+  waitForCreatedWorkspace,
+} from "./new-workspace";
+import { createTempGitRepo } from "./workspace";
+import { expectAppRoute } from "./route-assertions";
+import { getServerId } from "./server-id";
+import {
+  expectTerminalOutputContains,
+  expectWorkspaceOpensWithTerminalTab,
+  fillTerminalPrompt,
+  seedTerminalProfiles,
+  selectLaunchOption,
+  submitTerminalLaunch,
+  type TerminalProfile,
+} from "./new-workspace-launch";
+import { switchWorkspaceViaSidebar, waitForSidebarHydration } from "./workspace-ui";
+import { dropFileOnComposer, expectAttachmentPill } from "./composer";
+
+const PROMPT = "Hello from the navigation guard";
+const NEXT_PROMPT = "Keep this newer draft";
+const CONTEXT = {
+  name: "context.json",
+  mimeType: "application/json",
+  buffer: Buffer.from('{"preserve":"attachment"}'),
+};
+const PROFILE: TerminalProfile = {
+  id: "e2e-nav-guard-echo",
+  name: "Nav Guard Echo",
+  command: "/bin/sh",
+  args: ["-c", 'echo captured: "$0"; sleep 120', "{{{prompt}}}"],
+};
+
+export async function verifyDelayedWorkspaceCreation(
+  page: Page,
+  launch: "chat" | "terminal" | "empty",
+  destination: "leave" | "stay" | "new-draft",
+  isolation: "local" | "worktree" = "local",
+): Promise<void> {
+  const client = await connectNewWorkspaceDaemonClient();
+  const repo = await createTempGitRepo("workspace-focus-");
+  const profileSeed = await seedTerminalProfiles([PROFILE]);
+  const delay = await delayBrowserWorkspaceCreatedResponse(page);
+  const serverId = getServerId();
+  let localWorkspaceId: string | undefined;
+  let createdDirectory: string | undefined;
+  let newDraftRoute = "";
+
+  try {
+    const project = await openProjectViaDaemon(client, repo.path);
+    localWorkspaceId = project.workspaceId;
+    const knownIds = new Set((await client.fetchWorkspaces()).entries.map((entry) => entry.id));
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await switchWorkspaceViaSidebar({ page, serverId, workspaceId: project.workspaceId });
+
+    await test.step("Submit workspace creation with the requested content", async () => {
+      await openNewWorkspaceComposer(page, project);
+      await selectWorkspaceIsolation(page, isolation);
+      if (launch === "chat") {
+        await dropFileOnComposer(page, CONTEXT);
+        await expectAttachmentPill(page, "composer-file-attachment-pill");
+        await submitNewWorkspacePrompt(page, PROMPT);
+      } else if (launch === "terminal") {
+        await selectLaunchOption(page, PROFILE.id);
+        await fillTerminalPrompt(page, PROMPT);
+        await submitTerminalLaunch(page);
+      } else {
+        await submitNewWorkspaceEmpty(page);
+      }
+      await delay.waitForCreateRequest();
+    });
+
+    await test.step("Choose where to work while the creation response is held", async () => {
+      if (destination !== "stay") {
+        await switchWorkspaceViaSidebar({ page, serverId, workspaceId: project.workspaceId });
+      }
+      if (destination === "new-draft") {
+        await openNewWorkspaceComposer(page, project);
+        await fillNewWorkspaceDraft(page, NEXT_PROMPT);
+        const url = new URL(page.url());
+        newDraftRoute = url.pathname + url.search;
+      }
+      // Recording pacing only; the response is held deterministically above.
+      if (process.env.E2E_RECORD_VIDEO === "1") {
+        await page.mouse.move(1100, 80);
+        await page.waitForTimeout(1500);
+      }
+      delay.release();
+    });
+
+    const created = await waitForCreatedWorkspace(client, knownIds);
+    createdDirectory = created.workspaceDirectory;
+    expect(created.workspaceKind).toBe(isolation === "worktree" ? "worktree" : "local_checkout");
+    await test.step("Completion creates exactly the requested resource and preserves focus", async () => {
+      await expect
+        .poll(() => countWorkspaceAgents(client, created.id))
+        .toBe(launch === "chat" ? 1 : 0);
+      await expect
+        .poll(() => countWorkspaceTerminals(client, created.id))
+        .toBe(launch === "terminal" ? 1 : 0);
+      // A negative navigation assertion needs an observation window after completion.
+      await page.waitForTimeout(5000);
+      const expectedRoute =
+        destination === "new-draft"
+          ? newDraftRoute
+          : buildHostWorkspaceRoute(
+              serverId,
+              destination === "stay" ? created.id : project.workspaceId,
+            );
+      await expectAppRoute(page, expectedRoute);
+      if (destination === "new-draft") await expectNewWorkspaceDraft(page, NEXT_PROMPT);
+      if (launch === "chat") {
+        expect(delay.agentRequests).toHaveLength(1);
+        const upload = delay.agentRequests[0]?.attachments?.find(
+          (item) => item.type === "uploaded_file",
+        );
+        if (!upload) throw new Error("The create request did not contain the submitted file");
+        expect(await readFile(upload.path)).toEqual(CONTEXT.buffer);
+        const agents = await client.fetchAgents();
+        expect(
+          agents.entries.find((entry) => entry.agent.workspaceId === created.id)?.agent,
+        ).toMatchObject({
+          cwd: created.workspaceDirectory,
+        });
+        expect(delay.agentRequests[0]).toMatchObject({
+          initialPrompt: PROMPT,
+          config: {
+            provider: "mock",
+            model: "ten-second-stream",
+            modeId: "load-test",
+            thinkingOptionId: "low",
+            cwd: repo.path,
+          },
+          attachments: [
+            expect.objectContaining({
+              fileName: CONTEXT.name,
+              mimeType: CONTEXT.mimeType,
+              size: CONTEXT.buffer.length,
+            }),
+          ],
+        });
+      }
+    });
+
+    await test.step("Visit the new workspace and return without submitting a second draft", async () => {
+      await switchWorkspaceViaSidebar({ page, serverId, workspaceId: created.id });
+      if (launch === "chat") {
+        await scrollTimelineToOldestLoadedEdge(page);
+        await expect(page.getByText(PROMPT, { exact: true }).first()).toBeVisible();
+      } else if (launch === "terminal") {
+        await expectWorkspaceOpensWithTerminalTab(page);
+        await expectTerminalOutputContains(page, `captured: ${PROMPT}`);
+      }
+      await switchWorkspaceViaSidebar({ page, serverId, workspaceId: project.workspaceId });
+      await switchWorkspaceViaSidebar({ page, serverId, workspaceId: created.id });
+      await expect
+        .poll(() => countWorkspaceAgents(client, created.id))
+        .toBe(launch === "chat" ? 1 : 0);
+      await expect
+        .poll(() => countWorkspaceTerminals(client, created.id))
+        .toBe(launch === "terminal" ? 1 : 0);
+      if (launch === "chat") {
+        expect(delay.agentRequests).toHaveLength(1);
+        await openNewWorkspaceComposer(page, project);
+        await expectNewWorkspaceDraft(page, destination === "new-draft" ? NEXT_PROMPT : "");
+      }
+      if (process.env.E2E_RECORD_VIDEO === "1") {
+        await page.mouse.move(1100, 80);
+        await page.waitForTimeout(1500);
+      }
+    });
+  } catch (error) {
+    await page.screenshot({ path: test.info().outputPath("before-cleanup.png") });
+    console.error(error);
+    throw error;
+  } finally {
+    delay.release();
+    if (createdDirectory) await archiveWorkspaceFromDaemon(client, createdDirectory);
+    if (localWorkspaceId) await archiveLocalWorkspaceFromDaemon(client, localWorkspaceId);
+    await profileSeed.restore();
+    await client.close();
+    await repo.cleanup();
+  }
+}
diff --git a/packages/app/e2e/support/helpers/new-workspace.ts b/packages/app/e2e/support/helpers/new-workspace.ts
index 6ac5d89871..63034d52a3 100644
--- a/packages/app/e2e/support/helpers/new-workspace.ts
+++ b/packages/app/e2e/support/helpers/new-workspace.ts
@@ -1,7 +1,8 @@
 import { expect, type BrowserContext, type Page } from "@playwright/test";
+import type { CreateAgentRequestMessage, SessionInboundMessage } from "@getpaseo/protocol/messages";
 import type { DaemonClient as InternalDaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { decodeWorkspaceIdFromPathSegment } from "@/utils/host-routes";
-import { connectDaemonClient } from "./daemon-client-loader";
+import { connectDaemonClient, loadProtocolSchemas } from "./daemon-client-loader";
 import { daemonWsRoutePattern } from "./daemon-port";
 import { projectEquivalenceViewKey } from "./project-view-key";
 import { expectWorkspaceHeader } from "./workspace-ui";
@@ -16,12 +17,17 @@ type NewWorkspaceDaemonClient = Pick<
   | "connect"
   | "createPaseoWorktree"
   | "createWorkspace"
+  | "fetchAgents"
   | "fetchWorkspaces"
   | "getPaseoWorktreeList"
   | "getDaemonConfig"
   | "installDirectoryPlugin"
+  | "installPluginSource"
+  | "disablePlugin"
+  | "enablePlugin"
   | "inspectWorkspaceRecovery"
   | "listProjects"
+  | "listTerminals"
   | "on"
   | "patchDaemonConfig"
   | "removeProject"
@@ -192,7 +198,8 @@ export async function openNewWorkspaceComposer(
 }
 
 export async function openGlobalNewWorkspaceComposer(page: Page): Promise<void> {
-  await page.getByTestId("sidebar-global-new-workspace").click();
+  // The shell keeps a hidden copy of the other layout's sidebar mounted.
+  await page.locator('[data-testid="sidebar-global-new-workspace"]:visible').first().click();
 
   await expect(page).toHaveURL(/\/new(?:\?.*)?$/, {
     timeout: 30_000,
@@ -530,37 +537,35 @@ function parseWebSocketJson(message: WebSocketMessage): unknown {
   }
 }
 
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseWebSocketJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
-    return null;
-  }
-  if (typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
-function getStringField(input: Record<string, unknown>, key: string): string | null {
-  const value = input[key];
-  return typeof value === "string" ? value : null;
+export async function loadSessionMessageReaders() {
+  // Use the same ESM module instance as the dynamically loaded daemon client.
+  const { WSInboundMessageSchema, WSOutboundMessageSchema } = await loadProtocolSchemas();
+  return {
+    client(message: WebSocketMessage) {
+      const parsed = WSInboundMessageSchema.safeParse(parseWebSocketJson(message));
+      return parsed.success && parsed.data.type === "session" ? parsed.data.message : null;
+    },
+    server(message: WebSocketMessage) {
+      const parsed = WSOutboundMessageSchema.safeParse(parseWebSocketJson(message));
+      return parsed.success && parsed.data.type === "session" ? parsed.data.message : null;
+    },
+  };
 }
 
 export interface AgentCreatedDelayControl {
   release(): void;
   waitForCreateRequest(): Promise<void>;
   waitForDelayedCreatedStatus(): Promise<void>;
+  expectSingleWorkspaceIntent(): void;
 }
 
 export async function delayBrowserAgentCreatedStatus(
   page: Page,
 ): Promise<AgentCreatedDelayControl> {
+  const frames = await loadSessionMessageReaders();
   const daemonPortPattern = daemonWsRoutePattern();
   const createRequestIds = new Set<string>();
+  const creationRequests: SessionInboundMessage[] = [];
   const delayedForwards: Array<() => void> = [];
   let releaseRequested = false;
   let resolveCreateRequest: (() => void) | null = null;
@@ -576,26 +581,32 @@ export async function delayBrowserAgentCreatedStatus(
     const server = ws.connectToServer();
 
     ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (sessionMessage?.type === "create_agent_request") {
-        const requestId = getStringField(sessionMessage, "requestId");
-        if (requestId) {
-          createRequestIds.add(requestId);
-          resolveCreateRequest?.();
-        }
+      const sessionMessage = frames.client(message);
+      if (sessionMessage?.type === "send_agent_message_request")
+        creationRequests.push(sessionMessage);
+      if (
+        sessionMessage?.type === "create_agent_request" ||
+        sessionMessage?.type === "agent.create.request" ||
+        sessionMessage?.type === "workspace.create.request"
+      ) {
+        creationRequests.push(sessionMessage);
+        createRequestIds.add(sessionMessage.requestId);
+        resolveCreateRequest?.();
       }
       server.send(message);
     });
 
     server.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      const payload =
-        sessionMessage?.type === "status" && typeof sessionMessage.payload === "object"
-          ? (sessionMessage.payload as Record<string, unknown>)
-          : null;
-      const requestId = payload ? getStringField(payload, "requestId") : null;
-
-      if (payload?.status === "agent_created" && requestId && createRequestIds.has(requestId)) {
+      const sessionMessage = frames.server(message);
+      const isCreated =
+        (sessionMessage?.type === "status" && sessionMessage.payload.status === "agent_created") ||
+        sessionMessage?.type === "agent.create.response" ||
+        sessionMessage?.type === "workspace.create.response";
+      if (
+        isCreated &&
+        typeof sessionMessage.payload.requestId === "string" &&
+        createRequestIds.has(sessionMessage.payload.requestId)
+      ) {
         resolveDelayedCreatedStatus?.();
         if (releaseRequested) {
           ws.send(message);
@@ -616,7 +627,135 @@ export async function delayBrowserAgentCreatedStatus(
         forward();
       }
     },
+
+    expectSingleWorkspaceIntent() {
+      expect(creationRequests).toHaveLength(1);
+      expect(creationRequests[0]).toMatchObject({
+        type: "workspace.create.request",
+        agent: { initialPrompt: expect.any(String) },
+      });
+    },
     waitForCreateRequest: () => createRequestSeen,
     waitForDelayedCreatedStatus: () => delayedCreatedStatusSeen,
   };
 }
+
+type AgentCreationIntent = Pick<
+  CreateAgentRequestMessage,
+  "config" | "initialPrompt" | "attachments"
+>;
+
+export interface WorkspaceCreatedDelayControl {
+  agentRequests: readonly AgentCreationIntent[];
+  release(): void;
+  waitForCreateRequest(): Promise<void>;
+}
+
+/**
+ * Holds workspace readiness events and responses so a test can act while the daemon is still
+ * running `git worktree add` — most importantly, navigate somewhere else.
+ */
+export async function delayBrowserWorkspaceCreatedResponse(
+  page: Page,
+): Promise<WorkspaceCreatedDelayControl> {
+  const frames = await loadSessionMessageReaders();
+  const daemonPortPattern = daemonWsRoutePattern();
+  const agentRequests: AgentCreationIntent[] = [];
+  const creationKeys = new Set<string>();
+  const createRequestIds = new Set<string>();
+  const delayedForwards: Array<() => void> = [];
+  let releaseRequested = false;
+  let resolveCreateRequest: (() => void) | null = null;
+  const createRequestSeen = new Promise<void>((resolve) => {
+    resolveCreateRequest = resolve;
+  });
+
+  await page.routeWebSocket(daemonPortPattern, (ws) => {
+    const server = ws.connectToServer();
+
+    ws.onMessage((message) => {
+      const sessionMessage = frames.client(message);
+      if (sessionMessage?.type === "create_agent_request") agentRequests.push(sessionMessage);
+      if (sessionMessage?.type === "workspace.create.request") {
+        createRequestIds.add(sessionMessage.requestId);
+        if (sessionMessage.idempotencyKey) creationKeys.add(sessionMessage.idempotencyKey);
+        if (sessionMessage.agent) agentRequests.push(sessionMessage.agent);
+        resolveCreateRequest?.();
+      }
+      server.send(message);
+    });
+
+    server.onMessage((message) => {
+      const sessionMessage = frames.server(message);
+      const isCreation =
+        (sessionMessage?.type === "workspace.create.response" &&
+          createRequestIds.has(sessionMessage.payload.requestId)) ||
+        (sessionMessage?.type === "workspace.create.update" &&
+          creationKeys.has(sessionMessage.payload.idempotencyKey));
+      if (isCreation && !releaseRequested) {
+        delayedForwards.push(() => ws.send(message));
+        return;
+      }
+
+      ws.send(message);
+    });
+  });
+
+  return {
+    agentRequests,
+    release() {
+      releaseRequested = true;
+      for (const forward of delayedForwards.splice(0)) {
+        forward();
+      }
+    },
+    waitForCreateRequest: () => createRequestSeen,
+  };
+}
+
+type WorkspaceEntry = Awaited<
+  ReturnType<NewWorkspaceDaemonClient["fetchWorkspaces"]>
+>["entries"][number];
+
+/**
+ * Waits for a workspace the caller did not already know about, and returns it. Tests that create a
+ * workspace without navigating to it have no route to assert on, so the daemon's own list is the
+ * signal that creation finished.
+ */
+export async function waitForCreatedWorkspace(
+  client: NewWorkspaceDaemonClient,
+  knownWorkspaceIds: ReadonlySet<string>,
+  options?: { timeout?: number },
+): Promise<WorkspaceEntry> {
+  let created: WorkspaceEntry | undefined;
+  await expect
+    .poll(
+      async () => {
+        const payload = await client.fetchWorkspaces();
+        created = payload.entries.find((entry) => !knownWorkspaceIds.has(entry.id));
+        return created !== undefined;
+      },
+      { timeout: options?.timeout ?? 60_000 },
+    )
+    .toBe(true);
+  if (!created) {
+    throw new Error("Workspace list reported a new workspace but it could not be read back");
+  }
+  return created;
+}
+
+export async function countWorkspaceAgents(
+  client: NewWorkspaceDaemonClient,
+  workspaceId: string,
+): Promise<number> {
+  const payload = await client.fetchAgents({ filter: { includeArchived: true } });
+  return payload.entries.filter((entry) => entry.agent.workspaceId === workspaceId).length;
+}
+
+export async function countWorkspaceTerminals(
+  client: NewWorkspaceDaemonClient,
+  workspaceId: string,
+): Promise<number> {
+  const payload = await client.listTerminals(undefined, undefined, { workspaceId });
+  return payload.terminals.length;
+}
diff --git a/packages/app/e2e/support/helpers/packaged-web-daemon.ts b/packages/app/e2e/support/helpers/packaged-web-daemon.ts
index 33182df0d0..cd622ff27a 100644
--- a/packages/app/e2e/support/helpers/packaged-web-daemon.ts
+++ b/packages/app/e2e/support/helpers/packaged-web-daemon.ts
@@ -1,5 +1,5 @@
 import { execFile } from "node:child_process";
-import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import net from "node:net";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -59,23 +59,37 @@ export async function startPackagedWebDaemon(input: {
   const serverId = `relay-deployment-${Date.now().toString(36)}`;
   const paseo = path.resolve(__dirname, "../../../../../node_modules/.bin/paseo");
   const env: NodeJS.ProcessEnv = {
-    ...process.env,
+    ...Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_"))),
+    HOME: home,
+    USERPROFILE: home,
     CI: "true",
     NODE_ENV: "development",
     PASEO_NODE_ENV: "development",
     PASEO_SERVER_ID: serverId,
-    PASEO_RELAY_ENDPOINT: input.relayEndpoint,
-    PASEO_RELAY_PUBLIC_ENDPOINT: input.relayEndpoint,
-    PASEO_RELAY_USE_TLS: "false",
-    PASEO_RELAY_PUBLIC_USE_TLS: "false",
   };
 
   try {
-    await execFileAsync(
-      paseo,
-      ["daemon", "start", "--home", home, "--port", String(port), "--relay", "--web-ui"],
-      { env },
+    await writeFile(
+      path.join(home, "config.json"),
+      JSON.stringify({
+        daemon: {
+          listen: `127.0.0.1:${port}`,
+          relay: {
+            enabled: true,
+            endpoint: input.relayEndpoint,
+            publicEndpoint: input.relayEndpoint,
+            useTls: false,
+            publicUseTls: false,
+          },
+        },
+        features: {
+          webUi: { enabled: true },
+          dictation: { enabled: false },
+          voiceMode: { enabled: false },
+        },
+      }),
     );
+    await execFileAsync(paseo, ["daemon", "start", "--home", home], { env });
     const origin = `http://127.0.0.1:${port}`;
     await waitForWebUi(origin, home);
 
diff --git a/packages/app/e2e/support/helpers/plugin-button-example.ts b/packages/app/e2e/support/helpers/plugin-button-example.ts
new file mode 100644
index 0000000000..ebe868ee2c
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-button-example.ts
@@ -0,0 +1,203 @@
+import type { Locator, TestInfo } from "@playwright/test";
+import { test, expect, type Page } from "@playwright/test";
+import { copyPluginExample } from "./plugin-fixture";
+import { gotoAppShell } from "./app";
+import { buildAgentRoute } from "./mock-agent";
+import { openCommandCenter } from "./command-center";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { seedWorkspace } from "./seed-client";
+import { waitForSettledPosition } from "./sheet-layout";
+
+const WIDE = { width: 1440, height: 900 };
+const COMPACT = { width: 390, height: 844 };
+
+function headerButtons(page: Page) {
+  return page.getByRole("toolbar", { name: "Workspace actions", exact: true }).getByRole("button");
+}
+
+async function exampleCommand(page: Page, name: string) {
+  await page.setViewportSize(WIDE);
+  const panel = await openCommandCenter(page);
+  const title = `Button examples: ${name}`;
+  await panel.getByTestId("command-center-input").fill(title);
+  await panel.getByRole("button", { name: title, exact: true }).click();
+  await expect(panel).not.toBeVisible();
+}
+
+async function capture(
+  page: Page,
+  info: TestInfo,
+  name: string,
+  subject: Locator = headerButtons(page),
+) {
+  await expect(subject).toBeInViewport();
+  await waitForSettledPosition(subject);
+  const file = info.outputPath(`${name}.png`);
+  await page.screenshot({ path: file, animations: "disabled" });
+  await info.attach(name, { path: file, contentType: "image/png" });
+}
+
+async function closeDetails(page: Page) {
+  await page.getByRole("button", { name: "Close workspace details", exact: true }).click();
+  await expect(
+    page.getByRole("button", { name: "Close workspace details", exact: true }),
+  ).toHaveCount(0);
+}
+
+export async function withButtonAuthorExample(
+  page: Page,
+  info: TestInfo,
+  run: (buttons: {
+    refreshFromHeaderAndComposer(): Promise<void>;
+    useMenusAndToggleButtons(): Promise<void>;
+    inspectLiveWorkspaceDetails(): Promise<void>;
+  }) => Promise<void>,
+) {
+  const workspace = await seedWorkspace({
+    repoPrefix: "button-example-",
+    title: "Button examples",
+  });
+  const agent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Example agent",
+    model: "ten-second-stream",
+    modeId: "load-test",
+  });
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const config = await client.getDaemonConfig();
+  const example = await copyPluginExample("buttons");
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(example.directory);
+    await page.setViewportSize(WIDE);
+    await gotoAppShell(page);
+    await page.goto(buildAgentRoute(workspace.workspaceId, agent.id));
+
+    await run({
+      refreshFromHeaderAndComposer: () =>
+        test.step("icon-only header action and labeled composer action update in place", async () => {
+          await exampleCommand(page, "action");
+          await expect(headerButtons(page)).toHaveCount(1);
+          await headerButtons(page).click();
+          await expect(headerButtons(page)).toHaveAccessibleName("Refresh workspace (1)");
+          await page.getByRole("button", { name: "Refresh context", exact: true }).click();
+          await expect(
+            page.getByRole("button", { name: "Refresh context", exact: true }),
+          ).toContainText("Refreshed · 2");
+          await capture(page, info, "01-actions");
+          await page.setViewportSize(COMPACT);
+          await expect(headerButtons(page)).toHaveCount(0);
+          await capture(
+            page,
+            info,
+            "02-compact-actions",
+            page.getByRole("button", { name: "Refresh context", exact: true }),
+          );
+        }),
+      useMenusAndToggleButtons: () =>
+        test.step("named menus include separators, nested actions, disabled items, and custom content", async () => {
+          await exampleCommand(page, "menu");
+          await headerButtons(page).click();
+          await expect(
+            page.getByRole("menuitem", { name: "Publish (unavailable in example)", exact: true }),
+          ).toBeDisabled();
+          await capture(
+            page,
+            info,
+            "03-header-menu",
+            page.getByRole("menuitem", { name: "Refresh workspace", exact: true }),
+          );
+          await page.getByRole("menuitem", { name: "Workspace details", exact: true }).click();
+          await expect(page.getByText("Button examples", { exact: true }).last()).toBeVisible();
+          await closeDetails(page);
+          await page.getByRole("button", { name: "Composer tools", exact: true }).click();
+          await capture(
+            page,
+            info,
+            "04-composer-menu",
+            page.getByRole("menuitem", { name: "Refresh workspace", exact: true }),
+          );
+          await page.getByRole("menuitem", { name: "Display", exact: true }).click();
+          await page.getByRole("menuitem", { name: "Hide example buttons", exact: true }).click();
+          await expect(headerButtons(page)).toHaveCount(0);
+          await expect(
+            page.getByRole("button", { name: "Composer tools", exact: true }),
+          ).toHaveCount(0);
+          await exampleCommand(page, "show");
+          await exampleCommand(page, "disable");
+          await expect(headerButtons(page)).toBeDisabled();
+          await expect(
+            page.getByRole("button", { name: "Composer tools", exact: true }),
+          ).toBeDisabled();
+          await capture(page, info, "05-disabled");
+          await exampleCommand(page, "enable");
+          await page.setViewportSize(COMPACT);
+          await expect(headerButtons(page)).toHaveCount(0);
+          await page.getByRole("button", { name: "Composer tools", exact: true }).click();
+          await expect(
+            page.getByRole("menuitem", { name: "Refresh workspace", exact: true }),
+          ).toBeInViewport();
+          await capture(
+            page,
+            info,
+            "06-compact-menu",
+            page.getByRole("menuitem", { name: "Refresh workspace", exact: true }),
+          );
+          await page.getByRole("menuitem", { name: "Refresh workspace", exact: true }).click();
+        }),
+      inspectLiveWorkspaceDetails: () =>
+        test.step("custom icons and content react to workspace changes and adapt to sheets", async () => {
+          await exampleCommand(page, "popover");
+          await expect(headerButtons(page)).toHaveCount(1);
+          await headerButtons(page).click();
+          await expect(
+            page.getByRole("button", { name: "Close workspace details", exact: true }),
+          ).toBeVisible();
+          await capture(
+            page,
+            info,
+            "07-header-popover",
+            page.getByRole("button", { name: "Close workspace details", exact: true }),
+          );
+          await client.setWorkspaceTitle(workspace.workspaceId, "Renamed from the daemon");
+          await expect(
+            page.getByText("Renamed from the daemon", { exact: true }).last(),
+          ).toBeVisible();
+          await closeDetails(page);
+          await page.getByRole("button", { name: "Context details", exact: true }).click();
+          await capture(
+            page,
+            info,
+            "08-composer-popover",
+            page.getByRole("button", { name: "Close workspace details", exact: true }),
+          );
+          await closeDetails(page);
+          await page.setViewportSize(COMPACT);
+          await page.getByRole("button", { name: "Context details", exact: true }).click();
+          await expect(
+            page.getByRole("button", { name: "Close workspace details", exact: true }),
+          ).toBeInViewport();
+          await capture(
+            page,
+            info,
+            "09-compact-popover",
+            page.getByRole("button", { name: "Close workspace details", exact: true }),
+          );
+          await closeDetails(page);
+          await client.disablePlugin("button-examples");
+          await expect(headerButtons(page)).toHaveCount(0);
+          await expect(
+            page.getByRole("button", { name: "Context details", exact: true }),
+          ).toHaveCount(0);
+        }),
+    });
+  } finally {
+    await client.removePlugin("button-examples");
+    await client.patchDaemonConfig({ pluginsEnabled: config.config.pluginsEnabled });
+    await client.close();
+    await example.cleanup();
+    await workspace.cleanup();
+  }
+}
diff --git a/packages/app/e2e/support/helpers/plugin-buttons.ts b/packages/app/e2e/support/helpers/plugin-buttons.ts
new file mode 100644
index 0000000000..f3279ce7ef
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-buttons.ts
@@ -0,0 +1,467 @@
+import { mkdtemp, mkdir, writeFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { Locator } from "@playwright/test";
+import { test, expect, type Page } from "@playwright/test";
+import { gotoAppShell } from "./app";
+import { buildAgentRoute } from "./mock-agent";
+import { openCommandCenter } from "./command-center";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { seedWorkspace } from "./seed-client";
+import { pluginRequirements } from "./plugin-fixture";
+
+const PLUGIN_ID = "button-showcase";
+const WIDE = { width: 1440, height: 900 };
+const COMPACT = { width: 390, height: 844 };
+
+function clientSource(workspaceId: string, agentId: string): string {
+  return `import React from "react";
+import { Text, View, Pressable } from "react-native";
+import { useWorkspace, useRpc, usePaseo } from "@getpaseo/plugin/client";
+import { useQuery } from "@tanstack/react-query";
+import { summary } from "./shared/rpc";
+
+function StatusIcon({ size, theme }) {
+  return <View style={{ width: size, height: size, borderRadius: size / 2, backgroundColor: theme.colors.statusSuccess }} />;
+}
+
+function Details({ workspaceId, theme, layout, close }) {
+  const workspace = useWorkspace(workspaceId, (workspace) => workspace.name);
+  const paseo = usePaseo();
+  const [ownerId, setOwnerId] = React.useState("");
+  const [updates, setUpdates] = React.useState(0);
+  const [failed, setFailed] = React.useState(false);
+  React.useEffect(() => {
+    const owner = paseo.observeEvents(["project.update"]);
+    owner.subscribe({ snapshot(value) { setOwnerId(value.subscriptionId); }, update() { setUpdates((n) => n + 1); } });
+    return () => { void owner.release(); };
+  }, [paseo]);
+  const rpc = useRpc(summary);
+  const query = useQuery({ queryKey: ["summary"], queryFn: () => rpc({}) });
+  if (failed) throw new Error("Button content failed");
+  return <View style={{ gap: 12 }}>
+    <Text accessibilityLabel="Content observation" style={{ color: theme.colors.foreground }}>{ownerId}</Text>
+    <Text style={{ color: theme.colors.foreground }}>Observed updates: {updates}</Text>
+    <Pressable accessibilityRole="button" accessibilityLabel="Fail button content" onPress={() => setFailed(true)}><Text style={{ color: theme.colors.foreground }}>Fail content</Text></Pressable>
+    <Text style={{ color: theme.colors.foreground, fontSize: 18 }}>Deployment status</Text>
+    <Text style={{ color: theme.colors.foregroundMuted }}>{workspace}</Text>
+    <Text style={{ color: theme.colors.statusSuccess }}>{query.data?.message ?? "Loading deployment..."}</Text>
+    <Text style={{ color: theme.colors.foregroundMuted }}>3 checks passed · Production</Text>
+    <Text style={{ color: theme.colors.foregroundMuted }}>Presentation: {layout.compact ? "compact" : "wide"}</Text>
+    <Pressable accessibilityRole="button" accessibilityLabel="Close deployment details" onPress={close} style={{ padding: 8, borderRadius: 6, backgroundColor: theme.colors.surface2 }}><Text style={{ color: theme.colors.foreground }}>Done</Text></Pressable>
+  </View>;
+}
+
+export default function contribute(client) {
+  const workspaceId = ${JSON.stringify(workspaceId)};
+  const agentId = ${JSON.stringify(agentId)};
+  const registrations = [];
+  let finish = () => {};
+  let finishReview = () => {};
+  let attempts = 0;
+  const action = { kind: "action", async onPress() {
+    if (++attempts === 1) throw new Error("Deployment failed. Try again.");
+    await new Promise((resolve) => { finish = resolve; });
+    deploy.update({ label: "Deployed" });
+  } };
+  const header = (id, button) => { const registration = client.addHeaderButton({ id, workspaceId, button }); registrations.push(registration); return registration; };
+  const pill = (id, button) => { const registration = client.addComposerPill({ id, workspaceId, agentId, button }); registrations.push(registration); return registration; };
+  const menu = { kind: "menu", items: [
+    { kind: "item", id: "run", title: "Run checks", icon: "Play", behavior: { kind: "action", onPress() { checks.update({ label: "Checks passed" }); } } },
+    { kind: "separator", id: "divider" },
+    { kind: "item", id: "environment", title: "Environment", behavior: { kind: "menu", items: [
+      { kind: "item", id: "staging", title: "Staging", icon: "FlaskConical", behavior: { kind: "action", onPress() {} } },
+      { kind: "item", id: "production", title: "Production", icon: "Globe", disabled: true, behavior: { kind: "action", onPress() {} } },
+    ] } },
+    { kind: "item", id: "details", title: "Deployment details", icon: "Activity", behavior: { kind: "popover", Content: Details } },
+  ] };
+  const deploy = header("deploy", { title: "Deploy application", icon: "Rocket", label: "Deploy", behavior: action });
+  const checks = header("checks", { title: "Header checks", icon: "ListChecks", label: "Checks", behavior: menu });
+  header("status", { title: "Header status", icon: StatusIcon, label: "Healthy", behavior: { kind: "popover", Content: Details } });
+  header("logs", { title: "Open deployment logs", icon: "ScrollText", behavior: { kind: "popover", Content: Details } });
+  header("locked", { title: "Production locked", icon: "Lock", disabled: true, behavior: { kind: "action", onPress() {} } });
+  const review = pill("review", { title: "Run review", icon: "Scan", label: "Review", behavior: { kind: "action", async onPress() { await new Promise((resolve) => { finishReview = resolve; }); review.update({ label: "Reviewed" }); } } });
+  const pillMenu = pill("checks", { title: "Composer checks", icon: "ListChecks", label: "Checks", behavior: menu });
+  pill("usage", { title: "Composer status", icon: StatusIcon, label: "Status", behavior: { kind: "popover", Content: Details } });
+  const command = (id, title, onSelect) => client.addCommandCenterItem({ id, title, icon: "Settings", context: "workspace", onSelect });
+  command("finish", "Finish deployment", () => finish());
+  command("finish-review", "Finish review", () => finishReview());
+  command("hide-deploy", "Hide deployment button", () => deploy.update({ visible: false }));
+  command("show-deploy", "Show deployment button", () => deploy.update({ visible: true }));
+  command("hide", "Hide review button", () => review.update({ visible: false }));
+  command("show", "Show review button", () => review.update({ visible: true, label: "Review ready" }));
+  command("disable", "Disable example buttons", () => { deploy.update({ disabled: true }); review.update({ disabled: true }); });
+  command("enable", "Enable example buttons", () => { deploy.update({ disabled: false }); review.update({ disabled: false }); });
+  command("icon-only", "Use icon-only header", () => deploy.update({ label: undefined }));
+  command("hide-menu", "Hide composer menu", () => pillMenu.update({ visible: false }));
+  command("show-menu", "Show composer menu", () => pillMenu.update({ visible: true }));
+  const lifetime = new AbortController();
+  const applyWorkspace = (workspace) => {
+    if (workspace.id !== workspaceId) return;
+    deploy.update({ visible: workspace.name !== "Compact checks" });
+    pillMenu.update({ visible: workspace.name !== "Hide composer menu" });
+  };
+  void client.paseo.workspaces.list({ subscribe: {}, signal: lifetime.signal }).then(({ subscription }) => {
+    subscription.subscribe({
+      snapshot({ entries }) { for (const workspace of entries) applyWorkspace(workspace); },
+      update(message) { if (message.type === "workspace_update" && message.payload.kind === "upsert") applyWorkspace(message.payload.workspace); },
+    });
+  }).catch((error) => { if (!lifetime.signal.aborted) console.error(error); });
+  return () => { lifetime.abort(); finish(); finishReview(); for (const registration of registrations) registration.remove(); };
+}`;
+}
+
+async function installShowcase(workspaceId: string, agentId: string) {
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const config = await client.getDaemonConfig();
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-buttons-"));
+  await mkdir(path.join(directory, "shared"));
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+  );
+  await writeFile(path.join(directory, "index.client.tsx"), clientSource(workspaceId, agentId));
+  await writeFile(
+    path.join(directory, "shared/rpc.ts"),
+    `import { defineRpc } from "@getpaseo/plugin"; import { z } from "zod"; export const summary = defineRpc({ name: "summary", input: z.object({}), output: z.object({ message: z.string() }) });`,
+  );
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    `import { summary } from "./shared/rpc"; export default function contribute(server) { server.handle(summary, async () => ({ message: "All systems operational" })); return () => {}; }`,
+  );
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await client.installDirectoryPlugin(directory);
+  return {
+    disable: () => client.disablePlugin(PLUGIN_ID),
+    setTitle: (title: string) => client.setWorkspaceTitle(workspaceId, title),
+    async cleanup() {
+      await client.removePlugin(PLUGIN_ID);
+      await client.patchDaemonConfig({ pluginsEnabled: config.config.pluginsEnabled });
+      await client.close();
+      await rm(directory, { recursive: true, force: true });
+    },
+  };
+}
+
+async function press(page: Page, title: string) {
+  await page.getByRole("button", { name: title, exact: true }).click();
+}
+
+async function openHeaderOverflow(page: Page) {
+  await page
+    .getByRole("toolbar", { name: "Workspace actions", exact: true })
+    .getByRole("button", { name: "More actions", exact: true })
+    .click();
+}
+
+async function choose(page: Page, title: string) {
+  await page.getByRole("menuitem", { name: title, exact: true }).click();
+}
+
+async function command(page: Page, title: string) {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill(title);
+  await panel.getByRole("button", { name: title, exact: true }).click();
+  await expect(panel).not.toBeVisible();
+}
+
+async function expectSurfaceVisible(
+  page: Page,
+  subject: Locator = page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
+) {
+  await expect(subject).toBeInViewport();
+}
+
+async function expectDetails(page: Page) {
+  await expect(page.getByText("All systems operational", { exact: true })).toBeInViewport();
+}
+
+async function expectHeaderTextTruncated(page: Page) {
+  const title = page.getByTestId("workspace-header-title");
+  const subtitle = page.getByTestId("workspace-header-subtitle");
+  await expect(title).toHaveCSS("text-overflow", "ellipsis");
+  await expect(subtitle).toHaveCSS("text-overflow", "ellipsis");
+  // The text itself must overflow its box, rather than being clipped by an ancestor.
+  await expect
+    .poll(() => title.evaluate((element) => element.scrollWidth > element.clientWidth))
+    .toBe(true);
+  await expect
+    .poll(() => subtitle.evaluate((element) => element.scrollWidth > element.clientWidth))
+    .toBe(true);
+  const titleBox = await title.boundingBox();
+  const subtitleBox = await subtitle.boundingBox();
+  const actionsBox = await page
+    .getByRole("button", { name: "Workspace actions", exact: true })
+    .boundingBox();
+  expect(titleBox).not.toBeNull();
+  expect(subtitleBox).not.toBeNull();
+  expect(actionsBox).not.toBeNull();
+  expect(titleBox!.x + titleBox!.width).toBeLessThanOrEqual(actionsBox!.x);
+  expect(subtitleBox!.x + subtitleBox!.width).toBeLessThanOrEqual(actionsBox!.x);
+  const hostIcon = page.getByLabel("localhost", { exact: true }).locator("svg");
+  await expect.poll(async () => (await hostIcon.boundingBox())?.width).toBe(12);
+}
+
+export async function withButtonShowcase(
+  page: Page,
+  run: (buttons: {
+    openWideMenusAndPopovers(): Promise<void>;
+    runAndUpdateActions(): Promise<void>;
+    openCompactSheets(): Promise<void>;
+    hideAndUnloadOpenButtons(): Promise<void>;
+    verifyObservationLifetime(): Promise<void>;
+  }) => Promise<void>,
+) {
+  const released = new Set<string>();
+  page.on("websocket", (socket) =>
+    socket.on("framereceived", ({ payload }) => {
+      if (typeof payload !== "string") return;
+      const frame = JSON.parse(payload);
+      if (frame.message?.type === "subscription.release.response")
+        released.add(frame.message.payload.subscriptionId);
+    }),
+  );
+  const workspace = await seedWorkspace({ repoPrefix: "plugin-buttons-" });
+  const agent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Button showcase",
+    model: "ten-second-stream",
+    modeId: "load-test",
+  });
+  const showcase = await installShowcase(workspace.workspaceId, agent.id);
+  try {
+    await page.setViewportSize(WIDE);
+    await gotoAppShell(page);
+    await page.goto(buildAgentRoute(workspace.workspaceId, agent.id));
+    await expect(page.getByRole("button", { name: "Run review", exact: true })).toBeVisible();
+
+    await run({
+      verifyObservationLifetime: () =>
+        test.step("closing and crashing content release its owner while sibling buttons and app remain live", async () => {
+          await press(page, "Header status");
+          await expectDetails(page);
+          const observation = page.getByLabel("Content observation", { exact: true });
+          await expect(observation).not.toHaveText("");
+          const first = (await observation.textContent())!;
+          await press(page, "Close deployment details");
+          await expect.poll(() => released.has(first)).toBe(true);
+          await press(page, "Composer status");
+          await expectDetails(page);
+          const second = (await observation.textContent())!;
+          expect(second).not.toBe(first);
+          await workspace.client.renameProject(workspace.projectId, "Observer control");
+          await expect(page.getByText("Observed updates: 1", { exact: true })).toBeVisible();
+          await press(page, "Fail button content");
+          await expect(
+            page.getByText("Plugin failed: Button content failed", { exact: true }),
+          ).toBeVisible();
+          await expect.poll(() => released.has(second)).toBe(true);
+          await page.keyboard.press("Escape");
+          await press(page, "Header status");
+          await expectDetails(page);
+          const recovered = (await observation.textContent())!;
+          expect([first, second]).not.toContain(recovered);
+          await showcase.setTitle("Healthy app after button failure");
+          await expect(page.getByTestId("workspace-header-title")).toHaveText(
+            "Healthy app after button failure",
+          );
+          await press(page, "Close deployment details");
+          await expect.poll(() => released.has(recovered)).toBe(true);
+          await showcase.setTitle("Button showcase");
+        }),
+      openWideMenusAndPopovers: () =>
+        test.step("wide buttons have placement-owned labels and chevrons", async () => {
+          await expect(
+            page
+              .getByRole("button", { name: "Header checks", exact: true })
+              .getByTestId("plugin-button-chevron"),
+          ).toHaveCount(1);
+          await expect(
+            page
+              .getByRole("button", { name: "Composer checks", exact: true })
+              .getByTestId("plugin-button-chevron"),
+          ).toHaveCount(0);
+          await expectSurfaceVisible(page);
+          await press(page, "Header checks");
+          await expect(
+            page.getByRole("menuitem", { name: "Run checks", exact: true }),
+          ).toBeVisible();
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("menuitem", { name: "Run checks", exact: true }),
+          );
+          await choose(page, "Environment");
+          await expect(page.getByRole("menuitem", { name: "Staging", exact: true })).toBeVisible();
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("menuitem", { name: "Staging", exact: true }),
+          );
+          await choose(page, "Staging");
+          await openHeaderOverflow(page);
+          await expect(
+            page.getByRole("menuitem", { name: "Production locked", exact: true }),
+          ).toBeDisabled();
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("menuitem", { name: "Production locked", exact: true }),
+          );
+          await choose(page, "Open deployment logs");
+          await expectDetails(page);
+          await press(page, "Close deployment details");
+          await press(page, "Header status");
+          await expectDetails(page);
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("button", { name: "Close deployment details", exact: true }),
+          );
+          await press(page, "Close deployment details");
+          await press(page, "Composer checks");
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("menuitem", { name: "Run checks", exact: true }),
+          );
+          await choose(page, "Deployment details");
+          await expectDetails(page);
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("button", { name: "Close deployment details", exact: true }),
+          );
+          await press(page, "Close deployment details");
+          await press(page, "Composer status");
+          await expectDetails(page);
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("button", { name: "Close deployment details", exact: true }),
+          );
+          await press(page, "Close deployment details");
+        }),
+      runAndUpdateActions: () =>
+        test.step("actions fail visibly, retry, and remain busy until completion", async () => {
+          await press(page, "Deploy application");
+          await expect(
+            page.getByText("Deployment failed. Try again.", { exact: true }),
+          ).toBeVisible();
+          await expectSurfaceVisible(
+            page,
+            page.getByText("Deployment failed. Try again.", { exact: true }),
+          );
+          await press(page, "Deploy application");
+          await expect(
+            page.getByRole("button", { name: "Deploy application", exact: true }),
+          ).toBeDisabled();
+          await expectSurfaceVisible(page);
+          await command(page, "Finish deployment");
+          await expect(
+            page.getByRole("button", { name: "Deploy application", exact: true }),
+          ).toContainText("Deployed");
+          await press(page, "Run review");
+          await expect(
+            page.getByRole("button", { name: "Run review", exact: true }),
+          ).toBeDisabled();
+          await expectSurfaceVisible(page);
+          await command(page, "Finish review");
+          await expect(page.getByRole("button", { name: "Run review", exact: true })).toContainText(
+            "Reviewed",
+          );
+          await command(page, "Disable example buttons");
+          await expect(
+            page.getByRole("button", { name: "Run review", exact: true }),
+          ).toBeDisabled();
+          await expectSurfaceVisible(page);
+          await command(page, "Enable example buttons");
+          await command(page, "Use icon-only header");
+          await expectSurfaceVisible(page);
+          await command(page, "Hide review button");
+          await expect(page.getByRole("button", { name: "Run review", exact: true })).toHaveCount(
+            0,
+          );
+          await command(page, "Show review button");
+          await expect(page.getByRole("button", { name: "Run review", exact: true })).toContainText(
+            "Review ready",
+          );
+        }),
+      openCompactSheets: () =>
+        test.step("compact header omits plugin actions while composer triggers open sheets", async () => {
+          await page.setViewportSize(COMPACT);
+          await expect(page.getByTestId("plugin-button-chevron")).toHaveCount(0);
+          await expect(
+            page.getByRole("button", { name: "Composer checks", exact: true }),
+          ).toContainText("Checks");
+          await workspace.client.renameProject(
+            workspace.projectId,
+            "Plugin buttons with a long project name",
+          );
+          await expect(page.getByTestId("workspace-header-subtitle")).toHaveText(
+            "Plugin buttons with a long project name",
+          );
+          await showcase.setTitle("Button showcase with a long workspace title");
+          await expect(page.getByTestId("workspace-header-title")).toHaveText(
+            "Button showcase with a long workspace title",
+          );
+          await expectHeaderTextTruncated(page);
+          await expect(
+            page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
+          ).toHaveCount(0);
+          await expect(
+            page.getByRole("button", { name: "Open menu", exact: true }),
+          ).toBeInViewport();
+          await showcase.setTitle("Button showcase");
+          await press(page, "Composer status");
+          await expectDetails(page);
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("button", { name: "Close deployment details", exact: true }),
+          );
+          await press(page, "Close deployment details");
+          await press(page, "Composer checks");
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("menuitem", { name: "Run checks", exact: true }),
+          );
+          await choose(page, "Run checks");
+        }),
+      hideAndUnloadOpenButtons: () =>
+        test.step("hiding an open button and unloading a plugin remove its surfaces", async () => {
+          await page.setViewportSize(WIDE);
+          await press(page, "Composer checks");
+          await showcase.setTitle("Hide composer menu");
+          await expect(page.getByRole("menuitem", { name: "Run checks", exact: true })).toHaveCount(
+            0,
+          );
+          await expect(
+            page.getByRole("button", { name: "Composer checks", exact: true }),
+          ).toHaveCount(0);
+          await showcase.setTitle("Button showcase");
+          await page.emulateMedia({ colorScheme: "dark" });
+          await expectSurfaceVisible(page);
+          await press(page, "Header status");
+          await expectDetails(page);
+          await expectSurfaceVisible(
+            page,
+            page.getByRole("button", { name: "Close deployment details", exact: true }),
+          );
+          const observation = page.getByLabel("Content observation", { exact: true });
+          await expect(observation).not.toHaveText("");
+          const owner = (await observation.textContent())!;
+          await showcase.disable();
+          await expect.poll(() => released.has(owner)).toBe(true);
+          await expect(
+            page.getByRole("button", { name: "Header status", exact: true }),
+          ).toHaveCount(0);
+          await expect(page.getByRole("button", { name: "Run review", exact: true })).toHaveCount(
+            0,
+          );
+          await expect(page.getByText("All systems operational", { exact: true })).toHaveCount(0);
+          await showcase.setTitle("Healthy app after plugin unload");
+          await expect(page.getByTestId("workspace-header-title")).toHaveText(
+            "Healthy app after plugin unload",
+          );
+        }),
+    });
+  } finally {
+    await showcase.cleanup();
+    await workspace.cleanup();
+  }
+}
diff --git a/packages/app/e2e/support/helpers/plugin-fixture.ts b/packages/app/e2e/support/helpers/plugin-fixture.ts
new file mode 100644
index 0000000000..2b6e548e71
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-fixture.ts
@@ -0,0 +1,29 @@
+import { cp, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { z } from "zod";
+import appPackage from "../../../package.json";
+
+export const pluginRequirements = { paseo: `>=${appPackage.version}` };
+
+export async function copyPluginExample(name: string) {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-example-"));
+  try {
+    await cp(path.resolve(__dirname, "../../../../../plugin-examples", name), directory, {
+      recursive: true,
+    });
+    const manifestPath = path.join(directory, "paseo-plugin.json");
+    const manifest = z
+      .record(z.string(), z.unknown())
+      .parse(JSON.parse(await readFile(manifestPath, "utf8")));
+    // Exercise example UI against the checkout runtime before its release version is bumped.
+    await writeFile(
+      manifestPath,
+      JSON.stringify({ ...manifest, requirements: pluginRequirements }),
+    );
+    return { directory, cleanup: () => rm(directory, { recursive: true, force: true }) };
+  } catch (error) {
+    await rm(directory, { recursive: true, force: true });
+    throw error;
+  }
+}
diff --git a/packages/app/e2e/support/helpers/plugin-hosts.ts b/packages/app/e2e/support/helpers/plugin-hosts.ts
new file mode 100644
index 0000000000..3072b92518
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-hosts.ts
@@ -0,0 +1,154 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, type Page } from "../fixtures";
+import { gotoAppShell } from "./app";
+import { addConnectedHostAndReload } from "./hosts";
+import { startIsolatedHostDaemon } from "./isolated-host-daemon";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { pluginRequirements } from "./plugin-fixture";
+
+const id = "host-clients";
+const source = `import { useHosts, getPaseoClient, usePaseo } from "@getpaseo/plugin/client";
+import { useState } from "react";
+import { View, Text, Pressable } from "react-native";
+export default function contribute(plugin) {
+  function Surface() {
+    const hosts = useHosts();
+    const selected = usePaseo();
+    const [result, setResult] = useState("");
+    const [subscriptionId, setSubscriptionId] = useState("");
+    async function read(serverId) {
+      setResult("Loading");
+      try {
+        const client = serverId ? getPaseoClient(serverId) : selected;
+        const { subscriptionId } = await client.agents.list({ subscribe: {} });
+        setSubscriptionId(subscriptionId);
+        const { config } = await client.config.get();
+        setResult((serverId || "selected") + ":plugins=" + Boolean(config.pluginsEnabled));
+      } catch (error) { setResult(error.message); }
+    }
+    async function disposeHost(serverId) {
+      await getPaseoClient(serverId).dispose();
+      setResult("Disposed:" + serverId);
+    }
+    return <View>
+      {hosts.map(host => <View key={host.serverId}>
+        <Text>{host.label + ":" + host.status}</Text>
+        <Pressable accessibilityRole="button" onPress={() => disposeHost(host.serverId)}><Text>{"Dispose " + host.label}</Text></Pressable>
+        <Pressable accessibilityRole="button" onPress={() => read(host.serverId)}><Text>{"Read " + host.label}</Text></Pressable>
+      </View>)}
+      <Pressable accessibilityRole="button" onPress={() => read()}><Text>Read selected</Text></Pressable>
+      <Pressable accessibilityRole="button" onPress={() => read("missing")}><Text>Read missing</Text></Pressable>
+      <Text>{result}</Text>
+      <Text>{"Agents subscription:" + subscriptionId}</Text>
+    </View>;
+  }
+  plugin.addSurface("main", Surface);
+  plugin.addSidebarItem({ id: "main", title: "Host clients", icon: "Server", surface: "main" });
+  return () => {};
+}`;
+
+function observeSubscriptionReleases(page: Page, port: number) {
+  const released = new Set<string>();
+  page.on("websocket", (socket) => {
+    if (new URL(socket.url()).port !== String(port)) return;
+    socket.on("framesent", ({ payload }) => {
+      const frame = JSON.parse(String(payload));
+      if (frame.type === "session" && frame.message?.type === "subscription.release.request")
+        released.add(frame.message.subscriptionId);
+    });
+  });
+  return { has: (subscriptionId: string) => released.has(subscriptionId) };
+}
+
+export async function openHostClients(page: Page) {
+  await page.getByRole("button", { name: "Host clients", exact: true }).click();
+}
+export async function readHost(page: Page, label: string, result: string) {
+  await page.getByRole("button", { name: `Read ${label}`, exact: true }).click();
+  await expect(page.getByText(result, { exact: true }).filter({ visible: true })).toBeVisible();
+}
+
+export async function installHostClientsScenario(page: Page) {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-hosts-"));
+  const primary = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const secondary = await startIsolatedHostDaemon("plugin-hosts-secondary");
+  const remote = await connectNewWorkspaceDaemonClient({
+    port: secondary.port,
+    ownProjects: false,
+  });
+  const previous = await primary.getDaemonConfig();
+  const releases = observeSubscriptionReleases(page, secondary.port);
+  async function close() {
+    await remote.close().catch(() => undefined);
+    await secondary.close();
+    await primary.removePlugin(id).catch(() => undefined);
+    await primary.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    await primary.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+  try {
+    await remote.patchDaemonConfig({ pluginsEnabled: false });
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), source);
+    await primary.patchDaemonConfig({ pluginsEnabled: true });
+    await primary.installDirectoryPlugin(directory);
+    await gotoAppShell(page);
+    await openHostClients(page);
+    await addConnectedHostAndReload(page, {
+      serverId: secondary.serverId,
+      label: "Secondary",
+      port: secondary.port,
+      primaryLabel: "Primary",
+    });
+    await openHostClients(page);
+  } catch (error) {
+    await close();
+    throw error;
+  }
+  async function expectObservationReleased(action: () => Promise<unknown>) {
+    const text = await page
+      .getByText(/^Agents subscription:/)
+      .filter({ visible: true })
+      .innerText();
+    const subscriptionId = text.slice("Agents subscription:".length);
+    expect(subscriptionId).not.toBe("");
+    expect(releases.has(subscriptionId)).toBe(false);
+    await action();
+    await expect.poll(() => releases.has(subscriptionId)).toBe(true);
+  }
+  return {
+    serverId: secondary.serverId,
+    close,
+    async expectOnline() {
+      await expect(
+        page.getByText("Primary:online", { exact: true }).filter({ visible: true }),
+      ).toBeVisible();
+      await expect(
+        page.getByText("Secondary:online", { exact: true }).filter({ visible: true }),
+      ).toBeVisible({ timeout: 30_000 });
+    },
+    reloadAndExpectObservationReleased: () =>
+      expectObservationReleased(() => primary.reloadPlugin(id)),
+    async disposeSecondaryAndExpectObservationReleased() {
+      await expectObservationReleased(() =>
+        page.getByRole("button", { name: "Dispose Secondary", exact: true }).click(),
+      );
+      await expect(
+        page.getByText(`Disposed:${secondary.serverId}`, { exact: true }).filter({ visible: true }),
+      ).toBeVisible();
+    },
+    restartSecondary: () => secondary.restart(),
+    async disconnectSecondary() {
+      await secondary.close();
+      await expect(
+        page.getByText(/^Secondary:(offline|error|connecting)$/).filter({ visible: true }),
+      ).toBeVisible();
+    },
+    useCompactLayout: () => page.setViewportSize({ width: 390, height: 844 }),
+  };
+}
diff --git a/packages/app/e2e/support/helpers/plugin-provider-icons.ts b/packages/app/e2e/support/helpers/plugin-provider-icons.ts
new file mode 100644
index 0000000000..22a8e46ecc
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-provider-icons.ts
@@ -0,0 +1,175 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import type { Locator, TestInfo } from "@playwright/test";
+import { expect, test as base, type Page } from "../fixtures";
+import { gotoAppShell, openSettings } from "./app";
+import { openModelPicker } from "./agent-profiles";
+import { openAgentRoute } from "./mock-agent";
+import { connectNewWorkspaceDaemonClient, openGlobalNewWorkspaceComposer } from "./new-workspace";
+import { copyPluginExample } from "./plugin-fixture";
+import { seedWorkspace, type SeededWorkspace } from "./seed-client";
+import { getServerId } from "./server-id";
+import { openSettingsHostSection } from "./settings";
+
+const MODEL_LABEL = "Select model (Example 1)";
+const WIDE = { width: 1400, height: 950 };
+const COMPACT = { width: 390, height: 844 };
+
+async function readIconPaths(page: Page, pluginDirectory: string): Promise<string[]> {
+  const svg = await readFile(path.join(pluginDirectory, "icon.svg"), "utf8");
+  return page.evaluate(
+    (source) =>
+      Array.from(
+        new DOMParser().parseFromString(source, "image/svg+xml").querySelectorAll("path"),
+        (element) => element.getAttribute("d") ?? "",
+      ),
+    svg,
+  );
+}
+
+function readIconDrawings(icons: SVGElement[]): string[][] {
+  return icons.map((icon) =>
+    Array.from(icon.querySelectorAll("path"), (element) => element.getAttribute("d") ?? ""),
+  );
+}
+
+async function expectProviderIcon(surface: Locator, paths: string[]): Promise<void> {
+  await expect(surface).toBeVisible();
+  // Provider icons are decorative SVGs without accessible names. Compare the
+  // plugin asset's drawing, allowing surface-specific size and theme colours.
+  await expect
+    .poll(() => surface.locator("svg").evaluateAll(readIconDrawings))
+    .toContainEqual(paths);
+}
+
+async function selectPluginModel(page: Page): Promise<void> {
+  await openModelPicker(page);
+  await page.getByRole("button", { name: "Back", exact: true }).click();
+  await page.getByText("Direct provider example", { exact: true }).click();
+  await page.getByText("Example 1", { exact: true }).click();
+  await expect(page.getByRole("button", { name: MODEL_LABEL, exact: true })).toBeVisible();
+}
+
+async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  const screenshot = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: screenshot });
+  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
+}
+
+interface ProviderIconJourney {
+  page: Page;
+  testInfo: TestInfo;
+  iconPaths: string[];
+  workspace: SeededWorkspace;
+}
+
+export const test = base.extend<{ providerIcons: ProviderIconJourney }>({
+  providerIcons: async ({ page }, provide, testInfo) => {
+    const client = await connectNewWorkspaceDaemonClient();
+    try {
+      const previous = await client.getDaemonConfig();
+      const plugin = await copyPluginExample("provider-direct");
+      try {
+        try {
+          await client.patchDaemonConfig({ pluginsEnabled: true });
+          await client.installDirectoryPlugin(plugin.directory);
+          const workspace = await seedWorkspace({ repoPrefix: "plugin-provider-icons-" });
+          try {
+            await page.setViewportSize(WIDE);
+            await gotoAppShell(page);
+            const iconPaths = await readIconPaths(page, plugin.directory);
+            await provide({ page, testInfo, iconPaths, workspace });
+          } finally {
+            await workspace.cleanup();
+          }
+        } finally {
+          try {
+            await client.removePlugin("provider-direct-example");
+          } finally {
+            await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+          }
+        }
+      } finally {
+        await plugin.cleanup();
+      }
+    } finally {
+      await client.close();
+    }
+  },
+});
+
+export async function verifyProviderSettings({
+  page,
+  iconPaths,
+  testInfo,
+}: ProviderIconJourney): Promise<void> {
+  await test.step("provider settings render the registered icon", async () => {
+    await openSettings(page);
+    await openSettingsHostSection(page, getServerId(), "providers");
+    await expectProviderIcon(
+      page.getByRole("button", { name: "Direct provider example provider details", exact: true }),
+      iconPaths,
+    );
+    await capture(page, testInfo, "provider-settings");
+    await page.getByTestId("settings-back-to-workspace").click();
+  });
+}
+
+export async function verifyNewWorkspaceModelIcon({
+  page,
+  iconPaths,
+  testInfo,
+}: ProviderIconJourney): Promise<void> {
+  await test.step("new workspace keeps the picker icon on its selected model button", async () => {
+    await openGlobalNewWorkspaceComposer(page);
+    await selectPluginModel(page);
+    await openModelPicker(page);
+    await expectProviderIcon(page.getByTestId("model-row-direct-example-example-1"), iconPaths);
+    await capture(page, testInfo, "new-workspace-picker");
+    await page.keyboard.press("Escape");
+    await expectProviderIcon(
+      page.getByRole("button", { name: MODEL_LABEL, exact: true }),
+      iconPaths,
+    );
+    await capture(page, testInfo, "new-workspace-selected-model");
+  });
+}
+
+export async function verifyCompactModelIcon({
+  page,
+  iconPaths,
+  testInfo,
+}: ProviderIconJourney): Promise<void> {
+  await test.step("compact composer preserves the same provider icon", async () => {
+    await page.setViewportSize(COMPACT);
+    await expectProviderIcon(
+      page.getByRole("button", { name: MODEL_LABEL, exact: true }),
+      iconPaths,
+    );
+    await capture(page, testInfo, "compact-selected-model");
+  });
+}
+
+export async function verifyExistingAgentModelIcon({
+  page,
+  iconPaths,
+  testInfo,
+  workspace,
+}: ProviderIconJourney): Promise<void> {
+  await test.step("existing agent composer uses the same icon", async () => {
+    const agent = await workspace.client.createAgent({
+      provider: "direct-example",
+      model: "example-1",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Plugin icon agent",
+    });
+    await page.setViewportSize(WIDE);
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    await expectProviderIcon(
+      page.getByRole("button", { name: MODEL_LABEL, exact: true }),
+      iconPaths,
+    );
+    await capture(page, testInfo, "agent-selected-model");
+  });
+}
diff --git a/packages/app/e2e/support/helpers/plugin-requirements.ts b/packages/app/e2e/support/helpers/plugin-requirements.ts
new file mode 100644
index 0000000000..cf680c11b4
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-requirements.ts
@@ -0,0 +1,119 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { spawnTsx, killProcessTree } from "./spawn-node";
+import { expect, test as base, type Page } from "../fixtures";
+import { connectDaemonClient } from "./daemon-client-loader";
+import { addConnectedHostAndReload } from "./hosts";
+import { gotoAppShell, openSettings } from "./app";
+import { openHostSection, selectSettingsHost } from "./settings";
+import { pluginRequirements } from "./plugin-fixture";
+
+export const test = base.extend<{
+  requirementHost: { serverId: string; port: number; directory: string; client: DaemonClient };
+}>({
+  requirementHost: async ({ e2eWorker }, provide) => {
+    void e2eWorker;
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-requirement-ui-"));
+    await writeRequirements(directory, "^99.0.0");
+    await writeFile(
+      path.join(directory, "index.client.ts"),
+      `export default function(client) {
+      return () => {};
+    }`,
+    );
+    const daemon = spawnTsx(
+      path.resolve(__dirname, "../../../../server/src/server/test-utils/versioned-daemon.ts"),
+      ["99.0.0"],
+      { stdio: ["ignore", "pipe", "pipe", "ipc"] },
+    );
+    const ready = Promise.withResolvers<{ port: number; serverId: string }>();
+    const timeout = setTimeout(
+      () => ready.reject(new Error("Versioned daemon startup timed out")),
+      30_000,
+    );
+    let output = "";
+    daemon.stdout?.on("data", (data) => {
+      output += data;
+    });
+    daemon.stderr?.on("data", (data) => {
+      output += data;
+    });
+    daemon.once("error", ready.reject);
+    daemon.once("exit", () => ready.reject(new Error(`Versioned daemon exited: ${output}`)));
+    daemon.once("message", (message) => {
+      if (
+        typeof message !== "object" ||
+        message === null ||
+        !("port" in message) ||
+        typeof message.port !== "number" ||
+        !("serverId" in message) ||
+        typeof message.serverId !== "string"
+      ) {
+        ready.reject(new Error("Invalid versioned daemon startup message"));
+        return;
+      }
+      ready.resolve({ port: message.port, serverId: message.serverId });
+    });
+    try {
+      const host = await ready.promise;
+      clearTimeout(timeout);
+      const client = await connectDaemonClient<DaemonClient>({
+        port: host.port,
+        clientIdPrefix: "requirements",
+      });
+      try {
+        await client.installDirectoryPlugin(directory);
+        await provide({ ...host, directory, client });
+      } finally {
+        await client.close();
+      }
+    } finally {
+      clearTimeout(timeout);
+      await killProcessTree(daemon);
+      await rm(directory, { recursive: true, force: true });
+    }
+  },
+});
+
+async function writeRequirements(directory: string, paseo: string) {
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: "requirements-example", requirements: { paseo } }),
+  );
+}
+
+export async function openRequirementHost(page: Page, host: { serverId: string; port: number }) {
+  await gotoAppShell(page);
+  await addConnectedHostAndReload(page, { ...host, label: "Plugin requirements" });
+  await openSettings(page);
+  await selectSettingsHost(page, host.serverId);
+  await openHostSection(page, host.serverId, "plugins");
+}
+
+export async function expectAppMismatch(page: Page) {
+  await expect(page.getByLabel("requirements-example failed", { exact: true })).toBeVisible();
+  await expect(
+    page.getByText(/Plugin "requirements-example" requires Paseo \^99.0.0. Your app is/),
+  ).toBeVisible();
+}
+
+export async function correctRequirementAndReload(page: Page, directory: string) {
+  await writeRequirements(directory, pluginRequirements.paseo);
+  await reloadRequirementsPlugin(page);
+  await expect(page.getByLabel("requirements-example running", { exact: true })).toBeVisible();
+  await expect(page.getByText(/Your app is/)).toHaveCount(0);
+}
+
+export async function rejectDaemonMismatch(page: Page, directory: string) {
+  await writeRequirements(directory, ">=100.0.0");
+  await reloadRequirementsPlugin(page);
+  await expect(page.getByLabel("requirements-example failed", { exact: true })).toBeVisible();
+  await expect(page.getByText(/Your daemon is 99.0.0/).first()).toBeVisible();
+}
+
+async function reloadRequirementsPlugin(page: Page) {
+  await page.getByRole("button", { name: "Actions for requirements-example", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Reload", exact: true }).click();
+}
diff --git a/packages/app/e2e/support/helpers/plugin-settings.ts b/packages/app/e2e/support/helpers/plugin-settings.ts
new file mode 100644
index 0000000000..32f07fcdfd
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-settings.ts
@@ -0,0 +1,121 @@
+import { copyPluginExample } from "./plugin-fixture";
+import { expect, test as base, type Page } from "../fixtures";
+import { gotoAppShell, openSettings } from "./app";
+import { goBackInSettings, openCompactSettings, openHostSection } from "./settings";
+import { getServerId } from "./server-id";
+import { expectAppRoute } from "./route-assertions";
+import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+
+type SettingsClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
+
+export const test = base.extend<{ settingsPlugin: SettingsClient }>({
+  settingsPlugin: [
+    async ({ e2eWorker, page }, provide, testInfo) => {
+      void e2eWorker;
+      const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+      const previous = await client.getDaemonConfig();
+      const example = await copyPluginExample("settings");
+      try {
+        await client.patchDaemonConfig({ pluginsEnabled: true });
+        await client.installDirectoryPlugin(example.directory);
+        await provide(client);
+        await page.screenshot({ path: testInfo.outputPath("settings.png") });
+      } finally {
+        await client.removePlugin("settings-example");
+        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+        await client.close();
+        await example.cleanup();
+      }
+    },
+    { auto: true },
+  ],
+});
+
+export async function openDisplaySettings(page: Page) {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openPluginScreen(page);
+}
+export async function openCompactDisplaySettings(page: Page) {
+  await gotoAppShell(page);
+  await openCompactSettings(page, new URL(page.url()).pathname);
+  await openPluginScreen(page);
+}
+async function openPluginScreen(page: Page) {
+  await openHostSection(page, getServerId(), "plugins");
+  await page.getByRole("button", { name: "Actions for settings-example", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Display", exact: true }).click();
+  await expect(page.getByRole("switch", { name: "Show metadata" })).toBeVisible();
+}
+export async function groupByWorkspace(page: Page) {
+  await page.getByRole("button", { name: /^Group agents by:/ }).click();
+  await page.getByRole("menuitem", { name: "Workspace", exact: true }).click();
+  await expect(page.getByText("Grouped by workspace", { exact: true })).toBeVisible();
+}
+export async function hideMetadata(page: Page) {
+  await page.getByRole("switch", { name: "Show metadata" }).click();
+  await expect(page.getByText("Metadata hidden", { exact: true })).toBeVisible();
+}
+export async function reloadSavedDisplaySettings(page: Page) {
+  await page.reload();
+  await expect(page.getByText("Grouped by workspace", { exact: true })).toBeVisible();
+  await expect(page.getByRole("switch", { name: "Show metadata" })).not.toBeChecked();
+}
+export async function editTitle(page: Page, title: string) {
+  await page.getByRole("button", { name: "Edit title", exact: true }).click();
+  await replaceTitle(page, title);
+}
+export async function replaceTitle(page: Page, title: string) {
+  await page.getByRole("textbox", { name: "Monitor title", exact: true }).fill(title);
+}
+export async function saveTitle(page: Page) {
+  await page.getByRole("button", { name: "Save title", exact: true }).click();
+}
+export async function expectTitleRequired(page: Page) {
+  await expect(page.getByText(/Enter a title/).first()).toBeVisible();
+}
+export async function expectSavedTitle(page: Page, title: string) {
+  await expect(page.getByText(title, { exact: true })).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Monitor title", exact: true })).toHaveCount(0);
+}
+export async function changeMetadataFromAnotherClient(page: Page) {
+  const peer = await page.context().newPage();
+  try {
+    await peer.goto(page.url());
+    await hideMetadata(peer);
+    await expect(page.getByText("Metadata hidden", { exact: true })).toBeVisible();
+  } finally {
+    await peer.close();
+  }
+}
+export async function expectConflictPreservesDraft(page: Page, title: string) {
+  await expect(page.getByText(/Settings changed on another client/)).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Monitor title", exact: true })).toHaveValue(
+    title,
+  );
+}
+export async function discardTitle(page: Page) {
+  await page.getByRole("button", { name: "Discard", exact: true }).click();
+  await expectSavedTitle(page, "Agent monitor");
+}
+export async function returnAndReopenSettings(page: Page) {
+  await goBackInSettings(page);
+  const actions = page.getByRole("button", { name: "Actions for settings-example", exact: true });
+  await expect(actions).toBeVisible();
+  await actions.click();
+  await page.getByRole("menuitem", { name: "Display", exact: true }).click();
+  await expect(page.getByRole("switch", { name: "Show metadata" })).toBeVisible();
+}
+export async function returnToPluginsPage(page: Page) {
+  await page.getByRole("button", { name: "Back to plugins", exact: true }).click();
+  await expectAppRoute(page, buildSettingsHostSectionRoute(getServerId(), "plugins"));
+  await expect(
+    page.getByRole("button", { name: "Actions for settings-example", exact: true }),
+  ).toBeVisible();
+}
+export async function expectSettingsUnavailable(page: Page) {
+  await expect(
+    page.getByText("This plugin settings screen is unavailable.", { exact: true }),
+  ).toBeVisible();
+}
diff --git a/packages/app/e2e/support/helpers/plugin-sidebar-items.ts b/packages/app/e2e/support/helpers/plugin-sidebar-items.ts
new file mode 100644
index 0000000000..0722bd8317
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-sidebar-items.ts
@@ -0,0 +1,268 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, type Locator, type Page } from "@playwright/test";
+import { openCommandCenter } from "./command-center";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { pluginRequirements } from "./plugin-fixture";
+
+export const SHOWCASE_PLUGIN_ID = "sidebar-showcase";
+export const LEGACY_PLUGIN_ID = "legacy-sidebar";
+export const BOTS_PLUGIN_ID = "sidebar-bots";
+export const WIDE = { width: 1440, height: 900 };
+export const COMPACT = { width: 390, height: 844 };
+
+/** A plugin written against the current API: a screen, header and footer items, a command. */
+const SHOWCASE_SOURCE = `import React from "react";
+import { Pressable, Text, View } from "react-native";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+
+function DeploysScreen({ theme }) {
+  return <View style={{ flex: 1, padding: 24 }}><Text style={{ color: theme.colors.foreground }}>Deploys screen body</Text></View>;
+}
+
+function RefreshButton({ theme, onPress }) {
+  return (
+    <Pressable accessibilityRole="button" accessibilityLabel="Refresh deploys" onPress={onPress} style={{ paddingHorizontal: 6 }}>
+      <Text style={{ color: theme.colors.foregroundMuted, fontSize: 12 }}>Refresh</Text>
+    </Pressable>
+  );
+}
+
+function DeploysItem({ theme, currentScreen, openScreen }) {
+  const [refreshes, setRefreshes] = React.useState(0);
+  return (
+    <SidebarRow
+      icon="Rocket"
+      label={refreshes === 0 ? undefined : "Deploys (refreshed " + refreshes + ")"}
+      active={currentScreen?.screenId === "deploys"}
+      onPress={() => openScreen({ screenId: "deploys" })}
+      trailing={<RefreshButton theme={theme} onPress={() => setRefreshes((count) => count + 1)} />}
+    />
+  );
+}
+
+function SyncDetails({ theme, layout, close, openScreen }) {
+  return (
+    <View style={{ gap: 8 }}>
+      <Text style={{ color: theme.colors.foreground }}>Sync details</Text>
+      <Text style={{ color: theme.colors.foregroundMuted }}>Presentation: {layout.compact ? "compact" : "wide"}</Text>
+      <Pressable accessibilityRole="button" accessibilityLabel="Open deploys from popover" onPress={() => openScreen({ screenId: "deploys" })}><Text style={{ color: theme.colors.foreground }}>Open deploys</Text></Pressable>
+      <Pressable accessibilityRole="button" accessibilityLabel="Close sync details" onPress={close}><Text style={{ color: theme.colors.foreground }}>Done</Text></Pressable>
+    </View>
+  );
+}
+
+function SyncItem({ openPopover }) {
+  return <SidebarRow icon="RefreshCw" onPress={() => openPopover(SyncDetails)} />;
+}
+
+function Broken() {
+  throw new Error("Sidebar item exploded");
+}
+
+export default function contribute(client) {
+  client.addScreen({ id: "deploys", title: "Deploys", Component: DeploysScreen });
+  client.addSidebarHeaderItem({ id: "deploys", title: "Deploys", Component: DeploysItem });
+  client.addSidebarHeaderItem({ id: "broken", title: "Broken header", Component: Broken });
+  client.addSidebarFooterItem({ id: "sync", title: "Sync", Component: SyncItem });
+  client.addSidebarFooterItem({ id: "broken", title: "Broken footer", Component: Broken });
+  client.addCommandCenterItem({ id: "open-deploys", title: "Open deploys", icon: "Rocket", context: "global", onSelect: (ctx) => ctx.openScreen({ screenId: "deploys" }) });
+  return () => {};
+}
+`;
+
+/**
+ * One header item that renders a group: a row per bot, a separator and a status row. Each bot
+ * row opens the bot screen with the bot's id as a param, and its trailing More button opens that
+ * bot's popover. Commands open a bot with a `serverId` param, and add and remove a footer item
+ * after setup; that item opens an event observation, releases it in its cleanup, and publishes its
+ * id on `globalThis.__botAlertsObservation`.
+ */
+const BOTS_SOURCE = `import React from "react";
+import { Pressable, Text, View } from "react-native";
+import { usePaseo } from "@getpaseo/plugin/client";
+import { SidebarRow, SidebarSeparator } from "@getpaseo/plugin/client/ui";
+
+const BOTS = [
+  { id: "bot-1", name: "Bot 1" },
+  { id: "bot-2", name: "Bot 2" },
+];
+
+function BotScreen({ theme, params }) {
+  return (
+    <View style={{ flex: 1, padding: 24, gap: 8 }}>
+      <Text style={{ color: theme.colors.foreground }}>{"Bot screen: " + params.botId}</Text>
+      <Text style={{ color: theme.colors.foregroundMuted }}>{"serverId param: " + (params.serverId ?? "none")}</Text>
+    </View>
+  );
+}
+
+function botTitle(params) {
+  return BOTS.find((bot) => bot.id === params.botId)?.name ?? "Bot";
+}
+
+const botMenus = {};
+
+function botMenu(bot) {
+  botMenus[bot.id] ??= function BotMenu({ theme, close }) {
+    return (
+      <View style={{ gap: 8 }}>
+        <Text style={{ color: theme.colors.foreground }}>{bot.name + " options"}</Text>
+        <Pressable accessibilityRole="button" accessibilityLabel={"Close " + bot.name + " options"} onPress={close}><Text style={{ color: theme.colors.foreground }}>Done</Text></Pressable>
+      </View>
+    );
+  };
+  return botMenus[bot.id];
+}
+
+function MoreButton({ theme, bot, onPress }) {
+  return (
+    <Pressable accessibilityRole="button" accessibilityLabel={"More for " + bot.name} onPress={onPress} style={{ paddingHorizontal: 6 }}>
+      <Text style={{ color: theme.colors.foregroundMuted, fontSize: 12 }}>More</Text>
+    </Pressable>
+  );
+}
+
+function BotStatus({ theme, close }) {
+  return (
+    <View style={{ gap: 8 }}>
+      <Text style={{ color: theme.colors.foreground }}>Bot status details</Text>
+      <Pressable accessibilityRole="button" accessibilityLabel="Close bot status" onPress={close}><Text style={{ color: theme.colors.foreground }}>Done</Text></Pressable>
+    </View>
+  );
+}
+
+function BotsItem({ theme, currentScreen, openScreen, openPopover }) {
+  return (
+    <>
+      {BOTS.map((bot) => (
+        <SidebarRow
+          key={bot.id}
+          id={bot.id}
+          icon="Bot"
+          label={bot.name}
+          active={currentScreen?.screenId === "bot" && currentScreen.params.botId === bot.id}
+          onPress={() => openScreen({ screenId: "bot", params: { botId: bot.id } })}
+          trailing={<MoreButton theme={theme} bot={bot} onPress={() => openPopover(botMenu(bot))} />}
+        />
+      ))}
+      <SidebarSeparator />
+      <SidebarRow id="status" icon="Activity" label="Bot status" onPress={() => openPopover(BotStatus)} />
+    </>
+  );
+}
+
+function AlertsItem() {
+  const paseo = usePaseo();
+  React.useEffect(() => {
+    const observation = paseo.observeEvents(["project.update"]);
+    observation.subscribe({ snapshot(value) { globalThis.__botAlertsObservation = value.subscriptionId; }, update() {} });
+    return () => { void observation.release(); };
+  }, [paseo]);
+  return <SidebarRow icon="Bell" onPress={() => {}} />;
+}
+
+export default function contribute(client) {
+  let removeAlerts = null;
+  client.addScreen({ id: "bot", title: botTitle, Component: BotScreen });
+  client.addSidebarHeaderItem({ id: "bots", title: "Bots", Component: BotsItem });
+  client.addCommandCenterItem({ id: "open-bot-3", title: "Open bot 3 on server x", icon: "Bot", context: "global", onSelect: (ctx) => ctx.openScreen({ screenId: "bot", params: { botId: "bot-3", serverId: "x" } }) });
+  client.addCommandCenterItem({ id: "add-alerts", title: "Add bot alerts", icon: "Bell", context: "global", onSelect: () => {
+    if (!removeAlerts) removeAlerts = client.addSidebarFooterItem({ id: "alerts", title: "Bot alerts", Component: AlertsItem });
+  } });
+  client.addCommandCenterItem({ id: "remove-alerts", title: "Remove bot alerts", icon: "BellOff", context: "global", onSelect: () => {
+    removeAlerts?.();
+    removeAlerts = null;
+  } });
+  return () => {};
+}
+`;
+
+/** A plugin that still uses only the old descriptor calls. */
+const LEGACY_SOURCE = `import React from "react";
+import { Text, View } from "react-native";
+
+function Main({ theme }) {
+  return <View style={{ flex: 1, padding: 24 }}><Text style={{ color: theme.colors.foreground }}>Legacy screen body</Text></View>;
+}
+
+export default function contribute(plugin) {
+  plugin.addSurface("main", Main);
+  plugin.addSidebarItem({ id: "entry", title: "Legacy entry", icon: "Server", surface: "main" });
+  plugin.addSidebarItem({ id: "hidden", title: "Legacy hidden", icon: "Blocks", surface: "main" });
+  return () => {};
+}
+`;
+
+export async function installSidebarPlugins() {
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const config = await client.getDaemonConfig();
+  const directories: string[] = [];
+  for (const [id, source] of [
+    [SHOWCASE_PLUGIN_ID, SHOWCASE_SOURCE],
+    [LEGACY_PLUGIN_ID, LEGACY_SOURCE],
+    [BOTS_PLUGIN_ID, BOTS_SOURCE],
+  ] as const) {
+    const directory = await mkdtemp(path.join(tmpdir(), `paseo-${id}-`));
+    directories.push(directory);
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), source);
+  }
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  for (const directory of directories) await client.installDirectoryPlugin(directory);
+  return {
+    async cleanup() {
+      await client.removePlugin(SHOWCASE_PLUGIN_ID);
+      await client.removePlugin(LEGACY_PLUGIN_ID);
+      await client.removePlugin(BOTS_PLUGIN_ID);
+      await client.patchDaemonConfig({ pluginsEnabled: config.config.pluginsEnabled });
+      await client.close();
+      await Promise.all(
+        directories.map((directory) => rm(directory, { recursive: true, force: true })),
+      );
+    },
+  };
+}
+
+/** The first visible match: the shell keeps a compact copy of the sidebar mounted. */
+export function visibleTestId(page: Page, testID: string): Locator {
+  return page.locator(`[data-testid="${testID}"]:visible`).first();
+}
+
+export function headerRow(page: Page, pluginId: string, itemId: string): Locator {
+  return visibleTestId(page, `plugin-sidebar-${pluginId}-${itemId}`);
+}
+
+export function footerItem(page: Page, pluginId: string, itemId: string): Locator {
+  return visibleTestId(page, `plugin-sidebar-footer-${pluginId}-${itemId}`);
+}
+
+export async function expectRowActive(row: Locator, active: boolean): Promise<void> {
+  if (active) await expect(row).toHaveAttribute("aria-selected", "true");
+  else await expect(row).not.toHaveAttribute("aria-selected", "true");
+}
+
+export async function runCommand(page: Page, title: string): Promise<void> {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill(title);
+  await panel.getByRole("button", { name: title, exact: true }).click();
+  await expect(panel).not.toBeVisible();
+}
+
+export async function closeScreen(page: Page): Promise<void> {
+  await page.getByTestId("plugin-surface-close").click();
+  await expect(page).not.toHaveURL(/\/plugin\//);
+}
+
+/** Box of the popover body, located from the text it renders. */
+export async function popoverBox(page: Page, text = "Sync details") {
+  const details = page.getByText(text, { exact: true });
+  await expect(details).toBeInViewport();
+  const box = await details.boundingBox();
+  expect(box).not.toBeNull();
+  return box!;
+}
diff --git a/packages/app/e2e/support/helpers/plugin-timeline.ts b/packages/app/e2e/support/helpers/plugin-timeline.ts
new file mode 100644
index 0000000000..8ad7e0a632
--- /dev/null
+++ b/packages/app/e2e/support/helpers/plugin-timeline.ts
@@ -0,0 +1,233 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, type Page, type TestInfo } from "@playwright/test";
+import { pluginRequirements } from "./plugin-fixture";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { openAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+
+const PLUGIN_ID = "timeline-transform-e2e";
+export const ASSISTANT_TEXT =
+  "Skill header\n\n# Instructions\n\nRead every paragraph and preserve the full message while this response is still streaming.";
+
+const CLIENT_SOURCE = `import React, { useState } from "react";
+import { Text, View, Pressable } from "react-native";
+import { z } from "zod";
+
+function Card({ item }) {
+  const [count, setCount] = useState(0);
+  return <View>
+    <Text accessibilityRole="header">{item.data.label + " " + item.data.phase}</Text>
+    <Text>{item.data.text}</Text>
+    <Pressable accessibilityRole="button" onPress={() => setCount(count + 1)}>
+      <Text>{"Card clicks " + count}</Text>
+    </Pressable>
+  </View>;
+}
+
+export default function contribute(client) {
+  for (const itemType of ["assistant_message", "tool_call"]) {
+    client.addTimelineTransformer({
+      id: itemType.replaceAll("_", "-"),
+      query: { itemType },
+      transform({ item, phase }) {
+        return { items: [{ type: "plugin", kind: "card", version: 1, data: {
+          label: item.type === "tool_call" ? "Tool " + item.name : "Assistant",
+          text: item.type === "tool_call" ? item.callId : item.text,
+          phase,
+        } }] };
+      },
+    });
+  }
+  client.addTimelineRenderer({
+    kind: "card", version: 1,
+    schema: z.object({ label: z.string(), text: z.string(), phase: z.enum(["streaming", "complete"]) }),
+    Component: Card,
+  });
+  return () => {};
+}`;
+
+const PROMPT_PLUGIN_ID = "timeline-prompt-e2e";
+
+function promptClientSource(prompts?: readonly string[]): string {
+  return `import React from "react";
+import { Text, View } from "react-native";
+import { z } from "zod";
+
+const selectedPrompts = ${JSON.stringify(prompts ?? null)};
+
+function PromptCard({ item }) {
+  return <View testID="plugin-prompt"><Text>{item.data.text}</Text></View>;
+}
+
+export default function contribute(client) {
+  client.addTimelineTransformer({
+    id: "prompt",
+    query: { itemType: "user_message" },
+    transform({ item }) {
+      if (selectedPrompts && !selectedPrompts.includes(item.text)) return undefined;
+      return { items: [{ type: "plugin", kind: "prompt", version: 1, data: { text: item.text } }] };
+    },
+  });
+  client.addTimelineRenderer({
+    kind: "prompt", version: 1,
+    schema: z.object({ text: z.string() }),
+    Component: PromptCard,
+  });
+  return () => {};
+}`;
+}
+
+async function withDirectoryPlugin(options: {
+  pluginId: string;
+  source: string;
+  run: () => Promise<void>;
+}): Promise<void> {
+  const { pluginId, source, run } = options;
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-timeline-plugin-"));
+  const pluginClient = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await pluginClient.getDaemonConfig();
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: pluginId, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), source);
+    await pluginClient.patchDaemonConfig({ pluginsEnabled: true });
+    await pluginClient.installDirectoryPlugin(directory);
+    await run();
+  } finally {
+    await pluginClient.removePlugin(pluginId);
+    await pluginClient.patchDaemonConfig({
+      pluginsEnabled: previous.config.pluginsEnabled ?? false,
+    });
+    await pluginClient.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}
+
+export async function withTimelinePlugin(
+  page: Page,
+  info: TestInfo,
+  mode: "assistant" | "tools",
+  run: (agent: MockAgentWorkspace) => Promise<void>,
+): Promise<void> {
+  info.setTimeout(120_000);
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "@paseo:app-settings",
+      JSON.stringify({ toolCallDetailLevel: "overview" }),
+    );
+  });
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "timeline-plugin-",
+    title: "Timeline plugin regression",
+    model: "ten-second-stream",
+    featureValues:
+      mode === "assistant"
+        ? {
+            mockStreamingAssistantResponse: ASSISTANT_TEXT,
+            mockStreamingAssistantIntervalMs: 300,
+          }
+        : {},
+  });
+  try {
+    await withDirectoryPlugin({
+      pluginId: PLUGIN_ID,
+      source: CLIENT_SOURCE,
+      run: async () => {
+        try {
+          await openAgentRoute(page, agent);
+          await expect(
+            page.getByRole("textbox", { name: "Message agent..." }).first(),
+          ).toBeVisible();
+          await run(agent);
+          await info.attach("timeline-plugin", {
+            body: await page.screenshot({ path: info.outputPath("timeline-plugin.png") }),
+            contentType: "image/png",
+          });
+        } catch (error) {
+          await info.attach("timeline-before-cleanup", {
+            body: await page.screenshot({ path: info.outputPath("timeline-before-cleanup.png") }),
+            contentType: "image/png",
+          });
+          throw error;
+        }
+      },
+    });
+  } finally {
+    await agent.cleanup();
+  }
+}
+
+/** Draws all prompts, or only the selected prompts, as plugin cards. */
+export async function withPromptTimelinePlugin(
+  run: () => Promise<void>,
+  prompts?: readonly string[],
+): Promise<void> {
+  await withDirectoryPlugin({
+    pluginId: PROMPT_PLUGIN_ID,
+    source: promptClientSource(prompts),
+    run,
+  });
+}
+
+export async function expectPromptsDrawnByPlugin(page: Page): Promise<void> {
+  const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  await expect(timeline.getByTestId("plugin-prompt").first()).toBeVisible({ timeout: 30_000 });
+  await expect(timeline.getByTestId("user-message")).toHaveCount(0);
+}
+
+export async function requestPluginTimeline(agent: MockAgentWorkspace): Promise<void> {
+  await agent.client.sendAgentMessage(agent.agentId, "Exercise timeline transforms.");
+}
+
+export async function interactWithStreamingCard(page: Page): Promise<void> {
+  await expect(page.getByRole("heading", { name: "Assistant streaming", exact: true })).toHaveCount(
+    1,
+  );
+  await page.getByRole("button", { name: "Card clicks 0", exact: true }).click();
+  await expect(page.getByText(/Skill header\s+# Instructions/)).toBeVisible();
+  await expect(page.getByRole("heading", { name: "Assistant streaming", exact: true })).toHaveCount(
+    1,
+  );
+  await expect(page.getByRole("button", { name: "Card clicks 1", exact: true })).toBeVisible();
+  await expect(page.getByTestId("assistant-message")).toHaveCount(0);
+}
+
+export async function expectWholeCompletedCard(page: Page): Promise<void> {
+  await expect(page.getByRole("heading", { name: "Assistant complete", exact: true })).toHaveCount(
+    1,
+  );
+  await expect(page.getByText(ASSISTANT_TEXT, { exact: true })).toBeVisible();
+  await expect(page.getByTestId("assistant-message")).toHaveCount(0);
+}
+
+export async function expectBothConsecutiveTools(page: Page): Promise<void> {
+  // read and grep are consecutive source calls in the fixture. Overview used to
+  // send only the later call to the plugin, so the read card never existed.
+  const read = page.getByRole("heading", { name: "Tool read complete", exact: true }).first();
+  await read.scrollIntoViewIfNeeded();
+  await expect(read).toBeVisible();
+  const grep = page.getByRole("heading", { name: "Tool grep complete", exact: true }).first();
+  await grep.scrollIntoViewIfNeeded();
+  await expect(grep).toBeVisible();
+}
+
+/** The row belongs to the virtualized history, not the always-mounted recent window. */
+export async function expectVirtualizedPluginPromptVisible(
+  page: Page,
+  prompt: string,
+): Promise<void> {
+  const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  await expect(
+    timeline.locator("[data-index]").getByTestId("plugin-prompt").filter({ hasText: prompt }),
+  ).toBeVisible();
+}
+
+export async function attachPromptTimelineEvidence(page: Page, info: TestInfo): Promise<void> {
+  await info.attach("plugin-outline-jump", {
+    body: await page.screenshot({ path: info.outputPath("plugin-outline-jump.png") }),
+    contentType: "image/png",
+  });
+}
diff --git a/packages/app/e2e/support/helpers/pr-pane.ts b/packages/app/e2e/support/helpers/pr-pane.ts
index 56f0ef444c..37fe719e0f 100644
--- a/packages/app/e2e/support/helpers/pr-pane.ts
+++ b/packages/app/e2e/support/helpers/pr-pane.ts
@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { getStateLabel } from "@/git/pull-request-panel/data";
+import { en } from "@/i18n/resources/en";
 import { openPullRequestPanel } from "./workspace-tabs";
 
 export async function openPrPane(page: Page): Promise<void> {
@@ -14,7 +14,7 @@ export async function expectPrPaneState(
   page: Page,
   state: "open" | "merged" | "closed" | "draft",
 ): Promise<void> {
-  await expect(page.getByTestId("pr-pane-state")).toHaveText(getStateLabel(state), {
+  await expect(page.getByTestId("pr-pane-state")).toHaveText(en.workspace.git.pr.states[state], {
     timeout: 15_000,
   });
 }
diff --git a/packages/app/e2e/support/helpers/provider-subagents.ts b/packages/app/e2e/support/helpers/provider-subagents.ts
new file mode 100644
index 0000000000..33c084d747
--- /dev/null
+++ b/packages/app/e2e/support/helpers/provider-subagents.ts
@@ -0,0 +1,94 @@
+import { expect, type Locator, type Page, type TestInfo } from "@playwright/test";
+
+import { launchAgent, sendMessage, type AgentHandle } from "./rewind-flow";
+import { openSubagentsTrack } from "./subagents";
+
+const NESTED_OWNERSHIP_PROMPT =
+  "You are ROOT_OWNER. Use Claude Code's native Agent tool exactly once, never Paseo tools. " +
+  "Name the agent direct_owner and give it this complete task: You are DIRECT_OWNER. Use " +
+  "Claude Code's native Agent tool exactly once. Name that agent nested_owner and give it " +
+  "this complete task: You are NESTED_OWNER. Use Bash exactly once to run `sleep 2; printf " +
+  "'NESTED_BACKGROUND_SENTINEL\\n'` with run_in_background true. Wait for the background " +
+  "command's completion notification. Use TaskOutput with block true to wait for the Bash task and verify exit code 0 and the sentinel output before replying exactly NESTED_DONE. Do not finish while it is running. Wait for nested_owner " +
+  "to finish, then reply exactly DIRECT_DONE. Wait for direct_owner to finish, then reply " +
+  "exactly ROOT_DONE.";
+
+export async function launchNestedProviderSubagentOwnershipScenario(
+  page: Page,
+  cwd: string,
+): Promise<AgentHandle> {
+  const handle = await launchAgent({
+    page,
+    provider: "claude",
+    cwd,
+    mode: "full-access",
+    providerConfig: { model: "claude-sonnet-5" },
+  });
+  await sendMessage(handle, NESTED_OWNERSHIP_PROMPT);
+  await expect(page.getByText("ROOT_DONE", { exact: true }).last()).toBeVisible({
+    timeout: 120_000,
+  });
+  return handle;
+}
+
+async function attachScreenshot(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  const path = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path });
+  await testInfo.attach(name, { path, contentType: "image/png" });
+}
+
+async function expectOnlySubagent(page: Page, label: RegExp): Promise<Locator> {
+  const rows = page.locator('[data-testid^="subagents-track-row-"]');
+  await expect(rows).toHaveCount(1);
+  const row = page.getByTestId("subagents-track-header-panel").getByRole("button", { name: label });
+  await expect(row).toBeVisible();
+  return row;
+}
+
+async function selectOnlyRootSubagent(page: Page, label: RegExp): Promise<void> {
+  await openSubagentsTrack(page);
+  const row = await expectOnlySubagent(page, label);
+  await row.click();
+}
+
+async function openOwnedSubagents(page: Page, ownerPanel: Locator): Promise<void> {
+  await ownerPanel.getByTestId("subagents-track-header").click();
+  await expect(page.getByTestId("subagents-track-header-panel")).toBeVisible();
+}
+
+export async function expectNestedProviderSubagentOwnership(
+  page: Page,
+  testInfo: TestInfo,
+  phase: string,
+): Promise<void> {
+  await expect(
+    page.getByText("Task notification", { exact: true }).filter({ visible: true }),
+  ).toHaveCount(0);
+  await selectOnlyRootSubagent(page, /^direct_owner\b/);
+  const directPanel = page.getByTestId("provider-subagent-panel").filter({ visible: true });
+  await expect(directPanel).toBeVisible();
+
+  await openOwnedSubagents(page, directPanel);
+  const nestedRow = await expectOnlySubagent(page, /^nested_owner\b/);
+  await attachScreenshot(page, testInfo, `nested-ownership-${phase}-tree`);
+  await nestedRow.click();
+
+  const nestedPanel = page.locator('[data-testid="provider-subagent-panel"]:visible');
+  await expect(
+    nestedPanel
+      .getByRole("button", {
+        name: /^Task notification Background command .*completed \(exit code 0\)/,
+      })
+      .first(),
+  ).toBeVisible();
+  await expect(nestedPanel).toContainText("NESTED_BACKGROUND_SENTINEL");
+  await expect(nestedPanel).toContainText("NESTED_DONE");
+  await attachScreenshot(page, testInfo, `nested-ownership-${phase}-timeline`);
+}
+
+export async function reopenNestedProviderSession(handle: AgentHandle): Promise<void> {
+  await handle.client.refreshAgent(handle.agentId);
+  await handle.page.reload();
+  await handle.page.getByTestId(`workspace-tab-agent_${handle.agentId}`).first().click();
+  await expect(handle.page.getByText("ROOT_DONE", { exact: true }).last()).toBeVisible();
+}
diff --git a/packages/app/e2e/support/helpers/provider-usage.ts b/packages/app/e2e/support/helpers/provider-usage.ts
deleted file mode 100644
index 9ce3bc8849..0000000000
--- a/packages/app/e2e/support/helpers/provider-usage.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import type { Page } from "@playwright/test";
-import type { ProviderUsage } from "@getpaseo/protocol/messages";
-import { daemonWsRoutePattern } from "./daemon-port";
-
-interface ProviderUsageFixturePayload {
-  fetchedAt: string;
-  providers: ProviderUsage[];
-}
-
-export interface ProviderUsageFixture {
-  requestCount(): number;
-  waitForRequestCount(count: number): Promise<void>;
-}
-
-type WebSocketMessage = string | Buffer;
-
-function parseJson(message: WebSocketMessage): unknown {
-  const raw = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
-    return null;
-  }
-  if (typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
-function withProviderUsageFeature(message: WebSocketMessage): string | null {
-  const envelope = parseJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as {
-    type?: unknown;
-    message?: {
-      type?: unknown;
-      payload?: Record<string, unknown>;
-    };
-  };
-  const payload = maybeEnvelope.message?.payload;
-  if (
-    maybeEnvelope.type !== "session" ||
-    maybeEnvelope.message?.type !== "status" ||
-    payload?.status !== "server_info"
-  ) {
-    return null;
-  }
-  return JSON.stringify({
-    ...maybeEnvelope,
-    message: {
-      ...maybeEnvelope.message,
-      payload: {
-        ...payload,
-        features: {
-          ...(typeof payload.features === "object" && payload.features !== null
-            ? payload.features
-            : {}),
-          providerUsageList: true,
-        },
-      },
-    },
-  });
-}
-
-export async function installProviderUsageFixture(
-  page: Page,
-  payloads: ProviderUsageFixturePayload[],
-): Promise<ProviderUsageFixture> {
-  let requests = 0;
-  const waiters: Array<{ count: number; resolve: () => void }> = [];
-
-  function notifyWaiters() {
-    for (const waiter of waiters.splice(0)) {
-      if (requests >= waiter.count) {
-        waiter.resolve();
-      } else {
-        waiters.push(waiter);
-      }
-    }
-  }
-
-  function payloadForRequest(): ProviderUsageFixturePayload {
-    const index = Math.min(requests - 1, payloads.length - 1);
-    const payload = payloads[index];
-    if (!payload) {
-      throw new Error("Provider usage fixture requires at least one payload.");
-    }
-    return payload;
-  }
-
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-
-    ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (sessionMessage?.type === "provider.usage.list.request") {
-        requests += 1;
-        const requestId = sessionMessage.requestId;
-        if (typeof requestId !== "string") {
-          throw new Error("provider.usage.list.request missing requestId");
-        }
-        const payload = payloadForRequest();
-        notifyWaiters();
-        ws.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              type: "provider.usage.list.response",
-              payload: {
-                requestId,
-                fetchedAt: payload.fetchedAt,
-                providers: payload.providers,
-              },
-            },
-          }),
-        );
-        return;
-      }
-      server.send(message);
-    });
-
-    server.onMessage((message) => {
-      const serverInfo = typeof message === "string" ? withProviderUsageFeature(message) : null;
-      ws.send(serverInfo ?? message);
-    });
-  });
-
-  return {
-    requestCount() {
-      return requests;
-    },
-    waitForRequestCount(count: number) {
-      if (requests >= count) {
-        return Promise.resolve();
-      }
-      return new Promise<void>((resolve) => {
-        waiters.push({ count, resolve });
-      });
-    },
-  };
-}
diff --git a/packages/app/e2e/support/helpers/relay-deployment.ts b/packages/app/e2e/support/helpers/relay-deployment.ts
index 3d727e0804..bdbc635a64 100644
--- a/packages/app/e2e/support/helpers/relay-deployment.ts
+++ b/packages/app/e2e/support/helpers/relay-deployment.ts
@@ -92,7 +92,7 @@ export async function measureRelayRestartDuringStream(input: {
   agentTitle: string;
 }): Promise<RelayDeploymentMeasurements> {
   const { page, relay, agentTitle } = input;
-  const toast = page.getByTestId("agent-reconnecting-toast");
+  const toast = page.getByRole("alert").filter({ hasText: "Reconnecting to host" });
   const beforeOutage = await latestAssistantText(page);
   await waitForAssistantTextToGrow(page, beforeOutage);
 
diff --git a/packages/app/e2e/support/helpers/replica-cache-measurement.ts b/packages/app/e2e/support/helpers/replica-cache-measurement.ts
deleted file mode 100644
index 9876bf1d1e..0000000000
--- a/packages/app/e2e/support/helpers/replica-cache-measurement.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-import type { CDPSession, Page } from "@playwright/test";
-
-const REPLICA_CACHE_DATABASE = "paseo-replica-row-store";
-const REPLICA_CACHE_ROWS_STORE = "rows";
-const PERSIST_FRAME_NAMES = [
-  "captureSessions",
-  "captureHost",
-  "queueReplicaChanges",
-  "apply",
-  "safeParse",
-  "stringify",
-  "setItem",
-  "measuredPut",
-] as const;
-const PERSIST_STACK_ANCHORS = new Set([
-  "captureSessions",
-  "captureHost",
-  "queueReplicaChanges",
-  "persist",
-  "flushPending",
-  "measuredPut",
-]);
-
-export interface ReplicaCacheMeasurementReport {
-  targetUrl: string;
-  observationMs: number;
-  persistCpuMs: number;
-  persistCpuFrames: Record<string, number>;
-  flushes: number;
-  bytesWritten: {
-    total: number;
-    perFlush: number[];
-  };
-  redundantWrites: number;
-  storageDurationMs: number;
-  longTasks: {
-    count: number;
-    totalDurationMs: number;
-    maximumDurationMs: number;
-    durationsMs: number[];
-  };
-  restoreMs: number | null;
-}
-
-interface BrowserMeasurementState {
-  flushes: Array<{ bytes: number; durationMs: number }>;
-  longTasks: number[];
-  redundantWrites: number;
-}
-
-interface ProfileNode {
-  id: number;
-  callFrame: { functionName: string; url: string };
-  parent?: number;
-}
-
-interface SamplingProfile {
-  nodes: ProfileNode[];
-  samples?: number[];
-  timeDeltas?: number[];
-}
-
-declare global {
-  interface Window {
-    __replicaCacheMeasurement?: BrowserMeasurementState;
-    __replicaCacheRestoreReadStartedAt?: number;
-  }
-}
-
-export async function installReplicaCacheMeasurement(page: Page): Promise<void> {
-  await page.addInitScript(
-    ({ databaseName, storeName }) => {
-      const encoder = new TextEncoder();
-      const transactionWrites = new WeakMap<
-        IDBTransaction,
-        Array<
-          | { type: "put"; key: string; value: string; bytes: number; startedAt: number }
-          | { type: "delete"; key: string; bytes: 0; startedAt: number }
-        >
-      >();
-      const lastValues = new Map<string, string>();
-
-      const resolveStorageKey = (
-        store: IDBObjectStore,
-        value: unknown,
-        explicitKey: IDBValidKey | undefined,
-      ): unknown => {
-        if (explicitKey !== undefined) return explicitKey;
-        if (value === null || typeof value !== "object") return null;
-        if (Array.isArray(store.keyPath)) {
-          return store.keyPath.map((part) => Reflect.get(value, part));
-        }
-        return typeof store.keyPath === "string" ? Reflect.get(value, store.keyPath) : null;
-      };
-
-      window.__replicaCacheMeasurement = {
-        flushes: [],
-        longTasks: [],
-        redundantWrites: 0,
-      };
-
-      const observeTransaction = (transaction: IDBTransaction) => {
-        let writes = transactionWrites.get(transaction);
-        if (writes) return writes;
-        writes = [];
-        transactionWrites.set(transaction, writes);
-        transaction.addEventListener("complete", () => {
-          const state = window.__replicaCacheMeasurement;
-          if (!state || writes!.length === 0) return;
-          let bytes = 0;
-          let startedAt = Number.POSITIVE_INFINITY;
-          for (const write of writes!) {
-            bytes += write.bytes;
-            startedAt = Math.min(startedAt, write.startedAt);
-            if (write.type === "put") {
-              if (lastValues.get(write.key) === write.value) state.redundantWrites += 1;
-              lastValues.set(write.key, write.value);
-            } else {
-              lastValues.delete(write.key);
-            }
-          }
-          state.flushes.push({ bytes, durationMs: performance.now() - startedAt });
-        });
-        return writes;
-      };
-
-      const originalPut = IDBObjectStore.prototype.put;
-      IDBObjectStore.prototype.put = function measuredPut(value: unknown, key?: IDBValidKey) {
-        const request =
-          key === undefined ? originalPut.call(this, value) : originalPut.call(this, value, key);
-        if (this.transaction.db.name !== databaseName || this.name !== storeName) return request;
-        const rowPayload =
-          value && typeof value === "object" ? Reflect.get(value, "payload") : undefined;
-        let serialized = JSON.stringify(value);
-        if (typeof value === "string") serialized = value;
-        if (typeof rowPayload === "string") serialized = rowPayload;
-        const storageKey = JSON.stringify(resolveStorageKey(this, value, key));
-        observeTransaction(this.transaction).push({
-          type: "put",
-          key: `${this.name}:${storageKey}`,
-          value: serialized,
-          bytes: encoder.encode(serialized).byteLength,
-          startedAt: performance.now(),
-        });
-        return request;
-      };
-      const originalDelete = IDBObjectStore.prototype.delete;
-      IDBObjectStore.prototype.delete = function measuredDelete(query: IDBValidKey | IDBKeyRange) {
-        const request = originalDelete.call(this, query);
-        if (this.transaction.db.name !== databaseName || this.name !== storeName) return request;
-        observeTransaction(this.transaction).push({
-          type: "delete",
-          key: `${this.name}:${JSON.stringify(query)}`,
-          bytes: 0,
-          startedAt: performance.now(),
-        });
-        return request;
-      };
-
-      const markRestoreRead = (store: IDBObjectStore) => {
-        if (
-          store.transaction.db.name === databaseName &&
-          store.name === storeName &&
-          store.transaction.mode === "readonly" &&
-          window.__replicaCacheRestoreReadStartedAt === undefined
-        ) {
-          window.__replicaCacheRestoreReadStartedAt = performance.now();
-        }
-      };
-      const originalGet = IDBObjectStore.prototype.get;
-      IDBObjectStore.prototype.get = function measuredGet(query: IDBValidKey | IDBKeyRange) {
-        markRestoreRead(this);
-        return originalGet.call(this, query);
-      };
-      const originalGetAll = IDBObjectStore.prototype.getAll;
-      IDBObjectStore.prototype.getAll = function measuredGetAll(
-        query?: IDBValidKey | IDBKeyRange | null,
-        count?: number,
-      ) {
-        markRestoreRead(this);
-        return originalGetAll.call(this, query, count);
-      };
-      const originalOpenCursor = IDBObjectStore.prototype.openCursor;
-      IDBObjectStore.prototype.openCursor = function measuredOpenCursor(
-        query?: IDBValidKey | IDBKeyRange | null,
-        direction?: IDBCursorDirection,
-      ) {
-        markRestoreRead(this);
-        return originalOpenCursor.call(this, query, direction);
-      };
-
-      if (typeof PerformanceObserver !== "undefined") {
-        const observer = new PerformanceObserver((entries) => {
-          const state = window.__replicaCacheMeasurement;
-          if (!state) return;
-          for (const entry of entries.getEntries()) state.longTasks.push(entry.duration);
-        });
-        try {
-          observer.observe({ type: "longtask", buffered: true });
-        } catch {
-          // Chromium exposes Long Tasks; leave an empty list on runtimes that do not.
-        }
-      }
-    },
-    { databaseName: REPLICA_CACHE_DATABASE, storeName: REPLICA_CACHE_ROWS_STORE },
-  );
-}
-
-export async function beginReplicaCacheObservation(
-  page: Page,
-): Promise<{ cdp: CDPSession; startedAt: number }> {
-  await page.evaluate(() => {
-    const state = window.__replicaCacheMeasurement;
-    if (!state) throw new Error("Replica cache measurement is not installed");
-    state.flushes = [];
-    state.longTasks = [];
-    state.redundantWrites = 0;
-  });
-  const cdp = await page.context().newCDPSession(page);
-  await cdp.send("Profiler.enable");
-  await cdp.send("Profiler.setSamplingInterval", { interval: 100 });
-  await cdp.send("Profiler.start");
-  return { cdp, startedAt: Date.now() };
-}
-
-export async function finishReplicaCacheObservation(
-  page: Page,
-  observation: { cdp: CDPSession; startedAt: number },
-  targetUrl: string,
-): Promise<Omit<ReplicaCacheMeasurementReport, "restoreMs">> {
-  const result = (await observation.cdp.send("Profiler.stop")) as { profile: SamplingProfile };
-  await observation.cdp.detach();
-  const browser = await page.evaluate(() => {
-    const state = window.__replicaCacheMeasurement;
-    if (!state) throw new Error("Replica cache measurement is not installed");
-    return state;
-  });
-  const cpu = summarizePersistCpu(result.profile);
-  const bytesPerFlush = browser.flushes.map((flush) => flush.bytes);
-  const longTaskDurations = browser.longTasks;
-  return {
-    targetUrl,
-    observationMs: Date.now() - observation.startedAt,
-    persistCpuMs: cpu.totalMs,
-    persistCpuFrames: cpu.byFrame,
-    flushes: browser.flushes.length,
-    bytesWritten: {
-      total: bytesPerFlush.reduce((sum, bytes) => sum + bytes, 0),
-      perFlush: bytesPerFlush,
-    },
-    redundantWrites: browser.redundantWrites,
-    storageDurationMs: browser.flushes.reduce((sum, flush) => sum + flush.durationMs, 0),
-    longTasks: {
-      count: longTaskDurations.length,
-      totalDurationMs: longTaskDurations.reduce((sum, duration) => sum + duration, 0),
-      maximumDurationMs: Math.max(0, ...longTaskDurations),
-      durationsMs: longTaskDurations,
-    },
-  };
-}
-
-export async function measureReplicaCacheRestore(
-  page: Page,
-  targetUrl: string,
-  hydratedSelector: string,
-): Promise<number | null> {
-  await page.routeWebSocket(/\/ws(?:\?|$)/, async (socket) => {
-    await socket.close({ code: 1000, reason: "Hold reconnect until cached replica paints" });
-  });
-  await page.goto(targetUrl, { waitUntil: "domcontentloaded" });
-  const restoredAt = await page.waitForFunction(
-    (selector) => {
-      const startedAt = window.__replicaCacheRestoreReadStartedAt;
-      if (startedAt === undefined) return null;
-      const element = document.querySelector(selector);
-      if (!element || !(element instanceof HTMLElement) || element.offsetParent === null)
-        return null;
-      return performance.now();
-    },
-    hydratedSelector,
-    { timeout: 30_000 },
-  );
-  const restoredAtMs = await restoredAt.jsonValue();
-  const startedAtMs = await page.evaluate(() => window.__replicaCacheRestoreReadStartedAt ?? null);
-  return typeof restoredAtMs === "number" && startedAtMs !== null
-    ? restoredAtMs - startedAtMs
-    : null;
-}
-
-function summarizePersistCpu(profile: SamplingProfile): {
-  totalMs: number;
-  byFrame: Record<string, number>;
-} {
-  const nodes = new Map(profile.nodes.map((node) => [node.id, node]));
-  const byFrame: Record<string, number> = {};
-  let totalMicroseconds = 0;
-  for (const [index, sampleId] of (profile.samples ?? []).entries()) {
-    const delta = profile.timeDeltas?.[index] ?? 0;
-    const stackFunctions = new Set<string>();
-    let node = nodes.get(sampleId);
-    while (node) {
-      stackFunctions.add(node.callFrame.functionName);
-      node = node.parent === undefined ? undefined : nodes.get(node.parent);
-    }
-    if (![...stackFunctions].some((name) => PERSIST_STACK_ANCHORS.has(name))) continue;
-    const matched = PERSIST_FRAME_NAMES.filter((name) => stackFunctions.has(name));
-    if (matched.length === 0) continue;
-    totalMicroseconds += delta;
-    for (const pattern of matched) byFrame[pattern] = (byFrame[pattern] ?? 0) + delta / 1_000;
-  }
-  return { totalMs: totalMicroseconds / 1_000, byFrame };
-}
diff --git a/packages/app/e2e/support/helpers/rewind-flow.ts b/packages/app/e2e/support/helpers/rewind-flow.ts
index a9dace4f81..22f4cf5bcd 100644
--- a/packages/app/e2e/support/helpers/rewind-flow.ts
+++ b/packages/app/e2e/support/helpers/rewind-flow.ts
@@ -318,9 +318,9 @@ export async function assertFileContains(filePath: string, text: string): Promis
 
 export async function assertComposerIdle(handle: Pick<AgentHandle, "page">): Promise<void> {
   await expectComposerEditable(handle.page);
-  await expect(handle.page.getByRole("button", { name: /stop|cancel/i })).toHaveCount(0, {
-    timeout: 30_000,
-  });
+  await expect(
+    handle.page.getByRole("button", { name: /^(?:Stop agent|Canceling agent)$/ }),
+  ).toHaveCount(0, { timeout: 30_000 });
   await expect(handle.page.getByTestId("turn-working-indicator")).toHaveCount(0, {
     timeout: 30_000,
   });
diff --git a/packages/app/e2e/support/helpers/schedule-fake-host.ts b/packages/app/e2e/support/helpers/schedule-fake-host.ts
deleted file mode 100644
index df54741fc0..0000000000
--- a/packages/app/e2e/support/helpers/schedule-fake-host.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import { type Page } from "@playwright/test";
-import { buildSeededHost } from "./daemon-registry";
-import { wsRoutePatternForPort } from "./daemon-port";
-import { type SeededWorkspace } from "./seed-client";
-
-const REGISTRY_KEY = "@paseo:daemon-registry";
-const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
-const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
-export const FAKE_HOST_MODEL_ID = "fake-host-model";
-export const FAKE_HOST_MODEL_LABEL = "Fake host model";
-export const FAKE_HOST_PROJECT_DISPLAY_NAME = "Fake host project";
-
-type WebSocketMessage = string | Buffer;
-type SessionRequest = Record<string, unknown> & { type?: string; requestId?: string };
-
-export interface FakeScheduleHostWorkspace {
-  serverId: string;
-  projectId: string;
-  projectKey: string;
-  projectDisplayName: string;
-  workspace: Record<string, unknown>;
-}
-
-interface FakeScheduleSummary {
-  id: string;
-  name: string | null;
-  prompt: string;
-  cadence: { type: "cron"; expression: string };
-  target: {
-    type: "new-agent";
-    config: {
-      provider: "mock";
-      cwd: string;
-      model: string;
-      modeId: string;
-      title?: string;
-    };
-  };
-  status: "active";
-  createdAt: string;
-  updatedAt: string;
-  nextRunAt: string | null;
-  lastRunAt: string | null;
-  pausedAt: string | null;
-  expiresAt: string | null;
-  maxRuns: number | null;
-}
-
-function parseJson(message: WebSocketMessage): unknown {
-  const raw = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-function buildSessionMessage(type: string, payload: Record<string, unknown>) {
-  return JSON.stringify({
-    type: "session",
-    message: {
-      type,
-      payload,
-    },
-  });
-}
-
-function buildFakeProviderEntries(nowIso: string) {
-  return [
-    {
-      provider: "mock",
-      label: "Mock",
-      status: "ready",
-      enabled: true,
-      fetchedAt: nowIso,
-      models: [
-        {
-          provider: "mock",
-          id: FAKE_HOST_MODEL_ID,
-          label: FAKE_HOST_MODEL_LABEL,
-          isDefault: true,
-        },
-      ],
-      modes: [{ id: "load-test", label: "Load test" }],
-      defaultModeId: "load-test",
-    },
-  ];
-}
-
-function readSessionRequest(message: WebSocketMessage): SessionRequest | null {
-  const parsed = parseJson(message);
-  if (!parsed || typeof parsed !== "object") {
-    return null;
-  }
-
-  const envelope = parsed as { type?: string; message?: SessionRequest };
-  if (envelope.type !== "session" || !envelope.message) {
-    return null;
-  }
-
-  return envelope.message;
-}
-
-function getRequestId(request: SessionRequest): string {
-  return typeof request.requestId === "string" ? request.requestId : "fake-request";
-}
-
-export async function buildFakeScheduleHostWorkspace(
-  workspace: SeededWorkspace,
-): Promise<FakeScheduleHostWorkspace> {
-  const workspaceList = await workspace.client.fetchWorkspaces({
-    filter: { projectId: workspace.projectId },
-  });
-  const baseWorkspace = workspaceList.entries.find((entry) => entry.id === workspace.workspaceId);
-  if (!baseWorkspace) {
-    throw new Error(`Failed to load seeded workspace descriptor ${workspace.workspaceId}`);
-  }
-
-  const projectId = `${workspace.projectId}-fake-host`;
-  const cwd = `${workspace.repoPath}-fake-host`;
-  return {
-    serverId: "schedule-fake-host",
-    projectId,
-    projectKey: workspace.projectKey,
-    projectDisplayName: FAKE_HOST_PROJECT_DISPLAY_NAME,
-    workspace: {
-      ...baseWorkspace,
-      id: `${baseWorkspace.id}-fake-host`,
-      projectId,
-      projectDisplayName: FAKE_HOST_PROJECT_DISPLAY_NAME,
-      projectRootPath: cwd,
-      workspaceDirectory: cwd,
-      name: FAKE_HOST_PROJECT_DISPLAY_NAME,
-      project: undefined,
-    },
-  };
-}
-
-export async function installFakeScheduleHost(input: {
-  page: Page;
-  port: string;
-  serverId: string;
-  workspace: Record<string, unknown>;
-  project: Pick<FakeScheduleHostWorkspace, "projectId" | "projectKey" | "projectDisplayName">;
-  schedules?: FakeScheduleSummary[];
-}): Promise<void> {
-  await input.page.routeWebSocket(wsRoutePatternForPort(input.port), (ws) => {
-    ws.onMessage((message) => {
-      const parsed = parseJson(message);
-      if (parsed && typeof parsed === "object" && (parsed as { type?: string }).type === "hello") {
-        ws.send(
-          buildSessionMessage("status", {
-            status: "server_info",
-            serverId: input.serverId,
-            hostname: "fake-schedule-host",
-            version: "0.0.0-e2e",
-            features: {
-              providersSnapshot: true,
-              workspaceMultiplicity: true,
-              projectList: true,
-              projectAdd: true,
-              projectRemove: true,
-              workspaceRecovery: true,
-            },
-          }),
-        );
-        return;
-      }
-
-      if (parsed && typeof parsed === "object" && (parsed as { type?: string }).type === "ping") {
-        ws.send(JSON.stringify({ type: "pong" }));
-        return;
-      }
-
-      const request = readSessionRequest(message);
-      if (!request) {
-        return;
-      }
-
-      const requestId = getRequestId(request);
-      const now = Date.now();
-      const nowIso = new Date(now).toISOString();
-      switch (request.type) {
-        case "ping":
-          ws.send(
-            buildSessionMessage("pong", {
-              requestId,
-              clientSentAt: typeof request.clientSentAt === "number" ? request.clientSentAt : now,
-              serverReceivedAt: now,
-              serverSentAt: now,
-            }),
-          );
-          return;
-        case "fetch_workspaces_request":
-          ws.send(
-            buildSessionMessage("fetch_workspaces_response", {
-              requestId,
-              entries: [input.workspace],
-              emptyProjects: [],
-              pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-            }),
-          );
-          return;
-        case "project.list.request":
-          ws.send(
-            buildSessionMessage("project.list.response", {
-              requestId,
-              projects: [
-                {
-                  projectId: input.project.projectId,
-                  projectKey: input.project.projectKey,
-                  projectDisplayName: input.project.projectDisplayName,
-                  projectRootPath: String(input.workspace.projectRootPath),
-                  projectKind: "git",
-                },
-              ],
-            }),
-          );
-          return;
-        case "fetch_agents_request":
-          ws.send(
-            buildSessionMessage("fetch_agents_response", {
-              requestId,
-              entries: [],
-              pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-            }),
-          );
-          return;
-        case "get_providers_snapshot_request":
-          ws.send(
-            buildSessionMessage("get_providers_snapshot_response", {
-              requestId,
-              entries: buildFakeProviderEntries(nowIso),
-              generatedAt: nowIso,
-            }),
-          );
-          return;
-        case "refresh_providers_snapshot_request":
-          ws.send(
-            buildSessionMessage("refresh_providers_snapshot_response", {
-              requestId,
-              acknowledged: true,
-            }),
-          );
-          return;
-        case "schedule/list":
-          ws.send(
-            buildSessionMessage("schedule/list/response", {
-              requestId,
-              schedules: input.schedules ?? [],
-              error: null,
-            }),
-          );
-          return;
-      }
-    });
-  });
-}
-
-export async function addFakeScheduleHostAndReload(input: {
-  page: Page;
-  serverId: string;
-  label: string;
-  port: string;
-}): Promise<void> {
-  const host = buildSeededHost({
-    serverId: input.serverId,
-    label: input.label,
-    endpoint: `127.0.0.1:${input.port}`,
-    nowIso: new Date().toISOString(),
-  });
-
-  await input.page.evaluate(
-    ({ seededHost, keys }) => {
-      const nonce = localStorage.getItem(keys.nonce);
-      if (!nonce) {
-        throw new Error("Expected the e2e seed nonce before overriding the host registry.");
-      }
-      const raw = localStorage.getItem(keys.registry);
-      const registry: Array<{ serverId: string }> = raw ? JSON.parse(raw) : [];
-      const nextRegistry = registry.filter((entry) => entry.serverId !== seededHost.serverId);
-      nextRegistry.push(seededHost);
-      localStorage.setItem(keys.registry, JSON.stringify(nextRegistry));
-
-      const rawExtraHosts = localStorage.getItem(keys.extraHosts);
-      const extraHosts: Array<{ serverId: string }> = rawExtraHosts
-        ? JSON.parse(rawExtraHosts)
-        : [];
-      const nextExtraHosts = extraHosts.filter((entry) => entry.serverId !== seededHost.serverId);
-      nextExtraHosts.push(seededHost);
-      localStorage.setItem(keys.extraHosts, JSON.stringify(nextExtraHosts));
-    },
-    {
-      seededHost: host,
-      keys: {
-        registry: REGISTRY_KEY,
-        nonce: SEED_NONCE_KEY,
-        extraHosts: EXTRA_HOSTS_KEY,
-      },
-    },
-  );
-
-  await input.page.reload();
-}
diff --git a/packages/app/e2e/support/helpers/schedule-host.ts b/packages/app/e2e/support/helpers/schedule-host.ts
new file mode 100644
index 0000000000..6c01c9650e
--- /dev/null
+++ b/packages/app/e2e/support/helpers/schedule-host.ts
@@ -0,0 +1,81 @@
+import { type Page } from "@playwright/test";
+import { buildSeededHost } from "./daemon-registry";
+import { startIsolatedHostDaemon } from "./isolated-host-daemon";
+import { seedWorkspace, type SeededWorkspace } from "./seed-client";
+
+const REGISTRY_KEY = "@paseo:daemon-registry";
+const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
+const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
+export const SECONDARY_MODEL_ID = "one-minute-stream";
+export const SECONDARY_MODEL_LABEL = "One minute stream";
+
+export async function createScheduleHost() {
+  const daemon = await startIsolatedHostDaemon("schedule-secondary-host");
+  let workspace: SeededWorkspace | undefined;
+  try {
+    workspace = await seedWorkspace({ repoPrefix: "schedule-secondary-", port: daemon.port });
+    const seeded = workspace;
+    await seeded.client.renameProject(seeded.projectId, "Secondary project");
+    return {
+      ...seeded,
+      projectDisplayName: "Secondary project",
+      serverId: daemon.serverId,
+      port: daemon.port,
+      label: "Secondary host",
+      cleanup: async () => {
+        await seeded.cleanup();
+        await daemon.close();
+      },
+    };
+  } catch (error) {
+    await workspace?.cleanup();
+    await daemon.close();
+    throw error;
+  }
+}
+
+export async function addScheduleHostAndReload(input: {
+  page: Page;
+  serverId: string;
+  label: string;
+  port: number;
+}): Promise<void> {
+  const host = buildSeededHost({
+    serverId: input.serverId,
+    label: input.label,
+    endpoint: `127.0.0.1:${input.port}`,
+    nowIso: new Date().toISOString(),
+  });
+
+  await input.page.evaluate(
+    ({ seededHost, keys }) => {
+      const nonce = localStorage.getItem(keys.nonce);
+      if (!nonce) {
+        throw new Error("Expected the e2e seed nonce before overriding the host registry.");
+      }
+      const raw = localStorage.getItem(keys.registry);
+      const registry: Array<{ serverId: string }> = raw ? JSON.parse(raw) : [];
+      const nextRegistry = registry.filter((entry) => entry.serverId !== seededHost.serverId);
+      nextRegistry.push(seededHost);
+      localStorage.setItem(keys.registry, JSON.stringify(nextRegistry));
+
+      const rawExtraHosts = localStorage.getItem(keys.extraHosts);
+      const extraHosts: Array<{ serverId: string }> = rawExtraHosts
+        ? JSON.parse(rawExtraHosts)
+        : [];
+      const nextExtraHosts = extraHosts.filter((entry) => entry.serverId !== seededHost.serverId);
+      nextExtraHosts.push(seededHost);
+      localStorage.setItem(keys.extraHosts, JSON.stringify(nextExtraHosts));
+    },
+    {
+      seededHost: host,
+      keys: {
+        registry: REGISTRY_KEY,
+        nonce: SEED_NONCE_KEY,
+        extraHosts: EXTRA_HOSTS_KEY,
+      },
+    },
+  );
+
+  await input.page.reload();
+}
diff --git a/packages/app/e2e/support/helpers/seed-client.ts b/packages/app/e2e/support/helpers/seed-client.ts
index 5abfb54c1b..4aec3fff01 100644
--- a/packages/app/e2e/support/helpers/seed-client.ts
+++ b/packages/app/e2e/support/helpers/seed-client.ts
@@ -45,6 +45,7 @@ export interface SeedDaemonClient {
     entries: SeedWorkspaceDescriptor[];
   }>;
   setWorkspacePinned(workspaceId: string, pinned: boolean): Promise<{ pinnedAt: string | null }>;
+  clearWorkspaceAttention(workspaceId: string): Promise<void>;
   setWorkspaceLabel(input: {
     workspaceId: string;
     label: { name: string; color: "red" };
@@ -65,6 +66,7 @@ export interface SeedDaemonClient {
           worktreeSlug?: string;
         };
     title?: string;
+    background?: boolean;
   }): Promise<{
     workspace: SeedWorkspaceDescriptor | null;
     error: string | null;
@@ -159,6 +161,7 @@ export interface SeedDaemonClient {
     features?: {
       projectAdd?: boolean;
       workspaceRecovery?: boolean;
+      workspaceMarkUnread?: boolean;
     } | null;
   } | null;
   fetchAgentHistory(options?: {
@@ -221,6 +224,7 @@ export interface SeededWorkspace {
 export async function seedWorkspace(options: {
   repoPrefix: string;
   title?: string;
+  background?: boolean;
   port?: number;
   /** Repo fixture options; only applies to git projects (the default). */
   repo?: Parameters<typeof createTempGitRepo>[1];
@@ -236,6 +240,7 @@ export async function seedWorkspace(options: {
     const created = await client.createWorkspace({
       source: { kind: "directory", path: project.path },
       title: options.title,
+      background: options.background,
     });
     if (!created.workspace) {
       throw new Error(created.error ?? `Failed to create workspace ${project.path}`);
diff --git a/packages/app/e2e/support/helpers/settings.ts b/packages/app/e2e/support/helpers/settings.ts
index 43c0579d1d..1702f7fe44 100644
--- a/packages/app/e2e/support/helpers/settings.ts
+++ b/packages/app/e2e/support/helpers/settings.ts
@@ -20,8 +20,12 @@ interface SavedSettingsHostInput {
 
 const SECTION_LABELS = {
   general: "General",
+  chat: "Chat",
   appearance: "Appearance",
+  sidebar: "Sidebar",
   editor: "Editor",
+  terminal: "Terminal",
+  browser: "Browser",
   shortcuts: "Shortcuts",
   integrations: "Integrations",
   permissions: "Permissions",
@@ -70,7 +74,7 @@ export async function openSettingsHostSection(
 }
 
 export async function expectSettingsHeader(page: Page, title: string): Promise<void> {
-  await expect(page.getByTestId("settings-detail-header-title")).toHaveText(title);
+  await expect(page.getByTestId("page-title")).toHaveText(title);
 }
 
 export async function openAddHostFlow(page: Page): Promise<void> {
@@ -91,12 +95,15 @@ export async function selectHostConnectionType(
 
 export async function addDirectHostFromSettings(
   page: Page,
-  input: { host: string; port: number },
+  input: { host: string; port: number; password?: string },
 ): Promise<void> {
   await openAddHostFlow(page);
   await selectHostConnectionType(page, "direct");
   await page.getByTestId("direct-host-input").fill(input.host);
   await page.getByTestId("direct-port-input").fill(String(input.port));
+  if (input.password) {
+    await page.getByTestId("direct-password-input").fill(input.password);
+  }
   await page.getByTestId("direct-host-submit").click();
   await expect(page.getByTestId("add-host-modal")).toHaveCount(0, { timeout: 30_000 });
 }
@@ -418,3 +425,31 @@ export async function expectLocalHostEntryFirst(page: Page, _serverId: string):
   await expect(picker).toBeVisible();
   await expect(picker.getByText(TEST_HOST_LABEL, { exact: true })).toBeVisible();
 }
+
+export async function expectHostRejectedWithReAddGuidance(
+  page: Page,
+  reason: string,
+): Promise<void> {
+  const error = page.getByTestId("host-connection-error");
+  await expect(error).toContainText(reason);
+  await expect(error).toContainText(
+    "Remove this host and add it again with the password this daemon asks for.",
+  );
+}
+
+export async function expectNoHostPasswordControls(page: Page): Promise<void> {
+  await expect(page.getByText("Password", { exact: true })).toHaveCount(0);
+  await expect(page.locator('input[type="password"]')).toHaveCount(0);
+  await expect(page.getByRole("button", { name: /password/i })).toHaveCount(0);
+}
+
+export async function removeHostFromHostPage(page: Page, serverId: string): Promise<void> {
+  await page.getByTestId("host-page-remove-host-button").click();
+  await page.getByTestId("remove-host-confirm").click();
+  await expect(page).not.toHaveURL(new RegExp(`/settings/hosts/${serverId}`));
+}
+
+export async function expectHostOnlineWithoutError(page: Page): Promise<void> {
+  await expect(page.getByTestId("host-page-identity")).toContainText("Online");
+  await expect(page.getByTestId("host-connection-error")).toHaveCount(0);
+}
diff --git a/packages/app/e2e/support/helpers/sidebar-nav-settings.ts b/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
index bfe6b2c8f5..e3eff916e7 100644
--- a/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
+++ b/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
@@ -1,3 +1,4 @@
+import path from "node:path";
 import { expect, type Locator, type Page } from "@playwright/test";
 import { openSettings } from "./app";
 import { clickSettingsBackToWorkspace, openSettingsSection } from "./settings";
@@ -55,10 +56,25 @@ export async function seedSidebarNavPreferences(
   );
 }
 
+/** Seeds stored footer rows once; a reload keeps whatever the app wrote since. */
+export async function seedSidebarFooterPreferences(
+  page: Page,
+  preferences: SidebarNavPreference[],
+): Promise<void> {
+  await page.addInitScript(
+    ({ key, sidebarFooterItems }) => {
+      if (localStorage.getItem(key)) return;
+      localStorage.setItem(key, JSON.stringify({ sidebarFooterItems }));
+    },
+    { key: APP_SETTINGS_KEY, sidebarFooterItems: preferences },
+  );
+}
+
 export async function openSidebarNavSettings(page: Page): Promise<void> {
   await openSettings(page);
-  await openSettingsSection(page, "appearance");
-  await expect(page.getByTestId("sidebar-nav-section")).toBeVisible({ timeout: 30_000 });
+  await openSettingsSection(page, "sidebar");
+  await expect(page.getByTestId("sidebar-nav-section-header")).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByTestId("sidebar-nav-section-footer")).toBeVisible();
 }
 
 export async function leaveSettings(page: Page): Promise<void> {
@@ -125,9 +141,9 @@ export async function expectStoredSidebarNav(
     .toEqual(expected);
 }
 
-async function expectVerticalOrder(
-  keys: SidebarNavKey[],
-  locate: (key: SidebarNavKey) => Locator,
+async function expectVerticalOrder<Key extends string>(
+  keys: Key[],
+  locate: (key: Key) => Locator,
   subject: string,
 ): Promise<void> {
   await expect
@@ -136,11 +152,7 @@ async function expectVerticalOrder(
         const measured = await Promise.all(
           keys.map(async (key) => ({ key, top: await rowTop(locate(key)) })),
         );
-        if (
-          !measured.every(
-            (entry): entry is { key: SidebarNavKey; top: number } => entry.top !== null,
-          )
-        )
+        if (!measured.every((entry): entry is { key: Key; top: number } => entry.top !== null))
           return null;
         return measured.sort((a, b) => a.top - b.top).map((entry) => entry.key);
       },
@@ -148,3 +160,141 @@ async function expectVerticalOrder(
     )
     .toEqual(keys);
 }
+
+/** Persisted footer row key -> the testID the app shell renders that row with. */
+function shellFooterTestID(key: string): string {
+  if (key === "usage") return "sidebar-usage";
+  const [, pluginId, itemId] = key.split(":");
+  return `plugin-sidebar-footer-${pluginId}-${itemId}`;
+}
+
+function shellFooterRow(page: Page, key: string): Locator {
+  return page.locator(`[data-testid="${shellFooterTestID(key)}"]:visible`).first();
+}
+
+function footerSettingsRows(page: Page): Locator {
+  return page
+    .getByTestId("sidebar-nav-section-footer")
+    .locator('[data-testid^="sidebar-nav-item-"]');
+}
+
+export async function expectFooterSettingsKeys(page: Page, keys: string[]): Promise<void> {
+  await expect
+    .poll(async () =>
+      (
+        await footerSettingsRows(page).evaluateAll((rows) =>
+          rows.map((row) => row.getAttribute("data-testid")),
+        )
+      ).map((testID) => testID?.replace("sidebar-nav-item-", "")),
+    )
+    .toEqual(keys);
+}
+
+export async function moveFooterItemUp(page: Page, key: string): Promise<void> {
+  await page
+    .getByTestId("sidebar-nav-section-footer")
+    .getByTestId(`sidebar-nav-move-up-${key}`)
+    .click();
+}
+
+function footerItemSwitch(page: Page, key: string): Locator {
+  return page.getByTestId("sidebar-nav-section-footer").getByTestId(`sidebar-nav-toggle-${key}`);
+}
+
+export async function setFooterItemVisible(
+  page: Page,
+  key: string,
+  visible: boolean,
+): Promise<void> {
+  const toggle = footerItemSwitch(page, key);
+  await toggle.click();
+  await expect(toggle).toHaveAttribute("aria-checked", String(visible));
+}
+
+/** Whether Settings > Sidebar shows a footer item as on. */
+export async function expectFooterItemSetting(
+  page: Page,
+  key: string,
+  visible: boolean,
+): Promise<void> {
+  await expect(footerItemSwitch(page, key)).toHaveAttribute("aria-checked", String(visible));
+}
+
+export async function expectFooterOrder(page: Page, keys: string[]): Promise<void> {
+  await expectVerticalOrder(keys, (key) => shellFooterRow(page, key), "sidebar footer rows");
+}
+
+export async function expectFooterItemHidden(page: Page, key: string): Promise<void> {
+  await expect(page.locator(`[data-testid="${shellFooterTestID(key)}"]:visible`)).toHaveCount(0);
+}
+
+const FOOTER_ICON_TEST_IDS = [
+  "sidebar-add-project",
+  "sidebar-usage-icon",
+  "sidebar-hosts-trigger",
+  "sidebar-help",
+  "sidebar-settings",
+];
+
+// Browser layout boxes include floating-point rounding, even for whole-pixel styles.
+const FOOTER_GEOMETRY_TOLERANCE = 0.01;
+
+/**
+ * One line of same-size icons: Add project, Usage and Hosts together on the left, Help and
+ * Settings together at the end.
+ */
+export async function expectFooterIconRow(page: Page): Promise<void> {
+  // Read one browser-frame snapshot: the compact drawer can translate between separate RPCs.
+  const boxes = await page
+    .locator(FOOTER_ICON_TEST_IDS.map((testID) => `[data-testid="${testID}"]:visible`).join(","))
+    .evaluateAll((elements) =>
+      elements.map((element) => {
+        const { x, y, width, height } = element.getBoundingClientRect();
+        return { testID: element.getAttribute("data-testid"), x, y, width, height };
+      }),
+    );
+  expect(boxes.map((box) => box.testID)).toEqual(FOOTER_ICON_TEST_IDS);
+  const [first] = boxes;
+  for (const box of boxes) {
+    expect(Math.abs(box.y + box.height / 2 - first!.y - first!.height / 2)).toBeLessThan(2);
+    expect(Math.abs(box.width - first!.width)).toBeLessThan(FOOTER_GEOMETRY_TOLERANCE);
+  }
+  const gaps = boxes.slice(1).map((box, index) => box.x - (boxes[index]!.x + boxes[index]!.width));
+  for (const index of [0, 1, 3]) {
+    expect(Math.abs(gaps[index]!)).toBeLessThan(FOOTER_GEOMETRY_TOLERANCE);
+  }
+  expect(gaps[2]).toBeGreaterThan(first!.width);
+}
+
+export async function expectFooterSeparator(page: Page, shown: boolean): Promise<void> {
+  await expect(page.locator('[data-testid="sidebar-footer"]:visible')).toHaveCSS(
+    "border-top-width",
+    "1px",
+  );
+  await expect(page.locator('[data-testid="sidebar-footer-bottom-line"]:visible')).toHaveCSS(
+    "border-top-width",
+    "0px",
+  );
+  const separator = page.locator('[data-testid="sidebar-footer-separator"]:visible');
+  await expect(separator).toHaveCount(shown ? 1 : 0);
+  expect(
+    await separator.evaluateAll((elements) =>
+      elements.map((element) => getComputedStyle(element).borderBottomWidth),
+    ),
+  ).toEqual(shown ? ["1px"] : []);
+}
+
+export async function hoverFooterAddProject(page: Page): Promise<void> {
+  await page.locator('[data-testid="sidebar-add-project"]:visible').hover();
+  const tooltip = page.getByTestId("sidebar-add-project-tooltip");
+  await expect(tooltip.getByText("Add project", { exact: true })).toBeVisible();
+  await expect(tooltip.getByText("Ctrl+O", { exact: true })).toBeVisible();
+}
+
+export async function footerScreenshot(page: Page, name: string): Promise<void> {
+  const directory = process.env.PASEO_QA_SCREENSHOT_DIR;
+  if (!directory) return;
+  await page.waitForTimeout(600);
+  await page.addStyleTag({ content: ".__expo_fast_refresh { display: none !important; }" });
+  await page.screenshot({ path: path.join(directory, `${name}.png`) });
+}
diff --git a/packages/app/e2e/support/helpers/sidebar.ts b/packages/app/e2e/support/helpers/sidebar.ts
index c2afc34ef8..1909b4f31b 100644
--- a/packages/app/e2e/support/helpers/sidebar.ts
+++ b/packages/app/e2e/support/helpers/sidebar.ts
@@ -53,6 +53,37 @@ export async function showWorkspaceHoverCard(page: Page, workspaceId: string): P
   await expect(page.getByTestId("workspace-hover-card")).toBeVisible();
 }
 
+export async function movePointerAwayFromWorkspaceHoverCard(page: Page): Promise<void> {
+  // Two moves, so the pointer always moves even when it is already parked here.
+  await page.mouse.move(1200, 200, { steps: 5 });
+  await page.mouse.move(1200, 400, { steps: 5 });
+}
+
+export async function focusWorkspaceRowWithKeyboard(
+  page: Page,
+  workspaceId: string,
+): Promise<void> {
+  const row = page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`);
+  await row.focus();
+  await page.keyboard.press("Shift+Tab");
+  await page.keyboard.press("Tab");
+  await expect(row).toBeFocused();
+}
+
+export async function expectWorkspaceHoverCardOpen(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-hover-card")).toBeVisible();
+}
+
+export async function expectWorkspaceHoverCardStaysOpen(page: Page): Promise<void> {
+  // Longer than the hover card's close grace period.
+  await page.waitForTimeout(300);
+  await expectWorkspaceHoverCardOpen(page);
+}
+
+export async function expectWorkspaceHoverCardClosed(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-hover-card")).toHaveCount(0);
+}
+
 export async function closeWorkspaceContextMenu(page: Page, workspaceId: string): Promise<void> {
   const workspaceKey = `${getServerId()}:${workspaceId}`;
   await page.getByTestId(`sidebar-workspace-context-menu-${workspaceKey}-backdrop`).click();
diff --git a/packages/app/e2e/support/helpers/startup-dsl.ts b/packages/app/e2e/support/helpers/startup-dsl.ts
index dc65b63e08..19dbeecdd0 100644
--- a/packages/app/e2e/support/helpers/startup-dsl.ts
+++ b/packages/app/e2e/support/helpers/startup-dsl.ts
@@ -163,7 +163,6 @@ class StartupAssertions {
     await expect(hostRow).toBeVisible({ timeout: 15_000 });
     await expect(hostRow).toContainText(input.label);
     await expect(this.page.getByTestId("sidebar-add-project")).toBeVisible();
-    await expect(this.page.getByTestId("sidebar-import-session")).toBeVisible();
     await expect(this.page.getByTestId("sidebar-settings")).toBeVisible();
     await expect(this.page.getByTestId("welcome-screen")).toHaveCount(0);
     return this;
diff --git a/packages/app/e2e/support/helpers/streaming-markdown.ts b/packages/app/e2e/support/helpers/streaming-markdown.ts
new file mode 100644
index 0000000000..e628d80471
--- /dev/null
+++ b/packages/app/e2e/support/helpers/streaming-markdown.ts
@@ -0,0 +1,102 @@
+import { holdAssistantStream } from "./agent-timeline-gate";
+import { expect, type Page, type TestInfo } from "@playwright/test";
+import { openAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+
+interface StreamingMarkdownAgent extends MockAgentWorkspace {
+  stream: Awaited<ReturnType<typeof holdAssistantStream>>;
+}
+
+export async function withStreamingMarkdown(
+  page: Page,
+  testInfo: TestInfo,
+  run: (agent: StreamingMarkdownAgent) => Promise<void>,
+): Promise<void> {
+  testInfo.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "streaming-markdown-",
+    title: "Streaming Markdown",
+    featureValues: {
+      mockStreamingAssistantResponse:
+        "**Bold text stays bold** and [Paseo docs](https://example.com/documentation). Done.",
+      mockStreamingAssistantIntervalMs: 400,
+    },
+  });
+  const stream = await holdAssistantStream(page, agent.agentId);
+  try {
+    await openAgentRoute(page, agent);
+    await stream.waitForInitialTimeline();
+    await run({ ...agent, stream });
+  } finally {
+    stream.release();
+    await agent.cleanup();
+  }
+}
+
+export async function requestStreamingMarkdown(agent: StreamingMarkdownAgent): Promise<void> {
+  await agent.client.sendAgentMessage(agent.agentId, "Show the formatted streaming response.");
+  // Exercise late assertions: the producer finishes before the browser consumes its frames.
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+  // The mock splits "**Bold" into two frames. Whether they land in one store
+  // commit or two is up to the browser's task scheduling, and word pacing only
+  // releases a word once the whitespace after it has arrived, so stop after
+  // that whitespace: every batching then reveals "Bold" and nothing past "text".
+  await agent.stream.showThrough("**Bold text");
+}
+
+export async function expectUnfinishedBold(page: Page): Promise<void> {
+  const message = page.getByTestId("assistant-message").last();
+  const bold = message.locator('[data-paseo-markdown-tag="strong"]');
+  await expect(bold).toContainText("Bold");
+  await expect(message).not.toContainText("stays bold");
+  await expect(bold).toHaveCSS("font-weight", "500");
+  await expect(message).not.toContainText("*");
+}
+
+export async function expectUnfinishedLink(
+  page: Page,
+  agent: StreamingMarkdownAgent,
+  testInfo: TestInfo,
+): Promise<void> {
+  const message = page.getByTestId("assistant-message").last();
+  await agent.stream.showThrough("**Bold text stays bold** and [Paseo docs");
+  await expect(message).toContainText("Paseo docs");
+  await expect(message.getByRole("link", { name: "Paseo docs" })).toHaveCount(0);
+  await expect(message).not.toContainText("[");
+  await expect(message).not.toContainText("https:");
+  await captureMarkdown(page, testInfo, "unfinished-link");
+}
+
+export async function expectFinishedMarkdown(
+  page: Page,
+  agent: StreamingMarkdownAgent,
+  testInfo: TestInfo,
+): Promise<void> {
+  agent.stream.release();
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+  await expectCompletedMarkdown(page);
+  await captureMarkdown(page, testInfo, "completed-markdown");
+}
+
+export async function expectReloadedMarkdown(page: Page): Promise<void> {
+  await page.reload({ waitUntil: "domcontentloaded" });
+  await expectCompletedMarkdown(page);
+}
+
+async function captureMarkdown(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  await testInfo.attach(name, {
+    body: await page.screenshot({ path: testInfo.outputPath(`${name}.png`) }),
+    contentType: "image/png",
+  });
+}
+
+async function expectCompletedMarkdown(page: Page): Promise<void> {
+  const message = page.getByTestId("assistant-message").last();
+  await expect(message).toHaveText("Bold text stays bold and Paseo docs. Done.");
+  await expect(
+    message.getByRole("link", { name: "Paseo docs" }).and(message.locator("a")),
+  ).toHaveAttribute("href", "https://example.com/documentation");
+  await expect(message.locator('[data-paseo-markdown-tag="strong"]')).toHaveCSS(
+    "font-weight",
+    "500",
+  );
+}
diff --git a/packages/app/e2e/support/helpers/timeline-delivery.ts b/packages/app/e2e/support/helpers/timeline-delivery.ts
index b843318527..917a5da18f 100644
--- a/packages/app/e2e/support/helpers/timeline-delivery.ts
+++ b/packages/app/e2e/support/helpers/timeline-delivery.ts
@@ -40,6 +40,13 @@ export function observeTimelineSubscriptions(page: Page) {
   });
 
   return {
+    /**
+     * Forget what the daemon acknowledged so far. Use this before a reload, so a wait that
+     * follows can only be satisfied by a subscription the reloaded app actually sent.
+     */
+    reset(): void {
+      acknowledgedAgentIds = null;
+    },
     async waitForSubscribedAgents(
       agentIds: string[],
       options: TimelineSubscriptionWaitOptions = {},
diff --git a/packages/app/e2e/support/helpers/timeline-pagination.ts b/packages/app/e2e/support/helpers/timeline-pagination.ts
index 0cdd34857c..7dd3dca8d7 100644
--- a/packages/app/e2e/support/helpers/timeline-pagination.ts
+++ b/packages/app/e2e/support/helpers/timeline-pagination.ts
@@ -1,4 +1,4 @@
-import { expect, type Page } from "@playwright/test";
+import { expect, type TestInfo, type Page } from "@playwright/test";
 import { buildAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
 import { readReplicaCache } from "./replica-cache-storage";
 import {
@@ -15,6 +15,8 @@ export { holdDaemonHydration };
 
 interface LongTimelineAgentOptions {
   turns: number;
+  /** Live turns stream for ten seconds unless a test needs one that outlasts it. */
+  liveTurns?: "ten-second-stream" | "thirty-minute-stream";
 }
 
 export interface LongTimelineAgent extends MockAgentWorkspace {
@@ -23,6 +25,8 @@ export interface LongTimelineAgent extends MockAgentWorkspace {
   firstOlderPagePrompt: string;
   initialTailAnchorPrompt: string;
   initialTailOldestPrompt: string;
+  /** The newest prompt on the first older page, adjacent to the initial tail. */
+  newestOlderPagePrompt: string;
   oldestPrompt: string;
   newestPrompt: string;
 }
@@ -40,12 +44,6 @@ interface TimelineViewportSnapshot {
   scrollTop: number;
 }
 
-interface PersistedCanonicalTimelineRange {
-  epoch: string;
-  startSeq: number;
-  endSeq: number;
-}
-
 export interface TimelinePresentationSnapshot {
   marker: string;
   position: TimelinePromptPositionSnapshot;
@@ -57,11 +55,6 @@ interface TimelinePromptPositionSnapshot {
   top: number;
 }
 
-interface OlderHistoryLoadingOperation {
-  animationStartTime: number | null;
-  marker: string;
-}
-
 interface OlderHistoryPages {
   expectRequestedPages(count: number): Promise<void>;
   expectSettledWithRequestedPages(count: number): Promise<void>;
@@ -82,7 +75,7 @@ export async function seedLongMockAgentTimeline(
   const agent = await seedMockAgentWorkspace({
     repoPrefix: "timeline-pagination-",
     title: "Timeline pagination regression",
-    model: "ten-second-stream",
+    model: options.liveTurns ?? "ten-second-stream",
   });
 
   for (let index = 0; index < options.turns; index += 1) {
@@ -96,6 +89,7 @@ export async function seedLongMockAgentTimeline(
     firstOlderPagePrompt: promptForTurn(Math.max(0, options.turns - 40)),
     initialTailAnchorPrompt: promptForTurn(Math.max(0, options.turns - 5)),
     initialTailOldestPrompt: promptForTurn(Math.max(0, options.turns - 20)),
+    newestOlderPagePrompt: promptForTurn(Math.max(0, options.turns - 21)),
     oldestPrompt: promptForTurn(0),
     newestPrompt: promptForTurn(options.turns - 1),
   };
@@ -304,34 +298,6 @@ export async function reloadAgentTimelineFromPersistedReplica(
   await expectTimelinePromptVisible(page, agent.newestPrompt);
 }
 
-export async function waitForPersistedCanonicalTimelineRange(
-  page: Page,
-  agentId: string,
-): Promise<PersistedCanonicalTimelineRange> {
-  const readRange = async () => {
-    const cache = await readReplicaCache(page);
-    if (cache?.version !== 6) return null;
-    const range = cache.hosts
-      ?.flatMap((host) => host.timelines)
-      .find((timeline) => timeline.agentId === agentId)?.range;
-    if (
-      typeof range?.epoch !== "string" ||
-      typeof range.startSeq !== "number" ||
-      typeof range.endSeq !== "number"
-    ) {
-      return null;
-    }
-    return { epoch: range.epoch, startSeq: range.startSeq, endSeq: range.endSeq };
-  };
-
-  await expect.poll(readRange).not.toBeNull();
-  const range = await readRange();
-  if (!range) {
-    throw new Error(`Persisted canonical timeline range is missing for ${agentId}`);
-  }
-  return range;
-}
-
 export async function holdNextOlderTimelinePage(
   page: Page,
   agent: LongTimelineAgent,
@@ -402,8 +368,15 @@ export async function expectStableHistoryStartGutter(page: Page): Promise<void>
 export async function scrollTimelinePromptIntoView(page: Page, prompt: string): Promise<void> {
   const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
   const row = timeline.getByTestId("user-message").filter({ hasText: prompt });
-  await row.scrollIntoViewIfNeeded();
-  await expect(row).toBeVisible();
+  const [viewport, target] = await Promise.all([timeline.boundingBox(), row.boundingBox()]);
+  if (!viewport || !target) {
+    throw new Error(`Expected a rendered timeline prompt for ${prompt}`);
+  }
+  // Programmatic scrolling does not express the user's intent to stop following output.
+  await timeline.hover();
+  await page.mouse.wheel(0, target.y - viewport.y - (viewport.height - target.height) / 2);
+  await expect(row).toBeInViewport({ ratio: 1 });
+  await waitForTimelineGeometryToSettle(page);
   await expect
     .poll(async () => (await readTimelineViewport(page)).scrollTop)
     .toBeGreaterThan(HISTORY_START_THRESHOLD_PX);
@@ -450,49 +423,6 @@ export async function expectTimelineViewportAnchoredAfterPrepend(
   expect(Math.abs(contentGrowth - scrollAdjustment)).toBeLessThanOrEqual(2);
 }
 
-export async function rememberOlderHistoryLoadingOperation(
-  page: Page,
-): Promise<OlderHistoryLoadingOperation> {
-  const slot = page.getByTestId("load-older-history-spinner");
-  await expect(slot).toBeVisible();
-  const marker = `older-history-loading-${Date.now()}`;
-  await slot.evaluate((element, operationMarker) => {
-    const candidates = [element, ...Array.from(element.querySelectorAll("*"))];
-    const animated = candidates.find(
-      (candidate) => getComputedStyle(candidate).animationName !== "none",
-    );
-    if (!(animated instanceof HTMLElement)) {
-      throw new Error("Expected the older-history loader to contain an animated element");
-    }
-    animated.dataset.olderHistoryLoadingOperation = operationMarker;
-  }, marker);
-  const animated = page.locator(`[data-older-history-loading-operation="${marker}"]`);
-  await expect
-    .poll(async () => {
-      const startTime = await animated.evaluate((element) => element.getAnimations()[0]?.startTime);
-      return typeof startTime === "number" ? startTime : null;
-    })
-    .not.toBeNull();
-  const animationStartTime = await animated.evaluate((element) => {
-    const startTime = element.getAnimations()[0]?.startTime;
-    return typeof startTime === "number" ? startTime : null;
-  });
-  return { animationStartTime, marker };
-}
-
-export async function expectSameOlderHistoryLoadingOperation(
-  page: Page,
-  operation: OlderHistoryLoadingOperation,
-): Promise<void> {
-  const animated = page.locator(`[data-older-history-loading-operation="${operation.marker}"]`);
-  await expect(animated).toBeVisible();
-  const animationStartTime = await animated.evaluate((element) => {
-    const startTime = element.getAnimations()[0]?.startTime;
-    return typeof startTime === "number" ? startTime : null;
-  });
-  expect(animationStartTime).toBe(operation.animationStartTime);
-}
-
 export async function expectTimelineAtHistoryStart(page: Page): Promise<void> {
   await expect
     .poll(async () => (await readTimelineViewport(page)).scrollTop)
@@ -644,3 +574,58 @@ async function waitForTimelineGeometryToSettle(page: Page): Promise<void> {
       }),
   );
 }
+
+function spokenTimelinePrompt(text: string): string {
+  return `<spoken-input>\n${text}\n</spoken-input>\n<instruction>This message was spoken by the user. Respond using the speak tool only, not normal messages, because the user may not be looking at the chat.</instruction>`;
+}
+
+export async function expectSpokenTimelinePrompt(page: Page, text: string): Promise<void> {
+  await expectTimelinePromptVisible(page, text);
+  const row = page.getByTestId("user-message").filter({ hasText: text });
+  await expect(row).not.toContainText("<spoken-input>");
+  await expect(row).not.toContainText("<instruction>");
+  await expect(row).not.toContainText("This message was spoken by the user.");
+}
+
+export async function sendSpokenTimelinePrompt(
+  agent: MockAgentWorkspace,
+  text: string,
+): Promise<void> {
+  await agent.client.sendAgentMessage(agent.agentId, spokenTimelinePrompt(text));
+  await agent.client.waitForFinish(agent.agentId, 15_000);
+}
+
+export async function withSpokenTimeline(
+  historyText: string,
+  run: (agent: MockAgentWorkspace) => Promise<void>,
+): Promise<void> {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "spoken-timeline-",
+    title: "Spoken timeline presentation",
+    initialPrompt: spokenTimelinePrompt(historyText),
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await run(agent);
+  } finally {
+    await agent.cleanup();
+  }
+}
+
+export async function reloadSpokenTimeline(page: Page): Promise<void> {
+  await page.reload();
+}
+
+export async function captureSpokenTimeline(
+  page: Page,
+  testInfo: TestInfo,
+  size: "desktop" | "compact",
+): Promise<void> {
+  await page.setViewportSize(
+    size === "compact" ? { width: 390, height: 844 } : { width: 1280, height: 900 },
+  );
+  await testInfo.attach(`spoken-${size}-web`, {
+    body: await page.screenshot({ path: testInfo.outputPath(`spoken-${size}-web.png`) }),
+    contentType: "image/png",
+  });
+}
diff --git a/packages/app/e2e/support/helpers/timeline-resume.ts b/packages/app/e2e/support/helpers/timeline-resume.ts
index 73c921776c..d8926013b2 100644
--- a/packages/app/e2e/support/helpers/timeline-resume.ts
+++ b/packages/app/e2e/support/helpers/timeline-resume.ts
@@ -6,6 +6,7 @@ import { expectReconnectingToastGone, expectReconnectingToastVisible } from "./w
 type DaemonWebSocketGate = Awaited<ReturnType<typeof installDaemonWebSocketGate>>;
 
 export interface TimelineRequestCounts {
+  agentId?: string;
   after: number;
   tail: number;
 }
@@ -33,10 +34,14 @@ export async function commitTimelineTurnsWhileDisconnected(
   };
 }
 
-export function rememberTimelineRequestCounts(gate: DaemonWebSocketGate): TimelineRequestCounts {
+export function rememberTimelineRequestCounts(
+  gate: DaemonWebSocketGate,
+  agentId?: string,
+): TimelineRequestCounts {
   return {
-    after: gate.getTimelineRequestCount("after"),
-    tail: gate.getTimelineRequestCount("tail"),
+    agentId,
+    after: gate.getTimelineRequestCount("after", agentId),
+    tail: gate.getTimelineRequestCount("tail", agentId),
   };
 }
 
@@ -44,16 +49,16 @@ export function expectOneResumeCheckWithoutTail(
   gate: DaemonWebSocketGate,
   before: TimelineRequestCounts,
 ): void {
-  expect(gate.getTimelineRequestCount("after") - before.after).toBe(1);
-  expect(gate.getTimelineRequestCount("tail") - before.tail).toBe(0);
+  expect(gate.getTimelineRequestCount("after", before.agentId) - before.after).toBe(1);
+  expect(gate.getTimelineRequestCount("tail", before.agentId) - before.tail).toBe(0);
 }
 
 export function expectResumeOverflowFallsBackToOneTail(
   gate: DaemonWebSocketGate,
   before: TimelineRequestCounts,
 ): void {
-  expect(gate.getTimelineRequestCount("after") - before.after).toBe(1);
-  expect(gate.getTimelineRequestCount("tail") - before.tail).toBe(1);
+  expect(gate.getTimelineRequestCount("after", before.agentId) - before.after).toBe(1);
+  expect(gate.getTimelineRequestCount("tail", before.agentId) - before.tail).toBe(1);
 }
 
 export async function disconnectViewedTimeline(
@@ -71,6 +76,8 @@ export async function restoreViewedTimelineWithHeldResponse(
   gate.holdNextServerMessage("fetch_agent_timeline_response");
   gate.restore();
   await gate.waitForHeldServerMessage();
-  gate.releaseHeldServerMessage();
   await expectReconnectingToastGone(page);
+  await expect(page.getByRole("alert").filter({ hasText: "Updating messages" })).toBeVisible();
+  gate.releaseHeldServerMessage();
+  await expect(page.getByRole("alert").filter({ hasText: "Updating messages" })).toHaveCount(0);
 }
diff --git a/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
new file mode 100644
index 0000000000..01055ce2c1
--- /dev/null
+++ b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
@@ -0,0 +1,537 @@
+import { writeFile } from "node:fs/promises";
+import { createServer } from "node:http";
+import { expect, type Page, type TestInfo } from "@playwright/test";
+import { seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+import { openAgentTimeline, expectTimelinePromptVisible } from "./timeline-pagination";
+
+export const scrollCadences = [
+  { name: "slow", delta: 160, intervalMs: 50, steps: 1000 },
+  { name: "medium", delta: 480, intervalMs: 32, steps: 400 },
+  { name: "fast", delta: 1200, intervalMs: 16, steps: 180 },
+] as const;
+
+type Cadence = (typeof scrollCadences)[number];
+interface RowFrame {
+  id: string;
+  top: number;
+  height: number;
+}
+export interface ScrollFrame {
+  at: number;
+  scrollTop: number;
+  scrollHeight: number;
+  viewportHeight: number;
+  virtualized: boolean;
+  loading: boolean;
+  rows: RowFrame[];
+  anchor: string | null;
+  wheelTotal: number;
+  lastWheelAt: number;
+  inputFinishedAt: number | null;
+  imageLoads: number;
+  mounted: number;
+  unmounted: number;
+}
+interface Recording {
+  frames: ScrollFrame[];
+  finishInput(): void;
+  stop(): void;
+}
+interface TimelinePage {
+  direction: string;
+  count: number;
+  hasOlder: boolean;
+  at: number;
+}
+
+/** Real HTTP image responses, with intrinsic dimensions unavailable until the response arrives. */
+export async function withVariedTimeline(
+  run: (agent: MockAgentWorkspace, newestPrompt: string) => Promise<void>,
+): Promise<void> {
+  const timers = new Set<ReturnType<typeof setTimeout>>();
+  const server = createServer((request, response) => {
+    const portrait = request.url?.includes("portrait");
+    const timer = setTimeout(
+      () => {
+        timers.delete(timer);
+        response.writeHead(200, {
+          "Content-Type": "image/svg+xml",
+          "Cache-Control": "no-store",
+          "Access-Control-Allow-Origin": "*",
+        });
+        response.end(
+          `<svg xmlns="http://www.w3.org/2000/svg" width="${portrait ? 320 : 960}" height="${portrait ? 640 : 240}"><rect width="100%" height="100%" fill="${portrait ? "#936" : "#369"}"/><text x="20" y="50" fill="white" font-size="24">Delayed ${portrait ? "portrait" : "landscape"}</text></svg>`,
+        );
+      },
+      portrait ? 900 : 350,
+    );
+    timers.add(timer);
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("Image server did not listen");
+  const imageUrl = `http://127.0.0.1:${address.port}`;
+  let agent: MockAgentWorkspace | undefined;
+  try {
+    agent = await seedMockAgentWorkspace({
+      repoPrefix: "timeline-scroll-smoothness-",
+      title: "Varied timeline scroll reproduction",
+      featureValues: {
+        mockAssistantResponses: Array.from({ length: 70 }, (_, turn) =>
+          [
+            `## Review of turn ${turn}`,
+            "A short response followed by blocks with different heights. Read the comparison, inspect the screenshot, and continue to the next turn.",
+            "| Component | Observation | Next step |\n| --- | --- | --- |\n| Pagination | Older turns arrive together | Keep the visible text anchored |\n| Images | Intrinsic sizes arrive later | Preserve the reading position |\n| Virtualization | Estimated heights become measured heights | Keep wheel input moving upward |",
+            `![Delayed landscape](${imageUrl}/${turn}/landscape.svg)`,
+            "```typescript\nconst viewport = { top: 0, height: 800 };\nfor (const row of history) {\n  inspect(row, viewport);\n}\n```",
+            "> Keep reading while content above the viewport changes.",
+            "- Short item\n- A longer item that wraps when the available width is smaller and adds another height variation\n- Final item",
+            `![Delayed portrait](${imageUrl}/${turn}/portrait.svg)`,
+            "Review complete. The next prompt starts a separate turn.",
+          ].join("\n\n"),
+        ),
+      },
+    });
+    for (let turn = 0; turn < 70; turn += 1) {
+      await agent.client.sendAgentMessage(
+        agent.agentId,
+        `Review turn ${turn}. ${"Compare the image and table with the earlier result. ".repeat(1 + (turn % 4))}`,
+      );
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    }
+    await run(
+      agent,
+      `Review turn 69. ${"Compare the image and table with the earlier result. ".repeat(2)}`,
+    );
+  } finally {
+    await agent?.cleanup();
+    for (const timer of timers) clearTimeout(timer);
+    server.closeAllConnections();
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+}
+
+export function observeTimelinePages(page: Page, agentId: string): TimelinePage[] {
+  const pages: TimelinePage[] = [];
+  page.on("websocket", (socket) => {
+    socket.on("framereceived", ({ payload }) => {
+      const envelope = JSON.parse(String(payload));
+      const message = envelope.message;
+      if (message?.type !== "fetch_agent_timeline_response" || message.payload.agentId !== agentId)
+        return;
+      pages.push({
+        direction: message.payload.direction,
+        count: message.payload.entries.length,
+        hasOlder: message.payload.hasOlder,
+        at: Date.now(),
+      });
+    });
+  });
+  return pages;
+}
+
+export async function openOnlyTimelineTail(
+  page: Page,
+  agent: MockAgentWorkspace,
+  newestPrompt: string,
+  pages: TimelinePage[],
+): Promise<void> {
+  await page.addInitScript(() => Reflect.set(globalThis, "__PASEO_RENDER_PROFILE_ENABLED__", true));
+  await openAgentTimeline(page, agent);
+  await expectTimelinePromptVisible(page, newestPrompt.trim());
+  await expect
+    .poll(() => pages.filter((entry) => entry.direction === "tail").length)
+    .toBeGreaterThanOrEqual(1);
+
+  expect(pages[0]).toMatchObject({ direction: "tail", hasOlder: true });
+  expect(pages[0].count).toBe(40);
+  expect(pages.filter((entry) => entry.direction === "tail")).toHaveLength(1);
+  expect(
+    pages.filter((entry) => entry.direction === "after").every((entry) => entry.count === 0),
+  ).toBe(true);
+  await expect(page.getByText(/^Review turn 0\./)).toHaveCount(0);
+  // Start each cadence after the tail's initial image loads and bottom anchoring.
+  await page.waitForTimeout(1500);
+  expect(pages.filter((entry) => entry.direction === "before")).toHaveLength(0);
+}
+
+export async function recordUpwardTraversal(
+  page: Page,
+  cadence: Cadence,
+  testInfo: TestInfo,
+): Promise<ScrollFrame[]> {
+  const stopTrace = await traceScrollIfRequested(page, testInfo, cadence);
+  const timeline = page.getByTestId("agent-chat-scroll");
+  await timeline.hover();
+  await timeline.evaluate((viewport) => {
+    const scroll = viewport as HTMLElement;
+    const frames: ScrollFrame[] = [];
+    let frame = 0;
+    let wheelTotal = 0;
+    let lastWheelAt = -Infinity;
+    let inputFinishedAt: number | null = null;
+    let imageLoads = 0;
+    let mounted = scroll.querySelectorAll("[data-history-row-id]").length;
+    let unmounted = 0;
+    const collectRows = (node: Node, rows: Set<Element>) => {
+      if (!(node instanceof Element)) return;
+      if (node.matches("[data-history-row-id]")) rows.add(node);
+      for (const row of node.querySelectorAll("[data-history-row-id]")) rows.add(row);
+    };
+    const recordMutations = (records: MutationRecord[]) => {
+      // A newly inserted container and its children can both appear in one
+      // delivery. Count each DOM row once, including rows removed before paint.
+      const added = new Set<Element>();
+      const removed = new Set<Element>();
+      for (const record of records) {
+        for (const node of record.addedNodes) collectRows(node, added);
+        for (const node of record.removedNodes) collectRows(node, removed);
+      }
+      mounted += added.size;
+      unmounted += removed.size;
+    };
+    const mutations = new MutationObserver(recordMutations);
+    mutations.observe(scroll, { childList: true, subtree: true });
+    const wheel = (event: WheelEvent) => {
+      wheelTotal += -event.deltaY;
+      lastWheelAt = performance.now();
+    };
+    const imageLoad = (event: Event) => {
+      if (event.target instanceof HTMLImageElement) imageLoads += 1;
+    };
+    scroll.addEventListener("wheel", wheel, { passive: true });
+    scroll.addEventListener("load", imageLoad, true);
+    const observed = new Set<Element>();
+    const capture = (replaceLast: boolean) => {
+      const rect = scroll.getBoundingClientRect();
+      const elements = Array.from(scroll.querySelectorAll<HTMLElement>("[data-history-row-id]"));
+      const current = new Set<Element>([scroll, ...elements]);
+      if (scroll.firstElementChild) current.add(scroll.firstElementChild);
+      for (const element of observed) {
+        if (!current.has(element)) {
+          resizeObserver.unobserve(element);
+          observed.delete(element);
+        }
+      }
+      for (const element of current) {
+        if (!observed.has(element)) {
+          resizeObserver.observe(element);
+          observed.add(element);
+        }
+      }
+      const rows = elements.map((row) => {
+        const box = row.getBoundingClientRect();
+        return { id: row.dataset.historyRowId!, top: box.top - rect.top, height: box.height };
+      });
+      // Include rows mounted and removed in the same commit, before sampling.
+      recordMutations(mutations.takeRecords());
+      // Preserve the row crossing the reading line. Rows below an expanding
+      // visible image legitimately move even when the reading position is stable.
+      const anchor = rows.find((row) => row.top < rect.height && row.top + row.height > 8);
+      const snapshot: ScrollFrame = {
+        at: performance.now(),
+        scrollTop: scroll.scrollTop,
+        scrollHeight: scroll.scrollHeight,
+        viewportHeight: rect.height,
+        rows,
+        anchor: anchor?.id ?? null,
+        virtualized: scroll.id.includes("virtualized"),
+        loading: !!scroll.querySelector('[data-testid="load-older-history-spinner"]'),
+        wheelTotal,
+        lastWheelAt,
+        inputFinishedAt,
+        imageLoads,
+        mounted,
+        unmounted,
+      };
+      if (replaceLast && frames.length > 0) frames[frames.length - 1] = snapshot;
+      else frames.push(snapshot);
+    };
+    // rAF precedes ResizeObserver. Refresh that frame after resize delivery so
+    // it represents the final layout, not geometry repaired before the paint.
+    const resizeObserver = new ResizeObserver(() => capture(true));
+    const sample = () => {
+      capture(false);
+      frame = requestAnimationFrame(sample);
+    };
+    const recording: Recording = {
+      frames,
+      finishInput() {
+        inputFinishedAt = performance.now();
+      },
+      stop() {
+        cancelAnimationFrame(frame);
+        resizeObserver.disconnect();
+        mutations.disconnect();
+        scroll.removeEventListener("wheel", wheel);
+        scroll.removeEventListener("load", imageLoad, true);
+      },
+    };
+    Reflect.set(window, "__timelineScrollRecording", recording);
+    const reset = Reflect.get(window, "__PASEO_RESET_RENDER_PROFILE__");
+    if (typeof reset === "function") reset();
+    sample();
+  });
+  // No settling between inputs: exercise wheel input overlapping prepend and measurement.
+  for (let step = 0; step < cadence.steps; step += 1) {
+    await page.mouse.wheel(0, -cadence.delta);
+    await page.waitForTimeout(cadence.intervalMs);
+  }
+  await page.evaluate(() => {
+    (Reflect.get(window, "__timelineScrollRecording") as Recording).finishInput();
+  });
+  await page.waitForTimeout(1500);
+  await stopTrace();
+  return page.evaluate(() => {
+    const recording = Reflect.get(window, "__timelineScrollRecording") as Recording;
+    recording.stop();
+    return recording.frames;
+  });
+}
+
+export function findScrollJumps(frames: ScrollFrame[]) {
+  return frames.flatMap((current, index) => {
+    const previous = frames[index - 1];
+    if (!previous?.anchor) return [];
+    // Wheel input can move the reading line onto an image before it expands.
+    // Follow that intended row, not text now below the image.
+    const recent = frames.findLast((frame) => frame.at <= previous.at - 100);
+    const wheelBudget = current.wheelTotal - (recent?.wheelTotal ?? 0);
+    const frameScroll = Math.max(0, previous.scrollTop - current.scrollTop);
+    const availableScroll = Math.min(frameScroll, wheelBudget, previous.scrollTop);
+    const readingLine = 8 - availableScroll;
+    const currentRows = new Map(current.rows.map((row) => [row.id, row]));
+    const intendedRow = previous.rows.find((row) => row.top + row.height > readingLine);
+    const anchor = previous.anchor;
+    const before = currentRows.has(anchor)
+      ? previous.rows.find((row) => row.id === anchor)!
+      : previous.rows
+          .filter((row) => currentRows.has(row.id))
+          .sort((left, right) => Math.abs(left.top - 8) - Math.abs(right.top - 8))[0];
+    if (!before) {
+      throw new Error(`No shared reading geometry between frames ${index - 1} and ${index}`);
+    }
+    const after = currentRows.get(before.id)!;
+    const movement = after.top - before.top;
+    // A busy main thread can deliver wheel movement hundreds of milliseconds
+    // after its event. Only assert idle stability after the driver stops input.
+    const idle = current.inputFinishedAt !== null && previous.at - current.inputFinishedAt > 250;
+    // Wheel events can precede their scroll update, or include input already
+    // applied in earlier frames. Locate the reader with this frame's scroll,
+    // bounded by recent input. Growth below it can move the old anchor without
+    // moving the reading line.
+    const readerFollowsInput =
+      intendedRow &&
+      currentRows.has(intendedRow.id) &&
+      Math.abs(currentRows.get(intendedRow.id)!.top - intendedRow.top - availableScroll) <= 32;
+    const enteredRowGrowth = readerFollowsInput
+      ? previous.rows.reduce((growth, row) => {
+          if (row.top < intendedRow.top || row.top >= before.top) return growth;
+          const height = currentRows.get(row.id)?.height ?? row.height;
+          return growth + Math.max(0, height - row.height);
+        }, 0)
+      : 0;
+    const excessForward = movement > wheelBudget + enteredRowGrowth + 32;
+    // Upward wheel input moves the same text DOWN the viewport. A negative move
+    // is a reversal, independent of legitimate scrollTop compensation on prepend.
+    if (movement >= -8 && (!idle || Math.abs(movement) <= 8) && !excessForward) return [];
+    return [
+      {
+        frame: index,
+        at: current.at,
+        row: before.id,
+        movement,
+        idle,
+        excessForward,
+        resizedRows: current.rows.flatMap((row) => {
+          const old = previous.rows.find((candidate) => candidate.id === row.id);
+          return old && old.height !== row.height
+            ? [{ id: row.id, before: old.height, after: row.height }]
+            : [];
+        }),
+        loading: current.loading || previous.loading,
+        virtualized: current.virtualized,
+        heightChange: current.scrollHeight - previous.scrollHeight,
+        imageLoads: current.imageLoads - previous.imageLoads,
+        frameGapMs: current.at - previous.at,
+      },
+    ];
+  });
+}
+
+export async function reportScrollJumps(
+  page: Page,
+  testInfo: TestInfo,
+  frames: ScrollFrame[],
+  pages: TimelinePage[],
+): Promise<void> {
+  const jumps = findScrollJumps(frames);
+  const react = await page.evaluate(() => Reflect.get(window, "__PASEO_RENDER_PROFILE__") ?? []);
+  const gaps = frames
+    .slice(1)
+    .map((frame, index) => frame.at - frames[index].at)
+    .sort((a, b) => a - b);
+  const summary = {
+    browserTimeOrigin: await page.evaluate(() => performance.timeOrigin),
+    frames: frames.length,
+    pages,
+    jumpCount: jumps.length,
+    worstReversePx: Math.max(0, ...jumps.map((jump) => -jump.movement)),
+    frameGapP95Ms: gaps[Math.floor(gaps.length * 0.95)],
+    frameGapMaxMs: gaps.at(-1),
+    imageLoads: frames[frames.length - 1].imageLoads,
+    mounted: frames[frames.length - 1].mounted,
+    unmounted: frames[frames.length - 1].unmounted,
+    jumps,
+  };
+  await writeFile(testInfo.outputPath("scroll-summary.json"), JSON.stringify(summary, null, 2));
+  await writeFile(testInfo.outputPath("scroll-frames.json"), JSON.stringify(frames));
+  await writeFile(testInfo.outputPath("scroll-react-profile.json"), JSON.stringify(react));
+  await testInfo.attach("scroll-summary", {
+    body: JSON.stringify(summary, null, 2),
+    contentType: "application/json",
+  });
+  await testInfo.attach("scroll-frames", {
+    body: JSON.stringify(frames),
+    contentType: "application/json",
+  });
+  await testInfo.attach("scroll-react-profile", {
+    body: JSON.stringify(react),
+    contentType: "application/json",
+  });
+  await attachTimelineScreenshot(page, testInfo, "scroll-end");
+  console.log(
+    `[scroll] ${testInfo.title}: ${JSON.stringify({ ...summary, jumps: jumps.slice(0, 5) })}`,
+  );
+  expect(
+    pages.filter((entry) => entry.direction === "before").length,
+    "must exercise multiple older pages",
+  ).toBeGreaterThanOrEqual(2);
+  expect(
+    frames.some((frame) => frame.virtualized),
+    "must exercise virtualization",
+  ).toBe(true);
+  expect(summary.imageLoads, "must exercise image completion during traversal").toBeGreaterThan(0);
+  expect(
+    summary.mounted - summary.unmounted,
+    "row counters must balance against the final DOM",
+  ).toBe(frames[frames.length - 1].rows.length);
+  const uniqueRows = new Set(frames.flatMap((frame) => frame.rows.map((row) => row.id))).size;
+  expect(
+    summary.mounted,
+    "prepending must not mount a discarded range before correcting the viewport",
+  ).toBeLessThanOrEqual(uniqueRows * 1.25);
+  expect(
+    jumps,
+    "visible text must not reverse direction while scrolling upward or move after input stops",
+  ).toEqual([]);
+}
+
+async function traceScrollIfRequested(
+  page: Page,
+  testInfo: TestInfo,
+  cadence: Cadence,
+): Promise<() => Promise<void>> {
+  if (process.env.PASEO_TIMELINE_SCROLL_TRACE !== cadence.name) return async () => {};
+  const cdp = await page.context().newCDPSession(page);
+  await cdp.send("Tracing.start", {
+    categories:
+      "devtools.timeline,v8.execute,blink.user_timing,disabled-by-default-v8.cpu_profiler",
+    transferMode: "ReturnAsStream",
+  });
+  return async () => {
+    const completed = new Promise<string>((resolve) => {
+      cdp.once("Tracing.tracingComplete", ({ stream }) => resolve(stream!));
+    });
+    await cdp.send("Tracing.end");
+    const stream = await completed;
+    const chunks: string[] = [];
+    for (;;) {
+      const chunk = await cdp.send("IO.read", { handle: stream });
+      chunks.push(chunk.base64Encoded ? Buffer.from(chunk.data, "base64").toString() : chunk.data);
+      if (chunk.eof) break;
+    }
+    await cdp.send("IO.close", { handle: stream });
+    await cdp.detach();
+    const path = testInfo.outputPath("scroll-chromium-trace.json");
+    await writeFile(path, chunks.join(""));
+    await testInfo.attach("scroll-chromium-trace", { path, contentType: "application/json" });
+  };
+}
+
+/** Hold real image bytes until the reader has reached its placeholder. */
+export async function expectImageSpaceReserved(page: Page, testInfo: TestInfo): Promise<void> {
+  let released = false;
+  const pending = new Set<() => void>();
+  const server = createServer((_request, response) => {
+    const send = () => {
+      response.writeHead(200, { "Content-Type": "image/svg+xml", "Cache-Control": "no-store" });
+      response.end(
+        '<svg xmlns="http://www.w3.org/2000/svg" width="240" height="160"><rect width="240" height="160" fill="#369"/></svg>',
+      );
+    };
+    if (released) send();
+    else pending.add(send);
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  try {
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Image server did not listen");
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "reserved-timeline-image-",
+      title: "Reserved image geometry",
+      featureValues: {
+        mockAssistantResponses: [
+          `Before the image.\n\n![Reserved image](http://127.0.0.1:${address.port}/image.svg)\n\nText below the image.`,
+        ],
+      },
+    });
+    try {
+      await agent.client.sendAgentMessage(agent.agentId, "Show the delayed image");
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, "Show the delayed image");
+      const image = page.getByRole("img", { name: "Reserved image" }).first();
+      await expect(image).toBeVisible();
+      const before = await image.boundingBox();
+      await attachTimelineScreenshot(page, testInfo, "image-placeholder");
+      released = true;
+      for (const send of pending) send();
+      await expect
+        .poll(() =>
+          image.evaluate((element) => {
+            const img =
+              element instanceof HTMLImageElement ? element : element.querySelector("img");
+            return img?.naturalWidth;
+          }),
+        )
+        .toBe(240);
+      await expect
+        .poll(async () => {
+          const box = await image.boundingBox();
+          return box ? Math.round((box.width / box.height) * 100) : 0;
+        })
+        .toBe(150);
+      const after = await image.boundingBox();
+      await attachTimelineScreenshot(page, testInfo, "image-loaded");
+      expect(before?.height, "reserve the final image height before the HTTP response").toBe(
+        after?.height,
+      );
+    } finally {
+      await agent.cleanup();
+    }
+  } finally {
+    server.closeAllConnections();
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+}
+
+async function attachTimelineScreenshot(
+  page: Page,
+  testInfo: TestInfo,
+  name: string,
+): Promise<void> {
+  const path = testInfo.outputPath(`${name}.png`);
+  await page.getByTestId("agent-chat-scroll").screenshot({ path });
+  await testInfo.attach(name, { path, contentType: "image/png" });
+}
diff --git a/packages/app/e2e/support/helpers/usage-login.ts b/packages/app/e2e/support/helpers/usage-login.ts
new file mode 100644
index 0000000000..6129f0259e
--- /dev/null
+++ b/packages/app/e2e/support/helpers/usage-login.ts
@@ -0,0 +1,137 @@
+import { cp, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { UsageReport } from "@getpaseo/protocol/messages";
+import { expect, type Page } from "@playwright/test";
+import { expectPinnedUsage, pinRow, usageItem } from "./usage-sidebar-item";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { pluginRequirements } from "./plugin-fixture";
+
+/** A real store-backed plugin on the worker's isolated daemon. */
+type LoginReports = Array<{ harness: string; report: UsageReport }>;
+
+export async function installLoginUsage(initialReport: UsageReport | LoginReports) {
+  const directory = await mkdtemp(path.join(tmpdir(), "usage-login-journey-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  const store = path.join(directory, "report.json");
+  const setReport = (report: UsageReport | LoginReports) =>
+    writeFile(store, JSON.stringify(report));
+  const cleanup = async () => {
+    try {
+      await client.removePlugin("login-journey");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    } finally {
+      await client.close();
+      await rm(directory, { recursive: true, force: true });
+    }
+  };
+  try {
+    await setReport(initialReport);
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "login-journey", requirements: pluginRequirements }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+import {readFile} from "node:fs/promises";
+import {z} from "zod";
+export default function contribute(server) {
+  const read = async () => {
+    const value = JSON.parse(await readFile(${JSON.stringify(store)}, "utf8"));
+    return Array.isArray(value) ? value : [{harness: "Claude", report: value}];
+  };
+  server.registerUsageSource({id: "login-journey", label: "Claude", input: z.object({index: z.number()}),
+    discover: async () => (await read()).map((login, index) => ({key: "account", harness: login.harness, input: {index}})),
+    fetch: async ({index}) => (await read())[index].report,
+  });
+  return () => {};
+}`,
+    );
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installPluginSource({ source: directory });
+    return { setReport, cleanup };
+  } catch (error) {
+    await cleanup();
+    throw error;
+  }
+}
+
+export async function refreshLoginUsage(page: Page) {
+  await page.getByRole("button", { name: "Refresh Claude", exact: true }).click();
+}
+
+export async function hoverUsageWindow(page: Page, window: string) {
+  await page
+    .getByRole("checkbox", { name: new RegExp(`^Pin Claude ${window}, `) })
+    .getByTestId(/usage-pin-glyph-/)
+    .hover();
+}
+
+/** Exercises the built-in Codex adapter through the real plugin loader and daemon transport. */
+export async function installCodexWindowUsage(payload: unknown) {
+  const directory = await mkdtemp(path.join(tmpdir(), "usage-codex-windows-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  const cleanup = async () => {
+    try {
+      await client.removePlugin("codex-window-qa");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    } finally {
+      await client.close();
+      await rm(directory, { recursive: true, force: true });
+    }
+  };
+  try {
+    const source = path.resolve(__dirname, "../../../../../plugins/codex-usage-source");
+    await cp(path.join(source, "server"), path.join(directory, "server"), { recursive: true });
+    await cp(path.join(source, "shared"), path.join(directory, "shared"), { recursive: true });
+    await writeFile(
+      path.join(directory, "auth.json"),
+      JSON.stringify({ tokens: { access_token: "fixture-codex" } }),
+    );
+    await writeFile(path.join(directory, "payload.json"), JSON.stringify(payload));
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "codex-window-qa", requirements: pluginRequirements }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+import {readFile} from "node:fs/promises";
+import {fetchUsage, discover} from "./server/usage.js";
+import {inputSchema} from "./shared/input.js";
+export default function contribute(server) {
+  server.registerUsageSource({id: "codex-window-qa", label: "Codex", input: inputSchema,
+    discover: (scope) => discover(scope, {home: ${JSON.stringify(directory)}, env: {CODEX_HOME: ${JSON.stringify(directory)}}}),
+    fetch: (input) => fetchUsage(input, async () => Response.json(JSON.parse(await readFile(${JSON.stringify(path.join(directory, "payload.json"))}, "utf8")))),
+  });
+  return () => {};
+}`,
+    );
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installPluginSource({ source: directory });
+    return { cleanup };
+  } catch (error) {
+    await cleanup();
+    throw error;
+  }
+}
+
+export async function expectCodexReportedWindows(page: Page, shape: "seven-day-only" | "Spark") {
+  await expectPinnedUsage(page, ["11% wk"]);
+  await expect(pinRow(page.locator("body"), "Codex", "Weekly")).toBeChecked();
+  await expect(page.getByText("Session", { exact: true })).toHaveCount(0);
+  if (shape === "Spark") {
+    const fiveHour = pinRow(page.locator("body"), "Codex", "GPT-5.3-Codex-Spark · 5-hour");
+    const weekly = pinRow(page.locator("body"), "Codex", "GPT-5.3-Codex-Spark · Weekly");
+    await expect(fiveHour).not.toBeChecked();
+    await expect(weekly).not.toBeChecked();
+    await fiveHour.click();
+    await expect(fiveHour).toBeChecked();
+    await expect(usageItem(page)).toHaveAccessibleName(
+      /Codex Weekly 11% used, Codex GPT-5.3-Codex-Spark · 5-hour 0% used/,
+    );
+  }
+}
diff --git a/packages/app/e2e/support/helpers/usage-reports.ts b/packages/app/e2e/support/helpers/usage-reports.ts
new file mode 100644
index 0000000000..86b74c6ea3
--- /dev/null
+++ b/packages/app/e2e/support/helpers/usage-reports.ts
@@ -0,0 +1,242 @@
+import type { Page } from "@playwright/test";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { daemonWsRoutePattern, wsRoutePatternForPort } from "./daemon-port";
+
+export interface UsageListRequest {
+  forceRefresh: boolean;
+  reportIds?: string[];
+  agentId?: string;
+}
+
+export interface UsageReportsFixture {
+  listRequests(): UsageListRequest[];
+  waitForListRequests(count: number): Promise<void>;
+}
+
+interface UsageReportsFixtureOptions {
+  /**
+   * Successive `usage.list_reports` responses; the last one repeats. `{ error }` fails that
+   * request; a function builds the response from the request when it arrives (e.g. a fresh
+   * `fetchedAt`, or a different answer to a forced refresh).
+   */
+  lists?: Array<UsageListResponse | ((request: UsageListRequest) => UsageListResponse)>;
+  /**
+   * False simulates a host with no usage reporting capability. A function is read each time the
+   * app connects, so a reload can switch it.
+   */
+  usageSupported?: boolean | (() => boolean);
+  /** Released hosts expose provider.usage.list with no source icons. */
+  providerUsageListOnly?: boolean;
+  /** The host daemon's port; defaults to the E2E daemon. */
+  port?: number;
+}
+
+/**
+ * A list of reports, a request error, or a stream: reports sent in order, where a promise holds
+ * the rest of the stream and the response until it settles, like a slow source.
+ */
+export type UsageListResponse =
+  | UsageReportEntry[]
+  | { error: string }
+  | { stream: Array<UsageReportEntry | Promise<unknown>> };
+
+type WebSocketMessage = string | Buffer;
+
+function parseJson(message: WebSocketMessage): unknown {
+  const raw = typeof message === "string" ? message : message.toString("utf8");
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+
+function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
+  const envelope = parseJson(message) as { type?: unknown; message?: unknown } | null;
+  if (!envelope || envelope.type !== "session" || typeof envelope.message !== "object") {
+    return null;
+  }
+  return envelope.message as Record<string, unknown>;
+}
+
+function withUsageSupportFeature(
+  message: WebSocketMessage,
+  enabled: boolean,
+  providerUsageListOnly: boolean,
+): string | null {
+  const envelope = parseJson(message) as {
+    type?: unknown;
+    message?: { type?: unknown; payload?: Record<string, unknown> };
+  } | null;
+  const payload = envelope?.message?.payload;
+  if (
+    envelope?.type !== "session" ||
+    envelope.message?.type !== "status" ||
+    payload?.status !== "server_info"
+  ) {
+    return null;
+  }
+  const features =
+    typeof payload.features === "object" && payload.features !== null ? payload.features : {};
+  return JSON.stringify({
+    ...envelope,
+    message: {
+      ...envelope.message,
+      payload: {
+        ...payload,
+        features: {
+          ...features,
+          usageSources: enabled && !providerUsageListOnly,
+          providerUsageList: enabled,
+        },
+      },
+    },
+  });
+}
+
+function pick<T>(values: T[], index: number): T {
+  const value = values[Math.min(index, values.length - 1)];
+  if (value === undefined) throw new Error("Usage fixture requires at least one response.");
+  return value;
+}
+
+function createCounter() {
+  let count = 0;
+  const waiters: Array<{ count: number; resolve: () => void }> = [];
+  return {
+    increment() {
+      count += 1;
+      for (const waiter of waiters.splice(0)) {
+        if (count >= waiter.count) waiter.resolve();
+        else waiters.push(waiter);
+      }
+    },
+    waitFor(target: number): Promise<void> {
+      if (count >= target) return Promise.resolve();
+      return new Promise((resolve) => waiters.push({ count: target, resolve }));
+    },
+  };
+}
+
+export async function installUsageReportsFixture(
+  page: Page,
+  options: UsageReportsFixtureOptions,
+): Promise<UsageReportsFixture> {
+  const listRequests: UsageListRequest[] = [];
+  const listCounter = createCounter();
+  const usageSupported = options.usageSupported ?? true;
+  const isUsageSupported = () =>
+    typeof usageSupported === "function" ? usageSupported() : usageSupported;
+  const providerUsageListOnly = options.providerUsageListOnly ?? false;
+  const requestType = providerUsageListOnly
+    ? "provider.usage.list.request"
+    : "usage.list_reports.request";
+
+  const route =
+    options.port === undefined ? daemonWsRoutePattern() : wsRoutePatternForPort(`${options.port}`);
+  await page.routeWebSocket(route, (ws) => {
+    const server = ws.connectToServer();
+
+    ws.onMessage((message) => {
+      const request = getSessionMessage(message);
+      const requestId = request?.requestId;
+      if (request?.type === requestType && typeof requestId === "string") {
+        const listRequest: UsageListRequest = {
+          forceRefresh: request.forceRefresh === true,
+          reportIds: Array.isArray(request.reportIds) ? (request.reportIds as string[]) : undefined,
+          agentId: typeof request.agentId === "string" ? request.agentId : undefined,
+        };
+        listRequests.push(listRequest);
+        const scripted = pick(options.lists ?? [[]], listRequests.length - 1);
+        const response = typeof scripted === "function" ? scripted(listRequest) : scripted;
+        if ("error" in response) {
+          ws.send(
+            JSON.stringify({
+              type: "session",
+              message: providerUsageListOnly
+                ? {
+                    type: "rpc_error",
+                    payload: { requestId, requestType, error: response.error, code: "transport" },
+                  }
+                : {
+                    type: "usage.list_reports.response",
+                    payload: { requestId, error: response.error },
+                  },
+            }),
+          );
+          listCounter.increment();
+          return;
+        }
+        const sendUpdate = (report: UsageReportEntry) =>
+          ws.send(
+            JSON.stringify({
+              type: "session",
+              message: { type: "usage.list_reports.update", payload: { requestId, report } },
+            }),
+          );
+        if ("stream" in response) {
+          void (async () => {
+            for (const item of response.stream) {
+              if (item instanceof Promise) await item;
+              else sendUpdate(item);
+            }
+            ws.send(
+              JSON.stringify({
+                type: "session",
+                message: {
+                  type: "usage.list_reports.response",
+                  payload: { requestId, error: null },
+                },
+              }),
+            );
+            listCounter.increment();
+          })();
+          return;
+        }
+        const ids = Array.isArray(request.reportIds) ? request.reportIds : null;
+        const reports = ids ? response.filter((entry) => ids.includes(entry.id)) : response;
+        if (!providerUsageListOnly) {
+          for (const report of reports) sendUpdate(report);
+        }
+        const reply = providerUsageListOnly
+          ? {
+              type: "provider.usage.list.response",
+              payload: {
+                requestId,
+                fetchedAt: new Date().toISOString(),
+                providers: reports.map((entry) => ({
+                  providerId: entry.sourceId,
+                  displayName: entry.sourceLabel,
+                  fetchedAt: entry.fetchedAt,
+                  status: entry.report.status,
+                  windows: entry.report.status === "available" ? entry.report.windows : [],
+                  balances: entry.report.status === "available" ? entry.report.balances : undefined,
+                  details: entry.report.status === "available" ? entry.report.details : undefined,
+                  planLabel:
+                    entry.report.status === "available" ? (entry.report.planLabel ?? null) : null,
+                  error: entry.report.status === "error" ? entry.report.error : null,
+                })),
+              },
+            }
+          : { type: "usage.list_reports.response", payload: { requestId, error: null } };
+        ws.send(JSON.stringify({ type: "session", message: reply }));
+        listCounter.increment();
+        return;
+      }
+      server.send(message);
+    });
+
+    server.onMessage((message) => {
+      const serverInfo =
+        typeof message === "string"
+          ? withUsageSupportFeature(message, isUsageSupported(), providerUsageListOnly)
+          : null;
+      ws.send(serverInfo ?? message);
+    });
+  });
+
+  return {
+    listRequests: () => [...listRequests],
+    waitForListRequests: (count) => listCounter.waitFor(count),
+  };
+}
diff --git a/packages/app/e2e/support/helpers/usage-sidebar-item.ts b/packages/app/e2e/support/helpers/usage-sidebar-item.ts
new file mode 100644
index 0000000000..8cc3c07a00
--- /dev/null
+++ b/packages/app/e2e/support/helpers/usage-sidebar-item.ts
@@ -0,0 +1,295 @@
+import { readFileSync } from "node:fs";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { expect, type Locator, type Page } from "@playwright/test";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { pluginRequirements } from "./plugin-fixture";
+import { waitForSettledPosition } from "./sheet-layout";
+
+/** Real usage-source plugin; its long report makes the Usage modal scroll. */
+export async function installTallUsageSource() {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-tall-usage-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  const cleanup = async () => {
+    try {
+      await client.removePlugin("tall-usage");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    } finally {
+      await client.close();
+      await rm(directory, { recursive: true, force: true });
+    }
+  };
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({
+        id: "tall-usage",
+        requirements: pluginRequirements,
+      }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+import { z } from "zod";
+export default function contribute(server) {
+  server.registerUsageSource({
+    id: "tall-usage", label: "Scrolling account", input: z.object({}),
+    discover: async () => [{key: "scrolling-account", input: {}}],
+    fetch: async () => ({ status: "available", windows: Array.from({ length: 20 }, (_, i) => ({
+      id: String(i), label: "Window " + (i + 1), usedPct: 25,
+    })) }),
+  });
+  return () => {};
+}
+`,
+    );
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installPluginSource({ source: directory });
+    return { cleanup };
+  } catch (error) {
+    await cleanup();
+    throw error;
+  }
+}
+
+const PLUGINS_DIR = path.resolve(__dirname, "../../../../../plugins");
+
+function sourceIcon(plugin: string): string {
+  return readFileSync(path.join(PLUGINS_DIR, plugin, "icon.svg"), "utf8");
+}
+
+function inOneDay(): string {
+  return new Date(Date.now() + 24 * 60 * 60_000).toISOString();
+}
+
+/** Claude and Codex reports shaped like the built-in sources report them. */
+export function claudeAndCodexReports(): UsageReportEntry[] {
+  const fetchedAt = new Date().toISOString();
+  return [
+    {
+      id: "claude:default",
+      account: { label: "dev@example.com" },
+      fetchedAt,
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      icon: sourceIcon("claude-usage-source"),
+      report: {
+        status: "available",
+        planLabel: "Max",
+        windows: [
+          {
+            id: "five_hour",
+            label: "Session",
+            shortLabel: "5h",
+            summary: true,
+            usedPct: 31,
+            resetsAt: inOneDay(),
+          },
+          {
+            id: "weekly",
+            label: "Weekly",
+            shortLabel: "wk",
+            summary: true,
+            usedPct: 54,
+            resetsAt: inOneDay(),
+          },
+        ],
+      },
+    },
+    {
+      id: "codex:default",
+      account: { label: "dev@example.com" },
+      fetchedAt,
+      sourceId: "codex",
+      sourceLabel: "Codex",
+      icon: sourceIcon("codex-usage-source"),
+      report: {
+        status: "available",
+        planLabel: "Pro",
+        windows: [
+          {
+            id: "session",
+            label: "Session",
+            shortLabel: "5h",
+            summary: true,
+            usedPct: 7,
+            resetsAt: inOneDay(),
+          },
+          {
+            id: "weekly",
+            label: "Weekly",
+            shortLabel: "wk",
+            summary: true,
+            usedPct: 12,
+            resetsAt: inOneDay(),
+          },
+        ],
+      },
+    },
+  ];
+}
+
+/** The first visible match: the shell keeps a compact copy of the sidebar mounted. */
+function visible(page: Page, testID: string): Locator {
+  return page.locator(`[data-testid="${testID}"]:visible`).first();
+}
+
+/** The sidebar footer's Usage item: each summary window with data. */
+export function usageItem(page: Page): Locator {
+  return visible(page, "sidebar-usage");
+}
+
+/** The Usage modal's body: a dialog on wide layouts, a bottom sheet on compact ones. */
+export function usageModal(page: Page): Locator {
+  return visible(page, "usage-modal-body");
+}
+
+/** Each pinned window as it reads: its percent and short label, "31% 5h". */
+export async function expectPinnedUsage(page: Page, windows: string[]): Promise<void> {
+  const pinned = usageItem(page).getByTestId("sidebar-usage-pinned-window");
+  await expect(pinned).toHaveText(windows);
+}
+
+/** Without a summary window with data the footer has no Usage item, only the Usage icon. */
+export async function expectNoUsageItem(page: Page): Promise<void> {
+  await expect(page.locator('[data-testid="sidebar-usage"]:visible')).toHaveCount(0);
+  await expect(page.locator('[data-testid="sidebar-usage-icon"]:visible')).toBeVisible();
+}
+
+/** A window row, which is itself the pin toggle: "Claude", "Session". */
+export function pinRow(scope: Locator, source: string, window: string): Locator {
+  // The row's label goes on with its percent and reset: "Pin Claude Session, 31% · resets in 2h".
+  return scope.getByRole("checkbox", { name: new RegExp(`^Pin ${source} ${window}, `) });
+}
+
+/**
+ * A report card whose window rows do not pin: no pin toggle, no pin glyph, and nothing focusable
+ * but buttons, so no row presses or highlights on hover.
+ */
+export async function expectUnpinnableRows(card: Locator): Promise<void> {
+  await expect(card.getByRole("checkbox")).toHaveCount(0);
+  await expect(card.locator('[data-testid^="usage-pin-"]')).toHaveCount(0);
+  const focusable = await card
+    .locator("[tabindex]")
+    .evaluateAll((nodes) => nodes.filter((node) => node.getAttribute("role") !== "button").length);
+  expect(focusable).toBe(0);
+}
+
+export async function togglePin(scope: Locator, source: string, window: string) {
+  const row = pinRow(scope, source, window);
+  const pinned = await row.isChecked();
+  await row.click();
+  await expect(row).toBeChecked({ checked: !pinned });
+}
+
+/**
+ * The footer's Usage icon, which is there whether or not the Usage item is on. On a phone the
+ * sidebar drawer has to be open.
+ */
+export async function openUsageFromIcon(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Usage", exact: true }).click({ timeout: 30_000 });
+  await expect(usageModal(page)).toBeVisible();
+}
+
+/** The footer's Usage item, its summary of pinned windows. */
+export async function openUsageFromItem(page: Page): Promise<void> {
+  await usageItem(page).click();
+  await expect(usageModal(page)).toBeVisible();
+}
+
+/** Scrolls the Usage modal's body with the mouse wheel, as a user does. */
+export async function scrollUsage(page: Page, deltaY: number): Promise<void> {
+  const body = await usageModal(page).boundingBox();
+  const viewport = page.viewportSize();
+  if (!body || !viewport) throw new Error("Usage must be open before scrolling it.");
+  // The middle of the part of the body on screen; the body itself runs past the viewport.
+  const top = Math.max(body.y, 0);
+  const bottom = Math.min(body.y + body.height, viewport.height);
+  await page.mouse.move(body.x + body.width / 2, (top + bottom) / 2);
+  await page.mouse.wheel(0, deltaY);
+}
+
+/** The modal's own Close button. */
+export async function closeUsage(page: Page): Promise<void> {
+  await visible(page, "usage-modal").getByRole("button", { name: "Close", exact: true }).click();
+  await expect(usageModal(page)).toHaveCount(0);
+}
+
+/** A tap on the backdrop above the bottom sheet. */
+export async function closeUsageFromBackdrop(page: Page): Promise<void> {
+  const sheet = usageModal(page);
+  await waitForSettledPosition(sheet);
+  const bounds = await visible(page, "usage-modal").boundingBox();
+  if (!bounds) throw new Error("Usage must be open before closing it.");
+  await page.mouse.click(bounds.x + bounds.width / 2, bounds.y / 2);
+  await expect(sheet).toHaveCount(0);
+}
+
+function summaryInSidebarSwitch(page: Page): Locator {
+  return page.getByRole("switch", { name: "Summary in sidebar", exact: true });
+}
+
+/** Turns the sidebar Usage summary on or off from the Usage modal's Settings. */
+export async function setSummaryInSidebar(page: Page, on: boolean): Promise<void> {
+  await openUsageOptions(page);
+  await summaryInSidebarSwitch(page).click();
+  await expectSummaryInSidebar(page, on);
+}
+
+export async function expectSummaryInSidebar(page: Page, on: boolean): Promise<void> {
+  await openUsageOptions(page);
+  await expect(summaryInSidebarSwitch(page)).toBeChecked({ checked: on });
+  await closeUsageOptions(page);
+}
+
+/** Open the cog's settings popover or compact sheet. */
+export async function openUsageOptions(page: Page): Promise<void> {
+  if (!(await visible(page, "usage-display-used").isVisible())) {
+    await visible(page, "usage-options-menu").click();
+  }
+  await expect(visible(page, "usage-display-used")).toBeVisible();
+}
+
+export function usageOptionsSurface(page: Page): Locator {
+  return page
+    .locator(
+      '[data-testid="usage-options-surface"]:visible, [data-testid="usage-options-surface-content"]:visible',
+    )
+    .first();
+}
+
+export async function expectUsageOptionsFitContent(page: Page): Promise<void> {
+  await waitForSettledPosition(usageOptionsSurface(page));
+  const surface = await usageOptionsSurface(page).boundingBox();
+  const fields = await page.getByTestId("usage-options-fields").boundingBox();
+  if (!surface || !fields) throw new Error("Settings must be visible before measuring its fit.");
+  expect(surface.y + surface.height - (fields.y + fields.height)).toBeLessThanOrEqual(10);
+}
+
+export async function closeUsageOptions(page: Page): Promise<void> {
+  await waitForSettledPosition(usageOptionsSurface(page));
+  await page.mouse.click(0, 0);
+  await expect(page.getByTestId("usage-display-used")).toHaveCount(0);
+}
+
+export async function showUsageAs(page: Page, displayAs: "used" | "remaining") {
+  await openUsageOptions(page);
+  await visible(page, `usage-display-${displayAs}`).click();
+  await expect(visible(page, `usage-display-${displayAs}`)).toHaveAttribute(
+    "aria-selected",
+    "true",
+  );
+  await closeUsageOptions(page);
+}
+
+export async function refreshAllUsage(page: Page): Promise<void> {
+  await visible(page, "usage-refresh-all").click();
+}
+
+/** Opens the compact sidebar drawer. */
+export async function openCompactSidebar(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Open menu", exact: true }).first().click();
+}
diff --git a/packages/app/e2e/support/helpers/versioned-host-daemon.ts b/packages/app/e2e/support/helpers/versioned-host-daemon.ts
new file mode 100644
index 0000000000..ee281a322f
--- /dev/null
+++ b/packages/app/e2e/support/helpers/versioned-host-daemon.ts
@@ -0,0 +1,176 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import net from "node:net";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { getAvailableHostDaemonPort } from "./isolated-host-daemon";
+import { killProcessTree, spawnTsx } from "./spawn-node";
+
+const VERSIONED_DAEMON_ENTRYPOINT = path.resolve(
+  __dirname,
+  "../../../../server/src/server/test-utils/versioned-daemon.ts",
+);
+
+const READY_TIMEOUT_MS = 30_000;
+
+// A host daemon that can be replaced by a daemon reporting another version under the same
+// endpoint and serverId, the way an upgraded host comes back.
+export interface RestartableHostDaemon {
+  serverId: string;
+  port: number;
+  stop(): Promise<void>;
+  restartWithVersion(version: string): Promise<void>;
+  dispose(): Promise<void>;
+}
+
+export async function startRestartableHostDaemon(version: string): Promise<RestartableHostDaemon> {
+  const paseoHomeRoot = await mkdtemp(path.join(tmpdir(), "paseo-e2e-restartable-host-"));
+  const port = await getAvailableHostDaemonPort();
+  let current: VersionedHostDaemon | null = null;
+  async function dispose(): Promise<void> {
+    await current?.stop();
+    current = null;
+    await rm(paseoHomeRoot, { recursive: true, force: true });
+  }
+  try {
+    current = await startVersionedHostDaemon({ version, port, paseoHomeRoot });
+  } catch (error) {
+    await dispose();
+    throw error;
+  }
+  const { serverId } = current;
+
+  return {
+    serverId,
+    port,
+    async stop() {
+      await current?.stop();
+      current = null;
+      await waitForPortReleased(port);
+    },
+    async restartWithVersion(nextVersion) {
+      await current?.stop();
+      current = null;
+      await waitForPortReleased(port);
+      current = await startVersionedHostDaemon({ version: nextVersion, port, paseoHomeRoot });
+      if (current.serverId !== serverId) {
+        throw new Error(
+          `Restarted host daemon reported serverId ${current.serverId}, expected ${serverId}`,
+        );
+      }
+    },
+    dispose,
+  };
+}
+
+interface VersionedHostDaemon {
+  serverId: string;
+  port: number;
+  version: string;
+  stop(): Promise<void>;
+}
+
+interface VersionedHostDaemonOptions {
+  version: string;
+  port: number;
+  paseoHomeRoot: string;
+}
+
+// Starts the versioned test daemon on an explicit port with a caller-owned PASEO_HOME. The caller
+// removes the home root.
+async function startVersionedHostDaemon(
+  options: VersionedHostDaemonOptions,
+): Promise<VersionedHostDaemon> {
+  const child = spawnTsx(
+    VERSIONED_DAEMON_ENTRYPOINT,
+    [options.version, String(options.port), options.paseoHomeRoot],
+    { stdio: ["ignore", "pipe", "pipe", "ipc"] },
+  );
+  const ready = Promise.withResolvers<{ port: number; serverId: string }>();
+  let output = "";
+  child.stdout?.on("data", (chunk: Buffer) => {
+    output += chunk.toString("utf8");
+  });
+  child.stderr?.on("data", (chunk: Buffer) => {
+    output += chunk.toString("utf8");
+  });
+  child.once("error", ready.reject);
+  child.once("exit", () => {
+    ready.reject(
+      new Error(`Versioned daemon ${options.version} exited before reporting ready:\n${output}`),
+    );
+  });
+  child.once("message", (message) => {
+    if (!isReadyMessage(message)) {
+      ready.reject(new Error("Invalid versioned daemon startup message"));
+      return;
+    }
+    ready.resolve(message);
+  });
+  const timeout = setTimeout(
+    () =>
+      ready.reject(
+        new Error(
+          `Versioned daemon ${options.version} did not report ready within ${READY_TIMEOUT_MS}ms:\n${output}`,
+        ),
+      ),
+    READY_TIMEOUT_MS,
+  );
+
+  let stopped = false;
+  async function stop(): Promise<void> {
+    if (stopped) return;
+    stopped = true;
+    await killProcessTree(child);
+  }
+
+  try {
+    const readyMessage = await ready.promise;
+    if (readyMessage.port !== options.port) {
+      throw new Error(
+        `Versioned daemon ${options.version} bound port ${readyMessage.port}, expected ${options.port}`,
+      );
+    }
+    return {
+      serverId: readyMessage.serverId,
+      port: readyMessage.port,
+      version: options.version,
+      stop,
+    };
+  } catch (error) {
+    await stop();
+    throw error;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+// A replacement daemon can only bind the port the stopped daemon just released.
+async function waitForPortReleased(port: number, timeoutMs = 15_000): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await isPortAvailable(port)) return;
+    await new Promise((resolve) => setTimeout(resolve, 50));
+  }
+  throw new Error(`Port ${port} was not released within ${timeoutMs}ms`);
+}
+
+function isReadyMessage(message: unknown): message is { port: number; serverId: string } {
+  return (
+    typeof message === "object" &&
+    message !== null &&
+    "port" in message &&
+    typeof message.port === "number" &&
+    "serverId" in message &&
+    typeof message.serverId === "string"
+  );
+}
+
+function isPortAvailable(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    server.once("error", () => resolve(false));
+    server.listen(port, "127.0.0.1", () => {
+      server.close(() => resolve(true));
+    });
+  });
+}
diff --git a/packages/app/e2e/support/helpers/workspace-layout.ts b/packages/app/e2e/support/helpers/workspace-layout.ts
new file mode 100644
index 0000000000..8fbc893f5f
--- /dev/null
+++ b/packages/app/e2e/support/helpers/workspace-layout.ts
@@ -0,0 +1,63 @@
+import type { Page } from "@playwright/test";
+import { z } from "zod";
+import { WorkspaceLayoutPersistedStateSchema } from "../../../src/stores/workspace-layout-storage";
+import {
+  buildWorkspaceTabPersistenceKey,
+  type WorkspaceTab,
+} from "../../../src/workspace-tabs/model";
+import { getServerId } from "./server-id";
+
+/** Seed the reported hidden Explorer-only layout with 2,250 saved agent draft tabs. */
+export async function seedCorruptedWorkspaceLayout(page: Page, workspaceId: string): Promise<void> {
+  const raw = await page.evaluate(() => localStorage.getItem("workspace-layout-state"));
+  if (raw === null) throw new Error("Explorer fixture: workspace layout was not persisted");
+  const stored = z
+    .strictObject({
+      state: WorkspaceLayoutPersistedStateSchema,
+      version: z.number().int().nonnegative().optional(),
+    })
+    .parse(JSON.parse(raw), {
+      error: () => "Explorer fixture: invalid persisted workspace layout",
+    });
+  const key = buildWorkspaceTabPersistenceKey({ serverId: getServerId(), workspaceId });
+  if (!key || !Object.hasOwn(stored.state.layoutByWorkspace, key)) {
+    throw new Error(`Explorer fixture: no persisted layout for workspace ${workspaceId}`);
+  }
+  const tabs: WorkspaceTab[] = [
+    { tabId: "files", target: { kind: "files" }, createdAt: 1 },
+    { tabId: "changes_tree", target: { kind: "changes_tree" }, createdAt: 1 },
+    ...Array.from(
+      { length: 2250 },
+      (_, index): WorkspaceTab => ({
+        tabId: `draft_saved_${index}`,
+        target: { kind: "draft", draftId: `draft_saved_${index}` },
+        createdAt: index + 2,
+      }),
+    ),
+  ];
+  const corruptedLayout = {
+    root: {
+      kind: "pane",
+      pane: {
+        id: "pane_generated_report_equivalent",
+        hidden: true,
+        tabIds: tabs.map((tab) => tab.tabId),
+        tabs,
+        focusedTabId: tabs[tabs.length - 1].tabId,
+      },
+    },
+    focusedPaneId: null,
+  };
+  stored.state = WorkspaceLayoutPersistedStateSchema.parse({
+    ...stored.state,
+    layoutByWorkspace: { ...stored.state.layoutByWorkspace, [key]: corruptedLayout },
+    explorerPaneIdByWorkspace: {
+      ...stored.state.explorerPaneIdByWorkspace,
+      [key]: "pane_generated_report_equivalent",
+    },
+  });
+  await page.evaluate(
+    (value) => localStorage.setItem("workspace-layout-state", value),
+    JSON.stringify(stored),
+  );
+}
diff --git a/packages/app/e2e/support/helpers/workspace-recovery.ts b/packages/app/e2e/support/helpers/workspace-recovery.ts
new file mode 100644
index 0000000000..17c90fddb3
--- /dev/null
+++ b/packages/app/e2e/support/helpers/workspace-recovery.ts
@@ -0,0 +1,38 @@
+import { expect, type Page } from "@playwright/test";
+import { openChangesPanel } from "./branch-switcher";
+
+export async function restoreArchivedWorkspace(page: Page): Promise<void> {
+  await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await page.getByRole("button", { name: "Restore", exact: true }).click();
+  await expect(page.getByText("Workspace archived", { exact: true })).toHaveCount(0, {
+    timeout: 30_000,
+  });
+}
+
+export async function restoreWorkspaceFromHistory(
+  page: Page,
+  serverId: string,
+  agentId: string,
+): Promise<void> {
+  // History rows have no unique accessible name; their stable ID identifies the session.
+  await page.getByTestId(`agent-row-${serverId}-${agentId}`).click();
+  await restoreArchivedWorkspace(page);
+}
+
+export async function expectCommittedFile(page: Page, filename: string): Promise<void> {
+  await openChangesPanel(page);
+  await expect(page.getByText(filename, { exact: true }).filter({ visible: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(
+    page.getByText("No changes to display", { exact: true }).filter({ visible: true }),
+  ).toHaveCount(0);
+}
+
+export async function expectCommittedFileAfterReload(page: Page, filename: string): Promise<void> {
+  await expectCommittedFile(page, filename);
+  await page.reload();
+  await expectCommittedFile(page, filename);
+}
diff --git a/packages/app/e2e/support/helpers/workspace-setup.ts b/packages/app/e2e/support/helpers/workspace-setup.ts
index f990e52e86..ee706d7ad7 100644
--- a/packages/app/e2e/support/helpers/workspace-setup.ts
+++ b/packages/app/e2e/support/helpers/workspace-setup.ts
@@ -20,6 +20,7 @@ type WorkspaceSetupDaemonClient = Pick<
   | "fetchAgents"
   | "fetchWorkspaces"
   | "listTerminals"
+  | "observeEvents"
   | "removeProject"
   | "subscribeRawMessages"
 >;
@@ -35,6 +36,13 @@ export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemo
   const client = await connectDaemonClient<WorkspaceSetupDaemonClient>({
     clientIdPrefix: "workspace-setup",
   });
+  // Establish demand before a caller can launch setup. Client close releases it.
+  try {
+    await client.observeEvents(["workspace_setup_progress"]).ready;
+  } catch (error) {
+    await client.close();
+    throw error;
+  }
   return withProjectOwnership(client);
 }
 
diff --git a/packages/app/e2e/support/helpers/workspace-tabs.ts b/packages/app/e2e/support/helpers/workspace-tabs.ts
index 9477556823..8ddd507563 100644
--- a/packages/app/e2e/support/helpers/workspace-tabs.ts
+++ b/packages/app/e2e/support/helpers/workspace-tabs.ts
@@ -89,7 +89,7 @@ async function openExplorerView(
 ): Promise<void> {
   const explorer = await ensureExplorerSidebar(page);
   const tab = explorer.getByTestId(view.tabTestId);
-  await tab.click();
+  await selectWorkspaceTab(tab);
   await expect(visibleTestId(page, view.contentTestId).first()).toBeVisible({
     timeout: view.timeout ?? 30_000,
   });
@@ -97,7 +97,7 @@ async function openExplorerView(
 
 export async function openChangesTreePanel(page: Page): Promise<void> {
   await openExplorerView(page, {
-    tabTestId: "explorer-sidebar-tab-changes_tree",
+    tabTestId: "workspace-tab-changes_tree",
     contentTestId: "changes-tree-panel",
   });
 }
@@ -117,7 +117,7 @@ export async function openChangesPanel(page: Page, timeout = 30_000): Promise<vo
 
 export async function openFilesPanel(page: Page): Promise<void> {
   await openExplorerView(page, {
-    tabTestId: "explorer-sidebar-tab-files",
+    tabTestId: "workspace-tab-files",
     contentTestId: "file-explorer-tree-scroll",
   });
 }
diff --git a/packages/app/e2e/support/helpers/workspace-ui.ts b/packages/app/e2e/support/helpers/workspace-ui.ts
index 2daa58bf69..fe03ec053c 100644
--- a/packages/app/e2e/support/helpers/workspace-ui.ts
+++ b/packages/app/e2e/support/helpers/workspace-ui.ts
@@ -95,23 +95,66 @@ export async function expectReconnectingToastVisible(
   page: Page,
   options?: { timeout?: number },
 ): Promise<void> {
-  const toast = page.getByTestId("agent-reconnecting-toast");
+  const toast = page.getByRole("alert").filter({ hasText: "Reconnecting to host" });
   await expect(toast).toBeVisible({
     timeout: options?.timeout ?? 30_000,
   });
-  await expect(toast).toHaveText("Reconnecting");
-  await expect(toast.getByTestId("agent-reconnecting-status-dot")).toBeVisible();
+  await expect(toast).toHaveText("Reconnecting to host");
 }
 
 export async function expectReconnectingToastGone(
   page: Page,
   options?: { timeout?: number },
 ): Promise<void> {
-  await expect(page.getByTestId("agent-reconnecting-toast")).toHaveCount(0, {
+  await expect(page.getByRole("alert").filter({ hasText: "Reconnecting to host" })).toHaveCount(0, {
     timeout: options?.timeout ?? 30_000,
   });
 }
 
+declare global {
+  interface Window {
+    __shownPanelToasts?: string[];
+  }
+}
+
+export interface PanelToastLog {
+  /** Test ids of every toast that entered the DOM since recording started, in order. */
+  shown(): Promise<string[]>;
+  expectNeverShown(testId: string): Promise<void>;
+}
+
+/**
+ * Record every toast that enters the DOM from the next navigation onward. A toast can appear
+ * and disappear within a few frames, so a settled `toHaveCount(0)` cannot prove one never showed.
+ */
+export async function recordPanelToasts(page: Page): Promise<PanelToastLog> {
+  await page.addInitScript(() => {
+    const shown: string[] = [];
+    window.__shownPanelToasts = shown;
+    const record = (node: Element) => {
+      if (node.getAttribute("role") !== "alert") return;
+      shown.push(node.getAttribute("data-testid") ?? "");
+    };
+    new MutationObserver((mutations) => {
+      for (const mutation of mutations) {
+        for (const node of mutation.addedNodes) {
+          if (!(node instanceof Element)) continue;
+          record(node);
+          for (const descendant of node.querySelectorAll('[role="alert"]')) record(descendant);
+        }
+      }
+    }).observe(document, { childList: true, subtree: true });
+  });
+
+  const shown = () => page.evaluate(() => window.__shownPanelToasts ?? []);
+  return {
+    shown,
+    async expectNeverShown(testId: string): Promise<void> {
+      expect(await shown()).not.toContain(testId);
+    },
+  };
+}
+
 export async function expectHostConnectingOrOffline(
   page: Page,
   options?: { timeout?: number },
diff --git a/packages/app/e2e/support/helpers/workspace.ts b/packages/app/e2e/support/helpers/workspace.ts
index 23bfc4bf9b..14b31be926 100644
--- a/packages/app/e2e/support/helpers/workspace.ts
+++ b/packages/app/e2e/support/helpers/workspace.ts
@@ -18,12 +18,11 @@ export interface TempDirectory {
 }
 
 /**
- * The temp root for E2E fixtures. On macOS we resolve symlinks (/tmp →
- * /private/tmp) so fixture paths match the daemon's resolved paths; on Windows
- * `/tmp` doesn't exist, so fall back to the OS temp dir.
+ * Honor the OS temp directory (including TMPDIR), resolving symlinks so fixture
+ * paths match the daemon's resolved paths.
  */
 export async function resolveTempRoot(): Promise<string> {
-  return process.platform === "win32" ? tmpdir() : await realpath("/tmp");
+  return await realpath(tmpdir());
 }
 
 async function configureRemote(input: {
diff --git a/packages/app/e2e/support/metro-warmup.mjs b/packages/app/e2e/support/metro-warmup.mjs
new file mode 100644
index 0000000000..558f2cbe82
--- /dev/null
+++ b/packages/app/e2e/support/metro-warmup.mjs
@@ -0,0 +1,26 @@
+/** @param {number} port */
+export async function warmMetro(port) {
+  const origin = `http://127.0.0.1:${port}`;
+  const documentResponse = await fetch(origin, { signal: AbortSignal.timeout(120_000) });
+  if (!documentResponse.ok) {
+    throw new Error(`Metro document warmup failed with HTTP ${documentResponse.status}`);
+  }
+  const document = await documentResponse.text();
+  const scriptSources = [...document.matchAll(/<script[^>]+src=["']([^"']+)["']/g)].map(
+    (match) => match[1],
+  );
+  if (scriptSources.length === 0) {
+    throw new Error("Metro document warmup found no scripts to compile");
+  }
+  for (const source of scriptSources) {
+    const scriptUrl = new URL(source, origin);
+    if (scriptUrl.origin !== origin) continue;
+    const response = await fetch(scriptUrl, { signal: AbortSignal.timeout(120_000) });
+    if (!response.ok) {
+      throw new Error(
+        `Metro bundle warmup failed for ${scriptUrl.pathname}: HTTP ${response.status}`,
+      );
+    }
+    await response.arrayBuffer();
+  }
+}
diff --git a/packages/app/e2e/support/recovery-app.tsx b/packages/app/e2e/support/recovery-app.tsx
new file mode 100644
index 0000000000..4ec02edd26
--- /dev/null
+++ b/packages/app/e2e/support/recovery-app.tsx
@@ -0,0 +1,55 @@
+// Test-only entry: the production recovery boundary and Expo router with failing routes.
+import "../../src/styles/unistyles";
+// oxlint-disable-next-line import/no-unassigned-import -- Match the Metro web entry runtime.
+import "@expo/metro-runtime";
+import { registerRootComponent } from "expo";
+import { Link, Redirect, Stack, type Href } from "expo-router";
+import { useCallback, useState, type ComponentProps } from "react";
+import { Button, Text, View } from "react-native";
+import { RootRouter } from "../../src/root-app";
+
+const screenOptions = { headerShown: false };
+function Layout() {
+  return <Stack screenOptions={screenOptions} />;
+}
+// Fixture routes are absent from Expo's generated production route types.
+function Startup() {
+  return <Redirect href={"/broken" as Href} />;
+}
+function BrokenWorkspace(): never {
+  throw new Error("Workspace recovery fixture");
+}
+function Picker() {
+  return (
+    <View>
+      <Text>Project picker</Text>
+      <Link href={"/healthy" as Href}>Open healthy workspace</Link>
+    </View>
+  );
+}
+function HealthyWorkspace() {
+  const [broken, setBroken] = useState(false);
+  const breakWorkspace = useCallback(() => setBroken(true), []);
+  if (broken) return <BrokenWorkspace />;
+  return (
+    <View>
+      <Text>Healthy workspace</Text>
+      <Button title="Break this workspace" onPress={breakWorkspace} />
+    </View>
+  );
+}
+const screens = {
+  "./_layout.tsx": { default: Layout },
+  "./index.tsx": { default: Startup },
+  "./broken.tsx": { default: BrokenWorkspace },
+  "./open-project.tsx": { default: Picker },
+  "./healthy.tsx": { default: HealthyWorkspace },
+};
+const context: ComponentProps<typeof RootRouter>["context"] = Object.assign(
+  (key: string) => screens[key as keyof typeof screens],
+  { keys: () => Object.keys(screens), resolve: (key: string) => key, id: "recovery-fixture" },
+);
+function RecoveryApp() {
+  return <RootRouter context={context} />;
+}
+registerRootComponent(RecoveryApp);
diff --git a/packages/app/eas.json b/packages/app/eas.json
index 0746c8d9a6..6ec7f248d3 100644
--- a/packages/app/eas.json
+++ b/packages/app/eas.json
@@ -19,7 +19,8 @@
         "APP_VARIANT": "production"
       },
       "android": {
-        "resourceClass": "large"
+        "resourceClass": "large",
+        "gradleCommand": ":app:bundleRelease -x lint -x lintVitalAnalyzeRelease -x lintVitalRelease -x generateReleaseLintModel -x generateReleaseLintVitalModel"
       }
     },
     "production-apk": {
diff --git a/packages/app/index.ts b/packages/app/index.ts
index 060f848a71..82d47bfe8c 100644
--- a/packages/app/index.ts
+++ b/packages/app/index.ts
@@ -1,11 +1,14 @@
-// Polyfill crypto.randomUUID for React Native before any other imports
-import { polyfillCrypto } from "./src/polyfills/crypto";
-polyfillCrypto();
-
-// Polyfill screen.orientation for WebKitGTK desktop runtimes that lack the API.
-import { polyfillScreenOrientation } from "./src/polyfills/screen-orientation";
-polyfillScreenOrientation();
+// Install runtime polyfills before any other module evaluates. Keep this the first import.
+// oxlint-disable-next-line import/no-unassigned-import -- Polyfills install on import.
+import "./src/polyfills/install-early";
 
 // Configure Unistyles before Expo Router pulls in any components using StyleSheet.
 import "./src/styles/unistyles";
-import "expo-router/entry";
+// oxlint-disable-next-line import/no-unassigned-import -- Preserve Expo's entry side effects.
+import "@expo/metro-runtime";
+// oxlint-disable-next-line import/no-unassigned-import -- Preserve Expo's entry side effects.
+import "expo-router/build/fast-refresh";
+import { renderRootComponent } from "expo-router/build/renderRootComponent";
+import { RootApp } from "./src/root-app";
+
+renderRootComponent(RootApp);
diff --git a/packages/app/maestro/sidebar-scroll-retention.yaml b/packages/app/maestro/sidebar-scroll-retention.yaml
new file mode 100644
index 0000000000..f7ded2e617
--- /dev/null
+++ b/packages/app/maestro/sidebar-scroll-retention.yaml
@@ -0,0 +1,53 @@
+appId: sh.paseo.debug
+---
+# Start in a workspace with the sidebar closed. Both workspace IDs come from
+# the connected host: TOP_WORKSPACE is near the top; SCROLLED_WORKSPACE starts
+# below the viewport. The list must remain unchanged throughout the flow.
+- tapOn:
+    id: menu-button
+- scrollUntilVisible:
+    element:
+      id: sidebar-workspace-row-${TOP_WORKSPACE}
+    direction: UP
+    timeout: 60000
+- assertNotVisible:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- scrollUntilVisible:
+    element:
+      id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+    direction: DOWN
+    timeout: 60000
+- waitForAnimationToEnd
+- assertVisible:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- assertNotVisible:
+    id: sidebar-workspace-row-${TOP_WORKSPACE}
+- tapOn:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- waitForAnimationToEnd
+- assertNotVisible:
+    id: sidebar-project-workspace-list-scroll
+- swipe:
+    start: "5%,50%"
+    end: "90%,50%"
+    duration: 300
+- waitForAnimationToEnd
+- assertVisible:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- assertNotVisible:
+    id: sidebar-workspace-row-${TOP_WORKSPACE}
+
+# Selecting the current workspace removes workspace switching as a cause.
+# Reopening by button removes horizontal movement as a cause.
+- tapOn:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- waitForAnimationToEnd
+- tapOn:
+    id: menu-button
+- waitForAnimationToEnd
+- assertVisible:
+    id: sidebar-workspace-row-${SCROLLED_WORKSPACE}
+- assertNotVisible:
+    id: sidebar-workspace-row-${TOP_WORKSPACE}
+- tapOn:
+    id: sidebar-close
diff --git a/packages/app/metro.config.cjs b/packages/app/metro.config.cjs
index e26fa04c32..c1fdbdef77 100644
--- a/packages/app/metro.config.cjs
+++ b/packages/app/metro.config.cjs
@@ -1,12 +1,10 @@
 const { getDefaultConfig } = require("expo/metro-config");
 const { resolve } = require("metro-resolver");
-const fs = require("fs");
 const path = require("path");
 
 const projectRoot = __dirname;
 const appNodeModulesRoot = path.resolve(projectRoot, "node_modules");
 const appSrcRoot = path.resolve(projectRoot, "src");
-const relaySrcRoot = path.resolve(projectRoot, "../relay/src");
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
 const fdroidModuleOverrides = {
   "expo-camera": path.resolve(appSrcRoot, "fdroid/expo-camera.tsx"),
@@ -81,15 +79,6 @@ config.resolver.resolveRequest = (context, moduleName, platform) => {
     return resolveWithCustomWebOverlay(context, fdroidModuleOverrides[moduleName], platform);
   }
 
-  const origin = context.originModulePath;
-  if (origin && origin.startsWith(relaySrcRoot) && moduleName.endsWith(".js")) {
-    const tsModuleName = moduleName.replace(/\.js$/, ".ts");
-    const candidatePath = path.resolve(path.dirname(origin), tsModuleName);
-    if (fs.existsSync(candidatePath)) {
-      return resolveWithCustomWebOverlay(context, tsModuleName, platform);
-    }
-  }
-
   return resolveWithCustomWebOverlay(context, moduleName, platform);
 };
 
diff --git a/packages/app/modules/paseo-diff-prototype/.gitignore b/packages/app/modules/paseo-diff-prototype/.gitignore
new file mode 100644
index 0000000000..d80969eb27
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/.gitignore
@@ -0,0 +1,2 @@
+/android/.cxx/
+/android/build/
diff --git a/packages/app/modules/paseo-diff-prototype/README.md b/packages/app/modules/paseo-diff-prototype/README.md
new file mode 100644
index 0000000000..f872033889
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/README.md
@@ -0,0 +1,35 @@
+# Native diff layout experiment
+
+Android-only Expo module for evaluating background wrapped-text layout. The normal
+diff surface does not call this module; it still uses the JavaScript model and
+renderer. This is a checkpoint of the layout experiment, not a replacement renderer.
+
+The C++ core owns cell text and wrapped grapheme geometry. Kotlin/JNI supplies the
+Android font manager and dispatches preparation through Expo's background queue.
+It links the Skia libraries shipped by the installed React Native Skia package.
+An iOS binding, renderer integration, and shipping library ownership are unfinished.
+
+## Diagnostic interface
+
+Access the module through `expo.modules.PaseoDiffPrototype` in a development build:
+
+- `create()` returns a numeric handle.
+- `prepare(handle, texts, widths, family, fontSize)` asynchronously builds geometry
+  and returns counts, copy/layout timings, and a partial geometry allocation estimate.
+  Text and width arrays must have matching lengths. Input is copied; it is not zero-copy.
+- `read(handle, startCell, count)` synchronously returns packed numerical geometry
+  for at most 256 cells. This exists for parity checks, not whole-model transfer.
+- `release(handle)` cancels pending work and releases ownership. Release handles
+  after success or failure; module destruction also cancels and releases all handles.
+
+Each packed cell begins with its index and fragment count. Each fragment contains
+UTF-16 start/end offsets, width, and grapheme count, followed by each grapheme's
+UTF-16 start/end offsets and width. The caller retains source text.
+
+The experiment accepts normalized cell inputs. It does not parse wire payloads,
+construct file/header/review models, apply highlighting, or draw pixels. A renderer
+integration must preserve native ownership and request bounded visible data rather
+than reconstructing the entire JavaScript graph.
+
+Grapheme property ranges are generated at build time from the installed JavaScript
+dependency so segmentation uses the same data as the reference implementation.
diff --git a/packages/app/modules/paseo-diff-prototype/android/CMakeLists.txt b/packages/app/modules/paseo-diff-prototype/android/CMakeLists.txt
new file mode 100644
index 0000000000..1230d875a2
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/android/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.22)
+project(paseo_diff_prototype)
+set(CMAKE_CXX_STANDARD 20)
+execute_process(COMMAND node "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/generate-graphemes.mjs" "${CMAKE_CURRENT_BINARY_DIR}/graphemes.h" COMMAND_ERROR_IS_FATAL ANY)
+
+add_library(paseo_diff_prototype SHARED ../cpp/layout.cpp ../cpp/jni.cpp)
+target_include_directories(paseo_diff_prototype PRIVATE "${SKIA_PACKAGE}/cpp/skia" "${CMAKE_CURRENT_BINARY_DIR}")
+target_compile_definitions(paseo_diff_prototype PRIVATE SK_BUILD_FOR_ANDROID)
+target_compile_options(paseo_diff_prototype PRIVATE -O2 -Wall -Wextra)
+target_link_options(paseo_diff_prototype PRIVATE "-Wl,-z,max-page-size=16384")
+foreach(lib skparagraph skshaper skunicode_core skunicode_icu skia)
+  add_library(${lib} STATIC IMPORTED)
+  set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${SKIA_PACKAGE}/libs/android/${ANDROID_ABI}/lib${lib}.a")
+endforeach()
+target_link_libraries(paseo_diff_prototype PRIVATE skparagraph skshaper skunicode_core skunicode_icu skia android log EGL GLESv2)
diff --git a/packages/app/modules/paseo-diff-prototype/android/build.gradle b/packages/app/modules/paseo-diff-prototype/android/build.gradle
new file mode 100644
index 0000000000..f218c03ef8
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/android/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+group = 'sh.paseo.diffprototype'
+version = '0.1.0'
+
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+
+def skiaPackage = new File(["node", "--print", "require.resolve('@shopify/react-native-skia/package.json')"].execute(null, projectDir).text.trim()).parentFile
+
+android {
+  namespace "sh.paseo.diffprototype"
+  defaultConfig {
+    externalNativeBuild {
+      cmake {
+        arguments "-DSKIA_PACKAGE=${skiaPackage.absolutePath}"
+        cppFlags "-std=c++20 -O2 -fexceptions -frtti"
+      }
+    }
+  }
+  externalNativeBuild {
+    cmake { path "CMakeLists.txt" }
+  }
+}
diff --git a/packages/app/modules/paseo-diff-prototype/android/src/main/AndroidManifest.xml b/packages/app/modules/paseo-diff-prototype/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..94cbbcfc39
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/android/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/packages/app/modules/paseo-diff-prototype/android/src/main/java/sh/paseo/diffprototype/PaseoDiffPrototypeModule.kt b/packages/app/modules/paseo-diff-prototype/android/src/main/java/sh/paseo/diffprototype/PaseoDiffPrototypeModule.kt
new file mode 100644
index 0000000000..d542f0b17b
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/android/src/main/java/sh/paseo/diffprototype/PaseoDiffPrototypeModule.kt
@@ -0,0 +1,34 @@
+package sh.paseo.diffprototype
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+// Experimental binding only. The layout engine has no JVM or platform dependency.
+class PaseoDiffPrototypeModule : Module() {
+  companion object {
+    init { System.loadLibrary("paseo_diff_prototype") }
+  }
+
+  private external fun createDocument(): Double
+  private external fun prepareDocument(id: Double, texts: Array<String>, widths: DoubleArray, family: String, size: Double): DoubleArray
+  private external fun readDocument(id: Double, start: Int, count: Int): DoubleArray
+  private external fun releaseDocument(id: Double)
+  private external fun releaseAllDocuments()
+
+  override fun definition() = ModuleDefinition {
+    Name("PaseoDiffPrototype")
+
+    Function("create") { createDocument() }
+    // Expo dispatches this non-suspending AsyncFunction on its background queue.
+    AsyncFunction("prepare") { id: Double, texts: List<String>, widths: List<Double>, family: String, size: Double ->
+      val stats = prepareDocument(id, texts.toTypedArray(), widths.toDoubleArray(), family, size)
+      mapOf(
+        "cells" to stats[0], "fragments" to stats[1], "graphemes" to stats[2],
+        "copyMs" to stats[3], "layoutMs" to stats[4], "geometryBytes" to stats[5]
+      )
+    }
+    Function("read") { id: Double, start: Int, count: Int -> readDocument(id, start, count) }
+    Function("release") { id: Double -> releaseDocument(id) }
+    OnDestroy { releaseAllDocuments() }
+  }
+}
diff --git a/packages/app/modules/paseo-diff-prototype/cpp/generate-graphemes.mjs b/packages/app/modules/paseo-diff-prototype/cpp/generate-graphemes.mjs
new file mode 100644
index 0000000000..70422df3ce
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/cpp/generate-graphemes.mjs
@@ -0,0 +1,18 @@
+import { writeFileSync } from "node:fs";
+import { isExtendingChar } from "@marijn/find-cluster-break";
+
+// Use the installed JS engine's Unicode property data, not a different ICU version.
+const ranges = [];
+let start = null;
+for (let code = 0; code <= 0x110000; code++) {
+  const extending = code < 0x110000 && isExtendingChar(code);
+  if (extending && start === null) start = code;
+  if (!extending && start !== null) {
+    ranges.push(`{${start},${code}}`);
+    start = null;
+  }
+}
+writeFileSync(
+  process.argv[2],
+  `#pragma once\n#include <array>\n#include <utility>\ninline constexpr std::array<std::pair<int,int>,${ranges.length}> extendingRanges = {{${ranges.join(",")}}};\n`,
+);
diff --git a/packages/app/modules/paseo-diff-prototype/cpp/jni.cpp b/packages/app/modules/paseo-diff-prototype/cpp/jni.cpp
new file mode 100644
index 0000000000..a8f25fac54
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/cpp/jni.cpp
@@ -0,0 +1,136 @@
+#include "layout.h"
+#include <jni.h>
+#include <chrono>
+#include <cmath>
+#include <memory>
+#include <mutex>
+#include <stdexcept>
+#include <unordered_map>
+#include "include/ports/SkFontMgr_android.h"
+#include "modules/skunicode/include/SkUnicode.h"
+
+namespace {
+using Clock = std::chrono::steady_clock;
+using paseo::diff::Document;
+struct Job {
+  std::atomic<bool> cancelled{false};
+  std::atomic<bool> started{false};
+  std::shared_ptr<const Document> document;
+};
+std::mutex mutex;
+std::unordered_map<uint64_t, std::shared_ptr<Job>> jobs;
+uint64_t nextId = 0;
+
+double elapsed(Clock::time_point start) {
+  return std::chrono::duration<double, std::milli>(Clock::now() - start).count();
+}
+std::shared_ptr<Job> findJob(double id) {
+  std::lock_guard lock(mutex);
+  const auto found = jobs.find(static_cast<uint64_t>(id));
+  if (found == jobs.end()) throw std::runtime_error("Unknown or released layout");
+  return found->second;
+}
+std::u16string copyString(JNIEnv* env, jstring source) {
+  if (!source) throw std::runtime_error("Missing text");
+  const jsize length = env->GetStringLength(source);
+  const jchar* chars = env->GetStringChars(source, nullptr);
+  if (!chars) throw std::runtime_error("Could not copy text");
+  std::u16string result(reinterpret_cast<const char16_t*>(chars), length);
+  env->ReleaseStringChars(source, chars);
+  return result;
+}
+jdoubleArray numbers(JNIEnv* env, const std::vector<double>& values) {
+  auto result = env->NewDoubleArray(values.size());
+  if (result) env->SetDoubleArrayRegion(result, 0, values.size(), values.data());
+  return result;
+}
+void fail(JNIEnv* env, const std::exception& error) {
+  env->ThrowNew(env->FindClass("java/lang/IllegalStateException"), error.what());
+}
+}  // namespace
+
+#define METHOD(name) Java_sh_paseo_diffprototype_PaseoDiffPrototypeModule_##name
+
+extern "C" JNIEXPORT jdouble JNICALL METHOD(createDocument)(JNIEnv*, jobject) {
+  std::lock_guard lock(mutex);
+  const auto id = ++nextId;
+  jobs.emplace(id, std::make_shared<Job>());
+  return id;
+}
+
+extern "C" JNIEXPORT jdoubleArray JNICALL METHOD(prepareDocument)(
+    JNIEnv* env, jobject, jdouble id, jobjectArray texts, jdoubleArray widths,
+    jstring family, jdouble size) {
+  try {
+    auto job = findJob(id);
+    if (job->started.exchange(true)) throw std::runtime_error("Layout already started");
+    const auto copyStart = Clock::now();
+    const jsize count = env->GetArrayLength(texts);
+    if (count > 100000 || env->GetArrayLength(widths) != count || !std::isfinite(size) || size <= 0 || size > 100)
+      throw std::runtime_error("Invalid layout input");
+    std::vector<double> available(count);
+    env->GetDoubleArrayRegion(widths, 0, count, available.data());
+    auto document = std::make_shared<Document>();
+    document->cells.reserve(count);
+    size_t units = 0;
+    for (jsize i = 0; i < count; i++) {
+      if (job->cancelled.load()) throw std::runtime_error("Layout cancelled");
+      if (!std::isfinite(available[i]) || available[i] <= 0) throw std::runtime_error("Invalid width");
+      auto text = static_cast<jstring>(env->GetObjectArrayElement(texts, i));
+      auto copied = copyString(env, text);
+      env->DeleteLocalRef(text);
+      units += copied.size();
+      if (units > 16000000) throw std::runtime_error("Prototype input limit exceeded");
+      document->cells.push_back({std::move(copied), available[i], {}});
+    }
+    const auto fontFamily = SkUnicode::convertUtf16ToUtf8(copyString(env, family));
+    const double copyMs = elapsed(copyStart);
+    const auto layoutStart = Clock::now();
+    paseo::diff::prepare(*document, SkFontMgr_New_Android(nullptr), fontFamily.c_str(), size, job->cancelled);
+    const double layoutMs = elapsed(layoutStart);
+    {
+      std::lock_guard lock(mutex);
+      if (job->cancelled.load()) throw std::runtime_error("Layout cancelled");
+      job->document = document;
+    }
+    return numbers(env, {static_cast<double>(document->cells.size()),
+      static_cast<double>(document->fragmentCount), static_cast<double>(document->graphemeCount),
+      copyMs, layoutMs, static_cast<double>(document->geometryBytes)});
+  } catch (const std::exception& error) {
+    fail(env, error);
+    return nullptr;
+  }
+}
+
+extern "C" JNIEXPORT jdoubleArray JNICALL METHOD(readDocument)(
+    JNIEnv* env, jobject, jdouble id, jint start, jint count) {
+  try {
+    const auto job = findJob(id);
+    std::shared_ptr<const Document> document;
+    {
+      std::lock_guard lock(mutex);
+      document = job->document;
+    }
+    if (!document) throw std::runtime_error("Layout is not ready");
+    if (start < 0 || count < 0 || count > 256 || static_cast<size_t>(start) > document->cells.size())
+      throw std::runtime_error("Invalid viewport range");
+    return numbers(env, paseo::diff::read(*document, start, count));
+  } catch (const std::exception& error) {
+    fail(env, error);
+    return nullptr;
+  }
+}
+
+extern "C" JNIEXPORT void JNICALL METHOD(releaseDocument)(JNIEnv*, jobject, jdouble id) {
+  std::lock_guard lock(mutex);
+  const auto found = jobs.find(static_cast<uint64_t>(id));
+  if (found == jobs.end()) return;
+  found->second->cancelled.store(true);
+  jobs.erase(found);
+}
+
+extern "C" JNIEXPORT void JNICALL METHOD(releaseAllDocuments)(JNIEnv*, jobject) {
+  std::lock_guard lock(mutex);
+  for (auto& [id, job] : jobs) job->cancelled.store(true);
+  jobs.clear();
+}
diff --git a/packages/app/modules/paseo-diff-prototype/cpp/layout.cpp b/packages/app/modules/paseo-diff-prototype/cpp/layout.cpp
new file mode 100644
index 0000000000..e5f7d0f8a8
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/cpp/layout.cpp
@@ -0,0 +1,277 @@
+#include "layout.h"
+#include "graphemes.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <stdexcept>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "include/core/SkFont.h"
+#include "modules/skparagraph/include/FontCollection.h"
+#include "modules/skparagraph/include/Paragraph.h"
+#include "modules/skparagraph/include/ParagraphBuilder.h"
+#include "modules/skunicode/include/SkUnicode.h"
+
+namespace paseo::diff {
+namespace {
+namespace para = skia::textlayout;
+
+int codePoint(const std::u16string& text, size_t pos) {
+  int code = text[pos];
+  if (code >= 0xd800 && code < 0xdc00 && pos + 1 < text.size()) {
+    int low = text[pos + 1];
+    if (low >= 0xdc00 && low < 0xe000) return ((code - 0xd800) << 10) + low - 0xdc00 + 0x10000;
+  }
+  return code;
+}
+bool extending(int code) {
+  const auto found = std::upper_bound(extendingRanges.begin(), extendingRanges.end(), code,
+      [](int value, const auto& range) { return value < range.first; });
+  return found != extendingRanges.begin() && code < std::prev(found)->second;
+}
+bool regional(int code) { return code >= 0x1f1e6 && code <= 0x1f1ff; }
+
+// Same forward-cluster rules as @marijn/find-cluster-break, including ZWJ/RI behavior.
+std::vector<Grapheme> segment(const std::u16string& text) {
+  std::vector<Grapheme> result;
+  size_t pos = 0;
+  size_t column = 0;
+  while (pos < text.size()) {
+    const auto start = pos;
+    int previous = codePoint(text, pos);
+    pos += previous < 0x10000 ? 1 : 2;
+    while (pos < text.size()) {
+      const int next = codePoint(text, pos);
+      if (previous == 0x200d || next == 0x200d || extending(next)) {
+        pos += next < 0x10000 ? 1 : 2;
+        previous = next;
+      } else if (regional(next)) {
+        size_t count = 0;
+        for (int index = static_cast<int>(pos) - 2; index >= 0 && regional(codePoint(text, index)); index -= 2) count++;
+        if (count % 2 == 0) break;
+        pos += 2;
+      } else {
+        break;
+      }
+    }
+    auto display = text.substr(start, pos - start);
+    const bool tab = display == u"\t";
+    const size_t spaces = tab ? 4 - column % 4 : 0;
+    if (tab) display.assign(spaces, u' ');
+    result.push_back({static_cast<int>(start), static_cast<int>(pos), std::move(display)});
+    column += tab ? spaces : 1;
+  }
+  return result;
+}
+
+bool needsShaping(const std::u16string& text) {
+  for (const auto c : text) if ((c < 0x20 || c > 0x7e) && c != u'\t') return true;
+  for (const auto* pair : {u"==", u"!=", u"=>", u"<=", u">=", u"->", u"::", u"++", u"--"}) {
+    if (text.find(pair) != std::u16string::npos) return true;
+  }
+  return false;
+}
+bool cleanBoundary(const Grapheme& grapheme) {
+  for (const auto c : grapheme.text) {
+    if (c < 0x20 || c > 0x7e || std::u16string_view(u"=!<>+-:&|*/~^?.").find(c) != std::u16string_view::npos) return false;
+  }
+  return true;
+}
+size_t chunkEnd(const std::vector<Grapheme>& graphemes, size_t start, size_t end) {
+  const size_t limit = start + 64;
+  if (limit >= end) return end;
+  const size_t floor = std::max(start + 1, limit - 16);
+  for (size_t seam = limit; seam > floor; seam--) {
+    if (cleanBoundary(graphemes[seam - 1]) && cleanBoundary(graphemes[seam])) return seam;
+  }
+  return limit;
+}
+
+class Measurer {
+ public:
+  Measurer(sk_sp<SkFontMgr> manager, const std::string& family, float size,
+           const std::atomic<bool>& cancelled) : cancelled_(cancelled) {
+    families_ = {SkString(family), SkString("Menlo"), SkString("SF Mono"), SkString("monospace"), SkString("System")};
+    std::unordered_set<std::string> available;
+    for (int i = 0; i < manager->countFamilies(); i++) {
+      SkString name;
+      manager->getFamilyName(i, &name);
+      available.insert(name.c_str());
+    }
+    std::string primary = "System";
+    for (const auto& name : families_) {
+      if (available.contains(name.c_str())) { primary = name.c_str(); break; }
+    }
+    font_ = SkFont(manager->matchFamilyStyle(primary.c_str(), SkFontStyle()), size);
+    fonts_ = sk_make_sp<para::FontCollection>();
+    fonts_->setDefaultFontManager(manager);
+    fonts_->enableFontFallback();
+    para::StrutStyle strut;
+    strut.setStrutEnabled(true);
+    strut.setForceStrutHeight(true);
+    strut.setFontFamilies(families_);
+    strut.setFontSize(size);
+    strut.setHeight(std::round(size * 1.5) / size);
+    strut.setHeightOverride(true);
+    strut.setHalfLeading(true);
+    style_.setMaxLines(1);
+    style_.setStrutStyle(strut);
+    textStyle_.setFontFamilies(families_);
+    textStyle_.setFontSize(size);
+    textStyle_.setColor(SK_ColorBLACK);
+  }
+
+  double measure(const std::vector<Grapheme>& graphemes, size_t start, size_t end,
+                 std::vector<double>* advances = nullptr) {
+    double base = 0;
+    for (size_t chunkStart = start; chunkStart < end;) {
+      if (cancelled_.load()) throw std::runtime_error("Layout cancelled");
+      const size_t chunkLimit = chunkEnd(graphemes, chunkStart, end);
+      std::u16string text;
+      for (size_t i = chunkStart; i < chunkLimit; i++) text += graphemes[i].text;
+      double width = 0;
+      if (!needsShaping(text) && hasEveryGlyph(text)) {
+        for (size_t i = chunkStart; i < chunkLimit; i++) {
+          width += additiveWidth(graphemes[i].text);
+          if (advances) advances->push_back(base + width);
+        }
+      } else {
+        auto paragraph = shape(text);
+        if (advances) {
+          size_t offset = 0;
+          for (size_t i = chunkStart; i < chunkLimit; i++) {
+            offset += graphemes[i].text.size();
+            width = paragraphWidth(*paragraph, offset);
+            advances->push_back(base + width);
+          }
+        } else {
+          width = paragraphWidth(*paragraph, text.size());
+        }
+      }
+      base += width;
+      chunkStart = chunkLimit;
+    }
+    return base;
+  }
+
+ private:
+  bool hasEveryGlyph(const std::u16string& text) {
+    for (const auto c : text) {
+      auto [it, inserted] = glyphs_.try_emplace(c, false);
+      if (inserted) it->second = font_.unicharToGlyph(c) != 0;
+      if (!it->second) return false;
+    }
+    return true;
+  }
+  double additiveWidth(const std::u16string& text) {
+    auto [it, inserted] = widths_.try_emplace(text, 0);
+    if (inserted) {
+      std::vector<SkGlyphID> glyphs(font_.countText(text.data(), text.size() * 2, SkTextEncoding::kUTF16));
+      font_.textToGlyphs(text.data(), text.size() * 2, SkTextEncoding::kUTF16, SkSpan(glyphs));
+      std::vector<SkScalar> widths(glyphs.size());
+      font_.getWidthsBounds(SkSpan(glyphs), SkSpan(widths), {}, nullptr);
+      // Match RNSkia 2.2.12 getTextWidth's integer accumulator exactly.
+      it->second = std::accumulate(widths.begin(), widths.end(), 0);
+    }
+    return it->second;
+  }
+  std::unique_ptr<para::Paragraph> shape(const std::u16string& text) {
+    auto builder = para::ParagraphBuilder::make(style_, fonts_);
+    builder->pushStyle(textStyle_);
+    const auto utf8 = SkUnicode::convertUtf16ToUtf8(text);
+    builder->addText(utf8.c_str(), utf8.size());
+    builder->pop();
+    auto paragraph = builder->Build();
+    paragraph->layout(100000);
+    return paragraph;
+  }
+  static double paragraphWidth(para::Paragraph& paragraph, size_t end) {
+    double width = 0;
+    for (const auto& box : paragraph.getRectsForRange(0, end, para::RectHeightStyle::kTight, para::RectWidthStyle::kTight)) {
+      // JS adds the two float-valued properties in double precision.
+      width = std::max(width, static_cast<double>(box.rect.x()) + box.rect.width());
+    }
+    return width;
+  }
+  SkFont font_;
+  std::vector<SkString> families_;
+  sk_sp<para::FontCollection> fonts_;
+  para::ParagraphStyle style_;
+  para::TextStyle textStyle_;
+  std::unordered_map<char16_t, bool> glyphs_;
+  std::unordered_map<std::u16string, double> widths_;
+  const std::atomic<bool>& cancelled_;
+};
+}  // namespace
+
+void prepare(Document& document, sk_sp<SkFontMgr> fonts, const std::string& family, float size,
+             const std::atomic<bool>& cancelled) {
+  Measurer measure(std::move(fonts), family, size, cancelled);
+  for (auto& cell : document.cells) {
+    if (cancelled.load()) throw std::runtime_error("Layout cancelled");
+    auto graphemes = segment(cell.text);
+    const bool bounded = !needsShaping(cell.text);
+    size_t start = 0;
+    do {
+      size_t fitting = graphemes.size();
+      if (!graphemes.empty()) {
+        size_t low = start + 1;
+        size_t high = bounded ? std::min(graphemes.size(), start + 64) : graphemes.size();
+        fitting = low;
+        if (bounded) {
+          while (measure.measure(graphemes, start, high) <= cell.availableWidth) {
+            fitting = high;
+            low = high + 1;
+            if (high == graphemes.size()) break;
+            high = std::min(graphemes.size(), start + (high - start) * 2);
+          }
+        }
+        while (low <= high) {
+          const size_t middle = (low + high) / 2;
+          const double width = measure.measure(graphemes, start, middle);
+          if (width <= cell.availableWidth || middle == start + 1) {
+            fitting = middle;
+            low = middle + 1;
+          } else {
+            high = middle - 1;
+          }
+        }
+      }
+      std::vector<double> advances;
+      advances.reserve(fitting - start);
+      const double width = measure.measure(graphemes, start, fitting, &advances);
+      Fragment fragment{start < graphemes.size() ? graphemes[start].start : 0,
+                        fitting > start ? graphemes[fitting - 1].end : 0, width, {}};
+      fragment.graphemes.reserve(fitting - start);
+      for (size_t i = start; i < fitting; i++) {
+        auto grapheme = graphemes[i];
+        grapheme.width = advances[i - start] - (i > start ? advances[i - start - 1] : 0);
+        fragment.graphemes.push_back(std::move(grapheme));
+      }
+      document.fragmentCount++;
+      document.graphemeCount += fragment.graphemes.size();
+      document.geometryBytes += sizeof(Fragment) + fragment.graphemes.capacity() * sizeof(Grapheme);
+      cell.fragments.push_back(std::move(fragment));
+      start = fitting;
+    } while (start < graphemes.size());
+  }
+}
+
+std::vector<double> read(const Document& document, size_t start, size_t count) {
+  std::vector<double> output;
+  const size_t end = start + std::min(count, document.cells.size() - start);
+  for (size_t i = start; i < end; i++) {
+    const auto& cell = document.cells[i];
+    output.insert(output.end(), {static_cast<double>(i), static_cast<double>(cell.fragments.size())});
+    for (const auto& fragment : cell.fragments) {
+      output.insert(output.end(), {static_cast<double>(fragment.start), static_cast<double>(fragment.end), fragment.width, static_cast<double>(fragment.graphemes.size())});
+      for (const auto& grapheme : fragment.graphemes) {
+        output.insert(output.end(), {static_cast<double>(grapheme.start), static_cast<double>(grapheme.end), grapheme.width});
+      }
+    }
+  }
+  return output;
+}
+}  // namespace paseo::diff
diff --git a/packages/app/modules/paseo-diff-prototype/cpp/layout.h b/packages/app/modules/paseo-diff-prototype/cpp/layout.h
new file mode 100644
index 0000000000..7de6f00fe2
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/cpp/layout.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <atomic>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include "include/core/SkFontMgr.h"
+
+namespace paseo::diff {
+struct Grapheme {
+  int start;
+  int end;
+  std::u16string text;
+  double width = 0;
+};
+struct Fragment {
+  int start;
+  int end;
+  double width;
+  std::vector<Grapheme> graphemes;
+};
+struct Cell {
+  std::u16string text;
+  double availableWidth;
+  std::vector<Fragment> fragments;
+};
+struct Document {
+  std::vector<Cell> cells;
+  size_t fragmentCount = 0;
+  size_t graphemeCount = 0;
+  size_t geometryBytes = 0;
+};
+
+void prepare(Document& document, sk_sp<SkFontMgr> fonts, const std::string& family, float fontSize,
+             const std::atomic<bool>& cancelled);
+std::vector<double> read(const Document& document, size_t start, size_t count);
+}  // namespace paseo::diff
diff --git a/packages/app/modules/paseo-diff-prototype/expo-module.config.json b/packages/app/modules/paseo-diff-prototype/expo-module.config.json
new file mode 100644
index 0000000000..2a4587d5f8
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/expo-module.config.json
@@ -0,0 +1,6 @@
+{
+  "platforms": ["android"],
+  "android": {
+    "modules": ["sh.paseo.diffprototype.PaseoDiffPrototypeModule"]
+  }
+}
diff --git a/packages/app/modules/paseo-diff-prototype/package.json b/packages/app/modules/paseo-diff-prototype/package.json
new file mode 100644
index 0000000000..9c775282ed
--- /dev/null
+++ b/packages/app/modules/paseo-diff-prototype/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "paseo-diff-prototype",
+  "version": "0.1.0",
+  "private": true
+}
diff --git a/packages/app/modules/paseo-scroll/.gitignore b/packages/app/modules/paseo-scroll/.gitignore
new file mode 100644
index 0000000000..d80969eb27
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/.gitignore
@@ -0,0 +1,2 @@
+/android/.cxx/
+/android/build/
diff --git a/packages/app/modules/paseo-scroll/android/build.gradle b/packages/app/modules/paseo-scroll/android/build.gradle
new file mode 100644
index 0000000000..5f5eed07cb
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/android/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+group = 'sh.paseo.scroll'
+version = '0.1.0'
+
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+
+android {
+  namespace "sh.paseo.scroll"
+  defaultConfig {
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+  }
+}
+
+dependencies {
+  implementation "com.facebook.react:react-android"
+  androidTestImplementation 'androidx.test:runner:1.6.2'
+  androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+}
diff --git a/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt b/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt
new file mode 100644
index 0000000000..7d6fcee8ed
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt
@@ -0,0 +1,77 @@
+package sh.paseo.scroll
+
+import android.graphics.Rect
+import android.text.Selection
+import android.text.Spannable
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.views.scroll.ReactScrollView
+import com.facebook.react.views.scroll.ReactScrollViewManager
+import com.facebook.soloader.SoLoader
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ScrollSelectionTest {
+  @Test fun focusingSelectableTextKeepsInvertedViewportStill() = withScroll(inverted = true) { scroll, text ->
+    val before = scroll.scrollY
+    assertTrue(text.requestFocus())
+    assertSame(text, scroll.findFocus())
+    assertEquals("Text focus must not move the inverted viewport", before, scroll.scrollY)
+    assertTrue(text.isTextSelectable)
+  }
+
+  @Test fun selectingTextKeepsInvertedViewportStill() = withScroll(inverted = true) { scroll, text ->
+    val before = scroll.scrollY
+    Selection.setSelection(text.text as Spannable, 0, 8)
+    text.requestRectangleOnScreen(Rect(0, 0, 80, 40), true)
+    assertEquals("Selection visibility requests must not move the inverted viewport", before, scroll.scrollY)
+    assertEquals("Selectab", text.text.subSequence(text.selectionStart, text.selectionEnd).toString())
+  }
+
+  @Test fun explicitScrollCommandsStillMoveInvertedViewport() = withScroll(inverted = true) { scroll, _ ->
+    scroll.scrollTo(0, 600)
+    assertEquals(600, scroll.scrollY)
+  }
+
+  @Test fun ordinaryScrollViewsStillRevealSelectedText() = withScroll(inverted = false) { scroll, text ->
+    val before = scroll.scrollY
+    text.requestRectangleOnScreen(Rect(0, 0, 80, 40), true)
+    assertNotEquals(before, scroll.scrollY)
+  }
+
+  private fun withScroll(inverted: Boolean, check: (ReactScrollView, TextView) -> Unit) {
+    val instrumentation = InstrumentationRegistry.getInstrumentation()
+    instrumentation.runOnMainSync {
+      val appContext = instrumentation.targetContext
+      SoLoader.init(appContext, OpenSourceMergedSoMapping)
+      val reactContext = BridgeReactContext(appContext)
+      val context = ThemedReactContext(reactContext, appContext)
+      val manager = PaseoScrollPackage().createViewManager(reactContext, ReactScrollViewManager.REACT_CLASS) as ReactScrollViewManager
+      val scroll = manager.createViewInstance(context)
+      scroll.scaleY = if (inverted) -1f else 1f
+      val content = FrameLayout(context)
+      val text = TextView(context).apply {
+        setText("Selectable timeline text", TextView.BufferType.SPANNABLE)
+        setTextIsSelectable(true)
+      }
+      content.addView(text, FrameLayout.LayoutParams(300, 100).apply { topMargin = 1400 })
+      scroll.addView(content)
+      content.measure(exact(300), exact(2000))
+      content.layout(0, 0, 300, 2000)
+      scroll.measure(exact(300), exact(300))
+      scroll.layout(0, 0, 300, 300)
+      scroll.scrollTo(0, 400)
+      check(scroll, text)
+    }
+  }
+
+  private fun exact(size: Int) = View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY)
+}
diff --git a/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt b/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt
new file mode 100644
index 0000000000..c3a2a4373d
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt
@@ -0,0 +1,35 @@
+package sh.paseo.scroll
+
+import android.graphics.Rect
+import com.facebook.react.ReactPackage
+import com.facebook.react.ViewManagerOnDemandReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManager
+import com.facebook.react.views.scroll.ReactScrollView
+import com.facebook.react.views.scroll.ReactScrollViewManager
+
+/** Keeps RN's scroll props, commands, events, and Fabric component unchanged. */
+class PaseoScrollPackage : ReactPackage, ViewManagerOnDemandReactPackage {
+  override fun createNativeModules(context: ReactApplicationContext): List<NativeModule> = emptyList()
+  override fun createViewManagers(context: ReactApplicationContext): List<ViewManager<*, *>> =
+    listOf(PaseoScrollViewManager())
+  override fun getViewManagerNames(context: ReactApplicationContext): Collection<String> =
+    listOf(ReactScrollViewManager.REACT_CLASS)
+  override fun createViewManager(context: ReactApplicationContext, name: String): ViewManager<*, *>? =
+    if (name == ReactScrollViewManager.REACT_CLASS) PaseoScrollViewManager() else null
+}
+
+private class PaseoScrollViewManager : ReactScrollViewManager() {
+  override fun createViewInstance(context: ThemedReactContext): ReactScrollView =
+    PaseoScrollView(context)
+}
+
+private class PaseoScrollView(context: ThemedReactContext) : ReactScrollView(context) {
+  // Both RN focus handling and Android selection visibility requests use this calculation.
+  // Its coordinates ignore inversion. Keep focus/selection bookkeeping, but leave timeline
+  // movement to user gestures and explicit scroll commands.
+  override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect): Int =
+    if (scaleY < 0) 0 else super.computeScrollDeltaToGetChildRectOnScreen(rect)
+}
diff --git a/packages/app/modules/paseo-scroll/app.plugin.js b/packages/app/modules/paseo-scroll/app.plugin.js
new file mode 100644
index 0000000000..08cd8f1774
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/app.plugin.js
@@ -0,0 +1,21 @@
+const { withMainApplication } = require("expo/config-plugins");
+
+const PACKAGE_LIST = "PackageList(this).packages.apply {";
+const REGISTRATION = "add(0, sh.paseo.scroll.PaseoScrollPackage())";
+
+function configureScrollPackage(contents) {
+  if (contents.includes(REGISTRATION)) return contents;
+  if (!contents.includes(PACKAGE_LIST)) {
+    throw new Error(
+      "Could not register Android scroll behavior before React Native's core package",
+    );
+  }
+  return contents.replace(PACKAGE_LIST, `${PACKAGE_LIST}\n              ${REGISTRATION}`);
+}
+
+module.exports = (config) =>
+  withMainApplication(config, (mod) => {
+    mod.modResults.contents = configureScrollPackage(mod.modResults.contents);
+    return mod;
+  });
+module.exports.configureScrollPackage = configureScrollPackage;
diff --git a/packages/app/modules/paseo-scroll/app.plugin.test.ts b/packages/app/modules/paseo-scroll/app.plugin.test.ts
new file mode 100644
index 0000000000..8004c20ecd
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/app.plugin.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+
+const { configureScrollPackage } = require("./app.plugin");
+
+describe("Android scroll registration", () => {
+  it("gives the app scroll manager precedence over the prebuilt React Native manager", () => {
+    const source = "PackageList(this).packages.apply {\n}";
+    const result = configureScrollPackage(source);
+    expect(result).toBe(
+      "PackageList(this).packages.apply {\n              add(0, sh.paseo.scroll.PaseoScrollPackage())\n}",
+    );
+    expect(configureScrollPackage(result)).toBe(result);
+  });
+
+  it("fails prebuild when the template no longer supports registration", () => {
+    expect(() => configureScrollPackage("changed template")).toThrow(
+      "Could not register Android scroll behavior",
+    );
+  });
+});
diff --git a/packages/app/modules/paseo-scroll/expo-module.config.json b/packages/app/modules/paseo-scroll/expo-module.config.json
new file mode 100644
index 0000000000..ba00434407
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/expo-module.config.json
@@ -0,0 +1 @@
+{ "platforms": ["android"], "android": { "modules": [] } }
diff --git a/packages/app/modules/paseo-scroll/package.json b/packages/app/modules/paseo-scroll/package.json
new file mode 100644
index 0000000000..5887e76734
--- /dev/null
+++ b/packages/app/modules/paseo-scroll/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "paseo-scroll",
+  "version": "0.1.0",
+  "private": true
+}
diff --git a/packages/app/package.json b/packages/app/package.json
index e184856c1d..84af04dee4 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "private": true,
   "main": "index.ts",
   "scripts": {
@@ -102,13 +102,14 @@
     "fast-deep-equal": "^3.1.3",
     "htmlparser2": "^12.0.0",
     "i18next": "^26.3.0",
-    "lucide-react-native": "^0.546.0",
+    "lucide-react-native": "^1.50.0",
     "markdown-it": "^10.0.0",
     "mermaid": "^11.16.0",
     "mnemonic-id": "^3.2.7",
     "qrcode": "^1.5.4",
     "react": "19.1.0",
     "react-dom": "19.1.0",
+    "react-freeze": "1.0.4",
     "react-i18next": "^17.0.8",
     "react-native": "0.81.5",
     "react-native-draggable-flatlist": "^4.0.3",
diff --git a/packages/app/plugins/with-android-optional-camera.js b/packages/app/plugins/with-android-optional-camera.js
new file mode 100644
index 0000000000..dd5776e155
--- /dev/null
+++ b/packages/app/plugins/with-android-optional-camera.js
@@ -0,0 +1,24 @@
+const { withAndroidManifest } = require("expo/config-plugins");
+
+// Requesting CAMERA implies these features are required, which hides the app
+// on Google Play for devices without a camera. Pairing works without QR scanning.
+const OPTIONAL_CAMERA_FEATURES = ["android.hardware.camera", "android.hardware.camera.autofocus"];
+
+function withAndroidOptionalCamera(config) {
+  return withAndroidManifest(config, (modConfig) => {
+    const manifest = modConfig.modResults.manifest;
+    const features = manifest["uses-feature"] ?? [];
+    for (const name of OPTIONAL_CAMERA_FEATURES) {
+      const existing = features.find((feature) => feature.$["android:name"] === name);
+      if (existing) {
+        existing.$["android:required"] = "false";
+      } else {
+        features.push({ $: { "android:name": name, "android:required": "false" } });
+      }
+    }
+    manifest["uses-feature"] = features;
+    return modConfig;
+  });
+}
+
+module.exports = withAndroidOptionalCamera;
diff --git a/packages/app/public/index.html b/packages/app/public/index.html
index f7116fc86b..a95e7b8c9e 100644
--- a/packages/app/public/index.html
+++ b/packages/app/public/index.html
@@ -70,6 +70,15 @@
         -webkit-app-region: no-drag !important;
       }
 
+      /* Electron does not clip app-region rectangles to scroll viewports.
+         Content-only viewports emit no window regions, including from their
+         controls. Visible controls here use normal DOM hit testing.
+         Use initial: Blink parses the explicit value none as no-drag. */
+      [data-window-content],
+      [data-window-content] * {
+        -webkit-app-region: initial !important;
+      }
+
       /* Suppress the browser's default focus outline — it appears on mouse
          clicks and looks out of place against our themed surfaces. Keep a
          themed ring for keyboard users via :focus-visible. */
diff --git a/packages/app/src/agent-controls/policy.ts b/packages/app/src/agent-controls/policy.ts
index 827dfadf57..89a4a86daa 100644
--- a/packages/app/src/agent-controls/policy.ts
+++ b/packages/app/src/agent-controls/policy.ts
@@ -2,6 +2,7 @@ import type { AgentMode } from "@getpaseo/protocol/agent-types";
 
 export const PLAN_MODE_FEATURE_ID = "plan_mode";
 export const FAST_MODE_FEATURE_ID = "fast_mode";
+export const SPEED_FEATURE_ID = "service_tier";
 
 export function isPlanningAgentMode(mode: Pick<AgentMode, "id" | "colorTier">): boolean {
   return mode.colorTier === "planning" || mode.id === "plan" || mode.id.endsWith("#plan");
diff --git a/packages/app/src/agent-profiles/settings/agent-profiles-section.tsx b/packages/app/src/agent-profiles/settings/agent-profiles-section.tsx
index 37f94bfc0c..0cbee5d4d6 100644
--- a/packages/app/src/agent-profiles/settings/agent-profiles-section.tsx
+++ b/packages/app/src/agent-profiles/settings/agent-profiles-section.tsx
@@ -7,7 +7,7 @@ import type { AgentProfile } from "@getpaseo/protocol/messages";
 import { Button } from "@/components/ui/button";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { confirmDialog } from "@/utils/confirm-dialog";
diff --git a/packages/app/src/agent-skills/index.tsx b/packages/app/src/agent-skills/index.tsx
index 044c6acd1d..04fdbd2294 100644
--- a/packages/app/src/agent-skills/index.tsx
+++ b/packages/app/src/agent-skills/index.tsx
@@ -7,7 +7,7 @@ import { ArrowUpRight, Blocks, Check, Settings2 } from "lucide-react-native";
 import type { AgentSkillOperation, AgentSkillsStatus } from "@getpaseo/protocol/messages";
 import type { TFunction } from "i18next";
 import { Button } from "@/components/ui/button";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { confirmDialog } from "@/utils/confirm-dialog";
diff --git a/packages/app/src/agent-skills/selection-sheet.tsx b/packages/app/src/agent-skills/selection-sheet.tsx
index 923d098cee..c161747c4c 100644
--- a/packages/app/src/agent-skills/selection-sheet.tsx
+++ b/packages/app/src/agent-skills/selection-sheet.tsx
@@ -6,7 +6,7 @@ import { Check } from "lucide-react-native";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import type { Theme } from "@/styles/theme";
 import { confirmDialog } from "@/utils/confirm-dialog";
diff --git a/packages/app/src/agent-stream/bottom-anchor-controller.ts b/packages/app/src/agent-stream/bottom-anchor-controller.ts
index 7533699815..93b3c075e7 100644
--- a/packages/app/src/agent-stream/bottom-anchor-controller.ts
+++ b/packages/app/src/agent-stream/bottom-anchor-controller.ts
@@ -726,7 +726,7 @@ export function useBottomAnchorController(input: {
   routeRequest: BottomAnchorRouteRequest | null;
   isAuthoritativeHistoryReady: boolean;
   renderStrategy: string;
-  transportBehavior: BottomAnchorTransportBehavior;
+  getTransportBehavior: () => BottomAnchorTransportBehavior;
   getMeasurementState: () => ControllerMeasurementState;
   isNearBottom: () => boolean;
   scrollToBottom: (animated: boolean) => void;
@@ -735,7 +735,7 @@ export function useBottomAnchorController(input: {
   const agentIdRef = useRef(input.agentId);
   const readinessRef = useRef(input.isAuthoritativeHistoryReady);
   const renderStrategyRef = useRef(input.renderStrategy);
-  const transportBehaviorRef = useRef(input.transportBehavior);
+  const getTransportBehaviorRef = useRef(input.getTransportBehavior);
   const getMeasurementStateRef = useRef(input.getMeasurementState);
   const isNearBottomRef = useRef(input.isNearBottom);
   const scrollToBottomRef = useRef(input.scrollToBottom);
@@ -744,7 +744,7 @@ export function useBottomAnchorController(input: {
   agentIdRef.current = input.agentId;
   readinessRef.current = input.isAuthoritativeHistoryReady;
   renderStrategyRef.current = input.renderStrategy;
-  transportBehaviorRef.current = input.transportBehavior;
+  getTransportBehaviorRef.current = input.getTransportBehavior;
   getMeasurementStateRef.current = input.getMeasurementState;
   isNearBottomRef.current = input.isNearBottom;
   scrollToBottomRef.current = input.scrollToBottom;
@@ -754,7 +754,7 @@ export function useBottomAnchorController(input: {
       getAgentId: () => agentIdRef.current,
       getIsAuthoritativeHistoryReady: () => readinessRef.current,
       getRenderStrategy: () => renderStrategyRef.current,
-      getTransportBehavior: () => transportBehaviorRef.current,
+      getTransportBehavior: () => getTransportBehaviorRef.current(),
       getMeasurementState: () => getMeasurementStateRef.current(),
       isNearBottom: () => isNearBottomRef.current(),
       scrollToBottom: (animated) => scrollToBottomRef.current(animated),
diff --git a/packages/app/src/agent-stream/chat-find/index.tsx b/packages/app/src/agent-stream/chat-find/index.tsx
new file mode 100644
index 0000000000..daa78baea2
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/index.tsx
@@ -0,0 +1,12 @@
+import type { ChatFindProps, ChatFindExpansionProps } from "./types";
+
+export function ChatFind({ children }: ChatFindProps) {
+  return children;
+}
+export function ChatFindExpansion({ children }: ChatFindExpansionProps) {
+  return children(false);
+}
+/** Native has no chat find, so no message is ever selected by one. */
+export function useChatFindSelectedMessageId(): string | null {
+  return null;
+}
diff --git a/packages/app/src/agent-stream/chat-find/index.web.tsx b/packages/app/src/agent-stream/chat-find/index.web.tsx
new file mode 100644
index 0000000000..c817b55028
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/index.web.tsx
@@ -0,0 +1,176 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
+import { View, Text } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { PaneFind, findShortcutPlatform, isFindShortcut, type PaneFindHandle } from "@/pane-find";
+import { Button } from "@/components/ui/button";
+import { usePaneFocus } from "@/panels/pane-context";
+import { useRetainedPanelActive } from "@/components/retained-panel";
+import { hasActiveWebOverlay } from "@/lib/overlay-root";
+import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { planTimelinePromptJump } from "@/timeline/timeline-sync-plan";
+import { ChatFindModel, type ChatFindFailure } from "./model";
+import { createFindViewport } from "./viewport.web";
+import type { ChatFindProps, ChatFindExpansionProps } from "./types";
+
+const SelectedMessage = createContext<string | null>(null);
+const FAILURE_TEXT: Record<ChatFindFailure, string> = {
+  connection: "paneFind.connectionFailure",
+  historyChanged: "paneFind.historyChangedFailure",
+  reveal: "paneFind.revealFailure",
+};
+const WIDGET_DATASET = { chatFindWidget: "true" };
+const ROOT_STYLE = {
+  display: "flex",
+  flex: 1,
+  minHeight: 0,
+  position: "relative",
+  outline: "none",
+} as const;
+let nextHighlightId = 0;
+
+/**
+ * The message chat find has landed on, for surfaces that must keep it addressable:
+ * the row that lifts its render cap, and the web virtualizer that has to mount every
+ * block row of it so the whole message can be counted and highlighted.
+ */
+export function useChatFindSelectedMessageId(): string | null {
+  return useContext(SelectedMessage);
+}
+
+export function ChatFindExpansion({ messageId, children }: ChatFindExpansionProps) {
+  return children(useChatFindSelectedMessageId() === messageId);
+}
+
+export function ChatFind({
+  agentId,
+  serverId,
+  epoch,
+  items,
+  viewportRef,
+  revealLoadedMessage,
+  visibleMessageIds,
+  children,
+}: ChatFindProps) {
+  const { t } = useTranslation();
+  const widget = useRef<PaneFindHandle>(null);
+  const root = useRef<HTMLDivElement>(null);
+  const bindings = useRef({ viewportRef, revealLoadedMessage, visibleMessageIds });
+  bindings.current = { viewportRef, revealLoadedMessage, visibleMessageIds };
+  const [highlightName] = useState(() => `paseo-chat-find-${++nextHighlightId}`);
+  const { isInteractive } = usePaneFocus();
+  const active = useRetainedPanelActive();
+  const model = useMemo(
+    () =>
+      new ChatFindModel({
+        search(query, cursor) {
+          const client = getHostRuntimeStore().getClient(serverId);
+          if (!client) return Promise.reject(new Error("Host disconnected"));
+          return client.searchAgentTimeline({ agentId, query, cursor });
+        },
+        load(targetEpoch, seq) {
+          return getHostRuntimeStore().fetchAgentTimeline(
+            serverId,
+            agentId,
+            planTimelinePromptJump({ epoch: targetEpoch, seq }),
+          );
+        },
+        ...createFindViewport({
+          getBindings: () => bindings.current,
+          getRoot: () => root.current,
+          highlightName,
+        }),
+      }),
+    [agentId, serverId, highlightName],
+  );
+  const state = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
+  useEffect(() => {
+    model.updateHistory(epoch, items);
+  }, [model, epoch, items]);
+  useEffect(() => () => model.close(), [model]);
+  useEffect(() => {
+    if (!active) model.close();
+  }, [active, model]);
+  useEffect(() => {
+    if (!active || !isInteractive) return;
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.defaultPrevented || hasActiveWebOverlay() || isImeComposingKeyboardEvent(event))
+        return;
+      if (isFindShortcut(event, findShortcutPlatform())) {
+        event.preventDefault();
+        model.open();
+        widget.current?.focus();
+      }
+    };
+    // React Native TextInput stops bubbling key events, including from the composer.
+    document.addEventListener("keydown", onKeyDown, true);
+    return () => document.removeEventListener("keydown", onKeyDown, true);
+  }, [active, isInteractive, model]);
+  const close = useCallback(() => {
+    model.close();
+    root.current?.focus({ preventScroll: true });
+  }, [model]);
+  let status = "";
+  if (state.phase === "searching") status = t("paneFind.searching");
+  else if (state.phase === "loading") status = t("paneFind.loading");
+  else if (state.phase === "error") status = t("paneFind.failed");
+  else if (state.query.trim())
+    status = state.count
+      ? t("paneFind.position", { current: state.occurrence + 1, total: state.count })
+      : t("paneFind.noMatches");
+  return (
+    <div ref={root} tabIndex={-1} style={ROOT_STYLE}>
+      <style>{`::highlight(${highlightName}) { background-color: ${styles.highlight.backgroundColor}; color: ${styles.highlight.color}; }`}</style>
+      <SelectedMessage.Provider value={state.selectedItemId}>{children}</SelectedMessage.Provider>
+      {state.open && (
+        <View style={styles.overlay} dataSet={WIDGET_DATASET}>
+          <PaneFind
+            ref={widget}
+            query={state.query}
+            status={status}
+            canNavigate={state.phase === "ready" && state.count > 0}
+            onQueryChange={model.setQuery}
+            onNext={model.next}
+            onPrevious={model.previous}
+            onClose={close}
+          />
+          {state.failure && (
+            <View style={styles.error}>
+              <Text style={styles.errorText}>{t(FAILURE_TEXT[state.failure])}</Text>
+              <Button size="xs" variant="ghost" onPress={model.retry}>
+                {t("paneFind.retry")}
+              </Button>
+            </View>
+          )}
+        </View>
+      )}
+    </div>
+  );
+}
+const styles = StyleSheet.create((theme) => ({
+  overlay: {
+    position: "absolute",
+    top: theme.spacing[2],
+    right: theme.spacing[3],
+    zIndex: 10,
+    maxWidth: "100%",
+  },
+  error: {
+    flexDirection: "row",
+    alignItems: "center",
+    padding: theme.spacing[2],
+    backgroundColor: theme.colors.surface1,
+  },
+  errorText: { color: theme.colors.foreground, fontSize: theme.fontSize.sm, flex: 1 },
+  highlight: { backgroundColor: theme.colors.statusWarning, color: theme.colors.surface0 },
+}));
diff --git a/packages/app/src/agent-stream/chat-find/model.test.ts b/packages/app/src/agent-stream/chat-find/model.test.ts
new file mode 100644
index 0000000000..abc3ade6c6
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/model.test.ts
@@ -0,0 +1,313 @@
+import { expect, it } from "vitest";
+import { hydrateStreamState, type StreamItem } from "@/types/stream";
+import { ChatFindModel, type ChatFindOperations } from "./model";
+
+function response(locations: Array<{ seq: number; role: "user" | "assistant"; count?: number }>) {
+  return {
+    agentId: "agent",
+    requestId: "request",
+    epoch: "epoch",
+    locations,
+    nextCursor: null,
+    error: null,
+  };
+}
+function message(seq: number, text = "target"): StreamItem {
+  return {
+    id: `row-${seq}`,
+    kind: "assistant_message",
+    text,
+    timestamp: new Date(0),
+    timelineCursor: { epoch: "epoch", seq },
+  };
+}
+
+it("loads an older location and searches a response merged across suppressed tasks once", async () => {
+  const source = [
+    { type: "assistant_message" as const, text: "first **target** " },
+    {
+      type: "tool_call" as const,
+      callId: "task",
+      name: "TaskCreate",
+      status: "completed" as const,
+      detail: { type: "unknown" as const, input: {}, output: null },
+      error: null,
+    },
+    { type: "assistant_message" as const, text: "second target" },
+  ];
+  const history = hydrateStreamState(
+    source.map((item, index) => ({
+      event: { type: "timeline" as const, provider: "claude" as const, item },
+      timestamp: new Date(0),
+      timelineCursor: { epoch: "epoch", seq: index + 1 },
+    })),
+    { source: "canonical" },
+  );
+  expect(history).toHaveLength(1);
+  const loaded: number[] = [];
+  const revealed: number[] = [];
+  const model = new ChatFindModel({
+    async search() {
+      return response([
+        { seq: 1, role: "assistant" },
+        { seq: 3, role: "assistant" },
+      ]);
+    },
+    async load(_epoch, seq) {
+      loaded.push(seq);
+      model.updateHistory("epoch", history);
+    },
+    async reveal(_id, _query, occurrence) {
+      revealed.push(occurrence);
+      return { count: 2, occurrence: occurrence < 0 ? 1 : occurrence };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", []);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    model.next();
+    await expect.poll(() => model.getSnapshot().occurrence).toBe(1);
+    model.next();
+    await expect.poll(() => revealed).toEqual([0, 1, 0]);
+    model.previous();
+    await expect.poll(() => model.getSnapshot().occurrence).toBe(1);
+    expect(loaded).toEqual([1]);
+  } finally {
+    model.close();
+  }
+});
+
+it("skips a source-only candidate and highlights a displayed match", async () => {
+  const revealed: string[] = [];
+  const model = new ChatFindModel({
+    async search() {
+      return response([
+        { seq: 1, role: "assistant" },
+        { seq: 2, role: "assistant" },
+      ]);
+    },
+    async load() {
+      throw new Error("Already loaded");
+    },
+    async reveal(id) {
+      revealed.push(id);
+      return { count: id === "row-1" ? 0 : 1, occurrence: 0 };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", [message(1), message(2)]);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().selectedItemId).toBe("row-2");
+    expect(revealed).toEqual(["row-1", "row-2"]);
+    expect(model.getSnapshot().phase).toBe("ready");
+  } finally {
+    model.close();
+  }
+});
+
+it("ignores replies after closing and does not navigate", async () => {
+  let finish!: (value: ReturnType<typeof response>) => void;
+  const calls: string[] = [];
+  const model = new ChatFindModel({
+    search() {
+      calls.push("search");
+      return new Promise((resolve) => {
+        finish = resolve;
+      });
+    },
+    async load() {
+      calls.push("load");
+    },
+    async reveal() {
+      calls.push("reveal");
+      return { count: 1, occurrence: 0 };
+    },
+    clear() {},
+  });
+  model.updateHistory("epoch", [message(1)]);
+  model.open();
+  model.setQuery("target");
+  await expect.poll(() => calls).toEqual(["search"]);
+  model.close();
+  finish(response([{ seq: 1, role: "assistant" }]));
+  await Promise.resolve();
+  expect(calls).toEqual(["search"]);
+  expect(model.getSnapshot()).toMatchObject({ open: false, phase: "idle" });
+});
+
+it("retains a failed search for retry and distinguishes failure from zero matches", async () => {
+  let disconnected = true;
+  const operations: ChatFindOperations = {
+    async search() {
+      if (disconnected) throw new Error("Host disconnected");
+      return response([]);
+    },
+    async load() {},
+    async reveal() {
+      return { count: 0, occurrence: 0 };
+    },
+    clear() {},
+  };
+  const model = new ChatFindModel(operations);
+  try {
+    model.updateHistory("epoch", []);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("error");
+    expect(model.getSnapshot().failure).toBe("connection");
+    disconnected = false;
+    model.retry();
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    expect(model.getSnapshot()).toMatchObject({ count: 0, failure: null });
+  } finally {
+    model.close();
+  }
+});
+
+// `load` is a host RPC like `search`, so its failure is a connection failure and the
+// widget must say so rather than blaming the reveal.
+it("reports a failed timeline load as a connection failure", async () => {
+  const model = new ChatFindModel({
+    async search() {
+      return response([{ seq: 1, role: "assistant" }]);
+    },
+    async load() {
+      throw new Error("Host disconnected");
+    },
+    async reveal() {
+      return { count: 1, occurrence: 0 };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", []);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("error");
+    expect(model.getSnapshot().failure).toBe("connection");
+  } finally {
+    model.close();
+  }
+});
+
+it("reports a search result that outlived its epoch as a changed history", async () => {
+  const model = new ChatFindModel({
+    async search() {
+      return response([{ seq: 1, role: "assistant" }]);
+    },
+    async load() {},
+    async reveal() {
+      return { count: 1, occurrence: 0 };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", [message(1)]);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    model.updateHistory("epoch-2", [message(1)]);
+    expect(model.getSnapshot()).toMatchObject({ phase: "error", failure: "historyChanged" });
+  } finally {
+    model.close();
+  }
+});
+
+it("can load a search location before the initial chat history has arrived", async () => {
+  const model = new ChatFindModel({
+    async search() {
+      return response([{ seq: 1, role: "assistant" }]);
+    },
+    async load() {
+      model.updateHistory("epoch", [message(1)]);
+    },
+    async reveal() {
+      return { count: 1, occurrence: 0 };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory(null, []);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    expect(model.getSnapshot()).toMatchObject({ selectedItemId: "row-1", count: 1, failure: null });
+  } finally {
+    model.close();
+  }
+});
+
+// The scope of the search is the whole chat, so the position spans every located
+// message: the host's estimate until a message is on screen, the rendered count after.
+it("reports the position across the whole chat and corrects it with rendered counts", async () => {
+  const model = new ChatFindModel({
+    async search() {
+      return response([
+        { seq: 1, role: "assistant", count: 2 },
+        { seq: 2, role: "assistant", count: 3 },
+      ]);
+    },
+    async load() {},
+    async reveal(id, _query, occurrence) {
+      const count = id === "row-1" ? 2 : 1;
+      return { count, occurrence: occurrence < 0 ? count - 1 : occurrence };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", [message(1), message(2)]);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    expect(model.getSnapshot()).toMatchObject({ selectedItemId: "row-1", occurrence: 0, count: 5 });
+    model.next();
+    await expect.poll(() => model.getSnapshot().occurrence).toBe(1);
+    expect(model.getSnapshot().count).toBe(5);
+    model.next();
+    await expect.poll(() => model.getSnapshot().selectedItemId).toBe("row-2");
+    expect(model.getSnapshot()).toMatchObject({ occurrence: 2, count: 3 });
+    model.previous();
+    await expect.poll(() => model.getSnapshot().selectedItemId).toBe("row-1");
+    expect(model.getSnapshot()).toMatchObject({ occurrence: 1, count: 3 });
+  } finally {
+    model.close();
+  }
+});
+
+// COMPAT(timelineSearchCount): a host that reports no counts is worth one match per
+// located message until a reveal replaces the estimate with the rendered count.
+it("counts one match per message from a host that reports no counts", async () => {
+  const model = new ChatFindModel({
+    async search() {
+      return response([
+        { seq: 1, role: "assistant" },
+        { seq: 2, role: "assistant" },
+      ]);
+    },
+    async load() {},
+    async reveal(id, _query, occurrence) {
+      const count = id === "row-1" ? 2 : 1;
+      return { count, occurrence: occurrence < 0 ? count - 1 : occurrence };
+    },
+    clear() {},
+  });
+  try {
+    model.updateHistory("epoch", [message(1), message(2)]);
+    model.open();
+    model.setQuery("target");
+    await expect.poll(() => model.getSnapshot().phase).toBe("ready");
+    expect(model.getSnapshot()).toMatchObject({ selectedItemId: "row-1", occurrence: 0, count: 3 });
+    model.next();
+    await expect.poll(() => model.getSnapshot().occurrence).toBe(1);
+    model.next();
+    await expect.poll(() => model.getSnapshot().selectedItemId).toBe("row-2");
+    expect(model.getSnapshot()).toMatchObject({ occurrence: 2, count: 3 });
+  } finally {
+    model.close();
+  }
+});
diff --git a/packages/app/src/agent-stream/chat-find/model.ts b/packages/app/src/agent-stream/chat-find/model.ts
new file mode 100644
index 0000000000..98acc9840f
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/model.ts
@@ -0,0 +1,308 @@
+import type { AgentTimelineSearchPayload } from "@getpaseo/client/internal/daemon-client";
+import type { StreamItem } from "@/types/stream";
+
+/**
+ * A message the host says contains the query. `count` is the host's estimate of its
+ * occurrences until a reveal replaces it with the rendered count, so the whole-chat
+ * position the widget shows is exact for every message that has been on screen. The
+ * wire field is optional; the search boundary fills it in, so the interior trusts it.
+ */
+type Location = Omit<AgentTimelineSearchPayload["locations"][number], "count"> & {
+  count: number;
+};
+interface Target {
+  id: string;
+  seq: number;
+  before: number;
+}
+/**
+ * Why a search stopped, so the widget can say something true. `connection` is the
+ * host call itself failing, `historyChanged` is the timeline moving under a result
+ * set, and `reveal` is a located match that never made it onto the screen.
+ */
+export type ChatFindFailure = "connection" | "historyChanged" | "reveal";
+
+class ChatFindFailureError extends Error {
+  constructor(
+    readonly failure: ChatFindFailure,
+    options?: { cause: unknown },
+  ) {
+    super(`Chat find failed: ${failure}`, options);
+  }
+}
+
+function tagged<T>(failure: ChatFindFailure, operation: Promise<T>): Promise<T> {
+  return operation.catch((cause: unknown) => {
+    throw cause instanceof ChatFindFailureError
+      ? cause
+      : new ChatFindFailureError(failure, { cause });
+  });
+}
+
+interface Snapshot {
+  open: boolean;
+  query: string;
+  phase: "idle" | "searching" | "loading" | "ready" | "error";
+  selectedItemId: string | null;
+  /** Position across the whole chat: the search scope, not the selected message. */
+  occurrence: number;
+  count: number;
+  failure: ChatFindFailure | null;
+}
+export interface ChatFindOperations {
+  search(query: string, cursor?: number): Promise<AgentTimelineSearchPayload>;
+  load(epoch: string, seq: number): Promise<unknown>;
+  reveal(
+    messageId: string,
+    query: string,
+    occurrence: number,
+    signal: AbortSignal,
+  ): Promise<{ occurrence: number; count: number }>;
+  clear(): void;
+}
+
+export class ChatFindModel {
+  private state: Snapshot = {
+    open: false,
+    query: "",
+    phase: "idle",
+    selectedItemId: null,
+    occurrence: 0,
+    count: 0,
+    failure: null,
+  };
+  private listeners = new Set<() => void>();
+  private historyListeners = new Set<() => void>();
+  private items: StreamItem[] = [];
+  private epoch: string | null = null;
+  private resultEpoch: string | null = null;
+  private locations: Location[] = [];
+  private resolved = new Map<Location, Target>();
+  private current = -1;
+  private inMessage = { occurrence: 0, count: 0 };
+  private abort = new AbortController();
+  private timer: ReturnType<typeof setTimeout> | undefined;
+  constructor(private operations: ChatFindOperations) {}
+  readonly getSnapshot = () => this.state;
+  readonly subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  private publish(change: Partial<Snapshot>) {
+    this.state = { ...this.state, ...change };
+    this.listeners.forEach((listener) => listener());
+  }
+  private cancel() {
+    this.abort.abort();
+    this.abort = new AbortController();
+    clearTimeout(this.timer);
+    this.operations.clear();
+  }
+  readonly open = () => {
+    if (this.state.open) return;
+    this.publish({ open: true });
+    if (this.state.query) this.setQuery(this.state.query);
+  };
+  readonly close = () => {
+    this.cancel();
+    this.publish({ open: false, phase: "idle", selectedItemId: null, count: 0, failure: null });
+  };
+  readonly setQuery = (query: string) => {
+    this.cancel();
+    this.locations = [];
+    this.resultEpoch = null;
+    this.resolved.clear();
+    this.current = -1;
+    this.inMessage = { occurrence: 0, count: 0 };
+    this.publish({
+      query,
+      phase: query.trim() ? "searching" : "idle",
+      selectedItemId: null,
+      occurrence: 0,
+      count: 0,
+      failure: null,
+    });
+    if (!query.trim()) return;
+    const signal = this.abort.signal;
+    this.timer = setTimeout(() => {
+      void this.search(signal);
+    }, 120);
+  };
+  readonly retry = () => this.setQuery(this.state.query);
+  private fail(error: unknown, signal: AbortSignal) {
+    if (signal.aborted) return;
+    this.cancel();
+    this.publish({
+      phase: "error",
+      selectedItemId: null,
+      // Every operation call site is tagged, so an untagged failure is a bug here
+      // rather than a known outcome; `connection` is the least misleading thing to
+      // say about one, and its copy already asks the reader to check and retry.
+      failure: error instanceof ChatFindFailureError ? error.failure : "connection",
+    });
+  }
+  private async search(signal: AbortSignal) {
+    try {
+      let cursor: number | undefined;
+      do {
+        const result = await tagged("connection", this.operations.search(this.state.query, cursor));
+        if (signal.aborted) return;
+        const historyChanged = this.epoch !== null && result.epoch !== this.epoch;
+        const searchChanged = this.resultEpoch !== null && result.epoch !== this.resultEpoch;
+        if (historyChanged || searchChanged) throw new ChatFindFailureError("historyChanged");
+        this.resultEpoch = result.epoch;
+        this.locations.push(
+          ...result.locations.map((location) => ({
+            seq: location.seq,
+            role: location.role,
+            // COMPAT(timelineSearchCount): hosts before v0.9.0 send no count; remove after 2027-09-22.
+            count: location.count ?? 1,
+          })),
+        );
+        cursor = result.nextCursor ?? undefined;
+      } while (cursor !== undefined);
+      await this.navigate(0, 1, signal);
+    } catch (error) {
+      this.fail(error, signal);
+    }
+  }
+  updateHistory(epoch: string | null, items: StreamItem[]) {
+    if (
+      this.resultEpoch !== null &&
+      epoch !== null &&
+      epoch !== this.resultEpoch &&
+      this.state.open
+    ) {
+      this.fail(new ChatFindFailureError("historyChanged"), this.abort.signal);
+    }
+    this.epoch = epoch;
+    this.items = items;
+    this.historyListeners.forEach((listener) => listener());
+  }
+  private target(location: Location, exact: boolean): Target | null {
+    let before = 0;
+    for (const item of this.items) {
+      if (item.timelineCursor?.epoch !== this.resultEpoch) continue;
+      const seq = item.timelineCursor.seq;
+      if (seq < location.seq) {
+        before = Math.max(before, seq);
+        continue;
+      }
+      const sameRole = item.kind === `${location.role}_message`;
+      if (sameRole && (!exact || seq === location.seq)) return { id: item.id, seq, before };
+      // A prompt is a hard boundary; never resolve an assistant hit in a later response.
+      if (item.kind === "user_message") return null;
+    }
+    return null;
+  }
+  private waitForTarget(location: Location, signal: AbortSignal): Promise<Target> {
+    return new Promise((resolve, reject) => {
+      const finish = (target?: Target) => {
+        clearTimeout(timeout);
+        this.historyListeners.delete(check);
+        signal.removeEventListener("abort", cancelled);
+        if (target) resolve(target);
+        else reject(new ChatFindFailureError("reveal"));
+      };
+      const check = () => {
+        const target = this.target(location, false);
+        if (target) finish(target);
+      };
+      const cancelled = () => finish();
+      const timeout = setTimeout(() => finish(), 5000);
+      this.historyListeners.add(check);
+      signal.addEventListener("abort", cancelled, { once: true });
+      if (signal.aborted) cancelled();
+      else check();
+    });
+  }
+  private async navigate(index: number, direction: 1 | -1, signal: AbortSignal) {
+    const epoch = this.resultEpoch;
+    if (epoch === null) return;
+    this.publish({ phase: "loading", failure: null });
+    let remaining = this.locations.length;
+    while (remaining-- > 0 && this.locations.length) {
+      index = (index + this.locations.length) % this.locations.length;
+      const location = this.locations[index]!;
+      const cached = this.resolved.get(location);
+      const stillLoaded =
+        cached &&
+        this.items.some((item) => item.id === cached.id && item.timelineCursor?.seq === cached.seq);
+      let target = stillLoaded ? cached : this.target(location, true);
+      if (!target) {
+        await tagged("connection", this.operations.load(epoch, location.seq));
+        if (signal.aborted) return;
+        target = await this.waitForTarget(location, signal);
+      }
+      if (signal.aborted) return;
+      this.resolved.set(location, target);
+      // Multiple source hits may belong to the same displayed message. Resolve that
+      // here, using loaded client rows, without changing the timeline's data model.
+      this.locations = this.locations.filter(
+        (candidate) =>
+          candidate === location ||
+          candidate.role !== location.role ||
+          candidate.seq <= target.before ||
+          candidate.seq > target.seq,
+      );
+      index = this.locations.indexOf(location);
+      this.publish({ selectedItemId: target.id });
+      const result = await tagged(
+        "reveal",
+        this.operations.reveal(target.id, this.state.query, direction === 1 ? 0 : -1, signal),
+      );
+      if (signal.aborted) return;
+      if (result.count) {
+        this.current = index;
+        this.publish({ phase: "ready", ...this.position(location, result) });
+        return;
+      }
+      this.locations.splice(index, 1);
+      if (direction === -1) index--;
+    }
+    this.operations.clear();
+    this.publish({ phase: "ready", selectedItemId: null, count: 0, occurrence: 0 });
+  }
+  private position(location: Location, revealed: { occurrence: number; count: number }) {
+    this.inMessage = revealed;
+    location.count = revealed.count;
+    let before = 0;
+    let total = 0;
+    for (const candidate of this.locations) {
+      if (candidate === location) before = total;
+      total += candidate.count;
+    }
+    return { occurrence: before + revealed.occurrence, count: total };
+  }
+  private async move(direction: 1 | -1) {
+    if (this.state.phase !== "ready" || !this.state.count) return;
+    this.cancel();
+    const signal = this.abort.signal;
+    try {
+      const occurrence = this.inMessage.occurrence + direction;
+      if (occurrence >= 0 && occurrence < this.inMessage.count && this.state.selectedItemId) {
+        this.publish({ phase: "loading" });
+        const result = await tagged(
+          "reveal",
+          this.operations.reveal(this.state.selectedItemId, this.state.query, occurrence, signal),
+        );
+        if (signal.aborted) return;
+        if (result.count) {
+          this.publish({ phase: "ready", ...this.position(this.locations[this.current]!, result) });
+          return;
+        }
+      }
+      await this.navigate(this.current + direction, direction, signal);
+    } catch (error) {
+      this.fail(error, signal);
+    }
+  }
+  readonly next = () => {
+    void this.move(1);
+  };
+  readonly previous = () => {
+    void this.move(-1);
+  };
+}
diff --git a/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
new file mode 100644
index 0000000000..c1d84c1b42
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
@@ -0,0 +1,67 @@
+import { afterEach, expect, it } from "vitest";
+import { findMessageMatches, findRenderedMatches } from "./ranges.web";
+
+afterEach(() => {
+  document.body.replaceChildren();
+});
+function content(html: string) {
+  const row = document.createElement("div");
+  row.innerHTML = `<div data-message-text="true">${html}</div>`;
+  document.body.append(row);
+  return row;
+}
+function message(messageId: string, ...blocks: string[]) {
+  const root = document.createElement("div");
+  for (const block of blocks) {
+    const row = document.createElement("div");
+    row.dataset.messageId = messageId;
+    row.innerHTML = `<div data-message-text="true"><div data-paseo-markdown-tag="p">${block}</div></div>`;
+    root.append(row);
+  }
+  document.body.append(root);
+  return root;
+}
+it("collects a message's occurrences across its block rows in row order", () => {
+  const root = message("message-1", "alpha one", "beta", "alpha two");
+  const other = document.createElement("div");
+  other.dataset.messageId = "message-2";
+  other.innerHTML =
+    '<div data-message-text="true"><div data-paseo-markdown-tag="p">alpha three</div></div>';
+  root.append(other);
+  expect(findMessageMatches(root, "message-1", "alpha").map((range) => range.toString())).toEqual([
+    "alpha",
+    "alpha",
+  ]);
+  expect(
+    findMessageMatches(root, "message-1", "alpha").map(
+      (range) => range.startContainer.parentElement?.textContent,
+    ),
+  ).toEqual(["alpha one", "alpha two"]);
+  expect(findMessageMatches(root, "message-2", "alpha")).toHaveLength(1);
+  expect(findMessageMatches(null, "message-1", "alpha")).toEqual([]);
+});
+it("finds each actual occurrence across inline formatting with original Unicode offsets", () => {
+  const row = content(
+    '<div data-paseo-markdown-tag="p">İ😀hello <strong>world</strong> then <em>hello</em> world</div>',
+  );
+  const matches = findRenderedMatches(row, "hello world");
+  expect(matches.map((range) => range.toString())).toEqual(["hello world", "hello world"]);
+  expect(matches[0]!.startOffset).toBe(3);
+  expect(matches[0]!.compareBoundaryPoints(Range.START_TO_START, matches[1]!)).toBe(-1);
+});
+it("ignores controls, keeps block boundaries, and preserves literal code punctuation", () => {
+  const row = content(
+    '<div data-paseo-markdown-tag="p">first</div><div data-paseo-markdown-tag="p">second</div><div data-paseo-markdown-tag="pre"><span>const a</span><span>.b</span><button>copy a.b</button><span data-paseo-markdown-ignore="true">a.b</span></div>',
+  );
+  expect(findRenderedMatches(row, "firstsecond")).toEqual([]);
+  expect(findRenderedMatches(row, "a.b").map((range) => range.toString())).toEqual(["a.b"]);
+});
+it("matches whitespace across text nodes without inspecting hidden link destinations", () => {
+  const row = content(
+    '<div data-paseo-markdown-tag="p"><a href="https://example.com/hidden">hello &amp; world</a>\nline</div>',
+  );
+  expect(findRenderedMatches(row, "hidden")).toEqual([]);
+  expect(findRenderedMatches(row, "world line").map((range) => range.toString())).toEqual([
+    "world\nline",
+  ]);
+});
diff --git a/packages/app/src/agent-stream/chat-find/ranges.web.ts b/packages/app/src/agent-stream/chat-find/ranges.web.ts
new file mode 100644
index 0000000000..91ed7bff6a
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/ranges.web.ts
@@ -0,0 +1,65 @@
+const BLOCKS = ["p", "pre", "li", "td", "th", "h1", "h2", "h3", "h4", "h5", "h6"]
+  .map((tag) => `[data-paseo-markdown-tag="${tag}"]`)
+  .join(",");
+const IGNORED =
+  '[data-paseo-markdown-ignore="true"], [aria-hidden="true"], button, [role="button"], svg, script, style';
+
+/** The rows of one message, in reading order. Each is one Markdown block. */
+export function findMessageRows(root: HTMLElement | null, messageId: string): HTMLElement[] {
+  if (!root) return [];
+  return Array.from(
+    root.querySelectorAll<HTMLElement>(`[data-message-id="${CSS.escape(messageId)}"]`),
+  );
+}
+
+/** Occurrences in one message, ordered by row and then by position inside the row. */
+export function findMessageMatches(
+  root: HTMLElement | null,
+  messageId: string,
+  query: string,
+): Range[] {
+  return findMessageRows(root, messageId).flatMap((row) => findRenderedMatches(row, query));
+}
+
+/** Local offsets belong to the DOM that supplied the text, never to a host parser. */
+export function findRenderedMatches(row: HTMLElement, query: string): Range[] {
+  if (!query.trim()) return [];
+  const groups = new Map<Element, Text[]>();
+  for (const content of row.querySelectorAll<HTMLElement>('[data-message-text="true"]')) {
+    const walker = document.createTreeWalker(content, NodeFilter.SHOW_TEXT);
+    let node: Node | null;
+    while ((node = walker.nextNode())) {
+      if (!(node instanceof Text) || node.parentElement?.closest(IGNORED)) continue;
+      const block = node.parentElement?.closest(BLOCKS) ?? content;
+      const texts = groups.get(block) ?? [];
+      texts.push(node);
+      groups.set(block, texts);
+    }
+  }
+  const pattern = query
+    .trim()
+    .split(/\s+/)
+    .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+    .join("\\s+");
+  const ranges: Range[] = [];
+  for (const texts of groups.values()) {
+    const points = texts.map((node) => ({ node, start: 0, end: 0 }));
+    let text = "";
+    for (const point of points) {
+      point.start = text.length;
+      text += point.node.data;
+      point.end = text.length;
+    }
+    for (const match of text.matchAll(new RegExp(pattern, "giu"))) {
+      const start = points.find((point) => point.start <= match.index && point.end > match.index);
+      const endOffset = match.index + match[0].length;
+      const end = points.find((point) => point.start < endOffset && point.end >= endOffset);
+      if (!start || !end) continue;
+      const range = document.createRange();
+      range.setStart(start.node, match.index - start.start);
+      range.setEnd(end.node, endOffset - end.start);
+      ranges.push(range);
+    }
+  }
+  return ranges;
+}
diff --git a/packages/app/src/agent-stream/chat-find/types.ts b/packages/app/src/agent-stream/chat-find/types.ts
new file mode 100644
index 0000000000..cce58be96e
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/types.ts
@@ -0,0 +1,18 @@
+import type { ReactNode, RefObject } from "react";
+import type { StreamItem } from "@/types/stream";
+import type { StreamViewportHandle } from "../strategy";
+
+export interface ChatFindProps {
+  agentId: string;
+  serverId: string;
+  epoch: string | null;
+  items: StreamItem[];
+  viewportRef: RefObject<StreamViewportHandle | null>;
+  revealLoadedMessage(messageId: string): boolean;
+  visibleMessageIds: ReadonlySet<string>;
+  children: ReactNode;
+}
+export interface ChatFindExpansionProps {
+  messageId: string;
+  children(renderFullContent: boolean): ReactNode;
+}
diff --git a/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts b/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts
new file mode 100644
index 0000000000..2bd1e291b4
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts
@@ -0,0 +1,100 @@
+import { afterEach, expect, it } from "vitest";
+import { createFindViewport } from "./viewport.web";
+import type { ChatFindProps } from "./types";
+import type { StreamViewportHandle } from "../strategy";
+
+interface Capture {
+  occurrence?: { signal: AbortSignal; targetTop(): number | null };
+}
+
+function transcript(messageId: string, blocks: string[]): HTMLElement {
+  const root = document.createElement("div");
+  for (const [index, text] of blocks.entries()) {
+    const row = document.createElement("div");
+    row.setAttribute("data-history-row-id", `${messageId}:block:${index}`);
+    row.setAttribute("data-message-id", messageId);
+    row.innerHTML = `<div data-message-text="true"><div data-paseo-markdown-tag="p">${text}</div></div>`;
+    root.append(row);
+  }
+  document.body.append(root);
+  return root;
+}
+
+function viewport(root: HTMLElement, capture: Capture) {
+  const handle: StreamViewportHandle = {
+    scrollToBottom() {},
+    prepareForViewportChange() {},
+    scrollToMessage(_messageId, occurrence) {
+      if (occurrence) capture.occurrence = occurrence;
+    },
+  };
+  const bindings: Pick<ChatFindProps, "viewportRef" | "revealLoadedMessage" | "visibleMessageIds"> =
+    {
+      viewportRef: { current: handle },
+      revealLoadedMessage: () => false,
+      visibleMessageIds: new Set(["message-1"]),
+    };
+  return createFindViewport({
+    getBindings: () => bindings,
+    getRoot: () => root,
+    highlightName: "paseo-chat-find-test",
+  });
+}
+
+afterEach(() => {
+  CSS.highlights.delete("paseo-chat-find-test");
+  document.body.replaceChildren();
+});
+
+it("counts occurrences across every block row of the message", async () => {
+  const root = transcript("message-1", ["needle one needle", "no hits", "needle three"]);
+  const capture: Capture = {};
+  const found = await viewport(root, capture).reveal(
+    "message-1",
+    "needle",
+    2,
+    new AbortController().signal,
+  );
+  expect(found).toEqual({ occurrence: 2, count: 3 });
+});
+
+// The settle loop asks for the target position every frame while the viewport moves,
+// and rows mount and unmount as it does. A flat index into the message would name a
+// different occurrence each time the row set changed; the chosen row owns it instead.
+it("keeps the chosen occurrence when an earlier row unmounts mid-scroll", async () => {
+  const root = transcript("message-1", ["needle one needle", "needle three"]);
+  const capture: Capture = {};
+  const found = await viewport(root, capture).reveal(
+    "message-1",
+    "needle",
+    2,
+    new AbortController().signal,
+  );
+  expect(found).toEqual({ occurrence: 2, count: 3 });
+
+  const settled = capture.occurrence?.targetTop();
+  expect(settled).toBeTypeOf("number");
+  expect(highlightedText()).toEqual(["needle"]);
+  expect(highlightedRow()).toBe("message-1:block:1");
+
+  root.firstElementChild?.remove();
+  expect(capture.occurrence?.targetTop()).toBeTypeOf("number");
+  expect(highlightedRow()).toBe("message-1:block:1");
+});
+
+function highlightedRanges(): Range[] {
+  const highlight = CSS.highlights.get("paseo-chat-find-test");
+  return highlight ? Array.from(highlight).filter((range) => range instanceof Range) : [];
+}
+
+function highlightedText(): string[] {
+  return highlightedRanges().map((range) => range.toString());
+}
+
+function highlightedRow(): string | undefined {
+  const row =
+    highlightedRanges()[0]?.startContainer.parentElement?.closest<HTMLElement>(
+      "[data-history-row-id]",
+    );
+  return row?.dataset.historyRowId;
+}
diff --git a/packages/app/src/agent-stream/chat-find/viewport.web.ts b/packages/app/src/agent-stream/chat-find/viewport.web.ts
new file mode 100644
index 0000000000..6bbb3a704b
--- /dev/null
+++ b/packages/app/src/agent-stream/chat-find/viewport.web.ts
@@ -0,0 +1,102 @@
+import type { ChatFindOperations } from "./model";
+import type { ChatFindProps } from "./types";
+import { findMessageMatches, findMessageRows, findRenderedMatches } from "./ranges.web";
+
+interface ViewportInput {
+  getBindings(): Pick<ChatFindProps, "viewportRef" | "revealLoadedMessage" | "visibleMessageIds">;
+  getRoot(): HTMLElement | null;
+  highlightName: string;
+}
+
+function rowOf(range: Range): HTMLElement | null {
+  return range.startContainer.parentElement?.closest<HTMLElement>("[data-history-row-id]") ?? null;
+}
+
+export function createFindViewport({
+  getBindings,
+  getRoot,
+  highlightName,
+}: ViewportInput): Pick<ChatFindOperations, "reveal" | "clear"> {
+  return {
+    clear() {
+      CSS.highlights.delete(highlightName);
+    },
+    // A message renders as one row per Markdown block, so an occurrence can sit in
+    // any of them and the chosen one decides where the viewport lands.
+    reveal(messageId, query, occurrence, signal) {
+      return new Promise((resolve, reject) => {
+        let frame = 0;
+        let started = false;
+        const deadline = performance.now() + 5000;
+        const cleanup = () => {
+          cancelAnimationFrame(frame);
+          signal.removeEventListener("abort", cancelled);
+        };
+        const cancelled = () => {
+          cleanup();
+          reject(new Error("Search cancelled"));
+        };
+        const poll = () => {
+          if (signal.aborted) {
+            cancelled();
+            return;
+          }
+          if (performance.now() >= deadline) {
+            cleanup();
+            reject(new Error("Could not reveal this match; retry"));
+            return;
+          }
+          const current = getBindings();
+          if (!current.visibleMessageIds.has(messageId)) {
+            current.revealLoadedMessage(messageId);
+            frame = requestAnimationFrame(poll);
+            return;
+          }
+          if (!started) {
+            current.viewportRef.current?.scrollToMessage?.(messageId);
+            started = true;
+          }
+          const rows = findMessageRows(getRoot(), messageId);
+          if (!rows.some((row) => row.getBoundingClientRect().height)) {
+            frame = requestAnimationFrame(poll);
+            return;
+          }
+          const ranges = findMessageMatches(getRoot(), messageId, query);
+          const index =
+            occurrence < 0 ? ranges.length - 1 : Math.min(occurrence, ranges.length - 1);
+          const range = ranges[index];
+          cleanup();
+          if (!range) {
+            resolve({ occurrence: 0, count: 0 });
+            return;
+          }
+          // The settle loop re-resolves the range every frame because scrolling
+          // invalidates it. Re-counting the whole message would let a row mounting or
+          // unmounting mid-scroll shift which occurrence a fixed index names, so the
+          // occurrence is pinned to its own row for the rest of this reveal.
+          const row = rowOf(range);
+          const indexInRow = ranges
+            .slice(0, index)
+            .filter((earlier) => rowOf(earlier) === row).length;
+          current.viewportRef.current?.scrollToMessage?.(messageId, {
+            signal,
+            targetTop() {
+              const selected = row ? findRenderedMatches(row, query)[indexInRow] : undefined;
+              if (!selected) return null;
+              CSS.highlights.set(highlightName, new Highlight(selected));
+              const widget = getRoot()?.querySelector<HTMLElement>(
+                '[data-chat-find-widget="true"]',
+              );
+              const clearance = widget ? widget.getBoundingClientRect().height + 8 : 0;
+              return selected.getBoundingClientRect().top - clearance;
+            },
+          });
+          CSS.highlights.set(highlightName, new Highlight(range));
+          resolve({ occurrence: index, count: ranges.length });
+        };
+        signal.addEventListener("abort", cancelled, { once: true });
+        frame = requestAnimationFrame(poll);
+      });
+    },
+  };
+}
diff --git a/packages/app/src/agent-stream/chat-outline/model.test.ts b/packages/app/src/agent-stream/chat-outline/model.test.ts
index 81811c7d78..f11be1ea77 100644
--- a/packages/app/src/agent-stream/chat-outline/model.test.ts
+++ b/packages/app/src/agent-stream/chat-outline/model.test.ts
@@ -12,7 +12,6 @@ describe("chat outline prompt index epoch", () => {
   it("accepts only the authoritative timeline epoch", () => {
     expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-2")).toBe(true);
     expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-1")).toBe(false);
-    expect(shouldAcceptPromptIndexEpoch(null, "epoch-1")).toBe(true);
   });
 });
 
diff --git a/packages/app/src/agent-stream/chat-outline/model.ts b/packages/app/src/agent-stream/chat-outline/model.ts
index 3d71d52b5f..0fb4b5dcb6 100644
--- a/packages/app/src/agent-stream/chat-outline/model.ts
+++ b/packages/app/src/agent-stream/chat-outline/model.ts
@@ -2,11 +2,8 @@ import type { AgentTimelinePromptIndexPayload } from "@getpaseo/client/internal/
 
 export type ChatOutlinePrompt = AgentTimelinePromptIndexPayload["prompts"][number];
 
-export function shouldAcceptPromptIndexEpoch(
-  timelineEpoch: string | null,
-  indexEpoch: string,
-): boolean {
-  return timelineEpoch === null || timelineEpoch === indexEpoch;
+export function shouldAcceptPromptIndexEpoch(timelineEpoch: string, indexEpoch: string): boolean {
+  return timelineEpoch === indexEpoch;
 }
 
 /**
diff --git a/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx b/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
index 6200b8b0f9..4b2139fef6 100644
--- a/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
+++ b/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
@@ -6,20 +6,12 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { StreamViewportHandle } from "../strategy";
 import { useChatOutline } from "./use-chat-outline";
 
-interface RefreshMessage {
-  type: "agent_stream";
-  payload: {
-    agentId: string;
-    event: { type: "timeline"; item: { type: "user_message" } };
-  };
-}
-
 const runtime = vi.hoisted(() => ({
   listAgentTimelinePrompts: vi.fn(),
   fetchAgentTimeline: vi.fn(),
-  on: vi.fn<(event: string, listener: (message: RefreshMessage) => void) => () => void>(
-    () => () => undefined,
-  ),
+  subscribeAgentTimeline: vi.fn(() => {
+    throw new Error("The outline must reuse the viewed timeline");
+  }),
 }));
 
 vi.mock("@/constants/platform", () => ({ isWeb: true }));
@@ -42,7 +34,32 @@ describe("useChatOutline", () => {
   beforeEach(() => {
     runtime.listAgentTimelinePrompts.mockReset();
     runtime.fetchAgentTimeline.mockReset();
-    runtime.on.mockClear();
+    runtime.subscribeAgentTimeline.mockClear();
+  });
+
+  it("waits for a served timeline before requesting its prompt index", async () => {
+    runtime.listAgentTimelinePrompts.mockResolvedValue({ epoch: "epoch-1", prompts: [] });
+    const viewportRef = createRef<StreamViewportHandle>();
+    const { rerender } = renderHook(
+      ({ agentId, timelineEpoch }) =>
+        useChatOutline({
+          agentId,
+          serverId: "server-1",
+          timelineEpoch,
+          tail: [],
+          head: [],
+          enabled: true,
+          viewportRef,
+          onJumpError: vi.fn(),
+        }),
+      { initialProps: { agentId: "draft_msg_1", timelineEpoch: null as string | null } },
+    );
+
+    expect(runtime.listAgentTimelinePrompts).not.toHaveBeenCalled();
+
+    rerender({ agentId: "agent-1", timelineEpoch: "epoch-1" });
+    await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(1));
+    expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledWith("agent-1");
   });
 
   it("drops a late prompt index after the authoritative timeline epoch changes", async () => {
@@ -88,7 +105,7 @@ describe("useChatOutline", () => {
     expect(result.current.prompts[0]?.seq).toBe(2);
   });
 
-  it("keeps the newest prompt index response within one epoch", async () => {
+  it("refreshes from viewed user messages without another stream and keeps the newest index", async () => {
     const older = deferred<{
       epoch: string;
       prompts: Array<{ seq: number; timestamp: string; preview: string }>;
@@ -102,36 +119,31 @@ describe("useChatOutline", () => {
       .mockReturnValueOnce(older.promise)
       .mockReturnValueOnce(newer.promise);
     const viewportRef = createRef<StreamViewportHandle>();
-    const { result } = renderHook(() =>
-      useChatOutline({
-        agentId: "agent-1",
-        serverId: "server-1",
-        timelineEpoch: "epoch-1",
-        tail: [],
-        head: [],
-        enabled: true,
-        viewportRef,
-        onJumpError: vi.fn(),
-      }),
+    const { result, rerender } = renderHook(
+      ({ tail }) =>
+        useChatOutline({
+          agentId: "agent-1",
+          serverId: "server-1",
+          timelineEpoch: "epoch-1",
+          tail,
+          head: [],
+          enabled: true,
+          viewportRef,
+          onJumpError: vi.fn(),
+        }),
+      { initialProps: { tail: [] as import("@/types/stream").StreamItem[] } },
     );
     await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(1));
-    const refresh = runtime.on.mock.calls[0]?.[1];
-    await act(async () => {
-      refresh?.({
-        type: "agent_stream",
-        payload: {
-          agentId: "agent-1",
-          event: { type: "timeline", item: { type: "user_message" } },
-        },
-      });
-      refresh?.({
-        type: "agent_stream",
-        payload: {
-          agentId: "agent-1",
-          event: { type: "timeline", item: { type: "user_message" } },
-        },
-      });
+    const loadedPrompt = (seq: number): import("@/types/stream").StreamItem => ({
+      id: `prompt-${seq}`,
+      kind: "user_message",
+      text: "live prompt",
+      timestamp: new Date(seq),
+      timelineCursor: { epoch: "epoch-1", seq },
     });
+    rerender({ tail: [loadedPrompt(2)] });
+    await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(2));
+    rerender({ tail: [loadedPrompt(2), loadedPrompt(3)] });
     await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(3));
     await act(async () =>
       newer.resolve({
@@ -147,6 +159,74 @@ describe("useChatOutline", () => {
     );
 
     expect(result.current.prompts.map((prompt) => prompt.seq)).toEqual([3]);
+    expect(runtime.subscribeAgentTimeline).not.toHaveBeenCalled();
+  });
+
+  it("refreshes after reconnect catch-up and visibility changes without reacting to assistant chunks", async () => {
+    runtime.listAgentTimelinePrompts.mockResolvedValue({
+      epoch: "epoch-1",
+      prompts: [{ seq: 1, timestamp: new Date(1).toISOString(), preview: "Unloaded prompt" }],
+    });
+    const viewportRef = createRef<StreamViewportHandle>();
+    const { result, rerender } = renderHook(
+      ({ enabled, head, timelineEpoch }) =>
+        useChatOutline({
+          agentId: "agent-1",
+          serverId: "server-1",
+          tail: [],
+          head,
+          timelineEpoch,
+          enabled,
+          viewportRef,
+          visibleMessageIds: new Set(),
+          onJumpError: vi.fn(),
+        }),
+      {
+        initialProps: {
+          enabled: true,
+          head: [] as import("@/types/stream").StreamItem[],
+          timelineEpoch: "epoch-1",
+        },
+      },
+    );
+    await waitFor(() => expect(result.current.prompts[0]?.preview).toBe("Unloaded prompt"));
+    rerender({
+      enabled: true,
+      head: [
+        {
+          id: "assistant",
+          kind: "assistant_message",
+          text: "chunk",
+          timestamp: new Date(),
+          timelineCursor: { epoch: "epoch-1", seq: 2 },
+        },
+      ],
+      timelineEpoch: "epoch-1",
+    });
+    expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(1);
+    rerender({ enabled: false, head: [], timelineEpoch: "epoch-1" });
+    expect(result.current.prompts).toEqual([]);
+    // The viewed model publishes the catch-up from the reconnected transport.
+    runtime.listAgentTimelinePrompts.mockResolvedValue({
+      epoch: "epoch-2",
+      prompts: [{ seq: 1, timestamp: new Date(2).toISOString(), preview: "Replaced conversation" }],
+    });
+    rerender({
+      enabled: true,
+      head: [
+        {
+          id: "reconnected-user",
+          kind: "user_message",
+          text: "Replaced conversation",
+          timestamp: new Date(2),
+          timelineCursor: { epoch: "epoch-2", seq: 1 },
+        },
+      ],
+      timelineEpoch: "epoch-2",
+    });
+    await waitFor(() => expect(result.current.prompts[0]?.preview).toBe("Replaced conversation"));
+    expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(2);
+    expect(runtime.subscribeAgentTimeline).not.toHaveBeenCalled();
   });
 
   it("reports a failed unloaded prompt jump", async () => {
@@ -181,7 +261,7 @@ describe("useChatOutline", () => {
       prompts: [{ seq: 1, timestamp: new Date(1).toISOString(), preview: "prompt" }],
     });
     const scrollToMessage = vi.fn();
-    const revealLoadedItem = vi.fn(() => true);
+    const revealLoadedMessage = vi.fn(() => true);
     const viewport: StreamViewportHandle = {
       scrollToBottom: vi.fn(),
       prepareForViewportChange: vi.fn(),
@@ -198,7 +278,7 @@ describe("useChatOutline", () => {
       },
     ];
     const { result, rerender } = renderHook(
-      ({ visibleItemIds }) =>
+      ({ visibleMessageIds }) =>
         useChatOutline({
           agentId: "agent-1",
           serverId: "server-1",
@@ -208,18 +288,18 @@ describe("useChatOutline", () => {
           enabled: true,
           viewportRef,
           onJumpError: vi.fn(),
-          visibleItemIds,
-          revealLoadedItem,
+          visibleMessageIds,
+          revealLoadedMessage,
         }),
-      { initialProps: { visibleItemIds: new Set<string>() } },
+      { initialProps: { visibleMessageIds: new Set<string>() } },
     );
 
     await waitFor(() => expect(result.current.prompts).toHaveLength(1));
     await act(async () => result.current.jumpToPrompt(1));
-    expect(revealLoadedItem).toHaveBeenCalledWith("older-prompt");
+    expect(revealLoadedMessage).toHaveBeenCalledWith("older-prompt");
     expect(scrollToMessage).not.toHaveBeenCalled();
 
-    rerender({ visibleItemIds: new Set(["older-prompt"]) });
+    rerender({ visibleMessageIds: new Set(["older-prompt"]) });
     await waitFor(() => expect(scrollToMessage).toHaveBeenCalledWith("older-prompt"));
   });
 
@@ -231,7 +311,7 @@ describe("useChatOutline", () => {
     const fetch = deferred<void>();
     runtime.fetchAgentTimeline.mockReturnValue(fetch.promise);
     const scrollToMessage = vi.fn();
-    const revealLoadedItem = vi.fn(() => true);
+    const revealLoadedMessage = vi.fn(() => true);
     const viewportRef = {
       current: {
         scrollToBottom: vi.fn(),
@@ -247,7 +327,7 @@ describe("useChatOutline", () => {
       timelineCursor: { epoch: "epoch-1", seq: 1 },
     };
     const { result, rerender } = renderHook(
-      ({ tail, visibleItemIds }) =>
+      ({ tail, visibleMessageIds }) =>
         useChatOutline({
           agentId: "agent-1",
           serverId: "server-1",
@@ -257,13 +337,13 @@ describe("useChatOutline", () => {
           enabled: true,
           viewportRef,
           onJumpError: vi.fn(),
-          visibleItemIds,
-          revealLoadedItem,
+          visibleMessageIds,
+          revealLoadedMessage,
         }),
       {
         initialProps: {
           tail: [] as (typeof fetchedPrompt)[],
-          visibleItemIds: new Set<string>(),
+          visibleMessageIds: new Set<string>(),
         },
       },
     );
@@ -272,11 +352,11 @@ describe("useChatOutline", () => {
     act(() => result.current.jumpToPrompt(1));
     await waitFor(() => expect(runtime.fetchAgentTimeline).toHaveBeenCalledOnce());
 
-    rerender({ tail: [fetchedPrompt], visibleItemIds: new Set<string>() });
-    await waitFor(() => expect(revealLoadedItem).toHaveBeenCalledWith(fetchedPrompt.id));
+    rerender({ tail: [fetchedPrompt], visibleMessageIds: new Set<string>() });
+    await waitFor(() => expect(revealLoadedMessage).toHaveBeenCalledWith(fetchedPrompt.id));
     expect(scrollToMessage).not.toHaveBeenCalled();
 
-    rerender({ tail: [fetchedPrompt], visibleItemIds: new Set([fetchedPrompt.id]) });
+    rerender({ tail: [fetchedPrompt], visibleMessageIds: new Set([fetchedPrompt.id]) });
     await waitFor(() => expect(scrollToMessage).toHaveBeenCalledOnce());
     expect(scrollToMessage).toHaveBeenCalledWith(fetchedPrompt.id);
     await act(async () => fetch.resolve());
@@ -300,8 +380,8 @@ describe("useChatOutline", () => {
       timestamp: new Date(2),
       timelineCursor: { epoch: "epoch-1", seq: 2 },
     };
-    const revealLoadedItem = vi.fn();
-    revealLoadedItem.mockReturnValue(false);
+    const revealLoadedMessage = vi.fn();
+    revealLoadedMessage.mockReturnValue(false);
     const { result } = renderHook(() =>
       useChatOutline({
         agentId: "agent-1",
@@ -312,8 +392,8 @@ describe("useChatOutline", () => {
         enabled: true,
         viewportRef: { current: viewport },
         onJumpError: vi.fn(),
-        visibleItemIds: new Set([livePrompt.id]),
-        revealLoadedItem,
+        visibleMessageIds: new Set([livePrompt.id]),
+        revealLoadedMessage,
       }),
     );
 
diff --git a/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts b/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
index b88876ef49..015b883d21 100644
--- a/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
+++ b/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
@@ -33,15 +33,15 @@ export interface UseChatOutlineInput {
   enabled: boolean;
   viewportRef: RefObject<StreamViewportHandle | null>;
   onJumpError: () => void;
-  visibleItemIds?: ReadonlySet<string>;
-  revealLoadedItem?: (itemId: string) => boolean;
+  visibleMessageIds?: ReadonlySet<string>;
+  revealLoadedMessage?: (messageId: string) => boolean;
 }
 
 export interface ChatOutline {
   prompts: ChatOutlinePrompt[];
   activePrompt: ActivePromptSource;
   jumpToPrompt: (seq: number) => void;
-  reportReadingPosition: (rowId: string | null) => void;
+  reportReadingPosition: (seq: number | null) => void;
 }
 
 export function useChatOutline({
@@ -53,24 +53,37 @@ export function useChatOutline({
   enabled,
   viewportRef,
   onJumpError,
-  visibleItemIds,
-  revealLoadedItem,
+  visibleMessageIds,
+  revealLoadedMessage,
 }: UseChatOutlineInput): ChatOutline {
   const [index, setIndex] = useState<AgentTimelinePromptIndexPayload | null>(null);
   const [pendingJump, setPendingJump] = useState<PendingPromptJump | null>(null);
   const [activePrompt] = useState(createActivePromptPublisher);
-  const readingRowIdRef = useRef<string | null>(null);
+  const readingSeqRef = useRef<number | null>(null);
   const nextJumpRequestIdRef = useRef(0);
   const nextIndexRequestIdRef = useRef(0);
   const loadedItems = useMemo(() => [...tail, ...(head ?? NO_STREAM_ITEMS)], [head, tail]);
   const prompts = enabled ? (index?.prompts ?? NO_PROMPTS) : NO_PROMPTS;
 
+  // The viewed timeline already owns live delivery and reconnect catch-up. Its complete
+  // loaded items (including rows outside the mounted window) invalidate the prompt index.
+  const latestPromptSeq = loadedItems.reduce(
+    (latest, item) =>
+      item.kind === "user_message" && item.timelineCursor?.epoch === timelineEpoch
+        ? Math.max(latest, item.timelineCursor.seq)
+        : latest,
+    -1,
+  );
+
+  useEffect(() => setIndex(null), [agentId, enabled, serverId, timelineEpoch]);
+
+  // Only a timeline the daemon has served can be indexed. A draft's optimistic stream has no
+  // epoch, and its id names no agent the daemon knows.
   useEffect(() => {
-    if (!isWeb || !enabled) {
+    if (!isWeb || !enabled || timelineEpoch === null) {
       setIndex(null);
       return;
     }
-    setIndex(null);
     const client = getHostRuntimeStore().getClient(serverId);
     if (!client) return;
     let active = true;
@@ -91,42 +104,26 @@ export function useChatOutline({
         .catch(() => undefined);
     };
     refresh();
-    const unsubscribe = client.on("agent_stream", (message) => {
-      if (
-        message.type === "agent_stream" &&
-        message.payload.agentId === agentId &&
-        message.payload.event.type === "timeline" &&
-        message.payload.event.item.type === "user_message"
-      ) {
-        refresh();
-      }
-    });
     return () => {
       active = false;
-      unsubscribe();
     };
-  }, [agentId, enabled, serverId, timelineEpoch]);
+  }, [agentId, enabled, serverId, timelineEpoch, latestPromptSeq]);
 
-  // The transcript names the row it is showing; the outline turns that into a prompt using the
-  // complete index, so unloaded rows never have to exist in the DOM to be marked.
+  // The transcript resolves display rows (including Markdown blocks and plugin cards) to
+  // timeline positions. The outline uses the complete index, including unloaded prompts.
   const publishActivePrompt = useStableEvent(() => {
-    const rowId = readingRowIdRef.current;
-    const anchorSeq =
-      rowId === null
-        ? null
-        : (loadedItems.find((item) => item.id === rowId)?.timelineCursor?.seq ?? null);
-    activePrompt.publish(resolveActivePromptSeq(prompts, anchorSeq));
+    activePrompt.publish(resolveActivePromptSeq(prompts, readingSeqRef.current));
   });
 
-  const reportReadingPosition = useStableEvent((rowId: string | null) => {
-    readingRowIdRef.current = rowId;
+  const reportReadingPosition = useStableEvent((seq: number | null) => {
+    readingSeqRef.current = seq;
     publishActivePrompt();
   });
 
   useEffect(() => {
     nextJumpRequestIdRef.current += 1;
     setPendingJump(null);
-    readingRowIdRef.current = null;
+    readingSeqRef.current = null;
     activePrompt.publish(null);
   }, [activePrompt, agentId, timelineEpoch]);
 
@@ -134,15 +131,15 @@ export function useChatOutline({
   // who never scrolls would otherwise sit on an unmarked rail.
   useEffect(() => {
     publishActivePrompt();
-  }, [loadedItems, prompts, publishActivePrompt]);
+  }, [prompts, publishActivePrompt]);
 
   useEffect(() => {
     if (pendingJump === null) return;
     const target = loadedItems.find((item) => item.timelineCursor?.seq === pendingJump.seq);
     if (target) {
       if (pendingJump.hasScrolled) return;
-      if (visibleItemIds?.has(target.id) === false) {
-        revealLoadedItem?.(target.id);
+      if (visibleMessageIds?.has(target.id) === false) {
+        revealLoadedMessage?.(target.id);
         return;
       }
       viewportRef.current?.scrollToMessage?.(target.id);
@@ -153,7 +150,7 @@ export function useChatOutline({
       return;
     }
     if (pendingJump.fetchSettled) setPendingJump(null);
-  }, [loadedItems, pendingJump, revealLoadedItem, viewportRef, visibleItemIds]);
+  }, [loadedItems, pendingJump, revealLoadedMessage, viewportRef, visibleMessageIds]);
 
   const jumpToPrompt = useCallback(
     (seq: number) => {
@@ -161,7 +158,7 @@ export function useChatOutline({
       setPendingJump(null);
       const loaded = loadedItems.find((item) => item.timelineCursor?.seq === seq);
       if (loaded) {
-        if (revealLoadedItem?.(loaded.id)) {
+        if (revealLoadedMessage?.(loaded.id)) {
           const requestId = nextJumpRequestIdRef.current;
           setPendingJump({ requestId, seq, fetchSettled: true, hasScrolled: false });
           return;
@@ -185,7 +182,7 @@ export function useChatOutline({
           });
         });
     },
-    [agentId, index, loadedItems, onJumpError, revealLoadedItem, serverId, viewportRef],
+    [agentId, index, loadedItems, onJumpError, revealLoadedMessage, serverId, viewportRef],
   );
 
   return { prompts, activePrompt, jumpToPrompt, reportReadingPosition };
diff --git a/packages/app/src/agent-stream/presentation.test.ts b/packages/app/src/agent-stream/presentation.test.ts
new file mode 100644
index 0000000000..70ed8862ae
--- /dev/null
+++ b/packages/app/src/agent-stream/presentation.test.ts
@@ -0,0 +1,599 @@
+import { QueryClient } from "@tanstack/react-query";
+import { describe, expect, it } from "vitest";
+import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
+import { runPluginClientBundle, type PluginClientRuntime } from "@/plugins/evaluate";
+import type { InstalledPlugin } from "@/plugins/types";
+import {
+  applyStreamEvent,
+  hydrateStreamState,
+  type StreamItem,
+  type ToolCallItem,
+  type UserMessageItem,
+} from "@/types/stream";
+import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/timeline/model";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
+import { buildAgentStreamRenderModel } from "./model";
+
+const runtime = {
+  paseo: {},
+  async rpc() {},
+  openSettings() {},
+  openSurface() {},
+  openPanel() {},
+  addHeaderButton() {
+    return { update() {}, remove() {} };
+  },
+  addComposerPill() {
+    return { update() {}, remove() {} };
+  },
+} as unknown as PluginClientRuntime;
+
+function installProbe(
+  itemType: "user_message" | "assistant_message" | "tool_call" | "reasoning",
+  condition = "true",
+): InstalledPlugin {
+  const clientBundle = `(function() {
+    return { default: function(client) {
+      client.addTimelineTransformer({
+        id: "probe",
+        query: { itemType: ${JSON.stringify(itemType)} },
+        transform: function({ item, phase }) {
+          if (!(${condition})) return undefined;
+          return {
+            items: [{
+              type: "plugin",
+              kind: "probe",
+              version: 1,
+              data: item.type === "tool_call"
+                ? { callId: item.callId, name: item.name, status: item.status,
+                    detail: item.detail, ...(item.metadata ? { metadata: item.metadata } : {}), error: item.error, phase: phase }
+                : { text: item.text, phase: phase }
+            }]
+          };
+        }
+      });
+      return function() {};
+    } };
+  })`;
+  const evaluated = runPluginClientBundle("probe-plugin", clientBundle, runtime);
+  return {
+    ...evaluated,
+    serverId: "host-1",
+    clientBundle,
+    lifetime: new AbortController(),
+    queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
+  };
+}
+
+function installedTransform(plugin: InstalledPlugin): TimelineItemTransform {
+  return (input) => transformTimelineItem({ ...input, plugins: [plugin] });
+}
+
+function toolCall(callId: string, name: string): ToolCallItem {
+  return {
+    kind: "tool_call",
+    id: `tool-${callId}`,
+    timestamp: new Date("2026-01-01T00:00:00.000Z"),
+    payload: {
+      source: "agent",
+      data: {
+        provider: "codex",
+        callId,
+        name,
+        status: "completed",
+        error: null,
+        detail: { type: "unknown", input: { callId }, output: { callId } },
+      },
+    },
+  };
+}
+
+function pluginData(items: StreamItem[]): unknown[] {
+  return items.flatMap((item) => (item.kind === "plugin" ? [item.data] : []));
+}
+
+const presentationOptions = { level: "overview" as const, isTurnActive: true };
+
+function streamHarness(transform?: TimelineItemTransform) {
+  let state: { tail: StreamItem[]; head: StreamItem[] } = { tail: [], head: [] };
+  const present = createStreamPresentation();
+  return {
+    send(event: AgentStreamEventPayload) {
+      state = applyStreamEvent({ ...state, event, timestamp: new Date(1000) });
+      return this.render();
+    },
+    render(nextTransform = transform) {
+      return present({ ...presentationOptions, ...state, transform: nextTransform });
+    },
+    source: () => state,
+  };
+}
+
+function assistant(text: string, messageId = "message-1"): AgentStreamEventPayload {
+  return {
+    type: "timeline",
+    provider: "claude",
+    item: { type: "assistant_message", messageId, text },
+  };
+}
+
+function rows(result: { tail: StreamItem[]; head: StreamItem[] }): StreamItem[] {
+  return [...result.tail, ...result.head];
+}
+
+describe("stream presentation through installed plugins", () => {
+  it("offers every source tool call to an installed transformer in Overview mode", () => {
+    const calls = [toolCall("call-1", "bash"), toolCall("call-2", "read")];
+    const rendered = createStreamPresentation()({
+      ...presentationOptions,
+      tail: calls,
+      head: [],
+      transform: installedTransform(installProbe("tool_call")),
+    });
+    expect(pluginData([...rendered.tail, ...rendered.head])).toMatchObject([
+      { callId: "call-1", name: "bash", phase: "complete" },
+      { callId: "call-2", name: "read", phase: "complete" },
+    ]);
+  });
+
+  it.each([
+    { type: "turn_completed", provider: "claude" },
+    { type: "turn_canceled", provider: "claude", reason: "test cancellation" },
+    { type: "turn_failed", provider: "claude", error: "test failure" },
+  ] satisfies AgentStreamEventPayload[])(
+    "streams accumulated assistant text with one identity through $type",
+    (completion) => {
+      const harness = streamHarness(installedTransform(installProbe("assistant_message")));
+      const first = rows(harness.send(assistant("Header")));
+      const fullText = "Header\n\n\n# Body\n\n```ts\nconst x = 1;\n\nconst y = 2;\n```\n";
+      const live = rows(harness.send(assistant(fullText.slice("Header".length))));
+      const completed = rows(harness.send(completion));
+
+      expect(pluginData(first)).toEqual([{ text: "Header", phase: "streaming" }]);
+      expect(pluginData(live)).toEqual([{ text: fullText, phase: "streaming" }]);
+      expect(pluginData(completed)).toEqual([{ text: fullText, phase: "complete" }]);
+      expect(live.map((item) => item.id)).toEqual(first.map((item) => item.id));
+      expect(completed.map((item) => item.id)).toEqual(first.map((item) => item.id));
+      expect(rows(harness.source())).toMatchObject([{ kind: "assistant_message", text: fullText }]);
+    },
+  );
+
+  it("addresses a prompt a plugin replaced by the prompt's own id", () => {
+    const harness = streamHarness(installedTransform(installProbe("user_message")));
+    const rendered = rows(
+      harness.send({
+        type: "timeline",
+        provider: "claude",
+        item: { type: "user_message", messageId: "prompt-1", text: "Earlier prompt" },
+      }),
+    );
+    const source = rows(harness.source());
+
+    expect(source).toMatchObject([{ kind: "user_message", id: "prompt-1" }]);
+    expect(rendered).toMatchObject([{ kind: "plugin", id: "probe-plugin/prompt-1/0" }]);
+    // The chat outline jumps to the source id; the row it lands on is the plugin's.
+    expect(rendered.map(getStreamItemMessageId)).toEqual(["prompt-1"]);
+  });
+
+  it("finishes one message before streaming a different message ID", () => {
+    const harness = streamHarness(installedTransform(installProbe("assistant_message")));
+    harness.send(assistant("First\n\nBody", "first"));
+    const result = harness.send(assistant("Second", "second"));
+    expect(pluginData(rows(result))).toEqual([
+      { text: "First\n\nBody", phase: "complete" },
+      { text: "Second", phase: "streaming" },
+    ]);
+    expect(new Set(rows(result).map((item) => item.id)).size).toBe(2);
+  });
+
+  it("lets a plugin claim the accumulated message after earlier text used native Markdown", () => {
+    const harness = streamHarness();
+    harness.send(assistant("Header\n\nBody"));
+    const transform = installedTransform(
+      installProbe("assistant_message", 'item.text.includes("Body")'),
+    );
+    expect(pluginData(rows(harness.render(transform)))).toEqual([
+      { text: "Header\n\nBody", phase: "streaming" },
+    ]);
+    expect(rows(harness.render(transform))).toHaveLength(1);
+    expect(rows(harness.render()).map((item) => item.kind)).toEqual([
+      "assistant_message",
+      "assistant_message",
+    ]);
+  });
+
+  it("keeps completed native blocks stable while the last block grows and finishes", () => {
+    const harness = streamHarness();
+    const first = harness.send(assistant("Intro\n\n![Image](image.png)"));
+    const growing = harness.send(assistant("\n\nAfter\n"));
+    const last = harness.send(assistant("- item"));
+    const completed = harness.send({ type: "turn_completed", provider: "claude" });
+    expect(first.tail).toMatchObject([{ text: "Intro", blockIndex: 0 }]);
+    expect(first.head).toMatchObject([{ text: "![Image](image.png)", blockIndex: 1 }]);
+    expect(growing.tail[0]).toBe(first.tail[0]);
+    expect(growing.tail[1]).toBe(first.head[0]);
+    expect(last.tail).toBe(growing.tail);
+    expect(last.head).toMatchObject([{ text: "After\n- item", blockIndex: 2 }]);
+    expect(completed.tail).toEqual(rows(last));
+    expect(completed.tail[2]).toBe(last.head[0]);
+    expect(completed.head).toEqual([]);
+  });
+
+  it("keeps blank lines inside an open native code fence", () => {
+    const harness = streamHarness();
+    harness.send(assistant("Intro\n\n```ts\nconst a = 1;"));
+    const result = harness.send(assistant("\n\nconst b = 2;"));
+    expect(result.tail).toMatchObject([{ text: "Intro" }]);
+    expect(result.head).toMatchObject([{ text: "```ts\nconst a = 1;\n\nconst b = 2;" }]);
+  });
+
+  // Codex streams a line break and the next line's indent as their own chunks.
+  it("keeps a line break when a chunk ends in the next line's indent", () => {
+    const harness = streamHarness();
+    harness.send(assistant("```mermaid\nflowchart TD\n    A[Start] --> B[Review]\n"));
+    harness.send(assistant("   "));
+    const result = harness.send(assistant(" B --> C[Finish]\n```"));
+    expect(result.head).toMatchObject([
+      { text: "```mermaid\nflowchart TD\n    A[Start] --> B[Review]\n    B --> C[Finish]\n```" },
+    ]);
+  });
+
+  // One rendering path: a fetched message is the same block group as a streamed one,
+  // which is what lets find, scroll-to-message and history reveal address it by id.
+  // A link reference definition stays with the paragraph that uses it, so the split
+  // never leaves an empty row behind and the reference still resolves.
+  it("splits an assistant message into the same blocks through history and through the live head", () => {
+    const source = hydrateStreamState([
+      {
+        event: assistant("[Link][docs]\n\n[docs]: https://example.com\n\nClosing paragraph."),
+        timestamp: new Date(1000),
+      },
+    ]);
+    const messageId = source[0]!.id;
+    const present = (placement: "tail" | "head") =>
+      rows(
+        createStreamPresentation()({
+          ...presentationOptions,
+          tail: placement === "tail" ? source : [],
+          head: placement === "head" ? source : [],
+          transform: undefined,
+        }),
+      );
+    expect(present("tail")).toMatchObject([
+      {
+        id: `${messageId}:block:0`,
+        blockGroupId: messageId,
+        blockIndex: 0,
+        text: "[Link][docs]\n\n[docs]: https://example.com",
+      },
+      {
+        id: `${messageId}:block:1`,
+        blockGroupId: messageId,
+        blockIndex: 1,
+        text: "Closing paragraph.",
+      },
+    ]);
+    const blocks = (items: StreamItem[]) =>
+      items.map((item) => [item.id, item.kind === "assistant_message" ? item.text : null]);
+    expect(blocks(present("head"))).toEqual(blocks(present("tail")));
+  });
+
+  // Rows are addressed by id from outside presentation, so the same text has to land on
+  // the same ids whether the reader watched it arrive or opened the chat afterwards.
+  it("gives a streamed message the block ids its hydrated text would have had", () => {
+    const text = "Intro paragraph.\n\n# Heading\n\n- first\n- second\n\nClosing paragraph.";
+    const harness = streamHarness();
+    for (let end = 8; end < text.length; end += 8) {
+      harness.send(assistant(text.slice(end - 8, end)));
+    }
+    harness.send(assistant(text.slice(text.length - (text.length % 8 || 8))));
+    const streamed = rows(harness.send({ type: "turn_completed", provider: "claude" }));
+    const hydrated = rows(
+      createStreamPresentation()({
+        ...presentationOptions,
+        tail: hydrateStreamState([{ event: assistant(text), timestamp: new Date(1000) }]),
+        head: [],
+        transform: undefined,
+      }),
+    );
+    expect(streamed.map((item) => item.id)).toEqual(hydrated.map((item) => item.id));
+    expect(streamed.map((item) => item.kind === "assistant_message" && item.text)).toEqual(
+      hydrated.map((item) => item.kind === "assistant_message" && item.text),
+    );
+  });
+
+  it("repoints a block at the canonical source that replaced the streamed one", () => {
+    const harness = streamHarness();
+    harness.send(assistant("Streamed answer"));
+    const streamed = rows(harness.render());
+    expect(streamed[0]).not.toHaveProperty("timelineCursor");
+    const source = harness.source();
+    const live = source.head[0];
+    if (live?.kind !== "assistant_message") throw new Error("Expected a live assistant message");
+    const canonical = { ...live, timelineCursor: { epoch: "epoch-1", seq: 42 } };
+    const present = createStreamPresentation();
+    present({ ...presentationOptions, tail: [], head: [live], transform: undefined });
+    const repointed = rows(
+      present({ ...presentationOptions, tail: [], head: [canonical], transform: undefined }),
+    );
+    expect(repointed).toMatchObject([
+      {
+        id: streamed[0]!.id,
+        text: "Streamed answer",
+        timelineCursor: { epoch: "epoch-1", seq: 42 },
+      },
+    ]);
+  });
+
+  it("keeps a single-paragraph message a one-block group", () => {
+    const source = hydrateStreamState([
+      { event: assistant("Only one paragraph."), timestamp: new Date(1000) },
+    ]);
+    const messageId = source[0]!.id;
+    const result = createStreamPresentation()({
+      ...presentationOptions,
+      tail: source,
+      head: [],
+      transform: undefined,
+    });
+    expect(result.tail).toMatchObject([
+      {
+        id: `${messageId}:block:0`,
+        blockGroupId: messageId,
+        blockIndex: 0,
+        text: "Only one paragraph.",
+      },
+    ]);
+    expect(result.tail[0]!.id).not.toBe(messageId);
+  });
+
+  it("continues to stream inline reasoning with a stable plugin row", () => {
+    const harness = streamHarness(installedTransform(installProbe("reasoning")));
+    const first = harness.send({
+      type: "timeline",
+      provider: "claude",
+      item: { type: "reasoning", text: "First" },
+    });
+    const second = harness.send({
+      type: "timeline",
+      provider: "claude",
+      item: { type: "reasoning", text: "\n\nSecond" },
+    });
+    const done = harness.send({ type: "turn_completed", provider: "claude" });
+    expect(pluginData(rows(second))).toEqual([{ text: "First\n\nSecond", phase: "streaming" }]);
+    expect(pluginData(rows(done))).toEqual([{ text: "First\n\nSecond", phase: "complete" }]);
+    expect(rows(first)[0]?.id).toBe(rows(done)[0]?.id);
+  });
+
+  it("groups only unclaimed tools and passes unchanged tool details to the callback", () => {
+    const calls = [
+      toolCall("call-1", "read"),
+      toolCall("call-2", "read"),
+      toolCall("call-3", "bash"),
+    ];
+    const result = createStreamPresentation()({
+      ...presentationOptions,
+      isTurnActive: false,
+      tail: calls,
+      head: [],
+      transform: installedTransform(installProbe("tool_call", 'item.name === "bash"')),
+    });
+    expect(result.groupsByHostId.get(result.tail[0]!.id)?.run.calls).toEqual(calls.slice(0, 2));
+    expect(pluginData(rows(result))).toEqual([
+      {
+        callId: "call-3",
+        name: "bash",
+        status: "completed",
+        error: null,
+        detail: { type: "unknown", input: { callId: "call-3" }, output: { callId: "call-3" } },
+        phase: "complete",
+      },
+    ]);
+  });
+
+  it.each([
+    { status: "completed", error: null },
+    { status: "failed", error: { message: "Command failed" } },
+    { status: "canceled", error: null },
+  ] as const)("keeps a tool card's identity and full payload through $status", (completion) => {
+    const harness = streamHarness(installedTransform(installProbe("tool_call")));
+    const source = {
+      type: "tool_call" as const,
+      callId: "call-1",
+      name: "bash",
+      detail: { type: "shell" as const, command: "pwd", cwd: "/repo" },
+      metadata: { sequence: 1 },
+    };
+    const running = rows(
+      harness.send({
+        type: "timeline",
+        provider: "claude",
+        item: {
+          ...source,
+          status: "running",
+          error: null,
+        },
+      }),
+    );
+    const terminalItem = { ...source, ...completion };
+    const terminal = rows(
+      harness.send({
+        type: "timeline",
+        provider: "claude",
+        item: {
+          ...terminalItem,
+        },
+      }),
+    );
+    expect(pluginData(running)).toMatchObject([
+      { callId: "call-1", status: "running", phase: "streaming" },
+    ]);
+    expect(pluginData(terminal)).toEqual([
+      {
+        callId: source.callId,
+        name: source.name,
+        detail: source.detail,
+        metadata: source.metadata,
+        phase: "complete",
+        status: completion.status,
+        error: terminalItem.error,
+      },
+    ]);
+    expect(terminal.map((item) => item.id)).toEqual(running.map((item) => item.id));
+  });
+
+  it("offers one complete live source assistant message to an installed transformer", () => {
+    const sourceText =
+      '[IMPORTANT: User invoked the "diagnose" skill; follow its instructions. Full skill below.]\n\n# Diagnose\n\nFind the root cause.';
+    const event = {
+      type: "timeline" as const,
+      provider: "opencode" as const,
+      item: { type: "assistant_message" as const, messageId: "message-1", text: sourceText },
+    };
+    const timestamp = new Date("2026-01-01T00:00:00.000Z");
+    const transform = installedTransform(installProbe("assistant_message"));
+    const present = createStreamPresentation();
+
+    const fetched = hydrateStreamState([{ event, timestamp }]);
+    const history = present({ ...presentationOptions, tail: fetched, head: [], transform });
+    expect(pluginData(history.tail)).toEqual([{ text: sourceText, phase: "complete" }]);
+
+    const stream = applyStreamEvent({
+      tail: [],
+      head: [],
+      event,
+      timestamp,
+    });
+
+    const rendered = present({ ...presentationOptions, ...stream, transform });
+    expect(pluginData([...rendered.tail, ...rendered.head])).toEqual([
+      { text: sourceText, phase: "streaming" },
+    ]);
+  });
+});
+
+function createTimestamp(seed: number): Date {
+  return new Date(`2026-01-01T00:00:${seed.toString().padStart(2, "0")}.000Z`);
+}
+
+function userMessage(id: string, seed: number): UserMessageItem {
+  return {
+    kind: "user_message",
+    id,
+    text: id,
+    timestamp: createTimestamp(seed),
+  };
+}
+
+function assistantMessage(
+  id: string,
+  seed: number,
+): Extract<StreamItem, { kind: "assistant_message" }> {
+  return {
+    kind: "assistant_message",
+    id,
+    text: id,
+    timestamp: createTimestamp(seed),
+  };
+}
+
+describe("timeline presentation", () => {
+  const present = createStreamPresentation();
+  function projectTimelineItems(items: StreamItem[], transform?: TimelineItemTransform) {
+    return present({ ...presentationOptions, tail: items, head: [], transform }).tail;
+  }
+  const envelope =
+    "<spoken-input>\nPlease fix the voice chat.\n</spoken-input>\n<instruction>This message was spoken by the user. Respond using the speak tool only, not normal messages, because the user may not be looking at the chat.</instruction>";
+
+  it.each(["live", "history"])(
+    "shows only spoken words from a %s user message without mutating its source",
+    (source) => {
+      const item: UserMessageItem = Object.freeze({
+        ...userMessage(source, 1),
+        text: envelope,
+        messageId: "provider-message",
+        clientMessageId: "client-message",
+        turnId: "turn-1",
+        timelineCursor: { epoch: "epoch", seq: 12 },
+      });
+      const presentMessage = () =>
+        present({
+          ...presentationOptions,
+          tail: source === "history" ? [item] : [],
+          head: source === "live" ? [item] : [],
+          transform: undefined,
+        });
+      const projected = rows(presentMessage());
+      expect(projected).toEqual([{ ...item, text: "Please fix the voice chat." }]);
+      const model = buildAgentStreamRenderModel({
+        tail: source === "history" ? projected : [],
+        head: source === "live" ? projected : [],
+        isTurnActive: source === "live",
+        activeTurnStartedAt: item.timestamp,
+        platform: "native",
+        isMobileBreakpoint: true,
+      });
+      const rendered = [...model.history, ...model.segments.liveHead];
+      expect(rendered).toContainEqual({ ...item, text: "Please fix the voice chat." });
+      expect(item.text).toBe(envelope);
+      expect(rows(presentMessage())[0]).toBe(projected[0]);
+    },
+  );
+
+  it("supports older envelopes and preserves multiline spoken content", () => {
+    const item = {
+      ...userMessage("legacy", 1),
+      text: "<spoken-input>\nFirst line.\nSecond line with <example>XML</example>.\n</spoken-input>",
+    };
+    expect(projectTimelineItems([item])).toEqual([
+      { ...item, text: "First line.\nSecond line with <example>XML</example>." },
+    ]);
+  });
+
+  it("leaves ordinary messages, assistant examples and incomplete wrappers unchanged", () => {
+    const items: StreamItem[] = [
+      userMessage("ordinary", 1),
+      { ...assistantMessage("example", 2), text: envelope },
+      { ...userMessage("incomplete", 3), text: "<spoken-input>unfinished" },
+      { ...userMessage("quoted", 4), text: "Explain this example: " + envelope },
+      {
+        ...userMessage("xml", 5),
+        text: "<spoken-input>Example</spoken-input><instruction>Explain this XML.</instruction>",
+      },
+    ];
+    expect(projectTimelineItems(items)).toEqual(
+      items.map((item) =>
+        item.kind === "assistant_message"
+          ? { ...item, id: `${item.id}:block:0`, blockGroupId: item.id, blockIndex: 0 }
+          : item,
+      ),
+    );
+    expect(projectTimelineItems(items)[0]).toBe(items[0]);
+  });
+
+  it("keeps plugin transforms on the original source and respects replacements", () => {
+    const source: StreamItem = { ...userMessage("spoken", 1), text: envelope };
+    const inputs: string[] = [];
+    const transformed = projectTimelineItems([source], ({ item, sourceId }) => {
+      if (item.type === "user_message") inputs.push(item.text);
+      return [
+        {
+          type: "plugin",
+          pluginId: "test",
+          id: sourceId,
+          kind: "voice",
+          version: 1,
+          data: { text: "Custom voice row" },
+        },
+      ];
+    });
+    expect(inputs).toEqual([envelope]);
+    expect(transformed).toMatchObject([{ kind: "plugin", data: { text: "Custom voice row" } }]);
+    expect(projectTimelineItems([source], () => undefined)).toEqual([
+      { ...source, text: "Please fix the voice chat." },
+    ]);
+    expect(projectTimelineItems([source], () => [])).toEqual([]);
+  });
+});
diff --git a/packages/app/src/agent-stream/presentation.ts b/packages/app/src/agent-stream/presentation.ts
new file mode 100644
index 0000000000..b89f91f6c0
--- /dev/null
+++ b/packages/app/src/agent-stream/presentation.ts
@@ -0,0 +1,188 @@
+import type { AssistantMessageItem, StreamItem, UserMessageItem } from "@/types/stream";
+import type { TimelineItemTransform } from "@/plugins/timeline/model";
+import { projectPluginTimelineItems } from "@/plugins/timeline/projection";
+import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
+import {
+  prepareToolCallHistory,
+  projectToolCallDetailLevel,
+  type PreparedToolCallHistory,
+  type ToolCallDetailLevel,
+} from "@/tool-calls/detail-level/projection";
+
+interface PresentationInput {
+  tail: StreamItem[];
+  head: StreamItem[];
+  transform: TimelineItemTransform | undefined;
+  level: ToolCallDetailLevel;
+  isTurnActive: boolean;
+}
+
+function retainItems(previous: StreamItem[], next: StreamItem[]): StreamItem[] {
+  return previous.length === next.length && previous.every((item, index) => item === next[index])
+    ? previous
+    : next;
+}
+
+/**
+ * The source message a display row belongs to. Every assistant message is split into
+ * Markdown blocks, so an assistant row id never equals its message id; anything that
+ * addresses a message — find, scroll-to-message, history reveal — asks for this. A
+ * plugin row a timeline transformer projected answers for the item it replaced, whose
+ * id is what the chat outline and find hold.
+ */
+export function getStreamItemMessageId(item: StreamItem): string {
+  if (item.kind === "assistant_message") return item.blockGroupId ?? item.id;
+  if (item.kind === "plugin") return item.sourceId ?? item.id;
+  return item.id;
+}
+
+/**
+ * A block is reusable only when it still stands for the same source state. Text and
+ * turn are what the reader sees; cursor and timestamp are what the timeline reads back
+ * through the row — a reused block carrying a pre-canonical cursor reports a stale
+ * reading position and weakens fork-boundary resolution.
+ */
+function isReusableBlock(block: AssistantMessageItem, source: AssistantMessageItem, id: string) {
+  return (
+    block.id === id &&
+    block.turnId === source.turnId &&
+    block.timestamp.getTime() === source.timestamp.getTime() &&
+    block.timelineCursor?.epoch === source.timelineCursor?.epoch &&
+    block.timelineCursor?.seq === source.timelineCursor?.seq
+  );
+}
+
+/** Source messages reach plugins before any Markdown splitting or Overview grouping. */
+export function createStreamPresentation() {
+  const userMessageCache = new WeakMap<UserMessageItem, UserMessageItem>();
+
+  function presentUserMessage(item: UserMessageItem): UserMessageItem {
+    const cached = userMessageCache.get(item);
+    if (cached) return cached;
+
+    // Recognize the complete voice envelope, including older messages without the
+    // instruction suffix. Leave quoted examples and unrelated XML untouched.
+    const spokenInput =
+      /^\s*<spoken-input>([\s\S]*?)<\/spoken-input>(?:\s*<instruction>This message was spoken by the user\.[\s\S]*?<\/instruction>)?\s*$/.exec(
+        item.text,
+      );
+    const projected = spokenInput ? { ...item, text: spokenInput[1].trim() } : item;
+    userMessageCache.set(item, projected);
+    return projected;
+  }
+
+  const blocksBySource = new WeakMap<AssistantMessageItem, AssistantMessageItem[]>();
+  let liveSources = new Map<string, AssistantMessageItem>();
+  let historySource: StreamItem[] | undefined;
+  let historyTransform: TimelineItemTransform | undefined;
+  let historyRows: StreamItem[] = [];
+  let displayTail: StreamItem[] = [];
+  let displayHistory: StreamItem[] | undefined;
+  let promotedRows: StreamItem[] = [];
+  let preparedTail: StreamItem[] | undefined;
+  let preparedLevel: ToolCallDetailLevel | undefined;
+  let preparedHistory: PreparedToolCallHistory | null = null;
+
+  /**
+   * One display row per Markdown block. Each block renders on its own, so a construct
+   * that needs context from another block does not resolve: `splitMarkdownBlocks` keeps
+   * link reference definitions with the block that uses them, but a reference pointing
+   * at a definition several blocks away renders as literal text. Streamed messages
+   * always behaved this way; history now matches them.
+   */
+  function nativeBlocks(item: StreamItem): StreamItem[] {
+    if (item.kind === "user_message") return [presentUserMessage(item)];
+    if (item.kind !== "assistant_message") return [item];
+    const cached = blocksBySource.get(item);
+    if (cached) return cached;
+    const previousSource = liveSources.get(item.id);
+    const previous = previousSource && blocksBySource.get(previousSource);
+    // Parse only the growing last block on append, as the old live reducer did.
+    // Canonical text replacements are parsed afresh instead of joining fragments.
+    const isAppend = previousSource && previous && item.text.startsWith(previousSource.text);
+    let prefix: AssistantMessageItem[] = [];
+    let growingText = item.text;
+    if (isAppend) {
+      prefix = previous.slice(0, -1);
+      growingText =
+        previous[previous.length - 1]!.text + item.text.slice(previousSource.text.length);
+    }
+    const parsed = splitMarkdownBlocks(growingText);
+    // Whitespace-only text has no block, and a message still owns exactly one row.
+    const textBlocks = parsed.length > 0 || prefix.length > 0 ? parsed : [""];
+
+    const blocks = [...prefix];
+    for (const [offset, text] of textBlocks.entries()) {
+      const index = prefix.length + offset;
+      let blockText = text;
+      if (offset === textBlocks.length - 1) {
+        // The split drops trailing blank lines, including a line break followed only
+        // by the next line's indent. Keep them so the next append continues that line.
+        const trailingBlankLines = /\n\s*$/.exec(item.text)?.[0] ?? "";
+        blockText += trailingBlankLines;
+      }
+      const existing = previous?.[index];
+      const id = `${item.id}:block:${index}`;
+      if (existing?.text === blockText && isReusableBlock(existing, item, id)) {
+        blocks.push(existing);
+        continue;
+      }
+      blocks.push({
+        ...item,
+        id,
+        blockGroupId: item.id,
+        blockIndex: index,
+        text: blockText,
+      });
+    }
+    blocksBySource.set(item, blocks);
+    return blocks;
+  }
+
+  return (input: PresentationInput) => {
+    // Retained history is not reprojected or regrouped on each live text update.
+    if (historySource !== input.tail || historyTransform !== input.transform) {
+      // One rendering path: history splits the same way the live head does, and
+      // `blocksBySource` keeps both the live block identities and the split cost
+      // from being paid again when only the tail's array identity changed.
+      historyRows = projectPluginTimelineItems(input.tail, input.transform).flatMap<StreamItem>(
+        nativeBlocks,
+      );
+      historySource = input.tail;
+      historyTransform = input.transform;
+    }
+    const head: StreamItem[] = [];
+    const promoted: StreamItem[] = [];
+    const nextLiveSources = new Map<string, AssistantMessageItem>();
+    for (const item of projectPluginTimelineItems(input.head, input.transform, "streaming")) {
+      const blocks = nativeBlocks(item);
+      if (item.kind === "assistant_message") nextLiveSources.set(item.id, item);
+      if (item.kind === "assistant_message" && blocks.length > 1) {
+        promoted.push(...blocks.slice(0, -1));
+        head.push(blocks[blocks.length - 1]!);
+      } else {
+        head.push(...blocks);
+      }
+    }
+    liveSources = nextLiveSources;
+    const nextPromoted = retainItems(promotedRows, promoted);
+    if (displayHistory !== historyRows || nextPromoted !== promotedRows) {
+      displayTail = historyRows;
+      if (nextPromoted.length > 0) displayTail = [...historyRows, ...nextPromoted];
+      displayHistory = historyRows;
+      promotedRows = nextPromoted;
+    }
+    if (preparedTail !== displayTail || preparedLevel !== input.level) {
+      preparedHistory = prepareToolCallHistory(input.level, displayTail);
+      preparedTail = displayTail;
+      preparedLevel = input.level;
+    }
+    return projectToolCallDetailLevel({
+      level: input.level,
+      tail: displayTail,
+      head,
+      preparedHistory,
+      isTurnActive: input.isTurnActive,
+    });
+  };
+}
diff --git a/packages/app/src/agent-stream/prompt-jump-settle.ts b/packages/app/src/agent-stream/prompt-jump-settle.ts
index 1ef5e1f7ee..ec15afe177 100644
--- a/packages/app/src/agent-stream/prompt-jump-settle.ts
+++ b/packages/app/src/agent-stream/prompt-jump-settle.ts
@@ -5,7 +5,7 @@ interface PromptJumpScrollMetrics {
 }
 
 export interface PromptJumpSettleViewport {
-  findTargetTop(itemId: string): number | null;
+  findTargetTop(messageId: string): number | null;
   getContainerTop(): number;
   getScrollMetrics(): PromptJumpScrollMetrics;
   setScrollTop(scrollTop: number): void;
@@ -13,7 +13,7 @@ export interface PromptJumpSettleViewport {
 }
 
 export interface PromptJumpSettleController {
-  start(itemId: string): void;
+  start(messageId: string): void;
   cancel(): void;
   isActive(): boolean;
 }
@@ -32,7 +32,7 @@ export function createPromptJumpSettleController(input: {
   requestFrame: (callback: () => void) => number;
   cancelFrame: (frameId: number) => void;
 }): PromptJumpSettleController {
-  let activeItemId: string | null = null;
+  let activeMessageId: string | null = null;
   let frameId: number | null = null;
   let sampledFrames = 0;
   let stableFrames = 0;
@@ -41,7 +41,7 @@ export function createPromptJumpSettleController(input: {
   function finish(): void {
     if (frameId !== null) input.cancelFrame(frameId);
     unsubscribeFromUserIntent?.();
-    activeItemId = null;
+    activeMessageId = null;
     frameId = null;
     sampledFrames = 0;
     stableFrames = 0;
@@ -54,11 +54,11 @@ export function createPromptJumpSettleController(input: {
 
   function tick(): void {
     frameId = null;
-    const itemId = activeItemId;
-    if (itemId === null) return;
+    const messageId = activeMessageId;
+    if (messageId === null) return;
 
     sampledFrames += 1;
-    const targetTop = input.viewport.findTargetTop(itemId);
+    const targetTop = input.viewport.findTargetTop(messageId);
     if (targetTop !== null) {
       const delta = distanceFromLandingPosition(targetTop, input.viewport.getContainerTop());
       if (Math.abs(delta) <= POSITION_TOLERANCE_PX) {
@@ -72,7 +72,7 @@ export function createPromptJumpSettleController(input: {
         const before = input.viewport.getScrollMetrics();
         input.viewport.setScrollTop(before.scrollTop + delta);
         const after = input.viewport.getScrollMetrics();
-        const adjustedTargetTop = input.viewport.findTargetTop(itemId);
+        const adjustedTargetTop = input.viewport.findTargetTop(messageId);
         let remainingDelta = 0;
         if (adjustedTargetTop !== null) {
           remainingDelta = distanceFromLandingPosition(
@@ -97,15 +97,15 @@ export function createPromptJumpSettleController(input: {
   }
 
   return {
-    start(itemId) {
+    start(messageId) {
       finish();
-      activeItemId = itemId;
+      activeMessageId = messageId;
       unsubscribeFromUserIntent = input.viewport.subscribeToUserIntent(finish);
       scheduleNextFrame();
     },
     cancel: finish,
     isActive() {
-      return activeItemId !== null;
+      return activeMessageId !== null;
     },
   };
 }
diff --git a/packages/app/src/agent-stream/reading-anchor.test.ts b/packages/app/src/agent-stream/reading-anchor.test.ts
new file mode 100644
index 0000000000..74b2bd5bcd
--- /dev/null
+++ b/packages/app/src/agent-stream/reading-anchor.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from "vitest";
+import { createReadingAnchor } from "./reading-anchor";
+
+describe("reading anchor", () => {
+  const rows = [
+    { id: "above", top: 0, height: 500 },
+    { id: "reading", top: 500, height: 500 },
+    { id: "below", top: 1000, height: 500 },
+  ];
+
+  it("preserves wheel movement during an asynchronous prepend", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    expect(
+      anchor.reconcile(
+        440,
+        rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 2000 })),
+      ),
+    ).toBe(2440);
+    expect(
+      anchor.reconcile(
+        2280,
+        rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 2000 })),
+      ),
+    ).toBe(2280);
+  });
+
+  it("ignores growth below the reader and compensates growth above", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    expect(anchor.reconcile(600, [rows[0]!, rows[1]!, { ...rows[2]!, height: 2000 }])).toBe(600);
+    expect(
+      anchor.reconcile(600, [
+        { ...rows[0]!, height: 1000 },
+        { ...rows[1]!, top: 1000 },
+        { ...rows[2]!, top: 1500 },
+      ]),
+    ).toBe(1100);
+  });
+
+  it("leaves expansion of the row being read in place", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    expect(
+      anchor.reconcile(600, [rows[0]!, { ...rows[1]!, height: 1000 }, { ...rows[2]!, top: 1500 }]),
+    ).toBe(600);
+  });
+
+  it("keeps the existing reader through prepend measurements until the user scrolls", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(0, [{ id: "reading", top: 48, height: 100 }]);
+    const prepended = [
+      { id: "new", top: 2000, height: 57 },
+      { id: "reading", top: 2057, height: 100 },
+    ];
+    expect(anchor.reconcile(0, prepended)).toBe(2009);
+    expect(anchor.getRowId()).toBe("reading");
+    const measured = [
+      { id: "new", top: 2000, height: 100 },
+      { id: "reading", top: 2100, height: 100 },
+    ];
+    expect(anchor.reconcile(2009, measured)).toBe(2052);
+    expect(anchor.getRowId()).toBe("reading");
+    expect(anchor.reconcile(2000, measured, true)).toBe(2000);
+    expect(anchor.getRowId()).toBe("new");
+  });
+
+  it("retains the reader while the virtualizer initializes its mounted range", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    anchor.reconcile(600, [rows[2]!]);
+    expect(anchor.getRowId()).toBe("reading");
+    expect(
+      anchor.reconcile(
+        600,
+        rows.map((row) => ({ ...row, top: row.top + 2000 })),
+      ),
+    ).toBe(2600);
+  });
+
+  it("projects a prepend range without consuming the correction before layout commits", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    expect(anchor.project(440, { id: "reading", top: 2500 })).toBe(2440);
+    expect(anchor.project(440, { id: "reading", top: 2500 })).toBe(2440);
+    expect(
+      anchor.reconcile(
+        440,
+        rows.map((row) => ({ ...row, top: row.top + 2000 })),
+        true,
+      ),
+    ).toBe(2440);
+    expect(anchor.getRowId()).toBe("above");
+  });
+
+  it("repicks from user movement before applying a simultaneous layout correction", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    anchor.scroll(440);
+    expect(anchor.getRowId()).toBe("above");
+    expect(
+      anchor.reconcile(
+        440,
+        rows.map((row) => ({ ...row, top: row.top + 2000 })),
+      ),
+    ).toBe(2440);
+    expect(anchor.getRowId()).toBe("above");
+  });
+
+  it("releases the old reading position for explicit navigation", () => {
+    const anchor = createReadingAnchor();
+    anchor.reconcile(600, rows);
+    anchor.reset();
+    expect(anchor.getRowId()).toBeNull();
+    expect(
+      anchor.reconcile(
+        0,
+        rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 2000 })),
+      ),
+    ).toBe(0);
+  });
+});
diff --git a/packages/app/src/agent-stream/reading-anchor.ts b/packages/app/src/agent-stream/reading-anchor.ts
new file mode 100644
index 0000000000..4299f1d9c8
--- /dev/null
+++ b/packages/app/src/agent-stream/reading-anchor.ts
@@ -0,0 +1,45 @@
+interface RowGeometry {
+  id: string;
+  top: number;
+  height: number;
+}
+
+// A row must clear the reading line before the next row takes ownership.
+const READING_POSITION_OFFSET_PX = 8;
+
+// Content coordinates survive user scrolling. Layout commits replace the geometry;
+// scroll events reuse it, without another DOM measurement pass.
+export function createReadingAnchor() {
+  let anchor: { id: string; top: number } | null = null;
+  let geometry: readonly RowGeometry[] = [];
+  const readingRow = (scrollTop: number) =>
+    geometry.find((row) => row.top + row.height > scrollTop + READING_POSITION_OFFSET_PX);
+  const project = (scrollTop: number, row: Pick<RowGeometry, "id" | "top"> | undefined) =>
+    scrollTop + (anchor && row?.id === anchor.id ? row.top - anchor.top : 0);
+  return {
+    getRowId: () => anchor?.id ?? null,
+    getReadingRowId: (scrollTop: number) =>
+      readingRow(scrollTop)?.id ?? geometry.at(-1)?.id ?? null,
+    project,
+    reset() {
+      anchor = null;
+    },
+    scroll(scrollTop: number) {
+      const next = readingRow(scrollTop);
+      anchor = next ? { id: next.id, top: next.top } : null;
+    },
+    reconcile(scrollTop: number, rows: readonly RowGeometry[], userScrolled = false): number {
+      geometry = rows;
+      const previous = anchor && rows.find((row) => row.id === anchor?.id);
+      // The first virtualized commit can precede its mounted range. Keep the
+      // pinned reader until it mounts, rather than adopting an unrelated row.
+      if (anchor && !previous && !userScrolled) return scrollTop;
+      const correctedTop = project(scrollTop, previous ?? undefined);
+      // A prepend can expose the bottom of an estimated row above the reader.
+      // Do not transfer ownership to it until the user moves the reading position.
+      const next = previous && !userScrolled ? previous : readingRow(correctedTop);
+      anchor = next ? { id: next.id, top: next.top } : null;
+      return correctedTop;
+    },
+  };
+}
diff --git a/packages/app/src/agent-stream/scroll-keyboard-dismiss/use-scroll-keyboard-dismiss.ts b/packages/app/src/agent-stream/scroll-keyboard-dismiss/use-scroll-keyboard-dismiss.ts
index 8632cc2bc1..fb78eea9b5 100644
--- a/packages/app/src/agent-stream/scroll-keyboard-dismiss/use-scroll-keyboard-dismiss.ts
+++ b/packages/app/src/agent-stream/scroll-keyboard-dismiss/use-scroll-keyboard-dismiss.ts
@@ -5,7 +5,7 @@ import {
   type NativeScrollEvent,
   type NativeSyntheticEvent,
 } from "react-native";
-import { useKeyboardShift } from "@/hooks/keyboard-shift-context";
+import { useKeyboardShift } from "@/keyboard/shift";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import {
   beginDrag,
diff --git a/packages/app/src/agent-stream/strategy-native.tsx b/packages/app/src/agent-stream/strategy-native.tsx
index b51954a6d0..65f535db11 100644
--- a/packages/app/src/agent-stream/strategy-native.tsx
+++ b/packages/app/src/agent-stream/strategy-native.tsx
@@ -9,7 +9,6 @@ import {
 } from "react";
 import {
   FlatList,
-  Keyboard,
   Platform,
   View,
   type LayoutChangeEvent,
@@ -23,6 +22,7 @@ import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { useStableEvent } from "@/hooks/use-stable-event";
+import { useKeyboardStreamInset } from "@/keyboard/shift";
 import { useRevisedHistoryRows } from "./history-row-revision";
 import { useBottomAnchorController } from "./bottom-anchor-controller";
 import { useScrollKeyboardDismiss } from "./scroll-keyboard-dismiss/use-scroll-keyboard-dismiss";
@@ -42,6 +42,7 @@ import {
   type HistoryStartPaginationInput,
   type HistoryStartPaginationTransition,
 } from "./history-start-pagination";
+import { useStreamTopOverlayInset } from "./top-overlay";
 import {
   createHistoryStartSettleScheduler,
   type HistoryStartSettleScheduler,
@@ -104,9 +105,10 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
   const scrollOffsetYRef = useRef(0);
   const isUserScrollActiveRef = useRef(false);
   const scrollKeyboardDismiss = useScrollKeyboardDismiss();
+  const streamKeyboardInset = useKeyboardStreamInset();
   const userScrollEndFrameIdRef = useRef<number | null>(null);
   const programmaticScrollEventBudgetRef = useRef(0);
-  const [isNativeViewportSettling, setIsNativeViewportSettling] = useState(false);
+  const isNativeViewportSettlingRef = useRef(false);
   const nativeViewportSettlingFrameIdRef = useRef<number | null>(null);
   const historyStartReadyRef = useRef(false);
   const [historyStartPaginationState, setHistoryStartPaginationState] = useState(
@@ -208,12 +210,12 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
 
   const markNativeViewportSettling = useCallback(() => {
     clearNativeViewportSettling();
-    setIsNativeViewportSettling(true);
+    isNativeViewportSettlingRef.current = true;
     let remainingFrames = 4;
     const tick = () => {
       if (remainingFrames <= 0) {
         nativeViewportSettlingFrameIdRef.current = null;
-        setIsNativeViewportSettling(false);
+        isNativeViewportSettlingRef.current = false;
         return;
       }
       remainingFrames -= 1;
@@ -222,13 +224,13 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     nativeViewportSettlingFrameIdRef.current = requestAnimationFrame(tick);
   }, [clearNativeViewportSettling]);
 
-  const bottomAnchorTransportBehavior = useMemo(
+  const getBottomAnchorTransportBehavior = useCallback(
     () =>
       resolveBottomAnchorTransportBehavior({
         strategy,
-        isViewportSettling: isNativeViewportSettling,
+        isViewportSettling: isNativeViewportSettlingRef.current,
       }),
-    [isNativeViewportSettling, strategy],
+    [strategy],
   );
 
   const scrollToBottom = useCallback(
@@ -253,7 +255,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     routeRequest: routeBottomAnchorRequest,
     isAuthoritativeHistoryReady,
     renderStrategy: "inverted-stream",
-    transportBehavior: bottomAnchorTransportBehavior,
+    getTransportBehavior: getBottomAnchorTransportBehavior,
     getMeasurementState: () => streamViewportMetricsRef.current,
     isNearBottom: () => {
       const metrics = streamViewportMetricsRef.current;
@@ -273,6 +275,34 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     Platform.OS === "android" && bottomAnchorController.mode === "sticky-bottom"
       ? undefined
       : DEFAULT_MAINTAIN_VISIBLE_CONTENT_POSITION;
+  const topOverlayInset = useStreamTopOverlayInset();
+  // The list is inverted, so its content's bottom padding is the visual top.
+  const listContentContainerStyle = useMemo(
+    () => [
+      baseListContentContainerStyle,
+      {
+        paddingBottom: streamKeyboardInset.contentContainerPaddingBottom + topOverlayInset,
+      },
+    ],
+    [
+      baseListContentContainerStyle,
+      streamKeyboardInset.contentContainerPaddingBottom,
+      topOverlayInset,
+    ],
+  );
+  const listInsetProps = useMemo(
+    () =>
+      streamKeyboardInset.contentInset
+        ? {
+            automaticallyAdjustContentInsets: false,
+            automaticallyAdjustsScrollIndicatorInsets: false,
+            contentInsetAdjustmentBehavior: "never" as const,
+            contentInset: streamKeyboardInset.contentInset,
+            scrollIndicatorInsets: streamKeyboardInset.contentInset,
+          }
+        : {},
+    [streamKeyboardInset.contentInset],
+  );
 
   useEffect(() => {
     streamViewportMetricsRef.current = {
@@ -288,7 +318,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     isUserScrollActiveRef.current = false;
     clearPendingUserScrollEnd();
     clearNativeViewportSettling();
-    setIsNativeViewportSettling(false);
+    isNativeViewportSettlingRef.current = false;
     historyStartReadyRef.current = false;
     const initialHistoryStartState = createHistoryStartPaginationState();
     historyStartPaginationStateRef.current = initialHistoryStartState;
@@ -305,27 +335,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     };
   }, [agentId, clearNativeViewportSettling, clearPendingUserScrollEnd, evaluateHistoryStart]);
 
-  useEffect(() => {
-    const keyboardEvents = [
-      "keyboardWillShow",
-      "keyboardWillHide",
-      "keyboardDidShow",
-      "keyboardDidHide",
-      "keyboardWillChangeFrame",
-      "keyboardDidChangeFrame",
-    ] as const;
-    const subscriptions = keyboardEvents.map((eventName) =>
-      Keyboard.addListener(eventName, () => {
-        markNativeViewportSettling();
-      }),
-    );
-    return () => {
-      for (const subscription of subscriptions) {
-        subscription.remove();
-      }
-      clearNativeViewportSettling();
-    };
-  }, [clearNativeViewportSettling, markNativeViewportSettling]);
+  useEffect(() => () => clearNativeViewportSettling(), [clearNativeViewportSettling]);
 
   useEffect(() => {
     bottomAnchorController.prepareForStickyContentChange();
@@ -560,6 +570,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
   // data or the live header changes, preserving the row identities above.
   return (
     <FlatList
+      {...listInsetProps}
       ref={flatListRef}
       data={historyRows}
       renderItem={renderItem}
@@ -569,7 +580,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
       nativeID="agent-chat-scroll-native-virtualized"
       ListHeaderComponent={liveHeaderContent ?? undefined}
       ListFooterComponent={historyFooterContent ?? undefined}
-      contentContainerStyle={baseListContentContainerStyle}
+      contentContainerStyle={listContentContainerStyle}
       style={listStyle}
       onLayout={handleListLayout}
       onScroll={handleScroll}
diff --git a/packages/app/src/agent-stream/strategy-web.test.tsx b/packages/app/src/agent-stream/strategy-web.test.tsx
index 1d86943e05..1f61d0a14c 100644
--- a/packages/app/src/agent-stream/strategy-web.test.tsx
+++ b/packages/app/src/agent-stream/strategy-web.test.tsx
@@ -1,6 +1,7 @@
 /**
  * @vitest-environment jsdom
  */
+import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import React from "react";
 import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
@@ -31,7 +32,7 @@ vi.mock("react-native-unistyles", () => ({
   withUnistyles: (Component: React.ComponentType) => Component,
 }));
 
-function userMessage(index: number): StreamItem {
+function userMessage(index: number): Extract<StreamItem, { kind: "user_message" }> {
   return {
     kind: "user_message",
     id: `message-${index}`,
@@ -54,6 +55,30 @@ function createRenderers(onRowRender: () => void): StreamSegmentRenderers {
   };
 }
 
+function MeasuredTestRow({ item }: { item: StreamItem }) {
+  const [loaded, setLoaded] = React.useState(false);
+  const load = React.useCallback(() => setLoaded(true), []);
+  const height = item.kind === "user_message" && item.text === "grown" ? 120 : 24;
+  const measure = React.useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!node?.parentElement) return;
+      Object.defineProperty(node.parentElement, "offsetHeight", {
+        configurable: true,
+        value: height,
+      });
+    },
+    [height],
+  );
+  return (
+    <div ref={measure}>
+      <button type="button" onClick={load}>
+        {loaded ? "Loaded" : "Load"}
+      </button>
+      {item.id}
+    </div>
+  );
+}
+
 describe("createWebStreamStrategy", () => {
   let root: Root | null = null;
   let container: HTMLDivElement | null = null;
@@ -144,6 +169,7 @@ describe("createWebStreamStrategy", () => {
             listStyle: null,
             baseListContentContainerStyle: null,
             forwardListContentContainerStyle: null,
+            contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
           })}
         </>,
       );
@@ -153,6 +179,75 @@ describe("createWebStreamStrategy", () => {
     expect(rowRenderCount.mock.calls.length).toBeLessThanOrEqual(historyVirtualized.length);
   });
 
+  it("retains a row's DOM and local state when recent history becomes virtualized", () => {
+    const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+    const item = userMessage(0);
+    const renderRow = (rowItem: StreamItem) => <MeasuredTestRow item={rowItem} />;
+    const input: StreamRenderInput = {
+      agentId: "agent",
+      segments: { historyVirtualized: [], historyMounted: [item], liveHead: [] },
+      boundary: { hasVirtualizedHistory: false, hasMountedHistory: true, hasLiveHead: false },
+      renderers: {
+        renderHistoryVirtualizedRow: renderRow,
+        renderHistoryMountedRow: renderRow,
+        renderLiveHeadRow: renderRow,
+        renderLiveAuxiliary: () => null,
+      },
+      listEmptyComponent: null,
+      viewportRef: React.createRef<StreamViewportHandle>(),
+      routeBottomAnchorRequest: null,
+      isAuthoritativeHistoryReady: true,
+      onNearBottomChange: () => {},
+      onNearHistoryStart: () => true,
+      isLoadingOlderHistory: false,
+      hasOlderHistory: false,
+      olderHistoryProgressKey: null,
+      scrollEnabled: true,
+      listStyle: null,
+      baseListContentContainerStyle: null,
+      forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+    };
+    act(() => root?.render(strategy.render(input)));
+    const row = container.querySelector('[data-history-row-id="message-0"]')!;
+    act(() => row.querySelector("button")!.click());
+    expect(row.querySelector("button")!.textContent).toBe("Loaded");
+    const viewport = container.querySelector('[data-testid="agent-chat-scroll"]')!;
+    Object.defineProperty(viewport, "clientHeight", { configurable: true, value: 500 });
+    act(() =>
+      root?.render(
+        strategy.render({
+          ...input,
+          segments: { historyVirtualized: [item], historyMounted: [userMessage(1)], liveHead: [] },
+          boundary: { ...input.boundary, hasVirtualizedHistory: true },
+        }),
+      ),
+    );
+    expect(container.querySelector('[data-history-row-id="message-0"]')).toBe(row);
+    expect(row.isConnected).toBe(true);
+    expect(row.querySelector("button")!.textContent).toBe("Loaded");
+    act(() =>
+      root?.render(
+        strategy.render({
+          ...input,
+          segments: {
+            historyVirtualized: [{ ...item, text: "grown" }, userMessage(1)],
+            historyMounted: [userMessage(2)],
+            liveHead: [],
+          },
+          boundary: { ...input.boundary, hasVirtualizedHistory: true },
+        }),
+      ),
+    );
+    expect(
+      (container.querySelector('[data-history-row-id="message-1"]') as HTMLElement).style.transform,
+    ).toBe("translateY(120px)");
+    expect(row.querySelector("button")!.textContent).toBe("Loaded");
+  });
+
   it("keeps the timeline width stable with an overlay scrollbar", () => {
     const strategy = createWebStreamStrategy({ isMobileBreakpoint: false });
     container = document.createElement("div");
@@ -187,6 +282,7 @@ describe("createWebStreamStrategy", () => {
           listStyle: null,
           baseListContentContainerStyle: null,
           forwardListContentContainerStyle: null,
+          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
         }),
       );
     });
@@ -233,6 +329,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -291,6 +388,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     const unrevised = {
       contentById: new Set<string>(),
@@ -354,6 +452,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -429,6 +528,7 @@ describe("createWebStreamStrategy", () => {
           listStyle: null,
           baseListContentContainerStyle: null,
           forwardListContentContainerStyle: null,
+          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
         }),
       );
     });
@@ -473,6 +573,7 @@ describe("createWebStreamStrategy", () => {
           listStyle: null,
           baseListContentContainerStyle: null,
           forwardListContentContainerStyle: null,
+          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
         }),
       );
     });
@@ -483,10 +584,7 @@ describe("createWebStreamStrategy", () => {
     }
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 766 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 5725 });
-    Object.defineProperty(scrollContainer, "scrollTop", {
-      configurable: true,
-      value: 4959.1708984375,
-    });
+    scrollContainer.scrollTop = 4959.1708984375;
     scrollTo.mockClear();
 
     act(() => {
@@ -496,10 +594,7 @@ describe("createWebStreamStrategy", () => {
     expect(scrollTo).toHaveBeenCalledWith({ top: 5725, behavior: "auto" });
 
     scrollTo.mockClear();
-    Object.defineProperty(scrollContainer, "scrollTop", {
-      configurable: true,
-      value: 4960.5,
-    });
+    scrollContainer.scrollTop = 4960.5;
 
     act(() => {
       viewportRef.current?.scrollToBottom("message-sent");
@@ -508,10 +603,7 @@ describe("createWebStreamStrategy", () => {
     expect(scrollTo).toHaveBeenCalledWith({ top: 5725, behavior: "auto" });
 
     scrollTo.mockClear();
-    Object.defineProperty(scrollContainer, "scrollTop", {
-      configurable: true,
-      value: 4967,
-    });
+    scrollContainer.scrollTop = 4967;
 
     act(() => {
       viewportRef.current?.scrollToBottom("message-sent");
@@ -527,7 +619,7 @@ describe("createWebStreamStrategy", () => {
       y?: number,
     ) {
       const top = typeof options === "object" ? (options.top ?? 0) : (y ?? 0);
-      Object.defineProperty(this, "scrollTop", { configurable: true, value: top });
+      this.scrollTop = top;
     });
     const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
     const viewportRef = React.createRef<StreamViewportHandle>();
@@ -553,6 +645,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -576,7 +669,7 @@ describe("createWebStreamStrategy", () => {
     }
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 400 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1200 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 0 });
+    scrollContainer.scrollTop = 0;
 
     act(() => {
       root?.render(
@@ -612,10 +705,7 @@ describe("createWebStreamStrategy", () => {
       y?: number,
     ) {
       const top = typeof options === "object" ? (options.top ?? 0) : (y ?? 0);
-      Object.defineProperty(this, "scrollTop", {
-        configurable: true,
-        value: top,
-      });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
 
@@ -646,6 +736,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -672,7 +763,7 @@ describe("createWebStreamStrategy", () => {
     const scrollElement = scrollContainer;
     Object.defineProperty(scrollElement, "clientHeight", { configurable: true, value: 400 });
     Object.defineProperty(scrollElement, "scrollHeight", { configurable: true, value: 400 });
-    Object.defineProperty(scrollElement, "scrollTop", { configurable: true, value: 0 });
+    scrollElement.scrollTop = 0;
     await act(async () => {
       await new Promise((resolve) => requestAnimationFrame(resolve));
     });
@@ -714,10 +805,7 @@ describe("createWebStreamStrategy", () => {
       y?: number,
     ) {
       const top = typeof options === "object" ? (options.top ?? 0) : (y ?? 0);
-      Object.defineProperty(this, "scrollTop", {
-        configurable: true,
-        value: top,
-      });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
 
@@ -755,6 +843,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -775,7 +864,7 @@ describe("createWebStreamStrategy", () => {
     }
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 400 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1400 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1000 });
+    scrollContainer.scrollTop = 1000;
     await act(async () => {
       await new Promise((resolve) => requestAnimationFrame(resolve));
     });
@@ -787,7 +876,7 @@ describe("createWebStreamStrategy", () => {
     act(() => {
       scrollContainer.dispatchEvent(new WheelEvent("wheel", { deltaY: -240 }));
     });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 0 });
+    scrollContainer.scrollTop = 0;
     act(() => {
       scrollContainer.dispatchEvent(new Event("scroll"));
     });
@@ -820,10 +909,7 @@ describe("createWebStreamStrategy", () => {
       y?: number,
     ) {
       const top = typeof options === "object" ? (options.top ?? 0) : (y ?? 0);
-      Object.defineProperty(this, "scrollTop", {
-        configurable: true,
-        value: top,
-      });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
 
@@ -860,6 +946,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -880,7 +967,7 @@ describe("createWebStreamStrategy", () => {
     }
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1491 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 0 });
+    scrollContainer.scrollTop = 0;
     await act(async () => {
       await new Promise((resolve) => requestAnimationFrame(resolve));
     });
@@ -889,17 +976,17 @@ describe("createWebStreamStrategy", () => {
     });
     scrollTo.mockClear();
 
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 991 });
+    scrollContainer.scrollTop = 991;
     act(() => {
       scrollContainer.dispatchEvent(new WheelEvent("wheel", { deltaY: -900 }));
     });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 91 });
+    scrollContainer.scrollTop = 91;
     act(() => {
       scrollContainer.dispatchEvent(new Event("scroll"));
     });
     expect(scrollTo).not.toHaveBeenCalled();
 
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 0 });
+    scrollContainer.scrollTop = 0;
     act(() => {
       scrollContainer.dispatchEvent(new Event("scroll"));
     });
@@ -925,10 +1012,7 @@ describe("createWebStreamStrategy", () => {
       y?: number,
     ) {
       const top = typeof options === "object" ? (options.top ?? 0) : (y ?? 0);
-      Object.defineProperty(this, "scrollTop", {
-        configurable: true,
-        value: top,
-      });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
 
@@ -959,6 +1043,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -979,7 +1064,7 @@ describe("createWebStreamStrategy", () => {
     }
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 550 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 50 });
+    scrollContainer.scrollTop = 50;
     await act(async () => {
       await new Promise((resolve) => requestAnimationFrame(resolve));
     });
@@ -991,13 +1076,13 @@ describe("createWebStreamStrategy", () => {
     act(() => {
       scrollContainer.dispatchEvent(new WheelEvent("wheel", { deltaY: -30 }));
     });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 20 });
+    scrollContainer.scrollTop = 20;
     act(() => {
       scrollContainer.dispatchEvent(new Event("scroll"));
     });
     expect(scrollTo).not.toHaveBeenCalled();
 
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 50 });
+    scrollContainer.scrollTop = 50;
     act(() => {
       scrollContainer.dispatchEvent(new Event("scroll"));
     });
@@ -1025,7 +1110,7 @@ describe("createWebStreamStrategy", () => {
   it("keeps following output after geometry, nested-scroll, and zoom wheel events", () => {
     const scrollTo = vi.fn(function (this: HTMLElement, options?: ScrollToOptions | number) {
       const top = typeof options === "object" ? (options.top ?? 0) : 0;
-      Object.defineProperty(this, "scrollTop", { configurable: true, value: top });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
     const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
@@ -1056,6 +1141,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -1070,7 +1156,7 @@ describe("createWebStreamStrategy", () => {
     Object.defineProperty(scrollContainer, "clientWidth", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "offsetWidth", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1500 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1000 });
+    scrollContainer.scrollTop = 1000;
     scrollContainer.getBoundingClientRect = () =>
       ({
         bottom: 500,
@@ -1110,7 +1196,7 @@ describe("createWebStreamStrategy", () => {
       window.dispatchEvent(jitterPointerMove);
     });
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 700 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 800 });
+    scrollContainer.scrollTop = 800;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     scrollTo.mockClear();
 
@@ -1118,11 +1204,11 @@ describe("createWebStreamStrategy", () => {
     nestedScroller.style.overflowY = "auto";
     Object.defineProperty(nestedScroller, "clientHeight", { configurable: true, value: 100 });
     Object.defineProperty(nestedScroller, "scrollHeight", { configurable: true, value: 300 });
-    Object.defineProperty(nestedScroller, "scrollTop", { configurable: true, value: 100 });
+    nestedScroller.scrollTop = 100;
     scrollContainer.append(nestedScroller);
     act(() => {
       nestedScroller.dispatchEvent(new WheelEvent("wheel", { bubbles: true, deltaY: -100 }));
-      Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 700 });
+      scrollContainer.scrollTop = 700;
       scrollContainer.dispatchEvent(new Event("scroll"));
       scrollContainer.dispatchEvent(
         new WheelEvent("wheel", { bubbles: true, ctrlKey: true, deltaY: -100 }),
@@ -1145,7 +1231,7 @@ describe("createWebStreamStrategy", () => {
   it("stops following output after scrollbar and middle-button upward scrolling", () => {
     const scrollTo = vi.fn(function (this: HTMLElement, options?: ScrollToOptions | number) {
       const top = typeof options === "object" ? (options.top ?? 0) : 0;
-      Object.defineProperty(this, "scrollTop", { configurable: true, value: top });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
     const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
@@ -1175,6 +1261,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -1189,7 +1276,7 @@ describe("createWebStreamStrategy", () => {
     Object.defineProperty(scrollContainer, "clientWidth", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "offsetWidth", { configurable: true, value: 520 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1500 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1000 });
+    scrollContainer.scrollTop = 1000;
     scrollContainer.getBoundingClientRect = () =>
       ({
         bottom: 500,
@@ -1217,7 +1304,7 @@ describe("createWebStreamStrategy", () => {
       pointerType: { value: "mouse" },
     });
     act(() => scrollContainer.dispatchEvent(scrollbarPointerDown));
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 700 });
+    scrollContainer.scrollTop = 700;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     scrollTo.mockClear();
 
@@ -1233,7 +1320,7 @@ describe("createWebStreamStrategy", () => {
     });
     expect(scrollTo).not.toHaveBeenCalled();
 
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1300 });
+    scrollContainer.scrollTop = 1300;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     Object.defineProperty(scrollContainer, "offsetWidth", { configurable: true, value: 500 });
     scrollContainer.getBoundingClientRect = () =>
@@ -1261,7 +1348,7 @@ describe("createWebStreamStrategy", () => {
       pointerType: { value: "mouse" },
     });
     act(() => scrollContainer.dispatchEvent(overlayScrollbarPointerDown));
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 900 });
+    scrollContainer.scrollTop = 900;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     scrollTo.mockClear();
 
@@ -1280,7 +1367,7 @@ describe("createWebStreamStrategy", () => {
     });
     expect(scrollTo).not.toHaveBeenCalled();
 
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1400 });
+    scrollContainer.scrollTop = 1400;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     const autoscrollPointerDown = new MouseEvent("pointerdown", {
       bubbles: true,
@@ -1314,7 +1401,7 @@ describe("createWebStreamStrategy", () => {
       window.dispatchEvent(autoscrollPointerUp);
       window.dispatchEvent(autoscrollPointerMove);
     });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1000 });
+    scrollContainer.scrollTop = 1000;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     scrollTo.mockClear();
 
@@ -1375,7 +1462,7 @@ describe("createWebStreamStrategy", () => {
     };
     const scrollTo = vi.fn(function (this: HTMLElement, options?: ScrollToOptions | number) {
       const top = typeof options === "object" ? (options.top ?? 0) : 0;
-      Object.defineProperty(this, "scrollTop", { configurable: true, value: top });
+      this.scrollTop = top;
     });
     HTMLElement.prototype.scrollTo = scrollTo;
     const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
@@ -1408,6 +1495,7 @@ describe("createWebStreamStrategy", () => {
       listStyle: null,
       baseListContentContainerStyle: null,
       forwardListContentContainerStyle: null,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
     };
     const renderWithActivity = (active: boolean, input: StreamRenderInput = renderInput) => (
       <RetainedPanelActivity active={active}>{strategy.render(input)}</RetainedPanelActivity>
@@ -1431,12 +1519,18 @@ describe("createWebStreamStrategy", () => {
       throw new Error("Expected retained history rows");
     }
     let rowsShifted = false;
-    scrollContainer.getBoundingClientRect = vi.fn(() => ({ top: 0 }) as DOMRect);
-    firstRow.getBoundingClientRect = vi.fn(() => ({ bottom: rowsShifted ? 4 : 120 }) as DOMRect);
-    secondRow.getBoundingClientRect = vi.fn(() => ({ bottom: rowsShifted ? 120 : 160 }) as DOMRect);
+    scrollContainer.getBoundingClientRect = () => ({ top: 0, height: 500, bottom: 500 }) as DOMRect;
+    firstRow.getBoundingClientRect = () =>
+      ({ top: rowsShifted ? -116 : 0, height: 120, bottom: rowsShifted ? 4 : 120 }) as DOMRect;
+    secondRow.getBoundingClientRect = () =>
+      ({
+        top: rowsShifted ? 4 : 120,
+        height: rowsShifted ? 116 : 40,
+        bottom: rowsShifted ? 120 : 160,
+      }) as DOMRect;
     Object.defineProperty(scrollContainer, "clientHeight", { configurable: true, value: 500 });
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 1500 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 1000 });
+    scrollContainer.scrollTop = 1000;
     act(() => scrollContainer.dispatchEvent(new Event("scroll")));
     const viewportObservation = observed.get(scrollContainer);
     expect(viewportObservation).toBeDefined();
@@ -1467,7 +1561,7 @@ describe("createWebStreamStrategy", () => {
     act(() => root?.render(renderWithActivity(false)));
     scrollTo.mockClear();
     Object.defineProperty(scrollContainer, "scrollHeight", { configurable: true, value: 2200 });
-    Object.defineProperty(scrollContainer, "scrollTop", { configurable: true, value: 0 });
+    scrollContainer.scrollTop = 0;
     act(() => {
       scrollContainer.dispatchEvent(new WheelEvent("wheel", { deltaY: -100 }));
       scrollContainer.dispatchEvent(new Event("scroll"));
diff --git a/packages/app/src/agent-stream/strategy-web.tsx b/packages/app/src/agent-stream/strategy-web.tsx
index 25cda1829d..226b7c1e2a 100644
--- a/packages/app/src/agent-stream/strategy-web.tsx
+++ b/packages/app/src/agent-stream/strategy-web.tsx
@@ -7,18 +7,25 @@ import React, {
   useRef,
   useState,
 } from "react";
-import { measureElement as measureVirtualElement, useVirtualizer } from "@tanstack/react-virtual";
+import {
+  defaultRangeExtractor,
+  observeElementOffset,
+  measureElement as measureVirtualElement,
+  useVirtualizer,
+  type Range as VirtualRange,
+  type Virtualizer,
+} from "@tanstack/react-virtual";
+import { flushSync } from "react-dom";
 import { withUnistyles } from "react-native-unistyles";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useStableEvent } from "@/hooks/use-stable-event";
+import type { StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { WEB_SCROLLBAR_SIZE_PX } from "@/styles/web-scrollbar";
 import { DomOverlayScrollbar } from "@/components/ui/overlay-scrollbar/dom-overlay-scrollbar";
-import {
-  estimateStreamItemHeight,
-  shouldAdjustScrollForVirtualRowResize,
-} from "./web-virtualization";
+import { estimateStreamItemHeight } from "./web-virtualization";
+import { createReadingAnchor } from "./reading-anchor";
 import type { StreamRenderInput, StreamStrategy, StreamViewportHandle } from "./strategy";
 import { useRevisedHistoryRows } from "./history-row-revision";
 import { createStreamStrategy } from "./strategy";
@@ -36,18 +43,14 @@ import {
   createHistoryStartSettleScheduler,
   type HistoryStartSettleScheduler,
 } from "./history-start-settle-scheduler";
+import { useChatFindSelectedMessageId } from "@/agent-stream/chat-find";
+import { getStreamItemMessageId } from "./presentation";
 import { useScrollToMessage } from "./use-scroll-to-message.web";
 
 interface CreateWebStreamStrategyInput {
   isMobileBreakpoint: boolean;
 }
 
-interface HistoryStartPrependAnchor {
-  progressKey: string;
-  rowId: string;
-  viewportOffset: number;
-}
-
 type ScrollBehaviorLike = "auto" | "smooth";
 
 const WEB_BOTTOM_SETTLE_TIMEOUT_MS = 200;
@@ -60,24 +63,12 @@ const HISTORY_START_SLOT_HEIGHT_PX = 32;
 const CONTENT_PADDING_TOP_PX = 16;
 const UPWARD_INPUT_EVIDENCE_TIMEOUT_MS = 100;
 const VIRTUALIZER_SCROLL_MARGIN_PX = HISTORY_START_SLOT_HEIGHT_PX + CONTENT_PADDING_TOP_PX;
-// A row has to clear this much of the viewport top before the next one takes over as the
-// reading position, so a row resting exactly on the edge does not flip back and forth.
-const READING_POSITION_OFFSET_PX = 8;
 
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
 
-function findHistoryRowElement(contentNode: HTMLElement, rowId: string): HTMLElement | null {
-  for (const element of contentNode.querySelectorAll<HTMLElement>("[data-history-row-id]")) {
-    if (element.dataset.historyRowId === rowId) {
-      return element;
-    }
-  }
-  return null;
-}
-
 const historyStartSlotStyle: CSSProperties = {
   display: "flex",
   alignItems: "center",
@@ -86,6 +77,8 @@ const historyStartSlotStyle: CSSProperties = {
   flexShrink: 0,
 };
 
+const streamRowsHostStyle: CSSProperties = { position: "relative", width: "100%" };
+
 const streamRowStyle: CSSProperties = {
   display: "flex",
   flexDirection: "column",
@@ -278,6 +271,23 @@ function isScrollContainerOverscrolledPastBottom(
   return getScrollContainerDistanceFromBottom(scrollContainer) < -BOTTOM_OVERSCROLL_TOLERANCE_PX;
 }
 
+// Position updates do not change a row's content. Keep renderer work separate
+// from virtual measurements while retaining the same component across lanes.
+const StreamRowContent = React.memo(function StreamRowContent({
+  item,
+  index,
+  items,
+  render,
+}: {
+  revision?: StreamRenderInput["liveHeadRowRevision"];
+  item: StreamItem;
+  index: number;
+  items: StreamItem[];
+  render: StreamRenderInput["renderers"]["renderHistoryVirtualizedRow"];
+}) {
+  return render(item, index, items);
+});
+
 function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: boolean }) {
   const {
     segments: inputSegments,
@@ -296,6 +306,8 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     hasOlderHistory,
     olderHistoryProgressKey,
     scrollEnabled,
+    contentMaxWidth,
+    imageContext,
     isMobileBreakpoint,
   } = props;
   const historyVirtualized = useRevisedHistoryRows(
@@ -340,14 +352,13 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
   const lastTouchClientYRef = useRef<number | null>(null);
   const pendingAutoScrollFrameRef = useRef<number | null>(null);
   const pendingAutoScrollTimeoutRef = useRef<number | null>(null);
-  const pendingVirtualRowMeasureFramesRef = useRef(new Map<Element, number>());
   const historyStartReadyRef = useRef(false);
   const [historyStartPaginationState, setHistoryStartPaginationState] = useState(
     createHistoryStartPaginationState,
   );
   const historyStartPaginationStateRef = useRef(historyStartPaginationState);
-  const historyStartPrependAnchorRef = useRef<HistoryStartPrependAnchor | null>(null);
-  const historyStartPrependAnchorActiveRef = useRef(false);
+  const readingAnchor = useMemo(createReadingAnchor, []);
+  const measuredRowHeights = useRef(new Map<string, { width: number; height: number }>());
   const historyStartSettleSchedulerRef = useRef<HistoryStartSettleScheduler | null>(null);
   const lastActiveFollowOutputLayoutRef = useRef<ActiveFollowOutputLayout | null>(null);
   const lastObservedViewportGeometryRef = useRef<ObservedViewportGeometry | null>(null);
@@ -369,37 +380,92 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
   const activationKey = routeBottomAnchorRequest?.requestKey ?? props.agentId;
   const isActivationReady = !hasRouteBottomAnchorRequest || isAuthoritativeHistoryReady;
 
+  // Chat find counts and highlights occurrences from the DOM, so every block row of
+  // the message it selected has to be mounted even when the scroll window is nowhere
+  // near it. Without this a hit in a far paragraph is invisible to the count and Next
+  // walks off to the following message.
+  const chatFindMessageId = useChatFindSelectedMessageId();
+  const chatFindRowIndexes = useMemo(() => {
+    if (!chatFindMessageId) return null;
+    const indexes = segments.historyVirtualized.flatMap((item, index) =>
+      getStreamItemMessageId(item) === chatFindMessageId ? [index] : [],
+    );
+    return indexes.length > 0 ? indexes : null;
+  }, [chatFindMessageId, segments.historyVirtualized]);
+  const rowVirtualizerRef = useRef<Virtualizer<HTMLElement, Element> | null>(null);
+  const rangeExtractor = useCallback(
+    (range: VirtualRange): number[] => {
+      const anchorIndex = segments.historyVirtualized.findIndex(
+        (row) => row.id === readingAnchor.getRowId(),
+      );
+      const container = scrollContainerRef.current;
+      // TanStack has computed the new measurements before calling the extractor.
+      // Select against the pending anchor correction, before mounting any rows at
+      // the stale pre-prepend offset. The DOM correction still belongs to commit.
+      const virtualizer = rowVirtualizerRef.current!;
+      const measurement = virtualizer.measurementsCache[anchorIndex];
+      const correctedOffset =
+        container && measurement
+          ? readingAnchor.project(container.scrollTop, {
+              id: String(measurement.key),
+              top: measurement.start,
+            })
+          : container?.scrollTop;
+      let visibleRange = range;
+      if (
+        container &&
+        correctedOffset !== undefined &&
+        Math.abs(correctedOffset - container.scrollTop) > 0.5
+      ) {
+        const first = virtualizer.getVirtualItemForOffset(correctedOffset);
+        const last = virtualizer.getVirtualItemForOffset(correctedOffset + container.clientHeight);
+        if (first && last)
+          visibleRange = { ...range, startIndex: first.index, endIndex: last.index };
+      }
+      return [
+        ...new Set([
+          ...defaultRangeExtractor(visibleRange),
+          ...(chatFindRowIndexes ?? []),
+          ...(anchorIndex < 0 ? [] : [anchorIndex]),
+        ]),
+      ].sort((left, right) => left - right);
+    },
+    [chatFindRowIndexes, readingAnchor, segments.historyVirtualized],
+  );
+  const virtualOffsetListener = useRef<((offset: number, scrolling: boolean) => void) | null>(null);
+  const observeVirtualOffset = useCallback<typeof observeElementOffset>((instance, onOffset) => {
+    virtualOffsetListener.current = onOffset;
+    const unsubscribe = observeElementOffset(instance, onOffset);
+    return () => {
+      virtualOffsetListener.current = null;
+      unsubscribe?.();
+    };
+  }, []);
+  const contentWidth = contentRef.current?.getBoundingClientRect().width;
   const rowVirtualizer = useVirtualizer({
     count: segments.historyVirtualized.length,
     enabled: shouldUseVirtualizer,
+    initialRect: {
+      width: scrollContainerRef.current?.clientWidth ?? 0,
+      height: scrollContainerRef.current?.clientHeight ?? 0,
+    },
     getScrollElement: () => scrollContainerRef.current,
     getItemKey: (index: number) => segments.historyVirtualized[index]?.id ?? index,
     estimateSize: (index: number) => {
       const row = segments.historyVirtualized[index];
-      return row ? estimateStreamItemHeight(row) : 120;
+      const measured = row && measuredRowHeights.current.get(row.id);
+      if (measured && measured.width === contentWidth) return measured.height;
+      return row ? estimateStreamItemHeight({ item: row, contentMaxWidth, imageContext }) : 120;
     },
-    measureElement: measureVirtualElement,
+    observeElementOffset: observeVirtualOffset,
+    rangeExtractor,
     scrollMargin: VIRTUALIZER_SCROLL_MARGIN_PX,
-    useAnimationFrameWithResizeObserver: true,
     overscan: 8,
   });
-  useEffect(() => {
-    rowVirtualizer.shouldAdjustScrollPositionOnItemSizeChange = (item, _delta, instance) => {
-      const viewportHeight = instance.scrollRect?.height ?? 0;
-      const scrollOffset = instance.scrollOffset ?? 0;
-      const remainingDistance = instance.getTotalSize() - (scrollOffset + viewportHeight);
-      return shouldAdjustScrollForVirtualRowResize({
-        isHistoryStartPrependActive: historyStartPrependAnchorActiveRef.current,
-        rowStart: item.start,
-        scrollOffset,
-        remainingDistanceFromBottom: remainingDistance,
-        bottomThreshold: AUTO_SCROLL_BOTTOM_THRESHOLD_PX,
-      });
-    };
-    return () => {
-      rowVirtualizer.shouldAdjustScrollPositionOnItemSizeChange = undefined;
-    };
-  }, [rowVirtualizer]);
+  rowVirtualizerRef.current = rowVirtualizer;
+  // Scroll correction belongs to the viewport's committed layout. The virtualizer
+  // otherwise writes scrollTop before React applies its new row positions.
+  rowVirtualizer.shouldAdjustScrollPositionOnItemSizeChange = () => false;
   const virtualRows = rowVirtualizer.getVirtualItems();
   const virtualTotalSize = rowVirtualizer.getTotalSize();
   const getHistoryStartPaginationInput = useStableEvent((): HistoryStartPaginationInput | null => {
@@ -413,7 +479,9 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       distanceFromHistoryStart: scrollContainer.scrollTop,
       hasOlderHistory,
       isLoadingOlderHistory,
-      isReady: historyStartReadyRef.current && bottomAnchorSettled,
+      // An explicit jump owns the landing position. Revealing another local
+      // page here changes the virtual index before the target has mounted.
+      isReady: historyStartReadyRef.current && bottomAnchorSettled && !isJumpSettling(),
       progressKey: olderHistoryProgressKey,
     };
   });
@@ -424,29 +492,9 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       if (transition.state !== previousState) {
         setHistoryStartPaginationState(transition.state);
       }
-      if (!isHistoryStartLoadingOperation(transition.state)) {
-        historyStartPrependAnchorRef.current = null;
-        historyStartPrependAnchorActiveRef.current = false;
-      }
       if (!transition.shouldLoad || olderHistoryProgressKey === null) {
         return;
       }
-      const scrollContainer = scrollContainerRef.current;
-      const contentNode = contentRef.current;
-      const anchorRow = segments.historyMounted.at(-1) ?? segments.historyVirtualized.at(-1);
-      const anchorElement =
-        contentNode && anchorRow ? findHistoryRowElement(contentNode, anchorRow.id) : null;
-      if (scrollContainer && anchorRow && anchorElement) {
-        historyStartPrependAnchorRef.current = {
-          progressKey: olderHistoryProgressKey,
-          rowId: anchorRow.id,
-          viewportOffset:
-            anchorElement.getBoundingClientRect().top - scrollContainer.getBoundingClientRect().top,
-        };
-      } else {
-        historyStartPrependAnchorRef.current = null;
-      }
-      historyStartPrependAnchorActiveRef.current = false;
       const requestedProgressKey = olderHistoryProgressKey;
       void (async () => {
         const started = await onNearHistoryStart();
@@ -483,27 +531,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     setHistoryStartPaginationState(rearmed);
     evaluateHistoryStart();
   });
-  const applyHistoryStartPrependAnchor = useStableEvent(() => {
-    const scrollContainer = scrollContainerRef.current;
-    const contentNode = contentRef.current;
-    const anchor = historyStartPrependAnchorRef.current;
-    if (
-      !scrollContainer ||
-      !contentNode ||
-      !anchor ||
-      !historyStartPrependAnchorActiveRef.current
-    ) {
-      return;
-    }
-    const anchorElement = findHistoryRowElement(contentNode, anchor.rowId);
-    if (!anchorElement) {
-      return;
-    }
-    const viewportOffset =
-      anchorElement.getBoundingClientRect().top - scrollContainer.getBoundingClientRect().top;
-    scrollContainer.scrollTop += viewportOffset - anchor.viewportOffset;
-    lastKnownScrollTopRef.current = scrollContainer.scrollTop;
-  });
   const scheduleHistoryStartPrependSettle = useStableEvent(() => {
     let scheduler = historyStartSettleSchedulerRef.current;
     if (!scheduler) {
@@ -514,24 +541,17 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
         isSettling: () => historyStartPaginationStateRef.current.status === "settling",
         isLoading: () => {
           const input = getHistoryStartPaginationInput();
-          return (
-            !input ||
-            input.isLoadingOlderHistory ||
-            pendingVirtualRowMeasureFramesRef.current.size > 0
-          );
+          return !input || input.isLoadingOlderHistory;
         },
-        onFrame: applyHistoryStartPrependAnchor,
         onSettle: () => {
           const input = getHistoryStartPaginationInput();
           if (!input) {
             return;
           }
-          historyStartPrependAnchorActiveRef.current = false;
           const transition = settleHistoryStartPagination(
             historyStartPaginationStateRef.current,
             input,
           );
-          historyStartPrependAnchorRef.current = null;
           applyHistoryStartPaginationTransition(transition);
         },
       });
@@ -540,59 +560,41 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     scheduler.schedule();
   });
 
-  useLayoutEffect(() => {
-    if (!isActiveRef.current) {
-      return;
+  const measureVirtualizedRows = useStableEvent(() => {
+    let resized = false;
+    for (const element of contentRef.current?.querySelectorAll<HTMLElement>(
+      "[data-history-row-id][data-index]",
+    ) ?? []) {
+      const index = Number(element.dataset.index);
+      const height = measureVirtualElement(element, undefined, rowVirtualizer);
+      if (rowVirtualizer.measurementsCache[index]?.size === height) continue;
+      rowVirtualizer.resizeItem(index, height);
+      resized = true;
     }
-    const anchor = historyStartPrependAnchorRef.current;
-    if (!anchor || anchor.progressKey === olderHistoryProgressKey) {
-      return;
-    }
-    historyStartPrependAnchorActiveRef.current = true;
-    evaluateHistoryStart();
-    applyHistoryStartPrependAnchor();
-    scheduleHistoryStartPrependSettle();
-  }, [
-    applyHistoryStartPrependAnchor,
-    evaluateHistoryStart,
-    olderHistoryProgressKey,
-    scheduleHistoryStartPrependSettle,
-    segments.historyMounted,
-    segments.historyVirtualized,
-    virtualTotalSize,
-  ]);
+    return resized;
+  });
 
+  // Measure the committed DOM rather than queued observer entries: flushSync can
+  // also commit an image's pending intrinsic dimensions, invalidating those entries.
+  const virtualRowObserver = useMemo(
+    () =>
+      new ResizeObserver(() => {
+        if (!isActiveRef.current) return;
+        flushSync(() => {
+          measureVirtualizedRows();
+        });
+      }),
+    [measureVirtualizedRows],
+  );
   const measureVirtualizedRowElement = useCallback(
     (node: HTMLDivElement | null) => {
-      if (!node) {
-        rowVirtualizer.measureElement(null);
-        return;
-      }
-      const pendingFrames = pendingVirtualRowMeasureFramesRef.current;
-      const existingFrame = pendingFrames.get(node);
-      if (existingFrame !== undefined) {
-        window.cancelAnimationFrame(existingFrame);
-      }
-      const frame = window.requestAnimationFrame(() => {
-        pendingFrames.delete(node);
-        if (isActiveRef.current && node.isConnected) {
-          rowVirtualizer.measureElement(node);
-        }
-      });
-      pendingFrames.set(node, frame);
+      if (!node) return;
+      virtualRowObserver.observe(node, { box: "border-box" });
+      return () => virtualRowObserver.unobserve(node);
     },
-    [rowVirtualizer],
+    [virtualRowObserver],
   );
-
-  useEffect(() => {
-    const pendingFrames = pendingVirtualRowMeasureFramesRef.current;
-    return () => {
-      for (const frame of pendingFrames.values()) {
-        window.cancelAnimationFrame(frame);
-      }
-      pendingFrames.clear();
-    };
-  }, []);
+  useEffect(() => () => virtualRowObserver.disconnect(), [virtualRowObserver]);
 
   const cancelPendingStickToBottom = useCallback(() => {
     const pendingFrame = pendingAutoScrollFrameRef.current;
@@ -631,10 +633,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     }
     cancelPendingStickToBottom();
     historyStartSettleSchedulerRef.current?.cancel();
-    for (const frame of pendingVirtualRowMeasureFramesRef.current.values()) {
-      window.cancelAnimationFrame(frame);
-    }
-    pendingVirtualRowMeasureFramesRef.current.clear();
     clearMouseScrollGesture();
     clearUpwardInputEvidence();
     lastTouchClientYRef.current = null;
@@ -702,19 +700,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       onReadingPositionChange(null);
       return;
     }
-    const readingLine = scrollContainer.getBoundingClientRect().top + READING_POSITION_OFFSET_PX;
-    let readingRowId: string | null = null;
-    for (const element of contentNode.querySelectorAll<HTMLElement>("[data-history-row-id]")) {
-      const rowId = element.dataset.historyRowId;
-      if (!rowId) {
-        continue;
-      }
-      readingRowId = rowId;
-      if (element.getBoundingClientRect().bottom > readingLine) {
-        break;
-      }
-    }
-    onReadingPositionChange(readingRowId);
+    onReadingPositionChange(readingAnchor.getReadingRowId(scrollContainer.scrollTop));
   });
 
   const updateScrollMetrics = useCallback(() => {
@@ -740,6 +726,54 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     onNearBottomChange,
   });
 
+  const reconcileReadingPosition = useStableEvent(() => {
+    const container = scrollContainerRef.current;
+    const content = contentRef.current;
+    if (!isActiveRef.current || !container || !content) return;
+    const viewportTop = container.getBoundingClientRect().top;
+    const scrollTop = container.scrollTop;
+    const width = content.getBoundingClientRect().width;
+    const rows = Array.from(
+      content.querySelectorAll<HTMLElement>("[data-history-row-id]"),
+      (element) => {
+        const bounds = element.getBoundingClientRect();
+        const id = element.dataset.historyRowId!;
+        measuredRowHeights.current.set(id, { width, height: bounds.height });
+        return { id, top: bounds.top - viewportTop + scrollTop, height: bounds.height };
+      },
+    );
+    const shouldAnchor = !followOutputRef.current && !isJumpSettling();
+    if (!shouldAnchor) readingAnchor.reset();
+    const correctedTop = readingAnchor.reconcile(container.scrollTop, rows);
+    if (!shouldAnchor) {
+      readingAnchor.reset();
+      return;
+    }
+    if (Math.abs(correctedTop - container.scrollTop) > 0.5) {
+      container.scrollTop = correctedTop;
+      lastKnownScrollTopRef.current = container.scrollTop;
+      // The DOM scroll event arrives later. Fill the corrected virtual range in
+      // this layout so the reader does not get a frame containing only the pin.
+      virtualOffsetListener.current?.(container.scrollTop, false);
+    }
+  });
+
+  // Apply row positions and their scroll correction in the same paint, including
+  // the ordinary-to-virtualized handoff and measurements of newly mounted rows.
+  useLayoutEffect(() => {
+    // Commit positions for every resized row before accepting reading geometry.
+    // Child layout can change during this commit, ahead of ResizeObserver delivery.
+    if (!isActive || measureVirtualizedRows()) return;
+    reconcileReadingPosition();
+  }, [
+    contentWidth,
+    isActive,
+    segments,
+    virtualRows,
+    measureVirtualizedRows,
+    reconcileReadingPosition,
+  ]);
+
   const stopFollowingOutputFromUserIntent = useStableEvent(() => {
     cancelPendingStickToBottom();
     if (followOutputRef.current) {
@@ -772,11 +806,15 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     }
 
     lastKnownScrollTopRef.current = currentScrollTop;
+    if (!followOutputRef.current && !isJumpSettling() && (scrolledUp || scrolledDown)) {
+      readingAnchor.scroll(currentScrollTop);
+    }
     updateScrollMetrics();
     evaluateHistoryStart();
   }, [
     evaluateHistoryStart,
     isJumpSettling,
+    readingAnchor,
     stopFollowingOutputFromUserIntent,
     updateScrollMetrics,
   ]);
@@ -785,8 +823,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     const initialHistoryStartState = createHistoryStartPaginationState();
     historyStartPaginationStateRef.current = initialHistoryStartState;
     setHistoryStartPaginationState(initialHistoryStartState);
-    historyStartPrependAnchorRef.current = null;
-    historyStartPrependAnchorActiveRef.current = false;
+    readingAnchor.reset();
     const frame = window.requestAnimationFrame(() => {
       historyStartReadyRef.current = true;
       evaluateHistoryStart();
@@ -797,7 +834,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       historyStartSettleSchedulerRef.current?.cancel();
       historyStartSettleSchedulerRef.current = null;
     };
-  }, [evaluateHistoryStart, props.agentId]);
+  }, [evaluateHistoryStart, props.agentId, readingAnchor]);
 
   useLayoutEffect(() => {
     if (!isActiveRef.current || !isActivationReady) {
@@ -918,6 +955,9 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       evaluateHistoryStart();
     }
     const observer = new ResizeObserver(() => {
+      flushSync(() => {
+        measureVirtualizedRows();
+      });
       const nextGeometry = getObservedViewportGeometry(scrollContainer);
       if (pendingResumeGeometryCheckRef.current) {
         pendingResumeGeometryCheckRef.current = false;
@@ -930,9 +970,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       } else {
         lastObservedViewportGeometryRef.current = nextGeometry;
       }
-      if (historyStartPrependAnchorActiveRef.current) {
-        applyHistoryStartPrependAnchor();
-      }
+      reconcileReadingPosition();
       if (historyStartPaginationStateRef.current.status === "settling") {
         scheduleHistoryStartPrependSettle();
       }
@@ -951,13 +989,14 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       observer.disconnect();
     };
   }, [
-    applyHistoryStartPrependAnchor,
+    reconcileReadingPosition,
     evaluateHistoryStart,
     isActive,
     reportReadingPosition,
     scheduleHistoryStartPrependSettle,
     scheduleStickToBottom,
     updateScrollMetrics,
+    measureVirtualizedRows,
   ]);
 
   useLayoutEffect(() => {
@@ -1072,7 +1111,9 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       lastTouchClientYRef.current = null;
     };
 
-    scrollContainer.addEventListener("scroll", handleDomScroll, { passive: true });
+    // Read user movement before the virtualizer's bubbling listener flushes a
+    // layout correction. Scroll events reuse the last committed row geometry.
+    scrollContainer.addEventListener("scroll", handleDomScroll, { passive: true, capture: true });
     scrollContainer.addEventListener("wheel", handleWheel, { passive: true });
     scrollContainer.addEventListener("keydown", handleKeyDown, { passive: true });
     scrollContainer.addEventListener("pointerdown", handlePointerDown, { passive: true });
@@ -1086,7 +1127,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     scrollContainer.addEventListener("touchcancel", handleTouchEnd, { passive: true });
 
     return () => {
-      scrollContainer.removeEventListener("scroll", handleDomScroll);
+      scrollContainer.removeEventListener("scroll", handleDomScroll, true);
       scrollContainer.removeEventListener("wheel", handleWheel);
       scrollContainer.removeEventListener("keydown", handleKeyDown);
       scrollContainer.removeEventListener("pointerdown", handlePointerDown);
@@ -1159,9 +1200,12 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       overflowX: "hidden",
       overflowY: scrollEnabled ? "auto" : "hidden",
       overscrollBehaviorY: "contain",
+      // The browser still anchors delayed image growth while following output.
+      // Detached reading has one owner: reconcileReadingPosition.
+      overflowAnchor: followOutput ? "auto" : "none",
       scrollbarWidth: overlayScrollbarEnabled ? "none" : undefined,
     };
-  }, [isMobileBreakpoint, scrollEnabled]);
+  }, [followOutput, isMobileBreakpoint, scrollEnabled]);
   const viewportStyle = useMemo(
     (): CSSProperties => ({
       position: "relative",
@@ -1171,13 +1215,13 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     }),
     [],
   );
-  const virtualRowsContainerStyle = useMemo((): CSSProperties => {
-    return {
-      position: "relative",
-      width: "100%",
+  const virtualRowsContainerStyle = useMemo(
+    (): CSSProperties => ({
       height: virtualTotalSize,
-    };
-  }, [virtualTotalSize]);
+      flexShrink: 0,
+    }),
+    [virtualTotalSize],
+  );
   const renderVirtualRowStyle = useCallback(
     (start: number): CSSProperties => ({
       position: "absolute",
@@ -1192,16 +1236,36 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
   );
   const mountedHistoryRows = useMemo(() => {
     return segments.historyMounted.map((item, index) => (
-      <div key={item.id} data-history-row-id={item.id} style={streamRowStyle}>
-        {renderHistoryMountedRow(item, index, segments.historyMounted)}
+      <div
+        key={item.id}
+        data-history-row-id={item.id}
+        data-message-id={getStreamItemMessageId(item)}
+        style={streamRowStyle}
+      >
+        <StreamRowContent
+          item={item}
+          index={index}
+          items={segments.historyMounted}
+          render={renderHistoryMountedRow}
+        />
       </div>
     ));
   }, [renderHistoryMountedRow, segments.historyMounted]);
   const liveHeadRows = useMemo(() => {
-    void liveHeadRowRevision;
     return segments.liveHead.map((item, index) => (
-      <div key={item.id} data-history-row-id={item.id} style={streamRowStyle}>
-        {renderLiveHeadRow(item, index, segments.liveHead)}
+      <div
+        key={item.id}
+        data-history-row-id={item.id}
+        data-message-id={getStreamItemMessageId(item)}
+        style={streamRowStyle}
+      >
+        <StreamRowContent
+          item={item}
+          index={index}
+          items={segments.liveHead}
+          revision={liveHeadRowRevision}
+          render={renderLiveHeadRow}
+        />
       </div>
     ));
   }, [liveHeadRowRevision, renderLiveHeadRow, segments.liveHead]);
@@ -1231,7 +1295,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     !liveAuxiliary;
 
   return (
-    <div style={viewportStyle}>
+    <div style={viewportStyle} data-window-content>
       <div
         ref={handleScrollContainerRef}
         data-testid="agent-chat-scroll"
@@ -1241,32 +1305,33 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       >
         <div ref={handleContentRef} style={contentContainerStyle}>
           {historyStartSlot}
-          {shouldUseVirtualizer ? (
-            <div style={virtualRowsContainerStyle}>
-              {virtualRows.map((virtualRow) => {
+          <div style={streamRowsHostStyle}>
+            <div style={virtualRowsContainerStyle} />
+            {[
+              ...virtualRows.map((virtualRow) => {
                 const item = segments.historyVirtualized[virtualRow.index];
-                if (!item) {
-                  return null;
-                }
+                if (!item) return null;
                 return (
                   <div
                     key={virtualRow.key}
                     data-index={virtualRow.index}
                     data-history-row-id={item.id}
+                    data-message-id={getStreamItemMessageId(item)}
                     ref={measureVirtualizedRowElement}
                     style={renderVirtualRowStyle(virtualRow.start)}
                   >
-                    {renderHistoryVirtualizedRow(
-                      item,
-                      virtualRow.index,
-                      segments.historyVirtualized,
-                    )}
+                    <StreamRowContent
+                      item={item}
+                      index={virtualRow.index}
+                      items={segments.historyVirtualized}
+                      render={renderHistoryVirtualizedRow}
+                    />
                   </div>
                 );
-              })}
-            </div>
-          ) : null}
-          {mountedRows}
+              }),
+              ...mountedRows,
+            ]}
+          </div>
           {liveAuxiliary}
           {shouldRenderEmpty ? listEmptyComponent : null}
         </div>
diff --git a/packages/app/src/agent-stream/strategy.ts b/packages/app/src/agent-stream/strategy.ts
index 636ebe870a..3b77f6b831 100644
--- a/packages/app/src/agent-stream/strategy.ts
+++ b/packages/app/src/agent-stream/strategy.ts
@@ -1,3 +1,4 @@
+import type { AssistantImageContext } from "@/utils/assistant-image-metadata";
 import type { ComponentType, ReactElement, ReactNode, RefObject } from "react";
 import type { StyleProp, ViewStyle } from "react-native";
 import type { StreamItem } from "@/types/stream";
@@ -40,10 +41,20 @@ export interface StreamEdgeSlotProps {
   ListFooterComponentStyle?: StyleProp<ViewStyle>;
 }
 
+/**
+ * A caller that landed on one occurrence inside the message owns where the viewport
+ * settles. It resolved the occurrence against a specific row already, so it takes no
+ * row here and returns null once that row is gone.
+ */
+export interface ScrollToMessageOccurrence {
+  signal: AbortSignal;
+  targetTop(): number | null;
+}
+
 export interface StreamViewportHandle {
   scrollToBottom: (reason?: BottomAnchorLocalRequest["reason"]) => void;
   prepareForViewportChange: () => void;
-  scrollToMessage?: (itemId: string) => void;
+  scrollToMessage?: (messageId: string, occurrence?: ScrollToMessageOccurrence) => void;
 }
 
 export interface StreamSegmentRenderers {
@@ -82,6 +93,9 @@ export interface StreamRenderInput {
   listStyle: StyleProp<ViewStyle>;
   baseListContentContainerStyle: StyleProp<ViewStyle>;
   forwardListContentContainerStyle: StyleProp<ViewStyle>;
+  // The chat column's max width. The web viewport estimates unmeasured row heights with it.
+  contentMaxWidth: number;
+  imageContext?: AssistantImageContext;
 }
 
 export interface ResolveStreamRenderStrategyInput {
diff --git a/packages/app/src/agent-stream/top-overlay.ts b/packages/app/src/agent-stream/top-overlay.ts
new file mode 100644
index 0000000000..24cd7f9592
--- /dev/null
+++ b/packages/app/src/agent-stream/top-overlay.ts
@@ -0,0 +1,14 @@
+import { createContext, useContext } from "react";
+import { isNative } from "@/constants/platform";
+
+/** The native inverted viewport reserves visual-top clearance; web stays in flow. */
+export const supportsStreamTopOverlay = isNative;
+
+const StreamTopOverlayContext = createContext(0);
+
+/** Visual-top clearance supplied by the containing layout, in points. */
+export const StreamTopOverlayProvider = StreamTopOverlayContext.Provider;
+
+export function useStreamTopOverlayInset(): number {
+  return useContext(StreamTopOverlayContext);
+}
diff --git a/packages/app/src/agent-stream/turn-footer.tsx b/packages/app/src/agent-stream/turn-footer.tsx
index d1ddd40697..acbd920b81 100644
--- a/packages/app/src/agent-stream/turn-footer.tsx
+++ b/packages/app/src/agent-stream/turn-footer.tsx
@@ -1,7 +1,6 @@
 import React, { memo, useCallback, useMemo, type ReactNode } from "react";
 import { View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { SPACING, type Theme } from "@/styles/theme";
 import type { TurnTiming } from "@/timeline/turn-time";
 import type { StreamItem } from "@/types/stream";
@@ -215,7 +214,7 @@ function TurnFooterRow({ children }: { children: ReactNode }) {
 const stylesheet = StyleSheet.create((theme) => ({
   streamItemWrapper: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     alignSelf: "center",
     paddingHorizontal: theme.spacing[2],
   },
diff --git a/packages/app/src/agent-stream/use-scroll-to-message.web.ts b/packages/app/src/agent-stream/use-scroll-to-message.web.ts
index 55aeae47a9..6de7a3296c 100644
--- a/packages/app/src/agent-stream/use-scroll-to-message.web.ts
+++ b/packages/app/src/agent-stream/use-scroll-to-message.web.ts
@@ -1,13 +1,16 @@
 import type React from "react";
-import { useCallback, useEffect, useLayoutEffect, useMemo } from "react";
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from "react";
 import type { Virtualizer } from "@tanstack/react-virtual";
+import type { StreamItem } from "@/types/stream";
+import { getStreamItemMessageId } from "./presentation";
 import { createPromptJumpSettleController, PROMPT_JUMP_TOP_INSET_PX } from "./prompt-jump-settle";
+import type { ScrollToMessageOccurrence } from "./strategy";
 
 interface UseScrollToMessageInput {
   active: boolean;
   scrollContainerRef: React.RefObject<HTMLElement | null>;
   rowVirtualizer: Virtualizer<HTMLElement, Element>;
-  historyVirtualized: readonly { id: string }[];
+  historyVirtualized: readonly StreamItem[];
   cancelPendingStickToBottom: () => void;
   setFollowOutput: (value: boolean) => boolean;
   onNearBottomChange: (value: boolean) => void;
@@ -32,16 +35,22 @@ export function useScrollToMessage({
   setFollowOutput,
   onNearBottomChange,
 }: UseScrollToMessageInput) {
+  const occurrenceRef = useRef<ScrollToMessageOccurrence | undefined>(undefined);
+  const removeAbortListener = useRef<(() => void) | null>(null);
   const settleController = useMemo(
     () =>
       createPromptJumpSettleController({
         viewport: {
-          findTargetTop(itemId) {
-            const container = scrollContainerRef.current;
-            const target = container?.querySelector<HTMLElement>(
-              `[data-history-row-id="${CSS.escape(itemId)}"]`,
+          findTargetTop(messageId) {
+            const occurrence = occurrenceRef.current;
+            if (occurrence?.signal.aborted) return null;
+            if (occurrence) return occurrence.targetTop();
+            // Every row of an assistant message carries the message id; the first one
+            // is the message's top.
+            const target = scrollContainerRef.current?.querySelector<HTMLElement>(
+              `[data-message-id="${CSS.escape(messageId)}"]`,
             );
-            return target?.getBoundingClientRect().top ?? null;
+            return target ? target.getBoundingClientRect().top : null;
           },
           getContainerTop() {
             return scrollContainerRef.current?.getBoundingClientRect().top ?? 0;
@@ -80,7 +89,13 @@ export function useScrollToMessage({
     [scrollContainerRef],
   );
 
-  useEffect(() => () => settleController.cancel(), [settleController]);
+  useEffect(
+    () => () => {
+      removeAbortListener.current?.();
+      settleController.cancel();
+    },
+    [settleController],
+  );
   useLayoutEffect(() => {
     if (!active) {
       settleController.cancel();
@@ -88,7 +103,12 @@ export function useScrollToMessage({
   }, [active, settleController]);
 
   const scrollToMessage = useCallback(
-    (itemId: string) => {
+    (messageId: string, occurrence?: ScrollToMessageOccurrence) => {
+      occurrenceRef.current = occurrence;
+      removeAbortListener.current?.();
+      const cancel = () => settleController.cancel();
+      occurrence?.signal.addEventListener("abort", cancel, { once: true });
+      removeAbortListener.current = () => occurrence?.signal.removeEventListener("abort", cancel);
       if (!active) return;
       const container = scrollContainerRef.current;
       if (!container) return;
@@ -96,7 +116,7 @@ export function useScrollToMessage({
       setFollowOutput(false);
 
       const mounted = container.querySelector<HTMLElement>(
-        `[data-history-row-id="${CSS.escape(itemId)}"]`,
+        `[data-message-id="${CSS.escape(messageId)}"]`,
       );
       if (mounted) {
         const delta =
@@ -104,15 +124,17 @@ export function useScrollToMessage({
           container.getBoundingClientRect().top -
           PROMPT_JUMP_TOP_INSET_PX;
         container.scrollTop += delta;
-        settleController.start(itemId);
+        settleController.start(messageId);
         onNearBottomChange(false);
         return;
       }
 
-      const index = historyVirtualized.findIndex((item) => item.id === itemId);
+      const index = historyVirtualized.findIndex(
+        (item) => getStreamItemMessageId(item) === messageId,
+      );
       if (index >= 0) {
         rowVirtualizer.scrollToIndex(index, { align: "start" });
-        settleController.start(itemId);
+        settleController.start(messageId);
         onNearBottomChange(false);
       }
     },
diff --git a/packages/app/src/agent-stream/use-stream-history-window.ts b/packages/app/src/agent-stream/use-stream-history-window.ts
index 03303d712d..42168f052d 100644
--- a/packages/app/src/agent-stream/use-stream-history-window.ts
+++ b/packages/app/src/agent-stream/use-stream-history-window.ts
@@ -1,13 +1,20 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import type { StreamItem } from "@/types/stream";
 import { findMountedWindowStart, getMountedRecentStreamItems } from "./history-window";
+import { getStreamItemMessageId } from "./presentation";
+
+// Callers reveal a message, not a row: an assistant message is several block rows and
+// the window has to open at the first of them.
+function findMessageRowIndex(items: StreamItem[], messageId: string): number {
+  return items.findIndex((item) => getStreamItemMessageId(item) === messageId);
+}
 
 function findEarlierHistoryWindowStart(input: {
   items: StreamItem[];
   start: number;
   itemId: string | undefined;
 }): number {
-  const targetIndex = input.itemId ? input.items.findIndex((item) => item.id === input.itemId) : -1;
+  const targetIndex = input.itemId ? findMessageRowIndex(input.items, input.itemId) : -1;
   const targetStart = targetIndex >= 0 && targetIndex < input.start ? targetIndex : input.start;
   if (!input.itemId) {
     return findMountedWindowStart({
@@ -90,7 +97,7 @@ export function useStreamHistoryWindow(input: {
 
   const revealLoadedHistory = useCallback(
     (itemId?: string): boolean => {
-      const targetIndex = itemId ? items.findIndex((item) => item.id === itemId) : -1;
+      const targetIndex = itemId ? findMessageRowIndex(items, itemId) : -1;
       if (start === 0 || (itemId !== undefined && (targetIndex < 0 || targetIndex >= start))) {
         return false;
       }
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index c54bcb5e70..1e60240be9 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -1,3 +1,4 @@
+import { ChatFind, ChatFindExpansion } from "@/agent-stream/chat-find";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import React, {
   forwardRef,
@@ -22,7 +23,7 @@ import {
   type ViewStyle,
 } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { MAX_CONTENT_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { useMutation } from "@tanstack/react-query";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { Check, ChevronDown, X } from "lucide-react-native";
@@ -32,7 +33,7 @@ import {
   AssistantMessage,
   SpeakMessage,
   UserMessage,
-  ActivityLog,
+  Notification,
   ToolCall,
   TodoListCard,
   CompactionMarker,
@@ -54,17 +55,14 @@ import { useSessionStore } from "@/stores/session-store";
 import { useRevealedText } from "@/hooks/use-revealed-text";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import { useLoadOlderAgentHistory } from "@/hooks/use-load-older-agent-history";
-import { useSettings } from "@/hooks/use-settings";
+import { resolveContentMaxWidth, useSettings } from "@/hooks/use-settings";
 import type { ToastApi } from "@/components/toast-host";
 import { returnToTimelineTail } from "./timeline-tail-navigation";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { ToolCallDetailsContent } from "@/components/tool-call-details";
 import { QuestionFormCard } from "@/components/question-form-card";
 import { ToolCallSheetProvider } from "@/components/tool-call-sheet";
-import {
-  prepareToolCallHistory,
-  projectToolCallDetailLevel,
-} from "@/tool-calls/detail-level/projection";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
 import { OverviewToolCallGroupView } from "@/tool-calls/detail-level/overview/view";
 import { type AgentStreamRenderModel, buildAgentStreamRenderModel } from "./model";
 import { resolveStreamRenderStrategy } from "./strategy-resolver";
@@ -108,7 +106,6 @@ import { recordRenderProfileReasons } from "@/utils/render-profiler";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useStreamHistoryWindow } from "./use-stream-history-window";
 import { PluginTimelineItemView, useInstalledTimelineTransform } from "@/plugins/timeline";
-import { projectPluginTimelineItems } from "@/plugins/timeline/projection";
 
 function renderLiveAuxiliaryNode(input: {
   pendingPermissions: ReactNode;
@@ -352,6 +349,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
     const toolCallDetailLevel = useSettings((settings) => settings.toolCallDetailLevel);
     const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
+    const contentMaxWidth = useSettings(resolveContentMaxWidth);
     const viewportRef = useRef<StreamViewportHandle | null>(null);
     const pendingClientMessageIds = useMemo(
       () => new Set(pendingMessageSubmissions.map((submission) => submission.clientMessageId)),
@@ -537,35 +535,25 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     const effectiveStreamHead = useRetainedValue(streamHead, isActive);
     const effectiveTurnPresentation = useRetainedValue(turnPresentation, isActive);
     const isTurnActive = effectiveTurnPresentation.isActive;
-    // Keep retained history outside the 48ms live-head flush path.
-    const preparedToolCallHistory = useMemo(
-      () => prepareToolCallHistory(toolCallDetailLevel, effectiveStreamItems),
-      [effectiveStreamItems, toolCallDetailLevel],
-    );
-    const projectedToolCalls = useMemo(
+    const presentStream = useMemo(() => createStreamPresentation(), []);
+    const presentation = useMemo(
       () =>
-        projectToolCallDetailLevel({
-          level: toolCallDetailLevel,
+        presentStream({
           tail: effectiveStreamItems,
           head: effectiveStreamHead ?? EMPTY_STREAM_HEAD,
-          preparedHistory: preparedToolCallHistory,
+          transform: transformTimelineItem,
+          level: toolCallDetailLevel,
           isTurnActive,
         }),
       [
-        effectiveStreamHead,
+        presentStream,
         effectiveStreamItems,
-        isTurnActive,
-        preparedToolCallHistory,
+        effectiveStreamHead,
+        transformTimelineItem,
         toolCallDetailLevel,
+        isTurnActive,
       ],
     );
-    const projectedPlugins = useMemo(
-      () => ({
-        tail: projectPluginTimelineItems(projectedToolCalls.tail, transformTimelineItem),
-        head: projectPluginTimelineItems(projectedToolCalls.head, transformTimelineItem),
-      }),
-      [projectedToolCalls.head, projectedToolCalls.tail, transformTimelineItem],
-    );
     const {
       start: historyWindowStart,
       hasLocalHistory,
@@ -573,7 +561,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       loadOlder,
     } = useStreamHistoryWindow({
       agentId,
-      items: projectedPlugins.tail,
+      items: presentation.tail,
       loadRemoteOlder,
     });
     const isLoadingOlder = remoteIsLoadingOlder;
@@ -584,8 +572,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       return buildAgentStreamRenderModel({
         isTurnActive,
         activeTurnStartedAt: effectiveTurnPresentation.startedAt,
-        tail: projectedPlugins.tail,
-        head: projectedPlugins.head,
+        tail: presentation.tail,
+        head: presentation.head,
         platform: isWeb ? "web" : "native",
         isMobileBreakpoint: isMobile,
         historyStart: historyWindowStart,
@@ -593,8 +581,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     }, [
       isMobile,
       isTurnActive,
-      projectedPlugins.head,
-      projectedPlugins.tail,
+      presentation.head,
+      presentation.tail,
       effectiveTurnPresentation.startedAt,
       historyWindowStart,
     ]);
@@ -618,10 +606,14 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     const handleTimelineHistoryLoadError = useCallback(() => {
       toast?.error(t("agentStream.historyLoadFailed"));
     }, [t, toast]);
-    const visibleHistoryItemIds = useMemo(
+    // Chat find and the chat outline address messages, and an assistant message is a
+    // group of block rows, so this is a set of message ids and never of row ids.
+    const visibleMessageIds = useMemo(
       () =>
         new Set(
-          [...baseRenderModel.history, ...baseRenderModel.segments.liveHead].map((item) => item.id),
+          [...baseRenderModel.history, ...baseRenderModel.segments.liveHead].map(
+            getStreamItemMessageId,
+          ),
         ),
       [baseRenderModel.history, baseRenderModel.segments.liveHead],
     );
@@ -634,8 +626,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       enabled: supportsChatOutline && chatOutlineEnabled,
       viewportRef,
       onJumpError: handleTimelineHistoryLoadError,
-      visibleItemIds: visibleHistoryItemIds,
-      revealLoadedItem: revealLoadedHistory,
+      visibleMessageIds,
+      revealLoadedMessage: revealLoadedHistory,
     });
 
     useImperativeHandle(
@@ -731,16 +723,21 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             onOpenWorkspaceFile={handleInlinePathPress}
             toast={toast}
           >
-            <AssistantMessage
-              occurrenceKey={createAssistantImageOccurrenceKey({ agentId, itemId: item.id })}
-              message={item.text}
-              timestamp={item.timestamp.getTime()}
-              workspaceRoot={workspaceRoot}
-              serverId={resolvedServerId}
-              client={client}
-              spacing={layoutItem.assistantSpacing}
-              phase={layoutItem.phase}
-            />
+            <ChatFindExpansion messageId={getStreamItemMessageId(item)}>
+              {(renderFullContent) => (
+                <AssistantMessage
+                  renderFullContent={renderFullContent}
+                  occurrenceKey={createAssistantImageOccurrenceKey({ agentId, itemId: item.id })}
+                  message={item.text}
+                  timestamp={item.timestamp.getTime()}
+                  workspaceRoot={workspaceRoot}
+                  serverId={resolvedServerId}
+                  client={client}
+                  spacing={layoutItem.assistantSpacing}
+                  phase={layoutItem.phase}
+                />
+              )}
+            </ChatFindExpansion>
           </AssistantFileLinkResolverProvider>
         );
       },
@@ -795,6 +792,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
               detail={data.detail}
               cwd={context.cwd}
               metadata={data.metadata}
+              agentMessage={data.agentMessage}
               isLastInSequence={isLastInSequence}
               onOpenFilePath={handleToolCallOpenFile}
               maxDetailHeight={maxDetailHeight}
@@ -823,7 +821,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     // Read through a stable event so live group updates do not change the renderer identity
     // every tick; history hosts whose group changed are revised through `historyRowRevision`.
     const getToolCallGroup = useStableEvent((hostId: string) =>
-      projectedToolCalls.groupsByHostId.get(hostId),
+      presentation.groupsByHostId.get(hostId),
     );
     const renderToolCallItem = useCallback(
       (layoutItem: StreamLayoutItem, item: Extract<StreamItem, { kind: "tool_call" }>) => {
@@ -877,15 +875,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           case "tool_call":
             return renderToolCallItem(layoutItem, item);
 
-          case "activity_log":
-            return (
-              <ActivityLog
-                type={item.activityType}
-                message={item.message}
-                timestamp={item.timestamp.getTime()}
-                metadata={item.metadata}
-              />
-            );
+          case "notification":
+            return <Notification level={item.level} message={item.message} />;
 
           case "todo_list":
             return <TodoListCard items={item.items} activity={item.activity} />;
@@ -1024,6 +1015,14 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       return itemById;
     }, [streamLayout.liveHead]);
 
+    const handleReadingPositionChange = useStableEvent((rowId: string | null) => {
+      const row =
+        rowId === null
+          ? undefined
+          : (layoutHistoryItemById.get(rowId) ?? layoutLiveHeadItemById.get(rowId));
+      chatOutline.reportReadingPosition(row?.item.timelineCursor?.seq ?? null);
+    });
+
     const renderHistoryRow = useCallback(
       (item: StreamItem) =>
         renderHistoryStreamItem({
@@ -1087,62 +1086,78 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       expandedInlineToolCallIds.size === 0;
     const historyRowRevision = useMemo(
       () => ({
-        contentById: projectedToolCalls.historyGroupUpdatesByHostId,
+        contentById: presentation.historyGroupUpdatesByHostId,
         displayStateById: expandedToolCallGroupIds,
         globalDisplayState: isMobile,
       }),
-      [expandedToolCallGroupIds, isMobile, projectedToolCalls.historyGroupUpdatesByHostId],
+      [expandedToolCallGroupIds, isMobile, presentation.historyGroupUpdatesByHostId],
     );
 
+    const findItems = useMemo(
+      () => [...effectiveStreamItems, ...(effectiveStreamHead ?? [])],
+      [effectiveStreamItems, effectiveStreamHead],
+    );
     return (
-      <ToolCallSheetProvider>
-        <AssistantSelectionCopySurface style={stylesheet.container}>
-          <MessageOuterSpacingProvider disableOuterSpacing>
-            {streamRenderStrategy.render({
-              agentId,
-              segments: renderModel.segments,
-              historyRowRevision,
-              liveHeadRowRevision: expandedToolCallGroupIds,
-              boundary,
-              renderers,
-              listEmptyComponent,
-              viewportRef,
-              routeBottomAnchorRequest,
-              isAuthoritativeHistoryReady,
-              onNearBottomChange: setIsNearBottom,
-              onReadingPositionChange: chatOutline.reportReadingPosition,
-              onNearHistoryStart: loadOlder,
-              isLoadingOlderHistory: isLoadingOlder,
-              hasOlderHistory: hasOlder,
-              olderHistoryProgressKey: progressKey,
-              scrollEnabled: streamScrollEnabled,
-              listStyle: stylesheet.list,
-              baseListContentContainerStyle: stylesheet.listContentContainer,
-              forwardListContentContainerStyle: stylesheet.forwardListContentContainer,
-            })}
-          </MessageOuterSpacingProvider>
-          <ChatOutlineRail
-            prompts={chatOutline.prompts}
-            activePrompt={chatOutline.activePrompt}
-            onJumpToPrompt={chatOutline.jumpToPrompt}
-          />
-          {(!isNearBottom || isTimelineDetached) && (
-            <View style={scrollToBottomContainerStyle} pointerEvents="box-none">
-              <Animated.View entering={scrollIndicatorFadeIn} exiting={scrollIndicatorFadeOut}>
-                <Pressable
-                  style={stylesheet.scrollToBottomButton}
-                  onPress={scrollToBottom}
-                  accessibilityRole="button"
-                  accessibilityLabel={t("agentStream.scrollToBottom")}
-                  testID="scroll-to-bottom-button"
-                >
-                  <ChevronDown size={24} color={stylesheet.scrollToBottomIcon.color} />
-                </Pressable>
-              </Animated.View>
-            </View>
-          )}
-        </AssistantSelectionCopySurface>
-      </ToolCallSheetProvider>
+      <ChatFind
+        agentId={agentId}
+        serverId={resolvedServerId}
+        epoch={timelineEpoch}
+        items={findItems}
+        viewportRef={viewportRef}
+        revealLoadedMessage={revealLoadedHistory}
+        visibleMessageIds={visibleMessageIds}
+      >
+        <ToolCallSheetProvider>
+          <AssistantSelectionCopySurface style={stylesheet.container}>
+            <MessageOuterSpacingProvider disableOuterSpacing>
+              {streamRenderStrategy.render({
+                agentId,
+                segments: renderModel.segments,
+                historyRowRevision,
+                liveHeadRowRevision: expandedToolCallGroupIds,
+                boundary,
+                renderers,
+                listEmptyComponent,
+                viewportRef,
+                routeBottomAnchorRequest,
+                isAuthoritativeHistoryReady,
+                onNearBottomChange: setIsNearBottom,
+                onReadingPositionChange: handleReadingPositionChange,
+                onNearHistoryStart: loadOlder,
+                isLoadingOlderHistory: isLoadingOlder,
+                hasOlderHistory: hasOlder,
+                olderHistoryProgressKey: progressKey,
+                scrollEnabled: streamScrollEnabled,
+                listStyle: stylesheet.list,
+                baseListContentContainerStyle: stylesheet.listContentContainer,
+                forwardListContentContainerStyle: stylesheet.forwardListContentContainer,
+                contentMaxWidth,
+                imageContext: { serverId: resolvedServerId, workspaceRoot },
+              })}
+            </MessageOuterSpacingProvider>
+            <ChatOutlineRail
+              prompts={chatOutline.prompts}
+              activePrompt={chatOutline.activePrompt}
+              onJumpToPrompt={chatOutline.jumpToPrompt}
+            />
+            {(!isNearBottom || isTimelineDetached) && (
+              <View style={scrollToBottomContainerStyle} pointerEvents="box-none">
+                <Animated.View entering={scrollIndicatorFadeIn} exiting={scrollIndicatorFadeOut}>
+                  <Pressable
+                    style={stylesheet.scrollToBottomButton}
+                    onPress={scrollToBottom}
+                    accessibilityRole="button"
+                    accessibilityLabel={t("agentStream.scrollToBottom")}
+                    testID="scroll-to-bottom-button"
+                  >
+                    <ChevronDown size={24} color={stylesheet.scrollToBottomIcon.color} />
+                  </Pressable>
+                </Animated.View>
+              </View>
+            )}
+          </AssistantSelectionCopySurface>
+        </ToolCallSheetProvider>
+      </ChatFind>
     );
   },
 );
@@ -1572,6 +1587,7 @@ function PermissionRequestCard({
         title={title}
         description={description}
         text={planMarkdown}
+        outcome="pending"
         footer={footer}
         testID="permission-plan-card"
         disableOuterSpacing
@@ -1610,7 +1626,7 @@ const stylesheet = StyleSheet.create((theme) => ({
   },
   contentWrapper: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     alignSelf: "center",
     paddingHorizontal: theme.spacing[2],
   },
@@ -1631,7 +1647,7 @@ const stylesheet = StyleSheet.create((theme) => ({
   },
   streamItemWrapper: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     alignSelf: "center",
     paddingHorizontal: theme.spacing[2],
   },
diff --git a/packages/app/src/agent-stream/web-virtualization.test.ts b/packages/app/src/agent-stream/web-virtualization.test.ts
index 0e45efa65d..602925faa0 100644
--- a/packages/app/src/agent-stream/web-virtualization.test.ts
+++ b/packages/app/src/agent-stream/web-virtualization.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import type { StreamItem } from "@/types/stream";
 import {
   clearAssistantImageMetadataCache,
@@ -11,7 +12,6 @@ import {
   findMountedWindowStart,
   getWebMountedRecentStreamItems,
   getWebPartialVirtualizationThreshold,
-  shouldAdjustScrollForVirtualRowResize,
   splitWebVirtualizedHistory,
   type IndexedStreamItem,
 } from "./web-virtualization";
@@ -123,8 +123,18 @@ describe("splitWebVirtualizedHistory", () => {
 
 describe("estimateStreamItemHeight", () => {
   it("uses compact estimates for collapsed tool sequence rows", () => {
-    expect(estimateStreamItemHeight(toolCall("tool", 1))).toBe(40);
-    expect(estimateStreamItemHeight(thought("thought", 2))).toBe(40);
+    expect(
+      estimateStreamItemHeight({
+        item: toolCall("tool", 1),
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
+    ).toBe(40);
+    expect(
+      estimateStreamItemHeight({
+        item: thought("thought", 2),
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
+    ).toBe(40);
   });
 
   it("uses a larger estimate for user messages with image attachments", () => {
@@ -146,7 +156,40 @@ describe("estimateStreamItemHeight", () => {
       ],
     };
 
-    expect(estimateStreamItemHeight(item)).toBe(220);
+    expect(estimateStreamItemHeight({ item, contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH })).toBe(
+      220,
+    );
+  });
+
+  it("uses local image dimensions only from the row's server and workspace", () => {
+    clearAssistantImageMetadataCache();
+    const imageContext = { serverId: "server-one", workspaceRoot: "/workspace/one" };
+    setAssistantImageMetadata(
+      { source: "portrait.png", ...imageContext },
+      { width: 800, height: 1600 },
+    );
+    const item: StreamItem = {
+      kind: "assistant_message",
+      id: "local-image",
+      text: "![Portrait](portrait.png)",
+      timestamp: createTimestamp(2),
+    };
+
+    expect(estimateStreamItemHeight({ item, contentMaxWidth: 608, imageContext })).toBe(1264);
+    expect(
+      estimateStreamItemHeight({
+        item,
+        contentMaxWidth: 608,
+        imageContext: { ...imageContext, workspaceRoot: "/workspace/two" },
+      }),
+    ).toBe(464);
+    expect(
+      estimateStreamItemHeight({
+        item,
+        contentMaxWidth: 608,
+        imageContext: { ...imageContext, serverId: "server-two" },
+      }),
+    ).toBe(464);
   });
 
   it("uses cached assistant image metadata when available", () => {
@@ -165,56 +208,9 @@ describe("estimateStreamItemHeight", () => {
       timestamp: createTimestamp(2),
     };
 
-    expect(estimateStreamItemHeight(item)).toBeGreaterThan(220);
-  });
-});
-
-describe("virtual row resize anchoring", () => {
-  it("does not move the viewport when a visible row expands while detached", () => {
     expect(
-      shouldAdjustScrollForVirtualRowResize({
-        isHistoryStartPrependActive: false,
-        rowStart: 1200,
-        scrollOffset: 1000,
-        remainingDistanceFromBottom: 5000,
-        bottomThreshold: 64,
-      }),
-    ).toBe(false);
-  });
-
-  it("keeps the reading position when a row above the viewport changes size", () => {
-    expect(
-      shouldAdjustScrollForVirtualRowResize({
-        isHistoryStartPrependActive: false,
-        rowStart: 800,
-        scrollOffset: 1000,
-        remainingDistanceFromBottom: 5000,
-        bottomThreshold: 64,
-      }),
-    ).toBe(true);
-  });
-
-  it("leaves history prepend and bottom following to their existing anchors", () => {
-    const baseInput = {
-      rowStart: 800,
-      scrollOffset: 1000,
-      remainingDistanceFromBottom: 5000,
-      bottomThreshold: 64,
-    };
-
-    expect(
-      shouldAdjustScrollForVirtualRowResize({
-        ...baseInput,
-        isHistoryStartPrependActive: true,
-      }),
-    ).toBe(false);
-    expect(
-      shouldAdjustScrollForVirtualRowResize({
-        ...baseInput,
-        isHistoryStartPrependActive: false,
-        remainingDistanceFromBottom: 64,
-      }),
-    ).toBe(false);
+      estimateStreamItemHeight({ item, contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH }),
+    ).toBeGreaterThan(220);
   });
 });
 
diff --git a/packages/app/src/agent-stream/web-virtualization.ts b/packages/app/src/agent-stream/web-virtualization.ts
index d63e1ab84b..0c7f756959 100644
--- a/packages/app/src/agent-stream/web-virtualization.ts
+++ b/packages/app/src/agent-stream/web-virtualization.ts
@@ -1,3 +1,4 @@
+import type { AssistantImageContext } from "@/utils/assistant-image-metadata";
 import type { StreamItem } from "@/types/stream";
 import { estimateAssistantMessageHeightFromCache } from "@/utils/assistant-message-height-estimate";
 import {
@@ -10,21 +11,6 @@ export const DEFAULT_WEB_PARTIAL_VIRTUALIZATION_THRESHOLD = 100;
 export const DEFAULT_WEB_MOUNTED_RECENT_STREAM_ITEMS = DEFAULT_MOUNTED_RECENT_STREAM_ITEMS;
 const COLLAPSED_TOOL_SEQUENCE_ROW_HEIGHT_ESTIMATE = 40;
 
-export function shouldAdjustScrollForVirtualRowResize(input: {
-  isHistoryStartPrependActive: boolean;
-  rowStart: number;
-  scrollOffset: number;
-  remainingDistanceFromBottom: number;
-  bottomThreshold: number;
-}): boolean {
-  if (input.isHistoryStartPrependActive) {
-    return false;
-  }
-  return (
-    input.remainingDistanceFromBottom > input.bottomThreshold && input.rowStart < input.scrollOffset
-  );
-}
-
 type BottomAnchorE2ETestGlobals = typeof globalThis & {
   __PASEO_E2E_WEB_PARTIAL_VIRTUALIZATION_THRESHOLD?: unknown;
 };
@@ -58,19 +44,35 @@ export interface WebVirtualizedHistoryWindow {
   mountedEntries: IndexedStreamItem[];
 }
 
-export function estimateStreamItemHeight(item: StreamItem): number {
+interface StreamItemHeightEstimateInput {
+  item: StreamItem;
+  contentMaxWidth: number;
+  imageContext?: AssistantImageContext;
+}
+
+export function estimateStreamItemHeight({
+  item,
+  contentMaxWidth,
+  imageContext,
+}: StreamItemHeightEstimateInput): number {
   switch (item.kind) {
     case "user_message":
       return item.images && item.images.length > 0 ? 220 : 96;
     case "assistant_message":
-      return estimateAssistantMessageHeightFromCache(item.text) ?? 220;
+      return (
+        estimateAssistantMessageHeightFromCache({
+          markdown: item.text,
+          contentMaxWidth,
+          imageContext,
+        }) ?? 220
+      );
     case "tool_call":
       return COLLAPSED_TOOL_SEQUENCE_ROW_HEIGHT_ESTIMATE;
     case "thought":
       return COLLAPSED_TOOL_SEQUENCE_ROW_HEIGHT_ESTIMATE;
     case "todo_list":
       return 144;
-    case "activity_log":
+    case "notification":
       return 88;
     case "compaction":
       return 72;
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index c57dba4429..869c93a0b2 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -1,7 +1,8 @@
+import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { PortalProvider } from "@gorhom/portal";
-import { QueryClientProvider } from "@tanstack/react-query";
+import { LucideProvider } from "lucide-react-native";
 import * as Linking from "expo-linking";
 import * as Notifications from "expo-notifications";
 import { Stack, useNavigationContainerRef, usePathname, useRouter } from "expo-router";
@@ -19,7 +20,6 @@ import {
 import { AppState, useWindowDimensions, View } from "react-native";
 import { GestureDetector, GestureHandlerRootView } from "react-native-gesture-handler";
 import { KeyboardProvider } from "react-native-keyboard-controller";
-import { SafeAreaProvider } from "react-native-safe-area-context";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { AppearanceProvider } from "@/appearance/provider";
 import { CommandCenter } from "@/command-center/command-center";
@@ -28,25 +28,26 @@ import { CommandCenterProvider } from "@/command-center/provider";
 import { CommandCenterWorkspaceActions } from "@/command-center/workspace-registration";
 import { PluginCommandCenterActions } from "@/plugins/command-center/registration";
 import { AddProjectFlowHost } from "@/components/add-project-flow-host";
-import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 import { WorktreeSetupCalloutSource } from "@/components/worktree-setup-callout-source";
 import { DownloadToast } from "@/components/download-toast";
 import { QuittingOverlay } from "@/components/quitting-overlay";
 import { KeyboardShortcutsDialog } from "@/components/keyboard-shortcuts-dialog";
+import { ChangelogHost } from "@/changelog";
 import { AppDiagnosticHost } from "@/components/app-diagnostic-host";
+import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 import { LeftSidebar } from "@/components/left-sidebar";
-import { WindowSidebarMenuToggle } from "@/components/headers/menu-header";
+import { WindowSidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
 import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
 import { WorkspaceRenameHost } from "@/components/workspace-rename-host";
 import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
 import { ProviderSettingsHost } from "@/components/provider-settings-host";
-import { RootErrorBoundary } from "@/components/root-error-boundary";
 import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
 import { FloatingPanelPortalHost } from "@/components/ui/floating-panel-portal";
 import { HostChooserModal, useHostChooser } from "@/hosts/host-chooser";
+import { HostConfirmationSheet } from "@/hosts/host-confirmation-sheet";
 import {
   getIsElectronRuntime,
   HEADER_INNER_HEIGHT,
@@ -69,6 +70,7 @@ import {
   resolveStartupNavigationReady,
   shouldRunStartupGiveUpTimer,
   startHostRuntimeBootstrap,
+  bindHostRuntimeAppState,
   type StartupBlocker,
 } from "@/navigation/host-runtime-bootstrap";
 import { registerWorkspaceRouteNavigationRef } from "@/navigation/workspace-route-navigation";
@@ -89,26 +91,22 @@ import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
 import { resolveExplorerSidebarPresentation } from "@/workspace-tabs/explorer-sidebar";
-import { KeyboardShiftProvider } from "@/hooks/use-keyboard-shift-style";
+import { KeyboardShiftProvider } from "@/keyboard/shift";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
 import { useAppSettings } from "@/hooks/use-settings";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { useOpenAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelsProvider, useIsMobilePanelActive } from "@/mobile-panels/provider";
-import { I18nProvider } from "@/i18n/provider";
 import {
   KeyboardActionDispatcherProvider,
   useKeyboardActionDispatcher,
 } from "@/keyboard/keyboard-action-dispatcher-context";
 import { polyfillCrypto } from "@/polyfills/crypto";
-import { polyfillNavigator } from "@/polyfills/navigator";
-import { queryClient } from "@/data/query-client";
 import {
   getHostRuntimeStore,
   hasConfiguredLocalDaemonOverride,
   useHostRegistryLoaded,
-  useHostMutations,
   useHostRuntimeClient,
   useHostRuntimeIsConnected,
   useHosts,
@@ -116,7 +114,7 @@ import {
 import { getDaemonStartService } from "@/runtime/daemon-start-service";
 import { usePanelStore } from "@/stores/panel-store";
 import { flushDraftPersistStorage } from "@/stores/draft-store";
-import { getNextThemePreference } from "@/styles/theme";
+import { getNextThemePreference, ICON_STROKE_WIDTH } from "@/styles/theme";
 import { useSessionStore } from "@/stores/session-store";
 import { installWebScrollbarStyles } from "@/styles/install-web-scrollbar-styles";
 import type { HostProfile } from "@/types/host-connection";
@@ -140,7 +138,6 @@ import {
   type WebNotificationClickDetail,
 } from "@/utils/os-notifications";
 
-polyfillNavigator();
 polyfillCrypto();
 
 export interface HostRuntimeBootstrapState {
@@ -372,6 +369,11 @@ async function shouldStartBuiltInDaemon(): Promise<boolean> {
 }
 
 function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
+  useEffect(() => {
+    const store = getHostRuntimeStore();
+    return bindHostRuntimeAppState(store, AppState);
+  }, []);
+
   useEffect(() => {
     const store = getHostRuntimeStore();
     const daemonStartService = getDaemonStartService({ store });
@@ -444,10 +446,6 @@ export function useHostRuntimeBootstrapState(): HostRuntimeBootstrapState {
   return useContext(HostRuntimeBootstrapContext);
 }
 
-function QueryProvider({ children }: { children: ReactNode }) {
-  return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
-}
-
 const rowStyle = { flex: 1, flexDirection: "row" } as const;
 const flexStyle = { flex: 1 } as const;
 const MOBILE_WEB_GESTURE_TOUCH_ACTION = isWeb ? "auto" : "pan-y";
@@ -545,11 +543,15 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
       keyboardShortcutsEnabled={keyboardShortcutsEnabled}
     />
   );
+  let themedSidebarChrome = sidebarChrome;
+  if (isWeb) {
+    themedSidebarChrome = <AppearanceStyleBoundary>{sidebarChrome}</AppearanceStyleBoundary>;
+  }
   const workspaceChrome = (
     <View style={rowStyle}>
       {!isCompactLayout ? (
         <WindowChromeRegion corners={appChromeLayout.sidebarCorners}>
-          {sidebarChrome}
+          {themedSidebarChrome}
         </WindowChromeRegion>
       ) : null}
       {usesCompactExplorerHost ? (
@@ -569,42 +571,50 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
     </View>
   );
 
+  // Native panel gesture hosts outlive appearance keys, like native navigators.
+  // Their tracked styles update in place; web numeric styles still need remounting.
   const surface = (
     <View style={layoutStyles.surfaceFill}>
       {workspaceChrome}
-      {!isCompactLayout && appChromeLayout.sidebarToggleOwner === "window" ? (
-        <WindowChromeRegion corners="top-left">
-          <WindowChromeSafeArea
-            placement="inline"
-            horizontalPadding={WINDOW_SIDEBAR_TOGGLE_HORIZONTAL_PADDING}
-            pointerEvents="box-none"
-            style={layoutStyles.windowSidebarToggle}
-          >
-            <WindowSidebarMenuToggle />
-          </WindowChromeSafeArea>
-        </WindowChromeRegion>
-      ) : null}
-      <DesktopWindowControls />
-      <FloatingPanelPortalHost />
-      {isCompactLayout ? sidebarChrome : null}
-      <DownloadToast />
-      <RosettaCalloutSource />
-      <UpdateCalloutSource />
-      <LegacyAgentSkillsMigration />
-      <WorktreeSetupCalloutSource />
-      <CommandCenterRootActions />
-      <CommandCenterWorkspaceActions />
-      <PluginCommandCenterActions />
-      <WorkspacePinShortcutHandler />
-      <WorkspaceRenameHost />
-      <CommandCenter />
-      <AddProjectFlowHost />
-      <HostChooserModal />
-      <ProviderSettingsHost />
-      <WorkspaceSetupDialog />
-      <KeyboardShortcutsDialog />
-      <AppDiagnosticHost />
-      <QuittingOverlay />
+      <AppearanceStyleBoundary>
+        {!isCompactLayout && appChromeLayout.sidebarToggleOwner === "window" ? (
+          <WindowChromeRegion corners="top-left">
+            <WindowChromeSafeArea
+              placement="inline"
+              horizontalPadding={WINDOW_SIDEBAR_TOGGLE_HORIZONTAL_PADDING}
+              pointerEvents="box-none"
+              style={layoutStyles.windowSidebarToggle}
+            >
+              <WindowSidebarMenuToggle />
+            </WindowChromeSafeArea>
+          </WindowChromeRegion>
+        ) : null}
+        <DesktopWindowControls />
+        <FloatingPanelPortalHost />
+      </AppearanceStyleBoundary>
+      {isCompactLayout ? themedSidebarChrome : null}
+      <AppearanceStyleBoundary>
+        <DownloadToast />
+        <RosettaCalloutSource />
+        <UpdateCalloutSource />
+        <LegacyAgentSkillsMigration />
+        <WorktreeSetupCalloutSource />
+        <CommandCenterRootActions />
+        <CommandCenterWorkspaceActions />
+        <PluginCommandCenterActions />
+        <WorkspacePinShortcutHandler />
+        <WorkspaceRenameHost />
+        <CommandCenter />
+        <AddProjectFlowHost />
+        <HostChooserModal />
+        <HostConfirmationSheet />
+        <ProviderSettingsHost />
+        <WorkspaceSetupDialog />
+        <KeyboardShortcutsDialog />
+        <AppDiagnosticHost />
+        <ChangelogHost />
+        <QuittingOverlay />
+      </AppearanceStyleBoundary>
     </View>
   );
 
@@ -614,7 +624,11 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
     surface
   );
 
-  return <CommandCenterProvider>{content}</CommandCenterProvider>;
+  return (
+    <ComposerEditingSessionsProvider>
+      <CommandCenterProvider>{content}</CommandCenterProvider>
+    </ComposerEditingSessionsProvider>
+  );
 }
 
 function SidebarChrome({
@@ -657,16 +671,14 @@ function MobileGestureWrapper({
 }
 
 function ProvidersWrapper({ children }: { children: ReactNode }) {
-  const { upsertConnectionFromOfferUrl } = useHostMutations();
-
   return (
     <AppearanceProvider>
       <VoiceProvider>
         <DesktopWindowControlsSync />
-        <OfferLinkListener upsertDaemonFromOfferUrl={upsertConnectionFromOfferUrl} />
+        <OfferLinkListener />
         <HostSessionManager />
         <FaviconStatusSync />
-        <AppearanceStyleBoundary>{children}</AppearanceStyleBoundary>
+        {children}
       </VoiceProvider>
     </AppearanceProvider>
   );
@@ -690,45 +702,36 @@ function DesktopWindowControlsSync() {
   return null;
 }
 
-function OfferLinkListener({
-  upsertDaemonFromOfferUrl,
-}: {
-  upsertDaemonFromOfferUrl: (offerUrlOrFragment: string) => Promise<unknown>;
-}) {
+function OfferLinkListener() {
   const router = useRouter();
 
   useEffect(() => {
     let cancelled = false;
-    const handleUrl = (url: string | null) => {
+    const handleUrl = async (url: string | null) => {
       if (!url) return;
-      if (!url.includes("#offer=")) return;
-      void upsertDaemonFromOfferUrl(url)
-        .then((profile) => {
-          if (cancelled) return;
-          const serverId = (profile as { serverId?: unknown } | null)?.serverId;
-          if (typeof serverId !== "string" || !serverId) return;
-          router.replace(buildOpenProjectRoute());
-          return;
-        })
-        .catch((error) => {
-          if (cancelled) return;
-          console.warn("[Linking] Failed to import pairing offer", error);
-        });
+      if (!url.includes("#offer=") && !url.includes("#connect=") && !url.startsWith("relay://"))
+        return;
+      try {
+        const result = await getHostRuntimeStore().importConnectionLink(url, "openProject");
+        if (!cancelled && result.status === "connected") router.replace(buildOpenProjectRoute());
+      } catch (error) {
+        console.warn("[OfferLinkListener] Pairing link failed", error);
+      }
     };
 
     void Linking.getInitialURL()
-      .then(handleUrl)
+      .then((url) => handleUrl(url))
       .catch(() => undefined);
 
     const subscription = Linking.addEventListener("url", (event) => {
-      handleUrl(event.url);
+      void handleUrl(event.url);
     });
 
     return () => {
       cancelled = true;
       subscription.remove();
     };
-  }, [router, upsertDaemonFromOfferUrl]);
+  }, [router]);
 
   return null;
 }
@@ -877,11 +880,15 @@ const ROOT_STACK_SCREEN_OPTIONS = {
   headerShown: false,
   animation: "none" as const,
 };
+const ROOT_STACK_NESTED_NAVIGATOR_SCREENS = ["h/[serverId]"] as const;
 
 function RootStack() {
   const storeReady = useStoreReady();
   return (
-    <ThemedStack screenOptions={ROOT_STACK_SCREEN_OPTIONS}>
+    <ThemedStack
+      screenOptions={ROOT_STACK_SCREEN_OPTIONS}
+      nestedNavigatorScreens={ROOT_STACK_NESTED_NAVIGATOR_SCREENS}
+    >
       <Stack.Screen name="index" />
       <Stack.Protected guard={storeReady}>
         <Stack.Screen name="welcome" />
@@ -896,6 +903,7 @@ function RootStack() {
       <Stack.Screen name="h/[serverId]" />
       <Stack.Screen name="settings/hosts/[serverId]/index" />
       <Stack.Screen name="settings/hosts/[serverId]/[hostSection]" />
+      <Stack.Screen name="settings/hosts/[serverId]/plugins/[pluginId]/[screenId]" />
       <Stack.Screen name="settings/hosts/[serverId]/projects/index" />
       <Stack.Screen name="settings/hosts/[serverId]/projects/[projectId]" />
     </ThemedStack>
@@ -966,11 +974,13 @@ function RootAppTree() {
   return (
     <GestureHandlerRootView style={flexStyle}>
       <View style={layoutStyles.surfaceFill}>
-        <RootProviders>
-          <RuntimeProviders>
-            <AppShell />
-          </RuntimeProviders>
-        </RootProviders>
+        <LucideProvider strokeWidth={ICON_STROKE_WIDTH}>
+          <RootProviders>
+            <RuntimeProviders>
+              <AppShell />
+            </RuntimeProviders>
+          </RootProviders>
+        </LucideProvider>
       </View>
     </GestureHandlerRootView>
   );
@@ -987,17 +997,7 @@ export default function RootLayout() {
     return () => subscription.remove();
   }, []);
 
-  return (
-    <QueryProvider>
-      <I18nProvider>
-        <SafeAreaProvider>
-          <RootErrorBoundary>
-            <RootAppTree />
-          </RootErrorBoundary>
-        </SafeAreaProvider>
-      </I18nProvider>
-    </QueryProvider>
-  );
+  return <RootAppTree />;
 }
 
 const layoutStyles = StyleSheet.create((theme) => ({
diff --git a/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx b/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx
index 8396d00b36..7dc11b08f1 100644
--- a/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx
+++ b/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx
@@ -115,8 +115,7 @@ function HostWorkspaceRouteContent() {
   const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
   const workspaceExists = useWorkspaceExists(serverId, workspaceId);
   const openIntent = useMemo(() => parseWorkspaceOpenIntent(openValue), [openValue]);
-  const recoveryAgentId = openIntent?.kind === "agent" ? openIntent.agentId : null;
-  const isAgentOpenIntent = recoveryAgentId !== null;
+  const isAgentOpenIntent = openIntent?.kind === "agent";
   const isOpenIntentWaitingForWorkspace = Boolean(
     isAgentOpenIntent && (!hasHydratedWorkspaces || !workspaceExists),
   );
@@ -191,16 +190,10 @@ function HostWorkspaceRouteContent() {
     return null;
   }
 
-  return <WorkspaceDeck recoveryRequested={isAgentOpenIntent} recoveryAgentId={recoveryAgentId} />;
+  return <WorkspaceDeck recoveryRequested={isAgentOpenIntent} />;
 }
 
-function WorkspaceDeck({
-  recoveryRequested,
-  recoveryAgentId,
-}: {
-  recoveryRequested: boolean;
-  recoveryAgentId: string | null;
-}) {
+function WorkspaceDeck({ recoveryRequested }: { recoveryRequested: boolean }) {
   const activeSelection = useActiveWorkspaceSelection();
   const [retainedSelections, setRetainedSelections] = useState<RetainedWorkspaceSelection[]>(() =>
     activeSelection ? [{ selection: activeSelection, inactiveSince: null }] : [],
@@ -272,7 +265,6 @@ function WorkspaceDeck({
               selection={selection}
               active={active}
               recoveryRequested={recoveryRequested}
-              recoveryAgentId={recoveryAgentId}
               onUnmountInactive={unmountWorkspaceSelection}
             />
           );
@@ -286,13 +278,11 @@ function WorkspaceDeckEntry({
   selection,
   active,
   recoveryRequested,
-  recoveryAgentId,
   onUnmountInactive,
 }: {
   selection: ActiveWorkspaceSelection;
   active: boolean;
   recoveryRequested: boolean;
-  recoveryAgentId: string | null;
   onUnmountInactive: (selection: ActiveWorkspaceSelection) => void;
 }) {
   const hasHydratedWorkspaces = useHasHydratedWorkspaces(selection.serverId);
@@ -323,7 +313,6 @@ function WorkspaceDeckEntry({
         workspaceId={selection.workspaceId}
         isRouteFocused={active}
         recoveryRequested={active && recoveryRequested}
-        recoveryAgentId={active ? recoveryAgentId : null}
       />
     </RetainedPanel>
   );
diff --git a/packages/app/src/app/pair-scan.tsx b/packages/app/src/app/pair-scan.tsx
index 63f01a7b26..6aea5225d6 100644
--- a/packages/app/src/app/pair-scan.tsx
+++ b/packages/app/src/app/pair-scan.tsx
@@ -1,18 +1,18 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, Pressable, Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { useLocalSearchParams, useRouter, type Href } from "expo-router";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { CameraView, useCameraPermissions } from "expo-camera";
 import type { BarcodeScanningResult, BarcodeSettings } from "expo-camera";
-import { useHostMutations } from "@/runtime/host-runtime";
-import { decodeOfferFragmentPayload, normalizeHostPort } from "@/utils/daemon-endpoints";
-import { connectToDaemon } from "@/utils/test-daemon-connection";
-import { ConnectionOfferSchema } from "@getpaseo/protocol/connection-offer";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { openPairScan } from "@/hosts/pair-scan-model";
 import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
 import { isWeb } from "@/constants/platform";
 import { BackHeader } from "@/components/headers/back-header";
+import { PairLinkModal } from "@/components/pair-link-modal";
+import { Button } from "@/components/ui/button";
 
 const styles = StyleSheet.create((theme) => ({
   container: {
@@ -75,6 +75,9 @@ const styles = StyleSheet.create((theme) => ({
     borderBottomWidth: 4,
     borderBottomRightRadius: 12,
   },
+  scanAgainButton: {
+    marginTop: theme.spacing[6],
+  },
   helperText: {
     marginTop: theme.spacing[6],
     color: theme.colors.foregroundMuted,
@@ -110,15 +113,6 @@ const styles = StyleSheet.create((theme) => ({
   },
 }));
 
-function extractOfferUrlFromScan(result: BarcodeScanningResult): string | null {
-  const raw = typeof result.data === "string" ? result.data.trim() : "";
-  if (!raw) return null;
-
-  if (raw.includes("#offer=")) return raw;
-
-  return null;
-}
-
 export default function PairScanScreen() {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
@@ -128,11 +122,8 @@ export default function PairScanScreen() {
     source?: string;
   }>();
   const source = typeof params.source === "string" ? params.source : "settings";
-  const { upsertConnectionFromOfferUrl: upsertDaemonFromOfferUrl } = useHostMutations();
 
   const [permission, requestPermission] = useCameraPermissions();
-  const [isPairing, setIsPairing] = useState(false);
-  const lastScannedRef = useRef<string | null>(null);
 
   const navigateToPairedHost = useCallback(
     (serverId: string) => {
@@ -145,6 +136,19 @@ export default function PairScanScreen() {
     [router, source],
   );
 
+  const [scan] = useState(() =>
+    openPairScan({
+      importConnectionLink: (link) =>
+        getHostRuntimeStore().importConnectionLink(
+          link,
+          source === "onboarding" ? "hostRoot" : "hostSettings",
+        ),
+      onConnected: navigateToPairedHost,
+    }),
+  );
+  const scanState = useSyncExternalStore(scan.subscribe, scan.getState, scan.getState);
+  useEffect(() => () => scan.close(), [scan]);
+
   const closeToSource = useCallback(() => {
     try {
       router.back();
@@ -160,48 +164,16 @@ export default function PairScanScreen() {
   }, [permission, requestPermission]);
 
   const handleScan = useCallback(
-    async (result: BarcodeScanningResult) => {
-      if (isPairing) return;
-      const offerUrl = extractOfferUrlFromScan(result);
-      if (!offerUrl) return;
-
-      if (lastScannedRef.current === offerUrl) return;
-      lastScannedRef.current = offerUrl;
-
-      try {
-        setIsPairing(true);
-        const idx = offerUrl.indexOf("#offer=");
-        const encoded = offerUrl.slice(idx + "#offer=".length).trim();
-        const offerPayload = decodeOfferFragmentPayload(encoded);
-        const offer = ConnectionOfferSchema.parse(offerPayload);
-
-        const { client, hostname } = await connectToDaemon(
-          {
-            id: "probe",
-            type: "relay",
-            relayEndpoint: normalizeHostPort(offer.relay.endpoint),
-            useTls: offer.relay.useTls,
-            daemonPublicKeyB64: offer.daemonPublicKeyB64,
-          },
-          { serverId: offer.serverId },
-        );
-        await client.close().catch(() => undefined);
-
-        const profile = await upsertDaemonFromOfferUrl(offerUrl, hostname ?? undefined);
-
-        navigateToPairedHost(profile.serverId);
-      } catch (error) {
-        lastScannedRef.current = null;
-        const message = error instanceof Error ? error.message : t("pairing.scan.unableToPair");
-        Alert.alert(t("pairing.scan.errorTitle"), message);
-      } finally {
-        setIsPairing(false);
-      }
-    },
-    [isPairing, navigateToPairedHost, t, upsertDaemonFromOfferUrl],
+    (result: BarcodeScanningResult) =>
+      scan.scan(typeof result.data === "string" ? result.data : ""),
+    [scan],
   );
 
   const handleRouterBack = useCallback(() => router.back(), [router]);
+  const savePasswordPairing = useCallback(
+    ({ serverId }: { serverId: string }) => navigateToPairedHost(serverId),
+    [navigateToPairedHost],
+  );
   const handleRequestPermission = useCallback(() => {
     void requestPermission();
   }, [requestPermission]);
@@ -255,18 +227,40 @@ export default function PairScanScreen() {
               barcodeScannerSettings={BARCODE_SCANNER_SETTINGS}
               onBarcodeScanned={handleScan}
             />
-            <View style={styles.overlay} pointerEvents="none">
+            <View style={styles.overlay} pointerEvents="box-none">
               <View style={styles.scanFrame}>
                 <View style={[styles.corner, styles.cornerTL]} />
                 <View style={[styles.corner, styles.cornerTR]} />
                 <View style={[styles.corner, styles.cornerBL]} />
                 <View style={[styles.corner, styles.cornerBR]} />
               </View>
-              {isPairing ? <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text> : null}
+              {scanState.status === "pairing" ? (
+                <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text>
+              ) : null}
+              {scanState.status === "stopped" && scanState.error ? (
+                <Text style={helperTextStyle}>{scanState.error}</Text>
+              ) : null}
+              {scanState.status === "stopped" ? (
+                <Button
+                  style={styles.scanAgainButton}
+                  onPress={scan.scanAgain}
+                  testID="pair-scan-again"
+                >
+                  {t("pairing.connectionMethods.scanQr.title")}
+                </Button>
+              ) : null}
             </View>
           </View>
         )}
       </View>
+      <PairLinkModal
+        visible={scanState.status === "passwordRequired"}
+        passwordRequired={
+          scanState.status === "passwordRequired" ? scanState.passwordRequired : undefined
+        }
+        onClose={scan.closePassword}
+        onSaved={savePasswordPairing}
+      />
     </View>
   );
 }
diff --git a/packages/app/src/app/settings/hosts/[serverId]/plugins/[pluginId]/[screenId].tsx b/packages/app/src/app/settings/hosts/[serverId]/plugins/[pluginId]/[screenId].tsx
new file mode 100644
index 0000000000..1fa5ad7f85
--- /dev/null
+++ b/packages/app/src/app/settings/hosts/[serverId]/plugins/[pluginId]/[screenId].tsx
@@ -0,0 +1,22 @@
+import { useMemo } from "react";
+
+import { useLocalSearchParams } from "expo-router";
+import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
+import SettingsScreen from "@/screens/settings-screen";
+
+export default function PluginSettingsRoute() {
+  const { serverId, pluginId, screenId } = useLocalSearchParams<{
+    serverId: string;
+    pluginId: string;
+    screenId: string;
+  }>();
+  const view = useMemo(
+    () => ({ kind: "plugin" as const, serverId, pluginId, screenId }),
+    [serverId, pluginId, screenId],
+  );
+  return (
+    <HostRouteBootstrapBoundary>
+      <SettingsScreen view={view} />
+    </HostRouteBootstrapBoundary>
+  );
+}
diff --git a/packages/app/src/appearance/apply.test.ts b/packages/app/src/appearance/apply.test.ts
index 9780d00738..e18eaa6555 100644
--- a/packages/app/src/appearance/apply.test.ts
+++ b/packages/app/src/appearance/apply.test.ts
@@ -37,6 +37,7 @@ interface FakeTheme {
     "4xl": number;
   };
   lineHeight: { diff: number };
+  contentMaxWidth: number;
   colors: { foreground: string; syntax: Record<string, string> };
 }
 
@@ -56,6 +57,7 @@ function makeFakeTheme(): FakeTheme {
       "4xl": 26,
     },
     lineHeight: { diff: 22 },
+    contentMaxWidth: 820,
     colors: { foreground: "#fff", syntax: {} },
   };
 }
@@ -67,6 +69,7 @@ function makeInput(overrides: Partial<AppearanceInput> = {}): AppearanceInput {
     uiBaseFontSize: 14,
     contentFontSize: 15,
     codeFontSize: 12,
+    contentMaxWidth: 820,
     syntaxTheme: "one",
     ...overrides,
   };
@@ -102,6 +105,12 @@ describe("applyAppearance", () => {
     ]);
   });
 
+  it("patches the content max width into the theme", () => {
+    applyAppearance(makeInput({ contentMaxWidth: 1600 }));
+
+    expect(runCapturedUpdater().contentMaxWidth).toBe(1600);
+  });
+
   it("resolves an empty UI font family to the default stack", () => {
     applyAppearance(makeInput({ uiFontFamily: "" }));
 
diff --git a/packages/app/src/appearance/apply.ts b/packages/app/src/appearance/apply.ts
index 4d840265f0..04032a00b0 100644
--- a/packages/app/src/appearance/apply.ts
+++ b/packages/app/src/appearance/apply.ts
@@ -17,6 +17,7 @@ export interface AppearanceInput {
   uiBaseFontSize: number; // already clamped
   contentFontSize: number; // already clamped
   codeFontSize: number; // already clamped
+  contentMaxWidth: number; // already clamped, default resolved
   syntaxTheme: SyntaxThemeId;
 }
 
@@ -55,7 +56,7 @@ function scaleFontSize(
  * always current and makes ordering vs `setTheme`/`setAdaptiveThemes` irrelevant.
  *
  * The updater preserves the active theme wholesale (surfaces, accents,
- * terminal) and only patches the font ramp and syntax palette.
+ * terminal) and only patches the font ramp, content width, and syntax palette.
  * `updateTheme` replaces the stored theme rather than merging, so we spread
  * `...t` first.
  */
@@ -86,6 +87,7 @@ export function applyAppearance(input: AppearanceInput): void {
           fontFamily,
           fontSize,
           lineHeight,
+          contentMaxWidth: input.contentMaxWidth,
           colors: { ...t.colors, syntax: resolveSyntaxColors(input.syntaxTheme, t.colorScheme) },
         };
       }
@@ -94,6 +96,7 @@ export function applyAppearance(input: AppearanceInput): void {
         fontFamily,
         fontSize,
         lineHeight,
+        contentMaxWidth: input.contentMaxWidth,
         colors: { ...t.colors, syntax: resolveSyntaxColors(input.syntaxTheme, t.colorScheme) },
       };
     });
diff --git a/packages/app/src/appearance/provider.tsx b/packages/app/src/appearance/provider.tsx
index 03fb22b4da..77addad9a3 100644
--- a/packages/app/src/appearance/provider.tsx
+++ b/packages/app/src/appearance/provider.tsx
@@ -1,6 +1,19 @@
-import { createContext, type ReactNode, useCallback, useContext, useEffect, useMemo } from "react";
+import {
+  createContext,
+  type ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 import { UnistylesRuntime } from "react-native-unistyles";
-import { DEFAULT_THEME_PREFERENCE, useAppSettings, type AppSettings } from "@/hooks/use-settings";
+import {
+  DEFAULT_THEME_PREFERENCE,
+  resolveContentMaxWidth,
+  useAppSettings,
+  type AppSettings,
+} from "@/hooks/use-settings";
 import {
   rememberPluginThemeHost,
   usePluginThemeCatalog,
@@ -8,6 +21,7 @@ import {
 } from "@/plugins/themes";
 import { PLUGIN_THEME_NAMES, PLUGIN_THEME_PREFERENCE, THEME_TO_UNISTYLES } from "@/styles/theme";
 import { applyAppearance } from "./apply";
+import { AppearanceSystemBars } from "./system-bars";
 
 interface ContributedThemes {
   options: PluginThemeOption[];
@@ -44,6 +58,7 @@ function applyTheme({ preference, contributedTheme }: ApplyThemeInput): void {
 
 export function AppearanceProvider({ children }: { children: ReactNode }) {
   const { settings, updateSettings, isLoading } = useAppSettings();
+  const [hasAppliedAppearance, setHasAppliedAppearance] = useState(false);
   const options = usePluginThemeCatalog();
   const selected = useMemo(() => {
     if (settings.theme !== PLUGIN_THEME_PREFERENCE) return null;
@@ -59,8 +74,10 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
       uiBaseFontSize: settings.uiBaseFontSize,
       contentFontSize: settings.contentFontSize,
       codeFontSize: settings.codeFontSize,
+      contentMaxWidth: resolveContentMaxWidth({ contentMaxWidth: settings.contentMaxWidth }),
       syntaxTheme: settings.syntaxTheme,
     });
+    setHasAppliedAppearance(true);
   }, [
     isLoading,
     selected,
@@ -70,6 +87,7 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
     settings.uiBaseFontSize,
     settings.contentFontSize,
     settings.codeFontSize,
+    settings.contentMaxWidth,
     settings.syntaxTheme,
   ]);
 
@@ -85,8 +103,15 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
   );
   const value = useMemo(() => ({ options, selected, select }), [options, selected, select]);
 
+  // The first settings load changes appearance keys. Mount screens only after applying it
+  // so startup does not destroy and recreate an already-visible workspace.
+  if (!hasAppliedAppearance) return null;
+
   return (
-    <ContributedThemesContext.Provider value={value}>{children}</ContributedThemesContext.Provider>
+    <ContributedThemesContext.Provider value={value}>
+      <AppearanceSystemBars />
+      {children}
+    </ContributedThemesContext.Provider>
   );
 }
 
diff --git a/packages/app/src/appearance/system-bars.android.tsx b/packages/app/src/appearance/system-bars.android.tsx
new file mode 100644
index 0000000000..f36fb60599
--- /dev/null
+++ b/packages/app/src/appearance/system-bars.android.tsx
@@ -0,0 +1,11 @@
+import { SystemBars } from "react-native-edge-to-edge";
+import { withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
+
+function ThemeSystemBars({ colorScheme }: Pick<Theme, "colorScheme">) {
+  return <SystemBars style={colorScheme === "light" ? "dark" : "light"} />;
+}
+
+export const AppearanceSystemBars = withUnistyles(ThemeSystemBars, (theme) => ({
+  colorScheme: theme.colorScheme,
+}));
diff --git a/packages/app/src/appearance/system-bars.tsx b/packages/app/src/appearance/system-bars.tsx
new file mode 100644
index 0000000000..930579bc4a
--- /dev/null
+++ b/packages/app/src/appearance/system-bars.tsx
@@ -0,0 +1,3 @@
+export function AppearanceSystemBars() {
+  return null;
+}
diff --git a/packages/app/src/assistant-file-links/link.tsx b/packages/app/src/assistant-file-links/link.tsx
index 31f6d719d7..4b8e944ee3 100644
--- a/packages/app/src/assistant-file-links/link.tsx
+++ b/packages/app/src/assistant-file-links/link.tsx
@@ -10,6 +10,7 @@ import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
 import { markdownCopyDataSet } from "@/assistant-selection-copy/markup";
 import { useAssistantFileLinkResolverContext } from "./provider";
 import type { AssistantFileLinkSource } from "./resolver";
+import { formatFileLinkTooltipPath } from "./tooltip-path";
 import { useFileLink } from "./use-file-link";
 
 interface AssistantMarkdownLinkProps {
@@ -34,7 +35,7 @@ export function AssistantMarkdownLink({
   const { configRef } = useAssistantFileLinkResolverContext();
   const workspaceRoot = configRef.current.workspaceRoot;
   const tooltipPath = useMemo(
-    () => (target ? formatInlinePathTargetForTooltip(target, workspaceRoot) : null),
+    () => (target ? formatFileLinkTooltipPath({ target, workspaceRoot }) : null),
     [target, workspaceRoot],
   );
   const linkPress = useMemo<AssistantLinkPress>(
@@ -127,38 +128,6 @@ export function AssistantMarkdownCodeLink({
   );
 }
 
-function formatInlinePathTargetForTooltip(
-  target: { path: string; lineStart?: number; lineEnd?: number },
-  workspaceRoot: string | undefined,
-): string {
-  let result = relativizePathToWorkspace(target.path, workspaceRoot);
-  if (target.lineStart) {
-    result += `:${target.lineStart}`;
-    if (target.lineEnd && target.lineEnd !== target.lineStart) {
-      result += `-${target.lineEnd}`;
-    }
-  }
-  return result;
-}
-
-function relativizePathToWorkspace(filePath: string, workspaceRoot: string | undefined): string {
-  if (!workspaceRoot) {
-    return filePath;
-  }
-  const root = workspaceRoot.replace(/\/+$/, "");
-  if (!root) {
-    return filePath;
-  }
-  if (filePath === root) {
-    return ".";
-  }
-  const prefix = `${root}/`;
-  if (filePath.startsWith(prefix)) {
-    return filePath.slice(prefix.length);
-  }
-  return filePath;
-}
-
 interface AssistantInlineCodePathLinkProps {
   content: string;
   inheritedStyles: TextStyle;
diff --git a/packages/app/src/assistant-file-links/parse.test.ts b/packages/app/src/assistant-file-links/parse.test.ts
index 12921b855c..3390d0cfa9 100644
--- a/packages/app/src/assistant-file-links/parse.test.ts
+++ b/packages/app/src/assistant-file-links/parse.test.ts
@@ -417,6 +417,128 @@ describe("parseAssistantFileLink", () => {
     }
     expect(() => parseFileProtocolUrl("file:///tmp/100% packet loss")).not.toThrow();
   });
+
+  it("decodes percent-encoded relative markdown hrefs", () => {
+    // markdown-it percent-encodes non-ASCII characters in hrefs, so a link
+    // written as [x](docs/reports/开户赠金.md) arrives here percent-encoded.
+    expect(
+      parseAssistantFileLink("docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md",
+      path: "/Users/test/project/docs/reports/开户赠金.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded spaces in relative markdown hrefs", () => {
+    expect(
+      parseAssistantFileLink("docs/my%20file.md#L5", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "docs/my%20file.md#L5",
+      path: "/Users/test/project/docs/my file.md",
+      lineStart: 5,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded absolute hrefs with line suffixes", () => {
+    expect(
+      parseAssistantFileLink("/tmp/%E5%BC%80%E6%88%B7.md:3", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "/tmp/%E5%BC%80%E6%88%B7.md:3",
+      path: "/tmp/开户.md",
+      lineStart: 3,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded home-relative hrefs", () => {
+    expect(
+      parseAssistantFileLink("~/notes/%E5%BC%80%E6%88%B7.md", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "~/notes/%E5%BC%80%E6%88%B7.md",
+      path: "~/notes/开户.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded Windows hrefs", () => {
+    expect(
+      parseAssistantFileLink("C:/repo/my%20dir/app.tsx#L8", {
+        workspaceRoot: "C:/repo",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "C:/repo/my%20dir/app.tsx#L8",
+      path: "C:/repo/my dir/app.tsx",
+      lineStart: 8,
+      lineEnd: undefined,
+    });
+  });
+
+  it("keeps literal percent signs in raw paths that are not hrefs", () => {
+    // Inline-code and linkified tokens are raw file paths: a real file named
+    // "my%20file.md" must not be decoded into "my file.md".
+    expect(
+      parseAssistantFileLink("docs/my%20file.md", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "docs/my%20file.md",
+      path: "/Users/test/project/docs/my%20file.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+    expect(
+      parseAssistantFileLink("/tmp/my%20file.md:3", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/my%20file.md:3",
+      path: "/tmp/my%20file.md",
+      lineStart: 3,
+      lineEnd: undefined,
+    });
+  });
+
+  it("keeps non-ASCII characters in raw absolute paths", () => {
+    // `new URL` percent-encodes non-ASCII, so raw paths must not be routed
+    // through URL parsing — `/tmp/开户.md` must round-trip unchanged.
+    expect(
+      parseAssistantFileLink("/tmp/开户.md", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/开户.md",
+      path: "/tmp/开户.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+    expect(
+      parseAssistantFileLink("/tmp/开户.md#L4", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/开户.md#L4",
+      path: "/tmp/开户.md",
+      lineStart: 4,
+      lineEnd: undefined,
+    });
+  });
 });
 
 describe("normalizeInlinePathTarget", () => {
@@ -469,3 +591,23 @@ describe("normalizeInlinePathTarget", () => {
     });
   });
 });
+
+describe("encoded filename line markers", () => {
+  it.each(["docs/report.md%3A12", "docs/report.md%2812%2C4%29"])(
+    "keeps encoded line syntax in the filename %s",
+    (href) => {
+      expect(
+        parseAssistantFileLink(href, {
+          workspaceRoot: "/workspace",
+          decodeHref: true,
+        }),
+      ).toMatchObject({ path: `/workspace/${decodeURIComponent(href)}` });
+      expect(
+        parseAssistantFileLink(href, {
+          workspaceRoot: "/workspace",
+          decodeHref: true,
+        })?.lineStart,
+      ).toBeUndefined();
+    },
+  );
+});
diff --git a/packages/app/src/assistant-file-links/parse.ts b/packages/app/src/assistant-file-links/parse.ts
index 092f3b4dcd..0a8089acca 100644
--- a/packages/app/src/assistant-file-links/parse.ts
+++ b/packages/app/src/assistant-file-links/parse.ts
@@ -80,6 +80,13 @@ const ASSISTANT_FILE_EXTENSIONS = new Set([
 
 export interface AssistantHrefParseOptions {
   workspaceRoot?: string;
+  /**
+   * True only when `value` is a markdown href — the renderer percent-encodes
+   * non-ASCII and space characters, so the path must be decoded. Raw path
+   * text (inline code, linkified tokens) is not encoded; decoding it would
+   * send a real file named `my%20file.md` to `my file.md`.
+   */
+  decodeHref?: boolean;
 }
 
 export type AssistantFileLinkClassification =
@@ -234,13 +241,20 @@ export function parseFileProtocolUrl(value: string): InlinePathTarget | null {
   };
 }
 
-function parseAssistantInlinePathLink(value: string): InlinePathTarget | null {
+function parseAssistantInlinePathLink(
+  value: string,
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): InlinePathTarget | null {
   const inlinePathTarget = parseInlinePathToken(value);
   if (!inlinePathTarget) {
     return null;
   }
 
-  const normalizedPath = normalizePathToken(inlinePathTarget.path);
+  let pathPart = inlinePathTarget.path;
+  if (options.decodeHref) {
+    pathPart = safeDecodeURIComponent(pathPart);
+  }
+  const normalizedPath = normalizePathToken(pathPart);
   if (!normalizedPath || !isAbsolutePath(normalizedPath)) {
     return null;
   }
@@ -277,7 +291,7 @@ export function classifyAssistantFileLink(
     return null;
   }
 
-  if (isAmbiguousWorkspaceCandidate(trimmed, target, options.workspaceRoot)) {
+  if (isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
     return {
       kind: "ambiguousFileCandidate",
       target,
@@ -308,32 +322,19 @@ export function parseAssistantFileLink(
     return null;
   }
 
-  const inlinePathTarget = parseAssistantInlinePathLink(trimmed);
+  const inlinePathTarget = parseAssistantInlinePathLink(trimmed, options);
   if (inlinePathTarget) {
     return inlinePathTarget;
   }
 
-  const windowsPathMatch = trimmed.match(/^([A-Za-z]:[\\/][^?#]*)(#[^?]+)?$/);
-  if (windowsPathMatch) {
-    const normalizedPath = normalizePathToken(windowsPathMatch[1] ?? "");
-    if (!normalizedPath) {
-      return null;
-    }
-
-    const lines = parseLineFragment(windowsPathMatch[2] ?? "");
-    if (!lines) {
-      return null;
-    }
-
-    return {
-      raw: value,
-      path: normalizedPath,
-      ...lines,
-    };
+  const windowsTarget = parseWindowsFileLink(trimmed, value, options);
+  if (windowsTarget) {
+    return windowsTarget;
   }
 
   const relativeTarget = parseWorkspaceRelativeFileLink(trimmed, {
     workspaceRoot: options.workspaceRoot,
+    decodeHref: options.decodeHref,
   });
   if (relativeTarget) {
     return relativeTarget;
@@ -343,19 +344,33 @@ export function parseAssistantFileLink(
     return null;
   }
 
-  let parsedUrl: URL;
-  try {
-    parsedUrl = new URL(trimmed, "http://paseo.invalid");
-  } catch {
-    return null;
+  // Hrefs go through URL parsing so `%`-escapes and `.`/`..` segments
+  // normalize before decode. Raw paths must not: `new URL` percent-encodes
+  // non-ASCII characters, which would corrupt `/tmp/开户.md` into the
+  // still-encoded name.
+  let pathPart: string;
+  let hashPart: string;
+  if (options.decodeHref) {
+    let parsedUrl: URL;
+    try {
+      parsedUrl = new URL(trimmed, "http://paseo.invalid");
+    } catch {
+      return null;
+    }
+    pathPart = safeDecodeURIComponent(parsedUrl.pathname);
+    hashPart = parsedUrl.hash;
+  } else {
+    const hashIndex = trimmed.indexOf("#");
+    pathPart = hashIndex >= 0 ? trimmed.slice(0, hashIndex) : trimmed;
+    hashPart = hashIndex >= 0 ? trimmed.slice(hashIndex) : "";
   }
 
-  const normalizedPath = normalizePathToken(safeDecodeURIComponent(parsedUrl.pathname));
+  const normalizedPath = normalizePathToken(pathPart);
   if (!normalizedPath || !isAbsolutePath(normalizedPath)) {
     return null;
   }
 
-  const lines = parseLineFragment(parsedUrl.hash);
+  const lines = parseLineFragment(hashPart);
   if (!lines) {
     return null;
   }
@@ -386,11 +401,42 @@ export function isFileLookingAssistantToken(value: string): boolean {
   return isPlausibleAssistantLocalPath(path);
 }
 
+function parseWindowsFileLink(
+  trimmed: string,
+  raw: string,
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): InlinePathTarget | null {
+  const windowsPathMatch = trimmed.match(/^([A-Za-z]:[\\/][^?#]*)(#[^?]+)?$/);
+  if (!windowsPathMatch) {
+    return null;
+  }
+
+  let pathPart = windowsPathMatch[1] ?? "";
+  if (options.decodeHref) {
+    pathPart = safeDecodeURIComponent(pathPart);
+  }
+  const normalizedPath = normalizePathToken(pathPart);
+  if (!normalizedPath) {
+    return null;
+  }
+
+  const lines = parseLineFragment(windowsPathMatch[2] ?? "");
+  if (!lines) {
+    return null;
+  }
+
+  return {
+    raw,
+    path: normalizedPath,
+    ...lines,
+  };
+}
+
 function parseWorkspaceRelativeFileLink(
   value: string,
   options: AssistantHrefParseOptions,
 ): InlinePathTarget | null {
-  const parsed = parseLocalPathParts(value);
+  const parsed = parseLocalPathParts(value, options);
   if (!parsed || isAbsolutePath(parsed.path)) {
     return null;
   }
@@ -422,7 +468,11 @@ function parseWorkspaceRelativeFileLink(
 
 function parseLocalPathParts(
   value: string,
-): { path: string; lines: Pick<InlinePathTarget, "lineStart" | "lineEnd"> } | null {
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): {
+  path: string;
+  lines: Pick<InlinePathTarget, "lineStart" | "lineEnd">;
+} | null {
   const normalized = normalizePathToken(value);
   if (!normalized || normalized.includes("?")) {
     return null;
@@ -436,14 +486,19 @@ function parseLocalPathParts(
     return null;
   }
 
+  // Split literal line markers before decoding; encoded punctuation belongs
+  // to the filename. Raw inline-code/path text stays untouched.
   const inlinePathTarget = parseInlinePathToken(beforeHash);
   if (inlinePathTarget) {
-    if (!isPlausibleAssistantLocalPath(inlinePathTarget.path)) {
+    let pathPart = inlinePathTarget.path;
+    if (options.decodeHref) {
+      pathPart = safeDecodeURIComponent(pathPart);
+    }
+    if (!isPlausibleAssistantLocalPath(pathPart)) {
       return null;
     }
-
     return {
-      path: inlinePathTarget.path,
+      path: pathPart,
       lines: {
         lineStart: inlinePathTarget.lineStart,
         lineEnd: inlinePathTarget.lineEnd,
@@ -455,12 +510,17 @@ function parseLocalPathParts(
     return null;
   }
 
-  if (!isPlausibleAssistantLocalPath(beforeHash)) {
+  let decodedBeforeHash = beforeHash;
+  if (options.decodeHref) {
+    decodedBeforeHash = safeDecodeURIComponent(beforeHash);
+  }
+  const plausiblePath = parseInlinePathToken(decodedBeforeHash)?.path ?? decodedBeforeHash;
+  if (!isPlausibleAssistantLocalPath(plausiblePath)) {
     return null;
   }
 
   return {
-    path: beforeHash,
+    path: decodedBeforeHash,
     lines: fragmentLines,
   };
 }
@@ -545,14 +605,14 @@ function isExternalHref(value: string): boolean {
 function isAmbiguousWorkspaceCandidate(
   value: string,
   target: InlinePathTarget,
-  workspaceRoot?: string,
+  options: AssistantHrefParseOptions = {},
 ): boolean {
-  const normalizedWorkspaceRoot = normalizePathInput(workspaceRoot);
+  const normalizedWorkspaceRoot = normalizePathInput(options.workspaceRoot);
   if (!normalizedWorkspaceRoot || !isAllowedAbsolutePath(target.path, normalizedWorkspaceRoot)) {
     return false;
   }
 
-  const parsed = parseLocalPathParts(value);
+  const parsed = parseLocalPathParts(value, options);
   if (!parsed || isAbsolutePath(parsed.path)) {
     return false;
   }
diff --git a/packages/app/src/assistant-file-links/resolver.test.ts b/packages/app/src/assistant-file-links/resolver.test.ts
index 312bfff1fd..384c3b6857 100644
--- a/packages/app/src/assistant-file-links/resolver.test.ts
+++ b/packages/app/src/assistant-file-links/resolver.test.ts
@@ -1,4 +1,8 @@
 import { describe, expect, it } from "vitest";
+import MarkdownIt from "markdown-it";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import {
   classifyForResolution,
   fetchDaemonResolution,
@@ -14,6 +18,25 @@ const CONTEXT: AssistantFileLinkContext = {
   workspaceRoot: "/Users/test/project",
 };
 
+it("opens the existing non-ASCII file named by a rendered markdown link", async () => {
+  const workspaceRoot = await mkdtemp(path.join(tmpdir(), "assistant-file-link-"));
+  try {
+    await mkdir(path.join(workspaceRoot, "docs/reports"), { recursive: true });
+    await writeFile(path.join(workspaceRoot, "docs/reports/开户赠金.md"), "report content");
+    const tokens = new MarkdownIt().parseInline("[报告](docs/reports/开户赠金.md)", {});
+    const href = tokens[0].children?.find((token) => token.type === "link_open")?.attrGet("href");
+    expect(href).toBe("docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md");
+    const resolution = classifyForResolution({ href: href! }, { workspaceRoot });
+    expect(resolution.kind).toBe("resolved");
+    if (resolution.kind !== "resolved" || resolution.value.kind !== "file") {
+      throw new Error("Expected a directly resolved file link");
+    }
+    expect(await readFile(resolution.value.target.path, "utf8")).toBe("report content");
+  } finally {
+    await rm(workspaceRoot, { recursive: true, force: true });
+  }
+});
+
 function resolvedSuggestions(
   entries: DirectorySuggestionResult["entries"],
 ): DirectorySuggestionResult {
@@ -52,6 +75,27 @@ const unavailableSuggestions: GetDirectorySuggestions = async () => {
 };
 
 describe("classifyForResolution", () => {
+  it.each([
+    ["C:/repo/my%20file.md", undefined],
+    ["C:\\repo\\my%20file.md", undefined],
+    ["C:/repo/my%20file.md:12", 12],
+    ["C:\\repo\\my%20file.md:12", 12],
+  ])("keeps the literal filename in Windows inline code %s", (href, lineStart) => {
+    for (const text of [href, undefined]) {
+      const result = classifyForResolution(
+        { href, text, sourceType: "inline-code" },
+        { workspaceRoot: "C:/repo" },
+      );
+      expect(result).toMatchObject({
+        kind: "resolved",
+        value: { kind: "file", target: { path: "C:/repo/my%20file.md", lineStart } },
+      });
+    }
+    expect(classifyForResolution({ href }, { workspaceRoot: "C:/repo" })).toMatchObject({
+      kind: "resolved",
+      value: { kind: "file", target: { path: "C:/repo/my file.md", lineStart } },
+    });
+  });
   it("returns the directFile target synchronously", () => {
     const result = classifyForResolution({ href: "src/components/message.tsx#L33" }, CONTEXT);
 
@@ -165,6 +209,46 @@ describe("classifyForResolution", () => {
 
     expect(result).toEqual({ kind: "resolved", value: { kind: "ignored" } });
   });
+
+  it("decodes percent-encoded markdown hrefs", () => {
+    const result = classifyForResolution({ href: "docs/my%20file.md" }, CONTEXT);
+
+    expect(result).toEqual({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: {
+          raw: "docs/my%20file.md",
+          path: "/Users/test/project/docs/my file.md",
+          lineStart: undefined,
+          lineEnd: undefined,
+        },
+      },
+    });
+  });
+
+  it("keeps literal percent signs in inline-code paths", () => {
+    const result = classifyForResolution(
+      {
+        href: "docs/my%20file.md",
+        text: "docs/my%20file.md",
+        sourceType: "inline-code",
+      },
+      CONTEXT,
+    );
+
+    expect(result).toEqual({
+      kind: "needsLookup",
+      ambiguousQuery: "docs/my%20file.md",
+      token: "docs/my%20file.md",
+      target: {
+        raw: "docs/my%20file.md",
+        path: "/Users/test/project/docs/my%20file.md",
+        lineStart: undefined,
+        lineEnd: undefined,
+      },
+    });
+  });
 });
 
 describe("fetchDaemonResolution", () => {
diff --git a/packages/app/src/assistant-file-links/resolver.ts b/packages/app/src/assistant-file-links/resolver.ts
index 5fa4849fc8..774d39278b 100644
--- a/packages/app/src/assistant-file-links/resolver.ts
+++ b/packages/app/src/assistant-file-links/resolver.ts
@@ -108,13 +108,15 @@ export function classifyForResolution(
   source: AssistantFileLinkSource,
   context: AssistantFileLinkContext,
 ): AssistantFileLinkResolution {
-  const token = getAssistantFileLinkToken(source).trim();
+  const tokenInfo = getAssistantFileLinkTokenInfo(source);
+  const token = tokenInfo.token.trim();
   if (!token) {
     return { kind: "resolved", value: { kind: "ignored" } };
   }
 
   const classification = classifyAssistantFileLink(token, {
     workspaceRoot: context.workspaceRoot,
+    decodeHref: tokenInfo.fromHref,
   });
   if (!classification) {
     return { kind: "resolved", value: { kind: "ignored" } };
@@ -148,14 +150,26 @@ export function classifyForResolution(
 }
 
 export function getAssistantFileLinkToken(source: AssistantFileLinkSource): string {
-  if (isLinkifiedSource(source) || source.sourceType === "inline-code") {
+  return getAssistantFileLinkTokenInfo(source).token;
+}
+
+// Markdown link hrefs are percent-encoded by the renderer; inline-code and
+// linkified text are raw file paths that must not be decoded.
+function getAssistantFileLinkTokenInfo(source: AssistantFileLinkSource): {
+  token: string;
+  fromHref: boolean;
+} {
+  if (source.sourceType === "inline-code") {
+    return { token: source.text?.trim() || source.href, fromHref: false };
+  }
+  if (isLinkifiedSource(source)) {
     const text = source.text?.trim();
     if (text && isFileLookingAssistantToken(text)) {
-      return text;
+      return { token: text, fromHref: false };
     }
   }
 
-  return source.href;
+  return { token: source.href, fromHref: true };
 }
 
 export function getAmbiguousSuggestionQuery(
diff --git a/packages/app/src/assistant-file-links/tooltip-path.test.ts b/packages/app/src/assistant-file-links/tooltip-path.test.ts
new file mode 100644
index 0000000000..c01410f54b
--- /dev/null
+++ b/packages/app/src/assistant-file-links/tooltip-path.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it } from "vitest";
+import { formatFileLinkTooltipPath } from "./tooltip-path";
+
+describe("formatFileLinkTooltipPath", () => {
+  it("shows a Windows file path relative to its workspace regardless of separators", () => {
+    expect(
+      formatFileLinkTooltipPath({
+        target: {
+          path: "C:/Users/me/repo/src/app.ts",
+          lineStart: 12,
+          lineEnd: 20,
+        },
+        workspaceRoot: "C:\\Users\\me\\repo",
+      }),
+    ).toBe("src/app.ts:12-20");
+    expect(
+      formatFileLinkTooltipPath({
+        target: { path: "C:/src/app.ts", lineStart: 12 },
+        workspaceRoot: "C:\\",
+      }),
+    ).toBe("src/app.ts:12");
+  });
+
+  it("shows the workspace root as a dot", () => {
+    expect(
+      formatFileLinkTooltipPath({
+        target: { path: "/Users/me/repo" },
+        workspaceRoot: "/Users/me/repo",
+      }),
+    ).toBe(".");
+    expect(
+      formatFileLinkTooltipPath({
+        target: { path: "C:/Users/Me/Repo/", lineStart: 4 },
+        workspaceRoot: "c:\\users\\me\\repo",
+      }),
+    ).toBe(".:4");
+  });
+
+  it("keeps an absolute path outside the workspace", () => {
+    expect(
+      formatFileLinkTooltipPath({
+        target: { path: "/Users/me/notes.md" },
+        workspaceRoot: "/Users/me/repo",
+      }),
+    ).toBe("/Users/me/notes.md");
+    expect(
+      formatFileLinkTooltipPath({
+        target: { path: "C:/Users/me/notes.md", lineStart: 8 },
+        workspaceRoot: "C:\\Users\\me\\repo",
+      }),
+    ).toBe("C:/Users/me/notes.md:8");
+  });
+
+  it("keeps the target path when the workspace root is unavailable", () => {
+    expect(formatFileLinkTooltipPath({ target: { path: "src/app.ts", lineStart: 12 } })).toBe(
+      "src/app.ts:12",
+    );
+  });
+});
diff --git a/packages/app/src/assistant-file-links/tooltip-path.ts b/packages/app/src/assistant-file-links/tooltip-path.ts
new file mode 100644
index 0000000000..dee48a3e9e
--- /dev/null
+++ b/packages/app/src/assistant-file-links/tooltip-path.ts
@@ -0,0 +1,30 @@
+import {
+  isWorkspaceRootPath,
+  resolveWorkspaceFilePaths,
+  type WorkspaceFileLocation,
+} from "@/workspace/file-open";
+
+interface FormatFileLinkTooltipPathInput {
+  target: WorkspaceFileLocation;
+  workspaceRoot?: string;
+}
+
+export function formatFileLinkTooltipPath({
+  target,
+  workspaceRoot,
+}: FormatFileLinkTooltipPathInput): string {
+  const resolvedPaths = workspaceRoot
+    ? resolveWorkspaceFilePaths({ path: target.path, workspaceRoot })
+    : null;
+  const isWorkspaceRoot = workspaceRoot
+    ? isWorkspaceRootPath({ path: target.path, workspaceRoot })
+    : false;
+  let result = isWorkspaceRoot ? "." : (resolvedPaths?.relativePath ?? target.path);
+  if (target.lineStart) {
+    result += `:${target.lineStart}`;
+    if (target.lineEnd && target.lineEnd !== target.lineStart) {
+      result += `-${target.lineEnd}`;
+    }
+  }
+  return result;
+}
diff --git a/packages/app/src/assistant-file-links/use-file-link.ts b/packages/app/src/assistant-file-links/use-file-link.ts
index 2a08594aa5..603645f0fe 100644
--- a/packages/app/src/assistant-file-links/use-file-link.ts
+++ b/packages/app/src/assistant-file-links/use-file-link.ts
@@ -29,14 +29,21 @@ export interface AssistantFileLinkActions {
   canResolveFile(source: AssistantFileLinkSource): boolean;
 }
 
+interface AssistantFileLinkLookupKey {
+  query: string;
+  path: string;
+  lineStart: number | null;
+  lineEnd: number | null;
+}
+
 type AssistantFileLinkQueryKey = readonly [
   "assistantFileLink",
   string | null,
   string | null,
-  string,
+  AssistantFileLinkLookupKey | null,
 ];
 
-const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, ""] as const;
+const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, null] as const;
 
 export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult {
   const { t } = useTranslation();
@@ -59,7 +66,7 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
         ? assistantFileLinkQueryKey({
             serverId,
             workspaceRoot,
-            ambiguousQuery: resolution.ambiguousQuery,
+            resolution,
           })
         : DISABLED_QUERY_KEY,
     [resolution, serverId, workspaceRoot],
@@ -179,7 +186,7 @@ function openAssistantFileLink(input: {
   const capturedQueryKey = assistantFileLinkQueryKey({
     serverId: capturedConfig.serverId,
     workspaceRoot: capturedConfig.workspaceRoot,
-    ambiguousQuery: capturedResolution.ambiguousQuery,
+    resolution: capturedResolution,
   });
 
   const run = async () => {
@@ -245,13 +252,18 @@ function useStableSource(source: AssistantFileLinkSource): AssistantFileLinkSour
 function assistantFileLinkQueryKey(input: {
   serverId?: string;
   workspaceRoot?: string;
-  ambiguousQuery: string;
+  resolution: Extract<AssistantFileLinkResolution, { kind: "needsLookup" }>;
 }): AssistantFileLinkQueryKey {
   return [
     "assistantFileLink",
     input.serverId ?? null,
     input.workspaceRoot ?? null,
-    input.ambiguousQuery,
+    {
+      query: input.resolution.ambiguousQuery,
+      path: input.resolution.target.path,
+      lineStart: input.resolution.target.lineStart ?? null,
+      lineEnd: input.resolution.target.lineEnd ?? null,
+    },
   ];
 }
 
diff --git a/packages/app/src/assistant-image/use-assistant-image.ts b/packages/app/src/assistant-image/use-assistant-image.ts
index 0c0818e8f1..3314b7a398 100644
--- a/packages/app/src/assistant-image/use-assistant-image.ts
+++ b/packages/app/src/assistant-image/use-assistant-image.ts
@@ -415,8 +415,8 @@ export function useAssistantImage({
   const preview = dataImage ? dataImagePreview : filePreview;
   const previewUri = preview.status === "loaded" ? preview.uri : null;
   const uri = directUri ?? previewUri;
-  const cachedMetadata = useMemo(
-    () => getAssistantImageMetadata({ source, workspaceRoot, serverId }),
+  const cachedAspectRatio = useMemo(
+    () => getAssistantImageMetadata({ source, workspaceRoot, serverId })?.aspectRatio ?? null,
     [serverId, source, workspaceRoot],
   );
   const [lifecycle, dispatchLifecycle] = useReducer(
@@ -454,9 +454,9 @@ export function useAssistantImage({
     dispatch({
       type: "preview_created",
       uri,
-      aspectRatio: cachedMetadata?.aspectRatio ?? null,
+      aspectRatio: cachedAspectRatio,
     });
-  }, [cachedMetadata, dispatch, uri]);
+  }, [cachedAspectRatio, dispatch, uri]);
 
   const handleImageError = useCallback(() => {
     if (uri) {
@@ -484,7 +484,7 @@ export function useAssistantImage({
       const metadata = dimensions
         ? setAssistantImageMetadata({ source, workspaceRoot, serverId }, dimensions)
         : null;
-      const aspectRatio = metadata?.aspectRatio ?? cachedMetadata?.aspectRatio ?? null;
+      const aspectRatio = metadata?.aspectRatio ?? cachedAspectRatio;
       if (!aspectRatio) {
         dispatch({
           type: "failed",
@@ -495,7 +495,7 @@ export function useAssistantImage({
       }
       dispatch({ type: "image_loaded", uri, aspectRatio });
     },
-    [cachedMetadata, dispatch, serverId, source, t, uri, workspaceRoot],
+    [cachedAspectRatio, dispatch, serverId, source, t, uri, workspaceRoot],
   );
 
   const acquisitionFailure = getAcquisitionFailure({
@@ -539,6 +539,6 @@ export function useAssistantImage({
   return {
     status: "loading",
     binding,
-    aspectRatio: hasCurrentLifecycleUri ? lifecycle.aspectRatio : null,
+    aspectRatio: (hasCurrentLifecycleUri ? lifecycle.aspectRatio : null) ?? cachedAspectRatio,
   };
 }
diff --git a/packages/app/src/assistant-selection-copy/content.browser.test.ts b/packages/app/src/assistant-selection-copy/content.browser.test.ts
index c53cba9f98..aecb4ba5b4 100644
--- a/packages/app/src/assistant-selection-copy/content.browser.test.ts
+++ b/packages/app/src/assistant-selection-copy/content.browser.test.ts
@@ -87,6 +87,31 @@ function selectNodeContents(element: Element): Selection {
   return selection;
 }
 
+interface TranscriptMessage {
+  messageId: string;
+  blocks: string[];
+}
+
+/**
+ * The web transcript's shape: a scroll container holding one row per Markdown block,
+ * each row carrying its message id and wrapping its own assistant message element.
+ */
+function mountTranscript(messages: TranscriptMessage[]): HTMLElement {
+  const transcript = document.createElement("div");
+  transcript.setAttribute("data-testid", "agent-chat-scroll");
+  for (const { messageId, blocks } of messages) {
+    for (const [index, text] of blocks.entries()) {
+      const row = document.createElement("div");
+      row.setAttribute("data-history-row-id", `${messageId}:block:${index}`);
+      row.setAttribute("data-message-id", messageId);
+      row.innerHTML = `<div data-testid="assistant-message"><div data-paseo-markdown-tag="p">${text}</div></div>`;
+      transcript.append(row);
+    }
+  }
+  document.body.append(transcript);
+  return transcript;
+}
+
 function copiedMarkdown(selection: Selection): string | null {
   return createAssistantSelectionClipboardContent(selection)?.plainText ?? null;
 }
@@ -110,6 +135,82 @@ describe("assistant selection copy ranges", () => {
     expect(copiedMarkdown(selectText(outside, 0, 7))).toBeNull();
   });
 
+  it("copies a selection that runs across the block rows of one message", () => {
+    const transcript = mountTranscript([
+      { messageId: "message-1", blocks: ["First paragraph.", "Second paragraph."] },
+    ]);
+    const blocks = transcript.querySelectorAll('[data-paseo-markdown-tag="p"]');
+    expect(copiedMarkdown(selectRange(blocks[0]!, 6, blocks[1]!, 6))).toBe("paragraph.\n\nSecond");
+  });
+
+  // Chrome anchors a drag that starts in the gap below an image at the start of the
+  // image's rendered internals: the background-image layer, ahead of the hidden `img`.
+  // Only the text after it is highlighted.
+  it("leaves out an image when the selection starts in the gap below it", () => {
+    const transcript = mountTranscript([
+      {
+        messageId: "message-1",
+        blocks: [
+          "Before the image.",
+          '<div data-paseo-markdown-tag="img" data-paseo-markdown-src="https://example.test/chart.png" data-paseo-markdown-alt="chart"><div><div style="background-image: url(blob:https://example.test/preview)"></div><img src="blob:https://example.test/preview" alt=""></div></div>',
+          "After the image.",
+        ],
+      },
+    ]);
+    const frame = fixtureElement(transcript, '[data-paseo-markdown-tag="img"]');
+    const range = document.createRange();
+    range.setStart(frame.firstElementChild!.firstElementChild!, 0);
+    range.setEnd(textNode(fixtureElement(transcript, '[data-paseo-markdown-tag="p"]', 2)), 9);
+    const selection = window.getSelection()!;
+    selection.removeAllRanges();
+    selection.addRange(range);
+
+    expect(copiedMarkdown(selection)).toBe("After the");
+  });
+
+  it("keeps a failed image when the selection starts in its error text", () => {
+    const transcript = mountTranscript([
+      {
+        messageId: "message-1",
+        blocks: [
+          '<div data-paseo-markdown-tag="img" data-paseo-markdown-src="https://example.test/chart.png" data-paseo-markdown-alt="chart"><div>Image failed to load</div></div>',
+          "After the image.",
+        ],
+      },
+    ]);
+    const frame = fixtureElement(transcript, '[data-paseo-markdown-tag="img"]');
+    const selection = selectRange(
+      frame.firstElementChild!,
+      6,
+      fixtureElement(transcript, '[data-paseo-markdown-tag="p"]', 1),
+      9,
+    );
+
+    expect(copiedMarkdown(selection)).toBe("![chart](https://example.test/chart.png)\n\nAfter the");
+  });
+
+  it("does not replace the browser clipboard for a selection reaching a second message", () => {
+    const transcript = mountTranscript([
+      { messageId: "message-1", blocks: ["First paragraph.", "Second paragraph."] },
+      { messageId: "message-2", blocks: ["Reply paragraph."] },
+    ]);
+    const blocks = transcript.querySelectorAll('[data-paseo-markdown-tag="p"]');
+    expect(copiedMarkdown(selectRange(blocks[1]!, 0, blocks[2]!, 5))).toBeNull();
+  });
+
+  // A retained inactive panel renders the same agent, so the same message id can exist
+  // twice in the document. A group is only ever read out of one transcript, and rows
+  // that belong to no transcript are not a group at all.
+  it("does not assemble a message group from rows outside a transcript", () => {
+    const transcript = mountTranscript([
+      { messageId: "message-1", blocks: ["First paragraph.", "Second paragraph."] },
+    ]);
+    document.body.append(...transcript.children);
+    transcript.remove();
+    const blocks = document.querySelectorAll('[data-paseo-markdown-tag="p"]');
+    expect(copiedMarkdown(selectRange(blocks[0]!, 0, blocks[1]!, 17))).toBeNull();
+  });
+
   it("does not replace the browser clipboard for a range spanning assistant messages", () => {
     const firstMessage = mountFixture();
     const secondMessage = mountFixture();
@@ -265,6 +366,32 @@ describe("assistant selection copy ranges", () => {
     ).toBe("6. Second bullet text");
   });
 
+  it("keeps the next number when a drag crosses a code block nested in an item", () => {
+    const message = mountFixture();
+    const list = fixtureElement(message, '[data-paseo-markdown-tag="ul"]');
+    list.outerHTML = [
+      '<div data-paseo-markdown-tag="ol" data-paseo-markdown-list-start="1">',
+      '<div data-paseo-markdown-tag="li">',
+      '<div data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">1.</div>',
+      "<div><div><span>Install it:</span></div>",
+      '<div data-paseo-markdown-tag="pre" data-paseo-markdown-language="sh">',
+      '<div data-paseo-markdown-tag="code"><span>brew install foo</span></div>',
+      '<button data-paseo-markdown-ignore="true">Copy</button>',
+      "</div></div>",
+      "</div>",
+      '<div data-paseo-markdown-tag="li">',
+      '<div data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">2.</div>',
+      "<div><div><span>Done.</span></div></div>",
+      "</div>",
+      "</div>",
+    ].join("");
+
+    const content = copyAcross(message, "Install it:", "Done.");
+
+    expect(content?.plainText).toBe("Install it:\n\n```sh\nbrew install foo\n```\n\n2. Done.");
+    expect(content?.html).toContain("<div>2. Done.</div>");
+  });
+
   it("retains nested markers when a drag includes the complete outer item", () => {
     const message = mountFixture();
     const firstItem = fixtureElement(message, '[data-paseo-markdown-tag="li"]');
@@ -330,6 +457,20 @@ describe("assistant selection copy ranges", () => {
     expect(content?.html).not.toContain("<pre>");
   });
 
+  it("copies an image as its Markdown when the selection stays inside the rendered image", () => {
+    const message = mountFixture();
+    const frame = document.createElement("div");
+    frame.setAttribute("data-paseo-markdown-tag", "img");
+    frame.setAttribute("data-paseo-markdown-src", "https://example.test/chart.png");
+    frame.setAttribute("data-paseo-markdown-alt", "chart");
+    frame.innerHTML = '<div><div><img src="blob:https://example.test/preview" alt=""></div></div>';
+    message.prepend(frame);
+
+    expect(copiedMarkdown(selectNodeContents(fixtureElement(frame, "img").parentElement!))).toBe(
+      "![chart](https://example.test/chart.png)",
+    );
+  });
+
   it("copies code without a fence when every character is selected inside the block", () => {
     const message = mountFixture();
     const blockCode = fixtureElement(
@@ -350,10 +491,19 @@ describe("assistant selection copy ranges", () => {
  * Turndown, so those cases need a fixture shaped like the real thing.
  */
 function highlightedFixture(language: string | null): string {
+  return [
+    '<div data-testid="assistant-message">',
+    '<div data-paseo-markdown-tag="p"><span>Before the block.</span></div>',
+    highlightedCodeBlock(language),
+    '<div data-paseo-markdown-tag="p"><span>After the block.</span></div>',
+    "</div>",
+  ].join("");
+}
+
+function highlightedCodeBlock(language: string | null): string {
   const languageAttribute =
     language === null ? "" : ` data-paseo-markdown-language="${escapeAttribute(language)}"`;
   return [
-    '<div data-testid="assistant-message">',
     `<div data-paseo-markdown-tag="pre"${languageAttribute}>`,
     '<span data-paseo-markdown-tag="code">',
     "<span>const</span><span> answer</span><span> = 1;</span>",
@@ -364,8 +514,6 @@ function highlightedFixture(language: string | null): string {
     "</span>",
     '<div data-paseo-markdown-ignore="true"><span>Copy</span></div>',
     "</div>",
-    '<div data-paseo-markdown-tag="p"><span>After the block.</span></div>',
-    "</div>",
   ].join("");
 }
 
@@ -543,6 +691,65 @@ describe("assistant selection copy inside highlighted code", () => {
     );
   });
 
+  // A drag that starts or ends in the gap beside a block anchors the selection at the
+  // edge of the neighbouring block. Nothing outside the code is highlighted or selected.
+  it("copies code without a fence when the selection only touches the end of the block before it", () => {
+    const message = mountHighlighted();
+    const before = tokenText(message, "Before the block.");
+
+    const content = copyBetween(
+      [before, before.length],
+      [tokenText(message, "    doThing();"), 14],
+    );
+
+    expect(content?.plainText).toBe("const answer = 1;\n  if (answer) {\n    doThing();");
+  });
+
+  it("copies code without a fence when the selection only touches the start of the block after it", () => {
+    const message = mountHighlighted();
+
+    const content = copyBetween(
+      [tokenText(message, "const"), 0],
+      [tokenText(message, "After the block."), 0],
+    );
+
+    expect(content?.plainText).toBe("const answer = 1;\n  if (answer) {\n    doThing();");
+  });
+
+  it("copies code without a fence when the selection only touches the row before the block", () => {
+    const transcript = mountTranscript([{ messageId: "message-1", blocks: ["Run this:", "code"] }]);
+    const codeRow = transcript.querySelectorAll('[data-testid="assistant-message"]')[1]!;
+    codeRow.innerHTML = highlightedCodeBlock("typescript");
+    const before = tokenText(transcript, "Run this:");
+
+    const content = copyBetween(
+      [before, before.length],
+      [tokenText(transcript, "    doThing();"), 14],
+    );
+
+    expect(content?.plainText).toBe("const answer = 1;\n  if (answer) {\n    doThing();");
+  });
+
+  it("keeps an image selected beside the code in the copy", () => {
+    const message = mountHighlighted();
+    const image = document.createElement("div");
+    image.setAttribute("data-paseo-markdown-tag", "p");
+    // The rendered `img` shows a preview URL with no alt text; the frame carries the Markdown.
+    image.innerHTML =
+      '<div data-paseo-markdown-tag="img" data-paseo-markdown-src="https://example.test/chart.png" data-paseo-markdown-alt="chart"><img src="blob:https://example.test/preview" alt=""></div>';
+    message.querySelector('[data-paseo-markdown-tag="pre"]')!.before(image);
+    const before = tokenText(message, "Before the block.");
+
+    const content = copyBetween(
+      [before, before.length],
+      [tokenText(message, "    doThing();"), 14],
+    );
+
+    expect(content?.plainText).toBe(
+      "![chart](https://example.test/chart.png)\n\n```typescript\nconst answer = 1;\n  if (answer) {\n    doThing();\n```",
+    );
+  });
+
   it("retains the fence when a complete code block is selected across its boundary", () => {
     const message = mountHighlighted();
 
diff --git a/packages/app/src/assistant-selection-copy/content.web.ts b/packages/app/src/assistant-selection-copy/content.web.ts
index f04ddfb3e2..e59a71aeca 100644
--- a/packages/app/src/assistant-selection-copy/content.web.ts
+++ b/packages/app/src/assistant-selection-copy/content.web.ts
@@ -7,18 +7,24 @@ import {
 } from "@/utils/rich-clipboard";
 import {
   MARKDOWN_COPY_ALIGN_ATTRIBUTE,
+  MARKDOWN_COPY_ALT_ATTRIBUTE,
   MARKDOWN_COPY_IGNORE_ATTRIBUTE,
   MARKDOWN_COPY_LANGUAGE_ATTRIBUTE,
   MARKDOWN_COPY_LIST_MARKER_ATTRIBUTE,
   MARKDOWN_COPY_LIST_START_ATTRIBUTE,
+  MARKDOWN_COPY_SRC_ATTRIBUTE,
   MARKDOWN_COPY_TAG_ATTRIBUTE,
   MARKDOWN_COPY_UNWRAP_ATTRIBUTE,
   TRAILING_CODE_LINE_BREAKS,
 } from "./markup";
 
 const ASSISTANT_MESSAGE_SELECTOR = '[data-testid="assistant-message"]';
+const MESSAGE_ROW_SELECTOR = "[data-message-id]";
+const CHAT_SCROLL_SELECTOR = '[data-testid="agent-chat-scroll"]';
+const messageRowSelector = (messageId: string) => `[data-message-id="${CSS.escape(messageId)}"]`;
 const CODE_BLOCK_SELECTOR = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}="pre"]`;
 const CODE_REGION_SELECTOR = `${CODE_BLOCK_SELECTOR}, [${MARKDOWN_COPY_TAG_ATTRIBUTE}="code"]`;
+const IMAGE_FRAME_SELECTOR = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}="img"]`;
 
 const turndown = new TurndownService({
   bulletListMarker: "-",
@@ -50,9 +56,7 @@ turndown.addRule("compactListItem", {
     if (parent?.nodeName !== "OL") {
       return `${options.bulletListMarker} ${item}\n`;
     }
-    const start = Number(parent.getAttribute("start") ?? 1);
-    const index = Array.from(parent.children).indexOf(node);
-    return `${start + index}. ${item}\n`;
+    return `${node.getAttribute("value")}. ${item}\n`;
   },
 });
 
@@ -63,21 +67,23 @@ export function createAssistantSelectionClipboardContent(
     return null;
   }
 
-  const range = selection.getRangeAt(0);
-  const startMessage = closestAssistantMessage(range.startContainer);
-  const endMessage = closestAssistantMessage(range.endContainer);
-  if (!startMessage || startMessage !== endMessage) {
+  const range = startAfterImageFrame(selection.getRangeAt(0));
+  const parts = selectedMessageParts(range)?.filter((part) => selectsContent(part.range));
+  if (!parts?.length) {
     return null;
   }
 
-  const partialCode = createPartialCodeContent(range, startMessage);
-  if (partialCode) {
-    return partialCode;
+  if (parts.length === 1) {
+    const partialCode = createPartialCodeContent(range, parts[0]!.message);
+    if (partialCode) {
+      return partialCode;
+    }
   }
 
   const container = document.createElement("div");
-  const selected = cloneMarkdownSelection(range, startMessage);
-  container.append(selected);
+  for (const part of parts) {
+    container.append(cloneMarkdownSelection(part.range, part.message));
+  }
   restoreMarkdownElements(container);
 
   const markdown = turndown.turndown(container.innerHTML).trim();
@@ -88,6 +94,33 @@ export function createAssistantSelectionClipboardContent(
   return { ...content, html: flattenClipboardListMarkup(content.html) };
 }
 
+/**
+ * A drag that starts in the gap below an image anchors at the start of the image's
+ * rendered internals, ahead of the hidden `img`, while only the text after it is
+ * highlighted. Pressing on the image itself opens it instead of starting a selection,
+ * so a selection that starts inside an image, before any of its text, and ends past it
+ * starts after the image. A failed image shows its error as text, and a selection
+ * starting in that text keeps the image.
+ */
+function startAfterImageFrame(range: Range): Range {
+  const start =
+    range.startContainer instanceof Element
+      ? range.startContainer
+      : range.startContainer.parentElement;
+  const frame = start?.closest(IMAGE_FRAME_SELECTOR);
+  if (!frame || frame.contains(range.endContainer)) {
+    return range;
+  }
+  const insideFrame = range.cloneRange();
+  insideFrame.setEnd(frame, frame.childNodes.length);
+  if (insideFrame.toString()) {
+    return range;
+  }
+  const afterFrame = range.cloneRange();
+  afterFrame.setStartAfter(frame);
+  return afterFrame;
+}
+
 /**
  * Partly-selected code copies as the code itself, never through Turndown.
  *
@@ -98,10 +131,12 @@ export function createAssistantSelectionClipboardContent(
  *
  * A selection contained inside code always copies as code, even when it contains every
  * character. A selection that crosses the code boundary stays on the Markdown path so
- * a complete block retains its fence.
+ * a complete block retains its fence. Crossing means selecting content outside the code:
+ * a drag that starts or ends in the gap beside a block anchors at the edge of the
+ * neighbouring block, which selects nothing there.
  */
 function createPartialCodeContent(range: Range, message: Element): MarkdownClipboardContent | null {
-  const region = closestCodeRegion(range.commonAncestorContainer, message);
+  const region = selectedCodeRegion(range, message);
   if (!region) {
     return null;
   }
@@ -125,6 +160,18 @@ function createPartialCodeContent(range: Range, message: Element): MarkdownClipb
   });
 }
 
+function selectedCodeRegion(range: Range, message: Element): Element | null {
+  const edgeRegions = [range.startContainer, range.endContainer].map((node) =>
+    closestCodeRegion(node, message),
+  );
+  return (
+    edgeRegions.find(
+      // Measure against the whole block, so its own hover Copy button is not outside it.
+      (edge) => edge && selectsNothingOutside(range, edge.closest(CODE_BLOCK_SELECTOR) ?? edge),
+    ) ?? null
+  );
+}
+
 function closestCodeRegion(node: Node, message: Element): Element | null {
   const element = node instanceof Element ? node : node.parentElement;
   const region = element?.closest(CODE_REGION_SELECTOR) ?? null;
@@ -276,7 +323,8 @@ function shouldPreserveSemanticElement(range: Range, element: Element): boolean
     return false;
   }
   const tag = element.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE);
-  if (tag === "p" || isTableStructure(tag)) {
+  // An image has no part to select, so touching it selects all of it.
+  if (tag === "p" || tag === "img" || isTableStructure(tag)) {
     return true;
   }
   const isSelectableSemantic = tag !== null && tag !== "li" && tag !== "ol" && tag !== "ul";
@@ -379,6 +427,31 @@ function hasSelectedAllContents(range: Range, element: Element, includeIgnored =
   return true;
 }
 
+function selectsContent(range: Range): boolean {
+  return hasMarkdownContent(range.cloneContents(), true);
+}
+
+function selectsNothingOutside(range: Range, element: Element): boolean {
+  const contents = document.createRange();
+  contents.selectNodeContents(element);
+
+  if (range.compareBoundaryPoints(Range.START_TO_START, contents) < 0) {
+    const before = range.cloneRange();
+    before.setEnd(contents.startContainer, contents.startOffset);
+    if (selectsContent(before)) {
+      return false;
+    }
+  }
+  if (range.compareBoundaryPoints(Range.END_TO_END, contents) > 0) {
+    const after = range.cloneRange();
+    after.setStart(contents.endContainer, contents.endOffset);
+    if (selectsContent(after)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 function hasMarkdownContent(fragment: DocumentFragment, includeIgnored: boolean): boolean {
   if (!includeIgnored) {
     for (const ignored of fragment.querySelectorAll(`[${MARKDOWN_COPY_IGNORE_ATTRIBUTE}]`)) {
@@ -388,8 +461,9 @@ function hasMarkdownContent(fragment: DocumentFragment, includeIgnored: boolean)
   if (fragment.textContent) {
     return true;
   }
-  const visibleVoidSelector = ["br", "hr"]
+  const visibleVoidSelector = ["br", "hr", "img"]
     .map((tag) => `[${MARKDOWN_COPY_TAG_ATTRIBUTE}="${tag}"]`)
+    .concat("img")
     .join(",");
   return Boolean(fragment.querySelector(visibleVoidSelector));
 }
@@ -407,6 +481,70 @@ function closestAssistantMessage(node: Node): Element | null {
   return element?.closest(ASSISTANT_MESSAGE_SELECTOR) ?? null;
 }
 
+interface SelectedMessagePart {
+  message: Element;
+  range: Range;
+}
+
+function messageIdOf(node: Element): string | undefined {
+  return node.closest<HTMLElement>(MESSAGE_ROW_SELECTOR)?.dataset.messageId;
+}
+
+/**
+ * A retained inactive panel keeps rendering its chat, so the same agent — and the same
+ * message id — can exist twice in the document. The selection's own transcript is the
+ * only one that can answer for it.
+ */
+function assistantMessagesOfGroup(node: Element, messageId: string): Element[] {
+  const transcript = node.closest(CHAT_SCROLL_SELECTOR);
+  if (!transcript) {
+    return [];
+  }
+  const rows = transcript.querySelectorAll<HTMLElement>(messageRowSelector(messageId));
+  return Array.from(rows).flatMap((row) => {
+    const message = row.querySelector(ASSISTANT_MESSAGE_SELECTOR);
+    return message ? [message] : [];
+  });
+}
+
+/**
+ * The selection cut into one range per assistant message element it covers.
+ *
+ * An assistant message renders one row per Markdown block, so a selection that runs
+ * past a paragraph ends in a different element of the same message. Each block is
+ * serialized against its own element, exactly as a selection inside one block is, and
+ * the results are concatenated — Turndown never sees the row wrappers between them.
+ * A selection reaching a second message, or anything that is not assistant Markdown,
+ * copies as plain text.
+ */
+function selectedMessageParts(range: Range): SelectedMessagePart[] | null {
+  const start = closestAssistantMessage(range.startContainer);
+  const end = closestAssistantMessage(range.endContainer);
+  if (!start || !end) {
+    return null;
+  }
+  if (start === end) {
+    return [{ message: start, range }];
+  }
+  const messageId = messageIdOf(start);
+  if (!messageId || messageId !== messageIdOf(end)) {
+    return null;
+  }
+  const messages = assistantMessagesOfGroup(start, messageId);
+  const first = messages.indexOf(start);
+  const last = messages.indexOf(end);
+  if (first < 0 || last < first) {
+    return null;
+  }
+  return messages.slice(first, last + 1).map((message) => {
+    const part = message.ownerDocument.createRange();
+    part.selectNodeContents(message);
+    if (message === start) part.setStart(range.startContainer, range.startOffset);
+    if (message === end) part.setEnd(range.endContainer, range.endOffset);
+    return { message, range: part };
+  });
+}
+
 function restoreMarkdownElements(container: HTMLElement): void {
   for (const ignored of container.querySelectorAll(`[${MARKDOWN_COPY_IGNORE_ATTRIBUTE}]`)) {
     ignored.remove();
@@ -419,14 +557,19 @@ function restoreMarkdownElements(container: HTMLElement): void {
       continue;
     }
     const semanticElement = document.createElement(tagName);
-    if (tagName !== "br") {
+    if (tagName !== "br" && tagName !== "img") {
       semanticElement.append(...element.childNodes);
     }
+    if (tagName === "img") {
+      semanticElement.setAttribute("src", element.getAttribute(MARKDOWN_COPY_SRC_ATTRIBUTE) ?? "");
+      semanticElement.setAttribute("alt", element.getAttribute(MARKDOWN_COPY_ALT_ATTRIBUTE) ?? "");
+    }
     if (tagName === "ol") {
       const start = element.getAttribute(MARKDOWN_COPY_LIST_START_ATTRIBUTE);
       if (start) {
         semanticElement.setAttribute("start", start);
       }
+      numberOrderedListItems(semanticElement, Number(start ?? 1));
     }
     if (tagName === "pre") {
       const language = element.getAttribute(MARKDOWN_COPY_LANGUAGE_ATTRIBUTE);
@@ -459,6 +602,20 @@ function restoreMarkdownElements(container: HTMLElement): void {
   }
 }
 
+/**
+ * Each item carries its number before Turndown re-parses the HTML. Until then every
+ * child of the list is one item, including a partly selected item demoted to a `p`.
+ * The parser splits a `p` that holds a code block into several siblings, so counting
+ * siblings afterwards numbers the next item too high.
+ */
+function numberOrderedListItems(list: Element, start: number): void {
+  Array.from(list.children).forEach((child, index) => {
+    if (child.tagName === "LI") {
+      child.setAttribute("value", String(start + index));
+    }
+  });
+}
+
 function unwrapIncompleteTables(container: HTMLElement): void {
   for (const table of container.querySelectorAll("table")) {
     if (hasUsableTableColumnContract(table)) {
diff --git a/packages/app/src/assistant-selection-copy/markup.ts b/packages/app/src/assistant-selection-copy/markup.ts
index 8f220043ce..91c6c1618a 100644
--- a/packages/app/src/assistant-selection-copy/markup.ts
+++ b/packages/app/src/assistant-selection-copy/markup.ts
@@ -5,6 +5,8 @@ export const MARKDOWN_COPY_UNWRAP_ATTRIBUTE = "data-paseo-markdown-unwrap";
 export const MARKDOWN_COPY_LIST_START_ATTRIBUTE = "data-paseo-markdown-list-start";
 export const MARKDOWN_COPY_LANGUAGE_ATTRIBUTE = "data-paseo-markdown-language";
 export const MARKDOWN_COPY_ALIGN_ATTRIBUTE = "data-paseo-markdown-align";
+export const MARKDOWN_COPY_SRC_ATTRIBUTE = "data-paseo-markdown-src";
+export const MARKDOWN_COPY_ALT_ATTRIBUTE = "data-paseo-markdown-alt";
 
 /**
  * Trailing line breaks, with any indentation that followed the last one.
@@ -63,6 +65,18 @@ export function markdownCopyCodeBlockDataSet(language: string | null | undefined
   } as const;
 }
 
+/**
+ * An image copies as the Markdown it came from. The rendered `img` points at a preview
+ * URL for data and workspace images, and carries no alt text of its own.
+ */
+export function markdownCopyImageDataSet(source: string, alt: string | undefined) {
+  return {
+    paseoMarkdownTag: "img",
+    paseoMarkdownSrc: source,
+    ...(alt ? { paseoMarkdownAlt: alt } : {}),
+  } as const;
+}
+
 export function markdownCopyTableCellDataSet(tag: "td" | "th", style: unknown) {
   const alignment =
     typeof style === "string"
diff --git a/packages/app/src/attachments/local-file-attachment-store.test.ts b/packages/app/src/attachments/local-file-attachment-store.test.ts
index 48f974fa1a..82774aa723 100644
--- a/packages/app/src/attachments/local-file-attachment-store.test.ts
+++ b/packages/app/src/attachments/local-file-attachment-store.test.ts
@@ -2,16 +2,75 @@ import { describe, expect, it } from "vitest";
 import { createLocalFileAttachmentStore } from "./local-file-attachment-store";
 import { createTestAttachmentFileSystem } from "./test-attachment-file-system";
 
+function createStore() {
+  const fileSystem = createTestAttachmentFileSystem();
+  const store = createLocalFileAttachmentStore({
+    storageType: "native-file",
+    baseDirectoryName: "preview-assets",
+    fileSystem,
+    resolvePreviewUrl: async (attachment) => `file://${attachment.storageKey}`,
+  });
+  return { fileSystem, store };
+}
+
 describe("local file attachment store", () => {
-  it("writes raw byte sources directly to the managed file path", async () => {
-    const fileSystem = createTestAttachmentFileSystem();
-    const store = createLocalFileAttachmentStore({
-      storageType: "native-file",
-      baseDirectoryName: "preview-assets",
-      fileSystem,
-      resolvePreviewUrl: async (attachment) => `file://${attachment.storageKey}`,
+  it.each([
+    "data:image/png;base64,AAECAwQF+/8=",
+    "data:image/png;charset=utf-8;base64,AAEC\nAwQF+/8=",
+  ])("preserves binary image bytes from %s", async (dataUrl) => {
+    const { fileSystem, store } = createStore();
+    const attachment = await store.save({
+      id: "clipboard",
+      fileName: "clipboard.png",
+      source: { kind: "data_url", dataUrl },
     });
 
+    expect(attachment).toMatchObject({
+      mimeType: "image/png",
+      fileName: "clipboard.png",
+      byteSize: 8,
+      storageType: "native-file",
+      storageKey: "/cache/preview-assets/clipboard.png",
+    });
+    expect(fileSystem.files.get("file:///cache/preview-assets/clipboard.png")).toEqual(
+      new Uint8Array([0, 1, 2, 3, 4, 5, 251, 255]),
+    );
+    await expect(store.encodeBase64({ attachment })).resolves.toBe("AAECAwQF+/8=");
+    await expect(store.resolvePreviewUrl({ attachment })).resolves.toBe(
+      "file:///cache/preview-assets/clipboard.png",
+    );
+  });
+
+  it.each([
+    "not-a-data-url",
+    "data:image/png,hello",
+    "data:image/png;base64,",
+    "data:image/png;base64,%%%%",
+    "data:image/png;base64,A",
+  ])("rejects malformed image data without writing a file: %s", async (dataUrl) => {
+    const { fileSystem, store } = createStore();
+    await expect(store.save({ source: { kind: "data_url", dataUrl } })).rejects.toThrow();
+    expect(fileSystem.files.size).toBe(0);
+  });
+
+  it("copies file URI images without altering the source", async () => {
+    const { fileSystem, store } = createStore();
+    const bytes = new Uint8Array([0, 1, 254, 255]);
+    fileSystem.setFile("file:///keyboard/image.png", bytes);
+    const attachment = await store.save({
+      id: "keyboard",
+      mimeType: "image/png",
+      source: { kind: "file_uri", uri: "file:///keyboard/image.png" },
+    });
+
+    expect(fileSystem.files.get("file:///cache/preview-assets/keyboard.png")).toEqual(bytes);
+    expect(fileSystem.files.get("file:///keyboard/image.png")).toEqual(bytes);
+    expect(attachment.byteSize).toBe(bytes.length);
+  });
+
+  it("writes raw byte sources directly to the managed file path", async () => {
+    const { fileSystem, store } = createStore();
+
     const attachment = await store.save({
       id: "preview_8_test",
       mimeType: "image/png",
diff --git a/packages/app/src/attachments/local-file-attachment-store.ts b/packages/app/src/attachments/local-file-attachment-store.ts
index b9e76a86e6..54b6347fd4 100644
--- a/packages/app/src/attachments/local-file-attachment-store.ts
+++ b/packages/app/src/attachments/local-file-attachment-store.ts
@@ -44,9 +44,10 @@ async function ensureDirectory(fileSystem: AttachmentFileSystem, uri: string): P
   await fileSystem.makeDirectory(uri, { intermediates: true });
 }
 
-async function dataUrlToBytes(dataUrl: string): Promise<Uint8Array> {
-  const response = await fetch(dataUrl);
-  return new Uint8Array(await response.arrayBuffer());
+function dataUrlToBytes(dataUrl: string): Uint8Array {
+  // React Native's fetch cannot read data URLs. Decode the embedded bytes locally.
+  const { base64 } = parseDataUrl(dataUrl);
+  return Uint8Array.from(atob(base64), (character) => character.charCodeAt(0));
 }
 
 async function blobToBytes(blob: Blob): Promise<Uint8Array> {
@@ -70,7 +71,7 @@ async function writeFromSource(input: {
 
   let bytes: Uint8Array;
   if (input.source.kind === "data_url") {
-    bytes = await dataUrlToBytes(input.source.dataUrl);
+    bytes = dataUrlToBytes(input.source.dataUrl);
   } else if (input.source.kind === "blob") {
     bytes = await blobToBytes(input.source.blob);
   } else {
diff --git a/packages/app/src/attachments/picked-file.ts b/packages/app/src/attachments/selected-file.ts
similarity index 92%
rename from packages/app/src/attachments/picked-file.ts
rename to packages/app/src/attachments/selected-file.ts
index a7efdfd639..f0746ab760 100644
--- a/packages/app/src/attachments/picked-file.ts
+++ b/packages/app/src/attachments/selected-file.ts
@@ -2,10 +2,10 @@ import { getFileExtension } from "@/attachments/file-types";
 import { copyDesktopAttachmentFile } from "@/desktop/attachments/desktop-file-commands";
 import { readDesktopFileBase64 } from "@/desktop/attachments/desktop-preview-url";
 
-export interface PickedFile {
+export interface SelectedFile {
   fileName: string;
   mimeType: string;
-  bytes: Uint8Array;
+  readBytes(): Promise<Uint8Array>;
 }
 
 function base64ToUint8Array(base64: string): Uint8Array {
diff --git a/packages/app/src/voice/audio-engine-types.ts b/packages/app/src/audio/audio-engine-types.ts
similarity index 88%
rename from packages/app/src/voice/audio-engine-types.ts
rename to packages/app/src/audio/audio-engine-types.ts
index 03108b5cf6..90bec732fb 100644
--- a/packages/app/src/voice/audio-engine-types.ts
+++ b/packages/app/src/audio/audio-engine-types.ts
@@ -20,7 +20,7 @@ export interface AudioEngine {
   toggleMute(): boolean;
   isMuted(): boolean;
 
-  play(audio: AudioPlaybackSource): Promise<number>;
+  play(audio: AudioPlaybackSource, signal?: AbortSignal): Promise<number>;
   stop(): void;
   clearQueue(): void;
   isPlaying(): boolean;
diff --git a/packages/app/src/voice/audio-engine.d.ts b/packages/app/src/audio/audio-engine.d.ts
similarity index 100%
rename from packages/app/src/voice/audio-engine.d.ts
rename to packages/app/src/audio/audio-engine.d.ts
diff --git a/packages/app/src/audio/audio-engine.native.ts b/packages/app/src/audio/audio-engine.native.ts
new file mode 100644
index 0000000000..86a6fc3d26
--- /dev/null
+++ b/packages/app/src/audio/audio-engine.native.ts
@@ -0,0 +1,224 @@
+import type { AudioEngine, AudioEngineCallbacks, AudioPlaybackSource } from "./audio-engine-types";
+
+import { createAudioPlayer, setAudioModeAsync } from "expo-audio";
+import { File, Paths } from "expo-file-system";
+import { createPlaybackQueue } from "./playback";
+import { playFile } from "./file-playback";
+import { playPcm16 } from "./pcm";
+
+export function createAudioEngine(
+  callbacks: AudioEngineCallbacks,
+  _options?: { traceLabel?: string },
+): AudioEngine {
+  const native = require("@getpaseo/expo-two-way-audio");
+
+  const refs: {
+    initialized: boolean;
+    captureActive: boolean;
+    muted: boolean;
+    destroyed: boolean;
+  } = {
+    initialized: false,
+    captureActive: false,
+    muted: false,
+    destroyed: false,
+  };
+
+  const microphoneSubscription = native.addExpoTwoWayAudioEventListener(
+    "onMicrophoneData",
+    (event: { data: Uint8Array }) => {
+      if (!refs.captureActive || refs.muted) {
+        return;
+      }
+      const pcm = event.data;
+      callbacks.onCaptureData(pcm);
+    },
+  );
+  const volumeSubscription = native.addExpoTwoWayAudioEventListener(
+    "onInputVolumeLevelData",
+    (event: { data: number }) => {
+      if (!refs.captureActive) {
+        return;
+      }
+      const level = refs.muted ? 0 : event.data;
+      callbacks.onVolumeLevel(level);
+    },
+  );
+  const interruptionSubscription = native.addExpoTwoWayAudioEventListener(
+    "onAudioInterruption",
+    (event: { data: string }) => {
+      if (event.data !== "blocked") {
+        return;
+      }
+      const wasCaptureActive = refs.captureActive;
+      refs.captureActive = false;
+      refs.muted = false;
+      callbacks.onVolumeLevel(0);
+      if (wasCaptureActive) {
+        callbacks.onInterruption?.();
+      }
+    },
+  );
+
+  async function ensureInitialized(): Promise<void> {
+    if (refs.initialized) {
+      return;
+    }
+    const success = await native.initialize();
+    if (!success) {
+      throw new Error("expo-two-way-audio: native initialize() returned false");
+    }
+    refs.initialized = true;
+  }
+
+  /**
+   * Release the OS audio session as soon as we are neither capturing nor playing.
+   * Holding it keeps the user's background music paused — on iOS the non-mixing
+   * `.playAndRecord` category survives backgrounding and is re-asserted on every
+   * foreground, so an unreleased session means their music never comes back.
+   */
+  function releaseSessionIfIdle(): void {
+    if (!refs.initialized || refs.destroyed) {
+      return;
+    }
+    if (refs.captureActive || playback.isPlaying()) {
+      return;
+    }
+    // The wrapper no-ops on binaries whose native module predates this function.
+    native.releaseAudioSession();
+  }
+
+  async function ensureMicrophonePermission(): Promise<void> {
+    let permission = await native.getMicrophonePermissionsAsync().catch(() => null);
+    if (!permission?.granted) {
+      permission = await native.requestMicrophonePermissionsAsync().catch(() => null);
+    }
+    if (!permission?.granted) {
+      throw new Error(
+        "Microphone permission is required to capture audio. Please enable microphone access in system settings.",
+      );
+    }
+  }
+
+  let nextFileId = 0;
+  async function playAudio(audio: AudioPlaybackSource, signal: AbortSignal): Promise<number> {
+    const bytes = new Uint8Array(await audio.arrayBuffer());
+    if (signal.aborted) throw new Error("Playback stopped");
+    if (audio.type.startsWith("audio/pcm")) {
+      await ensureInitialized();
+      return playPcm16(bytes, audio.type, signal, native);
+    }
+    // Capture owns its audio session while active. File playback alone must not
+    // initialize the microphone or the native two-way engine.
+    if (!refs.captureActive) {
+      await setAudioModeAsync({
+        playsInSilentMode: true,
+        allowsRecording: false,
+        interruptionMode: "duckOthers",
+        interruptionModeAndroid: "duckOthers",
+      });
+    }
+    if (signal.aborted) throw new Error("Playback stopped");
+    // AVPlayer needs a file extension to recognize local encoded audio on iOS.
+    const extension =
+      {
+        "audio/wav": "wav",
+        "audio/x-wav": "wav",
+        "audio/wave": "wav",
+        "audio/mpeg": "mp3",
+        "audio/mp3": "mp3",
+        "audio/mp4": "m4a",
+        "audio/aac": "aac",
+        "audio/ogg": "ogg",
+        "audio/flac": "flac",
+      }[audio.type.split(";")[0].trim()] ?? "audio";
+    const file = new File(Paths.cache, `paseo-audio-${Date.now()}-${nextFileId++}.${extension}`);
+    try {
+      file.write(bytes);
+      const player = createAudioPlayer(file.uri, {
+        updateInterval: 100,
+        keepAudioSessionActive: refs.captureActive,
+      });
+      return await playFile(player, signal);
+    } finally {
+      if (file.exists) file.delete();
+    }
+  }
+  const playback = createPlaybackQueue(playAudio, releaseSessionIfIdle);
+
+  return {
+    async initialize() {
+      await ensureInitialized();
+    },
+
+    async destroy() {
+      if (refs.destroyed) {
+        return;
+      }
+      refs.destroyed = true;
+      playback.destroy();
+      if (refs.captureActive) {
+        native.toggleRecording(false);
+        refs.captureActive = false;
+      }
+      refs.muted = false;
+      callbacks.onVolumeLevel(0);
+      if (refs.initialized) {
+        native.tearDown();
+        refs.initialized = false;
+      }
+      microphoneSubscription.remove();
+      volumeSubscription.remove();
+      interruptionSubscription.remove();
+    },
+
+    async startCapture() {
+      if (refs.captureActive) {
+        return;
+      }
+
+      try {
+        await ensureMicrophonePermission();
+        await ensureInitialized();
+        const isRecording = native.toggleRecording(true);
+        if (!isRecording) {
+          throw new Error(
+            "Microphone capture could not start because Android audio focus is unavailable.",
+          );
+        }
+        refs.captureActive = true;
+      } catch (error) {
+        const wrapped = error instanceof Error ? error : new Error(String(error));
+        callbacks.onError?.(wrapped);
+        throw wrapped;
+      }
+    },
+
+    async stopCapture() {
+      if (refs.captureActive) {
+        native.toggleRecording(false);
+      }
+      refs.captureActive = false;
+      refs.muted = false;
+      callbacks.onVolumeLevel(0);
+      releaseSessionIfIdle();
+    },
+
+    toggleMute() {
+      refs.muted = !refs.muted;
+      if (refs.muted) {
+        callbacks.onVolumeLevel(0);
+      }
+      return refs.muted;
+    },
+
+    isMuted() {
+      return refs.muted;
+    },
+
+    play: playback.play,
+    stop: playback.stop,
+    clearQueue: playback.clearQueue,
+    isPlaying: playback.isPlaying,
+  };
+}
diff --git a/packages/app/src/voice/audio-engine.web.ts b/packages/app/src/audio/audio-engine.web.ts
similarity index 63%
rename from packages/app/src/voice/audio-engine.web.ts
rename to packages/app/src/audio/audio-engine.web.ts
index 0453c0ae33..dc0f049ca7 100644
--- a/packages/app/src/voice/audio-engine.web.ts
+++ b/packages/app/src/audio/audio-engine.web.ts
@@ -1,15 +1,8 @@
+import { parsePcmSampleRate, resampleToPcm16 } from "./pcm";
 import { isElectronRuntime } from "@/desktop/host";
-import type {
-  AudioEngine,
-  AudioEngineCallbacks,
-  AudioPlaybackSource,
-} from "@/voice/audio-engine-types";
+import type { AudioEngine, AudioEngineCallbacks, AudioPlaybackSource } from "./audio-engine-types";
 
-interface QueuedAudio {
-  audio: AudioPlaybackSource;
-  resolve: (duration: number) => void;
-  reject: (error: Error) => void;
-}
+import { createPlaybackQueue } from "./playback";
 
 function getAudioContextCtor(): typeof AudioContext | null {
   if (typeof window === "undefined") {
@@ -21,40 +14,6 @@ function getAudioContextCtor(): typeof AudioContext | null {
   return browserWindow.AudioContext ?? browserWindow.webkitAudioContext ?? null;
 }
 
-function floatToInt16(sample: number): number {
-  const clamped = Math.max(-1, Math.min(1, sample));
-  return clamped < 0 ? Math.round(clamped * 0x8000) : Math.round(clamped * 0x7fff);
-}
-
-function resampleToPcm16(input: Float32Array, inputRate: number, outputRate: number): Uint8Array {
-  if (input.length === 0) {
-    return new Uint8Array(0);
-  }
-
-  const ratio = inputRate / outputRate;
-  const outputLength = Math.max(1, Math.round(input.length / ratio));
-  const output = new Int16Array(outputLength);
-  for (let i = 0; i < outputLength; i += 1) {
-    const sourceIndex = i * ratio;
-    const i0 = Math.floor(sourceIndex);
-    const i1 = Math.min(input.length - 1, i0 + 1);
-    const frac = sourceIndex - i0;
-    const sample = input[i0] * (1 - frac) + input[i1] * frac;
-    output[i] = floatToInt16(sample);
-  }
-
-  return new Uint8Array(output.buffer, output.byteOffset, output.byteLength);
-}
-
-function parsePcmSampleRate(mimeType: string): number | null {
-  const match = /rate=(\d+)/i.exec(mimeType);
-  if (!match) {
-    return null;
-  }
-  const rate = Number(match[1]);
-  return Number.isFinite(rate) && rate > 0 ? rate : null;
-}
-
 function pcm16LeToAudioBuffer(
   context: AudioContext,
   bytes: Uint8Array,
@@ -98,14 +57,6 @@ export function createAudioEngine(
     gain: GainNode | null;
     started: boolean;
     muted: boolean;
-    queue: QueuedAudio[];
-    processingQueue: boolean;
-    activePlayback: {
-      source: AudioBufferSourceNode;
-      resolve: (duration: number) => void;
-      reject: (error: Error) => void;
-      settled: boolean;
-    } | null;
   } = {
     playbackContext: null,
     captureContext: null,
@@ -115,29 +66,31 @@ export function createAudioEngine(
     gain: null,
     started: false,
     muted: false,
-    queue: [],
-    processingQueue: false,
-    activePlayback: null,
   };
 
   async function ensurePlaybackContext(): Promise<AudioContext> {
-    if (refs.playbackContext) {
-      if (refs.playbackContext.state === "suspended") {
-        await refs.playbackContext.resume().catch(() => undefined);
-      }
-      return refs.playbackContext;
+    if (!refs.playbackContext) {
+      const AudioContextCtor = getAudioContextCtor();
+      if (!AudioContextCtor) throw new Error("AudioContext unavailable");
+      refs.playbackContext = new AudioContextCtor();
     }
-
-    const AudioContextCtor = getAudioContextCtor();
-    if (!AudioContextCtor) {
-      throw new Error("AudioContext unavailable");
-    }
-
-    const context = new AudioContextCtor();
+    const context = refs.playbackContext;
     if (context.state === "suspended") {
-      await context.resume().catch(() => undefined);
+      let timeout: ReturnType<typeof setTimeout> | undefined;
+      try {
+        await Promise.race([
+          context.resume(),
+          new Promise<never>((_resolve, reject) => {
+            timeout = setTimeout(
+              () => reject(new Error("Audio playback requires a user interaction")),
+              2000,
+            );
+          }),
+        ]);
+      } finally {
+        clearTimeout(timeout);
+      }
     }
-    refs.playbackContext = context;
     return context;
   }
 
@@ -162,7 +115,7 @@ export function createAudioEngine(
     return context;
   }
 
-  async function playAudio(audio: AudioPlaybackSource): Promise<number> {
+  async function playAudio(audio: AudioPlaybackSource, signal: AbortSignal): Promise<number> {
     const context = await ensurePlaybackContext();
     const arrayBuffer = await audio.arrayBuffer();
     const type = (audio.type || "").toLowerCase();
@@ -174,53 +127,39 @@ export function createAudioEngine(
         )
       : await decodeAudioData(context, arrayBuffer);
 
+    if (signal.aborted) throw new Error("Playback stopped");
     const durationSec = audioBuffer.duration;
     const source = context.createBufferSource();
     source.buffer = audioBuffer;
     source.connect(context.destination);
 
     return await new Promise<number>((resolve, reject) => {
-      refs.activePlayback = { source, resolve, reject, settled: false };
-
-      const settle = (fn: () => void) => {
-        const active = refs.activePlayback;
-        if (!active || active.source !== source || active.settled) {
-          return;
-        }
-        active.settled = true;
-        refs.activePlayback = null;
-        fn();
+      const abort = () => {
+        source.stop();
+        source.disconnect();
+        reject(new Error("Playback stopped"));
       };
-
-      source.addEventListener("ended", () => {
-        settle(() => resolve(durationSec));
-      });
-
+      signal.addEventListener("abort", abort, { once: true });
+      source.addEventListener(
+        "ended",
+        () => {
+          signal.removeEventListener("abort", abort);
+          source.disconnect();
+          resolve(durationSec);
+        },
+        { once: true },
+      );
       try {
         source.start();
       } catch (error) {
-        settle(() => reject(error instanceof Error ? error : new Error(String(error))));
+        signal.removeEventListener("abort", abort);
+        source.disconnect();
+        reject(error);
       }
     });
   }
 
-  async function processQueue(): Promise<void> {
-    if (refs.processingQueue || refs.queue.length === 0) {
-      return;
-    }
-
-    refs.processingQueue = true;
-    while (refs.queue.length > 0) {
-      const item = refs.queue.shift()!;
-      try {
-        const duration = await playAudio(item.audio);
-        item.resolve(duration);
-      } catch (error) {
-        item.reject(error instanceof Error ? error : new Error(String(error)));
-      }
-    }
-    refs.processingQueue = false;
-  }
+  const playback = createPlaybackQueue(playAudio);
 
   async function stopCapture(): Promise<void> {
     refs.started = false;
@@ -263,8 +202,7 @@ export function createAudioEngine(
     },
 
     async destroy() {
-      this.stop();
-      this.clearQueue();
+      playback.destroy();
       await stopCapture();
 
       const playbackContext = refs.playbackContext;
@@ -334,7 +272,8 @@ export function createAudioEngine(
             return;
           }
 
-          callbacks.onCaptureData(resampleToPcm16(input, context.sampleRate, 16000));
+          const pcm = resampleToPcm16(input, context.sampleRate, 16000);
+          callbacks.onCaptureData(new Uint8Array(pcm.buffer, pcm.byteOffset, pcm.byteLength));
         };
 
         source.connect(processor);
@@ -370,40 +309,9 @@ export function createAudioEngine(
       return refs.muted;
     },
 
-    async play(audio: AudioPlaybackSource) {
-      return await new Promise<number>((resolve, reject) => {
-        refs.queue.push({ audio, resolve, reject });
-        if (!refs.processingQueue) {
-          void processQueue();
-        }
-      });
-    },
-
-    stop() {
-      if (refs.activePlayback) {
-        const active = refs.activePlayback;
-        refs.activePlayback = null;
-        try {
-          active.source.stop();
-        } catch {
-          // Ignore best-effort stop errors.
-        }
-        if (!active.settled) {
-          active.settled = true;
-          active.reject(new Error("Playback stopped"));
-        }
-      }
-    },
-
-    clearQueue() {
-      while (refs.queue.length > 0) {
-        refs.queue.shift()!.reject(new Error("Playback stopped"));
-      }
-      refs.processingQueue = false;
-    },
-
-    isPlaying() {
-      return refs.activePlayback !== null;
-    },
+    play: playback.play,
+    stop: playback.stop,
+    clearQueue: playback.clearQueue,
+    isPlaying: playback.isPlaying,
   };
 }
diff --git a/packages/app/src/audio/file-playback.ts b/packages/app/src/audio/file-playback.ts
new file mode 100644
index 0000000000..6d4370bd6f
--- /dev/null
+++ b/packages/app/src/audio/file-playback.ts
@@ -0,0 +1,61 @@
+export interface FilePlaybackStatus {
+  playbackState: string;
+  isLoaded: boolean;
+  didJustFinish: boolean;
+  duration: number;
+}
+
+export interface FilePlayer {
+  play(): void;
+  remove(): void;
+  addListener(
+    event: "playbackStatusUpdate",
+    listener: (status: FilePlaybackStatus) => void,
+  ): { remove(): void };
+}
+
+/** Own completion, load failure and resource release for the native file backend. */
+export function playFile(player: FilePlayer, signal: AbortSignal): Promise<number> {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    // expo-audio 1.x does not report Android decoder errors. A local file that
+    // never becomes loaded must still release its queue slot and temporary file.
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    const finish = (error?: unknown, duration = 0) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timeout);
+      signal.removeEventListener("abort", abort);
+      subscription.remove();
+      player.remove();
+      if (error) reject(error);
+      else resolve(duration);
+    };
+    const abort = () => finish(new Error("Playback stopped"));
+    let loaded = false;
+    const subscription = player.addListener("playbackStatusUpdate", (status) => {
+      if (status.playbackState === "error" || status.playbackState === "failed") {
+        finish(new Error("Audio file could not be decoded"));
+      } else if (status.didJustFinish) {
+        finish(undefined, status.duration);
+      } else if (status.isLoaded && status.duration > 0 && !loaded) {
+        loaded = true;
+        clearTimeout(timeout);
+        timeout = setTimeout(
+          () => finish(new Error("Audio playback timed out")),
+          (status.duration + 30) * 1000,
+        );
+      }
+    });
+    timeout = setTimeout(() => finish(new Error("Audio file could not be loaded")), 15000);
+    signal.addEventListener("abort", abort, { once: true });
+    if (signal.aborted) abort();
+    else {
+      try {
+        player.play();
+      } catch (error) {
+        finish(error);
+      }
+    }
+  });
+}
diff --git a/packages/app/src/audio/index.ts b/packages/app/src/audio/index.ts
new file mode 100644
index 0000000000..fd5bbfd221
--- /dev/null
+++ b/packages/app/src/audio/index.ts
@@ -0,0 +1,3 @@
+export { createAudioEngine } from "./audio-engine";
+export type { AudioEngine, AudioEngineCallbacks, AudioPlaybackSource } from "./audio-engine-types";
+export { createPlayAudio } from "./play-audio";
diff --git a/packages/app/src/audio/pcm/index.ts b/packages/app/src/audio/pcm/index.ts
new file mode 100644
index 0000000000..fe1164b8ce
--- /dev/null
+++ b/packages/app/src/audio/pcm/index.ts
@@ -0,0 +1,124 @@
+const floatToInt16 = (sample: number): number => {
+  const clamped = Math.max(-1, Math.min(1, sample));
+  return clamped < 0 ? Math.round(clamped * 0x8000) : Math.round(clamped * 0x7fff);
+};
+
+export const resampleToPcm16 = (
+  input: Float32Array,
+  inputRate: number,
+  outputRate: number,
+): Int16Array => {
+  if (input.length === 0) {
+    return new Int16Array(0);
+  }
+  if (inputRate === outputRate) {
+    const out = new Int16Array(input.length);
+    for (let i = 0; i < input.length; i++) {
+      out[i] = floatToInt16(input[i]);
+    }
+    return out;
+  }
+
+  const ratio = inputRate / outputRate;
+  const outputLength = Math.max(1, Math.round(input.length / ratio));
+  const out = new Int16Array(outputLength);
+  for (let i = 0; i < outputLength; i++) {
+    const sourceIndex = i * ratio;
+    const i0 = Math.floor(sourceIndex);
+    const i1 = Math.min(input.length - 1, i0 + 1);
+    const frac = sourceIndex - i0;
+    const sample = input[i0] * (1 - frac) + input[i1] * frac;
+    out[i] = floatToInt16(sample);
+  }
+  return out;
+};
+
+export function parsePcmSampleRate(mimeType: string): number | null {
+  const match = /rate=(\d+)/i.exec(mimeType);
+  if (!match) {
+    return null;
+  }
+  const rate = Number(match[1]);
+  return Number.isFinite(rate) && rate > 0 ? rate : null;
+}
+
+function resamplePcm16(pcm: Uint8Array, fromRate: number, toRate: number): Uint8Array {
+  if (fromRate === toRate) {
+    return pcm;
+  }
+
+  const inputSamples = Math.floor(pcm.length / 2);
+  const outputSamples = Math.floor((inputSamples * toRate) / fromRate);
+  const out = new Uint8Array(outputSamples * 2);
+  const ratio = fromRate / toRate;
+
+  const readInt16 = (sampleIndex: number): number => {
+    const i = sampleIndex * 2;
+    if (i + 1 >= pcm.length) {
+      return 0;
+    }
+    const lo = pcm[i];
+    const hi = pcm[i + 1];
+    let value = (hi << 8) | lo;
+    if (value & 0x8000) {
+      value = value - 0x10000;
+    }
+    return value;
+  };
+
+  const writeInt16 = (sampleIndex: number, value: number): void => {
+    const clamped = Math.max(-32768, Math.min(32767, Math.round(value)));
+    const i = sampleIndex * 2;
+    out[i] = clamped & 0xff;
+    out[i + 1] = (clamped >> 8) & 0xff;
+  };
+
+  for (let i = 0; i < outputSamples; i++) {
+    const srcPos = i * ratio;
+    const i0 = Math.floor(srcPos);
+    const frac = srcPos - i0;
+    const s0 = readInt16(i0);
+    const s1 = readInt16(Math.min(inputSamples - 1, i0 + 1));
+    writeInt16(i, s0 + (s1 - s0) * frac);
+  }
+
+  return out;
+}
+
+interface PcmOutput {
+  resumePlayback(): void;
+  playPCMData(bytes: Uint8Array): void;
+  stopPlayback(): void;
+}
+
+/** Keep voice output on the native communication engine and its echo reference. */
+export function playPcm16(
+  bytes: Uint8Array,
+  mimeType: string,
+  signal: AbortSignal,
+  output: PcmOutput,
+): Promise<number> {
+  if (signal.aborted) return Promise.reject(new Error("Playback stopped"));
+  const pcm = resamplePcm16(bytes, parsePcmSampleRate(mimeType) ?? 24000, 16000);
+  const duration = pcm.length / 2 / 16000;
+  return new Promise((resolve, reject) => {
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    const abort = () => {
+      clearTimeout(timeout);
+      output.stopPlayback();
+      reject(new Error("Playback stopped"));
+    };
+    signal.addEventListener("abort", abort, { once: true });
+    try {
+      output.resumePlayback();
+      output.playPCMData(pcm);
+      timeout = setTimeout(() => {
+        signal.removeEventListener("abort", abort);
+        resolve(duration);
+      }, duration * 1000);
+    } catch (error) {
+      signal.removeEventListener("abort", abort);
+      reject(error);
+    }
+  });
+}
diff --git a/packages/app/src/audio/play-audio.test.ts b/packages/app/src/audio/play-audio.test.ts
new file mode 100644
index 0000000000..a47b5c0ecc
--- /dev/null
+++ b/packages/app/src/audio/play-audio.test.ts
@@ -0,0 +1,202 @@
+import { expect, test } from "vitest";
+import { createPlayAudio } from "./play-audio";
+import { playPcm16, parsePcmSampleRate, resampleToPcm16 } from "./pcm";
+import { playFile, type FilePlaybackStatus, type FilePlayer } from "./file-playback";
+
+const source = { base64: "UklGRg==", mimeType: "audio/wav" };
+test("passes RPC file bytes to the shared engine and awaits completion", async () => {
+  const owner = new AbortController();
+  let finish!: () => void;
+  const played = new Promise<void>((resolve) => {
+    finish = resolve;
+  });
+  let completed = false;
+  const play = createPlayAudio(
+    {
+      async play(audio, signal) {
+        expect(signal).toBe(owner.signal);
+        expect(audio.type).toBe("audio/wav");
+        expect(audio.size).toBe(4);
+        expect(new Uint8Array(await audio.arrayBuffer())).toEqual(new Uint8Array([82, 73, 70, 70]));
+        await played;
+        return 1;
+      },
+    },
+    owner.signal,
+  );
+  const result = play(source).then(() => {
+    completed = true;
+    return undefined;
+  });
+  await Promise.resolve();
+  expect(completed).toBe(false);
+  finish();
+  await result;
+  expect(completed).toBe(true);
+});
+
+test.each([
+  { ...source, base64: "garbage!" },
+  { ...source, base64: "" },
+  { ...source, mimeType: "text/plain" },
+])("rejects invalid input before reaching a decoder: %o", async (input) => {
+  const play = createPlayAudio(
+    {
+      play() {
+        throw new Error("Reached decoder");
+      },
+    },
+    new AbortController().signal,
+  );
+  await expect(play(input)).rejects.toThrow(/^Audio must/);
+});
+
+test("rejects calls from an unloaded plugin", async () => {
+  const owner = new AbortController();
+  owner.abort(new Error("Plugin unloaded"));
+  const play = createPlayAudio(
+    {
+      play() {
+        throw new Error("Reached decoder");
+      },
+    },
+    owner.signal,
+  );
+  await expect(play(source)).rejects.toThrow("Playback stopped");
+});
+
+test("voice PCM retains its native output and 16 kHz samples", async () => {
+  const pcm = new Uint8Array([0, 0, 255, 127, 0, 128]);
+  let written: Uint8Array | undefined;
+  const duration = await playPcm16(
+    pcm,
+    "audio/pcm;rate=16000;bits=16",
+    new AbortController().signal,
+    {
+      resumePlayback() {},
+      playPCMData(bytes) {
+        written = bytes;
+      },
+      stopPlayback() {},
+    },
+  );
+  expect(written).toEqual(pcm);
+  expect(duration).toBe(3 / 16000);
+});
+
+test("voice PCM cancellation stops native output and rejects", async () => {
+  let stopped = false;
+  const owner = new AbortController();
+  const result = playPcm16(new Uint8Array(32000), "audio/pcm;rate=16000;bits=16", owner.signal, {
+    resumePlayback() {},
+    playPCMData() {},
+    stopPlayback() {
+      stopped = true;
+    },
+  });
+  owner.abort();
+  await expect(result).rejects.toThrow("Playback stopped");
+  expect(stopped).toBe(true);
+});
+
+function filePlayer() {
+  let listener: (status: FilePlaybackStatus) => void = () => {};
+  let removed = false;
+  let started = false;
+  const player: FilePlayer = {
+    play() {
+      started = true;
+    },
+    remove() {
+      removed = true;
+    },
+    addListener(_event, callback) {
+      listener = callback;
+      return {
+        remove() {
+          listener = () => {};
+        },
+      };
+    },
+  };
+  return {
+    player,
+    status: (status: Partial<FilePlaybackStatus>) =>
+      listener({
+        playbackState: "ready",
+        duration: 1,
+        didJustFinish: false,
+        isLoaded: true,
+        ...status,
+      }),
+    removed: () => removed,
+    started: () => started,
+  };
+}
+
+test("native file playback waits for completion and releases its player", async () => {
+  const h = filePlayer();
+  const promise = playFile(h.player, new AbortController().signal);
+  expect(h.started()).toBe(true);
+  h.status({ didJustFinish: true });
+  await expect(promise).resolves.toBe(1);
+  expect(h.removed()).toBe(true);
+});
+
+test("native decoder errors reject and release the player", async () => {
+  const h = filePlayer();
+  const promise = playFile(h.player, new AbortController().signal);
+  h.status({ playbackState: "failed" });
+  await expect(promise).rejects.toThrow("could not be decoded");
+  expect(h.removed()).toBe(true);
+});
+
+test("native cancellation releases playback and settles the caller", async () => {
+  const h = filePlayer();
+  const owner = new AbortController();
+  const promise = playFile(h.player, owner.signal);
+  owner.abort(new Error("Plugin unloaded"));
+  await expect(promise).rejects.toThrow("Playback stopped");
+  expect(h.removed()).toBe(true);
+});
+
+test.each(["audio/pcm;rate=16000;bits=16", "AUDIO/PCM; rate=16000"])(
+  "rejects raw PCM instead of initializing voice capture: %s",
+  async (mimeType) => {
+    const play = createPlayAudio(
+      {
+        play: async () => {
+          throw new Error("Reached engine");
+        },
+      },
+      new AbortController().signal,
+    );
+    await expect(play({ base64: "AAAAAA==", mimeType })).rejects.toThrow(
+      "Pass an audio file, such as WAV or MP3",
+    );
+  },
+);
+
+// Voice capture and browser dictation use this same PCM boundary.
+test("capture PCM preserves clipping, signed samples, and empty input", () => {
+  expect(resampleToPcm16(new Float32Array([-2, -1, -0.5, 0, 0.5, 1, 2]), 16000, 16000)).toEqual(
+    new Int16Array([-32768, -32768, -16384, 0, 16384, 32767, 32767]),
+  );
+  expect(resampleToPcm16(new Float32Array(), 48000, 16000)).toEqual(new Int16Array());
+});
+
+test("capture PCM resamples with interpolation and preserves the last sample", () => {
+  expect(resampleToPcm16(new Float32Array([-1, 0, 1]), 24000, 16000)).toEqual(
+    new Int16Array([-32768, 16384]),
+  );
+  expect(resampleToPcm16(new Float32Array([0, 1]), 8000, 16000)).toEqual(
+    new Int16Array([0, 16384, 32767, 32767]),
+  );
+});
+
+test("voice playback shares PCM sample-rate parsing", () => {
+  expect(parsePcmSampleRate("audio/pcm;rate=16000;bits=16")).toBe(16000);
+  expect(parsePcmSampleRate("audio/PCM;RATE=48000")).toBe(48000);
+  expect(parsePcmSampleRate("audio/pcm")).toBeNull();
+  expect(parsePcmSampleRate("audio/pcm;rate=0")).toBeNull();
+});
diff --git a/packages/app/src/audio/play-audio.ts b/packages/app/src/audio/play-audio.ts
new file mode 100644
index 0000000000..e5d831de17
--- /dev/null
+++ b/packages/app/src/audio/play-audio.ts
@@ -0,0 +1,38 @@
+import { Buffer } from "buffer";
+import type { AudioEngine } from "./audio-engine-types";
+
+/** RPC-friendly file input. No browser Blob, URL, or platform knowledge is needed. */
+export function createPlayAudio(engine: Pick<AudioEngine, "play">, signal: AbortSignal) {
+  return async (source: { base64: string; mimeType: string }): Promise<void> => {
+    if (signal.aborted) throw new Error("Playback stopped");
+    if (
+      !source ||
+      typeof source.base64 !== "string" ||
+      !/^[A-Za-z0-9+/]+={0,2}$/.test(source.base64) ||
+      source.base64.length % 4 !== 0 ||
+      !source.base64.length
+    ) {
+      throw new Error("Audio must contain a non-empty base64-encoded file");
+    }
+    if (
+      typeof source.mimeType !== "string" ||
+      !/^audio\/[\w.+-]+(?:[ \t]*;[^\r\n]+)?$/i.test(source.mimeType)
+    ) {
+      throw new Error("Audio must have an audio MIME type, such as audio/wav");
+    }
+    const bytes = Uint8Array.from(Buffer.from(source.base64, "base64"));
+    const [mediaType, ...parameters] = source.mimeType.split(";");
+    const type = [mediaType.trim().toLowerCase(), ...parameters].join(";");
+    if (mediaType.trim().toLowerCase() === "audio/pcm") {
+      throw new Error("Pass an audio file, such as WAV or MP3; raw PCM is not supported");
+    }
+    await engine.play(
+      {
+        type,
+        size: bytes.byteLength,
+        arrayBuffer: async () => bytes.buffer,
+      },
+      signal,
+    );
+  };
+}
diff --git a/packages/app/src/audio/playback.test.ts b/packages/app/src/audio/playback.test.ts
new file mode 100644
index 0000000000..2627d899cf
--- /dev/null
+++ b/packages/app/src/audio/playback.test.ts
@@ -0,0 +1,136 @@
+import { expect, test } from "vitest";
+import { createPlaybackQueue } from "./playback";
+
+function harness() {
+  const started: string[] = [];
+  const finishes: (() => void)[] = [];
+  const queue = createPlaybackQueue<string>((source, signal) => {
+    started.push(source);
+    return new Promise<number>((resolve, reject) => {
+      finishes.push(() => resolve(1));
+      signal.addEventListener("abort", () => reject(new Error("Playback stopped")), { once: true });
+    });
+  });
+  return { queue, started, finishes };
+}
+
+test("plays in order and resolves only after playback completes", async () => {
+  const h = harness();
+  const first = h.queue.play("first");
+  const second = h.queue.play("second");
+  expect(h.started).toEqual(["first"]);
+  h.finishes[0]();
+  await expect(first).resolves.toBe(1);
+  expect(h.started).toEqual(["first", "second"]);
+  h.finishes[1]();
+  await expect(second).resolves.toBe(1);
+});
+
+test("cancels one owner's queued and active work without stopping another owner", async () => {
+  const h = harness();
+  const owner = new AbortController();
+  const first = h.queue.play("first", owner.signal);
+  const queued = h.queue.play("cancelled", owner.signal);
+  const other = h.queue.play("other");
+  const rejected = Promise.all([
+    expect(first).rejects.toThrow("Playback stopped"),
+    expect(queued).rejects.toThrow("Playback stopped"),
+  ]);
+  owner.abort(new Error("unloaded"));
+  await rejected;
+  expect(h.started).toEqual(["first", "other"]);
+  h.finishes[1]();
+  await expect(other).resolves.toBe(1);
+});
+
+test("stop during loading cannot start cancelled audio or strand the next call", async () => {
+  const h = harness();
+  const first = h.queue.play("loading");
+  const rejected = expect(first).rejects.toThrow("Playback stopped");
+  h.queue.stop();
+  await rejected;
+  const second = h.queue.play("next");
+  h.finishes[1]();
+  await expect(second).resolves.toBe(1);
+});
+
+test("a failed file does not block the queue", async () => {
+  const queue = createPlaybackQueue<string>(async (source) => {
+    if (source === "invalid") throw new Error("Invalid audio");
+    return 2;
+  });
+  const failed = queue.play("invalid");
+  const next = queue.play("valid");
+  await expect(failed).rejects.toThrow("Invalid audio");
+  await expect(next).resolves.toBe(2);
+});
+
+test("ending the voice waiting cue leaves a plugin's active audio playing", async () => {
+  const { createVoiceRuntime } = await import("../voice/voice-runtime");
+  let finishPlugin!: () => void;
+  let cueQueued!: () => void;
+  const queued = new Promise<void>((resolve) => {
+    cueQueued = resolve;
+  });
+  const output = createPlaybackQueue<{ type: string }>(
+    (_source, signal) =>
+      new Promise((resolve, reject) => {
+        finishPlugin = () => resolve(1);
+        signal.addEventListener("abort", () => reject(new Error("Playback stopped")), {
+          once: true,
+        });
+      }),
+  );
+  const engine = {
+    initialize: async () => {},
+    destroy: async () => {
+      output.destroy();
+    },
+    startCapture: async () => {},
+    stopCapture: async () => {},
+    toggleMute: () => false,
+    isMuted: () => false,
+    play(source: { type: string }, signal?: AbortSignal) {
+      if (source.type.startsWith("audio/pcm")) cueQueued();
+      return output.play(source, signal);
+    },
+    stop: output.stop,
+    clearQueue: output.clearQueue,
+    isPlaying: output.isPlaying,
+  };
+  const runtime = createVoiceRuntime({
+    engine,
+    getServerInfo: () => ({
+      serverId: "host",
+      hostname: "host",
+      version: "1.0.0",
+      capabilities: {
+        voice: { dictation: { enabled: true, reason: "" }, voice: { enabled: true, reason: "" } },
+      },
+    }),
+    activateKeepAwake: async () => {},
+    deactivateKeepAwake: async () => {},
+  });
+  runtime.registerSession({
+    serverId: "host",
+    setVoiceMode: async () => {},
+    sendVoiceAudioChunk: async () => {},
+    audioPlayed: async () => {},
+    abortRequest: async () => {},
+    setAssistantAudioPlaying: () => {},
+  });
+  try {
+    await runtime.startVoice("host", "agent");
+    const result = engine.play({ type: "audio/wav" }).then(
+      () => "finished",
+      () => "stopped",
+    );
+    runtime.onTurnEvent("host", "agent", "turn_started");
+    await queued;
+    runtime.onAssistantAudioStarted("host");
+    finishPlugin();
+    expect(await result).toBe("finished");
+  } finally {
+    await runtime.destroy();
+  }
+});
diff --git a/packages/app/src/audio/playback.ts b/packages/app/src/audio/playback.ts
new file mode 100644
index 0000000000..8d0744b79c
--- /dev/null
+++ b/packages/app/src/audio/playback.ts
@@ -0,0 +1,81 @@
+/** One queue for voice and plugin audio, including cancellation while loading. */
+export function createPlaybackQueue<Source>(
+  start: (source: Source, signal: AbortSignal) => Promise<number>,
+  onIdle: () => void = () => {},
+) {
+  interface Item {
+    source: Source;
+    controller: AbortController;
+    resolve: (duration: number) => void;
+    reject: (error: unknown) => void;
+    release: () => void;
+  }
+  const pending: Item[] = [];
+  let active: Item | null = null;
+  let destroyed = false;
+
+  async function drain() {
+    if (active) return;
+    const item = pending.shift();
+    if (!item) {
+      onIdle();
+      return;
+    }
+    active = item;
+    try {
+      if (item.controller.signal.aborted) throw new Error("Playback stopped");
+      item.resolve(await start(item.source, item.controller.signal));
+    } catch (error) {
+      item.reject(error);
+    } finally {
+      item.release();
+      active = null;
+      void drain();
+    }
+  }
+
+  const stopped = () => new Error("Playback stopped");
+  return {
+    play(source: Source, signal?: AbortSignal): Promise<number> {
+      if (destroyed) return Promise.reject(new Error("Audio engine destroyed"));
+      if (signal?.aborted) return Promise.reject(new Error("Playback stopped"));
+      return new Promise((resolve, reject) => {
+        const controller = new AbortController();
+        const cancel = () => {
+          controller.abort();
+          const index = pending.indexOf(item);
+          if (index !== -1) {
+            pending.splice(index, 1);
+            item.release();
+            reject(new Error("Playback stopped"));
+          }
+        };
+        const item: Item = {
+          source,
+          controller,
+          resolve,
+          reject,
+          release: () => signal?.removeEventListener("abort", cancel),
+        };
+        signal?.addEventListener("abort", cancel, { once: true });
+        pending.push(item);
+        void drain();
+      });
+    },
+    stop() {
+      active?.controller.abort();
+    },
+    clearQueue() {
+      for (const item of pending.splice(0)) {
+        item.release();
+        item.reject(stopped());
+      }
+    },
+    isPlaying: () => active !== null,
+    destroy() {
+      destroyed = true;
+      this.clearQueue();
+      this.stop();
+    },
+  };
+}
diff --git a/packages/app/src/changelog/changelog-host.tsx b/packages/app/src/changelog/changelog-host.tsx
new file mode 100644
index 0000000000..b3d938ce8d
--- /dev/null
+++ b/packages/app/src/changelog/changelog-host.tsx
@@ -0,0 +1,10 @@
+import { useChangelogStore } from "./internal/changelog-store";
+import { ChangelogSheet } from "./internal/changelog-sheet";
+
+/** Mounted once by the app shell so any surface can call `openChangelog()`. */
+export function ChangelogHost() {
+  const visible = useChangelogStore((state) => state.visible);
+  const close = useChangelogStore((state) => state.close);
+
+  return <ChangelogSheet visible={visible} onClose={close} />;
+}
diff --git a/packages/app/src/changelog/index.ts b/packages/app/src/changelog/index.ts
new file mode 100644
index 0000000000..636aae99ea
--- /dev/null
+++ b/packages/app/src/changelog/index.ts
@@ -0,0 +1,11 @@
+/**
+ * What's new: the release notes, read from the repository's CHANGELOG.md and
+ * rendered in the app instead of sending the reader to a browser.
+ *
+ * Two things leave this module — the host the app shell mounts, and the command
+ * every entry point calls. Where the document comes from, how it is parsed, and
+ * how much of it renders at once stay inside; import from `@/changelog`, never
+ * a path within it.
+ */
+export { ChangelogHost } from "./changelog-host";
+export { openChangelog } from "./open-changelog";
diff --git a/packages/app/src/changelog/internal/changelog-sheet.tsx b/packages/app/src/changelog/internal/changelog-sheet.tsx
new file mode 100644
index 0000000000..04afdcafb0
--- /dev/null
+++ b/packages/app/src/changelog/internal/changelog-sheet.tsx
@@ -0,0 +1,242 @@
+import { memo, useCallback, useMemo } from "react";
+import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { ExternalLink, Gift } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { MarkdownRenderer } from "@/components/markdown/renderer";
+import { Alert } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import {
+  iconButtonChromeGlyphSize,
+  iconButtonChromeStyle,
+} from "@/components/ui/icon-button-chrome";
+import { StatusBadge } from "@/components/ui/status-badge";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { resolveAppVersion } from "@/utils/app-version";
+import { openExternalUrl } from "@/utils/open-external-url";
+import { useChangelog, type ChangelogState } from "./changelog-source";
+import { useRevealedReleases } from "./use-revealed-releases";
+import {
+  formatChangelogDate,
+  type ChangelogRelease,
+  type ChangelogSection,
+} from "./parse-changelog";
+
+const WEBSITE_CHANGELOG_URL = "https://paseo.sh/changelog";
+
+const ThemedGift = withUnistyles(Gift);
+const ThemedExternalLink = withUnistyles(ExternalLink);
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const sheetLeadingIcon = <ThemedGift size={ICON_SIZE.md} uniProps={mutedColorMapping} />;
+const websiteButtonStyle = (state: PressableStateCallbackType & { hovered?: boolean }) =>
+  iconButtonChromeStyle({ size: "large", state });
+
+interface ChangelogSheetProps {
+  visible: boolean;
+  onClose: () => void;
+}
+
+export function ChangelogSheet({ visible, onClose }: ChangelogSheetProps) {
+  const { t } = useTranslation();
+  const { state, reload } = useChangelog(visible);
+  const { count, showMore } = useRevealedReleases(visible && state.status === "ready");
+
+  const handleOpenWebsite = useCallback(() => {
+    void openExternalUrl(WEBSITE_CHANGELOG_URL);
+  }, []);
+
+  const header: SheetHeader = useMemo(
+    () => ({
+      title: t("changelog.title"),
+      leading: sheetLeadingIcon,
+      actions: (
+        <Pressable
+          onPress={handleOpenWebsite}
+          hitSlop={8}
+          style={websiteButtonStyle}
+          accessibilityRole="button"
+          accessibilityLabel={t("changelog.openWebsite")}
+          testID="changelog-open-website"
+        >
+          <ThemedExternalLink
+            size={iconButtonChromeGlyphSize("large")}
+            uniProps={mutedColorMapping}
+          />
+        </Pressable>
+      ),
+    }),
+    [handleOpenWebsite, t],
+  );
+
+  return (
+    <AdaptiveModalSheet
+      header={header}
+      visible={visible}
+      onClose={onClose}
+      snapPoints={SNAP_POINTS}
+      desktopMaxWidth={620}
+      desktopHeight="85%"
+      testID="changelog-sheet"
+    >
+      <ChangelogBody state={state} shownReleases={count} onShowMore={showMore} onRetry={reload} />
+    </AdaptiveModalSheet>
+  );
+}
+
+const SNAP_POINTS = ["85%", "95%"];
+
+interface ChangelogBodyProps {
+  state: ChangelogState;
+  shownReleases: number;
+  onShowMore: () => void;
+  onRetry: () => void;
+}
+
+function ChangelogBody({ state, shownReleases, onShowMore, onRetry }: ChangelogBodyProps) {
+  const { t } = useTranslation();
+  const appVersion = useMemo(() => resolveAppVersion()?.replace(/^v/i, "") ?? null, []);
+
+  if (state.status === "loading") {
+    return (
+      <View style={styles.centered}>
+        <ThemedLoadingSpinner size="large" uniProps={mutedColorMapping} />
+      </View>
+    );
+  }
+
+  if (state.status === "error") {
+    return (
+      <View style={styles.centered}>
+        <Alert
+          size="md"
+          variant="error"
+          title={t("changelog.error.title")}
+          description={t("changelog.error.description")}
+          testID="changelog-error"
+        >
+          <Button variant="outline" size="sm" onPress={onRetry} testID="changelog-retry">
+            {t("common.actions.retry")}
+          </Button>
+        </Alert>
+      </View>
+    );
+  }
+
+  const visibleReleases = state.releases.slice(0, shownReleases);
+
+  return (
+    <View style={styles.releaseList}>
+      {visibleReleases.map((release) => (
+        <ReleaseView
+          key={`${release.version}:${release.date}`}
+          release={release}
+          isCurrent={release.version === appVersion}
+        />
+      ))}
+      {state.releases.length > visibleReleases.length ? (
+        <Button
+          variant="ghost"
+          onPress={onShowMore}
+          style={styles.showMore}
+          testID="changelog-show-more"
+        >
+          {t("changelog.showMore")}
+        </Button>
+      ) : null}
+    </View>
+  );
+}
+
+interface ReleaseViewProps {
+  release: ChangelogRelease;
+  isCurrent: boolean;
+}
+
+const ReleaseView = memo(function ReleaseView({ release, isCurrent }: ReleaseViewProps) {
+  const { t } = useTranslation();
+  const date = formatChangelogDate(release.date);
+
+  return (
+    <View style={styles.release} testID={`changelog-release-${release.version}`}>
+      <View style={styles.releaseHeading}>
+        <Text style={styles.version}>{release.version}</Text>
+        {isCurrent ? <StatusBadge label={t("changelog.installed")} /> : null}
+        <View style={styles.headingSpacer} />
+        {date ? <Text style={styles.date}>{date}</Text> : null}
+      </View>
+      {keyChangelogSections(release.sections).map(({ key, section }) => (
+        <View key={key} style={styles.section}>
+          {section.title ? <Text style={styles.sectionTitle}>{section.title}</Text> : null}
+          {section.body ? <MarkdownRenderer text={section.body} compact /> : null}
+        </View>
+      ))}
+    </View>
+  );
+});
+
+/** A release can repeat a section title; the occurrence keeps the key stable. */
+function keyChangelogSections(
+  sections: readonly ChangelogSection[],
+): { key: string; section: ChangelogSection }[] {
+  const seen = new Map<string, number>();
+  return sections.map((section) => {
+    const title = section.title ?? "";
+    const occurrence = seen.get(title) ?? 0;
+    seen.set(title, occurrence + 1);
+    return { key: `${title}:${occurrence}`, section };
+  });
+}
+
+const styles = StyleSheet.create((theme) => ({
+  centered: {
+    flex: 1,
+    minHeight: 160,
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[3],
+  },
+  releaseList: {
+    gap: theme.spacing[8],
+    paddingBottom: theme.spacing[4],
+  },
+  release: {
+    gap: theme.spacing[4],
+  },
+  releaseHeading: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingBottom: theme.spacing[2],
+    borderBottomWidth: theme.borderWidth[1],
+    borderBottomColor: theme.colors.border,
+  },
+  headingSpacer: {
+    flex: 1,
+  },
+  version: {
+    fontSize: theme.fontSize.lg,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+  },
+  date: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  section: {
+    gap: theme.spacing[2],
+  },
+  sectionTitle: {
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+    textTransform: "uppercase",
+    letterSpacing: 0.5,
+  },
+  showMore: {
+    alignSelf: "center",
+  },
+}));
diff --git a/packages/app/src/changelog/internal/changelog-source.ts b/packages/app/src/changelog/internal/changelog-source.ts
new file mode 100644
index 0000000000..f678f4ddd6
--- /dev/null
+++ b/packages/app/src/changelog/internal/changelog-source.ts
@@ -0,0 +1,72 @@
+import { useCallback, useEffect, useState } from "react";
+import { parseChangelog, type ChangelogRelease } from "./parse-changelog";
+
+const CHANGELOG_URL = "https://raw.githubusercontent.com/getpaseo/paseo/main/CHANGELOG.md";
+
+export type ChangelogState =
+  | { status: "loading" }
+  | { status: "ready"; releases: ChangelogRelease[] }
+  | { status: "error" };
+
+// Survives close/reopen so the second look paints without a spinner. The raw
+// text is kept alongside the releases so an unchanged revalidation can be
+// dropped: handing back an equal-but-new array would re-render every release.
+let cached: { markdown: string; releases: ChangelogRelease[] } | null = null;
+
+export interface Changelog {
+  state: ChangelogState;
+  reload: () => void;
+}
+
+/**
+ * Reads the changelog from the repository the app was built from.
+ *
+ * The daemon is not involved: the changelog describes the app, a phone reaching
+ * a relay already has internet, and going through a host would make the notes
+ * depend on which host happens to be connected.
+ *
+ * Every open refetches, because the whole point of opening it is a release that
+ * shipped after this app started. A previous result stays on screen while that
+ * happens, and survives a failed revalidation.
+ */
+export function useChangelog(enabled: boolean): Changelog {
+  const [state, setState] = useState<ChangelogState>(readCache);
+  const [attempt, setAttempt] = useState(0);
+
+  useEffect(() => {
+    if (!enabled) return;
+
+    const controller = new AbortController();
+    setState(readCache());
+
+    void (async () => {
+      try {
+        const response = await fetch(CHANGELOG_URL, { signal: controller.signal });
+        if (!response.ok) throw new Error(`Changelog request failed: ${response.status}`);
+        const markdown = await response.text();
+        if (cached?.markdown === markdown) return;
+        const releases = parseChangelog(markdown);
+        if (releases.length === 0) throw new Error("Changelog has no releases");
+        cached = { markdown, releases };
+        setState({ status: "ready", releases });
+      } catch {
+        if (controller.signal.aborted) return;
+        if (cached) return;
+        setState({ status: "error" });
+      }
+    })();
+
+    return () => controller.abort();
+  }, [enabled, attempt]);
+
+  const reload = useCallback(() => {
+    cached = null;
+    setAttempt((value) => value + 1);
+  }, []);
+
+  return { state, reload };
+}
+
+function readCache(): ChangelogState {
+  return cached ? { status: "ready", releases: cached.releases } : { status: "loading" };
+}
diff --git a/packages/app/src/changelog/internal/changelog-store.ts b/packages/app/src/changelog/internal/changelog-store.ts
new file mode 100644
index 0000000000..ce56cd9b3d
--- /dev/null
+++ b/packages/app/src/changelog/internal/changelog-store.ts
@@ -0,0 +1,13 @@
+import { create } from "zustand";
+
+interface ChangelogVisibility {
+  visible: boolean;
+  open: () => void;
+  close: () => void;
+}
+
+export const useChangelogStore = create<ChangelogVisibility>((set) => ({
+  visible: false,
+  open: () => set({ visible: true }),
+  close: () => set({ visible: false }),
+}));
diff --git a/packages/app/src/changelog/internal/parse-changelog.test.ts b/packages/app/src/changelog/internal/parse-changelog.test.ts
new file mode 100644
index 0000000000..958be560ff
--- /dev/null
+++ b/packages/app/src/changelog/internal/parse-changelog.test.ts
@@ -0,0 +1,301 @@
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import {
+  formatChangelogDate,
+  parseChangelog,
+  type ChangelogRelease,
+  type ChangelogSection,
+} from "./parse-changelog";
+
+function bodies(markdown: string, releaseIndex = 0): string[] {
+  return parseChangelog(markdown)[releaseIndex].sections.map(sectionBody);
+}
+
+function sectionBody(section: ChangelogSection): string {
+  return section.body;
+}
+
+function sectionTitle(section: ChangelogSection): string | null {
+  return section.title;
+}
+
+function releaseDate(release: ChangelogRelease): string {
+  return release.date;
+}
+
+function authoredLines(release: ChangelogRelease): string[] {
+  return release.sections.flatMap(sectionLines);
+}
+
+function sectionLines(section: ChangelogSection): string[] {
+  return [...(section.title ? [`### ${section.title}`] : []), ...section.body.split("\n")];
+}
+
+function isNotBlank(line: string): boolean {
+  return line.trim().length > 0;
+}
+
+describe("parseChangelog", () => {
+  it("reads the shape the changelog is authored in today", () => {
+    const releases = parseChangelog(
+      [
+        "# Changelog",
+        "",
+        "## 0.8.0-beta.1 - 2026-09-08",
+        "",
+        "This release extends what plugins can do.",
+        "",
+        "### Plugins",
+        "",
+        "- Added provider contributions ([#4314](https://example.com/4314))",
+        "",
+        "### Fixed",
+        "",
+        "- Fixed the mobile terminal keyboard closing",
+        "",
+        "## 0.7.2 - 2026-09-02",
+        "",
+        "### Fixed",
+        "",
+        "- Fixed a thing",
+        "",
+      ].join("\n"),
+    );
+
+    expect(releases).toEqual([
+      {
+        version: "0.8.0-beta.1",
+        date: "2026-09-08",
+        sections: [
+          { title: null, body: "This release extends what plugins can do." },
+          {
+            title: "Plugins",
+            body: "- Added provider contributions ([#4314](https://example.com/4314))",
+          },
+          { title: "Fixed", body: "- Fixed the mobile terminal keyboard closing" },
+        ],
+      },
+      {
+        version: "0.7.2",
+        date: "2026-09-02",
+        sections: [{ title: "Fixed", body: "- Fixed a thing" }],
+      },
+    ]);
+  });
+
+  it("drops everything above the first release heading", () => {
+    const releases = parseChangelog(
+      "# Changelog\n\nAll notable changes.\n\n## 1.0.0 - 2026-01-01\n\n- One\n",
+    );
+    expect(releases).toHaveLength(1);
+    expect(releases[0].sections).toEqual([{ title: null, body: "- One" }]);
+  });
+
+  it("returns nothing for a document with no releases", () => {
+    expect(parseChangelog("")).toEqual([]);
+    expect(parseChangelog("# Changelog\n\nNothing yet.\n")).toEqual([]);
+  });
+
+  describe("release headings", () => {
+    const headings: [string, { version: string; date: string }][] = [
+      ["## 1.2.3 - 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3", { version: "1.2.3", date: "" }],
+      ["## [1.2.3] - 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## v1.2.3 - 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3 — 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3 – 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3 (2026-01-01)", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3 - January 1, 2026", { version: "1.2.3", date: "January 1, 2026" }],
+      [
+        "## [1.2.3](https://example.com/v1.2.3) - 2026-01-01",
+        { version: "1.2.3", date: "2026-01-01" },
+      ],
+      ["## Unreleased", { version: "Unreleased", date: "" }],
+      ["## [Unreleased]", { version: "Unreleased", date: "" }],
+      ["##   1.2.3   -   2026-01-01   ", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 1.2.3 - 2026-01-01 ##", { version: "1.2.3", date: "2026-01-01" }],
+      ["   ## 1.2.3 - 2026-01-01", { version: "1.2.3", date: "2026-01-01" }],
+      ["## 0.8.0-beta.1 - 2026-09-08", { version: "0.8.0-beta.1", date: "2026-09-08" }],
+    ];
+
+    for (const [heading, expected] of headings) {
+      it(`reads ${JSON.stringify(heading)}`, () => {
+        const [release] = parseChangelog(`${heading}\n\n- Entry\n`);
+        expect({ version: release.version, date: release.date }).toEqual(expected);
+      });
+    }
+
+    it("keeps both entries when a version appears twice", () => {
+      const releases = parseChangelog(
+        "## 1.0.0 - 2026-01-02\n\n- Two\n\n## 1.0.0 - 2026-01-01\n\n- One\n",
+      );
+      expect(releases.map(releaseDate)).toEqual(["2026-01-02", "2026-01-01"]);
+    });
+
+    it("does not treat a deeper heading as a release", () => {
+      const releases = parseChangelog("## 1.0.0 - 2026-01-01\n\n#### Deep\n\n- One\n");
+      expect(releases).toHaveLength(1);
+      expect(releases[0].sections).toEqual([{ title: null, body: "#### Deep\n\n- One" }]);
+    });
+
+    it("does not treat an unspaced hash run as a heading", () => {
+      const releases = parseChangelog("## 1.0.0 - 2026-01-01\n\n##notaheading\n");
+      expect(releases).toHaveLength(1);
+      expect(releases[0].sections[0].body).toBe("##notaheading");
+    });
+  });
+
+  describe("sections", () => {
+    it("names sections from the document instead of a fixed list", () => {
+      const releases = parseChangelog(
+        "## 1.0.0 - 2026-01-01\n\n### Security\n\n- One\n\n### Deprecated\n\n- Two\n",
+      );
+      expect(releases[0].sections.map(sectionTitle)).toEqual(["Security", "Deprecated"]);
+    });
+
+    it("keeps a section that has a heading but no body", () => {
+      const releases = parseChangelog("## 1.0.0 - 2026-01-01\n\n### Fixed\n\n### Added\n\n- One\n");
+      expect(releases[0].sections).toEqual([
+        { title: "Fixed", body: "" },
+        { title: "Added", body: "- One" },
+      ]);
+    });
+
+    it("drops an empty lead section", () => {
+      const releases = parseChangelog("## 1.0.0 - 2026-01-01\n\n### Fixed\n\n- One\n");
+      expect(releases[0].sections).toEqual([{ title: "Fixed", body: "- One" }]);
+    });
+
+    it("keeps a release that is only prose", () => {
+      const releases = parseChangelog("## 1.0.0 - 2026-01-01\n\nJust a note.\n");
+      expect(releases[0].sections).toEqual([{ title: null, body: "Just a note." }]);
+    });
+  });
+
+  describe("block kinds it does not interpret", () => {
+    it("passes a block quote, callout, table and embed through untouched", () => {
+      const source = [
+        "## 1.0.0 - 2026-01-01",
+        "",
+        "### Notes",
+        "",
+        "> [!WARNING]",
+        "> This release drops macOS 12.",
+        "",
+        "| Platform | Status |",
+        "| --- | --- |",
+        "| macOS | Shipped |",
+        "",
+        "![Screenshot](https://example.com/shot.png)",
+        "",
+        '<video src="https://example.com/demo.mp4" controls></video>',
+        "",
+        '<iframe src="https://example.com/embed"></iframe>',
+        "",
+        "<details><summary>More</summary>Hidden</details>",
+      ].join("\n");
+
+      expect(bodies(source)).toEqual([source.split("\n").slice(4).join("\n")]);
+    });
+
+    it("does not split on a heading inside a fenced code block", () => {
+      const source = [
+        "## 1.0.0 - 2026-01-01",
+        "",
+        "### Added",
+        "",
+        "```md",
+        "## 9.9.9 - 2099-01-01",
+        "### Fake section",
+        "```",
+        "",
+        "- Real entry",
+      ].join("\n");
+
+      const releases = parseChangelog(source);
+      expect(releases).toHaveLength(1);
+      expect(releases[0].sections).toEqual([
+        {
+          title: "Added",
+          body: "```md\n## 9.9.9 - 2099-01-01\n### Fake section\n```\n\n- Real entry",
+        },
+      ]);
+    });
+
+    it("tracks tilde fences and longer fence runs", () => {
+      const source = [
+        "## 1.0.0 - 2026-01-01",
+        "",
+        "~~~~",
+        "## 9.9.9",
+        "```",
+        "~~~~",
+        "",
+        "- Real entry",
+      ].join("\n");
+
+      expect(parseChangelog(source)).toHaveLength(1);
+    });
+
+    it("does not split on a heading inside a fence nested in a list item", () => {
+      const source = [
+        "## 1.0.0 - 2026-01-01",
+        "",
+        "- Entry with a sample",
+        "",
+        "  ```",
+        "  ## 9.9.9",
+        "  ```",
+      ].join("\n");
+
+      expect(parseChangelog(source)).toHaveLength(1);
+    });
+  });
+
+  it("reads CRLF documents", () => {
+    const releases = parseChangelog("## 1.0.0 - 2026-01-01\r\n\r\n### Fixed\r\n\r\n- One\r\n");
+    expect(releases).toEqual([
+      { version: "1.0.0", date: "2026-01-01", sections: [{ title: "Fixed", body: "- One" }] },
+    ]);
+  });
+});
+
+describe("formatChangelogDate", () => {
+  it("localizes an ISO date without shifting it across a timezone", () => {
+    expect(formatChangelogDate("2026-09-08")).toBe("September 8, 2026");
+  });
+
+  it("shows anything else as authored", () => {
+    expect(formatChangelogDate("September 8, 2026")).toBe("September 8, 2026");
+    expect(formatChangelogDate("")).toBe("");
+  });
+});
+
+describe("the repository's own CHANGELOG.md", () => {
+  const markdown = readFileSync(
+    fileURLToPath(new URL("../../../../../CHANGELOG.md", import.meta.url)),
+    "utf8",
+  );
+  const releases = parseChangelog(markdown);
+
+  it("parses every release heading", () => {
+    expect(releases.length).toBeGreaterThan(50);
+    for (const release of releases) {
+      expect(release.version).toMatch(/^\d+\.\d+\.\d+/);
+      expect(release.date).toMatch(/^\d{4}-\d{2}-\d{2}$/);
+      expect(release.sections.length).toBeGreaterThan(0);
+    }
+  });
+
+  it("keeps every authored line inside a release", () => {
+    const documentLines = markdown.split("\n");
+    const fromFirstRelease = documentLines.slice(
+      documentLines.findIndex((line) => line.startsWith("## ")),
+    );
+
+    expect(releases.flatMap(authoredLines).filter(isNotBlank)).toEqual(
+      fromFirstRelease.filter(isNotBlank).filter((line) => !line.startsWith("## ")),
+    );
+  });
+});
diff --git a/packages/app/src/changelog/internal/parse-changelog.ts b/packages/app/src/changelog/internal/parse-changelog.ts
new file mode 100644
index 0000000000..693538574f
--- /dev/null
+++ b/packages/app/src/changelog/internal/parse-changelog.ts
@@ -0,0 +1,151 @@
+/**
+ * Structural parser for a CHANGELOG.md document.
+ *
+ * The document is authored in the repository, fetched at runtime, and rewritten
+ * on every release, so this parser commits to exactly two facts: a `##` heading
+ * starts a release and a `###` heading starts a section inside it. Everything
+ * else — prose, callouts, block quotes, fenced code, images, video and embed
+ * HTML, tables, nested lists — is carried through verbatim and handed to the
+ * Markdown renderer. A new block kind in the changelog therefore needs no
+ * change here.
+ *
+ * Section titles are read, never matched: renaming "Improved" or adding a
+ * section is a content change, not a code change.
+ *
+ * The one way a line scan can be fooled is a fenced block whose contents look
+ * like a heading, so fences are tracked.
+ */
+
+export interface ChangelogSection {
+  /** The `###` heading text, or null for content that precedes the first one. */
+  title: string | null;
+  /** Verbatim markdown under the heading. */
+  body: string;
+}
+
+export interface ChangelogRelease {
+  /** Version as authored, stripped of link, bracket and `v` decoration. */
+  version: string;
+  /** The heading tail after the version. Empty when the heading carried none. */
+  date: string;
+  /** Sections in document order; the untitled lead section comes first. */
+  sections: ChangelogSection[];
+}
+
+// `##` / `###` must be followed by whitespace, which is what keeps each pattern
+// from matching one level deeper.
+const RELEASE_HEADING = /^ {0,3}##(?:[ \t]+(.*?))?[ \t]*$/;
+const SECTION_HEADING = /^ {0,3}###(?:[ \t]+(.*?))?[ \t]*$/;
+const FENCE_OPEN = /^\s*(`{3,}|~{3,})/;
+const ATX_CLOSING = /[ \t]+#+[ \t]*$/;
+const MARKDOWN_LINK = /\[([^\]]*)\]\([^)]*\)/g;
+const DASH_SEPARATED_DATE = /^(.*?)\s+[-–—]\s+(.+)$/;
+const PARENTHESIZED_DATE = /^(.*?)\s*\((.+)\)$/;
+const BRACKETED_VERSION = /^\[(.*)\]$/;
+const LEADING_V = /^v(?=\d)/i;
+const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/;
+
+interface SectionDraft {
+  title: string | null;
+  lines: string[];
+}
+
+interface ReleaseDraft {
+  version: string;
+  date: string;
+  sections: SectionDraft[];
+}
+
+export function parseChangelog(markdown: string): ChangelogRelease[] {
+  const releases: ReleaseDraft[] = [];
+  let fence: string | null = null;
+
+  for (const line of markdown.split(/\r?\n/)) {
+    const fenceEdge = line.match(FENCE_OPEN)?.[1];
+    if (fenceEdge) {
+      if (!fence) {
+        fence = fenceEdge;
+      } else if (fenceEdge[0] === fence[0] && fenceEdge.length >= fence.length) {
+        fence = null;
+      }
+    }
+
+    if (!fence) {
+      const releaseHeading = line.match(RELEASE_HEADING);
+      if (releaseHeading) {
+        releases.push({
+          ...splitReleaseHeading(releaseHeading[1] ?? ""),
+          sections: [{ title: null, lines: [] }],
+        });
+        continue;
+      }
+
+      const sectionHeading = line.match(SECTION_HEADING);
+      if (sectionHeading && releases.length > 0) {
+        releases[releases.length - 1].sections.push({
+          title: (sectionHeading[1] ?? "").replace(ATX_CLOSING, "").trim() || null,
+          lines: [],
+        });
+        continue;
+      }
+    }
+
+    const release = releases.at(-1);
+    if (release) release.sections[release.sections.length - 1].lines.push(line);
+  }
+
+  return releases.map(materializeRelease);
+}
+
+function materializeRelease(draft: ReleaseDraft): ChangelogRelease {
+  const sections = draft.sections
+    .map((section) => ({ title: section.title, body: trimBlankLines(section.lines) }))
+    // A heading with an empty body still names something; an empty lead section
+    // is just the gap between the release heading and the first section.
+    .filter((section) => section.title !== null || section.body.length > 0);
+  return { version: draft.version, date: draft.date, sections };
+}
+
+function trimBlankLines(lines: string[]): string {
+  let start = 0;
+  let end = lines.length;
+  while (start < end && lines[start].trim().length === 0) start += 1;
+  while (end > start && lines[end - 1].trim().length === 0) end -= 1;
+  return lines.slice(start, end).join("\n");
+}
+
+function splitReleaseHeading(heading: string): { version: string; date: string } {
+  const plain = heading.replace(ATX_CLOSING, "").replace(MARKDOWN_LINK, "$1").trim();
+
+  const dashed = plain.match(DASH_SEPARATED_DATE);
+  if (dashed) return { version: normalizeVersion(dashed[1]), date: dashed[2].trim() };
+
+  const parenthesized = plain.match(PARENTHESIZED_DATE);
+  if (parenthesized) {
+    return { version: normalizeVersion(parenthesized[1]), date: parenthesized[2].trim() };
+  }
+
+  return { version: normalizeVersion(plain), date: "" };
+}
+
+function normalizeVersion(raw: string): string {
+  const unbracketed = raw.trim().replace(BRACKETED_VERSION, "$1").trim();
+  return unbracketed.replace(LEADING_V, "");
+}
+
+/**
+ * ISO dates become the reader's locale; anything else the author wrote is shown
+ * as authored rather than guessed at.
+ */
+export function formatChangelogDate(date: string): string {
+  if (!ISO_DATE.test(date)) return date;
+  const [year, month, day] = date.split("-").map(Number);
+  const value = new Date(Date.UTC(year, month - 1, day));
+  if (Number.isNaN(value.getTime())) return date;
+  return new Intl.DateTimeFormat(undefined, {
+    month: "long",
+    day: "numeric",
+    year: "numeric",
+    timeZone: "UTC",
+  }).format(value);
+}
diff --git a/packages/app/src/changelog/internal/use-revealed-releases.ts b/packages/app/src/changelog/internal/use-revealed-releases.ts
new file mode 100644
index 0000000000..a448e909ca
--- /dev/null
+++ b/packages/app/src/changelog/internal/use-revealed-releases.ts
@@ -0,0 +1,42 @@
+import { startTransition, useCallback, useEffect, useState } from "react";
+
+/**
+ * How much of the changelog is on screen.
+ *
+ * The latest release renders as soon as there is one, because that is what
+ * nearly every open is asking for. The rest of the first page follows
+ * immediately, and every Show more after it, as transitions: React then slices
+ * that work around the opening animation instead of committing hundreds of list
+ * items in one task. The whole document is well over a thousand of them.
+ *
+ * The input is "releases are on screen", not "the sheet is open". A cold open
+ * spends its first moment on the loading state, and stepping the count up
+ * during it would land the whole first page in the one commit that follows —
+ * the exact commit this exists to split.
+ */
+const LATEST_RELEASE_ONLY = 1;
+const FIRST_PAGE = 5;
+const PAGE_SIZE = 10;
+
+export interface RevealedReleases {
+  count: number;
+  showMore: () => void;
+}
+
+export function useRevealedReleases(hasReleases: boolean): RevealedReleases {
+  const [count, setCount] = useState(LATEST_RELEASE_ONLY);
+
+  useEffect(() => {
+    if (!hasReleases) {
+      setCount(LATEST_RELEASE_ONLY);
+      return;
+    }
+    startTransition(() => setCount(FIRST_PAGE));
+  }, [hasReleases]);
+
+  const showMore = useCallback(() => {
+    startTransition(() => setCount((current) => current + PAGE_SIZE));
+  }, []);
+
+  return { count, showMore };
+}
diff --git a/packages/app/src/changelog/open-changelog.ts b/packages/app/src/changelog/open-changelog.ts
new file mode 100644
index 0000000000..f0d7767463
--- /dev/null
+++ b/packages/app/src/changelog/open-changelog.ts
@@ -0,0 +1,6 @@
+import { useChangelogStore } from "./internal/changelog-store";
+
+/** Opens the What's new sheet from anywhere, including outside React. */
+export function openChangelog(): void {
+  useChangelogStore.getState().open();
+}
diff --git a/packages/app/src/client-slash-commands/index.test.ts b/packages/app/src/client-slash-commands/index.test.ts
index 768602a3d8..c6e86be582 100644
--- a/packages/app/src/client-slash-commands/index.test.ts
+++ b/packages/app/src/client-slash-commands/index.test.ts
@@ -53,7 +53,7 @@ function createAgent(overrides: Partial<Agent> = {}): Agent {
     parentAgentId: null,
     labels: {},
     ...overrides,
-    activeTurn: overrides.activeTurn ?? null,
+    turn: overrides.turn ?? { phase: "idle", cancellationRequestId: null },
   };
 }
 
diff --git a/packages/app/src/command-center/agent-control-registration.tsx b/packages/app/src/command-center/agent-control-registration.tsx
index ecc7e8985c..21ce492373 100644
--- a/packages/app/src/command-center/agent-control-registration.tsx
+++ b/packages/app/src/command-center/agent-control-registration.tsx
@@ -13,7 +13,7 @@ import {
   PlanModeIcon,
   ThinkingIcon,
 } from "@/agent-controls/icons";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcons } from "@/components/provider-icons";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import {
   buildAgentControlContributions,
@@ -88,6 +88,7 @@ export function useAgentControlCommandCenterActions(input: {
   const { t } = useTranslation();
   const { controls } = input;
   const { features, models, modes, thinking } = controls;
+  const getProviderIcon = useProviderIcons(controls.serverId);
   const actions = useMemo(
     () =>
       buildAgentControlContributions({
@@ -128,6 +129,7 @@ export function useAgentControlCommandCenterActions(input: {
         },
       }),
     [
+      getProviderIcon,
       controls.ownerKey,
       controls.provider,
       controls.providerDefinitions,
diff --git a/packages/app/src/command-center/command-center.tsx b/packages/app/src/command-center/command-center.tsx
index e909bf28e5..607f24c214 100644
--- a/packages/app/src/command-center/command-center.tsx
+++ b/packages/app/src/command-center/command-center.tsx
@@ -14,11 +14,7 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Check, ChevronRight, Folder, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  BottomSheetBackdrop,
-  BottomSheetFlatList,
-  type BottomSheetFlatListMethods,
-} from "@gorhom/bottom-sheet";
+import { BottomSheetFlatList, type BottomSheetFlatListMethods } from "@gorhom/bottom-sheet";
 import { AgentStatusDot } from "@/components/agent-status-dot";
 import { MaterialFileIcon } from "@/components/material-file-icon";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
@@ -718,12 +714,6 @@ export function CommandCenter() {
     layer: modalLayer,
     onKeyDown: handleWebOverlayKeyDown,
   });
-  const backdrop = useCallback(
-    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop {...props} disappearsOnIndex={-1} appearsOnIndex={0} opacity={0.45} />
-    ),
-    [],
-  );
 
   if (showBottomSheet) {
     return (
@@ -735,7 +725,7 @@ export function CommandCenter() {
         enableDynamicSizing={false}
         onChange={handleSheetChange}
         onDismiss={handleSheetDismiss}
-        backdropComponent={backdrop}
+        backdropOpacity={0.45}
         enablePanDownToClose
         backgroundStyle={styles.sheetBackground}
         handleIndicatorStyle={styles.sheetHandle}
diff --git a/packages/app/src/command-center/results.test.ts b/packages/app/src/command-center/results.test.ts
index d62ea92f35..4f6a43d704 100644
--- a/packages/app/src/command-center/results.test.ts
+++ b/packages/app/src/command-center/results.test.ts
@@ -363,11 +363,11 @@ describe("Command Center query tokenization", () => {
     }
   });
 
-  it("requires each token to be adjacent characters, not a subsequence", () => {
-    // Unlike the composer's slash-command list, where "/pasbab" finds "/paseo-babysit". Dropping
-    // the subsequence tier is what keeps "No matches" meaning no matches: this list preselects
-    // its first row, so a query that should find nothing must not put an action under Enter.
-    for (const query of ["labdes", "lbl", "lasdsgn"]) {
+  it("matches subsequences within words without joining separate words", () => {
+    expect(sectionResultIds(buildContributionSections([labelAsDesign()], "lbl dsgn"))).toEqual([
+      "label:design",
+    ]);
+    for (const query of ["labdes", "lasdsgn"]) {
       expect(sectionResultIds(buildContributionSections([labelAsDesign()], query)), query).toEqual(
         [],
       );
diff --git a/packages/app/src/command-center/results.ts b/packages/app/src/command-center/results.ts
index ff9d5c90ad..8f3528cd2c 100644
--- a/packages/app/src/command-center/results.ts
+++ b/packages/app/src/command-center/results.ts
@@ -126,8 +126,6 @@ export interface CommandCenterSearchFields {
   hidden: readonly string[];
 }
 
-const MATCH_OPTIONS = { subsequence: false } as const;
-
 /**
  * The one definition of "how well did this row match", shared by every scored row kind. Null
  * means the row is filtered out, so scoring and filtering are the same pass — a separate boolean
@@ -138,19 +136,17 @@ const MATCH_OPTIONS = { subsequence: false } as const;
  * only ever widen the result set: tokens hold no whitespace, so any token that was found in the
  * old space-joined haystack lies entirely within one field and is still found here.
  *
- * Subsequence matching is off, unlike the composer's slash-command list. Each token has to be a
- * run of adjacent characters, so `lab des` matches and `labdes` does not. It widens hard enough
- * that almost any typo finds something, and this list preselects its first row: a query the user
- * expects to find nothing would instead put an unrelated action under Enter.
+ * Subsequence matches stay within each word, so `lbl dsgn` finds "Label as Design"
+ * while `labdes` cannot assemble a match across those words.
  */
 export function scoreSearchFields(
   query: string,
   fields: CommandCenterSearchFields,
 ): CommandCenterScore | null {
-  const visible = scoreTextFields(query, [...fields.visible], MATCH_OPTIONS);
+  const visible = scoreTextFields(query, [...fields.visible]);
   if (visible) return { fieldRank: VISIBLE_FIELD_RANK, match: visible };
   if (fields.hidden.length === 0) return null;
-  const match = scoreTextFields(query, [...fields.visible, ...fields.hidden], MATCH_OPTIONS);
+  const match = scoreTextFields(query, [...fields.visible, ...fields.hidden]);
   return match ? { fieldRank: KEYWORD_FIELD_RANK, match } : null;
 }
 
diff --git a/packages/app/src/components/adaptive-modal-sheet-layout.test.ts b/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
index 308193d9d8..cc8ad8fc11 100644
--- a/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
@@ -1,34 +1,27 @@
 import { describe, expect, it } from "vitest";
-import {
-  getBottomSheetVisibleContentHeight,
-  getCompactSheetSafeAreaPadding,
-} from "@/components/adaptive-modal-sheet-layout";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
 
 describe("getCompactSheetSafeAreaPadding", () => {
-  it("adds the bottom inset to compact sheet footers", () => {
+  it("assigns safe clearance to the footer independently of decorative padding", () => {
     expect(
       getCompactSheetSafeAreaPadding({
         isCompact: true,
         isKeyboardVisible: false,
         hasFooter: true,
-        baseContentPadding: 24,
-        baseFooterPadding: 12,
         safeAreaBottom: 34,
       }),
-    ).toEqual({ footerPaddingBottom: 46 });
+    ).toEqual({ footerPaddingBottom: 34 });
   });
 
-  it("adds the bottom inset to compact sheet content when there is no footer", () => {
+  it("assigns safe clearance to the body only without a footer", () => {
     expect(
       getCompactSheetSafeAreaPadding({
         isCompact: true,
         isKeyboardVisible: false,
         hasFooter: false,
-        baseContentPadding: 24,
-        baseFooterPadding: 12,
         safeAreaBottom: 34,
       }),
-    ).toEqual({ contentPaddingBottom: 58 });
+    ).toEqual({ contentPaddingBottom: 34 });
   });
 
   it("does not add a safe-area band above the compact keyboard", () => {
@@ -37,8 +30,6 @@ describe("getCompactSheetSafeAreaPadding", () => {
         isCompact: true,
         isKeyboardVisible: true,
         hasFooter: false,
-        baseContentPadding: 24,
-        baseFooterPadding: 12,
         safeAreaBottom: 34,
       }),
     ).toEqual({});
@@ -50,24 +41,8 @@ describe("getCompactSheetSafeAreaPadding", () => {
         isCompact: false,
         isKeyboardVisible: false,
         hasFooter: false,
-        baseContentPadding: 24,
-        baseFooterPadding: 12,
         safeAreaBottom: 34,
       }),
     ).toEqual({});
   });
 });
-
-describe("getBottomSheetVisibleContentHeight", () => {
-  it("stops subtracting the retained keyboard height after the keyboard hides", () => {
-    const layout = {
-      containerHeight: 874,
-      contentPosition: 88,
-      handleHeight: 24,
-      keyboardHeight: 344,
-    };
-
-    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: true })).toBe(418);
-    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: false })).toBe(762);
-  });
-});
diff --git a/packages/app/src/components/adaptive-modal-sheet-layout.ts b/packages/app/src/components/adaptive-modal-sheet-layout.ts
index 123c0d337a..b38db5750c 100644
--- a/packages/app/src/components/adaptive-modal-sheet-layout.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.ts
@@ -2,8 +2,6 @@ export interface CompactSheetSafeAreaPaddingInput {
   isCompact: boolean;
   isKeyboardVisible: boolean;
   hasFooter: boolean;
-  baseContentPadding: number;
-  baseFooterPadding: number;
   safeAreaBottom: number;
 }
 
@@ -12,34 +10,10 @@ export interface CompactSheetSafeAreaPadding {
   footerPaddingBottom?: number;
 }
 
-interface BottomSheetVisibleContentHeightInput {
-  containerHeight: number;
-  contentPosition: number;
-  handleHeight: number;
-  keyboardHeight: number;
-  isKeyboardVisible: boolean;
-}
-
-export function getBottomSheetVisibleContentHeight({
-  containerHeight,
-  contentPosition,
-  handleHeight,
-  keyboardHeight,
-  isKeyboardVisible,
-}: BottomSheetVisibleContentHeightInput): number {
-  "worklet";
-  return Math.max(
-    0,
-    containerHeight - contentPosition - handleHeight - (isKeyboardVisible ? keyboardHeight : 0),
-  );
-}
-
 export function getCompactSheetSafeAreaPadding({
   isCompact,
   isKeyboardVisible,
   hasFooter,
-  baseContentPadding,
-  baseFooterPadding,
   safeAreaBottom,
 }: CompactSheetSafeAreaPaddingInput): CompactSheetSafeAreaPadding {
   if (!isCompact || isKeyboardVisible || safeAreaBottom <= 0) {
@@ -47,8 +21,8 @@ export function getCompactSheetSafeAreaPadding({
   }
 
   if (hasFooter) {
-    return { footerPaddingBottom: baseFooterPadding + safeAreaBottom };
+    return { footerPaddingBottom: safeAreaBottom };
   }
 
-  return { contentPaddingBottom: baseContentPadding + safeAreaBottom };
+  return { contentPaddingBottom: safeAreaBottom };
 }
diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx
index bd50928b7b..707c0e8622 100644
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -1,9 +1,9 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
-import { Modal, Platform, Pressable, ScrollView, Text, View } from "react-native";
-import type { StyleProp, ViewStyle } from "react-native";
+import { Keyboard, Pressable, Text, View } from "react-native";
+import type { DimensionValue, StyleProp, ViewStyle } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import {
@@ -12,24 +12,17 @@ import {
   useGlobalWebOverlayLayer,
   useWebOverlayRegistration,
 } from "../lib/overlay-root";
-import {
-  BottomSheetBackdrop,
-  BottomSheetScrollView,
-  KEYBOARD_STATUS,
-  useBottomSheetInternal,
-  type BottomSheetBackgroundProps,
-} from "@gorhom/bottom-sheet";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
+import Animated from "react-native-reanimated";
 import { ArrowLeft, Search, X } from "lucide-react-native";
 import {
   IsolatedBottomSheetModal,
+  SheetVisibleFrame,
   type ContextBridge,
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
-import {
-  getBottomSheetVisibleContentHeight,
-  getCompactSheetSafeAreaPadding,
-} from "@/components/adaptive-modal-sheet-layout";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
+import { ScrollView } from "@/components/ui/scroll-view";
 import { isWeb } from "@/constants/platform";
 import { useKeyboardVisibility } from "@/hooks/use-keyboard-visibility";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -42,6 +35,11 @@ export { AdaptiveTextInput, type AdaptiveTextInputProps } from "@/components/ada
 // match this padding.
 export const SHEET_HORIZONTAL_PADDING_SCALE = 6;
 
+// The header's close button grows outward from its glyph, so the glyph's
+// trailing rail is the content inset plus this padding. Rows whose trailing
+// glyph should line up with the X must reach the same rail.
+export const SHEET_HEADER_CLOSE_PADDING_SCALE = 2;
+
 export interface SheetHeaderSearch {
   onChange: (value: string) => void;
   onFocus?: () => void;
@@ -67,9 +65,17 @@ export interface SheetHeader {
   search?: SheetHeaderSearch;
 }
 
+const SCROLL_CONTENT_GROW = { flexGrow: 1 };
 const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFillObject };
+const NATIVE_DIALOG_SNAP_POINTS = ["100%"];
 
 const styles = StyleSheet.create((theme) => ({
+  nativeDialogSurface: {
+    flex: 1,
+  },
+  nativeDialogBackground: {
+    backgroundColor: "transparent",
+  },
   desktopOverlay: {
     ...StyleSheet.absoluteFillObject,
     backgroundColor: "rgba(0,0,0,0.55)",
@@ -79,6 +85,7 @@ const styles = StyleSheet.create((theme) => ({
     pointerEvents: "auto" as const,
   },
   desktopCard: {
+    overflow: "hidden",
     width: "100%",
     maxWidth: 520,
     maxHeight: "85%",
@@ -122,7 +129,7 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   closeButton: {
-    padding: theme.spacing[2],
+    padding: theme.spacing[SHEET_HEADER_CLOSE_PADDING_SCALE],
     borderRadius: theme.borderRadius.lg,
   },
   searchRow: {
@@ -169,6 +176,10 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
   },
   desktopScrollContainer: {
+    // Grows only when the card has an explicit `desktopHeight`; a content-sized
+    // card has nothing to grow into. Without it a fixed-height card with short
+    // content leaves the footer stranded in the middle.
+    flexGrow: 1,
     flexShrink: 1,
     minHeight: 0,
     position: "relative",
@@ -190,10 +201,6 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     minHeight: 0,
   },
-  bottomSheetVisibleContent: {
-    minHeight: 0,
-    overflow: "hidden",
-  },
   bottomSheetVisibleScroll: {
     flex: 1,
     minHeight: 0,
@@ -246,40 +253,6 @@ function SheetContent({ style, children }: { style: StyleProp<ViewStyle>; childr
   return <View style={[styles.sheetContent, style]}>{children}</View>;
 }
 
-function BottomSheetVisibleContent({ children }: { children: ReactNode }) {
-  const { animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition } =
-    useBottomSheetInternal();
-  const visibleContentStyle = useAnimatedStyle(() => {
-    const { containerHeight, handleHeight } = animatedLayoutState.get();
-    if (containerHeight < 0 || handleHeight < 0) {
-      return { height: 0 };
-    }
-
-    const initialDetentPosition = animatedDetentsState.get().detents?.[0];
-    const contentPosition =
-      initialDetentPosition == null
-        ? animatedPosition.get()
-        : Math.min(animatedPosition.get(), initialDetentPosition);
-
-    const keyboardState = animatedKeyboardState.get();
-    return {
-      height: getBottomSheetVisibleContentHeight({
-        containerHeight,
-        contentPosition,
-        handleHeight,
-        keyboardHeight: keyboardState.heightWithinContainer,
-        isKeyboardVisible: keyboardState.status === KEYBOARD_STATUS.SHOWN,
-      }),
-    };
-  }, [animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition]);
-
-  return (
-    <Animated.View style={[styles.bottomSheetVisibleContent, visibleContentStyle]}>
-      {children}
-    </Animated.View>
-  );
-}
-
 export function SheetHeaderView({
   header,
   onClose,
@@ -445,13 +418,16 @@ export interface AdaptiveModalSheetProps {
   testID?: string;
   /** Override the max width of the desktop card. */
   desktopMaxWidth?: number;
+  /** Bound an author-owned list without changing content-sized first-party dialogs. */
+  desktopHeight?: DimensionValue;
+  /** Whether the host supplies the scroll container. Caller-owned lists still share sheet gestures. */
   scrollable?: boolean;
   presentation?: "push" | "replace";
+  /** Full body viewport below the header, including space beyond the content. */
+  bodyStyle?: StyleProp<ViewStyle>;
   /** Layout intent for the sheet body, composed over the sheet's own content inset. */
   contentStyle?: StyleProp<ViewStyle>;
-  /** Size compact sheet content to the live snap height instead of its largest snap point. */
-  sizeContentToCurrentSnapPoint?: boolean;
-  /** Re-establishes caller-owned contexts inside the compact bottom-sheet portal. */
+  /** Re-establishes caller-owned contexts inside the native or compact sheet portal. */
   contextBridge?: ContextBridge | null;
 }
 
@@ -466,17 +442,18 @@ export function AdaptiveModalSheet({
   snapPoints,
   testID,
   desktopMaxWidth,
+  desktopHeight,
   scrollable = true,
   presentation,
   contentStyle,
-  sizeContentToCurrentSnapPoint = false,
+  bodyStyle,
   contextBridge = null,
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const isMobile = useIsCompactFormFactor();
   const insets = useSafeAreaInsets();
-  const isKeyboardVisible = useKeyboardVisibility();
+  const isKeyboardVisible = useKeyboardVisibility(visible);
   const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
   const compactSafeAreaPadding = useMemo(
     () =>
@@ -484,78 +461,58 @@ export function AdaptiveModalSheet({
         isCompact: isMobile,
         isKeyboardVisible,
         hasFooter: Boolean(footer),
-        baseContentPadding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
-        baseFooterPadding: theme.spacing[3],
         safeAreaBottom: insets.bottom,
       }),
-    [footer, insets.bottom, isKeyboardVisible, isMobile, theme.spacing],
+    [footer, insets.bottom, isKeyboardVisible, isMobile],
   );
-  const compactContentStyle = useMemo(
-    () => [
-      contentStyle,
-      compactSafeAreaPadding.contentPaddingBottom != null
-        ? { paddingBottom: compactSafeAreaPadding.contentPaddingBottom }
-        : null,
-    ],
-    [compactSafeAreaPadding.contentPaddingBottom, contentStyle],
+  // Safe-area clearance is a separate layer: it must not replace the caller's
+  // padding (including an explicit zero), and the footer owns it when present.
+  const bodyClearanceStyle = { paddingBottom: compactSafeAreaPadding.contentPaddingBottom ?? 0 };
+  const footerClearanceStyle = useMemo(
+    () => ({ paddingBottom: compactSafeAreaPadding.footerPaddingBottom ?? 0 }),
+    [compactSafeAreaPadding.footerPaddingBottom],
   );
-  const compactStaticContentStyle = useMemo(
-    () => [styles.compactStaticContent, compactContentStyle],
-    [compactContentStyle],
-  );
-  const desktopScrollContentStyle = useMemo(
-    () => [styles.contentGrow, contentStyle],
-    [contentStyle],
-  );
-  const desktopStaticContentStyle = useMemo(
-    () => [styles.desktopStaticContent, contentStyle],
-    [contentStyle],
-  );
-  const footerStyle = useMemo(
-    () => [
-      styles.footer,
-      footerContainerStyle,
-      compactSafeAreaPadding.footerPaddingBottom != null
-        ? { paddingBottom: compactSafeAreaPadding.footerPaddingBottom }
-        : null,
-    ],
-    [compactSafeAreaPadding.footerPaddingBottom, footerContainerStyle],
+  const footerView = useMemo(
+    () =>
+      footer ? (
+        <View style={footerClearanceStyle}>
+          <View style={[styles.footer, footerContainerStyle]}>{footer}</View>
+        </View>
+      ) : null,
+    [footer, footerClearanceStyle, footerContainerStyle],
   );
   const handleIndicatorStyle = useMemo(
     () => ({ backgroundColor: theme.colors.palette.zinc[600] }),
     [theme.colors.palette.zinc],
   );
+  useEffect(() => {
+    if (!isWeb && visible) {
+      // A newly opened sheet owns input. A keyboard belonging to the sheet below
+      // would cover controls in the new sheet, which has no focused input yet.
+      Keyboard.dismiss();
+    }
+  }, [visible]);
+
   const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
     visible,
-    isEnabled: isMobile,
+    isEnabled: isMobile || !isWeb,
     onClose,
   });
   const [shouldRenderWeb, setShouldRenderWeb] = useState(visible);
   const [isWebClosing, setIsWebClosing] = useState(false);
   const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && !isMobile && shouldRenderWeb);
-  const nativeModalDismissNotifiedRef = useRef(!visible);
   const handleDismiss = useCallback(() => {
     handleSheetDismiss();
     onDismiss?.();
   }, [handleSheetDismiss, onDismiss]);
-  const notifyNativeModalDismiss = useCallback(() => {
-    if (nativeModalDismissNotifiedRef.current) {
-      return;
-    }
-    nativeModalDismissNotifiedRef.current = true;
-    onDismiss?.();
-  }, [onDismiss]);
-
-  const renderBackdrop = useCallback(
-    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop {...props} disappearsOnIndex={-1} appearsOnIndex={0} opacity={0.45} />
-    ),
-    [],
-  );
 
   const desktopCardStyle = useMemo(
-    () => [styles.desktopCard, desktopMaxWidth != null && { maxWidth: desktopMaxWidth }],
-    [desktopMaxWidth],
+    () => [
+      styles.desktopCard,
+      desktopHeight != null && { height: desktopHeight },
+      desktopMaxWidth != null && { maxWidth: desktopMaxWidth },
+    ],
+    [desktopMaxWidth, desktopHeight],
   );
   const desktopOverlayStyle = useMemo(
     () => [
@@ -587,12 +544,6 @@ export function AdaptiveModalSheet({
     onKeyDown: handleWebOverlayKeyDown,
   });
 
-  useEffect(() => {
-    if (visible) {
-      nativeModalDismissNotifiedRef.current = false;
-    }
-  }, [visible]);
-
   useEffect(() => {
     if (!isWeb || isMobile) return;
     if (visible) {
@@ -610,28 +561,30 @@ export function AdaptiveModalSheet({
     return () => window.clearTimeout(timeout);
   }, [visible, isMobile, onDismiss, shouldRenderWeb]);
 
-  useEffect(() => {
-    if (isWeb || isMobile || visible || Platform.OS !== "android") return;
-    const timeout = setTimeout(notifyNativeModalDismiss, 0);
-    return () => clearTimeout(timeout);
-  }, [visible, isMobile, notifyNativeModalDismiss]);
-
   if (isMobile) {
     const sheetContent = (
       <>
         <SheetHeaderView header={header} onClose={onClose} testID={testID} />
-        {scrollable ? (
-          <BottomSheetScrollView
-            style={sizeContentToCurrentSnapPoint ? styles.bottomSheetVisibleScroll : undefined}
-            keyboardShouldPersistTaps="handled"
-            showsVerticalScrollIndicator={false}
-          >
-            <SheetContent style={compactContentStyle}>{children}</SheetContent>
-          </BottomSheetScrollView>
-        ) : (
-          <SheetContent style={compactStaticContentStyle}>{children}</SheetContent>
-        )}
-        {footer ? <View style={footerStyle}>{footer}</View> : null}
+        <View style={[styles.compactStaticContent, bodyStyle]}>
+          {scrollable ? (
+            <ScrollView
+              style={styles.bottomSheetVisibleScroll}
+              contentContainerStyle={SCROLL_CONTENT_GROW}
+              keyboardShouldPersistTaps="handled"
+              showsVerticalScrollIndicator={false}
+            >
+              <View style={[styles.contentGrow, bodyClearanceStyle]}>
+                <SheetContent style={[styles.contentGrow, contentStyle]}>{children}</SheetContent>
+              </View>
+            </ScrollView>
+          ) : (
+            <View style={[styles.compactStaticContent, bodyClearanceStyle]}>
+              <SheetContent style={[styles.compactStaticContent, contentStyle]}>
+                {children}
+              </SheetContent>
+            </View>
+          )}
+        </View>
       </>
     );
 
@@ -644,7 +597,7 @@ export function AdaptiveModalSheet({
         enableDynamicSizing={false}
         onChange={handleSheetChange}
         onDismiss={handleDismiss}
-        backdropComponent={renderBackdrop}
+        backdropOpacity={0.45}
         enablePanDownToClose
         backgroundComponent={SheetBackground}
         handleIndicatorStyle={handleIndicatorStyle}
@@ -653,33 +606,31 @@ export function AdaptiveModalSheet({
         accessible={false}
         presentation={presentation}
       >
-        {sizeContentToCurrentSnapPoint ? (
-          <BottomSheetVisibleContent>{sheetContent}</BottomSheetVisibleContent>
-        ) : (
-          sheetContent
-        )}
+        <SheetVisibleFrame footer={footerView}>{sheetContent}</SheetVisibleFrame>
       </IsolatedBottomSheetModal>
     );
   }
 
+  const desktopStaticStyle =
+    desktopHeight == null ? styles.desktopStaticContent : styles.compactStaticContent;
   const cardInner = (
     <OverlayLayerProvider layer={modalLayer}>
       <SheetHeaderView header={header} onClose={onClose} />
-      {scrollable ? (
-        <View style={styles.desktopScrollContainer}>
+      <View style={[scrollable ? styles.desktopScrollContainer : desktopStaticStyle, bodyStyle]}>
+        {scrollable ? (
           <ScrollView
             style={styles.desktopScroll}
-            contentContainerStyle={styles.contentGrow}
+            contentContainerStyle={SCROLL_CONTENT_GROW}
             keyboardShouldPersistTaps="handled"
             showsVerticalScrollIndicator
           >
-            <SheetContent style={desktopScrollContentStyle}>{children}</SheetContent>
+            <SheetContent style={[styles.contentGrow, contentStyle]}>{children}</SheetContent>
           </ScrollView>
-        </View>
-      ) : (
-        <SheetContent style={desktopStaticContentStyle}>{children}</SheetContent>
-      )}
-      {footer ? <View style={footerStyle}>{footer}</View> : null}
+        ) : (
+          <SheetContent style={[desktopStaticStyle, contentStyle]}>{children}</SheetContent>
+        )}
+      </View>
+      {footerView}
     </OverlayLayerProvider>
   );
 
@@ -709,15 +660,28 @@ export function AdaptiveModalSheet({
   }
 
   return (
-    <Modal
-      transparent
-      animationType="fade"
-      visible={visible}
-      onRequestClose={onClose}
-      onDismiss={notifyNativeModalDismiss}
-      hardwareAccelerated
+    // Both native presentations share Gorhom's app-wide stack. Independent RN Modals
+    // present from their React ancestor's controller, so a root-owned sibling dialog
+    // cannot present while that controller already has a dialog open on iOS.
+    <IsolatedBottomSheetModal
+      ref={sheetRef}
+      contextBridge={contextBridge}
+      snapPoints={NATIVE_DIALOG_SNAP_POINTS}
+      index={0}
+      enableDynamicSizing={false}
+      onChange={handleSheetChange}
+      onDismiss={handleDismiss}
+      handleComponent={null}
+      backgroundStyle={styles.nativeDialogBackground}
+      enablePanDownToClose={false}
+      enableHandlePanningGesture={false}
+      enableContentPanningGesture={false}
+      keyboardBehavior="extend"
+      keyboardBlurBehavior="restore"
+      accessible={false}
+      presentation={presentation}
     >
-      {desktopContent}
-    </Modal>
+      <View style={styles.nativeDialogSurface}>{desktopContent}</View>
+    </IsolatedBottomSheetModal>
   );
 }
diff --git a/packages/app/src/components/add-host-modal.tsx b/packages/app/src/components/add-host-modal.tsx
index ea91e57621..bf364f1040 100644
--- a/packages/app/src/components/add-host-modal.tsx
+++ b/packages/app/src/components/add-host-modal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useReducer, useState } from "react";
+import { useCallback, useMemo, useReducer, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
@@ -11,9 +11,13 @@ import {
   serializeConnectionUri,
   serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
-import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
+import {
+  DaemonConnectionTestError,
+  getConnectionAuthFailureReason,
+} from "@/utils/test-daemon-connection";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
+import { PairingTargetTracker } from "./pair-link-credentials";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 
@@ -250,8 +254,8 @@ function buildConnectionFailureCopy(input: {
   const rawLower = raw?.toLowerCase() ?? "";
   let detail: string | null = null;
 
-  if (raw === "Incorrect password" || raw === "Password required") {
-    detail = raw;
+  if (getConnectionAuthFailureReason(error)) {
+    detail = error instanceof Error ? error.message : raw;
   } else if (rawLower.includes("timed out")) {
     detail = labels.timedOut;
   } else if (
@@ -290,10 +294,23 @@ export interface AddHostModalProps {
 }
 
 export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
+  return (
+    <AddHostModalContent
+      key={String(visible)}
+      visible={visible}
+      onClose={onClose}
+      onCancel={onCancel}
+      onSaved={onSaved}
+    />
+  );
+}
+
+function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const daemons = useHosts();
-  const { probeAndUpsertDirectConnection } = useHostMutations();
+  const { probeAndUpsertDirectConnection, beginLinkPairing } = useHostMutations();
+  const [linkPairing] = useState(() => beginLinkPairing());
   const isMobile = useIsCompactFormFactor();
 
   const [isSaving, setIsSaving] = useState(false);
@@ -306,17 +323,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
   const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
   const [advancedUri, setAdvancedUri] = useState("");
   const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
-
-  const clearInput = useCallback(() => {
-    setHost("");
-    setPort("6767");
-    setUseTls(false);
-    setPassword("");
-    setIsPasswordVisible(false);
-    setIsAdvancedOpen(false);
-    setAdvancedUri("");
-    bumpInputResetKey();
-  }, []);
+  const advancedTarget = useRef(new PairingTargetTracker("", true));
 
   const connectIcon = useMemo(
     () => <Link2 size={16} color={theme.colors.accentForeground} />,
@@ -351,23 +358,55 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
   );
   const header = useMemo<SheetHeader>(() => ({ title: t("pairing.direct.title") }), [t]);
 
+  // Each open mounts a fresh form (see AddHostModal), so closing needs no reset.
   const handleClose = useCallback(() => {
     if (isSaving) return;
-    clearInput();
-    setErrorMessage("");
     onClose();
-  }, [isSaving, clearInput, onClose]);
+  }, [isSaving, onClose]);
 
   const handleCancel = useCallback(() => {
     if (isSaving) return;
-    clearInput();
-    setErrorMessage("");
     (onCancel ?? onClose)();
-  }, [isSaving, clearInput, onCancel, onClose]);
+  }, [isSaving, onCancel, onClose]);
+
+  const handleSaveRelay = useCallback(
+    async (relayUri: string) => {
+      try {
+        setIsSaving(true);
+        setErrorMessage("");
+        const result = await linkPairing.submit(relayUri, password || undefined);
+        if (result.status === "cancelled") return;
+        const { profile, serverId, hostname } = result;
+        const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);
+        onSaved?.({ profile, serverId, hostname, isNewHost });
+        handleClose();
+      } catch (error) {
+        setErrorMessage(
+          error instanceof Error ? error.message : directConnectionLabels.invalidConnection,
+        );
+      } finally {
+        setIsSaving(false);
+      }
+    },
+    [
+      daemons,
+      directConnectionLabels.invalidConnection,
+      handleClose,
+      linkPairing,
+      onSaved,
+      password,
+    ],
+  );
 
   const handleSave = useCallback(async () => {
     if (isSaving) return;
 
+    const relayUri = isAdvancedOpen ? advancedUri.trim() : "";
+    if (relayUri.startsWith("relay://") || relayUri.includes("#connect=")) {
+      await handleSaveRelay(relayUri);
+      return;
+    }
+
     let connection: PreparedDirectConnection;
     try {
       connection = prepareDirectConnection(
@@ -422,10 +461,12 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
       setIsSaving(false);
     }
   }, [
+    advancedUri,
     daemons,
     directConnectionLabels,
     handleClose,
     host,
+    isAdvancedOpen,
     isMobile,
     isSaving,
     onSaved,
@@ -433,6 +474,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
     port,
     probeAndUpsertDirectConnection,
     t,
+    handleSaveRelay,
     useTls,
   ]);
 
@@ -444,6 +486,15 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
     void handleSave();
   }, [handleSave]);
 
+  const handleChangeAdvancedUri = useCallback((next: string) => {
+    if (advancedTarget.current.changeUrl(next)) {
+      setPassword("");
+      bumpInputResetKey();
+      setErrorMessage("");
+    }
+    setAdvancedUri(next);
+  }, []);
+
   const handleToggleUseTls = useCallback(() => {
     if (isSaving) return;
     setUseTls((current) => !current);
@@ -455,6 +506,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
 
   const handleToggleAdvanced = useCallback(() => {
     if (!isAdvancedOpen) {
+      advancedTarget.current = new PairingTargetTracker("", true);
       try {
         setAdvancedUri(
           buildConnectionUriFromDraft({ host, port, useTls, password }, directConnectionLabels),
@@ -612,7 +664,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             accessibilityLabel={t("pairing.direct.fields.connectionUri")}
             initialValue={advancedUri}
             resetKey={`direct-host-uri-${inputResetKey}`}
-            onChangeText={setAdvancedUri}
+            onChangeText={handleChangeAdvancedUri}
             placeholder="tcp://localhost:6767?ssl=true"
             placeholderTextColor={theme.colors.foregroundMuted}
             style={styles.input}
diff --git a/packages/app/src/components/add-project-flow.tsx b/packages/app/src/components/add-project-flow.tsx
index 80cc9075be..d874a73618 100644
--- a/packages/app/src/components/add-project-flow.tsx
+++ b/packages/app/src/components/add-project-flow.tsx
@@ -1,3 +1,4 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { router } from "expo-router";
 import type { WorkspaceProjectDescriptorPayload } from "@getpaseo/protocol/messages";
 import {
@@ -5,7 +6,6 @@ import {
   Folder,
   FolderOpen,
   FolderPlus,
-  Github,
   HardDrive,
   Plus,
   Search,
@@ -33,6 +33,7 @@ import {
   type EditingTextInputHandle,
 } from "@/components/ui/text-input";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { GitHubIcon } from "@/components/icons/github-icon";
 import {
   applyAvailableAddProjectHosts,
   backAddProjectPage,
@@ -161,7 +162,7 @@ function FlowBackButton({ onPress }: { onPress: () => void }) {
 }
 
 function methodIcon(method: AddProjectMethodId): FlowRowOption["icon"] {
-  if (method === "github") return Github;
+  if (method === "github") return GitHubIcon;
   if (method === "browse") return FolderOpen;
   if (method === "new-directory") return FolderPlus;
   return Search;
@@ -372,7 +373,15 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
   const recommendedPaths = useRecommendedProjectPaths(hostId);
   const openProject = useOpenProject(hostId);
   const cloneGithubProject = useCloneGithubProject(hostId);
-  const upsertProject = useSessionStore((store) => store.upsertProject);
+  const upsertProject = useCallback(
+    (
+      targetServerId: string,
+      project: Parameters<ReturnType<typeof getHostRuntimeStore>["acceptProjectSnapshot"]>[1],
+    ) => {
+      getHostRuntimeStore().acceptProjectSnapshot(targetServerId, project);
+    },
+    [],
+  );
   const setHasHydratedWorkspaces = useSessionStore((store) => store.setHasHydratedWorkspaces);
   const inputRef = useRef<EditingTextInputHandle>(null);
   const submissionInFlightRef = useRef(false);
@@ -647,7 +656,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
           ? `${repository.nameWithOwner} via ${repository.cloneProtocol.toUpperCase()}`
           : repository.nameWithOwner,
         subtitle: repository.description,
-        icon: Github,
+        icon: GitHubIcon,
         testID: `add-project-flow-repository-${repository.id}`,
         select: () =>
           setState((current) => openGithubLocationPage(current, page.hostId, repository)),
diff --git a/packages/app/src/components/add-remote-ssh-host-modal.tsx b/packages/app/src/components/add-remote-ssh-host-modal.tsx
index 2e3e369f39..c7e25bce64 100644
--- a/packages/app/src/components/add-remote-ssh-host-modal.tsx
+++ b/packages/app/src/components/add-remote-ssh-host-modal.tsx
@@ -1,13 +1,25 @@
 import { useCallback, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
+import {
+  Pressable,
+  Text,
+  View,
+  type PressableStateCallbackType,
+  type StyleProp,
+  type ViewStyle,
+} from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Terminal } from "lucide-react-native";
+import { Eye, EyeOff, Terminal } from "lucide-react-native";
 import { parseSshTransportUri } from "@getpaseo/protocol/ssh-transport";
 import type { HostProfile } from "@/types/host-connection";
 import { useHostMutations, useHosts } from "@/runtime/host-runtime";
 import { Button } from "@/components/ui/button";
 import { Field, FormTextInput } from "@/components/ui/form-field";
+import {
+  CONTROL_HEIGHTS,
+  createControlGeometry,
+  resolveControlInteractionStyles,
+} from "@/components/ui/control-geometry";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
@@ -15,18 +27,64 @@ import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 const ThemedTerminal = withUnistyles(Terminal);
+const ThemedEye = withUnistyles(Eye, (theme) => ({ color: theme.colors.foregroundMuted }));
+const ThemedEyeOff = withUnistyles(EyeOff, (theme) => ({ color: theme.colors.foregroundMuted }));
 
-const styles = StyleSheet.create((theme) => ({
-  helper: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  actions: {
-    flexDirection: "row",
-    gap: theme.spacing[3],
-    marginTop: theme.spacing[2],
-  },
-}));
+const styles = StyleSheet.create((theme) => {
+  const geometry = createControlGeometry(theme);
+  return {
+    helper: {
+      color: theme.colors.foregroundMuted,
+      fontSize: theme.fontSize.sm,
+    },
+    passwordRow: {
+      flexDirection: "row",
+      alignItems: "center",
+      alignSelf: "stretch",
+      width: "100%",
+      gap: theme.spacing[2],
+    },
+    passwordInputWrap: {
+      flex: 1,
+      minWidth: 0,
+    },
+    // Boxed adornment next to the field: same height and radius as the field
+    // chrome of the active form size, and the shared interaction phases.
+    iconButtonSm: {
+      minHeight: CONTROL_HEIGHTS.compact,
+      width: CONTROL_HEIGHTS.compact,
+      alignItems: "center",
+      justifyContent: "center",
+      borderRadius: theme.borderRadius.md,
+      backgroundColor: theme.colors.surface2,
+    },
+    iconButtonMd: {
+      minHeight: CONTROL_HEIGHTS.field,
+      width: CONTROL_HEIGHTS.field,
+      alignItems: "center",
+      justifyContent: "center",
+      borderRadius: theme.borderRadius.lg,
+      backgroundColor: theme.colors.surface2,
+    },
+    controlRest: {
+      ...geometry.controlRest,
+    },
+    controlHover: {
+      ...geometry.controlHover,
+    },
+    controlActive: {
+      ...geometry.controlActive,
+    },
+    controlDisabled: {
+      ...geometry.controlDisabled,
+    },
+    actions: {
+      flexDirection: "row",
+      gap: theme.spacing[3],
+      marginTop: theme.spacing[2],
+    },
+  };
+});
 
 export interface AddRemoteSshHostModalProps {
   visible: boolean;
@@ -51,14 +109,20 @@ export function AddRemoteSshHostModal({
   const isCompact = useIsCompactFormFactor();
   const { probeAndUpsertRemoteSshConnection } = useHostMutations();
   const targetRef = useRef("");
+  const passwordRef = useRef("");
   const inputRef = useRef<EditingTextInputHandle>(null);
+  const passwordInputRef = useRef<EditingTextInputHandle>(null);
+  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
   const header = useMemo<SheetHeader>(() => ({ title: t("pairing.remoteSsh.title") }), [t]);
 
   const clear = useCallback(() => {
     targetRef.current = "";
+    passwordRef.current = "";
     inputRef.current?.replaceText("");
+    passwordInputRef.current?.replaceText("");
+    setIsPasswordVisible(false);
     setErrorMessage("");
   }, []);
 
@@ -94,7 +158,10 @@ export function AddRemoteSshHostModal({
     try {
       setIsSaving(true);
       setErrorMessage("");
-      result = await probeAndUpsertRemoteSshConnection(target);
+      result = await probeAndUpsertRemoteSshConnection({
+        ...target,
+        password: passwordRef.current === "" ? undefined : passwordRef.current,
+      });
     } catch (error) {
       const message =
         error instanceof DaemonConnectionTestError
@@ -116,6 +183,34 @@ export function AddRemoteSshHostModal({
   const handleTargetChange = useCallback((value: string) => {
     targetRef.current = value;
   }, []);
+  const handlePasswordChange = useCallback((value: string) => {
+    passwordRef.current = value;
+  }, []);
+  const handleTogglePasswordVisibility = useCallback(() => {
+    setIsPasswordVisible((currentlyVisible) => !currentlyVisible);
+  }, []);
+  const iconButtonStyle = useCallback(
+    (
+      state: PressableStateCallbackType & { hovered?: boolean; focused?: boolean },
+    ): StyleProp<ViewStyle> => [
+      isCompact ? styles.iconButtonMd : styles.iconButtonSm,
+      resolveControlInteractionStyles(
+        {
+          controlRest: styles.controlRest,
+          controlHover: styles.controlHover,
+          controlActive: styles.controlActive,
+          controlDisabled: styles.controlDisabled,
+        },
+        {
+          hovered: state.hovered,
+          pressed: state.pressed,
+          focused: state.focused,
+          disabled: isSaving,
+        },
+      ),
+    ],
+    [isCompact, isSaving],
+  );
   const handleSubmit = useCallback(() => void handleSave(), [handleSave]);
 
   return (
@@ -146,6 +241,41 @@ export function AddRemoteSshHostModal({
           onSubmitEditing={handleSubmit}
         />
       </Field>
+      <Field label={t("pairing.remoteSsh.fields.password")} testID="remote-ssh-password">
+        <View style={styles.passwordRow}>
+          <View style={styles.passwordInputWrap}>
+            <FormTextInput
+              ref={passwordInputRef}
+              size={isCompact ? "md" : "sm"}
+              testID="remote-ssh-password-input"
+              accessibilityLabel={t("pairing.remoteSsh.fields.password")}
+              initialValue=""
+              onChangeText={handlePasswordChange}
+              placeholder={t("pairing.remoteSsh.fields.optional")}
+              autoCapitalize="none"
+              autoCorrect={false}
+              secureTextEntry={!isPasswordVisible}
+              editable={!isSaving}
+              returnKeyType="done"
+              onSubmitEditing={handleSubmit}
+            />
+          </View>
+          <Pressable
+            style={iconButtonStyle}
+            onPress={handleTogglePasswordVisibility}
+            disabled={isSaving}
+            accessibilityRole="button"
+            accessibilityLabel={
+              isPasswordVisible
+                ? t("pairing.remoteSsh.passwordVisibility.hide")
+                : t("pairing.remoteSsh.passwordVisibility.show")
+            }
+            testID="remote-ssh-password-visibility-toggle"
+          >
+            {isPasswordVisible ? <ThemedEyeOff size={18} /> : <ThemedEye size={18} />}
+          </Pressable>
+        </View>
+      </Field>
       <View style={styles.actions}>
         <Button
           style={FLEX_ONE_STYLE}
diff --git a/packages/app/src/components/agent-list.tsx b/packages/app/src/components/agent-list.tsx
index 5083d63916..7da36742ae 100644
--- a/packages/app/src/components/agent-list.tsx
+++ b/packages/app/src/components/agent-list.tsx
@@ -14,17 +14,16 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { formatTimeAgo } from "@/utils/time";
+import { useTimeAgo } from "@/hooks/use-time-ago";
 import { type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useSessionStore } from "@/stores/session-store";
 import { Archive, ChevronRight } from "lucide-react-native";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
 import { HighlightedText } from "@/components/ui/highlighted-text";
 import { StatusBadge, type StatusBadgeVariant } from "@/components/ui/status-badge";
-import type { AgentSearchMatch } from "@getpaseo/protocol/messages";
-import type { MatchRange } from "@getpaseo/protocol/search/text-match";
+import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 
 interface AgentListProps {
   agents: AggregatedAgent[];
@@ -36,18 +35,7 @@ interface AgentListProps {
   listFooterComponent?: ReactElement | null;
   showAttentionIndicator?: boolean;
   showHostColumn?: boolean;
-  /**
-   * Where a search matched each row, keyed by `serverId:agentId`. Rows mark the
-   * spans so the list can explain why a result is in it — the subsequence and
-   * typo tiers match characters the eye would not find on its own.
-   */
-  searchMatchesByAgentKey?: Record<string, AgentSearchMatch[]>;
-  /**
-   * Renders one flat list in the given order instead of grouping by day. Day
-   * headings claim the list is chronological, which is a lie once the caller
-   * has ordered it by something else — relevance, for instance.
-   */
-  flat?: boolean;
+  search?: string;
 }
 
 type DateSectionKey = "today" | "yesterday" | "thisWeek" | "thisMonth" | "older";
@@ -122,39 +110,6 @@ function SessionBadge({
   return <StatusBadge label={label} variant={variant} leading={icon} />;
 }
 
-function WorkspaceTitlePrefix({
-  visible,
-  workspaceName,
-  ranges,
-  testID,
-  iconSize,
-  color,
-}: {
-  visible: boolean;
-  workspaceName: string;
-  ranges?: readonly MatchRange[];
-  testID: string;
-  iconSize: number;
-  color: string;
-}) {
-  if (!visible) {
-    return null;
-  }
-
-  return (
-    <>
-      <HighlightedText
-        text={workspaceName}
-        ranges={ranges}
-        style={styles.workspaceTitleText}
-        numberOfLines={1}
-        testID={testID}
-      />
-      <ChevronRight size={iconSize} color={color} />
-    </>
-  );
-}
-
 function SessionRowBadges({
   agent,
   archivedIcon,
@@ -207,7 +162,7 @@ function SessionRowTrailingAttention({
 
 function SessionRow({
   agent,
-  searchMatches,
+  search,
   isMobile,
   selectedAgentId,
   showAttentionIndicator,
@@ -216,7 +171,7 @@ function SessionRow({
   onLongPress,
 }: {
   agent: AggregatedAgent;
-  searchMatches?: readonly AgentSearchMatch[];
+  search?: string;
   isMobile: boolean;
   selectedAgentId?: string;
   showAttentionIndicator: boolean;
@@ -226,18 +181,21 @@ function SessionRow({
 }) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
-  const timeAgo = formatTimeAgo(agent.lastActivityAt);
   const agentKey = `${agent.serverId}:${agent.id}`;
   const isSelected = selectedAgentId === agentKey;
   const projectName = agent.projectPlacement?.projectName ?? "";
   const branch = agent.projectPlacement?.checkout.currentBranch ?? "";
   const workspaceName = agent.projectPlacement?.workspaceName ?? "";
-  const ProviderIcon = getProviderIcon(agent.provider);
+  const ProviderIcon = useProviderIcon(agent.provider, agent.serverId);
   const pendingPermissionCount = agent.pendingPermissionCount ?? 0;
-  const rangesFor = useCallback(
-    (field: AgentSearchMatch["field"]) =>
-      searchMatches?.find((match) => match.field === field)?.ranges,
-    [searchMatches],
+  const ranges = useMemo(
+    () => ({
+      workspace: findHighlightRanges(search ?? "", workspaceName),
+      title: findHighlightRanges(search ?? "", agent.title ?? ""),
+      branch: findHighlightRanges(search ?? "", branch),
+      project: findHighlightRanges(search ?? "", projectName),
+    }),
+    [search, workspaceName, agent.title, branch, projectName],
   );
 
   const pressableStyle = useCallback(
@@ -253,11 +211,6 @@ function SessionRow({
   const handlePress = useCallback(() => onPress(agent), [onPress, agent]);
   const handleLongPress = useCallback(() => onLongPress(agent), [onLongPress, agent]);
 
-  const sessionTitleStyle = useMemo(
-    () => [styles.sessionTitle, isSelected && styles.sessionTitleHighlighted],
-    [isSelected],
-  );
-
   const archivedIcon = useMemo(
     () => <Archive size={theme.fontSize.sm} color={theme.colors.foregroundMuted} />,
     [theme.fontSize.sm, theme.colors.foregroundMuted],
@@ -265,32 +218,44 @@ function SessionRow({
   const showDesktopAttention =
     !isMobile && showAttentionIndicator && Boolean(agent.requiresAttention);
 
+  const agentTitle = (
+    <View style={styles.agentTitleRow}>
+      <View style={styles.providerIconWrap}>
+        <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+      </View>
+      <HighlightedText
+        text={agent.title || t("agentList.fallbackTitle")}
+        ranges={ranges.title}
+        style={styles.sessionTitle}
+        numberOfLines={1}
+        testID={`agent-row-title-${agent.serverId}-${agent.id}`}
+      />
+    </View>
+  );
+
   return (
     <Pressable
       style={pressableStyle}
       onPress={handlePress}
       onLongPress={handleLongPress}
+      accessibilityRole="button"
       testID={`agent-row-${agent.serverId}-${agent.id}`}
     >
       <View style={styles.rowContent}>
         <View style={styles.rowTitleRow}>
-          <WorkspaceTitlePrefix
-            visible={!isMobile && Boolean(workspaceName)}
-            workspaceName={workspaceName}
-            ranges={rangesFor("workspace")}
-            testID={`agent-row-workspace-${agent.serverId}-${agent.id}`}
-            iconSize={theme.iconSize.xs}
-            color={theme.colors.foregroundMuted}
-          />
-          <View style={styles.providerIconWrap}>
-            <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-          </View>
           <HighlightedText
-            text={agent.title || t("agentList.fallbackTitle")}
-            ranges={agent.title ? rangesFor("title") : undefined}
-            style={sessionTitleStyle}
+            text={workspaceName || projectName}
+            ranges={workspaceName ? ranges.workspace : ranges.project}
+            style={styles.workspaceTitleText}
             numberOfLines={1}
+            testID={`agent-row-workspace-${agent.serverId}-${agent.id}`}
           />
+          {!isMobile ? (
+            <>
+              <ChevronRight size={theme.iconSize.xs} color={theme.colors.foregroundMuted} />
+              {agentTitle}
+            </>
+          ) : null}
           <SessionRowBadges
             agent={agent}
             archivedIcon={archivedIcon}
@@ -298,11 +263,12 @@ function SessionRow({
             showDesktopAttention={showDesktopAttention}
           />
         </View>
+        {isMobile ? agentTitle : null}
         {isMobile ? (
           <View style={styles.rowMetaRow}>
             <HighlightedText
               text={projectName}
-              ranges={rangesFor("project")}
+              ranges={ranges.project}
               style={styles.sessionMetaText}
               numberOfLines={1}
               testID={`agent-row-project-${agent.serverId}-${agent.id}`}
@@ -310,21 +276,13 @@ function SessionRow({
             <Text style={styles.sessionMetaSeparator}>·</Text>
             <HighlightedText
               text={branch}
-              ranges={rangesFor("branch")}
+              ranges={ranges.branch}
               style={styles.sessionMetaText}
               numberOfLines={1}
               testID={`agent-row-branch-${agent.serverId}-${agent.id}`}
             />
             <Text style={styles.sessionMetaSeparator}>·</Text>
-            <HighlightedText
-              text={workspaceName}
-              ranges={rangesFor("workspace")}
-              style={styles.sessionMetaText}
-              numberOfLines={1}
-              testID={`agent-row-workspace-${agent.serverId}-${agent.id}`}
-            />
-            <Text style={styles.sessionMetaSeparator}>·</Text>
-            <Text style={styles.sessionMetaText}>{timeAgo}</Text>
+            <AgentActivityTime date={agent.lastActivityAt} isMobile />
             {showHostColumn && agent.serverLabel ? (
               <>
                 <Text style={styles.sessionMetaSeparator}>·</Text>
@@ -340,7 +298,7 @@ function SessionRow({
         <View style={styles.rowColumns}>
           <HighlightedText
             text={projectName}
-            ranges={rangesFor("project")}
+            ranges={ranges.project}
             style={styles.columnMeta}
             numberOfLines={1}
             testID={`agent-row-project-${agent.serverId}-${agent.id}`}
@@ -352,14 +310,12 @@ function SessionRow({
           ) : null}
           <HighlightedText
             text={branch}
-            ranges={rangesFor("branch")}
+            ranges={ranges.branch}
             style={styles.columnMeta}
             numberOfLines={1}
             testID={`agent-row-branch-${agent.serverId}-${agent.id}`}
           />
-          <Text style={styles.columnMetaFixed} numberOfLines={1}>
-            {timeAgo}
-          </Text>
+          <AgentActivityTime date={agent.lastActivityAt} isMobile={false} />
         </View>
       ) : null}
       <SessionRowTrailingAttention
@@ -371,6 +327,15 @@ function SessionRow({
   );
 }
 
+function AgentActivityTime({ date, isMobile }: { date: Date; isMobile: boolean }) {
+  const label = useTimeAgo(date);
+  return (
+    <Text style={isMobile ? styles.sessionMetaText : styles.columnMetaFixed} numberOfLines={1}>
+      {label}
+    </Text>
+  );
+}
+
 export function AgentList({
   agents,
   isRefreshing = false,
@@ -380,8 +345,7 @@ export function AgentList({
   listFooterComponent,
   showAttentionIndicator = true,
   showHostColumn = false,
-  searchMatchesByAgentKey,
-  flat = false,
+  search,
 }: AgentListProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
@@ -449,14 +413,6 @@ export function AgentList({
   }, [actionAgent, actionClient, archiveAgent]);
 
   const flatItems = useMemo((): FlatListItem[] => {
-    if (flat) {
-      return agents.map((agent) => ({
-        type: "agent" as const,
-        key: `${agent.serverId}:${agent.id}`,
-        agent,
-      }));
-    }
-
     const buckets = new Map<DateSectionKey, AggregatedAgent[]>();
     for (const agent of agents) {
       const section = deriveDateSectionKey(agent.lastActivityAt);
@@ -477,7 +433,7 @@ export function AgentList({
       }
     }
     return result;
-  }, [agents, flat]);
+  }, [agents]);
 
   const renderItem: ListRenderItem<FlatListItem> = useCallback(
     ({ item }) => {
@@ -491,7 +447,7 @@ export function AgentList({
       return (
         <SessionRow
           agent={item.agent}
-          searchMatches={searchMatchesByAgentKey?.[item.key]}
+          search={search}
           isMobile={isMobile}
           selectedAgentId={selectedAgentId}
           showAttentionIndicator={showAttentionIndicator}
@@ -505,7 +461,7 @@ export function AgentList({
       handleAgentLongPress,
       handleAgentPress,
       isMobile,
-      searchMatchesByAgentKey,
+      search,
       selectedAgentId,
       showAttentionIndicator,
       showHostColumn,
@@ -647,16 +603,21 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
     overflow: "hidden",
   },
-  providerIconWrap: {
-    width: theme.iconSize.md,
+  agentTitleRow: {
+    flexDirection: "row",
     alignItems: "center",
-    justifyContent: "center",
+    gap: theme.spacing[2],
+    flexShrink: 1,
+    minWidth: 0,
+  },
+  providerIconWrap: {
+    flexShrink: 0,
   },
   workspaceTitleText: {
-    flexShrink: 0,
-    maxWidth: 220,
+    flexShrink: { xs: 1, md: 0 },
+    maxWidth: { xs: "100%", md: 320 },
     fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
+    color: theme.colors.foreground,
   },
   rowMetaRow: {
     flexDirection: "row",
@@ -682,11 +643,7 @@ const styles = StyleSheet.create((theme) => ({
     minWidth: 0,
     fontSize: theme.fontSize.base,
     fontWeight: "400",
-    color: theme.colors.foreground,
-    opacity: 0.86,
-  },
-  sessionTitleHighlighted: {
-    opacity: 1,
+    color: theme.colors.foregroundMuted,
   },
   sessionMetaText: {
     maxWidth: "100%",
diff --git a/packages/app/src/components/appearance-style-boundary.test.ts b/packages/app/src/components/appearance-style-boundary.test.ts
index a92278cce5..da6fb85c45 100644
--- a/packages/app/src/components/appearance-style-boundary.test.ts
+++ b/packages/app/src/components/appearance-style-boundary.test.ts
@@ -1,3 +1,5 @@
+import { readFileSync } from "node:fs";
+import ts from "typescript";
 import { describe, expect, it } from "vitest";
 import { darkTheme } from "@/styles/theme";
 import { appearanceStyleBoundaryKey } from "./appearance-style-boundary";
@@ -14,3 +16,58 @@ describe("appearanceStyleBoundaryKey", () => {
     );
   });
 });
+
+// This is a placement contract against the production JSX, not a simulated native mount.
+// Native Gesture Handler/Fabric lifetime behavior is verified on the release app.
+describe("retained native gesture host appearance placement", () => {
+  it.each([
+    ["../app/_layout.tsx", ["sidebarChrome", "themedSidebarChrome"]],
+    [
+      "./compact-explorer-sidebar-host.tsx",
+      ["explorer", "themedExplorer", "CompactExplorerSidebar", "NativeExplorerSidebarDock"],
+    ],
+  ] as const)("keeps native hosts outside appearance keys in %s", (path, hosts) => {
+    const source = ts.createSourceFile(
+      path,
+      readFileSync(new URL(path, import.meta.url), "utf8"),
+      ts.ScriptTarget.Latest,
+      true,
+      ts.ScriptKind.TSX,
+    );
+    let hostsFound = 0;
+    let webKeysFound = 0;
+    function visit(node: ts.Node) {
+      let name: string | undefined;
+      if (ts.isIdentifier(node)) name = node.text;
+      if (ts.isJsxSelfClosingElement(node)) name = node.tagName.getText(source);
+      if (name && hosts.some((host) => host === name)) {
+        hostsFound++;
+        let webOnly = false;
+        let keyed = false;
+        for (
+          let child = node, parent = node.parent;
+          parent;
+          child = parent, parent = parent.parent
+        ) {
+          if (
+            ts.isIfStatement(parent) &&
+            parent.expression.getText(source) === "isWeb" &&
+            parent.thenStatement === child
+          )
+            webOnly = true;
+          if (
+            ts.isJsxElement(parent) &&
+            parent.openingElement.tagName.getText(source) === "AppearanceStyleBoundary"
+          )
+            keyed = true;
+        }
+        if (keyed && webOnly) webKeysFound++;
+        expect(keyed && !webOnly, `${name} is remounted on native appearance changes`).toBe(false);
+      }
+      ts.forEachChild(node, visit);
+    }
+    visit(source);
+    expect(hostsFound).toBeGreaterThan(0);
+    expect(webKeysFound).toBeGreaterThan(0);
+  });
+});
diff --git a/packages/app/src/components/appearance-style-boundary.tsx b/packages/app/src/components/appearance-style-boundary.tsx
index f64b3e553f..e4f2a61f73 100644
--- a/packages/app/src/components/appearance-style-boundary.tsx
+++ b/packages/app/src/components/appearance-style-boundary.tsx
@@ -7,6 +7,15 @@ interface AppearanceStyleBoundaryProps {
   children: ReactNode;
 }
 
+// Remounts its children when an appearance token changes. Memoized and parsed content bakes
+// tokens in, and on web numeric tokens (font sizes, line heights) are baked into generated
+// classes that only a re-render refreshes. Native tracked styles update in place.
+// Keep native gesture hosts outside these keys too: shared gesture refs can outlive detached
+// dependent views until passive cleanup. It must sit below every native navigator: remounting
+// a navigator while settings hydrate
+// detaches its screen container inside a FragmentManager transaction and crashes Android.
+// `ThemedStack` places one per screen; the app shell places them around the chrome outside the
+// navigators.
 function AppearanceStyleBoundaryBase({ appearanceKey, children }: AppearanceStyleBoundaryProps) {
   return <Fragment key={appearanceKey}>{children}</Fragment>;
 }
diff --git a/packages/app/src/components/archived-agent-callout.tsx b/packages/app/src/components/archived-agent-callout.tsx
index 8982f6e06a..b5f6a3ea54 100644
--- a/packages/app/src/components/archived-agent-callout.tsx
+++ b/packages/app/src/components/archived-agent-callout.tsx
@@ -1,12 +1,10 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useState } from "react";
 import { View, Text } from "react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native-unistyles";
-import Animated from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { FOOTER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
+import { FOOTER_HEIGHT } from "@/constants/layout";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
+import { KeyboardTranslateView } from "@/keyboard/shift";
 import { Button } from "@/components/ui/button";
 import type { Theme } from "@/styles/theme";
 import { toErrorMessage } from "@/utils/error-messages";
@@ -18,19 +16,11 @@ interface ArchivedAgentCalloutProps {
 
 export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCalloutProps) {
   const { t } = useTranslation();
-  const insets = useSafeAreaInsets();
   const client = useHostRuntimeClient(serverId);
   const isConnected = useHostRuntimeIsConnected(serverId);
   const [isUnarchiving, setIsUnarchiving] = useState(false);
   const [unarchiveError, setUnarchiveError] = useState<string | null>(null);
 
-  const { style: keyboardAnimatedStyle } = useKeyboardShiftStyle({ mode: "translate" });
-
-  const containerStyle = useMemo(
-    () => [styles.container, { paddingBottom: insets.bottom }, keyboardAnimatedStyle],
-    [insets.bottom, keyboardAnimatedStyle],
-  );
-
   const handleUnarchive = useCallback(async () => {
     if (!client || !isConnected || isUnarchiving) return;
     setIsUnarchiving(true);
@@ -44,7 +34,7 @@ export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCallout
   }, [client, isConnected, isUnarchiving, agentId]);
 
   return (
-    <Animated.View style={containerStyle}>
+    <KeyboardTranslateView style={styles.container}>
       <View style={styles.inputAreaContainer}>
         <View style={styles.inputAreaContent}>
           <View style={styles.calloutStack}>
@@ -67,7 +57,7 @@ export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCallout
           </View>
         </View>
       </View>
-    </Animated.View>
+    </KeyboardTranslateView>
   );
 }
 
@@ -87,7 +77,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
   },
   inputAreaContent: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
   },
   callout: {
     flexDirection: "row",
diff --git a/packages/app/src/components/assistant-message-render-limit.test.ts b/packages/app/src/components/assistant-message-render-limit.test.ts
index a73a7b5dfa..52a7799633 100644
--- a/packages/app/src/components/assistant-message-render-limit.test.ts
+++ b/packages/app/src/components/assistant-message-render-limit.test.ts
@@ -26,14 +26,18 @@ describe("assistant message render limit", () => {
     });
   });
 
-  it("does not split a grapheme cluster at the boundary", () => {
-    const prefix = "a".repeat(ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT - 1);
-
-    expect(capAssistantMessageForRender(`${prefix}étail`)).toEqual({
-      text: prefix,
-      capped: true,
-    });
-  });
+  it.each(["😀", "é", "👨‍👩‍👧‍👦", "👍🏽", "❤️", "🇺🇸", "가", "कः"])(
+    "does not split %s at the render limit",
+    (cluster) => {
+      for (let offset = 1; offset < cluster.length; offset++) {
+        const prefix = "a".repeat(ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT - offset);
+        expect(capAssistantMessageForRender(`${prefix}${cluster}tail`)).toEqual({
+          text: prefix,
+          capped: true,
+        });
+      }
+    },
+  );
 
   it("counts the complete message size in UTF-8 bytes", () => {
     expect(getUtf8ByteLength("aé😀")).toBe(7);
diff --git a/packages/app/src/components/assistant-message-render-limit.ts b/packages/app/src/components/assistant-message-render-limit.ts
index cdc911442a..0c37270cb5 100644
--- a/packages/app/src/components/assistant-message-render-limit.ts
+++ b/packages/app/src/components/assistant-message-render-limit.ts
@@ -1,4 +1,7 @@
-import { clampToSafeRevealBoundary, isTextRevealPacingSupported } from "@/agent-stream/text-reveal";
+const graphemeSegmenter =
+  typeof Intl.Segmenter === "function"
+    ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
+    : null;
 
 export const ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT = 32_000;
 
@@ -39,8 +42,8 @@ export function capAssistantMessageForRender(message: string): CappedAssistantMe
   }
 
   let end = ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT;
-  if (isTextRevealPacingSupported()) {
-    end = clampToSafeRevealBoundary(message, end);
+  if (graphemeSegmenter) {
+    end = graphemeSegmenter.segment(message).containing(end)!.index;
   } else {
     const finalCodeUnit = message.charCodeAt(end - 1);
     if (finalCodeUnit >= 0xd800 && finalCodeUnit <= 0xdbff) {
diff --git a/packages/app/src/components/assistant-turn-footer-label.test.ts b/packages/app/src/components/assistant-turn-footer-label.test.ts
new file mode 100644
index 0000000000..7e3e918df8
--- /dev/null
+++ b/packages/app/src/components/assistant-turn-footer-label.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+
+import { i18n } from "@/i18n/i18next";
+import { getTurnDurationLabel } from "./assistant-turn-footer-label";
+
+describe("getTurnDurationLabel", () => {
+  it("says how long the turn worked", () => {
+    expect(getTurnDurationLabel(14_000, i18n.t)).toBe("Worked for 14s");
+  });
+
+  it("reads in the active app language", async () => {
+    await i18n.changeLanguage("fr");
+    try {
+      expect(getTurnDurationLabel(14_000, i18n.t)).toBe("A travaillé pendant 14s");
+    } finally {
+      await i18n.changeLanguage("en");
+    }
+  });
+});
diff --git a/packages/app/src/components/assistant-turn-footer-label.ts b/packages/app/src/components/assistant-turn-footer-label.ts
new file mode 100644
index 0000000000..2e2a088f0c
--- /dev/null
+++ b/packages/app/src/components/assistant-turn-footer-label.ts
@@ -0,0 +1,6 @@
+import type { TFunction } from "i18next";
+import { formatDuration } from "@/utils/time";
+
+export function getTurnDurationLabel(durationMs: number, t: TFunction): string {
+  return t("message.turnFooter.workedFor", { duration: formatDuration(durationMs) });
+}
diff --git a/packages/app/src/components/combined-model-selector.tsx b/packages/app/src/components/combined-model-selector.tsx
index dda77246c0..8473760c92 100644
--- a/packages/app/src/components/combined-model-selector.tsx
+++ b/packages/app/src/components/combined-model-selector.tsx
@@ -255,6 +255,7 @@ export function CombinedModelSelector({
             <View style={toolbar?.glyphSize === 20 ? styles.toolbarGlyph20 : styles.toolbarGlyph16}>
               <ModelProviderGlyph
                 provider={selectedProvider}
+                serverId={serverId}
                 size={toolbar?.glyphSize ?? ICON_SIZE.md}
               />
             </View>
diff --git a/packages/app/src/components/compact-explorer-sidebar-host.tsx b/packages/app/src/components/compact-explorer-sidebar-host.tsx
index 3a05f1c265..2dae4b9042 100644
--- a/packages/app/src/components/compact-explorer-sidebar-host.tsx
+++ b/packages/app/src/components/compact-explorer-sidebar-host.tsx
@@ -21,6 +21,7 @@ import {
   resolveCompactExplorerSidebarHostModel,
   type CompactExplorerSidebarHostModel,
 } from "@/components/compact-explorer-sidebar-host-state";
+import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 
 interface CompactExplorerOpenGestureSurfaceProps {
   children: ReactNode;
@@ -177,11 +178,16 @@ export function CompactExplorerSidebarHost({
       </DiffDocumentWorkspaceCacheProvider>
     ) : null;
 
+  let themedExplorer = explorer;
+  if (isWeb) {
+    themedExplorer = <AppearanceStyleBoundary>{explorer}</AppearanceStyleBoundary>;
+  }
+
   if (presentation === "dock") {
     return (
       <View style={styles.row} onLayout={handleContainerLayout}>
         <View style={styles.fill}>{children}</View>
-        {explorer}
+        {themedExplorer}
       </View>
     );
   }
@@ -194,7 +200,7 @@ export function CompactExplorerSidebarHost({
       >
         {children}
       </CompactExplorerOpenGestureSurface>
-      {explorer}
+      {themedExplorer}
     </>
   );
 }
diff --git a/packages/app/src/components/compact-explorer-sidebar.tsx b/packages/app/src/components/compact-explorer-sidebar.tsx
index 0f51f68a52..d52a9eac36 100644
--- a/packages/app/src/components/compact-explorer-sidebar.tsx
+++ b/packages/app/src/components/compact-explorer-sidebar.tsx
@@ -4,7 +4,7 @@ import { Gesture } from "react-native-gesture-handler";
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { X } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { formatPrTabLabel, PullRequestTabIcon } from "@/git/pull-request-panel";
@@ -20,12 +20,13 @@ import {
   HEADER_INNER_HEIGHT,
   HEADER_INNER_HEIGHT_MOBILE,
   HEADER_TOP_PADDING_MOBILE,
+  useIsCompactFormFactor,
 } from "@/constants/layout";
 import { ChangesSurface } from "@/git/diff-pane";
 import { changesStateSchema, defaultChangesState, type ChangesState } from "@/panels/changes/state";
 import { FileExplorerPane } from "./file-explorer-pane";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
-import { shouldUseCompactExplorerKeyboardPadding } from "@/hooks/keyboard-shift-policy";
+import { useKeyboardShiftStyle } from "@/keyboard/shift";
+import { shouldUseCompactExplorerKeyboardPadding } from "@/keyboard/shift";
 import { WindowChromeSafeArea } from "@/utils/desktop-window";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { RetainedPanel, RetainedPanelActivity } from "@/components/retained-panel";
@@ -38,9 +39,17 @@ import {
   SIDEBAR_RESIZE_ACTIVATION_OFFSET,
   SIDEBAR_RESIZE_FAIL_OFFSET,
 } from "@/components/sidebar-resize-handle-layout";
-import { resolveExplorerSidebarWidth } from "@/components/explorer-sidebar-layout";
+import {
+  EXPLORER_TAB_RAIL_INSET,
+  explorerSidebarCloseButtonLayout,
+  resolveExplorerSidebarWidth,
+} from "@/components/explorer-sidebar-layout";
+import { ToolbarButton } from "@/components/ui/pane-content-toolbar";
+import { mutedIconColorMapping } from "@/components/ui/icon-button-chrome";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
 
+const ThemedX = withUnistyles(X);
+
 function logExplorerSidebar(_event: string, _details: Record<string, unknown>): void {}
 
 interface ExplorerSidebarProps {
@@ -279,8 +288,12 @@ function ExplorerTabButton({
   testID,
   children,
 }: ExplorerTabButtonProps) {
+  const isCompact = useIsCompactFormFactor();
   const handlePress = useCallback(() => onTabPress(tab), [onTabPress, tab]);
-  const tabStyle = useMemo(() => [styles.tab, active && styles.tabActive], [active]);
+  const tabStyle = useMemo(
+    () => [styles.tab(isCompact), active && styles.tabActive],
+    [active, isCompact],
+  );
   const tabTextStyle = useMemo(() => [styles.tabText, active && styles.tabTextActive], [active]);
   return (
     <Pressable testID={testID} style={tabStyle} onPress={handlePress}>
@@ -315,6 +328,17 @@ function ExplorerSidebarContent({
 }: SidebarContentProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
+  const isCompact = useIsCompactFormFactor();
+  const closeButtonLayout = explorerSidebarCloseButtonLayout(isCompact);
+  const closeButtonStyle = useMemo(
+    () => ({ width: closeButtonLayout.size, height: closeButtonLayout.size }),
+    [closeButtonLayout.size],
+  );
+  // The close glyph shares the trailing rail with the toolbar rows below it.
+  const headerRightSectionStyle = useMemo(
+    () => [styles.headerRightSection, { paddingRight: closeButtonLayout.trailingPadding }],
+    [closeButtonLayout.trailingPadding],
+  );
   const { prPane, showPullRequest: showPrTab } = usePullRequestPanelAvailability({
     serverId,
     cwd: workspaceRoot,
@@ -341,14 +365,9 @@ function ExplorerSidebarContent({
   return (
     <View style={styles.sidebarContent} pointerEvents="auto">
       {/* Header with tabs and close button */}
-      <WindowChromeSafeArea
-        placement="inline"
-        horizontalPadding={theme.spacing[2]}
-        style={styles.header}
-        testID="explorer-header"
-      >
+      <WindowChromeSafeArea placement="inline" style={styles.header} testID="explorer-header">
         <TitlebarDragRegion />
-        <View style={styles.tabsContainer}>
+        <View style={styles.tabsContainer(isCompact)}>
           {isGit && (
             <ExplorerTabButton
               tab="changes"
@@ -383,24 +402,18 @@ function ExplorerSidebarContent({
             </ExplorerTabButton>
           )}
         </View>
-        <View style={styles.headerRightSection}>
-          <Pressable
+        <View style={headerRightSectionStyle}>
+          <ToolbarButton
+            compact={isCompact}
+            style={closeButtonStyle}
+            hitSlop={closeButtonLayout.hitSlop}
+            label={t("workspace.tabs.explorerSidebar.close")}
             onPress={onClose}
-            style={styles.closeButton}
             testID="explorer-close"
             nativeID="explorer-close"
-            accessible
-            accessibilityRole="button"
-            accessibilityLabel={t("workspace.tabs.explorerSidebar.close")}
-            hitSlop={8}
           >
-            {({ hovered, pressed }) => (
-              <X
-                size={18}
-                color={hovered || pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
+            <ThemedX size={closeButtonLayout.iconSize} uniProps={mutedIconColorMapping} />
+          </ToolbarButton>
         </View>
       </WindowChromeSafeArea>
 
@@ -520,18 +533,21 @@ const styles = StyleSheet.create((theme) => ({
     borderBottomWidth: 1,
     borderBottomColor: theme.colors.border,
   },
-  tabsContainer: {
+  tabsContainer: (isCompact: boolean) => ({
     flexDirection: "row",
     gap: theme.spacing[1],
-  },
-  tab: {
+    // With the tab's own horizontal padding this puts the label on the pane's
+    // leading rail, the same way the desktop tab rail does.
+    paddingLeft: isCompact ? EXPLORER_TAB_RAIL_INSET : theme.spacing[2],
+  }),
+  tab: (isCompact: boolean) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
     paddingVertical: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
+    paddingHorizontal: isCompact ? theme.spacing[2] : theme.spacing[3],
     borderRadius: theme.borderRadius.md,
-  },
+  }),
   tabActive: {
     backgroundColor: theme.colors.surfaceSidebarHover,
   },
@@ -551,10 +567,6 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     gap: theme.spacing[2],
   },
-  closeButton: {
-    padding: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-  },
   contentArea: {
     flex: 1,
     minHeight: 0,
diff --git a/packages/app/src/components/context-window-details.tsx b/packages/app/src/components/context-window-details.tsx
new file mode 100644
index 0000000000..3221539cec
--- /dev/null
+++ b/packages/app/src/components/context-window-details.tsx
@@ -0,0 +1,82 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { AgentUsage } from "@/usage";
+import { formatTokenCount } from "./context-window-meter.utils";
+
+interface ContextWindowDetailsProps {
+  serverId: string;
+  agentId: string;
+  context: {
+    percentage: number;
+    usedTokens: number;
+    maxTokens: number;
+  } | null;
+  sessionCost: string | null;
+  /** The hover card and tooltip title themselves; the sheet's header carries the title instead. */
+  showTitle: boolean;
+  /** Whether the usage cards have a Refresh button; without one they show their freshness. */
+  refreshable: boolean;
+}
+
+/**
+ * What the context window meter opens: how full the window is, then the usage of the agent's
+ * account. The desktop hover card, the native wide tooltip, and the compact sheet all render it.
+ */
+export function ContextWindowDetails({
+  serverId,
+  agentId,
+  context,
+  sessionCost,
+  showTitle,
+  refreshable,
+}: ContextWindowDetailsProps) {
+  const { t } = useTranslation();
+  return (
+    <>
+      <View style={styles.summary}>
+        {showTitle ? <Text style={styles.title}>{t("contextWindow.title")}</Text> : null}
+        {context ? (
+          <>
+            <Text style={styles.text}>
+              {t("contextWindow.used", { percentage: context.percentage })}
+            </Text>
+            <Text style={styles.detail}>
+              {t("contextWindow.tokens", {
+                used: formatTokenCount(context.usedTokens),
+                max: formatTokenCount(context.maxTokens),
+              })}
+            </Text>
+          </>
+        ) : (
+          <Text style={styles.detail}>{t("contextWindow.noData")}</Text>
+        )}
+        {sessionCost ? (
+          <Text style={styles.detail}>{t("contextWindow.sessionCost", { cost: sessionCost })}</Text>
+        ) : null}
+      </View>
+      <AgentUsage serverId={serverId} agentId={agentId} refreshable={refreshable} />
+    </>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  summary: {
+    gap: theme.spacing[1.5],
+    minWidth: 200,
+  },
+  title: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.base,
+  },
+  text: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.base,
+    lineHeight: theme.fontSize.base * 1.4,
+  },
+  detail: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+    lineHeight: theme.fontSize.sm * 1.4,
+  },
+}));
diff --git a/packages/app/src/components/context-window-meter.tsx b/packages/app/src/components/context-window-meter.tsx
index 6fe837562e..11931bdd41 100644
--- a/packages/app/src/components/context-window-meter.tsx
+++ b/packages/app/src/components/context-window-meter.tsx
@@ -1,34 +1,34 @@
-import { useCallback, useState } from "react";
-import { Pressable, Text, View } from "react-native";
+import { useCallback, useMemo, useState } from "react";
+import { Pressable, Text, View, useWindowDimensions } from "react-native";
 import Svg, { Circle } from "react-native-svg";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { ProviderUsageTooltipSection } from "@/provider-usage/tooltip-section";
-import { useProviderUsage } from "@/provider-usage/use-provider-usage";
-import { formatTokenCount } from "./context-window-meter.utils";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { isNative } from "@/constants/platform";
+import { useHostReportsUsage } from "@/usage";
+import type { Theme } from "@/styles/theme";
+import { ContextWindowDetails } from "./context-window-details";
+import { ContextWindowSheet } from "./context-window-sheet";
 
 interface ContextWindowMeterProps {
+  serverId: string;
+  agentId: string;
   maxTokens: number | null;
   usedTokens: number | null;
   totalCostUsd?: number | null;
   showPercentage?: boolean;
-  serverId?: string;
-  /** The Paseo provider key, e.g. "claude", "gemini", "codex" */
-  provider?: string | null;
-  /** Reserve the meter footprint and show a loading ring while usage is pending. */
-  pending?: boolean;
   /** Optional glyph envelope for icon-toolbar alignment. */
   glyphSize?: number;
 }
 
 const SVG_SIZE = 14;
+const USAGE_POPOVER_WIDTH = 300;
 const COMPACT_SVG_SIZE = 12;
-const COMPACT_CENTER = COMPACT_SVG_SIZE / 2;
 const COMPACT_RADIUS = 5;
 const STROKE_WIDTH = 2;
 const COMPACT_STROKE_WIDTH = 1.75;
-const COMPACT_CIRCUMFERENCE = 2 * Math.PI * COMPACT_RADIUS;
 
 function isValidMaxTokens(value: number): boolean {
   return Number.isFinite(value) && value > 0;
@@ -59,28 +59,22 @@ function formatSessionCost(value: number): string | null {
   return `$${value.toFixed(2)}`;
 }
 
-function getMeterColors(
-  percentage: number,
-  theme: ReturnType<typeof useUnistyles>["theme"],
-): { progress: string; track: string } {
-  const track = theme.colors.surface3;
+function getProgressColor(percentage: number, theme: Theme): string {
   if (percentage > 90) {
-    return { progress: theme.colors.destructive, track };
+    return theme.colors.destructive;
   }
   if (percentage >= 70) {
-    return { progress: theme.colors.palette.amber[500], track };
+    return theme.colors.palette.amber[500];
   }
-  return { progress: theme.colors.foregroundMuted, track };
+  return theme.colors.foregroundMuted;
 }
 
 function getMeterGeometry(showPercentage: boolean, glyphSize?: number) {
   if (showPercentage) {
     return {
       svgSize: COMPACT_SVG_SIZE,
-      center: COMPACT_CENTER,
       radius: COMPACT_RADIUS,
       strokeWidth: COMPACT_STROKE_WIDTH,
-      circumference: COMPACT_CIRCUMFERENCE,
       containerStyle: styles.containerWithLabel,
     };
   }
@@ -88,155 +82,221 @@ function getMeterGeometry(showPercentage: boolean, glyphSize?: number) {
   const resolvedStrokeWidth = glyphSize ? 2 : STROKE_WIDTH;
   return {
     svgSize: resolvedSize,
-    center: resolvedSize / 2,
     radius: (resolvedSize - resolvedStrokeWidth) / 2,
     strokeWidth: resolvedStrokeWidth,
-    circumference: Math.PI * (resolvedSize - resolvedStrokeWidth),
     containerStyle: styles.container,
   };
 }
 
+// Wrap the whole SVG: withUnistyles adds a div on web, which cannot sit inside an SVG.
+const ContextWindowRing = withUnistyles(function ContextWindowRing({
+  size,
+  radius,
+  strokeWidth,
+  percentage,
+  trackColor,
+  progressColor,
+}: {
+  size: number;
+  radius: number;
+  strokeWidth: number;
+  percentage: number | null;
+  trackColor: string;
+  progressColor: string;
+}) {
+  const center = size / 2;
+  const circumference = 2 * Math.PI * radius;
+  return (
+    <Svg
+      width={size}
+      height={size}
+      viewBox={`0 0 ${size} ${size}`}
+      accessibilityElementsHidden
+      importantForAccessibility="no-hide-descendants"
+    >
+      <Circle
+        cx={center}
+        cy={center}
+        r={radius}
+        fill="none"
+        stroke={trackColor}
+        strokeWidth={strokeWidth}
+      />
+      {percentage !== null ? (
+        <Circle
+          cx={center}
+          cy={center}
+          r={radius}
+          fill="none"
+          stroke={progressColor}
+          strokeWidth={strokeWidth}
+          strokeLinecap="round"
+          strokeDasharray={circumference}
+          strokeDashoffset={circumference - (clampPercentage(percentage) / 100) * circumference}
+          // SVG strokes start at three o'clock; the ring reads clockwise from twelve.
+          transform={`rotate(-90 ${center} ${center})`}
+        />
+      ) : null}
+    </Svg>
+  );
+});
+
 export function ContextWindowMeter({
+  serverId,
+  agentId,
   maxTokens,
   usedTokens,
   totalCostUsd,
   showPercentage = false,
-  serverId,
-  provider,
-  pending = false,
   glyphSize,
 }: ContextWindowMeterProps) {
-  const { theme } = useUnistyles();
   const { t } = useTranslation();
-  const [isTooltipOpen, setIsTooltipOpen] = useState(false);
-  const { view: providerUsageView, refresh: refreshProviderUsage } = useProviderUsage(
-    serverId ?? null,
-    { enabled: isTooltipOpen },
-  );
+  const { width } = useWindowDimensions();
+  // Usage cards need a wider popover; without them it keeps the plain tooltip shape.
+  const showsUsage = useHostReportsUsage(serverId);
+  const popoverWidth = Math.min(USAGE_POPOVER_WIDTH, width - 24);
+  // Compact screens open the details in a sheet, which can hold a pressable Refresh.
+  const isCompact = useIsCompactFormFactor();
+  const [isSheetOpen, setIsSheetOpen] = useState(false);
+  const openSheet = useCallback(() => setIsSheetOpen(true), []);
+  const closeSheet = useCallback(() => setIsSheetOpen(false), []);
   const percentage =
     maxTokens !== null && usedTokens !== null ? getUsagePercentage(maxTokens, usedTokens) : null;
-  const handleTooltipOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      setIsTooltipOpen(nextOpen);
-      if (nextOpen) {
-        void refreshProviderUsage().catch(() => {});
-      }
-    },
-    [refreshProviderUsage],
-  );
-
   const geometry = getMeterGeometry(showPercentage, glyphSize);
 
-  // No usage yet: reserve the footprint with a track-only ring while a session is
-  // active so the real ring fades in without shifting siblings. Render nothing when
-  // no usage is expected.
-  if (percentage === null || maxTokens === null || usedTokens === null) {
-    if (!pending) {
-      return null;
-    }
-    return (
-      <View style={geometry.containerStyle}>
-        <Svg
-          width={geometry.svgSize}
-          height={geometry.svgSize}
-          viewBox={`0 0 ${geometry.svgSize} ${geometry.svgSize}`}
-          style={styles.svg}
-          accessibilityElementsHidden
-          importantForAccessibility="no-hide-descendants"
-        >
-          <Circle
-            cx={geometry.center}
-            cy={geometry.center}
-            r={geometry.radius}
-            fill="none"
-            stroke={theme.colors.surface3}
-            strokeWidth={geometry.strokeWidth}
-          />
-        </Svg>
-        {showPercentage ? <View style={styles.skeletonLabel} /> : null}
-      </View>
-    );
-  }
-
-  const clampedPercentage = clampPercentage(percentage);
-  const roundedPercentage = Math.round(percentage);
-  const { svgSize, center, radius, strokeWidth, circumference, containerStyle } = geometry;
-  const dashOffset = circumference - (clampedPercentage / 100) * circumference;
-  const colors = getMeterColors(clampedPercentage, theme);
+  const context = useMemo(
+    () =>
+      percentage !== null && maxTokens !== null && usedTokens !== null
+        ? { percentage: Math.round(percentage), maxTokens, usedTokens }
+        : null,
+    [percentage, maxTokens, usedTokens],
+  );
+  const meterColors = useCallback(
+    (theme: Theme) => ({
+      progressColor: getProgressColor(percentage ?? 0, theme),
+      trackColor: theme.colors.surface3,
+    }),
+    [percentage],
+  );
   const formattedSessionCost =
     typeof totalCostUsd === "number" ? formatSessionCost(totalCostUsd) : null;
+  const containerStyle = geometry.containerStyle;
+  const ring = (
+    <ContextWindowRing
+      size={geometry.svgSize}
+      radius={geometry.radius}
+      strokeWidth={geometry.strokeWidth}
+      percentage={percentage}
+      uniProps={meterColors}
+    />
+  );
+  const percentageLabel =
+    showPercentage && context ? (
+      <Text style={styles.percentageLabel}>{`${context.percentage}%`}</Text>
+    ) : null;
+  const accessibilityLabel = context
+    ? t("contextWindow.accessibility", { percentage: context.percentage })
+    : t("contextWindow.accessibilityNoData");
 
-  return (
-    <Tooltip
-      open={isTooltipOpen}
-      onOpenChange={handleTooltipOpenChange}
-      delayDuration={0}
-      enabledOnDesktop
-      enabledOnMobile
-    >
-      <TooltipTrigger asChild triggerRefProp="ref">
+  if (isCompact) {
+    return (
+      <>
         <Pressable
           style={containerStyle}
           testID="context-window-meter"
-          accessibilityRole="image"
-          accessibilityLabel={t("contextWindow.accessibility", {
-            percentage: roundedPercentage,
-          })}
+          accessibilityRole="button"
+          accessibilityLabel={accessibilityLabel}
+          onPress={openSheet}
         >
-          <Svg
-            width={svgSize}
-            height={svgSize}
-            viewBox={`0 0 ${svgSize} ${svgSize}`}
-            style={styles.svg}
-            accessibilityElementsHidden
-            importantForAccessibility="no-hide-descendants"
-          >
-            <Circle
-              cx={center}
-              cy={center}
-              r={radius}
-              fill="none"
-              stroke={colors.track}
-              strokeWidth={strokeWidth}
-            />
-            <Circle
-              cx={center}
-              cy={center}
-              r={radius}
-              fill="none"
-              stroke={colors.progress}
-              strokeWidth={strokeWidth}
-              strokeLinecap="round"
-              strokeDasharray={circumference}
-              strokeDashoffset={dashOffset}
-            />
-          </Svg>
-          {showPercentage ? (
-            <Text style={styles.percentageLabel}>{`${roundedPercentage}%`}</Text>
-          ) : null}
+          {ring}
+          {percentageLabel}
         </Pressable>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <View style={styles.tooltipContent}>
-          <Text style={styles.tooltipTitle}>{t("contextWindow.title")}</Text>
-          <Text style={styles.tooltipText}>
-            {t("contextWindow.used", { percentage: roundedPercentage })}
-          </Text>
-          <Text style={styles.tooltipDetail}>
-            {t("contextWindow.tokens", {
-              used: formatTokenCount(usedTokens),
-              max: formatTokenCount(maxTokens),
-            })}
-          </Text>
-          {formattedSessionCost ? (
-            <Text style={styles.tooltipDetail}>
-              {t("contextWindow.sessionCost", { cost: formattedSessionCost })}
-            </Text>
-          ) : null}
-          <ProviderUsageTooltipSection view={providerUsageView} activeProviderId={provider} />
+        <ContextWindowSheet open={isSheetOpen} onClose={closeSheet}>
+          <ContextWindowDetails
+            serverId={serverId}
+            agentId={agentId}
+            context={context}
+            sessionCost={formattedSessionCost}
+            showTitle={false}
+            refreshable
+          />
+        </ContextWindowSheet>
+      </>
+    );
+  }
+
+  const popoverStyle = showsUsage
+    ? [styles.usagePopover, { width: popoverWidth }]
+    : styles.plainPopover;
+
+  // Native wide screens have no hover, so the details open in a tooltip on press. The tooltip
+  // takes no presses, so its usage cards have no Refresh.
+  if (isNative) {
+    return (
+      <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile>
+        <TooltipTrigger asChild triggerRefProp="ref">
+          <Pressable
+            style={containerStyle}
+            testID="context-window-meter"
+            accessibilityRole="image"
+            accessibilityLabel={accessibilityLabel}
+          >
+            {ring}
+            {percentageLabel}
+          </Pressable>
+        </TooltipTrigger>
+        <TooltipContent
+          side="top"
+          align="center"
+          offset={8}
+          maxWidth={showsUsage ? popoverWidth : undefined}
+          style={popoverStyle}
+          testID="context-window-meter-tooltip"
+        >
+          <ContextWindowDetails
+            serverId={serverId}
+            agentId={agentId}
+            context={context}
+            sessionCost={formattedSessionCost}
+            showTitle
+            refreshable={false}
+          />
+        </TooltipContent>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <HoverCard>
+      <HoverCardTrigger focusable accessibilityLabel={accessibilityLabel}>
+        <View
+          style={containerStyle}
+          testID="context-window-meter"
+          accessibilityRole="image"
+          accessibilityLabel={accessibilityLabel}
+        >
+          {ring}
+          {percentageLabel}
         </View>
-      </TooltipContent>
-    </Tooltip>
+      </HoverCardTrigger>
+      <HoverCardContent
+        placement="top"
+        offset={8}
+        role="dialog"
+        accessibilityLabel={t("contextWindow.title")}
+        testID="context-window-details"
+        style={popoverStyle}
+      >
+        <ContextWindowDetails
+          serverId={serverId}
+          agentId={agentId}
+          context={context}
+          sessionCost={formattedSessionCost}
+          showTitle
+          refreshable
+        />
+      </HoverCardContent>
+    </HoverCard>
   );
 }
 
@@ -256,36 +316,12 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[1],
     borderRadius: theme.borderRadius.full,
   },
-  svg: {
-    transform: [{ rotate: "-90deg" }],
-  },
   percentageLabel: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
   },
-  skeletonLabel: {
-    width: 22,
-    height: theme.fontSize.base,
-    borderRadius: theme.borderRadius.full,
-    backgroundColor: theme.colors.surface3,
-  },
-  tooltipContent: {
-    gap: theme.spacing[1.5],
-    minWidth: 200,
-  },
-  tooltipTitle: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-  tooltipText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    lineHeight: theme.fontSize.base * 1.4,
-  },
-  tooltipDetail: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    lineHeight: theme.fontSize.sm * 1.4,
-  },
+  // Plain details use a small inset; account usage cards have their own content density.
+  plainPopover: { paddingVertical: theme.spacing[1], paddingHorizontal: theme.spacing[2] },
+  usagePopover: { padding: theme.spacing[3], gap: theme.spacing[3] },
 }));
diff --git a/packages/app/src/components/context-window-sheet.tsx b/packages/app/src/components/context-window-sheet.tsx
new file mode 100644
index 0000000000..5dd454e048
--- /dev/null
+++ b/packages/app/src/components/context-window-sheet.tsx
@@ -0,0 +1,80 @@
+import { useMemo, type ReactNode } from "react";
+import { View, useWindowDimensions } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { SheetHeaderView, SHEET_HORIZONTAL_PADDING_SCALE } from "@/components/adaptive-modal-sheet";
+import {
+  IsolatedBottomSheetModal,
+  useIsolatedBottomSheetVisibility,
+} from "@/components/ui/isolated-bottom-sheet-modal";
+
+// `backgroundStyle` and `handleIndicatorStyle` are style-shaped props the Babel plugin does not
+// track, so the sheet is wrapped rather than reading the theme through a hook.
+// See docs/unistyles.md.
+const ThemedBottomSheetModal = withUnistyles(IsolatedBottomSheetModal, (theme) => ({
+  backgroundStyle: {
+    backgroundColor: theme.colors.surface0,
+    borderTopLeftRadius: theme.borderRadius["2xl"],
+    borderTopRightRadius: theme.borderRadius["2xl"],
+  },
+  handleIndicatorStyle: { backgroundColor: theme.colors.palette.zinc[600] },
+}));
+
+/**
+ * The context window meter's details on compact screens, in a sheet as tall as its content.
+ * Gorhom mounts the content only while the sheet is presented, so whatever it fetches stops once
+ * the sheet closes.
+ */
+export function ContextWindowSheet({
+  open,
+  onClose,
+  children,
+}: {
+  open: boolean;
+  onClose: () => void;
+  children: ReactNode;
+}) {
+  const { t } = useTranslation();
+  const { height } = useWindowDimensions();
+  const insets = useSafeAreaInsets();
+  const header = useMemo(() => ({ title: t("contextWindow.title") }), [t]);
+  const scrollContentStyle = useMemo(() => ({ paddingBottom: insets.bottom }), [insets.bottom]);
+  const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
+    visible: open,
+    onClose,
+  });
+
+  return (
+    <ThemedBottomSheetModal
+      ref={sheetRef}
+      contextBridge={null}
+      // Content-sized rather than fixed snap points: the usage cards stream in one at a time.
+      enableDynamicSizing
+      maxDynamicContentSize={height * 0.8}
+      onChange={handleSheetChange}
+      onDismiss={handleSheetDismiss}
+      backdropOpacity={0.45}
+      enablePanDownToClose
+    >
+      <BottomSheetScrollView
+        contentContainerStyle={scrollContentStyle}
+        showsVerticalScrollIndicator={false}
+      >
+        <View role="dialog" aria-label={header.title}>
+          <SheetHeaderView header={header} onClose={onClose} />
+          {/* The inset sits on a View: a themed contentContainerStyle resolves to nothing on web. */}
+          <View style={styles.body}>{children}</View>
+        </View>
+      </BottomSheetScrollView>
+    </ThemedBottomSheetModal>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  body: {
+    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    gap: theme.spacing[4],
+  },
+}));
diff --git a/packages/app/src/components/explorer-sidebar-layout.test.ts b/packages/app/src/components/explorer-sidebar-layout.test.ts
index 5ec16dc860..0570144000 100644
--- a/packages/app/src/components/explorer-sidebar-layout.test.ts
+++ b/packages/app/src/components/explorer-sidebar-layout.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import {
+  explorerSidebarCloseButtonLayout,
   resolveExplorerSidebarDockSizes,
   resolveExplorerSidebarWidth,
 } from "@/components/explorer-sidebar-layout";
@@ -20,3 +21,20 @@ describe("Explorer sidebar layout", () => {
     expect(resolveExplorerSidebarWidth({ requestedWidth: 600, containerWidth: 750 })).toBe(350);
   });
 });
+
+describe("Explorer close action", () => {
+  it("preserves the wide-native touch target and glyph rail", () => {
+    const layout = explorerSidebarCloseButtonLayout(false);
+    expect(layout.size).toBe(34);
+    expect(layout.iconSize).toBe(18);
+    expect(layout.size + layout.hitSlop * 2).toBe(50);
+    expect(layout.trailingPadding + (layout.size - layout.iconSize) / 2).toBe(16);
+  });
+
+  it("keeps the compact close glyph on the pane rail", () => {
+    const layout = explorerSidebarCloseButtonLayout(true);
+    expect(layout.size).toBe(32);
+    expect(layout.iconSize).toBe(18);
+    expect(layout.trailingPadding + (layout.size - layout.iconSize) / 2).toBe(8);
+  });
+});
diff --git a/packages/app/src/components/explorer-sidebar-layout.ts b/packages/app/src/components/explorer-sidebar-layout.ts
index 840b615902..5cd5352556 100644
--- a/packages/app/src/components/explorer-sidebar-layout.ts
+++ b/packages/app/src/components/explorer-sidebar-layout.ts
@@ -1,3 +1,28 @@
+import {
+  paneContentToolbarIconSize,
+  paneContentToolbarTrailingPadding,
+} from "@/components/ui/pane-content-toolbar";
+import { smallIconButtonChromeFrameSize } from "@/components/ui/icon-button-chrome";
+
+export function explorerSidebarCloseButtonLayout(compact: boolean) {
+  // The inline native dock retains its padded close action and touch slop.
+  if (!compact) {
+    return { size: 34, iconSize: 18, hitSlop: 8, trailingPadding: 8 };
+  }
+  return {
+    size: smallIconButtonChromeFrameSize(compact),
+    iconSize: paneContentToolbarIconSize(compact),
+    hitSlop: 0,
+    trailingPadding: paneContentToolbarTrailingPadding(compact, "glyph"),
+  };
+}
+
+/**
+ * Outer inset of an Explorer tab rail. With each tab's own horizontal padding it puts
+ * the tab label on the pane's shared leading rail (`treeRowPaddingLeft(0)`).
+ */
+export const EXPLORER_TAB_RAIL_INSET = 4;
+
 const DEFAULT_EXPLORER_SIDEBAR_WIDTH = 320;
 const MIN_EXPLORER_SIDEBAR_WIDTH = 240;
 const MIN_WORKSPACE_BODY_WIDTH = 400;
diff --git a/packages/app/src/components/file-explorer-pane.tsx b/packages/app/src/components/file-explorer-pane.tsx
index e014928531..209ec74f28 100644
--- a/packages/app/src/components/file-explorer-pane.tsx
+++ b/packages/app/src/components/file-explorer-pane.tsx
@@ -1220,7 +1220,10 @@ function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {
   return (
     <View style={[styles.treePane, styles.treePaneFill]}>
       <PaneContentToolbar
-        style={[styles.paneHeader, { paddingRight: paneContentToolbarTrailingPadding(isCompact) }]}
+        style={[
+          styles.paneHeader,
+          { paddingRight: paneContentToolbarTrailingPadding(isCompact, "glyph") },
+        ]}
         testID="files-pane-header"
       >
         <Pressable
diff --git a/packages/app/src/components/floating-header/index.tsx b/packages/app/src/components/floating-header/index.tsx
new file mode 100644
index 0000000000..b18a8731b0
--- /dev/null
+++ b/packages/app/src/components/floating-header/index.tsx
@@ -0,0 +1,99 @@
+import { useCallback, useId, useState, type ReactNode } from "react";
+import { View, type LayoutChangeEvent } from "react-native";
+import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
+
+/** How far the fade runs past the header's bottom edge, so content dissolves instead of clipping. */
+const FADE_OVERHANG = 24;
+
+interface FloatingHeaderLayoutProps {
+  header: ReactNode;
+  /** Float only when the content supports visual-top clearance. */
+  floating: boolean;
+  children: (topOverlayInset: number) => ReactNode;
+}
+
+/**
+ * Stacks a header above content, or floats it over the content behind a fade. Children keep the
+ * same tree position in both modes, so toggling `floating` never remounts them.
+ */
+export function FloatingHeaderLayout({ header, floating, children }: FloatingHeaderLayoutProps) {
+  const [headerHeight, setHeaderHeight] = useState(0);
+  const handleHeaderLayout = useCallback((event: LayoutChangeEvent) => {
+    setHeaderHeight(Math.round(event.nativeEvent.layout.height));
+  }, []);
+
+  return (
+    <View style={styles.root}>
+      {floating ? null : header}
+      <View style={styles.content}>{children(floating ? headerHeight : 0)}</View>
+      {floating ? (
+        <View style={styles.overlay} pointerEvents="box-none" onLayout={handleHeaderLayout}>
+          <FloatingHeaderFade />
+          {header}
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
+function FloatingHeaderFadeSvg({ gradientId, color }: { gradientId: string; color: string }) {
+  return (
+    <Svg width="100%" height="100%" preserveAspectRatio="none">
+      <Defs>
+        <SvgLinearGradient id={gradientId} x1="0%" y1="0%" x2="0%" y2="100%">
+          {/* Vary opacity rather than interpolating toward `transparent`, which crosses black in
+              some engines and leaves a grey fringe. */}
+          <Stop offset="0%" stopColor={color} stopOpacity={1} />
+          <Stop offset="50%" stopColor={color} stopOpacity={0.97} />
+          <Stop offset="75%" stopColor={color} stopOpacity={0.8} />
+          <Stop offset="100%" stopColor={color} stopOpacity={0} />
+        </SvgLinearGradient>
+      </Defs>
+      <Rect x="0" y="0" width="100%" height="100%" fill={`url(#${gradientId})`} />
+    </Svg>
+  );
+}
+
+const ThemedFloatingHeaderFadeSvg = withUnistyles(FloatingHeaderFadeSvg);
+const workspaceSurfaceColorMapping = (theme: Theme) => ({
+  color: theme.colors.surfaceWorkspace,
+});
+
+function FloatingHeaderFade() {
+  // React-generated ids contain characters that are invalid inside SVG fragment references.
+  const gradientId = `floating-header-fade-${useId().replace(/[^a-zA-Z0-9_-]/g, "")}`;
+  return (
+    <View style={styles.fade} pointerEvents="none">
+      <ThemedFloatingHeaderFadeSvg
+        gradientId={gradientId}
+        uniProps={workspaceSurfaceColorMapping}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+    minHeight: 0,
+  },
+  content: {
+    flex: 1,
+    minHeight: 0,
+  },
+  overlay: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+  },
+  fade: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: -FADE_OVERHANG,
+  },
+});
diff --git a/packages/app/src/components/headers/back-header.tsx b/packages/app/src/components/headers/back-header.tsx
index 6532ee561a..a9398da0cf 100644
--- a/packages/app/src/components/headers/back-header.tsx
+++ b/packages/app/src/components/headers/back-header.tsx
@@ -6,10 +6,11 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { ArrowLeft } from "lucide-react-native";
 import { ScreenHeader } from "./screen-header";
 import { ScreenTitle } from "./screen-title";
+import { CompactHeader } from "./compact-header";
+import { useIsCompactFormFactor } from "@/constants/layout";
 
 interface BackHeaderProps {
   title?: string;
-  titleAccessory?: ReactNode;
   rightContent?: ReactNode;
   onBack?: () => void;
 }
@@ -18,7 +19,15 @@ function goBack(): void {
   router.back();
 }
 
-export function BackHeader({ title, titleAccessory, rightContent, onBack }: BackHeaderProps) {
+export function BackHeader({ title, rightContent, onBack }: BackHeaderProps) {
+  const isCompact = useIsCompactFormFactor();
+  if (isCompact) {
+    return <CompactHeader navigation="back" title={title} onBack={onBack} actions={rightContent} />;
+  }
+  return <DesktopBackHeader title={title} rightContent={rightContent} onBack={onBack} />;
+}
+
+function DesktopBackHeader({ title, rightContent, onBack }: BackHeaderProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const handleBack = useCallback(() => {
@@ -42,7 +51,6 @@ export function BackHeader({ title, titleAccessory, rightContent, onBack }: Back
             <ArrowLeft size={theme.iconSize.lg} color={theme.colors.foregroundMuted} />
           </Pressable>
           {title && <ScreenTitle>{title}</ScreenTitle>}
-          {titleAccessory}
         </>
       }
       right={rightContent}
@@ -56,10 +64,7 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   backButton: {
-    padding: {
-      xs: theme.spacing[3],
-      md: theme.spacing[2],
-    },
+    padding: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
   },
 }));
diff --git a/packages/app/src/components/headers/compact-header.tsx b/packages/app/src/components/headers/compact-header.tsx
new file mode 100644
index 0000000000..aa66580fce
--- /dev/null
+++ b/packages/app/src/components/headers/compact-header.tsx
@@ -0,0 +1,168 @@
+import { useCallback, useMemo, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { Text, View } from "react-native";
+import { router } from "expo-router";
+import { ArrowLeft } from "lucide-react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import { SidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
+import {
+  IconButtonChromeProvider,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
+import { HEADER_INNER_HEIGHT_MOBILE, HEADER_TOP_PADDING_MOBILE } from "@/constants/layout";
+import type { ShortcutKey } from "@/utils/format-shortcut";
+
+const ThemedArrowLeft = withUnistyles(ArrowLeft);
+
+const ISLAND_PADDING = 7;
+const NO_SHORTCUT: ShortcutKey[] = [];
+
+interface CompactHeaderProps {
+  /** The leading island: the sidebar menu, or a back button. */
+  navigation: "menu" | "back";
+  /** Back button action. Defaults to navigating back. */
+  onBack?: () => void;
+  title?: string;
+  titleTestID?: string;
+  /** A line under the title. */
+  subtitle?: ReactNode;
+  /** Show a placeholder instead of the title while it loads. */
+  loading?: boolean;
+  /** Icon actions inherit the island chrome through the shared button primitives. */
+  actions?: ReactNode;
+}
+
+/**
+ * The phone header: the navigation button and the screen's actions sit in islands, with the title
+ * left-aligned between them. It has no background of its own, so it reads the same in flow and floating
+ * over content (see `FloatingHeaderLayout`). Its height matches the old flat header, so anything
+ * offset by the header height still lines up.
+ */
+export function CompactHeader({
+  navigation,
+  onBack,
+  title,
+  titleTestID,
+  subtitle,
+  loading = false,
+  actions,
+}: CompactHeaderProps) {
+  const insets = useSafeAreaInsets();
+  const rootStyle = useMemo(
+    () => [styles.root, { paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE }],
+    [insets.top],
+  );
+
+  return (
+    <IconButtonChromeProvider value="header-island">
+      <View style={rootStyle}>
+        <View style={styles.row}>
+          <View style={styles.island}>
+            {navigation === "menu" ? <SidebarMenuToggle /> : <BackButton onBack={onBack} />}
+          </View>
+          <View style={styles.titleGroup}>
+            <CompactHeaderTitle
+              loading={loading}
+              title={title}
+              titleTestID={titleTestID}
+              subtitle={subtitle}
+            />
+          </View>
+          {actions ? <View style={styles.island}>{actions}</View> : null}
+        </View>
+      </View>
+    </IconButtonChromeProvider>
+  );
+}
+
+function CompactHeaderTitle({
+  loading,
+  title,
+  titleTestID,
+  subtitle,
+}: Pick<CompactHeaderProps, "title" | "titleTestID" | "subtitle"> & { loading: boolean }) {
+  if (loading) {
+    return <View style={styles.titleSkeleton} />;
+  }
+  return (
+    <>
+      {title ? (
+        <Text style={styles.title} numberOfLines={1} testID={titleTestID}>
+          {title}
+        </Text>
+      ) : null}
+      {subtitle}
+    </>
+  );
+}
+
+function BackButton({ onBack }: { onBack?: () => void }) {
+  const { t } = useTranslation();
+  const handlePress = useCallback(() => {
+    if (onBack) {
+      onBack();
+      return;
+    }
+    router.back();
+  }, [onBack]);
+  return (
+    <HeaderToggleButton
+      onPress={handlePress}
+      tooltipLabel={t("common.actions.back")}
+      tooltipKeys={NO_SHORTCUT}
+      tooltipSide="right"
+      testID="header-back-button"
+      accessibilityRole="button"
+      accessibilityLabel={t("common.actions.back")}
+    >
+      <ThemedArrowLeft
+        size={iconButtonChromeGlyphSize("large")}
+        strokeWidth={1.5}
+        uniProps={mutedIconColorMapping}
+      />
+    </HeaderToggleButton>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  root: {
+    paddingHorizontal: theme.spacing[3],
+  },
+  row: {
+    height: HEADER_INNER_HEIGHT_MOBILE,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  titleGroup: {
+    flex: 1,
+    minWidth: 0,
+    // Both title lines receive the remaining width; text alignment does not size the slot.
+    alignItems: "stretch",
+  },
+  island: {
+    flexDirection: "row",
+    alignItems: "center",
+    padding: ISLAND_PADDING,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.surface2,
+    ...theme.shadow.sm,
+  },
+  title: {
+    fontSize: theme.fontSize.base,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+    textAlign: "left",
+  },
+  titleSkeleton: {
+    width: 140,
+    maxWidth: "100%",
+    height: 22,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.surface3,
+    opacity: 0.25,
+  },
+}));
diff --git a/packages/app/src/components/headers/header-toggle-button.tsx b/packages/app/src/components/headers/header-toggle-button.tsx
index b11394c46d..137d5d483d 100644
--- a/packages/app/src/components/headers/header-toggle-button.tsx
+++ b/packages/app/src/components/headers/header-toggle-button.tsx
@@ -1,4 +1,4 @@
-import { useMemo, type ReactElement, type ReactNode } from "react";
+import { type ReactElement, type ReactNode } from "react";
 import { Text, View, type PressableProps, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -7,7 +7,7 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 import { isWeb } from "@/constants/platform";
 import {
   iconButtonChromeFrameStyle,
-  iconButtonChromeStyle,
+  useIconButtonChromeStyle,
 } from "@/components/ui/icon-button-chrome";
 
 interface HeaderToggleButtonState {
@@ -46,17 +46,11 @@ export function HeaderToggleButton({
       ? ({ "aria-expanded": expandedState } as Record<string, boolean>)
       : null;
 
-  const combinedStyle = useMemo(
-    () =>
-      ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) =>
-        iconButtonChromeStyle({
-          size: "large",
-          state: { hovered: Boolean(hovered), pressed },
-          disabled: Boolean(disabled),
-          style,
-        }),
-    [disabled, style],
-  );
+  const combinedStyle = useIconButtonChromeStyle({
+    size: "large",
+    disabled: Boolean(disabled),
+    style,
+  });
 
   return (
     <Tooltip delayDuration={tooltipDelayDuration} enabledOnDesktop enabledOnMobile={false}>
diff --git a/packages/app/src/components/headers/menu-header.tsx b/packages/app/src/components/headers/menu-header.tsx
index 37f39ca0ba..fc4f2442ff 100644
--- a/packages/app/src/components/headers/menu-header.tsx
+++ b/packages/app/src/components/headers/menu-header.tsx
@@ -1,16 +1,10 @@
-import { useCallback, useMemo, type ReactNode } from "react";
-import { useTranslation } from "react-i18next";
-import { View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { PanelLeft } from "lucide-react-native";
+import type { ReactNode } from "react";
+import { StyleSheet } from "react-native-unistyles";
 import { ScreenHeader } from "./screen-header";
 import { ScreenTitle } from "./screen-title";
-import { HeaderToggleButton, headerIconSlotStyle } from "./header-toggle-button";
-import { selectIsAgentListOpen, usePanelStore } from "@/stores/panel-store";
+import { CompactHeader } from "./compact-header";
+import { SidebarMenuToggle } from "./sidebar-menu-toggle";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { getShortcutOs } from "@/utils/shortcut-platform";
-import { useHasWindowChromeObstruction, useOwnsWindowChromeCorner } from "@/utils/desktop-window";
-import { iconButtonChromeGlyphSize } from "@/components/ui/icon-button-chrome";
 
 interface MenuHeaderProps {
   title?: string;
@@ -18,130 +12,11 @@ interface MenuHeaderProps {
   borderless?: boolean;
 }
 
-interface SidebarMenuToggleProps {
-  style?: StyleProp<ViewStyle>;
-  tooltipSide?: "left" | "right" | "top" | "bottom";
-  testID?: string;
-  nativeID?: string;
-}
-
-const MOBILE_MENU_LINE_WIDTH = 16;
-const MOBILE_MENU_LINE_SHORT_WIDTH = 8;
-const MOBILE_MENU_LINE_HEIGHT = 1.5;
-
-function MobileMenuIcon({ color }: { color: string }) {
-  const lineStyle = useMemo(() => [styles.mobileMenuLine, { backgroundColor: color }], [color]);
-  const shortLineStyle = useMemo(
-    () => [styles.mobileMenuLine, styles.mobileMenuLineShort, { backgroundColor: color }],
-    [color],
-  );
-  return (
-    <View style={styles.mobileMenuIcon} pointerEvents="none">
-      <View style={lineStyle} />
-      <View style={lineStyle} />
-      <View style={shortLineStyle} />
-    </View>
-  );
-}
-
-function SidebarMenuToggleButton({
-  isMobile,
-  extraMutedIdleIcon = false,
-  resolvedStyle,
-  tooltipSide = "right",
-  testID = "menu-button",
-  nativeID = "menu-button",
-}: Omit<SidebarMenuToggleProps, "style"> & {
-  isMobile: boolean;
-  extraMutedIdleIcon?: boolean;
-  resolvedStyle: StyleProp<ViewStyle>;
-}) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const isOpen = usePanelStore((state) => selectIsAgentListOpen(state, { isCompact: isMobile }));
-  const toggleAgentListForLayout = usePanelStore((state) => state.toggleAgentListForLayout);
-  const toggleShortcutKeys = useMemo(
-    () => (getShortcutOs() === "mac" ? ["mod", "B"] : ["mod", "."]),
-    [],
-  );
-
-  const handlePress = useCallback(() => {
-    toggleAgentListForLayout({ isCompact: isMobile });
-  }, [toggleAgentListForLayout, isMobile]);
-
-  const accessibilityState = useMemo(() => ({ expanded: isOpen }), [isOpen]);
-
-  return (
-    <HeaderToggleButton
-      onPress={handlePress}
-      tooltipLabel={t("shell.menu.toggleSidebar")}
-      tooltipKeys={toggleShortcutKeys}
-      tooltipSide={tooltipSide}
-      testID={testID}
-      nativeID={nativeID}
-      style={resolvedStyle}
-      accessible
-      accessibilityRole="button"
-      accessibilityLabel={isOpen ? t("shell.menu.close") : t("shell.menu.open")}
-      accessibilityState={accessibilityState}
-    >
-      {isMobile ? (
-        <MobileMenuIcon
-          color={
-            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
-          }
-        />
-      ) : (
-        <PanelLeft
-          size={iconButtonChromeGlyphSize("large")}
-          strokeWidth={1.5}
-          color={
-            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
-          }
-        />
-      )}
-    </HeaderToggleButton>
-  );
-}
-
-export function SidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
-  const isMobile = useIsCompactFormFactor();
-  const ownsTopLeft = useOwnsWindowChromeCorner("top-left");
-  const hasTopLeftWindowControls = useHasWindowChromeObstruction("top-left");
-  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
-  const placeholderStyle = useMemo(
-    () => [headerIconSlotStyle.slot, resolvedStyle],
-    [resolvedStyle],
-  );
-
-  if (!isMobile && !ownsTopLeft) {
-    return null;
-  }
-
-  if (!isMobile && hasTopLeftWindowControls) {
-    return (
-      <View pointerEvents="none" style={placeholderStyle}>
-        <View style={styles.desktopMenuIconSpace} />
-      </View>
-    );
-  }
-
-  return <SidebarMenuToggleButton {...props} isMobile={isMobile} resolvedStyle={resolvedStyle} />;
-}
-
-export function WindowSidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
-  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
-  return (
-    <SidebarMenuToggleButton
-      {...props}
-      isMobile={false}
-      extraMutedIdleIcon
-      resolvedStyle={resolvedStyle}
-    />
-  );
-}
-
 export function MenuHeader({ title, rightContent, borderless }: MenuHeaderProps) {
+  const isCompact = useIsCompactFormFactor();
+  if (isCompact) {
+    return <CompactHeader navigation="menu" title={title} actions={rightContent} />;
+  }
   return (
     <ScreenHeader
       left={
@@ -158,31 +33,7 @@ export function MenuHeader({ title, rightContent, borderless }: MenuHeaderProps)
 }
 
 const styles = StyleSheet.create((theme) => ({
-  leadingToggle: {
-    marginLeft: {
-      xs: 0,
-      md: -theme.spacing[2],
-    },
-  },
   left: {
     gap: theme.spacing[2],
   },
-  mobileMenuIcon: {
-    width: MOBILE_MENU_LINE_WIDTH,
-    height: 12,
-    justifyContent: "space-between",
-    alignItems: "flex-start",
-  },
-  desktopMenuIconSpace: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-  },
-  mobileMenuLine: {
-    width: MOBILE_MENU_LINE_WIDTH,
-    height: MOBILE_MENU_LINE_HEIGHT,
-    borderRadius: theme.borderRadius.full,
-  },
-  mobileMenuLineShort: {
-    width: MOBILE_MENU_LINE_SHORT_WIDTH,
-  },
 }));
diff --git a/packages/app/src/components/headers/screen-header.tsx b/packages/app/src/components/headers/screen-header.tsx
index c2bd2f5d3a..6492658389 100644
--- a/packages/app/src/components/headers/screen-header.tsx
+++ b/packages/app/src/components/headers/screen-header.tsx
@@ -1,3 +1,4 @@
+import { ComposerDockBackground } from "@/composer/dock";
 import { useMemo, type ReactNode } from "react";
 import type { LayoutChangeEvent } from "react-native";
 import { View, type StyleProp, type ViewStyle } from "react-native";
@@ -49,7 +50,7 @@ export function ScreenHeader({
   const rightCombinedStyle = useMemo(() => [styles.right, rightStyle], [rightStyle]);
 
   return (
-    <View style={styles.header}>
+    <ComposerDockBackground style={styles.header} testID="composer-dock-header">
       <View style={innerStyle}>
         <WindowChromeSafeArea
           placement="inline"
@@ -62,7 +63,7 @@ export function ScreenHeader({
           <View style={rightCombinedStyle}>{right}</View>
         </WindowChromeSafeArea>
       </View>
-    </View>
+    </ComposerDockBackground>
   );
 }
 
diff --git a/packages/app/src/components/headers/sidebar-menu-toggle.tsx b/packages/app/src/components/headers/sidebar-menu-toggle.tsx
new file mode 100644
index 0000000000..445b7baa96
--- /dev/null
+++ b/packages/app/src/components/headers/sidebar-menu-toggle.tsx
@@ -0,0 +1,167 @@
+import { useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { PanelLeft } from "lucide-react-native";
+import { HeaderToggleButton, headerIconSlotStyle } from "./header-toggle-button";
+import { selectIsAgentListOpen, usePanelStore } from "@/stores/panel-store";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { getShortcutOs } from "@/utils/shortcut-platform";
+import { useHasWindowChromeObstruction, useOwnsWindowChromeCorner } from "@/utils/desktop-window";
+import {
+  extraMutedIconColorMapping,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
+
+const ThemedPanelLeft = withUnistyles(PanelLeft);
+
+interface SidebarMenuToggleProps {
+  style?: StyleProp<ViewStyle>;
+  tooltipSide?: "left" | "right" | "top" | "bottom";
+  testID?: string;
+  nativeID?: string;
+}
+
+const MOBILE_MENU_LINE_WIDTH = 16;
+const MOBILE_MENU_LINE_SHORT_WIDTH = 8;
+const MOBILE_MENU_LINE_HEIGHT = 1.5;
+
+function MobileMenuIcon({ extraMuted }: { extraMuted: boolean }) {
+  const color = extraMuted ? styles.mobileMenuLineExtraMuted : styles.mobileMenuLineMuted;
+  const lineStyle = useMemo(() => [styles.mobileMenuLine, color], [color]);
+  const shortLineStyle = useMemo(
+    () => [styles.mobileMenuLine, styles.mobileMenuLineShort, color],
+    [color],
+  );
+  return (
+    <View style={styles.mobileMenuIcon} pointerEvents="none">
+      <View style={lineStyle} />
+      <View style={lineStyle} />
+      <View style={shortLineStyle} />
+    </View>
+  );
+}
+
+function SidebarMenuToggleButton({
+  isMobile,
+  extraMutedIdleIcon = false,
+  resolvedStyle,
+  tooltipSide = "right",
+  testID = "menu-button",
+  nativeID = "menu-button",
+}: Omit<SidebarMenuToggleProps, "style"> & {
+  isMobile: boolean;
+  extraMutedIdleIcon?: boolean;
+  resolvedStyle: StyleProp<ViewStyle>;
+}) {
+  const { t } = useTranslation();
+  const isOpen = usePanelStore((state) => selectIsAgentListOpen(state, { isCompact: isMobile }));
+  const toggleAgentListForLayout = usePanelStore((state) => state.toggleAgentListForLayout);
+  const toggleShortcutKeys = useMemo(
+    () => (getShortcutOs() === "mac" ? ["mod", "B"] : ["mod", "."]),
+    [],
+  );
+
+  const handlePress = useCallback(() => {
+    toggleAgentListForLayout({ isCompact: isMobile });
+  }, [toggleAgentListForLayout, isMobile]);
+
+  const accessibilityState = useMemo(() => ({ expanded: isOpen }), [isOpen]);
+
+  return (
+    <HeaderToggleButton
+      onPress={handlePress}
+      tooltipLabel={t("shell.menu.toggleSidebar")}
+      tooltipKeys={toggleShortcutKeys}
+      tooltipSide={tooltipSide}
+      testID={testID}
+      nativeID={nativeID}
+      style={resolvedStyle}
+      accessible
+      accessibilityRole="button"
+      accessibilityLabel={isOpen ? t("shell.menu.close") : t("shell.menu.open")}
+      accessibilityState={accessibilityState}
+    >
+      {isMobile ? (
+        <MobileMenuIcon extraMuted={extraMutedIdleIcon} />
+      ) : (
+        <ThemedPanelLeft
+          size={iconButtonChromeGlyphSize("large")}
+          strokeWidth={1.5}
+          uniProps={extraMutedIdleIcon ? extraMutedIconColorMapping : mutedIconColorMapping}
+        />
+      )}
+    </HeaderToggleButton>
+  );
+}
+
+export function SidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
+  const isMobile = useIsCompactFormFactor();
+  const ownsTopLeft = useOwnsWindowChromeCorner("top-left");
+  const hasTopLeftWindowControls = useHasWindowChromeObstruction("top-left");
+  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
+  const placeholderStyle = useMemo(
+    () => [headerIconSlotStyle.slot, resolvedStyle],
+    [resolvedStyle],
+  );
+
+  if (!isMobile && !ownsTopLeft) {
+    return null;
+  }
+
+  if (!isMobile && hasTopLeftWindowControls) {
+    return (
+      <View pointerEvents="none" style={placeholderStyle}>
+        <View style={styles.desktopMenuIconSpace} />
+      </View>
+    );
+  }
+
+  return <SidebarMenuToggleButton {...props} isMobile={isMobile} resolvedStyle={resolvedStyle} />;
+}
+
+export function WindowSidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
+  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
+  return (
+    <SidebarMenuToggleButton
+      {...props}
+      isMobile={false}
+      extraMutedIdleIcon
+      resolvedStyle={resolvedStyle}
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  leadingToggle: {
+    marginLeft: {
+      xs: 0,
+      md: -theme.spacing[2],
+    },
+  },
+  mobileMenuIcon: {
+    width: MOBILE_MENU_LINE_WIDTH,
+    height: 12,
+    justifyContent: "space-between",
+    alignItems: "flex-start",
+  },
+  desktopMenuIconSpace: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+  },
+  mobileMenuLine: {
+    width: MOBILE_MENU_LINE_WIDTH,
+    height: MOBILE_MENU_LINE_HEIGHT,
+    borderRadius: theme.borderRadius.full,
+  },
+  mobileMenuLineMuted: {
+    backgroundColor: theme.colors.foregroundMuted,
+  },
+  mobileMenuLineExtraMuted: {
+    backgroundColor: theme.colors.foregroundExtraMuted,
+  },
+  mobileMenuLineShort: {
+    width: MOBILE_MENU_LINE_SHORT_WIDTH,
+  },
+}));
diff --git a/packages/app/src/components/hosts/host-filter.tsx b/packages/app/src/components/hosts/host-filter.tsx
index ffdb6a2130..d073dc943d 100644
--- a/packages/app/src/components/hosts/host-filter.tsx
+++ b/packages/app/src/components/hosts/host-filter.tsx
@@ -2,13 +2,13 @@ import { useCallback, useMemo, useRef, useState, type ReactElement } from "react
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
 import { ChevronDown, Server } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { HostProfile } from "@/types/host-connection";
 import type { Theme } from "@/styles/theme";
 import {
   ALL_HOSTS_OPTION_ID,
   getHostPickerLabel,
   HostPicker,
   HostStatusDotSlot,
+  type HostPickerHost,
 } from "@/components/hosts/host-picker";
 
 const ThemedServer = withUnistyles(Server);
@@ -16,7 +16,7 @@ const ThemedChevronDown = withUnistyles(ChevronDown);
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
 export interface HostFilterProps {
-  hosts: HostProfile[];
+  hosts: HostPickerHost[];
   selectedHost: string;
   onSelectHost: (serverId: string) => void;
   /**
@@ -29,9 +29,9 @@ export interface HostFilterProps {
 }
 
 /**
- * The "All hosts / <host>" filter pill shared by the History and Schedules
- * screens: an anchored HostPicker with `includeAllHost`, hidden by the caller
- * when only one host exists. Copies the History layout exactly.
+ * The "All hosts / <host>" host pill shared by History, Schedules, Usage, the label manager and
+ * plugin screens: an anchored HostPicker, hidden by the caller when only one host exists. Without
+ * `includeAllHost` it picks the one host a surface shows.
  */
 export function HostFilter({
   hosts,
diff --git a/packages/app/src/components/hosts/host-picker.tsx b/packages/app/src/components/hosts/host-picker.tsx
index 9bc8955e64..ced0be3d55 100644
--- a/packages/app/src/components/hosts/host-picker.tsx
+++ b/packages/app/src/components/hosts/host-picker.tsx
@@ -24,7 +24,7 @@ export {
 
 const SEARCHABLE_THRESHOLD = 10;
 type RenderHostOption = NonNullable<ComboboxProps["renderOption"]>;
-interface HostPickerHost {
+export interface HostPickerHost {
   serverId: string;
   label: string;
 }
diff --git a/packages/app/src/components/import-session-sheet.test.tsx b/packages/app/src/components/import-session-sheet.test.tsx
index 65e32d752c..35c475e824 100644
--- a/packages/app/src/components/import-session-sheet.test.tsx
+++ b/packages/app/src/components/import-session-sheet.test.tsx
@@ -63,7 +63,8 @@ vi.mock("@/constants/layout", () => ({
 }));
 
 vi.mock("@/components/provider-icons", () => ({
-  getProviderIcon: () => () => null,
+  useProviderIcon: () => () => null,
+  useProviderIcons: () => () => () => null,
 }));
 
 vi.mock("lucide-react-native", () => {
diff --git a/packages/app/src/components/import-session-sheet.tsx b/packages/app/src/components/import-session-sheet.tsx
index 4ae38a9aea..3be15c0892 100644
--- a/packages/app/src/components/import-session-sheet.tsx
+++ b/packages/app/src/components/import-session-sheet.tsx
@@ -13,8 +13,8 @@ import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-moda
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { getProviderIcon } from "@/components/provider-icons";
-import { formatTimeAgo } from "@/utils/time";
+import { useProviderIcon, useProviderIcons } from "@/components/provider-icons";
+import { useTimeAgo } from "@/hooks/use-time-ago";
 import { useDebouncedValue } from "@/hooks/use-debounced-value";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { useHostProjects } from "@/projects/host-projects";
@@ -290,12 +290,14 @@ function SheetEmptyState({ title }: { title: string }) {
 }
 
 function ImportSessionSheetRow({
+  serverId,
   entry,
   disabled,
   importing,
   folder,
   onImportSession,
 }: {
+  serverId: string | null;
   entry: FetchRecentProviderSessionEntry;
   disabled: boolean;
   importing: boolean;
@@ -307,8 +309,7 @@ function ImportSessionSheetRow({
   const { t } = useTranslation();
   const title = getSessionTitle(entry);
   const promptPreview = getPromptPreview(entry);
-  const lastActivity = formatTimeAgo(new Date(entry.lastActivityAt));
-  const ProviderIcon = getProviderIcon(entry.providerId);
+  const ProviderIcon = useProviderIcon(entry.providerId, serverId);
   const accessibilityState = useMemo(
     () => (disabled ? DISABLED_ACCESSIBILITY_STATE : undefined),
     [disabled],
@@ -342,9 +343,11 @@ function ImportSessionSheetRow({
           <Text style={styles.rowTitle} numberOfLines={1}>
             {title}
           </Text>
-          <Text style={styles.rowMeta}>
-            {importing ? t("importSession.row.importing") : lastActivity}
-          </Text>
+          {importing ? (
+            <Text style={styles.rowMeta}>{t("importSession.row.importing")}</Text>
+          ) : (
+            <ImportSessionActivityTime date={entry.lastActivityAt} />
+          )}
         </View>
         <Text style={styles.rowPreview} numberOfLines={2}>
           {promptPreview}
@@ -363,13 +366,20 @@ function ImportSessionSheetRow({
   );
 }
 
+function ImportSessionActivityTime({ date }: { date: string }) {
+  const label = useTimeAgo(new Date(date));
+  return <Text style={styles.rowMeta}>{label}</Text>;
+}
+
 function SessionRows({
+  serverId,
   entries,
   disabled,
   importingSessionKey,
   resolveFolder,
   onImportSession,
 }: {
+  serverId: string | null;
   entries: ReadonlyArray<FetchRecentProviderSessionEntry>;
   disabled: boolean;
   importingSessionKey: string | null;
@@ -381,6 +391,7 @@ function SessionRows({
       {entries.map((entry) => (
         <ImportSessionSheetRow
           key={`${entry.providerId}:${entry.providerHandleId}`}
+          serverId={serverId}
           entry={entry}
           disabled={disabled}
           importing={importingSessionKey === `${entry.providerId}:${entry.providerHandleId}`}
@@ -548,6 +559,8 @@ export function ImportSessionSheet({
     setIsFilterOpen(false);
   }, []);
 
+  const getProviderIcon = useProviderIcons(serverId);
+  const SelectedProviderIcon = useProviderIcon(selectedProvider, serverId);
   const filterOptionIcons = useMemo(() => {
     const map = new Map<string, React.ReactNode>();
     map.set(ALL_FILTER_VALUE, <Layers size={14} color={theme.colors.foregroundMuted} />);
@@ -556,7 +569,7 @@ export function ImportSessionSheet({
       map.set(provider, <ProviderIcon size={14} color={theme.colors.foregroundMuted} />);
     }
     return map;
-  }, [filterProviders, theme.colors.foregroundMuted]);
+  }, [filterProviders, getProviderIcon, theme.colors.foregroundMuted]);
 
   const renderFilterOption = useCallback(
     ({
@@ -735,10 +748,7 @@ export function ImportSessionSheet({
             {selectedProvider === ALL_FILTER_VALUE ? (
               <Layers size={14} color={theme.colors.foregroundMuted} />
             ) : (
-              (() => {
-                const ProviderIcon = getProviderIcon(selectedProvider);
-                return <ProviderIcon size={14} color={theme.colors.foregroundMuted} />;
-              })()
+              <SelectedProviderIcon size={14} color={theme.colors.foregroundMuted} />
             )}
             <Text style={styles.filterTriggerText} numberOfLines={1}>
               {selectedProviderLabel}
@@ -773,6 +783,7 @@ export function ImportSessionSheet({
       ) : null}
       {visibleEntries.length > 0 ? (
         <SessionRows
+          serverId={serverId}
           entries={visibleEntries}
           disabled={importMutation.isPending}
           importingSessionKey={importingSessionKey}
diff --git a/packages/app/src/components/keyboard-dock.d.ts b/packages/app/src/components/keyboard-dock.d.ts
deleted file mode 100644
index d8d61aa441..0000000000
--- a/packages/app/src/components/keyboard-dock.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./keyboard-dock.native";
diff --git a/packages/app/src/components/keyboard-dock.native.tsx b/packages/app/src/components/keyboard-dock.native.tsx
deleted file mode 100644
index 4fa9ea4a7a..0000000000
--- a/packages/app/src/components/keyboard-dock.native.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ReactNode } from "react";
-import type { ViewProps } from "react-native";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { useKeyboardShift } from "@/hooks/keyboard-shift-context";
-
-interface KeyboardDockProps extends ViewProps {
-  children: ReactNode;
-}
-
-export function KeyboardDock({ children, style, ...props }: KeyboardDockProps) {
-  const { shift } = useKeyboardShift();
-  const keyboardPaddingStyle = useAnimatedStyle(() => ({
-    paddingBottom: shift.value,
-  }));
-
-  return (
-    <Animated.View style={[style, keyboardPaddingStyle]} {...props}>
-      {children}
-    </Animated.View>
-  );
-}
diff --git a/packages/app/src/components/keyboard-dock.web.tsx b/packages/app/src/components/keyboard-dock.web.tsx
deleted file mode 100644
index 4d28739ac3..0000000000
--- a/packages/app/src/components/keyboard-dock.web.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { ReactNode } from "react";
-import { View, type ViewProps } from "react-native";
-
-interface KeyboardDockProps extends ViewProps {
-  children: ReactNode;
-}
-
-export function KeyboardDock(props: KeyboardDockProps) {
-  return <View {...props} />;
-}
diff --git a/packages/app/src/components/left-sidebar.tsx b/packages/app/src/components/left-sidebar.tsx
index 1cdfe83e6d..087a3ffca8 100644
--- a/packages/app/src/components/left-sidebar.tsx
+++ b/packages/app/src/components/left-sidebar.tsx
@@ -1,5 +1,13 @@
 import { router } from "expo-router";
-import { FolderPlus, GitBranch, Import, Server, Settings, X } from "lucide-react-native";
+import {
+  CircleGauge,
+  FolderPlus,
+  GitBranch,
+  Server,
+  Settings,
+  X,
+  type LucideIcon,
+} from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { memo, useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
 import {
@@ -8,7 +16,6 @@ import {
   Text,
   useWindowDimensions,
   View,
-  type PressableStateCallbackType,
 } from "react-native";
 import { Gesture } from "react-native-gesture-handler";
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
@@ -23,9 +30,11 @@ import {
 } from "@/components/sidebar-resize-handle-layout";
 import { HostPicker } from "@/components/hosts/host-picker";
 import { SidebarDisplayPreferencesMenu } from "@/components/sidebar/display-preferences/menu";
+import { SidebarSeparator } from "@/components/sidebar/sidebar-separator";
 import { SidebarNavRows } from "@/components/sidebar/sidebar-nav-rows";
 import { SidebarHelpMenu } from "@/components/sidebar/sidebar-help-menu";
 import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { HEADER_INNER_HEIGHT, useIsCompactFormFactor } from "@/constants/layout";
@@ -36,6 +45,7 @@ import {
   type SidebarProjectEntry,
   type SidebarWorkspaceEntry,
 } from "@/hooks/use-sidebar-workspaces-list";
+import { density } from "@/styles/density";
 import { useSidebarModel } from "@/components/sidebar/sidebar-model";
 import type { PinnedSidebarGroups } from "@/hooks/use-sidebar-pins";
 import { RetainedPanelActivity } from "@/components/retained-panel";
@@ -43,12 +53,21 @@ import type { SidebarWorkspaceGroup } from "@/components/sidebar/sidebar-labels"
 import type { SidebarProjectIconTarget } from "@/utils/sidebar-project-row-model";
 import { type SidebarGroupMode, useSidebarViewStore } from "@/stores/sidebar-view-store";
 import { useHosts } from "@/runtime/host-runtime";
+import { PluginSidebarItem } from "@/plugins/sidebar-items";
+import { builtinSidebarNavLabelKey } from "@/sidebar-nav/model";
+import { useSidebarNavItems } from "@/sidebar-nav/use-sidebar-nav-items";
 import { usePanelStore } from "@/stores/panel-store";
 import { useOwnsWindowChromeCorner, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { useCloseAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelOverlay } from "@/mobile-panels/presentation";
 import { buildSettingsAddHostRoute, buildSettingsRoute } from "@/utils/host-routes";
 import { openHostOverview } from "@/navigation/settings-navigation";
+import {
+  UsageSidebarItem,
+  UsageSidebarRoot,
+  useHasUsageSummary,
+  useOpenSidebarUsage,
+} from "@/usage";
 import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
 import { SidebarCalloutSlot } from "./sidebar-callout-slot";
 import { SidebarWorkspaceList } from "./sidebar-workspace-list";
@@ -85,9 +104,9 @@ interface SidebarSharedProps {
 interface SidebarLabels {
   addProject: string;
   hosts: string;
-  importSession: string;
   settings: string;
   searchHosts: string;
+  usage: string;
   closeSidebar: string;
 }
 
@@ -192,9 +211,9 @@ export const LeftSidebar = memo(function LeftSidebar({ active }: { active: boole
     (): SidebarLabels => ({
       addProject: t("sidebar.actions.addProject"),
       hosts: t("sidebar.actions.hosts"),
-      importSession: t("importSession.title"),
       settings: t("sidebar.actions.settings"),
       searchHosts: t("sidebar.host.searchPlaceholder"),
+      usage: t(builtinSidebarNavLabelKey("usage")),
       closeSidebar: t("sidebar.actions.closeSidebar"),
     }),
     [t],
@@ -270,18 +289,17 @@ function FooterIconButton({
   onPress,
   testID,
   label,
-  icon: Icon,
-  iconSize,
+  icon,
+  iconSizeAdjustment = 0,
   shortcutKeys,
-  theme,
 }: {
   onPress: () => void;
   testID: string;
   label: string;
-  icon: typeof FolderPlus;
-  iconSize?: number;
+  icon: LucideIcon;
+  /** Only for a glyph that reads larger than the others at the same size. */
+  iconSizeAdjustment?: number;
   shortcutKeys?: ReturnType<typeof useShortcutKeys>;
-  theme: SidebarTheme;
   buttonRef?: RefObject<View | null>;
 }) {
   return (
@@ -299,72 +317,16 @@ function FooterIconButton({
           onPress={onPress}
         >
           {({ hovered }) => (
-            <Icon
-              size={iconSize ?? theme.iconSize.md}
-              color={hovered ? theme.colors.foreground : theme.colors.foregroundMuted}
+            <DensityIcon
+              icon={icon}
+              size="md"
+              sizeAdjustment={iconSizeAdjustment}
+              color={hovered ? "foreground" : "foregroundMuted"}
             />
           )}
         </Pressable>
       </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <IconTooltipContent label={label} shortcutKeys={shortcutKeys} />
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
-function footerAddProjectButtonStyle({
-  hovered,
-}: PressableStateCallbackType & { hovered?: boolean }) {
-  return [styles.footerAddProjectButton, Boolean(hovered) && styles.footerAddProjectButtonHovered];
-}
-
-function FooterAddProjectButton({
-  onPress,
-  label,
-  shortcutKeys,
-  theme,
-}: {
-  onPress: () => void;
-  label: string;
-  shortcutKeys: ReturnType<typeof useShortcutKeys>;
-  theme: SidebarTheme;
-}) {
-  return (
-    <Tooltip delayDuration={300}>
-      <TooltipTrigger asChild>
-        <Pressable
-          style={footerAddProjectButtonStyle}
-          testID="sidebar-add-project"
-          nativeID="sidebar-add-project"
-          accessible
-          accessibilityLabel={label}
-          accessibilityRole="button"
-          onPress={onPress}
-        >
-          {({ hovered }) => {
-            const isHovered = Boolean(hovered);
-            return (
-              <>
-                <FolderPlus
-                  size={theme.iconSize.sm}
-                  color={isHovered ? theme.colors.foreground : theme.colors.foregroundMuted}
-                />
-                <Text
-                  numberOfLines={1}
-                  style={[
-                    styles.footerAddProjectLabel,
-                    isHovered && styles.footerAddProjectLabelHovered,
-                  ]}
-                >
-                  {label}
-                </Text>
-              </>
-            );
-          }}
-        </Pressable>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
+      <TooltipContent side="top" align="center" offset={8} testID={`${testID}-tooltip`}>
         <IconTooltipContent label={label} shortcutKeys={shortcutKeys} />
       </TooltipContent>
     </Tooltip>
@@ -372,12 +334,10 @@ function FooterAddProjectButton({
 }
 
 function SidebarHostPicker({
-  theme,
   label,
   onAddHost,
   onOpenHostSettings,
 }: {
-  theme: SidebarTheme;
   label: string;
   onAddHost: () => void;
   onOpenHostSettings: (serverId: string) => void;
@@ -419,8 +379,8 @@ function SidebarHostPicker({
         testID="sidebar-hosts-trigger"
         label={label}
         icon={Server}
-        iconSize={theme.iconSize.sm}
-        theme={theme}
+        // Server's two boxes fill more of the square than the other glyphs.
+        iconSizeAdjustment={-1}
       />
     </HostPicker>
   );
@@ -442,64 +402,106 @@ function IconTooltipContent({
 }
 
 function SidebarFooter({
-  theme,
   handleOpenProject,
-  handleImportSession,
   handleSettings,
   labels,
   handleAddHost,
   handleOpenHostSettings,
+  onBeforeNavigate,
 }: {
-  theme: SidebarTheme;
   handleOpenProject: () => void;
-  handleImportSession: () => void;
   handleSettings: () => void;
   labels: {
     addProject: string;
     hosts: string;
-    importSession: string;
     settings: string;
     searchHosts: string;
+    usage: string;
   };
   handleAddHost: () => void;
   handleOpenHostSettings: (serverId: string) => void;
+  onBeforeNavigate?: () => void;
 }) {
   const newAgentKeys = useShortcutKeys("new-agent");
   const settingsKeys = useShortcutKeys("toggle-settings");
 
+  // One line of icons: Add project, Usage, Hosts, then Help and Settings at the end.
   return (
-    <View style={styles.sidebarFooter}>
-      <FooterAddProjectButton
-        onPress={handleOpenProject}
-        label={labels.addProject}
-        shortcutKeys={newAgentKeys}
-        theme={theme}
-      />
-      <View style={styles.footerIconRow}>
-        <SidebarHostPicker
-          theme={theme}
-          label={labels.hosts}
-          onAddHost={handleAddHost}
-          onOpenHostSettings={handleOpenHostSettings}
-        />
-        <FooterIconButton
-          onPress={handleImportSession}
-          testID="sidebar-import-session"
-          label={labels.importSession}
-          icon={Import}
-          theme={theme}
-        />
-        <SidebarHelpMenu />
-        <FooterIconButton
-          onPress={handleSettings}
-          testID="sidebar-settings"
-          label={labels.settings}
-          icon={Settings}
-          shortcutKeys={settingsKeys}
-          theme={theme}
-        />
+    <UsageSidebarRoot>
+      <View style={styles.footerContainer} testID="sidebar-footer">
+        <SidebarFooterRows onBeforeNavigate={onBeforeNavigate} />
+        <View style={styles.sidebarFooter} testID="sidebar-footer-bottom-line">
+          <FooterIconButton
+            onPress={handleOpenProject}
+            testID="sidebar-add-project"
+            label={labels.addProject}
+            icon={FolderPlus}
+            shortcutKeys={newAgentKeys}
+          />
+          <SidebarUsageIcon label={labels.usage} />
+          <SidebarHostPicker
+            label={labels.hosts}
+            onAddHost={handleAddHost}
+            onOpenHostSettings={handleOpenHostSettings}
+          />
+          <View style={styles.footerSpacer} />
+          <SidebarHelpMenu />
+          <FooterIconButton
+            onPress={handleSettings}
+            testID="sidebar-settings"
+            label={labels.settings}
+            icon={Settings}
+            shortcutKeys={settingsKeys}
+          />
+        </View>
       </View>
-    </View>
+    </UsageSidebarRoot>
+  );
+}
+
+function SidebarUsageIcon({ label }: { label: string }) {
+  const openUsage = useOpenSidebarUsage();
+  return (
+    <FooterIconButton
+      onPress={openUsage}
+      testID="sidebar-usage-icon"
+      label={label}
+      icon={CircleGauge}
+    />
+  );
+}
+
+/**
+ * The footer rows in the user's `sidebarFooterItems` order: the Usage item and plugin rows. The
+ * Usage item is left out while it has no summary to show.
+ */
+function SidebarFooterRows({ onBeforeNavigate }: { onBeforeNavigate?: () => void }) {
+  const { items } = useSidebarNavItems("footer");
+  const hasUsageSummary = useHasUsageSummary();
+  const rowsRef = useRef<View | null>(null);
+  const visibleItems = items.filter(
+    (item) => item.visible && (item.kind === "plugin" || hasUsageSummary),
+  );
+  if (visibleItems.length === 0) return null;
+  return (
+    <>
+      <View ref={rowsRef} collapsable={false} style={styles.footerRows}>
+        {visibleItems.map((item) =>
+          item.kind === "plugin" ? (
+            <PluginSidebarItem
+              key={item.key}
+              group={item.group}
+              section="footer"
+              fallbackAnchorRef={rowsRef}
+              onBeforeNavigate={onBeforeNavigate}
+            />
+          ) : (
+            <UsageSidebarItem key={item.key} />
+          ),
+        )}
+      </View>
+      <SidebarSeparator testID="sidebar-footer-separator" />
+    </>
   );
 }
 
@@ -556,7 +558,11 @@ function MobileSidebar({
       <View style={styles.sidebarContent} pointerEvents="auto">
         <WindowChromeSafeArea placement="below" />
         <SidebarNavRows style={styles.sidebarHeaderGroup} onBeforeNavigate={closeSidebar} />
-        <WindowChromeSafeArea placement="inline" style={styles.mobileCloseButtonRow}>
+        <WindowChromeSafeArea
+          placement="inline"
+          pointerEvents="box-none"
+          style={styles.mobileCloseButtonRow}
+        >
           <Pressable
             style={styles.mobileCloseButton}
             onPress={closeSidebar}
@@ -603,13 +609,12 @@ function MobileSidebar({
         )}
 
         <SidebarFooter
-          theme={theme}
           handleOpenProject={handleOpenProject}
-          handleImportSession={handleImportSession}
           handleSettings={handleSettings}
           labels={labels}
           handleAddHost={handleAddHost}
           handleOpenHostSettings={handleOpenHostSettings}
+          onBeforeNavigate={closeSidebar}
         />
       </View>
     </MobilePanelOverlay>
@@ -780,9 +785,7 @@ function DesktopSidebar({
         <SidebarCalloutSlot />
 
         <SidebarFooter
-          theme={theme}
           handleOpenProject={handleOpenProject}
-          handleImportSession={handleImportSession}
           handleSettings={handleSettings}
           labels={labels}
           handleAddHost={handleAddHost}
@@ -881,7 +884,6 @@ const styles = StyleSheet.create((theme) => ({
     right: 0,
     zIndex: 2,
     alignItems: "flex-end",
-    pointerEvents: "box-none",
   },
   mobileCloseButton: {
     // The 16px X paints farther inside its 32px hit target than the 14px Settings2 glyph.
@@ -929,48 +931,30 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.sm,
     fontWeight: theme.fontWeight.medium,
   },
-  sidebarFooter: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[3],
+  footerContainer: {
     borderTopWidth: 1,
     borderTopColor: theme.colors.border,
   },
-  footerIconRow: {
+  // Buttons sit edge to edge; their own inset spaces the glyphs.
+  sidebarFooter: {
     flexDirection: "row",
     alignItems: "center",
-    gap: theme.spacing[2],
-    flexShrink: 0,
-  },
-  footerAddProjectButton: {
-    minWidth: 0,
-    minHeight: 32,
-    flex: 1,
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingVertical: theme.spacing[1.5],
     paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.lg,
+    paddingVertical: theme.spacing[1.5],
   },
-  footerAddProjectButtonHovered: {
-    backgroundColor: theme.colors.surfaceSidebarHover,
+  // Pushes Help and Settings to the end of the icon line.
+  footerSpacer: {
+    flex: 1,
   },
-  footerAddProjectLabel: {
-    minWidth: 0,
-    flexShrink: 1,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.normal,
-    color: theme.colors.foregroundMuted,
-  },
-  footerAddProjectLabelHovered: {
-    color: theme.colors.foreground,
+  // Usage and plugin rows sit above the footer's icon line, spaced like the header nav rows.
+  footerRows: {
+    paddingHorizontal: theme.spacing[2],
+    paddingVertical: theme.spacing[1.5],
+    gap: 2,
   },
   footerIconButton: {
-    width: 28,
-    height: 28,
+    width: density.iconButton,
+    height: density.iconButton,
     alignItems: "center",
     justifyContent: "center",
     paddingVertical: theme.spacing[1],
diff --git a/packages/app/src/components/markdown/html-ish.test.ts b/packages/app/src/components/markdown/html-ish.test.ts
index 37e3aeddb5..d8b45ae415 100644
--- a/packages/app/src/components/markdown/html-ish.test.ts
+++ b/packages/app/src/components/markdown/html-ish.test.ts
@@ -113,6 +113,85 @@ describe("splitHtmlishMarkdown", () => {
     ]);
   });
 
+  it("renders a linked picture inside a heading without exposing its HTML", () => {
+    const source = [
+      '<h2><a href="https://example.com/retrigger?id=73851569"><picture>',
+      '<source media="(prefers-color-scheme: dark)" srcset="https://example.com/dark.svg">',
+      '<source media="(prefers-color-scheme: light)" srcset="https://example.com/light.svg">',
+      '<img alt="Retrigger" src="https://example.com/default.svg" width="85" height="24">',
+      "</picture></a></h2>",
+      "",
+      "Confidence Score: 5/5",
+      "",
+      "<details><summary>Summary</summary>No outstanding findings.</details>",
+    ].join("\n");
+
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      {
+        kind: "inlineImage",
+        alt: "Retrigger",
+        src: "https://example.com/default.svg",
+        href: "https://example.com/retrigger?id=73851569",
+        width: 85,
+        height: 24,
+      },
+      { kind: "markdown", text: "\n\nConfidence Score: 5/5\n\n" },
+      { kind: "details", summary: "Summary", body: "No outstanding findings." },
+    ]);
+  });
+
+  it.each([
+    ["", ""],
+    ["<h3>", "</h3>"],
+    ['<a href="javascript:alert(1)">', "</a>"],
+  ])("uses the picture fallback without activating unsafe links (%s)", (wrapper, closing) => {
+    const picture =
+      '<picture><source srcset="https://example.com/alternate.svg"/><img src="https://example.com/default.svg" alt="Image"></picture>';
+
+    expect(splitHtmlishMarkdown(`${wrapper}${picture}${closing}`)).toEqual([
+      { kind: "inlineImage", src: "https://example.com/default.svg", alt: "Image" },
+    ]);
+  });
+
+  it("keeps picture examples literal inside inline and fenced code", () => {
+    const picture =
+      '<picture><source srcset="https://example.com/alternate.svg"><img src="https://example.com/default.svg"></picture>';
+    const source = `Use \`${picture}\`\n\n\`\`\`html\n${picture}\n\`\`\``;
+    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
+  });
+
+  it.each(["p", "div"])("renders a linked picture inside %s", (wrapper) => {
+    const source = `<${wrapper}><a href="https://example.com/page"><picture><source srcset="https://example.com/dark.svg"><img src="https://example.com/default.svg" alt="Image"></picture></a></${wrapper}>`;
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      {
+        kind: "inlineImage",
+        src: "https://example.com/default.svg",
+        alt: "Image",
+        href: "https://example.com/page",
+      },
+    ]);
+  });
+
+  it.each(["h2", "p", "div"])("keeps text after an image-only %s on a separate row", (wrapper) => {
+    const source = `<${wrapper}><img src="https://example.com/image.svg" alt="Image"></${wrapper}>Next section`;
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      { kind: "inlineImage", src: "https://example.com/image.svg", alt: "Image" },
+      { kind: "markdown", text: "Next section" },
+    ]);
+  });
+
+  it("handles deeply nested image wrappers without exhausting the stack", () => {
+    const source = `${"<div>".repeat(10000)}<a href="https://example.com/page"><picture><img src="https://example.com/image.svg" alt="Image"></picture></a>${"</div>".repeat(10000)}`;
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      {
+        kind: "inlineImage",
+        src: "https://example.com/image.svg",
+        alt: "Image",
+        href: "https://example.com/page",
+      },
+    ]);
+  });
+
   it("preserves inline image parts inside details bodies", () => {
     expect(
       splitHtmlishMarkdown(
@@ -312,6 +391,43 @@ describe("splitHtmlishMarkdown", () => {
     );
   });
 
+  it("keeps table rows after a comparison that only looks like a tag", () => {
+    const source = [
+      "| ID | Note | Status |",
+      "|---|---|---|",
+      "| a-1 | accepts 1<size<2 only | open |",
+      "| a-2 | second row | open |",
+      "",
+      "Later x -> y.",
+    ].join("\n");
+
+    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
+  });
+
+  it.each(["See <https://example.com/docs> for more.", "Stop when a<b", "Keep </ b> and a <b"])(
+    "keeps %j literal because it is not HTML",
+    (source) => {
+      expect(normalizeHtmlishMarkdown(source)).toBe(source);
+    },
+  );
+
+  it.each([
+    "Call As<Integer>() before limits<DWORD>::max()",
+    "<Kbd Data-Key='K'>Ctrl</Kbd> then <Foo/>",
+  ])("echoes unknown tags in %j as written", (source) => {
+    expect(normalizeHtmlishMarkdown(source)).toBe(source);
+  });
+
+  it("rebuilds an unknown tag that a code span splits", () => {
+    expect(normalizeHtmlishMarkdown('<Tip title="`x`">hi</Tip>')).toBe("`x`<tip title>hi</Tip>");
+  });
+
+  it("still reads tags and comments next to literal angle brackets", () => {
+    expect(normalizeHtmlishMarkdown("1<n<2 <b>bold</b><!-- hidden --> 3<4")).toBe(
+      "1<n<2 **bold** 3<4",
+    );
+  });
+
   it("falls back to inert markdown when details are unclosed", () => {
     const source = "<details><summary>Open</summary>Still open";
 
diff --git a/packages/app/src/components/markdown/html-ish.ts b/packages/app/src/components/markdown/html-ish.ts
index 93a88cd4b8..bd095c60b3 100644
--- a/packages/app/src/components/markdown/html-ish.ts
+++ b/packages/app/src/components/markdown/html-ish.ts
@@ -29,7 +29,13 @@ const FENCE_LINE_RE = /^ {0,3}([`~]{3,})[^\n\r]*(?:\r?\n|$)/gm;
 const BACKTICK_RUN_RE = /`+/g;
 const SAFE_IMAGE_SRC_RE = /^(https?:\/\/|data:image\/(?:png|gif|jpe?g);base64,)/i;
 const SAFE_LINK_HREF_RE = /^(https?:\/\/|#(?:$|[\w-]))/i;
-const VOID_HTML_TAGS = new Set(["br", "img"]);
+// CommonMark open and closing tags (spec "Raw HTML"); comments are matched separately.
+const HTML_ATTRIBUTE = String.raw`\s+[A-Za-z_:][\w.:-]*(?:\s*=\s*(?:[^\s"'=<>\x60]+|'[^']*'|"[^"]*"))?`;
+const HTML_TAG_RE = new RegExp(
+  String.raw`<(?:[A-Za-z][A-Za-z0-9-]*(?:${HTML_ATTRIBUTE})*\s*\/?|\/[A-Za-z][A-Za-z0-9-]*\s*)>`,
+  "y",
+);
+const VOID_HTML_TAGS = new Set(["br", "img", "source"]);
 const MARKDOWN_TAG_WRAPPERS: Readonly<Record<string, readonly [string, string]>> = {
   b: ["**", "**"],
   del: ["~~", "~~"],
@@ -140,25 +146,73 @@ function parseInlineImageAt(tokens: HtmlToken[], start: number): InlineImagePars
     return image ? { part: image, end: start + 1 } : null;
   }
 
-  if (token.name !== "a") {
+  if (token.name !== "a" && token.name !== "picture" && !isImageBlockWrapper(token)) {
     return null;
   }
 
-  const closeIndex = findMatchingClose(tokens, start, "a");
-  if (closeIndex === null) {
-    return null;
-  }
+  return parseWrappedImageAt(tokens, start);
+}
 
-  const image = getSingleImageChild(tokens.slice(start + 1, closeIndex));
-  if (!image) {
-    return null;
-  }
+function parseWrappedImageAt(tokens: HtmlToken[], start: number): InlineImageParseResult | null {
+  // Walk an image-only wrapper chain once. Recursing over copied child slices
+  // makes deeply nested review HTML quadratic and can exhaust the JS stack.
+  const wrappers: string[] = [];
+  let image: MarkdownInlineImagePart | null = null;
+  let href: string | undefined;
+  let hasLink = false;
 
-  const inlineImage = imageTokenToInlineImage(image, safeHref(token.attributes.href));
-  return inlineImage ? { part: inlineImage, end: closeIndex + 1 } : null;
+  for (let index = start; index < tokens.length; index += 1) {
+    const child = tokens[index];
+    if (child.kind === "comment" || isWhitespaceText(child)) {
+      continue;
+    }
+    if (child.kind !== "tag") {
+      return null;
+    }
+    if (child.closing) {
+      if (!image || wrappers.pop() !== child.name) {
+        return null;
+      }
+      if (wrappers.length === 0) {
+        return { part: image, end: index + 1 };
+      }
+      continue;
+    }
+    // Pictures use their img fallback, not responsive source selection.
+    if (child.name === "source" && wrappers.at(-1) === "picture") {
+      continue;
+    }
+    if (image) {
+      return null;
+    }
+    if (child.name === "img") {
+      image = imageTokenToInlineImage(child, href);
+      if (!image) {
+        return null;
+      }
+      continue;
+    }
+    if (child.name !== "a" && child.name !== "picture" && !isImageBlockWrapper(child)) {
+      return null;
+    }
+    if (child.name === "a" && !hasLink) {
+      href = safeHref(child.attributes.href);
+      hasLink = true;
+    }
+    wrappers.push(child.name);
+  }
+  return null;
+}
+
+function isImageBlockWrapper(token: HtmlToken | undefined): boolean {
+  return isHeadingTag(token) || isOpenTag(token, "p") || isOpenTag(token, "div");
 }
 
 function flowsWithFollowingText(tokens: HtmlToken[], start: number, end: number): boolean {
+  if (isImageBlockWrapper(tokens[start])) {
+    return false;
+  }
+
   const previous = tokens[start - 1];
   // At line start if nothing precedes this image, or the preceding token ends with only
   // whitespace since the last newline (covers a bare space between two images on the same line).
@@ -191,6 +245,9 @@ function flowsWithFollowingText(tokens: HtmlToken[], start: number, end: number)
     }
     // An inline image tag — skip over it (the image itself and its possible wrapping close tag).
     if (token.kind === "tag") {
+      if (isImageBlockWrapper(token)) {
+        return false;
+      }
       const imageResult = parseInlineImageAt(tokens, cursor);
       if (imageResult) {
         cursor = imageResult.end;
@@ -322,14 +379,16 @@ function renderInlineTokens(tokens: HtmlToken[]): string {
     }
 
     const children = tokens.slice(index + 1, closeIndex);
-    output += renderHtmlTag(token, children);
+    const close = tokens[closeIndex];
+    const closeRaw = isClosingTag(close, token.name) ? close.raw : `</${token.name}>`;
+    output += renderHtmlTag(token, children, closeRaw);
     index = closeIndex;
   }
 
   return output;
 }
 
-function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[]): string {
+function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[], closeRaw: string): string {
   if (token.name === "a") {
     return renderLinkToken(token, children);
   }
@@ -349,7 +408,7 @@ function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[]): string {
   if (token.name === "p" || token.name === "div") {
     return `\n\n${renderInlineTokens(children).trim()}\n\n`;
   }
-  return `${token.raw}${renderInlineTokens(children)}</${token.name}>`;
+  return `${token.raw}${renderInlineTokens(children)}${closeRaw}`;
 }
 
 function renderTableTokens(tokens: HtmlToken[]): string {
@@ -555,7 +614,15 @@ function tokenizeHtmlishMarkdown(source: string): HtmlToken[] {
 function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishTokenParser {
   let stripNextLeadingLineBreak = false;
   let skippedLength = 0;
+  let writtenLength = 0;
+  let chunkStart = 0;
   let parser!: Parser;
+  // Unknown tags render as text, so keep them as written: the parser lowercases names
+  // and rewrites attributes. A tag split by a protected range has no single slice.
+  const readRawTag = (): string | null =>
+    parser.startIndex < chunkStart
+      ? null
+      : source.slice(parser.startIndex + skippedLength, parser.endIndex + 1 + skippedLength);
   parser = new Parser(
     {
       onopentag(name, attributes, isImplied) {
@@ -569,7 +636,7 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
           closing: false,
           selfClosing,
           attributes,
-          raw: renderStartTag(name, attributes),
+          raw: readRawTag() ?? renderStartTag(name, attributes),
         });
       },
       onclosetag(name, isImplied) {
@@ -582,7 +649,7 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
           closing: true,
           selfClosing: false,
           attributes: {},
-          raw: `</${name}>`,
+          raw: readRawTag() ?? `</${name}>`,
         });
       },
       ontext(value) {
@@ -609,6 +676,8 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
   );
   return {
     write(chunk) {
+      chunkStart = writtenLength;
+      writtenLength += chunk.length;
       parser.write(chunk);
     },
     skip(length) {
@@ -647,7 +716,58 @@ function escapeAttribute(value: string): string {
 
 function getProtectedMarkdownRanges(source: string): ProtectedMarkdownRange[] {
   const fencedRanges = getFencedCodeRanges(source);
-  return mergeProtectedRanges([...fencedRanges, ...getInlineCodeRanges(source, fencedRanges)]);
+  const codeRanges = mergeProtectedRanges([
+    ...fencedRanges,
+    ...getInlineCodeRanges(source, fencedRanges),
+  ]);
+  return mergeProtectedRanges([...codeRanges, ...getLiteralAngleBracketRanges(source, codeRanges)]);
+}
+
+/**
+ * htmlparser2 reads any `<` followed by a letter as a tag and keeps collecting attributes up
+ * to the next `>`, so `1<n<2` in a table cell swallows the rows after it and an autolink loses
+ * its slashes. Hand it only what CommonMark would read as raw HTML; every other `<` is text.
+ */
+function getLiteralAngleBracketRanges(
+  source: string,
+  codeRanges: ProtectedMarkdownRange[],
+): ProtectedMarkdownRange[] {
+  const ranges: ProtectedMarkdownRange[] = [];
+  let codeIndex = 0;
+  // Reused across comment openers so unclosed comments stay linear.
+  let commentClose = -1;
+  let index = source.indexOf("<");
+
+  while (index !== -1) {
+    while ((codeRanges[codeIndex]?.end ?? Infinity) <= index) {
+      codeIndex += 1;
+    }
+    const code = codeRanges[codeIndex];
+    if (code && code.start <= index) {
+      index = source.indexOf("<", code.end);
+      continue;
+    }
+
+    let htmlEnd: number | null;
+    if (source.startsWith("<!--", index)) {
+      if (commentClose !== source.length && commentClose < index + 2) {
+        const close = source.indexOf("-->", index + 2);
+        commentClose = close === -1 ? source.length : close;
+      }
+      htmlEnd = commentClose === source.length ? null : commentClose + 3;
+    } else {
+      HTML_TAG_RE.lastIndex = index;
+      htmlEnd = HTML_TAG_RE.test(source) ? HTML_TAG_RE.lastIndex : null;
+    }
+
+    if (htmlEnd === null) {
+      ranges.push({ start: index, end: index + 1 });
+      htmlEnd = index + 1;
+    }
+    index = source.indexOf("<", htmlEnd);
+  }
+
+  return ranges;
 }
 
 function getFencedCodeRanges(source: string): ProtectedMarkdownRange[] {
diff --git a/packages/app/src/components/markdown/inline-image-size.ts b/packages/app/src/components/markdown/inline-image-size.ts
index c4f4b67ff3..8f83f80fcc 100644
--- a/packages/app/src/components/markdown/inline-image-size.ts
+++ b/packages/app/src/components/markdown/inline-image-size.ts
@@ -8,7 +8,6 @@ export interface InlineImageExplicitDimensions {
   height?: number;
 }
 
-const INLINE_IMAGE_FALLBACK_SIZE = 16;
 const INLINE_IMAGE_MAX_WIDTH = 240;
 const INLINE_IMAGE_MAX_HEIGHT = 160;
 
@@ -59,5 +58,5 @@ function resolveInlineImageDimensions(input: {
     return { width: input.explicit.height, height: input.explicit.height };
   }
 
-  return input.natural ?? { width: INLINE_IMAGE_FALLBACK_SIZE, height: INLINE_IMAGE_FALLBACK_SIZE };
+  return input.natural ?? { width: INLINE_IMAGE_MAX_WIDTH, height: INLINE_IMAGE_MAX_HEIGHT };
 }
diff --git a/packages/app/src/components/markdown/renderer.test.ts b/packages/app/src/components/markdown/renderer.test.ts
index 1dc279a2d5..2dcab5c327 100644
--- a/packages/app/src/components/markdown/renderer.test.ts
+++ b/packages/app/src/components/markdown/renderer.test.ts
@@ -63,10 +63,10 @@ describe("resolveInlineImageSize", () => {
     });
   });
 
-  it("uses a generic small fallback when no dimensions are known", () => {
+  it("reserves a capped 3:2 placeholder when no dimensions are known", () => {
     expect(resolveInlineImageSize({ explicit: {}, natural: null })).toEqual({
-      width: 16,
-      height: 16,
+      width: 240,
+      height: 160,
     });
   });
 });
diff --git a/packages/app/src/components/markdown/renderer.tsx b/packages/app/src/components/markdown/renderer.tsx
index db51607a8a..83380ea919 100644
--- a/packages/app/src/components/markdown/renderer.tsx
+++ b/packages/app/src/components/markdown/renderer.tsx
@@ -39,6 +39,10 @@ import {
   type MarkdownInlineImagePart,
 } from "./html-ish";
 import { resolveInlineImageSize, type InlineImageDimensions } from "./inline-image-size";
+import {
+  getAssistantImageMetadata,
+  setAssistantImageMetadata,
+} from "@/utils/assistant-image-metadata";
 import { groupMarkdownParts, type MarkdownPartGroup } from "./part-groups";
 import { colorMarkdownLinkChildren } from "./link-children";
 import { MarkdownLinkText } from "./link-text";
@@ -147,26 +151,7 @@ function MarkdownPartList({
 function keyMarkdownGroups(
   groups: MarkdownPartGroup[],
 ): { key: string; group: MarkdownPartGroup }[] {
-  const seen = new Map<string, number>();
-  return groups.map((group) => {
-    const identity =
-      group.kind === "part"
-        ? getMarkdownPartIdentity(group.part)
-        : `imageText:${group.images.map((i) => i.src).join(",")}:${group.lead.slice(0, 80)}`;
-    const seenCount = seen.get(identity) ?? 0;
-    seen.set(identity, seenCount + 1);
-    return { key: `${identity}:${seenCount}`, group };
-  });
-}
-
-function getMarkdownPartIdentity(part: MarkdownDisplayPart): string {
-  if (part.kind === "markdown") {
-    return `markdown:${part.text.slice(0, 80)}`;
-  }
-  if (part.kind === "inlineImage") {
-    return `inlineImage:${part.src}:${part.alt}`;
-  }
-  return `details:${part.summary.slice(0, 80)}:${part.body.slice(0, 80)}`;
+  return groups.map((group, index) => ({ key: `${group.kind}:${index}`, group }));
 }
 
 function MarkdownPart({
@@ -220,11 +205,16 @@ function useNaturalImageDimensions(part: MarkdownInlineImagePart): {
   failed: boolean;
   setFailed: (failed: boolean) => void;
 } {
-  const [natural, setNatural] = useState<InlineImageDimensions | null>(null);
+  const cached = useMemo(() => getAssistantImageMetadata({ source: part.src }), [part.src]);
+  const [resolved, setResolved] = useState<{
+    source: string;
+    dimensions: InlineImageDimensions;
+  } | null>(null);
+  const natural = resolved?.source === part.src ? resolved.dimensions : cached;
   const [failed, setFailed] = useState(false);
 
   useEffect(() => {
-    if (part.width && part.height) {
+    if ((part.width && part.height) || cached) {
       return;
     }
 
@@ -232,8 +222,9 @@ function useNaturalImageDimensions(part: MarkdownInlineImagePart): {
     Image.getSize(
       part.src,
       (width, height) => {
+        setAssistantImageMetadata({ source: part.src }, { width, height });
         if (!cancelled) {
-          setNatural({ width, height });
+          setResolved({ source: part.src, dimensions: { width, height } });
         }
       },
       () => {
@@ -246,7 +237,7 @@ function useNaturalImageDimensions(part: MarkdownInlineImagePart): {
     return () => {
       cancelled = true;
     };
-  }, [part.height, part.src, part.width]);
+  }, [cached, part.height, part.src, part.width]);
 
   return { natural, failed, setFailed };
 }
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 9ca8eaed10..4587556ebe 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -1,3 +1,5 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
+import { ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO } from "@/utils/assistant-image-metadata";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { TaskListRow } from "@/components/task-list-row";
 import {
@@ -30,13 +32,9 @@ import type MarkdownIt from "markdown-it";
 import { type ASTNode, type RenderRules } from "react-native-markdown-display";
 import MaskedView from "@react-native-masked-view/masked-view";
 import {
-  Circle,
   Info,
-  CheckCircle,
   XCircle,
-  FileText,
   ChevronRight,
-  ChevronDown,
   Check,
   CheckSquare,
   CircleDot,
@@ -59,7 +57,6 @@ import Animated, {
   withTiming,
 } from "react-native-reanimated";
 import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
-import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { MarkdownRenderer, type MarkdownStyles } from "@/components/markdown/renderer";
 import type { TaskActivity, TodoEntry, UserMessageImageAttachment } from "@/types/stream";
@@ -78,6 +75,7 @@ import { useRevealedText } from "@/hooks/use-revealed-text";
 import { colorMarkdownLinkChildren } from "@/components/markdown/link-children";
 import { createAssistantMarkdownParser } from "@/utils/assistant-markdown-parser";
 import { formatDuration, formatMessageTimestamp } from "@/utils/time";
+import { getTurnDurationLabel } from "./assistant-turn-footer-label";
 import { writeMarkdownToRichClipboard } from "@/utils/rich-clipboard";
 import { getDefaultMarkdownClipboardEnvironment } from "@/utils/rich-clipboard-default-environment";
 import { setAssistantMarkdownBlockHeight } from "@/utils/assistant-message-height-estimate";
@@ -112,6 +110,7 @@ import { AssistantForkMenu, type AssistantForkTarget } from "@/components/assist
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import {
   markdownCopyDataSet,
+  markdownCopyImageDataSet,
   markdownCopyOrderedListDataSet,
   markdownCopyTableCellDataSet,
   type MarkdownCopyInlineTag,
@@ -173,6 +172,9 @@ const ThemedFileSymlinkIcon = withUnistyles(FileSymlink);
 const ThemedTriangleAlertIcon = withUnistyles(TriangleAlertIcon);
 const ThemedChevronRightIcon = withUnistyles(ChevronRight);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const ThemedNotificationInfo = withUnistyles(Info);
+const ThemedNotificationWarning = withUnistyles(TriangleAlertIcon);
+const ThemedNotificationError = withUnistyles(XCircle);
 
 const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedColorMapping = (theme: Theme) => ({
@@ -182,6 +184,8 @@ const mutedForegroundColorMapping = (theme: Theme) => ({
   color: theme.colors.mutedForeground,
 });
 const destructiveColorMapping = (theme: Theme) => ({ color: theme.colors.destructive });
+const infoColorMapping = (theme: Theme) => ({ color: theme.colors.palette.blue[300] });
+const warningColorMapping = (theme: Theme) => ({ color: theme.colors.palette.amber[500] });
 const WEB_TOOLCALL_SHIMMER_KEYFRAME_CSS = `
   @keyframes ${WEB_TOOLCALL_SHIMMER_ANIMATION_NAME} {
     0% {
@@ -421,6 +425,8 @@ function UserMessageImagePill({ image, onOpen, accessibilityLabel }: UserMessage
   );
 }
 
+const MESSAGE_TEXT_DATASET = { messageText: "true" };
+
 export const UserMessage = memo(function UserMessage({
   serverId,
   agentId,
@@ -540,7 +546,7 @@ export const UserMessage = memo(function UserMessage({
             </View>
           ) : null}
           {hasText ? (
-            <Text selectable style={userMessageStylesheet.text}>
+            <Text selectable style={userMessageStylesheet.text} dataSet={MESSAGE_TEXT_DATASET}>
               {message}
             </Text>
           ) : null}
@@ -625,6 +631,7 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
   durationMs,
   onFork,
 }: AssistantTurnFooterProps) {
+  const { t } = useTranslation();
   const [hovered, setHovered] = useState(false);
   const [pressedReveal, setPressedReveal] = useState(false);
   const revealTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -640,10 +647,8 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
 
   const durationLabel = useMemo(
     () =>
-      durationMs !== undefined && durationMs !== null
-        ? `Worked for ${formatDuration(durationMs)}`
-        : "",
-    [durationMs],
+      durationMs !== undefined && durationMs !== null ? getTurnDurationLabel(durationMs, t) : "",
+    [durationMs, t],
   );
   const timestampLabel = useMemo(
     () => (completedAt ? formatMessageTimestamp(completedAt) : ""),
@@ -746,6 +751,7 @@ export const LiveElapsed = memo(function LiveElapsed({
 });
 
 interface AssistantMessageProps {
+  renderFullContent?: boolean;
   occurrenceKey: string;
   message: string;
   timestamp: number;
@@ -811,8 +817,6 @@ export const assistantMessageStylesheet = StyleSheet.create((theme) => ({
   },
 }));
 
-const ASSISTANT_IMAGE_MIN_HEIGHT = 160;
-
 function AssistantMarkdownImage({
   source,
   occurrenceKey,
@@ -857,11 +861,9 @@ function AssistantMarkdownImage({
     [containerStyle],
   );
   const imageSizeStyle = useMemo<ViewStyle>(() => {
-    if (aspectRatio) {
-      return { aspectRatio };
-    }
-    return { height: ASSISTANT_IMAGE_MIN_HEIGHT };
-  }, [aspectRatio]);
+    if (image.status === "failed") return { height: 160 };
+    return { aspectRatio: aspectRatio ?? ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO };
+  }, [aspectRatio, image.status]);
   const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
     () => [assistantMessageStylesheet.imageSurface, imageSizeStyle],
     [imageSizeStyle],
@@ -879,15 +881,16 @@ function AssistantMarkdownImage({
     () => [
       assistantMessageStylesheet.imageFrame,
       containerStyle,
-      { height: ASSISTANT_IMAGE_MIN_HEIGHT },
+      imageSizeStyle,
       assistantMessageStylesheet.imageState,
     ],
-    [containerStyle],
+    [containerStyle, imageSizeStyle],
   );
+  const copyDataSet = useMemo(() => markdownCopyImageDataSet(source, alt), [source, alt]);
 
   if (image.status === "failed") {
     return (
-      <View style={stateFrameStyle}>
+      <View style={stateFrameStyle} dataSet={copyDataSet}>
         <Text style={assistantMessageStylesheet.imageErrorText}>{image.message}</Text>
       </View>
     );
@@ -895,14 +898,14 @@ function AssistantMarkdownImage({
 
   if (!binding) {
     return (
-      <View style={stateFrameStyle}>
+      <View style={stateFrameStyle} dataSet={copyDataSet}>
         <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
       </View>
     );
   }
 
   return (
-    <View style={frameStyle}>
+    <View style={frameStyle} dataSet={copyDataSet}>
       <Pressable
         accessibilityLabel={t("composer.attachments.openImage")}
         accessibilityRole="button"
@@ -1490,6 +1493,7 @@ function MarkdownListView({
 }
 
 export const AssistantMessage = memo(function AssistantMessage({
+  renderFullContent = false,
   occurrenceKey,
   message,
   timestamp: _timestamp,
@@ -1501,10 +1505,17 @@ export const AssistantMessage = memo(function AssistantMessage({
 }: AssistantMessageProps) {
   const { t } = useTranslation();
   const markdownParser = useMemo(createAssistantMarkdownParser, []);
-  const renderedMessage = useMemo(() => capAssistantMessageForRender(message), [message]);
-  // Paint a paced prefix while the turn is streaming so text arrives at a steady
-  // rate instead of in whatever lumps the daemon's coalescing window produced.
-  const revealedMessage = useRevealedText(renderedMessage.text, phase);
+  const streamingMarkdownParser = useMemo(
+    () => createAssistantMarkdownParser({ streaming: true }),
+    [],
+  );
+  const renderedMessage = useMemo(
+    () =>
+      renderFullContent ? { text: message, capped: false } : capAssistantMessageForRender(message),
+    [message, renderFullContent],
+  );
+  const revealedText = useRevealedText(renderedMessage.text, phase);
+  const revealedMessage = renderFullContent ? renderedMessage.text : revealedText;
   const fullMessageByteLength = useMemo(
     () => (renderedMessage.capped && phase === "complete" ? getUtf8ByteLength(message) : null),
     [message, phase, renderedMessage.capped],
@@ -1966,8 +1977,12 @@ export const AssistantMessage = memo(function AssistantMessage({
   const revealDataSet = useMemo(
     () =>
       isRenderProfileEnabled()
-        ? { revealKey: occurrenceKey, revealLength: String(revealedMessage.length) }
-        : undefined,
+        ? {
+            ...MESSAGE_TEXT_DATASET,
+            revealKey: occurrenceKey,
+            revealLength: String(revealedMessage.length),
+          }
+        : MESSAGE_TEXT_DATASET,
     [occurrenceKey, revealedMessage.length],
   );
 
@@ -1982,7 +1997,11 @@ export const AssistantMessage = memo(function AssistantMessage({
           <MemoizedMarkdownBlock
             text={block}
             rules={markdownRules}
-            parser={markdownParser}
+            parser={
+              phase === "streaming" && index === keyedBlocks.length - 1
+                ? streamingMarkdownParser
+                : markdownParser
+            }
             onLinkPress={handleMarkdownLinkPress}
           />
         </AssistantMessageBlockContainer>
@@ -2058,41 +2077,28 @@ export const SpeakMessage = memo(function SpeakMessage({
   );
 });
 
-interface ActivityLogProps {
-  type: "system" | "info" | "success" | "error" | "artifact";
+interface NotificationProps {
+  level: "info" | "warning" | "error";
   message: string;
-  timestamp: number;
-  metadata?: Record<string, unknown>;
-  artifactId?: string;
-  artifactType?: string;
-  title?: string;
-  onArtifactClick?: (artifactId: string) => void;
   disableOuterSpacing?: boolean;
 }
 
-const activityLogStylesheet = StyleSheet.create((theme) => ({
-  pressable: {
+const notificationStylesheet = StyleSheet.create((theme) => ({
+  container: {
     borderRadius: theme.borderRadius.md,
     overflow: "hidden",
   },
-  pressableSpacing: {
+  containerSpacing: {
     marginBottom: theme.spacing[1],
   },
-  pressableActive: {
-    opacity: 0.7,
-  },
-  systemBg: {
-    backgroundColor: "rgba(39, 39, 42, 0.5)",
-  },
   infoBg: {
-    backgroundColor: "rgba(30, 58, 138, 0.3)",
+    backgroundColor: "rgba(147, 197, 253, 0.1)",
   },
-  successBg: {
-    backgroundColor: "rgba(20, 83, 45, 0.3)",
+  warningBg: {
+    backgroundColor: "rgba(245, 158, 11, 0.1)",
   },
-  errorBg: {},
-  artifactBg: {
-    backgroundColor: "rgba(30, 58, 138, 0.4)",
+  errorBg: {
+    backgroundColor: "rgba(239, 68, 68, 0.1)",
   },
   content: {
     paddingHorizontal: theme.spacing[3],
@@ -2112,137 +2118,63 @@ const activityLogStylesheet = StyleSheet.create((theme) => ({
     flex: 1,
   },
   messageText: {
+    color: theme.colors.foreground,
     fontSize: theme.fontSize.base,
     lineHeight: 20,
   },
-  detailsRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    marginTop: theme.spacing[1],
-  },
-  detailsText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    marginRight: theme.spacing[1],
-  },
-  metadataContainer: {
-    marginTop: theme.spacing[2],
-    backgroundColor: "rgba(0, 0, 0, 0.5)",
-    borderRadius: theme.borderRadius.base,
-    padding: theme.spacing[2],
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-  },
-  metadataText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.code,
-    fontFamily: theme.fontFamily.mono,
-    lineHeight: 16,
-  },
 }));
 
-export const ActivityLog = memo(function ActivityLog({
-  type,
+export const Notification = memo(function Notification({
+  level,
   message,
-  timestamp: _timestamp,
-  metadata,
-  artifactId,
-  artifactType,
-  title,
-  onArtifactClick,
   disableOuterSpacing,
-}: ActivityLogProps) {
-  const { t } = useTranslation();
+}: NotificationProps) {
   const resolvedDisableOuterSpacing = useDisableOuterSpacing(disableOuterSpacing);
-  const [isExpanded, setIsExpanded] = useState(false);
 
   const typeConfig = {
-    system: {
-      bg: activityLogStylesheet.systemBg,
-      color: "#a1a1aa",
-      Icon: Circle,
+    info: {
+      bg: notificationStylesheet.infoBg,
+      iconColorMapping: infoColorMapping,
+      Icon: ThemedNotificationInfo,
     },
-    info: { bg: activityLogStylesheet.infoBg, color: "#60a5fa", Icon: Info },
-    success: {
-      bg: activityLogStylesheet.successBg,
-      color: "#4ade80",
-      Icon: CheckCircle,
+    warning: {
+      bg: notificationStylesheet.warningBg,
+      iconColorMapping: warningColorMapping,
+      Icon: ThemedNotificationWarning,
     },
     error: {
-      bg: activityLogStylesheet.errorBg,
-      color: "#f87171",
-      Icon: XCircle,
-    },
-    artifact: {
-      bg: activityLogStylesheet.artifactBg,
-      color: "#93c5fd",
-      Icon: FileText,
+      bg: notificationStylesheet.errorBg,
+      iconColorMapping: destructiveColorMapping,
+      Icon: ThemedNotificationError,
     },
   };
 
-  const config = typeConfig[type];
+  const config = typeConfig[level];
   const IconComponent = config.Icon;
 
-  const handlePress = useCallback(() => {
-    if (type === "artifact" && artifactId && onArtifactClick) {
-      onArtifactClick(artifactId);
-    } else if (metadata) {
-      setIsExpanded((prev) => !prev);
-    }
-  }, [type, artifactId, onArtifactClick, metadata]);
-
-  const displayMessage =
-    type === "artifact" && artifactType && title ? `${artifactType}: ${title}` : message;
-
-  const isInteractive = type === "artifact" || metadata;
-  const pressableStyle = useMemo(
+  const containerStyle = useMemo(
     () => [
-      activityLogStylesheet.pressable,
-      !resolvedDisableOuterSpacing && activityLogStylesheet.pressableSpacing,
+      notificationStylesheet.container,
+      !resolvedDisableOuterSpacing && notificationStylesheet.containerSpacing,
       config.bg,
-      isInteractive && activityLogStylesheet.pressableActive,
     ],
-    [resolvedDisableOuterSpacing, config.bg, isInteractive],
+    [resolvedDisableOuterSpacing, config.bg],
   );
-  const messageTextStyle = useMemo(
-    () => [activityLogStylesheet.messageText, { color: config.color }],
-    [config.color],
-  );
-
   return (
-    <Pressable onPress={handlePress} disabled={!isInteractive} style={pressableStyle}>
-      <View style={activityLogStylesheet.content}>
-        <View style={activityLogStylesheet.row}>
-          <View style={activityLogStylesheet.iconContainer}>
-            <IconComponent size={16} color={config.color} />
+    <View style={containerStyle}>
+      <View style={notificationStylesheet.content}>
+        <View style={notificationStylesheet.row}>
+          <View style={notificationStylesheet.iconContainer}>
+            <IconComponent size={16} uniProps={config.iconColorMapping} />
           </View>
-          <View style={activityLogStylesheet.textContainer}>
-            <Text style={messageTextStyle} selectable>
-              {displayMessage}
+          <View style={notificationStylesheet.textContainer}>
+            <Text style={notificationStylesheet.messageText} selectable>
+              {message}
             </Text>
-            {metadata && (
-              <View style={activityLogStylesheet.detailsRow}>
-                <Text style={activityLogStylesheet.detailsText}>
-                  {t("message.activity.details")}
-                </Text>
-                {isExpanded ? (
-                  <ChevronDown size={12} color="#71717a" />
-                ) : (
-                  <ChevronRight size={12} color="#71717a" />
-                )}
-              </View>
-            )}
           </View>
         </View>
-        {isExpanded && metadata && (
-          <View style={activityLogStylesheet.metadataContainer} dataSet={CODE_SURFACE_DATASET}>
-            <Text style={activityLogStylesheet.metadataText}>
-              {JSON.stringify(metadata, null, 2)}
-            </Text>
-          </View>
-        )}
       </View>
-    </Pressable>
+    </View>
   );
 });
 
@@ -3091,6 +3023,7 @@ function areExpandableBadgePropsEqual(previous: ExpandableBadgeProps, next: Expa
 }
 
 interface ToolCallProps {
+  agentMessage?: AgentMessage;
   toolName: string;
   args?: unknown;
   result?: unknown;
@@ -3110,6 +3043,7 @@ interface ToolCallProps {
 }
 
 export const ToolCall = memo(function ToolCall({
+  agentMessage,
   toolName,
   args,
   result,
@@ -3150,6 +3084,7 @@ export const ToolCall = memo(function ToolCall({
   const presentation = useMemo(
     () =>
       buildToolCallPresentation({
+        agentMessage,
         toolName,
         status,
         error: error ?? null,
@@ -3158,7 +3093,7 @@ export const ToolCall = memo(function ToolCall({
         cwd,
         resolveIcon: resolveToolCallIcon,
       }),
-    [toolName, status, error, effectiveDetail, metadata, cwd],
+    [toolName, status, error, effectiveDetail, metadata, cwd, agentMessage],
   );
   const handleOpenFile = useMemo(() => {
     const openFilePath = presentation.openFilePath;
@@ -3174,7 +3109,7 @@ export const ToolCall = memo(function ToolCall({
         toolName,
         displayName: presentation.displayName,
         summary: presentation.summary,
-        detail: effectiveDetail,
+        detail: presentation.detail,
         errorText: presentation.errorText,
         icon: presentation.icon,
         showLoadingSkeleton: presentation.isLoadingDetails,
@@ -3186,12 +3121,12 @@ export const ToolCall = memo(function ToolCall({
     shouldRenderInline,
     openToolCall,
     toolName,
+    presentation.detail,
     presentation.displayName,
     presentation.summary,
     presentation.errorText,
     presentation.icon,
     presentation.isLoadingDetails,
-    effectiveDetail,
   ]);
 
   useEffect(() => {
@@ -3227,7 +3162,7 @@ export const ToolCall = memo(function ToolCall({
     return (
       <ToolCallDetailsContent
         toolName={toolName}
-        detail={effectiveDetail}
+        detail={presentation.detail}
         errorText={presentation.errorText}
         maxHeight={maxDetailHeight}
         showLoadingSkeleton={presentation.isLoadingDetails}
@@ -3236,7 +3171,7 @@ export const ToolCall = memo(function ToolCall({
   }, [
     shouldRenderInline,
     toolName,
-    effectiveDetail,
+    presentation.detail,
     presentation.errorText,
     presentation.isLoadingDetails,
     maxDetailHeight,
@@ -3246,6 +3181,7 @@ export const ToolCall = memo(function ToolCall({
     return (
       <PlanCard
         text={effectiveDetail.text}
+        outcome={presentation.planOutcome}
         testID="timeline-plan-card"
         disableOuterSpacing={disableOuterSpacing}
       />
diff --git a/packages/app/src/components/model-browser.tsx b/packages/app/src/components/model-browser.tsx
index 422240c21c..17924b233d 100644
--- a/packages/app/src/components/model-browser.tsx
+++ b/packages/app/src/components/model-browser.tsx
@@ -13,7 +13,10 @@ import {
   type StyleProp,
   type ViewStyle,
 } from "react-native";
-import { BottomSheetFlatList, BottomSheetScrollView } from "@gorhom/bottom-sheet";
+import {
+  FlatList as SheetFlatList,
+  ScrollView as SheetScrollView,
+} from "@/components/ui/scroll-view";
 import { Gesture, GestureDetector } from "react-native-gesture-handler";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
@@ -36,7 +39,7 @@ import type { SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
 import {
@@ -154,6 +157,7 @@ interface ModelBrowserInput {
 }
 
 export interface ModelBrowserState {
+  serverId: string | null;
   providers: ProviderSelectorProvider[];
   selectedProvider: string;
   selectedModel: string;
@@ -192,6 +196,7 @@ interface ModelBrowserProps {
 }
 
 interface ModelBrowserContentProps extends Omit<ModelBrowserProps, "state" | "scrolling"> {
+  serverId: string | null;
   view: ModelBrowserView;
   providers: ProviderSelectorProvider[];
   selectedProvider: string;
@@ -209,14 +214,16 @@ type ProviderGlyphTone = "muted" | "foreground";
 
 export function ModelProviderGlyph({
   provider,
+  serverId,
   size,
   tone = "muted",
 }: {
   provider: string;
+  serverId: string | null;
   size: number;
   tone?: ProviderGlyphTone;
 }) {
-  const Icon = getProviderIcon(provider);
+  const Icon = useProviderIcon(provider, serverId);
   const color =
     tone === "foreground" ? styles.providerIconForeground.color : styles.providerIconMuted.color;
   return <Icon size={size} color={color} />;
@@ -330,7 +337,12 @@ export function useModelBrowser({
     return {
       title: view.providerLabel,
       leading: (
-        <ModelProviderGlyph provider={view.providerId} size={ICON_SIZE.md} tone="foreground" />
+        <ModelProviderGlyph
+          provider={view.providerId}
+          serverId={serverId}
+          size={ICON_SIZE.md}
+          tone="foreground"
+        />
       ),
       back: singleProviderView ? undefined : { onPress: showAll },
       actions: (
@@ -389,6 +401,7 @@ export function useModelBrowser({
   );
 
   return {
+    serverId,
     providers,
     selectedProvider,
     selectedModel,
@@ -612,13 +625,6 @@ function ModelRowProfileAction({
 }) {
   const isCompact = useIsCompactFormFactor();
   const visible = hovered || isNative || isCompact;
-  const handlePress = useCallback(
-    (event: GestureResponderEvent) => {
-      event.stopPropagation();
-      onPress();
-    },
-    [onPress],
-  );
   const pressableStyle = useCallback(
     ({ hovered: buttonHovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.rowIconButton,
@@ -632,7 +638,7 @@ function ModelRowProfileAction({
     <Tooltip delayDuration={250} enabledOnDesktop enabledOnMobile={false}>
       <TooltipTrigger asChild>
         <Pressable
-          onPress={handlePress}
+          onPress={onPress}
           hitSlop={8}
           style={pressableStyle}
           pointerEvents={visible ? "auto" : "none"}
@@ -652,6 +658,7 @@ function ModelRowProfileAction({
 
 function ModelRow({
   row,
+  serverId,
   isSelected,
   showProviderLabel = false,
   onPress,
@@ -661,6 +668,7 @@ function ModelRow({
   onEditProfiles,
 }: {
   row: ProviderSelectionModelRow;
+  serverId: string | null;
   isSelected: boolean;
   showProviderLabel?: boolean;
   onPress: () => void;
@@ -672,8 +680,8 @@ function ModelRow({
   const { t } = useTranslation();
   const [isHovered, setIsHovered] = useState(false);
   const leadingSlot = useMemo(
-    () => <ModelProviderGlyph provider={row.provider} size={ICON_SIZE.sm} />,
-    [row.provider],
+    () => <ModelProviderGlyph provider={row.provider} serverId={serverId} size={ICON_SIZE.sm} />,
+    [row.provider, serverId],
   );
 
   const description = showProviderLabel ? buildProviderQualifiedDescription(row) : row.description;
@@ -763,7 +771,6 @@ function ModelRow({
   const pressableStyle = useCallback(
     ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.browserRow,
-      styles.browserModelRow,
       Boolean(hovered) && styles.browserRowHovered,
       pressed && styles.browserRowPressed,
     ],
@@ -772,7 +779,7 @@ function ModelRow({
 
   return (
     <View
-      style={styles.modelRowHoverBoundary}
+      style={[styles.modelRowHoverBoundary, styles.browserModelRow]}
       onPointerEnter={handlePointerEnter}
       onPointerLeave={handlePointerLeave}
     >
@@ -800,16 +807,24 @@ function ModelRow({
                 <ThemedCheck size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
               ) : null}
             </View>
-            {profileAction}
+            {profileAction ? <View style={styles.rowIconButton} /> : null}
           </View>
         </View>
       </ModelBrowserPressable>
+      {/* The row renders a <button> on web, so its profile action sits beside it,
+          over the slot reserved above, rather than inside it. */}
+      {profileAction ? (
+        <View style={styles.modelRowProfileActionSlot} pointerEvents="box-none">
+          {profileAction}
+        </View>
+      ) : null}
     </View>
   );
 }
 
 function SelectableModelRow({
   row,
+  serverId,
   isSelected,
   showProviderLabel,
   onSelect,
@@ -819,6 +834,7 @@ function SelectableModelRow({
   onEditProfiles,
 }: {
   row: ProviderSelectionModelRow;
+  serverId: string | null;
   isSelected: boolean;
   showProviderLabel?: boolean;
   onSelect: (provider: string, modelId: string) => void;
@@ -833,6 +849,7 @@ function SelectableModelRow({
   return (
     <ModelRow
       row={row}
+      serverId={serverId}
       isSelected={isSelected}
       showProviderLabel={showProviderLabel}
       onPress={handlePress}
@@ -948,9 +965,11 @@ function AgentProfilesPickerContent({
 
 function GroupProviderButton({
   provider,
+  serverId,
   onDrillDown,
 }: {
   provider: ProviderSelectorProvider;
+  serverId: string | null;
   onDrillDown: (providerId: string, providerLabel: string) => void;
 }) {
   const { t } = useTranslation();
@@ -988,8 +1007,8 @@ function GroupProviderButton({
     );
   }, [selection, t]);
   const leadingSlot = useMemo(
-    () => <ModelProviderGlyph provider={provider.id} size={ICON_SIZE.sm} />,
-    [provider.id],
+    () => <ModelProviderGlyph provider={provider.id} serverId={serverId} size={ICON_SIZE.sm} />,
+    [provider.id, serverId],
   );
   const trailingSlot = useMemo(
     () => (
@@ -1016,9 +1035,11 @@ function GroupProviderButton({
 
 function GroupedProviderRows({
   providers,
+  serverId,
   onDrillDown,
 }: {
   providers: ProviderSelectorProvider[];
+  serverId: string | null;
   onDrillDown: (providerId: string, providerLabel: string) => void;
 }) {
   return (
@@ -1026,7 +1047,7 @@ function GroupedProviderRows({
       {providers.map((provider, index) => (
         <View key={provider.id}>
           {index > 0 ? <View style={styles.separator} /> : null}
-          <GroupProviderButton provider={provider} onDrillDown={onDrillDown} />
+          <GroupProviderButton provider={provider} serverId={serverId} onDrillDown={onDrillDown} />
         </View>
       ))}
     </View>
@@ -1111,6 +1132,7 @@ function IndependentProviderList({ children }: { children: React.ReactNode }) {
 
 function ModelRowList({
   rows,
+  serverId,
   selectedProvider,
   selectedModel,
   onSelect,
@@ -1123,6 +1145,7 @@ function ModelRowList({
   onEditProfiles,
 }: {
   rows: ProviderSelectionModelRow[];
+  serverId: string | null;
   selectedProvider: string;
   selectedModel: string;
   onSelect: (provider: string, modelId: string) => void;
@@ -1139,6 +1162,7 @@ function ModelRowList({
     ({ item }: { item: ProviderSelectionModelRow }) => (
       <SelectableModelRow
         row={item}
+        serverId={serverId}
         isSelected={item.provider === selectedProvider && item.modelId === selectedModel}
         showProviderLabel={showProviderLabel}
         onSelect={onSelect}
@@ -1156,6 +1180,7 @@ function ModelRowList({
       profiledLookup,
       selectedModel,
       selectedProvider,
+      serverId,
       showProviderLabel,
     ],
   );
@@ -1167,7 +1192,7 @@ function ModelRowList({
 
   if (isCompact && isNative) {
     return (
-      <BottomSheetFlatList
+      <SheetFlatList
         data={rows}
         renderItem={renderItem}
         ListHeaderComponent={header}
@@ -1229,6 +1254,7 @@ function ModelSearchEmptyState() {
 }
 
 function ProviderModelBrowserContent({
+  serverId,
   view,
   provider,
   profiles,
@@ -1246,6 +1272,7 @@ function ProviderModelBrowserContent({
   isRetryingProvider,
   scrolling,
 }: {
+  serverId: string | null;
   view: Extract<ModelBrowserView, { kind: "provider" }>;
   provider: ProviderSelectorProvider | null;
   profiles: AgentProfilePicker | null;
@@ -1318,6 +1345,7 @@ function ProviderModelBrowserContent({
   }
   return (
     <ModelRowList
+      serverId={serverId}
       rows={visibleRows}
       selectedProvider={selectedProvider}
       selectedModel={selectedModel}
@@ -1333,6 +1361,7 @@ function ProviderModelBrowserContent({
 }
 
 function ModelBrowserContent({
+  serverId,
   view,
   providers,
   selectedProvider,
@@ -1380,6 +1409,7 @@ function ModelBrowserContent({
   if (view.kind === "provider") {
     return (
       <ProviderModelBrowserContent
+        serverId={serverId}
         view={view}
         provider={selectedViewProvider}
         profiles={profiles}
@@ -1414,6 +1444,7 @@ function ModelBrowserContent({
   if (allView.kind === "searchResults") {
     return (
       <ModelRowList
+        serverId={serverId}
         rows={allView.rows}
         selectedProvider={selectedProvider}
         selectedModel={selectedModel}
@@ -1445,7 +1476,11 @@ function ModelBrowserContent({
                 <Text style={styles.sectionHeadingText}>{t("modelSelector.providers")}</Text>
               </View>
             ) : null}
-            <GroupedProviderRows providers={providers} onDrillDown={onDrillDown} />
+            <GroupedProviderRows
+              providers={providers}
+              serverId={serverId}
+              onDrillDown={onDrillDown}
+            />
           </View>
         ) : null)}
       {!hasResults ? <ModelSearchEmptyState /> : null}
@@ -1455,7 +1490,7 @@ function ModelBrowserContent({
   return scrolling === "independent" ? (
     <IndependentProviderList>{allProvidersContent}</IndependentProviderList>
   ) : (
-    <BottomSheetScrollView
+    <SheetScrollView
       style={styles.virtualizedModelList}
       contentContainerStyle={[
         styles.virtualizedModelListContent,
@@ -1467,7 +1502,7 @@ function ModelBrowserContent({
       testID="compact-provider-list"
     >
       {allProvidersContent}
-    </BottomSheetScrollView>
+    </SheetScrollView>
   );
 }
 
@@ -1487,6 +1522,7 @@ export function ModelBrowser({
 }: ModelBrowserProps) {
   return (
     <ModelBrowserContent
+      serverId={state.serverId}
       view={state.view}
       providers={state.providers}
       selectedProvider={state.selectedProvider}
@@ -1553,6 +1589,13 @@ const styles = StyleSheet.create((theme) => ({
   modelRowHoverBoundary: {
     position: "relative",
   },
+  modelRowProfileActionSlot: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    right: isWeb ? theme.spacing[3] : theme.spacing[6],
+    justifyContent: "center",
+  },
   browserModelRow: isWeb ? {} : { marginBottom: theme.spacing[1] },
   browserRowHovered: {
     backgroundColor: theme.colors.surface1,
diff --git a/packages/app/src/components/page-layout/index.tsx b/packages/app/src/components/page-layout/index.tsx
new file mode 100644
index 0000000000..e0c46b695a
--- /dev/null
+++ b/packages/app/src/components/page-layout/index.tsx
@@ -0,0 +1,91 @@
+import { useMemo, type ReactNode } from "react";
+import { ScrollView, Text, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import { BackHeader } from "@/components/headers/back-header";
+import { MenuHeader } from "@/components/headers/menu-header";
+import { useIsCompactFormFactor } from "@/constants/layout";
+
+interface PageLayoutProps {
+  title?: string;
+  /** Compact back button. Defaults to navigating back. */
+  onBack?: () => void;
+  testID?: string;
+  titleTestID?: string;
+  /** Controls for the whole page: right of the title on desktop, in the back header on compact. */
+  actions?: ReactNode;
+  children: ReactNode;
+}
+
+/**
+ * A full-width page with a centered content column. On desktop the title is a
+ * document heading inside the page and the header only keeps the titlebar drag
+ * region and window controls; on compact the title moves into a back header.
+ */
+export function PageLayout({
+  title,
+  onBack,
+  testID,
+  titleTestID,
+  actions,
+  children,
+}: PageLayoutProps) {
+  const isCompact = useIsCompactFormFactor();
+  const insets = useSafeAreaInsets();
+  const scrollContentStyle = useMemo(() => ({ paddingBottom: insets.bottom }), [insets.bottom]);
+  const showTitle = !isCompact && title !== undefined;
+
+  return (
+    <View style={styles.container}>
+      {isCompact ? (
+        <BackHeader title={title} onBack={onBack} rightContent={actions} />
+      ) : (
+        <MenuHeader borderless />
+      )}
+      <ScrollView style={styles.scroll} contentContainerStyle={scrollContentStyle} testID={testID}>
+        <View style={styles.content}>
+          {showTitle ? (
+            <View style={styles.titleRow} testID={titleTestID}>
+              <Text style={styles.title} testID="page-title">
+                {title}
+              </Text>
+              {actions}
+            </View>
+          ) : null}
+          {children}
+        </View>
+      </ScrollView>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    flex: 1,
+    backgroundColor: theme.colors.surface0,
+  },
+  scroll: {
+    flex: 1,
+  },
+  content: {
+    padding: theme.spacing[4],
+    paddingTop: theme.spacing[6],
+    width: "100%",
+    maxWidth: 720,
+    alignSelf: "center",
+  },
+  titleRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: theme.spacing[4],
+    marginBottom: theme.spacing[6],
+  },
+  title: {
+    // Line up with the section titles, which sit inset from their cards.
+    marginLeft: theme.spacing[1],
+    fontSize: theme.fontSize["4xl"],
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+  },
+}));
diff --git a/packages/app/src/components/pair-link-credentials.test.ts b/packages/app/src/components/pair-link-credentials.test.ts
new file mode 100644
index 0000000000..bc663bcc25
--- /dev/null
+++ b/packages/app/src/components/pair-link-credentials.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { PairingTargetTracker } from "./pair-link-credentials";
+
+describe("pairing target password", () => {
+  it("clears the password and hides its input when switching hosts", () => {
+    const first = "relay://relay.example:443/srv_a?key=AAAA&ssl=true";
+    const second = "relay://relay.example:443/srv_b?key=BBBB&ssl=true";
+    const target = new PairingTargetTracker(first);
+    expect(target.changeUrl("relay://relay.example:443/")).toBe(false);
+    expect(target.changeUrl(second)).toBe(true);
+    expect(target.changeUrl(second)).toBe(false);
+  });
+
+  it("clears the direct form credential when its advanced URI changes to a relay target", () => {
+    const target = new PairingTargetTracker("", true);
+    expect(target.changeUrl("relay://relay.example:443/srv_new?key=BBBB&ssl=true")).toBe(true);
+  });
+
+  it("keeps the password when a relay URI receives harmless whitespace", () => {
+    const uri = "relay://relay.example:443/srv_a?key=AAAA&ssl=true";
+    const target = new PairingTargetTracker(uri);
+    expect(target.changeUrl(`${uri} `)).toBe(false);
+  });
+
+  it("recognizes a different host in an offer link after an incomplete edit", () => {
+    const offer = Buffer.from(
+      JSON.stringify({
+        v: 2,
+        serverId: "srv_b",
+        daemonPublicKeyB64: "BBBB",
+        relay: { endpoint: "relay.example:443" },
+      }),
+    ).toString("base64url");
+    const target = new PairingTargetTracker("relay://relay.example:443/srv_a?key=AAAA");
+    expect(target.changeUrl("https://app.paseo.sh/#offer=")).toBe(false);
+    expect(target.changeUrl(`https://app.paseo.sh/#offer=${offer}`)).toBe(true);
+  });
+});
diff --git a/packages/app/src/components/pair-link-credentials.ts b/packages/app/src/components/pair-link-credentials.ts
new file mode 100644
index 0000000000..e6bdf2a2b6
--- /dev/null
+++ b/packages/app/src/components/pair-link-credentials.ts
@@ -0,0 +1,33 @@
+import { parseConnectionOfferFromUrl } from "@getpaseo/protocol/connection-offer";
+import { parseRelayConnectionUri } from "@/utils/daemon-endpoints";
+
+function pairingTarget(url: string): string | null {
+  try {
+    const trimmed = url.trim();
+    const offer =
+      trimmed.startsWith("relay://") || trimmed.includes("#connect=")
+        ? parseRelayConnectionUri(trimmed).offer
+        : parseConnectionOfferFromUrl(trimmed);
+    return offer ? `${offer.serverId}:${offer.daemonPublicKeyB64}` : null;
+  } catch {
+    // Keep the last valid target while the user edits an incomplete URI.
+    return null;
+  }
+}
+
+/** Tracks the last valid host so harmless edits never clear its password. */
+export class PairingTargetTracker {
+  private currentTarget: string | null;
+
+  constructor(initialUrl = "", startsFromDirectForm = false) {
+    this.currentTarget = pairingTarget(initialUrl) ?? (startsFromDirectForm ? "direct-form" : null);
+  }
+
+  changeUrl(nextUrl: string): boolean {
+    const nextTarget = pairingTarget(nextUrl);
+    if (!nextTarget) return false;
+    const changed = this.currentTarget !== null && this.currentTarget !== nextTarget;
+    this.currentTarget = nextTarget;
+    return changed;
+  }
+}
diff --git a/packages/app/src/components/pair-link-modal.tsx b/packages/app/src/components/pair-link-modal.tsx
index 6d971001c4..8ed9cefba9 100644
--- a/packages/app/src/components/pair-link-modal.tsx
+++ b/packages/app/src/components/pair-link-modal.tsx
@@ -1,20 +1,32 @@
-import { useCallback, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useReducer, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { Link } from "lucide-react-native";
 import type { HostProfile } from "@/types/host-connection";
-import { useHosts, useHostMutations } from "@/runtime/host-runtime";
-import { decodeOfferFragmentPayload, normalizeHostPort } from "@/utils/daemon-endpoints";
-import { connectToDaemon } from "@/utils/test-daemon-connection";
-import { ConnectionOfferSchema } from "@getpaseo/protocol/connection-offer";
+import { useHosts, useHostMutations, type PasswordRequiredPairing } from "@/runtime/host-runtime";
+import { parseRelayConnectionUri } from "@/utils/daemon-endpoints";
+import { parseConnectionOfferFromUrl } from "@getpaseo/protocol/connection-offer";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
+import { getConnectionAuthFailureReason } from "@/utils/test-daemon-connection";
+import { PairingTargetTracker } from "./pair-link-credentials";
 import { Button } from "@/components/ui/button";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 
+function parsedHostLabel(input: string): string {
+  try {
+    if (input.startsWith("relay://") || input.includes("#connect=")) {
+      return parseRelayConnectionUri(input).offer.serverId;
+    }
+    return parseConnectionOfferFromUrl(input)?.serverId ?? "host";
+  } catch {
+    return "host";
+  }
+}
+
 const styles = StyleSheet.create((theme) => ({
   helper: {
     color: theme.colors.foregroundMuted,
@@ -50,6 +62,8 @@ const styles = StyleSheet.create((theme) => ({
 
 export interface PairLinkModalProps {
   visible: boolean;
+  /** Continues a confirmed pairing whose host asked for a password. */
+  passwordRequired?: PasswordRequiredPairing;
   onClose: () => void;
   onCancel?: () => void;
   onSaved?: (result: {
@@ -60,21 +74,56 @@ export interface PairLinkModalProps {
   }) => void;
 }
 
-export function PairLinkModal({ visible, onClose, onCancel, onSaved }: PairLinkModalProps) {
+export function PairLinkModal({
+  visible,
+  passwordRequired,
+  onClose,
+  onCancel,
+  onSaved,
+}: PairLinkModalProps) {
+  return (
+    <PairLinkModalContent
+      key={`${visible}:${passwordRequired?.link ?? ""}`}
+      visible={visible}
+      passwordRequired={passwordRequired}
+      onClose={onClose}
+      onCancel={onCancel}
+      onSaved={onSaved}
+    />
+  );
+}
+
+function PairLinkModalContent({
+  visible,
+  passwordRequired,
+  onClose,
+  onCancel,
+  onSaved,
+}: PairLinkModalProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const daemons = useHosts();
-  const { upsertConnectionFromOfferUrl: upsertDaemonFromOfferUrl } = useHostMutations();
+  const { beginLinkPairing } = useHostMutations();
+  const [pairing] = useState(() => passwordRequired?.pairing ?? beginLinkPairing());
+  const initialUrl = passwordRequired?.link;
   const isMobile = useIsCompactFormFactor();
 
-  const offerUrlRef = useRef("");
+  const offerUrlRef = useRef(initialUrl ?? "");
+  const targetTracker = useRef(new PairingTargetTracker(initialUrl));
   const inputRef = useRef<EditingTextInputHandle>(null);
   const [isSaving, setIsSaving] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
+  const [password, setPassword] = useState("");
+  const [needsPassword, setNeedsPassword] = useState(passwordRequired !== undefined);
+  const [passwordResetKey, resetPasswordInput] = useReducer((key: number) => key + 1, 0);
 
   const clearInput = useCallback(() => {
     offerUrlRef.current = "";
+    targetTracker.current = new PairingTargetTracker();
     inputRef.current?.replaceText("");
+    setPassword("");
+    setNeedsPassword(false);
+    resetPasswordInput();
   }, []);
 
   const pairIcon = useMemo(
@@ -96,74 +145,53 @@ export function PairLinkModal({ visible, onClose, onCancel, onSaved }: PairLinkM
     (onCancel ?? onClose)();
   }, [isSaving, clearInput, onCancel, onClose]);
 
-  const handleSave = useCallback(async () => {
-    if (isSaving) return;
-    const raw = offerUrlRef.current.trim();
-    if (!raw) {
-      setErrorMessage(t("pairing.link.errors.required"));
-      return;
-    }
-    if (!raw.includes("#offer=")) {
-      setErrorMessage(t("pairing.link.errors.missingOffer"));
-      return;
-    }
+  const handleSave = useCallback(
+    async (input?: string) => {
+      if (isSaving) return;
+      const raw = (input ?? offerUrlRef.current).trim();
+      if (!raw) {
+        setErrorMessage(t("pairing.link.errors.required"));
+        return;
+      }
+      if (!raw.includes("#offer=") && !raw.startsWith("relay://") && !raw.includes("#connect=")) {
+        setErrorMessage(t("pairing.link.errors.missingOffer"));
+        return;
+      }
 
-    const parsedOffer = (() => {
       try {
-        const idx = raw.indexOf("#offer=");
-        const encoded = raw.slice(idx + "#offer=".length).trim();
-        if (!encoded) {
-          throw new Error(t("pairing.link.errors.emptyOffer"));
-        }
-        const payload = decodeOfferFragmentPayload(encoded);
-        return ConnectionOfferSchema.parse(payload);
+        setIsSaving(true);
+        setErrorMessage("");
+        const result = await pairing.submit(raw, password || undefined);
+        if (result.status === "cancelled") return;
+        const { profile, serverId, hostname } = result;
+        const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);
+        onSaved?.({ profile, serverId, hostname, isNewHost });
+        handleClose();
       } catch (error) {
-        const message = error instanceof Error ? error.message : t("pairing.link.errors.invalid");
+        const message =
+          error instanceof Error ? error.message : t("pairing.link.errors.unableToPair");
         setErrorMessage(message);
+        if (getConnectionAuthFailureReason(error)) {
+          setNeedsPassword(true);
+          return;
+        }
         if (!isMobile) {
           Alert.alert(t("pairing.link.alert.failedTitle"), message);
         }
-        return null;
+      } finally {
+        setIsSaving(false);
       }
-    })();
-
-    if (!parsedOffer) {
-      return;
-    }
-
-    try {
-      setIsSaving(true);
-      setErrorMessage("");
-
-      const { client, hostname } = await connectToDaemon(
-        {
-          id: "probe",
-          type: "relay",
-          relayEndpoint: normalizeHostPort(parsedOffer.relay.endpoint),
-          useTls: parsedOffer.relay.useTls,
-          daemonPublicKeyB64: parsedOffer.daemonPublicKeyB64,
-        },
-        { serverId: parsedOffer.serverId },
-      );
-      await client.close().catch(() => undefined);
-
-      const isNewHost = !daemons.some((daemon) => daemon.serverId === parsedOffer.serverId);
-      const profile = await upsertDaemonFromOfferUrl(raw, hostname ?? undefined);
-      onSaved?.({ profile, serverId: parsedOffer.serverId, hostname, isNewHost });
-      handleClose();
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : t("pairing.link.errors.unableToPair");
-      setErrorMessage(message);
-      if (!isMobile) {
-        Alert.alert(t("pairing.link.alert.failedTitle"), message);
-      }
-    } finally {
-      setIsSaving(false);
-    }
-  }, [daemons, handleClose, isMobile, isSaving, onSaved, t, upsertDaemonFromOfferUrl]);
+    },
+    [daemons, handleClose, isMobile, isSaving, onSaved, password, t, pairing],
+  );
 
   const handleChangeOfferUrl = useCallback((next: string) => {
+    if (targetTracker.current.changeUrl(next)) {
+      setPassword("");
+      setNeedsPassword(false);
+      resetPasswordInput();
+      setErrorMessage("");
+    }
     offerUrlRef.current = next;
   }, []);
 
@@ -186,6 +214,7 @@ export function PairLinkModal({ visible, onClose, onCancel, onSaved }: PairLinkM
         <Text style={styles.label}>{t("pairing.link.label")}</Text>
         <AdaptiveTextInput
           ref={inputRef}
+          initialValue={initialUrl}
           testID="pair-link-input"
           nativeID="pair-link-input"
           accessibilityLabel={t("pairing.link.label")}
@@ -201,6 +230,22 @@ export function PairLinkModal({ visible, onClose, onCancel, onSaved }: PairLinkM
         {errorMessage ? <Text style={styles.error}>{errorMessage}</Text> : null}
       </View>
 
+      {needsPassword ? (
+        <View style={styles.field}>
+          <Text style={styles.label}>
+            {t("pairing.hostPassword.title", { host: parsedHostLabel(offerUrlRef.current) })}
+          </Text>
+          <AdaptiveTextInput
+            testID="pair-link-password-input"
+            resetKey={`pair-link-password-${passwordResetKey}`}
+            accessibilityLabel={t("pairing.hostPassword.label")}
+            onChangeText={setPassword}
+            secureTextEntry
+            style={styles.input}
+          />
+        </View>
+      ) : null}
+
       <View style={styles.actions}>
         <Button
           style={FLEX_ONE_STYLE}
diff --git a/packages/app/src/components/plan-card.tsx b/packages/app/src/components/plan-card.tsx
index 2ac00f1b7e..52c70683fb 100644
--- a/packages/app/src/components/plan-card.tsx
+++ b/packages/app/src/components/plan-card.tsx
@@ -1,9 +1,19 @@
-import { useMemo, type ReactNode } from "react";
-import { Text, View, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
-import Markdown, { type ASTNode } from "react-native-markdown-display";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { useCallback, useMemo, useState, type ReactNode } from "react";
+import {
+  Pressable,
+  Text,
+  View,
+  type StyleProp,
+  type TextStyle,
+  type ViewStyle,
+} from "react-native";
+import { type ASTNode } from "react-native-markdown-display";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
-import { createMarkdownStyles } from "@/styles/markdown-styles";
+import { MarkdownRenderer } from "@/components/markdown/renderer";
+import { ChevronRight } from "lucide-react-native";
+import { isWeb } from "@/constants/platform";
+import type { Theme } from "@/styles/theme";
 import { getMarkdownListMarker } from "@/utils/markdown-list";
 import { createMarkdownParser } from "@/utils/markdown-parser";
 
@@ -180,54 +190,81 @@ function createPlanMarkdownRules() {
   };
 }
 
-export function PlanCard({
-  title,
-  description,
-  text,
-  footer,
-  disableOuterSpacing = false,
-  testID,
-}: {
+export type PlanOutcome = "pending" | "approved" | "rejected" | "canceled";
+
+interface PlanCardProps {
   title?: string;
   description?: string;
   text: string;
+  outcome?: PlanOutcome;
   footer?: ReactNode;
   disableOuterSpacing?: boolean;
   testID?: string;
-}) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const markdownStyles = createMarkdownStyles(theme);
-  const markdownRules = createPlanMarkdownRules();
-  const resolvedTitle = title ?? t("agentStream.permission.plan");
+}
 
+const ThemedChevron = withUnistyles(ChevronRight);
+const chevronColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const markdownRules = createPlanMarkdownRules();
+
+export function PlanCard(props: PlanCardProps) {
+  // A resolution starts its own presentation state; subsequent taps stay local.
+  return <PlanCardContent key={props.outcome ?? "proposed"} {...props} />;
+}
+
+function PlanCardContent({
+  title,
+  description,
+  text,
+  outcome,
+  footer,
+  disableOuterSpacing = false,
+  testID,
+}: PlanCardProps) {
+  const { t } = useTranslation();
+  const [expanded, setExpanded] = useState(outcome !== "rejected" && outcome !== "canceled");
+  const labels = {
+    pending: title ?? t("agentStream.permission.plan"),
+    rejected: t("agentStream.permission.rejectedPlan"),
+    approved: t("agentStream.permission.approvedPlan"),
+    canceled: t("agentStream.permission.canceledPlan"),
+  };
+  const resolvedTitle = labels[outcome ?? "pending"];
+  const accessibilityState = useMemo(() => ({ expanded }), [expanded]);
+  const webExpandedState = useMemo(
+    () => (isWeb ? ({ "aria-expanded": expanded } as const) : null),
+    [expanded],
+  );
+  const toggleExpanded = useCallback(() => setExpanded((value) => !value), []);
   const containerStyle = useMemo(
-    () => [
-      styles.container,
-      disableOuterSpacing && styles.containerCompact,
-      {
-        backgroundColor: theme.colors.surface1,
-        borderColor: theme.colors.border,
-      },
-    ],
-    [disableOuterSpacing, theme.colors.surface1, theme.colors.border],
+    () => [styles.container, disableOuterSpacing && styles.containerCompact],
+    [disableOuterSpacing],
   );
-  const titleStyle = useMemo(
-    () => [styles.title, { color: theme.colors.foreground }],
-    [theme.colors.foreground],
-  );
-  const descriptionStyle = useMemo(
-    () => [styles.description, { color: theme.colors.foregroundMuted }],
-    [theme.colors.foregroundMuted],
+  const chevronStyle = useMemo(
+    () => [styles.chevron, expanded && styles.chevronExpanded],
+    [expanded],
   );
 
   return (
     <View testID={testID} style={containerStyle}>
-      <Text style={titleStyle}>{resolvedTitle}</Text>
-      {description ? <Text style={descriptionStyle}>{description}</Text> : null}
-      <Markdown style={markdownStyles} rules={markdownRules} markdownit={planMarkdownParser}>
-        {text}
-      </Markdown>
+      <Pressable
+        {...webExpandedState}
+        accessibilityRole="button"
+        accessibilityLabel={resolvedTitle}
+        accessibilityState={accessibilityState}
+        onPress={toggleExpanded}
+        style={styles.header}
+      >
+        <View style={chevronStyle}>
+          <ThemedChevron size={16} uniProps={chevronColor} />
+        </View>
+        <Text style={styles.title}>{resolvedTitle}</Text>
+      </Pressable>
+      {expanded ? (
+        <View style={styles.body}>
+          {description ? <Text style={styles.description}>{description}</Text> : null}
+          <MarkdownRenderer text={text} rules={markdownRules} markdownit={planMarkdownParser} />
+        </View>
+      ) : null}
       {footer ? <View style={styles.footer}>{footer}</View> : null}
     </View>
   );
@@ -239,16 +276,30 @@ const styles = StyleSheet.create((theme) => ({
     padding: theme.spacing[3],
     borderRadius: theme.spacing[2],
     borderWidth: 1,
+    backgroundColor: theme.colors.surface1,
+    borderColor: theme.colors.border,
     gap: theme.spacing[2],
   },
   containerCompact: {
     marginVertical: 0,
   },
+  header: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    minHeight: 24,
+  },
+  chevron: {},
+  chevronExpanded: { transform: [{ rotate: "90deg" }] },
+  body: { gap: theme.spacing[2] },
   title: {
+    color: theme.colors.foreground,
+    flexShrink: 1,
     fontSize: theme.fontSize.base,
     lineHeight: 22,
   },
   description: {
+    color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
     lineHeight: 20,
   },
diff --git a/packages/app/src/components/project-edit-sheet.tsx b/packages/app/src/components/project-edit-sheet.tsx
index a2790cb432..d80fa2bad0 100644
--- a/packages/app/src/components/project-edit-sheet.tsx
+++ b/packages/app/src/components/project-edit-sheet.tsx
@@ -81,7 +81,7 @@ export function ProjectEditSheet({
     form.setPickedImage({
       fileName: file.fileName,
       mimeType: file.mimeType,
-      data: Buffer.from(file.bytes).toString("base64"),
+      data: Buffer.from(await file.readBytes()).toString("base64"),
     });
   }, [form, pickFiles]);
 
@@ -126,9 +126,6 @@ export function ProjectEditSheet({
       onClose={handleClose}
       footer={footer}
       desktopMaxWidth={440}
-      // Bound the compact scroller to the live snap height so the footer stays
-      // on screen instead of being pushed past the bottom of the sheet.
-      sizeContentToCurrentSnapPoint
       testID="project-edit-sheet"
     >
       <Field
diff --git a/packages/app/src/components/provider-diagnostic-sheet.tsx b/packages/app/src/components/provider-diagnostic-sheet.tsx
index 7babccd240..bf2d1c1b95 100644
--- a/packages/app/src/components/provider-diagnostic-sheet.tsx
+++ b/packages/app/src/components/provider-diagnostic-sheet.tsx
@@ -19,10 +19,10 @@ import { useToast } from "@/contexts/toast-context";
 import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
+import { useTimeAgo } from "@/hooks/use-time-ago";
 import { useHostRuntimeClient } from "@/runtime/host-runtime";
 import { settingsStyles } from "@/styles/settings";
 import { resolveProviderLabel } from "@/utils/provider-definitions";
-import { formatTimeAgo } from "@/utils/time";
 import { compareMatchScores, scoreTextFields } from "@getpaseo/protocol/search/text-match";
 import type { AgentModelDefinition, AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { ProviderProfileModel } from "@getpaseo/protocol/provider-config";
@@ -409,7 +409,7 @@ interface ProviderModalBodyProps {
 }
 
 interface ProviderSheetFooterInput {
-  fetchedAtLabel: string | null;
+  fetchedAt: string | null;
   isCompact: boolean;
   modelsRefreshing: boolean;
   t: TFunction;
@@ -419,7 +419,7 @@ interface ProviderSheetFooterInput {
 }
 
 function renderProviderSheetFooter({
-  fetchedAtLabel,
+  fetchedAt,
   isCompact,
   modelsRefreshing,
   t,
@@ -430,16 +430,10 @@ function renderProviderSheetFooter({
   const contentStyle = isCompact ? sheetStyles.compactFooterContent : sheetStyles.footerContent;
   const actionsStyle = isCompact ? sheetStyles.compactFooterActions : sheetStyles.footerActions;
   const buttonStyle = isCompact ? sheetStyles.compactFooterButton : null;
-  const metaStyle = isCompact
-    ? [sheetStyles.footerMeta, sheetStyles.compactFooterMeta]
-    : sheetStyles.footerMeta;
-
   return (
     <View style={contentStyle}>
-      {fetchedAtLabel || !isCompact ? (
-        <Text style={metaStyle} numberOfLines={1}>
-          {fetchedAtLabel ? t("settings.providers.models.updated", { time: fetchedAtLabel }) : ""}
-        </Text>
+      {fetchedAt || !isCompact ? (
+        <ProviderUpdatedLabel fetchedAt={fetchedAt} isCompact={isCompact} />
       ) : null}
       <View style={actionsStyle}>
         <Button
@@ -477,6 +471,25 @@ function renderProviderSheetFooter({
   );
 }
 
+function ProviderUpdatedLabel({
+  fetchedAt,
+  isCompact,
+}: {
+  fetchedAt: string | null;
+  isCompact: boolean;
+}) {
+  const { t } = useTranslation();
+  const label = useTimeAgo(fetchedAt ? new Date(fetchedAt) : null);
+  const style = isCompact
+    ? [sheetStyles.footerMeta, sheetStyles.compactFooterMeta]
+    : sheetStyles.footerMeta;
+  return (
+    <Text style={style} numberOfLines={1}>
+      {fetchedAt ? t("settings.providers.models.updated", { time: label }) : ""}
+    </Text>
+  );
+}
+
 function ProviderModalBody(props: ProviderModalBodyProps) {
   const { t } = useTranslation();
   const {
@@ -609,18 +622,6 @@ export function ProviderDiagnosticSheet({
   });
   stableDiscoveredRef.current = nextDiscoveredCache;
 
-  const [clockTick, setClockTick] = useState(0);
-  useEffect(() => {
-    if (!visible) return;
-    const id = setInterval(() => setClockTick((tick) => tick + 1), 10_000);
-    return () => clearInterval(id);
-  }, [visible]);
-  const fetchedAtLabel = useMemo(() => {
-    if (!providerEntry?.fetchedAt) return null;
-    void clockTick;
-    return formatTimeAgo(new Date(providerEntry.fetchedAt));
-  }, [providerEntry?.fetchedAt, clockTick]);
-
   useEffect(() => {
     if (!visible) {
       setQuery("");
@@ -686,7 +687,7 @@ export function ProviderDiagnosticSheet({
         onClose={onClose}
         testID="provider-settings-sheet"
         footer={renderProviderSheetFooter({
-          fetchedAtLabel,
+          fetchedAt: providerEntry?.fetchedAt ?? null,
           isCompact,
           modelsRefreshing,
           t,
diff --git a/packages/app/src/components/provider-icon-name.test.ts b/packages/app/src/components/provider-icon-name.test.ts
index a0b25d63d7..65c75166a5 100644
--- a/packages/app/src/components/provider-icon-name.test.ts
+++ b/packages/app/src/components/provider-icon-name.test.ts
@@ -25,6 +25,12 @@ describe("resolveProviderIconName", () => {
   it("falls back to the bot icon for unknown custom providers", () => {
     expect(resolveProviderIconName("custom-claude-profile")).toEqual({ kind: "bot" });
   });
+
+  it("resolves a snapshot SVG for a custom provider", () => {
+    const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+
+    expect(resolveProviderIconName("snapshot-provider", svg)).toEqual({ kind: "svg", svg });
+  });
 });
 
 describe("known provider icon names", () => {
diff --git a/packages/app/src/components/provider-icon-name.ts b/packages/app/src/components/provider-icon-name.ts
index 02cd2ec874..38d4344cd1 100644
--- a/packages/app/src/components/provider-icon-name.ts
+++ b/packages/app/src/components/provider-icon-name.ts
@@ -6,15 +6,18 @@ import {
 export type ProviderIconName =
   | { kind: "builtin"; id: string }
   | { kind: "catalog"; id: string }
+  | { kind: "svg"; svg: string }
   | { kind: "bot" };
 
 const BUILTIN_PROVIDER_IDS = new Set(BUILTIN_PROVIDER_ICON_NAMES);
 const KNOWN_PROVIDER_IDS = new Set(KNOWN_PROVIDER_ICON_NAMES);
-
-export function resolveProviderIconName(provider: string): ProviderIconName {
+export function resolveProviderIconName(provider: string, iconSvg?: string): ProviderIconName {
   if (BUILTIN_PROVIDER_IDS.has(provider)) {
     return { kind: "builtin", id: provider };
   }
+  if (iconSvg) {
+    return { kind: "svg", svg: iconSvg };
+  }
   if (KNOWN_PROVIDER_IDS.has(provider)) {
     return { kind: "catalog", id: provider };
   }
diff --git a/packages/app/src/components/provider-icons.test.ts b/packages/app/src/components/provider-icons.test.ts
new file mode 100644
index 0000000000..025ff14bef
--- /dev/null
+++ b/packages/app/src/components/provider-icons.test.ts
@@ -0,0 +1,86 @@
+// @vitest-environment jsdom
+import { act, cleanup, renderHook } from "@testing-library/react";
+import { Bot } from "lucide-react-native";
+import { SvgXml } from "react-native-svg";
+import { afterEach, describe, expect, it } from "vitest";
+import { replaceProviderSnapshotIcons } from "@/data/provider-icons";
+import { useProviderIcon, useProviderIcons, type ProviderIconComponent } from "./provider-icons";
+
+afterEach(cleanup);
+
+function renderIcon(Component: ProviderIconComponent) {
+  if (typeof Component !== "function") throw new Error("Expected a function component");
+  return (Component as (props: { size: number; color: string }) => unknown)({
+    size: 18,
+    color: "#123456",
+  });
+}
+
+describe("useProviderIcon", () => {
+  it("renders registered snapshot SVG metadata with the requested size and color", () => {
+    const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+    replaceProviderSnapshotIcons("server-1", [{ provider: "rendered-provider", iconSvg: svg }]);
+
+    const rendered = renderIcon(
+      renderHook(() => useProviderIcon("rendered-provider", "server-1")).result.current,
+    );
+
+    expect(rendered).toMatchObject({
+      type: SvgXml,
+      props: { xml: svg, width: 18, height: 18, color: "#123456" },
+    });
+  });
+
+  it("uses the normal Bot fallback without snapshot SVG metadata", () => {
+    replaceProviderSnapshotIcons("server-1", [{ provider: "plain-provider" }]);
+
+    expect(renderHook(() => useProviderIcon("plain-provider", "server-1")).result.current).toBe(
+      Bot,
+    );
+  });
+});
+
+it("updates a mounted consumer when the plugin snapshot arrives after mount", () => {
+  const serverId = "cold-reload-host";
+  const provider = "plugin-provider";
+  const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+  replaceProviderSnapshotIcons(serverId, []);
+  const { result, unmount } = renderHook(() => useProviderIcon(provider, serverId));
+  expect(result.current).toBe(Bot);
+  act(() => replaceProviderSnapshotIcons(serverId, [{ provider, iconSvg: svg }]));
+  expect(renderIcon(result.current)).toMatchObject({
+    type: SvgXml,
+    props: { xml: svg, width: 18, height: 18, color: "#123456" },
+  });
+  unmount();
+});
+
+it("keeps host SVGs isolated, updates replacements, and clears removed icons", () => {
+  const provider = "shared-plugin-provider";
+  const firstSvg = '<svg id="first" />';
+  const secondSvg = '<svg id="second" />';
+  replaceProviderSnapshotIcons("first-host", [{ provider, iconSvg: firstSvg }]);
+  replaceProviderSnapshotIcons("second-host", [{ provider, iconSvg: secondSvg }]);
+  const first = renderHook(() => useProviderIcon(provider, "first-host"));
+  const second = renderHook(() => useProviderIcon(provider, "second-host"));
+  const firstIcon = first.result.current;
+  expect(renderIcon(firstIcon)).toMatchObject({ props: { xml: firstSvg } });
+  expect(renderIcon(second.result.current)).toMatchObject({ props: { xml: secondSvg } });
+  act(() => replaceProviderSnapshotIcons("second-host", [{ provider, iconSvg: firstSvg }]));
+  expect(renderIcon(second.result.current)).toMatchObject({ props: { xml: firstSvg } });
+  expect(first.result.current).toBe(firstIcon);
+  act(() => replaceProviderSnapshotIcons("second-host", []));
+  expect(second.result.current).toBe(Bot);
+  expect(first.result.current).toBe(firstIcon);
+});
+
+it("updates collection consumers when their host snapshot arrives", () => {
+  const serverId = "collection-host";
+  const provider = "collection-plugin-provider";
+  const svg = '<svg id="collection" />';
+  replaceProviderSnapshotIcons(serverId, []);
+  const { result } = renderHook(() => useProviderIcons(serverId));
+  expect(result.current(provider)).toBe(Bot);
+  act(() => replaceProviderSnapshotIcons(serverId, [{ provider, iconSvg: svg }]));
+  expect(renderIcon(result.current(provider))).toMatchObject({ props: { xml: svg } });
+});
diff --git a/packages/app/src/components/provider-icons.ts b/packages/app/src/components/provider-icons.ts
index 92d8c1ca38..fec4003705 100644
--- a/packages/app/src/components/provider-icons.ts
+++ b/packages/app/src/components/provider-icons.ts
@@ -1,5 +1,7 @@
+import { useStore } from "zustand";
+import { providerSnapshotIcons } from "@/data/provider-icons";
 import { Bot, PackagePlus } from "lucide-react-native";
-import { createElement, type ComponentType } from "react";
+import { createElement, useCallback, type ComponentType } from "react";
 import { SvgXml } from "react-native-svg";
 import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
@@ -34,17 +36,18 @@ const CATALOG_ICON_SVGS = new Map(
 );
 
 const catalogIconComponents = new Map<string, ProviderIconComponent>();
+const snapshotIconComponents = new Map<string, ProviderIconComponent>();
 
-function createCatalogIcon(provider: string, iconSvg: string): ProviderIconComponent {
-  const CatalogProviderIcon: ProviderIconComponent = ({ size, color }) =>
-    createElement(SvgXml, {
-      xml: iconSvg,
-      width: size,
-      height: size,
-      color,
-    });
-  CatalogProviderIcon.displayName = `CatalogProviderIcon(${provider})`;
-  return CatalogProviderIcon;
+/** Renders a sanitized SVG string from a host catalog, tinted through `currentColor`. */
+export function SvgIcon({ svg, size, color }: ProviderIconProps & { svg: string }) {
+  return createElement(SvgXml, { xml: svg, width: size, height: size, color });
+}
+
+function createSvgIcon(provider: string, iconSvg: string): ProviderIconComponent {
+  const SvgProviderIcon: ProviderIconComponent = ({ size, color }) =>
+    SvgIcon({ svg: iconSvg, size, color });
+  SvgProviderIcon.displayName = `SvgProviderIcon(${provider})`;
+  return SvgProviderIcon;
 }
 
 function getCatalogProviderIcon(provider: string): ProviderIconComponent {
@@ -56,18 +59,47 @@ function getCatalogProviderIcon(provider: string): ProviderIconComponent {
   if (!iconSvg) {
     return Bot;
   }
-  const icon = createCatalogIcon(provider, iconSvg);
+  const icon = createSvgIcon(provider, iconSvg);
   catalogIconComponents.set(provider, icon);
   return icon;
 }
 
-export function getProviderIcon(provider: string): ProviderIconComponent {
-  const name = resolveProviderIconName(provider);
+function getSnapshotProviderIcon(provider: string, svg: string): ProviderIconComponent {
+  const cached = snapshotIconComponents.get(svg);
+  if (cached) return cached;
+  const component = createSvgIcon(provider, svg);
+  snapshotIconComponents.set(svg, component);
+  return component;
+}
+
+function resolveProviderIcon(provider: string, svg?: string): ProviderIconComponent {
+  const name = resolveProviderIconName(provider, svg);
   if (name.kind === "builtin") {
     return BUILTIN_PROVIDER_ICONS[name.id];
   }
   if (name.kind === "catalog") {
     return getCatalogProviderIcon(name.id);
   }
+  if (name.kind === "svg") {
+    return getSnapshotProviderIcon(provider, name.svg);
+  }
   return Bot;
 }
+
+export function useProviderIcon(provider: string, serverId?: string | null): ProviderIconComponent {
+  const svg = useStore(providerSnapshotIcons, (state) =>
+    serverId ? state.get(serverId)?.get(provider) : undefined,
+  );
+  return resolveProviderIcon(provider, svg);
+}
+
+/** Subscribe once for consumers that render a collection of providers. */
+export function useProviderIcons(serverId?: string | null) {
+  const icons = useStore(providerSnapshotIcons, (state) =>
+    serverId ? state.get(serverId) : undefined,
+  );
+  return useCallback(
+    (provider: string) => resolveProviderIcon(provider, icons?.get(provider)),
+    [icons],
+  );
+}
diff --git a/packages/app/src/components/question-form-card-core.test.ts b/packages/app/src/components/question-form-card-core.test.ts
index 7feb268211..40692d4acf 100644
--- a/packages/app/src/components/question-form-card-core.test.ts
+++ b/packages/app/src/components/question-form-card-core.test.ts
@@ -54,6 +54,54 @@ describe("question form card core", () => {
     });
   });
 
+  test("keeps checked options and appends the other answer for multi-select", () => {
+    const questions = parseQuestionFormQuestions({
+      questions: [
+        {
+          question: "Which fruits do you like?",
+          header: "Fruits",
+          options: [{ label: "Apple" }, { label: "Banana" }, { label: "Cherry" }],
+          multiSelect: true,
+          allowOther: true,
+        },
+      ],
+    });
+
+    if (!questions) throw new Error("questions did not parse");
+    expect(buildQuestionFormAnswers(questions, { 0: new Set([0, 2]) }, { 0: " durian " })).toEqual({
+      Fruits: "Apple, Cherry, durian",
+    });
+    expect(buildQuestionFormAnswers(questions, { 0: new Set([0, 2]) }, {})).toEqual({
+      Fruits: "Apple, Cherry",
+    });
+    expect(buildQuestionFormAnswers(questions, { 0: new Set() }, { 0: "durian" })).toEqual({
+      Fruits: "durian",
+    });
+    expect(buildQuestionFormAnswers(questions, {}, { 0: "durian" })).toEqual({ Fruits: "durian" });
+  });
+
+  test("replaces the selected option with the other answer for single-select", () => {
+    const questions = parseQuestionFormQuestions({
+      questions: [
+        {
+          question: "Which provider?",
+          header: "Provider",
+          options: [{ label: "Claude Code" }, { label: "Codex" }],
+          multiSelect: false,
+          allowOther: true,
+        },
+      ],
+    });
+
+    if (!questions) throw new Error("questions did not parse");
+    expect(buildQuestionFormAnswers(questions, { 0: new Set([1]) }, { 0: "OpenCode" })).toEqual({
+      Provider: "OpenCode",
+    });
+    expect(buildQuestionFormAnswers(questions, { 0: new Set([1]) }, {})).toEqual({
+      Provider: "Codex",
+    });
+  });
+
   test("shows text input for explicit other questions", () => {
     const questions = parseQuestionFormQuestions({
       questions: [
diff --git a/packages/app/src/components/question-form-card-core.ts b/packages/app/src/components/question-form-card-core.ts
index 3924a5a1d9..0dea6c706e 100644
--- a/packages/app/src/components/question-form-card-core.ts
+++ b/packages/app/src/components/question-form-card-core.ts
@@ -111,10 +111,13 @@ export function buildQuestionFormAnswers(
     const q = questions[i];
     const selected = selections[i];
     const otherText = otherTexts[i]?.trim();
+    const labels = selected ? Array.from(selected).map((idx) => q.options[idx].label) : [];
 
     if (questionShowsTextInput(q)) {
       if (otherText && otherText.length > 0) {
-        answers[q.header] = otherText;
+        // Multi-select keeps the checked options and appends the custom answer, the way
+        // Claude Code's own AskUserQuestion UI does. Single-select replaces the option.
+        answers[q.header] = q.multiSelect ? [...labels, otherText].join(", ") : otherText;
         continue;
       }
       if (q.allowEmpty && q.options.length === 0) {
@@ -123,8 +126,7 @@ export function buildQuestionFormAnswers(
       }
     }
 
-    if (selected && selected.size > 0) {
-      const labels = Array.from(selected).map((idx) => q.options[idx].label);
+    if (labels.length > 0) {
       answers[q.header] = labels.join(", ");
     }
   }
diff --git a/packages/app/src/components/question-form-card.browser.test.tsx b/packages/app/src/components/question-form-card.browser.test.tsx
new file mode 100644
index 0000000000..630b001aa6
--- /dev/null
+++ b/packages/app/src/components/question-form-card.browser.test.tsx
@@ -0,0 +1,149 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { within } from "@testing-library/dom";
+import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { i18n as testI18n } from "@/i18n/i18next";
+import type { PendingPermission } from "@/types/shared";
+import { QuestionFormCard } from "./question-form-card";
+
+// Load translations so controls expose their real accessible names.
+void testI18n;
+
+// App sources compile against the classic JSX runtime, which expects React on the global.
+beforeEach(() => vi.stubGlobal("React", React));
+
+/**
+ * A real browser with the real web `EditingTextInput`, because the bug under test lives in the
+ * gap between that input and React state: the input owns its text and never replays state, so a
+ * card that drops the Other text from state alone keeps showing it while submit ignores it.
+ */
+
+interface Mounted {
+  root: Root;
+  container: HTMLDivElement;
+}
+
+const mounted: Mounted[] = [];
+
+afterEach(() => {
+  for (const entry of mounted.splice(0)) {
+    act(() => entry.root.unmount());
+    entry.container.remove();
+  }
+});
+
+function buildPermission(question: Record<string, unknown>): PendingPermission {
+  return {
+    key: "perm-1",
+    agentId: "agent-1",
+    request: {
+      id: "perm-1",
+      provider: "claude",
+      name: "AskUserQuestion",
+      kind: "question",
+      input: { questions: [question] },
+    },
+  };
+}
+
+function mountCard(question: Record<string, unknown>) {
+  const onRespond = vi.fn<(response: AgentPermissionResponse) => void>();
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+  act(() =>
+    root.render(
+      <QuestionFormCard
+        permission={buildPermission(question)}
+        onRespond={onRespond}
+        isResponding={false}
+      />,
+    ),
+  );
+  mounted.push({ root, container });
+
+  const view = within(container);
+  const optionRole = question.multiSelect ? "checkbox" : "radio";
+  const otherInput = () =>
+    view.getByRole<HTMLInputElement>("textbox", { name: String(question.question) });
+  const check = (label: string) => act(() => view.getByRole(optionRole, { name: label }).click());
+  const type = (text: string) => {
+    const input = otherInput();
+    const valueSetter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")?.set;
+    if (!valueSetter) throw new Error("HTML input value setter is unavailable");
+    act(() => {
+      valueSetter.call(input, text);
+      input.dispatchEvent(new InputEvent("input", { bubbles: true, data: text }));
+    });
+  };
+  const submit = () => act(() => view.getByRole("button", { name: "Submit" }).click());
+  const submittedAnswers = (): Record<string, string> => {
+    const response = onRespond.mock.calls[0]?.[0];
+    if (!response || response.behavior !== "allow") throw new Error("card did not submit");
+    return (response.updatedInput as { answers: Record<string, string> }).answers;
+  };
+  return { check, type, otherInput, submit, submittedAnswers };
+}
+
+const multiSelectQuestion = {
+  question: "Which fruits do you like?",
+  header: "Fruits",
+  options: [{ label: "Apple" }, { label: "Banana" }, { label: "Cherry" }],
+  multiSelect: true,
+  allowOther: true,
+};
+
+const singleSelectQuestion = {
+  question: "Which provider?",
+  header: "Provider",
+  options: [{ label: "Claude Code" }, { label: "Codex" }],
+  multiSelect: false,
+  allowOther: true,
+};
+
+describe("QuestionFormCard other answers", () => {
+  it("keeps checked options when the other answer is typed afterwards (multi-select)", () => {
+    const card = mountCard(multiSelectQuestion);
+
+    card.check("Apple");
+    card.check("Cherry");
+    card.type("durian");
+    card.submit();
+
+    expect(card.submittedAnswers()).toEqual({ Fruits: "Apple, Cherry, durian" });
+  });
+
+  it("keeps the typed other answer when options are checked afterwards (multi-select)", () => {
+    const card = mountCard(multiSelectQuestion);
+
+    card.type("durian");
+    card.check("Apple");
+    card.check("Banana");
+
+    expect(card.otherInput().value).toBe("durian");
+    card.submit();
+    expect(card.submittedAnswers()).toEqual({ Fruits: "Apple, Banana, durian" });
+  });
+
+  it("replaces the selected option with the typed other answer (single-select)", () => {
+    const card = mountCard(singleSelectQuestion);
+
+    card.check("Codex");
+    card.type("OpenCode");
+    card.submit();
+
+    expect(card.submittedAnswers()).toEqual({ Provider: "OpenCode" });
+  });
+
+  it("clears the typed other answer on screen when an option is picked afterwards (single-select)", () => {
+    const card = mountCard(singleSelectQuestion);
+
+    card.type("OpenCode");
+    card.check("Codex");
+
+    expect(card.otherInput().value).toBe("");
+    card.submit();
+    expect(card.submittedAnswers()).toEqual({ Provider: "Codex" });
+  });
+});
diff --git a/packages/app/src/components/question-form-card.tsx b/packages/app/src/components/question-form-card.tsx
index d612bca0c9..5b3b146f4e 100644
--- a/packages/app/src/components/question-form-card.tsx
+++ b/packages/app/src/components/question-form-card.tsx
@@ -1,5 +1,5 @@
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { useState, useCallback, useMemo } from "react";
+import { useState, useCallback, useMemo, useRef, type RefObject } from "react";
 import { View, Text, Pressable, type PressableStateCallbackType } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -9,6 +9,7 @@ import type { PendingPermission } from "@/types/shared";
 import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
 import { isWeb } from "@/constants/platform";
 import { EditingTextInput as TextInput } from "@/components/ui/text-input";
+import type { EditingTextInputHandle } from "@/components/ui/text-input/types";
 import {
   areQuestionsAnswered,
   buildQuestionFormAnswers,
@@ -80,8 +81,11 @@ function QuestionOptionRow({
   );
 
   const optionLabelStyle = useMemo(
-    () => [styles.optionLabel, { color: theme.colors.foreground }],
-    [theme.colors.foreground],
+    () => [
+      styles.optionLabel,
+      { color: isSelected ? theme.colors.foreground : theme.colors.foregroundMuted },
+    ],
+    [isSelected, theme.colors.foreground, theme.colors.foregroundMuted],
   );
   const optionDescriptionStyle = useMemo(
     () => [styles.optionDescription, { color: theme.colors.foregroundMuted }],
@@ -96,11 +100,11 @@ function QuestionOptionRow({
       styles.selectionControl,
       multiSelect ? styles.selectionControlCheckbox : styles.selectionControlRadio,
       {
-        borderColor: isSelected ? theme.colors.accent : theme.colors.foregroundMuted,
+        borderColor: isSelected ? theme.colors.accent : theme.colors.foregroundExtraMuted,
         backgroundColor: isSelected && multiSelect ? theme.colors.accent : "transparent",
       },
     ],
-    [isSelected, multiSelect, theme.colors.accent, theme.colors.foregroundMuted],
+    [isSelected, multiSelect, theme.colors.accent, theme.colors.foregroundExtraMuted],
   );
   const radioDotStyle = useMemo(
     () => [styles.selectionRadioDot, { backgroundColor: theme.colors.accent }],
@@ -255,6 +259,7 @@ function QuestionNav({
 
 interface QuestionOtherInputProps {
   qIndex: number;
+  inputRef: RefObject<EditingTextInputHandle | null>;
   accessibilityLabel: string;
   value: string;
   placeholder: string;
@@ -265,6 +270,7 @@ interface QuestionOtherInputProps {
 
 function QuestionOtherInput({
   qIndex,
+  inputRef,
   accessibilityLabel,
   value,
   placeholder,
@@ -300,6 +306,7 @@ function QuestionOtherInput({
   );
   return (
     <TextInput
+      ref={inputRef}
       // @ts-expect-error - outlineStyle is web-only
       style={otherInputStyle}
       accessibilityLabel={accessibilityLabel}
@@ -325,6 +332,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
 
   const [selections, setSelections] = useState<Record<number, Set<number>>>({});
   const [otherTexts, setOtherTexts] = useState<Record<number, string>>({});
+  const otherInputRef = useRef<EditingTextInputHandle | null>(null);
   const [respondingAction, setRespondingAction] = useState<"submit" | "dismiss" | null>(null);
   const [activeQuestionIndex, setActiveQuestionIndex] = useState(0);
 
@@ -346,29 +354,40 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
       }
 
       setSelections((prev) => ({ ...prev, [qIndex]: next }));
-      setOtherTexts((prev) => {
-        if (!prev[qIndex]) return prev;
-        const nextTexts = { ...prev };
-        delete nextTexts[qIndex];
-        return nextTexts;
-      });
+
+      // Single-select: an option and a custom answer replace each other, as in Claude Code.
+      // Multi-select keeps both. The editing surface owns its text and never replays state
+      // (docs/forms.md), so clearing state alone would leave stale text on screen that
+      // submit ignores; clear the surface explicitly.
+      if (!multiSelect && otherTexts[qIndex]) {
+        setOtherTexts((prev) => {
+          const nextTexts = { ...prev };
+          delete nextTexts[qIndex];
+          return nextTexts;
+        });
+        otherInputRef.current?.replaceText("");
+      }
 
       if (!multiSelect && next.size > 0 && qIndex === activeQuestionIndex && questions) {
         setActiveQuestionIndex(Math.min(qIndex + 1, questions.length - 1));
       }
     },
-    [activeQuestionIndex, questions, selections],
+    [activeQuestionIndex, otherTexts, questions, selections],
   );
 
-  const setOtherText = useCallback((qIndex: number, text: string) => {
-    setOtherTexts((prev) => ({ ...prev, [qIndex]: text }));
-    if (text.length > 0) {
-      setSelections((prev) => {
-        if (!prev[qIndex] || prev[qIndex].size === 0) return prev;
-        return { ...prev, [qIndex]: new Set<number>() };
-      });
-    }
-  }, []);
+  const setOtherText = useCallback(
+    (qIndex: number, text: string) => {
+      setOtherTexts((prev) => ({ ...prev, [qIndex]: text }));
+      const multiSelect = questions?.[qIndex]?.multiSelect ?? false;
+      if (!multiSelect && text.length > 0) {
+        setSelections((prev) => {
+          if (!prev[qIndex] || prev[qIndex].size === 0) return prev;
+          return { ...prev, [qIndex]: new Set<number>() };
+        });
+      }
+    },
+    [questions],
+  );
 
   const allAnswered = areQuestionsAnswered(questions, selections, otherTexts);
   const resolvedActiveQuestionIndex = questions
@@ -551,6 +570,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
           {showTextInput ? (
             <QuestionOtherInput
               qIndex={resolvedActiveQuestionIndex}
+              inputRef={otherInputRef}
               accessibilityLabel={activeQuestion.question}
               value={otherText}
               placeholder={getQuestionInputPlaceholder({
@@ -628,7 +648,7 @@ const styles = StyleSheet.create((theme) => ({
   questionText: {
     flex: 1,
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
+    fontWeight: theme.fontWeight.normal,
     lineHeight: 22,
   },
   optionsWrap: {
@@ -653,7 +673,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   questionNavText: {
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
+    fontWeight: theme.fontWeight.normal,
   },
   optionItem: {
     flexDirection: "row",
@@ -677,7 +697,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   optionLabel: {
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.semibold,
+    fontWeight: theme.fontWeight.normal,
     lineHeight: 22,
   },
   optionDescription: {
diff --git a/packages/app/src/components/rewind/composer-restore.tsx b/packages/app/src/components/rewind/composer-restore.tsx
index e615db5912..07e645d225 100644
--- a/packages/app/src/components/rewind/composer-restore.tsx
+++ b/packages/app/src/components/rewind/composer-restore.tsx
@@ -1,19 +1,12 @@
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  type ReactNode,
-} from "react";
+import type { ComposerTextSource } from "@/composer/text-source";
+import { createContext, useCallback, useContext, useMemo, type ReactNode } from "react";
 
 interface RewindComposerRestoreContextValue {
   completeRewind: (text: string) => void;
 }
 
 interface RewindComposerRestoreProviderProps {
-  text: string;
+  textSource: ComposerTextSource;
   setText: (text: string) => void;
   onRewindComplete: () => void;
   children: ReactNode;
@@ -32,29 +25,24 @@ export function restoreComposerTextIfEmpty(input: {
 }
 
 export function RewindComposerRestoreProvider({
-  text,
+  textSource,
   setText,
   onRewindComplete,
   children,
 }: RewindComposerRestoreProviderProps) {
-  const textRef = useRef(text);
-
-  useEffect(() => {
-    textRef.current = text;
-  }, [text]);
-
   const completeRewind = useCallback(
     (rewoundText: string) => {
+      const currentText = textSource.getSnapshot();
       const nextText = restoreComposerTextIfEmpty({
-        currentText: textRef.current,
+        currentText: currentText,
         rewoundText,
       });
-      if (nextText !== textRef.current) {
+      if (nextText !== currentText) {
         setText(nextText);
       }
       onRewindComplete();
     },
-    [onRewindComplete, setText],
+    [onRewindComplete, setText, textSource],
   );
 
   const value = useMemo(() => ({ completeRewind }), [completeRewind]);
diff --git a/packages/app/src/components/root-error-boundary.test.tsx b/packages/app/src/components/root-error-boundary.test.tsx
index de1a8225e8..12bf05ee43 100644
--- a/packages/app/src/components/root-error-boundary.test.tsx
+++ b/packages/app/src/components/root-error-boundary.test.tsx
@@ -71,25 +71,26 @@ afterEach(() => {
 
 describe("RootErrorFallback", () => {
   for (const breakpoint of ["xs", "lg"]) {
-    it(`keeps the safe-area header and retry action outside the scrollable details on ${breakpoint}`, () => {
+    it(`keeps the safe-area header and reload action outside the scrollable details on ${breakpoint}`, () => {
       runtime.breakpoint = breakpoint;
       act(() => {
-        root?.render(<RootErrorFallback error={"failure\n".repeat(200)} onRetry={vi.fn()} />);
+        root?.render(<RootErrorFallback error={"failure\n".repeat(200)} onReload={vi.fn()} />);
       });
 
       const screen = document.querySelector('[data-testid="root-error-boundary"]');
       const header = document.querySelector('[data-testid="root-error-boundary-header"]');
       const details = document.querySelector('[data-testid="root-error-boundary-details"]');
-      const retry = document.querySelector('[data-testid="root-error-boundary-retry"]');
+      const reload = document.querySelector('[data-testid="root-error-boundary-reload"]');
 
       expect(screen).not.toBeNull();
       expect(header).not.toBeNull();
       expect(details).not.toBeNull();
-      expect(retry).not.toBeNull();
+      expect(reload).not.toBeNull();
+      expect(reload?.textContent).toBe("common.actions.reload");
       expect(screen?.getAttribute("style")).toContain("padding: 47px 3px 34px 5px");
       expect(details?.contains(header)).toBe(false);
-      expect(details?.contains(retry)).toBe(false);
-      expect(screen?.contains(retry)).toBe(true);
+      expect(details?.contains(reload)).toBe(false);
+      expect(screen?.contains(reload)).toBe(true);
     });
   }
 });
diff --git a/packages/app/src/components/root-error-boundary.tsx b/packages/app/src/components/root-error-boundary.tsx
index 1ed3de6707..01e8b79563 100644
--- a/packages/app/src/components/root-error-boundary.tsx
+++ b/packages/app/src/components/root-error-boundary.tsx
@@ -1,4 +1,4 @@
-import React, { Component, Fragment, type ErrorInfo, type ReactNode } from "react";
+import React, { Component, type ErrorInfo, type ReactNode } from "react";
 import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -10,17 +10,16 @@ import { formatCaughtValue } from "./root-error-details";
 
 interface RootErrorBoundaryProps {
   children: ReactNode;
+  onReload: () => void;
 }
 
 interface RootErrorBoundaryState {
   error: string | null;
-  resetKey: number;
 }
 
 export class RootErrorBoundary extends Component<RootErrorBoundaryProps, RootErrorBoundaryState> {
   state: RootErrorBoundaryState = {
     error: null,
-    resetKey: 0,
   };
 
   static getDerivedStateFromError(error: unknown): Partial<RootErrorBoundaryState> {
@@ -34,40 +33,33 @@ export class RootErrorBoundary extends Component<RootErrorBoundaryProps, RootErr
     });
   }
 
-  retry = () => {
-    this.setState(({ resetKey }) => ({
-      error: null,
-      resetKey: resetKey + 1,
-    }));
-  };
-
   render() {
-    const { error, resetKey } = this.state;
+    const { error } = this.state;
     if (error !== null) {
-      return <RootErrorFallback error={error} onRetry={this.retry} />;
+      return <RootErrorFallback error={error} onReload={this.props.onReload} />;
     }
 
-    return <Fragment key={resetKey}>{this.props.children}</Fragment>;
+    return this.props.children;
   }
 }
 
 // A stack trace is reference material, not the screen. Cap it so the message and
-// the retry action stay the shape of the page; the rest scrolls.
+// the reload action stay the shape of the page; the rest scrolls.
 const DETAILS_MAX_HEIGHT = 300;
 
 interface RootErrorFallbackProps {
   error: string;
-  onRetry: () => void;
+  onReload: () => void;
 }
 
-export function RootErrorFallback({ error, onRetry }: RootErrorFallbackProps) {
+export function RootErrorFallback({ error, onReload }: RootErrorFallbackProps) {
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
   const isCompact = useIsCompactFormFactor();
 
-  const retry = (
-    <Button variant="default" onPress={onRetry} testID="root-error-boundary-retry">
-      {t("common.actions.retry")}
+  const reload = (
+    <Button variant="default" onPress={onReload} testID="root-error-boundary-reload">
+      {t("common.actions.reload")}
     </Button>
   );
 
@@ -100,9 +92,9 @@ export function RootErrorFallback({ error, onRetry }: RootErrorFallbackProps) {
             {error}
           </ScrollableCodeSurface>
         </View>
-        {isCompact ? null : retry}
+        {isCompact ? null : reload}
       </View>
-      {isCompact ? <View style={styles.footer}>{retry}</View> : null}
+      {isCompact ? <View style={styles.footer}>{reload}</View> : null}
     </View>
   );
 }
diff --git a/packages/app/src/components/schedules/schedule-form-sheet.tsx b/packages/app/src/components/schedules/schedule-form-sheet.tsx
index 6b9290632a..230a41e2e9 100644
--- a/packages/app/src/components/schedules/schedule-form-sheet.tsx
+++ b/packages/app/src/components/schedules/schedule-form-sheet.tsx
@@ -24,7 +24,7 @@ import { HostStatusDotSlot } from "@/components/hosts/host-picker";
 import { createControlGeometry, type FieldControlSize } from "@/components/ui/control-geometry";
 import { Field, FormTextInput } from "@/components/ui/form-field";
 import { Switch } from "@/components/ui/switch";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { CadenceEditor } from "@/components/schedules/cadence-editor";
 import {
   SelectField,
@@ -661,8 +661,8 @@ function ScheduleTargetFields({
     [],
   );
   const modelTriggerLeading = useMemo(
-    () => <ProviderGlyph provider={state.selectedProvider} />,
-    [state.selectedProvider],
+    () => <ProviderGlyph provider={state.selectedProvider} serverId={state.selectedServerId} />,
+    [state.selectedProvider, state.selectedServerId],
   );
   const renderModelTrigger = useCallback(
     ({
@@ -1019,11 +1019,17 @@ function ThinkingOptionItem({
   );
 }
 
-function ProviderGlyph({ provider }: { provider: string | null }): ReactElement | null {
+function ProviderGlyph({
+  provider,
+  serverId,
+}: {
+  provider: string | null;
+  serverId: string | null;
+}): ReactElement | null {
+  const Icon = useProviderIcon(provider ?? "", serverId);
   if (!provider) {
     return null;
   }
-  const Icon = getProviderIcon(provider);
   return <Icon size={16} color={styles.providerIcon.color} />;
 }
 
diff --git a/packages/app/src/components/schedules/schedule-row.tsx b/packages/app/src/components/schedules/schedule-row.tsx
index f2799fcf54..2af4b33428 100644
--- a/packages/app/src/components/schedules/schedule-row.tsx
+++ b/packages/app/src/components/schedules/schedule-row.tsx
@@ -10,7 +10,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { StatusBadge } from "@/components/ui/status-badge";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { isNative } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { settingsStyles } from "@/styles/settings";
@@ -22,7 +22,7 @@ import {
   resolveScheduleTitle,
   scheduleProductName,
 } from "@/utils/schedule-format";
-import { formatTimeAgo } from "@/utils/time";
+import { useTimeAgo } from "@/hooks/use-time-ago";
 import type { ScheduleSummary } from "@getpaseo/protocol/schedule/types";
 
 // Themed lucide wrappers — module-scope so only the icon re-renders on theme
@@ -59,6 +59,7 @@ export interface ScheduleRowActions {
 }
 
 interface ScheduleRowProps extends ScheduleRowActions {
+  serverId: string;
   schedule: ScheduleSummary;
   /** Client-derived target line (agent title / project / shortened path). */
   targetLabel: string;
@@ -95,16 +96,19 @@ function stateBadge(state: ScheduleDerivedState): {
 // Meta reads left-to-right as identity → history → future: how often, when it
 // was created, when it last ran, and (only while it can still run) when it runs
 // next. Status lives on the badge, never repeated here.
-function buildMeta(
-  schedule: ScheduleSummary,
-  state: ScheduleDerivedState,
-  serverName: string | undefined,
-  singleHost: boolean,
-): string {
+function buildMeta(input: {
+  schedule: ScheduleSummary;
+  state: ScheduleDerivedState;
+  createdAgo: string;
+  lastRunAgo: string;
+  serverName: string | undefined;
+  singleHost: boolean;
+}): string {
+  const { schedule, state, serverName, singleHost } = input;
   const parts = [
     formatCadence(schedule.cadence),
-    `Created ${formatTimeAgo(new Date(schedule.createdAt))}`,
-    schedule.lastRunAt ? `Last run ${formatTimeAgo(new Date(schedule.lastRunAt))}` : "Never run",
+    `Created ${input.createdAgo}`,
+    schedule.lastRunAt ? `Last run ${input.lastRunAgo}` : "Never run",
   ];
   if (state === "active") {
     const next = formatNextRun(schedule.nextRunAt);
@@ -118,13 +122,40 @@ function buildMeta(
   return parts.join(" · ");
 }
 
+function ScheduleMeta({
+  schedule,
+  state,
+  serverName,
+  singleHost,
+}: {
+  schedule: ScheduleSummary;
+  state: ScheduleDerivedState;
+  serverName: string | undefined;
+  singleHost: boolean;
+}) {
+  const createdAgo = useTimeAgo(new Date(schedule.createdAt));
+  const lastRunAgo = useTimeAgo(schedule.lastRunAt ? new Date(schedule.lastRunAt) : null);
+  const meta = buildMeta({ schedule, state, createdAgo, lastRunAgo, serverName, singleHost });
+  return (
+    <Text style={settingsStyles.rowHint} numberOfLines={1}>
+      {meta}
+    </Text>
+  );
+}
+
 /** Small provider glyph. Reads the icon color off a StyleSheet object so the
- * dynamic component (getProviderIcon) stays compliant without useUnistyles. */
-function ProviderGlyph({ provider }: { provider: string | null }): ReactElement | null {
+ * dynamic component (useProviderIcon) stays compliant without useUnistyles. */
+function ProviderGlyph({
+  provider,
+  serverId,
+}: {
+  provider: string | null;
+  serverId: string;
+}): ReactElement | null {
+  const Icon = useProviderIcon(provider ?? "", serverId);
   if (!provider) {
     return null;
   }
-  const Icon = getProviderIcon(provider);
   return <Icon size={PROVIDER_ICON_SIZE} color={styles.providerIcon.color} />;
 }
 
@@ -138,6 +169,7 @@ function ProviderGlyph({ provider }: { provider: string | null }): ReactElement
  * highlights without reflow.
  */
 export function ScheduleRow({
+  serverId,
   schedule,
   targetLabel,
   provider,
@@ -160,7 +192,6 @@ export function ScheduleRow({
   const title = resolveScheduleTitle(schedule);
   const productName = scheduleProductName(schedule);
   const badge = stateBadge(state);
-  const meta = buildMeta(schedule, state, serverName, singleHost ?? false);
   const canRun = schedule.target.type === "new-agent" && (state === "active" || state === "paused");
 
   const rowStyle = useCallback(
@@ -189,7 +220,7 @@ export function ScheduleRow({
       >
         <View style={styles.main}>
           <View style={styles.leading}>
-            <ProviderGlyph provider={provider} />
+            <ProviderGlyph provider={provider} serverId={serverId} />
           </View>
           <View style={styles.textGroup}>
             <Text style={settingsStyles.rowTitle} numberOfLines={1}>
@@ -198,9 +229,12 @@ export function ScheduleRow({
             <Text style={styles.target} numberOfLines={1}>
               {targetLabel}
             </Text>
-            <Text style={settingsStyles.rowHint} numberOfLines={1}>
-              {meta}
-            </Text>
+            <ScheduleMeta
+              schedule={schedule}
+              state={state}
+              serverName={serverName}
+              singleHost={singleHost ?? false}
+            />
           </View>
         </View>
 
diff --git a/packages/app/src/components/schedules/schedules-table.tsx b/packages/app/src/components/schedules/schedules-table.tsx
index c591b03d42..d91f95cb72 100644
--- a/packages/app/src/components/schedules/schedules-table.tsx
+++ b/packages/app/src/components/schedules/schedules-table.tsx
@@ -129,6 +129,7 @@ function SchedulesTableRow({
 
   return (
     <ScheduleRow
+      serverId={row.schedule.serverId}
       schedule={schedule}
       targetLabel={row.targetLabel}
       provider={row.provider}
diff --git a/packages/app/src/components/settings/collapsible-row.tsx b/packages/app/src/components/settings/collapsible-row.tsx
new file mode 100644
index 0000000000..219c19776c
--- /dev/null
+++ b/packages/app/src/components/settings/collapsible-row.tsx
@@ -0,0 +1,102 @@
+import { ChevronRight } from "lucide-react-native";
+import { Children, isValidElement, useCallback, useMemo, useState, type ReactNode } from "react";
+import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { mutedIconColorMapping } from "@/components/ui/icon-color";
+import { isWeb } from "@/constants/platform";
+import { settingsStyles } from "@/styles/settings";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+
+const ThemedChevron = withUnistyles(ChevronRight);
+const hoveredIconColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
+
+interface SettingsCollapsibleRowProps {
+  label: string;
+  defaultExpanded?: boolean;
+  testID?: string;
+  /** The rows revealed underneath, separated like the rows of a `SettingsCard`. */
+  children: ReactNode;
+}
+
+/**
+ * A settings row that folds a group of rows under it. Collapsed, it is one row: the label and a
+ * trailing chevron that points right, and turns down once expanded. Sits inside a `SettingsCard` like any
+ * other row.
+ */
+export function SettingsCollapsibleRow({
+  label,
+  defaultExpanded = false,
+  testID,
+  children,
+}: SettingsCollapsibleRowProps) {
+  const [expanded, setExpanded] = useState(defaultExpanded);
+  const toggle = useCallback(() => setExpanded((value) => !value), []);
+  const accessibilityState = useMemo(() => ({ expanded }), [expanded]);
+  // React Native Web does not map `accessibilityState.expanded` to `aria-expanded`.
+  const webExpandedProps = useMemo(
+    () => (isWeb ? ({ "aria-expanded": expanded } as const) : null),
+    [expanded],
+  );
+  const headerStyle = useCallback(
+    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
+      settingsStyles.row,
+      hovered && styles.headerHovered,
+      pressed && styles.headerPressed,
+    ],
+    [],
+  );
+  const chevronStyle = useMemo(
+    () => [styles.chevron, expanded && styles.chevronExpanded],
+    [expanded],
+  );
+
+  return (
+    <View testID={testID}>
+      <Pressable
+        {...webExpandedProps}
+        accessibilityRole="button"
+        accessibilityLabel={label}
+        accessibilityState={accessibilityState}
+        onPress={toggle}
+        style={headerStyle}
+        testID={testID ? `${testID}-toggle` : undefined}
+      >
+        {({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => (
+          <>
+            <View style={settingsStyles.rowContent}>
+              <Text style={settingsStyles.rowTitle}>{label}</Text>
+            </View>
+            <View style={chevronStyle}>
+              <ThemedChevron
+                size={ICON_SIZE.sm}
+                uniProps={hovered ? hoveredIconColorMapping : mutedIconColorMapping}
+              />
+            </View>
+          </>
+        )}
+      </Pressable>
+      {expanded
+        ? Children.toArray(children).map((child, index) => (
+            <View key={isValidElement(child) ? child.key : index} style={settingsStyles.rowBorder}>
+              {child}
+            </View>
+          ))
+        : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  headerHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  headerPressed: {
+    backgroundColor: theme.colors.surface3,
+  },
+  // Optical: the chevron's ink sits about 4px inside its box whether it points right or down; this
+  // puts the ink on the card's trailing rail, where the switch and the reports' refresh buttons end.
+  chevron: { marginRight: -theme.spacing[1] },
+  chevronExpanded: {
+    transform: [{ rotate: "90deg" }],
+  },
+}));
diff --git a/packages/app/src/screens/settings/settings-group.tsx b/packages/app/src/components/settings/headings/settings-group.tsx
similarity index 96%
rename from packages/app/src/screens/settings/settings-group.tsx
rename to packages/app/src/components/settings/headings/settings-group.tsx
index 25e4087292..e13bc6017a 100644
--- a/packages/app/src/screens/settings/settings-group.tsx
+++ b/packages/app/src/components/settings/headings/settings-group.tsx
@@ -1,7 +1,7 @@
 import { useMemo, type ReactNode } from "react";
 import { Text, View, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { SettingsInfoTip } from "@/screens/settings/settings-info-tip";
+import { SettingsInfoTip } from "./settings-info-tip";
 
 interface SettingsGroupProps {
   title: string;
diff --git a/packages/app/src/screens/settings/settings-info-tip.tsx b/packages/app/src/components/settings/headings/settings-info-tip.tsx
similarity index 100%
rename from packages/app/src/screens/settings/settings-info-tip.tsx
rename to packages/app/src/components/settings/headings/settings-info-tip.tsx
diff --git a/packages/app/src/screens/settings/settings-section.tsx b/packages/app/src/components/settings/headings/settings-section.tsx
similarity index 96%
rename from packages/app/src/screens/settings/settings-section.tsx
rename to packages/app/src/components/settings/headings/settings-section.tsx
index d3a4a4b01c..28b19f3589 100644
--- a/packages/app/src/screens/settings/settings-section.tsx
+++ b/packages/app/src/components/settings/headings/settings-section.tsx
@@ -1,7 +1,7 @@
 import { useMemo, type ReactNode } from "react";
 import { Text, View, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { SettingsInfoTip } from "@/screens/settings/settings-info-tip";
+import { SettingsInfoTip } from "./settings-info-tip";
 import { settingsStyles } from "@/styles/settings";
 
 interface SettingsSectionProps {
diff --git a/packages/app/src/components/settings/index.tsx b/packages/app/src/components/settings/index.tsx
new file mode 100644
index 0000000000..f31a0e7b38
--- /dev/null
+++ b/packages/app/src/components/settings/index.tsx
@@ -0,0 +1,207 @@
+import {
+  Children,
+  isValidElement,
+  useCallback,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  type ReactNode,
+} from "react";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import type {
+  SettingsRowProps,
+  SettingsSwitchProps,
+  SettingsSelectProps,
+  SettingsInputProps,
+  SettingsActionProps,
+} from "@getpaseo/plugin/client/ui";
+import type { EditingTextInputHandle } from "@/components/ui/text-input";
+import { Switch } from "@/components/ui/switch";
+import { Button } from "@/components/ui/button";
+import { FormTextInput } from "@/components/ui/form-field";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { settingsStyles } from "@/styles/settings";
+export { SettingsGroup } from "./headings/settings-group";
+export { SettingsSection } from "./headings/settings-section";
+export { SettingsCollapsibleRow } from "./collapsible-row";
+
+interface AppSettingsRowProps extends Omit<SettingsRowProps, "hint"> {
+  hint?: ReactNode;
+  labelAccessory?: ReactNode;
+}
+
+export function SettingsCard({ children, testID }: { children: ReactNode; testID?: string }) {
+  return (
+    <View style={settingsStyles.card} testID={testID}>
+      {Children.toArray(children).map((child, index) => (
+        <View
+          key={isValidElement(child) ? child.key : index}
+          style={index ? settingsStyles.rowBorder : undefined}
+        >
+          {child}
+        </View>
+      ))}
+    </View>
+  );
+}
+
+export function SettingsRow({
+  label,
+  labelAccessory,
+  hint,
+  error,
+  children,
+  testID,
+}: AppSettingsRowProps) {
+  const compact = useIsCompactFormFactor();
+  const rowStyle = useMemo(() => [settingsStyles.row, compact && styles.compactRow], [compact]);
+  return (
+    <View style={rowStyle} testID={testID}>
+      <View style={styles.label}>
+        {labelAccessory ? (
+          <View style={styles.labelRow}>
+            <Text style={[settingsStyles.rowTitle, styles.accessoryLabel]}>{label}</Text>
+            {labelAccessory}
+          </View>
+        ) : (
+          <Text style={settingsStyles.rowTitle}>{label}</Text>
+        )}
+        {typeof hint === "string" ? <Text style={settingsStyles.rowHint}>{hint}</Text> : hint}
+        {error ? (
+          <Text accessibilityRole="alert" style={settingsStyles.rowError}>
+            {error}
+          </Text>
+        ) : null}
+      </View>
+      {children ? <View style={styles.control}>{children}</View> : null}
+    </View>
+  );
+}
+
+export function SettingsSwitch({ value, onValueChange, disabled, ...row }: SettingsSwitchProps) {
+  return (
+    <SettingsRow {...row}>
+      <Switch
+        value={value}
+        onValueChange={onValueChange}
+        disabled={disabled}
+        accessibilityLabel={row.label}
+      />
+    </SettingsRow>
+  );
+}
+
+function SettingsOption<Value extends string>({
+  option,
+  selected,
+  onValueChange,
+}: {
+  option: { label: string; value: Value };
+  selected: boolean;
+  onValueChange(value: Value): void;
+}) {
+  const select = useCallback(() => onValueChange(option.value), [onValueChange, option.value]);
+  return (
+    <DropdownMenuItem selected={selected} onSelect={select}>
+      {option.label}
+    </DropdownMenuItem>
+  );
+}
+
+export function SettingsSelect<Value extends string>({
+  value,
+  options,
+  onValueChange,
+  disabled,
+  ...row
+}: SettingsSelectProps<Value>) {
+  const selectedLabel = options.find((option) => option.value === value)?.label ?? value;
+  return (
+    <SettingsRow {...row}>
+      <DropdownMenu>
+        <DropdownTrigger
+          disabled={disabled}
+          accessibilityRole="button"
+          accessibilityLabel={`${row.label}: ${selectedLabel}`}
+        >
+          {selectedLabel}
+        </DropdownTrigger>
+        <DropdownMenuContent side="bottom" align="end" width={220}>
+          {options.map((option) => (
+            <SettingsOption
+              key={option.value}
+              option={option}
+              selected={option.value === value}
+              onValueChange={onValueChange}
+            />
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </SettingsRow>
+  );
+}
+
+export function SettingsInput({
+  initialValue,
+  onChangeText,
+  placeholder,
+  disabled,
+  secureTextEntry,
+  ref,
+  ...row
+}: SettingsInputProps) {
+  const compact = useIsCompactFormFactor();
+  const input = useRef<EditingTextInputHandle>(null);
+  useImperativeHandle(
+    ref,
+    () => ({
+      focus: () => input.current?.focus(),
+      blur: () => input.current?.blur(),
+      getText: () => input.current?.getText() ?? "",
+      replaceText: (text) => input.current?.replaceText(text),
+    }),
+    [],
+  );
+  return (
+    <SettingsRow {...row}>
+      <FormTextInput
+        ref={input}
+        initialValue={initialValue}
+        onChangeText={onChangeText}
+        placeholder={placeholder}
+        editable={!disabled}
+        secureTextEntry={secureTextEntry}
+        accessibilityLabel={row.label}
+        size={compact ? "md" : "sm"}
+        style={styles.input}
+      />
+    </SettingsRow>
+  );
+}
+
+export function SettingsAction({ actionLabel, onPress, disabled, ...row }: SettingsActionProps) {
+  return (
+    <SettingsRow {...row}>
+      <Button variant="outline" size="sm" onPress={onPress} disabled={disabled}>
+        {actionLabel}
+      </Button>
+    </SettingsRow>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  compactRow: { flexWrap: "wrap", gap: theme.spacing[3] },
+  label: { flexGrow: 1, flexShrink: 1, flexBasis: 160, marginRight: theme.spacing[3] },
+  labelRow: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  accessoryLabel: { flexShrink: 1, minWidth: 0 },
+  control: { flexShrink: 1, maxWidth: "100%" },
+  input: { minWidth: 180 },
+}));
diff --git a/packages/app/src/components/sidebar-workspace-list.test.tsx b/packages/app/src/components/sidebar-workspace-list.test.tsx
index 94e6f36466..73c008dd22 100644
--- a/packages/app/src/components/sidebar-workspace-list.test.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.test.tsx
@@ -38,7 +38,7 @@ import {
 } from "@/runtime/host-runtime";
 import type { HostProfile } from "@/types/host-connection";
 import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
-import { seedSessionWorkspaces } from "@/test/seed-session";
+import { seedRuntimeWorkspaces } from "@/test/seed-session";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
 import { useWorkspaceFields } from "@/stores/session-store-hooks";
 import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
@@ -167,7 +167,7 @@ function initializeSidebarState(workspaces: WorkspaceDescriptor[]): void {
   act(() => {
     setHostProfiles([makeHost()]);
     useSessionStore.getState().initializeSession(SERVER_ID, null as unknown as DaemonClient);
-    seedSessionWorkspaces(SERVER_ID, new Map(workspaces.map((entry) => [entry.id, entry])));
+    seedRuntimeWorkspaces(SERVER_ID, new Map(workspaces.map((entry) => [entry.id, entry])));
     useSessionStore.getState().setHasHydratedWorkspaces(SERVER_ID, true);
     useSidebarOrderStore.setState({
       projectOrder: ["project-a", "project-b"],
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index 347315bd19..bbda666436 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -30,6 +30,7 @@ import {
   type ActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { getSidebarRowBackdrop } from "@/components/sidebar/sidebar-row-backdrop";
@@ -63,11 +64,7 @@ import {
   type SidebarWorkspacePlacement,
 } from "@/hooks/use-sidebar-workspaces-list";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
-import {
-  hasActiveSidebarLabelFilter,
-  useSidebarViewStore,
-  type SidebarGroupMode,
-} from "@/stores/sidebar-view-store";
+import { useSidebarViewStore, type SidebarGroupMode } from "@/stores/sidebar-view-store";
 import { useShowShortcutBadges } from "@/hooks/use-show-shortcut-badges";
 import {
   ContextMenu,
@@ -118,13 +115,14 @@ import {
   SidebarWorkspaceTrailingContent,
   useSidebarWorkspaceTrailing,
 } from "@/components/sidebar/workspace-trailing";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { PressHighlight } from "@/components/ui/press-highlight";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Shortcut } from "@/components/ui/shortcut";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
-import { useClearWorkspaceAttention } from "@/hooks/use-clear-workspace-attention";
+import { useWorkspaceReadState } from "@/hooks/use-workspace-read-state";
 import type { PrHint } from "@/git/use-pr-status-query";
 import {
   buildSidebarProjectRowModel,
@@ -284,6 +282,7 @@ interface WorkspaceRowInnerProps {
   onCopyPath?: () => void;
   onRename?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   archiveShortcutKeys?: ShortcutKey[][] | null;
   isPinned?: boolean;
   onTogglePin?: () => void;
@@ -612,6 +611,7 @@ function WorkspaceRowRightGroup({
   archiveShortcutKeys,
   onArchive,
   onMarkAsRead,
+  onMarkAsUnread,
   onCopyBranchName,
   onCopyPath,
   onRename,
@@ -631,6 +631,7 @@ function WorkspaceRowRightGroup({
   archiveShortcutKeys?: ShortcutKey[][] | null;
   onArchive?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   onCopyBranchName?: () => void;
   onCopyPath?: () => void;
   onRename?: () => void;
@@ -642,7 +643,7 @@ function WorkspaceRowRightGroup({
   const trailing = useSidebarWorkspaceTrailing();
   const showShortcut = showShortcutBadge && shortcutNumber !== null;
   const {
-    showTrailing,
+    trailingPresentation,
     showKebab: showKebabInSlot,
     showScrim,
     renderSlot,
@@ -664,7 +665,7 @@ function WorkspaceRowRightGroup({
       ) : null}
       {renderSlot ? (
         <SidebarWorkspaceTrailingActionSlot reserveWidth={reserveSlotWidth}>
-          <SidebarWorkspaceTrailingActionBase visible={showTrailing}>
+          <SidebarWorkspaceTrailingActionBase presentation={trailingPresentation}>
             <SidebarWorkspaceTrailingContent workspace={workspace} trailing={trailing} />
           </SidebarWorkspaceTrailingActionBase>
           <SidebarWorkspaceTrailingActionOverlay
@@ -682,6 +683,7 @@ function WorkspaceRowRightGroup({
                 onCopyBranchName={onCopyBranchName}
                 onRename={onRename}
                 onMarkAsRead={onMarkAsRead}
+                onMarkAsUnread={onMarkAsUnread}
                 onArchive={onArchive}
                 archiveLabel={archiveLabel}
                 archiveStatus={archiveStatus}
@@ -822,9 +824,10 @@ function NewWorkspaceGhostRow({
       {({ hovered, pressed }) => (
         <>
           <View style={styles.newWorkspaceGhostIconSlot}>
-            <ThemedPlus
-              size={14}
-              uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
+            <DensityIcon
+              icon={Plus}
+              size="sm"
+              color={hovered || pressed ? "foreground" : "foregroundMuted"}
             />
           </View>
           <Text
@@ -1065,6 +1068,8 @@ function WorkspaceRowInner({
   onCopyBranchName,
   onCopyPath,
   onRename,
+  onMarkAsRead,
+  onMarkAsUnread,
   archiveShortcutKeys,
   isPinned,
   onTogglePin,
@@ -1135,6 +1140,8 @@ function WorkspaceRowInner({
               onCopyPath={onCopyPath}
               onCopyBranchName={onCopyBranchName}
               onRename={onRename}
+              onMarkAsRead={onMarkAsRead}
+              onMarkAsUnread={onMarkAsUnread}
               onArchive={onArchive}
               archiveLabel={archiveLabel}
               archiveStatus={archiveStatus}
@@ -1185,6 +1192,8 @@ function WorkspaceRowInner({
                   onCopyBranchName={onCopyBranchName}
                   onCopyPath={onCopyPath}
                   onRename={onRename}
+                  onMarkAsRead={onMarkAsRead}
+                  onMarkAsUnread={onMarkAsUnread}
                   isPinned={isPinned}
                   onTogglePin={onTogglePin}
                 />
@@ -1286,15 +1295,21 @@ function WorkspaceRowWithMenu({
   const onTogglePin = canPin ? handleTogglePin : undefined;
 
   const archiveShortcutKeys = useShortcutKeys("archive-workspace");
-  const { hasClearableAttention, clearAttention } = useClearWorkspaceAttention({
-    serverId: workspace.serverId,
-    workspaceId: workspace.workspaceId,
-  });
+  const { hasClearableAttention, canMarkUnread, clearAttention, markUnread } =
+    useWorkspaceReadState({
+      serverId: workspace.serverId,
+      workspaceId: workspace.workspaceId,
+    });
   const handleMarkAsRead = useCallback(() => {
     void clearAttention().catch((error) => {
       toast.error(error instanceof Error ? error.message : "Failed to mark workspace as read");
     });
   }, [clearAttention, toast]);
+  const handleMarkAsUnread = useCallback(() => {
+    void markUnread().catch((error) => {
+      toast.error(error instanceof Error ? error.message : "Failed to mark workspace as unread");
+    });
+  }, [markUnread, toast]);
 
   useKeyboardActionHandler({
     handlerId: `workspace-archive-${workspace.workspaceKey}`,
@@ -1332,6 +1347,7 @@ function WorkspaceRowWithMenu({
         onCopyPath={handleCopyPath}
         onRename={handleOpenRename}
         onMarkAsRead={hasClearableAttention ? handleMarkAsRead : undefined}
+        onMarkAsUnread={canMarkUnread ? handleMarkAsUnread : undefined}
         archiveShortcutKeys={selected ? archiveShortcutKeys : null}
         isPinned={isPinned}
         onTogglePin={onTogglePin}
@@ -1902,9 +1918,6 @@ export function SidebarWorkspaceList({
   const onToggleWorkspacePin = useSidebarWorkspacePinController();
   const getPinnedWorkspaceOrder = useSidebarOrderStore((state) => state.getPinnedWorkspaceOrder);
   const setPinnedWorkspaceOrder = useSidebarOrderStore((state) => state.setPinnedWorkspaceOrder);
-  const hasActiveLabelFilter = useSidebarViewStore((state) =>
-    hasActiveSidebarLabelFilter(state.labelFilter),
-  );
   const handlePinnedWorkspaceReorder = useCallback(
     (reorderedWorkspaces: SidebarWorkspacePlacement[]) => {
       const reorderedWorkspaceKeys = reorderedWorkspaces.map((workspace) => workspace.workspaceKey);
@@ -1936,11 +1949,10 @@ export function SidebarWorkspaceList({
   // this whole subtree, which unmounted the header — and the header is where the display menu's
   // trigger lives, so filtering the last row away closed the menu you were filtering from.
   //
-  // Only the label filter can get here. The project filter resolves against the projects it can
-  // see and falls back to "all projects" when nothing matches, so it either keeps at least one
-  // project or is not applied at all — it can narrow this list but never empty it.
-  const sidebarFilterEmpty =
-    hasActiveLabelFilter && hasProjectsBeforeFilter && projects.length === 0;
+  // Background visibility can also hide the last project. Keep the header mounted
+  // whenever a local filter empties an otherwise populated directory, so users can
+  // reach the display menu to reveal their work again.
+  const sidebarFilterEmpty = hasProjectsBeforeFilter && projects.length === 0;
 
   // Project mode is the one that keeps its project headers; every other grouping mode is a flat
   // list of grouped rows, so a new mode lands in the grouped branch rather than silently in this
@@ -2510,7 +2522,7 @@ const styles = StyleSheet.create((theme) => ({
   // the step in reads as belonging to that project. Padding rather than margin, so the hover and
   // pressed fills stay the same box as every other row in the sidebar.
   newWorkspaceGhostRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[4],
@@ -2530,27 +2542,27 @@ const styles = StyleSheet.create((theme) => ({
   // The width of a workspace row's status slot, so the label lands on the same rail as the
   // titles above it.
   newWorkspaceGhostIconSlot: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     alignItems: "center",
     justifyContent: "center",
     flexShrink: 0,
   },
   newWorkspaceGhostText: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
   newWorkspaceGhostTextHovered: {
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
     color: theme.colors.foreground,
   },
   projectRow: {
     position: "relative",
-    minHeight: 36,
+    minHeight: density.rowHeight,
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
@@ -2591,7 +2603,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   projectTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
@@ -2672,7 +2684,7 @@ const styles = StyleSheet.create((theme) => ({
     right: theme.spacing[2],
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/sidebar/display-preferences/menu.tsx b/packages/app/src/components/sidebar/display-preferences/menu.tsx
index 018c8cc37e..d62b3f9ff1 100644
--- a/packages/app/src/components/sidebar/display-preferences/menu.tsx
+++ b/packages/app/src/components/sidebar/display-preferences/menu.tsx
@@ -301,6 +301,13 @@ export function SidebarDisplayPreferencesMenu(): ReactElement {
           sheetTitle={t("sidebar.display.heading")}
           testID="sidebar-display-preferences-content"
         >
+          <MenuItem
+            selected={preferences.showBackground}
+            closeOnSelect={false}
+            onSelect={preferences.toggleBackground}
+          >
+            {t("sidebar.display.showBackground")}
+          </MenuItem>
           <MenuSubTrigger
             id="grouping"
             value={t(GROUPING_LABEL_KEYS[preferences.grouping])}
diff --git a/packages/app/src/components/sidebar/display-preferences/model.ts b/packages/app/src/components/sidebar/display-preferences/model.ts
index 14bddb9918..68d347a258 100644
--- a/packages/app/src/components/sidebar/display-preferences/model.ts
+++ b/packages/app/src/components/sidebar/display-preferences/model.ts
@@ -16,6 +16,8 @@ import { DEFAULT_SIDEBAR_ROW_ITEMS, type SidebarRowItem, type SidebarRowItems }
 export type SidebarTrailingChoice = Exclude<SidebarWorkspaceTrailing, "none">;
 
 export interface SidebarDisplayPreferences {
+  showBackground: boolean;
+  toggleBackground: () => void;
   grouping: SidebarGroupMode;
   setGrouping: (mode: SidebarGroupMode) => void;
   titleSource: WorkspaceTitleSource;
@@ -48,6 +50,8 @@ export interface SidebarDisplayPreferences {
  * this for a value and set it; where it lands is this module's problem.
  */
 export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
+  const showBackground = useSidebarViewStore((state) => state.showBackground);
+  const toggleBackground = useSidebarViewStore((state) => state.toggleBackground);
   const grouping = useSidebarViewStore((state) => state.groupMode);
   const setGrouping = useSidebarViewStore((state) => state.setGroupMode);
   const hostFilters = useSidebarViewStore((state) => state.hostFilters);
@@ -104,6 +108,8 @@ export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
 
   return useMemo(
     () => ({
+      showBackground,
+      toggleBackground,
       grouping,
       setGrouping,
       titleSource: workspaceTitleSource,
@@ -125,6 +131,8 @@ export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
       clearLabelFilter,
     }),
     [
+      showBackground,
+      toggleBackground,
       grouping,
       setGrouping,
       workspaceTitleSource,
diff --git a/packages/app/src/components/sidebar/empty-states.tsx b/packages/app/src/components/sidebar/empty-states.tsx
index 4aaf93e0cc..3328ed2c5c 100644
--- a/packages/app/src/components/sidebar/empty-states.tsx
+++ b/packages/app/src/components/sidebar/empty-states.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { type ReactNode, useCallback } from "react";
 import { Import, Plus } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
@@ -6,6 +6,28 @@ import { StyleSheet } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";
 import { useSidebarViewStore } from "@/stores/sidebar-view-store";
 
+function SidebarEmptyStateCard({
+  testID,
+  title,
+  description,
+  children,
+}: {
+  testID: string;
+  title: string;
+  description: string;
+  children: ReactNode;
+}) {
+  return (
+    <View style={styles.card} testID={testID}>
+      <View style={styles.copy}>
+        <Text style={styles.title}>{title}</Text>
+        <Text style={styles.description}>{description}</Text>
+      </View>
+      <View style={styles.actions}>{children}</View>
+    </View>
+  );
+}
+
 /**
  * The two things the sidebar's workspace list says when it has no rows.
  *
@@ -27,13 +49,15 @@ export function SidebarFilterEmptyState() {
   }, [clearLabelFilter, clearProjectFilters]);
 
   return (
-    <View style={styles.container} testID="sidebar-filter-empty-state">
-      <Text style={styles.title}>{t("sidebar.filterEmpty.title")}</Text>
-      <Text style={styles.description}>{t("sidebar.filterEmpty.description")}</Text>
-      <Button variant="ghost" size="sm" onPress={clearFilters}>
+    <SidebarEmptyStateCard
+      testID="sidebar-filter-empty-state"
+      title={t("sidebar.filterEmpty.title")}
+      description={t("sidebar.filterEmpty.description")}
+    >
+      <Button variant="secondary" size="xs" onPress={clearFilters}>
         {t("sidebar.filterEmpty.clear")}
       </Button>
-    </View>
+    </SidebarEmptyStateCard>
   );
 }
 
@@ -47,40 +71,44 @@ export function SidebarProjectEmptyState({
   const { t } = useTranslation();
 
   return (
-    <View style={styles.container} testID="sidebar-project-empty-state">
-      <Text style={styles.title}>{t("sidebar.project.empty.title")}</Text>
-      <Text style={styles.description}>{t("sidebar.project.empty.description")}</Text>
-      <Button variant="ghost" size="sm" leftIcon={Plus} onPress={onAddProject}>
+    <SidebarEmptyStateCard
+      testID="sidebar-project-empty-state"
+      title={t("sidebar.project.empty.title")}
+      description={t("sidebar.project.empty.description")}
+    >
+      <Button variant="secondary" size="xs" leftIcon={Plus} onPress={onAddProject}>
         {t("sidebar.actions.addProject")}
       </Button>
-      <Button variant="ghost" size="sm" leftIcon={Import} onPress={onImportSession}>
+      <Button variant="outline" size="xs" leftIcon={Import} onPress={onImportSession}>
         {t("importSession.title")}
       </Button>
-    </View>
+    </SidebarEmptyStateCard>
   );
 }
 
 const styles = StyleSheet.create((theme) => ({
-  container: {
-    marginHorizontal: theme.spacing[2],
-    marginTop: theme.spacing[4],
-    paddingTop: theme.spacing[6],
-    paddingBottom: theme.spacing[4],
-    paddingHorizontal: theme.spacing[4],
+  card: {
+    marginTop: theme.spacing[3],
+    padding: theme.spacing[4],
+    borderWidth: 1,
+    borderColor: theme.colors.border,
     borderRadius: theme.borderRadius.lg,
-    backgroundColor: theme.colors.surface0,
-    alignItems: "center",
-    gap: theme.spacing[3],
+  },
+  copy: {
+    gap: theme.spacing[1],
+  },
+  actions: {
+    flexDirection: "row",
+    gap: theme.spacing[2],
+    marginTop: theme.spacing[4],
   },
   title: {
     color: theme.colors.foreground,
     fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.medium,
-    textAlign: "center",
+    fontWeight: theme.fontWeight.normal,
   },
   description: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
-    textAlign: "center",
   },
 }));
diff --git a/packages/app/src/components/sidebar/pinned-section-header.tsx b/packages/app/src/components/sidebar/pinned-section-header.tsx
index 9dc2c9fdba..2169492a08 100644
--- a/packages/app/src/components/sidebar/pinned-section-header.tsx
+++ b/packages/app/src/components/sidebar/pinned-section-header.tsx
@@ -2,16 +2,11 @@ import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight } from "lucide-react-native";
 import { Pressable, Text } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet } from "react-native-unistyles";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative } from "@/constants/platform";
-import type { Theme } from "@/styles/theme";
-
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const ThemedChevronRight = withUnistyles(ChevronRight);
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
+import { density, densityFontSize } from "@/styles/density";
 
 export function PinnedSectionHeader({
   collapsed,
@@ -23,7 +18,6 @@ export function PinnedSectionHeader({
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
   const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
-  const Chevron = collapsed ? ThemedChevronRight : ThemedChevronDown;
 
   return (
     <Pressable
@@ -37,7 +31,11 @@ export function PinnedSectionHeader({
         <>
           <Text style={styles.title}>{t("sidebar.pinned.title")}</Text>
           {hovered || isNative || isCompact ? (
-            <Chevron size={12} uniProps={foregroundMutedColorMapping} />
+            <DensityIcon
+              icon={collapsed ? ChevronRight : ChevronDown}
+              size="xs"
+              color="foregroundMuted"
+            />
           ) : null}
         </>
       )}
@@ -47,7 +45,7 @@ export function PinnedSectionHeader({
 
 const styles = StyleSheet.create((theme) => ({
   header: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     flexDirection: "row",
     alignItems: "center",
     alignSelf: "flex-start",
@@ -58,7 +56,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   title: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
+    fontSize: densityFontSize(theme, "sm"),
     fontWeight: theme.fontWeight.normal,
   },
 }));
diff --git a/packages/app/src/components/sidebar/project-leading-visual.tsx b/packages/app/src/components/sidebar/project-leading-visual.tsx
index c3950efe2d..3f31181220 100644
--- a/packages/app/src/components/sidebar/project-leading-visual.tsx
+++ b/packages/app/src/components/sidebar/project-leading-visual.tsx
@@ -1,9 +1,11 @@
 import { ActivityIndicator, View, type ViewStyle } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight, CircleAlert } from "lucide-react-native";
 import { ProjectIconView } from "@/components/project-icon-view";
-import { STATUS_BUCKET_LABELS } from "@/hooks/sidebar-status-view-model";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { getStatusBucketLabel } from "@/hooks/sidebar-status-view-model";
+import { density, densityIconBox, densityIconProps } from "@/styles/density";
+import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import {
   getProjectStatusBadgeContent,
@@ -34,9 +36,8 @@ const STATUS_BADGE_OFFSET = -4;
 //
 // The filled alert occupies the full badge shell so needs-input remains more prominent than
 // the passive status dots.
-// Matches the workspace title's lineHeight (sidebar-workspace-row-content's
-// workspaceBranchText) so the icon centers on the title rather than floating above it.
-const LEADING_SLOT_HEIGHT = 20;
+const DensityProjectIconView = withUnistyles(ProjectIconView);
+const projectIconProps = densityIconProps("md", () => ({}));
 
 const ThemedActivityIndicator = withUnistyles(ActivityIndicator);
 const ThemedCircleAlert = withUnistyles(CircleAlert);
@@ -170,6 +171,7 @@ function ProjectStatusBadge({
   statusBucket: SidebarStateBucket;
   backdrop: SidebarSurfaceBackdrop;
 }) {
+  const { t } = useTranslation();
   // Running skips the shell. The ring is wider than the 12pt shell and carries its own knockout,
   // so nesting it inside would clip it against the very thing that was meant to separate it from
   // the icon. It anchors to the same corner instead, growing around the centre the dot had.
@@ -177,7 +179,7 @@ function ProjectStatusBadge({
     return (
       <View
         role="status"
-        accessibilityLabel={STATUS_BUCKET_LABELS[statusBucket]}
+        accessibilityLabel={getStatusBucketLabel(statusBucket, t)}
         style={styles.statusRingAnchor}
         testID="project-status-badge"
       >
@@ -188,7 +190,7 @@ function ProjectStatusBadge({
   return (
     <View
       role="status"
-      accessibilityLabel={STATUS_BUCKET_LABELS[statusBucket]}
+      accessibilityLabel={getStatusBucketLabel(statusBucket, t)}
       style={[styles.statusBadge, getStatusBadgeBackdropStyle(backdrop)]}
       testID="project-status-badge"
     >
@@ -228,12 +230,12 @@ function ProjectIcon({
   projectViewKey: string;
 }) {
   return (
-    <ProjectIconView
+    <DensityProjectIconView
       iconDataUri={iconDataUri}
       initial={placeholderInitial}
       projectViewKey={projectViewKey}
-      size={ICON_SIZE.md}
       textStyle={styles.projectIconFallbackText}
+      uniProps={projectIconProps}
     />
   );
 }
@@ -269,12 +271,12 @@ const styles = StyleSheet.create((theme) => {
 
   return {
     // The slot is as tall as the title's line box, not as tall as the icon, and centers the
-    // icon inside it. Rows lay their leading visual out with alignItems:flex-start, so a
-    // 16pt slot next to a 20pt line box puts the icon 2pt above the title and the kebab —
-    // which is why the workspace status indicator is also 20 tall. Keep the two in step.
+    // icon inside it. Rows lay their leading visual out with alignItems:flex-start, so a slot
+    // only as tall as the icon puts it above the title and the kebab — which is why the
+    // workspace status indicator shares the same `rowLineHeight`.
     projectLeadingVisualSlot: {
-      width: theme.iconSize.md,
-      height: LEADING_SLOT_HEIGHT,
+      width: densityIconBox("md"),
+      height: density.rowLineHeight,
       flexShrink: 0,
       alignItems: "center",
       justifyContent: "center",
@@ -282,8 +284,8 @@ const styles = StyleSheet.create((theme) => {
     // Anchors the corner badge to the icon rather than to the taller slot.
     projectIconBox: {
       position: "relative",
-      width: theme.iconSize.md,
-      height: theme.iconSize.md,
+      width: densityIconBox("md"),
+      height: densityIconBox("md"),
     },
     projectIconFallbackText: {
       fontSize: 9,
diff --git a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
index f67bd738ba..3d437ae0ca 100644
--- a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
@@ -2,19 +2,11 @@ import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
 import { ChevronDown, ChevronUp } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet } from "react-native-unistyles";
 import { isWeb } from "@/constants/platform";
 import { sidebarWorkspaceRowStyles } from "@/components/sidebar/sidebar-workspace-row-content";
-import type { Theme } from "@/styles/theme";
-
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-const foregroundColorMapping = (theme: Theme) => ({
-  color: theme.colors.foreground,
-});
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const ThemedChevronUp = withUnistyles(ChevronUp);
+import { DensityIcon } from "@/components/ui/density-icon";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 
 /**
  * The row that ends a truncated group. It is a workspace row that happens to say "Show more", so
@@ -62,17 +54,11 @@ export function SidebarGroupToggleRow({
       {({ hovered, pressed }) => (
         <>
           <View style={styles.iconSlot}>
-            {expanded ? (
-              <ThemedChevronUp
-                size={14}
-                uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
-              />
-            ) : (
-              <ThemedChevronDown
-                size={14}
-                uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
-              />
-            )}
+            <DensityIcon
+              icon={expanded ? ChevronUp : ChevronDown}
+              size="sm"
+              color={hovered || pressed ? "foreground" : "foregroundMuted"}
+            />
           </View>
           <Text style={hovered || pressed ? styles.textHovered : styles.text} numberOfLines={1}>
             {label}
@@ -86,7 +72,7 @@ export function SidebarGroupToggleRow({
 const styles = StyleSheet.create((theme) => ({
   // Kept in step with `workspaceRow` in sidebar-workspace-list.tsx and sidebar-status-list.tsx.
   row: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
@@ -106,21 +92,21 @@ const styles = StyleSheet.create((theme) => ({
   // The width of a workspace row's status slot, so the label lands on the same rail as the
   // titles above it rather than two points to their left.
   iconSlot: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     alignItems: "center",
     justifyContent: "center",
     flexShrink: 0,
   },
   text: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
   textHovered: {
     color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
diff --git a/packages/app/src/components/sidebar/sidebar-header-row.tsx b/packages/app/src/components/sidebar/sidebar-header-row.tsx
index 22d48c2c4e..7001bf66a6 100644
--- a/packages/app/src/components/sidebar/sidebar-header-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-header-row.tsx
@@ -1,20 +1,18 @@
-import { useCallback, useMemo } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { LucideIcon } from "lucide-react-native";
+import { useCallback, useState, type ComponentType, type ReactNode, type Ref } from "react";
+import { Pressable, Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
 import { HEADER_INNER_HEIGHT, HEADER_INNER_HEIGHT_MOBILE } from "@/constants/layout";
-import { ICON_SIZE } from "@/styles/theme";
-import type { Theme } from "@/styles/theme";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Shortcut } from "@/components/ui/shortcut";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+type SidebarHeaderRowVariant = "header" | "compact" | "inline";
 
-type SidebarHeaderRowVariant = "header" | "compact";
+export type SidebarRowIcon = ComponentType<{ size: number; color: string }>;
 
 interface SidebarHeaderRowProps {
-  icon: LucideIcon;
+  icon: SidebarRowIcon | null;
   label: string;
   onPress: () => void;
   isActive?: boolean;
@@ -24,15 +22,24 @@ interface SidebarHeaderRowProps {
   /**
    * "header" (default): a sidebar-height row with its own bottom separator —
    * the lone header at the top of a sidebar (settings "Back to workspace").
-   * "compact": a workspace-row-height row with no separator, for entries that
+   * "compact": a row with no separator, for entries that
    * sit in a header group whose wrapper owns the single divider.
+   * "inline": a full-width row with no inset, for a row inside a padded container such as the
+   * sidebar footer.
    */
   variant?: SidebarHeaderRowVariant;
+  /** Shown in the right slot while the row is hovered, when `trailing` is not set. */
   shortcutKeys?: ShortcutKey[][] | null;
+  /**
+   * The right slot. A sibling of the row's button, never inside it (web cannot nest buttons). A
+   * press on the slot presses the row; a button inside it presses on its own.
+   */
+  trailing?: ReactNode;
+  rowRef?: Ref<View>;
 }
 
 export function SidebarHeaderRow({
-  icon: Icon,
+  icon,
   label,
   onPress,
   isActive = false,
@@ -41,72 +48,60 @@ export function SidebarHeaderRow({
   accessibilityLabel,
   variant = "header",
   shortcutKeys = null,
+  trailing,
+  rowRef,
 }: SidebarHeaderRowProps) {
-  const ThemedIcon = useMemo(() => withUnistyles(Icon), [Icon]);
+  const [isHovered, setIsHovered] = useState(false);
+  const handlePointerEnter = useCallback(() => setIsHovered(true), []);
+  const handlePointerLeave = useCallback(() => setIsHovered(false), []);
+  const isHighlighted = isHovered || isActive;
+  const iconSize = variant === "header" ? "md" : "sm";
 
-  const containerStyle = useMemo(
-    () => (variant === "compact" ? styles.containerCompact : styles.container),
-    [variant],
-  );
-
-  const buttonStyle = useCallback(
-    ({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.button,
-      variant === "compact" && styles.buttonCompact,
-      (Boolean(hovered) || isActive) && styles.buttonHovered,
-    ],
-    [isActive, variant],
-  );
-
-  const renderChildren = useCallback(
-    (state: PressableStateCallbackType & { hovered?: boolean }) => {
-      const isHighlighted = Boolean(state.hovered) || isActive;
-      return (
-        <>
-          <ThemedIcon
-            size={ICON_SIZE.sm}
-            uniProps={isHighlighted ? foregroundColorMapping : foregroundMutedColorMapping}
-          />
-          <SidebarHeaderRowLabel label={label} isHighlighted={isHighlighted} />
-          {shortcutKeys && Boolean(state.hovered) ? (
-            <Shortcut chord={shortcutKeys} style={styles.shortcut} />
-          ) : null}
-        </>
-      );
-    },
-    [ThemedIcon, isActive, label, shortcutKeys],
-  );
+  let right = trailing ?? null;
+  if (right === null && shortcutKeys && isHovered) {
+    right = <Shortcut chord={shortcutKeys} />;
+  }
 
   return (
-    <View style={containerStyle}>
-      <Pressable
-        onPress={onPress}
-        testID={testID}
-        nativeID={nativeID}
-        accessible
-        accessibilityRole="button"
-        accessibilityLabel={accessibilityLabel ?? label}
-        style={buttonStyle}
+    <View ref={rowRef} collapsable={false} style={getContainerStyle(variant)}>
+      <View
+        style={[styles.row, isHighlighted && styles.rowHighlighted]}
+        onPointerEnter={handlePointerEnter}
+        onPointerLeave={handlePointerLeave}
       >
-        {renderChildren}
-      </Pressable>
+        <Pressable
+          onPress={onPress}
+          testID={testID}
+          nativeID={nativeID}
+          accessible
+          accessibilityRole="button"
+          accessibilityLabel={accessibilityLabel ?? label}
+          accessibilityState={isActive ? SELECTED_STATE : undefined}
+          aria-selected={isActive}
+          style={styles.button}
+        >
+          {icon ? (
+            <DensityIcon
+              icon={icon}
+              size={iconSize}
+              color={isHighlighted ? "foreground" : "foregroundMuted"}
+            />
+          ) : (
+            <View style={variant === "header" ? styles.iconSpacer : styles.iconSpacerCompact} />
+          )}
+          <Text style={[styles.label, isHighlighted && styles.labelHighlighted]}>{label}</Text>
+        </Pressable>
+        {right === null ? null : (
+          <Pressable onPress={onPress} accessible={false} focusable={false} style={styles.trailing}>
+            {right}
+          </Pressable>
+        )}
+      </View>
     </View>
   );
 }
 
-function SidebarHeaderRowLabel({
-  label,
-  isHighlighted,
-}: {
-  label: string;
-  isHighlighted: boolean;
-}) {
-  const labelStyle = useMemo(
-    () => [styles.label, isHighlighted && styles.labelHighlighted],
-    [isHighlighted],
-  );
-  return <Text style={labelStyle}>{label}</Text>;
-}
+const SELECTED_STATE = { selected: true } as const;
 
 const styles = StyleSheet.create((theme) => ({
   container: {
@@ -125,38 +120,60 @@ const styles = StyleSheet.create((theme) => ({
     justifyContent: "center",
     userSelect: "none",
   },
+  containerInline: {
+    width: "100%",
+    justifyContent: "center",
+    userSelect: "none",
+  },
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    // Same row geometry as the settings sidebar items. Shorter than the header
+    // strip so the hover highlight clears the strip's bottom separator.
+    minHeight: density.tightRowHeight,
+    borderRadius: theme.borderRadius.lg,
+  },
+  rowHighlighted: {
+    backgroundColor: theme.colors.surfaceSidebarHover,
+  },
   button: {
+    flex: 1,
+    minWidth: 0,
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-    // Match the sidebar workspace-row shape (height, padding, radius) so the
-    // compact header entries sit tight against the workspace list below.
-    minHeight: 36,
-    paddingVertical: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
-    borderRadius: theme.borderRadius.lg,
-  },
-  // Compact header entries (New workspace / History) sit tighter than the
-  // workspace-row shape the base button mirrors.
-  buttonCompact: {
-    minHeight: 32,
-    paddingVertical: theme.spacing[1.5],
+    minHeight: density.tightRowHeight,
+    paddingVertical: theme.spacing[1],
     // Match the project rows' inner padding so the icons align on one vertical
-    // edge with the workspace list below (base button uses a wider spacing[3]).
+    // edge with the list below.
     paddingHorizontal: theme.spacing[2],
   },
-  buttonHovered: {
-    backgroundColor: theme.colors.surfaceSidebarHover,
-  },
+  iconSpacer: { width: densityIconBox("md"), height: densityIconBox("md") },
+  iconSpacerCompact: { width: densityIconBox("sm"), height: densityIconBox("sm") },
   label: {
-    fontSize: theme.fontSize.base,
+    flexShrink: 1,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: theme.fontWeight.normal,
     color: theme.colors.foregroundMuted,
   },
   labelHighlighted: {
     color: theme.colors.foreground,
   },
-  shortcut: {
-    marginLeft: "auto",
+  trailing: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+    paddingRight: theme.spacing[2],
   },
 }));
+
+function getContainerStyle(variant: SidebarHeaderRowVariant) {
+  switch (variant) {
+    case "header":
+      return styles.container;
+    case "compact":
+      return styles.containerCompact;
+    case "inline":
+      return styles.containerInline;
+  }
+}
diff --git a/packages/app/src/components/sidebar/sidebar-help-menu.tsx b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
index eb00df6e12..97ff3d2772 100644
--- a/packages/app/src/components/sidebar/sidebar-help-menu.tsx
+++ b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
@@ -14,28 +14,28 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useAppDiagnosticStore } from "@/diagnostics/store";
 import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
 import { useHostRuntimeIsConnected, useHosts } from "@/runtime/host-runtime";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { useSessionStore } from "@/stores/session-store";
+import { density } from "@/styles/density";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
 import { formatVersionWithPrefix } from "@/desktop/updates/desktop-updates";
 import { resolveAppVersion } from "@/utils/app-version";
+import { openChangelog } from "@/changelog";
 import { openExternalUrl } from "@/utils/open-external-url";
 
 const DISCORD_URL = "https://discord.gg/jz8T2uahpH";
 const GITHUB_ISSUE_URL = "https://github.com/getpaseo/paseo/issues/new";
-const CHANGELOG_URL = "https://paseo.sh/changelog";
 const ThemedActivity = withUnistyles(Activity);
-const ThemedCircleHelp = withUnistyles(CircleHelp);
 const ThemedGift = withUnistyles(Gift);
 const ThemedKeyboard = withUnistyles(Keyboard);
 const ThemedDiscordIcon = withUnistyles(DiscordIcon);
 const ThemedGitHubIcon = withUnistyles(GitHubIcon);
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
@@ -97,10 +97,6 @@ export function SidebarHelpMenu() {
     void openExternalUrl(GITHUB_ISSUE_URL);
   }, []);
 
-  const openChangelog = useCallback(() => {
-    void openExternalUrl(CHANGELOG_URL);
-  }, []);
-
   return (
     <DropdownMenu open={open} onOpenChange={setOpen}>
       <Tooltip delayDuration={300} enabledOnDesktop={!open}>
@@ -113,9 +109,10 @@ export function SidebarHelpMenu() {
               accessibilityLabel={t("sidebar.help.trigger")}
             >
               {({ hovered }) => (
-                <ThemedCircleHelp
-                  size={ICON_SIZE.md}
-                  uniProps={hovered ? foregroundColorMapping : foregroundMutedColorMapping}
+                <DensityIcon
+                  icon={CircleHelp}
+                  size="md"
+                  color={hovered ? "foreground" : "foregroundMuted"}
                 />
               )}
             </DropdownMenuTrigger>
@@ -186,8 +183,8 @@ export function SidebarHelpMenu() {
 
 const styles = StyleSheet.create((theme) => ({
   trigger: {
-    width: 28,
-    height: 28,
+    width: density.iconButton,
+    height: density.iconButton,
     alignItems: "center",
     justifyContent: "center",
     paddingVertical: theme.spacing[1],
diff --git a/packages/app/src/components/sidebar/sidebar-model.tsx b/packages/app/src/components/sidebar/sidebar-model.tsx
index 9399a3bd13..ec834aee19 100644
--- a/packages/app/src/components/sidebar/sidebar-model.tsx
+++ b/packages/app/src/components/sidebar/sidebar-model.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "react-i18next";
 import React, { createContext, useContext, useEffect, useMemo, type ReactNode } from "react";
 import {
   useSidebarWorkspacesList,
@@ -54,7 +55,9 @@ export function SidebarModelProvider({
   active?: boolean;
   children: ReactNode;
 }) {
+  const { t } = useTranslation();
   const list = useSidebarWorkspacesList({ enabled: active });
+  const showBackground = useSidebarViewStore((state) => state.showBackground);
   const groupMode = useSidebarViewStore((state) => state.groupMode);
   const labelFilter = useSidebarViewStore((state) => state.labelFilter);
   const projectFilters = useSidebarViewStore((state) => state.projectFilters);
@@ -105,9 +108,12 @@ export function SidebarModelProvider({
       workspaces: [...workspaceEntriesByKey.values()],
       projectFilters: resolvedProjectFilters,
     });
-    const filtered = filterWorkspacesByLabels({ workspaces: byProject, ...labelFilter });
+    const filtered = filterWorkspacesByLabels({
+      workspaces: byProject.filter((workspace) => showBackground || !workspace.background),
+      ...labelFilter,
+    });
     return new Map(filtered.map((workspace) => [workspace.workspaceKey, workspace]));
-  }, [labelFilter, resolvedProjectFilters, workspaceEntriesByKey]);
+  }, [showBackground, labelFilter, resolvedProjectFilters, workspaceEntriesByKey]);
   const visibleWorkspaceKeys = useMemo(
     () => new Set(filteredWorkspaceEntriesByKey.keys()),
     [filteredWorkspaceEntriesByKey],
@@ -122,16 +128,19 @@ export function SidebarModelProvider({
       const included = new Set(resolvedProjectFilters);
       projects = projects.filter((project) => included.has(project.viewKey));
     }
-    if (hasActiveLabelFilter) {
+    if (hasActiveLabelFilter || !showBackground) {
       projects = projects.flatMap((project) => {
         const workspaces = project.workspaces.filter((workspace) =>
           visibleWorkspaceKeys.has(workspace.workspaceKey),
         );
-        return workspaces.length > 0 ? [{ ...project, workspaces }] : [];
+        return workspaces.length > 0 || (!hasActiveLabelFilter && project.workspaces.length === 0)
+          ? [{ ...project, workspaces }]
+          : [];
       });
     }
     return projects;
   }, [
+    showBackground,
     hasActiveLabelFilter,
     hasActiveProjectFilter,
     resolvedProjectFilters,
@@ -150,6 +159,7 @@ export function SidebarModelProvider({
       pinnedCollapsed,
       collapsedProjectKeys,
       collapsedWorkspaceGroupKeys,
+      t,
     }),
     [
       collapsedProjectKeys,
@@ -161,6 +171,7 @@ export function SidebarModelProvider({
       pinnedKeys,
       pinnedWorkspaceOrder,
       filteredWorkspaceEntriesByKey,
+      t,
     ],
   );
   const projection = useMemo(() => buildSidebarProjection(projectionInput), [projectionInput]);
diff --git a/packages/app/src/components/sidebar/sidebar-nav-rows.tsx b/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
index 258dc19468..425280207e 100644
--- a/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
+++ b/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
@@ -1,11 +1,11 @@
 import { router, usePathname } from "expo-router";
 import { CalendarClock, History, Plus, Search } from "lucide-react-native";
-import { memo, useCallback, useMemo, type ComponentType } from "react";
+import { memo, useCallback, useMemo, useRef, type ComponentType } from "react";
 import { useTranslation } from "react-i18next";
 import { View, type StyleProp, type ViewStyle } from "react-native";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
-import { PluginSidebarItemRow } from "@/plugins/sidebar-items";
+import { PluginSidebarItem } from "@/plugins/sidebar-items";
 import { canCreateWorktreeForProjectKind } from "@/projects/host-projects";
 import { useHostFeature } from "@/runtime/host-features";
 import {
@@ -38,19 +38,22 @@ interface SidebarNavRowsProps extends SidebarNavRowProps {
  * wrapper — when every item is hidden.
  */
 export function SidebarNavRows({ style, onBeforeNavigate }: SidebarNavRowsProps) {
-  const { items } = useSidebarNavItems();
+  const { items } = useSidebarNavItems("header");
   const visibleItems = useMemo(() => items.filter((item) => item.visible), [items]);
+  const groupRef = useRef<View | null>(null);
 
   if (visibleItems.length === 0) return null;
 
   return (
-    <View style={style}>
+    <View ref={groupRef} collapsable={false} style={style}>
       {visibleItems.map((item) => {
         if (item.kind === "plugin") {
           return (
-            <PluginSidebarItemRow
+            <PluginSidebarItem
               key={item.key}
               group={item.group}
+              section="header"
+              fallbackAnchorRef={groupRef}
               onBeforeNavigate={onBeforeNavigate}
             />
           );
diff --git a/packages/app/src/components/sidebar/sidebar-popover.tsx b/packages/app/src/components/sidebar/sidebar-popover.tsx
new file mode 100644
index 0000000000..e57f3cf6ac
--- /dev/null
+++ b/packages/app/src/components/sidebar/sidebar-popover.tsx
@@ -0,0 +1,98 @@
+import { useCallback, type ReactNode, type RefObject } from "react";
+import type { View } from "react-native";
+import { MenuRoot, useMenuContext } from "@/components/ui/menu";
+import { PluginPopoverSurface } from "@/plugins/popover";
+import type { SidebarSection } from "@/sidebar-nav/model";
+
+/**
+ * The popover a sidebar item opens: anchored to the item on wide layouts, a bottom sheet on
+ * compact ones. Plugin items open it this way:
+ * `SidebarPopoverRoot` around the item, `useSidebarPopoverAnchor` on the element to anchor to,
+ * and `SidebarPopoverSurface` for the body.
+ */
+export function SidebarPopoverRoot({
+  open,
+  onOpenChange,
+  children,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  children: ReactNode;
+}) {
+  return (
+    <MenuRoot compactMode="sheet" open={open} onOpenChange={onOpenChange}>
+      {children}
+    </MenuRoot>
+  );
+}
+
+function assignRef(ref: RefObject<View | null>, node: View | null) {
+  Object.assign(ref, { current: node });
+}
+
+/**
+ * Where the popover anchors. `anchorTo` moves it to an element, such as the row just pressed;
+ * `offerAnchor` sets it only when nothing is anchored; `releaseAnchor` drops an element that is
+ * going away; `anchorToFallback` covers an item that anchored nothing.
+ */
+export function useSidebarPopoverAnchor(name: string): {
+  anchorTo: (node: View | null) => void;
+  offerAnchor: (node: View | null) => void;
+  releaseAnchor: (node: View | null) => void;
+  anchorToFallback: (fallback: RefObject<View | null>) => void;
+} {
+  const { triggerRef } = useMenuContext(name);
+  const anchorTo = useCallback((node: View | null) => assignRef(triggerRef, node), [triggerRef]);
+  const offerAnchor = useCallback(
+    (node: View | null) => {
+      if (!triggerRef.current) assignRef(triggerRef, node);
+    },
+    [triggerRef],
+  );
+  const releaseAnchor = useCallback(
+    (node: View | null) => {
+      if (triggerRef.current === node) assignRef(triggerRef, null);
+    },
+    [triggerRef],
+  );
+  const anchorToFallback = useCallback(
+    (fallback: RefObject<View | null>) => offerAnchor(fallback.current),
+    [offerAnchor],
+  );
+  return { anchorTo, offerAnchor, releaseAnchor, anchorToFallback };
+}
+
+const PLACEMENT = {
+  header: { side: "right", align: "start" },
+  footer: { side: "top", align: "start" },
+} as const satisfies Record<SidebarSection, { side: string; align: string }>;
+
+export function SidebarPopoverSurface({
+  section,
+  title,
+  sheetTrailing,
+  testID,
+  children,
+}: {
+  section: SidebarSection;
+  /** The bottom sheet's title. */
+  title: string;
+  /** Controls on the right of the bottom sheet's title. */
+  sheetTrailing?: ReactNode;
+  testID: string;
+  children: ReactNode;
+}) {
+  const placement = PLACEMENT[section];
+  return (
+    <PluginPopoverSurface
+      sheetTitle={title}
+      sheetTrailing={sheetTrailing}
+      side={placement.side}
+      align={placement.align}
+      offset={8}
+      testID={testID}
+    >
+      {children}
+    </PluginPopoverSurface>
+  );
+}
diff --git a/packages/app/src/components/sidebar/sidebar-projection.test.ts b/packages/app/src/components/sidebar/sidebar-projection.test.ts
index 55882a0c49..c2dc31f2ee 100644
--- a/packages/app/src/components/sidebar/sidebar-projection.test.ts
+++ b/packages/app/src/components/sidebar/sidebar-projection.test.ts
@@ -1,3 +1,4 @@
+import { i18n } from "@/i18n/i18next";
 import { describe, expect, it } from "vitest";
 import type {
   SidebarProjectEntry,
@@ -85,6 +86,7 @@ function projectionInput(options?: {
     pinnedCollapsed: options?.pinnedCollapsed ?? false,
     collapsedProjectKeys: new Set<string>(),
     collapsedWorkspaceGroupKeys: new Set<string>(),
+    t: i18n.t,
   };
 }
 
diff --git a/packages/app/src/components/sidebar/sidebar-projection.ts b/packages/app/src/components/sidebar/sidebar-projection.ts
index c67042b45e..2e84f02aae 100644
--- a/packages/app/src/components/sidebar/sidebar-projection.ts
+++ b/packages/app/src/components/sidebar/sidebar-projection.ts
@@ -1,3 +1,4 @@
+import type { TFunction } from "i18next";
 import { buildStatusGroups } from "@/hooks/sidebar-status-view-model";
 import {
   splitPinnedSidebarGroups,
@@ -45,6 +46,7 @@ export interface SidebarProjectionInput {
   pinnedCollapsed: boolean;
   collapsedProjectKeys: ReadonlySet<string>;
   collapsedWorkspaceGroupKeys: ReadonlySet<string>;
+  t: TFunction;
 }
 
 export function buildSidebarProjection(input: SidebarProjectionInput): SidebarProjection {
@@ -100,7 +102,7 @@ function buildWorkspaceGroups(
       return [];
     case "status":
       return statusWorkspaceGroups(
-        buildStatusGroups(unpinnedWorkspaces, input.projectNamesByViewKey),
+        buildStatusGroups(unpinnedWorkspaces, input.projectNamesByViewKey, input.t),
       );
   }
 }
diff --git a/packages/app/src/components/sidebar/sidebar-separator.tsx b/packages/app/src/components/sidebar/sidebar-separator.tsx
index 864e56361f..30310d84ad 100644
--- a/packages/app/src/components/sidebar/sidebar-separator.tsx
+++ b/packages/app/src/components/sidebar/sidebar-separator.tsx
@@ -6,8 +6,8 @@ import { StyleSheet } from "react-native-unistyles";
  * padded container so the line runs the full sidebar width — matching the
  * separator beneath the workspace sidebar's "New agent" header.
  */
-export function SidebarSeparator() {
-  return <View style={styles.line} />;
+export function SidebarSeparator({ testID }: { testID?: string } = {}) {
+  return <View style={styles.line} testID={testID} />;
 }
 
 const styles = StyleSheet.create((theme) => ({
diff --git a/packages/app/src/components/sidebar/sidebar-status-list.tsx b/packages/app/src/components/sidebar/sidebar-status-list.tsx
index def203c9cd..85c0d524f8 100644
--- a/packages/app/src/components/sidebar/sidebar-status-list.tsx
+++ b/packages/app/src/components/sidebar/sidebar-status-list.tsx
@@ -28,7 +28,7 @@ import type { HostBadgeModel } from "@/hosts/appearance";
 import { isWeb as platformIsWeb, isNative as platformIsNative } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { StyleSheet } from "react-native-unistyles";
-import type { Theme } from "@/styles/theme";
+import { density, densityFontSize, densityIconBox, densityIconProps } from "@/styles/density";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { withUnistyles } from "react-native-unistyles";
 import {
@@ -48,11 +48,12 @@ import { toWorktreeArchiveRisk } from "@/git/worktree-archive-warning";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
-import { useClearWorkspaceAttention } from "@/hooks/use-clear-workspace-attention";
+import { useWorkspaceReadState } from "@/hooks/use-workspace-read-state";
 import {
   SidebarWorkspaceRowFrame,
   SidebarWorkspaceRowContent,
   resolveTrailingActionVisibility,
+  type SidebarWorkspaceTrailingPresentation,
   SidebarWorkspaceTrailingActionBase,
   SidebarWorkspaceTrailingActionOverlay,
   SidebarWorkspaceTrailingActionSlot,
@@ -81,23 +82,23 @@ import type { DraggableListDragHandleProps } from "@/components/draggable-list.t
 import { useLongPressDragInteraction } from "@/components/sidebar/use-long-press-drag-interaction";
 
 // Themed icon wrappers
-const foregroundMutedColorMapping = (theme: Theme) => ({
+const mutedGroupIconProps = densityIconProps("sm", (theme) => ({
   color: theme.colors.foregroundMuted,
-});
+}));
 // One mapping per bucket, resolved through the status-dot producer so a group header and
 // the rows under it cannot disagree about what "failed" looks like.
-const needsInputColorMapping = (theme: Theme) => ({
+const needsInputGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
-});
-const failedColorMapping = (theme: Theme) => ({
+}));
+const failedGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "failed" }) ?? undefined,
-});
-const attentionColorMapping = (theme: Theme) => ({
+}));
+const attentionGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "attention" }) ?? undefined,
-});
-const runningColorMapping = (theme: Theme) => ({
+}));
+const runningGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "running" }) ?? undefined,
-});
+}));
 
 const ThemedChevronDown = withUnistyles(ChevronDown);
 const ThemedChevronRight = withUnistyles(ChevronRight);
@@ -407,6 +408,7 @@ function StatusGroupHeader({
   group: SidebarWorkspaceGroup;
   collapsed: boolean;
 }) {
+  const { t } = useTranslation();
   const [isHovered, setIsHovered] = useState(false);
   const toggleWorkspaceGroupCollapsed = useSidebarCollapsedSectionsStore(
     (state) => state.toggleWorkspaceGroupCollapsed,
@@ -430,7 +432,7 @@ function StatusGroupHeader({
     <View onPointerEnter={handleHoverIn} onPointerLeave={handleHoverOut}>
       <Pressable
         accessibilityRole={platformIsWeb ? undefined : "button"}
-        accessibilityLabel={`${group.label} group`}
+        accessibilityLabel={t("sidebar.statusGroupAccessibility", { label: group.label })}
         accessibilityState={accessibilityState}
         style={rowStyle}
         onPress={handlePress}
@@ -468,23 +470,23 @@ function StatusGroupLeadingVisual({
     return <StatusGroupIcon bucket={leading.bucket} />;
   }
   if (collapsed) {
-    return <ThemedChevronRight size={14} uniProps={foregroundMutedColorMapping} />;
+    return <ThemedChevronRight uniProps={mutedGroupIconProps} />;
   }
-  return <ThemedChevronDown size={14} uniProps={foregroundMutedColorMapping} />;
+  return <ThemedChevronDown uniProps={mutedGroupIconProps} />;
 }
 
 function StatusGroupIcon({ bucket }: { bucket: StatusBucket }) {
   switch (bucket) {
     case "needs_input":
-      return <ThemedCircleAlert size={14} uniProps={needsInputColorMapping} />;
+      return <ThemedCircleAlert uniProps={needsInputGroupIconProps} />;
     case "failed":
-      return <ThemedCircleX size={14} uniProps={failedColorMapping} />;
+      return <ThemedCircleX uniProps={failedGroupIconProps} />;
     case "attention":
-      return <ThemedCircleCheck size={14} uniProps={attentionColorMapping} />;
+      return <ThemedCircleCheck uniProps={attentionGroupIconProps} />;
     case "running":
-      return <ThemedCircleDot size={14} uniProps={runningColorMapping} />;
+      return <ThemedCircleDot uniProps={runningGroupIconProps} />;
     case "done":
-      return <ThemedCircleCheck size={14} uniProps={foregroundMutedColorMapping} />;
+      return <ThemedCircleCheck uniProps={mutedGroupIconProps} />;
   }
 }
 
@@ -641,15 +643,21 @@ function StatusWorkspaceRowWithMenu({
   const onTogglePin = canPin ? handleTogglePin : undefined;
 
   const archiveShortcutKeys = useShortcutKeys("archive-workspace");
-  const { hasClearableAttention, clearAttention } = useClearWorkspaceAttention({
-    serverId: workspace.serverId,
-    workspaceId: workspace.workspaceId,
-  });
+  const { hasClearableAttention, canMarkUnread, clearAttention, markUnread } =
+    useWorkspaceReadState({
+      serverId: workspace.serverId,
+      workspaceId: workspace.workspaceId,
+    });
   const handleMarkAsRead = useCallback(() => {
     void clearAttention().catch((error) => {
       toast.error(error instanceof Error ? error.message : "Failed to mark workspace as read");
     });
   }, [clearAttention, toast]);
+  const handleMarkAsUnread = useCallback(() => {
+    void markUnread().catch((error) => {
+      toast.error(error instanceof Error ? error.message : "Failed to mark workspace as unread");
+    });
+  }, [markUnread, toast]);
 
   useKeyboardActionHandler({
     handlerId: `workspace-archive-${workspace.workspaceKey}`,
@@ -682,6 +690,7 @@ function StatusWorkspaceRowWithMenu({
         onCopyPath={handleCopyPath}
         onRename={handleOpenRename}
         onMarkAsRead={hasClearableAttention ? handleMarkAsRead : undefined}
+        onMarkAsUnread={canMarkUnread ? handleMarkAsUnread : undefined}
         archiveShortcutKeys={selected ? archiveShortcutKeys : null}
         isPinned={isPinned}
         onTogglePin={onTogglePin}
@@ -719,6 +728,7 @@ interface StatusWorkspaceRowInnerProps {
   onCopyPath?: () => void;
   onRename?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   archiveShortcutKeys?: ShortcutKey[][] | null;
   isPinned?: boolean;
   onTogglePin?: () => void;
@@ -765,6 +775,7 @@ function StatusWorkspaceRowInnerContent({
   onCopyPath,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   archiveShortcutKeys,
   isPinned,
   onTogglePin,
@@ -819,7 +830,7 @@ function StatusWorkspaceRowInnerContent({
       {({ isHovered, contextMenuOpen, onContextMenuOpenChange, hoverHandlers }) => {
         const showShortcut = showShortcutBadge && shortcutNumber !== null;
         const {
-          showTrailing,
+          trailingPresentation,
           showKebab: showKebabInSlot,
           showScrim,
           renderSlot,
@@ -860,6 +871,7 @@ function StatusWorkspaceRowInnerContent({
               onCopyBranchName={onCopyBranchName}
               onRename={onRename}
               onMarkAsRead={onMarkAsRead}
+              onMarkAsUnread={onMarkAsUnread}
               onArchive={onArchive}
               archiveLabel={archiveLabel}
               archiveStatus={archiveStatus}
@@ -897,7 +909,7 @@ function StatusWorkspaceRowInnerContent({
                     workspace={workspace}
                     backdrop={backdrop}
                     trailing={trailing}
-                    showBase={showTrailing}
+                    trailingPresentation={trailingPresentation}
                     showKebab={showKebabInSlot}
                     showScrim={showScrim}
                     reserveSlotWidth={reserveSlotWidth}
@@ -907,6 +919,7 @@ function StatusWorkspaceRowInnerContent({
                     onCopyBranchName={onCopyBranchName}
                     onRename={onRename}
                     onMarkAsRead={onMarkAsRead}
+                    onMarkAsUnread={onMarkAsUnread}
                     onArchive={onArchive}
                     archiveLabel={archiveLabel}
                     archiveStatus={archiveStatus}
@@ -927,7 +940,7 @@ function StatusWorkspaceActionSlot({
   workspace,
   backdrop,
   trailing,
-  showBase,
+  trailingPresentation,
   showKebab,
   showScrim,
   reserveSlotWidth,
@@ -937,6 +950,7 @@ function StatusWorkspaceActionSlot({
   onCopyBranchName,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   onArchive,
   archiveLabel,
   archiveStatus,
@@ -946,7 +960,7 @@ function StatusWorkspaceActionSlot({
   workspace: SidebarWorkspaceEntry;
   backdrop: SidebarSurfaceBackdrop;
   trailing: SidebarWorkspaceTrailing;
-  showBase: boolean;
+  trailingPresentation: SidebarWorkspaceTrailingPresentation;
   showKebab: boolean;
   showScrim: boolean;
   reserveSlotWidth: boolean;
@@ -956,6 +970,7 @@ function StatusWorkspaceActionSlot({
   onCopyBranchName?: () => void;
   onRename?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   onArchive?: () => void;
   archiveLabel?: string;
   archiveStatus?: "idle" | "pending" | "success";
@@ -965,7 +980,7 @@ function StatusWorkspaceActionSlot({
   const kebab = useOpenKebabMenuVisibility(showKebab);
   return (
     <SidebarWorkspaceTrailingActionSlot reserveWidth={reserveSlotWidth}>
-      <SidebarWorkspaceTrailingActionBase visible={showBase}>
+      <SidebarWorkspaceTrailingActionBase presentation={trailingPresentation}>
         <SidebarWorkspaceTrailingContent workspace={workspace} trailing={trailing} />
       </SidebarWorkspaceTrailingActionBase>
       <SidebarWorkspaceTrailingActionOverlay
@@ -983,6 +998,7 @@ function StatusWorkspaceActionSlot({
             onCopyBranchName={onCopyBranchName}
             onRename={onRename}
             onMarkAsRead={onMarkAsRead}
+            onMarkAsUnread={onMarkAsUnread}
             onArchive={onArchive}
             archiveLabel={archiveLabel}
             archiveStatus={archiveStatus}
@@ -1042,7 +1058,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusWorkspaceListContainer: {},
   statusGroupRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
@@ -1068,8 +1084,8 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusGroupLeadingVisualSlot: {
     position: "relative",
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     flexShrink: 0,
     alignItems: "center",
     justifyContent: "center",
@@ -1083,7 +1099,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusGroupTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
@@ -1092,7 +1108,7 @@ const styles = StyleSheet.create((theme) => ({
     position: "relative",
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-menu.tsx b/packages/app/src/components/sidebar/sidebar-workspace-menu.tsx
index 66df32bdbb..e1543fac41 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-menu.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-menu.tsx
@@ -4,6 +4,7 @@ import { type PressableStateCallbackType } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   Archive,
+  Circle,
   CircleCheck,
   Copy,
   MoreVertical,
@@ -52,6 +53,7 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
 const ThemedMoreVertical = withUnistyles(MoreVertical);
 const ThemedCopy = withUnistyles(Copy);
 const ThemedArchive = withUnistyles(Archive);
+const ThemedCircle = withUnistyles(Circle);
 const ThemedPencil = withUnistyles(Pencil);
 const ThemedCircleCheck = withUnistyles(CircleCheck);
 const ThemedPin = withUnistyles(Pin);
@@ -63,6 +65,7 @@ const renameLeadingIcon = <ThemedPencil size={14} uniProps={foregroundMutedColor
 const markAsReadLeadingIcon = (
   <ThemedCircleCheck size={14} uniProps={foregroundMutedColorMapping} />
 );
+const markAsUnreadLeadingIcon = <ThemedCircle size={14} uniProps={foregroundMutedColorMapping} />;
 const archiveLeadingIcon = <ThemedArchive size={14} uniProps={foregroundMutedColorMapping} />;
 const pinLeadingIcon = <ThemedPin size={14} uniProps={foregroundMutedColorMapping} />;
 const unpinLeadingIcon = <ThemedPinOff size={14} uniProps={foregroundMutedColorMapping} />;
@@ -85,6 +88,7 @@ export interface SidebarWorkspaceMenuProps {
   onCopyBranchName?: () => void;
   onRename?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   onArchive: () => void;
   archiveLabel?: string;
   archiveStatus?: "idle" | "pending" | "success";
@@ -132,6 +136,7 @@ function SidebarWorkspaceMenuItems({
   onCopyBranchName,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   onArchive,
   archiveLabel,
   archiveStatus,
@@ -193,6 +198,16 @@ function SidebarWorkspaceMenuItems({
           Mark as read
         </WorkspaceMenuItem>
       ) : null}
+      {onMarkAsUnread ? (
+        <WorkspaceMenuItem
+          surface={surface}
+          testID={`sidebar-workspace-menu-mark-as-unread-${workspaceKey}`}
+          leading={markAsUnreadLeadingIcon}
+          onSelect={onMarkAsUnread}
+        >
+          Mark as unread
+        </WorkspaceMenuItem>
+      ) : null}
       {onTogglePin ? (
         <WorkspaceMenuItem
           surface={surface}
@@ -243,6 +258,7 @@ export function SidebarWorkspaceMenu({
   onCopyBranchName,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   onArchive,
   archiveLabel,
   archiveStatus,
@@ -288,6 +304,7 @@ export function SidebarWorkspaceMenu({
           onCopyBranchName={onCopyBranchName}
           onRename={onRename}
           onMarkAsRead={onMarkAsRead}
+          onMarkAsUnread={onMarkAsUnread}
           onArchive={onArchive}
           archiveLabel={archiveLabel}
           archiveStatus={archiveStatus}
@@ -320,6 +337,7 @@ export function SidebarWorkspaceContextMenu({
   onCopyBranchName,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   onArchive,
   archiveLabel,
   archiveStatus,
@@ -362,6 +380,7 @@ export function SidebarWorkspaceContextMenu({
     serviceLabel: serviceSummary
       ? t(workspaceServiceLabelKey(serviceSummary), { name: serviceSummary.name })
       : null,
+    t,
   });
   const workspaceTarget = useMemo<WorkspaceLabelTarget>(
     () => ({
@@ -399,6 +418,7 @@ export function SidebarWorkspaceContextMenu({
           onCopyBranchName={onCopyBranchName}
           onRename={onRename}
           onMarkAsRead={onMarkAsRead}
+          onMarkAsUnread={onMarkAsUnread}
           onArchive={onArchive}
           archiveLabel={archiveLabel}
           archiveStatus={archiveStatus}
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
index 2eeb6b043d..33f14afcb5 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
@@ -16,6 +16,7 @@ import {
   type SidebarWorkspaceTrailing,
 } from "@/components/sidebar/workspace-trailing";
 import { useAppSettings } from "@/hooks/use-settings";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { getStatusDotColor } from "@/utils/status-dot-color";
@@ -27,19 +28,16 @@ import {
 import { shouldRenderSyncedStatusLoader } from "@/utils/status-loader";
 import { StatusRing } from "@/components/status-ring";
 import { resolveSidebarWorkspacePrimaryLabel } from "@/components/sidebar/sidebar-workspace-title";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { TrailingActionScrim } from "@/components/ui/trailing-action-scrim";
 import { useWorkspaceLabelDefinitions } from "@/workspace-labels";
 
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 const needsInputColorMapping = (theme: Theme) => ({
   color: theme.colors.surface0,
   fill: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
 });
 
 const ThemedCircleAlert = withUnistyles(CircleAlert);
-const ThemedMonitor = withUnistyles(Monitor);
-const ThemedFolder = withUnistyles(Folder);
-const ThemedFolderGit2 = withUnistyles(FolderGit2);
 
 export function SidebarWorkspaceRowFrame({
   workspace,
@@ -241,15 +239,15 @@ function WorkspaceStatusIndicator({
     ) : null;
   }
 
-  let KindIcon: typeof ThemedMonitor;
-  if (workspaceKind === "local_checkout") KindIcon = ThemedMonitor;
-  else if (workspaceKind === "worktree") KindIcon = ThemedFolderGit2;
-  else KindIcon = ThemedFolder;
+  let KindIcon: typeof Monitor;
+  if (workspaceKind === "local_checkout") KindIcon = Monitor;
+  else if (workspaceKind === "worktree") KindIcon = FolderGit2;
+  else KindIcon = Folder;
 
   const dotColorStyle = getStatusDotColorStyle(bucket);
   return (
     <View style={styles.workspaceStatusDot} testID={`workspace-status-indicator-${bucket}`}>
-      <KindIcon size={14} uniProps={foregroundMutedColorMapping} />
+      <DensityIcon icon={KindIcon} size="sm" color="foregroundMuted" />
       {dotColorStyle ? <StatusDotOverlay dotColorStyle={dotColorStyle} /> : null}
     </View>
   );
@@ -343,6 +341,8 @@ export function SidebarWorkspaceShortcutBadge({ number }: { number: number }) {
   );
 }
 
+export type SidebarWorkspaceTrailingPresentation = "visible" | "hidden" | "absent";
+
 /**
  * What the trailing slot shows for a row. Derived in one place because three row renderers
  * share it: the two project-mode rows and the status-mode row. The rule used to be copied
@@ -368,7 +368,7 @@ export function resolveTrailingActionVisibility({
   isTouchPlatform: boolean;
   showShortcut: boolean;
 }): {
-  showTrailing: boolean;
+  trailingPresentation: SidebarWorkspaceTrailingPresentation;
   showKebab: boolean;
   showScrim: boolean;
   renderSlot: boolean;
@@ -376,9 +376,13 @@ export function resolveTrailingActionVisibility({
 } {
   const hasTrailing = hasSidebarWorkspaceTrailing({ workspace, trailing });
   const showKebab = Boolean(hasArchiveAction && (isHovered || isTouchPlatform)) && !showShortcut;
-  const showTrailing = hasTrailing && !showShortcut && (isHovered || !showKebab);
+  // Touch permanently replaces the stats with the menu. Only temporary shortcut hints
+  // conceal content while retaining its width, so desktop rows do not shift.
+  const hasContent = hasTrailing && !(hasArchiveAction && isTouchPlatform);
+  let trailingPresentation: SidebarWorkspaceTrailingPresentation = "absent";
+  if (hasContent) trailingPresentation = showShortcut ? "hidden" : "visible";
   return {
-    showTrailing,
+    trailingPresentation,
     showKebab,
     // The scrim paints the row's own hover background, so it can only be drawn on a hovered
     // row — over an unhovered one the gradient fades to the wrong color. That is also why
@@ -389,7 +393,7 @@ export function resolveTrailingActionVisibility({
     // does; the kebab only does on touch, where there is no hover for it to appear on and so
     // no scrim to let it overlay the title. Everywhere else the width goes back to the title
     // and the kebab fades in over its tail.
-    reserveSlotWidth: hasTrailing || (hasArchiveAction && isTouchPlatform),
+    reserveSlotWidth: hasContent || (hasArchiveAction && isTouchPlatform),
   };
 }
 
@@ -414,14 +418,18 @@ export function SidebarWorkspaceTrailingActionSlot({
 }
 
 export function SidebarWorkspaceTrailingActionBase({
-  visible,
+  presentation,
   children,
 }: {
-  visible: boolean;
+  presentation: SidebarWorkspaceTrailingPresentation;
   children: ReactNode;
 }) {
-  if (!children) return null;
-  return <View style={visible ? undefined : sidebarWorkspaceRowStyles.hidden}>{children}</View>;
+  if (presentation === "absent") return null;
+  return (
+    <View style={presentation === "hidden" ? sidebarWorkspaceRowStyles.hidden : undefined}>
+      {children}
+    </View>
+  );
 }
 
 export function SidebarWorkspaceTrailingActionOverlay({
@@ -472,8 +480,8 @@ const styles = StyleSheet.create((theme) => ({
   },
   workspaceStatusDot: {
     position: "relative",
-    width: theme.iconSize.md,
-    height: 20,
+    width: densityIconBox("md"),
+    height: density.rowLineHeight,
     borderRadius: theme.borderRadius.full,
     flexShrink: 0,
     alignItems: "center",
@@ -505,9 +513,9 @@ const styles = StyleSheet.create((theme) => ({
   // to the meta row, so it takes the full width the trailing slot leaves behind.
   workspaceBranchText: {
     color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
-    lineHeight: 20,
+    lineHeight: density.rowLineHeight,
     opacity: 0.76,
     flex: 1,
     minWidth: 0,
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
index 1233365673..c5f8a278bd 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
@@ -4,6 +4,7 @@ import { View, Text, type GestureResponderEvent } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import type { HostBadgeModel } from "@/hosts/appearance";
 import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
+import { density } from "@/styles/density";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import type { DraggableListDragHandleProps } from "@/components/draggable-list.types";
 import type { ShortcutKey } from "@/utils/format-shortcut";
@@ -14,7 +15,7 @@ import { toWorktreeArchiveRisk } from "@/git/worktree-archive-warning";
 import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
-import { useClearWorkspaceAttention } from "@/hooks/use-clear-workspace-attention";
+import { useWorkspaceReadState } from "@/hooks/use-workspace-read-state";
 import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
 import { isNative as platformIsNative } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -123,15 +124,21 @@ export function SidebarWorkspaceRow({
   }, []);
 
   const archiveShortcutKeys = useShortcutKeys("archive-workspace");
-  const { hasClearableAttention, clearAttention } = useClearWorkspaceAttention({
-    serverId: workspace.serverId,
-    workspaceId: workspace.workspaceId,
-  });
+  const { hasClearableAttention, canMarkUnread, clearAttention, markUnread } =
+    useWorkspaceReadState({
+      serverId: workspace.serverId,
+      workspaceId: workspace.workspaceId,
+    });
   const handleMarkAsRead = useCallback(() => {
     void clearAttention().catch((error) => {
       toast.error(error instanceof Error ? error.message : "Failed to mark workspace as read");
     });
   }, [clearAttention, toast]);
+  const handleMarkAsUnread = useCallback(() => {
+    void markUnread().catch((error) => {
+      toast.error(error instanceof Error ? error.message : "Failed to mark workspace as unread");
+    });
+  }, [markUnread, toast]);
 
   useKeyboardActionHandler({
     handlerId: `workspace-archive-${workspace.workspaceKey}`,
@@ -166,6 +173,7 @@ export function SidebarWorkspaceRow({
         onCopyPath={handleCopyPath}
         onRename={handleOpenRename}
         onMarkAsRead={hasClearableAttention ? handleMarkAsRead : undefined}
+        onMarkAsUnread={canMarkUnread ? handleMarkAsUnread : undefined}
         archiveShortcutKeys={selected ? archiveShortcutKeys : null}
       />
       <WorkspaceRenameModal
@@ -198,6 +206,7 @@ interface WorkspaceRowBodyProps {
   onCopyPath?: () => void;
   onRename?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   archiveShortcutKeys?: ShortcutKey[][] | null;
 }
 
@@ -221,6 +230,7 @@ function WorkspaceRowBody({
   onCopyPath,
   onRename,
   onMarkAsRead,
+  onMarkAsUnread,
   archiveShortcutKeys,
 }: WorkspaceRowBodyProps) {
   const isCompact = useIsCompactFormFactor();
@@ -293,6 +303,7 @@ function WorkspaceRowBody({
               onCopyBranchName={onCopyBranchName}
               onRename={onRename}
               onMarkAsRead={onMarkAsRead}
+              onMarkAsUnread={onMarkAsUnread}
               onArchive={onArchive}
               archiveLabel={archiveLabel}
               archiveStatus={archiveStatus}
@@ -340,6 +351,7 @@ function WorkspaceRowBody({
                   onCopyPath={onCopyPath}
                   onRename={onRename}
                   onMarkAsRead={onMarkAsRead}
+                  onMarkAsUnread={onMarkAsUnread}
                 />
               </SidebarWorkspaceRowContent>
             </SidebarWorkspaceContextMenu>
@@ -365,6 +377,7 @@ function WorkspaceRowTrailingActions({
   archiveShortcutKeys,
   onArchive,
   onMarkAsRead,
+  onMarkAsUnread,
   onCopyBranchName,
   onCopyPath,
   onRename,
@@ -383,6 +396,7 @@ function WorkspaceRowTrailingActions({
   archiveShortcutKeys?: ShortcutKey[][] | null;
   onArchive?: () => void;
   onMarkAsRead?: () => void;
+  onMarkAsUnread?: () => void;
   onCopyBranchName?: () => void;
   onCopyPath?: () => void;
   onRename?: () => void;
@@ -390,7 +404,7 @@ function WorkspaceRowTrailingActions({
   const { t } = useTranslation();
   const showShortcut = showShortcutBadge && shortcutNumber !== null;
   const {
-    showTrailing,
+    trailingPresentation,
     showKebab: showKebabInSlot,
     showScrim,
     renderSlot,
@@ -412,7 +426,7 @@ function WorkspaceRowTrailingActions({
       ) : null}
       {renderSlot ? (
         <SidebarWorkspaceTrailingActionSlot reserveWidth={reserveSlotWidth}>
-          <SidebarWorkspaceTrailingActionBase visible={showTrailing}>
+          <SidebarWorkspaceTrailingActionBase presentation={trailingPresentation}>
             <SidebarWorkspaceTrailingContent workspace={workspace} trailing={trailing} />
           </SidebarWorkspaceTrailingActionBase>
           <SidebarWorkspaceTrailingActionOverlay
@@ -430,6 +444,7 @@ function WorkspaceRowTrailingActions({
                 onCopyBranchName={onCopyBranchName}
                 onRename={onRename}
                 onMarkAsRead={onMarkAsRead}
+                onMarkAsUnread={onMarkAsUnread}
                 onArchive={onArchive}
                 archiveLabel={archiveLabel}
                 archiveStatus={archiveStatus}
@@ -471,7 +486,7 @@ const styles = StyleSheet.create((theme) => ({
     position: "relative",
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[1],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-title.test.ts b/packages/app/src/components/sidebar/sidebar-workspace-title.test.ts
index 2068dbe271..465caf1344 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-title.test.ts
+++ b/packages/app/src/components/sidebar/sidebar-workspace-title.test.ts
@@ -1,3 +1,4 @@
+import { i18n } from "@/i18n/i18next";
 import { describe, expect, it } from "vitest";
 import {
   resolveSidebarWorkspaceAccessibilityLabel,
@@ -39,6 +40,7 @@ describe("resolveSidebarWorkspaceAccessibilityLabel", () => {
       workspace: { name: "Investigate search", currentBranch: "fix/search", statusBucket: "done" },
       workspaceTitleSource: "title",
       hostBadgeLabel: "Build host",
+      t: i18n.t,
     });
 
     expect(label).toBe("Investigate search, Build host");
@@ -56,6 +58,7 @@ describe("resolveSidebarWorkspaceAccessibilityLabel", () => {
       hostBadgeLabel: "Build host",
       pullRequestLabel: "Pull request 42",
       serviceLabel: "Service web running",
+      t: i18n.t,
     });
 
     expect(label).toBe(
@@ -69,6 +72,7 @@ describe("resolveSidebarWorkspaceAccessibilityLabel", () => {
       workspaceTitleSource: "title",
       leadingProjectName: "Search project",
       hostBadgeLabel: "Build host",
+      t: i18n.t,
     });
 
     expect(label).toBe("Search project, Investigate search, Build host");
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-title.ts b/packages/app/src/components/sidebar/sidebar-workspace-title.ts
index 955c9d2636..da3782f082 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-title.ts
+++ b/packages/app/src/components/sidebar/sidebar-workspace-title.ts
@@ -1,6 +1,7 @@
+import type { TFunction } from "i18next";
 import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
 import type { WorkspaceTitleSource } from "@/hooks/use-settings";
-import { STATUS_BUCKET_LABELS } from "@/hooks/sidebar-status-view-model";
+import { getStatusBucketLabel } from "@/hooks/sidebar-status-view-model";
 
 export function resolveSidebarWorkspacePrimaryLabel(input: {
   workspace: Pick<SidebarWorkspaceEntry, "name" | "currentBranch">;
@@ -19,6 +20,7 @@ export function resolveSidebarWorkspaceAccessibilityLabel(input: {
   hostBadgeLabel?: string | null;
   pullRequestLabel?: string | null;
   serviceLabel?: string | null;
+  t: TFunction;
 }): string {
   return [
     input.leadingProjectName,
@@ -28,7 +30,7 @@ export function resolveSidebarWorkspaceAccessibilityLabel(input: {
     input.serviceLabel,
     input.workspace.statusBucket === "done"
       ? null
-      : STATUS_BUCKET_LABELS[input.workspace.statusBucket],
+      : getStatusBucketLabel(input.workspace.statusBucket, input.t),
   ]
     .filter((label): label is string => Boolean(label))
     .join(", ");
diff --git a/packages/app/src/components/sidebar/workspace-trailing/index.tsx b/packages/app/src/components/sidebar/workspace-trailing/index.tsx
index ed573b2bfb..1f7b91dd51 100644
--- a/packages/app/src/components/sidebar/workspace-trailing/index.tsx
+++ b/packages/app/src/components/sidebar/workspace-trailing/index.tsx
@@ -4,7 +4,7 @@ import { DiffStat } from "@/components/diff-stat";
 import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
 import { useAppSettings } from "@/hooks/use-settings";
 import type { SidebarWorkspaceTrailing } from "@/hooks/use-settings";
-import { useCompactTimeAgo } from "@/hooks/use-compact-time-ago";
+import { useCompactTimeAgo } from "@/hooks/use-time-ago";
 
 export type { SidebarWorkspaceTrailing };
 
diff --git a/packages/app/src/components/split-container.tsx b/packages/app/src/components/split-container.tsx
index 5f467785d7..9705f3be15 100644
--- a/packages/app/src/components/split-container.tsx
+++ b/packages/app/src/components/split-container.tsx
@@ -397,18 +397,6 @@ export function SplitContainer({
     },
     [workspaceKey],
   );
-  const handleCreateExplorerTab = useCallback(
-    () => onCreateNewTab({ paneId: explorerSidebarPaneId ?? undefined }),
-    [explorerSidebarPaneId, onCreateNewTab],
-  );
-  const handleMoveExplorerTabToMain = useCallback(
-    (tabId: string) => {
-      if (layout.focusedPaneId) {
-        onMoveTabToPane(tabId, layout.focusedPaneId);
-      }
-    },
-    [layout.focusedPaneId, onMoveTabToPane],
-  );
   const splitRoot = useMemo(
     () =>
       resolveSplitContainerRoot({
@@ -725,8 +713,19 @@ export function SplitContainer({
                   closingTabIds={closingTabIds}
                   onSelectTab={onSelectTabInPane}
                   onCloseTab={onCloseTab}
-                  onCreateNewTab={handleCreateExplorerTab}
-                  onMoveTabToMain={handleMoveExplorerTabToMain}
+                  onCreateNewTab={onCreateNewTab}
+                  hoveredCloseTabKey={hoveredCloseTabKey}
+                  setHoveredCloseTabKey={setHoveredCloseTabKey}
+                  onCopyResumeCommand={onCopyResumeCommand}
+                  onCopyAgentId={onCopyAgentId}
+                  onCopyTerminalId={onCopyTerminalId}
+                  onCopyFilePath={onCopyFilePath}
+                  onReloadAgent={onReloadAgent}
+                  onRenameTab={onRenameTab}
+                  onCloseTabsToLeft={onCloseTabsToLeft}
+                  onCloseTabsToRight={onCloseTabsToRight}
+                  onCloseOtherTabs={onCloseOtherTabs}
+                  onExitFocusMode={onExitFocusMode}
                   buildPaneContentModel={buildPaneContentModel}
                   onReorderTabsInPane={onReorderTabsInPane}
                   activeDragTabId={activeDragTabId}
diff --git a/packages/app/src/components/terminal-emulator-contract.ts b/packages/app/src/components/terminal-emulator-contract.ts
index 5f2d3eb3a0..3575e21500 100644
--- a/packages/app/src/components/terminal-emulator-contract.ts
+++ b/packages/app/src/components/terminal-emulator-contract.ts
@@ -1,3 +1,7 @@
+import type {
+  TerminalFindHandle,
+  TerminalFindResult,
+} from "../terminal/runtime/terminal-emulator-runtime";
 import type { Ref } from "react";
 import type { ITheme } from "@xterm/xterm";
 import type { TerminalState } from "@getpaseo/protocol/messages";
@@ -12,6 +16,7 @@ import type { PendingTerminalModifiers } from "../utils/terminal-keys";
 import type { TerminalRendererReadyChange } from "../utils/terminal-renderer-readiness";
 
 export interface TerminalEmulatorHandle {
+  find?: TerminalFindHandle;
   writeOutput: (data: TerminalOutputData) => void;
   restoreOutput: (data: TerminalOutputData) => void;
   renderSnapshot: (state: TerminalState | null) => void;
@@ -39,6 +44,8 @@ export interface TerminalEmulatorProps {
   onSwipeLeft?: () => void;
   onSwipeRight?: () => void;
   initialSnapshot?: TerminalState | null;
+  onFindRequest?: () => void;
+  onFindResult?: (result: TerminalFindResult) => void;
   onInput?: (data: string) => Promise<void> | void;
   onFocus?: () => Promise<void> | void;
   onResize?: (input: {
diff --git a/packages/app/src/components/terminal-emulator-webview.native.tsx b/packages/app/src/components/terminal-emulator-webview.native.tsx
index 77a5fbb94b..dbaa0175d4 100644
--- a/packages/app/src/components/terminal-emulator-webview.native.tsx
+++ b/packages/app/src/components/terminal-emulator-webview.native.tsx
@@ -19,7 +19,10 @@ import { WebView, type WebViewMessageEvent } from "react-native-webview";
 import type { ITheme } from "@xterm/xterm";
 import type { TerminalState } from "@getpaseo/protocol/messages";
 import type { TerminalInputModeState } from "@getpaseo/protocol/terminal-input-mode";
-import type { TerminalOutputData } from "../terminal/runtime/terminal-emulator-runtime";
+import type {
+  TerminalOutputData,
+  TerminalFindResult,
+} from "../terminal/runtime/terminal-emulator-runtime";
 import type {
   TerminalLocalFileLinkSource,
   TerminalLocalFileLinkTarget,
@@ -49,6 +52,9 @@ type BridgeInboundMessage =
   | { type: "renderSnapshot"; streamKey: string; state: TerminalState | null }
   | { type: "paste"; streamKey: string; text: string }
   | { type: "clear"; streamKey: string }
+  | { type: "find"; streamKey: string; query: string; direction?: "next" | "previous" }
+  | { type: "clearFind"; streamKey: string }
+  | { type: "findWidgetSize"; streamKey: string; size: { width: number; height: number } }
   | { type: "focus"; streamKey: string; forceRefocus?: boolean }
   | { type: "resize"; streamKey: string; forceClaim: boolean; shouldClaim?: boolean }
   | { type: "setTheme"; streamKey: string; theme: ITheme }
@@ -67,6 +73,8 @@ type BridgeOutboundMessage =
   | { type: "bridgeReady" }
   | { type: "rendererReady"; streamKey: string; isReady: boolean }
   | { type: "input"; streamKey: string; data: string }
+  | { type: "findRequest"; streamKey: string }
+  | { type: "findResult"; streamKey: string; result: TerminalFindResult }
   | {
       type: "resize";
       streamKey: string;
@@ -162,6 +170,8 @@ export default function WebViewTerminalEmulator({
   onSwipeLeft,
   onSwipeRight,
   initialSnapshot = null,
+  onFindRequest,
+  onFindResult,
   onInput,
   onFocus,
   onResize,
@@ -209,6 +219,8 @@ export default function WebViewTerminalEmulator({
     swipeGesturesEnabled,
   };
   const callbacksRef = useRef({
+    onFindRequest,
+    onFindResult,
     onInput,
     onFocus,
     onResize,
@@ -222,6 +234,8 @@ export default function WebViewTerminalEmulator({
     onSwipeRight,
   });
   callbacksRef.current = {
+    onFindRequest,
+    onFindResult,
     onInput,
     onFocus,
     onResize,
@@ -315,6 +329,11 @@ export default function WebViewTerminalEmulator({
   useImperativeHandle(
     ref,
     (): TerminalEmulatorHandle => ({
+      find: {
+        setWidgetSize: (size) => sendToWebView({ type: "findWidgetSize", streamKey, size }),
+        search: (query, direction) => sendToWebView({ type: "find", streamKey, query, direction }),
+        clear: () => sendToWebView({ type: "clearFind", streamKey }),
+      },
       writeOutput: (data: TerminalOutputData) => {
         const output = outputDecoderRef.current.decode(data, { stream: true });
         if (output.length === 0) {
@@ -563,6 +582,14 @@ export default function WebViewTerminalEmulator({
       ) {
         return;
       }
+      if (message.type === "findRequest") {
+        callbacksRef.current.onFindRequest?.();
+        return;
+      }
+      if (message.type === "findResult") {
+        callbacksRef.current.onFindResult?.(message.result);
+        return;
+      }
       handleTerminalMessage(message);
     },
     [handleLifecycleMessage, handleTerminalMessage, streamKey],
diff --git a/packages/app/src/components/terminal-emulator.tsx b/packages/app/src/components/terminal-emulator.tsx
index 438d72d85c..be12355bea 100644
--- a/packages/app/src/components/terminal-emulator.tsx
+++ b/packages/app/src/components/terminal-emulator.tsx
@@ -1,5 +1,10 @@
 "use dom";
 
+import type {
+  TerminalFindHandle,
+  TerminalFindResult,
+} from "../terminal/runtime/terminal-emulator-runtime";
+
 import {
   useCallback,
   useEffect,
@@ -41,6 +46,7 @@ import {
 import { getDesktopHost } from "@/desktop/host";
 
 export interface TerminalEmulatorHandle {
+  find?: TerminalFindHandle;
   writeOutput: (data: TerminalOutputData) => void;
   restoreOutput: (data: TerminalOutputData) => void;
   renderSnapshot: (state: TerminalState | null) => void;
@@ -111,6 +117,8 @@ interface TerminalEmulatorProps {
   onSwipeLeft?: () => void;
   onSwipeRight?: () => void;
   initialSnapshot?: TerminalState | null;
+  onFindRequest?: () => void;
+  onFindResult?: (result: TerminalFindResult) => void;
   onInput?: (data: string) => Promise<void> | void;
   onFocus?: () => Promise<void> | void;
   onResize?: (input: {
@@ -172,6 +180,8 @@ export default function TerminalEmulator({
   onSwipeLeft,
   onSwipeRight,
   initialSnapshot = null,
+  onFindRequest,
+  onFindResult,
   onInput,
   onFocus,
   onResize,
@@ -201,6 +211,8 @@ export default function TerminalEmulator({
   const onRendererReadyChangeRef = useRef(onRendererReadyChange);
   onRendererReadyChangeRef.current = onRendererReadyChange;
   const mountCallbacksRef = useRef({
+    onFindRequest,
+    onFindResult,
     onInput,
     onResize,
     onTerminalKey,
@@ -210,6 +222,8 @@ export default function TerminalEmulator({
     onOpenLocalFileLink,
   });
   mountCallbacksRef.current = {
+    onFindRequest,
+    onFindResult,
     onInput,
     onResize,
     onTerminalKey,
@@ -283,6 +297,11 @@ export default function TerminalEmulator({
   useImperativeHandle(
     ref,
     (): TerminalEmulatorHandle => ({
+      find: {
+        setWidgetSize: (size) => runtimeRef.current?.find.setWidgetSize(size),
+        search: (query, direction) => runtimeRef.current?.find.search(query, direction),
+        clear: () => runtimeRef.current?.find.clear(),
+      },
       writeOutput: (data: TerminalOutputData) => {
         runtimeRef.current?.write({ data });
       },
@@ -478,6 +497,8 @@ export default function TerminalEmulator({
   useEffect(() => {
     runtimeRef.current?.setCallbacks({
       callbacks: {
+        onFindRequest,
+        onFindResult,
         onInput,
         onResize,
         onTerminalKey,
@@ -489,6 +510,8 @@ export default function TerminalEmulator({
       },
     });
   }, [
+    onFindRequest,
+    onFindResult,
     onInput,
     onInputModeChange,
     onOpenLocalFileLink,
diff --git a/packages/app/src/components/terminal-pane.tsx b/packages/app/src/components/terminal-pane.tsx
index 3e98799035..31c36b607c 100644
--- a/packages/app/src/components/terminal-pane.tsx
+++ b/packages/app/src/components/terminal-pane.tsx
@@ -1,8 +1,16 @@
+import { TerminalFind, type TerminalPaneFindHandle } from "@/terminal/find";
+import type { TerminalFindResult } from "@/terminal/runtime/terminal-emulator-runtime";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import * as Clipboard from "expo-clipboard";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import {
+  Pressable,
+  Text,
+  View,
+  type LayoutChangeEvent,
+  type PressableStateCallbackType,
+} from "react-native";
 import Animated, { runOnJS, useAnimatedReaction } from "react-native-reanimated";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Keyboard as KeyboardIcon, KeyboardOff as KeyboardOffIcon } from "lucide-react-native";
@@ -14,7 +22,7 @@ import {
 } from "@getpaseo/protocol/terminal-input-mode";
 import { useTranslation } from "react-i18next";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
+import { useKeyboardShiftStyle } from "@/keyboard/shift";
 import { useAppActivelyVisible } from "@/hooks/use-app-visible";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import {
@@ -29,9 +37,10 @@ import {
 } from "@/terminal/runtime/terminal-key-dispatch";
 import {
   getTerminalVirtualKeyboardControlId,
+  resolveTerminalVirtualKeyboardRows,
+  shouldShowTerminalVirtualKeyBar,
   shouldShowTerminalFloatingCopyAction,
   shouldShowTerminalPasteAction,
-  TERMINAL_VIRTUAL_KEYBOARD_ROWS,
   type TerminalVirtualKeyboardControl,
 } from "@/terminal/runtime/terminal-virtual-keyboard";
 import { pasteTerminalClipboard } from "@/terminal/runtime/terminal-paste";
@@ -91,6 +100,7 @@ interface TerminalPaneProps {
 
 const TERMINAL_REFIT_DELAYS_MS = [0, 48, 144, 320];
 const TERMINAL_RESIZE_DEBOUNCE_MS = 100;
+const TERMINAL_KEY_BAR_MAX_WIDTH = 880;
 
 const MODIFIER_LABELS = {
   ctrl: "Ctrl",
@@ -136,8 +146,16 @@ function ModifierButton({ modifier, active, onToggle }: ModifierButtonProps) {
     () => [styles.keyButtonText, active && styles.keyButtonTextActive],
     [active],
   );
+  const accessibilityState = useMemo(() => ({ selected: active }), [active]);
   return (
-    <Pressable testID={`terminal-key-${modifier}`} onPress={handlePress} style={pressableStyle}>
+    <Pressable
+      accessibilityLabel={MODIFIER_LABELS[modifier]}
+      accessibilityRole="button"
+      accessibilityState={accessibilityState}
+      testID={`terminal-key-${modifier}`}
+      onPress={handlePress}
+      style={pressableStyle}
+    >
       <Text style={textStyle}>{MODIFIER_LABELS[modifier]}</Text>
     </Pressable>
   );
@@ -160,7 +178,13 @@ function VirtualKeyButton({ id, label, keyValue, onSend }: VirtualKeyButtonProps
     [],
   );
   return (
-    <Pressable testID={`terminal-key-${id}`} onPress={handlePress} style={pressableStyle}>
+    <Pressable
+      accessibilityLabel={label}
+      accessibilityRole="button"
+      testID={`terminal-key-${id}`}
+      onPress={handlePress}
+      style={pressableStyle}
+    >
       <Text style={styles.keyButtonText}>{label}</Text>
     </Pressable>
   );
@@ -220,12 +244,18 @@ export function TerminalPane({
     return trimmed.length > 0 ? trimmed : undefined;
   }, [settings.monoFontFamily]);
   const isMobile = useIsCompactFormFactor();
+  const showVirtualKeyBar = shouldShowTerminalVirtualKeyBar({ isNative, isCompact: isMobile });
+  const [keyBarWidth, setKeyBarWidth] = useState(0);
+  const virtualKeyboardRows = resolveTerminalVirtualKeyboardRows({
+    isCompact: isMobile,
+    availableWidth: keyBarWidth,
+  });
   const mobileView = usePanelStore((state) => state.mobilePanel.target);
   const showMobileAgentList = usePanelStore((state) => state.showMobileAgentList);
   const swipeGesturesEnabled = isMobile;
   const { shift: keyboardShift, style: keyboardPaddingStyle } = useKeyboardShiftStyle({
     mode: "padding",
-    enabled: isMobile,
+    enabled: isNative || isMobile,
   });
   const [keyboardInset, setKeyboardInset] = useState(0);
   const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);
@@ -267,6 +297,12 @@ export function TerminalPane({
   const [resizeRequestToken, setResizeRequestToken] = useState(0);
   useBlockMobilePanelOpenGestures(isMobile && isWorkspaceFocused && isPaneFocused && hasSelection);
   const emulatorRef = useRef<TerminalEmulatorHandle>(null);
+  const findRef = useRef<TerminalPaneFindHandle>(null);
+  const handleFindRequest = useCallback(() => findRef.current?.open(), []);
+  const handleFindResult = useCallback(
+    (result: TerminalFindResult) => findRef.current?.update(result),
+    [],
+  );
   const terminalIdRef = useRef<string>(terminalId);
   const terminalPresentedRef = useRef(isTerminalPresented);
   terminalPresentedRef.current = isTerminalPresented;
@@ -284,7 +320,7 @@ export function TerminalPane({
   }, [terminalId]);
 
   const refreshClipboardAvailability = useCallback(async () => {
-    if (!isMobile) {
+    if (!showVirtualKeyBar) {
       setHasClipboardText(false);
       return;
     }
@@ -294,7 +330,7 @@ export function TerminalPane({
     } catch {
       setHasClipboardText(false);
     }
-  }, [isMobile]);
+  }, [showVirtualKeyBar]);
 
   useEffect(() => {
     void refreshClipboardAvailability();
@@ -326,6 +362,7 @@ export function TerminalPane({
   }, [isMobile, isWorkspaceFocused, mobileView]);
   const handleRendererReadyChange = useCallback(
     (change: TerminalRendererReadyChange) => {
+      if (!change.isReady && change.streamKey === terminalStreamKey) findRef.current?.reset();
       setRendererReadyStreamKey((current) => applyTerminalRendererReadyChange(current, change));
       if (!shouldReplayTerminalSnapshotForRenderer({ change, terminalStreamKey })) {
         return;
@@ -427,7 +464,7 @@ export function TerminalPane({
 
   const handleKeyboardChange = useCallback(
     (nextShift: number) => {
-      setKeyboardInset(isMobile ? nextShift : 0);
+      setKeyboardInset(isNative || isMobile ? nextShift : 0);
       setIsKeyboardVisible(nextShift > 0);
       pulseKeyboardRefits();
     },
@@ -449,31 +486,11 @@ export function TerminalPane({
     [handleKeyboardChange],
   );
 
-  useEffect(() => {
-    if (!client || !isConnected || !isWorkspaceFocused) {
-      return;
-    }
-
-    return client.on("terminal_stream_exit", (message) => {
-      if (message.type !== "terminal_stream_exit") {
-        return;
-      }
-
-      const exitedTerminalId = message.payload.terminalId;
-      if (!exitedTerminalId) {
-        return;
-      }
-
-      workspaceTerminalSession.snapshots.clear({ terminalId: exitedTerminalId });
-      if (terminalIdRef.current === exitedTerminalId) {
-        emulatorRef.current?.clear();
-      }
-      streamControllerRef.current?.handleTerminalExit({
-        terminalId: exitedTerminalId,
-      });
-      setModifiers({ ...EMPTY_MODIFIERS });
-    });
-  }, [client, isConnected, isWorkspaceFocused, workspaceTerminalSession.snapshots]);
+  const handleStreamExit = useStableEvent((exitedTerminalId: string) => {
+    workspaceTerminalSession.snapshots.clear({ terminalId: exitedTerminalId });
+    if (terminalIdRef.current === exitedTerminalId) emulatorRef.current?.clear();
+    setModifiers({ ...EMPTY_MODIFIERS });
+  });
 
   useEffect(() => {
     measuredTerminalSizeRef.current = null;
@@ -561,6 +578,7 @@ export function TerminalPane({
       onOutput: handleStreamOutput,
       onRestore: handleStreamRestore,
       onSnapshot: handleStreamSnapshot,
+      onExit: handleStreamExit,
       getRestoreOptions: getStreamRestoreOptions,
       onStatusChange: handleStreamControllerStatus,
     });
@@ -581,6 +599,7 @@ export function TerminalPane({
     handleStreamOutput,
     handleStreamRestore,
     handleStreamSnapshot,
+    handleStreamExit,
     isConnected,
   ]);
 
@@ -964,6 +983,11 @@ export function TerminalPane({
     [keyboardPaddingStyle],
   );
 
+  const handleKeyBarLayout = useCallback((event: LayoutChangeEvent) => {
+    const width = event.nativeEvent.layout.width;
+    if (width > 0) setKeyBarWidth(width);
+  }, []);
+
   const handleSwipeRight = useCallback(() => {
     if (!swipeGesturesEnabled) return;
     emulatorRef.current?.blur();
@@ -1060,6 +1084,8 @@ export function TerminalPane({
             onRendererReadyChange={handleRendererReadyChange}
             onSwipeRight={handleSwipeRight}
             onSwipeLeft={handleSwipeLeft}
+            onFindRequest={handleFindRequest}
+            onFindResult={handleFindResult}
             onInput={handleTerminalData}
             onFocus={handleTerminalFocus}
             onResize={handleTerminalResize}
@@ -1075,6 +1101,16 @@ export function TerminalPane({
           />
         </View>
 
+        <TerminalFind
+          key={terminalStreamKey}
+          ref={findRef}
+          terminal={emulatorRef}
+          active={
+            isTerminalPresented && isPaneFocused && rendererReadyStreamKey === terminalStreamKey
+          }
+          focusTerminal={requestTerminalFocus}
+        />
+
         {showLoadingOverlay ? (
           <View style={styles.attachOverlay} pointerEvents="none" testID="terminal-attach-loading">
             <LoadingSpinner size="small" color={theme.colors.foregroundMuted} />
@@ -1096,10 +1132,14 @@ export function TerminalPane({
         </View>
       ) : null}
 
-      {isMobile ? (
+      {showVirtualKeyBar ? (
         <View style={styles.keyboardContainer} testID="terminal-virtual-keyboard">
-          <View style={styles.keyboardRows}>
-            {TERMINAL_VIRTUAL_KEYBOARD_ROWS.map((row) => (
+          <View
+            style={styles.keyboardRows}
+            onLayout={handleKeyBarLayout}
+            testID={isNative && !isMobile ? "terminal-virtual-keyboard-native-wide" : undefined}
+          >
+            {virtualKeyboardRows.map((row) => (
               <View
                 key={row.map(getTerminalVirtualKeyboardControlId).join(":")}
                 style={styles.keyboardRow}
@@ -1162,6 +1202,9 @@ const styles = StyleSheet.create((theme) => ({
   },
   keyboardRows: {
     gap: theme.spacing[1],
+    width: "100%",
+    maxWidth: TERMINAL_KEY_BAR_MAX_WIDTH,
+    alignSelf: "center",
   },
   keyboardRow: {
     flexDirection: "row",
diff --git a/packages/app/src/components/terminal-profile-icon.tsx b/packages/app/src/components/terminal-profile-icon.tsx
index db3a216e7b..66cc00f69b 100644
--- a/packages/app/src/components/terminal-profile-icon.tsx
+++ b/packages/app/src/components/terminal-profile-icon.tsx
@@ -1,7 +1,7 @@
 import type { ReactElement } from "react";
 import { SquareTerminal } from "lucide-react-native";
 import { withUnistyles } from "react-native-unistyles";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import type { Theme } from "@/styles/theme";
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
@@ -17,7 +17,7 @@ function ProviderProfileIcon({
   size: number;
   color?: string;
 }) {
-  const Icon = getProviderIcon(iconKey);
+  const Icon = useProviderIcon(iconKey);
   return <Icon size={size} color={color} />;
 }
 
diff --git a/packages/app/src/components/toast-host.tsx b/packages/app/src/components/toast-host.tsx
index 9466bc6ba6..6b9009dd6a 100644
--- a/packages/app/src/components/toast-host.tsx
+++ b/packages/app/src/components/toast-host.tsx
@@ -1,8 +1,17 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import { createPortal } from "react-dom";
-import { Animated, Easing, Platform, Text, ToastAndroid, View } from "react-native";
+import {
+  Platform,
+  Pressable,
+  StyleSheet as NativeStyleSheet,
+  Text,
+  ToastAndroid,
+  View,
+} from "react-native";
+import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
 import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isWeb } from "@/constants/platform";
@@ -44,13 +53,22 @@ type ToastViewportPlacement = "app-shell" | "panel";
 
 const DEFAULT_DURATION_MS = 2200;
 const TOAST_MAX_WIDTH = 480;
+const toastEntering = FadeIn.duration(140);
+const toastExiting = FadeOut.duration(140);
+const ThemedCheckCircle = withUnistyles(CheckCircle2);
+const ThemedInfo = withUnistyles(Info);
+const ThemedWarning = withUnistyles(AlertTriangle);
+const foregroundIcon = (theme: Theme) => ({ color: theme.colors.foreground });
+const infoIcon = (theme: Theme) => ({ color: theme.colors.palette.blue[300] });
+const successIcon = (theme: Theme) => ({ color: theme.colors.primary });
+const warningIcon = (theme: Theme) => ({ color: theme.colors.palette.amber[500] });
+const errorIcon = (theme: Theme) => ({ color: theme.colors.destructive });
 
 export function useToastHost(): {
   api: ToastApi;
   toast: ToastState | null;
   dismiss: () => void;
 } {
-  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const [toast, setToast] = useState<ToastState | null>(null);
   const idRef = useRef(0);
@@ -90,11 +108,11 @@ export function useToastHost(): {
       copied: (label?: string) =>
         show(label ? t("common.states.copiedLabel", { label }) : t("common.states.copied"), {
           variant: "success",
-          icon: <CheckCircle2 size={18} color={theme.colors.foreground} />,
+          icon: <ThemedCheckCircle size={18} uniProps={foregroundIcon} />,
         }),
       error: (message: string) => show(message, { variant: "error", durationMs: 3200 }),
     }),
-    [show, theme.colors.foreground, t],
+    [show, t],
   );
 
   const dismiss = useCallback(() => {
@@ -113,11 +131,8 @@ export function ToastViewport({
   onDismiss: () => void;
   placement?: ToastViewportPlacement;
 }) {
-  const { theme } = useUnistyles();
   const insets = useSafeAreaInsets();
   const isMobile = useIsCompactFormFactor();
-  const opacity = useRef(new Animated.Value(0)).current;
-  const translateY = useRef(new Animated.Value(-8)).current;
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const dismissDeadlineRef = useRef<number | null>(null);
   const remainingDurationRef = useRef(0);
@@ -129,28 +144,6 @@ export function ToastViewport({
     }
   }, []);
 
-  const animateOut = useCallback(() => {
-    clearTimer();
-    Animated.parallel([
-      Animated.timing(opacity, {
-        toValue: 0,
-        duration: 140,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-      Animated.timing(translateY, {
-        toValue: -8,
-        duration: 140,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-    ]).start(({ finished }) => {
-      if (finished) {
-        onDismiss();
-      }
-    });
-  }, [clearTimer, onDismiss, opacity, translateY]);
-
   const scheduleDismiss = useCallback(
     (durationMs: number | null) => {
       clearTimer();
@@ -163,10 +156,10 @@ export function ToastViewport({
       remainingDurationRef.current = nextDurationMs;
       dismissDeadlineRef.current = Date.now() + nextDurationMs;
       timeoutRef.current = setTimeout(() => {
-        animateOut();
+        onDismiss();
       }, nextDurationMs);
     },
-    [animateOut, clearTimer],
+    [onDismiss, clearTimer],
   );
 
   const pauseDismiss = useCallback(() => {
@@ -184,107 +177,35 @@ export function ToastViewport({
     scheduleDismiss(remainingDurationRef.current || toast.durationMs);
   }, [scheduleDismiss, toast]);
 
+  const toastId = toast?.id;
+  const durationMs = toast?.durationMs ?? null;
   useEffect(() => {
-    if (!toast) {
-      clearTimer();
-      dismissDeadlineRef.current = null;
-      remainingDurationRef.current = 0;
-      opacity.setValue(0);
-      translateY.setValue(-8);
-      return;
-    }
-
-    clearTimer();
-    opacity.setValue(0);
-    translateY.setValue(-8);
-
-    Animated.parallel([
-      Animated.timing(opacity, {
-        toValue: 1,
-        duration: 140,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-      Animated.timing(translateY, {
-        toValue: 0,
-        duration: 140,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-    ]).start();
-
-    scheduleDismiss(toast.durationMs);
-
-    return () => {
-      clearTimer();
-    };
-  }, [clearTimer, opacity, scheduleDismiss, toast, translateY]);
+    scheduleDismiss(durationMs);
+    return clearTimer;
+  }, [clearTimer, durationMs, scheduleDismiss, toastId]);
 
   const headerHeight = isMobile ? HEADER_INNER_HEIGHT_MOBILE : HEADER_INNER_HEIGHT;
   const headerTopPadding = isMobile ? HEADER_TOP_PADDING_MOBILE : 0;
-  const topOffset =
-    placement === "app-shell"
-      ? insets.top + headerTopPadding + headerHeight + theme.spacing[2]
-      : theme.spacing[3];
-
-  const toastVariant = toast?.variant;
-  const toastAnimatedStyle = useMemo(
-    () => [
-      styles.toast,
-      toastVariant === "info" ? styles.toastInfo : null,
-      toastVariant === "success" ? styles.toastSuccess : null,
-      toastVariant === "warning" ? styles.toastWarning : null,
-      toastVariant === "error" ? styles.toastError : null,
-      {
-        marginTop: topOffset,
-        opacity,
-        transform: [{ translateY }],
-      },
-    ],
-    [toastVariant, topOffset, opacity, translateY],
-  );
-  const toastMessageStyle = useMemo(
-    () => [styles.message, toastVariant === "error" ? styles.messageError : null],
-    [toastVariant],
-  );
-
-  if (!toast) {
-    return null;
-  }
-
-  let defaultIcon: ReactNode = null;
-  if (toast.variant === "info") {
-    defaultIcon = <Info size={18} color={theme.colors.palette.blue[300]} />;
-  } else if (toast.variant === "success") {
-    defaultIcon = <CheckCircle2 size={18} color={theme.colors.primary} />;
-  } else if (toast.variant === "warning") {
-    defaultIcon = <AlertTriangle size={18} color={theme.colors.palette.amber[500]} />;
-  } else if (toast.variant === "error") {
-    defaultIcon = <AlertTriangle size={18} color={theme.colors.destructive} />;
-  }
-  const icon = toast.icon ?? defaultIcon;
+  const topOffset = placement === "app-shell" ? insets.top + headerTopPadding + headerHeight : 0;
 
   const content = (
-    <View style={styles.container} pointerEvents="box-none">
-      <View style={styles.widthBoundary} pointerEvents="box-none">
-        <Animated.View
-          testID={toast.testID ?? "app-toast"}
-          onPointerEnter={isWeb ? pauseDismiss : undefined}
-          onPointerLeave={isWeb ? resumeDismiss : undefined}
-          style={toastAnimatedStyle}
-          accessibilityRole="alert"
-        >
-          {icon ? <View style={styles.iconSlot}>{icon}</View> : null}
-          {typeof toast.content === "string" ? (
-            <Text testID="app-toast-message" style={toastMessageStyle}>
-              {toast.content}
-            </Text>
-          ) : (
-            <View testID="app-toast-message" style={styles.contentSlot}>
-              {toast.content}
-            </View>
-          )}
-        </Animated.View>
+    <View
+      style={styles.container(placement, topOffset)}
+      pointerEvents="box-none"
+      collapsable={false}
+    >
+      <View style={styles.widthBoundary} pointerEvents="box-none" collapsable={false}>
+        {toast ? (
+          <Animated.View
+            entering={toastEntering}
+            exiting={toastExiting}
+            style={animatedStyles.surface}
+            testID={toast.testID ?? "app-toast"}
+            accessibilityRole="alert"
+          >
+            <ToastCard toast={toast} onHoverIn={pauseDismiss} onHoverOut={resumeDismiss} />
+          </Animated.View>
+        ) : null}
       </View>
     </View>
   );
@@ -296,15 +217,66 @@ export function ToastViewport({
   return content;
 }
 
+function ToastCard({
+  toast,
+  onHoverIn,
+  onHoverOut,
+}: {
+  toast: ToastState;
+  onHoverIn: () => void;
+  onHoverOut: () => void;
+}) {
+  let defaultIcon: ReactNode = null;
+  if (toast.variant === "info") {
+    defaultIcon = <ThemedInfo size={18} uniProps={infoIcon} />;
+  } else if (toast.variant === "success") {
+    defaultIcon = <ThemedCheckCircle size={18} uniProps={successIcon} />;
+  } else if (toast.variant === "warning") {
+    defaultIcon = <ThemedWarning size={18} uniProps={warningIcon} />;
+  } else if (toast.variant === "error") {
+    defaultIcon = <ThemedWarning size={18} uniProps={errorIcon} />;
+  }
+  const icon = toast.icon ?? defaultIcon;
+
+  return (
+    <Pressable
+      accessible={false}
+      onHoverIn={onHoverIn}
+      onHoverOut={onHoverOut}
+      style={[
+        styles.toast,
+        toast.variant === "info" ? styles.toastInfo : null,
+        toast.variant === "warning" ? styles.toastWarning : null,
+        toast.variant === "error" ? styles.toastError : null,
+      ]}
+    >
+      {icon ? <View style={styles.iconSlot}>{icon}</View> : null}
+      {typeof toast.content === "string" ? (
+        <Text testID="app-toast-message" style={styles.message}>
+          {toast.content}
+        </Text>
+      ) : (
+        <View testID="app-toast-message" style={styles.contentSlot}>
+          {toast.content}
+        </View>
+      )}
+    </Pressable>
+  );
+}
+
+const animatedStyles = NativeStyleSheet.create({
+  surface: { alignSelf: "center", maxWidth: "100%" },
+});
+
 const styles = StyleSheet.create((theme) => ({
-  container: {
+  container: (placement: ToastViewportPlacement, topOffset: number) => ({
     position: "absolute",
     left: theme.spacing[4],
     right: theme.spacing[4],
-    top: 0,
+    top: topOffset + (placement === "app-shell" ? theme.spacing[2] : theme.spacing[3]),
     zIndex: OVERLAY_Z.toast,
     alignItems: "center",
-  },
+  }),
   widthBoundary: {
     width: "92%",
     maxWidth: TOAST_MAX_WIDTH,
@@ -324,9 +296,6 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[3],
     ...theme.shadow.md,
   },
-  toastSuccess: {
-    borderColor: theme.colors.border,
-  },
   toastInfo: {
     borderColor: theme.colors.palette.blue[300],
   },
@@ -350,7 +319,4 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
   },
-  messageError: {
-    color: theme.colors.foreground,
-  },
 }));
diff --git a/packages/app/src/components/tool-call-sheet.tsx b/packages/app/src/components/tool-call-sheet.tsx
index 022a9bc7c2..33009ee376 100644
--- a/packages/app/src/components/tool-call-sheet.tsx
+++ b/packages/app/src/components/tool-call-sheet.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 import { View, Text, Pressable } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
-import { BottomSheetScrollView, BottomSheetBackdrop } from "@gorhom/bottom-sheet";
+import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import { X } from "lucide-react-native";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import {
@@ -115,13 +115,6 @@ export function ToolCallSheetProvider({ children }: ToolCallSheetProviderProps)
     setSheetData(null);
   }, [handleSheetDismiss]);
 
-  const renderBackdrop = useCallback(
-    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop {...props} disappearsOnIndex={-1} appearsOnIndex={0} opacity={0.5} />
-    ),
-    [],
-  );
-
   const contextValue = useMemo(
     () => ({ openToolCall, closeToolCall }),
     [openToolCall, closeToolCall],
@@ -138,7 +131,7 @@ export function ToolCallSheetProvider({ children }: ToolCallSheetProviderProps)
         enableDynamicSizing={false}
         onChange={handleSheetChange}
         onDismiss={handleToolCallSheetDismiss}
-        backdropComponent={renderBackdrop}
+        backdropOpacity={0.5}
         enablePanDownToClose
       >
         {sheetData && <ToolCallSheetContent data={sheetData} onClose={closeToolCall} />}
diff --git a/packages/app/src/components/ui/alert.tsx b/packages/app/src/components/ui/alert.tsx
index 674f0cb062..fe9fa3ce4b 100644
--- a/packages/app/src/components/ui/alert.tsx
+++ b/packages/app/src/components/ui/alert.tsx
@@ -2,14 +2,21 @@ import { AlertTriangle, CheckCircle2, Info, XCircle, type LucideIcon } from "luc
 import { type ReactNode, useMemo } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import {
+  type ButtonControlSize,
+  buttonIconSize,
+  createControlGeometry,
+} from "@/components/ui/control-geometry";
+import { hexColorWithAlpha } from "@/utils/color";
 
 export type AlertVariant = "default" | "info" | "success" | "warning" | "error";
+export type AlertSize = ButtonControlSize;
 
 export interface AlertProps {
   title?: string;
   description?: ReactNode;
   variant?: AlertVariant;
-  icon?: ReactNode;
+  size?: AlertSize;
   children?: ReactNode;
   testID?: string;
 }
@@ -25,50 +32,93 @@ export function Alert({
   title,
   description,
   variant = "default",
-  icon,
+  size = "md",
   children,
   testID,
 }: AlertProps) {
   const { theme } = useUnistyles();
   const accentColor = resolveAccentColor(variant, theme);
-  const borderColor = variant === "success" ? theme.colors.border : accentColor;
+  const borderColor =
+    variant === "success" || !accentColor
+      ? theme.colors.border
+      : hexColorWithAlpha(accentColor, 0.5);
 
-  const containerStyle = useMemo(
-    () => [styles.container, borderColor ? { borderColor } : null],
-    [borderColor],
-  );
-
-  const titleStyle = useMemo(
-    () => [styles.title, accentColor ? { color: accentColor } : null],
-    [accentColor],
-  );
+  const sized = resolveSizeStyles(size);
+  const containerStyle = [styles.container, sized.container, { borderColor }];
+  const titleStyle = [styles.title, sized.text, accentColor ? { color: accentColor } : null];
+  const iconSize = buttonIconSize[size];
 
   const resolvedIcon = useMemo(() => {
-    if (icon !== undefined) return icon;
     if (variant === "default") return null;
     const Icon = VARIANT_ICON[variant];
-    return <Icon size={theme.iconSize.sm} color={accentColor ?? theme.colors.foreground} />;
-  }, [icon, variant, theme, accentColor]);
+    return <Icon size={iconSize} color={accentColor ?? theme.colors.foreground} />;
+  }, [variant, theme, accentColor, iconSize]);
 
-  const hasDescription = description != null && description !== "";
+  let descriptionContent: ReactNode = null;
+  if (typeof description === "string" && description !== "") {
+    descriptionContent = <Text style={[styles.description, sized.text]}>{description}</Text>;
+  } else if (description != null && description !== "") {
+    descriptionContent = <View style={styles.descriptionSlot}>{description}</View>;
+  }
+  const leadContent = title ? <Text style={titleStyle}>{title}</Text> : descriptionContent;
+  const belowLead = title ? descriptionContent : null;
+  const hasBody = belowLead !== null || Boolean(children);
 
   return (
     <View style={containerStyle} testID={testID} accessibilityRole="alert">
-      {resolvedIcon ? <View style={styles.iconSlot}>{resolvedIcon}</View> : null}
-      <View style={styles.body}>
-        {title ? <Text style={titleStyle}>{title}</Text> : null}
-        {hasDescription && typeof description === "string" ? (
-          <Text style={styles.description}>{description}</Text>
+      <View style={[styles.lead, sized.lead]}>
+        {resolvedIcon ? (
+          <View style={[styles.iconSlot, sized.iconSlot]}>{resolvedIcon}</View>
         ) : null}
-        {hasDescription && typeof description !== "string" ? (
-          <View style={styles.descriptionSlot}>{description}</View>
-        ) : null}
-        {children ? <View style={styles.actions}>{children}</View> : null}
+        {leadContent ? <View style={styles.leadText}>{leadContent}</View> : null}
       </View>
+      {hasBody ? (
+        <View style={resolvedIcon ? sized.indent : null}>
+          {belowLead}
+          {children ? <View style={styles.actions}>{children}</View> : null}
+        </View>
+      ) : null}
     </View>
   );
 }
 
+function resolveSizeStyles(size: AlertSize) {
+  if (size === "xs") {
+    return {
+      container: styles.containerXs,
+      text: styles.textXs,
+      lead: styles.leadXs,
+      iconSlot: styles.iconSlotXs,
+      indent: styles.indentXs,
+    };
+  }
+  if (size === "sm") {
+    return {
+      container: styles.containerSm,
+      text: styles.textSm,
+      lead: styles.leadSm,
+      iconSlot: styles.iconSlotSm,
+      indent: styles.indentSm,
+    };
+  }
+  if (size === "lg") {
+    return {
+      container: styles.containerLg,
+      text: styles.textLg,
+      lead: styles.leadLg,
+      iconSlot: styles.iconSlotLg,
+      indent: styles.indentLg,
+    };
+  }
+  return {
+    container: styles.containerMd,
+    text: styles.textMd,
+    lead: styles.leadMd,
+    iconSlot: styles.iconSlotMd,
+    indent: styles.indentMd,
+  };
+}
+
 function resolveAccentColor(
   variant: AlertVariant,
   theme: ReturnType<typeof useUnistyles>["theme"],
@@ -80,43 +130,63 @@ function resolveAccentColor(
   return null;
 }
 
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    flexDirection: "row",
-    alignItems: "flex-start",
-    gap: theme.spacing[3],
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    backgroundColor: "transparent",
-    borderRadius: theme.borderRadius.xl,
-    paddingVertical: theme.spacing[3],
-    paddingHorizontal: theme.spacing[4],
-  },
-  iconSlot: {
-    paddingTop: 2,
-  },
-  body: {
-    flex: 1,
-    minWidth: 0,
-    gap: theme.spacing[1],
-  },
-  title: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
-  },
-  description: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  descriptionSlot: {
-    flexShrink: 1,
-    minWidth: 0,
-    gap: theme.spacing[2],
-  },
-  actions: {
-    flexDirection: "row",
-    gap: theme.spacing[2],
-    marginTop: theme.spacing[2],
-  },
-}));
+const styles = StyleSheet.create((theme) => {
+  const { alert } = createControlGeometry(theme);
+
+  return {
+    container: {
+      borderWidth: theme.borderWidth[1],
+      borderColor: theme.colors.border,
+      backgroundColor: "transparent",
+    },
+    containerXs: alert.xs.container,
+    containerSm: alert.sm.container,
+    containerMd: alert.md.container,
+    containerLg: alert.lg.container,
+    lead: {
+      flexDirection: "row",
+      alignItems: "center",
+    },
+    iconSlot: {
+      alignItems: "center",
+    },
+    leadText: {
+      flex: 1,
+      minWidth: 0,
+    },
+    leadXs: alert.xs.lead,
+    leadSm: alert.sm.lead,
+    leadMd: alert.md.lead,
+    leadLg: alert.lg.lead,
+    iconSlotXs: alert.xs.iconSlot,
+    iconSlotSm: alert.sm.iconSlot,
+    iconSlotMd: alert.md.iconSlot,
+    iconSlotLg: alert.lg.iconSlot,
+    indentXs: alert.xs.indent,
+    indentSm: alert.sm.indent,
+    indentMd: alert.md.indent,
+    indentLg: alert.lg.indent,
+    textXs: alert.xs.text,
+    textSm: alert.sm.text,
+    textMd: alert.md.text,
+    textLg: alert.lg.text,
+    title: {
+      color: theme.colors.foreground,
+      fontWeight: theme.fontWeight.medium,
+    },
+    description: {
+      color: theme.colors.foregroundMuted,
+      fontWeight: theme.fontWeight.normal,
+    },
+    descriptionSlot: {
+      flexShrink: 1,
+      minWidth: 0,
+      gap: theme.spacing[2],
+    },
+    actions: {
+      flexDirection: "row",
+      gap: theme.spacing[2],
+      marginTop: theme.spacing[2],
+    },
+  };
+});
diff --git a/packages/app/src/components/ui/menu/menu-anchor.test.ts b/packages/app/src/components/ui/anchor.test.ts
similarity index 68%
rename from packages/app/src/components/ui/menu/menu-anchor.test.ts
rename to packages/app/src/components/ui/anchor.test.ts
index ecdf438fe7..cb18a86271 100644
--- a/packages/app/src/components/ui/menu/menu-anchor.test.ts
+++ b/packages/app/src/components/ui/anchor.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { computePosition, getTransformOrigin, type Rect } from "./menu-anchor";
+import { computePosition, getTransformOrigin, type Rect } from "./anchor";
 
 const DISPLAY: Rect = { x: 0, y: 0, width: 1000, height: 800 };
 const TRIGGER: Rect = { x: 100, y: 100, width: 40, height: 20 };
@@ -55,6 +55,18 @@ describe("computePosition", () => {
     expect(right).toEqual({ x: 144, y: 100, actualPlacement: "right" });
   });
 
+  it("lets hover cards flip horizontally when the opposite side has room", () => {
+    const result = position({
+      triggerRect: { ...TRIGGER, x: 850 },
+      placement: "right",
+      flipHorizontal: true,
+    });
+    expect(result).toEqual({ x: 646, y: 100, actualPlacement: "left" });
+    expect(
+      position({ triggerRect: { ...TRIGGER, x: 850 }, placement: "right" }).actualPlacement,
+    ).toBe("right");
+  });
+
   it("keeps the surface inside a display area that does not start at the origin", () => {
     // Regression: the horizontal clamp used to ignore displayArea.x while the vertical one
     // honoured displayArea.y, so an offset display area pushed the surface off its left edge.
@@ -68,10 +80,20 @@ describe("computePosition", () => {
 
 describe("getTransformOrigin", () => {
   it.each([
-    ["bottom", "start", "left top"],
-    ["top", "end", "right bottom"],
-    ["right", "center", "center center"],
-  ] as const)("maps %s/%s to %s", (placement, alignment, expected) => {
-    expect(getTransformOrigin(placement, alignment)).toBe(expected);
+    ["bottom", "start", [0, 0, 0]],
+    ["bottom", "center", ["50%", 0, 0]],
+    ["bottom", "end", ["100%", 0, 0]],
+    ["top", "start", [0, "100%", 0]],
+    ["top", "center", ["50%", "100%", 0]],
+    ["top", "end", ["100%", "100%", 0]],
+    ["left", "start", [0, "50%", 0]],
+    ["left", "center", ["50%", "50%", 0]],
+    ["left", "end", ["100%", "50%", 0]],
+    ["right", "start", [0, "50%", 0]],
+    ["right", "center", ["50%", "50%", 0]],
+    ["right", "end", ["100%", "50%", 0]],
+  ] as const)("emits a native-ready origin for %s/%s", (placement, alignment, expected) => {
+    // Theme updates may reach Fabric without React Native's JS string preprocessing.
+    expect(getTransformOrigin(placement, alignment)).toEqual(expected);
   });
 });
diff --git a/packages/app/src/components/ui/menu/menu-anchor.ts b/packages/app/src/components/ui/anchor.ts
similarity index 70%
rename from packages/app/src/components/ui/menu/menu-anchor.ts
rename to packages/app/src/components/ui/anchor.ts
index c7548dde68..51454a9ee5 100644
--- a/packages/app/src/components/ui/menu/menu-anchor.ts
+++ b/packages/app/src/components/ui/anchor.ts
@@ -1,10 +1,8 @@
 import type { View } from "react-native";
 
 /**
- * Where a floating menu surface goes relative to the thing that opened it.
- *
- * This was two byte-identical copies, one in `dropdown-menu.tsx` and one in `context-menu.tsx`.
- * Submenus need a third caller, so it lives here now and the menus import it.
+ * Where a floating surface goes relative to the thing that opened it. Menus and hover cards
+ * place themselves with it.
  */
 
 export type Placement = "top" | "bottom" | "left" | "right";
@@ -38,14 +36,15 @@ export function measureElement(element: View): Promise<Rect> {
  * there is more room above. Both conditions matter: flipping into a side that is equally
  * cramped just moves the clipping, so a surface taller than the whole viewport stays put.
  *
- * Only the vertical placements flip. A left/right submenu that doesn't fit is handled by the
- * caller choosing its side up front, because flipping it mid-open would move the surface out
- * from under the pointer that is travelling toward it.
+ * Horizontal flipping is opt-in for hover cards. Submenus choose their direction up front so
+ * they do not move out from under the pointer travelling toward them.
  */
 function flipPlacement(input: {
   placement: Placement;
   triggerRect: Rect;
   contentHeight: number;
+  contentWidth: number;
+  flipHorizontal: boolean;
   displayArea: Rect;
 }): Placement {
   const { placement, triggerRect, contentHeight, displayArea } = input;
@@ -58,6 +57,14 @@ function flipPlacement(input: {
   if (placement === "top" && spaceTop < contentHeight && spaceBottom > spaceTop) {
     return "bottom";
   }
+  if (input.flipHorizontal) {
+    const spaceLeft = triggerRect.x - displayArea.x;
+    const spaceRight = displayArea.x + displayArea.width - (triggerRect.x + triggerRect.width);
+    if (placement === "right" && spaceRight < input.contentWidth && spaceLeft > spaceRight)
+      return "left";
+    if (placement === "left" && spaceLeft < input.contentWidth && spaceRight > spaceLeft)
+      return "right";
+  }
   return placement;
 }
 
@@ -120,6 +127,7 @@ export function computePosition({
   placement,
   alignment,
   offset,
+  flipHorizontal = false,
 }: {
   triggerRect: Rect;
   contentSize: Size;
@@ -127,11 +135,15 @@ export function computePosition({
   placement: Placement;
   alignment: Alignment;
   offset: number;
+  /** Hover cards can choose either side; submenu direction is owned by the menu. */
+  flipHorizontal?: boolean;
 }): { x: number; y: number; actualPlacement: Placement } {
   const actualPlacement = flipPlacement({
     placement,
     triggerRect,
     contentHeight: contentSize.height,
+    contentWidth: contentSize.width,
+    flipHorizontal,
     displayArea,
   });
   const anchored = anchorToPlacement({
@@ -144,18 +156,21 @@ export function computePosition({
   return { ...clampToDisplayArea({ ...anchored, contentSize, displayArea }), actualPlacement };
 }
 
-export function getTransformOrigin(placement: Placement, alignment: Alignment): string {
-  let vertical: string;
-  if (placement === "bottom") vertical = "top";
-  else if (placement === "top") vertical = "bottom";
-  else vertical = "center";
+export function getTransformOrigin(
+  placement: Placement,
+  alignment: Alignment,
+): [number | string, number | string, number] {
+  let vertical: number | string;
+  if (placement === "bottom") vertical = 0;
+  else if (placement === "top") vertical = "100%";
+  else vertical = "50%";
 
-  let horizontal: string;
-  if (alignment === "start") horizontal = "left";
-  else if (alignment === "end") horizontal = "right";
-  else horizontal = "center";
+  let horizontal: number | string;
+  if (alignment === "start") horizontal = 0;
+  else if (alignment === "end") horizontal = "100%";
+  else horizontal = "50%";
 
-  // React Native parses transform-origin positionally (x then y), unlike CSS
-  // which accepts keyword pairs in either order.
-  return `${horizontal} ${vertical}`;
+  // Native theme updates can bypass RN's JS string preprocessing. Supply the native
+  // array shape directly; Reanimated's web style builder also accepts this form.
+  return [horizontal, vertical, 0];
 }
diff --git a/packages/app/src/components/ui/autocomplete-popover.tsx b/packages/app/src/components/ui/autocomplete-popover.tsx
index df9bc52fd1..9b1dcaf23d 100644
--- a/packages/app/src/components/ui/autocomplete-popover.tsx
+++ b/packages/app/src/components/ui/autocomplete-popover.tsx
@@ -1,7 +1,20 @@
-import { useEffect, useMemo, useState, type ReactElement, type RefObject } from "react";
-import { Keyboard, View, useWindowDimensions } from "react-native";
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactElement,
+  type RefObject,
+} from "react";
+import { View, useWindowDimensions } from "react-native";
 import { Portal } from "@gorhom/portal";
-import Animated, { useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+import Animated, {
+  useAnimatedReaction,
+  useAnimatedStyle,
+  useSharedValue,
+} from "react-native-reanimated";
+import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet } from "react-native-unistyles";
 import { Autocomplete, type AutocompleteOption } from "@/components/ui/autocomplete";
@@ -9,7 +22,7 @@ import {
   measureFloatingPanelPortalHost,
   useFloatingPanelPortalHostName,
 } from "@/components/ui/floating-panel-portal";
-import { useKeyboardShift } from "@/hooks/keyboard-shift-context";
+import { useKeyboardShift } from "@/keyboard/shift";
 import { SPACING } from "@/styles/theme";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 
@@ -66,57 +79,57 @@ export function AutocompletePopover({
   const windowDimensions = useWindowDimensions();
   const safeAreaInsets = useSafeAreaInsets();
   const portalHostName = useFloatingPanelPortalHostName();
-  const { shift } = useKeyboardShift();
+  const { shift, isMoving } = useKeyboardShift();
   const measuredShift = useSharedValue(0);
+  const measurementGeneration = useRef(0);
+  const canMeasure = visible && (options.length === 0 || selectedIndex >= 0);
+
+  const remeasure = useCallback(() => {
+    if (!canMeasure) return;
+    const anchorElement = anchorRef.current;
+    if (!anchorElement) return;
+    const generation = measurementGeneration.current;
+    void Promise.all([
+      measureElement(anchorElement),
+      measureFloatingPanelPortalHost(portalHostName),
+    ]).then(([anchorRect, hostRect]) => {
+      if (generation !== measurementGeneration.current || !hostRect) return undefined;
+      setRelativeAnchorRect({
+        x: anchorRect.x - hostRect.x,
+        y: anchorRect.y - hostRect.y,
+        width: anchorRect.width,
+        hostHeight: hostRect.height,
+      });
+      measuredShift.value = shift.value;
+      return undefined;
+    });
+  }, [anchorRef, canMeasure, measuredShift, portalHostName, shift]);
 
   useEffect(() => {
-    if (!visible || (options.length > 0 && selectedIndex < 0)) {
+    measurementGeneration.current += 1;
+    if (!canMeasure) {
       setRelativeAnchorRect(null);
       return;
     }
 
-    let cancelled = false;
-    const remeasure = () => {
-      const anchorElement = anchorRef.current;
-      if (!anchorElement) return;
-      void Promise.all([
-        measureElement(anchorElement),
-        measureFloatingPanelPortalHost(portalHostName),
-      ]).then(([anchorRect, hostRect]) => {
-        if (cancelled || !hostRect) return undefined;
-        setRelativeAnchorRect({
-          x: anchorRect.x - hostRect.x,
-          y: anchorRect.y - hostRect.y,
-          width: anchorRect.width,
-          hostHeight: hostRect.height,
-        });
-        measuredShift.value = shift.value;
-        return undefined;
-      });
-    };
-
     remeasure();
     const raf = requestAnimationFrame(remeasure);
-    const subscriptions = (["keyboardDidShow", "keyboardDidHide"] as const).map((event) =>
-      Keyboard.addListener(event, () => requestAnimationFrame(remeasure)),
-    );
 
     return () => {
-      cancelled = true;
+      measurementGeneration.current += 1;
       cancelAnimationFrame(raf);
-      for (const sub of subscriptions) sub.remove();
     };
-  }, [
-    visible,
-    options.length,
-    selectedIndex,
-    anchorRef,
-    portalHostName,
-    measuredShift,
-    shift,
-    windowDimensions.width,
-    windowDimensions.height,
-  ]);
+  }, [canMeasure, remeasure, windowDimensions.width, windowDimensions.height]);
+
+  useAnimatedReaction(
+    () => isMoving.value,
+    (moving, wasMoving) => {
+      if (wasMoving && !moving) {
+        scheduleOnRN(remeasure);
+      }
+    },
+    [isMoving, remeasure],
+  );
 
   const baseStyle = useMemo(() => {
     if (!relativeAnchorRect) return null;
diff --git a/packages/app/src/components/ui/text-input/bottom-sheet-scope.tsx b/packages/app/src/components/ui/bottom-sheet-scope.tsx
similarity index 79%
rename from packages/app/src/components/ui/text-input/bottom-sheet-scope.tsx
rename to packages/app/src/components/ui/bottom-sheet-scope.tsx
index 1d25bf7598..cbdaedac5f 100644
--- a/packages/app/src/components/ui/text-input/bottom-sheet-scope.tsx
+++ b/packages/app/src/components/ui/bottom-sheet-scope.tsx
@@ -2,7 +2,7 @@ import React, { createContext, useContext, type ReactNode } from "react";
 
 const BottomSheetScopeContext = createContext(false);
 
-export function BottomSheetTextInputScope({ children }: { children: ReactNode }) {
+export function BottomSheetScope({ children }: { children: ReactNode }) {
   return <BottomSheetScopeContext.Provider value>{children}</BottomSheetScopeContext.Provider>;
 }
 
diff --git a/packages/app/src/components/ui/button.tsx b/packages/app/src/components/ui/button.tsx
index e160970223..707ce60648 100644
--- a/packages/app/src/components/ui/button.tsx
+++ b/packages/app/src/components/ui/button.tsx
@@ -174,6 +174,7 @@ export function Button({
   ...props
 }: PropsWithChildren<
   Omit<PressableProps, "style"> & {
+    ref?: React.Ref<View>;
     variant?: ButtonVariant;
     size?: ButtonSize;
     leftIcon?: LeftIcon;
diff --git a/packages/app/src/components/ui/combobox-options.test.ts b/packages/app/src/components/ui/combobox-options.test.ts
index 6129af9463..e3e98633b3 100644
--- a/packages/app/src/components/ui/combobox-options.test.ts
+++ b/packages/app/src/components/ui/combobox-options.test.ts
@@ -160,3 +160,16 @@ describe("combobox above-search ordering", () => {
     expect(getComboboxFallbackIndex(ordered.length, "below-search")).toBe(0);
   });
 });
+
+describe("search-only option text", () => {
+  it("finds hidden search text while keeping title matches first", () => {
+    const bodyMatch = { id: "pr:7", label: "Fix parsing", searchText: "Release notes for 2024" };
+    const titleMatch = { id: "pr:8", label: "2024 release" };
+    expect(filterAndRankComboboxOptions([bodyMatch, titleMatch], "2024")).toEqual([
+      titleMatch,
+      bodyMatch,
+    ]);
+    expect(filterAndRankComboboxOptions([bodyMatch], "unrelated")).toEqual([]);
+    expect(filterAndRankComboboxOptions([bodyMatch], "parsing 2024")).toEqual([bodyMatch]);
+  });
+});
diff --git a/packages/app/src/components/ui/combobox-options.ts b/packages/app/src/components/ui/combobox-options.ts
index e23f2315ef..006eb1a21e 100644
--- a/packages/app/src/components/ui/combobox-options.ts
+++ b/packages/app/src/components/ui/combobox-options.ts
@@ -10,18 +10,22 @@ export interface ComboboxOptionModel {
   id: string;
   label: string;
   description?: string;
+  /** Additional text to match without displaying it in the option row. */
+  searchText?: string;
   kind?: ComboboxOptionKind;
 }
 
-const DESCRIPTION_FALLBACK_TIER = 99;
+const SECONDARY_TEXT_FALLBACK_TIER = 99;
 
 function scoreOption(opt: ComboboxOptionModel, search: string): MatchScore | null {
   const best = scoreTextFields(search, [opt.label, opt.id]);
   if (best) return best;
-  if (!opt.description) return null;
-  const descriptionScore = scoreTextFields(search, [opt.description]);
-  if (!descriptionScore) return null;
-  return { ...descriptionScore, tier: descriptionScore.tier + DESCRIPTION_FALLBACK_TIER };
+  const secondaryFields = opt.searchText
+    ? [opt.label, opt.id, opt.description ?? "", opt.searchText]
+    : [opt.description ?? ""];
+  const secondaryScore = scoreTextFields(search, secondaryFields);
+  if (!secondaryScore) return null;
+  return { ...secondaryScore, tier: secondaryScore.tier + SECONDARY_TEXT_FALLBACK_TIER };
 }
 
 export interface BuildVisibleComboboxOptionsInput {
diff --git a/packages/app/src/components/ui/combobox.tsx b/packages/app/src/components/ui/combobox.tsx
index 7ee9407dca..caf73d1bbc 100644
--- a/packages/app/src/components/ui/combobox.tsx
+++ b/packages/app/src/components/ui/combobox.tsx
@@ -28,12 +28,9 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import {
-  BottomSheetScrollView,
-  BottomSheetBackdrop,
-  BottomSheetBackgroundProps,
-} from "@gorhom/bottom-sheet";
+import { BottomSheetScrollView, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { Check, File, Folder, Search } from "lucide-react-native";
 import {
   flip,
@@ -53,6 +50,7 @@ import type { ComboboxOptionModel } from "./combobox-options";
 import { isWeb } from "@/constants/platform";
 import {
   IsolatedBottomSheetModal,
+  SheetVisibleFrame,
   useIsolatedBottomSheetVisibility,
 } from "./isolated-bottom-sheet-modal";
 import {
@@ -947,25 +945,23 @@ interface MobileBodyProps {
 }
 
 function MobileComboboxBody(props: MobileBodyProps): ReactElement {
-  const renderBackdrop = useCallback(
-    (backdropProps: React.ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop
-        {...backdropProps}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-        opacity={0.45}
-      />
-    ),
-    [],
-  );
-
   const comboboxTitleStyle = useMemo(
     () => [styles.comboboxTitle, { color: props.titleColor }],
     [props.titleColor],
   );
+  const { footer, safeAreaBottom } = props;
   const frameStyle = useMemo(
-    () => [styles.mobileSheetFrame, { paddingBottom: props.safeAreaBottom }],
-    [props.safeAreaBottom],
+    () => [styles.mobileSheetFrame, { paddingBottom: footer ? 0 : safeAreaBottom }],
+    [footer, safeAreaBottom],
+  );
+  const footerStyle = useMemo(
+    () => [styles.footer, { paddingBottom: safeAreaBottom }],
+    [safeAreaBottom],
+  );
+
+  const footerView = useMemo(
+    () => (footer ? <View style={footerStyle}>{footer}</View> : undefined),
+    [footer, footerStyle],
   );
 
   const body = props.hasChildren ? (
@@ -990,7 +986,7 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
       enableDynamicSizing={false}
       onChange={props.handleSheetChange}
       onDismiss={props.handleSheetDismiss}
-      backdropComponent={renderBackdrop}
+      backdropOpacity={0.45}
       enablePanDownToClose
       backgroundComponent={ComboboxSheetBackground}
       handleIndicatorStyle={props.handleIndicatorStyle}
@@ -998,46 +994,47 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
       keyboardBlurBehavior="none"
       presentation={props.presentation}
     >
-      <View style={frameStyle}>
-        {props.header ? (
-          <SheetHeaderView header={props.header} onClose={props.onClose} />
-        ) : (
-          <>
-            <View style={styles.bottomSheetHeader}>
-              <Text key={props.titleColor} style={comboboxTitleStyle}>
-                {props.title}
-              </Text>
-            </View>
-            {props.stickyHeader}
-            {!props.hasChildren && props.searchable ? (
-              <SearchInput
-                placeholder={props.searchPlaceholder}
-                onChangeText={props.setSearchQueryWithCallback}
-                onSubmitEditing={props.handleSubmitSearch}
-                autoFocus={false}
-                useBottomSheetInput
-                resetKey={props.searchResetKey}
-              />
-            ) : null}
-          </>
-        )}
-        {props.hasChildren && !props.mobileChildrenScrollEnabled ? (
-          body
-        ) : (
-          <BottomSheetScrollView
-            style={styles.mobileSheetBody}
-            contentContainerStyle={[
-              styles.comboboxScrollContent,
-              props.mobileChildrenContentContainerStyle,
-            ]}
-            keyboardShouldPersistTaps="handled"
-            showsVerticalScrollIndicator={false}
-          >
-            {body}
-          </BottomSheetScrollView>
-        )}
-        {props.footer ? <View style={styles.footer}>{props.footer}</View> : null}
-      </View>
+      <SheetVisibleFrame footer={footerView}>
+        <View style={frameStyle}>
+          {props.header ? (
+            <SheetHeaderView header={props.header} onClose={props.onClose} />
+          ) : (
+            <>
+              <View style={styles.bottomSheetHeader}>
+                <Text key={props.titleColor} style={comboboxTitleStyle}>
+                  {props.title}
+                </Text>
+              </View>
+              {props.stickyHeader}
+              {!props.hasChildren && props.searchable ? (
+                <SearchInput
+                  placeholder={props.searchPlaceholder}
+                  onChangeText={props.setSearchQueryWithCallback}
+                  onSubmitEditing={props.handleSubmitSearch}
+                  autoFocus={false}
+                  useBottomSheetInput
+                  resetKey={props.searchResetKey}
+                />
+              ) : null}
+            </>
+          )}
+          {props.hasChildren && !props.mobileChildrenScrollEnabled ? (
+            body
+          ) : (
+            <BottomSheetScrollView
+              style={styles.mobileSheetBody}
+              contentContainerStyle={[
+                styles.comboboxScrollContent,
+                props.mobileChildrenContentContainerStyle,
+              ]}
+              keyboardShouldPersistTaps="handled"
+              showsVerticalScrollIndicator={false}
+            >
+              {body}
+            </BottomSheetScrollView>
+          )}
+        </View>
+      </SheetVisibleFrame>
     </IsolatedBottomSheetModal>
   );
 }
@@ -1266,7 +1263,8 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
       visible={props.isOpen}
       onRequestClose={props.handleClose}
     >
-      {overlay}
+      {/* Android Modal opens a separate window outside the app's gesture root. */}
+      <GestureHandlerRootView style={styles.desktopOverlay}>{overlay}</GestureHandlerRootView>
     </Modal>
   );
 }
diff --git a/packages/app/src/components/ui/control-geometry.test.ts b/packages/app/src/components/ui/control-geometry.test.ts
index 5f4a653e51..0b0675596f 100644
--- a/packages/app/src/components/ui/control-geometry.test.ts
+++ b/packages/app/src/components/ui/control-geometry.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   buttonControlHeight,
+  buttonIconSize,
   createControlGeometry,
   getControlInteractionPhase,
 } from "@/components/ui/control-geometry";
@@ -11,6 +12,7 @@ const theme = {
     md: 6,
     lg: 8,
     xl: 12,
+    "2xl": 16,
     full: 9999,
   },
   borderWidth: {
@@ -30,10 +32,13 @@ const theme = {
   },
   spacing: {
     0: 0,
+    0.5: 2,
+    1: 4,
     2: 8,
     3: 12,
     4: 16,
     6: 24,
+    8: 32,
   },
 } as unknown as Theme;
 
@@ -157,4 +162,41 @@ describe("control geometry", () => {
       geometry.buttonMd.paddingHorizontal,
     );
   });
+
+  it("gives alert title and description one font size and a tight gap per size", () => {
+    const { alert } = createControlGeometry(theme);
+
+    expect(alert.xs.text).toEqual({ fontSize: 12 });
+    expect(alert.sm.text).toEqual({ fontSize: 14 });
+    expect(alert.md.text).toEqual(alert.sm.text);
+    expect(alert.lg.text).toEqual(alert.sm.text);
+    for (const size of ["xs", "sm", "md", "lg"] as const) {
+      expect(alert[size].container.gap).toBeLessThanOrEqual(4);
+    }
+  });
+
+  it("starts alert text below the lead row at the lead text's left edge", () => {
+    const { alert } = createControlGeometry(theme);
+
+    for (const size of ["xs", "sm", "md", "lg"] as const) {
+      expect(alert[size].iconSlot.width).toBe(buttonIconSize[size]);
+      expect(alert[size].indent.marginLeft).toBe(alert[size].iconSlot.width + alert[size].lead.gap);
+    }
+  });
+
+  it("keeps sm alerts as roomy and round as the original alert, and scales the rest around it", () => {
+    const { alert } = createControlGeometry(theme);
+
+    expect(alert.sm.container).toMatchObject({
+      paddingVertical: 12,
+      paddingHorizontal: 16,
+      borderRadius: 16,
+    });
+    expect(alert.xs.container.paddingVertical).toBeLessThan(alert.sm.container.paddingVertical);
+    expect(alert.md.container.paddingVertical).toBeGreaterThan(alert.sm.container.paddingVertical);
+    expect(alert.lg.container.paddingVertical).toBeGreaterThan(alert.md.container.paddingVertical);
+    for (const size of ["xs", "sm", "md", "lg"] as const) {
+      expect(alert[size].container.borderRadius).toBeGreaterThanOrEqual(12);
+    }
+  });
 });
diff --git a/packages/app/src/components/ui/control-geometry.ts b/packages/app/src/components/ui/control-geometry.ts
index 0828e37c66..d56200887e 100644
--- a/packages/app/src/components/ui/control-geometry.ts
+++ b/packages/app/src/components/ui/control-geometry.ts
@@ -87,6 +87,77 @@ function fieldVerticalPadding(
   return (controlHeight - lineHeight - borderWidth * 2) / 2;
 }
 
+/**
+ * Alerts share the button's size names, text size, and icon size (`buttonIconSize`).
+ * The icon and the first text sit in one centered lead row; everything below is indented
+ * by the icon slot plus its gap so it starts at the lead text's left edge. Title and
+ * description use one font size; only the container gap separates them.
+ */
+function createAlertGeometry(theme: Theme) {
+  function alertSize(input: {
+    size: ButtonControlSize;
+    fontSize: number;
+    paddingVertical: number;
+    paddingHorizontal: number;
+    borderRadius: number;
+    iconGap: number;
+    textGap: number;
+  }) {
+    const iconSize = buttonIconSize[input.size];
+    return {
+      container: {
+        paddingVertical: input.paddingVertical,
+        paddingHorizontal: input.paddingHorizontal,
+        borderRadius: input.borderRadius,
+        gap: input.textGap,
+      },
+      lead: { gap: input.iconGap },
+      iconSlot: { width: iconSize },
+      indent: { marginLeft: iconSize + input.iconGap },
+      text: { fontSize: input.fontSize },
+    };
+  }
+
+  return {
+    xs: alertSize({
+      size: "xs",
+      fontSize: theme.fontSize.sm,
+      paddingVertical: theme.spacing[2],
+      paddingHorizontal: theme.spacing[3],
+      borderRadius: theme.borderRadius.xl,
+      iconGap: theme.spacing[2],
+      textGap: 0,
+    }),
+    sm: alertSize({
+      size: "sm",
+      fontSize: theme.fontSize.base,
+      paddingVertical: theme.spacing[3],
+      paddingHorizontal: theme.spacing[4],
+      borderRadius: theme.borderRadius["2xl"],
+      iconGap: theme.spacing[3],
+      textGap: theme.spacing[0.5],
+    }),
+    md: alertSize({
+      size: "md",
+      fontSize: theme.fontSize.base,
+      paddingVertical: theme.spacing[4],
+      paddingHorizontal: theme.spacing[6],
+      borderRadius: theme.borderRadius["2xl"],
+      iconGap: theme.spacing[3],
+      textGap: theme.spacing[0.5],
+    }),
+    lg: alertSize({
+      size: "lg",
+      fontSize: theme.fontSize.base,
+      paddingVertical: theme.spacing[6],
+      paddingHorizontal: theme.spacing[8],
+      borderRadius: theme.borderRadius["2xl"],
+      iconGap: theme.spacing[4],
+      textGap: theme.spacing[1],
+    }),
+  } satisfies Record<ButtonControlSize, unknown>;
+}
+
 export function getControlInteractionPhase(
   state: ControlInteractionState,
 ): ControlInteractionPhase {
@@ -147,6 +218,7 @@ export function createControlGeometry(theme: Theme) {
     fontSize: theme.fontSize.base,
     lineHeight: fieldTextMdLineHeight,
   };
+  const alert = createAlertGeometry(theme);
   const switchControl = {
     minHeight: CONTROL_HEIGHTS.compact,
     justifyContent: CONTROL_CENTER_JUSTIFY_CONTENT,
@@ -156,22 +228,22 @@ export function createControlGeometry(theme: Theme) {
     buttonXs: {
       minHeight: buttonControlHeight.xs,
       paddingHorizontal: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
+      borderRadius: theme.borderRadius.xl,
     },
     buttonSm: {
       minHeight: buttonControlHeight.sm,
       paddingHorizontal: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
+      borderRadius: theme.borderRadius.xl,
     },
     buttonMd: {
       minHeight: buttonControlHeight.md,
       paddingHorizontal: theme.spacing[4],
-      borderRadius: theme.borderRadius.lg,
+      borderRadius: theme.borderRadius["2xl"],
     },
     buttonLg: {
       minHeight: buttonControlHeight.lg,
       paddingHorizontal: theme.spacing[6],
-      borderRadius: theme.borderRadius.xl,
+      borderRadius: theme.borderRadius["2xl"],
     },
     buttonText: {
       fontSize: theme.fontSize.base,
@@ -179,6 +251,7 @@ export function createControlGeometry(theme: Theme) {
     buttonTextXs: {
       fontSize: theme.fontSize.sm,
     },
+    alert,
     formTextInputSm: {
       ...fieldControlSm,
       ...fieldTextSm,
@@ -233,17 +306,17 @@ export function createControlGeometry(theme: Theme) {
     segmentedSegmentXs: {
       minHeight: CONTROL_HEIGHTS.tight - SEGMENTED_TIGHT_INSET * 2,
       paddingHorizontal: theme.spacing[2],
-      borderRadius: theme.borderRadius.md,
+      borderRadius: theme.borderRadius.xl,
     },
     segmentedSegmentSm: {
       minHeight: CONTROL_HEIGHTS.compact - SEGMENTED_COMPACT_INSET * 2,
       paddingHorizontal: theme.spacing[2],
-      borderRadius: theme.borderRadius.md,
+      borderRadius: theme.borderRadius.xl,
     },
     segmentedSegmentMd: {
       minHeight: CONTROL_HEIGHTS.field - SEGMENTED_FIELD_INSET * 2,
       paddingHorizontal: theme.spacing[3],
-      borderRadius: theme.borderRadius.lg,
+      borderRadius: theme.borderRadius["2xl"],
     },
     segmentedLabelXs: {
       fontSize: theme.fontSize.sm,
diff --git a/packages/app/src/components/ui/density-icon.tsx b/packages/app/src/components/ui/density-icon.tsx
new file mode 100644
index 0000000000..ee24ee3588
--- /dev/null
+++ b/packages/app/src/components/ui/density-icon.tsx
@@ -0,0 +1,51 @@
+import { useMemo, type ComponentType } from "react";
+import { withUnistyles } from "react-native-unistyles";
+import { densityIconSize, type DensityIconSize } from "@/styles/density";
+import type { Theme } from "@/styles/theme";
+
+type IconComponent = ComponentType<{ size: number; color: string; strokeWidth?: number }>;
+
+type IconColor = {
+  [K in keyof Theme["colors"]]: Theme["colors"][K] extends string ? K : never;
+}[keyof Theme["colors"]];
+
+function IconGlyph({
+  icon: Icon,
+  size,
+  color,
+  strokeWidth,
+}: {
+  icon: IconComponent;
+  size: number;
+  color: string;
+  strokeWidth?: number;
+}) {
+  return <Icon size={size} color={color} strokeWidth={strokeWidth} />;
+}
+
+const ThemedIconGlyph = withUnistyles(IconGlyph);
+
+/** An icon sized by density: larger on compact layouts. See `@/styles/density`. */
+export function DensityIcon({
+  icon,
+  size,
+  sizeAdjustment = 0,
+  color,
+  strokeWidth,
+}: {
+  icon: IconComponent;
+  size: DensityIconSize;
+  /** Only for a glyph that reads larger than others at the same size. */
+  sizeAdjustment?: number;
+  color: IconColor;
+  strokeWidth?: number;
+}) {
+  const uniProps = useMemo(
+    () => (theme: Theme, rt: { breakpoint?: string }) => ({
+      size: densityIconSize(rt, size) + sizeAdjustment,
+      color: theme.colors[color],
+    }),
+    [size, sizeAdjustment, color],
+  );
+  return <ThemedIconGlyph icon={icon} strokeWidth={strokeWidth} uniProps={uniProps} />;
+}
diff --git a/packages/app/src/components/ui/dropdown-trigger.tsx b/packages/app/src/components/ui/dropdown-trigger.tsx
index 8c88ca84a4..2fc1eb26ac 100644
--- a/packages/app/src/components/ui/dropdown-trigger.tsx
+++ b/packages/app/src/components/ui/dropdown-trigger.tsx
@@ -1,48 +1,104 @@
-import type { ReactElement, ReactNode } from "react";
-import { View } from "react-native";
+import { useCallback, useMemo, type ReactElement, type ReactNode } from "react";
+import { Text, View, type ViewStyle } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ChevronDown } from "lucide-react-native";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
+import {
+  buttonIconSize,
+  createControlGeometry,
+  type ButtonControlSize,
+} from "@/components/ui/control-geometry";
+import type { Theme } from "@/styles/theme";
 import { DropdownMenuTrigger, type DropdownMenuTriggerProps } from "@/components/ui/dropdown-menu";
 
 const ThemedChevronDown = withUnistyles(ChevronDown);
 
-interface DropdownTriggerProps extends Omit<DropdownMenuTriggerProps, "children"> {
-  children?: ReactNode;
-  chevron?: ReactNode | null;
-}
-
 const chevronColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
 
+interface DropdownTriggerProps extends Omit<DropdownMenuTriggerProps, "children" | "style"> {
+  /** The selected option's label. */
+  children: string;
+  /** Icon or swatch before the label. */
+  leading?: ReactNode;
+  size?: ButtonControlSize;
+}
+
+/**
+ * A select-style menu trigger: the selected value plus a chevron, drawn with the
+ * outline Button's chrome and size scale so a dropdown and a button in the same
+ * row share one geometry. Callers pick a size; they don't style it.
+ */
 export function DropdownTrigger({
   children,
-  chevron,
+  leading,
+  size = "sm",
+  disabled,
   ...props
 }: DropdownTriggerProps): ReactElement {
+  let sizeStyle: ViewStyle;
+  if (size === "xs") {
+    sizeStyle = styles.xs;
+  } else if (size === "md") {
+    sizeStyle = styles.md;
+  } else if (size === "lg") {
+    sizeStyle = styles.lg;
+  } else {
+    sizeStyle = styles.sm;
+  }
+  const triggerStyle = useCallback(
+    ({ pressed }: { pressed: boolean }) => [
+      styles.base,
+      sizeStyle,
+      pressed ? styles.pressed : null,
+      disabled ? styles.disabled : null,
+    ],
+    [disabled, sizeStyle],
+  );
+  const labelStyle = useMemo(() => [styles.label, size === "xs" && styles.labelXs], [size]);
+
   return (
-    <DropdownMenuTrigger {...props}>
-      <View style={styles.row}>
+    <DropdownMenuTrigger {...props} disabled={disabled} style={triggerStyle}>
+      {leading}
+      <Text style={labelStyle} numberOfLines={1}>
         {children}
-        {chevron !== null &&
-          (chevron ?? (
-            <View style={styles.chevronContainer}>
-              <ThemedChevronDown size={ICON_SIZE.sm} uniProps={chevronColorMapping} />
-            </View>
-          ))}
+      </Text>
+      <View style={styles.chevron}>
+        <ThemedChevronDown size={buttonIconSize[size]} uniProps={chevronColorMapping} />
       </View>
     </DropdownMenuTrigger>
   );
 }
 
-const styles = StyleSheet.create((theme) => ({
-  row: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
-  chevronContainer: {
-    transform: [{ translateY: 1 }],
-  },
-}));
+const styles = StyleSheet.create((theme) => {
+  const geometry = createControlGeometry(theme);
+  return {
+    base: {
+      flexDirection: "row",
+      alignItems: "center",
+      gap: theme.spacing[2],
+      borderWidth: 1,
+      borderColor: theme.colors.borderAccent,
+      backgroundColor: "transparent",
+    },
+    xs: geometry.buttonXs,
+    sm: geometry.buttonSm,
+    md: geometry.buttonMd,
+    lg: geometry.buttonLg,
+    pressed: {
+      opacity: 0.85,
+    },
+    disabled: {
+      opacity: theme.opacity[50],
+    },
+    label: {
+      flexShrink: 1,
+      color: theme.colors.foreground,
+      ...geometry.buttonText,
+    },
+    labelXs: geometry.buttonTextXs,
+    chevron: {
+      transform: [{ translateY: 1 }],
+    },
+  };
+});
diff --git a/packages/app/src/components/ui/external-link.tsx b/packages/app/src/components/ui/external-link.tsx
index 02e48cc44f..a29018b042 100644
--- a/packages/app/src/components/ui/external-link.tsx
+++ b/packages/app/src/components/ui/external-link.tsx
@@ -1,13 +1,16 @@
 import { useCallback, type ReactNode } from "react";
 import { Pressable, Text } from "react-native";
 import { ArrowUpRight } from "lucide-react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import type { Theme } from "@/styles/theme";
 import { openExternalUrl } from "@/utils/open-external-url";
 
-interface ExternalLinkProps {
+export interface ExternalLinkProps {
   href: string;
-  label: string;
+  label?: string;
+  children?: ReactNode;
+  onError?: (error: unknown) => void;
   tooltip?: ReactNode;
   testID?: string;
   accessibilityLabel?: string;
@@ -16,19 +19,20 @@ interface ExternalLinkProps {
 /**
  * Inline "Docs ↗" affordance — muted text + arrow-top-right icon, opens the
  * URL via the platform's external opener. Wrap in a Tooltip when there's a
- * one-line hint worth surfacing on hover/tap.
+ * one-line hint worth surfacing on hover. A native tap opens the URL.
  */
 export function ExternalLink({
   href,
   label,
+  children,
+  onError,
   tooltip,
   testID,
   accessibilityLabel,
 }: ExternalLinkProps) {
-  const { theme } = useUnistyles();
   const handlePress = useCallback(() => {
-    void openExternalUrl(href);
-  }, [href]);
+    void openExternalUrl(href).catch(onError ?? console.error);
+  }, [href, onError]);
 
   const trigger = (
     <Pressable
@@ -39,8 +43,8 @@ export function ExternalLink({
       testID={testID}
       style={styles.trigger}
     >
-      <Text style={styles.label}>{label}</Text>
-      <ArrowUpRight size={12} color={theme.colors.foregroundMuted} />
+      <Text style={styles.label}>{children ?? label}</Text>
+      <ThemedArrowUpRight size={12} uniProps={iconColor} />
     </Pressable>
   );
 
@@ -49,7 +53,7 @@ export function ExternalLink({
   }
 
   return (
-    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile>
+    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
       <TooltipTrigger asChild>{trigger}</TooltipTrigger>
       <TooltipContent side="top" align="end" offset={6}>
         <Text style={styles.tooltipText}>{tooltip}</Text>
@@ -58,6 +62,9 @@ export function ExternalLink({
   );
 }
 
+const iconColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const ThemedArrowUpRight = withUnistyles(ArrowUpRight);
+
 const styles = StyleSheet.create((theme) => ({
   trigger: {
     flexDirection: "row",
diff --git a/packages/app/src/components/ui/floating-action-button.tsx b/packages/app/src/components/ui/floating-action-button.tsx
new file mode 100644
index 0000000000..2b06e097f2
--- /dev/null
+++ b/packages/app/src/components/ui/floating-action-button.tsx
@@ -0,0 +1,94 @@
+import { forwardRef, useMemo } from "react";
+import { Text, type View } from "react-native";
+import type { LucideIcon } from "lucide-react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { PressHighlight } from "@/components/ui/press-highlight";
+import { ICON_SIZE } from "@/styles/theme";
+
+import {
+  FLOATING_ACTION_BUTTON_SIZE,
+  FLOATING_ACTION_BUTTON_INSET,
+} from "./floating-action-layout";
+export {
+  FLOATING_ACTION_BUTTON_CLEARANCE,
+  floatingActionsClearance,
+} from "./floating-action-layout";
+
+export interface FloatingActionButtonProps {
+  icon: LucideIcon;
+  /** Names the action for assistive technology. */
+  accessibilityLabel: string;
+  onPress: () => void;
+  label?: string;
+  disabled?: boolean;
+  bottomInset?: number;
+  testID?: string;
+}
+
+/**
+ * Pins an action to the bottom-right of its nearest positioned ancestor.
+ * The surface reserves scroll clearance and uses bottomInset to separate stacked actions.
+ */
+export const FloatingActionButton = forwardRef<View, FloatingActionButtonProps>(
+  function FloatingActionButton(
+    { icon: Icon, accessibilityLabel, onPress, label, disabled = false, bottomInset = 0, testID },
+    ref,
+  ) {
+    const accessibilityState = useMemo(() => ({ disabled }), [disabled]);
+    const buttonStyle = useMemo(
+      () => [
+        styles.button,
+        label && styles.labeled,
+        disabled && styles.disabled,
+        { bottom: FLOATING_ACTION_BUTTON_INSET + bottomInset },
+      ],
+      [bottomInset, disabled, label],
+    );
+    return (
+      <PressHighlight
+        ref={ref}
+        accessibilityRole="button"
+        accessibilityLabel={accessibilityLabel}
+        accessibilityState={accessibilityState}
+        disabled={disabled}
+        onPress={onPress}
+        style={buttonStyle}
+        highlightStyle={styles.pressed}
+        testID={testID}
+      >
+        <Icon size={ICON_SIZE.lg} color={styles.glyph.color} />
+        {label ? <Text style={styles.label}>{label}</Text> : null}
+      </PressHighlight>
+    );
+  },
+);
+
+const styles = StyleSheet.create((theme) => ({
+  button: {
+    position: "absolute",
+    right: FLOATING_ACTION_BUTTON_INSET,
+    bottom: FLOATING_ACTION_BUTTON_INSET,
+    width: FLOATING_ACTION_BUTTON_SIZE,
+    height: FLOATING_ACTION_BUTTON_SIZE,
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.surface3,
+    ...theme.shadow.md,
+  },
+  labeled: {
+    width: "auto",
+    minWidth: FLOATING_ACTION_BUTTON_SIZE,
+    paddingHorizontal: theme.spacing[4],
+    flexDirection: "row",
+    gap: theme.spacing[2],
+  },
+  label: { color: theme.colors.foreground, fontSize: theme.fontSize.base },
+  disabled: { opacity: theme.opacity[50] },
+  pressed: {
+    backgroundColor: theme.colors.interactionHighlight,
+  },
+  glyph: {
+    color: theme.colors.foreground,
+  },
+}));
diff --git a/packages/app/src/components/ui/floating-action-layout.test.ts b/packages/app/src/components/ui/floating-action-layout.test.ts
new file mode 100644
index 0000000000..2256f4ef9b
--- /dev/null
+++ b/packages/app/src/components/ui/floating-action-layout.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import {
+  floatingActionsClearance,
+  FLOATING_ACTION_BUTTON_CLEARANCE,
+} from "./floating-action-layout";
+
+describe("floating action scroll clearance", () => {
+  it("keeps the last diff line above Jump to file before and after feedback is added", () => {
+    const jump = FLOATING_ACTION_BUTTON_CLEARANCE;
+    const feedback = FLOATING_ACTION_BUTTON_CLEARANCE + 44;
+    expect(floatingActionsClearance([jump, 0], 34)).toBe(106);
+    expect(floatingActionsClearance([jump, feedback], 34)).toBe(222);
+    expect(floatingActionsClearance([0, feedback], 34)).toBe(150);
+    expect(floatingActionsClearance([jump, feedback], 0)).toBe(188);
+    expect(floatingActionsClearance([0, 0], 34)).toBe(0);
+  });
+});
diff --git a/packages/app/src/components/ui/floating-action-layout.ts b/packages/app/src/components/ui/floating-action-layout.ts
new file mode 100644
index 0000000000..c54fd62dbe
--- /dev/null
+++ b/packages/app/src/components/ui/floating-action-layout.ts
@@ -0,0 +1,15 @@
+import { SPACING } from "@/styles/theme";
+
+export const FLOATING_ACTION_BUTTON_SIZE = 56;
+export const FLOATING_ACTION_BUTTON_INSET = SPACING[4];
+export const FLOATING_ACTION_BUTTON_CLEARANCE =
+  FLOATING_ACTION_BUTTON_SIZE + FLOATING_ACTION_BUTTON_INSET;
+
+/** Reserve the stacked actions and the safe-area inset once for their scrolling surface. */
+export function floatingActionsClearance(
+  actionClearances: readonly number[],
+  bottomInset: number,
+): number {
+  const clearance = actionClearances.reduce((total, action) => total + action, 0);
+  return clearance > 0 ? clearance + bottomInset : 0;
+}
diff --git a/packages/app/src/components/ui/form-field.tsx b/packages/app/src/components/ui/form-field.tsx
index d7c5356f03..f55b10bb10 100644
--- a/packages/app/src/components/ui/form-field.tsx
+++ b/packages/app/src/components/ui/form-field.tsx
@@ -27,12 +27,13 @@ import {
 interface FieldProps {
   label: string;
   children: ReactNode;
+  trailing?: ReactNode;
   hint?: string;
   error?: string | null;
   testID?: string;
 }
 
-export function Field({ label, children, hint, error, testID }: FieldProps) {
+export function Field({ label, children, trailing, hint, error, testID }: FieldProps) {
   const hintTestID = useMemo(() => (testID ? `${testID}-hint` : undefined), [testID]);
   const errorTestID = useMemo(() => (testID ? `${testID}-error` : undefined), [testID]);
   const subtext = useMemo(() => {
@@ -55,7 +56,10 @@ export function Field({ label, children, hint, error, testID }: FieldProps) {
 
   return (
     <View style={styles.container} testID={testID}>
-      <Text style={styles.label}>{label}</Text>
+      <View style={styles.header}>
+        <Text style={styles.label}>{label}</Text>
+        {trailing}
+      </View>
       {children}
       {subtext}
     </View>
@@ -226,7 +230,15 @@ const styles = StyleSheet.create((theme) => ({
   container: {
     gap: theme.spacing[2],
   },
+  header: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: theme.spacing[2],
+  },
   label: {
+    flexShrink: 1,
+    minWidth: 0,
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
diff --git a/packages/app/src/components/ui/highlighted-text-segments.test.ts b/packages/app/src/components/ui/highlighted-text-segments.test.ts
index b38ed4664b..6f42fe823d 100644
--- a/packages/app/src/components/ui/highlighted-text-segments.test.ts
+++ b/packages/app/src/components/ui/highlighted-text-segments.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { toHighlightSegments } from "./highlighted-text-segments";
+import { findHighlightRanges, toHighlightSegments } from "./highlighted-text-segments";
 
 /** What the eye sees, written back out with the marked runs bracketed. */
 function marked(text: string, ranges: { start: number; length: number }[]): string {
@@ -48,3 +48,40 @@ describe("toHighlightSegments", () => {
     expect(toHighlightSegments("main", [])).toEqual([{ start: 0, text: "main", marked: false }]);
   });
 });
+
+describe("findHighlightRanges", () => {
+  it("highlights the same case-insensitive query independently in every field", () => {
+    for (const text of ["Billing fixes", "Fix BILLING", "feat/billing", "billing-project"]) {
+      expect(marked(text, findHighlightRanges("bill", text))).toContain(
+        `[${text.slice(text.toLowerCase().indexOf("bill"), text.toLowerCase().indexOf("bill") + 4)}]`,
+      );
+    }
+  });
+  it("highlights the tokens present even when other words match another field", () => {
+    expect(marked("Stripe billing", findHighlightRanges("stripe main", "Stripe billing"))).toBe(
+      "[Stripe] billing",
+    );
+  });
+  it("uses the search matcher for typo and scattered-character matches", () => {
+    expect(marked("billing", findHighlightRanges("bulling", "billing"))).toBe("[billing]");
+    expect(marked("paseo-babysit", findHighlightRanges("pasbab", "paseo-babysit"))).toBe(
+      "[pas]eo-[bab]ysit",
+    );
+  });
+  it("does not highlight a query assembled across separate words", () => {
+    expect(
+      findHighlightRanges(
+        "terminal",
+        "Let me diagnose this problem in a diagnose this problem and",
+      ),
+    ).toEqual([]);
+    expect(marked("check configuration", findHighlightRanges("confg", "check configuration"))).toBe(
+      "check [conf]i[g]uration",
+    );
+  });
+  it("merges overlapping tokens and ignores empty or unmatched queries", () => {
+    expect(marked("billing", findHighlightRanges("bill billing", "billing"))).toBe("[billing]");
+    expect(findHighlightRanges("", "billing")).toEqual([]);
+    expect(findHighlightRanges("xyz", "billing")).toEqual([]);
+  });
+});
diff --git a/packages/app/src/components/ui/highlighted-text-segments.ts b/packages/app/src/components/ui/highlighted-text-segments.ts
index 65fdbe2e7c..0bd4f1e0bd 100644
--- a/packages/app/src/components/ui/highlighted-text-segments.ts
+++ b/packages/app/src/components/ui/highlighted-text-segments.ts
@@ -1,4 +1,10 @@
-import type { MatchRange } from "@getpaseo/protocol/search/text-match";
+import {
+  fuzzyPolicyForToken,
+  matchRanges,
+  scoreMatch,
+  tokenizeQuery,
+  type MatchRange,
+} from "@getpaseo/protocol/search/text-match";
 
 export interface HighlightSegment {
   /** Offset into the source text; unique per segment, so it doubles as a key. */
@@ -33,3 +39,23 @@ export function toHighlightSegments(
   }
   return segments;
 }
+
+/** Best-effort presentation of each query token in this field, independently of other fields. */
+export function findHighlightRanges(query: string, text: string): MatchRange[] {
+  const ranges = tokenizeQuery(query)
+    .flatMap((token) => {
+      const score = scoreMatch(token, text, { fuzzy: fuzzyPolicyForToken(token) });
+      return score ? matchRanges(token, text, score) : [];
+    })
+    .sort((left, right) => left.start - right.start);
+  const merged: MatchRange[] = [];
+  for (const range of ranges) {
+    const last = merged.at(-1);
+    if (last && range.start <= last.start + last.length) {
+      last.length = Math.max(last.length, range.start + range.length - last.start);
+    } else {
+      merged.push({ ...range });
+    }
+  }
+  return merged;
+}
diff --git a/packages/app/src/components/ui/hover-card.tsx b/packages/app/src/components/ui/hover-card.tsx
new file mode 100644
index 0000000000..3d438505d3
--- /dev/null
+++ b/packages/app/src/components/ui/hover-card.tsx
@@ -0,0 +1,418 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactElement,
+  type ReactNode,
+  type RefObject,
+} from "react";
+import { Dimensions, View, type Role, type StyleProp, type ViewStyle } from "react-native";
+import { FadeIn, FadeOut } from "react-native-reanimated";
+import { StyleSheet } from "react-native-unistyles";
+import { Portal } from "@gorhom/portal";
+import { useBottomSheetModalInternal } from "@gorhom/bottom-sheet";
+import {
+  OverlayLayerProvider,
+  useOverlayLayer,
+  useWebOverlayRegistration,
+} from "@/lib/overlay-root";
+import { FloatingSurface } from "@/components/ui/floating";
+import { isWeb } from "@/constants/platform";
+import { useHoverSafeZone } from "@/hooks/use-hover-safe-zone";
+import {
+  computePosition,
+  measureElement,
+  type Alignment,
+  type Placement,
+  type Rect,
+  type Size,
+} from "./anchor";
+
+const CLOSE_GRACE_MS = 100;
+
+interface HoverCardContextValue {
+  open: boolean;
+  layer: number;
+  setTriggerRef: (node: View | null) => void;
+  triggerRef: RefObject<View | null>;
+  contentRef: RefObject<View | null>;
+  openNow: () => void;
+  scheduleClose: () => void;
+}
+
+const HoverCardContext = createContext<HoverCardContextValue | null>(null);
+
+/**
+ * A card that opens while the pointer is on its trigger and stays open while the pointer crosses
+ * onto it, so its content can be pressed. Hover only exists on web; elsewhere the trigger renders
+ * alone and the content never mounts. See docs/hover.md.
+ *
+ * ```tsx
+ * <HoverCard>
+ *   <HoverCardTrigger>{trigger}</HoverCardTrigger>
+ *   <HoverCardContent placement="top">{details}</HoverCardContent>
+ * </HoverCard>
+ * ```
+ */
+export function HoverCard({
+  disabled = false,
+  children,
+}: {
+  /** Closes the card and keeps it closed, e.g. while its trigger is dragged. */
+  disabled?: boolean;
+  children: ReactNode;
+}): ReactNode {
+  if (!isWeb) return children;
+  return <WebHoverCard disabled={disabled}>{children}</WebHoverCard>;
+}
+
+function WebHoverCard({
+  disabled,
+  children,
+}: {
+  disabled: boolean;
+  children: ReactNode;
+}): ReactElement {
+  const layer = useOverlayLayer("floating");
+  const triggerRef = useRef<View>(null);
+  const contentRef = useRef<View>(null);
+  const [open, setOpen] = useState(false);
+  const graceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  // Read when focus arrives: by focusout the element losing focus no longer matches :focus-visible.
+  const keyboardFocusedRef = useRef(false);
+
+  const clearGraceTimer = useCallback(() => {
+    if (graceTimerRef.current) {
+      clearTimeout(graceTimerRef.current);
+      graceTimerRef.current = null;
+    }
+  }, []);
+
+  const focusInside = useCallback(() => {
+    if (!isWeb) return false;
+    const active = document.activeElement;
+    return [triggerRef.current, contentRef.current].some((view) =>
+      (view as unknown as HTMLElement | null)?.contains(active),
+    );
+  }, []);
+
+  // Keyboard focus keeps the card open for keyboard users; the focus a pointer click leaves
+  // behind on the trigger or a button in the card does not outlast the pointer leaving.
+  const keyboardFocusInside = useCallback(() => {
+    return focusInside() && document.activeElement?.matches(":focus-visible") === true;
+  }, [focusInside]);
+
+  const scheduleClose = useCallback(() => {
+    if (keyboardFocusInside()) return;
+    if (graceTimerRef.current) return;
+    graceTimerRef.current = setTimeout(() => {
+      graceTimerRef.current = null;
+      if (keyboardFocusInside()) return;
+      setOpen(false);
+    }, CLOSE_GRACE_MS);
+  }, [keyboardFocusInside]);
+
+  const openNow = useCallback(() => {
+    clearGraceTimer();
+    if (!disabled) {
+      setOpen(true);
+    }
+  }, [clearGraceTimer, disabled]);
+
+  const keyPressed = useCallback(
+    (event: KeyboardEvent): boolean => {
+      if (!isWeb) return false;
+      const trigger = triggerRef.current as unknown as HTMLElement | null;
+      if (!trigger) return false;
+      if (event.key === "Escape" && open) {
+        event.preventDefault();
+        if (focusInside()) trigger.focus();
+        clearGraceTimer();
+        setOpen(false);
+        return true;
+      } else if (
+        focusInside() &&
+        event.target === trigger &&
+        ["ArrowDown", "Enter", " "].includes(event.key)
+      ) {
+        event.preventDefault();
+        openNow();
+        requestAnimationFrame(() => {
+          (contentRef.current as unknown as HTMLElement | null)
+            ?.querySelector<HTMLElement>(
+              'button, [role="button"][tabindex="0"], a[href], input, [tabindex="0"]',
+            )
+            ?.focus();
+        });
+        return true;
+      }
+      return false;
+    },
+    [clearGraceTimer, focusInside, open, openNow],
+  );
+
+  const setOverlayScope = useWebOverlayRegistration({
+    active: !disabled && open,
+    layer,
+    onKeyDown: keyPressed,
+    manageFocus: false,
+  });
+  const setTriggerRef = useCallback(
+    (node: View | null) => {
+      triggerRef.current = node;
+      setOverlayScope(node);
+    },
+    [setOverlayScope],
+  );
+
+  useEffect(() => {
+    if (!isWeb) return;
+    const trigger = triggerRef.current as unknown as HTMLElement | null;
+    if (!trigger) return;
+    const close = () => {
+      clearGraceTimer();
+      setOpen(false);
+    };
+    const focusEntered = (event: FocusEvent) => {
+      const target = event.target as Element;
+      keyboardFocusedRef.current = target.matches(":focus-visible");
+      if (trigger.contains(target)) {
+        openNow();
+      } else if ((contentRef.current as unknown as HTMLElement | null)?.contains(target)) {
+        clearGraceTimer();
+      }
+    };
+    // Only keyboard focus keeps the card open, so only losing keyboard focus closes it. A button
+    // that disables itself on press drops pointer focus while the pointer is still on the card.
+    const focusLeft = (event: FocusEvent) => {
+      const next = event.relatedTarget as Node | null;
+      if (
+        keyboardFocusedRef.current &&
+        !trigger.contains(next) &&
+        !(contentRef.current as unknown as HTMLElement | null)?.contains(next)
+      ) {
+        scheduleClose();
+      }
+    };
+    const activateClosedTrigger = (event: KeyboardEvent) => {
+      if (
+        !open &&
+        !event.defaultPrevented &&
+        !event.isComposing &&
+        ["ArrowDown", "Enter", " "].includes(event.key)
+      )
+        keyPressed(event);
+    };
+    const scrolled = (event: Event) => {
+      if (!(contentRef.current as unknown as HTMLElement | null)?.contains(event.target as Node))
+        close();
+    };
+    document.addEventListener("focusin", focusEntered);
+    document.addEventListener("focusout", focusLeft);
+    trigger.addEventListener("keydown", activateClosedTrigger);
+    document.addEventListener("scroll", scrolled, true);
+    window.addEventListener("resize", close);
+    return () => {
+      document.removeEventListener("focusin", focusEntered);
+      document.removeEventListener("focusout", focusLeft);
+      trigger.removeEventListener("keydown", activateClosedTrigger);
+      document.removeEventListener("scroll", scrolled, true);
+      window.removeEventListener("resize", close);
+    };
+  }, [clearGraceTimer, keyPressed, open, openNow, scheduleClose]);
+
+  // While open, the safe zone covers trigger + content + the bridge between
+  // them. Close only fires when the pointer leaves the safe zone; re-entering
+  // it (including the bridge) cancels the pending close.
+  useHoverSafeZone({
+    enabled: open,
+    triggerRef,
+    contentRef,
+    onEnterSafeZone: clearGraceTimer,
+    onLeaveSafeZone: scheduleClose,
+  });
+
+  useEffect(() => {
+    if (disabled) {
+      clearGraceTimer();
+      setOpen(false);
+    }
+  }, [clearGraceTimer, disabled]);
+
+  useEffect(() => clearGraceTimer, [clearGraceTimer]);
+
+  const value = useMemo<HoverCardContextValue>(
+    () => ({ open, layer, setTriggerRef, triggerRef, contentRef, openNow, scheduleClose }),
+    [open, layer, setTriggerRef, openNow, scheduleClose],
+  );
+
+  return (
+    <OverlayLayerProvider layer={layer}>
+      <HoverCardContext.Provider value={value}>{children}</HoverCardContext.Provider>
+    </OverlayLayerProvider>
+  );
+}
+
+export function HoverCardTrigger({
+  children,
+  focusable = false,
+  accessibilityLabel,
+}: {
+  children: ReactNode;
+  focusable?: boolean;
+  accessibilityLabel?: string;
+}): ReactNode {
+  const ctx = useContext(HoverCardContext);
+  if (!ctx) return children;
+  return (
+    <View
+      ref={ctx.setTriggerRef}
+      tabIndex={focusable ? 0 : undefined}
+      accessibilityRole={focusable ? "button" : undefined}
+      accessibilityLabel={accessibilityLabel}
+      collapsable={false}
+      onPointerEnter={ctx.openNow}
+      onPointerLeave={ctx.scheduleClose}
+    >
+      {children}
+    </View>
+  );
+}
+
+interface HoverCardContentProps {
+  placement: Placement;
+  alignment?: Alignment;
+  offset?: number;
+  /** Layered over the default popover surface. */
+  style?: StyleProp<ViewStyle>;
+  role?: Role;
+  accessibilityLabel?: string;
+  testID?: string;
+  /** Mounted only while the card is open, so whatever it fetches runs only then. */
+  children: ReactNode;
+}
+
+export function HoverCardContent(props: HoverCardContentProps): ReactElement | null {
+  const ctx = useContext(HoverCardContext);
+  if (!ctx?.open) return null;
+  return (
+    <HoverCardSurface
+      {...props}
+      layer={ctx.layer}
+      triggerRef={ctx.triggerRef}
+      contentRef={ctx.contentRef}
+    />
+  );
+}
+
+function HoverCardSurface({
+  layer,
+  triggerRef,
+  contentRef,
+  placement,
+  alignment = "center",
+  offset = 4,
+  style,
+  role,
+  accessibilityLabel,
+  testID,
+  children,
+}: HoverCardContentProps & {
+  layer: number;
+  triggerRef: RefObject<View | null>;
+  contentRef: RefObject<View | null>;
+}): ReactElement {
+  const bottomSheetInternal = useBottomSheetModalInternal(true);
+  const [triggerRect, setTriggerRect] = useState<Rect | null>(null);
+  const [contentSize, setContentSize] = useState<Size | null>(null);
+  const [position, setPosition] = useState<{ x: number; y: number } | null>(null);
+
+  useEffect(() => {
+    if (!triggerRef.current) return;
+    let cancelled = false;
+    void measureElement(triggerRef.current).then((rect) => {
+      if (!cancelled) setTriggerRect(rect);
+      return undefined;
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [triggerRef]);
+
+  useEffect(() => {
+    if (!triggerRect || !contentSize) return;
+    const { width, height } = Dimensions.get("window");
+    const { x, y } = computePosition({
+      triggerRect,
+      contentSize,
+      displayArea: { x: 0, y: 0, width, height },
+      placement,
+      flipHorizontal: true,
+      alignment,
+      offset,
+    });
+    setPosition({ x, y });
+  }, [alignment, contentSize, offset, placement, triggerRect]);
+
+  const handleLayout = useCallback(
+    (event: { nativeEvent: { layout: { width: number; height: number } } }) => {
+      const { width, height } = event.nativeEvent.layout;
+      setContentSize({ width, height });
+    },
+    [],
+  );
+
+  const frameStyle = useMemo(
+    () => ({
+      position: "absolute" as const,
+      top: position?.y ?? -9999,
+      left: position?.x ?? -9999,
+    }),
+    [position?.x, position?.y],
+  );
+  const surfaceStyle = useMemo(() => [styles.surface, style], [style]);
+
+  return (
+    <Portal hostName={bottomSheetInternal?.hostName}>
+      <View pointerEvents="box-none" style={[styles.portalOverlay, { zIndex: layer }]}>
+        <FloatingSurface
+          ref={contentRef}
+          entering={FadeIn.duration(80)}
+          exiting={FadeOut.duration(80)}
+          collapsable={false}
+          onLayout={handleLayout}
+          role={role}
+          accessibilityLabel={accessibilityLabel}
+          testID={testID}
+          style={surfaceStyle}
+          frameStyle={frameStyle}
+        >
+          {children}
+        </FloatingSurface>
+      </View>
+    </Portal>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  portalOverlay: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
+    zIndex: 1000,
+  },
+  surface: {
+    backgroundColor: theme.colors.popover,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.borderAccent,
+    borderRadius: theme.borderRadius.xl,
+    ...theme.shadow.md,
+    zIndex: 1000,
+  },
+}));
diff --git a/packages/app/src/components/ui/icon-button-chrome.ts b/packages/app/src/components/ui/icon-button-chrome.ts
index 394a744e64..75735ac986 100644
--- a/packages/app/src/components/ui/icon-button-chrome.ts
+++ b/packages/app/src/components/ui/icon-button-chrome.ts
@@ -1,3 +1,4 @@
+import { createContext, useCallback, useContext } from "react";
 import type { StyleProp, ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
@@ -8,6 +9,8 @@ export { extraMutedIconColorMapping, mutedIconColorMapping } from "@/components/
 export type IconButtonChromeSize = "large" | "small";
 
 const SMALL_ICON_BUTTON_SIZE = 20;
+/** Width and height of a large icon button on compact layouts. */
+export const COMPACT_LARGE_ICON_BUTTON_SIZE = 32;
 const COMPACT_SMALL_ICON_BUTTON_SIZE = 32;
 
 export interface IconButtonChromeState {
@@ -27,20 +30,53 @@ interface IconButtonChromeOptions {
   state?: IconButtonChromeState;
   compact?: boolean;
   disabled?: boolean;
+  /** A circular hitbox and highlight, for buttons inside a pill-shaped container. */
+  round?: boolean;
   style?: StyleProp<ViewStyle>;
 }
 
+const IconButtonChromeContext = createContext<"default" | "header-island">("default");
+
+/** A container owns the chrome of its icon actions, including custom menu and badge triggers. */
+export const IconButtonChromeProvider = IconButtonChromeContext.Provider;
+
+/** The same state callback works with Pressable, TooltipTrigger, and DropdownMenuTrigger. */
+export function useIconButtonChromeStyle({
+  size,
+  compact,
+  disabled,
+  round,
+  style,
+  active,
+}: Omit<IconButtonChromeOptions, "state"> & { active?: boolean }) {
+  const scope = useContext(IconButtonChromeContext);
+  return useCallback(
+    (state: IconButtonChromeState) =>
+      iconButtonChromeStyle({
+        size: scope === "header-island" ? "large" : size,
+        compact,
+        disabled,
+        round: scope === "header-island" || round,
+        style,
+        state: { ...state, active: active || state.active },
+      }),
+    [scope, size, compact, disabled, round, style, active],
+  );
+}
+
 /** Shared hitbox and interaction chrome for icon-only header and toolbar controls. */
 export function iconButtonChromeStyle({
   size,
   state,
   compact = false,
   disabled = false,
+  round = false,
   style,
 }: IconButtonChromeOptions): StyleProp<ViewStyle> {
   const highlighted = state?.active || state?.hovered || state?.pressed || state?.open;
   return [
     resolveIconButtonFrame(size, compact),
+    round ? styles.round : null,
     style,
     highlighted ? styles.highlighted : null,
     disabled ? styles.disabled : null,
@@ -67,11 +103,11 @@ export function smallIconButtonChromeFrameSize(compact = false): number {
 const styles = StyleSheet.create((theme) => ({
   large: {
     width: {
-      xs: 32,
+      xs: COMPACT_LARGE_ICON_BUTTON_SIZE,
       md: HEADER_CONTROL_HEIGHT,
     },
     height: {
-      xs: 32,
+      xs: COMPACT_LARGE_ICON_BUTTON_SIZE,
       md: HEADER_CONTROL_HEIGHT,
     },
     padding: 0,
@@ -104,6 +140,9 @@ const styles = StyleSheet.create((theme) => ({
     outlineWidth: 0,
     outlineColor: "transparent",
   },
+  round: {
+    borderRadius: theme.borderRadius.full,
+  },
   highlighted: {
     backgroundColor: theme.colors.interactionHighlight,
   },
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/back-press.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/back-press.ts
new file mode 100644
index 0000000000..d8f58356d6
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/back-press.ts
@@ -0,0 +1,16 @@
+import { BackHandler, Platform } from "react-native";
+import type { BackPressSource } from "./visibility-tracker";
+
+/**
+ * Android's hardware Back press.
+ *
+ * iOS and web have no such press, and `react-native-web`'s `BackHandler` logs an error as soon as
+ * anything subscribes, so nothing is registered off Android.
+ */
+export const systemBackPress: BackPressSource = {
+  subscribe(onBackPress) {
+    if (Platform.OS !== "android") return () => {};
+    const subscription = BackHandler.addEventListener("hardwareBackPress", onBackPress);
+    return () => subscription.remove();
+  },
+};
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx
index 7567601eca..cf820ac86c 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx
@@ -58,7 +58,7 @@ vi.mock("@gorhom/bottom-sheet", async () => {
 });
 
 import { IsolatedBottomSheetModal, type ContextBridge } from ".";
-import { useIsInsideBottomSheet } from "@/components/ui/text-input/bottom-sheet-scope";
+import { useIsInsideBottomSheet } from "@/components/ui/bottom-sheet-scope";
 
 /** Renders whatever the portal is currently holding, from its own place in the tree. */
 function PortalHostProbe() {
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
index 1f70a6babe..8dd55e5678 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
@@ -1,15 +1,18 @@
 import {
   BottomSheetModal as GorhomBottomSheetModal,
   type BottomSheetModalProps,
+  type BottomSheetBackdropProps,
 } from "@gorhom/bottom-sheet";
 import React from "react";
-import { forwardRef, useCallback, useEffect, useMemo, useRef } from "react";
+import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from "react";
 import type { ElementRef, ReactNode } from "react";
+import { systemBackPress } from "./back-press";
 import {
   type BottomSheetController,
   createBottomSheetVisibilityTracker,
 } from "./visibility-tracker";
-import { BottomSheetTextInputScope } from "@/components/ui/text-input/bottom-sheet-scope";
+import { BottomSheetScope } from "@/components/ui/bottom-sheet-scope";
+import { SheetBackdrop } from "./sheet-backdrop";
 
 type GorhomBottomSheetModalMethods = ElementRef<typeof GorhomBottomSheetModal>;
 
@@ -35,7 +38,7 @@ export type ContextBridge = (children: ReactNode) => ReactNode;
 
 type IsolatedBottomSheetModalProps = Omit<
   BottomSheetModalProps,
-  "enableDismissOnClose" | "stackBehavior" | "children"
+  "enableDismissOnClose" | "stackBehavior" | "children" | "backdropComponent"
 > & {
   /**
    * Nodes only. Gorhom also accepts a render function, but nothing here uses it and a bridge
@@ -43,6 +46,8 @@ type IsolatedBottomSheetModalProps = Omit<
    */
   children?: ReactNode;
   presentation?: "push" | "replace";
+  /** Show a dismissible backdrop. Its interaction belongs to the modal stack. */
+  backdropOpacity?: number;
   /**
    * Required, and `null` is a real answer: a sheet that needs nothing from its call site should
    * have to say so. The failure it prevents is invisible until someone adds a `useContext` deep
@@ -57,17 +62,45 @@ export const IsolatedBottomSheetModal = forwardRef<
   IsolatedBottomSheetModalRef,
   IsolatedBottomSheetModalProps
 >(function IsolatedBottomSheetModal(props, ref) {
-  const { children, presentation = "push", contextBridge, ...bottomSheetProps } = props;
+  // Gorhom puts this ref into its provider queue and reads `.current` for stack operations.
+  // A callback ref accepts the handle but leaves that queue unable to dismiss or restore it.
+  const modalRef = useRef<GorhomBottomSheetModalMethods>(null);
+  useImperativeHandle(
+    ref,
+    () => ({
+      present: (...args) => modalRef.current?.present(...args),
+      dismiss: (...args) => modalRef.current?.dismiss(...args),
+      snapToIndex: (...args) => modalRef.current?.snapToIndex(...args),
+      snapToPosition: (...args) => modalRef.current?.snapToPosition(...args),
+      expand: (...args) => modalRef.current?.expand(...args),
+      collapse: (...args) => modalRef.current?.collapse(...args),
+      close: (...args) => modalRef.current?.close(...args),
+      forceClose: (...args) => modalRef.current?.forceClose(...args),
+    }),
+    [],
+  );
+  const {
+    children,
+    presentation = "push",
+    contextBridge,
+    backdropOpacity,
+    ...bottomSheetProps
+  } = props;
+  const renderBackdrop = useCallback(
+    (backdropProps: BottomSheetBackdropProps) => (
+      <SheetBackdrop {...backdropProps} opacity={backdropOpacity} />
+    ),
+    [backdropOpacity],
+  );
   const modal = (
     <GorhomBottomSheetModal
       {...bottomSheetProps}
-      ref={ref}
+      ref={modalRef}
       enableDismissOnClose
       stackBehavior={presentation}
+      backdropComponent={backdropOpacity === undefined ? undefined : renderBackdrop}
     >
-      <BottomSheetTextInputScope>
-        {contextBridge ? contextBridge(children) : children}
-      </BottomSheetTextInputScope>
+      <BottomSheetScope>{contextBridge ? contextBridge(children) : children}</BottomSheetScope>
     </GorhomBottomSheetModal>
   );
 
@@ -87,7 +120,11 @@ export function useIsolatedBottomSheetVisibility({
   onCloseRef.current = onClose;
 
   const tracker = useMemo(
-    () => createBottomSheetVisibilityTracker({ onClose: () => onCloseRef.current() }),
+    () =>
+      createBottomSheetVisibilityTracker({
+        onClose: () => onCloseRef.current(),
+        backPress: systemBackPress,
+      }),
     [],
   );
 
@@ -115,3 +152,5 @@ export function useIsolatedBottomSheetVisibility({
     handleSheetDismiss,
   };
 }
+
+export { SheetVisibleFrame } from "./visible-frame";
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx
new file mode 100644
index 0000000000..1232566462
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx
@@ -0,0 +1,5 @@
+import { BottomSheetBackdrop, type BottomSheetBackdropProps } from "@gorhom/bottom-sheet";
+
+export function SheetBackdrop(props: BottomSheetBackdropProps & { opacity?: number }) {
+  return <BottomSheetBackdrop {...props} appearsOnIndex={0} disappearsOnIndex={-1} />;
+}
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx
new file mode 100644
index 0000000000..ba1e397a9e
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx
@@ -0,0 +1,36 @@
+import {
+  BottomSheetBackdrop,
+  useBottomSheetModal,
+  type BottomSheetBackdropProps,
+} from "@gorhom/bottom-sheet";
+import { useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import { Pressable, StyleSheet, View } from "react-native";
+
+export function SheetBackdrop(props: BottomSheetBackdropProps & { opacity?: number }) {
+  const { dismiss } = useBottomSheetModal();
+  const { t } = useTranslation();
+  const dismissTopSheet = useCallback(() => dismiss(), [dismiss]);
+
+  return (
+    <View style={StyleSheet.absoluteFill}>
+      <BottomSheetBackdrop
+        {...props}
+        appearsOnIndex={0}
+        disappearsOnIndex={-1}
+        pressBehavior="none"
+        accessible={false}
+        accessibilityRole={null}
+        accessibilityLabel={null}
+      />
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={t("common.bottomSheetBackdrop")}
+        // The provider owns presentation order, including when a lower backdrop remounts.
+        // Keep this target until the portal unmounts: animation must not expose the sheet below.
+        onPress={dismissTopSheet}
+        style={StyleSheet.absoluteFill}
+      />
+    </View>
+  );
+}
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
index d70dffdaa1..60b386bd45 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import {
+  type BackPressSource,
   type BottomSheetController,
   createBottomSheetVisibilityTracker,
 } from "./visibility-tracker";
@@ -20,21 +21,55 @@ class FakeBottomSheet implements BottomSheetController {
   }
 }
 
+/**
+ * Stands in for Android's `BackHandler`, which offers the press to listeners newest-first and
+ * stops at the first one that claims it.
+ */
+class FakeBackPress implements BackPressSource {
+  private listeners: (() => boolean)[] = [];
+
+  subscribe(onBackPress: () => boolean): () => void {
+    this.listeners.push(onBackPress);
+    return () => {
+      const index = this.listeners.indexOf(onBackPress);
+      if (index >= 0) this.listeners.splice(index, 1);
+    };
+  }
+
+  /** True when a sheet claimed the press, false when it falls through to the navigator. */
+  press(): boolean {
+    for (let index = this.listeners.length - 1; index >= 0; index--) {
+      if (this.listeners[index]?.()) return true;
+    }
+    return false;
+  }
+}
+
 function setup() {
   const sheet = new FakeBottomSheet();
+  const backPress = new FakeBackPress();
   let closeCount = 0;
   const tracker = createBottomSheetVisibilityTracker({
     onClose: () => {
       closeCount += 1;
     },
+    backPress,
   });
   return {
     sheet,
+    backPress,
     tracker,
     closeCount: () => closeCount,
   };
 }
 
+/** Opens a sheet and runs it through the presentation the real sheet reports back. */
+function openSheet(context: ReturnType<typeof setup>) {
+  context.tracker.attachController(context.sheet);
+  context.tracker.syncDesired({ visible: true });
+  context.tracker.handleSheetIndexChange(0);
+}
+
 describe("bottom sheet visibility tracker", () => {
   it("presents once when the sheet becomes visible and dismisses when it goes back to hidden", () => {
     const { sheet, tracker } = setup();
@@ -160,4 +195,62 @@ describe("bottom sheet visibility tracker", () => {
 
     expect(sheet.events).toEqual([{ type: "present" }, { type: "present" }]);
   });
+
+  it("dismisses the sheet on a Back press instead of letting it reach the navigator", () => {
+    const context = setup();
+    openSheet(context);
+
+    expect(context.backPress.press()).toBe(true);
+    expect(context.sheet.events).toEqual([{ type: "present" }, { type: "dismiss" }]);
+  });
+
+  it("leaves Back to the navigator before the sheet is on screen and after it closes", () => {
+    const context = setup();
+    context.tracker.attachController(context.sheet);
+    context.tracker.syncDesired({ visible: false });
+
+    expect(context.backPress.press()).toBe(false);
+
+    openSheet(context);
+    context.tracker.handleSheetIndexChange(-1);
+    context.tracker.handleSheetDismiss();
+
+    expect(context.backPress.press()).toBe(false);
+  });
+
+  it("gives the Back press to the sheet presented last", () => {
+    const backPress = new FakeBackPress();
+    const sheets = ["below", "above"].map((name) => {
+      const sheet = new FakeBottomSheet();
+      const tracker = createBottomSheetVisibilityTracker({ onClose: () => {}, backPress });
+      tracker.attachController(sheet);
+      tracker.syncDesired({ visible: true });
+      tracker.handleSheetIndexChange(0);
+      return { name, sheet };
+    });
+
+    backPress.press();
+
+    expect(sheets.map((entry) => [entry.name, entry.sheet.events.at(-1)?.type])).toEqual([
+      ["below", "present"],
+      ["above", "dismiss"],
+    ]);
+  });
+
+  it("stops claiming Back once the sheet leaves the tree", () => {
+    const context = setup();
+    openSheet(context);
+    context.tracker.attachController(null);
+
+    expect(context.backPress.press()).toBe(false);
+  });
+});
+
+it("does not cancel the owner's editor when the compact sheet leaves the tree on resize", () => {
+  const context = setup();
+  openSheet(context);
+  context.tracker.attachController(null);
+  context.tracker.handleSheetDismiss();
+  expect(context.closeCount()).toBe(0);
+  expect(context.backPress.press()).toBe(false);
 });
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
index 048d85f361..dec2dd535c 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
@@ -8,6 +8,22 @@ export interface BottomSheetVisibilityInput {
   isEnabled?: boolean;
 }
 
+/**
+ * The system Back press, as the tracker needs it.
+ *
+ * A sheet is presented through `@gorhom/portal`, which renders it into the app's own view tree
+ * rather than a native modal window, so Android delivers Back to the navigator underneath it
+ * unless something on top claims the press first.
+ *
+ * `subscribe` registers a listener and returns its removal. The listener returns `true` when it
+ * claims the press. Listeners are offered the press newest-first, so a tracker holds its
+ * subscription only while its sheet is on screen, and a stacked sheet answers before the one
+ * below it.
+ */
+export interface BackPressSource {
+  subscribe(onBackPress: () => boolean): () => void;
+}
+
 export interface BottomSheetVisibilityTracker {
   attachController(controller: BottomSheetController | null): void;
   syncDesired(input: BottomSheetVisibilityInput): void;
@@ -19,23 +35,46 @@ type BottomSheetPhase = "closed" | "presenting" | "presented" | "dismissing";
 
 export function createBottomSheetVisibilityTracker(opts: {
   onClose: () => void;
+  backPress?: BackPressSource;
 }): BottomSheetVisibilityTracker {
   let controller: BottomSheetController | null = null;
   let visible = false;
   let isEnabled: boolean | undefined;
   let phase: BottomSheetPhase = "closed";
   let hasNotifiedClose = false;
+  let releaseBackPress: (() => void) | null = null;
+
+  function setPhase(next: BottomSheetPhase): void {
+    phase = next;
+    syncBackPress();
+  }
+
+  /** Holds the Back press for exactly the window the sheet is on screen, and no longer. */
+  function syncBackPress(): void {
+    const wantsBackPress = phase === "presented" && controller !== null;
+    if (wantsBackPress === (releaseBackPress !== null)) return;
+    if (!wantsBackPress) {
+      releaseBackPress?.();
+      releaseBackPress = null;
+      return;
+    }
+    releaseBackPress =
+      opts.backPress?.subscribe(() => {
+        dismiss();
+        return true;
+      }) ?? null;
+  }
 
   function present(): void {
     if (!controller || phase !== "closed") return;
-    phase = "presenting";
     hasNotifiedClose = false;
+    setPhase("presenting");
     controller.present();
   }
 
   function dismiss(): void {
     if (!controller || phase === "closed" || phase === "dismissing") return;
-    phase = "dismissing";
+    setPhase("dismissing");
     controller.dismiss();
   }
 
@@ -48,6 +87,9 @@ export function createBottomSheetVisibilityTracker(opts: {
   return {
     attachController(next) {
       controller = next;
+      // A sheet that left the tree cannot answer, so it lets go of the press without changing
+      // phase: the parent has not acknowledged the dismissal yet.
+      syncBackPress();
       if (next && visible && isEnabled !== false) {
         present();
       }
@@ -61,7 +103,7 @@ export function createBottomSheetVisibilityTracker(opts: {
         return;
       }
       if (phase === "dismissing") {
-        phase = "closed";
+        setPhase("closed");
         hasNotifiedClose = false;
         return;
       }
@@ -70,21 +112,24 @@ export function createBottomSheetVisibilityTracker(opts: {
     handleSheetIndexChange(index) {
       if (index !== -1) {
         if (phase === "presenting" || phase === "dismissing") {
-          phase = "presented";
+          setPhase("presented");
         }
         return;
       }
       if (phase === "presenting" || phase === "presented") {
-        phase = "dismissing";
+        setPhase("dismissing");
       }
     },
     handleSheetDismiss() {
+      // Portal cleanup reports dismissal after the sheet leaves the tree. It is
+      // presentation teardown, so the owner keeps its desired state.
+      if (!controller) return;
       if (visible) {
-        phase = "dismissing";
+        setPhase("dismissing");
         notifyClose();
         return;
       }
-      phase = "closed";
+      setPhase("closed");
       hasNotifiedClose = false;
     },
   };
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts
new file mode 100644
index 0000000000..9e98bd359f
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+import { getBottomSheetVisibleContentHeight } from "./visible-frame-layout";
+
+describe("getBottomSheetVisibleContentHeight", () => {
+  it("stops subtracting the retained keyboard height after the keyboard hides", () => {
+    const layout = {
+      containerHeight: 874,
+      contentPosition: 88,
+      handleHeight: 24,
+      keyboardHeight: 344,
+    };
+
+    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: true })).toBe(418);
+    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: false })).toBe(762);
+  });
+});
+
+// Below the lowest snap the frame must travel with the sheet, not shrink to the screen edge.
+describe("sheet footer motion", () => {
+  it("keeps the frame height fixed while opening and panning below the lowest snap", () => {
+    const layout = {
+      containerHeight: 1000,
+      handleHeight: 24,
+      keyboardHeight: 0,
+      isKeyboardVisible: false,
+      lowestDetentPosition: 400,
+    };
+    const heights = [1000, 800, 600, 400].map((contentPosition) =>
+      getBottomSheetVisibleContentHeight({ ...layout, contentPosition }),
+    );
+    expect(heights).toEqual([576, 576, 576, 576]);
+  });
+});
+
+it("resizes above the lowest snap and never returns negative or unmeasured heights", () => {
+  const layout = {
+    containerHeight: 1000,
+    handleHeight: 24,
+    keyboardHeight: 0,
+    isKeyboardVisible: false,
+    lowestDetentPosition: 400,
+  };
+  expect(getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100 })).toBe(876);
+  expect(
+    getBottomSheetVisibleContentHeight({
+      ...layout,
+      contentPosition: 100,
+      keyboardHeight: 950,
+      isKeyboardVisible: true,
+    }),
+  ).toBe(0);
+  expect(
+    getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100, handleHeight: -999 }),
+  ).toBe(0);
+  expect(
+    getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100, containerHeight: -999 }),
+  ).toBe(0);
+});
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts
new file mode 100644
index 0000000000..316f56048a
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts
@@ -0,0 +1,25 @@
+interface BottomSheetVisibleContentHeightInput {
+  containerHeight: number;
+  contentPosition: number;
+  lowestDetentPosition?: number;
+  handleHeight: number;
+  keyboardHeight: number;
+  isKeyboardVisible: boolean;
+}
+
+export function getBottomSheetVisibleContentHeight({
+  containerHeight,
+  contentPosition,
+  lowestDetentPosition,
+  handleHeight,
+  keyboardHeight,
+  isKeyboardVisible,
+}: BottomSheetVisibleContentHeightInput): number {
+  "worklet";
+  if (containerHeight < 0 || handleHeight < 0) return 0;
+  const position = Math.min(contentPosition, lowestDetentPosition ?? contentPosition);
+  return Math.max(
+    0,
+    containerHeight - position - handleHeight - (isKeyboardVisible ? keyboardHeight : 0),
+  );
+}
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx
new file mode 100644
index 0000000000..15ead99edf
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx
@@ -0,0 +1,42 @@
+import type { ReactNode } from "react";
+import { View, StyleSheet } from "react-native";
+import { KEYBOARD_STATUS, useBottomSheetInternal } from "@gorhom/bottom-sheet";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { getBottomSheetVisibleContentHeight } from "./visible-frame-layout";
+
+/** Fixed-detent sheet content. The footer shares the sheet's translation below its lowest snap. */
+export function SheetVisibleFrame({
+  children,
+  footer,
+}: {
+  children: ReactNode;
+  footer?: ReactNode;
+}) {
+  const { animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition } =
+    useBottomSheetInternal();
+  const visibleStyle = useAnimatedStyle(() => {
+    const { containerHeight, handleHeight } = animatedLayoutState.get();
+    const keyboard = animatedKeyboardState.get();
+    return {
+      height: getBottomSheetVisibleContentHeight({
+        containerHeight,
+        handleHeight,
+        contentPosition: animatedPosition.get(),
+        lowestDetentPosition: animatedDetentsState.get().detents?.[0],
+        keyboardHeight: keyboard.heightWithinContainer,
+        isKeyboardVisible: keyboard.status === KEYBOARD_STATUS.SHOWN,
+      }),
+    };
+  }, [animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition]);
+  return (
+    <Animated.View style={[styles.frame, visibleStyle]}>
+      <View style={styles.body}>{children}</View>
+      {footer}
+    </Animated.View>
+  );
+}
+
+const styles = StyleSheet.create({
+  frame: { minHeight: 0, overflow: "hidden" },
+  body: { flex: 1, minHeight: 0 },
+});
diff --git a/packages/app/src/components/ui/menu/index.ts b/packages/app/src/components/ui/menu/index.ts
index c2114d1593..5668556899 100644
--- a/packages/app/src/components/ui/menu/index.ts
+++ b/packages/app/src/components/ui/menu/index.ts
@@ -35,4 +35,4 @@ export {
   type MenuPresentation,
 } from "./menu-context";
 export { currentPageId, isSubPageOpen, MENU_ROOT_PATH, type MenuPath } from "./menu-navigation";
-export type { Alignment, Placement, Rect, Size } from "./menu-anchor";
+export type { Alignment, Placement, Rect, Size } from "../anchor";
diff --git a/packages/app/src/components/ui/menu/menu-context.ts b/packages/app/src/components/ui/menu/menu-context.ts
index 8dceb70ec0..9635f09c9f 100644
--- a/packages/app/src/components/ui/menu/menu-context.ts
+++ b/packages/app/src/components/ui/menu/menu-context.ts
@@ -9,7 +9,7 @@ import {
   openSubPage,
   type MenuPath,
 } from "./menu-navigation";
-import type { Rect } from "./menu-anchor";
+import type { Rect } from "../anchor";
 
 /**
  * How a menu draws itself once it is open.
diff --git a/packages/app/src/components/ui/menu/menu-overlay.tsx b/packages/app/src/components/ui/menu/menu-overlay.tsx
index 32aed88abf..52afc71a77 100644
--- a/packages/app/src/components/ui/menu/menu-overlay.tsx
+++ b/packages/app/src/components/ui/menu/menu-overlay.tsx
@@ -38,7 +38,7 @@ import {
   type Placement,
   type Rect,
   type Size,
-} from "./menu-anchor";
+} from "../anchor";
 
 const SCROLL_CONTENT_STYLE = { flexGrow: 1 } as const;
 const CONTENT_ENTERING_DURATION_MS = 150;
@@ -292,8 +292,16 @@ export function AnchoredSurface({
     revision,
   });
 
+  // The surface is placed once both measurements land. Until then it sits off-screen so it can
+  // be measured, and it must not animate: Reanimated's web entering path snapshots the element's
+  // rect when the animation ends and writes that rect back as inline top/left when it cleans the
+  // keyframe up 750ms later. If the animation ends before placement, the snapshot is the
+  // off-screen rect and the menu jumps back off-screen. Remounting on placement starts the
+  // animation from the final position.
+  const placed = position !== null;
+
   useEffect(() => {
-    if (!isWeb || !open || !contentSize || typeof document === "undefined") return undefined;
+    if (!isWeb || !open || !placed || typeof document === "undefined") return undefined;
     const frame = requestAnimationFrame(() => {
       document
         .getElementById(surfaceNativeID)
@@ -301,7 +309,7 @@ export function AnchoredSurface({
         ?.focus();
     });
     return () => cancelAnimationFrame(frame);
-  }, [contentSize, open, surfaceNativeID]);
+  }, [open, placed, surfaceNativeID]);
 
   const frameStyle = useMemo<StyleProp<ViewStyle>>(() => {
     const { width: screenWidth } = Dimensions.get("window");
@@ -371,6 +379,7 @@ export function AnchoredSurface({
         />
       ) : null}
       <FloatingSurface
+        key={placed ? "placed" : "measuring"}
         collapsable={false}
         tabIndex={-1}
         nativeID={surfaceNativeID}
@@ -378,9 +387,9 @@ export function AnchoredSurface({
         dataSet={surfaceDataSet}
         style={styles.content}
         frameStyle={frameStyle}
-        entering={contentEntering}
+        entering={placed ? contentEntering : undefined}
         exiting={
-          isWeb || !onExited
+          !placed || isWeb || !onExited
             ? undefined
             : contentExiting.withCallback((finished) => {
                 "worklet";
diff --git a/packages/app/src/components/ui/menu/menu-surface.tsx b/packages/app/src/components/ui/menu/menu-surface.tsx
index 4f5bb22de1..3b76d4cf2b 100644
--- a/packages/app/src/components/ui/menu/menu-surface.tsx
+++ b/packages/app/src/components/ui/menu/menu-surface.tsx
@@ -5,14 +5,13 @@ import {
   useEffect,
   useMemo,
   useRef,
-  type ComponentProps,
   type ReactElement,
   type ReactNode,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { Pressable, Text, View } from "react-native";
+import { Pressable, Text, View, useWindowDimensions } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { BottomSheetBackdrop, BottomSheetScrollView } from "@gorhom/bottom-sheet";
+import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import { ChevronLeft } from "lucide-react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import {
@@ -21,12 +20,13 @@ import {
   type ContextBridge,
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { SPACING, type Theme } from "@/styles/theme";
+import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useMenuContext, MenuContextProvider } from "./menu-context";
 import { MenuPage } from "./menu-item";
 import { currentPageId, isSubPageOpen } from "./menu-navigation";
 import { AnchoredSurface, MenuOverlay } from "./menu-overlay";
 import { getMenuSheetBottomPadding } from "./menu-sheet-layout";
-import type { Alignment, Placement } from "./menu-anchor";
+import type { Alignment, Placement } from "../anchor";
 import type { KeyboardFocusScope } from "@/keyboard/actions";
 
 const ThemedChevronLeft = withUnistyles(ChevronLeft);
@@ -104,6 +104,8 @@ export interface MenuSurfaceProps {
   pages?: readonly MenuPageDefinition[];
   /** Title shown on the sheet's root page. Sheets always have a header; popovers never do. */
   sheetTitle?: string;
+  /** Controls on the right of the sheet's root title. */
+  sheetTrailing?: ReactNode;
   side?: Placement;
   align?: Alignment;
   offset?: number;
@@ -125,6 +127,10 @@ export interface MenuSurfaceProps {
  */
 export function MenuSurface(props: MenuSurfaceProps): ReactElement | null {
   const { presentation } = useMenuContext("MenuSurface");
+  const active = useRetainedPanelActive();
+  // Portals escape the hidden panel. Remove the surface in its inactive commit,
+  // before freezing can suspend an async menu action's closing update.
+  if (!active) return null;
   if (presentation === "sheet") {
     return <MenuSheetSurface {...props} />;
   }
@@ -334,9 +340,11 @@ function MenuSheetSurface({
   children,
   pages = [],
   sheetTitle,
+  sheetTrailing,
   testID,
   keyboardFocusScope,
 }: MenuSurfaceProps): ReactElement | null {
+  const { height: windowHeight } = useWindowDimensions();
   const menu = useMenuContext("MenuSurface");
   const { value: surfaceValue } = useSubAnchors();
   const safeAreaInsets = useSafeAreaInsets();
@@ -362,18 +370,6 @@ function MenuSheetSurface({
     onClose: handleClose,
   });
 
-  const renderBackdrop = useCallback(
-    (backdropProps: ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop
-        {...backdropProps}
-        appearsOnIndex={0}
-        disappearsOnIndex={-1}
-        opacity={0.45}
-      />
-    ),
-    [],
-  );
-
   const openPageId = currentPageId(menu.path);
   const openPage = openPageId ? pages.find((page) => page.id === openPageId) : null;
   const depth = menu.path.length;
@@ -397,9 +393,10 @@ function MenuSheetSurface({
       // Content-sized rather than fixed snap points: a pushed page is rarely the same height
       // as the page it replaced, and a fixed sheet would either clip it or leave dead space.
       enableDynamicSizing
+      maxDynamicContentSize={windowHeight * 0.8}
       onChange={handleSheetChange}
       onDismiss={handleSheetDismiss}
-      backdropComponent={renderBackdrop}
+      backdropOpacity={0.45}
       enablePanDownToClose
       // `interactive` rather than `extend`, which is what every other sheet in the app uses.
       // `extend` grows the sheet to its largest snap point, and with `enableDynamicSizing` that
@@ -423,7 +420,9 @@ function MenuSheetSurface({
           </>
         ) : (
           <>
-            {sheetTitle ? <MenuSheetHeader title={sheetTitle} onBack={null} /> : null}
+            {sheetTitle ? (
+              <MenuSheetHeader title={sheetTitle} onBack={null} trailing={sheetTrailing} />
+            ) : null}
             <MenuPage depth={0}>{children}</MenuPage>
           </>
         )}
@@ -435,9 +434,11 @@ function MenuSheetSurface({
 function MenuSheetHeader({
   title,
   onBack,
+  trailing = null,
 }: {
   title: string;
   onBack: (() => void) | null;
+  trailing?: ReactNode;
 }): ReactElement {
   const { t } = useTranslation();
   return (
@@ -457,6 +458,7 @@ function MenuSheetHeader({
       <Text style={styles.sheetTitle} numberOfLines={1}>
         {title}
       </Text>
+      {trailing ? <View style={styles.sheetTrailing}>{trailing}</View> : null}
     </View>
   );
 }
@@ -470,6 +472,11 @@ const styles = StyleSheet.create((theme) => ({
     paddingTop: theme.spacing[1],
     paddingBottom: theme.spacing[3],
   },
+  sheetTrailing: {
+    flex: 1,
+    flexDirection: "row",
+    justifyContent: "flex-end",
+  },
   sheetBackButton: {
     width: 24,
     height: 24,
diff --git a/packages/app/src/components/ui/pane-content-toolbar.test.ts b/packages/app/src/components/ui/pane-content-toolbar.test.ts
new file mode 100644
index 0000000000..81ff52f2e0
--- /dev/null
+++ b/packages/app/src/components/ui/pane-content-toolbar.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import { WORKSPACE_PANE_TRAILING_GLYPH_RAIL } from "@/components/tree-primitives";
+import { smallIconButtonChromeFrameSize } from "@/components/ui/icon-button-chrome";
+import {
+  paneContentToolbarIconSize,
+  paneContentToolbarTrailingPadding,
+} from "@/components/ui/pane-content-toolbar";
+
+/** Where the last control's painted edge lands, measured from the row's right edge. */
+function trailingInkRail(isCompact: boolean, trailing: "glyph" | "framed"): number {
+  const padding = paneContentToolbarTrailingPadding(isCompact, trailing);
+  if (trailing === "framed") return padding;
+  const frameOverhang =
+    (smallIconButtonChromeFrameSize(isCompact) - paneContentToolbarIconSize(isCompact)) / 2;
+  return padding + frameOverhang;
+}
+
+describe("pane content toolbar trailing rail", () => {
+  it("lands a bare glyph on the shared rail by letting its hitbox overhang the row", () => {
+    expect(trailingInkRail(false, "glyph")).toBe(WORKSPACE_PANE_TRAILING_GLYPH_RAIL);
+    expect(trailingInkRail(true, "glyph")).toBe(WORKSPACE_PANE_TRAILING_GLYPH_RAIL);
+    expect(paneContentToolbarTrailingPadding(true, "glyph")).toBeLessThan(
+      WORKSPACE_PANE_TRAILING_GLYPH_RAIL,
+    );
+  });
+
+  it("lands a framed control on the shared rail, because its frame is the ink", () => {
+    expect(trailingInkRail(false, "framed")).toBe(WORKSPACE_PANE_TRAILING_GLYPH_RAIL);
+    expect(trailingInkRail(true, "framed")).toBe(WORKSPACE_PANE_TRAILING_GLYPH_RAIL);
+    expect(paneContentToolbarTrailingPadding(true, "framed")).toBe(
+      WORKSPACE_PANE_TRAILING_GLYPH_RAIL,
+    );
+  });
+
+  it("pads a framed control more than a glyph, since the glyph's frame is bigger on compact", () => {
+    expect(paneContentToolbarTrailingPadding(true, "framed")).toBeGreaterThan(
+      paneContentToolbarTrailingPadding(true, "glyph"),
+    );
+    expect(paneContentToolbarTrailingPadding(false, "framed")).toBeGreaterThan(
+      paneContentToolbarTrailingPadding(false, "glyph"),
+    );
+  });
+});
diff --git a/packages/app/src/components/ui/pane-content-toolbar.tsx b/packages/app/src/components/ui/pane-content-toolbar.tsx
index 8e5be2da95..4ff947afc9 100644
--- a/packages/app/src/components/ui/pane-content-toolbar.tsx
+++ b/packages/app/src/components/ui/pane-content-toolbar.tsx
@@ -16,6 +16,7 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 import {
   iconButtonChromeGlyphSize,
   iconButtonChromeStyle,
+  useIconButtonChromeStyle,
   smallIconButtonChromeFrameSize,
 } from "@/components/ui/icon-button-chrome";
 import { WORKSPACE_PANE_TRAILING_GLYPH_RAIL } from "@/components/tree-primitives";
@@ -56,8 +57,12 @@ interface ToolbarButtonCommonProps extends Omit<
 > {
   children: ReactNode;
   label: string;
+  /** What the tooltip says when it is not the label, e.g. a status. Defaults to the label. */
+  tooltip?: ReactNode;
   selected?: boolean;
   compact?: boolean;
+  /** A circular highlight, for buttons inside a pill-shaped container. */
+  round?: boolean;
   shortcut?: ShortcutKey[][] | null;
   tooltipSide?: "left" | "right" | "top" | "bottom";
   style?: StyleProp<ViewStyle>;
@@ -76,8 +81,10 @@ type ToolbarButtonProps = ToolbarButtonCommonProps &
 export function ToolbarButton({
   children,
   label,
+  tooltip: tooltipBody,
   selected = false,
   compact = false,
+  round = false,
   shortcut,
   tooltipSide = "bottom",
   style,
@@ -87,17 +94,14 @@ export function ToolbarButton({
   testID,
   ...props
 }: ToolbarButtonProps) {
-  const buttonStyle = useMemo(
-    () => (state: { hovered?: boolean; pressed: boolean; open?: boolean }) =>
-      iconButtonChromeStyle({
-        size: "small",
-        compact,
-        state: { ...state, active: selected },
-        disabled: Boolean(disabled),
-        style,
-      }),
-    [compact, disabled, selected, style],
-  );
+  const buttonStyle = useIconButtonChromeStyle({
+    size: "small",
+    compact,
+    active: selected,
+    disabled: Boolean(disabled),
+    round,
+    style,
+  });
   const accessibilityState = useMemo(
     () => ({ disabled: Boolean(disabled), selected }),
     [disabled, selected],
@@ -105,7 +109,7 @@ export function ToolbarButton({
   const tooltip = (
     <TooltipContent side={tooltipSide} align="center" offset={8}>
       <View style={styles.tooltipRow}>
-        <Text style={styles.tooltipText}>{label}</Text>
+        {tooltipBody ?? <Text style={styles.tooltipText}>{label}</Text>}
         {shortcut ? <Shortcut chord={shortcut} /> : null}
       </View>
     </TooltipContent>
@@ -155,8 +159,26 @@ export function paneContentToolbarIconSize(isCompact: boolean): number {
   return iconButtonChromeGlyphSize("small", isCompact);
 }
 
-/** Keeps a toolbar glyph on the same trailing rail as tree-row glyphs. */
-export function paneContentToolbarTrailingPadding(isCompact: boolean): number {
+/**
+ * What the last control in a toolbar row ends with. A `glyph` control paints an icon
+ * inside a larger invisible hitbox; a `framed` control (bordered trigger, split button)
+ * paints its own frame, so the frame is the ink.
+ */
+export type ToolbarTrailingControl = "glyph" | "framed";
+
+/**
+ * Keeps the last control in a toolbar row on the same trailing rail as tree-row glyphs.
+ * A bare glyph's hitbox overhangs its ink, so the row pads by less than the rail and lets
+ * the hitbox run off the edge; a framed control's ink reaches its own edge, so it pads by
+ * the full rail.
+ */
+export function paneContentToolbarTrailingPadding(
+  isCompact: boolean,
+  trailing: ToolbarTrailingControl,
+): number {
+  if (trailing === "framed") {
+    return WORKSPACE_PANE_TRAILING_GLYPH_RAIL;
+  }
   const buttonSize = smallIconButtonChromeFrameSize(isCompact);
   return (
     WORKSPACE_PANE_TRAILING_GLYPH_RAIL - (buttonSize - paneContentToolbarIconSize(isCompact)) / 2
diff --git a/packages/app/src/components/ui/scroll-view.tsx b/packages/app/src/components/ui/scroll-view.tsx
new file mode 100644
index 0000000000..d6abed39d9
--- /dev/null
+++ b/packages/app/src/components/ui/scroll-view.tsx
@@ -0,0 +1,61 @@
+import { forwardRef, type Ref } from "react";
+import {
+  ScrollView as NativeScrollView,
+  FlatList as NativeFlatList,
+  type ScrollViewProps,
+  type FlatListProps,
+} from "react-native";
+import { BottomSheetScrollView, BottomSheetFlatList } from "@gorhom/bottom-sheet";
+import {
+  ScrollView as GestureScrollView,
+  FlatList as GestureFlatList,
+  type NativeViewGestureHandlerProps,
+} from "react-native-gesture-handler";
+import { isNative } from "@/constants/platform";
+import { useIsInsideBottomSheet } from "./bottom-sheet-scope";
+
+// Both libraries forward to the RN FlatList instance. Their published ref types
+// disagree about getScrollResponder (Gorhom) and include the component function
+// in the instance intersection (RNGH); keep that type discrepancy at this boundary.
+const SheetFlatList = BottomSheetFlatList as unknown as typeof NativeFlatList;
+const HorizontalFlatList = GestureFlatList as unknown as <Item>(
+  props: FlatListProps<Item> & NativeViewGestureHandlerProps & { ref?: Ref<NativeFlatList<Item>> },
+) => React.ReactElement;
+
+/** The presentation owns gesture integration; callers keep the React Native API. */
+export const ScrollView = forwardRef<NativeScrollView, ScrollViewProps>(
+  function ScrollView(props, ref) {
+    const inSheet = useIsInsideBottomSheet();
+    if (!inSheet) return <NativeScrollView {...props} ref={ref} />;
+    if (props.horizontal) {
+      return isNative ? (
+        <GestureScrollView {...props} ref={ref} disallowInterruption />
+      ) : (
+        <NativeScrollView {...props} ref={ref} />
+      );
+    }
+    return (
+      <BottomSheetScrollView {...props} ref={ref}>
+        {props.children}
+      </BottomSheetScrollView>
+    );
+  },
+);
+
+function SheetAwareFlatList<Item>(props: FlatListProps<Item>, ref: Ref<NativeFlatList<Item>>) {
+  const inSheet = useIsInsideBottomSheet();
+  if (!inSheet) return <NativeFlatList {...props} ref={ref} />;
+  if (props.horizontal) {
+    return isNative ? (
+      <HorizontalFlatList {...props} ref={ref} disallowInterruption />
+    ) : (
+      <NativeFlatList {...props} ref={ref} />
+    );
+  }
+  return <SheetFlatList {...props} ref={ref} />;
+}
+
+// forwardRef erases the item generic. All three implementations expose the RN list methods.
+export const FlatList = forwardRef(SheetAwareFlatList) as <Item>(
+  props: FlatListProps<Item> & { ref?: Ref<NativeFlatList<Item>> },
+) => React.ReactElement;
diff --git a/packages/app/src/components/ui/scroll-view.web.tsx b/packages/app/src/components/ui/scroll-view.web.tsx
new file mode 100644
index 0000000000..7372623b5c
--- /dev/null
+++ b/packages/app/src/components/ui/scroll-view.web.tsx
@@ -0,0 +1,3 @@
+// Web dialogs use ordinary scrolling at every breakpoint. Keep native gesture
+// dependencies out of this module's import graph.
+export { ScrollView, FlatList } from "react-native";
diff --git a/packages/app/src/components/ui/scrollable-code-surface.tsx b/packages/app/src/components/ui/scrollable-code-surface.tsx
index e55093b9d8..3b99f8bcaf 100644
--- a/packages/app/src/components/ui/scrollable-code-surface.tsx
+++ b/packages/app/src/components/ui/scrollable-code-surface.tsx
@@ -1,14 +1,8 @@
 import { useMemo, type ReactNode } from "react";
-import {
-  ScrollView,
-  Text,
-  View,
-  type StyleProp,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
+import { Text, View, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 
+import { ScrollView } from "./scroll-view";
 import { isWeb } from "@/constants/platform";
 import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
@@ -87,7 +81,7 @@ export function ScrollableCodeSurface({
     [maxHeight],
   );
   const outerScrollStyle = useMemo(
-    () => [maxHeightStyle, scrollStyle],
+    () => [styles.scroll, maxHeightStyle, scrollStyle],
     [maxHeightStyle, scrollStyle],
   );
   const contentStyle = useMemo(
@@ -108,24 +102,21 @@ export function ScrollableCodeSurface({
     <SurfaceCard
       tone={tone}
       bordered={bordered}
-      style={style}
+      style={[styles.scroll, style]}
       testID={testID}
       accessibilityLabel={accessibilityLabel}
       codeSurface
     >
-      <ScrollView
-        style={outerScrollStyle}
-        contentContainerStyle={contentStyle}
-        nestedScrollEnabled
-        showsVerticalScrollIndicator
-      >
-        {horizontal ? (
-          <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator>
-            {codeContent}
-          </ScrollView>
-        ) : (
-          codeContent
-        )}
+      <ScrollView style={outerScrollStyle} nestedScrollEnabled showsVerticalScrollIndicator>
+        <View style={contentStyle}>
+          {horizontal ? (
+            <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator>
+              {codeContent}
+            </ScrollView>
+          ) : (
+            codeContent
+          )}
+        </View>
       </ScrollView>
     </SurfaceCard>
   );
@@ -171,6 +162,10 @@ function getSurfaceStyle(tone: CodeSurfaceTone): StyleProp<ViewStyle> {
 }
 
 const styles = StyleSheet.create((theme) => ({
+  scroll: {
+    flexShrink: 1,
+    minHeight: 0,
+  },
   container: {
     overflow: "hidden",
   },
diff --git a/packages/app/src/components/ui/status-badge.browser.test.tsx b/packages/app/src/components/ui/status-badge.browser.test.tsx
index a47b5036e5..858ded8173 100644
--- a/packages/app/src/components/ui/status-badge.browser.test.tsx
+++ b/packages/app/src/components/ui/status-badge.browser.test.tsx
@@ -32,15 +32,32 @@ afterEach(() => {
   }
 });
 
+function parseColor(value: string): { rgb: string; alpha: number } {
+  const channels = value.match(/[\d.]+/g)?.map(Number) ?? [];
+  return { rgb: channels.slice(0, 3).join(","), alpha: channels[3] ?? 1 };
+}
+
 describe("StatusBadge", () => {
-  it.each(["success", "warning", "error", "muted"] as const)(
-    "uses the semantic badge shell for the %s variant",
+  it("uses the neutral badge shell for the muted variant", () => {
+    const style = getComputedStyle(mountBadge("muted"));
+
+    expect(style.backgroundColor).toBe("rgb(228, 228, 231)");
+    expect(style.borderColor).toBe("rgb(228, 228, 231)");
+  });
+
+  it.each(["success", "warning", "error"] as const)(
+    "fills the %s variant with a translucent tint of its own status color",
     (variant) => {
       const badge = mountBadge(variant);
-      const style = getComputedStyle(badge);
+      const text = badge.lastElementChild;
+      if (!(text instanceof HTMLElement)) {
+        throw new Error("StatusBadge did not render its label");
+      }
+      const fill = parseColor(getComputedStyle(badge).backgroundColor);
 
-      expect(style.backgroundColor).toBe("rgb(228, 228, 231)");
-      expect(style.borderColor).toBe("rgb(228, 228, 231)");
+      expect(fill.rgb).toBe(parseColor(getComputedStyle(text).color).rgb);
+      expect(fill.alpha).toBeGreaterThan(0);
+      expect(fill.alpha).toBeLessThan(0.5);
     },
   );
 
diff --git a/packages/app/src/components/ui/status-badge.tsx b/packages/app/src/components/ui/status-badge.tsx
index 28035d9294..c1071ac882 100644
--- a/packages/app/src/components/ui/status-badge.tsx
+++ b/packages/app/src/components/ui/status-badge.tsx
@@ -8,9 +8,21 @@ interface StatusBadgeProps {
   label: string;
   variant?: StatusBadgeVariant;
   leading?: ReactNode;
+  /** `xs` fits beside a line of `sm` text: the same label on tighter padding. */
+  size?: "sm" | "xs";
 }
 
-export function StatusBadge({ label, variant = "muted", leading }: StatusBadgeProps) {
+export function StatusBadge({ label, variant = "muted", leading, size = "sm" }: StatusBadgeProps) {
+  const pillStyle = useMemo(
+    () => [
+      styles.pill,
+      size === "xs" && styles.pillXs,
+      variant === "success" && styles.pillSuccess,
+      variant === "warning" && styles.pillWarning,
+      variant === "error" && styles.pillError,
+    ],
+    [size, variant],
+  );
   const textStyle = useMemo(
     () => [
       styles.pillText,
@@ -22,7 +34,7 @@ export function StatusBadge({ label, variant = "muted", leading }: StatusBadgePr
   );
 
   return (
-    <View style={styles.pill}>
+    <View style={pillStyle}>
       {leading}
       <Text style={textStyle}>{label}</Text>
     </View>
@@ -41,6 +53,22 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[2],
     paddingVertical: 3,
   },
+  pillXs: {
+    paddingHorizontal: theme.spacing[1.5],
+    paddingVertical: 1,
+  },
+  pillSuccess: {
+    backgroundColor: theme.colors.statusSuccessTint,
+    borderColor: "transparent",
+  },
+  pillWarning: {
+    backgroundColor: theme.colors.statusWarningTint,
+    borderColor: "transparent",
+  },
+  pillError: {
+    backgroundColor: theme.colors.statusDangerTint,
+    borderColor: "transparent",
+  },
   pillText: {
     fontSize: theme.fontSize.sm,
     fontWeight: theme.fontWeight.normal,
diff --git a/packages/app/src/components/ui/text-input/sheet-aware.tsx b/packages/app/src/components/ui/text-input/sheet-aware.tsx
new file mode 100644
index 0000000000..33539b6cbb
--- /dev/null
+++ b/packages/app/src/components/ui/text-input/sheet-aware.tsx
@@ -0,0 +1,24 @@
+import { forwardRef, useCallback } from "react";
+import { TextInput as NativeTextInput, type TextInputProps } from "react-native";
+import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
+import { isNative } from "@/constants/platform";
+import { useIsInsideBottomSheet } from "../bottom-sheet-scope";
+
+/** Registers focus with the sheet so the keyboard can move the active input into view. */
+export const SheetAwareTextInput = forwardRef<NativeTextInput, TextInputProps>(
+  function SheetAwareTextInput(props, ref) {
+    const inSheet = useIsInsideBottomSheet();
+    const setRef = useCallback(
+      (input: NativeTextInput | null | undefined) => {
+        if (typeof ref === "function") ref(input ?? null);
+        else if (ref) ref.current = input ?? null;
+      },
+      [ref],
+    );
+    return inSheet && isNative ? (
+      <BottomSheetTextInput {...props} ref={setRef} />
+    ) : (
+      <NativeTextInput {...props} ref={setRef} />
+    );
+  },
+);
diff --git a/packages/app/src/components/ui/text-input/text-input.native.test.tsx b/packages/app/src/components/ui/text-input/text-input.native.test.tsx
index a04bd89d50..b52d7b9923 100644
--- a/packages/app/src/components/ui/text-input/text-input.native.test.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.native.test.tsx
@@ -2,7 +2,7 @@
 import React, { act, createRef } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { BottomSheetTextInputScope } from "./bottom-sheet-scope";
+import { BottomSheetScope } from "@/components/ui/bottom-sheet-scope";
 import { EditingTextInput } from "./text-input.native";
 import type { EditingTextInputHandle } from "./types";
 
@@ -56,15 +56,25 @@ afterEach(() => {
 
 function noop() {}
 
+function createHandleRecorder() {
+  const handleRef = createRef<EditingTextInputHandle>();
+  const received: (EditingTextInputHandle | null)[] = [];
+  function assignHandle(handle: EditingTextInputHandle | null) {
+    received.push(handle);
+    handleRef.current = handle;
+  }
+  return { handleRef, received, assignHandle };
+}
+
 describe("EditingTextInputNative", () => {
   it("uses the bottom-sheet input only inside a bottom sheet", () => {
     act(() => {
       root?.render(
         <>
           <EditingTextInput testID="outside" />
-          <BottomSheetTextInputScope>
+          <BottomSheetScope>
             <EditingTextInput testID="inside" />
-          </BottomSheetTextInputScope>
+          </BottomSheetScope>
         </>,
       );
     });
@@ -76,6 +86,32 @@ describe("EditingTextInputNative", () => {
     expect(bottomSheetTextInputRender.mock.calls[0]?.[0]).toMatchObject({ testID: "inside" });
   });
 
+  it("keeps its editing handle and selection when native editing rerenders the leaf", () => {
+    const { handleRef, received, assignHandle } = createHandleRecorder();
+    act(() =>
+      root?.render(<EditingTextInput ref={assignHandle} initialValue="initial" multiline />),
+    );
+    const input = container?.querySelector("textarea");
+    if (!input) throw new Error("Expected native editing surface");
+    const handle = handleRef.current;
+    act(() => {
+      handle?.focus();
+      const setValue = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
+      if (!setValue) throw new Error("Expected input value setter");
+      setValue.call(input, "native edit");
+      input.setSelectionRange(2, 5);
+      input.dispatchEvent(new InputEvent("input", { bubbles: true, data: "native edit" }));
+    });
+    expect(handleRef.current).toBe(handle);
+    expect(received).toEqual([handle]);
+    expect(handle?.getText()).toBe("native edit");
+    expect([input.selectionStart, input.selectionEnd]).toEqual([2, 5]);
+    expect(document.activeElement).toBe(input);
+    act(() => root?.unmount());
+    root = null;
+    expect(received).toEqual([handle, null]);
+  });
+
   it("clears text via clear() when replaceText receives an empty string", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
@@ -92,7 +128,7 @@ describe("EditingTextInputNative", () => {
     expect(handleRef.current?.getText()).toBe("");
   });
 
-  it("replaces the native input when clearing text", () => {
+  it("replaces the native input when resetting the editor", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
     act(() => {
@@ -105,15 +141,17 @@ describe("EditingTextInputNative", () => {
       );
     });
     const grownInput = container?.querySelector("input");
+    const handle = handleRef.current;
 
     act(() => {
-      handleRef.current?.replaceText("");
+      handleRef.current?.reset();
     });
 
     expect(container?.querySelector("input")).not.toBe(grownInput);
+    expect(handleRef.current).toBe(handle);
   });
 
-  it("restores focus after replacing a cleared native input", () => {
+  it("restores focus after replacing a reset native input", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
     act(() => {
@@ -125,13 +163,13 @@ describe("EditingTextInputNative", () => {
     originalInput.focus();
 
     act(() => {
-      handleRef.current?.replaceText("");
+      handleRef.current?.reset();
     });
 
     expect(document.activeElement).toBe(container?.querySelector("input"));
   });
 
-  it("focuses the replacement input when focus is requested before a cleared input remounts", () => {
+  it("focuses the replacement input when focus is requested before an editor reset remounts", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
     act(() => {
@@ -142,7 +180,7 @@ describe("EditingTextInputNative", () => {
     const originalFocus = vi.spyOn(originalInput, "focus");
 
     act(() => {
-      handleRef.current?.replaceText("");
+      handleRef.current?.reset();
       handleRef.current?.focus();
     });
 
@@ -152,7 +190,7 @@ describe("EditingTextInputNative", () => {
     expect(document.activeElement).toBe(replacementInput);
   });
 
-  it("drops a pending focus restore when blur is requested before a cleared input remounts", () => {
+  it("drops a pending focus restore when blur is requested before an editor reset remounts", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
     act(() => {
@@ -164,7 +202,7 @@ describe("EditingTextInputNative", () => {
     originalInput.focus();
 
     act(() => {
-      handleRef.current?.replaceText("");
+      handleRef.current?.reset();
       handleRef.current?.blur();
     });
 
diff --git a/packages/app/src/components/ui/text-input/text-input.native.tsx b/packages/app/src/components/ui/text-input/text-input.native.tsx
index c505a9b917..243e813f26 100644
--- a/packages/app/src/components/ui/text-input/text-input.native.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.native.tsx
@@ -1,11 +1,18 @@
-import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from "react";
+import React, {
+  forwardRef,
+  useCallback,
+  useImperativeHandle,
+  useRef,
+  useReducer,
+  useState,
+} from "react";
 import { TextInput } from "react-native";
 import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
 import PasteInput, {
   type PastedFile,
   type PasteTextInputInstance,
 } from "@mattermost/react-native-paste-input";
-import { useIsInsideBottomSheet } from "./bottom-sheet-scope";
+import { useIsInsideBottomSheet } from "@/components/ui/bottom-sheet-scope";
 import type { EditingTextInputHandle, EditingTextInputProps } from "./types";
 
 type NativeInput = (TextInput | PasteTextInputInstance) & {
@@ -35,7 +42,8 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
     const inputRef = useRef<NativeInput | null>(null);
     const initialTextRef = useRef(initialValue);
     const textRef = useRef(initialTextRef.current);
-    // Clearing swaps the native input for a fresh instance (see replaceText).
+    // Resetting the editor swaps the native input to reset intrinsic multiline
+    // sizing. Text replacement (including an empty buffer) keeps the input mounted.
     // Until React commits that swap, `inputRef` still points at the doomed
     // instance: focusing it asks Android for the keyboard and then tears the
     // focused view down, which cancels the show. Fabric also runs view
@@ -45,6 +53,12 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
     // once the view is attached.
     const isAwaitingReplacementRef = useRef(false);
     const [replacement, setReplacement] = useState({ revision: 0, autoFocus: false });
+    // Fabric re-measures the Android input when its `text` prop changes. A native edit only
+    // refreshes a cached spannable, and batched IME deletes (Gboard hold-to-delete) leave the
+    // measured height at the previous content, so an emptied draft keeps several lines. Render
+    // again after every edit so `defaultValue` carries the current text and the input is
+    // re-measured. Only this leaf renders; the composer stays isolated from typing.
+    const [, bumpTextRevision] = useReducer((revision: number) => revision + 1, 0);
 
     const assignInputRef = useCallback((input: NativeInput | null) => {
       inputRef.current = input;
@@ -55,53 +69,62 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       setReplacement((current) => ({ ...current, autoFocus }));
     }, []);
 
-    useImperativeHandle(ref, () => ({
-      focus: () => {
-        if (isAwaitingReplacementRef.current) {
-          setReplacementFocus(true);
-          return;
-        }
-        inputRef.current?.focus();
-      },
-      blur: () => {
-        if (isAwaitingReplacementRef.current) {
-          setReplacementFocus(false);
-          return;
-        }
-        inputRef.current?.blur();
-      },
-      isFocused: () => inputRef.current?.isFocused?.() ?? false,
-      getText: () => textRef.current,
-      replaceText: (nextText, selection) => {
-        textRef.current = nextText;
-        if (nextText === "") {
-          const autoFocus = inputRef.current?.isFocused?.() ?? false;
+    useImperativeHandle(
+      ref,
+      () => ({
+        focus: () => {
+          if (isAwaitingReplacementRef.current) {
+            setReplacementFocus(true);
+            return;
+          }
+          inputRef.current?.focus();
+        },
+        blur: () => {
+          if (isAwaitingReplacementRef.current) {
+            setReplacementFocus(false);
+            return;
+          }
+          inputRef.current?.blur();
+        },
+        isFocused: () => inputRef.current?.isFocused?.() ?? false,
+        getText: () => textRef.current,
+        replaceText: (nextText, selection) => {
+          textRef.current = nextText;
           if (inputRef.current?.replaceText) {
             inputRef.current.replaceText(nextText, selection);
+            return;
+          }
+          if (nextText === "") {
+            inputRef.current?.clear?.();
+            return;
+          }
+          inputRef.current?.setNativeProps?.({
+            text: nextText,
+            ...(selection ? { selection } : {}),
+          });
+          if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
+        },
+        reset: () => {
+          textRef.current = "";
+          const autoFocus = inputRef.current?.isFocused?.() ?? false;
+          if (inputRef.current?.replaceText) {
+            inputRef.current.replaceText("");
           } else {
             inputRef.current?.clear?.();
           }
           isAwaitingReplacementRef.current = true;
           setReplacement((current) => ({ revision: current.revision + 1, autoFocus }));
-          return;
-        }
-        if (inputRef.current?.replaceText) {
-          inputRef.current.replaceText(nextText, selection);
-          return;
-        }
-        inputRef.current?.setNativeProps?.({
-          text: nextText,
-          ...(selection ? { selection } : {}),
-        });
-        if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
-      },
-      getNativeRef: () => inputRef.current?.getNativeRef?.() ?? inputRef.current,
-    }));
+        },
+        getNativeRef: () => inputRef.current?.getNativeRef?.() ?? inputRef.current,
+      }),
+      [setReplacementFocus],
+    );
 
     const handleChangeText = useCallback(
       (nextText: string) => {
         textRef.current = nextText;
         onChangeText?.(nextText);
+        bumpTextRevision();
       },
       [onChangeText],
     );
diff --git a/packages/app/src/components/ui/text-input/text-input.web.tsx b/packages/app/src/components/ui/text-input/text-input.web.tsx
index 82f2f47c07..30ee0c6eba 100644
--- a/packages/app/src/components/ui/text-input/text-input.web.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.web.tsx
@@ -57,26 +57,35 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       onChangeTextRef.current?.(nextText);
     }, []);
 
-    useImperativeHandle(ref, () => ({
-      focus: () => inputRef.current?.focus(),
-      blur: () => inputRef.current?.blur(),
-      isFocused: () => document.activeElement === inputRef.current,
-      getText: () => {
-        const input = inputRef.current as WebTextInputElement | null;
-        const nextText = input?.value ?? textRef.current;
-        textRef.current = nextText;
-        return nextText;
-      },
-      replaceText: (nextText, selection) => {
-        textRef.current = nextText;
-        const input = inputRef.current as WebTextInputElement | null;
-        if (input && "value" in input) input.value = nextText;
-        if (selection && typeof input?.setSelectionRange === "function") {
-          input.setSelectionRange(selection.start, selection.end);
-        }
-      },
-      getNativeRef: () => inputRef.current,
-    }));
+    useImperativeHandle(
+      ref,
+      () => ({
+        focus: () => inputRef.current?.focus(),
+        blur: () => inputRef.current?.blur(),
+        isFocused: () => document.activeElement === inputRef.current,
+        getText: () => {
+          const input = inputRef.current as WebTextInputElement | null;
+          const nextText = input?.value ?? textRef.current;
+          textRef.current = nextText;
+          return nextText;
+        },
+        replaceText: (nextText, selection) => {
+          textRef.current = nextText;
+          const input = inputRef.current as WebTextInputElement | null;
+          if (input && "value" in input) input.value = nextText;
+          if (selection && typeof input?.setSelectionRange === "function") {
+            input.setSelectionRange(selection.start, selection.end);
+          }
+        },
+        reset: () => {
+          textRef.current = "";
+          const input = inputRef.current as WebTextInputElement | null;
+          if (input && "value" in input) input.value = "";
+        },
+        getNativeRef: () => inputRef.current,
+      }),
+      [],
+    );
 
     return (
       <TextInput
diff --git a/packages/app/src/components/ui/text-input/types.ts b/packages/app/src/components/ui/text-input/types.ts
index 49a0f60ff6..9f746bd656 100644
--- a/packages/app/src/components/ui/text-input/types.ts
+++ b/packages/app/src/components/ui/text-input/types.ts
@@ -1,12 +1,15 @@
 import type { TextInputProps } from "react-native";
 import type { NativePastedFile } from "@/composer/native-pasted-image";
 
+/** Stable for the mounted editor lifetime; reset() owns any inner input replacement. */
 export interface EditingTextInputHandle {
   focus(): void;
   blur(): void;
   isFocused(): boolean;
   getText(): string;
   replaceText(text: string, selection?: { start: number; end: number }): void;
+  /** Clear the editor and reset its intrinsic layout, preserving focus intent. */
+  reset(): void;
   getNativeRef(): unknown;
 }
 
diff --git a/packages/app/src/components/ui/tooltip.tsx b/packages/app/src/components/ui/tooltip.tsx
index f69c4feab9..22796e7ffe 100644
--- a/packages/app/src/components/ui/tooltip.tsx
+++ b/packages/app/src/components/ui/tooltip.tsx
@@ -28,7 +28,7 @@ import { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { FloatingSurface } from "@/components/ui/floating";
-import { isWeb } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { getOverlayRoot, OVERLAY_Z } from "@/lib/overlay-root";
 
 type Side = "top" | "bottom" | "left" | "right";
@@ -248,7 +248,8 @@ export function Tooltip({
   });
 
   const isCompact = useIsCompactFormFactor();
-  const enabled = isCompact ? enabledOnMobile : enabledOnDesktop;
+  const opensOnPress = isNative || isCompact;
+  const enabled = opensOnPress ? enabledOnMobile : enabledOnDesktop;
 
   const value = useMemo<TooltipContextValue>(
     () => ({
@@ -256,10 +257,10 @@ export function Tooltip({
       setOpen: setIsOpen,
       triggerRef,
       enabled,
-      openOnPress: isCompact,
+      openOnPress: opensOnPress,
       delayDuration,
     }),
-    [isOpen, setIsOpen, enabled, isCompact, delayDuration],
+    [isOpen, setIsOpen, enabled, opensOnPress, delayDuration],
   );
 
   return <TooltipContext.Provider value={value}>{children}</TooltipContext.Provider>;
@@ -522,6 +523,7 @@ export function TooltipContent({
           entering={FadeIn.duration(80)}
           exiting={FadeOut.duration(80)}
           collapsable={false}
+          role="tooltip"
           testID={testID}
           onLayout={handleLayout}
           style={contentStyle}
@@ -542,12 +544,13 @@ export function TooltipContent({
       statusBarTranslucent={Platform.OS === "android"}
       onRequestClose={handleDismiss}
     >
-      <Pressable style={styles.overlay} onPress={handleDismiss}>
+      <Pressable testID="tooltip-dismiss" style={styles.overlay} onPress={handleDismiss}>
         <FloatingSurface
           pointerEvents="none"
           entering={FadeIn.duration(80)}
           exiting={FadeOut.duration(80)}
           collapsable={false}
+          role="tooltip"
           testID={testID}
           onLayout={handleLayout}
           style={contentStyle}
diff --git a/packages/app/src/components/workspace-hover-card.tsx b/packages/app/src/components/workspace-hover-card.tsx
index a865bfe2fa..039fec3be7 100644
--- a/packages/app/src/components/workspace-hover-card.tsx
+++ b/packages/app/src/components/workspace-hover-card.tsx
@@ -1,16 +1,12 @@
 import {
   useCallback,
-  useEffect,
-  useMemo,
-  useRef,
   useState,
   type PropsWithChildren,
   type ReactElement,
   type ReactNode,
 } from "react";
-import { Dimensions, Text, View } from "react-native";
+import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
-import { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   Check,
@@ -27,17 +23,13 @@ import type { Theme } from "@/styles/theme";
 import { DiffStat } from "@/components/diff-stat";
 import { Pressable } from "react-native";
 import type { GestureResponderEvent } from "react-native";
-import { Portal } from "@gorhom/portal";
-import { useBottomSheetModalInternal } from "@gorhom/bottom-sheet";
 import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
 import type { PrHint } from "@/git/use-pr-status-query";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { copyToClipboard } from "@/utils/copy-to-clipboard";
 import { PrBadge } from "@/components/sidebar-workspace-list";
-import { useHoverSafeZone } from "@/hooks/use-hover-safe-zone";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { FloatingSurface } from "@/components/ui/floating";
-import { isWeb } from "@/constants/platform";
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
 import { useHosts } from "@/runtime/host-runtime";
 import {
   COUNTED_CHECK_PRESENTATIONS,
@@ -48,52 +40,6 @@ import { formatCheckPresentationCountsLabel } from "@/git/check-presentation-cop
 import { CheckPresentationIcon, getCheckPresentationTone } from "@/git/check-presentation.view";
 import { buildForgeChecksUrl } from "@/git/forge-url";
 
-interface Rect {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-function measureElement(element: View): Promise<Rect> {
-  return new Promise((resolve) => {
-    element.measureInWindow((x, y, width, height) => {
-      resolve({ x, y, width, height });
-    });
-  });
-}
-
-function computeHoverCardPosition({
-  triggerRect,
-  contentSize,
-  displayArea,
-  offset,
-}: {
-  triggerRect: Rect;
-  contentSize: { width: number; height: number };
-  displayArea: Rect;
-  offset: number;
-}): { x: number; y: number } {
-  let x = triggerRect.x + triggerRect.width + offset;
-  let y = triggerRect.y;
-
-  // If it overflows right, try left
-  if (x + contentSize.width > displayArea.width - 8) {
-    x = triggerRect.x - contentSize.width - offset;
-  }
-
-  // Constrain to screen
-  const padding = 8;
-  x = Math.max(padding, Math.min(displayArea.width - contentSize.width - padding, x));
-  y = Math.max(
-    displayArea.y + padding,
-    Math.min(displayArea.y + displayArea.height - contentSize.height - padding, y),
-  );
-
-  return { x, y };
-}
-
-const HOVER_GRACE_MS = 100;
 const HOVER_CARD_WIDTH = 260;
 
 interface WorkspaceHoverCardProps {
@@ -110,237 +56,80 @@ export function WorkspaceHoverCard({
   disabled = false,
   children,
 }: PropsWithChildren<WorkspaceHoverCardProps>): ReactNode {
+  const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
 
-  if (!isWeb || isCompact) {
+  if (isCompact) {
     return children;
   }
 
   return (
-    <WorkspaceHoverCardDesktop
-      workspace={workspace}
-      prHint={prHint}
-      isDragging={isDragging}
-      disabled={disabled}
-    >
-      {children}
-    </WorkspaceHoverCardDesktop>
-  );
-}
-
-function WorkspaceHoverCardDesktop({
-  workspace,
-  prHint,
-  isDragging,
-  disabled = false,
-  children,
-}: PropsWithChildren<WorkspaceHoverCardProps>): ReactElement {
-  const triggerRef = useRef<View>(null);
-  const contentRef = useRef<View>(null);
-  const [open, setOpen] = useState(false);
-  const graceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const triggerHoveredRef = useRef(false);
-
-  const clearGraceTimer = useCallback(() => {
-    if (graceTimerRef.current) {
-      clearTimeout(graceTimerRef.current);
-      graceTimerRef.current = null;
-    }
-  }, []);
-
-  const scheduleClose = useCallback(() => {
-    if (graceTimerRef.current) return;
-    graceTimerRef.current = setTimeout(() => {
-      graceTimerRef.current = null;
-      setOpen(false);
-    }, HOVER_GRACE_MS);
-  }, []);
-
-  const handleTriggerEnter = useCallback(() => {
-    triggerHoveredRef.current = true;
-    clearGraceTimer();
-    if (!isDragging && !disabled) {
-      setOpen(true);
-    }
-  }, [clearGraceTimer, disabled, isDragging]);
-
-  const handleTriggerLeave = useCallback(() => {
-    triggerHoveredRef.current = false;
-    scheduleClose();
-  }, [scheduleClose]);
-
-  // While open, the safe zone covers trigger + content + the bridge between
-  // them. Close only fires when the pointer leaves the safe zone; re-entering
-  // it (including the bridge) cancels the pending close.
-  useHoverSafeZone({
-    enabled: open,
-    triggerRef,
-    contentRef,
-    onEnterSafeZone: clearGraceTimer,
-    onLeaveSafeZone: scheduleClose,
-  });
-
-  // Close while another row interaction owns attention.
-  useEffect(() => {
-    if (isDragging || disabled) {
-      clearGraceTimer();
-      setOpen(false);
-    }
-  }, [clearGraceTimer, disabled, isDragging]);
-
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      clearGraceTimer();
-    };
-  }, [clearGraceTimer]);
-
-  return (
-    <View
-      ref={triggerRef}
-      collapsable={false}
-      onPointerEnter={handleTriggerEnter}
-      onPointerLeave={handleTriggerLeave}
-    >
-      {children}
-      {open ? (
-        <WorkspaceHoverCardContent
-          workspace={workspace}
-          prHint={prHint}
-          triggerRef={triggerRef}
-          contentRef={contentRef}
-        />
-      ) : null}
-    </View>
+    <HoverCard disabled={isDragging || disabled}>
+      <HoverCardTrigger>{children}</HoverCardTrigger>
+      <HoverCardContent
+        placement="right"
+        role="menu"
+        accessibilityLabel={t("workspace.hoverCard.scriptsAccessibility")}
+        testID="workspace-hover-card"
+        style={styles.card}
+      >
+        <WorkspaceHoverCardContent workspace={workspace} prHint={prHint} />
+      </HoverCardContent>
+    </HoverCard>
   );
 }
 
 function WorkspaceHoverCardContent({
   workspace,
   prHint,
-  triggerRef,
-  contentRef,
 }: {
   workspace: SidebarWorkspaceEntry;
   prHint: PrHint | null;
-  triggerRef: React.RefObject<View | null>;
-  contentRef: React.RefObject<View | null>;
-}): ReactElement | null {
+}): ReactElement {
   const { t } = useTranslation();
-  const bottomSheetInternal = useBottomSheetModalInternal(true);
-  const [triggerRect, setTriggerRect] = useState<Rect | null>(null);
-  const [contentSize, setContentSize] = useState<{ width: number; height: number } | null>(null);
-  const [position, setPosition] = useState<{ x: number; y: number } | null>(null);
-
-  // Measure trigger — same pattern as tooltip.tsx
-  useEffect(() => {
-    if (!triggerRef.current) return;
-
-    let cancelled = false;
-    measureElement(triggerRef.current).then((rect) => {
-      if (cancelled) return;
-      setTriggerRect(rect);
-      return;
-    });
-
-    return () => {
-      cancelled = true;
-    };
-  }, [triggerRef]);
-
-  // Compute position when both measurements are available
-  useEffect(() => {
-    if (!triggerRect || !contentSize) return;
-    const { width: screenWidth, height: screenHeight } = Dimensions.get("window");
-    const displayArea = { x: 0, y: 0, width: screenWidth, height: screenHeight };
-    const result = computeHoverCardPosition({
-      triggerRect,
-      contentSize,
-      displayArea,
-      offset: 4,
-    });
-    setPosition(result);
-  }, [triggerRect, contentSize]);
-
-  const handleLayout = useCallback(
-    (event: { nativeEvent: { layout: { width: number; height: number } } }) => {
-      const { width, height } = event.nativeEvent.layout;
-      setContentSize({ width, height });
-    },
-    [],
-  );
-
-  const frameStyle = useMemo(
-    () => ({
-      position: "absolute" as const,
-      top: position?.y ?? -9999,
-      left: position?.x ?? -9999,
-    }),
-    [position?.x, position?.y],
-  );
-
   return (
-    <Portal hostName={bottomSheetInternal?.hostName}>
-      <View pointerEvents="box-none" style={styles.portalOverlay}>
-        <FloatingSurface
-          ref={contentRef}
-          entering={FadeIn.duration(80)}
-          exiting={FadeOut.duration(80)}
-          collapsable={false}
-          onLayout={handleLayout}
-          accessibilityRole="menu"
-          accessibilityLabel={t("workspace.hoverCard.scriptsAccessibility")}
-          testID="workspace-hover-card"
-          style={styles.card}
-          frameStyle={frameStyle}
-        >
-          <View style={styles.cardHeader}>
-            <Text style={styles.cardTitle} testID="hover-card-workspace-name">
-              {workspace.name}
-            </Text>
-          </View>
-          {prHint ? <PrBadge hint={prHint} style={styles.cardInfoRow} /> : null}
-          {workspace.diffStat ? (
-            <View style={styles.cardInfoRow}>
-              <ThemedFileDiff size={12} uniProps={foregroundMutedColorMapping} />
-              <DiffStat
-                additions={workspace.diffStat.additions}
-                deletions={workspace.diffStat.deletions}
-              />
-            </View>
-          ) : null}
-          <HostRow serverId={workspace.serverId} />
-          {workspace.currentBranch ? (
-            <CopyableInfoRow
-              icon={ThemedGitBranch}
-              value={workspace.currentBranch}
-              copyValue={workspace.currentBranch}
-              copyLabel={t("workspace.hoverCard.copyBranchName")}
-              testID="hover-card-workspace-branch"
-            />
-          ) : null}
-          {workspace.workspaceDirectoryLabel ? (
-            <CopyableInfoRow
-              icon={ThemedFolder}
-              value={workspace.workspaceDirectoryLabel}
-              copyValue={workspace.workspaceDirectory}
-              copyLabel={t("workspace.hoverCard.copyPath")}
-              testID="hover-card-workspace-cwd"
-            />
-          ) : null}
-          {prHint?.checks && prHint.checks.length > 0 ? (
-            <>
-              <View style={styles.separator} />
-              <ChecksSummaryPressable
-                checks={prHint.checks}
-                url={prHint.url}
-                forge={prHint.forge}
-              />
-            </>
-          ) : null}
-        </FloatingSurface>
+    <>
+      <View style={styles.cardHeader}>
+        <Text style={styles.cardTitle} testID="hover-card-workspace-name">
+          {workspace.name}
+        </Text>
       </View>
-    </Portal>
+      {prHint ? <PrBadge hint={prHint} style={styles.cardInfoRow} /> : null}
+      {workspace.diffStat ? (
+        <View style={styles.cardInfoRow}>
+          <ThemedFileDiff size={12} uniProps={foregroundMutedColorMapping} />
+          <DiffStat
+            additions={workspace.diffStat.additions}
+            deletions={workspace.diffStat.deletions}
+          />
+        </View>
+      ) : null}
+      <HostRow serverId={workspace.serverId} />
+      {workspace.currentBranch ? (
+        <CopyableInfoRow
+          icon={ThemedGitBranch}
+          value={workspace.currentBranch}
+          copyValue={workspace.currentBranch}
+          copyLabel={t("workspace.hoverCard.copyBranchName")}
+          testID="hover-card-workspace-branch"
+        />
+      ) : null}
+      {workspace.workspaceDirectoryLabel ? (
+        <CopyableInfoRow
+          icon={ThemedFolder}
+          value={workspace.workspaceDirectoryLabel}
+          copyValue={workspace.workspaceDirectory}
+          copyLabel={t("workspace.hoverCard.copyPath")}
+          testID="hover-card-workspace-cwd"
+        />
+      ) : null}
+      {prHint?.checks && prHint.checks.length > 0 ? (
+        <>
+          <View style={styles.separator} />
+          <ChecksSummaryPressable checks={prHint.checks} url={prHint.url} forge={prHint.forge} />
+        </>
+      ) : null}
+    </>
   );
 }
 
@@ -561,14 +350,6 @@ function checksSummaryPressableStyle({ hovered = false }: { pressed: boolean; ho
 }
 
 const styles = StyleSheet.create((theme) => ({
-  portalOverlay: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-    zIndex: 1000,
-  },
   card: {
     backgroundColor: theme.colors.surface1,
     borderWidth: 1,
@@ -581,7 +362,6 @@ const styles = StyleSheet.create((theme) => ({
     shadowOpacity: 0.2,
     shadowRadius: 8,
     elevation: 8,
-    zIndex: 1000,
   },
   cardHeader: {
     flexDirection: "row",
diff --git a/packages/app/src/components/workspace-setup-dialog.tsx b/packages/app/src/components/workspace-setup-dialog.tsx
index 4dabf067ba..1954394176 100644
--- a/packages/app/src/components/workspace-setup-dialog.tsx
+++ b/packages/app/src/components/workspace-setup-dialog.tsx
@@ -1,8 +1,11 @@
+import { KeyboardTranslateView } from "@/keyboard/shift";
+import type { CreateWorkspaceRequestOptions } from "@getpaseo/client/internal/daemon-client";
+import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
-import { createNameId } from "mnemonic-id";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { Composer } from "@/composer";
@@ -12,7 +15,11 @@ import { useToast } from "@/contexts/toast-context";
 import { useAgentInputDraft } from "@/composer/draft/input-draft";
 import { useProjectIcon } from "@/projects/icons";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { normalizeWorkspaceDescriptor, useSessionStore } from "@/stores/session-store";
+import {
+  normalizeWorkspaceDescriptor,
+  useSessionStore,
+  type WorkspaceDescriptor,
+} from "@/stores/session-store";
 import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { applyLegacyDaemonWorkspaceOwnership } from "@/workspace/legacy-daemon-workspaces";
@@ -27,7 +34,6 @@ import type {
   DaemonClient,
 } from "@getpaseo/client/internal/daemon-client";
 import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
-import { requireWorkspaceDirectory } from "@/utils/workspace-directory";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
 import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
 import type { MessagePayload } from "@/composer/types";
@@ -61,25 +67,18 @@ function resolveWorkspaceTitle({
 
 function buildChatDraftComposerArgs({
   serverId,
-  isConnected,
   workspaceDirectory,
   sourceDirectory,
   pendingWorkspaceSetup,
 }: {
   serverId: string;
-  isConnected: boolean;
   workspaceDirectory: string | undefined;
   sourceDirectory: string;
   pendingWorkspaceSetup: { creationMethod: string } | null;
 }) {
   return {
     initialServerId: serverId || null,
-    initialValues:
-      workspaceDirectory || sourceDirectory
-        ? { workingDir: workspaceDirectory || sourceDirectory }
-        : undefined,
     isVisible: pendingWorkspaceSetup !== null,
-    onlineServerIds: isConnected && serverId ? [serverId] : [],
     lockedWorkingDir: workspaceDirectory || sourceDirectory || undefined,
   };
 }
@@ -87,20 +86,23 @@ function buildChatDraftComposerArgs({
 async function callWorkspaceCreation({
   creationMethod,
   connectedClient,
+  creationId,
+  worktreeSlug,
   input,
 }: {
   creationMethod: "create_worktree" | "open_project";
   connectedClient: DaemonClient;
-  input: { cwd: string };
+  creationId: string;
+  worktreeSlug: string;
+  input: { cwd: string; agent?: CreateWorkspaceRequestOptions["agent"] };
 }) {
-  if (creationMethod === "create_worktree") {
-    return connectedClient.createPaseoWorktree({
-      cwd: input.cwd,
-      worktreeSlug: createNameId(),
-    });
-  }
   return connectedClient.createWorkspace({
-    source: { kind: "directory", path: input.cwd },
+    idempotencyKey: creationId,
+    agent: input.agent,
+    source:
+      creationMethod === "create_worktree"
+        ? { kind: "worktree", cwd: input.cwd, worktreeSlug }
+        : { kind: "directory", path: input.cwd },
   });
 }
 
@@ -164,9 +166,13 @@ export function WorkspaceSetupDialog() {
   const toast = useToast();
   const pendingWorkspaceSetup = useWorkspaceSetupStore((state) => state.pendingWorkspaceSetup);
   const clearWorkspaceSetup = useWorkspaceSetupStore((state) => state.clearWorkspaceSetup);
-  const mergeWorkspaces = useSessionStore((state) => state.mergeWorkspaces);
+  const mergeWorkspaces = useCallback(
+    (targetServerId: string, workspaces: Iterable<WorkspaceDescriptor>) => {
+      getHostRuntimeStore().acceptWorkspaceSnapshots(targetServerId, Array.from(workspaces));
+    },
+    [],
+  );
   const setHasHydratedWorkspaces = useSessionStore((state) => state.setHasHydratedWorkspaces);
-  const setAgents = useSessionStore((state) => state.setAgents);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [createdWorkspace, setCreatedWorkspace] = useState<ReturnType<
     typeof normalizeWorkspaceDescriptor
@@ -186,7 +192,6 @@ export function WorkspaceSetupDialog() {
     draftKey: `workspace-setup:${serverId}:${sourceDirectory}`,
     composer: buildChatDraftComposerArgs({
       serverId,
-      isConnected,
       workspaceDirectory: workspace?.workspaceDirectory,
       sourceDirectory,
       pendingWorkspaceSetup,
@@ -207,7 +212,7 @@ export function WorkspaceSetupDialog() {
     setErrorMessage(null);
     setCreatedWorkspace(null);
     setPendingAction(null);
-  }, [pendingWorkspaceSetup?.creationMethod, serverId, sourceDirectory]);
+  }, [pendingWorkspaceSetup?.creationId]);
 
   const handleClose = useCallback(() => {
     clearWorkspaceSetup();
@@ -248,18 +253,25 @@ export function WorkspaceSetupDialog() {
   }, [client, isConnected, t]);
 
   const ensureWorkspace = useCallback(
-    async (input: { cwd: string; attachments: MessagePayload["attachments"] }) => {
+    async (input: {
+      cwd: string;
+      attachments: MessagePayload["attachments"];
+      agent?: CreateWorkspaceRequestOptions["agent"];
+      onAgentCreated?: (agent: AgentSnapshotPayload) => void;
+    }) => {
       if (!pendingWorkspaceSetup) {
         throw new Error(t("workspaceSetup.errors.pendingRequired"));
       }
 
-      if (createdWorkspace) {
+      if (createdWorkspace && !input.agent) {
         return createdWorkspace;
       }
 
       const connectedClient = withConnectedClient();
       const payload = await callWorkspaceCreation({
         creationMethod: pendingWorkspaceSetup.creationMethod,
+        creationId: pendingWorkspaceSetup.creationId,
+        worktreeSlug: pendingWorkspaceSetup.worktreeSlug,
         connectedClient,
         input,
       });
@@ -270,6 +282,7 @@ export function WorkspaceSetupDialog() {
         );
       }
 
+      if (payload.agent) input.onAgentCreated?.(payload.agent);
       const normalizedWorkspace = normalizeWorkspaceDescriptor(payload.workspace);
       mergeWorkspaces(pendingWorkspaceSetup.serverId, [normalizedWorkspace]);
       if (pendingWorkspaceSetup.creationMethod === "open_project") {
@@ -306,8 +319,7 @@ export function WorkspaceSetupDialog() {
       try {
         setPendingAction("chat");
         setErrorMessage(null);
-        const ensuredWorkspace = await ensureWorkspace({ cwd, attachments });
-        const connectedClient = withConnectedClient();
+
         if (!composerState) {
           throw new Error(t("workspaceSetup.errors.composerStateRequired"));
         }
@@ -321,37 +333,42 @@ export function WorkspaceSetupDialog() {
           }),
         });
         const encodedImages = await encodeImages(wirePayload.images);
-        const workspaceDirectory = requireWorkspaceDirectory({
-          workspaceId: ensuredWorkspace.id,
-          workspaceDirectory: ensuredWorkspace.workspaceDirectory,
+        if (!pendingWorkspaceSetup) throw new Error(t("workspaceSetup.errors.pendingRequired"));
+        let createdAgent: AgentSnapshotPayload | undefined;
+        const { workspaceId: _workspaceId, ...agentInput } = buildCreateAgentOptions({
+          composerState,
+          text,
+          attachments: wirePayload.attachments,
+          encodedImages: encodedImages ?? null,
+          workspaceDirectory: cwd,
+          workspaceId: "",
+          provider: composerState.selectedProvider,
         });
-        const agent = await connectedClient.createAgent(
-          buildCreateAgentOptions({
-            composerState,
-            text,
-            attachments: wirePayload.attachments,
-            encodedImages: encodedImages ?? null,
-            workspaceDirectory,
-            workspaceId: ensuredWorkspace.id,
-            provider: composerState.selectedProvider,
-          }),
-        );
+        const ensuredWorkspace = await ensureWorkspace({
+          cwd,
+          attachments,
+          agent: {
+            ...agentInput,
+            clientMessageId: `${pendingWorkspaceSetup.creationId}:initial-message`,
+          },
+          onAgentCreated: (value) => {
+            createdAgent = value;
+          },
+        });
+        if (!createdAgent) throw new Error("The daemon did not create the requested agent");
+        const agent = createdAgent;
 
         if (!getIsStillActive()) {
           return;
         }
 
-        setAgents(serverId, (previous) => {
-          const next = new Map(previous);
-          next.set(
-            agent.id,
-            applyLegacyDaemonWorkspaceOwnership({
-              serverId,
-              agent: normalizeAgentSnapshot(agent, serverId),
-            }),
-          );
-          return next;
-        });
+        getHostRuntimeStore().acceptAgentSnapshot(
+          serverId,
+          applyLegacyDaemonWorkspaceOwnership({
+            serverId,
+            agent: normalizeAgentSnapshot(agent, serverId),
+          }),
+        );
         navigateAfterCreation(ensuredWorkspace.id, { kind: "agent", agentId: agent.id });
       } catch (error) {
         const message = toErrorMessage(error);
@@ -365,14 +382,13 @@ export function WorkspaceSetupDialog() {
     },
     [
       composerState,
+      pendingWorkspaceSetup,
       getIsStillActive,
       navigateAfterCreation,
       serverId,
-      setAgents,
       ensureWorkspace,
       t,
       toast,
-      withConnectedClient,
       supportsForgeSearch,
     ],
   );
@@ -430,25 +446,27 @@ export function WorkspaceSetupDialog() {
       desktopMaxWidth={640}
     >
       <FileDropZone style={styles.section}>
-        <Composer
-          agentId={`workspace-setup:${serverId}:${sourceDirectory}`}
-          serverId={serverId}
-          isPaneFocused={true}
-          onSubmitMessage={handleCreateChatAgent}
-          isSubmitLoading={pendingAction === "chat"}
-          blurOnSubmit={true}
-          value={chatDraft.text}
-          onChangeText={chatDraft.editText}
-          textReplacement={chatDraft.textReplacement}
-          attachments={chatDraft.attachments}
-          onChangeAttachments={chatDraft.setAttachments}
-          cwd={sourceDirectory}
-          clearDraft={chatDraft.clear}
-          autoFocus
-          commandDraftConfig={composerState?.commandDraftConfig}
-          agentControls={agentControlsWithDisabled}
-          inputWrapperStyle={styles.composerInputWrapper}
-        />
+        <KeyboardTranslateView>
+          <Composer
+            agentId={`workspace-setup:${serverId}:${sourceDirectory}`}
+            serverId={serverId}
+            isPaneFocused={true}
+            onSubmitMessage={handleCreateChatAgent}
+            isSubmitLoading={pendingAction === "chat"}
+            blurOnSubmit={true}
+            textSource={chatDraft.textSource}
+            onChangeText={chatDraft.editText}
+            textReplacement={chatDraft.textReplacement}
+            attachments={chatDraft.attachments}
+            onChangeAttachments={chatDraft.setAttachments}
+            cwd={sourceDirectory}
+            clearDraft={chatDraft.clear}
+            autoFocus
+            commandDraft={composerState?.commandDraft}
+            agentControls={agentControlsWithDisabled}
+            inputWrapperStyle={styles.composerInputWrapper}
+          />
+        </KeyboardTranslateView>
       </FileDropZone>
 
       {errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
diff --git a/packages/app/src/components/workspace-shortcut-targets-subscriber.test.tsx b/packages/app/src/components/workspace-shortcut-targets-subscriber.test.tsx
index 2cceeae961..7124fd2f0a 100644
--- a/packages/app/src/components/workspace-shortcut-targets-subscriber.test.tsx
+++ b/packages/app/src/components/workspace-shortcut-targets-subscriber.test.tsx
@@ -9,7 +9,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
-import { seedSessionWorkspaces } from "@/test/seed-session";
+import { seedRuntimeWorkspaces } from "@/test/seed-session";
 import { useSidebarCollapsedSectionsStore } from "@/stores/sidebar-collapsed-sections-store";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
 import { useSidebarViewStore } from "@/stores/sidebar-view-store";
@@ -96,7 +96,7 @@ describe("WorkspaceShortcutTargetsSubscriber", () => {
     act(() => {
       setHostProfiles([hostProfile()]);
       useSessionStore.getState().initializeSession("srv", null as unknown as DaemonClient);
-      seedSessionWorkspaces(
+      seedRuntimeWorkspaces(
         "srv",
         new Map([
           ["ws-1", workspaceDescriptor({ id: "ws-1", name: "Workspace 1" })],
@@ -142,7 +142,7 @@ describe("WorkspaceShortcutTargetsSubscriber", () => {
   it("publishes status-mode shortcut targets in visual status order", async () => {
     act(() => {
       useSidebarViewStore.getState().setGroupMode("status");
-      seedSessionWorkspaces(
+      seedRuntimeWorkspaces(
         "srv",
         new Map([
           [
@@ -214,11 +214,11 @@ describe("WorkspaceShortcutTargetsSubscriber", () => {
       setHostProfiles([hostProfile("host-a"), hostProfile("host-b")]);
       useSessionStore.getState().initializeSession("host-a", null as unknown as DaemonClient);
       useSessionStore.getState().initializeSession("host-b", null as unknown as DaemonClient);
-      seedSessionWorkspaces(
+      seedRuntimeWorkspaces(
         "host-a",
         new Map([["a-1", workspaceDescriptor({ id: "a-1", name: "Host A" })]]),
       );
-      seedSessionWorkspaces(
+      seedRuntimeWorkspaces(
         "host-b",
         new Map([["b-1", workspaceDescriptor({ id: "b-1", name: "Host B" })]]),
       );
diff --git a/packages/app/src/composer/actions.test.ts b/packages/app/src/composer/actions.test.ts
index 688ef99925..697f848a09 100644
--- a/packages/app/src/composer/actions.test.ts
+++ b/packages/app/src/composer/actions.test.ts
@@ -18,6 +18,7 @@ import {
   type MessageSubmissionRecord,
 } from "@/composer/submission/model";
 import {
+  uploadFileAttachments,
   cancelComposerAgent,
   dispatchComposerAgentMessage,
   editQueuedComposerMessage,
@@ -1039,3 +1040,86 @@ describe("findForgeItemByOption / isAttachmentSelectedForForgeItem", () => {
     expect(isAttachmentSelectedForForgeItem(attachments, prItem)).toBe(false);
   });
 });
+
+describe("file upload preparation", () => {
+  it("waits for file bytes and daemon acknowledgement before returning the attachment", async () => {
+    let resolveRead!: (bytes: Uint8Array) => void;
+    const read = new Promise<Uint8Array>((resolve) => {
+      resolveRead = resolve;
+    });
+    let acknowledge!: (result: Awaited<ReturnType<ComposerSendClient["uploadFile"]>>) => void;
+    const response = new Promise<Awaited<ReturnType<ComposerSendClient["uploadFile"]>>>(
+      (resolve) => {
+        acknowledge = resolve;
+      },
+    );
+    const sent: string[] = [];
+    const upload = uploadFileAttachments({
+      client: {
+        sendAgentMessage: async () => {},
+        uploadFile: async (file) => {
+          sent.push(file.fileName);
+          expect(file.bytes).toEqual(new Uint8Array([1, 2]));
+          return response;
+        },
+      },
+      files: [
+        { fileName: "sample.bin", mimeType: "application/octet-stream", readBytes: () => read },
+      ],
+    });
+    let completed = false;
+    void upload.then(() => {
+      completed = true;
+      return undefined;
+    });
+    expect(sent).toEqual([]);
+    resolveRead(new Uint8Array([1, 2]));
+    await Promise.resolve();
+    expect(sent).toEqual(["sample.bin"]);
+    expect(completed).toBe(false);
+    const file = {
+      type: "uploaded_file" as const,
+      id: "file-1",
+      fileName: "sample.bin",
+      mimeType: "application/octet-stream",
+      size: 2,
+      path: "/uploads/sample.bin",
+    };
+    acknowledge({ requestId: "req-1", file, error: null });
+    await expect(upload).resolves.toEqual([{ kind: "file", attachment: file }]);
+  });
+
+  it.each(["unreadable", "oversized"])(
+    "does not upload a batch containing a later %s file",
+    async (failure) => {
+      let sends = 0;
+      await expect(
+        uploadFileAttachments({
+          client: {
+            sendAgentMessage: async () => {},
+            uploadFile: async () => {
+              sends++;
+              throw new Error("unexpected send");
+            },
+          },
+          files: [
+            {
+              fileName: "valid.bin",
+              mimeType: "application/octet-stream",
+              readBytes: async () => new Uint8Array([1]),
+            },
+            {
+              fileName: "missing.bin",
+              mimeType: "application/octet-stream",
+              readBytes: async () => {
+                if (failure === "oversized") return new Uint8Array(50 * 1024 * 1024 + 1);
+                throw new Error("read failed");
+              },
+            },
+          ],
+        }),
+      ).rejects.toThrow(failure === "unreadable" ? "read failed" : "too large");
+      expect(sends).toBe(0);
+    },
+  );
+});
diff --git a/packages/app/src/composer/actions.ts b/packages/app/src/composer/actions.ts
index d020e7b6b0..4ae1764a02 100644
--- a/packages/app/src/composer/actions.ts
+++ b/packages/app/src/composer/actions.ts
@@ -1,3 +1,4 @@
+import type { SelectedFile } from "@/attachments/selected-file";
 import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
 import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
 import type {
@@ -123,11 +124,26 @@ export async function pickAndPersistImages(input: {
 
 export async function uploadFileAttachments(input: {
   client: ComposerSendClient;
-  files: Array<{ fileName: string; mimeType: string; bytes: Uint8Array }>;
+  files: SelectedFile[];
 }): Promise<Extract<ComposerAttachment, { kind: "file" }>[]> {
   const result: Extract<ComposerAttachment, { kind: "file" }>[] = [];
+  const prepared: Array<{ fileName: string; mimeType: string; bytes: Uint8Array }> = [];
 
   for (const file of input.files) {
+    const bytes = await file.readBytes();
+    if (bytes.byteLength > 50 * 1024 * 1024) {
+      throw new Error(
+        i18n.t("composer.errors.fileTooLarge", { size: "50MB", fileName: file.fileName }),
+      );
+    }
+    prepared.push({
+      fileName: file.fileName,
+      mimeType: file.mimeType,
+      bytes,
+    });
+  }
+
+  for (const file of prepared) {
     const response = await input.client.uploadFile(file);
     if (response.error || !response.file) {
       throw new Error(response.error ?? "Upload failed.");
diff --git a/packages/app/src/composer/agent-controls/index.tsx b/packages/app/src/composer/agent-controls/index.tsx
index 32941e46e7..72795289cf 100644
--- a/packages/app/src/composer/agent-controls/index.tsx
+++ b/packages/app/src/composer/agent-controls/index.tsx
@@ -55,6 +55,7 @@ import type {
 import type { AgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";
 import {
   getFeatureHighlightColor,
+  isFeatureActive,
   getFeatureTooltip,
   getAgentControlHintKey,
   resolveAgentModelSelection,
@@ -211,8 +212,7 @@ function getModeProviderDefinitions(modeControl: AgentModeControlValue | null) {
 }
 
 function getFeatureIconColor(
-  featureId: string,
-  enabled: boolean,
+  feature: AgentFeature,
   palette: {
     blue: { 400: string };
     green: { 400: string };
@@ -220,11 +220,11 @@ function getFeatureIconColor(
   },
   foregroundMuted: string,
 ): string {
-  if (!enabled) {
+  if (!isFeatureActive(feature)) {
     return foregroundMuted;
   }
 
-  switch (getFeatureHighlightColor(featureId)) {
+  switch (getFeatureHighlightColor(feature.id)) {
     case "blue":
       return palette.blue[400];
     case "green":
@@ -394,6 +394,7 @@ type AgentControlsSlice = {
   runtimeModelId: string | null;
   model: string | null | undefined;
   features: AgentFeature[] | undefined;
+  runtimeThinkingOptionId: string | null;
   thinkingOptionId: string | null | undefined;
   lastUsage: unknown;
 } | null;
@@ -413,6 +414,7 @@ function selectAgentControlsSlice(
     runtimeModelId: currentAgent.runtimeInfo?.model ?? null,
     model: currentAgent.model,
     features: currentAgent.features,
+    runtimeThinkingOptionId: currentAgent.runtimeInfo?.thinkingOptionId ?? null,
     thinkingOptionId: currentAgent.thinkingOptionId,
     lastUsage: currentAgent.lastUsage,
   };
@@ -1333,8 +1335,7 @@ function DesktopFeatureItem({
           <AgentControlTrigger
             icon={FeatureIcon}
             iconColor={getFeatureIconColor(
-              feature.id,
-              feature.value,
+              feature,
               theme.colors.palette,
               theme.colors.foregroundMuted,
             )}
@@ -1357,6 +1358,10 @@ function DesktopFeatureItem({
   if (feature.type === "select") {
     const FeatureIcon = getAgentFeatureIcon(feature.icon);
     const selectedOption = feature.options.find((o) => o.id === feature.value);
+    const iconOnly = feature.desktopTrigger === "icon";
+    const tooltip = iconOnly
+      ? `${feature.label}: ${selectedOption?.label ?? feature.label}`
+      : getFeatureTooltip(feature);
     return (
       <>
         <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
@@ -1364,18 +1369,24 @@ function DesktopFeatureItem({
             <AgentControlTrigger
               ref={featureAnchorRef}
               icon={FeatureIcon}
+              iconColor={getFeatureIconColor(
+                feature,
+                theme.colors.palette,
+                theme.colors.foregroundMuted,
+              )}
               surface="toolbar"
               label={feature.label}
               value={selectedOption?.label ?? feature.label}
+              showToolbarLabel={!iconOnly}
               open={openSelector === featureSelector}
               disabled={disabled}
               onPress={handleSelectPress}
-              accessibilityLabel={getFeatureTooltip(feature)}
+              accessibilityLabel={tooltip}
               testID={`agent-feature-${feature.id}`}
             />
           </TooltipTrigger>
           <TooltipContent side="top" align="center" offset={8}>
-            <Text style={styles.tooltipText}>{getFeatureTooltip(feature)}</Text>
+            <Text style={styles.tooltipText}>{tooltip}</Text>
           </TooltipContent>
         </Tooltip>
         <Combobox
@@ -1446,8 +1457,7 @@ function SheetFeatureItem({
           ref={featureAnchorRef}
           icon={FeatureIcon}
           iconColor={getFeatureIconColor(
-            feature.id,
-            feature.value,
+            feature,
             theme.colors.palette,
             theme.colors.foregroundMuted,
           )}
@@ -1483,6 +1493,11 @@ function SheetFeatureItem({
         <AgentControlTrigger
           ref={featureAnchorRef}
           icon={FeatureIcon}
+          iconColor={getFeatureIconColor(
+            feature,
+            theme.colors.palette,
+            theme.colors.foregroundMuted,
+          )}
           surface="sheet"
           label={feature.label}
           value={selectedOption?.label ?? feature.label}
@@ -1589,6 +1604,7 @@ export const AgentControls = memo(function AgentControls({
     models,
     runtimeModelId: agent?.runtimeModelId,
     configuredModelId: agent?.model,
+    runtimeThinkingOptionId: agent?.runtimeThinkingOptionId,
     explicitThinkingOptionId: agent?.thinkingOptionId,
   });
 
@@ -1788,7 +1804,7 @@ export const AgentControls = memo(function AgentControls({
         onEditAgentProfiles={handleEditAgentProfiles}
         onCreateAgentProfile={profileActions.create}
         onEditAgentProfile={profileActions.edit}
-        thinkingOptions={thinkingOptions.length > 1 ? thinkingOptions : undefined}
+        thinkingOptions={thinkingOptions.length > 0 ? thinkingOptions : undefined}
         selectedThinkingOptionId={modelSelection.selectedThinkingId ?? undefined}
         onSelectThinkingOption={handleSelectThinkingOption}
         features={agent.features}
diff --git a/packages/app/src/composer/agent-controls/model-sheet.tsx b/packages/app/src/composer/agent-controls/model-sheet.tsx
index bd55e72c55..6929b447ea 100644
--- a/packages/app/src/composer/agent-controls/model-sheet.tsx
+++ b/packages/app/src/composer/agent-controls/model-sheet.tsx
@@ -2,12 +2,11 @@ import { useCallback, useMemo, useState, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { Keyboard, ScrollView, Text, View, type PressableStateCallbackType } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { Bot } from "lucide-react-native";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { AgentProfilePicker, AgentProfileSeed } from "@/agent-profiles";
 import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
 import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { ModelBrowser, useModelBrowser } from "@/components/model-browser";
 import { resolveModelBrowserScrolling } from "@/components/model-browser-view";
 import { AgentControlTrigger } from "@/composer/agent-controls/control";
@@ -130,9 +129,8 @@ export function CompactModelSheet({
     profiles,
     serverId,
   });
-  const ProviderIcon =
-    selectedProvider.trim().length > 0 ? getProviderIcon(selectedProvider) : null;
-  const ModelIcon = ProviderIcon ?? Bot;
+  const ModelIcon = useProviderIcon(selectedProvider, serverId);
+  const hasSelectedProvider = selectedProvider.trim().length > 0;
   const rootHeader = useMemo(
     () => ({
       ...rootBrowser.header,
@@ -277,9 +275,9 @@ export function CompactModelSheet({
         testID="combined-model-selector"
         chevron={null}
       >
-        {ProviderIcon ? (
+        {hasSelectedProvider ? (
           <ComposerToolbarGlyph size={glyphSize}>
-            <ProviderIcon size={glyphSize} color={styles.providerIcon.color} />
+            <ModelIcon size={glyphSize} color={styles.providerIcon.color} />
           </ComposerToolbarGlyph>
         ) : null}
         <View style={styles.triggerLabels}>
@@ -300,7 +298,6 @@ export function CompactModelSheet({
         onClose={close}
         snapPoints={SNAP_POINTS}
         scrollable={false}
-        sizeContentToCurrentSnapPoint={usesBottomSheet}
         contentStyle={styles.sheetBody}
         testID="agent-controls-model-sheet"
       >
@@ -348,7 +345,6 @@ export function CompactModelSheet({
           onClose={closeModelBrowser}
           snapPoints={SNAP_POINTS}
           scrollable={false}
-          sizeContentToCurrentSnapPoint
           presentation="push"
           contentStyle={styles.sheetBody}
           testID="agent-controls-model-browser-sheet"
diff --git a/packages/app/src/composer/agent-controls/utils.test.ts b/packages/app/src/composer/agent-controls/utils.test.ts
index 5b566fdeb4..dfacec0ec7 100644
--- a/packages/app/src/composer/agent-controls/utils.test.ts
+++ b/packages/app/src/composer/agent-controls/utils.test.ts
@@ -3,6 +3,7 @@ import {
   getFeatureHighlightColor,
   getFeatureTooltip,
   getAgentControlHintKey,
+  isFeatureActive,
   normalizeModelId,
   resolveAgentModelSelection,
 } from "./utils";
@@ -35,9 +36,32 @@ describe("feature metadata helpers", () => {
 
   it("maps feature highlight colors by feature id", () => {
     expect(getFeatureHighlightColor("fast_mode")).toBe("yellow");
+    expect(getFeatureHighlightColor("service_tier")).toBe("yellow");
     expect(getFeatureHighlightColor("plan_mode")).toBe("blue");
     expect(getFeatureHighlightColor("other")).toBe("default");
   });
+
+  it("treats a select feature as active when a non-default option is selected", () => {
+    const speed = {
+      type: "select" as const,
+      id: "service_tier",
+      label: "Speed",
+      options: [
+        { id: "default", label: "Normal", isDefault: true },
+        { id: "fast", label: "Fast" },
+      ],
+    };
+    expect(isFeatureActive({ ...speed, value: "default" })).toBe(false);
+    expect(isFeatureActive({ ...speed, value: "fast" })).toBe(true);
+    expect(
+      isFeatureActive({
+        type: "toggle",
+        id: "fast_mode",
+        label: "Fast",
+        value: true,
+      }),
+    ).toBe(true);
+  });
 });
 
 describe("normalizeModelId", () => {
@@ -67,6 +91,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: null,
       configuredModelId: "claude-fable-5[1m]",
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: null,
     });
 
@@ -88,6 +113,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: "a",
       configuredModelId: "b",
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: null,
     });
 
@@ -112,6 +138,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: "a",
       configuredModelId: null,
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: "high",
     });
 
@@ -119,6 +146,54 @@ describe("resolveAgentModelSelection", () => {
     expect(selection.displayThinking).toBe("High");
   });
 
+  it("shows the thinking level the agent runs on when none was chosen", () => {
+    const selection = resolveAgentModelSelection({
+      models: [
+        {
+          id: "openrouter/google/gemini-3.6-flash",
+          provider: "pi",
+          label: "Gemini 3.6 Flash",
+          thinkingOptions: [
+            { id: "low", label: "Low" },
+            { id: "medium", label: "Medium", isDefault: true },
+            { id: "high", label: "High" },
+          ],
+          defaultThinkingOptionId: "medium",
+        },
+      ],
+      runtimeModelId: "openrouter/google/gemini-3.6-flash",
+      configuredModelId: null,
+      runtimeThinkingOptionId: "high",
+      explicitThinkingOptionId: null,
+    });
+
+    expect(selection.selectedThinkingId).toBe("high");
+    expect(selection.displayThinking).toBe("High");
+  });
+
+  it("falls back to the chosen thinking level when the runtime level is not a model option", () => {
+    const selection = resolveAgentModelSelection({
+      models: [
+        {
+          id: "a",
+          provider: "codex",
+          label: "Model A",
+          thinkingOptions: [
+            { id: "low", label: "Low" },
+            { id: "high", label: "High" },
+          ],
+          defaultThinkingOptionId: "low",
+        },
+      ],
+      runtimeModelId: "a",
+      configuredModelId: null,
+      runtimeThinkingOptionId: "xhigh",
+      explicitThinkingOptionId: "high",
+    });
+
+    expect(selection.selectedThinkingId).toBe("high");
+  });
+
   it("formats raw thinking labels in the selected model display", () => {
     const selection = resolveAgentModelSelection({
       models: [
@@ -134,6 +209,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: "a",
       configuredModelId: null,
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: "xhigh",
     });
 
@@ -155,6 +231,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: null,
       configuredModelId: null,
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: null,
     });
 
@@ -178,6 +255,7 @@ describe("resolveAgentModelSelection", () => {
       ],
       runtimeModelId: "claude-sonnet-4-6-20260101",
       configuredModelId: "default",
+      runtimeThinkingOptionId: null,
       explicitThinkingOptionId: null,
     });
 
@@ -186,4 +264,31 @@ describe("resolveAgentModelSelection", () => {
     expect(selection.selectedThinkingId).toBe("low");
     expect(selection.displayThinking).toBe("Low");
   });
+
+  it("shows the agent's own model when the catalog does not list it", () => {
+    const selection = resolveAgentModelSelection({
+      models: [
+        {
+          id: "gpt-6-sol",
+          provider: "codex",
+          label: "GPT-6-Sol",
+          isDefault: true,
+          thinkingOptions: [
+            { id: "medium", label: "medium" },
+            { id: "max", label: "max" },
+          ],
+          defaultThinkingOptionId: "medium",
+        },
+      ],
+      runtimeModelId: "gpt-6.1-sol",
+      configuredModelId: "gpt-6.1-sol",
+      runtimeThinkingOptionId: null,
+      explicitThinkingOptionId: "max",
+    });
+
+    expect(selection.selectedModel).toBeNull();
+    expect(selection.activeModelId).toBe("gpt-6.1-sol");
+    expect(selection.displayModel).toBe("gpt-6.1-sol");
+    expect(selection.displayThinking).toBe("Max");
+  });
 });
diff --git a/packages/app/src/composer/agent-controls/utils.ts b/packages/app/src/composer/agent-controls/utils.ts
index b28b693365..c0b1da7c47 100644
--- a/packages/app/src/composer/agent-controls/utils.ts
+++ b/packages/app/src/composer/agent-controls/utils.ts
@@ -1,7 +1,11 @@
 import type { AgentFeature, AgentModelDefinition } from "@getpaseo/protocol/agent-types";
 import { i18n } from "@/i18n/i18next";
 import { formatThinkingOptionLabel } from "@/agent-controls/labels";
-import { FAST_MODE_FEATURE_ID, PLAN_MODE_FEATURE_ID } from "@/agent-controls/policy";
+import {
+  FAST_MODE_FEATURE_ID,
+  PLAN_MODE_FEATURE_ID,
+  SPEED_FEATURE_ID,
+} from "@/agent-controls/policy";
 
 export type ExplainedAgentControl = "mode" | "model" | "thinking";
 export type FeatureHighlightColor = "blue" | "default" | "green" | "yellow";
@@ -35,9 +39,16 @@ export function getFeatureTooltip(feature: Pick<AgentFeature, "label" | "tooltip
   return feature.tooltip ?? feature.label;
 }
 
+export function isFeatureActive(feature: AgentFeature): boolean {
+  if (feature.type === "toggle") return feature.value;
+  const selectedOption = feature.options.find((option) => option.id === feature.value);
+  return selectedOption !== undefined && !selectedOption.isDefault;
+}
+
 export function getFeatureHighlightColor(featureId: string): FeatureHighlightColor {
   switch (featureId) {
     case FAST_MODE_FEATURE_ID:
+    case SPEED_FEATURE_ID:
       return "yellow";
     case "auto_accept":
       return "green";
@@ -79,16 +90,23 @@ function pickSelectedModel(
   preferredModelId: string | null,
   fallbackModel: AgentModelDefinition | null,
 ): AgentModelDefinition | null {
-  if (!models || !preferredModelId) {
+  if (!preferredModelId) {
     return fallbackModel;
   }
-  return findModelById(models, preferredModelId) ?? fallbackModel;
+  return findModelById(models, preferredModelId);
 }
 
 function resolveThinkingId(
+  runtimeThinkingOptionId: string | null | undefined,
   explicitThinkingOptionId: string | null | undefined,
   selectedModel: AgentModelDefinition | null,
 ): string | null {
+  const runtimeThinkingOption = selectedModel?.thinkingOptions?.find(
+    (option) => option.id === runtimeThinkingOptionId,
+  );
+  if (runtimeThinkingOption) {
+    return runtimeThinkingOption.id;
+  }
   if (explicitThinkingOptionId && explicitThinkingOptionId !== "default") {
     return explicitThinkingOptionId;
   }
@@ -139,9 +157,16 @@ export function resolveAgentModelSelection(input: {
   models: AgentModelDefinition[] | null;
   runtimeModelId: string | null | undefined;
   configuredModelId: string | null | undefined;
+  runtimeThinkingOptionId: string | null | undefined;
   explicitThinkingOptionId: string | null | undefined;
 }) {
-  const { models, runtimeModelId, configuredModelId, explicitThinkingOptionId } = input;
+  const {
+    models,
+    runtimeModelId,
+    configuredModelId,
+    runtimeThinkingOptionId,
+    explicitThinkingOptionId,
+  } = input;
   const normalizedRuntimeModelId = normalizeModelId(runtimeModelId);
   const normalizedConfiguredModelId = normalizeModelId(configuredModelId);
 
@@ -162,9 +187,13 @@ export function resolveAgentModelSelection(input: {
   );
 
   const thinkingOptions = selectedModel?.thinkingOptions ?? null;
-  const resolvedThinkingId = resolveThinkingId(explicitThinkingOptionId, selectedModel);
+  const resolvedThinkingId = resolveThinkingId(
+    runtimeThinkingOptionId,
+    explicitThinkingOptionId,
+    selectedModel,
+  );
   const effectiveThinking = resolveEffectiveThinking(thinkingOptions, resolvedThinkingId);
-  const selectedThinkingId = effectiveThinking?.id ?? null;
+  const selectedThinkingId = effectiveThinking?.id ?? resolvedThinkingId;
   const displayThinking = resolveThinkingDisplay(
     effectiveThinking,
     selectedThinkingId,
diff --git a/packages/app/src/composer/attachments/drop.test.ts b/packages/app/src/composer/attachments/drop.test.ts
index 31a26a7fe0..16a75e1f3d 100644
--- a/packages/app/src/composer/attachments/drop.test.ts
+++ b/packages/app/src/composer/attachments/drop.test.ts
@@ -1,28 +1,25 @@
 import { describe, expect, it } from "vitest";
-import { droppedItemsToPickedFiles } from "./drop";
+import { droppedItemsToSelectedFiles } from "./drop";
 
 describe("composer dropped attachments", () => {
-  it("turns non-image browser files into picked files and leaves raster images for image handling", async () => {
+  it("turns non-image browser files into selected files and leaves raster images for image handling", async () => {
     const jsonFile = new File([JSON.stringify({ ok: true })], "config.json", {
       type: "application/json",
     });
     const imageFile = new File([new Uint8Array([0])], "screen.png", { type: "image/png" });
 
-    const files = await droppedItemsToPickedFiles([
+    const files = droppedItemsToSelectedFiles([
       { kind: "web-file", file: jsonFile },
       { kind: "web-file", file: imageFile },
     ]);
 
-    expect(files).toEqual([
-      {
-        fileName: "config.json",
-        mimeType: "application/json",
-        bytes: new Uint8Array(await jsonFile.arrayBuffer()),
-      },
+    expect(files.map(({ fileName, mimeType }) => ({ fileName, mimeType }))).toEqual([
+      { fileName: "config.json", mimeType: "application/json" },
     ]);
+    expect(await files[0]?.readBytes()).toEqual(new Uint8Array(await jsonFile.arrayBuffer()));
   });
 
-  it("turns non-image desktop paths into picked files and leaves raster images for image handling", async () => {
+  it("reads desktop paths lazily and leaves raster images for image handling", async () => {
     const windowsPath = "C:\\Users\\alice\\config.json";
     const posixPath = "/Users/alice/notes/readme.txt";
     const imagePath = "C:\\Users\\alice\\screen.png";
@@ -32,7 +29,7 @@ describe("composer dropped attachments", () => {
     ]);
     const readPaths: string[] = [];
 
-    const files = await droppedItemsToPickedFiles(
+    const files = droppedItemsToSelectedFiles(
       [
         { kind: "desktop-path", path: windowsPath },
         { kind: "desktop-path", path: imagePath },
@@ -50,18 +47,14 @@ describe("composer dropped attachments", () => {
       },
     );
 
-    expect(readPaths).toEqual([windowsPath, posixPath]);
-    expect(files).toEqual([
-      {
-        fileName: "config.json",
-        mimeType: "application/octet-stream",
-        bytes: new Uint8Array([1, 2, 3]),
-      },
-      {
-        fileName: "readme.txt",
-        mimeType: "application/octet-stream",
-        bytes: new Uint8Array([4, 5]),
-      },
+    expect(files.map(({ fileName, mimeType }) => ({ fileName, mimeType }))).toEqual([
+      { fileName: "config.json", mimeType: "application/octet-stream" },
+      { fileName: "readme.txt", mimeType: "application/octet-stream" },
     ]);
+    expect(readPaths).toEqual([]);
+
+    expect(await files[0]?.readBytes()).toEqual(new Uint8Array([1, 2, 3]));
+    expect(await files[1]?.readBytes()).toEqual(new Uint8Array([4, 5]));
+    expect(readPaths).toEqual([windowsPath, posixPath]);
   });
 });
diff --git a/packages/app/src/composer/attachments/drop.ts b/packages/app/src/composer/attachments/drop.ts
index b5a0f1b6ad..dddff293e9 100644
--- a/packages/app/src/composer/attachments/drop.ts
+++ b/packages/app/src/composer/attachments/drop.ts
@@ -3,7 +3,7 @@ import {
   isRasterImageFile,
   isRasterImagePath,
 } from "@/attachments/file-types";
-import { readDesktopFileBytes, type PickedFile } from "@/attachments/picked-file";
+import { readDesktopFileBytes, type SelectedFile } from "@/attachments/selected-file";
 import type { DroppedItem } from "@/components/file-drop/types";
 
 interface DroppedAttachmentsRuntime {
@@ -25,21 +25,22 @@ function fileNameFromPath(path: string): string {
   return path;
 }
 
-export async function droppedItemsToPickedFiles(
+export function droppedItemsToSelectedFiles(
   items: DroppedItem[],
   runtime: DroppedAttachmentsRuntime = defaultRuntime,
-): Promise<PickedFile[]> {
-  const files: PickedFile[] = [];
+): SelectedFile[] {
+  const files: SelectedFile[] = [];
 
   for (const item of items) {
     if (item.kind === "web-file") {
       if (isRasterImageFile(item.file)) {
         continue;
       }
+      const file = item.file;
       files.push({
-        fileName: item.file.name,
-        mimeType: item.file.type || getMimeTypeFromPath(item.file.name),
-        bytes: new Uint8Array(await item.file.arrayBuffer()),
+        fileName: file.name,
+        mimeType: file.type || getMimeTypeFromPath(file.name),
+        readBytes: async () => new Uint8Array(await file.arrayBuffer()),
       });
       continue;
     }
@@ -47,10 +48,11 @@ export async function droppedItemsToPickedFiles(
     if (isRasterImagePath(item.path)) {
       continue;
     }
+    const path = item.path;
     files.push({
-      fileName: fileNameFromPath(item.path),
-      mimeType: getMimeTypeFromPath(item.path),
-      bytes: await runtime.readDesktopFileBytes(item.path),
+      fileName: fileNameFromPath(path),
+      mimeType: getMimeTypeFromPath(path),
+      readBytes: () => runtime.readDesktopFileBytes(path),
     });
   }
 
diff --git a/packages/app/src/composer/dock/index.native.tsx b/packages/app/src/composer/dock/index.native.tsx
new file mode 100644
index 0000000000..a668c00743
--- /dev/null
+++ b/packages/app/src/composer/dock/index.native.tsx
@@ -0,0 +1,186 @@
+import { ComposerDockBackground } from "./internal/background";
+export { ComposerDockBackground } from "./internal/background";
+import { ScrollView } from "@/components/ui/scroll-view";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { HEADER_INNER_HEIGHT } from "@/constants/layout";
+import { resolveContentMaxWidth, useAppSettings } from "@/hooks/use-settings";
+import { KeyboardTranslateView } from "@/keyboard/shift";
+import { createContext, useCallback, useContext, useState, type ReactNode } from "react";
+import { View, type LayoutChangeEvent, type ViewProps, StyleSheet } from "react-native";
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  useDerivedValue,
+  useAnimatedReaction,
+  type SharedValue,
+} from "react-native-reanimated";
+import { useKeyboardShift } from "@/keyboard/shift";
+import {
+  resolveCenteredClearance,
+  resolveInlineComposerCapacity,
+  updateComposerCapacity,
+  type ComposerCapacity,
+} from "./internal/capacity";
+
+const ViewportCapacity = createContext<SharedValue<number | undefined> | null>(null);
+
+interface ComposerViewportProps extends ViewProps {
+  bottomInset?: number;
+  centered?: boolean;
+}
+
+/** Measure the stationary space below the header, outside keyboard translation. */
+function ComposerViewport({
+  children,
+  onLayout,
+  bottomInset = 0,
+  centered = false,
+  ...props
+}: ComposerViewportProps) {
+  const measuredHeight = useSharedValue(0);
+  const sizing = useSharedValue<ComposerCapacity | undefined>(undefined);
+  const { layoutShift, bottomInset: safeAreaBottom } = useKeyboardShift();
+  useAnimatedReaction(
+    () => ({
+      height: measuredHeight.value,
+      bottomInset,
+      safeAreaBottom: safeAreaBottom.value,
+      keyboardShift: layoutShift.value,
+      centered,
+    }),
+    (geometry) => {
+      if (geometry.height <= 0) return;
+      sizing.value = updateComposerCapacity(sizing.value, geometry);
+    },
+    [],
+  );
+  const capacity = useDerivedValue(() => sizing.value?.capacity);
+  const measureViewport = useCallback(
+    (event: LayoutChangeEvent) => {
+      measuredHeight.value = event.nativeEvent.layout.height;
+      onLayout?.(event);
+    },
+    [measuredHeight, onLayout],
+  );
+
+  return (
+    <View testID="composer-viewport" {...props} onLayout={measureViewport} collapsable={false}>
+      <ViewportCapacity.Provider value={capacity}>{children}</ViewportCapacity.Provider>
+    </View>
+  );
+}
+
+/** Bound the complete composer (including its controls), not just the text input. */
+function ComposerViewportContent({ style, ...props }: ViewProps) {
+  const compact = useIsCompactFormFactor();
+  const capacity = useContext(ViewportCapacity);
+  if (!capacity) throw new Error("ComposerViewportContent requires ComposerViewport");
+  const constraint = useAnimatedStyle(() => ({
+    // Only viewport changes and keyboard start/end events trigger layout. Motion
+    // stays in KeyboardTranslateView and never changes this constraint per frame.
+    maxHeight: resolveInlineComposerCapacity(capacity.value, compact),
+  }));
+
+  return (
+    <Animated.View testID="composer-viewport-content" {...props} style={[style, constraint]} />
+  );
+}
+
+/** The keyboard only needs to move a centered form once it reaches the form's resting bottom. */
+function useCenteredClearance(safeAreaBottom: number) {
+  const [viewportHeight, setViewportHeight] = useState(0);
+  const [formBottom, setFormBottom] = useState(0);
+  const measureViewport = useCallback((event: LayoutChangeEvent) => {
+    setViewportHeight(event.nativeEvent.layout.height);
+  }, []);
+  const measureForm = useCallback((event: LayoutChangeEvent) => {
+    const { y, height } = event.nativeEvent.layout;
+    setFormBottom(y + height);
+  }, []);
+  return {
+    value: resolveCenteredClearance({ viewportHeight, safeAreaBottom, formBottom }),
+    measureViewport,
+    measureForm,
+  };
+}
+
+interface ComposerDockProps {
+  children: [ReactNode, ReactNode, ReactNode?];
+  centered?: boolean;
+}
+
+/** The stationary viewport, translated surface, and bounded composer are one owner. */
+export function ComposerDock({
+  children: [content, composer, overlay],
+  centered = false,
+}: ComposerDockProps) {
+  const insets = useSafeAreaInsets();
+  const contentMaxWidth = resolveContentMaxWidth(useAppSettings().settings);
+  const centeredClearance = useCenteredClearance(insets.bottom);
+  // Preserve the existing centered form's visual balance on tablets.
+  const bottomInset = centered ? HEADER_INNER_HEIGHT + 24 : 0;
+  if (centered) {
+    return (
+      <ComposerViewport
+        style={[dockStyles.centeredViewport, { paddingBottom: bottomInset }]}
+        bottomInset={bottomInset}
+        centered
+        onLayout={centeredClearance.measureViewport}
+      >
+        <KeyboardTranslateView
+          style={[dockStyles.centered, { maxWidth: contentMaxWidth }]}
+          bottomClearance={centeredClearance.value}
+          onLayout={centeredClearance.measureForm}
+        >
+          <ComposerViewportContent style={dockStyles.composer}>
+            <ScrollView style={dockStyles.setup} keyboardShouldPersistTaps="handled">
+              {content}
+            </ScrollView>
+            <ComposerViewportContent style={dockStyles.centeredComposer}>
+              {composer}
+            </ComposerViewportContent>
+          </ComposerViewportContent>
+          {overlay}
+        </KeyboardTranslateView>
+      </ComposerViewport>
+    );
+  }
+  return (
+    <ComposerViewport style={dockStyles.viewport}>
+      <KeyboardTranslateView style={dockStyles.surface}>
+        <View
+          testID="composer-dock-content"
+          collapsable={false}
+          style={dockStyles.content}
+          pointerEvents="box-none"
+        >
+          {/* A responder ancestor intercepts native scroll drags on Android Fabric.
+              Only unclaimed background touches may reach this sibling. */}
+          <ComposerDockBackground style={StyleSheet.absoluteFill} />
+          <View style={dockStyles.content} pointerEvents="box-none">
+            {content}
+          </View>
+        </View>
+        <ComposerViewportContent style={dockStyles.composer}>
+          <View style={[dockStyles.composer, { paddingBottom: insets.bottom }]}>{composer}</View>
+        </ComposerViewportContent>
+        {overlay}
+      </KeyboardTranslateView>
+    </ComposerViewport>
+  );
+}
+
+// Plain React Native styles: these land on Reanimated views, which must not carry
+// theme-driven Unistyles (docs/unistyles.md). The content width arrives inline.
+const dockStyles = StyleSheet.create({
+  viewport: { flex: 1, overflow: "hidden" },
+  surface: { flex: 1 },
+  content: { flex: 1, justifyContent: "flex-end" },
+  composer: { width: "100%", flexShrink: 1 },
+  centeredViewport: { flex: 1, alignItems: "center", justifyContent: "center" },
+  centered: { flexShrink: 1, width: "100%" },
+  // Reserve the composer's own capped height before the setup scroll view shrinks.
+  centeredComposer: { width: "100%", flexShrink: 0 },
+  setup: { flexGrow: 0, flexShrink: 1, minHeight: 0 },
+});
diff --git a/packages/app/src/composer/dock/index.tsx b/packages/app/src/composer/dock/index.tsx
new file mode 100644
index 0000000000..3f41118696
--- /dev/null
+++ b/packages/app/src/composer/dock/index.tsx
@@ -0,0 +1,64 @@
+export { ComposerDockBackground } from "./internal/background";
+import { ScrollView } from "@/components/ui/scroll-view";
+import { useState, useCallback, useMemo, type ReactNode } from "react";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { resolveInlineComposerCapacity } from "./internal/capacity";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { HEADER_INNER_HEIGHT } from "@/constants/layout";
+
+interface ComposerDockProps {
+  children: [ReactNode, ReactNode, ReactNode?];
+  centered?: boolean;
+}
+
+export function ComposerDock({
+  children: [content, composer, overlay],
+  centered = false,
+}: ComposerDockProps) {
+  const compact = useIsCompactFormFactor();
+  const [availableHeight, setAvailableHeight] = useState<number>();
+  const constraint = useMemo(
+    () => ({ maxHeight: resolveInlineComposerCapacity(availableHeight, compact) }),
+    [availableHeight, compact],
+  );
+  const measureViewport = useCallback((event: import("react-native").LayoutChangeEvent) => {
+    const { height } = event.nativeEvent.layout;
+    if (height > 0) setAvailableHeight(height);
+  }, []);
+  if (centered) {
+    return (
+      <View style={styles.centered} onLayout={measureViewport}>
+        <View style={styles.form}>
+          <ScrollView style={styles.setup} keyboardShouldPersistTaps="handled">
+            {content}
+          </ScrollView>
+          <View style={[styles.centeredComposer, constraint]}>{composer}</View>
+          {overlay}
+        </View>
+      </View>
+    );
+  }
+  return (
+    <View style={styles.surface} onLayout={measureViewport}>
+      <View style={styles.content}>{content}</View>
+      <View style={[styles.composer, constraint]}>{composer}</View>
+      {overlay}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  surface: { flex: 1, overflow: "hidden" },
+  content: { flex: 1, justifyContent: "flex-end" },
+  composer: { width: "100%", flexShrink: 1 },
+  centered: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    paddingBottom: HEADER_INNER_HEIGHT + 24,
+  },
+  form: { flexShrink: 1, width: "100%", maxWidth: theme.contentMaxWidth },
+  centeredComposer: { flexShrink: 0 },
+  setup: { flexGrow: 0, flexShrink: 1, minHeight: 0 },
+}));
diff --git a/packages/app/src/composer/dock/internal/background.native.tsx b/packages/app/src/composer/dock/internal/background.native.tsx
new file mode 100644
index 0000000000..5e6219b28a
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/background.native.tsx
@@ -0,0 +1,6 @@
+import { Keyboard, Pressable, type ViewProps } from "react-native";
+
+/** Use behind scrollable content as a sibling, never as its responder ancestor. */
+export function ComposerDockBackground(props: ViewProps) {
+  return <Pressable {...props} accessible={false} onPress={Keyboard.dismiss} />;
+}
diff --git a/packages/app/src/composer/dock/internal/background.tsx b/packages/app/src/composer/dock/internal/background.tsx
new file mode 100644
index 0000000000..7a19f44a12
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/background.tsx
@@ -0,0 +1,5 @@
+import { View, type ViewProps } from "react-native";
+
+export function ComposerDockBackground(props: ViewProps) {
+  return <View {...props} />;
+}
diff --git a/packages/app/src/composer/dock/internal/capacity.test.ts b/packages/app/src/composer/dock/internal/capacity.test.ts
new file mode 100644
index 0000000000..7e98b7ef3d
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/capacity.test.ts
@@ -0,0 +1,146 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveCenteredClearance,
+  resolveInlineComposerCapacity,
+  resolveComposerCapacity,
+  updateComposerCapacity,
+} from "./capacity";
+
+describe("composer viewport", () => {
+  it("caps the complete compact composer at sixty percent of keyboard-reserved space", () => {
+    const open = updateComposerCapacity(undefined, {
+      height: 582,
+      bottomInset: 24,
+      safeAreaBottom: 0,
+      centered: false,
+      keyboardShift: 308,
+    });
+    expect(resolveInlineComposerCapacity(open.capacity, true)).toBe(147);
+    expect(resolveInlineComposerCapacity(open.capacity, false)).toBe(245);
+    expect(resolveInlineComposerCapacity(undefined, true)).toBeUndefined();
+  });
+  it("preserves the editing capacity when the keyboard closes", () => {
+    const viewport = { height: 582, bottomInset: 24, safeAreaBottom: 0, centered: false };
+    const open = updateComposerCapacity(undefined, { ...viewport, keyboardShift: 308 });
+    const closed = updateComposerCapacity(open, { ...viewport, keyboardShift: 0 });
+    expect(open.capacity).toBe(245);
+    expect(closed.capacity).toBe(open.capacity);
+    expect(updateComposerCapacity(closed, { ...viewport, keyboardShift: 250 }).capacity).toBe(303);
+  });
+
+  it("remeasures the viewport without forgetting the keyboard reservation", () => {
+    const open = updateComposerCapacity(undefined, {
+      height: 582,
+      bottomInset: 24,
+      safeAreaBottom: 0,
+      centered: false,
+      keyboardShift: 308,
+    });
+    expect(
+      updateComposerCapacity(open, {
+        height: 650,
+        bottomInset: 24,
+        safeAreaBottom: 0,
+        centered: false,
+        keyboardShift: 0,
+      }).capacity,
+    ).toBe(313);
+    expect(
+      updateComposerCapacity(open, {
+        height: 0,
+        bottomInset: 24,
+        safeAreaBottom: 0,
+        centered: false,
+        keyboardShift: 0,
+      }),
+    ).toEqual(open);
+  });
+  it("leaves five points below the header for a bottom-anchored composer", () => {
+    const height = resolveComposerCapacity({
+      height: 582,
+      bottomInset: 24,
+      safeAreaBottom: 0,
+      keyboardShift: 308,
+      centered: false,
+    });
+    expect(height).toBe(245);
+    expect(582 - 24 - 308 - height).toBe(5);
+  });
+
+  it("keeps a centered tablet form below the header once the keyboard reaches it", () => {
+    const viewport = 1000;
+    const bottomInset = 80;
+    const keyboardShift = 300;
+    const height = resolveComposerCapacity({
+      height: viewport,
+      bottomInset,
+      safeAreaBottom: 0,
+      keyboardShift,
+      centered: true,
+    });
+    expect(height).toBe(695);
+    const restingTop = (viewport - bottomInset - height) / 2;
+    const bottomClearance = resolveCenteredClearance({
+      viewportHeight: viewport,
+      safeAreaBottom: 0,
+      formBottom: restingTop + height,
+    });
+    expect(restingTop - Math.max(0, keyboardShift - bottomClearance)).toBe(5);
+  });
+
+  it("leaves a centered form room to edit on a short foldable viewport", () => {
+    expect(
+      resolveComposerCapacity({
+        height: 725,
+        bottomInset: 72,
+        safeAreaBottom: 0,
+        keyboardShift: 313,
+        centered: true,
+      }),
+    ).toBe(407);
+  });
+
+  it("rests a centered form on the keyboard above the bottom safe area", () => {
+    // The keyboard shift excludes the safe area that the keyboard also covers.
+    const geometry = {
+      height: 660,
+      bottomInset: 60,
+      safeAreaBottom: 32,
+      keyboardShift: 288,
+      centered: true,
+    };
+    const height = resolveComposerCapacity(geometry);
+    const restingTop = (geometry.height - geometry.bottomInset - height) / 2;
+    const formBottom = restingTop + height;
+    const clearance = resolveCenteredClearance({
+      viewportHeight: geometry.height,
+      safeAreaBottom: geometry.safeAreaBottom,
+      formBottom,
+    });
+    const translation = Math.max(0, geometry.keyboardShift - clearance);
+    const keyboardTop = geometry.height - geometry.safeAreaBottom - geometry.keyboardShift;
+    expect(formBottom - translation).toBe(keyboardTop);
+    expect(restingTop - translation).toBe(5);
+  });
+
+  it("uses the measured viewport before the first keyboard opening", () => {
+    expect(
+      resolveComposerCapacity({
+        height: 582,
+        bottomInset: 24,
+        safeAreaBottom: 0,
+        keyboardShift: 0,
+        centered: false,
+      }),
+    ).toBe(553);
+    expect(
+      resolveComposerCapacity({
+        height: 300,
+        bottomInset: 0,
+        safeAreaBottom: 0,
+        keyboardShift: 200,
+        centered: false,
+      }),
+    ).toBe(95);
+  });
+});
diff --git a/packages/app/src/composer/dock/internal/capacity.ts b/packages/app/src/composer/dock/internal/capacity.ts
new file mode 100644
index 0000000000..ca4fed2991
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/capacity.ts
@@ -0,0 +1,62 @@
+interface ComposerGeometry {
+  height: number;
+  bottomInset: number;
+  /** The keyboard also covers this space below its shift. */
+  safeAreaBottom: number;
+  keyboardShift: number;
+  centered: boolean;
+}
+
+export interface ComposerCapacity {
+  keyboardReserve: number;
+  capacity: number;
+}
+
+export function resolveComposerCapacity(input: ComposerGeometry): number {
+  "worklet";
+  // A centered form only translates by the keyboard overlap, so once the keyboard
+  // reaches it the form sits on the keyboard and fits above it, not twice over.
+  // A bottom-anchored composer pads the safe area inside its own capacity.
+  const available = input.centered
+    ? Math.min(
+        input.height - input.bottomInset,
+        input.height - input.safeAreaBottom - input.keyboardShift,
+      )
+    : input.height - input.bottomInset - input.keyboardShift;
+  return Math.max(0, available - 5);
+}
+
+/** Space below a centered form that the keyboard fills before the form moves. */
+export function resolveCenteredClearance(input: {
+  viewportHeight: number;
+  safeAreaBottom: number;
+  formBottom: number;
+}): number {
+  return Math.max(0, input.viewportHeight - input.safeAreaBottom - input.formBottom);
+}
+
+export function updateComposerCapacity(
+  previous: ComposerCapacity | undefined,
+  input: ComposerGeometry,
+): ComposerCapacity {
+  "worklet";
+  if (input.height <= 0 && previous) return previous;
+  // Closing the keyboard moves the composer; it does not enlarge its editing
+  // capacity. A subsequent keyboard opening supplies the next reservation.
+  const keyboardReserve =
+    input.keyboardShift > 0 ? input.keyboardShift : (previous?.keyboardReserve ?? 0);
+  return {
+    keyboardReserve,
+    capacity: resolveComposerCapacity({ ...input, keyboardShift: keyboardReserve }),
+  };
+}
+
+/** Compact editing leaves conversation space above the complete composer. */
+export function resolveInlineComposerCapacity(
+  capacity: number | undefined,
+  compact: boolean,
+): number | undefined {
+  "worklet";
+  if (capacity === undefined) return undefined;
+  return compact ? capacity * 0.6 : capacity;
+}
diff --git a/packages/app/src/composer/draft/create-agent-request.ts b/packages/app/src/composer/draft/create-agent-request.ts
new file mode 100644
index 0000000000..23fa22e8c9
--- /dev/null
+++ b/packages/app/src/composer/draft/create-agent-request.ts
@@ -0,0 +1,35 @@
+import type { AgentSessionConfig } from "@getpaseo/protocol/agent-types";
+import type { AgentSnapshotPayload, CreateAgentRequestMessage } from "@getpaseo/protocol/messages";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { encodeImages } from "@/utils/encode-images";
+import type { UserMessageImageAttachment } from "@/types/stream";
+
+export interface WorkspaceDraftAgentRequest {
+  workspaceId: string;
+  config: AgentSessionConfig;
+  text: string;
+  clientMessageId: string;
+  images?: UserMessageImageAttachment[];
+  attachments?: CreateAgentRequestMessage["attachments"];
+}
+
+/**
+ * Shared by the workspace draft tab and by the new-workspace screen when it finishes creation
+ * after the user has already navigated away and no draft tab will ever mount.
+ */
+export async function requestWorkspaceDraftAgent(
+  client: DaemonClient,
+  request: WorkspaceDraftAgentRequest,
+): Promise<AgentSnapshotPayload> {
+  const images = await encodeImages(request.images);
+  return await client.createAgent({
+    config: request.config,
+    workspaceId: request.workspaceId,
+    clientMessageId: request.clientMessageId,
+    ...(request.text ? { initialPrompt: request.text } : {}),
+    ...(images && images.length > 0 ? { images } : {}),
+    ...(request.attachments && request.attachments.length > 0
+      ? { attachments: request.attachments }
+      : {}),
+  });
+}
diff --git a/packages/app/src/composer/draft/create-flow.test.ts b/packages/app/src/composer/draft/create-flow.test.ts
index 471d1fc8b9..8587fa3db6 100644
--- a/packages/app/src/composer/draft/create-flow.test.ts
+++ b/packages/app/src/composer/draft/create-flow.test.ts
@@ -88,6 +88,110 @@ describe("useDraftAgentCreateFlow", () => {
     expect(onCreateSuccess).toHaveBeenCalledTimes(1);
   });
 
+  it("keeps the submitted preview when the pending provider selection disappears", () => {
+    const attempt: DraftCreateAttempt = {
+      clientMessageId: "msg-provider-handoff",
+      text: "build this",
+      timestamp: new Date("2026-05-25T00:00:00.000Z"),
+    };
+    const { result, rerender } = renderHook(
+      ({ provider }: { provider: string | null }) =>
+        useDraftAgentCreateFlow({
+          draftId: "draft-handoff",
+          getPendingServerId: () => "server-1",
+          initialAttempt: attempt,
+          buildDraftAgent: () => {
+            if (!provider) throw new Error("Select a model");
+            return { provider, model: "selected-model" };
+          },
+          createRequest: async () => ({ agentId: "agent-1", result: { id: "agent-1" } }),
+          onCreateSuccess: () => undefined,
+        }),
+      { initialProps: { provider: "codex" } as { provider: string | null } },
+    );
+    expect(result.current.draftAgent).toEqual({ provider: "codex", model: "selected-model" });
+    rerender({ provider: null });
+    expect(result.current.isSubmitting).toBe(true);
+    expect(result.current.draftAgent).toEqual({ provider: "codex", model: "selected-model" });
+  });
+
+  it("shows an invalid prepared selection as a form error instead of throwing in render", () => {
+    const createRequest = vi.fn(async () => ({ agentId: "agent-1", result: { id: "agent-1" } }));
+    const { result } = renderHook(() =>
+      useDraftAgentCreateFlow({
+        draftId: "draft-invalid",
+        getPendingServerId: () => "server-1",
+        initialAttempt: {
+          clientMessageId: "msg-invalid",
+          text: "build this",
+          timestamp: new Date(0),
+        },
+        buildDraftAgent: () => {
+          throw new Error("Select a model");
+        },
+        createRequest,
+        onCreateSuccess: () => undefined,
+      }),
+    );
+    expect(result.current.isSubmitting).toBe(false);
+    expect(result.current.draftAgent).toBeNull();
+    expect(result.current.formErrorMessage).toBe("Select a model");
+    expect(createRequest).not.toHaveBeenCalled();
+  });
+
+  it("keeps a manual submission stable and lets a failed request retry with a new selection", async () => {
+    let failRequest!: (error: Error) => void;
+    const request = new Promise<never>((_resolve, reject) => {
+      failRequest = reject;
+    });
+    let requestCount = 0;
+    const { result, rerender } = renderHook(
+      ({ provider }: { provider: string | null }) =>
+        useDraftAgentCreateFlow({
+          draftId: "draft-manual",
+          getPendingServerId: () => "server-1",
+          buildDraftAgent: () => {
+            if (!provider) throw new Error("Select a model");
+            return { provider };
+          },
+          createRequest: async () => {
+            requestCount++;
+            if (requestCount === 1) return await request;
+            return { agentId: "agent-1", result: { id: "agent-1" } };
+          },
+          onCreateSuccess: () => undefined,
+        }),
+      { initialProps: { provider: "codex" } as { provider: string | null } },
+    );
+    let submission!: Promise<unknown>;
+    const captureError = (error: unknown) => error;
+    await act(async () => {
+      submission = result.current
+        .handleCreateFromInput({ text: "build this", attachments: [], cwd: "/repo" })
+        .catch(captureError);
+    });
+    rerender({ provider: null });
+    expect(result.current.draftAgent).toEqual({ provider: "codex" });
+    await act(async () => {
+      failRequest(new Error("Provider unavailable"));
+      await submission;
+    });
+    expect(result.current.isSubmitting).toBe(false);
+    expect(result.current.draftAgent).toBeNull();
+    expect(result.current.formErrorMessage).toBe("Provider unavailable");
+    rerender({ provider: "claude" });
+    await act(async () => {
+      await result.current.handleCreateFromInput({
+        text: "try again",
+        attachments: [],
+        cwd: "/repo",
+      });
+    });
+    expect(result.current.draftAgent).toEqual({ provider: "claude" });
+    expect(result.current.formErrorMessage).toBe("");
+    expect(requestCount).toBe(2);
+  });
+
   it("allows retrying an empty prompt when the draft still has context attachments", async () => {
     const attachment = {
       kind: "chat_history",
diff --git a/packages/app/src/composer/draft/create-flow.ts b/packages/app/src/composer/draft/create-flow.ts
index 89a237e786..bd4d0fe95c 100644
--- a/packages/app/src/composer/draft/create-flow.ts
+++ b/packages/app/src/composer/draft/create-flow.ts
@@ -5,12 +5,11 @@ import {
   resolveComposerAttachmentSubmitFormat,
   splitComposerAttachmentsForSubmit,
 } from "@/composer/attachments/submit";
-import { useCreateFlowStore } from "@/stores/create-flow-store";
+import { isActiveCreateFlowForDraft, useCreateFlowStore } from "@/stores/create-flow-store";
 import { handoffCreatedAgentMessageSubmission } from "@/composer/submission/writer";
 import { useSessionStore } from "@/stores/session-store";
 import {
   createUserMessage,
-  generateMessageId,
   type StreamItem,
   type UserMessageImageAttachment,
 } from "@/types/stream";
@@ -27,23 +26,23 @@ interface CreateAttempt {
   attachments?: AgentAttachment[];
 }
 
-type DraftAgentMachineState =
+type DraftAgentMachineState<TDraftAgent> =
   | { tag: "draft"; errorMessage: string }
-  | { tag: "creating"; attempt: CreateAttempt };
+  | { tag: "creating"; attempt: CreateAttempt; draftAgent: TDraftAgent };
 
-type DraftAgentMachineEvent =
+type DraftAgentMachineEvent<TDraftAgent> =
   | { type: "DRAFT_SET_ERROR"; message: string }
-  | { type: "SUBMIT"; attempt: CreateAttempt }
+  | { type: "SUBMIT"; attempt: CreateAttempt; draftAgent: TDraftAgent }
   | { type: "CREATE_FAILED"; message: string };
 
 function assertNever(value: never): never {
   throw new Error(`Unhandled state: ${JSON.stringify(value)}`);
 }
 
-function reducer(
-  state: DraftAgentMachineState,
-  event: DraftAgentMachineEvent,
-): DraftAgentMachineState {
+function reducer<TDraftAgent>(
+  state: DraftAgentMachineState<TDraftAgent>,
+  event: DraftAgentMachineEvent<TDraftAgent>,
+): DraftAgentMachineState<TDraftAgent> {
   switch (event.type) {
     case "DRAFT_SET_ERROR": {
       if (state.tag !== "draft") {
@@ -52,7 +51,7 @@ function reducer(
       return { ...state, errorMessage: event.message };
     }
     case "SUBMIT": {
-      return { tag: "creating", attempt: event.attempt };
+      return { tag: "creating", attempt: event.attempt, draftAgent: event.draftAgent };
     }
     case "CREATE_FAILED": {
       if (state.tag !== "creating") {
@@ -65,6 +64,17 @@ function reducer(
   }
 }
 
+function prepareCreateAttempt<TDraftAgent>(
+  attempt: CreateAttempt,
+  buildDraftAgent: (attempt: CreateAttempt) => TDraftAgent,
+): DraftAgentMachineState<TDraftAgent> {
+  try {
+    return { tag: "creating", attempt, draftAgent: buildDraftAgent(attempt) };
+  } catch (error) {
+    return { tag: "draft", errorMessage: error instanceof Error ? error.message : String(error) };
+  }
+}
+
 interface CreateRequestResult<TCreateResult> {
   agentId: string | null;
   result: TCreateResult;
@@ -112,22 +122,34 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
   onCreateError,
 }: UseDraftAgentCreateFlowOptions<TDraftAgent, TCreateResult>) {
   const { t } = useTranslation();
-  const [machine, dispatch] = useReducer(
-    reducer,
+  const [localMachine, dispatch] = useReducer(
+    reducer<TDraftAgent>,
     initialAttempt,
-    (attempt): DraftAgentMachineState =>
+    (attempt): DraftAgentMachineState<TDraftAgent> =>
       attempt
-        ? { tag: "creating", attempt }
+        ? prepareCreateAttempt(attempt, buildDraftAgent)
         : {
             tag: "draft",
             errorMessage: "",
           },
   );
 
+  const pending = useCreateFlowStore((state) => state.pendingByDraftId[draftId]);
+  // Remounts can precede model hydration. Rebuild the preview when its inputs
+  // arrive, and observe the original request's failure through shared state.
+  const machine = useMemo<DraftAgentMachineState<TDraftAgent>>(() => {
+    if (pending?.lifecycle === "abandoned") {
+      return { tag: "draft", errorMessage: pending.errorMessage ?? "" };
+    }
+    if (pending?.lifecycle === "active" && localMachine.tag === "draft" && initialAttempt) {
+      return prepareCreateAttempt(initialAttempt, buildDraftAgent);
+    }
+    return localMachine;
+  }, [pending, localMachine, initialAttempt, buildDraftAgent]);
+
   const setPendingCreateAttempt = useCreateFlowStore((state) => state.setPending);
   const updatePendingAgentId = useCreateFlowStore((state) => state.updateAgentId);
   const markPendingCreateLifecycle = useCreateFlowStore((state) => state.markLifecycle);
-  const clearPendingCreateAttempt = useCreateFlowStore((state) => state.clear);
   const formErrorMessage = machine.tag === "draft" ? machine.errorMessage : "";
   const isSubmitting = machine.tag === "creating";
 
@@ -163,12 +185,18 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
     ];
   }, [machine]);
 
-  const draftAgent = useMemo<TDraftAgent | null>(() => {
-    if (machine.tag !== "creating") {
-      return null;
-    }
-    return buildDraftAgent(machine.attempt);
-  }, [buildDraftAgent, machine]);
+  const draftAgent = machine.tag === "creating" ? machine.draftAgent : null;
+  const startCreateAttempt = useCallback(
+    (attempt: CreateAttempt) => {
+      const prepared = prepareCreateAttempt(attempt, buildDraftAgent);
+      if (prepared.tag === "draft") {
+        dispatch({ type: "DRAFT_SET_ERROR", message: prepared.errorMessage });
+        throw new Error(prepared.errorMessage);
+      }
+      dispatch({ type: "SUBMIT", attempt, draftAgent: prepared.draftAgent });
+    },
+    [buildDraftAgent],
+  );
 
   const runCreateAttempt = useCallback(
     async ({ attempt, cwd }: { attempt: CreateAttempt; cwd: string }) => {
@@ -179,15 +207,14 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
         throw error;
       }
 
-      await onBeforeSubmit?.({
-        attempt,
-        text: attempt.text,
-        images: attempt.images,
-        attachments: attempt.attachments,
-        cwd,
-      });
-
       try {
+        await onBeforeSubmit?.({
+          attempt,
+          text: attempt.text,
+          images: attempt.images,
+          attachments: attempt.attachments,
+          cwd,
+        });
         const createResult = await createRequest({
           attempt,
           text: attempt.text,
@@ -217,14 +244,16 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
         const resolved =
           error instanceof Error ? error : new Error(t("composer.errors.failedToCreateAgent"));
         dispatch({ type: "CREATE_FAILED", message: resolved.message });
-        markPendingCreateLifecycle({ draftId, lifecycle: "abandoned" });
-        clearPendingCreateAttempt({ draftId });
+        markPendingCreateLifecycle({
+          draftId,
+          lifecycle: "abandoned",
+          errorMessage: resolved.message,
+        });
         onCreateError?.(resolved);
         throw error;
       }
     },
     [
-      clearPendingCreateAttempt,
       createRequest,
       draftId,
       getPendingServerId,
@@ -239,7 +268,11 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
 
   const handleCreateFromInput = useCallback(
     async ({ text, attachments, cwd }: SubmitContext) => {
-      if (isSubmitting) {
+      const existing = useCreateFlowStore.getState().pendingByDraftId[draftId];
+      if (
+        isSubmitting ||
+        isActiveCreateFlowForDraft({ pending: existing, serverId: getPendingServerId(), draftId })
+      ) {
         throw new Error(t("composer.errors.alreadyLoading"));
       }
 
@@ -280,13 +313,14 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
       }
 
       const attempt: CreateAttempt = {
-        clientMessageId: generateMessageId(),
+        clientMessageId: `${draftId}:initial-message`,
         text: trimmedPrompt,
         timestamp: new Date(),
-        ...(images && images.length > 0 ? { images } : {}),
+        ...(images.length > 0 ? { images } : {}),
         ...(wirePayload.attachments.length > 0 ? { attachments: wirePayload.attachments } : {}),
       };
 
+      startCreateAttempt(attempt);
       setPendingCreateAttempt({
         draftId,
         serverId: pendingServerId,
@@ -300,7 +334,6 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
           : {}),
       });
 
-      dispatch({ type: "SUBMIT", attempt });
       onCreateStart?.();
       await runCreateAttempt({ attempt, cwd });
     },
@@ -312,6 +345,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
       onCreateStart,
       runCreateAttempt,
       setPendingCreateAttempt,
+      startCreateAttempt,
       t,
       validateBeforeSubmit,
     ],
@@ -320,11 +354,11 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
   const continueCreateFromAttempt = useCallback(
     async ({ attempt, cwd }: { attempt: CreateAttempt; cwd: string }) => {
       if (!isSubmitting) {
-        dispatch({ type: "SUBMIT", attempt });
+        startCreateAttempt(attempt);
       }
       await runCreateAttempt({ attempt, cwd });
     },
-    [isSubmitting, runCreateAttempt],
+    [isSubmitting, runCreateAttempt, startCreateAttempt],
   );
 
   return {
diff --git a/packages/app/src/composer/draft/input-draft.live.test.tsx b/packages/app/src/composer/draft/input-draft.live.test.tsx
index 65180dce35..33041cceb6 100644
--- a/packages/app/src/composer/draft/input-draft.live.test.tsx
+++ b/packages/app/src/composer/draft/input-draft.live.test.tsx
@@ -1,8 +1,8 @@
+/** @vitest-environment jsdom */
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
-import { JSDOM } from "jsdom";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { useDraftStore } from "@/stores/draft-store";
 import type { AttachmentMetadata, ComposerAttachment } from "@/attachments/types";
 import { createWorkspaceFileAttachment } from "@/attachments/workspace-file";
@@ -34,8 +34,6 @@ vi.mock("@/attachments/service", () => ({
 vi.mock("@/hooks/use-agent-form-state", () => ({
   useAgentFormState: () => ({
     selectedServerId: "host-1",
-    setSelectedServerId: () => undefined,
-    setSelectedServerIdFromUser: () => undefined,
     selectedProvider: "codex",
     setProviderFromUser: () => undefined,
     selectedMode: "auto",
@@ -45,8 +43,6 @@ vi.mock("@/hooks/use-agent-form-state", () => ({
     selectedThinkingOptionId: "",
     setThinkingOptionFromUser: () => undefined,
     workingDir: "/repo",
-    setWorkingDir: () => undefined,
-    setWorkingDirFromUser: () => undefined,
     providerDefinitions: [{ id: "codex", label: "Codex", modes: [{ id: "auto", label: "Auto" }] }],
     providerDefinitionMap: new Map(),
     agentDefinition: undefined,
@@ -116,26 +112,24 @@ vi.mock("@/hooks/use-agent-form-state", () => ({
   }),
 }));
 
+const mountedRoots = new Set<Root>();
+function createTestRoot(container: HTMLElement): Root {
+  const root = createRoot(container);
+  mountedRoots.add(root);
+  return root;
+}
+
+afterEach(async () => {
+  await act(async () => {
+    for (const root of mountedRoots) root.unmount();
+    mountedRoots.clear();
+  });
+});
+
 let useAgentInputDraft: typeof import("./input-draft").useAgentInputDraft;
 type DraftRecordForTest = ReturnType<typeof useDraftStore.getState>["drafts"][string];
 
 beforeAll(async () => {
-  const storage = new Map<string, string>();
-
-  Object.defineProperty(globalThis, "window", {
-    value: {
-      localStorage: {
-        getItem: (key: string) => storage.get(key) ?? null,
-        setItem: (key: string, value: string) => {
-          storage.set(key, value);
-        },
-        removeItem: (key: string) => {
-          storage.delete(key);
-        },
-      },
-    },
-    configurable: true,
-  });
   Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", {
     value: true,
     configurable: true,
@@ -147,18 +141,8 @@ beforeAll(async () => {
 describe("useAgentInputDraft live contract", () => {
   beforeEach(() => {
     asyncStorage.clear();
-    const dom = new JSDOM("<!doctype html><html><body><div id='root'></div></body></html>", {
-      url: "http://localhost",
-    });
-
-    Object.defineProperty(globalThis, "document", {
-      value: dom.window.document,
-      configurable: true,
-    });
-    Object.defineProperty(globalThis, "navigator", {
-      value: dom.window.navigator,
-      configurable: true,
-    });
+    document.body.innerHTML = "<div id='root'></div>";
+    localStorage.clear();
 
     useDraftStore.setState({
       drafts: {},
@@ -191,9 +175,7 @@ describe("useAgentInputDraft live contract", () => {
         draftKey,
         composer: {
           initialServerId: "host-1",
-          initialValues: { workingDir: "/repo" },
           isVisible: true,
-          onlineServerIds: ["host-1"],
           lockedWorkingDir: "/repo",
         },
       });
@@ -206,7 +188,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    let root: Root | null = createRoot(container);
+    let root: Root | null = createTestRoot(container);
     await act(async () => {
       root!.render(
         <QueryClientProvider client={queryClient}>
@@ -216,12 +198,15 @@ describe("useAgentInputDraft live contract", () => {
     });
 
     expect(getLatest().composerState?.agentControls.selectedProvider).toBe("codex");
-    expect(getLatest().composerState?.commandDraftConfig).toEqual({
-      provider: "codex",
-      cwd: "/repo",
-      modeId: "auto",
-      model: "gpt-5.4",
-      thinkingOptionId: "high",
+    expect(getLatest().composerState?.commandDraft).toEqual({
+      status: "ready",
+      config: {
+        provider: "codex",
+        cwd: "/repo",
+        modeId: "auto",
+        model: "gpt-5.4",
+        thinkingOptionId: "high",
+      },
     });
 
     const hydratedTextReplacement = getLatest().textReplacement;
@@ -248,7 +233,7 @@ describe("useAgentInputDraft live contract", () => {
       root!.unmount();
     });
 
-    root = createRoot(container);
+    root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -257,7 +242,7 @@ describe("useAgentInputDraft live contract", () => {
       );
     });
 
-    expect(getLatest().text).toBe("hello world");
+    expect(getLatest().textSource.getSnapshot()).toBe("hello world");
     expect(getLatest().attachments).toEqual([{ kind: "image", metadata: image }]);
   });
 
@@ -306,7 +291,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    const root = createRoot(container);
+    const root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -315,7 +300,7 @@ describe("useAgentInputDraft live contract", () => {
       );
     });
 
-    expect(getLatest().text).toBe("legacy text");
+    expect(getLatest().textSource.getSnapshot()).toBe("legacy text");
     expect(getLatest().attachments).toEqual([{ kind: "image", metadata: image }]);
     expect(useDraftStore.getState().drafts["draft:legacy"]?.input).toEqual({
       text: "legacy text",
@@ -372,7 +357,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    const root = createRoot(container);
+    const root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -381,7 +366,7 @@ describe("useAgentInputDraft live contract", () => {
       );
     });
 
-    expect(getLatest().text).toBe("new text");
+    expect(getLatest().textSource.getSnapshot()).toBe("new text");
     expect(getLatest().attachments).toEqual([githubIssue]);
 
     await act(async () => {
@@ -412,7 +397,9 @@ describe("useAgentInputDraft live contract", () => {
       return latest;
     }
 
+    let renders = 0;
     function Probe() {
+      renders += 1;
       latest = useAgentInputDraft({ draftKey: "draft:attachments" });
       return null;
     }
@@ -423,7 +410,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    const root = createRoot(container);
+    const root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -438,9 +425,32 @@ describe("useAgentInputDraft live contract", () => {
     });
 
     expect(getLatest().attachments).toEqual([{ kind: "image", metadata: image }]);
-    expect(useDraftStore.getState().drafts["draft:attachments"]?.input).toEqual({
-      text: "with attachment",
-      attachments: [{ kind: "image", metadata: image }],
+    const readPersistedInput = () => useDraftStore.getState().drafts["draft:attachments"]?.input;
+    await act(async () => {
+      // Web text publication occurs after paint; attachments save immediately.
+      await expect.poll(readPersistedInput).toEqual({
+        text: "with attachment",
+        attachments: [{ kind: "image", metadata: image }],
+      });
+    });
+    const settledRenders = renders;
+    const attached = getLatest().attachments;
+    const source = getLatest().textSource;
+    let textNotifications = 0;
+    const unsubscribe = source.subscribe(() => {
+      textNotifications += 1;
+    });
+    await act(async () => {
+      getLatest().editText("with attachment\n");
+      await expect.poll(source.getSnapshot).toBe("with attachment\n");
+    });
+    expect(renders).toBe(settledRenders);
+    expect(getLatest().attachments).toBe(attached);
+    expect(getLatest().textSource).toBe(source);
+    expect(textNotifications).toBe(1);
+    unsubscribe();
+    await act(async () => {
+      root.unmount();
     });
   });
 
@@ -505,7 +515,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    const root = createRoot(container);
+    const root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -523,7 +533,7 @@ describe("useAgentInputDraft live contract", () => {
       getLatest().clear("sent");
     });
 
-    expect(getLatest().text).toBe("");
+    expect(getLatest().textSource.getSnapshot()).toBe("");
     expect(getLatest().attachments).toEqual([]);
     expect(useDraftStore.getState().drafts["draft:clear"]?.input).toEqual({
       text: "",
@@ -559,7 +569,7 @@ describe("useAgentInputDraft live contract", () => {
       throw new Error("Missing root container");
     }
 
-    const root = createRoot(container);
+    const root = createTestRoot(container);
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -577,7 +587,7 @@ describe("useAgentInputDraft live contract", () => {
       getLatest().clear("sent");
     });
 
-    expect(getLatest().text).toBe("");
+    expect(getLatest().textSource.getSnapshot()).toBe("");
     expect(getLatest().attachments).toEqual([]);
     expect(useDraftStore.getState().drafts["draft:lifecycle"]).toMatchObject({
       lifecycle: "sent",
diff --git a/packages/app/src/composer/draft/input-draft.test.ts b/packages/app/src/composer/draft/input-draft.test.ts
index d9bbb6838f..882f342199 100644
--- a/packages/app/src/composer/draft/input-draft.test.ts
+++ b/packages/app/src/composer/draft/input-draft.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { hasDraftContent, resolveDraftKey } from "./input-draft-core";
 import {
-  buildDraftCommandConfig,
+  buildDraftCommandTarget,
   resolveEffectiveComposerModelId,
   resolveEffectiveComposerThinkingOptionId,
 } from "@/provider-selection/provider-selection";
@@ -124,46 +124,55 @@ describe("resolveEffectiveComposerThinkingOptionId", () => {
   });
 });
 
-describe("buildDraftComposerCommandConfig", () => {
-  it("returns undefined when cwd is empty", () => {
+describe("buildDraftCommandTarget", () => {
+  const codexSelection = {
+    provider: "codex",
+    modelId: "gpt-5.4",
+    modeId: "auto",
+    thinkingOptionId: "high",
+    availableModels: [],
+    modeOptions: [{ id: "auto", label: "Auto" }],
+  };
+
+  it("needs a project when cwd is empty", () => {
     expect(
-      buildDraftCommandConfig({
-        selection: {
-          provider: "codex",
-          modelId: "gpt-5.4",
-          modeId: "",
-          thinkingOptionId: "",
-          availableModels: [],
-          modeOptions: [],
-        },
+      buildDraftCommandTarget({
+        selection: codexSelection,
         cwd: "  ",
         effectiveModelId: "gpt-5.4",
         effectiveThinkingOptionId: "high",
       }),
-    ).toBeUndefined();
+    ).toEqual({ status: "needs-project" });
+  });
+
+  it("needs a provider when none is selected", () => {
+    expect(
+      buildDraftCommandTarget({
+        selection: { ...codexSelection, provider: null },
+        cwd: "/repo",
+        effectiveModelId: "",
+        effectiveThinkingOptionId: "",
+      }),
+    ).toEqual({ status: "needs-provider" });
   });
 
   it("builds the draft command config from derived composer state", () => {
     expect(
-      buildDraftCommandConfig({
-        selection: {
-          provider: "codex",
-          modelId: "gpt-5.4",
-          modeId: "auto",
-          thinkingOptionId: "high",
-          availableModels: [],
-          modeOptions: [{ id: "auto", label: "Auto" }],
-        },
+      buildDraftCommandTarget({
+        selection: codexSelection,
         cwd: "/repo",
         effectiveModelId: "gpt-5.4",
         effectiveThinkingOptionId: "high",
       }),
     ).toEqual({
-      provider: "codex",
-      cwd: "/repo",
-      modeId: "auto",
-      model: "gpt-5.4",
-      thinkingOptionId: "high",
+      status: "ready",
+      config: {
+        provider: "codex",
+        cwd: "/repo",
+        modeId: "auto",
+        model: "gpt-5.4",
+        thinkingOptionId: "high",
+      },
     });
   });
 });
diff --git a/packages/app/src/composer/draft/input-draft.ts b/packages/app/src/composer/draft/input-draft.ts
index c26e18696f..7e6805b0b3 100644
--- a/packages/app/src/composer/draft/input-draft.ts
+++ b/packages/app/src/composer/draft/input-draft.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { TextReplacement } from "@/composer/types";
 import type { DraftAgentControlsProps } from "@/composer/agent-controls";
-import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
 import {
   useAgentFormState,
   type CreateAgentInitialValues,
@@ -16,14 +16,15 @@ import {
   type DraftKeyInput,
 } from "@/composer/draft/input-draft-core";
 import {
-  buildDraftCommandConfig,
+  buildDraftCommandTarget,
   resolveEffectiveComposerModelId,
   resolveEffectiveComposerThinkingOptionId,
   type ProviderSelectionState,
 } from "@/provider-selection/provider-selection";
 import { useDraftStore } from "@/stores/draft-store";
-import { toDraftInputIfReady } from "@/stores/draft-store/state";
 import { AfterPaintPublication } from "@/composer/after-paint-publication";
+import { useShallow } from "zustand/shallow";
+import type { ComposerTextSource } from "@/composer/text-source";
 import { isWeb } from "@/constants/platform";
 
 type AttachmentUpdater =
@@ -35,7 +36,6 @@ interface AgentInputDraftComposerOptions {
   initialValues?: CreateAgentInitialValues;
   initialFeatureValues?: Record<string, unknown>;
   isVisible?: boolean;
-  onlineServerIds?: string[];
   lockedWorkingDir?: string;
 }
 
@@ -50,11 +50,11 @@ type DraftComposerState = UseAgentFormStateResult & {
   effectiveThinkingOptionId: string;
   featureValues: Record<string, unknown> | undefined;
   agentControls: DraftAgentControlsProps;
-  commandDraftConfig: DraftCommandConfig | undefined;
+  commandDraft: DraftCommandTarget;
 };
 
 export interface AgentInputDraft {
-  text: string;
+  textSource: ComposerTextSource;
   editText: (text: string) => void;
   replaceText: (text: string) => void;
   textReplacement: TextReplacement;
@@ -68,12 +68,13 @@ export interface AgentInputDraft {
 
 export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDraft {
   const composerOptions = input.composer ?? null;
+  const workingDir = composerOptions?.lockedWorkingDir?.trim() || "";
   const formState = useAgentFormState({
-    initialServerId: composerOptions?.initialServerId ?? null,
+    workingDir,
+    serverId: composerOptions?.initialServerId ?? null,
     initialValues: composerOptions?.initialValues,
     isVisible: composerOptions?.isVisible ?? false,
     isCreateFlow: true,
-    onlineServerIds: composerOptions?.onlineServerIds ?? [],
   });
   const draftKey = useMemo(
     () =>
@@ -83,25 +84,47 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
       }),
     [formState.selectedServerId, input.draftKey],
   );
-  const draftRecord = useDraftStore((state) => state.drafts[draftKey]);
-  const draft = useMemo(() => toDraftInputIfReady(draftRecord), [draftRecord]);
+  const attachments = useDraftStore(
+    useShallow((state) =>
+      state.drafts[draftKey]?.lifecycle === "active"
+        ? (state.drafts[draftKey].input.attachments ?? [])
+        : [],
+    ),
+  );
+  const textSource = useMemo<ComposerTextSource>(
+    () => ({
+      getSnapshot: () => {
+        const record = useDraftStore.getState().drafts[draftKey];
+        return record?.lifecycle === "active" ? record.input.text : "";
+      },
+      subscribe: (listener) =>
+        useDraftStore.subscribe((state, previous) => {
+          if (
+            state.drafts[draftKey]?.input.text !== previous.drafts[draftKey]?.input.text ||
+            state.drafts[draftKey]?.lifecycle !== previous.drafts[draftKey]?.lifecycle
+          )
+            listener();
+        }),
+    }),
+    [draftKey],
+  );
   const attachmentFocusRequestId = useDraftStore(
     (state) => state.attachmentFocusRequestByDraftKey[draftKey] ?? 0,
   );
   const [hydratedDraftKey, setHydratedDraftKey] = useState<string | null>(null);
-  const text = draft?.text ?? "";
-  const attachments = draft?.attachments ?? [];
   const isHydrated = hydratedDraftKey === draftKey;
   const textReplacementRevisionRef = useRef(0);
   const [textReplacement, setTextReplacement] = useState<TextReplacement>(() => ({
+    kind: "initial",
     key: `${draftKey}:0`,
-    text,
+    text: textSource.getSnapshot(),
   }));
 
   const publishTextReplacement = useCallback(
     (nextText: string) => {
       textReplacementRevisionRef.current += 1;
       setTextReplacement({
+        kind: "replace",
         key: `${draftKey}:${textReplacementRevisionRef.current}`,
         text: nextText,
       });
@@ -131,9 +154,9 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   const textPublication = useMemo(
     () =>
       new AfterPaintPublication<string>((nextText) => {
-        saveDraft((current) => ({ ...current, text: nextText }));
+        useDraftStore.getState().editDraftText({ draftKey, text: nextText });
       }),
-    [saveDraft],
+    [draftKey],
   );
 
   const editText = useCallback(
@@ -141,19 +164,19 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
       if (isWeb) {
         textPublication.stage(nextText);
       } else {
-        saveDraft((current) => ({ ...current, text: nextText }));
+        useDraftStore.getState().editDraftText({ draftKey, text: nextText });
       }
     },
-    [saveDraft, textPublication],
+    [draftKey, textPublication],
   );
 
   const replaceText = useCallback(
     (nextText: string) => {
       textPublication.cancel();
-      saveDraft((current) => ({ ...current, text: nextText }));
+      useDraftStore.getState().editDraftText({ draftKey, text: nextText });
       publishTextReplacement(nextText);
     },
-    [publishTextReplacement, saveDraft, textPublication],
+    [draftKey, publishTextReplacement, textPublication],
   );
 
   const setAttachments = useCallback(
@@ -214,17 +237,6 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     };
   }, [draftKey, publishTextReplacement]);
 
-  const lockedWorkingDir = composerOptions?.lockedWorkingDir?.trim() ?? "";
-  useEffect(() => {
-    if (!composerOptions || !lockedWorkingDir) {
-      return;
-    }
-    if (formState.workingDir.trim() === lockedWorkingDir) {
-      return;
-    }
-    formState.setWorkingDir(lockedWorkingDir);
-  }, [composerOptions, formState, lockedWorkingDir]);
-
   const providerSelection = useMemo<ProviderSelectionState>(
     () => ({
       provider: formState.selectedProvider,
@@ -254,7 +266,6 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     [effectiveModelId, providerSelection],
   );
 
-  const workingDir = lockedWorkingDir || formState.workingDir;
   const {
     features: draftFeatures,
     featureValues: draftFeatureValues,
@@ -278,19 +289,16 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     [applyProfileFeatureValues, formState],
   );
 
-  const commandDraftConfig = useMemo(
+  const commandDraft = useMemo(
     () =>
-      composerOptions
-        ? buildDraftCommandConfig({
-            selection: providerSelection,
-            cwd: workingDir,
-            effectiveModelId,
-            effectiveThinkingOptionId,
-            featureValues: draftFeatureValues,
-          })
-        : undefined,
+      buildDraftCommandTarget({
+        selection: providerSelection,
+        cwd: workingDir,
+        effectiveModelId,
+        effectiveThinkingOptionId,
+        featureValues: draftFeatureValues,
+      }),
     [
-      composerOptions,
       effectiveModelId,
       effectiveThinkingOptionId,
       draftFeatureValues,
@@ -316,10 +324,10 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
         onSetFeature: setDraftFeatureValue,
         onApplyAgentProfile: applyDraftAgentProfile,
       }),
-      commandDraftConfig,
+      commandDraft,
     };
   }, [
-    commandDraftConfig,
+    commandDraft,
     composerOptions,
     effectiveModelId,
     effectiveThinkingOptionId,
@@ -332,7 +340,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   ]);
 
   return {
-    text,
+    textSource,
     editText,
     replaceText,
     textReplacement,
@@ -349,7 +357,6 @@ export const __private__ = {
   resolveDraftKey,
   resolveEffectiveComposerModelId,
   resolveEffectiveComposerThinkingOptionId,
-  buildDraftCommandConfig,
-  buildDraftComposerCommandConfig: buildDraftCommandConfig,
+  buildDraftCommandTarget,
   buildDraftAgentControls,
 };
diff --git a/packages/app/src/composer/draft/workspace-tab.tsx b/packages/app/src/composer/draft/workspace-tab.tsx
index 167a8886b8..6e9c45eab5 100644
--- a/packages/app/src/composer/draft/workspace-tab.tsx
+++ b/packages/app/src/composer/draft/workspace-tab.tsx
@@ -1,10 +1,8 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { Keyboard, ScrollView, StyleSheet as RNStyleSheet, Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
-import ReanimatedAnimated from "react-native-reanimated";
 import { StyleSheet } from "react-native-unistyles";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
+import { ComposerDock } from "@/composer/dock";
 import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import invariant from "tiny-invariant";
 import { Composer } from "@/composer";
@@ -17,7 +15,7 @@ import { useAgentInputDraft } from "@/composer/draft/input-draft";
 import type { CreateAgentInitialValues } from "@/hooks/use-agent-form-state";
 import { useDraftAgentCreateFlow, type DraftCreateAttempt } from "@/composer/draft/create-flow";
 import { resolveTurnPresentation, TURN_LIVENESS_IDLE } from "@/timeline/turn-liveness";
-import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useHostRuntimeClient } from "@/runtime/host-runtime";
 import { buildWorkspaceDraftAgentConfig } from "@/screens/workspace/workspace-draft-agent-config";
 import { buildDraftStoreKey } from "@/stores/draft-keys";
 import { useCreateFlowStore } from "@/stores/create-flow-store";
@@ -42,11 +40,7 @@ import {
   useWorkspaceAttachmentsStore,
 } from "@/attachments/workspace-attachments-store";
 import type { UserMessageImageAttachment } from "@/types/stream";
-import {
-  COMPACT_FORM_FACTOR_WIDTH,
-  MAX_CONTENT_WIDTH,
-  useIsCompactFormFactor,
-} from "@/constants/layout";
+import { COMPACT_FORM_FACTOR_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
 import { isWeb } from "@/constants/platform";
 import {
   buildWorkspaceTabPersistenceKey,
@@ -56,7 +50,6 @@ import { openWorkspaceChanges } from "@/workspace-tabs/open-supporting-view";
 import { useSettings } from "@/hooks/use-settings";
 
 const EMPTY_PENDING_PERMISSIONS = new Map();
-const EMPTY_ONLINE_SERVER_IDS: string[] = [];
 const DRAFT_CAPABILITIES: AgentCapabilityFlags = {
   supportsStreaming: true,
   supportsSessionPersistence: false,
@@ -138,6 +131,7 @@ function resolveDraftModeId(input: {
 }
 
 async function submitDraftCreateRequest(input: {
+  draftId: string;
   attempt: { clientMessageId: string };
   text: string;
   images?: UserMessageImageAttachment[];
@@ -196,16 +190,19 @@ async function submitDraftCreateRequest(input: {
     featureValues: autoSubmitConfig?.featureValues ?? composerState.featureValues,
   });
 
-  const imagesData = await encodeImages(images);
   const attachmentsArray = Array.isArray(attachments) ? attachments : undefined;
-  const result = await client.createAgent({
+  const imagesData = await encodeImages(images);
+  const options = {
+    idempotencyKey: input.draftId,
     config,
     workspaceId,
-    ...(text ? { initialPrompt: text } : {}),
+    initialPrompt: text,
     clientMessageId: attempt.clientMessageId,
     ...(imagesData && imagesData.length > 0 ? { images: imagesData } : {}),
     ...(attachmentsArray && attachmentsArray.length > 0 ? { attachments: attachmentsArray } : {}),
-  });
+  };
+  const creation = useWorkspaceDraftSubmissionStore.getState().creationByDraftId[input.draftId];
+  const result = creation ? await creation.retry(options) : await client.createAgent(options);
 
   return {
     agentId: result.id,
@@ -249,7 +246,7 @@ function buildDraftAgentSnapshot(input: {
     id: tabId,
     provider,
     status: "running",
-    activeTurn: null,
+    turn: { phase: "idle", cancellationRequestId: null },
     createdAt: now,
     updatedAt: now,
     lastUserMessageAt: now,
@@ -271,17 +268,10 @@ function buildDraftAgentSnapshot(input: {
 }
 
 function buildDraftInitialValues(input: {
-  workingDir: string | null;
   initialSetup: WorkspaceDraftTabSetup | null;
 }): CreateAgentInitialValues | undefined {
-  if (!input.workingDir) {
-    return undefined;
-  }
-  if (!input.initialSetup) {
-    return { workingDir: input.workingDir };
-  }
+  if (!input.initialSetup) return undefined;
   return {
-    workingDir: input.workingDir,
     provider: input.initialSetup.provider,
     modeId: input.initialSetup.modeId,
     model: input.initialSetup.model,
@@ -299,13 +289,6 @@ function resolveDraftWorkingDirectory(input: {
   return input.workspaceDirectory;
 }
 
-function resolveOnlineServerIds(input: { isConnected: boolean; serverId: string }): string[] {
-  if (!input.isConnected) {
-    return EMPTY_ONLINE_SERVER_IDS;
-  }
-  return [input.serverId];
-}
-
 interface WorkspaceDraftAgentTabProps {
   serverId: string;
   workspaceId: string;
@@ -340,9 +323,7 @@ export function WorkspaceDraftAgentTab({
   onOpenImportSheet,
 }: WorkspaceDraftAgentTabProps) {
   const { t } = useTranslation();
-  const insets = useSafeAreaInsets();
   const client = useHostRuntimeClient(serverId);
-  const isConnected = useHostRuntimeIsConnected(serverId);
   const workspaceFields = useWorkspaceFields(serverId, workspaceId, (w) => ({
     workspaceDirectory: w.workspaceDirectory,
     id: w.id,
@@ -354,10 +335,8 @@ export function WorkspaceDraftAgentTab({
     initialSetup: draftSetup,
   });
   const draftInitialValues = buildDraftInitialValues({
-    workingDir: draftWorkingDirectory,
     initialSetup: draftSetup,
   });
-  const onlineServerIds = resolveOnlineServerIds({ isConnected, serverId });
   const draftStoreKey = useMemo(
     () =>
       buildDraftStoreKey({
@@ -374,7 +353,6 @@ export function WorkspaceDraftAgentTab({
       initialValues: draftInitialValues,
       initialFeatureValues: draftSetup?.featureValues,
       isVisible: true,
-      onlineServerIds,
       lockedWorkingDir: draftWorkingDirectory ?? undefined,
     },
   });
@@ -410,10 +388,7 @@ export function WorkspaceDraftAgentTab({
   );
   const autoSubmitConfig = resolveAutoSubmitConfig(pendingAutoSubmit);
   const initialCreateAttempt = useMemo<DraftCreateAttempt | null>(() => {
-    if (!pendingAutoSubmit || !pendingCreateAttempt) {
-      return null;
-    }
-    if (pendingAutoSubmit.clientMessageId !== pendingCreateAttempt.clientMessageId) {
+    if (!pendingCreateAttempt) {
       return null;
     }
     return {
@@ -427,7 +402,7 @@ export function WorkspaceDraftAgentTab({
         ? { attachments: pendingCreateAttempt.attachments }
         : {}),
     };
-  }, [pendingAutoSubmit, pendingCreateAttempt]);
+  }, [pendingCreateAttempt]);
   const allowsEmptyAutoSubmit = pendingAutoSubmit?.allowEmptyText === true;
   const isCompactFormFactor = useIsCompactFormFactor();
   const { onLayout: onInputAreaLayout, isBelow: isCompactComposerLayout } = useContainerWidthBelow(
@@ -507,8 +482,13 @@ export function WorkspaceDraftAgentTab({
         composerState,
         selectModelMessage: t("workspaceSetup.errors.selectModel"),
       }),
-    createRequest: async ({ attempt, text, images, attachments, cwd }) =>
-      submitDraftCreateRequest({
+    createRequest: async ({ attempt, text, images, attachments, cwd }) => {
+      if (pendingAutoSubmit?.agentCreation) {
+        const result = await pendingAutoSubmit.agentCreation.result;
+        return { agentId: result.id, result };
+      }
+      return submitDraftCreateRequest({
+        draftId,
         attempt,
         text,
         images,
@@ -521,7 +501,8 @@ export function WorkspaceDraftAgentTab({
         composerState,
         hostDisconnectedMessage: t("workspace.terminal.hostDisconnected"),
         selectModelMessage: t("workspaceSetup.errors.selectModel"),
-      }),
+      });
+    },
     onCreateSuccess: ({ result }) => {
       clearDraftInput("sent");
       clearWorkspaceAttachments({ scopeKey: draftAttachmentScopeKey });
@@ -624,19 +605,6 @@ export function WorkspaceDraftAgentTab({
     focusInputRef.current = focus;
   }, []);
 
-  const { style: composerKeyboardStyle } = useKeyboardShiftStyle({
-    mode: "translate",
-  });
-
-  const inputAreaWrapperStyle = useMemo(
-    () => [
-      animatedStaticStyles.inputAreaWrapper,
-      { paddingBottom: insets.bottom },
-      composerKeyboardStyle,
-    ],
-    [insets.bottom, composerKeyboardStyle],
-  );
-
   const handleDropdownCloseFocus = useCallback(() => {
     focusInputRef.current?.();
   }, []);
@@ -649,69 +617,73 @@ export function WorkspaceDraftAgentTab({
     }),
     [composerState.agentControls, handleDropdownCloseFocus, isSubmitting],
   );
+  const dockContent = (
+    <View style={styles.contentContainer}>
+      {isSubmitting && draftAgent ? (
+        <View style={styles.streamContainer}>
+          <AgentStreamView
+            agentId={tabId}
+            serverId={serverId}
+            context={draftAgent}
+            streamItems={submittedStreamItems}
+            pendingMessageSubmissions={pendingMessageSubmissions}
+            turnPresentation={turnPresentation}
+            pendingPermissions={EMPTY_PENDING_PERMISSIONS}
+            onOpenWorkspaceFile={onOpenWorkspaceFile}
+          />
+        </View>
+      ) : (
+        <ScrollView style={styles.scrollView} contentContainerStyle={styles.configScrollContent}>
+          <View style={styles.configSection}>
+            {formErrorMessage ? (
+              <View style={styles.errorContainer}>
+                <Text style={styles.errorText}>{formErrorMessage}</Text>
+              </View>
+            ) : null}
+          </View>
+        </ScrollView>
+      )}
+    </View>
+  );
+
   return (
     <FileDropZone style={styles.container}>
-      <View style={styles.contentContainer}>
-        {isSubmitting && draftAgent ? (
-          <View style={styles.streamContainer}>
-            <AgentStreamView
-              agentId={tabId}
-              serverId={serverId}
-              context={draftAgent}
-              streamItems={submittedStreamItems}
-              pendingMessageSubmissions={pendingMessageSubmissions}
-              turnPresentation={turnPresentation}
-              pendingPermissions={EMPTY_PENDING_PERMISSIONS}
-              onOpenWorkspaceFile={onOpenWorkspaceFile}
-            />
-          </View>
-        ) : (
-          <ScrollView style={styles.scrollView} contentContainerStyle={styles.configScrollContent}>
-            <View style={styles.configSection}>
-              {formErrorMessage ? (
-                <View style={styles.errorContainer}>
-                  <Text style={styles.errorText}>{formErrorMessage}</Text>
-                </View>
-              ) : null}
+      <ComposerDock>
+        {dockContent}
+        <View style={animatedStaticStyles.inputAreaWrapper} onLayout={onInputAreaLayout}>
+          {importPillPress ? (
+            <View style={styles.importPillRow}>
+              <View style={styles.importPillContent}>
+                <ComposerImportPill onPress={importPillPress} />
+              </View>
             </View>
-          </ScrollView>
-        )}
-      </View>
-
-      <ReanimatedAnimated.View style={inputAreaWrapperStyle} onLayout={onInputAreaLayout}>
-        {importPillPress ? (
-          <View style={styles.importPillRow}>
-            <View style={styles.importPillContent}>
-              <ComposerImportPill onPress={importPillPress} />
-            </View>
-          </View>
-        ) : null}
-        <Composer
-          agentId={tabId}
-          serverId={serverId}
-          workspaceId={workspaceId}
-          externalKeyboardShift
-          isPaneFocused={isPaneFocused}
-          onSubmitMessage={handleCreateFromInput}
-          isSubmitLoading={isSubmitting}
-          blurOnSubmit={true}
-          value={draftInput.text}
-          onChangeText={draftInput.editText}
-          textReplacement={draftInput.textReplacement}
-          attachments={draftInput.attachments}
-          attachmentScopeKeys={attachmentScopeKeys}
-          onOpenWorkspaceAttachment={handleOpenWorkspaceAttachment}
-          onChangeAttachments={draftInput.setAttachments}
-          cwd={composerState.workingDir}
-          clearDraft={draftInput.clear}
-          autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
-          autoFocusKey={String(draftInput.attachmentFocusRequestId)}
-          onFocusInput={handleFocusInputCallback}
-          commandDraftConfig={composerState.commandDraftConfig}
-          agentControls={composerAgentControls}
-          isCompactLayout={isCompactComposerLayout}
-        />
-      </ReanimatedAnimated.View>
+          ) : null}
+          <Composer
+            agentId={tabId}
+            serverId={serverId}
+            workspaceId={workspaceId}
+            isPaneFocused={isPaneFocused}
+            onSubmitMessage={handleCreateFromInput}
+            isSubmitLoading={isSubmitting}
+            blurOnSubmit={true}
+            textSource={draftInput.textSource}
+            onChangeText={draftInput.editText}
+            textReplacement={draftInput.textReplacement}
+            attachments={draftInput.attachments}
+            attachmentScopeKeys={attachmentScopeKeys}
+            onOpenWorkspaceAttachment={handleOpenWorkspaceAttachment}
+            onChangeAttachments={draftInput.setAttachments}
+            cwd={composerState.workingDir}
+            clearDraft={draftInput.clear}
+            autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
+            autoFocusKey={String(draftInput.attachmentFocusRequestId)}
+            onFocusInput={handleFocusInputCallback}
+            commandDraft={composerState.commandDraft}
+            agentControls={composerAgentControls}
+            isCompactLayout={isCompactComposerLayout}
+          />
+        </View>
+      </ComposerDock>
     </FileDropZone>
   );
 }
@@ -719,6 +691,7 @@ export function WorkspaceDraftAgentTab({
 const animatedStaticStyles = RNStyleSheet.create({
   inputAreaWrapper: {
     width: "100%",
+    flexShrink: 1,
   },
 });
 
@@ -760,7 +733,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   importPillContent: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     flexDirection: "row",
   },
   errorContainer: {
diff --git a/packages/app/src/composer/editing-session/index.test.ts b/packages/app/src/composer/editing-session/index.test.ts
new file mode 100644
index 0000000000..d593e5a64e
--- /dev/null
+++ b/packages/app/src/composer/editing-session/index.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest";
+import { ComposerEditingSession } from "./index";
+
+function leaveLiveDraft(session: ComposerEditingSession) {
+  session.captureForRemount({
+    snapshot: { text: "Unpublished live draft", selection: { start: 4, end: 17 } },
+    focused: true,
+    replacementKey: "draft:applied",
+  });
+}
+
+describe("composer editing remount handoff", () => {
+  it("keeps live text and selection when remounting from an initial draft publication", () => {
+    const session = new ComposerEditingSession();
+    leaveLiveDraft(session);
+    const handoff = session.takeHandoff({ kind: "initial", key: "draft:initial", text: "stale" });
+    expect(handoff?.snapshot).toEqual({
+      text: "Unpublished live draft",
+      selection: { start: 4, end: 17 },
+    });
+    expect(handoff?.focused).toBe(true);
+  });
+
+  it("keeps local edits when the last applied replacement is still current", () => {
+    const session = new ComposerEditingSession();
+    leaveLiveDraft(session);
+    const handoff = session.takeHandoff({
+      kind: "replace",
+      key: "draft:applied",
+      text: "old replacement",
+    });
+    expect(handoff?.snapshot).toEqual({
+      text: "Unpublished live draft",
+      selection: { start: 4, end: 17 },
+    });
+  });
+
+  it.each(["New explicit draft", ""])(
+    "honors an explicit replacement made while the editor is absent: %j",
+    (text) => {
+      const session = new ComposerEditingSession();
+      leaveLiveDraft(session);
+      const handoff = session.takeHandoff({ kind: "replace", key: "draft:new", text });
+      expect(handoff?.snapshot).toEqual({
+        text,
+        selection: { start: text.length, end: text.length },
+      });
+      expect(handoff?.focused).toBe(true);
+      expect(session.takeHandoff({ kind: "replace", key: "draft:new", text })).toBeNull();
+    },
+  );
+});
diff --git a/packages/app/src/composer/editing-session/index.tsx b/packages/app/src/composer/editing-session/index.tsx
new file mode 100644
index 0000000000..97f7a79c51
--- /dev/null
+++ b/packages/app/src/composer/editing-session/index.tsx
@@ -0,0 +1,142 @@
+import React, {
+  createContext,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+  useSyncExternalStore,
+  type ReactNode,
+} from "react";
+import type { TextReplacement } from "@/composer/types";
+import type { ComposerInputMode } from "@/composer/input-mode";
+
+export interface ComposerEditingHandoff {
+  snapshot: { text: string; selection: { start: number; end: number } };
+  focused: boolean;
+  replacementKey: string;
+}
+
+/** Editing metadata outlives a layout's input; draft text still belongs to its draft owner. */
+export class ComposerEditingSession {
+  private fullscreen = false;
+  private handoff: ComposerEditingHandoff | null = null;
+  private listeners = new Set<() => void>();
+  getFullscreen = () => this.fullscreen;
+  subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  changePresentation(fullscreen: boolean, handoff: ComposerEditingHandoff) {
+    this.captureForRemount(handoff);
+    if (fullscreen === this.fullscreen) return;
+    this.fullscreen = fullscreen;
+    for (const listener of this.listeners) listener();
+  }
+  captureForRemount(handoff: ComposerEditingHandoff) {
+    this.handoff = handoff;
+  }
+  peekHandoff(replacement: TextReplacement): ComposerEditingHandoff | null {
+    const handoff = this.handoff;
+    if (!handoff || replacement.kind === "initial" || replacement.key === handoff.replacementKey)
+      return handoff;
+    // A replacement command issued since capture supersedes the old editor's live buffer.
+    return {
+      snapshot: {
+        text: replacement.text,
+        selection: { start: replacement.text.length, end: replacement.text.length },
+      },
+      focused: handoff.focused,
+      replacementKey: replacement.key,
+    };
+  }
+  takeHandoff(replacement: TextReplacement) {
+    const handoff = this.peekHandoff(replacement);
+    this.handoff = null;
+    return handoff;
+  }
+}
+
+class ComposerEditingSessions {
+  private workspaces = new Map<
+    string,
+    Map<string, { targetKey: string; sessions: Map<ComposerInputMode, ComposerEditingSession> }>
+  >();
+  get(workspaceKey: string, tabId: string, targetKey: string, purpose: ComposerInputMode) {
+    let workspace = this.workspaces.get(workspaceKey);
+    if (!workspace) {
+      workspace = new Map();
+      this.workspaces.set(workspaceKey, workspace);
+    }
+    let tab = workspace.get(tabId);
+    if (!tab || tab.targetKey !== targetKey) {
+      tab = { targetKey, sessions: new Map() };
+      workspace.set(tabId, tab);
+    }
+    let session = tab.sessions.get(purpose);
+    if (!session) {
+      session = new ComposerEditingSession();
+      tab.sessions.set(purpose, session);
+    }
+    return session;
+  }
+  retain(workspaceKey: string, tabIds: readonly string[]) {
+    const workspace = this.workspaces.get(workspaceKey);
+    if (!workspace) return;
+    const retained = new Set(tabIds);
+    for (const tabId of workspace.keys()) if (!retained.has(tabId)) workspace.delete(tabId);
+    if (workspace.size === 0) this.workspaces.delete(workspaceKey);
+  }
+}
+
+const SessionsContext = createContext<ComposerEditingSessions | null>(null);
+const WorkspaceContext = createContext<string | null>(null);
+const ScopeContext = createContext<{ tabId: string; targetKey: string } | null>(null);
+
+/** App-container ownership survives replacement of both the gesture shell and tab layout. */
+export function ComposerEditingSessionsProvider({ children }: { children: ReactNode }) {
+  const [sessions] = useState(() => new ComposerEditingSessions());
+  return <SessionsContext.Provider value={sessions}>{children}</SessionsContext.Provider>;
+}
+export function WorkspaceComposerEditingSessionsProvider({
+  workspaceKey,
+  tabIds,
+  children,
+}: {
+  workspaceKey: string;
+  tabIds: readonly string[];
+  children: ReactNode;
+}) {
+  const sessions = useContext(SessionsContext);
+  useEffect(() => sessions?.retain(workspaceKey, tabIds), [sessions, workspaceKey, tabIds]);
+  return <WorkspaceContext.Provider value={workspaceKey}>{children}</WorkspaceContext.Provider>;
+}
+export function ComposerEditingScope({
+  tabId,
+  targetKey,
+  children,
+}: {
+  tabId: string;
+  targetKey: string;
+  children: ReactNode;
+}) {
+  const scope = useMemo(() => ({ tabId, targetKey }), [tabId, targetKey]);
+  return <ScopeContext.Provider value={scope}>{children}</ScopeContext.Provider>;
+}
+export function useComposerEditingSession(
+  purpose: ComposerInputMode,
+  provided?: ComposerEditingSession,
+): ComposerEditingSession {
+  const sessions = useContext(SessionsContext);
+  const scope = useContext(ScopeContext);
+  const workspaceKey = useContext(WorkspaceContext);
+  const [local] = useState(() => provided ?? new ComposerEditingSession());
+  if (provided) return provided;
+  return sessions && scope && workspaceKey
+    ? sessions.get(workspaceKey, scope.tabId, scope.targetKey, purpose)
+    : local;
+}
+export function useComposerFullscreen(session: ComposerEditingSession): boolean {
+  return useSyncExternalStore(session.subscribe, session.getFullscreen, session.getFullscreen);
+}
diff --git a/packages/app/src/composer/index.tsx b/packages/app/src/composer/index.tsx
index 989382fe79..c77b39d332 100644
--- a/packages/app/src/composer/index.tsx
+++ b/packages/app/src/composer/index.tsx
@@ -1,3 +1,8 @@
+import { useComposerEditingSession, useComposerFullscreen } from "./editing-session";
+import type { ComposerTextSource } from "./text-source";
+import { createStore, type StoreApi } from "zustand/vanilla";
+import { useStore } from "zustand";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
   View,
@@ -10,16 +15,19 @@ import type { TFunction } from "i18next";
 import {
   useState,
   useEffect,
+  useLayoutEffect,
   useRef,
   useCallback,
   useMemo,
+  useSyncExternalStore,
+  useImperativeHandle,
   memo,
   type ReactElement,
-  type ReactNode,
 } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
+import { useHasFinePointer } from "@/hooks/use-fine-pointer";
 import { useShallow } from "zustand/shallow";
 import {
   ArrowUp,
@@ -34,8 +42,7 @@ import {
   Paperclip,
 } from "lucide-react-native";
 import * as Clipboard from "expo-clipboard";
-import Animated from "react-native-reanimated";
-import { FOOTER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
+import { FOOTER_HEIGHT } from "@/constants/layout";
 import {
   AgentControls,
   DraftAgentControls,
@@ -55,7 +62,7 @@ import {
 } from "./input/input";
 import type { ImageAttachment, MessagePayload, TextReplacement } from "./types";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
-import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
 import { encodeImages } from "@/utils/encode-images";
 import { focusWithRetries } from "@/utils/web-focus";
 import {
@@ -102,7 +109,6 @@ import {
 import { resolveAgentControlsMode } from "@/composer/agent-controls/mode";
 import { resolveComposerInputMode, type ComposerInputMode } from "@/composer/input-mode";
 import { resolveActiveSendBehavior } from "./input/state";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
@@ -121,14 +127,19 @@ import type {
   WorkspaceFileComposerAttachment,
   WorkspaceComposerAttachment,
 } from "@/attachments/types";
-import type { PickedFile } from "@/attachments/picked-file";
+import type { SelectedFile } from "@/attachments/selected-file";
 import { resolveComposerAttachmentSubmitFormat } from "@/composer/attachments/submit";
 import { composerWorkspaceAttachment } from "@/composer/attachments/workspace";
 import { useWorkspaceAttachmentsForScopes } from "@/attachments/workspace-attachments-store";
-import { droppedItemsToPickedFiles } from "@/composer/attachments/drop";
+import { droppedItemsToSelectedFiles } from "@/composer/attachments/drop";
 import { getFileTypeLabel } from "@/attachments/file-types";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { AttachmentLabel, AttachmentPill, AttachmentThumbnail } from "@/components/attachment-pill";
+import {
+  AttachmentFrame,
+  AttachmentLabel,
+  AttachmentPill,
+  AttachmentThumbnail,
+} from "@/components/attachment-pill";
 import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { useIsDictationReady } from "@/hooks/use-is-dictation-ready";
@@ -264,46 +275,10 @@ function buildAgentStateSelector(serverId: string, agentId: string) {
       contextWindowUsedTokens: agent?.lastUsage?.contextWindowUsedTokens ?? null,
       totalCostUsd: agent?.lastUsage?.totalCostUsd ?? null,
       model: agent?.model ?? null,
-      provider: agent?.provider ?? null,
     };
   };
 }
 
-function renderContextWindowMeter(
-  contextWindowMaxTokens: number | null,
-  contextWindowUsedTokens: number | null,
-  totalCostUsd: number | null,
-  showPercentage: boolean,
-  serverId: string,
-  provider: string | null,
-  pending: boolean,
-  glyphSize: number,
-): ReactElement | null {
-  const hasData = contextWindowMaxTokens !== null && contextWindowUsedTokens !== null;
-  if (!hasData && !pending) {
-    return null;
-  }
-  return (
-    <ContextWindowMeter
-      maxTokens={contextWindowMaxTokens}
-      usedTokens={contextWindowUsedTokens}
-      totalCostUsd={totalCostUsd}
-      showPercentage={showPercentage}
-      serverId={serverId}
-      provider={provider}
-      pending={pending}
-      glyphSize={glyphSize}
-    />
-  );
-}
-
-function resolveContextWindowPlacement(
-  meter: ReactElement | null,
-  reserveSlot: boolean,
-): ReactNode {
-  return reserveSlot ? <View style={styles.contextWindowMeterSlot}>{meter}</View> : null;
-}
-
 interface RenderLeftContentArgs {
   agentControls: DraftAgentControlsProps | undefined;
   agentId: string;
@@ -329,8 +304,14 @@ function renderLeftContent(args: RenderLeftContentArgs): ReactElement | null {
   );
 }
 
+interface PendingFileAttachment {
+  id: number;
+  file: SelectedFile;
+}
+
 interface RenderAttachmentTrayArgs {
   selectedAttachments: ComposerAttachment[];
+  pendingFiles: PendingFileAttachment[];
   isComposerLocked: boolean;
   handleOpenAttachment: (attachment: ComposerAttachment) => void;
   handleRemoveAttachment: (index: number) => void;
@@ -346,12 +327,13 @@ interface RenderAttachmentTrayArgs {
 function renderAttachmentTray(args: RenderAttachmentTrayArgs): ReactElement | null {
   const {
     selectedAttachments,
+    pendingFiles,
     isComposerLocked,
     handleOpenAttachment,
     handleRemoveAttachment,
     labels,
   } = args;
-  if (selectedAttachments.length === 0) return null;
+  if (selectedAttachments.length === 0 && pendingFiles.length === 0) return null;
   return (
     <View style={styles.attachmentTray} testID="composer-attachment-tray">
       {selectedAttachments.map((attachment, index) =>
@@ -364,6 +346,15 @@ function renderAttachmentTray(args: RenderAttachmentTrayArgs): ReactElement | nu
           labels,
         }),
       )}
+      {pendingFiles.map(({ id, file }) => (
+        <AttachmentFrame key={id} testID="composer-pending-file-attachment">
+          <AttachmentLabel
+            icon={pendingFilePillIcon}
+            title={file.fileName}
+            subtitle={getFileTypeLabel(file.fileName) ?? ""}
+          />
+        </AttachmentFrame>
+      ))}
     </View>
   );
 }
@@ -934,7 +925,7 @@ interface ComposerProps {
   submitBehavior?: "clear" | "preserve-and-lock";
   /** When true, blurs the input immediately when submitting. */
   blurOnSubmit?: boolean;
-  value: string;
+  textSource: ComposerTextSource;
   onChangeText: (text: string) => void;
   textReplacement: TextReplacement;
   attachments: UserComposerAttachment[];
@@ -951,8 +942,8 @@ interface ComposerProps {
   autoFocusKey?: string;
   /** Callback to expose a focus function to parent components (desktop only). */
   onFocusInput?: (focus: () => void) => void;
-  /** Optional draft context for listing commands before an agent exists. */
-  commandDraftConfig?: DraftCommandConfig;
+  /** Draft context for listing commands before an agent exists. Omitted for running agents. */
+  commandDraft?: DraftCommandTarget;
   /** Called when a message is about to be sent (any path: keyboard, dictation, queued). */
   onMessageSent?: () => void;
   onComposerHeightChange?: (height: number) => void;
@@ -962,8 +953,6 @@ interface ComposerProps {
   agentControls?: DraftAgentControlsProps;
   /** Extra styles merged onto the message input wrapper (e.g. elevated background). */
   inputWrapperStyle?: import("react-native").ViewStyle;
-  /** When true, a parent wrapper owns the keyboard shift, so the composer skips its own. */
-  externalKeyboardShift?: boolean;
   /** Optional panel/container layout breakpoint. Defaults to the screen breakpoint. */
   isCompactLayout?: boolean;
   /**
@@ -972,7 +961,7 @@ interface ComposerProps {
    * and nothing else — never branch on it at the call site.
    */
   inputMode?: ComposerInputMode;
-  /** Renders `value` as static text on the same surface, for content there is nothing to type into. */
+  /** Renders the current text as static text on the same surface, for content there is nothing to type into. */
   readOnly?: boolean;
   /** Replaces the submit icon with this label, still inside the composer's own toolbar row. */
   submitLabel?: string;
@@ -980,19 +969,85 @@ interface ComposerProps {
   placeholder?: string;
 }
 
-const MAX_FILE_SIZE_BYTES = 50 * 1024 * 1024;
-
 const EMPTY_ARRAY: readonly QueuedMessage[] = [];
 const StableMessageInput = memo(MessageInput);
 
-function resolveContextWindowValues(
-  rawMax: number | null,
-  rawUsed: number | null,
-): { contextWindowMaxTokens: number | null; contextWindowUsedTokens: number | null } {
-  if (typeof rawMax === "number" && typeof rawUsed === "number") {
-    return { contextWindowMaxTokens: rawMax, contextWindowUsedTokens: rawUsed };
-  }
-  return { contextWindowMaxTokens: null, contextWindowUsedTokens: null };
+interface ComposerAutocompleteHandle {
+  onKeyPress: (event: ComposerKeyPressEvent) => boolean;
+}
+
+function ComposerAutocompleteBinding({
+  text,
+  cursor,
+  configuration,
+  inputRef,
+  anchorRef,
+  show,
+  ref,
+}: {
+  text: ComposerTextSource;
+  cursor: StoreApi<number>;
+  configuration: Omit<
+    Parameters<typeof useAgentAutocomplete>[0],
+    "userInput" | "cursorIndex" | "onAutocompleteApplied"
+  >;
+  inputRef: React.RefObject<MessageInputRef | null>;
+  anchorRef: React.RefObject<View | null>;
+  show: boolean;
+  ref: React.Ref<ComposerAutocompleteHandle>;
+}) {
+  const userInput = useSyncExternalStore(text.subscribe, text.getSnapshot, text.getSnapshot);
+  const cursorIndex = useStore(cursor);
+  const autocomplete = useAgentAutocomplete({
+    ...configuration,
+    userInput,
+    cursorIndex: Math.min(cursorIndex, userInput.length),
+    onAutocompleteApplied: () => inputRef.current?.focus(),
+  });
+  const handleKeyPress = autocomplete.onKeyPress;
+  useImperativeHandle(ref, () => ({ onKeyPress: (event) => show && handleKeyPress(event) }), [
+    show,
+    handleKeyPress,
+  ]);
+  const selectOption = autocomplete.onSelectOption;
+  const onSelect = useCallback(
+    (option: AutocompleteOption) => selectOption(option, inputRef.current?.getInputSnapshot()),
+    [selectOption, inputRef],
+  );
+  return (
+    <ComposerAutocomplete
+      visible={autocomplete.isVisible && show}
+      anchorRef={anchorRef}
+      options={autocomplete.options}
+      selectedIndex={autocomplete.selectedIndex}
+      onSelect={onSelect}
+      isLoading={autocomplete.isLoading}
+      errorMessage={autocomplete.errorMessage}
+      loadingText={autocomplete.loadingText}
+      emptyText={autocomplete.emptyText}
+    />
+  );
+}
+
+function ComposerForgeBinding({
+  text,
+  configuration,
+  ref,
+  onResolvingChange,
+}: {
+  text: ComposerTextSource;
+  configuration: Omit<Parameters<typeof useComposerForgeAutoAttach>[0], "text">;
+  ref: React.Ref<ReturnType<typeof useComposerForgeAutoAttach>>;
+  onResolvingChange: (resolving: boolean) => void;
+}) {
+  const value = useSyncExternalStore(text.subscribe, text.getSnapshot, text.getSnapshot);
+  const binding = useComposerForgeAutoAttach({ ...configuration, text: value });
+  useImperativeHandle(ref, () => binding, [binding]);
+  useLayoutEffect(
+    () => onResolvingChange(binding.isResolving),
+    [binding.isResolving, onResolvingChange],
+  );
+  return null;
 }
 
 interface ComposerCancelButtonProps {
@@ -1156,7 +1211,7 @@ function ComposerContentImpl({
   waitForForgeAutoAttachOnSubmit = false,
   submitBehavior = "clear",
   blurOnSubmit = false,
-  value,
+  textSource,
   onChangeText,
   textReplacement,
   attachments,
@@ -1170,14 +1225,13 @@ function ComposerContentImpl({
   autoFocus = false,
   autoFocusKey,
   onFocusInput,
-  commandDraftConfig,
+  commandDraft,
   onMessageSent,
   onComposerHeightChange,
   onAttentionInputFocus,
   onAttentionPromptSend,
   agentControls,
   inputWrapperStyle,
-  externalKeyboardShift,
   isCompactLayout: isCompactLayoutOverride,
   inputMode = "chat",
   readOnly = false,
@@ -1216,9 +1270,14 @@ function ComposerContentImpl({
   const isCompactFormFactor = useIsCompactFormFactor();
   const isCompactLayout = resolveCompactLayout(isCompactLayoutOverride, isCompactFormFactor);
   const isDesktopWebBreakpoint = resolveIsDesktopWebBreakpoint(isCompactFormFactor);
+  const hasFinePointer = useHasFinePointer();
   const isDesktopLayout = resolveIsDesktopWebBreakpoint(isCompactLayout);
   const messagePlaceholder = resolveMessagePlaceholder(inputMode, isDesktopLayout, t, placeholder);
-  const userInput = value;
+  const hasText = useSyncExternalStore(
+    textSource.subscribe,
+    () => textSource.getSnapshot().trim().length > 0,
+    () => textSource.getSnapshot().trim().length > 0,
+  );
   const setUserInput = onChangeText;
   const workspaceAttachments = useWorkspaceAttachmentsForScopes(attachmentScopeKeys);
   const {
@@ -1240,24 +1299,48 @@ function ComposerContentImpl({
   const supportsForgeSearch = useSessionStore(
     (state) => state.sessions[serverId]?.serverInfo?.features?.forgeSearch === true,
   );
-  const forgeAutoAttach = useComposerForgeAutoAttach({
-    text: userInput,
-    remoteUrl: resolveCheckoutRemoteUrl(checkoutStatusQuery.status),
-    attachments,
-    client,
-    isConnected,
-    serverId,
-    cwd,
-    supportsForgeSearch,
-    setAttachments: setSelectedAttachments,
-    onChangeRequestDetected: onForgeChangeRequestDetected,
-    onChangeRequestAdded: onForgeChangeRequestAutoAttach,
-  });
-  const [cursorIndex, setCursorIndex] = useState(0);
-  const cursorPublication = useMemo(() => new AfterPaintPublication<number>(setCursorIndex), []);
+  const forgeAutoAttachRef = useRef<ReturnType<typeof useComposerForgeAutoAttach>>(null);
+  const [isForgeResolving, setIsForgeResolving] = useState(false);
+  const forgeConfiguration = useMemo(
+    () => ({
+      remoteUrl: resolveCheckoutRemoteUrl(checkoutStatusQuery.status),
+      attachments,
+      client,
+      isConnected,
+      serverId,
+      cwd,
+      supportsForgeSearch,
+      setAttachments: setSelectedAttachments,
+      onChangeRequestDetected: onForgeChangeRequestDetected,
+      onChangeRequestAdded: onForgeChangeRequestAutoAttach,
+    }),
+    [
+      checkoutStatusQuery.status,
+      attachments,
+      client,
+      isConnected,
+      serverId,
+      cwd,
+      supportsForgeSearch,
+      setSelectedAttachments,
+      onForgeChangeRequestDetected,
+      onForgeChangeRequestAutoAttach,
+    ],
+  );
+  const cursor = useMemo(() => createStore<number>(() => 0), []);
+  const cursorPublication = useMemo(
+    () => new AfterPaintPublication<number>((position) => cursor.setState(position)),
+    [cursor],
+  );
+  useEffect(() => () => cursorPublication.cancel(), [cursorPublication]);
+  const autocompleteRef = useRef<ComposerAutocompleteHandle>(null);
   const [isProcessing, setIsProcessing] = useState(false);
-  const [isUploadingFile, setIsUploadingFile] = useState(false);
+  const [pendingFiles, setPendingFiles] = useState<PendingFileAttachment[]>([]);
+  const nextPendingFileId = useRef(0);
+  const isUploadingFile = pendingFiles.length > 0;
   const [pendingNativeImagePastes, setPendingNativeImagePastes] = useState(0);
+  const editingSession = useComposerEditingSession(inputMode);
+  const isFullscreen = useComposerFullscreen(editingSession);
   const [sendError, setSendError] = useState<string | null>(null);
   const [isMessageInputFocused, setIsMessageInputFocused] = useState(false);
   const [isGithubPickerOpen, setIsGithubPickerOpen] = useState(false);
@@ -1350,36 +1433,6 @@ function ComposerContentImpl({
     [blurOnSubmit, clearDraft, replaceUserInput, resetSuppression, setSelectedAttachments],
   );
 
-  const autocomplete = useAgentAutocomplete({
-    userInput,
-    cursorIndex,
-    setUserInput: replaceUserInput,
-    serverId,
-    agentId,
-    draftConfig: commandDraftConfig,
-    canExecuteClientSlashCommand: buildOutgoingAttachments(attachments).length === 0,
-    onClientSlashCommand: runClientSlashCommand,
-    pluginClientSlashCommands,
-    onAutocompleteApplied: () => {
-      messageInputRef.current?.focus();
-    },
-  });
-  const autocompleteOnKeyPressRef = useRef(autocomplete.onKeyPress);
-  autocompleteOnKeyPressRef.current = autocomplete.onKeyPress;
-  const selectAutocompleteOption = autocomplete.onSelectOption;
-  const handleAutocompleteSelect = useCallback(
-    (option: AutocompleteOption) =>
-      selectAutocompleteOption(option, messageInputRef.current?.getInputSnapshot()),
-    [selectAutocompleteOption],
-  );
-
-  // Clear send error when user edits the input
-  useEffect(() => {
-    setCursorIndex((current) => Math.min(current, userInput.length));
-  }, [userInput.length]);
-
-  useEffect(() => () => cursorPublication.cancel(), [cursorPublication]);
-
   const { pickImages } = useImageAttachmentPicker();
   const { pickFiles } = useFilePicker();
   const agentIdRef = useRef(agentId);
@@ -1488,8 +1541,10 @@ function ComposerContentImpl({
         activeTurnBehavior,
         activeTurnId:
           activeTurnBehavior === "steer"
-            ? (useSessionStore.getState().sessions[serverId]?.agents.get(targetAgentId)?.activeTurn
-                ?.turnId ?? undefined)
+            ? (selectAgentTurnPresentation(
+                useSessionStore.getState().sessions[serverId],
+                targetAgentId,
+              ).turnId ?? undefined)
             : undefined,
       });
       onAttentionPromptSend?.();
@@ -1506,8 +1561,6 @@ function ComposerContentImpl({
   const isCancellingAgent = useSessionStore(
     (state) => selectAgentTurnPresentation(state.sessions[serverId], agentId).isCancelling,
   );
-  const beginAgentCancellation = useSessionStore((state) => state.beginAgentCancellation);
-  const settleAgentCancellation = useSessionStore((state) => state.settleAgentCancellation);
   const isAgentRunning = hasActiveTurn;
   // Queueing behind a permission prompt would strand the message: the turn is
   // parked until the request is answered.
@@ -1703,23 +1756,16 @@ function ComposerContentImpl({
     [addImages, t],
   );
 
-  const uploadPickedFiles = useCallback(
-    async (files: PickedFile[]) => {
+  const uploadSelectedFiles = useCallback(
+    async (files: SelectedFile[]) => {
       if (files.length === 0) return;
       if (!client) {
         toastErrorRef.current(t("composer.errors.daemonClientDisconnected"));
         return;
       }
 
-      const oversized = files.find((f) => f.bytes.byteLength > MAX_FILE_SIZE_BYTES);
-      if (oversized) {
-        toastErrorRef.current(
-          t("composer.errors.fileTooLarge", { size: "50MB", fileName: oversized.fileName }),
-        );
-        return;
-      }
-
-      setIsUploadingFile(true);
+      const placeholders = files.map((file) => ({ id: nextPendingFileId.current++, file }));
+      setPendingFiles((pending) => [...pending, ...placeholders]);
       try {
         const uploaded = await uploadFileAttachments({ client, files });
         addFiles(uploaded);
@@ -1729,7 +1775,7 @@ function ComposerContentImpl({
           error instanceof Error ? error.message : t("composer.errors.uploadFailed"),
         );
       } finally {
-        setIsUploadingFile(false);
+        setPendingFiles((pending) => pending.filter((entry) => !placeholders.includes(entry)));
       }
     },
     [addFiles, client, t],
@@ -1743,25 +1789,25 @@ function ComposerContentImpl({
     try {
       const files = await pickFiles();
       if (!files) return;
-      await uploadPickedFiles(files);
+      await uploadSelectedFiles(files);
     } catch (error) {
       console.error("[Composer] Failed to upload file:", error);
       toastErrorRef.current(
         error instanceof Error ? error.message : t("composer.errors.uploadFailed"),
       );
     }
-  }, [client, pickFiles, t, uploadPickedFiles]);
+  }, [client, pickFiles, t, uploadSelectedFiles]);
 
   const handleGenericFilesDropped = useCallback(
     async (items: DroppedItem[]) => {
       try {
-        const files = await droppedItemsToPickedFiles(items);
+        const files = droppedItemsToSelectedFiles(items);
         if (files.length === 0) return;
         if (!client || !isConnected) {
           toastErrorRef.current(t("composer.errors.daemonClientDisconnected"));
           return;
         }
-        await uploadPickedFiles(files);
+        await uploadSelectedFiles(files);
       } catch (error) {
         console.error("[Composer] Failed to upload dropped files:", error);
         toastErrorRef.current(
@@ -1769,12 +1815,12 @@ function ComposerContentImpl({
         );
       }
     },
-    [client, isConnected, t, uploadPickedFiles],
+    [client, isConnected, t, uploadSelectedFiles],
   );
 
   const handleRemoveAttachment = useCallback(
     (index: number) => {
-      forgeAutoAttach.markForgeAttachmentRemoved(selectedAttachments[index]);
+      forgeAutoAttachRef.current?.markForgeAttachmentRemoved(selectedAttachments[index]);
       const didRemoveWorkspaceAttachment = removeAttachment({
         selectedAttachments,
         index,
@@ -1786,7 +1832,7 @@ function ComposerContentImpl({
         removeComposerAttachmentAtIndex({ attachments: prev, index, deleteAttachments }),
       );
     },
-    [forgeAutoAttach, removeAttachment, selectedAttachments, setSelectedAttachments],
+    [removeAttachment, selectedAttachments, setSelectedAttachments],
   );
 
   const handleOpenAttachment = useCallback(
@@ -1813,7 +1859,7 @@ function ComposerContentImpl({
       isConnected,
     });
     if (!cancellation) return;
-    const requestId = beginAgentCancellation(serverId, targetAgentId);
+    const requestId = getHostRuntimeStore().beginAgentCancellation(serverId, targetAgentId);
     void cancellation
       .catch((error) => {
         const message = resolveErrorMessage(error);
@@ -1822,28 +1868,15 @@ function ComposerContentImpl({
         }
       })
       .finally(() => {
-        settleAgentCancellation(serverId, targetAgentId, requestId);
+        getHostRuntimeStore().settleAgentCancellation(serverId, targetAgentId, requestId);
       });
     messageInputRef.current?.focus();
-  }, [
-    beginAgentCancellation,
-    client,
-    isAgentRunning,
-    isCancellingAgent,
-    isConnected,
-    serverId,
-    settleAgentCancellation,
-  ]);
+  }, [client, isAgentRunning, isCancellingAgent, isConnected, serverId]);
 
   const focusMessageInputForKeyboardAction = useCallback(() => {
     focusMessageInputWithPlatformStrategy(messageInputRef);
   }, []);
 
-  const { style: keyboardAnimatedStyle } = useKeyboardShiftStyle({
-    mode: "translate",
-    enabled: !externalKeyboardShift,
-  });
-
   const isVoiceModeForAgent = resolveIsVoiceModeForAgent(voice, serverId, agentId);
 
   const handleToggleRealtimeVoice = useCallback(() => {
@@ -1918,11 +1951,11 @@ function ComposerContentImpl({
     ],
   );
 
-  const hasSendableContent = userInput.trim().length > 0 || selectedAttachments.length > 0;
+  const hasSendableContent = hasText || selectedAttachments.length > 0;
 
   // Handle keyboard navigation for command autocomplete.
   const handleCommandKeyPress = useCallback(
-    (event: ComposerKeyPressEvent) => autocompleteOnKeyPressRef.current(event),
+    (event: ComposerKeyPressEvent) => autocompleteRef.current?.onKeyPress(event) ?? false,
     [],
   );
 
@@ -1997,40 +2030,31 @@ function ComposerContentImpl({
     ],
   );
 
-  const { contextWindowMaxTokens, contextWindowUsedTokens } = resolveContextWindowValues(
-    agentState.contextWindowMaxTokens,
-    agentState.contextWindowUsedTokens,
-  );
-
-  const contextWindowPending = agentState.status === "initializing" || isAgentRunning;
   const contextWindowMeterGlyphSize = isCompactLayout ? ICON_SIZE.md : buttonIconSize;
-
-  const contextWindowMeter = useMemo(
+  const beforeVoiceContent = useMemo(
     () =>
-      renderContextWindowMeter(
-        contextWindowMaxTokens,
-        contextWindowUsedTokens,
-        agentState.totalCostUsd,
-        false,
-        serverId,
-        agentState.provider,
-        contextWindowPending,
-        contextWindowMeterGlyphSize,
-      ),
+      hasAgent ? (
+        <View style={styles.contextWindowMeterSlot}>
+          <ContextWindowMeter
+            serverId={serverId}
+            agentId={agentId}
+            maxTokens={agentState.contextWindowMaxTokens}
+            usedTokens={agentState.contextWindowUsedTokens}
+            totalCostUsd={agentState.totalCostUsd}
+            glyphSize={contextWindowMeterGlyphSize}
+          />
+        </View>
+      ) : null,
     [
-      contextWindowMaxTokens,
-      contextWindowUsedTokens,
-      agentState.totalCostUsd,
+      hasAgent,
       serverId,
-      agentState.provider,
-      contextWindowPending,
+      agentId,
+      agentState.contextWindowMaxTokens,
+      agentState.contextWindowUsedTokens,
+      agentState.totalCostUsd,
       contextWindowMeterGlyphSize,
     ],
   );
-  const beforeVoiceContent = useMemo(
-    () => resolveContextWindowPlacement(contextWindowMeter, hasAgent),
-    [contextWindowMeter, hasAgent],
-  );
 
   const hasGithubAttachment = useMemo(
     () =>
@@ -2138,19 +2162,14 @@ function ComposerContentImpl({
       const nextAttachments = toggleForgeAttachmentFromPicker({
         current: attachments,
         item,
-        markForgeAttachmentRemoved: forgeAutoAttach.markForgeAttachmentRemoved,
+        markForgeAttachmentRemoved: (attachment) =>
+          forgeAutoAttachRef.current?.markForgeAttachmentRemoved(attachment),
       });
       setSelectedAttachments(nextAttachments);
       setIsGithubPickerOpen(false);
       setGithubSearchQuery("");
     },
-    [
-      attachments,
-      forgeAutoAttach,
-      setSelectedAttachments,
-      setGithubSearchQuery,
-      setIsGithubPickerOpen,
-    ],
+    [attachments, setSelectedAttachments, setGithubSearchQuery, setIsGithubPickerOpen],
   );
 
   const leftContent = useMemo(
@@ -2175,10 +2194,10 @@ function ComposerContentImpl({
       if (isWeb) {
         cursorPublication.stage(selection.start);
       } else {
-        setCursorIndex(selection.start);
+        cursor.setState(selection.start);
       }
     },
-    [cursorPublication],
+    [cursorPublication, cursor],
   );
 
   const handleFocusChange = useCallback(
@@ -2231,10 +2250,6 @@ function ComposerContentImpl({
     [githubSearchItems, selectedAttachments, handleToggleGithubItem],
   );
 
-  const composerContainerStyle = useMemo(
-    () => [animatedStaticStyles.container, keyboardAnimatedStyle],
-    [keyboardAnimatedStyle],
-  );
   const inputAreaContainerStyle = useMemo(
     () => [styles.inputAreaContainer, isComposerLocked && styles.inputAreaLocked],
     [isComposerLocked],
@@ -2244,6 +2259,7 @@ function ComposerContentImpl({
     () =>
       renderAttachmentTray({
         selectedAttachments,
+        pendingFiles,
         isComposerLocked,
         handleOpenAttachment,
         handleRemoveAttachment,
@@ -2257,7 +2273,14 @@ function ComposerContentImpl({
             t("composer.attachments.removeGithub", { kind, number: numberLabel }),
         },
       }),
-    [handleOpenAttachment, handleRemoveAttachment, isComposerLocked, selectedAttachments, t],
+    [
+      handleOpenAttachment,
+      handleRemoveAttachment,
+      isComposerLocked,
+      selectedAttachments,
+      pendingFiles,
+      t,
+    ],
   );
 
   const queueList = useMemo(
@@ -2272,12 +2295,33 @@ function ComposerContentImpl({
     [handleEditQueuedMessage, handleSendQueuedNow, queuedMessages, t],
   );
 
+  const autocompleteConfiguration = useMemo(
+    () => ({
+      setUserInput: replaceUserInput,
+      serverId,
+      agentId,
+      draft: commandDraft,
+      canExecuteClientSlashCommand: buildOutgoingAttachments(attachments).length === 0,
+      onClientSlashCommand: runClientSlashCommand,
+      pluginClientSlashCommands,
+    }),
+    [
+      replaceUserInput,
+      serverId,
+      agentId,
+      commandDraft,
+      buildOutgoingAttachments,
+      attachments,
+      runClientSlashCommand,
+      pluginClientSlashCommands,
+    ],
+  );
   const messageInputContainerRef = useRef<View>(null);
 
   const isSubmitLoadingVisible =
     isProcessing || isSubmitLoading || isUploadingFile || pendingNativeImagePastes > 0;
   const isSubmitDisabled =
-    isSubmitLoadingVisible || (waitForForgeAutoAttachOnSubmit && forgeAutoAttach.isResolving);
+    isSubmitLoadingVisible || (waitForForgeAutoAttachOnSubmit && isForgeResolving);
 
   // Disable drops while submitting/uploading: the submit path clears and restores attachments,
   // so a drop in that window would be lost or land on a locked draft. `disabled` hides the
@@ -2291,7 +2335,8 @@ function ComposerContentImpl({
     { disabled: isSubmitLoadingVisible },
   );
 
-  const messageInputAutoFocus = autoFocus && isDesktopWebBreakpoint;
+  // Focusing the composer on a touch screen raises the on-screen keyboard over the conversation.
+  const messageInputAutoFocus = autoFocus && isDesktopWebBreakpoint && hasFinePointer;
   const submitLoadingPressHandler = isAgentRunning ? handleCancelAgent : undefined;
   const sendErrorNode = useMemo(
     () =>
@@ -2305,7 +2350,6 @@ function ComposerContentImpl({
   const githubEmptyText = githubSearchResultsQuery.isFetching
     ? t("composer.github.searching")
     : t("composer.github.noResults");
-  const autocompleteVisible = autocomplete.isVisible && mode.showAutocomplete;
 
   return (
     <>
@@ -2319,32 +2363,38 @@ function ComposerContentImpl({
         focusMessageInputForKeyboardAction={focusMessageInputForKeyboardAction}
         isMessageInputFocused={isMessageInputFocused}
       />
-      <Animated.View style={composerContainerStyle}>
+      <View style={animatedStaticStyles.container}>
         <AttachmentLightbox source={lightboxSource} onClose={handleLightboxClose} />
         {/* Input area */}
         <View style={inputAreaContainerStyle}>
           <View style={styles.inputAreaContent}>
             {queueList}
-            {sendErrorNode}
+            {!isFullscreen && sendErrorNode}
 
             <View ref={messageInputContainerRef} style={styles.messageInputContainer}>
-              <ComposerAutocomplete
-                visible={autocompleteVisible}
+              <ComposerAutocompleteBinding
+                text={textSource}
+                cursor={cursor}
+                inputRef={messageInputRef}
                 anchorRef={messageInputContainerRef}
-                options={autocomplete.options}
-                selectedIndex={autocomplete.selectedIndex}
-                onSelect={handleAutocompleteSelect}
-                isLoading={autocomplete.isLoading}
-                errorMessage={autocomplete.errorMessage}
-                loadingText={autocomplete.loadingText}
-                emptyText={autocomplete.emptyText}
+                show={mode.showAutocomplete && !isFullscreen}
+                ref={autocompleteRef}
+                configuration={autocompleteConfiguration}
+              />
+              <ComposerForgeBinding
+                text={textSource}
+                configuration={forgeConfiguration}
+                ref={forgeAutoAttachRef}
+                onResolvingChange={setIsForgeResolving}
               />
 
               {/* MessageInput handles everything: text, dictation, attachments, all buttons */}
               <RenderProfile id="MessageInput">
                 <StableMessageInput
                   ref={messageInputRef}
-                  value={userInput}
+                  editingSession={editingSession}
+                  submissionError={sendErrorNode}
+                  value={textSource.getSnapshot()}
                   onChangeText={setUserInput}
                   onSubmit={handleSubmit}
                   hasExternalContent={hasExternalContent}
@@ -2413,7 +2463,7 @@ function ComposerContentImpl({
             </View>
           </View>
         </View>
-      </Animated.View>
+      </View>
     </>
   );
 }
@@ -2421,8 +2471,7 @@ function ComposerContentImpl({
 const animatedStaticStyles = RNStyleSheet.create({
   container: {
     flexDirection: "column",
-    // KeyboardDock reduces the available column height with bottom padding.
-    // Keep the composer's constraint chain shrinkable down to its scrolling input.
+    // Propagate the viewport's height constraint down to the scrolling input.
     flexShrink: 1,
     position: "relative",
   },
@@ -2450,7 +2499,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
   inputAreaContent: {
     flexShrink: 1,
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     gap: theme.spacing[3],
   },
   messageInputContainer: {
@@ -2557,6 +2606,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
   },
 })) as unknown as Record<string, object>;
 
+const ThemedAttachmentSpinner = withUnistyles(LoadingSpinner);
 const ThemedPencil = withUnistyles(Pencil);
 const ThemedArrowUp = withUnistyles(ArrowUp);
 const ThemedGitPullRequest = withUnistyles(GitPullRequest);
@@ -2583,3 +2633,7 @@ const githubIssuePillIcon = (
   <ThemedCircleDot size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
 );
 const filePillIcon = <ThemedFileText size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />;
+
+const pendingFilePillIcon = (
+  <ThemedAttachmentSpinner size={18} uniProps={iconForegroundMutedMapping} />
+);
diff --git a/packages/app/src/composer/input/fullscreen-host.native.tsx b/packages/app/src/composer/input/fullscreen-host.native.tsx
new file mode 100644
index 0000000000..22ce0052bf
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-host.native.tsx
@@ -0,0 +1,57 @@
+import { useEffect, type ReactNode } from "react";
+import { Portal } from "@gorhom/portal";
+import { BackHandler, View, useWindowDimensions } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { DEFAULT_FLOATING_PANEL_PORTAL_HOST } from "@/components/ui/floating-panel-portal";
+import { useKeyboardShift } from "@/keyboard/shift";
+
+/** Same-window host keeps the IME attached while escaping the dock's clipping. */
+export function ComposerFullscreenHost({
+  children,
+  onExit,
+  active,
+}: {
+  children: ReactNode;
+  onExit: () => void;
+  active: boolean;
+}) {
+  useEffect(() => {
+    if (!active) return;
+    const handler = BackHandler.addEventListener("hardwareBackPress", () => {
+      onExit();
+      return true;
+    });
+    return () => handler.remove();
+  }, [active, onExit]);
+  const insets = useSafeAreaInsets();
+  const { height } = useWindowDimensions();
+  const { layoutShift } = useKeyboardShift();
+  const frame = useAnimatedStyle(() => ({
+    height: Math.max(0, height - layoutShift.value),
+    paddingTop: insets.top,
+    paddingBottom: insets.bottom,
+    paddingLeft: insets.left,
+    paddingRight: insets.right,
+  }));
+  return (
+    <Portal hostName={DEFAULT_FLOATING_PANEL_PORTAL_HOST}>
+      <View style={[styles.background, !active && styles.hidden]}>
+        <Animated.View style={[{ width: "100%" }, frame]}>{children}</Animated.View>
+      </View>
+    </Portal>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  hidden: { display: "none" },
+  background: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: theme.colors.surface1,
+  },
+}));
diff --git a/packages/app/src/composer/input/fullscreen-host.tsx b/packages/app/src/composer/input/fullscreen-host.tsx
new file mode 100644
index 0000000000..ba634b268d
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-host.tsx
@@ -0,0 +1,77 @@
+import { useMemo, useLayoutEffect, useState, type ReactNode } from "react";
+import { createPortal } from "react-dom";
+import { View } from "react-native";
+import {
+  getOverlayRoot,
+  useOverlayLayer,
+  OverlayLayerProvider,
+  useWebOverlayRegistration,
+} from "@/lib/overlay-root";
+
+export function ComposerFullscreenHost({
+  children,
+  onExit,
+  active,
+}: {
+  children: ReactNode;
+  onExit: () => void;
+  active: boolean;
+}) {
+  const layer = useOverlayLayer("modal");
+  const registration = useWebOverlayRegistration({
+    active,
+    layer,
+    onKeyDown: (event) => {
+      if (event.key !== "Escape") return false;
+      event.preventDefault();
+      onExit();
+      return true;
+    },
+  });
+  const [viewport, setViewport] = useState(readVisibleViewport);
+  useLayoutEffect(() => {
+    if (!active) return;
+    const update = () => setViewport(readVisibleViewport());
+    const visualViewport = window.visualViewport;
+    update();
+    visualViewport?.addEventListener("resize", update);
+    visualViewport?.addEventListener("scroll", update);
+    window.addEventListener("resize", update);
+    return () => {
+      visualViewport?.removeEventListener("resize", update);
+      visualViewport?.removeEventListener("scroll", update);
+      window.removeEventListener("resize", update);
+    };
+  }, [active]);
+  const frameStyle = useMemo(
+    () => ({
+      display: active ? ("flex" as const) : ("none" as const),
+      position: "absolute" as const,
+      top: viewport.top,
+      left: viewport.left,
+      width: viewport.width,
+      zIndex: layer,
+      pointerEvents: "auto" as const,
+      height: viewport.height,
+    }),
+    [active, layer, viewport],
+  );
+  return createPortal(
+    <OverlayLayerProvider layer={layer}>
+      <View ref={registration} style={frameStyle}>
+        {children}
+      </View>
+    </OverlayLayerProvider>,
+    getOverlayRoot(),
+  );
+}
+
+function readVisibleViewport() {
+  const viewport = window.visualViewport;
+  return {
+    top: viewport?.offsetTop ?? 0,
+    left: viewport?.offsetLeft ?? 0,
+    width: viewport?.width ?? window.innerWidth,
+    height: viewport?.height ?? window.innerHeight,
+  };
+}
diff --git a/packages/app/src/composer/input/height.native.ts b/packages/app/src/composer/input/height.native.ts
index f2bd88cd18..a36839e2e7 100644
--- a/packages/app/src/composer/input/height.native.ts
+++ b/packages/app/src/composer/input/height.native.ts
@@ -3,10 +3,12 @@ import type { RefObject } from "react";
 import type { ComposerHeightResult } from "./height.types";
 
 interface ComposerHeightArgs {
-  value: string;
+  getText: () => string;
   textareaRef: RefObject<unknown>;
   minHeight: number;
   maxHeight: number;
+  onRenderedLinesChange?: (lines: number) => void;
+  presentationKey?: boolean;
 }
 
 export function useComposerHeight({
diff --git a/packages/app/src/composer/input/height.web.ts b/packages/app/src/composer/input/height.web.ts
index 4e3bef363d..6b8c1ec561 100644
--- a/packages/app/src/composer/input/height.web.ts
+++ b/packages/app/src/composer/input/height.web.ts
@@ -3,10 +3,12 @@ import type { RefObject } from "react";
 import type { ComposerHeightResult } from "./height.types";
 
 interface ComposerHeightArgs {
-  value: string;
+  getText: () => string;
   textareaRef: RefObject<HTMLElement | null>;
   minHeight: number;
   maxHeight: number;
+  onRenderedLinesChange?: (lines: number) => void;
+  presentationKey?: boolean;
 }
 
 const COPIED_STYLES = [
@@ -32,15 +34,17 @@ const COPIED_STYLES = [
 ] as const;
 
 export function useComposerHeight({
-  value,
+  getText,
   textareaRef,
   minHeight,
   maxHeight,
+  onRenderedLinesChange,
+  presentationKey,
 }: ComposerHeightArgs): ComposerHeightResult {
   const [height, setHeight] = useState(minHeight);
   const heightRef = useRef(minHeight);
-  const paramsRef = useRef({ value, minHeight, maxHeight });
-  paramsRef.current = { value, minHeight, maxHeight };
+  const paramsRef = useRef({ getText, minHeight, maxHeight, onRenderedLinesChange });
+  paramsRef.current = { getText, minHeight, maxHeight, onRenderedLinesChange };
   const mirrorRef = useRef<HTMLTextAreaElement | null>(null);
 
   const setBoundedHeight = useCallback((nextHeight: number) => {
@@ -65,6 +69,13 @@ export function useComposerHeight({
       }
       mirror.style.width = `${sourceWidth}px`;
       mirror.value = text.endsWith("\n") ? `${text} ` : text;
+      const padding =
+        parseFloat(computedStyle.paddingTop) + parseFloat(computedStyle.paddingBottom);
+      const lineHeight = parseFloat(computedStyle.lineHeight);
+      if (lineHeight > 0)
+        paramsRef.current.onRenderedLinesChange?.(
+          Math.round((mirror.scrollHeight - padding) / lineHeight),
+        );
       setBoundedHeight(mirror.scrollHeight);
     },
     [setBoundedHeight, textareaRef],
@@ -92,7 +103,7 @@ export function useComposerHeight({
     });
     document.body.appendChild(mirror);
     mirrorRef.current = mirror;
-    measure(paramsRef.current.value);
+    measure(paramsRef.current.getText());
     return () => {
       mirror.remove();
       mirrorRef.current = null;
@@ -100,8 +111,8 @@ export function useComposerHeight({
   }, [measure]);
 
   useLayoutEffect(() => {
-    measure(value);
-  }, [maxHeight, minHeight, value, measure]);
+    measure(getText());
+  }, [maxHeight, minHeight, getText, measure, presentationKey]);
 
   useEffect(() => {
     const source = textareaRef.current;
@@ -111,11 +122,11 @@ export function useComposerHeight({
       const nextWidth = source.clientWidth;
       if (Math.abs(nextWidth - previousWidth) < 1) return;
       previousWidth = nextWidth;
-      measure(paramsRef.current.value);
+      measure(paramsRef.current.getText());
     });
     observer.observe(source);
     return () => observer.disconnect();
-  }, [measure, textareaRef]);
+  }, [measure, textareaRef, presentationKey]);
 
   const onTextChange = useCallback(
     (_previousText: string, nextText: string) => measure(nextText),
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index fc8a260cfb..a0476ff7a7 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -1,3 +1,8 @@
+import {
+  useComposerEditingSession,
+  useComposerFullscreen,
+  type ComposerEditingSession,
+} from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
   View,
@@ -56,6 +61,7 @@ import { useIsCompactFormFactor } from "@/constants/layout";
 import { useComposerKeyboardScope } from "@/composer/keyboard-scope";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useComposerHeight } from "./height";
+import { ComposerInputPresentation } from "./presentation";
 import { resolveComposerInputMode, type ComposerInputMode } from "@/composer/input-mode";
 import type { NativePastedFile } from "@/composer/native-pasted-image";
 import {
@@ -77,6 +83,7 @@ import {
   applyDictationTranscript,
   computeCanStartDictation,
   resolveComposerSurfacePresentation,
+  resolveComposerSurfaceText,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -106,6 +113,8 @@ export interface ComposerKeyPressEvent {
 }
 
 export interface MessageInputProps {
+  editingSession?: ComposerEditingSession;
+  submissionError?: React.ReactNode;
   value: string;
   onChangeText: (text: string) => void;
   onSubmit: (payload: MessagePayload) => void;
@@ -206,6 +215,7 @@ type WebTextInputKeyPressEvent = NativeSyntheticEvent<
 >;
 
 interface TextAreaHandle {
+  value?: string;
   scrollHeight?: number;
   clientHeight?: number;
   offsetHeight?: number;
@@ -215,7 +225,7 @@ interface TextAreaHandle {
   style?: {
     height?: string;
     overflowY?: string;
-  } & Record<string, unknown>;
+  };
 }
 
 function AttachButtonIcon({
@@ -433,7 +443,7 @@ function getTextInputNativeElement(current: ComposerTextInputHandle | null): HTM
 }
 
 interface PasteImagesEffectArgs {
-  getWebTextArea: () => TextAreaHandle | null;
+  textarea: HTMLElement | null;
   isConnected: boolean;
   disabled: boolean;
   isDictating: boolean;
@@ -443,7 +453,7 @@ interface PasteImagesEffectArgs {
 
 function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
   const {
-    getWebTextArea,
+    textarea,
     isConnected,
     disabled,
     isDictating,
@@ -454,19 +464,7 @@ function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
   useEffect(() => {
     if (!isWeb || !onAddImages) return;
 
-    const textarea = getWebTextArea() as
-      | (TextAreaHandle & {
-          addEventListener?: (type: string, listener: (e: ClipboardEvent) => void) => void;
-          removeEventListener?: (type: string, listener: (e: ClipboardEvent) => void) => void;
-        })
-      | null;
-    if (
-      !textarea ||
-      typeof textarea.addEventListener !== "function" ||
-      typeof textarea.removeEventListener !== "function"
-    ) {
-      return;
-    }
+    if (!textarea) return;
 
     let disposed = false;
     const handlePaste = (event: ClipboardEvent) => {
@@ -493,14 +491,7 @@ function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
       disposed = true;
       textarea.removeEventListener?.("paste", handlePaste);
     };
-  }, [
-    disabled,
-    getWebTextArea,
-    isConnected,
-    isDictating,
-    isRealtimeVoiceForCurrentAgent,
-    onAddImages,
-  ]);
+  }, [disabled, textarea, isConnected, isDictating, isRealtimeVoiceForCurrentAgent, onAddImages]);
 }
 
 function useAutoFocusOnWebEffect(
@@ -628,6 +619,7 @@ function FocusHint({
 interface ComposerTextSurfaceProps {
   readOnly: boolean;
   value: string;
+  textReplacementKey: string;
   textInputRef: React.Ref<ComposerTextInputHandle>;
   textInputStyle: EditingTextInputProps["style"];
   readOnlyTextStyle: React.ComponentProps<typeof Text>["style"];
@@ -643,6 +635,9 @@ interface ComposerTextSurfaceProps {
   onSelectionChange: (event: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => void;
   onPasteImages: ((files: readonly NativePastedFile[]) => void) | undefined;
   onPasteError: (message: string) => void;
+  fullscreen: boolean;
+  compact: boolean;
+  onRenderedLinesChange: (lines: number) => void;
   focusHintVisible: boolean;
   focusInputKeys: ShortcutChord | null | undefined;
   focusHintLabel: string;
@@ -654,6 +649,23 @@ interface ComposerTextSurfaceProps {
  * state of this composer rather than a second one.
  */
 function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElement {
+  const { onChangeText, onRenderedLinesChange } = props;
+  const [measurementText, setMeasurementText] = useState(props.value);
+  useEffect(() => {
+    if (!isWeb) setMeasurementText(props.value);
+  }, [props.value, props.textReplacementKey]);
+  const handleTextChange = useCallback(
+    (text: string) => {
+      if (!isWeb) setMeasurementText(text);
+      onChangeText(text);
+    },
+    [onChangeText, setMeasurementText],
+  );
+  const measureLines = useCallback(
+    (event: import("react-native").TextLayoutEvent) =>
+      onRenderedLinesChange(event.nativeEvent.lines.length),
+    [onRenderedLinesChange],
+  );
   if (props.readOnly) {
     return (
       <View style={styles.textInputScrollWrapper}>
@@ -664,12 +676,28 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
     );
   }
   return (
-    <View style={styles.textInputScrollWrapper}>
+    <View
+      style={[
+        styles.textInputScrollWrapper,
+        props.fullscreen && styles.fullscreenTextSurface,
+        props.compact && !props.fullscreen && styles.compactTextSurface,
+      ]}
+    >
+      {!isWeb && props.compact && !props.fullscreen ? (
+        <Text
+          accessible={false}
+          pointerEvents="none"
+          style={[props.textInputStyle, styles.lineMeasurement]}
+          onTextLayout={measureLines}
+        >
+          {`${measurementText}\u200b`}
+        </Text>
+      ) : null}
       <ComposerTextInput
         ref={props.textInputRef}
         dataSet={COMPOSER_INPUT_DATASET}
         initialValue={props.value}
-        onChangeText={props.onChangeText}
+        onChangeText={handleTextChange}
         placeholder={props.placeholder}
         accessibilityLabel={props.accessibilityLabel}
         onFocus={props.onFocus}
@@ -843,6 +871,7 @@ interface ToggleRealtimeVoiceContext {
   handleStopRealtimeVoice: () => Promise<unknown> | void;
   toast: { error: (msg: string) => void };
   interruptBeforeVoiceMessage: string;
+  exitFullscreen: () => void;
 }
 
 function toggleRealtimeVoiceImpl(ctx: ToggleRealtimeVoiceContext): void {
@@ -858,6 +887,7 @@ function toggleRealtimeVoiceImpl(ctx: ToggleRealtimeVoiceContext): void {
     ctx.toast.error(ctx.interruptBeforeVoiceMessage);
     return;
   }
+  ctx.exitFullscreen();
   void ctx.voice.startVoice(ctx.voiceServerId, ctx.voiceAgentId).catch((error) => {
     console.error("[MessageInput] Failed to start realtime voice", error);
     const message = extractErrorMessage(error);
@@ -872,6 +902,7 @@ interface StartDictationContext {
   canStartDictation: () => boolean;
   toast: { error: (msg: string) => void };
   startDictation: () => Promise<void>;
+  exitFullscreen: () => void;
 }
 
 async function startDictationIfAvailableImpl(ctx: StartDictationContext): Promise<void> {
@@ -882,6 +913,7 @@ async function startDictationIfAvailableImpl(ctx: StartDictationContext): Promis
   if (!ctx.canStartDictation()) {
     return;
   }
+  ctx.exitFullscreen();
   await ctx.startDictation();
 }
 
@@ -983,7 +1015,8 @@ function computeIsDictationStartEnabled(
   return (isReadyForDictation ?? isConnected) && !disabled;
 }
 
-function resolveMaxInputHeight(windowHeight: number): number {
+function resolveMaxInputHeight(windowHeight: number, compact: boolean): number {
+  if (compact) return DEFAULT_MAX_INPUT_HEIGHT;
   if (!Number.isFinite(windowHeight) || windowHeight <= 0) return DEFAULT_MAX_INPUT_HEIGHT;
   return Math.max(DEFAULT_MAX_INPUT_HEIGHT, Math.floor(windowHeight * MAX_INPUT_VIEWPORT_RATIO));
 }
@@ -1007,9 +1040,12 @@ function getComposerInputSnapshot(
   current: ComposerTextInputHandle | null,
   fallbackText: string,
   fallbackSelection: ComposerInputSnapshot["selection"],
+  mountedTextArea?: TextAreaHandle | null,
 ): ComposerInputSnapshot {
-  const text = current?.getText() ?? fallbackText;
-  const textArea = getWebTextAreaImpl(current);
+  // The inner DOM ref can detach before the outer editing handle. Keep the mounted
+  // element available until this owner's ref callback captures the remount handoff.
+  const textArea = mountedTextArea ?? getWebTextAreaImpl(current);
+  const text = textArea?.value ?? current?.getText() ?? fallbackText;
   const start = textArea?.selectionStart ?? fallbackSelection.start;
   const end = textArea?.selectionEnd ?? fallbackSelection.end;
   return { text, selection: { start, end } };
@@ -1139,6 +1175,28 @@ function extractErrorMessage(error: unknown): string | null {
   return null;
 }
 
+function resolvePresentationSendDisabled(input: {
+  fullscreen: boolean;
+  disabled: boolean;
+  hasText: boolean;
+  attachments: ComposerAttachment[];
+  hasExternalContent: boolean;
+  allowEmpty: boolean;
+}): boolean {
+  return (
+    input.disabled || (input.fullscreen && !input.allowEmpty && !hasSendableComposerContent(input))
+  );
+}
+
+function shouldShowFullscreenControl(
+  compact: boolean,
+  readOnly: boolean,
+  overlayVisible: boolean,
+  renderedLines: number,
+) {
+  return compact && !readOnly && !overlayVisible && renderedLines > 2;
+}
+
 export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
   function MessageInput(props, ref) {
     const {
@@ -1186,11 +1244,15 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       textReplacement,
       submitLabel,
     } = resolveMessageInputProps(props);
+    const { isActiveComposer } = useComposerKeyboardScope();
     const mode = resolveComposerInputMode(inputMode);
     const { t } = useTranslation();
     const isCompact = useIsCompactFormFactor();
     const { height: windowHeight } = useWindowDimensions();
-    const maxInputHeight = resolveMaxInputHeight(windowHeight);
+    const editingSession = useComposerEditingSession(inputMode, props.editingSession);
+    const isFullscreen = useComposerFullscreen(editingSession);
+    const [renderedLines, setRenderedLines] = useState(1);
+    const maxInputHeight = resolveMaxInputHeight(windowHeight, isCompact);
     const buttonIconSize = isWeb ? ICON_SIZE.md : ICON_SIZE.lg;
     const toast = useToast();
     const voice = useVoiceOptional();
@@ -1207,26 +1269,19 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const inputWrapperRef = useRef<View | null>(null);
     const textInputRef = useRef<ComposerTextInputHandle | null>(null);
     const isInputFocusedRef = useRef(false);
-    const valueRef = useRef(value);
-    const selectionRef = useRef({ start: value.length, end: value.length });
-    const appliedTextReplacementKeyRef = useRef(textReplacement.key);
-    const webTextareaRef = useRef<HTMLElement | null>(null);
-    const composerHeight = useComposerHeight({
-      value,
-      textareaRef: webTextareaRef,
-      minHeight: MIN_INPUT_HEIGHT,
-      maxHeight: maxInputHeight,
-    });
-    const { style: composerHeightStyle, scrollEnabled: isComposerScrollEnabled } = composerHeight;
-    const measuredComposerHeight = composerHeight.mode === "measured" ? composerHeight : undefined;
-    const updateComposerHeightForText = measuredComposerHeight?.onTextChange;
-    const resetComposerHeight = measuredComposerHeight?.reset;
-
-    const handleComposerLayout = useCallback(
-      (event: LayoutChangeEvent) => onHeightChange?.(event.nativeEvent.layout.height),
-      [onHeightChange],
+    const handoff = editingSession.peekHandoff(textReplacement);
+    const focusIntentRef = useRef(Boolean(handoff?.focused));
+    const valueRef = useRef(handoff?.snapshot.text ?? value);
+    const selectionRef = useRef(
+      handoff?.snapshot.selection ?? { start: value.length, end: value.length },
     );
-
+    const activeComposerRef = useRef(isActiveComposer);
+    activeComposerRef.current = isActiveComposer;
+    const [webTextArea, setWebTextArea] = useState<HTMLElement | null>(null);
+    const appliedTextReplacementKeyRef = useRef(textReplacement.key);
+    const textReplacementRef = useRef(textReplacement);
+    textReplacementRef.current = textReplacement;
+    const webTextareaRef = useRef<HTMLElement | null>(null);
     const updateLiveTextPresence = useCallback((text: string) => {
       const nextHasLiveText = text.trim().length > 0;
       if (hasLiveTextRef.current === nextHasLiveText) return;
@@ -1234,13 +1289,93 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       setHasLiveText(nextHasLiveText);
     }, []);
 
+    const assignTextInput = useCallback(
+      (input: ComposerTextInputHandle | null) => {
+        const previous = textInputRef.current;
+        if (!input && previous) {
+          editingSession.captureForRemount({
+            snapshot: getComposerInputSnapshot(
+              previous,
+              valueRef.current,
+              selectionRef.current,
+              webTextareaRef.current,
+            ),
+            focused: previous.isFocused() || isInputFocusedRef.current,
+            replacementKey: appliedTextReplacementKeyRef.current,
+          });
+        }
+        textInputRef.current = input;
+        if (isWeb) {
+          const element = getWebTextAreaImpl(input) as HTMLElement | null;
+          webTextareaRef.current = element;
+          setWebTextArea(element);
+        }
+        if (!input) return;
+        const transfer = editingSession.takeHandoff(textReplacementRef.current);
+        if (transfer) {
+          appliedTextReplacementKeyRef.current = textReplacementRef.current.key;
+          valueRef.current = transfer.snapshot.text;
+          updateLiveTextPresence(transfer.snapshot.text);
+          selectionRef.current = transfer.snapshot.selection;
+          input.replaceText(transfer.snapshot.text, transfer.snapshot.selection);
+          if (transfer.focused && activeComposerRef.current) input.focus();
+        }
+      },
+      [editingSession, updateLiveTextPresence],
+    );
+    useLayoutEffect(() => {
+      if (isActiveComposer && focusIntentRef.current) textInputRef.current?.focus();
+    }, [isActiveComposer]);
+    const getLiveText = useCallback(() => valueRef.current, []);
+    const composerHeight = useComposerHeight({
+      getText: getLiveText,
+      textareaRef: webTextareaRef,
+      minHeight: MIN_INPUT_HEIGHT,
+      maxHeight: maxInputHeight,
+      onRenderedLinesChange: setRenderedLines,
+      presentationKey: isFullscreen,
+    });
+    const { style: composerHeightStyle, scrollEnabled: isComposerScrollEnabled } = composerHeight;
+    const measuredComposerHeight = composerHeight.mode === "measured" ? composerHeight : undefined;
+    const updateComposerHeightForText = measuredComposerHeight?.onTextChange;
+    const resetComposerHeight = measuredComposerHeight?.reset;
+
+    const changePresentation = useCallback(
+      (fullscreen: boolean) => {
+        if (editingSession.getFullscreen() === fullscreen) return;
+        const snapshot = getComposerInputSnapshot(
+          textInputRef.current,
+          valueRef.current,
+          selectionRef.current,
+        );
+        editingSession.changePresentation(fullscreen, {
+          snapshot,
+          focused: textInputRef.current?.isFocused() ?? isInputFocusedRef.current,
+          replacementKey: appliedTextReplacementKeyRef.current,
+        });
+        valueRef.current = snapshot.text;
+        selectionRef.current = snapshot.selection;
+      },
+      [editingSession],
+    );
+    const exitFullscreen = useCallback(() => changePresentation(false), [changePresentation]);
+
+    const handleComposerLayout = useCallback(
+      (event: LayoutChangeEvent) => onHeightChange?.(event.nativeEvent.layout.height),
+      [onHeightChange],
+    );
+
     const replaceText = useCallback(
       (nextText: string, selection?: { start: number; end: number }) => {
         updateComposerHeightForText?.(valueRef.current, nextText);
         valueRef.current = nextText;
         updateLiveTextPresence(nextText);
         selectionRef.current = selection ?? { start: nextText.length, end: nextText.length };
-        textInputRef.current?.replaceText(nextText, selection);
+        if (nextText === "") {
+          textInputRef.current?.reset();
+        } else {
+          textInputRef.current?.replaceText(nextText, selection);
+        }
         onChangeText(nextText);
       },
       [onChangeText, updateComposerHeightForText, updateLiveTextPresence],
@@ -1292,7 +1427,11 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       updateComposerHeightForText?.(valueRef.current, textReplacement.text);
       valueRef.current = textReplacement.text;
       updateLiveTextPresence(textReplacement.text);
-      textInputRef.current?.replaceText(textReplacement.text);
+      if (textReplacement.text === "") {
+        textInputRef.current?.reset();
+      } else {
+        textInputRef.current?.replaceText(textReplacement.text);
+      }
     }, [textReplacement, updateComposerHeightForText, updateLiveTextPresence]);
 
     useEffect(() => {
@@ -1403,8 +1542,9 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
           canStartDictation,
           toast,
           startDictation,
+          exitFullscreen,
         }),
-      [canStartDictation, dictationUnavailableMessage, startDictation, toast],
+      [canStartDictation, dictationUnavailableMessage, startDictation, toast, exitFullscreen],
     );
 
     const handleVoicePress = useCallback(
@@ -1476,10 +1616,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         handleStopRealtimeVoice,
         toast,
         interruptBeforeVoiceMessage: t("composer.voice.interruptBeforeVoice"),
+        exitFullscreen,
       });
     }, [
       disabled,
       handleStopRealtimeVoice,
+      exitFullscreen,
       isAgentRunning,
       isConnected,
       t,
@@ -1563,10 +1705,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       if (isWeb) {
         webTextareaRef.current = getWebTextArea() as HTMLElement | null;
       }
-    }, [getWebTextArea]);
+    }, [getWebTextArea, isFullscreen]);
 
     usePasteImagesEffect({
-      getWebTextArea,
+      textarea: webTextArea,
       isConnected,
       disabled,
       isDictating,
@@ -1587,16 +1729,30 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const shouldHandleWebKeyPress = isWeb;
     const shouldSubmitOnEnter = isWeb && !isCompact;
 
-    function handleDesktopKeyPress(event: WebTextInputKeyPressEvent) {
-      if (!shouldHandleWebKeyPress) return;
-      handleDesktopKeyPressImpl(event, {
+    const handleDesktopKeyPress = useCallback(
+      (event: WebTextInputKeyPressEvent) => {
+        if (!shouldHandleWebKeyPress) return;
+        handleDesktopKeyPressImpl(event, {
+          onKeyPressCallback,
+          input: getComposerInputSnapshot(
+            textInputRef.current,
+            valueRef.current,
+            selectionRef.current,
+          ),
+          submitOnEnter: shouldSubmitOnEnter,
+          isAgentRunning,
+          onQueue,
+          isSubmitDisabled,
+          isSubmitLoading,
+          disabled,
+          handleAlternateSendAction,
+          handleDefaultSendAction,
+        });
+      },
+      [
+        shouldHandleWebKeyPress,
         onKeyPressCallback,
-        input: getComposerInputSnapshot(
-          textInputRef.current,
-          valueRef.current,
-          selectionRef.current,
-        ),
-        submitOnEnter: shouldSubmitOnEnter,
+        shouldSubmitOnEnter,
         isAgentRunning,
         onQueue,
         isSubmitDisabled,
@@ -1604,8 +1760,8 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         disabled,
         handleAlternateSendAction,
         handleDefaultSendAction,
-      });
-    }
+      ],
+    );
 
     const primaryActionKind = resolvePrimaryActionKind({
       hasSendableContent: hasSendableComposerContent({
@@ -1669,16 +1825,18 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     );
 
     const handleInputFocus = useCallback(() => {
+      focusIntentRef.current = true;
       isInputFocusedRef.current = true;
       setIsInputFocused(true);
       onFocusChange?.(true);
     }, [onFocusChange]);
 
     const handleInputBlur = useCallback(() => {
+      if (activeComposerRef.current && !isFullscreen) focusIntentRef.current = false;
       isInputFocusedRef.current = false;
       setIsInputFocused(false);
       onFocusChange?.(false);
-    }, [onFocusChange]);
+    }, [isFullscreen, onFocusChange]);
 
     const handlePasteError = useCallback(
       (message: string) => {
@@ -1726,8 +1884,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     // `fontFamily` here is silently dropped while every other property lands.
     // An inline style outranks both classes. See docs/unistyles.md.
     const textInputStyle = useMemo(
-      () => [styles.textInput, mode.isMonospace && styles.textInputMonospace, composerHeightStyle],
-      [composerHeightStyle, mode.isMonospace],
+      () => [
+        styles.textInput,
+        mode.isMonospace && styles.textInputMonospace,
+        isFullscreen ? styles.fullscreenTextInput : composerHeightStyle,
+      ],
+      [composerHeightStyle, mode.isMonospace, isFullscreen],
     );
     // Static content has no textarea to mirror, so it grows with its own text
     // instead of the measured input height.
@@ -1771,107 +1933,192 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       [isDictating, isRealtimeVoiceForCurrentAgent, voice?.isMuted, buttonIconSize],
     );
 
-    return (
-      <View
-        ref={rootRef}
-        style={styles.container}
-        testID="message-input-root"
-        onLayout={handleComposerLayout}
-      >
-        <MessageInputAutoFocus
-          enabled={autoFocus}
-          autoFocusKey={autoFocusKey}
-          textInputRef={textInputRef}
+    const sendButton = useMemo(
+      () => (
+        <PrimaryAction
+          kind={isFullscreen ? "send" : primaryActionKind}
+          activeActionContent={activeActionContent}
+          shouldShow
+          canPressLoadingButton={canPressLoadingButton}
+          onSubmitLoadingPress={onSubmitLoadingPress}
+          onDefaultSendAction={handleDefaultSendAction}
+          isSendButtonDisabled={resolvePresentationSendDisabled({
+            fullscreen: isFullscreen,
+            disabled: isSendButtonDisabled,
+            hasText: hasLiveText,
+            attachments,
+            hasExternalContent,
+            allowEmpty: allowEmptySubmit,
+          })}
+          submitAccessibilityLabel={submitAccessibilityLabel}
+          sendButtonCombinedStyle={sendButtonCombinedStyle}
+          isSubmitLoading={isSubmitLoading}
+          submitIcon={submitIcon}
+          submitLabel={submitLabel}
+          submitButtonTestID={submitButtonTestID}
+          buttonIconSize={buttonIconSize}
+          sendKeys={DEFAULT_SEND_KEYS}
+          sendTooltipLabel={sendTooltipLabel}
         />
-        {/* Regular input */}
-        <View
-          ref={inputWrapperRef}
-          style={inputWrapperCombinedStyle}
-          pointerEvents={surfacePresentation.input.pointerEvents}
-        >
-          {attachmentSlot}
-          {/* Text input */}
-          <RenderProfile id="ComposerTextSurface">
-            <ComposerTextSurface
-              readOnly={readOnly}
-              value={value}
-              textInputRef={textInputRef}
-              textInputStyle={textInputStyle}
-              readOnlyTextStyle={readOnlyTextStyle}
-              placeholder={placeholder ?? t("composer.placeholders.fallback")}
-              accessibilityLabel={t(mode.accessibilityLabelKey)}
-              onChangeText={handleInputChange}
-              onFocus={handleInputFocus}
-              onBlur={handleInputBlur}
-              editable={!isDictating && !isRealtimeVoiceForCurrentAgent && !disabled}
-              scrollEnabled={isComposerScrollEnabled}
-              autoFocus={false}
-              onKeyPress={shouldHandleWebKeyPress ? handleDesktopKeyPress : undefined}
-              onSelectionChange={handleSelectionChange}
-              onPasteImages={onPasteImages}
-              onPasteError={handlePasteError}
-              focusHintVisible={isWeb && !isInputFocused && !value}
-              focusInputKeys={focusInputKeys}
-              focusHintLabel={t("composer.input.focusHint", {
-                shortcut: focusInputKeys ? formatShortcut(focusInputKeys[0], getShortcutOs()) : "",
-              })}
+      ),
+      [
+        isFullscreen,
+        primaryActionKind,
+        activeActionContent,
+        canPressLoadingButton,
+        onSubmitLoadingPress,
+        handleDefaultSendAction,
+        isSendButtonDisabled,
+        hasLiveText,
+        attachments,
+        hasExternalContent,
+        allowEmptySubmit,
+        submitAccessibilityLabel,
+        sendButtonCombinedStyle,
+        isSubmitLoading,
+        submitIcon,
+        submitLabel,
+        submitButtonTestID,
+        buttonIconSize,
+        sendTooltipLabel,
+      ],
+    );
+    const textSurface = useMemo(
+      () => (
+        <RenderProfile id="ComposerTextSurface">
+          <ComposerTextSurface
+            readOnly={readOnly}
+            value={
+              readOnly
+                ? value
+                : resolveComposerSurfaceText(
+                    valueRef.current,
+                    textReplacement,
+                    appliedTextReplacementKeyRef.current,
+                  )
+            }
+            textReplacementKey={textReplacement.key}
+            textInputRef={assignTextInput}
+            textInputStyle={textInputStyle}
+            readOnlyTextStyle={readOnlyTextStyle}
+            placeholder={placeholder ?? t("composer.placeholders.fallback")}
+            accessibilityLabel={t(mode.accessibilityLabelKey)}
+            onChangeText={handleInputChange}
+            onFocus={handleInputFocus}
+            onBlur={handleInputBlur}
+            editable={!isDictating && !isRealtimeVoiceForCurrentAgent && !disabled}
+            scrollEnabled={isComposerScrollEnabled}
+            autoFocus={
+              Boolean(editingSession.peekHandoff(textReplacement)?.focused) && isActiveComposer
+            }
+            onKeyPress={shouldHandleWebKeyPress ? handleDesktopKeyPress : undefined}
+            onSelectionChange={handleSelectionChange}
+            onPasteImages={onPasteImages}
+            onPasteError={handlePasteError}
+            fullscreen={isFullscreen}
+            compact={isCompact}
+            onRenderedLinesChange={setRenderedLines}
+            focusHintVisible={!isFullscreen && isWeb && !isInputFocused && !value}
+            focusInputKeys={focusInputKeys}
+            focusHintLabel={t("composer.input.focusHint", {
+              shortcut: focusInputKeys ? formatShortcut(focusInputKeys[0], getShortcutOs()) : "",
+            })}
+          />
+        </RenderProfile>
+      ),
+      [
+        readOnly,
+        textReplacement,
+        editingSession,
+        isActiveComposer,
+        assignTextInput,
+        textInputStyle,
+        readOnlyTextStyle,
+        placeholder,
+        t,
+        mode.accessibilityLabelKey,
+        handleInputChange,
+        handleInputFocus,
+        handleInputBlur,
+        isDictating,
+        isRealtimeVoiceForCurrentAgent,
+        disabled,
+        isComposerScrollEnabled,
+        shouldHandleWebKeyPress,
+        handleDesktopKeyPress,
+        handleSelectionChange,
+        onPasteImages,
+        handlePasteError,
+        isFullscreen,
+        isCompact,
+        isInputFocused,
+        value,
+        focusInputKeys,
+      ],
+    );
+    const toolbar = useMemo(
+      () => (
+        <View style={styles.buttonRow}>
+          {/* Toolbar left: attachment button + agent controls */}
+          <View style={styles.leftButtonGroup}>
+            <AttachmentDropdown
+              visible={mode.showAttachments}
+              isConnected={isConnected}
+              disabled={disabled}
+              attachButtonStyle={attachButtonStyle}
+              renderAttachButtonIcon={renderAttachButtonIcon}
+              attachmentMenuItems={attachmentMenuItems}
+              addAttachmentLabel={t("composer.input.addAttachment")}
             />
-          </RenderProfile>
+            {leftContent}
+          </View>
 
-          {/* Button row */}
-          <View style={styles.buttonRow}>
-            {/* Toolbar left: attachment button + agent controls */}
-            <View style={styles.leftButtonGroup}>
-              <AttachmentDropdown
-                visible={mode.showAttachments}
-                isConnected={isConnected}
-                disabled={disabled}
-                attachButtonStyle={attachButtonStyle}
-                renderAttachButtonIcon={renderAttachButtonIcon}
-                attachmentMenuItems={attachmentMenuItems}
-                addAttachmentLabel={t("composer.input.addAttachment")}
-              />
-              {leftContent}
-            </View>
-
-            {/* Right: voice button, contextual button (realtime/send/cancel) */}
-            <View style={styles.rightButtonGroup}>
-              {beforeVoiceContent}
-              <VoiceButtonTooltip
-                visible={mode.showVoice}
-                onVoicePress={handleVoicePress}
-                isDictationStartEnabled={isDictationStartEnabled}
-                voiceButtonAccessibilityLabel={voiceButtonAccessibilityLabel}
-                voiceButtonStyle={voiceButtonStyle}
-                renderVoiceButtonIcon={renderVoiceButtonIcon}
-                voiceTooltipText={voiceTooltipText}
-                isRealtimeVoiceForCurrentAgent={isRealtimeVoiceForCurrentAgent}
-                voiceMuteToggleKeys={voiceMuteToggleKeys}
-                dictationToggleKeys={dictationToggleKeys}
-              />
-              {rightContent}
-              <PrimaryAction
-                kind={primaryActionKind}
-                activeActionContent={activeActionContent}
-                shouldShow
-                canPressLoadingButton={canPressLoadingButton}
-                onSubmitLoadingPress={onSubmitLoadingPress}
-                onDefaultSendAction={handleDefaultSendAction}
-                isSendButtonDisabled={isSendButtonDisabled}
-                submitAccessibilityLabel={submitAccessibilityLabel}
-                sendButtonCombinedStyle={sendButtonCombinedStyle}
-                isSubmitLoading={isSubmitLoading}
-                submitIcon={submitIcon}
-                submitLabel={submitLabel}
-                submitButtonTestID={submitButtonTestID}
-                buttonIconSize={buttonIconSize}
-                sendKeys={DEFAULT_SEND_KEYS}
-                sendTooltipLabel={sendTooltipLabel}
-              />
-            </View>
+          {/* Right: voice button, contextual button (realtime/send/cancel) */}
+          <View style={styles.rightButtonGroup}>
+            {beforeVoiceContent}
+            <VoiceButtonTooltip
+              visible={mode.showVoice}
+              onVoicePress={handleVoicePress}
+              isDictationStartEnabled={isDictationStartEnabled}
+              voiceButtonAccessibilityLabel={voiceButtonAccessibilityLabel}
+              voiceButtonStyle={voiceButtonStyle}
+              renderVoiceButtonIcon={renderVoiceButtonIcon}
+              voiceTooltipText={voiceTooltipText}
+              isRealtimeVoiceForCurrentAgent={isRealtimeVoiceForCurrentAgent}
+              voiceMuteToggleKeys={voiceMuteToggleKeys}
+              dictationToggleKeys={dictationToggleKeys}
+            />
+            {rightContent}
+            {sendButton}
           </View>
         </View>
-
+      ),
+      [
+        mode.showAttachments,
+        isConnected,
+        disabled,
+        attachButtonStyle,
+        renderAttachButtonIcon,
+        attachmentMenuItems,
+        t,
+        leftContent,
+        beforeVoiceContent,
+        mode.showVoice,
+        handleVoicePress,
+        isDictationStartEnabled,
+        voiceButtonAccessibilityLabel,
+        voiceButtonStyle,
+        renderVoiceButtonIcon,
+        voiceTooltipText,
+        isRealtimeVoiceForCurrentAgent,
+        voiceMuteToggleKeys,
+        dictationToggleKeys,
+        rightContent,
+        sendButton,
+      ],
+    );
+    const voiceOverlay = useMemo(
+      () => (
         <View
           style={overlayContainerStyle}
           pointerEvents={surfacePresentation.overlay.pointerEvents}
@@ -1894,6 +2141,62 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
             onRealtimeVoiceStop={handleRealtimeVoiceStop}
           />
         </View>
+      ),
+      [
+        overlayContainerStyle,
+        surfacePresentation.overlay.pointerEvents,
+        showDictationOverlay,
+        showRealtimeOverlay,
+        voice,
+        dictationVolume,
+        dictationDuration,
+        isDictating,
+        isDictationProcessing,
+        dictationStatus,
+        dictationError,
+        handleCancelRecording,
+        handleAcceptRecording,
+        handleAcceptAndSendRecording,
+        handleRetryFailedRecording,
+        handleDiscardFailedRecording,
+        handleRealtimeVoiceStop,
+      ],
+    );
+    const enterFullscreen = useCallback(() => changePresentation(true), [changePresentation]);
+    return (
+      <View
+        ref={rootRef}
+        style={styles.container}
+        testID="message-input-root"
+        onLayout={handleComposerLayout}
+      >
+        <MessageInputAutoFocus
+          enabled={autoFocus}
+          autoFocusKey={autoFocusKey}
+          textInputRef={textInputRef}
+        />
+        <ComposerInputPresentation
+          fullscreen={isFullscreen}
+          iconSize={buttonIconSize}
+          active={isActiveComposer}
+          surface={textSurface}
+          toolbar={toolbar}
+          send={sendButton}
+          error={props.submissionError}
+          onExit={exitFullscreen}
+          inputWrapperRef={inputWrapperRef}
+          inputWrapperStyle={inputWrapperCombinedStyle}
+          inputPointerEvents={surfacePresentation.input.pointerEvents}
+          attachmentSlot={attachmentSlot}
+          showFullscreenButton={shouldShowFullscreenControl(
+            isCompact,
+            readOnly,
+            showOverlay,
+            renderedLines,
+          )}
+          onEnter={enterFullscreen}
+          overlay={voiceOverlay}
+        />
       </View>
     );
   },
@@ -1912,10 +2215,15 @@ const styles = StyleSheet.create((theme: Theme) => ({
     borderWidth: theme.borderWidth[1],
     borderColor: theme.colors.borderAccent,
     borderRadius: theme.borderRadius["2xl"],
-    paddingVertical: {
+    paddingTop: {
       xs: theme.spacing[2],
       md: theme.spacing[4],
     },
+    // The button row bleeds 6px horizontally, so match its corner inset at the bottom.
+    paddingBottom: {
+      xs: theme.spacing[2],
+      md: theme.spacing[3],
+    },
     paddingHorizontal: {
       xs: theme.spacing[3],
       md: theme.spacing[4],
@@ -1933,6 +2241,19 @@ const styles = StyleSheet.create((theme: Theme) => ({
   inputWrapperReadOnly: {
     borderStyle: "dotted",
   },
+  compactTextSurface: { paddingRight: 36 },
+  fullscreenTextSurface: { flex: 1, minHeight: 0 },
+  fullscreenTextInput: { flex: 1, height: "100%", textAlignVertical: "top" },
+  lineMeasurement: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 36,
+    opacity: 0,
+    maxHeight: undefined,
+    minHeight: undefined,
+    height: undefined,
+  },
   textInputScrollWrapper: {
     flexShrink: 1,
     position: "relative",
@@ -1952,9 +2273,13 @@ const styles = StyleSheet.create((theme: Theme) => ({
     color: theme.colors.foreground,
     fontSize: theme.fontSize.content,
     fontWeight: theme.fontWeight.normal,
-    lineHeight: theme.fontSize.content * 1.4,
+    // No lineHeight on native. React Native applies it as a span over the text, and an
+    // empty trailing line is laid out from the font's own metrics on some devices, so
+    // the input jumps when the first character lands on a new line. The font's natural
+    // line box is the same for every line. Web keeps the CSS value.
     ...(isWeb
       ? ({
+          lineHeight: theme.fontSize.content * 1.4,
           outlineStyle: "none",
           outlineWidth: 0,
           outlineColor: "transparent",
diff --git a/packages/app/src/composer/input/presentation.tsx b/packages/app/src/composer/input/presentation.tsx
new file mode 100644
index 0000000000..d02821696a
--- /dev/null
+++ b/packages/app/src/composer/input/presentation.tsx
@@ -0,0 +1,146 @@
+import { useCallback, useMemo, type ReactNode, type Ref } from "react";
+import { View, type ViewProps } from "react-native";
+import { Maximize2, Minimize2 } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import { isWeb } from "@/constants/platform";
+import { StyleSheet } from "react-native-unistyles";
+import { ComposerFullscreenHost } from "./fullscreen-host";
+
+function keepEditorFocused(event: import("react-native").PointerEvent) {
+  if (isWeb) event.preventDefault();
+}
+
+/** Both presentations receive the same editing surface and send capability. */
+export function ComposerInputPresentation({
+  fullscreen,
+  iconSize,
+  active,
+  surface,
+  toolbar,
+  send,
+  error,
+  onExit,
+  inputWrapperRef,
+  inputWrapperStyle,
+  inputPointerEvents,
+  attachmentSlot,
+  showFullscreenButton,
+  onEnter,
+  overlay,
+}: {
+  fullscreen: boolean;
+  iconSize: number;
+  active: boolean;
+  surface: ReactNode;
+  toolbar: ReactNode;
+  send: ReactNode;
+  error: ReactNode;
+  onExit: () => void;
+  inputWrapperRef: Ref<View>;
+  inputWrapperStyle: ViewProps["style"];
+  inputPointerEvents: ViewProps["pointerEvents"];
+  attachmentSlot: ReactNode;
+  showFullscreenButton: boolean;
+  onEnter: () => void;
+  overlay: ReactNode;
+}) {
+  const { t } = useTranslation();
+  // ArrowUp ends at x19; the fullscreen glyphs end at x21 in Lucide's 24px viewBox.
+  // Compensate for that difference to align visible ink with Send, not just boxes.
+  const railAdjustment = iconSize / 12;
+  const maximizeIcon = useCallback(
+    (color: string) => <Maximize2 color={color} size={iconSize} />,
+    [iconSize],
+  );
+  const minimizeIcon = useCallback(
+    (color: string) => <Minimize2 color={color} size={iconSize} />,
+    [iconSize],
+  );
+  const enterStyle = useMemo(
+    () => [styles.fullscreenButton, { right: -6 + railAdjustment }],
+    [railAdjustment],
+  );
+  const exitStyle = useMemo(
+    () => [styles.iconButton, { marginRight: railAdjustment }],
+    [railAdjustment],
+  );
+  if (!fullscreen)
+    return (
+      <>
+        <View ref={inputWrapperRef} style={inputWrapperStyle} pointerEvents={inputPointerEvents}>
+          {attachmentSlot}
+          <View style={styles.inlineTextSurface}>
+            {surface}
+            {showFullscreenButton ? (
+              <Button
+                variant="ghost"
+                size="xs"
+                accessibilityLabel={t("composer.input.fullscreen")}
+                leftIcon={maximizeIcon}
+                onPointerDown={keepEditorFocused}
+                onPress={onEnter}
+                style={enterStyle}
+                hitSlop={8}
+              >
+                {null}
+              </Button>
+            ) : null}
+          </View>
+          {toolbar}
+        </View>
+        {overlay}
+      </>
+    );
+  return (
+    <ComposerFullscreenHost onExit={onExit} active={active}>
+      <View style={styles.fullscreen} testID="composer-fullscreen">
+        <View style={styles.exitRow}>
+          <Button
+            variant="ghost"
+            size="xs"
+            accessibilityLabel={t("composer.input.exitFullscreen")}
+            onPointerDown={keepEditorFocused}
+            onPress={onExit}
+            style={exitStyle}
+            leftIcon={minimizeIcon}
+            hitSlop={8}
+          >
+            {null}
+          </Button>
+        </View>
+        {surface}
+        {error}
+        <View style={styles.sendRow}>{send}</View>
+      </View>
+    </ComposerFullscreenHost>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  inlineTextSurface: { flexShrink: 1, position: "relative" },
+  iconButton: {
+    width: 28,
+    height: 28,
+    padding: 0,
+    borderWidth: 0,
+    borderRadius: theme.borderRadius.full,
+  },
+  fullscreenButton: {
+    position: "absolute",
+    top: 0,
+    width: 28,
+    height: 28,
+    padding: 0,
+    borderWidth: 0,
+    borderRadius: theme.borderRadius.full,
+  },
+  fullscreen: {
+    flex: 1,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[4],
+    gap: theme.spacing[3],
+  },
+  exitRow: { alignItems: "flex-end", flexShrink: 0 },
+  sendRow: { flexShrink: 0, alignItems: "flex-end" },
+}));
diff --git a/packages/app/src/composer/input/state.test.ts b/packages/app/src/composer/input/state.test.ts
index 5503ea1512..a7f4113b28 100644
--- a/packages/app/src/composer/input/state.test.ts
+++ b/packages/app/src/composer/input/state.test.ts
@@ -4,6 +4,7 @@ import {
   computeCanStartDictation,
   resolveActiveSendBehavior,
   resolveComposerSurfacePresentation,
+  resolveComposerSurfaceText,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -316,3 +317,26 @@ describe("stopRealtimeVoice", () => {
     expect(calls).toEqual(["cancel agent", "stop voice"]);
   });
 });
+
+describe("composer surface text", () => {
+  it("measures a new nonempty replacement before it reaches the editing handle", () => {
+    const replacement = { kind: "replace" as const, key: "draft:2", text: "First\nSecond\nThird" };
+    expect(resolveComposerSurfaceText("Short draft", replacement, "draft:1")).toBe(
+      replacement.text,
+    );
+  });
+
+  it("keeps live typing once the replacement is applied", () => {
+    const replacement = { kind: "replace" as const, key: "draft:2", text: "First\nSecond\nThird" };
+    expect(resolveComposerSurfaceText("Edited live draft", replacement, "draft:2")).toBe(
+      "Edited live draft",
+    );
+  });
+
+  it("uses the live handoff when its replacement has already been applied", () => {
+    const replacement = { kind: "initial" as const, key: "draft:0", text: "Stale publication" };
+    expect(resolveComposerSurfaceText("Live remount handoff", replacement, "draft:0")).toBe(
+      "Live remount handoff",
+    );
+  });
+});
diff --git a/packages/app/src/composer/input/state.ts b/packages/app/src/composer/input/state.ts
index a63aeb02dc..3786613eb2 100644
--- a/packages/app/src/composer/input/state.ts
+++ b/packages/app/src/composer/input/state.ts
@@ -1,6 +1,6 @@
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
-import type { MessagePayload } from "@/composer/types";
+import type { MessagePayload, TextReplacement } from "@/composer/types";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
 
 export type SendBehavior = ActiveTurnBehavior | "queue";
@@ -192,3 +192,11 @@ export async function stopRealtimeVoice(ctx: StopRealtimeVoiceContext): Promise<
 
   await ctx.voice.stopVoice();
 }
+
+export function resolveComposerSurfaceText(
+  liveText: string,
+  replacement: TextReplacement,
+  appliedReplacementKey: string,
+): string {
+  return replacement.key === appliedReplacementKey ? liveText : replacement.text;
+}
diff --git a/packages/app/src/composer/input/text-input.web.browser.test.tsx b/packages/app/src/composer/input/text-input.web.browser.test.tsx
index 91dec513e6..29df20012c 100644
--- a/packages/app/src/composer/input/text-input.web.browser.test.tsx
+++ b/packages/app/src/composer/input/text-input.web.browser.test.tsx
@@ -82,6 +82,49 @@ afterEach(() => {
 });
 
 describe("ComposerTextInput web IME composition", () => {
+  it("resets the composer text while preserving focus", () => {
+    const mounted = mountInput(ignoreTextChange);
+    act(() => {
+      mounted.inputRef.current?.focus();
+      typeFromIme(mounted.textarea, "line one\nline two");
+    });
+
+    act(() => mounted.inputRef.current?.reset());
+
+    expect(mounted.textarea.value).toBe("");
+    expect(mounted.inputRef.current?.getText()).toBe("");
+    expect(document.activeElement).toBe(mounted.textarea);
+  });
+
+  it("keeps its editing handle and selection across a rerender during composition", () => {
+    const recorder = createTextRecorder();
+    const mounted = mountInput(recorder.onChangeText);
+    const handle = mounted.inputRef.current;
+    act(() => {
+      handle?.focus();
+      dispatchComposition(mounted.textarea, "compositionstart");
+      typeFromIme(mounted.textarea, "你好");
+      mounted.textarea.setSelectionRange(1, 2);
+      mounted.root.render(
+        <ComposerTextInput
+          ref={mounted.inputRef}
+          initialValue="stale publication"
+          multiline
+          onChangeText={recorder.onChangeText}
+          placeholder="updated presentation"
+        />,
+      );
+    });
+    expect(mounted.inputRef.current).toBe(handle);
+    expect(handle?.getNativeRef()).toBe(mounted.textarea);
+    expect([mounted.textarea.selectionStart, mounted.textarea.selectionEnd]).toEqual([1, 2]);
+    expect(document.activeElement).toBe(mounted.textarea);
+    expect(recorder.changes).toEqual([]);
+    act(() => dispatchComposition(mounted.textarea, "compositionend"));
+    expect(recorder.changes).toEqual(["你好"]);
+    expect(handle?.getText()).toBe("你好");
+  });
+
   it("keeps locally typed text when its parent rerenders with a stale value", () => {
     const recorder = createTextRecorder();
     const mounted = mountInput(recorder.onChangeText);
diff --git a/packages/app/src/composer/text-source.ts b/packages/app/src/composer/text-source.ts
new file mode 100644
index 0000000000..9046fd5744
--- /dev/null
+++ b/packages/app/src/composer/text-source.ts
@@ -0,0 +1,5 @@
+/** Live text is read by editing consumers; containers subscribe only to what they display. */
+export interface ComposerTextSource {
+  getSnapshot: () => string;
+  subscribe: (listener: () => void) => () => void;
+}
diff --git a/packages/app/src/composer/tracks.tsx b/packages/app/src/composer/tracks.tsx
index 3ff9e765c6..e33cd6ba53 100644
--- a/packages/app/src/composer/tracks.tsx
+++ b/packages/app/src/composer/tracks.tsx
@@ -11,7 +11,6 @@ import {
 } from "@/components/ui/menu";
 import { StatusRing } from "@/components/status-ring";
 import { STATUS_RING_HALO_INSET } from "@/components/status-ring/geometry";
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { isWeb } from "@/constants/platform";
 import { getStatusDotColor } from "@/utils/status-dot-color";
 import { STATUS_INDICATOR_FILLED_DOT_SIZE } from "@/utils/status-indicator-geometry";
@@ -328,7 +327,7 @@ const styles = StyleSheet.create((theme) => {
     },
     track: {
       width: "100%",
-      maxWidth: MAX_CONTENT_WIDTH,
+      maxWidth: theme.contentMaxWidth,
       flexDirection: "row",
       alignItems: "center",
       gap: theme.spacing[1],
diff --git a/packages/app/src/composer/types.ts b/packages/app/src/composer/types.ts
index 2f03b7e89a..ee01144ed7 100644
--- a/packages/app/src/composer/types.ts
+++ b/packages/app/src/composer/types.ts
@@ -10,6 +10,7 @@ export interface MessagePayload {
 }
 
 export interface TextReplacement {
+  kind: "initial" | "replace";
   key: string;
   text: string;
 }
diff --git a/packages/app/src/constants/layout.ts b/packages/app/src/constants/layout.ts
index 3e159041e2..9e9a15f6b4 100644
--- a/packages/app/src/constants/layout.ts
+++ b/packages/app/src/constants/layout.ts
@@ -11,8 +11,6 @@ export const HEADER_INNER_HEIGHT_MOBILE = 56;
 export const WORKSPACE_SECONDARY_HEADER_HEIGHT = 36;
 export const HEADER_TOP_PADDING_MOBILE = 8;
 
-// Max width for chat content (stream view, input area, new agent form)
-export const MAX_CONTENT_WIDTH = 820;
 export const COMPACT_FORM_FACTOR_WIDTH = 500;
 
 // Settings uses the canonical desktop list + detail layout. Its sidebar and
@@ -35,13 +33,18 @@ export {
   getIsElectronMac as getIsElectronRuntimeMac,
 } from "./platform";
 
+/** Compact layouts are the breakpoints below `md`. */
+export function isCompactBreakpoint(breakpoint: string | undefined): boolean {
+  return breakpoint === "xs" || breakpoint === "sm";
+}
+
 /**
  * Reactive hook — re-renders the component when the breakpoint changes.
  * Always use this instead of reading UnistylesRuntime.breakpoint directly.
  */
 export function useIsCompactFormFactor(): boolean {
   const { rt } = useUnistyles();
-  return rt.breakpoint === "xs" || rt.breakpoint === "sm";
+  return isCompactBreakpoint(rt.breakpoint);
 }
 
 // SplitContainer relies on dnd-kit and DOM-backed accessibility helpers.
diff --git a/packages/app/src/contexts/session-context.tsx b/packages/app/src/contexts/session-context.tsx
index 475eb26f27..430e4ade74 100644
--- a/packages/app/src/contexts/session-context.tsx
+++ b/packages/app/src/contexts/session-context.tsx
@@ -1,6 +1,7 @@
 import { useRef, ReactNode, useCallback, useEffect } from "react";
 import { Buffer } from "buffer";
 import { AppState } from "react-native";
+import { observeOpenWorkspaceAgentIds } from "@/stores/workspace-layout-store";
 import { useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import { useClientActivity } from "@/hooks/use-client-activity";
@@ -14,13 +15,8 @@ import type { StreamItem } from "@/types/stream";
 import { deriveAgentStreamTurnLiveness } from "@/timeline/session-stream-reducers";
 import { planTimelineTailFetch } from "@/timeline/timeline-sync-plan";
 import { requestTimelineReplacement } from "@/timeline/timeline-replacement";
-import {
-  consumeForcedTimelineTailReplacement,
-  type TimelineDeliveryMode,
-  type TimelineResponsePayload,
-  type ViewedTimelineOwner,
-} from "@/timeline/viewed-timeline-sync";
-import type { AgentAttachment, SessionOutboundMessage } from "@getpaseo/protocol/messages";
+import { type ViewedTimelineOwner } from "@/timeline/viewed-timeline-sync";
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { parseServerInfoStatusPayload } from "@getpaseo/protocol/messages";
 import {
   buildAgentAttentionNotificationPayload,
@@ -30,14 +26,13 @@ import {
 } from "@getpaseo/protocol/agent-attention-notification";
 
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { AgentSessionConfig } from "@getpaseo/protocol/agent-types";
-import type { GitSetupOptions } from "@getpaseo/protocol/messages";
 import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
 import { getHostRuntimeStore, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useVoiceAudioEngineOptional, useVoiceRuntimeOptional } from "@/contexts/voice-context";
-import type { AudioPlaybackSource } from "@/voice/audio-engine-types";
+import type { AudioPlaybackSource } from "@/audio";
 import {
   selectAgentTimelineState,
+  toDaemonServerInfo,
   useSessionStore,
   type SessionState,
 } from "@/stores/session-store";
@@ -50,15 +45,12 @@ import {
   createInitDeferred,
   rejectInitDeferred,
 } from "@/utils/agent-initialization";
-import { encodeImages } from "@/utils/encode-images";
 import { derivePendingPermissionKey } from "@/utils/agent-snapshots";
-import type { AttachmentMetadata } from "@/attachments/types";
 import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 import { showProviderNoticeToast } from "@/utils/provider-notice-toast";
 import { applyCheckoutStatusUpdateFromEvent } from "@/git/checkout-status-cache";
-import { useProviderSubagentStore } from "@/subagents/provider-store";
-import { revalidateSessionAfterResume } from "@/contexts/session-resume-revalidation";
+import { resyncProviderSubagents, useProviderSubagentStore } from "@/subagents/provider-store";
 
 // Re-export types from session-store and draft-store for backward compatibility
 export type { DraftInput } from "@/stores/draft-store";
@@ -81,11 +73,6 @@ interface BufferedAudioChunk {
   id: string;
 }
 
-// COMPAT(selectiveAgentTimeline): added in v0.1.106, remove after 2027-01-12.
-function getTimelineDeliveryMode(selectiveAgentTimeline?: boolean): TimelineDeliveryMode {
-  return selectiveAgentTimeline ? "selective" : "legacy";
-}
-
 function decodeBase64Chunk(base64: string): Uint8Array {
   return Buffer.from(base64, "base64");
 }
@@ -231,11 +218,8 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
   const setIsPlayingAudio = useSessionStore((state) => state.setIsPlayingAudio);
   const setAgentStreamTail = useSessionStore((state) => state.setAgentStreamTail);
   const setAgentStreamHead = useSessionStore((state) => state.setAgentStreamHead);
-  const applyAgentTurnLiveness = useSessionStore((state) => state.applyAgentTurnLiveness);
-  const clearAgentTurnLiveness = useSessionStore((state) => state.clearAgentTurnLiveness);
   const clearAgentStreamHead = useSessionStore((state) => state.clearAgentStreamHead);
   const setInitializingAgents = useSessionStore((state) => state.setInitializingAgents);
-  const bumpHistorySyncGeneration = useSessionStore((state) => state.bumpHistorySyncGeneration);
   const setAgents = useSessionStore((state) => state.setAgents);
   const flushAgentLastActivity = useSessionStore((state) => state.flushAgentLastActivity);
   const setPendingPermissions = useSessionStore((state) => state.setPendingPermissions);
@@ -253,7 +237,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
   const _sessionStateTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const attentionNotifiedRef = useRef<Map<string, number>>(new Map());
   const appStateRef = useRef(AppState.currentState);
-  const forcedTimelineTailReplacements = useRef(new Set<string>());
   const viewedTimelineSyncRef = useRef<ViewedTimelineOwner | null>(null);
   const audioOutputBuffersRef = useRef<Map<string, BufferedAudioChunk[]>>(new Map());
   const activeAudioGroupsRef = useRef<Set<string>>(new Set());
@@ -273,23 +256,11 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     viewedTimelineSyncRef.current?.setActive(isAppVisible);
   }, [isAppVisible]);
 
-  const handleAppResumed = useCallback(
-    (awayMs: number) => {
-      void revalidateSessionAfterResume({
-        awayMs,
-        serverId,
-        bumpHistorySyncGeneration,
-      });
-    },
-    [bumpHistorySyncGeneration, serverId],
-  );
-
   // Client activity tracking (heartbeat, push token registration)
   useClientActivity({
     client,
     focusedAgentId,
     focusedTerminalId,
-    onAppResumed: handleAppResumed,
   });
   useEffect(() => startPushNotifications({ client, serverId }), [client, serverId]);
 
@@ -348,24 +319,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     [serverId],
   );
 
-  useEffect(() => {
-    const serverInfo = client.getLastServerInfoMessage();
-    if (!serverInfo) {
-      return;
-    }
-
-    updateSessionServerInfo(serverId, {
-      serverId: serverInfo.serverId,
-      hostname: serverInfo.hostname,
-      version: serverInfo.version,
-      ...(serverInfo.desktopManaged !== undefined
-        ? { desktopManaged: serverInfo.desktopManaged }
-        : {}),
-      ...(serverInfo.capabilities ? { capabilities: serverInfo.capabilities } : {}),
-      ...(serverInfo.features ? { features: serverInfo.features } : {}),
-    });
-  }, [client, serverId, updateSessionServerInfo]);
-
   useEffect(() => {
     const unregister = voiceRuntime?.registerSession({
       serverId,
@@ -412,15 +365,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     }
   }, [flushAgentLastActivity, serverId, isConnected, setInitializingAgents]);
 
-  useEffect(
-    () =>
-      client.subscribeConnectionStatus((connection) => {
-        if (connection.status === "connected") return;
-        clearAgentTurnLiveness(serverId);
-      }),
-    [clearAgentTurnLiveness, client, serverId],
-  );
-
   const applyWorkspaceSetupProgress = useCallback(
     (payload: WorkspaceSetupProgressPayload) => {
       upsertWorkspaceSetupProgress({ serverId, payload });
@@ -428,24 +372,62 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     [serverId, upsertWorkspaceSetupProgress],
   );
 
-  const applyTimelineResponse = useCallback((receivedPayload: TimelineResponsePayload) => {
-    const payload = consumeForcedTimelineTailReplacement(
-      receivedPayload,
-      forcedTimelineTailReplacements.current,
-    );
-    const owner = viewedTimelineSyncRef.current;
-    if (!owner) throw new Error("Viewed timeline owner is unavailable");
-    owner.applyTimelineResponse(payload);
-  }, []);
-
   useEffect(() => {
     const setAgentInitializing = createSetAgentInitializing(serverId, setInitializingAgents);
-    const initialDeliveryMode = getTimelineDeliveryMode(
-      client.getLastServerInfoMessage()?.features?.selectiveAgentTimeline,
-    );
+    const onStream = (message: SessionOutboundMessage) => {
+      if (message.type !== "agent_stream") return;
+      const { agentId, event, timestamp, seq, epoch } = message.payload;
+      const parsedTimestamp = new Date(timestamp);
+      const streamEvent = event;
+      if (
+        event.type === "turn_started" ||
+        event.type === "turn_completed" ||
+        event.type === "turn_failed" ||
+        event.type === "turn_canceled"
+      ) {
+        voiceRuntime?.onTurnEvent(serverId, agentId, event.type);
+      }
+      const turnLiveness = deriveAgentStreamTurnLiveness([
+        { event: streamEvent, seq, epoch, timestamp: parsedTimestamp },
+      ]);
+      if (turnLiveness.length > 0) {
+        getHostRuntimeStore().applyAgentTurnLiveness(serverId, agentId, turnLiveness);
+      }
+      sync.enqueueStreamEvent(agentId, {
+        event: streamEvent,
+        seq,
+        epoch,
+        timestamp: parsedTimestamp,
+      });
+
+      // NOTE: We don't update lastActivityAt on every stream event to prevent
+      // cascading rerenders. The agent_update handler updates agent.lastActivityAt
+      // on status changes, which is sufficient for sorting and display purposes.
+    };
+    const onReplacement = (message: SessionOutboundMessage) => {
+      if (message.type !== "agent.timeline.replacement") return;
+      void requestTimelineReplacement(
+        {
+          fetchAgentTimeline: (agentId, request) =>
+            getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, request),
+        },
+        message.payload.agentId,
+      ).catch((error: unknown) => {
+        console.warn("[Session] timeline replacement refresh failed", { serverId, error });
+      });
+    };
     const sync = getHostRuntimeStore().createViewedTimelineOwner(serverId, {
-      initialDeliveryMode,
-      setSubscription: (agentIds) => client.setAgentTimelineSubscription(agentIds),
+      observe: (agentIds) => {
+        const observation = client.observeTimeline(agentIds);
+        observation.subscribe({
+          snapshot: () => {},
+          update: (message) => {
+            if (message.type === "agent_stream") onStream(message);
+            else if (message.type === "agent.timeline.replacement") onReplacement(message);
+          },
+        });
+        return observation;
+      },
       readCursor: (agentId) => {
         const timeline = selectAgentTimelineState(
           useSessionStore.getState().sessions[serverId],
@@ -485,18 +467,8 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
           throw error;
         }
       },
-      fetchLatestTail: async (agentId) => {
-        forcedTimelineTailReplacements.current.add(agentId);
-        try {
-          return await getHostRuntimeStore().fetchAgentTimeline(
-            serverId,
-            agentId,
-            planTimelineTailFetch(),
-          );
-        } finally {
-          forcedTimelineTailReplacements.current.delete(agentId);
-        }
-      },
+      fetchLatestTail: (agentId) =>
+        getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, planTimelineTailFetch()),
       reportError: (error) => {
         console.warn("[Session] viewed timeline synchronization failed", { serverId, error });
       },
@@ -508,15 +480,19 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     viewedTimelineSyncRef.current = sync;
     setViewedTimelineSync(serverId, sync);
     sync.setActive(getIsAppVisible(appStateRef.current));
+    const stopObservingOpenChats = observeOpenWorkspaceAgentIds(serverId, (agentIds) =>
+      sync.replaceOpenTabAgentIds(agentIds),
+    );
 
     return () => {
+      stopObservingOpenChats();
       if (viewedTimelineSyncRef.current === sync) {
         viewedTimelineSyncRef.current = null;
       }
       setViewedTimelineSync(serverId, null);
       sync.dispose();
     };
-  }, [client, serverId, setInitializingAgents, setViewedTimelineSync]);
+  }, [client, serverId, setInitializingAgents, setViewedTimelineSync, voiceRuntime]);
 
   useEffect(() => {
     viewedTimelineSyncRef.current?.setConnected(isConnected);
@@ -524,113 +500,68 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
 
   // Daemon message handlers - directly update Zustand store
   useEffect(() => {
-    const owner = viewedTimelineSyncRef.current;
-    if (!owner) throw new Error("Viewed timeline owner is unavailable");
-
-    const unsubAgentStream = client.on("agent_stream", (message) => {
-      if (message.type !== "agent_stream") return;
-      const { agentId, event, timestamp, seq, epoch } = message.payload;
-      const parsedTimestamp = new Date(timestamp);
-      const streamEvent = event;
-      if (
-        event.type === "turn_started" ||
-        event.type === "turn_completed" ||
-        event.type === "turn_failed" ||
-        event.type === "turn_canceled"
-      ) {
-        voiceRuntime?.onTurnEvent(serverId, agentId, event.type);
-      }
-      const turnLiveness = deriveAgentStreamTurnLiveness([
-        { event: streamEvent, seq, epoch, timestamp: parsedTimestamp },
-      ]);
-      if (turnLiveness.length > 0) {
-        applyAgentTurnLiveness(serverId, agentId, turnLiveness);
-      }
-      owner.enqueueStreamEvent(agentId, {
-        event: streamEvent,
-        seq,
-        epoch,
-        timestamp: parsedTimestamp,
+    const feeds = client.observeEvents(
+      [
+        "agent_attention_required",
+        "terminal_attention_required",
+        "agent_permission_request",
+        "agent_permission_resolved",
+        "agent.provider_subagents.update",
+        "checkout_status_update",
+        "workspace_setup_progress",
+        "status.server_info",
+      ],
+      { notifications: true },
+    );
+    const onFeed = (
+      type: SessionOutboundMessage["type"],
+      handler: (message: SessionOutboundMessage) => void,
+    ) =>
+      feeds.subscribe({
+        snapshot: () => {},
+        update: (message) => {
+          if (message.type === type) handler(message);
+        },
       });
 
-      // NOTE: We don't update lastActivityAt on every stream event to prevent
-      // cascading rerenders. The agent_update handler updates agent.lastActivityAt
-      // on status changes, which is sufficient for sorting and display purposes.
-    });
-
-    const unsubAgentAttention = client.onAgentAttentionRequired((notification) => {
+    const unsubAgentAttention = onFeed("agent_attention_required", (message) => {
+      if (message.type !== "agent_attention_required") return;
+      const notification = message.payload;
       if (notification.shouldNotify) {
         notifyAgentAttention(notification);
       }
     });
 
-    const unsubAgentTimeline = client.on("fetch_agent_timeline_response", (message) => {
-      if (message.type !== "fetch_agent_timeline_response") return;
-      owner.flushStreamAgent(message.payload.agentId);
-      applyTimelineResponse(message.payload);
+    const unsubProviderSubagentUpdate = feeds.subscribe({
+      snapshot: () => {
+        void resyncProviderSubagents(client, serverId);
+      },
+      update: (message) => {
+        if (message.type !== "agent.provider_subagents.update") return;
+        useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
+      },
     });
 
-    const unsubTimelineReplacement = client.on("agent.timeline.replacement", (message) => {
-      if (message.type !== "agent.timeline.replacement") return;
-      void requestTimelineReplacement(
-        {
-          fetchAgentTimeline: (agentId, request) =>
-            getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, request),
-        },
-        message.payload.agentId,
-      ).catch((error: unknown) => {
-        console.warn("[Session] timeline replacement refresh failed", { serverId, error });
-      });
-    });
-
-    const unsubProviderSubagentUpdate = client.on("agent.provider_subagents.update", (message) => {
-      if (message.type !== "agent.provider_subagents.update") return;
-      useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
-    });
-
-    const unsubCheckoutStatusUpdate = client.on("checkout_status_update", (message) => {
+    const unsubCheckoutStatusUpdate = onFeed("checkout_status_update", (message) => {
       if (message.type !== "checkout_status_update") return;
       applyCheckoutStatusUpdateFromEvent({ queryClient, serverId, message });
     });
 
-    const unsubWorkspaceSetupProgress = client.on("workspace_setup_progress", (message) => {
+    const unsubWorkspaceSetupProgress = onFeed("workspace_setup_progress", (message) => {
       if (message.type !== "workspace_setup_progress") return;
       applyWorkspaceSetupProgress(message.payload);
     });
 
-    const unsubWorkspaceSetupStatusResponse = client.on(
-      "workspace_setup_status_response",
-      (message) => {
-        if (message.type !== "workspace_setup_status_response") return;
-        const { workspaceId, snapshot } = message.payload;
-        if (snapshot) {
-          applyWorkspaceSetupProgress({ workspaceId, ...snapshot });
-        }
-      },
-    );
-
-    const unsubStatus = client.on("status", (message) => {
+    const unsubStatus = onFeed("status", (message) => {
       if (message.type !== "status") return;
       const serverInfo = parseServerInfoStatusPayload(message.payload);
       if (serverInfo) {
-        viewedTimelineSyncRef.current?.setDeliveryMode(
-          getTimelineDeliveryMode(serverInfo.features?.selectiveAgentTimeline),
-        );
-        updateSessionServerInfo(serverId, {
-          serverId: serverInfo.serverId,
-          hostname: serverInfo.hostname,
-          version: serverInfo.version,
-          ...(serverInfo.desktopManaged !== undefined
-            ? { desktopManaged: serverInfo.desktopManaged }
-            : {}),
-          ...(serverInfo.capabilities ? { capabilities: serverInfo.capabilities } : {}),
-          ...(serverInfo.features ? { features: serverInfo.features } : {}),
-        });
+        updateSessionServerInfo(serverId, toDaemonServerInfo(serverInfo));
         return;
       }
     });
 
-    const unsubPermissionRequest = client.on("agent_permission_request", (message) => {
+    const unsubPermissionRequest = onFeed("agent_permission_request", (message) => {
       if (message.type !== "agent_permission_request") return;
       const { agentId, request } = message.payload;
 
@@ -642,7 +573,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
       });
     });
 
-    const unsubPermissionResolved = client.on("agent_permission_resolved", (message) => {
+    const unsubPermissionResolved = onFeed("agent_permission_resolved", (message) => {
       if (message.type !== "agent_permission_resolved") return;
       const { requestId, agentId } = message.payload;
 
@@ -751,7 +682,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
       voiceRuntime?.onServerSpeechStateChanged(serverId, message.payload.isSpeaking);
     });
 
-    const unsubTerminalAttention = client.on("terminal_attention_required", (message) => {
+    const unsubTerminalAttention = onFeed("terminal_attention_required", (message) => {
       if (message.type !== "terminal_attention_required") {
         return;
       }
@@ -773,14 +704,13 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     });
 
     return () => {
-      unsubTimelineReplacement();
-      unsubAgentStream();
-      unsubAgentTimeline();
+      void feeds
+        .release()
+        .catch((error) => console.warn("[Session] Failed to release feeds", error));
       unsubProviderSubagentUpdate();
       unsubAgentAttention();
       unsubCheckoutStatusUpdate();
       unsubWorkspaceSetupProgress();
-      unsubWorkspaceSetupStatusResponse();
       unsubStatus();
       unsubPermissionRequest();
       unsubPermissionResolved();
@@ -797,14 +727,12 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     setIsPlayingAudio,
     setAgentStreamTail,
     setAgentStreamHead,
-    applyAgentTurnLiveness,
     clearAgentStreamHead,
     setInitializingAgents,
     setAgents,
     setPendingPermissions,
     notifyAgentAttention,
     applyWorkspaceSetupProgress,
-    applyTimelineResponse,
     updateSessionServerInfo,
     toast,
     voiceRuntime,
@@ -863,48 +791,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     [client],
   );
 
-  const _createAgent = useCallback(
-    async ({
-      config,
-      initialPrompt,
-      images,
-      attachments,
-      git,
-      worktreeName,
-      requestId,
-    }: {
-      config: AgentSessionConfig;
-      initialPrompt: string;
-      images?: AttachmentMetadata[];
-      attachments?: AgentAttachment[];
-      git?: GitSetupOptions;
-      worktreeName?: string;
-      requestId?: string;
-    }) => {
-      if (!client) {
-        console.warn("[Session] createAgent skipped: daemon unavailable");
-        return;
-      }
-      const trimmedPrompt = initialPrompt.trim();
-      let imagesData: Array<{ data: string; mimeType: string }> | undefined;
-      try {
-        imagesData = await encodeImages(images);
-      } catch (error) {
-        console.error("[Session] Failed to prepare images for agent creation:", error);
-      }
-      await client.createAgent({
-        config,
-        ...(trimmedPrompt ? { initialPrompt: trimmedPrompt } : {}),
-        ...(imagesData && imagesData.length > 0 ? { images: imagesData } : {}),
-        ...(attachments && attachments.length > 0 ? { attachments } : {}),
-        ...(git ? { git } : {}),
-        ...(worktreeName ? { worktreeName } : {}),
-        ...(requestId ? { requestId } : {}),
-      });
-    },
-    [client],
-  );
-
   const _setAgentMode = useCallback(
     (agentId: string, modeId: string) => {
       if (!client) {
diff --git a/packages/app/src/contexts/session-resume-revalidation.test.ts b/packages/app/src/contexts/session-resume-revalidation.test.ts
deleted file mode 100644
index 4c32bcf115..0000000000
--- a/packages/app/src/contexts/session-resume-revalidation.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  revalidateSessionAfterResume,
-  SESSION_STALE_AFTER_MS,
-} from "./session-resume-revalidation";
-
-describe("session resume revalidation", () => {
-  it("refreshes demanded timeline history without manufacturing directory demand", async () => {
-    const calls: string[] = [];
-
-    const revalidated = await revalidateSessionAfterResume({
-      awayMs: SESSION_STALE_AFTER_MS,
-      serverId: "server",
-      bumpHistorySyncGeneration: (serverId) => calls.push(`history:${serverId}`),
-    });
-
-    expect(revalidated).toBe(true);
-    expect(calls).toEqual(["history:server"]);
-  });
-
-  it("does nothing after a brief background interval", async () => {
-    const calls: string[] = [];
-
-    const revalidated = await revalidateSessionAfterResume({
-      awayMs: SESSION_STALE_AFTER_MS - 1,
-      serverId: "server",
-      bumpHistorySyncGeneration: () => calls.push("history"),
-    });
-
-    expect(revalidated).toBe(false);
-    expect(calls).toEqual([]);
-  });
-});
diff --git a/packages/app/src/contexts/session-resume-revalidation.ts b/packages/app/src/contexts/session-resume-revalidation.ts
deleted file mode 100644
index 8766ce4cc7..0000000000
--- a/packages/app/src/contexts/session-resume-revalidation.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export const SESSION_STALE_AFTER_MS = 60_000;
-
-export async function revalidateSessionAfterResume(input: {
-  awayMs: number;
-  serverId: string;
-  bumpHistorySyncGeneration: (serverId: string) => void;
-}): Promise<boolean> {
-  if (input.awayMs < SESSION_STALE_AFTER_MS) {
-    return false;
-  }
-
-  input.bumpHistorySyncGeneration(input.serverId);
-  return true;
-}
diff --git a/packages/app/src/contexts/session-status-tracking.test.ts b/packages/app/src/contexts/session-status-tracking.test.ts
index 346127b1ff..dcd150d764 100644
--- a/packages/app/src/contexts/session-status-tracking.test.ts
+++ b/packages/app/src/contexts/session-status-tracking.test.ts
@@ -8,7 +8,7 @@ function createAgent(status: Agent["status"]): Agent {
     id: "agent-1",
     provider: "codex",
     status,
-    activeTurn: null,
+    turn: { phase: "idle", cancellationRequestId: null },
     createdAt: new Date(0),
     updatedAt: new Date(0),
     lastUserMessageAt: null,
diff --git a/packages/app/src/contexts/voice-context.tsx b/packages/app/src/contexts/voice-context.tsx
index 7bb0b9b7e1..4c8d04e2f1 100644
--- a/packages/app/src/contexts/voice-context.tsx
+++ b/packages/app/src/contexts/voice-context.tsx
@@ -9,8 +9,8 @@ import {
 } from "react";
 import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
 import { useSessionStore } from "@/stores/session-store";
-import { createAudioEngine } from "@/voice/audio-engine";
-import type { AudioEngine } from "@/voice/audio-engine-types";
+import { createAudioEngine } from "@/audio";
+import type { AudioEngine } from "@/audio";
 import {
   createVoiceRuntime,
   type VoiceRuntime,
diff --git a/packages/app/src/data/provider-icons.ts b/packages/app/src/data/provider-icons.ts
new file mode 100644
index 0000000000..9556be7ab2
--- /dev/null
+++ b/packages/app/src/data/provider-icons.ts
@@ -0,0 +1,17 @@
+import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
+import { createStore } from "zustand/vanilla";
+
+export const providerSnapshotIcons = createStore<ReadonlyMap<string, ReadonlyMap<string, string>>>(
+  () => new Map(),
+);
+
+export function replaceProviderSnapshotIcons(
+  serverId: string,
+  entries: readonly Pick<ProviderSnapshotEntry, "provider" | "iconSvg">[],
+): void {
+  const icons = new Map<string, string>();
+  for (const entry of entries) {
+    if (entry.iconSvg) icons.set(entry.provider, entry.iconSvg);
+  }
+  providerSnapshotIcons.setState((previous) => new Map(previous).set(serverId, icons), true);
+}
diff --git a/packages/app/src/data/provider-snapshot-cache.test.ts b/packages/app/src/data/provider-snapshot-cache.test.ts
index f92e7e9bf9..424657e3fa 100644
--- a/packages/app/src/data/provider-snapshot-cache.test.ts
+++ b/packages/app/src/data/provider-snapshot-cache.test.ts
@@ -2,16 +2,10 @@ import { describe, expect, it } from "vitest";
 import { Buffer } from "buffer";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import { compactProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
-import { z } from "zod";
 import { createProviderSnapshotCache, type ProviderSnapshotCache } from "./provider-snapshot-cache";
 
-const SNAPSHOT_KEY_PREFIX = "@paseo/provider-snapshot/v1:";
-const SNAPSHOT_INDEX_KEY = "@paseo/provider-snapshot-index/v1";
-const SnapshotIndexSchema = z.object({
-  version: z.literal(1),
-  entries: z.array(z.object({ key: z.string(), bytes: z.number(), writtenAt: z.string() })),
-});
-
+const SNAPSHOT_KEY_PREFIX = "@paseo/provider-snapshot/v2:";
+const SNAPSHOT_INDEX_KEY = "@paseo/provider-snapshot-index/v2";
 function createStorage(maxSnapshotBytes = Number.POSITIVE_INFINITY) {
   const values = new Map<string, string>();
   const stats = { getAllKeysCalls: 0 };
@@ -109,21 +103,17 @@ function snapshotBytes(values: Map<string, string>): number {
     );
 }
 
-function expectIndexMatchesSnapshots(values: Map<string, string>): void {
-  const storedIndex = values.get(SNAPSHOT_INDEX_KEY);
-  if (!storedIndex) throw new Error("Expected provider snapshot index");
-  const index = SnapshotIndexSchema.parse(JSON.parse(storedIndex));
-  const storedSnapshots = [...values]
-    .filter(([key]) => key.startsWith(SNAPSHOT_KEY_PREFIX))
-    .map(([key, value]) => ({
-      key,
-      bytes: Buffer.byteLength(key, "utf8") + Buffer.byteLength(value, "utf8"),
-    }))
-    .toSorted((left, right) => left.key.localeCompare(right.key));
-  const indexedSnapshots = index.entries
-    .map(({ key, bytes }) => ({ key, bytes }))
-    .toSorted((left, right) => left.key.localeCompare(right.key));
-  expect(indexedSnapshots).toEqual(storedSnapshots);
+function expectConsistentSnapshots(values: Map<string, string>): void {
+  expect(values.has(SNAPSHOT_INDEX_KEY)).toBe(false);
+  for (const [key, value] of values) {
+    if (!key.startsWith(SNAPSHOT_KEY_PREFIX)) continue;
+    const [serverId, kind] = JSON.parse(key.slice(SNAPSHOT_KEY_PREFIX.length));
+    if (kind !== "cwd") continue;
+    const { hash } = JSON.parse(value);
+    expect(values.has(`${SNAPSHOT_KEY_PREFIX}${JSON.stringify([serverId, "hash", hash])}`)).toBe(
+      true,
+    );
+  }
 }
 
 function writeSnapshot(
@@ -140,6 +130,131 @@ function writeSnapshot(
 }
 
 describe("provider snapshot cache", () => {
+  it("normalizes duplicate model identities in live, legacy and persisted catalogs", async () => {
+    const storage = createStorage();
+    const entries = snapshotEntries("shared");
+    const first = entries[0].models![0];
+    entries[0].models!.push({ ...first, label: "Duplicate" });
+    const compactSnapshot = compactProviderSnapshot(entries);
+    const payload = { requestId: "catalog", generatedAt: "2026-09-01T00:00:00.000Z", entries };
+    const cache = createProviderSnapshotCache(storage);
+    const legacy = await cache.materialize("server-1", payload);
+    expect(legacy.entries[0].models).toEqual([first]);
+    const live = await cache.materialize("server-1", {
+      ...payload,
+      snapshotHash: "old-hash",
+      compactSnapshot,
+    });
+    expect(live.entries[0].models).toEqual([first]);
+    expect(live.compactSnapshot).toEqual(compactSnapshot);
+    await cache.write({
+      serverId: "server-1",
+      cwd: "/repo",
+      hash: "old-hash",
+      generatedAt: payload.generatedAt,
+      compactSnapshot,
+    });
+    const restarted = createProviderSnapshotCache(storage);
+    const saved = await restarted.read("server-1", "/repo");
+    expect(saved?.entries[0].models).toEqual([first]);
+    const unchanged = await restarted.materialize("server-1", {
+      ...payload,
+      entries: [],
+      snapshotHash: "old-hash",
+      notModified: true,
+    });
+    expect(unchanged.entries[0].models).toEqual([first]);
+    expect(unchanged.snapshotHash).toBe("old-hash");
+  });
+
+  it("removes externally lost body references and retains independent orphan bodies on reconciliation", async () => {
+    const storage = createStorage();
+    const cache = createProviderSnapshotCache(storage);
+    await writeSnapshot(cache, {
+      cwd: "/lost",
+      label: "lost",
+      generatedAt: "2026-09-01T00:00:00.000Z",
+    });
+    await writeSnapshot(cache, {
+      cwd: "/orphan",
+      label: "orphan",
+      generatedAt: "2026-09-02T00:00:00.000Z",
+    });
+    storage.values.delete(`${SNAPSHOT_KEY_PREFIX}["server-1","hash","lost"]`);
+    storage.values.delete(`${SNAPSHOT_KEY_PREFIX}["server-1","cwd","/orphan"]`);
+
+    await expect(cache.read("server-1", "/lost")).resolves.toBeNull();
+    expect(storage.values.has(`${SNAPSHOT_KEY_PREFIX}["server-1","cwd","/lost"]`)).toBe(false);
+    const restarted = createProviderSnapshotCache(storage);
+    await expect(restarted.readHash("server-1", "orphan")).resolves.not.toBeNull();
+    expectConsistentSnapshots(storage.values);
+  });
+
+  it.each(["live", "restart", "late association"])(
+    "retains recently reused bodies under pressure (%s)",
+    async (variant) => {
+      const storage = createStorage();
+      const seed = async (cache: ProviderSnapshotCache) => {
+        await writeSnapshot(cache, {
+          cwd: "/a",
+          label: "aaa",
+          generatedAt: "2026-09-01T00:00:00.000Z",
+        });
+        await writeSnapshot(cache, {
+          cwd: "/b",
+          label: "bbb",
+          generatedAt: "2026-09-02T00:00:00.000Z",
+        });
+      };
+      await seed(createProviderSnapshotCache(storage));
+      const maxBytes = snapshotBytes(storage.values);
+      let cache = createProviderSnapshotCache(storage, { maxBytes });
+      await writeSnapshot(cache, {
+        cwd: "/c",
+        label: "aaa",
+        generatedAt: "2026-09-03T00:00:00.000Z",
+      });
+      if (variant === "restart") cache = createProviderSnapshotCache(storage, { maxBytes });
+      if (variant === "late association") {
+        await writeSnapshot(cache, {
+          cwd: "/a",
+          label: "aaa",
+          generatedAt: "2026-09-01T00:00:00.000Z",
+        });
+      }
+      await writeSnapshot(cache, {
+        cwd: "/d",
+        label: "ccc",
+        generatedAt: "2026-09-04T00:00:00.000Z",
+      });
+
+      await expect(cache.read("server-1", "/c")).resolves.toMatchObject({ hash: "aaa" });
+      await expect(cache.read("server-1", "/d")).resolves.toMatchObject({ hash: "ccc" });
+      await expect(cache.readHash("server-1", "bbb")).resolves.toBeNull();
+      expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
+      expectConsistentSnapshots(storage.values);
+    },
+  );
+
+  it("keeps a reusable body when its directory association cannot fit beside it", async () => {
+    const input = { cwd: "/repo", label: "shared", generatedAt: "2026-09-06T12:00:00.000Z" };
+    const stagingStorage = createStorage();
+    await writeSnapshot(createProviderSnapshotCache(stagingStorage), input);
+    const maxBytes = snapshotBytes(stagingStorage.values) - 1;
+    const storage = createStorage(maxBytes);
+    const cache = createProviderSnapshotCache(storage, { maxBytes });
+
+    await writeSnapshot(cache, input);
+
+    await expect(cache.readHash("server-1", "shared")).resolves.not.toBeNull();
+    await expect(cache.read("server-1", "/repo")).resolves.toBeNull();
+    expect([...storage.values.keys()].filter((key) => key.includes('"cwd"'))).toEqual([]);
+    expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
+    expectConsistentSnapshots(storage.values);
+    const restarted = createProviderSnapshotCache(storage, { maxBytes });
+    await expect(restarted.readHash("server-1", "shared")).resolves.not.toBeNull();
+  });
+
   it("round-trips compact snapshots with shared thinking option references", async () => {
     const thinkingOptions = [{ id: "high", label: "High", isDefault: true }];
     const entries: ProviderSnapshotEntry[] = [
@@ -217,7 +332,7 @@ describe("provider snapshot cache", () => {
     await expect(cache.read("server-1", "/oldest")).resolves.toBeNull();
     await expect(cache.read("server-1", "/newest")).resolves.not.toBeNull();
     expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     expect(storage.stats.getAllKeysCalls).toBe(1);
   });
 
@@ -236,7 +351,7 @@ describe("provider snapshot cache", () => {
 
     expect(storage.values.has('@paseo/provider-snapshot/v1:["server-1","/legacy"]')).toBe(false);
     await expect(cache.read("server-1", "/current")).resolves.not.toBeNull();
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
   });
 
   it("clears unindexed snapshots on the first read", async () => {
@@ -247,7 +362,7 @@ describe("provider snapshot cache", () => {
     await expect(cache.read("server-1", "/legacy")).resolves.toBeNull();
 
     expect(storage.values.has('@paseo/provider-snapshot/v1:["server-1","/legacy"]')).toBe(false);
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     expect(storage.stats.getAllKeysCalls).toBe(1);
   });
 
@@ -266,7 +381,7 @@ describe("provider snapshot cache", () => {
     ]);
 
     await expect(cache.read("server-1", "/current")).resolves.not.toBeNull();
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     expect(storage.stats.getAllKeysCalls).toBe(1);
   });
 
@@ -292,8 +407,8 @@ describe("provider snapshot cache", () => {
     expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
     expect(
       [...storage.values.keys()].filter((key) => key.startsWith(SNAPSHOT_KEY_PREFIX)),
-    ).toHaveLength(1);
-    expectIndexMatchesSnapshots(storage.values);
+    ).toHaveLength(2);
+    expectConsistentSnapshots(storage.values);
   });
 
   it("removes the previous value when a replacement exceeds the entire budget", async () => {
@@ -314,10 +429,10 @@ describe("provider snapshot cache", () => {
 
     await expect(tinyCache.read("server-1", "/repo")).resolves.toBeNull();
     expect(snapshotBytes(storage.values)).toBe(0);
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
   });
 
-  it("resets corrupted index state before accepting another snapshot", async () => {
+  it("removes obsolete index data before accepting another snapshot", async () => {
     const storage = createStorage();
     storage.values.set(SNAPSHOT_INDEX_KEY, "corrupt");
     storage.values.set(`${SNAPSHOT_KEY_PREFIX}legacy`, "legacy");
@@ -331,7 +446,7 @@ describe("provider snapshot cache", () => {
 
     expect(storage.values.has(`${SNAPSHOT_KEY_PREFIX}legacy`)).toBe(false);
     await expect(cache.read("server-1", "/current")).resolves.not.toBeNull();
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     expect(storage.stats.getAllKeysCalls).toBe(1);
   });
 
@@ -361,7 +476,7 @@ describe("provider snapshot cache", () => {
     });
 
     await expect(cache.read("server-1", "/emoji")).resolves.toBeNull();
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
   });
 
   it("keeps hundreds of concurrent writes bounded without rescanning snapshots", async () => {
@@ -380,7 +495,7 @@ describe("provider snapshot cache", () => {
 
     expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
     await expect(cache.read("server-1", "/repo-249")).resolves.not.toBeNull();
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     expect(storage.stats.getAllKeysCalls).toBe(1);
   });
 
@@ -394,7 +509,7 @@ describe("provider snapshot cache", () => {
         label: "stable",
         generatedAt: "2026-08-01T00:00:00.000Z",
       });
-      const failedKey = `${SNAPSHOT_KEY_PREFIX}["server-1","/failed"]`;
+      const failedKey = `${SNAPSHOT_KEY_PREFIX}["server-1","cwd","/failed"]`;
       storage.failNext("setItem", timing, failedKey);
 
       await writeSnapshot(cache, {
@@ -412,34 +527,7 @@ describe("provider snapshot cache", () => {
       await expect(restarted.read("server-1", "/stable")).resolves.not.toBeNull();
       await expect(restarted.read("server-1", "/next")).resolves.not.toBeNull();
       expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(2_000);
-      expectIndexMatchesSnapshots(storage.values);
-    },
-  );
-
-  it.each(["before", "after"] as const)(
-    "reconciles snapshot records when the derived index write fails %s its side effect",
-    async (timing) => {
-      const storage = createStorage();
-      const cache = createProviderSnapshotCache(storage, { maxBytes: 2_000 });
-      await writeSnapshot(cache, {
-        cwd: "/stable",
-        label: "stable",
-        generatedAt: "2026-08-01T00:00:00.000Z",
-      });
-      storage.failNext("setItem", timing, SNAPSHOT_INDEX_KEY);
-
-      await writeSnapshot(cache, {
-        cwd: "/orphan-after-index-failure",
-        label: "orphan",
-        generatedAt: "2026-08-02T00:00:00.000Z",
-      });
-
-      const restarted = createProviderSnapshotCache(storage, { maxBytes: 2_000 });
-      await expect(
-        restarted.read("server-1", "/orphan-after-index-failure"),
-      ).resolves.not.toBeNull();
-      expectIndexMatchesSnapshots(storage.values);
-      expect(storage.stats.getAllKeysCalls).toBe(2);
+      expectConsistentSnapshots(storage.values);
     },
   );
 
@@ -481,7 +569,7 @@ describe("provider snapshot cache", () => {
 
     expect(storage.values.get("@paseo/unrelated")).toBe("keep-me");
     expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
     await expect(restarted.read("server-1", "/final")).resolves.not.toBeNull();
   });
 
@@ -508,14 +596,14 @@ describe("provider snapshot cache", () => {
 
     await expect(cache.read("server-1", "/newest")).resolves.not.toBeNull();
     expect(snapshotBytes(storage.values)).toBeLessThanOrEqual(maxBytes);
-    expectIndexMatchesSnapshots(storage.values);
+    expectConsistentSnapshots(storage.values);
   });
 
   it.each(["before", "after"] as const)(
     "recovers when invalid-record cleanup fails %s deletion",
     async (timing) => {
       const storage = createStorage();
-      const key = `${SNAPSHOT_KEY_PREFIX}["server-1","/invalid"]`;
+      const key = `${SNAPSHOT_KEY_PREFIX}["server-1","cwd","/invalid"]`;
       storage.values.set(key, "invalid");
       storage.failNext("multiRemove", timing);
       const cache = createProviderSnapshotCache(storage);
@@ -529,7 +617,165 @@ describe("provider snapshot cache", () => {
 
       expect(storage.values.has(key)).toBe(false);
       await expect(cache.read("server-1", "/recovered")).resolves.not.toBeNull();
-      expectIndexMatchesSnapshots(storage.values);
+      expectConsistentSnapshots(storage.values);
     },
   );
 });
+
+it("stores and expands identical content once across directory associations", async () => {
+  const storage = createStorage();
+  const cache = createProviderSnapshotCache(storage);
+  for (const cwd of ["/a", "/b", "/c"]) {
+    await writeSnapshot(cache, { cwd, label: "shared", generatedAt: "2026-09-06T12:00:00.000Z" });
+  }
+  const a = await cache.read("server-1", "/a");
+  const b = await cache.read("server-1", "/b");
+  expect(a?.entries[0]?.models).toBe(b?.entries[0]?.models);
+  expect(
+    [...storage.values.values()].filter((value) => value.includes('"compactSnapshot"')),
+  ).toHaveLength(1);
+});
+
+it("coalesces missing bodies and keeps a newer pushed association when an older pull completes", async () => {
+  const { QueryClient } = await import("@tanstack/react-query");
+  const { applyProvidersSnapshotUpdate } = await import("./push-router");
+  const { fetchProvidersSnapshot, providersSnapshotQueryKey } =
+    await import("./providers-snapshot");
+  const storage = createStorage();
+  const cache = createProviderSnapshotCache(storage);
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
+  const serverId = "shared-host";
+  const snapshot = (hash: string, fetchedAt = "2026-09-06T12:00:00.000Z") => ({
+    entries: [],
+    snapshotHash: hash,
+    compactSnapshot: compactProviderSnapshot(snapshotEntries(hash)),
+    generatedAt: fetchedAt,
+    fetchedAt: { pi: fetchedAt },
+    requestId: hash,
+  });
+  let transfers = 0;
+  const client = {
+    async getProvidersSnapshot() {
+      transfers++;
+      return snapshot("shared");
+    },
+  };
+  const announce = (cwd: string, hash: string, fetchedAt = "2026-09-06T12:00:00.000Z") =>
+    applyProvidersSnapshotUpdate({
+      serverId,
+      queryClient,
+      cache,
+      client,
+      message: {
+        type: "providers_snapshot_update",
+        payload: {
+          cwd,
+          entries: [],
+          snapshotHash: hash,
+          generatedAt: fetchedAt,
+          fetchedAt: { pi: fetchedAt },
+        },
+      },
+    });
+  try {
+    await Promise.all(["/a", "/b", "/c"].map((cwd) => announce(cwd, "shared")));
+    expect(transfers).toBe(1);
+    const first = await cache.read(serverId, "/a");
+    const second = await cache.read(serverId, "/b");
+    expect(first!.entries[0]!.models).toBe(second!.entries[0]!.models);
+    expect(
+      queryClient.getQueryData<{ compactSnapshot: unknown }>(
+        providersSnapshotQueryKey(serverId, "/a"),
+      )!.compactSnapshot,
+    ).toBe(first!.compactSnapshot);
+    expect(
+      [...storage.values.values()].filter((value) => value.includes('"compactSnapshot"')),
+    ).toHaveLength(1);
+    await Promise.all(
+      ["/a", "/b", "/c"].map((cwd) => announce(cwd, "shared", "2026-09-06T13:00:00.000Z")),
+    );
+    expect(transfers).toBe(1);
+    expect((await cache.read(serverId, "/a"))!.entries[0]!.fetchedAt).toBe(
+      "2026-09-06T13:00:00.000Z",
+    );
+
+    await queryClient.refetchQueries({
+      queryKey: providersSnapshotQueryKey(serverId, "/b"),
+      exact: true,
+    });
+    expect(transfers).toBe(2);
+
+    let release!: (value: ReturnType<typeof snapshot>) => void;
+    let began!: () => void;
+    const started = new Promise<void>((resolve) => {
+      began = resolve;
+    });
+    const oldClient = {
+      getProvidersSnapshot() {
+        began();
+        return new Promise<ReturnType<typeof snapshot>>((resolve) => {
+          release = resolve;
+        });
+      },
+    };
+    const queryKey = providersSnapshotQueryKey(serverId, "/a");
+    const old = queryClient.fetchQuery({
+      queryKey,
+      staleTime: 0,
+      queryFn: ({ signal }) =>
+        fetchProvidersSnapshot({
+          serverId,
+          cwd: "/a",
+          queryClient,
+          cache,
+          client: oldClient,
+          signal,
+        }),
+    });
+    const cancelled = old.catch(() => undefined);
+    await started;
+    await applyProvidersSnapshotUpdate({
+      serverId,
+      queryClient,
+      cache,
+      client,
+      message: { type: "providers_snapshot_update", payload: { ...snapshot("new"), cwd: "/a" } },
+    });
+    release(snapshot("old"));
+    await cancelled;
+    // Drain the same public cache queue after the old transport finishes.
+    await cache.read(serverId, "/a");
+    expect((await cache.read(serverId, "/a"))!.hash).toBe("new");
+    expect(queryClient.getQueryData(queryKey)).toMatchObject({
+      snapshotHash: "new",
+      entries: [{ models: [{ id: "new" }] }],
+    });
+    expect((await cache.read(serverId, "/b"))!.hash).toBe("shared");
+
+    const restarted = createProviderSnapshotCache(storage);
+    expect((await restarted.read(serverId, "/a"))!.hash).toBe("new");
+    const evicted = createProviderSnapshotCache(storage, { maxBytes: 1 });
+    expect(await evicted.read(serverId, "/b")).toBeNull();
+    await applyProvidersSnapshotUpdate({
+      serverId,
+      queryClient,
+      cache: evicted,
+      client,
+      message: {
+        type: "providers_snapshot_update",
+        payload: {
+          cwd: "/b",
+          entries: [],
+          snapshotHash: "shared",
+          generatedAt: "2026-09-06T14:00:00.000Z",
+        },
+      },
+    });
+    expect(transfers).toBe(3);
+    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId, "/b"))).toMatchObject({
+      entries: [{ models: [{ id: "shared" }] }],
+    });
+  } finally {
+    queryClient.clear();
+  }
+});
diff --git a/packages/app/src/data/provider-snapshot-cache.ts b/packages/app/src/data/provider-snapshot-cache.ts
index ed4823a39c..3871cbb1e0 100644
--- a/packages/app/src/data/provider-snapshot-cache.ts
+++ b/packages/app/src/data/provider-snapshot-cache.ts
@@ -1,17 +1,21 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { Buffer } from "buffer";
-import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
+import {
+  normalizeAgentModelCatalog,
+  type ProviderSnapshotEntry,
+} from "@getpaseo/protocol/agent-types";
 import {
   expandProviderSnapshot,
   type CompactProviderSnapshot,
 } from "@getpaseo/protocol/provider-snapshot-codec";
 import { CompactProviderSnapshotSchema } from "@getpaseo/protocol/messages";
 import { z } from "zod";
+import type { GetProvidersSnapshotResponseMessage } from "@getpaseo/protocol/messages";
+type SnapshotPayload = GetProvidersSnapshotResponseMessage["payload"];
 
-const CACHE_VERSION = 1;
-const CACHE_KEY_PREFIX = "@paseo/provider-snapshot/v1";
-const CACHE_INDEX_KEY = "@paseo/provider-snapshot-index/v1";
-const CACHE_INDEX_VERSION = 1;
+const CACHE_VERSION = 2;
+const CACHE_KEY_PREFIX = "@paseo/provider-snapshot/v2";
+const CACHE_INDEX_KEY = "@paseo/provider-snapshot-index/v2";
 const DEFAULT_MAX_CACHE_BYTES = 4 * 1024 * 1024;
 
 interface ProviderSnapshotStorage {
@@ -31,7 +35,8 @@ interface StoredProviderSnapshot {
   version: typeof CACHE_VERSION;
   hash: string;
   generatedAt: string;
-  compactSnapshot: CompactProviderSnapshot;
+  compactSnapshot?: CompactProviderSnapshot;
+  fetchedAt?: Record<string, string>;
 }
 
 interface ProviderSnapshotIndexEntry {
@@ -40,30 +45,31 @@ interface ProviderSnapshotIndexEntry {
   writtenAt: string;
 }
 
-interface ProviderSnapshotIndex {
-  version: typeof CACHE_INDEX_VERSION;
-  entries: ProviderSnapshotIndexEntry[];
-}
-
 const StoredProviderSnapshotSchema: z.ZodType<StoredProviderSnapshot> = z.strictObject({
   version: z.literal(CACHE_VERSION),
   hash: z.string(),
   generatedAt: z.string().datetime({ offset: true }),
-  compactSnapshot: CompactProviderSnapshotSchema,
+  compactSnapshot: CompactProviderSnapshotSchema.optional(),
+  fetchedAt: z.record(z.string(), z.string()).optional(),
 });
 
 export interface CachedProviderSnapshot extends StoredProviderSnapshot {
+  compactSnapshot: CompactProviderSnapshot;
   entries: ProviderSnapshotEntry[];
 }
 
 export interface ProviderSnapshotCache {
   read(serverId: string, cwd: string | null): Promise<CachedProviderSnapshot | null>;
+  readHash(serverId: string, hash: string): Promise<CachedProviderSnapshot | null>;
+  materialize(serverId: string, snapshot: SnapshotPayload): Promise<SnapshotPayload>;
   write(input: {
     serverId: string;
     cwd: string | null;
     hash: string;
     generatedAt: string;
     compactSnapshot: CompactProviderSnapshot;
+    fetchedAt?: Record<string, string>;
+    signal?: AbortSignal;
   }): Promise<void>;
 }
 
@@ -74,23 +80,53 @@ export class ProviderSnapshotCacheMissError extends Error {
   }
 }
 
+// COMPAT(duplicateModelCatalog): added in v0.8.1, remove after 2027-03-14 once
+// the daemon floor is v0.8.1 and pre-fix cached catalogs are no longer supported.
+// Keep the original compact body/hash: normalization belongs to its decoded view.
+function normalizeCatalogs(entries: ProviderSnapshotEntry[]): ProviderSnapshotEntry[] {
+  return entries.map((entry) => {
+    if (!entry.models) return entry;
+    const models = normalizeAgentModelCatalog(entry.models);
+    return models === entry.models ? entry : { ...entry, models };
+  });
+}
+
 function cacheKey(serverId: string, cwd: string | null): string {
-  return `${CACHE_KEY_PREFIX}:${JSON.stringify([serverId, cwd])}`;
+  return `${CACHE_KEY_PREFIX}:${JSON.stringify([serverId, "cwd", cwd])}`;
+}
+
+function bodyKey(serverId: string, hash: string): string {
+  return `${CACHE_KEY_PREFIX}:${JSON.stringify([serverId, "hash", hash])}`;
 }
 
 function storedBytes(key: string, value: string): number {
   return Buffer.byteLength(key, "utf8") + Buffer.byteLength(value, "utf8");
 }
 
-function oldestFirst(left: ProviderSnapshotIndexEntry, right: ProviderSnapshotIndexEntry): number {
-  const writtenAtOrder = left.writtenAt.localeCompare(right.writtenAt);
-  return writtenAtOrder !== 0 ? writtenAtOrder : left.key.localeCompare(right.key);
+const CacheKeySchema = z.tuple([z.string(), z.enum(["cwd", "hash"]), z.string().nullable()]);
+
+function decodeCacheKey(key: string) {
+  return CacheKeySchema.parse(JSON.parse(key.slice(CACHE_KEY_PREFIX.length + 1)));
 }
 
-function parseStoredProviderSnapshot(value: string): StoredProviderSnapshot | null {
+function oldestFirst(left: ProviderSnapshotIndexEntry, right: ProviderSnapshotIndexEntry): number {
+  const writtenAtOrder = left.writtenAt.localeCompare(right.writtenAt);
+  if (writtenAtOrder !== 0) return writtenAtOrder;
+  // References must be evicted before equally recent bodies, regardless of key encoding.
+  const leftKind = decodeCacheKey(left.key)[1];
+  const rightKind = decodeCacheKey(right.key)[1];
+  if (leftKind !== rightKind) return leftKind === "cwd" ? -1 : 1;
+  return left.key.localeCompare(right.key);
+}
+
+function parseStoredProviderSnapshot(key: string, value: string): StoredProviderSnapshot | null {
   const parsed: unknown = JSON.parse(value);
   const result = StoredProviderSnapshotSchema.safeParse(parsed);
-  return result.success ? result.data : null;
+  if (!result.success) return null;
+  const [, kind, identity] = decodeCacheKey(key);
+  const stored = result.data;
+  if (kind === "hash") return stored.compactSnapshot && identity === stored.hash ? stored : null;
+  return stored.compactSnapshot ? null : stored;
 }
 
 export function createProviderSnapshotCache(
@@ -98,50 +134,76 @@ export function createProviderSnapshotCache(
   options: ProviderSnapshotCacheOptions = {},
 ): ProviderSnapshotCache {
   const maxBytes = options.maxBytes ?? DEFAULT_MAX_CACHE_BYTES;
-  let index: ProviderSnapshotIndex | null = null;
+  let index: ProviderSnapshotIndexEntry[] | null = null;
   let operationQueue = Promise.resolve();
-
-  async function persistIndex(entries: ProviderSnapshotIndexEntry[]): Promise<void> {
-    const nextIndex: ProviderSnapshotIndex = { version: CACHE_INDEX_VERSION, entries };
-    await storage.setItem(CACHE_INDEX_KEY, JSON.stringify(nextIndex));
-    index = nextIndex;
-  }
+  const bodies = new Map<string, CachedProviderSnapshot>();
 
   async function reconcileCache(): Promise<void> {
-    const keys = (await storage.getAllKeys()).filter((key) =>
-      key.startsWith(`${CACHE_KEY_PREFIX}:`),
+    const allKeys = await storage.getAllKeys();
+    // COMPAT(providerSnapshotCache): added in v0.7.2, remove legacy cleanup after 2027-03-06.
+    const legacyKeys = allKeys.filter(
+      (key) =>
+        key.startsWith("@paseo/provider-snapshot/v1:") ||
+        key === "@paseo/provider-snapshot-index/v1" ||
+        key === CACHE_INDEX_KEY,
     );
+    if (legacyKeys.length) await storage.multiRemove(legacyKeys);
+    const keys = allKeys.filter((key) => key.startsWith(`${CACHE_KEY_PREFIX}:`));
     const values = await storage.multiGet(keys);
     const keysToRemove: string[] = [];
     const entries: ProviderSnapshotIndexEntry[] = [];
+    const references: Array<{ key: string; body: string; writtenAt: string }> = [];
     for (const [key, value] of values) {
       if (value === null) continue;
       try {
-        const stored = parseStoredProviderSnapshot(value);
+        const stored = parseStoredProviderSnapshot(key, value);
         if (!stored) {
           keysToRemove.push(key);
           continue;
         }
+        const [serverId, kind] = decodeCacheKey(key);
         entries.push({ key, bytes: storedBytes(key, value), writtenAt: stored.generatedAt });
+        if (kind === "cwd")
+          references.push({
+            key,
+            body: bodyKey(serverId, stored.hash),
+            writtenAt: stored.generatedAt,
+          });
       } catch (error) {
-        if (!(error instanceof SyntaxError) && !(error instanceof RangeError)) throw error;
+        if (
+          !(error instanceof SyntaxError) &&
+          !(error instanceof RangeError) &&
+          !(error instanceof z.ZodError)
+        )
+          throw error;
         keysToRemove.push(key);
       }
     }
 
-    let totalBytes = entries.reduce((total, entry) => total + entry.bytes, 0);
-    const retainedEntries = [...entries].sort(oldestFirst);
+    // Reconstruct the dependency ordering before applying a possibly smaller budget.
+    for (const reference of references) {
+      const body = entries.find((entry) => entry.key === reference.body);
+      if (!body) keysToRemove.push(reference.key);
+      else if (body.writtenAt < reference.writtenAt) body.writtenAt = reference.writtenAt;
+    }
+    const retainedEntries = entries
+      .filter((entry) => !keysToRemove.includes(entry.key))
+      .sort(oldestFirst);
+    let totalBytes = retainedEntries.reduce((total, entry) => total + entry.bytes, 0);
     while (totalBytes > maxBytes) {
       const evicted = retainedEntries.shift();
       if (!evicted) break;
       totalBytes -= evicted.bytes;
       keysToRemove.push(evicted.key);
     }
-    if (keysToRemove.length > 0) await storage.multiRemove(keysToRemove);
-    await persistIndex(retainedEntries);
+    if (keysToRemove.length > 0) {
+      for (const removedKey of keysToRemove) bodies.delete(removedKey);
+      await storage.multiRemove(keysToRemove);
+    }
+    index = retainedEntries;
   }
 
-  async function ensureCacheIndex(): Promise<ProviderSnapshotIndex> {
+  async function ensureCacheIndex(): Promise<ProviderSnapshotIndexEntry[]> {
     if (index === null) await reconcileCache();
     if (index === null) throw new Error("Provider snapshot cache reconciliation failed");
     return index;
@@ -158,83 +220,210 @@ export function createProviderSnapshotCache(
     return result;
   }
 
-  async function writeSnapshot(input: {
-    serverId: string;
-    cwd: string | null;
-    hash: string;
-    generatedAt: string;
-    compactSnapshot: CompactProviderSnapshot;
-  }): Promise<void> {
+  async function writeRecord(
+    key: string,
+    input: StoredProviderSnapshot,
+    requiredBody?: { key: string; input: StoredProviderSnapshot },
+  ): Promise<void> {
     const currentIndex = await ensureCacheIndex();
-    const key = cacheKey(input.serverId, input.cwd);
-    const stored = StoredProviderSnapshotSchema.safeParse({
-      version: CACHE_VERSION,
-      hash: input.hash,
-      generatedAt: input.generatedAt,
-      compactSnapshot: input.compactSnapshot,
-    });
-    if (!stored.success) {
-      await storage.removeItem(key);
-      await persistIndex(currentIndex.entries.filter((entry) => entry.key !== key));
-      return;
+    function prepare(recordKey: string, record: StoredProviderSnapshot) {
+      const value = JSON.stringify(record);
+      return {
+        key: recordKey,
+        bytes: storedBytes(recordKey, value),
+        writtenAt: record.generatedAt,
+        value,
+      };
     }
-    const value = JSON.stringify(stored.data);
-    const incomingBytes = storedBytes(key, value);
-    const canStoreIncoming = incomingBytes <= maxBytes;
-    const retainedEntries = currentIndex.entries.filter((entry) => entry.key !== key);
-    let projectedBytes = retainedEntries.reduce((total, entry) => total + entry.bytes, 0);
-    if (canStoreIncoming) projectedBytes += incomingBytes;
-
-    const keysToRemove: string[] = [];
+    const incoming = prepare(key, input);
+    // The index is committed last: membership proves a body was stored. Reusing it
+    // needs only its byte count, not another parse, expansion, or storage write.
+    const body = requiredBody
+      ? (currentIndex.find((entry) => entry.key === requiredBody.key) ??
+        prepare(requiredBody.key, requiredBody.input))
+      : undefined;
+    let admitted: Array<ProviderSnapshotIndexEntry & { value?: string }> = body
+      ? [body, incoming]
+      : [incoming];
+    if (admitted.reduce((bytes, entry) => bytes + entry.bytes, 0) > maxBytes) {
+      admitted = body && body.bytes <= maxBytes ? [body] : [];
+    } else if (body) {
+      admitted = [
+        {
+          ...body,
+          writtenAt: body.writtenAt > input.generatedAt ? body.writtenAt : input.generatedAt,
+        },
+        incoming,
+      ];
+    }
+    const replacedKeys = new Set([key, ...(requiredBody ? [requiredBody.key] : [])]);
+    const retainedEntries = currentIndex.filter((entry) => !replacedKeys.has(entry.key));
+    let projectedBytes = [...retainedEntries, ...admitted].reduce(
+      (total, entry) => total + entry.bytes,
+      0,
+    );
+    const keysToRemove = [...replacedKeys].filter(
+      (replaced) => !admitted.some((entry) => entry.key === replaced),
+    );
     for (const candidate of [...retainedEntries].sort(oldestFirst)) {
       if (projectedBytes <= maxBytes) break;
       projectedBytes -= candidate.bytes;
       keysToRemove.push(candidate.key);
     }
     const removedKeys = new Set(keysToRemove);
-    const nextEntries = retainedEntries.filter((entry) => !removedKeys.has(entry.key));
+    if (keysToRemove.length > 0) {
+      for (const removedKey of keysToRemove) bodies.delete(removedKey);
+      await storage.multiRemove(keysToRemove);
+    }
+    // Body, then reference, then in-memory index. A failed write can leave a reusable
+    // orphan body; reconciliation never retains a reference without its body.
+    for (const entry of admitted) {
+      if (entry.value !== undefined) await storage.setItem(entry.key, entry.value);
+    }
+    index = [
+      ...retainedEntries.filter((entry) => !removedKeys.has(entry.key)),
+      ...admitted.map(({ key: recordKey, bytes, writtenAt }) => ({
+        key: recordKey,
+        bytes,
+        writtenAt,
+      })),
+    ];
+  }
 
-    if (!canStoreIncoming && currentIndex.entries.some((entry) => entry.key === key)) {
-      keysToRemove.push(key);
+  async function readRecord(key: string): Promise<StoredProviderSnapshot | null> {
+    const currentIndex = await ensureCacheIndex();
+    const value = await storage.getItem(key);
+    if (value === null) return null;
+    try {
+      const stored = parseStoredProviderSnapshot(key, value);
+      if (!stored) throw new SyntaxError("Invalid provider snapshot");
+      return stored;
+    } catch (error) {
+      if (!(error instanceof SyntaxError) && !(error instanceof RangeError)) throw error;
+      bodies.delete(key);
+      await storage.removeItem(key);
+      index = currentIndex.filter((entry) => entry.key !== key);
+      return null;
     }
-    if (keysToRemove.length > 0) await storage.multiRemove(keysToRemove);
-    if (canStoreIncoming) {
-      await storage.setItem(key, value);
-      nextEntries.push({ key, bytes: incomingBytes, writtenAt: input.generatedAt });
+  }
+
+  async function readBody(serverId: string, hash: string): Promise<CachedProviderSnapshot | null> {
+    const key = bodyKey(serverId, hash);
+    const resident = bodies.get(key);
+    if (resident) return resident;
+    const stored = await readRecord(key);
+    if (!stored?.compactSnapshot) return null;
+    try {
+      const body = {
+        ...stored,
+        compactSnapshot: stored.compactSnapshot,
+        entries: normalizeCatalogs(expandProviderSnapshot(stored.compactSnapshot)),
+      };
+      bodies.set(key, body);
+      return body;
+    } catch (error) {
+      if (!(error instanceof RangeError)) throw error;
+      await storage.removeItem(key);
+      index = null;
+      return null;
+    }
+  }
+
+  async function safely<T>(operation: () => Promise<T>, fallback: T): Promise<T> {
+    try {
+      return await runSerialized(operation);
+    } catch (error) {
+      if (!(error instanceof Error)) throw error;
+      bodies.clear();
+      return fallback;
     }
-    await persistIndex(nextEntries);
   }
 
   return {
-    async read(serverId, cwd) {
-      try {
-        return await runSerialized(async () => {
-          const currentIndex = await ensureCacheIndex();
-          const key = cacheKey(serverId, cwd);
-          const value = await storage.getItem(key);
-          if (value === null) return null;
-          try {
-            const stored = parseStoredProviderSnapshot(value);
-            if (!stored) throw new SyntaxError("Invalid provider snapshot");
-            return { ...stored, entries: expandProviderSnapshot(stored.compactSnapshot) };
-          } catch (error) {
-            if (!(error instanceof SyntaxError) && !(error instanceof RangeError)) throw error;
-            await storage.removeItem(key);
-            await persistIndex(currentIndex.entries.filter((entry) => entry.key !== key));
-            return null;
-          }
+    async materialize(serverId, snapshot) {
+      const { snapshotHash: hash, compactSnapshot } = snapshot;
+      if (!hash) return { ...snapshot, entries: normalizeCatalogs(snapshot.entries) };
+      let body = await safely(async () => {
+        const cached = await readBody(serverId, hash);
+        if (cached) return cached;
+        if (!compactSnapshot) throw new ProviderSnapshotCacheMissError();
+        await writeRecord(bodyKey(serverId, hash), {
+          version: CACHE_VERSION,
+          hash,
+          generatedAt: snapshot.generatedAt,
+          compactSnapshot,
         });
-      } catch (error) {
-        if (error instanceof Error) return null;
-        throw error;
+        return await readBody(serverId, hash);
+      }, null);
+      if (!body) {
+        if (!compactSnapshot) throw new ProviderSnapshotCacheMissError();
+        body = {
+          version: CACHE_VERSION,
+          hash,
+          generatedAt: snapshot.generatedAt,
+          compactSnapshot,
+          entries: normalizeCatalogs(expandProviderSnapshot(compactSnapshot)),
+        };
       }
+      return {
+        ...snapshot,
+        compactSnapshot: body.compactSnapshot,
+        entries: snapshot.fetchedAt
+          ? body.entries.map((entry) => ({
+              ...entry,
+              fetchedAt: snapshot.fetchedAt![entry.provider],
+            }))
+          : body.entries,
+      };
     },
-    async write(input) {
-      try {
-        await runSerialized(() => writeSnapshot(input));
-      } catch (error) {
-        if (!(error instanceof Error)) throw error;
-      }
+    readHash(serverId, hash) {
+      return safely(() => readBody(serverId, hash), null);
+    },
+    read(serverId, cwd) {
+      return safely(async () => {
+        const association = await readRecord(cacheKey(serverId, cwd));
+        if (!association) return null;
+        const body = await readBody(serverId, association.hash);
+        if (!body) {
+          // Storage may be removed or corrupted outside this owner's write queue.
+          await reconcileCache();
+          return null;
+        }
+        return {
+          ...body,
+          ...association,
+          compactSnapshot: body.compactSnapshot,
+          entries: association.fetchedAt
+            ? body.entries.map((entry) => ({
+                ...entry,
+                fetchedAt: association.fetchedAt![entry.provider],
+              }))
+            : body.entries,
+        };
+      }, null);
+    },
+    write(input) {
+      return safely(async () => {
+        if (input.signal?.aborted) return;
+        await writeRecord(
+          cacheKey(input.serverId, input.cwd),
+          {
+            version: CACHE_VERSION,
+            hash: input.hash,
+            generatedAt: input.generatedAt,
+            fetchedAt: input.fetchedAt,
+          },
+          {
+            key: bodyKey(input.serverId, input.hash),
+            input: {
+              version: CACHE_VERSION,
+              hash: input.hash,
+              generatedAt: input.generatedAt,
+              compactSnapshot: input.compactSnapshot,
+            },
+          },
+        );
+      }, undefined);
     },
   };
 }
diff --git a/packages/app/src/data/providers-snapshot.test.ts b/packages/app/src/data/providers-snapshot.test.ts
index 1e62958440..c69eff9225 100644
--- a/packages/app/src/data/providers-snapshot.test.ts
+++ b/packages/app/src/data/providers-snapshot.test.ts
@@ -1,5 +1,14 @@
+import { createRequire } from "node:module";
+import { QueryClient, CancelledError } from "@tanstack/react-query";
+import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
+import type { GetProvidersSnapshotResponseMessage } from "@getpaseo/protocol/messages";
+import { compactProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
+import { applyProvidersSnapshotUpdate } from "./push-router";
+import { createProviderSnapshotCache } from "./provider-snapshot-cache";
+import { providerSnapshotIcons, replaceProviderSnapshotIcons } from "@/data/provider-icons";
 import { describe, expect, it } from "vitest";
 import {
+  fetchProvidersSnapshot,
   isProvidersSnapshotHomeScope,
   normalizeProvidersSnapshotCwd,
   providersSnapshotQueryKey,
@@ -49,3 +58,274 @@ describe("providers snapshot query scope", () => {
     );
   });
 });
+
+// Resolve the exact CommonJS implementation installed by React Native's setUpXHR.
+// Its runtime signal deliberately lacks the newer methods in the DOM typings.
+const nativeRequire = createRequire(require.resolve("react-native/package.json"));
+const { AbortController: NativeAbortController }: { AbortController: typeof AbortController } =
+  nativeRequire("abort-controller/dist/abort-controller");
+
+function createStorage(onWrite: () => void = () => {}) {
+  const values = new Map<string, string>();
+  return {
+    async getItem(key: string) {
+      return values.get(key) ?? null;
+    },
+    async setItem(key: string, value: string) {
+      values.set(key, value);
+      onWrite();
+    },
+    async removeItem(key: string) {
+      values.delete(key);
+    },
+    async getAllKeys() {
+      return [...values.keys()];
+    },
+    async multiGet(keys: readonly string[]) {
+      return keys.map((key) => [key, values.get(key) ?? null] as const);
+    },
+    async multiRemove(keys: readonly string[]) {
+      for (const key of keys) values.delete(key);
+    },
+  };
+}
+
+const entries: ProviderSnapshotEntry[] = [
+  {
+    provider: "test-provider",
+    status: "ready",
+    enabled: true,
+    iconSvg: '<svg xmlns="http://www.w3.org/2000/svg"/>',
+    models: [
+      { provider: "test-provider", id: "test-model", label: "Test model", thinkingOptions: [] },
+    ],
+  },
+];
+const snapshot = {
+  requestId: "test-request",
+  entries: [],
+  cwd: "/repo",
+  generatedAt: "2026-09-07T00:00:00.000Z",
+  snapshotHash: "test-hash",
+  compactSnapshot: compactProviderSnapshot(entries),
+} satisfies GetProvidersSnapshotResponseMessage["payload"];
+
+describe("provider fetch with runtime abort signals", () => {
+  it.each([
+    ["React Native", NativeAbortController],
+    ["default", AbortController],
+  ])(
+    "publishes ready models and persists the real compact snapshot with %s",
+    async (_, Controller) => {
+      const controller = new Controller();
+      const cache = createProviderSnapshotCache(createStorage());
+      const queryClient = new QueryClient({
+        defaultOptions: { queries: { retry: false, gcTime: 0 } },
+      });
+      const serverId = "successful-provider-fetch";
+      const queryKey = providersSnapshotQueryKey(serverId, snapshot.cwd);
+      try {
+        const result = await queryClient.fetchQuery({
+          queryKey,
+          queryFn: () =>
+            fetchProvidersSnapshot({
+              client: { getProvidersSnapshot: async () => snapshot },
+              serverId,
+              cwd: snapshot.cwd,
+              queryClient,
+              cache,
+              signal: controller.signal,
+            }),
+        });
+        expect(result.entries).toEqual(entries);
+        expect(queryClient.getQueryData(queryKey)).toEqual(result);
+        expect((await cache.read(serverId, snapshot.cwd))?.entries).toEqual(entries);
+        expect(providerSnapshotIcons.getState().get(serverId)?.get("test-provider")).toEqual(
+          entries[0].iconSvg,
+        );
+      } finally {
+        queryClient.clear();
+        replaceProviderSnapshotIcons(serverId, []);
+      }
+    },
+  );
+});
+
+describe.each([
+  ["React Native", NativeAbortController],
+  ["default", AbortController],
+])("provider fetch cancellation with %s", (_, Controller) => {
+  it.each([
+    { boundary: "response", abortOnWrite: 0, hasBody: false, hasReference: false },
+    { boundary: "body persistence", abortOnWrite: 1, hasBody: true, hasReference: false },
+    { boundary: "directory persistence", abortOnWrite: 2, hasBody: true, hasReference: true },
+  ])(
+    "does not publish after cancellation at $boundary",
+    async ({ abortOnWrite, hasBody, hasReference }) => {
+      const controller = new Controller();
+      let writes = 0;
+      const storage = createStorage(() => {
+        writes += 1;
+        if (writes === abortOnWrite) controller.abort();
+      });
+      const cache = createProviderSnapshotCache(storage);
+      const queryClient = new QueryClient({
+        defaultOptions: { queries: { retry: false, gcTime: 0 } },
+      });
+      const serverId = "cancelled-provider-fetch";
+      const queryKey = providersSnapshotQueryKey(serverId, snapshot.cwd);
+      const previous = { ...snapshot, entries: [{ ...entries[0], iconSvg: "previous-icon" }] };
+      queryClient.setQueryData(queryKey, previous);
+      replaceProviderSnapshotIcons(serverId, previous.entries);
+      try {
+        await expect(
+          queryClient.fetchQuery({
+            queryKey,
+            queryFn: () =>
+              fetchProvidersSnapshot({
+                client: {
+                  getProvidersSnapshot: async () => {
+                    if (abortOnWrite === 0) controller.abort();
+                    return snapshot;
+                  },
+                },
+                serverId,
+                cwd: snapshot.cwd,
+                queryClient,
+                cache,
+                signal: controller.signal,
+              }),
+          }),
+        ).rejects.toBeInstanceOf(CancelledError);
+        expect(controller.signal.aborted).toBe(true);
+        expect(queryClient.getQueryData(queryKey)).toEqual(previous);
+        expect(providerSnapshotIcons.getState().get(serverId)?.get("test-provider")).toEqual(
+          "previous-icon",
+        );
+        expect((await cache.readHash(serverId, "test-hash"))?.entries ?? null).toEqual(
+          hasBody ? entries : null,
+        );
+        expect((await cache.read(serverId, snapshot.cwd))?.entries ?? null).toEqual(
+          hasReference ? entries : null,
+        );
+      } finally {
+        queryClient.clear();
+        replaceProviderSnapshotIcons(serverId, []);
+      }
+    },
+  );
+});
+
+it("keeps a replacement query when the cancelled native fetch finishes late", async () => {
+  const controller = new NativeAbortController();
+  const cache = createProviderSnapshotCache(createStorage());
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false, gcTime: 0 } } });
+  const serverId = "superseded-provider-fetch";
+  const queryKey = providersSnapshotQueryKey(serverId, snapshot.cwd);
+  let finishResponse = () => {};
+  const responseReady = new Promise<void>((resolve) => {
+    finishResponse = resolve;
+  });
+  let markStarted = () => {};
+  const started = new Promise<void>((resolve) => {
+    markStarted = resolve;
+  });
+  let oldFetch: Promise<GetProvidersSnapshotResponseMessage["payload"]> | undefined;
+  try {
+    const oldQuery = queryClient.fetchQuery({
+      queryKey,
+      queryFn: ({ signal }) => {
+        signal.addEventListener("abort", () => controller.abort(), { once: true });
+        oldFetch = fetchProvidersSnapshot({
+          client: {
+            getProvidersSnapshot: async () => {
+              markStarted();
+              await responseReady;
+              return snapshot;
+            },
+          },
+          serverId,
+          cwd: snapshot.cwd,
+          queryClient,
+          cache,
+          signal: controller.signal,
+        });
+        return oldFetch;
+      },
+    });
+    const cancelledQuery = expect(oldQuery).rejects.toBeInstanceOf(CancelledError);
+    await started;
+    await queryClient.cancelQueries({ queryKey, exact: true });
+    await cancelledQuery;
+    expect(controller.signal.aborted).toBe(true);
+    const replacementEntries = [{ ...entries[0], iconSvg: "replacement-icon", models: [] }];
+    const replacement = await queryClient.fetchQuery({
+      queryKey,
+      queryFn: ({ signal }) =>
+        fetchProvidersSnapshot({
+          client: {
+            getProvidersSnapshot: async () => ({
+              ...snapshot,
+              snapshotHash: "replacement-hash",
+              compactSnapshot: compactProviderSnapshot(replacementEntries),
+            }),
+          },
+          serverId,
+          cwd: snapshot.cwd,
+          queryClient,
+          cache,
+          signal,
+        }),
+    });
+    finishResponse();
+    await expect(oldFetch).rejects.toBeInstanceOf(CancelledError);
+    expect(queryClient.getQueryData(queryKey)).toEqual(replacement);
+    expect(replacement.entries).toEqual(replacementEntries);
+    expect((await cache.read(serverId, snapshot.cwd))?.entries).toEqual(replacementEntries);
+    expect(providerSnapshotIcons.getState().get(serverId)?.get("test-provider")).toEqual(
+      "replacement-icon",
+    );
+  } finally {
+    finishResponse();
+    queryClient.clear();
+    replaceProviderSnapshotIcons(serverId, []);
+  }
+});
+
+describe("provider snapshot publication identity", () => {
+  it("keeps the hash cache's canonical objects across a catalog change and later announcements", async () => {
+    const cache = createProviderSnapshotCache(createStorage());
+    const queryClient = new QueryClient();
+    const serverId = "canonical-provider-snapshot";
+    const client = {
+      async getProvidersSnapshot() {
+        throw new Error("Unexpected content fetch");
+      },
+    };
+    const changed = {
+      ...snapshot,
+      snapshotHash: "next-hash",
+      compactSnapshot: compactProviderSnapshot([{ ...entries[0]!, label: "Updated provider" }]),
+    };
+    try {
+      for (const body of [snapshot, changed, changed]) {
+        await applyProvidersSnapshotUpdate({
+          serverId,
+          queryClient,
+          cache,
+          client,
+          message: { type: "providers_snapshot_update", payload: body },
+        });
+        const canonical = await cache.materialize(serverId, body);
+        const published = queryClient.getQueryData<GetProvidersSnapshotResponseMessage["payload"]>(
+          providersSnapshotQueryKey(serverId, body.cwd),
+        )!;
+        expect(published.entries).toBe(canonical.entries);
+        expect(published.compactSnapshot).toBe(canonical.compactSnapshot);
+        expect(published.entries[0]!.models).toBe(canonical.entries[0]!.models);
+      }
+    } finally {
+      queryClient.clear();
+    }
+  });
+});
diff --git a/packages/app/src/data/providers-snapshot.ts b/packages/app/src/data/providers-snapshot.ts
index 5a59be037c..68b389fe15 100644
--- a/packages/app/src/data/providers-snapshot.ts
+++ b/packages/app/src/data/providers-snapshot.ts
@@ -1,3 +1,14 @@
+import { CancelledError, type QueryClient } from "@tanstack/react-query";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { GetProvidersSnapshotResponseMessage } from "@getpaseo/protocol/messages";
+import {
+  providerSnapshotCache,
+  ProviderSnapshotCacheMissError,
+  type ProviderSnapshotCache,
+} from "./provider-snapshot-cache";
+import { queryClient as singletonQueryClient } from "./query-client";
+import { replaceProviderSnapshotIcons } from "@/data/provider-icons";
+import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 
@@ -34,3 +45,108 @@ export function providersSnapshotRequestOptions(input: {
 export function isProvidersSnapshotHomeScope(cwd?: string | null): boolean {
   return normalizeProvidersSnapshotCwd(cwd) === null;
 }
+
+type Snapshot = GetProvidersSnapshotResponseMessage["payload"];
+type SnapshotClient = Pick<DaemonClient, "getProvidersSnapshot">;
+
+export async function fetchProvidersSnapshot(input: {
+  client: SnapshotClient;
+  serverId: string;
+  cwd: string | null;
+  queryClient?: QueryClient;
+  cache?: ProviderSnapshotCache;
+  signal?: AbortSignal;
+  snapshot?: Snapshot;
+}): Promise<Snapshot> {
+  const cache = input.cache ?? providerSnapshotCache;
+  const queryClient = input.queryClient ?? singletonQueryClient;
+  const cached = input.snapshot ? null : await cache.read(input.serverId, input.cwd);
+  let snapshot =
+    input.snapshot ??
+    (await input.client.getProvidersSnapshot(
+      providersSnapshotRequestOptions({ cwd: input.cwd, ifNoneMatch: cached?.hash }),
+    ));
+  if (snapshot.snapshotHash && !snapshot.compactSnapshot) {
+    const known =
+      cached?.hash === snapshot.snapshotHash
+        ? cached
+        : await cache.readHash(input.serverId, snapshot.snapshotHash);
+    if (known) snapshot = { ...snapshot, compactSnapshot: known.compactSnapshot };
+    else if (snapshot.notModified) throw new ProviderSnapshotCacheMissError();
+    else {
+      const hash = snapshot.snapshotHash;
+      const body = await queryClient.fetchQuery({
+        queryKey: ["providerSnapshotContent", input.serverId, hash],
+        gcTime: 0,
+        structuralSharing: false,
+        staleTime: 0,
+        retry: false,
+        queryFn: async () => {
+          const response = await input.client.getProvidersSnapshot(
+            providersSnapshotRequestOptions({ cwd: input.cwd }),
+          );
+          // Materialize before settling so simultaneous directory announcements share
+          // both the transfer and decoded body through the existing query deduplication.
+          return cache.materialize(input.serverId, response);
+        },
+      });
+      if (body.snapshotHash === hash) {
+        snapshot = { ...snapshot, compactSnapshot: body.compactSnapshot };
+      } else if (normalizeProvidersSnapshotCwd(body.cwd) === input.cwd) {
+        snapshot = body;
+      } else {
+        snapshot = await input.client.getProvidersSnapshot(
+          providersSnapshotRequestOptions({ cwd: input.cwd }),
+        );
+      }
+    }
+  }
+  if (input.signal?.aborted) throw new CancelledError();
+  snapshot = await cache.materialize(input.serverId, snapshot);
+  if (snapshot.compactSnapshot && snapshot.snapshotHash) {
+    await cache.write({
+      serverId: input.serverId,
+      cwd: input.cwd,
+      hash: snapshot.snapshotHash,
+      generatedAt: snapshot.generatedAt,
+      fetchedAt: snapshot.fetchedAt,
+      compactSnapshot: snapshot.compactSnapshot,
+      signal: input.signal,
+    });
+  }
+  if (input.signal?.aborted) throw new CancelledError();
+  replaceProviderSnapshotIcons(input.serverId, snapshot.entries);
+  return snapshot;
+}
+
+export async function refreshAndApplyProvidersSnapshot(input: {
+  client: SnapshotClient & Pick<DaemonClient, "refreshProvidersSnapshot">;
+  queryClient: QueryClient;
+  serverId: string;
+  cwd: string | null;
+  providers?: AgentProvider[];
+  cache?: ProviderSnapshotCache;
+}) {
+  const result = await input.client.refreshProvidersSnapshot(
+    providersSnapshotRequestOptions(input),
+  );
+  const queryKey = providersSnapshotQueryKey(input.serverId, input.cwd);
+  await input.queryClient.cancelQueries({ queryKey, exact: true });
+  await input.queryClient.fetchQuery({
+    queryKey,
+    staleTime: 0,
+    structuralSharing: false,
+    queryFn: ({ signal }) => fetchProvidersSnapshot({ ...input, signal }),
+  });
+  void input.queryClient.invalidateQueries({
+    queryKey: agentCommandsQueryRoot(input.serverId),
+    exact: false,
+  });
+  if (isProvidersSnapshotHomeScope(input.cwd)) {
+    void input.queryClient.invalidateQueries({
+      queryKey: providersSnapshotQueryRoot(input.serverId),
+      exact: false,
+    });
+  }
+  return result;
+}
diff --git a/packages/app/src/data/push-router.test.ts b/packages/app/src/data/push-router.test.ts
index f468a3f928..3bf9e99f9b 100644
--- a/packages/app/src/data/push-router.test.ts
+++ b/packages/app/src/data/push-router.test.ts
@@ -1,3 +1,4 @@
+import type { OwnedSubscription, SubscriptionObserver } from "@getpaseo/client";
 import { QueryClient, QueryObserver, skipToken } from "@tanstack/react-query";
 import { describe, expect, it } from "vitest";
 import type { MutableDaemonConfig, SessionOutboundMessage } from "@getpaseo/protocol/messages";
@@ -94,34 +95,89 @@ function createFakeClient(config: { rejectCheckoutDiffSubscribe?: boolean } = {}
     }
   }
 
-  return {
-    client: {
-      on,
-      async subscribeCheckoutDiff(cwd, compare, requestOptions) {
-        subscribeCheckoutDiffCalls.push({
-          cwd,
-          compare,
-          subscriptionId: requestOptions.subscriptionId,
-        });
-        if (config.rejectCheckoutDiffSubscribe) {
-          throw new Error("subscribe failed");
+  function observe<T extends { subscriptionId: string }>(
+    snapshot: T,
+    types: RouterMessageType[],
+    released: () => void,
+    matches: (message: RouterMessage) => boolean = () => true,
+  ): OwnedSubscription<T> {
+    const observers = new Set<SubscriptionObserver<T>>();
+    let active = true;
+    const cleanups = types.map((type) =>
+      on(type, (message) => {
+        if (!matches(message)) return;
+        for (const observer of observers) {
+          if (message.type === "subscribe_checkout_diff_response")
+            observer.snapshot({ ...snapshot, ...message.payload });
+          else observer.update(message);
         }
-        return {
-          subscriptionId: requestOptions.subscriptionId,
-          cwd,
-          files: [],
-          error: null,
-          requestId: requestOptions.requestId ?? "subscribe-checkout-diff",
+      }),
+    );
+    return {
+      subscriptionId: snapshot.subscriptionId,
+      ready: Promise.resolve(snapshot),
+      subscribe: (observer) => {
+        observers.add(observer);
+        observer.snapshot(snapshot);
+        return () => {
+          observers.delete(observer);
         };
       },
-      unsubscribeCheckoutDiff(subscriptionId) {
-        unsubscribeCheckoutDiffCalls.push(subscriptionId);
+      release: async () => {
+        if (!active) return;
+        active = false;
+        cleanups.forEach((cleanup) => cleanup());
+        observers.clear();
+        released();
       },
-      subscribeTerminals(subscription) {
-        subscribeTerminalCalls.push(subscription);
+    };
+  }
+
+  return {
+    client: {
+      async getProvidersSnapshot() {
+        throw new Error("Unexpected snapshot pull");
       },
-      unsubscribeTerminals(subscription) {
-        unsubscribeTerminalCalls.push(subscription);
+      observeEvents: () =>
+        observe(
+          { subscriptionId: "events", requestId: "events", events: [] },
+          ["status", "providers_snapshot_update"],
+          () => {},
+        ),
+      observeCheckoutDiff(cwd, compare) {
+        const subscriptionId = `server-diff-${subscribeCheckoutDiffCalls.length + 1}`;
+        subscribeCheckoutDiffCalls.push({ cwd, compare, subscriptionId });
+        const handle = observe(
+          { subscriptionId, cwd, files: [], error: null, requestId: "subscribe-checkout-diff" },
+          ["checkout_diff_update", "subscribe_checkout_diff_response"],
+          () => unsubscribeCheckoutDiffCalls.push(subscriptionId),
+          (message) =>
+            "subscriptionId" in message.payload &&
+            message.payload.subscriptionId === subscriptionId,
+        );
+        if (!config.rejectCheckoutDiffSubscribe) return handle;
+        return {
+          ...handle,
+          subscribe: (observer) => {
+            queueMicrotask(() => observer.error?.(new Error("subscribe failed")));
+            return () => {};
+          },
+        };
+      },
+      observeTerminals(input) {
+        const { signal: _signal, ...query } = input;
+        subscribeTerminalCalls.push(query);
+        return observe(
+          {
+            ...query,
+            subscriptionId: `terminal-${subscribeTerminalCalls.length}`,
+            requestId: "terminals",
+            terminals: [],
+          },
+          ["terminals_changed"],
+          () => unsubscribeTerminalCalls.push(query),
+          (message) => message.type === "terminals_changed" && message.payload.cwd === query.cwd,
+        );
       },
     },
     emit,
@@ -143,7 +199,151 @@ function providerUpdate(generatedAt: string): ProvidersSnapshotUpdateMessage {
 }
 
 describe("server data push router", () => {
-  it("routes provider snapshot and daemon config payloads until detached", () => {
+  it("keeps a visible diff subscribed when a hidden panel switches to the same comparison", () => {
+    const queryClient = new QueryClient();
+    const fake = createFakeClient();
+    const serverId = "server-1";
+    const cwd = "/repo";
+    const options = (mode: "base" | "uncommitted", enabled: boolean) => {
+      const queryKey = checkoutDiffQueryKey(
+        serverId,
+        cwd,
+        mode,
+        mode === "base" ? "main" : undefined,
+      );
+      return {
+        queryKey,
+        queryFn: skipToken as typeof skipToken,
+        gcTime: Infinity,
+        meta: checkoutDiffPushRoute({
+          enabled,
+          serverId,
+          cwd,
+          subscriptionId: `checkoutDiff:${JSON.stringify(queryKey)}`,
+          compare: { mode, ...(mode === "base" ? { baseRef: "main" } : {}) },
+        }),
+      };
+    };
+    const visible = new QueryObserver(queryClient, options("base", true));
+    const hidden = new QueryObserver(queryClient, options("base", false));
+    const unsubscribeVisible = visible.subscribe(() => {});
+    const unsubscribeHidden = hidden.subscribe(() => {});
+    const unmount = mountServerDataPushRouter({ queryClient, client: fake.client, serverId });
+    try {
+      visible.setOptions(options("uncommitted", true));
+      hidden.setOptions(options("uncommitted", false));
+      const subscription = fake.subscribeCheckoutDiffCalls.findLast(
+        (call) => call.compare.mode === "uncommitted",
+      )!;
+      const files = [
+        {
+          path: "README.md",
+          isNew: false,
+          isDeleted: false,
+          additions: 1,
+          deletions: 0,
+          hunks: [],
+        },
+      ];
+      fake.emit({
+        type: "checkout_diff_update",
+        payload: { subscriptionId: subscription.subscriptionId, cwd, files, error: null },
+      });
+      expect(queryClient.getQueryData(options("uncommitted", true).queryKey)).toMatchObject({
+        files,
+      });
+      expect(fake.unsubscribeCheckoutDiffCalls).not.toContain(subscription.subscriptionId);
+
+      unsubscribeVisible();
+      expect(fake.unsubscribeCheckoutDiffCalls).toContain(subscription.subscriptionId);
+    } finally {
+      unsubscribeVisible();
+      unsubscribeHidden();
+      unmount();
+      queryClient.clear();
+    }
+  });
+
+  it("retains equal diff files without reconstructing changed file bodies", () => {
+    const queryClient = new QueryClient();
+    const fake = createFakeClient();
+    const serverId = "diff-sharing";
+    const cwd = "/repo";
+    const queryKey = checkoutDiffQueryKey(serverId, cwd, "uncommitted", undefined, false);
+    const subscriptionId = "diff-sharing";
+    const observer = new QueryObserver(queryClient, {
+      queryKey,
+      queryFn: skipToken,
+      meta: checkoutDiffPushRoute({
+        enabled: true,
+        serverId,
+        cwd,
+        subscriptionId,
+        compare: { mode: "uncommitted" },
+      }),
+    });
+    const unsubscribe = observer.subscribe(() => {});
+    const unmount = mountServerDataPushRouter({ queryClient, client: fake.client, serverId });
+    type Payload = SubscribeCheckoutDiffResponseMessage["payload"];
+    const files: Payload["files"] = ["a.ts", "b.ts"].map((path) => ({
+      path,
+      isNew: true,
+      isDeleted: false,
+      additions: 2,
+      deletions: 0,
+      hunks: [
+        {
+          oldStart: 0,
+          oldCount: 0,
+          newStart: 1,
+          newCount: 2,
+          lines: [
+            {
+              type: "add",
+              content: "const answer = 42",
+              tokens: [
+                { text: "const", style: "keyword" },
+                { text: " answer = 42", style: null },
+              ],
+            },
+            { type: "add", content: "answer", tokens: [{ text: "answer", style: null }] },
+          ],
+        },
+      ],
+    }));
+    const publish = (incomingFiles: Payload["files"], requestId: string) => {
+      fake.emit({
+        type: "subscribe_checkout_diff_response",
+        payload: {
+          subscriptionId: fake.subscribeCheckoutDiffCalls[0]!.subscriptionId,
+          cwd,
+          files: incomingFiles,
+          requestId,
+          error: null,
+        },
+      });
+      return queryClient.getQueryData<Payload>(queryKey)!;
+    };
+    try {
+      const first = publish(files, "first");
+      const same = publish(structuredClone(files), "reopen");
+      expect(same.files).toBe(first.files);
+      expect(same.requestId).toBe("reopen");
+      const changed = structuredClone(files);
+      changed[0]!.hunks[0]!.lines[0]!.tokens![0]!.style = "variable";
+      const next = publish(changed, "edit");
+      expect(next.files[1]).toBe(first.files[1]);
+      expect(next.files[0]).toBe(changed[0]);
+      expect(next.files[0]!.hunks[0]!.lines[0]!.tokens![0]!.style).toBe("variable");
+      expect(publish([], "deleted").files).toEqual([]);
+    } finally {
+      unsubscribe();
+      unmount();
+      queryClient.clear();
+    }
+  });
+
+  it("routes provider snapshot and daemon config payloads until detached", async () => {
     const queryClient = new QueryClient();
     const fake = createFakeClient();
     const serverId = "server-1";
@@ -157,22 +357,26 @@ describe("server data push router", () => {
       payload: { status: "daemon_config_changed", config: daemonConfig },
     });
 
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId))).toEqual({
-      entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
-      generatedAt: "2026-01-01T00:00:00.000Z",
-      requestId: "providers_snapshot_update",
-    });
+    await expect
+      .poll(() => queryClient.getQueryData(providersSnapshotQueryKey(serverId)))
+      .toEqual({
+        entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
+        generatedAt: "2026-01-01T00:00:00.000Z",
+        requestId: "providers_snapshot_update",
+      });
     expect(queryClient.getQueryData(daemonConfigQueryKey(serverId))).toEqual(daemonConfig);
     expect(queryClient.getQueryState(pairingOfferKey)?.isInvalidated).toBe(true);
 
     unmount();
     fake.emit(providerUpdate("2026-01-01T00:00:01.000Z"));
 
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId))).toEqual({
-      entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
-      generatedAt: "2026-01-01T00:00:00.000Z",
-      requestId: "providers_snapshot_update",
-    });
+    await expect
+      .poll(() => queryClient.getQueryData(providersSnapshotQueryKey(serverId)))
+      .toEqual({
+        entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
+        generatedAt: "2026-01-01T00:00:00.000Z",
+        requestId: "providers_snapshot_update",
+      });
   });
 
   it("subscribes active checkout diff queries and writes matching diff events", () => {
@@ -199,18 +403,19 @@ describe("server data push router", () => {
     const unsubscribeObserver = observer.subscribe(() => undefined);
     const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
 
+    const serverSubscriptionId = fake.subscribeCheckoutDiffCalls[0]!.subscriptionId;
     expect(fake.subscribeCheckoutDiffCalls).toEqual([
       {
         cwd,
         compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId,
+        subscriptionId: serverSubscriptionId,
       },
     ]);
 
     fake.emit({
       type: "subscribe_checkout_diff_response",
       payload: {
-        subscriptionId,
+        subscriptionId: serverSubscriptionId,
         cwd,
         files: [],
         error: null,
@@ -229,7 +434,13 @@ describe("server data push router", () => {
 
     fake.emit({
       type: "checkout_diff_update",
-      payload: { subscriptionId, cwd, files: [], error: null, diffTooLarge: true },
+      payload: {
+        subscriptionId: serverSubscriptionId,
+        cwd,
+        files: [],
+        error: null,
+        diffTooLarge: true,
+      },
     });
 
     expect(queryClient.getQueryData(queryKey)).toEqual({
@@ -237,12 +448,12 @@ describe("server data push router", () => {
       files: [],
       error: null,
       diffTooLarge: true,
-      requestId: `subscription:${subscriptionId}`,
+      requestId: `subscription:${serverSubscriptionId}`,
     });
 
     unsubscribeObserver();
 
-    expect(fake.unsubscribeCheckoutDiffCalls).toEqual([subscriptionId]);
+    expect(fake.unsubscribeCheckoutDiffCalls).toEqual([serverSubscriptionId]);
 
     unmount();
   });
@@ -333,7 +544,7 @@ describe("server data push router", () => {
     unmount();
   });
 
-  it("re-sends active push subscriptions after reconnect", () => {
+  it("keeps stable handles while invalidating caches after reconnect", () => {
     const queryClient = new QueryClient();
     const fake = createFakeClient();
     const serverId = "server-1";
@@ -397,18 +608,10 @@ describe("server data push router", () => {
       {
         cwd,
         compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId: checkoutDiffSubscriptionId,
-      },
-      {
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId: checkoutDiffSubscriptionId,
+        subscriptionId: "server-diff-1",
       },
     ]);
-    expect(fake.subscribeTerminalCalls).toEqual([
-      { cwd, workspaceId },
-      { cwd, workspaceId },
-    ]);
+    expect(fake.subscribeTerminalCalls).toEqual([{ cwd, workspaceId }]);
 
     fake.emit({
       type: "terminals_changed",
diff --git a/packages/app/src/data/push-router.ts b/packages/app/src/data/push-router.ts
index 0af2e8e684..5ab3069bd0 100644
--- a/packages/app/src/data/push-router.ts
+++ b/packages/app/src/data/push-router.ts
@@ -1,3 +1,4 @@
+import type { OwnedSubscription } from "@getpaseo/client";
 import type { Query, QueryCacheNotifyEvent, QueryClient, QueryKey } from "@tanstack/react-query";
 import type {
   ListTerminalsResponse,
@@ -5,12 +6,14 @@ import type {
   SessionOutboundMessage,
 } from "@getpaseo/protocol/messages";
 import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
+import { shareCheckoutDiff } from "@/git/diff-sharing";
 import { orderCheckoutDiffFiles } from "@/git/diff-order";
 import { daemonConfigQueryKey } from "@/data/daemon-config";
 import { daemonPairingOfferQueryKey } from "@/data/daemon-pairing";
-import { providerSnapshotCache, type ProviderSnapshotCache } from "@/data/provider-snapshot-cache";
+import { type ProviderSnapshotCache } from "@/data/provider-snapshot-cache";
 import {
   normalizeProvidersSnapshotCwd,
+  fetchProvidersSnapshot,
   providersSnapshotQueryKey,
   providersSnapshotQueryRoot,
 } from "@/data/providers-snapshot";
@@ -19,19 +22,12 @@ type ProvidersSnapshotUpdateMessage = Extract<
   SessionOutboundMessage,
   { type: "providers_snapshot_update" }
 >;
-type CheckoutDiffUpdateMessage = Extract<SessionOutboundMessage, { type: "checkout_diff_update" }>;
 type SubscribeCheckoutDiffResponseMessage = Extract<
   SessionOutboundMessage,
   { type: "subscribe_checkout_diff_response" }
 >;
 type StatusMessage = Extract<SessionOutboundMessage, { type: "status" }>;
 type TerminalsChangedMessage = Extract<SessionOutboundMessage, { type: "terminals_changed" }>;
-type ServerDataEventType =
-  | "providers_snapshot_update"
-  | "checkout_diff_update"
-  | "subscribe_checkout_diff_response"
-  | "status"
-  | "terminals_changed";
 type CheckoutDiffResponsePayload = SubscribeCheckoutDiffResponseMessage["payload"];
 type CheckoutDiffCachePayload = Omit<CheckoutDiffResponsePayload, "subscriptionId">;
 type ListTerminalsPayload = ListTerminalsResponse["payload"];
@@ -51,6 +47,10 @@ interface CheckoutDiffRoute {
   compare: CheckoutDiffCompare;
 }
 
+interface CheckoutDiffRegistration extends CheckoutDiffRoute {
+  subscription: OwnedSubscription<CheckoutDiffResponsePayload>;
+}
+
 interface WorkspaceTerminalsRoute {
   domain: "workspaceTerminals";
   enabled: boolean;
@@ -59,6 +59,10 @@ interface WorkspaceTerminalsRoute {
   workspaceId?: string;
 }
 
+interface WorkspaceTerminalsRegistration extends WorkspaceTerminalsRoute {
+  subscription: OwnedSubscription<TerminalsChangedMessage["payload"]>;
+}
+
 type ServerDataRoute = CheckoutDiffRoute | WorkspaceTerminalsRoute;
 
 export interface ServerDataQueryMeta extends Record<string, unknown> {
@@ -68,18 +72,10 @@ export interface ServerDataQueryMeta extends Record<string, unknown> {
 export type ProvidersSnapshotUpdate = ProvidersSnapshotUpdateMessage;
 
 interface ServerDataPushClient {
-  on<TType extends ServerDataEventType>(
-    type: TType,
-    handler: (message: Extract<SessionOutboundMessage, { type: TType }>) => void,
-  ): () => void;
-  subscribeCheckoutDiff(
-    cwd: string,
-    compare: CheckoutDiffCompare,
-    options: { subscriptionId: string; requestId?: string },
-  ): Promise<CheckoutDiffResponsePayload>;
-  unsubscribeCheckoutDiff(subscriptionId: string): void;
-  subscribeTerminals(input: { cwd: string; workspaceId?: string }): void;
-  unsubscribeTerminals(input: { cwd: string; workspaceId?: string }): void;
+  getProvidersSnapshot: import("@getpaseo/client/internal/daemon-client").DaemonClient["getProvidersSnapshot"];
+  observeEvents: import("@getpaseo/client/internal/daemon-client").DaemonClient["observeEvents"];
+  observeCheckoutDiff: import("@getpaseo/client/internal/daemon-client").DaemonClient["observeCheckoutDiff"];
+  observeTerminals: import("@getpaseo/client/internal/daemon-client").DaemonClient["observeTerminals"];
 }
 
 interface PushRouterInput {
@@ -134,7 +130,6 @@ const RECONNECT_REPAIR_POLICIES: ReconnectRepairPolicy[] = [
     },
   },
 ];
-const reconnectSubscriptionRepairsByServerId = new Map<string, Set<() => void>>();
 
 export function checkoutDiffPushRoute(input: {
   enabled: boolean;
@@ -179,46 +174,48 @@ export function invalidateServerDataQueriesAfterReconnect(input: {
   for (const policy of RECONNECT_REPAIR_POLICIES) {
     policy.invalidate(input);
   }
-  for (const repairSubscriptions of reconnectSubscriptionRepairsByServerId.get(input.serverId) ??
-    []) {
-    repairSubscriptions();
-  }
 }
 
-export function applyProvidersSnapshotUpdate(input: {
+export async function applyProvidersSnapshotUpdate(input: {
   serverId: string;
   queryClient: QueryClient;
   message: ProvidersSnapshotUpdate;
+  client: Pick<ServerDataPushClient, "getProvidersSnapshot">;
   cache?: ProviderSnapshotCache;
-}): void {
-  if (input.message.type !== "providers_snapshot_update") {
-    return;
-  }
-  const queryKey = providersSnapshotQueryKey(input.serverId, input.message.payload.cwd);
-  input.queryClient.setQueryData(queryKey, {
-    entries: input.message.payload.entries,
-    generatedAt: input.message.payload.generatedAt,
-    requestId: "providers_snapshot_update",
+}): Promise<void> {
+  const snapshot = { ...input.message.payload, requestId: "providers_snapshot_update" };
+  const cwd = normalizeProvidersSnapshotCwd(snapshot.cwd);
+  const queryKey = providersSnapshotQueryKey(input.serverId, cwd);
+  const previous = input.queryClient.getQueryData<{ snapshotHash?: string }>(queryKey);
+  let announcement: typeof snapshot | undefined = snapshot;
+  void input.queryClient.cancelQueries({ queryKey, exact: true });
+  await input.queryClient.fetchQuery({
+    queryKey,
+    staleTime: 0,
+    structuralSharing: false,
+    retry: false,
+    queryFn: ({ signal }) => {
+      const incoming = announcement;
+      announcement = undefined;
+      return fetchProvidersSnapshot({
+        ...input,
+        cwd,
+        snapshot: incoming,
+        signal,
+      });
+    },
   });
-  const { compactSnapshot, snapshotHash } = input.message.payload;
-  if (compactSnapshot && snapshotHash) {
-    void (input.cache ?? providerSnapshotCache).write({
-      serverId: input.serverId,
-      cwd: normalizeProvidersSnapshotCwd(input.message.payload.cwd),
-      hash: snapshotHash,
-      generatedAt: input.message.payload.generatedAt,
-      compactSnapshot,
+  if (!snapshot.snapshotHash || previous?.snapshotHash !== snapshot.snapshotHash) {
+    void input.queryClient.invalidateQueries({
+      queryKey: agentCommandsQueryRoot(input.serverId),
+      exact: false,
     });
   }
-  void input.queryClient.invalidateQueries({
-    queryKey: agentCommandsQueryRoot(input.serverId),
-    exact: false,
-  });
 }
 
 export function mountServerDataPushRouter(input: PushRouterInput): () => void {
-  const activeCheckoutDiffSubscriptions = new Map<string, CheckoutDiffRoute>();
-  const activeTerminalSubscriptions = new Map<string, WorkspaceTerminalsRoute>();
+  const activeCheckoutDiffSubscriptions = new Map<string, CheckoutDiffRegistration>();
+  const activeTerminalSubscriptions = new Map<string, WorkspaceTerminalsRegistration>();
   let disposed = false;
 
   function reconcileSubscriptions(
@@ -253,24 +250,24 @@ export function mountServerDataPushRouter(input: PushRouterInput): () => void {
       client: input.client,
       desired: desiredCheckoutDiffSubscriptions,
       serverId: input.serverId,
+      queryClient: input.queryClient,
     });
     reconcileTerminalSubscriptions({
       active: activeTerminalSubscriptions,
       client: input.client,
       desired: desiredTerminalSubscriptions,
+      apply: (route, payload) =>
+        applyTerminalsChanged({
+          activeCheckoutDiffSubscriptions,
+          activeTerminalSubscriptions,
+          queryClient: input.queryClient,
+          serverId: input.serverId,
+          route,
+          message: { type: "terminals_changed", payload },
+        }),
     });
   }
 
-  function resetSubscriptionsAfterReconnect(): void {
-    const fallbackActive = {
-      checkoutDiff: new Map(activeCheckoutDiffSubscriptions),
-      workspaceTerminals: new Map(activeTerminalSubscriptions),
-    };
-    activeCheckoutDiffSubscriptions.clear();
-    activeTerminalSubscriptions.clear();
-    reconcileSubscriptions(fallbackActive);
-  }
-
   const unsubscribeQueryCache = input.queryClient.getQueryCache().subscribe((event) => {
     if (
       !shouldReconcileSubscriptionsForCacheEvent(event, input.serverId, {
@@ -282,134 +279,131 @@ export function mountServerDataPushRouter(input: PushRouterInput): () => void {
     }
     reconcileSubscriptions();
   });
-  const unsubscribeProviders = input.client.on("providers_snapshot_update", (message) => {
-    applyProvidersSnapshotUpdate({
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
-  });
-  const unsubscribeDaemonConfig = input.client.on("status", (message) => {
-    applyDaemonConfigStatus({ queryClient: input.queryClient, serverId: input.serverId, message });
-  });
-  const unsubscribeCheckoutDiffUpdate = input.client.on("checkout_diff_update", (message) => {
-    applyCheckoutDiffUpdate({
-      activeCheckoutDiffSubscriptions,
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
-  });
-  const unsubscribeCheckoutDiffResponse = input.client.on(
-    "subscribe_checkout_diff_response",
-    (message) => {
-      applyCheckoutDiffSubscribeResponse({
-        activeCheckoutDiffSubscriptions,
-        queryClient: input.queryClient,
-        serverId: input.serverId,
-        message,
-      });
+  const events = input.client.observeEvents([
+    "providers_snapshot_update",
+    "status.daemon_config_changed",
+  ]);
+  events.subscribe({
+    snapshot: () => {},
+    update: (message) => {
+      if (message.type === "providers_snapshot_update") {
+        void applyProvidersSnapshotUpdate({
+          client: input.client,
+          queryClient: input.queryClient,
+          serverId: input.serverId,
+          message,
+        }).catch(() => {
+          /* Query state owns fetch failures; reconnect/refetch repairs them. */
+        });
+      }
+      if (message.type === "status")
+        applyDaemonConfigStatus({
+          queryClient: input.queryClient,
+          serverId: input.serverId,
+          message,
+        });
     },
-  );
-  const unsubscribeTerminalsChanged = input.client.on("terminals_changed", (message) => {
-    applyTerminalsChanged({
-      activeCheckoutDiffSubscriptions,
-      activeTerminalSubscriptions,
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
   });
-  let reconnectSubscriptionRepairs = reconnectSubscriptionRepairsByServerId.get(input.serverId);
-  if (!reconnectSubscriptionRepairs) {
-    reconnectSubscriptionRepairs = new Set();
-    reconnectSubscriptionRepairsByServerId.set(input.serverId, reconnectSubscriptionRepairs);
-  }
-  reconnectSubscriptionRepairs.add(resetSubscriptionsAfterReconnect);
 
   reconcileSubscriptions();
 
   return () => {
     disposed = true;
-    reconnectSubscriptionRepairs.delete(resetSubscriptionsAfterReconnect);
-    if (reconnectSubscriptionRepairs.size === 0) {
-      reconnectSubscriptionRepairsByServerId.delete(input.serverId);
-    }
     unsubscribeQueryCache();
-    unsubscribeProviders();
-    unsubscribeDaemonConfig();
-    unsubscribeCheckoutDiffUpdate();
-    unsubscribeCheckoutDiffResponse();
-    unsubscribeTerminalsChanged();
-    for (const subscriptionId of activeCheckoutDiffSubscriptions.keys()) {
-      unsubscribeCheckoutDiff(input.client, subscriptionId);
+    void events.release().catch(console.error);
+    for (const current of activeCheckoutDiffSubscriptions.values()) {
+      void current.subscription.release().catch(console.error);
     }
     activeCheckoutDiffSubscriptions.clear();
     for (const route of activeTerminalSubscriptions.values()) {
-      input.client.unsubscribeTerminals(workspaceTerminalSubscriptionInput(route));
+      void route.subscription.release().catch(console.error);
     }
     activeTerminalSubscriptions.clear();
   };
 }
 
 function reconcileCheckoutDiffSubscriptions(input: {
-  active: Map<string, CheckoutDiffRoute>;
+  active: Map<string, CheckoutDiffRegistration>;
   client: ServerDataPushClient;
   desired: Map<string, CheckoutDiffRoute>;
   serverId: string;
+  queryClient: QueryClient;
 }): void {
-  for (const [subscriptionId, current] of input.active) {
-    const desired = input.desired.get(subscriptionId);
-    if (desired && areCheckoutDiffRoutesEqual(current, desired)) {
-      continue;
-    }
-    unsubscribeCheckoutDiff(input.client, subscriptionId);
-    input.active.delete(subscriptionId);
+  for (const [key, current] of input.active) {
+    const desired = input.desired.get(key);
+    if (desired && areCheckoutDiffRoutesEqual(current, desired)) continue;
+    input.active.delete(key);
+    void current.subscription.release().catch(console.error);
   }
-
-  for (const [subscriptionId, desired] of input.desired) {
-    if (input.active.has(subscriptionId)) {
-      continue;
-    }
-    input.active.set(subscriptionId, desired);
-    void input.client
-      .subscribeCheckoutDiff(desired.cwd, desired.compare, {
-        subscriptionId,
-        requestId: `push-router:${input.serverId}:${subscriptionId}`,
-      })
-      .catch((error) => {
-        if (areCheckoutDiffRoutesEqual(input.active.get(subscriptionId), desired)) {
-          input.active.delete(subscriptionId);
-        }
-        console.error("[server-data] subscribeCheckoutDiff failed", {
+  for (const [key, desired] of input.desired) {
+    if (input.active.has(key)) continue;
+    const subscription = input.client.observeCheckoutDiff(desired.cwd, desired.compare);
+    const registration = { ...desired, subscription };
+    input.active.set(key, registration);
+    const apply = (
+      payload: Omit<CheckoutDiffResponsePayload, "requestId"> & { requestId?: string },
+    ) => {
+      if (input.active.get(key) !== registration) return;
+      const { subscriptionId, ...snapshot } = payload;
+      setCheckoutDiffPayload({
+        activeCheckoutDiffSubscriptions: input.active,
+        queryClient: input.queryClient,
+        serverId: input.serverId,
+        subscriptionId: key,
+        payload: {
+          ...snapshot,
+          files: orderCheckoutDiffFiles(payload.files),
+          requestId: payload.requestId ?? `subscription:${subscriptionId}`,
+        },
+      });
+    };
+    subscription.subscribe({
+      snapshot: apply,
+      update: (message) => {
+        if (message.type === "checkout_diff_update") apply(message.payload);
+      },
+      error: (error) => {
+        if (input.active.get(key) === registration) input.active.delete(key);
+        console.error("[server-data] observeCheckoutDiff failed", {
           serverId: input.serverId,
           cwd: desired.cwd,
           error,
         });
-      });
+      },
+    });
   }
 }
 
 function reconcileTerminalSubscriptions(input: {
-  active: Map<string, WorkspaceTerminalsRoute>;
+  active: Map<string, WorkspaceTerminalsRegistration>;
   client: ServerDataPushClient;
   desired: Map<string, WorkspaceTerminalsRoute>;
+  apply(route: WorkspaceTerminalsRoute, payload: TerminalsChangedMessage["payload"]): void;
 }): void {
   for (const [key, current] of input.active) {
     const desired = input.desired.get(key);
-    if (desired && areWorkspaceTerminalsRoutesEqual(current, desired)) {
-      continue;
-    }
-    input.client.unsubscribeTerminals(workspaceTerminalSubscriptionInput(current));
+    if (desired && areWorkspaceTerminalsRoutesEqual(current, desired)) continue;
     input.active.delete(key);
+    void current.subscription.release().catch(console.error);
   }
-
   for (const [key, desired] of input.desired) {
-    if (input.active.has(key)) {
-      continue;
-    }
-    input.active.set(key, desired);
-    input.client.subscribeTerminals(workspaceTerminalSubscriptionInput(desired));
+    if (input.active.has(key)) continue;
+    const subscription = input.client.observeTerminals(workspaceTerminalSubscriptionInput(desired));
+    const registration = { ...desired, subscription };
+    input.active.set(key, registration);
+    const apply = (payload: TerminalsChangedMessage["payload"]) => {
+      if (input.active.get(key) === registration) input.apply(desired, payload);
+    };
+    subscription.subscribe({
+      snapshot: apply,
+      update: (message) => {
+        if (message.type === "terminals_changed") apply(message.payload);
+      },
+      error: (error) => {
+        if (input.active.get(key) === registration) input.active.delete(key);
+        console.error("[server-data] observeTerminals failed", { cwd: desired.cwd, error });
+      },
+    });
   }
 }
 
@@ -431,52 +425,6 @@ function applyDaemonConfigStatus(input: {
   });
 }
 
-function applyCheckoutDiffUpdate(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  message: CheckoutDiffUpdateMessage;
-}): void {
-  setCheckoutDiffPayload({
-    activeCheckoutDiffSubscriptions: input.activeCheckoutDiffSubscriptions,
-    queryClient: input.queryClient,
-    serverId: input.serverId,
-    subscriptionId: input.message.payload.subscriptionId,
-    payload: {
-      cwd: input.message.payload.cwd,
-      files: orderCheckoutDiffFiles(input.message.payload.files),
-      error: input.message.payload.error,
-      ...(input.message.payload.diffTooLarge !== undefined
-        ? { diffTooLarge: input.message.payload.diffTooLarge }
-        : {}),
-      requestId: `subscription:${input.message.payload.subscriptionId}`,
-    },
-  });
-}
-
-function applyCheckoutDiffSubscribeResponse(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  message: SubscribeCheckoutDiffResponseMessage;
-}): void {
-  setCheckoutDiffPayload({
-    activeCheckoutDiffSubscriptions: input.activeCheckoutDiffSubscriptions,
-    queryClient: input.queryClient,
-    serverId: input.serverId,
-    subscriptionId: input.message.payload.subscriptionId,
-    payload: {
-      cwd: input.message.payload.cwd,
-      files: orderCheckoutDiffFiles(input.message.payload.files),
-      error: input.message.payload.error,
-      ...(input.message.payload.diffTooLarge !== undefined
-        ? { diffTooLarge: input.message.payload.diffTooLarge }
-        : {}),
-      requestId: input.message.payload.requestId,
-    },
-  });
-}
-
 function setCheckoutDiffPayload(input: {
   activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
   queryClient: QueryClient;
@@ -500,6 +448,7 @@ function setCheckoutDiffPayload(input: {
     ) {
       continue;
     }
+    query.setOptions({ ...query.options, structuralSharing: shareCheckoutDiff });
     input.queryClient.setQueryData<CheckoutDiffCachePayload>(query.queryKey, input.payload);
   }
 }
@@ -510,6 +459,7 @@ function applyTerminalsChanged(input: {
   queryClient: QueryClient;
   serverId: string;
   message: TerminalsChangedMessage;
+  route: WorkspaceTerminalsRoute;
 }): void {
   for (const query of input.queryClient.getQueryCache().getAll()) {
     const route = getActiveServerDataRoute(query, input.serverId, {
@@ -519,7 +469,7 @@ function applyTerminalsChanged(input: {
     if (
       !route ||
       route.domain !== "workspaceTerminals" ||
-      route.cwd !== input.message.payload.cwd
+      !areWorkspaceTerminalsRoutesEqual(route, input.route)
     ) {
       continue;
     }
@@ -544,6 +494,14 @@ function getActiveServerDataRoute(
   if (query.getObserversCount() === 0) {
     return null;
   }
+  // Query metadata belongs to the last observer that updated its options. A
+  // retained hidden panel must not cancel demand from another visible panel.
+  const observerRoutes = query.observers
+    .map((observer) => getServerDataRoute({ meta: observer.options.meta }))
+    .filter((route): route is ServerDataRoute => route !== null);
+  if (observerRoutes.length > 0) {
+    return observerRoutes.find((route) => route.enabled && route.serverId === serverId) ?? null;
+  }
   const route = getServerDataRoute(query);
   if (route) {
     return route.enabled && route.serverId === serverId ? route : null;
@@ -640,7 +598,7 @@ function canEventChangeDesiredSubscriptions(type: QueryCacheNotifyEvent["type"])
   );
 }
 
-function getServerDataRoute(query: Query): ServerDataRoute | null {
+function getServerDataRoute(query: Pick<Query, "meta">): ServerDataRoute | null {
   const meta = query.meta;
   if (!isRecord(meta) || !isRecord(meta.serverData)) {
     return null;
@@ -763,14 +721,6 @@ function workspaceTerminalSubscriptionInput(route: WorkspaceTerminalsRoute): {
   };
 }
 
-function unsubscribeCheckoutDiff(client: ServerDataPushClient, subscriptionId: string): void {
-  try {
-    client.unsubscribeCheckoutDiff(subscriptionId);
-  } catch {
-    // Disconnect cleanup can race with explicit subscription teardown.
-  }
-}
-
 function isQueryForServer(queryKey: QueryKey, kind: string, serverId: string): boolean {
   return queryKey.length >= 2 && queryKey[0] === kind && queryKey[1] === serverId;
 }
diff --git a/packages/app/src/data/query.ts b/packages/app/src/data/query.ts
index e1e28ee3b7..2a645f8666 100644
--- a/packages/app/src/data/query.ts
+++ b/packages/app/src/data/query.ts
@@ -31,8 +31,10 @@ type FetchQueryInput<TQueryFnData, TError, TData, TQueryKey extends QueryKey> =
 > & {
   dataShape: "list" | "value";
   queryFn: QueryFnOption<TQueryFnData, TError, TData, TQueryKey>;
-  staleTimeMs: number;
-};
+} & (
+    | { staleTimeMs: number; immutableWhen?: never }
+    | { staleTimeMs?: never; immutableWhen: (data: TQueryFnData) => boolean }
+  );
 
 export function useReplicaQuery<
   TQueryFnData,
@@ -88,7 +90,7 @@ function replicaQueryOptions<
   };
 }
 
-function fetchQueryOptions<
+export function fetchQueryOptions<
   TQueryFnData,
   TError = Error,
   TData = TQueryFnData,
@@ -96,11 +98,11 @@ function fetchQueryOptions<
 >(
   input: FetchQueryInput<TQueryFnData, TError, TData, TQueryKey>,
 ): UseQueryOptions<TQueryFnData, TError, TData, TQueryKey> {
-  if (!Number.isFinite(input.staleTimeMs)) {
+  if (!input.immutableWhen && !Number.isFinite(input.staleTimeMs)) {
     throw new Error("Fetch queries must declare a finite staleTimeMs.");
   }
 
-  const { dataShape, meta, staleTimeMs, ...options } = input;
+  const { dataShape, meta, staleTimeMs, immutableWhen, ...options } = input;
   return {
     ...options,
     ...(dataShape === "list" ? { placeholderData: keepPreviousData } : {}),
@@ -111,7 +113,10 @@ function fetchQueryOptions<
         dataShape,
       },
     },
-    refetchOnMount: "always",
-    staleTime: staleTimeMs,
+    refetchOnMount: immutableWhen ? true : "always",
+    staleTime: immutableWhen
+      ? (query) =>
+          query.state.data !== undefined && immutableWhen(query.state.data) ? Infinity : 0
+      : staleTimeMs,
   };
 }
diff --git a/packages/app/src/desktop/browser/automation/handler.ts b/packages/app/src/desktop/browser/automation/handler.ts
index bc30fdadb4..08bb9927e5 100644
--- a/packages/app/src/desktop/browser/automation/handler.ts
+++ b/packages/app/src/desktop/browser/automation/handler.ts
@@ -1,3 +1,4 @@
+import { BROWSER_AUTOMATION_COMMAND_NAMES } from "@getpaseo/protocol/browser-automation/rpc-schemas";
 import type { SessionInboundMessage, SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { getDesktopHost, type DesktopHostBridge } from "@/desktop/host";
 import {
@@ -69,13 +70,33 @@ export function mountBrowserAutomationHandler(
 }
 
 export function mountBrowserAutomationDaemonClientHandler(
-  client: unknown,
+  client: import("@getpaseo/client/internal/daemon-client").DaemonClient,
   options?: { serverId?: string },
 ): () => void {
-  return mountBrowserAutomationHandler({
-    client: client as BrowserAutomationClient,
+  const observation = client.registerBrowserHost({
+    hostKind: "desktop app",
+    supportedCommands: [...BROWSER_AUTOMATION_COMMAND_NAMES],
+  });
+  const unmount = mountBrowserAutomationHandler({
+    client: {
+      on: (_type, handler) =>
+        observation.subscribe({
+          snapshot: () => {},
+          update: (message) => {
+            if (message.type === "browser.automation.execute.request") handler(message);
+          },
+        }),
+      sendBrowserAutomationExecuteResponse: (response) =>
+        client.sendBrowserAutomationExecuteResponse(response),
+    },
     ...(options?.serverId ? { serverId: options.serverId } : {}),
   });
+  return () => {
+    unmount();
+    void observation
+      .release()
+      .catch((error) => console.warn("Failed to release browser host", error));
+  };
 }
 
 async function handleBrowserAutomationRequest(params: {
diff --git a/packages/app/src/desktop/browser/settings/browser-data-section.tsx b/packages/app/src/desktop/browser/settings/browser-data-section.tsx
index 0efc3ebf8e..ad4140d683 100644
--- a/packages/app/src/desktop/browser/settings/browser-data-section.tsx
+++ b/packages/app/src/desktop/browser/settings/browser-data-section.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { useToast } from "@/contexts/toast-context";
 import { getDesktopHost } from "@/desktop/host";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { useBrowserStore } from "@/desktop/browser/store";
 import { settingsStyles } from "@/styles/settings";
 import { confirmDialog } from "@/utils/confirm-dialog";
@@ -65,7 +65,7 @@ export function BrowserDataSection() {
             </Text>
           </View>
           <Button
-            variant="destructive"
+            variant="outline"
             size="sm"
             loading={isClearing}
             disabled={isClearing}
diff --git a/packages/app/src/desktop/components/desktop-notifications-section.tsx b/packages/app/src/desktop/components/desktop-notifications-section.tsx
index a45d64744d..60b8bb3b67 100644
--- a/packages/app/src/desktop/components/desktop-notifications-section.tsx
+++ b/packages/app/src/desktop/components/desktop-notifications-section.tsx
@@ -9,7 +9,7 @@ import { Switch } from "@/components/ui/switch";
 import { DesktopPermissionRow } from "@/desktop/components/desktop-permission-row";
 import { useDesktopPermissions } from "@/desktop/permissions/use-desktop-permissions";
 import { useDesktopSettings } from "@/desktop/settings/desktop-settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 
 const ThemedRotateCw = withUnistyles(RotateCw, (theme) => ({
@@ -131,6 +131,7 @@ export function DesktopNotificationsSection() {
       </View>
       {testNotificationState.status === "success" ? (
         <Alert
+          size="sm"
           variant="success"
           title={t("settings.notifications.sentTitle")}
           description={t("settings.notifications.sentDescription")}
@@ -139,6 +140,7 @@ export function DesktopNotificationsSection() {
       ) : null}
       {testNotificationState.status === "error" ? (
         <Alert
+          size="sm"
           variant="error"
           title={t("settings.notifications.sendFailedTitle")}
           description={testNotificationState.message}
diff --git a/packages/app/src/desktop/components/desktop-permissions-section.tsx b/packages/app/src/desktop/components/desktop-permissions-section.tsx
index 41a1da3431..74cc71dc4a 100644
--- a/packages/app/src/desktop/components/desktop-permissions-section.tsx
+++ b/packages/app/src/desktop/components/desktop-permissions-section.tsx
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button";
 import { DesktopPermissionRow } from "@/desktop/components/desktop-permission-row";
 import { useDesktopPermissions } from "@/desktop/permissions/use-desktop-permissions";
 import { settingsStyles } from "@/styles/settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 
 const ThemedRotateCw = withUnistyles(RotateCw, (theme) => ({
   size: theme.iconSize.md,
diff --git a/packages/app/src/desktop/components/desktop-updates-section.tsx b/packages/app/src/desktop/components/desktop-updates-section.tsx
index b904c628e8..bb5c1536a6 100644
--- a/packages/app/src/desktop/components/desktop-updates-section.tsx
+++ b/packages/app/src/desktop/components/desktop-updates-section.tsx
@@ -5,14 +5,18 @@ import * as Clipboard from "expo-clipboard";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { settingsStyles } from "@/styles/settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { ArrowUpRight, Copy, FileText, Activity } from "lucide-react-native";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { isVersionMismatch } from "@/desktop/updates/desktop-updates";
-import { getCliDaemonStatus, shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
+import {
+  getCliDaemonStatus,
+  shouldUseDesktopDaemon,
+  confirmAndStopDesktopDaemon,
+} from "@/desktop/daemon/desktop-daemon";
 import { useBuiltInDaemonManagement } from "@/desktop/hooks/use-built-in-daemon-management";
 import { useDaemonStatus } from "@/desktop/hooks/use-daemon-status";
 import { useDesktopSettings, type DesktopSettings } from "@/desktop/settings/desktop-settings";
@@ -330,6 +334,17 @@ export function LocalDaemonSection() {
   const daemonStatus = data?.status ?? null;
   const daemonLogs = data?.logs ?? null;
   const daemonVersion = daemonStatus?.version ?? null;
+  const [isStopping, setIsStopping] = useState(false);
+  const handleStop = useCallback(() => {
+    setIsStopping(true);
+    void confirmAndStopDesktopDaemon()
+      .then((status) => {
+        if (status) setStatus(status);
+        return undefined;
+      })
+      .catch((error) => Alert.alert(t("desktop.daemon.lifecycle.stopFailed"), String(error)))
+      .finally(() => setIsStopping(false));
+  }, [setStatus, t]);
 
   const daemonVersionMismatch = isVersionMismatch(appVersion, daemonVersion);
   const daemonStatusStateText =
@@ -445,6 +460,26 @@ export function LocalDaemonSection() {
             isLoadingCliStatus={isLoadingCliStatus}
           />
 
+          {daemonStatus?.pid ? (
+            <View style={settingsStyles.card}>
+              <View style={settingsStyles.row}>
+                <View style={settingsStyles.rowContent}>
+                  <Text style={settingsStyles.rowTitle}>
+                    {daemonStatus.ownedByDesktop
+                      ? t("desktop.daemon.lifecycle.owned")
+                      : t("desktop.daemon.lifecycle.attached")}
+                  </Text>
+                  <Text style={settingsStyles.rowHint}>{daemonStatus.home}</Text>
+                </View>
+                <Button variant="outline" size="sm" onPress={handleStop} disabled={isStopping}>
+                  {isStopping
+                    ? t("desktop.daemon.lifecycle.stopping")
+                    : t("desktop.daemon.lifecycle.stop")}
+                </Button>
+              </View>
+            </View>
+          ) : null}
+
           {daemonVersionMismatch ? (
             <View style={styles.warningCard}>
               <Text style={styles.warningText}>{t("desktop.daemon.versionMismatch")}</Text>
diff --git a/packages/app/src/desktop/components/integrations-section.tsx b/packages/app/src/desktop/components/integrations-section.tsx
index 7d859beef4..609aa9add4 100644
--- a/packages/app/src/desktop/components/integrations-section.tsx
+++ b/packages/app/src/desktop/components/integrations-section.tsx
@@ -6,7 +6,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { ArrowUpRight, Check, Terminal } from "lucide-react-native";
 import { Button } from "@/components/ui/button";
 import { useCliInstall } from "@/desktop/hooks/use-install-status";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
diff --git a/packages/app/src/desktop/components/pair-device-section.tsx b/packages/app/src/desktop/components/pair-device-section.tsx
index a036870d56..9209f6fcbf 100644
--- a/packages/app/src/desktop/components/pair-device-section.tsx
+++ b/packages/app/src/desktop/components/pair-device-section.tsx
@@ -169,7 +169,7 @@ function PairDeviceBody(props: PairDeviceBodyProps) {
 function OfferLoadError({ message, onRetry }: { message: string; onRetry: () => void }) {
   const { t } = useTranslation();
   return (
-    <Alert variant="error" description={message}>
+    <Alert size="sm" variant="error" description={message}>
       <Button variant="outline" size="sm" leftIcon={RotateCw} onPress={onRetry}>
         {t("pairing.device.retry")}
       </Button>
@@ -197,9 +197,11 @@ function RelayConsent(props: PairDeviceBodyProps) {
           accessibilityLabel={t("pairing.device.relayDocsAccessibility")}
         />
       </View>
-      {props.enableError ? <Alert variant="error" description={props.enableError.message} /> : null}
+      {props.enableError ? (
+        <Alert size="sm" variant="error" description={props.enableError.message} />
+      ) : null}
       {!props.canConfigureRelay ? (
-        <Alert variant="warning" description={t("pairing.device.updateRequired")} />
+        <Alert size="sm" variant="warning" description={t("pairing.device.updateRequired")} />
       ) : null}
       <View style={styles.actions}>
         <Button variant="secondary" style={FLEX_ONE_STYLE} onPress={props.onClose}>
@@ -262,7 +264,7 @@ function PairingOffer(props: PairDeviceBodyProps & { offer: { url: string } }) {
           {props.copied ? t("pairing.device.copied") : t("pairing.device.copy")}
         </Button>
       </View>
-      <Alert variant="warning" description={t("pairing.device.securityWarning")} />
+      <Alert size="sm" variant="warning" description={t("pairing.device.securityWarning")} />
     </View>
   );
 }
diff --git a/packages/app/src/desktop/daemon/daemon-management-toggle.test.ts b/packages/app/src/desktop/daemon/daemon-management-toggle.test.ts
index c63f4e13de..831e40f25f 100644
--- a/packages/app/src/desktop/daemon/daemon-management-toggle.test.ts
+++ b/packages/app/src/desktop/daemon/daemon-management-toggle.test.ts
@@ -11,10 +11,16 @@ const runningManagedStatus: DesktopDaemonStatus = {
   home: "/tmp/paseo",
   version: "1.0.0",
   desktopManaged: true,
+  ownedByDesktop: true,
+  startedAt: "2026-01-01T00:00:00.000Z",
   error: null,
 };
 
-const stoppedStatus: DesktopDaemonStatus = { ...runningManagedStatus, status: "stopped" };
+const stoppedStatus: DesktopDaemonStatus = {
+  ...runningManagedStatus,
+  status: "stopped",
+  ownedByDesktop: false,
+};
 
 function makeDeps(overrides?: {
   confirm?: () => Promise<boolean>;
@@ -128,9 +134,9 @@ describe("executeDaemonManagementToggle", () => {
       expect(result).toEqual({ kind: "disabled", newStatus: stoppedStatus });
     });
 
-    it("skips stop when daemon is running but not desktop-managed", async () => {
+    it("skips stop for an attached daemon even with a legacy desktop-managed flag", async () => {
       const { deps, calls } = makeDeps();
-      const manuallyManagedStatus = { ...runningManagedStatus, desktopManaged: false };
+      const manuallyManagedStatus = { ...runningManagedStatus, ownedByDesktop: false };
 
       const result = await executeDaemonManagementToggle(true, manuallyManagedStatus, deps);
 
diff --git a/packages/app/src/desktop/daemon/daemon-management-toggle.ts b/packages/app/src/desktop/daemon/daemon-management-toggle.ts
index efec0ad20c..ea08cbfcdb 100644
--- a/packages/app/src/desktop/daemon/daemon-management-toggle.ts
+++ b/packages/app/src/desktop/daemon/daemon-management-toggle.ts
@@ -14,7 +14,7 @@ export type DaemonManagementToggleResult =
 
 export async function executeDaemonManagementToggle(
   currentlyManaging: boolean,
-  daemonStatus: Pick<DesktopDaemonStatus, "status" | "desktopManaged"> | null,
+  daemonStatus: Pick<DesktopDaemonStatus, "status" | "ownedByDesktop"> | null,
   deps: DaemonManagementToggleDeps,
 ): Promise<DaemonManagementToggleResult> {
   if (!currentlyManaging) {
@@ -32,7 +32,7 @@ export async function executeDaemonManagementToggle(
   // state reflects what was actually applied if the stop fails.
   await deps.persistSettings({ manageBuiltInDaemon: false });
 
-  if (daemonStatus?.status === "running" && daemonStatus.desktopManaged) {
+  if (daemonStatus?.ownedByDesktop && ["running", "starting"].includes(daemonStatus.status)) {
     const newStatus = await deps.stopDaemon();
     return { kind: "disabled", newStatus };
   }
diff --git a/packages/app/src/desktop/daemon/desktop-daemon.ts b/packages/app/src/desktop/daemon/desktop-daemon.ts
index 83fd0864cf..87cc058a0c 100644
--- a/packages/app/src/desktop/daemon/desktop-daemon.ts
+++ b/packages/app/src/desktop/daemon/desktop-daemon.ts
@@ -1,3 +1,5 @@
+import { i18n } from "@/i18n/i18next";
+import { confirmDialog } from "@/utils/confirm-dialog";
 import { getDesktopHost, isElectronRuntime } from "@/desktop/host";
 import { invokeDesktopCommand } from "@/desktop/electron/invoke";
 import type { AgentSkillSelection } from "@getpaseo/protocol/messages";
@@ -21,6 +23,8 @@ export interface DesktopDaemonStatus {
   home: string;
   version: string | null;
   desktopManaged: boolean;
+  ownedByDesktop: boolean;
+  startedAt: string | null;
   error: string | null;
 }
 
@@ -34,6 +38,25 @@ export interface DesktopAppLogs {
   contents: string;
 }
 
+export interface DesktopUpdaterDiagnosticFile {
+  path: string;
+  exists: boolean;
+  modifiedAt: string | null;
+  contents: string;
+  error: string | null;
+}
+
+export interface DesktopUpdaterDiagnostics {
+  platform: string;
+  currentVersion: string;
+  targetVersion: string | null;
+  targetVersionError: string | null;
+  shipItDirectory: string | null;
+  state: DesktopUpdaterDiagnosticFile | null;
+  stdout: DesktopUpdaterDiagnosticFile | null;
+  stderr: DesktopUpdaterDiagnosticFile | null;
+}
+
 export interface LocalTransportTarget {
   [key: string]: unknown;
   transportType: "socket" | "pipe";
@@ -109,6 +132,8 @@ function parseDesktopDaemonStatus(raw: unknown): DesktopDaemonStatus {
     home: toStringOrNull(raw.home) ?? "",
     version: toStringOrNull(raw.version),
     desktopManaged: raw.desktopManaged === true,
+    ownedByDesktop: raw.ownedByDesktop === true,
+    startedAt: typeof raw.startedAt === "string" ? raw.startedAt : null,
     error: toStringOrNull(raw.error),
   };
 }
@@ -123,6 +148,36 @@ function parseDesktopDaemonLogs(raw: unknown): DesktopDaemonLogs {
   };
 }
 
+function parseDesktopUpdaterDiagnosticFile(raw: unknown): DesktopUpdaterDiagnosticFile | null {
+  if (raw === null) return null;
+  if (!isRecord(raw)) {
+    throw new Error("Unexpected desktop updater diagnostic file response.");
+  }
+  return {
+    path: toStringOrNull(raw.path) ?? "",
+    exists: raw.exists === true,
+    modifiedAt: toStringOrNull(raw.modifiedAt),
+    contents: typeof raw.contents === "string" ? raw.contents : "",
+    error: toStringOrNull(raw.error),
+  };
+}
+
+function parseDesktopUpdaterDiagnostics(raw: unknown): DesktopUpdaterDiagnostics {
+  if (!isRecord(raw)) {
+    throw new Error("Unexpected desktop updater diagnostics response.");
+  }
+  return {
+    platform: toStringOrNull(raw.platform) ?? "unknown",
+    currentVersion: toStringOrNull(raw.currentVersion) ?? "unknown",
+    targetVersion: toStringOrNull(raw.targetVersion),
+    targetVersionError: toStringOrNull(raw.targetVersionError),
+    shipItDirectory: toStringOrNull(raw.shipItDirectory),
+    state: parseDesktopUpdaterDiagnosticFile(raw.state),
+    stdout: parseDesktopUpdaterDiagnosticFile(raw.stdout),
+    stderr: parseDesktopUpdaterDiagnosticFile(raw.stderr),
+  };
+}
+
 export function shouldUseDesktopDaemon(): boolean {
   return isElectronRuntime();
 }
@@ -141,6 +196,33 @@ export async function stopDesktopDaemon(
   return parseDesktopDaemonStatus(await invokeDesktopCommand("stop_desktop_daemon", { reason }));
 }
 
+export async function confirmAndStopDesktopDaemon(): Promise<DesktopDaemonStatus | null> {
+  const captured = await getDesktopDaemonStatus();
+  if (!captured.pid || !captured.startedAt) return captured;
+  const ownership = captured.ownedByDesktop
+    ? i18n.t("desktop.daemon.lifecycle.ownedMessage")
+    : i18n.t("desktop.daemon.lifecycle.attachedMessage");
+  const confirmed = await confirmDialog({
+    title: i18n.t("desktop.daemon.lifecycle.stopTitle"),
+    message: i18n.t("desktop.daemon.lifecycle.stopMessage", {
+      ownership,
+      home: captured.home,
+      pid: captured.pid,
+    }),
+    confirmLabel: i18n.t("desktop.daemon.lifecycle.stop"),
+    cancelLabel: i18n.t("common.actions.cancel"),
+    destructive: true,
+  });
+  if (!confirmed) return null;
+  return parseDesktopDaemonStatus(
+    await invokeDesktopCommand("stop_desktop_daemon", {
+      reason: "manual_ipc",
+      pid: captured.pid,
+      startedAt: captured.startedAt,
+    }),
+  );
+}
+
 export async function restartDesktopDaemon(): Promise<DesktopDaemonStatus> {
   return parseDesktopDaemonStatus(await invokeDesktopCommand("restart_desktop_daemon"));
 }
@@ -160,6 +242,10 @@ export async function getDesktopAppLogs(): Promise<DesktopAppLogs> {
   };
 }
 
+export async function getDesktopUpdaterDiagnostics(): Promise<DesktopUpdaterDiagnostics> {
+  return parseDesktopUpdaterDiagnostics(await invokeDesktopCommand("desktop_update_diagnostics"));
+}
+
 export async function getCliDaemonStatus(): Promise<string> {
   const raw = await invokeDesktopCommand<unknown>("cli_daemon_status");
   if (typeof raw !== "string") {
@@ -249,3 +335,20 @@ export function readLegacySkillSelection(): Promise<AgentSkillSelection | null>
 export async function deleteLegacySkillSelection(): Promise<void> {
   await invokeDesktopCommand("delete_legacy_skill_selection");
 }
+
+export interface DesktopSandboxDiagnostics {
+  enabled: boolean;
+  reason: string;
+}
+
+export async function getDesktopSandboxDiagnostics(): Promise<DesktopSandboxDiagnostics> {
+  const result: unknown = await invokeDesktopCommand("desktop_sandbox_diagnostics");
+  if (
+    !isRecord(result) ||
+    typeof result.enabled !== "boolean" ||
+    typeof result.reason !== "string"
+  ) {
+    throw new Error("Unexpected desktop sandbox diagnostics response.");
+  }
+  return { enabled: result.enabled, reason: result.reason };
+}
diff --git a/packages/app/src/desktop/daemon/local-credential.ts b/packages/app/src/desktop/daemon/local-credential.ts
new file mode 100644
index 0000000000..005abdc21f
--- /dev/null
+++ b/packages/app/src/desktop/daemon/local-credential.ts
@@ -0,0 +1,29 @@
+import type { HostConnection } from "@/types/host-connection";
+import { getDesktopHost } from "@/desktop/host";
+
+function connectionListen(connection: HostConnection): string | null {
+  switch (connection.type) {
+    case "directTcp":
+      return connection.endpoint;
+    case "directSocket":
+      return `unix://${connection.path}`;
+    case "directPipe":
+      return `pipe://${connection.path}`;
+    case "remoteSsh":
+    case "relay":
+      return null;
+  }
+}
+
+// Desktop main checks that this target matches the live desktop-managed daemon.
+// A plain browser has no bridge and falls back to its saved host password.
+export async function readDesktopManagedLocalCredential(
+  connection: HostConnection,
+  invoke: (listen: string) => Promise<unknown> = async (listen) =>
+    getDesktopHost()?.invoke?.("desktop_local_credential", { listen }),
+): Promise<string | undefined> {
+  const listen = connectionListen(connection);
+  if (!listen) return undefined;
+  const credential = await invoke(listen);
+  return typeof credential === "string" ? credential : undefined;
+}
diff --git a/packages/app/src/desktop/hooks/use-built-in-daemon-management.ts b/packages/app/src/desktop/hooks/use-built-in-daemon-management.ts
index 16076b4d6d..71bbce378c 100644
--- a/packages/app/src/desktop/hooks/use-built-in-daemon-management.ts
+++ b/packages/app/src/desktop/hooks/use-built-in-daemon-management.ts
@@ -58,8 +58,16 @@ export function useBuiltInDaemonManagement(
           confirm: () =>
             confirmDialog({
               title: t("desktop.daemon.management.pauseTitle"),
-              message: t("desktop.daemon.management.pauseMessage"),
-              confirmLabel: t("desktop.daemon.management.pauseAndStop"),
+              message: t(
+                daemonStatus?.ownedByDesktop
+                  ? "desktop.daemon.management.pauseMessage"
+                  : "desktop.daemon.lifecycle.pauseAttached",
+              ),
+              confirmLabel: t(
+                daemonStatus?.ownedByDesktop
+                  ? "desktop.daemon.management.pauseAndStop"
+                  : "desktop.daemon.lifecycle.pause",
+              ),
               cancelLabel: t("common.actions.cancel"),
               destructive: true,
             }),
diff --git a/packages/app/src/desktop/updates/update-callout-source.tsx b/packages/app/src/desktop/updates/update-callout-source.tsx
index d442651cb8..62cf7fede6 100644
--- a/packages/app/src/desktop/updates/update-callout-source.tsx
+++ b/packages/app/src/desktop/updates/update-callout-source.tsx
@@ -14,10 +14,9 @@ import {
 } from "@/desktop/updates/resolve-update-callout";
 import { useDesktopAppUpdater } from "@/desktop/updates/use-desktop-app-updater";
 import { useStableEvent } from "@/hooks/use-stable-event";
-import { openExternalUrl } from "@/utils/open-external-url";
+import { openChangelog } from "@/changelog";
 
 const CHECK_INTERVAL_MS = 30 * 60 * 1000;
-const CHANGELOG_URL = "https://paseo.sh/changelog";
 
 function renderBody(body: UpdateCalloutBody, t: ReturnType<typeof useTranslation>["t"]): ReactNode {
   if (body.kind === "installing") return t("desktop.updates.callout.installingDescription");
@@ -52,9 +51,6 @@ export function UpdateCalloutSource() {
   } = useDesktopAppUpdater();
   const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
 
-  const openChangelog = useStableEvent(() => {
-    void openExternalUrl(CHANGELOG_URL);
-  });
   const install = useStableEvent(() => {
     void installUpdate();
   });
@@ -111,7 +107,6 @@ export function UpdateCalloutSource() {
     install,
     isDesktopApp,
     isInstalling,
-    openChangelog,
     retry,
     status,
     theme.colors.foregroundMuted,
diff --git a/packages/app/src/diagnostics/app-diagnostic-report.test.ts b/packages/app/src/diagnostics/app-diagnostic-report.test.ts
index bc6cad94b6..df10b01fed 100644
--- a/packages/app/src/diagnostics/app-diagnostic-report.test.ts
+++ b/packages/app/src/diagnostics/app-diagnostic-report.test.ts
@@ -11,6 +11,7 @@ import { defaultHostAppearance } from "@/hosts/appearance";
 function makeHost(): HostProfile {
   return {
     serverId: "srv-secret",
+    password: "tcp-password",
     label: "Secret host",
     appearance: defaultHostAppearance(),
     lifecycle: {},
@@ -23,7 +24,6 @@ function makeHost(): HostProfile {
         type: "directTcp",
         endpoint: "secret.example.test:6767",
         useTls: true,
-        password: "tcp-password",
       },
       {
         id: "relay:relay.secret.test:443",
diff --git a/packages/app/src/diagnostics/app-diagnostic-report.ts b/packages/app/src/diagnostics/app-diagnostic-report.ts
index 6a5764ff99..afb38e7aad 100644
--- a/packages/app/src/diagnostics/app-diagnostic-report.ts
+++ b/packages/app/src/diagnostics/app-diagnostic-report.ts
@@ -125,11 +125,11 @@ export function redactAppDiagnosticReport(report: string, hosts: HostProfile[]):
 function collectSensitiveHostValues(hosts: HostProfile[]): string[] {
   const values = new Set<string>();
   for (const host of hosts) {
+    if (host.password) values.add(host.password);
     for (const connection of host.connections) {
       values.add(connection.id);
       if (connection.type === "directTcp") {
         values.add(connection.endpoint);
-        if (connection.password) values.add(connection.password);
       } else if (connection.type === "relay") {
         values.add(connection.relayEndpoint);
         values.add(connection.daemonPublicKeyB64);
diff --git a/packages/app/src/diagnostics/desktop-diagnostic-report.test.ts b/packages/app/src/diagnostics/desktop-diagnostic-report.test.ts
index e26e1e776f..295344458f 100644
--- a/packages/app/src/diagnostics/desktop-diagnostic-report.test.ts
+++ b/packages/app/src/diagnostics/desktop-diagnostic-report.test.ts
@@ -6,6 +6,7 @@ import {
 
 function makeSources(): DesktopDiagnosticSources {
   return {
+    getSandboxDiagnostics: async () => ({ enabled: true, reason: "user namespaces available" }),
     getStatus: async () => ({
       serverId: "server-1",
       status: "running",
@@ -15,6 +16,8 @@ function makeSources(): DesktopDiagnosticSources {
       home: "/paseo/home",
       version: "1.2.3",
       desktopManaged: true,
+      ownedByDesktop: true,
+      startedAt: "2026-01-01T00:00:00.000Z",
       error: null,
     }),
     getDaemonLogs: async () => ({
@@ -25,6 +28,34 @@ function makeSources(): DesktopDiagnosticSources {
       logPath: "/logs/Paseo/main.log",
       contents: "[login-shell-env] start\n[login-shell-env] failed",
     }),
+    getUpdaterDiagnostics: async () => ({
+      platform: "darwin",
+      currentVersion: "0.7.0",
+      targetVersion: "0.7.2",
+      targetVersionError: null,
+      shipItDirectory: "/cache/sh.paseo.desktop.ShipIt",
+      state: {
+        path: "/cache/sh.paseo.desktop.ShipIt/ShipItState.plist",
+        exists: true,
+        modifiedAt: "2026-09-04T11:22:19.000Z",
+        contents: '{"launchAfterInstallation":true}',
+        error: null,
+      },
+      stdout: {
+        path: "/cache/sh.paseo.desktop.ShipIt/ShipIt_stdout.log",
+        exists: false,
+        modifiedAt: null,
+        contents: "",
+        error: null,
+      },
+      stderr: {
+        path: "/cache/sh.paseo.desktop.ShipIt/ShipIt_stderr.log",
+        exists: true,
+        modifiedAt: "2026-09-01T08:39:20.000Z",
+        contents: "Installation completed successfully",
+        error: null,
+      },
+    }),
   };
 }
 
@@ -50,15 +81,33 @@ describe("desktop diagnostic report", () => {
         await appLogGate;
         return makeSources().getAppLogs();
       },
+      getUpdaterDiagnostics: async () => {
+        calls.push("updater");
+        return makeSources().getUpdaterDiagnostics();
+      },
     };
 
     const resultPromise = collectDesktopDiagnosticSections(sources);
 
-    expect(calls).toEqual(["status", "daemonLogs", "appLogs"]);
+    expect(calls).toEqual(["status", "daemonLogs", "appLogs", "updater"]);
     releaseAppLogs();
     await expect(resultPromise).resolves.toMatchObject({ status: "done" });
   });
 
+  test("includes target version lookup errors", async () => {
+    const sources: DesktopDiagnosticSources = {
+      ...makeSources(),
+      getUpdaterDiagnostics: async () => ({
+        ...(await makeSources().getUpdaterDiagnostics()),
+        targetVersion: null,
+        targetVersionError: "plutil failed",
+      }),
+    };
+
+    const result = await collectDesktopDiagnosticSections(sources);
+    expect(result.sections.join("\n\n")).toContain("Target version error: plutil failed");
+  });
+
   test("includes the Electron main-process log after the daemon log", async () => {
     const result = await collectDesktopDiagnosticSections(makeSources());
     const report = result.sections.join("\n\n");
@@ -73,6 +122,14 @@ describe("desktop diagnostic report", () => {
     expect(report.indexOf("Desktop app log tail")).toBeGreaterThan(
       report.indexOf("Desktop daemon log tail"),
     );
+    expect(report).toContain("Desktop updater\n  Platform: darwin");
+    expect(report).toContain("  Current version: 0.7.0");
+    expect(report).toContain("  Target version: 0.7.2");
+    expect(report).toContain("ShipItState.plist");
+    expect(report).toContain('{"launchAfterInstallation":true}');
+    expect(report).toContain("ShipIt stdout log tail");
+    expect(report).toContain("  File not found");
+    expect(report).toContain("Installation completed successfully");
   });
 
   test("keeps daemon diagnostics when the Electron app log fails", async () => {
@@ -91,3 +148,20 @@ describe("desktop diagnostic report", () => {
     expect(report).toContain("Desktop app log tail\n  Error: app log unavailable");
   });
 });
+
+test("reports sandbox degradation and its reason even if daemon diagnostics fail", async () => {
+  const result = await collectDesktopDiagnosticSections({
+    ...makeSources(),
+    getStatus: async () => {
+      throw new Error("daemon unavailable");
+    },
+    getSandboxDiagnostics: async () => ({
+      enabled: false,
+      reason: "user namespaces unavailable; no usable SUID helper",
+    }),
+  });
+  expect(result.sections.join("\n")).toContain(
+    "Chromium sandbox\n  State: Disabled\n  Reason: user namespaces unavailable; no usable SUID helper",
+  );
+  expect(result.status).toBe("failed");
+});
diff --git a/packages/app/src/diagnostics/desktop-diagnostic-report.ts b/packages/app/src/diagnostics/desktop-diagnostic-report.ts
index 8fd26c6746..22eb7e388f 100644
--- a/packages/app/src/diagnostics/desktop-diagnostic-report.ts
+++ b/packages/app/src/diagnostics/desktop-diagnostic-report.ts
@@ -1,10 +1,15 @@
 import {
+  getDesktopSandboxDiagnostics,
+  type DesktopSandboxDiagnostics,
   getDesktopAppLogs,
   getDesktopDaemonLogs,
   getDesktopDaemonStatus,
+  getDesktopUpdaterDiagnostics,
   type DesktopAppLogs,
   type DesktopDaemonLogs,
   type DesktopDaemonStatus,
+  type DesktopUpdaterDiagnosticFile,
+  type DesktopUpdaterDiagnostics,
 } from "@/desktop/daemon/desktop-daemon";
 import { formatDiagnosticSection } from "./app-diagnostic-report";
 
@@ -16,15 +21,19 @@ export interface DesktopDiagnosticCollectionResult {
 }
 
 export interface DesktopDiagnosticSources {
+  getSandboxDiagnostics: () => Promise<DesktopSandboxDiagnostics>;
   getStatus: () => Promise<DesktopDaemonStatus>;
   getDaemonLogs: () => Promise<DesktopDaemonLogs>;
   getAppLogs: () => Promise<DesktopAppLogs>;
+  getUpdaterDiagnostics: () => Promise<DesktopUpdaterDiagnostics>;
 }
 
 const DEFAULT_DESKTOP_DIAGNOSTIC_SOURCES: DesktopDiagnosticSources = {
+  getSandboxDiagnostics: getDesktopSandboxDiagnostics,
   getStatus: getDesktopDaemonStatus,
   getDaemonLogs: getDesktopDaemonLogs,
   getAppLogs: getDesktopAppLogs,
+  getUpdaterDiagnostics: getDesktopUpdaterDiagnostics,
 };
 
 export async function collectDesktopDiagnosticSections(
@@ -33,11 +42,33 @@ export async function collectDesktopDiagnosticSections(
   const sections: string[] = [];
   let failed = false;
 
-  const [daemonResult, appLogsResult] = await Promise.allSettled([
+  const [daemonResult, appLogsResult, updaterResult, sandboxResult] = await Promise.allSettled([
     Promise.all([sources.getStatus(), sources.getDaemonLogs()]),
     sources.getAppLogs(),
+    sources.getUpdaterDiagnostics(),
+    sources.getSandboxDiagnostics(),
   ]);
 
+  if (sandboxResult.status === "fulfilled") {
+    const sandbox = sandboxResult.value;
+    sections.push(
+      formatDiagnosticSection("Chromium sandbox", [
+        {
+          label: "State",
+          value: sandbox.enabled ? "Enabled" : "Disabled",
+        },
+        { label: "Reason", value: sandbox.reason },
+      ]),
+    );
+  } else {
+    failed = true;
+    sections.push(
+      formatDiagnosticSection("Chromium sandbox", [
+        { label: "Error", value: toMessage(sandboxResult.reason) },
+      ]),
+    );
+  }
+
   if (daemonResult.status === "fulfilled") {
     const [status, daemonLogs] = daemonResult.value;
     const appLogs = appLogsResult.status === "fulfilled" ? appLogsResult.value : null;
@@ -62,12 +93,63 @@ export async function collectDesktopDiagnosticSections(
     );
   }
 
+  if (updaterResult.status === "fulfilled") {
+    sections.push(...formatDesktopUpdaterSections(updaterResult.value));
+  } else {
+    failed = true;
+    sections.push(
+      formatDiagnosticSection("Desktop updater", [
+        { label: "Error", value: toMessage(updaterResult.reason) },
+      ]),
+    );
+  }
+
   return {
     status: failed ? "failed" : "done",
     sections,
   };
 }
 
+function formatDesktopUpdaterSections(diagnostics: DesktopUpdaterDiagnostics): string[] {
+  const updaterDetails = [
+    { label: "Platform", value: diagnostics.platform },
+    { label: "Current version", value: diagnostics.currentVersion },
+    { label: "Target version", value: diagnostics.targetVersion ?? "unknown" },
+    { label: "ShipIt directory", value: diagnostics.shipItDirectory ?? "not applicable" },
+  ];
+  if (diagnostics.targetVersionError) {
+    updaterDetails.push({ label: "Target version error", value: diagnostics.targetVersionError });
+  }
+  const sections = [formatDiagnosticSection("Desktop updater", updaterDetails)];
+
+  if (diagnostics.platform !== "darwin") return sections;
+
+  sections.push(
+    formatUpdaterFileSection("ShipItState.plist", diagnostics.state),
+    formatUpdaterFileSection("ShipIt stdout log tail", diagnostics.stdout),
+    formatUpdaterFileSection("ShipIt stderr log tail", diagnostics.stderr),
+  );
+  return sections;
+}
+
+function formatUpdaterFileSection(
+  title: string,
+  file: DesktopUpdaterDiagnosticFile | null,
+): string {
+  if (!file) {
+    return formatDiagnosticSection(title, [{ label: "Status", value: "unavailable" }]);
+  }
+
+  const header = formatDiagnosticSection(title, [
+    { label: "Path", value: file.path || "unknown" },
+    { label: "Modified", value: file.modifiedAt ?? "unknown" },
+  ]);
+  if (file.error) return `${header}\n  Error: ${file.error}`;
+  if (!file.exists) return `${header}\n  File not found`;
+  if (!file.contents) return `${header}\n  No contents found`;
+  return `${header}\n${indentBlock(file.contents)}`;
+}
+
 function formatDesktopDaemonSections(input: {
   status: DesktopDaemonStatus;
   daemonLogs: DesktopDaemonLogs;
diff --git a/packages/app/src/file-pane/editor/extensions.web.ts b/packages/app/src/file-pane/editor/extensions.web.ts
index 47fc0ab3c5..e9310bd554 100644
--- a/packages/app/src/file-pane/editor/extensions.web.ts
+++ b/packages/app/src/file-pane/editor/extensions.web.ts
@@ -5,7 +5,6 @@ import {
   indentOnInput,
   syntaxHighlighting,
 } from "@codemirror/language";
-import { searchKeymap } from "@codemirror/search";
 import {
   EditorView,
   drawSelection,
@@ -42,7 +41,6 @@ export function editorBaseExtensions(onSave: () => void) {
       indentWithTab,
       ...defaultKeymap,
       ...historyKeymap,
-      ...searchKeymap,
     ]),
   ];
 }
@@ -63,6 +61,13 @@ export function editorTheme(theme: EditorVisualTheme) {
           fontFamily: theme.monoFont,
           lineHeight: "1.45",
         },
+        ".cm-panels": { backgroundColor: theme.background, color: theme.foreground },
+        ".cm-panels-top": { borderBottom: "none" },
+        ".cm-searchMatch": { backgroundColor: theme.selection },
+        ".cm-searchMatch-selected": {
+          backgroundColor: theme.selection,
+          outline: `1px solid ${theme.cursor}`,
+        },
         ".cm-content": { caretColor: theme.foreground, padding: "16px 0" },
         ".cm-cursor, .cm-dropCursor": { borderLeftColor: theme.cursor },
         ".cm-gutters": {
diff --git a/packages/app/src/file-pane/editor/view.web.tsx b/packages/app/src/file-pane/editor/view.web.tsx
index 03ab27a778..d396697c41 100644
--- a/packages/app/src/file-pane/editor/view.web.tsx
+++ b/packages/app/src/file-pane/editor/view.web.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef, useSyncExternalStore } from "react";
+import { useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { FileFind, FileFindModel } from "../find/index.web";
 import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
@@ -38,6 +39,7 @@ export function FileEditorView({
   onCursorChange,
   onVimModeChange,
 }: FileEditorViewProps) {
+  const [find] = useState(() => new FileFindModel());
   const hostRef = useRef<HTMLDivElement>(null);
   const viewRef = useRef<EditorView | null>(null);
   const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
@@ -54,6 +56,7 @@ export function FileEditorView({
         doc: values.content,
         extensions: [
           vimCompartment.of(values.vimEnabled ? vim() : []),
+          find.extension,
           ...editorBaseExtensions(() => void values.model.save()),
           languageCompartment.of(getLanguageForFile(values.filename)?.extension ?? []),
           wrappingCompartment.of(wrappingForFile(values.filename)),
@@ -81,7 +84,7 @@ export function FileEditorView({
       view.destroy();
       viewRef.current = null;
     };
-  }, []);
+  }, [find]);
 
   useEffect(() => {
     const view = viewRef.current;
@@ -141,15 +144,25 @@ export function FileEditorView({
   }, [onVimModeChange, vimEnabled]);
 
   return (
-    <div
-      ref={hostRef}
-      data-pmono=""
-      data-testid="file-source-editor"
-      aria-label={`Source editor for ${filename}`}
-      style={HOST_STYLE}
-    />
+    <div style={FRAME_STYLE}>
+      <div
+        ref={hostRef}
+        data-pmono=""
+        data-testid="file-source-editor"
+        aria-label={`Source editor for ${filename}`}
+        style={HOST_STYLE}
+      />
+      <FileFind model={find} editor={viewRef} />
+    </div>
   );
 }
 
 const remoteUpdate = Annotation.define<boolean>();
+const FRAME_STYLE = {
+  display: "flex",
+  position: "relative",
+  flex: 1,
+  minHeight: 0,
+  minWidth: 0,
+} as const;
 const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden" } as const;
diff --git a/packages/app/src/file-pane/find/index.web.tsx b/packages/app/src/file-pane/find/index.web.tsx
new file mode 100644
index 0000000000..dedf58389f
--- /dev/null
+++ b/packages/app/src/file-pane/find/index.web.tsx
@@ -0,0 +1,110 @@
+import {
+  useCallback,
+  useMemo,
+  useEffect,
+  useRef,
+  useSyncExternalStore,
+  type RefObject,
+} from "react";
+import { EditorView } from "@codemirror/view";
+import { View, type View as ViewInstance } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { PaneFind, findShortcutPlatform, isFindShortcut, type PaneFindHandle } from "@/pane-find";
+import { usePaneFocus } from "@/panels/pane-context";
+import { hasActiveWebOverlay } from "@/lib/overlay-root";
+import { useRetainedPanelActive } from "@/components/retained-panel";
+import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
+import { FileFindModel } from "./model.web";
+
+export { FileFindModel } from "./model.web";
+
+export function FileFind({
+  model,
+  editor,
+}: {
+  model: FileFindModel;
+  editor: RefObject<EditorView | null>;
+}) {
+  const { t } = useTranslation();
+  const state = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
+  const widget = useRef<PaneFindHandle>(null);
+  const { isInteractive } = usePaneFocus();
+  const active = useRetainedPanelActive();
+  // RN Web hands the underlying DOM element to a View ref; the model measures it.
+  const setWidgetNode = useCallback(
+    (node: ViewInstance | null) => model.setWidgetNode(node as unknown as HTMLElement | null),
+    [model],
+  );
+  useEffect(() => {
+    if (!isInteractive || !active) return;
+    function onKeyDown(event: KeyboardEvent) {
+      if (event.defaultPrevented || hasActiveWebOverlay() || isImeComposingKeyboardEvent(event))
+        return;
+      if (isFindShortcut(event, findShortcutPlatform())) {
+        event.preventDefault();
+        model.open(editor.current);
+        widget.current?.focus();
+      }
+    }
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
+  }, [active, editor, isInteractive, model]);
+
+  const replace = useMemo(
+    () =>
+      state.readOnly
+        ? undefined
+        : {
+            value: state.replacement,
+            onChange: model.setReplacement,
+            onReplace: model.replace,
+            onReplaceAll: model.replaceAll,
+          },
+    [model, state.readOnly, state.replacement],
+  );
+  if (!state.open) return null;
+  const total = `${state.total}${state.limited ? "+" : ""}`;
+  let status = "";
+  if (state.query) {
+    if (state.total === 0) status = t("paneFind.noMatches");
+    else if (state.current) status = t("paneFind.position", { current: state.current, total });
+    else status = t("paneFind.total", { total });
+  }
+  return (
+    <View
+      style={[styles.overlay, state.placement === "top" ? styles.overlayTop : styles.overlayBottom]}
+      pointerEvents="box-none"
+    >
+      <View ref={setWidgetNode} style={styles.widget}>
+        <PaneFind
+          ref={widget}
+          query={state.query}
+          status={status}
+          canNavigate={state.total > 0}
+          onQueryChange={model.setSearch}
+          onNext={model.next}
+          onPrevious={model.previous}
+          onClose={model.close}
+          replace={replace}
+        />
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  // The widget floats over the content; the model flips the corner when it would
+  // otherwise sit on top of the active match.
+  overlay: {
+    position: "absolute",
+    left: theme.spacing[2],
+    right: theme.spacing[2],
+    alignItems: "flex-end",
+    zIndex: 1,
+  },
+  // Bounds the widget to the pane; PaneFind's own maxWidth resolves against this.
+  widget: { maxWidth: "100%" },
+  overlayTop: { top: theme.spacing[2] },
+  overlayBottom: { bottom: theme.spacing[2] },
+}));
diff --git a/packages/app/src/file-pane/find/model.web.ts b/packages/app/src/file-pane/find/model.web.ts
new file mode 100644
index 0000000000..0ce22500a9
--- /dev/null
+++ b/packages/app/src/file-pane/find/model.web.ts
@@ -0,0 +1,255 @@
+import { EditorState, type Extension } from "@codemirror/state";
+import { EditorView, keymap, type Panel, type ViewUpdate } from "@codemirror/view";
+import {
+  closeSearchPanel,
+  findNext,
+  findPrevious,
+  getSearchQuery,
+  openSearchPanel,
+  replaceAll,
+  replaceNext,
+  search,
+  searchKeymap,
+  SearchQuery,
+  setSearchQuery,
+} from "@codemirror/search";
+
+const MATCH_STATUS_LIMIT = 10_000;
+
+/** Which corner of the editor the floating Find widget occupies. */
+export type FindPlacement = "top" | "bottom";
+
+/** CodeMirror owns query, matching, selection, replacement, and panel lifetime. */
+export class FileFindModel {
+  private view: EditorView | null = null;
+  private listeners = new Set<() => void>();
+  private matches: Array<{ from: number; to: number }> = [];
+  private widget: HTMLElement | null = null;
+  private widgetResize: ResizeObserver | null = null;
+  private snapshot = {
+    open: false,
+    placement: "top" as FindPlacement,
+    query: "",
+    replacement: "",
+    current: 0,
+    total: 0,
+    limited: false,
+    readOnly: true,
+  };
+  readonly subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  readonly getSnapshot = () => this.snapshot;
+
+  readonly extension: Extension = [
+    // The widget floats over the editor as a sibling overlay, so this panel is an
+    // inert placeholder that only reports whether Find is open. Hide the placeholder
+    // itself, never the shared panel container — Go to line's dialog lives there too.
+    EditorView.theme({ ".cm-panel.paseo-file-find": { display: "none" } }),
+    // Reveal matches clear of the widget instead of underneath it.
+    EditorView.scrollMargins.of((view) => {
+      const clearance = this.clearance(view);
+      if (!clearance) return null;
+      return this.snapshot.placement === "top" ? { top: clearance } : { bottom: clearance };
+    }),
+    search({ literal: true, top: true, createPanel: (view) => this.createPanel(view) }),
+    EditorState.transactionExtender.of((transaction) => {
+      // CodeMirror seeds every search-opening command from the selection. A
+      // single-line field cannot represent CR/LF, so keep the previous query.
+      const multilineSeed = transaction.effects.some(
+        (effect) => effect.is(setSearchQuery) && /[\r\n]/.test(effect.value.search),
+      );
+      if (!multilineSeed) return null;
+      return { effects: setSearchQuery.of(getSearchQuery(transaction.startState)) };
+    }),
+    keymap.of(searchKeymap.filter((binding) => binding.key !== "Mod-f")),
+  ];
+
+  readonly open = (view = this.view) => {
+    if (view) openSearchPanel(view);
+  };
+  readonly close = () => {
+    if (this.view) {
+      closeSearchPanel(this.view);
+      this.view.focus();
+    }
+  };
+  readonly next = () => {
+    if (this.view) findNext(this.view);
+  };
+  readonly previous = () => {
+    if (this.view) findPrevious(this.view);
+  };
+  readonly replace = () => {
+    if (this.view) replaceNext(this.view);
+  };
+  readonly replaceAll = () => {
+    if (this.view) replaceAll(this.view);
+  };
+  readonly setReplacement = (replacement: string) =>
+    this.setQuery(this.snapshot.query, replacement);
+  readonly setSearch = (query: string) => {
+    this.setQuery(query, this.snapshot.replacement);
+    if (this.view && this.matches.length > 0) {
+      this.view.dispatch({ selection: { anchor: this.view.state.selection.main.from } });
+      findNext(this.view);
+    }
+  };
+
+  private setQuery(query: string, replacement: string) {
+    this.view?.dispatch({
+      effects: setSearchQuery.of(
+        new SearchQuery({ search: query, replace: replacement, literal: true }),
+      ),
+    });
+  }
+
+  /**
+   * The widget renders outside CodeMirror, so the editor cannot see it. Handing the
+   * node here lets this model — which already owns reveal — measure the obstruction.
+   */
+  readonly setWidgetNode = (node: HTMLElement | null) => {
+    if (this.widget === node) return;
+    this.widgetResize?.disconnect();
+    this.widgetResize = null;
+    this.widget = node;
+    if (!node) return;
+    this.widgetResize = new ResizeObserver(() => this.reposition());
+    this.widgetResize.observe(node);
+    this.reposition();
+  };
+
+  private createPanel(view: EditorView): Panel {
+    this.view = view;
+    const dom = document.createElement("div");
+    dom.className = "paseo-file-find";
+    return {
+      dom,
+      top: true,
+      mount: () => {
+        this.snapshot = { ...this.snapshot, open: true, placement: "top" };
+        this.update(view, true);
+      },
+      update: (update: ViewUpdate) => {
+        const queryChanged = !getSearchQuery(update.startState).eq(getSearchQuery(update.state));
+        if (
+          update.docChanged ||
+          update.selectionSet ||
+          queryChanged ||
+          update.geometryChanged ||
+          update.viewportChanged
+        )
+          this.update(view, update.docChanged || queryChanged);
+      },
+      destroy: () => {
+        this.snapshot = { ...this.snapshot, open: false, placement: "top" };
+        this.publish();
+      },
+    };
+  }
+
+  /** Vertical space the widget takes out of the editor, including its inset. */
+  private clearance(view: EditorView): number {
+    const widget = this.widget;
+    if (!widget || !this.snapshot.open) return 0;
+    const box = widget.getBoundingClientRect();
+    if (!box.height) return 0;
+    const editor = view.scrollDOM.getBoundingClientRect();
+    const clearance =
+      this.snapshot.placement === "top" ? box.bottom - editor.top : editor.bottom - box.top;
+    return Math.max(0, clearance);
+  }
+
+  /**
+   * Move the widget to the opposite corner when it sits on top of the active match
+   * and the editor has no scroll range left to reveal it. Placement only changes
+   * when the current corner collides, so navigating matches never makes it bounce.
+   *
+   * Measurement runs through `requestMeasure` because CodeMirror refuses layout
+   * reads while an update is in progress, and every caller here sits inside one.
+   */
+  private reposition() {
+    const view = this.view;
+    if (!view || !this.widget || !this.snapshot.open) return;
+    view.requestMeasure<FindPlacement>({
+      key: this,
+      read: () => this.measurePlacement(view),
+      write: (placement) => {
+        if (placement === this.snapshot.placement) return;
+        this.snapshot = { ...this.snapshot, placement };
+        this.publish();
+      },
+    });
+  }
+
+  private measurePlacement(view: EditorView): FindPlacement {
+    const current = this.snapshot.placement;
+    const widget = this.widget;
+    if (!widget) return current;
+    const selection = view.state.selection.main;
+    if (selection.empty) return current;
+    const from = view.coordsAtPos(selection.from);
+    const to = view.coordsAtPos(selection.to);
+    if (!from || !to) return current;
+    const clearance = this.clearance(view);
+    if (!clearance) return current;
+    const box = widget.getBoundingClientRect();
+    const editor = view.scrollDOM.getBoundingClientRect();
+    const match = {
+      top: Math.min(from.top, to.top),
+      bottom: Math.max(from.bottom, to.bottom),
+      right: Math.max(from.right, to.right),
+    };
+    const hits = (placement: FindPlacement) => {
+      if (match.right <= box.left) return false;
+      return placement === "top"
+        ? match.top < editor.top + clearance && match.bottom > editor.top
+        : match.bottom > editor.bottom - clearance && match.top < editor.bottom;
+    };
+    if (!hits(current)) return current;
+    const other: FindPlacement = current === "top" ? "bottom" : "top";
+    return hits(other) ? current : other;
+  }
+
+  private update(view: EditorView, recount: boolean) {
+    const query = getSearchQuery(view.state);
+    let limited = this.snapshot.limited;
+    if (recount) {
+      this.matches = [];
+      limited = false;
+      if (query.valid) {
+        const cursor = query.getCursor(view.state);
+        for (let match = cursor.next(); !match.done; match = cursor.next()) {
+          if (this.matches.length === MATCH_STATUS_LIMIT) {
+            limited = true;
+            break;
+          }
+          this.matches.push(match.value);
+        }
+      }
+    }
+    const selection = view.state.selection.main;
+    const current =
+      this.matches.findIndex(
+        (match) => match.from === selection.from && match.to === selection.to,
+      ) + 1;
+    this.snapshot = {
+      ...this.snapshot,
+      query: query.search,
+      replacement: query.replace,
+      current,
+      total: this.matches.length,
+      limited,
+      readOnly: view.state.readOnly,
+    };
+    this.publish();
+    this.reposition();
+  }
+
+  private publish() {
+    for (const listener of this.listeners) listener();
+  }
+}
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.test.ts b/packages/app/src/file-pane/markdown-preview/image-source.test.ts
new file mode 100644
index 0000000000..8277e57492
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/image-source.test.ts
@@ -0,0 +1,165 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveMarkdownFileDirectory, resolveMarkdownPreviewImageSource } from "./image-source";
+
+describe("resolveMarkdownFileDirectory", () => {
+  it("uses the parent of an absolute markdown path", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "/Users/test/project/docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs");
+  });
+
+  it("joins a workspace-relative markdown path to the workspace root", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "docs/星谷云/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs/星谷云");
+  });
+
+  it("preserves the host home directory for home-relative markdown paths", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "~/.paseo/plans/note.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/plans");
+  });
+});
+
+describe("resolveMarkdownPreviewImageSource", () => {
+  it("passes through remote and data URIs", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "https://example.com/image.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("https://example.com/image.png");
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "data:image/png;base64,abc",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("data:image/png;base64,abc");
+  });
+
+  it("resolves a sibling image against the markdown file", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./images/hero.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs/images/hero.png");
+  });
+
+  it("ignores local URL query strings and fragments", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./images/hero.png?v=2#preview",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/workspace/docs/images/hero.png");
+  });
+
+  it("preserves encoded filename characters when stripping URL suffixes", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./hero%23draft%3Fv.png?v=2#preview",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/workspace/docs/hero#draft?v.png");
+  });
+
+  it("preserves remote URL query strings and fragments", () => {
+    const source = "https://example.com/hero.png?v=2#preview";
+    expect(resolveMarkdownPreviewImageSource({ source, markdownPath: "docs/guide.md" })).toBe(
+      source,
+    );
+  });
+
+  it("resolves parent-relative images that stay inside the workspace", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "../../data/cache/xinggu_docs/12-linkedin/token.png",
+        markdownPath: "docs/星谷云/12-LinkedIn.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/data/cache/xinggu_docs/12-linkedin/token.png");
+  });
+
+  it("keeps absolute and home-relative image paths", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "/tmp/screenshot.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/tmp/screenshot.png");
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "~/.paseo/screenshots/output.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/screenshots/output.png");
+  });
+
+  it("normalizes file URIs into host paths", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "file:///tmp/paseo-preview.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/tmp/paseo-preview.png");
+  });
+
+  it("resolves images beside a home-relative document without using the workspace root", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "screenshots/output.png",
+        markdownPath: "~/.paseo/plans/note.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/plans/screenshots/output.png");
+  });
+
+  it("decodes a file URI exactly once", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "file:///tmp/hero%2520image.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/tmp/hero%20image.png");
+  });
+
+  it("resolves parent segments from a home-relative document", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "../images/hero.png",
+        markdownPath: "~/docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("~/images/hero.png");
+  });
+
+  it("resolves Windows relative images against a drive-rooted markdown file", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "..\\images\\hero.png",
+        markdownPath: "C:\\Users\\test\\repo\\docs\\guide.md",
+        workspaceRoot: "C:\\Users\\test\\repo",
+      }),
+    ).toBe("C:/Users/test/repo/images/hero.png");
+  });
+});
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.ts b/packages/app/src/file-pane/markdown-preview/image-source.ts
new file mode 100644
index 0000000000..5316d94279
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/image-source.ts
@@ -0,0 +1,150 @@
+import { localFileSourceToPath } from "@/attachments/utils";
+import { isAbsolutePath } from "@/utils/path";
+
+function trimTrailingSeparators(value: string): string {
+  if (value === "/" || /^[A-Za-z]:[\\/]?$/.test(value)) {
+    return value.replace(/\\/g, "/");
+  }
+  return value.replace(/[\\/]+$/, "");
+}
+
+function normalizePathSegments(value: string): string {
+  const segments: string[] = [];
+  for (const segment of value.split("/")) {
+    if (!segment || segment === ".") {
+      continue;
+    }
+    if (segment === "..") {
+      if (segments.length > 0) {
+        segments.pop();
+      }
+      continue;
+    }
+    segments.push(segment);
+  }
+  return segments.join("/");
+}
+
+function normalizeAbsolutePath(value: string): string | null {
+  const normalizedInput = trimTrailingSeparators(value.replace(/\\/g, "/"));
+  if (isHomeRelativePath(normalizedInput)) {
+    return `~/${normalizePathSegments(normalizedInput.slice(2))}`;
+  }
+  if (!isAbsolutePath(normalizedInput)) {
+    return null;
+  }
+
+  const drivePath = /^([A-Za-z]:)\/(.*)$/.exec(normalizedInput);
+  if (drivePath) {
+    return trimTrailingSeparators(`${drivePath[1]}/${normalizePathSegments(drivePath[2])}`);
+  }
+
+  const prefix = normalizedInput.startsWith("//") ? "//" : "/";
+  return trimTrailingSeparators(
+    `${prefix}${normalizePathSegments(normalizedInput.replace(/^\/+/, ""))}`,
+  );
+}
+
+function parentDirectory(path: string): string | null {
+  const normalized = trimTrailingSeparators(path.replace(/\\/g, "/"));
+  if (!normalized) {
+    return null;
+  }
+  if (normalized === "/" || /^[A-Za-z]:\/?$/.test(normalized)) {
+    return normalized.endsWith("/") ? normalized : `${normalized}/`;
+  }
+
+  const index = normalized.lastIndexOf("/");
+  if (index < 0) {
+    return null;
+  }
+  if (index === 0) {
+    return "/";
+  }
+  const parent = normalized.slice(0, index);
+  if (/^[A-Za-z]:$/.test(parent)) {
+    return `${parent}/`;
+  }
+  return parent;
+}
+
+function joinAbsolute(baseDirectory: string, relativePath: string): string | null {
+  const directory = trimTrailingSeparators(baseDirectory.replace(/\\/g, "/"));
+  const relative = relativePath.replace(/\\/g, "/").replace(/^\/+/, "");
+  if (!directory) {
+    return null;
+  }
+  return normalizeAbsolutePath(`${directory}/${relative}`);
+}
+
+function isHomeRelativePath(value: string): boolean {
+  return value === "~" || value.startsWith("~/") || value.startsWith("~\\");
+}
+
+function decodeRelativeSource(source: string): string {
+  try {
+    return decodeURIComponent(source);
+  } catch {
+    return source;
+  }
+}
+
+export function resolveMarkdownFileDirectory(input: {
+  markdownPath: string;
+  workspaceRoot?: string;
+}): string | null {
+  const markdownPath = input.markdownPath.trim().replace(/\\/g, "/");
+  if (!markdownPath) {
+    return null;
+  }
+
+  if (isAbsolutePath(markdownPath) || isHomeRelativePath(markdownPath)) {
+    const absolute = normalizeAbsolutePath(markdownPath);
+    return absolute ? parentDirectory(absolute) : null;
+  }
+
+  const workspaceRoot = input.workspaceRoot?.trim();
+  if (!workspaceRoot || !isAbsolutePath(workspaceRoot)) {
+    return null;
+  }
+
+  const absoluteMarkdown = joinAbsolute(workspaceRoot, markdownPath);
+  return absoluteMarkdown ? parentDirectory(absoluteMarkdown) : null;
+}
+
+export function resolveMarkdownPreviewImageSource(input: {
+  source: string;
+  markdownPath: string;
+  workspaceRoot?: string;
+}): string | null {
+  const source = input.source.trim();
+  if (!source) {
+    return null;
+  }
+
+  if (/^(https?:|data:|blob:)/i.test(source)) {
+    return source;
+  }
+
+  const pathSource = source.replace(/[?#].*$/, "");
+  const path = localFileSourceToPath(
+    pathSource.startsWith("file://") ? pathSource : decodeRelativeSource(pathSource),
+  );
+  if (!path) {
+    return null;
+  }
+
+  if (isHomeRelativePath(path) || isAbsolutePath(path)) {
+    return path;
+  }
+
+  const directory = resolveMarkdownFileDirectory({
+    markdownPath: input.markdownPath,
+    workspaceRoot: input.workspaceRoot,
+  });
+  if (!directory) {
+    return path;
+  }
+
+  return joinAbsolute(directory, path);
+}
diff --git a/packages/app/src/file-pane/markdown-preview/index.tsx b/packages/app/src/file-pane/markdown-preview/index.tsx
index f1247f1c91..a79705323f 100644
--- a/packages/app/src/file-pane/markdown-preview/index.tsx
+++ b/packages/app/src/file-pane/markdown-preview/index.tsx
@@ -1,16 +1,63 @@
 import { useMemo } from "react";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { ASTNode, RenderRules } from "react-native-markdown-display";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { MarkdownRenderer } from "@/components/markdown/renderer";
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
+import {
+  createSharedMarkdownRules,
+  MarkdownRenderer,
+  type MarkdownStyles,
+} from "@/components/markdown/renderer";
 import { parseMarkdownPreviewDocument } from "./document";
+import { resolveMarkdownPreviewImageSource } from "./image-source";
+import { FileMarkdownPreviewImage } from "./preview-image";
 
-export function FileMarkdownPreview({ source }: { source: string }) {
+export function FileMarkdownPreview({
+  source,
+  filePath,
+  workspaceRoot,
+  client,
+  serverId,
+}: {
+  source: string;
+  filePath: string;
+  workspaceRoot?: string;
+  client?: DaemonClient | null;
+  serverId?: string;
+}) {
   const document = useMemo(() => parseMarkdownPreviewDocument(source), [source]);
+  const rules = useMemo<RenderRules>(
+    () => ({
+      ...createSharedMarkdownRules(),
+      image: (node: ASTNode, _children, _parent: ASTNode[], _styles: MarkdownStyles) => {
+        const resolved = resolveMarkdownPreviewImageSource({
+          source: String(node.attributes?.src ?? ""),
+          markdownPath: filePath,
+          workspaceRoot,
+        });
+        if (!resolved) {
+          return null;
+        }
+
+        return (
+          <FileMarkdownPreviewImage
+            key={node.key}
+            source={resolved}
+            occurrenceKey={`${filePath}:${node.key}`}
+            alt={typeof node.attributes?.alt === "string" ? node.attributes.alt : undefined}
+            client={client}
+            workspaceRoot={workspaceRoot}
+            serverId={serverId}
+          />
+        );
+      },
+    }),
+    [client, filePath, serverId, workspaceRoot],
+  );
 
   return (
     <View style={styles.outerGutter}>
-      <View style={styles.readingFrame}>
+      <View style={styles.readingFrame} testID="markdown-preview-frame">
         {document.frontMatter.length > 0 ? (
           <View style={styles.frontMatterTable} testID="markdown-front-matter">
             {document.frontMatter.map((row, index) => (
@@ -32,7 +79,7 @@ export function FileMarkdownPreview({ source }: { source: string }) {
             ))}
           </View>
         ) : null}
-        <MarkdownRenderer text={document.body} />
+        <MarkdownRenderer text={document.body} rules={rules} />
       </View>
     </View>
   );
@@ -49,7 +96,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   readingFrame: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
     alignSelf: "center",
     paddingHorizontal: theme.spacing[2],
   },
diff --git a/packages/app/src/file-pane/markdown-preview/preview-image.tsx b/packages/app/src/file-pane/markdown-preview/preview-image.tsx
new file mode 100644
index 0000000000..ef27c14978
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/preview-image.tsx
@@ -0,0 +1,151 @@
+import { useCallback, useMemo, useState } from "react";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { useTranslation } from "react-i18next";
+import { Image, Pressable, Text, View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useAssistantImage } from "@/assistant-image/use-assistant-image";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import type { Theme } from "@/styles/theme";
+
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const foregroundMutedColorMapping = (theme: Theme) => ({
+  color: theme.colors.foregroundMuted,
+});
+
+const PREVIEW_IMAGE_MIN_HEIGHT = 160;
+
+export function FileMarkdownPreviewImage({
+  source,
+  occurrenceKey,
+  alt,
+  client,
+  workspaceRoot,
+  serverId,
+}: {
+  source: string;
+  occurrenceKey: string;
+  alt?: string;
+  client?: DaemonClient | null;
+  workspaceRoot?: string;
+  serverId?: string;
+}) {
+  const { t } = useTranslation();
+  const [viewerOpen, setViewerOpen] = useState(false);
+  const openViewer = useCallback(() => setViewerOpen(true), []);
+  const closeViewer = useCallback(() => setViewerOpen(false), []);
+  const image = useAssistantImage({
+    source,
+    occurrenceKey,
+    client,
+    workspaceRoot,
+    serverId,
+  });
+  const binding = image.status === "failed" ? null : image.binding;
+  const aspectRatio = image.status === "failed" ? null : image.aspectRatio;
+  const imageUri = binding?.uri ?? "";
+  const imageSource = useMemo(() => ({ uri: imageUri }), [imageUri]);
+  const imageSizeStyle = useMemo<ViewStyle>(() => {
+    if (aspectRatio) {
+      return { aspectRatio };
+    }
+    return { height: PREVIEW_IMAGE_MIN_HEIGHT };
+  }, [aspectRatio]);
+  const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [styles.surface, imageSizeStyle],
+    [imageSizeStyle],
+  );
+  const lightboxSource = useMemo<ImageLightboxSource | null>(() => {
+    if (!viewerOpen || !imageUri) return null;
+    return {
+      type: "uri",
+      uri: imageUri,
+      contentSize: aspectRatio ? { width: aspectRatio, height: 1 } : undefined,
+    };
+  }, [aspectRatio, imageUri, viewerOpen]);
+
+  if (image.status === "failed") {
+    return (
+      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-failed">
+        <Text style={styles.errorText}>{image.message}</Text>
+      </View>
+    );
+  }
+
+  if (!binding) {
+    return (
+      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-loading">
+        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+      </View>
+    );
+  }
+
+  return (
+    <View style={styles.frame} testID="markdown-preview-image">
+      <Pressable
+        accessibilityLabel={t("composer.attachments.openImage")}
+        accessibilityRole="button"
+        disabled={image.status !== "loaded"}
+        onPress={openViewer}
+        style={surfaceStyle}
+      >
+        <View style={styles.image} accessibilityRole="image" accessibilityLabel={alt}>
+          <Image
+            ref={binding.onRef}
+            source={imageSource}
+            style={styles.image}
+            resizeMode="contain"
+            onLoad={binding.onLoad}
+            onError={binding.onError}
+          />
+          {image.status === "loading" ? (
+            <View pointerEvents="none" style={styles.loadingOverlay}>
+              <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+            </View>
+          ) : null}
+        </View>
+      </Pressable>
+      <AttachmentLightbox source={lightboxSource} onClose={closeViewer} />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  frame: {
+    width: "100%",
+    marginBottom: theme.spacing[4],
+  },
+  surface: {
+    width: "100%",
+    overflow: "hidden",
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface2,
+  },
+  image: {
+    width: "100%",
+    height: "100%",
+  },
+  state: {
+    minHeight: PREVIEW_IMAGE_MIN_HEIGHT,
+    alignItems: "center",
+    justifyContent: "center",
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[6],
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.md,
+  },
+  loadingOverlay: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  errorText: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+    textAlign: "center",
+  },
+}));
diff --git a/packages/app/src/file-pane/pane.tsx b/packages/app/src/file-pane/pane.tsx
index a5630ed82f..ea3c5b1edb 100644
--- a/packages/app/src/file-pane/pane.tsx
+++ b/packages/app/src/file-pane/pane.tsx
@@ -54,6 +54,9 @@ interface FilePreviewBodyProps {
   location: WorkspaceFileLocation;
   navigationRevision: number;
   imagePreviewUri: string | null;
+  workspaceRoot: string;
+  client: DaemonClient | null;
+  serverId: string;
 }
 
 type TextExplorerFile = ExplorerFile & { kind: "text" };
@@ -135,6 +138,9 @@ function FilePreviewBody({
   location,
   navigationRevision,
   imagePreviewUri,
+  workspaceRoot,
+  client,
+  serverId,
 }: FilePreviewBodyProps) {
   const { t } = useTranslation();
   const filePath = location.path;
@@ -182,7 +188,13 @@ function FilePreviewBody({
             style={styles.previewContent}
             showsVerticalScrollIndicator
           >
-            <FileMarkdownPreview source={preview.content ?? ""} />
+            <FileMarkdownPreview
+              source={preview.content ?? ""}
+              filePath={filePath}
+              workspaceRoot={workspaceRoot}
+              client={client}
+              serverId={serverId}
+            />
           </RNScrollView>
         </View>
       );
@@ -297,6 +309,7 @@ export function FilePane({
   return (
     <FilePanePresentation
       serverId={serverId}
+      workspaceRoot={normalizedWorkspaceRoot}
       client={client}
       readTarget={readTarget}
       preview={preview}
@@ -338,6 +351,7 @@ function isEditableTextFile(input: {
 
 function FilePanePresentation({
   serverId,
+  workspaceRoot,
   client,
   readTarget,
   preview,
@@ -359,6 +373,7 @@ function FilePanePresentation({
   imagePreviewUri,
 }: {
   serverId: string;
+  workspaceRoot: string;
   client: DaemonClient | null;
   readTarget: { cwd: string; path: string } | null;
   preview: ExplorerFile | null;
@@ -393,6 +408,8 @@ function FilePanePresentation({
     return (
       <EditableFilePane
         key={`${serverId}:${readTarget.cwd}:${readTarget.path}`}
+        serverId={serverId}
+        workspaceRoot={workspaceRoot}
         client={client}
         cwd={readTarget.cwd}
         path={readTarget.path}
@@ -449,12 +466,17 @@ function FilePanePresentation({
         location={location}
         navigationRevision={navigationRevision}
         imagePreviewUri={imagePreviewUri}
+        workspaceRoot={workspaceRoot}
+        client={client}
+        serverId={serverId}
       />
     </View>
   );
 }
 
 function EditableFilePane({
+  serverId,
+  workspaceRoot,
   client,
   cwd,
   path,
@@ -470,6 +492,8 @@ function EditableFilePane({
   location,
   navigationRevision,
 }: {
+  serverId: string;
+  workspaceRoot: string;
   client: DaemonClient;
   cwd: string;
   path: string;
@@ -622,6 +646,9 @@ function EditableFilePane({
           location={location}
           navigationRevision={navigationRevision}
           imagePreviewUri={null}
+          workspaceRoot={workspaceRoot}
+          client={client}
+          serverId={serverId}
         />
       )}
     </View>
diff --git a/packages/app/src/file-pane/source/view.web.tsx b/packages/app/src/file-pane/source/view.web.tsx
index 3a38b5d073..3499ac7d8e 100644
--- a/packages/app/src/file-pane/source/view.web.tsx
+++ b/packages/app/src/file-pane/source/view.web.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
+import { FileFind, FileFindModel } from "../find/index.web";
 import { Compartment, EditorState } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
@@ -59,6 +60,7 @@ function ReadonlyCodeMirror({
 }: Omit<FileSourceViewProps, "size" | "tooLargeMessage"> & {
   presentation: Exclude<SourcePresentation, "unsupported">;
 }) {
+  const [find] = useState(() => new FileFindModel());
   const hostRef = useRef<HTMLDivElement>(null);
   const viewRef = useRef<EditorView | null>(null);
   const initial = useRef({ content, filename, presentation, theme });
@@ -71,7 +73,12 @@ function ReadonlyCodeMirror({
       state: EditorState.create({
         doc: values.content,
         extensions: [
+          find.extension,
           EditorState.readOnly.of(true),
+          EditorView.contentAttributes.of({
+            tabindex: "0",
+            "aria-label": `Source for ${values.filename}`,
+          }),
           EditorView.editable.of(false),
           languageCompartment.of(
             languageFor({ filename: values.filename, presentation: values.presentation }),
@@ -85,7 +92,7 @@ function ReadonlyCodeMirror({
       view.destroy();
       viewRef.current = null;
     };
-  }, []);
+  }, [find]);
 
   useEffect(() => {
     const view = viewRef.current;
@@ -110,7 +117,12 @@ function ReadonlyCodeMirror({
     view.dispatch({ effects: EditorView.scrollIntoView(from, { y: "center" }) });
   }, [location.lineStart, navigationRevision]);
 
-  return <div ref={hostRef} data-testid="file-source-editor" style={HOST_STYLE} />;
+  return (
+    <div style={FRAME_STYLE}>
+      <div ref={hostRef} data-testid="file-source-editor" style={HOST_STYLE} />
+      <FileFind model={find} editor={viewRef} />
+    </div>
+  );
 }
 
 function languageFor(input: {
@@ -122,6 +134,13 @@ function languageFor(input: {
     : [];
 }
 
+const FRAME_STYLE = {
+  display: "flex",
+  position: "relative",
+  flex: 1,
+  minHeight: 0,
+  minWidth: 0,
+} as const;
 const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden" } as const;
 const UNSUPPORTED_STYLE = {
   alignItems: "center",
diff --git a/packages/app/src/git/changed-files-tree.tsx b/packages/app/src/git/changed-files-tree.tsx
new file mode 100644
index 0000000000..0b88d33e96
--- /dev/null
+++ b/packages/app/src/git/changed-files-tree.tsx
@@ -0,0 +1,158 @@
+import { useCallback, useMemo, useState } from "react";
+import { StyleSheet } from "react-native-unistyles";
+// The sheet-aware list: inside a bottom sheet the tree scrolls with the sheet
+// gesture, and outside one it is the ordinary React Native FlatList.
+import { FlatList } from "@/components/ui/scroll-view";
+import type { WorkingDiffMode } from "@/git/diff-document";
+import { DiffFolderRow } from "@/git/diff-folder-row";
+import {
+  buildDiffTree,
+  collectDirPaths,
+  compressSingleChildChains,
+  flattenDiffTree,
+  type DiffTreeRow,
+} from "@/git/diff-tree";
+import { FileHeader } from "@/git/file-header";
+import type { ParsedDiffFile } from "@/git/use-diff-query";
+
+export interface ChangedFilesTreeProps {
+  files: ParsedDiffFile[];
+  mode: WorkingDiffMode;
+  onSelectFile: (path: string) => void;
+  collapsedFolderPaths: string[];
+  onCollapsedFolderPathsChange: (paths: string[]) => void;
+}
+
+/** The changed-files tree shared by the desktop Changes rail and the compact Jump to file sheet. */
+export function ChangedFilesTree({
+  files,
+  mode,
+  onSelectFile,
+  collapsedFolderPaths,
+  onCollapsedFolderPathsChange,
+}: ChangedFilesTreeProps) {
+  const [selectedPath, setSelectedPath] = useState<string | null>(null);
+  const compressedTree = useMemo(() => compressSingleChildChains(buildDiffTree(files)), [files]);
+  const allFolderPaths = useMemo(() => collectDirPaths(compressedTree), [compressedTree]);
+  const collapsedFolders = useMemo(() => new Set(collapsedFolderPaths), [collapsedFolderPaths]);
+  const items = useMemo(
+    () => flattenDiffTree(compressedTree, collapsedFolders),
+    [collapsedFolders, compressedTree],
+  );
+  const handleSelectPath = useCallback((path: string) => setSelectedPath(path), []);
+  const handleSelectFile = useCallback(
+    (path: string) => {
+      setSelectedPath(path);
+      onSelectFile(path);
+    },
+    [onSelectFile],
+  );
+  const handleToggleFolder = useCallback(
+    (dirPath: string) => {
+      const next = collapsedFolders.has(dirPath)
+        ? Array.from(collapsedFolders).filter((path) => path !== dirPath)
+        : [...collapsedFolders, dirPath];
+      onCollapsedFolderPathsChange(next);
+    },
+    [collapsedFolders, onCollapsedFolderPathsChange],
+  );
+  const handleCollapseFolder = useCallback(
+    (dirPath: string) => {
+      const prefix = `${dirPath}/`;
+      onCollapsedFolderPathsChange([
+        ...new Set([
+          ...collapsedFolders,
+          ...allFolderPaths.filter(
+            (folderPath) => folderPath === dirPath || folderPath.startsWith(prefix),
+          ),
+        ]),
+      ]);
+    },
+    [allFolderPaths, collapsedFolders, onCollapsedFolderPathsChange],
+  );
+  const renderItem = useCallback(
+    ({ item }: { item: DiffTreeRow }) => {
+      if (item.kind === "folder") {
+        return (
+          <DiffFolderRow
+            dirPath={item.dirPath}
+            displayName={item.displayName}
+            depth={item.depth}
+            collapsed={collapsedFolders.has(item.dirPath)}
+            isSelected={selectedPath === item.dirPath}
+            additions={item.additions}
+            deletions={item.deletions}
+            onToggle={handleToggleFolder}
+            onCollapse={handleCollapseFolder}
+            onSelect={handleSelectPath}
+            onCopyPath={mode.onCopyPath}
+            onCopyRelativePath={mode.onCopyRelativePath}
+            onReveal={mode.onReveal}
+            revealTargetName={mode.revealTargetName}
+            onDuplicate={mode.onDuplicate}
+            onRevert={mode.onRevert}
+            testID={`diff-folder-${item.dirPath}`}
+          />
+        );
+      }
+      return (
+        <FileHeader
+          file={item.file}
+          workspaceFileDragScope={mode.workspaceFileDragScope}
+          bodyVisible={false}
+          showsBodyState={false}
+          isSelected={selectedPath === item.file.path}
+          depth={item.depth}
+          showDir={false}
+          onActivate={handleSelectFile}
+          onSelect={handleSelectPath}
+          onOpenFile={mode.onOpenFile}
+          onOpenToSide={mode.onOpenToSide}
+          onAddToChat={mode.onAddToChat}
+          onCopyPath={mode.onCopyPath}
+          onCopyRelativePath={mode.onCopyRelativePath}
+          onReveal={mode.onReveal}
+          revealTargetName={mode.revealTargetName}
+          onDownload={mode.onDownload}
+          onDuplicate={mode.onDuplicate}
+          onRevert={mode.onRevert}
+          testID={`diff-tree-file-${item.fileIndex}`}
+        />
+      );
+    },
+    [
+      handleCollapseFolder,
+      handleSelectFile,
+      handleSelectPath,
+      handleToggleFolder,
+      collapsedFolders,
+      mode,
+      selectedPath,
+    ],
+  );
+  const keyExtractor = useCallback(
+    (item: DiffTreeRow) =>
+      item.kind === "folder" ? `folder-${item.dirPath}` : `file-${item.file.path}`,
+    [],
+  );
+
+  return (
+    <FlatList
+      data={items}
+      renderItem={renderItem}
+      keyExtractor={keyExtractor}
+      style={styles.scrollView}
+      contentContainerStyle={styles.contentContainer}
+      testID="changes-file-tree"
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  scrollView: {
+    flex: 1,
+  },
+  contentContainer: {
+    paddingBottom: theme.spacing[8],
+  },
+}));
diff --git a/packages/app/src/git/checkout-status-cache.test.ts b/packages/app/src/git/checkout-status-cache.test.ts
index 8ab38178e4..ba4ddd2429 100644
--- a/packages/app/src/git/checkout-status-cache.test.ts
+++ b/packages/app/src/git/checkout-status-cache.test.ts
@@ -16,6 +16,7 @@ import {
   resolveWorkingDiffComparison,
   selectWorkingDiffComparison,
 } from "@/git/working-diff-comparison";
+import { draftAgentCommandsQueryKey } from "@/hooks/agent-commands-query";
 import {
   applyCheckoutStatusUpdateFromEvent,
   ensureCheckoutStatus,
@@ -197,6 +198,51 @@ describe("applyCheckoutStatusUpdateFromEvent", () => {
     ).toBe(false);
   });
 
+  it("drops the checkout's cached draft slash commands when its branch changes", () => {
+    const queryClient = createQueryClient();
+    queryClient.setQueryData(
+      checkoutStatusQueryKey(serverId, cwd),
+      checkoutStatus({ currentBranch: "chore/build-paseo" }),
+    );
+    const thisCheckout = draftAgentCommandsQueryKey({
+      serverId,
+      draftConfig: { provider: "claude", cwd, model: "haiku" },
+    });
+    const otherCheckout = draftAgentCommandsQueryKey({
+      serverId,
+      draftConfig: { provider: "claude", cwd: "/repo2", model: "haiku" },
+    });
+    queryClient.setQueryData(thisCheckout, [{ name: "build-paseo" }]);
+    queryClient.setQueryData(otherCheckout, [{ name: "build-paseo" }]);
+
+    applyCheckoutStatusUpdateFromEvent({
+      queryClient,
+      serverId,
+      message: checkoutStatusUpdate(checkoutStatus({ currentBranch: "main" })),
+    });
+
+    expect(queryClient.getQueryData(thisCheckout)).toBeUndefined();
+    expect(queryClient.getQueryData(otherCheckout)).toEqual([{ name: "build-paseo" }]);
+  });
+
+  it("keeps the checkout's draft slash commands when a push leaves its branch unchanged", () => {
+    const queryClient = createQueryClient();
+    queryClient.setQueryData(checkoutStatusQueryKey(serverId, cwd), checkoutStatus());
+    const thisCheckout = draftAgentCommandsQueryKey({
+      serverId,
+      draftConfig: { provider: "claude", cwd, model: "haiku" },
+    });
+    queryClient.setQueryData(thisCheckout, [{ name: "build-paseo" }]);
+
+    applyCheckoutStatusUpdateFromEvent({
+      queryClient,
+      serverId,
+      message: checkoutStatusUpdate(checkoutStatus({ isDirty: true })),
+    });
+
+    expect(queryClient.getQueryData(thisCheckout)).toEqual([{ name: "build-paseo" }]);
+  });
+
   it("writes the PR status cache when prStatus is present, and skips it otherwise", () => {
     const queryClient = createQueryClient();
     const pushedPr = prStatus({ requestId: "pr-1" });
diff --git a/packages/app/src/git/checkout-status-cache.ts b/packages/app/src/git/checkout-status-cache.ts
index 97a26e099b..c06499fef5 100644
--- a/packages/app/src/git/checkout-status-cache.ts
+++ b/packages/app/src/git/checkout-status-cache.ts
@@ -8,6 +8,7 @@ import {
   invalidatePrPaneTimelineForCheckout,
 } from "@/git/query-keys";
 import { type CheckoutPrStatusPayload, normalizeCheckoutPrStatusPayload } from "@/git/pr-status";
+import { resetDraftAgentCommandsForCheckout } from "@/hooks/agent-commands-query";
 import { expireWorkingDiffComparisons } from "@/git/working-diff-comparison";
 
 export type CheckoutStatusPayload = CheckoutStatusResponse["payload"];
@@ -67,7 +68,13 @@ export function applyCheckoutStatusUpdateFromEvent({
     ? normalizeCheckoutPrStatusPayload(payload.prStatus)
     : undefined;
   const cachePayload = prStatus ? { ...payload, prStatus } : payload;
+  const previousStatus = queryClient.getQueryData<CheckoutStatusPayload>(
+    checkoutStatusQueryKey(serverId, payload.cwd),
+  );
   queryClient.setQueryData(checkoutStatusQueryKey(serverId, payload.cwd), cachePayload);
+  if (previousStatus?.currentBranch !== payload.currentBranch) {
+    void resetDraftAgentCommandsForCheckout(queryClient, { serverId, cwd: payload.cwd });
+  }
   void queryClient.invalidateQueries({
     queryKey: checkoutCommitsQueryKey(serverId, payload.cwd),
   });
diff --git a/packages/app/src/git/commit-file-diff-query.test.ts b/packages/app/src/git/commit-file-diff-query.test.ts
new file mode 100644
index 0000000000..173592639d
--- /dev/null
+++ b/packages/app/src/git/commit-file-diff-query.test.ts
@@ -0,0 +1,76 @@
+import { QueryClient, QueryObserver } from "@tanstack/react-query";
+import { describe, expect, it } from "vitest";
+import { fetchQueryOptions } from "@/data/query";
+import { commitFileDiffQueryOptions } from "./commit-file-diff-query";
+
+const file = { path: "a.ts", isNew: true, isDeleted: false, additions: 0, deletions: 0, hunks: [] };
+
+describe("commit file diff fetching", () => {
+  it("reuses a cached commit body on remount and fetches on explicit refresh", async () => {
+    const queryClient = new QueryClient();
+    let calls = 0;
+    const options = fetchQueryOptions(
+      commitFileDiffQueryOptions({
+        serverId: "host",
+        cwd: "/repo",
+        sha: "abc",
+        path: "a.ts",
+        enabled: true,
+        client: {
+          async getCommitFileDiff() {
+            calls++;
+            return { file };
+          },
+        },
+      }),
+    );
+    queryClient.setQueryData(
+      options.queryKey,
+      { file },
+      { updatedAt: Date.now() - 24 * 60 * 60 * 1000 },
+    );
+    const observer = new QueryObserver(queryClient, options);
+    const detach = observer.subscribe(() => {});
+    try {
+      await Promise.resolve();
+      expect(calls).toBe(0);
+      expect(observer.getCurrentResult().data?.file).toBe(file);
+      await observer.refetch();
+      expect(calls).toBe(1);
+    } finally {
+      detach();
+      queryClient.clear();
+    }
+  });
+
+  it("retries a cached null result when reopened", async () => {
+    const queryClient = new QueryClient();
+    const options = fetchQueryOptions(
+      commitFileDiffQueryOptions({
+        serverId: "host",
+        cwd: "/repo",
+        sha: "abc",
+        path: "a.ts",
+        enabled: true,
+        client: {
+          async getCommitFileDiff() {
+            return { file };
+          },
+        },
+      }),
+    );
+    queryClient.setQueryData(options.queryKey, { file: null });
+    const observer = new QueryObserver(queryClient, options);
+    const settled = Promise.withResolvers<void>();
+    const detach = observer.subscribe((result) => {
+      if (result.fetchStatus === "idle") settled.resolve();
+    });
+    try {
+      await settled.promise;
+      expect(observer.getCurrentResult().data?.file).toEqual(file);
+    } finally {
+      detach();
+      queryClient.clear();
+    }
+  });
+});
diff --git a/packages/app/src/git/commit-file-diff-query.ts b/packages/app/src/git/commit-file-diff-query.ts
new file mode 100644
index 0000000000..5277551234
--- /dev/null
+++ b/packages/app/src/git/commit-file-diff-query.ts
@@ -0,0 +1,28 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { checkoutCommitFileDiffQueryKey, COMMIT_FILE_DIFF_STALE_TIME } from "./query-keys";
+import { shareCommitFileDiff } from "./diff-sharing";
+
+export function commitFileDiffQueryOptions(input: {
+  serverId: string;
+  cwd: string;
+  sha: string;
+  path: string;
+  client: Pick<DaemonClient, "getCommitFileDiff"> | null;
+  enabled: boolean;
+}) {
+  return {
+    queryKey: checkoutCommitFileDiffQueryKey(input.serverId, input.cwd, input.sha, input.path),
+    queryFn: () => {
+      if (!input.client) throw new Error("Host disconnected");
+      return input.client.getCommitFileDiff(input.cwd, input.sha, input.path);
+    },
+    enabled: input.enabled,
+    gcTime: COMMIT_FILE_DIFF_STALE_TIME,
+    // Only successful file bodies are immutable. Null/error results can recover.
+    immutableWhen: (data: Awaited<ReturnType<DaemonClient["getCommitFileDiff"]>>) =>
+      data.file !== null,
+    dataShape: "value" as const,
+    refetchOnWindowFocus: false,
+    structuralSharing: shareCommitFileDiff,
+  };
+}
diff --git a/packages/app/src/git/commits-section/commit-row.tsx b/packages/app/src/git/commits-section/commit-row.tsx
index 092651b526..aab76da3d0 100644
--- a/packages/app/src/git/commits-section/commit-row.tsx
+++ b/packages/app/src/git/commits-section/commit-row.tsx
@@ -4,14 +4,13 @@ import { StyleSheet } from "react-native-unistyles";
 import { ThemedChevron, chevronColorMapping } from "@/git/themed-chevron";
 import type { ClassifiedCheckoutCommit } from "@/git/use-commits-query";
 import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
-import { formatTimeAgo } from "@/utils/time";
+import { useTimeAgo } from "@/hooks/use-time-ago";
 import { CommitGraphNode } from "./commit-graph-node";
 
 interface CommitRowProps {
   commit: ClassifiedCheckoutCommit;
   isFirst: boolean;
   isLast: boolean;
-  now: Date;
   onCommitPress: (sha: string) => void;
 }
 
@@ -26,7 +25,6 @@ export const CommitRow = memo(function CommitRow({
   commit,
   isFirst,
   isLast,
-  now,
   onCommitPress,
 }: CommitRowProps) {
   const handlePress = useCallback(() => {
@@ -49,7 +47,7 @@ export const CommitRow = memo(function CommitRow({
           {commit.subject}
         </Text>
       </View>
-      <Text style={styles.timestamp}>{formatTimeAgo(new Date(commit.authorDate), now)}</Text>
+      <CommitTimestamp authorDate={commit.authorDate} />
       <View style={styles.caret}>
         <ThemedChevron size={14} uniProps={chevronColorMapping} />
       </View>
@@ -57,6 +55,11 @@ export const CommitRow = memo(function CommitRow({
   );
 });
 
+function CommitTimestamp({ authorDate }: { authorDate: string }) {
+  const label = useTimeAgo(new Date(authorDate));
+  return <Text style={styles.timestamp}>{label}</Text>;
+}
+
 const styles = StyleSheet.create((theme) => ({
   row: {
     flexDirection: "row",
diff --git a/packages/app/src/git/commits-section/commits-section.test.tsx b/packages/app/src/git/commits-section/commits-section.test.tsx
index cb95c91d33..3ae1288f2c 100644
--- a/packages/app/src/git/commits-section/commits-section.test.tsx
+++ b/packages/app/src/git/commits-section/commits-section.test.tsx
@@ -4,27 +4,6 @@ import { JSDOM } from "jsdom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { CommitsSection } from "./commits-section";
 
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) =>
-      typeof factory === "function"
-        ? factory({
-            borderRadius: { full: 9999, sm: 4 },
-            borderWidth: { 1: 1 },
-            colors: {
-              border: "#333",
-              foreground: "#fff",
-              foregroundMuted: "#aaa",
-              statusDanger: "#c33",
-              surface2: "#222",
-            },
-            fontSize: { base: 15, sm: 13 },
-            spacing: [0, 4, 8, 12],
-          })
-        : factory,
-  },
-}));
-
 vi.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 34, left: 0 }),
 }));
diff --git a/packages/app/src/git/commits-section/commits-section.tsx b/packages/app/src/git/commits-section/commits-section.tsx
index c344d44551..a7b32c7772 100644
--- a/packages/app/src/git/commits-section/commits-section.tsx
+++ b/packages/app/src/git/commits-section/commits-section.tsx
@@ -1,11 +1,11 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useMemo } from "react";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTranslation } from "react-i18next";
-import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useCheckoutCommitsQuery, type CheckoutCommitsQueryResult } from "@/git/use-commits-query";
 import { ThemedChevron, chevronColorMapping } from "@/git/themed-chevron";
+import { treeRowPaddingLeft } from "@/components/tree-primitives";
 import { normalizeBranchOptionName } from "@/utils/branch-suggestions";
 import { CommitRow } from "./commit-row";
 
@@ -39,11 +39,9 @@ function CommitsSectionSkeleton() {
 
 function CommitsSectionContent({
   query,
-  now,
   onCommitPress,
 }: {
   query: Exclude<CheckoutCommitsQueryResult, { status: "unsupported" }>;
-  now: Date;
   onCommitPress: (sha: string) => void;
 }) {
   const { t } = useTranslation();
@@ -76,7 +74,6 @@ function CommitsSectionContent({
           commit={commit}
           isFirst={index === 0}
           isLast={index === workspaceCommits.length - 1}
-          now={now}
           onCommitPress={onCommitPress}
         />
       ))}
@@ -93,9 +90,6 @@ export function CommitsSection({
 }: CommitsSectionProps) {
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
-  const isPanelActive = useRetainedPanelActive();
-  const [now, setNow] = useState(() => new Date());
-  const displayNow = useMemo(() => (isPanelActive ? new Date() : now), [isPanelActive, now]);
   const query = useCheckoutCommitsQuery({
     serverId,
     cwd,
@@ -103,20 +97,9 @@ export function CommitsSection({
   });
 
   const handleToggleSection = useCallback(() => {
-    if (collapsed) {
-      setNow(new Date());
-    }
     onCollapsedChange?.(!collapsed);
   }, [collapsed, onCollapsedChange]);
 
-  useEffect(() => {
-    if (collapsed || !isPanelActive) {
-      return;
-    }
-    const interval = setInterval(() => setNow(new Date()), 10_000);
-    return () => clearInterval(interval);
-  }, [collapsed, isPanelActive]);
-
   const headerChevronStyle = useMemo(
     () => [styles.headerChevron, !collapsed && styles.headerChevronExpanded],
     [collapsed],
@@ -159,9 +142,7 @@ export function CommitsSection({
           </Text>
         )}
       </Pressable>
-      {collapsed ? null : (
-        <CommitsSectionContent query={query} now={displayNow} onCommitPress={onCommitPress} />
-      )}
+      {collapsed ? null : <CommitsSectionContent query={query} onCommitPress={onCommitPress} />}
     </View>
   );
 }
@@ -175,7 +156,9 @@ const styles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-    paddingLeft: theme.spacing[2],
+    // Same leading rail as a depth-0 tree row, so the disclosure chevron lines up
+    // with the folder chevrons above it.
+    paddingLeft: treeRowPaddingLeft(0),
     paddingRight: theme.spacing[3],
     paddingVertical: theme.spacing[2],
     flexShrink: 0,
diff --git a/packages/app/src/git/diff-document/hit-testing.test.ts b/packages/app/src/git/diff-document/hit-testing.test.ts
index a0ed9c1578..d728c2f2d7 100644
--- a/packages/app/src/git/diff-document/hit-testing.test.ts
+++ b/packages/app/src/git/diff-document/hit-testing.test.ts
@@ -315,6 +315,7 @@ function reviewActionsForFirstAddition(): NonNullable<
     commentsByTarget: new Map(),
     editor: { target, commentId: null, body: "" },
     onStartComment() {},
+    onChangeEditorBody() {},
     onCancelEditor() {},
     onSaveEditor() {},
     onEditComment() {},
diff --git a/packages/app/src/git/diff-document/horizontal-scroll.native.tsx b/packages/app/src/git/diff-document/horizontal-scroll.native.tsx
index 993b2048bb..0aa42e01c6 100644
--- a/packages/app/src/git/diff-document/horizontal-scroll.native.tsx
+++ b/packages/app/src/git/diff-document/horizontal-scroll.native.tsx
@@ -26,9 +26,10 @@ export function HorizontalScroll({
   const scrollId = useId();
   const [isAtLeftEdge, setIsAtLeftEdge] = useState(true);
   const edgeRef = useRef(true);
+  const path = file.path;
   const handler = useAnimatedScrollHandler({
     onScroll(event) {
-      offsets.value = { ...offsets.value, [file.path]: event.contentOffset.x };
+      offsets.value = { ...offsets.value, [path]: event.contentOffset.x };
     },
   });
   useEffect(() => {
diff --git a/packages/app/src/git/diff-document/measurement-cost.test.ts b/packages/app/src/git/diff-document/measurement-cost.test.ts
index ef2f6231df..b870fbe9cb 100644
--- a/packages/app/src/git/diff-document/measurement-cost.test.ts
+++ b/packages/app/src/git/diff-document/measurement-cost.test.ts
@@ -1,6 +1,6 @@
 import type { ParsedDiffFile } from "@getpaseo/protocol/messages";
 import { describe, expect, it } from "vitest";
-import { buildDiffDocumentModel } from "./model";
+import { buildDiffDocumentModel, measureFragments } from "./model";
 import type { BuildDiffDocumentModelInput, TextMeasurer } from "./types";
 
 /**
@@ -92,6 +92,33 @@ function shapedCharactersFor(options: { lineCount: number; lineLength: number })
 }
 
 describe("diff document measurement cost", () => {
+  it("keeps additive wrapped search work proportional to long source lines", () => {
+    function measuredGraphemes(length: number): number {
+      let count = 0;
+      measureFragments({
+        text: "a".repeat(length),
+        availableWidth: 200,
+        wrapLines: true,
+        lineHeight: 18,
+        measureText: {
+          measure: (text) => text.length * 10,
+          measureWidth(graphemes) {
+            count += graphemes.length;
+            return graphemes.length * 10;
+          },
+          measureAdvances(graphemes) {
+            count += graphemes.length;
+            return graphemes.map((_, index) => (index + 1) * 10);
+          },
+        },
+      });
+      return count;
+    }
+    const short = measuredGraphemes(100);
+    const long = measuredGraphemes(1600);
+    expect(long / short).toBeLessThan(32);
+  });
+
   it("shapes a bounded number of characters per character of text", () => {
     // The shape of the CHANGELOG.md working diff that froze the renderer: 42
     // lines, longest 597 characters.
diff --git a/packages/app/src/git/diff-document/model.test.ts b/packages/app/src/git/diff-document/model.test.ts
index 77d6ae391d..ace965c1ce 100644
--- a/packages/app/src/git/diff-document/model.test.ts
+++ b/packages/app/src/git/diff-document/model.test.ts
@@ -71,6 +71,127 @@ function input(overrides: Partial<BuildDiffDocumentModelInput> = {}): BuildDiffD
 }
 
 describe("diff document model", () => {
+  it("preserves shaped wrap breaks when joining makes a longer prefix narrower", () => {
+    const measure = (text: string) => {
+      if (text === "لا") return 30;
+      if (text === "لام") return 15;
+      return text.length * 10;
+    };
+    const fragments = measureFragments({
+      text: "لام",
+      availableWidth: 20,
+      wrapLines: true,
+      lineHeight: 18,
+      measureText: { measure, measureWidth: (graphemes) => measure(graphemes.join("")) },
+    });
+    expect(fragments.map((fragment) => fragment.text)).toEqual(["ل", "ام"]);
+    expect(fragments.map((fragment) => fragment.width)).toEqual([10, 20]);
+  });
+
+  it("does not search wrap boundaries when the remaining text already fits", () => {
+    let widthQueries = 0;
+    const fragments = measureFragments({
+      text: "const answer = value + 1;",
+      availableWidth: 300,
+      wrapLines: true,
+      lineHeight: 18,
+      measureText: {
+        measure: measurer.measure,
+        measureWidth(graphemes) {
+          widthQueries++;
+          return graphemes.length * 10;
+        },
+      },
+    });
+    expect(fragments).toHaveLength(1);
+    expect(fragments[0]?.width).toBe(250);
+    expect(widthQueries).toBe(1);
+  });
+
+  it("builds character geometry only for displayed wrapped fragments", () => {
+    let advancedGraphemes = 0;
+    const measureWidth = (graphemes: readonly string[]) => graphemes.length * 10;
+    const measureText = {
+      // Whole-string widths need not match the chunked advance contract.
+      measure: () => 999,
+      measureWidth,
+      measureAdvances(graphemes: readonly string[]) {
+        advancedGraphemes += graphemes.length;
+        return graphemes.map((_, index) => (index + 1) * 10);
+      },
+    };
+    const text = "const next = (value) => value + 1;".repeat(4);
+    const fragments = measureFragments({
+      text,
+      availableWidth: 80,
+      wrapLines: true,
+      lineHeight: 18,
+      measureText,
+    });
+
+    expect(fragments.map((fragment) => fragment.text).join("")).toBe(text);
+    expect(fragments.every((fragment) => fragment.width <= 80)).toBe(true);
+    expect(fragments).toEqual(
+      measureFragments({
+        text,
+        availableWidth: 80,
+        wrapLines: true,
+        lineHeight: 18,
+        measureText: { measure: measurer.measure },
+      }),
+    );
+    expect(advancedGraphemes).toBe(text.length);
+  });
+
+  it("materializes only visible rows of a large file while preserving full horizontal extent", () => {
+    const source = file("large.ts");
+    source.hunks[0]!.lines = Array.from({ length: 1000 }, (_, index) => ({
+      type: "add",
+      content: index === 900 ? "a very wide offscreen line ".repeat(20) : `line ${index}`,
+      tokens: [{ text: `line ${index}`, style: null }],
+    }));
+    let advancedCharacters = 0;
+    const measureText: TextMeasurer = {
+      measure: (text) => text.length * 10,
+      measureAdvances(graphemes) {
+        advancedCharacters += graphemes.join("").length;
+        return graphemes.map((_, index) => (index + 1) * 10);
+      },
+    };
+    const base = input({ files: [source], wrapLines: false, viewportWidth: 300, measureText });
+    const eager = buildDiffDocumentModel(base);
+    advancedCharacters = 0;
+    const first = buildDiffDocumentModel({
+      ...base,
+      materializationWindow: { top: FILE_HEADER_HEIGHT, height: 54 },
+    });
+    expect(measuredFragments(first, source.path)).toBe(3);
+    expect(advancedCharacters).toBeLessThan(100);
+    expect(first.height).toBe(eager.height);
+    expect(first.files[0]!.contentWidth).toBe(eager.files[0]!.contentWidth);
+    const priorCells = firstLineCells(first, source.path);
+    advancedCharacters = 0;
+    const next = buildDiffDocumentModel({
+      ...base,
+      reuseFrom: [first],
+      materializationWindow: { top: FILE_HEADER_HEIGHT + 900 * 18, height: 54 },
+    });
+    expect(firstLineCells(next, source.path)).toBe(priorCells);
+    expect(next.rows[900]).toMatchObject({
+      kind: "line",
+      cells: [{ fragments: [{ text: source.hunks[0]!.lines[900]!.content }] }],
+    });
+    expect(advancedCharacters).toBeLessThan(600);
+    expect(next.height).toBe(eager.height);
+    advancedCharacters = 0;
+    buildDiffDocumentModel({
+      ...base,
+      reuseFrom: [next],
+      materializationWindow: { top: FILE_HEADER_HEIGHT, height: 54 },
+    });
+    expect(advancedCharacters).toBe(0);
+  });
+
   it("does not imperatively scroll for a no-op relayout", () => {
     expect(shouldApplyRelayoutScroll(320, 320)).toBe(false);
     expect(shouldApplyRelayoutScroll(320, 320.4)).toBe(false);
@@ -268,6 +389,7 @@ describe("diff document model", () => {
             commentId: null,
           },
           onStartComment() {},
+          onChangeEditorBody() {},
           onCancelEditor() {},
           onSaveEditor() {},
           onEditComment() {},
@@ -669,6 +791,7 @@ function reviewActionsWithEditor(
     commentsByTarget: new Map(),
     editor: target ? { target, body: "", commentId: null } : null,
     onStartComment() {},
+    onChangeEditorBody() {},
     onCancelEditor() {},
     onSaveEditor() {},
     onEditComment() {},
diff --git a/packages/app/src/git/diff-document/model.ts b/packages/app/src/git/diff-document/model.ts
index 6267519796..fb2b9a04f0 100644
--- a/packages/app/src/git/diff-document/model.ts
+++ b/packages/app/src/git/diff-document/model.ts
@@ -8,7 +8,7 @@ import {
 } from "@/utils/diff-layout";
 import { compactHighlightTokens } from "@/utils/diff-rendering";
 import { getInlineReviewThreadState, getSplitInlineReviewThreadState } from "@/review/geometry";
-import { advancesFor } from "./text-measurement";
+import { advancesFor, requiresShaping } from "./text-measurement";
 import type {
   BuildDiffDocumentModelInput,
   DiffCell,
@@ -157,21 +157,26 @@ function appendReusableFileRows(candidate: {
     !candidate.input.wrapLines &&
     candidate.model.reviewGeometryKey === candidate.reviewGeometryKey &&
     candidate.file.top === candidate.fileTop &&
+    candidate.file.fileIndex === candidate.fileIndex &&
     candidate.file.rowStart === candidate.rows.length;
-  if (retainsRowGeometry) {
-    candidate.rows.push(...reusedRows);
-    return {
-      bottom: candidate.bodyTop + candidate.file.bodyHeight,
-      maximumHorizontalOverflow: Math.max(
-        0,
-        candidate.file.contentWidth - candidate.input.viewportWidth,
-      ),
-    };
-  }
-
   let top = candidate.bodyTop;
   for (const reusedRow of reusedRows) {
-    const nextRow = repositionReusedRow(reusedRow, candidate, top);
+    let nextRow = retainsRowGeometry ? reusedRow : repositionReusedRow(reusedRow, candidate, top);
+    if (
+      nextRow.kind === "line" &&
+      intersectsMaterializationWindow(candidate.input, top, top + nextRow.height) &&
+      nextRow.cells.some((cell) => cell && cell.fragments.length === 0)
+    ) {
+      nextRow = {
+        ...nextRow,
+        cells: materializeCells(
+          nextRow.cells,
+          candidate.file.file,
+          candidate.file.gutterWidth,
+          candidate.input,
+        ),
+      };
+    }
     candidate.rows.push(nextRow);
     top += nextRow.height;
   }
@@ -232,71 +237,45 @@ function appendNewFileRows(candidate: {
     };
   }
 
-  const deferredLines =
-    candidate.input.materializationWindow && !candidate.input.wrapLines
-      ? geometryLines(lineSources(candidate.file, candidate.input.layout, false), candidate.input)
-      : null;
-  const deferredBodyHeight = deferredLines?.reduce((height, line) => height + line.height, 0) ?? 0;
-  const shouldMaterialize =
-    deferredLines === null ||
-    intersectsMaterializationWindow(
-      candidate.input,
-      candidate.fileTop,
-      candidate.bodyTop + deferredBodyHeight + DIFF_BODY_BORDER_HEIGHT,
-    );
-  return shouldMaterialize
-    ? appendMeasuredFileRows(candidate)
-    : appendGeometryFileRows(candidate, deferredLines);
-}
-
-function appendGeometryFileRows(
-  candidate: Parameters<typeof appendNewFileRows>[0],
-  lines: readonly GeometryLine[],
-): FileRowsResult {
-  let top = candidate.bodyTop;
-  for (const line of lines) {
-    candidate.rows.push({
-      kind: "line",
-      index: candidate.rows.length,
-      fileIndex: candidate.fileIndex,
-      path: candidate.file.path,
-      top,
-      height: line.height,
-      cells: line.cells,
-      reviewHeight: line.reviewHeight,
-    });
-    top += line.height;
-  }
-  return { bottom: top + DIFF_BODY_BORDER_HEIGHT, maximumHorizontalOverflow: 0 };
-}
-
-function appendMeasuredFileRows(
-  candidate: Parameters<typeof appendNewFileRows>[0],
-): FileRowsResult {
+  const lines = geometryLines(
+    lineSources(candidate.file, candidate.input.layout, false),
+    candidate.input,
+  );
+  const fileBottom =
+    candidate.bodyTop +
+    lines.reduce((height, line) => height + line.height, 0) +
+    DIFF_BODY_BORDER_HEIGHT;
+  const measureWidth =
+    !candidate.input.wrapLines &&
+    intersectsMaterializationWindow(candidate.input, candidate.fileTop, fileBottom);
   let top = candidate.bodyTop;
   let maximumHorizontalOverflow = 0;
-  for (const sourceCells of lineSources(candidate.file, candidate.input.layout, true)) {
-    const columnCount = sourceCells.length;
-    const columnWidth = candidate.input.viewportWidth / columnCount;
-    const availableWidth = Math.max(
-      candidate.input.measureText.measure("M"),
-      columnWidth - candidate.gutterWidth - CODE_HORIZONTAL_PADDING,
-    );
-    const cells = sourceCells.map((source) => {
-      if (!source) return null;
-      const cell = measureCell({ source, availableWidth, input: candidate.input });
-      maximumHorizontalOverflow = Math.max(
-        maximumHorizontalOverflow,
-        candidate.gutterWidth + CODE_HORIZONTAL_PADDING + measureCellWidth(cell) - columnWidth,
-      );
-      return cell;
-    }) as DiffLineRow["cells"];
+  for (const line of lines) {
+    const shouldMaterialize =
+      candidate.input.wrapLines ||
+      intersectsMaterializationWindow(candidate.input, top, top + line.height);
+    const cells = shouldMaterialize
+      ? materializeCells(line.cells, candidate.file, candidate.gutterWidth, candidate.input)
+      : line.cells;
+    const columnWidth = candidate.input.viewportWidth / cells.length;
+    if (measureWidth) {
+      for (const cell of cells) {
+        if (!cell) continue;
+        const width =
+          cell.fragments.length > 0
+            ? measureCellWidth(cell)
+            : candidate.input.measureText.measure(displayLineText(cell.content));
+        maximumHorizontalOverflow = Math.max(
+          maximumHorizontalOverflow,
+          candidate.gutterWidth + CODE_HORIZONTAL_PADDING + width - columnWidth,
+        );
+      }
+    }
     const textHeight = Math.max(
       candidate.input.typography.lineHeight,
       ...cells.map((cell) => (cell?.fragments.length ?? 1) * candidate.input.typography.lineHeight),
     );
-    const reviewHeight = reviewHeightForCells(cells, candidate.input);
-    const height = textHeight + reviewHeight;
+    const height = textHeight + line.reviewHeight;
     candidate.rows.push({
       kind: "line",
       index: candidate.rows.length,
@@ -305,13 +284,46 @@ function appendMeasuredFileRows(
       top,
       height,
       cells,
-      reviewHeight,
+      reviewHeight: line.reviewHeight,
     });
     top += height;
   }
   return { bottom: top + DIFF_BODY_BORDER_HEIGHT, maximumHorizontalOverflow };
 }
 
+function materializeCells(
+  cells: DiffLineRow["cells"],
+  file: BuildDiffDocumentModelInput["files"][number],
+  gutterWidth: number,
+  input: BuildDiffDocumentModelInput,
+): DiffLineRow["cells"] {
+  const availableWidth = Math.max(
+    input.measureText.measure("M"),
+    input.viewportWidth / cells.length - gutterWidth - CODE_HORIZONTAL_PADDING,
+  );
+  return cells.map((cell) => {
+    if (!cell || cell.fragments.length > 0) return cell;
+    const sourceLine =
+      file.hunks[cell.sourceIdentity.hunkIndex]!.lines[cell.sourceIdentity.lineIndex]!;
+    return measureCell({
+      source: {
+        ...cell,
+        tokenText: cell.type === "header" ? [] : compactHighlightTokens(sourceLine.tokens ?? []),
+      },
+      availableWidth,
+      input,
+    });
+  }) as DiffLineRow["cells"];
+}
+
+function displayLineText(text: string): string {
+  return text.includes("\t")
+    ? segmentGraphemes(text)
+        .map((segment) => segment.text)
+        .join("")
+    : text;
+}
+
 export function reviewGeometryKey(
   reviewActions: BuildDiffDocumentModelInput["reviewActions"],
 ): string {
@@ -334,7 +346,11 @@ export function retainReusableModels(
   previous: readonly DiffDocumentModel[] | undefined,
   next: DiffDocumentModel,
 ): DiffDocumentModel[] {
-  const fullest = [...(previous ?? []), next].reduce((best, candidate) =>
+  const sources = new Set(next.files.map((file) => file.file));
+  const compatible = previous?.filter((model) =>
+    model.files.every((file) => sources.has(file.file)),
+  );
+  const fullest = [...(compatible ?? []), next].reduce((best, candidate) =>
     measuredFileCount(candidate) > measuredFileCount(best) ? candidate : best,
   );
   return fullest === next ? [next] : [fullest, next];
@@ -437,16 +453,17 @@ function intersectsMaterializationWindow(
 
 function hasMeasuredFileRows(model: DiffDocumentModel, file: DiffFileSection): boolean {
   if (file.isCollapsed) return false;
-  return model.rows.slice(file.rowStart, file.rowEnd).every((row) => {
+  return model.rows.slice(file.rowStart, file.rowEnd).some((row) => {
     if (row.kind !== "line") return true;
-    return row.cells.every((cell) => !cell || cell.fragments.length > 0);
+    return row.cells.some((cell) => cell && cell.fragments.length > 0);
   });
 }
 
 function indexReusableModels(
   models: readonly DiffDocumentModel[] | undefined,
 ): ReusableModelIndex[] {
-  return (models ?? []).map((model) => {
+  // The latest model includes text prepared by later scroll windows.
+  return (models ?? []).toReversed().map((model) => {
     const filesBySource = new Map<BuildDiffDocumentModelInput["files"][number], DiffFileSection>();
     const measuredFiles = new Set<DiffFileSection>();
     for (const file of model.files) {
@@ -554,14 +571,31 @@ export function measureFragments(input: {
     return [createFragment(graphemes, 0, graphemes.length, 0, input.lineHeight, input.measureText)];
   }
   const fragments: DiffFragment[] = [];
+  const displayGraphemes = graphemes.map((grapheme) => grapheme.text);
+  const measureWidth =
+    input.measureText.measureWidth?.bind(input.measureText) ??
+    ((slice: readonly string[]) => advancesFor(input.measureText)(slice).at(-1) ?? 0);
+  // Joining/ligatures can make a longer prefix narrower. Preserve the existing
+  // search order for those runs; changing the probes can change their breaks.
+  const canBoundSearch = !requiresShaping(input.text);
   let graphemeIndex = 0;
   while (graphemeIndex < graphemes.length) {
     let low = graphemeIndex + 1;
-    let high = graphemes.length;
+    // A small first probe finishes short lines in one query. Grow it only when
+    // it fits, so narrow wrapping never repeatedly measures a huge line's tail.
+    let high = canBoundSearch ? Math.min(graphemes.length, graphemeIndex + 64) : graphemes.length;
     let fitting = low;
+    if (canBoundSearch) {
+      while (measureWidth(displayGraphemes.slice(graphemeIndex, high)) <= input.availableWidth) {
+        fitting = high;
+        low = high + 1;
+        if (high === graphemes.length) break;
+        high = Math.min(graphemes.length, graphemeIndex + (high - graphemeIndex) * 2);
+      }
+    }
     while (low <= high) {
       const middle = (low + high) >>> 1;
-      const width = measureGraphemeSlice(graphemes, graphemeIndex, middle, input.measureText).width;
+      const width = measureWidth(displayGraphemes.slice(graphemeIndex, middle));
       if (width <= input.availableWidth || middle === graphemeIndex + 1) {
         fitting = middle;
         low = middle + 1;
diff --git a/packages/app/src/git/diff-document/surface.native.tsx b/packages/app/src/git/diff-document/surface.native.tsx
index 49c2697169..2063198712 100644
--- a/packages/app/src/git/diff-document/surface.native.tsx
+++ b/packages/app/src/git/diff-document/surface.native.tsx
@@ -20,7 +20,7 @@ import Animated, {
 } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { InlineReviewThread } from "@/review";
-import { useKeyboardShift } from "@/hooks/keyboard-shift-context";
+import { useKeyboardShift } from "@/keyboard/shift";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { DocumentFileHeader } from "./document-file-header";
 import {
@@ -110,7 +110,6 @@ export function DiffSurface(props: DiffSurfaceProps) {
   const reviewActions = props.mode.kind === "working" ? props.mode.reviewActions : undefined;
   const model = useMemo(() => {
     const dependencies = [
-      props.files,
       props.displayPreferences.layout,
       props.displayPreferences.wrapLines,
       viewport.width,
@@ -172,8 +171,13 @@ export function DiffSurface(props: DiffSurfaceProps) {
     [family, props.palette, typography.lineHeight, typography.size],
   );
   const textLayout = useMemo(
-    () => prepareNativeTextLayout(textLayoutStore, model),
-    [model, textLayoutStore],
+    () =>
+      prepareNativeTextLayout(
+        textLayoutStore,
+        model,
+        diffMaterializationWindow(fileWindowTop, viewport.height),
+      ),
+    [model, textLayoutStore, fileWindowTop, viewport.height],
   );
   useEffect(() => () => disposeNativeTextLayout(textLayoutStore), [textLayoutStore]);
   const headerTextLayout = useMemo(
@@ -252,9 +256,13 @@ export function DiffSurface(props: DiffSurfaceProps) {
       consumedFocusRef.current = requestKey;
     }
   }, [collapsedFilePaths, mode, model.files, onToggleFile, scrollTop]);
+  const contentInsetBottom = props.contentInsetBottom ?? 0;
   const contentStyle = useMemo(
-    () => ({ minHeight: Math.max(model.height, viewport.height), backgroundColor: "transparent" }),
-    [model.height, viewport.height],
+    () => ({
+      minHeight: Math.max(model.height, viewport.height) + contentInsetBottom,
+      backgroundColor: "transparent",
+    }),
+    [contentInsetBottom, model.height, viewport.height],
   );
   return (
     <View style={[styles.root, { backgroundColor: props.palette.surface }]} onLayout={layout}>
@@ -386,11 +394,12 @@ function NativeCanvasFileHeader({
     () => recordNativeHeaderPicture({ file, viewportWidth, textLayout, paints }),
     [file, paints, textLayout, viewportWidth],
   );
+  const { top, bottom, headerHeight } = file;
   const stickyStyle = useAnimatedStyle(() => {
-    const pinOffset = Math.max(0, scrollTop.value - file.top);
-    const maximumPinOffset = Math.max(0, file.bottom - file.headerHeight - file.top);
+    const pinOffset = Math.max(0, scrollTop.value - top);
+    const maximumPinOffset = Math.max(0, bottom - headerHeight - top);
     return { transform: [{ translateY: Math.min(pinOffset, maximumPinOffset) }] };
-  }, [file.bottom, file.headerHeight, file.top, scrollTop]);
+  }, [bottom, headerHeight, top, scrollTop]);
   const style = useMemo<ViewStyle>(
     () => ({
       position: "absolute",
diff --git a/packages/app/src/git/diff-document/surface.web.tsx b/packages/app/src/git/diff-document/surface.web.tsx
index bcabe0ee4f..97801b708f 100644
--- a/packages/app/src/git/diff-document/surface.web.tsx
+++ b/packages/app/src/git/diff-document/surface.web.tsx
@@ -10,6 +10,7 @@ import {
   ContextMenuTrigger,
 } from "@/components/ui/context-menu";
 import { useToast } from "@/contexts/toast-context";
+import { useStableEvent } from "@/hooks/use-stable-event";
 import { InlineReviewAddButton, InlineReviewThread } from "@/review";
 import { copyToClipboard } from "@/utils/copy-to-clipboard";
 import type { ReviewableDiffTarget } from "@/utils/diff-layout";
@@ -557,23 +558,26 @@ export function DiffSurface(props: DiffSurfaceProps) {
     (event: React.PointerEvent<HTMLDivElement>) => pointHitAt(event.clientX, event.clientY),
     [pointHitAt],
   );
-  const setSelection = useCallback(
-    (selection: DiffSelection | null) => {
-      selectionRef.current = selection;
-      const currentModel = modelRef.current;
-      setHasSelection(
-        Boolean(
-          selection && currentModel && selectedSourceText(currentModel, selection).length > 0,
-        ),
-      );
-      schedulePaint();
-    },
-    [schedulePaint],
-  );
+  const setSelection = useStableEvent((selection: DiffSelection | null) => {
+    selectionRef.current = selection;
+    const currentModel = modelRef.current;
+    setHasSelection(
+      Boolean(selection && currentModel && selectedSourceText(currentModel, selection).length > 0),
+    );
+    schedulePaint();
+  });
+  // Source and code-layout changes invalidate selection coordinates. A new
+  // repaint callback (header typography, palette, viewport height) does not.
   useEffect(() => {
     dragRef.current = null;
     setSelection(null);
-  }, [props.collapsedFilePaths, props.displayPreferences.layout, props.files, setSelection]);
+  }, [
+    props.collapsedFilePaths,
+    props.displayPreferences.layout,
+    props.files,
+    desiredTypography,
+    setSelection,
+  ]);
   const pointerDown = useCallback(
     (event: React.PointerEvent<HTMLDivElement>) => {
       if (event.button !== 0) return;
@@ -768,9 +772,13 @@ export function DiffSurface(props: DiffSurfaceProps) {
     () => ({ ...ROOT_STYLE, background: props.palette.surface }),
     [props.palette.surface],
   );
+  const contentInsetBottom = props.contentInsetBottom ?? 0;
   const contentStyle = useMemo<React.CSSProperties>(
-    () => ({ ...CONTENT_STYLE, height: Math.max(model.height, viewport.height) }),
-    [model.height, viewport.height],
+    () => ({
+      ...CONTENT_STYLE,
+      height: Math.max(model.height, viewport.height) + contentInsetBottom,
+    }),
+    [contentInsetBottom, model.height, viewport.height],
   );
   const affordanceStyle = useMemo<ViewStyle>(
     () => ({
diff --git a/packages/app/src/git/diff-document/text-measurement.test.ts b/packages/app/src/git/diff-document/text-measurement.test.ts
index 476ef3e45d..414054e76c 100644
--- a/packages/app/src/git/diff-document/text-measurement.test.ts
+++ b/packages/app/src/git/diff-document/text-measurement.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   createCachedAsciiTextMetrics,
+  createChunkedWidthMeasurer,
   createFallbackAwareTextMeasurer,
   createMeasuredAdvances,
   requiresShaping,
@@ -55,6 +56,8 @@ describe("cached ASCII text metrics", () => {
 
     expect(metrics.measureAdvances(["a", "b", "a"])).toEqual([10, 20, 30]);
     expect(metrics.measureAdvances(["b", "a"])).toEqual([10, 20]);
+    expect(metrics.measure("abba")).toBe(40);
+    expect(metrics.measureWidth(["a", "b", "b", "a"])).toBe(40);
     expect(measured).toEqual(["a", "b"]);
   });
 
@@ -104,6 +107,27 @@ describe("chunked advance measurement", () => {
     return Array.from(text, (_, index) => shapingMeasure(text.slice(0, index + 1)));
   }
 
+  it.each([
+    "",
+    "a => b   ",
+    `${"a".repeat(63)}=>${"b".repeat(70)}`,
+    "=>".repeat(100),
+    "中文 é 👩‍💻 مرحبا".repeat(10),
+  ])("keeps width-only measurement equal to the last shaped advance: %s", (text) => {
+    const graphemes = Array.from(text);
+    const width = createChunkedWidthMeasurer((chunk) => shapingMeasure(chunk.join("")));
+    expect(width(graphemes)).toBe(createMeasuredAdvances(shapingMeasure)(graphemes).at(-1) ?? 0);
+  });
+
+  it("keeps expanded tabs on the same additive width path", () => {
+    const metrics = createCachedAsciiTextMetrics({
+      glyphIds: (text) => Array.from(text, () => 1),
+      measure: (text) => text.length * 3.7,
+    });
+    const graphemes = ["a", "   ", "b", "    "];
+    expect(metrics.measureWidth(graphemes)).toBe(metrics.measureAdvances(graphemes).at(-1));
+  });
+
   it("measures short runs in one shaping context", () => {
     expect(advancesOf("a => b")).toEqual(expected("a => b"));
   });
diff --git a/packages/app/src/git/diff-document/text-measurement.ts b/packages/app/src/git/diff-document/text-measurement.ts
index 92b245ad73..905a8915d1 100644
--- a/packages/app/src/git/diff-document/text-measurement.ts
+++ b/packages/app/src/git/diff-document/text-measurement.ts
@@ -6,8 +6,11 @@ export interface PrimaryTextFace {
 }
 
 export interface CachedAsciiTextMetrics {
+  /** Whole-line width after checking glyph coverage and excluding shaping. */
+  measure(text: string): number;
   hasEveryGlyph(text: string): boolean;
   measureAdvances(graphemes: readonly string[]): number[];
+  measureWidth(graphemes: readonly string[]): number;
 }
 
 const CODE_LIGATURE_CANDIDATE = /(?:===?|!==?|=>|<=|>=|->|::|\+\+|--)/;
@@ -66,6 +69,22 @@ export function createChunkedAdvanceMeasurer(
   };
 }
 
+/** Preserve advance chunk boundaries when only the final width is needed. */
+export function createChunkedWidthMeasurer(
+  measure: (graphemes: readonly string[]) => number,
+): (graphemes: readonly string[]) => number {
+  return (graphemes) => {
+    let width = 0;
+    let start = 0;
+    while (start < graphemes.length) {
+      const end = chunkEnd(graphemes, start);
+      width += measure(graphemes.slice(start, end));
+      start = end;
+    }
+    return width;
+  };
+}
+
 /**
  * Advance measurement for a backend that can only measure a whole string, which
  * is every backend except a native paragraph shaper.
@@ -97,24 +116,39 @@ export function advancesFor(measurer: TextMeasurer): (graphemes: readonly string
 export function createAdditiveAdvances(
   measure: (text: string) => number,
 ): (graphemes: readonly string[]) => number[] {
+  return additiveAdvances(cachedWidths(measure));
+}
+
+function cachedWidths(measure: (text: string) => number): (text: string) => number {
   const widths = new Map<string, number>();
+  return (text) => {
+    let width = widths.get(text);
+    if (width === undefined) {
+      width = measure(text);
+      widths.set(text, width);
+    }
+    return width;
+  };
+}
+
+function additiveAdvances(
+  measure: (text: string) => number,
+): (graphemes: readonly string[]) => number[] {
   return (graphemes) => {
     let advance = 0;
-    return graphemes.map((grapheme) => {
-      let width = widths.get(grapheme);
-      if (width === undefined) {
-        width = measure(grapheme);
-        widths.set(grapheme, width);
-      }
-      advance += width;
-      return advance;
-    });
+    return graphemes.map((grapheme) => (advance += measure(grapheme)));
   };
 }
 
 export function createCachedAsciiTextMetrics(primary: PrimaryTextFace): CachedAsciiTextMetrics {
   const glyphCoverage = new Map<string, boolean>();
+  const measure = cachedWidths((text) => primary.measure(text));
   return {
+    measure(text) {
+      let width = 0;
+      for (const character of text) width += measure(character);
+      return width;
+    },
     hasEveryGlyph(text) {
       for (const character of text) {
         let hasGlyph = glyphCoverage.get(character);
@@ -126,7 +160,12 @@ export function createCachedAsciiTextMetrics(primary: PrimaryTextFace): CachedAs
       }
       return true;
     },
-    measureAdvances: createAdditiveAdvances((text) => primary.measure(text)),
+    measureAdvances: additiveAdvances(measure),
+    measureWidth(graphemes) {
+      let width = 0;
+      for (const grapheme of graphemes) width += measure(grapheme);
+      return width;
+    },
   };
 }
 
diff --git a/packages/app/src/git/diff-document/text.native.ts b/packages/app/src/git/diff-document/text.native.ts
index 2f0252b384..c482bed1a2 100644
--- a/packages/app/src/git/diff-document/text.native.ts
+++ b/packages/app/src/git/diff-document/text.native.ts
@@ -5,12 +5,12 @@ import {
   type SkFont,
   type SkParagraph,
 } from "@shopify/react-native-skia";
-import { fragmentTextForRange } from "./model";
+import { fragmentTextForRange, visibleRowRange } from "./model";
 import { codeTextColor } from "./palette";
 import {
   createCachedAsciiTextMetrics,
   createChunkedAdvanceMeasurer,
-  createFallbackAwareTextMeasurer,
+  createChunkedWidthMeasurer,
   requiresShaping,
   type CachedAsciiTextMetrics,
 } from "./text-measurement";
@@ -86,7 +86,8 @@ export function shapeNativeHeaderText(input: {
 export interface NativeTextLayoutStore {
   font: SkFont;
   asciiMetrics: CachedAsciiTextMetrics;
-  paragraphsByCell: WeakMap<DiffCell, Array<SkParagraph | null>>;
+  paragraphsByCell: Map<DiffCell, Array<SkParagraph | null>>;
+  textStyles: Map<string, ReturnType<typeof textStyle>>;
   ownedParagraphs: Set<SkParagraph>;
   families: string[];
   fontSize: number;
@@ -97,6 +98,8 @@ export interface NativeTextLayoutStore {
 export function disposeNativeTextLayout(layout: NativeTextLayoutStore): void {
   for (const paragraph of layout.ownedParagraphs) paragraph.dispose();
   layout.ownedParagraphs.clear();
+  layout.paragraphsByCell.clear();
+  layout.textStyles.clear();
   layout.font.dispose();
 }
 
@@ -114,7 +117,8 @@ export function createNativeTextLayoutStore(input: {
       glyphIds: (text) => font.getGlyphIDs(text),
       measure: (text) => font.getTextWidth(text),
     }),
-    paragraphsByCell: new WeakMap(),
+    paragraphsByCell: new Map(),
+    textStyles: new Map(),
     ownedParagraphs: new Set(),
     families,
     fontSize: input.fontSize,
@@ -126,30 +130,64 @@ export function createNativeTextLayoutStore(input: {
 export function prepareNativeTextLayout(
   store: NativeTextLayoutStore,
   model: DiffDocumentModel,
+  window?: { top: number; height: number },
 ): NativeTextLayout {
-  const paragraphs = model.rows.map((row) => {
-    if (row.kind !== "line") return [];
-    return row.cells.map((cell) => {
+  const range = window
+    ? visibleRowRange(model.rows, window.top, window.height)
+    : { start: 0, end: model.rows.length };
+  const retainedCells = new Set<DiffCell>();
+  const retainedParagraphs = new Set<SkParagraph>();
+  const paragraphs: NativeTextLayout["paragraphs"] = [];
+  paragraphs.length = model.rows.length;
+  for (let index = range.start; index < range.end; index++) {
+    const row = model.rows[index]!;
+    if (row.kind !== "line") continue;
+    paragraphs[index] = row.cells.map((cell) => {
       if (!cell) return [];
+      retainedCells.add(cell);
       const cached = store.paragraphsByCell.get(cell);
-      if (cached) return cached;
-      const cellParagraphs = cell.fragments.map((fragment) => {
-        if (!requiresRetainedParagraph(fragment.text, store.asciiMetrics)) return null;
-        const paragraph = createFragmentParagraph({
-          cell,
-          fragment,
-          families: store.families,
-          fontSize: store.fontSize,
-          lineHeight: store.lineHeight,
-          palette: store.palette,
-        });
+      const start = window ? Math.max(0, Math.floor((window.top - row.top) / model.lineHeight)) : 0;
+      const end = window
+        ? Math.min(
+            cell.fragments.length,
+            Math.ceil((window.top + window.height - row.top) / model.lineHeight),
+          )
+        : cell.fragments.length;
+      const cellParagraphs: Array<SkParagraph | null> = [];
+      cellParagraphs.length = cell.fragments.length;
+      for (let fragmentIndex = start; fragmentIndex < end; fragmentIndex++) {
+        const fragment = cell.fragments[fragmentIndex]!;
+        if (!requiresRetainedParagraph(fragment.text, store.asciiMetrics)) {
+          cellParagraphs[fragmentIndex] = null;
+          continue;
+        }
+        const paragraph =
+          cached?.[fragmentIndex] ??
+          createFragmentParagraph({
+            cell,
+            fragment,
+            families: store.families,
+            fontSize: store.fontSize,
+            lineHeight: store.lineHeight,
+            palette: store.palette,
+            textStyles: store.textStyles,
+          });
         store.ownedParagraphs.add(paragraph);
-        return paragraph;
-      });
+        retainedParagraphs.add(paragraph);
+        cellParagraphs[fragmentIndex] = paragraph;
+      }
       store.paragraphsByCell.set(cell, cellParagraphs);
       return cellParagraphs;
     });
-  });
+  }
+  for (const paragraph of store.ownedParagraphs) {
+    if (retainedParagraphs.has(paragraph)) continue;
+    paragraph.dispose();
+    store.ownedParagraphs.delete(paragraph);
+  }
+  for (const cell of store.paragraphsByCell.keys()) {
+    if (!retainedCells.has(cell)) store.paragraphsByCell.delete(cell);
+  }
   return { font: store.font, paragraphs };
 }
 
@@ -164,42 +202,41 @@ export function createNativeTextMeasurer(input: {
     measure: (text: string) => font.getTextWidth(text),
   };
   const asciiMetrics = createCachedAsciiTextMetrics(primary);
-  const fallbackAware = createFallbackAwareTextMeasurer({
-    primary,
-    measureWithSystemFallback(text) {
-      const paragraph = createParagraph({
-        text,
-        families,
-        fontSize: input.fontSize,
-        lineHeight: Math.round(input.fontSize * 1.5),
-        color: Skia.Color("black"),
-      });
+  const black = Skia.Color("black");
+  const shapeParagraph = (text: string) =>
+    createParagraph({
+      text,
+      families,
+      fontSize: input.fontSize,
+      lineHeight: Math.round(input.fontSize * 1.5),
+      color: black,
+    });
+  return {
+    measure(text) {
+      if (!requiresRetainedParagraph(text, asciiMetrics)) return asciiMetrics.measure(text);
+      const paragraph = shapeParagraph(text);
       const width = paragraph.getLongestLine();
       paragraph.dispose();
       return width;
     },
-  });
-  return {
-    ...fallbackAware,
+    measureWidth: createChunkedWidthMeasurer((graphemes) => {
+      const text = graphemes.join("");
+      if (!requiresRetainedParagraph(text, asciiMetrics))
+        return asciiMetrics.measureWidth(graphemes);
+      const paragraph = shapeParagraph(text);
+      const width = paragraphAdvance(paragraph, text.length);
+      paragraph.dispose();
+      return width;
+    }),
     measureAdvances: createChunkedAdvanceMeasurer({
       requiresShaping: (text) => requiresRetainedParagraph(text, asciiMetrics),
       measureAdditive: (graphemes) => asciiMetrics.measureAdvances(graphemes),
       measureShaped(graphemes) {
-        const paragraph = createParagraph({
-          text: graphemes.join(""),
-          families,
-          fontSize: input.fontSize,
-          lineHeight: Math.round(input.fontSize * 1.5),
-          color: Skia.Color("black"),
-        });
+        const paragraph = shapeParagraph(graphemes.join(""));
         let end = 0;
         const advances = graphemes.map((grapheme) => {
           end += grapheme.length;
-          const rectangles = paragraph.getRectsForRange(0, end);
-          return rectangles.reduce(
-            (right, rectangle) => Math.max(right, rectangle.x + rectangle.width),
-            0,
-          );
+          return paragraphAdvance(paragraph, end);
         });
         paragraph.dispose();
         return advances;
@@ -208,6 +245,12 @@ export function createNativeTextMeasurer(input: {
   };
 }
 
+function paragraphAdvance(paragraph: SkParagraph, end: number): number {
+  return paragraph
+    .getRectsForRange(0, end)
+    .reduce((right, rectangle) => Math.max(right, rectangle.x + rectangle.width), 0);
+}
+
 function requiresRetainedParagraph(text: string, asciiMetrics: CachedAsciiTextMetrics): boolean {
   return requiresShaping(text) || !asciiMetrics.hasEveryGlyph(text);
 }
@@ -219,23 +262,21 @@ function createFragmentParagraph(input: {
   fontSize: number;
   lineHeight: number;
   palette: DiffPalette;
+  textStyles: NativeTextLayoutStore["textStyles"];
 }): SkParagraph {
   const builder = Skia.ParagraphBuilder.Make(
     paragraphStyle(input.families, input.fontSize, input.lineHeight),
   );
   if (input.cell.tokens.length === 0 || input.cell.type === "header") {
     const color = codeTextColor(input.cell, input.palette);
-    builder
-      .pushStyle(textStyle(input.families, input.fontSize, color))
-      .addText(input.fragment.text)
-      .pop();
+    builder.pushStyle(retainedTextStyle(input, color)).addText(input.fragment.text).pop();
   } else {
     for (const run of input.cell.tokens) {
       const start = Math.max(input.fragment.start, run.start);
       const end = Math.min(input.fragment.end, run.end);
       if (end <= start) continue;
       builder
-        .pushStyle(textStyle(input.families, input.fontSize, run.color))
+        .pushStyle(retainedTextStyle(input, run.color))
         .addText(fragmentTextForRange(input.fragment, start, end))
         .pop();
     }
@@ -281,6 +322,18 @@ function paragraphStyle(families: string[], fontSize: number, lineHeight: number
   };
 }
 
+function retainedTextStyle(
+  input: { families: string[]; fontSize: number; textStyles: NativeTextLayoutStore["textStyles"] },
+  color: string,
+) {
+  let style = input.textStyles.get(color);
+  if (!style) {
+    style = textStyle(input.families, input.fontSize, color);
+    input.textStyles.set(color, style);
+  }
+  return style;
+}
+
 function textStyle(families: string[], fontSize: number, color: string) {
   return { fontFamilies: families, fontSize, color: Skia.Color(color) };
 }
diff --git a/packages/app/src/git/diff-document/types.ts b/packages/app/src/git/diff-document/types.ts
index c307628d0c..4ac8125445 100644
--- a/packages/app/src/git/diff-document/types.ts
+++ b/packages/app/src/git/diff-document/types.ts
@@ -4,6 +4,8 @@ import type { ReviewableDiffTarget } from "@/utils/diff-layout";
 
 interface DiffDocumentBaseProps {
   files: ParsedDiffFile[];
+  /** Scrollable space kept below the last line so a floating control never traps content. */
+  contentInsetBottom?: number;
   displayPreferences: {
     layout: "unified" | "split";
     wrapLines: boolean;
@@ -167,6 +169,8 @@ export interface DiffDocumentModel {
 export interface TextMeasurer {
   measure(text: string, weight?: "regular" | "semibold"): number;
   measureAdvances?(graphemes: readonly string[]): number[];
+  /** Same width as the last cumulative advance, without computing every position. */
+  measureWidth?(graphemes: readonly string[]): number;
 }
 
 export interface BuildDiffDocumentModelInput {
diff --git a/packages/app/src/git/diff-document/workspace-cache.test.ts b/packages/app/src/git/diff-document/workspace-cache.test.ts
index 4a27cc3d44..ddf9972a46 100644
--- a/packages/app/src/git/diff-document/workspace-cache.test.ts
+++ b/packages/app/src/git/diff-document/workspace-cache.test.ts
@@ -78,6 +78,40 @@ function modelInput(
 }
 
 describe("diff document workspace cache", () => {
+  it("keeps text prepared in each visited window of the same file", () => {
+    const cache = createDiffDocumentWorkspaceCache();
+    const source = diffFile();
+    source.hunks[0]!.lines = Array.from({ length: 100 }, (_, index) => ({
+      type: "add",
+      content: `const value${index} = ${index};`,
+    }));
+    const { measureText, stats } = countingMeasurer();
+    const input = modelInput([source], measureText);
+    for (const top of [30, 300, 600]) {
+      cache.buildModel({ ...input, materializationWindow: { top, height: 54 } });
+    }
+    stats.calls = 0;
+    cache.buildModel({ ...input, materializationWindow: { top: 300, height: 54 } });
+    expect(stats.calls).toBe(0);
+  });
+
+  it("retains text cells for unchanged files when another file changes", () => {
+    const cache = createDiffDocumentWorkspaceCache();
+    const { measureText } = countingMeasurer();
+    const files = [diffFile(), { ...diffFile(), path: "b.ts" }];
+    const first = cache.buildModel(modelInput(files, measureText));
+    const replacement = structuredClone(files[0]!);
+    replacement.hunks[0]!.lines[0]!.content = "changed text";
+    const next = cache.buildModel(modelInput([replacement, files[1]!], measureText));
+    const oldRow = first.rows[first.files[1]!.rowStart]!;
+    const nextRow = next.rows[next.files[1]!.rowStart]!;
+    expect(oldRow.kind).toBe("line");
+    expect(nextRow.kind).toBe("line");
+    if (oldRow.kind !== "line" || nextRow.kind !== "line") throw new Error("Missing file text");
+    expect(nextRow.cells).toBe(oldRow.cells);
+    expect(next.files[0]!.file).toBe(replacement);
+  });
+
   it("reuses measured rows until a model-building input changes", () => {
     const cache = createDiffDocumentWorkspaceCache();
     const files = [diffFile()];
@@ -115,7 +149,7 @@ describe("diff document workspace cache", () => {
 
     stats.calls = 0;
     cache.buildModel({ ...input, files: [...files] });
-    expect(stats.calls).toBeGreaterThan(0);
+    expect(stats.calls).toBe(0);
   });
 
   it("bounds retained geometry variants for one diff payload", () => {
@@ -152,7 +186,7 @@ describe("diff document workspace cache", () => {
     const files = [diffFile(), { ...diffFile(), path: "src/b.ts" }];
     const { measureText, stats } = countingMeasurer();
     const first = cache.buildModel(
-      modelInput(files, measureText, { materializationWindow: { top: 0, height: 20 } }),
+      modelInput(files, measureText, { materializationWindow: { top: 30, height: 20 } }),
     );
     const firstCalls = stats.calls;
     const secondFile = first.files[1]!;
diff --git a/packages/app/src/git/diff-document/workspace-cache.tsx b/packages/app/src/git/diff-document/workspace-cache.tsx
index 270c7392ca..bd52000af3 100644
--- a/packages/app/src/git/diff-document/workspace-cache.tsx
+++ b/packages/app/src/git/diff-document/workspace-cache.tsx
@@ -13,6 +13,7 @@ const MAX_MODEL_VARIANTS = 4;
 const MAX_TYPOGRAPHY_RESOURCES = 4;
 
 interface ModelVariant {
+  measureText: TextMeasurer;
   key: string;
   exactKey: string;
   model: DiffDocumentModel;
@@ -38,23 +39,29 @@ export interface DiffDocumentWorkspaceCache {
 }
 
 export function createDiffDocumentWorkspaceCache(): DiffDocumentWorkspaceCache {
-  const variantsByFiles = new WeakMap<BuildDiffDocumentModelInput["files"], ModelVariant[]>();
+  let variants: ModelVariant[] = [];
   const typographyResources = new Map<string, DiffTypographyResource>();
 
   return {
     buildModel(input) {
       const key = modelVariantKey(input);
       const exactKey = exactModelKey(input);
-      const variants = variantsByFiles.get(input.files) ?? [];
-      const variantIndex = variants.findIndex((candidate) => candidate.key === key);
+      const variantIndex = variants.findIndex(
+        (candidate) => candidate.key === key && candidate.measureText === input.measureText,
+      );
       const variant = variantIndex === -1 ? undefined : variants[variantIndex];
-      if (variant?.exactKey === exactKey) {
+      if (
+        variant?.exactKey === exactKey &&
+        variant.model.files.length === input.files.length &&
+        variant.model.files.every((file, index) => file.file === input.files[index])
+      ) {
         variants.splice(variantIndex, 1);
         variants.unshift(variant);
         return variant.model;
       }
       const model = buildDiffDocumentModel({ ...input, reuseFrom: variant?.models });
       const nextVariant = {
+        measureText: input.measureText,
         key,
         exactKey,
         model,
@@ -62,7 +69,7 @@ export function createDiffDocumentWorkspaceCache(): DiffDocumentWorkspaceCache {
       };
       if (variantIndex !== -1) variants.splice(variantIndex, 1);
       variants.unshift(nextVariant);
-      variantsByFiles.set(input.files, variants.slice(0, MAX_MODEL_VARIANTS));
+      variants = variants.slice(0, MAX_MODEL_VARIANTS);
       return model;
     },
     typography(input) {
diff --git a/packages/app/src/git/diff-pane.tsx b/packages/app/src/git/diff-pane.tsx
index b934d56b25..6bafd3eee3 100644
--- a/packages/app/src/git/diff-pane.tsx
+++ b/packages/app/src/git/diff-pane.tsx
@@ -1,3 +1,5 @@
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { floatingActionsClearance } from "@/components/ui/floating-action-button";
 import { useState, useCallback, useMemo, type ReactElement, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
@@ -8,7 +10,6 @@ import {
   View,
   Text,
   Pressable,
-  FlatList,
   type PressableStateCallbackType,
   type StyleProp,
   type ViewStyle,
@@ -32,16 +33,10 @@ import {
 import { type ParsedDiffFile } from "@/git/use-diff-query";
 import type { ChangesState } from "@/panels/changes/state";
 import { defaultChangesState } from "@/panels/changes/state";
+import { ReviewCommentSheet, ReviewFeedbackAction } from "@/review";
 import { DiffDocument, type WorkingDiffMode } from "@/git/diff-document";
-import { FileHeader } from "@/git/file-header";
-import {
-  buildDiffTree,
-  collectDirPaths,
-  compressSingleChildChains,
-  flattenDiffTree,
-  type DiffTreeRow,
-} from "@/git/diff-tree";
-import { DiffFolderRow } from "@/git/diff-folder-row";
+import { ChangedFilesTree } from "@/git/changed-files-tree";
+import { JUMP_TO_FILE_CLEARANCE, JumpToFile } from "@/git/jump-to-file";
 import {
   selectPrHintFromStatus,
   type PrHint,
@@ -81,6 +76,7 @@ import {
   paneContentToolbarIconSize,
   paneContentToolbarIconButtonStyle,
   paneContentToolbarTrailingPadding,
+  type ToolbarTrailingControl,
   ToolbarButton,
   ToolbarControls,
 } from "@/components/ui/pane-content-toolbar";
@@ -568,7 +564,12 @@ function ChangesDiffOnlyToolbar({
   sidebarSurface: boolean;
 }) {
   return (
-    <ChangesToolbarRow compact={compact} sidebarSurface={sidebarSurface} testID="changes-header">
+    <ChangesToolbarRow
+      compact={compact}
+      sidebarSurface={sidebarSurface}
+      testID="changes-header"
+      trailing="glyph"
+    >
       <ChangesToolbarLeading />
       <ChangesToolbarTrailing>
         <ChangesToolbarActions mode={mode} compact={compact} />
@@ -582,19 +583,22 @@ function ChangesToolbarRow({
   compact,
   sidebarSurface,
   testID,
+  trailing,
 }: {
   children: ReactNode;
   compact: boolean;
   sidebarSurface: boolean;
   testID: string;
+  /** What the row's last control paints, so it can pad to the shared trailing rail. */
+  trailing: ToolbarTrailingControl;
 }) {
   const toolbarStyle = useMemo(
     () => [
       styles.changesToolbar,
-      { paddingRight: paneContentToolbarTrailingPadding(compact) },
+      { paddingRight: paneContentToolbarTrailingPadding(compact, trailing) },
       sidebarSurface ? styles.changesToolbarSidebar : null,
     ],
-    [compact, sidebarSurface],
+    [compact, sidebarSurface, trailing],
   );
   return (
     <PaneContentToolbar style={toolbarStyle} testID={testID}>
@@ -625,6 +629,7 @@ function ChangesRepositoryToolbar({
       compact={compact}
       sidebarSurface={sidebarSurface}
       testID="changes-repository-header"
+      trailing={model.gitActions ? "framed" : "glyph"}
     >
       <ChangesToolbarLeading>
         <BranchSwitcher
@@ -720,7 +725,12 @@ function ChangesComparisonToolbar({
   sidebarSurface: boolean;
 }) {
   return (
-    <ChangesToolbarRow compact={compact} sidebarSurface={sidebarSurface} testID="changes-header">
+    <ChangesToolbarRow
+      compact={compact}
+      sidebarSurface={sidebarSurface}
+      testID="changes-header"
+      trailing="glyph"
+    >
       <ChangesToolbarLeading>
         <DiffModeMenu
           diffMode={model.diffMode}
@@ -1034,25 +1044,6 @@ function ChangesDiffOptions({ options }: { options: ChangesToolbarDiffOptions })
 
 const ThemedRotateCw = withUnistyles(RotateCw);
 
-function computeEmptyMessage(
-  hideWhitespace: boolean,
-  diffMode: "uncommitted" | "base",
-  baseRefLabel: string,
-  labels: {
-    hiddenWhitespace: string;
-    uncommitted: string;
-    againstBase: (baseRefLabel: string) => string;
-  },
-): string {
-  if (hideWhitespace) {
-    return labels.hiddenWhitespace;
-  }
-  if (diffMode === "uncommitted") {
-    return labels.uncommitted;
-  }
-  return labels.againstBase(baseRefLabel);
-}
-
 interface DiffBodyContentProps {
   isStatusLoading: boolean;
   statusErrorMessage: string | null;
@@ -1258,134 +1249,23 @@ function buildToggleButtonStyle(
   return (state) => [baseStyles, paneContentToolbarIconButtonStyle(state, selected, isMobile)];
 }
 
-function ChangedFilesTree({
-  files,
-  mode,
-  onSelectFile,
-  collapsedFolderPaths,
-  onCollapsedFolderPathsChange,
-}: {
-  files: ParsedDiffFile[];
-  mode: WorkingDiffMode;
-  onSelectFile: (path: string) => void;
-  collapsedFolderPaths: string[];
-  onCollapsedFolderPathsChange: (paths: string[]) => void;
-}) {
-  const [selectedPath, setSelectedPath] = useState<string | null>(null);
-  const compressedTree = useMemo(() => compressSingleChildChains(buildDiffTree(files)), [files]);
-  const allFolderPaths = useMemo(() => collectDirPaths(compressedTree), [compressedTree]);
-  const collapsedFolders = useMemo(() => new Set(collapsedFolderPaths), [collapsedFolderPaths]);
-  const items = useMemo(
-    () => flattenDiffTree(compressedTree, collapsedFolders),
-    [collapsedFolders, compressedTree],
-  );
-  const handleSelectPath = useCallback((path: string) => setSelectedPath(path), []);
-  const handleSelectFile = useCallback(
-    (path: string) => {
-      setSelectedPath(path);
-      onSelectFile(path);
-    },
-    [onSelectFile],
-  );
-  const handleToggleFolder = useCallback(
-    (dirPath: string) => {
-      const next = collapsedFolders.has(dirPath)
-        ? Array.from(collapsedFolders).filter((path) => path !== dirPath)
-        : [...collapsedFolders, dirPath];
-      onCollapsedFolderPathsChange(next);
-    },
-    [collapsedFolders, onCollapsedFolderPathsChange],
-  );
-  const handleCollapseFolder = useCallback(
-    (dirPath: string) => {
-      const prefix = `${dirPath}/`;
-      onCollapsedFolderPathsChange([
-        ...new Set([
-          ...collapsedFolders,
-          ...allFolderPaths.filter(
-            (folderPath) => folderPath === dirPath || folderPath.startsWith(prefix),
-          ),
-        ]),
-      ]);
-    },
-    [allFolderPaths, collapsedFolders, onCollapsedFolderPathsChange],
-  );
-  const renderItem = useCallback(
-    ({ item }: { item: DiffTreeRow }) => {
-      if (item.kind === "folder") {
-        return (
-          <DiffFolderRow
-            dirPath={item.dirPath}
-            displayName={item.displayName}
-            depth={item.depth}
-            collapsed={collapsedFolders.has(item.dirPath)}
-            isSelected={selectedPath === item.dirPath}
-            additions={item.additions}
-            deletions={item.deletions}
-            onToggle={handleToggleFolder}
-            onCollapse={handleCollapseFolder}
-            onSelect={handleSelectPath}
-            onCopyPath={mode.onCopyPath}
-            onCopyRelativePath={mode.onCopyRelativePath}
-            onReveal={mode.onReveal}
-            revealTargetName={mode.revealTargetName}
-            onDuplicate={mode.onDuplicate}
-            onRevert={mode.onRevert}
-            testID={`diff-folder-${item.dirPath}`}
-          />
-        );
-      }
-      return (
-        <FileHeader
-          file={item.file}
-          workspaceFileDragScope={mode.workspaceFileDragScope}
-          bodyVisible={false}
-          showsBodyState={false}
-          isSelected={selectedPath === item.file.path}
-          depth={item.depth}
-          showDir={false}
-          onActivate={handleSelectFile}
-          onSelect={handleSelectPath}
-          onOpenFile={mode.onOpenFile}
-          onOpenToSide={mode.onOpenToSide}
-          onAddToChat={mode.onAddToChat}
-          onCopyPath={mode.onCopyPath}
-          onCopyRelativePath={mode.onCopyRelativePath}
-          onReveal={mode.onReveal}
-          revealTargetName={mode.revealTargetName}
-          onDownload={mode.onDownload}
-          onDuplicate={mode.onDuplicate}
-          onRevert={mode.onRevert}
-          testID={`diff-tree-file-${item.fileIndex}`}
-        />
-      );
-    },
-    [
-      handleCollapseFolder,
-      handleSelectFile,
-      handleSelectPath,
-      handleToggleFolder,
-      collapsedFolders,
-      mode,
-      selectedPath,
-    ],
-  );
-  const keyExtractor = useCallback(
-    (item: DiffTreeRow) =>
-      item.kind === "folder" ? `folder-${item.dirPath}` : `file-${item.file.path}`,
-    [],
-  );
+interface JumpToFileVisibility {
+  isCompact: boolean;
+  presentation: ChangesPresentation;
+  hasChanges: boolean;
+  isDiffLoading: boolean;
+}
 
-  return (
-    <FlatList
-      data={items}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
-      style={styles.scrollView}
-      contentContainerStyle={styles.contentContainer}
-      testID="changes-file-tree"
-    />
-  );
+/**
+ * The room the floating Jump to file action needs over the diff, and zero where
+ * it is not offered. Compact users never see the tree rail, so the diff is their
+ * only view of what changed; the tree and diff presentations are already halves
+ * of a desktop split.
+ */
+function jumpToFileClearance(visibility: JumpToFileVisibility): number {
+  if (!visibility.isCompact || visibility.presentation !== "combined") return 0;
+  if (!visibility.hasChanges || visibility.isDiffLoading) return 0;
+  return JUMP_TO_FILE_CLEARANCE;
 }
 
 function ChangesTreeRail({
@@ -1671,7 +1551,9 @@ export function ChangesSurface({
     isDiffLoading,
     reviewActions,
     reviewAttachment,
+    reviewFeedback,
   } = useWorkingDiff({
+    presentation,
     serverId,
     workspaceId: workspaceId ?? undefined,
     cwd,
@@ -1852,7 +1734,15 @@ export function ChangesSurface({
     ],
   );
 
+  const { bottom: bottomInset } = useSafeAreaInsets();
   const hasChanges = files.length > 0;
+  const jumpToFileInset = jumpToFileClearance({
+    isCompact: isMobile,
+    presentation,
+    hasChanges,
+    isDiffLoading,
+  });
+  const showJumpToFile = jumpToFileInset > 0;
   const selectedDiffStat = useMemo(
     () => computeSelectedDiffStat(files, isDiffLoading),
     [files, isDiffLoading],
@@ -1882,11 +1772,7 @@ export function ChangesSurface({
     () => computeCommittedDiffDescription(branchLabel, baseRefLabel),
     [baseRefLabel, branchLabel],
   );
-  const emptyMessage = computeEmptyMessage(preferences.hideWhitespace, diffMode, baseRefLabel, {
-    hiddenWhitespace: t("workspace.git.diff.emptyHiddenWhitespace"),
-    uncommitted: t("workspace.git.diff.emptyUncommitted"),
-    againstBase: (label) => t("workspace.git.diff.emptyAgainstBase", { baseRef: label }),
-  });
+  const emptyMessage = t("diffViewer.empty");
   const emptyAction = computeChangesEmptyAction({
     hideWhitespace: preferences.hideWhitespace,
     diffMode,
@@ -1898,26 +1784,41 @@ export function ChangesSurface({
   });
 
   const diffContent: ReactElement = (
-    <DiffBodyContent
-      isStatusLoading={isStatusLoading}
-      statusErrorMessage={statusErrorMessage}
-      notGit={notGit}
-      isDiffLoading={isDiffLoading}
-      diffErrorMessage={diffErrorMessage}
-      diffTooLarge={diffTooLarge}
-      hasChanges={hasChanges}
-      emptyMessage={emptyMessage}
-      emptyAction={emptyAction}
-      checkingRepositoryLabel={t("workspace.git.diff.checkingRepository")}
-      notRepositoryLabel={t("workspace.git.diff.notRepository")}
-    >
-      <DiffDocument
-        files={files}
-        collapseState={collapseState}
-        displayPreferences={sharedDisplayPreferences}
-        mode={workingMode}
+    <View style={styles.diffContainer}>
+      <DiffBodyContent
+        isStatusLoading={isStatusLoading}
+        statusErrorMessage={statusErrorMessage}
+        notGit={notGit}
+        isDiffLoading={isDiffLoading}
+        diffErrorMessage={diffErrorMessage}
+        diffTooLarge={diffTooLarge}
+        hasChanges={hasChanges}
+        emptyMessage={emptyMessage}
+        emptyAction={emptyAction}
+        checkingRepositoryLabel={t("workspace.git.diff.checkingRepository")}
+        notRepositoryLabel={t("workspace.git.diff.notRepository")}
+      >
+        <DiffDocument
+          files={files}
+          contentInsetBottom={floatingActionsClearance(
+            [jumpToFileInset, reviewFeedback.clearance],
+            bottomInset,
+          )}
+          collapseState={collapseState}
+          displayPreferences={sharedDisplayPreferences}
+          mode={workingMode}
+        />
+      </DiffBodyContent>
+      <ReviewFeedbackAction
+        bottomOffset={jumpToFileInset}
+        enabled={enabled}
+        hasDiff={presentation !== "tree"}
+        model={reviewFeedback.model}
+        state={reviewFeedback.state}
+        serverId={serverId}
+        workspaceId={workspaceId}
       />
-    </DiffBodyContent>
+    </View>
   );
   const bodyContent = (
     <ChangesBody
@@ -2046,7 +1947,19 @@ export function ChangesSurface({
 
       {prErrorMessage ? <Text style={styles.actionErrorText}>{prErrorMessage}</Text> : null}
 
-      <View style={styles.diffContainer}>{bodyContent}</View>
+      <View style={styles.diffContainer}>
+        {bodyContent}
+        {showJumpToFile ? (
+          <JumpToFile files={files} mode={workingMode} onSelectFile={handleSelectTreeFile} />
+        ) : null}
+      </View>
+
+      <ReviewCommentSheet
+        enabled={enabled}
+        editor={reviewActions.sheetEditor}
+        reviewActions={reviewActions}
+        onChangeBody={reviewActions.onChangeEditorBody}
+      />
 
       <ChangesCommits
         presentation={presentation}
@@ -2115,17 +2028,11 @@ const styles = StyleSheet.create((theme) => ({
     minHeight: 0,
     position: "relative",
   },
-  scrollView: {
-    flex: 1,
-  },
   scrollContainer: {
     flex: 1,
     minHeight: 0,
     position: "relative",
   },
-  contentContainer: {
-    paddingBottom: theme.spacing[8],
-  },
   loadingContainer: {
     flex: 1,
     alignItems: "center",
diff --git a/packages/app/src/git/diff-sharing.test.ts b/packages/app/src/git/diff-sharing.test.ts
new file mode 100644
index 0000000000..210c0f1a4b
--- /dev/null
+++ b/packages/app/src/git/diff-sharing.test.ts
@@ -0,0 +1,148 @@
+import type { ParsedDiffFile } from "@getpaseo/protocol/messages";
+import { describe, expect, it } from "vitest";
+import { retainDiffFiles, shareCheckoutDiff, shareCommitFileDiff } from "./diff-sharing";
+
+const file: ParsedDiffFile = {
+  path: "a.ts",
+  oldPath: "old-a.ts",
+  status: "ok",
+  isNew: false,
+  isDeleted: false,
+  additions: 1,
+  deletions: 1,
+  hunks: [
+    {
+      oldStart: 1,
+      oldCount: 1,
+      newStart: 1,
+      newCount: 1,
+      lines: [
+        {
+          type: "add",
+          content: "const a",
+          tokens: [
+            { text: "const", style: "keyword" },
+            { text: " a", style: null },
+          ],
+        },
+      ],
+    },
+  ],
+};
+
+// Exhaustive keys make a protocol-field addition require a sharing-policy test.
+const fileChanges = {
+  path: (value) => {
+    value.path = "b.ts";
+  },
+  oldPath: (value) => {
+    delete value.oldPath;
+  },
+  status: (value) => {
+    value.status = "binary";
+  },
+  isNew: (value) => {
+    value.isNew = true;
+  },
+  isDeleted: (value) => {
+    value.isDeleted = true;
+  },
+  additions: (value) => {
+    value.additions = 2;
+  },
+  deletions: (value) => {
+    value.deletions = 2;
+  },
+  hunks: (value) => {
+    value.hunks = [];
+  },
+} satisfies Record<keyof ParsedDiffFile, (value: ParsedDiffFile) => void>;
+type Hunk = ParsedDiffFile["hunks"][number];
+const hunkChanges = {
+  oldStart: (value) => {
+    value.oldStart = 2;
+  },
+  oldCount: (value) => {
+    value.oldCount = 2;
+  },
+  newStart: (value) => {
+    value.newStart = 2;
+  },
+  newCount: (value) => {
+    value.newCount = 2;
+  },
+  lines: (value) => {
+    value.lines = [];
+  },
+} satisfies Record<keyof Hunk, (value: Hunk) => void>;
+type Line = Hunk["lines"][number];
+const lineChanges = {
+  type: (value) => {
+    value.type = "remove";
+  },
+  content: (value) => {
+    value.content = "const b";
+  },
+  tokens: (value) => {
+    delete value.tokens;
+  },
+} satisfies Record<keyof Line, (value: Line) => void>;
+type Token = NonNullable<Line["tokens"]>[number];
+const tokenChanges = {
+  text: (value) => {
+    value.text = "class";
+  },
+  style: (value) => {
+    value.style = null;
+  },
+} satisfies Record<keyof Token, (value: Token) => void>;
+
+describe("diff sharing", () => {
+  it.each(Object.entries(fileChanges))("replaces a file when %s changes", (_, change) => {
+    const next = structuredClone(file);
+    change(next);
+    expect(retainDiffFiles([file], [next])[0]).toBe(next);
+  });
+  it.each(Object.entries(hunkChanges))("replaces a file when hunk %s changes", (_, change) => {
+    const next = structuredClone(file);
+    change(next.hunks[0]!);
+    expect(retainDiffFiles([file], [next])[0]).toBe(next);
+  });
+  it.each(Object.entries(lineChanges))("replaces a file when line %s changes", (_, change) => {
+    const next = structuredClone(file);
+    change(next.hunks[0]!.lines[0]!);
+    expect(retainDiffFiles([file], [next])[0]).toBe(next);
+  });
+  it.each(Object.entries(tokenChanges))("replaces a file when token %s changes", (_, change) => {
+    const next = structuredClone(file);
+    change(next.hunks[0]!.lines[0]!.tokens![0]!);
+    expect(retainDiffFiles([file], [next])[0]).toBe(next);
+  });
+  it("retains moved files and removes missing files", () => {
+    const second = { ...file, path: "b.ts" };
+    const reordered = retainDiffFiles([file, second], structuredClone([second, file]));
+    expect(reordered[0]).toBe(second);
+    expect(reordered[1]).toBe(file);
+    expect(retainDiffFiles(reordered, [structuredClone(file)])[0]).toBe(file);
+  });
+  it("updates response metadata without invalidating unchanged text", () => {
+    const previous = { cwd: "/repo", files: [file], error: null, requestId: "a" };
+    expect(shareCheckoutDiff(previous, structuredClone(previous))).toBe(previous);
+    const next = shareCheckoutDiff(previous, { ...structuredClone(previous), requestId: "b" });
+    expect(next.requestId).toBe("b");
+    expect(next.files).toBe(previous.files);
+    const rejected = {
+      ...previous,
+      files: [],
+      error: { code: "UNKNOWN", message: "Too large" },
+      diffTooLarge: true,
+    };
+    expect(shareCheckoutDiff(next, rejected)).toEqual(rejected);
+  });
+  it("preserves cached commit bodies and publishes null transitions", () => {
+    const previous = { file };
+    expect(shareCommitFileDiff(previous, structuredClone(previous))).toBe(previous);
+    expect(shareCommitFileDiff(previous, { file: null })).toEqual({ file: null });
+    expect(shareCommitFileDiff({ file: null }, previous)).toBe(previous);
+  });
+});
diff --git a/packages/app/src/git/diff-sharing.ts b/packages/app/src/git/diff-sharing.ts
new file mode 100644
index 0000000000..6bdac10ddf
--- /dev/null
+++ b/packages/app/src/git/diff-sharing.ts
@@ -0,0 +1,98 @@
+import { replaceEqualDeep } from "@tanstack/react-query";
+import type { ParsedDiffFile, SubscribeCheckoutDiffResponse } from "@getpaseo/protocol/messages";
+
+type DiffPayload = Omit<SubscribeCheckoutDiffResponse["payload"], "subscriptionId">;
+
+/** File identity owns text-model reuse. Never reconstruct the hunk/token graph. */
+export function retainDiffFiles(
+  previous: ParsedDiffFile[],
+  incoming: ParsedDiffFile[],
+): ParsedDiffFile[] {
+  if (previous === incoming) return previous;
+  const byPath = new Map(previous.map((file) => [file.path, file]));
+  let unchanged = previous.length === incoming.length;
+  const files = incoming.map((file, index) => {
+    const old = byPath.get(file.path);
+    const retained = old && equalFile(old, file) ? old : file;
+    unchanged &&= retained === previous[index];
+    return retained;
+  });
+  return unchanged ? previous : files;
+}
+
+export function shareCheckoutDiff(previous: unknown, incoming: unknown): DiffPayload {
+  const next = incoming as DiffPayload;
+  const old = previous as DiffPayload | undefined;
+  if (!old || old === next) return next;
+  const files = retainDiffFiles(old.files, next.files);
+  const error = replaceEqualDeep(old.error, next.error);
+  return files === old.files &&
+    error === old.error &&
+    old.cwd === next.cwd &&
+    old.requestId === next.requestId &&
+    old.diffTooLarge === next.diffTooLarge
+    ? old
+    : { ...next, files, error };
+}
+
+export function shareCommitFileDiff(
+  previous: unknown,
+  incoming: unknown,
+): { file: ParsedDiffFile | null } {
+  const next = incoming as { file: ParsedDiffFile | null };
+  const old = previous as typeof next | undefined;
+  return old &&
+    (old.file === next.file || (old.file && next.file && equalFile(old.file, next.file)))
+    ? old
+    : next;
+}
+
+function equalFile(left: ParsedDiffFile, right: ParsedDiffFile): boolean {
+  if (left === right) return true;
+  if (
+    left.path !== right.path ||
+    left.oldPath !== right.oldPath ||
+    left.status !== right.status ||
+    left.isNew !== right.isNew ||
+    left.isDeleted !== right.isDeleted ||
+    left.additions !== right.additions ||
+    left.deletions !== right.deletions ||
+    left.hunks.length !== right.hunks.length
+  )
+    return false;
+  for (let h = 0; h < left.hunks.length; h++) {
+    const a = left.hunks[h]!;
+    const b = right.hunks[h]!;
+    if (a === b) continue;
+    if (
+      a.oldStart !== b.oldStart ||
+      a.oldCount !== b.oldCount ||
+      a.newStart !== b.newStart ||
+      a.newCount !== b.newCount ||
+      a.lines.length !== b.lines.length
+    )
+      return false;
+    if (!equalLines(a.lines, b.lines)) return false;
+  }
+  return true;
+}
+
+function equalLines(
+  left: ParsedDiffFile["hunks"][number]["lines"],
+  right: ParsedDiffFile["hunks"][number]["lines"],
+): boolean {
+  for (let l = 0; l < left.length; l++) {
+    const x = left[l]!;
+    const y = right[l]!;
+    if (x === y) continue;
+    if (x.type !== y.type || x.content !== y.content) return false;
+    if (x.tokens === y.tokens) continue;
+    if (!x.tokens || !y.tokens || x.tokens.length !== y.tokens.length) return false;
+    for (let t = 0; t < x.tokens.length; t++) {
+      const p = x.tokens[t]!;
+      const q = y.tokens[t]!;
+      if (p.text !== q.text || p.style !== q.style) return false;
+    }
+  }
+  return true;
+}
diff --git a/packages/app/src/git/file-header.tsx b/packages/app/src/git/file-header.tsx
index 5c2f7f8fb5..d19d58cbf2 100644
--- a/packages/app/src/git/file-header.tsx
+++ b/packages/app/src/git/file-header.tsx
@@ -376,10 +376,10 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[1],
     minWidth: 0,
     zIndex: 2,
-    elevation: 2,
     userSelect: "none",
   },
   documentHeader: {
+    elevation: 2,
     height: 28,
     paddingLeft: 0,
     paddingRight: 0,
diff --git a/packages/app/src/git/jump-to-file/index.tsx b/packages/app/src/git/jump-to-file/index.tsx
new file mode 100644
index 0000000000..f3363b91ec
--- /dev/null
+++ b/packages/app/src/git/jump-to-file/index.tsx
@@ -0,0 +1,130 @@
+import { useCallback, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { FolderTree } from "lucide-react-native";
+import {
+  AdaptiveModalSheet,
+  SHEET_HEADER_CLOSE_PADDING_SCALE,
+  SHEET_HORIZONTAL_PADDING_SCALE,
+} from "@/components/adaptive-modal-sheet";
+import {
+  treeRowPaddingLeft,
+  WORKSPACE_PANE_TRAILING_GLYPH_RAIL,
+} from "@/components/tree-primitives";
+import {
+  FLOATING_ACTION_BUTTON_CLEARANCE,
+  FloatingActionButton,
+} from "@/components/ui/floating-action-button";
+import { ChangedFilesTree } from "@/git/changed-files-tree";
+import type { WorkingDiffMode } from "@/git/diff-document";
+import type { ParsedDiffFile } from "@/git/use-diff-query";
+import { ICON_SIZE, SPACING, type Theme } from "@/styles/theme";
+
+// The sheet header indents its leading glyph by the sheet's own content inset,
+// while a tree row indents itself by `treeRowPaddingLeft`. The body carries the
+// difference so a depth-0 file icon lands on the header glyph's rail.
+const TREE_LEADING_INSET = SPACING[SHEET_HORIZONTAL_PADDING_SCALE] - treeRowPaddingLeft(0);
+
+// The header's close glyph sits at the content inset plus the button's own
+// padding, while a tree row ends its trailing glyph at
+// `WORKSPACE_PANE_TRAILING_GLYPH_RAIL`. The body carries the difference so row
+// change icons land on the header X's rail.
+const TREE_TRAILING_INSET =
+  SPACING[SHEET_HORIZONTAL_PADDING_SCALE] +
+  SPACING[SHEET_HEADER_CLOSE_PADDING_SCALE] -
+  WORKSPACE_PANE_TRAILING_GLYPH_RAIL;
+
+const ThemedFolderTree = withUnistyles(FolderTree);
+
+const foregroundMutedIconColorMapping = (theme: Theme) => ({
+  color: theme.colors.foregroundMuted,
+});
+
+/** Scrollable space the diff keeps below its last line while the action is shown. */
+export const JUMP_TO_FILE_CLEARANCE = FLOATING_ACTION_BUTTON_CLEARANCE;
+
+export interface JumpToFileProps {
+  files: ParsedDiffFile[];
+  mode: WorkingDiffMode;
+  onSelectFile: (path: string) => void;
+}
+
+/** Compact overview of a loaded diff: a floating action that opens the changed-files tree. */
+export function JumpToFile({ files, mode, onSelectFile }: JumpToFileProps) {
+  const { t } = useTranslation();
+  const { bottom } = useSafeAreaInsets();
+  const [isOpen, setIsOpen] = useState(false);
+  // The sheet is a transient overview, so it always opens fully expanded and
+  // never writes to the panel's persisted folder state.
+  const [collapsedFolderPaths, setCollapsedFolderPaths] = useState<string[]>([]);
+  const title = t("workspace.git.diff.jumpToFile.title");
+  const header = useMemo(
+    () => ({
+      title,
+      leading: <ThemedFolderTree size={ICON_SIZE.md} uniProps={foregroundMutedIconColorMapping} />,
+    }),
+    [title],
+  );
+
+  const open = useCallback(() => {
+    setCollapsedFolderPaths([]);
+    setIsOpen(true);
+  }, []);
+  const close = useCallback(() => setIsOpen(false), []);
+  const handleSelectFile = useCallback(
+    (path: string) => {
+      setIsOpen(false);
+      onSelectFile(path);
+    },
+    [onSelectFile],
+  );
+
+  return (
+    <>
+      <FloatingActionButton
+        icon={FolderTree}
+        bottomInset={bottom}
+        accessibilityLabel={title}
+        onPress={open}
+        testID="changes-jump-to-file"
+      />
+      <AdaptiveModalSheet
+        header={header}
+        visible={isOpen}
+        onClose={close}
+        scrollable={false}
+        contentStyle={styles.sheetBody}
+        testID="changes-jump-to-file-sheet"
+      >
+        <View style={styles.tree}>
+          <ChangedFilesTree
+            files={files}
+            mode={mode}
+            onSelectFile={handleSelectFile}
+            collapsedFolderPaths={collapsedFolderPaths}
+            onCollapsedFolderPathsChange={setCollapsedFolderPaths}
+          />
+        </View>
+      </AdaptiveModalSheet>
+    </>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  // Rows own their rails, so the sheet's horizontal inset is zeroed here.
+  sheetBody: {
+    paddingHorizontal: 0,
+    paddingTop: 0,
+    paddingBottom: 0,
+    gap: 0,
+  },
+  tree: {
+    flex: 1,
+    minHeight: 0,
+    paddingLeft: TREE_LEADING_INSET,
+    paddingRight: TREE_TRAILING_INSET,
+    paddingTop: theme.spacing[2],
+  },
+}));
diff --git a/packages/app/src/git/pull-request-panel/checks-section.tsx b/packages/app/src/git/pull-request-panel/checks-section.tsx
index 9e4f2dd942..ac1ba078c5 100644
--- a/packages/app/src/git/pull-request-panel/checks-section.tsx
+++ b/packages/app/src/git/pull-request-panel/checks-section.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useMemo } from "react";
 import { Pressable, ScrollView, Text, View, type GestureResponderEvent } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight, MessageSquarePlus } from "lucide-react-native";
 import { Button } from "@/components/ui/button";
 import { openExternalUrl } from "@/utils/open-external-url";
@@ -71,7 +72,8 @@ export function ChecksSection({
   loadingCheckKeys,
   onAddLogsToChat,
 }: ChecksSectionProps) {
-  const summary = useMemo(() => summarizeChecks(checks), [checks]);
+  const { t } = useTranslation();
+  const summary = useMemo(() => summarizeChecks(checks, t), [checks, t]);
   const { collapsedGroups, toggle: handleToggleGroup } = useCheckGroupState();
 
   return (
@@ -91,13 +93,14 @@ export function ChecksSection({
           </Text>
           {summary.parts.length > 0 ? (
             <Text style={styles.detail} numberOfLines={1} testID="pr-pane-check-summary">
+              {summary.detailLead}
               {summary.parts.map((part, index) => (
                 <Text key={part.status}>
                   {index > 0 ? ", " : ""}
                   <Text testID={PART_TEST_ID[part.status]}>{part.text}</Text>
                 </Text>
               ))}
-              {` ${summary.countNoun}`}
+              {summary.detailTrail}
             </Text>
           ) : null}
         </View>
@@ -186,6 +189,7 @@ function CheckRow({
   isAddingLogsToChat: boolean;
   onAddLogsToChat: (check: PrPaneCheck) => void;
 }) {
+  const { t } = useTranslation();
   const handlePress = useCallback(() => {
     void openExternalUrl(check.url);
   }, [check.url]);
@@ -217,7 +221,9 @@ function CheckRow({
             onPress={handleAddLogsToChat}
             style={styles.addButton}
           >
-            {isAddingLogsToChat ? "Adding..." : "Add to chat"}
+            {isAddingLogsToChat
+              ? t("workspace.git.pr.actions.addingToChat")
+              : t("workspace.git.pr.actions.addToChat")}
           </Button>
         ) : null}
         {check.timing && <Text style={sectionKitStyles.checkDuration}>{check.timing}</Text>}
diff --git a/packages/app/src/git/pull-request-panel/checks-summary.test.ts b/packages/app/src/git/pull-request-panel/checks-summary.test.ts
index f014500753..747947b907 100644
--- a/packages/app/src/git/pull-request-panel/checks-summary.test.ts
+++ b/packages/app/src/git/pull-request-panel/checks-summary.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { i18n } from "@/i18n/i18next";
 import type { CheckStatus } from "./check-status";
 import { summarizeChecks } from "./checks-summary";
 import type { PrPaneCheck } from "./data";
@@ -9,7 +10,7 @@ function check(name: string, status: CheckStatus): PrPaneCheck {
 
 describe("summarizeChecks", () => {
   it("reports no checks without claiming the run passed", () => {
-    const summary = summarizeChecks([]);
+    const summary = summarizeChecks([], i18n.t);
 
     expect(summary.outcome).toBe("none");
     expect(summary.headline).toBe("No checks");
@@ -18,11 +19,10 @@ describe("summarizeChecks", () => {
   });
 
   it("leads with failures when anything failed", () => {
-    const summary = summarizeChecks([
-      check("build", "success"),
-      check("lint", "failure"),
-      check("e2e", "pending"),
-    ]);
+    const summary = summarizeChecks(
+      [check("build", "success"), check("lint", "failure"), check("e2e", "pending")],
+      i18n.t,
+    );
 
     expect(summary.outcome).toBe("failure");
     expect(summary.headline).toBe("Some checks were not successful");
@@ -31,7 +31,7 @@ describe("summarizeChecks", () => {
   });
 
   it("reports an unfinished run as in progress when nothing failed", () => {
-    const summary = summarizeChecks([check("build", "success"), check("e2e", "pending")]);
+    const summary = summarizeChecks([check("build", "success"), check("e2e", "pending")], i18n.t);
 
     expect(summary.outcome).toBe("pending");
     expect(summary.headline).toBe("Some checks haven't completed yet");
@@ -39,7 +39,10 @@ describe("summarizeChecks", () => {
   });
 
   it("treats a run of only successes and skips as passed", () => {
-    const summary = summarizeChecks([check("build", "success"), check("deploy", "skipped")]);
+    const summary = summarizeChecks(
+      [check("build", "success"), check("deploy", "skipped")],
+      i18n.t,
+    );
 
     expect(summary.outcome).toBe("success");
     expect(summary.headline).toBe("All checks have passed");
@@ -47,11 +50,10 @@ describe("summarizeChecks", () => {
   });
 
   it("keeps the checks of each group together under a counted label", () => {
-    const summary = summarizeChecks([
-      check("build", "failure"),
-      check("lint", "success"),
-      check("test", "failure"),
-    ]);
+    const summary = summarizeChecks(
+      [check("build", "failure"), check("lint", "success"), check("test", "failure")],
+      i18n.t,
+    );
 
     const [failing, successful] = summary.groups;
     expect(failing?.label).toBe("2 failing checks");
@@ -60,9 +62,34 @@ describe("summarizeChecks", () => {
   });
 
   it("says check rather than checks for a run of one", () => {
-    const summary = summarizeChecks([check("build", "failure")]);
+    const summary = summarizeChecks([check("build", "failure")], i18n.t);
 
-    expect(summary.countNoun).toBe("check");
     expect(summary.detail).toBe("1 failing check");
   });
+
+  it("reads in the active app language", async () => {
+    await i18n.changeLanguage("fr");
+    try {
+      const summary = summarizeChecks(
+        [
+          check("build", "success"),
+          check("deploy", "skipped"),
+          check("lint", "failure"),
+          check("test", "failure"),
+        ],
+        i18n.t,
+      );
+
+      expect(summary.headline).toBe("Certaines vérifications ont échoué");
+      expect(summary.detail).toBe("Vérifications : 2 en échec, 1 réussie(s), 1 ignorée(s)");
+      expect(summary.groups.map((group) => group.label)).toEqual([
+        "2 vérifications en échec",
+        "1 vérification réussie",
+        "1 vérification ignorée",
+      ]);
+      expect(summarizeChecks([], i18n.t).headline).toBe("Aucune vérification");
+    } finally {
+      await i18n.changeLanguage("en");
+    }
+  });
 });
diff --git a/packages/app/src/git/pull-request-panel/checks-summary.ts b/packages/app/src/git/pull-request-panel/checks-summary.ts
index f2f9b30a38..977706a9af 100644
--- a/packages/app/src/git/pull-request-panel/checks-summary.ts
+++ b/packages/app/src/git/pull-request-panel/checks-summary.ts
@@ -1,4 +1,5 @@
 import { classifyCheck, type CheckPresentation } from "@/git/check-presentation";
+import type { TFunction } from "i18next";
 import type { PrPaneCheck } from "./data";
 
 /**
@@ -16,27 +17,10 @@ const PRESENTATION_ORDER = [
   "ignored",
 ] as const satisfies readonly CheckPresentation[];
 
-/** How each status reads inside a count phrase: "2 failing", "4 in progress". */
-const PRESENTATION_NOUN: Record<CheckPresentation, string> = {
-  actionRequired: "needs action",
-  warning: "warning",
-  failure: "failing",
-  pending: "in progress",
-  manual: "manual",
-  success: "successful",
-  ignored: "skipped",
-};
-
 /** The worst thing happening in the run, which is what the headline and the ring report. */
 export type ChecksOutcome = "actionRequired" | "failure" | "pending" | "success" | "none";
 
-const OUTCOME_HEADLINE: Record<ChecksOutcome, string> = {
-  actionRequired: "Some checks need your attention",
-  failure: "Some checks were not successful",
-  pending: "Some checks haven't completed yet",
-  success: "All checks have passed",
-  none: "No checks",
-};
+const COPY = "workspace.git.pr.checksOverview";
 
 export interface ChecksCountPart {
   status: CheckPresentation;
@@ -58,8 +42,12 @@ export interface ChecksSummary {
   headline: string;
   /** The count phrases behind `detail`, kept apart so the header can label each one. */
   parts: readonly ChecksCountPart[];
-  /** The noun closing the detail line — "checks", or "check" for a run of one. */
-  countNoun: string;
+  /**
+   * The words around the count phrases in `detail`: "" and " checks" in English, where the noun
+   * closes the line, while other languages lead with it.
+   */
+  detailLead: string;
+  detailTrail: string;
   /** The whole line: "2 failing, 4 in progress, 1 successful checks". Empty with no checks. */
   detail: string;
   total: number;
@@ -72,7 +60,7 @@ export interface ChecksSummary {
  * header, the ring, and the grouped list all read from one derivation instead of each
  * filtering the array again with its own idea of what counts.
  */
-export function summarizeChecks(checks: readonly PrPaneCheck[]): ChecksSummary {
+export function summarizeChecks(checks: readonly PrPaneCheck[], t: TFunction): ChecksSummary {
   const groups: ChecksGroup[] = [];
   const parts: ChecksCountPart[] = [];
 
@@ -83,24 +71,27 @@ export function summarizeChecks(checks: readonly PrPaneCheck[]): ChecksSummary {
     }
     groups.push({
       status,
-      label: `${matching.length} ${PRESENTATION_NOUN[status]} ${countNoun(matching.length)}`,
+      label: t(`${COPY}.${matching.length === 1 ? "groupOne" : "groupMany"}.${status}`, {
+        count: matching.length,
+      }),
       checks: matching,
     });
     parts.push({
       status,
       count: matching.length,
-      text: `${matching.length} ${PRESENTATION_NOUN[status]}`,
+      text: t(`${COPY}.count.${status}`, { count: matching.length }),
     });
   }
 
   const outcome = selectOutcome(checks);
-  const noun = countNoun(checks.length);
+  const { lead, trail } = detailFrame(checks.length, t);
   return {
     outcome,
-    headline: OUTCOME_HEADLINE[outcome],
+    headline: t(`${COPY}.headline.${outcome}`),
     parts,
-    countNoun: noun,
-    detail: parts.length === 0 ? "" : `${parts.map((part) => part.text).join(", ")} ${noun}`,
+    detailLead: lead,
+    detailTrail: trail,
+    detail: parts.length === 0 ? "" : `${lead}${parts.map((part) => part.text).join(", ")}${trail}`,
     total: checks.length,
     groups,
   };
@@ -131,6 +122,13 @@ function selectOutcome(checks: readonly PrPaneCheck[]): ChecksOutcome {
   return "success";
 }
 
-function countNoun(count: number): string {
-  return count === 1 ? "check" : "checks";
+/**
+ * The header renders each count phrase on its own, so the translated line is split around
+ * where the phrases go.
+ */
+function detailFrame(total: number, t: TFunction): { lead: string; trail: string } {
+  const marker = "\u0000";
+  const line = t(`${COPY}.${total === 1 ? "detailOne" : "detailMany"}`, { parts: marker });
+  const [lead = "", trail = ""] = line.split(marker);
+  return { lead, trail };
 }
diff --git a/packages/app/src/git/pull-request-panel/data.test.ts b/packages/app/src/git/pull-request-panel/data.test.ts
index 21b145bedc..837433417e 100644
--- a/packages/app/src/git/pull-request-panel/data.test.ts
+++ b/packages/app/src/git/pull-request-panel/data.test.ts
@@ -9,12 +9,13 @@ import {
   isPipelineActiveStatus,
   mapPipelineStatus,
 } from "@/git/forges/gitlab";
+import { i18n } from "@/i18n/i18next";
 import { IDENTITY_COLOR_NAMES, identityColor } from "@/styles/identity-colors";
 import {
   deriveAvatarColor,
   formatAge,
-  getActivityVerb,
-  getStateLabel,
+  getActivityVerbKey,
+  getStateLabelKey,
   mapPrPaneData,
 } from "./data";
 
@@ -779,37 +780,34 @@ describe("formatAge", () => {
   });
 });
 
-describe("getStateLabel", () => {
+const english = i18n.getFixedT("en");
+const french = i18n.getFixedT("fr");
+
+describe("getStateLabelKey", () => {
   it.each([
-    ["open", "Open"],
-    ["draft", "Draft"],
-    ["merged", "Merged"],
-    ["closed", "Closed"],
-  ] as const)("maps %s → %s", (state, expected) => {
-    expect(getStateLabel(state)).toBe(expected);
+    ["open", "Open", "Ouverte"],
+    ["draft", "Draft", "Brouillon"],
+    ["merged", "Merged", "Fusionnée"],
+    ["closed", "Closed", "Fermée"],
+  ] as const)("labels %s as %s, and %s in French", (state, englishLabel, frenchLabel) => {
+    expect(english(getStateLabelKey(state))).toBe(englishLabel);
+    expect(french(getStateLabelKey(state))).toBe(frenchLabel);
   });
 });
 
-describe("getActivityVerb", () => {
-  it("returns Commented for comment kind", () => {
-    expect(getActivityVerb({ kind: "comment" })).toBe("Commented");
-  });
-
-  it("returns Approved for approved review", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "approved" })).toBe("Approved");
-  });
-
-  it("returns Requested changes for changes_requested review", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "changes_requested" })).toBe(
+describe("getActivityVerbKey", () => {
+  it.each([
+    [{ kind: "comment" }, "Commented", "A commenté"],
+    [{ kind: "review", reviewState: "approved" }, "Approved", "A approuvé"],
+    [
+      { kind: "review", reviewState: "changes_requested" },
       "Requested changes",
-    );
-  });
-
-  it("returns Reviewed for a commented review with body (generic case)", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "commented" })).toBe("Reviewed");
-  });
-
-  it("returns Reviewed when reviewState is undefined", () => {
-    expect(getActivityVerb({ kind: "review" })).toBe("Reviewed");
+      "A demandé des modifications",
+    ],
+    [{ kind: "review", reviewState: "commented" }, "Reviewed", "A relu"],
+    [{ kind: "review" }, "Reviewed", "A relu"],
+  ] as const)("labels %o as %s, and %s in French", (item, englishVerb, frenchVerb) => {
+    expect(english(getActivityVerbKey(item))).toBe(englishVerb);
+    expect(french(getActivityVerbKey(item))).toBe(frenchVerb);
   });
 });
diff --git a/packages/app/src/git/pull-request-panel/data.ts b/packages/app/src/git/pull-request-panel/data.ts
index 0f1e2014e9..d1275f2f1e 100644
--- a/packages/app/src/git/pull-request-panel/data.ts
+++ b/packages/app/src/git/pull-request-panel/data.ts
@@ -318,16 +318,18 @@ function parsePullRequestNumber(url: string): number | null {
   }
 }
 
-export function getStateLabel(state: PrState): string {
-  if (state === "draft") return "Draft";
-  if (state === "merged") return "Merged";
-  if (state === "closed") return "Closed";
-  return "Open";
+export function getStateLabelKey(state: PrState) {
+  if (state === "draft") return "workspace.git.pr.states.draft";
+  if (state === "merged") return "workspace.git.pr.states.merged";
+  if (state === "closed") return "workspace.git.pr.states.closed";
+  return "workspace.git.pr.states.open";
 }
 
-export function getActivityVerb(item: Pick<PrPaneActivity, "kind" | "reviewState">): string {
-  if (item.kind === "comment") return "Commented";
-  if (item.reviewState === "approved") return "Approved";
-  if (item.reviewState === "changes_requested") return "Requested changes";
-  return "Reviewed";
+export function getActivityVerbKey(item: Pick<PrPaneActivity, "kind" | "reviewState">) {
+  if (item.kind === "comment") return "workspace.git.pr.activity.commented";
+  if (item.reviewState === "approved") return "workspace.git.pr.activity.approved";
+  if (item.reviewState === "changes_requested") {
+    return "workspace.git.pr.activity.requestedChanges";
+  }
+  return "workspace.git.pr.activity.reviewed";
 }
diff --git a/packages/app/src/git/pull-request-panel/pane.tsx b/packages/app/src/git/pull-request-panel/pane.tsx
index b7c0890c3a..429dd2be0e 100644
--- a/packages/app/src/git/pull-request-panel/pane.tsx
+++ b/packages/app/src/git/pull-request-panel/pane.tsx
@@ -63,7 +63,7 @@ import {
   canAddPullRequestActivityToChat,
 } from "./context-attachment";
 import { ChecksSection, getCheckIdentity } from "./checks-section";
-import { getActivityVerb, getStateLabel } from "./data";
+import { getActivityVerbKey, getStateLabelKey } from "./data";
 import type { PrPaneActivity, PrPaneCheck, PrPaneData, PrState } from "./data";
 import type { ForgeSpecificStatusFacts } from "@/git/merge-capability";
 import { CheckPresentationIcon } from "@/git/check-presentation.view";
@@ -538,7 +538,7 @@ export function PullRequestPane({
               <View style={styles.metaLine}>
                 <StateIcon size={14} uniProps={statePresentation.iconColor} />
                 <Text style={stateLabelStyle(data.state)} testID="pr-pane-state">
-                  {getStateLabel(data.state)}
+                  {t(getStateLabelKey(data.state))}
                 </Text>
                 {nativeHeaderMeta}
                 {repoIdentity ? (
@@ -568,7 +568,7 @@ export function PullRequestPane({
         <View style={styles.divider} />
 
         <Section
-          title="Activity"
+          title={t("workspace.git.pr.sections.activity")}
           open={activityOpen}
           onToggle={handleToggleActivity}
           summary={
@@ -592,13 +592,13 @@ export function PullRequestPane({
                 onPress={handleAddAllToChat}
                 disabled={activityLoading}
               >
-                Add all to chat
+                {t("workspace.git.pr.actions.addAllToChat")}
               </Button>
             </View>
           ) : null}
           {activityLoading ? <PrActivitySkeleton /> : null}
           {!activityLoading && visibleEntries.length === 0 ? (
-            <Text style={sectionKitStyles.emptyText}>No activity yet</Text>
+            <Text style={sectionKitStyles.emptyText}>{t("workspace.git.pr.empty.noActivity")}</Text>
           ) : null}
           {!activityLoading
             ? visibleEntries.map(({ entry, collapsed }) => (
@@ -702,14 +702,14 @@ function ActivityKebab({
         <DropdownMenuTrigger
           hitSlop={8}
           style={kebabTriggerStyle}
-          accessibilityLabel="Comment actions"
+          accessibilityLabel={t("workspace.git.pr.accessibility.commentActions")}
         >
           {renderKebabTriggerIcon}
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" width={200}>
           {attachEnabled && canAddPullRequestActivityToChat(activity) ? (
             <DropdownMenuItem leading={ADD_TO_CHAT_MENU_ICON} onSelect={handleAddToChat}>
-              Add to chat
+              {t("workspace.git.pr.actions.addToChat")}
             </DropdownMenuItem>
           ) : null}
           {activity.body.trim() !== "" ? (
@@ -760,7 +760,8 @@ function ActivityAvatar({ activity, size }: { activity: PrPaneActivity; size: nu
 }
 
 function ActivityVerb({ activity }: { activity: PrPaneActivity }) {
-  const verb = getActivityVerb(activity).toLowerCase();
+  const { t } = useTranslation();
+  const verb = t(getActivityVerbKey(activity)).toLowerCase();
   if (activity.kind === "review" && activity.reviewState === "approved") {
     return (
       <View style={styles.verbGroup}>
@@ -815,6 +816,7 @@ function SingleActivityCard({
   entry: Extract<PrTimelineEntry, { kind: "single" }>;
   collapsed: boolean;
 }) {
+  const { t } = useTranslation();
   const { activity } = entry;
   const { actionsVisible, handlePointerEnter, handlePointerLeave, setMenuOpen } =
     useRevealOnHover();
@@ -884,7 +886,7 @@ function SingleActivityCard({
                 leftIcon={MessageSquarePlus}
                 onPress={handleAddToChat}
               >
-                Add to chat
+                {t("workspace.git.pr.actions.addToChat")}
               </Button>
             </View>
           ) : null}
@@ -935,6 +937,7 @@ function ReviewCard({
   collapsed: boolean;
   collapsedEntryIds: ReadonlySet<string>;
 }) {
+  const { t } = useTranslation();
   const { review, threads } = entry;
   const { actionsVisible, handlePointerEnter, handlePointerLeave, setMenuOpen } =
     useRevealOnHover();
@@ -961,7 +964,7 @@ function ReviewCard({
               onPress={handleAddToChat}
               style={styles.checkAddButton}
             >
-              Add to chat
+              {t("workspace.git.pr.actions.addToChat")}
             </Button>
           ) : null}
           {collapsed ? (
@@ -995,7 +998,7 @@ function ReviewCard({
                 leftIcon={MessageSquarePlus}
                 onPress={handleAddToChat}
               >
-                Add to chat
+                {t("workspace.git.pr.actions.addToChat")}
               </Button>
             </View>
           ) : null}
@@ -1063,8 +1066,12 @@ function ThreadBlock({
             ? formatPullRequestThreadPath(thread.location)
             : t("workspace.git.pr.thread.discussion")}
         </Text>
-        {thread.isResolved ? <StatusBadge label="Resolved" variant="success" /> : null}
-        {thread.location?.isOutdated ? <StatusBadge label="Outdated" /> : null}
+        {thread.isResolved ? (
+          <StatusBadge label={t("workspace.git.pr.thread.resolved")} variant="success" />
+        ) : null}
+        {thread.location?.isOutdated ? (
+          <StatusBadge label={t("workspace.git.pr.thread.outdated")} />
+        ) : null}
         <View style={styles.headerTrailing}>
           {collapsed ? (
             <View style={styles.threadCount}>
@@ -1080,7 +1087,7 @@ function ThreadBlock({
               <DropdownMenuTrigger
                 hitSlop={8}
                 style={kebabTriggerStyle}
-                accessibilityLabel="Thread actions"
+                accessibilityLabel={t("workspace.git.pr.accessibility.threadActions")}
               >
                 {renderKebabTriggerIcon}
               </DropdownMenuTrigger>
@@ -1124,7 +1131,7 @@ function ThreadBlock({
                 leftIcon={MessageSquarePlus}
                 onPress={handleAddThreadToChat}
               >
-                Add to chat
+                {t("workspace.git.pr.actions.addToChat")}
               </Button>
             </View>
           ) : null}
diff --git a/packages/app/src/git/use-diff-files.ts b/packages/app/src/git/use-diff-files.ts
index 14a17edcb1..9623a31171 100644
--- a/packages/app/src/git/use-diff-files.ts
+++ b/packages/app/src/git/use-diff-files.ts
@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import type { CheckoutCommitFile, ParsedDiffFile } from "@getpaseo/protocol/messages";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useFetchQueries } from "@/data/query";
-import { checkoutCommitFileDiffQueryKey, COMMIT_FILE_DIFF_STALE_TIME } from "@/git/query-keys";
+import { commitFileDiffQueryOptions } from "./commit-file-diff-query";
 import { useCheckoutCommitsQuery } from "@/git/use-commits-query";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 
@@ -79,18 +79,16 @@ export function useCommitDiffFiles(ctx: CommitDiffFilesContext): CommitDiffFiles
     Boolean(client) &&
     isConnected;
   const fileDiffResults = useFetchQueries(
-    commitFiles.map((file) => ({
-      queryKey: checkoutCommitFileDiffQueryKey(serverId, cwd, sha, file.path),
-      queryFn: async (): Promise<{ file: ParsedDiffFile | null }> => {
-        if (!client) {
-          throw new Error("Host disconnected");
-        }
-        return client.getCommitFileDiff(cwd, sha, file.path);
-      },
-      enabled: fileDiffsEnabled,
-      staleTimeMs: COMMIT_FILE_DIFF_STALE_TIME,
-      dataShape: "value" as const,
-    })),
+    commitFiles.map((file) =>
+      commitFileDiffQueryOptions({
+        serverId,
+        cwd,
+        sha,
+        path: file.path,
+        client,
+        enabled: fileDiffsEnabled,
+      }),
+    ),
   );
   const commitsLoading = commitsQuery.status === "connecting" || commitsQuery.status === "loading";
   const commitsError = commitsQuery.status === "error" ? commitsQuery.error : null;
diff --git a/packages/app/src/git/use-diff-query.test.ts b/packages/app/src/git/use-diff-query.test.ts
new file mode 100644
index 0000000000..94b18a7d16
--- /dev/null
+++ b/packages/app/src/git/use-diff-query.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from "vitest";
+import type { ParsedDiffFile } from "@getpaseo/protocol/messages";
+import { deriveCheckoutDiffResult } from "./use-diff-query";
+
+function createParsedDiffFile(path: string): ParsedDiffFile {
+  return {
+    path,
+    isNew: false,
+    isDeleted: false,
+    additions: 3,
+    deletions: 1,
+    hunks: [
+      {
+        oldStart: 1,
+        oldCount: 1,
+        newStart: 1,
+        newCount: 1,
+        lines: [{ type: "add", content: "x", tokens: [] }],
+      },
+    ],
+  } as ParsedDiffFile;
+}
+
+function createPayload(files: ParsedDiffFile[]) {
+  return { requestId: "req-1", cwd: "/repo", files, error: null };
+}
+
+describe("deriveCheckoutDiffResult", () => {
+  // No payload covers every not-yet-fetched case: the query is disabled because the
+  // retained panel is still inactive, the request is in flight, or the host is
+  // disconnected. None of them mean "the diff is empty".
+  it("reports loading while no payload has arrived, so an empty diff is never implied", () => {
+    const result = deriveCheckoutDiffResult(null);
+
+    expect(result.isLoading).toBe(true);
+    expect(result.files).toEqual([]);
+  });
+
+  it("reports a settled empty diff once a payload with zero files arrives", () => {
+    const result = deriveCheckoutDiffResult(createPayload([]));
+
+    expect(result.isLoading).toBe(false);
+    expect(result.files).toEqual([]);
+  });
+
+  it("passes the payload files through once the diff arrives", () => {
+    const files = [createParsedDiffFile("src/app.ts")];
+
+    const result = deriveCheckoutDiffResult(createPayload(files));
+
+    expect(result.isLoading).toBe(false);
+    expect(result.files).toEqual(files);
+  });
+
+  it("surfaces a payload error and the too-large flag", () => {
+    const error = { code: "NOT_GIT_REPO", message: "not a git repository" } as const;
+
+    const result = deriveCheckoutDiffResult({ ...createPayload([]), error, diffTooLarge: true });
+
+    expect(result).toEqual({
+      files: [],
+      payloadError: error,
+      diffTooLarge: true,
+      isLoading: false,
+      isFetching: false,
+      isError: true,
+      error: null,
+    });
+  });
+});
diff --git a/packages/app/src/git/use-diff-query.ts b/packages/app/src/git/use-diff-query.ts
index 7002bbfc55..091d053307 100644
--- a/packages/app/src/git/use-diff-query.ts
+++ b/packages/app/src/git/use-diff-query.ts
@@ -1,3 +1,4 @@
+import { shareCheckoutDiff } from "./diff-sharing";
 import { useMemo } from "react";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useReplicaQuery } from "@/data/query";
@@ -74,6 +75,7 @@ export function useCheckoutDiffQuery({
 
   const query = useReplicaQuery<CheckoutDiffQueryPayload>({
     queryKey,
+    structuralSharing: shareCheckoutDiff,
     enabled: routeEnabled,
     pushEvent: "checkout_diff_update",
     meta: checkoutDiffPushRoute({
@@ -89,14 +91,35 @@ export function useCheckoutDiffQuery({
     }),
   });
 
-  const payload = query.data ?? null;
-  const payloadError = payload?.error ?? null;
+  return deriveCheckoutDiffResult(query.data ?? null);
+}
 
+export interface CheckoutDiffResult {
+  files: ParsedDiffFile[];
+  payloadError: CheckoutDiffQueryPayload["error"];
+  diffTooLarge: boolean;
+  isLoading: boolean;
+  isFetching: boolean;
+  isError: boolean;
+  error: null;
+}
+
+/**
+ * The result derives from the payload alone. Until a payload arrives there is no
+ * diff to describe, so the boundary reports loading rather than an empty diff —
+ * whether the query is idle (an inactive retained panel), in flight, or the host
+ * is disconnected. Reporting `files: []` as settled made callers render "+0 -0"
+ * and "No changes" for a diff nobody has fetched yet.
+ */
+export function deriveCheckoutDiffResult(
+  payload: CheckoutDiffQueryPayload | null,
+): CheckoutDiffResult {
+  const payloadError = payload?.error ?? null;
   return {
     files: payload?.files ?? [],
     payloadError,
     diffTooLarge: payload?.diffTooLarge === true,
-    isLoading: payload === null && queryEnabled && isConnected,
+    isLoading: payload === null,
     isFetching: false,
     isError: Boolean(payloadError),
     error: null,
diff --git a/packages/app/src/git/use-working-diff.ts b/packages/app/src/git/use-working-diff.ts
index 341cc4946d..daeda1479d 100644
--- a/packages/app/src/git/use-working-diff.ts
+++ b/packages/app/src/git/use-working-diff.ts
@@ -7,6 +7,7 @@ import {
   buildReviewDraftKey,
   useInlineReviewController,
   useReviewAttachmentSnapshot,
+  useReviewFeedback,
 } from "@/review";
 import { useCheckoutDiffQuery } from "@/git/use-diff-query";
 import { useCheckoutStatusQuery } from "@/git/use-status-query";
@@ -19,6 +20,7 @@ interface UseWorkingDiffOptions {
   ignoreWhitespace: boolean;
   enabled: boolean;
   queryScope?: string;
+  presentation?: string;
 }
 
 export function useWorkingDiff({
@@ -28,6 +30,7 @@ export function useWorkingDiff({
   ignoreWhitespace,
   enabled,
   queryScope,
+  presentation,
 }: UseWorkingDiffOptions) {
   const {
     status,
@@ -81,7 +84,7 @@ export function useWorkingDiff({
       }),
     [baseRef, cwd, diffMode, ignoreWhitespace, serverId, workspaceId],
   );
-  const reviewActions = useInlineReviewController({ reviewDraftKey });
+  const reviewActions = useInlineReviewController({ reviewDraftKey, presentation });
   const reviewAttachment = useReviewAttachmentSnapshot({
     key: reviewDraftKey,
     diffFiles: files,
@@ -90,6 +93,13 @@ export function useWorkingDiff({
     baseRef,
   });
 
+  const reviewFeedback = useReviewFeedback({
+    serverId,
+    workspaceId,
+    reviewDraftKey,
+    attachment: reviewAttachment,
+  });
+
   return {
     status,
     isStatusLoading,
@@ -107,6 +117,7 @@ export function useWorkingDiff({
     isDiffLoading,
     reviewActions,
     reviewAttachment,
+    reviewFeedback,
   };
 }
 
diff --git a/packages/app/src/hooks/agent-commands-query.test.ts b/packages/app/src/hooks/agent-commands-query.test.ts
index 9d880b8dab..e8d8ee0b94 100644
--- a/packages/app/src/hooks/agent-commands-query.test.ts
+++ b/packages/app/src/hooks/agent-commands-query.test.ts
@@ -38,9 +38,10 @@ describe("agent command query keys", () => {
       "agentCommands",
       "server-1",
       "draft",
-      "codex",
       "cwd",
       "/repo",
+      "provider",
+      "codex",
       "mode",
       null,
       "model",
diff --git a/packages/app/src/hooks/agent-commands-query.ts b/packages/app/src/hooks/agent-commands-query.ts
index 38cbd97a10..276c0fd9ba 100644
--- a/packages/app/src/hooks/agent-commands-query.ts
+++ b/packages/app/src/hooks/agent-commands-query.ts
@@ -1,3 +1,4 @@
+import type { QueryClient } from "@tanstack/react-query";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 
@@ -24,17 +25,24 @@ export function sessionAgentCommandsQueryKey(input: { serverId: string; agentId:
   return [...agentCommandsQueryRoot(input.serverId), "session", input.agentId] as const;
 }
 
+function draftAgentCommandsCheckoutScope(input: { serverId: string; cwd: string }) {
+  return [
+    ...agentCommandsQueryRoot(input.serverId),
+    "draft",
+    "cwd",
+    normalizeAgentCommandsCwd(input.cwd),
+  ] as const;
+}
+
 export function draftAgentCommandsQueryKey(input: {
   serverId: string;
   draftConfig: AgentCommandsDraftConfig;
 }) {
   const { draftConfig } = input;
   return [
-    ...agentCommandsQueryRoot(input.serverId),
-    "draft",
+    ...draftAgentCommandsCheckoutScope({ serverId: input.serverId, cwd: draftConfig.cwd }),
+    "provider",
     draftConfig.provider,
-    "cwd",
-    normalizeAgentCommandsCwd(draftConfig.cwd),
     "mode",
     draftConfig.modeId ?? null,
     "model",
@@ -46,6 +54,16 @@ export function draftAgentCommandsQueryKey(input: {
   ] as const;
 }
 
+// Draft commands include project skills read from the checkout. When the checkout moves to
+// another branch the cached list describes files that are gone, so it is dropped rather than
+// shown while a refetch runs.
+export function resetDraftAgentCommandsForCheckout(
+  queryClient: QueryClient,
+  input: { serverId: string; cwd: string },
+): Promise<void> {
+  return queryClient.resetQueries({ queryKey: draftAgentCommandsCheckoutScope(input) });
+}
+
 export function agentCommandsQueryKey(input: {
   serverId: string;
   agentId: string;
diff --git a/packages/app/src/hooks/hover-safe-zone-tracker.test.ts b/packages/app/src/hooks/hover-safe-zone-tracker.test.ts
index b4fdc3df00..184ba8db87 100644
--- a/packages/app/src/hooks/hover-safe-zone-tracker.test.ts
+++ b/packages/app/src/hooks/hover-safe-zone-tracker.test.ts
@@ -94,14 +94,30 @@ describe("hover safe-zone tracker", () => {
     expect(handle.leaves).toBe(1);
   });
 
+  it("bridges the gap to content above or below the trigger", () => {
+    const handle = createHandle({
+      trigger: { left: 100, right: 130, top: 60, bottom: 90 },
+      content: { left: 0, right: 300, top: 0, bottom: 52 },
+    });
+
+    // In the gap between the card and the trigger below it.
+    handle.pointerMoved(115, 56);
+    expect(handle.enters).toBe(1);
+    expect(handle.leaves).toBe(0);
+
+    // Beside the trigger, past the gap — outside.
+    handle.pointerMoved(200, 75);
+    expect(handle.leaves).toBe(1);
+  });
+
   it("treats overlapping trigger and content as having no bridge", () => {
     const handle = createHandle({
       trigger: { left: 0, right: 200, top: 0, bottom: 50 },
-      content: { left: 100, right: 300, top: 60, bottom: 100 },
+      content: { left: 100, right: 300, top: 40, bottom: 100 },
     });
 
-    // Outside both rects, in what would be a bridge — should be outside.
-    handle.pointerMoved(150, 55);
+    // Outside both rects, in the corner neither of them covers — should be outside.
+    handle.pointerMoved(250, 20);
     expect(handle.enters).toBe(0);
     expect(handle.leaves).toBe(1);
   });
diff --git a/packages/app/src/hooks/hover-safe-zone-tracker.ts b/packages/app/src/hooks/hover-safe-zone-tracker.ts
index d097413c50..f9c4db4708 100644
--- a/packages/app/src/hooks/hover-safe-zone-tracker.ts
+++ b/packages/app/src/hooks/hover-safe-zone-tracker.ts
@@ -62,9 +62,20 @@ function isInsideSafeZone(
   if (isInsideRect(trigger, x, y)) return true;
   if (isInsideRect(content, x, y)) return true;
   if (!trigger || !content) return false;
+  return (
+    isInsideHorizontalBridge(trigger, content, x, y) ||
+    isInsideVerticalBridge(trigger, content, x, y)
+  );
+}
 
-  // Bridge: the horizontal strip connecting trigger and content, stretched
-  // vertically to span both. If they overlap horizontally there's no bridge.
+// A card beside its trigger: the strip between them, stretched vertically to
+// span both. If they overlap horizontally there's no horizontal bridge.
+function isInsideHorizontalBridge(
+  trigger: RectLike,
+  content: RectLike,
+  x: number,
+  y: number,
+): boolean {
   const bridgeLeft = Math.min(trigger.right, content.right);
   const bridgeRight = Math.max(trigger.left, content.left);
   if (bridgeLeft >= bridgeRight) return false;
@@ -72,3 +83,19 @@ function isInsideSafeZone(
   const bridgeBottom = Math.max(trigger.bottom, content.bottom);
   return x >= bridgeLeft && x <= bridgeRight && y >= bridgeTop && y <= bridgeBottom;
 }
+
+// A card above or below its trigger: the strip between them, stretched
+// horizontally to span both. If they overlap vertically there's no vertical bridge.
+function isInsideVerticalBridge(
+  trigger: RectLike,
+  content: RectLike,
+  x: number,
+  y: number,
+): boolean {
+  const bridgeTop = Math.min(trigger.bottom, content.bottom);
+  const bridgeBottom = Math.max(trigger.top, content.top);
+  if (bridgeTop >= bridgeBottom) return false;
+  const bridgeLeft = Math.min(trigger.left, content.left);
+  const bridgeRight = Math.max(trigger.right, content.right);
+  return x >= bridgeLeft && x <= bridgeRight && y >= bridgeTop && y <= bridgeBottom;
+}
diff --git a/packages/app/src/hooks/sidebar-status-view-model.test.ts b/packages/app/src/hooks/sidebar-status-view-model.test.ts
index 62dc7142a8..c5bd8dcd11 100644
--- a/packages/app/src/hooks/sidebar-status-view-model.test.ts
+++ b/packages/app/src/hooks/sidebar-status-view-model.test.ts
@@ -1,9 +1,10 @@
 import { describe, expect, it } from "vitest";
+import { i18n } from "@/i18n/i18next";
 import type { SidebarWorkspaceEntry } from "./sidebar-workspaces-view-model";
 import {
   buildStatusGroups,
   buildStatusShortcutIndex,
-  STATUS_BUCKET_LABELS,
+  getStatusBucketLabel,
   STATUS_BUCKET_ORDER,
   type StatusGroup,
 } from "./sidebar-status-view-model";
@@ -55,7 +56,7 @@ describe("buildStatusGroups", () => {
       ws({ workspaceKey: "srv:running-ws", statusBucket: "running", name: "running-ws" }),
     ];
 
-    const groups = buildStatusGroups(workspaces, emptyProjectNames);
+    const groups = buildStatusGroups(workspaces, emptyProjectNames, i18n.t);
 
     expect(groups.map((g) => g.bucket)).toEqual(["needs_input", "running", "done"]);
     expect(groups[0]?.label).toBe("Needs input");
@@ -69,7 +70,7 @@ describe("buildStatusGroups", () => {
       ws({ workspaceKey: "srv:b", statusBucket: "running" }),
     ];
 
-    const groups = buildStatusGroups(workspaces, emptyProjectNames);
+    const groups = buildStatusGroups(workspaces, emptyProjectNames, i18n.t);
 
     expect(groups.map((g) => g.bucket)).toEqual(["running", "done"]);
   });
@@ -93,7 +94,7 @@ describe("buildStatusGroups", () => {
       }),
     ];
 
-    const groups = buildStatusGroups(workspaces, emptyProjectNames);
+    const groups = buildStatusGroups(workspaces, emptyProjectNames, i18n.t);
 
     expect(groups[0]?.rows.map((r) => r.workspaceKey)).toEqual(["srv:new", "srv:mid", "srv:old"]);
   });
@@ -109,7 +110,7 @@ describe("buildStatusGroups", () => {
       ws({ workspaceKey: "srv:null-b", statusBucket: "done", statusEnteredAt: null }),
     ];
 
-    const groups = buildStatusGroups(workspaces, emptyProjectNames);
+    const groups = buildStatusGroups(workspaces, emptyProjectNames, i18n.t);
 
     expect(groups[0]?.rows.map((r) => r.workspaceKey)).toEqual([
       "srv:ts",
@@ -145,13 +146,13 @@ describe("buildStatusGroups", () => {
       }),
     ];
 
-    const groups = buildStatusGroups(workspaces, projectNames);
+    const groups = buildStatusGroups(workspaces, projectNames, i18n.t);
 
     expect(groups[0]?.rows.map((r) => r.workspaceKey)).toEqual(["srv:2", "srv:3", "srv:1"]);
   });
 
   it("returns empty array for no workspaces", () => {
-    const groups = buildStatusGroups([], emptyProjectNames);
+    const groups = buildStatusGroups([], emptyProjectNames, i18n.t);
     expect(groups).toEqual([]);
   });
 
@@ -180,11 +181,11 @@ describe("buildStatusGroups", () => {
       ws({ workspaceKey: "srv:dn", statusBucket: "done", statusEnteredAt: null }),
     ];
 
-    const groups = buildStatusGroups(workspaces, emptyProjectNames);
+    const groups = buildStatusGroups(workspaces, emptyProjectNames, i18n.t);
 
     expect(groups.map((g) => g.bucket)).toEqual(STATUS_BUCKET_ORDER);
     expect(groups.map((g) => g.label)).toEqual(
-      STATUS_BUCKET_ORDER.map((b) => STATUS_BUCKET_LABELS[b]),
+      STATUS_BUCKET_ORDER.map((b) => getStatusBucketLabel(b, i18n.t)),
     );
     // Each group has exactly one row with the matching bucket
     for (const group of groups) {
@@ -230,3 +231,20 @@ describe("buildStatusShortcutIndex", () => {
     expect(index.size).toBe(0);
   });
 });
+
+describe("getStatusBucketLabel", () => {
+  it("reads in the active app language", async () => {
+    await i18n.changeLanguage("fr");
+    try {
+      expect(STATUS_BUCKET_ORDER.map((bucket) => getStatusBucketLabel(bucket, i18n.t))).toEqual([
+        "Attend une réponse",
+        "Échec",
+        "À relire",
+        "En cours",
+        "Terminé",
+      ]);
+    } finally {
+      await i18n.changeLanguage("en");
+    }
+  });
+});
diff --git a/packages/app/src/hooks/sidebar-status-view-model.ts b/packages/app/src/hooks/sidebar-status-view-model.ts
index 7bcbe3d345..5736c7f391 100644
--- a/packages/app/src/hooks/sidebar-status-view-model.ts
+++ b/packages/app/src/hooks/sidebar-status-view-model.ts
@@ -1,3 +1,4 @@
+import type { TFunction } from "i18next";
 import { STATUS_BUCKET_ORDER } from "@/utils/sidebar-agent-state";
 import type { SidebarWorkspaceEntry } from "@/hooks/sidebar-workspaces-view-model";
 
@@ -5,13 +6,17 @@ export type StatusBucket = SidebarWorkspaceEntry["statusBucket"];
 
 export { STATUS_BUCKET_ORDER };
 
-export const STATUS_BUCKET_LABELS: Record<StatusBucket, string> = {
-  needs_input: "Needs input",
-  failed: "Failed",
-  attention: "Ready to review",
-  running: "Working",
-  done: "Done",
-};
+const STATUS_BUCKET_LABEL_KEYS = {
+  needs_input: "sidebar.statusBucket.needsInput",
+  failed: "sidebar.statusBucket.failed",
+  attention: "sidebar.statusBucket.readyToReview",
+  running: "sidebar.statusBucket.working",
+  done: "sidebar.statusBucket.done",
+} as const satisfies Record<StatusBucket, string>;
+
+export function getStatusBucketLabel(bucket: StatusBucket, t: TFunction): string {
+  return t(STATUS_BUCKET_LABEL_KEYS[bucket]);
+}
 
 export interface StatusGroup {
   bucket: StatusBucket;
@@ -22,6 +27,7 @@ export interface StatusGroup {
 export function buildStatusGroups(
   workspaces: SidebarWorkspaceEntry[],
   projectNamesByViewKey: Map<string, string>,
+  t: TFunction,
 ): StatusGroup[] {
   const bucketRows = new Map<StatusBucket, SidebarWorkspaceEntry[]>();
 
@@ -42,7 +48,7 @@ export function buildStatusGroups(
     if (!rows || rows.length === 0) continue;
 
     rows.sort((a, b) => compareStatusRows(a, b, projectNamesByViewKey));
-    groups.push({ bucket, label: STATUS_BUCKET_LABELS[bucket], rows });
+    groups.push({ bucket, label: getStatusBucketLabel(bucket, t), rows });
   }
 
   return groups;
diff --git a/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts b/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
index f9d192dbb9..637d3a035b 100644
--- a/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
+++ b/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
@@ -701,7 +701,10 @@ function agent(input: {
     id: input.id,
     provider: "claude" as Agent["provider"],
     status: input.status,
-    activeTurn: null,
+    turn:
+      input.status === "running"
+        ? { phase: "open", turnId: null, startedAt: null, cancellationRequestId: null }
+        : { phase: "idle", cancellationRequestId: null },
     createdAt: new Date(0),
     updatedAt: input.updatedAt ?? new Date(1_000),
     lastUserMessageAt: null,
diff --git a/packages/app/src/hooks/sidebar-workspaces-view-model.ts b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
index 842844cdc2..24ecc34461 100644
--- a/packages/app/src/hooks/sidebar-workspaces-view-model.ts
+++ b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
@@ -27,6 +27,7 @@ export interface SidebarWorkspacePlacement {
   workspaceDirectory?: string;
   projectKind: WorkspaceStructureProject["projectKind"];
   workspaceKind: WorkspaceDescriptor["workspaceKind"];
+  background?: boolean;
   name: string;
 }
 
@@ -164,6 +165,7 @@ export function createSidebarWorkspaceEntry(input: {
       input.workspace.worktreeSlug ?? shortenPath(input.workspace.workspaceDirectory),
     projectKind: input.workspace.projectKind,
     workspaceKind: input.workspace.workspaceKind,
+    background: input.workspace.background,
     name: input.workspace.name,
     title: input.workspace.title ?? null,
     pinnedAt: input.workspace.pinnedAt,
diff --git a/packages/app/src/hooks/use-agent-autocomplete.ts b/packages/app/src/hooks/use-agent-autocomplete.ts
index 5ab515d8b1..fe6f98c3f1 100644
--- a/packages/app/src/hooks/use-agent-autocomplete.ts
+++ b/packages/app/src/hooks/use-agent-autocomplete.ts
@@ -7,6 +7,7 @@ import {
   useAgentCommandsQuery,
   type AgentSlashCommand,
   type DraftCommandConfig,
+  type DraftCommandTarget,
 } from "./use-agent-commands-query";
 import { orderAutocompleteOptions } from "@/components/ui/autocomplete-utils";
 import { useAutocomplete } from "./use-autocomplete";
@@ -34,7 +35,7 @@ interface UseAgentAutocompleteInput {
   setUserInput: (nextValue: string) => void;
   serverId: string;
   agentId: string;
-  draftConfig?: DraftCommandConfig;
+  draft?: DraftCommandTarget;
   onAutocompleteApplied?: () => void;
   onClientSlashCommand?: (command: ClientSlashCommand) => void;
   canExecuteClientSlashCommand?: boolean;
@@ -117,18 +118,13 @@ type AvailableCommand =
   | { source: "plugin"; command: PluginClientSlashCommand }
   | { source: "provider"; command: AgentSlashCommand };
 
-function normalizeDraftCommandConfig(
-  draftConfig?: DraftCommandConfig,
-): DraftCommandConfig | undefined {
-  if (!draftConfig) {
+function resolveDraftQueryConfig(draft?: DraftCommandTarget): DraftCommandConfig | undefined {
+  if (draft?.status !== "ready") {
     return undefined;
   }
 
+  const draftConfig = draft.config;
   const cwd = draftConfig.cwd.trim();
-  if (!cwd) {
-    return undefined;
-  }
-
   const modeId = draftConfig.modeId?.trim() ?? "";
   const model = draftConfig.model?.trim() ?? "";
   const thinkingOptionId = draftConfig.thinkingOptionId?.trim() ?? "";
@@ -337,6 +333,35 @@ function resolveAutocompleteErrorMessage(args: {
   return undefined;
 }
 
+// A draft's agentId is a draft key the daemon does not know, so a draft lists
+// commands by its config only, and not at all until that config is complete.
+function resolveDraftCommandContext(draft: DraftCommandTarget | undefined) {
+  const queryDraftConfig = resolveDraftQueryConfig(draft);
+  const isDraftContext = draft !== undefined;
+  return {
+    isDraftContext,
+    queryDraftConfig,
+    canListCommands: !isDraftContext || queryDraftConfig !== undefined,
+  };
+}
+
+function resolveAutocompleteEmptyText(args: {
+  mode: AutocompleteMode;
+  draft: DraftCommandTarget | undefined;
+  t: TFunction;
+}): string {
+  if (args.mode === "file") {
+    return args.t("agentAutocomplete.noFiles");
+  }
+  if (args.draft?.status === "needs-project") {
+    return args.t("agentAutocomplete.chooseProjectForCommands");
+  }
+  if (args.draft?.status === "needs-provider") {
+    return args.t("agentAutocomplete.chooseModelForCommands");
+  }
+  return args.t("agentAutocomplete.noCommands");
+}
+
 export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAutocompleteResult {
   const { t } = useTranslation();
   const {
@@ -345,7 +370,7 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     setUserInput,
     serverId,
     agentId,
-    draftConfig,
+    draft,
     onAutocompleteApplied,
     onClientSlashCommand,
     canExecuteClientSlashCommand,
@@ -380,13 +405,10 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     return () => clearTimeout(timer);
   }, [fileFilterQuery]);
 
-  const normalizedDraftConfig = useMemo(
-    () => normalizeDraftCommandConfig(draftConfig),
-    [draftConfig],
+  const { isDraftContext, queryDraftConfig, canListCommands } = useMemo(
+    () => resolveDraftCommandContext(draft),
+    [draft],
   );
-
-  const isDraftContext = normalizedDraftConfig !== undefined;
-  const queryDraftConfig = normalizedDraftConfig;
   const canLoadCommands = resolveCanLoadCommands({ serverId, agentId, isDraftContext });
 
   const agentCwd = useSessionStore(
@@ -410,17 +432,14 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     autocompleteCwd,
   });
 
-  const {
-    commands,
-    isLoading: isCommandsLoading,
-    isError,
-    error,
-  } = useAgentCommandsQuery({
+  const commandsQuery = useAgentCommandsQuery({
     serverId,
     agentId,
-    enabled: mode === "command" && canLoadCommands,
+    enabled: mode === "command" && canLoadCommands && canListCommands,
     draftConfig: queryDraftConfig,
   });
+  const { commands, isError, error } = commandsQuery;
+  const isCommandsLoading = canListCommands && commandsQuery.isLoading;
 
   const isVisible = canShowAutocomplete && !(mode === "command" && isCommandsLoading);
 
@@ -587,8 +606,7 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     mode === "file"
       ? t("agentAutocomplete.searchingWorkspace")
       : t("agentAutocomplete.loadingCommands");
-  const emptyText =
-    mode === "file" ? t("agentAutocomplete.noFiles") : t("agentAutocomplete.noCommands");
+  const emptyText = resolveAutocompleteEmptyText({ mode, draft, t });
 
   return {
     isVisible,
diff --git a/packages/app/src/hooks/use-agent-commands-query.ts b/packages/app/src/hooks/use-agent-commands-query.ts
index e57184f536..eddc0ab02b 100644
--- a/packages/app/src/hooks/use-agent-commands-query.ts
+++ b/packages/app/src/hooks/use-agent-commands-query.ts
@@ -17,6 +17,12 @@ export interface AgentSlashCommand {
 
 export type DraftCommandConfig = AgentCommandsDraftConfig;
 
+/** What a draft composer can list commands for, before an agent exists. */
+export type DraftCommandTarget =
+  | { status: "ready"; config: DraftCommandConfig }
+  | { status: "needs-project" }
+  | { status: "needs-provider" };
+
 interface ListAgentCommandsOptions {
   agentId: string;
   draftConfig?: DraftCommandConfig;
diff --git a/packages/app/src/hooks/use-agent-form-state.ts b/packages/app/src/hooks/use-agent-form-state.ts
index 456ce249c2..26908bd6a0 100644
--- a/packages/app/src/hooks/use-agent-form-state.ts
+++ b/packages/app/src/hooks/use-agent-form-state.ts
@@ -6,7 +6,6 @@ import type {
   AgentProvider,
   ProviderSnapshotEntry,
 } from "@getpaseo/protocol/agent-types";
-import { useHosts } from "@/runtime/host-runtime";
 import { buildProviderDefinitions } from "@/utils/provider-definitions";
 import {
   buildSelectableProviderSelectorProviders,
@@ -27,7 +26,6 @@ import {
   normalizeSelectedModelId,
   resolveDefaultModelId,
   mergeSelectedComposerPreferences,
-  combineInitialValues,
   buildProviderDefinitionMap,
   buildProviderDefinitionMapForStatuses,
   INITIAL_AGENT_FORM_RESOLUTION,
@@ -43,18 +41,15 @@ import type { MaterializedAgentProfile } from "@/agent-profiles";
 export type { FormInitialValues } from "@/provider-selection/resolve-agent-form";
 
 export interface UseAgentFormStateOptions {
-  initialServerId?: string | null;
+  serverId: string | null;
+  workingDir: string;
   initialValues?: FormInitialValues;
   isVisible?: boolean;
   isCreateFlow?: boolean;
-  isTargetDaemonReady?: boolean;
-  onlineServerIds?: string[];
 }
 
 export interface UseAgentFormStateResult {
   selectedServerId: string | null;
-  setSelectedServerId: (value: string | null) => void;
-  setSelectedServerIdFromUser: (value: string | null) => void;
   selectedProvider: AgentProvider | null;
   selectedMode: string;
   setModeFromUser: (modeId: string) => void;
@@ -63,8 +58,6 @@ export interface UseAgentFormStateResult {
   selectedThinkingOptionId: string;
   setThinkingOptionFromUser: (thinkingOptionId: string) => void;
   workingDir: string;
-  setWorkingDir: (value: string) => void;
-  setWorkingDirFromUser: (value: string) => void;
   providerDefinitions: AgentProviderDefinition[];
   providerDefinitionMap: Map<AgentProvider, AgentProviderDefinition>;
   agentDefinition?: AgentProviderDefinition;
@@ -87,59 +80,6 @@ export interface UseAgentFormStateResult {
   persistFormPreferences: () => Promise<void>;
 }
 
-function shouldAutoSelectServerId(input: {
-  isVisible: boolean;
-  isCreateFlow: boolean;
-  isPreferencesLoading: boolean;
-  userModifiedServerId: boolean;
-  initialServerId: string | null | undefined;
-  currentServerId: string | null;
-}): boolean {
-  const {
-    isVisible,
-    isCreateFlow,
-    isPreferencesLoading,
-    userModifiedServerId,
-    initialServerId,
-    currentServerId,
-  } = input;
-  if (!isVisible || !isCreateFlow) return false;
-  if (isPreferencesLoading) return false;
-  if (userModifiedServerId) return false;
-  if (initialServerId !== undefined) return false;
-  if (currentServerId) return false;
-  return true;
-}
-
-function resolutionIntentKeyPart(value: string | null | undefined): string {
-  if (value === undefined) return "undefined";
-  if (value === null) return "null";
-  return value;
-}
-
-function buildResolutionIntentKey(initialValues: FormInitialValues | undefined): string {
-  if (!initialValues) return "none";
-  // workingDir seeds the open request, but locked cwd updates must not re-run
-  // provider/model/mode resolution after the form has settled.
-  return [
-    resolutionIntentKeyPart(initialValues.serverId),
-    resolutionIntentKeyPart(initialValues.provider),
-    resolutionIntentKeyPart(initialValues.modeId),
-    resolutionIntentKeyPart(initialValues.model),
-    resolutionIntentKeyPart(initialValues.thinkingOptionId),
-  ].join("\n");
-}
-
-function hasSnapshotDataForResolution(input: {
-  serverId: string | null;
-  snapshotEntries: ProviderSnapshotEntry[] | undefined;
-}): boolean {
-  if (!input.serverId) {
-    return false;
-  }
-  return input.snapshotEntries !== undefined;
-}
-
 function resolveSelectedProviderModes(input: {
   selectedEntry: ProviderSnapshotEntry | null;
   provider: AgentProvider | null;
@@ -170,7 +110,10 @@ function buildProviderModelsByProvider(
 ): ProviderModelsByProvider {
   const map: ProviderModelsByProvider = new Map();
   for (const entry of snapshotEntries ?? []) {
-    map.set(entry.provider, filterSelectableModels(entry.models ?? null));
+    map.set(
+      entry.provider,
+      entry.status === "ready" ? filterSelectableModels(entry.models ?? null) : null,
+    );
   }
   return map;
 }
@@ -201,15 +144,8 @@ async function persistProviderPreferences(input: {
   );
 }
 
-export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAgentFormStateResult {
-  const {
-    initialServerId = null,
-    initialValues,
-    isVisible = true,
-    isCreateFlow = true,
-    isTargetDaemonReady: _isTargetDaemonReady = true,
-    onlineServerIds = [],
-  } = options;
+export function useAgentFormState(options: UseAgentFormStateOptions): UseAgentFormStateResult {
+  const { serverId, initialValues, workingDir, isVisible = true, isCreateFlow = true } = options;
 
   const { preferences, isLoading: isPreferencesLoading, updatePreferences } = useFormPreferences();
   const preferenceOverlayRef = useRef(new OptimisticFormPreferences(preferences));
@@ -235,32 +171,11 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     [updatePreferences],
   );
 
-  const daemons = useHosts();
-
-  const validServerIds = useMemo(() => new Set(daemons.map((d) => d.serverId)), [daemons]);
-
-  const [{ form: formState, userModified, resolution }, dispatch] = useReducer(
-    resolveAgentForm,
-    initialServerId,
-    (serverId) => ({
-      form: {
-        serverId,
-        provider: null,
-        modeId: "",
-        model: "",
-        thinkingOptionId: "",
-        workingDir: "",
-      },
-      userModified: INITIAL_USER_MODIFIED,
-      resolution: INITIAL_AGENT_FORM_RESOLUTION,
-    }),
-  );
-
-  useEffect(() => {
-    if (!isVisible) {
-      dispatch({ type: "RESET" });
-    }
-  }, [isVisible]);
+  const [{ form: formState, userModified, resolution }, dispatch] = useReducer(resolveAgentForm, {
+    form: { provider: null, modeId: "", model: "", thinkingOptionId: "" },
+    userModified: INITIAL_USER_MODIFIED,
+    resolution: INITIAL_AGENT_FORM_RESOLUTION,
+  });
 
   const {
     entries: snapshotEntries,
@@ -269,7 +184,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     error: snapshotError,
     refresh: refreshSnapshot,
     refetchIfStale: refetchSnapshotIfStale,
-  } = useProvidersSnapshot(formState.serverId, { cwd: formState.workingDir });
+  } = useProvidersSnapshot(serverId, { cwd: workingDir });
 
   const allProviderEntries = useMemo(() => snapshotEntries ?? [], [snapshotEntries]);
   const snapshotProviderDefinitions = useMemo(
@@ -335,91 +250,31 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     resolution.status === "pending" || snapshotIsLoading || selectedProviderIsLoading;
   const isAllModelsLoading = isModelSelectionLoading;
 
-  const combinedInitialValues = useMemo(
-    () => combineInitialValues(initialValues, initialServerId),
-    [initialValues, initialServerId],
-  );
-  const resolutionIntentKey = useMemo(
-    () => buildResolutionIntentKey(combinedInitialValues),
-    [combinedInitialValues],
-  );
-
   useEffect(() => {
-    if (!isVisible || !isCreateFlow) {
-      return;
-    }
-
-    dispatch({ type: "REQUEST_RESOLUTION" });
-  }, [isVisible, isCreateFlow, resolutionIntentKey]);
-
-  useEffect(() => {
-    if (!isVisible || !isCreateFlow || resolution.status !== "pending") {
-      return;
-    }
-    if (isPreferencesLoading) {
-      return;
-    }
-    if (
-      !hasSnapshotDataForResolution({
-        serverId: formState.serverId,
-        snapshotEntries,
-      })
-    ) {
-      return;
-    }
-
     dispatch({
-      type: "COMPLETE_RESOLUTION",
-      initialValues: combinedInitialValues,
+      type: "INPUTS_CHANGED",
+      serverId,
+      isVisible,
+      isCreateFlow,
+      isPreferencesLoading,
+      hasSnapshot: snapshotEntries !== undefined,
+      initialValues,
       preferences,
       providerModelsByProvider: snapshotProviderModelsByProvider,
       allowedProviderMap: snapshotResolvableProviderDefinitionMap,
     });
   }, [
-    combinedInitialValues,
-    formState.serverId,
+    serverId,
+    isVisible,
     isCreateFlow,
     isPreferencesLoading,
-    isVisible,
-    preferences,
-    resolution.status,
     snapshotEntries,
+    initialValues,
+    preferences,
     snapshotProviderModelsByProvider,
     snapshotResolvableProviderDefinitionMap,
   ]);
 
-  const onlineServerIdsKey = onlineServerIds.join("|");
-  useEffect(() => {
-    const canAutoSelectServerId = shouldAutoSelectServerId({
-      isVisible,
-      isCreateFlow,
-      isPreferencesLoading,
-      userModifiedServerId: userModified.serverId,
-      initialServerId: combinedInitialValues?.serverId,
-      currentServerId: formState.serverId,
-    });
-    if (!canAutoSelectServerId) return;
-
-    const candidate = onlineServerIds.find((id) => validServerIds.has(id)) ?? null;
-    if (!candidate) return;
-
-    dispatch({ type: "AUTO_SELECT_SERVER", candidateServerId: candidate });
-  }, [
-    combinedInitialValues?.serverId,
-    isCreateFlow,
-    isPreferencesLoading,
-    isVisible,
-    onlineServerIds,
-    onlineServerIdsKey,
-    formState.serverId,
-    userModified.serverId,
-    validServerIds,
-  ]);
-
-  const setSelectedServerIdFromUser = useCallback((value: string | null) => {
-    dispatch({ type: "SET_SERVER_ID_FROM_USER", value });
-  }, []);
-
   const setProviderAndModelFromUser = useCallback(
     (provider: AgentProvider, modelId: string) => {
       if (!selectableProviderDefinitionMap.has(provider)) {
@@ -579,18 +434,6 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     [formState, updateCurrentPreferences],
   );
 
-  const setWorkingDir = useCallback((value: string) => {
-    dispatch({ type: "SET_WORKING_DIR", value });
-  }, []);
-
-  const setWorkingDirFromUser = useCallback((value: string) => {
-    dispatch({ type: "SET_WORKING_DIR_FROM_USER", value });
-  }, []);
-
-  const setSelectedServerId = useCallback((value: string | null) => {
-    dispatch({ type: "SET_SERVER_ID", value });
-  }, []);
-
   const refreshProviderModels = useCallback(
     (provider?: AgentProvider) => {
       void refreshSnapshot(provider ? [provider] : undefined);
@@ -626,13 +469,11 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
   const isModelLoading = isModelSelectionLoading;
   const modelError = snapshotError;
 
-  const workingDirIsEmpty = !formState.workingDir.trim();
+  const workingDirIsEmpty = !workingDir.trim();
 
   return useMemo(
     () => ({
-      selectedServerId: formState.serverId,
-      setSelectedServerId,
-      setSelectedServerIdFromUser,
+      selectedServerId: serverId,
       selectedProvider: formState.provider,
       selectedMode: formState.modeId,
       setModeFromUser,
@@ -640,9 +481,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       setModelFromUser,
       selectedThinkingOptionId: formState.thinkingOptionId,
       setThinkingOptionFromUser,
-      workingDir: formState.workingDir,
-      setWorkingDir,
-      setWorkingDirFromUser,
+      workingDir,
       providerDefinitions,
       providerDefinitionMap,
       agentDefinition,
@@ -665,19 +504,15 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       persistFormPreferences,
     }),
     [
-      formState.serverId,
+      serverId,
       formState.provider,
       formState.modeId,
       formState.model,
       formState.thinkingOptionId,
-      formState.workingDir,
-      setSelectedServerId,
-      setSelectedServerIdFromUser,
+      workingDir,
       setModeFromUser,
       setModelFromUser,
       setThinkingOptionFromUser,
-      setWorkingDir,
-      setWorkingDirFromUser,
       providerDefinitions,
       providerDefinitionMap,
       agentDefinition,
diff --git a/packages/app/src/hooks/use-agent-history.test.ts b/packages/app/src/hooks/use-agent-history.test.ts
index 3fcdd3df5c..d4da1f01bb 100644
--- a/packages/app/src/hooks/use-agent-history.test.ts
+++ b/packages/app/src/hooks/use-agent-history.test.ts
@@ -311,10 +311,10 @@ describe("fetchAgentHistoryPage", () => {
     });
 
     expect(client.calls[0]?.search).toBe("stripe");
-    expect(page.searchScoreByAgentKey).toEqual({ "server-1:match": 1000 });
+    expect(page.agents.map((agent) => agent.id)).toEqual(["match"]);
   });
 
-  it("keeps per-host scores apart when two hosts issue the same agent id", async () => {
+  it("keeps sessions with the same id on different hosts and sorts by recency", async () => {
     const sharedId = "collision";
     const serverAClient = createClient([
       historyPayload({
@@ -352,13 +352,9 @@ describe("fetchAgentHistoryPage", () => {
       search: "match",
     });
 
-    expect(page.searchScoreByAgentKey).toEqual({
-      "server-a:collision": 4000,
-      "server-b:collision": 1000,
-    });
     expect(page.agents.map((agent) => agent.title)).toEqual([
-      "Strong match on B",
       "Weak match on A",
+      "Strong match on B",
     ]);
   });
 
@@ -395,9 +391,8 @@ describe("fetchAgentHistoryPage", () => {
     });
   });
 
-  it("reports truncation when two complete host pages overflow the merge", async () => {
-    // Neither host is locally truncated; together they exceed what the merged
-    // list can show, and the footer has to say so.
+  it("preserves every matching row when merging complete host pages", async () => {
+    // Each host owns its cursor; merging must not discard rows already consumed.
     const buildHost = (serverId: string, count: number) =>
       createClient([
         historyPayload({
@@ -422,8 +417,8 @@ describe("fetchAgentHistoryPage", () => {
       search: "match",
     });
 
-    expect(page.isSearchTruncated).toBe(true);
-    expect(page.agents).toHaveLength(200);
+    expect(page.isSearchTruncated).toBe(false);
+    expect(page.agents).toHaveLength(300);
   });
 
   it("names the host that failed instead of quietly shortening the list", async () => {
@@ -515,7 +510,7 @@ describe("fetchAgentHistoryPage", () => {
       }),
     ).toEqual([{ serverId: "server-b", serverName: "Linux box" }]);
   });
-  it("orders a searched all-host page by relevance instead of recency", async () => {
+  it("orders searched history chronologically regardless of match strength", async () => {
     const serverAClient = createClient([
       historyPayload({
         entries: [
@@ -553,8 +548,8 @@ describe("fetchAgentHistoryPage", () => {
     });
 
     expect(page.agents.map((agent) => agent.id)).toEqual([
-      "older-strong-match",
       "newer-weak-match",
+      "older-strong-match",
     ]);
   });
 
@@ -588,6 +583,7 @@ describe("fetchAgentHistoryPage", () => {
         { serverId: "server-b", serverLabel: "Linux box", client: serverBClient },
       ] satisfies AgentHistoryHost[],
       cursorByServerId: { "server-b": "cursor-b" },
+      search: "match",
     });
 
     expect(page.agents.map((agent) => agent.id)).toEqual(["next-b"]);
@@ -596,6 +592,7 @@ describe("fetchAgentHistoryPage", () => {
       {
         sort: [{ key: "updated_at", direction: "desc" }],
         page: { limit: 200, cursor: "cursor-b" },
+        search: "match",
       } satisfies FetchAgentHistoryOptions,
     ]);
   });
diff --git a/packages/app/src/hooks/use-agent-history.ts b/packages/app/src/hooks/use-agent-history.ts
index b24c5f8ee7..96b0395e76 100644
--- a/packages/app/src/hooks/use-agent-history.ts
+++ b/packages/app/src/hooks/use-agent-history.ts
@@ -3,7 +3,6 @@ import type {
   FetchAgentHistoryOptions,
   FetchAgentHistoryPageInfo,
 } from "@getpaseo/client/internal/daemon-client";
-import type { AgentSearchMatch } from "@getpaseo/protocol/messages";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { useCallback, useMemo, useSyncExternalStore } from "react";
 import { useTranslation } from "react-i18next";
@@ -31,8 +30,6 @@ export interface AgentHistoryResult {
   isSearchSupported: boolean;
   /** More sessions matched than the ranked page holds. Narrow the query. */
   isSearchTruncated: boolean;
-  /** Where the query matched each row, keyed by `serverId:agentId`. */
-  searchMatchesByAgentKey: Record<string, AgentSearchMatch[]>;
   /** Hosts that failed while others succeeded. The list still renders. */
   hostErrors: AgentHistoryHostError[];
   refreshAll: () => Promise<void>;
@@ -41,26 +38,11 @@ export interface AgentHistoryResult {
 
 export interface AgentHistoryPage {
   agents: AggregatedAgent[];
-  /**
-   * Relevance of each agent to the request's search, keyed by `serverId:agentId`
-   * because that pair — not the bare agent id — is what identifies a row across
-   * hosts. Empty without a query. Each host ranks only its own sessions, so
-   * merging several of them into one list needs the scores rather than each
-   * host's row order.
-   */
-  searchScoreByAgentKey: Record<string, number>;
-  /** Where the query matched in each row, keyed like `searchScoreByAgentKey`. */
-  searchMatchesByAgentKey: Record<string, AgentSearchMatch[]>;
   pageInfo: FetchAgentHistoryPageInfo;
   /** More matched this host's query than its page could hold. */
   isSearchTruncated: boolean;
 }
 
-/** Identity of a history row. A bare agent id belongs to exactly one host. */
-export function agentHistoryRowKey(agent: { serverId: string; id: string }): string {
-  return `${agent.serverId}:${agent.id}`;
-}
-
 export type AgentHistoryClient = Pick<DaemonClient, "fetchAgentHistory">;
 
 /**
@@ -81,17 +63,12 @@ export interface AgentHistoryHost {
 
 interface AgentHistoryBatchPage {
   agents: AggregatedAgent[];
-  searchScoreByAgentKey: Record<string, number>;
-  searchMatchesByAgentKey: Record<string, AgentSearchMatch[]>;
   pageInfoByServerId: Record<string, FetchAgentHistoryPageInfo>;
   hostErrors: AgentHistoryHostError[];
   /** Set only under a query: more sessions matched than this page can hold. */
   isSearchTruncated?: boolean;
 }
 
-/** Sorts unmatched rows last so a page missing scores keeps its own order. */
-const UNRANKED = Number.POSITIVE_INFINITY;
-
 type AgentHistoryCursorByServerId = Record<string, string | null>;
 
 export async function fetchAgentHistoryPage(input: {
@@ -112,21 +89,7 @@ export async function fetchAgentHistoryPage(input: {
     serverId: input.serverId,
     entries: payload.entries,
   });
-  const searchScoreByAgentKey: Record<string, number> = {};
-  const searchMatchesByAgentKey: Record<string, AgentSearchMatch[]> = {};
-  for (const entry of payload.entries) {
-    const key = agentHistoryRowKey({ serverId: input.serverId, id: entry.agent.id });
-    if (entry.searchScore !== undefined) {
-      searchScoreByAgentKey[key] = entry.searchScore;
-    }
-    if (entry.searchMatches && entry.searchMatches.length > 0) {
-      searchMatchesByAgentKey[key] = entry.searchMatches;
-    }
-  }
-
   return {
-    searchScoreByAgentKey,
-    searchMatchesByAgentKey,
     isSearchTruncated: payload.searchTruncated === true,
     agents: Array.from(agents.values(), (agent) => ({
       id: agent.id,
@@ -134,6 +97,7 @@ export async function fetchAgentHistoryPage(input: {
       serverLabel: input.serverId,
       title: agent.title ?? null,
       status: agent.status,
+      turn: agent.turn,
       lastActivityAt: agent.lastActivityAt,
       cwd: agent.cwd,
       workspaceId: agent.workspaceId,
@@ -155,30 +119,6 @@ function sortByLatestActivity(agents: AggregatedAgent[]): AggregatedAgent[] {
   return [...agents].sort((a, b) => b.lastActivityAt.getTime() - a.lastActivityAt.getTime());
 }
 
-/**
- * Relevance first, recency to break ties. A search result list ordered by time
- * would bury the row the user described in favour of the row they last touched.
- *
- * Truncating the merge back to one page's worth is what makes the merged list
- * globally correct: the best N matches overall are always contained in the
- * union of each host's own best N, so keeping more than N here would be showing
- * rows that a further host could still outrank.
- */
-function mergeByRelevance(
-  agents: AggregatedAgent[],
-  searchScoreByAgentKey: Record<string, number>,
-  limit: number,
-): AggregatedAgent[] {
-  return [...agents]
-    .sort((a, b) => {
-      const scoreA = searchScoreByAgentKey[agentHistoryRowKey(a)] ?? UNRANKED;
-      const scoreB = searchScoreByAgentKey[agentHistoryRowKey(b)] ?? UNRANKED;
-      if (scoreA !== scoreB) return scoreA - scoreB;
-      return b.lastActivityAt.getTime() - a.lastActivityAt.getTime();
-    })
-    .slice(0, limit);
-}
-
 /**
  * Which hosts are missing from the list the user is looking at.
  *
@@ -264,30 +204,13 @@ export async function fetchAgentHistoryBatch(input: {
   const pageInfoByServerId = Object.fromEntries(
     pages.map(({ host, page }) => [host.serverId, page.pageInfo]),
   );
-  const searchScoreByAgentKey = Object.assign(
-    {},
-    ...pages.map(({ page }) => page.searchScoreByAgentKey),
-  ) as Record<string, number>;
-  const searchMatchesByAgentKey = Object.assign(
-    {},
-    ...pages.map(({ page }) => page.searchMatchesByAgentKey),
-  ) as Record<string, AgentSearchMatch[]>;
-  // Truncation has two independent sources: one host overflowed its own page,
-  // or several hosts each fit but their union does not. Two hosts returning 150
-  // matches apiece are both complete and still add up to more than the merge
-  // can show.
-  const truncated =
-    pages.some(({ page }) => page.isSearchTruncated) || agents.length > AGENT_HISTORY_PAGE_LIMIT;
-
   return {
-    agents: input.search
-      ? mergeByRelevance(agents, searchScoreByAgentKey, AGENT_HISTORY_PAGE_LIMIT)
-      : sortByLatestActivity(agents),
-    searchScoreByAgentKey,
-    searchMatchesByAgentKey,
+    agents: sortByLatestActivity(agents),
     pageInfoByServerId,
     hostErrors,
-    ...(input.search ? { isSearchTruncated: truncated } : {}),
+    ...(input.search
+      ? { isSearchTruncated: pages.some(({ page }) => page.isSearchTruncated) }
+      : {}),
   };
 }
 
@@ -419,28 +342,11 @@ export function useAgentHistory(options: {
         serverLabel: serverLabelById.get(agent.serverId) ?? agent.serverLabel,
       }),
     );
-    if (!search) {
-      return sortByLatestActivity(labelledAgents);
-    }
-    // A searched query never has a second page, so this is re-merging one page
-    // after relabelling rather than stitching a stream back together.
-    const searchScoreByAgentKey = Object.assign(
-      {},
-      ...pages.map((page) => page.searchScoreByAgentKey),
-    ) as Record<string, number>;
-    return mergeByRelevance(labelledAgents, searchScoreByAgentKey, AGENT_HISTORY_PAGE_LIMIT);
-  }, [data?.pages, search, serverLabelById]);
+    return sortByLatestActivity(labelledAgents);
+  }, [data?.pages, serverLabelById]);
   const isInitialLoad = isLoading && agents.length === 0;
   const isRevalidating = isFetching && !isFetchingNextPage && agents.length > 0;
   const isSearchTruncated = Boolean(search && data?.pages.some((page) => page.isSearchTruncated));
-  const searchMatchesByAgentKey = useMemo(
-    () =>
-      Object.assign(
-        {},
-        ...(data?.pages ?? []).map((page) => page.searchMatchesByAgentKey),
-      ) as Record<string, AgentSearchMatch[]>,
-    [data?.pages],
-  );
   const hostErrors = useMemo(
     () => collectAgentHistoryHostErrors({ pages: data?.pages ?? [], unreachableHosts }),
     [data?.pages, unreachableHosts],
@@ -452,13 +358,10 @@ export function useAgentHistory(options: {
     isInitialLoad,
     isRevalidating,
     isError,
-    // Under a query the daemon returns the best matches and no cursor, so the
-    // list is complete as far as it goes and "Load more" would be a lie.
-    hasMore: search ? false : hasNextPage,
+    hasMore: hasNextPage,
     isLoadingMore: isFetchingNextPage,
     isSearchSupported,
     isSearchTruncated,
-    searchMatchesByAgentKey,
     hostErrors,
     refreshAll,
     loadMore,
diff --git a/packages/app/src/hooks/use-agent-screen-state-machine.test.ts b/packages/app/src/hooks/use-agent-screen-state-machine.test.ts
index a7ed05e906..19caef4f8b 100644
--- a/packages/app/src/hooks/use-agent-screen-state-machine.test.ts
+++ b/packages/app/src/hooks/use-agent-screen-state-machine.test.ts
@@ -17,7 +17,7 @@ function createAgent(id: string): Agent {
     id,
     provider: "claude",
     status: "running",
-    activeTurn: { turnId: "turn-1", startedAt: now },
+    turn: { phase: "open", turnId: "turn-1", startedAt: now, cancellationRequestId: null },
     createdAt: now,
     updatedAt: now,
     lastUserMessageAt: now,
@@ -175,7 +175,7 @@ describe("deriveAgentScreenViewState", () => {
     expect(sync.ui).toBe("overlay");
   });
 
-  it("uses silent catching-up state for already-hydrated agents", () => {
+  it("shows updating status for already-hydrated agents", () => {
     const memory = createBaseMemory({
       hasRenderedReady: true,
       lastReadyAgent: createAgent("agent-1"),
@@ -190,7 +190,7 @@ describe("deriveAgentScreenViewState", () => {
     const ready = expectReadyState(result.state);
     const sync = expectCatchingUpSync(ready);
 
-    expect(sync.ui).toBe("silent");
+    expect(sync.ui).toBe("status");
   });
 
   it("keeps hydrated history visible while reconnect revalidation and visibility catch-up overlap", () => {
@@ -209,7 +209,7 @@ describe("deriveAgentScreenViewState", () => {
     const ready = expectReadyState(result.state);
     const sync = expectCatchingUpSync(ready);
 
-    expect(sync.ui).toBe("silent");
+    expect(sync.ui).toBe("status");
   });
 
   it("keeps already-hydrated history visible while a newly visible agent catches up", () => {
@@ -228,7 +228,7 @@ describe("deriveAgentScreenViewState", () => {
     const ready = expectReadyState(result.state);
     const sync = expectCatchingUpSync(ready);
 
-    expect(sync.ui).toBe("silent");
+    expect(sync.ui).toBe("status");
   });
 
   it("keeps hydrated history readable after a visibility catch-up error", () => {
@@ -607,7 +607,7 @@ describe("deriveAgentScreenViewState", () => {
     const ready = expectReadyState(result.state);
     const sync = expectCatchingUpSync(ready);
 
-    expect(sync.ui).toBe("silent");
+    expect(sync.ui).toBe("status");
     expect(result.memory.hadInitialSyncFailure).toBe(false);
   });
 });
diff --git a/packages/app/src/hooks/use-agent-screen-state-machine.ts b/packages/app/src/hooks/use-agent-screen-state-machine.ts
index df128e4f2f..591fd1abb1 100644
--- a/packages/app/src/hooks/use-agent-screen-state-machine.ts
+++ b/packages/app/src/hooks/use-agent-screen-state-machine.ts
@@ -82,7 +82,7 @@ export type AgentScreenReadySyncState =
   | { status: "reconnecting" }
   | {
       status: "catching_up";
-      ui: "overlay" | "silent";
+      ui: "overlay" | "status" | "silent";
     }
   | { status: "sync_error"; isRetrying: boolean };
 
@@ -162,9 +162,9 @@ function resolveCatchingUpUi(args: {
   isVisibilityCatchUpPending: boolean;
   hasHydratedHistoryBefore: boolean;
   hadInitialSyncFailure: boolean;
-}): "overlay" | "silent" {
+}): "overlay" | "status" | "silent" {
   if (args.hasOptimisticCreateContinuity) return "silent";
-  if (args.hasHydratedHistoryBefore) return "silent";
+  if (args.hasHydratedHistoryBefore) return "status";
   if (args.isVisibilityCatchUpPending) return "overlay";
   if (args.hadInitialSyncFailure) return "silent";
   return "overlay";
diff --git a/packages/app/src/hooks/use-aggregated-agents.ts b/packages/app/src/hooks/use-aggregated-agents.ts
index 1a016e9b13..78cca7fbb3 100644
--- a/packages/app/src/hooks/use-aggregated-agents.ts
+++ b/packages/app/src/hooks/use-aggregated-agents.ts
@@ -85,6 +85,7 @@ export function useAggregatedAgents(options?: {
           serverLabel,
           title: agent.title ?? null,
           status: agent.status,
+          turn: agent.turn,
           lastActivityAt: agent.lastActivityAt,
           cwd: agent.cwd,
           workspaceId: agent.workspaceId,
@@ -108,8 +109,8 @@ export function useAggregatedAgents(options?: {
 
     // Sort by: running agents first, then by most recent activity
     allAgents.sort((left, right) => {
-      const leftRunning = left.status === "running";
-      const rightRunning = right.status === "running";
+      const leftRunning = left.turn.phase === "open";
+      const rightRunning = right.turn.phase === "open";
       if (leftRunning && !rightRunning) {
         return -1;
       }
diff --git a/packages/app/src/hooks/use-archive-agent.test.ts b/packages/app/src/hooks/use-archive-agent.test.ts
index cd4d433f74..df14f2df38 100644
--- a/packages/app/src/hooks/use-archive-agent.test.ts
+++ b/packages/app/src/hooks/use-archive-agent.test.ts
@@ -1,6 +1,7 @@
+import { seedSessionHosts } from "@/test/seed-session";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { QueryClient } from "@tanstack/react-query";
-import { beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import type { Agent } from "@/stores/session-store";
 import { useSessionStore } from "@/stores/session-store";
 import { agentHistoryQueryKey, allAgentHistoryQueryKey } from "./agent-history-query-key";
@@ -41,13 +42,15 @@ function makeAgent(overrides: Partial<Agent> = {}): Agent {
     labels: {},
     archivedAt: null,
     ...overrides,
-    activeTurn: overrides.activeTurn ?? null,
+    turn: overrides.turn ?? { phase: "idle", cancellationRequestId: null },
   };
 }
 
 describe("useArchiveAgent", () => {
+  afterEach(() => seedSessionHosts([]));
   beforeEach(() => {
     useSessionStore.setState((state) => ({ ...state, sessions: {} }));
+    seedSessionHosts(["server-a"]);
   });
 
   it("tracks pending archive state in shared react-query cache", () => {
diff --git a/packages/app/src/hooks/use-archive-agent.ts b/packages/app/src/hooks/use-archive-agent.ts
index 437ed6df49..92d8e4d2d6 100644
--- a/packages/app/src/hooks/use-archive-agent.ts
+++ b/packages/app/src/hooks/use-archive-agent.ts
@@ -1,3 +1,4 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useCallback, useMemo } from "react";
 import {
   useMutation,
@@ -247,27 +248,7 @@ function getStoredAgentSnapshot(input: ArchiveAgentInput) {
 function restoreAgentSnapshot(
   input: ArchiveAgentInput & { agent: ReturnType<typeof getStoredAgentSnapshot> },
 ): void {
-  const setAgents = useSessionStore.getState().setAgents;
-  setAgents(input.serverId, (prev) => {
-    const hasAgent = prev.has(input.agentId);
-    if (!input.agent) {
-      if (!hasAgent) {
-        return prev;
-      }
-      const next = new Map(prev);
-      next.delete(input.agentId);
-      return next;
-    }
-
-    const current = prev.get(input.agentId);
-    if (current === input.agent) {
-      return prev;
-    }
-
-    const next = new Map(prev);
-    next.set(input.agentId, input.agent);
-    return next;
-  });
+  getHostRuntimeStore().restoreAgentSnapshot(input.serverId, input.agentId, input.agent);
 }
 
 function getArchivedAgentListCacheSnapshot(
@@ -324,22 +305,11 @@ function markAgentArchivedInStore(input: ArchiveAgentInput & { archivedAt: strin
     return;
   }
 
-  const setAgents = useSessionStore.getState().setAgents;
-  setAgents(input.serverId, (prev) => {
-    const existing = prev.get(input.agentId);
-    if (!existing) {
-      return prev;
-    }
-    if (existing.archivedAt && existing.archivedAt.getTime() === archivedAt.getTime()) {
-      return prev;
-    }
-    const next = new Map(prev);
-    next.set(input.agentId, {
-      ...existing,
-      archivedAt,
-    });
-    return next;
-  });
+  getHostRuntimeStore().archiveAgentSnapshot(
+    input.serverId,
+    input.agentId,
+    archivedAt.toISOString(),
+  );
 }
 
 interface ApplyArchivedAgentCloseResultsInput {
diff --git a/packages/app/src/hooks/use-clear-workspace-attention.ts b/packages/app/src/hooks/use-clear-workspace-attention.ts
deleted file mode 100644
index 0ba74c97e6..0000000000
--- a/packages/app/src/hooks/use-clear-workspace-attention.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { i18n } from "@/i18n/i18next";
-import { getHostRuntimeStore } from "@/runtime/host-runtime";
-import { useSessionStore } from "@/stores/session-store";
-
-export interface ClearWorkspaceAttentionController {
-  hasClearableAttention: boolean;
-  clearAttention: () => Promise<void>;
-}
-
-export function useClearWorkspaceAttention({
-  serverId,
-  workspaceId,
-}: {
-  serverId: string;
-  workspaceId: string;
-}): ClearWorkspaceAttentionController {
-  const hasClearableAttention = useSessionStore((state) => {
-    const workspace = state.sessions[serverId]?.workspaces.get(workspaceId);
-    return workspace?.status === "attention" || workspace?.status === "failed";
-  });
-
-  const clearAttention = useCallback(async () => {
-    if (!hasClearableAttention) {
-      return;
-    }
-    const client = getHostRuntimeStore().getClient(serverId);
-    if (!client) {
-      throw new Error(i18n.t("workspace.terminal.hostDisconnected"));
-    }
-    await client.clearWorkspaceAttention(workspaceId);
-  }, [hasClearableAttention, serverId, workspaceId]);
-
-  return useMemo(
-    () => ({ hasClearableAttention, clearAttention }),
-    [clearAttention, hasClearableAttention],
-  );
-}
diff --git a/packages/app/src/hooks/use-dictation-audio-source.native.ts b/packages/app/src/hooks/use-dictation-audio-source.native.ts
index aa50a8eead..293412fe1a 100644
--- a/packages/app/src/hooks/use-dictation-audio-source.native.ts
+++ b/packages/app/src/hooks/use-dictation-audio-source.native.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef } from "react";
 import { Buffer } from "buffer";
 import { useState } from "react";
 
-import { createAudioEngine } from "@/voice/audio-engine";
+import { createAudioEngine } from "@/audio";
 
 import type {
   DictationAudioSource,
diff --git a/packages/app/src/hooks/use-dictation-audio-source.web.ts b/packages/app/src/hooks/use-dictation-audio-source.web.ts
index afb4b44499..c482bece18 100644
--- a/packages/app/src/hooks/use-dictation-audio-source.web.ts
+++ b/packages/app/src/hooks/use-dictation-audio-source.web.ts
@@ -1,3 +1,4 @@
+import { resampleToPcm16 } from "@/audio/pcm";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { parsePcm16Wav } from "@/utils/pcm16-wav";
 import { isElectronRuntime } from "@/desktop/host";
@@ -17,41 +18,6 @@ const getAudioContextCtor = (): typeof AudioContext | null => {
   return ctor ?? null;
 };
 
-const floatToInt16 = (sample: number): number => {
-  const clamped = Math.max(-1, Math.min(1, sample));
-  return clamped < 0 ? Math.round(clamped * 0x8000) : Math.round(clamped * 0x7fff);
-};
-
-const resampleToPcm16 = (
-  input: Float32Array,
-  inputRate: number,
-  outputRate: number,
-): Int16Array => {
-  if (input.length === 0) {
-    return new Int16Array(0);
-  }
-  if (inputRate === outputRate) {
-    const out = new Int16Array(input.length);
-    for (let i = 0; i < input.length; i++) {
-      out[i] = floatToInt16(input[i]);
-    }
-    return out;
-  }
-
-  const ratio = inputRate / outputRate;
-  const outputLength = Math.max(1, Math.round(input.length / ratio));
-  const out = new Int16Array(outputLength);
-  for (let i = 0; i < outputLength; i++) {
-    const sourceIndex = i * ratio;
-    const i0 = Math.floor(sourceIndex);
-    const i1 = Math.min(input.length - 1, i0 + 1);
-    const frac = sourceIndex - i0;
-    const sample = input[i0] * (1 - frac) + input[i1] * frac;
-    out[i] = floatToInt16(sample);
-  }
-  return out;
-};
-
 const concatInt16 = (a: Int16Array, b: Int16Array): Int16Array => {
   if (a.length === 0) {
     return b;
diff --git a/packages/app/src/hooks/use-file-picker.ts b/packages/app/src/hooks/use-file-picker.ts
index f75e6eb857..44f7c6b0db 100644
--- a/packages/app/src/hooks/use-file-picker.ts
+++ b/packages/app/src/hooks/use-file-picker.ts
@@ -4,9 +4,9 @@ import { File } from "expo-file-system";
 import { getDesktopHost, isElectronRuntime } from "@/desktop/host";
 import { isWeb } from "@/constants/platform";
 import { getMimeTypeFromPath } from "@/attachments/file-types";
-import { readDesktopFileBytes, type PickedFile } from "@/attachments/picked-file";
+import { readDesktopFileBytes, type SelectedFile } from "@/attachments/selected-file";
 
-async function pickFilesWithDesktopDialog(): Promise<PickedFile[] | null> {
+async function pickFilesWithDesktopDialog(): Promise<SelectedFile[] | null> {
   const dialog = getDesktopHost()?.dialog;
   const dialogOpen = dialog?.open;
   if (typeof dialogOpen !== "function") {
@@ -27,20 +27,18 @@ async function pickFilesWithDesktopDialog(): Promise<PickedFile[] | null> {
     return null;
   }
 
-  const result: PickedFile[] = [];
+  const result: SelectedFile[] = [];
 
   for (const filePath of paths) {
     const fileName = filePath.split("/").pop() ?? filePath.split("\\").pop() ?? filePath;
     const mimeType = getMimeTypeFromPath(filePath);
-    const bytes = await readDesktopFileBytes(filePath);
-
-    result.push({ fileName, mimeType, bytes });
+    result.push({ fileName, mimeType, readBytes: () => readDesktopFileBytes(filePath) });
   }
 
   return result;
 }
 
-function pickFilesWithWebInput(): Promise<PickedFile[] | null> {
+function pickFilesWithWebInput(): Promise<SelectedFile[] | null> {
   return new Promise((resolve) => {
     const input = document.createElement("input");
     input.type = "file";
@@ -54,13 +52,12 @@ function pickFilesWithWebInput(): Promise<PickedFile[] | null> {
         return;
       }
 
-      const result: PickedFile[] = [];
+      const result: SelectedFile[] = [];
       for (const file of files) {
-        const bytes = new Uint8Array(await file.arrayBuffer());
         result.push({
           fileName: file.name,
           mimeType: file.type || getMimeTypeFromPath(file.name),
-          bytes,
+          readBytes: async () => new Uint8Array(await file.arrayBuffer()),
         });
       }
       resolve(result);
@@ -80,7 +77,7 @@ function pickFilesWithWebInput(): Promise<PickedFile[] | null> {
   });
 }
 
-async function pickFilesWithDocumentPicker(): Promise<PickedFile[] | null> {
+async function pickFilesWithDocumentPicker(): Promise<SelectedFile[] | null> {
   const result = await DocumentPicker.getDocumentAsync({
     multiple: true,
     copyToCacheDirectory: true,
@@ -90,19 +87,17 @@ async function pickFilesWithDocumentPicker(): Promise<PickedFile[] | null> {
     return null;
   }
 
-  return await Promise.all(
-    result.assets.map(async (asset) => ({
-      fileName: asset.name,
-      mimeType: asset.mimeType ?? getMimeTypeFromPath(asset.name),
-      bytes: await new File(asset.uri).bytes(),
-    })),
-  );
+  return result.assets.map((asset) => ({
+    fileName: asset.name,
+    mimeType: asset.mimeType ?? getMimeTypeFromPath(asset.name),
+    readBytes: () => new File(asset.uri).bytes(),
+  }));
 }
 
 export function useFilePicker() {
   const isPickingRef = useRef(false);
 
-  const pickFiles = useCallback(async (): Promise<PickedFile[] | null> => {
+  const pickFiles = useCallback(async (): Promise<SelectedFile[] | null> => {
     if (isPickingRef.current) {
       return null;
     }
diff --git a/packages/app/src/hooks/use-keyboard-shortcuts.ts b/packages/app/src/hooks/use-keyboard-shortcuts.ts
index 057efef369..d723b5be04 100644
--- a/packages/app/src/hooks/use-keyboard-shortcuts.ts
+++ b/packages/app/src/hooks/use-keyboard-shortcuts.ts
@@ -27,6 +27,7 @@ import {
 } from "@/keyboard/route-shortcut";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import { useOpenAddProject } from "@/hooks/use-open-add-project";
+import { useStableEvent } from "@/hooks/use-stable-event";
 import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";
 import { isNative } from "@/constants/platform";
 import { keyboardShortcutsAvailable } from "@/keyboard/availability";
@@ -75,7 +76,6 @@ export function useKeyboardShortcuts({
   const openProjectPickerAction = useOpenAddProject();
   const activeWorkspaceSelection = useActiveWorkspaceSelection();
   const keyboardWorkspaceSelectionRef = useRef<ActiveWorkspaceSelection | null>(null);
-  const badgeModifierKeyRef = useRef<string | null | undefined>(undefined);
 
   const publishBrowserShortcutPolicy = useCallback(
     (chordState?: ChordState) => {
@@ -107,271 +107,285 @@ export function useKeyboardShortcuts({
     publishBrowserShortcutPolicy();
   }, [isDesktopApp, publishBrowserShortcutPolicy]);
 
+  // Only the modifier that actually performs the workspace-index jump on this
+  // runtime should reveal the sidebar number badges (Alt on web, Cmd on
+  // desktop Mac, Ctrl on desktop non-Mac). The store ORs altDown/cmdOrCtrlDown
+  // to drive badge visibility, so we set the flag matching this runtime.
+  // Derived from the effective bindings: `null` when the user unassigned or
+  // rebound the jump shortcut, and no `event.key` ever equals null, so the
+  // badges simply never appear.
+  const badgeModifierKey = getWorkspaceIndexJumpModifierKey(
+    { isMac, isDesktop: isDesktopApp },
+    bindings,
+  );
+
+  // The keyup listener matches the released key against the current modifier,
+  // so a modifier held while the jump binding changes could never be released
+  // and the badges would stay up until a blur. Clear them when it changes.
+  useEffect(() => {
+    resetModifiers();
+  }, [badgeModifierKey, resetModifiers]);
+
+  const setBadgeModifierDown = (down: boolean) => {
+    const state = useKeyboardShortcutsStore.getState();
+    if (isDesktopApp) {
+      state.setCmdOrCtrlDown(down);
+    } else {
+      state.setAltDown(down);
+    }
+  };
+
+  const shouldHandle = () => {
+    if (typeof document === "undefined") return false;
+    if (document.visibilityState !== "visible") return false;
+    return true;
+  };
+
+  const captureCommandCenterFocusRestore = (event: KeyboardEvent) => {
+    const target = event.target instanceof Element ? event.target : null;
+    const targetEl =
+      target?.closest?.("textarea, input, [contenteditable='true']") ??
+      (target instanceof HTMLElement ? target : null);
+    const active = document.activeElement;
+    const activeEl = active instanceof HTMLElement ? active : null;
+    setCommandCenterFocusRestoreElement((targetEl as HTMLElement | null) ?? activeEl ?? null);
+  };
+
+  const callbacksByName: Record<ShortcutCallbackName, (() => void) | undefined> = {
+    "toggle-agent-list": toggleAgentList,
+    "toggle-both-sidebars": toggleBothSidebars,
+    "cycle-theme": cycleTheme,
+  };
+
+  const performShortcutAction = (
+    action: ShortcutAction,
+    event: KeyboardEvent | null,
+    browserFocusRestoreElement: HTMLElement | null = null,
+  ): boolean => {
+    switch (action.kind) {
+      case "none":
+        return false;
+      case "dispatch":
+        return keyboardActionDispatcher.dispatch(action.action);
+      case "navigate-workspace":
+        keyboardWorkspaceSelectionRef.current = {
+          serverId: action.serverId,
+          workspaceId: action.workspaceId,
+        };
+        navigateToWorkspace({ serverId: action.serverId, workspaceId: action.workspaceId });
+        return true;
+      case "navigate-last-workspace":
+        if (navigateToLastWorkspace()) {
+          return true;
+        }
+        router.replace(buildOpenProjectRoute());
+        return true;
+      case "router-replace":
+        router.replace(action.route as Parameters<typeof router.replace>[0]);
+        return true;
+      case "router-back":
+        router.back();
+        return true;
+      case "router-push":
+        router.push(action.route as Parameters<typeof router.push>[0]);
+        return true;
+      case "open-project-picker":
+        void openProjectPickerAction();
+        return true;
+      case "callback":
+        callbacksByName[action.name]?.();
+        return true;
+      case "command-center-toggle": {
+        if (action.nextOpen) {
+          if (event) {
+            captureCommandCenterFocusRestore(event);
+          } else {
+            setCommandCenterFocusRestoreElement(browserFocusRestoreElement);
+          }
+        }
+        useKeyboardShortcutsStore
+          .getState()
+          .setCommandCenterOpen(action.nextOpen, action.scope ?? null);
+        return true;
+      }
+      case "shortcuts-dialog-toggle":
+        useKeyboardShortcutsStore.getState().setShortcutsDialogOpen(action.nextOpen);
+        return true;
+    }
+  };
+
+  const routeAndPerformShortcut = (input: {
+    action: string;
+    payload: KeyboardShortcutPayload;
+    domEvent: KeyboardEvent | null;
+    browserFocusRestoreElement?: HTMLElement | null;
+  }): boolean => {
+    const store = useKeyboardShortcutsStore.getState();
+    const shortcutAction = routeKeyboardShortcut(
+      { action: input.action, payload: input.payload },
+      {
+        pathname,
+        isMobile,
+        sidebarShortcutTargets: store.sidebarShortcutWorkspaceTargets,
+        navigationActiveWorkspace:
+          keyboardWorkspaceSelectionRef.current ?? activeWorkspaceSelection,
+        commandCenterOpen: store.commandCenterOpen,
+        shortcutsDialogOpen: store.shortcutsDialogOpen,
+      },
+    );
+    const handled = performShortcutAction(
+      shortcutAction,
+      input.domEvent,
+      input.browserFocusRestoreElement,
+    );
+    if (handled && isWorkspaceFocusModeEnabled && input.action.startsWith("sidebar.")) {
+      exitFocusMode();
+    }
+    return handled;
+  };
+
+  const resolveAndPerformShortcut = (input: {
+    event: KeyboardShortcutInput;
+    focusScope: KeyboardFocusScope;
+    domEvent: KeyboardEvent | null;
+    browserFocusRestoreElement?: HTMLElement | null;
+  }) => {
+    const store = useKeyboardShortcutsStore.getState();
+    const previousChordState = chordStateRef.current;
+    const result = resolveKeyboardShortcut({
+      event: input.event,
+      context: {
+        isMac,
+        isDesktop: isDesktopApp,
+        focusScope: input.focusScope,
+        commandCenterOpen: store.commandCenterOpen,
+      },
+      chordState: chordStateRef.current,
+      onChordReset: () => {
+        chordStateRef.current = {
+          candidateIndices: [],
+          step: 0,
+          timeoutId: null,
+        };
+        publishBrowserShortcutPolicy();
+      },
+      bindings,
+    });
+    chordStateRef.current = result.nextChordState;
+    if (
+      shouldPublishBrowserShortcutPolicy({
+        isBrowserInput: "browserId" in input.event,
+        previousChordState,
+        nextChordState: result.nextChordState,
+      })
+    ) {
+      publishBrowserShortcutPolicy(result.nextChordState);
+    }
+
+    if (result.preventDefault && input.domEvent) {
+      input.domEvent.preventDefault();
+      input.domEvent.stopPropagation();
+    }
+
+    if (!result.match) {
+      return;
+    }
+
+    const handled = routeAndPerformShortcut({
+      action: result.match.action,
+      payload: result.match.payload,
+      domEvent: input.domEvent,
+      browserFocusRestoreElement: input.browserFocusRestoreElement,
+    });
+    if (!handled || !input.domEvent) {
+      return;
+    }
+
+    if (result.match.preventDefault) {
+      input.domEvent.preventDefault();
+    }
+    if (result.match.stopPropagation) {
+      input.domEvent.stopPropagation();
+    }
+  };
+
+  // The window listeners must outlive ordinary re-renders: removing them resets
+  // any in-progress chord. Stable events let them read the latest render instead
+  // of being re-registered whenever a route, callback, or selection changes.
+  const handleKeyDown = useStableEvent((event: KeyboardEvent) => {
+    if (!shouldHandle()) {
+      return;
+    }
+
+    if (dispatchTopWebOverlayKeyDown(event)) {
+      return;
+    }
+
+    // During IME composition, Enter confirms the candidate selection and must
+    // not route through global shortcuts like message send.
+    if (isImeComposingKeyboardEvent(event)) {
+      return;
+    }
+
+    const store = useKeyboardShortcutsStore.getState();
+    if (store.capturingShortcut) {
+      return;
+    }
+
+    const key = event.key ?? "";
+    if (
+      key === "Escape" &&
+      pathname.startsWith("/settings") &&
+      !isMobile &&
+      hasActiveWebOverlay()
+    ) {
+      return;
+    }
+    if (key === badgeModifierKey && !event.shiftKey) {
+      setBadgeModifierDown(true);
+    }
+    if (key === "Shift") {
+      const state = useKeyboardShortcutsStore.getState();
+      if (state.altDown || state.cmdOrCtrlDown) {
+        state.resetModifiers();
+      }
+    }
+
+    const focusScope = resolveKeyboardFocusScope({
+      target: event.target,
+      commandCenterOpen: store.commandCenterOpen,
+    });
+    resolveAndPerformShortcut({
+      event,
+      focusScope,
+      domEvent: event,
+    });
+  });
+
+  const handleKeyUp = useStableEvent((event: KeyboardEvent) => {
+    const key = event.key ?? "";
+    if (key === badgeModifierKey) {
+      setBadgeModifierDown(false);
+    }
+  });
+
+  const handleBrowserShortcutInput = useStableEvent((payload: unknown) => {
+    const input = parseBrowserShortcutInput(payload);
+    if (!input) {
+      return;
+    }
+    resolveAndPerformShortcut({
+      event: input,
+      focusScope: "browser",
+      domEvent: null,
+      browserFocusRestoreElement: getResidentBrowserWebview(input.browserId),
+    });
+  });
+
   useEffect(() => {
     if (!enabled) return;
     if (!shortcutsAvailable) return;
 
-    // Only the modifier that actually performs the workspace-index jump on this
-    // runtime should reveal the sidebar number badges (Alt on web, Cmd on
-    // desktop Mac, Ctrl on desktop non-Mac). The store ORs altDown/cmdOrCtrlDown
-    // to drive badge visibility, so we set the flag matching this runtime.
-    // Derived from the effective bindings: `null` when the user unassigned or
-    // rebound the jump shortcut, and no `event.key` ever equals null, so the
-    // badges simply never appear.
-    const badgeModifierKey = getWorkspaceIndexJumpModifierKey(
-      { isMac, isDesktop: isDesktopApp },
-      bindings,
-    );
-    const setBadgeModifierDown = (down: boolean) => {
-      const state = useKeyboardShortcutsStore.getState();
-      if (isDesktopApp) {
-        state.setCmdOrCtrlDown(down);
-      } else {
-        state.setAltDown(down);
-      }
-    };
-
-    // The keyup listener matches the released key against the modifier derived
-    // when the effect last ran, so a modifier held while the jump binding
-    // changes can never be released -- the badges would stay up until a blur.
-    // Clear on change only: this effect also re-runs on every navigation, and
-    // clearing unconditionally would drop the badges mid Cmd+1, Cmd+2.
-    if (badgeModifierKeyRef.current !== badgeModifierKey) {
-      badgeModifierKeyRef.current = badgeModifierKey;
-      resetModifiers();
-    }
-
-    const shouldHandle = () => {
-      if (typeof document === "undefined") return false;
-      if (document.visibilityState !== "visible") return false;
-      return true;
-    };
-
-    const captureCommandCenterFocusRestore = (event: KeyboardEvent) => {
-      const target = event.target instanceof Element ? event.target : null;
-      const targetEl =
-        target?.closest?.("textarea, input, [contenteditable='true']") ??
-        (target instanceof HTMLElement ? target : null);
-      const active = document.activeElement;
-      const activeEl = active instanceof HTMLElement ? active : null;
-      setCommandCenterFocusRestoreElement((targetEl as HTMLElement | null) ?? activeEl ?? null);
-    };
-
-    const callbacksByName: Record<ShortcutCallbackName, (() => void) | undefined> = {
-      "toggle-agent-list": toggleAgentList,
-      "toggle-both-sidebars": toggleBothSidebars,
-      "cycle-theme": cycleTheme,
-    };
-
-    const performShortcutAction = (
-      action: ShortcutAction,
-      event: KeyboardEvent | null,
-      browserFocusRestoreElement: HTMLElement | null = null,
-    ): boolean => {
-      switch (action.kind) {
-        case "none":
-          return false;
-        case "dispatch":
-          return keyboardActionDispatcher.dispatch(action.action);
-        case "navigate-workspace":
-          keyboardWorkspaceSelectionRef.current = {
-            serverId: action.serverId,
-            workspaceId: action.workspaceId,
-          };
-          navigateToWorkspace({ serverId: action.serverId, workspaceId: action.workspaceId });
-          return true;
-        case "navigate-last-workspace":
-          if (navigateToLastWorkspace()) {
-            return true;
-          }
-          router.replace(buildOpenProjectRoute());
-          return true;
-        case "router-replace":
-          router.replace(action.route as Parameters<typeof router.replace>[0]);
-          return true;
-        case "router-back":
-          router.back();
-          return true;
-        case "router-push":
-          router.push(action.route as Parameters<typeof router.push>[0]);
-          return true;
-        case "open-project-picker":
-          void openProjectPickerAction();
-          return true;
-        case "callback":
-          callbacksByName[action.name]?.();
-          return true;
-        case "command-center-toggle": {
-          if (action.nextOpen) {
-            if (event) {
-              captureCommandCenterFocusRestore(event);
-            } else {
-              setCommandCenterFocusRestoreElement(browserFocusRestoreElement);
-            }
-          }
-          useKeyboardShortcutsStore
-            .getState()
-            .setCommandCenterOpen(action.nextOpen, action.scope ?? null);
-          return true;
-        }
-        case "shortcuts-dialog-toggle":
-          useKeyboardShortcutsStore.getState().setShortcutsDialogOpen(action.nextOpen);
-          return true;
-      }
-    };
-
-    const routeAndPerformShortcut = (input: {
-      action: string;
-      payload: KeyboardShortcutPayload;
-      domEvent: KeyboardEvent | null;
-      browserFocusRestoreElement?: HTMLElement | null;
-    }): boolean => {
-      const store = useKeyboardShortcutsStore.getState();
-      const shortcutAction = routeKeyboardShortcut(
-        { action: input.action, payload: input.payload },
-        {
-          pathname,
-          isMobile,
-          sidebarShortcutTargets: store.sidebarShortcutWorkspaceTargets,
-          navigationActiveWorkspace:
-            keyboardWorkspaceSelectionRef.current ?? activeWorkspaceSelection,
-          commandCenterOpen: store.commandCenterOpen,
-          shortcutsDialogOpen: store.shortcutsDialogOpen,
-        },
-      );
-      const handled = performShortcutAction(
-        shortcutAction,
-        input.domEvent,
-        input.browserFocusRestoreElement,
-      );
-      if (handled && isWorkspaceFocusModeEnabled && input.action.startsWith("sidebar.")) {
-        exitFocusMode();
-      }
-      return handled;
-    };
-
-    const resolveAndPerformShortcut = (input: {
-      event: KeyboardShortcutInput;
-      focusScope: KeyboardFocusScope;
-      domEvent: KeyboardEvent | null;
-      browserFocusRestoreElement?: HTMLElement | null;
-    }) => {
-      const store = useKeyboardShortcutsStore.getState();
-      const previousChordState = chordStateRef.current;
-      const result = resolveKeyboardShortcut({
-        event: input.event,
-        context: {
-          isMac,
-          isDesktop: isDesktopApp,
-          focusScope: input.focusScope,
-          commandCenterOpen: store.commandCenterOpen,
-        },
-        chordState: chordStateRef.current,
-        onChordReset: () => {
-          chordStateRef.current = {
-            candidateIndices: [],
-            step: 0,
-            timeoutId: null,
-          };
-          publishBrowserShortcutPolicy();
-        },
-        bindings,
-      });
-      chordStateRef.current = result.nextChordState;
-      if (
-        shouldPublishBrowserShortcutPolicy({
-          isBrowserInput: "browserId" in input.event,
-          previousChordState,
-          nextChordState: result.nextChordState,
-        })
-      ) {
-        publishBrowserShortcutPolicy(result.nextChordState);
-      }
-
-      if (result.preventDefault && input.domEvent) {
-        input.domEvent.preventDefault();
-        input.domEvent.stopPropagation();
-      }
-
-      if (!result.match) {
-        return;
-      }
-
-      const handled = routeAndPerformShortcut({
-        action: result.match.action,
-        payload: result.match.payload,
-        domEvent: input.domEvent,
-        browserFocusRestoreElement: input.browserFocusRestoreElement,
-      });
-      if (!handled || !input.domEvent) {
-        return;
-      }
-
-      if (result.match.preventDefault) {
-        input.domEvent.preventDefault();
-      }
-      if (result.match.stopPropagation) {
-        input.domEvent.stopPropagation();
-      }
-    };
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (!shouldHandle()) {
-        return;
-      }
-
-      if (dispatchTopWebOverlayKeyDown(event)) {
-        return;
-      }
-
-      // During IME composition, Enter confirms the candidate selection and must
-      // not route through global shortcuts like message send.
-      if (isImeComposingKeyboardEvent(event)) {
-        return;
-      }
-
-      const store = useKeyboardShortcutsStore.getState();
-      if (store.capturingShortcut) {
-        return;
-      }
-
-      const key = event.key ?? "";
-      if (
-        key === "Escape" &&
-        pathname.startsWith("/settings") &&
-        !isMobile &&
-        hasActiveWebOverlay()
-      ) {
-        return;
-      }
-      if (key === badgeModifierKey && !event.shiftKey) {
-        setBadgeModifierDown(true);
-      }
-      if (key === "Shift") {
-        const state = useKeyboardShortcutsStore.getState();
-        if (state.altDown || state.cmdOrCtrlDown) {
-          state.resetModifiers();
-        }
-      }
-
-      const focusScope = resolveKeyboardFocusScope({
-        target: event.target,
-        commandCenterOpen: store.commandCenterOpen,
-      });
-      resolveAndPerformShortcut({
-        event,
-        focusScope,
-        domEvent: event,
-      });
-    };
-
-    const handleKeyUp = (event: KeyboardEvent) => {
-      const key = event.key ?? "";
-      if (key === badgeModifierKey) {
-        setBadgeModifierDown(false);
-      }
-    };
-
     const handleBlurOrHide = () => {
       resetModifiers();
     };
@@ -382,18 +396,7 @@ export function useKeyboardShortcuts({
     document.addEventListener("visibilitychange", handleBlurOrHide);
 
     const browserShortcutSubscription = isElectronRuntime()
-      ? getDesktopHost()?.events?.on?.("browser-shortcut-input", (payload) => {
-          const input = parseBrowserShortcutInput(payload);
-          if (!input) {
-            return;
-          }
-          resolveAndPerformShortcut({
-            event: input,
-            focusScope: "browser",
-            domEvent: null,
-            browserFocusRestoreElement: getResidentBrowserWebview(input.browserId),
-          });
-        })
+      ? getDesktopHost()?.events?.on?.("browser-shortcut-input", handleBrowserShortcutInput)
       : null;
     return () => {
       if (chordStateRef.current.timeoutId !== null) {
@@ -415,23 +418,11 @@ export function useKeyboardShortcuts({
       }
     };
   }, [
-    bindings,
-    cycleTheme,
     enabled,
-    exitFocusMode,
-    activeWorkspaceSelection,
-    isDesktopApp,
-    isMac,
-    isMobile,
-    isWorkspaceFocusModeEnabled,
-    keyboardActionDispatcher,
-    openProjectPickerAction,
-    pathname,
-    publishBrowserShortcutPolicy,
+    handleBrowserShortcutInput,
+    handleKeyDown,
+    handleKeyUp,
     resetModifiers,
-    router,
     shortcutsAvailable,
-    toggleAgentList,
-    toggleBothSidebars,
   ]);
 }
diff --git a/packages/app/src/hooks/use-keyboard-visibility.native.ts b/packages/app/src/hooks/use-keyboard-visibility.native.ts
index cb222d9e0c..f15b0fe7c7 100644
--- a/packages/app/src/hooks/use-keyboard-visibility.native.ts
+++ b/packages/app/src/hooks/use-keyboard-visibility.native.ts
@@ -1,5 +1,21 @@
-import { useKeyboardState } from "react-native-keyboard-controller";
+import { useSyncExternalStore } from "react";
+import { KeyboardController, KeyboardEvents } from "react-native-keyboard-controller";
 
-export function useKeyboardVisibility(): boolean {
-  return useKeyboardState((state) => state.isVisible);
+const subscribe = (onStoreChange: () => void) => {
+  const subscriptions = (["keyboardWillShow", "keyboardDidHide"] as const).map((event) =>
+    KeyboardEvents.addListener(event, onStoreChange),
+  );
+  return () => {
+    for (const subscription of subscriptions) {
+      subscription.remove();
+    }
+  };
+};
+
+export function useKeyboardVisibility(enabled = true): boolean {
+  return useSyncExternalStore(
+    subscribe,
+    () => (enabled ? KeyboardController.isVisible() : false),
+    () => false,
+  );
 }
diff --git a/packages/app/src/hooks/use-keyboard-visibility.ts b/packages/app/src/hooks/use-keyboard-visibility.ts
index 793a521b6f..375734124d 100644
--- a/packages/app/src/hooks/use-keyboard-visibility.ts
+++ b/packages/app/src/hooks/use-keyboard-visibility.ts
@@ -1,3 +1,3 @@
-export function useKeyboardVisibility(): boolean {
+export function useKeyboardVisibility(_enabled = true): boolean {
   return false;
 }
diff --git a/packages/app/src/hooks/use-open-project.ts b/packages/app/src/hooks/use-open-project.ts
index 71a0a78da2..18dc5064f3 100644
--- a/packages/app/src/hooks/use-open-project.ts
+++ b/packages/app/src/hooks/use-open-project.ts
@@ -1,3 +1,4 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useCallback } from "react";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useSessionStore } from "@/stores/session-store";
@@ -20,7 +21,15 @@ export function useOpenProject(
         state.sessions[normalizedServerId]?.serverInfo?.features?.stableProjectIdentity === true
       : false,
   );
-  const upsertProject = useSessionStore((state) => state.upsertProject);
+  const upsertProject = useCallback(
+    (
+      targetServerId: string,
+      project: Parameters<ReturnType<typeof getHostRuntimeStore>["acceptProjectSnapshot"]>[1],
+    ) => {
+      getHostRuntimeStore().acceptProjectSnapshot(targetServerId, project);
+    },
+    [],
+  );
   const setHasHydratedWorkspaces = useSessionStore((state) => state.setHasHydratedWorkspaces);
 
   return useCallback(
@@ -57,7 +66,15 @@ export function useCloneGithubProject(
   const normalizedServerId = serverId?.trim() ?? "";
   const client = useHostRuntimeClient(normalizedServerId);
   const isConnected = useHostRuntimeIsConnected(normalizedServerId);
-  const upsertProject = useSessionStore((state) => state.upsertProject);
+  const upsertProject = useCallback(
+    (
+      targetServerId: string,
+      project: Parameters<ReturnType<typeof getHostRuntimeStore>["acceptProjectSnapshot"]>[1],
+    ) => {
+      getHostRuntimeStore().acceptProjectSnapshot(targetServerId, project);
+    },
+    [],
+  );
   const setHasHydratedWorkspaces = useSessionStore((state) => state.setHasHydratedWorkspaces);
 
   return useCallback(
diff --git a/packages/app/src/hooks/use-providers-snapshot.test.ts b/packages/app/src/hooks/use-providers-snapshot.test.ts
index 620668e1fb..2f3c90b340 100644
--- a/packages/app/src/hooks/use-providers-snapshot.test.ts
+++ b/packages/app/src/hooks/use-providers-snapshot.test.ts
@@ -3,9 +3,13 @@ import { beforeEach, describe, expect, it } from "vitest";
 
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
-import { compactProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
+import {
+  compactProviderSnapshot,
+  expandProviderSnapshot,
+} from "@getpaseo/protocol/provider-snapshot-codec";
 import type { CachedProviderSnapshot, ProviderSnapshotCache } from "@/data/provider-snapshot-cache";
 import { draftAgentCommandsQueryKey } from "@/hooks/agent-commands-query";
+import { providerSnapshotIcons } from "@/data/provider-icons";
 import { applyProvidersSnapshotUpdate, type ProvidersSnapshotUpdate } from "@/data/push-router";
 import {
   fetchProvidersSnapshot,
@@ -81,12 +85,28 @@ function codexEntry(
 const readyCodexModel = { provider: "codex", id: "gpt-5.4", label: "GPT-5.4" } as const;
 const serverId = "server-1";
 
-function createCache(initial: CachedProviderSnapshot | null = null): ProviderSnapshotCache & {
+function createCache(
+  initial: CachedProviderSnapshot | null = null,
+  bodyResident = true,
+): ProviderSnapshotCache & {
   writes: Parameters<ProviderSnapshotCache["write"]>[0][];
 } {
   const writes: Parameters<ProviderSnapshotCache["write"]>[0][] = [];
   return {
     writes,
+    async readHash(_serverId, hash) {
+      return bodyResident && initial?.hash === hash ? initial : null;
+    },
+    async materialize(_serverId, snapshot) {
+      if (initial && initial.hash === snapshot.snapshotHash)
+        return { ...snapshot, entries: initial.entries };
+      return {
+        ...snapshot,
+        entries: snapshot.compactSnapshot
+          ? expandProviderSnapshot(snapshot.compactSnapshot)
+          : snapshot.entries,
+      };
+    },
     async read() {
       return initial;
     },
@@ -97,7 +117,7 @@ function createCache(initial: CachedProviderSnapshot | null = null): ProviderSna
 }
 
 describe("providersSnapshotQueryKey", () => {
-  it("uses separate keys for home and workspace scopes", () => {
+  it("uses separate keys for home and workspace scopes", async () => {
     expect(providersSnapshotQueryKey(serverId)).toEqual(["providersSnapshot", serverId, "home"]);
     expect(providersSnapshotQueryKey(serverId, "/repo-a")).toEqual([
       "providersSnapshot",
@@ -109,6 +129,23 @@ describe("providersSnapshotQueryKey", () => {
 });
 
 describe("fetchProvidersSnapshot", () => {
+  it("registers provider icons from the applied snapshot", async () => {
+    const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+    const client = createClient({
+      snapshots: [
+        providersSnapshot([
+          { provider: "snapshot-icon-provider", status: "ready", enabled: true, iconSvg: svg },
+        ]),
+      ],
+    });
+
+    await fetchProvidersSnapshot({ client, serverId, cwd: null, cache: createCache() });
+
+    expect(providerSnapshotIcons.getState().get(serverId)?.get("snapshot-icon-provider")).toEqual(
+      svg,
+    );
+  });
+
   it("sends no cwd for the home scope", async () => {
     const client = createClient({ snapshots: [providersSnapshot([])] });
 
@@ -130,16 +167,19 @@ describe("fetchProvidersSnapshot", () => {
     expect(client.getCalls).toEqual([{ cwd: "/repo-a" }]);
   });
 
-  it("reuses a cached snapshot when the daemon reports its hash unchanged", async () => {
+  it("reuses a not-modified response even if its body was evicted during the request", async () => {
     const entries = [codexEntry("ready", [readyCodexModel])];
     const compactSnapshot = compactProviderSnapshot(entries);
-    const cache = createCache({
-      version: 1,
-      hash: "snapshot-hash",
-      generatedAt: "2026-01-01T00:00:00.000Z",
-      compactSnapshot,
-      entries,
-    });
+    const cache = createCache(
+      {
+        version: 2,
+        hash: "snapshot-hash",
+        generatedAt: "2026-01-01T00:00:00.000Z",
+        compactSnapshot,
+        entries,
+      },
+      false,
+    );
     const client = createClient({
       snapshots: [
         {
@@ -161,7 +201,7 @@ describe("fetchProvidersSnapshot", () => {
 
     expect(client.getCalls).toEqual([{ cwd: "/repo-a", ifNoneMatch: "snapshot-hash" }]);
     expect(snapshot.entries).toBe(entries);
-    expect(cache.writes).toEqual([]);
+    expect(cache.writes).toHaveLength(1);
   });
 
   it("persists a changed compact snapshot for the next launch", async () => {
@@ -182,7 +222,7 @@ describe("fetchProvidersSnapshot", () => {
 
     await fetchProvidersSnapshot({ client, serverId, cwd: "/repo-a", cache });
 
-    expect(cache.writes).toEqual([
+    expect(cache.writes.map(({ signal: _signal, ...write }) => write)).toEqual([
       {
         serverId,
         cwd: "/repo-a",
@@ -323,8 +363,9 @@ describe("applyProvidersSnapshotUpdate", () => {
     };
   }
 
-  it("routes updates to the home query cache when the message carries no cwd", () => {
-    applyProvidersSnapshotUpdate({
+  it("routes updates to the home query cache when the message carries no cwd", async () => {
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
       serverId,
       queryClient,
       message: updateMessage([codexEntry("ready", [readyCodexModel])]),
@@ -337,16 +378,17 @@ describe("applyProvidersSnapshotUpdate", () => {
     });
   });
 
-  it("routes workspace updates to the matching scope without touching siblings", () => {
+  it("routes workspace updates to the matching scope without touching siblings", async () => {
     queryClient.setQueryData(providersSnapshotQueryKey(serverId, "/repo-b"), providersSnapshot([]));
 
-    applyProvidersSnapshotUpdate({
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
       serverId,
       queryClient,
       message: updateMessage([codexEntry("ready", [readyCodexModel])], "/repo-a"),
     });
 
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId, "/repo-a"))).toEqual({
+    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId, "/repo-a"))).toMatchObject({
       entries: [codexEntry("ready", [readyCodexModel])],
       generatedAt: "2026-01-01T00:00:01.000Z",
       requestId: "providers_snapshot_update",
@@ -356,7 +398,7 @@ describe("applyProvidersSnapshotUpdate", () => {
     );
   });
 
-  it("persists compact push updates", () => {
+  it("persists compact push updates", async () => {
     const entries = [codexEntry("ready", [readyCodexModel])];
     const compactSnapshot = compactProviderSnapshot(entries);
     const cache = createCache();
@@ -364,9 +406,15 @@ describe("applyProvidersSnapshotUpdate", () => {
     message.payload.compactSnapshot = compactSnapshot;
     message.payload.snapshotHash = "push-hash";
 
-    applyProvidersSnapshotUpdate({ serverId, queryClient, message, cache });
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message,
+      cache,
+    });
 
-    expect(cache.writes).toEqual([
+    expect(cache.writes.map(({ signal: _signal, ...write }) => write)).toEqual([
       {
         serverId,
         cwd: "/repo-a",
@@ -377,7 +425,7 @@ describe("applyProvidersSnapshotUpdate", () => {
     ]);
   });
 
-  it("applies Windows daemon updates to app-normalized workspace paths", () => {
+  it("applies Windows daemon updates to app-normalized workspace paths", async () => {
     const workspaceCwd = "C:/Users/Ezekiel Bulver/project";
     const daemonCwd = "C:\\Users\\Ezekiel Bulver\\project";
     queryClient.setQueryData(
@@ -385,27 +433,31 @@ describe("applyProvidersSnapshotUpdate", () => {
       providersSnapshot([codexEntry("loading")]),
     );
 
-    applyProvidersSnapshotUpdate({
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
       serverId,
       queryClient,
       message: updateMessage([codexEntry("ready", [readyCodexModel])], daemonCwd),
     });
 
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId, workspaceCwd))).toEqual({
+    expect(
+      queryClient.getQueryData(providersSnapshotQueryKey(serverId, workspaceCwd)),
+    ).toMatchObject({
       entries: [codexEntry("ready", [readyCodexModel])],
       generatedAt: "2026-01-01T00:00:01.000Z",
       requestId: "providers_snapshot_update",
     });
   });
 
-  it("invalidates cached agent commands when a provider snapshot update arrives", () => {
+  it("invalidates cached agent commands when a provider snapshot update arrives", async () => {
     const commandsKey = draftAgentCommandsQueryKey({
       serverId,
       draftConfig: { provider: "codex", cwd: "/repo-a" },
     });
     queryClient.setQueryData(commandsKey, [{ name: "compact", description: "", argumentHint: "" }]);
 
-    applyProvidersSnapshotUpdate({
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
       serverId,
       queryClient,
       message: updateMessage([codexEntry("ready", [readyCodexModel])], "/repo-a"),
@@ -416,7 +468,7 @@ describe("applyProvidersSnapshotUpdate", () => {
 });
 
 describe("selectorOpenRefetchDecision", () => {
-  it("refetches stale entries when no provider is selected", () => {
+  it("refetches stale entries when no provider is selected", async () => {
     expect(
       selectorOpenRefetchDecision({
         entries: [codexEntry("ready", [readyCodexModel])],
@@ -425,13 +477,13 @@ describe("selectorOpenRefetchDecision", () => {
     ).toBe("refetch-stale");
   });
 
-  it("forces a refetch when the selected provider has no entry", () => {
+  it("forces a refetch when the selected provider has no entry", async () => {
     expect(selectorOpenRefetchDecision({ entries: [], selectedProvider: "codex" })).toBe(
       "refetch-always",
     );
   });
 
-  it("forces a refetch when the selected provider is still loading", () => {
+  it("forces a refetch when the selected provider is still loading", async () => {
     expect(
       selectorOpenRefetchDecision({
         entries: [codexEntry("loading")],
@@ -440,7 +492,7 @@ describe("selectorOpenRefetchDecision", () => {
     ).toBe("refetch-always");
   });
 
-  it("keeps a stale-only refetch when the selected provider is ready with no models", () => {
+  it("keeps a stale-only refetch when the selected provider is ready with no models", async () => {
     expect(
       selectorOpenRefetchDecision({
         entries: [codexEntry("ready", [])],
@@ -449,7 +501,7 @@ describe("selectorOpenRefetchDecision", () => {
     ).toBe("refetch-stale");
   });
 
-  it("keeps a stale-only refetch when the selected provider is ready with models", () => {
+  it("keeps a stale-only refetch when the selected provider is ready with models", async () => {
     expect(
       selectorOpenRefetchDecision({
         entries: [codexEntry("ready", [readyCodexModel])],
diff --git a/packages/app/src/hooks/use-providers-snapshot.ts b/packages/app/src/hooks/use-providers-snapshot.ts
index 9dfdae6f37..dc90c18f06 100644
--- a/packages/app/src/hooks/use-providers-snapshot.ts
+++ b/packages/app/src/hooks/use-providers-snapshot.ts
@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from "react";
-import { useMutation, useQueryClient, type QueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import type { AgentProvider, ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -9,89 +9,25 @@ import { useSessionStore } from "@/stores/session-store";
 import { useReplicaQuery } from "@/data/query";
 import { queryClient as singletonQueryClient } from "@/data/query-client";
 import {
-  providerSnapshotCache,
-  ProviderSnapshotCacheMissError,
-  type ProviderSnapshotCache,
-} from "@/data/provider-snapshot-cache";
-import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
-import {
-  isProvidersSnapshotHomeScope,
   normalizeProvidersSnapshotCwd,
   providersSnapshotQueryKey,
   providersSnapshotQueryRoot,
-  providersSnapshotRequestOptions,
+  fetchProvidersSnapshot,
+  refreshAndApplyProvidersSnapshot,
 } from "@/data/providers-snapshot";
 
-type GetProvidersSnapshotResult = Awaited<ReturnType<DaemonClient["getProvidersSnapshot"]>>;
-type RefreshProvidersSnapshotResult = Awaited<ReturnType<DaemonClient["refreshProvidersSnapshot"]>>;
-
-export { providersSnapshotQueryKey, providersSnapshotQueryRoot };
+export {
+  providersSnapshotQueryKey,
+  providersSnapshotQueryRoot,
+  fetchProvidersSnapshot,
+  refreshAndApplyProvidersSnapshot,
+};
 
 export type ProvidersSnapshotClient = Pick<
   DaemonClient,
   "getProvidersSnapshot" | "refreshProvidersSnapshot"
 >;
 
-export async function fetchProvidersSnapshot(input: {
-  client: ProvidersSnapshotClient;
-  serverId: string;
-  cwd: string | null;
-  cache?: ProviderSnapshotCache;
-}): Promise<GetProvidersSnapshotResult> {
-  const cache = input.cache ?? providerSnapshotCache;
-  const cached = await cache.read(input.serverId, input.cwd);
-  const snapshot = await input.client.getProvidersSnapshot(
-    providersSnapshotRequestOptions({ cwd: input.cwd, ifNoneMatch: cached?.hash }),
-  );
-  if (snapshot.notModified) {
-    if (!cached) {
-      throw new ProviderSnapshotCacheMissError();
-    }
-    return { ...snapshot, entries: cached.entries };
-  }
-  if (snapshot.compactSnapshot && snapshot.snapshotHash) {
-    await cache.write({
-      serverId: input.serverId,
-      cwd: input.cwd,
-      hash: snapshot.snapshotHash,
-      generatedAt: snapshot.generatedAt,
-      compactSnapshot: snapshot.compactSnapshot,
-    });
-  }
-  return snapshot;
-}
-
-export async function refreshAndApplyProvidersSnapshot(input: {
-  client: ProvidersSnapshotClient;
-  queryClient: QueryClient;
-  serverId: string;
-  cwd: string | null;
-  providers?: AgentProvider[];
-  cache?: ProviderSnapshotCache;
-}): Promise<RefreshProvidersSnapshotResult> {
-  const refreshResult = await input.client.refreshProvidersSnapshot(
-    providersSnapshotRequestOptions({ cwd: input.cwd, providers: input.providers }),
-  );
-  const snapshot = await fetchProvidersSnapshot({
-    client: input.client,
-    serverId: input.serverId,
-    cwd: input.cwd,
-    cache: input.cache,
-  });
-  input.queryClient.setQueryData(providersSnapshotQueryKey(input.serverId, input.cwd), snapshot);
-  void input.queryClient.invalidateQueries({
-    queryKey: agentCommandsQueryRoot(input.serverId),
-    exact: false,
-  });
-  if (isProvidersSnapshotHomeScope(input.cwd)) {
-    void input.queryClient.invalidateQueries({
-      queryKey: providersSnapshotQueryRoot(input.serverId),
-      exact: false,
-    });
-  }
-  return refreshResult;
-}
-
 export type SelectorOpenRefetchDecision = "refetch-stale" | "refetch-always";
 
 export function selectorOpenRefetchDecision(input: {
@@ -143,13 +79,15 @@ export function useProvidersSnapshot(
 
   const snapshotQuery = useReplicaQuery({
     queryKey,
+    // The content-hash cache already owns catalog and model identity.
+    structuralSharing: false,
     enabled: Boolean(enabled && supportsSnapshot && serverId && client && isConnected),
     pushEvent: "providers_snapshot_update",
-    queryFn: async () => {
+    queryFn: async ({ signal }) => {
       if (!client || !serverId) {
         throw new Error(t("workspace.terminal.hostDisconnected"));
       }
-      return fetchProvidersSnapshot({ client, serverId, cwd });
+      return fetchProvidersSnapshot({ client, serverId, cwd, queryClient, signal });
     },
   });
 
@@ -213,6 +151,8 @@ export function prefetchProvidersSnapshot(
   void singletonQueryClient.prefetchQuery({
     queryKey,
     staleTime: Infinity,
-    queryFn: () => fetchProvidersSnapshot({ client, serverId, cwd }),
+    structuralSharing: false,
+    queryFn: ({ signal }) =>
+      fetchProvidersSnapshot({ client, serverId, cwd, queryClient: singletonQueryClient, signal }),
   });
 }
diff --git a/packages/app/src/hooks/use-settings/index.ts b/packages/app/src/hooks/use-settings/index.ts
index 704af34976..66a8e767b1 100644
--- a/packages/app/src/hooks/use-settings/index.ts
+++ b/packages/app/src/hooks/use-settings/index.ts
@@ -17,22 +17,27 @@ import {
   DEFAULT_CLIENT_SETTINGS,
   DEFAULT_CODE_FONT_SIZE,
   DEFAULT_CONTENT_FONT_SIZE,
+  DEFAULT_CONTENT_MAX_WIDTH,
   DEFAULT_TERMINAL_SCROLLBACK_LINES,
   DEFAULT_THEME_PREFERENCE,
   DEFAULT_UI_BASE_FONT_SIZE,
   MAX_CODE_FONT_SIZE,
   MAX_CONTENT_FONT_SIZE,
+  MAX_CONTENT_MAX_WIDTH,
   MAX_TERMINAL_SCROLLBACK_LINES,
   MAX_UI_BASE_FONT_SIZE,
   MIN_CODE_FONT_SIZE,
   MIN_CONTENT_FONT_SIZE,
+  MIN_CONTENT_MAX_WIDTH,
   MIN_TERMINAL_SCROLLBACK_LINES,
   MIN_UI_BASE_FONT_SIZE,
   loadAppSettingsFromStorage as loadAppSettingsFromStoragePure,
   loadSettingsFromStorage as loadSettingsFromStoragePure,
   normalizeAppSettings,
   parseClampedFontSize,
+  parseContentMaxWidth,
   parseTerminalScrollbackLines,
+  resolveContentMaxWidth,
   sanitizeFontFamily,
   saveAppSettings as saveAppSettingsPure,
   type AppSettings,
@@ -56,19 +61,24 @@ export {
   DEFAULT_CLIENT_SETTINGS,
   DEFAULT_CODE_FONT_SIZE,
   DEFAULT_CONTENT_FONT_SIZE,
+  DEFAULT_CONTENT_MAX_WIDTH,
   DEFAULT_TERMINAL_SCROLLBACK_LINES,
   DEFAULT_THEME_PREFERENCE,
   DEFAULT_UI_BASE_FONT_SIZE,
   MAX_CODE_FONT_SIZE,
   MAX_CONTENT_FONT_SIZE,
+  MAX_CONTENT_MAX_WIDTH,
   MAX_TERMINAL_SCROLLBACK_LINES,
   MAX_UI_BASE_FONT_SIZE,
   MIN_CODE_FONT_SIZE,
   MIN_CONTENT_FONT_SIZE,
+  MIN_CONTENT_MAX_WIDTH,
   MIN_TERMINAL_SCROLLBACK_LINES,
   MIN_UI_BASE_FONT_SIZE,
   parseClampedFontSize,
+  parseContentMaxWidth,
   parseTerminalScrollbackLines,
+  resolveContentMaxWidth,
   sanitizeFontFamily,
 };
 export type {
diff --git a/packages/app/src/hooks/use-settings/storage.test.ts b/packages/app/src/hooks/use-settings/storage.test.ts
index 51e2831338..d396f26d9a 100644
--- a/packages/app/src/hooks/use-settings/storage.test.ts
+++ b/packages/app/src/hooks/use-settings/storage.test.ts
@@ -14,6 +14,7 @@ import {
   loadSettingsFromStorage,
   parseClampedFontSize,
   parseTerminalScrollbackLines,
+  resolveContentMaxWidth,
   saveAppSettings,
   type SettingsDeps,
 } from "./storage";
@@ -22,7 +23,7 @@ import {
   DEFAULT_SIDEBAR_ROW_ITEMS,
   SIDEBAR_ROW_ITEMS,
 } from "@/components/sidebar/display-preferences/row-items";
-import { THEME_OPTIONS } from "@/styles/theme";
+import { DEFAULT_CONTENT_MAX_WIDTH, THEME_OPTIONS } from "@/styles/theme";
 
 const LEGACY_SETTINGS_KEY = "@paseo:settings";
 
@@ -237,6 +238,98 @@ describe("loadAppSettingsFromStorage", () => {
     expect(result.sidebarNavItems).toEqual([]);
   });
 
+  it("loads stored sidebar footer items in order and defaults them to empty", async () => {
+    expect((await loadAppSettingsFromStorage(makeDeps())).sidebarFooterItems).toEqual([]);
+
+    const deps = makeDeps({
+      storage: createInMemoryKeyValueStorage({
+        [APP_SETTINGS_KEY]: JSON.stringify({
+          sidebarFooterItems: [
+            // A footer button that was configurable once; the sidebar model skips it.
+            { key: "help", visible: false },
+            { key: "plugin:sync:status", visible: true },
+            { key: "usage", visible: false },
+          ],
+        }),
+      }),
+    });
+
+    const result = await loadAppSettingsFromStorage(deps);
+
+    expect(result.sidebarFooterItems).toEqual([
+      { key: "help", visible: false },
+      { key: "plugin:sync:status", visible: true },
+      { key: "usage", visible: false },
+    ]);
+  });
+
+  it("loads legacy usage pins in order and defaults a fresh device to source defaults", async () => {
+    expect((await loadAppSettingsFromStorage(makeDeps())).usage).toEqual({
+      displayAs: "used",
+      pins: null,
+      serverId: null,
+    });
+
+    const deps = makeDeps({
+      storage: createInMemoryKeyValueStorage({
+        [APP_SETTINGS_KEY]: JSON.stringify({
+          usage: {
+            displayAs: "remaining",
+            pinned: [
+              { sourceId: "codex", windowId: "weekly" },
+              { sourceId: "claude", windowId: "five-hour" },
+            ],
+            serverId: "server",
+          },
+        }),
+      }),
+    });
+
+    expect((await loadAppSettingsFromStorage(deps)).usage).toEqual({
+      displayAs: "remaining",
+      pins: [
+        { sourceId: "codex", windowId: "weekly" },
+        { sourceId: "claude", windowId: "five-hour" },
+      ],
+      serverId: "server",
+    });
+  });
+
+  it("loads an explicitly empty usage selection without restoring defaults", async () => {
+    const deps = makeDeps({
+      storage: createInMemoryKeyValueStorage({
+        [APP_SETTINGS_KEY]: JSON.stringify({
+          usage: { displayAs: "remaining", pins: [], serverId: "server" },
+        }),
+      }),
+    });
+    expect((await loadAppSettingsFromStorage(deps)).usage).toEqual({
+      displayAs: "remaining",
+      pins: [],
+      serverId: "server",
+    });
+  });
+
+  it("keeps valid usage preferences when one field is malformed", async () => {
+    const deps = makeDeps({
+      storage: createInMemoryKeyValueStorage({
+        [APP_SETTINGS_KEY]: JSON.stringify({
+          usage: {
+            displayAs: "percent",
+            pinned: [{ sourceId: "claude", windowId: "weekly" }],
+            serverId: 42,
+          },
+        }),
+      }),
+    });
+
+    expect((await loadAppSettingsFromStorage(deps)).usage).toEqual({
+      displayAs: "used",
+      pins: [{ sourceId: "claude", windowId: "weekly" }],
+      serverId: null,
+    });
+  });
+
   it("collapses legacy diff destinations into the former Explorer choice", async () => {
     const deps = makeDeps({
       storage: createInMemoryKeyValueStorage({
@@ -955,3 +1048,49 @@ describe("parseClampedFontSize", () => {
     expect(parseClampedFontSize("abc", { min: 11, max: 24 })).toBeNull();
   });
 });
+
+describe("content max width", () => {
+  it("follows the current default until the user picks a width", async () => {
+    const deps = makeDeps();
+    const queryClient = new QueryClient();
+
+    await saveAppSettings({ queryClient, updates: { codeFontSize: 14 }, deps });
+
+    const stored = JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null");
+    expect(stored.contentMaxWidth).toBeNull();
+    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(
+      DEFAULT_CONTENT_MAX_WIDTH,
+    );
+  });
+
+  it("keeps a picked width and returns to the default when reset", async () => {
+    const deps = makeDeps();
+    const queryClient = new QueryClient();
+
+    await saveAppSettings({ queryClient, updates: { contentMaxWidth: 1600 }, deps });
+    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(1600);
+
+    await saveAppSettings({ queryClient, updates: { contentMaxWidth: null }, deps });
+    expect(JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null").contentMaxWidth).toBe(
+      null,
+    );
+    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(
+      DEFAULT_CONTENT_MAX_WIDTH,
+    );
+  });
+
+  it("clamps stored widths and drops malformed ones to the default", async () => {
+    const load = (contentMaxWidth: unknown) =>
+      loadAppSettingsFromStorage(
+        makeDeps({
+          storage: createInMemoryKeyValueStorage({
+            [APP_SETTINGS_KEY]: JSON.stringify({ contentMaxWidth }),
+          }),
+        }),
+      );
+
+    expect((await load(100_000)).contentMaxWidth).toBe(4000);
+    expect((await load(10)).contentMaxWidth).toBe(600);
+    expect((await load("wide")).contentMaxWidth).toBeNull();
+  });
+});
diff --git a/packages/app/src/hooks/use-settings/storage.ts b/packages/app/src/hooks/use-settings/storage.ts
index 7a47bc7e6c..6c44546668 100644
--- a/packages/app/src/hooks/use-settings/storage.ts
+++ b/packages/app/src/hooks/use-settings/storage.ts
@@ -4,6 +4,11 @@ import type { QueryClient } from "@tanstack/react-query";
 import type { DesktopSettings } from "@/desktop/settings/desktop-settings";
 import type { AppLanguage } from "@/i18n/locales";
 import type { SidebarNavPreference } from "@/sidebar-nav/model";
+import {
+  DEFAULT_USAGE_PREFERENCES,
+  UsagePreferencesSchema,
+  type UsagePreferences,
+} from "@/usage/preferences";
 import {
   DEFAULT_SIDEBAR_CHECKS_DISPLAY,
   type SidebarChecksDisplay,
@@ -15,6 +20,7 @@ import {
 } from "@/components/sidebar/display-preferences/row-items";
 import { isNative } from "@/constants/platform";
 import {
+  DEFAULT_CONTENT_MAX_WIDTH,
   FONT_SIZE,
   PLUGIN_THEME_PREFERENCE,
   THEME_OPTIONS,
@@ -63,6 +69,9 @@ export const DEFAULT_CODE_FONT_SIZE = 12; // == FONT_SIZE.code
 export const MIN_CODE_FONT_SIZE = 9;
 export const MAX_CODE_FONT_SIZE = 22; // line-height 1.5×22=33 stays safe
 export const MAX_FONT_FAMILY_LENGTH = 200;
+export { DEFAULT_CONTENT_MAX_WIDTH };
+export const MIN_CONTENT_MAX_WIDTH = 600;
+export const MAX_CONTENT_MAX_WIDTH = 4000;
 
 export interface AppSettings {
   theme: ThemePreference;
@@ -78,6 +87,8 @@ export interface AppSettings {
   uiBaseFontSize: number; // clamped px, platform default 14 or 15
   contentFontSize: number; // clamped px, platform default 15 or 16
   codeFontSize: number; // clamped px, default 12
+  /** Max width of chat and markdown content in px; null follows the current default. */
+  contentMaxWidth: number | null;
   syntaxTheme: SyntaxThemeId; // default "one"
   workspaceTitleSource: WorkspaceTitleSource;
   sidebarWorkspaceTrailing: SidebarWorkspaceTrailing;
@@ -85,6 +96,10 @@ export interface AppSettings {
   sidebarChecksDisplay: SidebarChecksDisplay;
   /** Top-level sidebar rows in display order; empty means the default order, all visible. */
   sidebarNavItems: SidebarNavPreference[];
+  /** Sidebar footer items in display order; empty means the default order, all visible. */
+  sidebarFooterItems: SidebarNavPreference[];
+  /** How usage reads and which windows the sidebar summary shows. */
+  usage: UsagePreferences;
   autoExpandReasoning: boolean;
   toolCallDetailLevel: ToolCallDetailLevel;
   chatOutlineEnabled: boolean;
@@ -132,12 +147,15 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
   uiBaseFontSize: DEFAULT_UI_BASE_FONT_SIZE,
   contentFontSize: DEFAULT_CONTENT_FONT_SIZE,
   codeFontSize: DEFAULT_CODE_FONT_SIZE,
+  contentMaxWidth: null,
   syntaxTheme: "one",
   workspaceTitleSource: "title",
-  sidebarWorkspaceTrailing: "diff",
+  sidebarWorkspaceTrailing: "timestamp",
   sidebarRowItems: DEFAULT_SIDEBAR_ROW_ITEMS,
   sidebarChecksDisplay: DEFAULT_SIDEBAR_CHECKS_DISPLAY,
   sidebarNavItems: [],
+  sidebarFooterItems: [],
+  usage: DEFAULT_USAGE_PREFERENCES,
   autoExpandReasoning: false,
   toolCallDetailLevel: "detailed",
   chatOutlineEnabled: true,
@@ -218,15 +236,21 @@ const StoredAppSettingsSchema = z
     codeFontSize: clampedNumber(MIN_CODE_FONT_SIZE, MAX_CODE_FONT_SIZE).catch(
       DEFAULT_CODE_FONT_SIZE,
     ),
+    contentMaxWidth: z
+      .null()
+      .or(clampedNumber(MIN_CONTENT_MAX_WIDTH, MAX_CONTENT_MAX_WIDTH))
+      .catch(null),
     syntaxTheme: z.string().refine(isSyntaxThemeId).catch("one"),
     workspaceTitleSource: z.enum(["title", "branch"]).catch("title"),
-    sidebarWorkspaceTrailing: z.enum(["diff", "timestamp", "none"]).catch("diff"),
+    sidebarWorkspaceTrailing: z.enum(["diff", "timestamp", "none"]).catch("timestamp"),
     sidebarRowItems: SidebarRowItemsSchema,
     sidebarChecksDisplay: z
       .enum(["iconAndText", "icon", "none"])
       .optional()
       .catch(DEFAULT_SIDEBAR_CHECKS_DISPLAY),
     sidebarNavItems: z.array(z.object({ key: z.string(), visible: z.boolean() })).catch([]),
+    sidebarFooterItems: z.array(z.object({ key: z.string(), visible: z.boolean() })).catch([]),
+    usage: UsagePreferencesSchema,
     autoExpandReasoning: z.boolean().catch(false),
     toolCallDetailLevel: z
       .enum(["overview", "detailed"])
@@ -457,6 +481,14 @@ export function parseTerminalScrollbackLines(value: unknown): number | null {
   );
 }
 
+export function parseContentMaxWidth(value: unknown): number | null {
+  return parseClampedFontSize(value, { min: MIN_CONTENT_MAX_WIDTH, max: MAX_CONTENT_MAX_WIDTH });
+}
+
+export function resolveContentMaxWidth(settings: Pick<AppSettings, "contentMaxWidth">): number {
+  return settings.contentMaxWidth ?? DEFAULT_CONTENT_MAX_WIDTH;
+}
+
 export function parseClampedFontSize(
   value: unknown,
   bounds: { min: number; max: number },
diff --git a/packages/app/src/hooks/use-compact-time-ago.ts b/packages/app/src/hooks/use-time-ago.ts
similarity index 75%
rename from packages/app/src/hooks/use-compact-time-ago.ts
rename to packages/app/src/hooks/use-time-ago.ts
index de6bbc5214..e5d32a4ad1 100644
--- a/packages/app/src/hooks/use-compact-time-ago.ts
+++ b/packages/app/src/hooks/use-time-ago.ts
@@ -1,6 +1,11 @@
 import { useEffect, useState } from "react";
 import { subscribeToRelativeTimeTick, type TickResolution } from "@/utils/relative-time-ticker";
-import { describeCompactTimeAgo } from "@/utils/time";
+import { describeCompactTimeAgo, describeTimeAgo, type RelativeTimeLabel } from "@/utils/time";
+
+/** A prose relative timestamp ("5m ago") that keeps itself current. See `useCompactTimeAgo`. */
+export function useTimeAgo(date: Date | null): string {
+  return useRelativeTimeLabel(date, describeTimeAgo);
+}
 
 /**
  * A compact relative timestamp that keeps itself current.
@@ -19,7 +24,14 @@ import { describeCompactTimeAgo } from "@/utils/time";
  *   never changes again.
  */
 export function useCompactTimeAgo(date: Date | null): string {
-  const [label, setLabel] = useState(() => (date ? describeCompactTimeAgo(date).label : ""));
+  return useRelativeTimeLabel(date, describeCompactTimeAgo);
+}
+
+function useRelativeTimeLabel(
+  date: Date | null,
+  describe: (date: Date) => RelativeTimeLabel,
+): string {
+  const [label, setLabel] = useState(() => (date ? describe(date).label : ""));
 
   // Keyed on the instant, not the Date object: the store parses a fresh Date on every payload, so
   // depending on identity would tear down and rebuild the subscription for an unchanged time.
@@ -32,13 +44,13 @@ export function useCompactTimeAgo(date: Date | null): string {
     }
 
     const source = new Date(time);
-    let current = describeCompactTimeAgo(source);
+    let current = describe(source);
     setLabel(current.label);
 
     let unsubscribe: (() => void) | null = null;
 
     const handleTick = () => {
-      const next = describeCompactTimeAgo(source);
+      const next = describe(source);
       if (next.label !== current.label) {
         setLabel(next.label);
       }
@@ -62,7 +74,7 @@ export function useCompactTimeAgo(date: Date | null): string {
     return () => {
       unsubscribe?.();
     };
-  }, [time]);
+  }, [time, describe]);
 
   return label;
 }
diff --git a/packages/app/src/hooks/use-workspace-read-state.ts b/packages/app/src/hooks/use-workspace-read-state.ts
new file mode 100644
index 0000000000..2e7b092956
--- /dev/null
+++ b/packages/app/src/hooks/use-workspace-read-state.ts
@@ -0,0 +1,49 @@
+import { useCallback, useMemo } from "react";
+import { i18n } from "@/i18n/i18next";
+import { useHostFeature } from "@/runtime/host-features";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { useWorkspaceFields } from "@/stores/session-store-hooks";
+import { markWorkspaceUnread } from "@/workspace/mark-unread";
+
+export interface WorkspaceReadStateController {
+  hasClearableAttention: boolean;
+  canMarkUnread: boolean;
+  clearAttention: () => Promise<void>;
+  markUnread: () => Promise<void>;
+}
+
+export function useWorkspaceReadState({
+  serverId,
+  workspaceId,
+}: {
+  serverId: string;
+  workspaceId: string;
+}): WorkspaceReadStateController {
+  const status = useWorkspaceFields(serverId, workspaceId, (workspace) => workspace.status);
+  const supportsMarkUnread = useHostFeature(serverId, "workspaceMarkUnread");
+  const hasClearableAttention = status === "attention" || status === "failed";
+  const canMarkUnread = supportsMarkUnread && status === "done";
+
+  const clearAttention = useCallback(async () => {
+    if (!hasClearableAttention) {
+      return;
+    }
+    const client = getHostRuntimeStore().getClient(serverId);
+    if (!client) {
+      throw new Error(i18n.t("workspace.terminal.hostDisconnected"));
+    }
+    await client.clearWorkspaceAttention(workspaceId);
+  }, [hasClearableAttention, serverId, workspaceId]);
+
+  const markUnread = useCallback(async () => {
+    if (!canMarkUnread) {
+      return;
+    }
+    await markWorkspaceUnread(serverId, workspaceId);
+  }, [canMarkUnread, serverId, workspaceId]);
+
+  return useMemo(
+    () => ({ hasClearableAttention, canMarkUnread, clearAttention, markUnread }),
+    [canMarkUnread, clearAttention, hasClearableAttention, markUnread],
+  );
+}
diff --git a/packages/app/src/hosts/host-badge.tsx b/packages/app/src/hosts/host-badge.tsx
index b316e4a7b7..d35a4324f5 100644
--- a/packages/app/src/hosts/host-badge.tsx
+++ b/packages/app/src/hosts/host-badge.tsx
@@ -47,7 +47,11 @@ export function HostBadge({ badge }: { badge: HostBadgeModel }) {
       testID={`host-badge-${badge.serverId}`}
       accessibilityLabel={badge.label}
     >
-      <ThemedServer size={HOST_BADGE_ICON_SIZE} uniProps={HOST_ICON_MAPPINGS[badge.color]} />
+      <ThemedServer
+        size={HOST_BADGE_ICON_SIZE}
+        style={styles.icon}
+        uniProps={HOST_ICON_MAPPINGS[badge.color]}
+      />
       {badge.showLabel ? (
         <Text style={[styles.label, labelColorStyle(badge.color)]} numberOfLines={1}>
           {badge.label}
@@ -92,13 +96,16 @@ const styles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: 3,
-    minWidth: 0,
+    minWidth: HOST_BADGE_ICON_SIZE,
     // Outweighs a sibling's `flexShrink: 1` by enough that the badge is effectively fully
     // squeezed before that sibling gives up its first pixel. An equal factor would split the
     // loss in proportion to length, which hands the most space to the longest hostname —
     // exactly backwards. The icon has a fixed width, so the badge never disappears outright.
     flexShrink: 100,
   },
+  icon: {
+    flexShrink: 0,
+  },
   label: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
diff --git a/packages/app/src/hosts/host-confirmation-sheet.tsx b/packages/app/src/hosts/host-confirmation-sheet.tsx
new file mode 100644
index 0000000000..c83be51a30
--- /dev/null
+++ b/packages/app/src/hosts/host-confirmation-sheet.tsx
@@ -0,0 +1,109 @@
+import { useCallback, useMemo } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { Button } from "@/components/ui/button";
+import { settingsStyles } from "@/styles/settings";
+import { useHostConfirmation } from "@/runtime/host-runtime";
+
+/** Shows the host confirmation the host runtime is waiting on. Mount once at the app root. */
+export function HostConfirmationSheet() {
+  const { t } = useTranslation();
+  const { pending, answer } = useHostConfirmation();
+
+  const cancel = useCallback(() => answer(false), [answer]);
+  const connect = useCallback(() => answer(true), [answer]);
+  const header = useMemo<SheetHeader>(() => ({ title: t("pairing.hostConfirmation.title") }), [t]);
+
+  if (!pending) return null;
+
+  return (
+    <AdaptiveModalSheet header={header} visible onClose={cancel} testID="host-confirmation">
+      <Text style={styles.confirmText}>
+        {pending.kind === "changedConnection"
+          ? t("pairing.hostConfirmation.descriptionChanged")
+          : t("pairing.hostConfirmation.description")}
+      </Text>
+      <View style={settingsStyles.card}>
+        <DetailRow
+          label={t("pairing.hostConfirmation.hostLabel")}
+          value={pending.serverId}
+          testID="host-confirmation-server-id"
+        />
+        <DetailRow
+          label={t("pairing.hostConfirmation.fingerprintLabel")}
+          value={pending.keyFingerprint}
+          testID="host-confirmation-fingerprint"
+          showBorder
+        />
+        <DetailRow
+          label={t("pairing.hostConfirmation.relayLabel")}
+          value={pending.relayEndpoint}
+          testID="host-confirmation-relay"
+          showBorder
+        />
+      </View>
+      <View style={styles.confirmActions}>
+        <Button
+          variant="secondary"
+          size="sm"
+          style={FLEX_1_STYLE}
+          onPress={cancel}
+          testID="host-confirmation-cancel"
+        >
+          {t("common.actions.cancel")}
+        </Button>
+        <Button
+          variant="default"
+          size="sm"
+          style={FLEX_1_STYLE}
+          onPress={connect}
+          testID="host-confirmation-connect"
+        >
+          {t("pairing.hostConfirmation.connect")}
+        </Button>
+      </View>
+    </AdaptiveModalSheet>
+  );
+}
+
+function DetailRow({
+  label,
+  value,
+  showBorder = false,
+  testID,
+}: {
+  label: string;
+  value: string;
+  showBorder?: boolean;
+  testID?: string;
+}) {
+  return (
+    <View style={[settingsStyles.row, showBorder && settingsStyles.rowBorder]}>
+      <View style={settingsStyles.rowContent}>
+        <Text style={settingsStyles.rowTitle}>{label}</Text>
+        <Text style={settingsStyles.rowHint} selectable testID={testID}>
+          {value}
+        </Text>
+      </View>
+    </View>
+  );
+}
+
+// Same shape as the remove-host and remove-connection confirm sheets in
+// screens/settings/host-page.tsx.
+const styles = StyleSheet.create((theme) => ({
+  confirmText: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+  },
+  confirmActions: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    marginTop: theme.spacing[4],
+  },
+}));
+
+const FLEX_1_STYLE = { flex: 1 };
diff --git a/packages/app/src/hosts/pair-scan-model.test.ts b/packages/app/src/hosts/pair-scan-model.test.ts
new file mode 100644
index 0000000000..0ca69b9d24
--- /dev/null
+++ b/packages/app/src/hosts/pair-scan-model.test.ts
@@ -0,0 +1,116 @@
+import { describe, expect, it, vi } from "vitest";
+import type { ConnectionLinkImport, LinkPairing } from "@/runtime/host-runtime";
+import { openPairScan, type PairScanModel } from "./pair-scan-model";
+
+const LINK = "https://app.paseo.sh/#offer=abc";
+const PAIRING: LinkPairing = { submit: async () => ({ status: "cancelled" }) };
+
+/** The host runtime's side of a scan: each import resolves with the next queued outcome. */
+function createScanner(outcomes: Array<ConnectionLinkImport | Error>) {
+  const imports: string[] = [];
+  const connected: string[] = [];
+  const scan = openPairScan({
+    importConnectionLink: async (link) => {
+      imports.push(link);
+      const outcome = outcomes.shift();
+      if (!outcome) throw new Error("No outcome queued for this import");
+      if (outcome instanceof Error) throw outcome;
+      return outcome;
+    },
+    onConnected: (serverId) => connected.push(serverId),
+  });
+  return { scan, imports, connected };
+}
+
+async function settled(scan: PairScanModel): Promise<void> {
+  await vi.waitFor(() => expect(scan.getState().status).not.toBe("pairing"));
+}
+
+describe("openPairScan", () => {
+  it("stops scanning after Cancel until the user scans again", async () => {
+    const { scan, imports } = createScanner([{ status: "cancelled" }, { status: "cancelled" }]);
+
+    scan.scan(LINK);
+    await settled(scan);
+
+    // The code is still in front of the camera.
+    scan.scan(LINK);
+    scan.scan(LINK);
+    await Promise.resolve();
+    expect(imports).toEqual([LINK]);
+    expect(scan.getState()).toEqual({ status: "stopped", error: null });
+
+    scan.scanAgain();
+    scan.scan(LINK);
+    await settled(scan);
+    expect(imports).toEqual([LINK, LINK]);
+  });
+
+  it("starts one attempt per code while pairing, and ignores codes that are not pairing links", async () => {
+    const { scan, imports, connected } = createScanner([
+      { status: "connected", serverId: "srv_scan" },
+    ]);
+
+    scan.scan("https://example.com/not-a-pairing-link");
+    expect(scan.getState()).toEqual({ status: "scanning" });
+
+    scan.scan(LINK);
+    scan.scan(LINK);
+    await settled(scan);
+
+    expect(imports).toEqual([LINK]);
+    expect(connected).toEqual(["srv_scan"]);
+    scan.scan(LINK);
+    expect(imports).toEqual([LINK]);
+  });
+
+  it("ends the attempt when the password prompt closes", async () => {
+    const { scan, imports } = createScanner([
+      { status: "password_required", link: LINK, pairing: PAIRING },
+    ]);
+
+    scan.scan(LINK);
+    await settled(scan);
+    expect(scan.getState()).toEqual({
+      status: "passwordRequired",
+      passwordRequired: { link: LINK, pairing: PAIRING },
+    });
+    scan.scan(LINK);
+
+    scan.closePassword();
+    scan.scan(LINK);
+
+    expect(scan.getState()).toEqual({ status: "stopped", error: null });
+    expect(imports).toEqual([LINK]);
+  });
+
+  it("stops with the error when an attempt fails", async () => {
+    const { scan, imports } = createScanner([new Error("Server disconnected")]);
+
+    scan.scan(LINK);
+    await settled(scan);
+    scan.scan(LINK);
+
+    expect(scan.getState()).toEqual({ status: "stopped", error: "Server disconnected" });
+    expect(imports).toEqual([LINK]);
+  });
+
+  it("does not navigate for an attempt that finishes after the screen closed", async () => {
+    let finish: (outcome: ConnectionLinkImport) => void = () => {};
+    const connected: string[] = [];
+    const scan = openPairScan({
+      importConnectionLink: () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        }),
+      onConnected: (serverId) => connected.push(serverId),
+    });
+
+    scan.scan(LINK);
+    scan.close();
+    finish({ status: "connected", serverId: "srv_scan" });
+    await Promise.resolve();
+
+    expect(connected).toEqual([]);
+  });
+});
diff --git a/packages/app/src/hosts/pair-scan-model.ts b/packages/app/src/hosts/pair-scan-model.ts
new file mode 100644
index 0000000000..4dca380543
--- /dev/null
+++ b/packages/app/src/hosts/pair-scan-model.ts
@@ -0,0 +1,103 @@
+import type { ConnectionLinkImport, PasswordRequiredPairing } from "@/runtime/host-runtime";
+
+/**
+ * One visit to the QR scan screen. The camera reports every frame that shows
+ * a code, so an attempt that ends (Cancel on the host confirmation, a closed
+ * password prompt, or an error) stops scanning until the user taps scan again.
+ * Without that, the code still in front of the camera starts a new attempt on
+ * the next frame.
+ */
+export type PairScanState =
+  | { status: "scanning" }
+  | { status: "pairing" }
+  | { status: "passwordRequired"; passwordRequired: PasswordRequiredPairing }
+  | { status: "stopped"; error: string | null }
+  | { status: "connected" };
+
+export interface PairScanModel {
+  getState: () => PairScanState;
+  subscribe: (listener: () => void) => () => void;
+  /** Data from a QR code the camera saw. Only a scanning session starts an attempt. */
+  scan: (data: string) => void;
+  /** The user asked to scan again after an attempt ended. */
+  scanAgain: () => void;
+  /** The user closed the password prompt, which ends the attempt. */
+  closePassword: () => void;
+  close: () => void;
+}
+
+export interface PairScanDependencies {
+  importConnectionLink: (link: string) => Promise<ConnectionLinkImport>;
+  onConnected: (serverId: string) => void;
+}
+
+export function openPairScan(deps: PairScanDependencies): PairScanModel {
+  let state: PairScanState = { status: "scanning" };
+  let closed = false;
+  const listeners = new Set<() => void>();
+
+  function publish(next: PairScanState): void {
+    if (closed) return;
+    state = next;
+    for (const listener of listeners) {
+      listener();
+    }
+  }
+
+  async function pair(link: string): Promise<void> {
+    publish({ status: "pairing" });
+    try {
+      const outcome = await deps.importConnectionLink(link);
+      if (closed) return;
+      if (outcome.status === "connected") {
+        publish({ status: "connected" });
+        deps.onConnected(outcome.serverId);
+        return;
+      }
+      if (outcome.status === "password_required") {
+        const { link: passwordLink, pairing } = outcome;
+        publish({ status: "passwordRequired", passwordRequired: { link: passwordLink, pairing } });
+        return;
+      }
+      publish({ status: "stopped", error: null });
+    } catch (error) {
+      publish({ status: "stopped", error: error instanceof Error ? error.message : String(error) });
+    }
+  }
+
+  return {
+    getState: () => state,
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    scan(data) {
+      if (state.status !== "scanning") return;
+      const link = pairingLinkFromScan(data);
+      if (!link) return;
+      void pair(link);
+    },
+    scanAgain() {
+      if (state.status !== "stopped") return;
+      publish({ status: "scanning" });
+    },
+    closePassword() {
+      if (state.status !== "passwordRequired") return;
+      publish({ status: "stopped", error: null });
+    },
+    close() {
+      closed = true;
+      listeners.clear();
+    },
+  };
+}
+
+function pairingLinkFromScan(data: string): string | null {
+  const raw = data.trim();
+  if (raw.includes("#offer=") || raw.includes("#connect=") || raw.startsWith("relay://")) {
+    return raw;
+  }
+  return null;
+}
diff --git a/packages/app/src/i18n/resources.test.ts b/packages/app/src/i18n/resources.test.ts
index 46b3428026..bf42a3b61a 100644
--- a/packages/app/src/i18n/resources.test.ts
+++ b/packages/app/src/i18n/resources.test.ts
@@ -74,6 +74,45 @@ const untranslatedLocalFallbacks = [
   "Unable to save desktop settings.",
 ] as const;
 
+const pullRequestPanelSources = [
+  "git/pull-request-panel/pane.tsx",
+  "git/pull-request-panel/data.ts",
+  "git/pull-request-panel/checks-section.tsx",
+  "components/sidebar/sidebar-status-list.tsx",
+] as const;
+const untranslatedPullRequestPanelLabels = [
+  "Activity",
+  "No activity yet",
+  "Add all to chat",
+  "Add to chat",
+  "Adding...",
+  "Comment actions",
+  "Thread actions",
+  "Commented",
+  "Approved",
+  "Requested changes",
+  "Reviewed",
+  "Draft",
+  "Merged",
+  "Closed",
+  "Open",
+  "Resolved",
+  "Outdated",
+] as const;
+
+function findUntranslatedPullRequestPanelLabels(): string[] {
+  return pullRequestPanelSources.flatMap((source) => {
+    const contents = readFileSync(join(appSourceRoot, source), "utf8");
+    const matches: string[] = untranslatedPullRequestPanelLabels.filter(
+      (text) => contents.includes(`"${text}"`) || new RegExp(`>\\s*${text}\\s*<`).test(contents),
+    );
+    if (contents.includes("} group`")) {
+      matches.push("group");
+    }
+    return matches.length === 0 ? [] : [`${source}: ${matches.join(", ")}`];
+  });
+}
+
 function collectSourceFiles(directory: string): string[] {
   return readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {
     const path = join(directory, entry.name);
@@ -183,10 +222,53 @@ describe("translation resources", () => {
     expect(ko.desktop.daemon.status.notRunning).toBe("실행 중이 아님");
   });
 
+  it("uses the French navigation and Git meanings for reported labels", () => {
+    expect(fr.common.back).toBe("Retour");
+    expect(fr.common.actions.back).toBe("Retour");
+    expect(fr.common.actions.copy).toBe("Copier");
+    expect(fr.common.states.starting).toBe("Démarrage…");
+    expect(fr.common.connectionStatus.connecting).toBe("Connexion…");
+    expect(fr.workspace.git.pr.sections.checks).toBe("Vérifications");
+    expect(fr.sidebar.display.show.checks).toBe("Vérifications");
+  });
+
+  it("separates French interpolation placeholders from neighboring words", () => {
+    const glued = Object.entries(flattenStrings(fr)).filter(([, value]) =>
+      /\p{L}\{\{|\}\}\p{L}{2,}/u.test(value),
+    );
+    expect(glued).toEqual([]);
+  });
+
   it("labels the immediate add-to-chat action without an ellipsis", () => {
     expect(en.workspace.fileActions.addToChat).toBe("Add to chat");
   });
 
+  it("keeps pull request panel and sidebar status group labels translated", () => {
+    expect(findUntranslatedPullRequestPanelLabels()).toEqual([]);
+    for (const resource of [ar, es, fr, ja, ko, ptBR, ru, zhCN]) {
+      const pr = resource.workspace.git.pr;
+      const englishPr = en.workspace.git.pr;
+      expect(pr.sections.activity).not.toBe(englishPr.sections.activity);
+      expect(pr.empty.noActivity).not.toBe(englishPr.empty.noActivity);
+      expect(pr.actions.addToChat).not.toBe(englishPr.actions.addToChat);
+      expect(pr.actions.addAllToChat).not.toBe(englishPr.actions.addAllToChat);
+      expect(pr.actions.addingToChat).not.toBe(englishPr.actions.addingToChat);
+      expect(pr.accessibility.commentActions).not.toBe(englishPr.accessibility.commentActions);
+      expect(pr.accessibility.threadActions).not.toBe(englishPr.accessibility.threadActions);
+      for (const verb of Object.keys(englishPr.activity) as (keyof typeof englishPr.activity)[]) {
+        expect(pr.activity[verb]).not.toBe(englishPr.activity[verb]);
+      }
+      for (const state of Object.keys(englishPr.states) as (keyof typeof englishPr.states)[]) {
+        expect(pr.states[state]).not.toBe(englishPr.states[state]);
+      }
+      expect(pr.thread.resolved).not.toBe(englishPr.thread.resolved);
+      expect(pr.thread.outdated).not.toBe(englishPr.thread.outdated);
+      expect(resource.sidebar.statusGroupAccessibility).not.toBe(
+        en.sidebar.statusGroupAccessibility,
+      );
+    }
+  });
+
   it("keeps local connection fallback errors translated", () => {
     expect(findUntranslatedConnectionErrors()).toEqual([]);
   });
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index e09ef311de..ca402264f2 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -2,16 +2,42 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const ar: TranslationResources = {
+  paneFind: {
+    connectionFailure: "تعذر البحث في هذه المحادثة. تحقق من الاتصال بالمضيف وأعد المحاولة.",
+    historyChangedFailure: "تغيّرت المحادثة أثناء البحث. أعد البحث.",
+    revealFailure: "تعذر عرض هذا التطابق. أعد المحاولة.",
+    searching: "جارٍ البحث…",
+    loading: "جارٍ التحميل…",
+    failed: "فشل",
+    retry: "إعادة المحاولة",
+
+    title: "بحث",
+    placeholder: "بحث في اللوحة",
+    close: "إغلاق البحث",
+    matches: "نتائج البحث",
+    previous: "التطابق السابق",
+    next: "التطابق التالي",
+    toggleReplace: "إظهار الاستبدال",
+    replaceWith: "استبدال بـ",
+    replace: "استبدال",
+    replaceAll: "استبدال الكل",
+    noMatches: "لا توجد تطابقات",
+    position: "{{current}} من {{total}}",
+    total: "{{total}} تطابقات",
+  },
   common: {
+    bottomSheetBackdrop: "خلفية اللوحة السفلية",
     back: "خلف",
     loading: "تحميل...",
     actions: {
+      save: "حفظ",
       back: "خلف",
       cancel: "يلغي",
       close: "يغلق",
       copy: "ينسخ",
       copyLine: "نسخ السطر",
       dismiss: "رفض",
+      reload: "إعادة التحميل",
       retry: "أعد المحاولة",
       search: "يبحث",
       select: "يختار",
@@ -98,6 +124,8 @@ export const ar: TranslationResources = {
     input: {
       accessibilityLabel: "وكيل الرسائل...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "ملء الشاشة",
+      exitFullscreen: "الخروج من ملء الشاشة",
       focusHint: "{{shortcut}}للتركيز",
       addAttachment: "إضافة مرفق",
       interruptAgent: "عامل المقاطعة",
@@ -153,7 +181,7 @@ export const ar: TranslationResources = {
       initialPromptRequired: "مطلوب موجه الأولي",
       alreadyLoading: "جارٍ التحميل بالفعل",
       uploadFailed: "Failed to upload file",
-      noClipboardImage: "لا توجد صورة في الحافظة",
+      noClipboardImage: "لا توجد صورة في الحافظة الحالية. جرّب اللصق من لوحة المفاتيح.",
       pasteImageFailed: "تعذر لصق الصورة",
       fileTooLarge: "{{fileName}} is too large (max {{size}})",
     },
@@ -208,6 +236,10 @@ export const ar: TranslationResources = {
     historyLoadFailed: "تعذر تحميل سجل الوكيل",
     messageCapped: "تم اقتطاع هذه الرسالة ({{bytes}} بايت).",
     permission: {
+      rejectedPlan: "خطة مرفوضة",
+      approvedPlan: "خطة معتمدة",
+      canceledPlan: "خطة ملغاة",
+
       plan: "يخطط",
       required: "الإذن مطلوب",
       deny: "ينكر",
@@ -221,7 +253,8 @@ export const ar: TranslationResources = {
     states: {
       notFound: "لم يتم العثور على Agent",
       failedToLoad: "فشل تحميل الوكيل",
-      reconnecting: "جارٍ إعادة الاتصال",
+      reconnecting: "جارٍ إعادة الاتصال بالمضيف",
+      updating: "جارٍ تحديث الرسائل",
       timelineSyncFailed: "تعذر تحديث سجل الوكيل.",
       timelineSyncRetrying: "جارٍ إعادة المحاولة…",
       archivingTitle: "وكيل الارشيف...",
@@ -352,6 +385,9 @@ export const ar: TranslationResources = {
         completed: "اكتملت",
       },
     },
+    turnFooter: {
+      workedFor: "عمل لمدة {{duration}}",
+    },
     compaction: {
       loading: "الضغط...",
       auto: "يتم ضغط السياق تلقائيًا",
@@ -410,7 +446,9 @@ export const ar: TranslationResources = {
       recovery: {
         archivedTitle: "مساحة العمل مؤرشفة",
         restoreDescription:
-          "تمت أرشفة {{workspaceName}} وإزالة شجرة العمل الخاصة بها. استعد الفرع {{branch}} لفتحها مجددًا.",
+          "استعد {{workspaceName}} للعودة إلى وكلائها. ستستخدم شجرة العمل الفرع {{branch}}.",
+        restoreWithoutBranchDescription:
+          "استعد {{workspaceName}} للعودة إلى وكلائها. سيبدأ فرع جديد من الفرع الأساسي المحفوظ أو الفرع الافتراضي للمستودع.",
         unarchiveDescription: "{{workspaceName}} مؤرشفة. ألغِ أرشفتها لفتحها مجددًا.",
         restoreAction: "استعادة",
         unarchiveAction: "إلغاء الأرشفة",
@@ -879,6 +917,9 @@ export const ar: TranslationResources = {
         openChangesTab: "فتح علامة تبويب التغييرات",
         openDiffTab: "فتح علامة تبويب الفرق",
         closeChangesTab: "إغلاق علامة تبويب التغييرات",
+        jumpToFile: {
+          title: "الانتقال إلى ملف",
+        },
         binaryFile: "ملف ثنائي",
         tooLarge: "الفرق كبير جدًا بحيث لا يمكن عرضه",
         previewTooLargeTitle: "هذا الفرق كبير جدًا بحيث لا يمكن معاينته",
@@ -901,11 +942,8 @@ export const ar: TranslationResources = {
         refresh: "ينعش",
         refreshState: "تحديث حالة git و{{brand}}",
         failedRefresh: "فشل تحديث حالة git.",
-        emptyHiddenWhitespace: "لا توجد تغييرات مرئية بعد إخفاء المسافة البيضاء",
-        emptyUncommitted: "لا توجد تغييرات غير ملتزم بها",
         seeUncommittedChanges: "عرض التغييرات غير الملتزم بها",
         seeCommittedChanges: "عرض التغييرات الملتزم بها",
-        emptyAgainstBase: "لا توجد تغييرات مقابل{{baseRef}}",
         checkingRepository: "فحص المستودع...",
         notRepository: "ليس مستودع جيت",
         diffMode: "وضع الفرق",
@@ -938,6 +976,47 @@ export const ar: TranslationResources = {
         actions: {
           viewPullRequest: "عرض",
           openOn: "فتح على {{brand}}",
+          addToChat: "إضافة إلى الدردشة",
+          addAllToChat: "إضافة الكل إلى الدردشة",
+          addingToChat: "جارٍ الإضافة...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "بعض الفحوصات تحتاج إلى انتباهك",
+            failure: "بعض الفحوصات لم تنجح",
+            pending: "بعض الفحوصات لم تكتمل بعد",
+            success: "نجحت جميع الفحوصات",
+            none: "لا توجد فحوصات",
+          },
+          count: {
+            actionRequired: "{{count}} تحتاج إجراءً",
+            warning: "{{count}} مع تحذير",
+            failure: "{{count}} فاشلة",
+            pending: "{{count}} قيد التشغيل",
+            manual: "{{count}} يدوية",
+            success: "{{count}} ناجحة",
+            ignored: "{{count}} متخطاة",
+          },
+          detailOne: "الفحص: {{parts}}",
+          detailMany: "الفحوصات: {{parts}}",
+          groupOne: {
+            actionRequired: "{{count}} فحص يحتاج إجراءً",
+            warning: "{{count}} فحص مع تحذير",
+            failure: "{{count}} فحص فاشل",
+            pending: "{{count}} فحص قيد التشغيل",
+            manual: "{{count}} فحص يدوي",
+            success: "{{count}} فحص ناجح",
+            ignored: "{{count}} فحص متخطى",
+          },
+          groupMany: {
+            actionRequired: "{{count}} فحوصات تحتاج إجراءً",
+            warning: "{{count}} فحوصات مع تحذير",
+            failure: "{{count}} فحوصات فاشلة",
+            pending: "{{count}} فحوصات قيد التشغيل",
+            manual: "{{count}} فحوصات يدوية",
+            success: "{{count}} فحوصات ناجحة",
+            ignored: "{{count}} فحوصات متخطاة",
+          },
         },
         checksSummary: {
           passedLabel: "نجح",
@@ -951,17 +1030,21 @@ export const ar: TranslationResources = {
           checks: "الشيكات",
           pipeline: "خط المعالجة",
           reviews: "التعليقات",
+          activity: "النشاط",
         },
         empty: {
           noJobs: "لا توجد مهام",
           loadingPipeline: "جارٍ تحميل خط المعالجة...",
           pipelineJobsLoadFailed: "تعذر تحميل مهام خط المعالجة",
           allowedToFail: "مسموح بالفشل",
+          noActivity: "لا يوجد نشاط بعد",
         },
         approvals: "{{given}} من {{required}} موافقات",
         accessibility: {
           pullRequest: "سحب الطلب #{{number}}",
           pullRequest_mr: "طلب دمج !{{number}}",
+          commentActions: "إجراءات التعليق",
+          threadActions: "إجراءات سلسلة النقاش",
           checkStatus: {
             passed: "ناجح",
             failed: "فاشل",
@@ -990,6 +1073,8 @@ export const ar: TranslationResources = {
         },
         thread: {
           discussion: "سلسلة المناقشة",
+          resolved: "تم الحل",
+          outdated: "قديم",
         },
         errors: {
           statusLoadFailed: "غير قادر على تحميل حالة طلب السحب",
@@ -1045,8 +1130,27 @@ export const ar: TranslationResources = {
       updateHost: "حدّث هذا المضيف لإدارة التسميات.",
     },
   },
+  changelog: {
+    title: "ما الجديد",
+    installed: "مثبّت",
+    showMore: "عرض المزيد",
+    openWebsite: "سجل التغييرات الكامل",
+    error: {
+      title: "تعذّر تحميل سجل التغييرات",
+      description: "تحقق من اتصالك وحاول مرة أخرى.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "مجموعة {{label}}",
+    statusBucket: {
+      needsInput: "تحتاج إدخالاً",
+      failed: "فشل",
+      readyToReview: "جاهزة للمراجعة",
+      working: "قيد العمل",
+      done: "تم",
+    },
     display: {
+      showBackground: "إظهار مساحات العمل في الخلفية",
       trigger: "تفضيلات العرض",
       heading: "العرض",
       grouping: {
@@ -1106,6 +1210,9 @@ export const ar: TranslationResources = {
       settings: "إعدادات",
       closeSidebar: "إغلاق الشريط الجانبي",
     },
+    footer: {
+      usage: "الاستخدام",
+    },
     help: {
       trigger: "المساعدة والدعم",
       sectionHelp: "المساعدة",
@@ -1266,6 +1373,7 @@ export const ar: TranslationResources = {
       detail: "إيقاف البرنامج الخفي المحلي.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Daemon",
       status: {
         title: "حالة",
@@ -1482,6 +1590,8 @@ export const ar: TranslationResources = {
     noFiles: "لم يتم العثور على ملفات أو أدلة",
     noCommands: "لم يتم العثور على أي أوامر",
     failedToLoad: "فشل التحميل",
+    chooseProjectForCommands: "اختر مشروعًا لعرض الأوامر",
+    chooseModelForCommands: "اختر نموذجًا لعرض الأوامر",
   },
   loadOlderHistory: {
     failed: "تعذر تحميل السجل الأقدم",
@@ -1573,6 +1683,21 @@ export const ar: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "كلمة المرور لـ {{host}}",
+      label: "كلمة مرور المضيف",
+    },
+    hostConfirmation: {
+      title: "الاتصال بهذا المضيف؟",
+      description:
+        "سيتمكن هذا المضيف من تشغيل تعليمات برمجية في هذا التطبيق والوصول إلى مضيفيك الآخرين المتصلين. اتصل فقط إذا كنت تعرفه.",
+      descriptionChanged:
+        "يغيّر هذا الرابط طريقة اتصالك بهذا المضيف. سيتمكن المضيف من تشغيل تعليمات برمجية في هذا التطبيق والوصول إلى مضيفيك الآخرين المتصلين. اتصل فقط إذا كنت تعرفه.",
+      hostLabel: "المضيف",
+      fingerprintLabel: "بصمة المفتاح",
+      relayLabel: "المُرحّل",
+      connect: "اتصال",
+    },
     connectionMethods: {
       title: "إضافة اتصال",
       direct: {
@@ -1640,6 +1765,12 @@ export const ar: TranslationResources = {
       helper: "الاتصال بخادم Paseo يعمل على المضيف البعيد.",
       fields: {
         target: "مضيف SSH",
+        password: "كلمة مرور الدايمون",
+        optional: "خياري",
+      },
+      passwordVisibility: {
+        show: "إظهار كلمة المرور",
+        hide: "إخفاء كلمة المرور",
       },
       actions: {
         cancel: "إلغاء",
@@ -1868,6 +1999,8 @@ export const ar: TranslationResources = {
     dismiss: "رفض",
   },
   contextWindow: {
+    noData: "لا توجد بيانات للسياق",
+    accessibilityNoData: "نافذة السياق: لا توجد بيانات للسياق",
     title: "نافذة السياق",
     used: "تم استخدام{{percentage}}%",
     tokens: "رموز{{used}}/{{max}}",
@@ -1875,6 +2008,17 @@ export const ar: TranslationResources = {
     accessibility: "تم استخدام نافذة السياق{{percentage}}%",
   },
   review: {
+    feedback: {
+      send: "إرسال الملاحظات ({{count}})",
+      sending: "جارٍ إرسال الملاحظات ({{count}})",
+      chooseAgent: "اختر وكيلاً",
+      sent: "تم إرسال الملاحظات إلى {{recipient}}",
+      "no-agents": "افتح علامة تبويب وكيل في مساحة العمل هذه لإرسال الملاحظات.",
+      disconnected: "اتصل بالمضيف لإرسال الملاحظات.",
+      "no-context": "لم تعد التعليقات المحفوظة تتطابق مع هذا الفرق.",
+      failed: "تعذر إرسال الملاحظات. حاول مرة أخرى.",
+      prompt: "يرجى معالجة مراجعة الكود هذه.",
+    },
     comment: {
       add: "إضافة تعليق المراجعة",
       edit: "تحرير تعليق المراجعة",
@@ -1909,8 +2053,11 @@ export const ar: TranslationResources = {
     groupInfo: "حول{{title}}",
     sections: {
       general: "عام",
+      chat: "الدردشة",
       appearance: "مظهر",
-      layout: en.settings.sections.layout,
+      sidebar: "الشريط الجانبي",
+      terminal: "الطرفية",
+      browser: "المتصفح",
       editor: "المحرر",
       shortcuts: "الاختصارات",
       integrations: "التكامل",
@@ -1969,6 +2116,7 @@ export const ar: TranslationResources = {
     },
     general: {
       title: "عام",
+      sending: "الإرسال",
       browserData: {
         title: "بيانات المتصفح",
         siteData: "ملفات تعريف الارتباط وبيانات المواقع",
@@ -1996,8 +2144,6 @@ export const ar: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "عناوين URL للخدمة",
-        description: "مكان فتح عناوين URL من تشغيل البرامج النصية",
         options: {
           ask: "بسأل",
           inApp: "في Paseo",
@@ -2016,7 +2162,6 @@ export const ar: TranslationResources = {
       toolCallDetail: {
         label: "عرض استدعاءات الأدوات",
         description: "كيفية ظهور استدعاءات الأدوات في المخطط الزمني",
-        accessibilityLabel: "حدد عرض استدعاءات الأدوات ({{value}})",
         options: {
           overview: "ملخص",
           detailed: "التفاصيل الكاملة",
@@ -2070,6 +2215,7 @@ export const ar: TranslationResources = {
     about: {
       title: "عن",
       appVersion: "نسخة التطبيق",
+      whatsNewHint: "ملاحظات الإصدار لكل نسخة",
       thisDevice: "هذا الجهاز",
       connectedHosts: "المضيفين المتصلين",
       offline: "غير متصل",
@@ -2118,8 +2264,15 @@ export const ar: TranslationResources = {
         description: "عرض مخطط للتنقل بين المطالبات",
       },
       sidebar: {
-        title: "الشريط الجانبي",
-        description: "اختر العناصر التي تظهر أعلى الشريط الجانبي وترتيبها",
+        header: {
+          title: "الرأس",
+          description: "اختر العناصر التي تظهر أعلى الشريط الجانبي وترتيبها",
+        },
+        footer: {
+          title: "التذييل",
+          description:
+            "اختر الصفوف التي تظهر أسفل الشريط الجانبي وترتيبها. يظهر «إضافة مشروع» وصف الأيقونات دائمًا",
+        },
         moveUp: "نقل لأعلى",
         moveDown: "نقل لأسفل",
       },
@@ -2143,6 +2296,14 @@ export const ar: TranslationResources = {
         codeSizeHint: "يُستخدم للكود والفروقات ومخرجات الطرفية",
         codeSizeAccessibility: "حجم خط الكود",
       },
+      layout: {
+        title: "التخطيط",
+        contentWidth: "عرض المحتوى",
+        contentWidthHint: "أقصى عرض للمحادثة وملفات Markdown على الشاشات العريضة",
+        contentWidthAccessibility: "عرض المحتوى بالبكسل",
+        reset: "إعادة تعيين",
+        resetAccessibility: "إعادة عرض المحتوى إلى الافتراضي",
+      },
       syntax: {
         title: "بناء الجملة",
         highlightTheme: "تسليط الضوء على الموضوع",
@@ -2253,6 +2414,9 @@ export const ar: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance: "أزل هذا المضيف ثم أضفه مرة أخرى بكلمة المرور التي يطلبها هذا الخادم.",
+      },
       appearance: {
         title: "المظهر",
         name: {
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 2516a3f064..92dbb3f78c 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -1,14 +1,39 @@
 export const en = {
+  paneFind: {
+    connectionFailure: "Could not search this chat. Check the host connection and retry.",
+    historyChangedFailure: "The chat changed while searching. Search again.",
+    revealFailure: "Could not show this match. Retry.",
+    searching: "Searching…",
+    loading: "Loading…",
+    failed: "Failed",
+    retry: "Retry",
+    title: "Find",
+    placeholder: "Find in pane",
+    close: "Close Find",
+    matches: "Find matches",
+    previous: "Previous match",
+    next: "Next match",
+    toggleReplace: "Toggle replace",
+    replaceWith: "Replace with",
+    replace: "Replace",
+    replaceAll: "Replace all",
+    noMatches: "No matches",
+    position: "{{current}} of {{total}}",
+    total: "{{total}} matches",
+  },
   common: {
+    bottomSheetBackdrop: "Bottom sheet backdrop",
     back: "Back",
     loading: "Loading...",
     actions: {
+      save: "Save",
       back: "Back",
       cancel: "Cancel",
       close: "Close",
       copy: "Copy",
       copyLine: "Copy line",
       dismiss: "Dismiss",
+      reload: "Reload",
       retry: "Retry",
       search: "Search",
       select: "Select",
@@ -95,6 +120,8 @@ export const en = {
     input: {
       accessibilityLabel: "Message agent...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Fullscreen",
+      exitFullscreen: "Exit fullscreen",
       focusHint: "{{shortcut}} to focus",
       addAttachment: "Add attachment",
       interruptAgent: "Interrupt agent",
@@ -150,7 +177,7 @@ export const en = {
       initialPromptRequired: "Initial prompt is required",
       alreadyLoading: "Already loading",
       uploadFailed: "Failed to upload file",
-      noClipboardImage: "No image in clipboard",
+      noClipboardImage: "No image in the current clipboard. Try pasting from your keyboard.",
       pasteImageFailed: "Failed to paste image",
       fileTooLarge: "{{fileName}} is too large (max {{size}})",
     },
@@ -205,6 +232,10 @@ export const en = {
     historyLoadFailed: "Couldn't load agent history",
     messageCapped: "This message was capped ({{bytes}} bytes).",
     permission: {
+      rejectedPlan: "Rejected plan",
+      approvedPlan: "Approved plan",
+      canceledPlan: "Canceled plan",
+
       plan: "Plan",
       required: "Permission Required",
       deny: "Deny",
@@ -218,7 +249,8 @@ export const en = {
     states: {
       notFound: "Agent not found",
       failedToLoad: "Failed to load agent",
-      reconnecting: "Reconnecting",
+      reconnecting: "Reconnecting to host",
+      updating: "Updating messages",
       timelineSyncFailed: "Couldn't refresh agent history.",
       timelineSyncRetrying: "Retrying…",
       archivingTitle: "Archiving agent...",
@@ -350,6 +382,9 @@ export const en = {
         completed: "Completed",
       },
     },
+    turnFooter: {
+      workedFor: "Worked for {{duration}}",
+    },
     compaction: {
       loading: "Compacting...",
       auto: "Context automatically compacted",
@@ -408,7 +443,9 @@ export const en = {
       recovery: {
         archivedTitle: "Workspace archived",
         restoreDescription:
-          "{{workspaceName}} was archived and its worktree was removed. Restore branch {{branch}} to open it again.",
+          "Restore {{workspaceName}} to return to its agents. Its worktree will use branch {{branch}}.",
+        restoreWithoutBranchDescription:
+          "Restore {{workspaceName}} to return to its agents. A new branch will start from the saved base or the repository default.",
         unarchiveDescription: "{{workspaceName}} is archived. Unarchive it to open it again.",
         restoreAction: "Restore",
         unarchiveAction: "Unarchive",
@@ -888,6 +925,9 @@ export const en = {
         openChangesTab: "Open Changes tab",
         openDiffTab: "Open Diff tab",
         closeChangesTab: "Close Changes tab",
+        jumpToFile: {
+          title: "Jump to file",
+        },
         binaryFile: "Binary file",
         tooLarge: "Diff too large to display",
         previewTooLargeTitle: "This diff is too large to preview",
@@ -910,11 +950,8 @@ export const en = {
         refresh: "Refresh",
         refreshState: "Refresh git and {{brand}} state",
         failedRefresh: "Failed to refresh git state.",
-        emptyHiddenWhitespace: "No visible changes after hiding whitespace",
-        emptyUncommitted: "No uncommitted changes",
         seeUncommittedChanges: "See uncommitted changes",
         seeCommittedChanges: "See committed changes",
-        emptyAgainstBase: "No changes vs {{baseRef}}",
         checkingRepository: "Checking repository...",
         notRepository: "Not a git repository",
         diffMode: "Diff mode",
@@ -947,6 +984,47 @@ export const en = {
         actions: {
           viewPullRequest: "View",
           openOn: "Open on {{brand}}",
+          addToChat: "Add to chat",
+          addAllToChat: "Add all to chat",
+          addingToChat: "Adding...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "Some checks need your attention",
+            failure: "Some checks were not successful",
+            pending: "Some checks haven't completed yet",
+            success: "All checks have passed",
+            none: "No checks",
+          },
+          count: {
+            actionRequired: "{{count}} needs action",
+            warning: "{{count}} warning",
+            failure: "{{count}} failing",
+            pending: "{{count}} in progress",
+            manual: "{{count}} manual",
+            success: "{{count}} successful",
+            ignored: "{{count}} skipped",
+          },
+          detailOne: "{{parts}} check",
+          detailMany: "{{parts}} checks",
+          groupOne: {
+            actionRequired: "{{count}} needs action check",
+            warning: "{{count}} warning check",
+            failure: "{{count}} failing check",
+            pending: "{{count}} in progress check",
+            manual: "{{count}} manual check",
+            success: "{{count}} successful check",
+            ignored: "{{count}} skipped check",
+          },
+          groupMany: {
+            actionRequired: "{{count}} needs action checks",
+            warning: "{{count}} warning checks",
+            failure: "{{count}} failing checks",
+            pending: "{{count}} in progress checks",
+            manual: "{{count}} manual checks",
+            success: "{{count}} successful checks",
+            ignored: "{{count}} skipped checks",
+          },
         },
         checksSummary: {
           passedLabel: "passed",
@@ -960,17 +1038,21 @@ export const en = {
           checks: "Checks",
           pipeline: "Pipeline",
           reviews: "Reviews",
+          activity: "Activity",
         },
         empty: {
           noJobs: "No jobs",
           loadingPipeline: "Loading pipeline…",
           pipelineJobsLoadFailed: "Could not load pipeline jobs",
           allowedToFail: "allowed to fail",
+          noActivity: "No activity yet",
         },
         approvals: "{{given}} of {{required}} approvals",
         accessibility: {
           pullRequest: "Pull request #{{number}}",
           pullRequest_mr: "Merge request !{{number}}",
+          commentActions: "Comment actions",
+          threadActions: "Thread actions",
           checkStatus: {
             passed: "Passed",
             failed: "Failed",
@@ -999,6 +1081,8 @@ export const en = {
         },
         thread: {
           discussion: "Discussion thread",
+          resolved: "Resolved",
+          outdated: "Outdated",
         },
         errors: {
           statusLoadFailed: "Unable to load pull request status",
@@ -1054,8 +1138,27 @@ export const en = {
       updateHost: "Update this host to manage labels.",
     },
   },
+  changelog: {
+    title: "What's new",
+    installed: "Installed",
+    showMore: "Show more",
+    openWebsite: "Full changelog",
+    error: {
+      title: "Unable to load the changelog",
+      description: "Check your connection and try again.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "{{label}} group",
+    statusBucket: {
+      needsInput: "Needs input",
+      failed: "Failed",
+      readyToReview: "Ready to review",
+      working: "Working",
+      done: "Done",
+    },
     display: {
+      showBackground: "Show background",
       trigger: "Display preferences",
       heading: "Display",
       grouping: {
@@ -1115,6 +1218,9 @@ export const en = {
       settings: "Settings",
       closeSidebar: "Close sidebar",
     },
+    footer: {
+      usage: "Usage",
+    },
     help: {
       trigger: "Help and support",
       sectionHelp: "Help",
@@ -1276,6 +1382,23 @@ export const en = {
     },
     daemon: {
       title: "Daemon",
+      lifecycle: {
+        owned: "Launched by this Desktop session",
+        attached: "Attached to an existing daemon",
+        ownedMessage: "This daemon was launched by this Desktop session.",
+        attachedMessage: "This daemon was not launched by this Desktop session.",
+        stopTitle: "Stop local daemon?",
+        stopMessage:
+          "{{ownership}}\nHome: {{home}}\nSupervisor PID: {{pid}}\nRunning agent work will be interrupted.",
+        stop: "Stop daemon",
+        stopping: "Stopping…",
+        stopFailed: "Unable to stop daemon",
+        pauseAttached: "Pause automatic daemon management? The attached daemon will keep running.",
+        pause: "Pause management",
+        workerUpdated: "Worker updated to {{version}}",
+        supervisorRefresh:
+          "The running supervisor retains its original code. Its launcher must stop and start it to refresh the supervisor.",
+      },
       status: {
         title: "Status",
         builtInOnly: "Only the built-in desktop daemon is shown here",
@@ -1492,6 +1615,8 @@ export const en = {
     noFiles: "No files or directories found",
     noCommands: "No commands found",
     failedToLoad: "Failed to load",
+    chooseProjectForCommands: "Choose a project to see commands",
+    chooseModelForCommands: "Select a model to see commands",
   },
   loadOlderHistory: {
     failed: "Couldn't load older history",
@@ -1583,6 +1708,21 @@ export const en = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "Password for {{host}}",
+      label: "Host password",
+    },
+    hostConfirmation: {
+      title: "Connect to this host?",
+      description:
+        "This host will be able to run code in this app and reach your other connected hosts. Only connect if you recognize it.",
+      descriptionChanged:
+        "This link changes how you connect to this host. The host will be able to run code in this app and reach your other connected hosts. Only connect if you recognize it.",
+      hostLabel: "Host",
+      fingerprintLabel: "Key fingerprint",
+      relayLabel: "Relay",
+      connect: "Connect",
+    },
     connectionMethods: {
       title: "Add connection",
       direct: {
@@ -1649,6 +1789,12 @@ export const en = {
       helper: "Connect to a Paseo daemon running on the remote host.",
       fields: {
         target: "SSH host",
+        password: "Daemon password",
+        optional: "Optional",
+      },
+      passwordVisibility: {
+        show: "Show password",
+        hide: "Hide password",
       },
       actions: {
         cancel: "Cancel",
@@ -1878,6 +2024,8 @@ export const en = {
     dismiss: "Dismiss",
   },
   contextWindow: {
+    noData: "No context data",
+    accessibilityNoData: "Context window: No context data",
     title: "Context window",
     used: "{{percentage}}% used",
     tokens: "{{used}} / {{max}} tokens",
@@ -1885,6 +2033,17 @@ export const en = {
     accessibility: "Context window {{percentage}}% used",
   },
   review: {
+    feedback: {
+      send: "Send feedback ({{count}})",
+      sending: "Sending feedback ({{count}})",
+      chooseAgent: "Choose an agent",
+      sent: "Feedback sent to {{recipient}}",
+      "no-agents": "Open an agent tab in this workspace to send feedback.",
+      disconnected: "Connect to the host to send feedback.",
+      "no-context": "Saved comments no longer match this diff.",
+      failed: "Failed to send feedback. Try again.",
+      prompt: "Please address this code review.",
+    },
     comment: {
       add: "Add review comment",
       edit: "Edit review comment",
@@ -1919,9 +2078,12 @@ export const en = {
     groupInfo: "About {{title}}",
     sections: {
       general: "General",
+      chat: "Chat",
       appearance: "Appearance",
-      layout: "Layout",
+      sidebar: "Sidebar",
       editor: "Editor",
+      terminal: "Terminal",
+      browser: "Browser",
       shortcuts: "Shortcuts",
       integrations: "Integrations",
       notifications: "Notifications",
@@ -1939,29 +2101,32 @@ export const en = {
         },
         sources: {
           explorerFiles: {
-            label: "Selecting a file in Explorer",
+            label: "Clicking a file in the Explorer sidebar",
             description: "Open files selected in the Explorer sidebar beside your work",
           },
           diffs: {
-            label: "Opening a diff",
+            label: "Clicking a change in the Explorer sidebar or a chat",
             description: "Open diffs from Explorer and agent conversations beside your work",
           },
           chatFiles: {
-            label: "Opening a file from an agent chat",
+            label: "Clicking a file in an agent chat",
             description: "Open file links and tool-call files beside the conversation",
           },
           diffFiles: {
-            label: "Opening a file from Changes",
+            label: "Clicking a file in a diff",
             description: "Open source files selected from a diff beside it",
           },
           subagents: {
-            label: "Opening a subagent",
+            label: "Clicking a subagent in an agent chat",
             description: "Open subagents beside their parent agent",
           },
           pullRequests: {
-            label: "Opening a pull request from Changes",
+            label: "Clicking a pull request in the Explorer sidebar",
             description: "Open pull request details beside Changes",
           },
+          serviceUrls: {
+            label: "Clicking a script's service URL",
+          },
         },
       },
     },
@@ -1999,17 +2164,22 @@ export const en = {
     },
     plugins: {
       title: "Plugins",
+      screens: {
+        open: "Open",
+        offline: "Connect to this host to open plugin settings.",
+        update: "Update this host to use plugin settings.",
+        unavailable: "This plugin settings screen is unavailable.",
+        backToPlugins: "Back to plugins",
+      },
       trustedTitle: "Plugins are trusted code",
       trustedDescription:
         "They run on this host and inside the app without sandboxing. Install only code you trust.",
       globalTitle: "Enable plugins",
       globalHint: "Global switch for every configured plugin",
-      directoryLabel: "Plugin directory",
-      directoryPlaceholder: "/absolute/path/on/host",
-      idLabel: "Plugin installation ID",
-      idHint: "Leave blank to use paseo-plugin.json",
-      idPlaceholder: "Manifest default",
-      install: "Install directory",
+      sourceLabel: "Plugin source",
+      sourcePlaceholder: "owner/slug, directory, Git URL, or npm package",
+      docs: "Docs",
+      install: "Install plugin",
       installing: "Installing…",
       logs: {
         action: "Logs",
@@ -2022,6 +2192,7 @@ export const en = {
       },
       status: { running: "running", disabled: "disabled", failed: "failed" },
       actions: {
+        menu: "Actions for {{id}}",
         reload: "Reload",
         reloading: "Reloading…",
         enable: "Enable",
@@ -2047,6 +2218,7 @@ export const en = {
         offlineTitle: "Plugin host is offline",
         offlineDescription: "Reconnect to this host to manage its plugins.",
         updateTitle: "Update this host to manage plugins",
+        sourceUpdateTitle: "Update this host to install plugins",
         loading: "Loading plugins…",
         errorTitle: "Unable to load plugins",
         retry: "Retry",
@@ -2069,6 +2241,7 @@ export const en = {
     },
     general: {
       title: "General",
+      sending: "Sending",
       browserData: {
         title: "Browser data",
         siteData: "Cookies and site data",
@@ -2095,8 +2268,6 @@ export const en = {
         },
       },
       serviceUrls: {
-        label: "Service URLs",
-        description: "Where to open URLs from running scripts",
         options: {
           ask: "Ask",
           inApp: "In Paseo",
@@ -2115,7 +2286,6 @@ export const en = {
       toolCallDetail: {
         label: "Tool call display",
         description: "How tool calls appear in the timeline",
-        accessibilityLabel: "Select tool call display ({{value}})",
         options: {
           overview: "Summary",
           detailed: "Full detail",
@@ -2169,6 +2339,7 @@ export const en = {
     about: {
       title: "About",
       appVersion: "App version",
+      whatsNewHint: "Release notes for every version",
       thisDevice: "This device",
       connectedHosts: "Connected hosts",
       offline: "Offline",
@@ -2217,8 +2388,15 @@ export const en = {
         description: "Show an outline for jumping between prompts",
       },
       sidebar: {
-        title: "Sidebar",
-        description: "Choose which items appear at the top of the sidebar and in what order",
+        header: {
+          title: "Header",
+          description: "Choose which items appear at the top of the sidebar and in what order",
+        },
+        footer: {
+          title: "Footer",
+          description:
+            "Choose which rows appear at the bottom of the sidebar and in what order. Add project and the icon row always show",
+        },
         moveUp: "Move up",
         moveDown: "Move down",
       },
@@ -2242,6 +2420,14 @@ export const en = {
         codeSizeHint: "Used for code, diffs, and terminal output",
         codeSizeAccessibility: "Code font size",
       },
+      layout: {
+        title: "Layout",
+        contentWidth: "Content width",
+        contentWidthHint: "Max width of chat and Markdown files on wide screens",
+        contentWidthAccessibility: "Content width in pixels",
+        reset: "Reset",
+        resetAccessibility: "Reset content width to default",
+      },
       syntax: {
         title: "Syntax",
         highlightTheme: "Highlight theme",
@@ -2351,6 +2537,9 @@ export const en = {
       },
     },
     host: {
+      password: {
+        guidance: "Remove this host and add it again with the password this daemon asks for.",
+      },
       appearance: {
         title: "Appearance",
         name: {
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 1b7ee5118a..bc53c8b2aa 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -2,16 +2,43 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const es: TranslationResources = {
+  paneFind: {
+    connectionFailure:
+      "No se pudo buscar en este chat. Comprueba la conexión con el host y vuelve a intentarlo.",
+    historyChangedFailure: "El chat cambió durante la búsqueda. Vuelve a buscar.",
+    revealFailure: "No se pudo mostrar esta coincidencia. Vuelve a intentarlo.",
+    searching: "Buscando…",
+    loading: "Cargando…",
+    failed: "Error",
+    retry: "Reintentar",
+
+    title: "Buscar",
+    placeholder: "Buscar en el panel",
+    close: "Cerrar búsqueda",
+    matches: "Coincidencias",
+    previous: "Coincidencia anterior",
+    next: "Siguiente coincidencia",
+    toggleReplace: "Mostrar reemplazo",
+    replaceWith: "Reemplazar con",
+    replace: "Reemplazar",
+    replaceAll: "Reemplazar todo",
+    noMatches: "Sin coincidencias",
+    position: "{{current}} de {{total}}",
+    total: "{{total}} coincidencias",
+  },
   common: {
+    bottomSheetBackdrop: "Fondo del panel inferior",
     back: "Atrás",
     loading: "Cargando...",
     actions: {
+      save: "Guardar",
       back: "Atrás",
       cancel: "Cancelar",
       close: "Cerrar",
       copy: "Copiar",
       copyLine: "Copiar línea",
       dismiss: "Despedir",
+      reload: "Volver a cargar",
       retry: "Rever",
       search: "Buscar",
       select: "Seleccionar",
@@ -98,6 +125,8 @@ export const es: TranslationResources = {
     input: {
       accessibilityLabel: "Agente de mensajes...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Pantalla completa",
+      exitFullscreen: "Salir de pantalla completa",
       focusHint: "{{shortcut}}para enfocar",
       addAttachment: "Agregar archivo adjunto",
       interruptAgent: "agente de interrupción",
@@ -153,7 +182,8 @@ export const es: TranslationResources = {
       initialPromptRequired: "Se requiere aviso inicial",
       alreadyLoading: "Ya cargando",
       uploadFailed: "Failed to upload file",
-      noClipboardImage: "No hay ninguna imagen en el portapapeles",
+      noClipboardImage:
+        "No hay ninguna imagen en el portapapeles actual. Prueba a pegar desde el teclado.",
       pasteImageFailed: "No se pudo pegar la imagen",
       fileTooLarge: "{{fileName}} is too large (max {{size}})",
     },
@@ -208,6 +238,10 @@ export const es: TranslationResources = {
     historyLoadFailed: "No se pudo cargar el historial del agente",
     messageCapped: "Este mensaje fue truncado ({{bytes}} bytes).",
     permission: {
+      rejectedPlan: "Plan rechazado",
+      approvedPlan: "Plan aprobado",
+      canceledPlan: "Plan cancelado",
+
       plan: "Plan",
       required: "Permiso requerido",
       deny: "Denegar",
@@ -221,7 +255,8 @@ export const es: TranslationResources = {
     states: {
       notFound: "Agentno encontrado",
       failedToLoad: "No se pudo cargar el agente",
-      reconnecting: "Reconectando",
+      reconnecting: "Reconectando al host",
+      updating: "Actualizando mensajes",
       timelineSyncFailed: "No se pudo actualizar el historial del agente.",
       timelineSyncRetrying: "Reintentando…",
       archivingTitle: "Agente de archivo...",
@@ -355,6 +390,9 @@ export const es: TranslationResources = {
         completed: "Completada",
       },
     },
+    turnFooter: {
+      workedFor: "Trabajó durante {{duration}}",
+    },
     compaction: {
       loading: "Compactando...",
       auto: "Contexto compactado automáticamente",
@@ -413,7 +451,9 @@ export const es: TranslationResources = {
       recovery: {
         archivedTitle: "Espacio de trabajo archivado",
         restoreDescription:
-          "{{workspaceName}} se archivó y se eliminó su worktree. Restaura la rama {{branch}} para volver a abrirlo.",
+          "Restaura {{workspaceName}} para volver a sus agentes. Su worktree usará la rama {{branch}}.",
+        restoreWithoutBranchDescription:
+          "Restaura {{workspaceName}} para volver a sus agentes. Se creará una rama nueva desde la base guardada o la rama predeterminada del repositorio.",
         unarchiveDescription:
           "{{workspaceName}} está archivado. Desarchívalo para volver a abrirlo.",
         restoreAction: "Restaurar",
@@ -910,6 +950,9 @@ export const es: TranslationResources = {
         openChangesTab: "Abrir la pestaña Cambios",
         openDiffTab: "Abrir la pestaña Diferencia",
         closeChangesTab: "Cerrar la pestaña Cambios",
+        jumpToFile: {
+          title: "Ir al archivo",
+        },
         binaryFile: "archivo binario",
         tooLarge: "La diferencia es demasiado grande para mostrarse",
         previewTooLargeTitle: "Este diff es demasiado grande para previsualizarlo",
@@ -932,11 +975,8 @@ export const es: TranslationResources = {
         refresh: "Refrescar",
         refreshState: "Actualizar el estado de git y {{brand}}",
         failedRefresh: "No se pudo actualizar el estado de git.",
-        emptyHiddenWhitespace: "No hay cambios visibles después de ocultar espacios en blanco",
-        emptyUncommitted: "Sin cambios no confirmados",
         seeUncommittedChanges: "Ver cambios no confirmados",
         seeCommittedChanges: "Ver cambios confirmados",
-        emptyAgainstBase: "Sin cambios frente a{{baseRef}}",
         checkingRepository: "Comprobando repositorio...",
         notRepository: "No es un repositorio de git",
         diffMode: "modo diferencial",
@@ -969,6 +1009,47 @@ export const es: TranslationResources = {
         actions: {
           viewPullRequest: "Ver",
           openOn: "Abrir en {{brand}}",
+          addToChat: "Añadir al chat",
+          addAllToChat: "Añadir todo al chat",
+          addingToChat: "Añadiendo...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "Algunas comprobaciones requieren tu atención",
+            failure: "Algunas comprobaciones no se superaron",
+            pending: "Algunas comprobaciones aún no han terminado",
+            success: "Todas las comprobaciones se superaron",
+            none: "Sin comprobaciones",
+          },
+          count: {
+            actionRequired: "{{count}} con acción pendiente",
+            warning: "{{count}} con advertencia",
+            failure: "{{count}} con error",
+            pending: "{{count}} en curso",
+            manual: "{{count}} manual(es)",
+            success: "{{count}} superada(s)",
+            ignored: "{{count}} omitida(s)",
+          },
+          detailOne: "Comprobación: {{parts}}",
+          detailMany: "Comprobaciones: {{parts}}",
+          groupOne: {
+            actionRequired: "{{count}} comprobación con acción pendiente",
+            warning: "{{count}} comprobación con advertencia",
+            failure: "{{count}} comprobación con error",
+            pending: "{{count}} comprobación en curso",
+            manual: "{{count}} comprobación manual",
+            success: "{{count}} comprobación superada",
+            ignored: "{{count}} comprobación omitida",
+          },
+          groupMany: {
+            actionRequired: "{{count}} comprobaciones con acción pendiente",
+            warning: "{{count}} comprobaciones con advertencia",
+            failure: "{{count}} comprobaciones con error",
+            pending: "{{count}} comprobaciones en curso",
+            manual: "{{count}} comprobaciones manuales",
+            success: "{{count}} comprobaciones superadas",
+            ignored: "{{count}} comprobaciones omitidas",
+          },
         },
         checksSummary: {
           passedLabel: "pasó",
@@ -982,17 +1063,21 @@ export const es: TranslationResources = {
           checks: "cheques",
           pipeline: "Pipeline",
           reviews: "Reseñas",
+          activity: "Actividad",
         },
         empty: {
           noJobs: "Sin trabajos",
           loadingPipeline: "Cargando pipeline...",
           pipelineJobsLoadFailed: "No se pudieron cargar los trabajos del pipeline",
           allowedToFail: "permitido fallar",
+          noActivity: "Aún no hay actividad",
         },
         approvals: "{{given}} de {{required}} aprobaciones",
         accessibility: {
           pullRequest: "Solicitud de extracción n.°{{number}}",
           pullRequest_mr: "Solicitud de fusión !{{number}}",
+          commentActions: "Acciones del comentario",
+          threadActions: "Acciones del hilo",
           checkStatus: {
             passed: "Superado",
             failed: "Fallido",
@@ -1011,16 +1096,18 @@ export const es: TranslationResources = {
           open: "Abierto",
         },
         activity: {
-          commented: "Comentado",
-          approved: "Aprobado",
-          requestedChanges: "Cambios solicitados",
-          reviewed: "Revisado",
+          commented: "Comentó",
+          approved: "Aprobó",
+          requestedChanges: "Solicitó cambios",
+          reviewed: "Revisó",
         },
         time: {
           justNow: "En este momento",
         },
         thread: {
           discussion: "Hilo de discusión",
+          resolved: "Resuelto",
+          outdated: "Desactualizado",
         },
         errors: {
           statusLoadFailed: "No se puede cargar el estado de la solicitud de extracción",
@@ -1079,8 +1166,27 @@ export const es: TranslationResources = {
       updateHost: "Actualiza este host para gestionar etiquetas.",
     },
   },
+  changelog: {
+    title: "Novedades",
+    installed: "Instalada",
+    showMore: "Mostrar más",
+    openWebsite: "Registro de cambios completo",
+    error: {
+      title: "No se pudo cargar el registro de cambios",
+      description: "Comprueba tu conexión e inténtalo de nuevo.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "Grupo {{label}}",
+    statusBucket: {
+      needsInput: "Necesita datos",
+      failed: "Con error",
+      readyToReview: "Para revisar",
+      working: "En ejecución",
+      done: "Terminado",
+    },
     display: {
+      showBackground: "Mostrar espacios en segundo plano",
       trigger: "Preferencias de visualización",
       heading: "Visualización",
       grouping: {
@@ -1140,6 +1246,9 @@ export const es: TranslationResources = {
       settings: "Ajustes",
       closeSidebar: "Cerrar barra lateral",
     },
+    footer: {
+      usage: "Uso",
+    },
     help: {
       trigger: "Ayuda y soporte",
       sectionHelp: "Ayuda",
@@ -1300,6 +1409,7 @@ export const es: TranslationResources = {
       detail: "Deteniendo el demonio local.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Daemon",
       status: {
         title: "Estado",
@@ -1526,6 +1636,8 @@ export const es: TranslationResources = {
     noFiles: "No se encontraron archivos ni directorios",
     noCommands: "No se encontraron comandos",
     failedToLoad: "No se pudo cargar",
+    chooseProjectForCommands: "Elige un proyecto para ver los comandos",
+    chooseModelForCommands: "Selecciona un modelo para ver los comandos",
   },
   loadOlderHistory: {
     failed: "No se pudo cargar el historial anterior",
@@ -1617,6 +1729,21 @@ export const es: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "Contraseña de {{host}}",
+      label: "Contraseña del host",
+    },
+    hostConfirmation: {
+      title: "¿Conectar con este host?",
+      description:
+        "Este host podrá ejecutar código en esta app y acceder a tus otros hosts conectados. Conéctate solo si lo reconoces.",
+      descriptionChanged:
+        "Este enlace cambia cómo te conectas a este host. El host podrá ejecutar código en esta app y acceder a tus otros hosts conectados. Conéctate solo si lo reconoces.",
+      hostLabel: "Host",
+      fingerprintLabel: "Huella de la clave",
+      relayLabel: "Relay",
+      connect: "Conectar",
+    },
     connectionMethods: {
       title: "Agregar conexión",
       direct: {
@@ -1684,6 +1811,12 @@ export const es: TranslationResources = {
       helper: "Conéctate a un daemon de Paseo en el host remoto.",
       fields: {
         target: "Host SSH",
+        password: "Contraseña del daemon",
+        optional: "Opcional",
+      },
+      passwordVisibility: {
+        show: "Mostrar contraseña",
+        hide: "Ocultar contraseña",
       },
       actions: {
         cancel: "Cancelar",
@@ -1914,6 +2047,8 @@ export const es: TranslationResources = {
     dismiss: "Despedir",
   },
   contextWindow: {
+    noData: "No hay datos de contexto",
+    accessibilityNoData: "Ventana de contexto: No hay datos de contexto",
     title: "ventana contextual",
     used: "{{percentage}}% utilizado",
     tokens: "Fichas{{used}}/{{max}}",
@@ -1921,6 +2056,17 @@ export const es: TranslationResources = {
     accessibility: "Ventana de contexto{{percentage}}% utilizada",
   },
   review: {
+    feedback: {
+      send: "Enviar comentarios ({{count}})",
+      sending: "Enviando comentarios ({{count}})",
+      chooseAgent: "Elegir un agente",
+      sent: "Comentarios enviados a {{recipient}}",
+      "no-agents": "Abre una pestaña de agente en este espacio de trabajo para enviar comentarios.",
+      disconnected: "Conéctate al host para enviar comentarios.",
+      "no-context": "Los comentarios guardados ya no coinciden con este diff.",
+      failed: "No se pudieron enviar los comentarios. Inténtalo de nuevo.",
+      prompt: "Por favor, atiende esta revisión de código.",
+    },
     comment: {
       add: "Agregar comentario de revisión",
       edit: "Editar comentario de revisión",
@@ -1955,8 +2101,11 @@ export const es: TranslationResources = {
     groupInfo: "Acerca de{{title}}",
     sections: {
       general: "General",
+      chat: "Chat",
       appearance: "Apariencia",
-      layout: en.settings.sections.layout,
+      sidebar: "Barra lateral",
+      terminal: "Terminal",
+      browser: "Navegador",
       editor: "Editor",
       shortcuts: "Atajos",
       integrations: "Integraciones",
@@ -2015,6 +2164,7 @@ export const es: TranslationResources = {
     },
     general: {
       title: "General",
+      sending: "Envío",
       browserData: {
         title: "Datos del navegador",
         siteData: "Cookies y datos de sitios",
@@ -2045,8 +2195,6 @@ export const es: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "URL de servicio",
-        description: "Dónde abrir URL desde scripts en ejecución",
         options: {
           ask: "Preguntar",
           inApp: "EnPaseo",
@@ -2066,7 +2214,6 @@ export const es: TranslationResources = {
       toolCallDetail: {
         label: "Visualización de llamadas a herramientas",
         description: "Cómo aparecen las llamadas a herramientas en la cronología",
-        accessibilityLabel: "Seleccionar visualización de llamadas a herramientas ({{value}})",
         options: {
           overview: "Resumen",
           detailed: "Detalle completo",
@@ -2120,6 +2267,7 @@ export const es: TranslationResources = {
     about: {
       title: "Acerca de",
       appVersion: "Versión de la aplicación",
+      whatsNewHint: "Notas de versión de cada release",
       thisDevice: "este dispositivo",
       connectedHosts: "Anfitriones conectados",
       offline: "Desconectado",
@@ -2168,9 +2316,16 @@ export const es: TranslationResources = {
         description: "Muestra un esquema para saltar entre instrucciones",
       },
       sidebar: {
-        title: "Barra lateral",
-        description:
-          "Elige qué elementos aparecen en la parte superior de la barra lateral y en qué orden",
+        header: {
+          title: "Encabezado",
+          description:
+            "Elige qué elementos aparecen en la parte superior de la barra lateral y en qué orden",
+        },
+        footer: {
+          title: "Pie",
+          description:
+            "Elige qué filas aparecen en la parte inferior de la barra lateral y en qué orden. Añadir proyecto y la fila de iconos siempre se muestran",
+        },
         moveUp: "Mover hacia arriba",
         moveDown: "Mover hacia abajo",
       },
@@ -2195,6 +2350,14 @@ export const es: TranslationResources = {
         codeSizeHint: "Se usa en código, diferencias y la salida del terminal",
         codeSizeAccessibility: "Tamaño de fuente del código",
       },
+      layout: {
+        title: "Diseño",
+        contentWidth: "Ancho del contenido",
+        contentWidthHint: "Ancho máximo del chat y de los archivos Markdown en pantallas anchas",
+        contentWidthAccessibility: "Ancho del contenido en píxeles",
+        reset: "Restablecer",
+        resetAccessibility: "Restablecer el ancho del contenido",
+      },
       syntax: {
         title: "Sintaxis",
         highlightTheme: "Tema destacado",
@@ -2305,6 +2468,9 @@ export const es: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance: "Elimina este host y vuelve a añadirlo con la contraseña que pide este daemon.",
+      },
       appearance: {
         title: "Apariencia",
         name: {
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 5807c7e86f..78a9b2e82b 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -2,51 +2,77 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const fr: TranslationResources = {
+  paneFind: {
+    connectionFailure:
+      "Impossible de rechercher dans cette conversation. Vérifiez la connexion à l’hôte et réessayez.",
+    historyChangedFailure: "La conversation a changé pendant la recherche. Relancez la recherche.",
+    revealFailure: "Impossible d’afficher ce résultat. Réessayez.",
+    searching: "Recherche…",
+    loading: "Chargement…",
+    failed: "Échec",
+    retry: "Réessayer",
+
+    title: "Rechercher",
+    placeholder: "Rechercher dans le panneau",
+    close: "Fermer la recherche",
+    matches: "Résultats de recherche",
+    previous: "Résultat précédent",
+    next: "Résultat suivant",
+    toggleReplace: "Afficher/masquer le remplacement",
+    replaceWith: "Remplacer par",
+    replace: "Remplacer",
+    replaceAll: "Tout remplacer",
+    noMatches: "Aucun résultat",
+    position: "{{current}} sur {{total}}",
+    total: "{{total}} résultats",
+  },
   common: {
-    back: "Dos",
-    loading: "Chargement...",
+    bottomSheetBackdrop: "Arrière-plan du panneau inférieur",
+    back: "Retour",
+    loading: "Chargement…",
     actions: {
-      back: "Dos",
+      save: "Enregistrer",
+      back: "Retour",
       cancel: "Annuler",
       close: "Fermer",
-      copy: "Copie",
+      copy: "Copier",
       copyLine: "Copier la ligne",
-      dismiss: "Rejeter",
+      dismiss: "Ignorer",
+      reload: "Recharger",
       retry: "Réessayer",
-      search: "Recherche",
+      search: "Rechercher",
       select: "Sélectionner",
       selectAll: "Tout sélectionner",
     },
     placeholders: {
-      search: "Recherche...",
+      search: "Rechercher…",
     },
     empty: {
-      noResults: "Aucun résultat trouvé",
+      noResults: "Aucun résultat",
       noOptionsMatchSearch: "Aucune option ne correspond à votre recherche.",
     },
     states: {
-      loading: "Chargement...",
-      starting: "Départ...",
+      loading: "Chargement…",
+      starting: "Démarrage…",
       copied: "Copié",
-      copiedLabel: "{{label}}copié",
+      copiedLabel: "Copié : {{label}}",
       downloadComplete: "Téléchargement terminé",
-      downloadFailed: "Le téléchargement a échoué",
+      downloadFailed: "Échec du téléchargement",
     },
     errors: {
       error: "Erreur",
-      unableToSave: "Impossible d'enregistrer",
+      unableToSave: "Impossible d’enregistrer",
       unableToCopy: "Impossible de copier",
       nameRequired: "Le nom est requis",
-      daemonUnavailable: "Daemonindisponible",
-      daemonClientUnavailable: "ClientDaemonindisponible",
-      daemonClientDisconnected: "Le clientDaemonest déconnecté",
-      noFileFound: "Aucun fichier trouvé pour{{token}}",
-      unexpectedDictationError:
-        "Une erreur inattendue s'est produite lors du traitement de la dictée.",
+      daemonUnavailable: "Daemon indisponible",
+      daemonClientUnavailable: "Client du daemon indisponible",
+      daemonClientDisconnected: "Le client du daemon est déconnecté",
+      noFileFound: "Aucun fichier trouvé pour {{token}}",
+      unexpectedDictationError: "Une erreur inattendue s’est produite pendant la dictée.",
     },
     connectionStatus: {
       online: "En ligne",
-      connecting: "De liaison",
+      connecting: "Connexion…",
       offline: "Hors ligne",
       error: "Erreur",
       idle: "Inactif",
@@ -54,193 +80,201 @@ export const fr: TranslationResources = {
   },
   shell: {
     menu: {
-      toggleSidebar: "Basculer la barre latérale",
+      toggleSidebar: "Afficher/masquer la barre latérale",
       open: "Ouvrir le menu",
       close: "Fermer le menu",
     },
     commandCenter: {
-      placeholder: "Rechercher des commandes, fichiers, espaces de travail et agents...",
-      filePlaceholder: "Rechercher des fichiers...",
-      searchingFiles: "Recherche de fichiers...",
-      noMatches: "Aucune correspondance",
-      actions: "Actes",
+      placeholder: "Rechercher des commandes, fichiers, espaces de travail et agents…",
+      filePlaceholder: "Rechercher des fichiers…",
+      searchingFiles: "Recherche de fichiers…",
+      noMatches: "Aucun résultat",
+      actions: "Actions",
       files: "Fichiers",
       workspaces: "Espaces de travail",
       agents: "Agents",
       newAgent: "Nouvel agent",
       open: "Ouvrir {{name}}",
       openInSidePane: "Ouvrir {{name}} dans le panneau latéral",
-      openInFocusedPane: "Ouvrir {{name}} dans le volet actif",
+      openInFocusedPane: "Ouvrir {{name}} dans le panneau actif",
       addProject: "Ajouter un projet",
-      home: "Maison",
+      home: "Accueil",
       groupByProject: "Grouper par projet",
       groupByStatus: "Grouper par statut",
       modelGroupLabel: "Modèle",
       modelSearchKeywords:
-        "changer de modèle modifier le modèle définir le modèle sélectionner le modèle",
-      thinkingGroupLabel: "Raisonnement",
-      thinkingSearchKeywords: "raisonnement effort réflexion",
+        "changer de modèle modifier le modèle définir le modèle sélectionner le modèle model",
+      thinkingGroupLabel: "Réflexion",
+      thinkingSearchKeywords: "réflexion raisonnement effort thinking",
       modeGroupLabel: "Mode",
-      modeSearchKeywords: "accès permission approbation mode",
+      modeSearchKeywords: "accès autorisation approbation mode permission",
       planModeGroupLabel: "Mode plan",
       planModeSearchKeywords: "plan planification mode plan",
       fastModeGroupLabel: "Rapide",
-      fastModeSearchKeywords: "rapide vitesse faible latence",
+      fastModeSearchKeywords: "rapide vitesse faible latence fast",
       settingOn: "Activé",
       settingOff: "Désactivé",
     },
   },
   composer: {
     placeholders: {
-      desktop: "Envoyez un message à l'agent, marquez@filesou utilisez/commandset/skills",
-      mobile: "Message,@files,/commands",
-      fallback: "Message...",
+      desktop: "Écrivez à l’agent, mentionnez des @fichiers ou utilisez les /commandes et /skills",
+      mobile: "Message, @fichiers, /commandes",
+      fallback: "Message…",
       terminal: "Prompt",
     },
     input: {
-      accessibilityLabel: "Agent de messagerie...",
-      terminalAccessibilityLabel: "Terminal prompt",
-      focusHint: "{{shortcut}}pour se concentrer",
+      accessibilityLabel: "Écrire à l’agent…",
+      terminalAccessibilityLabel: "Prompt du terminal",
+      fullscreen: "Plein écran",
+      exitFullscreen: "Quitter le plein écran",
+      focusHint: "{{shortcut}} pour saisir",
       addAttachment: "Ajouter une pièce jointe",
-      interruptAgent: "Agent d'interruption",
-      queueMessage: "Message de file d'attente",
+      interruptAgent: "Interrompre l’agent",
+      queueMessage: "Mettre le message en file d’attente",
       sendAndInterrupt: "Envoyer et interrompre",
-      sendAndSteer: "Envoyer et guider",
-      sendMessage: "Envoyer un message",
-      queue: "File d'attente",
+      sendAndSteer: "Envoyer et réorienter",
+      sendMessage: "Envoyer le message",
+      queue: "Mettre en file d’attente",
       send: "Envoyer",
     },
     cancel: {
-      cancelingAgent: "Agent d'annulation",
-      stopAgent: "Agent d'arrêt",
+      cancelingAgent: "Annulation de l’agent…",
+      stopAgent: "Arrêter l’agent",
       interrupt: "Interrompre",
     },
     voice: {
       enableVoiceMode: "Activer le mode vocal",
       voiceMode: "Mode vocal",
-      unmuteVoiceMode: "Activer le mode vocal",
-      muteVoiceMode: "Mode voix muette",
+      unmuteVoiceMode: "Réactiver le micro du mode vocal",
+      muteVoiceMode: "Couper le micro du mode vocal",
       stopDictation: "Arrêter la dictée",
       startDictation: "Démarrer la dictée",
-      unmuteVoice: "Réactiver la voix",
-      muteVoice: "Voix muette",
+      unmuteVoice: "Réactiver le micro",
+      muteVoice: "Couper le micro",
       dictation: "Dictée",
-      interruptBeforeVoice: "Interrompre l'agent avant de démarrer le mode vocal",
+      interruptBeforeVoice: "Interrompez l’agent avant de démarrer le mode vocal",
     },
     attachments: {
       addImage: "Ajouter une image",
       pasteImage: "Coller une image",
-      addFile: "Upload file",
-      addIssueOrPr: "Ajouter un problème ouPR",
-      addIssueOrPr_mr: "Ajouter un problème ou MR",
+      addFile: "Importer un fichier",
+      addIssueOrPr: "Ajouter un ticket ou une PR",
+      addIssueOrPr_mr: "Ajouter un ticket ou une MR",
       dropImagesHere: "Déposez des images ici",
-      dropFilesHere: "Drop files here",
-      editQueuedMessage: "Modifier le message en file d'attente",
-      sendQueuedMessageNow: "Envoyer le message en file d'attente maintenant",
-      openImage: "Ouvrir la pièce jointe de l'image",
-      removeImage: "Supprimer l'image jointe",
-      removeFile: "Remove file attachment",
+      dropFilesHere: "Déposez des fichiers ici",
+      editQueuedMessage: "Modifier le message en file d’attente",
+      sendQueuedMessageNow: "Envoyer maintenant le message en file d’attente",
+      openImage: "Ouvrir l’image jointe",
+      removeImage: "Retirer l’image jointe",
+      removeFile: "Retirer le fichier joint",
       openGithub: "Ouvrir {{kind}} {{number}}",
-      removeGithub: "Supprimer {{kind}} {{number}}",
+      removeGithub: "Retirer {{kind}} {{number}}",
       element: "Élément",
-      openBrowserElement: "Ouvrir la pièce jointe de l'élément de navigateur",
-      removeBrowserElement: "Supprimer la pièce jointe d'un élément de navigateur",
-      openReview: "Ouvrir la pièce jointe de l'avis",
-      removeReview: "Supprimer la pièce jointe de l'avis",
+      openBrowserElement: "Ouvrir l’élément de navigateur joint",
+      removeBrowserElement: "Retirer l’élément de navigateur joint",
+      openReview: "Ouvrir la revue jointe",
+      removeReview: "Retirer la revue jointe",
     },
     errors: {
-      failedToSend: "Échec de l'envoi du message",
-      failedToCreateAgent: "Échec de la création de l'agent",
+      failedToSend: "Impossible d’envoyer le message",
+      failedToCreateAgent: "Impossible de créer l’agent",
       noHostSelected: "Aucun hôte sélectionné",
-      initialPromptRequired: "Une invite initiale est requise",
-      alreadyLoading: "Déjà en cours de chargement",
-      uploadFailed: "Failed to upload file",
-      noClipboardImage: "Aucune image dans le presse-papiers",
+      initialPromptRequired: "Un prompt initial est requis",
+      alreadyLoading: "Chargement déjà en cours",
+      uploadFailed: "Impossible d’importer le fichier",
+      noClipboardImage:
+        "Aucune image dans le presse-papiers. Essayez de coller depuis votre clavier.",
       pasteImageFailed: "Impossible de coller l’image",
-      fileTooLarge: "{{fileName}} is too large (max {{size}})",
+      fileTooLarge: "{{fileName}} est trop volumineux (maximum {{size}})",
     },
     clientCommands: {
-      archiveAgent: "Archiver l'agent actuel",
-      freshDraft: "Archivez cet agent et démarrez un nouveau brouillon",
+      archiveAgent: "Archiver l’agent actuel",
+      freshDraft: "Archiver cet agent et démarrer un nouveau brouillon",
     },
     github: {
-      searching: "Recherche...",
-      noResults: "Aucun résultat trouvé.",
-      searchPlaceholder: "Problèmes de recherche et PR...",
-      searchPlaceholder_mr: "Problèmes de recherche et MR...",
-      title: "Joindre le problème ouPR",
-      title_mr: "Joindre le problème ou MR",
+      searching: "Recherche…",
+      noResults: "Aucun résultat.",
+      searchPlaceholder: "Rechercher des tickets et des PR…",
+      searchPlaceholder_mr: "Rechercher des tickets et des MR…",
+      title: "Joindre un ticket ou une PR",
+      title_mr: "Joindre un ticket ou une MR",
     },
   },
   agentControls: {
     provider: {
       fallback: "Fournisseur",
-      select: "Sélectionnez le fournisseur d'agent",
+      select: "Choisir le fournisseur d’agent",
     },
     thinking: {
-      title: "Pensée",
+      title: "Réflexion",
       unknown: "Inconnu",
-      extraHigh: "Très haut",
-      select: "Sélectionnez l'option de réflexion",
-      selectWithValue: "Sélectionnez l'option de réflexion ({{value}})",
+      extraHigh: "Très élevé",
+      select: "Choisir le niveau de réflexion",
+      selectWithValue: "Choisir le niveau de réflexion ({{value}})",
     },
     model: {
       unknown: "Modèle inconnu",
     },
     features: {
-      title: "Caractéristiques",
-      open: "Fonctionnalités de l'agent ouvert",
-      on: "Sur",
+      title: "Fonctionnalités",
+      open: "Ouvrir les fonctionnalités de l’agent",
+      on: "Activé",
       off: "Désactivé",
     },
     mode: {
       title: "Mode",
-      searchPlaceholder: "Modes de recherche...",
-      selectWithValue: "Sélectionnez le mode agent ({{value}})",
+      searchPlaceholder: "Rechercher un mode…",
+      selectWithValue: "Choisir le mode de l’agent ({{value}})",
     },
     hints: {
-      thinking: "Mode réflexion",
+      thinking: "Mode de réflexion",
       model: "Changer de modèle",
       mode: "Changer de mode",
     },
   },
   agentStream: {
-    empty: "Commencez à discuter avec cet agent...",
+    empty: "Commencez à discuter avec cet agent…",
     scrollToBottom: "Faire défiler vers le bas",
     historyLoadFailed: "Impossible de charger l’historique de l’agent",
     messageCapped: "Ce message a été tronqué ({{bytes}} octets).",
     permission: {
+      rejectedPlan: "Plan refusé",
+      approvedPlan: "Plan approuvé",
+      canceledPlan: "Plan annulé",
+
       plan: "Plan",
       required: "Autorisation requise",
       deny: "Refuser",
       accept: "Accepter",
-      implement: "Mettre en œuvre",
-      question: "Comment souhaitez-vous procéder?",
+      implement: "Implémenter",
+      question: "Comment souhaitez-vous procéder ?",
       proposedPlan: "Plan proposé",
     },
   },
   agentPanel: {
     states: {
-      notFound: "Agentintrouvable",
-      failedToLoad: "Échec du chargement de l'agent",
-      reconnecting: "Reconnexion",
+      notFound: "Agent introuvable",
+      failedToLoad: "Impossible de charger l’agent",
+      reconnecting: "Reconnexion à l’hôte…",
+      updating: "Mise à jour des messages…",
       timelineSyncFailed: "Impossible d’actualiser l’historique de l’agent.",
       timelineSyncRetrying: "Nouvelle tentative…",
-      archivingTitle: "Agent d'archivage...",
-      archivingSubtitle: "Veuillez patienter pendant que nous archivons cet agent.",
+      archivingTitle: "Archivage de l’agent…",
+      archivingSubtitle: "Veuillez patienter pendant l’archivage de cet agent.",
     },
     unavailable: {
       selectedHost: "Hôte sélectionné",
       unknownHost:
-        "Impossible d'ouvrir cet agent car{{serverLabel}}n'est pas configuré sur ce périphérique.",
+        "Impossible d’ouvrir cet agent, car {{serverLabel}} n’est pas configuré sur cet appareil.",
       addHost:
-        "Ajoutez l'hôte dans Paramètres ou ouvrez un agent sur un serveur configuré pour continuer.",
-      preparingSession: "Préparation de la séance{{serverLabel}}...",
-      connecting: "Connexion à{{serverLabel}}...",
-      showSoon: "Nous montrerons cet agent dans un instant.",
-      showWhenOnline: "Nous afficherons cet agent une fois que l'hôte sera en ligne.",
-      reconnectingTo: "Reconnexion à{{serverLabel}}...",
-      showAgainWhenReachable: "Nous afficherons à nouveau cet agent dès que l'hôte sera joignable.",
+        "Pour continuer, ajoutez l’hôte dans Paramètres ou ouvrez un agent sur un serveur configuré.",
+      preparingSession: "Préparation de la session {{serverLabel}}…",
+      connecting: "Connexion à {{serverLabel}}…",
+      showSoon: "Cet agent va s’afficher dans un instant.",
+      showWhenOnline: "Cet agent s’affichera dès que l’hôte sera en ligne.",
+      reconnectingTo: "Reconnexion à {{serverLabel}}…",
+      showAgainWhenReachable: "Cet agent s’affichera de nouveau dès que l’hôte sera joignable.",
     },
     archived: {
       callout: "Cet agent est archivé",
@@ -249,42 +283,42 @@ export const fr: TranslationResources = {
   },
   sessions: {
     title: "Historique",
-    empty: "Aucune séance pour l'instant",
-    noMatches: "Aucune séance correspondante",
+    empty: "Aucune session pour l’instant",
+    noMatches: "Aucune session correspondante",
     tooManyMatches: "Trop de résultats — affinez la recherche",
-    hostLoadFailed: "{{host}} : Impossible de charger l'historique",
-    searchPlaceholder: "Rechercher dans l'historique",
+    hostLoadFailed: "{{host}} : impossible de charger l’historique",
+    searchPlaceholder: "Rechercher dans l’historique",
     actions: {
       loadMore: "Charger plus",
       clearSearch: "Effacer la recherche",
     },
   },
   agentList: {
-    fallbackTitle: "Nouvelle séance",
+    fallbackTitle: "Nouvelle session",
     dateSections: {
-      recent: "Récent",
-      today: "Aujourd'hui",
+      recent: "Récents",
+      today: "Aujourd’hui",
       yesterday: "Hier",
       thisWeek: "Cette semaine",
       thisMonth: "Ce mois-ci",
-      older: "Plus vieux",
+      older: "Plus anciens",
     },
     status: {
-      initializing: "Départ",
+      initializing: "Démarrage…",
       idle: "Inactif",
-      running: "En cours d'exécution",
+      running: "En cours",
       error: "Erreur",
       closed: "Fermé",
     },
     badges: {
       archived: "Archivé",
-      pending: "{{count}}en attente",
+      pending: "{{count}} en attente",
       attention: "Attention",
     },
     archiveSheet: {
-      hostOffline: "Hosthors ligne",
-      runningAgent: "Cet agent est toujours en cours d'exécution. L’archiver arrêtera l’agent.",
-      archive: "Archive",
+      hostOffline: "Hôte hors ligne",
+      runningAgent: "Cet agent est toujours en cours d’exécution. L’archiver l’arrêtera.",
+      archive: "Archiver",
     },
   },
   message: {
@@ -299,33 +333,33 @@ export const fr: TranslationResources = {
     },
     actions: {
       copyCode: "Copier le code",
-      copyTurn: "Copier le tour",
+      copyTurn: "Copier l’échange",
       copyMessage: "Copier le message",
-      forkMenu: "Dupliquer le message",
-      forkInNewTab: "Dupliquer dans un nouvel onglet",
-      forkInNewWorkspace: "Dupliquer dans un nouvel espace de travail",
-      forkUnavailable: "Mettez l'hôte à jour pour utiliser ceci.",
-      forkMissingWorkspace: "Cet agent n'est pas dans un espace de travail.",
-      forkFailed: "Impossible de dupliquer le chat",
+      forkMenu: "Forker la conversation à partir d’ici",
+      forkInNewTab: "Forker dans un nouvel onglet",
+      forkInNewWorkspace: "Forker dans un nouvel espace de travail",
+      forkUnavailable: "Mettez à jour l’hôte pour utiliser cette fonction.",
+      forkMissingWorkspace: "Cet agent n’est dans aucun espace de travail.",
+      forkFailed: "Impossible de forker la conversation",
       openFile: "Ouvrir le fichier",
       copied: "Copié",
     },
     attachments: {
-      dismissImage: "Ignorer l'image",
-      closeImage: "Fermer l'image",
-      imageLoadFailed: "Impossible de charger l'image",
+      dismissImage: "Ignorer l’image",
+      closeImage: "Fermer l’image",
+      imageLoadFailed: "Impossible de charger l’image",
       imageUnavailable: "Image indisponible",
-      imagePreviewUnavailable: "Aperçu de l'image indisponible.",
-      imagePreviewLoadFailed: "Impossible de charger l'aperçu de l'image.",
+      imagePreviewUnavailable: "Aperçu de l’image indisponible.",
+      imagePreviewLoadFailed: "Impossible de charger l’aperçu de l’image.",
       review: "Revue",
       commentsOne: "1 commentaire",
       commentsMany: "{{count}} commentaires",
-      textAttachment: "Texte en pièce jointe",
+      textAttachment: "Pièce jointe texte",
       text: "Texte",
       file: "Fichier",
     },
     speak: {
-      header: "Rayon",
+      header: "Prononcé",
     },
     activity: {
       details: "Détails",
@@ -333,21 +367,21 @@ export const fr: TranslationResources = {
     dictation: {
       start: "Démarrer la dictée vocale",
       cancel: "Annuler la dictée",
-      retry: "Réessayer la dictée",
+      retry: "Relancer la dictée",
       insert: "Insérer la transcription",
       insertAndSend: "Insérer la transcription et envoyer",
-      failed: "Échec de la dictée:{{error}}",
-      failedRetry: "La dictée a échoué. Appuyez sur réessayer.",
+      failed: "Échec de la dictée : {{error}}",
+      failedRetry: "La dictée a échoué. Appuyez sur Réessayer.",
     },
     question: {
-      submit: "Soumettre",
+      submit: "Envoyer",
       next: "Suivant",
-      answerPlaceholder: "Tapez votre réponse...",
-      otherPlaceholder: "Autre...",
+      answerPlaceholder: "Saisissez votre réponse…",
+      otherPlaceholder: "Autre…",
     },
     todo: {
       title: "Tâches",
-      empty: "Aucune tâche pour l'instant.",
+      empty: "Aucune tâche pour l’instant.",
       tasksProgress: "{{completed}}/{{total}} tâches",
       activity: {
         created: "{{count}} tâches créées",
@@ -356,18 +390,21 @@ export const fr: TranslationResources = {
         completed: "Terminée",
       },
     },
+    turnFooter: {
+      workedFor: "A travaillé pendant {{duration}}",
+    },
     compaction: {
-      loading: "Compactage...",
-      auto: "Contexte automatiquement compacté",
+      loading: "Compaction…",
+      auto: "Contexte compacté automatiquement",
       manual: "Contexte compacté manuellement",
-      withTokens: "Contexte compacté (jetons{{tokens}}K)",
+      withTokens: "Contexte compacté ({{tokens}}K tokens)",
       completed: "Contexte compacté",
     },
   },
   importSession: {
     chooseHostTitle: en.importSession.chooseHostTitle,
-    title: "Session d'importation",
-    searchPlaceholder: "Rechercher des sessions...",
+    title: "Importer une session",
+    searchPlaceholder: "Rechercher des sessions…",
     scope: {
       host: "Sessions sur {{host}}",
       workspace: "Cet espace de travail",
@@ -377,55 +414,57 @@ export const fr: TranslationResources = {
     },
     status: {
       connectHost: "Connectez-vous à un hôte pour importer des sessions",
-      updateHost: "Mettez à jour l'hôte pour importer des sessions.",
-      noProviders: "Aucun fournisseur importable n'est activé.",
-      loading: "Chargement des sessions récentes...",
+      updateHost: "Mettez à jour l’hôte pour importer des sessions.",
+      noProviders: "Aucun fournisseur importable n’est activé.",
+      loading: "Chargement des sessions récentes…",
       failedProvider: "Impossible de charger les sessions {{provider}}",
-      failedImport: "Impossible d'importer la session sélectionnée.",
+      failedImport: "Impossible d’importer la session sélectionnée.",
     },
     actions: {
-      refresh: "Sessions de rafraîchissement",
+      refresh: "Actualiser les sessions",
       showAll: "Tout afficher",
       loadMore: "Charger plus",
     },
     preview: {
-      untitledSession: "Séance sans titre",
-      noPrompt: "Aucun aperçu rapide",
+      untitledSession: "Session sans titre",
+      noPrompt: "Aucun aperçu du prompt",
     },
     empty: {
       noRecent: "Aucune session récente à importer.",
       noMatches: "Aucune session ne correspond à votre recherche.",
       alreadyImported: "Toutes les sessions récentes sont déjà importées.",
-      noProviderSessions: "Aucune session{{provider}}trouvée.",
+      noProviderSessions: "Aucune session {{provider}} trouvée.",
     },
     row: {
-      importing: "Importation...",
+      importing: "Importation…",
     },
   },
   workspace: {
     route: {
-      loading: "Chargement de l'espace de travail",
-      connecting: "De liaison",
-      hostOffline: "{{hostName}}est hors ligne",
-      cannotReachHost: "Impossible d'atteindre{{hostName}}",
-      hostStatus: "StatutHost:{{status}}",
+      loading: "Chargement de l’espace de travail…",
+      connecting: "Connexion…",
+      hostOffline: "{{hostName}} est hors ligne",
+      cannotReachHost: "Impossible de joindre {{hostName}}",
+      hostStatus: "Statut de l’hôte : {{status}}",
       needsHostUpgrade: "Mettez à jour votre hôte pour restaurer cet espace de travail",
-      manageHost: "Gérer l'hôte",
+      manageHost: "Gérer l’hôte",
       recovery: {
         archivedTitle: "Espace de travail archivé",
         restoreDescription:
-          "{{workspaceName}} a été archivé et son worktree supprimé. Restaurez la branche {{branch}} pour le rouvrir.",
+          "Restaurez {{workspaceName}} pour retrouver ses agents. Son worktree utilisera la branche {{branch}}.",
+        restoreWithoutBranchDescription:
+          "Restaurez {{workspaceName}} pour retrouver ses agents. Une nouvelle branche partira de la base enregistrée ou de la branche par défaut du dépôt.",
         unarchiveDescription: "{{workspaceName}} est archivé. Désarchivez-le pour le rouvrir.",
         restoreAction: "Restaurer",
         unarchiveAction: "Désarchiver",
-        restoringTitle: "Restauration de l'espace de travail",
-        restoringAction: "Restauration...",
+        restoringTitle: "Restauration de l’espace de travail",
+        restoringAction: "Restauration…",
         unavailableTitle: "Espace de travail indisponible",
-        checkFailedTitle: "Impossible de vérifier l'espace de travail",
+        checkFailedTitle: "Impossible de vérifier l’espace de travail",
       },
     },
     hoverCard: {
-      scriptsAccessibility: "ScriptsWorkspace",
+      scriptsAccessibility: "Scripts de l’espace de travail",
       copyPath: "Copier le chemin",
       copyBranchName: "Copier le nom de la branche",
       copied: "Copié",
@@ -438,8 +477,8 @@ export const fr: TranslationResources = {
       copyRelativePath: "Copier le chemin relatif",
       revealIn: "Afficher dans {{target}}",
       download: "Télécharger",
-      addToChat: "Ajouter au chat",
-      moreActions: "Plus de propositions",
+      addToChat: "Ajouter à la conversation",
+      moreActions: "Plus d’actions",
       newFile: "Nouveau fichier",
       newFolder: "Nouveau dossier",
       collapseFolder: "Replier le dossier",
@@ -448,24 +487,24 @@ export const fr: TranslationResources = {
       revert: "Abandonner les modifications",
       delete: "Supprimer",
       confirmDelete: {
-        fileTitle: "Supprimer le fichier ?",
-        folderTitle: "Supprimer le dossier ?",
-        message: "« {{name}} » sera définitivement supprimé.",
+        fileTitle: "Supprimer le fichier ?",
+        folderTitle: "Supprimer le dossier ?",
+        message: "« {{name}} » sera définitivement supprimé.",
         confirm: "Supprimer",
         cancel: "Annuler",
       },
       confirmRevert: {
-        title: "Abandonner les modifications ?",
-        message: "Les modifications de « {{name}} » seront définitivement abandonnées.",
+        title: "Abandonner les modifications ?",
+        message: "Les modifications de « {{name}} » seront définitivement abandonnées.",
         confirm: "Abandonner",
         cancel: "Annuler",
-        failed: "Échec de l'abandon des modifications",
+        failed: "Impossible d’abandonner les modifications",
       },
     },
     fileExplorer: {
       sort: {
         name: "Nom",
-        modified: "Modifié",
+        modified: "Date de modification",
         size: "Taille",
       },
       context: {
@@ -473,10 +512,10 @@ export const fr: TranslationResources = {
         modified: "Modifié",
       },
       actions: {
-        back: "Dos",
+        back: "Retour",
         retry: "Réessayer",
         refresh: "Actualiser les fichiers",
-        refreshing: "Actualisation des fichiers",
+        refreshing: "Actualisation des fichiers…",
         hideHiddenFiles: "Masquer les fichiers cachés",
         showHiddenFiles: "Afficher les fichiers cachés",
       },
@@ -485,16 +524,16 @@ export const fr: TranslationResources = {
         noVisibleFiles: "Aucun fichier visible",
       },
       states: {
-        unavailable: "Workspacen'est pas disponible",
-        loading: "Chargement des fichiers...",
+        unavailable: "L’espace de travail est indisponible",
+        loading: "Chargement des fichiers…",
       },
       errors: {
-        failedToListDirectory: "Échec de la liste du répertoire",
-        createFailed: "Échec de la création de l'entrée",
-        renameFailed: "Échec du renommage de l'entrée",
-        duplicateFailed: "Échec de la duplication de l'entrée",
-        revealFailed: "Échec de l'affichage de l'entrée",
-        deleteFailed: "Échec de la suppression de l'entrée",
+        failedToListDirectory: "Impossible de lister le répertoire",
+        createFailed: "Impossible de créer l’élément",
+        renameFailed: "Impossible de renommer l’élément",
+        duplicateFailed: "Impossible de dupliquer l’élément",
+        revealFailed: "Impossible d’afficher l’élément",
+        deleteFailed: "Impossible de supprimer l’élément",
       },
       draft: {
         filePlaceholder: "Nom du fichier",
@@ -503,33 +542,33 @@ export const fr: TranslationResources = {
     },
     setup: {
       descriptor: {
-        label: "Installation",
+        label: "Configuration",
         completed: "Configuration terminée",
-        failed: "Échec de l'installation",
-        workspace: "ConfigurationWorkspace",
+        failed: "Échec de la configuration",
+        workspace: "Configuration de l’espace de travail",
         blocked: "Configuration bloquée",
       },
       status: {
-        running: "En cours d'exécution",
-        completed: "Complété",
-        failed: "Échoué",
-        waiting: "En attente de la sortie de configuration",
+        running: "En cours",
+        completed: "Terminé",
+        failed: "Échec",
+        waiting: "En attente de la sortie de la configuration",
         blocked: "Bloqué",
       },
-      waiting: "Configuration de l'espace de travail...",
+      waiting: "Configuration de l’espace de travail…",
       blocked: {
-        title: "La configuration n’a pas été exécutée",
+        title: "La configuration n’a pas été lancée",
         description:
-          "Cette PR provient de {{repository}}, un dépôt différent. Sa configuration et ses scripts pourraient exécuter du code que vous n’avez pas examiné.",
-        run: "Exécuter la configuration",
-        runFailed: "Échec de la configuration de l’espace de travail",
+          "Cette PR provient de {{repository}}, un autre dépôt. Sa configuration et ses scripts pourraient exécuter du code que vous n’avez pas relu.",
+        run: "Lancer la configuration",
+        runFailed: "Impossible de lancer la configuration de l’espace de travail",
       },
       empty: {
-        noCommands: "Aucune commande de configuration n'a été exécutée pour cet espace de travail.",
+        noCommands: "Aucune commande de configuration n’a été exécutée pour cet espace de travail.",
       },
       accessibility: {
-        noCommands: "Aucune commande de configuration n'a été exécutée pour cet espace de travail",
-        log: "Journal de configurationWorkspace",
+        noCommands: "Aucune commande de configuration n’a été exécutée pour cet espace de travail",
+        log: "Journal de configuration de l’espace de travail",
       },
       log: {
         noOutput: "Aucune sortie",
@@ -537,177 +576,177 @@ export const fr: TranslationResources = {
     },
     browser: {
       unavailable: {
-        title: "Le navigateur est réservé au bureau",
+        title: "Le navigateur est réservé à l’app de bureau",
         subtitle: "Ouvrez cet espace de travail dans Electron pour utiliser le navigateur intégré.",
       },
-      session: "Session de navigateur{{browserId}}",
+      session: "Session de navigateur {{browserId}}",
       controls: {
-        back: "Dos",
-        forward: "Avant",
+        back: "Retour",
+        forward: "Suivant",
         stopLoading: "Arrêter le chargement",
-        refresh: "Rafraîchir",
-        browserUrl: "NavigateurURL",
-        enterUrl: "EntrezURL",
-        openDevTools: "Outils de développement du navigateur ouvert",
-        cancelSelector: "Annuler le sélecteur d'élément",
-        annotateElement: "Annoter l'élément",
-        screenshotElement: "Capturer l'élément",
-        screenshotCopied: "Capture d'écran copiée dans le presse-papiers",
+        refresh: "Actualiser",
+        browserUrl: "URL du navigateur",
+        enterUrl: "Saisir une URL",
+        openDevTools: "Ouvrir les outils de développement du navigateur",
+        cancelSelector: "Annuler la sélection d’élément",
+        annotateElement: "Annoter l’élément",
+        screenshotElement: "Capturer l’élément",
+        screenshotCopied: "Capture d’écran copiée dans le presse-papiers",
         elementCopied: "Élément copié dans le presse-papiers",
-        screenshotFailed: "Impossible de copier la capture",
+        screenshotFailed: "Impossible de copier la capture d’écran",
         selectorLoading: "Attendez la fin du chargement de la page",
-        selectorFailed: "Impossible de démarrer le sélecteur d’élément",
+        selectorFailed: "Impossible de lancer le sélecteur d’élément",
       },
       annotate: {
-        title: "Annoter l'élément",
-        placeholder: "Message à l'agent concernant cet élément…",
+        title: "Annoter l’élément",
+        placeholder: "Message à l’agent à propos de cet élément…",
         submit: "Joindre",
         cancel: "Annuler",
       },
       devices: {
-        label: "Taille de l'appareil",
+        label: "Taille de l’appareil",
         responsive: "Adaptatif",
       },
       errors: {
-        failedToLoad: "Échec du chargement de la page",
-        invalidUrl: "NavigateurURLinvalide",
-        unsupportedProtocol: "Navigateur non pris en charge bloquéURL:{{protocol}}",
+        failedToLoad: "Impossible de charger la page",
+        invalidUrl: "URL du navigateur invalide",
+        unsupportedProtocol: "URL bloquée, protocole non pris en charge : {{protocol}}",
       },
     },
     terminal: {
-      hostDisconnected: "Hostn'est pas connecté",
-      updateHost: "Mettez à jour l’hôte pour utiliser le terminal natif.",
-      unableToSubscribe: "Impossible de s'abonner au terminal",
+      hostDisconnected: "L’hôte n’est pas connecté",
+      updateHost: "Mettez à jour l’hôte pour utiliser le rendu natif du terminal.",
+      unableToSubscribe: "Impossible de s’abonner au terminal",
     },
     tabs: {
-      loading: "Chargement...",
+      loading: "Chargement…",
       modified: "Modifications non enregistrées",
-      loadingAgentTitle: "Titre d'agent de chargement",
+      loadingAgentTitle: "Chargement du titre de l’agent…",
       fallback: {
         newAgent: "Nouvel agent",
-        setup: "Installation",
-        workspaceSetup: "ConfigurationWorkspace",
+        setup: "Configuration",
+        workspaceSetup: "Configuration de l’espace de travail",
         terminal: "Terminal",
         browser: "Navigateur",
         agent: "Agent",
-        workspace: "Workspace",
+        workspace: "Espace de travail",
       },
       switcher: {
-        trigger: "Changer d'onglet ({{count}}ouvert)",
-        title: "Changer d'onglet",
-        searchPlaceholder: "Onglets de recherche",
+        trigger: "Changer d’onglet ({{count}} ouverts)",
+        title: "Changer d’onglet",
+        searchPlaceholder: "Rechercher des onglets",
       },
       menu: {
-        openFor: "Ouvrir le menu pour{{label}}",
+        openFor: "Ouvrir le menu de {{label}}",
         copyResumeCommand: "Copier la commande de reprise",
-        copyAgentId: "Copier l'identifiant de l'agent",
-        copyTerminalId: "Copier l'identifiant du terminal",
-        copyFilePath: "Copy file path",
-        rename: "Rebaptiser",
-        closeAbove: "Fermer les onglets ci-dessus",
-        closeBelow: "Fermer les onglets ci-dessous",
-        closeLeft: "Près de la gauche",
-        closeRight: "Près de la droite",
+        copyAgentId: "Copier l’ID de l’agent",
+        copyTerminalId: "Copier l’ID du terminal",
+        copyFilePath: "Copier le chemin du fichier",
+        rename: "Renommer",
+        closeAbove: "Fermer les onglets au-dessus",
+        closeBelow: "Fermer les onglets en dessous",
+        closeLeft: "Fermer les onglets à gauche",
+        closeRight: "Fermer les onglets à droite",
         closeOthers: "Fermer les autres onglets",
         moveToMain: "Déplacer vers le panneau principal",
-        reloadAgent: "Agent de rechargement",
+        reloadAgent: "Recharger l’agent",
         reloadAgentTooltip:
-          "Rechargez l'agent pour mettre à jour les compétences, les MCP ou le statut de connexion.",
+          "Rechargez l’agent pour mettre à jour les skills, les MCP ou l’état de connexion.",
         close: "Fermer",
         renameTerminal: "Renommer le terminal",
-        renameAgent: "Renommer l'agent",
+        renameAgent: "Renommer l’agent",
       },
       actions: {
         newTab: "Nouvel onglet",
         newAgent: "Nouvel agent",
         newTerminal: "Nouveau terminal",
-        preparingTerminal: "Préparation de l'onglet du terminal",
-        preparingTerminalTooltip: "Préparation du terminal...",
+        preparingTerminal: "Préparation de l’onglet de terminal…",
+        preparingTerminalTooltip: "Préparation du terminal…",
         newBrowser: "Nouveau navigateur",
-        maximizePane: "Agrandir le volet",
-        restorePane: "Restaurer le volet",
-        closePane: "Fermer le volet",
+        maximizePane: "Agrandir le panneau",
+        restorePane: "Restaurer le panneau",
+        closePane: "Fermer le panneau",
         exitFocusMode: "Quitter le mode concentration",
-        splitRight: "Volet divisé à droite",
-        splitDown: "Diviser le volet vers le bas",
+        splitRight: "Diviser le panneau à droite",
+        splitDown: "Diviser le panneau vers le bas",
         changes: "Modifications",
         files: "Fichiers",
-        pullRequest: "Demande de fusion",
-        terminalProfilesMenu: "Terminal profiles",
-        editTerminalProfiles: "Edit profiles",
+        pullRequest: "Pull request",
+        terminalProfilesMenu: "Profils de terminal",
+        editTerminalProfiles: "Modifier les profils",
       },
       explorerSidebar: {
-        open: "Ouvrir le panneau latéral",
-        close: "Fermer le panneau latéral",
-        toggle: "Basculer le panneau latéral",
-        changes: "Changements",
+        open: "Ouvrir la barre latérale de l’explorateur",
+        close: "Fermer la barre latérale de l’explorateur",
+        toggle: "Afficher/masquer la barre latérale de l’explorateur",
+        changes: "Modifications",
         files: "Fichiers",
       },
       toasts: {
-        copyFailed: "Échec de la copie",
-        agentIdCopiedLabel: "AgentID",
-        terminalIdCopiedLabel: "Identifiant du terminal",
-        resumeCommandCopiedLabel: "reprendre la commande",
-        filePathCopiedLabel: "File path",
-        resumeIdUnavailable: "ReprendreIDnon disponible",
-        resumeCommandUnavailable: "Commande de reprise non disponible",
-        reloadingAgent: "Agent de rechargement...",
+        copyFailed: "Impossible de copier",
+        agentIdCopiedLabel: "ID de l’agent",
+        terminalIdCopiedLabel: "ID du terminal",
+        resumeCommandCopiedLabel: "Commande de reprise",
+        filePathCopiedLabel: "Chemin du fichier",
+        resumeIdUnavailable: "ID de reprise indisponible",
+        resumeCommandUnavailable: "Commande de reprise indisponible",
+        reloadingAgent: "Rechargement de l’agent…",
         reloadedAgent: "Agent rechargé",
-        failedToReloadAgent: "Échec du rechargement de l'agent",
-        failedToCloseAgent: "Échec de la fermeture de l'agent",
+        failedToReloadAgent: "Impossible de recharger l’agent",
+        failedToCloseAgent: "Impossible de fermer l’agent",
       },
       confirmations: {
         unsavedTitle: "Modifications non enregistrées",
         unsavedMessage:
           "Cet onglet contient des modifications non enregistrées. Le fermer supprimera le brouillon.",
         closeWithoutSaving: "Fermer sans enregistrer",
-        closePaneTitle: "Fermer le volet?",
+        closePaneTitle: "Fermer le panneau ?",
         bulkUnsaved:
           "{{count}} onglet(s) contiennent des modifications non enregistrées. Les fermer supprimera ces brouillons.",
         close: "Fermer",
         cancel: "Annuler",
-        archive: "Archive",
-        closeTerminalTitle: "Fermer le terminal?",
-        closeTerminalMessage:
-          "Tout processus en cours d’exécution dans ce terminal sera immédiatement arrêté.",
-        archiveRunningAgentTitle: "Archiver l'agent en cours d'exécution?",
+        archive: "Archiver",
+        closeTerminalTitle: "Fermer le terminal ?",
+        closeTerminalMessage: "Tout processus en cours dans ce terminal sera arrêté immédiatement.",
+        archiveRunningAgentTitle: "Archiver l’agent en cours ?",
         archiveRunningAgentMessage:
-          "Cet agent est toujours en cours d'exécution. L'archiver arrêtera l'agent et fermera l'onglet.",
-        closeTabsLeftTitle: "Fermer les onglets à gauche?",
-        closeTabsRightTitle: "Fermer les onglets à droite?",
-        closeOtherTabsTitle: "Fermer les autres onglets?",
+          "Cet agent est toujours en cours d’exécution. L’archiver arrêtera l’agent et fermera l’onglet.",
+        closeTabsLeftTitle: "Fermer les onglets à gauche ?",
+        closeTabsRightTitle: "Fermer les onglets à droite ?",
+        closeOtherTabsTitle: "Fermer les autres onglets ?",
         bulk: {
-          all: "Cela archivera les agents{{agents}}, fermera les terminaux{{terminals}}et fermera les onglets{{tabs}}. Tout processus en cours d’exécution dans un terminal fermé sera immédiatement arrêté.",
+          all: "Cette action archivera {{agents}} agent(s), fermera {{terminals}} terminal(s) et fermera {{tabs}} onglet(s). Tout processus en cours dans un terminal fermé sera arrêté immédiatement.",
           agentsAndTerminals:
-            "Cela archivera les agents{{agents}}et fermera les terminaux{{terminals}}. Tout processus en cours d’exécution dans un terminal fermé sera immédiatement arrêté.",
+            "Cette action archivera {{agents}} agent(s) et fermera {{terminals}} terminal(s). Tout processus en cours dans un terminal fermé sera arrêté immédiatement.",
           terminalsAndTabs:
-            "Cela fermera le(s) terminal(s){{terminals}}et fermera le(s) onglet(s){{tabs}}. Tout processus en cours d’exécution dans un terminal fermé sera immédiatement arrêté.",
-          agentsAndTabs: "Cela archivera les agents{{agents}}et fermera les onglets{{tabs}}.",
+            "Cette action fermera {{terminals}} terminal(s) et {{tabs}} onglet(s). Tout processus en cours dans un terminal fermé sera arrêté immédiatement.",
+          agentsAndTabs:
+            "Cette action archivera {{agents}} agent(s) et fermera {{tabs}} onglet(s).",
           terminals:
-            "Cela fermera le(s) terminal(s){{terminals}}. Tout processus en cours d’exécution dans un terminal fermé sera immédiatement arrêté.",
-          tabs: "Cela fermera les onglets{{tabs}}.",
-          agents: "Cela archivera les agents{{agents}}.",
+            "Cette action fermera {{terminals}} terminal(s). Tout processus en cours dans un terminal fermé sera arrêté immédiatement.",
+          tabs: "Cette action fermera {{tabs}} onglet(s).",
+          agents: "Cette action archivera {{agents}} agent(s).",
         },
       },
     },
     header: {
       actions: {
-        workspaceActions: "ActionsWorkspace",
+        workspaceActions: "Actions de l’espace de travail",
         newAgent: "Nouvel agent",
-        newTerminal: "Nouvelle borne",
-        newBrowser: "Nouvel onglet du navigateur",
-        importSession: "Session d'importation",
-        copyPath: "Copier le chemin de l'espace de travail",
+        newTerminal: "Nouveau terminal",
+        newBrowser: "Nouvel onglet de navigateur",
+        importSession: "Importer une session",
+        copyPath: "Copier le chemin de l’espace de travail",
         copyBranchName: "Copier le nom de la branche",
         showSetup: "Afficher la configuration",
       },
       toasts: {
-        workspacePathUnavailable: "Le cheminWorkspacen'est pas encore disponible",
-        branchNameUnavailable: "Nom de la succursale non disponible",
+        workspacePathUnavailable: "Le chemin de l’espace de travail n’est pas encore disponible",
+        branchNameUnavailable: "Nom de la branche indisponible",
         terminalQueued:
-          "Préparation de l'espace de travail, ouverture du terminal lorsque vous êtes prêt...",
-        workspacePathCopiedLabel: "CheminWorkspace",
-        branchNameCopiedLabel: "Nom de la succursale",
+          "Préparation de l’espace de travail, le terminal s’ouvrira dès qu’il sera prêt…",
+        workspacePathCopiedLabel: "Chemin de l’espace de travail",
+        branchNameCopiedLabel: "Nom de la branche",
       },
     },
     scripts: {
@@ -717,231 +756,224 @@ export const fr: TranslationResources = {
         copyUrl: "Copier l’URL",
         openService: "Voir le service",
         restart: "Redémarrer",
-        run: "Courir",
+        run: "Lancer",
         stop: "Arrêter",
         view: "Voir le terminal",
       },
       accessibility: {
-        trigger: "ScriptsWorkspace",
+        trigger: "Scripts de l’espace de travail",
         openService: "Voir le service {{scriptName}}",
-        viewTerminal: "Voir le terminal{{scriptName}}",
-        runScript: "Exécuter le script{{scriptName}}",
-        stopScript: "Arrêter{{scriptName}}",
-        restartScript: "Redémarrer{{scriptName}}",
-        copyUrl: "Copier l'URL de{{scriptName}}",
-        chooseUrl: "Choisir l’URL pour {{scriptName}}",
-        script: "Script{{scriptName}}",
+        viewTerminal: "Voir le terminal de {{scriptName}}",
+        runScript: "Lancer le script {{scriptName}}",
+        stopScript: "Arrêter {{scriptName}}",
+        restartScript: "Redémarrer {{scriptName}}",
+        copyUrl: "Copier l’URL de {{scriptName}}",
+        chooseUrl: "Choisir l’URL de {{scriptName}}",
+        script: "Script {{scriptName}}",
       },
       routes: {
         public: "Proxy inverse",
-        paseo: "Memorable",
+        paseo: "Mémorable",
         direct: "Directe",
       },
       states: {
-        exitCode: "quitter{{code}}",
-        startFailed: "Échec du démarrage de{{scriptName}}",
-        stopFailed: "Échec de l'arrêt de{{scriptName}}",
+        exitCode: "sortie {{code}}",
+        startFailed: "Impossible de démarrer {{scriptName}}",
+        stopFailed: "Impossible d’arrêter {{scriptName}}",
       },
     },
     tree: {
-      showFolderTree: "Afficher l'arborescence des dossiers",
-      hideFolderTree: "Masquer l'arborescence des dossiers",
+      showFolderTree: "Afficher l’arborescence des dossiers",
+      hideFolderTree: "Masquer l’arborescence des dossiers",
     },
     git: {
       actions: {
-        moreOptions: "Plus d'options",
-        moreActions: "Plus de propositions",
+        moreOptions: "Plus d’options",
+        moreActions: "Plus d’actions",
         commit: {
-          label: "Commettre",
-          pending: "S'engager...",
-          success: "Engagé",
+          label: "Commiter",
+          pending: "Commit en cours…",
+          success: "Commité",
         },
         pull: {
-          label: "Tirer",
-          pending: "Tirer...",
-          success: "Tiré",
+          label: "Pull",
+          pending: "Pull en cours…",
+          success: "Pull effectué",
         },
         push: {
-          label: "Pousser",
-          pending: "Pousser...",
-          success: "Poussé",
+          label: "Push",
+          pending: "Push en cours…",
+          success: "Push effectué",
         },
         pullAndPush: {
-          label: "Tirez et poussez",
-          pending: "Tirer et pousser...",
-          success: "Tiré et poussé",
+          label: "Pull et push",
+          pending: "Pull et push en cours…",
+          success: "Pull et push effectués",
         },
-        viewPr: "VoirPR",
+        viewPr: "Voir la PR",
         createPr: {
-          label: "CréerPR",
-          pending: "Création dePR...",
-          success: "PRcréé",
-          label_mr: "Créer MR",
-          pending_mr: "Création de MR...",
-          success_mr: "MR créé",
+          label: "Créer une PR",
+          pending: "Création de la PR…",
+          success: "PR créée",
+          label_mr: "Créer une MR",
+          pending_mr: "Création de la MR…",
+          success_mr: "MR créée",
         },
         mergeBranch: {
-          label: "Fusionner localement",
-          pending: "Fusion...",
+          label: "Fusionner en local",
+          pending: "Fusion…",
           success: "Fusionné",
         },
         mergeFromBase: {
-          label: "Mise à jour de{{baseRef}}",
-          pending: "Mise à jour...",
+          label: "Mettre à jour depuis {{baseRef}}",
+          pending: "Mise à jour…",
           success: "Mis à jour",
         },
         archive: {
           label: "Archiver l’espace de travail",
-          pending: "Archivage...",
+          pending: "Archivage…",
           success: "Archivé",
         },
         mergePr: {
-          squash: "Fusionner PR (squash)",
-          merge: "Fusionner PR (merge)",
-          rebase: "Fusionner PR (rebase)",
-          pending: "Fusion de PR...",
-          success: "PR fusionné",
-          squash_mr: "Fusionner MR (squash)",
-          merge_mr: "Fusionner MR (merge)",
-          rebase_mr: "Fusionner MR (rebase)",
-          pending_mr: "Fusion de MR...",
-          success_mr: "MR fusionné",
+          squash: "Fusionner la PR (squash)",
+          merge: "Fusionner la PR (merge)",
+          rebase: "Fusionner la PR (rebase)",
+          pending: "Fusion de la PR…",
+          success: "PR fusionnée",
+          squash_mr: "Fusionner la MR (squash)",
+          merge_mr: "Fusionner la MR (merge)",
+          rebase_mr: "Fusionner la MR (rebase)",
+          pending_mr: "Fusion de la MR…",
+          success_mr: "MR fusionnée",
         },
-        viewPr_mr: "Voir MR",
+        viewPr_mr: "Voir la MR",
         autoMerge: {
           enableSquash: "Fusion automatique (squash)",
           enableMerge: "Fusion automatique (merge)",
           enableRebase: "Fusion automatique (rebase)",
           enabled: "Fusion automatique activée",
-          enabling: "Activation de la fusion automatique...",
-          disabling: "Désactivation de la fusion automatique...",
+          enabling: "Activation de la fusion automatique…",
+          disabling: "Désactivation de la fusion automatique…",
           disabled: "Fusion automatique désactivée",
         },
         unavailable: {
           viewPrNoForge:
-            "Voir {{noun}} n'est pas disponible pour le moment car {{brand}} n'est pas connecté",
+            "Impossible de voir la {{noun}} pour l’instant : {{brand}} n’est pas connecté",
           pullNoRemote:
-            "Pull n'est pas disponible ici car cette branche n'est pas encore connectée à une télécommande",
+            "Pull indisponible : cette branche n’est pas encore liée à un dépôt distant",
           pullDirty:
-            "Pull n'est pas disponible tant que vous avez des modifications locales, alors validez-les ou cachez-les d'abord",
-          pullUpToDate: "Pull n'est pas disponible car cette branche est déjà à jour",
+            "Pull indisponible tant que vous avez des modifications locales : commitez-les ou remisez-les d’abord",
+          pullUpToDate: "Pull indisponible : cette branche est déjà à jour",
           pushNoRemote:
-            "Push n'est pas disponible ici car cette branche n'est pas encore connectée à une télécommande",
+            "Push indisponible : cette branche n’est pas encore liée à un dépôt distant",
           pushBehind:
-            "Push n'est pas encore disponible, car de nouvelles modifications doivent être apportées en premier.",
-          pushNothing: "Push n'est pas disponible car il n'y a rien de nouveau à envoyer",
+            "Push indisponible pour l’instant : des modifications plus récentes doivent d’abord être récupérées",
+          pushNothing: "Push indisponible : il n’y a rien de nouveau à pousser",
           pullAndPushNoRemote:
-            "Le pull et le push ne sont pas disponibles ici car cette branche n'est pas encore connectée à une télécommande",
+            "Pull et push indisponibles : cette branche n’est pas encore liée à un dépôt distant",
           pullAndPushDirty:
-            "Pull et push ne sont pas disponibles tant que vous avez des modifications locales, alors validez-les ou cachez-les d'abord",
+            "Pull et push indisponibles tant que vous avez des modifications locales : commitez-les ou remisez-les d’abord",
           pullAndPushNoIncoming:
-            "Pull et push ne sont pas disponibles car il n'y a aucun changement entrant à récupérer d'abord",
-          pullAndPushInSync:
-            "Les fonctions Pull et Push ne sont pas disponibles car cette branche est déjà synchronisée",
+            "Pull et push indisponibles : aucune modification entrante à récupérer",
+          pullAndPushInSync: "Pull et push indisponibles : cette branche est déjà synchronisée",
           pullAndPushNothingToPush:
-            "Pull et push ne sont pas disponibles car il n'y a rien de nouveau à envoyer après le pull",
+            "Pull et push indisponibles : il n’y aurait rien de nouveau à pousser après le pull",
           createPrNoForge:
-            "Créer {{noun}} n'est pas disponible pour le moment car {{brand}} n'est pas connecté",
+            "Impossible de créer une {{noun}} pour l’instant : {{brand}} n’est pas connecté",
           createPrNoCommits:
-            "CréerPRn'est pas disponible car cette branche n'a pas encore de nouveaux commits",
-          mergeNoBase:
-            "La fusion n'est pas disponible car nous n'avons pas pu déterminer la branche de base",
+            "Impossible de créer une PR : cette branche n’a pas encore de nouveau commit",
+          mergeNoBase: "Fusion indisponible : impossible de déterminer la branche de base",
           mergeDirty:
-            "La fusion n'est pas disponible tant que vous avez des modifications locales, alors validez-les ou cachez-les d'abord",
+            "Fusion indisponible tant que vous avez des modifications locales : commitez-les ou remisez-les d’abord",
           mergeNothing:
-            "La fusion n'est pas disponible car cette branche n'a encore rien de nouveau à fusionner",
-          updateNoBase:
-            "La mise à jour n'est pas disponible car nous n'avons pas pu déterminer la branche de base",
+            "Fusion indisponible : cette branche n’a encore rien de nouveau à fusionner",
+          updateNoBase: "Mise à jour indisponible : impossible de déterminer la branche de base",
           updateDirty:
-            "La mise à jour n'est pas disponible tant que vous avez des modifications locales, alors validez-les ou cachez-les d'abord",
+            "Mise à jour indisponible tant que vous avez des modifications locales : commitez-les ou remisez-les d’abord",
           updateCurrent:
-            "La mise à jour n'est pas disponible car cette branche est déjà à jour avec{{baseRef}}",
+            "Mise à jour indisponible : cette branche est déjà à jour avec {{baseRef}}",
           mergePrNoGithub:
-            "La fusionPRn'est pas disponible pour le moment carGitHubn'est pas connecté",
+            "Impossible de fusionner la PR pour l’instant : GitHub n’est pas connecté",
           archiveNotWorktree:
-            "L'archive n'est pas disponible ici car cet espace de travail n'a pas été créé en tant qu'arbre de travailPaseo",
+            "Archivage indisponible : cet espace de travail n’a pas été créé comme worktree Paseo",
           mergePrNoForge:
-            "La fusion {{noun}} n'est pas disponible pour le moment car {{brand}} n'est pas connecté",
-          mergePrMissing:
-            "La fusionPRn'est pas disponible car il n'y a pas encore de demande d'extraction",
-          mergePrDraft:
-            "La fusionPRn'est pas disponible car la demande d'extraction est encore un brouillon",
-          mergePrMerged:
-            "La fusionPRn'est pas disponible car la demande d'extraction est déjà fusionnée",
-          mergePrClosed: "La fusionPRn'est pas disponible car la demande d'extraction est fermée",
-          mergePrConflicts:
-            "La fusionPRn'est pas disponible car la demande d'extraction présente des conflits",
+            "Impossible de fusionner la {{noun}} pour l’instant : {{brand}} n’est pas connecté",
+          mergePrMissing: "Impossible de fusionner la PR : il n’y a pas encore de pull request",
+          mergePrDraft: "Impossible de fusionner la PR : la pull request est encore un brouillon",
+          mergePrMerged: "Impossible de fusionner la PR : la pull request est déjà fusionnée",
+          mergePrClosed: "Impossible de fusionner la PR : la pull request est fermée",
+          mergePrConflicts: "Impossible de fusionner la PR : la pull request a des conflits",
           mergePrQueue:
-            "MergePRn'est pas disponible ici car ce référentiel utilise une file d'attente de fusion",
+            "Impossible de fusionner la PR ici : ce dépôt utilise une file d’attente de fusion",
           mergePrNotReady:
-            "La fusion {{noun}} n'est pas disponible jusqu'à ce que {{brand}} signale que {{noun}} est prête à fusionner",
+            "Impossible de fusionner la {{noun}} tant que {{brand}} n’indique pas que la {{noun}} est prête à être fusionnée",
           autoMergeCannotDisable:
             "La fusion automatique est activée, mais ce compte ne peut pas la désactiver",
         },
         toasts: {
-          failedCommit: "Échec de la validation",
-          failedPull: "Échec de l'extraction",
-          failedPush: "Échec de la poussée",
-          failedPullAndPush: "Impossible de tirer et de pousser",
-          failedCreatePr: "Échec de la création dePR",
-          failedMergePr: "Échec de la fusion dePR",
-          failedEnableAutoMerge: "Échec de l'activation de la fusion automatique",
-          failedDisableAutoMerge: "Échec de la désactivation de la fusion automatique",
-          baseRefUnavailable: "Réf de base indisponible",
+          failedCommit: "Impossible de commiter",
+          failedPull: "Échec du pull",
+          failedPush: "Échec du push",
+          failedPullAndPush: "Échec du pull et du push",
+          failedCreatePr: "Impossible de créer la PR",
+          failedMergePr: "Impossible de fusionner la PR",
+          failedEnableAutoMerge: "Impossible d’activer la fusion automatique",
+          failedDisableAutoMerge: "Impossible de désactiver la fusion automatique",
+          baseRefUnavailable: "Référence de base indisponible",
           failedMerge: "Échec de la fusion",
-          failedMergeFromBase: "Échec de la fusion à partir de la base",
+          failedMergeFromBase: "Échec de la fusion depuis la base",
         },
         archiveWarning: {
-          title: "Archiver «{{workspaceName}}»?",
-          confirm: "Archive",
+          title: "Archiver « {{workspaceName}} » ?",
+          confirm: "Archiver",
           cancel: "Annuler",
-          uncommittedChanges: "Modifications non validées",
-          uncommittedChangesWithDiff: "Modifications non validées ({{diffStat}})",
-          addedLine: "Ligne ajoutée{{count}}",
-          addedLines: "{{count}}lignes ajoutées",
-          deletedLine: "Ligne supprimée{{count}}",
-          deletedLines: "{{count}}lignes supprimées",
-          unpushedCommit: "Validation non poussée{{count}}",
-          unpushedCommits: "Validations non poussées{{count}}",
+          uncommittedChanges: "Modifications non commitées",
+          uncommittedChangesWithDiff: "Modifications non commitées ({{diffStat}})",
+          addedLine: "{{count}} ligne ajoutée",
+          addedLines: "{{count}} lignes ajoutées",
+          deletedLine: "{{count}} ligne supprimée",
+          deletedLines: "{{count}} lignes supprimées",
+          unpushedCommit: "{{count}} commit non poussé",
+          unpushedCommits: "{{count}} commits non poussés",
         },
       },
       diff: {
-        openChangesTab: "Ouvrir l'onglet Modifications",
-        openDiffTab: "Ouvrir l'onglet Diff",
-        closeChangesTab: "Fermer l'onglet Modifications",
+        openChangesTab: "Ouvrir l’onglet Modifications",
+        openDiffTab: "Ouvrir l’onglet Diff",
+        closeChangesTab: "Fermer l’onglet Modifications",
+        jumpToFile: {
+          title: "Aller au fichier",
+        },
         binaryFile: "Fichier binaire",
-        tooLarge: "Diff trop grand pour être affiché",
+        tooLarge: "Diff trop volumineux pour être affiché",
         previewTooLargeTitle: "Ce diff est trop volumineux pour être prévisualisé",
-        previewTooLargeDescription: "Réduisez la comparaison pour la prévisualiser ici",
-        unified: "Différentiel unifié",
-        split: "Différent côte à côte",
+        previewTooLargeDescription: "Réduisez la comparaison pour le prévisualiser ici",
+        unified: "Diff unifié",
+        split: "Diff côte à côte",
         switchToUnified: "Passer au diff unifié",
         switchToSplit: "Passer au diff côte à côte",
         options: "Options du diff",
-        inlineDiff: "Diff intégré",
+        inlineDiff: "Diff en ligne",
         hideWhitespace: "Masquer les espaces",
         showWhitespace: "Afficher les espaces",
         scrollLongLines: "Faire défiler les longues lignes",
-        wrapLongLines: "Enroulez les longues lignes",
-        collapseAllFolders: "Réduire tous les dossiers",
-        expandAllFolders: "Développer tous les dossiers",
-        collapseAllFiles: "Réduire tous les fichiers",
-        expandAllFiles: "Développer tous les fichiers",
-        refreshing: "Rafraîchissant",
-        refresh: "Rafraîchir",
-        refreshState: "Actualiser l'état de git et de {{brand}}",
-        failedRefresh: "Échec de l'actualisation de l'état git.",
-        emptyHiddenWhitespace: "Aucun changement visible après avoir masqué les espaces",
-        emptyUncommitted: "Aucune modification non validée",
-        seeUncommittedChanges: "Voir les modifications non validées",
-        seeCommittedChanges: "Voir les modifications validées",
-        emptyAgainstBase: "Aucun changement par rapport à{{baseRef}}",
-        checkingRepository: "Vérification du référentiel...",
-        notRepository: "Pas un dépôt git",
-        diffMode: "Mode différentiel",
-        uncommitted: "Non engagé",
-        committed: "Engagé",
-        branchUnknown: "Inconnu",
+        wrapLongLines: "Renvoyer les longues lignes à la ligne",
+        collapseAllFolders: "Replier tous les dossiers",
+        expandAllFolders: "Déplier tous les dossiers",
+        collapseAllFiles: "Replier tous les fichiers",
+        expandAllFiles: "Déplier tous les fichiers",
+        refreshing: "Actualisation…",
+        refresh: "Actualiser",
+        refreshState: "Actualiser l’état de git et de {{brand}}",
+        failedRefresh: "Impossible d’actualiser l’état git.",
+        seeUncommittedChanges: "Voir les modifications non commitées",
+        seeCommittedChanges: "Voir les modifications commitées",
+        checkingRepository: "Vérification du dépôt…",
+        notRepository: "Ce n’est pas un dépôt git",
+        diffMode: "Mode de diff",
+        uncommitted: "Non commité",
+        committed: "Commité",
+        branchUnknown: "Inconnue",
         base: "base",
         newFile: "Nouveau",
         deletedFile: "Supprimé",
@@ -949,81 +981,128 @@ export const fr: TranslationResources = {
         commits: {
           title: "Commits",
           countLabel: "{{count}} commits de l’espace de travail",
-          noneAhead: "Aucun commit en avance sur {{baseRef}} pour le moment",
+          noneAhead: "Aucun commit en avance sur {{baseRef}} pour l’instant",
           fileDiffEmpty: "Aucune modification à afficher",
-          fileDiffError: "Échec du chargement du diff du fichier",
+          fileDiffError: "Impossible de charger le diff du fichier",
           loading: "Chargement des commits…",
-          loadError: "Échec du chargement des commits",
-          empty: "Aucun commit pour le moment",
+          loadError: "Impossible de charger les commits",
+          empty: "Aucun commit pour l’instant",
         },
       },
       openInEditor: {
         open: "Ouvrir",
-        chooseEditor: "Choisir l'éditeur",
-        openIn: "Espace de travail ouvert dans{{target}}",
-        openFileIn: "Open {{fileName}} in {{target}}",
-        failedOpen: "Échec de l'ouverture de l'espace de travail",
+        chooseEditor: "Choisir l’éditeur",
+        openIn: "Ouvrir l’espace de travail dans {{target}}",
+        openFileIn: "Ouvrir {{fileName}} dans {{target}}",
+        failedOpen: "Impossible d’ouvrir l’espace de travail",
       },
       pr: {
         actions: {
           viewPullRequest: "Voir",
           openOn: "Ouvrir sur {{brand}}",
+          addToChat: "Ajouter à la conversation",
+          addAllToChat: "Tout ajouter à la conversation",
+          addingToChat: "Ajout…",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "Certaines vérifications demandent votre attention",
+            failure: "Certaines vérifications ont échoué",
+            pending: "Certaines vérifications ne sont pas terminées",
+            success: "Toutes les vérifications ont réussi",
+            none: "Aucune vérification",
+          },
+          count: {
+            actionRequired: "{{count}} à traiter",
+            warning: "{{count}} avec avertissement",
+            failure: "{{count}} en échec",
+            pending: "{{count}} en cours",
+            manual: "{{count}} manuelle(s)",
+            success: "{{count}} réussie(s)",
+            ignored: "{{count}} ignorée(s)",
+          },
+          detailOne: "Vérification : {{parts}}",
+          detailMany: "Vérifications : {{parts}}",
+          groupOne: {
+            actionRequired: "{{count}} vérification à traiter",
+            warning: "{{count}} vérification avec avertissement",
+            failure: "{{count}} vérification en échec",
+            pending: "{{count}} vérification en cours",
+            manual: "{{count}} vérification manuelle",
+            success: "{{count}} vérification réussie",
+            ignored: "{{count}} vérification ignorée",
+          },
+          groupMany: {
+            actionRequired: "{{count}} vérifications à traiter",
+            warning: "{{count}} vérifications avec avertissement",
+            failure: "{{count}} vérifications en échec",
+            pending: "{{count}} vérifications en cours",
+            manual: "{{count}} vérifications manuelles",
+            success: "{{count}} vérifications réussies",
+            ignored: "{{count}} vérifications ignorées",
+          },
         },
         checksSummary: {
-          passedLabel: "succès",
-          failedLabel: "échec",
+          passedLabel: "réussies",
+          failedLabel: "en échec",
           runningLabel: "en cours",
           passedAccessible: "Vérifications réussies",
           failedAccessible: "Vérifications en échec",
           runningAccessible: "Vérifications en cours",
         },
         sections: {
-          checks: "Chèques",
+          checks: "Vérifications",
           pipeline: "Pipeline",
-          reviews: "Avis",
+          reviews: "Revues",
+          activity: "Activité",
         },
         empty: {
-          noJobs: "Aucune tâche",
-          loadingPipeline: "Chargement du pipeline...",
-          pipelineJobsLoadFailed: "Impossible de charger les tâches du pipeline",
-          allowedToFail: "autorisé à échouer",
+          noJobs: "Aucun job",
+          loadingPipeline: "Chargement du pipeline…",
+          pipelineJobsLoadFailed: "Impossible de charger les jobs du pipeline",
+          allowedToFail: "échec autorisé",
+          noActivity: "Aucune activité pour le moment",
         },
         approvals: "{{given}} sur {{required}} approbations",
         accessibility: {
-          pullRequest: "Demande de tirage #{{number}}",
-          pullRequest_mr: "Demande de fusion !{{number}}",
+          pullRequest: "Pull request #{{number}}",
+          pullRequest_mr: "Merge request !{{number}}",
+          commentActions: "Actions du commentaire",
+          threadActions: "Actions du fil",
           checkStatus: {
-            passed: "Réussi",
+            passed: "Réussie",
             failed: "Échec",
             warning: "Avertissement",
             actionRequired: "Action requise",
-            manual: "Manuel",
+            manual: "Manuelle",
             pending: "En attente",
-            skipped: "Ignoré",
-            cancelled: "Annulé",
+            skipped: "Ignorée",
+            cancelled: "Annulée",
           },
         },
         states: {
           draft: "Brouillon",
-          merged: "Fusionné",
-          closed: "Fermé",
-          open: "Ouvrir",
+          merged: "Fusionnée",
+          closed: "Fermée",
+          open: "Ouverte",
         },
         activity: {
-          commented: "Commenté",
-          approved: "Approuvé",
-          requestedChanges: "Modifications demandées",
-          reviewed: "Révisé",
+          commented: "A commenté",
+          approved: "A approuvé",
+          requestedChanges: "A demandé des modifications",
+          reviewed: "A relu",
         },
         time: {
-          justNow: "tout à l' heure",
+          justNow: "à l’instant",
         },
         thread: {
           discussion: "Fil de discussion",
+          resolved: "Résolu",
+          outdated: "Obsolète",
         },
         errors: {
-          statusLoadFailed: "Impossible de charger le statut de la demande d'extraction",
-          activityLoadFailed: "Impossible de charger l'activité de demande d'extraction",
+          statusLoadFailed: "Impossible de charger le statut de la pull request",
+          activityLoadFailed: "Impossible de charger l’activité de la pull request",
         },
       },
       forgeSetup: {
@@ -1052,7 +1131,7 @@ export const fr: TranslationResources = {
       orange: "Orange",
       pink: "Rose",
       indigo: "Indigo",
-      teal: "Sarcelle",
+      teal: "Bleu canard",
       red: "Rouge",
       amber: "Ambre",
       blue: "Bleu",
@@ -1071,16 +1150,35 @@ export const fr: TranslationResources = {
       color: "Couleur",
       save: "Enregistrer",
       delete: "Supprimer",
-      deleteTitle: "Supprimer {{name}} ?",
+      deleteTitle: "Supprimer {{name}} ?",
       deleteMessage_one: "Cela retire l’étiquette de {{count}} espace de travail sur cet hôte.",
       deleteMessage_other: "Cela retire l’étiquette de {{count}} espaces de travail sur cet hôte.",
       offline: "Cet hôte est hors ligne.",
       updateHost: "Mettez à jour cet hôte pour gérer les étiquettes.",
     },
   },
+  changelog: {
+    title: "Nouveautés",
+    installed: "Installée",
+    showMore: "Afficher plus",
+    openWebsite: "Journal des modifications complet",
+    error: {
+      title: "Impossible de charger le journal des modifications",
+      description: "Vérifiez votre connexion et réessayez.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "Groupe {{label}}",
+    statusBucket: {
+      needsInput: "Attend une réponse",
+      failed: "Échec",
+      readyToReview: "À relire",
+      working: "En cours",
+      done: "Terminé",
+    },
     display: {
-      trigger: "Préférences d'affichage",
+      showBackground: "Afficher les espaces en arrière-plan",
+      trigger: "Préférences d’affichage",
       heading: "Affichage",
       grouping: {
         label: "Regroupement",
@@ -1102,7 +1200,7 @@ export const fr: TranslationResources = {
         checks: "Vérifications",
         services: "Services",
         labels: "Libellés",
-        diff: "Statistiques de diff",
+        diff: "Statistiques du diff",
         timestamp: "Dernière activité",
       },
       checks: {
@@ -1130,8 +1228,8 @@ export const fr: TranslationResources = {
     },
     host: {
       noHost: "Aucun hôte",
-      switchTitle: "Changer d'hôte",
-      searchPlaceholder: "Rechercher des hôtes...",
+      switchTitle: "Changer d’hôte",
+      searchPlaceholder: "Rechercher des hôtes…",
     },
     actions: {
       addProject: "Ajouter un projet",
@@ -1140,6 +1238,9 @@ export const fr: TranslationResources = {
       settings: "Paramètres",
       closeSidebar: "Fermer la barre latérale",
     },
+    footer: {
+      usage: "Utilisation",
+    },
     help: {
       trigger: "Aide et assistance",
       sectionHelp: "Aide",
@@ -1153,93 +1254,93 @@ export const fr: TranslationResources = {
     },
     sections: {
       sessions: "Historique",
-      search: "Rechercher",
+      search: "Recherche",
       schedules: "Planifications",
     },
     worktreeSetup: {
-      title: "Configurer les scripts d'arbre de travail",
+      title: "Configurer les scripts de worktree",
       description:
-        "Ajoutez des commandes de configuration pour que les nouveaux arbres de travail puissent installer des dépendances et se préparer automatiquement.",
+        "Ajoutez des commandes de configuration pour que les nouveaux worktrees installent leurs dépendances et se préparent automatiquement.",
       openProjectSettings: "Ouvrir les paramètres du projet",
     },
     project: {
       actions: {
         menu: "Actions du projet",
         openSettings: "Ouvrir les paramètres du projet",
-        openNewWindow: "Open in new window",
-        openNewWindowFailed: "Couldn't open a new window",
-        openFolder: "Open in file manager",
-        openFolderFailed: "Couldn't open folder",
-        remove: "Supprimer le projet",
-        removing: "Suppression...",
+        openNewWindow: "Ouvrir dans une nouvelle fenêtre",
+        openNewWindowFailed: "Impossible d’ouvrir une nouvelle fenêtre",
+        openFolder: "Ouvrir dans le gestionnaire de fichiers",
+        openFolderFailed: "Impossible d’ouvrir le dossier",
+        remove: "Retirer le projet",
+        removing: "Retrait…",
       },
       confirmations: {
-        removeTitle: "Supprimer le projet?",
+        removeTitle: "Retirer le projet ?",
         removeMessage:
-          "Supprimer «{{projectName}}» de la barre latérale?\n\nLes fichiers sur le disque ne seront pas modifiés.",
+          "Retirer « {{projectName}} » de la barre latérale ?\n\nLes fichiers sur le disque ne seront pas modifiés.",
         removeConfirm: "Retirer",
         cancel: "Annuler",
       },
       toasts: {
-        hostDisconnected: "Hostn'est pas connecté",
-        removeFailed: "Échec de la suppression de certains espaces de travail",
-        updateHostToRemove: "Mettez à jour le host pour supprimer des projets.",
+        hostDisconnected: "L’hôte n’est pas connecté",
+        removeFailed: "Impossible de retirer certains espaces de travail",
+        updateHostToRemove: "Mettez à jour l’hôte pour retirer des projets.",
       },
       empty: {
-        title: "Aucun projet pour l'instant",
+        title: "Aucun projet pour l’instant",
         description: "Ajoutez un projet pour commencer",
       },
     },
     workspace: {
       status: {
-        serviceRunning: "Service {{name}} en cours",
+        serviceRunning: "Service {{name}} en cours d’exécution",
         serviceUnhealthy: "Service {{name}} en échec",
-        creating: "Création...",
+        creating: "Création…",
       },
       checks: {
-        passed: "Réussis : {{count}}",
-        failed: "Échecs : {{count}}",
-        warning: "Avertissements : {{count}}",
-        actionRequired: "Action requise : {{count}}",
-        manual: "Manuels : {{count}}",
-        pending: "En attente : {{count}}",
+        passed: "Réussies : {{count}}",
+        failed: "Échouées : {{count}}",
+        warning: "Avertissements : {{count}}",
+        actionRequired: "Action requise : {{count}}",
+        manual: "Manuelles : {{count}}",
+        pending: "En attente : {{count}}",
       },
       actions: {
-        menu: "ActionsWorkspace",
+        menu: "Actions de l’espace de travail",
         newWorkspace: "Nouvel espace de travail",
         showMore: "Afficher plus",
         showLess: "Afficher moins",
-        createWorkspaceFor: "Créer un nouvel espace de travail pour{{projectName}}",
+        createWorkspaceFor: "Créer un espace de travail pour {{projectName}}",
         copyPath: "Copier le chemin",
         copyBranchName: "Copier le nom de la branche",
-        rename: "Renommer l'espace de travail",
+        rename: "Renommer l’espace de travail",
         pin: "Épingler en haut",
         unpin: "Désépingler",
-        archive: "Archive",
+        archive: "Archiver",
         archiveWorkspace: "Archiver l’espace de travail",
         hideFromSidebar: "Masquer de la barre latérale",
-        archiving: "Archivage...",
-        hiding: "Dissimulation...",
+        archiving: "Archivage…",
+        hiding: "Masquage…",
       },
       confirmations: {
-        hideTitle: "Masquer l'espace de travail?",
+        hideTitle: "Masquer l’espace de travail ?",
         hideMessage:
-          "Masquer «{{workspaceName}}» dans la barre latérale?\n\nLes fichiers sur le disque ne seront pas modifiés.",
-        hideConfirm: "Cacher",
+          "Masquer « {{workspaceName}} » de la barre latérale ?\n\nLes fichiers sur le disque ne seront pas modifiés.",
+        hideConfirm: "Masquer",
         cancel: "Annuler",
       },
       rename: {
-        title: "Renommer l'espace de travail",
-        submit: "Rebaptiser",
-        invalidBranchName: "Nom de succursale invalide",
+        title: "Renommer l’espace de travail",
+        submit: "Renommer",
+        invalidBranchName: "Nom de branche invalide",
       },
       toasts: {
-        workspacePathUnavailable: "CheminWorkspacenon disponible",
+        workspacePathUnavailable: "Chemin de l’espace de travail indisponible",
         pathCopied: "Chemin copié",
-        branchNameCopied: "Nom de la succursale copié",
-        hostDisconnected: "Hostn'est pas connecté",
-        hideFailed: "Échec du masquage de l'espace de travail",
-        archiveFailed: "Échec de l'archivage de l'espace de travail",
+        branchNameCopied: "Nom de branche copié",
+        hostDisconnected: "L’hôte n’est pas connecté",
+        hideFailed: "Impossible de masquer l’espace de travail",
+        archiveFailed: "Impossible d’archiver l’espace de travail",
       },
     },
   },
@@ -1258,34 +1359,34 @@ export const fr: TranslationResources = {
     },
     titlePlaceholder: "Titre (facultatif)",
     errors: {
-      hostDisconnected: "Hostn'est pas connecté",
-      createWorktreeFailed: "Échec de la création de l'arbre de travail",
-      composerStateRequired: "L'état du compositeur est requis",
+      hostDisconnected: "L’hôte n’est pas connecté",
+      createWorktreeFailed: "Impossible de créer le worktree",
+      composerStateRequired: "L’état de la zone de saisie est requis",
       selectModel: "Sélectionnez un modèle",
     },
     tooltips: {
-      project: "Choose the project",
-      host: "Choose the host",
-      isolation: "Choose the isolation level",
-      startingRef: "Choisissez par où commencer",
-      launch: "Choose what to launch",
+      project: "Choisir le projet",
+      host: "Choisir l’hôte",
+      isolation: "Choisir le niveau d’isolation",
+      startingRef: "Choisir le point de départ",
+      launch: "Choisir quoi lancer",
     },
     refPicker: {
-      startingRef: "Réf de départ",
-      intoBase: "dans {{baseRef}}",
-      searching: "Recherche...",
+      startingRef: "Réf. de départ",
+      intoBase: "vers {{baseRef}}",
+      searching: "Recherche…",
       noMatchingRefs: "Aucune référence correspondante.",
-      searchPlaceholder: "Rechercher des succursales et des PR",
-      title: "Commencer à partir de",
+      searchPlaceholder: "Rechercher des branches et des PR",
+      title: "Partir de",
     },
     launch: {
-      title: "What to launch",
+      title: "Que lancer ?",
       chat: "Chat",
       terminal: "Terminal",
-      manageProfiles: "Manage profiles",
-      submit: "Launch",
-      promptPlaceholder: "Prompt {{name}}",
-      commandPlaceholder: "Run a command, or leave empty for a blank terminal",
+      manageProfiles: "Gérer les profils",
+      submit: "Lancer",
+      promptPlaceholder: "Prompt pour {{name}}",
+      commandPlaceholder: "Saisissez une commande, ou laissez vide pour un terminal vierge",
     },
   },
   desktop: {
@@ -1296,180 +1397,180 @@ export const fr: TranslationResources = {
       close: "Fermer la fenêtre",
     },
     quitting: {
-      title: "QuitterPaseo...",
-      detail: "Arrêt du démon local.",
+      title: "Fermeture de Paseo…",
+      detail: "Arrêt du daemon local.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Daemon",
       status: {
         title: "Statut",
-        builtInOnly: "Seul le démon de bureau intégré est affiché ici",
-        running: "en cours d'exécution",
-        notRunning: "ne fonctionne pas",
-        pid: "PID{{pid}}",
+        builtInOnly: "Seul le daemon intégré à l’application de bureau est affiché ici",
+        running: "en cours d’exécution",
+        notRunning: "arrêté",
+        pid: "PID {{pid}}",
       },
       management: {
-        title: "Gérer le démon intégré",
-        hint: "LaissezPaseodémarrer et arrêter le démon intégré",
-        pauseTitle: "Suspendre le démon intégré",
+        title: "Gérer le daemon intégré",
+        hint: "Laisser Paseo démarrer et arrêter le daemon intégré",
+        pauseTitle: "Suspendre le daemon intégré",
         pauseMessage:
-          "Cela arrêtera immédiatement le démon intégré. Les agents en cours d'exécution et les terminaux connectés au démon intégré seront arrêtés.",
-        pauseAndStop: "Pause et arrêt",
+          "Le daemon intégré sera arrêté immédiatement. Les agents en cours et les terminaux connectés au daemon intégré seront arrêtés.",
+        pauseAndStop: "Suspendre et arrêter",
         registrationFailed:
-          "Built-in daemon started, but Paseo could not save the localhost connection. Toggle daemon management off and on again, or add localhost manually.",
+          "Le daemon intégré a démarré, mais Paseo n’a pas pu enregistrer la connexion localhost. Désactivez puis réactivez la gestion du daemon, ou ajoutez localhost manuellement.",
         pausedStopFailed:
-          "La gestion du démon intégré a été suspendue, maisPaseon'a ​​pas pu arrêter le démon.",
-        updateFailed: "Impossible de mettre à jour la gestion des démons intégrés.",
+          "La gestion du daemon intégré a été suspendue, mais Paseo n’a pas pu arrêter le daemon.",
+        updateFailed: "Impossible de mettre à jour la gestion du daemon intégré.",
       },
       keepRunning: {
-        title: "Laisser le démon fonctionner après avoir quitté",
-        hint: "Daemoncontinue de fonctionner lorsque vous quittezPaseo",
+        title: "Laisser le daemon tourner après la fermeture",
+        hint: "Le daemon continue de tourner quand vous quittez Paseo",
       },
       logs: {
         title: "Fichier journal",
-        modalTitle: "JournauxDaemon",
+        modalTitle: "Journaux du daemon",
         unavailable: "Chemin du journal indisponible",
         empty: "(le fichier journal est vide)",
         copied: "Chemin du journal copié.",
         copyFailed: "Impossible de copier le chemin du journal.",
-        open: "Journaux ouverts",
+        open: "Ouvrir les journaux",
         copyPath: "Copier le chemin",
       },
       fullStatus: {
         title: "Statut complet",
-        modalTitle: "StatutDaemon",
-        hint: "Exécute`paseo daemon status`et affiche la sortie",
-        view: "Afficher l'état",
+        modalTitle: "Statut du daemon",
+        hint: "Exécute `paseo daemon status` et affiche la sortie",
+        view: "Afficher le statut",
         copied: "Statut copié dans le presse-papiers.",
-        fetchFailed: "Échec de la récupération de l'état du démon:{{message}}",
+        fetchFailed: "Impossible de récupérer le statut du daemon : {{message}}",
       },
       advancedSettings: "Paramètres avancés",
-      openAdvancedSettings: "Ouvrir les paramètres avancés du démon",
+      openAdvancedSettings: "Ouvrir les paramètres avancés du daemon",
       versionMismatch:
-        "Les versions de l'application et du démon ne correspondent pas. Mettez à jour les deux vers la même version pour une meilleure expérience.",
-      loadFailed: "Impossible de charger l'état du démon de bureau.",
+        "Les versions de l’application et du daemon ne correspondent pas. Mettez-les à jour vers la même version pour une meilleure expérience.",
+      loadFailed: "Impossible de charger le statut du daemon de l’application de bureau.",
     },
     updates: {
       status: {
-        checking: "Vérification des mises à jour de l'application...",
-        installing: "Installation de la mise à jour de l'application...",
-        upToDate: "L'application est à jour.",
-        upToDateWithLastChecked: "Up to date. Last checked at {{time}}.",
-        pending: "Nous vous informerons lorsque la mise à jour sera prête.",
+        checking: "Recherche de mises à jour de l’application…",
+        installing: "Installation de la mise à jour de l’application…",
+        upToDate: "L’application est à jour.",
+        upToDateWithLastChecked: "À jour. Dernière vérification à {{time}}.",
+        pending: "Nous vous préviendrons quand la mise à jour sera prête.",
         pendingWithLastChecked:
-          "Nous vous informerons lorsque la mise à jour sera prête. Dernière vérification à {{time}}.",
-        pendingWithVersion: "Mise à jour trouvée : {{version}}. Téléchargement...",
+          "Nous vous préviendrons quand la mise à jour sera prête. Dernière vérification à {{time}}.",
+        pendingWithVersion: "Mise à jour trouvée : {{version}}. Téléchargement…",
         pendingWithVersionAndLastChecked:
-          "Mise à jour trouvée : {{version}}. Téléchargement... Dernière vérification à {{time}}.",
-        availableWithVersion: "Mise à jour prête:{{version}}",
+          "Mise à jour trouvée : {{version}}. Téléchargement… Dernière vérification à {{time}}.",
+        availableWithVersion: "Mise à jour prête : {{version}}",
         availableWithVersionAndLastChecked:
-          "Mise à jour prête:{{version}}. Dernière vérification à {{time}}.",
-        available: "Une mise à jour de l'application est prête à être installée.",
+          "Mise à jour prête : {{version}}. Dernière vérification à {{time}}.",
+        available: "Une mise à jour de l’application est prête à être installée.",
         availableWithLastChecked:
-          "Une mise à jour de l'application est prête à être installée. Dernière vérification à {{time}}.",
-        installed: "Mise à jour de l'application installée. Redémarrage requis.",
-        failed: "Échec de la mise à jour de l'application.",
-        idle: "L'état de la mise à jour n'a pas encore été vérifié.",
+          "Une mise à jour de l’application est prête à être installée. Dernière vérification à {{time}}.",
+        installed: "Mise à jour de l’application installée. Redémarrage requis.",
+        failed: "Échec de la mise à jour de l’application.",
+        idle: "Les mises à jour n’ont pas encore été vérifiées.",
       },
-      installError: "Impossible d'installer la mise à jour de l'application de bureau.",
+      installError: "Impossible d’installer la mise à jour de l’application de bureau.",
       callout: {
         installingTitle: "Installation de la mise à jour",
-        failedTitle: "La mise à jour a échoué",
+        failedTitle: "Échec de la mise à jour",
         availableTitle: "Mise à jour disponible",
-        genericError: "Quelque chose s'est mal passé.",
-        whatsNew: "Quoi de neuf",
-        installingAction: "Installation...",
+        genericError: "Une erreur s’est produite.",
+        whatsNew: "Nouveautés",
+        installingAction: "Installation…",
         installAndRestart: "Installer et redémarrer",
-        installingDescription: "Installation et redémarrage...",
-        versionReady: "{{version}}est prêt à être installé.",
+        installingDescription: "Installation et redémarrage…",
+        versionReady: "La version {{version}} est prête à être installée.",
         newVersionReady: "Une nouvelle version est prête à être installée.",
         restartWarning:
-          "La mise à niveau de l'application arrêtera l'exécution des agents et fermera les sessions de terminal.",
+          "La mise à jour de l’application arrêtera les agents en cours et fermera les sessions de terminal.",
       },
     },
     settings: {
-      loadFailed: "Impossible de charger les paramètres du bureau.",
-      saveFailed: "Impossible d'enregistrer les paramètres du bureau.",
+      loadFailed: "Impossible de charger les paramètres de l’application de bureau.",
+      saveFailed: "Impossible d’enregistrer les paramètres de l’application de bureau.",
     },
     rosetta: {
-      title: "Téléchargez la versionApple Silicon",
-      runningIntel: "Vous exécutez la versionInteldePaseosousRosettasurApple Silicon.",
+      title: "Téléchargez la version Apple Silicon",
+      runningIntel: "Vous utilisez la version Intel de Paseo via Rosetta sur Apple Silicon.",
       highCpu:
-        "Cela entraîne une utilisation élevée du processeur. Téléchargez la versionApple Siliconpour le réparer.",
+        "Cela entraîne une forte utilisation du processeur. Téléchargez la version Apple Silicon pour corriger le problème.",
       download: "Télécharger",
     },
     permissions: {
       notifications: {
-        allowed: "Les notifications sont autorisées par le système d'exploitation.",
+        allowed: "Les notifications sont autorisées par le système.",
         denied: "Les notifications sont refusées dans les paramètres système.",
-        notGranted: "Les notifications n'ont pas encore été accordées.",
+        notGranted: "Les notifications n’ont pas encore été autorisées.",
         webOnly:
-          "L’état des notifications sur le bureau est uniquement disponible sur l’exécution Web.",
+          "L’état des notifications de bureau n’est disponible que dans l’environnement web.",
         supported: "Les notifications de bureau sont prises en charge.",
         unsupported:
           "Les notifications de bureau ne sont pas prises en charge sur cette plateforme.",
-        apiUnavailable: "L'API de notification Web n'est pas disponible dans cet environnement.",
+        apiUnavailable: "L’API Web Notification n’est pas disponible dans cet environnement.",
         requestsWebOnly:
-          "Les demandes de notification sur le bureau sont uniquement disponibles sur l'exécution Web.",
-        requestUnavailable: "L'API de notification Web requestPermission() n'est pas disponible.",
-        requestFailed: "Échec de la demande d'autorisation de notification:{{message}}",
-        unexpectedState: "État d'autorisation de notification inattendu:{{state}}",
+          "Les demandes de notification de bureau ne sont disponibles que dans l’environnement web.",
+        requestUnavailable:
+          "La méthode requestPermission() de l’API Web Notification n’est pas disponible.",
+        requestFailed: "Échec de la demande d’autorisation de notification : {{message}}",
+        unexpectedState: "État d’autorisation de notification inattendu : {{state}}",
       },
       microphone: {
-        webOnly:
-          "L’état du microphone de bureau est uniquement disponible dans l’environnement d’exécution Web.",
-        navigatorUnavailable: "Le navigateur n'est pas disponible dans cet environnement.",
-        granted: "L’accès au microphone est accordé.",
-        denied: "L'accès au microphone est refusé dans les paramètres système.",
-        notGranted: "L'autorisation du microphone n'a pas encore été accordée.",
-        unexpectedState: "État d'autorisation inattendu du microphone:{{state}}",
+        webOnly: "L’état du microphone n’est disponible que dans l’environnement web.",
+        navigatorUnavailable: "L’objet navigator n’est pas disponible dans cet environnement.",
+        granted: "L’accès au microphone est autorisé.",
+        denied: "L’accès au microphone est refusé dans les paramètres système.",
+        notGranted: "L’accès au microphone n’a pas encore été autorisé.",
+        unexpectedState: "État d’autorisation du microphone inattendu : {{state}}",
         statusApiUnavailable:
-          "L’API d’état du microphone n’est pas disponible dans ce runtime. Utilisez Request pour vérifier l’accès.",
-        queryFailed: "Échec de l'interrogation de l'état du microphone:{{message}}",
-        captureUnavailable: "La capture du microphone n'est pas disponible dans cet environnement.",
+          "L’API d’état du microphone n’est pas disponible dans cet environnement. Utilisez « Demander » pour vérifier l’accès.",
+        queryFailed: "Impossible de consulter l’état du microphone : {{message}}",
+        captureUnavailable: "La capture du microphone n’est pas disponible dans cet environnement.",
         permissionApiUnavailable:
-          "L'API d'état des autorisations n'est pas disponible. Utilisez Request pour vérifier l’accès.",
+          "L’API d’état des autorisations n’est pas disponible. Utilisez « Demander » pour vérifier l’accès.",
         requestsWebOnly:
-          "Les demandes de microphone de bureau sont uniquement disponibles sur le runtime Web.",
+          "Les demandes d’accès au microphone ne sont disponibles que dans l’environnement web.",
         captureApiUnavailable:
-          "L'API de capture de microphone n'est pas disponible dans cet environnement.",
-        requestDenied:
-          "L'autorisation du microphone a été refusée par l'utilisateur ou le système.",
-        noDevice: "Aucun microphone n'a été trouvé.",
-        requestFailed: "Échec de la demande d'autorisation du microphone:{{message}}",
+          "L’API de capture du microphone n’est pas disponible dans cet environnement.",
+        requestDenied: "L’accès au microphone a été refusé par l’utilisateur ou le système.",
+        noDevice: "Aucun microphone trouvé.",
+        requestFailed: "Échec de la demande d’accès au microphone : {{message}}",
       },
       empty: {
-        notifications: "L'état de la notification n'a pas encore été vérifié.",
-        microphone: "L'état du microphone n'a pas encore été vérifié.",
+        notifications: "L’état des notifications n’a pas encore été vérifié.",
+        microphone: "L’état du microphone n’a pas encore été vérifié.",
       },
       testNotification: {
-        title: "Test de notificationPaseo",
-        body: "Si vous pouvez voir cela, les notifications sur le bureau fonctionnent.",
+        title: "Test de notification Paseo",
+        body: "Si vous voyez ceci, les notifications de bureau fonctionnent.",
         notDelivered:
-          "La notification n'a pas été délivrée. Vérifiez Paramètres système > Notifications.",
-        failed: "Échec de l'envoi de la notification.",
+          "La notification n’a pas été délivrée. Vérifiez Réglages système > Notifications.",
+        failed: "Échec de l’envoi de la notification.",
       },
     },
     integrations: {
       cli: {
-        statusFailed: "Impossible de vérifier l'état de l'installation deCLI.",
-        installFailed: "Impossible d'installer lePaseoCLI.",
+        statusFailed: "Impossible de vérifier l’installation de la CLI.",
+        installFailed: "Impossible d’installer la CLI Paseo.",
       },
     },
   },
   rootError: {
     title: "Paseo a rencontré un problème.",
-    body: "Réessayez pour recharger l'application. Si cela continue, joignez les détails ci-dessous au signalement.",
+    body: "Réessayez pour recharger l’application. Si le problème persiste, joignez les détails ci-dessous à votre signalement.",
     details: "Détails",
   },
   startup: {
-    errorTitle: "Quelque chose s'est mal passé",
+    errorTitle: "Une erreur s’est produite",
     errorDescription:
-      "Le serveur local n'a pas pu démarrer. Si cela continue, veuillez signaler le problème surGitHubet inclure les journaux ci-dessous.",
+      "Le serveur local n’a pas pu démarrer. Si le problème persiste, signalez-le sur GitHub en joignant les journaux ci-dessous.",
     logs: {
-      loading: "Chargement des journaux du démon...",
-      unavailable: "Aucun journal de démon disponible.",
-      loadFailed: "Impossible de charger les journaux du démon:{{message}}",
+      loading: "Chargement des journaux du daemon…",
+      unavailable: "Aucun journal du daemon disponible.",
+      loadFailed: "Impossible de charger les journaux du daemon : {{message}}",
     },
   },
   openProject: {
@@ -1479,24 +1580,24 @@ export const fr: TranslationResources = {
         description: "Ouvrez un dossier sur votre machine",
       },
       importSession: {
-        title: "Session d'importation",
-        description: "Apportez des sessionsCLIexternes récentes",
+        title: "Importer une session",
+        description: "Ouvrez une session Claude Code, Codex ou autre lancée dans un terminal",
       },
       setupProviders: {
-        title: "Fournisseurs d'installation",
-        description: "ConfigurezClaude Code,Codexet plus",
+        title: "Configurer les fournisseurs",
+        description: "Configurez Claude Code, Codex et plus encore",
       },
       pairDevice: {
         title: "Associer un appareil",
-        description: "Connectez votre téléphone à ce démon",
+        description: "Connectez votre téléphone à ce daemon",
       },
     },
   },
   projectPicker: {
-    placeholder: "Tapez pour rechercher...",
+    placeholder: "Tapez pour rechercher…",
     browse: "Parcourir…",
-    opening: "Projet d'ouverture...",
-    searching: "Recherche en cours...",
+    opening: "Ouverture du projet…",
+    searching: "Recherche…",
     empty: "Commencez à taper un chemin",
     errors: {
       directory_not_found: "Répertoire introuvable.",
@@ -1506,74 +1607,77 @@ export const fr: TranslationResources = {
   },
   branchSwitcher: {
     triggerTooltip: "Changer la branche de l’espace de travail",
-    currentBranch: "Branche actuelle:{{branchName}}. Appuyez pour changer de branche.",
-    placeholder: "Changer de branche...",
-    searchPlaceholder: "Filtrer les branches...",
+    currentBranch: "Branche actuelle : {{branchName}}. Appuyez pour changer de branche.",
+    placeholder: "Changer de branche…",
+    searchPlaceholder: "Filtrer les branches…",
     empty: "Aucune branche trouvée.",
     title: "Changer de branche",
-    uncommittedTitle: "Modifications non validées",
+    uncommittedTitle: "Modifications non commitées",
     uncommittedMessage:
-      "Vous avez des modifications non validées. Les ranger avant de changer de branche?",
-    stashAndSwitch: "Cachette et changement",
-    failedToStash: "Échec de la sauvegarde des modifications",
-    failedToSwitch: "Échec du changement de branche",
-    restoreStashTitle: "Restaurer les modifications cachées?",
+      "Vous avez des modifications non commitées. Les remiser avant de changer de branche ?",
+    stashAndSwitch: "Remiser et changer",
+    failedToStash: "Impossible de remiser les modifications",
+    failedToSwitch: "Impossible de changer de branche",
+    restoreStashTitle: "Restaurer les modifications remisées ?",
     restoreStashMessage:
-      "Cette branche a caché les modifications d'une session précédente. Souhaitez-vous les restaurer?",
+      "Cette branche contient des modifications remisées lors d’une session précédente. Voulez-vous les restaurer ?",
     restore: "Restaurer",
     later: "Plus tard",
-    stashRestored: "Modifications cachées restaurées",
+    stashRestored: "Modifications remisées restaurées",
   },
   agentAutocomplete: {
-    searchingWorkspace: "Recherche dans l'espace de travail...",
-    loadingCommands: "Chargement des commandes...",
+    searchingWorkspace: "Recherche dans l’espace de travail…",
+    loadingCommands: "Chargement des commandes…",
     noFiles: "Aucun fichier ou répertoire trouvé",
     noCommands: "Aucune commande trouvée",
     failedToLoad: "Échec du chargement",
+    chooseProjectForCommands: "Choisissez un projet pour afficher les commandes",
+    chooseModelForCommands: "Sélectionnez un modèle pour afficher les commandes",
   },
   loadOlderHistory: {
-    failed: "Impossible de charger l'ancien historique",
+    failed: "Impossible de charger l’historique plus ancien",
   },
   imageAttachmentPicker: {
     permissionTitle: "Autorisation requise",
-    permissionMessage: "Veuillez autoriser l'accès à votre photothèque pour joindre des images.",
+    permissionMessage: "Autorisez l’accès à votre photothèque pour joindre des images.",
     errorTitle: "Erreur",
-    failedToSelect: "Échec de la sélection de l'image",
+    failedToSelect: "Impossible de sélectionner l’image",
     dialogTitle: "Joindre des images",
     dialogFilterName: "Images",
   },
   workspaceSetup: {
     title: "Créer un espace de travail",
     errors: {
-      failedCreateWorktree: "Échec de la création de l'arbre de travail",
-      failedOpenProject: "Échec de l'ouverture du projet",
+      failedCreateWorktree: "Impossible de créer le worktree",
+      failedOpenProject: "Impossible d’ouvrir le projet",
       selectModel: "Sélectionnez un modèle",
-      hostDisconnected: "Hostn'est pas connecté",
-      pendingRequired: "Aucune configuration d'espace de travail n'est en attente",
-      composerStateRequired: "L'état du compositeur de configurationWorkspaceest requis",
+      hostDisconnected: "L’hôte n’est pas connecté",
+      pendingRequired: "Aucune configuration d’espace de travail en attente",
+      composerStateRequired:
+        "L’état de la zone de saisie de configuration de l’espace de travail est requis",
     },
   },
   onboarding: {
-    title: "Bienvenue surPaseo",
+    title: "Bienvenue dans Paseo",
     subtitle: "Connectez votre ordinateur pour commencer",
     actions: {
       settings: "Paramètres",
     },
   },
   modelSelector: {
-    title: "Sélectionnez le fournisseur",
-    selectModel: "Sélectionnez le modèle",
-    selectedModel: "Sélectionnez le modèle ({{model}})",
-    loading: "Chargement...",
+    title: "Sélectionner le fournisseur",
+    selectModel: "Sélectionner le modèle",
+    selectedModel: "Sélectionner le modèle ({{model}})",
+    loading: "Chargement…",
     loadingShort: "Chargement",
-    loadingSelector: "Chargement du sélecteur de modèle...",
+    loadingSelector: "Chargement du sélecteur de modèle…",
     error: "Erreur",
-    defaultModel: "Défaut",
+    defaultModel: "Par défaut",
     profiles: "Profils",
     providers: "Fournisseurs",
     model: "Modèle",
     editProfiles: "Modifier",
-    editProfilesLabel: "Modifier les profils d'agent",
+    editProfilesLabel: "Modifier les profils d’agent",
     createProfile: "Créer un profil",
     createProfileFromModel: "Créer un profil à partir de ce modèle",
     editProfileLabel: "Modifier {{name}}",
@@ -1581,46 +1685,61 @@ export const fr: TranslationResources = {
     modelCount: "{{count}} modèle",
     modelCountPlural: "{{count}} modèles",
     retry: "Réessayer",
-    retrying: "Nouvelle tentative...",
+    retrying: "Nouvelle tentative…",
     noMatches: "Aucun modèle ne correspond à votre recherche",
-    noMatchesForQuery: "Aucun modèle ne correspond à « {{query}} »",
-    searchAllPlaceholder: "Rechercher dans tous les modèles...",
-    searchPlaceholder: "Rechercher des modèles...",
-    openProviderSettings: "Ouvrir les paramètres{{provider}}",
+    noMatchesForQuery: "Aucun modèle ne correspond à « {{query}} »",
+    searchAllPlaceholder: "Rechercher dans tous les modèles…",
+    searchPlaceholder: "Rechercher des modèles…",
+    openProviderSettings: "Ouvrir les paramètres de {{provider}}",
   },
   providerCatalog: {
     title: "Ajouter un fournisseur",
-    search: "Fournisseurs de recherche",
+    search: "Rechercher des fournisseurs",
     noProviders: "Aucun fournisseur trouvé",
     actions: {
       add: "Ajouter",
-      adding: "Ajout",
+      adding: "Ajout…",
       installed: "Installé",
       cancel: "Annuler",
-      installInstructions: "Instructions d'installation",
-      installInstructionsFor: "Instructions d'installation{{provider}}",
+      installInstructions: "Instructions d’installation",
+      installInstructionsFor: "Instructions d’installation de {{provider}}",
     },
     errors: {
-      unableToInstall: "Impossible d'installer le fournisseur",
+      unableToInstall: "Impossible d’installer le fournisseur",
     },
   },
   providerSelection: {
-    defaultModel: "Défaut",
-    selectModel: "Sélectionnez le modèle",
-    loading: "Chargement...",
+    defaultModel: "Par défaut",
+    selectModel: "Sélectionner le modèle",
+    loading: "Chargement…",
     error: "Erreur",
     unavailable: "Indisponible",
     unknownError: "Erreur inconnue",
     readiness: {
-      initialPromptRequired: "Une invite initiale est requise",
-      noProviders: "Aucun fournisseur disponible sur l'hébergeur sélectionné",
-      modelDefaultsLoading: "Les valeurs par défaut du modèle sont toujours en cours de chargement",
-      noModelAvailable: "Aucun modèle n'est disponible pour le fournisseur sélectionné",
-      workspaceDirectoryNotFound: "RépertoireWorkspaceintrouvable",
-      hostDisconnected: "Hostn'est pas connecté",
+      initialPromptRequired: "Un prompt initial est requis",
+      noProviders: "Aucun fournisseur disponible sur l’hôte sélectionné",
+      modelDefaultsLoading: "Les valeurs par défaut du modèle sont en cours de chargement",
+      noModelAvailable: "Aucun modèle disponible pour le fournisseur sélectionné",
+      workspaceDirectoryNotFound: "Répertoire de l’espace de travail introuvable",
+      hostDisconnected: "L’hôte n’est pas connecté",
     },
   },
   pairing: {
+    hostPassword: {
+      title: "Mot de passe pour {{host}}",
+      label: "Mot de passe de l’hôte",
+    },
+    hostConfirmation: {
+      title: "Se connecter à cet hôte ?",
+      description:
+        "Cet hôte pourra exécuter du code dans cette app et accéder à vos autres hôtes connectés. Ne vous connectez que si vous le reconnaissez.",
+      descriptionChanged:
+        "Ce lien modifie la façon dont vous vous connectez à cet hôte. L’hôte pourra exécuter du code dans cette app et accéder à vos autres hôtes connectés. Ne vous connectez que si vous le reconnaissez.",
+      hostLabel: "Hôte",
+      fingerprintLabel: "Empreinte de la clé",
+      relayLabel: "Relais",
+      connect: "Se connecter",
+    },
     connectionMethods: {
       title: "Ajouter une connexion",
       direct: {
@@ -1629,22 +1748,22 @@ export const fr: TranslationResources = {
       },
       remoteSsh: {
         title: "SSH distant",
-        description: "Connectez-vous avec le client SSH de bureau.",
+        description: "Connexion via le client SSH de bureau.",
       },
       scanQr: {
-        title: "Scanner le codeQR",
-        description: "Connexion relais cryptée.",
+        title: "Scanner le code QR",
+        description: "Connexion chiffrée via le relais.",
       },
       pasteLink: {
-        title: "Coller le lien d'association",
-        description: "Connexion relais cryptée.",
+        title: "Coller le lien d’association",
+        description: "Connexion chiffrée via le relais.",
       },
     },
     direct: {
       title: "Connexion directe",
-      helper: "Saisissez l'adresse d'un serveurPaseo.",
+      helper: "Saisissez l’adresse d’un serveur Paseo.",
       fields: {
-        host: "Host",
+        host: "Hôte",
         port: "Port",
         password: "Mot de passe",
         optional: "Facultatif",
@@ -1652,9 +1771,9 @@ export const fr: TranslationResources = {
         connectionUri: "URI de connexion",
       },
       advanced: {
-        label: "Avancé",
-        show: "Afficher avancé",
-        hide: "Masquer avancé",
+        label: "Options avancées",
+        show: "Afficher les options avancées",
+        hide: "Masquer les options avancées",
       },
       passwordVisibility: {
         show: "Afficher le mot de passe",
@@ -1662,101 +1781,107 @@ export const fr: TranslationResources = {
       },
       actions: {
         cancel: "Annuler",
-        connect: "Connecter",
-        connecting: "De liaison...",
+        connect: "Se connecter",
+        connecting: "Connexion…",
       },
       errors: {
-        hostRequired: "Hostest requis",
+        hostRequired: "L’hôte est requis",
         invalidPort: "Le port doit être compris entre 1 et 65535",
         invalidConnection: "Connexion invalide",
-        failedTitle: "La connexion a échoué",
-        failedToConnect: "Nous n'avons pas réussi à nous connecter à{{endpoint}}.",
-        noAdditionalDetails: "{{detail}}(aucun détail supplémentaire fourni)",
-        timedOut: "La connexion a expiré. Vérifiez l'hôte/portet votre réseau.",
-        refused: "Connexion rejetée. Le serveur fonctionne-t-il à cette adresse?",
-        hostNotFound: "Hostintrouvable. Vérifiez le nom d'hôte et réessayez.",
-        hostUnreachable: "Hostest inaccessible. Vérifiez votre réseau et votre pare-feu.",
+        failedTitle: "Échec de la connexion",
+        failedToConnect: "Impossible de se connecter à {{endpoint}}.",
+        noAdditionalDetails: "{{detail}} (aucun détail supplémentaire)",
+        timedOut: "Délai de connexion dépassé. Vérifiez l’hôte, le port et votre réseau.",
+        refused: "Connexion refusée. Le serveur est-il bien lancé à cette adresse ?",
+        hostNotFound: "Hôte introuvable. Vérifiez le nom d’hôte et réessayez.",
+        hostUnreachable: "Hôte inaccessible. Vérifiez votre réseau et votre pare-feu.",
         tlsError:
-          "Erreur TLS. Les connexions directes utilisent SSL uniquement lorsqu'un terminateur TLS se trouve devant le démon.",
+          "Erreur TLS. Les connexions directes n’utilisent SSL que si un terminateur TLS est placé devant le daemon.",
         unableToConnect:
-          "Impossible de se connecter. Vérifiez l'hôte/portet que le démon est accessible.",
-        details: "Détails:{{detail}}",
+          "Impossible de se connecter. Vérifiez l’hôte, le port et que le daemon est joignable.",
+        details: "Détails : {{detail}}",
       },
     },
     remoteSsh: {
       title: "SSH distant",
-      helper: "Connectez-vous à un daemon Paseo sur l’hôte distant.",
+      helper: "Connectez-vous à un daemon Paseo qui tourne sur l’hôte distant.",
       fields: {
         target: "Hôte SSH",
+        password: "Mot de passe du daemon",
+        optional: "Facultatif",
+      },
+      passwordVisibility: {
+        show: "Afficher le mot de passe",
+        hide: "Masquer le mot de passe",
       },
       actions: {
         cancel: "Annuler",
-        connect: "Connecter",
-        connecting: "Connexion...",
+        connect: "Se connecter",
+        connecting: "Connexion…",
       },
       errors: {
         targetRequired: "L’hôte SSH est requis",
         invalidTarget: "Saisissez un hôte ssh:// valide",
-        failedToConnect: "Connexion SSH impossible. {{detail}}",
+        failedToConnect: "Impossible de se connecter en SSH. {{detail}}",
       },
     },
     link: {
-      title: "Coller le lien d'association",
-      helper: "Collez le lien d'appairage depuis votre serveur.",
-      label: "Lien d'appariement",
+      title: "Coller le lien d’association",
+      helper: "Collez le lien d’association fourni par votre serveur.",
+      label: "Lien d’association",
       errors: {
-        required: "Collez un lien d'appairage (.../#offer=...)",
-        missingOffer: "Le lien doit inclure#offer=...",
-        emptyOffer: "La charge utile de l'offre est vide",
-        invalid: "Lien d'association invalide",
-        unableToPair: "Impossible de coupler l'hôte",
+        required: "Collez un lien d’association (.../#offer=...)",
+        missingOffer: "Le lien doit contenir #offer=...",
+        emptyOffer: "Le contenu de l’offre est vide",
+        invalid: "Lien d’association invalide",
+        unableToPair: "Impossible d’associer l’hôte",
       },
       alert: {
-        failedTitle: "Échec du couplage",
+        failedTitle: "Échec de l’association",
       },
       actions: {
         cancel: "Annuler",
-        pair: "Paire",
-        pairing: "L'appariement...",
+        pair: "Associer",
+        pairing: "Association…",
       },
     },
     scan: {
-      title: "ScannerQR",
-      webUnavailableTitle: "Non disponible sur le Web",
+      title: "Scanner le code QR",
+      webUnavailableTitle: "Indisponible sur le web",
       webUnavailableBody:
-        "L'analyseQRn'est pas prise en charge dans la version Web. Utilisez plutôt \"Coller le lien\".",
+        "Le scan de code QR n’est pas pris en charge dans la version web. Utilisez plutôt « Coller le lien ».",
       backToSettings: "Retour aux paramètres",
       cameraPermissionTitle: "Autorisation de la caméra",
       cameraPermissionBody:
-        "Autorisez l'accès à la caméra pour scanner le code d'appairageQRà partir de votre démon.",
-      grantPermission: "Accorder l'autorisation",
-      pairing: "L'appariement...",
-      unableToPair: "Impossible de coupler l'hôte",
+        "Autorisez l’accès à la caméra pour scanner le code QR d’association affiché par votre daemon.",
+      grantPermission: "Accorder l’autorisation",
+      pairing: "Association…",
+      unableToPair: "Impossible d’associer l’hôte",
       errorTitle: "Erreur",
     },
     device: {
-      loadingOffer: "Chargement de l'offre d'association...",
-      failedToLoadOffer: "Échec du chargement de l'offre d'association.",
-      relayDisabled: "Le relais n'est pas activé. Activer le relais pour coupler un appareil.",
-      enableTitle: "Activer le relais ?",
+      loadingOffer: "Chargement de l’offre d’association…",
+      failedToLoadOffer: "Impossible de charger l’offre d’association.",
+      relayDisabled: "Le relais n’est pas activé. Activez-le pour associer un appareil.",
+      enableTitle: "Activer le relais ?",
       enableDescription:
-        "Le relais permet à cet appareil de se connecter depuis n’importe où. Le trafic de couplage est chiffré de bout en bout.",
+        "Le relais permet à cet appareil de se connecter depuis n’importe où. Le trafic d’association est chiffré de bout en bout.",
       relayDocs: "Fonctionnement du relais",
-      relayDocsAccessibility: "Lire comment fonctionne le relais Paseo",
+      relayDocsAccessibility: "Découvrir le fonctionnement du relais Paseo",
       enableRelay: "Activer le relais",
-      enablingRelay: "Activation...",
+      enablingRelay: "Activation…",
       notNow: "Pas maintenant",
       directConnectionHint:
         "Sans relais, connectez-vous directement via TCP, Tailscale ou un autre VPN. Aucun code QR n’est créé.",
       updateRequired: "Mettez à jour l’hôte pour activer le relais depuis Paseo Desktop.",
-      unavailable: "Offre de jumelage indisponible.",
-      hint: "Scannez ce codeQRavecPaseosur votre téléphone ou copiez le lien ci-dessous.",
+      unavailable: "Offre d’association indisponible.",
+      hint: "Scannez ce code QR avec Paseo sur votre téléphone, ou copiez le lien ci-dessous.",
       securityWarning:
         "Traitez ce lien d’association comme un mot de passe. Toute personne qui le possède peut accéder à ce daemon.",
-      qrUnavailable: "CodeQRindisponible.",
-      qrAccessibility: "Code QR de couplage",
+      qrUnavailable: "Code QR indisponible.",
+      qrAccessibility: "Code QR d’association",
       retry: "Réessayer",
-      copy: "Copie",
+      copy: "Copier",
       copied: "Copié",
     },
   },
@@ -1764,41 +1889,41 @@ export const fr: TranslationResources = {
     actions: {
       mute: "Couper la voix en temps réel",
       unmute: "Réactiver la voix en temps réel",
-      stop: "Arrêtez la voix en temps réel et interrompez le tour",
+      stop: "Arrêter la voix en temps réel et interrompre le tour",
     },
   },
   rewind: {
-    tooltip: "Revenez à ce message",
-    warning: "Cette action ne peut pas être annulée",
+    tooltip: "Revenir à ce message",
+    warning: "Cette action est irréversible",
     actions: {
-      conversation: "Rembobiner la conversation",
-      files: "Rembobiner les fichiers",
-      both: "Rembobiner la conversation et les fichiers",
+      conversation: "Revenir en arrière sur la conversation",
+      files: "Revenir en arrière sur les fichiers",
+      both: "Revenir en arrière sur la conversation et les fichiers",
     },
     errors: {
-      failed: "Échec du rembobinage de l'agent",
+      failed: "Impossible de faire revenir l’agent en arrière",
     },
   },
   diffViewer: {
-    empty: "Aucun changement à afficher",
+    empty: "Aucune modification à afficher",
   },
   serviceUrl: {
-    title: "Service ouvertURL",
-    message: "Ouvrir{{url}}?",
-    inPaseo: "DansPaseo",
+    title: "Ouvrir l’URL du service",
+    message: "Ouvrir {{url}} ?",
+    inPaseo: "Dans Paseo",
     externalBrowser: "Navigateur externe",
-    dontAskAgain: "Ne demande plus",
+    dontAskAgain: "Ne plus demander",
   },
   downloads: {
-    requestTokenFailed: "Échec de la demande du jeton de téléchargement.",
-    hostUnavailable: "L'hôte de téléchargement n'est pas disponible.",
-    cancelled: "Le téléchargement a été annulé.",
-    failed: "Échec du téléchargement du fichier.",
-    shareFile: "Partager un fichier",
-    shareFileNamed: "Partager{{fileName}}",
+    requestTokenFailed: "Impossible d’obtenir le token de téléchargement.",
+    hostUnavailable: "L’hôte de téléchargement est indisponible.",
+    cancelled: "Téléchargement annulé.",
+    failed: "Impossible de télécharger le fichier.",
+    shareFile: "Partager le fichier",
+    shareFileNamed: "Partager {{fileName}}",
   },
   menu: {
-    backdrop: "Toile de fond du menu",
+    backdrop: "Arrière-plan du menu",
   },
   subagents: {
     title: "Sous-agents",
@@ -1809,32 +1934,32 @@ export const fr: TranslationResources = {
     pillLabelNeedsInputOne: "1 attend une réponse",
     pillLabelNeedsInputMany: "{{count}} attendent une réponse",
     pillLabelReadyToReview: "{{count}} à relire",
-    detachAction: "Detacher {{label}}",
-    detachTooltip: "Detacher le sous-agent",
-    archiveAction: "Archiver{{label}}",
-    archiveTooltip: "Sous-agent d'archivage",
+    detachAction: "Détacher {{label}}",
+    detachTooltip: "Détacher le sous-agent",
+    archiveAction: "Archiver {{label}}",
+    archiveTooltip: "Archiver le sous-agent",
     archiveFinishedAction: "Archiver les sous-agents terminés",
     archiveFinishedRetry: "Réessayer ({{failed}}/{{total}})",
   },
   panels: {
     draft: {
       newAgent: "Nouvel agent",
-      creatingAgent: "Agent créateur",
+      creatingAgent: "Création de l’agent",
     },
     file: {
-      directoryMissing: "Répertoire Workspace introuvable.",
-      loading: "Chargement du fichier...",
+      directoryMissing: "Répertoire de l’espace de travail introuvable.",
+      loading: "Chargement du fichier…",
       noPreview: "Aucun aperçu disponible",
-      binaryPreviewUnavailable: "Aperçu binaire indisponible",
+      binaryPreviewUnavailable: "Aperçu indisponible pour un fichier binaire",
       tooLargeToDisplay: "Ce fichier est trop volumineux pour être affiché",
-      failedToLoad: "Échec du chargement du fichier",
-      failedToLoadPreview: "Échec du chargement de l'aperçu du fichier",
+      failedToLoad: "Impossible de charger le fichier",
+      failedToLoadPreview: "Impossible de charger l’aperçu du fichier",
       editor: {
-        fileSize: "Taille {{size}}",
+        fileSize: "Taille du fichier : {{size}}",
         lines: "{{count}} lignes",
-        editorStatus: "État de l’éditeur : {{status}}",
+        editorStatus: "État de l’éditeur : {{status}}",
         unsavedChanges: "Modifications non enregistrées",
-        saving: "Enregistrement...",
+        saving: "Enregistrement…",
         saveFailed: "Échec de l’enregistrement",
         changedOnDisk: "Modifié sur le disque",
         vimMode: "Mode Vim {{mode}}",
@@ -1847,7 +1972,7 @@ export const fr: TranslationResources = {
         conflictDescription: "Le contenu local a été conservé. Choisissez la version à garder.",
         overwrite: "Écraser",
         reload: "Recharger",
-        reloadTitle: "Recharger depuis le disque ?",
+        reloadTitle: "Recharger depuis le disque ?",
         reloadMessage: "Vos modifications locales seront perdues.",
       },
     },
@@ -1858,110 +1983,127 @@ export const fr: TranslationResources = {
       chooseFile: "Choisissez un fichier",
     },
     pullRequest: {
-      label: "Demande de fusion",
-      subtitle: "Détails de la demande de fusion",
-      emptyTitle: "Aucune demande de fusion pour le moment",
+      label: "Pull request",
+      subtitle: "Détails de la pull request",
+      emptyTitle: "Aucune pull request pour l’instant",
       emptyDescription:
-        "Créez une demande de fusion pour cette copie de travail afin d’afficher ses détails ici.",
+        "Créez une pull request pour cette copie de travail afin d’en voir les détails ici.",
     },
     diff: {
       changesLabel: "Modifications",
       diffLabel: "Diff",
-      changesSubtitle: "Différences de l'arbre de travail",
-      commitSubtitle: "Différences du commit",
-      uncommittedSubtitle: "Modifications non validées",
+      changesSubtitle: "Diff de l’arbre de travail",
+      commitSubtitle: "Diff du commit",
+      uncommittedSubtitle: "Modifications non commitées",
       baseSubtitle: "Comparé à {{baseRef}}",
-      directoryMissing: "Répertoire Workspace introuvable.",
+      directoryMissing: "Répertoire de l’espace de travail introuvable.",
       empty: "Aucune modification",
-      loadError: "Échec du chargement des différences",
-      capabilityMissing: "Mettez à jour l'hôte pour voir les différences des commits.",
+      loadError: "Impossible de charger le diff",
+      capabilityMissing: "Mettez à jour l’hôte pour afficher le diff des commits.",
     },
   },
   toolCallDetails: {
     error: "Erreur",
     empty: "Aucun détail supplémentaire disponible",
     subAgentActivity: "Activité du sous-agent",
-    input: "Saisir",
-    output: "Sortir",
+    input: "Entrée",
+    output: "Sortie",
   },
   toolCallGroup: {
     editedFiles: {
-      one: "a modifié {{count}} fichier",
-      other: "a modifié {{count}} fichiers",
+      one: "{{count}} fichier modifié",
+      other: "{{count}} fichiers modifiés",
     },
     commands: {
-      one: "a exécuté {{count}} commande",
-      other: "a exécuté {{count}} commandes",
+      one: "{{count}} commande exécutée",
+      other: "{{count}} commandes exécutées",
     },
     readFiles: {
-      one: "a lu {{count}} fichier",
-      other: "a lu {{count}} fichiers",
+      one: "{{count}} fichier lu",
+      other: "{{count}} fichiers lus",
     },
     searches: {
-      one: "a effectué {{count}} recherche",
-      other: "a effectué {{count}} recherches",
+      one: "{{count}} recherche effectuée",
+      other: "{{count}} recherches effectuées",
     },
     otherTools: {
-      one: "a utilisé {{count}} autre outil",
-      other: "a utilisé {{count}} autres outils",
+      one: "{{count}} autre outil utilisé",
+      other: "{{count}} autres outils utilisés",
     },
     paseoCalls: {
-      one: "a appelé Paseo {{count}} fois",
-      other: "a appelé Paseo {{count}} fois",
+      one: "{{count}} appel à Paseo",
+      other: "{{count}} appels à Paseo",
     },
     and: "et",
   },
   renameModal: {
-    rename: "Rebaptiser",
-    saving: "Sauvegarde...",
+    rename: "Renommer",
+    saving: "Enregistrement…",
   },
   sidebarCallout: {
-    dismiss: "Rejeter",
+    dismiss: "Ignorer",
   },
   contextWindow: {
-    title: "Fenêtre contextuelle",
-    used: "{{percentage}}% utilisé",
-    tokens: "Jetons{{used}}/{{max}}",
-    sessionCost: "Coût de la séance{{cost}}",
-    accessibility: "Fenêtre contextuelle{{percentage}}% utilisé",
+    noData: "Aucune donnée de contexte",
+    accessibilityNoData: "Fenêtre de contexte : aucune donnée de contexte",
+    title: "Fenêtre de contexte",
+    used: "{{percentage}} % utilisés",
+    tokens: "{{used}} / {{max}} tokens",
+    sessionCost: "Coût de la session : {{cost}}",
+    accessibility: "Fenêtre de contexte : {{percentage}} % utilisés",
   },
   review: {
+    feedback: {
+      send: "Envoyer les commentaires ({{count}})",
+      sending: "Envoi des commentaires ({{count}})",
+      chooseAgent: "Choisir un agent",
+      sent: "Commentaires envoyés à {{recipient}}",
+      "no-agents":
+        "Ouvrez un onglet d’agent dans cet espace de travail pour envoyer les commentaires.",
+      disconnected: "Connectez-vous à l’hôte pour envoyer les commentaires.",
+      "no-context": "Les commentaires enregistrés ne correspondent plus à ce diff.",
+      failed: "Échec de l’envoi des commentaires. Réessayez.",
+      prompt: "Veuillez traiter cette revue de code.",
+    },
     comment: {
-      add: "Ajouter un commentaire",
-      edit: "Modifier le commentaire de l'avis",
-      delete: "Supprimer le commentaire de l'avis",
-      label: "Revoir le commentaire",
+      add: "Ajouter un commentaire de revue",
+      edit: "Modifier le commentaire de revue",
+      delete: "Supprimer le commentaire de revue",
+      label: "Commentaire de revue",
       placeholder: "Laisser un commentaire",
       cancel: "Annuler",
-      cancelAccessibility: "Annuler le commentaire de révision",
-      save: "Commentaire",
-      saveAccessibility: "Enregistrer le commentaire de l'avis",
+      cancelAccessibility: "Annuler le commentaire de revue",
+      save: "Commenter",
+      saveAccessibility: "Enregistrer le commentaire de revue",
     },
   },
   settings: {
     title: "Paramètres",
-    loading: "Chargement des paramètres...",
+    loading: "Chargement des paramètres…",
     groups: {
       app: "Application",
-      host: "Host",
+      host: "Hôte",
     },
     hostPicker: {
-      switchHost: "Changer d'hôte",
-      local: "Locale",
+      switchHost: "Changer d’hôte",
+      local: "Local",
     },
-    backToWorkspace: "Dos",
+    backToWorkspace: "Retour",
     addHost: "Ajouter un hôte",
-    enableBuiltInDaemon: "Activer le démon intégré",
+    enableBuiltInDaemon: "Activer le daemon intégré",
     projects: "Projets",
     projectList: {
-      hostLoadFailed: "Impossible de charger les projets depuis l'hôte{{hostName}}:{{message}}",
-      editProject: "Modifier{{projectName}}",
+      hostLoadFailed: "Impossible de charger les projets depuis l’hôte {{hostName}} : {{message}}",
+      editProject: "Modifier {{projectName}}",
     },
-    groupInfo: "À propos de{{title}}",
+    groupInfo: "À propos de {{title}}",
     sections: {
       general: "Général",
+      chat: "Discussion",
       appearance: "Apparence",
-      layout: en.settings.sections.layout,
+      sidebar: "Barre latérale",
+      terminal: "Terminal",
+      browser: "Navigateur",
       editor: "Éditeur",
       shortcuts: "Raccourcis",
       integrations: "Intégrations",
@@ -1974,32 +2116,32 @@ export const fr: TranslationResources = {
     editor: {
       title: "Éditeur",
       vimKeybindings: "Raccourcis Vim",
-      vimHint: "S’applique aux fichiers source sur le web et le bureau.",
+      vimHint: "S’applique aux fichiers source dans l’app web et l’app de bureau.",
     },
     notifications: {
       title: "Notifications",
       permission: "Autorisation des notifications",
       refreshAccessibility: "Actualiser l’autorisation des notifications",
       playSound: "Émettre un son",
-      playSoundHint: "Émet un son lorsqu’une notification de bureau arrive",
+      playSoundHint: "Émet un son à l’arrivée d’une notification de bureau",
       test: "Tester la notification",
       testHint: "Envoie une notification avec ces réglages",
-      permissionRequired: "Autorisez l’accès aux notifications avant le test",
+      permissionRequired: "Autorisez les notifications avant de tester",
       send: "Envoyer",
-      sending: "Envoi...",
+      sending: "Envoi…",
       sentTitle: "Notification de test envoyée",
       sentDescription: "Paseo a transmis la notification au système d’exploitation.",
       sendFailedTitle: "Impossible d’envoyer la notification de test",
     },
     hostSections: {
       projects: "Projets",
-      connections: "Relations",
+      connections: "Connexions",
       agents: "Agents",
       metadata: "Métadonnées",
-      workspaces: "Workspaces",
+      workspaces: "Espaces de travail",
       providers: "Fournisseurs",
       usage: "Utilisation",
-      terminals: "Terminals",
+      terminals: "Terminaux",
       plugins: "Plugins",
       host: "Aperçu",
     },
@@ -2020,56 +2162,54 @@ export const fr: TranslationResources = {
     },
     general: {
       title: "Général",
+      sending: "Envoi",
       browserData: {
         title: "Données du navigateur",
         siteData: "Cookies et données des sites",
         description:
           "Les onglets du navigateur partagent les connexions et les données des sites dans Paseo.",
         clear: "Effacer les données du navigateur",
-        clearing: "Effacement...",
-        confirmTitle: "Effacer les données du navigateur ?",
+        clearing: "Effacement…",
+        confirmTitle: "Effacer les données du navigateur ?",
         confirmMessage: "Vous serez déconnecté des sites et les onglets ouverts seront rechargés.",
         success: "Données du navigateur effacées.",
-        error: "Impossible d'effacer les données du navigateur.",
+        error: "Impossible d’effacer les données du navigateur.",
       },
       defaultSend: {
         label: "Envoi par défaut",
         descriptions: {
           interrupt:
-            "Lorsque l'agent est en cours d'exécution, Entrée interrompt. Commande/Ctrl+Entrée met en file d'attente.",
+            "Quand l’agent est en cours d’exécution, Entrée l’interrompt. Cmd/Ctrl+Entrée met en file d’attente.",
           steer:
-            "Lorsque l’agent est en cours d’exécution, Entrée oriente le tour actif. Commande/Ctrl+Entrée met en file d’attente.",
+            "Quand l’agent est en cours d’exécution, Entrée réoriente le tour en cours. Cmd/Ctrl+Entrée met en file d’attente.",
           queue:
-            "Lorsque l'agent est en cours d'exécution, Entrée met en file d'attente. Commande/Ctrl+Entrée envoie.",
+            "Quand l’agent est en cours d’exécution, Entrée met en file d’attente. Cmd/Ctrl+Entrée envoie.",
         },
         options: {
           interrupt: "Interrompre",
-          steer: "Orienter",
-          queue: "File d'attente",
+          steer: "Réorienter",
+          queue: "File d’attente",
         },
       },
       serviceUrls: {
-        label: "URL de services",
-        description: "Où ouvrir les URL à partir de scripts en cours d'exécution",
         options: {
           ask: "Demander",
-          inApp: "DansPaseo",
+          inApp: "Dans Paseo",
           external: "Navigateur externe",
         },
       },
       terminalScrollback: {
-        label: "DéfilementTerminal",
+        label: "Historique du terminal",
         description: "Lignes conservées dans le tampon du terminal intégré",
-        accessibilityLabel: "Lignes de défilementTerminal",
+        accessibilityLabel: "Lignes d’historique du terminal",
       },
       autoExpandReasoning: {
         label: "Toujours afficher le raisonnement",
-        description: "Afficher le raisonnement de l'agent entièrement développé par défaut",
+        description: "Afficher par défaut le raisonnement de l’agent entièrement déplié",
       },
       toolCallDetail: {
         label: "Affichage des appels d’outils",
         description: "Comment les appels d’outils apparaissent dans la chronologie",
-        accessibilityLabel: "Sélectionner l’affichage des appels d’outils ({{value}})",
         options: {
           overview: "Résumé",
           detailed: "Détails complets",
@@ -2077,7 +2217,7 @@ export const fr: TranslationResources = {
       },
       language: {
         label: "Langue",
-        description: "Langue de l'application",
+        description: "Langue de l’application",
         options: {
           system: "Système",
           ar: "العربية",
@@ -2100,66 +2240,68 @@ export const fr: TranslationResources = {
         accessibilityLabel: "Utiliser l’ancien rendu du terminal",
       },
       testAudio: "Tester le son",
-      playTest: "Jouer à l'essai",
-      playing: "Jouant...",
-      playbackFailed: "Échec de la lecture:{{message}}",
+      playTest: "Lancer le test",
+      playing: "Lecture…",
+      playbackFailed: "Échec de la lecture : {{message}}",
       app: {
-        title: "App diagnostic",
-        rowTitle: "App diagnostic",
-        rowHint: "Collect connection, daemon, provider, desktop, and log details",
-        run: "Run",
-        running: "Running diagnostic...",
+        title: "Diagnostic de l’app",
+        rowTitle: "Diagnostic de l’app",
+        rowHint:
+          "Collecter les informations sur la connexion, le daemon, les fournisseurs, l’app de bureau et les journaux",
+        run: "Lancer",
+        running: "Diagnostic en cours…",
         copyLabel: "diagnostic",
-        copyAccessibility: "Copy diagnostic",
-        copyFailed: "Failed to copy diagnostic",
-        refreshAccessibility: "Refresh diagnostic",
-        refreshingAccessibility: "Refreshing diagnostic",
+        copyAccessibility: "Copier le diagnostic",
+        copyFailed: "Impossible de copier le diagnostic",
+        refreshAccessibility: "Actualiser le diagnostic",
+        refreshingAccessibility: "Actualisation du diagnostic",
         progress: {
           client: "Client",
-          desktop: "Desktop",
+          desktop: "App de bureau",
         },
       },
     },
     about: {
       title: "À propos",
-      appVersion: "Version de l'application",
+      appVersion: "Version de l’application",
+      whatsNewHint: "Les nouveautés de chaque version",
       thisDevice: "Cet appareil",
       connectedHosts: "Hôtes connectés",
       offline: "Hors ligne",
-      versionDiffers: "La version diffère de cet appareil",
+      versionDiffers: "Version différente de celle de cet appareil",
       releaseChannel: {
-        label: "Canal de sortie",
+        label: "Canal de publication",
         description:
-          "Passez àBetapour obtenir des mises à jour plus tôt et contribuer à les façonner",
+          "Passez à la Bêta pour recevoir les mises à jour plus tôt et contribuer à les façonner",
         stable: "Stable",
-        beta: "Beta",
+        beta: "Bêta",
       },
       updates: {
-        label: "Mises à jour de l'application",
-        readyToInstall: "Prêt à installer:{{version}}",
-        installTitle: "Installer la mise à jour du bureau",
-        installMessage: "Cela met à jourPaseosur cet ordinateur",
+        label: "Mises à jour de l’application",
+        readyToInstall: "Prête à installer : {{version}}",
+        installTitle: "Installer la mise à jour de l’app de bureau",
+        installMessage: "Paseo sera mis à jour sur cet ordinateur",
         installConfirm: "Installer la mise à jour",
-        update: "Mise à jour",
-        updateTo: "Mise à jour vers{{version}}",
-        installing: "Installation...",
+        update: "Mettre à jour",
+        updateTo: "Mettre à jour vers {{version}}",
+        installing: "Installation…",
         check: "Vérifier",
-        checking: "Vérification...",
+        checking: "Vérification…",
         alertTitle: "Erreur",
-        alertMessage: "Impossible d'ouvrir la boîte de dialogue de confirmation de mise à jour.",
+        alertMessage: "Impossible d’ouvrir la boîte de dialogue de confirmation de mise à jour.",
       },
     },
     appearance: {
       theme: {
         title: "Thème",
-        accessibilityLabel: "Thème:{{value}}",
+        accessibilityLabel: "Thème : {{value}}",
         options: {
-          light: "Lumière",
+          light: "Clair",
           dark: "Sombre",
           zinc: "Zinc",
           midnight: "Minuit",
           claude: "Claude",
-          ghostty: "Fantôme",
+          ghostty: "Ghostty",
           pureBlack: "Noir pur",
           auto: "Système",
         },
@@ -2169,57 +2311,74 @@ export const fr: TranslationResources = {
       },
       chatOutline: {
         title: "Plan de la discussion",
-        description: "Afficher un plan pour passer d’une requête à l’autre",
+        description: "Afficher un plan pour naviguer entre les prompts",
       },
       sidebar: {
-        title: "Barre latérale",
-        description: "Choisissez les éléments affichés en haut de la barre latérale et leur ordre",
-        moveUp: "Déplacer vers le haut",
-        moveDown: "Déplacer vers le bas",
+        header: {
+          title: "En-tête",
+          description:
+            "Choisissez les éléments affichés en haut de la barre latérale et leur ordre",
+        },
+        footer: {
+          title: "Pied de page",
+          description:
+            "Choisissez les lignes affichées en bas de la barre latérale et leur ordre. « Ajouter un projet » et la rangée d’icônes restent toujours visibles",
+        },
+        moveUp: "Monter",
+        moveDown: "Descendre",
       },
       fonts: {
         title: "Polices",
-        systemDefault: "Valeur par défaut du système",
-        interfaceFont: "Police d'interface",
+        systemDefault: "Police par défaut du système",
+        interfaceFont: "Police de l’interface",
         interfaceFontHint:
-          "Utilisé dans toute l'application. Laisser vide pour la valeur par défaut du système",
-        interfaceFontAccessibility: "Famille de polices d'interface",
-        interfaceSize: "Taille de l'interface",
+          "Utilisée dans toute l’application. Laissez vide pour utiliser la police par défaut du système",
+        interfaceFontAccessibility: "Famille de police de l’interface",
+        interfaceSize: "Taille de l’interface",
         interfaceSizeHint: "Utilisée pour la navigation, les contrôles et les libellés",
-        interfaceSizeAccessibility: "Taille de police de l'interface",
+        interfaceSizeAccessibility: "Taille de police de l’interface",
         contentSize: "Taille du contenu",
-        contentSizeHint: "Utilisée pour le texte du chat et le Markdown rendu",
+        contentSizeHint: "Utilisée pour le texte de la discussion et le Markdown rendu",
         contentSizeAccessibility: "Taille de police du contenu",
-        codeFont: "Police de code",
+        codeFont: "Police du code",
         codeFontHint:
-          "Utilisé dans le code, les différences et la sortie du terminal. Laisser vide pour la valeur par défaut du système",
-        codeFontAccessibility: "Famille de polices de code",
+          "Utilisée pour le code, les diffs et la sortie du terminal. Laissez vide pour utiliser la police par défaut du système",
+        codeFontAccessibility: "Famille de police du code",
         codeSize: "Taille du code",
         codeSizeHint: "Utilisée pour le code, les diffs et la sortie du terminal",
-        codeSizeAccessibility: "Taille de la police du code",
+        codeSizeAccessibility: "Taille de police du code",
+      },
+      layout: {
+        title: "Mise en page",
+        contentWidth: "Largeur du contenu",
+        contentWidthHint:
+          "Largeur maximale de la discussion et des fichiers Markdown sur les grands écrans",
+        contentWidthAccessibility: "Largeur du contenu en pixels",
+        reset: "Réinitialiser",
+        resetAccessibility: "Réinitialiser la largeur du contenu",
       },
       syntax: {
         title: "Syntaxe",
-        highlightTheme: "Thème de surbrillance",
-        highlightThemeHint: "Couleurs du code, indépendamment du thème de l'application",
-        highlightThemeAccessibility: "Thème phare:{{value}}",
+        highlightTheme: "Thème de coloration",
+        highlightThemeHint: "Couleurs du code, indépendantes du thème de l’application",
+        highlightThemeAccessibility: "Thème de coloration : {{value}}",
         previewAccessibility:
-          "Aperçu en direct de la typographie du contenu, du thème de syntaxe et de la police de code",
+          "Aperçu en direct de la typographie du contenu, du thème de syntaxe et de la police du code",
         previewContent: "Aperçu du contenu et du code",
       },
     },
     shortcuts: {
       dialogTitle: "Raccourcis",
       searchPlaceholder: "Rechercher des raccourcis",
-      unavailableOnMobile: "Les raccourcis clavier ne sont disponibles que sur le bureau",
-      capturePrompt: "Appuyez sur le raccourci...",
-      unassigned: "Non défini",
+      unavailableOnMobile: "Les raccourcis clavier ne sont disponibles que sur l’app de bureau",
+      capturePrompt: "Appuyez sur le raccourci…",
+      unassigned: "Non attribué",
       actions: {
         menu: "Actions pour {{name}}",
-        done: "Fait",
+        done: "Terminé",
         cancel: "Annuler",
         bind: "Attribuer",
-        rebind: "Relier",
+        rebind: "Réattribuer",
         clear: "Effacer",
         reset: "Rétablir la valeur par défaut",
         resetAll: "Tout réinitialiser",
@@ -2227,88 +2386,92 @@ export const fr: TranslationResources = {
       sections: {
         general: "Général",
         workspaces: "Projets et espaces de travail",
-        tabsPanes: "Onglets et volets",
+        tabsPanes: "Onglets et panneaux",
         layout: "Disposition",
-        agentInput: "EntréeAgent",
+        agentInput: "Zone de saisie",
       },
       help: {
-        openProject: "Projet ouvert",
+        openProject: "Ouvrir un projet",
         newWorkspace: "Nouvel espace de travail",
-        newWorktree: "Nouvel arbre de travail",
+        newWorktree: "Nouveau worktree",
         archiveWorkspace: "Archiver l’espace de travail",
         newTab: "Nouvel onglet",
-        closeCurrentTab: "Fermer l'onglet actuel",
-        jumpToWorkspace: "Accéder à l'espace de travail",
-        jumpToTab: "Aller à l'onglet",
+        closeCurrentTab: "Fermer l’onglet actuel",
+        jumpToWorkspace: "Aller à l’espace de travail",
+        jumpToTab: "Aller à l’onglet",
         previousWorkspace: "Espace de travail précédent",
         nextWorkspace: "Espace de travail suivant",
         previousTab: "Onglet précédent",
         nextTab: "Onglet suivant",
-        splitPaneRight: "Volet divisé à droite",
-        splitPaneDown: "Diviser le volet vers le bas",
-        focusPaneLeft: "Volet de mise au point à gauche",
-        focusPaneRight: "Volet de mise au point à droite",
-        focusPaneUp: "Volet de mise au point vers le haut",
-        focusPaneDown: "Volet de mise au point vers le bas",
-        moveTabLeft: "Déplacer l'onglet vers la gauche",
-        moveTabRight: "Déplacer l'onglet vers la droite",
-        moveTabUp: "Déplacer l'onglet vers le haut",
-        moveTabDown: "Déplacer l'onglet vers le bas",
-        closePane: "Fermer le volet",
-        newTerminal: "Nouvelle borne",
+        splitPaneRight: "Diviser le panneau vers la droite",
+        splitPaneDown: "Diviser le panneau vers le bas",
+        focusPaneLeft: "Activer le panneau de gauche",
+        focusPaneRight: "Activer le panneau de droite",
+        focusPaneUp: "Activer le panneau du haut",
+        focusPaneDown: "Activer le panneau du bas",
+        moveTabLeft: "Déplacer l’onglet vers la gauche",
+        moveTabRight: "Déplacer l’onglet vers la droite",
+        moveTabUp: "Déplacer l’onglet vers le haut",
+        moveTabDown: "Déplacer l’onglet vers le bas",
+        closePane: "Fermer le panneau",
+        newTerminal: "Nouveau terminal",
         searchFiles: "Rechercher des fichiers",
-        toggleCommandCenter: "Basculer le centre de commande",
+        toggleCommandCenter: "Afficher/masquer la palette de commandes",
         showKeyboardShortcuts: "Afficher les raccourcis clavier",
-        toggleLeftSidebar: "Basculer la barre latérale gauche",
-        toggleRightSidebar: "Basculer le panneau latéral",
-        toggleBothSidebars: "Basculer les deux barres latérales",
-        toggleSettings: "Basculer les paramètres",
-        toggleFocusMode: "Basculer le mode de mise au point",
-        cycleTheme: "Thème du cycle",
-        focusMessageInput: "Saisie du message de focus",
-        cycleAgentMode: "Parcourir les modes de l'agent",
-        toggleVoiceMode: "Changer le mode vocal",
-        startStopDictation: "Démarrer la dictée/stop",
-        interruptAgent: "Agent d'interruption",
-        sendMessage: "Envoyer un message",
-        queueMessage: "Message de file d'attente",
-        muteUnmuteVoiceMode: "Mode vocal/unmutemuet",
+        toggleLeftSidebar: "Afficher/masquer la barre latérale gauche",
+        toggleRightSidebar: "Afficher/masquer la barre latérale de l’explorateur",
+        toggleBothSidebars: "Afficher/masquer les deux barres latérales",
+        toggleSettings: "Afficher/masquer les paramètres",
+        toggleFocusMode: "Activer/désactiver le mode focus",
+        cycleTheme: "Parcourir les thèmes",
+        focusMessageInput: "Aller à la zone de saisie",
+        cycleAgentMode: "Parcourir les modes de l’agent",
+        toggleVoiceMode: "Activer/désactiver le mode vocal",
+        startStopDictation: "Démarrer/arrêter la dictée",
+        interruptAgent: "Interrompre l’agent",
+        sendMessage: "Envoyer le message",
+        queueMessage: "Mettre le message en file d’attente",
+        muteUnmuteVoiceMode: "Couper/réactiver le micro en mode vocal",
         switchProject: "Changer de projet",
       },
       helpNotes: {
         showKeyboardShortcuts:
-          "Disponible lorsque le focus n’est pas dans un champ de texte ou un terminal.",
+          "Disponible quand le focus n’est ni dans un champ de texte ni dans un terminal.",
       },
     },
     integrations: {
       title: "Intégrations",
       docs: {
-        cli: "DocumentsCLI",
-        openCli: "Ouvrir la documentationCLI",
+        cli: "Documentation CLI",
+        openCli: "Ouvrir la documentation CLI",
       },
       commandLine: {
         title: "Ligne de commande",
-        description: "Agents de contrôle et de script depuis votre terminal",
+        description: "Pilotez et scriptez vos agents depuis votre terminal",
       },
       actions: {
         install: "Installer",
-        installing: "Installation...",
+        installing: "Installation…",
         installed: "Installé",
       },
     },
     permissions: {
       title: "Autorisations",
       microphone: "Microphone",
-      refresh: "Rafraîchir",
-      refreshing: "Rafraîchissant...",
+      refresh: "Actualiser",
+      refreshing: "Actualisation…",
       refreshAccessibility: "Actualiser les autorisations du bureau",
       actions: {
-        granted: "Accordé",
-        request: "Demande",
-        requesting: "Demander...",
+        granted: "Accordée",
+        request: "Demander",
+        requesting: "Demande…",
       },
     },
     host: {
+      password: {
+        guidance:
+          "Supprimez cet hôte puis ajoutez-le à nouveau avec le mot de passe demandé par ce daemon.",
+      },
       appearance: {
         title: "Apparence",
         name: {
@@ -2320,12 +2483,12 @@ export const fr: TranslationResources = {
           options: {
             none: "Par défaut",
             violet: "Violet",
-            sky: "Ciel",
+            sky: "Bleu ciel",
             emerald: "Émeraude",
             orange: "Orange",
             pink: "Rose",
             indigo: "Indigo",
-            teal: "Sarcelle",
+            teal: "Bleu canard",
             red: "Rouge",
             amber: "Ambre",
             blue: "Bleu",
@@ -2344,250 +2507,252 @@ export const fr: TranslationResources = {
           workspaceName: "my-workspace",
         },
       },
-      notFound: "Hostintrouvable",
+      notFound: "Hôte introuvable",
       badges: {
         relay: "Relais",
-        local: "Locale",
+        local: "Local",
         remoteSsh: "SSH distant",
       },
       connections: {
-        title: "Relations",
+        title: "Connexions",
         removeTitle: "Supprimer la connexion",
-        removeMessage: "Supprimer{{name}}? Cela ne peut pas être annulé.",
-        removeAction: "Retirer",
+        removeMessage: "Supprimer {{name}} ? Cette action est irréversible.",
+        removeAction: "Supprimer",
         removeErrorTitle: "Erreur",
         removeErrorMessage: "Impossible de supprimer la connexion",
-        timeout: "Temps mort",
+        timeout: "Délai dépassé",
       },
       pairDevices: {
         title: "Associer des appareils",
         rowTitle: "Associer un appareil",
-        rowHint: "Scannez un codeQRou copiez un lien pour connecter votre téléphone à cet hôte",
+        rowHint: "Scannez un QR code ou copiez un lien pour connecter votre téléphone à cet hôte",
       },
       skills: {
         ...en.settings.host.skills,
-        sectionTitle: "Compétences en orchestration",
-        title: "Compétences en orchestration",
-        description: "Apprenez à vos agents à orchestrer via leCLI",
+        sectionTitle: "Skills d’orchestration",
+        title: "Skills d’orchestration",
+        description: "Apprenez à vos agents à orchestrer via la CLI",
         updateAvailable: "Mise à jour disponible",
-        updateTitle: "Mettre à jour les compétencesPaseo?",
-        updateFallback: "Synchronisez les compétences regroupées sur votre machine.",
-        uninstallTitle: "Désinstaller les compétencesPaseo?",
+        updateTitle: "Mettre à jour les skills Paseo ?",
+        updateFallback: "Synchronisez les skills fournis sur cet hôte.",
+        uninstallTitle: "Désinstaller les skills Paseo ?",
         uninstallMessage:
-          "Supprime toutes les compétences d'orchestrationPaseode ~/.agents, ~/.claude, ~/.codex.",
-        choose: "Choisir les compétences",
-        chooseAll: "Toutes les compétences",
+          "Supprime tous les skills d’orchestration Paseo de ~/.agents, ~/.claude et ~/.codex sur cet hôte.",
+        choose: "Choisir les skills",
+        chooseAll: "Tous les skills",
         chooseAllHint:
-          "Gardez installées toutes les compétences fournies, y compris celles ajoutées plus tard.",
-        chooseList: "Compétences fournies",
-        chooseEmpty: "Cette version ne fournit aucune compétence.",
-        removeTitle: "Supprimer les compétences décochées ?",
+          "Garder installés tous les skills fournis, y compris ceux ajoutés plus tard.",
+        chooseList: "Skills fournis",
+        chooseEmpty: "Cet hôte ne fournit aucun skill.",
+        removeTitle: "Supprimer les skills décochés ?",
         removeMessage:
-          "{{skills}} seront supprimées de ~/.agents, ~/.claude et ~/.codex. Tout ce que vous avez ajouté dans ces dossiers de compétences est également supprimé.",
-        saveFailed: "Impossible d'enregistrer votre sélection de compétences.",
-        statusFailed: "Impossible de vérifier l'état des compétences d'orchestration.",
-        updateFailed: "Impossible de mettre à jour les compétences d'orchestration.",
-        uninstallFailed: "Impossible de désinstaller les compétences d'orchestration.",
-        saveSelectionFailed:
-          "Impossible d'enregistrer la sélection des compétences d'orchestration.",
+          "{{skills}} seront supprimés de ~/.agents, ~/.claude et ~/.codex sur cet hôte. Tout ce que vous avez ajouté dans ces dossiers de skills sera également supprimé.",
+        saveFailed: "Impossible d’enregistrer votre sélection de skills.",
+        statusFailed: "Impossible de vérifier l’état des skills d’orchestration.",
+        updateFailed: "Impossible de mettre à jour les skills d’orchestration.",
+        uninstallFailed: "Impossible de désinstaller les skills d’orchestration.",
+        saveSelectionFailed: "Impossible d’enregistrer la sélection des skills d’orchestration.",
         actions: {
           install: "Installer",
-          installing: "Installation...",
+          installing: "Installation…",
           installed: "Installé",
-          update: "Mise à jour",
-          working: "Fonctionnement...",
+          update: "Mettre à jour",
+          working: "En cours…",
           remove: "Supprimer",
           uninstall: "Désinstaller",
           save: "Enregistrer",
-          saving: "Enregistrement...",
+          saving: "Enregistrement…",
           cancel: "Annuler",
         },
         operations: {
-          add: "Ajouter une compétence",
-          update: "Mettre à jour la compétence",
-          delete: "Supprimer la compétence",
+          add: "Ajouter un skill",
+          update: "Mettre à jour le skill",
+          delete: "Supprimer le skill",
         },
       },
       orchestration: {
         title: "Orchestration",
-        unavailable: "Connectez-vous à cet hôte pour gérer l'orchestration",
+        unavailable: "Connectez-vous à cet hôte pour gérer l’orchestration",
         enableTools: {
-          title: "Activer les outilsPaseo",
-          hint: "Les agents pourront gérer les arbres de travail, les agents et les horaires",
-          accessibilityLabel: "Injecter les outilsPaseo",
+          title: "Activer les outils Paseo",
+          hint: "Les agents pourront gérer les worktrees, les agents et les planifications",
+          accessibilityLabel: "Injecter les outils Paseo",
         },
         systemPrompt: {
-          title: "Invite système",
-          hint: "Ajoute une invite système à tous les agents",
-          sheetTitle: "Ajouter une invite système",
-          accessibilityLabel: "Ajouter une invite système",
-          placeholder: "Gardez toujours des réponses concises.",
+          title: "Prompt système",
+          hint: "Ajoute un prompt système à tous les agents",
+          sheetTitle: "Ajouter un prompt système",
+          accessibilityLabel: "Ajouter un prompt système",
+          placeholder: "Toujours répondre de façon concise.",
           edit: "Modifier",
           reset: "Réinitialiser",
-          save: "Sauvegarder",
-          saving: "Sauvegarde...",
+          save: "Enregistrer",
+          saving: "Enregistrement…",
         },
       },
       agents: {
-        unavailable: "Connect to this host to manage agents",
+        unavailable: "Connectez-vous à cet hôte pour gérer les agents",
       },
       workspaces: {
-        unavailable: "Connect to this host to manage workspaces",
+        unavailable: "Connectez-vous à cet hôte pour gérer les espaces de travail",
       },
       terminalProfiles: {
-        unavailable: "Connect to this host to manage terminal profiles",
-        sectionTitle: "Terminal profiles",
-        editProfile: "Edit profile",
-        addProfileTitle: "Add terminal profile",
-        editProfileTitle: "Edit terminal profile",
+        unavailable: "Connectez-vous à cet hôte pour gérer les profils de terminal",
+        sectionTitle: "Profils de terminal",
+        editProfile: "Modifier le profil",
+        addProfileTitle: "Ajouter un profil de terminal",
+        editProfileTitle: "Modifier le profil de terminal",
         namePlaceholder: "Claude Code",
         commandPlaceholder: "claude",
         argsPlaceholder: "--dangerously-skip-permissions",
-        nameLabel: "Name",
-        commandLabel: "Command",
+        nameLabel: "Nom",
+        commandLabel: "Commande",
         argsLabel: "Arguments",
-        nameRequired: "Name is required",
-        commandRequired: "Command is required",
-        argsHint: "Space-separated arguments passed to the command",
-        saving: "Saving...",
-        remove: "Remove",
-        removeConfirmTitle: "Remove profile?",
-        removeConfirmMessage: 'Remove "{{name}}"?',
-        moveUp: "Move up",
-        moveDown: "Move down",
-        save: "Save",
-        emptyState: "No profiles yet. Add one to launch terminals with a specific command.",
+        nameRequired: "Le nom est obligatoire",
+        commandRequired: "La commande est obligatoire",
+        argsHint: "Arguments séparés par des espaces, transmis à la commande",
+        saving: "Enregistrement…",
+        remove: "Supprimer",
+        removeConfirmTitle: "Supprimer le profil ?",
+        removeConfirmMessage: "Supprimer « {{name}} » ?",
+        moveUp: "Monter",
+        moveDown: "Descendre",
+        save: "Enregistrer",
+        emptyState:
+          "Aucun profil pour le moment. Ajoutez-en un pour lancer des terminaux avec une commande précise.",
       },
       agentProfiles: {
-        sectionTitle: "Profils d'agent",
-        unavailable: "Connectez-vous à cet hôte pour gérer les profils d'agent",
-        unsupported:
-          "Cet hôte exécute un daemon qui ne prend pas encore en charge les profils d'agent",
+        sectionTitle: "Profils d’agent",
+        unavailable: "Connectez-vous à cet hôte pour gérer les profils d’agent",
+        unsupported: "Le daemon de cet hôte ne prend pas encore en charge les profils d’agent",
         emptyState:
-          "Aucun profil pour le moment. Ajoutez-en un pour démarrer des agents à partir d'un fournisseur et d'un modèle enregistrés.",
-        addProfileTitle: "Ajouter un profil d'agent",
+          "Aucun profil pour le moment. Ajoutez-en un pour démarrer des agents avec un fournisseur et un modèle enregistrés.",
+        addProfileTitle: "Ajouter un profil d’agent",
         newProfile: "Nouveau profil",
         editProfile: "Modifier le profil",
-        editProfileTitle: "Modifier le profil d'agent",
+        editProfileTitle: "Modifier le profil d’agent",
         nameLabel: "Nom",
-        namePlaceholder: "Travail sur l'UI",
+        namePlaceholder: "Travail sur l’UI",
         iconLabel: "Icône",
         noIcon: "Aucune",
         providerLabel: "Fournisseur",
         providerPlaceholder: "Sélectionner un fournisseur",
-        noProviders: "Aucun fournisseur n'est disponible sur cet hôte",
+        noProviders: "Aucun fournisseur disponible sur cet hôte",
         modelLabel: "Modèle",
-        noModels: "Ce fournisseur n'a aucun modèle à choisir",
+        noModels: "Ce fournisseur ne propose aucun modèle",
         modeLabel: "Mode",
-        noModes: "Ce fournisseur n'a aucun mode à choisir",
-        thinkingLabel: "Pensée",
-        noThinkingOptions: "Ce modèle n'a aucun niveau de pensée",
-        featuresLabel: "Caractéristiques",
-        featureCount: "{{count}} caractéristiques",
-        featureCountOne: "{{count}} caractéristique",
+        noModes: "Ce fournisseur ne propose aucun mode",
+        thinkingLabel: "Réflexion",
+        noThinkingOptions: "Ce modèle n’a aucun niveau de réflexion",
+        featuresLabel: "Fonctionnalités",
+        featureCount: "{{count}} fonctionnalités",
+        featureCountOne: "{{count}} fonctionnalité",
         notesLabel: "Quand l’utiliser",
         notesPlaceholder:
-          "À utiliser pour le travail sur l'UI — composants, mise en page et tokens de design.",
+          "À utiliser pour le travail sur l’UI : composants, mise en page et design tokens.",
         notesHint: "Aide les agents à choisir ce profil lorsqu’ils démarrent un autre agent.",
         save: "Enregistrer",
-        saving: "Enregistrement...",
+        saving: "Enregistrement…",
         remove: "Supprimer",
-        removeConfirmTitle: "Supprimer le profil ?",
-        removeConfirmMessage: "Supprimer « {{name}} » ?",
-        moveUp: "Déplacer vers le haut",
-        moveDown: "Déplacer vers le bas",
+        removeConfirmTitle: "Supprimer le profil ?",
+        removeConfirmMessage: "Supprimer « {{name}} » ?",
+        moveUp: "Monter",
+        moveDown: "Descendre",
       },
       daemon: {
         rename: {
-          editLabel: "Modifier l'étiquette",
-          title: "Renommer l'hôte",
-          placeholder: "MonHost",
+          editLabel: "Modifier le libellé",
+          title: "Renommer l’hôte",
+          placeholder: "Mon hôte",
           submit: "Renommer",
         },
         restart: {
-          title: "Redémarrer le démon",
-          hint: "Redémarre le processus démon. L'application se reconnectera automatiquement",
+          title: "Redémarrer le daemon",
+          hint: "Redémarre le processus du daemon. L’application se reconnectera automatiquement",
           confirm: "Redémarrer",
-          confirmTitle: "Redémarrer{{name}}",
+          confirmTitle: "Redémarrer {{name}}",
           confirmMessage:
-            "Cela redémarrera le démon. Les agents qui s'y exécutent continueront à fonctionner; l'application se reconnectera automatiquement.",
-          restarting: "Redémarrage...",
+            "Le daemon va redémarrer. Les agents qui y tournent continueront de s’exécuter et l’application se reconnectera automatiquement.",
+          restarting: "Redémarrage…",
           unableToReconnectTitle: "Impossible de se reconnecter",
           unableToReconnectMessage:
-            "{{name}}n'est pas revenu en ligne. Veuillez vérifier qu'il a redémarré.",
-          unavailableTitle: "Hostindisponible",
+            "{{name}} n’est pas revenu en ligne. Vérifiez qu’il a bien redémarré.",
+          unavailableTitle: "Hôte indisponible",
           unavailableMessage:
-            "Cet hôte n'est pas connecté. Attendez qu'il soit en ligne avant de redémarrer.",
-          offlineTitle: "Hosthors ligne",
+            "Cet hôte n’est pas connecté. Attendez qu’il soit en ligne avant de redémarrer.",
+          offlineTitle: "Hôte hors ligne",
           offlineMessage:
-            "Cet hôte est hors ligne.Paseose reconnecte automatiquement: attendez qu'il soit de nouveau en ligne avant de redémarrer.",
+            "Cet hôte est hors ligne. Paseo se reconnecte automatiquement : attendez qu’il soit de nouveau en ligne avant de redémarrer.",
           requestFailedTitle: "Erreur",
           requestFailedMessage:
-            "Échec de l'envoi de la demande de redémarrage.Paseose reconnecte automatiquement - réessayez une fois que l'hôte apparaît comme en ligne.",
+            "Impossible d’envoyer la demande de redémarrage. Paseo se reconnecte automatiquement : réessayez quand l’hôte apparaît en ligne.",
           dialogFailedMessage:
-            "Impossible d'ouvrir la boîte de dialogue de confirmation de redémarrage.",
+            "Impossible d’ouvrir la boîte de dialogue de confirmation du redémarrage.",
         },
         update: {
           desktopManagedHint:
             "Ce daemon est géré par Paseo Desktop. Mettez à jour Paseo Desktop sur l’hôte.",
-          title: "Update daemon",
-          hint: "Update the daemon to the latest version and restart it",
-          confirm: "Update",
-          confirmTitle: "Update {{name}}",
+          title: "Mettre à jour le daemon",
+          hint: "Met à jour le daemon vers la dernière version puis le redémarre",
+          confirm: "Mettre à jour",
+          confirmTitle: "Mettre à jour {{name}}",
           confirmMessage:
-            "This will update the daemon to the latest version and restart it. Running agents will be briefly interrupted.",
-          updating: "Updating...",
-          phaseStarting: "Preparing update...",
-          phaseDownloading: "Downloading packages...",
-          phaseInstalling: "Installing...",
-          phaseComplete: "Update complete, restarting...",
-          unableToReconnectTitle: "Unable to reconnect",
+            "Le daemon va être mis à jour vers la dernière version puis redémarré. Les agents en cours seront brièvement interrompus.",
+          updating: "Mise à jour…",
+          phaseStarting: "Préparation de la mise à jour…",
+          phaseDownloading: "Téléchargement des paquets…",
+          phaseInstalling: "Installation…",
+          phaseComplete: "Mise à jour terminée, redémarrage…",
+          unableToReconnectTitle: "Impossible de se reconnecter",
           unableToReconnectMessage:
-            "{{name}} did not come back online after updating. Please verify the daemon restarted.",
-          unavailableTitle: "Host unavailable",
+            "{{name}} n’est pas revenu en ligne après la mise à jour. Vérifiez que le daemon a bien redémarré.",
+          unavailableTitle: "Hôte indisponible",
           unavailableMessage:
-            "This host is not connected. Wait for it to come online before updating.",
-          offlineTitle: "Host offline",
-          offlineMessage: "This host is offline. Wait until it is back online before updating.",
-          requestFailedTitle: "Update failed",
-          requestFailedMessage: "Failed to update the daemon: {{error}}",
-          dialogFailedMessage: "Unable to open the update confirmation dialog.",
+            "Cet hôte n’est pas connecté. Attendez qu’il soit en ligne avant de lancer la mise à jour.",
+          offlineTitle: "Hôte hors ligne",
+          offlineMessage:
+            "Cet hôte est hors ligne. Attendez qu’il soit de nouveau en ligne avant de lancer la mise à jour.",
+          requestFailedTitle: "Échec de la mise à jour",
+          requestFailedMessage: "Impossible de mettre à jour le daemon : {{error}}",
+          dialogFailedMessage:
+            "Impossible d’ouvrir la boîte de dialogue de confirmation de la mise à jour.",
         },
         dangerZone: "Zone dangereuse",
         remove: {
-          title: "Supprimer l'hôte",
-          localTitle: "Remove localhost connection",
+          title: "Supprimer l’hôte",
+          localTitle: "Supprimer la connexion localhost",
           hint: "Supprime cet hôte et ses connexions enregistrées de cet appareil",
-          localHint: "Removes localhost from this device and stops the built-in daemon",
-          localConfirmTitle: "Remove localhost connection and stop daemon?",
-          confirmMessage: "Supprimer{{name}}? Cela supprimera ses connexions enregistrées.",
+          localHint: "Supprime localhost de cet appareil et arrête le daemon intégré",
+          localConfirmTitle: "Supprimer la connexion localhost et arrêter le daemon ?",
+          confirmMessage: "Supprimer {{name}} ? Ses connexions enregistrées seront supprimées.",
           localConfirmMessage:
-            "This will remove the localhost connection, turn off built-in daemon management, and stop the managed daemon. Remote hosts remain connected.",
+            "La connexion localhost sera supprimée, la gestion du daemon intégré désactivée et le daemon géré arrêté. Les hôtes distants restent connectés.",
           errorTitle: "Erreur",
-          errorMessage: "Impossible de supprimer l'hôte",
-          localErrorMessage: "Unable to remove localhost connection",
+          errorMessage: "Impossible de supprimer l’hôte",
+          localErrorMessage: "Impossible de supprimer la connexion localhost",
         },
       },
     },
     providers: {
       title: "Fournisseurs",
       addProvider: "Ajouter un fournisseur",
-      providerDetails: "Détails du fournisseur{{name}}",
-      enableProvider: "Activer{{name}}",
+      providerDetails: "Détails du fournisseur {{name}}",
+      enableProvider: "Activer {{name}}",
       unavailable: "Connectez-vous à cet hôte pour voir les fournisseurs",
-      loading: "Chargement...",
-      addErrorTitle: "Unable to add provider",
+      loading: "Chargement…",
+      addErrorTitle: "Impossible d’ajouter le fournisseur",
       updateErrorTitle: "Impossible de mettre à jour le fournisseur",
       actions: {
-        menu: "{{name}} actions",
-        remove: "Remove provider",
-        removing: "Removing...",
+        menu: "Actions de {{name}}",
+        remove: "Supprimer le fournisseur",
+        removing: "Suppression…",
       },
       remove: {
-        confirmTitle: "Remove {{name}}?",
-        confirmMessage: "This deletes the provider entry from config.json. It cannot be undone.",
-        confirm: "Remove",
-        errorTitle: "Unable to remove provider",
+        confirmTitle: "Supprimer {{name}} ?",
+        confirmMessage:
+          "L’entrée du fournisseur sera supprimée de config.json. Cette action est irréversible.",
+        confirm: "Supprimer",
+        errorTitle: "Impossible de supprimer le fournisseur",
       },
       statuses: {
         disabled: "Désactivé",
@@ -2601,40 +2766,40 @@ export const fr: TranslationResources = {
         many: "{{count}} modèles",
         addModel: "Ajouter un modèle",
         addCustomTitle: "Ajouter un modèle personnalisé",
-        modelId: "ModèleID",
-        modelIdPlaceholder: "par ex. ouvert/gpt-5",
+        modelId: "ID du modèle",
+        modelIdPlaceholder: "ex. openai/gpt-5",
         add: "Ajouter",
-        adding: "Ajout...",
-        failedToSave: "Échec de l'enregistrement du modèle",
-        removeModel: "Supprimer{{id}}",
+        adding: "Ajout…",
+        failedToSave: "Impossible d’enregistrer le modèle",
+        removeModel: "Supprimer {{id}}",
         searchPlaceholder: "Rechercher des modèles",
-        loading: "Chargement des modèles...",
+        loading: "Chargement des modèles…",
         retry: "Réessayer",
-        retrying: "Nouvelle tentative...",
+        retrying: "Nouvelle tentative…",
         noSearchMatches: "Aucun modèle ne correspond à votre recherche",
         noneDetected: "Aucun modèle détecté",
-        discovered: "Découvert",
+        discovered: "Détectés",
         custom: "Modèles personnalisés",
-        updated: "{{time}}mis à jour",
+        updated: "Mis à jour {{time}}",
       },
       diagnostic: {
-        title: "Diagnostique",
-        button: "Diagnostique",
-        refresh: "Rafraîchir",
-        refreshing: "Rafraîchissant...",
+        title: "Diagnostic",
+        button: "Diagnostic",
+        refresh: "Actualiser",
+        refreshing: "Actualisation…",
         copyLabel: "diagnostic",
         copyAccessibility: "Copier le diagnostic",
-        copyFailed: "Échec de la copie du diagnostic",
+        copyFailed: "Impossible de copier le diagnostic",
         refreshAccessibility: "Actualiser le diagnostic",
-        refreshingAccessibility: "Diagnostic rafraîchissant",
-        running: "Exécution du diagnostic...",
+        refreshingAccessibility: "Actualisation du diagnostic",
+        running: "Exécution du diagnostic…",
         none: "Aucun diagnostic disponible",
-        failedToFetch: "Échec de la récupération du diagnostic",
+        failedToFetch: "Impossible de récupérer le diagnostic",
         unknownError: "Erreur inconnue",
       },
     },
     project: {
-      noEditableTarget: "Ce projet n'est pas modifiable sur cet hôte.",
+      noEditableTarget: "Ce projet n’est pas modifiable sur cet hôte.",
       backToProjects: "Retour aux projets",
       edit: {
         title: "Modifier le projet",
@@ -2642,85 +2807,86 @@ export const fr: TranslationResources = {
         nameLabel: "Nom du projet",
         icon: "Icône",
         chooseImage: "Choisir une image",
-        useAutomatic: "Utiliser l'automatique",
-        imageUrl: "URL d'image ou de site",
-        save: "Enregistrer",
+        useAutomatic: "Icône automatique",
+        imageUrl: "URL d’une image ou d’un site",
+        save: "Enregistrer les modifications",
         savedToast: "Projet mis à jour",
       },
       readFailures: {
-        invalidTitle: "paseo.json n'a pas pu être analysé",
+        invalidTitle: "Impossible d’analyser paseo.json",
         invalidDescription: "Corrigez le fichier sur le disque, puis rechargez.",
-        missingTitle: "Cet hôte n'a pas ce projet",
-        missingSingleHost: "L'hôte sélectionné n'a aucune trace de ce projet.",
+        missingTitle: "Ce projet n’existe pas sur cet hôte",
+        missingSingleHost: "L’hôte sélectionné n’a aucune trace de ce projet.",
         transportTitle: "Impossible de charger paseo.json",
-        transportFallback: "L'hôte n'a pas répondu.",
+        transportFallback: "L’hôte n’a pas répondu.",
         failedTitle: "Impossible de charger paseo.json",
         failedDescription: "Rechargez pour réessayer.",
       },
       worktree: {
-        title: "Crochets de cycle de vie Worktree",
-        info: "Commandes exécutées lorsqu'un arbre de travail est créé ou supprimé pour ce projet",
-        docs: "Documents",
+        title: "Hooks de cycle de vie des worktrees",
+        info: "Commandes exécutées à la création ou à la suppression d’un worktree de ce projet",
+        docs: "Documentation",
         docsTooltip:
-          "Voir la documentation pour plus de détails et les variables d'environnement disponibles pour ces commandes",
-        setup: "Installation",
-        setupAccessibility: "Commandes de configuration de Worktree",
-        uncommittedTitle: "Validez les modifications de paseo.json",
+          "Consultez la documentation pour plus de détails et la liste des variables d’environnement disponibles pour ces commandes",
+        setup: "Configuration",
+        setupAccessibility: "Commandes de configuration du worktree",
+        uncommittedTitle: "Commitez les modifications de paseo.json",
         uncommittedDescription:
           "Les nouveaux worktrees utilisent le script de configuration de la branche de base sélectionnée.",
-        teardown: "Démolir",
-        teardownAccessibility: "Commandes de démontage de Worktree",
+        teardown: "Démontage",
+        teardownAccessibility: "Commandes de démontage du worktree",
       },
       scripts: {
         title: "Scripts",
-        info: "Services de longue durée et commandes ponctuelles que vous pouvez lancer à partir de n'importe quel agent de ce projet",
-        empty: "Pas encore de scripts.",
+        info: "Services de longue durée et commandes ponctuelles que vous pouvez lancer depuis n’importe quel agent de ce projet",
+        empty: "Aucun script pour le moment.",
         untitled: "Script sans titre",
-        port: "port{{port}}",
-        menuAccessibility: "Ouvrir le menu des scripts",
-        removeTitle: "Supprimer le script?",
-        removeMessage: "Supprimer{{name}}?",
-        removeFallbackName: "ce scénario",
+        port: "port {{port}}",
+        menuAccessibility: "Ouvrir le menu du script",
+        removeTitle: "Supprimer le script ?",
+        removeMessage: "Supprimer {{name}} ?",
+        removeFallbackName: "ce script",
         name: "Nom",
         command: "Commande",
         nameAccessibility: "Nom du script",
-        commandAccessibility: "Commande de script",
-        nameRequired: "Le nom est requis",
-        commandRequired: "La commande est requise",
-        newScript: "Nouveau scénario",
-        editScript: "Modifier{{name}}",
-        runAsService: "Exécuter en tant que service",
-        serviceHint: "Paseosupervise le processus et attribue un port via $PASEO_PORT",
+        commandAccessibility: "Commande du script",
+        nameRequired: "Le nom est obligatoire",
+        commandRequired: "La commande est obligatoire",
+        newScript: "Nouveau script",
+        editScript: "Modifier {{name}}",
+        runAsService: "Exécuter comme service",
+        serviceHint: "Paseo supervise le processus et lui attribue un port via $PASEO_PORT",
         actions: {
           add: "Ajouter un script",
           edit: "Modifier",
-          remove: "Retirer",
+          remove: "Supprimer",
         },
       },
       metadata: {
-        title: "Génération de métadonnées",
-        info: "Instructions spécifiques au projet injectées dans les invites de l'IA quePaseoutilise pour générer des métadonnées: utilisez-les pour appliquer les conventions de votre équipe telles que la dénomination des branches, le style de validation ou le formatPR.",
-        branchName: "Noms des succursales",
+        title: "Génération des métadonnées",
+        info: "Instructions propres au projet, injectées dans les prompts IA que Paseo utilise pour générer les métadonnées : servez-vous-en pour imposer les conventions de votre équipe (nommage des branches, style de commit, format des PR).",
+        branchName: "Noms de branches",
         branchNamePlaceholder:
-          "Préfixez les branches avec feat/ ou fix/, mb/ pour les branches personnelles",
-        commitMessage: "Valider les messages",
-        commitMessagePlaceholder: "Utiliser des commits conventionnels avec une portée",
-        pullRequest: "Demandes de tirage",
+          "Préfixez les branches par feat/ ou fix/, et par mb/ pour les branches personnelles",
+        commitMessage: "Messages de commit",
+        commitMessagePlaceholder: "Utilisez les Conventional Commits avec un scope",
+        pullRequest: "Pull requests",
         pullRequestPlaceholder:
-          "Commencez avec un résumé d'un paragraphe, incluez une section sur le plan de test",
+          "Commencez par un résumé d’un paragraphe et incluez une section « Test plan »",
       },
       writeFailures: {
         staleTitle: "Configuration modifiée sur le disque",
-        staleDescription: "Rechargez pour récupérer le dernier paseo.json avant de sauvegarder.",
-        failedTitle: "Impossible d'enregistrer paseo.json",
-        failedDescription: "Réessayez ou rechargez la dernière version à partir du disque.",
+        staleDescription:
+          "Rechargez pour récupérer la dernière version de paseo.json avant d’enregistrer.",
+        failedTitle: "Impossible d’enregistrer paseo.json",
+        failedDescription: "Réessayez ou rechargez la dernière version depuis le disque.",
       },
       actions: {
         reload: "Recharger",
-        tryAgain: "Essayer à nouveau",
-        save: "Sauvegarder",
+        tryAgain: "Réessayer",
+        save: "Enregistrer",
         saved: "Projet enregistré",
-        saving: "Sauvegarde...",
+        saving: "Enregistrement…",
         cancel: "Annuler",
       },
     },
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 1e2e95838d..9899d0ff2b 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -2,16 +2,43 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const ja: TranslationResources = {
+  paneFind: {
+    connectionFailure:
+      "このチャットを検索できませんでした。ホストへの接続を確認して再試行してください。",
+    historyChangedFailure: "検索中にチャットが変更されました。もう一度検索してください。",
+    revealFailure: "この一致を表示できませんでした。再試行してください。",
+    searching: "検索中…",
+    loading: "読み込み中…",
+    failed: "失敗",
+    retry: "再試行",
+
+    title: "検索",
+    placeholder: "ペイン内を検索",
+    close: "検索を閉じる",
+    matches: "検索結果",
+    previous: "前の一致",
+    next: "次の一致",
+    toggleReplace: "置換を切り替え",
+    replaceWith: "置換後の文字列",
+    replace: "置換",
+    replaceAll: "すべて置換",
+    noMatches: "一致なし",
+    position: "{{current}} / {{total}}",
+    total: "{{total}} 件の一致",
+  },
   common: {
+    bottomSheetBackdrop: "ボトムシートの背景",
     back: "戻る",
     loading: "読み込み中...",
     actions: {
+      save: "保存",
       back: "戻る",
       cancel: "キャンセル",
       close: "閉じる",
       copy: "コピー",
       copyLine: "行をコピー",
       dismiss: "閉じる",
+      reload: "再読み込み",
       retry: "再試行",
       search: "検索",
       select: "選択",
@@ -98,6 +125,8 @@ export const ja: TranslationResources = {
     input: {
       accessibilityLabel: "エージェントにメッセージ...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "全画面表示",
+      exitFullscreen: "全画面表示を終了",
       focusHint: "{{shortcut}}でフォーカス",
       addAttachment: "添付ファイルを追加",
       interruptAgent: "エージェントを中断",
@@ -153,7 +182,8 @@ export const ja: TranslationResources = {
       initialPromptRequired: "初期プロンプトが必要です",
       alreadyLoading: "すでに読み込み中です",
       uploadFailed: "ファイルのアップロードに失敗しました",
-      noClipboardImage: "クリップボードに画像がありません",
+      noClipboardImage:
+        "現在のクリップボードに画像がありません。キーボードから貼り付けてみてください。",
       pasteImageFailed: "画像を貼り付けられませんでした",
       fileTooLarge: "{{fileName}}が大きすぎます（最大{{size}}）",
     },
@@ -208,6 +238,10 @@ export const ja: TranslationResources = {
     historyLoadFailed: "エージェントの履歴を読み込めませんでした",
     messageCapped: "このメッセージは上限で切り詰められました（{{bytes}}バイト）。",
     permission: {
+      rejectedPlan: "却下されたプラン",
+      approvedPlan: "承認されたプラン",
+      canceledPlan: "キャンセルされたプラン",
+
       plan: "プラン",
       required: "権限が必要です",
       deny: "拒否",
@@ -221,7 +255,8 @@ export const ja: TranslationResources = {
     states: {
       notFound: "エージェントが見つかりません",
       failedToLoad: "エージェントの読み込みに失敗しました",
-      reconnecting: "再接続中",
+      reconnecting: "ホストに再接続中",
+      updating: "メッセージを更新中",
       timelineSyncFailed: "エージェントの履歴を更新できませんでした。",
       timelineSyncRetrying: "再試行しています…",
       archivingTitle: "エージェントをアーカイブ中...",
@@ -355,6 +390,9 @@ export const ja: TranslationResources = {
         completed: "完了",
       },
     },
+    turnFooter: {
+      workedFor: "作業時間 {{duration}}",
+    },
     compaction: {
       loading: "コンテキストを圧縮中...",
       auto: "コンテキストが自動的に圧縮されました",
@@ -413,7 +451,9 @@ export const ja: TranslationResources = {
       recovery: {
         archivedTitle: "ワークスペースはアーカイブ済みです",
         restoreDescription:
-          "{{workspaceName}} はアーカイブされ、worktree が削除されました。ブランチ {{branch}} を復元して再度開きます。",
+          "{{workspaceName}} を復元してエージェントに戻ります。worktree ではブランチ {{branch}} を使用します。",
+        restoreWithoutBranchDescription:
+          "{{workspaceName}} を復元してエージェントに戻ります。保存されたベース、またはリポジトリのデフォルトブランチから新しいブランチを作成します。",
         unarchiveDescription:
           "{{workspaceName}} はアーカイブされています。再度開くにはアーカイブを解除してください。",
         restoreAction: "復元",
@@ -890,6 +930,9 @@ export const ja: TranslationResources = {
         openChangesTab: "変更タブを開く",
         openDiffTab: "差分タブを開く",
         closeChangesTab: "変更タブを閉じる",
+        jumpToFile: {
+          title: "ファイルへ移動",
+        },
         binaryFile: "バイナリファイル",
         tooLarge: "差分が大きすぎて表示できません",
         previewTooLargeTitle: "この差分は大きすぎるためプレビューできません",
@@ -912,11 +955,8 @@ export const ja: TranslationResources = {
         refresh: "更新",
         refreshState: "gitと{{brand}}の状態を更新",
         failedRefresh: "gitの状態の更新に失敗しました。",
-        emptyHiddenWhitespace: "空白を非表示にすると変更は表示されません",
-        emptyUncommitted: "未コミットの変更なし",
         seeUncommittedChanges: "未コミットの変更を表示",
         seeCommittedChanges: "コミット済みの変更を表示",
-        emptyAgainstBase: "{{baseRef}}との差分なし",
         checkingRepository: "リポジトリを確認中...",
         notRepository: "gitリポジトリではありません",
         diffMode: "差分モード",
@@ -949,6 +989,47 @@ export const ja: TranslationResources = {
         actions: {
           viewPullRequest: "表示",
           openOn: "{{brand}}で開く",
+          addToChat: "チャットに追加",
+          addAllToChat: "すべてチャットに追加",
+          addingToChat: "追加中...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "対応が必要なチェックがあります",
+            failure: "失敗したチェックがあります",
+            pending: "完了していないチェックがあります",
+            success: "すべてのチェックに合格しました",
+            none: "チェックなし",
+          },
+          count: {
+            actionRequired: "{{count}} 件要対応",
+            warning: "{{count}} 件警告",
+            failure: "{{count}} 件失敗",
+            pending: "{{count}} 件実行中",
+            manual: "{{count}} 件手動",
+            success: "{{count}} 件成功",
+            ignored: "{{count}} 件スキップ",
+          },
+          detailOne: "チェック: {{parts}}",
+          detailMany: "チェック: {{parts}}",
+          groupOne: {
+            actionRequired: "要対応のチェック {{count}} 件",
+            warning: "警告のチェック {{count}} 件",
+            failure: "失敗したチェック {{count}} 件",
+            pending: "実行中のチェック {{count}} 件",
+            manual: "手動のチェック {{count}} 件",
+            success: "成功したチェック {{count}} 件",
+            ignored: "スキップされたチェック {{count}} 件",
+          },
+          groupMany: {
+            actionRequired: "要対応のチェック {{count}} 件",
+            warning: "警告のチェック {{count}} 件",
+            failure: "失敗したチェック {{count}} 件",
+            pending: "実行中のチェック {{count}} 件",
+            manual: "手動のチェック {{count}} 件",
+            success: "成功したチェック {{count}} 件",
+            ignored: "スキップされたチェック {{count}} 件",
+          },
         },
         checksSummary: {
           passedLabel: "成功",
@@ -962,17 +1043,21 @@ export const ja: TranslationResources = {
           checks: "チェック",
           pipeline: "パイプライン",
           reviews: "レビュー",
+          activity: "アクティビティ",
         },
         empty: {
           noJobs: "ジョブなし",
           loadingPipeline: "パイプラインを読み込み中...",
           pipelineJobsLoadFailed: "パイプラインのジョブを読み込めませんでした",
           allowedToFail: "失敗を許可",
+          noActivity: "まだアクティビティはありません",
         },
         approvals: "{{given}} / {{required}} 承認",
         accessibility: {
           pullRequest: "プルリクエスト#{{number}}",
           pullRequest_mr: "マージリクエスト !{{number}}",
+          commentActions: "コメントの操作",
+          threadActions: "スレッドの操作",
           checkStatus: {
             passed: "成功",
             failed: "失敗",
@@ -1001,6 +1086,8 @@ export const ja: TranslationResources = {
         },
         thread: {
           discussion: "ディスカッションスレッド",
+          resolved: "解決済み",
+          outdated: "古い",
         },
         errors: {
           statusLoadFailed: "プルリクエストのステータスを読み込めません",
@@ -1056,8 +1143,27 @@ export const ja: TranslationResources = {
       updateHost: "ラベルを管理するにはホストを更新してください。",
     },
   },
+  changelog: {
+    title: "新着情報",
+    installed: "インストール済み",
+    showMore: "もっと見る",
+    openWebsite: "変更履歴をすべて表示",
+    error: {
+      title: "変更履歴を読み込めません",
+      description: "接続を確認してもう一度お試しください。",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "{{label}} グループ",
+    statusBucket: {
+      needsInput: "入力待ち",
+      failed: "失敗",
+      readyToReview: "レビュー待ち",
+      working: "実行中",
+      done: "完了",
+    },
     display: {
+      showBackground: "バックグラウンドを表示",
       trigger: "表示設定",
       heading: "表示",
       grouping: {
@@ -1118,6 +1224,9 @@ export const ja: TranslationResources = {
       settings: "設定",
       closeSidebar: "サイドバーを閉じる",
     },
+    footer: {
+      usage: "使用状況",
+    },
     help: {
       trigger: "ヘルプとサポート",
       sectionHelp: "ヘルプ",
@@ -1278,6 +1387,7 @@ export const ja: TranslationResources = {
       detail: "ローカルデーモンを停止中。",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "デーモン",
       status: {
         title: "ステータス",
@@ -1497,6 +1607,8 @@ export const ja: TranslationResources = {
     noFiles: "ファイルまたはディレクトリが見つかりません",
     noCommands: "コマンドが見つかりません",
     failedToLoad: "読み込みに失敗しました",
+    chooseProjectForCommands: "コマンドを表示するにはプロジェクトを選択してください",
+    chooseModelForCommands: "コマンドを表示するにはモデルを選択してください",
   },
   loadOlderHistory: {
     failed: "古い履歴を読み込めませんでした",
@@ -1588,6 +1700,21 @@ export const ja: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "{{host}} のパスワード",
+      label: "ホストのパスワード",
+    },
+    hostConfirmation: {
+      title: "このホストに接続しますか？",
+      description:
+        "このホストはこのアプリ内でコードを実行し、接続中の他のホストにアクセスできるようになります。心当たりがある場合のみ接続してください。",
+      descriptionChanged:
+        "このリンクはこのホストへの接続方法を変更します。ホストはこのアプリ内でコードを実行し、接続中の他のホストにアクセスできるようになります。心当たりがある場合のみ接続してください。",
+      hostLabel: "ホスト",
+      fingerprintLabel: "鍵のフィンガープリント",
+      relayLabel: "リレー",
+      connect: "接続",
+    },
     connectionMethods: {
       title: "接続を追加",
       direct: {
@@ -1654,6 +1781,12 @@ export const ja: TranslationResources = {
       helper: "リモートホストで動作する Paseo デーモンに接続します。",
       fields: {
         target: "SSH ホスト",
+        password: "デーモンのパスワード",
+        optional: "任意",
+      },
+      passwordVisibility: {
+        show: "パスワードを表示",
+        hide: "パスワードを非表示",
       },
       actions: {
         cancel: "キャンセル",
@@ -1886,6 +2019,8 @@ export const ja: TranslationResources = {
     dismiss: "閉じる",
   },
   contextWindow: {
+    noData: "コンテキストデータがありません",
+    accessibilityNoData: "コンテキストウィンドウ：コンテキストデータがありません",
     title: "コンテキストウィンドウ",
     used: "{{percentage}}%使用",
     tokens: "{{used}} / {{max}}トークン",
@@ -1893,6 +2028,18 @@ export const ja: TranslationResources = {
     accessibility: "コンテキストウィンドウ{{percentage}}%使用",
   },
   review: {
+    feedback: {
+      send: "フィードバックを送信 ({{count}})",
+      sending: "フィードバックを送信中 ({{count}})",
+      chooseAgent: "エージェントを選択",
+      sent: "{{recipient}} にフィードバックを送信しました",
+      "no-agents":
+        "フィードバックを送信するには、このワークスペースでエージェントタブを開いてください。",
+      disconnected: "フィードバックを送信するにはホストに接続してください。",
+      "no-context": "保存したコメントはこの差分と一致しなくなりました。",
+      failed: "フィードバックを送信できませんでした。もう一度お試しください。",
+      prompt: "このコードレビューに対応してください。",
+    },
     comment: {
       add: "レビューコメントを追加",
       edit: "レビューコメントを編集",
@@ -1927,8 +2074,11 @@ export const ja: TranslationResources = {
     groupInfo: "{{title}}について",
     sections: {
       general: "一般",
+      chat: "チャット",
       appearance: "外観",
-      layout: en.settings.sections.layout,
+      sidebar: "サイドバー",
+      terminal: "ターミナル",
+      browser: "ブラウザ",
       editor: "エディター",
       shortcuts: "ショートカット",
       integrations: "連携",
@@ -1987,6 +2137,7 @@ export const ja: TranslationResources = {
     },
     general: {
       title: "一般",
+      sending: "送信",
       browserData: {
         title: "ブラウザーデータ",
         siteData: "Cookie とサイトデータ",
@@ -2013,8 +2164,6 @@ export const ja: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "サービスURL",
-        description: "実行中のスクリプトからURLを開く場所",
         options: {
           ask: "確認する",
           inApp: "Paseoで",
@@ -2033,7 +2182,6 @@ export const ja: TranslationResources = {
       toolCallDetail: {
         label: "ツール呼び出しの表示",
         description: "タイムラインでのツール呼び出しの表示方法",
-        accessibilityLabel: "ツール呼び出しの表示を選択（{{value}}）",
         options: {
           overview: "要約",
           detailed: "すべての詳細",
@@ -2087,6 +2235,7 @@ export const ja: TranslationResources = {
     about: {
       title: "アプリ情報",
       appVersion: "アプリバージョン",
+      whatsNewHint: "各バージョンのリリースノート",
       thisDevice: "このデバイス",
       connectedHosts: "接続されているホスト",
       offline: "オフライン",
@@ -2135,8 +2284,15 @@ export const ja: TranslationResources = {
         description: "プロンプト間を移動するためのアウトラインを表示します",
       },
       sidebar: {
-        title: "サイドバー",
-        description: "サイドバー上部に表示する項目とその順序を選択します",
+        header: {
+          title: "ヘッダー",
+          description: "サイドバー上部に表示する項目とその順序を選択します",
+        },
+        footer: {
+          title: "フッター",
+          description:
+            "サイドバー下部に表示する行とその順序を選択します。プロジェクトを追加とアイコンの行は常に表示されます",
+        },
         moveUp: "上に移動",
         moveDown: "下に移動",
       },
@@ -2161,6 +2317,14 @@ export const ja: TranslationResources = {
         codeSizeHint: "コード、差分、ターミナル出力に使用されます",
         codeSizeAccessibility: "コードフォントサイズ",
       },
+      layout: {
+        title: "レイアウト",
+        contentWidth: "コンテンツ幅",
+        contentWidthHint: "ワイド画面でのチャットと Markdown ファイルの最大幅",
+        contentWidthAccessibility: "コンテンツ幅 (ピクセル)",
+        reset: "リセット",
+        resetAccessibility: "コンテンツ幅をデフォルトに戻す",
+      },
       syntax: {
         title: "構文ハイライト",
         highlightTheme: "ハイライトテーマ",
@@ -2272,6 +2436,10 @@ export const ja: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance:
+          "このホストを削除し、このデーモンが求めるパスワードを入力して追加し直してください。",
+      },
       appearance: {
         title: "外観",
         name: {
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index a37feac7a3..c6a8f17b3c 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -2,16 +2,42 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const ko: TranslationResources = {
+  paneFind: {
+    connectionFailure: "이 채팅을 검색할 수 없습니다. 호스트 연결을 확인하고 다시 시도하세요.",
+    historyChangedFailure: "검색 중에 채팅이 변경되었습니다. 다시 검색하세요.",
+    revealFailure: "이 일치 항목을 표시할 수 없습니다. 다시 시도하세요.",
+    searching: "검색 중…",
+    loading: "불러오는 중…",
+    failed: "실패",
+    retry: "다시 시도",
+
+    title: "찾기",
+    placeholder: "패널에서 찾기",
+    close: "찾기 닫기",
+    matches: "검색 결과",
+    previous: "이전 일치 항목",
+    next: "다음 일치 항목",
+    toggleReplace: "바꾸기 표시 전환",
+    replaceWith: "바꿀 내용",
+    replace: "바꾸기",
+    replaceAll: "모두 바꾸기",
+    noMatches: "일치 항목 없음",
+    position: "{{current}} / {{total}}",
+    total: "일치 항목 {{total}}개",
+  },
   common: {
+    bottomSheetBackdrop: "하단 시트 배경",
     back: "뒤로",
     loading: "불러오는 중...",
     actions: {
+      save: "저장",
       back: "뒤로",
       cancel: "취소",
       close: "닫기",
       copy: "복사",
       copyLine: "줄 복사",
       dismiss: "닫기",
+      reload: "다시 로드",
       retry: "다시 시도",
       search: "검색",
       select: "선택",
@@ -98,6 +124,8 @@ export const ko: TranslationResources = {
     input: {
       accessibilityLabel: "에이전트에게 메시지...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "전체 화면",
+      exitFullscreen: "전체 화면 종료",
       focusHint: "{{shortcut}}로 포커스",
       addAttachment: "첨부 추가",
       interruptAgent: "에이전트 중단",
@@ -153,7 +181,7 @@ export const ko: TranslationResources = {
       initialPromptRequired: "초기 프롬프트가 필요합니다",
       alreadyLoading: "이미 불러오는 중입니다",
       uploadFailed: "파일을 업로드하지 못했습니다",
-      noClipboardImage: "클립보드에 이미지가 없습니다.",
+      noClipboardImage: "현재 클립보드에 이미지가 없습니다. 키보드에서 붙여넣기를 시도해 보세요.",
       pasteImageFailed: "이미지를 붙여넣지 못했습니다.",
       fileTooLarge: "{{fileName}}이(가) 너무 큽니다 (최대 {{size}})",
     },
@@ -208,6 +236,10 @@ export const ko: TranslationResources = {
     historyLoadFailed: "에이전트 기록을 로드할 수 없습니다.",
     messageCapped: "이 메시지는 길이 제한으로 잘렸습니다({{bytes}}바이트).",
     permission: {
+      rejectedPlan: "거부된 계획",
+      approvedPlan: "승인된 계획",
+      canceledPlan: "취소된 계획",
+
       plan: "계획",
       required: "권한 필요",
       deny: "거부",
@@ -221,7 +253,8 @@ export const ko: TranslationResources = {
     states: {
       notFound: "에이전트를 찾을 수 없습니다",
       failedToLoad: "에이전트를 불러오지 못했습니다",
-      reconnecting: "다시 연결하는 중",
+      reconnecting: "호스트에 다시 연결하는 중",
+      updating: "메시지 업데이트 중",
       timelineSyncFailed: "에이전트 기록을 새로고침할 수 없습니다.",
       timelineSyncRetrying: "재시도 중…",
       archivingTitle: "에이전트 보관 중...",
@@ -353,6 +386,9 @@ export const ko: TranslationResources = {
         completed: "완료됨",
       },
     },
+    turnFooter: {
+      workedFor: "작업 시간 {{duration}}",
+    },
     compaction: {
       loading: "압축하는 중...",
       auto: "컨텍스트가 자동으로 압축되었습니다",
@@ -411,7 +447,9 @@ export const ko: TranslationResources = {
       recovery: {
         archivedTitle: "워크스페이스가 보관되었습니다",
         restoreDescription:
-          "{{workspaceName}}가 보관되고 워크트리가 제거되었습니다. 다시 열려면 {{branch}} 브랜치를 복원하세요.",
+          "{{workspaceName}}를 복원하여 에이전트로 돌아갑니다. 워크트리는 {{branch}} 브랜치를 사용합니다.",
+        restoreWithoutBranchDescription:
+          "{{workspaceName}}를 복원하여 에이전트로 돌아갑니다. 저장된 기반 브랜치 또는 저장소 기본 브랜치에서 새 브랜치를 만듭니다.",
         unarchiveDescription: "{{workspaceName}}가 보관되었습니다. 다시 열려면 보관을 취소하세요.",
         restoreAction: "복원",
         unarchiveAction: "보관 취소",
@@ -886,6 +924,9 @@ export const ko: TranslationResources = {
         openChangesTab: "변경사항 탭 열기",
         openDiffTab: "Diff 탭 열기",
         closeChangesTab: "변경사항 탭 닫기",
+        jumpToFile: {
+          title: "파일로 이동",
+        },
         binaryFile: "바이너리 파일",
         tooLarge: "표시하기에 diff가 너무 큽니다",
         previewTooLargeTitle: "Diff가 너무 커서 미리 볼 수 없습니다",
@@ -908,11 +949,8 @@ export const ko: TranslationResources = {
         refresh: "새로고침",
         refreshState: "Git 및 {{brand}} 상태 새로고침",
         failedRefresh: "Git 상태를 새로고침하지 못했습니다.",
-        emptyHiddenWhitespace: "공백을 숨긴 후 표시할 변경 사항이 없습니다",
-        emptyUncommitted: "커밋되지 않은 변경 사항이 없습니다",
         seeUncommittedChanges: "커밋되지 않은 변경 사항 보기",
         seeCommittedChanges: "커밋된 변경 사항 보기",
-        emptyAgainstBase: "{{baseRef}} 대비 변경 사항이 없습니다",
         checkingRepository: "저장소 확인 중...",
         notRepository: "Git 저장소가 아닙니다",
         diffMode: "Diff 모드",
@@ -945,6 +983,47 @@ export const ko: TranslationResources = {
         actions: {
           viewPullRequest: "보기",
           openOn: "{{brand}}에서 열기",
+          addToChat: "채팅에 추가",
+          addAllToChat: "모두 채팅에 추가",
+          addingToChat: "추가 중...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "확인이 필요한 검사가 있습니다",
+            failure: "실패한 검사가 있습니다",
+            pending: "아직 완료되지 않은 검사가 있습니다",
+            success: "모든 검사를 통과했습니다",
+            none: "검사 없음",
+          },
+          count: {
+            actionRequired: "{{count}}개 조치 필요",
+            warning: "{{count}}개 경고",
+            failure: "{{count}}개 실패",
+            pending: "{{count}}개 진행 중",
+            manual: "{{count}}개 수동",
+            success: "{{count}}개 성공",
+            ignored: "{{count}}개 건너뜀",
+          },
+          detailOne: "검사: {{parts}}",
+          detailMany: "검사: {{parts}}",
+          groupOne: {
+            actionRequired: "조치 필요 검사 {{count}}개",
+            warning: "경고 검사 {{count}}개",
+            failure: "실패한 검사 {{count}}개",
+            pending: "진행 중인 검사 {{count}}개",
+            manual: "수동 검사 {{count}}개",
+            success: "성공한 검사 {{count}}개",
+            ignored: "건너뛴 검사 {{count}}개",
+          },
+          groupMany: {
+            actionRequired: "조치 필요 검사 {{count}}개",
+            warning: "경고 검사 {{count}}개",
+            failure: "실패한 검사 {{count}}개",
+            pending: "진행 중인 검사 {{count}}개",
+            manual: "수동 검사 {{count}}개",
+            success: "성공한 검사 {{count}}개",
+            ignored: "건너뛴 검사 {{count}}개",
+          },
         },
         checksSummary: {
           passedLabel: "통과",
@@ -958,17 +1037,21 @@ export const ko: TranslationResources = {
           checks: "검사",
           pipeline: "파이프라인",
           reviews: "리뷰",
+          activity: "활동",
         },
         empty: {
           noJobs: "작업 없음",
           loadingPipeline: "파이프라인 로드 중…",
           pipelineJobsLoadFailed: "파이프라인 작업을 로드할 수 없습니다.",
           allowedToFail: "실패가 허용됨",
+          noActivity: "아직 활동이 없습니다",
         },
         approvals: "{{required}} 중 {{given}} 승인",
         accessibility: {
           pullRequest: "풀 리퀘스트 #{{number}}",
           pullRequest_mr: "병합 요청 !{{number}}",
+          commentActions: "댓글 작업",
+          threadActions: "스레드 작업",
           checkStatus: {
             passed: "통과",
             failed: "실패",
@@ -997,6 +1080,8 @@ export const ko: TranslationResources = {
         },
         thread: {
           discussion: "토론 스레드",
+          resolved: "해결됨",
+          outdated: "오래됨",
         },
         errors: {
           statusLoadFailed: "풀 리퀘스트 상태를 불러올 수 없습니다",
@@ -1052,8 +1137,27 @@ export const ko: TranslationResources = {
       updateHost: "레이블을 관리하려면 호스트를 업데이트하세요.",
     },
   },
+  changelog: {
+    title: "새로운 소식",
+    installed: "설치됨",
+    showMore: "더 보기",
+    openWebsite: "전체 변경 내역",
+    error: {
+      title: "변경 내역을 불러오지 못했습니다",
+      description: "연결을 확인한 후 다시 시도하세요.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "{{label}} 그룹",
+    statusBucket: {
+      needsInput: "입력 필요",
+      failed: "실패",
+      readyToReview: "검토 대기",
+      working: "실행 중",
+      done: "완료",
+    },
     display: {
+      showBackground: "백그라운드 표시",
       trigger: "표시 설정",
       heading: "표시",
       grouping: {
@@ -1113,6 +1217,9 @@ export const ko: TranslationResources = {
       settings: "설정",
       closeSidebar: "사이드바 닫기",
     },
+    footer: {
+      usage: "사용량",
+    },
     help: {
       trigger: "도움말 및 지원",
       sectionHelp: "도움말",
@@ -1273,6 +1380,7 @@ export const ko: TranslationResources = {
       detail: "로컬 데몬을 중지하는 중입니다.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "데몬",
       status: {
         title: "상태",
@@ -1492,6 +1600,8 @@ export const ko: TranslationResources = {
     noFiles: "파일 또는 디렉터리를 찾을 수 없습니다",
     noCommands: "명령을 찾을 수 없습니다",
     failedToLoad: "불러오지 못했습니다",
+    chooseProjectForCommands: "명령을 보려면 프로젝트를 선택하세요",
+    chooseModelForCommands: "명령을 보려면 모델을 선택하세요",
   },
   loadOlderHistory: {
     failed: "이전 기록을 불러올 수 없습니다",
@@ -1583,6 +1693,21 @@ export const ko: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "{{host}}의 비밀번호",
+      label: "호스트 비밀번호",
+    },
+    hostConfirmation: {
+      title: "이 호스트에 연결할까요?",
+      description:
+        "이 호스트는 이 앱에서 코드를 실행하고 연결된 다른 호스트에 접근할 수 있게 됩니다. 알고 있는 호스트인 경우에만 연결하세요.",
+      descriptionChanged:
+        "이 링크는 이 호스트에 연결하는 방식을 변경합니다. 호스트는 이 앱에서 코드를 실행하고 연결된 다른 호스트에 접근할 수 있게 됩니다. 알고 있는 호스트인 경우에만 연결하세요.",
+      hostLabel: "호스트",
+      fingerprintLabel: "키 지문",
+      relayLabel: "릴레이",
+      connect: "연결",
+    },
     connectionMethods: {
       title: "연결 추가",
       direct: {
@@ -1648,6 +1773,12 @@ export const ko: TranslationResources = {
       helper: "원격 호스트에서 실행 중인 Paseo 데몬에 연결합니다.",
       fields: {
         target: "SSH 호스트",
+        password: "데몬 비밀번호",
+        optional: "선택 사항",
+      },
+      passwordVisibility: {
+        show: "비밀번호 표시",
+        hide: "비밀번호 숨기기",
       },
       actions: {
         cancel: "취소",
@@ -1878,6 +2009,8 @@ export const ko: TranslationResources = {
     dismiss: "닫기",
   },
   contextWindow: {
+    noData: "컨텍스트 데이터 없음",
+    accessibilityNoData: "컨텍스트 창: 컨텍스트 데이터 없음",
     title: "컨텍스트 윈도우",
     used: "{{percentage}}% 사용됨",
     tokens: "{{used}} / {{max}} 토큰",
@@ -1885,6 +2018,17 @@ export const ko: TranslationResources = {
     accessibility: "컨텍스트 윈도우 {{percentage}}% 사용됨",
   },
   review: {
+    feedback: {
+      send: "피드백 보내기 ({{count}})",
+      sending: "피드백 전송 중 ({{count}})",
+      chooseAgent: "에이전트 선택",
+      sent: "{{recipient}}에게 피드백을 보냈습니다",
+      "no-agents": "피드백을 보내려면 이 작업 공간에서 에이전트 탭을 여세요.",
+      disconnected: "피드백을 보내려면 호스트에 연결하세요.",
+      "no-context": "저장된 댓글이 더 이상 이 변경 사항과 일치하지 않습니다.",
+      failed: "피드백 전송에 실패했습니다. 다시 시도하세요.",
+      prompt: "이 코드 리뷰를 반영해 주세요.",
+    },
     comment: {
       add: "리뷰 댓글 추가",
       edit: "리뷰 댓글 편집",
@@ -1919,8 +2063,11 @@ export const ko: TranslationResources = {
     groupInfo: "{{title}} 정보",
     sections: {
       general: "일반",
+      chat: "채팅",
       appearance: "모양",
-      layout: en.settings.sections.layout,
+      sidebar: "사이드바",
+      terminal: "터미널",
+      browser: "브라우저",
       editor: "편집기",
       shortcuts: "단축키",
       integrations: "통합",
@@ -1979,6 +2126,7 @@ export const ko: TranslationResources = {
     },
     general: {
       title: "일반",
+      sending: "전송",
       browserData: {
         title: "브라우저 데이터",
         siteData: "쿠키 및 사이트 데이터",
@@ -2007,8 +2155,6 @@ export const ko: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "서비스 URL",
-        description: "실행 중인 스크립트의 URL을 열 위치",
         options: {
           ask: "물어보기",
           inApp: "Paseo에서",
@@ -2027,7 +2173,6 @@ export const ko: TranslationResources = {
       toolCallDetail: {
         label: "도구 호출 표시",
         description: "타임라인에 도구 호출이 표시되는 방식",
-        accessibilityLabel: "도구 호출 표시 선택({{value}})",
         options: {
           overview: "요약",
           detailed: "전체 세부정보",
@@ -2081,6 +2226,7 @@ export const ko: TranslationResources = {
     about: {
       title: "정보",
       appVersion: "앱 버전",
+      whatsNewHint: "모든 버전의 릴리스 노트",
       thisDevice: "이 기기",
       connectedHosts: "연결된 호스트",
       offline: "오프라인",
@@ -2129,8 +2275,15 @@ export const ko: TranslationResources = {
         description: "프롬프트 사이를 이동하기 위한 개요 표시",
       },
       sidebar: {
-        title: "사이드바",
-        description: "사이드바 상단에 표시할 항목과 순서를 선택하세요",
+        header: {
+          title: "헤더",
+          description: "사이드바 상단에 표시할 항목과 순서를 선택하세요",
+        },
+        footer: {
+          title: "푸터",
+          description:
+            "사이드바 하단에 표시할 행과 순서를 선택하세요. 프로젝트 추가와 아이콘 행은 항상 표시됩니다",
+        },
         moveUp: "위로 이동",
         moveDown: "아래로 이동",
       },
@@ -2154,6 +2307,14 @@ export const ko: TranslationResources = {
         codeSizeHint: "코드, diff 및 터미널 출력에 사용됩니다",
         codeSizeAccessibility: "코드 글꼴 크기",
       },
+      layout: {
+        title: "레이아웃",
+        contentWidth: "콘텐츠 너비",
+        contentWidthHint: "와이드 화면에서 채팅과 Markdown 파일의 최대 너비",
+        contentWidthAccessibility: "콘텐츠 너비(픽셀)",
+        reset: "재설정",
+        resetAccessibility: "콘텐츠 너비를 기본값으로 재설정",
+      },
       syntax: {
         title: "구문",
         highlightTheme: "강조 테마",
@@ -2263,6 +2424,9 @@ export const ko: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance: "이 호스트를 제거한 뒤 이 데몬이 요구하는 비밀번호로 다시 추가하세요.",
+      },
       appearance: {
         title: "모양",
         name: {
diff --git a/packages/app/src/i18n/resources/plugin-settings.ts b/packages/app/src/i18n/resources/plugin-settings.ts
index 7390beac36..8146ad9747 100644
--- a/packages/app/src/i18n/resources/plugin-settings.ts
+++ b/packages/app/src/i18n/resources/plugin-settings.ts
@@ -1,5 +1,4 @@
 const shared = {
-  directoryPlaceholder: "/absolute/path/on/host",
   logs: {
     action: "Logs",
     title: "Logs: {{id}}",
@@ -14,20 +13,27 @@ const shared = {
 export const pluginSettings = {
   ar: {
     ...shared,
+    screens: {
+      open: "فتح",
+      offline: "اتصل بهذا المضيف لفتح إعدادات الإضافة.",
+      update: "حدّث هذا المضيف لاستخدام إعدادات الإضافة.",
+      unavailable: "شاشة إعدادات الإضافة هذه غير متاحة.",
+      backToPlugins: "العودة إلى الإضافات",
+    },
     title: "الإضافات",
     trustedTitle: "الإضافات تعليمات برمجية موثوقة",
     trustedDescription:
       "تعمل على هذا المضيف وداخل التطبيق دون عزل. ثبّت فقط التعليمات البرمجية التي تثق بها.",
     globalTitle: "تفعيل الإضافات",
     globalHint: "مفتاح عام لكل الإضافات المضبوطة",
-    directoryLabel: "مجلد الإضافة",
-    idLabel: "معرّف تثبيت الإضافة",
-    idHint: "اتركه فارغًا لاستخدام paseo-plugin.json",
-    idPlaceholder: "القيمة الافتراضية للبيان",
-    install: "تثبيت المجلد",
+    sourceLabel: "مصدر الإضافة",
+    sourcePlaceholder: "owner/slug, مجلد أو رابط Git أو حزمة npm",
+    docs: "الوثائق",
+    install: "تثبيت الإضافة",
     installing: "جارٍ التثبيت…",
     status: { running: "قيد التشغيل", disabled: "معطّلة", failed: "فشلت" },
     actions: {
+      menu: "إجراءات {{id}}",
       reload: "إعادة تحميل",
       reloading: "جارٍ إعادة التحميل…",
       enable: "تفعيل",
@@ -53,6 +59,7 @@ export const pluginSettings = {
       offlineTitle: "مضيف الإضافات غير متصل",
       offlineDescription: "أعد الاتصال بهذا المضيف لإدارة إضافاته.",
       updateTitle: "حدّث هذا المضيف لإدارة الإضافات",
+      sourceUpdateTitle: "حدّث هذا المضيف لتثبيت الإضافات",
       loading: "جارٍ تحميل الإضافات…",
       errorTitle: "تعذّر تحميل الإضافات",
       retry: "إعادة المحاولة",
@@ -61,20 +68,27 @@ export const pluginSettings = {
   },
   es: {
     ...shared,
+    screens: {
+      open: "Abrir",
+      offline: "Conéctate a este host para abrir los ajustes del plugin.",
+      update: "Actualiza este host para usar los ajustes del plugin.",
+      unavailable: "Esta pantalla de ajustes del plugin no está disponible.",
+      backToPlugins: "Volver a plugins",
+    },
     title: "Plugins",
     trustedTitle: "Los plugins son código de confianza",
     trustedDescription:
       "Se ejecutan en este host y dentro de la app sin aislamiento. Instala solo código de confianza.",
     globalTitle: "Activar plugins",
     globalHint: "Interruptor global para todos los plugins configurados",
-    directoryLabel: "Directorio del plugin",
-    idLabel: "ID de instalación del plugin",
-    idHint: "Déjalo vacío para usar paseo-plugin.json",
-    idPlaceholder: "Valor del manifiesto",
-    install: "Instalar directorio",
+    sourceLabel: "Fuente del plugin",
+    sourcePlaceholder: "owner/slug, Directorio, URL de Git o paquete npm",
+    docs: "Documentación",
+    install: "Instalar plugin",
     installing: "Instalando…",
     status: { running: "en ejecución", disabled: "desactivado", failed: "fallido" },
     actions: {
+      menu: "Acciones para {{id}}",
       reload: "Recargar",
       reloading: "Recargando…",
       enable: "Activar",
@@ -100,6 +114,7 @@ export const pluginSettings = {
       offlineTitle: "El host de plugins está sin conexión",
       offlineDescription: "Vuelve a conectar este host para gestionar sus plugins.",
       updateTitle: "Actualiza este host para gestionar plugins",
+      sourceUpdateTitle: "Actualiza este host para instalar plugins",
       loading: "Cargando plugins…",
       errorTitle: "No se pudieron cargar los plugins",
       retry: "Reintentar",
@@ -108,20 +123,27 @@ export const pluginSettings = {
   },
   fr: {
     ...shared,
+    screens: {
+      open: "Ouvrir",
+      offline: "Connectez-vous à cet hôte pour ouvrir les paramètres du plugin.",
+      update: "Mettez à jour cet hôte pour utiliser les paramètres du plugin.",
+      unavailable: "Cet écran de paramètres du plugin est indisponible.",
+      backToPlugins: "Retour aux plugins",
+    },
     title: "Plugins",
     trustedTitle: "Les plugins sont du code de confiance",
     trustedDescription:
       "Ils s’exécutent sur cet hôte et dans l’app sans isolation. N’installez que du code fiable.",
     globalTitle: "Activer les plugins",
     globalHint: "Interrupteur global pour tous les plugins configurés",
-    directoryLabel: "Dossier du plugin",
-    idLabel: "ID d’installation du plugin",
-    idHint: "Laissez vide pour utiliser paseo-plugin.json",
-    idPlaceholder: "Valeur du manifeste",
-    install: "Installer le dossier",
+    sourceLabel: "Source du plugin",
+    sourcePlaceholder: "owner/slug, Dossier, URL Git ou paquet npm",
+    docs: "Documentation",
+    install: "Installer le plugin",
     installing: "Installation…",
     status: { running: "actif", disabled: "désactivé", failed: "échec" },
     actions: {
+      menu: "Actions pour {{id}}",
       reload: "Recharger",
       reloading: "Rechargement…",
       enable: "Activer",
@@ -141,12 +163,13 @@ export const pluginSettings = {
       globalEnabled: "Plugins activés",
       globalDisabled: "Plugins désactivés",
     },
-    removeConfirmTitle: "Supprimer {{id}} ?",
+    removeConfirmTitle: "Supprimer {{id}} ?",
     removeConfirmMessage: "La configuration sera supprimée. Le dossier source ne sera pas effacé.",
     states: {
       offlineTitle: "L’hôte des plugins est hors ligne",
       offlineDescription: "Reconnectez cet hôte pour gérer ses plugins.",
       updateTitle: "Mettez cet hôte à jour pour gérer les plugins",
+      sourceUpdateTitle: "Mettez cet hôte à jour pour installer des plugins",
       loading: "Chargement des plugins…",
       errorTitle: "Impossible de charger les plugins",
       retry: "Réessayer",
@@ -155,20 +178,27 @@ export const pluginSettings = {
   },
   ja: {
     ...shared,
+    screens: {
+      open: "開く",
+      offline: "このホストに接続してプラグイン設定を開いてください。",
+      update: "プラグイン設定を使用するには、このホストを更新してください。",
+      unavailable: "このプラグイン設定画面は利用できません。",
+      backToPlugins: "プラグインに戻る",
+    },
     title: "プラグイン",
     trustedTitle: "プラグインは信頼済みコードです",
     trustedDescription:
       "ホストとアプリ内で分離されずに実行されます。信頼できるコードのみインストールしてください。",
     globalTitle: "プラグインを有効化",
     globalHint: "設定済みプラグインすべての共通スイッチ",
-    directoryLabel: "プラグインディレクトリ",
-    idLabel: "プラグインのインストール ID",
-    idHint: "paseo-plugin.json を使う場合は空欄にします",
-    idPlaceholder: "マニフェストの既定値",
-    install: "ディレクトリをインストール",
+    sourceLabel: "プラグインソース",
+    sourcePlaceholder: "owner/slug, ディレクトリ、Git URL、npm パッケージ",
+    docs: "ドキュメント",
+    install: "プラグインをインストール",
     installing: "インストール中…",
     status: { running: "実行中", disabled: "無効", failed: "失敗" },
     actions: {
+      menu: "{{id}} のアクション",
       reload: "再読み込み",
       reloading: "再読み込み中…",
       enable: "有効化",
@@ -194,6 +224,7 @@ export const pluginSettings = {
       offlineTitle: "プラグインホストはオフラインです",
       offlineDescription: "プラグインを管理するにはホストに再接続してください。",
       updateTitle: "プラグインを管理するにはホストを更新してください",
+      sourceUpdateTitle: "プラグインをインストールするにはこのホストを更新してください",
       loading: "プラグインを読み込み中…",
       errorTitle: "プラグインを読み込めません",
       retry: "再試行",
@@ -202,19 +233,26 @@ export const pluginSettings = {
   },
   ko: {
     ...shared,
+    screens: {
+      open: "열기",
+      offline: "플러그인 설정을 열려면 이 호스트에 연결하세요.",
+      update: "플러그인 설정을 사용하려면 이 호스트를 업데이트하세요.",
+      unavailable: "이 플러그인 설정 화면을 사용할 수 없습니다.",
+      backToPlugins: "플러그인으로 돌아가기",
+    },
     title: "플러그인",
     trustedTitle: "플러그인은 신뢰하는 코드입니다",
     trustedDescription: "호스트와 앱 안에서 격리 없이 실행됩니다. 신뢰하는 코드만 설치하세요.",
     globalTitle: "플러그인 활성화",
     globalHint: "설정된 모든 플러그인의 전역 스위치",
-    directoryLabel: "플러그인 디렉터리",
-    idLabel: "플러그인 설치 ID",
-    idHint: "paseo-plugin.json을 사용하려면 비워 두세요",
-    idPlaceholder: "매니페스트 기본값",
-    install: "디렉터리 설치",
+    sourceLabel: "플러그인 소스",
+    sourcePlaceholder: "owner/slug, 디렉터리, Git URL 또는 npm 패키지",
+    docs: "문서",
+    install: "플러그인 설치",
     installing: "설치 중…",
     status: { running: "실행 중", disabled: "비활성화", failed: "실패" },
     actions: {
+      menu: "{{id}} 작업",
       reload: "다시 로드",
       reloading: "다시 로드 중…",
       enable: "활성화",
@@ -240,6 +278,7 @@ export const pluginSettings = {
       offlineTitle: "플러그인 호스트가 오프라인입니다",
       offlineDescription: "플러그인을 관리하려면 호스트에 다시 연결하세요.",
       updateTitle: "플러그인을 관리하려면 호스트를 업데이트하세요",
+      sourceUpdateTitle: "플러그인을 설치하려면 이 호스트를 업데이트하세요",
       loading: "플러그인 로드 중…",
       errorTitle: "플러그인을 로드할 수 없습니다",
       retry: "다시 시도",
@@ -248,20 +287,27 @@ export const pluginSettings = {
   },
   "pt-BR": {
     ...shared,
+    screens: {
+      open: "Abrir",
+      offline: "Conecte-se a este host para abrir as configurações do plugin.",
+      update: "Atualize este host para usar as configurações do plugin.",
+      unavailable: "Esta tela de configurações do plugin está indisponível.",
+      backToPlugins: "Voltar para plugins",
+    },
     title: "Plugins",
     trustedTitle: "Plugins são código confiável",
     trustedDescription:
       "Eles rodam neste host e dentro do app sem isolamento. Instale apenas código confiável.",
     globalTitle: "Ativar plugins",
     globalHint: "Controle global para todos os plugins configurados",
-    directoryLabel: "Diretório do plugin",
-    idLabel: "ID de instalação do plugin",
-    idHint: "Deixe vazio para usar paseo-plugin.json",
-    idPlaceholder: "Padrão do manifesto",
-    install: "Instalar diretório",
+    sourceLabel: "Fonte do plugin",
+    sourcePlaceholder: "owner/slug, Diretório, URL Git ou pacote npm",
+    docs: "Documentação",
+    install: "Instalar plugin",
     installing: "Instalando…",
     status: { running: "em execução", disabled: "desativado", failed: "falhou" },
     actions: {
+      menu: "Ações para {{id}}",
       reload: "Recarregar",
       reloading: "Recarregando…",
       enable: "Ativar",
@@ -287,6 +333,7 @@ export const pluginSettings = {
       offlineTitle: "O host de plugins está offline",
       offlineDescription: "Reconecte este host para gerenciar seus plugins.",
       updateTitle: "Atualize este host para gerenciar plugins",
+      sourceUpdateTitle: "Atualize este host para instalar plugins",
       loading: "Carregando plugins…",
       errorTitle: "Não foi possível carregar os plugins",
       retry: "Tentar novamente",
@@ -295,20 +342,27 @@ export const pluginSettings = {
   },
   ru: {
     ...shared,
+    screens: {
+      open: "Открыть",
+      offline: "Подключитесь к этому хосту, чтобы открыть настройки плагина.",
+      update: "Обновите этот хост, чтобы использовать настройки плагина.",
+      unavailable: "Этот экран настроек плагина недоступен.",
+      backToPlugins: "Вернуться к плагинам",
+    },
     title: "Плагины",
     trustedTitle: "Плагины — доверенный код",
     trustedDescription:
       "Они выполняются на хосте и в приложении без изоляции. Устанавливайте только доверенный код.",
     globalTitle: "Включить плагины",
     globalHint: "Общий переключатель для всех настроенных плагинов",
-    directoryLabel: "Каталог плагина",
-    idLabel: "ID установки плагина",
-    idHint: "Оставьте пустым, чтобы использовать paseo-plugin.json",
-    idPlaceholder: "Значение из манифеста",
-    install: "Установить каталог",
+    sourceLabel: "Источник плагина",
+    sourcePlaceholder: "owner/slug, Каталог, URL Git или пакет npm",
+    docs: "Документация",
+    install: "Установить плагин",
     installing: "Установка…",
     status: { running: "работает", disabled: "отключён", failed: "ошибка" },
     actions: {
+      menu: "Действия для {{id}}",
       reload: "Перезагрузить",
       reloading: "Перезагрузка…",
       enable: "Включить",
@@ -334,6 +388,7 @@ export const pluginSettings = {
       offlineTitle: "Хост плагинов не в сети",
       offlineDescription: "Подключите хост снова, чтобы управлять плагинами.",
       updateTitle: "Обновите хост для управления плагинами",
+      sourceUpdateTitle: "Обновите этот хост для установки плагинов",
       loading: "Загрузка плагинов…",
       errorTitle: "Не удалось загрузить плагины",
       retry: "Повторить",
@@ -342,19 +397,26 @@ export const pluginSettings = {
   },
   "zh-CN": {
     ...shared,
+    screens: {
+      open: "打开",
+      offline: "连接到此主机以打开插件设置。",
+      update: "更新此主机以使用插件设置。",
+      unavailable: "此插件设置页面不可用。",
+      backToPlugins: "返回插件",
+    },
     title: "插件",
     trustedTitle: "插件是受信任的代码",
     trustedDescription: "它们会在此主机和应用内运行，且没有隔离。请仅安装你信任的代码。",
     globalTitle: "启用插件",
     globalHint: "所有已配置插件的全局开关",
-    directoryLabel: "插件目录",
-    idLabel: "插件安装 ID",
-    idHint: "留空以使用 paseo-plugin.json",
-    idPlaceholder: "清单默认值",
-    install: "安装目录",
+    sourceLabel: "插件来源",
+    sourcePlaceholder: "owner/slug, 目录、Git URL 或 npm 包",
+    docs: "文档",
+    install: "安装插件",
     installing: "正在安装…",
     status: { running: "运行中", disabled: "已禁用", failed: "失败" },
     actions: {
+      menu: "{{id}} 的操作",
       reload: "重新加载",
       reloading: "正在重新加载…",
       enable: "启用",
@@ -380,6 +442,7 @@ export const pluginSettings = {
       offlineTitle: "插件主机离线",
       offlineDescription: "重新连接此主机以管理其插件。",
       updateTitle: "更新此主机以管理插件",
+      sourceUpdateTitle: "更新此主机以安装插件",
       loading: "正在加载插件…",
       errorTitle: "无法加载插件",
       retry: "重试",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index f6ee9bdc29..66a25e9f03 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -2,16 +2,43 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const ptBR: TranslationResources = {
+  paneFind: {
+    connectionFailure:
+      "Não foi possível pesquisar nesta conversa. Verifique a conexão com o host e tente novamente.",
+    historyChangedFailure: "A conversa mudou durante a busca. Busque novamente.",
+    revealFailure: "Não foi possível mostrar esta correspondência. Tente novamente.",
+    searching: "Buscando…",
+    loading: "Carregando…",
+    failed: "Falhou",
+    retry: "Tentar novamente",
+
+    title: "Buscar",
+    placeholder: "Buscar no painel",
+    close: "Fechar busca",
+    matches: "Correspondências",
+    previous: "Correspondência anterior",
+    next: "Próxima correspondência",
+    toggleReplace: "Mostrar substituição",
+    replaceWith: "Substituir por",
+    replace: "Substituir",
+    replaceAll: "Substituir tudo",
+    noMatches: "Nenhuma correspondência",
+    position: "{{current}} de {{total}}",
+    total: "{{total}} correspondências",
+  },
   common: {
+    bottomSheetBackdrop: "Fundo do painel inferior",
     back: "Voltar",
     loading: "Carregando...",
     actions: {
+      save: "Salvar",
       back: "Voltar",
       cancel: "Cancelar",
       close: "Fechar",
       copy: "Copiar",
       copyLine: "Copiar linha",
       dismiss: "Dispensar",
+      reload: "Recarregar",
       retry: "Tentar novamente",
       search: "Buscar",
       select: "Selecionar",
@@ -98,6 +125,8 @@ export const ptBR: TranslationResources = {
     input: {
       accessibilityLabel: "Enviar mensagem ao agente...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Tela cheia",
+      exitFullscreen: "Sair da tela cheia",
       focusHint: "{{shortcut}} para focar",
       addAttachment: "Adicionar anexo",
       interruptAgent: "Interromper agente",
@@ -153,7 +182,7 @@ export const ptBR: TranslationResources = {
       initialPromptRequired: "O prompt inicial é obrigatório",
       alreadyLoading: "Já está carregando",
       uploadFailed: "Falha ao enviar arquivo",
-      noClipboardImage: "Não há imagem na área de transferência",
+      noClipboardImage: "Não há imagem na área de transferência atual. Tente colar pelo teclado.",
       pasteImageFailed: "Falha ao colar a imagem",
       fileTooLarge: "{{fileName}} é grande demais (máximo {{size}})",
     },
@@ -208,6 +237,10 @@ export const ptBR: TranslationResources = {
     historyLoadFailed: "Não foi possível carregar o histórico do agente",
     messageCapped: "Esta mensagem foi truncada ({{bytes}} bytes).",
     permission: {
+      rejectedPlan: "Plano rejeitado",
+      approvedPlan: "Plano aprovado",
+      canceledPlan: "Plano cancelado",
+
       plan: "Plano",
       required: "Permissão necessária",
       deny: "Negar",
@@ -221,7 +254,8 @@ export const ptBR: TranslationResources = {
     states: {
       notFound: "Agente não encontrado",
       failedToLoad: "Falha ao carregar agente",
-      reconnecting: "Reconectando",
+      reconnecting: "Reconectando ao host",
+      updating: "Atualizando mensagens",
       timelineSyncFailed: "Não foi possível atualizar o histórico do agente.",
       timelineSyncRetrying: "Tentando novamente…",
       archivingTitle: "Arquivando agente...",
@@ -355,6 +389,9 @@ export const ptBR: TranslationResources = {
         completed: "Concluída",
       },
     },
+    turnFooter: {
+      workedFor: "Trabalhou por {{duration}}",
+    },
     compaction: {
       loading: "Compactando...",
       auto: "Contexto compactado automaticamente",
@@ -413,7 +450,9 @@ export const ptBR: TranslationResources = {
       recovery: {
         archivedTitle: "Workspace arquivado",
         restoreDescription:
-          "{{workspaceName}} foi arquivado e sua worktree foi removida. Restaure a branch {{branch}} para abri-lo novamente.",
+          "Restaure {{workspaceName}} para voltar aos seus agentes. A worktree usará a branch {{branch}}.",
+        restoreWithoutBranchDescription:
+          "Restaure {{workspaceName}} para voltar aos seus agentes. Uma nova branch partirá da base salva ou da branch padrão do repositório.",
         unarchiveDescription:
           "{{workspaceName}} está arquivado. Desarquive-o para abri-lo novamente.",
         restoreAction: "Restaurar",
@@ -901,6 +940,9 @@ export const ptBR: TranslationResources = {
         openChangesTab: "Abrir a aba Alterações",
         openDiffTab: "Abrir a aba Diff",
         closeChangesTab: "Fechar a aba Alterações",
+        jumpToFile: {
+          title: "Ir para o arquivo",
+        },
         binaryFile: "Arquivo binário",
         tooLarge: "Diff grande demais para exibir",
         previewTooLargeTitle: "Este diff é grande demais para visualizar",
@@ -923,11 +965,8 @@ export const ptBR: TranslationResources = {
         refresh: "Atualizar",
         refreshState: "Atualizar estado do git e do {{brand}}",
         failedRefresh: "Falha ao atualizar estado do git.",
-        emptyHiddenWhitespace: "Nenhuma alteração visível após ocultar espaços em branco",
-        emptyUncommitted: "Nenhuma alteração sem commit",
         seeUncommittedChanges: "Ver alterações sem commit",
         seeCommittedChanges: "Ver alterações com commit",
-        emptyAgainstBase: "Nenhuma alteração vs {{baseRef}}",
         checkingRepository: "Verificando repositório...",
         notRepository: "Não é um repositório git",
         diffMode: "Modo de diff",
@@ -960,6 +999,47 @@ export const ptBR: TranslationResources = {
         actions: {
           viewPullRequest: "Ver",
           openOn: "Abrir no {{brand}}",
+          addToChat: "Adicionar ao chat",
+          addAllToChat: "Adicionar tudo ao chat",
+          addingToChat: "Adicionando...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "Algumas verificações precisam da sua atenção",
+            failure: "Algumas verificações não foram bem-sucedidas",
+            pending: "Algumas verificações ainda não terminaram",
+            success: "Todas as verificações foram aprovadas",
+            none: "Nenhuma verificação",
+          },
+          count: {
+            actionRequired: "{{count}} com ação pendente",
+            warning: "{{count}} com aviso",
+            failure: "{{count}} com falha",
+            pending: "{{count}} em andamento",
+            manual: "{{count}} manual(is)",
+            success: "{{count}} aprovada(s)",
+            ignored: "{{count}} ignorada(s)",
+          },
+          detailOne: "Verificação: {{parts}}",
+          detailMany: "Verificações: {{parts}}",
+          groupOne: {
+            actionRequired: "{{count}} verificação com ação pendente",
+            warning: "{{count}} verificação com aviso",
+            failure: "{{count}} verificação com falha",
+            pending: "{{count}} verificação em andamento",
+            manual: "{{count}} verificação manual",
+            success: "{{count}} verificação aprovada",
+            ignored: "{{count}} verificação ignorada",
+          },
+          groupMany: {
+            actionRequired: "{{count}} verificações com ação pendente",
+            warning: "{{count}} verificações com aviso",
+            failure: "{{count}} verificações com falha",
+            pending: "{{count}} verificações em andamento",
+            manual: "{{count}} verificações manuais",
+            success: "{{count}} verificações aprovadas",
+            ignored: "{{count}} verificações ignoradas",
+          },
         },
         checksSummary: {
           passedLabel: "passou",
@@ -973,17 +1053,21 @@ export const ptBR: TranslationResources = {
           checks: "Verificações",
           pipeline: "Pipeline",
           reviews: "Revisões",
+          activity: "Atividade",
         },
         empty: {
           noJobs: "Sem jobs",
           loadingPipeline: "Carregando pipeline...",
           pipelineJobsLoadFailed: "Não foi possível carregar os jobs do pipeline",
           allowedToFail: "permitido falhar",
+          noActivity: "Nenhuma atividade ainda",
         },
         approvals: "{{given}} de {{required}} aprovações",
         accessibility: {
           pullRequest: "Pull request #{{number}}",
           pullRequest_mr: "Merge request !{{number}}",
+          commentActions: "Ações do comentário",
+          threadActions: "Ações da conversa",
           checkStatus: {
             passed: "Aprovado",
             failed: "Falhou",
@@ -1003,15 +1087,17 @@ export const ptBR: TranslationResources = {
         },
         activity: {
           commented: "Comentou",
-          approved: "Aprovado",
+          approved: "Aprovou",
           requestedChanges: "Solicitou alterações",
-          reviewed: "Revisado",
+          reviewed: "Revisou",
         },
         time: {
           justNow: "agora mesmo",
         },
         thread: {
           discussion: "Tópico de discussão",
+          resolved: "Resolvido",
+          outdated: "Desatualizado",
         },
         errors: {
           statusLoadFailed: "Não foi possível carregar o status da pull request",
@@ -1070,8 +1156,27 @@ export const ptBR: TranslationResources = {
       updateHost: "Atualize este host para gerenciar etiquetas.",
     },
   },
+  changelog: {
+    title: "Novidades",
+    installed: "Instalada",
+    showMore: "Mostrar mais",
+    openWebsite: "Changelog completo",
+    error: {
+      title: "Não foi possível carregar o changelog",
+      description: "Verifique sua conexão e tente novamente.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "Grupo {{label}}",
+    statusBucket: {
+      needsInput: "Precisa de resposta",
+      failed: "Com falha",
+      readyToReview: "Para revisar",
+      working: "Em execução",
+      done: "Concluído",
+    },
     display: {
+      showBackground: "Mostrar espaços em segundo plano",
       trigger: "Preferências de exibição",
       heading: "Exibição",
       grouping: {
@@ -1131,6 +1236,9 @@ export const ptBR: TranslationResources = {
       settings: "Configurações",
       closeSidebar: "Fechar barra lateral",
     },
+    footer: {
+      usage: "Uso",
+    },
     help: {
       trigger: "Ajuda e suporte",
       sectionHelp: "Ajuda",
@@ -1291,6 +1399,7 @@ export const ptBR: TranslationResources = {
       detail: "Parando o daemon local.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Daemon",
       status: {
         title: "Status",
@@ -1512,6 +1621,8 @@ export const ptBR: TranslationResources = {
     noFiles: "Nenhum arquivo ou diretório encontrado",
     noCommands: "Nenhum comando encontrado",
     failedToLoad: "Falha ao carregar",
+    chooseProjectForCommands: "Escolha um projeto para ver os comandos",
+    chooseModelForCommands: "Selecione um modelo para ver os comandos",
   },
   loadOlderHistory: {
     failed: "Não foi possível carregar o histórico mais antigo",
@@ -1603,6 +1714,21 @@ export const ptBR: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "Senha de {{host}}",
+      label: "Senha do host",
+    },
+    hostConfirmation: {
+      title: "Conectar a este host?",
+      description:
+        "Este host poderá executar código neste app e acessar seus outros hosts conectados. Conecte apenas se você o reconhecer.",
+      descriptionChanged:
+        "Este link muda como você se conecta a este host. O host poderá executar código neste app e acessar seus outros hosts conectados. Conecte apenas se você o reconhecer.",
+      hostLabel: "Host",
+      fingerprintLabel: "Impressão da chave",
+      relayLabel: "Relay",
+      connect: "Conectar",
+    },
     connectionMethods: {
       title: "Adicionar conexão",
       direct: {
@@ -1670,6 +1796,12 @@ export const ptBR: TranslationResources = {
       helper: "Conecte-se a um daemon Paseo no host remoto.",
       fields: {
         target: "Host SSH",
+        password: "Senha do daemon",
+        optional: "Opcional",
+      },
+      passwordVisibility: {
+        show: "Mostrar senha",
+        hide: "Ocultar senha",
       },
       actions: {
         cancel: "Cancelar",
@@ -1900,6 +2032,8 @@ export const ptBR: TranslationResources = {
     dismiss: "Dispensar",
   },
   contextWindow: {
+    noData: "Sem dados de contexto",
+    accessibilityNoData: "Janela de contexto: sem dados de contexto",
     title: "Janela de contexto",
     used: "{{percentage}}% usado",
     tokens: "{{used}} / {{max}} tokens",
@@ -1907,6 +2041,17 @@ export const ptBR: TranslationResources = {
     accessibility: "Janela de contexto {{percentage}}% usada",
   },
   review: {
+    feedback: {
+      send: "Enviar comentários ({{count}})",
+      sending: "Enviando comentários ({{count}})",
+      chooseAgent: "Escolher um agente",
+      sent: "Comentários enviados para {{recipient}}",
+      "no-agents": "Abra uma aba de agente neste espaço de trabalho para enviar comentários.",
+      disconnected: "Conecte-se ao host para enviar comentários.",
+      "no-context": "Os comentários salvos não correspondem mais a este diff.",
+      failed: "Falha ao enviar comentários. Tente novamente.",
+      prompt: "Por favor, atenda a esta revisão de código.",
+    },
     comment: {
       add: "Adicionar comentário de revisão",
       edit: "Editar comentário de revisão",
@@ -1941,8 +2086,11 @@ export const ptBR: TranslationResources = {
     groupInfo: "Sobre {{title}}",
     sections: {
       general: "Geral",
+      chat: "Chat",
       appearance: "Aparência",
-      layout: en.settings.sections.layout,
+      sidebar: "Barra lateral",
+      terminal: "Terminal",
+      browser: "Navegador",
       editor: "Editor",
       shortcuts: "Atalhos",
       integrations: "Integrações",
@@ -2001,6 +2149,7 @@ export const ptBR: TranslationResources = {
     },
     general: {
       title: "Geral",
+      sending: "Envio",
       browserData: {
         title: "Dados do navegador",
         siteData: "Cookies e dados de sites",
@@ -2029,8 +2178,6 @@ export const ptBR: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "URLs de serviço",
-        description: "Onde abrir URLs de scripts em execução",
         options: {
           ask: "Perguntar",
           inApp: "No Paseo",
@@ -2050,7 +2197,6 @@ export const ptBR: TranslationResources = {
       toolCallDetail: {
         label: "Exibição de chamadas de ferramentas",
         description: "Como as chamadas de ferramentas aparecem na linha do tempo",
-        accessibilityLabel: "Selecionar exibição de chamadas de ferramentas ({{value}})",
         options: {
           overview: "Resumo",
           detailed: "Detalhes completos",
@@ -2104,6 +2250,7 @@ export const ptBR: TranslationResources = {
     about: {
       title: "Sobre",
       appVersion: "Versão do app",
+      whatsNewHint: "Notas de versão de cada release",
       thisDevice: "Este dispositivo",
       connectedHosts: "Hosts conectados",
       offline: "Offline",
@@ -2152,8 +2299,15 @@ export const ptBR: TranslationResources = {
         description: "Mostrar uma estrutura para navegar entre prompts",
       },
       sidebar: {
-        title: "Barra lateral",
-        description: "Escolha quais itens aparecem no topo da barra lateral e em que ordem",
+        header: {
+          title: "Cabeçalho",
+          description: "Escolha quais itens aparecem no topo da barra lateral e em que ordem",
+        },
+        footer: {
+          title: "Rodapé",
+          description:
+            "Escolha quais linhas aparecem na parte inferior da barra lateral e em que ordem. Adicionar projeto e a linha de ícones sempre aparecem",
+        },
         moveUp: "Mover para cima",
         moveDown: "Mover para baixo",
       },
@@ -2177,6 +2331,14 @@ export const ptBR: TranslationResources = {
         codeSizeHint: "Usado em código, diffs e saída do terminal",
         codeSizeAccessibility: "Tamanho da fonte de código",
       },
+      layout: {
+        title: "Layout",
+        contentWidth: "Largura do conteúdo",
+        contentWidthHint: "Largura máxima do chat e dos arquivos Markdown em telas largas",
+        contentWidthAccessibility: "Largura do conteúdo em pixels",
+        reset: "Redefinir",
+        resetAccessibility: "Redefinir a largura do conteúdo",
+      },
       syntax: {
         title: "Sintaxe",
         highlightTheme: "Tema de destaque",
@@ -2288,6 +2450,9 @@ export const ptBR: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance: "Remova este host e adicione-o novamente com a senha que este daemon pede.",
+      },
       appearance: {
         title: "Aparência",
         name: {
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index eefd8aa147..c06e53eda0 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -2,16 +2,43 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const ru: TranslationResources = {
+  paneFind: {
+    connectionFailure:
+      "Не удалось выполнить поиск в чате. Проверьте подключение к хосту и повторите попытку.",
+    historyChangedFailure: "Чат изменился во время поиска. Выполните поиск снова.",
+    revealFailure: "Не удалось показать это совпадение. Повторите попытку.",
+    searching: "Поиск…",
+    loading: "Загрузка…",
+    failed: "Ошибка",
+    retry: "Повторить",
+
+    title: "Найти",
+    placeholder: "Найти в панели",
+    close: "Закрыть поиск",
+    matches: "Совпадения",
+    previous: "Предыдущее совпадение",
+    next: "Следующее совпадение",
+    toggleReplace: "Показать замену",
+    replaceWith: "Заменить на",
+    replace: "Заменить",
+    replaceAll: "Заменить всё",
+    noMatches: "Нет совпадений",
+    position: "{{current}} из {{total}}",
+    total: "Совпадений: {{total}}",
+  },
   common: {
+    bottomSheetBackdrop: "Фон нижней панели",
     back: "Назад",
     loading: "Загрузка...",
     actions: {
+      save: "Сохранить",
       back: "Назад",
       cancel: "Отмена",
       close: "Закрыть",
       copy: "Копировать",
       copyLine: "Копировать строку",
       dismiss: "Отклонить",
+      reload: "Перезагрузить",
       retry: "Повторить",
       search: "Поиск",
       select: "Выбрать",
@@ -98,6 +125,8 @@ export const ru: TranslationResources = {
     input: {
       accessibilityLabel: "Написать агенту...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Полный экран",
+      exitFullscreen: "Выйти из полноэкранного режима",
       focusHint: "{{shortcut}}, для фокуса",
       addAttachment: "Добавить вложение",
       interruptAgent: "Прервать агента",
@@ -153,7 +182,8 @@ export const ru: TranslationResources = {
       initialPromptRequired: "Необходим инициализирующий промпт",
       alreadyLoading: "Уже загружается",
       uploadFailed: "Ошибка загрузки файла",
-      noClipboardImage: "В буфере обмена нет изображения",
+      noClipboardImage:
+        "В текущем буфере обмена нет изображения. Попробуйте вставить его с клавиатуры.",
       pasteImageFailed: "Не удалось вставить изображение",
       fileTooLarge: "Файл {{fileName}} слишком большой (максимальный размер: {{size}})",
     },
@@ -208,6 +238,10 @@ export const ru: TranslationResources = {
     historyLoadFailed: "Не удалось загрузить историю агента",
     messageCapped: "Это сообщение было обрезано ({{bytes}} байт).",
     permission: {
+      rejectedPlan: "Отклонённый план",
+      approvedPlan: "Одобренный план",
+      canceledPlan: "Отменённый план",
+
       plan: "План",
       required: "Требуется разрешение",
       deny: "Отклонить",
@@ -221,7 +255,8 @@ export const ru: TranslationResources = {
     states: {
       notFound: "Агент не найден",
       failedToLoad: "Не удалось загрузить агента",
-      reconnecting: "Повторное подключение",
+      reconnecting: "Повторное подключение к хосту",
+      updating: "Обновление сообщений",
       timelineSyncFailed: "Не удалось обновить историю агента.",
       timelineSyncRetrying: "Повторная попытка…",
       archivingTitle: "Агент перемещается в архив...",
@@ -354,6 +389,9 @@ export const ru: TranslationResources = {
         completed: "Завершена",
       },
     },
+    turnFooter: {
+      workedFor: "Время работы: {{duration}}",
+    },
     compaction: {
       loading: "Сжатие контекста...",
       auto: "Контекст сжат автоматически",
@@ -412,7 +450,9 @@ export const ru: TranslationResources = {
       recovery: {
         archivedTitle: "Рабочая область в архиве",
         restoreDescription:
-          "Рабочее пространство «{{workspaceName}}» было архивировано, а его worktree удалён. Восстановите ветку {{branch}}, чтобы снова открыть рабочее пространство.",
+          "Восстановите «{{workspaceName}}», чтобы вернуться к его агентам. Worktree будет использовать ветку {{branch}}.",
+        restoreWithoutBranchDescription:
+          "Восстановите «{{workspaceName}}», чтобы вернуться к его агентам. Новая ветка будет создана от сохранённой базовой или ветки репозитория по умолчанию.",
         unarchiveDescription:
           "Рабочее пространство «{{workspaceName}}» находится в архиве. Разархивируйте его, чтобы снова открыть.",
         restoreAction: "Восстановить",
@@ -894,6 +934,9 @@ export const ru: TranslationResources = {
         openChangesTab: "Открыть вкладку «Изменения»",
         openDiffTab: "Открыть вкладку «Дифф»",
         closeChangesTab: "Закрыть вкладку «Изменения»",
+        jumpToFile: {
+          title: "Перейти к файлу",
+        },
         binaryFile: "Бинарный файл",
         tooLarge: "Дифф слишком велик для отображения",
         previewTooLargeTitle: "Этот дифф слишком велик для предварительного просмотра",
@@ -916,11 +959,8 @@ export const ru: TranslationResources = {
         refresh: "Обновить",
         refreshState: "Обновить состояние Git и {{brand}}",
         failedRefresh: "Не удалось обновить состояние Git.",
-        emptyHiddenWhitespace: "После скрытия пробельных изменений видимых изменений нет",
-        emptyUncommitted: "Нет незафиксированных изменений",
         seeUncommittedChanges: "Показать незафиксированные изменения",
         seeCommittedChanges: "Показать зафиксированные изменения",
-        emptyAgainstBase: "Нет изменений относительно {{baseRef}}",
         checkingRepository: "Проверяем репозиторий...",
         notRepository: "Это не репозиторий Git",
         diffMode: "Режим диффа",
@@ -953,6 +993,47 @@ export const ru: TranslationResources = {
         actions: {
           viewPullRequest: "Просмотреть",
           openOn: "Открыть на {{brand}}",
+          addToChat: "Добавить в чат",
+          addAllToChat: "Добавить всё в чат",
+          addingToChat: "Добавление...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "Некоторые проверки требуют внимания",
+            failure: "Некоторые проверки не пройдены",
+            pending: "Некоторые проверки ещё не завершены",
+            success: "Все проверки пройдены",
+            none: "Нет проверок",
+          },
+          count: {
+            actionRequired: "требует действий: {{count}}",
+            warning: "с предупреждением: {{count}}",
+            failure: "не пройдено: {{count}}",
+            pending: "выполняется: {{count}}",
+            manual: "вручную: {{count}}",
+            success: "пройдено: {{count}}",
+            ignored: "пропущено: {{count}}",
+          },
+          detailOne: "Проверка ({{parts}})",
+          detailMany: "Проверки ({{parts}})",
+          groupOne: {
+            actionRequired: "Требует действий: {{count}}",
+            warning: "С предупреждением: {{count}}",
+            failure: "Не пройдена: {{count}}",
+            pending: "Выполняется: {{count}}",
+            manual: "Ручная: {{count}}",
+            success: "Пройдена: {{count}}",
+            ignored: "Пропущена: {{count}}",
+          },
+          groupMany: {
+            actionRequired: "Требуют действий: {{count}}",
+            warning: "С предупреждением: {{count}}",
+            failure: "Не пройдены: {{count}}",
+            pending: "Выполняются: {{count}}",
+            manual: "Ручные: {{count}}",
+            success: "Пройдены: {{count}}",
+            ignored: "Пропущены: {{count}}",
+          },
         },
         checksSummary: {
           passedLabel: "успешно",
@@ -966,17 +1047,21 @@ export const ru: TranslationResources = {
           checks: "Проверки",
           pipeline: "Пайплайн",
           reviews: "Ревью",
+          activity: "Активность",
         },
         empty: {
           noJobs: "Нет заданий",
           loadingPipeline: "Загрузка пайплайна...",
           pipelineJobsLoadFailed: "Не удалось загрузить задания пайплайна",
           allowedToFail: "допускается сбой",
+          noActivity: "Активности пока нет",
         },
         approvals: "Одобрено: {{given}} из {{required}}",
         accessibility: {
           pullRequest: "PR #{{number}}",
           pullRequest_mr: "MR !{{number}}",
+          commentActions: "Действия с комментарием",
+          threadActions: "Действия с обсуждением",
           checkStatus: {
             passed: "Успешно",
             failed: "Ошибка",
@@ -1005,6 +1090,8 @@ export const ru: TranslationResources = {
         },
         thread: {
           discussion: "Ветка обсуждения",
+          resolved: "Решено",
+          outdated: "Устарело",
         },
         errors: {
           statusLoadFailed: "Не удалось загрузить статус PR",
@@ -1060,8 +1147,27 @@ export const ru: TranslationResources = {
       updateHost: "Обновите этот хост для управления метками.",
     },
   },
+  changelog: {
+    title: "Что нового",
+    installed: "Установлена",
+    showMore: "Показать ещё",
+    openWebsite: "Полный список изменений",
+    error: {
+      title: "Не удалось загрузить список изменений",
+      description: "Проверьте подключение и попробуйте снова.",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "Группа «{{label}}»",
+    statusBucket: {
+      needsInput: "Ожидает ввода",
+      failed: "Ошибка",
+      readyToReview: "На проверку",
+      working: "В работе",
+      done: "Готово",
+    },
     display: {
+      showBackground: "Показать фоновые пространства",
       trigger: "Настройки отображения",
       heading: "Отображение",
       grouping: {
@@ -1122,6 +1228,9 @@ export const ru: TranslationResources = {
       settings: "Настройки",
       closeSidebar: "Закрыть боковую панель",
     },
+    footer: {
+      usage: "Использование",
+    },
     help: {
       trigger: "Помощь и поддержка",
       sectionHelp: "Помощь",
@@ -1283,6 +1392,7 @@ export const ru: TranslationResources = {
       detail: "Остановка локального демона.",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Демон",
       status: {
         title: "Статус",
@@ -1509,6 +1619,8 @@ export const ru: TranslationResources = {
     noFiles: "Файлы и каталоги не найдены",
     noCommands: "Команды не найдены",
     failedToLoad: "Не удалось загрузить",
+    chooseProjectForCommands: "Выберите проект, чтобы увидеть команды",
+    chooseModelForCommands: "Выберите модель, чтобы увидеть команды",
   },
   loadOlderHistory: {
     failed: "Не удалось загрузить старую историю.",
@@ -1600,6 +1712,21 @@ export const ru: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "Пароль для {{host}}",
+      label: "Пароль хоста",
+    },
+    hostConfirmation: {
+      title: "Подключиться к этому хосту?",
+      description:
+        "Этот хост сможет выполнять код в приложении и обращаться к другим вашим подключённым хостам. Подключайтесь, только если узнаёте его.",
+      descriptionChanged:
+        "Эта ссылка меняет способ подключения к этому хосту. Хост сможет выполнять код в приложении и обращаться к другим вашим подключённым хостам. Подключайтесь, только если узнаёте его.",
+      hostLabel: "Хост",
+      fingerprintLabel: "Отпечаток ключа",
+      relayLabel: "Реле",
+      connect: "Подключить",
+    },
     connectionMethods: {
       title: "Добавить подключение",
       direct: {
@@ -1667,6 +1794,12 @@ export const ru: TranslationResources = {
       helper: "Подключитесь к демону Paseo на удалённом хосте.",
       fields: {
         target: "Хост SSH",
+        password: "Пароль демона",
+        optional: "Необязательно",
+      },
+      passwordVisibility: {
+        show: "Показать пароль",
+        hide: "Скрыть пароль",
       },
       actions: {
         cancel: "Отмена",
@@ -1899,6 +2032,8 @@ export const ru: TranslationResources = {
     dismiss: "Закрыть",
   },
   contextWindow: {
+    noData: "Нет данных о контексте",
+    accessibilityNoData: "Контекстное окно: нет данных о контексте",
     title: "Контекстное окно",
     used: "Использовано: {{percentage}}%",
     tokens: "Токены: {{used}} / {{max}}",
@@ -1906,6 +2041,17 @@ export const ru: TranslationResources = {
     accessibility: "Использовано {{percentage}}% контекстного окна",
   },
   review: {
+    feedback: {
+      send: "Отправить отзыв ({{count}})",
+      sending: "Отправка отзыва ({{count}})",
+      chooseAgent: "Выберите агента",
+      sent: "Отзыв отправлен: {{recipient}}",
+      "no-agents": "Откройте вкладку агента в этой рабочей области, чтобы отправить отзыв.",
+      disconnected: "Подключитесь к хосту, чтобы отправить отзыв.",
+      "no-context": "Сохранённые комментарии больше не соответствуют этому diff.",
+      failed: "Не удалось отправить отзыв. Повторите попытку.",
+      prompt: "Пожалуйста, учтите эту проверку кода.",
+    },
     comment: {
       add: "Добавить комментарий к ревью",
       edit: "Изменить комментарий к ревью",
@@ -1940,8 +2086,11 @@ export const ru: TranslationResources = {
     groupInfo: "О разделе «{{title}}»",
     sections: {
       general: "Основные",
+      chat: "Чат",
       appearance: "Оформление",
-      layout: en.settings.sections.layout,
+      sidebar: "Боковая панель",
+      terminal: "Терминал",
+      browser: "Браузер",
       editor: "Редактор",
       shortcuts: "Сочетания клавиш",
       integrations: "Интеграции",
@@ -2000,6 +2149,7 @@ export const ru: TranslationResources = {
     },
     general: {
       title: "Основные",
+      sending: "Отправка",
       browserData: {
         title: "Данные браузера",
         siteData: "Файлы cookie и данные сайтов",
@@ -2029,8 +2179,6 @@ export const ru: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "URL-адреса сервисов",
-        description: "Где открывать URL-адреса запущенных скриптов",
         options: {
           ask: "Спрашивать",
           inApp: "В Paseo",
@@ -2050,7 +2198,6 @@ export const ru: TranslationResources = {
       toolCallDetail: {
         label: "Отображение вызовов инструментов",
         description: "Как вызовы инструментов отображаются на временной шкале",
-        accessibilityLabel: "Выбрать отображение вызовов инструментов ({{value}})",
         options: {
           overview: "Сводка",
           detailed: "Все подробности",
@@ -2105,6 +2252,7 @@ export const ru: TranslationResources = {
     about: {
       title: "О приложении",
       appVersion: "Версия приложения",
+      whatsNewHint: "Заметки о выпуске для каждой версии",
       thisDevice: "Это устройство",
       connectedHosts: "Подключенные хосты",
       offline: "Оффлайн",
@@ -2154,9 +2302,16 @@ export const ru: TranslationResources = {
         description: "Показывать оглавление для перехода между запросами",
       },
       sidebar: {
-        title: "Боковая панель",
-        description:
-          "Выберите, какие элементы отображаются вверху боковой панели и в каком порядке",
+        header: {
+          title: "Верх",
+          description:
+            "Выберите, какие элементы отображаются вверху боковой панели и в каком порядке",
+        },
+        footer: {
+          title: "Низ",
+          description:
+            "Выберите, какие строки отображаются внизу боковой панели и в каком порядке. «Добавить проект» и ряд значков видны всегда",
+        },
         moveUp: "Переместить вверх",
         moveDown: "Переместить вниз",
       },
@@ -2181,6 +2336,14 @@ export const ru: TranslationResources = {
         codeSizeHint: "Используется для кода, диффов и вывода терминала",
         codeSizeAccessibility: "Размер шрифта кода",
       },
+      layout: {
+        title: "Макет",
+        contentWidth: "Ширина содержимого",
+        contentWidthHint: "Максимальная ширина чата и файлов Markdown на широких экранах",
+        contentWidthAccessibility: "Ширина содержимого в пикселях",
+        reset: "Сбросить",
+        resetAccessibility: "Сбросить ширину содержимого",
+      },
       syntax: {
         title: "Синтаксис",
         highlightTheme: "Тема подсветки",
@@ -2291,6 +2454,10 @@ export const ru: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance:
+          "Удалите этот хост и добавьте его снова с паролем, который запрашивает этот демон.",
+      },
       appearance: {
         title: "Оформление",
         name: {
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 35e160de59..27a0d62ac1 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -2,16 +2,42 @@ import { en, type TranslationResources } from "./en";
 import { pluginSettings } from "./plugin-settings";
 
 export const zhCN: TranslationResources = {
+  paneFind: {
+    connectionFailure: "无法搜索此聊天。请检查主机连接后重试。",
+    historyChangedFailure: "搜索期间聊天已更改。请重新搜索。",
+    revealFailure: "无法显示此匹配项。请重试。",
+    searching: "搜索中…",
+    loading: "加载中…",
+    failed: "失败",
+    retry: "重试",
+
+    title: "查找",
+    placeholder: "在窗格中查找",
+    close: "关闭查找",
+    matches: "查找结果",
+    previous: "上一个匹配项",
+    next: "下一个匹配项",
+    toggleReplace: "切换替换",
+    replaceWith: "替换为",
+    replace: "替换",
+    replaceAll: "全部替换",
+    noMatches: "无匹配项",
+    position: "{{current}} / {{total}}",
+    total: "{{total}} 个匹配项",
+  },
   common: {
+    bottomSheetBackdrop: "底部面板背景",
     back: "返回",
     loading: "加载中...",
     actions: {
+      save: "保存",
       back: "返回",
       cancel: "取消",
       close: "关闭",
       copy: "复制",
       copyLine: "复制行",
       dismiss: "关闭",
+      reload: "重新加载",
       retry: "重试",
       search: "搜索",
       select: "选择",
@@ -98,6 +124,8 @@ export const zhCN: TranslationResources = {
     input: {
       accessibilityLabel: "给 Agent 发消息...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "全屏",
+      exitFullscreen: "退出全屏",
       focusHint: "{{shortcut}} 聚焦",
       addAttachment: "添加附件",
       interruptAgent: "中断 Agent",
@@ -153,7 +181,7 @@ export const zhCN: TranslationResources = {
       initialPromptRequired: "初始 prompt 必填",
       alreadyLoading: "正在加载",
       uploadFailed: "Failed to upload file",
-      noClipboardImage: "剪贴板中没有图片",
+      noClipboardImage: "当前剪贴板中没有图片。请尝试通过键盘粘贴。",
       pasteImageFailed: "无法粘贴图片",
       fileTooLarge: "{{fileName}} is too large (max {{size}})",
     },
@@ -208,6 +236,10 @@ export const zhCN: TranslationResources = {
     historyLoadFailed: "无法加载智能体历史记录",
     messageCapped: "此消息已被截断（{{bytes}} 字节）。",
     permission: {
+      rejectedPlan: "已拒绝的计划",
+      approvedPlan: "已批准的计划",
+      canceledPlan: "已取消的计划",
+
       plan: "Plan",
       required: "需要权限",
       deny: "拒绝",
@@ -221,7 +253,8 @@ export const zhCN: TranslationResources = {
     states: {
       notFound: "未找到 Agent",
       failedToLoad: "加载 Agent 失败",
-      reconnecting: "正在重连",
+      reconnecting: "正在重新连接主机",
+      updating: "正在更新消息",
       timelineSyncFailed: "无法刷新代理历史记录。",
       timelineSyncRetrying: "正在重试…",
       archivingTitle: "正在归档 Agent...",
@@ -352,6 +385,9 @@ export const zhCN: TranslationResources = {
         completed: "已完成",
       },
     },
+    turnFooter: {
+      workedFor: "工作了 {{duration}}",
+    },
     compaction: {
       loading: "正在压缩...",
       auto: "上下文已自动压缩",
@@ -410,7 +446,9 @@ export const zhCN: TranslationResources = {
       recovery: {
         archivedTitle: "Workspace 已归档",
         restoreDescription:
-          "{{workspaceName}} 已归档，其 worktree 已移除。恢复分支 {{branch}} 以重新打开。",
+          "恢复 {{workspaceName}} 以返回其中的代理。worktree 将使用分支 {{branch}}。",
+        restoreWithoutBranchDescription:
+          "恢复 {{workspaceName}} 以返回其中的代理。新分支将从保存的基准分支或仓库默认分支创建。",
         unarchiveDescription: "{{workspaceName}} 已归档。取消归档以重新打开。",
         restoreAction: "恢复",
         unarchiveAction: "取消归档",
@@ -871,6 +909,9 @@ export const zhCN: TranslationResources = {
         openChangesTab: "打开“更改”标签页",
         openDiffTab: "打开 Diff 标签页",
         closeChangesTab: "关闭“更改”标签页",
+        jumpToFile: {
+          title: "跳转到文件",
+        },
         binaryFile: "二进制文件",
         tooLarge: "Diff 过大，无法显示",
         previewTooLargeTitle: "此 diff 过大，无法预览",
@@ -893,11 +934,8 @@ export const zhCN: TranslationResources = {
         refresh: "刷新",
         refreshState: "刷新 git 和 {{brand}} 状态",
         failedRefresh: "刷新 git 状态失败。",
-        emptyHiddenWhitespace: "隐藏空白差异后没有可见变更",
-        emptyUncommitted: "没有未 commit 的变更",
         seeUncommittedChanges: "查看未 commit 的变更",
         seeCommittedChanges: "查看已 commit 的变更",
-        emptyAgainstBase: "相对于 {{baseRef}} 没有变更",
         checkingRepository: "正在检查 repository...",
         notRepository: "不是 git repository",
         diffMode: "Diff 模式",
@@ -930,6 +968,47 @@ export const zhCN: TranslationResources = {
         actions: {
           viewPullRequest: "查看",
           openOn: "在 {{brand}} 上打开",
+          addToChat: "添加到聊天",
+          addAllToChat: "全部添加到聊天",
+          addingToChat: "正在添加...",
+        },
+        checksOverview: {
+          headline: {
+            actionRequired: "部分检查需要你处理",
+            failure: "部分检查未通过",
+            pending: "部分检查尚未完成",
+            success: "所有检查均已通过",
+            none: "没有检查",
+          },
+          count: {
+            actionRequired: "{{count}} 个需处理",
+            warning: "{{count}} 个警告",
+            failure: "{{count}} 个失败",
+            pending: "{{count}} 个进行中",
+            manual: "{{count}} 个手动",
+            success: "{{count}} 个成功",
+            ignored: "{{count}} 个已跳过",
+          },
+          detailOne: "检查：{{parts}}",
+          detailMany: "检查：{{parts}}",
+          groupOne: {
+            actionRequired: "{{count}} 个需处理的检查",
+            warning: "{{count}} 个有警告的检查",
+            failure: "{{count}} 个失败的检查",
+            pending: "{{count}} 个进行中的检查",
+            manual: "{{count}} 个手动检查",
+            success: "{{count}} 个成功的检查",
+            ignored: "{{count}} 个已跳过的检查",
+          },
+          groupMany: {
+            actionRequired: "{{count}} 个需处理的检查",
+            warning: "{{count}} 个有警告的检查",
+            failure: "{{count}} 个失败的检查",
+            pending: "{{count}} 个进行中的检查",
+            manual: "{{count}} 个手动检查",
+            success: "{{count}} 个成功的检查",
+            ignored: "{{count}} 个已跳过的检查",
+          },
         },
         checksSummary: {
           passedLabel: "通过",
@@ -943,17 +1022,21 @@ export const zhCN: TranslationResources = {
           checks: "Checks",
           pipeline: "流水线",
           reviews: "Reviews",
+          activity: "动态",
         },
         empty: {
           noJobs: "无作业",
           loadingPipeline: "正在加载流水线...",
           pipelineJobsLoadFailed: "无法加载流水线作业",
           allowedToFail: "允许失败",
+          noActivity: "暂无动态",
         },
         approvals: "{{given}} / {{required}} 批准",
         accessibility: {
           pullRequest: "Pull request #{{number}}",
           pullRequest_mr: "合并请求 !{{number}}",
+          commentActions: "评论操作",
+          threadActions: "讨论串操作",
           checkStatus: {
             passed: "成功",
             failed: "失败",
@@ -966,22 +1049,24 @@ export const zhCN: TranslationResources = {
           },
         },
         states: {
-          draft: "Draft",
-          merged: "已 merge",
+          draft: "草稿",
+          merged: "已合并",
           closed: "已关闭",
-          open: "Open",
+          open: "开放",
         },
         activity: {
           commented: "已评论",
           approved: "已批准",
           requestedChanges: "请求修改",
-          reviewed: "已 review",
+          reviewed: "已审查",
         },
         time: {
           justNow: "刚刚",
         },
         thread: {
           discussion: "讨论主题",
+          resolved: "已解决",
+          outdated: "已过时",
         },
         errors: {
           statusLoadFailed: "无法加载 Pull Request 状态",
@@ -1037,8 +1122,27 @@ export const zhCN: TranslationResources = {
       updateHost: "请更新此主机以管理标签。",
     },
   },
+  changelog: {
+    title: "新功能",
+    installed: "已安装",
+    showMore: "显示更多",
+    openWebsite: "完整更新日志",
+    error: {
+      title: "无法加载更新日志",
+      description: "请检查网络连接后重试。",
+    },
+  },
   sidebar: {
+    statusGroupAccessibility: "{{label}} 分组",
+    statusBucket: {
+      needsInput: "需要输入",
+      failed: "失败",
+      readyToReview: "待查看",
+      working: "运行中",
+      done: "已完成",
+    },
     display: {
+      showBackground: "显示后台工作区",
       trigger: "显示偏好",
       heading: "显示",
       grouping: {
@@ -1098,6 +1202,9 @@ export const zhCN: TranslationResources = {
       settings: "设置",
       closeSidebar: "关闭侧边栏",
     },
+    footer: {
+      usage: "使用情况",
+    },
     help: {
       trigger: "帮助与支持",
       sectionHelp: "帮助",
@@ -1255,6 +1362,7 @@ export const zhCN: TranslationResources = {
       detail: "正在停止本地 daemon。",
     },
     daemon: {
+      lifecycle: en.desktop.daemon.lifecycle,
       title: "Daemon",
       status: {
         title: "状态",
@@ -1465,6 +1573,8 @@ export const zhCN: TranslationResources = {
     noFiles: "没有找到文件或目录",
     noCommands: "没有找到 commands",
     failedToLoad: "加载失败",
+    chooseProjectForCommands: "选择项目以查看命令",
+    chooseModelForCommands: "选择模型以查看命令",
   },
   loadOlderHistory: {
     failed: "无法加载更早历史",
@@ -1556,6 +1666,20 @@ export const zhCN: TranslationResources = {
     },
   },
   pairing: {
+    hostPassword: {
+      title: "{{host}} 的密码",
+      label: "主机密码",
+    },
+    hostConfirmation: {
+      title: "连接到此主机？",
+      description: "此主机将能在此应用中运行代码，并访问你其他已连接的主机。仅在你认识它时才连接。",
+      descriptionChanged:
+        "此链接会改变你连接此主机的方式。该主机将能在此应用中运行代码，并访问你其他已连接的主机。仅在你认识它时才连接。",
+      hostLabel: "主机",
+      fingerprintLabel: "密钥指纹",
+      relayLabel: "中继",
+      connect: "连接",
+    },
     connectionMethods: {
       title: "添加连接",
       direct: {
@@ -1621,6 +1745,12 @@ export const zhCN: TranslationResources = {
       helper: "连接到远程主机上运行的 Paseo 守护进程。",
       fields: {
         target: "SSH 主机",
+        password: "守护进程密码",
+        optional: "可选",
+      },
+      passwordVisibility: {
+        show: "显示密码",
+        hide: "隐藏密码",
       },
       actions: {
         cancel: "取消",
@@ -1847,6 +1977,8 @@ export const zhCN: TranslationResources = {
     dismiss: "关闭",
   },
   contextWindow: {
+    noData: "暂无上下文数据",
+    accessibilityNoData: "上下文窗口：暂无上下文数据",
     title: "上下文窗口",
     used: "已使用 {{percentage}}%",
     tokens: "{{used}} / {{max}} tokens",
@@ -1854,6 +1986,17 @@ export const zhCN: TranslationResources = {
     accessibility: "上下文窗口已使用 {{percentage}}%",
   },
   review: {
+    feedback: {
+      send: "发送反馈 ({{count}})",
+      sending: "正在发送反馈 ({{count}})",
+      chooseAgent: "选择智能体",
+      sent: "已向 {{recipient}} 发送反馈",
+      "no-agents": "请在此工作区打开智能体标签页以发送反馈。",
+      disconnected: "请连接到主机以发送反馈。",
+      "no-context": "保存的评论不再匹配此差异。",
+      failed: "发送反馈失败。请重试。",
+      prompt: "请处理此代码审查。",
+    },
     comment: {
       add: "添加 review 评论",
       edit: "编辑 review 评论",
@@ -1888,8 +2031,11 @@ export const zhCN: TranslationResources = {
     groupInfo: "关于 {{title}}",
     sections: {
       general: "通用",
+      chat: "聊天",
       appearance: "外观",
-      layout: en.settings.sections.layout,
+      sidebar: "侧边栏",
+      terminal: "终端",
+      browser: "浏览器",
       editor: "编辑器",
       shortcuts: "快捷键",
       integrations: "集成",
@@ -1947,6 +2093,7 @@ export const zhCN: TranslationResources = {
     },
     general: {
       title: "通用",
+      sending: "发送",
       browserData: {
         title: "浏览器数据",
         siteData: "Cookie 和网站数据",
@@ -1972,8 +2119,6 @@ export const zhCN: TranslationResources = {
         },
       },
       serviceUrls: {
-        label: "服务 URL",
-        description: "运行脚本中的 URL 打开位置",
         options: {
           ask: "询问",
           inApp: "在 Paseo 中",
@@ -1992,7 +2137,6 @@ export const zhCN: TranslationResources = {
       toolCallDetail: {
         label: "工具调用显示",
         description: "工具调用在时间线中的显示方式",
-        accessibilityLabel: "选择工具调用显示方式（{{value}}）",
         options: {
           overview: "摘要",
           detailed: "完整详情",
@@ -2046,6 +2190,7 @@ export const zhCN: TranslationResources = {
     about: {
       title: "关于",
       appVersion: "应用版本",
+      whatsNewHint: "每个版本的发布说明",
       thisDevice: "此设备",
       connectedHosts: "已连接的 Host",
       offline: "离线",
@@ -2094,8 +2239,14 @@ export const zhCN: TranslationResources = {
         description: "显示用于在提示词之间跳转的大纲",
       },
       sidebar: {
-        title: "侧边栏",
-        description: "选择侧边栏顶部显示的项目及其顺序",
+        header: {
+          title: "顶部",
+          description: "选择侧边栏顶部显示的项目及其顺序",
+        },
+        footer: {
+          title: "底部",
+          description: "选择侧边栏底部显示的行及其顺序。添加项目和图标行始终显示",
+        },
         moveUp: "上移",
         moveDown: "下移",
       },
@@ -2118,6 +2269,14 @@ export const zhCN: TranslationResources = {
         codeSizeHint: "用于代码、差异和终端输出",
         codeSizeAccessibility: "代码字号",
       },
+      layout: {
+        title: "布局",
+        contentWidth: "内容宽度",
+        contentWidthHint: "宽屏上聊天和 Markdown 文件的最大宽度",
+        contentWidthAccessibility: "内容宽度（像素）",
+        reset: "重置",
+        resetAccessibility: "将内容宽度重置为默认值",
+      },
       syntax: {
         title: "语法",
         highlightTheme: "高亮主题",
@@ -2227,6 +2386,9 @@ export const zhCN: TranslationResources = {
       },
     },
     host: {
+      password: {
+        guidance: "移除此主机，然后使用此守护进程要求的密码重新添加。",
+      },
       appearance: {
         title: "外观",
         name: {
diff --git a/packages/app/src/keyboard/keyboard-shortcuts.test.ts b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
index 02e23ba614..2a7960c9b9 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.test.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 import { formatShortcut } from "@/utils/format-shortcut";
+import { keyboardEventToComboString } from "./shortcut-string";
 import {
   buildKeyboardShortcutHelpSections,
   buildEffectiveBindings,
@@ -550,6 +551,36 @@ describe("keyboard-shortcuts", () => {
     expectNoShortcutResolution({ event, context });
   });
 
+  // A rebound pane-focus shortcut has to fire wherever the user is typing.
+  // Its default combo carries `editable: false` so that Cmd+Shift+Arrow keeps
+  // selecting text (the two cases above), and that guard describes the default
+  // combo rather than the action, so it must not survive the rebind.
+  describe("a rebound pane-focus shortcut", () => {
+    const PANE_FOCUS_DOWN_BINDING = "workspace-pane-focus-down-cmd-shift-down";
+    // macOS emits U+2206 for Option+J; the stored combo comes from the code.
+    const altJ = { key: "\u2206", code: "KeyJ", altKey: true };
+
+    it.each(["message-input", "editable"] as const)("fires with %s focused", (focusScope) => {
+      const result = resolveShortcut({
+        event: altJ,
+        context: { isMac: true, focusScope },
+        bindings: buildEffectiveBindings({ [PANE_FOCUS_DOWN_BINDING]: "Alt+J" }),
+      });
+
+      expect(result.match?.action).toBe("workspace.pane.focus.down");
+    });
+
+    it("still fires outside a text field", () => {
+      const result = resolveShortcut({
+        event: altJ,
+        context: { isMac: true, focusScope: "other" },
+        bindings: buildEffectiveBindings({ [PANE_FOCUS_DOWN_BINDING]: "Alt+J" }),
+      });
+
+      expect(result.match?.action).toBe("workspace.pane.focus.down");
+    });
+  });
+
   it("prefers advancing chord candidates over single-combo matches on the same prefix", () => {
     const bindings = buildEffectiveBindings({
       "workspace-terminal-new-ctrl-shift-t-non-mac": "Ctrl+W S",
@@ -593,6 +624,42 @@ describe("keyboard-shortcuts", () => {
     });
   });
 
+  it("completes a chord whose second step carries a modifier", () => {
+    const bindings = buildEffectiveBindings({
+      "command-center-toggle-ctrl-k-non-mac": "Ctrl+K Ctrl+J",
+    });
+
+    // The browser emits a keydown for the bare Control key before every combo,
+    // so the stream for Ctrl+K, release, Ctrl+J is four keydowns, not two.
+    const firstModifier = resolveShortcut({
+      event: { key: "Control", code: "ControlLeft", ctrlKey: true },
+      context: { isMac: false, isDesktop: true },
+      bindings,
+    });
+    const firstStep = resolveShortcut({
+      event: { key: "k", code: "KeyK", ctrlKey: true },
+      context: { isMac: false, isDesktop: true },
+      chordState: firstModifier.nextChordState,
+      bindings,
+    });
+    expect(firstStep.nextChordState.step).toBe(1);
+
+    const secondModifier = resolveShortcut({
+      event: { key: "Control", code: "ControlLeft", ctrlKey: true },
+      context: { isMac: false, isDesktop: true },
+      chordState: firstStep.nextChordState,
+      bindings,
+    });
+    const secondStep = resolveShortcut({
+      event: { key: "j", code: "KeyJ", ctrlKey: true },
+      context: { isMac: false, isDesktop: true },
+      chordState: secondModifier.nextChordState,
+      bindings,
+    });
+
+    expect(secondStep.match?.action).toBe("command-center.toggle");
+  });
+
   it("schedules a chord reset timeout for advancing candidates", () => {
     vi.useFakeTimers();
 
@@ -960,6 +1027,25 @@ describe("unassigned shortcuts", () => {
   });
 
   describe("matching", () => {
+    it("dispatches a captured Dvorak binding on the same logical key", () => {
+      const event = keyboardInput({ key: "b", code: "KeyN", metaKey: true });
+      const combo = keyboardEventToComboString(event as KeyboardEvent);
+      expect(combo).toBe("Cmd+B");
+      const bindings = buildEffectiveBindings({ "sidebar-toggle-left-mac-cmd-b": combo! });
+
+      expect(
+        resolveShortcut({ event, context: { isMac: true, isDesktop: true }, bindings }).match
+          ?.action,
+      ).toBe("sidebar.toggle.left");
+      expect(
+        resolveShortcut({
+          event: { key: "x", code: "KeyB", metaKey: true },
+          context: { isMac: true, isDesktop: true },
+          bindings,
+        }).match,
+      ).toBeNull();
+    });
+
     it("stops matching a shortcut the user unassigned", () => {
       const bindings = buildEffectiveBindings({ [TAB_NEW_BINDING]: UNASSIGNED_COMBO });
 
diff --git a/packages/app/src/keyboard/keyboard-shortcuts.ts b/packages/app/src/keyboard/keyboard-shortcuts.ts
index d18650a80a..4a843124f2 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.ts
@@ -7,6 +7,7 @@ import type {
 } from "@/keyboard/actions";
 import {
   chordStringToShortcutKeys,
+  isModifierKeyCode,
   type KeyCombo,
   parseChordString,
 } from "@/keyboard/shortcut-string";
@@ -1229,14 +1230,33 @@ export function buildEffectiveBindings(overrides: ShortcutOverrides): ParsedShor
     if (binding.repeat === false && lastCombo) {
       lastCombo.repeat = false;
     }
+    const when = withoutDefaultComboGuard(binding.when);
     if (!binding.help?.defaultDisplayKeys) {
-      return { ...binding, combo: override, parsedChord };
+      return { ...binding, combo: override, parsedChord, when };
     }
     const { defaultDisplayKeys: _defaultDisplayKeys, ...help } = binding.help;
-    return { ...binding, combo: override, parsedChord, help };
+    return { ...binding, combo: override, parsedChord, when, help };
   });
 }
 
+/**
+ * `editable: false` is a statement about a binding's *default* combo, not
+ * about its action: the pane-focus defaults carry it so that Cmd+Shift+Arrow
+ * keeps selecting text in a field instead of moving pane focus. An override
+ * replaces that combo, so the guard no longer describes anything and has to
+ * go, the same way `defaultDisplayKeys` does — otherwise the combo the user
+ * picked in Settings silently refuses to fire wherever they are typing.
+ *
+ * The other guards stay. Platform, command center, terminal and focus scope
+ * are properties of the action and of where it makes sense, and none of them
+ * change because the keys did.
+ */
+function withoutDefaultComboGuard(when: ShortcutWhen | undefined): ShortcutWhen | undefined {
+  if (when?.editable !== false) return when;
+  const { editable: _editable, ...rest } = when;
+  return rest;
+}
+
 // --- Matching engine ---
 
 function parseDigit(event: KeyboardShortcutInput): number | null {
@@ -1517,6 +1537,13 @@ export function resolveKeyboardShortcut(input: {
   preventDefault: boolean;
 } {
   const { event, context, chordState, onChordReset, bindings = DEFAULT_BINDINGS } = input;
+  // Pressing a modifier emits its own keydown before the combo that holds it,
+  // so a chord waiting on `Ctrl+J` sees a bare `Control` first. That keydown
+  // matches no combo, and resolving it would drop the chord back to its first
+  // step. It decides nothing: leave the chord where it is.
+  if (isModifierKeyCode(event.code)) {
+    return { match: null, nextChordState: chordState, preventDefault: false };
+  }
   if (chordState.step === 0) {
     return resolveInitialChordStep({ event, context, chordState, onChordReset, bindings });
   }
diff --git a/packages/app/src/keyboard/shift/index.ts b/packages/app/src/keyboard/shift/index.ts
new file mode 100644
index 0000000000..3c56692919
--- /dev/null
+++ b/packages/app/src/keyboard/shift/index.ts
@@ -0,0 +1,5 @@
+export { KeyboardShiftProvider, useKeyboardShiftStyle } from "./internal/provider";
+export { useKeyboardShift, useSettledKeyboardShift } from "./internal/context";
+export { KeyboardTranslateView } from "./internal/translate";
+export { shouldUseCompactExplorerKeyboardPadding } from "./internal/policy";
+export { useKeyboardStreamInset } from "./internal/stream";
diff --git a/packages/app/src/hooks/keyboard-shift-context.ts b/packages/app/src/keyboard/shift/internal/context.ts
similarity index 53%
rename from packages/app/src/hooks/keyboard-shift-context.ts
rename to packages/app/src/keyboard/shift/internal/context.ts
index a6eeb53729..dcb0b4cf64 100644
--- a/packages/app/src/hooks/keyboard-shift-context.ts
+++ b/packages/app/src/keyboard/shift/internal/context.ts
@@ -3,10 +3,14 @@ import type { SharedValue } from "react-native-reanimated";
 
 export interface KeyboardShiftContextValue {
   shift: SharedValue<number>;
+  /** Space reserved at keyboard boundaries, never updated by animation frames. */
+  layoutShift: SharedValue<number>;
+  isMoving: SharedValue<boolean>;
   bottomInset: SharedValue<number>;
 }
 
 export const KeyboardShiftContext = createContext<KeyboardShiftContextValue | null>(null);
+export const SettledKeyboardShiftContext = createContext<number | null>(null);
 
 /** Read the app-wide keyboard inset without loading its native provider implementation. */
 export function useKeyboardShift(): KeyboardShiftContextValue {
@@ -16,3 +20,12 @@ export function useKeyboardShift(): KeyboardShiftContextValue {
   }
   return context;
 }
+
+/** Read the keyboard inset published after native keyboard motion has settled. */
+export function useSettledKeyboardShift(): number {
+  const context = useContext(SettledKeyboardShiftContext);
+  if (context === null) {
+    throw new Error("useSettledKeyboardShift must be used inside KeyboardShiftProvider");
+  }
+  return context;
+}
diff --git a/packages/app/src/hooks/use-keyboard-shift-style.test.ts b/packages/app/src/keyboard/shift/internal/policy.test.ts
similarity index 51%
rename from packages/app/src/hooks/use-keyboard-shift-style.test.ts
rename to packages/app/src/keyboard/shift/internal/policy.test.ts
index 96165d7f1f..330cb2cfab 100644
--- a/packages/app/src/hooks/use-keyboard-shift-style.test.ts
+++ b/packages/app/src/keyboard/shift/internal/policy.test.ts
@@ -1,9 +1,56 @@
 import { describe, expect, it } from "vitest";
 import {
+  resolveStreamKeyboardInset,
   shouldReconcileHiddenKeyboardEnd,
   resolveKeyboardShift,
+  reserveKeyboardLayoutShift,
   shouldUseCompactExplorerKeyboardPadding,
-} from "./keyboard-shift-policy";
+} from "./policy";
+
+describe("keyboard layout reservation", () => {
+  it("reserves the opening destination before motion and releases it only after closing", () => {
+    const opened = reserveKeyboardLayoutShift({ current: 0, target: 308, phase: "start" });
+    expect(opened).toBe(308);
+    const closing = reserveKeyboardLayoutShift({ current: opened, target: 0, phase: "start" });
+    expect(closing).toBe(308);
+    expect(reserveKeyboardLayoutShift({ current: closing, target: 0, phase: "end" })).toBe(0);
+  });
+
+  it("keeps enough space when a resize or reversal interrupts keyboard motion", () => {
+    const resizing = reserveKeyboardLayoutShift({ current: 308, target: 250, phase: "start" });
+    expect(resizing).toBe(308);
+    const reversing = reserveKeyboardLayoutShift({
+      current: resizing,
+      target: 340,
+      phase: "start",
+    });
+    expect(reversing).toBe(340);
+    expect(reserveKeyboardLayoutShift({ current: reversing, target: 340, phase: "end" })).toBe(340);
+  });
+});
+
+describe("resolveStreamKeyboardInset", () => {
+  it("uses the native scroll inset on iOS without changing content size", () => {
+    expect(resolveStreamKeyboardInset({ platform: "ios", settledShift: 311 })).toEqual({
+      contentContainerPaddingBottom: 0,
+      contentInset: { bottom: 311 },
+    });
+  });
+
+  it("keeps Android's exact content-container padding behavior", () => {
+    expect(resolveStreamKeyboardInset({ platform: "android", settledShift: 311 })).toEqual({
+      contentContainerPaddingBottom: 311,
+      contentInset: undefined,
+    });
+  });
+
+  it("does not expose a negative inset", () => {
+    expect(resolveStreamKeyboardInset({ platform: "ios", settledShift: -1 })).toEqual({
+      contentContainerPaddingBottom: 0,
+      contentInset: { bottom: 0 },
+    });
+  });
+});
 
 describe("resolveKeyboardShift", () => {
   it("keeps the existing open-keyboard offset behavior", () => {
diff --git a/packages/app/src/hooks/keyboard-shift-policy.ts b/packages/app/src/keyboard/shift/internal/policy.ts
similarity index 55%
rename from packages/app/src/hooks/keyboard-shift-policy.ts
rename to packages/app/src/keyboard/shift/internal/policy.ts
index 68e013e1b1..97435027fa 100644
--- a/packages/app/src/hooks/keyboard-shift-policy.ts
+++ b/packages/app/src/keyboard/shift/internal/policy.ts
@@ -1,5 +1,35 @@
 export const DEFAULT_IOS_KEYBOARD_INSET_MIN_HEIGHT = 120;
 
+/** Reserve both endpoints during motion so content cannot grow into a closing IME. */
+export function reserveKeyboardLayoutShift(input: {
+  current: number;
+  target: number;
+  phase: "start" | "end";
+}): number {
+  "worklet";
+  return input.phase === "start" ? Math.max(input.current, input.target) : input.target;
+}
+
+export function resolveStreamKeyboardInset(input: {
+  platform: "android" | "ios";
+  settledShift: number;
+}): {
+  contentContainerPaddingBottom: number;
+  contentInset: { bottom: number } | undefined;
+} {
+  const settledShift = Math.max(0, input.settledShift);
+  if (input.platform === "ios") {
+    return {
+      contentContainerPaddingBottom: 0,
+      contentInset: { bottom: settledShift },
+    };
+  }
+  return {
+    contentContainerPaddingBottom: settledShift,
+    contentInset: undefined,
+  };
+}
+
 export function shouldUseCompactExplorerKeyboardPadding(input: {
   isGit: boolean;
   explorerTab: "changes" | "files" | "pr";
diff --git a/packages/app/src/hooks/use-keyboard-shift-style.ts b/packages/app/src/keyboard/shift/internal/provider.ts
similarity index 51%
rename from packages/app/src/hooks/use-keyboard-shift-style.ts
rename to packages/app/src/keyboard/shift/internal/provider.ts
index 6365771573..7b2ff46eae 100644
--- a/packages/app/src/hooks/use-keyboard-shift-style.ts
+++ b/packages/app/src/keyboard/shift/internal/provider.ts
@@ -1,4 +1,4 @@
-import { createElement, useEffect, useMemo, type ReactNode } from "react";
+import { createElement, useCallback, useEffect, useMemo, useState, type ReactNode } from "react";
 import { Platform } from "react-native";
 import type { ViewStyle } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -8,16 +8,19 @@ import {
 } from "react-native-keyboard-controller";
 import {
   useAnimatedStyle,
+  useAnimatedReaction,
   useDerivedValue,
   useSharedValue,
   type SharedValue,
 } from "react-native-reanimated";
+import { scheduleOnRN } from "react-native-worklets";
 import {
   DEFAULT_IOS_KEYBOARD_INSET_MIN_HEIGHT,
   resolveKeyboardShift,
+  reserveKeyboardLayoutShift,
   shouldReconcileHiddenKeyboardEnd,
-} from "@/hooks/keyboard-shift-policy";
-import { KeyboardShiftContext, useKeyboardShift } from "@/hooks/keyboard-shift-context";
+} from "./policy";
+import { KeyboardShiftContext, SettledKeyboardShiftContext, useKeyboardShift } from "./context";
 
 type KeyboardShiftMode = "translate" | "padding";
 
@@ -26,24 +29,17 @@ export function KeyboardShiftProvider({ children }: { children: ReactNode }) {
   const { height: keyboardHeight, progress: keyboardProgress } = useReanimatedKeyboardAnimation();
   const bottomInset = useSharedValue(insets.bottom);
   const isIos = Platform.OS === "ios";
+  const isMoving = useSharedValue(false);
+  const layoutShift = useSharedValue(0);
+  const [settledShift, setSettledShift] = useState(0);
+  const publishSettledShift = useCallback((nextShift: number) => {
+    setSettledShift((currentShift) => (currentShift === nextShift ? currentShift : nextShift));
+  }, []);
 
   useEffect(() => {
     bottomInset.value = insets.bottom;
   }, [bottomInset, insets.bottom]);
 
-  useGenericKeyboardHandler(
-    {
-      onEnd: (event) => {
-        "worklet";
-        if (isIos && shouldReconcileHiddenKeyboardEnd(event)) {
-          keyboardHeight.value = 0;
-          keyboardProgress.value = 0;
-        }
-      },
-    },
-    [isIos, keyboardHeight, keyboardProgress],
-  );
-
   const shift = useDerivedValue(() => {
     "worklet";
     return resolveKeyboardShift({
@@ -55,15 +51,73 @@ export function KeyboardShiftProvider({ children }: { children: ReactNode }) {
     });
   });
 
+  useGenericKeyboardHandler(
+    {
+      onStart: (event) => {
+        "worklet";
+        const target = resolveKeyboardShift({
+          rawKeyboardHeight: event.height,
+          keyboardProgress: event.height > 0 ? 1 : 0,
+          bottomInset: bottomInset.value,
+          isIos,
+          iosMinHeight: DEFAULT_IOS_KEYBOARD_INSET_MIN_HEIGHT,
+        });
+        layoutShift.value = reserveKeyboardLayoutShift({
+          current: layoutShift.value,
+          target,
+          phase: "start",
+        });
+        isMoving.value = true;
+      },
+      onEnd: (event) => {
+        "worklet";
+        const target = resolveKeyboardShift({
+          rawKeyboardHeight: event.height,
+          keyboardProgress: event.progress,
+          bottomInset: bottomInset.value,
+          isIos,
+          iosMinHeight: DEFAULT_IOS_KEYBOARD_INSET_MIN_HEIGHT,
+        });
+        layoutShift.value = reserveKeyboardLayoutShift({
+          current: layoutShift.value,
+          target,
+          phase: "end",
+        });
+        if (isIos && shouldReconcileHiddenKeyboardEnd(event)) {
+          keyboardHeight.value = 0;
+          keyboardProgress.value = 0;
+        }
+        isMoving.value = false;
+      },
+    },
+    [bottomInset, isIos, isMoving, keyboardHeight, keyboardProgress, layoutShift],
+  );
+
+  useAnimatedReaction(
+    () => ({ moving: isMoving.value, shift: shift.value }),
+    (current, previous) => {
+      if (!current.moving && (previous === null || previous.moving)) {
+        scheduleOnRN(publishSettledShift, current.shift);
+      }
+    },
+    [isMoving, publishSettledShift, shift],
+  );
+
   const value = useMemo(
     () => ({
       shift,
+      layoutShift,
+      isMoving,
       bottomInset,
     }),
-    [bottomInset, shift],
+    [bottomInset, isMoving, layoutShift, shift],
   );
 
-  return createElement(KeyboardShiftContext.Provider, { value }, children);
+  return createElement(
+    KeyboardShiftContext.Provider,
+    { value },
+    createElement(SettledKeyboardShiftContext.Provider, { value: settledShift }, children),
+  );
 }
 
 export function useKeyboardShiftStyle(input: { mode: KeyboardShiftMode; enabled?: boolean }): {
diff --git a/packages/app/src/keyboard/shift/internal/stream.ts b/packages/app/src/keyboard/shift/internal/stream.ts
new file mode 100644
index 0000000000..45fe167fe4
--- /dev/null
+++ b/packages/app/src/keyboard/shift/internal/stream.ts
@@ -0,0 +1,17 @@
+import { useMemo } from "react";
+import { Platform } from "react-native";
+import { useSettledKeyboardShift } from "./context";
+import { resolveStreamKeyboardInset } from "./policy";
+
+/** Preserve the translated inverted list's far-end scroll range only after motion settles. */
+export function useKeyboardStreamInset() {
+  const settledShift = useSettledKeyboardShift();
+  return useMemo(
+    () =>
+      resolveStreamKeyboardInset({
+        platform: Platform.OS === "ios" ? "ios" : "android",
+        settledShift,
+      }),
+    [settledShift],
+  );
+}
diff --git a/packages/app/src/keyboard/shift/internal/translate.android.tsx b/packages/app/src/keyboard/shift/internal/translate.android.tsx
new file mode 100644
index 0000000000..2a9e9d581d
--- /dev/null
+++ b/packages/app/src/keyboard/shift/internal/translate.android.tsx
@@ -0,0 +1,30 @@
+import type { ReactNode } from "react";
+import type { ViewProps } from "react-native";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { useKeyboardShift } from "./context";
+
+interface KeyboardTranslateViewProps extends ViewProps {
+  children: ReactNode;
+  enabled?: boolean;
+  /** Space below the view's resting position that the keyboard may fill before the view moves. */
+  bottomClearance?: number;
+}
+
+export function KeyboardTranslateView({
+  children,
+  enabled = true,
+  bottomClearance = 0,
+  style,
+  ...props
+}: KeyboardTranslateViewProps) {
+  const { shift } = useKeyboardShift();
+  const keyboardStyle = useAnimatedStyle(() => ({
+    transform: [{ translateY: enabled ? -Math.max(0, shift.value - bottomClearance) : 0 }],
+  }));
+
+  return (
+    <Animated.View style={[style, keyboardStyle]} {...props}>
+      {children}
+    </Animated.View>
+  );
+}
diff --git a/packages/app/src/keyboard/shift/internal/translate.ios.tsx b/packages/app/src/keyboard/shift/internal/translate.ios.tsx
new file mode 100644
index 0000000000..348fe828d0
--- /dev/null
+++ b/packages/app/src/keyboard/shift/internal/translate.ios.tsx
@@ -0,0 +1,45 @@
+import { useMemo, type ReactNode } from "react";
+import { Animated, type ViewProps } from "react-native";
+import { useKeyboardAnimation } from "react-native-keyboard-controller";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+interface KeyboardTranslateViewProps extends ViewProps {
+  children: ReactNode;
+  enabled?: boolean;
+  /** Space below the view's resting position that the keyboard may fill before the view moves. */
+  bottomClearance?: number;
+}
+
+export function KeyboardTranslateView({
+  children,
+  enabled = true,
+  bottomClearance = 0,
+  style,
+  ...props
+}: KeyboardTranslateViewProps) {
+  const insets = useSafeAreaInsets();
+  const { height, progress } = useKeyboardAnimation();
+  const translateY = useMemo(
+    () =>
+      Animated.add(
+        Animated.add(height, Animated.multiply(progress, insets.bottom)),
+        bottomClearance,
+      ).interpolate({
+        inputRange: [-1, 0],
+        outputRange: [-1, 0],
+        extrapolateLeft: "extend",
+        extrapolateRight: "clamp",
+      }),
+    [bottomClearance, height, insets.bottom, progress],
+  );
+  const keyboardStyle = useMemo(
+    () => ({ transform: [{ translateY: enabled ? translateY : 0 }] }),
+    [enabled, translateY],
+  );
+
+  return (
+    <Animated.View style={[style, keyboardStyle]} {...props}>
+      {children}
+    </Animated.View>
+  );
+}
diff --git a/packages/app/src/keyboard/shift/internal/translate.tsx b/packages/app/src/keyboard/shift/internal/translate.tsx
new file mode 100644
index 0000000000..6a0506c301
--- /dev/null
+++ b/packages/app/src/keyboard/shift/internal/translate.tsx
@@ -0,0 +1,17 @@
+import type { ReactNode } from "react";
+import { View, type ViewProps } from "react-native";
+
+interface KeyboardTranslateViewProps extends ViewProps {
+  children: ReactNode;
+  enabled?: boolean;
+  bottomClearance?: number;
+}
+
+export function KeyboardTranslateView({
+  children,
+  enabled: _enabled,
+  bottomClearance: _bottomClearance,
+  ...props
+}: KeyboardTranslateViewProps) {
+  return <View {...props}>{children}</View>;
+}
diff --git a/packages/app/src/keyboard/shortcut-string.test.ts b/packages/app/src/keyboard/shortcut-string.test.ts
index e7cffee597..8d48d5d986 100644
--- a/packages/app/src/keyboard/shortcut-string.test.ts
+++ b/packages/app/src/keyboard/shortcut-string.test.ts
@@ -22,6 +22,45 @@ function keyboardEvent(overrides: Partial<KeyboardEvent>): KeyboardEvent {
 }
 
 describe("keyboardEventToComboString", () => {
+  it("captures the Dvorak character rather than its QWERTY position", () => {
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: "b", code: "KeyN", metaKey: true })),
+    ).toBe("Cmd+B");
+  });
+
+  it("captures shifted Dvorak letters and punctuation at other physical positions", () => {
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "T", code: "KeyK", metaKey: true, shiftKey: true }),
+      ),
+    ).toBe("Shift+Cmd+T");
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: ";", code: "KeyZ", ctrlKey: true })),
+    ).toBe("Ctrl+;");
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "?", code: "BracketLeft", ctrlKey: true, shiftKey: true }),
+      ),
+    ).toBe("Ctrl+Shift+/");
+  });
+
+  it("keeps named keys and rewritten Option characters capturable", () => {
+    expect(keyboardEventToComboString(keyboardEvent({ key: "ArrowLeft", code: "ArrowLeft" }))).toBe(
+      "ArrowLeft",
+    );
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: "†", code: "KeyT", altKey: true })),
+    ).toBe("Alt+T");
+  });
+
+  it("does not record a named key that dispatch does not support", () => {
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "Enter", code: "NumpadEnter", ctrlKey: true }),
+      ),
+    ).toBeNull();
+  });
+
   it("captures the minus key (regression: previously returned null)", () => {
     expect(keyboardEventToComboString(keyboardEvent({ key: "-", code: "Minus" }))).toBe("-");
   });
diff --git a/packages/app/src/keyboard/shortcut-string.ts b/packages/app/src/keyboard/shortcut-string.ts
index 06a25bd373..8b632befbd 100644
--- a/packages/app/src/keyboard/shortcut-string.ts
+++ b/packages/app/src/keyboard/shortcut-string.ts
@@ -245,8 +245,17 @@ export function heldModifiersFromEvent(event: KeyboardEvent): string | null {
   return parts.length > 0 ? parts.join("+") : null;
 }
 
+/**
+ * Whether a keydown carries a modifier key itself rather than a key pressed
+ * with one. The browser emits one of these before every combo that holds a
+ * modifier, and it is the prefix of a combo, never a combo of its own.
+ */
+export function isModifierKeyCode(code: string): boolean {
+  return MODIFIER_CODES.has(code);
+}
+
 export function keyboardEventToComboString(event: KeyboardEvent): string | null {
-  if (MODIFIER_CODES.has(event.code)) {
+  if (isModifierKeyCode(event.code)) {
     return null;
   }
 
@@ -257,7 +266,16 @@ export function keyboardEventToComboString(event: KeyboardEvent): string | null
   if (event.shiftKey) parts.push("Shift");
   if (event.metaKey) parts.push("Cmd");
 
-  const humanKey = CODE_TO_KEY[event.code];
+  // Capture the same logical character that dispatch matches. Keep the code
+  // fallback for named keys and Option combinations whose key is rewritten.
+  const eventKey = event.key.toLowerCase();
+  const logicalKey = Object.entries(KEY_MAP).find(
+    ([, mapping]) =>
+      mapping.key?.length === 1 &&
+      (mapping.key.toLowerCase() === eventKey ||
+        (event.shiftKey && mapping.shiftedKey === event.key)),
+  )?.[0];
+  const humanKey = logicalKey ?? CODE_TO_KEY[event.code];
   if (humanKey) {
     parts.push(humanKey);
   } else {
diff --git a/packages/app/src/lib/overlay-root.ts b/packages/app/src/lib/overlay-root.ts
index 60cbaa30e3..9ffd81725f 100644
--- a/packages/app/src/lib/overlay-root.ts
+++ b/packages/app/src/lib/overlay-root.ts
@@ -88,6 +88,7 @@ interface WebOverlayEntry {
   getScope: () => HTMLElement | null;
   getKeyHandler: () => WebOverlayKeyHandler;
   restoreFocus: HTMLElement | null;
+  manageFocus: boolean;
 }
 
 const webOverlayEntries: WebOverlayEntry[] = [];
@@ -140,7 +141,7 @@ function focusFirstElement(scope: HTMLElement): void {
 function handleWebOverlayFocus(event: FocusEvent): void {
   const top = getTopWebOverlay();
   const scope = top?.getScope();
-  if (!scope || scope.contains(event.target as Node)) return;
+  if (!top?.manageFocus || !scope || scope.contains(event.target as Node)) return;
   if (webOverlayFocusCheckQueued) return;
 
   // React can autofocus a child before its parent scope ref attaches. Defer
@@ -149,8 +150,10 @@ function handleWebOverlayFocus(event: FocusEvent): void {
   webOverlayFocusCheckQueued = true;
   queueMicrotask(() => {
     webOverlayFocusCheckQueued = false;
-    const currentScope = getTopWebOverlay()?.getScope();
-    if (!currentScope || currentScope.contains(document.activeElement)) return;
+    const currentTop = getTopWebOverlay();
+    const currentScope = currentTop?.getScope();
+    if (!currentTop?.manageFocus || !currentScope || currentScope.contains(document.activeElement))
+      return;
     focusFirstElement(currentScope);
   });
 }
@@ -169,7 +172,7 @@ export function dispatchTopWebOverlayKeyDown(event: KeyboardEvent): boolean {
   const scope = top?.getScope();
   if (!top || !scope) return false;
 
-  if (event.key === "Tab") {
+  if (top.manageFocus && event.key === "Tab") {
     const focusable = getFocusableElements(scope);
     const first = focusable[0];
     const last = focusable[focusable.length - 1];
@@ -214,7 +217,12 @@ function addWebOverlay(entry: WebOverlayEntry): (options?: RemoveWebOverlayOptio
 
   const focusFrame = window.requestAnimationFrame(() => {
     const scope = entry.getScope();
-    if (getTopWebOverlay() === entry && scope && !scope.contains(document.activeElement)) {
+    if (
+      entry.manageFocus &&
+      getTopWebOverlay() === entry &&
+      scope &&
+      !scope.contains(document.activeElement)
+    ) {
       focusFirstElement(scope);
     }
   });
@@ -225,6 +233,7 @@ function addWebOverlay(entry: WebOverlayEntry): (options?: RemoveWebOverlayOptio
     if (index !== -1) webOverlayEntries.splice(index, 1);
     detachWebOverlayListeners();
     if (
+      entry.manageFocus &&
       options?.restoreFocus !== false &&
       entry.restoreFocus &&
       document.contains(entry.restoreFocus)
@@ -239,17 +248,20 @@ interface WebOverlayRegistration {
   layer: number;
   onKeyDown: WebOverlayKeyHandler;
   restoreFocusRef?: React.RefObject<unknown>;
+  /** Hover surfaces claim overlay keys while preserving the user's existing focus. */
+  manageFocus?: boolean;
 }
 
 /**
  * Registers a focus scope in the same relative layer model used for painting.
- * Only the highest painted overlay receives keyboard input; focus is trapped
- * there and restored to the opener when that overlay closes.
+ * Only the highest painted overlay receives keyboard input. By default, focus is trapped
+ * there and restored to the opener when it closes; hover surfaces preserve focus instead.
  */
 export function useWebOverlayRegistration({
   active,
   layer,
   onKeyDown,
+  manageFocus = true,
   restoreFocusRef: preferredRestoreFocusRef,
 }: WebOverlayRegistration) {
   const idRef = useRef(Symbol("web-overlay"));
@@ -305,10 +317,11 @@ export function useWebOverlayRegistration({
       getScope: () => scopeRef.current,
       getKeyHandler: () => keyHandlerRef.current,
       restoreFocus: capturedRestoreFocusRef.current,
+      manageFocus,
     };
     removeEntryRef.current = addWebOverlay(entry);
     registeredRef.current = true;
-  }, []);
+  }, [manageFocus]);
 
   const setScope = useCallback(
     (node: unknown) => {
diff --git a/packages/app/src/mobile-panels/presentation.tsx b/packages/app/src/mobile-panels/presentation.tsx
index b1d8a0036e..77059dfc39 100644
--- a/packages/app/src/mobile-panels/presentation.tsx
+++ b/packages/app/src/mobile-panels/presentation.tsx
@@ -42,7 +42,15 @@ export function MobilePanelOverlay({
 
   const overlayAnimatedStyle = useAnimatedStyle(() => {
     const isVisible = isLeft ? position.value < 0 : position.value > 0;
-    return { display: isVisible ? ("flex" as const) : ("none" as const) };
+    if (isWeb) {
+      return { display: isVisible ? ("flex" as const) : ("none" as const) };
+    }
+    // Preserve native scroll ranges while hidden. Collapsing layout makes Android
+    // spring retained scroll offsets back to zero on touch cancellation or release.
+    return {
+      opacity: isVisible ? 1 : 0,
+      pointerEvents: isVisible ? ("box-none" as const) : ("none" as const),
+    };
   }, [isLeft]);
 
   const positionedPanelStyle = isLeft ? styles.leftPanel : styles.rightPanel;
@@ -79,10 +87,7 @@ export function MobilePanelOverlay({
         pointerEvents={overlayPointerEvents}
         style={styles.overlay}
       >
-        <Animated.View
-          pointerEvents={overlayPointerEvents}
-          style={[styles.overlay, overlayAnimatedStyle]}
-        >
+        <Animated.View style={[styles.overlay, overlayAnimatedStyle]}>
           <Pressable
             accessible={false}
             accessibilityElementsHidden
diff --git a/packages/app/src/navigation/host-runtime-bootstrap.test.ts b/packages/app/src/navigation/host-runtime-bootstrap.test.ts
index ed6a8ccbe9..6e1e130090 100644
--- a/packages/app/src/navigation/host-runtime-bootstrap.test.ts
+++ b/packages/app/src/navigation/host-runtime-bootstrap.test.ts
@@ -6,11 +6,12 @@ import {
   resolveStartupRoute,
   shouldRunStartupGiveUpTimer,
   startHostRuntimeBootstrap,
+  bindHostRuntimeAppState,
 } from "./host-runtime-bootstrap";
 import type { DaemonStartResult, StartDaemonIfEnabledInput } from "@/runtime/daemon-start-service";
 
 describe("startHostRuntimeBootstrap", () => {
-  it("boots the host registry and starts the managed-daemon decision as one operation", async () => {
+  it("boots the host registry and starts the managed-daemon decision independently", async () => {
     const events: string[] = [];
     const shouldStartDaemon = async () => true;
     const store = {
@@ -39,9 +40,10 @@ describe("startHostRuntimeBootstrap", () => {
 
     expect(events).toEqual(["boot", "daemon-start-decision"]);
     expect(await receivedDecisions[0]).toBe(true);
+    expect(events).toEqual(["boot", "daemon-start-decision"]);
   });
 
-  it("waits for the host registry to load before evaluating managed-daemon startup", async () => {
+  it("loads the registry before evaluating managed-daemon startup", async () => {
     const events: string[] = [];
     let resolveBoot!: () => void;
     const booted = new Promise<void>((resolve) => {
@@ -393,3 +395,36 @@ describe("resolveHostIndexRoute", () => {
     ).toEqual("/open-project");
   });
 });
+
+describe("host runtime app lifecycle", () => {
+  it.each(["inactive", "background"] as const)(
+    "applies initial visibility and forwards lifecycle changes when mounted %s",
+    (currentState) => {
+      const visibility: boolean[] = [];
+      let listener: ((state: "active" | "inactive" | "background") => void) | undefined;
+      let subscribed = true;
+      const dispose = bindHostRuntimeAppState(
+        { setAppVisible: (visible) => visibility.push(visible) },
+        {
+          currentState,
+          addEventListener: (_event, handler) => {
+            listener = handler;
+            return {
+              remove: () => {
+                subscribed = false;
+              },
+            };
+          },
+        },
+      );
+      expect(visibility).toEqual([false]);
+      listener?.("active");
+      listener?.("inactive");
+      listener?.("background");
+      listener?.("active");
+      expect(visibility).toEqual([false, true, false, false, true]);
+      dispose();
+      expect(subscribed).toBe(false);
+    },
+  );
+});
diff --git a/packages/app/src/navigation/host-runtime-bootstrap.ts b/packages/app/src/navigation/host-runtime-bootstrap.ts
index 6fbceb8a21..8ee1f7bfb2 100644
--- a/packages/app/src/navigation/host-runtime-bootstrap.ts
+++ b/packages/app/src/navigation/host-runtime-bootstrap.ts
@@ -1,3 +1,4 @@
+import type { AppState } from "react-native";
 import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 import type {
   DaemonStartCondition,
@@ -250,3 +251,14 @@ export function resolveStartupRoute(input: ResolveStartupRouteInput): StartupRou
 
   return resolveReadyIndexStartupRoute(input);
 }
+
+export function bindHostRuntimeAppState(
+  store: { setAppVisible: (visible: boolean) => void },
+  appState: Pick<typeof AppState, "currentState" | "addEventListener">,
+): () => void {
+  const subscription = appState.addEventListener("change", (state) => {
+    store.setAppVisible(state === "active");
+  });
+  store.setAppVisible(appState.currentState === "active");
+  return () => subscription.remove();
+}
diff --git a/packages/app/src/navigation/settings-navigation.ts b/packages/app/src/navigation/settings-navigation.ts
index ae7eb6efdd..123b23077a 100644
--- a/packages/app/src/navigation/settings-navigation.ts
+++ b/packages/app/src/navigation/settings-navigation.ts
@@ -11,6 +11,7 @@ import {
 } from "@/utils/host-routes";
 
 export type SettingsView =
+  | { kind: "plugin"; serverId: string; pluginId: string; screenId: string }
   | { kind: "root" }
   | { kind: "section"; section: SettingsSectionSlug }
   | { kind: "host"; serverId: string; section: HostSectionSlug }
@@ -32,7 +33,8 @@ export function returnFromSettings(view: SettingsView): void {
     return;
   }
 
-  const parent =
-    view.kind === "project" ? buildProjectsSettingsRoute(view.serverId) : buildSettingsRoute();
+  let parent: Href = buildSettingsRoute();
+  if (view.kind === "plugin") parent = buildSettingsHostSectionRoute(view.serverId, "plugins");
+  if (view.kind === "project") parent = buildProjectsSettingsRoute(view.serverId);
   router.dismissTo(parent as Href);
 }
diff --git a/packages/app/src/navigation/themed-stack.tsx b/packages/app/src/navigation/themed-stack.tsx
index cf83f701c9..010877c061 100644
--- a/packages/app/src/navigation/themed-stack.tsx
+++ b/packages/app/src/navigation/themed-stack.tsx
@@ -1,15 +1,29 @@
 import type { NativeStackNavigationOptions } from "@react-navigation/native-stack";
 import { Stack } from "expo-router";
-import { type ReactNode, useMemo } from "react";
+import { isValidElement, type ReactElement, type ReactNode, useCallback, useMemo } from "react";
 import { withUnistyles } from "react-native-unistyles";
+import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 
 interface ThemedStackBaseProps {
   backgroundColor: string;
   children?: ReactNode;
   screenOptions?: NativeStackNavigationOptions;
+  // Screens whose content is another navigator. That navigator owns its own screens' appearance
+  // boundary; wrapping it here would remount it.
+  nestedNavigatorScreens?: readonly string[];
 }
 
-function ThemedStackBase({ backgroundColor, children, screenOptions }: ThemedStackBaseProps) {
+interface ScreenContent {
+  route: { name: string };
+  children: ReactNode;
+}
+
+function ThemedStackBase({
+  backgroundColor,
+  children,
+  screenOptions,
+  nestedNavigatorScreens,
+}: ThemedStackBaseProps) {
   const themedScreenOptions = useMemo<NativeStackNavigationOptions>(
     () => ({
       ...screenOptions,
@@ -17,8 +31,21 @@ function ThemedStackBase({ backgroundColor, children, screenOptions }: ThemedSta
     }),
     [backgroundColor, screenOptions],
   );
+  // Appearance changes remount each screen's content below the native stack, so the navigator
+  // and its screen containers keep their identity. See docs/unistyles.md.
+  const screenLayout = useCallback(
+    ({ route, children: content }: ScreenContent): ReactElement => {
+      if (nestedNavigatorScreens?.includes(route.name) && isValidElement(content)) return content;
+      return <AppearanceStyleBoundary>{content}</AppearanceStyleBoundary>;
+    },
+    [nestedNavigatorScreens],
+  );
 
-  return <Stack screenOptions={themedScreenOptions}>{children}</Stack>;
+  return (
+    <Stack screenOptions={themedScreenOptions} screenLayout={screenLayout}>
+      {children}
+    </Stack>
+  );
 }
 
 export const ThemedStack = withUnistyles(ThemedStackBase, (theme) => ({
diff --git a/packages/app/src/navigation/workspace-route-navigation.test.ts b/packages/app/src/navigation/workspace-route-navigation.test.ts
index 704345f9a0..a331451ed5 100644
--- a/packages/app/src/navigation/workspace-route-navigation.test.ts
+++ b/packages/app/src/navigation/workspace-route-navigation.test.ts
@@ -7,23 +7,36 @@ import {
 
 function createNavigationRef(rootState: unknown, options: { ready?: boolean } = {}) {
   const dispatch = vi.fn();
-  const navigationRef = {
-    current: {
-      isReady: () => options.ready ?? true,
-      getRootState: () => rootState,
-      dispatch,
+  let ready = options.ready ?? true;
+  const readyListeners = new Set<() => void>();
+  const navigation = {
+    isReady: () => ready,
+    getRootState: () => rootState,
+    dispatch,
+    addListener: (event: string, listener: () => void) => {
+      if (event === "ready") readyListeners.add(listener);
+      return () => readyListeners.delete(listener);
     },
+  };
+  const navigationRef = {
+    ...navigation,
+    current: navigation,
   } as unknown as NavigationContainerRefWithCurrent<ReactNavigation.RootParamList>;
 
-  return { navigationRef, dispatch };
+  return {
+    navigationRef,
+    dispatch,
+    becomeReady() {
+      ready = true;
+      for (const listener of readyListeners) listener();
+    },
+  };
 }
 
 describe("navigateToHostWorkspaceRoute", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    registerWorkspaceRouteNavigationRef({
-      current: null,
-    } as unknown as NavigationContainerRefWithCurrent<ReactNavigation.RootParamList>)();
+    registerWorkspaceRouteNavigationRef(createNavigationRef({}).navigationRef)();
   });
 
   it("falls back to route navigation when no host route is mounted yet", () => {
@@ -131,4 +144,74 @@ describe("navigateToHostWorkspaceRoute", () => {
       },
     });
   });
+
+  it("waits for the root navigator before applying a route intent", () => {
+    const { navigationRef, becomeReady } = createNavigationRef(
+      {
+        key: "root-stack",
+        routes: [{ key: "launcher", name: "index" }],
+      },
+      { ready: false },
+    );
+    registerWorkspaceRouteNavigationRef(navigationRef);
+    const dismissTo = vi.fn();
+
+    navigateToHostWorkspaceRoute("/h/server-1/workspace/workspace-a", { dismissTo });
+    expect(dismissTo).not.toHaveBeenCalled();
+
+    becomeReady();
+    expect(dismissTo).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
+    becomeReady();
+    expect(dismissTo).toHaveBeenCalledTimes(1);
+  });
+
+  it("retains an intent submitted before the root ref registers", () => {
+    const dismissTo = vi.fn();
+    navigateToHostWorkspaceRoute("/h/server-1/workspace/workspace-a", { dismissTo });
+    expect(dismissTo).not.toHaveBeenCalled();
+
+    const root = createNavigationRef({}, { ready: false });
+    const unregister = registerWorkspaceRouteNavigationRef(root.navigationRef);
+    expect(dismissTo).not.toHaveBeenCalled();
+    root.becomeReady();
+    expect(dismissTo).toHaveBeenCalledExactlyOnceWith("/h/server-1/workspace/workspace-a");
+    unregister();
+  });
+
+  it("keeps only the latest route intent while the root navigator is unavailable", () => {
+    const { navigationRef, becomeReady } = createNavigationRef({}, { ready: false });
+    registerWorkspaceRouteNavigationRef(navigationRef);
+    const firstDismissTo = vi.fn();
+    const latestDismissTo = vi.fn();
+
+    navigateToHostWorkspaceRoute("/h/server-1/workspace/workspace-a", {
+      dismissTo: firstDismissTo,
+    });
+    navigateToHostWorkspaceRoute("/h/server-1/workspace/workspace-b", {
+      dismissTo: latestDismissTo,
+    });
+    becomeReady();
+
+    expect(firstDismissTo).not.toHaveBeenCalled();
+    expect(latestDismissTo).toHaveBeenCalledWith("/h/server-1/workspace/workspace-b");
+  });
+
+  it("preserves a pending route intent across root navigator re-registration", () => {
+    const first = createNavigationRef({}, { ready: false });
+    const unregisterFirst = registerWorkspaceRouteNavigationRef(first.navigationRef);
+    const dismissTo = vi.fn();
+    navigateToHostWorkspaceRoute("/h/server-1/workspace/workspace-a", { dismissTo });
+
+    unregisterFirst();
+    first.becomeReady();
+    expect(dismissTo).not.toHaveBeenCalled();
+
+    const replacement = createNavigationRef({
+      key: "root-stack",
+      routes: [{ key: "launcher", name: "index" }],
+    });
+    registerWorkspaceRouteNavigationRef(replacement.navigationRef);
+
+    expect(dismissTo).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
+  });
 });
diff --git a/packages/app/src/navigation/workspace-route-navigation.ts b/packages/app/src/navigation/workspace-route-navigation.ts
index 79fc1d8c2f..06d0d23e07 100644
--- a/packages/app/src/navigation/workspace-route-navigation.ts
+++ b/packages/app/src/navigation/workspace-route-navigation.ts
@@ -1,4 +1,8 @@
-import type { NavigationAction, NavigationContainerRefWithCurrent } from "@react-navigation/native";
+import type {
+  NavigationAction,
+  NavigationContainerRef,
+  NavigationContainerRefWithCurrent,
+} from "@react-navigation/native";
 import { router, type Href } from "expo-router";
 import {
   encodeWorkspaceIdForPathSegment,
@@ -19,12 +23,16 @@ const defaultNavigateToHostWorkspaceRouteDeps: NavigateToHostWorkspaceRouteDeps
 
 let rootNavigationRef: NavigationContainerRefWithCurrent<ReactNavigation.RootParamList> | null =
   null;
+let pendingIntent: { route: string; deps: NavigateToHostWorkspaceRouteDeps } | null = null;
 
 export function registerWorkspaceRouteNavigationRef(
   ref: NavigationContainerRefWithCurrent<ReactNavigation.RootParamList>,
 ): () => void {
   rootNavigationRef = ref;
+  const unsubscribe = ref.addListener("ready", flushPendingIntent);
+  flushPendingIntent();
   return () => {
+    unsubscribe();
     if (rootNavigationRef === ref) {
       rootNavigationRef = null;
     }
@@ -95,10 +103,12 @@ function findStackWithMountedRouteName(
   return null;
 }
 
-function dispatchHostWorkspacePopTo(route: string): boolean {
+function dispatchHostWorkspacePopTo(
+  route: string,
+  navigation: NavigationContainerRef<ReactNavigation.RootParamList>,
+): boolean {
   const selection = parseHostWorkspaceRouteFromPathname(route);
-  const navigation = rootNavigationRef?.current;
-  if (!selection || !navigation?.isReady()) {
+  if (!selection) {
     return false;
   }
 
@@ -137,9 +147,15 @@ export function navigateToHostWorkspaceRoute(
   route: string,
   deps: NavigateToHostWorkspaceRouteDeps = defaultNavigateToHostWorkspaceRouteDeps,
 ): void {
-  if (dispatchHostWorkspacePopTo(route)) {
-    return;
-  }
+  pendingIntent = { route, deps };
+  flushPendingIntent();
+}
 
-  deps.dismissTo(route);
+function flushPendingIntent(): void {
+  const navigation = rootNavigationRef?.current;
+  if (!pendingIntent || !navigation?.isReady()) return;
+
+  const { route, deps } = pendingIntent;
+  pendingIntent = null;
+  if (!dispatchHostWorkspacePopTo(route, navigation)) deps.dismissTo(route);
 }
diff --git a/packages/app/src/pane-find/find-shortcut.test.ts b/packages/app/src/pane-find/find-shortcut.test.ts
new file mode 100644
index 0000000000..5d64bdee8d
--- /dev/null
+++ b/packages/app/src/pane-find/find-shortcut.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it } from "vitest";
+import { isFindShortcut } from "./find-shortcut";
+
+const MAC = { isMac: true };
+const NON_MAC = { isMac: false };
+
+function keydown(
+  overrides: Partial<Pick<KeyboardEvent, "key" | "metaKey" | "ctrlKey" | "shiftKey" | "altKey">>,
+) {
+  return {
+    key: "f",
+    metaKey: false,
+    ctrlKey: false,
+    shiftKey: false,
+    altKey: false,
+    ...overrides,
+  };
+}
+
+describe("on macOS", () => {
+  it("opens Find with Command+F", () => {
+    expect(isFindShortcut(keydown({ metaKey: true }), MAC)).toBe(true);
+  });
+
+  it("leaves Control+F to text editing", () => {
+    expect(isFindShortcut(keydown({ ctrlKey: true }), MAC)).toBe(false);
+  });
+
+  it("ignores Control+Command+F", () => {
+    expect(isFindShortcut(keydown({ metaKey: true, ctrlKey: true }), MAC)).toBe(false);
+  });
+
+  it("ignores Shift and Alt variants", () => {
+    expect(isFindShortcut(keydown({ metaKey: true, shiftKey: true }), MAC)).toBe(false);
+    expect(isFindShortcut(keydown({ metaKey: true, altKey: true }), MAC)).toBe(false);
+  });
+});
+
+describe("off macOS", () => {
+  it("opens Find with Control+F", () => {
+    expect(isFindShortcut(keydown({ ctrlKey: true }), NON_MAC)).toBe(true);
+  });
+
+  it("ignores Meta+F", () => {
+    expect(isFindShortcut(keydown({ metaKey: true }), NON_MAC)).toBe(false);
+  });
+
+  it("ignores Control+Meta+F", () => {
+    expect(isFindShortcut(keydown({ ctrlKey: true, metaKey: true }), NON_MAC)).toBe(false);
+  });
+
+  it("ignores Shift and Alt variants", () => {
+    expect(isFindShortcut(keydown({ ctrlKey: true, shiftKey: true }), NON_MAC)).toBe(false);
+    expect(isFindShortcut(keydown({ ctrlKey: true, altKey: true }), NON_MAC)).toBe(false);
+  });
+});
+
+it("matches an uppercase F from a shifted keyboard layout", () => {
+  expect(isFindShortcut(keydown({ key: "F", metaKey: true }), MAC)).toBe(true);
+  expect(isFindShortcut(keydown({ key: "F", ctrlKey: true }), NON_MAC)).toBe(true);
+});
+
+it("ignores other keys", () => {
+  expect(isFindShortcut(keydown({ key: "g", metaKey: true }), MAC)).toBe(false);
+  expect(isFindShortcut(keydown({ key: "g", ctrlKey: true }), NON_MAC)).toBe(false);
+});
diff --git a/packages/app/src/pane-find/find-shortcut.ts b/packages/app/src/pane-find/find-shortcut.ts
new file mode 100644
index 0000000000..f4c1c2b57b
--- /dev/null
+++ b/packages/app/src/pane-find/find-shortcut.ts
@@ -0,0 +1,24 @@
+export interface FindShortcutPlatform {
+  isMac: boolean;
+}
+
+/**
+ * The one Find keystroke policy: Command+F on macOS, Control+F everywhere else.
+ *
+ * Control+F is a macOS text-editing binding that moves the caret forward, so a
+ * surface that also claims it there eats a keystroke the text editor owns.
+ *
+ * The platform is a parameter rather than a lookup because this module is
+ * imported by the terminal emulator runtime, which is bundled on its own into
+ * the terminal WebView and cannot load React Native. App surfaces pass
+ * `findShortcutPlatform()` from `@/pane-find`.
+ */
+export function isFindShortcut(
+  event: Pick<KeyboardEvent, "key" | "metaKey" | "ctrlKey" | "shiftKey" | "altKey">,
+  platform: FindShortcutPlatform,
+): boolean {
+  const primaryModifier = platform.isMac
+    ? event.metaKey && !event.ctrlKey
+    : event.ctrlKey && !event.metaKey;
+  return primaryModifier && !event.shiftKey && !event.altKey && event.key.toLowerCase() === "f";
+}
diff --git a/packages/app/src/pane-find/index.tsx b/packages/app/src/pane-find/index.tsx
new file mode 100644
index 0000000000..761ac187e1
--- /dev/null
+++ b/packages/app/src/pane-find/index.tsx
@@ -0,0 +1,374 @@
+import {
+  forwardRef,
+  useCallback,
+  useLayoutEffect,
+  useMemo,
+  useImperativeHandle,
+  useRef,
+  useState,
+  type ReactNode,
+  type KeyboardEvent,
+} from "react";
+import {
+  Text,
+  View,
+  type NativeSyntheticEvent,
+  type TextInputKeyPressEventData,
+  type TextInputProps,
+} from "react-native";
+import { ArrowDown, ArrowUp, ChevronDown, ChevronRight, X } from "lucide-react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import { EditingTextInput, type EditingTextInputHandle } from "@/components/ui/text-input";
+import {
+  createControlGeometry,
+  resolveControlInteractionStyles,
+} from "@/components/ui/control-geometry";
+import {
+  mutedIconColorMapping,
+  smallIconButtonChromeFrameSize,
+} from "@/components/ui/icon-button-chrome";
+import { paneContentToolbarIconSize, ToolbarButton } from "@/components/ui/pane-content-toolbar";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { isWeb } from "@/constants/platform";
+import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
+import { getShortcutOs } from "@/utils/shortcut-platform";
+import { isFindShortcut, type FindShortcutPlatform } from "./find-shortcut";
+
+export { isFindShortcut, type FindShortcutPlatform } from "./find-shortcut";
+
+/** The platform every Find surface judges the shortcut against. */
+export function findShortcutPlatform(): FindShortcutPlatform {
+  return { isMac: getShortcutOs() === "mac" };
+}
+
+const TextInput = withUnistyles(EditingTextInput, (theme) => ({
+  placeholderTextColor: theme.colors.foregroundMuted,
+}));
+const ArrowUpIcon = withUnistyles(ArrowUp, mutedIconColorMapping);
+const ArrowDownIcon = withUnistyles(ArrowDown, mutedIconColorMapping);
+const CloseIcon = withUnistyles(X, mutedIconColorMapping);
+const ChevronDownIcon = withUnistyles(ChevronDown, mutedIconColorMapping);
+const ChevronRightIcon = withUnistyles(ChevronRight, mutedIconColorMapping);
+
+export interface PaneFindHandle {
+  focus(): void;
+}
+
+export interface PaneFindProps {
+  query: string;
+  status: string;
+  canNavigate: boolean;
+  onQueryChange(query: string): void;
+  onNext(): void;
+  onPrevious(): void;
+  onClose(): void;
+  replace?: {
+    value: string;
+    onChange(value: string): void;
+    onReplace(): void;
+    onReplaceAll(): void;
+  };
+}
+
+/**
+ * The bordered box around one Find input. It owns the field chrome so the query
+ * row and the replacement row land on the same rails, and so the match count can
+ * sit inside the query box instead of widening the widget.
+ */
+const FindField = forwardRef<
+  EditingTextInputHandle,
+  {
+    label: string;
+    initialValue: string;
+    height: number;
+    trailing?: ReactNode;
+    onChangeText(value: string): void;
+    onKeyPress(event: NativeSyntheticEvent<TextInputKeyPressEventData>): void;
+    autoFocus?: boolean;
+    returnKeyType?: TextInputProps["returnKeyType"];
+  }
+>(function FindField(
+  { label, initialValue, height, trailing, onChangeText, onKeyPress, autoFocus, returnKeyType },
+  ref,
+) {
+  const [focused, setFocused] = useState(false);
+  const onFocus = useCallback(() => setFocused(true), []);
+  const onBlur = useCallback(() => setFocused(false), []);
+  const fieldStyle = useMemo(
+    () => [
+      styles.field,
+      { minHeight: height },
+      resolveControlInteractionStyles(
+        {
+          controlRest: styles.controlRest,
+          controlHover: styles.controlHover,
+          controlActive: styles.controlActive,
+        },
+        { focused },
+      ),
+    ],
+    [focused, height],
+  );
+  return (
+    <View style={fieldStyle}>
+      <TextInput
+        ref={ref}
+        autoFocus={autoFocus}
+        selectTextOnFocus
+        initialValue={initialValue}
+        onChangeText={onChangeText}
+        onKeyPress={onKeyPress}
+        onFocus={onFocus}
+        onBlur={onBlur}
+        accessibilityLabel={label}
+        placeholder={label}
+        autoCapitalize="none"
+        autoCorrect={false}
+        blurOnSubmit={false}
+        returnKeyType={returnKeyType}
+        style={styles.input}
+      />
+      {trailing}
+    </View>
+  );
+});
+
+/** Pane-local chrome. The content owner supplies search state and commands. */
+export const PaneFind = forwardRef<PaneFindHandle, PaneFindProps>(function PaneFind(
+  { query, status, canNavigate, onQueryChange, onNext, onPrevious, onClose, replace },
+  ref,
+) {
+  const { t } = useTranslation();
+  const isCompact = useIsCompactFormFactor();
+  const controlSize = smallIconButtonChromeFrameSize(isCompact);
+  const glyphSize = paneContentToolbarIconSize(isCompact);
+  const rowHeight = Math.max(COLLAPSED_FIELD_HEIGHT, controlSize);
+  // Keep the replace actions on the same row height as the icon controls beside them.
+  const actionSize = isCompact ? "sm" : "xs";
+  const input = useRef<EditingTextInputHandle>(null);
+  const replacementInput = useRef<EditingTextInputHandle>(null);
+  useLayoutEffect(() => {
+    if (input.current?.getText() !== query) input.current?.replaceText(query);
+  }, [query]);
+  useLayoutEffect(() => {
+    if (replace && replacementInput.current?.getText() !== replace.value)
+      replacementInput.current?.replaceText(replace.value);
+  }, [replace]);
+  const [replaceExpanded, setReplaceExpanded] = useState(false);
+  const focus = useCallback(() => {
+    input.current?.focus();
+    const text = input.current?.getText() ?? "";
+    input.current?.replaceText(text, { start: 0, end: text.length });
+  }, []);
+  useImperativeHandle(ref, () => ({ focus }), [focus]);
+
+  const onKeyPress = useCallback(
+    (event: NativeSyntheticEvent<TextInputKeyPressEventData>) => {
+      const key = event.nativeEvent as TextInputKeyPressEventData & {
+        shiftKey?: boolean;
+        ctrlKey?: boolean;
+        metaKey?: boolean;
+        altKey?: boolean;
+        isComposing?: boolean;
+        keyCode?: number;
+      };
+      if (isImeComposingKeyboardEvent(key)) return;
+      const shortcut = {
+        key: key.key,
+        metaKey: key.metaKey === true,
+        ctrlKey: key.ctrlKey === true,
+        shiftKey: key.shiftKey === true,
+        altKey: key.altKey === true,
+      };
+      if (isFindShortcut(shortcut, findShortcutPlatform())) {
+        // RN Web inputs stop keydown before the pane's document listener.
+        event.preventDefault();
+        event.stopPropagation();
+        focus();
+      } else if (key.key === "Escape" || key.key === "Enter") {
+        event.preventDefault();
+        event.stopPropagation();
+        if (key.key === "Escape") onClose();
+        else if (key.shiftKey) onPrevious();
+        else onNext();
+      }
+    },
+    [focus, onClose, onNext, onPrevious],
+  );
+  const toggleReplace = useCallback(() => setReplaceExpanded((expanded) => !expanded), []);
+  const gutterStyle = useMemo(
+    () => [styles.gutter, { width: controlSize, height: rowHeight }],
+    [controlSize, rowHeight],
+  );
+  const matchCount = useMemo(
+    () => (
+      <Text
+        style={styles.status}
+        role="status"
+        accessibilityLabel={t("paneFind.matches")}
+        accessibilityLiveRegion="polite"
+      >
+        {status}
+      </Text>
+    ),
+    [status, t],
+  );
+
+  return (
+    <View
+      style={styles.widget}
+      accessibilityLabel={t("paneFind.title")}
+      {...(isWeb
+        ? {
+            onKeyDown: (event: KeyboardEvent) => {
+              if (event.key === "Escape" && !isImeComposingKeyboardEvent(event.nativeEvent)) {
+                event.preventDefault();
+                event.stopPropagation();
+                onClose();
+              }
+            },
+          }
+        : {})}
+    >
+      {replace ? (
+        <View style={gutterStyle}>
+          <ToolbarButton
+            label={t("paneFind.toggleReplace")}
+            aria-expanded={replaceExpanded}
+            compact={isCompact}
+            onPress={toggleReplace}
+          >
+            {replaceExpanded ? (
+              <ChevronDownIcon size={glyphSize} />
+            ) : (
+              <ChevronRightIcon size={glyphSize} />
+            )}
+          </ToolbarButton>
+        </View>
+      ) : null}
+      <View style={styles.rows}>
+        <View style={styles.row}>
+          <FindField
+            ref={input}
+            autoFocus
+            label={t("paneFind.placeholder")}
+            initialValue={query}
+            height={rowHeight}
+            returnKeyType="search"
+            trailing={matchCount}
+            onChangeText={onQueryChange}
+            onKeyPress={onKeyPress}
+          />
+          <ToolbarButton
+            label={t("paneFind.previous")}
+            compact={isCompact}
+            disabled={!canNavigate}
+            onPress={onPrevious}
+          >
+            <ArrowUpIcon size={glyphSize} />
+          </ToolbarButton>
+          <ToolbarButton
+            label={t("paneFind.next")}
+            compact={isCompact}
+            disabled={!canNavigate}
+            onPress={onNext}
+          >
+            <ArrowDownIcon size={glyphSize} />
+          </ToolbarButton>
+          <ToolbarButton label={t("paneFind.close")} compact={isCompact} onPress={onClose}>
+            <CloseIcon size={glyphSize} />
+          </ToolbarButton>
+        </View>
+        {replace && replaceExpanded ? (
+          <View style={styles.row}>
+            <FindField
+              ref={replacementInput}
+              label={t("paneFind.replaceWith")}
+              initialValue={replace.value}
+              height={rowHeight}
+              onChangeText={replace.onChange}
+              onKeyPress={onKeyPress}
+            />
+            <Button
+              variant="ghost"
+              size={actionSize}
+              style={styles.replaceAction}
+              disabled={!canNavigate}
+              onPress={replace.onReplace}
+            >
+              {t("paneFind.replace")}
+            </Button>
+            <Button
+              variant="ghost"
+              size={actionSize}
+              style={styles.replaceAction}
+              disabled={!canNavigate}
+              onPress={replace.onReplaceAll}
+            >
+              {t("paneFind.replaceAll")}
+            </Button>
+          </View>
+        ) : null}
+      </View>
+    </View>
+  );
+});
+
+/** Desktop find rows run one step tighter than a form field — this is pane chrome. */
+const COLLAPSED_FIELD_HEIGHT = 28;
+const FIND_WIDGET_WIDTH = 340;
+
+const styles = StyleSheet.create((theme) => {
+  const geometry = createControlGeometry(theme);
+
+  return {
+    widget: {
+      width: FIND_WIDGET_WIDTH,
+      maxWidth: "100%",
+      flexDirection: "row",
+      padding: theme.spacing[1.5],
+      gap: theme.spacing[1],
+      backgroundColor: theme.colors.surface1,
+      borderWidth: theme.borderWidth[1],
+      borderColor: theme.colors.border,
+      borderRadius: theme.borderRadius.lg,
+      ...theme.shadow.md,
+    },
+    // The disclosure column spans both rows so the two fields share a leading rail.
+    gutter: { alignItems: "center", justifyContent: "center", flexShrink: 0 },
+    rows: { flex: 1, minWidth: 0, gap: theme.spacing[1] },
+    row: { flexDirection: "row", alignItems: "center", gap: theme.spacing[1] },
+    field: {
+      flex: 1,
+      minWidth: 0,
+      flexDirection: "row",
+      alignItems: "center",
+      gap: theme.spacing[2],
+      paddingHorizontal: theme.spacing[2],
+      backgroundColor: theme.colors.surface2,
+      borderRadius: theme.borderRadius.md,
+    },
+    controlRest: { ...geometry.controlRest },
+    controlHover: { ...geometry.controlHover },
+    controlActive: { ...geometry.controlActive },
+    input: {
+      flex: 1,
+      minWidth: 0,
+      paddingHorizontal: 0,
+      paddingVertical: 0,
+      color: theme.colors.foreground,
+      outlineWidth: 0,
+      outlineColor: "transparent",
+      ...geometry.fieldTextSm,
+    },
+    status: {
+      flexShrink: 0,
+      color: theme.colors.foregroundMuted,
+      fontSize: theme.fontSize.sm,
+    },
+    // Ghost actions sit on the field's rail, so they carry the field's padding.
+    replaceAction: { paddingHorizontal: theme.spacing[2] },
+  };
+});
diff --git a/packages/app/src/panels/agent-panel.tsx b/packages/app/src/panels/agent-panel.tsx
index 5156ee8f28..2d8a605c3f 100644
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -1,3 +1,4 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -15,16 +16,16 @@ import React, {
 } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet as RNStyleSheet, Text, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import invariant from "tiny-invariant";
 import { shallow, useShallow } from "zustand/shallow";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { AgentStreamView, type AgentStreamViewHandle } from "@/agent-stream/view";
 import { ArchivedAgentCallout } from "@/components/archived-agent-callout";
-import { KeyboardDock } from "@/components/keyboard-dock";
+import { ComposerDock } from "@/composer/dock";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { useRetainedPanelActive } from "@/components/retained-panel";
+import { RetainedChatContent } from "./retained-chat-content";
 import { Composer } from "@/composer";
 import { useWorkspaceHasDiffStat } from "@/composer/workspace-diff-stat";
 import {
@@ -33,20 +34,11 @@ import {
 } from "@/composer/pill-styles";
 import { getActiveMessageSubmissions } from "@/composer/submission/model";
 import { RewindComposerRestoreProvider } from "@/components/rewind/composer-restore";
-import { getProviderIcon } from "@/components/provider-icons";
-import {
-  ToastViewport,
-  useToastHost,
-  type ToastApi,
-  type ToastState,
-} from "@/components/toast-host";
+import { useProviderIcon } from "@/components/provider-icons";
+import { useToastHost, type ToastApi, type ToastState } from "@/components/toast-host";
 import type { WorkspaceComposerAttachment } from "@/attachments/types";
 import { useWorkspaceAttachmentScopeKey } from "@/attachments/workspace-attachments-store";
-import {
-  COMPACT_FORM_FACTOR_WIDTH,
-  MAX_CONTENT_WIDTH,
-  useIsCompactFormFactor,
-} from "@/constants/layout";
+import { COMPACT_FORM_FACTOR_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
 import { useAgentAttentionClear } from "@/hooks/use-agent-attention-clear";
 import { useAgentInputDraft, type AgentInputDraft } from "@/composer/draft/input-draft";
@@ -56,14 +48,12 @@ import {
   type AgentScreenMissingState,
   type AgentScreenViewState,
   useAgentScreenStateMachine,
+  type AgentScreenReadySyncState,
 } from "@/hooks/use-agent-screen-state-machine";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
 import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import { reconcileMissingAgentStateWithPresentAgent } from "@/panels/agent-panel-load-state";
-import {
-  reconcileReconnectToastState,
-  type ReconnectToastState,
-} from "@/panels/reconnect-toast-state";
+import { TimelineSyncStatus } from "@/timeline/sync-status";
 import { usePaneContext, usePaneFocus } from "@/panels/pane-context";
 import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
 import { RenderProfile } from "@/utils/render-profiler";
@@ -71,7 +61,6 @@ import { useHasPluginComposerPills } from "@/plugins";
 import { buildDraftPanelDescriptor } from "@/panels/draft-panel-descriptor";
 import {
   type HostRuntimeConnectionStatus,
-  getHostRuntimeConnectionStatusSince,
   useHostRuntimeClient,
   useHostRuntimeConnectionStatus,
   useHostRuntimeIsConnected,
@@ -124,10 +113,6 @@ interface ChatAgentStateShape {
   lastError?: Agent["lastError"] | null;
 }
 
-const RECONNECT_TOAST_DELAY_MS = 1_000;
-
-const reconnectToastStateByServerId = new Map<string, ReconnectToastState>();
-
 interface ChatAgentSelectedState extends ChatAgentStateShape {
   archivedAt: Date | null;
   requiresAttention: boolean;
@@ -310,11 +295,7 @@ function storeFetchedAgentDetail(input: {
   const store = useSessionStore.getState();
 
   if (shouldStoreFetchedAgentInActiveDirectory(hydrated)) {
-    store.setAgents(input.serverId, (previous) => {
-      const next = new Map(previous);
-      next.set(hydrated.id, hydrated);
-      return next;
-    });
+    getHostRuntimeStore().acceptAgentSnapshot(input.serverId, hydrated);
   } else {
     store.setAgentDetails(input.serverId, (previous) => {
       const next = new Map(previous);
@@ -362,7 +343,7 @@ function useAgentPanelDescriptor(
   );
   const provider = descriptorState.provider;
   const label = resolveWorkspaceAgentTabLabel(descriptorState.title);
-  const icon = getProviderIcon(provider);
+  const icon = useProviderIcon(provider, context.serverId);
 
   return {
     label: label ?? "",
@@ -387,13 +368,15 @@ function AgentPanel() {
   invariant(target.kind === "agent", "AgentPanel requires agent target");
 
   return (
-    <AgentPanelContent
-      serverId={serverId}
-      workspaceId={workspaceId}
-      agentId={target.agentId}
-      isPaneFocused={isInteractive}
-      onOpenWorkspaceFile={openFileInWorkspace}
-    />
+    <RetainedChatContent>
+      <AgentPanelContent
+        serverId={serverId}
+        workspaceId={workspaceId}
+        agentId={target.agentId}
+        isPaneFocused={isInteractive}
+        onOpenWorkspaceFile={openFileInWorkspace}
+      />
+    </RetainedChatContent>
   );
 }
 
@@ -414,11 +397,7 @@ function DraftPanel() {
     (agentSnapshot: Parameters<typeof normalizeAgentSnapshot>[0]) => {
       const normalized = normalizeAgentSnapshot(agentSnapshot, serverId);
       const agent = applyLegacyDaemonWorkspaceOwnership({ serverId, agent: normalized });
-      useSessionStore.getState().setAgents(serverId, (prev) => {
-        const next = new Map(prev);
-        next.set(agentSnapshot.id, agent);
-        return next;
-      });
+      getHostRuntimeStore().acceptAgentSnapshot(serverId, agent);
       retargetCurrentTab({ kind: "agent", agentId: agentSnapshot.id });
     },
     [retargetCurrentTab, serverId],
@@ -584,7 +563,6 @@ function AgentPanelContent({
       isPaneFocused={isPaneFocused}
       client={runtimeClient}
       isConnected={runtimeIsConnected}
-      connectionStatus={connectionStatus}
       onOpenWorkspaceFile={onOpenWorkspaceFile}
     />
   );
@@ -597,7 +575,6 @@ function AgentPanelBody({
   isPaneFocused,
   client,
   isConnected,
-  connectionStatus,
   onOpenWorkspaceFile,
 }: {
   serverId: string;
@@ -606,7 +583,6 @@ function AgentPanelBody({
   isPaneFocused: boolean;
   client: ReturnType<typeof useHostRuntimeClient>;
   isConnected: boolean;
-  connectionStatus: HostRuntimeConnectionStatus;
   onOpenWorkspaceFile?: (request: WorkspaceFileOpenRequest) => void;
 }) {
   const { t } = useTranslation();
@@ -633,8 +609,6 @@ function AgentPanelBody({
   const [lookupState, setLookupState] = useState<AgentLookupState>({ tag: "idle" });
   const lookupAttemptTokenRef = useRef(0);
   const retryAgentLookup = useCallback(() => setLookupState({ tag: "idle" }), []);
-  const workspaceKey = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
-  const resolvePendingAgent = useWorkspaceLayoutStore((state) => state.resolvePendingAgent);
 
   useEffect(() => {
     lookupAttemptTokenRef.current += 1;
@@ -646,9 +620,6 @@ function AgentPanelBody({
       return;
     }
     if (agentState.id) {
-      if (workspaceKey) {
-        resolvePendingAgent(workspaceKey, agentId);
-      }
       if (lookupState.tag !== "idle") {
         setLookupState({ tag: "idle" });
       }
@@ -671,9 +642,6 @@ function AgentPanelBody({
           return;
         }
         if (!result) {
-          if (workspaceKey) {
-            resolvePendingAgent(workspaceKey, agentId);
-          }
           setLookupState({
             tag: "not_found",
             message: `Agent not found: ${agentId}`,
@@ -682,9 +650,6 @@ function AgentPanelBody({
         }
 
         storeFetchedAgentDetail({ serverId, result });
-        if (workspaceKey) {
-          resolvePendingAgent(workspaceKey, agentId);
-        }
         setLookupState({ tag: "idle" });
         return;
       })
@@ -694,25 +659,12 @@ function AgentPanelBody({
         }
         const message = toErrorMessage(error);
         if (isNotFoundErrorMessage(message)) {
-          if (workspaceKey) {
-            resolvePendingAgent(workspaceKey, agentId);
-          }
           setLookupState({ tag: "not_found", message });
           return;
         }
         setLookupState({ tag: "error", message });
       });
-  }, [
-    agentId,
-    agentState.id,
-    client,
-    hasSession,
-    isConnected,
-    lookupState.tag,
-    resolvePendingAgent,
-    serverId,
-    workspaceKey,
-  ]);
+  }, [agentId, agentState.id, client, hasSession, isConnected, lookupState.tag, serverId]);
 
   if (lookupState.tag === "not_found") {
     return (
@@ -766,7 +718,6 @@ function AgentPanelBody({
       isPaneFocused={isPaneFocused}
       client={client}
       isConnected={isConnected}
-      connectionStatus={connectionStatus}
       onOpenWorkspaceFile={onOpenWorkspaceFile}
     />
   );
@@ -779,7 +730,6 @@ function ChatAgentContent({
   isPaneFocused,
   client,
   isConnected,
-  connectionStatus,
   onOpenWorkspaceFile,
 }: {
   serverId: string;
@@ -788,7 +738,6 @@ function ChatAgentContent({
   isPaneFocused: boolean;
   client: ReturnType<typeof useHostRuntimeClient>;
   isConnected: boolean;
-  connectionStatus: HostRuntimeConnectionStatus;
   onOpenWorkspaceFile?: (request: WorkspaceFileOpenRequest) => void;
 }) {
   const { t } = useTranslation();
@@ -798,7 +747,6 @@ function ChatAgentContent({
   const streamViewRef = useRef<AgentStreamViewHandle>(null);
   const clearOnAgentBlurRef = useRef<() => void>(() => {});
   const wasPaneFocusedRef = useRef(isPaneFocused);
-  const reconnectToastPresentedRef = useRef(false);
   const initAttemptTokenRef = useRef(0);
   const routeBottomAnchorRequestRef = useRef<{
     routeKey: string;
@@ -885,73 +833,6 @@ function ChatAgentContent({
     clearOnAgentBlurRef.current = attentionController.clearOnAgentBlur;
   }, [attentionController.clearOnAgentBlur]);
 
-  const shouldPresentReconnectToast =
-    isPaneVisible && connectionStatus !== "online" && connectionStatus !== "idle";
-
-  useEffect(() => {
-    if (connectionStatus === "online" || connectionStatus === "idle") {
-      reconnectToastStateByServerId.delete(serverId);
-    }
-
-    if (!shouldPresentReconnectToast) {
-      if (reconnectToastPresentedRef.current) {
-        reconnectToastPresentedRef.current = false;
-        dismissToast();
-      }
-      return;
-    }
-
-    const startedAt = getHostRuntimeConnectionStatusSince(serverId) ?? Date.now();
-    const previousReconnectToastState = reconnectToastStateByServerId.get(serverId);
-    const reconnectToastState = reconcileReconnectToastState(
-      previousReconnectToastState,
-      startedAt,
-    );
-    if (reconnectToastState !== previousReconnectToastState) {
-      reconnectToastStateByServerId.set(serverId, reconnectToastState);
-    }
-
-    if (reconnectToastState.presented) {
-      if (!reconnectToastPresentedRef.current) {
-        reconnectToastPresentedRef.current = true;
-        toastApi.show(t("agentPanel.states.reconnecting"), {
-          durationMs: null,
-          icon: (
-            <View
-              accessible={false}
-              testID="agent-reconnecting-status-dot"
-              style={styles.reconnectingStatusDot}
-            />
-          ),
-          testID: "agent-reconnecting-toast",
-        });
-      }
-      return;
-    }
-
-    const delayMs = Math.max(0, startedAt + RECONNECT_TOAST_DELAY_MS - Date.now());
-    const timer = setTimeout(() => {
-      if (reconnectToastStateByServerId.get(serverId) !== reconnectToastState) {
-        return;
-      }
-      reconnectToastState.presented = true;
-      reconnectToastPresentedRef.current = true;
-      toastApi.show(t("agentPanel.states.reconnecting"), {
-        durationMs: null,
-        icon: (
-          <View
-            accessible={false}
-            testID="agent-reconnecting-status-dot"
-            style={styles.reconnectingStatusDot}
-          />
-        ),
-        testID: "agent-reconnecting-toast",
-      });
-    }, delayMs);
-
-    return () => clearTimeout(timer);
-  }, [connectionStatus, dismissToast, serverId, shouldPresentReconnectToast, toastApi, t]);
-
   const isArchivingCurrentAgent = Boolean(agentId && isArchivingAgent({ serverId, agentId }));
 
   useEffect(() => {
@@ -1205,6 +1086,7 @@ function ChatAgentContent({
       handleComposerHeightChange={handleComposerHeightChange}
       handleMessageSent={handleMessageSent}
       handleRewindComplete={handleRewindComplete}
+      timelineSync={isPaneVisible && viewState.tag === "ready" ? viewState.sync : null}
       showHistorySyncOverlay={showHistorySyncOverlay}
       showHistorySyncError={showHistorySyncError}
       isRetryingHistorySync={isRetryingHistorySync}
@@ -1234,6 +1116,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   handleComposerHeightChange,
   handleMessageSent,
   handleRewindComplete,
+  timelineSync,
   showHistorySyncOverlay,
   showHistorySyncError,
   isRetryingHistorySync,
@@ -1259,6 +1142,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   handleComposerHeightChange: (height: number) => void;
   handleMessageSent: () => void;
   handleRewindComplete: () => void;
+  timelineSync: AgentScreenReadySyncState | null;
   showHistorySyncOverlay: boolean;
   showHistorySyncError: boolean;
   isRetryingHistorySync: boolean;
@@ -1295,7 +1179,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   // Stabilize the agentInputDraft object identity so that memo(AgentComposerSection) can bail out
   // when only toast state changes (which does not affect any draft field).
   const {
-    text,
+    textSource,
     editText,
     replaceText,
     textReplacement,
@@ -1308,7 +1192,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   } = rawAgentInputDraft;
   const agentInputDraft = useMemo(
     (): AgentInputDraft => ({
-      text,
+      textSource,
       editText,
       replaceText,
       textReplacement,
@@ -1320,7 +1204,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
       composerState,
     }),
     [
-      text,
+      textSource,
       editText,
       replaceText,
       textReplacement,
@@ -1382,51 +1266,45 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
       ) : null}
     </View>
   );
-  const contentContainer = <View style={styles.contentContainer}>{streamContent}</View>;
+
+  const dockContent = (
+    <View style={styles.contentContainer}>
+      {streamContent}
+
+      {showHistorySyncError ? (
+        <TimelineSyncErrorCallout isRetrying={isRetryingHistorySync} onRetry={retryTimelineSync} />
+      ) : null}
+    </View>
+  );
+
+  const dockOverlay = (
+    <>
+      {showHistorySyncOverlay ? (
+        <View style={styles.historySyncOverlay} testID="agent-history-overlay">
+          <ThemedLoadingSpinner size="large" uniProps={foregroundMutedColorMapping} />
+        </View>
+      ) : null}
+
+      <TimelineSyncStatus sync={timelineSync} toast={toast} onDismiss={dismiss} />
+    </>
+  );
+
+  const dock = (
+    <ChatSurface disabled={isArchivingCurrentAgent}>
+      {dockContent}
+      {composerSection}
+      {dockOverlay}
+    </ChatSurface>
+  );
 
   return (
     <RewindComposerRestoreProvider
-      text={agentInputDraft.text}
+      textSource={agentInputDraft.textSource}
       setText={agentInputDraft.replaceText}
       onRewindComplete={handleRewindComplete}
     >
       <View style={styles.root}>
-        <DockedChatSurface disabled={isArchivingCurrentAgent}>
-          {contentContainer}
-
-          {showHistorySyncError ? (
-            <View style={styles.timelineSyncCalloutRail}>
-              <View style={styles.timelineSyncCalloutContent}>
-                <View style={styles.timelineSyncCallout} testID="agent-timeline-sync-error">
-                  <Text style={styles.timelineSyncCalloutText}>
-                    {t("agentPanel.states.timelineSyncFailed")}
-                  </Text>
-                  <Button
-                    size="sm"
-                    variant="secondary"
-                    onPress={retryTimelineSync}
-                    disabled={isRetryingHistorySync}
-                    testID="agent-timeline-sync-retry"
-                  >
-                    {isRetryingHistorySync
-                      ? t("agentPanel.states.timelineSyncRetrying")
-                      : t("common.actions.retry")}
-                  </Button>
-                </View>
-              </View>
-            </View>
-          ) : null}
-
-          {composerSection}
-
-          {showHistorySyncOverlay ? (
-            <View style={styles.historySyncOverlay} testID="agent-history-overlay">
-              <ThemedLoadingSpinner size="large" uniProps={foregroundMutedColorMapping} />
-            </View>
-          ) : null}
-
-          <ToastViewport toast={toast} onDismiss={dismiss} placement="panel" />
-        </DockedChatSurface>
+        {dock}
 
         {isArchivingCurrentAgent ? (
           <View style={styles.archivingOverlay} testID="agent-archiving-overlay">
@@ -1440,13 +1318,47 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   );
 });
 
-function DockedChatSurface({ children, disabled }: { children: ReactNode; disabled: boolean }) {
+function ChatSurface({
+  children,
+  disabled,
+}: {
+  children: [ReactNode, ReactNode, ReactNode];
+  disabled: boolean;
+}) {
   return (
-    <KeyboardDock style={styles.container}>
-      <FileDropZone style={styles.container} disabled={disabled}>
-        {children}
-      </FileDropZone>
-    </KeyboardDock>
+    <FileDropZone style={styles.container} disabled={disabled}>
+      <ComposerDock>{children}</ComposerDock>
+    </FileDropZone>
+  );
+}
+
+function TimelineSyncErrorCallout({
+  isRetrying,
+  onRetry,
+}: {
+  isRetrying: boolean;
+  onRetry: () => void;
+}) {
+  const { t } = useTranslation();
+  return (
+    <View style={styles.timelineSyncCalloutRail}>
+      <View style={styles.timelineSyncCalloutContent}>
+        <View style={styles.timelineSyncCallout} testID="agent-timeline-sync-error">
+          <Text style={styles.timelineSyncCalloutText}>
+            {t("agentPanel.states.timelineSyncFailed")}
+          </Text>
+          <Button
+            size="sm"
+            variant="secondary"
+            onPress={onRetry}
+            disabled={isRetrying}
+            testID="agent-timeline-sync-retry"
+          >
+            {isRetrying ? t("agentPanel.states.timelineSyncRetrying") : t("common.actions.retry")}
+          </Button>
+        </View>
+      </View>
+    </View>
   );
 }
 
@@ -1626,7 +1538,6 @@ function ActiveAgentComposer({
   onComposerHeightChange: (height: number) => void;
   onMessageSent: () => void;
 }) {
-  const insets = useSafeAreaInsets();
   const isCompactFormFactor = useIsCompactFormFactor();
   const { onLayout: onInputAreaLayout, isBelow: isCompactComposerLayout } = useContainerWidthBelow(
     COMPACT_FORM_FACTOR_WIDTH,
@@ -1701,21 +1612,15 @@ function ActiveAgentComposer({
     ],
   );
 
-  const inputAreaStyle = useMemo(
-    () => [animatedStaticStyles.inputAreaWrapper, { paddingBottom: insets.bottom }],
-    [insets.bottom],
-  );
-
   return (
-    <View style={inputAreaStyle} onLayout={onInputAreaLayout}>
+    <View style={animatedStaticStyles.inputAreaWrapper} onLayout={onInputAreaLayout}>
       <Composer
         agentId={agentId}
         serverId={serverId}
         workspaceId={workspaceId}
-        externalKeyboardShift
         blurOnSubmit={isNative}
         isPaneFocused={isPaneFocused}
-        value={agentInputDraft.text}
+        textSource={agentInputDraft.textSource}
         onChangeText={agentInputDraft.editText}
         textReplacement={agentInputDraft.textReplacement}
         attachments={agentInputDraft.attachments}
@@ -1841,7 +1746,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   timelineSyncCalloutContent: {
     width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
+    maxWidth: theme.contentMaxWidth,
   },
   timelineSyncCallout: {
     flexDirection: "row",
@@ -1898,12 +1803,6 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     color: theme.colors.foregroundMuted,
   },
-  reconnectingStatusDot: {
-    width: 8,
-    height: 8,
-    borderRadius: 4,
-    backgroundColor: theme.colors.palette.amber[500],
-  },
   centerState: {
     flex: 1,
     alignItems: "center",
diff --git a/packages/app/src/panels/agent-tracks.tsx b/packages/app/src/panels/agent-tracks.tsx
index cf505b63bc..962e095b89 100644
--- a/packages/app/src/panels/agent-tracks.tsx
+++ b/packages/app/src/panels/agent-tracks.tsx
@@ -128,6 +128,7 @@ export const AgentTracks = memo(function AgentTracks({
     <ComposerTrackBar>
       <AgentTaskList tasks={tasks} />
       <SubagentsTrack
+        serverId={serverId}
         rows={subagentRows}
         onOpenSubagent={handleOpenSubagent}
         onOpenProviderSubagent={handleOpenProviderSubagent}
diff --git a/packages/app/src/panels/new-tab-panel.tsx b/packages/app/src/panels/new-tab-panel.tsx
index cdafafabed..da1039a980 100644
--- a/packages/app/src/panels/new-tab-panel.tsx
+++ b/packages/app/src/panels/new-tab-panel.tsx
@@ -137,6 +137,7 @@ const NewTabPanel = memo(function NewTabPanel(): ReactElement {
     serverId,
     purpose: host === "explorer" ? "supporting" : "primary",
     host,
+    surface: "panel",
   });
   const itemsById = useMemo(
     () => new Map(groups.flatMap((group) => group.items).map((item) => [item.id, item])),
diff --git a/packages/app/src/panels/panel-manifest.test.ts b/packages/app/src/panels/panel-manifest.test.ts
index 0a91aad995..c06a87864d 100644
--- a/packages/app/src/panels/panel-manifest.test.ts
+++ b/packages/app/src/panels/panel-manifest.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { panelResourceKey, panelSupportsHost } from "@/panels/panel-manifest";
+import {
+  getPanelManifest,
+  panelCanLaunchInPane,
+  panelResourceKey,
+  panelSupportsHost,
+} from "@/panels/panel-manifest";
 
 describe("panel manifest", () => {
   it("answers host support without React panel registration", () => {
@@ -13,6 +18,23 @@ describe("panel manifest", () => {
     expect(panelSupportsHost("setup", "explorer")).toBe(false);
   });
 
+  it("lets navigation tabs hide their close button without losing their close action", () => {
+    expect(getPanelManifest("files").showCloseButton).toBe(false);
+    expect(getPanelManifest("changes_tree").showCloseButton).toBe(false);
+    expect(getPanelManifest("agent").showCloseButton).toBe(true);
+    expect(getPanelManifest("terminal").showCloseButton).toBe(true);
+    expect(getPanelManifest("file").showCloseButton).toBe(true);
+    expect(getPanelManifest("working_diff").showCloseButton).toBe(true);
+  });
+
+  it("hides a singleton launch only when it already exists in the destination pane", () => {
+    expect(panelCanLaunchInPane("files", ["files"])).toBe(false);
+    expect(panelCanLaunchInPane("changes_tree", ["changes_tree"])).toBe(false);
+    expect(panelCanLaunchInPane("files", ["changes_tree"])).toBe(true);
+    expect(panelCanLaunchInPane("files", [])).toBe(true);
+    expect(panelCanLaunchInPane("terminal", ["terminal"])).toBe(true);
+  });
+
   it("keeps durable resource identity separate from transient target input", () => {
     expect(
       panelResourceKey({ kind: "working_diff", focusPath: "src/a.ts", focusRequestId: 1 }),
diff --git a/packages/app/src/panels/panel-manifest.ts b/packages/app/src/panels/panel-manifest.ts
index c608340d09..4122da80f1 100644
--- a/packages/app/src/panels/panel-manifest.ts
+++ b/packages/app/src/panels/panel-manifest.ts
@@ -5,6 +5,8 @@ export type PaneHost = "main" | "explorer";
 export interface PanelManifest<K extends WorkspaceTabTarget["kind"] = WorkspaceTabTarget["kind"]> {
   kind: K;
   supportedHosts: readonly PaneHost[];
+  showCloseButton: boolean;
+  singleton: boolean;
   resourceKey(target: Extract<WorkspaceTabTarget, { kind: K }>): string;
 }
 
@@ -16,62 +18,86 @@ const manifests = {
   new_tab: {
     kind: "new_tab",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: () => "new_tab",
   },
   draft: {
     kind: "draft",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.draftId,
   },
   agent: {
     kind: "agent",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.agentId,
   },
   provider_subagent: {
     kind: "provider_subagent",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => `${target.parentAgentId}:${target.subagentId}`,
   },
   terminal: {
     kind: "terminal",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.terminalId,
   },
   browser: {
     kind: "browser",
     supportedHosts: ["main"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.browserId,
   },
   changes_tree: {
     kind: "changes_tree",
     supportedHosts: ["explorer"],
+    showCloseButton: false,
+    singleton: true,
     resourceKey: () => "changes_tree",
   },
   files: {
     kind: "files",
     supportedHosts: ["explorer"],
+    showCloseButton: false,
+    singleton: true,
     resourceKey: () => "files",
   },
   pull_request: {
     kind: "pull_request",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: () => "pull_request",
   },
   file: {
     kind: "file",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.path,
   },
   working_diff: {
     kind: "working_diff",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: () => "working_diff",
   },
   plugin: {
     kind: "plugin",
     // Plugin targets are narrowed by the target-aware plugin panel capability resolver.
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) =>
       target.context === "agent"
         ? `${target.pluginId}:${target.panelId}:agent:${target.agentId}`
@@ -80,11 +106,15 @@ const manifests = {
   setup: {
     kind: "setup",
     supportedHosts: ["main"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.workspaceId,
   },
   commit_diff: {
     kind: "commit_diff",
     supportedHosts: ["main", "explorer"],
+    showCloseButton: true,
+    singleton: false,
     resourceKey: (target) => target.sha,
   },
 } satisfies PanelManifestByKind;
@@ -97,6 +127,13 @@ export function panelSupportsHost(kind: WorkspaceTabTarget["kind"], host: PaneHo
   return getPanelManifest(kind).supportedHosts.includes(host);
 }
 
+export function panelCanLaunchInPane(
+  kind: WorkspaceTabTarget["kind"],
+  panePanelKinds: readonly WorkspaceTabTarget["kind"][],
+): boolean {
+  return !getPanelManifest(kind).singleton || !panePanelKinds.includes(kind);
+}
+
 export function panelResourceKey(target: WorkspaceTabTarget): string {
   const manifest = getPanelManifest(target.kind);
   return `${target.kind}:${manifest.resourceKey(target as never)}`;
diff --git a/packages/app/src/panels/provider-subagent-panel.tsx b/packages/app/src/panels/provider-subagent-panel.tsx
index 46153089e8..6c2d482403 100644
--- a/packages/app/src/panels/provider-subagent-panel.tsx
+++ b/packages/app/src/panels/provider-subagent-panel.tsx
@@ -4,15 +4,24 @@ import { StyleSheet } from "react-native-unistyles";
 import invariant from "tiny-invariant";
 import { useShallow } from "zustand/react/shallow";
 import { AgentStreamView } from "@/agent-stream/view";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
+import {
+  resolveComposerTrackControlClearance,
+  resolveComposerTrackTailClearance,
+} from "@/composer/pill-styles";
+import { ComposerTrackBar } from "@/composer/tracks";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { usePaneContext } from "@/panels/pane-context";
 import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
 import { useSessionStore } from "@/stores/session-store";
+import { useSubagentsForParent } from "@/subagents/select";
+import { SubagentsTrack } from "@/subagents/track";
 import {
   providerSubagentKey,
   providerSubagentLifecycleStatus,
   refreshProviderSubagents,
+  observeProviderSubagentTimeline,
   useProviderSubagentStore,
 } from "@/subagents/provider-store";
 import { useTranslation } from "react-i18next";
@@ -24,6 +33,38 @@ import type { TurnPresentation } from "@/timeline/turn-liveness";
 
 const EMPTY_PERMISSIONS = new Map<string, PendingPermission>();
 const EMPTY_STREAM_ITEMS: StreamItem[] = [];
+const NOOP_SUBAGENT = () => undefined;
+
+function resolveChildTrackClearance(childCount: number, isCompact: boolean) {
+  if (childCount === 0) return { tail: 0, controls: 0 };
+  return {
+    tail: resolveComposerTrackTailClearance(isCompact),
+    controls: resolveComposerTrackControlClearance(isCompact),
+  };
+}
+
+function ProviderSubagentChildTrack({
+  serverId,
+  rows,
+  onOpenProviderSubagent,
+}: {
+  serverId: string;
+  rows: ReturnType<typeof useSubagentsForParent>;
+  onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
+}) {
+  if (rows.length === 0) return null;
+  return (
+    <ComposerTrackBar>
+      <SubagentsTrack
+        serverId={serverId}
+        rows={rows}
+        onOpenSubagent={NOOP_SUBAGENT}
+        onOpenProviderSubagent={onOpenProviderSubagent}
+        onArchiveSubagent={NOOP_SUBAGENT}
+      />
+    </ComposerTrackBar>
+  );
+}
 
 function formatProviderLabel(provider: string): string {
   return provider
@@ -56,7 +97,7 @@ function useProviderSubagentDescriptor(
       subagentType && subagentType !== label ? `${subagentType} · ${providerLabel}` : providerLabel,
     tooltip: label,
     titleState: descriptor ? "ready" : "loading",
-    icon: getProviderIcon(provider),
+    icon: useProviderIcon(provider, context.serverId),
     statusBucket: descriptor
       ? deriveSidebarStateBucket({
           status: providerSubagentLifecycleStatus(descriptor.status),
@@ -68,7 +109,7 @@ function useProviderSubagentDescriptor(
 
 function ProviderSubagentPanel() {
   const { t } = useTranslation();
-  const { serverId, target, openFileInWorkspace } = usePaneContext();
+  const { serverId, target, openFileInWorkspace, openTab } = usePaneContext();
   invariant(target.kind === "provider_subagent", "ProviderSubagentPanel requires provider target");
   const key = providerSubagentKey(serverId, target.parentAgentId, target.subagentId);
   const streamId = `provider:${encodeURIComponent(target.parentAgentId)}:${encodeURIComponent(target.subagentId)}`;
@@ -86,9 +127,22 @@ function ProviderSubagentPanel() {
   );
   const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);
   const serverInfo = useSessionStore((state) => state.sessions[serverId]?.serverInfo ?? null);
-  // COMPAT(providerSubagents): added in v0.2.11, remove after 2027-01-12.
-  const supported = serverInfo?.features?.providerSubagents === true;
+  // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove after 2027-03-14.
+  const supported = serverInfo?.features?.projectedSubagentTimeline === true;
   const [isLoadingOlder, setIsLoadingOlder] = useState(false);
+  const isCompact = useIsCompactFormFactor();
+  const childRows = useSubagentsForParent({
+    serverId,
+    parentAgentId: target.parentAgentId,
+    providerParentSubagentId: target.subagentId,
+  });
+  const childTrackClearance = resolveChildTrackClearance(childRows.length, isCompact);
+  const openProviderChild = useCallback(
+    (parentAgentId: string, subagentId: string) => {
+      openTab({ kind: "provider_subagent", parentAgentId, subagentId });
+    },
+    [openTab],
+  );
 
   useEffect(() => {
     if (!client || !supported) return;
@@ -97,23 +151,28 @@ function ProviderSubagentPanel() {
 
   useEffect(() => {
     if (!client || !supported) return;
-    void client
-      .fetchProviderSubagentTimeline(target.parentAgentId, target.subagentId, {
-        direction: "tail",
-        limit: TIMELINE_FETCH_PAGE_SIZE,
-      })
-      .then((payload) => {
-        useProviderSubagentStore.getState().replaceTimeline(serverId, payload);
-        return undefined;
-      })
-      .catch(() => undefined);
-  }, [client, serverId, supported, target.parentAgentId, target.subagentId]);
+    return observeProviderSubagentTimeline({
+      client,
+      serverId,
+      parentAgentId: target.parentAgentId,
+      subagentId: target.subagentId,
+      limit: TIMELINE_FETCH_PAGE_SIZE,
+      reportError: (error) => {
+        console.error("[ProviderSubagentTimeline] Failed to refresh child history", {
+          error,
+          serverId,
+          parentAgentId: target.parentAgentId,
+          subagentId: target.subagentId,
+        });
+      },
+    });
+  }, [client, supported, serverId, target.parentAgentId, target.subagentId]);
 
   const loadOlder = useCallback((): boolean => {
     if (!client || !supported || isLoadingOlder || !timeline?.hasOlder || !timeline.epoch) {
       return false;
     }
-    const firstSeq = timeline.rows.size ? Math.min(...timeline.rows.keys()) : null;
+    const firstSeq = timeline.cursor?.startSeq ?? null;
     if (firstSeq === null) return false;
     setIsLoadingOlder(true);
     void client
@@ -138,7 +197,7 @@ function ProviderSubagentPanel() {
     target.subagentId,
     timeline,
   ]);
-  const firstTimelineSeq = timeline?.rows.size ? Math.min(...timeline.rows.keys()) : null;
+  const firstTimelineSeq = timeline?.cursor?.startSeq ?? null;
   const progressKey =
     timeline?.epoch && firstTimelineSeq !== null ? `${timeline.epoch}:${firstTimelineSeq}` : null;
   const subtitle = descriptor?.subtitle?.trim();
@@ -207,6 +266,13 @@ function ProviderSubagentPanel() {
         onOpenWorkspaceFile={openFileInWorkspace}
         readOnly
         historyPagination={historyPagination}
+        bottomOverlayTailClearance={childTrackClearance.tail}
+        bottomOverlayControlClearance={childTrackClearance.controls}
+      />
+      <ProviderSubagentChildTrack
+        serverId={serverId}
+        rows={childRows}
+        onOpenProviderSubagent={openProviderChild}
       />
     </View>
   );
diff --git a/packages/app/src/panels/pull-request/index.tsx b/packages/app/src/panels/pull-request/index.tsx
index 8759ae561f..148da86914 100644
--- a/packages/app/src/panels/pull-request/index.tsx
+++ b/packages/app/src/panels/pull-request/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native-unistyles";
@@ -14,11 +14,14 @@ import {
 import type { UsePrPaneDataResult } from "@/git/pull-request-panel/use-data";
 import { useCheckoutPrStatusQuery } from "@/git/use-pr-status-query";
 
+import { useSettings } from "@/hooks/use-settings";
+import { useWorkspaceLayoutStoreHydrated } from "@/stores/workspace-layout-store";
+import { autoOpenWorkspacePullRequest } from "@/workspace-tabs/open-supporting-view";
+
 import { getPullRequestIdentity, resolvePullRequestContentState } from "./state";
 
 /**
- * Whether this workspace's branch has a pull request. Detection only offers the
- * pull request as something the user can open; it never opens a tab on its own.
+ * Whether this workspace's branch has a pull request.
  */
 export function useHasPullRequest(input: {
   serverId: string;
@@ -33,6 +36,21 @@ export function useHasPullRequest(input: {
   return getPullRequestIdentity(status) !== null;
 }
 
+/** Connects desktop PR detection to the persisted layout after hydration. */
+export function usePullRequestAutoAdd(input: {
+  workspaceKey: string | null;
+  hasPullRequest: boolean;
+  enabled: boolean;
+}): void {
+  const hydrated = useWorkspaceLayoutStoreHydrated();
+  const destination = useSettings((settings) => settings.pullRequestOpenLocation);
+  useEffect(() => {
+    if (hydrated && input.enabled && input.hasPullRequest) {
+      autoOpenWorkspacePullRequest({ workspaceKey: input.workspaceKey, destination });
+    }
+  }, [hydrated, input.enabled, input.hasPullRequest, input.workspaceKey, destination]);
+}
+
 export function PullRequestContent(input: {
   serverId: string;
   workspaceId?: string | null;
diff --git a/packages/app/src/panels/reconnect-toast-state.test.ts b/packages/app/src/panels/reconnect-toast-state.test.ts
deleted file mode 100644
index 2813ca485b..0000000000
--- a/packages/app/src/panels/reconnect-toast-state.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { reconcileReconnectToastState, type ReconnectToastState } from "./reconnect-toast-state";
-
-describe("reconnect toast presentation state", () => {
-  it("resets after the host recovers without a mounted agent panel", () => {
-    const presented: ReconnectToastState = {
-      connectionStatusStartedAt: 100,
-      presented: true,
-    };
-
-    expect(reconcileReconnectToastState(presented, 100)).toBe(presented);
-    expect(reconcileReconnectToastState(presented, 200)).toEqual({
-      connectionStatusStartedAt: 200,
-      presented: false,
-    });
-  });
-});
diff --git a/packages/app/src/panels/reconnect-toast-state.ts b/packages/app/src/panels/reconnect-toast-state.ts
deleted file mode 100644
index ff690614fc..0000000000
--- a/packages/app/src/panels/reconnect-toast-state.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface ReconnectToastState {
-  connectionStatusStartedAt: number;
-  presented: boolean;
-}
-
-export function reconcileReconnectToastState(
-  state: ReconnectToastState | undefined,
-  connectionStatusStartedAt: number,
-): ReconnectToastState {
-  if (state?.connectionStatusStartedAt === connectionStatusStartedAt) {
-    return state;
-  }
-
-  return {
-    connectionStatusStartedAt,
-    presented: false,
-  };
-}
diff --git a/packages/app/src/panels/retained-chat-content.tsx b/packages/app/src/panels/retained-chat-content.tsx
new file mode 100644
index 0000000000..0ed1d2dfc8
--- /dev/null
+++ b/packages/app/src/panels/retained-chat-content.tsx
@@ -0,0 +1,11 @@
+import type { ReactNode } from "react";
+
+/**
+ * Native: a hidden chat stays mounted and keeps rendering. Suspending a retained
+ * native subtree hides its host views, tears down layout effects, and detaches
+ * refs, which changes Fabric ownership (docs/mobile-panels.md). Activity-gated
+ * work already stops through the retained-panel signal.
+ */
+export function RetainedChatContent({ children }: { children: ReactNode }) {
+  return children;
+}
diff --git a/packages/app/src/panels/retained-chat-content.web.tsx b/packages/app/src/panels/retained-chat-content.web.tsx
new file mode 100644
index 0000000000..938a0e48ca
--- /dev/null
+++ b/packages/app/src/panels/retained-chat-content.web.tsx
@@ -0,0 +1,17 @@
+import React, { useEffect, useState, type ReactNode } from "react";
+import { Freeze } from "react-freeze";
+import { useRetainedPanelActive } from "@/components/retained-panel";
+
+/**
+ * Web only: suspends a hidden chat so its subscribers stop rendering while the
+ * model keeps streaming. DOM nodes have no Fabric ownership to lose, so
+ * suspension is safe here; native keeps the subtree live (see the base file).
+ */
+export function RetainedChatContent({ children }: { children: ReactNode }) {
+  const active = useRetainedPanelActive();
+  const [frozen, setFrozen] = useState(!active);
+  // First let visibility-gated queries and animations receive active=false.
+  // The following commit freezes every chat subscriber while the model keeps streaming.
+  useEffect(() => setFrozen(!active), [active]);
+  return <Freeze freeze={!active && frozen}>{children}</Freeze>;
+}
diff --git a/packages/app/src/panels/setup-panel.tsx b/packages/app/src/panels/setup-panel.tsx
index 9934bec864..3648bf5a1c 100644
--- a/packages/app/src/panels/setup-panel.tsx
+++ b/packages/app/src/panels/setup-panel.tsx
@@ -145,6 +145,7 @@ function BlockedSetupNotice({
   return (
     <>
       <Alert
+        size="sm"
         variant="warning"
         title={t("workspace.setup.blocked.title")}
         description={t("workspace.setup.blocked.description", {
@@ -158,7 +159,7 @@ function BlockedSetupNotice({
           </Button>
         ) : null}
       </Alert>
-      {runError ? <Alert variant="error" description={runError} /> : null}
+      {runError ? <Alert size="sm" variant="error" description={runError} /> : null}
     </>
   );
 }
diff --git a/packages/app/src/panels/terminal-panel.tsx b/packages/app/src/panels/terminal-panel.tsx
index 32dd1f188d..8082bd36e5 100644
--- a/packages/app/src/panels/terminal-panel.tsx
+++ b/packages/app/src/panels/terminal-panel.tsx
@@ -69,7 +69,7 @@ function useTerminalPanelDescriptor(
     label,
     subtitle: t("workspace.tabs.fallback.terminal"),
     tooltip: label,
-    titleState: "ready",
+    titleState: terminalsQuery.isPending ? "loading" : "ready",
     icon: Terminal,
     statusBucket: deriveTerminalActivityStatusBucket(terminal?.activity),
   };
diff --git a/packages/app/src/plugins/actions.ts b/packages/app/src/plugins/actions.ts
index 0d9278a702..b61eae7c1d 100644
--- a/packages/app/src/plugins/actions.ts
+++ b/packages/app/src/plugins/actions.ts
@@ -1,17 +1,19 @@
-import { callPluginRpc } from "@getpaseo/plugin/host";
+import { callPluginRpc } from "@getpaseo/plugin/client/host";
 import type {
   PluginAgentCommandContext,
   PluginCommandCapabilities,
   PluginPanelLocation,
+  PluginScreenParams,
   PluginWorkspaceCommandContext,
-} from "@getpaseo/plugin";
-import type { PluginClientStateSource } from "@getpaseo/plugin/host";
+} from "@getpaseo/plugin/client";
+import type { PluginClientStateSource } from "@getpaseo/plugin/client/host";
 import { resolvePluginPanelOpenLocation } from "./workspace-panels/locations";
-import type { PluginSurfaceRuntime } from "./surface-runtime";
+import { parsePluginOpenScreenInput } from "./surface-contribution";
 import type { InstalledPlugin } from "./types";
 
 export interface PluginNavigation {
-  openSurface(pluginId: string, surfaceId: string): void;
+  openSettings(pluginId: string, screenId: string): void;
+  openSurface(pluginId: string, surfaceId: string, params?: PluginScreenParams): void;
   openWorkspacePanel(pluginId: string, panelId: string, location: PluginPanelLocation): void;
   openAgentPanel(
     pluginId: string,
@@ -23,36 +25,40 @@ export interface PluginNavigation {
 
 export function createPluginCapabilities(
   plugin: InstalledPlugin,
-  runtime: PluginSurfaceRuntime,
   navigation: PluginNavigation,
 ): PluginCommandCapabilities {
+  function openScreen(input: unknown) {
+    const { screenId, params } = parsePluginOpenScreenInput(plugin, input);
+    navigation.openSurface(plugin.id, screenId, params);
+  }
   return {
-    paseo: runtime.paseo,
-    rpc: (contract, input) => callPluginRpc(contract, runtime.invoke, input),
-    openSurface(surfaceId) {
-      if (!plugin.surfaces.some((surface) => surface.id === surfaceId)) {
-        throw new Error(`Plugin surface is unavailable: ${surfaceId}`);
-      }
-      navigation.openSurface(plugin.id, surfaceId);
+    paseo: plugin.paseo,
+    rpc: (contract, input) => callPluginRpc(contract, plugin.invoke, input),
+    openSettings(screenId) {
+      if (!plugin.settingsScreens.some((screen) => screen.id === screenId))
+        throw new Error(`Plugin settings screen is unavailable: ${screenId}`);
+      navigation.openSettings(plugin.id, screenId);
     },
+    openScreen,
+    // COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+    openSurface: (screenId) => openScreen({ screenId }),
   };
 }
 
 export function createPluginAgentActionContext(input: {
   plugin: InstalledPlugin;
-  runtime: PluginSurfaceRuntime;
   navigation: PluginNavigation;
   state: PluginClientStateSource;
   workspaceId: string;
   agentId: string;
 }): PluginAgentCommandContext | null {
-  const { plugin, runtime, navigation, state, workspaceId, agentId } = input;
+  const { plugin, navigation, state, workspaceId, agentId } = input;
   const workspace = state.getWorkspace(workspaceId);
   const agent = state.getAgent(agentId);
   if (!workspace || !agent || agent.workspaceId !== workspace.id) return null;
   return {
     context: "agent",
-    ...createPluginCapabilities(plugin, runtime, navigation),
+    ...createPluginCapabilities(plugin, navigation),
     workspace,
     agent,
     openPanel(panelId, options) {
@@ -70,17 +76,16 @@ export function createPluginAgentActionContext(input: {
 
 export function createPluginWorkspaceActionContext(input: {
   plugin: InstalledPlugin;
-  runtime: PluginSurfaceRuntime;
   navigation: PluginNavigation;
   state: PluginClientStateSource;
   workspaceId: string;
 }): PluginWorkspaceCommandContext | null {
-  const { plugin, runtime, navigation, state, workspaceId } = input;
+  const { plugin, navigation, state, workspaceId } = input;
   const workspace = state.getWorkspace(workspaceId);
   if (!workspace) return null;
   return {
     context: "workspace",
-    ...createPluginCapabilities(plugin, runtime, navigation),
+    ...createPluginCapabilities(plugin, navigation),
     workspace,
     openPanel(panelId, options) {
       const panel = plugin.workspacePanels.find(
diff --git a/packages/app/src/plugins/attachments/picker.tsx b/packages/app/src/plugins/attachments/picker.tsx
index f25d5c4d20..a63c1eb4e0 100644
--- a/packages/app/src/plugins/attachments/picker.tsx
+++ b/packages/app/src/plugins/attachments/picker.tsx
@@ -3,7 +3,7 @@ import { View } from "react-native";
 import { withUnistyles } from "react-native-unistyles";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { PluginAttachmentItem, PluginAttachmentSourceContribution } from "@getpaseo/plugin";
-import { searchPluginAttachments } from "@getpaseo/plugin/host";
+import { searchPluginAttachments } from "@getpaseo/plugin/client/host";
 import type { LucideIcon } from "lucide-react-native";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { AttachmentMenuItem } from "@/composer/input/input";
diff --git a/packages/app/src/plugins/buttons/index.ts b/packages/app/src/plugins/buttons/index.ts
new file mode 100644
index 0000000000..3cf26bcd50
--- /dev/null
+++ b/packages/app/src/plugins/buttons/index.ts
@@ -0,0 +1 @@
+export { pluginButtonStore } from "./store";
diff --git a/packages/app/src/plugins/buttons/model.test.ts b/packages/app/src/plugins/buttons/model.test.ts
new file mode 100644
index 0000000000..4a77a81311
--- /dev/null
+++ b/packages/app/src/plugins/buttons/model.test.ts
@@ -0,0 +1,173 @@
+import { QueryClient } from "@tanstack/react-query";
+import { describe, expect, it } from "vitest";
+import type { PluginButton } from "@getpaseo/plugin/client";
+import type { InstalledPlugin } from "../types";
+import { PluginButtonStore, buttonMatches } from "./model";
+
+function installation(): InstalledPlugin {
+  return {
+    lifetime: new AbortController(),
+    id: "review",
+    serverId: "host-a",
+    clientBundle: "bundle",
+    queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
+    cleanup: () => undefined,
+    settingsScreens: [],
+    surfaces: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
+    workspacePanels: [],
+    commandCenterItems: [],
+    clientSlashCommands: [],
+    attachmentSources: [],
+    themes: [],
+    timelineTransformers: [],
+    timelineRenderers: [],
+  };
+}
+
+function store() {
+  return new PluginButtonStore({
+    validateIconName(name) {
+      if (name !== "Scan") throw new Error("Unknown icon");
+    },
+  });
+}
+
+function button(onPress = () => {}): PluginButton {
+  return { title: "Review", icon: "Scan", behavior: { kind: "action", onPress } };
+}
+
+describe("plugin buttons", () => {
+  it("updates visibility in place, closes hidden content, and scopes each placement", () => {
+    const buttons = store();
+    const plugin = installation();
+    const header = buttons.addHeaderButton(plugin, {
+      id: "review",
+      workspaceId: "workspace",
+      button: button(),
+    });
+    buttons.addComposerPill(plugin, {
+      id: "review",
+      workspaceId: "workspace",
+      agentId: "agent",
+      button: button(),
+    });
+    const first = buttons.getSnapshot()[0];
+    expect(buttonMatches(first, "host-a", "workspace", null)).toBe(true);
+    expect(buttonMatches(first, "host-b", "workspace", null)).toBe(false);
+    expect(buttonMatches(first, "host-a", "another-workspace", null)).toBe(false);
+    expect(buttonMatches(first, "host-a", "workspace", "agent")).toBe(false);
+    expect(buttonMatches(buttons.getSnapshot()[1], "host-a", "workspace", "agent")).toBe(true);
+    expect(buttonMatches(buttons.getSnapshot()[1], "host-a", "workspace", "other-agent")).toBe(
+      false,
+    );
+    buttons.setOpen(first.key, true);
+    header.update({ visible: false, label: "3 reviews" });
+    expect(buttonMatches(buttons.getSnapshot()[0], "host-a", "workspace", null)).toBe(false);
+    expect(buttons.getSnapshot()[0].open).toBe(false);
+    header.update({ visible: true });
+    expect(buttons.getSnapshot().map((entry) => entry.key)).toEqual([first.key, first.key + 1]);
+    expect(buttons.getSnapshot()[0].button.label).toBe("3 reviews");
+    header.remove();
+    header.remove();
+    header.update({ visible: true });
+    expect(buttons.getSnapshot().map((entry) => entry.placement)).toEqual(["composer"]);
+  });
+
+  it("rejects duplicates within a target and validates updates atomically", () => {
+    const buttons = store();
+    const plugin = installation();
+    const contribution = { id: "review", workspaceId: "workspace", button: button() };
+    const header = buttons.addHeaderButton(plugin, contribution);
+    expect(() => buttons.addHeaderButton(plugin, contribution)).toThrow(
+      "Duplicate plugin button: review",
+    );
+    expect(() => buttons.addHeaderButton(installation(), contribution)).not.toThrow();
+    expect(() =>
+      buttons.addHeaderButton(plugin, { ...contribution, workspaceId: "other" }),
+    ).not.toThrow();
+    expect(() => header.update({ title: "Changed", icon: "Invalid" })).toThrow("Unknown icon");
+    expect(buttons.getSnapshot()[0].button.title).toBe("Review");
+  });
+
+  it("prevents repeated presses and cannot resurrect a removed pending button", async () => {
+    const buttons = store();
+    let finish = () => {};
+    const pending = new Promise<void>((resolve) => {
+      finish = resolve;
+    });
+    let calls = 0;
+    const registration = buttons.addHeaderButton(installation(), {
+      id: "review",
+      workspaceId: "workspace",
+      button: button(() => {
+        calls++;
+        return pending;
+      }),
+    });
+    const key = buttons.getSnapshot()[0].key;
+    const action = buttons.run(key);
+    await buttons.run(key);
+    expect(calls).toBe(1);
+    expect(buttons.getSnapshot()[0].pending).toBe(true);
+    registration.remove();
+    finish();
+    await action;
+    expect(buttons.getSnapshot()).toEqual([]);
+  });
+
+  it("allows retry after failure and respects disabled actions and menu ancestors", async () => {
+    const buttons = store();
+    let calls = 0;
+    const registration = buttons.addHeaderButton(installation(), {
+      id: "review",
+      workspaceId: "workspace",
+      button: button(() => {
+        if (++calls === 1) throw new Error("Review unavailable");
+      }),
+    });
+    const key = buttons.getSnapshot()[0].key;
+    await expect(buttons.run(key)).rejects.toThrow("Review unavailable");
+    expect(buttons.getSnapshot()[0].pending).toBe(false);
+    await buttons.run(key);
+    expect(calls).toBe(2);
+    registration.update({ disabled: true });
+    await buttons.run(key);
+    expect(calls).toBe(2);
+    registration.update({
+      disabled: false,
+      behavior: {
+        kind: "menu",
+        items: [
+          {
+            kind: "item",
+            id: "nested",
+            title: "Nested",
+            disabled: true,
+            behavior: {
+              kind: "menu",
+              items: [
+                {
+                  kind: "item",
+                  id: "run",
+                  title: "Run",
+                  behavior: {
+                    kind: "action",
+                    onPress() {
+                      calls++;
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      },
+    });
+    await buttons.run(key, ["nested", "run"]);
+    expect(calls).toBe(2);
+  });
+});
diff --git a/packages/app/src/plugins/buttons/model.ts b/packages/app/src/plugins/buttons/model.ts
new file mode 100644
index 0000000000..25e7490b33
--- /dev/null
+++ b/packages/app/src/plugins/buttons/model.ts
@@ -0,0 +1,178 @@
+import type {
+  PluginButtonBehavior,
+  PluginButtonContext,
+  PluginButtonRegistration,
+  PluginHeaderButtonContribution,
+  PluginComposerPillContribution,
+} from "@getpaseo/plugin/client";
+import type { InstalledPlugin } from "../types";
+import {
+  requireButtonId,
+  validateButton,
+  type ButtonValidation,
+  type ResolvedPluginButton,
+} from "./validation";
+
+export type ButtonPlacement = "header" | "composer";
+
+export interface RegisteredPluginButton {
+  key: number;
+  id: string;
+  installation: InstalledPlugin;
+  placement: ButtonPlacement;
+  context: PluginButtonContext;
+  button: ResolvedPluginButton;
+  pending: boolean;
+  open: boolean;
+}
+
+function resolveAction(
+  behavior: PluginButtonBehavior,
+  path: readonly string[],
+): (() => void | Promise<void>) | null {
+  if (path.length === 0) return behavior.kind === "action" ? behavior.onPress : null;
+  if (behavior.kind !== "menu") return null;
+  const item = behavior.items.find((entry) => entry.id === path[0]);
+  if (!item || item.kind !== "item" || item.visible === false || item.disabled) return null;
+  return resolveAction(item.behavior, path.slice(1));
+}
+
+export class PluginButtonStore {
+  private entries: readonly RegisteredPluginButton[] = [];
+  private nextKey = 0;
+  private listeners = new Set<() => void>();
+
+  constructor(private validation: ButtonValidation) {}
+
+  subscribe = (listener: () => void): (() => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+
+  getSnapshot = (): readonly RegisteredPluginButton[] => this.entries;
+
+  addHeaderButton(
+    installation: InstalledPlugin,
+    input: PluginHeaderButtonContribution,
+  ): PluginButtonRegistration {
+    return this.add(installation, input, "header", {
+      context: "workspace",
+      workspaceId: input.workspaceId.trim(),
+    });
+  }
+
+  addComposerPill(
+    installation: InstalledPlugin,
+    input: PluginComposerPillContribution,
+  ): PluginButtonRegistration {
+    if (!input.agentId.trim()) throw new Error("Plugin composer pill needs an agent");
+    return this.add(installation, input, "composer", {
+      context: "agent",
+      workspaceId: input.workspaceId.trim(),
+      agentId: input.agentId.trim(),
+    });
+  }
+
+  private add(
+    installation: InstalledPlugin,
+    input: PluginHeaderButtonContribution,
+    placement: ButtonPlacement,
+    context: PluginButtonContext,
+  ): PluginButtonRegistration {
+    const id = requireButtonId(input.id);
+    if (!context.workspaceId.trim()) throw new Error("Plugin button needs a workspace");
+    const duplicate = this.entries.some(
+      (entry) =>
+        entry.installation === installation &&
+        entry.placement === placement &&
+        entry.id === id &&
+        entry.context.workspaceId === context.workspaceId &&
+        (entry.context.context === "workspace" ||
+          (context.context === "agent" && entry.context.agentId === context.agentId)),
+    );
+    if (duplicate) throw new Error(`Duplicate plugin button: ${id}`);
+    const key = this.nextKey++;
+    const initialButton = validateButton(input.button, this.validation);
+    this.publish([
+      ...this.entries,
+      {
+        key,
+        id,
+        installation,
+        placement,
+        context,
+        button: initialButton,
+        pending: false,
+        open: false,
+      },
+    ]);
+    return {
+      update: (patch) => {
+        const entry = this.entries.find((candidate) => candidate.key === key);
+        if (!entry) return;
+        const button = validateButton({ ...entry.button, ...patch }, this.validation);
+        const close = !button.visible || button.disabled || patch.behavior !== undefined;
+        this.replace(key, { button, open: close ? false : entry.open });
+      },
+      remove: () => {
+        const next = this.entries.filter((entry) => entry.key !== key);
+        if (next.length !== this.entries.length) this.publish(next);
+      },
+    };
+  }
+
+  setOpen(key: number, open: boolean): void {
+    const entry = this.entries.find((candidate) => candidate.key === key);
+    if (!entry) return;
+    if (open && (!entry.button.visible || entry.button.disabled || entry.pending)) return;
+    this.replace(key, { open });
+  }
+
+  async run(key: number, path: readonly string[] = []): Promise<void> {
+    const entry = this.entries.find((candidate) => candidate.key === key);
+    if (!entry || !entry.button.visible || entry.button.disabled || entry.pending) return;
+    const action = resolveAction(entry.button.behavior, path);
+    if (!action) return;
+    this.replace(key, { pending: true });
+    try {
+      await action();
+    } finally {
+      this.replace(key, { pending: false });
+    }
+  }
+
+  private replace(
+    key: number,
+    patch: Partial<Pick<RegisteredPluginButton, "button" | "open" | "pending">>,
+  ): void {
+    if (!this.entries.some((entry) => entry.key === key)) return;
+    this.publish(this.entries.map((entry) => (entry.key === key ? { ...entry, ...patch } : entry)));
+  }
+
+  private publish(entries: readonly RegisteredPluginButton[]): void {
+    this.entries = entries;
+    for (const listener of this.listeners) listener();
+  }
+}
+
+export function buttonMatches(
+  entry: RegisteredPluginButton,
+  serverId: string,
+  workspaceId: string,
+  agentId: string | null,
+): boolean {
+  if (
+    entry.installation.serverId !== serverId ||
+    entry.context.workspaceId !== workspaceId ||
+    !entry.button.visible
+  )
+    return false;
+  if (agentId === null) return entry.placement === "header";
+  return (
+    entry.placement === "composer" &&
+    entry.context.context === "agent" &&
+    entry.context.agentId === agentId
+  );
+}
diff --git a/packages/app/src/plugins/buttons/store.ts b/packages/app/src/plugins/buttons/store.ts
new file mode 100644
index 0000000000..5dbc847333
--- /dev/null
+++ b/packages/app/src/plugins/buttons/store.ts
@@ -0,0 +1,4 @@
+import { resolvePluginIcon } from "../icons";
+import { PluginButtonStore } from "./model";
+
+export const pluginButtonStore = new PluginButtonStore({ validateIconName: resolvePluginIcon });
diff --git a/packages/app/src/plugins/buttons/validation.ts b/packages/app/src/plugins/buttons/validation.ts
new file mode 100644
index 0000000000..650c21fac2
--- /dev/null
+++ b/packages/app/src/plugins/buttons/validation.ts
@@ -0,0 +1,95 @@
+import type { PluginButton, PluginButtonBehavior, PluginButtonIcon } from "@getpaseo/plugin/client";
+
+export interface ButtonValidation {
+  validateIconName(name: string): void;
+}
+
+export function requireButtonId(value: string): string {
+  if (typeof value !== "string" || !/^[a-z][a-z0-9-]*$/.test(value))
+    throw new Error(`Invalid plugin button id: ${value}`);
+  return value;
+}
+
+function optionalBoolean(value: boolean | undefined, fallback: boolean): boolean {
+  if (value === undefined) return fallback;
+  if (typeof value !== "boolean")
+    throw new Error("Plugin button visibility and disabled state must be booleans");
+  return value;
+}
+
+function requireText(value: string, field: string): string {
+  if (typeof value !== "string" || !value.trim()) throw new Error(`Plugin button needs ${field}`);
+  return value.trim();
+}
+
+function isComponent(value: unknown): boolean {
+  return (
+    typeof value === "function" ||
+    (typeof value === "object" && value !== null && "$$typeof" in value)
+  );
+}
+
+function validateIcon(icon: PluginButtonIcon, validation: ButtonValidation): void {
+  if (typeof icon === "string") validation.validateIconName(icon);
+  else if (!isComponent(icon))
+    throw new Error("Plugin button icon must be a Lucide name or component");
+}
+
+function validateBehavior(
+  behavior: PluginButtonBehavior,
+  validation: ButtonValidation,
+): PluginButtonBehavior {
+  switch (behavior.kind) {
+    case "action":
+      if (typeof behavior.onPress !== "function")
+        throw new Error("Plugin button action needs onPress");
+      return { ...behavior };
+    case "popover":
+      if (!isComponent(behavior.Content)) throw new Error("Plugin button popover needs Content");
+      return { ...behavior };
+    case "menu": {
+      const ids = new Set<string>();
+      return {
+        kind: "menu",
+        items: behavior.items.map((item) => {
+          requireButtonId(item.id);
+          if (ids.has(item.id)) throw new Error(`Duplicate plugin button menu item: ${item.id}`);
+          ids.add(item.id);
+          if (item.kind === "separator") return { ...item };
+          if (item.kind !== "item") throw new Error("Invalid plugin button menu entry");
+          if (item.icon !== undefined) validateIcon(item.icon, validation);
+          return {
+            ...item,
+            title: requireText(item.title, "menu item title"),
+            visible: optionalBoolean(item.visible, true),
+            disabled: optionalBoolean(item.disabled, false),
+            behavior: validateBehavior(item.behavior, validation),
+          };
+        }),
+      };
+    }
+    default:
+      throw new Error("Invalid plugin button behavior");
+  }
+}
+
+export type ResolvedPluginButton = PluginButton & {
+  visible: boolean;
+  disabled: boolean;
+  label: string | undefined;
+};
+
+export function validateButton(
+  button: PluginButton,
+  validation: ButtonValidation,
+): ResolvedPluginButton {
+  validateIcon(button.icon, validation);
+  return {
+    ...button,
+    title: requireText(button.title, "title"),
+    label: button.label === undefined ? undefined : requireText(button.label, "label"),
+    visible: optionalBoolean(button.visible, true),
+    disabled: optionalBoolean(button.disabled, false),
+    behavior: validateBehavior(button.behavior, validation),
+  };
+}
diff --git a/packages/app/src/plugins/buttons/view.tsx b/packages/app/src/plugins/buttons/view.tsx
new file mode 100644
index 0000000000..7eae9a046d
--- /dev/null
+++ b/packages/app/src/plugins/buttons/view.tsx
@@ -0,0 +1,654 @@
+import type {
+  PluginButtonBehavior,
+  PluginButtonIcon,
+  PluginButtonMenuEntry,
+  PluginHostProps,
+} from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
+import { useCallback, useMemo, useSyncExternalStore, type ReactNode } from "react";
+import { Pressable, Text, View, useWindowDimensions } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { AlertCircle, ChevronDown, MoreHorizontal } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import {
+  MenuRoot,
+  MenuTrigger,
+  MenuItem,
+  MenuSeparator,
+  MenuSubTrigger,
+  useMenuContext,
+  type MenuPageDefinition,
+} from "@/components/ui/menu";
+import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
+import {
+  iconButtonChromeStyle,
+  type IconButtonChromeState,
+} from "@/components/ui/icon-button-chrome";
+import { composerPillStyles } from "@/composer/pill-styles";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { useToast } from "@/contexts/toast-context";
+import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
+import type { Theme } from "@/styles/theme";
+import { createPluginClientStateSource } from "../client-state/source";
+import { Icon } from "../icons";
+import {
+  PluginEnvironmentProvider,
+  PluginPopoverContent,
+  PluginPopoverSurface,
+  type PluginEnvironment,
+} from "../popover";
+import { SurfaceErrorBoundary } from "../surface-error-boundary";
+import { toPluginTheme } from "../theme";
+import { buttonMatches, type RegisteredPluginButton } from "./model";
+import { pluginButtonStore } from "./store";
+import { resolvePluginPlatform } from "../platform";
+
+interface ButtonView {
+  entry: RegisteredPluginButton;
+  props: PluginHostProps & RegisteredPluginButton["context"];
+  environment: PluginEnvironment;
+  toast: ReturnType<typeof useToast>;
+}
+
+const ROOT_PATH: readonly string[] = [];
+
+const pluginThemeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
+const mutedIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const errorIconMapping = (theme: Theme) => ({ color: theme.colors.statusDanger });
+const ThemedMoreIcon = withUnistyles(MoreHorizontal);
+const ThemedErrorIcon = withUnistyles(AlertCircle);
+
+function headerButtonStyle(compact: boolean, state: IconButtonChromeState, disabled = false) {
+  if (compact) return iconButtonChromeStyle({ size: "large", state, disabled });
+  return [
+    styles.headerButton,
+    styles.button,
+    (state.hovered || state.pressed || state.open) && styles.active,
+    disabled && styles.disabled,
+  ];
+}
+
+function ButtonEnvironment({ view, children }: { view: ButtonView; children: ReactNode }) {
+  return (
+    <PluginEnvironmentProvider environment={view.environment}>{children}</PluginEnvironmentProvider>
+  );
+}
+
+function ButtonIcon({ view, icon }: { view: ButtonView; icon: PluginButtonIcon }) {
+  const color = view.props.theme.colors.foregroundMuted;
+  const size = view.entry.placement === "composer" ? 14 : 16;
+  return (
+    <View
+      style={styles.icon}
+      pointerEvents="none"
+      accessible={false}
+      accessibilityElementsHidden
+      importantForAccessibility="no-hide-descendants"
+    >
+      {typeof icon === "string" ? (
+        <Icon name={icon} size={size} color={color} />
+      ) : (
+        renderCustomIcon(icon, view, size, color)
+      )}
+    </View>
+  );
+}
+
+function renderCustomIcon(
+  CustomIcon: Exclude<PluginButtonIcon, string>,
+  view: ButtonView,
+  size: number,
+  color: string,
+) {
+  return <CustomIcon {...view.props} size={size} color={color} />;
+}
+
+function pressButton(view: ButtonView, path: readonly string[]) {
+  void pluginButtonStore.run(view.entry.key, path).catch((error: unknown) => {
+    view.toast.error(error instanceof Error ? error.message : String(error));
+  });
+}
+
+function visibleMenuItems(
+  items: readonly PluginButtonMenuEntry[],
+): readonly PluginButtonMenuEntry[] {
+  const visible: PluginButtonMenuEntry[] = [];
+  for (const item of items) {
+    if (item.kind === "item" && item.visible === false) continue;
+    if (item.kind === "separator" && (visible.length === 0 || visible.at(-1)?.kind === "separator"))
+      continue;
+    visible.push(item);
+  }
+  if (visible.at(-1)?.kind === "separator") visible.pop();
+  return visible;
+}
+
+function ButtonMenuItem({
+  view,
+  title,
+  icon,
+  behavior,
+  disabled,
+  path,
+  pageId,
+}: {
+  view: ButtonView;
+  title: string;
+  icon?: PluginButtonIcon;
+  behavior: PluginButtonBehavior;
+  disabled: boolean;
+  path: readonly string[];
+  pageId: string;
+}) {
+  const select = useCallback(() => pressButton(view, path), [view, path]);
+  const leading = useMemo(
+    () => (icon ? <ButtonIcon view={view} icon={icon} /> : null),
+    [icon, view],
+  );
+  if (behavior.kind !== "action") {
+    return (
+      <MenuSubTrigger id={pageId} leading={leading} disabled={disabled}>
+        {title}
+      </MenuSubTrigger>
+    );
+  }
+  return (
+    <MenuItem onSelect={select} leading={leading} disabled={disabled}>
+      {title}
+    </MenuItem>
+  );
+}
+
+function ButtonBody({
+  view,
+  behavior,
+  path,
+}: {
+  view: ButtonView;
+  behavior: PluginButtonBehavior;
+  path: readonly string[];
+}) {
+  const menu = useMenuContext("PluginButton");
+  const close = useCallback(() => menu.setOpen(false), [menu]);
+  if (behavior.kind === "popover") {
+    const Content = behavior.Content;
+    return (
+      <PluginPopoverContent>
+        <Content {...view.props} close={close} />
+      </PluginPopoverContent>
+    );
+  }
+  if (behavior.kind !== "menu") return null;
+  return visibleMenuItems(behavior.items).map((item) => {
+    if (item.kind === "separator") return <MenuSeparator key={item.id} />;
+    const itemPath = [...path, item.id];
+    return (
+      <ButtonMenuItem
+        key={item.id}
+        view={view}
+        title={item.title}
+        icon={item.icon}
+        behavior={item.behavior}
+        disabled={view.entry.pending || view.entry.button.disabled || item.disabled === true}
+        path={itemPath}
+        pageId={buttonPageId(view, itemPath)}
+      />
+    );
+  });
+}
+
+function ButtonSurfaceBody({
+  view,
+  behavior,
+  path,
+}: {
+  view: ButtonView;
+  behavior: PluginButtonBehavior;
+  path: readonly string[];
+}) {
+  return (
+    <SurfaceErrorBoundary installation={view.entry.installation} Surface={behavior}>
+      <ButtonEnvironment view={view}>
+        <ButtonBody view={view} behavior={behavior} path={path} />
+      </ButtonEnvironment>
+    </SurfaceErrorBoundary>
+  );
+}
+
+function buttonPageId(view: ButtonView, path: readonly string[]): string {
+  return [view.entry.key, ...path].join("/");
+}
+
+function buttonPages(
+  view: ButtonView,
+  behavior: PluginButtonBehavior,
+  path: readonly string[] = [],
+): MenuPageDefinition[] {
+  if (behavior.kind !== "menu") return [];
+  return behavior.items.flatMap((item) => {
+    if (item.kind === "separator" || item.visible === false || item.behavior.kind === "action")
+      return [];
+    const itemPath = [...path, item.id];
+    return [
+      {
+        id: buttonPageId(view, itemPath),
+        title: item.title,
+        hoverIntent: item.behavior.kind === "menu",
+        content: <ButtonSurfaceBody view={view} behavior={item.behavior} path={itemPath} />,
+      },
+      ...buttonPages(view, item.behavior, itemPath),
+    ];
+  });
+}
+
+function ButtonControl({ view }: { view: ButtonView }) {
+  const { entry, props } = view;
+  const { button } = entry;
+  const composer = entry.placement === "composer";
+  const disabled = button.disabled || entry.pending;
+  const expanded = button.behavior.kind !== "action";
+  const chevron = !composer && !props.layout.compact && expanded;
+  let label = button.label;
+  if (composer) label = button.label ?? button.title;
+  else if (props.layout.compact) label = undefined;
+  const press = useCallback(() => pressButton(view, []), [view]);
+  const setOpen = useCallback(
+    (open: boolean) => pluginButtonStore.setOpen(entry.key, open),
+    [entry.key],
+  );
+  const buttonStyle = useCallback(
+    ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) =>
+      composer
+        ? [
+            composerPillStyles.body,
+            styles.button,
+            (hovered || pressed || entry.open) && styles.active,
+            disabled && styles.disabled,
+          ]
+        : headerButtonStyle(props.layout.compact, { hovered, pressed, open: entry.open }, disabled),
+    [composer, disabled, entry.open, props.layout.compact],
+  );
+  const contents = (
+    <>
+      {entry.pending ? (
+        <View style={styles.icon}>
+          <LoadingSpinner size={14} color={props.theme.colors.foregroundMuted} />
+        </View>
+      ) : (
+        <ButtonIcon view={view} icon={button.icon} />
+      )}
+      {label ? (
+        <Text numberOfLines={1} style={composer ? styles.composerLabel : styles.label}>
+          {label}
+        </Text>
+      ) : null}
+      {chevron ? (
+        <View testID="plugin-button-chevron">
+          <ChevronDown size={12} color={props.theme.colors.foregroundMuted} />
+        </View>
+      ) : null}
+    </>
+  );
+  const accessibilityState = useMemo(
+    () => ({ busy: entry.pending, disabled }),
+    [entry.pending, disabled],
+  );
+  const trigger = expanded ? (
+    <MenuTrigger
+      accessibilityRole="button"
+      accessibilityLabel={button.title}
+      accessibilityState={accessibilityState}
+      disabled={disabled}
+      style={buttonStyle}
+    >
+      {contents}
+    </MenuTrigger>
+  ) : (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={button.title}
+      accessibilityState={accessibilityState}
+      disabled={disabled}
+      onPress={press}
+      style={buttonStyle}
+    >
+      {contents}
+    </Pressable>
+  );
+  const pages = useMemo(() => buttonPages(view, button.behavior), [view, button.behavior]);
+  return (
+    <MenuRoot compactMode="sheet" open={entry.open} onOpenChange={setOpen}>
+      <Tooltip enabledOnMobile={false}>
+        <TooltipTrigger asChild>{trigger}</TooltipTrigger>
+        <TooltipContent>
+          <Text style={styles.tooltipLabel}>{button.title}</Text>
+        </TooltipContent>
+      </Tooltip>
+      {expanded ? (
+        <PluginPopoverSurface
+          sheetTitle={button.title}
+          side={composer ? "top" : "bottom"}
+          align={composer ? "start" : "end"}
+          offset={composer ? 12 : 4}
+          pages={pages}
+        >
+          <ButtonSurfaceBody view={view} behavior={button.behavior} path={ROOT_PATH} />
+        </PluginPopoverSurface>
+      ) : null}
+    </MenuRoot>
+  );
+}
+
+function BrokenButton({
+  title,
+  error,
+  compact,
+}: {
+  title: string;
+  error: string;
+  compact: boolean;
+}) {
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        accessibilityRole="button"
+        accessibilityLabel={title}
+        disabled
+        style={headerButtonStyle(compact, {}, true)}
+      >
+        <ThemedErrorIcon size={16} uniProps={errorIconMapping} />
+      </TooltipTrigger>
+      <TooltipContent>
+        <Text style={styles.tooltipLabel}>{error}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+function createButtonView({
+  entry,
+  client,
+  toast,
+  compact,
+  hostLabel,
+  theme,
+}: {
+  entry: RegisteredPluginButton;
+  client: ReturnType<typeof useHostRuntimeClient>;
+  toast: ReturnType<typeof useToast>;
+  compact: boolean;
+  hostLabel: string;
+  theme: PluginTheme;
+}): ButtonView | null {
+  if (!client) return null;
+  return {
+    entry,
+    toast,
+    environment: {
+      installation: entry.installation,
+      toast,
+      state: createPluginClientStateSource(entry.installation.serverId),
+    },
+    props: {
+      ...entry.context,
+      theme,
+      host: { id: entry.installation.serverId, label: hostLabel },
+      layout: { compact, platform: resolvePluginPlatform() },
+    },
+  };
+}
+
+function PluginButtonHost({
+  entry,
+  compact,
+  hostLabel,
+  theme,
+}: {
+  entry: RegisteredPluginButton;
+  compact: boolean;
+  hostLabel: string;
+  theme: PluginTheme;
+}) {
+  const client = useHostRuntimeClient(entry.installation.serverId);
+  const toast = useToast();
+  const view = useMemo(
+    () => createButtonView({ entry, client, toast, compact, hostLabel, theme }),
+    [entry, client, toast, compact, hostLabel, theme],
+  );
+  const renderError = useCallback(
+    (error: string) => <BrokenButton title={entry.button.title} error={error} compact={compact} />,
+    [entry.button.title, compact],
+  );
+  if (!view) return null;
+  return (
+    <SurfaceErrorBoundary
+      installation={entry.installation}
+      Surface={entry.button.icon}
+      renderError={renderError}
+    >
+      <ButtonEnvironment view={view}>
+        <ButtonControl view={view} />
+      </ButtonEnvironment>
+    </SurfaceErrorBoundary>
+  );
+}
+
+const ThemedPluginButton = withUnistyles(PluginButtonHost);
+
+// Overflow rows keep their own plugin runtime; a menu can contain several installations.
+function OverflowButton({ view }: { view: ButtonView }) {
+  const { button } = view.entry;
+  return (
+    <ButtonMenuItem
+      view={view}
+      title={button.title}
+      icon={button.icon}
+      behavior={button.behavior}
+      disabled={button.disabled || view.entry.pending}
+      path={ROOT_PATH}
+      pageId={buttonPageId(view, [])}
+    />
+  );
+}
+
+function OverflowPages({
+  entries,
+  compact,
+  hostLabel,
+  theme,
+}: {
+  entries: readonly RegisteredPluginButton[];
+  compact: boolean;
+  hostLabel: string;
+  theme: PluginTheme;
+}) {
+  // The header belongs to one host, but each button keeps its installation's query cache and RPCs.
+  const client = useHostRuntimeClient(entries[0].installation.serverId);
+  const toast = useToast();
+  const menuContent = useMemo(() => {
+    const pages: MenuPageDefinition[] = [];
+    const rows: ReactNode[] = [];
+    for (const entry of entries) {
+      const view = createButtonView({ entry, client, toast, compact, hostLabel, theme });
+      if (!view) continue;
+      rows.push(
+        <SurfaceErrorBoundary
+          key={entry.key}
+          installation={entry.installation}
+          Surface={entry.button.icon}
+        >
+          <ButtonEnvironment view={view}>
+            <OverflowButton view={view} />
+          </ButtonEnvironment>
+        </SurfaceErrorBoundary>,
+      );
+      if (entry.button.behavior.kind === "action") continue;
+      pages.push(
+        {
+          id: buttonPageId(view, []),
+          title: entry.button.title,
+          hoverIntent: false,
+          content: (
+            <ButtonSurfaceBody view={view} behavior={entry.button.behavior} path={ROOT_PATH} />
+          ),
+        },
+        ...buttonPages(view, entry.button.behavior),
+      );
+    }
+    return { pages, rows };
+  }, [entries, client, toast, theme, hostLabel, compact]);
+  const { t } = useTranslation();
+  return (
+    <PluginPopoverSurface
+      sheetTitle={t("workspace.git.actions.moreActions")}
+      align="end"
+      pages={menuContent.pages}
+    >
+      {menuContent.rows}
+    </PluginPopoverSurface>
+  );
+}
+
+const ThemedOverflowPages = withUnistyles(OverflowPages);
+
+function useButtons(serverId: string, workspaceId: string, agentId: string | null) {
+  const entries = useSyncExternalStore(
+    pluginButtonStore.subscribe,
+    pluginButtonStore.getSnapshot,
+    pluginButtonStore.getSnapshot,
+  );
+  return useMemo(
+    () => entries.filter((entry) => buttonMatches(entry, serverId, workspaceId, agentId)),
+    [entries, serverId, workspaceId, agentId],
+  );
+}
+
+export function useHasPluginComposerPills(
+  serverId: string,
+  workspaceId: string,
+  agentId: string,
+): boolean {
+  return useButtons(serverId, workspaceId, agentId).length > 0;
+}
+
+export function PluginComposerPills({
+  serverId,
+  workspaceId,
+  agentId,
+  compact,
+}: {
+  serverId: string;
+  workspaceId: string;
+  agentId: string;
+  compact: boolean;
+}) {
+  const entries = useButtons(serverId, workspaceId, agentId);
+  const hosts = useHosts();
+  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
+  return entries.map((entry) => (
+    <ThemedPluginButton
+      key={entry.key}
+      entry={entry}
+      compact={compact}
+      hostLabel={hostLabel}
+      uniProps={pluginThemeMapping}
+    />
+  ));
+}
+
+export function PluginHeaderButtons({
+  serverId,
+  workspaceId,
+}: {
+  serverId: string;
+  workspaceId: string;
+}) {
+  const entries = useButtons(serverId, workspaceId, null);
+  const compact = useIsCompactFormFactor();
+  const { width } = useWindowDimensions();
+  const hosts = useHosts();
+  const { t } = useTranslation();
+  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
+  const limit = compact || width < 1100 ? 1 : 3;
+  const visible = entries.slice(0, limit);
+  const overflow = entries.slice(limit);
+  const overflowStyle = useCallback(
+    (state: IconButtonChromeState) => headerButtonStyle(compact, state),
+    [compact],
+  );
+  if (entries.length === 0) return null;
+  return (
+    <View
+      accessibilityRole="toolbar"
+      accessibilityLabel={t("workspace.header.actions.workspaceActions")}
+      style={styles.headerButtons}
+    >
+      {visible.map((entry) => (
+        <ThemedPluginButton
+          key={entry.key}
+          entry={entry}
+          compact={compact}
+          hostLabel={hostLabel}
+          uniProps={pluginThemeMapping}
+        />
+      ))}
+      {overflow.length > 0 ? (
+        <MenuRoot compactMode="sheet">
+          <MenuTrigger
+            accessibilityRole="button"
+            accessibilityLabel={t("workspace.git.actions.moreActions")}
+            style={overflowStyle}
+          >
+            <ThemedMoreIcon size={16} uniProps={mutedIconMapping} />
+          </MenuTrigger>
+          <ThemedOverflowPages
+            entries={overflow}
+            compact={compact}
+            hostLabel={hostLabel}
+            uniProps={pluginThemeMapping}
+          />
+        </MenuRoot>
+      ) : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  headerButtons: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: { xs: theme.spacing[1], md: theme.spacing[2] },
+  },
+  headerButton: {
+    height: { xs: 32, md: HEADER_CONTROL_HEIGHT },
+    minWidth: { xs: 32, md: HEADER_CONTROL_HEIGHT },
+    paddingHorizontal: theme.spacing[2],
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[1],
+    borderRadius: theme.borderRadius.md,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.borderAccent,
+  },
+  button: { flexShrink: 1, minWidth: 0, maxWidth: 160 },
+  active: { backgroundColor: theme.colors.surface2 },
+  disabled: { opacity: theme.opacity[50] },
+  tooltipLabel: { fontSize: theme.fontSize.sm, color: theme.colors.foreground },
+  composerLabel: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+    flexShrink: 1,
+  },
+  label: { fontSize: theme.fontSize.sm, color: theme.colors.foregroundMuted, flexShrink: 1 },
+  icon: {
+    width: 16,
+    height: 16,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+    overflow: "hidden",
+  },
+}));
diff --git a/packages/app/src/plugins/catalog-sync.tsx b/packages/app/src/plugins/catalog-sync.tsx
index 3647334f73..0eedfde3ab 100644
--- a/packages/app/src/plugins/catalog-sync.tsx
+++ b/packages/app/src/plugins/catalog-sync.tsx
@@ -1,3 +1,5 @@
+import { useVoiceAudioEngineOptional } from "@/contexts/voice-context";
+import { pluginSettingsKey } from "./settings/use-settings";
 import { useEffect } from "react";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { useHostFeature } from "@/runtime/host-features";
@@ -11,13 +13,14 @@ export function PluginCatalogSync({
   serverId: string;
   client: DaemonClient;
 }) {
+  const audio = useVoiceAudioEngineOptional();
   const connected = useHostRuntimeIsConnected(serverId);
   const supported = useHostFeature(serverId, "plugins");
 
   useEffect(() => {
     let cancelled = false;
     let refreshQueue = Promise.resolve();
-    if (!supported) {
+    if (!supported || !audio) {
       pluginRegistry.removeHost(serverId);
       return;
     }
@@ -34,6 +37,7 @@ export function PluginCatalogSync({
               pluginRegistry.installCatalog(serverId, catalog, {
                 replacePluginId,
                 client,
+                audio,
               });
             }
             return undefined;
@@ -47,18 +51,38 @@ export function PluginCatalogSync({
       );
       return refreshQueue;
     };
-    void refresh();
-    const unsubscribe = client.on("status", (message) => {
-      if (message.payload.status === "plugin_catalog_changed") {
-        const pluginId = message.payload.pluginId;
-        if (typeof pluginId === "string") void refresh(pluginId);
-      }
+    const observation = client.observeEvents([
+      "status.plugin_catalog_changed",
+      "status.plugin_settings_changed",
+    ]);
+    observation.subscribe({
+      snapshot: () => {
+        void refresh();
+      },
+      update: (message) => {
+        if (message.type !== "status") return;
+        if (message.payload.status === "plugin_settings_changed") {
+          const { pluginId, settingsId } = message.payload;
+          if (typeof settingsId === "string") {
+            const plugin = pluginRegistry
+              .getSnapshot()
+              .find((item) => item.serverId === serverId && item.id === pluginId);
+            void plugin?.queryClient.invalidateQueries({ queryKey: pluginSettingsKey(settingsId) });
+          }
+        }
+        if (message.payload.status === "plugin_catalog_changed") {
+          const pluginId = message.payload.pluginId;
+          if (typeof pluginId === "string") void refresh(pluginId);
+        }
+      },
     });
     return () => {
       cancelled = true;
-      unsubscribe();
+      void observation
+        .release()
+        .catch((error) => console.warn("[Plugins] Failed to release catalog", error));
     };
-  }, [client, connected, serverId, supported]);
+  }, [audio, client, connected, serverId, supported]);
 
   useEffect(() => () => pluginRegistry.removeHost(serverId), [serverId]);
   return null;
diff --git a/packages/app/src/plugins/client-runtime.test.ts b/packages/app/src/plugins/client-runtime.test.ts
deleted file mode 100644
index 2be61bbc2e..0000000000
--- a/packages/app/src/plugins/client-runtime.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { QueryClient } from "@tanstack/react-query";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { PluginComposerPillProps } from "@getpaseo/plugin";
-import { afterEach, describe, expect, it } from "vitest";
-import type { InstalledPlugin } from "./types";
-import { createPluginClientRuntime } from "./client-runtime";
-import { pluginComposerPillStore } from "./composer-pills/store";
-
-function Pill(_props: PluginComposerPillProps) {
-  return null;
-}
-
-function installation(): InstalledPlugin {
-  return {
-    id: "review",
-    serverId: "host-a",
-    clientBundle: "bundle",
-    queryClient: new QueryClient(),
-    cleanup: () => undefined,
-    surfaces: [],
-    sidebarItems: [],
-    workspacePanels: [],
-    commandCenterItems: [],
-    clientSlashCommands: [],
-    attachmentSources: [],
-    themes: [],
-    timelineTransformers: [],
-    timelineRenderers: [],
-  };
-}
-
-const daemonClient = {} as DaemonClient;
-const installations: InstalledPlugin[] = [];
-
-afterEach(() => {
-  for (const plugin of installations.splice(0)) {
-    pluginComposerPillStore.removeInstallation(plugin);
-  }
-});
-
-describe("plugin client-side lifecycle", () => {
-  it("lets the client runtime add and remove a targeted composer pill", () => {
-    const plugin = installation();
-    installations.push(plugin);
-    const client = createPluginClientRuntime(plugin, daemonClient);
-
-    expect(pluginComposerPillStore.getSnapshot()).toEqual([]);
-    const remove = client.addComposerPill({
-      id: "review-ready",
-      title: "Open review",
-      workspaceId: "workspace-a",
-      agentId: "agent-a",
-      Component: Pill,
-      onPress() {},
-    });
-
-    expect(
-      pluginComposerPillStore.getSnapshot().map(({ contribution }) => ({
-        id: contribution.id,
-        workspaceId: contribution.workspaceId,
-        agentId: contribution.agentId,
-      })),
-    ).toEqual([{ id: "review-ready", workspaceId: "workspace-a", agentId: "agent-a" }]);
-
-    remove();
-    expect(pluginComposerPillStore.getSnapshot()).toEqual([]);
-  });
-
-  it("rejects duplicate pills only within the same plugin target", () => {
-    const plugin = installation();
-    installations.push(plugin);
-    const contribution = {
-      id: "review-ready",
-      title: "Open review",
-      workspaceId: "workspace-a",
-      agentId: "agent-a",
-      Component: Pill,
-      onPress() {},
-    };
-
-    pluginComposerPillStore.add(plugin, contribution);
-    expect(() => pluginComposerPillStore.add(plugin, contribution)).toThrow(
-      "Duplicate composer pill: review-ready",
-    );
-    expect(() =>
-      pluginComposerPillStore.add(plugin, { ...contribution, agentId: "agent-b" }),
-    ).not.toThrow();
-  });
-});
diff --git a/packages/app/src/plugins/client-runtime.ts b/packages/app/src/plugins/client-runtime.ts
index cef8bbb341..f9074383bd 100644
--- a/packages/app/src/plugins/client-runtime.ts
+++ b/packages/app/src/plugins/client-runtime.ts
@@ -1,5 +1,7 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { PluginClientOpenPanelOptions } from "@getpaseo/plugin";
+import { createPlayAudio, type AudioEngine } from "@/audio";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { createPluginHosts } from "./hosts";
+import type { PluginClientOpenPanelOptions } from "@getpaseo/plugin/client";
 import {
   createPluginAgentActionContext,
   createPluginCapabilities,
@@ -8,48 +10,47 @@ import {
 import { createPluginClientStateSource } from "./client-state/source";
 import type { PluginClientRuntime } from "./evaluate";
 import { createPluginNavigation } from "./navigation";
-import { pluginComposerPillStore } from "./composer-pills/store";
-import { createPluginSurfaceRuntime } from "./surface-runtime";
+import { pluginButtonStore } from "./buttons";
 import type { InstalledPlugin } from "./types";
 
 export function createPluginClientRuntime(
   installation: InstalledPlugin,
-  daemonClient: DaemonClient,
+  audio: Pick<AudioEngine, "play">,
 ): PluginClientRuntime {
-  const runtime = createPluginSurfaceRuntime(daemonClient, installation.id);
-  if (!runtime) throw new Error("Plugin host is offline");
   const state = createPluginClientStateSource(installation.serverId);
   const capabilities = createPluginCapabilities(
     installation,
-    runtime,
     createPluginNavigation({ serverId: installation.serverId, workspaceId: null }),
   );
   return {
     ...capabilities,
+    playAudio: createPlayAudio(audio, installation.lifetime.signal),
+    hosts: createPluginHosts(getHostRuntimeStore(), installation.lifetime.signal),
     addComposerPill(contribution) {
-      return pluginComposerPillStore.add(installation, contribution);
+      return pluginButtonStore.addComposerPill(installation, contribution);
+    },
+    addHeaderButton(contribution) {
+      return pluginButtonStore.addHeaderButton(installation, contribution);
     },
     openPanel(panelId, options) {
-      openClientPanel({ installation, runtime, state, panelId, options });
+      openClientPanel({ installation, state, panelId, options });
     },
   };
 }
 
 function openClientPanel(input: {
   installation: InstalledPlugin;
-  runtime: NonNullable<ReturnType<typeof createPluginSurfaceRuntime>>;
   state: ReturnType<typeof createPluginClientStateSource>;
   panelId: string;
   options: PluginClientOpenPanelOptions;
 }): void {
-  const { installation, runtime, state, panelId, options } = input;
+  const { installation, state, panelId, options } = input;
   const workspaceId = options.workspaceId.trim();
   const agentId = options.agentId?.trim();
   const navigation = createPluginNavigation({ serverId: installation.serverId, workspaceId });
   const action = agentId
     ? createPluginAgentActionContext({
         plugin: installation,
-        runtime,
         navigation,
         state,
         workspaceId,
@@ -57,7 +58,6 @@ function openClientPanel(input: {
       })
     : createPluginWorkspaceActionContext({
         plugin: installation,
-        runtime,
         navigation,
         state,
         workspaceId,
diff --git a/packages/app/src/plugins/client-slash-commands/index.ts b/packages/app/src/plugins/client-slash-commands/index.ts
index a99a0fa538..9ab66ac195 100644
--- a/packages/app/src/plugins/client-slash-commands/index.ts
+++ b/packages/app/src/plugins/client-slash-commands/index.ts
@@ -1,10 +1,8 @@
 import { useMemo } from "react";
-import { useHostRuntimeClient } from "@/runtime/host-runtime";
 import { createPluginAgentActionContext, createPluginWorkspaceActionContext } from "../actions";
 import { createPluginClientStateSource } from "../client-state/source";
 import { createPluginNavigation } from "../navigation";
 import { useInstalledPlugins } from "../registry";
-import { createPluginSurfaceRuntime } from "../surface-runtime";
 
 export interface PluginClientSlashCommand {
   pluginId: string;
@@ -19,10 +17,9 @@ export function usePluginClientSlashCommands(input: {
   workspaceId: string | null | undefined;
   agentId: string;
 }): PluginClientSlashCommand[] {
-  const client = useHostRuntimeClient(input.serverId);
   const installed = useInstalledPlugins();
   return useMemo(() => {
-    if (!client || !input.workspaceId) return [];
+    if (!input.workspaceId) return [];
     const workspaceId = input.workspaceId;
     const state = createPluginClientStateSource(input.serverId);
     const navigation = createPluginNavigation({
@@ -31,28 +28,10 @@ export function usePluginClientSlashCommands(input: {
     });
     const commands = installed
       .filter((plugin) => plugin.serverId === input.serverId)
-      .flatMap((plugin) => {
-        const runtime = createPluginSurfaceRuntime(client, plugin.id);
-        if (!runtime) return [];
-        return (plugin.clientSlashCommands ?? []).flatMap((contribution) => {
-          const context =
-            contribution.context === "agent"
-              ? createPluginAgentActionContext({
-                  plugin,
-                  runtime,
-                  navigation,
-                  state,
-                  workspaceId,
-                  agentId: input.agentId,
-                })
-              : createPluginWorkspaceActionContext({
-                  plugin,
-                  runtime,
-                  navigation,
-                  state,
-                  workspaceId,
-                });
-          if (!context) return [];
+      .flatMap((plugin) =>
+        plugin.clientSlashCommands.flatMap((contribution) => {
+          if (contribution.context === "agent" && !state.getAgent(input.agentId)) return [];
+          if (!state.getWorkspace(workspaceId)) return [];
           return [
             {
               pluginId: plugin.id,
@@ -60,19 +39,30 @@ export function usePluginClientSlashCommands(input: {
               description: contribution.description,
               argumentHint: contribution.argumentHint,
               async run(args: string) {
-                if (contribution.context === "agent" && context.context === "agent") {
+                const context =
+                  contribution.context === "agent"
+                    ? createPluginAgentActionContext({
+                        plugin,
+                        navigation,
+                        state,
+                        workspaceId,
+                        agentId: input.agentId,
+                      })
+                    : createPluginWorkspaceActionContext({
+                        plugin,
+                        navigation,
+                        state,
+                        workspaceId,
+                      });
+                if (contribution.context === "agent" && context?.context === "agent")
                   await contribution.onSubmit({ ...context, args });
-                } else if (
-                  contribution.context === "workspace" &&
-                  context.context === "workspace"
-                ) {
+                else if (contribution.context === "workspace" && context?.context === "workspace")
                   await contribution.onSubmit({ ...context, args });
-                }
               },
             },
           ];
-        });
-      });
+        }),
+      );
     return commands;
-  }, [client, input.agentId, input.serverId, input.workspaceId, installed]);
+  }, [input.agentId, input.serverId, input.workspaceId, installed]);
 }
diff --git a/packages/app/src/plugins/client-state/snapshots.test.ts b/packages/app/src/plugins/client-state/snapshots.test.ts
index 26ac4069dc..cbbbaaed4b 100644
--- a/packages/app/src/plugins/client-state/snapshots.test.ts
+++ b/packages/app/src/plugins/client-state/snapshots.test.ts
@@ -25,7 +25,7 @@ const agent: Agent = {
   id: "agent-1",
   provider: "codex",
   status: "running",
-  activeTurn: null,
+  turn: { phase: "idle", cancellationRequestId: null },
   createdAt: new Date("2026-08-16T10:01:00.000Z"),
   updatedAt: new Date("2026-08-16T10:02:00.000Z"),
   lastUserMessageAt: null,
diff --git a/packages/app/src/plugins/client-state/source.ts b/packages/app/src/plugins/client-state/source.ts
index d7aaee597e..142c1f3575 100644
--- a/packages/app/src/plugins/client-state/source.ts
+++ b/packages/app/src/plugins/client-state/source.ts
@@ -1,4 +1,4 @@
-import type { PluginClientStateSource } from "@getpaseo/plugin/host";
+import type { PluginClientStateSource } from "@getpaseo/plugin/client/host";
 import { useSessionStore } from "@/stores/session-store";
 import { selectWorkspace } from "@/stores/session-store-hooks/selectors";
 import { normalizeWorkspaceOpaqueId } from "@/utils/workspace-identity";
diff --git a/packages/app/src/plugins/command-center/contributions.test.ts b/packages/app/src/plugins/command-center/contributions.test.ts
index 51a6df5029..a2544bd034 100644
--- a/packages/app/src/plugins/command-center/contributions.test.ts
+++ b/packages/app/src/plugins/command-center/contributions.test.ts
@@ -4,9 +4,9 @@ import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import {
   defineRpc,
   type PluginAgentSnapshot,
-  type PluginCommandCenterItemContribution,
   type PluginWorkspaceSnapshot,
 } from "@getpaseo/plugin";
+import { type PluginCommandCenterItemContribution } from "@getpaseo/plugin/client";
 import { describe, expect, it } from "vitest";
 import { z } from "zod";
 import type { InstalledPlugin } from "../types";
@@ -60,10 +60,24 @@ function plugin(onAgentSelect: AgentCommandItem["onSelect"]): InstalledPlugin {
     id: "review",
     serverId: "host-1",
     clientBundle: "bundle",
+    lifetime: new AbortController(),
+    paseo: createPaseoApi(
+      new DaemonClient({
+        url: "ws://127.0.0.1:1",
+        clientId: "plugin-command-test",
+        clientType: "cli",
+      }),
+    ),
+    invoke: async (method: string, input: unknown) => {
+      expect(method).toBe("review.inspect");
+      return { value: inspect.input.parse(input).value + 1 };
+    },
     queryClient: new QueryClient(),
     cleanup: () => {},
-    surfaces: [{ id: "main", Component: () => null }],
-    sidebarItems: [],
+    settingsScreens: [],
+    surfaces: [{ id: "main", title: "Main", Component: () => null }],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
     workspacePanels: [
       {
         id: "details",
@@ -119,30 +133,14 @@ function stateSource() {
   };
 }
 
-function createRuntime(pluginId: string) {
-  const client = new DaemonClient({
-    url: "ws://127.0.0.1:1",
-    clientId: "plugin-command-test",
-    clientType: "cli",
-  });
-  return {
-    paseo: createPaseoApi(client),
-    invoke: async (method: string, input: unknown) => {
-      expect(pluginId).toBe("review");
-      expect(method).toBe("review.inspect");
-      return { value: inspect.input.parse(input).value + 1 };
-    },
-  };
-}
-
 describe("plugin Command Center contributions", () => {
   it("shows only contributions whose synchronous context exists", () => {
     const installed = plugin(() => undefined);
     const common = {
       plugins: [installed],
-      runtime: createRuntime,
       state: stateSource(),
       navigation: {
+        openSettings() {},
         openSurface() {},
         openWorkspacePanel() {},
         openAgentPanel() {},
@@ -185,14 +183,13 @@ describe("plugin Command Center contributions", () => {
       context.openSurface("main");
       context.openPanel("details", { location: "explorer" });
     });
-    const runtime = createRuntime("review");
     const actions = buildPluginCommandCenterContributions({
       plugins: [installed],
-      runtime: () => runtime,
       state: stateSource(),
       workspaceId: workspace.id,
       agentId: agent.id,
       navigation: {
+        openSettings() {},
         openSurface(pluginId, surfaceId) {
           opened.push(`${pluginId}/surface/${surfaceId}`);
         },
@@ -211,7 +208,8 @@ describe("plugin Command Center contributions", () => {
     await actions.find((action) => action.id === "review:agent")?.run();
 
     expect(rpcValue).toBe(5);
-    expect(receivedPaseo).toBe(runtime.paseo);
+    // Commands use the plugin's one client.
+    expect(receivedPaseo).toBe(installed.paseo);
     expect(opened).toEqual(["review/surface/main", "review/agent/details/agent-1/explorer"]);
   });
 
@@ -219,11 +217,11 @@ describe("plugin Command Center contributions", () => {
     expect(
       buildPluginCommandCenterContributions({
         plugins: [],
-        runtime: createRuntime,
         state: stateSource(),
         workspaceId: workspace.id,
         agentId: agent.id,
         navigation: {
+          openSettings() {},
           openSurface() {},
           openWorkspacePanel() {},
           openAgentPanel() {},
diff --git a/packages/app/src/plugins/command-center/contributions.ts b/packages/app/src/plugins/command-center/contributions.ts
index fbe67e034f..be4cb8068a 100644
--- a/packages/app/src/plugins/command-center/contributions.ts
+++ b/packages/app/src/plugins/command-center/contributions.ts
@@ -1,15 +1,13 @@
-import type { PluginClientStateSource } from "@getpaseo/plugin/host";
+import type { PluginClientStateSource } from "@getpaseo/plugin/client/host";
 import type { CommandCenterContribution } from "@/command-center/contributions";
 import { getCommandCenterIcon } from "@/command-center/icon";
 import { resolvePluginIcon } from "../icons";
 import { resolvePluginPanelOpenLocation } from "../workspace-panels/locations";
-import type { PluginSurfaceRuntime } from "../surface-runtime";
 import type { InstalledPlugin } from "../types";
 import { createPluginCapabilities, type PluginNavigation } from "../actions";
 
 export interface PluginCommandCenterSource {
   plugins: readonly InstalledPlugin[];
-  runtime(pluginId: string): PluginSurfaceRuntime;
   state: PluginClientStateSource;
   workspaceId: string | null;
   agentId: string | null;
@@ -22,12 +20,11 @@ export function buildPluginCommandCenterContributions(
 ): CommandCenterContribution[] {
   const contributions: CommandCenterContribution[] = [];
   for (const plugin of source.plugins) {
-    const runtime = source.runtime(plugin.id);
-    const common = createPluginCapabilities(plugin, runtime, source.navigation);
     for (const [rank, item] of plugin.commandCenterItems.entries()) {
       if (item.context === "workspace" && !source.workspaceId) continue;
       if (item.context === "agent" && (!source.workspaceId || !source.agentId)) continue;
       const run = async () => {
+        const common = createPluginCapabilities(plugin, source.navigation);
         try {
           if (item.context === "global") {
             await item.onSelect({ context: "global", ...common });
diff --git a/packages/app/src/plugins/command-center/registration.tsx b/packages/app/src/plugins/command-center/registration.tsx
index 2ee0d24ff2..faf3b9215f 100644
--- a/packages/app/src/plugins/command-center/registration.tsx
+++ b/packages/app/src/plugins/command-center/registration.tsx
@@ -11,7 +11,6 @@ import { normalizeWorkspaceOpaqueId } from "@/utils/workspace-identity";
 import { createPluginClientStateSource } from "../client-state/source";
 import { hostIdFromPathname } from "../routes";
 import { useInstalledPlugins } from "../registry";
-import { createPluginSurfaceRuntime } from "../surface-runtime";
 import { buildPluginCommandCenterContributions } from "./contributions";
 import { getFocusedAgentId } from "./context";
 import { createPluginNavigation } from "../navigation";
@@ -53,11 +52,6 @@ export function PluginCommandCenterActions() {
     if (!client || !serverId || !stateSource) return [];
     return buildPluginCommandCenterContributions({
       plugins,
-      runtime(pluginId) {
-        const runtime = createPluginSurfaceRuntime(client, pluginId);
-        if (!runtime) throw new Error("Plugin host is offline");
-        return runtime;
-      },
       state: stateSource,
       workspaceId: workspaceExists ? workspaceId : null,
       agentId: agentExists ? focusedAgentId : null,
diff --git a/packages/app/src/plugins/composer-pills/index.tsx b/packages/app/src/plugins/composer-pills/index.tsx
deleted file mode 100644
index 12797bb08d..0000000000
--- a/packages/app/src/plugins/composer-pills/index.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { PluginClientStateProvider } from "@getpaseo/plugin/host";
-import type { PluginComposerPillProps, PluginTheme } from "@getpaseo/plugin";
-import { useCallback, useMemo, useState, useSyncExternalStore } from "react";
-import { Platform, Pressable, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { composerPillStyles } from "@/composer/pill-styles";
-import { useToast } from "@/contexts/toast-context";
-import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
-import type { Theme } from "@/styles/theme";
-import { createPluginClientStateSource } from "../client-state/source";
-import { PluginRuntimeBoundary } from "../runtime-boundary";
-import { createPluginSurfaceRuntime } from "../surface-runtime";
-import { SurfaceErrorBoundary } from "../surface-error-boundary";
-import { toPluginTheme } from "../theme";
-import type { InstalledPlugin, PluginComposerPillContribution } from "../types";
-import { pluginComposerPillStore } from "./store";
-
-const pluginThemeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
-
-function resolvePlatform(): PluginComposerPillProps["layout"]["platform"] {
-  if (Platform.OS === "ios") return "ios";
-  if (Platform.OS === "android") return "android";
-  return "web";
-}
-
-function PluginComposerPill({
-  plugin,
-  contribution,
-  serverId,
-  workspaceId,
-  agentId,
-  compact,
-  hostLabel,
-  theme,
-}: {
-  plugin: InstalledPlugin;
-  contribution: PluginComposerPillContribution;
-  serverId: string;
-  workspaceId: string;
-  agentId: string;
-  compact: boolean;
-  hostLabel: string;
-  theme: PluginTheme;
-}) {
-  const client = useHostRuntimeClient(serverId);
-  const toast = useToast();
-  const [pending, setPending] = useState(false);
-  const runtime = useMemo(() => createPluginSurfaceRuntime(client, plugin.id), [client, plugin.id]);
-  const state = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
-  const props = useMemo<PluginComposerPillProps>(
-    () => ({
-      theme,
-      host: { id: serverId, label: hostLabel },
-      layout: { compact, platform: resolvePlatform() },
-      workspaceId,
-      agentId,
-    }),
-    [agentId, compact, hostLabel, serverId, theme, workspaceId],
-  );
-  const press = useCallback(async () => {
-    if (!runtime || pending) return;
-    setPending(true);
-    try {
-      await contribution.onPress();
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : String(error));
-    } finally {
-      setPending(false);
-    }
-  }, [contribution, pending, runtime, toast]);
-  const pillStyle = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      composerPillStyles.body,
-      styles.pill,
-      (hovered || pressed) && composerPillStyles.bodyActive,
-      pending && styles.disabled,
-    ],
-    [pending],
-  );
-  const accessibilityState = useMemo(() => ({ busy: pending, disabled: pending }), [pending]);
-  if (!runtime) return null;
-  const Component = contribution.Component;
-  return (
-    <SurfaceErrorBoundary installation={plugin} Surface={Component}>
-      <PluginRuntimeBoundary plugin={plugin} runtime={runtime}>
-        <PluginClientStateProvider source={state}>
-          <Pressable
-            accessibilityRole="button"
-            accessibilityLabel={contribution.title}
-            accessibilityState={accessibilityState}
-            disabled={pending}
-            onPress={press}
-            style={pillStyle}
-          >
-            <Component {...props} />
-            {pending ? <LoadingSpinner size="small" color={theme.colors.foregroundMuted} /> : null}
-          </Pressable>
-        </PluginClientStateProvider>
-      </PluginRuntimeBoundary>
-    </SurfaceErrorBoundary>
-  );
-}
-
-const ThemedPluginComposerPill = withUnistyles(PluginComposerPill);
-
-export function PluginComposerPills({
-  serverId,
-  workspaceId,
-  agentId,
-  compact,
-}: {
-  serverId: string;
-  workspaceId: string;
-  agentId: string;
-  compact: boolean;
-}) {
-  const registrations = useSyncExternalStore(
-    pluginComposerPillStore.subscribe,
-    pluginComposerPillStore.getSnapshot,
-    pluginComposerPillStore.getSnapshot,
-  );
-  const hosts = useHosts();
-  const visible = useMemo(
-    () =>
-      registrations.filter(
-        ({ installation, contribution }) =>
-          installation.serverId === serverId &&
-          contribution.workspaceId === workspaceId &&
-          contribution.agentId === agentId,
-      ),
-    [agentId, registrations, serverId, workspaceId],
-  );
-  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
-  return (
-    <>
-      {visible.map(({ installation, contribution }) => (
-        <ThemedPluginComposerPill
-          key={`${installation.id}/${contribution.id}`}
-          plugin={installation}
-          contribution={contribution}
-          serverId={serverId}
-          workspaceId={workspaceId}
-          agentId={agentId}
-          compact={compact}
-          hostLabel={hostLabel}
-          uniProps={pluginThemeMapping}
-        />
-      ))}
-    </>
-  );
-}
-
-export function useHasPluginComposerPills(
-  serverId: string,
-  workspaceId: string,
-  agentId: string,
-): boolean {
-  const registrations = useSyncExternalStore(
-    pluginComposerPillStore.subscribe,
-    pluginComposerPillStore.getSnapshot,
-    pluginComposerPillStore.getSnapshot,
-  );
-  return registrations.some(
-    ({ installation, contribution }) =>
-      installation.serverId === serverId &&
-      contribution.workspaceId === workspaceId &&
-      contribution.agentId === agentId,
-  );
-}
-
-const styles = StyleSheet.create(() => ({
-  pill: {
-    flexShrink: 1,
-    minWidth: 0,
-  },
-  disabled: {
-    opacity: 0.5,
-  },
-}));
diff --git a/packages/app/src/plugins/composer-pills/store.ts b/packages/app/src/plugins/composer-pills/store.ts
deleted file mode 100644
index ae273eb2b5..0000000000
--- a/packages/app/src/plugins/composer-pills/store.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import type { PluginComposerPillContribution } from "@getpaseo/plugin";
-import type { InstalledPlugin } from "../types";
-
-const CONTRIBUTION_ID = /^[a-z][a-z0-9-]*$/;
-
-export interface RegisteredPluginComposerPill {
-  installation: InstalledPlugin;
-  contribution: PluginComposerPillContribution;
-}
-
-class PluginComposerPillStore {
-  private entries: RegisteredPluginComposerPill[] = [];
-  private readonly listeners = new Set<() => void>();
-
-  subscribe = (listener: () => void): (() => void) => {
-    this.listeners.add(listener);
-    return () => this.listeners.delete(listener);
-  };
-
-  getSnapshot = (): readonly RegisteredPluginComposerPill[] => this.entries;
-
-  add(installation: InstalledPlugin, input: PluginComposerPillContribution): () => void {
-    const contribution = validateContribution(input);
-    const duplicate = this.entries.some(
-      (entry) =>
-        entry.installation === installation &&
-        entry.contribution.workspaceId === contribution.workspaceId &&
-        entry.contribution.agentId === contribution.agentId &&
-        entry.contribution.id === contribution.id,
-    );
-    if (duplicate) {
-      throw new Error(`Duplicate composer pill: ${contribution.id}`);
-    }
-    const entry = { installation, contribution };
-    this.entries = [...this.entries, entry];
-    this.publish();
-    let removed = false;
-    return () => {
-      if (removed) return;
-      removed = true;
-      this.entries = this.entries.filter((candidate) => candidate !== entry);
-      this.publish();
-    };
-  }
-
-  removeInstallation(installation: InstalledPlugin): void {
-    const next = this.entries.filter((entry) => entry.installation !== installation);
-    if (next.length === this.entries.length) return;
-    this.entries = next;
-    this.publish();
-  }
-
-  private publish(): void {
-    for (const listener of this.listeners) listener();
-  }
-}
-
-function validateContribution(
-  contribution: PluginComposerPillContribution,
-): PluginComposerPillContribution {
-  const id = contribution.id.trim();
-  const title = contribution.title.trim();
-  const workspaceId = contribution.workspaceId.trim();
-  const agentId = contribution.agentId.trim();
-  if (!CONTRIBUTION_ID.test(id)) throw new Error(`Invalid composer pill id: ${contribution.id}`);
-  if (!title) throw new Error(`Composer pill ${id} has no title`);
-  if (!workspaceId) throw new Error(`Composer pill ${id} has no workspace`);
-  if (!agentId) throw new Error(`Composer pill ${id} has no agent`);
-  if (typeof contribution.Component !== "function") {
-    throw new Error(`Composer pill ${id} is not a component`);
-  }
-  if (typeof contribution.onPress !== "function") {
-    throw new Error(`Composer pill ${id} has no callback`);
-  }
-  return { ...contribution, id, title, workspaceId, agentId };
-}
-
-export const pluginComposerPillStore = new PluginComposerPillStore();
diff --git a/packages/app/src/plugins/contribution-host.ts b/packages/app/src/plugins/contribution-host.ts
index cbead73be5..9614594802 100644
--- a/packages/app/src/plugins/contribution-host.ts
+++ b/packages/app/src/plugins/contribution-host.ts
@@ -7,3 +7,17 @@ export function getPreferredPluginContributionHost(contributionId: string): stri
 export function rememberPluginContributionHost(contributionId: string, serverId: string): void {
   preferredHosts.set(contributionId, serverId);
 }
+
+/**
+ * The host a plugin's screens and sidebar items share: the host last picked on one of its screens
+ * or last opened from one of its items.
+ */
+export function pluginScreensHostKey(pluginId: string): string {
+  return `${pluginId}/screens`;
+}
+
+// COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+/** The host an `addSidebarItem` row last opened, which its screen's host switcher also sets. */
+export function legacySidebarItemHostKey(pluginId: string, itemId: string): string {
+  return `${pluginId}/sidebar/${itemId}`;
+}
diff --git a/packages/app/src/plugins/evaluate.test.ts b/packages/app/src/plugins/evaluate.test.ts
index 698053102a..310ef5f7b9 100644
--- a/packages/app/src/plugins/evaluate.test.ts
+++ b/packages/app/src/plugins/evaluate.test.ts
@@ -4,10 +4,15 @@ import { runPluginClientBundle, type PluginClientRuntime } from "./evaluate";
 const runtime = {
   paseo: {},
   async rpc() {},
+  openSettings() {},
+  openScreen() {},
   openSurface() {},
   openPanel() {},
+  addHeaderButton() {
+    return { update() {}, remove() {} };
+  },
   addComposerPill() {
-    return () => undefined;
+    return { update() {}, remove() {} };
   },
 } as unknown as PluginClientRuntime;
 
@@ -16,7 +21,7 @@ function evaluatePluginClientBundle(id: string, source: string) {
 }
 
 function bundle(body: string): string {
-  return `(function() {
+  return `(function(require) {
     const module = { exports: {} };
     module.exports.default = function(plugin) { ${body}; return function() {}; };
     return module.exports;
@@ -24,6 +29,42 @@ function bundle(body: string): string {
 }
 
 describe("evaluatePluginClientBundle", () => {
+  it("releases button registrations when client setup throws", () => {
+    let active = 0;
+    function addButton() {
+      active++;
+      return {
+        update() {},
+        remove() {
+          active--;
+        },
+      };
+    }
+    expect(() =>
+      runPluginClientBundle(
+        "failed-buttons",
+        bundle(`
+      plugin.addHeaderButton({ id: "header", workspaceId: "workspace", button: { title: "Header", icon: "Scan", behavior: { kind: "action", onPress() {} } } });
+      plugin.addComposerPill({ id: "pill", workspaceId: "workspace", agentId: "agent", button: { title: "Pill", icon: "Scan", behavior: { kind: "action", onPress() {} } } });
+      throw new Error("Setup failed");
+    `),
+        { ...runtime, addHeaderButton: addButton, addComposerPill: addButton },
+      ),
+    ).toThrow("Setup failed");
+    expect(active).toBe(0);
+  });
+
+  it("accepts memoized settings screens", () => {
+    const plugin = evaluatePluginClientBundle(
+      "settings",
+      bundle(`
+        const Component = require("react").memo(function Settings() { return null; });
+        plugin.addSettingsScreen({ id: "display", title: "Display", icon: "Settings", Component });
+      `),
+    );
+    expect(plugin.settingsScreens.map((screen) => screen.id)).toEqual(["display"]);
+  });
+
   it("returns idempotent removers for every client registration", () => {
     let pillCount = 0;
     const plugin = runPluginClientBundle(
@@ -32,12 +73,14 @@ describe("evaluatePluginClientBundle", () => {
         function Component() { return null; }
         const schema = { safeParse(value) { return { success: true, data: value }; } };
         globalThis.__pluginRemovals = [
-          plugin.addSurface("main", Component),
-          plugin.addSidebarItem({ id: "main", title: "Main", icon: "Blocks", surface: "main" }),
+          plugin.addScreen({ id: "main", title: "Main", Component }),
+          plugin.addSettingsScreen({ id: "display", title: "Display", icon: "Settings", Component }),
+          plugin.addSidebarHeaderItem({ id: "main", title: "Main", Component }),
+          plugin.addSidebarFooterItem({ id: "status", title: "Status", Component }),
           plugin.addWorkspacePanel({ id: "panel", title: "Panel", icon: "Blocks", context: "workspace", Component }),
           plugin.addCommandCenterItem({ id: "command", title: "Command", icon: "Blocks", context: "global", onSelect() {} }),
           plugin.addSlashCommand({ name: "review", description: "Review", argumentHint: "", context: "workspace", onSubmit() {} }),
-          plugin.addComposerPill({ id: "pill", title: "Pill", workspaceId: "workspace", agentId: "agent", Component, onPress() {} }),
+          plugin.addComposerPill({ id: "pill", workspaceId: "workspace", agentId: "agent", button: { title: "Pill", icon: "Scan", behavior: { kind: "action", onPress() {} } } }).remove,
           plugin.addAttachmentSource({ id: "issues", title: "Issues", icon: "Blocks", pickerTitle: "Attach issue", searchPlaceholder: "Search", search: { name: "issues.search", input: {}, output: {} } }),
           plugin.addTheme({ id: "night", name: "Night", appearance: "dark", colors: { background: "#000", foreground: "#fff", raised: "#111", control: "#222", border: "#333", mutedForeground: "#aaa", ring: "#555" } }),
           plugin.addTimelineTransformer({ id: "transformer", query: { itemType: "tool_call" }, transform() { return { items: [] }; } }),
@@ -48,8 +91,11 @@ describe("evaluatePluginClientBundle", () => {
         ...runtime,
         addComposerPill() {
           pillCount += 1;
-          return () => {
-            pillCount -= 1;
+          return {
+            update() {},
+            remove() {
+              pillCount -= 1;
+            },
           };
         },
       },
@@ -59,7 +105,9 @@ describe("evaluatePluginClientBundle", () => {
     expect(
       [
         plugin.surfaces,
-        plugin.sidebarItems,
+        plugin.settingsScreens,
+        plugin.sidebarItems.header,
+        plugin.sidebarItems.footer,
         plugin.workspacePanels,
         plugin.commandCenterItems,
         plugin.clientSlashCommands,
@@ -77,7 +125,9 @@ describe("evaluatePluginClientBundle", () => {
     expect(
       [
         plugin.surfaces,
-        plugin.sidebarItems,
+        plugin.settingsScreens,
+        plugin.sidebarItems.header,
+        plugin.sidebarItems.footer,
         plugin.workspacePanels,
         plugin.commandCenterItems,
         plugin.clientSlashCommands,
@@ -134,21 +184,125 @@ describe("evaluatePluginClientBundle", () => {
     ).toThrow("Timeline transformer bad-query has invalid item type: settled");
   });
 
-  it("collects a surface and its sidebar placement", () => {
+  it("collects screens and sidebar header and footer items", () => {
+    const plugin = evaluatePluginClientBundle(
+      "example",
+      bundle(`
+        function Screen() { return null; }
+        const Item = require("react").memo(function Item() { return null; });
+        plugin.addScreen({ id: "main", title: " Main ", Component: Screen });
+        plugin.addScreen({ id: "bot", title: (params) => params.botId, Component: Screen });
+        plugin.addSidebarHeaderItem({ id: "main", title: " Example ", Component: Item });
+        plugin.addSidebarFooterItem({ id: "main", title: "Status", Component: Item });
+      `),
+    );
+
+    expect(plugin.id).toBe("example");
+    expect(plugin.surfaces.map((surface) => surface.id)).toEqual(["main", "bot"]);
+    expect(plugin.surfaces[0]?.title).toBe("Main");
+    expect(plugin.surfaces[1]?.title).toBeTypeOf("function");
+    expect(plugin.sidebarItems.header.map(({ id, title }) => ({ id, title }))).toEqual([
+      { id: "main", title: "Example" },
+    ]);
+    expect(plugin.sidebarItems.footer.map(({ id, title }) => ({ id, title }))).toEqual([
+      { id: "main", title: "Status" },
+    ]);
+    expect(plugin.legacySidebarItems).toEqual([]);
+  });
+
+  it.each([
+    [`plugin.addScreen("main", Screen);`, "addScreen takes { id, title, Component }"],
+    [`plugin.addScreen({ id: "main", Component: Screen });`, "Screen main needs a title"],
+    [
+      `plugin.addScreen({ id: "main", title: " ", Component: Screen });`,
+      "Screen main needs a title",
+    ],
+    [
+      `plugin.addScreen({ id: "main", title: 42, Component: Screen });`,
+      "Screen main needs a title",
+    ],
+    [
+      `plugin.addScreen({ id: "main", title: "Main", Component: "Main" });`,
+      "Screen main is not a component",
+    ],
+  ])("rejects a malformed screen: %s", (call, message) => {
+    expect(() =>
+      evaluatePluginClientBundle("example", bundle(`function Screen() { return null; } ${call}`)),
+    ).toThrow(message);
+  });
+
+  it("rejects duplicate and malformed sidebar items within a section", () => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        bundle(`
+          function Item() { return null; }
+          plugin.addSidebarFooterItem({ id: "main", title: "One", Component: Item });
+          plugin.addSidebarFooterItem({ id: "main", title: "Two", Component: Item });
+        `),
+      ),
+    ).toThrow("Duplicate sidebar footer item: main");
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        bundle(`plugin.addSidebarHeaderItem({ id: "main", title: "Main", Component: "Main" });`),
+      ),
+    ).toThrow("Sidebar item main is not a component");
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        bundle(
+          `plugin.addSidebarHeaderItem({ id: "main", title: " ", Component() { return null; } });`,
+        ),
+      ),
+    ).toThrow("Sidebar item main has no title");
+  });
+
+  it("expands the addSurface and addSidebarItem aliases to a screen and a legacy header item", () => {
     const plugin = evaluatePluginClientBundle(
       "example",
       bundle(`
         function Surface() { return null; }
         plugin.addSurface("main", Surface);
-        plugin.addSidebarItem({ id: "main", title: "Example", icon: "Blocks", surface: "main" });
+        plugin.addSidebarItem({ id: "entry", title: "Example", icon: "Blocks", surface: "main" });
       `),
     );
 
-    expect(plugin.id).toBe("example");
-    expect(plugin.surfaces.map((surface) => surface.id)).toEqual(["main"]);
-    expect(plugin.sidebarItems).toEqual([
-      { id: "main", title: "Example", icon: "Blocks", surface: "main" },
+    expect(plugin.surfaces.map(({ id, title }) => ({ id, title }))).toEqual([
+      { id: "main", title: "main" },
     ]);
+    expect(plugin.sidebarItems).toEqual({ header: [], footer: [] });
+    expect(plugin.legacySidebarItems).toEqual([
+      { id: "entry", title: "Example", icon: "Blocks", surface: "main" },
+    ]);
+  });
+
+  it("releases an addSidebarItem alias's header id", () => {
+    const plugin = evaluatePluginClientBundle(
+      "example",
+      bundle(`
+        plugin.addScreen({ id: "main", title: "Main", Component: function Screen() { return null; } });
+        const remove = plugin.addSidebarItem({ id: "entry", title: "Example", icon: "Blocks", surface: "main" });
+        remove();
+        plugin.addSidebarHeaderItem({ id: "entry", title: "Replacement", Component() { return null; } });
+      `),
+    );
+
+    expect(plugin.sidebarItems.header.map((item) => item.title)).toEqual(["Replacement"]);
+    expect(plugin.legacySidebarItems).toEqual([]);
+  });
+
+  it("rejects a header item that reuses an addSidebarItem id", () => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        bundle(`
+          plugin.addScreen({ id: "main", title: "Main", Component: function Screen() { return null; } });
+          plugin.addSidebarItem({ id: "entry", title: "Example", icon: "Blocks", surface: "main" });
+          plugin.addSidebarHeaderItem({ id: "entry", title: "Other", Component() { return null; } });
+        `),
+      ),
+    ).toThrow("Duplicate sidebar header item: entry");
   });
 
   it("collects a declarative attachment source", () => {
@@ -426,16 +580,16 @@ describe("evaluatePluginClientBundle", () => {
     ).toThrow("must return a cleanup function");
   });
 
-  it("provides the host Icon component through @getpaseo/plugin", () => {
+  it("provides the host Icon component through @getpaseo/plugin/client/react-native", () => {
     const plugin = evaluatePluginClientBundle(
       "example",
       `(function(require) {
-        const { Icon } = require("@getpaseo/plugin");
+        const { Icon } = require("@getpaseo/plugin/client/react-native");
         const module = { exports: {} };
         module.exports.default = function(plugin) {
-          plugin.addSurface("main", function Surface() {
+          plugin.addScreen({ id: "main", title: "Main", Component: function Surface() {
             return Icon({ name: "Settings", size: 18, color: "#123456" });
-          });
+          } });
           return function() {};
         };
         return module.exports;
@@ -448,11 +602,11 @@ describe("evaluatePluginClientBundle", () => {
     expect(element).toMatchObject({ props: { size: 18, color: "#123456" } });
   });
 
-  it("provides Paseo UI through @getpaseo/plugin/react-native", () => {
+  it("provides Paseo UI through @getpaseo/plugin/client/react-native", () => {
     const plugin = evaluatePluginClientBundle(
       "example",
       `(function(require) {
-        const { Icon, Modal, useToast } = require("@getpaseo/plugin/react-native");
+        const { Icon, Modal, useToast } = require("@getpaseo/plugin/client/react-native");
         const module = { exports: {} };
         module.exports.default = function(plugin) {
           if (typeof Icon !== "function" || typeof Modal !== "function" || typeof Modal.Content !== "function" || typeof useToast !== "function") {
@@ -468,6 +622,43 @@ describe("evaluatePluginClientBundle", () => {
     expect(plugin.surfaces.map((surface) => surface.id)).toEqual(["main"]);
   });
 
+  it("keeps shared and client runtime exports separate", () => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        `(function(require) {
+      const shared = require("@getpaseo/plugin");
+      const client = require("@getpaseo/plugin/client");
+      const { ExternalLink } = require("@getpaseo/plugin/client/ui");
+      if (typeof ExternalLink !== "function") throw new Error("ExternalLink");
+      for (const name of ["usePaseo", "useRpc", "useSettings", "useAgent", "useWorkspace", "openExternalUrl"]) {
+        if (name in shared || typeof client[name] !== "function") throw new Error(name);
+      }
+      if ("Icon" in shared || typeof shared.PluginAttachmentItemSchema.parse !== "function") throw new Error("shared exports");
+      return { default() { return () => {}; } };
+    })`,
+      ),
+    ).not.toThrow();
+  });
+
+  it.each([
+    "@getpaseo/plugin/server",
+    "@getpaseo/plugin/server/provider",
+    "@getpaseo/plugin/server/acp",
+    "@getpaseo/plugin/client/host",
+    "@getpaseo/plugin/react-native",
+    "@getpaseo/plugin/ui",
+    "@getpaseo/plugin/host",
+    "@paseo/plugin",
+  ])("rejects %s in the client loader", (specifier) => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        `(function(require) { require("${specifier}"); return {}; })`,
+      ),
+    ).toThrow("not available in plugin client code");
+  });
+
   it("resolves shared RPC helpers from @getpaseo/plugin", () => {
     const plugin = evaluatePluginClientBundle(
       "example",
@@ -519,3 +710,39 @@ describe("evaluatePluginClientBundle", () => {
     ).toThrow("setup exploded");
   });
 });
+
+it("binds imported getters to each originating installation across delayed callbacks", async () => {
+  const calls: string[] = [];
+  const hostRuntime = (installation: string): PluginClientRuntime => ({
+    ...runtime,
+    hosts: {
+      getSnapshot: () => [],
+      subscribe: () => () => {},
+      getPaseoClient(serverId) {
+        calls.push(`${installation}/${serverId}`);
+        return runtime.paseo;
+      },
+    },
+  });
+  const source = bundle(`
+    const { getPaseoClient } = require("@getpaseo/plugin/client");
+    getPaseoClient("entry-host");
+    plugin.addCommandCenterItem({
+      id: "read", title: "Read", icon: "Server", context: "global",
+      onSelect: async () => { await Promise.resolve(); getPaseoClient("target-host"); },
+    });
+  `);
+  const first = runPluginClientBundle("same-id", source, hostRuntime("first"));
+  const second = runPluginClientBundle("same-id", source, hostRuntime("second"));
+  // Both callbacks run after the second bundle has evaluated.
+  await first.commandCenterItems[0].onSelect({} as never);
+  await second.commandCenterItems[0].onSelect({} as never);
+  expect(calls).toEqual([
+    "first/entry-host",
+    "second/entry-host",
+    "first/target-host",
+    "second/target-host",
+  ]);
+  await first.cleanup();
+  await second.cleanup();
+});
diff --git a/packages/app/src/plugins/evaluate.ts b/packages/app/src/plugins/evaluate.ts
index 14ace0607a..a2703b6ad2 100644
--- a/packages/app/src/plugins/evaluate.ts
+++ b/packages/app/src/plugins/evaluate.ts
@@ -1,3 +1,9 @@
+import type { createPluginHosts } from "./hosts";
+import { openExternalUrl } from "@/utils/open-external-url";
+import * as pluginUiRuntime from "./react-native/ui";
+import { useSettings } from "./settings/use-settings";
+import * as pluginSharedRuntime from "@getpaseo/plugin";
+import * as pluginClientRuntime from "@getpaseo/plugin/client";
 import * as React from "react";
 import * as ReactJsxRuntime from "react/jsx-runtime";
 // eslint-disable-next-line no-restricted-imports -- plugin client runtime injects host ReactNative.
@@ -6,27 +12,28 @@ import * as ReactNative from "react-native";
 import * as ReactQuery from "@tanstack/react-query";
 import * as Zod from "zod";
 import {
-  defineAttachmentSource,
-  defineRpc,
   type PluginAttachmentSourceContribution,
-  type PluginCommandCenterItemContribution,
   type PluginCleanup,
+  type PluginThemeContribution,
+} from "@getpaseo/plugin";
+import {
+  type PluginCommandCenterItemContribution,
   type PluginClientContext,
   type PluginClientSlashCommandContribution,
   type PluginSidebarContribution,
+  type PluginScreenContribution,
+  type PluginScreenProps,
+  type PluginScreenTitle,
+  type PluginSidebarItemContribution,
   type PluginSurfaceProps,
-  type PluginThemeContribution,
   type PluginTimelineRendererContribution,
   type PluginTimelineTransformerContribution,
   type PluginWorkspacePanelContribution,
-  usePaseo,
-  useAgent,
-  useWorkspace,
-  useRpc,
-} from "@getpaseo/plugin";
-import type { EvaluatedPlugin } from "./types";
+  type PluginButtonRegistration,
+} from "@getpaseo/plugin/client";
+import type { EvaluatedPlugin, PluginSidebarSection } from "./types";
 import type { ComponentType } from "react";
-import { Icon, resolvePluginIcon } from "./icons";
+import { resolvePluginIcon } from "./icons";
 import { pluginReactNativeRuntime } from "./react-native/runtime";
 import { parsePluginThemeContribution } from "./themes";
 
@@ -62,16 +69,38 @@ function normalizePanelLocations(
   return normalized;
 }
 
+function isComponentType(value: unknown): boolean {
+  return (
+    typeof value === "function" ||
+    (typeof value === "object" && value !== null && "$$typeof" in value)
+  );
+}
+
 function requireId(value: string, label: string): string {
   const id = value.trim();
   if (!CONTRIBUTION_ID.test(id)) throw new Error(`Invalid ${label}: ${value}`);
   return id;
 }
 
+/** A non-empty string, or a function of the screen's params resolved when the header renders. */
+function requireScreenTitle(screenId: string, title: unknown): PluginScreenTitle {
+  if (typeof title === "function") return title as PluginScreenTitle;
+  if (typeof title === "string" && title.trim()) return title.trim();
+  throw new Error(`Screen ${screenId} needs a title: a non-empty string or a function of params`);
+}
+
 export type PluginClientRuntime = Pick<
   PluginClientContext,
-  "paseo" | "rpc" | "openSurface" | "openPanel" | "addComposerPill"
->;
+  | "playAudio"
+  | "paseo"
+  | "rpc"
+  | "openSettings"
+  | "openScreen"
+  | "openSurface"
+  | "openPanel"
+  | "addComposerPill"
+  | "addHeaderButton"
+> & { hosts: ReturnType<typeof createPluginHosts> };
 
 export function runPluginClientBundle(
   id: string,
@@ -81,7 +110,9 @@ export function runPluginClientBundle(
 ): EvaluatedPlugin {
   const collector: Omit<EvaluatedPlugin, "id" | "cleanup"> = {
     surfaces: [],
-    sidebarItems: [],
+    settingsScreens: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
     workspacePanels: [],
     commandCenterItems: [],
     clientSlashCommands: [],
@@ -91,7 +122,11 @@ export function runPluginClientBundle(
     timelineRenderers: [],
   };
   const surfaceIds = new Set<string>();
-  const sidebarItemIds = new Set<string>();
+  const settingsScreenIds = new Set<string>();
+  const sidebarItemIds: Record<PluginSidebarSection, Set<string>> = {
+    header: new Set(),
+    footer: new Set(),
+  };
   const workspacePanelIds = new Set<string>();
   const commandCenterItemIds = new Set<string>();
   const clientSlashCommandNames = new Set<string>();
@@ -101,6 +136,23 @@ export function runPluginClientBundle(
   const timelineRendererIds = new Set<string>();
   const removals = new Set<PluginCleanup>();
   let setupComplete = false;
+  let stopped = false;
+  function trackButton(registration: PluginButtonRegistration): PluginButtonRegistration {
+    let active = true;
+    const remove = () => {
+      if (!active) return;
+      active = false;
+      registration.remove();
+      removals.delete(remove);
+    };
+    removals.add(remove);
+    return {
+      update: (patch) => {
+        if (active && !stopped) registration.update(patch);
+      },
+      remove,
+    };
+  }
   const notifyChange = () => {
     if (setupComplete) onChange();
   };
@@ -120,36 +172,89 @@ export function runPluginClientBundle(
     removals.add(remove);
     return remove;
   }
+  function addSidebarItem(
+    section: PluginSidebarSection,
+    contribution: PluginSidebarItemContribution,
+  ): PluginCleanup {
+    const ids = sidebarItemIds[section];
+    const normalizedId = requireId(contribution.id, `sidebar ${section} item id`);
+    if (ids.has(normalizedId))
+      throw new Error(`Duplicate sidebar ${section} item: ${normalizedId}`);
+    const title = contribution.title.trim();
+    if (!title) throw new Error(`Sidebar item ${normalizedId} has no title`);
+    if (!isComponentType(contribution.Component)) {
+      throw new Error(`Sidebar item ${normalizedId} is not a component`);
+    }
+    ids.add(normalizedId);
+    return register(
+      collector.sidebarItems[section],
+      { id: normalizedId, title, Component: contribution.Component },
+      () => ids.delete(normalizedId),
+    );
+  }
   const pluginContext: PluginClientContext = {
     ...runtime,
-    addSurface(surfaceId: string, Component: ComponentType<PluginSurfaceProps>) {
-      const normalizedId = requireId(surfaceId, "surface id");
-      if (surfaceIds.has(normalizedId)) throw new Error(`Duplicate surface: ${normalizedId}`);
-      if (typeof Component !== "function")
-        throw new Error(`Surface ${normalizedId} is not a component`);
-      surfaceIds.add(normalizedId);
-      return register(collector.surfaces, { id: normalizedId, Component }, () =>
-        surfaceIds.delete(normalizedId),
+    addSettingsScreen(contribution) {
+      const screenId = requireId(contribution.id, "settings screen id");
+      if (settingsScreenIds.has(screenId))
+        throw new Error(`Duplicate settings screen: ${screenId}`);
+      if (!contribution.title.trim()) throw new Error(`Invalid settings screen: ${screenId}`);
+      resolvePluginIcon(contribution.icon);
+      settingsScreenIds.add(screenId);
+      return register(collector.settingsScreens, { ...contribution, id: screenId }, () =>
+        settingsScreenIds.delete(screenId),
       );
     },
+    addScreen(contribution: PluginScreenContribution) {
+      if (typeof contribution !== "object" || contribution === null) {
+        throw new Error("addScreen takes { id, title, Component }");
+      }
+      const normalizedId = requireId(contribution.id, "screen id");
+      if (surfaceIds.has(normalizedId)) throw new Error(`Duplicate screen: ${normalizedId}`);
+      const title = requireScreenTitle(normalizedId, contribution.title);
+      if (!isComponentType(contribution.Component)) {
+        throw new Error(`Screen ${normalizedId} is not a component`);
+      }
+      surfaceIds.add(normalizedId);
+      return register(
+        collector.surfaces,
+        { id: normalizedId, title, Component: contribution.Component },
+        () => surfaceIds.delete(normalizedId),
+      );
+    },
+    addSidebarHeaderItem(contribution: PluginSidebarItemContribution) {
+      return addSidebarItem("header", contribution);
+    },
+    addSidebarFooterItem(contribution: PluginSidebarItemContribution) {
+      return addSidebarItem("footer", contribution);
+    },
+    // COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+    // Titled by its id; a legacy item pointing at it lends the header its own title instead.
+    addSurface(surfaceId: string, Component: ComponentType<PluginSurfaceProps>) {
+      if (!isComponentType(Component)) throw new Error(`Screen ${surfaceId} is not a component`);
+      return pluginContext.addScreen({
+        id: surfaceId,
+        title: surfaceId,
+        Component: (props: PluginScreenProps) => React.createElement(Component, props),
+      });
+    },
+    // COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
     addSidebarItem(contribution: PluginSidebarContribution) {
       const normalizedId = requireId(contribution.id, "sidebar item id");
-      if (sidebarItemIds.has(normalizedId))
-        throw new Error(`Duplicate sidebar item: ${normalizedId}`);
-      if (!contribution.title.trim()) throw new Error(`Sidebar item ${normalizedId} has no title`);
       if (!contribution.icon.trim()) throw new Error(`Sidebar item ${normalizedId} has no icon`);
       resolvePluginIcon(contribution.icon.trim());
-      sidebarItemIds.add(normalizedId);
-      return register(
-        collector.sidebarItems,
-        {
-          id: normalizedId,
-          title: contribution.title.trim(),
-          icon: contribution.icon.trim(),
-          surface: requireId(contribution.surface, "sidebar surface id"),
-        },
-        () => sidebarItemIds.delete(normalizedId),
-      );
+      const legacy = {
+        id: normalizedId,
+        title: contribution.title.trim(),
+        icon: contribution.icon.trim(),
+        surface: requireId(contribution.surface, "sidebar surface id"),
+      };
+      // Shares the header's ids: the sidebar orders both kinds of item under one key.
+      const ids = sidebarItemIds.header;
+      if (ids.has(normalizedId)) throw new Error(`Duplicate sidebar header item: ${normalizedId}`);
+      if (!legacy.title) throw new Error(`Sidebar item ${normalizedId} has no title`);
+      ids.add(normalizedId);
+      return register(collector.legacySidebarItems, legacy, () => ids.delete(normalizedId));
     },
     addWorkspacePanel(contribution: PluginWorkspacePanelContribution) {
       const normalizedId = requireId(contribution.id, "workspace panel id");
@@ -323,39 +428,36 @@ export function runPluginClientBundle(
       );
     },
     addComposerPill(contribution) {
-      const removePill = runtime.addComposerPill(contribution);
-      let active = true;
-      const remove = () => {
-        if (!active) return;
-        active = false;
-        removePill();
-        removals.delete(remove);
-      };
-      removals.add(remove);
-      return remove;
+      if (stopped) throw new Error("Plugin has stopped");
+      return trackButton(runtime.addComposerPill(contribution));
+    },
+    addHeaderButton(contribution) {
+      if (stopped) throw new Error("Plugin has stopped");
+      return trackButton(runtime.addHeaderButton(contribution));
     },
   };
   const runtimeRequire = (name: string): unknown => {
+    if (name === "@getpaseo/plugin/client/ui") return pluginUiRuntime;
     if (name === "react") return React;
     if (name === "react/jsx-runtime") return ReactJsxRuntime;
     if (name === "react-native") return ReactNative;
-    if (name === "@getpaseo/plugin") {
+    if (name === "@getpaseo/plugin") return pluginSharedRuntime;
+    if (name === "@getpaseo/plugin/client")
       return {
-        defineAttachmentSource,
-        defineRpc,
-        Icon,
-        usePaseo,
-        useAgent,
-        useWorkspace,
-        useRpc,
+        ...pluginClientRuntime,
+        useSettings,
+        openExternalUrl,
+        getPaseoClient: (serverId: string) => runtime.hosts.getPaseoClient(serverId),
+        useHosts: () =>
+          React.useSyncExternalStore(
+            runtime.hosts.subscribe,
+            runtime.hosts.getSnapshot,
+            runtime.hosts.getSnapshot,
+          ),
       };
-    }
-    if (name === "@getpaseo/plugin/react-native" || name === "@paseo/plugin/react-native") {
+    if (name === "@getpaseo/plugin/client/react-native") {
       return pluginReactNativeRuntime;
     }
-    if (name === "@getpaseo/plugin/server" || name === "@paseo/plugin/server") {
-      return {};
-    }
     if (name === "@tanstack/react-query") return ReactQuery;
     if (name === "zod") return Zod;
     throw new Error(`Module "${name}" is not available in plugin client code`);
@@ -370,34 +472,38 @@ export function runPluginClientBundle(
   if (typeof setup !== "function") {
     throw new Error(`Plugin ${id} must default export a function`);
   }
-  const entryCleanup = setup(pluginContext);
-  if (typeof entryCleanup !== "function") {
-    throw new Error(`Plugin ${id} contribution must return a cleanup function`);
-  }
-
+  let entryCleanup: PluginCleanup | undefined;
   try {
-    for (const item of collector.sidebarItems) {
+    entryCleanup = setup(pluginContext);
+    if (typeof entryCleanup !== "function")
+      throw new Error(`Plugin ${id} contribution must return a cleanup function`);
+    for (const item of collector.legacySidebarItems) {
       if (!surfaceIds.has(item.surface)) {
         throw new Error(`Sidebar item ${item.id} references missing surface ${item.surface}`);
       }
     }
   } catch (error) {
+    stopped = true;
     try {
-      void Promise.resolve(entryCleanup()).catch((cleanupError) => {
+      void Promise.resolve(
+        typeof entryCleanup === "function" ? entryCleanup() : entryCleanup,
+      ).catch((cleanupError) => {
         console.warn(`[Plugins] Cleanup failed after setup error for ${id}`, cleanupError);
       });
     } catch (cleanupError) {
       console.warn(`[Plugins] Cleanup failed after setup error for ${id}`, cleanupError);
+    } finally {
+      for (const remove of removals) remove();
     }
     throw error;
   }
   setupComplete = true;
-  let stopped = false;
+  const cleanupEntry = entryCleanup;
   const cleanup = async () => {
     if (stopped) return;
     stopped = true;
     try {
-      await entryCleanup();
+      await cleanupEntry();
     } finally {
       for (const remove of removals) remove();
     }
@@ -406,7 +512,9 @@ export function runPluginClientBundle(
     id,
     cleanup,
     surfaces: collector.surfaces,
+    settingsScreens: collector.settingsScreens,
     sidebarItems: collector.sidebarItems,
+    legacySidebarItems: collector.legacySidebarItems,
     workspacePanels: collector.workspacePanels as EvaluatedPlugin["workspacePanels"],
     commandCenterItems: collector.commandCenterItems,
     clientSlashCommands: collector.clientSlashCommands,
diff --git a/packages/app/src/plugins/host-navigation-model.ts b/packages/app/src/plugins/host-navigation-model.ts
new file mode 100644
index 0000000000..f651370a9d
--- /dev/null
+++ b/packages/app/src/plugins/host-navigation-model.ts
@@ -0,0 +1,42 @@
+import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
+import type { NavigateToWorkspaceInput } from "@/stores/navigation-active-workspace-store";
+import { isHttpUrl } from "@/utils/http-url";
+
+interface HostNavigationOwner {
+  browserAvailable: boolean;
+  openAgent(input: { serverId: string; agentId: string }): void;
+  openWorkspace(input: NavigateToWorkspaceInput): void;
+  resolveWorkspace(input: { serverId: string; workspaceId: string }): string | null;
+  createBrowser(input: { initialUrl: string }): { browserId: string };
+}
+
+export function createPluginHostNavigation(
+  serverId: string,
+  owner: HostNavigationOwner,
+): NonNullable<PluginSurfaceProps["navigation"]> {
+  return {
+    openAgent: ({ agentId, serverId: targetServerId }) =>
+      owner.openAgent({ serverId: targetServerId ?? serverId, agentId }),
+    openWorkspace: ({ workspaceId, serverId: targetServerId }) =>
+      owner.openWorkspace({ serverId: targetServerId ?? serverId, workspaceId }),
+    openBrowser: owner.browserAvailable
+      ? ({ url, workspaceId, serverId: targetServerId }) => {
+          if (!isHttpUrl(url)) throw new Error("Only absolute HTTP(S) URLs are supported.");
+          if (!workspaceId.trim()) throw new Error("workspaceId is required.");
+          const destinationServerId = targetServerId ?? serverId;
+          const destinationWorkspaceId = owner.resolveWorkspace({
+            serverId: destinationServerId,
+            workspaceId,
+          });
+          if (!destinationWorkspaceId)
+            throw new Error("Workspace is unavailable on the requested host.");
+          const { browserId } = owner.createBrowser({ initialUrl: url });
+          owner.openWorkspace({
+            serverId: destinationServerId,
+            workspaceId: destinationWorkspaceId,
+            target: { kind: "browser", browserId },
+          });
+        }
+      : undefined,
+  };
+}
diff --git a/packages/app/src/plugins/host-navigation.test.ts b/packages/app/src/plugins/host-navigation.test.ts
new file mode 100644
index 0000000000..22538b3976
--- /dev/null
+++ b/packages/app/src/plugins/host-navigation.test.ts
@@ -0,0 +1,90 @@
+import { describe, expect, it } from "vitest";
+import { createPluginHostNavigation } from "./host-navigation-model";
+
+describe("plugin host navigation", () => {
+  function setup(electron = true) {
+    const destinations: unknown[] = [];
+    const browsers: string[] = [];
+    const workspaces = new Set(["selected:one", "remote:two"]);
+    const navigation = createPluginHostNavigation("selected", {
+      browserAvailable: electron,
+      resolveWorkspace: ({ serverId, workspaceId }) =>
+        workspaces.has(`${serverId}:${workspaceId}`) ? workspaceId : null,
+      openAgent: (input) => destinations.push(input),
+      openWorkspace: (input) => destinations.push(input),
+      createBrowser: ({ initialUrl }) => {
+        browsers.push(initialUrl);
+        return { browserId: `browser-${browsers.length}` };
+      },
+    });
+    return { navigation, destinations, browsers, workspaces };
+  }
+
+  it("creates and focuses a local browser in the selected or explicit host workspace", () => {
+    const { navigation, destinations, browsers } = setup();
+    navigation.openBrowser!({ url: "https://example.com/one", workspaceId: "one" });
+    navigation.openBrowser!({
+      url: "https://example.com/two",
+      workspaceId: "two",
+      serverId: "remote",
+    });
+    expect(browsers).toEqual(["https://example.com/one", "https://example.com/two"]);
+    expect(destinations).toEqual([
+      {
+        serverId: "selected",
+        workspaceId: "one",
+        target: { kind: "browser", browserId: "browser-1" },
+      },
+      {
+        serverId: "remote",
+        workspaceId: "two",
+        target: { kind: "browser", browserId: "browser-2" },
+      },
+    ]);
+  });
+
+  it("refuses unknown or removed workspaces before creating browser records", () => {
+    const { navigation, destinations, browsers, workspaces } = setup();
+    expect(() =>
+      navigation.openBrowser!({ url: "https://example.com", workspaceId: "missing" }),
+    ).toThrow("Workspace is unavailable");
+    expect(() =>
+      navigation.openBrowser!({
+        url: "https://example.com",
+        workspaceId: "one",
+        serverId: "unknown",
+      }),
+    ).toThrow("Workspace is unavailable");
+    workspaces.delete("selected:one");
+    expect(() =>
+      navigation.openBrowser!({ url: "https://example.com", workspaceId: "one" }),
+    ).toThrow("Workspace is unavailable");
+    expect(destinations).toEqual([]);
+    expect(browsers).toEqual([]);
+  });
+
+  it("exposes no browser capability outside Electron and creates no tabs", () => {
+    const { navigation, destinations, browsers } = setup(false);
+    expect(navigation.openBrowser).toBeUndefined();
+    expect(destinations).toEqual([]);
+    expect(browsers).toEqual([]);
+  });
+
+  it.each(["javascript:alert(1)", "file:///tmp/file", "/relative", "invalid"])(
+    "rejects %s before creating a browser",
+    (url) => {
+      const { navigation, browsers, destinations } = setup();
+      expect(() => navigation.openBrowser!({ url, workspaceId: "one" })).toThrow("HTTP(S)");
+      expect(browsers).toEqual([]);
+      expect(destinations).toEqual([]);
+    },
+  );
+
+  it("rejects an empty workspace before creating a browser", () => {
+    const { navigation, browsers } = setup();
+    expect(() => navigation.openBrowser!({ url: "https://example.com", workspaceId: "" })).toThrow(
+      "workspaceId",
+    );
+    expect(browsers).toEqual([]);
+  });
+});
diff --git a/packages/app/src/plugins/host-navigation.ts b/packages/app/src/plugins/host-navigation.ts
index 835cc41657..5f30f014aa 100644
--- a/packages/app/src/plugins/host-navigation.ts
+++ b/packages/app/src/plugins/host-navigation.ts
@@ -1,16 +1,30 @@
-import type { PluginSurfaceProps } from "@getpaseo/plugin";
+import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
+import { useSessionStore } from "@/stores/session-store";
+import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
 import { useMemo } from "react";
 import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
 
+import { getIsElectron } from "@/constants/platform";
+import { createWorkspaceBrowser } from "@/desktop/browser/store";
+import { createPluginHostNavigation } from "./host-navigation-model";
+
 export function usePluginHostNavigation(
   serverId: string,
 ): NonNullable<PluginSurfaceProps["navigation"]> {
   return useMemo(
-    () => ({
-      openAgent: ({ agentId }) => navigateToAgent({ serverId, agentId }),
-      openWorkspace: ({ workspaceId }) => navigateToWorkspace({ serverId, workspaceId }),
-    }),
+    () =>
+      createPluginHostNavigation(serverId, {
+        browserAvailable: getIsElectron(),
+        openAgent: navigateToAgent,
+        openWorkspace: navigateToWorkspace,
+        createBrowser: createWorkspaceBrowser,
+        resolveWorkspace: ({ serverId: targetServerId, workspaceId }) =>
+          resolveWorkspaceMapKeyByIdentity({
+            workspaces: useSessionStore.getState().sessions[targetServerId]?.workspaces,
+            workspaceId,
+          }),
+      }),
     [serverId],
   );
 }
diff --git a/packages/app/src/plugins/hosts/index.test.ts b/packages/app/src/plugins/hosts/index.test.ts
new file mode 100644
index 0000000000..287c1480eb
--- /dev/null
+++ b/packages/app/src/plugins/hosts/index.test.ts
@@ -0,0 +1,124 @@
+import { describe, expect, it } from "vitest";
+import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { createPluginHosts, type PluginHostsSource } from "./index";
+
+function registry() {
+  const hosts = [
+    { serverId: "a", label: "Alpha", password: "secret" },
+    { serverId: "b", label: "Beta", password: "secret" },
+  ];
+  const snapshots = new Map<string, NonNullable<ReturnType<PluginHostsSource["getSnapshot"]>>>();
+  const listeners = new Set<() => void>();
+  const source: PluginHostsSource = {
+    getHosts: () => hosts,
+    getSnapshot: (id) => snapshots.get(id) ?? null,
+    subscribeAll(listener) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    subscribeHostList(listener) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+  };
+  const lifetime = new AbortController();
+  const runtime = createPluginHosts(source, lifetime.signal);
+  return {
+    hosts,
+    snapshots,
+    listeners,
+    lifetime,
+    runtime,
+    source,
+    publish() {
+      for (const listener of listeners) listener();
+    },
+  };
+}
+function ignoreUpdate() {}
+
+function connection(id: string) {
+  return new DaemonClient({ url: `ws://${id}`, clientId: "test", reconnect: { enabled: false } });
+}
+
+describe("plugin host access", () => {
+  it("publishes credential-free configured hosts and only changes snapshots when summaries change", () => {
+    const h = registry();
+    expect(h.runtime.getSnapshot()).toEqual([
+      { serverId: "a", label: "Alpha", status: "offline" },
+      { serverId: "b", label: "Beta", status: "offline" },
+    ]);
+    const before = h.runtime.getSnapshot();
+    h.publish();
+    expect(h.runtime.getSnapshot()).toBe(before);
+    let updates = 0;
+    h.runtime.subscribe(() => updates++);
+    h.snapshots.set("b", { connectionStatus: "connecting", client: null });
+    h.publish();
+    expect(updates).toBe(1);
+    expect(h.runtime.getSnapshot()[1].status).toBe("connecting");
+    h.hosts[1].label = "Renamed";
+    h.publish();
+    expect(h.runtime.getSnapshot()[1].label).toBe("Renamed");
+    h.lifetime.abort();
+    expect(h.listeners.size).toBe(0);
+  });
+
+  it("rejects unknown and disconnected targets without falling through to another host", () => {
+    const h = registry();
+    h.snapshots.set("a", { connectionStatus: "online", client: connection("a") });
+    expect(() => h.runtime.getPaseoClient("missing")).toThrow("Unknown Paseo host: missing");
+    expect(() => h.runtime.getPaseoClient("b")).toThrow("Paseo host is disconnected: b");
+    h.lifetime.abort();
+  });
+
+  it("isolates installation lifetimes and releases APIs when a connection is replaced", async () => {
+    const h = registry();
+    const client = connection("b");
+    h.snapshots.set("b", { connectionStatus: "online", client });
+    h.publish();
+    const otherLifetime = new AbortController();
+    const other = createPluginHosts(h.source, otherLifetime.signal);
+    const api = h.runtime.getPaseoClient("b");
+    expect(api).toBe(h.runtime.getPaseoClient("b"));
+    expect(api).not.toBe(other.getPaseoClient("b"));
+    expect(api).not.toHaveProperty("connect");
+    expect(api).not.toHaveProperty("close");
+    api.agents.subscribe(ignoreUpdate);
+    h.snapshots.set("b", { connectionStatus: "offline", client });
+    h.publish();
+    expect(() => h.runtime.getPaseoClient("b")).toThrow("disconnected");
+    expect(() => api.config.get()).toThrow("Paseo host is disconnected: b");
+    h.snapshots.set("b", { connectionStatus: "online", client });
+    h.publish();
+    expect(h.runtime.getPaseoClient("b")).toBe(api);
+    h.snapshots.set("b", { connectionStatus: "online", client: connection("new-b") });
+    h.publish();
+    expect(() => api.agents.subscribe(ignoreUpdate)).toThrow("disposed");
+    expect(() => api.config.get()).toThrow("Paseo client is released: b");
+    expect(h.runtime.getPaseoClient("b")).not.toBe(api);
+    h.lifetime.abort();
+    expect(() => h.runtime.getPaseoClient("b")).toThrow("Plugin has stopped");
+    expect(() => other.getPaseoClient("b").agents.subscribe(ignoreUpdate)).not.toThrow();
+    otherLifetime.abort();
+  });
+});
+
+it("reacquires a fresh API after explicit disposal without affecting a later borrower", async () => {
+  const h = registry();
+  h.snapshots.set("b", { connectionStatus: "online", client: connection("b") });
+  const first = h.runtime.getPaseoClient("b");
+  await first.dispose();
+  const second = h.runtime.getPaseoClient("b");
+  expect(second).not.toBe(first);
+  expect(() => second.agents.subscribe(ignoreUpdate)).not.toThrow();
+  expect(() => first.config.get()).toThrow("Paseo client is released: b");
+  await first.dispose();
+  expect(h.runtime.getPaseoClient("b")).toBe(second);
+  h.lifetime.abort();
+  expect(() => second.agents.subscribe(ignoreUpdate)).toThrow("disposed");
+});
diff --git a/packages/app/src/plugins/hosts/index.ts b/packages/app/src/plugins/hosts/index.ts
new file mode 100644
index 0000000000..f3a6ace947
--- /dev/null
+++ b/packages/app/src/plugins/hosts/index.ts
@@ -0,0 +1,109 @@
+import { createPaseoApi, type PaseoApi } from "@getpaseo/client";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { PluginHostSummary } from "@getpaseo/plugin/client";
+
+export interface PluginHostsSource {
+  getHosts(): readonly { serverId: string; label: string }[];
+  getSnapshot(serverId: string): {
+    connectionStatus: PluginHostSummary["status"];
+    client: DaemonClient | null;
+  } | null;
+  subscribeAll(listener: () => void): () => void;
+  subscribeHostList(listener: () => void): () => void;
+}
+
+/** Each evaluated installation owns its borrowed APIs and registry subscriptions. */
+export function createPluginHosts(source: PluginHostsSource, signal: AbortSignal) {
+  const clients = new Map<
+    string,
+    { client: DaemonClient; api: PaseoApi; lifetime: AbortController }
+  >();
+  const listeners = new Set<() => void>();
+  let snapshot: readonly PluginHostSummary[] = [];
+  function readHosts(): readonly PluginHostSummary[] {
+    return source.getHosts().map(({ serverId, label }) => ({
+      serverId,
+      label,
+      status: source.getSnapshot(serverId)?.connectionStatus ?? "offline",
+    }));
+  }
+  function resolve(serverId: string): DaemonClient {
+    if (signal.aborted) throw new Error("Plugin has stopped");
+    if (!source.getHosts().some((host) => host.serverId === serverId)) {
+      throw new Error(`Unknown Paseo host: ${serverId}`);
+    }
+    const host = source.getSnapshot(serverId);
+    if (host?.connectionStatus !== "online" || !host.client) {
+      throw new Error(`Paseo host is disconnected: ${serverId}`);
+    }
+    return host.client;
+  }
+  function refresh() {
+    for (const [serverId, entry] of clients) {
+      if (
+        !source.getHosts().some((host) => host.serverId === serverId) ||
+        source.getSnapshot(serverId)?.client !== entry.client
+      ) {
+        entry.lifetime.abort();
+        clients.delete(serverId);
+      }
+    }
+    const next = readHosts();
+    if (JSON.stringify(snapshot) === JSON.stringify(next)) return;
+    snapshot = next;
+    for (const listener of listeners) listener();
+  }
+  snapshot = readHosts();
+  const unsubscribeRuntime = source.subscribeAll(refresh);
+  const unsubscribeHosts = source.subscribeHostList(refresh);
+  function stop() {
+    unsubscribeRuntime();
+    unsubscribeHosts();
+    listeners.clear();
+    for (const entry of clients.values()) entry.lifetime.abort();
+    clients.clear();
+  }
+  if (signal.aborted) stop();
+  else signal.addEventListener("abort", stop, { once: true });
+  return {
+    getSnapshot: () => snapshot,
+    subscribe(listener: () => void) {
+      if (signal.aborted) return () => {};
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    getPaseoClient(serverId: string): PaseoApi {
+      const client = resolve(serverId);
+      const existing = clients.get(serverId);
+      if (existing?.client === client) return existing.api;
+      existing?.lifetime.abort();
+      const lifetime = new AbortController();
+      // Guard even retained SDK handles against unload, offline calls, and replaced connections.
+      // Methods keep the real receiver because DaemonClient owns private state.
+      const borrowed = new Proxy(client, {
+        get(target, key) {
+          const value: unknown = Reflect.get(target, key, target);
+          if (typeof value !== "function") return value;
+          return (...args: unknown[]) => {
+            if (lifetime.signal.aborted) throw new Error(`Paseo client is released: ${serverId}`);
+            if (resolve(serverId) !== client) {
+              throw new Error(`Paseo connection changed; call getPaseoClient again: ${serverId}`);
+            }
+            return Reflect.apply(value, target, args);
+          };
+        },
+      });
+      const api = createPaseoApi(borrowed, { signal: lifetime.signal });
+      const dispose = api.dispose;
+      api.dispose = () => {
+        if (clients.get(serverId)?.api === api) clients.delete(serverId);
+        lifetime.abort();
+        return dispose();
+      };
+      clients.set(serverId, { client, api, lifetime });
+      return api;
+    },
+  };
+}
diff --git a/packages/app/src/plugins/icons.ts b/packages/app/src/plugins/icons.ts
index 1e3fdb4cbf..3c5ec581ce 100644
--- a/packages/app/src/plugins/icons.ts
+++ b/packages/app/src/plugins/icons.ts
@@ -1,6 +1,6 @@
 import { createElement, type ReactElement } from "react";
 import * as LucideIcons from "lucide-react-native";
-import type { PluginIconProps } from "@getpaseo/plugin";
+import type { PluginIconProps } from "@getpaseo/plugin/client";
 import type { LucideIcon } from "lucide-react-native";
 
 function findPluginIcon(name: string): LucideIcon | null {
diff --git a/packages/app/src/plugins/index.ts b/packages/app/src/plugins/index.ts
index b473ed1f41..e221f4208f 100644
--- a/packages/app/src/plugins/index.ts
+++ b/packages/app/src/plugins/index.ts
@@ -3,4 +3,8 @@ export { buildLegacyPluginSurfaceRedirectRoute } from "./routes";
 export { PluginSurfaceScreen } from "./surface-screen";
 export { usePluginAttachmentPicker } from "./attachments/picker";
 export { PluginResourceAttachmentPill } from "./attachments/pill";
-export { PluginComposerPills, useHasPluginComposerPills } from "./composer-pills";
+export {
+  PluginComposerPills,
+  PluginHeaderButtons,
+  useHasPluginComposerPills,
+} from "./buttons/view";
diff --git a/packages/app/src/plugins/installation-provider.test.tsx b/packages/app/src/plugins/installation-provider.test.tsx
new file mode 100644
index 0000000000..949bc7480f
--- /dev/null
+++ b/packages/app/src/plugins/installation-provider.test.tsx
@@ -0,0 +1,71 @@
+import { usePaseo, useRpc } from "@getpaseo/plugin/client";
+import { defineRpc } from "@getpaseo/plugin";
+import type { PaseoApi } from "@getpaseo/client";
+import { QueryClient } from "@tanstack/react-query";
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { expect, it } from "vitest";
+import { z } from "zod";
+import { PluginInstallationProvider } from "./installation-provider";
+import type { InstalledPlugin } from "./types";
+
+const status = defineRpc({
+  name: "deploys.status",
+  input: z.object({}),
+  output: z.object({ state: z.string() }),
+});
+
+function installation(invoked: string[]): InstalledPlugin {
+  return {
+    id: "deploys",
+    serverId: "host",
+    clientBundle: "",
+    lifetime: new AbortController(),
+    paseo: { dispose: async () => undefined } as PaseoApi,
+    invoke: async (method) => {
+      invoked.push(method);
+      return { state: "green" };
+    },
+    queryClient: new QueryClient(),
+    cleanup: () => undefined,
+    settingsScreens: [],
+    surfaces: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
+    workspacePanels: [],
+    commandCenterItems: [],
+    clientSlashCommands: [],
+    attachmentSources: [],
+    themes: [],
+    timelineTransformers: [],
+    timelineRenderers: [],
+  };
+}
+
+it("gives every surface the installation's client and RPCs on its first frame", async () => {
+  const invoked: string[] = [];
+  const plugin = installation(invoked);
+  const received: PaseoApi[] = [];
+  let rpc: ((input: Record<string, never>) => Promise<unknown>) | null = null;
+  function Surface({ name }: { name: string }) {
+    received.push(usePaseo());
+    rpc = useRpc(status);
+    return <span>{name}</span>;
+  }
+
+  const markup = ["Screen", "Sidebar item", "Popover"]
+    .map((name) =>
+      renderToStaticMarkup(
+        <PluginInstallationProvider plugin={plugin}>
+          <Surface name={name} />
+        </PluginInstallationProvider>,
+      ),
+    )
+    .join("");
+
+  expect(markup).toBe("<span>Screen</span><span>Sidebar item</span><span>Popover</span>");
+  expect(received).toEqual([plugin.paseo, plugin.paseo, plugin.paseo]);
+  expect(received.every((paseo) => paseo === plugin.paseo)).toBe(true);
+  await expect(rpc!({})).resolves.toEqual({ state: "green" });
+  expect(invoked).toEqual(["deploys.status"]);
+});
diff --git a/packages/app/src/plugins/runtime-boundary.tsx b/packages/app/src/plugins/installation-provider.tsx
similarity index 52%
rename from packages/app/src/plugins/runtime-boundary.tsx
rename to packages/app/src/plugins/installation-provider.tsx
index 7f2d62c054..40d06ef035 100644
--- a/packages/app/src/plugins/runtime-boundary.tsx
+++ b/packages/app/src/plugins/installation-provider.tsx
@@ -1,22 +1,20 @@
 import { QueryClientProvider } from "@tanstack/react-query";
-import { PaseoApiProvider, PluginRpcProvider } from "@getpaseo/plugin/host";
-import type { ReactNode } from "react";
+import { PaseoApiProvider, PluginRpcProvider } from "@getpaseo/plugin/client/host";
+import React, { type ReactNode } from "react";
 import type { InstalledPlugin } from "./types";
-import type { PluginSurfaceRuntime } from "./surface-runtime";
 
-export function PluginRuntimeBoundary({
+/** Every plugin surface renders under its installation: one query cache, one Paseo client, RPCs. */
+export function PluginInstallationProvider({
   plugin,
-  runtime,
   children,
 }: {
   plugin: InstalledPlugin;
-  runtime: PluginSurfaceRuntime;
   children: ReactNode;
 }) {
   return (
     <QueryClientProvider client={plugin.queryClient}>
-      <PaseoApiProvider paseo={runtime.paseo}>
-        <PluginRpcProvider invoke={runtime.invoke}>{children}</PluginRpcProvider>
+      <PaseoApiProvider paseo={plugin.paseo}>
+        <PluginRpcProvider invoke={plugin.invoke}>{children}</PluginRpcProvider>
       </PaseoApiProvider>
     </QueryClientProvider>
   );
diff --git a/packages/app/src/plugins/navigation.ts b/packages/app/src/plugins/navigation.ts
index cd1f9c129b..c1a50a98fc 100644
--- a/packages/app/src/plugins/navigation.ts
+++ b/packages/app/src/plugins/navigation.ts
@@ -1,5 +1,6 @@
+import { buildPluginSettingsRoute } from "./settings/routes";
 import { router } from "expo-router";
-import type { PluginPanelLocation } from "@getpaseo/plugin";
+import type { PluginPanelLocation } from "@getpaseo/plugin/client";
 import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
 import { buildPluginSurfaceRoute } from "./routes";
@@ -19,8 +20,13 @@ export function createPluginNavigation(input: {
     return { mode: "pane" as const, paneId };
   }
   return {
-    openSurface(pluginId, surfaceId) {
-      router.push(buildPluginSurfaceRoute(serverId, pluginId, { kind: "surface", id: surfaceId }));
+    openSettings(pluginId, screenId) {
+      router.push(buildPluginSettingsRoute(serverId, pluginId, screenId));
+    },
+    openSurface(pluginId, surfaceId, params) {
+      router.push(
+        buildPluginSurfaceRoute(serverId, pluginId, { kind: "surface", id: surfaceId }, params),
+      );
     },
     openWorkspacePanel(pluginId, panelId, location) {
       if (!workspaceId) throw new Error("No active workspace");
diff --git a/packages/app/src/plugins/platform.ts b/packages/app/src/plugins/platform.ts
new file mode 100644
index 0000000000..816095e255
--- /dev/null
+++ b/packages/app/src/plugins/platform.ts
@@ -0,0 +1,9 @@
+import type { PluginHostProps } from "@getpaseo/plugin/client";
+import { Platform } from "react-native";
+
+/** The platform plugins see in `layout.platform`. */
+export function resolvePluginPlatform(): PluginHostProps["layout"]["platform"] {
+  if (Platform.OS === "ios") return "ios";
+  if (Platform.OS === "android") return "android";
+  return "web";
+}
diff --git a/packages/app/src/plugins/popover.tsx b/packages/app/src/plugins/popover.tsx
new file mode 100644
index 0000000000..f9680ebb29
--- /dev/null
+++ b/packages/app/src/plugins/popover.tsx
@@ -0,0 +1,59 @@
+import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
+import type { ReactNode } from "react";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { MenuSurface, type MenuSurfaceProps } from "@/components/ui/menu";
+import { ToastApiProvider, type useToast } from "@/contexts/toast-context";
+import type { createPluginClientStateSource } from "./client-state/source";
+import { PluginInstallationProvider } from "./installation-provider";
+import type { InstalledPlugin } from "./types";
+
+export interface PluginEnvironment {
+  installation: InstalledPlugin;
+  state: ReturnType<typeof createPluginClientStateSource>;
+  toast: ReturnType<typeof useToast>;
+}
+
+interface PluginEnvironmentProviderProps {
+  environment: PluginEnvironment;
+  children: ReactNode;
+}
+
+/**
+ * The providers plugin UI runs under. Render it around a contribution and again inside every
+ * surface it opens: native sheets teleport their children, so providers around the trigger alone
+ * cannot reach a popover body.
+ */
+export function PluginEnvironmentProvider({
+  environment,
+  children,
+}: PluginEnvironmentProviderProps) {
+  return (
+    <ToastApiProvider api={environment.toast}>
+      <PluginInstallationProvider plugin={environment.installation}>
+        <PluginClientStateProvider source={environment.state}>{children}</PluginClientStateProvider>
+      </PluginInstallationProvider>
+    </ToastApiProvider>
+  );
+}
+
+type PluginPopoverSurfaceProps = Pick<
+  MenuSurfaceProps,
+  "children" | "pages" | "sheetTitle" | "sheetTrailing" | "side" | "align" | "offset" | "testID"
+>;
+
+/**
+ * The surface every plugin popover opens in: anchored to its trigger on wide layouts, a bottom
+ * sheet on compact ones when the enclosing `MenuRoot` uses `compactMode="sheet"`.
+ */
+export function PluginPopoverSurface(props: PluginPopoverSurfaceProps) {
+  return <MenuSurface {...props} minWidth={280} maxWidth={420} maxHeight={440} scrollable />;
+}
+
+export function PluginPopoverContent({ children }: { children: ReactNode }) {
+  return <View style={styles.content}>{children}</View>;
+}
+
+const styles = StyleSheet.create((theme) => ({
+  content: { padding: theme.spacing[3], gap: theme.spacing[2] },
+}));
diff --git a/packages/app/src/plugins/react-native/clipboard.ts b/packages/app/src/plugins/react-native/clipboard.ts
new file mode 100644
index 0000000000..4357a0baa1
--- /dev/null
+++ b/packages/app/src/plugins/react-native/clipboard.ts
@@ -0,0 +1,6 @@
+export async function copyText(text: string): Promise<void> {
+  const { setStringAsync } = require("expo-clipboard") as typeof import("expo-clipboard");
+  if (!(await setStringAsync(text))) {
+    throw new Error("Clipboard copy was denied or is unavailable");
+  }
+}
diff --git a/packages/app/src/plugins/react-native/clipboard.web.ts b/packages/app/src/plugins/react-native/clipboard.web.ts
new file mode 100644
index 0000000000..7207c2c689
--- /dev/null
+++ b/packages/app/src/plugins/react-native/clipboard.web.ts
@@ -0,0 +1,6 @@
+// Expo's web fallback reports success even when document.execCommand returns
+// false. Use the browser promise so the SDK can promise success or rejection.
+export async function copyText(text: string): Promise<void> {
+  if (!navigator.clipboard) throw new Error("Clipboard copy is unavailable in this browser");
+  await navigator.clipboard.writeText(text);
+}
diff --git a/packages/app/src/plugins/react-native/modal.tsx b/packages/app/src/plugins/react-native/modal.tsx
index 38728b56b6..b61cd925b1 100644
--- a/packages/app/src/plugins/react-native/modal.tsx
+++ b/packages/app/src/plugins/react-native/modal.tsx
@@ -1,6 +1,10 @@
 import { QueryClientProvider, useQueryClient } from "@tanstack/react-query";
-import type { ModalComponent, ModalContentProps, ModalProps } from "@getpaseo/plugin/react-native";
-import { usePluginRuntimeContextBridge } from "@getpaseo/plugin/host";
+import type {
+  ModalComponent,
+  ModalContentProps,
+  ModalProps,
+} from "@getpaseo/plugin/client/react-native";
+import { usePluginRuntimeContextBridge } from "@getpaseo/plugin/client/host";
 import { createContext, useCallback, useContext, useMemo, useRef, type ReactNode } from "react";
 import { ToastApiProvider, useToast as useAppToast } from "@/contexts/toast-api-context";
 
@@ -30,7 +34,12 @@ function useModalContext(): ModalContextValue {
   return context;
 }
 
-function ModalContent({ children }: ModalContentProps) {
+function ModalContent({
+  children,
+  style,
+  contentContainerStyle,
+  scrollable = true,
+}: ModalContentProps) {
   const modal = useModalContext();
   const queryClient = useQueryClient();
   const toast = useAppToast();
@@ -52,6 +61,10 @@ function ModalContent({ children }: ModalContentProps) {
       onClose={modal.dismiss}
       header={modal.header}
       contextBridge={contextBridge}
+      bodyStyle={style}
+      contentStyle={contentContainerStyle}
+      scrollable={scrollable}
+      desktopHeight={scrollable ? undefined : "85%"}
     >
       {children}
     </AdaptiveModalSheet>
diff --git a/packages/app/src/plugins/react-native/runtime.ts b/packages/app/src/plugins/react-native/runtime.ts
index 4ac8ef3349..bdf39910a4 100644
--- a/packages/app/src/plugins/react-native/runtime.ts
+++ b/packages/app/src/plugins/react-native/runtime.ts
@@ -1,6 +1,18 @@
 import { Icon } from "../icons";
 import { Modal } from "./modal";
+import { ScrollView, FlatList } from "./scroll-view";
+import { TextInput } from "./text-input";
+import { copyText } from "./clipboard";
 import { useToast } from "./toast";
 import { useRevealedText } from "@/hooks/use-revealed-text";
 
-export const pluginReactNativeRuntime = { Icon, Modal, useRevealedText, useToast };
+export const pluginReactNativeRuntime = {
+  Icon,
+  Modal,
+  ScrollView,
+  FlatList,
+  TextInput,
+  copyText,
+  useRevealedText,
+  useToast,
+};
diff --git a/packages/app/src/plugins/react-native/scroll-view.tsx b/packages/app/src/plugins/react-native/scroll-view.tsx
new file mode 100644
index 0000000000..40dcc2f192
--- /dev/null
+++ b/packages/app/src/plugins/react-native/scroll-view.tsx
@@ -0,0 +1,25 @@
+import { forwardRef } from "react";
+import type {
+  ScrollView as NativeScrollView,
+  ScrollViewProps,
+  FlatListProps,
+  FlatList as NativeFlatList,
+} from "react-native";
+import type * as Shared from "@/components/ui/scroll-view";
+
+// Plugin evaluation also runs before the native UI is ready. Load presentation
+// dependencies at render time, as Modal does, rather than evaluating them on import.
+export const ScrollView = forwardRef<NativeScrollView, ScrollViewProps>(
+  function ScrollView(props, ref) {
+    const { ScrollView: HostScrollView } =
+      require("../../components/ui/scroll-view") as typeof Shared;
+    return <HostScrollView {...props} ref={ref} />;
+  },
+);
+
+export const FlatList = forwardRef<NativeFlatList<unknown>, FlatListProps<unknown>>(
+  function FlatList(props, ref) {
+    const { FlatList: HostFlatList } = require("../../components/ui/scroll-view") as typeof Shared;
+    return <HostFlatList {...props} ref={ref} />;
+  },
+) as typeof Shared.FlatList;
diff --git a/packages/app/src/plugins/react-native/text-input.tsx b/packages/app/src/plugins/react-native/text-input.tsx
new file mode 100644
index 0000000000..0330e68533
--- /dev/null
+++ b/packages/app/src/plugins/react-native/text-input.tsx
@@ -0,0 +1,12 @@
+import { forwardRef, type ElementRef } from "react";
+import type { TextInputProps } from "react-native";
+
+import type { SheetAwareTextInput } from "@/components/ui/text-input/sheet-aware";
+
+export const TextInput = forwardRef<ElementRef<typeof SheetAwareTextInput>, TextInputProps>(
+  function TextInput(props, ref) {
+    const { SheetAwareTextInput } =
+      require("../../components/ui/text-input/sheet-aware") as typeof import("../../components/ui/text-input/sheet-aware");
+    return <SheetAwareTextInput {...props} ref={ref} />;
+  },
+);
diff --git a/packages/app/src/plugins/react-native/toast.ts b/packages/app/src/plugins/react-native/toast.ts
index e144390bfa..fd4d503799 100644
--- a/packages/app/src/plugins/react-native/toast.ts
+++ b/packages/app/src/plugins/react-native/toast.ts
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import type { ToastApi, ToastOptions } from "@getpaseo/plugin/react-native";
+import type { ToastApi, ToastOptions } from "@getpaseo/plugin/client/react-native";
 import { useToast as useAppToast } from "@/contexts/toast-api-context";
 
 export function useToast(): ToastApi {
diff --git a/packages/app/src/plugins/react-native/ui.ts b/packages/app/src/plugins/react-native/ui.ts
new file mode 100644
index 0000000000..1d7a72011f
--- /dev/null
+++ b/packages/app/src/plugins/react-native/ui.ts
@@ -0,0 +1,14 @@
+export {
+  SettingsGroup,
+  SettingsSection,
+  SettingsCard,
+  SettingsRow,
+  SettingsSwitch,
+  SettingsSelect,
+  SettingsInput,
+  SettingsAction,
+} from "@/components/settings";
+
+export { ExternalLink } from "@/components/ui/external-link";
+
+export { SidebarRow, SidebarSeparator } from "@/plugins/sidebar-items/kit";
diff --git a/packages/app/src/plugins/registry-lifecycle.test.ts b/packages/app/src/plugins/registry-lifecycle.test.ts
new file mode 100644
index 0000000000..ecec420e3c
--- /dev/null
+++ b/packages/app/src/plugins/registry-lifecycle.test.ts
@@ -0,0 +1,147 @@
+import { createPluginHosts } from "./hosts";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { PaseoApi } from "@getpaseo/client";
+import { expect, test } from "vitest";
+import { PluginRegistry } from "./registry";
+
+const audio = { play: async () => 0 };
+
+/** A host client that records open event observations by their first event name. */
+function observingClient() {
+  const open = new Set<string>();
+  const client = {
+    observeEvents(events: string[]) {
+      const [name] = events;
+      open.add(name);
+      return {
+        ready: Promise.resolve({ subscriptionId: name }),
+        subscribe: () => () => undefined,
+        release: async () => {
+          open.delete(name);
+        },
+      };
+    },
+    invokePluginRpc: async () => null,
+  } as unknown as DaemonClient;
+  return { client, open };
+}
+
+function registry() {
+  const setupClients = new Map<string, PaseoApi>();
+  const plugins = new PluginRegistry({
+    version: "0.8.0",
+    createRuntime: (installation) => {
+      setupClients.set(installation.id, installation.paseo);
+      return {
+        hosts: createPluginHosts(
+          {
+            getHosts: () => [],
+            getSnapshot: () => null,
+            subscribeAll: () => () => {},
+            subscribeHostList: () => () => {},
+          },
+          installation.lifetime.signal,
+        ),
+        paseo: installation.paseo,
+        rpc: async () => {
+          throw new Error("Unexpected plugin RPC");
+        },
+        openScreen: () => {},
+        openSurface: () => {},
+        openSettings: () => {},
+        playAudio: async () => {},
+        openPanel: () => {},
+        addComposerPill: () => ({ update() {}, remove() {} }),
+        addHeaderButton: () => ({ update() {}, remove() {} }),
+      };
+    },
+  });
+  return { ...observingClient(), plugins, setupClients };
+}
+
+/** A plugin whose setup opens an observation named after it and never releases it. */
+function catalog(id: string, body = "return function() {};") {
+  return {
+    id,
+    requirements: { paseo: ">=0.8.0" },
+    clientBundle: `(function() { return { default: function(plugin) { plugin.paseo.observeEvents(["${id}"]); ${body} } }; })`,
+  };
+}
+
+test("setup and every surface share the installation's one Paseo client", () => {
+  const h = registry();
+  h.plugins.installCatalog("host", [catalog("deploys")], { client: h.client, audio });
+
+  const [installation] = h.plugins.getSnapshot();
+  expect(h.setupClients.get("deploys")).toBe(installation.paseo);
+  expect(h.open).toEqual(new Set(["deploys"]));
+});
+
+test("teardown ends every subscription the plugin still holds", async () => {
+  const h = registry();
+  h.plugins.installCatalog("host", [catalog("disabled"), catalog("kept")], {
+    client: h.client,
+    audio,
+  });
+  expect(h.open).toEqual(new Set(["disabled", "kept"]));
+
+  // Disabling one plugin removes it from the catalog.
+  h.plugins.installCatalog("host", [catalog("kept")], { client: h.client, audio });
+  await expect.poll(() => [...h.open]).toEqual(["kept"]);
+
+  h.plugins.removeHost("host");
+  await expect.poll(() => h.open.size).toBe(0);
+});
+
+test("reloading a plugin ends the old installation's subscriptions", async () => {
+  const h = registry();
+  h.plugins.installCatalog("host", [catalog("reloaded")], { client: h.client, audio });
+  const [first] = h.plugins.getSnapshot();
+
+  h.plugins.installCatalog("host", [catalog("reloaded")], {
+    client: h.client,
+    audio,
+    replacePluginId: "reloaded",
+  });
+
+  const [second] = h.plugins.getSnapshot();
+  expect(second).not.toBe(first);
+  expect(second.paseo).not.toBe(first.paseo);
+  await expect(first.paseo.dispose()).resolves.toBeUndefined();
+  expect(() => first.paseo.observeEvents(["project.update"])).toThrow("Paseo API is disposed");
+  expect(h.open).toEqual(new Set(["reloaded"]));
+});
+
+test("failed plugin initialization ends the subscriptions it opened", async () => {
+  const h = registry();
+  h.plugins.installCatalog("host", [catalog("failed", 'throw new Error("setup failed");')], {
+    client: h.client,
+    audio,
+  });
+  await expect.poll(() => h.open.size).toBe(0);
+  expect(h.plugins.getSnapshot()).toEqual([]);
+});
+
+test("unloading ends the subscriptions even when plugin cleanup throws, preserving another plugin", async () => {
+  const h = registry();
+  const failing = catalog("failing", 'return function() { throw new Error("cleanup failed"); };');
+  const surviving = catalog("surviving", "return function() {};");
+  h.plugins.installCatalog("host", [failing, surviving], { client: h.client, audio });
+  h.plugins.installCatalog("host", [surviving], { client: h.client, audio });
+  await expect.poll(() => [...h.open]).toEqual(["surviving"]);
+  expect(h.plugins.getSnapshot().map((plugin) => plugin.id)).toEqual(["surviving"]);
+  h.plugins.removeHost("host");
+  await expect.poll(() => h.open.size).toBe(0);
+});
+
+test("an invalid async client entry is disposed and its rejected continuation is observed", async () => {
+  const h = registry();
+  h.plugins.installCatalog(
+    "host",
+    [catalog("async-entry", 'return Promise.reject(new Error("asynchronous setup failed"));')],
+    { client: h.client, audio },
+  );
+  await expect.poll(() => h.open.size).toBe(0);
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  expect(h.plugins.getSnapshot()).toEqual([]);
+});
diff --git a/packages/app/src/plugins/registry-requirements.test.ts b/packages/app/src/plugins/registry-requirements.test.ts
new file mode 100644
index 0000000000..eb141e94c2
--- /dev/null
+++ b/packages/app/src/plugins/registry-requirements.test.ts
@@ -0,0 +1,101 @@
+import { createPluginHosts } from "./hosts";
+import { afterEach, expect, it } from "vitest";
+import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { PluginRegistry } from "./registry";
+
+const audio = { play: async () => 0 };
+
+const client = new DaemonClient({ url: "ws://unused.test", clientId: "plugin-requirements-test" });
+const registries: PluginRegistry[] = [];
+function registry(version: string) {
+  let starts = 0;
+  let cleanups = 0;
+  const result = new PluginRegistry({
+    version,
+    createRuntime(installation) {
+      starts++;
+      return {
+        hosts: createPluginHosts(
+          {
+            getHosts: () => [],
+            getSnapshot: () => null,
+            subscribeAll: () => () => {},
+            subscribeHostList: () => () => {},
+          },
+          installation.lifetime.signal,
+        ),
+        paseo: installation.paseo,
+        rpc: async () => {
+          throw new Error("No RPC in this plugin");
+        },
+        openSettings() {
+          cleanups++;
+        },
+        openScreen() {},
+        openSurface() {},
+        async playAudio() {},
+        openPanel() {},
+        addComposerPill: () => ({ update() {}, remove() {} }),
+        addHeaderButton: () => ({ update() {}, remove() {} }),
+      };
+    },
+  });
+  registries.push(result);
+  return { result, starts: () => starts, cleanups: () => cleanups };
+}
+const clientBundle =
+  '(function() { return { default: function(client) { return () => client.openSettings("cleanup"); } }; })';
+afterEach(() => {
+  for (const value of registries.splice(0)) value.removeHost("host");
+});
+
+it("checks the app version before creating a runtime or evaluating plugin code", () => {
+  const { result, starts } = registry("0.8.0");
+  result.installCatalog(
+    "host",
+    [
+      {
+        id: "example",
+        requirements: { paseo: ">=0.9.0" },
+        clientBundle: "throw new Error('executed')",
+      },
+    ],
+    { client, audio },
+  );
+  expect(starts()).toBe(0);
+  expect(result.getSnapshot()).toEqual([]);
+  expect(result.getEvaluationError("host", "example")).toBe(
+    'Plugin "example" requires Paseo >=0.9.0. Your app is 0.8.0. Use a compatible plugin version or update the app.',
+  );
+});
+
+it("rejects catalogs without requirements from pre-0.8 daemons", () => {
+  const { result, starts } = registry("0.8.0");
+  result.installCatalog("host", [{ id: "example", clientBundle }], { client, audio });
+  expect(starts()).toBe(0);
+  expect(result.getEvaluationError("host", "example")).toContain(
+    "https://paseo.sh/docs/plugins/migration",
+  );
+});
+
+it("unloads on a requirement-only edit and recovers after correction", () => {
+  const { result, starts, cleanups } = registry("0.8.0");
+  const install = (paseo: string) =>
+    result.installCatalog("host", [{ id: "example", clientBundle, requirements: { paseo } }], {
+      client,
+      audio,
+    });
+  install("^0.8.0");
+  expect(result.getSnapshot().map(({ id }) => id)).toEqual(["example"]);
+  install("^0.8.0");
+  expect(starts()).toBe(1);
+  install(">=0.9.0");
+  expect(cleanups()).toBe(1);
+  expect(starts()).toBe(1);
+  expect(result.getSnapshot()).toEqual([]);
+  expect(result.getEvaluationError("host", "example")).toContain("requires Paseo >=0.9.0");
+  install(">=0.8.0");
+  expect(starts()).toBe(2);
+  expect(result.getSnapshot().map(({ id }) => id)).toEqual(["example"]);
+  expect(result.getEvaluationError("host", "example")).toBeUndefined();
+});
diff --git a/packages/app/src/plugins/registry.test.ts b/packages/app/src/plugins/registry.test.ts
index a0fc4c068f..9e8d246a95 100644
--- a/packages/app/src/plugins/registry.test.ts
+++ b/packages/app/src/plugins/registry.test.ts
@@ -1,17 +1,21 @@
+import appPackage from "../../package.json";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { pluginRegistry as registry } from "./registry";
 
+const audio = { play: async () => 0 };
+
 vi.mock("./navigation", () => ({
   createPluginNavigation: () => ({}),
 }));
 vi.mock("./client-runtime", () => ({
   createPluginClientRuntime: () => ({
-    paseo: {},
+    paseo: { dispose: async () => {} },
     rpc: async () => undefined,
     openSurface: () => undefined,
     openPanel: () => undefined,
-    addComposerPill: () => () => undefined,
+    addComposerPill: () => ({ update() {}, remove() {} }),
+    addHeaderButton: () => ({ update() {}, remove() {} }),
   }),
 }));
 
@@ -25,7 +29,11 @@ const pluginRegistry = {
     catalog: Parameters<typeof registry.installCatalog>[1],
     options: { replacePluginId?: string } = {},
   ) {
-    return registry.installCatalog(serverId, catalog, { ...options, client: daemonClient });
+    return registry.installCatalog(
+      serverId,
+      catalog.map((entry) => ({ ...entry, requirements: { paseo: `>=${appPackage.version}` } })),
+      { ...options, client: daemonClient, audio },
+    );
   },
 };
 
diff --git a/packages/app/src/plugins/registry.ts b/packages/app/src/plugins/registry.ts
index d7f5845e5a..e349446bfe 100644
--- a/packages/app/src/plugins/registry.ts
+++ b/packages/app/src/plugins/registry.ts
@@ -1,22 +1,30 @@
+import type { AudioEngine } from "@/audio";
 import { useMemo, useSyncExternalStore } from "react";
 import { QueryClient } from "@tanstack/react-query";
+import { createPaseoApi } from "@getpaseo/client";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { assertPluginCompatibility } from "@getpaseo/protocol/plugin-requirements";
+import { resolveAppVersion } from "@/utils/app-version";
 import { createPluginClientRuntime } from "./client-runtime";
 import { runPluginClientBundle } from "./evaluate";
 import type { InstalledPlugin } from "./types";
 
-interface CatalogPlugin {
-  id: string;
-  clientBundle: string;
-}
+type CatalogPlugin = Awaited<ReturnType<DaemonClient["getPluginCatalog"]>>[number];
 
-class PluginRegistry {
+export class PluginRegistry {
   private readonly byHost = new Map<string, InstalledPlugin[]>();
   private readonly listeners = new Set<() => void>();
   private snapshot: InstalledPlugin[] = [];
   private readonly disposed = new WeakSet<InstalledPlugin>();
   private readonly evaluationErrors = new Map<string, string>();
 
+  constructor(
+    private readonly dependencies: {
+      version: string | null;
+      createRuntime: typeof createPluginClientRuntime;
+    },
+  ) {}
+
   subscribe = (listener: () => void): (() => void) => {
     this.listeners.add(listener);
     return () => this.listeners.delete(listener);
@@ -34,6 +42,7 @@ class PluginRegistry {
     options: {
       replacePluginId?: string;
       client: DaemonClient;
+      audio: Pick<AudioEngine, "play">;
     },
   ): boolean {
     const previous = this.byHost.get(serverId) ?? [];
@@ -45,7 +54,8 @@ class PluginRegistry {
         (plugin) =>
           plugin.id !== options.replacePluginId &&
           plugin.id === entry.id &&
-          plugin.clientBundle === entry.clientBundle,
+          plugin.clientBundle === entry.clientBundle &&
+          plugin.requirements?.paseo === entry.requirements?.paseo,
       );
       return existing ? [existing] : [];
     });
@@ -57,8 +67,10 @@ class PluginRegistry {
     }
     const installed = catalog.flatMap((entry) => {
       const key = `${serverId}/${entry.id}`;
+      let installation: InstalledPlugin | undefined;
       try {
         if (!entry.clientBundle) return [];
+        assertPluginCompatibility({ ...entry, version: this.dependencies.version, runtime: "app" });
         const existing = preserved.find(
           (plugin) => plugin.id === entry.id && plugin.clientBundle === entry.clientBundle,
         );
@@ -66,14 +78,21 @@ class PluginRegistry {
           this.evaluationErrors.delete(key);
           return [existing];
         }
-        const installation: InstalledPlugin = {
+        const client = options.client;
+        installation = {
+          lifetime: new AbortController(),
+          paseo: createPaseoApi(client),
+          invoke: (method, input) => client.invokePluginRpc(entry.id, method, input),
           id: entry.id,
           serverId,
           clientBundle: entry.clientBundle,
+          requirements: entry.requirements,
           queryClient: new QueryClient(),
           cleanup: () => undefined,
           surfaces: [],
-          sidebarItems: [],
+          settingsScreens: [],
+          sidebarItems: { header: [], footer: [] },
+          legacySidebarItems: [],
           workspacePanels: [],
           commandCenterItems: [],
           clientSlashCommands: [],
@@ -82,16 +101,28 @@ class PluginRegistry {
           timelineTransformers: [],
           timelineRenderers: [],
         };
-        const evaluated = runPluginClientBundle(
-          entry.id,
-          entry.clientBundle,
-          createPluginClientRuntime(installation, options.client),
-          () => this.publish(),
+        const runtime = this.dependencies.createRuntime(installation, options.audio);
+        const evaluated = runPluginClientBundle(entry.id, entry.clientBundle, runtime, () =>
+          this.publish(),
         );
         Object.assign(installation, evaluated);
+        const paseo = installation.paseo;
+        installation.cleanup = async () => {
+          const results = await Promise.allSettled([paseo.dispose(), evaluated.cleanup()]);
+          const failures = results.filter((result) => result.status === "rejected");
+          if (failures.length)
+            throw new AggregateError(
+              failures.map((result) => result.reason),
+              "Plugin cleanup failed",
+            );
+        };
         this.evaluationErrors.delete(key);
         return [installation];
       } catch (error) {
+        installation?.lifetime.abort();
+        void installation?.paseo
+          .dispose()
+          .catch((failure) => console.warn(`[Plugins] API cleanup failed for ${key}`, failure));
         this.evaluationErrors.set(key, error instanceof Error ? error.message : String(error));
         console.warn(`[Plugins] Failed to evaluate ${serverId}/${entry.id}`, error);
         return [];
@@ -128,6 +159,7 @@ class PluginRegistry {
   private dispose(plugin: InstalledPlugin): void {
     if (this.disposed.has(plugin)) return;
     this.disposed.add(plugin);
+    plugin.lifetime.abort();
     plugin.queryClient.clear();
     try {
       void Promise.resolve(plugin.cleanup()).catch((error) => {
@@ -148,7 +180,10 @@ class PluginRegistry {
   }
 }
 
-export const pluginRegistry = new PluginRegistry();
+export const pluginRegistry = new PluginRegistry({
+  version: resolveAppVersion(),
+  createRuntime: createPluginClientRuntime,
+});
 
 export function useInstalledPlugins(): InstalledPlugin[] {
   return useSyncExternalStore(
diff --git a/packages/app/src/plugins/routes.test.ts b/packages/app/src/plugins/routes.test.ts
index 18c6bfb1a0..b05b55da6b 100644
--- a/packages/app/src/plugins/routes.test.ts
+++ b/packages/app/src/plugins/routes.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { buildLegacyPluginSurfaceRedirectRoute, buildPluginSurfaceRoute } from "./routes";
+import {
+  buildLegacyPluginSurfaceRedirectRoute,
+  buildPluginSurfaceRoute,
+  parsePluginSurfaceRoute,
+  pluginScreenParamsFromRoute,
+} from "./routes";
 
 describe("buildPluginSurfaceRoute", () => {
   it("keeps direct surfaces and sidebar contributions in separate route namespaces", () => {
@@ -11,9 +16,79 @@ describe("buildPluginSurfaceRoute", () => {
     );
   });
 
+  it("puts screen params in the query under their own prefix, encoded", () => {
+    expect(
+      buildPluginSurfaceRoute(
+        "local",
+        "bots",
+        { kind: "surface", id: "bot" },
+        { botId: "bot 2", "a&b": "x=y" },
+      ),
+    ).toBe("/h/local/plugin/bots/surface/bot?param.botId=bot%202&param.a%26b=x%3Dy");
+    expect(buildPluginSurfaceRoute("local", "bots", { kind: "surface", id: "bot" }, {})).toBe(
+      "/h/local/plugin/bots/surface/bot",
+    );
+  });
+
   it("redirects legacy plugin surface URLs to their sidebar contribution identity", () => {
     expect(buildLegacyPluginSurfaceRedirectRoute("host/one", "review", "overview/item")).toBe(
       "/h/host%2Fone/plugin/review/sidebar/overview%2Fitem",
     );
   });
 });
+
+describe("parsePluginSurfaceRoute", () => {
+  it("reads both route namespaces back from the paths buildPluginSurfaceRoute produces", () => {
+    expect(
+      parsePluginSurfaceRoute(
+        buildPluginSurfaceRoute("host/one", "review", { kind: "surface", id: "overview" }),
+      ),
+    ).toEqual({
+      serverId: "host/one",
+      pluginId: "review",
+      identity: { kind: "surface", id: "overview" },
+    });
+    expect(parsePluginSurfaceRoute("/h/local/plugin/review/sidebar/item")).toEqual({
+      serverId: "local",
+      pluginId: "review",
+      identity: { kind: "sidebar", id: "item" },
+    });
+  });
+
+  it("ignores routes that are not plugin screens", () => {
+    expect(parsePluginSurfaceRoute("/h/local/workspace/abc")).toBeNull();
+    expect(parsePluginSurfaceRoute("/h/local/plugin/review/settings/general")).toBeNull();
+  });
+});
+
+describe("pluginScreenParamsFromRoute", () => {
+  function searchParams(route: string): Record<string, string | string[]> {
+    // Expo Router's search params: the route's segments merged with its query.
+    const url = new URL(route, "http://paseo.test");
+    return {
+      serverId: "local",
+      pluginId: "bots",
+      contributionKind: "surface",
+      contributionId: "bot",
+      ...Object.fromEntries(url.searchParams),
+    };
+  }
+
+  it("round-trips params whose keys match the route's own segments", () => {
+    const params = { serverId: "x", pluginId: "y", botId: "bot-2" };
+    const route = buildPluginSurfaceRoute("local", "bots", { kind: "surface", id: "bot" }, params);
+    expect(pluginScreenParamsFromRoute(searchParams(route))).toEqual(params);
+  });
+
+  it("ignores the route's segments and non-string values", () => {
+    expect(
+      pluginScreenParamsFromRoute({
+        serverId: "local",
+        contributionId: "bot",
+        "param.botId": "bot-2",
+        "param.tags": ["a", "b"],
+        "param.missing": undefined,
+      }),
+    ).toEqual({ botId: "bot-2" });
+  });
+});
diff --git a/packages/app/src/plugins/routes.ts b/packages/app/src/plugins/routes.ts
index d4fbf2ebef..3c51fe4a3b 100644
--- a/packages/app/src/plugins/routes.ts
+++ b/packages/app/src/plugins/routes.ts
@@ -1,16 +1,58 @@
+import type { PluginScreenParams } from "@getpaseo/plugin/client";
 import type { PluginSurfaceContributionIdentity } from "./surface-contribution";
 
 type PluginSurfaceRoute<Kind extends PluginSurfaceContributionIdentity["kind"]> =
   `/h/${string}/plugin/${string}/${Kind}/${string}`;
 
+/**
+ * Expo Router merges the route's segments (`serverId`, `pluginId`, ...) into the same search params
+ * as the query. Prefixing screen param keys keeps any plugin key clear of them.
+ */
+const SCREEN_PARAM_PREFIX = "param.";
+
+/** Screen params ride in the route's query, so reload, history and deep links keep them. */
 export function buildPluginSurfaceRoute<Identity extends PluginSurfaceContributionIdentity>(
   serverId: string,
   pluginId: string,
   identity: Identity,
+  params: PluginScreenParams = {},
 ): PluginSurfaceRoute<Identity["kind"]> {
-  return `/h/${encodeURIComponent(serverId)}/plugin/${encodeURIComponent(pluginId)}/${identity.kind}/${encodeURIComponent(identity.id)}` as PluginSurfaceRoute<
-    Identity["kind"]
-  >;
+  const path = `/h/${encodeURIComponent(serverId)}/plugin/${encodeURIComponent(pluginId)}/${identity.kind}/${encodeURIComponent(identity.id)}`;
+  const query = Object.entries(params)
+    .map(
+      ([key, value]) =>
+        `${encodeURIComponent(SCREEN_PARAM_PREFIX + key)}=${encodeURIComponent(value)}`,
+    )
+    .join("&");
+  return (query ? `${path}?${query}` : path) as PluginSurfaceRoute<Identity["kind"]>;
+}
+
+/** Checks params a plugin passed to `openScreen`: an object of string values. Throws otherwise. */
+export function parsePluginScreenParams(value: unknown): PluginScreenParams {
+  if (value === undefined) return {};
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new Error("Plugin screen params must be an object of strings");
+  }
+  const params: PluginScreenParams = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (typeof entry !== "string") {
+      throw new Error(`Plugin screen param ${key} must be a string`);
+    }
+    params[key] = entry;
+  }
+  return params;
+}
+
+/** The screen params in a plugin screen route's search params (`useLocalSearchParams`). */
+export function pluginScreenParamsFromRoute(
+  routeParams: Readonly<Record<string, string | string[] | undefined>>,
+): PluginScreenParams {
+  const params: PluginScreenParams = {};
+  for (const [key, value] of Object.entries(routeParams)) {
+    if (!key.startsWith(SCREEN_PARAM_PREFIX) || typeof value !== "string") continue;
+    params[key.slice(SCREEN_PARAM_PREFIX.length)] = value;
+  }
+  return params;
 }
 
 export function buildLegacyPluginSurfaceRedirectRoute(
@@ -33,3 +75,21 @@ export function hostIdFromPathname(pathname: string): string | null {
     return null;
   }
 }
+
+export function parsePluginSurfaceRoute(pathname: string): {
+  serverId: string;
+  pluginId: string;
+  identity: PluginSurfaceContributionIdentity;
+} | null {
+  const match = /^\/h\/([^/]+)\/plugin\/([^/]+)\/(sidebar|surface)\/([^/]+)\/?$/.exec(pathname);
+  if (!match) return null;
+  try {
+    return {
+      serverId: decodeURIComponent(match[1]),
+      pluginId: decodeURIComponent(match[2]),
+      identity: { kind: match[3] as "sidebar" | "surface", id: decodeURIComponent(match[4]) },
+    };
+  } catch {
+    return null;
+  }
+}
diff --git a/packages/app/src/plugins/settings/index.tsx b/packages/app/src/plugins/settings/index.tsx
new file mode 100644
index 0000000000..0fda205671
--- /dev/null
+++ b/packages/app/src/plugins/settings/index.tsx
@@ -0,0 +1,158 @@
+import { useCallback, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { router } from "expo-router";
+import { ArrowLeft } from "lucide-react-native";
+import type { PluginHostProps } from "@getpaseo/plugin/client";
+import { Button } from "@/components/ui/button";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { useHostFeature } from "@/runtime/host-features";
+import { useHostRuntimeClient, useHostRuntimeIsConnected, useHosts } from "@/runtime/host-runtime";
+import type { Theme } from "@/styles/theme";
+import { useInstalledPlugin } from "../registry";
+import { PluginInstallationProvider } from "../installation-provider";
+import { SurfaceErrorBoundary } from "../surface-error-boundary";
+import { toPluginTheme } from "../theme";
+import { buildPluginSettingsRoute } from "./routes";
+
+interface SettingsIdentity {
+  serverId: string;
+  pluginId: string;
+  screenId: string;
+}
+
+function PluginSettingsMenuItem({
+  serverId,
+  pluginId,
+  screenId,
+  title,
+  disabled,
+}: SettingsIdentity & { title: string; disabled?: boolean }) {
+  const open = useCallback(
+    () => router.push(buildPluginSettingsRoute(serverId, pluginId, screenId)),
+    [serverId, pluginId, screenId],
+  );
+  return (
+    <DropdownMenuItem onSelect={open} disabled={disabled}>
+      {title}
+    </DropdownMenuItem>
+  );
+}
+
+export function PluginSettingsMenuItems({
+  serverId,
+  pluginId,
+  disabled,
+}: Omit<SettingsIdentity, "screenId"> & { disabled?: boolean }) {
+  const plugin = useInstalledPlugin(serverId, pluginId);
+  const supported = useHostFeature(serverId, "pluginSettings");
+  if (!supported || !plugin) return null;
+  return (
+    <>
+      {plugin.settingsScreens.map((screen) => (
+        <PluginSettingsMenuItem
+          key={screen.id}
+          serverId={serverId}
+          pluginId={pluginId}
+          screenId={screen.id}
+          title={screen.title}
+          disabled={disabled}
+        />
+      ))}
+    </>
+  );
+}
+
+function SettingsContent({
+  serverId,
+  pluginId,
+  screenId,
+  theme,
+}: SettingsIdentity & { theme: PluginHostProps["theme"] }) {
+  const { t } = useTranslation();
+  const plugin = useInstalledPlugin(serverId, pluginId);
+  const client = useHostRuntimeClient(serverId);
+  const connected = useHostRuntimeIsConnected(serverId);
+  const supported = useHostFeature(serverId, "pluginSettings");
+  const compact = useIsCompactFormFactor();
+  const hosts = useHosts();
+  const [attempt, setAttempt] = useState(0);
+  const screen = plugin?.settingsScreens.find((item) => item.id === screenId);
+  const retry = useCallback(() => setAttempt((value) => value + 1), []);
+  const renderError = useCallback(
+    (error: string) => (
+      <View>
+        <Text style={styles.message}>{error}</Text>
+        <Button variant="outline" size="sm" onPress={retry}>
+          {t("common.actions.retry")}
+        </Button>
+      </View>
+    ),
+    [retry, t],
+  );
+  const host = useMemo(
+    () => ({
+      id: serverId,
+      label: hosts.find((candidate) => candidate.serverId === serverId)?.label ?? serverId,
+    }),
+    [hosts, serverId],
+  );
+  const platform = Platform.OS === "ios" || Platform.OS === "android" ? Platform.OS : "web";
+  const layout = useMemo<PluginHostProps["layout"]>(
+    () => ({ compact, platform }),
+    [compact, platform],
+  );
+  if (!connected)
+    return <Text style={styles.message}>{t("settings.plugins.screens.offline")}</Text>;
+  // COMPAT(pluginSettings): added in v0.8, remove after 2027-03-05.
+  if (!supported) return <Text style={styles.message}>{t("settings.plugins.screens.update")}</Text>;
+  if (!plugin || !screen || !client)
+    return <Text style={styles.message}>{t("settings.plugins.screens.unavailable")}</Text>;
+  const Component = screen.Component;
+  return (
+    <View>
+      <SurfaceErrorBoundary
+        installation={plugin}
+        Surface={Component}
+        resetKey={attempt}
+        renderError={renderError}
+      >
+        <PluginInstallationProvider plugin={plugin}>
+          <Component theme={theme} layout={layout} host={host} />
+        </PluginInstallationProvider>
+      </SurfaceErrorBoundary>
+    </View>
+  );
+}
+const ThemedSettingsContent = withUnistyles(SettingsContent);
+// Settings routes carry no screen params.
+const themeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
+export function PluginSettingsContent({
+  onBackToPlugins,
+  showBackToPlugins,
+  ...identity
+}: SettingsIdentity & { onBackToPlugins: () => void; showBackToPlugins: boolean }) {
+  const { t } = useTranslation();
+  return (
+    <View>
+      {showBackToPlugins ? (
+        <Button
+          onPress={onBackToPlugins}
+          variant="ghost"
+          size="sm"
+          leftIcon={ArrowLeft}
+          style={styles.backButton}
+        >
+          {t("settings.plugins.screens.backToPlugins")}
+        </Button>
+      ) : null}
+      <ThemedSettingsContent {...identity} uniProps={themeMapping} />
+    </View>
+  );
+}
+const styles = StyleSheet.create((theme) => ({
+  message: { color: theme.colors.foregroundMuted },
+  backButton: { alignSelf: "flex-start", paddingHorizontal: 0, marginBottom: theme.spacing[4] },
+}));
diff --git a/packages/app/src/plugins/settings/routes.ts b/packages/app/src/plugins/settings/routes.ts
new file mode 100644
index 0000000000..be2fcfe897
--- /dev/null
+++ b/packages/app/src/plugins/settings/routes.ts
@@ -0,0 +1,6 @@
+export function buildPluginSettingsRoute(serverId: string, pluginId: string, screenId: string) {
+  return {
+    pathname: "/settings/hosts/[serverId]/plugins/[pluginId]/[screenId]" as const,
+    params: { serverId, pluginId, screenId },
+  };
+}
diff --git a/packages/app/src/plugins/settings/use-settings.ts b/packages/app/src/plugins/settings/use-settings.ts
new file mode 100644
index 0000000000..0cefc1878f
--- /dev/null
+++ b/packages/app/src/plugins/settings/use-settings.ts
@@ -0,0 +1,85 @@
+import type { SettingsState } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useRpc } from "@getpaseo/plugin/client";
+import { type SettingsDefinition } from "@getpaseo/plugin";
+import { settingsRpc } from "@getpaseo/plugin";
+import { useReplicaQuery } from "@/data/query";
+import { z, type ZodType } from "zod";
+
+export const pluginSettingsKey = (id: string) => ["plugin-settings", id] as const;
+function message(error: unknown): string {
+  if (error instanceof z.ZodError) return error.issues.map((issue) => issue.message).join("\n");
+  return error instanceof Error ? error.message : String(error);
+}
+
+export function useSettings<Schema extends ZodType>(
+  definition: SettingsDefinition<Schema>,
+): SettingsState<Schema> {
+  const rpc = useMemo(() => settingsRpc(definition.id), [definition.id]);
+  const read = useRpc(rpc.read);
+  const write = useRpc(rpc.write);
+  const reset = useRpc(rpc.reset);
+  const client = useQueryClient();
+  const key = pluginSettingsKey(definition.id);
+  const query = useReplicaQuery({
+    queryKey: key,
+    pushEvent: "plugin_settings_changed",
+    queryFn: () => read({}),
+    retry: false,
+  });
+  const mutation = useMutation({
+    mutationFn: async (
+      input: { revision: string; values: z.output<Schema> } | { revision: string },
+    ) => {
+      const result =
+        "values" in input
+          ? await write({
+              revision: input.revision,
+              values: z.json().parse(await definition.schema.parseAsync(input.values)),
+            })
+          : await reset(input);
+      if (result.status !== "saved") throw new Error(result.error);
+      client.setQueryData(key, { ...result, status: "ready" });
+    },
+  });
+  async function save(values: z.output<Schema>, revision: string) {
+    try {
+      await mutation.mutateAsync({ values, revision });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async function resetValues() {
+    if (!query.data) return false;
+    try {
+      await mutation.mutateAsync({ revision: query.data.revision });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  const actions = {
+    saving: mutation.isPending,
+    saveError: mutation.error ? message(mutation.error) : null,
+    save,
+    reset: resetValues,
+    reload: async () => {
+      mutation.reset();
+      await query.refetch();
+    },
+  };
+  if (query.isPending) return { ...actions, status: "loading" };
+  if (query.isError) return { ...actions, status: "error", error: message(query.error) };
+  if (query.data.status === "invalid") return { ...actions, ...query.data };
+  const parsed = definition.schema.safeParse(query.data.values);
+  if (!parsed.success)
+    return {
+      ...actions,
+      status: "invalid",
+      revision: query.data.revision,
+      error: parsed.error.message,
+    };
+  return { ...actions, ...query.data, values: parsed.data };
+}
diff --git a/packages/app/src/plugins/sidebar-groups.test.ts b/packages/app/src/plugins/sidebar-groups.test.ts
index dbecea7662..314e5fe1e7 100644
--- a/packages/app/src/plugins/sidebar-groups.test.ts
+++ b/packages/app/src/plugins/sidebar-groups.test.ts
@@ -1,24 +1,35 @@
 import { QueryClient } from "@tanstack/react-query";
 import { describe, expect, it } from "vitest";
 import type { InstalledPlugin } from "./types";
-import { groupPluginSidebarContributions } from "./sidebar-groups";
+import {
+  legacySidebarItemHostKey,
+  pluginScreensHostKey,
+  rememberPluginContributionHost,
+} from "./contribution-host";
+import { groupPluginSidebarItems, selectPluginSidebarTarget } from "./sidebar-groups";
 
-function installed(serverId: string, contributionId = "main"): InstalledPlugin {
+function installed(
+  serverId: string,
+  contributionId = "main",
+  legacySidebarItems: InstalledPlugin["legacySidebarItems"] = [],
+  pluginId = "example",
+): InstalledPlugin {
   return {
-    id: "example",
+    id: pluginId,
     cleanup: () => undefined,
     serverId,
     clientBundle: serverId,
+    lifetime: new AbortController(),
     queryClient: new QueryClient(),
-    surfaces: [{ id: "surface", Component: () => null }],
-    sidebarItems: [
-      {
-        id: contributionId,
-        title: "Example",
-        icon: "Blocks",
-        surface: "surface",
-      },
-    ],
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
+    settingsScreens: [],
+    surfaces: [{ id: "surface", title: "Surface", Component: () => null }],
+    sidebarItems: {
+      header: [{ id: contributionId, title: "Example", Component: () => null }],
+      footer: [{ id: "status", title: "Status", Component: () => null }],
+    },
+    legacySidebarItems,
     workspacePanels: [],
     commandCenterItems: [],
     clientSlashCommands: [],
@@ -29,9 +40,9 @@ function installed(serverId: string, contributionId = "main"): InstalledPlugin {
   };
 }
 
-describe("groupPluginSidebarContributions", () => {
+describe("groupPluginSidebarItems", () => {
   it("coalesces the same plugin contribution across hosts", () => {
-    const groups = groupPluginSidebarContributions([installed("host-a"), installed("host-b")]);
+    const groups = groupPluginSidebarItems([installed("host-a"), installed("host-b")], "header");
 
     expect(groups).toHaveLength(1);
     expect(groups[0]?.targets.map((target) => target.plugin.serverId)).toEqual([
@@ -41,14 +52,66 @@ describe("groupPluginSidebarContributions", () => {
   });
 
   it("keeps different contribution ids separate", () => {
-    const groups = groupPluginSidebarContributions([
-      installed("host-a", "main"),
-      installed("host-b", "settings"),
-    ]);
+    const groups = groupPluginSidebarItems(
+      [installed("host-a", "main"), installed("host-b", "settings")],
+      "header",
+    );
 
     expect(groups.map((group) => group.key)).toEqual([
       "example/sidebar/main",
       "example/sidebar/settings",
     ]);
   });
+
+  it("keeps a legacy addSidebarItem as its own kind, with its icon, in the header only", () => {
+    const legacy = [{ id: "entry", title: "Legacy", icon: "Blocks", surface: "surface" }];
+    const plugins = [installed("host-a", "main", legacy), installed("host-b", "main", legacy)];
+    const [legacyGroup, itemGroup] = groupPluginSidebarItems(plugins, "header");
+
+    expect(legacyGroup).toMatchObject({ kind: "legacy", title: "Legacy", icon: "Blocks" });
+    expect(legacyGroup?.targets.map((target) => target.plugin.serverId)).toEqual([
+      "host-a",
+      "host-b",
+    ]);
+    expect(itemGroup?.kind).toBe("item");
+    expect(groupPluginSidebarItems(plugins, "footer").map((group) => group.kind)).toEqual(["item"]);
+  });
+
+  it("groups only the requested section", () => {
+    const groups = groupPluginSidebarItems([installed("host-a")], "footer");
+
+    expect(groups.map((group) => group.key)).toEqual(["example/sidebar-footer/status"]);
+  });
+});
+
+describe("selectPluginSidebarTarget", () => {
+  const legacy = [{ id: "entry", title: "Legacy", icon: "Blocks", surface: "surface" }];
+
+  function hostsOf(section: "header" | "footer", pluginId: string) {
+    const plugins = ["host-a", "host-b"].map((serverId) =>
+      installed(serverId, "main", legacy, pluginId),
+    );
+    return groupPluginSidebarItems(plugins, section).map(
+      (group) => selectPluginSidebarTarget(group, null).plugin.serverId,
+    );
+  }
+
+  it("prefers the current route's host", () => {
+    const [group] = groupPluginSidebarItems([installed("host-a"), installed("host-b")], "footer");
+    expect(selectPluginSidebarTarget(group!, "host-b").plugin.serverId).toBe("host-b");
+  });
+
+  it("carries the host picked on any of a plugin's screens to all its items, but not legacy rows", () => {
+    expect(hostsOf("header", "screens")).toEqual(["host-a", "host-a"]);
+    rememberPluginContributionHost(pluginScreensHostKey("screens"), "host-b");
+    // Header: the legacy row keeps its own host; the item follows the screens' host.
+    expect(hostsOf("header", "screens")).toEqual(["host-a", "host-b"]);
+    expect(hostsOf("footer", "screens")).toEqual(["host-b"]);
+    expect(hostsOf("footer", "other")).toEqual(["host-a"]);
+  });
+
+  it("keeps a legacy row's host under its own key", () => {
+    rememberPluginContributionHost(legacySidebarItemHostKey("legacy-row", "entry"), "host-b");
+    expect(hostsOf("header", "legacy-row")).toEqual(["host-b", "host-a"]);
+  });
 });
diff --git a/packages/app/src/plugins/sidebar-groups.ts b/packages/app/src/plugins/sidebar-groups.ts
index 05c868f283..c764a53dcc 100644
--- a/packages/app/src/plugins/sidebar-groups.ts
+++ b/packages/app/src/plugins/sidebar-groups.ts
@@ -1,29 +1,65 @@
-import type { InstalledPlugin, PluginSidebarContribution } from "./types";
+import {
+  getPreferredPluginContributionHost,
+  legacySidebarItemHostKey,
+  pluginScreensHostKey,
+} from "./contribution-host";
+import type {
+  InstalledPlugin,
+  PluginSidebarContribution,
+  PluginSidebarItemContribution,
+  PluginSidebarSection,
+} from "./types";
 
 export interface PluginSidebarTarget {
+  plugin: InstalledPlugin;
+  item: PluginSidebarItemContribution;
+}
+
+// COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+export interface PluginLegacySidebarTarget {
   plugin: InstalledPlugin;
   item: PluginSidebarContribution;
 }
 
-export interface PluginSidebarGroup {
+interface PluginSidebarGroupBase {
   key: string;
   pluginId: string;
   contributionId: string;
   title: string;
-  icon: string;
-  targets: PluginSidebarTarget[];
 }
 
-export function groupPluginSidebarContributions(plugins: InstalledPlugin[]): PluginSidebarGroup[] {
+/**
+ * One sidebar item, coalesced across every host that contributes it. A `legacy` group is an
+ * `addSidebarItem` row: the app draws it with its registered icon and it opens its sidebar route.
+ */
+export type PluginSidebarGroup =
+  | (PluginSidebarGroupBase & { kind: "item"; targets: PluginSidebarTarget[] })
+  | (PluginSidebarGroupBase & {
+      kind: "legacy";
+      icon: string;
+      targets: PluginLegacySidebarTarget[];
+    });
+
+function groupKey(pluginId: string, section: PluginSidebarSection, itemId: string) {
+  return section === "header"
+    ? legacySidebarItemHostKey(pluginId, itemId)
+    : `${pluginId}/sidebar-${section}/${itemId}`;
+}
+
+export function groupPluginSidebarItems(
+  plugins: InstalledPlugin[],
+  section: PluginSidebarSection,
+): PluginSidebarGroup[] {
   const groups = new Map<string, PluginSidebarGroup>();
   for (const plugin of plugins) {
-    for (const item of plugin.sidebarItems) {
-      const key = `${plugin.id}/sidebar/${item.id}`;
+    const legacyItems = section === "header" ? plugin.legacySidebarItems : [];
+    for (const item of legacyItems) {
+      const key = groupKey(plugin.id, section, item.id);
       const existing = groups.get(key);
-      if (existing) {
-        existing.targets.push({ plugin, item });
-      } else {
+      if (existing?.kind === "legacy") existing.targets.push({ plugin, item });
+      else if (!existing) {
         groups.set(key, {
+          kind: "legacy",
           key,
           pluginId: plugin.id,
           contributionId: item.id,
@@ -33,6 +69,41 @@ export function groupPluginSidebarContributions(plugins: InstalledPlugin[]): Plu
         });
       }
     }
+    for (const item of plugin.sidebarItems[section]) {
+      const key = groupKey(plugin.id, section, item.id);
+      const existing = groups.get(key);
+      if (existing?.kind === "item") existing.targets.push({ plugin, item });
+      else if (!existing) {
+        groups.set(key, {
+          kind: "item",
+          key,
+          pluginId: plugin.id,
+          contributionId: item.id,
+          title: item.title,
+          targets: [{ plugin, item }],
+        });
+      }
+    }
   }
   return [...groups.values()];
 }
+
+/**
+ * The host a group's row uses: the current route's host, else the remembered one, else the first.
+ * A legacy row remembers its own host; other items share the host last used with the plugin's
+ * screens.
+ */
+export function selectPluginSidebarTarget<Group extends PluginSidebarGroup>(
+  group: Group,
+  currentHostId: string | null,
+): Group["targets"][number] {
+  const rememberedHostId = getPreferredPluginContributionHost(
+    group.kind === "legacy" ? group.key : pluginScreensHostKey(group.pluginId),
+  );
+  const targets: Group["targets"] = group.targets;
+  return (
+    targets.find((target) => target.plugin.serverId === currentHostId) ??
+    targets.find((target) => target.plugin.serverId === rememberedHostId) ??
+    targets[0]
+  );
+}
diff --git a/packages/app/src/plugins/sidebar-items.tsx b/packages/app/src/plugins/sidebar-items.tsx
deleted file mode 100644
index 97c0c6fa6d..0000000000
--- a/packages/app/src/plugins/sidebar-items.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { router, usePathname } from "expo-router";
-import { useCallback } from "react";
-import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
-import { resolvePluginIcon } from "./icons";
-import { buildPluginSurfaceRoute, hostIdFromPathname } from "./routes";
-import {
-  getPreferredPluginContributionHost,
-  rememberPluginContributionHost,
-} from "./contribution-host";
-import { type PluginSidebarGroup, type PluginSidebarTarget } from "./sidebar-groups";
-
-function selectTarget(
-  group: PluginSidebarGroup,
-  currentHostId: string | null,
-): PluginSidebarTarget {
-  const current = group.targets.find((target) => target.plugin.serverId === currentHostId);
-  if (current) return current;
-  const rememberedHostId = getPreferredPluginContributionHost(group.key);
-  const remembered = group.targets.find((target) => target.plugin.serverId === rememberedHostId);
-  return remembered ?? group.targets[0];
-}
-
-export function PluginSidebarItemRow({
-  group,
-  onBeforeNavigate,
-}: {
-  group: PluginSidebarGroup;
-  onBeforeNavigate?: () => void;
-}) {
-  const pathname = usePathname();
-  const target = selectTarget(group, hostIdFromPathname(pathname));
-  const route = buildPluginSurfaceRoute(target.plugin.serverId, group.pluginId, {
-    kind: "sidebar",
-    id: group.contributionId,
-  });
-  const isActive = group.targets.some(
-    (candidate) =>
-      pathname ===
-      buildPluginSurfaceRoute(candidate.plugin.serverId, group.pluginId, {
-        kind: "sidebar",
-        id: group.contributionId,
-      }),
-  );
-  const navigate = useCallback(() => {
-    rememberPluginContributionHost(group.key, target.plugin.serverId);
-    onBeforeNavigate?.();
-    router.push(route);
-  }, [group.key, onBeforeNavigate, route, target.plugin.serverId]);
-  return (
-    <SidebarHeaderRow
-      icon={resolvePluginIcon(group.icon)}
-      label={group.title}
-      onPress={navigate}
-      isActive={isActive}
-      testID={`plugin-sidebar-${group.pluginId}-${group.contributionId}`}
-      variant="compact"
-    />
-  );
-}
diff --git a/packages/app/src/plugins/sidebar-items/frame.ts b/packages/app/src/plugins/sidebar-items/frame.ts
new file mode 100644
index 0000000000..f5f42e5d56
--- /dev/null
+++ b/packages/app/src/plugins/sidebar-items/frame.ts
@@ -0,0 +1,23 @@
+import { createContext, useContext } from "react";
+import type { View } from "react-native";
+import type { PluginSidebarSection } from "../types";
+
+/** What the host tells the kit components about the sidebar item they render in. */
+export interface SidebarItemFrame {
+  section: PluginSidebarSection;
+  title: string;
+  testID: string;
+  /** A row calls this before its `onPress`, so a popover that press opens anchors to it. */
+  anchorTo: (node: View | null) => void;
+  /** Rows offer themselves on mount, so a popover opened without a press anchors to a row. */
+  offerAnchor: (node: View | null) => void;
+  releaseAnchor: (node: View | null) => void;
+}
+
+export const SidebarItemFrameContext = createContext<SidebarItemFrame | null>(null);
+
+export function useSidebarItemFrame(componentName: string): SidebarItemFrame {
+  const frame = useContext(SidebarItemFrameContext);
+  if (!frame) throw new Error(`${componentName} must render inside a sidebar item`);
+  return frame;
+}
diff --git a/packages/app/src/plugins/sidebar-items/index.tsx b/packages/app/src/plugins/sidebar-items/index.tsx
new file mode 100644
index 0000000000..11657c5d35
--- /dev/null
+++ b/packages/app/src/plugins/sidebar-items/index.tsx
@@ -0,0 +1,245 @@
+import type {
+  PluginHostProps,
+  PluginOpenScreenInput,
+  PluginPopoverProps,
+  PluginScreenLocation,
+  PluginSidebarItemProps,
+} from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
+import { router, useGlobalSearchParams, usePathname } from "expo-router";
+import { useCallback, useMemo, useState, type ComponentType, type RefObject } from "react";
+import { type View } from "react-native";
+import { withUnistyles } from "react-native-unistyles";
+import {
+  SidebarPopoverRoot,
+  SidebarPopoverSurface,
+  useSidebarPopoverAnchor,
+} from "@/components/sidebar/sidebar-popover";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { useToast } from "@/contexts/toast-context";
+import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
+import type { Theme } from "@/styles/theme";
+import { createPluginClientStateSource } from "../client-state/source";
+import { pluginScreensHostKey, rememberPluginContributionHost } from "../contribution-host";
+import {
+  PluginEnvironmentProvider,
+  PluginPopoverContent,
+  type PluginEnvironment,
+} from "../popover";
+import { buildPluginSurfaceRoute, hostIdFromPathname } from "../routes";
+import {
+  selectPluginSidebarTarget,
+  type PluginSidebarGroup,
+  type PluginSidebarTarget,
+} from "../sidebar-groups";
+import { currentPluginScreen, parsePluginOpenScreenInput } from "../surface-contribution";
+import { SurfaceErrorBoundary } from "../surface-error-boundary";
+import { toPluginTheme } from "../theme";
+import type { PluginSidebarSection } from "../types";
+import { SidebarItemFrameContext, type SidebarItemFrame } from "./frame";
+import { LegacyPluginSidebarRow } from "./legacy";
+import { resolvePluginPlatform } from "../platform";
+
+export { SidebarRow, SidebarSeparator } from "./kit";
+
+type PopoverContent = ComponentType<PluginPopoverProps>;
+
+const pluginThemeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
+
+type PluginItemGroup = Extract<PluginSidebarGroup, { kind: "item" }>;
+
+function renderNothing() {
+  return null;
+}
+
+interface PluginSidebarItemEntryProps {
+  group: PluginSidebarGroup;
+  section: PluginSidebarSection;
+  /** Anchors a popover opened by an item that renders no kit component. */
+  fallbackAnchorRef: RefObject<View | null>;
+  onBeforeNavigate?: () => void;
+}
+
+type PluginSidebarItemHostProps = Omit<PluginSidebarItemEntryProps, "group"> & {
+  group: PluginItemGroup;
+};
+
+/**
+ * One plugin sidebar item. Renders the item's `Component` from the host `selectPluginSidebarTarget` picks,
+ * inside the plugin's runtime and its own error boundary: a throwing item renders nothing. A legacy
+ * `addSidebarItem` group renders the app's own row.
+ */
+export function PluginSidebarItem({ group, ...props }: PluginSidebarItemEntryProps) {
+  if (group.kind === "legacy") {
+    return <LegacyPluginSidebarRow group={group} onBeforeNavigate={props.onBeforeNavigate} />;
+  }
+  return <ThemedPluginSidebarItem {...props} group={group} uniProps={pluginThemeMapping} />;
+}
+
+function PluginSidebarItemHost({
+  group,
+  section,
+  fallbackAnchorRef,
+  onBeforeNavigate,
+  theme,
+}: PluginSidebarItemHostProps & { theme: PluginTheme }) {
+  const pathname = usePathname();
+  const routeParams = useGlobalSearchParams();
+  const { plugin, item } = selectPluginSidebarTarget(group, hostIdFromPathname(pathname));
+  const client = useHostRuntimeClient(plugin.serverId);
+  const toast = useToast();
+  // The content outlives `open` so the surface can play its exit and native sheet teardown.
+  const [popover, setPopover] = useState<PopoverContent | null>(null);
+  const [popoverOpen, setPopoverOpen] = useState(false);
+  const environment = useMemo<PluginEnvironment | null>(
+    () =>
+      client
+        ? {
+            installation: plugin,
+            toast,
+            state: createPluginClientStateSource(plugin.serverId),
+          }
+        : null,
+    [client, plugin, toast],
+  );
+  const showPopover = useCallback((content: PopoverContent | null) => {
+    // A function passed to a state setter is an updater, so wrap the component.
+    if (content) setPopover(() => content);
+    setPopoverOpen(content !== null);
+  }, []);
+  const handleOpenChange = useCallback((open: boolean) => {
+    if (!open) setPopoverOpen(false);
+  }, []);
+  if (!environment) return null;
+  return (
+    <SurfaceErrorBoundary
+      installation={plugin}
+      Surface={item.Component}
+      renderError={renderNothing}
+    >
+      <PluginEnvironmentProvider environment={environment}>
+        <SidebarPopoverRoot open={popoverOpen} onOpenChange={handleOpenChange}>
+          <SidebarItemContent
+            plugin={plugin}
+            item={item}
+            section={section}
+            theme={theme}
+            currentScreen={currentPluginScreen(plugin, pathname, routeParams)}
+            environment={environment}
+            popover={popover}
+            showPopover={showPopover}
+            fallbackAnchorRef={fallbackAnchorRef}
+            onBeforeNavigate={onBeforeNavigate}
+          />
+        </SidebarPopoverRoot>
+      </PluginEnvironmentProvider>
+    </SurfaceErrorBoundary>
+  );
+}
+
+const ThemedPluginSidebarItem = withUnistyles(PluginSidebarItemHost);
+
+function SidebarItemContent({
+  plugin,
+  item,
+  section,
+  theme,
+  currentScreen,
+  environment,
+  popover,
+  showPopover,
+  fallbackAnchorRef,
+  onBeforeNavigate,
+}: {
+  plugin: PluginSidebarTarget["plugin"];
+  item: PluginSidebarTarget["item"];
+  section: PluginSidebarSection;
+  theme: PluginTheme;
+  currentScreen: PluginScreenLocation | null;
+  environment: PluginEnvironment;
+  popover: PopoverContent | null;
+  showPopover: (content: PopoverContent | null) => void;
+  fallbackAnchorRef: RefObject<View | null>;
+  onBeforeNavigate?: () => void;
+}) {
+  const { anchorTo, offerAnchor, releaseAnchor, anchorToFallback } =
+    useSidebarPopoverAnchor("PluginSidebarItem");
+  const hosts = useHosts();
+  const compact = useIsCompactFormFactor();
+  const hostLabel =
+    hosts.find((host) => host.serverId === plugin.serverId)?.label ?? plugin.serverId;
+
+  const hostProps = useMemo<PluginHostProps>(
+    () => ({
+      theme,
+      host: { id: plugin.serverId, label: hostLabel },
+      layout: { compact, platform: resolvePluginPlatform() },
+    }),
+    [compact, hostLabel, plugin.serverId, theme],
+  );
+  const openScreen = useCallback(
+    (input: PluginOpenScreenInput) => {
+      const { screenId, params } = parsePluginOpenScreenInput(plugin, input);
+      rememberPluginContributionHost(pluginScreensHostKey(plugin.id), plugin.serverId);
+      showPopover(null);
+      onBeforeNavigate?.();
+      router.push(
+        buildPluginSurfaceRoute(
+          plugin.serverId,
+          plugin.id,
+          { kind: "surface", id: screenId },
+          params,
+        ),
+      );
+    },
+    [onBeforeNavigate, plugin, showPopover],
+  );
+  const openPopover = useCallback(
+    (Content: PopoverContent) => {
+      anchorToFallback(fallbackAnchorRef);
+      showPopover(Content);
+    },
+    [anchorToFallback, fallbackAnchorRef, showPopover],
+  );
+  const close = useCallback(() => showPopover(null), [showPopover]);
+  const frame = useMemo<SidebarItemFrame>(
+    () => ({
+      section,
+      title: item.title,
+      testID:
+        section === "header"
+          ? `plugin-sidebar-${plugin.id}-${item.id}`
+          : `plugin-sidebar-${section}-${plugin.id}-${item.id}`,
+      anchorTo,
+      offerAnchor,
+      releaseAnchor,
+    }),
+    [anchorTo, item.id, item.title, offerAnchor, plugin.id, releaseAnchor, section],
+  );
+  const itemProps = useMemo<PluginSidebarItemProps>(
+    () => ({ ...hostProps, currentScreen, openScreen, openPopover }),
+    [currentScreen, hostProps, openPopover, openScreen],
+  );
+  const Item = item.Component;
+  const Popover = popover;
+  return (
+    <SidebarItemFrameContext.Provider value={frame}>
+      <Item {...itemProps} />
+      {Popover ? (
+        <SidebarPopoverSurface
+          section={section}
+          title={item.title}
+          testID={`${frame.testID}-popover`}
+        >
+          <SurfaceErrorBoundary installation={plugin} Surface={Popover}>
+            <PluginEnvironmentProvider environment={environment}>
+              <PluginPopoverContent>
+                <Popover {...hostProps} close={close} openScreen={openScreen} />
+              </PluginPopoverContent>
+            </PluginEnvironmentProvider>
+          </SurfaceErrorBoundary>
+        </SidebarPopoverSurface>
+      ) : null}
+    </SidebarItemFrameContext.Provider>
+  );
+}
diff --git a/packages/app/src/plugins/sidebar-items/kit.tsx b/packages/app/src/plugins/sidebar-items/kit.tsx
new file mode 100644
index 0000000000..5796d572ca
--- /dev/null
+++ b/packages/app/src/plugins/sidebar-items/kit.tsx
@@ -0,0 +1,72 @@
+import type { SidebarIcon, SidebarRowProps } from "@getpaseo/plugin/client/ui";
+import { useCallback, useEffect, useRef } from "react";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
+import { SidebarSeparator as AppSidebarSeparator } from "@/components/sidebar/sidebar-separator";
+import { resolvePluginIcon } from "../icons";
+import { useSidebarItemFrame } from "./frame";
+
+function resolveIcon(icon: SidebarIcon) {
+  return typeof icon === "string" ? resolvePluginIcon(icon) : icon;
+}
+
+/**
+ * An item may render several rows. Any press inside a row, on the row or on its trailing content,
+ * makes that row the popover anchor: the capture-phase responder check runs before the pressed
+ * child claims the touch (native and web), and returns false so the child still handles it.
+ */
+export function SidebarRow({ id, icon, label, onPress, active, trailing }: SidebarRowProps) {
+  const frame = useSidebarItemFrame("SidebarRow");
+  const { anchorTo, offerAnchor, releaseAnchor } = frame;
+  const rowRef = useRef<View | null>(null);
+  useEffect(() => {
+    const node = rowRef.current;
+    offerAnchor(node);
+    return () => releaseAnchor(node);
+  }, [offerAnchor, releaseAnchor]);
+  const anchorHere = useCallback(() => {
+    anchorTo(rowRef.current);
+    return false;
+  }, [anchorTo]);
+  // Keyboard activation skips the responder system, so the row's own press anchors as well.
+  const handlePress = useCallback(() => {
+    anchorTo(rowRef.current);
+    onPress();
+  }, [anchorTo, onPress]);
+  return (
+    <View ref={rowRef} collapsable={false} onStartShouldSetResponderCapture={anchorHere}>
+      <SidebarHeaderRow
+        icon={icon ? resolveIcon(icon) : null}
+        label={label ?? frame.title}
+        onPress={handlePress}
+        isActive={active}
+        trailing={trailing}
+        testID={id ? `${frame.testID}-${id}` : frame.testID}
+        variant={frame.section === "footer" ? "inline" : "compact"}
+      />
+    </View>
+  );
+}
+
+/** The sidebar's separator line, run edge to edge across the section like the app's own. */
+export function SidebarSeparator() {
+  const frame = useSidebarItemFrame("SidebarSeparator");
+  return (
+    <View style={frame.section === "footer" ? styles.footer : styles.header}>
+      <AppSidebarSeparator />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  // Header rows fill the sidebar width; the gap between them is 2px.
+  header: {
+    marginVertical: theme.spacing[1],
+  },
+  // The footer pads its rows by `spacing[2]` and spaces them `spacing[1]` apart.
+  footer: {
+    marginHorizontal: -theme.spacing[2],
+    marginVertical: theme.spacing[0.5],
+  },
+}));
diff --git a/packages/app/src/plugins/sidebar-items/legacy.tsx b/packages/app/src/plugins/sidebar-items/legacy.tsx
new file mode 100644
index 0000000000..94d3e69029
--- /dev/null
+++ b/packages/app/src/plugins/sidebar-items/legacy.tsx
@@ -0,0 +1,44 @@
+import { router, usePathname } from "expo-router";
+import { useCallback } from "react";
+import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
+import { rememberPluginContributionHost } from "../contribution-host";
+import { resolvePluginIcon } from "../icons";
+import { buildPluginSurfaceRoute, hostIdFromPathname } from "../routes";
+import { selectPluginSidebarTarget, type PluginSidebarGroup } from "../sidebar-groups";
+
+// COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+/**
+ * An `addSidebarItem({ id, title, icon, surface })` row. It opens `/sidebar/<id>`, so the screen's
+ * header and host switcher belong to this item.
+ */
+export function LegacyPluginSidebarRow({
+  group,
+  onBeforeNavigate,
+}: {
+  group: Extract<PluginSidebarGroup, { kind: "legacy" }>;
+  onBeforeNavigate?: () => void;
+}) {
+  const pathname = usePathname();
+  const identity = { kind: "sidebar", id: group.contributionId } as const;
+  const target = selectPluginSidebarTarget(group, hostIdFromPathname(pathname));
+  const route = buildPluginSurfaceRoute(target.plugin.serverId, group.pluginId, identity);
+  const isActive = group.targets.some(
+    (candidate) =>
+      pathname === buildPluginSurfaceRoute(candidate.plugin.serverId, group.pluginId, identity),
+  );
+  const navigate = useCallback(() => {
+    rememberPluginContributionHost(group.key, target.plugin.serverId);
+    onBeforeNavigate?.();
+    router.push(route);
+  }, [group.key, onBeforeNavigate, route, target.plugin.serverId]);
+  return (
+    <SidebarHeaderRow
+      icon={resolvePluginIcon(group.icon)}
+      label={group.title}
+      onPress={navigate}
+      isActive={isActive}
+      testID={`plugin-sidebar-${group.pluginId}-${group.contributionId}`}
+      variant="compact"
+    />
+  );
+}
diff --git a/packages/app/src/plugins/surface-contribution.test.ts b/packages/app/src/plugins/surface-contribution.test.ts
index 653bac17bd..90672ed435 100644
--- a/packages/app/src/plugins/surface-contribution.test.ts
+++ b/packages/app/src/plugins/surface-contribution.test.ts
@@ -2,7 +2,10 @@ import { QueryClient } from "@tanstack/react-query";
 import { describe, expect, it } from "vitest";
 import type { InstalledPlugin } from "./types";
 import {
+  currentPluginScreen,
   getPluginSurfaceContributionServerIds,
+  parsePluginOpenScreenInput,
+  resolvePluginScreenTitle,
   resolvePluginSurfaceContribution,
 } from "./surface-contribution";
 
@@ -16,10 +19,15 @@ function installation(
     id: pluginId,
     serverId,
     clientBundle: serverId,
+    lifetime: new AbortController(),
     queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
     cleanup: () => undefined,
-    surfaces: surfaces.map((id) => ({ id, Component: () => null })),
-    sidebarItems: sidebarItems.map((item) => ({
+    settingsScreens: [],
+    surfaces: surfaces.map((id) => ({ id, title: id, Component: () => null })),
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: sidebarItems.map((item) => ({
       ...item,
       title: item.id,
       icon: "Blocks",
@@ -65,6 +73,7 @@ describe("plugin surface contribution identity", () => {
     expect(getPluginSurfaceContributionServerIds(installations, "review", identity)).toEqual([
       "host-v1",
       "host-v2",
+      "same-surface",
     ]);
   });
 
@@ -80,4 +89,129 @@ describe("plugin surface contribution identity", () => {
       "same-surface",
     ]);
   });
+
+  it("opens a direct screen without borrowing a legacy item that points at it", () => {
+    const resolved = resolvePluginSurfaceContribution(installations[0] ?? null, {
+      kind: "surface",
+      id: "surface-v1",
+    });
+
+    expect(resolved.sidebarItem).toBeNull();
+    expect(resolved.surface?.id).toBe("surface-v1");
+  });
+
+  it("resolves an old sidebar link to the same-id screen once the plugin has migrated", () => {
+    const resolved = resolvePluginSurfaceContribution(installations[2] ?? null, {
+      kind: "sidebar",
+      id: "overview",
+    });
+
+    expect(resolved.sidebarItem).toBeNull();
+    expect(resolved.surface?.id).toBe("overview");
+    expect(
+      resolvePluginSurfaceContribution(installations[2] ?? null, { kind: "sidebar", id: "missing" })
+        .surface,
+    ).toBeNull();
+  });
+});
+
+describe("currentPluginScreen", () => {
+  const plugin = installation(
+    "local",
+    ["overview", "details"],
+    [{ id: "legacy", surface: "details" }],
+  );
+
+  it("reads the open screen and its params from direct and legacy routes on the installation's host", () => {
+    expect(
+      currentPluginScreen(plugin, "/h/local/plugin/review/surface/overview", {
+        serverId: "local",
+        pluginId: "review",
+        contributionKind: "surface",
+        contributionId: "overview",
+        "param.botId": "bot-2",
+      }),
+    ).toEqual({ screenId: "overview", params: { botId: "bot-2" } });
+    expect(currentPluginScreen(plugin, "/h/local/plugin/review/sidebar/legacy", {})).toEqual({
+      screenId: "details",
+      params: {},
+    });
+  });
+
+  it("is null on another host, another plugin, or a missing screen", () => {
+    expect(currentPluginScreen(plugin, "/h/remote/plugin/review/surface/overview", {})).toBeNull();
+    expect(currentPluginScreen(plugin, "/h/local/plugin/other/surface/overview", {})).toBeNull();
+    expect(currentPluginScreen(plugin, "/h/local/plugin/review/surface/missing", {})).toBeNull();
+    expect(currentPluginScreen(plugin, "/h/local/workspace/abc", {})).toBeNull();
+  });
+});
+
+describe("parsePluginOpenScreenInput", () => {
+  const plugin = installation("local", ["bot"]);
+
+  it("accepts a registered screen with or without string params, under any key", () => {
+    expect(parsePluginOpenScreenInput(plugin, { screenId: "bot" })).toEqual({
+      screenId: "bot",
+      params: {},
+    });
+    expect(parsePluginOpenScreenInput(plugin, { screenId: "bot", params: { botId: "2" } })).toEqual(
+      { screenId: "bot", params: { botId: "2" } },
+    );
+    expect(
+      parsePluginOpenScreenInput(plugin, { screenId: "bot", params: { serverId: "x" } }),
+    ).toEqual({ screenId: "bot", params: { serverId: "x" } });
+  });
+
+  it("throws on a bare id, an unknown screen, or params that are not strings", () => {
+    expect(() => parsePluginOpenScreenInput(plugin, "bot")).toThrow("{ screenId, params? }");
+    expect(() => parsePluginOpenScreenInput(plugin, { screenId: "missing" })).toThrow(
+      "unavailable: missing",
+    );
+    expect(() =>
+      parsePluginOpenScreenInput(plugin, { screenId: "bot", params: { botId: 2 } }),
+    ).toThrow("botId must be a string");
+    expect(() => parsePluginOpenScreenInput(plugin, { screenId: "bot", params: ["2"] })).toThrow(
+      "must be an object of strings",
+    );
+  });
+});
+
+describe("resolvePluginScreenTitle", () => {
+  const Component = () => null;
+  const botNames: Record<string, string> = { "bot-1": "Bot 1", "bot-2": "Bot 2" };
+  const bot = {
+    id: "bot",
+    title: (params: Record<string, string>) => botNames[params.botId] ?? "",
+    Component,
+  };
+
+  it("uses a string title as is", () => {
+    expect(resolvePluginScreenTitle({ id: "deploys", title: "Deploys", Component }, null, {})).toBe(
+      "Deploys",
+    );
+  });
+
+  it("derives a function title from the params it is given", () => {
+    expect(resolvePluginScreenTitle(bot, null, { botId: "bot-2" })).toBe("Bot 2");
+    expect(resolvePluginScreenTitle(bot, null, { botId: "bot-1" })).toBe("Bot 1");
+  });
+
+  it("falls back to the screen id when the function returns empty or throws", () => {
+    expect(resolvePluginScreenTitle(bot, null, { botId: "missing" })).toBe("bot");
+    const throwing = {
+      id: "bot",
+      title: () => {
+        throw new Error("no bots loaded");
+      },
+      Component,
+    };
+    expect(resolvePluginScreenTitle(throwing, null, {})).toBe("bot");
+  });
+
+  it("uses the title of a legacy item that points at the screen", () => {
+    const legacy = { id: "entry", title: "Legacy entry", icon: "Server", surface: "main" };
+    expect(resolvePluginScreenTitle({ id: "main", title: "main", Component }, legacy, {})).toBe(
+      "Legacy entry",
+    );
+  });
 });
diff --git a/packages/app/src/plugins/surface-contribution.ts b/packages/app/src/plugins/surface-contribution.ts
index 743ebbc1a7..830677f164 100644
--- a/packages/app/src/plugins/surface-contribution.ts
+++ b/packages/app/src/plugins/surface-contribution.ts
@@ -1,39 +1,100 @@
+import type { PluginScreenLocation, PluginScreenParams } from "@getpaseo/plugin/client";
+import {
+  parsePluginScreenParams,
+  parsePluginSurfaceRoute,
+  pluginScreenParamsFromRoute,
+} from "./routes";
 import type { InstalledPlugin } from "./types";
 
 export type PluginSurfaceContributionIdentity =
   | { kind: "sidebar"; id: string }
   | { kind: "surface"; id: string };
 
+/**
+ * A `sidebar` identity is a legacy `addSidebarItem` route: it resolves to that item and its screen,
+ * or, once the plugin has moved that item to `addScreen` under the same id, to that screen.
+ */
 export function resolvePluginSurfaceContribution(
   plugin: InstalledPlugin | null,
   identity: PluginSurfaceContributionIdentity | null,
 ): {
-  sidebarItem: InstalledPlugin["sidebarItems"][number] | null;
+  sidebarItem: InstalledPlugin["legacySidebarItems"][number] | null;
   surface: InstalledPlugin["surfaces"][number] | null;
 } {
-  if (!identity) return { sidebarItem: null, surface: null };
+  if (!identity || !plugin) return { sidebarItem: null, surface: null };
   const sidebarItem =
     identity.kind === "sidebar"
-      ? (plugin?.sidebarItems.find((contribution) => contribution.id === identity.id) ?? null)
+      ? (plugin.legacySidebarItems.find((contribution) => contribution.id === identity.id) ?? null)
       : null;
-  const surfaceId = identity.kind === "sidebar" ? sidebarItem?.surface : identity.id;
+  const surfaceId = sidebarItem ? sidebarItem.surface : identity.id;
   const surface = surfaceId
-    ? (plugin?.surfaces.find((contribution) => contribution.id === surfaceId) ?? null)
+    ? (plugin.surfaces.find((contribution) => contribution.id === surfaceId) ?? null)
     : null;
   return { sidebarItem, surface };
 }
 
+/**
+ * The screen header's title. A legacy `addSidebarItem` pointing at the screen lends its title, as
+ * before screens had one. A title function that throws or returns an empty string falls back to the
+ * screen id, so a bad title never takes the screen down.
+ */
+export function resolvePluginScreenTitle(
+  screen: InstalledPlugin["surfaces"][number],
+  legacySidebarItem: InstalledPlugin["legacySidebarItems"][number] | null,
+  params: PluginScreenParams,
+): string {
+  if (legacySidebarItem) return legacySidebarItem.title;
+  if (typeof screen.title === "string") return screen.title;
+  try {
+    const title = screen.title(params);
+    if (typeof title === "string" && title.trim()) return title.trim();
+  } catch (error) {
+    console.warn(`[Plugins] Screen ${screen.id} title failed`, error);
+  }
+  return screen.id;
+}
+
+/**
+ * The installation's screen open at `pathname` with the route's search params, or null when the
+ * route shows anything else.
+ */
+export function currentPluginScreen(
+  plugin: InstalledPlugin,
+  pathname: string,
+  routeParams: Readonly<Record<string, string | string[] | undefined>>,
+): PluginScreenLocation | null {
+  const route = parsePluginSurfaceRoute(pathname);
+  if (!route || route.serverId !== plugin.serverId || route.pluginId !== plugin.id) return null;
+  const screenId = resolvePluginSurfaceContribution(plugin, route.identity).surface?.id;
+  return screenId ? { screenId, params: pluginScreenParamsFromRoute(routeParams) } : null;
+}
+
+/** Checks an `openScreen` input against the installation's screens. Throws when it is invalid. */
+export function parsePluginOpenScreenInput(
+  plugin: InstalledPlugin,
+  input: unknown,
+): PluginScreenLocation {
+  if (typeof input !== "object" || input === null || !("screenId" in input)) {
+    throw new Error("openScreen takes { screenId, params? }");
+  }
+  const { screenId } = input;
+  if (typeof screenId !== "string" || !plugin.surfaces.some((surface) => surface.id === screenId)) {
+    throw new Error(`Plugin screen is unavailable: ${String(screenId)}`);
+  }
+  const params = "params" in input ? input.params : undefined;
+  return { screenId, params: parsePluginScreenParams(params) };
+}
+
 export function getPluginSurfaceContributionServerIds(
   installations: readonly InstalledPlugin[],
   pluginId: string,
   identity: PluginSurfaceContributionIdentity,
 ): string[] {
   return installations
-    .filter((installation) => {
-      if (installation.id !== pluginId) return false;
-      return identity.kind === "sidebar"
-        ? installation.sidebarItems.some((contribution) => contribution.id === identity.id)
-        : installation.surfaces.some((contribution) => contribution.id === identity.id);
-    })
+    .filter(
+      (installation) =>
+        installation.id === pluginId &&
+        resolvePluginSurfaceContribution(installation, identity).surface !== null,
+    )
     .map((installation) => installation.serverId);
 }
diff --git a/packages/app/src/plugins/surface-error-boundary.tsx b/packages/app/src/plugins/surface-error-boundary.tsx
index 7a3db639ea..89c6f6b468 100644
--- a/packages/app/src/plugins/surface-error-boundary.tsx
+++ b/packages/app/src/plugins/surface-error-boundary.tsx
@@ -7,6 +7,7 @@ interface SurfaceErrorBoundaryProps {
   installation: object;
   resetKey?: unknown;
   Surface: unknown;
+  renderError?(error: string): ReactNode;
 }
 
 interface SurfaceErrorBoundaryState {
@@ -40,6 +41,7 @@ export class SurfaceErrorBoundary extends Component<
 
   render() {
     if (this.state.error) {
+      if (this.props.renderError) return this.props.renderError(this.state.error);
       return <Text style={styles.errorText}>Plugin failed: {this.state.error}</Text>;
     }
     return this.props.children;
diff --git a/packages/app/src/plugins/surface-runtime.test.tsx b/packages/app/src/plugins/surface-runtime.test.tsx
deleted file mode 100644
index ec3ad2d4d1..0000000000
--- a/packages/app/src/plugins/surface-runtime.test.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { PaseoApi } from "@getpaseo/client";
-import { PaseoApiProvider } from "@getpaseo/plugin/host";
-import { usePaseo } from "@getpaseo/plugin";
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
-import { createPluginSurfaceRuntime } from "./surface-runtime";
-
-function clientWithWorkspace(id: string) {
-  const createWorkspace = vi.fn(async () => ({
-    error: null,
-    workspace: {
-      id,
-      projectId: `project-${id}`,
-      workspaceDirectory: `/tmp/${id}`,
-      name: id,
-      status: "active",
-    },
-  }));
-  const createAgent = vi.fn(async () => ({
-    id: `agent-${id}`,
-    provider: "codex",
-    cwd: `/tmp/${id}`,
-    workspaceId: id,
-    status: "idle",
-  }));
-  const invokePluginRpc = vi.fn(async () => id);
-  return {
-    client: { createWorkspace, createAgent, invokePluginRpc } as unknown as DaemonClient,
-    createWorkspace,
-    createAgent,
-    invokePluginRpc,
-  };
-}
-
-function borrowFromAppProvider(paseo: PaseoApi): PaseoApi {
-  let borrowed: PaseoApi | null = null;
-  function PluginSurface() {
-    borrowed = usePaseo();
-    return null;
-  }
-  renderToStaticMarkup(
-    <PaseoApiProvider paseo={paseo}>
-      <PluginSurface />
-    </PaseoApiProvider>,
-  );
-  if (!borrowed) throw new Error("Plugin surface did not receive Paseo API");
-  return borrowed;
-}
-
-describe("plugin surface host runtime", () => {
-  it("creates a PR worktree and agent through usePaseo on the selected app host", async () => {
-    const selected = clientWithWorkspace("workspace-a");
-    const runtime = createPluginSurfaceRuntime(selected.client, "workspace-plugin");
-    if (!runtime) throw new Error("Expected selected host runtime");
-
-    const paseo = borrowFromAppProvider(runtime.paseo);
-    const workspace = await paseo.workspaces.create({
-      source: {
-        kind: "worktree",
-        cwd: "/tmp/repository",
-        action: "checkout",
-        checkoutSource: { kind: "change_request", forge: "github", number: 42 },
-      },
-    });
-    const agent = await workspace.agents.create({
-      config: { provider: "codex/gpt-5" },
-      prompt: "Review PR #42",
-    });
-
-    expect(workspace.id).toBe("workspace-a");
-    expect(agent.id).toBe("agent-workspace-a");
-    expect(selected.createWorkspace).toHaveBeenCalledOnce();
-    expect(selected.createAgent).toHaveBeenCalledOnce();
-  });
-
-  it("switches all plugin calls when the selected host changes", async () => {
-    const hostA = clientWithWorkspace("workspace-a");
-    const hostB = clientWithWorkspace("workspace-b");
-    const first = createPluginSurfaceRuntime(hostA.client, "same-plugin");
-    const second = createPluginSurfaceRuntime(hostB.client, "same-plugin");
-    if (!first || !second) throw new Error("Expected online host runtimes");
-
-    await first.invoke("host", {});
-    await borrowFromAppProvider(second.paseo).workspaces.create({
-      source: { kind: "directory", path: "/tmp/workspace-b" },
-    });
-
-    expect(hostA.invokePluginRpc).toHaveBeenCalledWith("same-plugin", "host", {});
-    expect(hostA.createWorkspace).not.toHaveBeenCalled();
-    expect(hostB.createWorkspace).toHaveBeenCalledOnce();
-  });
-
-  it("keeps an offline selected host unavailable instead of borrowing another host", () => {
-    const otherHost = clientWithWorkspace("workspace-online");
-
-    expect(createPluginSurfaceRuntime(null, "same-plugin")).toBeNull();
-    expect(otherHost.createWorkspace).not.toHaveBeenCalled();
-  });
-});
diff --git a/packages/app/src/plugins/surface-runtime.ts b/packages/app/src/plugins/surface-runtime.ts
deleted file mode 100644
index b3635b9122..0000000000
--- a/packages/app/src/plugins/surface-runtime.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createPaseoApi, type PaseoApi } from "@getpaseo/client";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-
-export interface PluginSurfaceRuntime {
-  paseo: PaseoApi;
-  invoke(method: string, input: unknown): Promise<unknown>;
-}
-
-export function createPluginSurfaceRuntime(
-  client: DaemonClient | null,
-  pluginId: string,
-): PluginSurfaceRuntime | null {
-  if (!client) return null;
-  return {
-    paseo: createPaseoApi(client),
-    invoke: (method, input) => client.invokePluginRpc(pluginId, method, input),
-  };
-}
diff --git a/packages/app/src/plugins/surface-screen.tsx b/packages/app/src/plugins/surface-screen.tsx
index 849f357ba5..378965cd8f 100644
--- a/packages/app/src/plugins/surface-screen.tsx
+++ b/packages/app/src/plugins/surface-screen.tsx
@@ -1,14 +1,17 @@
 import { router, useLocalSearchParams } from "expo-router";
-import type { PluginSurfaceProps, PluginTheme } from "@getpaseo/plugin";
-import { ChevronDown, X } from "lucide-react-native";
-import { useCallback, useMemo, useRef, useState, type ComponentType } from "react";
-import { Platform, Pressable, Text, View } from "react-native";
+import type { PluginScreenParams, PluginScreenProps } from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
+import { X } from "lucide-react-native";
+import { useCallback, useMemo, type ComponentType } from "react";
+import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HeaderIconBadge } from "@/components/headers/header-icon-badge";
 import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import { CompactHeader } from "@/components/headers/compact-header";
 import { ScreenHeader } from "@/components/headers/screen-header";
 import { ScreenTitle } from "@/components/headers/screen-title";
-import { HostPicker } from "@/components/hosts/host-picker";
+import { HostFilter } from "@/components/hosts/host-filter";
+import type { HostPickerHost } from "@/components/hosts/host-picker";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
 import type { Theme } from "@/styles/theme";
@@ -17,16 +20,21 @@ import { usePluginHostNavigation } from "./host-navigation";
 import { resolvePluginIcon } from "./icons";
 import { toPluginTheme } from "./theme";
 import { useInstalledPlugin, usePluginInstallations } from "./registry";
-import { buildPluginSurfaceRoute } from "./routes";
-import { rememberPluginContributionHost } from "./contribution-host";
+import { buildPluginSurfaceRoute, pluginScreenParamsFromRoute } from "./routes";
+import {
+  legacySidebarItemHostKey,
+  pluginScreensHostKey,
+  rememberPluginContributionHost,
+} from "./contribution-host";
 import { SurfaceErrorBoundary } from "./surface-error-boundary";
-import { createPluginSurfaceRuntime } from "./surface-runtime";
-import { PluginRuntimeBoundary } from "./runtime-boundary";
+import { PluginInstallationProvider } from "./installation-provider";
 import {
   getPluginSurfaceContributionServerIds,
+  resolvePluginScreenTitle,
   resolvePluginSurfaceContribution,
   type PluginSurfaceContributionIdentity,
 } from "./surface-contribution";
+import { resolvePluginPlatform } from "./platform";
 
 const EMPTY_SHORTCUT_KEYS: ShortcutKey[] = [];
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
@@ -34,7 +42,6 @@ const pluginThemeMapping = (theme: Theme) => ({
   theme: toPluginTheme(theme),
 });
 const ThemedX = withUnistyles(X);
-const ThemedChevronDown = withUnistyles(ChevronDown);
 
 function routeParam(value: string | string[] | undefined): string {
   return typeof value === "string" ? value : "";
@@ -54,105 +61,80 @@ const ThemedPluginHeaderIcon = withUnistyles(PluginHeaderIcon);
 
 function SurfaceRenderer({
   Surface,
-  runtime,
   plugin,
   layout,
   host,
+  params,
   theme,
 }: {
-  Surface: ComponentType<PluginSurfaceProps>;
-  runtime: NonNullable<ReturnType<typeof createPluginSurfaceRuntime>>;
+  Surface: ComponentType<PluginScreenProps>;
   plugin: NonNullable<ReturnType<typeof useInstalledPlugin>>;
-  layout: PluginSurfaceProps["layout"];
-  host: PluginSurfaceProps["host"];
+  layout: PluginScreenProps["layout"];
+  host: PluginScreenProps["host"];
+  params: PluginScreenParams;
   theme: PluginTheme;
 }) {
   const navigation = usePluginHostNavigation(host.id);
   return (
-    <PluginRuntimeBoundary plugin={plugin} runtime={runtime}>
-      <Surface theme={theme} host={host} layout={layout} navigation={navigation} />
-    </PluginRuntimeBoundary>
+    <PluginInstallationProvider plugin={plugin}>
+      <Surface theme={theme} host={host} layout={layout} navigation={navigation} params={params} />
+    </PluginInstallationProvider>
   );
 }
 
 const ThemedSurfaceRenderer = withUnistyles(SurfaceRenderer);
 
-function resolvePlatform(): PluginSurfaceProps["layout"]["platform"] {
-  if (Platform.OS === "ios") return "ios";
-  if (Platform.OS === "android") return "android";
-  return "web";
-}
-
-function PluginHostSwitcher({
+function PluginHostFilter({
   serverId,
   pluginId,
   identity,
-  serverIds,
+  params,
+  hosts,
 }: {
   serverId: string;
   pluginId: string;
   identity: PluginSurfaceContributionIdentity;
-  serverIds: string[];
+  params: PluginScreenParams;
+  hosts: HostPickerHost[];
 }) {
-  const allHosts = useHosts();
-  const hosts = useMemo(
-    () => allHosts.filter((host) => serverIds.includes(host.serverId)),
-    [allHosts, serverIds],
-  );
-  const [open, setOpen] = useState(false);
-  const anchorRef = useRef<View | null>(null);
-  const selectedLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
   const selectHost = useCallback(
     (nextServerId: string) => {
-      rememberPluginContributionHost(`${pluginId}/${identity.kind}/${identity.id}`, nextServerId);
-      router.replace(buildPluginSurfaceRoute(nextServerId, pluginId, identity));
+      // A legacy row remembers its own host; a screen's host carries to all the plugin's items.
+      rememberPluginContributionHost(
+        identity.kind === "sidebar"
+          ? legacySidebarItemHostKey(pluginId, identity.id)
+          : pluginScreensHostKey(pluginId),
+        nextServerId,
+      );
+      router.replace(buildPluginSurfaceRoute(nextServerId, pluginId, identity, params));
     },
-    [identity, pluginId],
+    [identity, params, pluginId],
   );
-  const openPicker = useCallback(() => setOpen(true), []);
-  const show = serverIds.length > 1 && hosts.length > 1;
-  if (!show) return null;
-
   return (
-    <HostPicker
+    <HostFilter
       hosts={hosts}
-      value={serverId}
-      onSelect={selectHost}
-      open={open}
-      onOpenChange={setOpen}
-      anchorRef={anchorRef}
-      title="Choose plugin host"
-      desktopPlacement="bottom-start"
-    >
-      <View ref={anchorRef} collapsable={false}>
-        <Pressable
-          accessibilityRole="button"
-          accessibilityLabel={`Plugin host: ${selectedLabel}`}
-          testID="plugin-host-switcher"
-          onPress={openPicker}
-          style={styles.hostSwitcher}
-        >
-          <Text numberOfLines={1} style={styles.hostSwitcherText}>
-            {selectedLabel}
-          </Text>
-          <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-        </Pressable>
-      </View>
-    </HostPicker>
+      selectedHost={serverId}
+      onSelectHost={selectHost}
+      includeAllHost={false}
+      triggerTestID="plugin-host-filter-trigger"
+    />
   );
 }
 
 export function PluginSurfaceScreen() {
-  const params = useLocalSearchParams<{
+  const routeParams = useLocalSearchParams<{
     serverId?: string | string[];
     pluginId?: string | string[];
     contributionKind?: string | string[];
     contributionId?: string | string[];
   }>();
-  const serverId = routeParam(params.serverId);
-  const pluginId = routeParam(params.pluginId);
-  const contributionKind = routeParam(params.contributionKind);
-  const contributionId = routeParam(params.contributionId);
+  const serverId = routeParam(routeParams.serverId);
+  const pluginId = routeParam(routeParams.pluginId);
+  const contributionKind = routeParam(routeParams.contributionKind);
+  const contributionId = routeParam(routeParams.contributionId);
+  const paramsKey = JSON.stringify(pluginScreenParamsFromRoute(routeParams));
+  // Keyed by content: the route hands back a new object on every render.
+  const params = useMemo<PluginScreenParams>(() => JSON.parse(paramsKey), [paramsKey]);
   const identity = useMemo<PluginSurfaceContributionIdentity | null>(() => {
     if (contributionKind !== "sidebar" && contributionKind !== "surface") return null;
     return { kind: contributionKind, id: contributionId };
@@ -161,25 +143,31 @@ export function PluginSurfaceScreen() {
   const installations = usePluginInstallations(pluginId);
   const hosts = useHosts();
   const client = useHostRuntimeClient(serverId);
-  const runtime = useMemo(() => createPluginSurfaceRuntime(client, pluginId), [client, pluginId]);
   const compact = useIsCompactFormFactor();
   const { sidebarItem, surface } = useMemo(
     () => resolvePluginSurfaceContribution(plugin, identity),
     [identity, plugin],
   );
   const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
-  const contributionServerIds = useMemo(
+  // The hosts this contribution is installed on; the filter shows when there is a choice.
+  const filterHosts = useMemo(() => {
+    if (!identity) return [];
+    const serverIds = getPluginSurfaceContributionServerIds(installations, pluginId, identity);
+    return hosts.filter((candidate) => serverIds.includes(candidate.serverId));
+  }, [hosts, identity, installations, pluginId]);
+  const title = useMemo(
     () =>
-      identity ? getPluginSurfaceContributionServerIds(installations, pluginId, identity) : [],
-    [identity, installations, pluginId],
+      surface
+        ? resolvePluginScreenTitle(surface, sidebarItem, params)
+        : (sidebarItem?.title ?? (pluginId || "Plugin")),
+    [params, pluginId, sidebarItem, surface],
   );
-  const title = sidebarItem?.title ?? surface?.id ?? (pluginId || "Plugin");
   const Icon = sidebarItem ? resolvePluginIcon(sidebarItem.icon) : null;
   const close = useCallback(() => {
     if (router.canGoBack()) router.back();
     else router.replace(`/h/${encodeURIComponent(serverId)}`);
   }, [serverId]);
-  const layout = useMemo(() => ({ compact, platform: resolvePlatform() }), [compact]);
+  const layout = useMemo(() => ({ compact, platform: resolvePluginPlatform() }), [compact]);
   const host = useMemo(() => ({ id: serverId, label: hostLabel }), [hostLabel, serverId]);
   const headerLeft = useMemo(
     () => (
@@ -189,22 +177,28 @@ export function PluginSurfaceScreen() {
             <ThemedPluginHeaderIcon Icon={Icon} uniProps={mutedColorMapping} />
           </HeaderIconBadge>
         ) : null}
-        <ScreenTitle>{title}</ScreenTitle>
+        <ScreenTitle testID="plugin-surface-title">{title}</ScreenTitle>
       </>
     ),
     [Icon, title],
   );
+  const hostFilter = useMemo(
+    () =>
+      identity && filterHosts.length > 1 ? (
+        <PluginHostFilter
+          serverId={serverId}
+          pluginId={pluginId}
+          identity={identity}
+          params={params}
+          hosts={filterHosts}
+        />
+      ) : null,
+    [filterHosts, identity, params, pluginId, serverId],
+  );
   const headerRight = useMemo(
     () => (
       <>
-        {identity ? (
-          <PluginHostSwitcher
-            serverId={serverId}
-            pluginId={pluginId}
-            identity={identity}
-            serverIds={contributionServerIds}
-          />
-        ) : null}
+        {hostFilter}
         <HeaderToggleButton
           accessibilityLabel="Close plugin"
           onPress={close}
@@ -217,14 +211,24 @@ export function PluginSurfaceScreen() {
         </HeaderToggleButton>
       </>
     ),
-    [close, contributionServerIds, identity, pluginId, serverId],
+    [close, hostFilter],
   );
 
   return (
     <View style={styles.screen}>
-      <ScreenHeader left={headerLeft} right={headerRight} />
+      {compact ? (
+        <CompactHeader
+          navigation="back"
+          onBack={close}
+          title={title}
+          titleTestID="plugin-surface-title"
+          actions={hostFilter}
+        />
+      ) : (
+        <ScreenHeader left={headerLeft} right={headerRight} />
+      )}
       <View style={styles.body}>
-        {plugin && surface && runtime ? (
+        {plugin && surface && client ? (
           <SurfaceErrorBoundary
             key={`${serverId}/${pluginId}/${identity?.kind}/${contributionId}`}
             installation={plugin}
@@ -232,10 +236,10 @@ export function PluginSurfaceScreen() {
           >
             <ThemedSurfaceRenderer
               Surface={surface.Component}
-              runtime={runtime}
               plugin={plugin}
               host={host}
               layout={layout}
+              params={params}
               uniProps={pluginThemeMapping}
             />
           </SurfaceErrorBoundary>
@@ -261,19 +265,4 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.statusDanger,
     padding: theme.spacing[4],
   },
-  hostSwitcher: {
-    maxWidth: 180,
-    minHeight: 32,
-    paddingHorizontal: theme.spacing[2],
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface1,
-  },
-  hostSwitcherText: {
-    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-  },
 }));
diff --git a/packages/app/src/plugins/theme.test.ts b/packages/app/src/plugins/theme.test.ts
index 6081a33e86..c1548d0521 100644
--- a/packages/app/src/plugins/theme.test.ts
+++ b/packages/app/src/plugins/theme.test.ts
@@ -49,9 +49,14 @@ function installed(serverId: string, themes: PluginThemeContribution[]): Install
     cleanup: () => undefined,
     serverId,
     clientBundle: serverId,
+    lifetime: new AbortController(),
     queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
+    settingsScreens: [],
     surfaces: [],
-    sidebarItems: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
     workspacePanels: [],
     commandCenterItems: [],
     clientSlashCommands: [],
diff --git a/packages/app/src/plugins/timeline/model.test.ts b/packages/app/src/plugins/timeline/model.test.ts
index 27e734d40d..c64e498333 100644
--- a/packages/app/src/plugins/timeline/model.test.ts
+++ b/packages/app/src/plugins/timeline/model.test.ts
@@ -11,10 +11,15 @@ function plugin(input: {
     id: input.id,
     serverId: "host-1",
     clientBundle: "bundle",
+    lifetime: new AbortController(),
     queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
     cleanup: () => {},
+    settingsScreens: [],
     surfaces: [],
-    sidebarItems: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
     workspacePanels: [],
     commandCenterItems: [],
     clientSlashCommands: [],
diff --git a/packages/app/src/plugins/timeline/projection.test.ts b/packages/app/src/plugins/timeline/projection.test.ts
index ebb2df48c8..2dc95ed339 100644
--- a/packages/app/src/plugins/timeline/projection.test.ts
+++ b/packages/app/src/plugins/timeline/projection.test.ts
@@ -73,6 +73,48 @@ describe("plugin timeline projection", () => {
     expect(transform).toHaveBeenCalledOnce();
   });
 
+  it("preserves whether a notification row came from an agent error or a notice", () => {
+    const transform: TimelineItemTransform = vi.fn(() => undefined);
+    const timestamp = new Date("2026-01-01T00:00:00.000Z");
+
+    projectPluginTimelineItems(
+      [
+        {
+          kind: "notification",
+          sourceType: "error",
+          id: "error-1",
+          level: "error",
+          message: "Agent failed",
+          timestamp,
+        },
+        {
+          kind: "notification",
+          sourceType: "notification",
+          id: "notice-1",
+          level: "error",
+          message: "Extension reported an error",
+          timestamp,
+        },
+      ],
+      transform,
+    );
+
+    expect(transform).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({ item: { type: "error", message: "Agent failed" } }),
+    );
+    expect(transform).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        item: {
+          type: "notification",
+          level: "error",
+          message: "Extension reported an error",
+        },
+      }),
+    );
+  });
+
   it("reprojects when streaming produces a new source row", () => {
     const transform: TimelineItemTransform = vi.fn(() => undefined);
     projectPluginTimelineItems([thought("First")], transform);
diff --git a/packages/app/src/plugins/timeline/projection.ts b/packages/app/src/plugins/timeline/projection.ts
index 7e60392eef..0750bdb66a 100644
--- a/packages/app/src/plugins/timeline/projection.ts
+++ b/packages/app/src/plugins/timeline/projection.ts
@@ -2,7 +2,12 @@ import type { AgentTimelineItem, ToolCallTimelineItem } from "@getpaseo/protocol
 import type { AgentToolCallData, PluginTimelineStreamItem, StreamItem } from "@/types/stream";
 import type { TimelineItemTransform } from "./model";
 
-const projectionCache = new WeakMap<TimelineItemTransform, WeakMap<StreamItem, StreamItem[]>>();
+type AssistantPhase = "streaming" | "complete";
+
+const projectionCache = new WeakMap<
+  TimelineItemTransform,
+  WeakMap<StreamItem, Partial<Record<AssistantPhase, StreamItem[]>>>
+>();
 
 function cloneAndFreeze<T>(value: T): T {
   if (Array.isArray(value)) {
@@ -58,8 +63,10 @@ function sourceTimelineItem(item: StreamItem): AgentTimelineItem | null {
     }
     case "todo_list":
       return { type: "todo", items: item.items };
-    case "activity_log":
-      return item.activityType === "error" ? { type: "error", message: item.message } : null;
+    case "notification":
+      return item.sourceType === "error"
+        ? { type: "error", message: item.message }
+        : { type: "notification", level: item.level, message: item.message };
     case "compaction":
       return {
         type: "compaction",
@@ -75,6 +82,7 @@ function sourceTimelineItem(item: StreamItem): AgentTimelineItem | null {
 function transformSourceItem(
   item: StreamItem,
   transformTimelineItem: TimelineItemTransform,
+  assistantPhase: AssistantPhase,
 ): StreamItem[] {
   const source = sourceTimelineItem(item);
   if (!source) return [item];
@@ -83,7 +91,9 @@ function transformSourceItem(
     item.kind === "tool_call" &&
     item.payload.source === "agent" &&
     item.payload.data.status === "running";
-  const phase = isStreamingThought || isStreamingToolCall ? "streaming" : "complete";
+  const isStreamingAssistant = item.kind === "assistant_message" && assistantPhase === "streaming";
+  const phase =
+    isStreamingAssistant || isStreamingThought || isStreamingToolCall ? "streaming" : "complete";
   const transformed = transformTimelineItem({
     item: cloneAndFreeze(source),
     phase,
@@ -94,6 +104,7 @@ function transformSourceItem(
     const projected: PluginTimelineStreamItem = {
       kind: "plugin",
       id: `${pluginItem.pluginId}/${pluginItem.id}`,
+      sourceId: item.id,
       timestamp: item.timestamp,
       pluginId: pluginItem.pluginId,
       pluginItemId: pluginItem.id,
@@ -110,6 +121,7 @@ function transformSourceItem(
 export function projectPluginTimelineItems(
   items: StreamItem[],
   transformTimelineItem: TimelineItemTransform | undefined,
+  assistantPhase: AssistantPhase = "complete",
 ): StreamItem[] {
   if (!transformTimelineItem) return items;
   let bySource = projectionCache.get(transformTimelineItem);
@@ -119,13 +131,13 @@ export function projectPluginTimelineItems(
   }
   let changed = false;
   const projected = items.flatMap((item) => {
-    const cached = bySource.get(item);
+    const cached = bySource.get(item)?.[assistantPhase];
     if (cached) {
       changed = changed || cached.length !== 1 || cached[0] !== item;
       return cached;
     }
-    const output = transformSourceItem(item, transformTimelineItem);
-    bySource.set(item, output);
+    const output = transformSourceItem(item, transformTimelineItem, assistantPhase);
+    bySource.set(item, { ...bySource.get(item), [assistantPhase]: output });
     changed = changed || output.length !== 1 || output[0] !== item;
     return output;
   });
diff --git a/packages/app/src/plugins/timeline/view.test.tsx b/packages/app/src/plugins/timeline/view.test.tsx
index 870a51742b..d915216105 100644
--- a/packages/app/src/plugins/timeline/view.test.tsx
+++ b/packages/app/src/plugins/timeline/view.test.tsx
@@ -1,17 +1,20 @@
 /**
  * @vitest-environment jsdom
  */
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import React, { act } from "react";
+import appPackage from "../../../package.json";
+import { DaemonClient, type DaemonTransport } from "@getpaseo/client/internal/daemon-client";
+import React, { act, StrictMode } from "react";
 import { createRoot } from "react-dom/client";
-import { renderToStaticMarkup } from "react-dom/server";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
+const hostClient = vi.hoisted(() => ({ invokePluginRpc: async () => null }));
+const selectedHost = vi.hoisted(() => ({ client: null as DaemonClient | null }));
 vi.mock("@/runtime/host-runtime", () => ({
-  useHostRuntimeClient: () => ({ invokePluginRpc: async () => null }) as unknown as DaemonClient,
+  useHostRuntimeClient: () => selectedHost.client ?? (hostClient as unknown as DaemonClient),
   useHosts: () => [{ serverId: "host-1", label: "Local" }],
 }));
-vi.mock("@/constants/layout", () => ({
+vi.mock("@/constants/layout", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@/constants/layout")>()),
   useIsCompactFormFactor: () => false,
 }));
 vi.mock("../navigation", () => ({
@@ -20,30 +23,24 @@ vi.mock("../navigation", () => ({
 vi.mock("../client-runtime", () => ({
   createPluginClientRuntime: () => ({
     paseo: {},
+    dispose: () => {},
     rpc: async () => undefined,
     openSurface: () => undefined,
     openPanel: () => undefined,
-    addComposerPill: () => () => undefined,
+    addComposerPill: () => ({ update() {}, remove() {} }),
+    addHeaderButton: () => ({ update() {}, remove() {} }),
   }),
 }));
 vi.mock("../icons", () => ({
   Icon: () => null,
   resolvePluginIcon: () => () => null,
 }));
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: (theme: object) => object) =>
-      factory({
-        colors: { foregroundMuted: "gray", statusDanger: "red" },
-        spacing: [0, 4, 8, 12, 16],
-      }),
-  },
-  withUnistyles: (Component: React.ComponentType) => Component,
-}));
 
 import { pluginRegistry } from "../registry";
 import { PluginTimelineItemView } from "./view";
 
+const audio = { play: async () => 0 };
+
 const bundle = `(function(require) {
   const React = require("react");
   return { default: function(plugin) {
@@ -115,29 +112,51 @@ afterEach(() => {
   for (const root of roots.splice(0)) act(() => root.unmount());
   for (const container of containers.splice(0)) container.remove();
   pluginRegistry.removeHost("host-1");
+  selectedHost.client = null;
   vi.restoreAllMocks();
   vi.unstubAllGlobals();
 });
 
 describe("PluginTimelineItemView", () => {
-  it("validates and renders the matching plugin component", () => {
-    pluginRegistry.installCatalog("host-1", [{ id: "reports", clientBundle: bundle }], {
-      client: daemonClient,
-    });
-
-    const markup = renderToStaticMarkup(
-      <PluginTimelineItemView serverId="host-1" agentId="agent-1" item={timelineItem} />,
+  it("validates and renders the matching plugin component", async () => {
+    pluginRegistry.installCatalog(
+      "host-1",
+      [{ id: "reports", requirements: { paseo: `>=${appPackage.version}` }, clientBundle: bundle }],
+      {
+        client: daemonClient,
+        audio,
+      },
     );
 
-    expect(markup).toContain("Four tests passed");
+    const container = document.createElement("div");
+    containers.push(container);
+    const root = createRoot(container);
+    roots.push(root);
+    await act(async () =>
+      root.render(
+        <PluginTimelineItemView serverId="host-1" agentId="agent-1" item={timelineItem} />,
+      ),
+    );
+    expect(container.textContent).toContain("Four tests passed");
   });
 
   it("contains renderer crashes to one timeline item", async () => {
     vi.spyOn(console, "warn").mockImplementation(() => undefined);
     vi.spyOn(console, "error").mockImplementation(() => undefined);
-    pluginRegistry.installCatalog("host-1", [{ id: "reports", clientBundle: failingBundle }], {
-      client: daemonClient,
-    });
+    pluginRegistry.installCatalog(
+      "host-1",
+      [
+        {
+          id: "reports",
+          requirements: { paseo: `>=${appPackage.version}` },
+          clientBundle: failingBundle,
+        },
+      ],
+      {
+        client: daemonClient,
+        audio,
+      },
+    );
     const container = document.createElement("div");
     containers.push(container);
     document.body.appendChild(container);
@@ -162,9 +181,20 @@ describe("PluginTimelineItemView", () => {
   it("recovers when a streaming item's data changes", async () => {
     vi.spyOn(console, "warn").mockImplementation(() => undefined);
     vi.spyOn(console, "error").mockImplementation(() => undefined);
-    pluginRegistry.installCatalog("host-1", [{ id: "reports", clientBundle: recoveringBundle }], {
-      client: daemonClient,
-    });
+    pluginRegistry.installCatalog(
+      "host-1",
+      [
+        {
+          id: "reports",
+          requirements: { paseo: `>=${appPackage.version}` },
+          clientBundle: recoveringBundle,
+        },
+      ],
+      {
+        client: daemonClient,
+        audio,
+      },
+    );
     const container = document.createElement("div");
     containers.push(container);
     document.body.appendChild(container);
@@ -185,3 +215,142 @@ describe("PluginTimelineItemView", () => {
     expect(container.textContent).toBe("Recovered");
   });
 });
+
+it("a renderer releases its observation on the plugin's client when it crashes, and remounts in StrictMode", async () => {
+  let receive: Parameters<DaemonTransport["onMessage"]>[0] = () => {};
+  let opened: () => void = () => {};
+  let nextId = 0;
+  const retained = new Set<string>();
+  const released: string[] = [];
+  const deliver = (message: unknown) =>
+    receive(JSON.stringify({ type: "session", message }), false);
+  const client = new DaemonClient({
+    url: "ws://surface-observation.test",
+    clientId: "surface-lifetime-test",
+    transportFactory: () => ({
+      send(data) {
+        if (typeof data !== "string") throw new Error("Expected a JSON request");
+        const frame = JSON.parse(data) as {
+          type: string;
+          message?: { type: string; requestId: string; subscriptionId: string };
+        };
+        if (frame.type === "hello")
+          deliver({
+            type: "status",
+            payload: {
+              status: "server_info",
+              serverId: "host-1",
+              hostname: null,
+              version: null,
+              features: { ownedSubscriptions: true },
+            },
+          });
+        const request = frame.message;
+        if (request?.type === "session.events.set_subscription.request") {
+          const id = `surface-${++nextId}`;
+          retained.add(id);
+          deliver({
+            type: "session.events.set_subscription.response",
+            payload: {
+              requestId: request.requestId,
+              subscriptionId: id,
+              events: ["project.update"],
+              snapshots: [],
+            },
+          });
+        } else if (request?.type === "subscription.release.request") {
+          retained.delete(request.subscriptionId);
+          released.push(request.subscriptionId);
+          deliver({ type: "subscription.release.response", payload: request });
+        }
+      },
+      close() {},
+      onMessage(handler) {
+        receive = handler;
+        return () => {};
+      },
+      onOpen(handler) {
+        opened = handler;
+        return () => {};
+      },
+      onClose() {
+        return () => {};
+      },
+      onError() {
+        return () => {};
+      },
+    }),
+  });
+  const connecting = client.connect();
+  opened();
+  await connecting;
+  selectedHost.client = client;
+  const liveBundle = `(function(require) {
+    const React = require("react");
+    const { usePaseo } = require("@getpaseo/plugin/client");
+    return { default(plugin) {
+      function Card(props) {
+        const paseo = usePaseo();
+        React.useEffect(() => {
+          const owner = paseo.observeEvents(["project.update"]);
+          return () => { void owner.release(); };
+        }, [paseo]);
+        if (props.item.data.label === "explode") throw new Error("owned renderer failed");
+        return React.createElement("span", null, props.item.data.label);
+      }
+      plugin.addTimelineRenderer({ kind:"test-report", version:1, schema:{safeParse(data){return {success:true,data};}}, Component:Card });
+      return () => {};
+    }};
+  })`;
+  const survivor = client.observeEvents(["project.update"]);
+  const updates: unknown[] = [];
+  survivor.subscribe({ snapshot: () => {}, update: (message) => updates.push(message) });
+  await survivor.ready;
+  pluginRegistry.installCatalog(
+    "host-1",
+    [
+      {
+        id: "reports",
+        requirements: { paseo: `>=${appPackage.version}` },
+        clientBundle: liveBundle,
+      },
+    ],
+    { client, audio },
+  );
+  const container = document.createElement("div");
+  containers.push(container);
+  const root = createRoot(container);
+  roots.push(root);
+  const render = (item: typeof timelineItem) =>
+    act(async () =>
+      root.render(
+        <StrictMode>
+          <PluginTimelineItemView serverId="host-1" agentId="agent-1" item={item} />
+        </StrictMode>,
+      ),
+    );
+  try {
+    await render(timelineItem);
+    expect(retained.size).toBe(2);
+    const initialIds = new Set(retained);
+    await render(failingTimelineItem);
+    expect(container.textContent).toContain("Plugin failed:");
+    expect([...retained]).toEqual([survivor.subscriptionId]);
+    expect(released.some((id) => initialIds.has(id))).toBe(true);
+    deliver({
+      type: "project.update",
+      payload: { subscriptionId: survivor.subscriptionId, kind: "remove", projectId: "still-live" },
+    });
+    expect(updates).toHaveLength(1);
+    await render(recoveredTimelineItem);
+    expect(container.textContent).toContain("Recovered");
+    expect(retained.size).toBe(2);
+    expect([...retained].filter((id) => !initialIds.has(id))).toHaveLength(1);
+    await act(async () => root.unmount());
+    roots.splice(roots.indexOf(root), 1);
+    expect([...retained]).toEqual([survivor.subscriptionId]);
+  } finally {
+    await survivor.release();
+    await client.close();
+  }
+});
diff --git a/packages/app/src/plugins/timeline/view.tsx b/packages/app/src/plugins/timeline/view.tsx
index 443172263b..90f6e0e1a2 100644
--- a/packages/app/src/plugins/timeline/view.tsx
+++ b/packages/app/src/plugins/timeline/view.tsx
@@ -1,7 +1,8 @@
-import { PluginClientStateProvider } from "@getpaseo/plugin/host";
-import type { PluginHostProps, PluginTheme, PluginTimelineItemProps } from "@getpaseo/plugin";
+import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
+import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
 import React, { type ComponentType, useMemo } from "react";
-import { Platform, Text } from "react-native";
+import { Text } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
@@ -9,19 +10,13 @@ import type { Theme } from "@/styles/theme";
 import type { PluginTimelineStreamItem } from "@/types/stream";
 import { createPluginClientStateSource } from "../client-state/source";
 import { useInstalledPlugin } from "../registry";
-import { PluginRuntimeBoundary } from "../runtime-boundary";
-import { createPluginSurfaceRuntime } from "../surface-runtime";
+import { PluginInstallationProvider } from "../installation-provider";
 import { SurfaceErrorBoundary } from "../surface-error-boundary";
 import { toPluginTheme } from "../theme";
+import { resolvePluginPlatform } from "../platform";
 
 const pluginThemeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
 
-function resolvePlatform(): PluginHostProps["layout"]["platform"] {
-  if (Platform.OS === "ios") return "ios";
-  if (Platform.OS === "android") return "android";
-  return "web";
-}
-
 function TimelineItemUnavailable() {
   return <Text style={styles.unavailable}>Plugin timeline item unavailable.</Text>;
 }
@@ -59,18 +54,14 @@ function PluginTimelineItemBody({
   );
   const parsed = parseRendererData(renderer, item.data);
   const client = useHostRuntimeClient(serverId);
-  const runtime = useMemo(
-    () => createPluginSurfaceRuntime(client, item.pluginId),
-    [client, item.pluginId],
-  );
   const compact = useIsCompactFormFactor();
   const hosts = useHosts();
   const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
   const host = useMemo(() => ({ id: serverId, label: hostLabel }), [hostLabel, serverId]);
-  const layout = useMemo(() => ({ compact, platform: resolvePlatform() }), [compact]);
+  const layout = useMemo(() => ({ compact, platform: resolvePluginPlatform() }), [compact]);
   const stateSource = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
 
-  if (!plugin || !renderer || !parsed || !runtime) {
+  if (!plugin || !renderer || !parsed || !client) {
     return <TimelineItemUnavailable />;
   }
 
@@ -90,11 +81,11 @@ function PluginTimelineItemBody({
   };
   return (
     <SurfaceErrorBoundary installation={plugin} resetKey={item.data} Surface={Component}>
-      <PluginRuntimeBoundary plugin={plugin} runtime={runtime}>
+      <PluginInstallationProvider plugin={plugin}>
         <PluginClientStateProvider source={stateSource}>
           <Component {...props} />
         </PluginClientStateProvider>
-      </PluginRuntimeBoundary>
+      </PluginInstallationProvider>
     </SurfaceErrorBoundary>
   );
 }
diff --git a/packages/app/src/plugins/types.ts b/packages/app/src/plugins/types.ts
index 0006fe553a..bab295d623 100644
--- a/packages/app/src/plugins/types.ts
+++ b/packages/app/src/plugins/types.ts
@@ -1,18 +1,26 @@
+import type { PaseoApi } from "@getpaseo/client";
 import type { QueryClient } from "@tanstack/react-query";
+import type { PluginRequirements } from "@getpaseo/protocol/messages";
 import type {
   PluginAttachmentSourceContribution,
+  PluginCleanup,
+  PluginThemeContribution,
+} from "@getpaseo/plugin";
+import type {
   PluginCommandCenterItemContribution,
   PluginClientSlashCommandContribution,
-  PluginCleanup,
   PluginComposerPillContribution,
   PluginSidebarContribution,
-  PluginSurfaceContribution,
-  PluginThemeContribution,
+  PluginSidebarItemContribution,
+  PluginScreenContribution,
+  PluginSettingsScreenContribution,
   PluginTimelineRendererContribution,
   PluginTimelineTransformerContribution,
   PluginPanelLocation,
   PluginWorkspacePanelContribution,
-} from "@getpaseo/plugin";
+} from "@getpaseo/plugin/client";
+
+export type PluginSidebarSection = "header" | "footer";
 
 export type EvaluatedPluginWorkspacePanelContribution = PluginWorkspacePanelContribution & {
   locations: readonly PluginPanelLocation[];
@@ -21,8 +29,12 @@ export type EvaluatedPluginWorkspacePanelContribution = PluginWorkspacePanelCont
 export interface EvaluatedPlugin {
   id: string;
   cleanup: PluginCleanup;
-  surfaces: PluginSurfaceContribution[];
-  sidebarItems: PluginSidebarContribution[];
+  surfaces: PluginScreenContribution[];
+  settingsScreens: PluginSettingsScreenContribution[];
+  sidebarItems: Record<PluginSidebarSection, PluginSidebarItemContribution[]>;
+  // COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+  /** `addSidebarItem` registrations, so `/plugin/<id>/sidebar/<item>` routes keep resolving. */
+  legacySidebarItems: PluginSidebarContribution[];
   workspacePanels: EvaluatedPluginWorkspacePanelContribution[];
   commandCenterItems: PluginCommandCenterItemContribution[];
   clientSlashCommands: PluginClientSlashCommandContribution[];
@@ -33,7 +45,13 @@ export interface EvaluatedPlugin {
 }
 
 export interface InstalledPlugin extends EvaluatedPlugin {
+  lifetime: AbortController;
+  /** The plugin's one Paseo client, `usePaseo()` in every surface; disposed at teardown. */
+  paseo: PaseoApi;
+  /** Calls one of the plugin's server RPC methods on its host. */
+  invoke(method: string, input: unknown): Promise<unknown>;
   serverId: string;
+  requirements?: PluginRequirements;
   clientBundle: string;
   queryClient: QueryClient;
 }
@@ -44,7 +62,9 @@ export type {
   PluginClientSlashCommandContribution,
   PluginComposerPillContribution,
   PluginSidebarContribution,
-  PluginSurfaceContribution,
+  PluginSidebarItemContribution,
+  PluginScreenContribution,
+  PluginSettingsScreenContribution,
   PluginThemeContribution,
   PluginTimelineRendererContribution,
   PluginTimelineTransformerContribution,
diff --git a/packages/app/src/plugins/workspace-panels/locations.test.ts b/packages/app/src/plugins/workspace-panels/locations.test.ts
index d0e69478da..af5cade055 100644
--- a/packages/app/src/plugins/workspace-panels/locations.test.ts
+++ b/packages/app/src/plugins/workspace-panels/locations.test.ts
@@ -1,8 +1,11 @@
+import appPackage from "../../../package.json";
 import { describe, expect, it, vi } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { pluginRegistry } from "../registry";
 import { panelTargetSupportsHost, resolvePluginPanelOpenLocation } from "./locations";
 
+const audio = { play: async () => 0 };
+
 vi.mock("../navigation", () => ({
   createPluginNavigation: () => ({}),
 }));
@@ -12,7 +15,8 @@ vi.mock("../client-runtime", () => ({
     rpc: async () => undefined,
     openSurface: () => undefined,
     openPanel: () => undefined,
-    addComposerPill: () => () => undefined,
+    addComposerPill: () => ({ update() {}, remove() {} }),
+    addHeaderButton: () => ({ update() {}, remove() {} }),
   }),
 }));
 
@@ -30,9 +34,14 @@ function install(locations: readonly ("workspace" | "explorer")[]) {
       return function() {};
     }};
   })`;
-  pluginRegistry.installCatalog("host-1", [{ id: "review", clientBundle: bundle }], {
-    client: {} as DaemonClient,
-  });
+  pluginRegistry.installCatalog(
+    "host-1",
+    [{ id: "review", requirements: { paseo: `>=${appPackage.version}` }, clientBundle: bundle }],
+    {
+      client: {} as DaemonClient,
+      audio,
+    },
+  );
   return pluginRegistry.getSnapshot()[0]!;
 }
 
diff --git a/packages/app/src/plugins/workspace-panels/locations.ts b/packages/app/src/plugins/workspace-panels/locations.ts
index 7248ccbe61..1c8cfbfb90 100644
--- a/packages/app/src/plugins/workspace-panels/locations.ts
+++ b/packages/app/src/plugins/workspace-panels/locations.ts
@@ -1,4 +1,7 @@
-import type { PluginPanelLocation, PluginWorkspacePanelContribution } from "@getpaseo/plugin";
+import type {
+  PluginPanelLocation,
+  PluginWorkspacePanelContribution,
+} from "@getpaseo/plugin/client";
 import type { PaneHost } from "@/panels/panel-manifest";
 import { panelSupportsHost } from "@/panels/panel-manifest";
 import type { PluginWorkspaceTabTarget, WorkspaceTabTarget } from "@/workspace-tabs/model";
diff --git a/packages/app/src/plugins/workspace-panels/panel.tsx b/packages/app/src/plugins/workspace-panels/panel.tsx
index 2acca92bd2..998f7e90ff 100644
--- a/packages/app/src/plugins/workspace-panels/panel.tsx
+++ b/packages/app/src/plugins/workspace-panels/panel.tsx
@@ -1,13 +1,9 @@
-import type {
-  PluginAgentPanelProps,
-  PluginHostProps,
-  PluginTheme,
-  PluginWorkspacePanelProps,
-} from "@getpaseo/plugin";
-import { PluginClientStateProvider } from "@getpaseo/plugin/host";
+import type { PluginAgentPanelProps, PluginWorkspacePanelProps } from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
+import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
 import { CircleAlert } from "lucide-react-native";
 import { useMemo } from "react";
-import { Platform, Text, View } from "react-native";
+import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import invariant from "tiny-invariant";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -23,21 +19,15 @@ import { createPluginClientStateSource } from "../client-state/source";
 import { toPluginTheme } from "../theme";
 import { resolvePluginIcon } from "../icons";
 import { useInstalledPlugin } from "../registry";
-import { PluginRuntimeBoundary } from "../runtime-boundary";
-import { createPluginSurfaceRuntime } from "../surface-runtime";
+import { PluginInstallationProvider } from "../installation-provider";
 import { SurfaceErrorBoundary } from "../surface-error-boundary";
 import { resolvePluginWorkspacePanel } from "./resolution";
+import { resolvePluginPlatform } from "../platform";
 
 const pluginThemeMapping = (theme: Theme) => ({
   theme: toPluginTheme(theme),
 });
 
-function resolvePlatform(): PluginHostProps["layout"]["platform"] {
-  if (Platform.OS === "ios") return "ios";
-  if (Platform.OS === "android") return "android";
-  return "web";
-}
-
 function PluginPanelBody({ theme }: { theme: PluginTheme }) {
   const { serverId, workspaceId, target } = usePaneContext();
   invariant(target.kind === "plugin", "PluginPanel requires plugin target");
@@ -54,22 +44,18 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
     );
   });
   const client = useHostRuntimeClient(serverId);
-  const runtime = useMemo(
-    () => createPluginSurfaceRuntime(client, target.pluginId),
-    [client, target.pluginId],
-  );
   const compact = useIsCompactFormFactor();
   const hosts = useHosts();
   const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
   const host = useMemo(() => ({ id: serverId, label: hostLabel }), [hostLabel, serverId]);
-  const layout = useMemo(() => ({ compact, platform: resolvePlatform() }), [compact]);
+  const layout = useMemo(() => ({ compact, platform: resolvePluginPlatform() }), [compact]);
   const stateSource = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
   const navigation = usePluginHostNavigation(serverId);
 
   if (!plugin || !contribution || !workspaceExists) {
     return <PluginPanelUnavailable />;
   }
-  if (!runtime) {
+  if (!client) {
     return <PluginPanelUnavailable message="Plugin host is offline." />;
   }
 
@@ -110,9 +96,9 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
       Surface={Surface}
       key={`${serverId}/${target.pluginId}/${target.panelId}/${target.context}`}
     >
-      <PluginRuntimeBoundary plugin={plugin} runtime={runtime}>
+      <PluginInstallationProvider plugin={plugin}>
         <PluginClientStateProvider source={stateSource}>{panel}</PluginClientStateProvider>
-      </PluginRuntimeBoundary>
+      </PluginInstallationProvider>
     </SurfaceErrorBoundary>
   );
 }
diff --git a/packages/app/src/plugins/workspace-panels/resolution.test.ts b/packages/app/src/plugins/workspace-panels/resolution.test.ts
index 8ca204b8ba..a7e46de422 100644
--- a/packages/app/src/plugins/workspace-panels/resolution.test.ts
+++ b/packages/app/src/plugins/workspace-panels/resolution.test.ts
@@ -8,10 +8,15 @@ function installed(): InstalledPlugin {
     id: "review",
     serverId: "host-1",
     clientBundle: "bundle",
+    lifetime: new AbortController(),
     queryClient: new QueryClient(),
+    paseo: {} as InstalledPlugin["paseo"],
+    invoke: async () => undefined,
     cleanup: () => {},
+    settingsScreens: [],
     surfaces: [],
-    sidebarItems: [],
+    sidebarItems: { header: [], footer: [] },
+    legacySidebarItems: [],
     workspacePanels: [
       {
         id: "details",
diff --git a/packages/app/src/plugins/workspace-panels/resolution.ts b/packages/app/src/plugins/workspace-panels/resolution.ts
index b2436c6c52..7a9355e72a 100644
--- a/packages/app/src/plugins/workspace-panels/resolution.ts
+++ b/packages/app/src/plugins/workspace-panels/resolution.ts
@@ -1,4 +1,4 @@
-import type { PluginWorkspacePanelContribution } from "@getpaseo/plugin";
+import type { PluginWorkspacePanelContribution } from "@getpaseo/plugin/client";
 import type { InstalledPlugin } from "../types";
 import type { PluginWorkspaceTabTarget } from "@/workspace-tabs/model";
 
diff --git a/packages/app/src/polyfills/install-early.ts b/packages/app/src/polyfills/install-early.ts
new file mode 100644
index 0000000000..0ee6ca02fa
--- /dev/null
+++ b/packages/app/src/polyfills/install-early.ts
@@ -0,0 +1,12 @@
+// Side-effect module imported first by index.ts. Babel hoists imports above
+// statements, so polyfill calls written in index.ts would run only after every
+// imported module had evaluated. Modules that read these globals at load time,
+// such as @xterm/headless reading navigator.userAgent, need them installed here.
+import { polyfillCrypto } from "./crypto";
+import { polyfillNavigator } from "./navigator";
+import { polyfillScreenOrientation } from "./screen-orientation";
+
+polyfillCrypto();
+polyfillNavigator();
+// Polyfill screen.orientation for WebKitGTK desktop runtimes that lack the API.
+polyfillScreenOrientation();
diff --git a/packages/app/src/polyfills/navigator-startup.test.ts b/packages/app/src/polyfills/navigator-startup.test.ts
new file mode 100644
index 0000000000..49a0fc69a2
--- /dev/null
+++ b/packages/app/src/polyfills/navigator-startup.test.ts
@@ -0,0 +1,56 @@
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { createContext, runInContext } from "node:vm";
+import ts from "typescript";
+import { expect, it } from "vitest";
+
+it("installs navigator before the app entry loads its other dependencies", () => {
+  const entry = ts.createSourceFile(
+    "index.ts",
+    readFileSync(new URL("../../index.ts", import.meta.url), "utf8"),
+    ts.ScriptTarget.Latest,
+  );
+  const firstImport = entry.statements.find(ts.isImportDeclaration);
+  expect(firstImport?.moduleSpecifier.getText(entry)).toBe('"./src/polyfills/install-early"');
+  const early = ts.createSourceFile(
+    "install-early.ts",
+    readFileSync(new URL("./install-early.ts", import.meta.url), "utf8"),
+    ts.ScriptTarget.Latest,
+  );
+  expect(
+    early.statements.some(
+      (statement) =>
+        ts.isExpressionStatement(statement) &&
+        ts.isCallExpression(statement.expression) &&
+        statement.expression.expression.getText(early) === "polyfillNavigator",
+    ),
+  ).toBe(true);
+});
+
+it("initializes the native navigator before evaluating the real terminal dependency", () => {
+  const require = createRequire(import.meta.url);
+  const terminalSource = readFileSync(require.resolve("@xterm/headless"), "utf8");
+  const navigatorSource = ts.transpileModule(
+    readFileSync(new URL("./navigator.ts", import.meta.url), "utf8"),
+    { compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 } },
+  ).outputText;
+  // Each VM owns its globals, so the native navigator shape never replaces
+  // globals in the test runner or needs a native-module mock.
+  const uninitialized = createContext({
+    navigator: {},
+    window: {},
+    module: { exports: {} },
+    exports: {},
+  });
+  expect(() => runInContext(terminalSource, uninitialized)).toThrow(/includes/);
+
+  const initialized = createContext({
+    navigator: {},
+    window: {},
+    module: { exports: {} },
+    exports: {},
+  });
+  runInContext(navigatorSource, initialized);
+  runInContext("exports.polyfillNavigator()", initialized);
+  expect(() => runInContext(terminalSource, initialized)).not.toThrow();
+});
diff --git a/packages/app/src/provider-selection/provider-selection.ts b/packages/app/src/provider-selection/provider-selection.ts
index ca8be17b85..ae00dd9528 100644
--- a/packages/app/src/provider-selection/provider-selection.ts
+++ b/packages/app/src/provider-selection/provider-selection.ts
@@ -5,7 +5,7 @@ import type {
   ProviderSnapshotEntry,
 } from "@getpaseo/protocol/agent-types";
 import type { AgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";
-import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
 import { i18n } from "@/i18n/i18next";
 import { compareMatchScores, scoreTextFields } from "@getpaseo/protocol/search/text-match";
 import { filterSelectableModels } from "./model-catalog";
@@ -286,19 +286,22 @@ export function resolveEffectiveComposerThinkingOptionId(
   return selectedModelDefinition?.defaultThinkingOptionId ?? "";
 }
 
-export function buildDraftCommandConfig(input: {
+export function buildDraftCommandTarget(input: {
   selection: ProviderSelectionState;
   cwd: string;
   effectiveModelId: string;
   effectiveThinkingOptionId: string;
   featureValues?: Record<string, unknown>;
-}): DraftCommandConfig | undefined {
+}): DraftCommandTarget {
   const cwd = input.cwd.trim();
-  if (!input.selection.provider || !cwd) {
-    return undefined;
+  if (!cwd) {
+    return { status: "needs-project" };
+  }
+  if (!input.selection.provider) {
+    return { status: "needs-provider" };
   }
 
-  return {
+  const config = {
     provider: input.selection.provider,
     cwd,
     ...(input.selection.modeOptions.length > 0 && input.selection.modeId !== ""
@@ -310,6 +313,7 @@ export function buildDraftCommandConfig(input: {
       : {}),
     ...(input.featureValues ? { featureValues: input.featureValues } : {}),
   };
+  return { status: "ready", config };
 }
 
 export function resolveSubmissionReadiness(input: {
diff --git a/packages/app/src/provider-selection/resolve-agent-form.test.ts b/packages/app/src/provider-selection/resolve-agent-form.test.ts
index 5b6cc2a509..3912d87e13 100644
--- a/packages/app/src/provider-selection/resolve-agent-form.test.ts
+++ b/packages/app/src/provider-selection/resolve-agent-form.test.ts
@@ -2,9 +2,9 @@ import { describe, expect, it } from "vitest";
 import {
   resolveAgentForm,
   resolveFormState,
+  resolveEffectiveModel,
   resolveThinkingOptionId,
   mergeSelectedComposerPreferences,
-  combineInitialValues,
   buildProviderDefinitionMap,
   buildProviderDefinitionMapForStatuses,
   resolveDefaultModel,
@@ -90,12 +90,11 @@ function makeState(
 ): AgentFormReducerState {
   return {
     form: {
-      serverId: null,
       provider: null,
       modeId: "",
       model: "",
       thinkingOptionId: "",
-      workingDir: "",
+
       ...overrides,
     },
     userModified: { ...INITIAL_USER_MODIFIED, ...modified },
@@ -262,35 +261,6 @@ describe("resolveThinkingOptionId", () => {
   });
 });
 
-describe("combineInitialValues", () => {
-  it("returns undefined when no initial values and no initial server id", () => {
-    expect(combineInitialValues(undefined, null)).toBeUndefined();
-  });
-
-  it("does not inject a null serverId override when initialValues are present but serverId is absent", () => {
-    const combined = combineInitialValues({}, null);
-    expect(combined).toEqual({});
-    expect(Object.prototype.hasOwnProperty.call(combined, "serverId")).toBe(false);
-  });
-
-  it("injects serverId from options when provided", () => {
-    expect(combineInitialValues({}, "daemon-1")).toEqual({ serverId: "daemon-1" });
-  });
-
-  it("keeps other initial values without forcing serverId", () => {
-    const combined = combineInitialValues({ workingDir: "/repo" }, null);
-    expect(combined).toEqual({ workingDir: "/repo" });
-    expect(Object.prototype.hasOwnProperty.call(combined, "serverId")).toBe(false);
-  });
-
-  it("respects an explicit serverId override (including null) over initialServerId", () => {
-    expect(combineInitialValues({ serverId: null }, "daemon-1")).toEqual({ serverId: null });
-    expect(combineInitialValues({ serverId: "daemon-2" }, "daemon-1")).toEqual({
-      serverId: "daemon-2",
-    });
-  });
-});
-
 describe("mergeSelectedComposerPreferences", () => {
   it("stores the selected model for the selected provider", () => {
     expect(
@@ -534,7 +504,7 @@ describe("resolveFormState", () => {
     expect(resolved.thinkingOptionId).toBe("low");
   });
 
-  it("clears an invalid provider instead of falling back to the first allowed provider", () => {
+  it("preserves the remembered provider when it is absent from the available catalogue", () => {
     const resolved = resolveFormState(
       undefined,
       { provider: "codex" },
@@ -545,7 +515,7 @@ describe("resolveFormState", () => {
       claudeProviderMap,
     );
 
-    expect(resolved.provider).toBeNull();
+    expect(resolved.provider).toBe("codex");
   });
 
   it("preserves a user-selected provider and model while that provider is loading during refresh", () => {
@@ -582,12 +552,10 @@ describe("resolveFormState", () => {
       {},
       null,
       {
-        serverId: false,
         provider: true,
         modeId: true,
         model: true,
         thinkingOptionId: true,
-        workingDir: false,
       },
       makeState({
         provider: "codex",
@@ -677,7 +645,7 @@ describe("resolveFormState", () => {
     expect(resolved.modeId).toBe("auto");
   });
 
-  it("ignores disabled ready providers when resolving selectable defaults", () => {
+  it("preserves saved intent even when a provider is disabled", () => {
     const entries: ProviderSnapshotEntry[] = [
       {
         provider: "codex",
@@ -715,8 +683,8 @@ describe("resolveFormState", () => {
       selectableProviderMap,
     );
 
-    expect(resolved.provider).toBe("codex");
-    expect(resolved.modeId).toBe("auto");
+    expect(resolved.provider).toBe("claude");
+    expect(resolved.modeId).toBe("");
   });
 
   it("excludes disabled providers from the selectable provider map without removing them from snapshot definitions", () => {
@@ -752,7 +720,7 @@ describe("resolveFormState", () => {
     expect(providerDefinitions.map((d) => d.id)).toEqual(["codex", "claude"]);
   });
 
-  it("clears a user-selected provider when the refreshed snapshot marks it unavailable", () => {
+  it("preserves a user-selected provider when the refreshed snapshot marks it unavailable", () => {
     const unavailableEntries: ProviderSnapshotEntry[] = [
       {
         provider: "codex",
@@ -785,7 +753,13 @@ describe("resolveFormState", () => {
       undefined,
       {},
       null,
-      { ...INITIAL_USER_MODIFIED, provider: true },
+      {
+        ...INITIAL_USER_MODIFIED,
+        provider: true,
+        modeId: true,
+        model: true,
+        thinkingOptionId: true,
+      },
       makeState({
         provider: "codex",
         modeId: "full-access",
@@ -796,10 +770,10 @@ describe("resolveFormState", () => {
       resolvableProviderMap,
     );
 
-    expect(resolved.provider).toBeNull();
-    expect(resolved.modeId).toBe("");
-    expect(resolved.model).toBe("");
-    expect(resolved.thinkingOptionId).toBe("");
+    expect(resolved.provider).toBe("codex");
+    expect(resolved.modeId).toBe("full-access");
+    expect(resolved.model).toBe("gpt-5.3-codex");
+    expect(resolved.thinkingOptionId).toBe("xhigh");
   });
 
   it("does not force fallback provider when allowed provider map is empty", () => {
@@ -817,8 +791,63 @@ describe("resolveFormState", () => {
   });
 });
 
+it("keeps the explicit model when a refreshed catalogue no longer lists it", () => {
+  const resolved = resolveFormState(
+    undefined,
+    { provider: "codex", providerPreferences: { codex: { model: "gpt-6-astra" } } },
+    CODEX_MODELS,
+    INITIAL_USER_MODIFIED,
+    makeState().form,
+    codexProviderMap,
+  );
+  expect(resolved.model).toBe("gpt-6-astra");
+  // Label/persistence lookup must not reinterpret the submitted ID as another model.
+  expect(resolveEffectiveModel(CODEX_MODELS, resolved.model)).toBeNull();
+});
+
 describe("resolveAgentForm", () => {
   describe("resolution state", () => {
+    it.each(["error", "unavailable"] as const)(
+      "restores a remembered model after opening against a %s provider snapshot",
+      (status) => {
+        const preferences = {
+          provider: "codex",
+          providerPreferences: { codex: { model: "gpt-5.3-codex" } },
+        };
+        const snapshotEntries: ProviderSnapshotEntry[] = [
+          {
+            provider: "codex",
+            enabled: true,
+            status,
+            models: [],
+          },
+        ];
+        const opened = resolveAgentForm(makeState(), {
+          type: "COMPLETE_RESOLUTION",
+          initialValues: undefined,
+          preferences,
+          providerModelsByProvider: makeProviderModelsByProvider([["codex", []]]),
+          allowedProviderMap: buildProviderDefinitionMapForStatuses({
+            snapshotEntries,
+            providerDefinitions: buildProviderDefinitions(snapshotEntries),
+            statuses: new Set(["ready", "loading"]),
+          }),
+        });
+        const recovered = resolveAgentForm(opened, {
+          type: "COMPLETE_RESOLUTION",
+          initialValues: undefined,
+          preferences,
+          providerModelsByProvider: makeProviderModelsByProvider([["codex", CODEX_MODELS]]),
+          allowedProviderMap: codexProviderMap,
+        });
+
+        expect(recovered.form).toMatchObject({
+          provider: "codex",
+          model: "gpt-5.3-codex",
+        });
+      },
+    );
+
     it("requests resolution without changing the current form values", () => {
       const state = makeState(
         { provider: "codex", modeId: "auto", model: "gpt-5.3-codex" },
@@ -833,7 +862,7 @@ describe("resolveAgentForm", () => {
     });
 
     it("completes a pending open resolution when snapshot models arrive late", () => {
-      const state = resolveAgentForm(makeState({ serverId: "host-1" }), {
+      const state = resolveAgentForm(makeState(), {
         type: "REQUEST_RESOLUTION",
       });
       const next = resolveAgentForm(state, {
@@ -855,7 +884,7 @@ describe("resolveAgentForm", () => {
     });
 
     it("does not change settled selection when a background snapshot has different defaults", () => {
-      const settled = resolveAgentForm(makeState({ serverId: "host-1" }), {
+      const settled = resolveAgentForm(makeState(), {
         type: "COMPLETE_RESOLUTION",
         initialValues: undefined,
         preferences: {
@@ -885,7 +914,7 @@ describe("resolveAgentForm", () => {
     });
 
     it("prefills edit hydration from initial values", () => {
-      const state = makeState({ serverId: "host-1" });
+      const state = makeState();
       const next = resolveAgentForm(state, {
         type: "COMPLETE_RESOLUTION",
         initialValues: {
@@ -893,7 +922,6 @@ describe("resolveAgentForm", () => {
           modeId: "full-access",
           model: "gpt-5.3-codex",
           thinkingOptionId: "low",
-          workingDir: "/repo",
         },
         preferences: { provider: "claude" },
         providerModelsByProvider: makeProviderModelsByProvider([["codex", CODEX_MODELS]]),
@@ -904,7 +932,6 @@ describe("resolveAgentForm", () => {
       expect(next.form.modeId).toBe("full-access");
       expect(next.form.model).toBe("gpt-5.3-codex");
       expect(next.form.thinkingOptionId).toBe("low");
-      expect(next.form.workingDir).toBe("/repo");
     });
 
     it("keeps a user model change after resolution has completed", () => {
@@ -912,7 +939,7 @@ describe("resolveAgentForm", () => {
         ...CODEX_MODELS,
         { provider: "codex", id: "gpt-5.4-codex", label: "gpt-5.4-codex" },
       ];
-      const settled = resolveAgentForm(makeState({ serverId: "host-1" }), {
+      const settled = resolveAgentForm(makeState(), {
         type: "COMPLETE_RESOLUTION",
         initialValues: undefined,
         preferences: {
@@ -958,26 +985,6 @@ describe("resolveAgentForm", () => {
     });
   });
 
-  describe("SET_SERVER_ID", () => {
-    it("updates serverId without marking it user-modified", () => {
-      const state = makeState();
-      const next = resolveAgentForm(state, { type: "SET_SERVER_ID", value: "host-1" });
-
-      expect(next.form.serverId).toBe("host-1");
-      expect(next.userModified.serverId).toBe(false);
-    });
-  });
-
-  describe("SET_SERVER_ID_FROM_USER", () => {
-    it("updates serverId and marks it user-modified", () => {
-      const state = makeState();
-      const next = resolveAgentForm(state, { type: "SET_SERVER_ID_FROM_USER", value: "host-2" });
-
-      expect(next.form.serverId).toBe("host-2");
-      expect(next.userModified.serverId).toBe(true);
-    });
-  });
-
   describe("SET_PROVIDER_AND_MODEL_FROM_USER", () => {
     it("sets provider, model, and default mode; marks both modified", () => {
       const state = makeState();
@@ -1167,51 +1174,6 @@ describe("resolveAgentForm", () => {
     });
   });
 
-  describe("SET_WORKING_DIR", () => {
-    it("updates workingDir without marking it modified", () => {
-      const state = makeState();
-      const next = resolveAgentForm(state, { type: "SET_WORKING_DIR", value: "/home/user/proj" });
-
-      expect(next.form.workingDir).toBe("/home/user/proj");
-      expect(next.userModified.workingDir).toBe(false);
-    });
-  });
-
-  describe("SET_WORKING_DIR_FROM_USER", () => {
-    it("updates workingDir and marks it modified", () => {
-      const state = makeState();
-      const next = resolveAgentForm(state, {
-        type: "SET_WORKING_DIR_FROM_USER",
-        value: "/home/user/proj",
-      });
-
-      expect(next.form.workingDir).toBe("/home/user/proj");
-      expect(next.userModified.workingDir).toBe(true);
-    });
-  });
-
-  describe("AUTO_SELECT_SERVER", () => {
-    it("sets serverId when currently null", () => {
-      const state = makeState({ serverId: null });
-      const next = resolveAgentForm(state, {
-        type: "AUTO_SELECT_SERVER",
-        candidateServerId: "host-1",
-      });
-
-      expect(next.form.serverId).toBe("host-1");
-    });
-
-    it("does not override an already-set serverId", () => {
-      const state = makeState({ serverId: "existing" });
-      const next = resolveAgentForm(state, {
-        type: "AUTO_SELECT_SERVER",
-        candidateServerId: "host-1",
-      });
-
-      expect(next).toBe(state);
-    });
-  });
-
   describe("RESET", () => {
     it("keeps form values but marks them unresolved for the next open", () => {
       const state = makeState(
@@ -1276,3 +1238,34 @@ describe("resolveAgentForm", () => {
     });
   });
 });
+
+it("owns input readiness, reopening and user edits in the reducer", () => {
+  const inputs = {
+    type: "INPUTS_CHANGED" as const,
+    serverId: "host",
+    isVisible: true,
+    isCreateFlow: true,
+    isPreferencesLoading: true,
+    hasSnapshot: false,
+    initialValues: undefined,
+    preferences: { provider: "codex", providerPreferences: { codex: { model: "astra" } } },
+    allowedProviderMap: new Map(),
+    providerModelsByProvider: new Map(),
+  };
+  let state = resolveAgentForm(makeState(), inputs);
+  expect(state.resolution.status).toBe("pending");
+  state = resolveAgentForm(state, { ...inputs, isPreferencesLoading: false, hasSnapshot: true });
+  expect(state.form).toMatchObject({ provider: "codex", model: "astra" });
+  state = resolveAgentForm(state, {
+    type: "SET_MODEL_FROM_USER",
+    modelId: "manual",
+    availableModels: null,
+    providerPrefs: undefined,
+  });
+  state = resolveAgentForm(state, { ...inputs, isPreferencesLoading: false, hasSnapshot: true });
+  expect(state.form.model).toBe("manual");
+  state = resolveAgentForm(state, { ...inputs, isVisible: false });
+  expect(state.resolution.status).toBe("pending");
+  state = resolveAgentForm(state, { ...inputs, isPreferencesLoading: false, hasSnapshot: true });
+  expect(state.form).toMatchObject({ provider: "codex", model: "astra" });
+});
diff --git a/packages/app/src/provider-selection/resolve-agent-form.ts b/packages/app/src/provider-selection/resolve-agent-form.ts
index 9fa187200e..08e88fd7a3 100644
--- a/packages/app/src/provider-selection/resolve-agent-form.ts
+++ b/packages/app/src/provider-selection/resolve-agent-form.ts
@@ -12,30 +12,24 @@ import {
 import { findModelByReference } from "./model-catalog";
 
 export interface FormInitialValues {
-  serverId?: string | null;
   provider?: AgentProvider;
   modeId?: string | null;
   model?: string | null;
   thinkingOptionId?: string | null;
-  workingDir?: string;
 }
 
 export interface FormState {
-  serverId: string | null;
   provider: AgentProvider | null;
   modeId: string;
   model: string;
   thinkingOptionId: string;
-  workingDir: string;
 }
 
 export interface UserModifiedFields {
-  serverId: boolean;
   provider: boolean;
   modeId: boolean;
   model: boolean;
   thinkingOptionId: boolean;
-  workingDir: boolean;
 }
 
 export type ProviderModelsByProvider = Map<AgentProvider, AgentModelDefinition[] | null>;
@@ -46,15 +40,18 @@ export interface AgentFormReducerState {
   form: FormState;
   userModified: UserModifiedFields;
   resolution: AgentFormResolutionState;
+  inputs?: {
+    serverId: string | null;
+    initialValues: FormInitialValues | undefined;
+    active: boolean;
+  };
 }
 
 export const INITIAL_USER_MODIFIED: UserModifiedFields = {
-  serverId: false,
   provider: false,
   modeId: false,
   model: false,
   thinkingOptionId: false,
-  workingDir: false,
 };
 
 export const PENDING_AGENT_FORM_RESOLUTION: AgentFormResolutionState = { status: "pending" };
@@ -68,7 +65,21 @@ export const RESOLVABLE_PROVIDER_STATUSES = new Set<ProviderSnapshotEntry["statu
 ]);
 export const SELECTABLE_PROVIDER_STATUSES = new Set<ProviderSnapshotEntry["status"]>(["ready"]);
 
+interface AgentFormInputs {
+  type: "INPUTS_CHANGED";
+  serverId: string | null;
+  isVisible: boolean;
+  isCreateFlow: boolean;
+  isPreferencesLoading: boolean;
+  hasSnapshot: boolean;
+  initialValues: FormInitialValues | undefined;
+  preferences: FormPreferences | null;
+  providerModelsByProvider: ProviderModelsByProvider;
+  allowedProviderMap: Map<AgentProvider, AgentProviderDefinition>;
+}
+
 export type AgentFormAction =
+  | AgentFormInputs
   | { type: "REQUEST_RESOLUTION" }
   | {
       type: "COMPLETE_RESOLUTION";
@@ -77,8 +88,6 @@ export type AgentFormAction =
       providerModelsByProvider: ProviderModelsByProvider;
       allowedProviderMap: Map<AgentProvider, AgentProviderDefinition>;
     }
-  | { type: "SET_SERVER_ID"; value: string | null }
-  | { type: "SET_SERVER_ID_FROM_USER"; value: string | null }
   | {
       type: "SET_PROVIDER_AND_MODEL_FROM_USER";
       provider: AgentProvider;
@@ -106,9 +115,6 @@ export type AgentFormAction =
     }
   | { type: "CLEAR_PROVIDER_SELECTION_FROM_USER" }
   | { type: "SET_THINKING_OPTION_FROM_USER"; thinkingOptionId: string }
-  | { type: "SET_WORKING_DIR"; value: string }
-  | { type: "SET_WORKING_DIR_FROM_USER"; value: string }
-  | { type: "AUTO_SELECT_SERVER"; candidateServerId: string }
   | { type: "RESET" };
 
 type CompleteResolutionAction = Extract<AgentFormAction, { type: "COMPLETE_RESOLUTION" }>;
@@ -144,7 +150,7 @@ export function resolveEffectiveModel(
 ): AgentModelDefinition | null {
   if (!availableModels || availableModels.length === 0) return null;
   if (!normalizeSelectedModelId(modelId)) return null;
-  return findModelByReference(availableModels, modelId) ?? resolveDefaultModel(availableModels);
+  return findModelByReference(availableModels, modelId) ?? null;
 }
 
 function resolvePreferredThinkingOptionId(input: {
@@ -216,36 +222,12 @@ export function mergeSelectedComposerPreferences(args: {
   });
 }
 
-export function combineInitialValues(
-  initialValues: FormInitialValues | undefined,
-  initialServerId: string | null,
-): FormInitialValues | undefined {
-  const hasExplicitServerId = initialValues?.serverId !== undefined;
-  const serverIdFromOptions = initialServerId === null ? undefined : initialServerId;
-
-  if (!initialValues && !hasExplicitServerId && serverIdFromOptions === undefined) {
-    return undefined;
-  }
-
-  if (hasExplicitServerId) {
-    return { ...initialValues, serverId: initialValues?.serverId };
-  }
-
-  if (serverIdFromOptions !== undefined) {
-    return { ...initialValues, serverId: serverIdFromOptions };
-  }
-
-  return initialValues;
-}
-
 export function hasFormStateChanged(prev: FormState, next: FormState): boolean {
   return (
-    prev.serverId !== next.serverId ||
     prev.provider !== next.provider ||
     prev.modeId !== next.modeId ||
     prev.model !== next.model ||
-    prev.thinkingOptionId !== next.thinkingOptionId ||
-    prev.workingDir !== next.workingDir
+    prev.thinkingOptionId !== next.thinkingOptionId
   );
 }
 
@@ -282,29 +264,11 @@ function resolveProvider(input: {
   userModified: boolean;
   initialValues: FormInitialValues | undefined;
   preferences: FormPreferences | null;
-  allowedProviderMap: Map<AgentProvider, AgentProviderDefinition>;
 }): AgentProvider | null {
-  const { currentProvider, userModified, initialValues, preferences, allowedProviderMap } = input;
-  if (userModified) {
-    if (
-      currentProvider &&
-      allowedProviderMap.size > 0 &&
-      !allowedProviderMap.has(currentProvider)
-    ) {
-      return null;
-    }
-    return currentProvider;
-  }
-  if (initialValues?.provider && allowedProviderMap.has(initialValues.provider)) {
-    return initialValues.provider;
-  }
-  if (preferences?.provider && allowedProviderMap.has(preferences.provider)) {
-    return preferences.provider;
-  }
-  if (currentProvider && allowedProviderMap.size > 0 && !allowedProviderMap.has(currentProvider)) {
-    return null;
-  }
-  return currentProvider;
+  const { currentProvider, userModified, initialValues, preferences } = input;
+  // Discovery readiness does not change the user's saved or explicit choice.
+  if (userModified) return currentProvider;
+  return initialValues?.provider ?? preferences?.provider ?? currentProvider;
 }
 
 function resolveModeId(input: {
@@ -340,16 +304,22 @@ function resolveModelField(input: {
   if (!provider) return "";
   const initialModel = normalizeSelectedModelId(initialValues?.model);
   const preferredModel = normalizeSelectedModelId(providerPrefs?.model);
-  const defaultModelId = resolveDefaultModelId(availableModels);
+  // COMPAT(default-model-id): added in v0.7.2, remove after 2026-12-06.
+  // Older drafts used "default" before providers exposed concrete model IDs.
+  if ((initialModel || preferredModel) === "default" && availableModels?.length) {
+    return (
+      findModelByReference(availableModels, "default")?.id || resolveDefaultModelId(availableModels)
+    );
+  }
   if (initialModel) {
     return !availableModels
       ? initialModel
-      : resolveCanonicalModelId(availableModels, initialModel) || defaultModelId;
+      : resolveCanonicalModelId(availableModels, initialModel) || initialModel;
   }
   if (preferredModel) {
     return !availableModels
       ? preferredModel
-      : resolveCanonicalModelId(availableModels, preferredModel) || defaultModelId;
+      : resolveCanonicalModelId(availableModels, preferredModel) || preferredModel;
   }
   return "";
 }
@@ -403,7 +373,6 @@ export function resolveFormState(
     userModified: userModified.provider,
     initialValues,
     preferences,
-    allowedProviderMap,
   });
 
   const providerDef = result.provider ? allowedProviderMap.get(result.provider) : undefined;
@@ -447,14 +416,6 @@ export function resolveFormState(
     });
   }
 
-  if (!userModified.serverId && initialValues?.serverId !== undefined) {
-    result.serverId = initialValues.serverId;
-  }
-
-  if (!userModified.workingDir && initialValues?.workingDir !== undefined) {
-    result.workingDir = initialValues.workingDir;
-  }
-
   return result;
 }
 
@@ -615,11 +576,45 @@ function applyProfile(state: AgentFormReducerState, action: ApplyProfileAction)
   };
 }
 
+function sameInitialValues(left: FormInitialValues = {}, right: FormInitialValues = {}): boolean {
+  return (
+    left.provider === right.provider &&
+    left.model === right.model &&
+    left.modeId === right.modeId &&
+    left.thinkingOptionId === right.thinkingOptionId
+  );
+}
+
+function receiveInputs(
+  state: AgentFormReducerState,
+  action: AgentFormInputs,
+): AgentFormReducerState {
+  const active = action.isVisible && action.isCreateFlow;
+  const previous = state.inputs;
+  const initial = action.initialValues;
+  const changed =
+    previous?.active !== active ||
+    previous.serverId !== action.serverId ||
+    !sameInitialValues(previous.initialValues, initial);
+  let next = state;
+  if (changed) {
+    next = {
+      ...resolveAgentForm(state, { type: action.isVisible ? "REQUEST_RESOLUTION" : "RESET" }),
+      inputs: { serverId: action.serverId, initialValues: initial, active },
+    };
+  }
+  if (!active || action.isPreferencesLoading || !action.serverId || !action.hasSnapshot)
+    return next;
+  return completeResolution(next, { ...action, type: "COMPLETE_RESOLUTION" });
+}
+
 export function resolveAgentForm(
   state: AgentFormReducerState,
   action: AgentFormAction,
 ): AgentFormReducerState {
   switch (action.type) {
+    case "INPUTS_CHANGED":
+      return receiveInputs(state, action);
     case "REQUEST_RESOLUTION":
       return {
         ...state,
@@ -630,16 +625,6 @@ export function resolveAgentForm(
     case "COMPLETE_RESOLUTION":
       return completeResolution(state, action);
 
-    case "SET_SERVER_ID":
-      return { ...state, form: { ...state.form, serverId: action.value } };
-
-    case "SET_SERVER_ID_FROM_USER":
-      return {
-        ...state,
-        form: { ...state.form, serverId: action.value },
-        userModified: { ...state.userModified, serverId: true },
-      };
-
     case "SET_PROVIDER_AND_MODEL_FROM_USER": {
       const normalizedModelId = resolveCanonicalModelId(action.providerModels, action.modelId);
       const nextModelId = normalizedModelId || resolveDefaultModelId(action.providerModels);
@@ -730,20 +715,6 @@ export function resolveAgentForm(
         userModified: { ...state.userModified, thinkingOptionId: true },
       };
 
-    case "SET_WORKING_DIR":
-      return { ...state, form: { ...state.form, workingDir: action.value } };
-
-    case "SET_WORKING_DIR_FROM_USER":
-      return {
-        ...state,
-        form: { ...state.form, workingDir: action.value },
-        userModified: { ...state.userModified, workingDir: true },
-      };
-
-    case "AUTO_SELECT_SERVER":
-      if (state.form.serverId) return state;
-      return { ...state, form: { ...state.form, serverId: action.candidateServerId } };
-
     case "RESET":
       return {
         ...state,
diff --git a/packages/app/src/provider-usage/card.tsx b/packages/app/src/provider-usage/card.tsx
deleted file mode 100644
index 10ef161fcc..0000000000
--- a/packages/app/src/provider-usage/card.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { getProviderIcon } from "@/components/provider-icons";
-import { StatusBadge } from "@/components/ui/status-badge";
-import type { Theme } from "@/styles/theme";
-import { ProviderUsageBalanceBar } from "./balance-bar";
-import { formatAgo } from "./format";
-import type { ProviderUsage } from "./types";
-import { ProviderUsageWindowBar } from "./window-bar";
-
-interface ProviderUsageIconProps {
-  iconKey: string;
-  size: number;
-  color?: string;
-}
-
-function ProviderUsageIcon({ iconKey, size, color = "" }: ProviderUsageIconProps) {
-  const Icon = getProviderIcon(iconKey);
-  return <Icon size={size} color={color} />;
-}
-
-const ThemedProviderUsageIcon = withUnistyles(ProviderUsageIcon);
-
-const mutedIconColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-function statusText(usage: ProviderUsage): string | null {
-  if (usage.status === "available") return null;
-  return usage.status === "error" ? "Error" : "Unavailable";
-}
-
-function footerText(usage: ProviderUsage): string | null {
-  const updated = formatAgo(usage.fetchedAt);
-  const parts = [usage.sourceLabel, updated ? `Updated ${updated}` : null].filter(
-    (part): part is string => typeof part === "string" && part.length > 0,
-  );
-  return parts.length > 0 ? parts.join(" · ") : null;
-}
-
-export function ProviderUsageCard({
-  usage,
-  compact = false,
-}: {
-  usage: ProviderUsage;
-  compact?: boolean;
-}) {
-  const status = statusText(usage);
-  const footer = footerText(usage);
-  const balances = usage.balances ?? [];
-  const details = usage.details ?? [];
-
-  const containerStyle = useMemo(
-    () => [styles.container, compact ? styles.containerCompact : styles.containerPadded],
-    [compact],
-  );
-  const dotStyle = useMemo(
-    () => [
-      styles.statusDot,
-      usage.status === "available" && styles.statusDotAvailable,
-      usage.status === "error" && styles.statusDotError,
-    ],
-    [usage.status],
-  );
-
-  return (
-    <View style={containerStyle}>
-      <View style={styles.header}>
-        <ThemedProviderUsageIcon iconKey={usage.providerId} size={14} uniProps={mutedIconColor} />
-        <Text style={styles.name} numberOfLines={1}>
-          {usage.displayName}
-        </Text>
-        {usage.planLabel ? <StatusBadge label={usage.planLabel} variant="muted" /> : null}
-        <View style={styles.headerSpacer} />
-        {status ? (
-          <View style={styles.statusRow}>
-            <View style={dotStyle} />
-            <Text style={styles.statusLabel}>{status}</Text>
-          </View>
-        ) : null}
-      </View>
-
-      {usage.error ? (
-        <Text style={styles.error} numberOfLines={3}>
-          {usage.error}
-        </Text>
-      ) : null}
-
-      {usage.windows.length > 0 || balances.length > 0 ? (
-        <View style={styles.bars}>
-          {usage.windows.map((window) => (
-            <ProviderUsageWindowBar key={window.id} window={window} />
-          ))}
-          {balances.map((balance) => (
-            <ProviderUsageBalanceBar key={balance.id} balance={balance} />
-          ))}
-        </View>
-      ) : null}
-
-      {details.length > 0 ? (
-        <View style={styles.details}>
-          {details.map((detail) => (
-            <View key={detail.id} style={styles.detailRow}>
-              <Text style={styles.detailLabel} numberOfLines={1}>
-                {detail.label}
-              </Text>
-              <Text style={styles.detailValue} numberOfLines={1}>
-                {detail.value}
-              </Text>
-            </View>
-          ))}
-        </View>
-      ) : null}
-
-      {footer ? (
-        <Text style={styles.footer} numberOfLines={1}>
-          {footer}
-        </Text>
-      ) : null}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    gap: theme.spacing[3],
-  },
-  containerPadded: {
-    gap: theme.spacing[4],
-    paddingVertical: theme.spacing[4],
-    paddingHorizontal: theme.spacing[4],
-  },
-  containerCompact: {
-    gap: theme.spacing[3],
-  },
-  header: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  name: {
-    flexShrink: 1,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-  headerSpacer: {
-    flex: 1,
-  },
-  statusRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-  },
-  statusDot: {
-    width: 8,
-    height: 8,
-    borderRadius: 4,
-    backgroundColor: theme.colors.foregroundMuted,
-  },
-  statusDotAvailable: {
-    backgroundColor: theme.colors.statusSuccess,
-  },
-  statusDotError: {
-    backgroundColor: theme.colors.statusDanger,
-  },
-  statusLabel: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  bars: {
-    gap: theme.spacing[3],
-  },
-  details: {
-    gap: theme.spacing[1],
-  },
-  detailRow: {
-    flexDirection: "row",
-    justifyContent: "space-between",
-    gap: theme.spacing[2],
-  },
-  detailLabel: {
-    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  detailValue: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-  },
-  error: {
-    color: theme.colors.palette.red[300],
-    fontSize: theme.fontSize.sm,
-    lineHeight: theme.fontSize.sm * 1.4,
-  },
-  footer: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-}));
diff --git a/packages/app/src/provider-usage/copy.ts b/packages/app/src/provider-usage/copy.ts
deleted file mode 100644
index 1dcc817ef5..0000000000
--- a/packages/app/src/provider-usage/copy.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// User-facing copy for the provider-usage surfaces, centralized so localization
-// is a single-file change. INTEGRATION: move these into the i18n resources
-// (a `providerUsage` namespace across all locales) and swap to `t(...)` at the
-// call sites once the feature is wired to data. Kept inline for now because the
-// surfaces are not yet mounted and the locale files are being edited elsewhere.
-export const providerUsageCopy = {
-  title: "Plan usage",
-  refresh: "Refresh",
-  refreshing: "Refreshing...",
-  loading: "Loading usage...",
-  empty: "No usage data",
-  errorTitle: "Unable to load usage",
-  hostUnavailable: "Connect to this host to see provider usage",
-  hostUpgradeRequired: "Update the host to see provider usage",
-  clientUnavailable: "Host connection is not ready",
-  retry: "Try again",
-  tooltipLoading: "Loading plan usage…",
-} as const;
diff --git a/packages/app/src/provider-usage/list.tsx b/packages/app/src/provider-usage/list.tsx
deleted file mode 100644
index c9ff6742b2..0000000000
--- a/packages/app/src/provider-usage/list.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Fragment } from "react";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { settingsStyles } from "@/styles/settings";
-import { ProviderUsageCard } from "./card";
-import type { ProviderUsage } from "./types";
-
-export function ProviderUsageList({ providers }: { providers: ProviderUsage[] }) {
-  return (
-    <View style={settingsStyles.card}>
-      {providers.map((usage, index) => (
-        <Fragment key={usage.providerId}>
-          {index > 0 ? <View style={styles.divider} /> : null}
-          <ProviderUsageCard usage={usage} />
-        </Fragment>
-      ))}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  divider: {
-    height: 1,
-    backgroundColor: theme.colors.border,
-  },
-}));
diff --git a/packages/app/src/provider-usage/settings-section.tsx b/packages/app/src/provider-usage/settings-section.tsx
deleted file mode 100644
index cb8e8f6b55..0000000000
--- a/packages/app/src/provider-usage/settings-section.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { RefreshCw } from "lucide-react-native";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { Alert } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { settingsStyles } from "@/styles/settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
-import { providerUsageCopy } from "./copy";
-import { ProviderUsageList } from "./list";
-import type { ProviderUsageView } from "./types";
-
-export function ProviderUsageSettingsSection({
-  view,
-  onRefresh,
-}: {
-  view: ProviderUsageView;
-  onRefresh: () => void;
-}) {
-  const busy = view.kind === "loading" || (view.kind === "ready" && view.isRefreshing);
-
-  const refreshButton = useMemo(
-    () => (
-      <Button
-        variant="ghost"
-        size="sm"
-        leftIcon={RefreshCw}
-        loading={busy}
-        onPress={onRefresh}
-        accessibilityLabel={providerUsageCopy.refresh}
-      >
-        {busy ? providerUsageCopy.refreshing : providerUsageCopy.refresh}
-      </Button>
-    ),
-    [busy, onRefresh],
-  );
-
-  return (
-    <SettingsSection
-      title={providerUsageCopy.title}
-      testID="provider-usage-card"
-      trailing={refreshButton}
-    >
-      <ProviderUsageBody view={view} onRefresh={onRefresh} />
-    </SettingsSection>
-  );
-}
-
-function ProviderUsageBody({
-  view,
-  onRefresh,
-}: {
-  view: ProviderUsageView;
-  onRefresh: () => void;
-}) {
-  if (view.kind === "loading") {
-    return (
-      <View style={[settingsStyles.card, styles.emptyCard]}>
-        <Text style={styles.emptyText}>{providerUsageCopy.loading}</Text>
-      </View>
-    );
-  }
-
-  if (view.kind === "error") {
-    return (
-      <Alert variant="error" title={providerUsageCopy.errorTitle} description={view.message}>
-        <Button variant="outline" size="sm" onPress={onRefresh}>
-          {providerUsageCopy.retry}
-        </Button>
-      </Alert>
-    );
-  }
-
-  if (view.payload.providers.length === 0) {
-    return (
-      <View style={[settingsStyles.card, styles.emptyCard]}>
-        <Text style={styles.emptyText}>{providerUsageCopy.empty}</Text>
-      </View>
-    );
-  }
-
-  return <ProviderUsageList providers={view.payload.providers} />;
-}
-
-const styles = StyleSheet.create((theme) => ({
-  emptyCard: {
-    padding: theme.spacing[4],
-    alignItems: "center",
-  },
-  emptyText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-  },
-}));
diff --git a/packages/app/src/provider-usage/tone.ts b/packages/app/src/provider-usage/tone.ts
deleted file mode 100644
index 5cf6f68bab..0000000000
--- a/packages/app/src/provider-usage/tone.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { ProviderUsageTone } from "./types";
-
-export function deriveTone(usedPct: number | null | undefined): ProviderUsageTone {
-  if (usedPct == null) return "default";
-  if (usedPct > 90) return "danger";
-  if (usedPct >= 70) return "warning";
-  return "default";
-}
diff --git a/packages/app/src/provider-usage/tooltip-section.tsx b/packages/app/src/provider-usage/tooltip-section.tsx
deleted file mode 100644
index 6a5a896301..0000000000
--- a/packages/app/src/provider-usage/tooltip-section.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { ProviderUsageCard } from "./card";
-import { providerUsageCopy } from "./copy";
-import type { ProviderUsage, ProviderUsageView } from "./types";
-
-function matchProvider(
-  providers: ProviderUsage[],
-  activeProviderId: string | null | undefined,
-): ProviderUsage | null {
-  if (!activeProviderId) return null;
-  const target = activeProviderId.toLowerCase();
-  return providers.find((usage) => usage.providerId.toLowerCase() === target) ?? null;
-}
-
-// Renders the active agent's provider usage inside the context-meter tooltip.
-// Returns nothing when the active provider has no usage entry, so the meter's
-// own context section stays the whole tooltip.
-export function ProviderUsageTooltipSection({
-  view,
-  activeProviderId,
-}: {
-  view: ProviderUsageView;
-  activeProviderId: string | null | undefined;
-}) {
-  if (view.kind === "loading") {
-    return (
-      <>
-        <View style={styles.divider} />
-        <Text style={styles.detail}>{providerUsageCopy.tooltipLoading}</Text>
-      </>
-    );
-  }
-
-  if (view.kind === "error") {
-    return (
-      <>
-        <View style={styles.divider} />
-        <Text style={styles.error}>{view.message}</Text>
-      </>
-    );
-  }
-
-  const usage = matchProvider(view.payload.providers, activeProviderId);
-  if (!usage) return null;
-
-  return (
-    <>
-      <View style={styles.divider} />
-      <ProviderUsageCard usage={usage} compact />
-    </>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  divider: {
-    height: 1,
-    // Same token the popover draws its own outline with, so the rule reads as the
-    // popover's edge. `border` is invisible here (equals the popover background).
-    backgroundColor: theme.colors.borderAccent,
-    marginVertical: theme.spacing[2],
-    // Cancel the tooltip content's horizontal padding so the rule spans edge to edge.
-    marginHorizontal: -theme.spacing[2],
-  },
-  detail: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    lineHeight: theme.fontSize.sm * 1.4,
-  },
-  error: {
-    color: theme.colors.palette.red[300],
-    fontSize: theme.fontSize.sm,
-    lineHeight: theme.fontSize.sm * 1.4,
-  },
-}));
diff --git a/packages/app/src/provider-usage/types.ts b/packages/app/src/provider-usage/types.ts
deleted file mode 100644
index 52ff7c31f0..0000000000
--- a/packages/app/src/provider-usage/types.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {
-  ProviderUsage,
-  ProviderUsageBalance,
-  ProviderUsageDetail,
-  ProviderUsageListResponseMessage,
-  ProviderUsageStatus,
-  ProviderUsageTone,
-  ProviderUsageWindow,
-} from "@getpaseo/protocol/messages";
-
-export type {
-  ProviderUsage,
-  ProviderUsageBalance,
-  ProviderUsageDetail,
-  ProviderUsageStatus,
-  ProviderUsageTone,
-  ProviderUsageWindow,
-};
-
-export type ProviderUsageBalanceUnit = ProviderUsageBalance["unit"];
-export type ProviderUsageListPayload = ProviderUsageListResponseMessage["payload"];
-
-export type ProviderUsageView =
-  | { kind: "loading" }
-  | { kind: "error"; message: string }
-  | { kind: "ready"; payload: ProviderUsageListPayload; isRefreshing: boolean };
diff --git a/packages/app/src/provider-usage/use-provider-usage.ts b/packages/app/src/provider-usage/use-provider-usage.ts
deleted file mode 100644
index ce133726c3..0000000000
--- a/packages/app/src/provider-usage/use-provider-usage.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { useSessionStore } from "@/stores/session-store";
-import { providerUsageCopy } from "./copy";
-import type { ProviderUsageListPayload, ProviderUsageView } from "./types";
-
-export const PROVIDER_USAGE_STALE_TIME_MS = 5 * 60 * 1000;
-
-type ProviderUsageClient = Pick<DaemonClient, "listProviderUsage">;
-
-export function providerUsageQueryKey(serverId: string | null | undefined) {
-  return ["providerUsage", serverId ?? ""] as const;
-}
-
-async function fetchProviderUsage(client: ProviderUsageClient): Promise<ProviderUsageListPayload> {
-  return client.listProviderUsage();
-}
-
-interface UseProviderUsageOptions {
-  enabled?: boolean;
-}
-
-export function useProviderUsage(
-  serverId: string | null | undefined,
-  options: UseProviderUsageOptions = {},
-): {
-  view: ProviderUsageView;
-  refresh: () => Promise<void>;
-  canFetch: boolean;
-} {
-  const queryClient = useQueryClient();
-  const client = useHostRuntimeClient(serverId ?? "");
-  const isConnected = useHostRuntimeIsConnected(serverId ?? "");
-  const supportsProviderUsage = useSessionStore(
-    (state) => state.sessions[serverId ?? ""]?.serverInfo?.features?.providerUsageList === true,
-  );
-  const queryKey = useMemo(() => providerUsageQueryKey(serverId), [serverId]);
-  const canFetch = Boolean(serverId && client && isConnected && supportsProviderUsage);
-  const enabled = Boolean((options.enabled ?? true) && canFetch);
-
-  const queryFn = useCallback(async () => {
-    if (!client) {
-      throw new Error(providerUsageCopy.clientUnavailable);
-    }
-    return fetchProviderUsage(client);
-  }, [client]);
-
-  const query = useQuery({
-    queryKey,
-    queryFn,
-    enabled,
-    staleTime: PROVIDER_USAGE_STALE_TIME_MS,
-    refetchOnMount: true,
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-  });
-
-  const refresh = useCallback(async () => {
-    if (!canFetch) return;
-    await queryClient.invalidateQueries({ queryKey });
-    await queryClient.fetchQuery({
-      queryKey,
-      queryFn,
-      staleTime: PROVIDER_USAGE_STALE_TIME_MS,
-    });
-  }, [canFetch, queryClient, queryFn, queryKey]);
-
-  const view = useMemo<ProviderUsageView>(() => {
-    if (!serverId || !client || !isConnected) {
-      return { kind: "error", message: providerUsageCopy.hostUnavailable };
-    }
-    if (!supportsProviderUsage) {
-      return { kind: "error", message: providerUsageCopy.hostUpgradeRequired };
-    }
-    if (query.data) {
-      return {
-        kind: "ready",
-        payload: query.data,
-        isRefreshing: query.isFetching,
-      };
-    }
-    if (query.isError) {
-      return {
-        kind: "error",
-        message: query.error instanceof Error ? query.error.message : String(query.error),
-      };
-    }
-    return { kind: "loading" };
-  }, [
-    client,
-    isConnected,
-    query.data,
-    query.error,
-    query.isError,
-    query.isFetching,
-    serverId,
-    supportsProviderUsage,
-  ]);
-
-  return { view, refresh, canFetch };
-}
diff --git a/packages/app/src/provider-usage/window-bar.tsx b/packages/app/src/provider-usage/window-bar.tsx
deleted file mode 100644
index 0bd198521b..0000000000
--- a/packages/app/src/provider-usage/window-bar.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { useMemo } from "react";
-import { Text, View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { clampPct, formatPct, formatResetLabel } from "./format";
-import { deriveTone } from "./tone";
-import type { ProviderUsageTone, ProviderUsageWindow } from "./types";
-
-function resolveUsedPct(window: ProviderUsageWindow): number | null {
-  if (window.usedPct != null) return window.usedPct;
-  if (window.remainingPct != null) return 100 - window.remainingPct;
-  return null;
-}
-
-function fillToneStyle(tone: ProviderUsageTone) {
-  switch (tone) {
-    case "ok":
-      return styles.fillOk;
-    case "warning":
-      return styles.fillWarning;
-    case "danger":
-      return styles.fillDanger;
-    default:
-      return styles.fillDefault;
-  }
-}
-
-export function ProviderUsageWindowBar({ window }: { window: ProviderUsageWindow }) {
-  const usedPct = resolveUsedPct(window);
-  const tone = window.tone ?? deriveTone(usedPct);
-
-  const fillWidth = clampPct(usedPct ?? 0);
-  const fillStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.fill, fillToneStyle(tone), { width: `${fillWidth}%` }],
-    [fillWidth, tone],
-  );
-
-  const isAtRisk = window.runsOutAt != null && window.shortfallPct != null;
-  const trailing = isAtRisk
-    ? `runs out ${formatResetLabel(window.runsOutAt)?.replace("resets ", "") ?? ""}`.trim()
-    : formatResetLabel(window.resetsAt);
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.labelRow}>
-        <Text style={styles.label} numberOfLines={1}>
-          {window.label}
-        </Text>
-        <Text style={styles.value}>
-          {usedPct != null ? formatPct(usedPct) : "—"}
-          {trailing ? (
-            <Text style={isAtRisk ? styles.atRisk : styles.reset}>{` · ${trailing}`}</Text>
-          ) : null}
-        </Text>
-      </View>
-      <View style={styles.track}>
-        <View style={fillStyle} />
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    gap: 3,
-  },
-  labelRow: {
-    flexDirection: "row",
-    justifyContent: "space-between",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  label: {
-    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  value: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.medium,
-  },
-  reset: {
-    color: theme.colors.foregroundMuted,
-    fontWeight: theme.fontWeight.normal,
-  },
-  atRisk: {
-    color: theme.colors.statusDanger,
-    fontWeight: theme.fontWeight.normal,
-  },
-  track: {
-    height: 4,
-    borderRadius: 2,
-    backgroundColor: theme.colors.surface3,
-    overflow: "hidden",
-  },
-  fill: {
-    height: 4,
-    borderRadius: 2,
-  },
-  fillDefault: {
-    backgroundColor: theme.colors.foregroundMuted,
-  },
-  fillOk: {
-    backgroundColor: theme.colors.statusSuccess,
-  },
-  fillWarning: {
-    backgroundColor: theme.colors.statusWarning,
-  },
-  fillDanger: {
-    backgroundColor: theme.colors.statusDanger,
-  },
-}));
diff --git a/packages/app/src/review/comment-sheet.tsx b/packages/app/src/review/comment-sheet.tsx
new file mode 100644
index 0000000000..d54ec0ec96
--- /dev/null
+++ b/packages/app/src/review/comment-sheet.tsx
@@ -0,0 +1,106 @@
+import { useCallback, useMemo } from "react";
+import { Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { FormTextInput } from "@/components/ui/form-field";
+import { Button } from "@/components/ui/button";
+import type { InlineReviewActions, InlineReviewEditorState } from "./geometry";
+
+export function ReviewCommentSheet({
+  editor,
+  reviewActions,
+  onChangeBody,
+  enabled,
+}: {
+  enabled: boolean | undefined;
+  editor: InlineReviewEditorState | null;
+  reviewActions: InlineReviewActions;
+  onChangeBody: (body: string) => void;
+}) {
+  if (enabled === false || !editor) return null;
+  return (
+    <OpenReviewCommentSheet
+      editor={editor}
+      reviewActions={reviewActions}
+      onChangeBody={onChangeBody}
+    />
+  );
+}
+
+function OpenReviewCommentSheet({
+  editor,
+  reviewActions,
+  onChangeBody,
+}: {
+  editor: InlineReviewEditorState;
+  reviewActions: InlineReviewActions;
+  onChangeBody: (body: string) => void;
+}) {
+  const { t } = useTranslation();
+  const context = `${editor.target.filePath} · ${editor.target.side === "old" ? "−" : "+"}${editor.target.lineNumber}`;
+  const header = useMemo(
+    () => ({
+      title: t("review.comment.label"),
+      subtitle: <Text style={styles.context}>{context}</Text>,
+    }),
+    [context, t],
+  );
+  const { onSaveEditor, onCancelEditor } = reviewActions;
+  const handleSave = useCallback(() => onSaveEditor(editor.body), [onSaveEditor, editor.body]);
+  const canSave = editor.body.trim().length > 0;
+  const footer = useMemo(
+    () => (
+      <View style={styles.actions}>
+        <Button
+          size="md"
+          variant="secondary"
+          accessibilityLabel={t("review.comment.cancelAccessibility")}
+          onPress={onCancelEditor}
+        >
+          {t("review.comment.cancel")}
+        </Button>
+        <Button
+          size="md"
+          variant="default"
+          accessibilityLabel={t("review.comment.saveAccessibility")}
+          disabled={!canSave}
+          onPress={handleSave}
+        >
+          {t("common.actions.save")}
+        </Button>
+      </View>
+    ),
+    [canSave, handleSave, onCancelEditor, t],
+  );
+  return (
+    <AdaptiveModalSheet
+      visible
+      header={header}
+      onClose={onCancelEditor}
+      snapPoints={COMMENT_SNAP_POINTS}
+      scrollable={false}
+      testID="review-comment-sheet"
+      footer={footer}
+    >
+      <FormTextInput
+        key={editor.target.key + (editor.commentId ?? "new")}
+        size="md"
+        multiline
+        accessibilityLabel={t("review.comment.label")}
+        placeholder={t("review.comment.placeholder")}
+        initialValue={editor.body}
+        onChangeText={onChangeBody}
+        style={styles.input}
+      />
+    </AdaptiveModalSheet>
+  );
+}
+
+const COMMENT_SNAP_POINTS = ["50%", "90%"];
+
+const styles = StyleSheet.create((theme) => ({
+  context: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm },
+  input: { flex: 1, minHeight: 0, textAlignVertical: "top" },
+  actions: { flex: 1, flexDirection: "row", justifyContent: "flex-end", gap: theme.spacing[2] },
+}));
diff --git a/packages/app/src/review/editor/index.test.ts b/packages/app/src/review/editor/index.test.ts
new file mode 100644
index 0000000000..6735adef34
--- /dev/null
+++ b/packages/app/src/review/editor/index.test.ts
@@ -0,0 +1,145 @@
+import { describe, expect, it } from "vitest";
+import { createReviewEditor, createReviewEditorScope, type ReviewCommentWriter } from "./index";
+import type { ReviewDraftComment } from "../state";
+import type { ReviewableDiffTarget } from "@/utils/diff-layout";
+
+const target: ReviewableDiffTarget = {
+  key: "src/example.ts:new:2",
+  filePath: "src/example.ts",
+  side: "new",
+  lineNumber: 2,
+  hunkHeader: "@@ -1,2 +1,2 @@",
+  hunkIndex: 0,
+  lineIndex: 2,
+  oldLineNumber: null,
+  newLineNumber: 2,
+  lineType: "add",
+  content: "const value = next;",
+};
+
+function memoryWriter() {
+  const drafts = new Map<string, ReviewDraftComment[]>();
+  let sequence = 0;
+  const writer: ReviewCommentWriter = {
+    saveComment: ({ key, id, comment }) => {
+      const current = drafts.get(key) ?? [];
+      if (id && current.some((saved) => saved.id === id)) {
+        drafts.set(
+          key,
+          current.map((saved) => (saved.id === id ? { ...saved, ...comment } : saved)),
+        );
+      } else {
+        const saved = {
+          ...comment,
+          id: String(++sequence),
+          createdAt: "2026-10-09T00:00:00Z",
+          updatedAt: "2026-10-09T00:00:00Z",
+        };
+        drafts.set(key, [...current, saved]);
+      }
+    },
+    deleteComment: ({ key, id }) => {
+      drafts.set(
+        key,
+        (drafts.get(key) ?? []).filter((comment) => comment.id !== id),
+      );
+    },
+  };
+  return { writer, comments: (key: string) => drafts.get(key) ?? [] };
+}
+
+describe("review editor", () => {
+  it("saves trimmed comments, edits the same record, and cancels without altering saved comments", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.setBody("  First comment  ");
+    editor.save(editor.getState()!.body);
+    expect(editor.getState()).toBeNull();
+    const saved = storage.comments("first")[0]!;
+    expect(saved).toMatchObject({
+      filePath: target.filePath,
+      side: "new",
+      lineNumber: 2,
+      body: "First comment",
+    });
+    editor.edit(target, saved);
+    editor.setBody("Discarded edit");
+    editor.cancel();
+    expect(storage.comments("first")).toEqual([saved]);
+    editor.edit(target, saved);
+    editor.save(" Updated comment ");
+    expect(storage.comments("first")).toEqual([{ ...saved, body: "Updated comment" }]);
+    editor.start(target);
+    editor.setBody("Discarded new comment");
+    editor.cancel();
+    expect(storage.comments("first")).toHaveLength(1);
+  });
+
+  it("keeps an open edit saveable after its submitted record is acknowledged", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.save("Submitted body");
+    const saved = storage.comments("first")[0]!;
+    editor.edit(target, saved);
+    editor.setBody("Typed before acknowledgement");
+    storage.writer.deleteComment({ key: "first", id: saved.id });
+    expect(editor.getState()!.body).toBe("Typed before acknowledgement");
+    editor.save(editor.getState()!.body);
+    expect(storage.comments("first")).toMatchObject([
+      {
+        body: "Typed before acknowledgement",
+        filePath: target.filePath,
+        lineNumber: target.lineNumber,
+      },
+    ]);
+  });
+
+  it("rejects empty saves and repeated saves after the editor closes", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.save(" \n ");
+    expect(editor.getState()).toEqual({ target, commentId: null, body: "" });
+    expect(storage.comments("first")).toEqual([]);
+    editor.save("Saved once");
+    editor.save("Duplicate");
+    expect(storage.comments("first").map((comment) => comment.body)).toEqual(["Saved once"]);
+  });
+
+  it("isolates draft ownership and closes an editor when its saved comment is deleted", () => {
+    const storage = memoryWriter();
+    const first = createReviewEditor("first", storage.writer);
+    const second = createReviewEditor("second", storage.writer);
+    first.start(target);
+    first.save("First workspace");
+    const saved = storage.comments("first")[0]!;
+    first.edit(target, saved);
+    expect(second.getState()).toBeNull();
+    second.start(target);
+    second.save("Second workspace");
+    first.delete(saved.id);
+    expect(first.getState()).toBeNull();
+    expect(storage.comments("first")).toEqual([]);
+    expect(storage.comments("second").map((comment) => comment.body)).toEqual(["Second workspace"]);
+  });
+});
+
+it("retains an open editor through remounts without exposing it on another surface or draft", async () => {
+  const storage = memoryWriter();
+  const scope = createReviewEditorScope(storage.writer);
+  const editor = scope.forDraft("first", "diff");
+  const unsubscribe = editor.subscribe(() => {});
+  editor.start(target);
+  editor.setBody("Unsaved wide body");
+  unsubscribe();
+  await Promise.resolve();
+  const compact = scope.forDraft("first", "diff");
+  expect(compact.getState()!.body).toBe("Unsaved wide body");
+  expect(scope.forDraft("first", "combined").getState()).toBeNull();
+  expect(scope.forDraft("second", "diff").getState()).toBeNull();
+  compact.save(compact.getState()!.body);
+  expect(storage.comments("first")[0]!.body).toBe("Unsaved wide body");
+  expect(scope.forDraft("first", "diff").getState()).toBeNull();
+});
diff --git a/packages/app/src/review/editor/index.ts b/packages/app/src/review/editor/index.ts
new file mode 100644
index 0000000000..6a7741eceb
--- /dev/null
+++ b/packages/app/src/review/editor/index.ts
@@ -0,0 +1,84 @@
+import type { ReviewableDiffTarget } from "@/utils/diff-layout";
+import type { InlineReviewEditorState } from "../geometry";
+import type { ReviewDraftComment } from "../state";
+
+export interface ReviewCommentWriter {
+  saveComment: (input: {
+    key: string;
+    id: string | null;
+    comment: Pick<ReviewDraftComment, "filePath" | "side" | "lineNumber" | "body">;
+  }) => void;
+  deleteComment: (input: { key: string; id: string }) => void;
+}
+
+/** One editor belongs to one review draft; replacing the draft creates a fresh editor. */
+export function createReviewEditor(key: string, writer: ReviewCommentWriter) {
+  return buildReviewEditor(key, writer, () => {});
+}
+
+function buildReviewEditor(key: string, writer: ReviewCommentWriter, onUnused: () => void) {
+  let editor: InlineReviewEditorState | null = null;
+  const listeners = new Set<() => void>();
+  function publish(next: InlineReviewEditorState | null) {
+    editor = next;
+    listeners.forEach((listener) => listener());
+    if (!editor && listeners.size === 0) onUnused();
+  }
+  return {
+    getState: () => editor,
+    subscribe: (listener: () => void) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+        queueMicrotask(() => {
+          if (!editor && listeners.size === 0) onUnused();
+        });
+      };
+    },
+    start: (target: ReviewableDiffTarget) => publish({ target, commentId: null, body: "" }),
+    edit: (target: ReviewableDiffTarget, comment: ReviewDraftComment) =>
+      publish({ target, commentId: comment.id, body: comment.body }),
+    setBody: (body: string) => {
+      if (editor) publish({ ...editor, body });
+    },
+    cancel: () => publish(null),
+    save: (body: string) => {
+      const trimmedBody = body.trim();
+      if (!editor || !trimmedBody) return;
+      writer.saveComment({
+        key,
+        id: editor.commentId,
+        comment: {
+          filePath: editor.target.filePath,
+          side: editor.target.side,
+          lineNumber: editor.target.lineNumber,
+          body: trimmedBody,
+        },
+      });
+      publish(null);
+    },
+    delete: (id: string) => {
+      writer.deleteComment({ key, id });
+      if (editor?.commentId === id) publish(null);
+    },
+  };
+}
+
+/** An open draft survives presentation remounts; each presentation owns its editor for that draft. */
+export function createReviewEditorScope(writer: ReviewCommentWriter) {
+  const editors = new Map<string, ReturnType<typeof createReviewEditor>>();
+  return {
+    forDraft(key: string, presentation: string) {
+      const owner = JSON.stringify([key, presentation]);
+      let model = editors.get(owner);
+      if (!model) {
+        const created = buildReviewEditor(key, writer, () => {
+          if (editors.get(owner) === created) editors.delete(owner);
+        });
+        model = created;
+        editors.set(owner, model);
+      }
+      return model;
+    },
+  };
+}
diff --git a/packages/app/src/review/feedback/index.test.ts b/packages/app/src/review/feedback/index.test.ts
new file mode 100644
index 0000000000..b423855b75
--- /dev/null
+++ b/packages/app/src/review/feedback/index.test.ts
@@ -0,0 +1,272 @@
+import { describe, expect, it } from "vitest";
+import {
+  createReviewFeedback,
+  createReviewFeedbackScope,
+  type ReviewFeedbackPorts,
+  type ReviewFeedbackSnapshot,
+  type FeedbackAttachment,
+  type FeedbackRecipient,
+} from "./index";
+import type { ReviewDraftComment } from "../state";
+
+function makeComment(id: string, body = id): ReviewDraftComment {
+  return {
+    id,
+    body,
+    filePath: "sample.ts",
+    side: "new",
+    lineNumber: 2,
+    createdAt: "2026-10-09T00:00:00Z",
+    updatedAt: "2026-10-09T00:00:00Z",
+  };
+}
+function makeRecipient(agentId: string): FeedbackRecipient {
+  return {
+    agentId,
+    tab: {
+      key: `agent_${agentId}`,
+      tabId: `agent_${agentId}`,
+      kind: "agent",
+      target: { kind: "agent", agentId },
+    },
+  };
+}
+function makeAttachment(comments: readonly ReviewDraftComment[]): FeedbackAttachment | null {
+  if (!comments.length) return null;
+  const line = {
+    type: "add" as const,
+    content: "const value = 1",
+    oldLineNumber: null,
+    newLineNumber: 2,
+  };
+  return {
+    kind: "review",
+    reviewDraftKey: "draft",
+    commentCount: comments.length,
+    attachment: {
+      type: "review",
+      mimeType: "application/paseo-review",
+      cwd: "/workspace",
+      mode: "uncommitted",
+      baseRef: null,
+      comments: comments.map((comment) => ({
+        filePath: comment.filePath,
+        side: comment.side,
+        lineNumber: comment.lineNumber,
+        body: comment.body,
+        context: { hunkHeader: "@@ -1 +1 @@", targetLine: line, lines: [line] },
+      })),
+    },
+  };
+}
+function setup(agentIds: string[], unavailableIds: string[] = [], create = createReviewFeedback) {
+  let comments = [makeComment("first")];
+  let recipients = agentIds.map(makeRecipient);
+  let connected = true;
+  let rejectSend: ((error: Error) => void) | null = null;
+  let resolveSend: (() => void) | null = null;
+  const sends: Array<{ recipient: FeedbackRecipient; attachment: FeedbackAttachment }> = [];
+  const read = (): ReviewFeedbackSnapshot => ({
+    comments,
+    recipients,
+    connected,
+    attachment: makeAttachment(comments.filter((comment) => !unavailableIds.includes(comment.id))),
+  });
+  const ports: ReviewFeedbackPorts = {
+    read,
+    send: (recipient, attachment) => {
+      sends.push({ recipient, attachment });
+      return new Promise<void>((resolve, reject) => {
+        resolveSend = resolve;
+        rejectSend = reject;
+      });
+    },
+    clearSent: (sent) => {
+      comments = comments.filter(
+        (current) =>
+          !sent.some(
+            (prior) =>
+              prior.id === current.id &&
+              prior.updatedAt === current.updatedAt &&
+              prior.body === current.body,
+          ),
+      );
+    },
+    failedMessage: () => "Failed to send",
+  };
+  const model = create(ports);
+  return {
+    model,
+    ports,
+    sends,
+    comments: () => comments,
+    setComments: (next: ReviewDraftComment[]) => {
+      comments = next;
+      model.refresh();
+    },
+    setRecipients: (ids: string[]) => {
+      recipients = ids.map(makeRecipient);
+      model.refresh();
+    },
+    disconnect: () => {
+      connected = false;
+      model.refresh();
+    },
+    succeed: () => resolveSend!(),
+    fail: () => rejectSend!(new Error("Host rejected feedback")),
+  };
+}
+
+describe("review feedback", () => {
+  it("counts only attached comments, freezes the sending count, and retains orphans", async () => {
+    const feedback = setup(["one"], ["orphan"]);
+    feedback.setComments([makeComment("first"), makeComment("orphan")]);
+    expect(feedback.model.getState()).toMatchObject({ commentCount: 2, sendableCommentCount: 1 });
+    const pending = feedback.model.press();
+    feedback.setComments([makeComment("first"), makeComment("orphan"), makeComment("added")]);
+    expect(feedback.model.getState()).toMatchObject({
+      phase: { kind: "sending", commentCount: 1 },
+      sendableCommentCount: 2,
+    });
+    expect(feedback.sends[0]!.attachment.commentCount).toBe(1);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([makeComment("orphan"), makeComment("added")]);
+  });
+  it("retains an entirely orphaned draft without claiming any comments are sendable", async () => {
+    const feedback = setup(["one"], ["first"]);
+    expect(feedback.model.getState()).toMatchObject({
+      commentCount: 1,
+      sendableCommentCount: 0,
+      disabledReason: "no-context",
+      canSend: false,
+    });
+    await feedback.model.press();
+    expect(feedback.sends).toEqual([]);
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+  });
+  it("retains comments and explains why no workspace agent can receive them", async () => {
+    const feedback = setup([]);
+    await feedback.model.press();
+    expect(feedback.model.getState()).toMatchObject({
+      canSend: false,
+      disabledReason: "no-agents",
+      commentCount: 1,
+    });
+    expect(feedback.sends).toEqual([]);
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+  });
+  it("sends once to the only recipient and clears only sent versions", async () => {
+    const feedback = setup(["one"]);
+    const pending = feedback.model.press();
+    await feedback.model.press();
+    await feedback.model.send("one");
+    expect(feedback.sends).toEqual([
+      { recipient: makeRecipient("one"), attachment: makeAttachment([makeComment("first")]) },
+    ]);
+    feedback.setComments([makeComment("first", "Edited during send"), makeComment("added")]);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([
+      makeComment("first", "Edited during send"),
+      makeComment("added"),
+    ]);
+    expect(feedback.model.getState().phase).toEqual({
+      kind: "sent",
+      recipient: makeRecipient("one"),
+    });
+  });
+  it("clears unchanged sent comments while preserving additions", async () => {
+    const feedback = setup(["one"]);
+    const pending = feedback.model.press();
+    feedback.setComments([makeComment("first"), makeComment("added")]);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([makeComment("added")]);
+  });
+  it("asks for a recipient when several tabs exist and validates the selection again", async () => {
+    const feedback = setup(["one", "two"]);
+    await feedback.model.press();
+    expect(feedback.model.getState().phase).toEqual({ kind: "choosing" });
+    expect(feedback.sends).toEqual([]);
+    feedback.setRecipients(["one"]);
+    await feedback.model.send("two");
+    expect(feedback.sends).toEqual([]);
+    const pending = feedback.model.send("one");
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([]);
+  });
+  it("retains comments on failure and retries using the latest saved version", async () => {
+    const feedback = setup(["one"]);
+    const failed = feedback.model.press();
+    feedback.fail();
+    await failed;
+    expect(feedback.model.getState().phase).toEqual({
+      kind: "failed",
+      message: "Host rejected feedback",
+    });
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+    feedback.setComments([makeComment("first", "Corrected before retry")]);
+    const retried = feedback.model.press();
+    feedback.succeed();
+    await retried;
+    expect(feedback.sends).toHaveLength(2);
+    expect(feedback.sends[1]!.attachment.attachment.comments[0]!.body).toBe(
+      "Corrected before retry",
+    );
+    expect(feedback.comments()).toEqual([]);
+  });
+  it("keeps workspace drafts independent and prevents disconnected sends", async () => {
+    const first = setup(["one"]);
+    const second = setup(["other"]);
+    first.disconnect();
+    await first.model.press();
+    expect(first.model.getState().disabledReason).toBe("disconnected");
+    const pending = second.model.press();
+    second.succeed();
+    await pending;
+    expect(first.comments()).toEqual([makeComment("first")]);
+    expect(first.sends).toEqual([]);
+    expect(second.comments()).toEqual([]);
+  });
+});
+
+describe("shared review submission ownership", () => {
+  it("blocks another surface and reconnects to the pending draft while other drafts remain usable", async () => {
+    const scope = createReviewFeedbackScope();
+    const first = setup(["one"], [], (ports) => scope.connect("workspace-one", ports));
+    const second = scope.connect("workspace-one", first.ports);
+    const other = setup(["other"], [], (ports) => scope.connect("workspace-other", ports));
+    const unsubscribe = first.model.subscribe(() => {});
+    const pending = first.model.press();
+    unsubscribe();
+    await Promise.resolve();
+    const reconnected = scope.connect("workspace-one", first.ports);
+    expect(second.getState()).toMatchObject({ canSend: false, phase: { kind: "sending" } });
+    await second.press();
+    await reconnected.send("one");
+    expect(first.sends).toHaveLength(1);
+    const otherPending = other.model.press();
+    expect(other.sends).toHaveLength(1);
+    first.fail();
+    await pending;
+    expect(second.getState().phase).toEqual({ kind: "failed", message: "Host rejected feedback" });
+    const retry = second.press();
+    first.succeed();
+    await retry;
+    expect(first.sends).toHaveLength(2);
+    other.succeed();
+    await otherPending;
+  });
+  it("opens only the active surface's recipient chooser", async () => {
+    const scope = createReviewFeedbackScope();
+    const first = setup(["one", "two"], [], (ports) => scope.connect("same", ports));
+    const second = scope.connect("same", first.ports);
+    await first.model.press();
+    expect(first.model.getState().phase).toEqual({ kind: "choosing" });
+    expect(second.getState().phase).toEqual({ kind: "idle" });
+    first.model.closeMenu();
+    expect(first.model.getState().phase).toEqual({ kind: "idle" });
+  });
+});
diff --git a/packages/app/src/review/feedback/index.ts b/packages/app/src/review/feedback/index.ts
new file mode 100644
index 0000000000..69e0592fe8
--- /dev/null
+++ b/packages/app/src/review/feedback/index.ts
@@ -0,0 +1,177 @@
+import type { ComposerAttachment } from "@/attachments/types";
+import type { ReviewDraftComment } from "../state";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+
+export interface FeedbackRecipient {
+  agentId: string;
+  tab: WorkspaceTabDescriptor;
+}
+export type FeedbackAttachment = Extract<ComposerAttachment, { kind: "review" }>;
+export interface ReviewFeedbackSnapshot {
+  comments: readonly ReviewDraftComment[];
+  attachment: FeedbackAttachment | null;
+  recipients: readonly FeedbackRecipient[];
+  connected: boolean;
+}
+export interface ReviewFeedbackPorts {
+  read: () => ReviewFeedbackSnapshot;
+  send: (recipient: FeedbackRecipient, attachment: FeedbackAttachment) => Promise<void>;
+  clearSent: (comments: readonly ReviewDraftComment[]) => void;
+  failedMessage: () => string;
+}
+export type FeedbackPhase =
+  | { kind: "idle" }
+  | { kind: "choosing" }
+  | { kind: "sending"; recipient: FeedbackRecipient; commentCount: number }
+  | { kind: "failed"; message: string }
+  | { kind: "sent"; recipient: FeedbackRecipient };
+export interface ReviewFeedbackState {
+  phase: FeedbackPhase;
+  commentCount: number;
+  sendableCommentCount: number;
+  recipients: readonly FeedbackRecipient[];
+  disabledReason: "no-agents" | "disconnected" | "no-context" | null;
+  canSend: boolean;
+}
+
+export function createReviewFeedback(ports: ReviewFeedbackPorts) {
+  return createFeedbackView(ports, createFeedbackWorkflow());
+}
+
+/** Surfaces share submission ownership while keeping their chooser and live inputs local. */
+export function createReviewFeedbackScope() {
+  const workflows = new Map<string, ReturnType<typeof createFeedbackWorkflow>>();
+  return {
+    connect(key: string, ports: ReviewFeedbackPorts) {
+      let workflow = workflows.get(key);
+      if (!workflow) {
+        const created = createFeedbackWorkflow(() => {
+          if (workflows.get(key) === created) workflows.delete(key);
+        });
+        workflow = created;
+        workflows.set(key, workflow);
+      }
+      return createFeedbackView(ports, workflow);
+    },
+  };
+}
+
+function createFeedbackWorkflow(onUnused: () => void = () => {}) {
+  let phase: FeedbackPhase = { kind: "idle" };
+  const observers = new Set<() => void>();
+  function releaseIfUnused() {
+    queueMicrotask(() => {
+      if (observers.size === 0 && phase.kind !== "sending") onUnused();
+    });
+  }
+  return {
+    getPhase: () => phase,
+    changePhase(next: FeedbackPhase) {
+      phase = next;
+      observers.forEach((observer) => observer());
+      releaseIfUnused();
+    },
+    subscribe(observer: () => void) {
+      observers.add(observer);
+      return () => {
+        observers.delete(observer);
+        releaseIfUnused();
+      };
+    },
+  };
+}
+
+function createFeedbackView(
+  ports: ReviewFeedbackPorts,
+  workflow: ReturnType<typeof createFeedbackWorkflow>,
+) {
+  let choosing = false;
+  const choosingPhase: FeedbackPhase = { kind: "choosing" };
+  const getPhase = () => (choosing ? choosingPhase : workflow.getPhase());
+  let state = deriveState(ports.read(), getPhase());
+  const listeners = new Set<() => void>();
+  function publish() {
+    state = deriveState(ports.read(), getPhase());
+    listeners.forEach((listener) => listener());
+  }
+  async function send(agentId: string) {
+    const snapshot = ports.read();
+    const current = deriveState(snapshot, workflow.getPhase());
+    const recipient = snapshot.recipients.find((candidate) => candidate.agentId === agentId);
+    if (!current.canSend || !recipient || !snapshot.attachment) return;
+    const attachment = snapshot.attachment;
+    const sentComments = snapshot.comments.filter((comment) =>
+      attachment.attachment.comments.some(
+        (sent) =>
+          sent.filePath === comment.filePath &&
+          sent.side === comment.side &&
+          sent.lineNumber === comment.lineNumber &&
+          sent.body === comment.body,
+      ),
+    );
+    choosing = false;
+    workflow.changePhase({ kind: "sending", recipient, commentCount: attachment.commentCount });
+    publish();
+    try {
+      await ports.send(recipient, attachment);
+      ports.clearSent(sentComments);
+      workflow.changePhase({ kind: "sent", recipient });
+    } catch (error) {
+      workflow.changePhase({
+        kind: "failed",
+        message: error instanceof Error ? error.message : ports.failedMessage(),
+      });
+    }
+    publish();
+  }
+  return {
+    getState: () => {
+      if (state.phase !== getPhase()) state = deriveState(ports.read(), getPhase());
+      return state;
+    },
+    subscribe: (listener: () => void) => {
+      listeners.add(listener);
+      const unsubscribe = workflow.subscribe(() => {
+        choosing = false;
+        publish();
+      });
+      return () => {
+        listeners.delete(listener);
+        unsubscribe();
+      };
+    },
+    refresh: publish,
+    press: async () => {
+      const snapshot = ports.read();
+      if (!deriveState(snapshot, workflow.getPhase()).canSend) return;
+      if (snapshot.recipients.length === 1) {
+        await send(snapshot.recipients[0]!.agentId);
+      } else {
+        choosing = true;
+        publish();
+      }
+    },
+    closeMenu: () => {
+      if (choosing) {
+        choosing = false;
+        publish();
+      }
+    },
+    send,
+  };
+}
+
+function deriveState(snapshot: ReviewFeedbackSnapshot, phase: FeedbackPhase): ReviewFeedbackState {
+  let disabledReason: ReviewFeedbackState["disabledReason"] = null;
+  if (snapshot.recipients.length === 0) disabledReason = "no-agents";
+  else if (!snapshot.connected) disabledReason = "disconnected";
+  else if (!snapshot.attachment) disabledReason = "no-context";
+  return {
+    phase,
+    commentCount: snapshot.comments.length,
+    sendableCommentCount: snapshot.attachment?.commentCount ?? 0,
+    recipients: snapshot.recipients,
+    disabledReason,
+    canSend: snapshot.comments.length > 0 && disabledReason === null && phase.kind !== "sending",
+  };
+}
diff --git a/packages/app/src/review/feedback/surface.tsx b/packages/app/src/review/feedback/surface.tsx
new file mode 100644
index 0000000000..7f87f46d88
--- /dev/null
+++ b/packages/app/src/review/feedback/surface.tsx
@@ -0,0 +1,284 @@
+import { useCallback, useMemo, type ReactNode } from "react";
+import { Text, View } from "react-native";
+import { Send } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { useMenuContext } from "@/components/ui/menu";
+import { Button } from "@/components/ui/button";
+import { buttonControlHeight } from "@/components/ui/control-geometry";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { SPACING } from "@/styles/theme";
+import { FloatingActionButton } from "@/components/ui/floating-action-button";
+import {
+  WorkspaceTabPresentationResolver,
+  WorkspaceTabIcon,
+  type WorkspaceTabPresentation,
+} from "@/screens/workspace/workspace-tab-presentation";
+import type { FeedbackRecipient, ReviewFeedbackState, createReviewFeedback } from "./index";
+
+type FeedbackModel = ReturnType<typeof createReviewFeedback>;
+interface ReviewFeedbackActionProps {
+  bottomOffset: number;
+  model: FeedbackModel;
+  state: ReviewFeedbackState;
+  serverId: string;
+  workspaceId: string;
+}
+
+export function ReviewFeedbackAction({
+  enabled,
+  hasDiff,
+  ...props
+}: Omit<ReviewFeedbackActionProps, "workspaceId"> & {
+  workspaceId?: string | null;
+  enabled: boolean | undefined;
+  hasDiff: boolean;
+}) {
+  if (enabled === false || !hasDiff) return null;
+  return <OpenReviewFeedbackAction {...props} workspaceId={props.workspaceId ?? ""} />;
+}
+
+function OpenReviewFeedbackAction({
+  model,
+  state,
+  serverId,
+  workspaceId,
+  bottomOffset,
+}: ReviewFeedbackActionProps) {
+  const { t } = useTranslation();
+  const { bottom } = useSafeAreaInsets();
+  const isCompact = useIsCompactFormFactor();
+  const onOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) model.closeMenu();
+    },
+    [model],
+  );
+  const noteStyle = useMemo(
+    () => [
+      styles.note,
+      !isCompact && styles.centered,
+      {
+        bottom:
+          bottom +
+          bottomOffset +
+          (isCompact ? 88 : buttonControlHeight.sm + SPACING[4] + SPACING[2]),
+      },
+    ],
+    [bottom, bottomOffset, isCompact],
+  );
+  const sending = state.phase.kind === "sending";
+  const label = t(sending ? "review.feedback.sending" : "review.feedback.send", {
+    count: state.phase.kind === "sending" ? state.phase.commentCount : state.sendableCommentCount,
+  });
+  const unavailableNotice =
+    state.disabledReason && state.commentCount > 0 ? (
+      <Text style={styles.text}>{t(`review.feedback.${state.disabledReason}`)}</Text>
+    ) : null;
+  let notice: ReactNode = unavailableNotice;
+  if (state.phase.kind === "failed")
+    notice = <Text style={styles.error}>{state.phase.message}</Text>;
+  else if (state.phase.kind === "sent")
+    notice = (
+      <>
+        <SentNotice
+          recipient={state.phase.recipient}
+          serverId={serverId}
+          workspaceId={workspaceId}
+        />
+        {unavailableNotice}
+      </>
+    );
+  return (
+    <>
+      {state.commentCount > 0 ? (
+        <DropdownMenu
+          open={state.phase.kind === "choosing"}
+          onOpenChange={onOpenChange}
+          compactMode="sheet"
+        >
+          <FeedbackTrigger
+            model={model}
+            label={label}
+            disabled={!state.canSend}
+            bottomInset={bottom + bottomOffset}
+          />
+          <DropdownMenuContent
+            side="top"
+            align="center"
+            sheetTitle={t("review.feedback.chooseAgent")}
+          >
+            {state.recipients.map((recipient) => (
+              <RecipientOption
+                key={recipient.tab.key}
+                recipient={recipient}
+                model={model}
+                serverId={serverId}
+                workspaceId={workspaceId}
+              />
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      ) : null}
+      {notice ? (
+        <View style={noteStyle} accessibilityRole="alert">
+          {notice}
+        </View>
+      ) : null}
+    </>
+  );
+}
+
+function FeedbackTrigger({
+  model,
+  label,
+  disabled,
+  bottomInset,
+}: {
+  model: FeedbackModel;
+  label: string;
+  disabled: boolean;
+  bottomInset: number;
+}) {
+  const { triggerRef } = useMenuContext("FeedbackTrigger");
+  const isCompact = useIsCompactFormFactor();
+  const press = useCallback(() => {
+    void model.press();
+  }, [model]);
+  if (!isCompact) {
+    return (
+      <View
+        pointerEvents="box-none"
+        style={[styles.wideAction, { bottom: bottomInset + SPACING[4] }]}
+      >
+        <Button
+          ref={triggerRef}
+          variant="default"
+          size="sm"
+          leftIcon={Send}
+          accessibilityLabel={label}
+          disabled={disabled}
+          onPress={press}
+        >
+          {label}
+        </Button>
+      </View>
+    );
+  }
+  return (
+    <FloatingActionButton
+      ref={triggerRef}
+      icon={Send}
+      label={label}
+      accessibilityLabel={label}
+      disabled={disabled}
+      bottomInset={bottomInset}
+      onPress={press}
+    />
+  );
+}
+
+function RecipientOption({
+  recipient,
+  model,
+  serverId,
+  workspaceId,
+}: {
+  recipient: FeedbackRecipient;
+  model: FeedbackModel;
+  serverId: string;
+  workspaceId: string;
+}) {
+  const choose = useCallback(() => {
+    void model.send(recipient.agentId);
+  }, [model, recipient.agentId]);
+  const render = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <RecipientRow presentation={presentation} onSelect={choose} />
+    ),
+    [choose],
+  );
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={recipient.tab}
+      serverId={serverId}
+      workspaceId={workspaceId}
+    >
+      {render}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+function RecipientRow({
+  presentation,
+  onSelect,
+}: {
+  presentation: WorkspaceTabPresentation;
+  onSelect: () => void;
+}) {
+  const leading = useMemo(
+    () => <WorkspaceTabIcon presentation={presentation} backdrop="surface0" />,
+    [presentation],
+  );
+  return (
+    <DropdownMenuItem leading={leading} onSelect={onSelect}>
+      {presentation.label}
+    </DropdownMenuItem>
+  );
+}
+
+function SentNotice({
+  recipient,
+  serverId,
+  workspaceId,
+}: {
+  recipient: FeedbackRecipient;
+  serverId: string;
+  workspaceId: string;
+}) {
+  const { t } = useTranslation();
+  const render = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <Text style={styles.text}>
+        {t("review.feedback.sent", { recipient: presentation.label })}
+      </Text>
+    ),
+    [t],
+  );
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={recipient.tab}
+      serverId={serverId}
+      workspaceId={workspaceId}
+    >
+      {render}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  wideAction: { position: "absolute", left: 0, right: 0, alignItems: "center" },
+  centered: { alignItems: "center" },
+  note: {
+    position: "absolute",
+    right: theme.spacing[4],
+    left: theme.spacing[4],
+    alignItems: "flex-end",
+  },
+  text: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+  },
+  error: {
+    color: theme.colors.destructive,
+    fontSize: theme.fontSize.sm,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+  },
+}));
diff --git a/packages/app/src/review/feedback/use-feedback.ts b/packages/app/src/review/feedback/use-feedback.ts
new file mode 100644
index 0000000000..e2b151953e
--- /dev/null
+++ b/packages/app/src/review/feedback/use-feedback.ts
@@ -0,0 +1,120 @@
+import { useEffect, useMemo, useRef, useSyncExternalStore } from "react";
+import {
+  useReviewDraftComments,
+  getReviewDraftComments,
+  clearSentReviewDraftComments,
+} from "../store";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
+import { deriveWorkspaceTabModel } from "@/screens/workspace/workspace-tab-model";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useAppSettings } from "@/hooks/use-settings";
+import { dispatchComposerAgentMessage } from "@/composer/actions";
+import { createMessageSubmissionWriter } from "@/composer/submission/writer";
+import { useSessionStore, selectAgentTurnPresentation } from "@/stores/session-store";
+import { FLOATING_ACTION_BUTTON_CLEARANCE } from "@/components/ui/floating-action-button";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { buttonControlHeight } from "@/components/ui/control-geometry";
+import { SPACING } from "@/styles/theme";
+import { i18n } from "@/i18n/i18next";
+import {
+  createReviewFeedbackScope,
+  type FeedbackAttachment,
+  type FeedbackRecipient,
+} from "./index";
+
+const feedbackScope = createReviewFeedbackScope();
+
+export function useReviewFeedback(input: {
+  reviewDraftKey: string;
+  serverId: string;
+  workspaceId?: string;
+  attachment: FeedbackAttachment | null;
+}) {
+  const { serverId, reviewDraftKey, workspaceId } = input;
+  const isCompact = useIsCompactFormFactor();
+  const workspaceKey = workspaceId
+    ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId })
+    : null;
+  const client = useHostRuntimeClient(serverId);
+  const connected = useHostRuntimeIsConnected(serverId);
+  const { settings } = useAppSettings();
+  const comments = useReviewDraftComments(reviewDraftKey);
+  const layout = useWorkspaceLayoutStore((store) =>
+    workspaceKey ? store.layoutByWorkspace[workspaceKey] : undefined,
+  );
+  // The adapter keeps live host and diff inputs available to commands without reconstructing the workflow.
+  const live = useRef({
+    client,
+    connected,
+    attachment: input.attachment,
+    sendBehavior: settings.sendBehavior,
+  });
+  live.current = {
+    client,
+    connected,
+    attachment: input.attachment,
+    sendBehavior: settings.sendBehavior,
+  };
+  const model = useMemo(
+    () =>
+      feedbackScope.connect(reviewDraftKey, {
+        read: () => ({
+          comments: getReviewDraftComments(reviewDraftKey) ?? [],
+          attachment: live.current.attachment,
+          connected: live.current.connected,
+          recipients: readRecipients(workspaceKey),
+        }),
+        send: async (recipient, attachment) => {
+          const { client: targetClient, sendBehavior } = live.current;
+          if (!targetClient) throw new Error(i18n.t("workspace.terminal.hostDisconnected"));
+          const activeTurnBehavior = sendBehavior === "steer" ? "steer" : "interrupt";
+          await dispatchComposerAgentMessage({
+            client: targetClient,
+            agentId: recipient.agentId,
+            text: i18n.t("review.feedback.prompt"),
+            attachments: [attachment],
+            encodeImages: async () => [],
+            submission: createMessageSubmissionWriter(serverId),
+            activeTurnBehavior,
+            activeTurnId:
+              activeTurnBehavior === "steer"
+                ? (selectAgentTurnPresentation(
+                    useSessionStore.getState().sessions[serverId],
+                    recipient.agentId,
+                  ).turnId ?? undefined)
+                : undefined,
+          });
+        },
+        clearSent: (sentComments) =>
+          clearSentReviewDraftComments({ key: reviewDraftKey, comments: sentComments }),
+        failedMessage: () => i18n.t("review.feedback.failed"),
+      }),
+    [reviewDraftKey, serverId, workspaceKey],
+  );
+  useEffect(() => {
+    model.refresh();
+  }, [model, comments, layout, connected, input.attachment]);
+  const state = useSyncExternalStore(model.subscribe, model.getState, model.getState);
+  return {
+    model,
+    state,
+    clearance:
+      state.commentCount > 0
+        ? (isCompact ? FLOATING_ACTION_BUTTON_CLEARANCE : buttonControlHeight.sm + SPACING[4]) + 44
+        : 0,
+  };
+}
+
+function readRecipients(workspaceKey: string | null): FeedbackRecipient[] {
+  const tabs = workspaceKey
+    ? useWorkspaceLayoutStore.getState().getWorkspaceTabs(workspaceKey)
+    : [];
+  const descriptors = deriveWorkspaceTabModel({ tabs }).tabs;
+  const recipients: FeedbackRecipient[] = [];
+  for (const { descriptor } of descriptors) {
+    if (descriptor.target.kind === "agent")
+      recipients.push({ agentId: descriptor.target.agentId, tab: descriptor });
+  }
+  return recipients;
+}
diff --git a/packages/app/src/review/geometry.ts b/packages/app/src/review/geometry.ts
index 819c1d29b1..46bbf88ecc 100644
--- a/packages/app/src/review/geometry.ts
+++ b/packages/app/src/review/geometry.ts
@@ -19,6 +19,7 @@ export interface InlineReviewActions {
   onStartComment: (target: ReviewableDiffTarget) => void;
   onEditComment: (target: ReviewableDiffTarget, comment: ReviewDraftComment) => void;
   onCancelEditor: () => void;
+  onChangeEditorBody: (body: string) => void;
   onSaveEditor: (body: string) => void;
   onDeleteComment: (id: string) => void;
 }
diff --git a/packages/app/src/review/index.ts b/packages/app/src/review/index.ts
index 014447090b..308f955259 100644
--- a/packages/app/src/review/index.ts
+++ b/packages/app/src/review/index.ts
@@ -31,3 +31,8 @@ export {
   SMALL_ACTION_HIT_SLOP,
   useInlineReviewController,
 } from "./surface";
+
+export { ReviewCommentSheet } from "./comment-sheet";
+
+export { useReviewFeedback } from "./feedback/use-feedback";
+export { ReviewFeedbackAction } from "./feedback/surface";
diff --git a/packages/app/src/review/store.test.ts b/packages/app/src/review/store.test.ts
index 344b28b61d..222a3f57f3 100644
--- a/packages/app/src/review/store.test.ts
+++ b/packages/app/src/review/store.test.ts
@@ -2,7 +2,16 @@ import { describe, expect, it } from "vitest";
 import type { StateStorage } from "zustand/middleware";
 import type { ParsedDiffFile } from "@/git/use-diff-query";
 import { createValidatedPersistStorage } from "@/storage/validated-persist-storage";
-import { buildReviewAttachmentSnapshot, buildReviewDraftKey } from "./store";
+import {
+  buildReviewAttachmentSnapshot,
+  buildReviewDraftKey,
+  addReviewDraftComment,
+  saveReviewDraftComment,
+  clearSentReviewDraftComments,
+  getReviewDraftComments,
+  resetReviewDraftStore,
+  useReviewDraftStore,
+} from "./store";
 import {
   addCommentToState,
   clearReviewInState,
@@ -304,3 +313,49 @@ describe("buildReviewAttachmentSnapshot", () => {
     });
   });
 });
+
+describe("successful feedback cleanup", () => {
+  it("clears sent versions only, preserving edits, additions and other workspace drafts", () => {
+    resetReviewDraftStore();
+    const first = addReviewDraftComment({ key: "first", comment: makeComment() });
+    const edited = addReviewDraftComment({
+      key: "first",
+      comment: makeComment({ id: "edited", body: "Before send" }),
+    });
+    const other = addReviewDraftComment({ key: "other", comment: makeComment({ id: "other" }) });
+    useReviewDraftStore.getState().updateComment({
+      key: "first",
+      id: edited.id,
+      updates: { body: "After send" },
+      updatedAt: edited.updatedAt,
+    });
+    const added = addReviewDraftComment({ key: "first", comment: makeComment({ id: "added" }) });
+    clearSentReviewDraftComments({ key: "first", comments: [first, edited] });
+    expect(getReviewDraftComments("first")).toEqual([{ ...edited, body: "After send" }, added]);
+    expect(getReviewDraftComments("other")).toEqual([other]);
+    resetReviewDraftStore();
+  });
+});
+
+it("saves an acknowledged open edit as a new version and keeps subsequent edits on that record", () => {
+  resetReviewDraftStore();
+  const submitted = addReviewDraftComment({ key: "first", comment: makeComment() });
+  clearSentReviewDraftComments({ key: "first", comments: [submitted] });
+  saveReviewDraftComment({
+    key: "first",
+    id: submitted.id,
+    comment: { ...submitted, body: "Open edit after acknowledgement" },
+  });
+  const restored = getReviewDraftComments("first")![0]!;
+  expect(restored.body).toBe("Open edit after acknowledgement");
+  expect(restored.id).not.toBe(submitted.id);
+  clearSentReviewDraftComments({ key: "first", comments: [submitted] });
+  expect(getReviewDraftComments("first")).toEqual([restored]);
+  saveReviewDraftComment({
+    key: "first",
+    id: restored.id,
+    comment: { ...restored, body: "Saved again" },
+  });
+  expect(getReviewDraftComments("first")).toMatchObject([{ id: restored.id, body: "Saved again" }]);
+  resetReviewDraftStore();
+});
diff --git a/packages/app/src/review/store.ts b/packages/app/src/review/store.ts
index bac1659751..614572190a 100644
--- a/packages/app/src/review/store.ts
+++ b/packages/app/src/review/store.ts
@@ -320,3 +320,43 @@ export function useReviewAttachmentSnapshot(input: {
     [comments, input.key, input.cwd, input.mode, input.baseRef, input.diffFiles],
   );
 }
+
+/** Acknowledgement removes only the versions included in that submission. */
+export function clearSentReviewDraftComments(input: {
+  key: string;
+  comments: readonly ReviewDraftComment[];
+}): void {
+  const sentById = new Map(input.comments.map((comment) => [comment.id, comment]));
+  useReviewDraftStore.setState((state) => {
+    const current = state.drafts[input.key];
+    if (!current) return state;
+    const remaining = current.filter((comment) => {
+      const sent = sentById.get(comment.id);
+      return !sent || sent.updatedAt !== comment.updatedAt || sent.body !== comment.body;
+    });
+    if (remaining.length === current.length) return state;
+    return { drafts: { ...state.drafts, [input.key]: remaining } };
+  });
+}
+
+/** Acknowledgement can remove the original while the user still has an edit open. */
+export function saveReviewDraftComment(input: {
+  key: string;
+  id: string | null;
+  comment: Pick<ReviewDraftComment, "filePath" | "side" | "lineNumber" | "body">;
+}): void {
+  const store = useReviewDraftStore.getState();
+  if (input.id && store.drafts[input.key]?.some((comment) => comment.id === input.id)) {
+    store.updateComment({ key: input.key, id: input.id, updates: { body: input.comment.body } });
+  } else {
+    store.addComment({
+      key: input.key,
+      comment: {
+        filePath: input.comment.filePath,
+        side: input.comment.side,
+        lineNumber: input.comment.lineNumber,
+        body: input.comment.body,
+      },
+    });
+  }
+}
diff --git a/packages/app/src/review/surface.test.tsx b/packages/app/src/review/surface.test.tsx
index e23f321d38..925ebe6b24 100644
--- a/packages/app/src/review/surface.test.tsx
+++ b/packages/app/src/review/surface.test.tsx
@@ -9,45 +9,24 @@ import { useReviewDraftStore, type ReviewDraftComment } from "./store";
 import { buildReviewableDiffTargetKey, type ReviewableDiffTarget } from "@/utils/diff-layout";
 import {
   getInlineReviewThreadState,
-  getInlineReviewThreadViewportStyle,
   getSplitInlineReviewThreadState,
+  type InlineReviewActions,
+} from "./geometry";
+import {
+  getInlineReviewThreadViewportStyle,
   groupInlineReviewCommentsByTarget,
   InlineReviewEditor,
   InlineReviewGutterCell,
   InlineReviewThread,
   SMALL_ACTION_HIT_SLOP,
   useInlineReviewController,
-  type InlineReviewActions,
-} from "./index";
+} from "./surface";
 
 void testI18n;
 
-const { theme, pressablePropsByLabel } = vi.hoisted(() => {
+const { pressablePropsByLabel } = vi.hoisted(() => {
   Object.assign(globalThis, { __DEV__: false });
-  return {
-    theme: {
-      spacing: { 1: 4, 2: 8, 3: 12 },
-      borderWidth: { 1: 1 },
-      borderRadius: { base: 4, md: 6, lg: 8, xl: 12, full: 999 },
-      opacity: { 50: 0.5 },
-      fontSize: { xs: 11, sm: 13 },
-      fontWeight: { normal: "400", medium: "500" },
-      lineHeight: { diff: 18 },
-      colors: {
-        accent: "#0a84ff",
-        accentForeground: "#fff",
-        border: "#555",
-        destructive: "#ff453a",
-        foreground: "#fff",
-        foregroundMuted: "#aaa",
-        surface1: "#111",
-        surface2: "#222",
-        surface3: "#333",
-        palette: { white: "#fff" },
-      },
-    },
-    pressablePropsByLabel: new Map<string, Record<string, unknown>>(),
-  };
+  return { pressablePropsByLabel: new Map<string, Record<string, unknown>>() };
 });
 
 vi.mock("react-native", async (importOriginal) => {
@@ -88,13 +67,16 @@ vi.mock("react-native", async (importOriginal) => {
   };
 });
 
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
-  },
-  withUnistyles: <T,>(component: T) => component,
-  useUnistyles: () => ({ theme, rt: { breakpoint: "md" } }),
-}));
+vi.mock("react-native-unistyles", async () => {
+  const { darkTheme: theme } = await import("@/styles/theme");
+  return {
+    StyleSheet: {
+      create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
+    },
+    withUnistyles: <T,>(component: T) => component,
+    useUnistyles: () => ({ theme, rt: { breakpoint: "md" } }),
+  };
+});
 
 vi.mock("@/constants/platform", () => ({
   getIsElectron: () => false,
@@ -103,19 +85,6 @@ vi.mock("@/constants/platform", () => ({
   isWeb: true,
 }));
 
-vi.mock("lucide-react-native", () => {
-  const createIcon = (name: string) => (props: Record<string, unknown>) =>
-    React.createElement("span", { ...props, "data-icon": name });
-  return {
-    Check: createIcon("Check"),
-    CircleDot: createIcon("CircleDot"),
-    Pencil: createIcon("Pencil"),
-    Plus: createIcon("Plus"),
-    Trash2: createIcon("Trash2"),
-    X: createIcon("X"),
-  };
-});
-
 function target(overrides: Partial<ReviewableDiffTarget> = {}): ReviewableDiffTarget {
   return {
     filePath: "src/example.ts",
@@ -147,6 +116,7 @@ function buildReviewActions(overrides: Partial<InlineReviewActions> = {}): Inlin
     onStartComment: vi.fn(),
     onEditComment: vi.fn(),
     onCancelEditor: vi.fn(),
+    onChangeEditorBody: () => {},
     onSaveEditor: vi.fn(),
     onDeleteComment: vi.fn(),
     ...overrides,
@@ -312,8 +282,9 @@ describe("git diff inline review helpers", () => {
 
   it("keeps the line number visible and only floats the plus for line hover", () => {
     const reviewTarget = target();
-    const { container, queryByText, rerender } = render(
+    const { queryByTestId, queryByText, rerender } = render(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={EMPTY_COMMENTS}
         isEditorOpen={false}
@@ -324,10 +295,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={COMMENT_LIST}
         isEditorOpen={false}
@@ -338,10 +310,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={EMPTY_COMMENTS}
         isEditorOpen
@@ -352,10 +325,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={COMMENT_LIST}
         isEditorOpen={false}
@@ -367,7 +341,7 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeTruthy();
+    expect(queryByTestId("add-comment-glyph")).toBeTruthy();
   });
 });
 
@@ -384,7 +358,7 @@ describe("InlineReviewEditor", () => {
     const onCancel = vi.fn();
     const onSave = vi.fn();
     const { getByTestId } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody=" initial "
         onCancel={onCancel}
         onSave={onSave}
@@ -404,7 +378,7 @@ describe("InlineReviewEditor", () => {
     const onCancel = vi.fn();
     const onSave = vi.fn();
     const { getByTestId } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody="ready"
         onCancel={onCancel}
         onSave={onSave}
@@ -428,7 +402,7 @@ describe("InlineReviewEditor", () => {
       removeEventListener: vi.fn(),
     });
     const { getByTestId, queryByText } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody="ready"
         onCancel={vi.fn()}
         onSave={vi.fn()}
@@ -472,3 +446,13 @@ describe("InlineReviewThread", () => {
     expect(actions.onDeleteComment).toHaveBeenCalledWith("comment-1");
   });
 });
+
+function ReviewEditorFixture({
+  initialBody,
+  ...props
+}: Omit<React.ComponentProps<typeof InlineReviewEditor>, "body" | "onChangeBody"> & {
+  initialBody: string;
+}) {
+  const [body, onChangeBody] = React.useState(initialBody);
+  return <InlineReviewEditor {...props} body={body} onChangeBody={onChangeBody} />;
+}
diff --git a/packages/app/src/review/surface.tsx b/packages/app/src/review/surface.tsx
index 43b6af914a..7466052456 100644
--- a/packages/app/src/review/surface.tsx
+++ b/packages/app/src/review/surface.tsx
@@ -1,4 +1,11 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import type { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { Pencil, Plus, Trash2 } from "lucide-react-native";
@@ -17,10 +24,17 @@ import {
   EditingTextInput as TextInput,
   type EditingTextInputHandle,
 } from "@/components/ui/text-input";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { createReviewEditorScope } from "./editor";
 import { isWeb } from "@/constants/platform";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { Theme } from "@/styles/theme";
-import { useReviewDraftComments, useReviewDraftStore, type ReviewDraftComment } from "./store";
+import {
+  useReviewDraftComments,
+  useReviewDraftStore,
+  saveReviewDraftComment,
+  type ReviewDraftComment,
+} from "./store";
 import { buildReviewableDiffTargetKey, type ReviewableDiffTarget } from "@/utils/diff-layout";
 import {
   INLINE_REVIEW_EDITOR_HEIGHT,
@@ -98,92 +112,42 @@ export function groupInlineReviewCommentsByTarget(
   return grouped;
 }
 
-export function useInlineReviewController(input: { reviewDraftKey: string }): InlineReviewActions {
+const reviewEditors = createReviewEditorScope({
+  saveComment: saveReviewDraftComment,
+  deleteComment: (input) => useReviewDraftStore.getState().deleteComment(input),
+});
+
+export function useInlineReviewController(input: {
+  reviewDraftKey: string;
+  presentation?: string;
+}): InlineReviewActions & {
+  sheetEditor: InlineReviewEditorState | null;
+  onChangeEditorBody: (body: string) => void;
+} {
+  const isCompact = useIsCompactFormFactor();
   const reviewComments = useReviewDraftComments(input.reviewDraftKey);
   const commentsByTarget = useMemo(
     () => groupInlineReviewCommentsByTarget(reviewComments),
     [reviewComments],
   );
-  const [editor, setEditor] = useState<InlineReviewEditorState | null>(null);
-  const addComment = useReviewDraftStore((state) => state.addComment);
-  const updateComment = useReviewDraftStore((state) => state.updateComment);
-  const deleteComment = useReviewDraftStore((state) => state.deleteComment);
-
-  useEffect(() => {
-    setEditor(null);
-  }, [input.reviewDraftKey]);
-
-  const handleStartComment = useCallback((target: ReviewableDiffTarget) => {
-    setEditor({ target, commentId: null, body: "" });
-  }, []);
-
-  const handleEditComment = useCallback(
-    (target: ReviewableDiffTarget, comment: ReviewDraftComment) => {
-      setEditor({ target, commentId: comment.id, body: comment.body });
-    },
-    [],
+  const model = useMemo(
+    () => reviewEditors.forDraft(input.reviewDraftKey, input.presentation ?? "diff"),
+    [input.reviewDraftKey, input.presentation],
   );
-
-  const handleCancelEditor = useCallback(() => {
-    setEditor(null);
-  }, []);
-
-  const handleSaveEditor = useCallback(
-    (body: string) => {
-      const trimmedBody = body.trim();
-      if (!editor || trimmedBody.length === 0) {
-        return;
-      }
-
-      if (editor.commentId) {
-        updateComment({
-          key: input.reviewDraftKey,
-          id: editor.commentId,
-          updates: { body: trimmedBody },
-        });
-      } else {
-        addComment({
-          key: input.reviewDraftKey,
-          comment: {
-            filePath: editor.target.filePath,
-            side: editor.target.side,
-            lineNumber: editor.target.lineNumber,
-            body: trimmedBody,
-          },
-        });
-      }
-      setEditor(null);
-    },
-    [addComment, editor, input.reviewDraftKey, updateComment],
-  );
-
-  const handleDeleteComment = useCallback(
-    (id: string) => {
-      deleteComment({ key: input.reviewDraftKey, id });
-      setEditor((current) => (current?.commentId === id ? null : current));
-    },
-    [deleteComment, input.reviewDraftKey],
-  );
-
-  return useMemo<InlineReviewActions>(
+  const editor = useSyncExternalStore(model.subscribe, model.getState, model.getState);
+  return useMemo(
     () => ({
       commentsByTarget,
-      editor,
-      onStartComment: handleStartComment,
-      onEditComment: handleEditComment,
-      onCancelEditor: handleCancelEditor,
-      onSaveEditor: handleSaveEditor,
-      onDeleteComment: handleDeleteComment,
+      editor: isCompact ? null : editor,
+      sheetEditor: isCompact ? editor : null,
+      onChangeEditorBody: model.setBody,
+      onStartComment: model.start,
+      onEditComment: model.edit,
+      onCancelEditor: model.cancel,
+      onSaveEditor: model.save,
+      onDeleteComment: model.delete,
     }),
-    [
-      commentsByTarget,
-      editor,
-      handleCancelEditor,
-      handleDeleteComment,
-      handleEditComment,
-      handleSaveEditor,
-      handleStartComment,
-    ],
+    [commentsByTarget, editor, isCompact, model],
   );
 }
 
@@ -321,7 +285,8 @@ export function InlineReviewThread({
   const editorElement = editor ? (
     <InlineReviewEditor
       key={editingCommentId ?? "new"}
-      initialBody={editor.body}
+      body={editor.body}
+      onChangeBody={reviewActions.onChangeEditorBody}
       onCancel={reviewActions.onCancelEditor}
       onSave={reviewActions.onSaveEditor}
       testID="inline-review-editor"
@@ -428,19 +393,20 @@ export function getInlineReviewThreadViewportStyle({
 }
 
 export function InlineReviewEditor({
-  initialBody,
+  body,
+  onChangeBody,
   onCancel,
   onSave,
   testID,
 }: {
-  initialBody: string;
+  body: string;
+  onChangeBody: (body: string) => void;
   onCancel: () => void;
   onSave: (body: string) => void;
   testID?: string;
 }) {
   const { t } = useTranslation();
   const inputRef = useRef<EditingTextInputHandle | null>(null);
-  const [body, setBody] = useState(initialBody);
   const [isFocused, setIsFocused] = useState(false);
   const trimmedBody = body.trim();
   const canSave = trimmedBody.length > 0;
@@ -506,7 +472,7 @@ export function InlineReviewEditor({
         placeholderTextColor={styles.placeholderColor.color}
         multiline
         initialValue={body}
-        onChangeText={setBody}
+        onChangeText={onChangeBody}
         onFocus={handleFocus}
         onBlur={handleBlur}
         style={inputStyle}
diff --git a/packages/app/src/root-app.tsx b/packages/app/src/root-app.tsx
new file mode 100644
index 0000000000..cae9b169d6
--- /dev/null
+++ b/packages/app/src/root-app.tsx
@@ -0,0 +1,40 @@
+import { useCallback, useState, type ComponentProps } from "react";
+import { ExpoRoot } from "expo-router";
+import Head from "expo-router/head";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { SafeAreaProvider } from "react-native-safe-area-context";
+import { queryClient } from "@/data/query-client";
+import { I18nProvider } from "@/i18n/provider";
+import { RootErrorBoundary } from "@/components/root-error-boundary";
+
+// Keep Expo's platform filtering, route root, and lazy import configuration.
+const { ctx: context } = require("expo-router/_ctx") as {
+  ctx: ComponentProps<typeof ExpoRoot>["context"];
+};
+
+export function RootApp() {
+  return <RootRouter context={context} />;
+}
+
+export function RootRouter({ context: routes }: Pick<ComponentProps<typeof ExpoRoot>, "context">) {
+  const [generation, setGeneration] = useState(0);
+  const reload = useCallback(() => setGeneration((value) => value + 1), []);
+
+  return (
+    <QueryClientProvider client={queryClient}>
+      <I18nProvider>
+        <SafeAreaProvider>
+          <RootErrorBoundary key={generation} onReload={reload}>
+            <Head.Provider>
+              {/* Recreate the router at a safe destination before a failed route can mount. */}
+              <ExpoRoot
+                context={routes}
+                location={generation === 0 ? undefined : "/open-project"}
+              />
+            </Head.Provider>
+          </RootErrorBoundary>
+        </SafeAreaProvider>
+      </I18nProvider>
+    </QueryClientProvider>
+  );
+}
diff --git a/packages/app/src/runtime/daemon-start-service.test.ts b/packages/app/src/runtime/daemon-start-service.test.ts
index a988a09e0e..f1cae10118 100644
--- a/packages/app/src/runtime/daemon-start-service.test.ts
+++ b/packages/app/src/runtime/daemon-start-service.test.ts
@@ -36,6 +36,8 @@ function makeStatus(overrides: Partial<DesktopDaemonStatus> = {}): DesktopDaemon
     home: "/home",
     version: "0.0.0",
     desktopManaged: true,
+    ownedByDesktop: true,
+    startedAt: "2026-01-01T00:00:00.000Z",
     error: null,
     ...overrides,
   };
@@ -323,6 +325,15 @@ describe("upsertDesktopDaemonConnection", () => {
     expect(fake.upserts).toEqual([]);
   });
 
+  it("keeps an already registered host without waiting for a listen address", async () => {
+    const fake = createFakeStore([makeRelayOnlyHost("srv_desktop")]);
+
+    const result = await upsertDesktopDaemonConnection(fake.store, makeStatus({ listen: null }));
+
+    expect(result).toEqual({ ok: true });
+    expect(fake.upserts).toEqual([]);
+  });
+
   it("rejects a missing listen address without upserting", async () => {
     const fake = createFakeStore();
 
diff --git a/packages/app/src/runtime/daemon-start-service.ts b/packages/app/src/runtime/daemon-start-service.ts
index 093158e9ea..b00e3a380c 100644
--- a/packages/app/src/runtime/daemon-start-service.ts
+++ b/packages/app/src/runtime/daemon-start-service.ts
@@ -27,7 +27,6 @@ export async function upsertDesktopDaemonConnection(
   if (store.getHosts().some((host) => host.serverId === serverId)) {
     return { ok: true };
   }
-
   const listenAddress = daemon.listen?.trim() ?? "";
   if (!listenAddress) {
     return { ok: false, error: "Desktop daemon did not return a listen address." };
diff --git a/packages/app/src/runtime/directory-sync/agent-replica.test.ts b/packages/app/src/runtime/directory-sync/agent-replica.test.ts
index c791949827..648c66c590 100644
--- a/packages/app/src/runtime/directory-sync/agent-replica.test.ts
+++ b/packages/app/src/runtime/directory-sync/agent-replica.test.ts
@@ -1,7 +1,13 @@
 import { describe, expect, it } from "vitest";
 import type { DaemonClient, FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { useSessionStore } from "@/stores/session-store";
+import {
+  selectAgentTimelineState,
+  selectAgentTurnPresentation,
+  useSessionStore,
+} from "@/stores/session-store";
+import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
+import type { DirectoryReplicaMutation } from "@/runtime/replica-cache";
 import { AgentDirectoryReplica } from "./agent-replica";
 
 function payload(title: string): AgentSnapshotPayload {
@@ -51,11 +57,82 @@ function entry(agent: AgentSnapshotPayload): FetchAgentsEntry {
 }
 
 describe("AgentDirectoryReplica", () => {
+  it.each(["delta", "snapshot"] as const)(
+    "does not erase freshly fetched history when the active directory removes it by %s",
+    (removal) => {
+      const serverId = `agent-replica-history-${removal}`;
+      const store = useSessionStore.getState();
+      store.initializeSession(serverId, null);
+      const replica = new AgentDirectoryReplica(
+        serverId,
+        () => undefined,
+        () => undefined,
+      );
+      const archived = { ...payload("archived"), archivedAt: "2026-09-11T00:00:00.000Z" };
+      replica.submitTimelineAgent(replica.captureTimeline("agent"), archived);
+      store.applyAgentTimelineResponseState(serverId, "agent", {
+        items: [
+          {
+            kind: "assistant_message",
+            id: "reply",
+            text: "server history",
+            timestamp: new Date(),
+            timelineCursor: { epoch: "e", seq: 1 },
+          },
+        ],
+        head: [],
+        range: { epoch: "e", startSeq: 1, endSeq: 1 },
+        older: "none",
+        newer: false,
+        synchronized: true,
+        acknowledgedClientMessageIds: [],
+      });
+      if (removal === "delta") replica.applyDelta({ kind: "remove", agentId: "agent" });
+      else replica.commitSnapshot([], []);
+      expect(selectAgentTimelineState(store.getSession(serverId), "agent")).toMatchObject({
+        status: "synced",
+        items: [{ text: "server history" }],
+      });
+      replica.remove("agent");
+      expect(selectAgentTimelineState(store.getSession(serverId), "agent")).toMatchObject({
+        status: "cold",
+      });
+      store.clearSession(serverId);
+    },
+  );
+
+  it("does not let a late cache read replace newer live turn state", () => {
+    const serverId = "agent-replica-late-cache";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
+    replica.commitSnapshot([entry(payload("live"))], []);
+    replica.applyTurnLiveness("agent", {
+      type: "stream_open",
+      turn: { turnId: "turn-live", startedAt: null },
+    });
+
+    replica.commitCached(new Map([["agent", normalizeAgentSnapshot(payload("cached"), serverId)]]));
+
+    expect(selectAgentTurnPresentation(store.getSession(serverId), "agent").turnId).toBe(
+      "turn-live",
+    );
+    store.clearSession(serverId);
+  });
+
   it("accepts the requested agent from the authoritative timeline after a cache miss", () => {
     const serverId = "agent-replica-cache-miss";
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
-    const replica = new AgentDirectoryReplica(serverId, () => undefined);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
 
     expect(replica.submitTimelineAgent(replica.captureTimeline("agent"), payload("network"))).toBe(
       true,
@@ -66,11 +143,174 @@ describe("AgentDirectoryReplica", () => {
     store.clearSession(serverId);
   });
 
+  it("persists stream-only turn transitions through the agent owner", () => {
+    const serverId = "agent-replica-stream-turn";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const commits: DirectoryReplicaMutation[][] = [];
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      (mutations) => commits.push([...mutations]),
+    );
+    replica.commitSnapshot([entry(payload("agent"))], []);
+    commits.length = 0;
+
+    replica.applyTurnLiveness("agent", {
+      type: "stream_open",
+      turn: { turnId: "turn-1", startedAt: new Date("2026-08-31T12:00:00.000Z") },
+    });
+
+    expect(commits).toEqual([
+      [
+        expect.objectContaining({
+          kind: "agent",
+          type: "upsert",
+          id: "agent",
+          value: expect.objectContaining({
+            status: "idle",
+            turn: {
+              phase: "open",
+              cancellationRequestId: null,
+              turnId: "turn-1",
+              startedAt: new Date("2026-08-31T12:00:00.000Z"),
+            },
+          }),
+        }),
+      ],
+    ]);
+    expect(selectAgentTurnPresentation(store.getSession(serverId), "agent").isActive).toBe(true);
+    store.clearSession(serverId);
+  });
+
+  it("notifies the queue owner exactly once when a stream turn closes", () => {
+    const serverId = "agent-replica-stream-stop";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const stopped: string[] = [];
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      (agentId) => stopped.push(agentId),
+      () => undefined,
+    );
+    replica.commitSnapshot([entry(payload("agent"))], []);
+    replica.applyTurnLiveness("agent", {
+      type: "stream_open",
+      turn: { turnId: "turn-1", startedAt: null },
+    });
+
+    replica.applyTurnLiveness("agent", { type: "stream_close", turnId: "turn-1" });
+    replica.applyTurnLiveness("agent", { type: "stream_close", turnId: "turn-1" });
+
+    expect(stopped).toEqual(["agent"]);
+    store.clearSession(serverId);
+  });
+
+  it("preserves cancellation state when the same active turn is snapshotted", () => {
+    const serverId = "agent-replica-cancellation-snapshot";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
+    replica.commitSnapshot(
+      [
+        entry({
+          ...payload("running"),
+          activeTurn: { turnId: "turn-1", startedAt: null },
+        }),
+      ],
+      [],
+    );
+    replica.applyTurnLiveness("agent", { type: "cancellation_started", requestId: 7 });
+
+    replica.applyDelta({
+      kind: "upsert",
+      agent: {
+        ...payload("same running turn"),
+        activeTurn: { turnId: "turn-1", startedAt: null },
+      },
+      project: entry(payload("project")).project,
+    });
+
+    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")?.turn).toMatchObject({
+      phase: "open",
+      turnId: "turn-1",
+      cancellationRequestId: 7,
+    });
+
+    replica.commitSnapshot(
+      [
+        entry({
+          ...payload("same turn from refresh"),
+          activeTurn: { turnId: "turn-1", startedAt: null },
+        }),
+      ],
+      [],
+    );
+    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")?.turn).toMatchObject({
+      phase: "open",
+      turnId: "turn-1",
+      cancellationRequestId: 7,
+    });
+    store.clearSession(serverId);
+  });
+
+  it("uses turn liveness for stopped transitions even when protocol status disagrees", () => {
+    const serverId = "agent-replica-mismatched-status";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const stopped: string[] = [];
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      (agentId) => stopped.push(agentId),
+      () => undefined,
+    );
+    replica.commitSnapshot(
+      [
+        entry({
+          ...payload("open despite idle"),
+          activeTurn: { turnId: "turn-1", startedAt: null },
+        }),
+      ],
+      [],
+    );
+
+    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")).toMatchObject({
+      status: "idle",
+      turn: { phase: "open", turnId: "turn-1" },
+    });
+
+    replica.applyDelta({
+      kind: "upsert",
+      agent: { ...payload("idle turn despite running"), status: "running", activeTurn: null },
+      project: entry(payload("project")).project,
+    });
+    replica.applyDelta({
+      kind: "upsert",
+      agent: { ...payload("status-only update"), status: "idle", activeTurn: null },
+      project: entry(payload("project")).project,
+    });
+
+    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")).toMatchObject({
+      status: "idle",
+      turn: { phase: "idle" },
+    });
+    expect(stopped).toEqual(["agent"]);
+    store.clearSession(serverId);
+  });
+
   it("preserves an unchanged running agent's turn identity during catch-up", () => {
     const serverId = "agent-replica-catch-up";
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
-    const replica = new AgentDirectoryReplica(serverId, () => undefined);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
     replica.commitSnapshot(
       [
         entry({
@@ -84,9 +324,11 @@ describe("AgentDirectoryReplica", () => {
 
     replica.commitChanges([], [], []);
 
-    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")?.activeTurn).toEqual({
+    expect(useSessionStore.getState().sessions[serverId]?.agents.get("agent")?.turn).toEqual({
+      phase: "open",
       turnId: "turn-1",
       startedAt: new Date("2026-07-17T00:01:00.000Z"),
+      cancellationRequestId: null,
     });
     store.clearSession(serverId);
   });
@@ -95,7 +337,11 @@ describe("AgentDirectoryReplica", () => {
     const serverId = "agent-replica";
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
-    const replica = new AgentDirectoryReplica(serverId, () => undefined);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
     replica.commitSnapshot([entry(payload("directory"))], []);
     const directoryPlacement = useSessionStore
       .getState()
@@ -123,4 +369,25 @@ describe("AgentDirectoryReplica", () => {
     ).toEqual(directoryPlacement);
     store.clearSession(serverId);
   });
+
+  it("keeps a timeline-hydrated agent when a sequenced catch-up carries no entries", () => {
+    const serverId = "agent-replica-timeline-membership";
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, null as unknown as DaemonClient);
+    const replica = new AgentDirectoryReplica(
+      serverId,
+      () => undefined,
+      () => undefined,
+    );
+
+    // A conversation opened from history arrives over its timeline, without the
+    // project placement the directory carries, and is a member from then on.
+    replica.submitTimelineAgent(replica.captureTimeline("agent"), payload("timeline only"));
+    expect(useSessionStore.getState().sessions[serverId]?.agents.has("agent")).toBe(true);
+
+    replica.commitChanges([], [], []);
+
+    expect(useSessionStore.getState().sessions[serverId]?.agents.has("agent")).toBe(true);
+    store.clearSession(serverId);
+  });
 });
diff --git a/packages/app/src/runtime/directory-sync/agent-replica.ts b/packages/app/src/runtime/directory-sync/agent-replica.ts
index c9ff7424a4..37d5a1e4cb 100644
--- a/packages/app/src/runtime/directory-sync/agent-replica.ts
+++ b/packages/app/src/runtime/directory-sync/agent-replica.ts
@@ -2,23 +2,25 @@ import type { FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
 import { clearArchiveAgentPending } from "@/hooks/use-archive-agent";
 import { queryClient } from "@/data/query-client";
-import { useSessionStore, type Agent } from "@/stores/session-store";
+import type { Agent } from "@/stores/session-store";
 import { normalizeAgentSnapshot, projectAgentSnapshot } from "@/utils/agent-snapshots";
-import {
-  applyAgentDirectoryDelta,
-  type AgentDirectoryDelta,
-  removeAgentDirectoryReplica,
-  replaceAgentPendingPermissions,
-  replaceFetchedAgentDirectory,
-  upsertAgentReplica,
-} from "@/utils/agent-directory-sync";
+import { type AgentDirectoryDelta } from "@/utils/agent-directory-sync";
 import { reconcileAgentDirectory } from "@/utils/agent-directory-reconciliation";
+import { resolveProjectPlacement } from "@/utils/project-placement";
 import { applyLegacyDaemonWorkspaceOwnership } from "@/workspace/legacy-daemon-workspaces";
+import type { DirectoryReplicaMutation } from "@/runtime/replica-cache";
+import type { TurnLivenessTransition } from "@/timeline/turn-liveness";
+import { AgentStoreProjection } from "./internal/agent-store";
 
-function projectAgentDirectoryEntry(agent: Agent): FetchAgentsEntry | null {
-  return agent.projectPlacement
-    ? { agent: projectAgentSnapshot(agent), project: agent.projectPlacement }
-    : null;
+// A member hydrated from its timeline or restored from the replica cache carries
+// no placement. Every other path in this flow derives one from the working
+// directory, so this one does too; returning nothing here would drop the member
+// from the merged directory and delete the conversation on the next catch-up.
+function projectAgentDirectoryEntry(agent: Agent): FetchAgentsEntry {
+  return {
+    agent: projectAgentSnapshot(agent),
+    project: resolveProjectPlacement({ projectPlacement: agent.projectPlacement, cwd: agent.cwd }),
+  };
 }
 
 export interface AgentLifecycleToken {
@@ -30,28 +32,35 @@ export class AgentDirectoryReplica {
   private readonly lifecycleVersions = new Map<string, number>();
   private readonly members = new Set<string>();
   private readonly pendingCacheReads = new Set<string>();
+  private readonly storeProjection: AgentStoreProjection;
 
   constructor(
     private readonly serverId: string,
     private readonly onStoppedRunning: (agentId: string) => void,
-  ) {}
+    private readonly persist: (mutations: readonly DirectoryReplicaMutation[]) => void,
+  ) {
+    this.storeProjection = new AgentStoreProjection(serverId);
+  }
 
   captureTimeline(agentId: string): AgentLifecycleToken {
     return { agentId, version: this.lifecycleVersions.get(agentId) ?? 0 };
   }
 
+  snapshot(): Map<string, Agent> {
+    return this.storeProjection.snapshot();
+  }
+
   captureCache(agentId: string): AgentLifecycleToken {
     this.pendingCacheReads.add(agentId);
     return this.captureTimeline(agentId);
   }
 
   commitCached(agents: Map<string, Agent>): void {
+    const merged = this.storeProjection.commitCached(agents);
     this.members.clear();
-    for (const [agentId, agent] of agents) {
+    for (const agentId of merged.keys()) {
       this.members.add(agentId);
-      useSessionStore.getState().setAgentLastActivity(agentId, agent.lastActivityAt);
     }
-    useSessionStore.getState().setAgents(this.serverId, agents);
   }
 
   commitCachedAgent(token: AgentLifecycleToken, agent: Agent): boolean {
@@ -59,13 +68,8 @@ export class AgentDirectoryReplica {
     if (token.version !== (this.lifecycleVersions.get(token.agentId) ?? 0)) return false;
     if (this.members.has(agent.id)) return false;
     this.members.add(agent.id);
-    useSessionStore.getState().setAgents(this.serverId, (current) => {
-      if (current.has(agent.id)) return current;
-      const next = new Map(current);
-      next.set(agent.id, agent);
-      return next;
-    });
-    useSessionStore.getState().setAgentLastActivity(agent.id, agent.lastActivityAt);
+    this.storeProjection.accept(agent);
+    this.storeProjection.publishActivity(agent);
     return true;
   }
 
@@ -73,7 +77,7 @@ export class AgentDirectoryReplica {
     if (token.version !== (this.lifecycleVersions.get(token.agentId) ?? 0)) {
       return false;
     }
-    const existing = useSessionStore.getState().sessions[this.serverId]?.agents.get(token.agentId);
+    const existing = this.storeProjection.get(token.agentId);
     const timelineAgent = applyLegacyDaemonWorkspaceOwnership({
       serverId: this.serverId,
       agent: normalizeAgentSnapshot(payload, this.serverId),
@@ -82,19 +86,20 @@ export class AgentDirectoryReplica {
       ...timelineAgent,
       projectPlacement: timelineAgent.projectPlacement ?? existing?.projectPlacement,
     };
-    const accepted = upsertAgentReplica(this.serverId, normalized);
+    const accepted = this.storeProjection.accept(normalized);
     this.members.add(accepted.id);
-    replaceAgentPendingPermissions(this.serverId, accepted);
-    useSessionStore.getState().setAgentLastActivity(accepted.id, accepted.lastActivityAt);
+    this.storeProjection.replacePendingPermissions(accepted);
+    this.storeProjection.publishActivity(accepted);
     if (accepted.archivedAt) {
       clearArchiveAgentPending({ queryClient, serverId: this.serverId, agentId: accepted.id });
     }
+    this.persist([this.agentUpsert(accepted)]);
     return true;
   }
 
   applyDelta(delta: AgentDirectoryDelta): void {
     const before = this.members.has(delta.kind === "remove" ? delta.agentId : delta.agent.id);
-    const result = applyAgentDirectoryDelta({ serverId: this.serverId, delta });
+    const result = this.storeProjection.applyDelta(delta);
     if (delta.kind === "remove") {
       this.members.delete(delta.agentId);
       this.advance(delta.agentId);
@@ -103,15 +108,28 @@ export class AgentDirectoryReplica {
       if (!before) this.advance(delta.agent.id);
     }
     if (result.stoppedRunning) this.onStoppedRunning(result.agentId);
+    this.persist(
+      result.agent
+        ? [this.agentUpsert(result.agent)]
+        : [{ kind: "agent", type: "delete", id: result.agentId }],
+    );
+  }
+
+  accept(agent: Agent): Agent {
+    const accepted = this.storeProjection.accept(agent);
+    this.members.add(accepted.id);
+    this.persist([this.agentUpsert(accepted)]);
+    return accepted;
   }
 
   commitSnapshot(
     entries: FetchAgentsEntry[],
     deltas: readonly AgentDirectoryDelta[],
+    persist = true,
   ): Map<string, Agent> {
-    const previous = useSessionStore.getState().sessions[this.serverId]?.agents ?? new Map();
-    const reconciled = reconcileAgentDirectory({ previous, snapshot: entries, deltas });
-    const nextIds = new Set(reconciled.entries.map((entry) => entry.agent.id));
+    const previous = this.storeProjection.snapshot();
+    const reconciled = reconcileAgentDirectory({ snapshot: entries, deltas });
+    const nextIds = new Set(reconciled.map((entry) => entry.agent.id));
     for (const agentId of this.pendingCacheReads) {
       if (!nextIds.has(agentId)) this.advance(agentId);
     }
@@ -122,16 +140,25 @@ export class AgentDirectoryReplica {
       if (!this.members.has(agentId)) this.advance(agentId);
     }
     for (const agentId of previous.keys()) {
-      if (!nextIds.has(agentId)) removeAgentDirectoryReplica(this.serverId, agentId);
+      if (!nextIds.has(agentId)) this.storeProjection.removeFromDirectory(agentId);
     }
     this.members.clear();
     this.pendingCacheReads.clear();
     for (const agentId of nextIds) this.members.add(agentId);
-    const { agents } = replaceFetchedAgentDirectory({
-      serverId: this.serverId,
-      entries: reconciled.entries,
-    });
-    for (const agentId of reconciled.stoppedRunningAgentIds) this.onStoppedRunning(agentId);
+    const agents = this.storeProjection.replaceFetched(reconciled);
+    for (const [agentId, previousAgent] of previous) {
+      if (previousAgent.turn.phase === "open" && agents.get(agentId)?.turn.phase === "idle") {
+        this.onStoppedRunning(agentId);
+      }
+    }
+    if (persist) {
+      this.persist([
+        ...Array.from(previous.keys())
+          .filter((agentId) => !agents.has(agentId))
+          .map((id): DirectoryReplicaMutation => ({ kind: "agent", type: "delete", id })),
+        ...Array.from(agents.values(), (value) => this.agentUpsert(value)),
+      ]);
+    }
     return agents;
   }
 
@@ -140,36 +167,67 @@ export class AgentDirectoryReplica {
     removals: readonly { id: string }[],
     deltas: readonly AgentDirectoryDelta[],
   ): Map<string, Agent> {
-    const previous = useSessionStore.getState().sessions[this.serverId]?.agents ?? new Map();
+    const previous = this.storeProjection.snapshot();
     const merged = new Map<string, FetchAgentsEntry>();
     for (const agent of previous.values()) {
-      const entry = projectAgentDirectoryEntry(agent);
-      if (entry) merged.set(agent.id, entry);
+      merged.set(agent.id, projectAgentDirectoryEntry(agent));
     }
     for (const entry of entries) merged.set(entry.agent.id, entry);
     const removalsAsDeltas: AgentDirectoryDelta[] = removals.map(({ id }) => ({
       kind: "remove",
       agentId: id,
     }));
-    return this.commitSnapshot(Array.from(merged.values()), [...removalsAsDeltas, ...deltas]);
+    const agents = this.commitSnapshot(
+      Array.from(merged.values()),
+      [...removalsAsDeltas, ...deltas],
+      false,
+    );
+    const touchedIds = new Set([
+      ...entries.map((entry) => entry.agent.id),
+      ...removals.map(({ id }) => id),
+      ...deltas.map((delta) => (delta.kind === "remove" ? delta.agentId : delta.agent.id)),
+    ]);
+    this.persist(
+      Array.from(touchedIds, (id): DirectoryReplicaMutation => {
+        const value = agents.get(id);
+        return value ? this.agentUpsert(value) : { kind: "agent", type: "delete", id };
+      }),
+    );
+    return agents;
   }
 
   archive(agentId: string, archivedAt: string): void {
     this.advance(agentId);
-    useSessionStore.getState().setAgents(this.serverId, (current) => {
-      const agent = current.get(agentId);
-      if (!agent) return current;
-      const next = new Map(current);
-      next.set(agentId, { ...agent, archivedAt: new Date(archivedAt) });
-      return next;
-    });
+    const archived = this.storeProjection.archive(agentId, archivedAt);
+    if (archived) this.persist([this.agentUpsert(archived)]);
     clearArchiveAgentPending({ queryClient, serverId: this.serverId, agentId });
   }
 
   remove(agentId: string): void {
     this.members.delete(agentId);
     this.advance(agentId);
-    removeAgentDirectoryReplica(this.serverId, agentId);
+    this.storeProjection.remove(agentId);
+    this.persist([{ kind: "agent", type: "delete", id: agentId }]);
+  }
+
+  applyTurnLiveness(
+    agentId: string,
+    transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
+  ): void {
+    const wasRunning = this.storeProjection.get(agentId)?.turn.phase === "open";
+    const accepted = this.storeProjection.applyTurn(agentId, transition);
+    if (!accepted) return;
+    this.persist([this.agentUpsert(accepted)]);
+    if (wasRunning && accepted.turn.phase === "idle") this.onStoppedRunning(agentId);
+  }
+
+  private agentUpsert(agent: Agent): DirectoryReplicaMutation {
+    return {
+      kind: "agent",
+      type: "upsert",
+      id: agent.id,
+      value: agent,
+    };
   }
 
   private advance(agentId: string): void {
diff --git a/packages/app/src/runtime/directory-sync/index.test.ts b/packages/app/src/runtime/directory-sync/index.test.ts
index 2008abb6a1..5a247590d5 100644
--- a/packages/app/src/runtime/directory-sync/index.test.ts
+++ b/packages/app/src/runtime/directory-sync/index.test.ts
@@ -1,5 +1,15 @@
+import { DatabaseSync } from "node:sqlite";
+import { ReplicaCache } from "@/runtime/replica-cache";
+import {
+  createSqliteReplicaRowStore,
+  type ReplicaSqliteConnection,
+  type SqliteValue,
+} from "@/runtime/replica-cache/row-store-sqlite";
 import { afterEach, describe, expect, it } from "vitest";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type {
+  DaemonClient,
+  WorkspaceLabelListPayload,
+} from "@getpaseo/client/internal/daemon-client";
 import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import {
   normalizeProjectDescriptor,
@@ -8,18 +18,27 @@ import {
 } from "@/stores/session-store";
 import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { selectWorkspaceDirectoryServerIds } from "@/stores/session-store-hooks/selectors";
-import type { CachedDirectory } from "@/runtime/replica-cache";
+import { useWorkspaceLabels } from "@/workspace-labels";
+import type { DirectoryReplicaMutation } from "@/runtime/replica-cache";
 import {
   DirectoryRefreshSupersededError,
   DirectorySync,
   type DirectoryCheckpointStorage,
 } from "./index";
 
+import { subscriptionFixture } from "../subscription-fixture";
+
 type WorkspaceFetchResult = Awaited<ReturnType<DaemonClient["fetchWorkspaces"]>>;
 type ProjectListResult = Awaited<ReturnType<DaemonClient["listProjects"]>>;
 type AgentFetchResult = Awaited<ReturnType<DaemonClient["fetchAgents"]>>;
 
 class FakeDirectoryClient {
+  supportsBackgroundWorkspaces(): boolean {
+    return false;
+  }
+
+  supportsWorkspaceLabels = false;
+  listWorkspaceLabelsCalls = 0;
   fetchAgentsCalls = 0;
   lastAgentOptions: unknown;
   fetchWorkspacesCalls = 0;
@@ -29,6 +48,7 @@ class FakeDirectoryClient {
   projectResult: ProjectListResult | null = null;
   private pendingAgentFetch: Promise<AgentFetchResult> | null = null;
   private pendingWorkspaceFetch: Promise<WorkspaceFetchResult> | null = null;
+  private pendingProjectFetch: Promise<ProjectListResult> | null = null;
   private readonly handlers = new Map<
     SessionOutboundMessage["type"],
     Set<(message: SessionOutboundMessage) => void>
@@ -67,6 +87,14 @@ class FakeDirectoryClient {
     return complete;
   }
 
+  holdProjectFetch(): (result: ProjectListResult) => void {
+    let complete!: (result: ProjectListResult) => void;
+    this.pendingProjectFetch = new Promise((resolve) => {
+      complete = resolve;
+    });
+    return complete;
+  }
+
   async fetchAgents(options?: unknown): Promise<Awaited<ReturnType<DaemonClient["fetchAgents"]>>> {
     this.fetchAgentsCalls += 1;
     this.lastAgentOptions = options;
@@ -101,6 +129,11 @@ class FakeDirectoryClient {
   async listProjects(options?: unknown): Promise<ProjectListResult> {
     this.listProjectsCalls += 1;
     this.lastProjectOptions = options;
+    if (this.pendingProjectFetch) {
+      const pending = this.pendingProjectFetch;
+      this.pendingProjectFetch = null;
+      return pending;
+    }
     if (this.projectResult) return this.projectResult;
     return {
       requestId: "projects",
@@ -116,19 +149,55 @@ class FakeDirectoryClient {
     };
   }
 
-  getLastServerInfoMessage(): null {
-    return null;
+  observeAgents(options: Parameters<DaemonClient["observeAgents"]>[0]) {
+    return subscriptionFixture(this.fetchAgents({ ...options, subscribe: {} }), (receive) =>
+      this.on("agent_update", receive),
+    );
+  }
+
+  observeWorkspaces(options: Parameters<DaemonClient["observeWorkspaces"]>[0]) {
+    return subscriptionFixture(this.fetchWorkspaces(options), (receive) =>
+      this.on("workspace_update", receive),
+    );
+  }
+
+  observeEvents(events: readonly SessionOutboundMessage["type"][]) {
+    return subscriptionFixture(Promise.resolve({ events }), (receive) => {
+      const stops = events.map((event) => this.on(event, receive));
+      return () => stops.forEach((stop) => stop());
+    });
+  }
+
+  observeWorkspaceLabels() {
+    return subscriptionFixture(this.listWorkspaceLabels(), () => () => {});
+  }
+
+  async listWorkspaceLabels(): Promise<WorkspaceLabelListPayload> {
+    this.listWorkspaceLabelsCalls += 1;
+    return {
+      requestId: "workspace-labels",
+      labels: [{ name: "Urgent", color: "red" }],
+      sync: { mode: "snapshot", removals: [], generation: "generation-1", headSeq: 0 },
+    };
+  }
+
+  getLastServerInfoMessage() {
+    return this.supportsWorkspaceLabels ? { features: { workspaceLabels: true } } : null;
   }
 }
 
 const serverIds = new Set<string>();
 
-function createDirectory(serverId: string): {
+function createDirectory(
+  serverId: string,
+  options?: { workspaceLabels?: boolean },
+): {
   client: FakeDirectoryClient;
   directory: DirectorySync;
 } {
   serverIds.add(serverId);
   const client = new FakeDirectoryClient();
+  client.supportsWorkspaceLabels = options?.workspaceLabels === true;
   const directory = new DirectorySync(serverId, {
     onAgentStoppedRunning: () => undefined,
     markAgentLoading: () => undefined,
@@ -176,13 +245,33 @@ function createAgent(serverId: string, id: string) {
   };
 }
 
+function createWorkspaceEntry(id: string): WorkspaceFetchResult["entries"][number] {
+  return {
+    id,
+    projectId: "snapshot-project",
+    projectDisplayName: "Snapshot project",
+    projectRootPath: "/repo",
+    workspaceDirectory: `/repo/${id}`,
+    projectKind: "git",
+    workspaceKind: "local_checkout",
+    name: id,
+    status: "done",
+    statusEnteredAt: null,
+    activityAt: null,
+    archivingAt: null,
+    diffStat: null,
+    scripts: [],
+  };
+}
+
 afterEach(() => {
   for (const serverId of serverIds) useSessionStore.getState().clearSession(serverId);
   serverIds.clear();
+  useWorkspaceLabels.setState({ hosts: {} });
 });
 
 describe("DirectorySync session readiness", () => {
-  it("paints a demanded cached directory while offline", async () => {
+  it("restores the cached directory before network demand", async () => {
     const serverId = "offline-cached-directory";
     serverIds.add(serverId);
     const client = new FakeDirectoryClient();
@@ -224,12 +313,12 @@ describe("DirectorySync session readiness", () => {
           workspaces: new Map([[cachedWorkspace.id, cachedWorkspace]]),
           projects: new Map([[cachedProject.projectId, cachedProject]]),
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
 
-    await directory.refreshAll();
+    await directory.restoreCachedDirectory();
 
     expect(
       useSessionStore.getState().sessions[serverId]?.workspaces.get(cachedWorkspace.id),
@@ -280,7 +369,7 @@ describe("DirectorySync session readiness", () => {
           workspaces: new Map(),
           projects: new Map(),
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
@@ -297,11 +386,11 @@ describe("DirectorySync session readiness", () => {
     directory.dispose();
   });
 
-  it("persists accepted script status updates through the directory owner", () => {
+  it("persists accepted script status updates through the directory owner", async () => {
     const serverId = "script-status-owner";
     serverIds.add(serverId);
     const client = new FakeDirectoryClient();
-    const commits: CachedDirectory[] = [];
+    const commits: DirectoryReplicaMutation[][] = [];
     const directory = new DirectorySync(
       serverId,
       {
@@ -318,7 +407,7 @@ describe("DirectorySync session readiness", () => {
           workspaces: new Map(),
           projects: new Map(),
         }),
-        commitDirectory: (_serverId, value) => commits.push(value),
+        commitDirectoryMutations: (_serverId, mutations) => commits.push([...mutations]),
       },
     );
     directory.connectionChanged({
@@ -344,7 +433,16 @@ describe("DirectorySync session readiness", () => {
     });
     const store = useSessionStore.getState();
     store.initializeSession(serverId, client as unknown as DaemonClient, 1);
-    store.setWorkspaces(serverId, new Map([[workspace.id, workspace]]));
+    store.updateSessionServerInfo(serverId, {
+      serverId,
+      hostname: null,
+      version: "test",
+      features: { workspaceMultiplicity: true },
+    });
+    directory.setDemand({}, true);
+    await directory.refreshDemand();
+    directory.acceptWorkspaces([workspace]);
+    commits.length = 0;
 
     client.emit({
       type: "script_status_update",
@@ -370,7 +468,17 @@ describe("DirectorySync session readiness", () => {
       useSessionStore.getState().sessions[serverId]?.workspaces.get(workspace.id)?.scripts[0]
         ?.lifecycle,
     ).toBe("running");
-    expect(commits.at(-1)?.workspaces.get(workspace.id)?.scripts[0]?.lifecycle).toBe("running");
+    const persisted = commits
+      .flat()
+      .find(
+        (
+          mutation,
+        ): mutation is Extract<DirectoryReplicaMutation, { kind: "workspace"; type: "upsert" }> =>
+          mutation.kind === "workspace" &&
+          mutation.type === "upsert" &&
+          mutation.id === workspace.id,
+      );
+    expect(persisted?.value.scripts[0]?.lifecycle).toBe("running");
     directory.dispose();
   });
 
@@ -476,7 +584,7 @@ describe("DirectorySync session readiness", () => {
             projects: new Map([[cachedProject.projectId, cachedProject]]),
           };
         },
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -556,7 +664,7 @@ describe("DirectorySync session readiness", () => {
           projects: new Map([[cachedProject.projectId, cachedProject]]),
           checkpoint: { workspaces: { generation: "g", afterSeq: 7 } },
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -593,6 +701,63 @@ describe("DirectorySync session readiness", () => {
     directory.dispose();
   });
 
+  it("reconciles agent changes on top of the accepted cached baseline", async () => {
+    const serverId = "cached-agent-changes";
+    serverIds.add(serverId);
+    const client = new FakeDirectoryClient();
+    const cachedAgent = createAgent(serverId, "cached-agent");
+    const releaseNetwork = client.holdAgentFetch();
+    const directory = new DirectorySync(
+      serverId,
+      {
+        onAgentStoppedRunning: () => undefined,
+        markAgentLoading: () => undefined,
+        markAgentReady: () => undefined,
+        markAgentError: () => undefined,
+      },
+      {
+        readAgent: async () => undefined,
+        readWorkspace: async () => undefined,
+        readDirectory: async () => ({
+          agents: new Map([[cachedAgent.id, cachedAgent]]),
+          workspaces: new Map(),
+          projects: new Map(),
+          checkpoint: { agents: { generation: "g", afterSeq: 7 } },
+        }),
+        commitDirectoryMutations: () => undefined,
+      },
+    );
+    directory.connectionChanged({
+      client: client as unknown as DaemonClient,
+      status: "online",
+      source: { clientGeneration: 1, connectionEpoch: 1 },
+    });
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, client as unknown as DaemonClient, 1);
+    store.updateSessionServerInfo(serverId, {
+      serverId,
+      hostname: null,
+      version: "test",
+      features: { workspaceMultiplicity: true, directorySync: true },
+    });
+
+    const refresh = directory.refreshAgents();
+    await expect.poll(() => client.fetchAgentsCalls).toBe(1);
+    releaseNetwork({
+      requestId: "agents",
+      entries: [],
+      pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
+      sync: { generation: "g", headSeq: 7, mode: "changes", removals: [] },
+    });
+    await refresh;
+
+    expect(client.lastAgentOptions).toMatchObject({
+      sync: { generation: "g", afterSeq: 7 },
+    });
+    expect(useSessionStore.getState().sessions[serverId]?.agents.has(cachedAgent.id)).toBe(true);
+    directory.dispose();
+  });
+
   it("does not use a cached checkpoint when the corresponding cache read loses its race", async () => {
     const serverId = "late-directory-cache";
     serverIds.add(serverId);
@@ -617,7 +782,7 @@ describe("DirectorySync session readiness", () => {
         readAgent: async () => undefined,
         readWorkspace: async () => undefined,
         readDirectory: () => cacheRead,
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -634,6 +799,8 @@ describe("DirectorySync session readiness", () => {
       features: { workspaceMultiplicity: true, directorySync: true },
     });
 
+    directory.setAgentRouteDemand(["agent-1"]);
+    await directory.refreshDemand();
     const refresh = directory.refreshWorkspaces();
     await Promise.resolve();
     client.emit({
@@ -706,7 +873,7 @@ describe("DirectorySync session readiness", () => {
           workspaces: new Map(),
           projects: new Map(),
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -717,10 +884,7 @@ describe("DirectorySync session readiness", () => {
     useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
 
     const load = directory.loadCachedAgent(cachedAgent.id);
-    client.emit({
-      type: "agent_deleted",
-      payload: { agentId: cachedAgent.id, requestId: "delete-live" },
-    });
+    directory.removeAgent(cachedAgent.id);
     releaseAgent(cachedAgent);
     await load;
 
@@ -754,7 +918,7 @@ describe("DirectorySync session readiness", () => {
           workspaces: new Map(),
           projects: new Map(),
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -807,7 +971,7 @@ describe("DirectorySync session readiness", () => {
           projects: new Map(),
           checkpoint: { agents: { generation: "generation", afterSeq: 12 } },
         }),
-        commitDirectory: () => undefined,
+        commitDirectoryMutations: () => undefined,
       },
     );
     directory.connectionChanged({
@@ -825,14 +989,14 @@ describe("DirectorySync session readiness", () => {
     });
 
     await directory.refreshAgents({
-      subscribe: { subscriptionId: `app:${serverId}` },
+      subscribe: {},
       page: { limit: 200 },
     });
 
     expect(client.lastAgentOptions).toEqual({
       scope: "active",
       sort: [{ key: "updated_at", direction: "desc" }],
-      subscribe: { subscriptionId: `app:${serverId}` },
+      subscribe: {},
       page: { limit: 200 },
       sync: { generation: "generation", afterSeq: 12 },
     });
@@ -891,7 +1055,10 @@ describe("DirectorySync session readiness", () => {
     const serverId = "project-list-sequence";
     serverIds.add(serverId);
     const client = new FakeDirectoryClient();
-    const writes: unknown[] = [];
+    const writes: Array<{
+      mutations: readonly DirectoryReplicaMutation[];
+      checkpoint: unknown;
+    }> = [];
     const cachedProjects = [
       normalizeProjectDescriptor({
         projectId: "project-1",
@@ -905,6 +1072,12 @@ describe("DirectorySync session readiness", () => {
         projectRootPath: "/repo/two",
         projectKind: "git",
       }),
+      normalizeProjectDescriptor({
+        projectId: "untouched-project",
+        projectDisplayName: "Untouched",
+        projectRootPath: "/repo/untouched",
+        projectKind: "git",
+      }),
     ];
     const directory = new DirectorySync(
       serverId,
@@ -923,7 +1096,8 @@ describe("DirectorySync session readiness", () => {
           projects: new Map(cachedProjects.map((project) => [project.projectId, project])),
           checkpoint: { projects: { generation: "generation", afterSeq: 4 } },
         }),
-        commitDirectory: (_serverId, value) => writes.push(value.checkpoint),
+        commitDirectoryMutations: (_serverId, mutations, checkpoint) =>
+          writes.push({ mutations: [...mutations], checkpoint }),
       },
     );
     directory.connectionChanged({
@@ -964,9 +1138,52 @@ describe("DirectorySync session readiness", () => {
       sync: { generation: "generation", afterSeq: 4 },
     });
     const projects = useSessionStore.getState().sessions[serverId]?.projects;
-    expect(Array.from(projects?.keys() ?? [])).toEqual(["project-1"]);
+    expect(Array.from(projects?.keys() ?? [])).toEqual(["project-1", "untouched-project"]);
     expect(projects?.get("project-1")?.projectDisplayName).toBe("New name");
-    expect(writes).toContainEqual({ projects: { generation: "generation", afterSeq: 6 } });
+    expect(writes.map(({ checkpoint }) => checkpoint)).toContainEqual({
+      projects: { generation: "generation", afterSeq: 6 },
+    });
+    const writtenProjectIds = writes
+      .flatMap(({ mutations }) => mutations)
+      .filter((mutation) => mutation.kind === "project")
+      .map((mutation) => mutation.id);
+    expect(writtenProjectIds).toEqual(["project-1", "project-2"]);
+    expect(writtenProjectIds).not.toContain("untouched-project");
+    directory.dispose();
+  });
+
+  it("keeps the accepted baseline when an old connection finishes its workspace request", async () => {
+    const serverId = "superseded-workspace-baseline";
+    const { client, directory } = createDirectory(serverId);
+    const store = useSessionStore.getState();
+    store.initializeSession(serverId, client as unknown as DaemonClient, 1);
+    store.updateSessionServerInfo(serverId, {
+      serverId,
+      hostname: null,
+      version: "test",
+      features: { workspaceMultiplicity: true, directorySync: true },
+    });
+    directory.acceptWorkspaces([normalizeWorkspaceDescriptor(createWorkspaceEntry("retained"))]);
+    const release = client.holdWorkspaceFetch();
+    const refresh = directory.refreshWorkspaces();
+    const rejected = expect(refresh).rejects.toBeInstanceOf(DirectoryRefreshSupersededError);
+    await expect.poll(() => client.fetchWorkspacesCalls).toBe(1);
+    directory.connectionChanged({
+      client: client as unknown as DaemonClient,
+      status: "online",
+      source: { clientGeneration: 1, connectionEpoch: 2 },
+    });
+    release({
+      requestId: "old-empty-snapshot",
+      entries: [],
+      emptyProjects: [],
+      pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
+      sync: { generation: "g", headSeq: 7, mode: "snapshot", removals: [] },
+    });
+    await rejected;
+    expect([...useSessionStore.getState().sessions[serverId].workspaces.keys()]).toEqual([
+      "retained",
+    ]);
     directory.dispose();
   });
 
@@ -1009,8 +1226,9 @@ describe("DirectorySync session readiness", () => {
     });
     const completeFetch = client.holdWorkspaceFetch();
 
-    const refresh = directory.refreshWorkspaces({ subscribe: true });
-    await Promise.resolve();
+    directory.setDemand({}, true);
+    const refresh = directory.refreshDemand();
+    await expect.poll(() => client.fetchWorkspacesCalls).toBe(1);
     client.emit({
       type: "workspace_update",
       payload: {
@@ -1036,9 +1254,19 @@ describe("DirectorySync session readiness", () => {
         },
       },
     });
+    client.emit({
+      type: "workspace_update",
+      payload: {
+        kind: "upsert",
+        workspace: { ...createWorkspaceEntry("updated-workspace"), name: "Live name" },
+      },
+    });
     completeFetch({
       requestId: "workspaces",
-      entries: [],
+      entries: [
+        createWorkspaceEntry("removed-workspace"),
+        createWorkspaceEntry("updated-workspace"),
+      ],
       emptyProjects: [
         {
           projectId: "snapshot-project",
@@ -1061,10 +1289,15 @@ describe("DirectorySync session readiness", () => {
     expect(projects?.get("workspace-project")).toMatchObject({
       projectDisplayName: "Project from workspace update",
     });
+    expect(
+      [...useSessionStore.getState().sessions[serverId].workspaces.values()].map(
+        ({ id, name }) => ({ id, name }),
+      ),
+    ).toEqual([{ id: "updated-workspace", name: "Live name" }]);
     directory.dispose();
   });
 
-  it("buffers project updates from the online epoch before workspace hydration starts", async () => {
+  it("ignores passive project events before directory demand", async () => {
     const serverId = "project-before-workspace-hydration";
     const { client, directory } = createDirectory(serverId);
     const store = useSessionStore.getState();
@@ -1094,12 +1327,433 @@ describe("DirectorySync session readiness", () => {
     await directory.refreshWorkspaces({ subscribe: true });
 
     expect(useSessionStore.getState().sessions[serverId]?.hasHydratedWorkspaces).toBe(true);
-    expect(
-      useSessionStore.getState().sessions[serverId]?.projects.get("early-project"),
-    ).toMatchObject({
-      projectDisplayName: "Early project",
-      projectRootPath: "/repo/early-project",
+    expect(useSessionStore.getState().sessions[serverId]?.projects.has("early-project")).toBe(
+      false,
+    );
+    directory.dispose();
+  });
+});
+
+function createSqliteCache() {
+  const database = new DatabaseSync(":memory:");
+  let beforeRead = async () => {};
+  const connection: ReplicaSqliteConnection = {
+    async exec(sql) {
+      database.exec(sql);
+    },
+    async run(sql, params = []) {
+      database.prepare(sql).run(...params);
+    },
+    async all<Row>(sql: string, params: readonly SqliteValue[] = []) {
+      const rows = database.prepare(sql).all(...params) as Row[];
+      if (sql.includes("FROM rows") && sql.includes("WHERE")) await beforeRead();
+      return rows;
+    },
+    async transaction(operation) {
+      database.exec("BEGIN IMMEDIATE");
+      try {
+        await operation(connection);
+        database.exec("COMMIT");
+      } catch (error) {
+        database.exec("ROLLBACK");
+        throw error;
+      }
+    },
+  };
+  const storage = createSqliteReplicaRowStore({ open: async () => connection }, 1);
+  const cache = new ReplicaCache(storage, { clearLegacyCache: async () => {} });
+  return {
+    cache,
+    database,
+    storage,
+    reopen: () => new ReplicaCache(storage, { clearLegacyCache: async () => {} }),
+    holdRead: (operation: () => Promise<void>) => {
+      beforeRead = operation;
+    },
+  };
+}
+
+it("fills every cached workspace beneath live updates received during the SQLite read", async () => {
+  const serverId = "sqlite-directory-race";
+  serverIds.add(serverId);
+  const { cache, database, holdRead } = createSqliteCache();
+  cache.setHosts([serverId]);
+  const project = normalizeProjectDescriptor({
+    projectId: "project",
+    projectDisplayName: "Cached",
+    projectRootPath: "/repo",
+    projectKind: "git",
+  });
+  const workspaces = ["first", "second", "third"].map((id) =>
+    normalizeWorkspaceDescriptor({
+      id,
+      projectId: "project",
+      projectDisplayName: "Cached",
+      projectRootPath: "/repo",
+      workspaceDirectory: `/repo/${id}`,
+      projectKind: "git",
+      workspaceKind: "local_checkout",
+      name: id,
+      status: "done",
+      statusEnteredAt: null,
+      activityAt: null,
+      archivingAt: null,
+      diffStat: null,
+      scripts: [],
+    }),
+  );
+  cache.replaceDirectoryBaseline(serverId, {
+    agents: new Map([["agent", createAgent(serverId, "agent")]]),
+    workspaces: new Map(workspaces.map((workspace) => [workspace.id, workspace])),
+    projects: new Map([[project.projectId, project]]),
+  });
+  await cache.flush();
+  const client = new FakeDirectoryClient();
+  const directory = new DirectorySync(
+    serverId,
+    {
+      onAgentStoppedRunning: () => {},
+      markAgentLoading: () => {},
+      markAgentReady: () => {},
+      markAgentError: () => {},
+    },
+    cache,
+  );
+  useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
+  directory.connectionChanged({
+    client: client as unknown as DaemonClient,
+    status: "online",
+    source: { clientGeneration: 1, connectionEpoch: 1 },
+  });
+  useSessionStore.getState().updateSessionServerInfo(serverId, {
+    serverId,
+    hostname: null,
+    version: "test",
+    features: { workspaceMultiplicity: true },
+  });
+  directory.setAgentRouteDemand(["agent"]);
+  await directory.refreshDemand();
+  let updated = false;
+  holdRead(async () => {
+    if (updated) return;
+    updated = true;
+    client.emit({
+      type: "workspace_update",
+      payload: {
+        kind: "upsert",
+        workspace: { ...workspaces[0], name: "Live", activityAt: null, statusEnteredAt: null },
+      },
+    });
+  });
+  await directory.restoreCachedDirectory();
+  const session = useSessionStore.getState().sessions[serverId];
+  expect(
+    [...session.workspaces.values()]
+      .map(({ id, name }) => ({ id, name }))
+      .sort((a, b) => a.id.localeCompare(b.id)),
+  ).toEqual([
+    { id: "first", name: "Live" },
+    { id: "second", name: "second" },
+    { id: "third", name: "third" },
+  ]);
+  expect(session.agents.get("agent")?.title).toBe("Cached");
+  expect(session.hasWorkspaceDirectorySnapshot).toBe(true);
+  directory.dispose();
+  await cache.flush();
+  database.close();
+});
+
+function createWorkspaceLabelDirectory(serverId: string) {
+  const { client, directory } = createDirectory(serverId, { workspaceLabels: true });
+  const store = useSessionStore.getState();
+  store.initializeSession(serverId, client as unknown as DaemonClient, 1);
+  store.updateSessionServerInfo(serverId, {
+    serverId,
+    hostname: null,
+    version: "test",
+    features: {
+      directorySync: true,
+      projectList: true,
+      workspaceLabels: true,
+      workspaceMultiplicity: true,
+    },
+  });
+  return { client, directory };
+}
+
+async function flushWorkspaceLabels(): Promise<void> {
+  for (let index = 0; index < 4; index += 1) await Promise.resolve();
+}
+
+describe("DirectorySync workspace labels", () => {
+  it("loads the catalog when an agent route is open before the sidebar", async () => {
+    const serverId = "workspace-labels-route-then-full";
+    const { directory } = createWorkspaceLabelDirectory(serverId);
+
+    directory.setAgentRouteDemand(["agent-1"]);
+    await directory.refreshDemand();
+    directory.setDemand({}, true);
+    await flushWorkspaceLabels();
+
+    expect(useWorkspaceLabels.getState().hosts[serverId]).toMatchObject({
+      status: "online",
+      labels: [{ name: "Urgent", color: "red" }],
+    });
+    directory.dispose();
+  });
+
+  it("loads the catalog when the sidebar demands the directory first", async () => {
+    const serverId = "workspace-labels-full-first";
+    const { directory } = createWorkspaceLabelDirectory(serverId);
+
+    directory.setDemand({}, true);
+    await directory.refreshDemand();
+
+    expect(useWorkspaceLabels.getState().hosts[serverId]).toMatchObject({
+      status: "online",
+      labels: [{ name: "Urgent", color: "red" }],
+    });
+    directory.dispose();
+  });
+
+  it("keeps the picker online during a full refresh", async () => {
+    const serverId = "workspace-labels-refresh-no-flicker";
+    const { client, directory } = createWorkspaceLabelDirectory(serverId);
+    directory.setDemand({}, true);
+    await directory.refreshDemand();
+    const callsBeforeRefresh = client.listWorkspaceLabelsCalls;
+    const statuses: string[] = [];
+    const unsubscribe = useWorkspaceLabels.subscribe((state) => {
+      const status = state.hosts[serverId]?.status;
+      if (status) statuses.push(status);
+    });
+
+    await directory.refreshDemand();
+
+    expect(client.listWorkspaceLabelsCalls).toBeGreaterThan(callsBeforeRefresh);
+    expect(statuses).not.toContain("offline");
+    unsubscribe();
+    directory.dispose();
+  });
+
+  it("restores the catalog after reconnecting", async () => {
+    const serverId = "workspace-labels-reconnect";
+    const { client, directory } = createWorkspaceLabelDirectory(serverId);
+    directory.setDemand({}, true);
+    await directory.refreshDemand();
+
+    directory.connectionChanged({
+      client: null,
+      status: "offline",
+      source: { clientGeneration: 1, connectionEpoch: 1 },
+    });
+    expect(useWorkspaceLabels.getState().hosts[serverId]?.status).toBe("offline");
+    directory.connectionChanged({
+      client: client as unknown as DaemonClient,
+      status: "online",
+      source: { clientGeneration: 1, connectionEpoch: 2 },
+    });
+    await flushWorkspaceLabels();
+
+    expect(useWorkspaceLabels.getState().hosts[serverId]).toMatchObject({
+      status: "online",
+      labels: [{ name: "Urgent", color: "red" }],
     });
     directory.dispose();
   });
 });
+
+it.each(["before", "during", "before-metadata", "damaged"] as const)(
+  "retains unchanged workspaces across route/full demand and restart (cache: %s)",
+  async (timing) => {
+    const cacheFirst = timing === "before";
+    const damaged = timing === "damaged";
+    const serverId = `cache-route-overlap-${timing}`;
+    serverIds.add(serverId);
+    const { cache, database, reopen, storage } = createSqliteCache();
+    cache.setHosts([serverId]);
+    const projectEntry: ProjectListResult["projects"][number] = {
+      projectId: "P",
+      projectDisplayName: "Project P",
+      projectRootPath: "/repo",
+      projectKind: "git",
+    };
+    const project = normalizeProjectDescriptor(projectEntry);
+    const workspaceEntries: WorkspaceFetchResult["entries"] = ["A", "B"].map((id) => ({
+      id,
+      projectId: "P",
+      projectDisplayName: "Project P",
+      projectRootPath: "/repo",
+      workspaceDirectory: `/repo/${id}`,
+      projectKind: "git",
+      workspaceKind: "local_checkout",
+      name: id,
+      status: "done",
+      statusEnteredAt: null,
+      activityAt: null,
+      archivingAt: null,
+      diffStat: null,
+      scripts: [],
+    }));
+    const workspaces = workspaceEntries.map(normalizeWorkspaceDescriptor);
+    const cursor = { generation: "g", afterSeq: 7 };
+    cache.replaceDirectoryBaseline(serverId, {
+      agents: new Map(),
+      projects: new Map([[project.projectId, project]]),
+      workspaces: new Map(
+        (damaged ? [] : workspaces).map((workspace) => [workspace.id, workspace]),
+      ),
+      checkpoint: { projects: cursor, workspaces: cursor, agents: cursor },
+    });
+    await cache.flush();
+    if (damaged) {
+      await storage.apply({
+        deletes: [],
+        upserts: [
+          {
+            serverId,
+            kind: "checkpoint",
+            id: "singleton",
+            payload: JSON.stringify({ projects: cursor, workspaces: cursor, agents: cursor }),
+          },
+        ],
+      });
+    }
+
+    // The host keeps A/B unchanged. A current cursor legitimately receives no rows.
+    class UnchangedDirectoryClient extends FakeDirectoryClient {
+      readonly workspaceSyncRequests: unknown[] = [];
+      override async fetchWorkspaces(
+        options?: Parameters<DaemonClient["fetchWorkspaces"]>[0],
+      ): Promise<WorkspaceFetchResult> {
+        this.fetchWorkspacesCalls += 1;
+        this.lastWorkspaceOptions = options;
+        this.workspaceSyncRequests.push(options?.sync);
+        const changes = options?.sync?.generation === "g" && options.sync.afterSeq === 7;
+        return {
+          requestId: "workspaces",
+          entries: changes ? [] : [workspaceEntries[options?.page?.cursor ? 1 : 0]],
+          emptyProjects: [],
+          pageInfo: {
+            hasMore: !changes && !options?.page?.cursor,
+            nextCursor: !changes && !options?.page?.cursor ? "page-2" : null,
+            prevCursor: null,
+          },
+          sync: {
+            generation: "g",
+            headSeq: 7,
+            mode: changes ? "changes" : "snapshot",
+            removals: [],
+          },
+        };
+      }
+    }
+    const client = new UnchangedDirectoryClient();
+    const releaseAgents = client.holdAgentFetch();
+    const releaseProjects = client.holdProjectFetch();
+    const projectResult: ProjectListResult = {
+      requestId: "projects",
+      projects: [projectEntry],
+      sync: { generation: "g", headSeq: 7, mode: "snapshot", removals: [] },
+    };
+    client.projectResult = projectResult;
+    const callbacks = {
+      onAgentStoppedRunning: () => {},
+      markAgentLoading: () => {},
+      markAgentReady: () => {},
+      markAgentError: () => {},
+    };
+    const directory = new DirectorySync(serverId, callbacks, cache);
+    const publishServerInfo = () => {
+      useSessionStore.getState().updateSessionServerInfo(serverId, {
+        serverId,
+        hostname: null,
+        version: "test",
+        features: { workspaceMultiplicity: true, directorySync: true, projectList: true },
+      });
+    };
+    const initializeSession = (ready = true) => {
+      useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
+      if (ready) publishServerInfo();
+    };
+    const connection = {
+      client: client as unknown as DaemonClient,
+      status: "online" as const,
+      source: { clientGeneration: 1, connectionEpoch: 1 },
+    };
+    initializeSession(timing !== "before-metadata");
+    directory.connectionChanged(connection);
+    const visibleIds = () =>
+      [...useSessionStore.getState().sessions[serverId].workspaces.keys()].sort();
+    let restarted: DirectorySync | undefined;
+    const restartedCache = reopen();
+    try {
+      if (cacheFirst) await directory.restoreCachedDirectory();
+      directory.setAgentRouteDemand(["agent"]);
+      if (timing === "before-metadata") {
+        await directory.restoreCachedDirectory();
+        publishServerInfo();
+      }
+      await expect.poll(() => client.listProjectsCalls).toBe(1);
+      await expect.poll(() => client.fetchAgentsCalls).toBe(1);
+      directory.setDemand({}, true);
+      await directory.restoreCachedDirectory();
+      expect(visibleIds()).toEqual(damaged ? [] : ["A", "B"]);
+
+      releaseProjects(projectResult);
+      releaseAgents({
+        requestId: "agents",
+        entries: [],
+        pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
+        sync: {
+          generation: "g",
+          headSeq: 7,
+          mode: cacheFirst ? "changes" : "snapshot",
+          removals: [],
+        },
+      });
+      await directory.refreshDemand();
+      expect(client.lastProjectOptions).toEqual({ sync: cacheFirst ? cursor : {} });
+      expect(client.workspaceSyncRequests).toEqual(cacheFirst ? [cursor] : [{}, {}]);
+      expect.soft(visibleIds(), "after overlapping refresh").toEqual(["A", "B"]);
+      await cache.flush();
+      expect([...(await cache.readDirectory(serverId)).workspaces.keys()].sort()).toEqual([
+        "A",
+        "B",
+      ]);
+
+      await directory.refreshAll();
+      await cache.flush();
+      directory.dispose();
+      useSessionStore.getState().clearSession(serverId);
+      restartedCache.setHosts([serverId]);
+      const persisted = await restartedCache.readDirectory(serverId);
+      expect(persisted.checkpoint?.workspaces).toEqual(cursor);
+      expect
+        .soft([...persisted.workspaces.keys()].sort(), "persisted baseline")
+        .toEqual(["A", "B"]);
+      initializeSession();
+      restarted = new DirectorySync(serverId, callbacks, restartedCache);
+      restarted.connectionChanged(connection);
+      await restarted.refreshAll();
+      expect.soft(visibleIds(), "after restart and refresh").toEqual(["A", "B"]);
+      const beforeUpdate = visibleIds();
+      client.emit({
+        type: "workspace_update",
+        payload: { kind: "upsert", workspace: workspaceEntries[0], generation: "g", seq: 8 },
+      });
+      expect(visibleIds()).toEqual([...new Set([...beforeUpdate, "A"])].sort());
+      client.emit({
+        type: "workspace_update",
+        payload: { kind: "upsert", workspace: workspaceEntries[1], generation: "g", seq: 9 },
+      });
+      expect(visibleIds()).toEqual(["A", "B"]);
+    } finally {
+      directory.dispose();
+      restarted?.dispose();
+      await cache.flush();
+      await restartedCache.flush();
+      database.close();
+    }
+  },
+);
diff --git a/packages/app/src/runtime/directory-sync/index.ts b/packages/app/src/runtime/directory-sync/index.ts
index 90648ffd38..6589914825 100644
--- a/packages/app/src/runtime/directory-sync/index.ts
+++ b/packages/app/src/runtime/directory-sync/index.ts
@@ -1,3 +1,4 @@
+import type { OwnedSubscription } from "@getpaseo/client";
 import type {
   DaemonClient,
   FetchAgentsEntry,
@@ -12,12 +13,6 @@ import {
   type ProjectDescriptor,
   type WorkspaceDescriptor,
 } from "@/stores/session-store";
-import {
-  readLegacyDaemonWorkspaceDirectory,
-  buildLegacyWorkspaces,
-  shouldUseLegacyDaemonWorkspaceDirectory,
-  stampLegacyWorkspaceIds,
-} from "@/workspace/legacy-daemon-workspaces";
 import type { AgentDirectoryDelta } from "@/utils/agent-directory-sync";
 import { AgentDirectoryReplica } from "./agent-replica";
 import {
@@ -36,7 +31,12 @@ import type {
   CachedWorkspace,
   DirectoryCheckpoint,
   DirectoryCursor,
+  DirectoryReplicaMutation,
 } from "@/runtime/replica-cache";
+import type { TurnLivenessTransition } from "@/timeline/turn-liveness";
+
+type FetchAgentsPayload = Awaited<ReturnType<DaemonClient["fetchAgents"]>>;
+type FetchWorkspacesPayload = Awaited<ReturnType<DaemonClient["fetchWorkspaces"]>>;
 
 const PAGE_LIMIT = 200;
 const AGENT_SORT: NonNullable<FetchAgentsOptions["sort"]> = [
@@ -56,12 +56,15 @@ function resolveAgentNextPage(pageInfo: AgentPageInfo): {
 interface AgentSnapshot {
   entries: FetchAgentsEntry[];
   subscriptionId: string | null;
-  legacy: boolean;
   syncMode?: "snapshot" | "changes";
   syncCursor?: DirectoryCursor;
   syncRemovals: Array<{ id: string; seq: number }>;
 }
 
+interface WorkspaceRefreshSnapshot extends WorkspaceDirectorySnapshot {
+  readonly requestCursors: Readonly<Pick<DirectoryCheckpoint, "projects" | "workspaces">>;
+}
+
 interface AgentPageInfo {
   hasMore?: boolean;
   hasMoreAfter?: boolean;
@@ -69,6 +72,36 @@ interface AgentPageInfo {
   afterCursor?: string | null;
 }
 
+function applyWorkspaceSnapshotPage(
+  snapshot: WorkspaceDirectorySnapshot,
+  payload: Awaited<ReturnType<DaemonClient["fetchWorkspaces"]>>,
+  firstPage: boolean,
+): void {
+  if (firstPage && payload.sync?.mode !== "changes") snapshot.workspaces.clear();
+  if (firstPage) (snapshot.syncModes ??= {}).workspaces = payload.sync?.mode ?? "snapshot";
+  for (const entry of payload.entries) {
+    const workspace = normalizeWorkspaceDescriptor(entry);
+    snapshot.workspaces.set(workspace.id, workspace);
+    (snapshot.touchedWorkspaceIds ??= new Set()).add(workspace.id);
+    (snapshot.touchedProjectIds ??= new Set()).add(workspace.projectId);
+  }
+  for (const removal of payload.sync?.removals ?? []) {
+    snapshot.workspaces.delete(removal.id);
+    (snapshot.touchedWorkspaceIds ??= new Set()).add(removal.id);
+  }
+  if (payload.sync) {
+    (snapshot.syncCursors ??= {}).workspaces = {
+      generation: payload.sync.generation,
+      afterSeq: payload.sync.headSeq,
+    };
+  }
+  for (const entry of payload.emptyProjects ?? []) {
+    const project = normalizeProjectDescriptor(entry);
+    snapshot.projects.set(project.projectId, project);
+    (snapshot.touchedProjectIds ??= new Set()).add(project.projectId);
+  }
+}
+
 export interface DirectoryConnection {
   client: DaemonClient | null;
   status: "online" | "offline";
@@ -79,15 +112,12 @@ export interface DirectoryCheckpointStorage {
   readAgent(serverId: string, agentId: string): Promise<Agent | undefined>;
   readWorkspace(serverId: string, workspaceId: string): Promise<CachedWorkspace | undefined>;
   readDirectory(serverId: string): Promise<CachedDirectory>;
-  commitDirectory(
+  commitDirectoryMutations(
     serverId: string,
-    directory: {
-      agents: Map<string, Agent>;
-      workspaces: Map<string, WorkspaceDescriptor>;
-      projects: Map<string, ProjectDescriptor>;
-      checkpoint?: DirectoryCheckpoint;
-    },
+    mutations: readonly DirectoryReplicaMutation[],
+    checkpoint?: DirectoryCheckpoint,
   ): void;
+  replaceDirectoryBaseline?(serverId: string, directory: CachedDirectory): void;
 }
 
 export interface RefreshAgentDirectoryInput {
@@ -107,7 +137,7 @@ export class DirectorySync {
     AgentDirectoryDelta
   >();
   private readonly workspaceTransactions = new DirectoryTransactionOwner<
-    WorkspaceDirectorySnapshot,
+    WorkspaceRefreshSnapshot,
     WorkspaceDirectoryDelta
   >();
   private readonly agents: AgentDirectoryReplica;
@@ -117,7 +147,9 @@ export class DirectorySync {
     status: "offline",
     source: { clientGeneration: 0, connectionEpoch: 0 },
   };
-  private unsubscribe: (() => void) | null = null;
+  private agentSubscription: OwnedSubscription<FetchAgentsPayload> | null = null;
+  private workspaceSubscription: OwnedSubscription<FetchWorkspacesPayload> | null = null;
+  private eventSubscription: ReturnType<DaemonClient["observeEvents"]> | null = null;
   private readonly abortSessionWaits = new Set<() => void>();
   private cacheLoad: Promise<void> | null = null;
   private cacheAccepted = false;
@@ -139,7 +171,9 @@ export class DirectorySync {
     },
     private readonly checkpoints?: DirectoryCheckpointStorage,
   ) {
-    this.agents = new AgentDirectoryReplica(serverId, callbacks.onAgentStoppedRunning);
+    const persist = (mutations: readonly DirectoryReplicaMutation[]) =>
+      this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
+    this.agents = new AgentDirectoryReplica(serverId, callbacks.onAgentStoppedRunning, persist);
     this.workspaces = new WorkspaceDirectoryReplica(serverId);
   }
 
@@ -154,79 +188,13 @@ export class DirectorySync {
       return false;
     }
     this.flushAbortedTransactions();
-    this.unsubscribe?.();
-    this.unsubscribe = null;
+    this.releaseSubscriptions();
     workspaceLabels.disconnect(this.serverId);
     this.connection = connection;
     this.abortPendingSessionWaits();
     if (!connection.client || connection.status !== "online") return true;
-    const client = connection.client;
-    const source = connection.source;
-    const subscriptions = [
-      client.on("agent_update", (message) => {
-        if (message.type !== "agent_update" || !this.isCurrent(client, source)) return;
-        this.revision += 1;
-        const recorded = this.agentTransactions.record(source, message.payload);
-        if (!recorded) {
-          this.agents.applyDelta(message.payload);
-          this.noteLiveCursor("agents", message.payload);
-          this.persistDirectory();
-        }
-      }),
-      client.on("workspace_update", (message) => {
-        if (message.type !== "workspace_update" || !this.isCurrent(client, source)) return;
-        this.revision += 1;
-        this.workspaceRevision += 1;
-        const recorded = this.workspaceTransactions.record(source, message.payload);
-        if (!recorded) {
-          this.workspaces.applyDelta(message.payload);
-          this.noteLiveCursor("workspaces", message.payload);
-          this.persistDirectory();
-        }
-      }),
-      client.on("project.update", (message) => {
-        if (message.type !== "project.update" || !this.isCurrent(client, source)) return;
-        this.revision += 1;
-        this.workspaceRevision += 1;
-        const recorded = this.workspaceTransactions.record(source, message.payload);
-        if (!recorded) {
-          this.workspaces.applyDelta(message.payload);
-          this.noteLiveCursor("projects", message.payload);
-          this.persistDirectory();
-        }
-      }),
-      client.on("script_status_update", (message) => {
-        if (message.type !== "script_status_update" || !this.isCurrent(client, source)) return;
-        this.revision += 1;
-        this.workspaceRevision += 1;
-        const delta: WorkspaceDirectoryDelta = {
-          kind: "script_status",
-          update: message.payload,
-        };
-        const recorded = this.workspaceTransactions.record(source, delta);
-        if (!recorded) {
-          this.workspaces.applyDelta(delta);
-          this.persistDirectory();
-        }
-      }),
-      client.on("agent_deleted", (message) => {
-        if (message.type === "agent_deleted" && this.isCurrent(client, source)) {
-          this.revision += 1;
-          this.agents.remove(message.payload.agentId);
-          this.persistDirectory();
-        }
-      }),
-      client.on("agent_archived", (message) => {
-        if (message.type === "agent_archived" && this.isCurrent(client, source)) {
-          this.revision += 1;
-          this.agents.archive(message.payload.agentId, message.payload.archivedAt);
-          this.persistDirectory();
-        }
-      }),
-    ];
-    this.unsubscribe = () => {
-      for (const unsubscribe of subscriptions) unsubscribe();
-    };
+    // Reattach labels here because route-only demand can satisfy the epoch before full demand requests them.
+    void this.connectWorkspaceLabels().catch(() => undefined);
     if (this.hasDemand()) void this.requestDemandRefresh().catch(() => undefined);
     return true;
   }
@@ -235,6 +203,7 @@ export class DirectorySync {
     const wasDemanded = this.fullDemandSources.size > 0;
     if (demanded) this.fullDemandSources.add(source);
     else this.fullDemandSources.delete(source);
+    if (!this.hasDemand()) this.releaseSubscriptions();
     if (!wasDemanded && this.fullDemandSources.size > 0) {
       void this.loadCachedDirectory().catch(() => undefined);
       if (this.getOnlineConnection()) void this.requestDemandRefresh().catch(() => undefined);
@@ -251,6 +220,7 @@ export class DirectorySync {
     }
     this.routeDemandIds.clear();
     for (const agentId of next) this.routeDemandIds.add(agentId);
+    if (!this.hasDemand()) this.releaseSubscriptions();
     if (this.routeDemandIds.size > 0 && this.getOnlineConnection()) {
       void this.requestDemandRefresh().catch(() => undefined);
     }
@@ -259,13 +229,65 @@ export class DirectorySync {
   dispose(): void {
     this.flushAbortedTransactions();
     this.abortPendingSessionWaits();
-    this.unsubscribe?.();
-    this.unsubscribe = null;
+    this.releaseSubscriptions();
     this.fullDemandSources.clear();
     this.routeDemandIds.clear();
     workspaceLabels.disconnect(this.serverId);
   }
 
+  private releaseSubscriptions(): void {
+    for (const subscription of [
+      this.agentSubscription,
+      this.workspaceSubscription,
+      this.eventSubscription,
+    ]) {
+      void subscription?.release().catch(() => undefined);
+    }
+    this.agentSubscription = null;
+    this.workspaceSubscription = null;
+    this.eventSubscription = null;
+    this.satisfiedDemandSource = null;
+  }
+
+  private receiveAgentDelta(source: DirectorySourceToken, delta: AgentDirectoryDelta): void {
+    this.revision += 1;
+    if (this.agentTransactions.record(source, delta)) return;
+    this.agents.applyDelta(delta);
+    this.noteLiveCursor("agents", delta);
+    this.persistCheckpoint();
+  }
+
+  private receiveWorkspaceDelta(
+    source: DirectorySourceToken,
+    delta: WorkspaceDirectoryDelta,
+  ): void {
+    this.revision += 1;
+    this.workspaceRevision += 1;
+    if (this.workspaceTransactions.record(source, delta)) return;
+    this.applyWorkspaceDelta(delta);
+    if (delta.kind !== "script_status")
+      this.noteLiveCursor(
+        "projectId" in delta || "project" in delta ? "projects" : "workspaces",
+        delta,
+      );
+    this.persistCheckpoint();
+  }
+
+  private observeDirectoryEvents(): void {
+    if (this.eventSubscription) return;
+    const { client, source } = this.requireOnline();
+    this.eventSubscription = client.observeEvents(["project.update", "script_status_update"]);
+    this.eventSubscription.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (!this.isCurrent(client, source)) return;
+        if (message.type === "project.update") this.receiveWorkspaceDelta(source, message.payload);
+        if (message.type === "script_status_update")
+          this.receiveWorkspaceDelta(source, { kind: "script_status", update: message.payload });
+      },
+    });
+  }
+
   private hasDemand(): boolean {
     return this.fullDemandSources.size > 0 || this.routeDemandIds.size > 0;
   }
@@ -276,6 +298,7 @@ export class DirectorySync {
     if (!this.getOnlineConnection()) {
       return this.fullDemandSources.size > 0 ? this.loadCachedDirectory() : Promise.resolve();
     }
+    this.observeDirectoryEvents();
     const source = this.connection.source;
     if (
       !force &&
@@ -352,32 +375,32 @@ export class DirectorySync {
     if (!checkpoints) return Promise.resolve();
     this.cacheLoad ??= (async () => {
       const revision = this.revision;
-      const initial = useSessionStore.getState().sessions[this.serverId];
-      if (!initial) return;
-      const initialAgents = initial.agents;
-      const initialWorkspaces = initial.workspaces;
-      const initialProjects = initial.projects;
-      const pristine =
-        initialAgents.size === 0 && initialWorkspaces.size === 0 && initialProjects.size === 0;
       const cached = await checkpoints.readDirectory(this.serverId);
-      if (this.cacheAccepted || !pristine || this.revision !== revision) return;
-      const session = useSessionStore.getState().sessions[this.serverId];
-      if (
-        !session ||
-        session.agents !== initialAgents ||
-        session.workspaces !== initialWorkspaces ||
-        session.projects !== initialProjects
-      ) {
-        return;
-      }
+      if (this.cacheAccepted) return;
+      if (!useSessionStore.getState().sessions[this.serverId]) return;
       this.agents.commitCached(cached.agents);
       this.workspaces.commitCached(cached);
-      this.cursors = cached.checkpoint ?? {};
+      if (this.revision === revision) this.cursors = cached.checkpoint ?? {};
       this.cacheAccepted = true;
     })();
     return this.cacheLoad;
   }
 
+  restoreCachedDirectory(): Promise<void> {
+    return this.loadCachedDirectory();
+  }
+
+  applyAgentTurnLiveness(
+    agentId: string,
+    transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
+  ): void {
+    this.agents.applyTurnLiveness(agentId, transition);
+  }
+
+  acceptAgent(agent: Agent): Agent {
+    return this.agents.accept(agent);
+  }
+
   async fetchTimeline(
     agentId: string,
     request: Parameters<DaemonClient["fetchAgentTimeline"]>[1],
@@ -387,7 +410,7 @@ export class DirectorySync {
     const page = await fetchAgentTimelineOnce(client, agentId, request);
     if (page.agent && this.agents.submitTimelineAgent(token, page.agent)) {
       this.revision += 1;
-      this.persistDirectory();
+      this.persistCheckpoint();
     }
     return page;
   }
@@ -418,32 +441,12 @@ export class DirectorySync {
     const transaction = this.agentTransactions.begin(source, () => ({
       entries: [],
       subscriptionId: null,
-      legacy: false,
       syncRemovals: [],
     }));
     this.callbacks.markAgentLoading();
     try {
       await this.waitForSession(client, source);
-      const session = useSessionStore.getState().sessions[this.serverId];
-      if (!input.filter && shouldUseLegacyDaemonWorkspaceDirectory(session?.serverInfo)) {
-        const directory = await readLegacyDaemonWorkspaceDirectory({
-          client,
-          subscribe: input.subscribe,
-          page: input.page,
-        });
-        if (
-          !directory ||
-          !this.agentTransactions.isCurrent(transaction) ||
-          !this.isCurrent(client, source)
-        ) {
-          throw new DirectoryRefreshSupersededError("legacy fetch no longer current");
-        }
-        transaction.snapshot.entries.push(...stampLegacyWorkspaceIds(directory.entries));
-        transaction.snapshot.subscriptionId = directory.subscriptionId;
-        transaction.snapshot.legacy = true;
-      } else {
-        await this.fetchAgents(client, source, transaction, input);
-      }
+      await this.fetchAgents(client, source, transaction, input);
       if (!this.isCurrent(client, source) || !this.hasMatchingSession(client, source)) {
         throw new DirectoryRefreshSupersededError("agent completion no longer current");
       }
@@ -451,27 +454,10 @@ export class DirectorySync {
       if (completion.kind === "stale") {
         throw new DirectoryRefreshSupersededError("agent completion was superseded");
       }
-      if (completion.snapshot.legacy) {
-        const store = useSessionStore.getState();
-        const workspaces = buildLegacyWorkspaces(completion.snapshot.entries);
-        store.setWorkspaces(this.serverId, workspaces);
-        store.setProjects(
-          this.serverId,
-          Array.from(workspaces.values(), legacyProjectDescriptorFromWorkspace),
-        );
-        store.setHasHydratedWorkspaces(this.serverId, true);
-      }
-      const deltas = completion.snapshot.legacy
-        ? completion.deltas.map((delta) =>
-            delta.kind === "upsert"
-              ? { ...delta, agent: { ...delta.agent, workspaceId: delta.agent.cwd } }
-              : delta,
-          )
-        : completion.deltas;
       this.revision += 1;
-      const agents = this.commitAgentSnapshot(completion.snapshot, deltas);
+      const agents = this.commitAgentSnapshot(completion.snapshot, completion.deltas);
       this.persistAgentCursors(completion.snapshot, completion.deltas);
-      this.persistDirectory();
+      this.persistCheckpoint();
       this.callbacks.markAgentReady();
       return { agents, subscriptionId: completion.snapshot.subscriptionId };
     } catch (error) {
@@ -496,21 +482,25 @@ export class DirectorySync {
     const onlineConnection = this.getOnlineConnection();
     if (!onlineConnection) return;
     const { client, source } = onlineConnection;
-    const transaction = this.workspaceTransactions.begin(source, () => ({
-      workspaces: new Map(useSessionStore.getState().sessions[this.serverId]?.workspaces),
-      projects: new Map(useSessionStore.getState().sessions[this.serverId]?.projects),
-      syncCursors: {},
-    }));
+    const transaction = this.workspaceTransactions.begin(source, () => {
+      const baseline = this.workspaces.snapshot();
+      return {
+        workspaces: new Map(baseline.workspaces),
+        projects: new Map(baseline.projects),
+        // Cache hydration can advance the live replica while these requests await responses.
+        // Every page must use the cursors belonging to the maps captured here.
+        requestCursors: { ...this.cursors },
+        syncCursors: {},
+        syncModes: {},
+        touchedWorkspaceIds: new Set(),
+        touchedProjectIds: new Set(),
+      };
+    });
     try {
       await this.waitForSessionMetadata(client, source);
       const serverInfo = useSessionStore.getState().sessions[this.serverId]?.serverInfo;
-      if (serverInfo?.features?.workspaceMultiplicity !== true) {
-        const deltas = this.workspaceTransactions.fail(transaction);
-        if (deltas) for (const delta of deltas) this.workspaces.applyDelta(delta);
-        return;
-      }
-      const supportsProjectList = serverInfo.features?.projectList === true;
-      const supportsDirectorySync = serverInfo.features?.directorySync === true;
+      const supportsProjectList = serverInfo?.features?.projectList === true;
+      const supportsDirectorySync = serverInfo?.features?.directorySync === true;
       if (supportsProjectList) {
         await this.fetchProjectSnapshot(client, source, transaction, supportsDirectorySync);
       }
@@ -521,11 +511,15 @@ export class DirectorySync {
         input?.subscribe === true,
         supportsDirectorySync,
       );
-      if (!supportsProjectList) this.buildLegacyProjectSnapshot(transaction.snapshot);
+      if (!supportsProjectList) {
+        this.buildLegacyProjectSnapshot(transaction.snapshot);
+        (transaction.snapshot.syncModes ??= {}).projects =
+          transaction.snapshot.syncModes?.workspaces;
+      }
       this.completeWorkspaceRefresh(client, source, transaction);
     } catch (error) {
       const deltas = this.workspaceTransactions.fail(transaction);
-      if (deltas) for (const delta of deltas) this.workspaces.applyDelta(delta);
+      if (deltas) for (const delta of deltas) this.applyWorkspaceDelta(delta);
       throw error;
     }
   }
@@ -533,40 +527,37 @@ export class DirectorySync {
   private async fetchWorkspaceSnapshot(
     client: DaemonClient,
     source: DirectorySourceToken,
-    transaction: DirectoryTransaction<WorkspaceDirectorySnapshot, WorkspaceDirectoryDelta>,
+    transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
     initialSubscribe: boolean,
     supportsDirectorySync: boolean,
   ): Promise<void> {
     let cursor: string | null = null;
     let subscribe = initialSubscribe;
     while (true) {
-      const payload = await client.fetchWorkspaces({
+      const query: Parameters<DaemonClient["observeWorkspaces"]>[0] = {
+        ...(client.supportsBackgroundWorkspaces() ? { includeBackground: true } : {}),
         sort: [{ key: "activity_at", direction: "desc" }],
-        ...(subscribe ? { subscribe: {} } : {}),
         page: cursor ? { limit: PAGE_LIMIT, cursor } : { limit: PAGE_LIMIT },
-        ...(supportsDirectorySync ? { sync: this.readCursors().workspaces ?? {} } : {}),
-      });
+        ...(supportsDirectorySync
+          ? { sync: transaction.snapshot.requestCursors.workspaces ?? {} }
+          : {}),
+      };
+      let payload: FetchWorkspacesPayload;
+      if (subscribe) {
+        void this.workspaceSubscription?.release().catch(() => undefined);
+        const subscription = client.observeWorkspaces(query);
+        this.workspaceSubscription = subscription;
+        subscription.subscribe({
+          snapshot: () => {},
+          update: (message) => {
+            if (message.type === "workspace_update" && this.isCurrent(client, source))
+              this.receiveWorkspaceDelta(source, message.payload);
+          },
+        });
+        payload = await subscription.ready;
+      } else payload = await client.fetchWorkspaces(query);
       this.assertWorkspaceTransactionCurrent(client, source, transaction);
-      if (cursor === null && payload.sync?.mode !== "changes") {
-        transaction.snapshot.workspaces.clear();
-      }
-      for (const entry of payload.entries) {
-        const workspace = normalizeWorkspaceDescriptor(entry);
-        transaction.snapshot.workspaces.set(workspace.id, workspace);
-      }
-      for (const removal of payload.sync?.removals ?? []) {
-        transaction.snapshot.workspaces.delete(removal.id);
-      }
-      if (payload.sync) {
-        (transaction.snapshot.syncCursors ??= {}).workspaces = {
-          generation: payload.sync.generation,
-          afterSeq: payload.sync.headSeq,
-        };
-      }
-      for (const entry of payload.emptyProjects ?? []) {
-        const project = normalizeProjectDescriptor(entry);
-        transaction.snapshot.projects.set(project.projectId, project);
-      }
+      applyWorkspaceSnapshotPage(transaction.snapshot, payload, cursor === null);
       if (!payload.pageInfo.hasMore || !payload.pageInfo.nextCursor) return;
       cursor = payload.pageInfo.nextCursor;
       subscribe = false;
@@ -587,6 +578,11 @@ export class DirectorySync {
       this.refreshAgents({ subscribe: {} }),
       this.refreshWorkspaces({ subscribe: true }),
     ]);
+    this.checkpoints?.replaceDirectoryBaseline?.(this.serverId, {
+      agents: this.agents.snapshot(),
+      ...this.workspaces.snapshot(),
+      checkpoint: this.cursors,
+    });
     if (this.getOnlineConnection()) await this.connectWorkspaceLabels();
   }
 
@@ -600,6 +596,33 @@ export class DirectorySync {
     });
   }
 
+  acceptWorkspaces(workspaces: readonly WorkspaceDescriptor[]): void {
+    const mutations = this.workspaces.acceptWorkspaces(workspaces);
+    this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
+  }
+
+  archiveAgent(agentId: string, archivedAt: string): void {
+    this.agents.archive(agentId, archivedAt);
+  }
+
+  removeAgent(agentId: string): void {
+    this.agents.remove(agentId);
+  }
+
+  acceptProject(project: ProjectDescriptor): void {
+    const mutations = this.workspaces.acceptProject(project);
+    this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
+  }
+
+  removeWorkspace(workspaceId: string): void {
+    const mutations = this.workspaces.removeWorkspaceSnapshot(workspaceId);
+    this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
+  }
+
+  markWorkspacesHydrated(hydrated: boolean): void {
+    useSessionStore.getState().setHasHydratedWorkspaces(this.serverId, hydrated);
+  }
+
   private async fetchAgents(
     client: DaemonClient,
     source: DirectorySourceToken,
@@ -610,15 +633,30 @@ export class DirectorySync {
     let subscribe = input.subscribe;
     while (true) {
       const limit = input.page?.limit ?? PAGE_LIMIT;
-      const payload = await client.fetchAgents({
+      const query: Omit<FetchAgentsOptions, "subscribe"> = {
         ...(input.filter ? { filter: input.filter } : { scope: "active" as const }),
+        ...(client.supportsBackgroundWorkspaces() ? { includeBackground: true } : {}),
         sort: AGENT_SORT,
-        ...(subscribe ? { subscribe } : {}),
         page: cursor ? { limit, cursor } : { limit },
         ...(!input.filter && cursor === null && this.supportsDirectorySync()
           ? { sync: this.readCursors().agents ?? {} }
           : {}),
-      });
+      };
+      let payload: FetchAgentsPayload;
+      if (subscribe) {
+        if (subscribe.subscriptionId) throw new Error("Subscription IDs are assigned by the host");
+        void this.agentSubscription?.release().catch(() => undefined);
+        const subscription = client.observeAgents(query);
+        this.agentSubscription = subscription;
+        subscription.subscribe({
+          snapshot: () => {},
+          update: (message) => {
+            if (message.type === "agent_update" && this.isCurrent(client, source))
+              this.receiveAgentDelta(source, message.payload);
+          },
+        });
+        payload = await subscription.ready;
+      } else payload = await client.fetchAgents(query);
       this.assertAgentTransactionCurrent(client, source, transaction);
       transaction.snapshot.entries.push(...payload.entries);
       transaction.snapshot.subscriptionId ??= payload.subscriptionId ?? null;
@@ -643,7 +681,7 @@ export class DirectorySync {
   private assertWorkspaceTransactionCurrent(
     client: DaemonClient,
     source: DirectorySourceToken,
-    transaction: DirectoryTransaction<WorkspaceDirectorySnapshot, WorkspaceDirectoryDelta>,
+    transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
   ): void {
     if (!this.workspaceTransactions.isCurrent(transaction) || !this.isCurrent(client, source)) {
       throw new DirectoryRefreshSupersededError("workspace fetch no longer current");
@@ -669,7 +707,6 @@ export class DirectorySync {
     this.agentTransactions.begin(connection.source, () => ({
       entries: [],
       subscriptionId: null,
-      legacy: false,
       syncRemovals: [],
     }));
   }
@@ -701,20 +738,25 @@ export class DirectorySync {
   private async fetchProjectSnapshot(
     client: DaemonClient,
     source: DirectorySourceToken,
-    transaction: DirectoryTransaction<WorkspaceDirectorySnapshot, WorkspaceDirectoryDelta>,
+    transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
     supportsDirectorySync: boolean,
   ): Promise<void> {
     const payload = await client.listProjects(
-      supportsDirectorySync ? { sync: this.readCursors().projects ?? {} } : undefined,
+      supportsDirectorySync
+        ? { sync: transaction.snapshot.requestCursors.projects ?? {} }
+        : undefined,
     );
     this.assertWorkspaceTransactionCurrent(client, source, transaction);
     if (payload.sync?.mode !== "changes") transaction.snapshot.projects.clear();
+    (transaction.snapshot.syncModes ??= {}).projects = payload.sync?.mode ?? "snapshot";
     for (const entry of payload.projects) {
       const project = normalizeProjectDescriptor(entry);
       transaction.snapshot.projects.set(project.projectId, project);
+      (transaction.snapshot.touchedProjectIds ??= new Set()).add(project.projectId);
     }
     for (const removal of payload.sync?.removals ?? []) {
       transaction.snapshot.projects.delete(removal.id);
+      (transaction.snapshot.touchedProjectIds ??= new Set()).add(removal.id);
     }
     if (payload.sync) {
       (transaction.snapshot.syncCursors ??= {}).projects = {
@@ -727,7 +769,7 @@ export class DirectorySync {
   private completeWorkspaceRefresh(
     client: DaemonClient,
     source: DirectorySourceToken,
-    transaction: DirectoryTransaction<WorkspaceDirectorySnapshot, WorkspaceDirectoryDelta>,
+    transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
   ): void {
     if (!this.isCurrent(client, source) || !this.hasMatchingSession(client, source)) {
       throw new DirectoryRefreshSupersededError("workspace completion no longer current");
@@ -738,7 +780,22 @@ export class DirectorySync {
     }
     this.revision += 1;
     this.workspaceRevision += 1;
-    this.workspaces.commitSnapshot(completion.snapshot, completion.deltas);
+    const previous = this.readWorkspaceState();
+    const deltaMutations = this.workspaces.commitSnapshot(completion.snapshot, completion.deltas);
+    const next = this.workspaces.snapshot();
+    const workspaceIds =
+      completion.snapshot.syncModes?.workspaces === "changes"
+        ? new Set(completion.snapshot.touchedWorkspaceIds)
+        : new Set([...previous.workspaces.keys(), ...next.workspaces.keys()]);
+    const projectIds =
+      completion.snapshot.syncModes?.projects === "changes"
+        ? new Set(completion.snapshot.touchedProjectIds)
+        : new Set([...previous.projects.keys(), ...next.projects.keys()]);
+    for (const mutation of deltaMutations) {
+      if (mutation.kind === "workspace") workspaceIds.add(mutation.id);
+      if (mutation.kind === "project") projectIds.add(mutation.id);
+    }
+    this.persistWorkspaceChanges(previous, workspaceIds, projectIds);
     for (const [entity, cursor] of Object.entries(completion.snapshot.syncCursors ?? {})) {
       if (cursor) this.writeCursor(entity as "projects" | "workspaces", cursor);
     }
@@ -747,19 +804,41 @@ export class DirectorySync {
       const entity = "projectId" in delta || "project" in delta ? "projects" : "workspaces";
       this.noteLiveCursor(entity, delta);
     }
-    this.persistDirectory();
+    this.persistCheckpoint();
   }
 
-  private persistDirectory(): void {
-    if (!this.checkpoints) return;
-    const session = useSessionStore.getState().sessions[this.serverId];
-    if (!session) return;
-    this.checkpoints.commitDirectory(this.serverId, {
-      agents: session.agents,
-      workspaces: session.workspaces,
-      projects: session.projects,
-      checkpoint: this.cursors,
-    });
+  private persistCheckpoint(): void {
+    this.checkpoints?.commitDirectoryMutations(this.serverId, [], this.cursors);
+  }
+
+  private readWorkspaceState(): WorkspaceDirectorySnapshot {
+    return this.workspaces.snapshot();
+  }
+
+  private applyWorkspaceDelta(delta: WorkspaceDirectoryDelta): void {
+    const mutations = this.workspaces.applyDelta(delta);
+    this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
+  }
+
+  private persistWorkspaceChanges(
+    previous: WorkspaceDirectorySnapshot,
+    workspaceIds: Set<string>,
+    projectIds: Set<string>,
+  ): void {
+    const next = this.workspaces.snapshot();
+    const mutations: DirectoryReplicaMutation[] = [];
+    for (const id of workspaceIds) {
+      const value = next.workspaces.get(id);
+      if (value) mutations.push({ kind: "workspace", type: "upsert", id, value });
+      else if (previous.workspaces.has(id))
+        mutations.push({ kind: "workspace", type: "delete", id });
+    }
+    for (const id of projectIds) {
+      const value = next.projects.get(id);
+      if (value) mutations.push({ kind: "project", type: "upsert", id, value });
+      else if (previous.projects.has(id)) mutations.push({ kind: "project", type: "delete", id });
+    }
+    this.checkpoints?.commitDirectoryMutations(this.serverId, mutations);
   }
 
   private recordAgentSync(
@@ -858,7 +937,7 @@ export class DirectorySync {
 
   private flushAbortedTransactions(): void {
     for (const delta of this.agentTransactions.abort()) this.agents.applyDelta(delta);
-    for (const delta of this.workspaceTransactions.abort()) this.workspaces.applyDelta(delta);
+    for (const delta of this.workspaceTransactions.abort()) this.applyWorkspaceDelta(delta);
   }
 
   private abortPendingSessionWaits(): void {
diff --git a/packages/app/src/runtime/directory-sync/internal/agent-store.ts b/packages/app/src/runtime/directory-sync/internal/agent-store.ts
new file mode 100644
index 0000000000..97c8208da5
--- /dev/null
+++ b/packages/app/src/runtime/directory-sync/internal/agent-store.ts
@@ -0,0 +1,228 @@
+import equal from "fast-deep-equal";
+import type { FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
+import { useSessionStore, type Agent } from "@/stores/session-store";
+import { acceptAgentDirectoryUpdate } from "@/utils/agent-directory-update-policy";
+import { buildAgentDirectoryState, type AgentDirectoryDelta } from "@/utils/agent-directory-sync";
+import { derivePendingPermissionKey, normalizeAgentSnapshot } from "@/utils/agent-snapshots";
+import { resolveProjectPlacement } from "@/utils/project-placement";
+import { clearArchiveAgentPending } from "@/hooks/use-archive-agent";
+import { queryClient } from "@/data/query-client";
+import { buildDraftStoreKey } from "@/stores/draft-keys";
+import { useDraftStore } from "@/stores/draft-store";
+import { getInitDeferred, getInitKey, rejectInitDeferred } from "@/utils/agent-initialization";
+import { reduceTurnLiveness, type TurnLivenessTransition } from "@/timeline/turn-liveness";
+
+function withoutAgent(agentId: string) {
+  return <T>(current: Map<string, T>): Map<string, T> => {
+    if (!current.has(agentId)) return current;
+    const next = new Map(current);
+    next.delete(agentId);
+    return next;
+  };
+}
+
+function mergeSnapshotTurn(previous: Agent | undefined, incoming: Agent): Agent {
+  if (!previous) return incoming;
+  const activeTurn =
+    incoming.turn.phase === "open"
+      ? { turnId: incoming.turn.turnId, startedAt: incoming.turn.startedAt }
+      : null;
+  const turn = reduceTurnLiveness(previous.turn, { type: "snapshot", activeTurn });
+  return turn === incoming.turn ? incoming : { ...incoming, turn };
+}
+
+export class AgentStoreProjection {
+  constructor(private readonly serverId: string) {}
+
+  snapshot(): Map<string, Agent> {
+    return useSessionStore.getState().sessions[this.serverId]?.agents ?? new Map();
+  }
+
+  get(agentId: string): Agent | undefined {
+    const session = useSessionStore.getState().sessions[this.serverId];
+    return session?.agents.get(agentId) ?? session?.agentDetails.get(agentId);
+  }
+
+  commitCached(agents: Map<string, Agent>): Map<string, Agent> {
+    const merged = new Map(agents);
+    for (const [agentId, agent] of this.snapshot()) merged.set(agentId, agent);
+    for (const agent of merged.values()) this.publishActivity(agent);
+    useSessionStore.getState().setAgents(this.serverId, merged);
+    return merged;
+  }
+
+  publishActivity(agent: Agent): void {
+    useSessionStore.getState().setAgentLastActivity(agent.id, agent.lastActivityAt);
+  }
+
+  accept(agent: Agent): Agent {
+    let accepted = agent;
+    useSessionStore.getState().setAgents(this.serverId, (current) => {
+      const previous = current.get(agent.id);
+      accepted = acceptAgentDirectoryUpdate(previous, mergeSnapshotTurn(previous, agent));
+      if (accepted === previous) return current;
+      const next = new Map(current);
+      next.set(agent.id, accepted);
+      return next;
+    });
+    return accepted;
+  }
+
+  applyDelta(delta: AgentDirectoryDelta): {
+    agentId: string;
+    stoppedRunning: boolean;
+    agent?: Agent;
+  } {
+    if (delta.kind === "remove") {
+      this.removeFromDirectory(delta.agentId);
+      return { agentId: delta.agentId, stoppedRunning: false };
+    }
+    const normalized = normalizeAgentSnapshot(delta.agent, this.serverId);
+    const session = useSessionStore.getState().sessions[this.serverId];
+    const previous = session?.agents.get(normalized.id) ?? session?.agentDetails.get(normalized.id);
+    const legacyWorkspaceId =
+      previous?.workspaceId ??
+      Array.from(session?.workspaces.values() ?? []).find(
+        (workspace) =>
+          session?.serverInfo?.features?.workspaceMultiplicity !== true &&
+          workspace.workspaceDirectory === normalized.cwd,
+      )?.id;
+    const accepted = this.accept({
+      ...normalized,
+      workspaceId: normalized.workspaceId ?? legacyWorkspaceId,
+      projectPlacement:
+        resolveProjectPlacement({ projectPlacement: delta.project, cwd: normalized.cwd }) ??
+        previous?.projectPlacement,
+    });
+    if (accepted.archivedAt) {
+      clearArchiveAgentPending({ queryClient, serverId: this.serverId, agentId: accepted.id });
+    }
+    this.replacePendingPermissions(accepted);
+    useSessionStore.getState().setAgentLastActivity(accepted.id, accepted.lastActivityAt);
+    return {
+      agentId: accepted.id,
+      stoppedRunning: previous?.turn.phase === "open" && accepted.turn.phase === "idle",
+      agent: accepted,
+    };
+  }
+
+  replaceFetched(entries: FetchAgentsEntry[]): Map<string, Agent> {
+    const { agents: fetched, pendingPermissions } = buildAgentDirectoryState({
+      serverId: this.serverId,
+      entries,
+    });
+    const store = useSessionStore.getState();
+    const current = store.sessions[this.serverId]?.agents ?? new Map<string, Agent>();
+    const agents = new Map<string, Agent>();
+    for (const [agentId, fetchedAgent] of fetched) {
+      const existing = current.get(agentId);
+      const merged = mergeSnapshotTurn(existing, fetchedAgent);
+      agents.set(agentId, existing && equal(existing, merged) ? existing : merged);
+      if (fetchedAgent.archivedAt) {
+        clearArchiveAgentPending({ queryClient, serverId: this.serverId, agentId });
+      }
+    }
+    store.setAgents(this.serverId, agents);
+    store.setAgentDetails(this.serverId, (previous) => {
+      let next: Map<string, Agent> | null = null;
+      for (const agentId of agents.keys()) {
+        if (!previous.has(agentId)) continue;
+        next ??= new Map(previous);
+        next.delete(agentId);
+      }
+      return next ?? previous;
+    });
+    store.setAgentLastActivityBatch(
+      new Map(Array.from(agents.values(), (agent) => [agent.id, agent.lastActivityAt])),
+    );
+    store.setPendingPermissions(this.serverId, new Map(pendingPermissions));
+    store.setHasHydratedAgents(this.serverId, true);
+    return agents;
+  }
+
+  replacePendingPermissions(agent: Agent): void {
+    const pending = new Map(useSessionStore.getState().sessions[this.serverId]?.pendingPermissions);
+    for (const [key, entry] of pending) if (entry.agentId === agent.id) pending.delete(key);
+    for (const request of agent.pendingPermissions) {
+      const key = derivePendingPermissionKey(agent.id, request);
+      pending.set(key, { key, agentId: agent.id, request });
+    }
+    useSessionStore.getState().setPendingPermissions(this.serverId, pending);
+  }
+
+  removeFromDirectory(agentId: string): void {
+    const store = useSessionStore.getState();
+    const removeKey = withoutAgent(agentId);
+    clearArchiveAgentPending({ queryClient, serverId: this.serverId, agentId });
+    store.setAgents(this.serverId, removeKey);
+    store.setAgentDetails(this.serverId, removeKey);
+    store.setQueuedMessages(this.serverId, removeKey);
+    store.setInitializingAgents(this.serverId, removeKey);
+    store.setPendingPermissions(this.serverId, (current) => {
+      const next = new Map(current);
+      for (const [key, pending] of next) if (pending.agentId === agentId) next.delete(key);
+      return next.size === current.size ? current : next;
+    });
+    useSessionStore.setState((state) => {
+      if (!state.agentLastActivity.has(agentId)) return state;
+      const agentLastActivity = new Map(state.agentLastActivity);
+      agentLastActivity.delete(agentId);
+      return { ...state, agentLastActivity };
+    });
+    useDraftStore.getState().clearDraftInput({
+      draftKey: buildDraftStoreKey({ serverId: this.serverId, agentId }),
+    });
+    const initKey = getInitKey(this.serverId, agentId);
+    if (getInitDeferred(initKey)) {
+      rejectInitDeferred(initKey, new Error("Agent was removed during initialization"));
+    }
+  }
+
+  remove(agentId: string): void {
+    this.removeFromDirectory(agentId);
+    // Only entity deletion destroys the transcript. A filtered active-list
+    // response can arrive after a fresh history response for an archived agent.
+    const store = useSessionStore.getState();
+    const removeKey = withoutAgent(agentId);
+    store.setAgentTimelineCursor(this.serverId, removeKey);
+    store.setAgentAuthoritativeHistoryApplied(this.serverId, agentId, false);
+    store.setAgentStreamTail(this.serverId, removeKey);
+    store.clearAgentStreamHead(this.serverId, agentId);
+  }
+
+  archive(agentId: string, archivedAt: string): Agent | null {
+    let archived: Agent | null = null;
+    useSessionStore.getState().setAgents(this.serverId, (current) => {
+      const agent = current.get(agentId);
+      if (!agent) return current;
+      archived = {
+        ...agent,
+        turn: { phase: "idle", cancellationRequestId: null },
+        archivedAt: new Date(archivedAt),
+      };
+      const next = new Map(current);
+      next.set(agentId, archived);
+      return next;
+    });
+    return archived;
+  }
+
+  applyTurn(
+    agentId: string,
+    transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
+  ): Agent | null {
+    const transitions = Array.isArray(transition) ? transition : [transition];
+    let accepted: Agent | null = null;
+    useSessionStore.getState().setAgents(this.serverId, (current) => {
+      const agent = current.get(agentId);
+      if (!agent) return current;
+      const turn = transitions.reduce(reduceTurnLiveness, agent.turn);
+      if (turn === agent.turn) return current;
+      accepted = { ...agent, turn };
+      const next = new Map(current);
+      next.set(agentId, accepted);
+      return next;
+    });
+    return accepted;
+  }
+}
diff --git a/packages/app/src/runtime/directory-sync/workspace-replica.ts b/packages/app/src/runtime/directory-sync/workspace-replica.ts
index bc3a36fd56..d229c196a2 100644
--- a/packages/app/src/runtime/directory-sync/workspace-replica.ts
+++ b/packages/app/src/runtime/directory-sync/workspace-replica.ts
@@ -16,11 +16,11 @@ import {
   shouldSuppressWorkspaceForLocalArchive,
 } from "@/contexts/session-workspace-upserts";
 import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
+import type { DirectoryReplicaMutation } from "@/runtime/replica-cache";
 
 export type WorkspaceDirectoryDelta =
   | Extract<SessionOutboundMessage, { type: "workspace_update" | "project.update" }>["payload"]
   | { kind: "script_status"; update: ScriptStatusUpdateMessage["payload"] };
-type ProjectDirectoryDelta = Extract<SessionOutboundMessage, { type: "project.update" }>["payload"];
 
 export interface WorkspaceDirectorySnapshot {
   workspaces: Map<string, WorkspaceDescriptor>;
@@ -28,67 +28,33 @@ export interface WorkspaceDirectorySnapshot {
   syncCursors?: Partial<
     Record<"projects" | "workspaces", { generation: string; afterSeq: number }>
   >;
-}
-
-function patchWorkspaceScripts(
-  workspaces: Map<string, WorkspaceDescriptor>,
-  update: ScriptStatusUpdateMessage["payload"],
-): Map<string, WorkspaceDescriptor> {
-  const workspaceKey = resolveWorkspaceMapKeyByIdentity({
-    workspaces,
-    workspaceId: update.workspaceId,
-  });
-  if (!workspaceKey) return workspaces;
-  const existing = workspaces.get(workspaceKey);
-  if (!existing || equal(existing.scripts, update.scripts)) return workspaces;
-  const next = new Map(workspaces);
-  next.set(workspaceKey, {
-    ...existing,
-    scripts: update.scripts.map((script) => ({ ...script })),
-  });
-  return next;
-}
-
-function applyProjectDelta(
-  snapshot: WorkspaceDirectorySnapshot,
-  delta: ProjectDirectoryDelta,
-): void {
-  if (delta.kind === "remove") {
-    snapshot.projects.delete(delta.projectId);
-    for (const [workspaceId, workspace] of snapshot.workspaces) {
-      if (workspace.projectId === delta.projectId) snapshot.workspaces.delete(workspaceId);
-    }
-    return;
-  }
-
-  const project = normalizeProjectDescriptor(delta.project);
-  snapshot.projects.set(project.projectId, project);
-  for (const [workspaceId, workspace] of snapshot.workspaces) {
-    if (workspace.projectId !== project.projectId) continue;
-    snapshot.workspaces.set(workspaceId, {
-      ...workspace,
-      projectDisplayName: project.projectDisplayName,
-      projectCustomName: project.projectCustomName,
-      projectCustomIconRevision: project.projectCustomIconRevision,
-      projectRootPath: project.projectRootPath,
-      projectKind: project.projectKind,
-    });
-  }
+  syncModes?: Partial<Record<"projects" | "workspaces", "snapshot" | "changes">>;
+  touchedWorkspaceIds?: Set<string>;
+  touchedProjectIds?: Set<string>;
 }
 
 export class WorkspaceDirectoryReplica {
+  private workspaces = new Map<string, WorkspaceDescriptor>();
+  private projects = new Map<string, ProjectDescriptor>();
+  private workspaceIdsByProject = new Map<string, Set<string>>();
+
   constructor(private readonly serverId: string) {}
 
-  applyDelta(delta: WorkspaceDirectoryDelta): void {
-    const state = this.reconcile(this.read(), [delta]);
-    this.commit(state, delta.kind === "remove" && "id" in delta ? [delta.id] : []);
+  applyDelta(delta: WorkspaceDirectoryDelta): DirectoryReplicaMutation[] {
+    if (delta.kind === "script_status") return this.applyScriptStatus(delta.update);
+    if ("projectId" in delta || "project" in delta) return this.applyProjectDelta(delta);
+    if (delta.kind === "remove") return this.removeWorkspace(delta);
+    return this.upsertWorkspace(normalizeWorkspaceDescriptor(delta.workspace));
   }
 
   commitCached(input: {
     workspaces: Map<string, WorkspaceDescriptor>;
     projects: Map<string, ProjectDescriptor>;
   }): void {
-    this.commit(input, []);
+    this.replace({
+      workspaces: new Map([...input.workspaces, ...this.workspaces]),
+      projects: new Map([...input.projects, ...this.projects]),
+    });
     useSessionStore.getState().setHasWorkspaceDirectorySnapshot(this.serverId, true);
   }
 
@@ -97,79 +63,171 @@ export class WorkspaceDirectoryReplica {
     project: ProjectDescriptor | undefined,
   ): void {
     if (shouldSuppressWorkspaceForLocalArchive({ serverId: this.serverId, workspace })) return;
-    const snapshot = this.read();
-    snapshot.workspaces.set(workspace.id, workspace);
-    if (project) snapshot.projects.set(project.projectId, project);
-    this.commit(snapshot, []);
+    if (project) this.setProject(project);
+    this.setWorkspace(workspace);
   }
 
   commitSnapshot(
     snapshot: WorkspaceDirectorySnapshot,
     deltas: readonly WorkspaceDirectoryDelta[],
-  ): void {
-    const removedWorkspaceIds = deltas.flatMap((delta) =>
-      delta.kind === "remove" && "id" in delta ? [delta.id] : [],
-    );
-    this.commit(this.reconcile(snapshot, deltas), removedWorkspaceIds);
+  ): DirectoryReplicaMutation[] {
+    this.replace(snapshot);
+    const mutations = deltas.flatMap((delta) => this.applyDelta(delta));
     useSessionStore.getState().setHasHydratedWorkspaces(this.serverId, true);
+    return mutations;
   }
 
-  private read(): WorkspaceDirectorySnapshot {
-    const session = useSessionStore.getState().sessions[this.serverId];
-    return {
-      workspaces: new Map(session?.workspaces),
-      projects: new Map(session?.projects),
-    };
+  snapshot(): WorkspaceDirectorySnapshot {
+    return { workspaces: this.workspaces, projects: this.projects };
   }
 
-  private reconcile(
-    snapshot: WorkspaceDirectorySnapshot,
-    deltas: readonly WorkspaceDirectoryDelta[],
-  ): WorkspaceDirectorySnapshot {
-    let workspaces = new Map(snapshot.workspaces);
-    const projects = new Map(snapshot.projects);
-    for (const [workspaceId, workspace] of workspaces) {
-      if (shouldSuppressWorkspaceForLocalArchive({ serverId: this.serverId, workspace })) {
-        workspaces.delete(workspaceId);
+  acceptWorkspaces(workspaces: readonly WorkspaceDescriptor[]): DirectoryReplicaMutation[] {
+    return workspaces.flatMap((workspace) => this.upsertWorkspace(workspace));
+  }
+
+  acceptProject(project: ProjectDescriptor): DirectoryReplicaMutation[] {
+    this.setProject(project);
+    return [{ kind: "project", type: "upsert", id: project.projectId, value: project }];
+  }
+
+  removeWorkspaceSnapshot(workspaceId: string): DirectoryReplicaMutation[] {
+    this.deleteWorkspace(workspaceId);
+    return [{ kind: "workspace", type: "delete", id: workspaceId }];
+  }
+
+  private replace(snapshot: WorkspaceDirectorySnapshot): void {
+    const workspaces = new Map<string, WorkspaceDescriptor>();
+    for (const [workspaceId, workspace] of snapshot.workspaces) {
+      if (!shouldSuppressWorkspaceForLocalArchive({ serverId: this.serverId, workspace })) {
+        workspaces.set(workspaceId, workspace);
       }
     }
-    for (const delta of deltas) {
-      if (delta.kind === "script_status") {
-        workspaces = patchWorkspaceScripts(workspaces, delta.update);
-        continue;
-      }
-      if ("projectId" in delta || "project" in delta) {
-        applyProjectDelta({ workspaces, projects }, delta);
-        continue;
-      }
-      if (delta.kind === "remove") {
-        workspaces.delete(delta.id);
-        if (delta.emptyProject) {
-          const project = normalizeProjectDescriptor(delta.emptyProject);
-          projects.set(project.projectId, project);
-        }
-        if (delta.removedProjectId) {
-          projects.delete(delta.removedProjectId);
-        }
-        continue;
-      }
-      const workspace = normalizeWorkspaceDescriptor(delta.workspace);
-      if (shouldSuppressWorkspaceForLocalArchive({ serverId: this.serverId, workspace })) {
-        workspaces.delete(workspace.id);
-      } else {
-        workspaces.set(workspace.id, workspace);
-      }
-    }
-    return { workspaces, projects };
-  }
-
-  private commit(snapshot: WorkspaceDirectorySnapshot, removedWorkspaceIds: string[]): void {
+    this.workspaces = workspaces;
+    this.projects = new Map(snapshot.projects);
+    this.rebuildProjectIndex();
     const store = useSessionStore.getState();
-    store.setWorkspaces(this.serverId, snapshot.workspaces);
-    store.setProjects(this.serverId, snapshot.projects.values());
-    for (const workspaceId of removedWorkspaceIds) {
-      clearWorkspaceArchivePending({ serverId: this.serverId, workspaceId });
-      useWorkspaceSetupStore.getState().removeWorkspace({ serverId: this.serverId, workspaceId });
+    store.setWorkspaces(this.serverId, this.workspaces);
+    store.setProjects(this.serverId, this.projects.values());
+  }
+
+  private applyScriptStatus(
+    update: ScriptStatusUpdateMessage["payload"],
+  ): DirectoryReplicaMutation[] {
+    const workspaceId = resolveWorkspaceMapKeyByIdentity({
+      workspaces: this.workspaces,
+      workspaceId: update.workspaceId,
+    });
+    const workspace = workspaceId ? this.workspaces.get(workspaceId) : undefined;
+    if (!workspace || equal(workspace.scripts, update.scripts)) return [];
+    const next = { ...workspace, scripts: update.scripts.map((script) => ({ ...script })) };
+    this.setWorkspace(next);
+    return [{ kind: "workspace", type: "upsert", id: next.id, value: next }];
+  }
+
+  private applyProjectDelta(
+    delta: Extract<SessionOutboundMessage, { type: "project.update" }>["payload"],
+  ): DirectoryReplicaMutation[] {
+    if (delta.kind === "remove") {
+      const mutations: DirectoryReplicaMutation[] = [
+        { kind: "project", type: "delete", id: delta.projectId },
+      ];
+      this.projects.delete(delta.projectId);
+      useSessionStore.getState().removeProject(this.serverId, delta.projectId);
+      for (const workspaceId of this.workspaceIdsByProject.get(delta.projectId) ?? []) {
+        this.deleteWorkspace(workspaceId);
+        mutations.push({ kind: "workspace", type: "delete", id: workspaceId });
+      }
+      return mutations;
+    }
+
+    const project = normalizeProjectDescriptor(delta.project);
+    this.setProject(project);
+    const mutations: DirectoryReplicaMutation[] = [
+      { kind: "project", type: "upsert", id: project.projectId, value: project },
+    ];
+    for (const workspaceId of this.workspaceIdsByProject.get(project.projectId) ?? []) {
+      const workspace = this.workspaces.get(workspaceId);
+      if (!workspace) continue;
+      const next = {
+        ...workspace,
+        projectDisplayName: project.projectDisplayName,
+        projectCustomName: project.projectCustomName,
+        projectCustomIconRevision: project.projectCustomIconRevision,
+        projectRootPath: project.projectRootPath,
+        projectKind: project.projectKind,
+      };
+      this.setWorkspace(next);
+      mutations.push({ kind: "workspace", type: "upsert", id: next.id, value: next });
+    }
+    return mutations;
+  }
+
+  private removeWorkspace(
+    delta: Extract<SessionOutboundMessage, { type: "workspace_update" }>["payload"] & {
+      kind: "remove";
+    },
+  ): DirectoryReplicaMutation[] {
+    this.deleteWorkspace(delta.id);
+    const mutations: DirectoryReplicaMutation[] = [
+      { kind: "workspace", type: "delete", id: delta.id },
+    ];
+    if (delta.emptyProject) {
+      const project = normalizeProjectDescriptor(delta.emptyProject);
+      this.setProject(project);
+      mutations.push({ kind: "project", type: "upsert", id: project.projectId, value: project });
+    }
+    if (delta.removedProjectId) {
+      this.projects.delete(delta.removedProjectId);
+      useSessionStore.getState().removeProject(this.serverId, delta.removedProjectId);
+      mutations.push({ kind: "project", type: "delete", id: delta.removedProjectId });
+    }
+    clearWorkspaceArchivePending({ serverId: this.serverId, workspaceId: delta.id });
+    useWorkspaceSetupStore
+      .getState()
+      .removeWorkspace({ serverId: this.serverId, workspaceId: delta.id });
+    return mutations;
+  }
+
+  private upsertWorkspace(workspace: WorkspaceDescriptor): DirectoryReplicaMutation[] {
+    if (shouldSuppressWorkspaceForLocalArchive({ serverId: this.serverId, workspace })) {
+      if (!this.workspaces.has(workspace.id)) return [];
+      this.deleteWorkspace(workspace.id);
+      return [{ kind: "workspace", type: "delete", id: workspace.id }];
+    }
+    this.setWorkspace(workspace);
+    return [{ kind: "workspace", type: "upsert", id: workspace.id, value: workspace }];
+  }
+
+  private setWorkspace(workspace: WorkspaceDescriptor): void {
+    const previous = this.workspaces.get(workspace.id);
+    if (previous?.projectId !== workspace.projectId) {
+      this.workspaceIdsByProject.get(previous?.projectId ?? "")?.delete(workspace.id);
+    }
+    this.workspaces.set(workspace.id, workspace);
+    const projectWorkspaces = this.workspaceIdsByProject.get(workspace.projectId) ?? new Set();
+    projectWorkspaces.add(workspace.id);
+    this.workspaceIdsByProject.set(workspace.projectId, projectWorkspaces);
+    useSessionStore.getState().mergeWorkspaces(this.serverId, [workspace]);
+  }
+
+  private deleteWorkspace(workspaceId: string): void {
+    const workspace = this.workspaces.get(workspaceId);
+    if (workspace) this.workspaceIdsByProject.get(workspace.projectId)?.delete(workspaceId);
+    this.workspaces.delete(workspaceId);
+    useSessionStore.getState().removeWorkspace(this.serverId, workspaceId);
+  }
+
+  private setProject(project: ProjectDescriptor): void {
+    this.projects.set(project.projectId, project);
+    useSessionStore.getState().upsertProject(this.serverId, project);
+  }
+
+  private rebuildProjectIndex(): void {
+    this.workspaceIdsByProject = new Map();
+    for (const workspace of this.workspaces.values()) {
+      const workspaceIds = this.workspaceIdsByProject.get(workspace.projectId) ?? new Set();
+      workspaceIds.add(workspace.id);
+      this.workspaceIdsByProject.set(workspace.projectId, workspaceIds);
     }
   }
 }
diff --git a/packages/app/src/runtime/host-confirmation.ts b/packages/app/src/runtime/host-confirmation.ts
new file mode 100644
index 0000000000..8fac1031ff
--- /dev/null
+++ b/packages/app/src/runtime/host-confirmation.ts
@@ -0,0 +1,97 @@
+import type { ConnectionOffer } from "@getpaseo/protocol/connection-offer";
+import {
+  hostHasConnection,
+  relayConnectionFromOffer,
+  type HostProfile,
+} from "@/types/host-connection";
+
+/**
+ * The question shown before a pairing link adds a host that is not saved, or
+ * changes the key, relay, or TLS setting of a saved one.
+ */
+export interface HostConfirmationRequest {
+  /** Identifies this question, so an answer shown for it never answers a newer one. */
+  id: number;
+  serverId: string;
+  /** Grouped daemon public key the user can compare with the one their daemon shows. */
+  keyFingerprint: string;
+  relayEndpoint: string;
+  kind: "newHost" | "changedConnection";
+}
+
+interface PendingConfirmation {
+  request: HostConfirmationRequest;
+  resolve: (approved: boolean) => void;
+}
+
+/**
+ * Owns the one host confirmation the app is waiting on. The host runtime asks
+ * through `confirmLink`; the view reads `getPending` and replies with `answer`.
+ * A question waits until it is answered, whether or not a view is showing it.
+ */
+export class HostConfirmations {
+  private pending: PendingConfirmation | null = null;
+  private nextRequestId = 1;
+  private listeners = new Set<() => void>();
+
+  getPending(): HostConfirmationRequest | null {
+    return this.pending?.request ?? null;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  /** Answers the request with `requestId`; an answer for any other request is ignored. */
+  answer(requestId: number, approved: boolean): void {
+    const current = this.pending;
+    if (!current || current.request.id !== requestId) return;
+    this.pending = null;
+    this.emit();
+    current.resolve(approved);
+  }
+
+  /** Resolves true without asking when the link matches a saved host exactly. */
+  confirmLink(offer: ConnectionOffer, savedHosts: HostProfile[]): Promise<boolean> {
+    const connection = relayConnectionFromOffer(offer);
+    const savedHost = savedHosts.find((host) => host.serverId === offer.serverId);
+    if (savedHost && hostHasConnection(savedHost, connection)) return Promise.resolve(true);
+    return this.ask({
+      id: this.nextRequestId++,
+      serverId: offer.serverId,
+      keyFingerprint: formatDaemonKeyFingerprint(connection.daemonPublicKeyB64),
+      relayEndpoint: connection.relayEndpoint,
+      kind: savedHost ? "changedConnection" : "newHost",
+    });
+  }
+
+  private ask(request: HostConfirmationRequest): Promise<boolean> {
+    // One question at a time: a newer one cancels the unanswered one.
+    this.pending?.resolve(false);
+    return new Promise<boolean>((resolve) => {
+      this.pending = { request, resolve };
+      this.emit();
+    });
+  }
+
+  private emit(): void {
+    for (const listener of this.listeners) {
+      listener();
+    }
+  }
+}
+
+/**
+ * Shows the key material itself (not a re-hash) in groups of four. Keys longer
+ * than 16 characters show only their first and last 8, so two keys that share
+ * both ends show the same value.
+ */
+function formatDaemonKeyFingerprint(daemonPublicKeyB64: string): string {
+  const normalized = daemonPublicKeyB64.replace(/[^A-Za-z0-9]/g, "");
+  const group = (value: string): string => value.replace(/(.{4})/g, "$1 ").trim();
+  if (normalized.length <= 16) return group(normalized);
+  return `${group(normalized.slice(0, 8))} … ${group(normalized.slice(-8))}`;
+}
diff --git a/packages/app/src/runtime/host-runtime.test.ts b/packages/app/src/runtime/host-runtime.test.ts
index 431b806aae..61285eb2c6 100644
--- a/packages/app/src/runtime/host-runtime.test.ts
+++ b/packages/app/src/runtime/host-runtime.test.ts
@@ -1,10 +1,16 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
+import type { AppStateStatus } from "react-native";
+import {
+  bindHostRuntimeAppState,
+  startHostRuntimeBootstrap,
+} from "@/navigation/host-runtime-bootstrap";
 import type {
   DaemonClient,
   ConnectionState,
   FetchAgentsEntry,
   FetchAgentsOptions,
 } from "@getpaseo/client/internal/daemon-client";
+import { DaemonAuthenticationError } from "@getpaseo/client/internal/daemon-client";
 import type { ConnectionOffer } from "@getpaseo/protocol/connection-offer";
 import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
@@ -23,14 +29,43 @@ import {
 } from "./host-runtime";
 import type { ReplicaRow, ReplicaRowStore } from "./replica-cache/row-store";
 
+import { subscriptionFixture } from "./subscription-fixture";
+import { readDesktopManagedLocalCredential } from "@/desktop/daemon/local-credential";
+import type { HostConfirmationRequest } from "./host-confirmation";
+
+it("requests the managed connection credential through desktop main without a web hint", async () => {
+  const requests: string[] = [];
+  const connection: HostConnection = {
+    id: "direct:localhost:6767",
+    type: "directTcp",
+    endpoint: "localhost:6767",
+  };
+  let token = "local-token";
+  const invoke = async (listen: string) => {
+    requests.push(listen);
+    return token;
+  };
+  expect(await readDesktopManagedLocalCredential(connection, invoke)).toBe("local-token");
+  token = "rotated-token";
+  expect(await readDesktopManagedLocalCredential(connection, invoke)).toBe("rotated-token");
+  expect(requests).toEqual(["localhost:6767", "localhost:6767"]);
+});
+
 class FakeDaemonClient {
+  supportsBackgroundWorkspaces(): boolean {
+    return false;
+  }
   private state: ConnectionState = { status: "idle" };
   private listeners = new Set<(status: ConnectionState) => void>();
   private error: string | null = null;
+  authFailureReason: "password_required" | "incorrect_password" | null = null;
   private heartbeatRttMs: number | null = null;
   private latencyMeasurementFailure: Error | null = null;
   private latencyMeasurementsRequested: Array<{ timeoutMs?: number }> = [];
   public connectCalls = 0;
+  public ensureConnectedCalls = 0;
+  public connectionVerifications = 0;
+  public reconnectEnabledChanges: boolean[] = [];
   public fetchAgentsCalls: FetchAgentsOptions[] = [];
   public fetchAgentsResponses: Array<
     Awaited<ReturnType<DaemonClient["fetchAgents"]>> | ReturnType<DaemonClient["fetchAgents"]>
@@ -54,6 +89,16 @@ class FakeDaemonClient {
     return () => this.agentUpdateListeners.delete(listener);
   }
 
+  observeAgents(options: Parameters<DaemonClient["observeAgents"]>[0]) {
+    return subscriptionFixture(this.fetchAgents({ ...options, subscribe: {} }), (receive) =>
+      this.on("agent_update", receive),
+    );
+  }
+
+  observeEvents() {
+    return subscriptionFixture(Promise.resolve({}), () => () => {});
+  }
+
   async waitForAgentUpdates(): Promise<void> {
     if (this.agentUpdateListeners.size > 0) return;
     await new Promise<void>((resolve) => {
@@ -104,7 +149,9 @@ class FakeDaemonClient {
     });
   }
 
-  ensureConnected(): void {
+  ensureConnected(options?: { verify?: boolean }): void {
+    this.ensureConnectedCalls += 1;
+    if (options?.verify) this.connectionVerifications += 1;
     if (this.state.status !== "connected") {
       this.setConnectionState({ status: "connected" });
     }
@@ -114,8 +161,27 @@ class FakeDaemonClient {
     return this.state;
   }
 
-  getLastServerInfoMessage(): null {
-    return null;
+  public ownedSubscriptions = true;
+  private daemonVersion: string | null = "0.8.0";
+
+  getLastServerInfoMessage(): ReturnType<DaemonClient["getLastServerInfoMessage"]> {
+    if (this.daemonVersion === null) return null;
+    return {
+      status: "server_info",
+      serverId: "srv_test",
+      hostname: "test",
+      version: this.daemonVersion,
+      features: { ownedSubscriptions: this.ownedSubscriptions },
+    };
+  }
+
+  // Like the real client, the server info is cleared while disconnected and replaced by the
+  // restarted daemon's handshake before the client reports connected again.
+  daemonRestartsAs(version: string): void {
+    this.daemonVersion = null;
+    this.setConnectionState({ status: "disconnected", reason: "Connection lost" });
+    this.daemonVersion = version;
+    this.setConnectionState({ status: "connected" });
   }
 
   subscribeConnectionStatus(listener: (status: ConnectionState) => void): () => void {
@@ -170,7 +236,9 @@ class FakeDaemonClient {
     return result.rttMs;
   }
 
-  setReconnectEnabled(_enabled: boolean): void {}
+  setReconnectEnabled(enabled: boolean): void {
+    this.reconnectEnabledChanges.push(enabled);
+  }
 
   getLastLivenessRttMs(): number | null {
     return this.heartbeatRttMs;
@@ -352,6 +420,7 @@ function makeHost(input?: Partial<HostProfile>): HostProfile {
 
   return {
     serverId: input?.serverId ?? "srv_test",
+    ...(input?.password ? { password: input.password } : {}),
     label: input?.label ?? "test host",
     appearance: input?.appearance ?? defaultHostAppearance(),
     lifecycle: input?.lifecycle ?? {},
@@ -442,6 +511,63 @@ function makeConnectedProbeClient(latencyMs: number): FakeDaemonClient {
   return client;
 }
 
+/**
+ * Answers every host confirmation the store asks, the way the sheet does, and
+ * records each request.
+ */
+function answerHostConfirmations(
+  store: HostRuntimeStore,
+  answer: boolean | ((request: HostConfirmationRequest, index: number) => boolean),
+): HostConfirmationRequest[] {
+  const requests: HostConfirmationRequest[] = [];
+  store.subscribeHostConfirmation(() => {
+    const pending = store.getPendingHostConfirmation();
+    if (!pending) return;
+    requests.push(pending);
+    store.answerHostConfirmation(
+      pending.id,
+      typeof answer === "function" ? answer(pending, requests.length - 1) : answer,
+    );
+  });
+  return requests;
+}
+
+function requirePendingConfirmation(store: HostRuntimeStore): HostConfirmationRequest {
+  const pending = store.getPendingHostConfirmation();
+  if (!pending) throw new Error("Expected a pending host confirmation");
+  return pending;
+}
+
+function createPairingStore(
+  input: {
+    hostname?: string;
+    password?: string;
+    connectAttempts?: string[];
+    serverIdForHost?: (host: HostProfile) => string;
+    storage?: HostRuntimeStorage;
+  } = {},
+): HostRuntimeStore {
+  return new HostRuntimeStore({
+    storage: input.storage ?? createMemoryHostRuntimeStorage(),
+    deps: {
+      createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+      connectToDaemon: async ({ host, connection }) => {
+        input.connectAttempts?.push(connection.id);
+        if (input.password && host.password !== input.password) {
+          throw new DaemonAuthenticationError("password_required");
+        }
+        return {
+          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+          serverId: input.serverIdForHost?.(host) ?? host.serverId,
+          hostname: input.hostname ?? "paired",
+        };
+      },
+      getClientId: async () => "cid_pairing",
+      readInitialConnectionHint: () => null,
+    },
+  });
+}
+
 function createMemoryHostRuntimeStorage(entries: Record<string, string> = {}): HostRuntimeStorage {
   const values = new Map(Object.entries(entries));
   return {
@@ -530,6 +656,21 @@ function onceHostListMatches(store: HostRuntimeStore, predicate: () => boolean):
   });
 }
 
+function onceHostSnapshotMatches(
+  store: HostRuntimeStore,
+  serverId: string,
+  predicate: (snapshot: ReturnType<HostRuntimeStore["getSnapshot"]>) => boolean,
+): Promise<void> {
+  if (predicate(store.getSnapshot(serverId))) return Promise.resolve();
+  return new Promise((resolve) => {
+    const unsubscribe = store.subscribe(serverId, () => {
+      if (!predicate(store.getSnapshot(serverId))) return;
+      unsubscribe();
+      resolve();
+    });
+  });
+}
+
 class BrowserClientLifecycle {
   public active: Array<{ serverId: string; connectionId: string }> = [];
 
@@ -543,6 +684,42 @@ class BrowserClientLifecycle {
 }
 
 describe("HostRuntimeController", () => {
+  it("publishes an old host and mounts observations through the client interface", async () => {
+    const host = makeHost();
+    const client = new FakeDaemonClient();
+    client.ownedSubscriptions = false;
+    let mounts = 0;
+    const controller = new HostRuntimeController({
+      host,
+      deps: {
+        createClient: () => client as unknown as DaemonClient,
+        connectToDaemon: async () => ({
+          client: client as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: null,
+        }),
+        getClientId: async () => "app-version-gate",
+        mountClientHandlers: () => {
+          mounts++;
+          return () => {};
+        },
+      },
+    });
+    const publishedClients: Array<DaemonClient | null> = [];
+    const stop = controller.subscribe(() => publishedClients.push(controller.getSnapshot().client));
+    await controller.activateConnection({ connectionId: host.connections[0]!.id });
+    expect(controller.getSnapshot()).toMatchObject({
+      connectionStatus: "online",
+      client,
+      lastError: null,
+    });
+    expect(mounts).toBe(1);
+    expect(publishedClients).toContain(client);
+    expect(client.fetchAgentsCalls).toEqual([]);
+    stop();
+    await controller.stop();
+  });
+
   it("replaces the active relay client when re-pairing changes the daemon public key", async () => {
     const oldRelay: HostConnection = {
       id: "relay:wss:relay.paseo.sh:443",
@@ -815,6 +992,52 @@ describe("HostRuntimeController", () => {
     expect(activeClient.latencyMeasurements()).toEqual([]);
   });
 
+  it("does not create a probe client for the selected connection while it reconnects", async () => {
+    useHostRuntimeClock();
+    const relay: HostConnection = {
+      id: "relay:relay.paseo.sh:443",
+      type: "relay",
+      relayEndpoint: "relay.paseo.sh:443",
+      daemonPublicKeyB64: "pk_test",
+    };
+    const host = makeHost({ connections: [relay], preferredConnectionId: relay.id });
+    const activeClient = new FakeDaemonClient();
+    activeClient.setConnectionState({ status: "connected" });
+    const probeAttempts: string[] = [];
+    const controller = new HostRuntimeController({
+      host,
+      deps: {
+        createClient: () => {
+          throw new Error("the existing client owns the selected connection");
+        },
+        connectToDaemon: async ({ connection }) => {
+          probeAttempts.push(connection.id);
+          return {
+            client: makeConnectedProbeClient(10) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label ?? null,
+          };
+        },
+        getClientId: async () => "cid_test_runtime",
+      },
+    });
+
+    await controller.start({
+      autoProbe: false,
+      initialConnection: {
+        connectionId: relay.id,
+        existingClient: activeClient as unknown as DaemonClient,
+      },
+    });
+    activeClient.setConnectionState({ status: "disconnected", reason: "network lost" });
+    await vi.advanceTimersByTimeAsync(10_000);
+
+    await controller.runProbeCycleNow();
+
+    expect(probeAttempts).toEqual([]);
+    expect(controller.getSnapshot().client).toBe(activeClient as unknown as DaemonClient);
+  });
+
   it("rejects probes that resolve to a different server id", async () => {
     const host = makeHost({
       serverId: "srv_old",
@@ -1435,6 +1658,104 @@ describe("HostRuntimeController", () => {
 });
 
 describe("HostRuntimeStore", () => {
+  it.each(["active", "inactive", "background"] as const)(
+    "keeps reconnect enabled through inactive/background and resumes immediately (mounted %s)",
+    async (currentState) => {
+      const relay = (suffix: string): HostConnection => ({
+        id: `relay:relay-${suffix}.paseo.sh:443`,
+        type: "relay",
+        relayEndpoint: `relay-${suffix}.paseo.sh:443`,
+        daemonPublicKeyB64: `pk_${suffix}`,
+      });
+      const hostAConnection = relay("a");
+      const hostBConnection = relay("b");
+      const hostA = makeHost({
+        serverId: "srv_a",
+        connections: [hostAConnection],
+        preferredConnectionId: hostAConnection.id,
+      });
+      const hostB = makeHost({
+        serverId: "srv_b",
+        connections: [hostBConnection],
+        preferredConnectionId: hostBConnection.id,
+      });
+      const clientA = new FakeDaemonClient();
+      const clientB = new FakeDaemonClient();
+      clientA.setConnectionState({ status: "connected" });
+      clientB.setConnectionState({ status: "connected" });
+      const store = new HostRuntimeStore({
+        storage: createMemoryHostRuntimeStorage(),
+        deps: {
+          createClient: () => {
+            throw new Error("initial clients are supplied");
+          },
+          connectToDaemon: async () => {
+            throw new Error("single-connection hosts reuse their active clients");
+          },
+          getClientId: async () => "cid_test_runtime",
+        },
+      });
+
+      let changeAppState: (state: AppStateStatus) => void = () => {
+        throw new Error("AppState listener not registered");
+      };
+      const unbind = bindHostRuntimeAppState(store, {
+        currentState,
+        addEventListener: (_event, listener) => {
+          changeAppState = listener;
+          return { remove: () => {} };
+        },
+      });
+      store.syncHosts([hostA, hostB], {
+        initialConnectionByServerId: new Map([
+          [
+            hostA.serverId,
+            {
+              connectionId: hostAConnection.id,
+              existingClient: clientA as unknown as DaemonClient,
+            },
+          ],
+          [
+            hostB.serverId,
+            {
+              connectionId: hostBConnection.id,
+              existingClient: clientB as unknown as DaemonClient,
+            },
+          ],
+        ]),
+      });
+      await waitForHostOnline(store, hostA.serverId);
+      await waitForHostOnline(store, hostB.serverId);
+      expect(clientA.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientB.reconnectEnabledChanges.at(-1)).toBe(true);
+      changeAppState("inactive");
+      expect(clientA.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientB.reconnectEnabledChanges.at(-1)).toBe(true);
+      changeAppState("background");
+      expect(clientA.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientB.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientA.getConnectionState()).toEqual({ status: "connected" });
+      expect(clientB.getConnectionState()).toEqual({ status: "connected" });
+      expect(clientA.ensureConnectedCalls).toBe(0);
+      expect(clientB.ensureConnectedCalls).toBe(0);
+      clientA.setConnectionState({ status: "disconnected", reason: "backgrounded" });
+      clientB.setConnectionState({ status: "disconnected", reason: "backgrounded" });
+
+      changeAppState("active");
+      expect(clientA.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientB.reconnectEnabledChanges.at(-1)).toBe(true);
+      expect(clientA.ensureConnectedCalls).toBe(1);
+      expect(clientA.connectionVerifications).toBe(1);
+      expect(clientB.connectionVerifications).toBe(1);
+      expect(clientB.ensureConnectedCalls).toBe(1);
+      expect(store.getSnapshot(hostA.serverId)?.connectionStatus).toBe("online");
+      expect(store.getSnapshot(hostB.serverId)?.connectionStatus).toBe("online");
+
+      unbind();
+      store.syncHosts([]);
+    },
+  );
+
   it("revokes push notifications before removing a host", async () => {
     const host = makeHost({ connections: [makeHost().connections[0]!] });
     const revocation = createDeferred<void>();
@@ -1483,16 +1804,16 @@ describe("HostRuntimeStore", () => {
     expect(store.getHosts()).toEqual([]);
   });
 
-  it("loads the host registry without scanning or installing replica rows", async () => {
+  it("loads the host registry and restores its cached directory", async () => {
     const host = makeHost();
     const storage = createMemoryHostRuntimeStorage();
-    const backingStore = createMemoryReplicaRowStore();
     let fullScans = 0;
+    const backingStore = createMemoryReplicaRowStore();
     const replicaRowStore: ReplicaRowStore = {
       ...backingStore,
-      readAll: async () => {
+      read: async (...args) => {
         fullScans += 1;
-        return backingStore.readAll();
+        return backingStore.read(...args);
       },
     };
     await storage.setItem("@paseo:daemon-registry", JSON.stringify([host]));
@@ -1516,7 +1837,7 @@ describe("HostRuntimeStore", () => {
     store.boot();
     await registryLoaded;
 
-    expect(fullScans).toBe(0);
+    await vi.waitFor(() => expect(fullScans).toBe(1));
     expect(useSessionStore.getState().sessions[host.serverId]).toMatchObject({
       client: null,
       hasHydratedAgents: false,
@@ -1803,6 +2124,7 @@ describe("HostRuntimeStore", () => {
 
     expect(fakeClient.fetchAgentsCalls).toHaveLength(1);
     expect(fakeClient.fetchAgentsCalls[0]).toEqual({
+      scope: "active",
       sort: [{ key: "updated_at", direction: "desc" }],
       subscribe: {},
       page: { limit: 200 },
@@ -1819,6 +2141,7 @@ describe("HostRuntimeStore", () => {
 
     await store.refreshAgentDirectory({ serverId: host.serverId });
     expect(fakeClient.fetchAgentsCalls[2]).toEqual({
+      scope: "active",
       sort: [{ key: "updated_at", direction: "desc" }],
       page: { limit: 200 },
     });
@@ -1857,7 +2180,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     const load = store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_no_session" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(1);
@@ -1870,7 +2193,7 @@ describe("HostRuntimeStore", () => {
     expect(fakeClient.fetchAgentsCalls[0]).toEqual({
       scope: "active",
       sort: [{ key: "updated_at", direction: "desc" }],
-      subscribe: { subscriptionId: "app:srv_no_session" },
+      subscribe: {},
       page: { limit: 200 },
     });
 
@@ -1878,32 +2201,13 @@ describe("HostRuntimeStore", () => {
     expect(useSessionStore.getState().sessions[host.serverId]).toBeUndefined();
   });
 
-  it("bootstraps legacy daemons from unscoped agents and creates path-backed workspaces", async () => {
+  it("shows the restarted daemon's version after the same client reconnects", async () => {
     const host = makeHost({
-      serverId: "srv_legacy_workspace_daemon",
-      connections: [
-        {
-          id: "direct:lan:6767",
-          type: "directTcp",
-          endpoint: "lan:6767",
-        },
-      ],
+      serverId: "srv_restarted",
+      connections: [{ id: "direct:lan:6767", type: "directTcp", endpoint: "lan:6767" }],
     });
     const fakeClient = new FakeDaemonClient();
     fakeClient.setConnectionState({ status: "connected" });
-    fakeClient.fetchAgentsResponses.push(
-      makeFetchAgentsPayload({
-        entries: [
-          makeFetchAgentsEntry({
-            id: "agent-legacy",
-            cwd: "/repo/legacy-app",
-            updatedAt: "2026-06-18T12:00:00.000Z",
-            title: "Legacy daemon agent",
-          }),
-        ],
-        subscriptionId: "app:srv_legacy_workspace_daemon",
-      }),
-    );
     const store = new HostRuntimeStore({
       deps: {
         createClient: () => fakeClient as unknown as DaemonClient,
@@ -1916,45 +2220,19 @@ describe("HostRuntimeStore", () => {
       },
     });
 
-    const sessionStore = useSessionStore.getState();
-    sessionStore.initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
-    sessionStore.updateSessionServerInfo(host.serverId, {
-      serverId: host.serverId,
-      hostname: null,
-      version: "0.1.96",
-    });
     store.syncHosts([host]);
     await waitForHostOnline(store, host.serverId);
-    const load = store.refreshAgentDirectory({
-      serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_legacy_workspace_daemon" },
-      page: { limit: 200 },
-    });
-    await fakeClient.waitForFetches(1);
-    await load;
+    expect(useSessionStore.getState().sessions[host.serverId]?.serverInfo?.version).toBe("0.8.0");
 
-    expect(fakeClient.fetchAgentsCalls).toEqual([
-      {
-        sort: [{ key: "updated_at", direction: "desc" }],
-        subscribe: { subscriptionId: "app:srv_legacy_workspace_daemon" },
-        page: { limit: 200 },
-      },
-    ]);
-    const session = useSessionStore.getState().sessions[host.serverId];
-    expect(session?.agents.get("agent-legacy")?.workspaceId).toBe("/repo/legacy-app");
-    expect(Array.from(session?.workspaces.values() ?? [])).toEqual([
-      expect.objectContaining({
-        id: "/repo/legacy-app",
-        workspaceDirectory: "/repo/legacy-app",
-        name: "legacy-app",
-      }),
-    ]);
+    fakeClient.daemonRestartsAs("0.9.1");
+
+    expect(store.getSnapshot(host.serverId)?.client).toBe(fakeClient);
+    expect(useSessionStore.getState().sessions[host.serverId]?.serverInfo?.version).toBe("0.9.1");
 
     store.syncHosts([]);
-    useSessionStore.getState().clearSession(host.serverId);
   });
 
-  it("drains legacy snapshot and buffered running transitions exactly once", async () => {
+  it("drains snapshot and buffered running transitions exactly once", async () => {
     const host = makeHost({
       serverId: "srv_legacy_transitions",
       connections: [{ id: "direct:lan:6767", type: "directTcp", endpoint: "lan:6767" }],
@@ -2006,11 +2284,27 @@ describe("HostRuntimeStore", () => {
       new Map([
         [
           "legacy-snapshot",
-          { ...replicaAgent(snapshotAgent.agent, host.serverId), status: "running" },
+          {
+            ...replicaAgent(snapshotAgent.agent, host.serverId),
+            turn: {
+              phase: "open",
+              turnId: null,
+              startedAt: null,
+              cancellationRequestId: null,
+            },
+          },
         ],
         [
           "legacy-buffered",
-          { ...replicaAgent(bufferedAgent.agent, host.serverId), status: "running" },
+          {
+            ...replicaAgent(bufferedAgent.agent, host.serverId),
+            turn: {
+              phase: "open",
+              turnId: null,
+              startedAt: null,
+              cancellationRequestId: null,
+            },
+          },
         ],
       ]),
     );
@@ -2025,7 +2319,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     const load = store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: `app:${host.serverId}` },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(2);
@@ -2047,8 +2341,8 @@ describe("HostRuntimeStore", () => {
         ({ id, status, workspaceId }) => [id, status, workspaceId],
       ),
     ).toEqual([
-      ["legacy-snapshot", "idle", "/legacy/repo"],
-      ["legacy-buffered", "idle", "/legacy/repo"],
+      ["legacy-snapshot", "idle", snapshotAgent.agent.workspaceId],
+      ["legacy-buffered", "idle", bufferedAgent.agent.workspaceId],
     ]);
 
     store.syncHosts([]);
@@ -2115,7 +2409,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     const load = store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_paged" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(2);
@@ -2125,7 +2419,7 @@ describe("HostRuntimeStore", () => {
     expect(fakeClient.fetchAgentsCalls[0]).toEqual({
       scope: "active",
       sort: [{ key: "updated_at", direction: "desc" }],
-      subscribe: { subscriptionId: "app:srv_paged" },
+      subscribe: {},
       page: { limit: 200 },
     });
     expect(fakeClient.fetchAgentsCalls[1]).toEqual({
@@ -2205,7 +2499,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     const load = store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_paged_delta" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(2);
@@ -2292,12 +2586,13 @@ describe("HostRuntimeStore", () => {
     });
 
     store.syncHosts([host]);
-    await fakeClient.waitForAgentUpdates();
+    await waitForHostOnline(store, host.serverId);
     const load = store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: `app:${host.serverId}` },
+      subscribe: {},
       page: { limit: 200 },
     });
+    await fakeClient.waitForAgentUpdates();
     fakeClient.agentUpdate({
       kind: "upsert",
       agent: { ...snapshotEntry.agent, title: "before-session" },
@@ -2343,7 +2638,7 @@ describe("HostRuntimeStore", () => {
       .initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
     store.syncHosts([host]);
     await waitForHostOnline(store, host.serverId);
-    await store.refreshAgentDirectory({ serverId: host.serverId });
+    await store.refreshAgentDirectory({ serverId: host.serverId, subscribe: {} });
     const olderPage = new Deferred<Awaited<ReturnType<DaemonClient["fetchAgents"]>>>();
     fakeClient.fetchAgentsResponses.push(olderPage.promise);
     const olderRefresh = store.refreshAgentDirectory({ serverId: host.serverId });
@@ -2411,7 +2706,7 @@ describe("HostRuntimeStore", () => {
       .initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
     store.syncHosts([host]);
     await waitForHostOnline(store, host.serverId);
-    await store.refreshAgentDirectory({ serverId: host.serverId });
+    await store.refreshAgentDirectory({ serverId: host.serverId, subscribe: {} });
 
     const olderPage = new Deferred<Awaited<ReturnType<DaemonClient["fetchAgents"]>>>();
     fakeClient.fetchAgentsResponses.push(olderPage.promise);
@@ -2545,11 +2840,27 @@ describe("HostRuntimeStore", () => {
       new Map([
         [
           "snapshot-transition",
-          { ...replicaAgent(snapshotAgent.agent, host.serverId), status: "running" },
+          {
+            ...replicaAgent(snapshotAgent.agent, host.serverId),
+            turn: {
+              phase: "open",
+              turnId: null,
+              startedAt: null,
+              cancellationRequestId: null,
+            },
+          },
         ],
         [
           "buffered-transition",
-          { ...replicaAgent(bufferedAgent.agent, host.serverId), status: "running" },
+          {
+            ...replicaAgent(bufferedAgent.agent, host.serverId),
+            turn: {
+              phase: "open",
+              turnId: null,
+              startedAt: null,
+              cancellationRequestId: null,
+            },
+          },
         ],
       ]),
     );
@@ -2568,7 +2879,7 @@ describe("HostRuntimeStore", () => {
     );
     store.syncHosts([host]);
     await waitForHostOnline(store, host.serverId);
-    const load = store.refreshAgentDirectory({ serverId: host.serverId });
+    const load = store.refreshAgentDirectory({ serverId: host.serverId, subscribe: {} });
     await fakeClient.waitForFetches(2);
     fakeClient.agentUpdate({
       kind: "upsert",
@@ -2739,6 +3050,34 @@ describe("HostRuntimeStore", () => {
     useSessionStore.getState().clearSession(host.serverId);
   });
 
+  it("drains a queued message as a steer so a turn the agent just started is not interrupted", async () => {
+    const host = makeHost({ serverId: "srv_steer_queue_drain" });
+    const fakeClient = new FakeDaemonClient();
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => fakeClient as unknown as DaemonClient,
+        connectToDaemon: async () => ({
+          client: fakeClient as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: null,
+        }),
+        getClientId: async () => "cid_steer_queue_drain",
+      },
+    });
+    const sessionStore = useSessionStore.getState();
+    sessionStore.initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
+    sessionStore.setQueuedMessages(
+      host.serverId,
+      new Map([["agent", [{ id: "queued", text: "next task", attachments: [] }]]]),
+    );
+
+    store.drainQueuedAgentMessage(host.serverId, "agent");
+    await fakeClient.waitForSentMessages(1);
+
+    expect(fakeClient.sentAgentMessages[0]?.[2]?.activeTurnBehavior).toBe("steer");
+    sessionStore.clearSession(host.serverId);
+  });
+
   it("uses legacy GitHub attachments when draining a queue for an old daemon", async () => {
     const host = makeHost({ serverId: "srv_legacy_queue_attachment" });
     const fakeClient = new FakeDaemonClient();
@@ -2870,7 +3209,7 @@ describe("HostRuntimeStore", () => {
     });
     store.syncHosts([host]);
     await waitForHostOnline(store, host.serverId);
-    const load = store.refreshAgentDirectory({ serverId: host.serverId });
+    const load = store.refreshAgentDirectory({ serverId: host.serverId, subscribe: {} });
     await fakeClient.waitForFetches(2);
     fakeClient.agentUpdate({
       kind: "upsert",
@@ -2951,7 +3290,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     await store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_resubscribe" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(1);
@@ -2969,7 +3308,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     await store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_resubscribe" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(2);
@@ -2978,13 +3317,13 @@ describe("HostRuntimeStore", () => {
       {
         scope: "active",
         sort: [{ key: "updated_at", direction: "desc" }],
-        subscribe: { subscriptionId: "app:srv_resubscribe" },
+        subscribe: {},
         page: { limit: 200 },
       },
       {
         scope: "active",
         sort: [{ key: "updated_at", direction: "desc" }],
-        subscribe: { subscriptionId: "app:srv_resubscribe" },
+        subscribe: {},
         page: { limit: 200 },
       },
     ]);
@@ -3037,12 +3376,14 @@ describe("HostRuntimeStore", () => {
       }).agent;
       const staleAgent: Agent = {
         ...stale,
-        activeTurn: stale.activeTurn
+        turn: stale.activeTurn
           ? {
+              phase: "open",
               turnId: stale.activeTurn.turnId,
               startedAt: stale.activeTurn.startedAt ? new Date(stale.activeTurn.startedAt) : null,
+              cancellationRequestId: null,
             }
-          : null,
+          : { phase: "idle", cancellationRequestId: null },
         serverId: host.serverId,
         createdAt: new Date(stale.createdAt),
         updatedAt: new Date(stale.updatedAt),
@@ -3059,7 +3400,7 @@ describe("HostRuntimeStore", () => {
     await waitForHostOnline(store, host.serverId);
     await store.refreshAgentDirectory({
       serverId: host.serverId,
-      subscribe: { subscriptionId: "app:srv_archived_rehydrate" },
+      subscribe: {},
       page: { limit: 200 },
     });
     await fakeClient.waitForFetches(1);
@@ -3180,7 +3521,7 @@ describe("HostRuntimeStore", () => {
     }
   });
 
-  it("upsertDirectConnection stores SSL and password settings", async () => {
+  it("upsertDirectConnection stores SSL on the connection and password on the host", async () => {
     const store = new HostRuntimeStore({
       deps: {
         createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
@@ -3208,9 +3549,9 @@ describe("HostRuntimeStore", () => {
         type: "directTcp",
         endpoint: "example.paseo.test:7443",
         useTls: true,
-        password: "shared-secret",
       },
     ]);
+    expect(host?.password).toBe("shared-secret");
 
     store.syncHosts([]);
   });
@@ -3295,19 +3636,10 @@ describe("HostRuntimeStore", () => {
   });
 
   it("uses the advertised hostname when adding a relay host from a pairing offer", async () => {
-    const store = new HostRuntimeStore({
-      deps: {
-        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-        connectToDaemon: async ({ host }) => ({
-          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-          serverId: host.serverId,
-          hostname: host.label ?? null,
-        }),
-        getClientId: async () => "cid_test_runtime",
-      },
-    });
+    const store = createPairingStore({ hostname: "mbp" });
+    answerHostConfirmations(store, true);
 
-    await store.upsertConnectionFromOffer(makeOffer(), "mbp");
+    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
 
     const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
     expect(pairedHost?.label).toBe("mbp");
@@ -3316,27 +3648,14 @@ describe("HostRuntimeStore", () => {
   });
 
   it("stores relay TLS from a pairing offer", async () => {
-    const store = new HostRuntimeStore({
-      deps: {
-        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-        connectToDaemon: async ({ host }) => ({
-          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-          serverId: host.serverId,
-          hostname: host.label ?? null,
-        }),
-        getClientId: async () => "cid_test_runtime",
-      },
-    });
+    const store = createPairingStore();
+    answerHostConfirmations(store, true);
 
-    await store.upsertConnectionFromOffer(
-      makeOffer({
-        relay: {
-          endpoint: "relay.example.com:443",
-          useTls: true,
-        },
-      }),
-      "tls relay",
-    );
+    await store
+      .beginLinkPairing()
+      .submit(
+        encodeOfferUrl(makeOffer({ relay: { endpoint: "relay.example.com:443", useTls: true } })),
+      );
 
     const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
     expect(pairedHost?.connections).toEqual([
@@ -3353,17 +3672,8 @@ describe("HostRuntimeStore", () => {
   });
 
   it("uses TLS for old pairing URLs that omit relay TLS on port 443", async () => {
-    const store = new HostRuntimeStore({
-      deps: {
-        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-        connectToDaemon: async ({ host }) => ({
-          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-          serverId: host.serverId,
-          hostname: host.label ?? null,
-        }),
-        getClientId: async () => "cid_test_runtime",
-      },
-    });
+    const store = createPairingStore();
+    answerHostConfirmations(store, true);
     const oldPairingUrl = encodeOfferUrl({
       v: 2,
       serverId: "srv_offer",
@@ -3371,7 +3681,7 @@ describe("HostRuntimeStore", () => {
       relay: { endpoint: "relay.paseo.sh:443" },
     });
 
-    await store.upsertConnectionFromOfferUrl(oldPairingUrl, "old relay");
+    await store.importConnectionLink(oldPairingUrl, "openProject");
 
     const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
     expect(pairedHost?.connections).toEqual([
@@ -3387,28 +3697,314 @@ describe("HostRuntimeStore", () => {
     store.syncHosts([]);
   });
 
-  it("preserves the existing host label when re-pairing an existing relay host", async () => {
-    const store = new HostRuntimeStore({
-      deps: {
-        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-        connectToDaemon: async ({ host }) => ({
-          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-          serverId: host.serverId,
-          hostname: host.label ?? null,
-        }),
-        getClientId: async () => "cid_test_runtime",
+  it("probes a pairing link immediately and saves only after admission", async () => {
+    const store = createPairingStore({ password: "correct-password" });
+    answerHostConfirmations(store, true);
+    const offerUrl = encodeOfferUrl(makeOffer());
+    const pairing = store.beginLinkPairing();
+
+    await expect(pairing.submit(offerUrl)).rejects.toThrow("Password required");
+    expect(store.getHosts()).toHaveLength(0);
+    const result = await pairing.submit(offerUrl, "correct-password");
+    expect(result).toMatchObject({ status: "connected", serverId: "srv_offer" });
+    expect(store.getHosts()[0]?.password).toBe("correct-password");
+    store.syncHosts([]);
+  });
+
+  it("asks before a pairing link adds a new host, and Cancel saves and connects nothing", async () => {
+    const connectAttempts: string[] = [];
+    const store = createPairingStore({ connectAttempts });
+    const requests = answerHostConfirmations(store, false);
+    const offerUrl = encodeOfferUrl(makeOffer());
+    const relayLink = "relay://relay.example:443/srv_relay?key=AAAA&ssl=true";
+
+    // `#offer=` in the app URL, then a QR scan, then the pair-link and add-host modals.
+    await expect(store.importConnectionLink(offerUrl, "openProject")).resolves.toEqual({
+      status: "cancelled",
+    });
+    await expect(store.importConnectionLink(offerUrl, "hostRoot")).resolves.toEqual({
+      status: "cancelled",
+    });
+    await expect(store.beginLinkPairing().submit(offerUrl)).resolves.toEqual({
+      status: "cancelled",
+    });
+    await expect(store.beginLinkPairing().submit(relayLink)).resolves.toEqual({
+      status: "cancelled",
+    });
+
+    expect(requests).toEqual([
+      ...Array.from({ length: 3 }, () => ({
+        id: expect.any(Number),
+        serverId: "srv_offer",
+        keyFingerprint: "pkte stof fer",
+        relayEndpoint: "relay.paseo.sh:443",
+        kind: "newHost",
+      })),
+      {
+        id: expect.any(Number),
+        serverId: "srv_relay",
+        keyFingerprint: "AAAA",
+        relayEndpoint: "relay.example:443",
+        kind: "newHost",
       },
-      storage: createMemoryHostRuntimeStorage(),
-    });
+    ]);
+    expect(store.getHosts()).toEqual([]);
+    expect(connectAttempts).toEqual([]);
+    store.syncHosts([]);
+  });
 
-    await store.upsertRelayConnection({
+  it("connects a saved host from a matching pairing link without asking", async () => {
+    const store = createPairingStore();
+    const requests = answerHostConfirmations(store, true);
+    const offerUrl = encodeOfferUrl(makeOffer());
+    await store.beginLinkPairing().submit(offerUrl);
+    expect(requests).toHaveLength(1);
+
+    await expect(store.importConnectionLink(offerUrl, "openProject")).resolves.toEqual({
+      status: "connected",
       serverId: "srv_offer",
-      relayEndpoint: "relay.paseo.sh:443",
-      daemonPublicKeyB64: "pk_test_offer",
-      label: "Custom name",
+    });
+    await expect(store.importConnectionLink(offerUrl, "hostRoot")).resolves.toEqual({
+      status: "connected",
+      serverId: "srv_offer",
+    });
+    await expect(store.beginLinkPairing().submit(offerUrl)).resolves.toMatchObject({
+      status: "connected",
     });
 
-    await store.upsertConnectionFromOffer(makeOffer(), "mbp");
+    expect(requests).toHaveLength(1);
+    expect(store.getHosts()).toHaveLength(1);
+    store.syncHosts([]);
+  });
+
+  it("asks when a pairing link changes a saved host's key, relay, or TLS setting", async () => {
+    const store = createPairingStore();
+    const requests = answerHostConfirmations(store, (_request, index) => index === 0);
+    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
+    const savedHosts = store.getHosts();
+
+    const changedLinks = [
+      makeOffer({ daemonPublicKeyB64: "pk_other_key" }),
+      makeOffer({ relay: { endpoint: "relay.example:443", useTls: false } }),
+      makeOffer({ relay: { endpoint: "relay.paseo.sh:443", useTls: true } }),
+    ].map(encodeOfferUrl);
+    for (const link of changedLinks) {
+      await expect(store.importConnectionLink(link, "openProject")).resolves.toEqual({
+        status: "cancelled",
+      });
+      await expect(store.beginLinkPairing().submit(link)).resolves.toEqual({
+        status: "cancelled",
+      });
+    }
+
+    expect(requests.map((request) => request.kind)).toEqual([
+      "newHost",
+      ...Array.from({ length: 6 }, () => "changedConnection"),
+    ]);
+    expect(store.getHosts()).toEqual(savedHosts);
+    store.syncHosts([]);
+  });
+
+  it("asks once per pairing flow and link when the host asks for a password", async () => {
+    const store = createPairingStore({ password: "correct-password" });
+    const requests = answerHostConfirmations(store, (_request, index) => index < 2);
+    const offerUrl = encodeOfferUrl(makeOffer());
+    const pairing = store.beginLinkPairing();
+
+    await expect(pairing.submit(offerUrl)).rejects.toThrow("Password required");
+    await expect(pairing.submit(offerUrl, "wrong-password")).rejects.toThrow();
+    expect(requests).toHaveLength(1);
+
+    // A new pairing flow for the same link asks again.
+    await expect(store.beginLinkPairing().submit(offerUrl, "wrong-password")).rejects.toThrow();
+    expect(requests).toHaveLength(2);
+
+    await expect(pairing.submit(offerUrl, "correct-password")).resolves.toMatchObject({
+      status: "connected",
+    });
+    expect(requests).toHaveLength(2);
+    expect(store.getHosts()[0]).toMatchObject({
+      serverId: "srv_offer",
+      password: "correct-password",
+    });
+
+    // A different link in the same flow asks again.
+    const otherKeyUrl = encodeOfferUrl(makeOffer({ daemonPublicKeyB64: "pk_other_key" }));
+    await expect(pairing.submit(otherKeyUrl, "correct-password")).resolves.toEqual({
+      status: "cancelled",
+    });
+    expect(requests).toHaveLength(3);
+    store.syncHosts([]);
+  });
+
+  it("continues a scanned link's password retry without asking again", async () => {
+    const store = createPairingStore({ password: "correct-password" });
+    const requests = answerHostConfirmations(store, true);
+    const link = "relay://relay.example:443/srv_pair?key=AAAA&ssl=true";
+
+    const outcome = await store.importConnectionLink(link, "hostRoot");
+    expect(outcome).toMatchObject({ status: "password_required", link });
+    expect(store.getHosts()).toHaveLength(0);
+    if (outcome.status !== "password_required") throw new Error("expected password_required");
+
+    await outcome.pairing.submit(outcome.link, "correct-password");
+    expect(requests).toHaveLength(1);
+    expect(store.getHosts()[0]).toMatchObject({
+      serverId: "srv_pair",
+      password: "correct-password",
+    });
+    store.syncHosts([]);
+  });
+
+  it("keeps a host confirmation pending until it is answered, and a newer one cancels it", async () => {
+    const store = createPairingStore();
+    const first = store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject");
+    await vi.waitFor(() =>
+      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_offer" }),
+    );
+
+    const second = store.importConnectionLink(
+      encodeOfferUrl(makeOffer({ serverId: "srv_second" })),
+      "openProject",
+    );
+    await expect(first).resolves.toEqual({ status: "cancelled" });
+    await vi.waitFor(() =>
+      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_second" }),
+    );
+
+    store.answerHostConfirmation(requirePendingConfirmation(store).id, true);
+    await expect(second).resolves.toEqual({ status: "connected", serverId: "srv_second" });
+    expect(store.getPendingHostConfirmation()).toBeNull();
+    expect(store.getHosts().map((host) => host.serverId)).toEqual(["srv_second"]);
+    store.syncHosts([]);
+  });
+
+  it("ignores an answer for a host confirmation that a newer one replaced", async () => {
+    const store = createPairingStore();
+    const first = store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject");
+    await vi.waitFor(() =>
+      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_offer" }),
+    );
+    const firstRequest = requirePendingConfirmation(store);
+    const second = store.importConnectionLink(
+      encodeOfferUrl(makeOffer({ serverId: "srv_second" })),
+      "openProject",
+    );
+    await expect(first).resolves.toEqual({ status: "cancelled" });
+
+    // Connect tapped on the first sheet as the second link arrives.
+    store.answerHostConfirmation(firstRequest.id, true);
+
+    const secondRequest = requirePendingConfirmation(store);
+    expect(secondRequest.serverId).toBe("srv_second");
+    store.answerHostConfirmation(secondRequest.id, false);
+    await expect(second).resolves.toEqual({ status: "cancelled" });
+    expect(store.getHosts()).toEqual([]);
+  });
+
+  it("waits for saved hosts to load before deciding whether a pairing link asks", async () => {
+    const savedHost = makeHost({
+      serverId: "srv_offer",
+      connections: [
+        {
+          id: "relay:relay.paseo.sh:443",
+          type: "relay",
+          relayEndpoint: "relay.paseo.sh:443",
+          useTls: false,
+          daemonPublicKeyB64: "pk_test_offer",
+        },
+      ],
+    });
+    const store = createPairingStore({
+      storage: createMemoryHostRuntimeStorage({
+        "@paseo:daemon-registry": JSON.stringify([savedHost]),
+        "@paseo:e2e": "1",
+      }),
+    });
+    const requests = answerHostConfirmations(store, true);
+
+    await expect(
+      store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject"),
+    ).resolves.toEqual({ status: "connected", serverId: "srv_offer" });
+
+    expect(requests).toEqual([]);
+    expect(store.getHosts().map((host) => host.serverId)).toEqual(["srv_offer"]);
+    store.syncHosts([]);
+  });
+
+  it("adds hosts by address and the default localhost without asking", async () => {
+    const store = createPairingStore({
+      serverIdForHost: (host) =>
+        host.connections[0]?.type === "directTcp" ? `srv_${host.connections[0].endpoint}` : "",
+    });
+    const requests = answerHostConfirmations(store, false);
+
+    await store.boot();
+    await store.probeAndUpsertDirectConnection({ endpoint: "10.0.0.5:6767" });
+
+    expect(requests).toEqual([]);
+    expect(store.getHosts().map((host) => host.serverId)).toEqual([
+      "srv_localhost:6767",
+      "srv_10.0.0.5:6767",
+    ]);
+    store.syncHosts([]);
+  });
+
+  it("authenticates Remote SSH probes with the entered daemon password and stores it verbatim", async () => {
+    const store = createPairingStore({
+      password: " s3cret ",
+      serverIdForHost: (host) => (host.connections[0]?.type === "remoteSsh" ? "srv_ssh" : ""),
+    });
+    answerHostConfirmations(store, false);
+
+    await store.boot();
+    await store.probeAndUpsertRemoteSshConnection({
+      host: "deploy@example.com",
+      password: " s3cret ",
+    });
+
+    const host = store.getHosts().find((entry) => entry.serverId === "srv_ssh");
+    expect(host?.password).toBe(" s3cret ");
+    expect(host?.connections[0]).toMatchObject({
+      type: "remoteSsh",
+      host: "deploy@example.com",
+    });
+
+    // The fix promises the saved password is sent on every connection: a later
+    // cycle must authenticate from the stored profile alone.
+    await store.runProbeCycleNow("srv_ssh");
+    await waitForHostOnline(store, "srv_ssh");
+    store.syncHosts([]);
+  });
+
+  it("rejects Remote SSH probes without the daemon password, the way the daemon does", async () => {
+    const store = createPairingStore({
+      password: "s3cret",
+      serverIdForHost: (host) => (host.connections[0]?.type === "remoteSsh" ? "srv_ssh" : ""),
+    });
+    answerHostConfirmations(store, false);
+
+    await store.boot();
+    const failure = await store
+      .probeAndUpsertRemoteSshConnection({ host: "deploy@example.com" })
+      .then(
+        () => null,
+        (error: unknown) => error,
+      );
+    expect(failure).toBeInstanceOf(DaemonAuthenticationError);
+    expect((failure as DaemonAuthenticationError).reason).toBe("password_required");
+    expect(store.getHosts().find((entry) => entry.serverId === "srv_ssh")).toBeUndefined();
+    store.syncHosts([]);
+  });
+
+  it("preserves the existing host label when re-pairing an existing relay host", async () => {
+    const store = createPairingStore({ hostname: "mbp" });
+    answerHostConfirmations(store, true);
+
+    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
+    await store.renameHost("srv_offer", "Custom name");
+
+    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
 
     const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
     expect(pairedHost?.label).toBe("Custom name");
@@ -3455,6 +4051,326 @@ describe("readInitialDaemonConnectionHint", () => {
 });
 
 describe("HostRuntimeStore initial connection hint bootstrap", () => {
+  it("starts saved remote-host probes while desktop daemon startup is still pending", async () => {
+    const host = makeHost({
+      serverId: "srv_remote_saved",
+      connections: [
+        { id: "direct:remote.example:6799", type: "directTcp", endpoint: "remote.example:6799" },
+      ],
+    });
+    const storage = createMemoryHostRuntimeStorage();
+    await storage.setItem("@paseo:daemon-registry", JSON.stringify([host]));
+    let remoteProbeStarted = false;
+    let finishDesktopStart: (() => void) | undefined;
+    const desktopStartPending = new Promise<void>((resolve) => {
+      finishDesktopStart = resolve;
+    });
+    const store = new HostRuntimeStore({
+      storage,
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async () => {
+          remoteProbeStarted = true;
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label,
+          };
+        },
+        getClientId: async () => "cid_remote_saved",
+      },
+    });
+    startHostRuntimeBootstrap({
+      store,
+      shouldStartDaemon: true,
+      daemonStartService: {
+        startIfEnabled: async () => {
+          await desktopStartPending;
+          return { ok: true };
+        },
+      },
+    });
+    try {
+      await vi.waitFor(() => expect(remoteProbeStarted).toBe(true), { timeout: 400 });
+      expect(store.isHostRegistryLoaded()).toBe(true);
+    } finally {
+      finishDesktopStart?.();
+      await store.boot();
+      store.syncHosts([]);
+    }
+  });
+  it("resolves a local credential for a reopened saved desktop host connection", async () => {
+    const host = makeHost({
+      serverId: "srv_desktop_reopened",
+      connections: [{ id: "direct:localhost:6799", type: "directTcp", endpoint: "localhost:6799" }],
+    });
+    const storage = createMemoryHostRuntimeStorage();
+    await storage.setItem("@paseo:daemon-registry", JSON.stringify([host]));
+    const credentialRequests: string[] = [];
+    const store = new HostRuntimeStore({
+      storage,
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host: probeHost, connection }) => {
+          expect(probeHost.password).toBeUndefined();
+          const credential = await readDesktopManagedLocalCredential(connection, async (listen) => {
+            credentialRequests.push(listen);
+            return listen === "localhost:6799" ? "local-token" : null;
+          });
+          expect(credential).toBe("local-token");
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label,
+          };
+        },
+        getClientId: async () => "cid_desktop_reopened",
+      },
+    });
+    startHostRuntimeBootstrap({
+      store,
+      shouldStartDaemon: true,
+      daemonStartService: {
+        startIfEnabled: async () => ({ ok: true }),
+      },
+    });
+    await waitForHostOnline(store, host.serverId);
+    expect(credentialRequests).toContain("localhost:6799");
+    store.syncHosts([]);
+  });
+  it("requires a new password and stops reconnecting after a previously connected client is rejected", async () => {
+    const client = makeConnectedProbeClient(5);
+    const host = makeHost({
+      serverId: "srv_changed_password",
+      password: "old-password",
+      connections: [{ id: "direct:lan:6767", type: "directTcp", endpoint: "lan:6767" }],
+    });
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => client as unknown as DaemonClient,
+        connectToDaemon: async () => ({
+          client: client as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: host.label,
+        }),
+        getClientId: async () => "cid_changed_password",
+      },
+    });
+    store.syncHosts([host], {
+      initialConnectionByServerId: new Map([
+        [
+          host.serverId,
+          {
+            connectionId: host.connections[0]!.id,
+            existingClient: client as unknown as DaemonClient,
+          },
+        ],
+      ]),
+    });
+    await waitForHostOnline(store, host.serverId);
+    client.authFailureReason = "incorrect_password";
+    client.setConnectionState({ status: "disconnected", reason: "Incorrect password" });
+    await onceHostSnapshotMatches(
+      store,
+      host.serverId,
+      (snapshot) => snapshot?.authFailureReason === "incorrect_password",
+    );
+    expect(store.getSnapshot(host.serverId)?.lastError).toBe("Incorrect password");
+    expect(client.reconnectEnabledChanges.at(-1)).toBe(false);
+    store.syncHosts([]);
+  });
+
+  it("tries another connection after the active connection rejects its password", async () => {
+    const relayClient = makeConnectedProbeClient(5);
+    const directClient = makeConnectedProbeClient(5);
+    const host = makeHost({
+      serverId: "srv_rejected_relay_with_local_direct",
+      password: "stale-password",
+      preferredConnectionId: "relay:remote:443",
+      connections: [
+        {
+          id: "relay:remote:443",
+          type: "relay",
+          relayEndpoint: "remote:443",
+          daemonPublicKeyB64: "pk_test_offer",
+        },
+        { id: "direct:localhost:6799", type: "directTcp", endpoint: "localhost:6799" },
+      ],
+    });
+    const probeAttempts: string[] = [];
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ connection }) => {
+          probeAttempts.push(connection.id);
+          if (connection.type === "relay")
+            throw new DaemonAuthenticationError("incorrect_password");
+          return {
+            client: directClient as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label,
+          };
+        },
+        getClientId: async () => "cid_rejected_relay_with_local_direct",
+      },
+    });
+    store.syncHosts([host], {
+      initialConnectionByServerId: new Map([
+        [
+          host.serverId,
+          {
+            connectionId: "relay:remote:443",
+            existingClient: relayClient as unknown as DaemonClient,
+          },
+        ],
+      ]),
+    });
+    await waitForHostOnline(store, host.serverId);
+    relayClient.authFailureReason = "incorrect_password";
+    relayClient.setConnectionState({ status: "disconnected", reason: "Incorrect password" });
+    await onceHostSnapshotMatches(
+      store,
+      host.serverId,
+      (snapshot) => snapshot?.authFailureReason === "incorrect_password",
+    );
+    await store.runProbeCycleNow(host.serverId);
+    await onceHostSnapshotMatches(
+      store,
+      host.serverId,
+      (snapshot) =>
+        snapshot?.connectionStatus === "online" &&
+        snapshot.activeConnectionId === "direct:localhost:6799",
+    );
+    expect(probeAttempts).toContain("direct:localhost:6799");
+    expect(probeAttempts).not.toContain("relay:remote:443");
+    store.syncHosts([]);
+  });
+
+  it("keeps five rejected hosts red with independent password errors", async () => {
+    let probeAttempts = 0;
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async () => {
+          probeAttempts += 1;
+          throw new DaemonAuthenticationError("password_required");
+        },
+        getClientId: async () => "cid_five_rejected_hosts",
+      },
+    });
+    for (let index = 1; index <= 5; index += 1) {
+      const serverId = `srv_rejected_${index}`;
+      await store.upsertDirectConnection({ serverId, endpoint: `host-${index}:6767` });
+      await onceHostSnapshotMatches(
+        store,
+        serverId,
+        (snapshot) => snapshot?.authFailureReason === "password_required",
+      );
+    }
+    for (let index = 1; index <= 5; index += 1) {
+      const snapshot = store.getSnapshot(`srv_rejected_${index}`);
+      expect(snapshot?.connectionStatus).toBe("error");
+      expect(snapshot?.lastError).toBe("Password required");
+    }
+    const attemptsBeforeRetry = probeAttempts;
+    await store.runProbeCycleNow("srv_rejected_1");
+    expect(probeAttempts).toBe(attemptsBeforeRetry);
+    store.syncHosts([]);
+  });
+  it("imports a deep link without waiting for admission, then leaves a rejected saved host red", async () => {
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async () => {
+          throw new DaemonAuthenticationError("password_required");
+        },
+        getClientId: async () => "cid_deep_link",
+      },
+    });
+    answerHostConfirmations(store, true);
+    const link = "relay://relay.example:443/srv_deep?key=AAAA&ssl=true";
+    await expect(store.importConnectionLink(link, "openProject")).resolves.toEqual({
+      status: "connected",
+      serverId: "srv_deep",
+    });
+    expect(store.getHosts()).toHaveLength(1);
+    await onceHostSnapshotMatches(
+      store,
+      "srv_deep",
+      (snapshot) => snapshot?.authFailureReason === "password_required",
+    );
+    expect(store.getSnapshot("srv_deep")?.connectionStatus).toBe("error");
+    store.syncHosts([]);
+  });
+  it("stops connecting to a host removed while its first probe is pending", async () => {
+    useHostRuntimeClock();
+    const firstProbe = createDeferred<void>();
+    let connectCalls = 0;
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => {
+          connectCalls += 1;
+          if (connectCalls === 1) await firstProbe.promise;
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label ?? null,
+          };
+        },
+        getClientId: async () => "cid_test_removed_host",
+      },
+    });
+    await store.upsertDirectConnection({ serverId: "srv_removed", endpoint: "lan:6767" });
+    await vi.waitFor(() => expect(connectCalls).toBe(1));
+
+    await store.removeHost("srv_removed");
+    firstProbe.resolve();
+    await vi.advanceTimersByTimeAsync(60_000);
+
+    expect(connectCalls).toBe(1);
+    expect(store.getSnapshot("srv_removed")).toBeNull();
+    expect(useSessionStore.getState().sessions["srv_removed"]).toBeUndefined();
+  });
+
+  it("saves and reconnects a rejected saved host after changing its password", async () => {
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => {
+          if (host.password !== "correct-password")
+            throw new DaemonAuthenticationError("password_required");
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: host.label,
+          };
+        },
+        getClientId: async () => "cid_test_password_setting",
+      },
+    });
+    await store.upsertDirectConnection({ serverId: "srv_test", endpoint: "lan:6767" });
+    await onceHostSnapshotMatches(
+      store,
+      "srv_test",
+      (snapshot) => snapshot?.authFailureReason === "password_required",
+    );
+    expect(store.getSnapshot("srv_test")?.connectionStatus).toBe("error");
+    await store.setHostPassword("srv_test", "correct-password");
+    await waitForHostOnline(store, "srv_test");
+    expect(store.getHosts()[0]?.password).toBe("correct-password");
+    expect(store.getSnapshot("srv_test")?.authFailureReason).toBeNull();
+    await store.setHostPassword("srv_test", "");
+    expect(store.getHosts()[0]?.password).toBeUndefined();
+    store.syncHosts([]);
+  });
+
   it("attempts the explicit initial connection hint before default localhost bootstrap", async () => {
     const seenProbes: { endpoint: string; useTls?: boolean }[] = [];
     const store = new HostRuntimeStore({
diff --git a/packages/app/src/runtime/host-runtime.ts b/packages/app/src/runtime/host-runtime.ts
index fc434365dd..2ecbe60448 100644
--- a/packages/app/src/runtime/host-runtime.ts
+++ b/packages/app/src/runtime/host-runtime.ts
@@ -3,6 +3,7 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
 import equal from "fast-deep-equal/es6";
 import {
   DaemonClient,
+  DaemonAuthenticationError,
   type DaemonClientConfig,
   type ConnectionState,
   type FetchAgentsOptions,
@@ -13,6 +14,7 @@ import {
   normalizeStoredHostProfile,
   upsertHostConnectionInProfiles,
   registryHasConnection,
+  relayConnectionFromOffer,
   StoredHostRegistrySchema,
   type HostConnection,
   type HostProfile,
@@ -23,13 +25,15 @@ import {
   buildRelayWebSocketUrl,
   decodeOfferFragmentPayload,
   normalizeHostPort,
+  parseRelayConnectionUri,
   shouldUseTlsForDefaultHostedRelay,
 } from "@/utils/daemon-endpoints";
 import { resolveAppVersion } from "@/utils/app-version";
 import { ConnectionOfferSchema, type ConnectionOffer } from "@getpaseo/protocol/connection-offer";
+import { HostConfirmations, type HostConfirmationRequest } from "./host-confirmation";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { isWeb } from "@/constants/platform";
-import { connectToDaemon } from "@/utils/test-daemon-connection";
+import { connectToDaemon, getConnectionAuthFailureReason } from "@/utils/test-daemon-connection";
 import { getOrCreateClientId } from "@/utils/client-id";
 import { z } from "zod";
 import { readValidatedJson, readValidatedString } from "@/storage/validated-storage";
@@ -43,9 +47,17 @@ import {
   createDesktopDaemonTransportFactory,
 } from "@/desktop/daemon/desktop-daemon-transport";
 import { getDesktopHost } from "@/desktop/host";
+import { readDesktopManagedLocalCredential } from "@/desktop/daemon/local-credential";
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
 import { BROWSER_AUTOMATION_COMMAND_NAMES } from "@getpaseo/protocol/browser-automation/rpc-schemas";
-import { useSessionStore } from "@/stores/session-store";
+import {
+  useSessionStore,
+  toDaemonServerInfo,
+  type Agent,
+  type WorkspaceDescriptor,
+  type ProjectDescriptor,
+} from "@/stores/session-store";
+import type { TurnLivenessTransition } from "@/timeline/turn-liveness";
 import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { invalidateCheckoutGitQueriesForServer } from "@/git/query-keys";
 import { queryClient } from "@/data/query-client";
@@ -76,8 +88,30 @@ import { revokePushNotifications } from "@/push-notifications";
 import { createAppWebSocketFactory } from "./websocket-factory";
 
 export type HostRuntimeConnectionStatus = "idle" | "connecting" | "online" | "offline" | "error";
+export type PairingNavigationTarget = "openProject" | "hostRoot" | "hostSettings";
 export type HostRegistryStatus = "loading" | "ready";
 
+/** One pairing flow started with `HostRuntimeStore.beginLinkPairing`. */
+export interface LinkPairing {
+  /** Probes the linked host and saves it. Connection and password errors throw. */
+  submit(link: string, password?: string): Promise<LinkPairingResult>;
+}
+
+export type LinkPairingResult =
+  | { status: "connected"; profile: HostProfile; serverId: string; hostname: string | null }
+  | { status: "cancelled" };
+
+/** A pairing link the user confirmed whose host then asked for a password. */
+export interface PasswordRequiredPairing {
+  link: string;
+  pairing: LinkPairing;
+}
+
+export type ConnectionLinkImport =
+  | { status: "connected"; serverId: string }
+  | ({ status: "password_required" } & PasswordRequiredPairing)
+  | { status: "cancelled" };
+
 export type ActiveConnection =
   | { type: "directTcp"; endpoint: string; display: string }
   | { type: "directSocket"; endpoint: string; display: "socket" }
@@ -100,6 +134,7 @@ export interface HostRuntimeSnapshot {
   connectionStatus: HostRuntimeConnectionStatus;
   client: DaemonClient | null;
   lastError: string | null;
+  authFailureReason?: "password_required" | "incorrect_password" | null;
   lastOnlineAt: string | null;
   agentDirectoryStatus: HostRuntimeAgentDirectoryStatus;
   agentDirectoryError: string | null;
@@ -495,8 +530,6 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
       }
     : undefined;
   const appCapabilities = {
-    [CLIENT_CAPS.selectiveAgentTimeline]: true,
-    [CLIENT_CAPS.timelineReplacementInvalidation]: true,
     ...browserAutomationCapabilities,
   };
 
@@ -512,6 +545,9 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
         runtimeGeneration,
         capabilities: appCapabilities,
         trace: nativePerformanceTrace,
+        providerSnapshots: "wire",
+        ...(host.password ? { password: host.password } : {}),
+        localCredential: () => readDesktopManagedLocalCredential(connection),
       } satisfies Omit<DaemonClientConfig, "url">;
       if (connection.type === "directSocket" || connection.type === "directPipe") {
         return new DaemonClient({
@@ -545,7 +581,6 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
           url: buildDaemonWebSocketUrl(connection.endpoint, {
             useTls: connection.useTls ?? false,
           }),
-          ...(connection.password ? { password: connection.password } : {}),
         });
       }
       return new DaemonClient({
@@ -565,6 +600,8 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
     connectToDaemon: ({ host, connection, timeoutMs }) =>
       connectToDaemon(connection, {
         ...(host.serverId ? { serverId: host.serverId } : {}),
+        ...(host.password ? { password: host.password } : {}),
+        localCredential: () => readDesktopManagedLocalCredential(connection),
         ...(timeoutMs !== undefined ? { timeoutMs } : {}),
         capabilities: appCapabilities,
         trace: nativePerformanceTrace,
@@ -612,6 +649,7 @@ export class HostRuntimeController {
   private switchRequestVersion = 0;
   private probeRequestVersion = 0;
   private probeCycleInFlight: Promise<void> | null = null;
+  private readonly authRejectedConnectionIds = new Set<string>();
 
   constructor(input: {
     host: HostProfile;
@@ -662,8 +700,15 @@ export class HostRuntimeController {
         connectionId: options.initialConnection.connectionId,
         existingClient: options.initialConnection.existingClient,
       });
+      if (!this.started) {
+        return;
+      }
     }
     await this.runProbeCycleNow();
+    // stop() can run while startup is pending; a stopped controller never probes again.
+    if (!this.started) {
+      return;
+    }
     if (options?.autoProbe !== false) {
       this.probeIntervalHandle = setInterval(() => {
         void this.runProbeCycleNow();
@@ -700,6 +745,12 @@ export class HostRuntimeController {
   }
 
   async updateHost(host: HostProfile): Promise<void> {
+    const passwordChanged = this.host.password !== host.password;
+    if (passwordChanged) {
+      this.probeRequestVersion += 1;
+      this.authRejectedConnectionIds.clear();
+      this.updateSnapshot({ authFailureReason: null });
+    }
     const activeConnectionId = this.snapshot.activeConnectionId;
     const previousActiveConnection = findConnectionById(this.host, activeConnectionId);
     this.host = host;
@@ -709,16 +760,18 @@ export class HostRuntimeController {
       activeConnectionId &&
       previousActiveConnection &&
       nextActiveConnection &&
-      !equal(previousActiveConnection, nextActiveConnection)
+      (!equal(previousActiveConnection, nextActiveConnection) || passwordChanged)
     ) {
       this.connectionLastProbedAt.delete(activeConnectionId);
       await this.switchToConnection({ connectionId: activeConnectionId });
     }
+    if (passwordChanged) this.connectionLastProbedAt.clear();
+    if (passwordChanged) await this.probeCycleInFlight;
     await this.runProbeCycleNow();
   }
 
-  ensureConnected(): void {
-    this.activeClient?.ensureConnected();
+  ensureConnected(options?: { verify?: boolean }): void {
+    this.activeClient?.ensureConnected(options);
   }
 
   markAgentDirectorySyncLoading(): void {
@@ -803,6 +856,7 @@ export class HostRuntimeController {
     const hasActiveOnlineConnection = isOnline && activeConnectionId !== null;
 
     const connectionsToProbe = this.host.connections.filter((connection) => {
+      if (this.authRejectedConnectionIds.has(connection.id)) return false;
       const lastProbed = this.connectionLastProbedAt.get(connection.id);
       if (lastProbed == null) {
         return true;
@@ -838,6 +892,7 @@ export class HostRuntimeController {
     this.updateSnapshot({ probeByConnectionId: new Map(probeByConnectionId) });
 
     let remaining = connectionsToProbe.length;
+    let probeAuthFailure: "password_required" | "incorrect_password" | null = null;
     let activationLock: Promise<void> | null = null;
 
     const publishProbeState = (): void => {
@@ -888,11 +943,18 @@ export class HostRuntimeController {
             connectionId: nextConnectionId,
             expectedProbeVersion: requestVersion,
           });
+        } else if (probeAuthFailure) {
+          const message = new DaemonAuthenticationError(probeAuthFailure).message;
+          this.applyConnectionEvent({ type: "connect_failed", message });
+          this.updateSnapshot({
+            ...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
+            authFailureReason: probeAuthFailure,
+          });
         }
         return;
       }
 
-      if (activeProbe?.status === "unavailable") {
+      if (this.isConnectionUnavailable(currentActiveConnectionId, activeProbe)) {
         const nextConnectionId = selectBestConnection({
           candidates: buildConnectionCandidates(this.host),
           probeByConnectionId,
@@ -970,10 +1032,7 @@ export class HostRuntimeController {
           let shouldCloseClient = false;
           try {
             const activeClient =
-              this.snapshot.connectionStatus === "online" &&
-              this.snapshot.activeConnectionId === connection.id
-                ? this.snapshot.client
-                : null;
+              this.snapshot.activeConnectionId === connection.id ? this.snapshot.client : null;
 
             if (activeClient) {
               connectedClient = activeClient;
@@ -1028,8 +1087,13 @@ export class HostRuntimeController {
               latencyMs: rttMs,
             });
             publishProbeState();
-          } catch {
+          } catch (error) {
             if (this.isCurrentProbeRequest(requestVersion)) {
+              const authFailure = getConnectionAuthFailureReason(error);
+              if (authFailure) {
+                this.authRejectedConnectionIds.add(connection.id);
+                probeAuthFailure = authFailure;
+              }
               probeByConnectionId.set(connection.id, {
                 status: "unavailable",
                 latencyMs: null,
@@ -1047,6 +1111,13 @@ export class HostRuntimeController {
     });
   }
 
+  private isConnectionUnavailable(
+    connectionId: string,
+    probe: ConnectionProbeState | null | undefined,
+  ): boolean {
+    return probe?.status === "unavailable" || this.authRejectedConnectionIds.has(connectionId);
+  }
+
   private updateSnapshot(patch: HostRuntimeSnapshotPatch): void {
     const preservedPatch: HostRuntimeSnapshotPatch = { ...patch };
     let hasChanged = this.host.serverId !== this.snapshot.serverId;
@@ -1226,9 +1297,6 @@ export class HostRuntimeController {
     }
 
     const nextGeneration = this.snapshot.clientGeneration + 1;
-    if (existingClient) {
-      existingClient.setReconnectEnabled(true);
-    }
     const client =
       existingClient ??
       this.deps.createClient({
@@ -1237,6 +1305,7 @@ export class HostRuntimeController {
         clientId,
         runtimeGeneration: nextGeneration,
       });
+    client.setReconnectEnabled(true);
 
     if (!this.isSwitchStillValid(requestVersion, expectedProbeVersion)) {
       await client.close().catch(() => undefined);
@@ -1244,56 +1313,75 @@ export class HostRuntimeController {
     }
 
     this.activeClient = client;
-    this.unsubscribeClientHandlers =
-      this.deps.mountClientHandlers?.({ client, host: this.host, connection }) ?? null;
     this.applyConnectionEvent({
       type: "select_connection",
       connectionId: connection.id,
       connection: toActiveConnection(connection),
     });
-    this.snapshot = {
-      ...this.snapshot,
-      serverId: this.host.serverId,
+    this.snapshot = { ...this.snapshot, clientGeneration: nextGeneration };
+    this.updateSnapshot({
       ...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
-      client,
-      clientGeneration: nextGeneration,
-    };
-    for (const listener of this.listeners) {
-      listener();
-    }
-
-    this.unsubscribeClientStatus = client.subscribeConnectionStatus((state) => {
-      if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) {
-        return;
-      }
-      this.applyConnectionEvent({
-        type: "client_state",
-        state,
-        lastError: client.lastError,
-      });
-      const patch: HostRuntimeSnapshotPatch = {
-        ...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
-        ...this.buildAgentDirectoryStatusPatch(),
-      };
-      this.updateSnapshot(patch);
+      client: null,
     });
 
-    try {
-      if (!existingClient) {
-        await client.connect();
-      }
-    } catch (error) {
-      if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) {
-        return;
-      }
-      const message = toErrorMessage(error);
-      this.applyConnectionEvent({
-        type: "connect_failed",
-        message,
-      });
+    const failConnection = async (error: unknown) => {
+      if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
+      const authFailure = getConnectionAuthFailureReason(error);
+      if (authFailure) this.authRejectedConnectionIds.add(connection.id);
+      this.unsubscribeClientStatus?.();
+      this.unsubscribeClientStatus = null;
+      this.unsubscribeClientHandlers?.();
+      this.unsubscribeClientHandlers = null;
+      client.setReconnectEnabled(false);
+      this.applyConnectionEvent({ type: "connect_failed", message: toErrorMessage(error) });
       this.updateSnapshot({
         ...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
+        client: null,
+        authFailureReason: authFailure,
       });
+      if (authFailure) {
+        const probes = new Map(this.snapshot.probeByConnectionId);
+        probes.set(connection.id, { status: "unavailable", latencyMs: null });
+        this.updateSnapshot({ probeByConnectionId: probes });
+        for (const candidate of this.host.connections) {
+          if (!this.authRejectedConnectionIds.has(candidate.id)) {
+            this.connectionLastProbedAt.delete(candidate.id);
+          }
+        }
+      }
+      try {
+        await client.close();
+      } catch {
+        /* Preserve the compatibility/connection error. */
+      }
+      if (
+        authFailure &&
+        this.host.connections.some((candidate) => !this.authRejectedConnectionIds.has(candidate.id))
+      ) {
+        void this.runProbeCycleNow();
+      }
+    };
+    try {
+      if (!existingClient) await client.connect();
+      if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
+      this.unsubscribeClientHandlers =
+        this.deps.mountClientHandlers?.({ client, host: this.host, connection }) ?? null;
+      this.unsubscribeClientStatus = client.subscribeConnectionStatus((state) => {
+        if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
+        if (client.authFailureReason) {
+          void failConnection(new DaemonAuthenticationError(client.authFailureReason));
+          return;
+        }
+        this.applyConnectionEvent({ type: "client_state", state, lastError: client.lastError });
+        this.updateSnapshot({
+          ...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
+          ...this.buildAgentDirectoryStatusPatch(),
+          client,
+          authFailureReason: null,
+        });
+      });
+    } catch (error) {
+      await failConnection(error);
     }
   }
 
@@ -1350,6 +1438,26 @@ function readConfiguredLocalDaemonOverride(): string | null {
   return value && value.length > 0 ? value : null;
 }
 
+function isSameLinkedConnection(left: ConnectionOffer, right: ConnectionOffer): boolean {
+  return (
+    left.serverId === right.serverId &&
+    equal(relayConnectionFromOffer(left), relayConnectionFromOffer(right))
+  );
+}
+
+function parseOfferConnectionUrl(input: string): { offer: ConnectionOffer; password?: string } {
+  if (input.trim().startsWith("relay://") || input.includes("#connect=")) {
+    return parseRelayConnectionUri(input);
+  }
+  const marker = "#offer=";
+  const idx = input.indexOf(marker);
+  if (idx === -1) throw new Error("Missing #offer= fragment");
+  const encoded = input.slice(idx + marker.length).trim();
+  if (!encoded) throw new Error("Offer payload is empty");
+  const payload = decodeOfferFragmentPayload(encoded);
+  return { offer: ConnectionOfferSchema.parse(payload) };
+}
+
 export function hasConfiguredLocalDaemonOverride(): boolean {
   return readConfiguredLocalDaemonOverride() !== null;
 }
@@ -1394,9 +1502,12 @@ export class HostRuntimeStore {
   private connectionStatusStartedAtByServer = new Map<string, number>();
   private queuedAgentDrainInFlight = new Set<string>();
   private directorySyncByServer = new Map<string, DirectorySync>();
+  private nextCancellationRequestId = 0;
   private timelineReplicaByServer = new Map<string, TimelineReplica>();
   private configuredOverrideBootstrapInFlight: Promise<void> | null = null;
   private bootPromise: Promise<void> | null = null;
+  private registryLoad: Promise<void> | null = null;
+  private readonly hostConfirmations = new HostConfirmations();
   private storage: HostRuntimeStorage;
   private replicaCache: ReplicaCache;
   private readonly revokePushNotifications: typeof revokePushNotifications;
@@ -1447,8 +1558,7 @@ export class HostRuntimeStore {
 
   private async runBoot(): Promise<void> {
     const override = readConfiguredLocalDaemonOverride();
-    await this.loadFromStorage();
-    this.markHostRegistryLoaded();
+    await this.loadRegistry();
 
     let isE2E: string | null = null;
     try {
@@ -1481,6 +1591,13 @@ export class HostRuntimeStore {
     }
   }
 
+  private loadRegistry(): Promise<void> {
+    if (!this.registryLoad) {
+      this.registryLoad = this.loadFromStorage().then(() => this.markHostRegistryLoaded());
+    }
+    return this.registryLoad;
+  }
+
   private async loadFromStorage(): Promise<void> {
     let shouldPersistHosts = false;
     let profiles: HostProfile[] = [];
@@ -1499,6 +1616,14 @@ export class HostRuntimeStore {
             normalizedProfiles.length = 0;
             break;
           }
+          // COMPAT(connectionPassword): added in v0.9.1, remove after 2027-03-24 with stored-password migration.
+          if (
+            entry.connections.some(
+              (connection) => connection.type === "directTcp" && connection.password,
+            )
+          ) {
+            shouldPersistHosts = true;
+          }
           normalizedProfiles.push(profile);
         }
         profiles = normalizedProfiles.filter((entry) => !isPlaceholderServerId(entry.serverId));
@@ -1511,6 +1636,12 @@ export class HostRuntimeStore {
       projectIconCache.setHosts(profiles.map((profile) => profile.serverId));
       await projectIconCache.restore();
       this.syncHosts(profiles);
+      for (const profile of profiles) {
+        void this.directorySyncByServer
+          .get(profile.serverId)
+          ?.restoreCachedDirectory()
+          .catch(() => undefined);
+      }
     } catch (error) {
       console.error("[HostRuntime] Failed to load host registry from storage", error);
     } finally {
@@ -1715,12 +1846,12 @@ export class HostRuntimeStore {
     return this.upsertHostConnection({
       serverId: input.serverId,
       label: input.label,
+      password,
       connection: {
         id: `direct:${endpoint}`,
         type: "directTcp",
         endpoint,
         useTls: input.useTls ?? false,
-        ...(password ? { password } : {}),
       },
       existingClient: input.existingClient,
     });
@@ -1728,6 +1859,7 @@ export class HostRuntimeStore {
 
   async probeAndUpsertConnection(input: {
     connection: HostConnection;
+    password?: string;
     label?: string;
     timeoutMs?: number;
   }): Promise<{ profile: HostProfile; serverId: string; hostname: string | null }> {
@@ -1736,6 +1868,7 @@ export class HostRuntimeStore {
     }
     const probeHost: HostProfile = {
       serverId: "",
+      ...(input.password ? { password: input.password } : {}),
       label: input.label ?? input.connection.id,
       appearance: defaultHostAppearance(),
       lifecycle: {},
@@ -1752,6 +1885,7 @@ export class HostRuntimeStore {
     const profile = await this.upsertHostConnection({
       serverId,
       label: input.label ?? hostname ?? undefined,
+      password: input.password,
       connection: input.connection,
       existingClient: client,
     });
@@ -1768,12 +1902,12 @@ export class HostRuntimeStore {
     const password = input.password?.trim();
     return this.probeAndUpsertConnection({
       label: input.label,
+      password,
       connection: {
         id: `direct:${endpoint}`,
         type: "directTcp",
         endpoint,
         useTls: input.useTls ?? false,
-        ...(password ? { password } : {}),
       },
     });
   }
@@ -1782,20 +1916,25 @@ export class HostRuntimeStore {
     host: string;
     sshPort?: number;
     daemonPort?: number;
+    password?: string;
     label?: string;
   }): Promise<{ profile: HostProfile; serverId: string; hostname: string | null }> {
     return this.probeAndUpsertConnection({
       label: input.label,
+      // The daemon hashes and compares the password verbatim (`paseo daemon
+      // set-password` keeps what it reads), so whitespace is significant here.
+      password: input.password ? input.password : undefined,
       connection: createRemoteSshHostConnection(input),
     });
   }
 
-  async upsertRelayConnection(input: {
+  private async upsertRelayConnection(input: {
     serverId: string;
     relayEndpoint: string;
     useTls?: boolean;
     daemonPublicKeyB64: string;
     label?: string;
+    password?: string;
   }): Promise<HostProfile> {
     const relayEndpoint = normalizeHostPort(input.relayEndpoint);
     const useTls = input.useTls ?? false;
@@ -1804,7 +1943,7 @@ export class HostRuntimeStore {
       throw new Error("daemonPublicKeyB64 is required");
     }
     const explicitUseTls = input.useTls !== undefined;
-    return this.upsertHostConnection({
+    const profile = await this.upsertHostConnection({
       serverId: input.serverId,
       label: input.label,
       connection: {
@@ -1815,36 +1954,110 @@ export class HostRuntimeStore {
         daemonPublicKeyB64,
       },
     });
+    if (input.password) {
+      await this.setHostPassword(profile.serverId, input.password);
+      return this.hosts.find((host) => host.serverId === profile.serverId) ?? profile;
+    }
+    return profile;
   }
 
-  async upsertConnectionFromOffer(offer: ConnectionOffer, label?: string): Promise<HostProfile> {
-    // COMPAT(oldRelayOfferTls): added in v0.1.73, remove after 2026-11-10.
-    const useTls = offer.relay.useTls ?? shouldUseTlsForDefaultHostedRelay(offer.relay.endpoint);
+  // A pairing link (a URL, a QR code, or a pasted link) asks the user to
+  // confirm when it adds a new host or changes a saved host's key, relay, or
+  // TLS setting. The answer needs the saved hosts, so it waits for them to load.
+  private async confirmLink(offer: ConnectionOffer): Promise<boolean> {
+    await this.loadRegistry();
+    return this.hostConfirmations.confirmLink(offer, this.hosts);
+  }
+
+  getPendingHostConfirmation(): HostConfirmationRequest | null {
+    return this.hostConfirmations.getPending();
+  }
+
+  subscribeHostConfirmation(listener: () => void): () => void {
+    return this.hostConfirmations.subscribe(listener);
+  }
+
+  answerHostConfirmation(requestId: number, approved: boolean): void {
+    this.hostConfirmations.answer(requestId, approved);
+  }
+
+  /**
+   * Starts one pairing flow, such as one open pairing modal. Once the user
+   * confirms a link, submitting the same link again in this flow (the
+   * password retry) does not ask again. A new flow asks again.
+   */
+  beginLinkPairing(): LinkPairing {
+    let approvedOffer: ConnectionOffer | null = null;
+    return {
+      submit: async (link, password) => {
+        const { offer, password: linkPassword } = parseOfferConnectionUrl(link);
+        if (!approvedOffer || !isSameLinkedConnection(approvedOffer, offer)) {
+          if (!(await this.confirmLink(offer))) return { status: "cancelled" };
+          approvedOffer = offer;
+        }
+        const result = await this.probeAndUpsertOffer(offer, password ?? linkPassword);
+        return { status: "connected", ...result };
+      },
+    };
+  }
+
+  async importConnectionLink(
+    url: string,
+    target: PairingNavigationTarget,
+  ): Promise<ConnectionLinkImport> {
+    if (target === "openProject") {
+      const { offer, password } = parseOfferConnectionUrl(url);
+      if (!(await this.confirmLink(offer))) return { status: "cancelled" };
+      const profile = await this.upsertConnectionFromOffer(offer, undefined, password);
+      return { status: "connected", serverId: profile.serverId };
+    }
+    const pairing = this.beginLinkPairing();
+    try {
+      const result = await pairing.submit(url);
+      if (result.status === "cancelled") return result;
+      return { status: "connected", serverId: result.serverId };
+    } catch (error) {
+      if (!getConnectionAuthFailureReason(error)) throw error;
+      return { status: "password_required", link: url, pairing };
+    }
+  }
+
+  private async upsertConnectionFromOffer(
+    offer: ConnectionOffer,
+    label?: string,
+    password?: string,
+  ): Promise<HostProfile> {
+    const connection = relayConnectionFromOffer(offer);
     return this.upsertRelayConnection({
       serverId: offer.serverId,
-      relayEndpoint: offer.relay.endpoint,
-      useTls,
-      daemonPublicKeyB64: offer.daemonPublicKeyB64,
+      relayEndpoint: connection.relayEndpoint,
+      useTls: connection.useTls,
+      daemonPublicKeyB64: connection.daemonPublicKeyB64,
       label,
+      password,
     });
   }
 
-  async upsertConnectionFromOfferUrl(
-    offerUrlOrFragment: string,
-    label?: string,
-  ): Promise<HostProfile> {
-    const marker = "#offer=";
-    const idx = offerUrlOrFragment.indexOf(marker);
-    if (idx === -1) {
-      throw new Error("Missing #offer= fragment");
-    }
-    const encoded = offerUrlOrFragment.slice(idx + marker.length).trim();
-    if (!encoded) {
-      throw new Error("Offer payload is empty");
-    }
-    const payload = decodeOfferFragmentPayload(encoded);
-    const offer = ConnectionOfferSchema.parse(payload);
-    return this.upsertConnectionFromOffer(offer, label);
+  private async probeAndUpsertOffer(
+    offer: ConnectionOffer,
+    password: string | undefined,
+  ): Promise<{ profile: HostProfile; serverId: string; hostname: string | null }> {
+    const connection = relayConnectionFromOffer(offer);
+    const probeHost: HostProfile = {
+      serverId: offer.serverId,
+      ...(password ? { password } : {}),
+      label: offer.serverId,
+      appearance: defaultHostAppearance(),
+      lifecycle: {},
+      connections: [connection],
+      preferredConnectionId: connection.id,
+      createdAt: new Date(0).toISOString(),
+      updatedAt: new Date(0).toISOString(),
+    };
+    const { client, hostname } = await this.deps.connectToDaemon({ host: probeHost, connection });
+    await client.close().catch(() => undefined);
+    const profile = await this.upsertConnectionFromOffer(offer, hostname ?? undefined, password);
+    return { profile, serverId: offer.serverId, hostname };
   }
 
   async upsertConnectionFromListen(input: {
@@ -1884,6 +2097,13 @@ export class HostRuntimeStore {
     await this.updateHost(serverId, (host) => ({ ...host, label }));
   }
 
+  async setHostPassword(serverId: string, password: string): Promise<void> {
+    await this.updateHost(serverId, (host) => {
+      const { password: _previous, ...rest } = host;
+      return password ? { ...rest, password } : rest;
+    });
+  }
+
   async setHostColor(serverId: string, color: HostColor): Promise<void> {
     await this.updateHostAppearance(serverId, (host) => ({
       ...host,
@@ -1961,6 +2181,7 @@ export class HostRuntimeStore {
   private async upsertHostConnection(input: {
     serverId: string;
     label?: string;
+    password?: string;
     connection: HostConnection;
     existingClient?: DaemonClient;
   }): Promise<HostProfile> {
@@ -1970,6 +2191,7 @@ export class HostRuntimeStore {
       serverId: input.serverId,
       label: input.label,
       connection: input.connection,
+      password: input.password,
       now,
     });
     this.setHostsAndSync(next, {
@@ -2117,6 +2339,13 @@ export class HostRuntimeStore {
     const sessionStore = useSessionStore.getState();
     sessionStore.initializeSession(serverId, snapshot.client, snapshot.clientGeneration);
     sessionStore.updateSessionClient(serverId, snapshot.client, snapshot.clientGeneration);
+    // A reconnect keeps the same client, so the daemon's handshake (a restart or upgrade can
+    // change its version and features) only reaches the store here. The client clears it while
+    // disconnected; keep the last known value until the next handshake.
+    const serverInfo = snapshot.client.getLastServerInfoMessage();
+    if (serverInfo) {
+      sessionStore.updateSessionServerInfo(serverId, toDaemonServerInfo(serverInfo));
+    }
   }
 
   private clearHostReplica(serverId: string): void {
@@ -2197,6 +2426,11 @@ export class HostRuntimeStore {
           }),
           encodeImages,
           submission: createMessageSubmissionWriter(serverId),
+          // The queue drains when the agent goes idle, but the agent can start a turn of its own
+          // in that same moment (a wake-up after background work). Steering folds the message
+          // into that turn instead of interrupting it; with no turn running, the daemon starts
+          // a normal one.
+          activeTurnBehavior: "steer",
         });
       },
     })
@@ -2215,6 +2449,56 @@ export class HostRuntimeStore {
       });
   }
 
+  applyAgentTurnLiveness(
+    serverId: string,
+    agentId: string,
+    transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
+  ): void {
+    this.directorySyncByServer.get(serverId)?.applyAgentTurnLiveness(agentId, transition);
+  }
+
+  beginAgentCancellation(serverId: string, agentId: string): number {
+    const requestId = ++this.nextCancellationRequestId;
+    this.applyAgentTurnLiveness(serverId, agentId, { type: "cancellation_started", requestId });
+    return requestId;
+  }
+
+  settleAgentCancellation(serverId: string, agentId: string, requestId: number): void {
+    this.applyAgentTurnLiveness(serverId, agentId, { type: "cancellation_settled", requestId });
+  }
+
+  acceptAgentSnapshot(serverId: string, agent: Agent): Agent {
+    return this.requireDirectory(serverId).acceptAgent(agent);
+  }
+
+  archiveAgentSnapshot(serverId: string, agentId: string, archivedAt: string): void {
+    this.requireDirectory(serverId).archiveAgent(agentId, archivedAt);
+  }
+
+  restoreAgentSnapshot(serverId: string, agentId: string, agent: Agent | undefined): void {
+    const directory = this.requireDirectory(serverId);
+    if (agent) directory.acceptAgent(agent);
+    else directory.removeAgent(agentId);
+  }
+
+  acceptWorkspaceSnapshots(serverId: string, workspaces: readonly WorkspaceDescriptor[]): void {
+    this.requireDirectory(serverId).acceptWorkspaces(workspaces);
+  }
+
+  acceptProjectSnapshot(serverId: string, project: ProjectDescriptor): void {
+    this.requireDirectory(serverId).acceptProject(project);
+  }
+
+  removeWorkspaceSnapshot(serverId: string, workspaceId: string): void {
+    this.requireDirectory(serverId).removeWorkspace(workspaceId);
+  }
+
+  private requireDirectory(serverId: string): DirectorySync {
+    const directory = this.directorySyncByServer.get(serverId);
+    if (!directory) throw new Error(`Unknown host runtime for serverId ${serverId}`);
+    return directory;
+  }
+
   getSnapshot(serverId: string): HostRuntimeSnapshot | null {
     return this.controllers.get(serverId)?.getSnapshot() ?? null;
   }
@@ -2268,12 +2552,23 @@ export class HostRuntimeStore {
     return earliestServerId;
   }
 
-  ensureConnectedAll(): void {
+  ensureConnectedAll(options?: { verify?: boolean }): void {
     for (const controller of this.controllers.values()) {
-      controller.ensureConnected();
+      controller.ensureConnected(options);
     }
   }
 
+  setAppVisible(visible: boolean): void {
+    // Keep normal reconnect backoff running while hidden, for as long as the OS
+    // lets us execute. Foregrounding bypasses that backoff without closing healthy sockets.
+    if (!visible) {
+      void this.replicaCache.flush();
+      return;
+    }
+
+    this.ensureConnectedAll({ verify: true });
+  }
+
   runProbeCycleNow(serverId?: string): Promise<void> {
     if (serverId) {
       return this.controllers.get(serverId)?.runProbeCycleNow() ?? Promise.resolve();
@@ -2329,14 +2624,20 @@ export class HostRuntimeStore {
     await replica.prepare(agentId);
   }
 
-  fetchAgentTimeline(
+  async fetchAgentTimeline(
     serverId: string,
     agentId: string,
     request: Parameters<DaemonClient["fetchAgentTimeline"]>[1],
   ): Promise<Awaited<ReturnType<DaemonClient["fetchAgentTimeline"]>>> {
     const directory = this.directorySyncByServer.get(serverId);
     if (!directory) throw new Error(`Unknown host runtime for serverId ${serverId}`);
-    return directory.fetchTimeline(agentId, request);
+    const owner = useSessionStore.getState().sessions[serverId]?.viewedTimelineSync;
+    const page = await directory.fetchTimeline(agentId, request);
+    if (owner && useSessionStore.getState().sessions[serverId]?.viewedTimelineSync === owner) {
+      owner.flushStreamAgent(agentId);
+      owner.applyTimelineResponse(page);
+    }
+    return page;
   }
 
   createViewedTimelineOwner(
@@ -2437,21 +2738,22 @@ export function useHostRuntimeConnectionStatuses(
   serverIds: readonly string[],
 ): ReadonlyMap<string, HostRuntimeConnectionStatus> {
   const store = getHostRuntimeStore();
-  const version = useSyncExternalStore(
+  // The snapshot is the statuses themselves, joined into a string so React compares by
+  // value. A version counter read only for reactivity is dropped by the React Compiler.
+  const readStatuses = () =>
+    serverIds
+      .map((serverId) => store.getSnapshot(serverId)?.connectionStatus ?? "connecting")
+      .join("\n");
+  const statuses = useSyncExternalStore(
     (onStoreChange) => store.subscribeAll(onStoreChange),
-    () => store.getVersion(),
-    () => store.getVersion(),
+    readStatuses,
+    readStatuses,
   );
 
   return useMemo(() => {
-    // The aggregate version is the reactivity trigger; re-read snapshots on every host tick.
-    void version;
-    const entries: Array<[string, HostRuntimeConnectionStatus]> = serverIds.map((serverId) => [
-      serverId,
-      store.getSnapshot(serverId)?.connectionStatus ?? "connecting",
-    ]);
-    return new Map(entries);
-  }, [serverIds, store, version]);
+    const values = statuses.split("\n") as HostRuntimeConnectionStatus[];
+    return new Map(serverIds.map((serverId, index) => [serverId, values[index]]));
+  }, [serverIds, statuses]);
 }
 
 export function useHostRuntimeLastError(serverId: string): string | null {
@@ -2510,6 +2812,29 @@ export function useHostRegistryLoaded(): boolean {
   );
 }
 
+export function useHostConfirmation(): {
+  pending: HostConfirmationRequest | null;
+  answer: (approved: boolean) => void;
+} {
+  const store = getHostRuntimeStore();
+  const pending = useSyncExternalStore(
+    (onStoreChange) => store.subscribeHostConfirmation(onStoreChange),
+    () => store.getPendingHostConfirmation(),
+    () => store.getPendingHostConfirmation(),
+  );
+  // The answer is bound to the request this render shows, so a tap never
+  // answers a request that replaced it.
+  return useMemo(
+    () => ({
+      pending,
+      answer: (approved: boolean) => {
+        if (pending) store.answerHostConfirmation(pending.id, approved);
+      },
+    }),
+    [pending, store],
+  );
+}
+
 export interface HostMutations {
   upsertDirectConnection: (input: {
     serverId: string;
@@ -2528,20 +2853,10 @@ export interface HostMutations {
     host: string;
     sshPort?: number;
     daemonPort?: number;
+    password?: string;
     label?: string;
   }) => Promise<{ profile: HostProfile; serverId: string; hostname: string | null }>;
-  upsertRelayConnection: (input: {
-    serverId: string;
-    relayEndpoint: string;
-    useTls?: boolean;
-    daemonPublicKeyB64: string;
-    label?: string;
-  }) => Promise<HostProfile>;
-  upsertConnectionFromOffer: (offer: ConnectionOffer, label?: string) => Promise<HostProfile>;
-  upsertConnectionFromOfferUrl: (
-    offerUrlOrFragment: string,
-    label?: string,
-  ) => Promise<HostProfile>;
+  beginLinkPairing: () => LinkPairing;
   renameHost: (serverId: string, label: string) => Promise<void>;
   setHostColor: (serverId: string, color: HostColor) => Promise<void>;
   setHostBadgeDisplay: (serverId: string, badgeDisplay: HostBadgeDisplay) => Promise<void>;
@@ -2556,9 +2871,7 @@ export function useHostMutations(): HostMutations {
       upsertDirectConnection: (input) => store.upsertDirectConnection(input),
       probeAndUpsertDirectConnection: (input) => store.probeAndUpsertDirectConnection(input),
       probeAndUpsertRemoteSshConnection: (input) => store.probeAndUpsertRemoteSshConnection(input),
-      upsertRelayConnection: (input) => store.upsertRelayConnection(input),
-      upsertConnectionFromOffer: (offer, label) => store.upsertConnectionFromOffer(offer, label),
-      upsertConnectionFromOfferUrl: (url, label) => store.upsertConnectionFromOfferUrl(url, label),
+      beginLinkPairing: () => store.beginLinkPairing(),
       renameHost: (serverId, label) => store.renameHost(serverId, label),
       setHostColor: (serverId, color) => store.setHostColor(serverId, color),
       setHostBadgeDisplay: (serverId, badgeDisplay) =>
diff --git a/packages/app/src/runtime/replica-cache/index.test.ts b/packages/app/src/runtime/replica-cache/index.test.ts
index 56e4546507..76e9e66464 100644
--- a/packages/app/src/runtime/replica-cache/index.test.ts
+++ b/packages/app/src/runtime/replica-cache/index.test.ts
@@ -7,7 +7,8 @@ import {
 } from "@/stores/session-store";
 import type { StreamItem } from "@/types/stream";
 import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
-import { ReplicaCache, type DirectoryCheckpoint } from ".";
+import { ReplicaCache } from ".";
+import type { DirectoryCheckpoint } from "@/runtime/replica-cache";
 import type { ReplicaHostRows, ReplicaRow, ReplicaRowChanges, ReplicaRowStore } from "./row-store";
 
 const SERVER_ID = "cached-host";
@@ -31,8 +32,11 @@ class MemoryStorage implements ReplicaRowStore {
   writes = 0;
   cleanups = 0;
   nextWriteFailure: Error | null = null;
+  persistentWriteFailure: Error | null = null;
   readGate: Promise<void> | null = null;
   onRead: (() => void) | null = null;
+  /** Throws once a read goes past this count, so a non-terminating read loop fails the test. */
+  readLimit: number | null = null;
 
   private key(row: Pick<ReplicaRow, "serverId" | "kind" | "id">): string {
     return `${row.serverId}:${row.kind}:${row.id}`;
@@ -46,6 +50,11 @@ class MemoryStorage implements ReplicaRowStore {
     ids?: readonly string[],
   ): Promise<ReplicaRow[]> {
     this.reads.push({ serverId, kinds, ...(ids ? { ids } : {}) });
+    if (this.readLimit !== null && this.reads.length > this.readLimit) {
+      throw new Error(
+        `replica cache read ${this.reads.length} passed the limit of ${this.readLimit}`,
+      );
+    }
     this.onRead?.();
     await this.readGate;
     const acceptedKinds = new Set(kinds);
@@ -70,6 +79,7 @@ class MemoryStorage implements ReplicaRowStore {
 
   async apply(changes: ReplicaRowChanges): Promise<void> {
     this.writes += 1;
+    if (this.persistentWriteFailure) throw this.persistentWriteFailure;
     if (this.nextWriteFailure) {
       const error = this.nextWriteFailure;
       this.nextWriteFailure = null;
@@ -109,6 +119,12 @@ function createCache(storage: MemoryStorage, maxBytes?: number): ReplicaCache {
   return cache;
 }
 
+function requireTimelineRow(storage: MemoryStorage): ReplicaRow {
+  const row = [...storage.rows.values()].find((candidate) => candidate.kind === "timeline");
+  if (!row) throw new Error("timeline row was not written");
+  return row;
+}
+
 function agent(id = "agent-1"): Agent {
   return {
     ...normalizeAgentSnapshot(
@@ -200,7 +216,81 @@ function timeline(text = "Cached") {
   };
 }
 
+function commitDirectory(
+  cache: ReplicaCache,
+  serverId: string,
+  value: ReturnType<typeof directory>,
+): void {
+  cache.commitDirectoryMutations(
+    serverId,
+    [
+      ...Array.from(value.agents.values(), (cachedAgent) => ({
+        kind: "agent" as const,
+        type: "upsert" as const,
+        id: cachedAgent.id,
+        value: cachedAgent,
+      })),
+      ...Array.from(value.workspaces.values(), (workspace) => ({
+        kind: "workspace" as const,
+        type: "upsert" as const,
+        id: workspace.id,
+        value: workspace,
+      })),
+      ...Array.from(value.projects.values(), (project) => ({
+        kind: "project" as const,
+        type: "upsert" as const,
+        id: project.projectId,
+        value: project,
+      })),
+    ],
+    value.checkpoint,
+  );
+}
+
+function deleteDirectory(cache: ReplicaCache, serverId: string): void {
+  cache.commitDirectoryMutations(serverId, [
+    { kind: "agent", type: "delete", id: "agent-1" },
+    { kind: "workspace", type: "delete", id: "workspace-1" },
+    { kind: "project", type: "delete", id: "project-1" },
+  ]);
+}
+
 describe("ReplicaCache", () => {
+  it("rejects pre-baseline-fix checkpoints without discarding cached rows or timelines", async () => {
+    const storage = new MemoryStorage();
+    const writer = createCache(storage);
+    const baseline = directory();
+    writer.replaceDirectoryBaseline(SERVER_ID, baseline);
+    writer.commitTimeline(SERVER_ID, "agent-1", timeline());
+    await writer.flush();
+    await storage.apply({
+      deletes: [],
+      upserts: [
+        {
+          serverId: SERVER_ID,
+          kind: "checkpoint",
+          id: "singleton",
+          payload: JSON.stringify(baseline.checkpoint),
+        },
+      ],
+    });
+
+    const reader = createCache(storage);
+    const restored = await reader.readDirectory(SERVER_ID);
+    expect(restored.checkpoint).toBeUndefined();
+    expect([...restored.workspaces.keys()]).toEqual([...baseline.workspaces.keys()]);
+    expect([...restored.projects.keys()]).toEqual([...baseline.projects.keys()]);
+    expect([...restored.agents.keys()]).toEqual([...baseline.agents.keys()]);
+    expect(await reader.readTimeline(SERVER_ID, "agent-1")).toEqual(timeline());
+    expect(await storage.read(SERVER_ID, ["checkpoint"])).toEqual([]);
+
+    reader.replaceDirectoryBaseline(SERVER_ID, baseline);
+    await reader.flush();
+    expect((await createCache(storage).readDirectory(SERVER_ID)).checkpoint).toEqual(
+      baseline.checkpoint,
+    );
+  });
+
   it("does nothing until an owner explicitly commits data", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
@@ -214,7 +304,7 @@ describe("ReplicaCache", () => {
   it("round-trips explicit directory and timeline commits", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
-    writer.commitDirectory(SERVER_ID, directory());
+    commitDirectory(writer, SERVER_ID, directory());
     writer.commitTimeline(SERVER_ID, "agent-1", timeline());
     await writer.flush();
 
@@ -229,17 +319,145 @@ describe("ReplicaCache", () => {
     expect(restoredTimeline).toEqual(timeline());
   });
 
+  it("preserves pending timeline updates across directory baseline replacement", async () => {
+    const storage = new MemoryStorage();
+    const writer = createCache(storage);
+    writer.commitTimeline(SERVER_ID, "agent-1", timeline("Latest visible reply"));
+    writer.replaceDirectoryBaseline(SERVER_ID, directory());
+    await writer.flush();
+
+    const reader = createCache(storage);
+    expect(await reader.readTimeline(SERVER_ID, "agent-1")).toEqual(
+      timeline("Latest visible reply"),
+    );
+  });
+
+  it("preserves clearing a timeline across directory baseline replacement", async () => {
+    const storage = new MemoryStorage();
+    const writer = createCache(storage);
+    writer.commitTimeline(SERVER_ID, "agent-1", timeline());
+    await writer.flush();
+    writer.commitTimeline(SERVER_ID, "agent-1", { ...timeline(), items: [], range: null });
+    writer.replaceDirectoryBaseline(SERVER_ID, directory());
+    await writer.flush();
+
+    const reader = createCache(storage);
+    expect(await reader.readTimeline(SERVER_ID, "agent-1")).toEqual({
+      ...timeline(),
+      items: [],
+      range: null,
+      hasOlder: false,
+    });
+  });
+
+  it("serializes and writes only keyed directory mutations", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    const changed = agent("changed-agent");
+    let titleReads = 0;
+    Object.defineProperty(changed, "title", {
+      configurable: true,
+      enumerable: true,
+      get: () => {
+        titleReads += 1;
+        return "Changed agent";
+      },
+    });
+
+    cache.commitDirectoryMutations(
+      SERVER_ID,
+      [{ kind: "agent", type: "upsert", id: changed.id, value: changed }],
+      { agents: { generation: "g", afterSeq: 13 } },
+    );
+
+    expect(titleReads).toBe(0);
+    await cache.flush();
+    expect(titleReads).toBe(1);
+    expect(storage.changes).toHaveLength(1);
+    expect(storage.changes[0]?.upserts.map(({ kind, id }) => ({ kind, id }))).toEqual([
+      { kind: "agent", id: "changed-agent" },
+      { kind: "checkpoint", id: "singleton" },
+    ]);
+    expect(storage.changes[0]?.deletes).toEqual([]);
+  });
+
+  it("round-trips identified and anonymous open turns without changing protocol status", async () => {
+    const storage = new MemoryStorage();
+    const writer = createCache(storage);
+    const identified = agent("identified");
+    identified.turn = {
+      phase: "open",
+      turnId: "turn-1",
+      startedAt: new Date("2026-08-31T12:00:00.000Z"),
+      cancellationRequestId: null,
+    };
+    const anonymous = agent("anonymous");
+    anonymous.turn = {
+      phase: "open",
+      turnId: null,
+      startedAt: null,
+      cancellationRequestId: null,
+    };
+    writer.commitDirectoryMutations(SERVER_ID, [
+      { kind: "agent", type: "upsert", id: identified.id, value: identified },
+      { kind: "agent", type: "upsert", id: anonymous.id, value: anonymous },
+    ]);
+    await writer.flush();
+
+    const restored = await createCache(storage).readDirectory(SERVER_ID);
+
+    expect(restored.agents.get("identified")).toMatchObject({
+      status: "idle",
+      turn: {
+        phase: "open",
+        turnId: "turn-1",
+        startedAt: new Date("2026-08-31T12:00:00.000Z"),
+        cancellationRequestId: null,
+      },
+    });
+    expect(restored.agents.get("anonymous")).toMatchObject({
+      status: "idle",
+      turn: {
+        phase: "open",
+        turnId: null,
+        startedAt: null,
+        cancellationRequestId: null,
+      },
+    });
+  });
+
+  it("coalesces timeline values before serialization", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    let textReads = 0;
+    const changedTimeline = timeline();
+    Object.defineProperty(changedTimeline.items[0], "text", {
+      configurable: true,
+      enumerable: true,
+      get: () => {
+        textReads += 1;
+        return "Latest";
+      },
+    });
+
+    cache.commitTimeline(SERVER_ID, "agent-1", timeline("Old"));
+    cache.commitTimeline(SERVER_ID, "agent-1", changedTimeline);
+
+    expect(textReads).toBe(0);
+    await cache.flush();
+    expect(textReads).toBe(1);
+    expect(storage.changes[0]?.upserts.map(({ kind, id }) => ({ kind, id }))).toEqual([
+      { kind: "timeline", id: "agent-1" },
+    ]);
+  });
+
   it("never reads directory rows older than an accepted deferred deletion", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
-    cache.commitDirectory(SERVER_ID, directory());
+    commitDirectory(cache, SERVER_ID, directory());
     await cache.flush();
 
-    cache.commitDirectory(SERVER_ID, {
-      agents: new Map(),
-      workspaces: new Map(),
-      projects: new Map(),
-    });
+    deleteDirectory(cache, SERVER_ID);
 
     expect(await cache.readAgent(SERVER_ID, "agent-1")).toBeUndefined();
     expect(await cache.readWorkspace(SERVER_ID, "workspace-1")).toBeUndefined();
@@ -249,23 +467,47 @@ describe("ReplicaCache", () => {
   it("fails closed when an accepted deletion cannot be persisted before a read", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
-    cache.commitDirectory(SERVER_ID, directory());
+    commitDirectory(cache, SERVER_ID, directory());
     await cache.flush();
     storage.nextWriteFailure = new Error("disk busy");
 
-    cache.commitDirectory(SERVER_ID, {
-      agents: new Map(),
-      workspaces: new Map(),
-      projects: new Map(),
-    });
+    deleteDirectory(cache, SERVER_ID);
 
     expect(await cache.readWorkspace(SERVER_ID, "workspace-1")).toBeUndefined();
   });
 
+  it("gives up a read instead of retrying while the store keeps rejecting writes", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    commitDirectory(cache, SERVER_ID, directory());
+    await cache.flush();
+    storage.persistentWriteFailure = new Error("QuotaExceededError");
+    storage.reads.length = 0;
+    storage.readLimit = 5;
+
+    deleteDirectory(cache, SERVER_ID);
+
+    expect(await cache.readWorkspace(SERVER_ID, "workspace-1")).toBeUndefined();
+    expect(storage.reads.length).toBeLessThanOrEqual(1);
+  });
+
+  it("still reads a host whose rows are stored when another host's write is rejected", async () => {
+    const storage = new MemoryStorage();
+    const cache = new ReplicaCache(storage, noLegacyCleanup);
+    cache.setHosts([SERVER_ID, "other-host"]);
+    commitDirectory(cache, SERVER_ID, directory());
+    await cache.flush();
+    storage.persistentWriteFailure = new Error("QuotaExceededError");
+
+    commitDirectory(cache, "other-host", directory());
+
+    expect((await cache.readWorkspace(SERVER_ID, "workspace-1"))?.workspace.id).toBe("workspace-1");
+  });
+
   it("discards a durable read when the host changes while it is in flight", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
-    cache.commitDirectory(SERVER_ID, directory());
+    commitDirectory(cache, SERVER_ID, directory());
     await cache.flush();
     const started = deferred();
     const release = deferred();
@@ -274,11 +516,7 @@ describe("ReplicaCache", () => {
 
     const reading = cache.readAgent(SERVER_ID, "agent-1");
     await started.promise;
-    cache.commitDirectory(SERVER_ID, {
-      agents: new Map(),
-      workspaces: new Map(),
-      projects: new Map(),
-    });
+    deleteDirectory(cache, SERVER_ID);
     release.resolve();
 
     expect(await reading).toBeUndefined();
@@ -341,8 +579,7 @@ describe("ReplicaCache", () => {
       hasOlder: true,
     });
     await writer.flush();
-    const row = [...storage.rows.values()].find((candidate) => candidate.kind === "timeline");
-    if (!row) throw new Error("timeline row was not written");
+    const row = requireTimelineRow(storage);
     const payload = JSON.parse(row.payload) as { items: Array<Record<string, unknown>> };
     delete payload.items[0]?.pluginItemId;
     storage.rows.set(`${row.serverId}:${row.kind}:${row.id}`, {
@@ -353,10 +590,26 @@ describe("ReplicaCache", () => {
     expect(await createCache(storage).readTimeline(SERVER_ID, "agent-1")).toBeUndefined();
   });
 
+  it("refetches old cached Markdown fragments instead of offering them as whole messages", async () => {
+    const storage = new MemoryStorage();
+    const writer = createCache(storage);
+    writer.commitTimeline(SERVER_ID, "agent-1", timeline());
+    await writer.flush();
+    const row = requireTimelineRow(storage);
+    const payload = JSON.parse(row.payload) as { items: Array<Record<string, unknown>> };
+    Object.assign(payload.items[0]!, { blockGroupId: "message-1", blockIndex: 0 });
+    storage.rows.set(`${row.serverId}:${row.kind}:${row.id}`, {
+      ...row,
+      payload: JSON.stringify(payload),
+    });
+
+    expect(await createCache(storage).readTimeline(SERVER_ID, "agent-1")).toBeUndefined();
+  });
+
   it("reads one requested agent and the focused timeline without scanning directory rows", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
-    writer.commitDirectory(SERVER_ID, directory());
+    commitDirectory(writer, SERVER_ID, directory());
     writer.commitTimeline(SERVER_ID, "agent-1", timeline());
     await writer.flush();
 
@@ -372,7 +625,7 @@ describe("ReplicaCache", () => {
   it("reads one requested workspace and its project without scanning the directory", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
-    writer.commitDirectory(SERVER_ID, directory());
+    commitDirectory(writer, SERVER_ID, directory());
     await writer.flush();
 
     const reader = createCache(storage);
@@ -422,9 +675,9 @@ describe("ReplicaCache", () => {
     const storage = new MemoryStorage();
     const writer = new ReplicaCache(storage, noLegacyCleanup);
     writer.setHosts([SERVER_ID, otherServerId]);
-    writer.commitDirectory(SERVER_ID, directory());
+    commitDirectory(writer, SERVER_ID, directory());
     writer.commitTimeline(SERVER_ID, "agent-1", timeline());
-    writer.commitDirectory(otherServerId, directory());
+    commitDirectory(writer, otherServerId, directory());
     await writer.flush();
     storage.rows.set(`${SERVER_ID}:agent:agent-1`, {
       serverId: SERVER_ID,
@@ -438,7 +691,7 @@ describe("ReplicaCache", () => {
     );
     const cache = new ReplicaCache(storage, { ...noLegacyCleanup, maxBytes: initialBytes + 100 });
     cache.setHosts([SERVER_ID, otherServerId]);
-    cache.commitDirectory(otherServerId, directory());
+    commitDirectory(cache, otherServerId, directory());
     await cache.flush();
 
     expect(await cache.readAgent(SERVER_ID, "agent-1")).toBeUndefined();
@@ -451,7 +704,8 @@ describe("ReplicaCache", () => {
   it("atomically removes a targeted corrupt row and its matching persisted cursor", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
-    writer.commitDirectory(
+    commitDirectory(
+      writer,
       SERVER_ID,
       directory({
         agents: { generation: "g", afterSeq: 12 },
@@ -480,7 +734,8 @@ describe("ReplicaCache", () => {
   it("drops only the cursor whose cached entity baseline is corrupt", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
-    writer.commitDirectory(
+    commitDirectory(
+      writer,
       SERVER_ID,
       directory({
         agents: { generation: "g", afterSeq: 12 },
@@ -514,7 +769,7 @@ describe("ReplicaCache", () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
 
-    cache.commitDirectory(SERVER_ID, directory());
+    commitDirectory(cache, SERVER_ID, directory());
     await cache.flush();
 
     expect(storage.changes).toHaveLength(1);
@@ -548,7 +803,7 @@ describe("ReplicaCache", () => {
     await cache.flush();
     storage.onRead = () => {
       storage.onRead = null;
-      cache.commitDirectory(SERVER_ID, directory());
+      commitDirectory(cache, SERVER_ID, directory());
     };
 
     expect((await cache.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([
@@ -561,13 +816,23 @@ describe("ReplicaCache", () => {
     const cache = new ReplicaCache(storage, { ...noLegacyCleanup, maxBytes: 2_500 });
     cache.setHosts([SERVER_ID, "other-host"]);
     const cachedDirectory = directory();
-    cache.commitDirectory(SERVER_ID, cachedDirectory);
+    commitDirectory(cache, SERVER_ID, cachedDirectory);
     await cache.flush();
-    cache.commitDirectory("other-host", cachedDirectory);
+    commitDirectory(cache, "other-host", cachedDirectory);
     await cache.flush();
     expect([...storage.rows.values()].some((row) => row.serverId === SERVER_ID)).toBe(false);
 
-    cache.commitDirectory(SERVER_ID, cachedDirectory);
+    cache.commitDirectoryMutations(
+      SERVER_ID,
+      [{ kind: "agent", type: "upsert", id: "agent-1", value: agent() }],
+      { agents: { generation: "new-generation", afterSeq: 99 } },
+    );
+    await cache.flush();
+
+    expect([...storage.rows.values()].some((row) => row.serverId === SERVER_ID)).toBe(false);
+    expect((await cache.readDirectory(SERVER_ID)).checkpoint).toBeUndefined();
+
+    cache.replaceDirectoryBaseline(SERVER_ID, cachedDirectory);
     await cache.flush();
 
     expect(
@@ -588,9 +853,42 @@ describe("ReplicaCache", () => {
     cache.setHosts([SERVER_ID]);
 
     await cache.readAgent(SERVER_ID, "missing");
-    cache.commitDirectory(SERVER_ID, directory());
+    commitDirectory(cache, SERVER_ID, directory());
     await cache.flush();
 
     expect(storage.cleanups).toBe(1);
   });
 });
+
+it("retains semantic agent messages across disk-cache reconstruction", async () => {
+  const storage = new MemoryStorage();
+  const writer = createCache(storage);
+  const value = timeline();
+  value.items = [
+    {
+      kind: "tool_call",
+      id: "delivery",
+      timestamp: new Date(1),
+      timelineCursor: { epoch: "epoch-1", seq: 12 },
+      payload: {
+        source: "agent",
+        data: {
+          provider: "codex",
+          callId: "delivery",
+          name: "agent_message",
+          status: "completed",
+          error: null,
+          detail: { type: "plain_text", text: "Done" },
+          agentMessage: {
+            event: "finished",
+            sender: { id: "remote::worker", title: "Reviewer" },
+            text: "Done",
+          },
+        },
+      },
+    },
+  ];
+  writer.commitTimeline(SERVER_ID, "agent-1", value);
+  await writer.flush();
+  expect(await createCache(storage).readTimeline(SERVER_ID, "agent-1")).toEqual(value);
+});
diff --git a/packages/app/src/runtime/replica-cache/index.ts b/packages/app/src/runtime/replica-cache/index.ts
index 8029a2506b..3fc8458551 100644
--- a/packages/app/src/runtime/replica-cache/index.ts
+++ b/packages/app/src/runtime/replica-cache/index.ts
@@ -30,7 +30,45 @@ import {
   type ReplicaRowStore,
 } from "./row-store";
 
-const PERSIST_DELAY_MS = 5_000;
+export type DirectoryReplicaMutation =
+  | { kind: "agent"; type: "upsert"; id: string; value: Agent }
+  | { kind: "agent"; type: "delete"; id: string }
+  | { kind: "workspace"; type: "upsert"; id: string; value: WorkspaceDescriptor }
+  | { kind: "workspace"; type: "delete"; id: string }
+  | { kind: "project"; type: "upsert"; id: string; value: ProjectDescriptor }
+  | { kind: "project"; type: "delete"; id: string };
+
+export interface CachedDirectory {
+  agents: Map<string, Agent>;
+  workspaces: Map<string, WorkspaceDescriptor>;
+  projects: Map<string, ProjectDescriptor>;
+  checkpoint?: DirectoryCheckpoint;
+}
+
+export interface CachedWorkspace {
+  workspace: WorkspaceDescriptor;
+  project?: ProjectDescriptor;
+}
+
+export interface DirectoryCursor {
+  generation: string;
+  afterSeq: number;
+}
+
+export interface DirectoryCheckpoint {
+  projects?: DirectoryCursor;
+  workspaces?: DirectoryCursor;
+  agents?: DirectoryCursor;
+}
+
+export interface CachedTimeline {
+  agentId: string;
+  items: StreamItem[];
+  range: AgentTimelineCursorState | null;
+  hasOlder: boolean;
+}
+
+const PERSIST_DELAY_MS = 1_000;
 const MAX_TIMELINE_ITEMS = 50;
 const MAX_CACHE_BYTES = 32 * 1024 * 1024;
 const IsoDateSchema = z.iso.datetime();
@@ -86,8 +124,7 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
     kind: z.literal("assistant_message"),
     messageId: z.string().optional(),
     text: z.string(),
-    blockGroupId: z.string().optional(),
-    blockIndex: z.number().int().nonnegative().optional(),
+    // Reject old caches containing display fragments; refetch the complete source text.
   }),
   z.strictObject({
     ...TimelineItemBaseShape,
@@ -104,8 +141,9 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
   }),
   z.strictObject({
     ...TimelineItemBaseShape,
-    kind: z.literal("activity_log"),
-    activityType: z.enum(["system", "info", "success", "error"]),
+    kind: z.literal("notification"),
+    sourceType: z.enum(["error", "notification"]),
+    level: z.enum(["info", "warning", "error"]),
     message: z.string(),
   }),
   z.strictObject({
@@ -216,6 +254,16 @@ const StoredAgentSnapshotSchema = z.strictObject({
 
 const StoredAgentSchema = z.strictObject({
   snapshot: StoredAgentSnapshotSchema,
+  turn: z
+    .discriminatedUnion("phase", [
+      z.strictObject({ phase: z.literal("idle") }),
+      z.strictObject({
+        phase: z.literal("open"),
+        turnId: z.string().nullable(),
+        startedAt: IsoDateSchema.nullable(),
+      }),
+    ])
+    .optional(),
   projectPlacement: StoredProjectPlacementSchema.nullable(),
   lastActivityAt: IsoDateSchema,
 });
@@ -312,28 +360,12 @@ interface ReplicaCacheOptions {
   clearLegacyCache?: () => Promise<void>;
 }
 
-export interface CachedDirectory {
-  agents: Map<string, Agent>;
-  workspaces: Map<string, WorkspaceDescriptor>;
-  projects: Map<string, ProjectDescriptor>;
-  checkpoint?: DirectoryCheckpoint;
-}
-
-export interface CachedWorkspace {
-  workspace: WorkspaceDescriptor;
-  project?: ProjectDescriptor;
-}
-
-export interface DirectoryCursor {
-  generation: string;
-  afterSeq: number;
-}
-
-export interface DirectoryCheckpoint {
-  projects?: DirectoryCursor;
-  workspaces?: DirectoryCursor;
-  agents?: DirectoryCursor;
-}
+type StructuredReplicaUpsert =
+  | { serverId: string; kind: "agent"; id: string; value: Agent }
+  | { serverId: string; kind: "workspace"; id: string; value: WorkspaceDescriptor }
+  | { serverId: string; kind: "project"; id: string; value: ProjectDescriptor }
+  | { serverId: string; kind: "timeline"; id: string; value: CachedTimeline }
+  | { serverId: string; kind: "checkpoint"; id: string; value: DirectoryCheckpoint };
 
 const DirectoryCursorSchema = z.strictObject({
   generation: z.string(),
@@ -346,11 +378,19 @@ const DirectoryCheckpointSchema = z.strictObject({
   agents: DirectoryCursorSchema.optional(),
 });
 
-export interface CachedTimeline {
-  agentId: string;
-  items: StreamItem[];
-  range: AgentTimelineCursorState | null;
-  hasOlder: boolean;
+// Old checkpoints could describe a baseline that an overlapping refresh had discarded.
+// Revalidate directory contents once without evicting cached rows or timelines.
+const StoredDirectoryCheckpointSchema = z.strictObject({
+  version: z.literal(1),
+  cursors: DirectoryCheckpointSchema,
+});
+
+function serializeDirectoryCheckpoint(cursors: DirectoryCheckpoint) {
+  return { version: 1 as const, cursors };
+}
+
+function deserializeDirectoryCheckpoint(payload: string): DirectoryCheckpoint {
+  return parseStoredPayload(StoredDirectoryCheckpointSchema, payload).cursors;
 }
 
 function deserializeTimeline(stored: StoredTimeline | null): CachedTimeline | null {
@@ -381,6 +421,7 @@ function serializeAgentToolCall(data: AgentToolCallData): StoredToolCall {
     name: data.name,
     detail: data.detail,
     ...(data.metadata ? { metadata: data.metadata } : {}),
+    ...(data.agentMessage ? { agentMessage: data.agentMessage } : {}),
   };
   switch (data.status) {
     case "running":
@@ -409,8 +450,6 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
         kind: item.kind,
         ...(item.messageId ? { messageId: item.messageId } : {}),
         text: item.text,
-        ...(item.blockGroupId ? { blockGroupId: item.blockGroupId } : {}),
-        ...(item.blockIndex !== undefined ? { blockIndex: item.blockIndex } : {}),
       };
     case "thought":
       return { ...base, kind: item.kind, text: item.text, status: item.status };
@@ -422,11 +461,12 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
         items: item.items,
         activity: item.activity,
       };
-    case "activity_log":
+    case "notification":
       return {
         ...base,
         kind: item.kind,
-        activityType: item.activityType,
+        sourceType: item.sourceType,
+        level: item.level,
         message: item.message,
       };
     case "compaction":
@@ -500,8 +540,6 @@ function deserializeBuiltinTimelineItem(
         kind: item.kind,
         ...(item.messageId ? { messageId: item.messageId } : {}),
         text: item.text,
-        ...(item.blockGroupId ? { blockGroupId: item.blockGroupId } : {}),
-        ...(item.blockIndex !== undefined ? { blockIndex: item.blockIndex } : {}),
       };
     case "thought":
       return { ...base, kind: item.kind, text: item.text, status: item.status };
@@ -513,11 +551,12 @@ function deserializeBuiltinTimelineItem(
         items: item.items,
         activity: item.activity,
       };
-    case "activity_log":
+    case "notification":
       return {
         ...base,
         kind: item.kind,
-        activityType: item.activityType,
+        sourceType: item.sourceType,
+        level: item.level,
         message: item.message,
       };
     case "compaction":
@@ -546,6 +585,7 @@ function deserializeBuiltinTimelineItem(
             error: tool.error,
             detail: tool.detail,
             ...(tool.metadata ? { metadata: tool.metadata } : {}),
+            ...(tool.agentMessage ? { agentMessage: tool.agentMessage } : {}),
           },
         },
       };
@@ -557,6 +597,15 @@ function serializeProjectPlacement(agent: Agent): StoredAgent["projectPlacement"
   return agent.projectPlacement ?? null;
 }
 
+function serializeAgentTurn(agent: Agent): NonNullable<StoredAgent["turn"]> {
+  if (agent.turn.phase === "idle") return { phase: "idle" };
+  return {
+    phase: "open",
+    turnId: agent.turn.turnId,
+    startedAt: agent.turn.startedAt?.toISOString() ?? null,
+  };
+}
+
 function serializeAgent(agent: Agent): StoredAgent {
   const snapshot = {
     id: agent.id,
@@ -569,11 +618,11 @@ function serializeAgent(agent: Agent): StoredAgent {
     updatedAt: agent.updatedAt.toISOString(),
     lastUserMessageAt: agent.lastUserMessageAt?.toISOString() ?? null,
     status: agent.status,
-    ...(agent.activeTurn?.turnId
+    ...(agent.turn.phase === "open" && agent.turn.turnId
       ? {
           activeTurn: {
-            turnId: agent.activeTurn.turnId,
-            startedAt: agent.activeTurn.startedAt?.toISOString() ?? null,
+            turnId: agent.turn.turnId,
+            startedAt: agent.turn.startedAt?.toISOString() ?? null,
           },
         }
       : {}),
@@ -611,14 +660,27 @@ function serializeAgent(agent: Agent): StoredAgent {
   };
   return {
     snapshot,
+    turn: serializeAgentTurn(agent),
     projectPlacement: serializeProjectPlacement(agent),
     lastActivityAt: agent.lastActivityAt.toISOString(),
   };
 }
 
 function deserializeAgent(serverId: string, stored: StoredAgent): Agent {
+  const normalized = normalizeAgentSnapshot(stored.snapshot, serverId);
+  let turn = normalized.turn;
+  if (stored.turn?.phase === "idle") turn = { phase: "idle", cancellationRequestId: null };
+  if (stored.turn?.phase === "open") {
+    turn = {
+      phase: "open",
+      turnId: stored.turn.turnId,
+      startedAt: stored.turn.startedAt ? new Date(stored.turn.startedAt) : null,
+      cancellationRequestId: null,
+    };
+  }
   return {
-    ...normalizeAgentSnapshot(stored.snapshot, serverId),
+    ...normalized,
+    turn,
     lastActivityAt: new Date(stored.lastActivityAt),
     projectPlacement: stored.projectPlacement,
   };
@@ -681,8 +743,6 @@ function isTimelineItemStoredLosslessly(item: StreamItem): boolean {
   switch (item.kind) {
     case "user_message":
       return (item.images?.length ?? 0) === 0 && (item.attachments?.length ?? 0) === 0;
-    case "activity_log":
-      return item.metadata === undefined;
     case "tool_call":
       return item.payload.source === "agent";
     default:
@@ -772,8 +832,10 @@ interface DirectoryReadAccumulator {
   checkpoint?: DirectoryCheckpoint;
 }
 
-interface PendingReplicaChanges extends ReplicaRowChanges {
-  directoryReplacements: Map<string, Set<string>>;
+interface PendingReplicaChanges {
+  upserts: StructuredReplicaUpsert[];
+  deletes: ReplicaRowKey[];
+  baselines: Set<string>;
 }
 
 function applyDirectoryRow(
@@ -804,7 +866,7 @@ function applyDirectoryRow(
       if (row.id !== REPLICA_SINGLETON_ROW_ID) {
         throw new Error("Replica checkpoint row id mismatch");
       }
-      result.checkpoint = parseStoredPayload(DirectoryCheckpointSchema, row.payload);
+      result.checkpoint = deserializeDirectoryCheckpoint(row.payload);
       return;
     default:
       return;
@@ -824,9 +886,10 @@ export class ReplicaCache {
   private readonly storedRows = new Map<string, Map<string, ReplicaRow>>();
   private readonly hostBytes = new Map<string, number>();
   private readonly hostWriteOrder = new Map<string, true>();
-  private pendingUpserts = new Map<string, ReplicaRow>();
+  private pendingUpserts = new Map<string, StructuredReplicaUpsert>();
   private pendingDeletes = new Map<string, ReplicaRowKey>();
-  private pendingDirectoryReplacements = new Map<string, Set<string>>();
+  private pendingBaselines = new Set<string>();
+  private readonly invalidatedHosts = new Set<string>();
   private readonly maxBytes: number;
   private totalBytes = 0;
   private persistTimer: ReturnType<typeof setTimeout> | null = null;
@@ -937,7 +1000,11 @@ export class ReplicaCache {
     try {
       await this.prepareStore();
       while (this.activeServerIds.has(serverId)) {
-        await this.flush();
+        // A read may only answer from rows the store already holds, so it waits for this host's
+        // accepted commits to land. A store that rejects them will keep rejecting them: fail closed
+        // rather than re-attempt the write on every pass. A write rejected for another host leaves
+        // this host's stored rows readable.
+        if (!(await this.syncPending()) && this.hasPendingHostChanges(serverId)) return [];
         const revision = this.hostRevisions.get(serverId) ?? 0;
         const rows = await this.rowStore.read(serverId, kinds, ids);
         if (this.canReadHostRevision(serverId, revision)) return rows;
@@ -965,7 +1032,7 @@ export class ReplicaCache {
     let checkpoint: DirectoryCheckpoint | undefined;
     if (checkpointRow) {
       try {
-        checkpoint = parseStoredPayload(DirectoryCheckpointSchema, checkpointRow.payload);
+        checkpoint = deserializeDirectoryCheckpoint(checkpointRow.payload);
         checkpoint = { ...checkpoint };
         delete checkpoint[invalidEntity];
       } catch {
@@ -981,7 +1048,7 @@ export class ReplicaCache {
                 serverId: row.serverId,
                 kind: "checkpoint",
                 id: REPLICA_SINGLETON_ROW_ID,
-                payload: JSON.stringify(checkpoint),
+                payload: JSON.stringify(serializeDirectoryCheckpoint(checkpoint)),
               },
             ]
           : [],
@@ -1007,7 +1074,7 @@ export class ReplicaCache {
                 serverId,
                 kind: "checkpoint",
                 id: REPLICA_SINGLETON_ROW_ID,
-                payload: JSON.stringify(checkpoint),
+                payload: JSON.stringify(serializeDirectoryCheckpoint(checkpoint)),
               },
             ]
           : [],
@@ -1018,39 +1085,65 @@ export class ReplicaCache {
     });
   }
 
-  commitDirectory(
+  commitDirectoryMutations(
     serverId: string,
-    directory: {
-      agents: Map<string, Agent>;
-      workspaces: Map<string, WorkspaceDescriptor>;
-      projects: Map<string, ProjectDescriptor>;
-      checkpoint?: DirectoryCheckpoint;
-    },
+    mutations: readonly DirectoryReplicaMutation[],
+    checkpoint?: DirectoryCheckpoint,
   ): void {
     if (!this.activeServerIds.has(serverId)) return;
+    if (this.invalidatedHosts.has(serverId)) return;
     this.advanceHostRevision(serverId);
-    this.clearPendingDirectoryChanges(serverId);
-    const desiredRows: ReplicaRow[] = [];
-    for (const agent of directory.agents.values()) {
-      desiredRows.push(this.entityRow(serverId, "agent", agent.id, serializeAgent(agent)));
+    for (const mutation of mutations) {
+      if (mutation.type === "delete") {
+        this.queueEntityDelete(serverId, mutation.kind, mutation.id);
+      } else {
+        this.queueUpsert({
+          serverId,
+          kind: mutation.kind,
+          id: mutation.id,
+          value: mutation.value,
+        } as StructuredReplicaUpsert);
+      }
     }
-    for (const workspace of directory.workspaces.values()) {
-      desiredRows.push(
-        this.entityRow(serverId, "workspace", workspace.id, serializeWorkspace(workspace)),
-      );
+    if (checkpoint) {
+      this.queueUpsert({
+        serverId,
+        kind: "checkpoint",
+        id: REPLICA_SINGLETON_ROW_ID,
+        value: checkpoint,
+      });
     }
-    for (const project of directory.projects.values()) {
-      desiredRows.push(
-        this.entityRow(serverId, "project", project.projectId, serializeProject(project)),
-      );
+    this.schedulePersist();
+  }
+
+  replaceDirectoryBaseline(serverId: string, directory: CachedDirectory): void {
+    if (!this.activeServerIds.has(serverId)) return;
+    this.advanceHostRevision(serverId);
+    // Replacing the directory must not discard independently accepted timeline changes.
+    for (const [key, row] of this.pendingUpserts) {
+      if (row.serverId === serverId && row.kind !== "timeline") this.pendingUpserts.delete(key);
+    }
+    for (const [key, row] of this.pendingDeletes) {
+      if (row.serverId === serverId && row.kind !== "timeline") this.pendingDeletes.delete(key);
+    }
+    this.pendingBaselines.add(serverId);
+    for (const [id, value] of directory.agents) {
+      this.queueUpsert({ serverId, kind: "agent", id, value });
+    }
+    for (const [id, value] of directory.workspaces) {
+      this.queueUpsert({ serverId, kind: "workspace", id, value });
+    }
+    for (const [id, value] of directory.projects) {
+      this.queueUpsert({ serverId, kind: "project", id, value });
     }
     if (directory.checkpoint) {
-      desiredRows.push(
-        this.entityRow(serverId, "checkpoint", REPLICA_SINGLETON_ROW_ID, directory.checkpoint),
-      );
+      this.queueUpsert({
+        serverId,
+        kind: "checkpoint",
+        id: REPLICA_SINGLETON_ROW_ID,
+        value: directory.checkpoint,
+      });
     }
-    for (const row of desiredRows) this.queueUpsert(row);
-    this.pendingDirectoryReplacements.set(serverId, new Set(desiredRows.map((row) => rowKey(row))));
     this.schedulePersist();
   }
 
@@ -1058,9 +1151,7 @@ export class ReplicaCache {
     if (!this.activeServerIds.has(serverId)) return;
     if (timeline.agentId !== agentId) throw new Error("Timeline cache key does not match payload");
     this.advanceHostRevision(serverId);
-    const stored = serializeTimeline(timeline);
-    if (stored) this.queueEntityUpsert(serverId, "timeline", agentId, stored);
-    else this.queueEntityDelete(serverId, "timeline", agentId);
+    this.queueUpsert({ serverId, kind: "timeline", id: agentId, value: timeline });
     this.schedulePersist();
   }
 
@@ -1074,6 +1165,7 @@ export class ReplicaCache {
     for (const serverId of removed) {
       this.removeStoredHost(serverId);
       this.dropPendingHostChanges(serverId);
+      this.invalidatedHosts.delete(serverId);
       this.queueOperation(() => this.rowStore.deleteHost(serverId));
     }
   }
@@ -1102,20 +1194,26 @@ export class ReplicaCache {
   }
 
   async flush(): Promise<void> {
-    await this.persist();
+    await this.syncPending();
+  }
+
+  /** Resolves to whether every pending change reached the store. */
+  private async syncPending(): Promise<boolean> {
+    const persisted = await this.persist();
     await this.writeQueue.catch(() => undefined);
+    return persisted;
   }
 
   private async flushPending(): Promise<void> {
     await this.persist();
   }
 
-  private async persist(): Promise<void> {
+  private async persist(): Promise<boolean> {
     if (this.persistTimer) {
       clearTimeout(this.persistTimer);
       this.persistTimer = null;
     }
-    if (!this.hasPendingChanges()) return;
+    if (!this.hasPendingChanges()) return true;
     const write = this.writeQueue
       .catch(() => undefined)
       .then(async () => {
@@ -1123,55 +1221,35 @@ export class ReplicaCache {
         try {
           await this.prepareStore();
           await this.ensureStoredIndex();
-          const changes = this.materializeDirectoryReplacements(pending);
-          const boundedChanges = await this.fitChangesToBudget(changes);
+          const changes = this.materializePendingChanges(pending);
+          const { changes: boundedChanges, evicted } = await this.fitChangesToBudget(changes);
           if (boundedChanges.upserts.length > 0 || boundedChanges.deletes.length > 0) {
             await this.rowStore.apply(boundedChanges);
             this.applyStoredChanges(boundedChanges);
           }
+          for (const serverId of pending.baselines) {
+            if (!evicted.has(serverId)) this.invalidatedHosts.delete(serverId);
+          }
         } catch {
           this.restorePendingChanges(pending);
           if (this.hasPendingChanges()) this.schedulePersist();
+          return false;
         }
-        return undefined;
+        return true;
       });
-    this.writeQueue = write;
-    await write;
-  }
-
-  private queueEntityUpsert(
-    serverId: string,
-    kind: ReplicaRowKind,
-    id: string,
-    value: unknown,
-  ): void {
-    this.queueUpsert(this.entityRow(serverId, kind, id, value));
-  }
-
-  private entityRow(
-    serverId: string,
-    kind: ReplicaRowKind,
-    id: string,
-    value: unknown,
-  ): ReplicaRow {
-    return { serverId, kind, id, payload: JSON.stringify(value) };
-  }
-
-  private clearPendingDirectoryChanges(serverId: string): void {
-    const isDirectoryRow = (row: ReplicaRowKey) => row.kind !== "timeline";
-    for (const [key, row] of this.pendingUpserts) {
-      if (row.serverId === serverId && isDirectoryRow(row)) this.pendingUpserts.delete(key);
-    }
-    for (const [key, row] of this.pendingDeletes) {
-      if (row.serverId === serverId && isDirectoryRow(row)) this.pendingDeletes.delete(key);
-    }
+    // The queue only sequences writes; every consumer decides for itself what a failure means.
+    this.writeQueue = write.then(
+      () => undefined,
+      () => undefined,
+    );
+    return write;
   }
 
   private queueEntityDelete(serverId: string, kind: ReplicaRowKind, id: string): void {
     this.queueDelete({ serverId, kind, id });
   }
 
-  private queueUpsert(row: ReplicaRow): void {
+  private queueUpsert(row: StructuredReplicaUpsert): void {
     const key = pendingRowKey(row);
     this.pendingDeletes.delete(key);
     this.pendingUpserts.set(key, row);
@@ -1185,9 +1263,7 @@ export class ReplicaCache {
 
   private hasPendingChanges(): boolean {
     return (
-      this.pendingUpserts.size > 0 ||
-      this.pendingDeletes.size > 0 ||
-      this.pendingDirectoryReplacements.size > 0
+      this.pendingUpserts.size > 0 || this.pendingDeletes.size > 0 || this.pendingBaselines.size > 0
     );
   }
 
@@ -1200,7 +1276,7 @@ export class ReplicaCache {
   }
 
   private hasPendingHostChanges(serverId: string): boolean {
-    if (this.pendingDirectoryReplacements.has(serverId)) return true;
+    if (this.pendingBaselines.has(serverId)) return true;
     for (const row of this.pendingUpserts.values()) {
       if (row.serverId === serverId) return true;
     }
@@ -1218,31 +1294,66 @@ export class ReplicaCache {
     const changes = {
       upserts: [...this.pendingUpserts.values()],
       deletes: [...this.pendingDeletes.values()],
-      directoryReplacements: this.pendingDirectoryReplacements,
+      baselines: this.pendingBaselines,
     };
     this.pendingUpserts = new Map();
     this.pendingDeletes = new Map();
-    this.pendingDirectoryReplacements = new Map();
+    this.pendingBaselines = new Set();
     return changes;
   }
 
-  private materializeDirectoryReplacements(pending: PendingReplicaChanges): ReplicaRowChanges {
+  private materializePendingChanges(pending: PendingReplicaChanges): ReplicaRowChanges {
     const deletes = new Map(pending.deletes.map((row) => [pendingRowKey(row), row]));
-    for (const [serverId, desiredRows] of pending.directoryReplacements) {
+    const upserts: ReplicaRow[] = [];
+    for (const upsert of pending.upserts) {
+      const row = this.materializeUpsert(upsert);
+      if (row) upserts.push(row);
+      else deletes.set(pendingRowKey(upsert), upsert);
+    }
+    for (const serverId of pending.baselines) {
+      const replacementKeys = new Set(
+        upserts.filter((row) => row.serverId === serverId && row.kind !== "timeline").map(rowKey),
+      );
       for (const row of this.storedRows.get(serverId)?.values() ?? []) {
-        if (row.kind !== "timeline" && !desiredRows.has(rowKey(row))) {
+        if (row.kind !== "timeline" && !replacementKeys.has(rowKey(row))) {
           deletes.set(pendingRowKey(row), row);
         }
       }
     }
-    return { upserts: pending.upserts, deletes: [...deletes.values()] };
+    return { upserts, deletes: [...deletes.values()] };
+  }
+
+  private materializeUpsert(upsert: StructuredReplicaUpsert): ReplicaRow | null {
+    let value: unknown;
+    switch (upsert.kind) {
+      case "agent":
+        value = serializeAgent(upsert.value);
+        break;
+      case "workspace":
+        value = serializeWorkspace(upsert.value);
+        break;
+      case "project":
+        value = serializeProject(upsert.value);
+        break;
+      case "timeline":
+        value = serializeTimeline(upsert.value);
+        if (!value) return null;
+        break;
+      case "checkpoint":
+        value = serializeDirectoryCheckpoint(upsert.value);
+        break;
+    }
+    return {
+      serverId: upsert.serverId,
+      kind: upsert.kind,
+      id: upsert.id,
+      payload: JSON.stringify(value),
+    };
   }
 
   private restorePendingChanges(changes: PendingReplicaChanges): void {
-    for (const [serverId, desiredRows] of changes.directoryReplacements) {
-      if (this.activeServerIds.has(serverId) && !this.pendingDirectoryReplacements.has(serverId)) {
-        this.pendingDirectoryReplacements.set(serverId, desiredRows);
-      }
+    for (const serverId of changes.baselines) {
+      if (this.activeServerIds.has(serverId)) this.pendingBaselines.add(serverId);
     }
     for (const key of changes.deletes) {
       const pendingKey = pendingRowKey(key);
@@ -1305,7 +1416,9 @@ export class ReplicaCache {
     this.hostWriteOrder.set(serverId, true);
   }
 
-  private async fitChangesToBudget(changes: ReplicaRowChanges): Promise<ReplicaRowChanges> {
+  private async fitChangesToBudget(
+    changes: ReplicaRowChanges,
+  ): Promise<{ changes: ReplicaRowChanges; evicted: Set<string> }> {
     const touchedServerIds = new Set<string>();
     for (const key of changes.deletes) touchedServerIds.add(key.serverId);
     for (const row of changes.upserts) touchedServerIds.add(row.serverId);
@@ -1341,15 +1454,17 @@ export class ReplicaCache {
       projectedTotal -= bytes;
       projectedBytes.delete(serverId);
       evicted.add(serverId);
+      this.invalidatedHosts.add(serverId);
       if (this.storedRows.has(serverId)) await this.rowStore.deleteHost(serverId);
       this.removeStoredHost(serverId);
-      // The next accepted owner commit must rebuild the complete host replica. Retaining the
-      // directory replacement marker ensures its checkpoint and rows stay atomic.
     }
 
     return {
-      upserts: changes.upserts.filter((row) => !evicted.has(row.serverId)),
-      deletes: changes.deletes.filter((key) => !evicted.has(key.serverId)),
+      changes: {
+        upserts: changes.upserts.filter((row) => !evicted.has(row.serverId)),
+        deletes: changes.deletes.filter((key) => !evicted.has(key.serverId)),
+      },
+      evicted,
     };
   }
 
@@ -1361,7 +1476,7 @@ export class ReplicaCache {
   }
 
   private dropPendingHostChanges(serverId: string): void {
-    this.pendingDirectoryReplacements.delete(serverId);
+    this.pendingBaselines.delete(serverId);
     for (const [key, row] of this.pendingUpserts) {
       if (row.serverId === serverId) this.pendingUpserts.delete(key);
     }
@@ -1372,18 +1487,16 @@ export class ReplicaCache {
 
   private renamePendingHostChanges(oldServerId: string, newServerId: string): void {
     const changes = this.drainPendingChanges();
-    for (const [serverId, desiredRows] of changes.directoryReplacements) {
-      this.pendingDirectoryReplacements.set(
-        serverId === oldServerId ? newServerId : serverId,
-        desiredRows,
-      );
-    }
     for (const key of changes.deletes) {
       this.queueDelete(key.serverId === oldServerId ? { ...key, serverId: newServerId } : key);
     }
     for (const row of changes.upserts) {
       this.queueUpsert(row.serverId === oldServerId ? { ...row, serverId: newServerId } : row);
     }
+    for (const serverId of changes.baselines) {
+      this.pendingBaselines.add(serverId === oldServerId ? newServerId : serverId);
+    }
+    if (this.invalidatedHosts.delete(oldServerId)) this.invalidatedHosts.add(newServerId);
   }
 
   private prepareStore(): Promise<void> {
diff --git a/packages/app/src/runtime/subscription-fixture.ts b/packages/app/src/runtime/subscription-fixture.ts
new file mode 100644
index 0000000000..c6eb9f78fe
--- /dev/null
+++ b/packages/app/src/runtime/subscription-fixture.ts
@@ -0,0 +1,43 @@
+import type { OwnedSubscription, SubscriptionObserver } from "@getpaseo/client";
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
+
+/** Public observation dependency for the directory/host runtime tests. */
+export function subscriptionFixture<T>(
+  snapshot: Promise<T>,
+  listen: (receive: (message: SessionOutboundMessage) => void) => () => void,
+): OwnedSubscription<T> {
+  const subscriptionId = crypto.randomUUID();
+  const observers = new Set<SubscriptionObserver<T & { subscriptionId: string }>>();
+  const updates: SessionOutboundMessage[] = [];
+  let current: (T & { subscriptionId: string }) | undefined;
+  let released = false;
+  const stop = listen((message) => {
+    if (!current) updates.push(message);
+    else for (const observer of observers) observer.update(message);
+  });
+  const ready = snapshot.then((value) => {
+    current = { ...value, subscriptionId };
+    if (!released) {
+      for (const observer of observers) {
+        observer.snapshot(current);
+        for (const message of updates) observer.update(message);
+      }
+    }
+    return current;
+  });
+  return {
+    subscriptionId,
+    ready,
+    subscribe(observer) {
+      if (released) return () => {};
+      observers.add(observer);
+      if (current) observer.snapshot(current);
+      return () => observers.delete(observer);
+    },
+    async release() {
+      released = true;
+      observers.clear();
+      stop();
+    },
+  };
+}
diff --git a/packages/app/src/schedules/schedule-form-model.ts b/packages/app/src/schedules/schedule-form-model.ts
index 4a889f9ef1..d7d2a115d0 100644
--- a/packages/app/src/schedules/schedule-form-model.ts
+++ b/packages/app/src/schedules/schedule-form-model.ts
@@ -338,19 +338,16 @@ function isSelectedModelValidForProviders(input: {
 
 function normalizeInitialValues(input: {
   snapshot: ScheduleFormSnapshot;
-  selectedServerId: string | null;
 }): FormInitialValues | undefined {
   const config = newAgentConfig(input.snapshot.schedule);
   if (!config) {
     return undefined;
   }
   return {
-    serverId: input.selectedServerId,
     provider: config.provider,
     model: config.model ?? null,
     modeId: config.modeId ?? null,
     thinkingOptionId: config.thinkingOptionId ?? null,
-    workingDir: config.cwd,
   };
 }
 
@@ -711,24 +708,20 @@ function buildInitialState(snapshot: ScheduleFormSnapshot): ScheduleFormState {
 
 function toFormState(state: ScheduleFormState): FormState {
   return {
-    serverId: state.selectedServerId,
     provider: state.selectedProvider,
     modeId: state.selectedMode,
     model: state.selectedModel,
     thinkingOptionId: state.selectedThinkingOptionId,
-    workingDir: state.workingDir,
   };
 }
 
 function applyResolvedFormState(state: ScheduleFormState, form: FormState): ScheduleFormState {
   return {
     ...state,
-    selectedServerId: form.serverId,
     selectedProvider: form.provider,
     selectedMode: form.modeId,
     selectedModel: form.model,
     selectedThinkingOptionId: form.thinkingOptionId,
-    workingDir: form.workingDir,
   };
 }
 
@@ -846,7 +839,6 @@ export function openScheduleForm(snapshot: ScheduleFormSnapshot): ScheduleFormMo
   const listeners = new Set<() => void>();
   const initialValues = normalizeInitialValues({
     snapshot,
-    selectedServerId: resolveInitialServerId(snapshot),
   });
   let closed = false;
   let hosts = snapshot.hosts;
@@ -1017,11 +1009,6 @@ export function openScheduleForm(snapshot: ScheduleFormSnapshot): ScheduleFormMo
       if (closed || state.selectedServerId === serverId) {
         return;
       }
-      userModified = {
-        ...userModified,
-        serverId: true,
-        workingDir: true,
-      };
       publish(
         clearProviderSelection({
           ...state,
@@ -1046,7 +1033,6 @@ export function openScheduleForm(snapshot: ScheduleFormSnapshot): ScheduleFormMo
       if (!providerScopeChanged && state.selectedProjectOptionId === target.optionId) {
         return;
       }
-      userModified = { ...userModified, serverId: true, workingDir: true };
       const nextState = {
         ...state,
         selectedServerId: target.serverId,
diff --git a/packages/app/src/screens/new-workspace-picker-item.test.ts b/packages/app/src/screens/new-workspace-picker-item.test.ts
index 739738e0f9..a6c1e81845 100644
--- a/packages/app/src/screens/new-workspace-picker-item.test.ts
+++ b/packages/app/src/screens/new-workspace-picker-item.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { buildVisibleComboboxOptions } from "@/components/ui/combobox-options";
 import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
 import {
   type BranchPickerDetail,
@@ -340,3 +341,48 @@ describe("defaultBasePickerItem", () => {
     expect(defaultBasePickerItem({ currentBranch: null })).toBeNull();
   });
 });
+
+describe("starting-ref search", () => {
+  it.each(["gitlab", "github"] as const)(
+    "keeps a %s change request returned for a body-only match",
+    (forge) => {
+      const item: ForgeSearchItem = {
+        ...prItem,
+        forge,
+        number: 3896,
+        title: "fix(config): send environment credentials only to trusted hosts",
+        body: "This mirrors the fix shipped for CVE-2024-53858.",
+        headRefName: "8545-duo-test",
+      };
+      const { options } = buildPickerOptionData({
+        branchDetails: [],
+        prItems: [item],
+        baseItem: null,
+      });
+      const visible = buildVisibleComboboxOptions({
+        options,
+        searchQuery: "2024",
+        searchable: true,
+        allowCustomValue: false,
+        customValuePrefix: "Use",
+      });
+      expect(visible.map((option) => option.label)).toEqual([
+        `${forge === "gitlab" ? "!" : "#"}3896 fix(config): send environment credentials only to trusted hosts`,
+      ]);
+      const selected = buildPickerOptionData({
+        branchDetails: [],
+        prItems: [],
+        baseItem: { kind: "github-pr", item },
+      });
+      expect(
+        buildVisibleComboboxOptions({
+          options: selected.options,
+          searchQuery: "2024",
+          searchable: true,
+          allowCustomValue: false,
+          customValuePrefix: "Use",
+        }),
+      ).toEqual(visible);
+    },
+  );
+});
diff --git a/packages/app/src/screens/new-workspace-picker-item.ts b/packages/app/src/screens/new-workspace-picker-item.ts
index 0cb0680605..d02c7a0bf2 100644
--- a/packages/app/src/screens/new-workspace-picker-item.ts
+++ b/packages/app/src/screens/new-workspace-picker-item.ts
@@ -264,7 +264,10 @@ export function buildPickerOptionData(input: {
     itemById.set(id, { kind: "github-pr", item: pr });
     const updatedAtMs = pr.updatedAt ? Date.parse(pr.updatedAt) : 0;
     const timestamp = Number.isNaN(updatedAtMs) ? 0 : Math.floor(updatedAtMs / 1000);
-    timedOptions.push({ option: { id, label: formatPrLabel(pr) }, timestamp });
+    timedOptions.push({
+      option: { id, label: formatPrLabel(pr), searchText: pr.body ?? undefined },
+      timestamp,
+    });
   }
 
   const baseItem = input.baseItem;
@@ -279,7 +282,13 @@ export function buildPickerOptionData(input: {
     const labeledItem = disambiguate(baseItem, timedOptions);
     itemById.set(selectedOptionId, labeledItem);
     timedOptions.push({
-      option: { id: selectedOptionId, label: pickerItemLabel(labeledItem) },
+      option: {
+        id: selectedOptionId,
+        label: pickerItemLabel(labeledItem),
+        ...(labeledItem.kind === "github-pr"
+          ? { searchText: labeledItem.item.body ?? undefined }
+          : {}),
+      },
       // The base sorts first: it is what a workspace is created from unless you pick something.
       timestamp: Number.POSITIVE_INFINITY,
     });
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 947190ccd0..1cf8d76f23 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -1,16 +1,22 @@
+import type {
+  CreateAgentRequestOptions,
+  CreateWorkspaceRequestOptions,
+} from "@getpaseo/client/internal/daemon-client";
+import type { AgentSnapshotPayload, CreationSnapshot } from "@getpaseo/protocol/messages";
+import { encodeImages } from "@/utils/encode-images";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
-import type { ReactElement, RefObject } from "react";
+import type { ReactElement, ReactNode, RefObject } from "react";
 import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
-import { Pressable, StyleSheet as RNStyleSheet, Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import type { PressableStateCallbackType } from "react-native";
-import ReanimatedAnimated from "react-native-reanimated";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { createNameId } from "mnemonic-id";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { ChevronDown, Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
 import { Composer } from "@/composer";
+import { ComposerDock } from "@/composer/dock";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import {
   resolveComposerAttachmentSubmitFormat,
@@ -25,9 +31,8 @@ import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
-import { SidebarMenuToggle } from "@/components/headers/menu-header";
-import { ScreenHeader } from "@/components/headers/screen-header";
-import { HEADER_INNER_HEIGHT, MAX_CONTENT_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import { MenuHeader } from "@/components/headers/menu-header";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { useToast } from "@/contexts/toast-context";
 import { useAgentInputDraft } from "@/composer/draft/input-draft";
 import { useForgeSearchQuery } from "@/git/use-forge-search-query";
@@ -53,7 +58,7 @@ import {
   navigateToWorkspace,
   useLastWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
-import { normalizeWorkspaceDescriptor, useSessionStore } from "@/stores/session-store";
+import { normalizeWorkspaceDescriptor, type WorkspaceDescriptor } from "@/stores/session-store";
 import { useWorkspace } from "@/stores/session-store-hooks";
 import { buildNewWorkspaceDraftKey, generateDraftId } from "@/stores/draft-keys";
 import { useOpenAddProject } from "@/hooks/use-open-add-project";
@@ -62,13 +67,11 @@ import {
   useWorkspaceDraftSubmissionStore,
   type PendingWorkspaceDraftSetup,
 } from "@/stores/workspace-draft-submission-store";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import type { KeyboardActionId } from "@/keyboard/keyboard-action-dispatcher";
 import { useFormPreferences } from "@/hooks/use-form-preferences";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import type { CreateAgentInitialValues } from "@/hooks/use-agent-form-state";
-import { generateMessageId } from "@/types/stream";
 import { toErrorMessage } from "@/utils/error-messages";
 import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
 import {
@@ -88,7 +91,7 @@ import { useDraftWorkspaceAttachmentScopeKey } from "@/attachments/workspace-att
 import type { MessagePayload } from "@/composer/types";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { AgentAttachment, ForgeSearchItem } from "@getpaseo/protocol/messages";
-import type { CreatePaseoWorktreeInput } from "@getpaseo/client/internal/daemon-client";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { WorkspaceDraftTabSetup, WorkspaceTabTarget } from "@/workspace-tabs/model";
 import { isEmptyWorkspaceSubmission, runCreateEmptyWorkspace } from "./new-workspace-empty";
@@ -118,6 +121,15 @@ import {
 } from "./new-workspace-initial-context";
 import { buildNewWorkspaceProjectIconTargets } from "./new-workspace/project-icon-targets";
 import { useNewWorkspaceProjectPicker } from "./new-workspace/project-picker";
+import { ImportSessionButton } from "./new-workspace/import-session-button";
+import { useImportSession } from "@/hooks/use-import-session";
+import {
+  buildTerminalsQueryKey,
+  type ListTerminalsPayload,
+  upsertCreatedTerminalPayload,
+} from "./workspace/terminals/state";
+import { captureWorkspaceDraftCleanup } from "./new-workspace/background-handoff";
+import { useNewWorkspaceScreenPresence } from "./new-workspace/screen-presence";
 
 const ThemedFolderPlus = withUnistyles(FolderPlus);
 const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
@@ -675,8 +687,13 @@ function IsolationPickerTrigger({
 
 // Wraps a single argument control in the mobile vertical stack. On desktop the
 // controls are laid out in one horizontal row, so no per-control wrapper is used.
+// Decorative padding must not block the dock background from iOS hit testing.
 function FormRow({ children }: { children: React.ReactNode }) {
-  return <View style={styles.row}>{children}</View>;
+  return (
+    <View style={styles.row} pointerEvents="box-none">
+      {children}
+    </View>
+  );
 }
 
 interface WorkspaceIsolationState {
@@ -726,13 +743,6 @@ function isolationLabel(t: TFunction, isolation: "local" | "worktree"): string {
     : t("newWorkspace.isolation.local");
 }
 
-function getContentStyle(input: { isCompact: boolean; insetBottom: number }) {
-  if (input.isCompact) {
-    return [styles.content, styles.contentCompact, { paddingBottom: input.insetBottom }];
-  }
-  return [styles.content, styles.contentCentered];
-}
-
 function normalizeBranchDetails(
   data: { branchDetails?: BranchPickerDetail[]; branches?: string[] } | undefined,
 ): BranchPickerDetail[] {
@@ -742,10 +752,23 @@ function normalizeBranchDetails(
   return names.map((name) => ({ name, committerDate: 0 }));
 }
 
+/**
+ * "background" means the user left the New workspace screen mid-creation, so nothing navigated
+ * and the screen — if still mounted under another route — has to drop its pending state itself.
+ */
+type SubmitOutcome = "navigated" | "background";
+
 interface SubmitDraftInput {
+  clearConsumedDraft: () => void;
+  agentCreation?: {
+    result: Promise<AgentSnapshotPayload>;
+    retry: (input: CreateAgentRequestOptions) => Promise<AgentSnapshotPayload>;
+  };
   serverId: string;
+  draftKey: string;
   clearDraft: (lifecycle: "sent" | "abandoned") => void;
   draftId?: string;
+  draftContextScopeKey: string | null;
   initialSetup?: WorkspaceDraftTabSetup;
   workspaceId: string;
   workspaceDirectory: string;
@@ -754,6 +777,8 @@ interface SubmitDraftInput {
   provider: AgentProvider;
   composerState: NewWorkspaceComposerState;
   supportsForgeSearch: boolean;
+  resolveClient: () => DaemonClient;
+  isStillOnCreateScreen: () => boolean;
 }
 
 type NewWorkspaceComposerState = NonNullable<
@@ -770,37 +795,22 @@ interface WorkspaceDraftSubmissionConfig {
   target: WorkspaceTabTarget;
 }
 
-async function createAndMergeWorkspace(input: {
-  client: NonNullable<ReturnType<typeof useHostRuntimeClient>>;
-  createInput: Parameters<
-    NonNullable<ReturnType<typeof useHostRuntimeClient>>["createPaseoWorktree"]
-  >[0];
-  mergeWorkspaces: (
-    serverId: string,
-    workspaces: ReturnType<typeof normalizeWorkspaceDescriptor>[],
-  ) => void;
-  serverId: string;
-  createFailedMessage: string;
-}): Promise<ReturnType<typeof normalizeWorkspaceDescriptor>> {
-  const payload = await input.client.createPaseoWorktree(input.createInput);
-  if (payload.error || !payload.workspace) {
-    throw new Error(payload.error ?? input.createFailedMessage);
-  }
-  const normalizedWorkspace = normalizeWorkspaceDescriptor(payload.workspace);
-  const workspaceForInitialMerge = input.createInput.firstAgentContext
-    ? { ...normalizedWorkspace, status: "running" as const, statusEnteredAt: new Date() }
-    : normalizedWorkspace;
-  input.mergeWorkspaces(input.serverId, [workspaceForInitialMerge]);
-  return normalizedWorkspace;
+interface WorkspaceCreationResult {
+  workspace: ReturnType<typeof normalizeWorkspaceDescriptor>;
+  agent?: AgentSnapshotPayload;
 }
 
 async function createMultiplicityWorkspace(input: {
+  idempotencyKey: string;
+  worktreeSlug: string;
   client: NonNullable<ReturnType<typeof useHostRuntimeClient>>;
   isolation: "local" | "worktree";
   project: HostProjectListItem;
   sourceDirectory: string;
   checkoutRequest: PickerCheckoutRequest | undefined;
   withInitialAgent: boolean;
+  agent?: CreateWorkspaceRequestOptions["agent"];
+  onEvent?: (snapshot: CreationSnapshot) => void;
   prompt: string;
   attachments: AgentAttachment[];
   mergeWorkspaces: (
@@ -809,7 +819,7 @@ async function createMultiplicityWorkspace(input: {
   ) => void;
   serverId: string;
   createFailedMessage: string;
-}): Promise<ReturnType<typeof normalizeWorkspaceDescriptor>> {
+}): Promise<WorkspaceCreationResult> {
   const projectId = getHostProjectId(input.project, input.serverId);
   if (!projectId) throw new Error("Project is not available on the selected host");
   const isWorktree = input.isolation === "worktree";
@@ -818,12 +828,15 @@ async function createMultiplicityWorkspace(input: {
     attachments: input.attachments,
   });
   const payload = await input.client.createWorkspace({
+    idempotencyKey: input.idempotencyKey,
+    agent: input.agent,
+    onEvent: input.onEvent,
     source: isWorktree
       ? {
           kind: "worktree",
           cwd: input.sourceDirectory,
           projectId,
-          worktreeSlug: createNameId(),
+          worktreeSlug: input.worktreeSlug,
           ...input.checkoutRequest,
         }
       : {
@@ -841,7 +854,7 @@ async function createMultiplicityWorkspace(input: {
     ? { ...normalizedWorkspace, status: "running" as const, statusEnteredAt: new Date() }
     : normalizedWorkspace;
   input.mergeWorkspaces(input.serverId, [workspaceForInitialMerge]);
-  return normalizedWorkspace;
+  return { workspace: normalizedWorkspace, agent: payload.agent };
 }
 
 interface CreateChatAgentInput {
@@ -853,11 +866,17 @@ interface CreateChatAgentInput {
     prompt: string;
     attachments: AgentAttachment[];
     withInitialAgent: boolean;
-  }) => Promise<ReturnType<typeof normalizeWorkspaceDescriptor>>;
+    agent?: CreateWorkspaceRequestOptions["agent"];
+    onEvent?: (snapshot: CreationSnapshot) => void;
+  }) => Promise<WorkspaceCreationResult>;
   serverId: string;
+  draftKey: string;
   clearDraft: (lifecycle: "sent" | "abandoned") => void;
   draftId?: string;
+  draftContextScopeKey: string | null;
   supportsForgeSearch: boolean;
+  resolveClient: () => DaemonClient;
+  isStillOnCreateScreen: () => boolean;
   labels: {
     composerStateRequired: string;
     selectModel: string;
@@ -900,26 +919,33 @@ function buildWorkspaceDraftSetupForCreatedWorkspace(input: {
 }
 
 function buildComposerInitialValues(input: {
-  workingDir: string | undefined;
   initialSetup?: WorkspaceDraftTabSetup | null;
 }): CreateAgentInitialValues | undefined {
   if (input.initialSetup) {
     return {
-      workingDir: input.workingDir ?? input.initialSetup.cwd,
       provider: input.initialSetup.provider,
       modeId: input.initialSetup.modeId,
       model: input.initialSetup.model,
       thinkingOptionId: input.initialSetup.thinkingOptionId,
     };
   }
-  if (input.workingDir) {
-    return { workingDir: input.workingDir };
-  }
   return undefined;
 }
 
-async function runCreateChatAgent(input: CreateChatAgentInput): Promise<void> {
+const pendingWorkspaceSubmissions = new Map<string, Promise<SubmitOutcome>>();
+function runCreateChatAgent(input: CreateChatAgentInput): Promise<SubmitOutcome> {
+  const key = JSON.stringify([input.serverId, input.draftId]);
+  const pending = pendingWorkspaceSubmissions.get(key);
+  if (pending) return pending;
+  const submission = Promise.resolve().then(() => createWorkspaceChatAgent(input));
+  pendingWorkspaceSubmissions.set(key, submission);
+  void submission.finally(() => pendingWorkspaceSubmissions.delete(key)).catch(() => undefined);
+  return submission;
+}
+
+async function createWorkspaceChatAgent(input: CreateChatAgentInput): Promise<SubmitOutcome> {
   const { payload, composerState, ensureWorkspace, serverId, clearDraft } = input;
+  const clearConsumedDraft = captureWorkspaceDraftCleanup(input);
   const { text, attachments, cwd } = payload;
   if (!composerState) {
     throw new Error(input.labels.composerStateRequired);
@@ -935,48 +961,101 @@ async function runCreateChatAgent(input: CreateChatAgentInput): Promise<void> {
     format: attachmentSubmitFormat,
   });
   const workspaceNamingAttachments = getWorkspaceNamingAttachments(reviewAttachments);
-  const ensuredWorkspace = await ensureWorkspace({
-    cwd,
-    prompt: text,
-    attachments: workspaceNamingAttachments,
-    withInitialAgent: true,
-  });
-  const initialSetup = buildWorkspaceDraftSetupForCreatedWorkspace({
-    forkDraftSetup: input.forkDraftSetup,
-    workspaceDirectory: ensuredWorkspace.workspaceDirectory,
-    provider,
-    composerState,
-  });
-  submitWorkspaceDraft({
-    serverId,
-    clearDraft,
-    draftId: input.draftId,
-    initialSetup,
-    workspaceId: ensuredWorkspace.id,
-    workspaceDirectory: ensuredWorkspace.workspaceDirectory,
-    text,
-    attachments,
-    provider,
-    composerState,
-    supportsForgeSearch: input.supportsForgeSearch,
+  const wirePayload = splitComposerAttachmentsForSubmit(attachments, {
+    format: attachmentSubmitFormat,
   });
+  const images = await encodeImages(wirePayload.images);
+  let navigated = false;
+  let outcome: SubmitOutcome = "background";
+  const initialAgent: NonNullable<CreateWorkspaceRequestOptions["agent"]> = {
+    config: {
+      provider,
+      cwd,
+      modeId: composerState.selectedMode || undefined,
+      model: composerState.effectiveModelId || undefined,
+      thinkingOptionId: composerState.effectiveThinkingOptionId || undefined,
+      featureValues: composerState.featureValues,
+    },
+    initialPrompt: text,
+    clientMessageId: `${input.draftId}:initial-message`,
+    images: images?.length ? images : undefined,
+    attachments: wirePayload.attachments?.length ? wirePayload.attachments : undefined,
+  };
+  const execute = async (requestedAgent = initialAgent): Promise<AgentSnapshotPayload> => {
+    const { agent } = await ensureWorkspace({
+      cwd,
+      prompt: text,
+      attachments: workspaceNamingAttachments,
+      withInitialAgent: true,
+      agent: requestedAgent,
+      onEvent: (snapshot) => {
+        if (!snapshot.workspace || navigated) return;
+        navigated = true;
+        if (!input.isStillOnCreateScreen()) return;
+        const workspace = normalizeWorkspaceDescriptor(snapshot.workspace);
+        getHostRuntimeStore().acceptWorkspaceSnapshots(serverId, [
+          { ...workspace, status: "running" },
+        ]);
+        const initialSetup = buildWorkspaceDraftSetupForCreatedWorkspace({
+          forkDraftSetup: input.forkDraftSetup,
+          workspaceDirectory: workspace.workspaceDirectory,
+          provider,
+          composerState,
+        });
+        outcome = submitWorkspaceDraft({
+          clearConsumedDraft,
+          draftKey: input.draftKey,
+          draftContextScopeKey: input.draftContextScopeKey,
+          resolveClient: input.resolveClient,
+          isStillOnCreateScreen: input.isStillOnCreateScreen,
+          serverId,
+          clearDraft,
+          draftId: input.draftId,
+          initialSetup,
+          workspaceId: workspace.id,
+          workspaceDirectory: workspace.workspaceDirectory,
+          text,
+          attachments,
+          provider,
+          composerState,
+          supportsForgeSearch: input.supportsForgeSearch,
+          agentCreation,
+        });
+      },
+    });
+    if (!agent) throw new Error("Workspace creation returned no agent");
+    return agent;
+  };
+  const agentCreation = {
+    result: Promise.resolve().then(() => execute()),
+    retry: (request: CreateAgentRequestOptions) =>
+      execute({
+        ...initialAgent,
+        config: { ...request.config!, cwd },
+        initialPrompt: request.initialPrompt ?? "",
+        clientMessageId: initialAgent.clientMessageId,
+        images: request.images,
+        attachments: request.attachments,
+      }),
+  };
+  await agentCreation.result;
+  if (outcome === "background") clearConsumedDraft();
+  return outcome;
 }
 
 function buildComposerConfig(input: {
   serverId: string;
-  isConnected: boolean;
   workspaceDirectory: string | null;
   sourceDirectory: string | null;
   initialSetup?: WorkspaceDraftTabSetup | null;
 }): Parameters<typeof useAgentInputDraft>[0]["composer"] {
-  const { serverId, isConnected, workspaceDirectory, sourceDirectory, initialSetup } = input;
+  const { serverId, workspaceDirectory, sourceDirectory, initialSetup } = input;
   const workingDir = workspaceDirectory || sourceDirectory || undefined;
   return {
     initialServerId: serverId || null,
-    initialValues: buildComposerInitialValues({ workingDir, initialSetup }),
+    initialValues: buildComposerInitialValues({ initialSetup }),
     initialFeatureValues: initialSetup?.featureValues,
     isVisible: true,
-    onlineServerIds: isConnected && serverId ? [serverId] : [],
     lockedWorkingDir: workingDir,
   };
 }
@@ -1023,7 +1102,7 @@ function resolveWorkspaceDraftSubmissionConfig(input: {
   };
 }
 
-function submitWorkspaceDraft(input: SubmitDraftInput): void {
+function submitWorkspaceDraft(input: SubmitDraftInput): SubmitOutcome {
   const {
     serverId,
     clearDraft,
@@ -1037,7 +1116,7 @@ function submitWorkspaceDraft(input: SubmitDraftInput): void {
     initialSetup,
   } = input;
   const draftId = draftIdInput?.trim() || generateDraftId();
-  const clientMessageId = generateMessageId();
+  const clientMessageId = `${draftId}:initial-message`;
   const timestamp = Date.now();
   const wirePayload = splitComposerAttachmentsForSubmit(attachments, {
     format: resolveComposerAttachmentSubmitFormat({
@@ -1051,7 +1130,7 @@ function submitWorkspaceDraft(input: SubmitDraftInput): void {
     composerState,
     initialSetup,
   });
-  useCreateFlowStore.getState().setPending({
+  const started = useCreateFlowStore.getState().trySetPending({
     serverId,
     draftId,
     workspaceId,
@@ -1062,6 +1141,7 @@ function submitWorkspaceDraft(input: SubmitDraftInput): void {
     ...(wirePayload.images.length > 0 ? { images: wirePayload.images } : {}),
     ...(wirePayload.attachments.length > 0 ? { attachments: wirePayload.attachments } : {}),
   });
+  if (!started) return "navigated";
   useWorkspaceDraftSubmissionStore.getState().setPending({
     serverId,
     workspaceId,
@@ -1077,6 +1157,7 @@ function submitWorkspaceDraft(input: SubmitDraftInput): void {
     ...(submission.thinkingOptionId ? { thinkingOptionId: submission.thinkingOptionId } : {}),
     ...(submission.featureValues ? { featureValues: submission.featureValues } : {}),
     allowEmptyText: true,
+    agentCreation: input.agentCreation,
   });
   clearDraft("sent");
   navigateToWorkspace({
@@ -1084,6 +1165,7 @@ function submitWorkspaceDraft(input: SubmitDraftInput): void {
     workspaceId,
     target: submission.target,
   });
+  return "navigated";
 }
 
 function useNewWorkspaceHostSelector(input: {
@@ -1516,23 +1598,27 @@ function useNewWorkspaceFormStack(input: NewWorkspaceFormStackInput): ReactEleme
   );
 
   return isCompact ? (
-    <View testID="new-workspace-ref-picker-row" style={styles.formStack}>
+    <View testID="new-workspace-ref-picker-row" style={styles.formStack} pointerEvents="box-none">
       <FormRow>{projectControl}</FormRow>
       {hostControl ? <FormRow>{hostControl}</FormRow> : null}
       {isolationControl ? <FormRow>{isolationControl}</FormRow> : null}
       {baseControl ? <FormRow>{baseControl}</FormRow> : null}
       <FormRow>{launchControl}</FormRow>
       {/* Keep fixed stack height without separating the visible controls. */}
-      {isolationControl ? null : <View style={styles.baseSpacer} />}
-      {baseControl ? null : <View style={styles.baseSpacer} />}
+      {isolationControl ? null : <View style={styles.baseSpacer} pointerEvents="none" />}
+      {baseControl ? null : <View style={styles.baseSpacer} pointerEvents="none" />}
     </View>
   ) : (
-    <View testID="new-workspace-ref-picker-row" style={styles.formStackDesktop}>
+    <View
+      testID="new-workspace-ref-picker-row"
+      style={styles.formStackDesktop}
+      pointerEvents="box-none"
+    >
       {projectControl}
       {hostControl}
       {isolationControl}
       {baseControl}
-      <View style={styles.launchSpacer} />
+      <View style={styles.launchSpacer} pointerEvents="none" />
       {launchControl}
     </View>
   );
@@ -1548,10 +1634,14 @@ export function NewWorkspaceScreen({
   const queryClient = useQueryClient();
   const { theme } = useUnistyles();
   const { t } = useTranslation();
-  const insets = useSafeAreaInsets();
   const isCompact = useIsCompactFormFactor();
   const toast = useToast();
-  const mergeWorkspaces = useSessionStore((state) => state.mergeWorkspaces);
+  const mergeWorkspaces = useCallback(
+    (targetServerId: string, workspaces: Iterable<WorkspaceDescriptor>) => {
+      getHostRuntimeStore().acceptWorkspaceSnapshots(targetServerId, Array.from(workspaces));
+    },
+    [],
+  );
   const {
     allHosts,
     selectedServerId,
@@ -1572,10 +1662,14 @@ export function NewWorkspaceScreen({
   // COMPAT(workspaceMultiplicity): added in v0.1.97, drop the gate when floor >= v0.1.97
   const supportsWorkspaceMultiplicity = useHostFeature(selectedServerId, "workspaceMultiplicity");
   const supportsForgeSearch = useHostFeature(selectedServerId, "forgeSearch");
+  const [creationIdentity] = useState(() => ({
+    draftId: draftId ?? generateDraftId(),
+    worktreeSlug: createNameId(),
+  }));
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [createdWorkspace, setCreatedWorkspace] = useState<ReturnType<
-    typeof normalizeWorkspaceDescriptor
-  > | null>(null);
+  const [creationResult, setCreationResult] = useState<
+    WorkspaceCreationResult | { workspace: null }
+  >({ workspace: null });
   const [pendingAction, setPendingAction] = useState<"chat" | "empty" | "terminal" | null>(null);
   const [pickerOpen, setPickerOpen] = useState(false);
   const [projectPickerOpen, setProjectPickerOpen] = useState(false);
@@ -1588,6 +1682,7 @@ export function NewWorkspaceScreen({
   const isolationPickerAnchorRef = useRef<View>(null);
   const hostPickerAnchorRef = useRef<View | null>(null);
   const isDraftHandoffActive = useIsNewWorkspaceDraftHandoffActive({ draftId, selectedServerId });
+  const isStillOnCreateScreen = useNewWorkspaceScreenPresence();
 
   // Launch target: what the composer submits to (chat agent, or a terminal
   // profile). Mirrors useWorkspaceIsolation's pattern below: the derived
@@ -1620,8 +1715,15 @@ export function NewWorkspaceScreen({
     terminalSubmitLabel,
     launchFocusKey,
   } = useTerminalComposerState({ launchTarget, terminalProfiles, terminalPromptText });
+  const terminalTextSource = useMemo(
+    () => ({
+      getSnapshot: () => terminalComposerValue,
+      subscribe: (_listener: () => void) => () => {},
+    }),
+    [terminalComposerValue],
+  );
   const terminalTextReplacement = useMemo(
-    () => ({ key: launchFocusKey, text: terminalComposerValue }),
+    () => ({ kind: "replace" as const, key: launchFocusKey, text: terminalComposerValue }),
     [launchFocusKey, terminalComposerValue],
   );
 
@@ -1631,7 +1733,7 @@ export function NewWorkspaceScreen({
     return () => clearTimeout(timer);
   }, [pickerSearchQuery]);
 
-  const workspace = createdWorkspace;
+  const { workspace } = creationResult;
   const client = useHostRuntimeClient(selectedServerId);
   const isConnected = useHostRuntimeIsConnected(selectedServerId);
   const {
@@ -1669,7 +1771,6 @@ export function NewWorkspaceScreen({
     draftKey,
     composer: buildComposerConfig({
       serverId: selectedServerId,
-      isConnected,
       workspaceDirectory: workspace?.workspaceDirectory ?? null,
       sourceDirectory: selectedSourceDirectory,
       initialSetup: forkDraftSetup?.setup,
@@ -1694,11 +1795,12 @@ export function NewWorkspaceScreen({
   }, []);
 
   const withConnectedClient = useCallback(() => {
-    if (!client || !isConnected) {
+    const connectedClient = getHostRuntimeStore().getClient(selectedServerId);
+    if (!connectedClient?.isConnected) {
       throw new Error(t("newWorkspace.errors.hostDisconnected"));
     }
-    return client;
-  }, [client, isConnected, t]);
+    return connectedClient;
+  }, [selectedServerId, t]);
 
   const clientReady = isConnected && Boolean(client);
   const hasSelectedSourceDirectory = selectedSourceDirectory !== null;
@@ -1932,45 +2034,17 @@ export function NewWorkspaceScreen({
     setProjectPickerOpen(nextOpen);
   }, []);
 
-  const buildCreateWorktreeInput = useCallback(
-    (input: {
-      cwd: string;
-      prompt: string;
-      attachments: AgentAttachment[];
-      checkoutRequest: PickerCheckoutRequest | undefined;
-    }): CreatePaseoWorktreeInput => {
-      if (!selectedProject) {
-        throw new Error("Choose a project");
-      }
-      if (!selectedSourceDirectory) {
-        throw new Error("Choose a host for this project");
-      }
-      const firstAgentContext = buildFirstAgentContext(input);
-      const hostProjectId = getHostProjectId(selectedProject, selectedServerId);
-      if (!hostProjectId) {
-        throw new Error("Project is not available on the selected host");
-      }
-
-      return {
-        cwd: selectedSourceDirectory,
-        projectId: hostProjectId,
-        worktreeSlug: createNameId(),
-        ...(firstAgentContext ? { firstAgentContext } : {}),
-        ...input.checkoutRequest,
-      };
-    },
-    [selectedProject, selectedServerId, selectedSourceDirectory],
-  );
-
   const ensureWorkspace = useCallback(
     async (input: {
       cwd: string;
       prompt: string;
       attachments: AgentAttachment[];
       withInitialAgent: boolean;
+      agent?: CreateWorkspaceRequestOptions["agent"];
+      onEvent?: (snapshot: CreationSnapshot) => void;
     }) => {
-      if (createdWorkspace) {
-        return createdWorkspace;
+      if (creationResult.workspace) {
+        return creationResult;
       }
       if (!selectedProject) {
         throw new Error("Choose a project");
@@ -1993,33 +2067,29 @@ export function NewWorkspaceScreen({
             selectedItem ?? defaultBasePickerItem(checkoutStatusForCreate),
           )
         : undefined;
-      const normalizedWorkspace = supportsWorkspaceMultiplicity
-        ? await createMultiplicityWorkspace({
-            client: connectedClient,
-            isolation: effectiveIsolation,
-            project: selectedProject,
-            sourceDirectory: selectedSourceDirectory,
-            checkoutRequest,
-            withInitialAgent: input.withInitialAgent,
-            prompt: input.prompt,
-            attachments: input.attachments,
-            mergeWorkspaces,
-            serverId: selectedServerId,
-            createFailedMessage: t("newWorkspace.errors.createWorktreeFailed"),
-          })
-        : await createAndMergeWorkspace({
-            client: connectedClient,
-            createInput: buildCreateWorktreeInput({ ...input, checkoutRequest }),
-            mergeWorkspaces,
-            serverId: selectedServerId,
-            createFailedMessage: t("newWorkspace.errors.createWorktreeFailed"),
-          });
-      setCreatedWorkspace(normalizedWorkspace);
+      const normalizedWorkspace = await createMultiplicityWorkspace({
+        idempotencyKey: creationIdentity.draftId,
+        worktreeSlug: creationIdentity.worktreeSlug,
+        client: connectedClient,
+        isolation: createsWorktree ? "worktree" : "local",
+        project: selectedProject,
+        sourceDirectory: selectedSourceDirectory,
+        checkoutRequest,
+        withInitialAgent: input.withInitialAgent,
+        prompt: input.prompt,
+        attachments: input.attachments,
+        agent: input.agent,
+        onEvent: input.onEvent,
+        mergeWorkspaces,
+        serverId: selectedServerId,
+        createFailedMessage: t("newWorkspace.errors.createWorktreeFailed"),
+      });
+      setCreationResult(normalizedWorkspace);
       return normalizedWorkspace;
     },
     [
-      buildCreateWorktreeInput,
-      createdWorkspace,
+      creationIdentity,
+      creationResult,
       effectiveIsolation,
       mergeWorkspaces,
       queryClient,
@@ -2041,31 +2111,49 @@ export function NewWorkspaceScreen({
         await updateFormPreferences({ launchTarget });
         if (isEmptyWorkspaceSubmission(payload)) {
           setPendingAction("empty");
+          let outcome: SubmitOutcome = "background";
           await runCreateEmptyWorkspace({
             payload,
-            ensureWorkspace,
+            ensureWorkspace: async (request) => (await ensureWorkspace(request)).workspace,
             serverId: selectedServerId,
-            navigate: (targetServerId, workspaceId) =>
-              navigateToWorkspace({ serverId: targetServerId, workspaceId }),
+            navigate: (targetServerId, workspaceId) => {
+              if (!isStillOnCreateScreen()) {
+                return;
+              }
+              outcome = "navigated";
+              navigateToWorkspace({ serverId: targetServerId, workspaceId });
+            },
           });
+          // Nothing navigated, so this screen may still be mounted under another route. Release
+          // the pending lock it would otherwise keep forever.
+          if (outcome === "background") {
+            setPendingAction(null);
+          }
           return;
         }
 
         setPendingAction("chat");
-        await runCreateChatAgent({
+        const outcome = await runCreateChatAgent({
           payload,
           composerState,
           forkDraftSetup,
           ensureWorkspace,
           serverId: selectedServerId,
           clearDraft: chatDraft.clear,
-          draftId,
+          draftKey,
+          draftId: creationIdentity.draftId,
+          draftContextScopeKey,
           supportsForgeSearch,
+          resolveClient: withConnectedClient,
+          isStillOnCreateScreen,
           labels: {
             composerStateRequired: t("newWorkspace.errors.composerStateRequired"),
             selectModel: t("newWorkspace.errors.selectModel"),
           },
         });
+        if (outcome === "background") {
+          setPendingAction(null);
+        }
       } catch (error) {
         const message = toErrorMessage(error);
         setPendingAction(null);
@@ -2075,16 +2163,20 @@ export function NewWorkspaceScreen({
     },
     [
       composerState,
-      draftId,
+      draftContextScopeKey,
+      creationIdentity,
       chatDraft.clear,
+      draftKey,
       ensureWorkspace,
       forkDraftSetup,
+      isStillOnCreateScreen,
       launchTarget,
       selectedServerId,
       supportsForgeSearch,
       t,
       toast,
       updateFormPreferences,
+      withConnectedClient,
     ],
   );
 
@@ -2093,12 +2185,13 @@ export function NewWorkspaceScreen({
       setErrorMessage(null);
       await updateFormPreferences({ launchTarget });
       setPendingAction("terminal");
+      let outcome: SubmitOutcome = "background";
       await runCreateTerminalWorkspace({
         cwd: selectedSourceDirectory ?? "",
         prompt: terminalPromptText,
         profile: selectedTerminalProfile,
         profileName: selectedTerminalProfile?.name,
-        ensureWorkspace,
+        ensureWorkspace: async (request) => (await ensureWorkspace(request)).workspace,
         createTerminal: async (input) => {
           const connectedClient = withConnectedClient();
           const createdTerminal = await connectedClient.createTerminal(
@@ -2107,18 +2200,39 @@ export function NewWorkspaceScreen({
             undefined,
             { command: input.command, args: input.args, workspaceId: input.workspaceId },
           );
-          if (!createdTerminal.terminal) {
+          const terminal = createdTerminal.terminal;
+          if (!terminal) {
             throw new Error(createdTerminal.error ?? t("newWorkspace.errors.createWorktreeFailed"));
           }
-          return { terminalId: createdTerminal.terminal.id };
+          queryClient.setQueryData<ListTerminalsPayload>(
+            buildTerminalsQueryKey(selectedServerId, input.workspaceDirectory, input.workspaceId),
+            (current) =>
+              upsertCreatedTerminalPayload({
+                current,
+                terminal,
+                workspaceDirectory: input.workspaceDirectory,
+              }),
+          );
+          return { terminalId: terminal.id };
         },
         sendTerminalInput: (terminalId, data) => {
           withConnectedClient().sendTerminalInput(terminalId, { type: "input", data });
         },
         serverId: selectedServerId,
-        navigate: (targetServerId, workspaceId, target) =>
-          navigateToWorkspace({ serverId: targetServerId, workspaceId, target }),
+        // The terminal is spawned and fed its command before this runs, so skipping the
+        // navigation costs nothing: it is standalone, and `reconcileTabs` auto-opens standalone
+        // terminals when the workspace is next visited.
+        navigate: (targetServerId, workspaceId, target) => {
+          if (!isStillOnCreateScreen()) {
+            return;
+          }
+          outcome = "navigated";
+          navigateToWorkspace({ serverId: targetServerId, workspaceId, target });
+        },
       });
+      if (outcome === "background") {
+        setPendingAction(null);
+      }
     } catch (error) {
       const message = toErrorMessage(error);
       setPendingAction(null);
@@ -2127,7 +2241,9 @@ export function NewWorkspaceScreen({
     }
   }, [
     ensureWorkspace,
+    isStillOnCreateScreen,
     launchTarget,
+    queryClient,
     selectedServerId,
     selectedSourceDirectory,
     selectedTerminalProfile,
@@ -2173,20 +2289,6 @@ export function NewWorkspaceScreen({
     ],
   );
 
-  const contentStyle = useMemo(
-    () => getContentStyle({ isCompact, insetBottom: insets.bottom }),
-    [isCompact, insets.bottom],
-  );
-
-  const { style: composerKeyboardStyle } = useKeyboardShiftStyle({
-    mode: "translate",
-  });
-
-  const centeredStyle = useMemo(
-    () => [animatedStaticStyles.centered, composerKeyboardStyle],
-    [composerKeyboardStyle],
-  );
-
   const agentControlsWithDisabled = useMemo(
     () =>
       composerState
@@ -2265,91 +2367,120 @@ export function NewWorkspaceScreen({
     },
   });
 
-  const screenHeaderLeft = useMemo(() => <SidebarMenuToggle />, []);
+  const importSession = useImportSession({ serverId: selectedServerId });
 
+  const composer = isTerminalLaunch ? (
+    <Composer
+      key="terminal"
+      inputMode="terminal"
+      readOnly={!terminalTakesPrompt}
+      placeholder={terminalPlaceholder}
+      submitLabel={terminalSubmitLabel}
+      agentId={draftKey}
+      serverId={selectedServerId}
+      isPaneFocused={true}
+      onSubmitMessage={handleSubmitTerminalLaunch}
+      allowEmptySubmit={true}
+      submitButtonAccessibilityLabel={t("newWorkspace.launch.submit")}
+      submitButtonTestID="new-workspace-launch-submit"
+      isSubmitLoading={isPending}
+      submitBehavior="preserve-and-lock"
+      blurOnSubmit={true}
+      textSource={terminalTextSource}
+      onChangeText={setTerminalPromptText}
+      textReplacement={terminalTextReplacement}
+      attachments={NO_TERMINAL_ATTACHMENTS}
+      onChangeAttachments={noopChangeAttachments}
+      cwd={selectedSourceDirectory ?? ""}
+      clearDraft={noopClearDraft}
+      autoFocus={terminalTakesPrompt}
+      autoFocusKey={launchFocusKey}
+    />
+  ) : (
+    <Composer
+      key="chat"
+      agentId={draftKey}
+      serverId={selectedServerId}
+      isPaneFocused={true}
+      onSubmitMessage={handleSubmitNewWorkspace}
+      allowEmptySubmit={true}
+      submitButtonAccessibilityLabel={t("newWorkspace.create")}
+      submitButtonTestID="workspace-create-submit"
+      submitIcon="return"
+      isSubmitLoading={isPending}
+      waitForForgeAutoAttachOnSubmit
+      submitBehavior="preserve-and-lock"
+      blurOnSubmit={true}
+      textSource={chatDraft.textSource}
+      onChangeText={chatDraft.editText}
+      textReplacement={chatDraft.textReplacement}
+      attachments={chatDraft.attachments}
+      attachmentScopeKeys={visibleDraftContextScopeKeys}
+      onChangeAttachments={chatDraft.setAttachments}
+      onForgeChangeRequestDetected={handleForgeChangeRequestDetected}
+      onForgeChangeRequestAutoAttach={handleForgeChangeRequestAutoAttach}
+      cwd={selectedSourceDirectory ?? ""}
+      clearDraft={handleClearDraft}
+      autoFocus
+      autoFocusKey={launchFocusKey}
+      commandDraft={composerState?.commandDraft}
+      agentControls={agentControlsWithDisabled}
+    />
+  );
   return (
     <FileDropZone style={styles.container}>
-      <ScreenHeader left={screenHeaderLeft} borderless />
-      <View style={contentStyle}>
+      <MenuHeader borderless />
+      <View style={styles.content}>
         <TitlebarDragRegion />
-        <ReanimatedAnimated.View style={centeredStyle}>
-          <View style={styles.composerTitleContainer}>
-            <Text style={styles.composerTitle}>{t("newWorkspace.title")}</Text>
-          </View>
-          {formStack}
-          {isTerminalLaunch ? (
-            <Composer
-              key="terminal"
-              externalKeyboardShift
-              inputMode="terminal"
-              readOnly={!terminalTakesPrompt}
-              placeholder={terminalPlaceholder}
-              submitLabel={terminalSubmitLabel}
-              agentId={draftKey}
-              serverId={selectedServerId}
-              isPaneFocused={true}
-              onSubmitMessage={handleSubmitTerminalLaunch}
-              allowEmptySubmit={true}
-              submitButtonAccessibilityLabel={t("newWorkspace.launch.submit")}
-              submitButtonTestID="new-workspace-launch-submit"
-              isSubmitLoading={isPending}
-              submitBehavior="preserve-and-lock"
-              blurOnSubmit={true}
-              value={terminalComposerValue}
-              onChangeText={setTerminalPromptText}
-              textReplacement={terminalTextReplacement}
-              attachments={NO_TERMINAL_ATTACHMENTS}
-              onChangeAttachments={noopChangeAttachments}
-              cwd={selectedSourceDirectory ?? ""}
-              clearDraft={noopClearDraft}
-              autoFocus={terminalTakesPrompt}
-              autoFocusKey={launchFocusKey}
-            />
-          ) : (
-            <Composer
-              key="chat"
-              externalKeyboardShift
-              agentId={draftKey}
-              serverId={selectedServerId}
-              isPaneFocused={true}
-              onSubmitMessage={handleSubmitNewWorkspace}
-              allowEmptySubmit={true}
-              submitButtonAccessibilityLabel={t("newWorkspace.create")}
-              submitButtonTestID="workspace-create-submit"
-              submitIcon="return"
-              isSubmitLoading={isPending}
-              waitForForgeAutoAttachOnSubmit
-              submitBehavior="preserve-and-lock"
-              blurOnSubmit={true}
-              value={chatDraft.text}
-              onChangeText={chatDraft.editText}
-              textReplacement={chatDraft.textReplacement}
-              attachments={chatDraft.attachments}
-              attachmentScopeKeys={visibleDraftContextScopeKeys}
-              onChangeAttachments={chatDraft.setAttachments}
-              onForgeChangeRequestDetected={handleForgeChangeRequestDetected}
-              onForgeChangeRequestAutoAttach={handleForgeChangeRequestAutoAttach}
-              cwd={selectedSourceDirectory ?? ""}
-              clearDraft={handleClearDraft}
-              autoFocus
-              autoFocusKey={launchFocusKey}
-              commandDraftConfig={composerState?.commandDraftConfig}
-              agentControls={agentControlsWithDisabled}
-            />
-          )}
+        <NewWorkspaceLayout
+          isCompact={isCompact}
+          title={t("newWorkspace.title")}
+          formStack={formStack}
+          onImportSession={importSession.open}
+        >
+          {composer}
           {errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
-        </ReanimatedAnimated.View>
+        </NewWorkspaceLayout>
       </View>
+      {importSession.sheet}
     </FileDropZone>
   );
 }
 
-const animatedStaticStyles = RNStyleSheet.create({
-  centered: {
-    width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
-  },
-});
+function NewWorkspaceLayout({
+  isCompact,
+  title,
+  formStack,
+  onImportSession,
+  children,
+}: {
+  isCompact: boolean;
+  title: string;
+  formStack: ReactNode;
+  onImportSession: () => void;
+  children: ReactNode;
+}) {
+  // At the top of the screen on compact layouts, under the composer otherwise.
+  const importSessionButton = <ImportSessionButton compact={isCompact} onPress={onImportSession} />;
+  const setupFields = (
+    <>
+      {isCompact ? <View style={styles.compactTopActions}>{importSessionButton}</View> : null}
+      <View style={styles.composerTitleContainer} pointerEvents="none">
+        <Text style={styles.composerTitle}>{title}</Text>
+      </View>
+      {formStack}
+    </>
+  );
+  return (
+    <ComposerDock centered={!isCompact}>
+      {setupFields}
+      <>
+        {children}
+        {isCompact ? null : importSessionButton}
+      </>
+    </ComposerDock>
+  );
+}
 
 const styles = StyleSheet.create((theme) => ({
   container: {
@@ -2360,14 +2491,12 @@ const styles = StyleSheet.create((theme) => ({
   content: {
     position: "relative",
     flex: 1,
-    alignItems: "center",
   },
-  contentCentered: {
-    justifyContent: "center",
-    paddingBottom: HEADER_INNER_HEIGHT + theme.spacing[6],
-  },
-  contentCompact: {
-    justifyContent: "flex-end",
+  // Takes the free space above the setup fields, so its button sits at the top of the screen.
+  // The inset puts the ghost button's icon on the setup rows' icon rail.
+  compactTopActions: {
+    flex: 1,
+    paddingHorizontal: theme.spacing[3],
   },
   composerTitleContainer: {
     marginBottom: theme.spacing[8],
@@ -2391,7 +2520,8 @@ const styles = StyleSheet.create((theme) => ({
   formStackDesktop: {
     flexDirection: "row",
     alignItems: "center",
-    marginBottom: theme.spacing[8],
+    // Matches the gap between the composer and the Import session pill below it.
+    marginBottom: theme.spacing[4],
     // The badge adds its own left padding; offset it so the project icon's left
     // edge lands exactly on the "New workspace" title's left edge. The trailing
     // inset mirrors it so the launch chip stops on the composer's inner content
diff --git a/packages/app/src/screens/new-workspace/background-handoff.test.ts b/packages/app/src/screens/new-workspace/background-handoff.test.ts
new file mode 100644
index 0000000000..a84369fdf4
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/background-handoff.test.ts
@@ -0,0 +1,176 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { useCreateFlowStore } from "@/stores/create-flow-store";
+import { useDraftStore } from "@/stores/draft-store";
+import { useWorkspaceAttachmentsStore } from "@/attachments/workspace-attachments-store";
+import { useWorkspaceDraftSubmissionStore } from "@/stores/workspace-draft-submission-store";
+import {
+  captureWorkspaceDraftCleanup,
+  createWorkspaceAgentInBackground,
+} from "./background-handoff";
+
+const DRAFT_ID = "draft_1";
+const DRAFT_KEY = "new-workspace";
+const SCOPE_KEY = "draft:draft_1";
+
+function saveDraft(text: string) {
+  useDraftStore
+    .getState()
+    .saveDraftInput({ draftKey: DRAFT_KEY, draft: { text, attachments: [] } });
+}
+
+function draftText(): string | undefined {
+  return useDraftStore.getState().drafts[DRAFT_KEY]?.input.text;
+}
+
+function captureCleanup() {
+  return captureWorkspaceDraftCleanup({
+    draftId: DRAFT_ID,
+    draftKey: DRAFT_KEY,
+    clearDraft: (lifecycle) =>
+      useDraftStore.getState().clearDraftInput({ draftKey: DRAFT_KEY, lifecycle }),
+    draftContextScopeKey: SCOPE_KEY,
+  });
+}
+
+function run(createAgent: () => Promise<unknown>, clearConsumedDraft = captureCleanup()) {
+  return createWorkspaceAgentInBackground({ createAgent, clearConsumedDraft });
+}
+
+beforeEach(() => {
+  useWorkspaceDraftSubmissionStore.setState({ pendingByDraftId: {}, setupByDraftId: {} });
+  useCreateFlowStore.setState({ pendingByDraftId: {} });
+  useWorkspaceAttachmentsStore.setState({ attachmentsByScope: { [SCOPE_KEY]: [] } });
+  saveDraft("do the thing");
+});
+
+describe("createWorkspaceAgentInBackground", () => {
+  it("preserves context added to a newer draft without editing its text", async () => {
+    await run(async () => {
+      useWorkspaceAttachmentsStore.getState().addWorkspaceAttachment({
+        scopeKey: SCOPE_KEY,
+        attachment: {
+          kind: "chat_history",
+          id: "fork-context",
+          attachment: {
+            type: "text",
+            mimeType: "text/plain",
+            contextKind: "chat_history",
+            title: "Chat history",
+            text: "Preserve this context",
+          },
+          source: { serverId: "local", agentId: "agent-1" },
+        },
+      });
+      useWorkspaceDraftSubmissionStore.getState().setDraftSetup({
+        draftId: DRAFT_ID,
+        setup: {
+          cwd: "/work/new-repo",
+          provider: "codex",
+          modeId: null,
+          model: null,
+          thinkingOptionId: null,
+          featureValues: {},
+        },
+      });
+    });
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[SCOPE_KEY]).toHaveLength(1);
+    expect(useWorkspaceDraftSubmissionStore.getState().setupByDraftId[DRAFT_ID]?.setup.cwd).toBe(
+      "/work/new-repo",
+    );
+  });
+
+  it("creates one agent and clears the consumed draft setup, attachments and input", async () => {
+    let calls = 0;
+    useWorkspaceDraftSubmissionStore.getState().setDraftSetup({
+      draftId: DRAFT_ID,
+      setup: {
+        cwd: "/work/repo",
+        provider: "claude",
+        modeId: null,
+        model: null,
+        thinkingOptionId: null,
+        featureValues: {},
+      },
+    });
+
+    await run(async () => {
+      calls += 1;
+    });
+
+    expect(calls).toBe(1);
+    expect(useWorkspaceDraftSubmissionStore.getState().setupByDraftId).toEqual({});
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[SCOPE_KEY]).toBeUndefined();
+    expect(draftText()).toBe("");
+  });
+
+  it("preserves context changed while workspace creation was pending", async () => {
+    const clearConsumedDraft = captureCleanup();
+    useWorkspaceAttachmentsStore.getState().addWorkspaceAttachment({
+      scopeKey: SCOPE_KEY,
+      attachment: {
+        kind: "chat_history",
+        id: "fork-context",
+        attachment: {
+          type: "text",
+          mimeType: "text/plain",
+          contextKind: "chat_history",
+          title: "Chat history",
+          text: "Preserve this context",
+        },
+        source: { serverId: "local", agentId: "agent-1" },
+      },
+    });
+    await run(async () => undefined, clearConsumedDraft);
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[SCOPE_KEY]).toHaveLength(1);
+    expect(draftText()).toBe("do the thing");
+  });
+
+  it("leaves no pending submission behind, so no draft tab can create a second agent", async () => {
+    await run(async () => undefined);
+
+    expect(useWorkspaceDraftSubmissionStore.getState().pendingByDraftId).toEqual({});
+    expect(useCreateFlowStore.getState().pendingByDraftId).toEqual({});
+  });
+
+  it("rethrows a failed creation and keeps the prompt for retry", async () => {
+    const failure = new Error("daemon exploded");
+
+    await expect(
+      run(async () => {
+        throw failure;
+      }),
+    ).rejects.toThrow(failure);
+
+    expect(draftText()).toBe("do the thing");
+  });
+
+  it("keeps a prompt typed into the shared draft while creation was in flight", async () => {
+    await run(async () => {
+      saveDraft("a different idea");
+    });
+
+    expect(draftText()).toBe("a different idea");
+  });
+  it("keeps a newer draft written while workspace creation was pending", async () => {
+    useWorkspaceAttachmentsStore.getState().addWorkspaceAttachment({
+      scopeKey: SCOPE_KEY,
+      attachment: {
+        kind: "chat_history",
+        id: "fork-context",
+        attachment: {
+          type: "text",
+          mimeType: "text/plain",
+          contextKind: "chat_history",
+          title: "Chat history",
+          text: "Preserve this context",
+        },
+        source: { serverId: "local", agentId: "agent-1" },
+      },
+    });
+    const clearConsumedDraft = captureCleanup();
+    saveDraft("a newer workspace idea");
+    await run(async () => undefined, clearConsumedDraft);
+    expect(draftText()).toBe("a newer workspace idea");
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[SCOPE_KEY]).toHaveLength(1);
+  });
+});
diff --git a/packages/app/src/screens/new-workspace/background-handoff.ts b/packages/app/src/screens/new-workspace/background-handoff.ts
new file mode 100644
index 0000000000..598772f1a1
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/background-handoff.ts
@@ -0,0 +1,54 @@
+import { useWorkspaceAttachmentsStore } from "@/attachments/workspace-attachments-store";
+import { useDraftStore } from "@/stores/draft-store";
+import { useWorkspaceDraftSubmissionStore } from "@/stores/workspace-draft-submission-store";
+
+interface WorkspaceDraftCleanupInput {
+  draftId?: string;
+  draftKey: string;
+  clearDraft: (lifecycle: "sent" | "abandoned") => void;
+  draftContextScopeKey: string | null;
+}
+
+/** Capture ownership before workspace creation starts, not when its response arrives. */
+export function captureWorkspaceDraftCleanup(input: WorkspaceDraftCleanupInput): () => void {
+  const draftId = input.draftId?.trim() ?? "";
+  const scopeKey = input.draftContextScopeKey ?? "";
+  const draftVersion = useDraftStore.getState().drafts[input.draftKey]?.version;
+  const setup = useWorkspaceDraftSubmissionStore.getState().setupByDraftId[draftId];
+  const attachments = useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey];
+
+  return () => {
+    // These stores update independently. A context-only edit does not bump the text version.
+    // Any newer draft state owns the whole draft, including its unchanged context.
+    if (
+      useDraftStore.getState().drafts[input.draftKey]?.version !== draftVersion ||
+      useWorkspaceDraftSubmissionStore.getState().setupByDraftId[draftId] !== setup ||
+      useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey] !== attachments
+    ) {
+      return;
+    }
+    useWorkspaceDraftSubmissionStore.getState().clearDraftSetup({ draftId });
+    if (scopeKey) {
+      useWorkspaceAttachmentsStore.getState().clearWorkspaceAttachments({ scopeKey });
+    }
+    input.clearDraft("sent");
+  };
+}
+
+/**
+ * The workspace draft tab normally issues create_agent once it mounts on the destination screen.
+ * When the user leaves the New workspace screen before creation resolves, that tab never mounts,
+ * so this path issues the request itself. The agent tab opens on its own when the workspace is
+ * next visited — `reconcileTabs` auto-opens agents.
+ *
+ * The caller must not write a pending entry to the draft-submission or create-flow stores on this
+ * path: those drive the draft tab's auto-submit, and the daemon does not dedupe create_agent by
+ * clientMessageId, so a leftover entry would create a second agent when the workspace is opened.
+ */
+export async function createWorkspaceAgentInBackground(input: {
+  clearConsumedDraft: () => void;
+  createAgent: () => Promise<unknown>;
+}): Promise<void> {
+  await input.createAgent();
+  input.clearConsumedDraft();
+}
diff --git a/packages/app/src/screens/new-workspace/import-session-button.tsx b/packages/app/src/screens/new-workspace/import-session-button.tsx
new file mode 100644
index 0000000000..39b55e1b2e
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/import-session-button.tsx
@@ -0,0 +1,50 @@
+import { Import } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { Button } from "@/components/ui/button";
+
+/**
+ * The new workspace screen's way into Import session: a ghost button at the top on compact
+ * layouts, an outlined pill under the composer otherwise. Both are muted until hovered.
+ */
+export function ImportSessionButton({
+  compact,
+  onPress,
+}: {
+  compact: boolean;
+  onPress: () => void;
+}) {
+  const { t } = useTranslation();
+  return (
+    <View style={compact ? styles.compact : styles.wide}>
+      <Button
+        // Ghost for its muted text that turns foreground on hover; the pill adds the outline.
+        variant="ghost"
+        size="sm"
+        leftIcon={Import}
+        onPress={onPress}
+        style={compact ? null : styles.pill}
+        testID="new-workspace-import-session"
+      >
+        {t("importSession.title")}
+      </Button>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  compact: {
+    alignItems: "flex-start",
+  },
+  // The composer sits spacing[4] in from the dock and leaves spacing[4] below itself; the pill's
+  // border lines up with the composer's border.
+  wide: {
+    alignItems: "flex-start",
+    paddingHorizontal: theme.spacing[4],
+  },
+  pill: {
+    borderRadius: theme.borderRadius.full,
+    borderColor: theme.colors.borderAccent,
+  },
+}));
diff --git a/packages/app/src/screens/new-workspace/screen-presence.test.ts b/packages/app/src/screens/new-workspace/screen-presence.test.ts
new file mode 100644
index 0000000000..7213583c13
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/screen-presence.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vitest";
+import { isNewWorkspaceScreenActive } from "./screen-presence";
+
+describe("isNewWorkspaceScreenActive", () => {
+  it("is active while the screen is mounted and the route is /new", () => {
+    expect(isNewWorkspaceScreenActive({ isMounted: true, pathname: "/new" })).toBe(true);
+  });
+
+  it("is inactive once the screen has been popped off the stack", () => {
+    expect(isNewWorkspaceScreenActive({ isMounted: false, pathname: "/new" })).toBe(false);
+  });
+
+  it("is inactive while another route sits on top of the screen", () => {
+    expect(isNewWorkspaceScreenActive({ isMounted: true, pathname: "/settings" })).toBe(false);
+  });
+
+  it("is inactive on a workspace route", () => {
+    expect(isNewWorkspaceScreenActive({ isMounted: true, pathname: "/host/workspace/wks_1" })).toBe(
+      false,
+    );
+  });
+});
diff --git a/packages/app/src/screens/new-workspace/screen-presence.ts b/packages/app/src/screens/new-workspace/screen-presence.ts
new file mode 100644
index 0000000000..812138e399
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/screen-presence.ts
@@ -0,0 +1,41 @@
+import { usePathname } from "expo-router";
+import { useCallback, useEffect, useRef } from "react";
+
+const NEW_WORKSPACE_PATHNAME = "/new";
+
+export interface NewWorkspaceScreenPresence {
+  isMounted: boolean;
+  pathname: string;
+}
+
+/**
+ * Workspace creation blocks on a slow daemon RPC, so by the time it resolves the user may have
+ * moved on. Both signals are needed: popping to a workspace unmounts the screen while its last
+ * observed pathname stays "/new", and pushing a route on top of it keeps it mounted underneath.
+ */
+export function isNewWorkspaceScreenActive(input: NewWorkspaceScreenPresence): boolean {
+  return input.isMounted && input.pathname === NEW_WORKSPACE_PATHNAME;
+}
+
+export function useNewWorkspaceScreenPresence(): () => boolean {
+  const pathname = usePathname();
+  const pathnameRef = useRef(pathname);
+  pathnameRef.current = pathname;
+  const isMountedRef = useRef(true);
+
+  useEffect(() => {
+    isMountedRef.current = true;
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, []);
+
+  return useCallback(
+    () =>
+      isNewWorkspaceScreenActive({
+        isMounted: isMountedRef.current,
+        pathname: pathnameRef.current,
+      }),
+    [],
+  );
+}
diff --git a/packages/app/src/screens/open-project-screen.tsx b/packages/app/src/screens/open-project-screen.tsx
index 9cbe43d83e..4c340e0f15 100644
--- a/packages/app/src/screens/open-project-screen.tsx
+++ b/packages/app/src/screens/open-project-screen.tsx
@@ -1,3 +1,4 @@
+import { useHosts, useHostRuntimeLastError } from "@/runtime/host-runtime";
 import { useCallback, useEffect, useState, type ComponentType } from "react";
 import { useTranslation } from "react-i18next";
 import { View, Text, Pressable } from "react-native";
@@ -24,6 +25,7 @@ import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 
 export function OpenProjectScreen() {
   const { t } = useTranslation();
+  const hosts = useHosts();
   const router = useRouter();
   const openDesktopAgentList = usePanelStore((s) => s.openDesktopAgentList);
   const openProjectPicker = useOpenAddProject();
@@ -64,6 +66,9 @@ export function OpenProjectScreen() {
         <View style={styles.logo}>
           <PaseoLogo size={52} />
         </View>
+        {hosts.map((host) => (
+          <HostError key={host.serverId} serverId={host.serverId} label={host.label} />
+        ))}
         <View style={styles.tiles}>
           <HomeTile
             icon={FolderOpen}
@@ -112,6 +117,15 @@ export function OpenProjectScreen() {
   );
 }
 
+function HostError({ serverId, label }: { serverId: string; label: string }) {
+  const error = useHostRuntimeLastError(serverId);
+  return error ? (
+    <Text accessibilityRole="alert" style={styles.hostError}>
+      {label}: {error}
+    </Text>
+  ) : null;
+}
+
 interface HomeTileProps {
   icon: ComponentType<{ size: number; color: string }>;
   title: string;
@@ -178,6 +192,12 @@ const styles = StyleSheet.create((theme) => ({
   logo: {
     marginBottom: theme.spacing[8],
   },
+  hostError: {
+    color: theme.colors.destructive,
+    fontSize: theme.fontSize.base,
+    maxWidth: 452,
+    textAlign: "center",
+  },
   tiles: {
     marginTop: { xs: theme.spacing[6], md: theme.spacing[12] },
     width: "100%",
diff --git a/packages/app/src/screens/project-settings-screen.tsx b/packages/app/src/screens/project-settings-screen.tsx
index 591c955269..50c81a05fd 100644
--- a/packages/app/src/screens/project-settings-screen.tsx
+++ b/packages/app/src/screens/project-settings-screen.tsx
@@ -28,8 +28,8 @@ import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-moda
 import { ProjectEditSheet } from "@/components/project-edit-sheet";
 import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import { SettingsTextAreaCard } from "@/components/settings-textarea";
-import { SettingsGroup } from "@/screens/settings/settings-group";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsGroup } from "@/components/settings/headings/settings-group";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import { useProjects } from "@/hooks/use-projects";
 import type { ProjectEditFormSnapshot } from "@/projects/edit-form";
@@ -419,7 +419,7 @@ function ReadFailureCallout({ kind, error, onReload }: ReadFailureCalloutProps)
   });
   return (
     <View style={styles.errorBlock}>
-      <Alert testID={testID} variant="error" title={title} description={description}>
+      <Alert size="md" testID={testID} variant="error" title={title} description={description}>
         <Button testID={`${testID}-action-0`} onPress={onReload} variant="outline" size="sm">
           {t("settings.project.actions.reload")}
         </Button>
@@ -702,6 +702,7 @@ function ProjectConfigForm({
         >
           {hasUncommittedWorktreeSetupChanges ? (
             <Alert
+              size="sm"
               variant="warning"
               title={t("settings.project.worktree.uncommittedTitle")}
               description={t("settings.project.worktree.uncommittedDescription")}
@@ -776,6 +777,7 @@ function ProjectConfigForm({
       {isStale ? (
         <View style={styles.calloutWrap}>
           <Alert
+            size="sm"
             testID="stale-callout"
             variant="error"
             title={t("settings.project.writeFailures.staleTitle")}
@@ -796,6 +798,7 @@ function ProjectConfigForm({
       {isWriteFailed ? (
         <View style={styles.calloutWrap}>
           <Alert
+            size="sm"
             testID="write-failed-callout"
             variant="error"
             title={t("settings.project.writeFailures.failedTitle")}
diff --git a/packages/app/src/screens/projects-screen.test.tsx b/packages/app/src/screens/projects-screen.test.tsx
index 0533d7c810..0e3337e240 100644
--- a/packages/app/src/screens/projects-screen.test.tsx
+++ b/packages/app/src/screens/projects-screen.test.tsx
@@ -7,27 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { ProjectHostEntry, ProjectSummary, WorkspaceSummary } from "@/utils/projects";
 import type { ProjectHostError, UseProjectsResult } from "@/hooks/use-projects";
 
-const { theme, projectsState, push } = vi.hoisted(() => ({
-  theme: {
-    spacing: { 0: 0, 1: 4, "1.5": 6, 2: 8, 3: 12, 4: 16, 6: 24, 8: 32 },
-    iconSize: { sm: 14, md: 20 },
-    fontSize: { xs: 11, sm: 13, base: 15 },
-    fontWeight: { normal: "400" as const, medium: "500" as const },
-    borderRadius: { sm: 4, md: 6, lg: 8, full: 999 },
-    opacity: { 50: 0.5 },
-    colors: {
-      surface0: "#000",
-      surface1: "#111",
-      surface2: "#222",
-      surface3: "#333",
-      surfaceSidebarHover: "#1a1a1a",
-      foreground: "#fff",
-      foregroundMuted: "#aaa",
-      border: "#444",
-      accent: "#0a84ff",
-      palette: { red: { 300: "#ff6b6b" } },
-    },
-  },
+const { projectsState, push } = vi.hoisted(() => ({
   projectsState: {
     current: {
       projects: [],
@@ -40,7 +20,8 @@ const { theme, projectsState, push } = vi.hoisted(() => ({
   push: vi.fn(),
 }));
 
-vi.mock("react-native", () => {
+vi.mock("react-native", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("react-native")>();
   const passthrough = ({
     children,
     testID,
@@ -87,6 +68,7 @@ vi.mock("react-native", () => {
   };
 
   return {
+    ...actual,
     View: ({ children, testID }: { children?: React.ReactNode; testID?: string }) =>
       React.createElement("div", { "data-testid": testID }, children),
     Text: ({ children }: { children?: React.ReactNode }) =>
@@ -101,21 +83,15 @@ vi.mock("react-native", () => {
   };
 });
 
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) =>
-      typeof factory === "function" ? (factory as (t: typeof theme) => unknown)(theme) : factory,
-  },
-  useUnistyles: () => ({ theme }),
-}));
-
-vi.mock("lucide-react-native", () => {
+vi.mock("lucide-react-native", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("lucide-react-native")>();
   const icon = (name: string) => {
     const Icon = () => React.createElement("span", { "data-icon": name });
     Icon.displayName = name;
     return Icon;
   };
   return {
+    ...actual,
     ChevronRight: icon("ChevronRight"),
     MoreVertical: icon("MoreVertical"),
     ExternalLink: icon("ExternalLink"),
@@ -128,19 +104,6 @@ vi.mock("expo-router", () => ({
   router: { push },
 }));
 
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (key: string, values?: Record<string, string>) => {
-      if (key === "sidebar.project.empty.title") return "No projects yet";
-      if (key === "settings.projectList.hostLoadFailed") {
-        return `Couldn't load projects from host ${values?.hostName}: ${values?.message}`;
-      }
-      if (key === "settings.projectList.editProject") return `Edit ${values?.projectName}`;
-      return key;
-    },
-  }),
-}));
-
 vi.mock("@/components/ui/loading-spinner", () => ({
   LoadingSpinner: ({ size }: { size?: string | number }) =>
     React.createElement("span", {
@@ -208,6 +171,7 @@ vi.mock("@/projects/icons", () => ({
   useProjectIcons: () => new Map(),
 }));
 
+import { i18n } from "@/i18n/i18next";
 import ProjectsScreen from "./projects-screen";
 
 function workspaceSummary(overrides: Partial<WorkspaceSummary> = {}): WorkspaceSummary {
@@ -275,7 +239,8 @@ describe("ProjectsScreen", () => {
   let container: HTMLElement | null = null;
   let root: Root | null = null;
 
-  beforeEach(() => {
+  beforeEach(async () => {
+    await i18n.changeLanguage("en");
     vi.stubGlobal("React", React);
     vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
     container = document.createElement("div");
diff --git a/packages/app/src/screens/sessions-screen.tsx b/packages/app/src/screens/sessions-screen.tsx
index 7cc3294ef5..bcd1e4f740 100644
--- a/packages/app/src/screens/sessions-screen.tsx
+++ b/packages/app/src/screens/sessions-screen.tsx
@@ -87,7 +87,6 @@ function SessionsScreenContent() {
     isError,
     isSearchSupported,
     isSearchTruncated,
-    searchMatchesByAgentKey,
     hostErrors,
     loadMore,
     refreshAll,
@@ -113,7 +112,7 @@ function SessionsScreenContent() {
     void refreshAll().finally(() => setIsManualRefresh(false));
   }, [refreshAll]);
 
-  // `useAgentHistory` owns the order: recency at rest, relevance under a query.
+  // Searching filters the chronological history without changing its date buckets.
   const emptyText = resolveEmptyText({
     t,
     isSearching,
@@ -130,8 +129,8 @@ function SessionsScreenContent() {
   const handleClearSearch = useCallback(() => setSearchInput(""), []);
 
   const listFooterComponent = useMemo(() => {
-    // A ranked result set has no next page — reaching a weaker match means
-    // narrowing the query, so the footer says that instead of offering a button.
+    // COMPAT(historyPagination): old daemons return a truncated relevance page.
+    // Added in v0.8.0; remove after 2027-03-16 once the daemon floor supports search pagination.
     if (isSearchTruncated) {
       return (
         <View style={styles.footer}>
@@ -217,8 +216,7 @@ function SessionsScreenContent() {
           listFooterComponent={listFooterComponent}
           showAttentionIndicator={false}
           showHostColumn
-          searchMatchesByAgentKey={isSearching ? searchMatchesByAgentKey : undefined}
-          flat={isSearching}
+          search={isSearching ? search : undefined}
         />
       ) : null}
       {importSession.sheet}
diff --git a/packages/app/src/screens/settings-screen.tsx b/packages/app/src/screens/settings-screen.tsx
index 5e5e9be474..925607a858 100644
--- a/packages/app/src/screens/settings-screen.tsx
+++ b/packages/app/src/screens/settings-screen.tsx
@@ -8,7 +8,6 @@ import {
   View,
   type PressableStateCallbackType,
 } from "react-native";
-import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import { useRouter } from "expo-router";
 import { useFocusEffect } from "@react-navigation/native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -38,26 +37,27 @@ import {
   Smartphone,
   Sparkles,
   Blocks,
-  PanelsTopLeft,
+  Globe,
+  PanelLeft,
+  MessageSquare,
+  ChevronRight,
 } from "lucide-react-native";
 import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
 import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
-import { SidebarSeparator } from "@/components/sidebar/sidebar-separator";
 import { HostPicker as SharedHostPicker } from "@/components/hosts/host-picker";
 import { HostStatusDot } from "@/components/host-status-dot";
-import { ScreenTitle } from "@/components/headers/screen-title";
-import { HeaderIconBadge } from "@/components/headers/header-icon-badge";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { AppearanceSection } from "@/screens/settings/appearance/appearance-section";
-import { LayoutSection } from "@/screens/settings/layout/layout-section";
+import { OpenLocationSection } from "@/screens/settings/open-location/open-location-section";
+import { TerminalSection } from "@/screens/settings/terminal/terminal-section";
+import { ChatSection } from "@/screens/settings/chat/chat-section";
+import { SidebarNavSection } from "@/screens/settings/sidebar/sidebar-nav-section";
+import { SendingSection } from "@/screens/settings/general/sending-section";
 import {
   useAppSettings,
   useSettings,
-  parseTerminalScrollbackLines,
   type AppSettings,
-  type SendBehavior,
-  type ServiceUrlBehavior,
   type Settings as EffectiveSettings,
 } from "@/hooks/use-settings";
 import { useHostRuntimeIsConnected, useHosts } from "@/runtime/host-runtime";
@@ -71,7 +71,7 @@ import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { WindowChromeRegion, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { BackHeader } from "@/components/headers/back-header";
-import { ScreenHeader } from "@/components/headers/screen-header";
+import { PageLayout } from "@/components/page-layout";
 import { AddHostMethodModal } from "@/components/add-host-method-modal";
 import { AddHostModal } from "@/components/add-host-modal";
 import { AddRemoteSshHostModal } from "@/components/add-remote-ssh-host-modal";
@@ -91,6 +91,7 @@ import { isElectronRuntime } from "@/desktop/host";
 import { useDesktopAppUpdater } from "@/desktop/updates/use-desktop-app-updater";
 import { formatVersionWithPrefix } from "@/desktop/updates/desktop-updates";
 import { resolveAppVersion } from "@/utils/app-version";
+import { openChangelog } from "@/changelog";
 import { useAppDiagnosticStore } from "@/diagnostics/store";
 import { settingsStyles } from "@/styles/settings";
 import { THINKING_TONE_NATIVE_PCM_BASE64 } from "@/utils/thinking-tone.native-pcm";
@@ -112,6 +113,8 @@ import {
   HostWorkspacesPage,
   HostTerminalsPage,
 } from "@/screens/settings/host-page";
+import { PluginSettingsContent } from "@/plugins/settings";
+import { useInstalledPlugins } from "@/plugins/registry";
 import { HostPluginsPage } from "@/screens/settings/plugins-page";
 import { MetadataGenerationPage } from "@/screens/settings/metadata-generation-page";
 import ProjectsScreen from "@/screens/projects-screen";
@@ -139,48 +142,88 @@ import { isNative, isWeb } from "@/constants/platform";
 interface SidebarSectionItem {
   id: SettingsSectionSlug;
   labelKey: string;
-  icon: ComponentType<{ size: number; color: string }>;
+  icon: ComponentType<{ size: number; color: string; strokeWidth?: number }>;
   desktopOnly?: boolean;
   webOnly?: boolean;
+  /** The page body, for pages that need nothing from the settings screen. */
+  Content?: ComponentType;
 }
 
 const SIDEBAR_SECTION_ITEMS: SidebarSectionItem[] = [
   { id: "general", labelKey: "settings.sections.general", icon: Settings },
-  { id: "appearance", labelKey: "settings.sections.appearance", icon: Palette },
   {
-    id: "layout",
-    labelKey: "settings.sections.layout",
-    icon: PanelsTopLeft,
+    id: "appearance",
+    labelKey: "settings.sections.appearance",
+    icon: Palette,
+    Content: AppearanceSection,
+  },
+  {
+    id: "sidebar",
+    labelKey: "settings.sections.sidebar",
+    icon: PanelLeft,
+    Content: SidebarNavSection,
+  },
+  { id: "chat", labelKey: "settings.sections.chat", icon: MessageSquare, Content: ChatSection },
+  {
+    id: "terminal",
+    labelKey: "settings.sections.terminal",
+    icon: SquareTerminal,
+    Content: TerminalSection,
+  },
+  {
+    id: "browser",
+    labelKey: "settings.sections.browser",
+    icon: Globe,
     desktopOnly: true,
+    Content: BrowserDataSection,
+  },
+  {
+    id: "editor",
+    labelKey: "settings.sections.editor",
+    icon: Code2,
+    webOnly: true,
+    Content: EditorSection,
+  },
+  {
+    id: "shortcuts",
+    labelKey: "settings.sections.shortcuts",
+    icon: Keyboard,
+    desktopOnly: true,
+    Content: KeyboardShortcutsSection,
   },
-  { id: "editor", labelKey: "settings.sections.editor", icon: Code2, webOnly: true },
-  { id: "shortcuts", labelKey: "settings.sections.shortcuts", icon: Keyboard, desktopOnly: true },
   {
     id: "integrations",
     labelKey: "settings.sections.integrations",
     icon: Puzzle,
     desktopOnly: true,
+    Content: IntegrationsSection,
   },
   {
     id: "notifications",
     labelKey: "settings.sections.notifications",
     icon: Bell,
     desktopOnly: true,
+    Content: DesktopNotificationsSection,
   },
   {
     id: "permissions",
     labelKey: "settings.sections.permissions",
     icon: Shield,
     desktopOnly: true,
+    Content: DesktopPermissionsSection,
   },
   { id: "diagnostics", labelKey: "settings.sections.diagnostics", icon: Stethoscope },
   { id: "about", labelKey: "settings.sections.about", icon: Info },
 ];
 
+function isSectionAvailable(item: SidebarSectionItem, isDesktopApp: boolean): boolean {
+  return (!item.desktopOnly || isDesktopApp) && (!item.webOnly || isWeb);
+}
+
 interface HostSectionItem {
   id: HostSectionSlug;
   labelKey: string;
-  icon: ComponentType<{ size: number; color: string }>;
+  icon: ComponentType<{ size: number; color: string; strokeWidth?: number }>;
 }
 
 const HOST_SECTION_ITEMS: HostSectionItem[] = [
@@ -231,10 +274,6 @@ function renderHostSettingsContent(
 // Trigger + sidebar style helpers
 // ---------------------------------------------------------------------------
 
-function themeTriggerStyle({ pressed }: PressableStateCallbackType) {
-  return [styles.themeTrigger, pressed && { opacity: 0.85 }];
-}
-
 function sidebarItemStyle({ hovered }: PressableStateCallbackType & { hovered?: boolean }) {
   return [sidebarStyles.item, Boolean(hovered) && sidebarStyles.itemHovered];
 }
@@ -247,82 +286,18 @@ function selectedSidebarItemStyle({ hovered }: PressableStateCallbackType & { ho
   ];
 }
 
-function getSendBehaviorOptions(t: TFunction) {
-  return [
-    { value: "interrupt" as const, label: t("settings.general.defaultSend.options.interrupt") },
-    { value: "steer" as const, label: t("settings.general.defaultSend.options.steer") },
-    { value: "queue" as const, label: t("settings.general.defaultSend.options.queue") },
-  ];
-}
-
-function getServiceUrlBehaviorLabel(t: TFunction, value: ServiceUrlBehavior): string {
-  const labels: Record<ServiceUrlBehavior, string> = {
-    ask: t("settings.general.serviceUrls.options.ask"),
-    "in-app": t("settings.general.serviceUrls.options.inApp"),
-    external: t("settings.general.serviceUrls.options.external"),
-  };
-  return labels[value];
-}
-
 function getActiveLocale(language: string | undefined): SupportedLocale {
   const parsed = parseAppLanguage(language);
   return parsed && parsed !== "system" ? parsed : "en";
 }
 
-const SERVICE_URL_BEHAVIOR_VALUES: ServiceUrlBehavior[] = ["ask", "in-app", "external"];
-
 // ---------------------------------------------------------------------------
 // Section components
 // ---------------------------------------------------------------------------
 
 interface GeneralSectionProps {
   settings: AppSettings;
-  isDesktopApp: boolean;
-  handleSendBehaviorChange: (behavior: SendBehavior) => void;
-  handleServiceUrlBehaviorChange: (behavior: ServiceUrlBehavior) => void;
   handleLanguageChange: (language: AppLanguage) => void;
-  handleTerminalScrollbackLinesChange: (lines: number) => void;
-}
-
-interface ServiceUrlBehaviorMenuItemProps {
-  value: ServiceUrlBehavior;
-  label: string;
-  selected: boolean;
-  onChange: (value: ServiceUrlBehavior) => void;
-}
-
-interface SendBehaviorMenuItemProps {
-  value: SendBehavior;
-  label: string;
-  selected: boolean;
-  onChange: (value: SendBehavior) => void;
-}
-
-function SendBehaviorMenuItem({ value, label, selected, onChange }: SendBehaviorMenuItemProps) {
-  const handleSelect = useCallback(() => {
-    onChange(value);
-  }, [onChange, value]);
-  return (
-    <DropdownMenuItem selected={selected} onSelect={handleSelect}>
-      {label}
-    </DropdownMenuItem>
-  );
-}
-
-function ServiceUrlBehaviorMenuItem({
-  value,
-  label,
-  selected,
-  onChange,
-}: ServiceUrlBehaviorMenuItemProps) {
-  const handleSelect = useCallback(() => {
-    onChange(value);
-  }, [onChange, value]);
-  return (
-    <DropdownMenuItem selected={selected} onSelect={handleSelect}>
-      {label}
-    </DropdownMenuItem>
-  );
 }
 
 interface LanguageMenuItemProps {
@@ -349,21 +324,9 @@ function LanguageMenuItem({ value, activeLocale, selected, onChange }: LanguageM
   );
 }
 
-function GeneralSection({
-  settings,
-  isDesktopApp,
-  handleSendBehaviorChange,
-  handleServiceUrlBehaviorChange,
-  handleLanguageChange,
-  handleTerminalScrollbackLinesChange,
-}: GeneralSectionProps) {
+function GeneralSection({ settings, handleLanguageChange }: GeneralSectionProps) {
   const { t, i18n } = useTranslation();
   const activeLocale = getActiveLocale(i18n.language);
-  const sendBehaviorOptions = useMemo(() => getSendBehaviorOptions(t), [t]);
-  const selectedSendBehaviorLabel =
-    sendBehaviorOptions.find((option) => option.value === settings.sendBehavior)?.label ??
-    settings.sendBehavior;
-  const sendBehaviorDescriptionKey = `settings.general.defaultSend.descriptions.${settings.sendBehavior}`;
   const selectedLanguageOption = LANGUAGE_OPTIONS.find(
     (option) => option.value === settings.language,
   );
@@ -374,72 +337,17 @@ function GeneralSection({
         t(selectedLanguageOption.labelKey),
       )
     : settings.language;
-  const [terminalScrollbackValue, setTerminalScrollbackValue] = useState(
-    String(settings.terminalScrollbackLines),
-  );
-
-  const handleTerminalScrollbackChangeText = useCallback((value: string) => {
-    setTerminalScrollbackValue(value.replace(/[^\d]/g, ""));
-  }, []);
-
-  const commitTerminalScrollback = useCallback(() => {
-    const parsed = parseTerminalScrollbackLines(terminalScrollbackValue);
-    const nextValue = parsed ?? settings.terminalScrollbackLines;
-    setTerminalScrollbackValue(String(nextValue));
-    if (nextValue !== settings.terminalScrollbackLines) {
-      handleTerminalScrollbackLinesChange(nextValue);
-    }
-  }, [
-    handleTerminalScrollbackLinesChange,
-    settings.terminalScrollbackLines,
-    terminalScrollbackValue,
-  ]);
-
-  useEffect(() => {
-    setTerminalScrollbackValue(String(settings.terminalScrollbackLines));
-  }, [settings.terminalScrollbackLines]);
-
   return (
     <SettingsSection title={t("settings.general.title")}>
       <View style={settingsStyles.card}>
         <View style={settingsStyles.row}>
-          <View style={settingsStyles.rowContent}>
-            <Text style={settingsStyles.rowTitle}>{t("settings.general.defaultSend.label")}</Text>
-            <Text style={settingsStyles.rowHint}>{t(sendBehaviorDescriptionKey)}</Text>
-          </View>
-          <DropdownMenu>
-            <DropdownTrigger
-              accessibilityRole="button"
-              accessibilityLabel={`${t("settings.general.defaultSend.label")}: ${selectedSendBehaviorLabel}`}
-              style={themeTriggerStyle}
-            >
-              <Text style={styles.themeTriggerText}>{selectedSendBehaviorLabel}</Text>
-            </DropdownTrigger>
-            <DropdownMenuContent side="bottom" align="end" width={200}>
-              {sendBehaviorOptions.map((option) => (
-                <SendBehaviorMenuItem
-                  key={option.value}
-                  value={option.value}
-                  label={option.label}
-                  selected={settings.sendBehavior === option.value}
-                  onChange={handleSendBehaviorChange}
-                />
-              ))}
-            </DropdownMenuContent>
-          </DropdownMenu>
-        </View>
-        <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
           <View style={settingsStyles.rowContent}>
             <Text style={settingsStyles.rowTitle}>{t("settings.general.language.label")}</Text>
             <Text style={settingsStyles.rowHint}>{t("settings.general.language.description")}</Text>
           </View>
           <DropdownMenu>
-            <DropdownTrigger
-              accessibilityRole="button"
-              accessibilityLabel={selectedLanguageLabel}
-              style={themeTriggerStyle}
-            >
-              <Text style={styles.themeTriggerText}>{selectedLanguageLabel}</Text>
+            <DropdownTrigger accessibilityRole="button" accessibilityLabel={selectedLanguageLabel}>
+              {selectedLanguageLabel}
             </DropdownTrigger>
             <DropdownMenuContent side="bottom" align="end" width={300}>
               {LANGUAGE_OPTIONS.map((option) => (
@@ -454,55 +362,6 @@ function GeneralSection({
             </DropdownMenuContent>
           </DropdownMenu>
         </View>
-        {isDesktopApp ? (
-          <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
-            <View style={settingsStyles.rowContent}>
-              <Text style={settingsStyles.rowTitle}>{t("settings.general.serviceUrls.label")}</Text>
-              <Text style={settingsStyles.rowHint}>
-                {t("settings.general.serviceUrls.description")}
-              </Text>
-            </View>
-            <DropdownMenu>
-              <DropdownTrigger style={themeTriggerStyle}>
-                <Text style={styles.themeTriggerText}>
-                  {getServiceUrlBehaviorLabel(t, settings.serviceUrlBehavior)}
-                </Text>
-              </DropdownTrigger>
-              <DropdownMenuContent side="bottom" align="end" width={200}>
-                {SERVICE_URL_BEHAVIOR_VALUES.map((value) => (
-                  <ServiceUrlBehaviorMenuItem
-                    key={value}
-                    value={value}
-                    label={getServiceUrlBehaviorLabel(t, value)}
-                    selected={settings.serviceUrlBehavior === value}
-                    onChange={handleServiceUrlBehaviorChange}
-                  />
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </View>
-        ) : null}
-        <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
-          <View style={settingsStyles.rowContent}>
-            <Text style={settingsStyles.rowTitle}>
-              {t("settings.general.terminalScrollback.label")}
-            </Text>
-            <Text style={settingsStyles.rowHint}>
-              {t("settings.general.terminalScrollback.description")}
-            </Text>
-          </View>
-          <TextInput
-            initialValue={terminalScrollbackValue}
-            onChangeText={handleTerminalScrollbackChangeText}
-            onBlur={commitTerminalScrollback}
-            onSubmitEditing={commitTerminalScrollback}
-            keyboardType="number-pad"
-            inputMode="numeric"
-            selectTextOnFocus
-            style={styles.terminalScrollbackInput}
-            accessibilityLabel={t("settings.general.terminalScrollback.accessibilityLabel")}
-          />
-        </View>
       </View>
     </SettingsSection>
   );
@@ -604,6 +463,7 @@ function AboutSection({ appVersion, appVersionText, isDesktopApp }: AboutSection
             </View>
             <Text style={styles.aboutValue}>{appVersionText}</Text>
           </View>
+          <WhatsNewRow />
           {isDesktopApp ? <DesktopAppUpdateRow /> : null}
         </View>
       </SettingsSection>
@@ -615,6 +475,33 @@ function AboutSection({ appVersion, appVersionText, isDesktopApp }: AboutSection
   );
 }
 
+function WhatsNewRow() {
+  const { t } = useTranslation();
+  const { theme } = useUnistyles();
+
+  return (
+    <Pressable
+      style={[settingsStyles.row, settingsStyles.rowBorder]}
+      onPress={openChangelog}
+      accessibilityRole="button"
+      testID="settings-whats-new"
+    >
+      {({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => (
+        <>
+          <View style={settingsStyles.rowContent}>
+            <Text style={settingsStyles.rowTitle}>{t("changelog.title")}</Text>
+            <Text style={settingsStyles.rowHint}>{t("settings.about.whatsNewHint")}</Text>
+          </View>
+          <ChevronRight
+            size={theme.iconSize.sm}
+            color={hovered ? theme.colors.foreground : theme.colors.foregroundMuted}
+          />
+        </>
+      )}
+    </Pressable>
+  );
+}
+
 function normalizeVersion(version: string | null | undefined): string | null {
   const trimmed = version?.trim();
   if (!trimmed) return null;
@@ -856,11 +743,14 @@ function useSortedHosts(hosts: HostProfile[], localServerId: string | null): Hos
 interface SidebarSectionButtonProps {
   itemId: SettingsSectionSlug;
   label: string;
-  icon: ComponentType<{ size: number; color: string }>;
+  icon: ComponentType<{ size: number; color: string; strokeWidth?: number }>;
   isSelected: boolean;
   onSelect: (section: SettingsSectionSlug) => void;
 }
 
+// Lighter than lucide's default 2px stroke so the nav reads quieter than the content.
+const SIDEBAR_ICON_STROKE_WIDTH = 1.5;
+
 function SidebarSectionButton({
   itemId,
   label,
@@ -887,6 +777,7 @@ function SidebarSectionButton({
       <IconComponent
         size={theme.iconSize.md}
         color={isSelected ? theme.colors.foreground : theme.colors.foregroundMuted}
+        strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
       />
       <Text style={labelStyle} numberOfLines={1}>
         {label}
@@ -898,7 +789,7 @@ function SidebarSectionButton({
 interface SidebarHostSectionButtonProps {
   itemId: HostSectionSlug;
   label: string;
-  icon: ComponentType<{ size: number; color: string }>;
+  icon: ComponentType<{ size: number; color: string; strokeWidth?: number }>;
   isSelected: boolean;
   onSelect: (section: HostSectionSlug) => void;
 }
@@ -930,6 +821,7 @@ function SidebarHostSectionButton({
       <IconComponent
         size={theme.iconSize.md}
         color={isSelected ? theme.colors.foreground : theme.colors.foregroundMuted}
+        strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
       />
       <Text style={labelStyle} numberOfLines={1}>
         {label}
@@ -1049,9 +941,7 @@ function SettingsSidebar({
   const hasHosts = sortedHosts.length > 0;
   const enableBuiltInDaemonOption = useEnableBuiltInDaemonOption();
   const isDesktopApp = isElectronRuntime();
-  const items = SIDEBAR_SECTION_ITEMS.filter(
-    (item) => (!item.desktopOnly || isDesktopApp) && (!item.webOnly || isWeb),
-  );
+  const items = SIDEBAR_SECTION_ITEMS.filter((item) => isSectionAvailable(item, isDesktopApp));
   const insets = useSafeAreaInsets();
   const isDesktop = layout === "desktop";
   const outerContainerStyle = useMemo(
@@ -1066,6 +956,7 @@ function SettingsSidebar({
   let selectedHostSection: HostSectionSlug | null = null;
   if (view.kind === "host") selectedHostSection = view.section;
   if (view.kind === "project") selectedHostSection = "projects";
+  if (view.kind === "plugin") selectedHostSection = "plugins";
 
   const sidebarBody = (
     <>
@@ -1082,7 +973,6 @@ function SettingsSidebar({
           />
         ))}
       </View>
-      <SidebarSeparator />
       {hasHosts ? (
         <View style={sidebarStyles.list}>
           <Text style={sidebarStyles.groupLabel}>{t("settings.groups.host")}</Text>
@@ -1113,7 +1003,11 @@ function SettingsSidebar({
             testID="settings-add-host"
             style={sidebarItemStyle}
           >
-            <Plus size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+            <Plus
+              size={theme.iconSize.md}
+              color={theme.colors.foregroundMuted}
+              strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
+            />
             <Text style={sidebarStyles.label} numberOfLines={1}>
               {t("settings.addHost")}
             </Text>
@@ -1126,7 +1020,11 @@ function SettingsSidebar({
               testID="settings-enable-built-in-daemon"
               style={sidebarItemStyle}
             >
-              <Server size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+              <Server
+                size={theme.iconSize.md}
+                color={theme.colors.foregroundMuted}
+                strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
+              />
               <Text style={sidebarStyles.label} numberOfLines={1}>
                 {t("settings.enableBuiltInDaemon")}
               </Text>
@@ -1182,7 +1080,6 @@ export interface SettingsScreenProps {
 
 export default function SettingsScreen({ view, openAddHostIntent = null }: SettingsScreenProps) {
   const router = useRouter();
-  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const voiceAudioEngine = useVoiceAudioEngineOptional();
   const { settings, isLoading: settingsLoading, updateSettings } = useAppSettings();
@@ -1204,7 +1101,9 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
   const sortedHosts = useSortedHosts(hosts, localServerId);
   const lastWorkspaceSelection = useLastWorkspaceSelection();
   const routedSettingsHostServerId =
-    view.kind === "host" || view.kind === "project" ? view.serverId : null;
+    view.kind === "host" || view.kind === "project" || view.kind === "plugin"
+      ? view.serverId
+      : null;
   const [selectedSettingsHostServerId, setSelectedSettingsHostServerId] = useState<string | null>(
     routedSettingsHostServerId ?? lastWorkspaceSelection?.serverId ?? null,
   );
@@ -1219,7 +1118,8 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
   // The host the four sections scope to: the host on the active view, otherwise
   // the picker choice, otherwise the connected local daemon, otherwise the first host.
   const activeHostServerId = useMemo(() => {
-    if (view.kind === "host" || view.kind === "project") return view.serverId;
+    if (view.kind === "host" || view.kind === "project" || view.kind === "plugin")
+      return view.serverId;
     return resolveActiveHostServerId({
       selectedServerId: selectedSettingsHostServerId,
       localServerId,
@@ -1228,20 +1128,6 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
     });
   }, [view, selectedSettingsHostServerId, localServerId, hosts, sortedHosts]);
 
-  const handleSendBehaviorChange = useCallback(
-    (behavior: SendBehavior) => {
-      void updateSettings({ sendBehavior: behavior });
-    },
-    [updateSettings],
-  );
-
-  const handleServiceUrlBehaviorChange = useCallback(
-    (behavior: ServiceUrlBehavior) => {
-      void updateSettings({ serviceUrlBehavior: behavior });
-    },
-    [updateSettings],
-  );
-
   const handleLanguageChange = useCallback(
     (language: AppLanguage) => {
       void updateSettings({ language });
@@ -1249,13 +1135,6 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
     [updateSettings],
   );
 
-  const handleTerminalScrollbackLinesChange = useCallback(
-    (terminalScrollbackLines: number) => {
-      void updateSettings({ terminalScrollbackLines });
-    },
-    [updateSettings],
-  );
-
   const handleUseLegacyTerminalRendererChange = useCallback(
     (useLegacyTerminalRenderer: boolean) => {
       void updateSettings({ useLegacyTerminalRenderer });
@@ -1425,98 +1304,90 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
     returnFromSettings({ kind: "root" });
   }, []);
 
-  const detailHeader = ((): {
-    title: string;
-    Icon: ComponentType<{ size: number; color: string }>;
-    titleAccessory?: ReactNode;
-  } | null => {
+  const installedPlugins = useInstalledPlugins();
+  const detailTitle = ((): string | undefined => {
+    if (view.kind === "plugin") {
+      const screen = installedPlugins
+        .find((plugin) => plugin.serverId === view.serverId && plugin.id === view.pluginId)
+        ?.settingsScreens.find((candidate) => candidate.id === view.screenId);
+      return `${view.pluginId} · ${screen?.title ?? t("settings.title")}`;
+    }
     if (view.kind === "host") {
       const item = HOST_SECTION_ITEMS.find((s) => s.id === view.section);
-      if (!item) return null;
-      return { title: t(item.labelKey), Icon: item.icon };
+      return item ? t(item.labelKey) : undefined;
     }
     if (view.kind === "section") {
       const item = SIDEBAR_SECTION_ITEMS.find((s) => s.id === view.section);
-      if (!item) return null;
-      return { title: t(item.labelKey), Icon: item.icon };
+      return item ? t(item.labelKey) : undefined;
     }
     if (view.kind === "project") {
-      return { title: t("settings.projects"), Icon: FolderGit2 };
+      return t("settings.projects");
+    }
+    return undefined;
+  })();
+
+  const content: ReactNode = (() => {
+    if (view.kind === "plugin")
+      return (
+        <PluginSettingsContent
+          serverId={view.serverId}
+          pluginId={view.pluginId}
+          screenId={view.screenId}
+          onBackToPlugins={handleBackFromDetail}
+          showBackToPlugins={!isCompactLayout}
+        />
+      );
+    if (view.kind === "host") {
+      return renderHostSettingsContent(view, handleHostRemoved);
+    }
+    if (view.kind === "project") {
+      return (
+        <ProjectSettingsScreen
+          serverId={view.serverId}
+          projectId={view.projectId}
+          onBackToProjects={handleBackFromDetail}
+          showBackToProjects={!isCompactLayout}
+        />
+      );
+    }
+    if (view.kind === "section") {
+      const item = SIDEBAR_SECTION_ITEMS.find((candidate) => candidate.id === view.section);
+      if (!item || !isSectionAvailable(item, isDesktopApp)) return null;
+      switch (view.section) {
+        case "general":
+          return (
+            <>
+              <GeneralSection settings={settings} handleLanguageChange={handleLanguageChange} />
+              <SendingSection />
+              {isDesktopApp ? <OpenLocationSection /> : null}
+            </>
+          );
+        case "diagnostics":
+          return (
+            <DiagnosticsSection
+              useLegacyTerminalRenderer={settings.useLegacyTerminalRenderer}
+              onUseLegacyTerminalRendererChange={handleUseLegacyTerminalRendererChange}
+              voiceAudioEngine={voiceAudioEngine}
+              isPlaybackTestRunning={isPlaybackTestRunning}
+              playbackTestResult={playbackTestResult}
+              handlePlaybackTest={handlePlaybackTest}
+            />
+          );
+        case "about":
+          return (
+            <AboutSection
+              appVersion={appVersion}
+              appVersionText={appVersionText}
+              isDesktopApp={isDesktopApp}
+            />
+          );
+        default:
+          return item.Content ? <item.Content /> : null;
+      }
     }
     return null;
   })();
 
-  let content: ReactNode;
-  if (view.kind === "section" && view.section === "layout") {
-    content = isDesktopApp ? <LayoutSection /> : null;
-  } else {
-    content = (() => {
-      if (view.kind === "host") {
-        return renderHostSettingsContent(view, handleHostRemoved);
-      }
-      if (view.kind === "project") {
-        return (
-          <ProjectSettingsScreen
-            serverId={view.serverId}
-            projectId={view.projectId}
-            onBackToProjects={handleBackFromDetail}
-            showBackToProjects={!isCompactLayout}
-          />
-        );
-      }
-      if (view.kind === "section") {
-        switch (view.section) {
-          case "general":
-            return (
-              <>
-                <GeneralSection
-                  settings={settings}
-                  isDesktopApp={isDesktopApp}
-                  handleSendBehaviorChange={handleSendBehaviorChange}
-                  handleServiceUrlBehaviorChange={handleServiceUrlBehaviorChange}
-                  handleLanguageChange={handleLanguageChange}
-                  handleTerminalScrollbackLinesChange={handleTerminalScrollbackLinesChange}
-                />
-                {isDesktopApp ? <BrowserDataSection /> : null}
-              </>
-            );
-          case "appearance":
-            return <AppearanceSection />;
-          case "editor":
-            return isWeb ? <EditorSection /> : null;
-          case "shortcuts":
-            return isDesktopApp ? <KeyboardShortcutsSection /> : null;
-          case "integrations":
-            return isDesktopApp ? <IntegrationsSection /> : null;
-          case "notifications":
-            return isDesktopApp ? <DesktopNotificationsSection /> : null;
-          case "permissions":
-            return isDesktopApp ? <DesktopPermissionsSection /> : null;
-          case "diagnostics":
-            return (
-              <DiagnosticsSection
-                useLegacyTerminalRenderer={settings.useLegacyTerminalRenderer}
-                onUseLegacyTerminalRendererChange={handleUseLegacyTerminalRendererChange}
-                voiceAudioEngine={voiceAudioEngine}
-                isPlaybackTestRunning={isPlaybackTestRunning}
-                playbackTestResult={playbackTestResult}
-                handlePlaybackTest={handlePlaybackTest}
-              />
-            );
-          case "about":
-            return (
-              <AboutSection
-                appVersion={appVersion}
-                appVersionText={appVersionText}
-                isDesktopApp={isDesktopApp}
-              />
-            );
-        }
-      }
-      return null;
-    })();
-  }
-
   if (settingsLoading) {
     return (
       <View style={styles.loadingContainer}>
@@ -1525,16 +1396,6 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
     );
   }
 
-  const desktopDetailHeaderLeft = detailHeader ? (
-    <>
-      <HeaderIconBadge>
-        <detailHeader.Icon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-      </HeaderIconBadge>
-      <ScreenTitle testID="settings-detail-header-title">{detailHeader.title}</ScreenTitle>
-      {detailHeader.titleAccessory}
-    </>
-  ) : null;
-
   const addHostModals = (
     <>
       <AddHostMethodModal
@@ -1591,14 +1452,9 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
   if (isCompactLayout) {
     return (
       <View style={styles.container}>
-        <BackHeader
-          title={detailHeader?.title}
-          titleAccessory={detailHeader?.titleAccessory}
-          onBack={handleBackFromDetail}
-        />
-        <ScrollView style={styles.scrollView} contentContainerStyle={insetBottomStyle}>
-          <View style={styles.content}>{content}</View>
-        </ScrollView>
+        <PageLayout title={detailTitle} onBack={handleBackFromDetail}>
+          {content}
+        </PageLayout>
         {addHostModals}
       </View>
     );
@@ -1624,14 +1480,9 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
         </WindowChromeRegion>
         <WindowChromeRegion corners="top-right">
           <View style={desktopStyles.contentPane} testID="settings-detail-pane">
-            <ScreenHeader
-              borderless={!detailHeader}
-              left={desktopDetailHeaderLeft}
-              leftStyle={desktopStyles.detailLeft}
-            />
-            <ScrollView style={styles.scrollView} contentContainerStyle={insetBottomStyle}>
-              <View style={styles.content}>{content}</View>
-            </ScrollView>
+            <PageLayout title={detailTitle} titleTestID="settings-detail-header-title">
+              {content}
+            </PageLayout>
           </View>
         </WindowChromeRegion>
       </View>
@@ -1662,13 +1513,6 @@ const styles = StyleSheet.create((theme) => ({
   scrollView: {
     flex: 1,
   },
-  content: {
-    padding: theme.spacing[4],
-    paddingTop: theme.spacing[6],
-    width: "100%",
-    maxWidth: 720,
-    alignSelf: "center",
-  },
   aboutValue: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
@@ -1689,33 +1533,6 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     gap: theme.spacing[2],
   },
-  themeTrigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-  },
-  themeTriggerText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-  terminalScrollbackInput: {
-    width: 112,
-    minHeight: 36,
-    paddingVertical: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    backgroundColor: theme.colors.surface2,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    textAlign: "right",
-  },
   placeholder: {
     flex: 1,
     alignItems: "center",
@@ -1728,7 +1545,7 @@ const styles = StyleSheet.create((theme) => ({
   },
 }));
 
-const desktopStyles = StyleSheet.create((theme) => ({
+const desktopStyles = StyleSheet.create({
   row: {
     flex: 1,
     flexDirection: "row",
@@ -1736,10 +1553,7 @@ const desktopStyles = StyleSheet.create((theme) => ({
   contentPane: {
     flex: 1,
   },
-  detailLeft: {
-    gap: theme.spacing[2],
-  },
-}));
+});
 
 const sidebarStyles = StyleSheet.create((theme) => ({
   desktopContainer: {
@@ -1761,12 +1575,12 @@ const sidebarStyles = StyleSheet.create((theme) => ({
   list: {
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
-    gap: theme.spacing[1],
+    gap: theme.spacing[0.5],
   },
   groupLabel: {
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
-    color: theme.colors.foregroundMuted,
+    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.foregroundExtraMuted,
     paddingHorizontal: theme.spacing[2],
     paddingVertical: theme.spacing[1],
   },
@@ -1774,8 +1588,8 @@ const sidebarStyles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-    minHeight: 36,
-    paddingVertical: theme.spacing[2],
+    minHeight: 28,
+    paddingVertical: theme.spacing[1],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
   },
@@ -1795,8 +1609,8 @@ const sidebarStyles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-    minHeight: 36,
-    paddingVertical: theme.spacing[2],
+    minHeight: 28,
+    paddingVertical: theme.spacing[1],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
   },
diff --git a/packages/app/src/screens/settings/appearance/appearance-section.tsx b/packages/app/src/screens/settings/appearance/appearance-section.tsx
index 5e9d3d1597..6e98819323 100644
--- a/packages/app/src/screens/settings/appearance/appearance-section.tsx
+++ b/packages/app/src/screens/settings/appearance/appearance-section.tsx
@@ -1,9 +1,9 @@
-import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
+import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
-import { Text, View, type PressableStateCallbackType } from "react-native";
+import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ChevronDown, Monitor, Moon, Sun } from "lucide-react-native";
+import { Monitor, Moon, Sun } from "lucide-react-native";
 import {
   SYNTAX_THEME_OPTIONS,
   type SyntaxThemeId,
@@ -14,12 +14,15 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuSeparator,
-  DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Switch } from "@/components/ui/switch";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { useContributedThemes } from "@/appearance/provider";
-import { EditingTextInput as TextInput } from "@/components/ui/text-input";
+import { Button } from "@/components/ui/button";
+import {
+  EditingTextInput as TextInput,
+  type EditingTextInputHandle,
+} from "@/components/ui/text-input";
 import {
   MAX_CODE_FONT_SIZE,
   MAX_CONTENT_FONT_SIZE,
@@ -28,6 +31,8 @@ import {
   MIN_CONTENT_FONT_SIZE,
   MIN_UI_BASE_FONT_SIZE,
   parseClampedFontSize,
+  parseContentMaxWidth,
+  resolveContentMaxWidth,
   sanitizeFontFamily,
   useAppSettings,
   type AppSettings,
@@ -46,7 +51,6 @@ import { isNative } from "@/constants/platform";
 import type { PluginThemeOption } from "@/plugins/themes";
 import { settingsStyles } from "@/styles/settings";
 import { AppearancePreview } from "./appearance-preview";
-import { SidebarNavSection } from "./sidebar-nav-section";
 
 // ---------------------------------------------------------------------------
 // Theme-reactive leaf icons (withUnistyles + uniProps color mapping — no
@@ -57,7 +61,6 @@ import { SidebarNavSection } from "./sidebar-nav-section";
 const ThemedSun = withUnistyles(Sun);
 const ThemedMoon = withUnistyles(Moon);
 const ThemedMonitor = withUnistyles(Monitor);
-const ThemedChevronDown = withUnistyles(ChevronDown);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
@@ -83,10 +86,6 @@ function sizeDraftToOverride(value: string): number | undefined {
   return Number.isFinite(parsed) ? parsed : undefined;
 }
 
-function dropdownTriggerStyle({ pressed }: PressableStateCallbackType) {
-  return [styles.trigger, pressed ? styles.triggerPressed : null];
-}
-
 // ---------------------------------------------------------------------------
 // Theme picker
 // ---------------------------------------------------------------------------
@@ -175,27 +174,30 @@ function ThemeRow({
   const selectedLabel = selectedPluginTheme
     ? selectedPluginTheme.name
     : getThemeLabel(t, builtInValue);
+  const leading = useMemo(
+    () =>
+      selectedPluginTheme ? (
+        <ThemeSwatch color={selectedPluginTheme.swatch} />
+      ) : (
+        <ThemeLeading themeValue={builtInValue} />
+      ),
+    [builtInValue, selectedPluginTheme],
+  );
   return (
     <View style={settingsStyles.row}>
       <View style={settingsStyles.rowContent}>
         <Text style={settingsStyles.rowTitle}>{t("settings.appearance.theme.title")}</Text>
       </View>
       <DropdownMenu>
-        <DropdownMenuTrigger
-          style={dropdownTriggerStyle}
+        <DropdownTrigger
           accessibilityLabel={t("settings.appearance.theme.accessibilityLabel", {
             value: selectedLabel,
           })}
+          leading={leading}
         >
-          {selectedPluginTheme ? (
-            <ThemeSwatch color={selectedPluginTheme.swatch} />
-          ) : (
-            <ThemeLeading themeValue={builtInValue} />
-          )}
-          <Text style={styles.triggerText}>{selectedLabel}</Text>
-          <ThemedChevronDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
-        </DropdownMenuTrigger>
-        <DropdownMenuContent side="bottom" align="end" width={200}>
+          {selectedLabel}
+        </DropdownTrigger>
+        <DropdownMenuContent side="bottom" align="end" width={200} scrollable>
           {THEME_OPTIONS.map((option, index) => {
             const previousOption = THEME_OPTIONS[index - 1];
             return (
@@ -226,121 +228,6 @@ function ThemeRow({
   );
 }
 
-interface AutoExpandReasoningRowProps {
-  value: boolean;
-  onChange: (value: boolean) => void;
-}
-
-function AutoExpandReasoningRow({ value, onChange }: AutoExpandReasoningRowProps) {
-  const { t } = useTranslation();
-  return (
-    <View style={settingsStyles.row}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>
-          {t("settings.general.autoExpandReasoning.label")}
-        </Text>
-        <Text style={settingsStyles.rowHint}>
-          {t("settings.general.autoExpandReasoning.description")}
-        </Text>
-      </View>
-      <Switch value={value} onValueChange={onChange} />
-    </View>
-  );
-}
-
-interface ChatOutlineRowProps {
-  value: boolean;
-  onChange: (value: boolean) => void;
-}
-
-function ChatOutlineRow({ value, onChange }: ChatOutlineRowProps) {
-  const { t } = useTranslation();
-  return (
-    <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>{t("settings.appearance.chatOutline.title")}</Text>
-        <Text style={settingsStyles.rowHint}>
-          {t("settings.appearance.chatOutline.description")}
-        </Text>
-      </View>
-      <Switch
-        value={value}
-        onValueChange={onChange}
-        accessibilityLabel={t("settings.appearance.chatOutline.title")}
-      />
-    </View>
-  );
-}
-
-const TOOL_CALL_DETAIL_LEVELS: readonly AppSettings["toolCallDetailLevel"][] = [
-  "detailed",
-  "overview",
-];
-
-function getToolCallDetailLevelLabel(
-  t: TFunction,
-  value: AppSettings["toolCallDetailLevel"],
-): string {
-  return t(`settings.general.toolCallDetail.options.${value}`);
-}
-
-interface ToolCallDetailMenuItemProps {
-  value: AppSettings["toolCallDetailLevel"];
-  selected: boolean;
-  onChange: (value: AppSettings["toolCallDetailLevel"]) => void;
-}
-
-function ToolCallDetailMenuItem({ value, selected, onChange }: ToolCallDetailMenuItemProps) {
-  const { t } = useTranslation();
-  const handleSelect = useCallback(() => onChange(value), [onChange, value]);
-  return (
-    <DropdownMenuItem selected={selected} onSelect={handleSelect}>
-      {getToolCallDetailLevelLabel(t, value)}
-    </DropdownMenuItem>
-  );
-}
-
-interface ToolCallDetailRowProps {
-  value: AppSettings["toolCallDetailLevel"];
-  onChange: (value: AppSettings["toolCallDetailLevel"]) => void;
-}
-
-function ToolCallDetailRow({ value, onChange }: ToolCallDetailRowProps) {
-  const { t } = useTranslation();
-  const selectedLabel = getToolCallDetailLevelLabel(t, value);
-  return (
-    <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>{t("settings.general.toolCallDetail.label")}</Text>
-        <Text style={settingsStyles.rowHint}>
-          {t("settings.general.toolCallDetail.description")}
-        </Text>
-      </View>
-      <DropdownMenu>
-        <DropdownMenuTrigger
-          style={dropdownTriggerStyle}
-          accessibilityLabel={t("settings.general.toolCallDetail.accessibilityLabel", {
-            value: selectedLabel,
-          })}
-        >
-          <Text style={styles.triggerText}>{selectedLabel}</Text>
-          <ThemedChevronDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
-        </DropdownMenuTrigger>
-        <DropdownMenuContent side="bottom" align="end" width={200}>
-          {TOOL_CALL_DETAIL_LEVELS.map((option) => (
-            <ToolCallDetailMenuItem
-              key={option}
-              value={option}
-              selected={value === option}
-              onChange={onChange}
-            />
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </View>
-  );
-}
-
 // ---------------------------------------------------------------------------
 // Fonts: family text fields + numeric size fields (commit on blur/submit)
 // ---------------------------------------------------------------------------
@@ -445,6 +332,74 @@ function FontSizeRow({
   );
 }
 
+// ---------------------------------------------------------------------------
+// Content width: numeric field (commit on blur/submit) + reset to the default
+// ---------------------------------------------------------------------------
+
+interface ContentWidthRowProps {
+  value: AppSettings["contentMaxWidth"];
+  onChange: (value: AppSettings["contentMaxWidth"]) => void;
+}
+
+function ContentWidthRow({ value, onChange }: ContentWidthRowProps) {
+  const { t } = useTranslation();
+  const width = resolveContentMaxWidth({ contentMaxWidth: value });
+  // The field is uncontrolled, so a saved or reset width is written into it directly.
+  const input = useRef<EditingTextInputHandle>(null);
+
+  useEffect(() => {
+    input.current?.replaceText(String(width));
+  }, [width]);
+
+  const commit = useCallback(() => {
+    const next = parseContentMaxWidth(input.current?.getText()) ?? width;
+    input.current?.replaceText(String(next));
+    // Typing the width already in effect keeps following the default.
+    if (next !== width) {
+      onChange(next);
+    }
+  }, [onChange, width]);
+
+  const reset = useCallback(() => {
+    onChange(null);
+  }, [onChange]);
+
+  return (
+    <View style={settingsStyles.row}>
+      <View style={settingsStyles.rowContent}>
+        <Text style={settingsStyles.rowTitle}>{t("settings.appearance.layout.contentWidth")}</Text>
+        <Text style={settingsStyles.rowHint}>
+          {t("settings.appearance.layout.contentWidthHint")}
+        </Text>
+      </View>
+      <View style={styles.sizeField}>
+        {value === null ? null : (
+          <Button
+            variant="ghost"
+            size="sm"
+            onPress={reset}
+            accessibilityLabel={t("settings.appearance.layout.resetAccessibility")}
+          >
+            {t("settings.appearance.layout.reset")}
+          </Button>
+        )}
+        <TextInput
+          ref={input}
+          initialValue={String(width)}
+          onBlur={commit}
+          onSubmitEditing={commit}
+          keyboardType="number-pad"
+          inputMode="numeric"
+          selectTextOnFocus
+          style={styles.widthInput}
+          accessibilityLabel={t("settings.appearance.layout.contentWidthAccessibility")}
+        />
+        <Text style={styles.unit}>px</Text>
+      </View>
+    </View>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // Syntax highlight theme picker (commits immediately)
 // ---------------------------------------------------------------------------
@@ -490,15 +445,13 @@ function SyntaxRow({ value, onChange }: SyntaxRowProps) {
         </Text>
       </View>
       <DropdownMenu>
-        <DropdownMenuTrigger
-          style={dropdownTriggerStyle}
+        <DropdownTrigger
           accessibilityLabel={t("settings.appearance.syntax.highlightThemeAccessibility", {
             value: selectedLabel,
           })}
         >
-          <Text style={styles.triggerText}>{selectedLabel}</Text>
-          <ThemedChevronDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
-        </DropdownMenuTrigger>
+          {selectedLabel}
+        </DropdownTrigger>
         <DropdownMenuContent side="bottom" align="end" width={200}>
           {SYNTAX_THEME_OPTIONS.map((option) => (
             <SyntaxMenuItem
@@ -561,6 +514,13 @@ export function AppearanceSection() {
     [selectPluginTheme],
   );
 
+  const handleContentMaxWidthChange = useCallback(
+    (contentMaxWidth: AppSettings["contentMaxWidth"]) => {
+      void updateSettings({ contentMaxWidth });
+    },
+    [updateSettings],
+  );
+
   const handleSyntaxThemeChange = useCallback(
     (syntaxTheme: SyntaxThemeId) => {
       void updateSettings({ syntaxTheme });
@@ -568,27 +528,6 @@ export function AppearanceSection() {
     [updateSettings],
   );
 
-  const handleAutoExpandReasoningChange = useCallback(
-    (autoExpandReasoning: boolean) => {
-      void updateSettings({ autoExpandReasoning });
-    },
-    [updateSettings],
-  );
-
-  const handleToolCallDetailLevelChange = useCallback(
-    (toolCallDetailLevel: AppSettings["toolCallDetailLevel"]) => {
-      void updateSettings({ toolCallDetailLevel });
-    },
-    [updateSettings],
-  );
-
-  const handleChatOutlineChange = useCallback(
-    (chatOutlineEnabled: boolean) => {
-      void updateSettings({ chatOutlineEnabled });
-    },
-    [updateSettings],
-  );
-
   const commitUiFontFamily = useCallback(
     (value: string) => {
       const sanitized = sanitizeFontFamily(value);
@@ -692,25 +631,6 @@ export function AppearanceSection() {
           />
         </View>
       </SettingsSection>
-      <SettingsSection title={t("settings.appearance.detailLevel.title")}>
-        <View style={settingsStyles.card}>
-          <AutoExpandReasoningRow
-            value={settings.autoExpandReasoning}
-            onChange={handleAutoExpandReasoningChange}
-          />
-          <ToolCallDetailRow
-            value={settings.toolCallDetailLevel}
-            onChange={handleToolCallDetailLevelChange}
-          />
-          {!isNative ? (
-            <ChatOutlineRow
-              value={settings.chatOutlineEnabled}
-              onChange={handleChatOutlineChange}
-            />
-          ) : null}
-        </View>
-      </SettingsSection>
-      <SidebarNavSection />
       <SettingsSection title={t("settings.appearance.fonts.title")}>
         <View style={settingsStyles.card}>
           {showInterfaceFontFamilyRow ? (
@@ -764,6 +684,14 @@ export function AppearanceSection() {
           />
         </View>
       </SettingsSection>
+      <SettingsSection title={t("settings.appearance.layout.title")}>
+        <View style={settingsStyles.card}>
+          <ContentWidthRow
+            value={settings.contentMaxWidth}
+            onChange={handleContentMaxWidthChange}
+          />
+        </View>
+      </SettingsSection>
       <SettingsSection title={t("settings.appearance.syntax.title")}>
         <View style={settingsStyles.card}>
           <SyntaxRow value={settings.syntaxTheme} onChange={handleSyntaxThemeChange} />
@@ -789,23 +717,6 @@ const styles = StyleSheet.create((theme) => ({
     borderTopWidth: theme.borderWidth[1],
     borderTopColor: theme.colors.border,
   },
-  trigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-  },
-  triggerPressed: {
-    opacity: 0.85,
-  },
-  triggerText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
   swatch: {
     width: ICON_SIZE.md,
     height: ICON_SIZE.md,
@@ -846,6 +757,19 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     textAlign: "right",
   },
+  widthInput: {
+    width: 80,
+    minHeight: 36,
+    paddingVertical: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.border,
+    backgroundColor: theme.colors.surface2,
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.base,
+    textAlign: "right",
+  },
   unit: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
diff --git a/packages/app/src/screens/settings/chat/chat-section.tsx b/packages/app/src/screens/settings/chat/chat-section.tsx
new file mode 100644
index 0000000000..8a81d30073
--- /dev/null
+++ b/packages/app/src/screens/settings/chat/chat-section.tsx
@@ -0,0 +1,74 @@
+import { useCallback, useMemo } from "react";
+import { View } from "react-native";
+import { useTranslation } from "react-i18next";
+import {
+  SettingsCard,
+  SettingsSection,
+  SettingsSelect,
+  SettingsSwitch,
+} from "@/components/settings";
+import { isNative } from "@/constants/platform";
+import { useAppSettings, type AppSettings } from "@/hooks/use-settings";
+
+const TOOL_CALL_DETAIL_LEVELS: readonly AppSettings["toolCallDetailLevel"][] = [
+  "detailed",
+  "overview",
+];
+
+export function ChatSection() {
+  const { t } = useTranslation();
+  const { settings, updateSettings } = useAppSettings();
+
+  const toolCallDetailOptions = useMemo(
+    () =>
+      TOOL_CALL_DETAIL_LEVELS.map((value) => ({
+        value,
+        label: t(`settings.general.toolCallDetail.options.${value}`),
+      })),
+    [t],
+  );
+
+  const changeToolCallDetailLevel = useCallback(
+    (toolCallDetailLevel: AppSettings["toolCallDetailLevel"]) =>
+      void updateSettings({ toolCallDetailLevel }),
+    [updateSettings],
+  );
+  const changeAutoExpandReasoning = useCallback(
+    (autoExpandReasoning: boolean) => void updateSettings({ autoExpandReasoning }),
+    [updateSettings],
+  );
+  const changeChatOutline = useCallback(
+    (chatOutlineEnabled: boolean) => void updateSettings({ chatOutlineEnabled }),
+    [updateSettings],
+  );
+
+  return (
+    <View>
+      <SettingsSection title={t("settings.appearance.detailLevel.title")}>
+        <SettingsCard>
+          <SettingsSwitch
+            label={t("settings.general.autoExpandReasoning.label")}
+            hint={t("settings.general.autoExpandReasoning.description")}
+            value={settings.autoExpandReasoning}
+            onValueChange={changeAutoExpandReasoning}
+          />
+          <SettingsSelect
+            label={t("settings.general.toolCallDetail.label")}
+            hint={t("settings.general.toolCallDetail.description")}
+            value={settings.toolCallDetailLevel}
+            options={toolCallDetailOptions}
+            onValueChange={changeToolCallDetailLevel}
+          />
+          {isNative ? null : (
+            <SettingsSwitch
+              label={t("settings.appearance.chatOutline.title")}
+              hint={t("settings.appearance.chatOutline.description")}
+              value={settings.chatOutlineEnabled}
+              onValueChange={changeChatOutline}
+            />
+          )}
+        </SettingsCard>
+      </SettingsSection>
+    </View>
+  );
+}
diff --git a/packages/app/src/screens/settings/daemon-lifecycle.test.ts b/packages/app/src/screens/settings/daemon-lifecycle.test.ts
new file mode 100644
index 0000000000..c50006534a
--- /dev/null
+++ b/packages/app/src/screens/settings/daemon-lifecycle.test.ts
@@ -0,0 +1,98 @@
+import { expect, test } from "vitest";
+import { restartDaemonFromSettings, updateDaemonFromSettings } from "./daemon-lifecycle";
+
+test("settings restart completes when a replacement worker is observed without a sampled disconnect", async () => {
+  let pid = 10;
+  await restartDaemonFromSettings("daemon", "settings", {
+    getStatus: async () => ({ pid, version: "1.0.0", serverId: "daemon" }),
+    restartServer: async () => {
+      pid = 11;
+    },
+  });
+  expect(pid).toBe(11);
+});
+
+test("a status permission failure prevents the restart request", async () => {
+  let restarted = false;
+  await expect(
+    restartDaemonFromSettings("daemon", "settings", {
+      getStatus: async () => {
+        throw new Error("Permission denied");
+      },
+      restartServer: async () => {
+        restarted = true;
+      },
+    }),
+  ).rejects.toThrow("Permission denied");
+  expect(restarted).toBe(false);
+});
+
+test("a different responder fails confirmation immediately", async () => {
+  let serverId = "daemon";
+  await expect(
+    restartDaemonFromSettings("daemon", "settings", {
+      getStatus: async () => ({ pid: 10, version: "1.0.0", serverId }),
+      restartServer: async () => {
+        serverId = "other";
+      },
+    }),
+  ).rejects.toThrow("identity changed");
+});
+
+test("a lost restart acknowledgment can still confirm the replacement", async () => {
+  let pid = 10;
+  await restartDaemonFromSettings("daemon", "settings", {
+    getStatus: async () => ({ pid, version: "1.0.0", serverId: "daemon" }),
+    restartServer: async () => {
+      pid = 11;
+      throw Object.assign(new Error("Connection lost"), { code: "DAEMON_CONNECTION_LOST" });
+    },
+  });
+  expect(pid).toBe(11);
+});
+
+test("installation and worker version confirmation are separate outcomes", async () => {
+  let pid = 10;
+  await expect(
+    updateDaemonFromSettings("daemon", {
+      getStatus: async () => ({ pid, version: "1.0.0", serverId: "daemon" }),
+      updateDaemon: async () => {
+        pid = 11;
+        return { success: true, error: null, newVersion: "2.0.0" };
+      },
+    }),
+  ).rejects.toThrow("Package installed; replacement worker version was not confirmed");
+});
+
+test("an installed version is confirmed only in its replacement worker", async () => {
+  let pid = 10,
+    version = "1.0.0";
+  await expect(
+    updateDaemonFromSettings("daemon", {
+      getStatus: async () => ({ pid, version, serverId: "daemon" }),
+      updateDaemon: async () => {
+        pid = 11;
+        version = "2.0.0";
+        return { success: true, error: null, newVersion: version };
+      },
+    }),
+  ).resolves.toEqual({ workerVersion: "2.0.0" });
+});
+
+test("RPC errors mentioning transport are not retried", async () => {
+  let requested = false;
+  await expect(
+    restartDaemonFromSettings("daemon", "settings", {
+      getStatus: async () => {
+        if (requested)
+          throw Object.assign(new Error("Connection policy denied by plugin"), {
+            code: "permission_denied",
+          });
+        return { pid: 10, version: "1.0.0", serverId: "daemon" };
+      },
+      restartServer: async () => {
+        requested = true;
+      },
+    }),
+  ).rejects.toThrow("Connection policy denied by plugin");
+});
diff --git a/packages/app/src/screens/settings/daemon-lifecycle.ts b/packages/app/src/screens/settings/daemon-lifecycle.ts
new file mode 100644
index 0000000000..c4e9d83f5a
--- /dev/null
+++ b/packages/app/src/screens/settings/daemon-lifecycle.ts
@@ -0,0 +1,94 @@
+interface WorkerStatus {
+  pid: number;
+  serverId: string;
+  version: string | null;
+}
+interface StatusReader {
+  getStatus: () => Promise<WorkerStatus>;
+}
+
+export interface SettingsDaemonRestartDeps extends StatusReader {
+  restartServer: (reason: string) => Promise<unknown>;
+}
+
+/** Acknowledgment starts the wait; only a different ready worker completes it. */
+export async function restartDaemonFromSettings(
+  hostServerId: string,
+  reason: string,
+  deps: SettingsDaemonRestartDeps,
+): Promise<void> {
+  const previous = await readSelectedWorker(hostServerId, deps);
+  let acknowledged = false;
+  try {
+    await deps.restartServer(reason);
+    acknowledged = true;
+  } catch (error) {
+    if (!isReconnectFailure(error)) throw error;
+  }
+  try {
+    await observeReplacement(previous, deps);
+  } catch (error) {
+    throw new Error(`Restart acknowledged: ${acknowledged}. ${String(error)}`, { cause: error });
+  }
+}
+
+export async function updateDaemonFromSettings(
+  hostServerId: string,
+  deps: StatusReader & {
+    updateDaemon: () => Promise<{
+      success: boolean;
+      error: string | null;
+      newVersion: string | null;
+    }>;
+  },
+): Promise<{ workerVersion: string }> {
+  const previous = await readSelectedWorker(hostServerId, deps);
+  const installed = await deps.updateDaemon();
+  if (!installed.success) throw new Error(installed.error ?? "Package installation failed");
+  try {
+    const worker = await observeReplacement(previous, deps);
+    if (!worker.version || !installed.newVersion || worker.version !== installed.newVersion) {
+      throw new Error(
+        `Expected installed version ${installed.newVersion ?? "unknown"}; observed worker ${worker.version}.`,
+      );
+    }
+    return { workerVersion: worker.version };
+  } catch (error) {
+    throw new Error(
+      `Package installed; replacement worker version was not confirmed. ${String(error)}`,
+      { cause: error },
+    );
+  }
+}
+
+async function readSelectedWorker(serverId: string, deps: StatusReader): Promise<WorkerStatus> {
+  const worker = await deps.getStatus();
+  if (worker.serverId !== serverId) throw new Error("Daemon identity changed");
+  return worker;
+}
+
+async function observeReplacement(
+  previous: WorkerStatus,
+  deps: StatusReader,
+): Promise<WorkerStatus> {
+  const deadline = Date.now() + 600_000;
+  while (Date.now() < deadline) {
+    try {
+      const current = await readSelectedWorker(previous.serverId, deps);
+      if (current.pid !== previous.pid) return current;
+    } catch (error) {
+      if (!isReconnectFailure(error)) throw error;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+  throw new Error("Replacement worker could not be confirmed. Check daemon status and logs.");
+}
+
+function isReconnectFailure(error: unknown): boolean {
+  return Boolean(
+    error &&
+    typeof error === "object" &&
+    "code" in error &&
+    ["DAEMON_CONNECTION_LOST", "DAEMON_REQUEST_TIMEOUT"].includes(String(error.code)),
+  );
+}
diff --git a/packages/app/src/screens/settings/daemon-restart.test.ts b/packages/app/src/screens/settings/daemon-restart.test.ts
deleted file mode 100644
index 51b6c4d121..0000000000
--- a/packages/app/src/screens/settings/daemon-restart.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { DesktopDaemonStatus } from "@/desktop/daemon/desktop-daemon";
-import { restartDaemonFromSettings, type SettingsDaemonRestartDeps } from "./daemon-restart";
-
-const runningDesktopDaemonStatus: DesktopDaemonStatus = {
-  serverId: "local-desktop",
-  status: "running",
-  listen: null,
-  hostname: null,
-  pid: 123,
-  home: "/tmp/paseo",
-  version: "1.0.0",
-  desktopManaged: true,
-  error: null,
-};
-
-const desktopSettings = {
-  daemon: {
-    manageBuiltInDaemon: true,
-  },
-};
-
-function makeDeps(overrides?: {
-  isElectron?: boolean;
-  desktopDaemonStatus?: DesktopDaemonStatus;
-  desktopSettings?: typeof desktopSettings;
-  desktopSettingsError?: Error;
-  restartDesktopDaemon?: () => Promise<DesktopDaemonStatus>;
-  restartServer?: (reason: string) => Promise<void>;
-}) {
-  const calls: string[] = [];
-  const deps: SettingsDaemonRestartDeps = {
-    getIsElectron: () => overrides?.isElectron ?? true,
-    getDesktopDaemonStatus: async () => {
-      calls.push("desktop-status");
-      return overrides?.desktopDaemonStatus ?? runningDesktopDaemonStatus;
-    },
-    getDesktopSettings: async () => {
-      calls.push("desktop-settings");
-      if (overrides?.desktopSettingsError) {
-        throw overrides.desktopSettingsError;
-      }
-      return overrides?.desktopSettings ?? desktopSettings;
-    },
-    restartDesktopDaemon:
-      overrides?.restartDesktopDaemon ??
-      (async () => {
-        calls.push("desktop-restart");
-        return runningDesktopDaemonStatus;
-      }),
-    restartServer:
-      overrides?.restartServer ??
-      (async (reason) => {
-        calls.push(`rpc-restart:${reason}`);
-      }),
-  };
-  return { calls, deps };
-}
-
-describe("restartDaemonFromSettings", () => {
-  it("restarts the local desktop-managed daemon through the desktop bridge", async () => {
-    const { calls, deps } = makeDeps();
-
-    await restartDaemonFromSettings(" local-desktop ", "settings_daemon_restart_local", deps);
-
-    expect(calls).toEqual(["desktop-status", "desktop-settings", "desktop-restart"]);
-  });
-
-  it("restarts remote hosts over the daemon RPC without reading desktop settings", async () => {
-    const { calls, deps } = makeDeps({
-      desktopSettingsError: new Error("Unreadable desktop settings."),
-    });
-
-    await restartDaemonFromSettings("remote-host", "settings_daemon_restart_remote", deps);
-
-    expect(calls).toEqual(["desktop-status", "rpc-restart:settings_daemon_restart_remote"]);
-  });
-
-  it("keeps manually managed local daemons on the RPC path without reading desktop settings", async () => {
-    const { calls, deps } = makeDeps({
-      desktopDaemonStatus: { ...runningDesktopDaemonStatus, desktopManaged: false },
-      desktopSettingsError: new Error("Unreadable desktop settings."),
-    });
-
-    await restartDaemonFromSettings("local-desktop", "settings_daemon_restart_local", deps);
-
-    expect(calls).toEqual(["desktop-status", "rpc-restart:settings_daemon_restart_local"]);
-  });
-
-  it("keeps the RPC path when built-in daemon management is disabled", async () => {
-    const { calls, deps } = makeDeps({
-      desktopSettings: {
-        ...desktopSettings,
-        daemon: { ...desktopSettings.daemon, manageBuiltInDaemon: false },
-      },
-    });
-
-    await restartDaemonFromSettings("local-desktop", "settings_daemon_restart_local", deps);
-
-    expect(calls).toEqual([
-      "desktop-status",
-      "desktop-settings",
-      "rpc-restart:settings_daemon_restart_local",
-    ]);
-  });
-
-  it("uses the RPC path outside Electron without reading desktop daemon status or settings", async () => {
-    const { calls, deps } = makeDeps({
-      isElectron: false,
-    });
-
-    await restartDaemonFromSettings("local-desktop", "settings_daemon_restart_local", deps);
-
-    expect(calls).toEqual(["rpc-restart:settings_daemon_restart_local"]);
-  });
-
-  it("surfaces desktop restart failures without falling back to worker recycle", async () => {
-    const { calls, deps } = makeDeps({
-      restartDesktopDaemon: async () => {
-        calls.push("desktop-restart");
-        throw new Error("Desktop restart failed.");
-      },
-    });
-
-    await expect(
-      restartDaemonFromSettings("local-desktop", "settings_daemon_restart_local", deps),
-    ).rejects.toThrow("Desktop restart failed.");
-
-    expect(calls).toEqual(["desktop-status", "desktop-settings", "desktop-restart"]);
-  });
-});
diff --git a/packages/app/src/screens/settings/daemon-restart.ts b/packages/app/src/screens/settings/daemon-restart.ts
deleted file mode 100644
index 61cce091e2..0000000000
--- a/packages/app/src/screens/settings/daemon-restart.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { DesktopDaemonStatus } from "@/desktop/daemon/desktop-daemon";
-
-interface DesktopDaemonRestartStatus {
-  desktopManaged: boolean;
-  serverId: string;
-}
-
-interface DesktopDaemonRestartSettings {
-  daemon: {
-    manageBuiltInDaemon: boolean;
-  };
-}
-
-export interface SettingsDaemonRestartDeps {
-  getIsElectron: () => boolean;
-  getDesktopDaemonStatus: () => Promise<DesktopDaemonRestartStatus>;
-  getDesktopSettings: () => Promise<DesktopDaemonRestartSettings>;
-  restartDesktopDaemon: () => Promise<DesktopDaemonStatus>;
-  restartServer: (reason: string) => Promise<unknown>;
-}
-
-async function isLocalDesktopManagedDaemon(
-  hostServerId: string,
-  deps: SettingsDaemonRestartDeps,
-): Promise<boolean> {
-  if (!deps.getIsElectron()) {
-    return false;
-  }
-
-  const desktopDaemonStatus = await deps.getDesktopDaemonStatus();
-  if (!desktopDaemonStatus.desktopManaged) {
-    return false;
-  }
-
-  const normalizedHostServerId = hostServerId.trim();
-  const normalizedDesktopServerId = desktopDaemonStatus.serverId.trim();
-
-  if (normalizedHostServerId.length === 0 || normalizedHostServerId !== normalizedDesktopServerId) {
-    return false;
-  }
-
-  const desktopSettings = await deps.getDesktopSettings();
-  return desktopSettings.daemon.manageBuiltInDaemon;
-}
-
-export async function restartDaemonFromSettings(
-  hostServerId: string,
-  reason: string,
-  deps: SettingsDaemonRestartDeps,
-): Promise<void> {
-  if (await isLocalDesktopManagedDaemon(hostServerId, deps)) {
-    await deps.restartDesktopDaemon();
-    return;
-  }
-
-  await deps.restartServer(reason);
-}
diff --git a/packages/app/src/screens/settings/editor-section.tsx b/packages/app/src/screens/settings/editor-section.tsx
index ec926640ee..b9367d81f9 100644
--- a/packages/app/src/screens/settings/editor-section.tsx
+++ b/packages/app/src/screens/settings/editor-section.tsx
@@ -4,7 +4,7 @@ import { Text, View } from "react-native";
 import { Switch } from "@/components/ui/switch";
 import { useAppSettings } from "@/hooks/use-settings";
 import { settingsStyles } from "@/styles/settings";
-import { SettingsSection } from "./settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 
 export function EditorSection() {
   const { t } = useTranslation();
diff --git a/packages/app/src/screens/settings/general/sending-section.tsx b/packages/app/src/screens/settings/general/sending-section.tsx
new file mode 100644
index 0000000000..85da0fdf4e
--- /dev/null
+++ b/packages/app/src/screens/settings/general/sending-section.tsx
@@ -0,0 +1,36 @@
+import { useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { SettingsCard, SettingsSection, SettingsSelect } from "@/components/settings";
+import { useAppSettings, type SendBehavior } from "@/hooks/use-settings";
+
+const SEND_BEHAVIORS: readonly SendBehavior[] = ["interrupt", "steer", "queue"];
+
+export function SendingSection() {
+  const { t } = useTranslation();
+  const { settings, updateSettings } = useAppSettings();
+  const options = useMemo(
+    () =>
+      SEND_BEHAVIORS.map((value) => ({
+        value,
+        label: t(`settings.general.defaultSend.options.${value}`),
+      })),
+    [t],
+  );
+  const change = useCallback(
+    (sendBehavior: SendBehavior) => void updateSettings({ sendBehavior }),
+    [updateSettings],
+  );
+  return (
+    <SettingsSection title={t("settings.general.sending")}>
+      <SettingsCard>
+        <SettingsSelect
+          label={t("settings.general.defaultSend.label")}
+          hint={t(`settings.general.defaultSend.descriptions.${settings.sendBehavior}`)}
+          value={settings.sendBehavior}
+          options={options}
+          onValueChange={change}
+        />
+      </SettingsCard>
+    </SettingsSection>
+  );
+}
diff --git a/packages/app/src/screens/settings/host-appearance-section.tsx b/packages/app/src/screens/settings/host-appearance-section.tsx
index 037be657d4..585be1cfda 100644
--- a/packages/app/src/screens/settings/host-appearance-section.tsx
+++ b/packages/app/src/screens/settings/host-appearance-section.tsx
@@ -1,19 +1,15 @@
 import { useCallback, useMemo, useState } from "react";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ChevronDown, Pencil } from "lucide-react-native";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+import { Pencil } from "lucide-react-native";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
 import { AdaptiveRenameModal } from "@/components/rename-modal";
 import { WorkspaceMetaRow } from "@/components/sidebar/workspace-meta-row";
 import { useToast } from "@/contexts/toast-context";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import {
   HOST_BADGE_DISPLAYS,
   HOST_COLORS,
@@ -28,15 +24,10 @@ import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
 
-const ThemedChevronDown = withUnistyles(ChevronDown);
 const ThemedPencil = withUnistyles(Pencil);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-function dropdownTriggerStyle({ pressed }: PressableStateCallbackType) {
-  return pressed ? [styles.trigger, styles.triggerPressed] : styles.trigger;
-}
-
 function HostRenameButton({ host }: { host: HostProfile }) {
   const { t } = useTranslation();
   const { renameHost } = useHostMutations();
@@ -119,23 +110,22 @@ function ColorMenuItem({
 function ColorRow({ color, onChange }: { color: HostColor; onChange: (color: HostColor) => void }) {
   const { t } = useTranslation();
   const selectedLabel = colorLabel(t, color);
+  const leading = useMemo(() => <ColorSwatch color={color} />, [color]);
   return (
     <View style={[settingsStyles.row, settingsStyles.rowBorder]}>
       <View style={settingsStyles.rowContent}>
         <Text style={settingsStyles.rowTitle}>{t("settings.host.appearance.color.label")}</Text>
       </View>
       <DropdownMenu>
-        <DropdownMenuTrigger
-          style={dropdownTriggerStyle}
+        <DropdownTrigger
           accessibilityRole="button"
           accessibilityLabel={t("settings.host.appearance.color.accessibilityLabel", {
             value: selectedLabel,
           })}
+          leading={leading}
         >
-          <ColorSwatch color={color} />
-          <Text style={styles.triggerText}>{selectedLabel}</Text>
-          <ThemedChevronDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
-        </DropdownMenuTrigger>
+          {selectedLabel}
+        </DropdownTrigger>
         <DropdownMenuContent side="bottom" align="end" width={200}>
           {HOST_COLORS.map((option) => (
             <ColorMenuItem
@@ -166,17 +156,15 @@ function BadgeDisplayRow({
         <Text style={settingsStyles.rowTitle}>{t("settings.host.appearance.badge.label")}</Text>
       </View>
       <DropdownMenu>
-        <DropdownMenuTrigger
+        <DropdownTrigger
           testID="host-appearance-badge-display"
-          style={dropdownTriggerStyle}
           accessibilityRole="button"
           accessibilityLabel={t("settings.host.appearance.badge.accessibilityLabel", {
             value: selectedLabel,
           })}
         >
-          <Text style={styles.triggerText}>{selectedLabel}</Text>
-          <ThemedChevronDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
-        </DropdownMenuTrigger>
+          {selectedLabel}
+        </DropdownTrigger>
         <DropdownMenuContent side="bottom" align="end" width={200}>
           {HOST_BADGE_DISPLAYS.map((option) => (
             <BadgeDisplayMenuItem
@@ -312,23 +300,6 @@ export function HostAppearanceSection({ host }: { host: HostProfile }) {
 }
 
 const styles = StyleSheet.create((theme) => ({
-  trigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-  },
-  triggerPressed: {
-    opacity: 0.85,
-  },
-  triggerText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
   swatch: {
     width: ICON_SIZE.md,
     height: ICON_SIZE.md,
diff --git a/packages/app/src/screens/settings/host-page.tsx b/packages/app/src/screens/settings/host-page.tsx
index 40eeb4fc77..6b308547a1 100644
--- a/packages/app/src/screens/settings/host-page.tsx
+++ b/packages/app/src/screens/settings/host-page.tsx
@@ -33,16 +33,10 @@ import {
   ProfileDraft,
   TerminalProfileEditModal,
 } from "@/screens/settings/terminal-profile-edit-modal";
-import { getIsElectron } from "@/constants/platform";
-import {
-  getDesktopDaemonStatus,
-  restartDesktopDaemon,
-  startDesktopDaemon,
-  stopDesktopDaemon,
-} from "@/desktop/daemon/desktop-daemon";
+import { startDesktopDaemon, stopDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { LocalDaemonSection } from "@/desktop/components/desktop-updates-section";
 import { useDaemonStatus } from "@/desktop/hooks/use-daemon-status";
-import { loadDesktopSettings, useDesktopSettings } from "@/desktop/settings/desktop-settings";
+import { useDesktopSettings } from "@/desktop/settings/desktop-settings";
 import { PairDeviceModal } from "@/desktop/components/pair-device-modal";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
@@ -56,10 +50,9 @@ import {
   useHosts,
 } from "@/runtime/host-runtime";
 import { ProvidersSection } from "@/screens/settings/providers-section";
-import { ProviderUsageSettingsSection } from "@/provider-usage/settings-section";
-import { useProviderUsage } from "@/provider-usage/use-provider-usage";
+import { HostUsageSection } from "@/usage";
 import { HostAppearanceSection } from "@/screens/settings/host-appearance-section";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { useSessionStore } from "@/stores/session-store";
 import { settingsStyles } from "@/styles/settings";
 import type { HostConnection, HostProfile } from "@/types/host-connection";
@@ -70,10 +63,18 @@ import { formatConnectionStatus, getConnectionStatusTone } from "@/utils/daemons
 import { formatLatency } from "@/utils/latency";
 import { ICON_SIZE } from "@/styles/theme";
 import type { Theme } from "@/styles/theme";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { BrowserToolsOptInCard } from "./browser-tools-card";
-import { hasDaemonReconnectedAfter, type DaemonConnectionMarker } from "./daemon-reconnect";
-import { restartDaemonFromSettings } from "./daemon-restart";
+import { restartDaemonFromSettings, updateDaemonFromSettings } from "./daemon-lifecycle";
+
+const ThemedRestart = withUnistyles(RotateCw);
+const ThemedUpdate = withUnistyles(ArrowUpToLine);
+const lifecycleIconProps = (theme: Theme) => ({
+  size: theme.iconSize.sm,
+  color: theme.colors.foreground,
+});
+const restartIcon = <ThemedRestart uniProps={lifecycleIconProps} />;
+const updateIcon = <ThemedUpdate uniProps={lifecycleIconProps} />;
 
 const ThemedArrowUp = withUnistyles(ArrowUp);
 const ThemedArrowDown = withUnistyles(ArrowDown);
@@ -89,7 +90,7 @@ interface DynamicProviderIconProps {
 }
 
 function DynamicProviderIcon({ iconKey, size, color = "" }: DynamicProviderIconProps) {
-  const Icon = getProviderIcon(iconKey);
+  const Icon = useProviderIcon(iconKey);
   return <Icon size={size} color={color} />;
 }
 
@@ -224,12 +225,23 @@ function HostStatusBadges({ serverId }: { serverId: string }) {
 }
 
 function HostConnectionError({ serverId }: { serverId: string }) {
+  const { t } = useTranslation();
   const snapshot = useHostRuntimeSnapshot(serverId);
   const lastError = snapshot?.lastError ?? null;
   const connectionError =
     typeof lastError === "string" && lastError.trim().length > 0 ? lastError.trim() : null;
   if (!connectionError) return null;
-  return <Text style={styles.errorText}>{connectionError}</Text>;
+  return (
+    <View style={styles.connectionError}>
+      <InlineAlert
+        size="sm"
+        variant="error"
+        title={connectionError}
+        description={snapshot?.authFailureReason ? t("settings.host.password.guidance") : undefined}
+        testID="host-connection-error"
+      />
+    </View>
+  );
 }
 
 export function HostConnectionsPage({ serverId }: { serverId: string }) {
@@ -330,10 +342,6 @@ export function HostProvidersPage({ serverId }: { serverId: string }) {
 
 export function HostUsagePage({ serverId }: { serverId: string }) {
   const host = useHostProfile(serverId);
-  const { view: providerUsageView, refresh: refreshProviderUsage } = useProviderUsage(serverId);
-  const handleRefresh = useCallback(() => {
-    void refreshProviderUsage();
-  }, [refreshProviderUsage]);
 
   if (!host) {
     return <HostNotFound />;
@@ -341,7 +349,7 @@ export function HostUsagePage({ serverId }: { serverId: string }) {
 
   return (
     <View>
-      <ProviderUsageSettingsSection view={providerUsageView} onRefresh={handleRefresh} />
+      <HostUsageSection serverId={serverId} />
     </View>
   );
 }
@@ -362,13 +370,8 @@ export function HostSettingsPage({
 
   return (
     <View>
-      <View style={styles.daemonHeader}>
-        <Text style={styles.daemonHeaderLabel} numberOfLines={1}>
-          {host.label}
-        </Text>
-      </View>
-
       <HostStatusBadges serverId={serverId} />
+      <HostConnectionError serverId={serverId} />
 
       <HostAppearanceSection host={host} />
 
@@ -553,14 +556,8 @@ function ConnectionRow({
   );
 }
 
-const delay = (ms: number) =>
-  new Promise<void>((resolve) => {
-    setTimeout(resolve, ms);
-  });
-
 function RestartDaemonCard({ host }: { host: HostProfile }) {
   const { t } = useTranslation();
-  const { theme } = useUnistyles();
   const daemonClient = useHostRuntimeClient(host.serverId);
   const isConnected = useHostRuntimeIsConnected(host.serverId);
   const runtime = getHostRuntimeStore();
@@ -578,68 +575,20 @@ function RestartDaemonCard({ host }: { host: HostProfile }) {
     [host.serverId, runtime],
   );
 
-  const waitForCondition = useCallback(
-    async (predicate: () => boolean, timeoutMs: number, intervalMs = 250) => {
-      const deadline = Date.now() + timeoutMs;
-      while (Date.now() < deadline) {
-        if (!isMountedRef.current) return false;
-        if (predicate()) return true;
-        await delay(intervalMs);
-      }
-      return predicate();
-    },
-    [],
-  );
-
   const waitForDaemonRestart = useCallback(
-    async (restartRequest: Promise<void>) => {
-      const disconnectTimeoutMs = 30000;
-      const reconnectTimeoutMs = 30000;
-      const requestFailureDisconnectGraceMs = 2000;
-      const disconnectedPromise = isHostConnected()
-        ? waitForCondition(() => !isHostConnected(), disconnectTimeoutMs)
-        : Promise.resolve(true);
-      const restartResult = await restartRequest.then(
-        () => ({ status: "accepted" as const }),
-        async (error) => ({
-          status: "rejected" as const,
-          error,
-          disconnectedAfterFailure: await waitForCondition(
-            () => !isHostConnected(),
-            requestFailureDisconnectGraceMs,
-            100,
-          ),
-        }),
-      );
-      if (!isMountedRef.current) return;
-
-      if (restartResult.status === "rejected" && !restartResult.disconnectedAfterFailure) {
-        console.error(`[HostPage] Failed to restart daemon ${host.label}`, restartResult.error);
-        setIsRestarting(false);
+    async (request: Promise<void>) => {
+      try {
+        await request;
+      } catch (error) {
         Alert.alert(
           t("settings.host.daemon.restart.requestFailedTitle"),
-          t("settings.host.daemon.restart.requestFailedMessage"),
+          error instanceof Error ? error.message : String(error),
         );
-        return;
-      }
-
-      const disconnected =
-        restartResult.status === "rejected"
-          ? restartResult.disconnectedAfterFailure
-          : await disconnectedPromise;
-      const reconnected =
-        disconnected && (await waitForCondition(() => isHostConnected(), reconnectTimeoutMs));
-      if (isMountedRef.current) {
-        setIsRestarting(false);
-        if (!reconnected) {
-          Alert.alert(
-            t("settings.host.daemon.restart.unableToReconnectTitle"),
-            t("settings.host.daemon.restart.unableToReconnectMessage", { name: host.label }),
-          );
-        }
+      } finally {
+        if (isMountedRef.current) setIsRestarting(false);
       }
     },
-    [host.label, isHostConnected, t, waitForCondition],
+    [t],
   );
 
   const handleRestart = useCallback(() => {
@@ -672,11 +621,12 @@ function RestartDaemonCard({ host }: { host: HostProfile }) {
           host.serverId,
           `settings_daemon_restart_${host.serverId}`,
           {
-            getIsElectron,
-            getDesktopDaemonStatus,
-            getDesktopSettings: loadDesktopSettings,
-            restartDesktopDaemon,
             restartServer: (reason) => daemonClient.restartServer(reason),
+            getStatus: async () => ({
+              ...(await daemonClient.getDaemonStatus()),
+              serverId: daemonClient.getLastServerInfoMessage()?.serverId ?? "",
+              version: daemonClient.getLastServerInfoMessage()?.version ?? null,
+            }),
           },
         );
         void waitForDaemonRestart(restartRequest);
@@ -691,11 +641,6 @@ function RestartDaemonCard({ host }: { host: HostProfile }) {
       });
   }, [daemonClient, host.label, host.serverId, isHostConnected, t, waitForDaemonRestart]);
 
-  const restartIcon = useMemo(
-    () => <RotateCw size={theme.iconSize.sm} color={theme.colors.foreground} />,
-    [theme.iconSize.sm, theme.colors.foreground],
-  );
-
   return (
     <View style={settingsStyles.card} testID="host-page-restart-card">
       <View style={settingsStyles.row}>
@@ -722,12 +667,12 @@ function RestartDaemonCard({ host }: { host: HostProfile }) {
 
 type DaemonUpdateState =
   | { status: "idle" }
+  | { status: "complete"; workerVersion: string }
   | { status: "updating"; phase: string }
   | { status: "failed"; title: string; message: string };
 
 function UpdateDaemonCard({ host }: { host: HostProfile }) {
   const { t } = useTranslation();
-  const { theme } = useUnistyles();
   const daemonClient = useHostRuntimeClient(host.serverId);
   const isConnected = useHostRuntimeIsConnected(host.serverId);
   const runtime = getHostRuntimeStore();
@@ -759,55 +704,6 @@ function UpdateDaemonCard({ host }: { host: HostProfile }) {
     () => isHostRuntimeConnected(runtime.getSnapshot(host.serverId)),
     [host.serverId, runtime],
   );
-  const hasReconnectedAfter = useCallback(
-    (startMarker: DaemonConnectionMarker | null) =>
-      hasDaemonReconnectedAfter(runtime.getSnapshot(host.serverId), startMarker),
-    [host.serverId, runtime],
-  );
-
-  const waitForCondition = useCallback(
-    async (predicate: () => boolean, timeoutMs: number, intervalMs = 250) => {
-      const deadline = Date.now() + timeoutMs;
-      while (Date.now() < deadline) {
-        if (!isMountedRef.current) return false;
-        if (predicate()) return true;
-        await delay(intervalMs);
-      }
-      return predicate();
-    },
-    [],
-  );
-
-  const waitForDaemonRestart = useCallback(
-    async (startMarker: DaemonConnectionMarker | null) => {
-      const disconnectTimeoutMs = 15000;
-      const reconnectTimeoutMs = 120000; // 2 minutes — npm update + restart can take a while
-      if (!hasReconnectedAfter(startMarker) && isHostConnected()) {
-        await waitForCondition(
-          () => !isHostConnected() || hasReconnectedAfter(startMarker),
-          disconnectTimeoutMs,
-        );
-      }
-      const reconnected =
-        hasReconnectedAfter(startMarker) ||
-        (await waitForCondition(() => hasReconnectedAfter(startMarker), reconnectTimeoutMs));
-      if (isMountedRef.current) {
-        if (!reconnected) {
-          setUpdateState({
-            status: "failed",
-            title: t("settings.host.daemon.update.unableToReconnectTitle"),
-            message: t("settings.host.daemon.update.unableToReconnectMessage", {
-              name: host.label,
-            }),
-          });
-          return;
-        }
-        setUpdateState({ status: "idle" });
-      }
-    },
-    [hasReconnectedAfter, host.label, isHostConnected, t, waitForCondition],
-  );
-
   const handleUpdate = useCallback(() => {
     if (!daemonClient) {
       setUpdateState({
@@ -835,13 +731,6 @@ function UpdateDaemonCard({ host }: { host: HostProfile }) {
     })
       .then((confirmed) => {
         if (!confirmed || !isMountedRef.current) return;
-        const startSnapshot = runtime.getSnapshot(host.serverId);
-        const startMarker = startSnapshot
-          ? {
-              clientGeneration: startSnapshot.clientGeneration,
-              lastOnlineAt: startSnapshot.lastOnlineAt,
-            }
-          : null;
         setUpdateState({
           status: "updating",
           phase: t("settings.host.daemon.update.phaseStarting"),
@@ -875,24 +764,18 @@ function UpdateDaemonCard({ host }: { host: HostProfile }) {
         });
         unsubscribeRef.current = unsubscribe;
 
-        void daemonClient
-          .updateDaemon(requestId)
-          .then((response) => {
+        void updateDaemonFromSettings(host.serverId, {
+          updateDaemon: () => daemonClient.updateDaemon(requestId),
+          getStatus: async () => ({
+            ...(await daemonClient.getDaemonStatus()),
+            serverId: daemonClient.getLastServerInfoMessage()?.serverId ?? "",
+            version: daemonClient.getLastServerInfoMessage()?.version ?? null,
+          }),
+        })
+          .then(({ workerVersion }) => {
             unsubscribeRef.current = null;
             unsubscribe();
-            if (!response.success) {
-              if (!isMountedRef.current) return undefined;
-              setUpdateState({
-                status: "failed",
-                title: t("settings.host.daemon.update.requestFailedTitle"),
-                message: t("settings.host.daemon.update.requestFailedMessage", {
-                  error: response.error ?? "Unknown error",
-                }),
-              });
-              return undefined;
-            }
-            // Update succeeded — wait for daemon to restart and reconnect
-            void waitForDaemonRestart(startMarker);
+            if (isMountedRef.current) setUpdateState({ status: "complete", workerVersion });
             return undefined;
           })
           .catch((error) => {
@@ -919,15 +802,10 @@ function UpdateDaemonCard({ host }: { host: HostProfile }) {
           message: t("settings.host.daemon.update.dialogFailedMessage"),
         });
       });
-  }, [daemonClient, host.label, host.serverId, isHostConnected, runtime, t, waitForDaemonRestart]);
-
-  const updateIcon = useMemo(
-    () => <ArrowUpToLine size={theme.iconSize.sm} color={theme.colors.foreground} />,
-    [theme.iconSize.sm, theme.colors.foreground],
-  );
+  }, [daemonClient, host.label, host.serverId, isHostConnected, t]);
 
   const shouldShowUpdate = hasVersionMismatch && (supportsSelfUpdate || desktopManaged);
-  if (!shouldShowUpdate) {
+  if (!shouldShowUpdate && updateState.status !== "complete") {
     return null;
   }
 
@@ -956,9 +834,20 @@ function UpdateDaemonCard({ host }: { host: HostProfile }) {
           {buttonLabel}
         </Button>
       </View>
+      {updateState.status === "complete" ? (
+        <InlineAlert
+          size="sm"
+          variant="success"
+          title={t("desktop.daemon.lifecycle.workerUpdated", {
+            version: updateState.workerVersion,
+          })}
+          description={t("desktop.daemon.lifecycle.supervisorRefresh")}
+        />
+      ) : null}
       {updateState.status === "failed" ? (
         <View style={styles.updateFailure}>
           <InlineAlert
+            size="sm"
             variant="error"
             title={updateState.title}
             description={updateState.message}
@@ -1253,13 +1142,14 @@ function RemoveHostSection({
   const [isConfirming, setIsConfirming] = useState(false);
   const [isRemoving, setIsRemoving] = useState(false);
   const daemonStatus = daemonStatusData?.status ?? null;
+  const stopsOwnedDaemon = isLocalDaemon && daemonStatus?.ownedByDesktop === true;
   const removeHostHeader = useMemo<SheetHeader>(
     () => ({
-      title: isLocalDaemon
+      title: stopsOwnedDaemon
         ? t("settings.host.daemon.remove.localConfirmTitle")
         : t("settings.host.daemon.remove.title"),
     }),
-    [isLocalDaemon, t],
+    [stopsOwnedDaemon, t],
   );
 
   const destructiveTextStyle = useMemo(
@@ -1292,7 +1182,7 @@ function RemoveHostSection({
         try {
           await updateSettings({ daemon: { manageBuiltInDaemon: false } });
           didDisableDaemonManagement = true;
-          if (daemonStatus?.status === "running" && daemonStatus.desktopManaged) {
+          if (daemonStatus?.status === "running" && daemonStatus.ownedByDesktop) {
             setStatus(await stopDesktopDaemon("host_remove"));
             didStopDaemon = true;
           }
@@ -1360,7 +1250,7 @@ function RemoveHostSection({
                 : t("settings.host.daemon.remove.title")}
             </Text>
             <Text style={settingsStyles.rowHint}>
-              {isLocalDaemon
+              {stopsOwnedDaemon
                 ? t("settings.host.daemon.remove.localHint")
                 : t("settings.host.daemon.remove.hint")}
             </Text>
@@ -1386,7 +1276,7 @@ function RemoveHostSection({
           testID="remove-host-confirm-modal"
         >
           <Text style={styles.confirmText}>
-            {isLocalDaemon
+            {stopsOwnedDaemon
               ? t("settings.host.daemon.remove.localConfirmMessage")
               : t("settings.host.daemon.remove.confirmMessage", { name: host.label })}
           </Text>
@@ -1813,18 +1703,6 @@ const styles = StyleSheet.create((theme) => ({
     marginHorizontal: theme.spacing[4],
     marginBottom: theme.spacing[4],
   },
-  daemonHeader: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    marginBottom: theme.spacing[4],
-  },
-  daemonHeaderLabel: {
-    flexShrink: 1,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
-    color: theme.colors.foreground,
-  },
   identityBadges: {
     flexDirection: "row",
     alignItems: "center",
@@ -1855,10 +1733,8 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     flexShrink: 1,
   },
-  errorText: {
-    color: theme.colors.palette.red[300],
-    fontSize: theme.fontSize.sm,
-    marginBottom: theme.spacing[2],
+  connectionError: {
+    marginBottom: theme.spacing[6],
   },
   connectionLatency: {
     fontSize: theme.fontSize.base,
diff --git a/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx b/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
index bba32cfa9d..3798a5f9bd 100644
--- a/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
+++ b/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
@@ -6,7 +6,7 @@ import { MoreHorizontal, Pencil, Undo2, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { Theme } from "@/styles/theme";
 import { settingsStyles } from "@/styles/settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -377,8 +377,7 @@ export function KeyboardShortcutsSection() {
       event.preventDefault();
       event.stopPropagation();
 
-      const key = event.key ?? "";
-      if (key === "Backspace") {
+      if (event.code === "Backspace" && heldModifiersFromEvent(event) === null) {
         setCapturedCombos((current) => (current.length > 0 ? current.slice(0, -1) : current));
         return;
       }
diff --git a/packages/app/src/screens/settings/layout/layout-section.tsx b/packages/app/src/screens/settings/layout/layout-section.tsx
deleted file mode 100644
index f15c451fbc..0000000000
--- a/packages/app/src/screens/settings/layout/layout-section.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { Fragment, useCallback } from "react";
-import { Text, View, type PressableStateCallbackType } from "react-native";
-import { useTranslation } from "react-i18next";
-import { StyleSheet } from "react-native-unistyles";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
-import {
-  useAppSettings,
-  type OpenInSidePanePreferences,
-  type PullRequestOpenLocation,
-} from "@/hooks/use-settings";
-import { SettingsSection } from "@/screens/settings/settings-section";
-import { settingsStyles } from "@/styles/settings";
-
-const SOURCES = [
-  "explorerFiles",
-  "diffs",
-  "chatFiles",
-  "diffFiles",
-  "subagents",
-] as const satisfies readonly (keyof OpenInSidePanePreferences)[];
-
-type LayoutPreferenceSource = keyof OpenInSidePanePreferences | "pullRequests";
-
-function destinationTriggerStyle({
-  pressed,
-  open,
-}: PressableStateCallbackType & { open?: boolean }) {
-  return [styles.destinationTrigger, (pressed || open) && styles.destinationTriggerActive];
-}
-
-function LayoutPreferenceRow({
-  source,
-  destination,
-  first,
-  allowExplorer,
-  onDestinationChange,
-}: {
-  source: LayoutPreferenceSource;
-  destination: PullRequestOpenLocation;
-  first: boolean;
-  allowExplorer?: boolean;
-  onDestinationChange: (
-    source: LayoutPreferenceSource,
-    destination: PullRequestOpenLocation,
-  ) => void;
-}) {
-  const { t } = useTranslation();
-  const destinationLabel = t(`settings.layout.openInSidePane.destinations.${destination}`);
-  const selectMain = useCallback(
-    () => onDestinationChange(source, "main"),
-    [onDestinationChange, source],
-  );
-  const selectSide = useCallback(
-    () => onDestinationChange(source, "side"),
-    [onDestinationChange, source],
-  );
-  const selectExplorer = useCallback(
-    () => onDestinationChange(source, "explorer"),
-    [onDestinationChange, source],
-  );
-  const label = t(`settings.layout.openInSidePane.sources.${source}.label`);
-  return (
-    <View style={[settingsStyles.row, first ? null : settingsStyles.rowBorder]}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>{label}</Text>
-      </View>
-      <DropdownMenu>
-        <DropdownTrigger
-          style={destinationTriggerStyle}
-          accessibilityRole="button"
-          accessibilityLabel={`${label}: ${destinationLabel}`}
-        >
-          <Text style={styles.destinationLabel}>{destinationLabel}</Text>
-        </DropdownTrigger>
-        <DropdownMenuContent side="bottom" align="end" width={180}>
-          <DropdownMenuItem selected={destination === "main"} onSelect={selectMain}>
-            {t("settings.layout.openInSidePane.destinations.main")}
-          </DropdownMenuItem>
-          <DropdownMenuItem selected={destination === "side"} onSelect={selectSide}>
-            {t("settings.layout.openInSidePane.destinations.side")}
-          </DropdownMenuItem>
-          {allowExplorer ? (
-            <DropdownMenuItem selected={destination === "explorer"} onSelect={selectExplorer}>
-              {t("settings.layout.openInSidePane.destinations.explorer")}
-            </DropdownMenuItem>
-          ) : null}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </View>
-  );
-}
-
-export function LayoutSection() {
-  const { t } = useTranslation();
-  const { settings, updateSettings } = useAppSettings();
-  const handleDestinationChange = useCallback(
-    (source: LayoutPreferenceSource, destination: PullRequestOpenLocation) => {
-      if (source === "pullRequests") {
-        void updateSettings({ pullRequestOpenLocation: destination });
-        return;
-      }
-      void updateSettings({
-        openInSidePane: { ...settings.openInSidePane, [source]: destination === "side" },
-      });
-    },
-    [settings.openInSidePane, updateSettings],
-  );
-  return (
-    <SettingsSection title={t("settings.layout.openInSidePane.title")}>
-      <View style={settingsStyles.card}>
-        {SOURCES.map((source, index) => (
-          <Fragment key={source}>
-            <LayoutPreferenceRow
-              source={source}
-              destination={settings.openInSidePane[source] ? "side" : "main"}
-              first={index === 0}
-              onDestinationChange={handleDestinationChange}
-            />
-          </Fragment>
-        ))}
-        <LayoutPreferenceRow
-          source="pullRequests"
-          destination={settings.pullRequestOpenLocation}
-          first={false}
-          allowExplorer
-          onDestinationChange={handleDestinationChange}
-        />
-      </View>
-    </SettingsSection>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  destinationTrigger: {
-    paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-  },
-  destinationTriggerActive: {
-    backgroundColor: theme.colors.interactionHighlight,
-  },
-  destinationLabel: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-}));
diff --git a/packages/app/src/screens/settings/metadata-generation-page.tsx b/packages/app/src/screens/settings/metadata-generation-page.tsx
index decf4bf6ee..be137726ba 100644
--- a/packages/app/src/screens/settings/metadata-generation-page.tsx
+++ b/packages/app/src/screens/settings/metadata-generation-page.tsx
@@ -10,7 +10,7 @@ import { SegmentedControl } from "@/components/ui/segmented-control";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { buildSelectableProviderSelectorProviders } from "@/provider-selection/provider-selection";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 
 const METADATA_GENERATION_DOCS_URL = "https://paseo.sh/docs/metadata-generation";
diff --git a/packages/app/src/screens/settings/open-location/open-location-section.tsx b/packages/app/src/screens/settings/open-location/open-location-section.tsx
new file mode 100644
index 0000000000..fddc3e1f4b
--- /dev/null
+++ b/packages/app/src/screens/settings/open-location/open-location-section.tsx
@@ -0,0 +1,123 @@
+import { useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { SettingsSection, SettingsCard, SettingsSelect } from "@/components/settings";
+import {
+  useAppSettings,
+  type OpenInSidePanePreferences,
+  type PullRequestOpenLocation,
+  type ServiceUrlBehavior,
+} from "@/hooks/use-settings";
+
+const SOURCES = [
+  "explorerFiles",
+  "diffs",
+  "chatFiles",
+  "diffFiles",
+  "subagents",
+] as const satisfies readonly (keyof OpenInSidePanePreferences)[];
+
+const SERVICE_URL_BEHAVIORS: readonly ServiceUrlBehavior[] = ["ask", "in-app", "external"];
+
+const SERVICE_URL_LABEL_KEYS: Record<ServiceUrlBehavior, string> = {
+  ask: "settings.general.serviceUrls.options.ask",
+  "in-app": "settings.general.serviceUrls.options.inApp",
+  external: "settings.general.serviceUrls.options.external",
+};
+
+type OpenLocationSource = keyof OpenInSidePanePreferences | "pullRequests";
+
+function OpenLocationRow({
+  source,
+  destination,
+  allowExplorer,
+  onDestinationChange,
+}: {
+  source: OpenLocationSource;
+  destination: PullRequestOpenLocation;
+  allowExplorer?: boolean;
+  onDestinationChange(source: OpenLocationSource, destination: PullRequestOpenLocation): void;
+}) {
+  const { t } = useTranslation();
+  const options = useMemo(() => {
+    const destinations = allowExplorer
+      ? (["main", "side", "explorer"] as const)
+      : (["main", "side"] as const);
+    return destinations.map((value) => ({
+      value,
+      label: t(`settings.layout.openInSidePane.destinations.${value}`),
+    }));
+  }, [allowExplorer, t]);
+  const change = useCallback(
+    (value: PullRequestOpenLocation) => onDestinationChange(source, value),
+    [source, onDestinationChange],
+  );
+  return (
+    <SettingsSelect
+      label={t(`settings.layout.openInSidePane.sources.${source}.label`)}
+      value={destination}
+      options={options}
+      onValueChange={change}
+    />
+  );
+}
+
+function ServiceUrlRow() {
+  const { t } = useTranslation();
+  const { settings, updateSettings } = useAppSettings();
+  const options = useMemo(
+    () =>
+      SERVICE_URL_BEHAVIORS.map((value) => ({ value, label: t(SERVICE_URL_LABEL_KEYS[value]) })),
+    [t],
+  );
+  const change = useCallback(
+    (serviceUrlBehavior: ServiceUrlBehavior) => void updateSettings({ serviceUrlBehavior }),
+    [updateSettings],
+  );
+  return (
+    <SettingsSelect
+      label={t("settings.layout.openInSidePane.sources.serviceUrls.label")}
+      value={settings.serviceUrlBehavior}
+      options={options}
+      onValueChange={change}
+    />
+  );
+}
+
+/** Where things open: files, diffs, subagents, pull requests, and script URLs. Desktop only. */
+export function OpenLocationSection() {
+  const { t } = useTranslation();
+  const { settings, updateSettings } = useAppSettings();
+  const handleDestinationChange = useCallback(
+    (source: OpenLocationSource, destination: PullRequestOpenLocation) => {
+      if (source === "pullRequests") {
+        void updateSettings({ pullRequestOpenLocation: destination });
+        return;
+      }
+      void updateSettings({
+        openInSidePane: { ...settings.openInSidePane, [source]: destination === "side" },
+      });
+    },
+    [settings.openInSidePane, updateSettings],
+  );
+  return (
+    <SettingsSection title={t("settings.layout.openInSidePane.title")}>
+      <SettingsCard>
+        {SOURCES.map((source) => (
+          <OpenLocationRow
+            key={source}
+            source={source}
+            destination={settings.openInSidePane[source] ? "side" : "main"}
+            onDestinationChange={handleDestinationChange}
+          />
+        ))}
+        <OpenLocationRow
+          source="pullRequests"
+          destination={settings.pullRequestOpenLocation}
+          allowExplorer
+          onDestinationChange={handleDestinationChange}
+        />
+        <ServiceUrlRow />
+      </SettingsCard>
+    </SettingsSection>
+  );
+}
diff --git a/packages/app/src/screens/settings/plugin-install-form-model.test.ts b/packages/app/src/screens/settings/plugin-install-form-model.test.ts
new file mode 100644
index 0000000000..3ee48f43d7
--- /dev/null
+++ b/packages/app/src/screens/settings/plugin-install-form-model.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { openPluginInstallForm } from "./plugin-install-form-model";
+
+describe("plugin install form", () => {
+  it("keeps the edited source in the submission until explicitly reset", () => {
+    const model = openPluginInstallForm();
+
+    model.setSource("owner/review");
+
+    expect(model.getSubmission()).toEqual({ source: "owner/review" });
+
+    model.reset();
+    expect(model.getState()).toEqual({
+      source: "",
+      canSubmit: false,
+      resetKey: 1,
+    });
+  });
+
+  it("trims the submitted source", () => {
+    const model = openPluginInstallForm();
+    model.setSource("  /plugins/review  ");
+    expect(model.getSubmission()).toEqual({ source: "/plugins/review" });
+  });
+});
diff --git a/packages/app/src/screens/settings/plugin-install-form-model.ts b/packages/app/src/screens/settings/plugin-install-form-model.ts
new file mode 100644
index 0000000000..82fbfa12e2
--- /dev/null
+++ b/packages/app/src/screens/settings/plugin-install-form-model.ts
@@ -0,0 +1,53 @@
+export interface PluginInstallFormState {
+  source: string;
+  canSubmit: boolean;
+  resetKey: number;
+}
+
+export interface PluginInstallSubmission {
+  source: string;
+}
+
+export interface PluginInstallFormModel {
+  getState(): PluginInstallFormState;
+  subscribe(listener: () => void): () => void;
+  close(): void;
+  setSource(value: string): void;
+  getSubmission(): PluginInstallSubmission;
+  reset(): void;
+}
+
+export function openPluginInstallForm(): PluginInstallFormModel {
+  const listeners = new Set<() => void>();
+  let state: PluginInstallFormState = {
+    source: "",
+    canSubmit: false,
+    resetKey: 0,
+  };
+
+  const publish = (next: Pick<PluginInstallFormState, "source" | "resetKey">) => {
+    state = { ...next, canSubmit: next.source.trim().length > 0 };
+    for (const listener of listeners) listener();
+  };
+
+  return {
+    getState: () => state,
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    close() {
+      listeners.clear();
+    },
+    setSource(source) {
+      publish({ ...state, source });
+    },
+    getSubmission() {
+      const source = state.source.trim();
+      return { source };
+    },
+    reset() {
+      publish({ source: "", resetKey: state.resetKey + 1 });
+    },
+  };
+}
diff --git a/packages/app/src/screens/settings/plugins-page.test.tsx b/packages/app/src/screens/settings/plugins-page.test.tsx
index 65992960da..0ede3f803b 100644
--- a/packages/app/src/screens/settings/plugins-page.test.tsx
+++ b/packages/app/src/screens/settings/plugins-page.test.tsx
@@ -1,3 +1,4 @@
+import { subscriptionFixture } from "@/runtime/subscription-fixture";
 /**
  * @vitest-environment jsdom
  */
@@ -25,8 +26,10 @@ vi.mock("@/runtime/host-runtime", () => ({
 }));
 
 vi.mock("@/runtime/host-features", () => ({
-  useHostFeature: (_serverId: string, feature: string) =>
-    feature === "pluginLogs" ? runtime.logsSupported : runtime.supported,
+  useHostFeature: (_serverId: string, feature: string) => {
+    if (feature === "pluginLogs") return runtime.logsSupported;
+    return runtime.supported;
+  },
 }));
 
 vi.mock("@/components/adaptive-modal-sheet", async () => {
@@ -58,6 +61,11 @@ vi.mock("@/components/adaptive-modal-sheet", async () => {
 
 vi.mock("react-native-reanimated", () => ({
   default: { View: "div" },
+  Keyframe: class {
+    duration() {
+      return this;
+    }
+  },
   Easing: { ease: "ease", inOut: (value: unknown) => value },
   interpolateColor: (value: number, _input: number[], output: string[]) =>
     value >= 1 ? output[1] : output[0],
@@ -83,27 +91,32 @@ vi.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
 }));
 
-function never<T>(): Promise<T> {
-  return new Promise<T>(() => undefined);
-}
-
 function plugin(enabled = true): PluginListItem {
   return {
     id: "example",
+    description: "Reviews changes before merge",
     path: "/plugins/example",
     enabled,
     status: enabled ? "running" : "disabled",
   };
 }
 
+async function selectPluginAction(action: string): Promise<void> {
+  fireEvent.click(await screen.findByRole("button", { name: "Actions for example" }));
+  fireEvent.click(await screen.findByRole("menuitem", { name: action }));
+}
+
 function createClient() {
   return {
-    on: vi.fn(() => () => undefined),
+    observeEvents: () =>
+      subscriptionFixture(
+        Promise.resolve({ events: ["status.plugin_catalog_changed"] }),
+        () => () => {},
+      ),
     getDaemonConfig: vi.fn(async () => ({ config: { pluginsEnabled: true } })),
     patchDaemonConfig: vi.fn(async () => ({ config: { pluginsEnabled: true } })),
     listPlugins: vi.fn(async (): Promise<PluginListItem[]> => []),
-    inspectDirectoryPlugin: vi.fn(async () => ({ id: "example" })),
-    installDirectoryPlugin: vi.fn(async () => plugin()),
+    installPluginSource: vi.fn(async () => plugin()),
     reloadPlugin: vi.fn(async () => plugin()),
     enablePlugin: vi.fn(async () => plugin()),
     disablePlugin: vi.fn(async () => plugin(false)),
@@ -170,36 +183,16 @@ describe("HostPluginsPage", () => {
   });
 
   it.each([
-    ["reloadPlugin", "Reload", "Reloading…", true],
-    ["disablePlugin", "Disable", "Disabling…", true],
-    ["enablePlugin", "Enable", "Enabling…", false],
-    ["removePlugin", "Remove", "Removing…", true],
-  ] as const)("renders %s pending on its plugin row", async (method, trigger, pending, enabled) => {
+    ["reloadPlugin", "Reload"],
+    ["removePlugin", "Remove"],
+  ] as const)("runs %s from the plugin actions menu", async (method, action) => {
     const client = createClient();
-    client.listPlugins.mockResolvedValue([plugin(enabled)]);
-    client[method].mockImplementation(() => never<never>());
+    client.listPlugins.mockResolvedValue([plugin()]);
     renderPage(client);
 
-    fireEvent.click(await screen.findByRole("button", { name: trigger }));
+    await selectPluginAction(action);
 
-    const pendingControl = await screen.findByRole("button", { name: pending });
-    expect(pendingControl.getAttribute("aria-disabled")).toBe("true");
-    expect(client[method]).toHaveBeenCalledTimes(1);
-  });
-
-  it("renders install pending through the real form and mutation", async () => {
-    const client = createClient();
-    client.installDirectoryPlugin.mockImplementation(() => never<never>());
-    renderPage(client);
-
-    fireEvent.change(screen.getByLabelText("Plugin directory"), {
-      target: { value: "/plugins/example" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "Install directory" }));
-
-    const pendingControl = await screen.findByRole("button", { name: "Installing…" });
-    expect(pendingControl.getAttribute("aria-disabled")).toBe("true");
-    expect(client.installDirectoryPlugin).toHaveBeenCalledWith("/plugins/example", undefined);
+    await waitFor(() => expect(client[method]).toHaveBeenCalledTimes(1));
   });
 
   it("hides the logs action when the host does not advertise support", async () => {
@@ -209,7 +202,8 @@ describe("HostPluginsPage", () => {
     renderPage(client);
 
     await screen.findByText("example");
-    expect(screen.queryByRole("button", { name: "Logs" })).toBeNull();
+    fireEvent.click(screen.getByRole("button", { name: "Actions for example" }));
+    expect(screen.queryByRole("menuitem", { name: "Logs" })).toBeNull();
   });
 
   it("opens readable stdout and stderr logs and refreshes them", async () => {
@@ -231,7 +225,7 @@ describe("HostPluginsPage", () => {
     ]);
     renderPage(client);
 
-    fireEvent.click(await screen.findByRole("button", { name: "Logs" }));
+    await selectPluginAction("Logs");
 
     expect(await screen.findByRole("dialog")).toBeDefined();
     expect(screen.getByText("Logs: example")).toBeDefined();
@@ -250,7 +244,7 @@ describe("HostPluginsPage", () => {
     client.getPluginLogs.mockRejectedValueOnce(new Error("logs exploded"));
     renderPage(client);
 
-    fireEvent.click(await screen.findByRole("button", { name: "Logs" }));
+    await selectPluginAction("Logs");
     expect(await screen.findByText("Unable to load plugin logs")).toBeDefined();
     expect(screen.getByText("logs exploded")).toBeDefined();
 
diff --git a/packages/app/src/screens/settings/plugins-page.tsx b/packages/app/src/screens/settings/plugins-page.tsx
index 8ff4ccc27e..f3bdab3fad 100644
--- a/packages/app/src/screens/settings/plugins-page.tsx
+++ b/packages/app/src/screens/settings/plugins-page.tsx
@@ -1,26 +1,39 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { formatPluginInstallation } from "@getpaseo/protocol/plugin-source-reference";
+import { PluginSettingsMenuItems } from "@/plugins/settings";
+import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useMutation } from "@tanstack/react-query";
 import type { PluginListItem, PluginLogEntry } from "@getpaseo/protocol/messages";
+import { MoreHorizontal, Trash2 } from "lucide-react-native";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { SettingsCard, SettingsRow } from "@/components/settings";
 import { Alert } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { ExternalLink } from "@/components/ui/external-link";
 import { Field, FormTextInput } from "@/components/ui/form-field";
 import { StatusBadge } from "@/components/ui/status-badge";
 import { Switch } from "@/components/ui/switch";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import { useFetchQuery } from "@/data/query";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { useHostFeature } from "@/runtime/host-features";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { resolvePluginPageState } from "@/screens/settings/plugins-page-state";
+import { openPluginInstallForm } from "@/screens/settings/plugin-install-form-model";
 import { pluginRegistry, useInstalledPlugins } from "@/plugins/registry";
 import { settingsStyles } from "@/styles/settings";
 import { confirmDialog } from "@/utils/confirm-dialog";
 
 const pluginQueryKey = (serverId: string) => ["plugins", serverId] as const;
+const PLUGIN_SOURCE_DOCS_URL = "https://paseo.sh/docs/plugins/reference#plugin-sources";
 type PluginRowAction = "reload" | "enable" | "disable" | "remove";
 
 function errorMessage(error: unknown): string {
@@ -34,9 +47,9 @@ function pluginRowAction(action: string | undefined): PluginRowAction | undefine
   return undefined;
 }
 
-function PluginRow({
+function PluginActionsMenu({
   plugin,
-  clientError,
+  serverId,
   pending,
   pendingAction,
   onAction,
@@ -44,7 +57,7 @@ function PluginRow({
   supportsLogs,
 }: {
   plugin: PluginListItem;
-  clientError?: string;
+  serverId: string;
   pending: boolean;
   pendingAction?: PluginRowAction;
   onAction(action: PluginRowAction, plugin: PluginListItem): void;
@@ -53,55 +66,128 @@ function PluginRow({
 }) {
   const { t } = useTranslation();
   const reload = useCallback(() => onAction("reload", plugin), [onAction, plugin]);
-  const toggle = useCallback(
-    () => onAction(plugin.enabled ? "disable" : "enable", plugin),
-    [onAction, plugin],
-  );
   const remove = useCallback(() => onAction("remove", plugin), [onAction, plugin]);
   const openLogs = useCallback(() => onOpenLogs(plugin.id), [onOpenLogs, plugin.id]);
+  const removeIcon = useMemo(() => <Trash2 size={16} color={styles.dangerIcon.color} />, []);
+  const menuLabel = t("settings.plugins.actions.menu", { id: plugin.id });
+
+  return (
+    <DropdownMenu compactMode="sheet">
+      <DropdownMenuTrigger
+        accessibilityRole="button"
+        accessibilityLabel={menuLabel}
+        disabled={pending}
+        hitSlop={8}
+        style={styles.menuButton}
+      >
+        <MoreHorizontal size={18} color={styles.menuIcon.color} />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" width={220} sheetTitle={menuLabel}>
+        <PluginSettingsMenuItems serverId={serverId} pluginId={plugin.id} disabled={pending} />
+        {supportsLogs ? (
+          <DropdownMenuItem onSelect={openLogs} disabled={pending}>
+            {t("settings.plugins.logs.action")}
+          </DropdownMenuItem>
+        ) : null}
+        <DropdownMenuItem
+          onSelect={reload}
+          disabled={pending || !plugin.enabled}
+          status={pendingAction === "reload" ? "pending" : "idle"}
+          pendingLabel={t("settings.plugins.actions.reloading")}
+        >
+          {t("settings.plugins.actions.reload")}
+        </DropdownMenuItem>
+        <DropdownMenuItem
+          destructive
+          leading={removeIcon}
+          onSelect={remove}
+          disabled={pending}
+          status={pendingAction === "remove" ? "pending" : "idle"}
+          pendingLabel={t("settings.plugins.actions.removing")}
+        >
+          {t("settings.plugins.actions.remove")}
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+function PluginRow({
+  plugin,
+  serverId,
+  clientError,
+  pending,
+  pendingAction,
+  onAction,
+  onOpenLogs,
+  supportsLogs,
+}: {
+  plugin: PluginListItem;
+  serverId: string;
+  clientError?: string;
+  pending: boolean;
+  pendingAction?: PluginRowAction;
+  onAction(action: PluginRowAction, plugin: PluginListItem): void;
+  onOpenLogs(pluginId: string): void;
+  supportsLogs: boolean;
+}) {
+  const { t } = useTranslation();
+  const toggle = useCallback(
+    (enabled: boolean) => onAction(enabled ? "enable" : "disable", plugin),
+    [onAction, plugin],
+  );
   const status = clientError ? "failed" : plugin.status;
   let badgeVariant: "success" | "error" | "muted" = "muted";
   if (status === "running") badgeVariant = "success";
   else if (status === "failed") badgeVariant = "error";
   const statusLabel = t(`settings.plugins.status.${status}`);
-  let toggleLabel = t(
-    plugin.enabled ? "settings.plugins.actions.disable" : "settings.plugins.actions.enable",
+  const statusBadge = useMemo(
+    () => <StatusBadge label={statusLabel} variant={badgeVariant} />,
+    [badgeVariant, statusLabel],
   );
-  if (pendingAction === "enable") toggleLabel = t("settings.plugins.actions.enabling");
-  else if (pendingAction === "disable") toggleLabel = t("settings.plugins.actions.disabling");
-  return (
-    <View style={styles.pluginRow} accessibilityLabel={`${plugin.id} ${statusLabel}`}>
-      <View style={settingsStyles.rowContent}>
-        <View style={styles.pluginTitle}>
-          <Text style={settingsStyles.rowTitle}>{plugin.id}</Text>
-          <StatusBadge label={statusLabel} variant={badgeVariant} />
+  const hint = useMemo(
+    () =>
+      plugin.description || plugin.installation ? (
+        <View>
+          {plugin.description ? (
+            <Text style={styles.pluginDescription}>{plugin.description}</Text>
+          ) : null}
+          {plugin.installation ? (
+            <Text style={styles.pluginSource}>{formatPluginInstallation(plugin.installation)}</Text>
+          ) : null}
         </View>
-        <Text style={settingsStyles.rowHint}>{plugin.path}</Text>
-        {clientError || plugin.error ? (
-          <Text style={styles.error}>{clientError ?? plugin.error}</Text>
-        ) : null}
+      ) : undefined,
+    [plugin.description, plugin.installation],
+  );
+  const toggleLabel = `${plugin.id}: ${t(
+    plugin.enabled ? "settings.plugins.actions.disable" : "settings.plugins.actions.enable",
+  )}`;
+  return (
+    <SettingsRow
+      label={plugin.id}
+      labelAccessory={statusBadge}
+      hint={hint}
+      error={clientError ?? plugin.error}
+      testID={`plugin-row-${plugin.id}`}
+    >
+      <View style={styles.pluginControls} accessibilityLabel={`${plugin.id} ${statusLabel}`}>
+        <Switch
+          value={plugin.enabled}
+          onValueChange={toggle}
+          disabled={pending}
+          accessibilityLabel={toggleLabel}
+        />
+        <PluginActionsMenu
+          plugin={plugin}
+          serverId={serverId}
+          pending={pending}
+          pendingAction={pendingAction}
+          onAction={onAction}
+          onOpenLogs={onOpenLogs}
+          supportsLogs={supportsLogs}
+        />
       </View>
-      <View style={styles.actions}>
-        {supportsLogs ? (
-          <Button variant="outline" size="sm" onPress={openLogs} disabled={pending}>
-            {t("settings.plugins.logs.action")}
-          </Button>
-        ) : null}
-        <Button variant="outline" size="sm" onPress={reload} disabled={pending || !plugin.enabled}>
-          {pendingAction === "reload"
-            ? t("settings.plugins.actions.reloading")
-            : t("settings.plugins.actions.reload")}
-        </Button>
-        <Button variant="outline" size="sm" onPress={toggle} disabled={pending}>
-          {toggleLabel}
-        </Button>
-        <Button variant="outline" size="sm" onPress={remove} disabled={pending}>
-          {pendingAction === "remove"
-            ? t("settings.plugins.actions.removing")
-            : t("settings.plugins.actions.remove")}
-        </Button>
-      </View>
-    </View>
+    </SettingsRow>
   );
 }
 
@@ -144,6 +230,7 @@ function PluginLogsSheet({
   if (logs.isError) {
     content = (
       <Alert
+        size="sm"
         variant="error"
         title={t("settings.plugins.logs.errorTitle")}
         description={errorMessage(logs.error)}
@@ -182,16 +269,30 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
   const client = useHostRuntimeClient(serverId);
   const connected = useHostRuntimeIsConnected(serverId);
   const supported = useHostFeature(serverId, "pluginManagement");
+  // COMPAT(pluginSourceInstallation): added in v0.8.0; remove gate after 2027-03-16 once daemon floor supports source identifiers.
+  const sourceInstallSupported = useHostFeature(serverId, "pluginSourceInstallation");
   // COMPAT(pluginLogs): added in v0.4.0, remove gate after 2027-08-16.
   const logsSupported = useHostFeature(serverId, "pluginLogs");
   const { config, patchConfig } = useDaemonConfig(serverId);
   const refreshQueue = useRef(Promise.resolve());
   useInstalledPlugins();
   const queryKey = useMemo(() => pluginQueryKey(serverId), [serverId]);
-  const [directory, setDirectory] = useState("");
-  const [pluginId, setPluginId] = useState("");
-  const [directoryResetKey, setDirectoryResetKey] = useState(0);
-  const [pluginIdResetKey, setPluginIdResetKey] = useState(0);
+  const [installForm] = useState(openPluginInstallForm);
+  const installState = useSyncExternalStore(
+    installForm.subscribe,
+    installForm.getState,
+    installForm.getState,
+  );
+  const sourceDocsLink = useMemo(
+    () => (
+      <ExternalLink
+        href={PLUGIN_SOURCE_DOCS_URL}
+        label={t("settings.plugins.docs")}
+        testID="plugin-source-docs-link"
+      />
+    ),
+    [t],
+  );
   const [logsPluginId, setLogsPluginId] = useState<string | null>(null);
   const [feedback, setFeedback] = useState<{ kind: "success" | "error"; message: string } | null>(
     null,
@@ -216,11 +317,24 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
     await refreshQueue.current;
   }, [client, refetchPlugins]);
   useEffect(() => {
-    if (!client) return;
-    return client.on("status", (message) => {
-      if (message.payload.status === "plugin_catalog_changed") void refresh();
+    return () => installForm.close();
+  }, [installForm]);
+  useEffect(() => {
+    if (!client || !connected || !supported) return;
+    const observation = client.observeEvents(["status.plugin_catalog_changed"]);
+    observation.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "status" && message.payload.status === "plugin_catalog_changed")
+          void refresh();
+      },
     });
-  }, [client, refresh]);
+    return () => {
+      void observation
+        .release()
+        .catch((error) => console.warn("[Plugins] Failed to release settings feed", error));
+    };
+  }, [client, connected, supported, refresh]);
   const mutation = useMutation({
     mutationFn: async (operation: {
       action: string;
@@ -234,33 +348,18 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
     onError: (error) => setFeedback({ kind: "error", message: errorMessage(error) }),
   });
   const install = useCallback(() => {
-    const path = directory.trim();
-    if (!client || !path) return;
+    if (!client || !sourceInstallSupported || !installState.canSubmit) return;
+    const input = installForm.getSubmission();
     setFeedback(null);
     mutation.mutate({
       action: "install",
       run: async () => {
-        const installed = await client.installDirectoryPlugin(path, pluginId.trim() || undefined);
-        setDirectory("");
-        setPluginId("");
-        setDirectoryResetKey((key) => key + 1);
-        setPluginIdResetKey((key) => key + 1);
+        const installed = await client.installPluginSource(input);
+        installForm.reset();
         return t("settings.plugins.feedback.installed", { id: installed.id });
       },
     });
-  }, [client, directory, mutation, pluginId, t]);
-  const prefillManifestId = useCallback(() => {
-    const path = directory.trim();
-    if (!client || !path || pluginId.trim()) return;
-    void client
-      .inspectDirectoryPlugin(path)
-      .then(({ id }) => {
-        setPluginId(id);
-        setPluginIdResetKey((key) => key + 1);
-        return undefined;
-      })
-      .catch(() => undefined);
-  }, [client, directory, pluginId]);
+  }, [client, installForm, installState.canSubmit, mutation, sourceInstallSupported, t]);
   const action = useCallback(
     (name: PluginRowAction, plugin: PluginListItem) => {
       if (!client) return;
@@ -314,6 +413,7 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
   if (pageState === "offline") {
     return (
       <Alert
+        size="md"
         variant="warning"
         title={t("settings.plugins.states.offlineTitle")}
         description={t("settings.plugins.states.offlineDescription")}
@@ -321,13 +421,14 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
     );
   }
   if (pageState === "unsupported") {
-    return <Alert variant="warning" title={t("settings.plugins.states.updateTitle")} />;
+    return <Alert size="md" variant="warning" title={t("settings.plugins.states.updateTitle")} />;
   }
 
-  let catalogContent = <Alert title={t("settings.plugins.states.loading")} />;
+  let catalogContent = <Alert size="sm" title={t("settings.plugins.states.loading")} />;
   if (pageState === "error") {
     catalogContent = (
       <Alert
+        size="sm"
         variant="error"
         title={t("settings.plugins.states.errorTitle")}
         description={errorMessage(plugins.error)}
@@ -339,7 +440,7 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
     );
   } else if (pageState !== "loading") {
     catalogContent = (
-      <View style={settingsStyles.card}>
+      <SettingsCard>
         {plugins.data?.length ? (
           plugins.data.map((plugin) => {
             const clientError = pluginRegistry.getEvaluationError(serverId, plugin.id);
@@ -347,6 +448,7 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
             return (
               <PluginRow
                 key={plugin.id}
+                serverId={serverId}
                 plugin={plugin}
                 clientError={clientError}
                 pending={mutation.isPending}
@@ -362,7 +464,7 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
             <Text style={settingsStyles.rowHint}>{t("settings.plugins.states.empty")}</Text>
           </View>
         )}
-      </View>
+      </SettingsCard>
     );
   }
 
@@ -370,6 +472,7 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
     <View>
       <SettingsSection title={t("settings.plugins.title")}>
         <Alert
+          size="sm"
           variant="warning"
           title={t("settings.plugins.trustedTitle")}
           description={t("settings.plugins.trustedDescription")}
@@ -388,40 +491,36 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
             />
           </View>
         </View>
-        <View style={[settingsStyles.card, styles.install]}>
-          <Field label={t("settings.plugins.directoryLabel")}>
-            <FormTextInput
-              initialValue=""
-              resetKey={directoryResetKey}
-              onChangeText={setDirectory}
-              onBlur={prefillManifestId}
-              placeholder={t("settings.plugins.directoryPlaceholder")}
-              autoCapitalize="none"
-              autoCorrect={false}
-              editable={!mutation.isPending}
-              accessibilityLabel={t("settings.plugins.directoryLabel")}
-            />
-          </Field>
-          <Field label={t("settings.plugins.idLabel")} hint={t("settings.plugins.idHint")}>
-            <FormTextInput
-              initialValue={pluginId}
-              resetKey={pluginIdResetKey}
-              onChangeText={setPluginId}
-              placeholder={t("settings.plugins.idPlaceholder")}
-              autoCapitalize="none"
-              autoCorrect={false}
-              editable={!mutation.isPending}
-              accessibilityLabel={t("settings.plugins.idLabel")}
-            />
-          </Field>
-          <Button onPress={install} disabled={!directory.trim() || mutation.isPending}>
-            {mutation.isPending && mutation.variables?.action === "install"
-              ? t("settings.plugins.installing")
-              : t("settings.plugins.install")}
-          </Button>
-        </View>
+        {sourceInstallSupported ? (
+          <View style={[settingsStyles.card, styles.install]}>
+            <Field label={t("settings.plugins.sourceLabel")} trailing={sourceDocsLink}>
+              <FormTextInput
+                initialValue=""
+                resetKey={installState.resetKey}
+                onChangeText={installForm.setSource}
+                placeholder={t("settings.plugins.sourcePlaceholder")}
+                autoCapitalize="none"
+                autoCorrect={false}
+                editable={!mutation.isPending}
+                accessibilityLabel={t("settings.plugins.sourceLabel")}
+              />
+            </Field>
+            <Button onPress={install} disabled={!installState.canSubmit || mutation.isPending}>
+              {mutation.isPending && mutation.variables?.action === "install"
+                ? t("settings.plugins.installing")
+                : t("settings.plugins.install")}
+            </Button>
+          </View>
+        ) : (
+          <Alert
+            size="sm"
+            variant="warning"
+            title={t("settings.plugins.states.sourceUpdateTitle")}
+          />
+        )}
         {feedback ? (
           <Alert
+            size="sm"
             variant={feedback.kind}
             title={feedback.message}
             testID="plugin-management-feedback"
@@ -442,16 +541,21 @@ export function HostPluginsPage({ serverId }: { serverId: string }) {
 }
 
 const styles = StyleSheet.create((theme) => ({
-  install: { padding: theme.spacing[4], gap: theme.spacing[3] },
-  pluginRow: {
-    padding: theme.spacing[4],
-    gap: theme.spacing[3],
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
+  pluginDescription: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+    marginTop: theme.spacing[1],
   },
-  pluginTitle: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
-  actions: { flexDirection: "row", flexWrap: "wrap", gap: theme.spacing[2] },
-  error: { color: theme.colors.statusDanger, fontSize: theme.fontSize.sm },
+  pluginSource: {
+    color: theme.colors.foregroundExtraMuted,
+    fontSize: theme.fontSize.sm,
+    marginTop: theme.spacing[1],
+  },
+  install: { padding: theme.spacing[4], gap: theme.spacing[3] },
+  pluginControls: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
+  menuButton: { padding: theme.spacing[1], borderRadius: theme.borderRadius.sm },
+  menuIcon: { color: theme.colors.foregroundMuted },
+  dangerIcon: { color: theme.colors.statusDanger },
   empty: { padding: theme.spacing[4], alignItems: "center" },
   logsState: {
     color: theme.colors.foregroundMuted,
diff --git a/packages/app/src/screens/settings/providers-section.test.tsx b/packages/app/src/screens/settings/providers-section.test.tsx
index 849ea62cbc..77aaa4d8ec 100644
--- a/packages/app/src/screens/settings/providers-section.test.tsx
+++ b/packages/app/src/screens/settings/providers-section.test.tsx
@@ -166,7 +166,7 @@ vi.mock("@/components/ui/loading-spinner", () => ({
   LoadingSpinner: () => React.createElement("span", { "data-testid": "loading-spinner" }),
 }));
 
-vi.mock("@/screens/settings/settings-info-tip", () => ({
+vi.mock("@/components/settings/headings/settings-info-tip", () => ({
   SettingsInfoTip: () => null,
 }));
 
@@ -233,7 +233,7 @@ vi.mock("@/components/ui/dropdown-menu", () => ({
 }));
 
 vi.mock("@/components/provider-icons", () => ({
-  getProviderIcon: (provider: string) => () =>
+  useProviderIcon: (provider: string) => () =>
     React.createElement("span", { "data-icon": `provider-${provider}` }),
 }));
 
diff --git a/packages/app/src/screens/settings/providers-section.tsx b/packages/app/src/screens/settings/providers-section.tsx
index 5c44244e32..4fb0a43278 100644
--- a/packages/app/src/screens/settings/providers-section.tsx
+++ b/packages/app/src/screens/settings/providers-section.tsx
@@ -22,7 +22,7 @@ import {
   type AcpProviderCatalogItem,
 } from "@/hooks/use-acp-provider-catalog";
 import { ProviderCatalogList } from "@/components/provider-catalog-list";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Switch } from "@/components/ui/switch";
 import {
@@ -31,7 +31,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { useProviderSettingsStore } from "@/stores/provider-settings-store";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { filterSelectableModels } from "@/provider-selection/model-catalog";
@@ -77,6 +77,7 @@ function getProviderStatus(
 }
 
 interface ProviderRowProps {
+  serverId: string;
   def: ProviderDefinition;
   entry: ProviderEntry;
   enabled: boolean;
@@ -167,6 +168,7 @@ function ProviderActionsMenu({
 }
 
 function ProviderRow({
+  serverId,
   def,
   entry,
   enabled,
@@ -181,7 +183,7 @@ function ProviderRow({
   const { t } = useTranslation();
   const { theme } = useUnistyles();
   const isCompact = useIsCompactFormFactor();
-  const ProviderIcon = getProviderIcon(def.id);
+  const ProviderIcon = useProviderIcon(def.id, serverId);
   const providerError =
     enabled &&
     entry.status === "error" &&
@@ -326,7 +328,7 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const isConnected = useHostRuntimeIsConnected(serverId);
   const supportsProviderRemoval = useHostFeature(serverId, "providerRemoval");
   const { entries, isLoading, refresh } = useProvidersSnapshot(serverId);
-  const { patchConfig } = useDaemonConfig(serverId);
+  const { config, patchConfig } = useDaemonConfig(serverId);
   const openProviderSettings = useProviderSettingsStore((state) => state.open);
   const [pendingProviderId, setPendingProviderId] = useState<string | null>(null);
   const [removingProviderId, setRemovingProviderId] = useState<string | null>(null);
@@ -336,6 +338,12 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const providerDefinitions = useMemo(() => buildProviderDefinitions(entries), [entries]);
   const hasServer = serverId.length > 0;
 
+  /** Custom providers are deletable only when config.json holds their `extends` definition. */
+  const isConfigOwnedProvider = useCallback(
+    (providerId: string) => Boolean(config?.providers?.[providerId]?.extends),
+    [config],
+  );
+
   const handleOpenProviderSettings = useCallback(
     (providerId: string) => {
       openProviderSettings({ serverId, provider: providerId });
@@ -436,12 +444,17 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
               return (
                 <ProviderRow
                   key={def.id}
+                  serverId={serverId}
                   def={def}
                   entry={entry}
                   enabled={entry.enabled ?? true}
                   isToggling={pendingProviderId === def.id}
                   isRemoving={removingProviderId === def.id}
-                  canRemove={supportsProviderRemoval && entry.source === "custom"}
+                  canRemove={
+                    supportsProviderRemoval &&
+                    entry.source === "custom" &&
+                    isConfigOwnedProvider(def.id)
+                  }
                   isFirst={index === 0}
                   onPress={handleOpenProviderSettings}
                   onToggleEnabled={handleToggleEnabled}
diff --git a/packages/app/src/screens/settings/appearance/sidebar-nav-section.tsx b/packages/app/src/screens/settings/sidebar/sidebar-nav-section.tsx
similarity index 78%
rename from packages/app/src/screens/settings/appearance/sidebar-nav-section.tsx
rename to packages/app/src/screens/settings/sidebar/sidebar-nav-section.tsx
index 1733d9ade9..7952a2b1ee 100644
--- a/packages/app/src/screens/settings/appearance/sidebar-nav-section.tsx
+++ b/packages/app/src/screens/settings/sidebar/sidebar-nav-section.tsx
@@ -5,7 +5,9 @@ import type { TFunction } from "i18next";
 import {
   ArrowDown,
   ArrowUp,
+  Blocks,
   CalendarClock,
+  Gauge,
   History,
   Plus,
   Search,
@@ -16,14 +18,15 @@ import { Button } from "@/components/ui/button";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Switch } from "@/components/ui/switch";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
-import { resolvePluginIcon } from "@/plugins/icons";
-import { SettingsSection } from "@/screens/settings/settings-section";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import {
   builtinSidebarNavLabelKey,
   builtinSidebarNavShortcutAction,
-  type BuiltinSidebarNavId,
+  type BuiltinSidebarItemId,
   type SidebarNavItem,
+  type SidebarSection,
 } from "@/sidebar-nav/model";
+import { resolvePluginIcon } from "@/plugins/icons";
 import { useSidebarNavItems } from "@/sidebar-nav/use-sidebar-nav-items";
 import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
@@ -36,13 +39,17 @@ const ThemedArrowDown = withUnistyles(ArrowDown);
 const moveUpIcon = <ThemedArrowUp size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
 const moveDownIcon = <ThemedArrowDown size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
 
-const BUILTIN_ICONS: Record<BuiltinSidebarNavId, LucideIcon> = {
+const BUILTIN_ICONS: Record<BuiltinSidebarItemId, LucideIcon> = {
   "new-workspace": Plus,
   history: History,
   search: Search,
   schedules: CalendarClock,
+  usage: Gauge,
 };
 
+/** Plugin items register no icon, so they share this one; a legacy `addSidebarItem` keeps its own. */
+const PLUGIN_ICON = Blocks;
+
 function NavIcon({ Icon, color = "" }: { Icon: LucideIcon; color?: string }) {
   return <Icon size={ICON_SIZE.md} color={color} />;
 }
@@ -50,7 +57,8 @@ function NavIcon({ Icon, color = "" }: { Icon: LucideIcon; color?: string }) {
 const ThemedNavIcon = withUnistyles(NavIcon);
 
 function navItemIcon(item: SidebarNavItem): LucideIcon {
-  return item.kind === "builtin" ? BUILTIN_ICONS[item.id] : resolvePluginIcon(item.group.icon);
+  if (item.kind === "builtin") return BUILTIN_ICONS[item.id];
+  return item.group.kind === "legacy" ? resolvePluginIcon(item.group.icon) : PLUGIN_ICON;
 }
 
 function navItemLabel(t: TFunction, item: SidebarNavItem): string {
@@ -134,15 +142,26 @@ function SidebarNavRow({
   );
 }
 
-export function SidebarNavSection(): ReactElement {
+const SECTION_COPY = {
+  header: {
+    title: "settings.appearance.sidebar.header.title",
+    info: "settings.appearance.sidebar.header.description",
+  },
+  footer: {
+    title: "settings.appearance.sidebar.footer.title",
+    info: "settings.appearance.sidebar.footer.description",
+  },
+} as const satisfies Record<SidebarSection, { title: string; info: string }>;
+
+function SidebarItemsCard({ section }: { section: SidebarSection }): ReactElement {
   const { t } = useTranslation();
-  const { items, setVisible, move } = useSidebarNavItems();
+  const { items, setVisible, move } = useSidebarNavItems(section);
 
   return (
     <SettingsSection
-      title={t("settings.appearance.sidebar.title")}
-      info={t("settings.appearance.sidebar.description")}
-      testID="sidebar-nav-section"
+      title={t(SECTION_COPY[section].title)}
+      info={t(SECTION_COPY[section].info)}
+      testID={`sidebar-nav-section-${section}`}
     >
       <View style={settingsStyles.card}>
         {items.map((item, index) => (
@@ -160,6 +179,16 @@ export function SidebarNavSection(): ReactElement {
   );
 }
 
+/** Settings > Sidebar: one card per section. The footer's bottom line is fixed and not listed. */
+export function SidebarNavSection(): ReactElement {
+  return (
+    <>
+      <SidebarItemsCard section="header" />
+      <SidebarItemsCard section="footer" />
+    </>
+  );
+}
+
 const styles = StyleSheet.create((theme) => ({
   row: {
     gap: theme.spacing[2],
diff --git a/packages/app/src/screens/settings/terminal/terminal-section.tsx b/packages/app/src/screens/settings/terminal/terminal-section.tsx
new file mode 100644
index 0000000000..4193e2e874
--- /dev/null
+++ b/packages/app/src/screens/settings/terminal/terminal-section.tsx
@@ -0,0 +1,67 @@
+import { useCallback, useEffect, useState } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { SettingsSection } from "@/components/settings";
+import { FormTextInput } from "@/components/ui/form-field";
+import { parseTerminalScrollbackLines, useAppSettings } from "@/hooks/use-settings";
+import { settingsStyles } from "@/styles/settings";
+
+export function TerminalSection() {
+  const { t } = useTranslation();
+  const { settings, updateSettings } = useAppSettings();
+  const [scrollbackValue, setScrollbackValue] = useState(String(settings.terminalScrollbackLines));
+
+  const handleChangeText = useCallback((value: string) => {
+    setScrollbackValue(value.replace(/[^\d]/g, ""));
+  }, []);
+
+  const commitScrollback = useCallback(() => {
+    const nextValue =
+      parseTerminalScrollbackLines(scrollbackValue) ?? settings.terminalScrollbackLines;
+    setScrollbackValue(String(nextValue));
+    if (nextValue !== settings.terminalScrollbackLines) {
+      void updateSettings({ terminalScrollbackLines: nextValue });
+    }
+  }, [scrollbackValue, settings.terminalScrollbackLines, updateSettings]);
+
+  useEffect(() => {
+    setScrollbackValue(String(settings.terminalScrollbackLines));
+  }, [settings.terminalScrollbackLines]);
+
+  return (
+    <SettingsSection title={t("settings.sections.terminal")}>
+      <View style={settingsStyles.card}>
+        <View style={settingsStyles.row}>
+          <View style={settingsStyles.rowContent}>
+            <Text style={settingsStyles.rowTitle}>
+              {t("settings.general.terminalScrollback.label")}
+            </Text>
+            <Text style={settingsStyles.rowHint}>
+              {t("settings.general.terminalScrollback.description")}
+            </Text>
+          </View>
+          <FormTextInput
+            size="sm"
+            initialValue={scrollbackValue}
+            onChangeText={handleChangeText}
+            onBlur={commitScrollback}
+            onSubmitEditing={commitScrollback}
+            keyboardType="number-pad"
+            inputMode="numeric"
+            selectTextOnFocus
+            style={styles.scrollbackInput}
+            accessibilityLabel={t("settings.general.terminalScrollback.accessibilityLabel")}
+          />
+        </View>
+      </View>
+    </SettingsSection>
+  );
+}
+
+const styles = StyleSheet.create({
+  scrollbackInput: {
+    width: 112,
+    textAlign: "right",
+  },
+});
diff --git a/packages/app/src/screens/workspace/compact-workspace-header/index.tsx b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx
new file mode 100644
index 0000000000..2a7c4a6a57
--- /dev/null
+++ b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx
@@ -0,0 +1,72 @@
+import { useMemo, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { CompactHeader } from "@/components/headers/compact-header";
+import {
+  EXPLORER_TOGGLE_KEYS,
+  WorkspaceExplorerToggle,
+} from "@/screens/workspace/workspace-explorer-toggle";
+import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row";
+
+export { MobileWorkspaceTabSwitcher } from "./tab-switcher";
+
+interface CompactWorkspaceHeaderProps {
+  serverId: string;
+  isLoading: boolean;
+  title: string;
+  subtitle: string;
+  isSubtitleDistinct: boolean;
+  onToggleExplorer: () => void;
+  explorerToggleLabel: string;
+  explorerToggleAccessibilityState: { expanded: boolean };
+  /** Tab switcher and workspace menu, before the explorer toggle. */
+  children: ReactNode;
+}
+
+/** The compact header with the workspace's project row and controls. */
+export function CompactWorkspaceHeader({
+  isLoading,
+  title,
+  subtitle,
+  isSubtitleDistinct,
+  onToggleExplorer,
+  explorerToggleLabel,
+  explorerToggleAccessibilityState,
+  children,
+  serverId,
+}: CompactWorkspaceHeaderProps) {
+  const { t } = useTranslation();
+  const projectRow = useMemo(
+    () => (
+      <WorkspaceHeaderProjectRow
+        subtitle={subtitle}
+        isSubtitleDistinct={isSubtitleDistinct}
+        serverId={serverId}
+      />
+    ),
+    [subtitle, isSubtitleDistinct, serverId],
+  );
+  const actions = (
+    <>
+      {children}
+      <WorkspaceExplorerToggle
+        onPress={onToggleExplorer}
+        label={explorerToggleLabel}
+        tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
+        tooltipKeys={EXPLORER_TOGGLE_KEYS}
+        accessibilityState={explorerToggleAccessibilityState}
+        mobile
+      />
+    </>
+  );
+
+  return (
+    <CompactHeader
+      navigation="menu"
+      title={title}
+      titleTestID="workspace-header-title"
+      subtitle={projectRow}
+      loading={isLoading}
+      actions={actions}
+    />
+  );
+}
diff --git a/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx b/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx
new file mode 100644
index 0000000000..970e77aaa9
--- /dev/null
+++ b/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx
@@ -0,0 +1,501 @@
+import { memo, useCallback, useMemo, useRef, useState } from "react";
+import { Keyboard, Pressable, Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { SquarePen, SquareTerminal } from "lucide-react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { Button } from "@/components/ui/button";
+import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
+import { useIconButtonChromeStyle } from "@/components/ui/icon-button-chrome";
+import {
+  WorkspaceTabPresentationResolver,
+  WorkspaceTabOptionRow,
+  type WorkspaceTabPresentation,
+} from "@/screens/workspace/workspace-tab-presentation";
+import { MobileTabTrailingAccessory } from "@/screens/workspace/workspace-tab-trailing-accessory";
+import {
+  buildWorkspaceTabMenuEntries,
+  type WorkspaceTabMenuLabels,
+} from "@/screens/workspace/workspace-tab-menu";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+
+// The trigger draws at 32pt beside its island neighbours, so only vertical slop is free.
+const TAB_SWITCHER_TRIGGER_HIT_SLOP = { top: 8, bottom: 8 } as const;
+
+function getFallbackTabOptionLabel(
+  tab: WorkspaceTabDescriptor,
+  labels: {
+    newTab: string;
+    newAgent: string;
+    setup: string;
+    terminal: string;
+    browser: string;
+    agent: string;
+    changes: string;
+    files: string;
+    pullRequest: string;
+  },
+): string {
+  if (tab.target.kind === "new_tab") {
+    return labels.newTab;
+  }
+  if (tab.target.kind === "draft") {
+    return labels.newAgent;
+  }
+  if (tab.target.kind === "setup") {
+    return labels.setup;
+  }
+  if (tab.target.kind === "terminal") {
+    return labels.terminal;
+  }
+  if (tab.target.kind === "browser") {
+    return labels.browser;
+  }
+  if (tab.target.kind === "file") {
+    return tab.target.path.split("/").findLast(Boolean) ?? tab.target.path;
+  }
+  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
+    return labels.changes;
+  }
+  if (tab.target.kind === "files") {
+    return labels.files;
+  }
+  if (tab.target.kind === "pull_request") {
+    return labels.pullRequest;
+  }
+  if (tab.target.kind === "commit_diff") {
+    return tab.target.sha.slice(0, 7);
+  }
+  return labels.agent;
+}
+
+function getFallbackTabOptionDescription(
+  tab: WorkspaceTabDescriptor,
+  labels: {
+    newTab: string;
+    newAgent: string;
+    workspaceSetup: string;
+    agent: string;
+    terminal: string;
+    browser: string;
+    changes: string;
+    files: string;
+    pullRequest: string;
+  },
+): string {
+  if (tab.target.kind === "new_tab") {
+    return labels.newTab;
+  }
+  if (tab.target.kind === "draft") {
+    return labels.newAgent;
+  }
+  if (tab.target.kind === "setup") {
+    return labels.workspaceSetup;
+  }
+  if (tab.target.kind === "agent") {
+    return labels.agent;
+  }
+  if (tab.target.kind === "terminal") {
+    return labels.terminal;
+  }
+  if (tab.target.kind === "browser") {
+    return labels.browser;
+  }
+  if (tab.target.kind === "provider_subagent") {
+    return labels.agent;
+  }
+  if (tab.target.kind === "commit_diff") {
+    return tab.target.sha.slice(0, 7);
+  }
+  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
+    return labels.changes;
+  }
+  if (tab.target.kind === "files") {
+    return labels.files;
+  }
+  if (tab.target.kind === "pull_request") {
+    return labels.pullRequest;
+  }
+  if (tab.target.kind === "plugin") {
+    return tab.target.panelId;
+  }
+  return tab.target.path;
+}
+
+interface MobileWorkspaceTabSwitcherProps {
+  tabs: WorkspaceTabDescriptor[];
+  activeTabKey: string;
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+  onSelectSwitcherTab: (key: string) => void;
+  createTerminalDisabled: boolean;
+  onCreateDraftTab: () => void;
+  onCreateTerminal: () => void;
+  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
+  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
+  onCopyFilePath: (path: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
+  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
+  onCloseTab: (tabId: string) => Promise<void> | void;
+  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
+  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
+  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
+}
+
+function MobileWorkspaceTabOption({
+  tab,
+  tabIndex,
+  tabCount,
+  normalizedServerId,
+  normalizedWorkspaceId,
+  selected,
+  active,
+  onPress,
+  onCopyResumeCommand,
+  onCopyAgentId,
+  onCopyTerminalId,
+  onCopyFilePath,
+  onReloadAgent,
+  onRenameTab,
+  onCloseTab,
+  onCloseTabsAbove,
+  onCloseTabsBelow,
+  onCloseOtherTabs,
+}: {
+  tab: WorkspaceTabDescriptor;
+  tabIndex: number;
+  tabCount: number;
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+  selected: boolean;
+  active: boolean;
+  onPress: () => void;
+  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
+  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
+  onCopyFilePath: (path: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
+  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
+  onCloseTab: (tabId: string) => Promise<void> | void;
+  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
+  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
+  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
+}) {
+  const { t } = useTranslation();
+  const tabMenuLabels = useMemo<WorkspaceTabMenuLabels>(
+    () => ({
+      copyResumeCommand: t("workspace.tabs.menu.copyResumeCommand"),
+      copyAgentId: t("workspace.tabs.menu.copyAgentId"),
+      copyTerminalId: t("workspace.tabs.menu.copyTerminalId"),
+      copyFilePath: t("workspace.tabs.menu.copyFilePath"),
+      rename: t("workspace.tabs.menu.rename"),
+      closeAbove: t("workspace.tabs.menu.closeAbove"),
+      closeBelow: t("workspace.tabs.menu.closeBelow"),
+      closeLeft: t("workspace.tabs.menu.closeLeft"),
+      closeRight: t("workspace.tabs.menu.closeRight"),
+      closeOthers: t("workspace.tabs.menu.closeOthers"),
+      reloadAgent: t("workspace.tabs.menu.reloadAgent"),
+      reloadAgentTooltip: t("workspace.tabs.menu.reloadAgentTooltip"),
+      close: t("workspace.tabs.menu.close"),
+    }),
+    [t],
+  );
+  const menuTestIDBase = `workspace-tab-menu-${tab.tabId}`;
+  const menuEntries = buildWorkspaceTabMenuEntries({
+    surface: "mobile",
+    tab,
+    index: tabIndex,
+    tabCount,
+    menuTestIDBase,
+    onCopyResumeCommand,
+    onCopyAgentId,
+    onCopyTerminalId,
+    onCopyFilePath,
+    onReloadAgent,
+    onRenameTab,
+    onCloseTab,
+    onCloseTabsBefore: onCloseTabsAbove,
+    onCloseTabsAfter: onCloseTabsBelow,
+    onCloseOtherTabs,
+    labels: tabMenuLabels,
+  });
+
+  const fallbackLabels = useMemo(
+    () => ({
+      newTab: t("workspace.tabs.actions.newTab"),
+      newAgent: t("workspace.tabs.fallback.newAgent"),
+      setup: t("workspace.tabs.fallback.setup"),
+      terminal: t("workspace.tabs.fallback.terminal"),
+      browser: t("workspace.tabs.fallback.browser"),
+      agent: t("workspace.tabs.fallback.agent"),
+      changes: t("panels.diff.changesLabel"),
+      files: t("panels.files.label"),
+      pullRequest: t("panels.pullRequest.label"),
+    }),
+    [t],
+  );
+  const fallbackLabel = getFallbackTabOptionLabel(tab, fallbackLabels);
+  const trailingAccessory = useMemo(
+    () => (
+      <MobileTabTrailingAccessory
+        menuTestIDBase={menuTestIDBase}
+        presentationLabel={fallbackLabel}
+        menuEntries={menuEntries}
+      />
+    ),
+    [menuTestIDBase, fallbackLabel, menuEntries],
+  );
+
+  const renderPresentation = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <WorkspaceTabOptionRow
+        presentation={presentation}
+        selected={selected}
+        active={active}
+        onPress={onPress}
+        trailingAccessory={trailingAccessory}
+      />
+    ),
+    [selected, active, onPress, trailingAccessory],
+  );
+
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={tab}
+      serverId={normalizedServerId}
+      workspaceId={normalizedWorkspaceId}
+    >
+      {renderPresentation}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+export const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
+  tabs,
+  activeTabKey,
+  normalizedServerId,
+  normalizedWorkspaceId,
+  onSelectSwitcherTab,
+  createTerminalDisabled,
+  onCreateDraftTab,
+  onCreateTerminal,
+  onCopyResumeCommand,
+  onCopyAgentId,
+  onCopyTerminalId,
+  onCopyFilePath,
+  onReloadAgent,
+  onRenameTab,
+  onCloseTab,
+  onCloseTabsAbove,
+  onCloseTabsBelow,
+  onCloseOtherTabs,
+}: MobileWorkspaceTabSwitcherProps) {
+  const { t } = useTranslation();
+  const tabFallbackLabels = useMemo(
+    () => ({
+      newTab: t("workspace.tabs.actions.newTab"),
+      newAgent: t("workspace.tabs.fallback.newAgent"),
+      setup: t("workspace.tabs.fallback.setup"),
+      workspaceSetup: t("workspace.tabs.fallback.workspaceSetup"),
+      terminal: t("workspace.tabs.fallback.terminal"),
+      browser: t("workspace.tabs.fallback.browser"),
+      agent: t("workspace.tabs.fallback.agent"),
+      changes: t("panels.diff.changesLabel"),
+      files: t("panels.files.label"),
+      pullRequest: t("panels.pullRequest.label"),
+    }),
+    [t],
+  );
+
+  const tabSwitcherOptions = useMemo(
+    () =>
+      tabs.map((tab) => ({
+        id: tab.key,
+        label: getFallbackTabOptionLabel(tab, tabFallbackLabels),
+        description: getFallbackTabOptionDescription(tab, tabFallbackLabels),
+      })),
+    [tabFallbackLabels, tabs],
+  );
+
+  const tabByKey = useMemo(() => new Map(tabs.map((tab) => [tab.key, tab])), [tabs]);
+  const triggerStyle = useIconButtonChromeStyle({ size: "large" });
+  const [isOpen, setIsOpen] = useState(false);
+  const anchorRef = useRef<View>(null);
+  const tabIndexByKey = useMemo(() => {
+    const map = new Map<string, number>();
+    tabs.forEach((tab, index) => {
+      map.set(tab.key, index);
+    });
+    return map;
+  }, [tabs]);
+
+  const handleOpenSwitcher = useCallback(() => {
+    Keyboard.dismiss();
+    setIsOpen(true);
+  }, []);
+
+  const handleNewAgent = useCallback(() => {
+    setIsOpen(false);
+    onCreateDraftTab();
+  }, [onCreateDraftTab]);
+
+  const handleNewTerminal = useCallback(() => {
+    setIsOpen(false);
+    onCreateTerminal();
+  }, [onCreateTerminal]);
+
+  const footer = useMemo(
+    () => (
+      <View style={styles.tabSwitcherFooter}>
+        <Button
+          testID="workspace-tab-switcher-new-agent"
+          style={styles.tabSwitcherFooterButton}
+          variant="secondary"
+          leftIcon={SquarePen}
+          onPress={handleNewAgent}
+        >
+          {t("workspace.header.actions.newAgent")}
+        </Button>
+        <Button
+          testID="workspace-tab-switcher-new-terminal"
+          style={styles.tabSwitcherFooterButton}
+          variant="secondary"
+          leftIcon={SquareTerminal}
+          disabled={createTerminalDisabled}
+          onPress={handleNewTerminal}
+        >
+          {t("workspace.header.actions.newTerminal")}
+        </Button>
+      </View>
+    ),
+    [createTerminalDisabled, handleNewAgent, handleNewTerminal, t],
+  );
+
+  const renderTabOption = useCallback(
+    ({
+      option,
+      selected,
+      active,
+      onPress,
+    }: {
+      option: ComboboxOption;
+      selected: boolean;
+      active: boolean;
+      onPress: () => void;
+    }) => {
+      const tab = tabByKey.get(option.id);
+      if (!tab) {
+        return <View />;
+      }
+      const tabIndex = tabIndexByKey.get(tab.key) ?? -1;
+      if (tabIndex < 0) {
+        return <View />;
+      }
+      return (
+        <MobileWorkspaceTabOption
+          tab={tab}
+          tabIndex={tabIndex}
+          tabCount={tabs.length}
+          normalizedServerId={normalizedServerId}
+          normalizedWorkspaceId={normalizedWorkspaceId}
+          selected={selected}
+          active={active}
+          onPress={onPress}
+          onCopyResumeCommand={onCopyResumeCommand}
+          onCopyAgentId={onCopyAgentId}
+          onCopyTerminalId={onCopyTerminalId}
+          onCopyFilePath={onCopyFilePath}
+          onReloadAgent={onReloadAgent}
+          onRenameTab={onRenameTab}
+          onCloseTab={onCloseTab}
+          onCloseTabsAbove={onCloseTabsAbove}
+          onCloseTabsBelow={onCloseTabsBelow}
+          onCloseOtherTabs={onCloseOtherTabs}
+        />
+      );
+    },
+    [
+      tabByKey,
+      tabIndexByKey,
+      tabs.length,
+      normalizedServerId,
+      normalizedWorkspaceId,
+      onCopyResumeCommand,
+      onCopyAgentId,
+      onCopyTerminalId,
+      onCopyFilePath,
+      onReloadAgent,
+      onRenameTab,
+      onCloseTab,
+      onCloseTabsAbove,
+      onCloseTabsBelow,
+      onCloseOtherTabs,
+    ],
+  );
+
+  return (
+    <>
+      <Pressable
+        ref={anchorRef}
+        testID="workspace-tab-switcher-trigger"
+        accessibilityRole="button"
+        accessibilityLabel={t("workspace.tabs.switcher.trigger", { count: tabs.length })}
+        hitSlop={TAB_SWITCHER_TRIGGER_HIT_SLOP}
+        style={triggerStyle}
+        onPress={handleOpenSwitcher}
+      >
+        <View style={styles.tabCountBadge}>
+          <Text style={styles.tabCountText}>{tabs.length}</Text>
+        </View>
+      </Pressable>
+
+      <Combobox
+        options={tabSwitcherOptions}
+        value={activeTabKey}
+        onSelect={onSelectSwitcherTab}
+        searchable={false}
+        title={t("workspace.tabs.switcher.title")}
+        searchPlaceholder={t("workspace.tabs.switcher.searchPlaceholder")}
+        open={isOpen}
+        onOpenChange={setIsOpen}
+        anchorRef={anchorRef}
+        renderOption={renderTabOption}
+        footer={footer}
+      />
+    </>
+  );
+});
+
+const styles = StyleSheet.create((theme) => ({
+  tabSwitcherFooter: {
+    flexDirection: "row",
+    gap: theme.spacing[3],
+    paddingHorizontal: theme.spacing[6],
+    paddingVertical: theme.spacing[3],
+  },
+  tabSwitcherFooterButton: {
+    flex: 1,
+  },
+  // Sized and stroked like the 16px header glyphs beside it (1.5 stroke on a 24 viewbox = 1px).
+  tabCountBadge: {
+    minWidth: 16,
+    height: 16,
+    paddingHorizontal: 2,
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: theme.borderRadius.sm,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.foregroundMuted,
+  },
+  // Android pads text above the ascender by default, which pushes the digit below center.
+  tabCountText: {
+    fontSize: 10,
+    lineHeight: 12,
+    includeFontPadding: false,
+    textAlign: "center",
+    textAlignVertical: "center",
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+    fontVariant: ["tabular-nums"],
+  },
+}));
diff --git a/packages/app/src/screens/workspace/explorer-sidebar-tab-rail.tsx b/packages/app/src/screens/workspace/explorer-sidebar-tab-rail.tsx
deleted file mode 100644
index bda9f8af5c..0000000000
--- a/packages/app/src/screens/workspace/explorer-sidebar-tab-rail.tsx
+++ /dev/null
@@ -1,470 +0,0 @@
-import { useCallback, useMemo, useState, type ComponentType, type ReactNode } from "react";
-import { Text, View } from "react-native";
-import { ArrowLeftToLine, Plus, X } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
-import Animated from "react-native-reanimated";
-import { SortableInlineList } from "@/components/sortable-inline-list";
-import type {
-  DraggableListDragHandleProps,
-  DraggableRenderItemInfo,
-} from "@/components/draggable-list.types";
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-  ContextMenuTrigger,
-} from "@/components/ui/context-menu";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { titlebarDragSurfaceStyle } from "@/components/desktop/titlebar-drag-region";
-import { WORKSPACE_SECONDARY_HEADER_HEIGHT } from "@/constants/layout";
-import { iconButtonChromeGlyphSize } from "@/components/ui/icon-button-chrome";
-import { HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
-import {
-  WorkspaceTabIcon,
-  WorkspaceTabPresentationResolver,
-  type WorkspaceTabPresentation,
-} from "@/screens/workspace/workspace-tab-presentation";
-import type { WorkspaceDesktopTabRowItem } from "@/screens/workspace/workspace-desktop-tabs-row";
-import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
-import {
-  useWorkspaceTabLaunchCatalog,
-  type WorkspaceTabLaunchItem,
-} from "@/workspace-tabs/launcher";
-import { panelSupportsHost } from "@/panels/panel-manifest";
-import type { PanelIconProps } from "@/panels/panel-registry";
-import { panelTargetSupportsHost } from "@/plugins/workspace-panels/locations";
-import type { Theme } from "@/styles/theme";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
-import {
-  HorizontalScrollBoundaryShades,
-  useHorizontalScrollBoundary,
-} from "@/components/ui/horizontal-scroll-boundary";
-
-const TAB_GAP = 4;
-const TAB_DROP_INDICATOR_WIDTH = 4;
-
-const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-interface ExplorerSidebarTabRailProps {
-  paneId: string;
-  tabs: WorkspaceDesktopTabRowItem[];
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  activeDragTabId: string | null;
-  tabDropPreviewIndex: number | null;
-  onNavigateTab: (tabId: string) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onCreateNewTab: () => void;
-  onMoveTabToMain: (tabId: string) => void;
-  onReorderTabs: (tabs: WorkspaceTabDescriptor[]) => void;
-  trailingAccessory?: ReactNode;
-}
-
-function tabKey(item: WorkspaceDesktopTabRowItem): string {
-  return `${item.tab.key}:${item.tab.kind}`;
-}
-
-function resolveExplorerSidebarTabBackdrop(): SurfaceBackdrop {
-  return "surfaceSidebar";
-}
-
-function ExplorerSidebarTab({
-  item,
-  isDragging,
-  dragHandleProps,
-  onNavigateTab,
-  onCloseTab,
-  onMoveTabToMain,
-  normalizedServerId,
-  normalizedWorkspaceId,
-}: {
-  item: WorkspaceDesktopTabRowItem;
-  isDragging: boolean;
-  dragHandleProps?: DraggableListDragHandleProps;
-  onNavigateTab: (tabId: string) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onMoveTabToMain: (tabId: string) => void;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-}) {
-  const { t } = useTranslation();
-  const [hovered, setHovered] = useState(false);
-  const handlePress = useCallback(
-    () => onNavigateTab(item.tab.tabId),
-    [item.tab.tabId, onNavigateTab],
-  );
-  const handleHoverIn = useCallback(() => setHovered(true), []);
-  const handleHoverOut = useCallback(() => setHovered(false), []);
-  const handleClose = useCallback(() => {
-    void onCloseTab(item.tab.tabId);
-  }, [item.tab.tabId, onCloseTab]);
-  const handleMoveToMain = useCallback(
-    () => onMoveTabToMain(item.tab.tabId),
-    [item.tab.tabId, onMoveTabToMain],
-  );
-  const canMoveToMain = panelTargetSupportsHost(normalizedServerId, item.tab.target, "main");
-  const moveToMainLeading = useMemo(
-    () => <ThemedArrowLeftToLine size={14} uniProps={mutedColorMapping} />,
-    [],
-  );
-  const closeLeading = useMemo(() => <ThemedX size={14} uniProps={mutedColorMapping} />, []);
-  const accessibilityState = useMemo(() => ({ selected: item.isActive }), [item.isActive]);
-  const renderPresentation = useCallback(
-    (presentation: WorkspaceTabPresentation) => (
-      <ContextMenu>
-        <Tooltip delayDuration={300} enabledOnDesktop enabledOnMobile={false}>
-          <TooltipTrigger asChild triggerRefProp="triggerRef">
-            <ContextMenuTrigger
-              {...(dragHandleProps?.attributes as object | undefined)}
-              {...(dragHandleProps?.listeners as object | undefined)}
-              triggerRef={dragHandleProps?.setActivatorNodeRef as never}
-              testID={`explorer-sidebar-tab-${item.tab.tabId}`}
-              accessibilityRole="button"
-              accessibilityLabel={presentation.tooltip}
-              accessibilityState={accessibilityState}
-              onPress={handlePress}
-              onHoverIn={handleHoverIn}
-              onHoverOut={handleHoverOut}
-              style={[
-                styles.tab,
-                hovered ? styles.tabHovered : null,
-                item.isActive ? styles.tabActive : null,
-                isDragging ? styles.tabDragging : null,
-              ]}
-            >
-              <WorkspaceTabIcon
-                presentation={presentation}
-                active={item.isActive}
-                size={iconButtonChromeGlyphSize("small")}
-                strokeWidth={1.5}
-                backdrop={resolveExplorerSidebarTabBackdrop()}
-              />
-              <Text
-                selectable={false}
-                numberOfLines={1}
-                ellipsizeMode="tail"
-                style={[styles.tabLabel, item.isActive ? styles.tabLabelActive : null]}
-              >
-                {presentation.label}
-              </Text>
-            </ContextMenuTrigger>
-          </TooltipTrigger>
-          <TooltipContent side="bottom" align="center" offset={8}>
-            <Text style={styles.tooltipText}>{presentation.tooltip}</Text>
-          </TooltipContent>
-        </Tooltip>
-        <ContextMenuContent align="start" minWidth={180}>
-          {canMoveToMain ? (
-            <ContextMenuItem leading={moveToMainLeading} onSelect={handleMoveToMain}>
-              {t("workspace.tabs.menu.moveToMain")}
-            </ContextMenuItem>
-          ) : null}
-          {canMoveToMain ? <ContextMenuSeparator /> : null}
-          <ContextMenuItem leading={closeLeading} onSelect={handleClose}>
-            {t("workspace.tabs.menu.close")}
-          </ContextMenuItem>
-        </ContextMenuContent>
-      </ContextMenu>
-    ),
-    [
-      accessibilityState,
-      dragHandleProps,
-      handleHoverIn,
-      handleHoverOut,
-      handleClose,
-      handleMoveToMain,
-      handlePress,
-      hovered,
-      isDragging,
-      item,
-      canMoveToMain,
-      closeLeading,
-      moveToMainLeading,
-      t,
-    ],
-  );
-
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={item.tab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {renderPresentation}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
-function CatalogIcon({
-  Icon,
-  color = "",
-}: {
-  Icon: ComponentType<PanelIconProps>;
-  color?: string;
-}) {
-  return <Icon size={14} color={color} />;
-}
-
-const ThemedCatalogIcon = withUnistyles(CatalogIcon);
-const ThemedArrowLeftToLine = withUnistyles(ArrowLeftToLine);
-const ThemedPlus = withUnistyles(Plus);
-const ThemedX = withUnistyles(X);
-
-function ExplorerSidebarConfigurationItem({
-  item,
-  paneId,
-  tab,
-  onCloseTab,
-}: {
-  item: WorkspaceTabLaunchItem;
-  paneId: string;
-  tab: WorkspaceTabDescriptor | null;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-}) {
-  const leading = useMemo(() => {
-    return item.Icon ? <ThemedCatalogIcon Icon={item.Icon} uniProps={mutedColorMapping} /> : null;
-  }, [item.Icon]);
-  const handleSelect = useCallback(() => {
-    if (tab) {
-      void onCloseTab(tab.tabId);
-      return;
-    }
-    item.launch({ kind: "open", paneId });
-  }, [item, onCloseTab, paneId, tab]);
-
-  return (
-    <ContextMenuItem
-      leading={leading}
-      selected={Boolean(tab)}
-      showSelectedCheck
-      disabled={!tab && item.disabled}
-      onSelect={handleSelect}
-    >
-      {item.label}
-    </ContextMenuItem>
-  );
-}
-
-function catalogItemMatchesTab(item: WorkspaceTabLaunchItem, tab: WorkspaceTabDescriptor): boolean {
-  return item.panelKind === tab.target.kind;
-}
-
-export function ExplorerSidebarTabRail({
-  paneId,
-  tabs,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  activeDragTabId,
-  tabDropPreviewIndex,
-  onNavigateTab,
-  onCloseTab,
-  onCreateNewTab,
-  onMoveTabToMain,
-  onReorderTabs,
-  trailingAccessory,
-}: ExplorerSidebarTabRailProps) {
-  const scrollBoundary = useHorizontalScrollBoundary();
-  const { t } = useTranslation();
-  const groups = useWorkspaceTabLaunchCatalog({
-    serverId: normalizedServerId,
-    purpose: "supporting",
-    host: "explorer",
-  });
-  const singletonConfigurationItems = useMemo(
-    () =>
-      (groups.find((group) => group.id === "tabs")?.items ?? []).filter(
-        (item) => !panelSupportsHost(item.panelKind, "main"),
-      ),
-    [groups],
-  );
-  const newTabLeading = useMemo(() => <ThemedPlus size={14} uniProps={mutedColorMapping} />, []);
-  const handleDragEnd = useCallback(
-    (nextTabs: WorkspaceDesktopTabRowItem[]) => onReorderTabs(nextTabs.map((item) => item.tab)),
-    [onReorderTabs],
-  );
-  const getTabDragData = useCallback(
-    (item: WorkspaceDesktopTabRowItem) => ({
-      kind: "workspace-tab" as const,
-      paneId,
-      tabId: item.tab.tabId,
-    }),
-    [paneId],
-  );
-  const renderTab = useCallback(
-    ({
-      item,
-      index,
-      dragHandleProps,
-      isActive,
-    }: DraggableRenderItemInfo<WorkspaceDesktopTabRowItem>) => {
-      const showBefore = activeDragTabId !== null && tabDropPreviewIndex === index;
-      const showAfter =
-        activeDragTabId !== null &&
-        tabDropPreviewIndex === tabs.length &&
-        index === tabs.length - 1;
-      return (
-        <View style={styles.tabSlot}>
-          {showBefore ? <View style={[styles.dropIndicator, styles.dropIndicatorBefore]} /> : null}
-          <ExplorerSidebarTab
-            item={item}
-            isDragging={isActive}
-            dragHandleProps={dragHandleProps}
-            onNavigateTab={onNavigateTab}
-            onCloseTab={onCloseTab}
-            onMoveTabToMain={onMoveTabToMain}
-            normalizedServerId={normalizedServerId}
-            normalizedWorkspaceId={normalizedWorkspaceId}
-          />
-          {showAfter ? <View style={[styles.dropIndicator, styles.dropIndicatorAfter]} /> : null}
-        </View>
-      );
-    },
-    [
-      activeDragTabId,
-      normalizedServerId,
-      normalizedWorkspaceId,
-      onNavigateTab,
-      onCloseTab,
-      onMoveTabToMain,
-      tabDropPreviewIndex,
-      tabs.length,
-    ],
-  );
-
-  return (
-    <ContextMenu>
-      <ContextMenuTrigger
-        contextOnly
-        style={[styles.track, titlebarDragSurfaceStyle as never]}
-        testID="explorer-sidebar-tab-rail"
-      >
-        <View style={styles.scrollContainer}>
-          <Animated.ScrollView
-            horizontal
-            showsHorizontalScrollIndicator={false}
-            contentContainerStyle={styles.scrollContent}
-            onLayout={scrollBoundary.onLayout}
-            onContentSizeChange={scrollBoundary.onContentSizeChange}
-            onScroll={scrollBoundary.onScroll}
-            scrollEventThrottle={16}
-          >
-            <SortableInlineList
-              data={tabs}
-              keyExtractor={tabKey}
-              renderItem={renderTab}
-              onDragEnd={handleDragEnd}
-              useDragHandle
-              externalDndContext
-              activeId={activeDragTabId}
-              getItemData={getTabDragData}
-            />
-          </Animated.ScrollView>
-          <HorizontalScrollBoundaryShades
-            visible
-            backdrop="sidebar"
-            testIDPrefix="explorer-sidebar-tabs-scroll-shade"
-            leftStyle={scrollBoundary.leftShadeStyle}
-            rightStyle={scrollBoundary.rightShadeStyle}
-          />
-        </View>
-        {trailingAccessory ? (
-          <View style={styles.trailingAccessory}>{trailingAccessory}</View>
-        ) : null}
-      </ContextMenuTrigger>
-      <ContextMenuContent align="start" minWidth={200} testID="explorer-sidebar-tab-configuration">
-        <ContextMenuItem leading={newTabLeading} onSelect={onCreateNewTab}>
-          {t("workspace.tabs.actions.newTab")}
-        </ContextMenuItem>
-        <ContextMenuSeparator />
-        {singletonConfigurationItems.map((item) => (
-          <ExplorerSidebarConfigurationItem
-            key={item.id}
-            item={item}
-            paneId={paneId}
-            tab={tabs.find(({ tab }) => catalogItemMatchesTab(item, tab))?.tab ?? null}
-            onCloseTab={onCloseTab}
-          />
-        ))}
-      </ContextMenuContent>
-    </ContextMenu>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  track: {
-    minWidth: 0,
-    height: WORKSPACE_SECONDARY_HEADER_HEIGHT,
-    backgroundColor: theme.colors.surfaceSidebar,
-    flexDirection: "row",
-    alignItems: "center",
-  },
-  scrollContainer: {
-    flex: 1,
-    minWidth: 0,
-    alignSelf: "stretch",
-  },
-  scrollContent: {
-    flexDirection: "row",
-    alignItems: "center",
-    paddingHorizontal: 4,
-  },
-  trailingAccessory: {
-    marginRight: 4,
-  },
-  tabSlot: {
-    position: "relative",
-    marginHorizontal: TAB_GAP / 2,
-  },
-  tab: {
-    height: HEADER_CONTROL_HEIGHT,
-    maxWidth: 180,
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    userSelect: "none",
-  },
-  tabHovered: {
-    backgroundColor: theme.colors.interactionHighlight,
-  },
-  tabActive: {
-    backgroundColor: theme.colors.interactionHighlight,
-  },
-  tabLabel: {
-    minWidth: 0,
-    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.normal,
-    userSelect: "none",
-  },
-  tabLabelActive: {
-    color: theme.colors.foreground,
-  },
-  tabDragging: {
-    opacity: 0.3,
-  },
-  dropIndicator: {
-    position: "absolute",
-    top: theme.spacing[0.5],
-    bottom: theme.spacing[0.5],
-    width: TAB_DROP_INDICATOR_WIDTH,
-    borderRadius: theme.borderRadius.full,
-    backgroundColor: theme.colors.accent,
-    zIndex: 10,
-    pointerEvents: "none",
-  },
-  dropIndicatorBefore: {
-    left: -TAB_GAP / 2 - TAB_DROP_INDICATOR_WIDTH / 2,
-  },
-  dropIndicatorAfter: {
-    right: -TAB_GAP / 2 - TAB_DROP_INDICATOR_WIDTH / 2,
-  },
-  tooltipText: {
-    color: theme.colors.popoverForeground,
-    fontSize: theme.fontSize.base,
-  },
-}));
diff --git a/packages/app/src/screens/workspace/explorer-sidebar.tsx b/packages/app/src/screens/workspace/explorer-sidebar.tsx
index 389d37c821..175be3695b 100644
--- a/packages/app/src/screens/workspace/explorer-sidebar.tsx
+++ b/packages/app/src/screens/workspace/explorer-sidebar.tsx
@@ -4,17 +4,35 @@ import { StyleSheet } from "react-native-unistyles";
 import { RetainedPanel } from "@/components/retained-panel";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import type { TabDropPreview } from "@/components/split-container-tab-drop-preview";
-import { ExplorerSidebarTabRail } from "@/screens/workspace/explorer-sidebar-tab-rail";
 import { WorkspacePanelHost } from "@/screens/workspace/workspace-panel-host";
 import { deriveWorkspacePaneState } from "@/screens/workspace/workspace-pane-state";
-import type { WorkspaceDesktopTabRowItem } from "@/screens/workspace/workspace-desktop-tabs-row";
+import {
+  WorkspaceDesktopTabsRow,
+  type WorkspaceDesktopTabRowItem,
+  type WorkspaceDesktopTabsRowProps,
+} from "@/screens/workspace/workspace-desktop-tabs-row";
 import type { WorkspacePaneContentModel } from "@/screens/workspace/workspace-pane-content";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import type { SplitPane } from "@/stores/workspace-layout-store";
 import type { WorkspaceTab } from "@/workspace-tabs/model";
 import { WindowChromeRegion, WindowChromeSafeArea } from "@/utils/desktop-window";
 
-interface ExplorerSidebarDockProps {
+interface ExplorerSidebarDockProps extends Pick<
+  WorkspaceDesktopTabsRowProps,
+  | "setHoveredCloseTabKey"
+  | "onCopyResumeCommand"
+  | "onCopyAgentId"
+  | "onCopyTerminalId"
+  | "onCopyFilePath"
+  | "onReloadAgent"
+  | "onRenameTab"
+  | "onCreateNewTab"
+  | "onExitFocusMode"
+> {
+  hoveredCloseTabKey: string | null;
+  onCloseTabsToLeft: (tabId: string, tabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
+  onCloseTabsToRight: (tabId: string, tabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
+  onCloseOtherTabs: (tabId: string, tabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
   pane: SplitPane;
   uiTabs: WorkspaceTab[];
   normalizedServerId: string;
@@ -25,8 +43,6 @@ interface ExplorerSidebarDockProps {
   tabDropPreview: TabDropPreview | null;
   onSelectTab: (paneId: string, tabId: string) => void;
   onCloseTab: (tabId: string) => Promise<void> | void;
-  onCreateNewTab: () => void;
-  onMoveTabToMain: (tabId: string) => void;
   onReorderTabsInPane: (paneId: string, tabIds: string[]) => void;
   buildPaneContentModel: (input: {
     paneId: string;
@@ -48,7 +64,18 @@ export function ExplorerSidebarDock({
   onSelectTab,
   onCloseTab,
   onCreateNewTab,
-  onMoveTabToMain,
+  hoveredCloseTabKey,
+  setHoveredCloseTabKey,
+  onCopyResumeCommand,
+  onCopyAgentId,
+  onCopyTerminalId,
+  onCopyFilePath,
+  onReloadAgent,
+  onRenameTab,
+  onCloseTabsToLeft,
+  onCloseTabsToRight,
+  onCloseOtherTabs,
+  onExitFocusMode,
   onReorderTabsInPane,
   buildPaneContentModel,
   headerAction,
@@ -61,10 +88,10 @@ export function ExplorerSidebarDock({
       tabs.map((tab) => ({
         tab,
         isActive: tab.tabId === activeTabId,
-        isCloseHovered: false,
+        isCloseHovered: hoveredCloseTabKey === tab.key,
         isClosingTab: closingTabIds.has(tab.tabId),
       })),
-    [activeTabId, closingTabIds, tabs],
+    [activeTabId, closingTabIds, hoveredCloseTabKey, tabs],
   );
   const handleSelectTab = useCallback(
     (tabId: string) => onSelectTab(pane.id, tabId),
@@ -80,28 +107,59 @@ export function ExplorerSidebarDock({
     [onReorderTabsInPane, pane.id],
   );
 
+  const handleCloseTabsToLeft = useCallback(
+    (tabId: string) => onCloseTabsToLeft(tabId, tabs),
+    [onCloseTabsToLeft, tabs],
+  );
+  const handleCloseTabsToRight = useCallback(
+    (tabId: string) => onCloseTabsToRight(tabId, tabs),
+    [onCloseTabsToRight, tabs],
+  );
+  const handleCloseOtherTabs = useCallback(
+    (tabId: string) => onCloseOtherTabs(tabId, tabs),
+    [onCloseOtherTabs, tabs],
+  );
+
   return (
     <RetainedPanel active>
       <WindowChromeRegion corners="top-right">
         <View style={styles.dock} testID="workspace-explorer-sidebar">
           <WindowChromeSafeArea placement="inline" style={styles.tabRail}>
             <TitlebarDragRegion />
-            <ExplorerSidebarTabRail
-              paneId={pane.id}
-              tabs={tabItems}
-              normalizedServerId={normalizedServerId}
-              normalizedWorkspaceId={normalizedWorkspaceId}
-              activeDragTabId={activeDragTabId}
-              tabDropPreviewIndex={
-                tabDropPreview?.paneId === pane.id ? tabDropPreview.indicatorIndex : null
-              }
-              onNavigateTab={handleSelectTab}
-              onCloseTab={onCloseTab}
-              onCreateNewTab={onCreateNewTab}
-              onMoveTabToMain={onMoveTabToMain}
-              onReorderTabs={handleReorderTabs}
-              trailingAccessory={headerAction}
-            />
+            <View style={styles.tabRow}>
+              <WorkspaceDesktopTabsRow
+                host="explorer"
+                launchPurpose="supporting"
+                isFocused={isWorkspaceFocused}
+                ownsKeyboardShortcuts={false}
+                setHoveredCloseTabKey={setHoveredCloseTabKey}
+                onCopyResumeCommand={onCopyResumeCommand}
+                onCopyAgentId={onCopyAgentId}
+                onCopyTerminalId={onCopyTerminalId}
+                onCopyFilePath={onCopyFilePath}
+                onReloadAgent={onReloadAgent}
+                onRenameTab={onRenameTab}
+                onCloseTabsToLeft={handleCloseTabsToLeft}
+                onCloseTabsToRight={handleCloseTabsToRight}
+                onCloseOtherTabs={handleCloseOtherTabs}
+                focusModeEnabled={false}
+                onExitFocusMode={onExitFocusMode}
+                externalDndContext
+                paneId={pane.id}
+                tabs={tabItems}
+                normalizedServerId={normalizedServerId}
+                normalizedWorkspaceId={normalizedWorkspaceId}
+                activeDragTabId={activeDragTabId}
+                tabDropPreviewIndex={
+                  tabDropPreview?.paneId === pane.id ? tabDropPreview.indicatorIndex : null
+                }
+                onNavigateTab={handleSelectTab}
+                onCloseTab={onCloseTab}
+                onCreateNewTab={onCreateNewTab}
+                onReorderTabs={handleReorderTabs}
+              />
+            </View>
+            {headerAction ? <View style={styles.headerAction}>{headerAction}</View> : null}
             <View pointerEvents="none" style={styles.tabRailDivider} />
           </WindowChromeSafeArea>
           <View style={styles.content}>
@@ -131,9 +189,18 @@ const styles = StyleSheet.create((theme) => ({
   },
   tabRail: {
     position: "relative",
+    flexDirection: "row",
+    alignItems: "center",
     flexShrink: 0,
     backgroundColor: theme.colors.surfaceSidebar,
   },
+  tabRow: {
+    flex: 1,
+    minWidth: 0,
+  },
+  headerAction: {
+    marginRight: theme.spacing[1],
+  },
   tabRailDivider: {
     position: "absolute",
     right: 0,
diff --git a/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx b/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx
index b462cf0cd5..f1806ede34 100644
--- a/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx
+++ b/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx
@@ -63,12 +63,15 @@ import {
   type WorkspaceTabMenuLabels,
 } from "@/screens/workspace/workspace-tab-menu";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+import type { PaneHost } from "@/panels/panel-manifest";
+import type { WorkspaceTabLaunchPurpose } from "@/workspace-tabs/launcher";
 import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import type { Theme } from "@/styles/theme";
 import { RenderProfile } from "@/utils/render-profiler";
 import { TrailingActionScrim } from "@/components/ui/trailing-action-scrim";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
-import { useCompactTimeAgo } from "@/hooks/use-compact-time-ago";
+import { useCompactTimeAgo } from "@/hooks/use-time-ago";
+import { formatCompactTimeAgoAsProse } from "@/utils/time";
 import { buildWorkspaceKeyboardHandlerId } from "@/keyboard/handler-id";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import { WorkspaceNewTabMenuContent } from "@/screens/workspace/workspace-new-tab-menu";
@@ -88,7 +91,7 @@ const DROPDOWN_WIDTH = 220;
 const DEFAULT_INLINE_ADD_BUTTON_RESERVED_WIDTH = 36;
 const PANE_SPLIT_ACTIONS_HORIZONTAL_PADDING = 2;
 const PANE_SPLIT_ACTIONS_OUTER_MARGIN =
-  paneContentToolbarTrailingPadding(false) - PANE_SPLIT_ACTIONS_HORIZONTAL_PADDING;
+  paneContentToolbarTrailingPadding(false, "glyph") - PANE_SPLIT_ACTIONS_HORIZONTAL_PADDING;
 const PANE_SPLIT_ACTIONS_RESERVED_WIDTH =
   smallIconButtonChromeFrameSize(false) +
   PANE_SPLIT_ACTIONS_HORIZONTAL_PADDING * 2 +
@@ -106,7 +109,7 @@ const TAB_ICON_WIDTH = 14;
 const TAB_CONTENT_GAP = 4;
 const TAB_DROP_INDICATOR_WIDTH = 4;
 const TAB_MODIFIED_DOT_SIZE = 8;
-const TAB_MIN_WIDTH = 96;
+const TAB_MIN_WIDTH = 64;
 const TAB_MAX_WIDTH = 160;
 const TAB_CLOSE_BUTTON_RESERVED_WIDTH = 0;
 const TAB_LABEL_LAYOUT_ALLOWANCE = 4;
@@ -148,12 +151,6 @@ function formatAgentTooltipTitle(singleLineTitle: string): string {
   return `${singleLineTitle.slice(0, AGENT_TOOLTIP_TITLE_MAX_LENGTH - 1).trimEnd()}…`;
 }
 
-function formatAgentTooltipActivity(compactActivity: string): string {
-  if (compactActivity === "now") return "just now";
-  if (/^\d/.test(compactActivity)) return `${compactActivity} ago`;
-  return compactActivity;
-}
-
 function AgentTabTooltipBody({
   serverId,
   agentId,
@@ -169,7 +166,7 @@ function AgentTabTooltipBody({
     return state.agentLastActivity.get(agentId) ?? agent?.lastActivityAt ?? null;
   });
   const compactActivity = useCompactTimeAgo(lastActivityAt);
-  const activity = formatAgentTooltipActivity(compactActivity);
+  const activity = formatCompactTimeAgoAsProse(compactActivity);
 
   return (
     <View style={styles.tooltipAgentContent}>
@@ -214,7 +211,12 @@ function TabLabelMeasurement({
   );
 }
 
+type PanePanelKinds = readonly WorkspaceTabDescriptor["kind"][];
+
 interface WorkspaceNewTabButtonProps {
+  panePanelKinds: PanePanelKinds;
+  host: PaneHost;
+  launchPurpose: WorkspaceTabLaunchPurpose;
   serverId: string;
   paneId?: string;
   shortcutKeys: ShortcutKey[][] | null;
@@ -222,6 +224,9 @@ interface WorkspaceNewTabButtonProps {
 }
 
 function WorkspaceNewTabButton({
+  panePanelKinds,
+  host,
+  launchPurpose,
   serverId,
   paneId,
   shortcutKeys,
@@ -242,8 +247,9 @@ function WorkspaceNewTabButton({
       </ToolbarButton>
       <WorkspaceNewTabMenuContent
         serverId={serverId}
-        purpose="primary"
-        host="main"
+        purpose={launchPurpose}
+        host={host}
+        panePanelKinds={panePanelKinds}
         paneId={paneId}
       />
     </DropdownMenu>
@@ -253,6 +259,9 @@ function WorkspaceNewTabButton({
 }
 
 function WorkspacePaneToolbarActions({
+  panePanelKinds,
+  host,
+  launchPurpose,
   showNewTabButton,
   showSplitActions,
   showMaximizeAction,
@@ -264,6 +273,9 @@ function WorkspacePaneToolbarActions({
   onSplitDown,
   onTogglePaneMaximized,
 }: {
+  panePanelKinds: PanePanelKinds;
+  host: PaneHost;
+  launchPurpose: WorkspaceTabLaunchPurpose;
   showNewTabButton: boolean;
   showSplitActions: boolean;
   showMaximizeAction: boolean;
@@ -302,6 +314,9 @@ function WorkspacePaneToolbarActions({
     <ToolbarControls style={styles.paneSplitActions}>
       {showNewTabButton ? (
         <WorkspaceNewTabButton
+          panePanelKinds={panePanelKinds}
+          host={host}
+          launchPurpose={launchPurpose}
           placement="toolbar"
           serverId={serverId}
           paneId={paneId}
@@ -497,9 +512,12 @@ function sameWidths(left: number[], right: number[]): boolean {
   return left.length === right.length && left.every((width, index) => width === right[index]);
 }
 
-interface WorkspaceDesktopTabsRowProps {
+export interface WorkspaceDesktopTabsRowProps {
+  host?: PaneHost;
+  launchPurpose?: WorkspaceTabLaunchPurpose;
   paneId?: string;
   isFocused?: boolean;
+  ownsKeyboardShortcuts?: boolean;
   tabs: WorkspaceDesktopTabRowItem[];
   normalizedServerId: string;
   normalizedWorkspaceId: string;
@@ -740,6 +758,7 @@ function TabChip({
   dragHandleProps: DraggableListDragHandleProps | undefined;
 }) {
   const { closeButtonTestId, contextMenuTestId, menuEntries } = resolvedTab;
+  const { t } = useTranslation();
   const middleClickRef = useMiddleClickClose(
     useCallback(() => void onCloseTab(tab.tabId), [onCloseTab, tab.tabId]),
   );
@@ -838,9 +857,8 @@ function TabChip({
               {...(dragHandleProps?.listeners as object | undefined)}
               testID={`workspace-tab-${testIdentity}`}
               triggerRef={dragHandleProps?.setActivatorNodeRef as unknown as undefined}
-              enabledOnMobile={false}
               style={tabChipStyle}
-              onPressIn={handleNavigateTab}
+              onPressIn={isWeb ? handleNavigateTab : undefined}
               onPress={handleNavigateTab}
               accessibilityRole="button"
               accessibilityLabel={accessibilityLabel}
@@ -889,6 +907,8 @@ function TabChip({
             <Pressable
               {...(closeButtonDragBlockers as object | undefined)}
               testID={closeButtonTestId}
+              accessibilityRole="button"
+              accessibilityLabel={t("workspace.tabs.menu.close")}
               disabled={isClosingTab}
               onPressIn={handleCloseButtonPressIn}
               onHoverIn={handleCloseButtonHoverIn}
@@ -991,8 +1011,11 @@ export function WorkspaceDesktopTabsRow(props: WorkspaceDesktopTabsRowProps) {
 }
 
 function ResolvedWorkspaceDesktopTabsRow({
+  host = "main",
+  launchPurpose = "primary",
   paneId,
   isFocused = false,
+  ownsKeyboardShortcuts = isFocused,
   tabs,
   normalizedServerId,
   normalizedWorkspaceId,
@@ -1062,6 +1085,8 @@ function ResolvedWorkspaceDesktopTabsRow({
     [exitFocusModeWidth, focusModeEnabled, showPaneMaximizeAction, showPaneSplitActions],
   );
 
+  const panePanelKinds = useMemo(() => tabs.map(({ tab }) => tab.kind), [tabs]);
+
   const fallbackTabLabels = useMemo(
     () => ({
       newTab: t("workspace.tabs.actions.newTab"),
@@ -1206,14 +1231,14 @@ function ResolvedWorkspaceDesktopTabsRow({
 
   const handleNewTabKeyboardAction = useCallback(
     (action: KeyboardActionDefinition): boolean => {
-      if (!isFocused) return false;
+      if (!ownsKeyboardShortcuts) return false;
       if (action.id === "workspace.tab.menu.open") {
         createNewTab();
         return true;
       }
       return false;
     },
-    [createNewTab, isFocused],
+    [createNewTab, ownsKeyboardShortcuts],
   );
 
   useKeyboardActionHandler({
@@ -1224,7 +1249,7 @@ function ResolvedWorkspaceDesktopTabsRow({
       paneId,
     }),
     actions: ["workspace.tab.menu.open"],
-    enabled: isFocused,
+    enabled: ownsKeyboardShortcuts,
     priority: 200,
     handle: handleNewTabKeyboardAction,
   });
@@ -1236,7 +1261,8 @@ function ResolvedWorkspaceDesktopTabsRow({
       dragHandleProps,
       isActive,
     }: DraggableRenderItemInfo<ResolvedWorkspaceDesktopTabRowItem>) => {
-      const shouldShowCloseButton = layout.closeButtonPolicy === "all";
+      const shouldShowCloseButton =
+        layout.closeButtonPolicy === "all" && item.presentation.showCloseButton;
       const layoutItem = layout.items[index] ?? null;
       const resolvedTabWidth = layoutItem?.width ?? 150;
       const showLabel = layoutItem?.showLabel ?? true;
@@ -1363,6 +1389,9 @@ function ResolvedWorkspaceDesktopTabsRow({
           />
           {!layout.requiresHorizontalScrollFallback ? (
             <WorkspaceNewTabButton
+              panePanelKinds={panePanelKinds}
+              host={host}
+              launchPurpose={launchPurpose}
               placement="inline"
               serverId={normalizedServerId}
               paneId={paneId}
@@ -1379,6 +1408,9 @@ function ResolvedWorkspaceDesktopTabsRow({
         />
       </View>
       <WorkspacePaneToolbarActions
+        panePanelKinds={panePanelKinds}
+        host={host}
+        launchPurpose={launchPurpose}
         showNewTabButton={layout.requiresHorizontalScrollFallback}
         showSplitActions={showPaneSplitActions}
         showMaximizeAction={showPaneMaximizeAction}
@@ -1487,9 +1519,7 @@ function ResolvedDesktopTabChip({
   );
 
   const rawTooltipLabel =
-    presentation.titleState === "loading"
-      ? t("workspace.tabs.loadingAgentTitle")
-      : presentation.tooltip;
+    presentation.titleState === "loading" ? t("common.states.loading") : presentation.tooltip;
   const accessibilityLabel =
     item.tab.target.kind === "agent"
       ? normalizeAgentTooltipTitle(rawTooltipLabel)
diff --git a/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx b/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
index 041aa6954b..5e8c3eea78 100644
--- a/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
+++ b/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
@@ -11,6 +11,8 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 
 const ThemedPanelRight = withUnistyles(PanelRight);
 
+export const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
+
 interface WorkspaceExplorerToggleProps {
   onPress: () => void;
   label: string;
diff --git a/packages/app/src/screens/workspace/workspace-header-menu.tsx b/packages/app/src/screens/workspace/workspace-header-menu.tsx
index 1ffd99425f..2fb7176e10 100644
--- a/packages/app/src/screens/workspace/workspace-header-menu.tsx
+++ b/packages/app/src/screens/workspace/workspace-header-menu.tsx
@@ -2,14 +2,7 @@ import React, { useCallback, useMemo } from "react";
 import { View } from "react-native";
 import { useRouter, type Href } from "expo-router";
 import { useTranslation } from "react-i18next";
-import {
-  Copy,
-  Ellipsis,
-  Globe,
-  Import as ImportIcon,
-  Settings,
-  SquarePen,
-} from "lucide-react-native";
+import { Copy, Ellipsis, Globe, Import as ImportIcon, Settings } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
 import {
@@ -24,6 +17,7 @@ import {
   extraMutedIconColorMapping,
   iconButtonChromeGlyphSize,
   iconButtonChromeStyle,
+  useIconButtonChromeStyle,
 } from "@/components/ui/icon-button-chrome";
 import { TerminalProfileIcon } from "@/components/terminal-profile-icon";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
@@ -36,16 +30,13 @@ import type { Theme } from "@/styles/theme";
 
 const ThemedEllipsis = withUnistyles(Ellipsis);
 const ThemedCopy = withUnistyles(Copy);
-const ThemedSquarePen = withUnistyles(SquarePen);
 const ThemedGlobe = withUnistyles(Globe);
 const ThemedImport = withUnistyles(ImportIcon);
 const ThemedSettings = withUnistyles(Settings);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-const MENU_NEW_AGENT_ICON = <ThemedSquarePen size={16} uniProps={mutedColorMapping} />;
 const MENU_NEW_BROWSER_ICON = <ThemedGlobe size={16} uniProps={mutedColorMapping} />;
-const MENU_NEW_TERMINAL_ICON = <TerminalProfileIcon iconKey={undefined} size={16} />;
 const MENU_IMPORT_ICON = <ThemedImport size={16} uniProps={mutedColorMapping} />;
 const MENU_COPY_ICON = <ThemedCopy size={16} uniProps={mutedColorMapping} />;
 const MENU_SETTINGS_ICON = <ThemedSettings size={16} uniProps={mutedColorMapping} />;
@@ -203,28 +194,25 @@ export interface WorkspaceHeaderMenuMobileProps extends WorkspaceHeaderWorkspace
   normalizedServerId: string;
   showCreateBrowserTab: boolean;
   createTerminalDisabled: boolean;
-  onCreateDraftTab: () => void;
-  onCreateTerminal: () => void;
   onCreateTerminalWithProfile: (profile: TerminalProfile) => void;
   onCreateBrowser: () => void;
 }
 
 /**
- * Compact layouts have no tab strip to launch from, so new tabs live here alongside the workspace
- * actions.
+ * Compact layouts have no tab strip. New agent and New terminal sit in the tab switcher's footer;
+ * the rarer launches stay here alongside the workspace actions.
  */
 export function WorkspaceHeaderMenuMobile({
   normalizedServerId,
   showCreateBrowserTab,
   createTerminalDisabled,
-  onCreateDraftTab,
-  onCreateTerminal,
   onCreateTerminalWithProfile,
   onCreateBrowser,
   ...workspaceActions
 }: WorkspaceHeaderMenuMobileProps) {
   const { t } = useTranslation();
   const router = useRouter();
+  const triggerStyle = useIconButtonChromeStyle({ size: "large" });
   const { config } = useDaemonConfig(normalizedServerId);
   const profiles = useMemo(
     () => resolveTerminalProfiles(config?.terminalProfiles),
@@ -239,7 +227,7 @@ export function WorkspaceHeaderMenuMobile({
     <DropdownMenu compactMode="sheet">
       <DropdownMenuTrigger
         testID="workspace-header-menu-trigger"
-        style={workspaceHeaderMenuButtonStyle}
+        style={triggerStyle}
         hitSlop={COMPACT_HEADER_BUTTON_HIT_SLOP}
         accessibilityRole="button"
         accessibilityLabel={t("workspace.header.actions.workspaceActions")}
@@ -252,13 +240,6 @@ export function WorkspaceHeaderMenuMobile({
         testID="workspace-header-menu"
         sheetTitle={t("workspace.header.actions.workspaceActions")}
       >
-        <DropdownMenuItem
-          testID="workspace-header-new-agent"
-          leading={MENU_NEW_AGENT_ICON}
-          onSelect={onCreateDraftTab}
-        >
-          {t("workspace.header.actions.newAgent")}
-        </DropdownMenuItem>
         {showCreateBrowserTab ? (
           <DropdownMenuItem
             testID="workspace-header-new-browser"
@@ -271,14 +252,6 @@ export function WorkspaceHeaderMenuMobile({
         <WorkspaceHeaderWorkspaceActionItems {...workspaceActions} />
         <DropdownMenuSeparator />
         <DropdownMenuLabel>{t("workspace.tabs.actions.terminalProfilesMenu")}</DropdownMenuLabel>
-        <DropdownMenuItem
-          testID="workspace-header-new-terminal"
-          leading={MENU_NEW_TERMINAL_ICON}
-          disabled={createTerminalDisabled}
-          onSelect={onCreateTerminal}
-        >
-          {t("workspace.header.actions.newTerminal")}
-        </DropdownMenuItem>
         {profiles.map((profile) => (
           <HeaderMenuProfileItem
             key={profile.id}
diff --git a/packages/app/src/screens/workspace/workspace-header-project-row.tsx b/packages/app/src/screens/workspace/workspace-header-project-row.tsx
new file mode 100644
index 0000000000..949bf29a19
--- /dev/null
+++ b/packages/app/src/screens/workspace/workspace-header-project-row.tsx
@@ -0,0 +1,68 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { HostBadge } from "@/hosts/host-badge";
+import { useHostBadges } from "@/hosts/use-host-badges";
+
+/**
+ * Which project the workspace belongs to, and which machine it runs on.
+ *
+ * Compact gets both, on their own line under the workspace name: this header is the only thing on
+ * screen that says where the workspace lives, because the sidebar that normally carries the host
+ * badge is closed. It still follows the host's own badge setting, so a purely local setup stays
+ * quiet. A project name that only repeats the workspace name is dropped on wide, where the two sit
+ * side by side, and kept on compact, where the line exists for the host anyway.
+ */
+export function WorkspaceHeaderProjectRow({
+  subtitle,
+  isSubtitleDistinct,
+  serverId,
+}: {
+  subtitle: string;
+  isSubtitleDistinct: boolean;
+  serverId: string;
+}) {
+  const isCompact = useIsCompactFormFactor();
+  const hostBadge = useHostBadges({ enabled: isCompact }).get(serverId) ?? null;
+  const showProject = isSubtitleDistinct || isCompact;
+  if (!showProject && !hostBadge) {
+    return null;
+  }
+  return (
+    <View style={styles.row}>
+      {showProject ? (
+        <Text testID="workspace-header-subtitle" style={styles.project} numberOfLines={1}>
+          {subtitle}
+        </Text>
+      ) : null}
+      {showProject && hostBadge ? <Text style={styles.separator}>·</Text> : null}
+      {hostBadge ? <HostBadge badge={hostBadge} /> : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  // The compact header stretches this row to its available title width. Within that width,
+  // the project truncates and HostBadge yields its label while retaining its fixed icon.
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+    minWidth: 0,
+    flexShrink: 1,
+  },
+  project: {
+    color: theme.colors.foregroundMuted,
+    fontSize: {
+      xs: theme.fontSize.sm,
+      md: theme.fontSize.base,
+    },
+    flexShrink: 1,
+    minWidth: 0,
+  },
+  separator: {
+    color: theme.colors.foregroundExtraMuted,
+    fontSize: theme.fontSize.sm,
+    flexShrink: 0,
+  },
+}));
diff --git a/packages/app/src/screens/workspace/workspace-new-tab-menu.tsx b/packages/app/src/screens/workspace/workspace-new-tab-menu.tsx
index a8d7c3a43a..16ca639c09 100644
--- a/packages/app/src/screens/workspace/workspace-new-tab-menu.tsx
+++ b/packages/app/src/screens/workspace/workspace-new-tab-menu.tsx
@@ -16,6 +16,7 @@ import {
   type WorkspaceTabLaunchItem,
   type WorkspaceTabLaunchPurpose,
 } from "@/workspace-tabs/launcher";
+import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
 import type { PaneHost } from "@/panels/panel-manifest";
 import type { PanelIconProps } from "@/panels/panel-registry";
 
@@ -84,14 +85,22 @@ export function WorkspaceNewTabMenuContent({
   serverId,
   purpose,
   host,
+  panePanelKinds,
   paneId,
 }: {
   serverId: string;
   purpose: WorkspaceTabLaunchPurpose;
   host: PaneHost;
+  panePanelKinds: readonly WorkspaceTabTarget["kind"][];
   paneId?: string;
 }) {
-  const groups = useWorkspaceTabLaunchCatalog({ serverId, purpose, host });
+  const groups = useWorkspaceTabLaunchCatalog({
+    serverId,
+    purpose,
+    host,
+    surface: "menu",
+    panePanelKinds,
+  });
 
   return (
     <DropdownMenuContent
diff --git a/packages/app/src/screens/workspace/workspace-pane-content.tsx b/packages/app/src/screens/workspace/workspace-pane-content.tsx
index e9534769b3..0ef496a94b 100644
--- a/packages/app/src/screens/workspace/workspace-pane-content.tsx
+++ b/packages/app/src/screens/workspace/workspace-pane-content.tsx
@@ -1,3 +1,4 @@
+import { ComposerEditingScope } from "@/composer/editing-session";
 import React, { useMemo, type ComponentType } from "react";
 import invariant from "tiny-invariant";
 import {
@@ -156,7 +157,12 @@ export function WorkspacePaneContent({
     >
       <PaneProvider value={stablePaneContextValue}>
         <PaneFocusProvider value={paneFocusValue}>
-          <Component key={key} />
+          <ComposerEditingScope
+            tabId={paneContextValue.tabId}
+            targetKey={JSON.stringify(paneContextValue.target)}
+          >
+            <Component key={key} />
+          </ComposerEditingScope>
         </PaneFocusProvider>
       </PaneProvider>
     </RenderProfile>
diff --git a/packages/app/src/screens/workspace/workspace-route-state-views.tsx b/packages/app/src/screens/workspace/workspace-route-state-views.tsx
index 364816114f..f5f8c5e096 100644
--- a/packages/app/src/screens/workspace/workspace-route-state-views.tsx
+++ b/packages/app/src/screens/workspace/workspace-route-state-views.tsx
@@ -126,15 +126,21 @@ function ArchivedWorkspaceRecovery({
   if (recovery.phase === "failed") {
     actionLabel = t("common.actions.retry");
   }
-  const description =
-    recovery.recovery.action === "restore"
-      ? t("workspace.route.recovery.restoreDescription", {
-          workspaceName: recovery.recovery.workspaceName,
-          branch: recovery.recovery.branch,
-        })
-      : t("workspace.route.recovery.unarchiveDescription", {
-          workspaceName: recovery.recovery.workspaceName,
-        });
+  let description: string;
+  if (recovery.recovery.action === "restore" && recovery.recovery.branch) {
+    description = t("workspace.route.recovery.restoreDescription", {
+      workspaceName: recovery.recovery.workspaceName,
+      branch: recovery.recovery.branch,
+    });
+  } else if (recovery.recovery.action === "restore") {
+    description = t("workspace.route.recovery.restoreWithoutBranchDescription", {
+      workspaceName: recovery.recovery.workspaceName,
+    });
+  } else {
+    description = t("workspace.route.recovery.unarchiveDescription", {
+      workspaceName: recovery.recovery.workspaceName,
+    });
+  }
 
   return (
     <View style={styles.emptyState}>
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index a27a1ed418..55a186cbab 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -1,3 +1,4 @@
+import { WorkspaceComposerEditingSessionsProvider } from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import { getOpenAgentTabLabel } from "@getpaseo/protocol/agent-labels";
@@ -14,23 +15,26 @@ import {
 } from "react";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { useIsFocused } from "@react-navigation/native";
-import { BackHandler, Keyboard, Pressable, Text, View } from "react-native";
+import { BackHandler, Text, View } from "react-native";
 import { useQueryClient } from "@tanstack/react-query";
 import { useRouter, type Href } from "expo-router";
 import * as Clipboard from "expo-clipboard";
 import { useTranslation } from "react-i18next";
-import { ChevronDown } from "lucide-react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { Theme } from "@/styles/theme";
 import invariant from "tiny-invariant";
-import { SidebarMenuToggle } from "@/components/headers/menu-header";
+import { SidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
 import { ScreenHeader } from "@/components/headers/screen-header";
+import { MenuHeader } from "@/components/headers/menu-header";
+import { FloatingHeaderLayout } from "@/components/floating-header";
+import { StreamTopOverlayProvider, supportsStreamTopOverlay } from "@/agent-stream/top-overlay";
+import {
+  CompactWorkspaceHeader,
+  MobileWorkspaceTabSwitcher,
+} from "@/screens/workspace/compact-workspace-header";
+import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row";
 import { ScreenTitle } from "@/components/headers/screen-title";
-import { HostBadge } from "@/hosts/host-badge";
-import { useHostBadges } from "@/hosts/use-host-badges";
-import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
-import type { ShortcutKey } from "@/utils/format-shortcut";
 import {
   FloatingPanelPortalHost,
   FloatingPanelPortalHostNameProvider,
@@ -115,30 +119,20 @@ import { buildProviderCommand } from "@/utils/provider-command-templates";
 import { generateDraftId } from "@/stores/draft-keys";
 import { resolveWorkspaceRouteId } from "@/utils/workspace-identity";
 import { useOpenAgentTabLabels } from "@/subagents/use-open-agent-tab-labels";
-import {
-  WorkspaceTabPresentationResolver,
-  WorkspaceTabIcon,
-  WorkspaceTabOptionRow,
-  type WorkspaceTabPresentation,
-} from "@/screens/workspace/workspace-tab-presentation";
+import { WorkspaceTabPresentationResolver } from "@/screens/workspace/workspace-tab-presentation";
 import {
   useWorkspaceTabRename,
   WorkspaceTabRenameModal,
 } from "@/screens/workspace/use-workspace-tab-rename";
-import { MobileTabTrailingAccessory } from "@/screens/workspace/workspace-tab-trailing-accessory";
 import {
   WorkspaceDesktopTabsRow,
   type WorkspaceDesktopTabRowItem,
 } from "@/screens/workspace/workspace-desktop-tabs-row";
-import {
-  buildWorkspaceTabMenuEntries,
-  type WorkspaceTabMenuLabels,
-} from "@/screens/workspace/workspace-tab-menu";
 import { useDesktopBrowserNewTabRequests } from "@/desktop/browser/new-tab-requests";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import {
   resolveWorkspaceExplorerToggleOwner,
-  WorkspaceExplorerToggle,
+  EXPLORER_TOGGLE_KEYS,
   WorkspaceExplorerSidebarToggle,
   WorkspaceHeaderExplorerToggle,
 } from "@/screens/workspace/workspace-explorer-toggle";
@@ -189,7 +183,6 @@ import {
 import { findAdjacentPane } from "@/utils/split-navigation";
 import { supportsDesktopPaneSplits, useIsCompactFormFactor } from "@/constants/layout";
 import { getIsElectron, isNative, isWeb } from "@/constants/platform";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
 import { useWorkspaceTerminals } from "@/screens/workspace/terminals/use-workspace-terminals";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
@@ -197,6 +190,7 @@ import {
   WorkspaceHeaderMenuDesktop,
   WorkspaceHeaderMenuMobile,
 } from "@/screens/workspace/workspace-header-menu";
+import { PluginHeaderButtons } from "@/plugins";
 import {
   createWorkspaceFileTabTarget,
   normalizeWorkspaceFileLocation,
@@ -205,7 +199,7 @@ import {
 } from "@/workspace/file-open";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useWorkspaceCheckoutStatus } from "@/screens/workspace/use-workspace-checkout-status";
-import { useHasPullRequest } from "@/panels/pull-request";
+import { useHasPullRequest, usePullRequestAutoAdd } from "@/panels/pull-request";
 
 const WORKSPACE_FLOATING_PANEL_PORTAL_HOST_PREFIX = "workspace-floating-panels";
 const EMPTY_UI_TABS: WorkspaceTab[] = [];
@@ -245,24 +239,19 @@ function buildWorkspaceFileLocation(
 }
 
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const ThemedChevronDown = withUnistyles(ChevronDown);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-const GATED_WORKSPACE_HEADER_LEFT = <SidebarMenuToggle />;
-
 interface WorkspaceScreenProps {
   serverId: string;
   workspaceId: string;
   isRouteFocused?: boolean;
   recoveryRequested?: boolean;
-  recoveryAgentId?: string | null;
 }
 
 type WorkspaceScreenContentProps = WorkspaceScreenProps & {
   isRouteFocused: boolean;
   recoveryRequested: boolean;
-  recoveryAgentId: string | null;
 };
 
 function trimNonEmpty(value: string | null | undefined): string | null {
@@ -302,187 +291,6 @@ function useSyncWorkspaceActiveBrowser(input: {
   }, [focusedBrowserId, input.workspaceId]);
 }
 
-function getFallbackTabOptionLabel(
-  tab: WorkspaceTabDescriptor,
-  labels: {
-    newTab: string;
-    newAgent: string;
-    setup: string;
-    terminal: string;
-    browser: string;
-    agent: string;
-    changes: string;
-    files: string;
-    pullRequest: string;
-  },
-): string {
-  if (tab.target.kind === "new_tab") {
-    return labels.newTab;
-  }
-  if (tab.target.kind === "draft") {
-    return labels.newAgent;
-  }
-  if (tab.target.kind === "setup") {
-    return labels.setup;
-  }
-  if (tab.target.kind === "terminal") {
-    return labels.terminal;
-  }
-  if (tab.target.kind === "browser") {
-    return labels.browser;
-  }
-  if (tab.target.kind === "file") {
-    return tab.target.path.split("/").findLast(Boolean) ?? tab.target.path;
-  }
-  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
-    return labels.changes;
-  }
-  if (tab.target.kind === "files") {
-    return labels.files;
-  }
-  if (tab.target.kind === "pull_request") {
-    return labels.pullRequest;
-  }
-  if (tab.target.kind === "commit_diff") {
-    return tab.target.sha.slice(0, 7);
-  }
-  return labels.agent;
-}
-
-function getFallbackTabOptionDescription(
-  tab: WorkspaceTabDescriptor,
-  labels: {
-    newTab: string;
-    newAgent: string;
-    workspaceSetup: string;
-    agent: string;
-    terminal: string;
-    browser: string;
-    changes: string;
-    files: string;
-    pullRequest: string;
-  },
-): string {
-  if (tab.target.kind === "new_tab") {
-    return labels.newTab;
-  }
-  if (tab.target.kind === "draft") {
-    return labels.newAgent;
-  }
-  if (tab.target.kind === "setup") {
-    return labels.workspaceSetup;
-  }
-  if (tab.target.kind === "agent") {
-    return labels.agent;
-  }
-  if (tab.target.kind === "terminal") {
-    return labels.terminal;
-  }
-  if (tab.target.kind === "browser") {
-    return labels.browser;
-  }
-  if (tab.target.kind === "provider_subagent") {
-    return labels.agent;
-  }
-  if (tab.target.kind === "commit_diff") {
-    return tab.target.sha.slice(0, 7);
-  }
-  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
-    return labels.changes;
-  }
-  if (tab.target.kind === "files") {
-    return labels.files;
-  }
-  if (tab.target.kind === "pull_request") {
-    return labels.pullRequest;
-  }
-  if (tab.target.kind === "plugin") {
-    return tab.target.panelId;
-  }
-  return tab.target.path;
-}
-
-interface MobileWorkspaceTabSwitcherProps {
-  tabs: WorkspaceTabDescriptor[];
-  activeTabKey: string;
-  activeTab: WorkspaceTabDescriptor | null;
-  tabSwitcherOptions: ComboboxOption[];
-  tabByKey: Map<string, WorkspaceTabDescriptor>;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  onSelectSwitcherTab: (key: string) => void;
-  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
-  onCopyAgentId: (agentId: string) => Promise<void> | void;
-  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
-  onCopyFilePath: (path: string) => Promise<void> | void;
-  onReloadAgent: (agentId: string) => Promise<void> | void;
-  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
-  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
-  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
-}
-
-function MobileActiveTabTrigger({
-  activeTab,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  backdrop,
-}: {
-  activeTab: WorkspaceTabDescriptor | null;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
-}) {
-  if (!activeTab) {
-    return null;
-  }
-
-  return (
-    <ResolvedMobileActiveTabTrigger
-      activeTab={activeTab}
-      normalizedServerId={normalizedServerId}
-      normalizedWorkspaceId={normalizedWorkspaceId}
-      backdrop={backdrop}
-    />
-  );
-}
-
-function ResolvedMobileActiveTabTrigger({
-  activeTab,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  backdrop,
-}: {
-  activeTab: WorkspaceTabDescriptor;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
-}) {
-  const { t } = useTranslation();
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={activeTab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {(presentation) => (
-        <>
-          <View style={styles.switcherTriggerIcon} testID="workspace-active-tab-icon">
-            <WorkspaceTabIcon presentation={presentation} active backdrop={backdrop} />
-          </View>
-
-          <Text style={styles.switcherTriggerText} numberOfLines={1}>
-            {presentation.titleState === "loading"
-              ? t("workspace.tabs.loading")
-              : presentation.label}
-          </Text>
-        </>
-      )}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
 function WorkspaceDocumentTitleEffect({
   label,
   titleState,
@@ -505,283 +313,13 @@ function WorkspaceDocumentTitleEffect({
   return null;
 }
 
-function switcherTriggerStyle({ pressed }: { pressed?: boolean }) {
-  return [styles.switcherTrigger, Boolean(pressed) && styles.switcherTriggerPressed];
-}
-
-function MobileWorkspaceTabOption({
-  tab,
-  tabIndex,
-  tabCount,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  selected,
-  active,
-  onPress,
-  onCopyResumeCommand,
-  onCopyAgentId,
-  onCopyTerminalId,
-  onCopyFilePath,
-  onReloadAgent,
-  onRenameTab,
-  onCloseTab,
-  onCloseTabsAbove,
-  onCloseTabsBelow,
-  onCloseOtherTabs,
-}: {
-  tab: WorkspaceTabDescriptor;
-  tabIndex: number;
-  tabCount: number;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
-  onCopyAgentId: (agentId: string) => Promise<void> | void;
-  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
-  onCopyFilePath: (path: string) => Promise<void> | void;
-  onReloadAgent: (agentId: string) => Promise<void> | void;
-  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
-  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
-  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
-}) {
-  const { t } = useTranslation();
-  const tabMenuLabels = useMemo<WorkspaceTabMenuLabels>(
-    () => ({
-      copyResumeCommand: t("workspace.tabs.menu.copyResumeCommand"),
-      copyAgentId: t("workspace.tabs.menu.copyAgentId"),
-      copyTerminalId: t("workspace.tabs.menu.copyTerminalId"),
-      copyFilePath: t("workspace.tabs.menu.copyFilePath"),
-      rename: t("workspace.tabs.menu.rename"),
-      closeAbove: t("workspace.tabs.menu.closeAbove"),
-      closeBelow: t("workspace.tabs.menu.closeBelow"),
-      closeLeft: t("workspace.tabs.menu.closeLeft"),
-      closeRight: t("workspace.tabs.menu.closeRight"),
-      closeOthers: t("workspace.tabs.menu.closeOthers"),
-      reloadAgent: t("workspace.tabs.menu.reloadAgent"),
-      reloadAgentTooltip: t("workspace.tabs.menu.reloadAgentTooltip"),
-      close: t("workspace.tabs.menu.close"),
-    }),
-    [t],
-  );
-  const menuTestIDBase = `workspace-tab-menu-${tab.tabId}`;
-  const menuEntries = buildWorkspaceTabMenuEntries({
-    surface: "mobile",
-    tab,
-    index: tabIndex,
-    tabCount,
-    menuTestIDBase,
-    onCopyResumeCommand,
-    onCopyAgentId,
-    onCopyTerminalId,
-    onCopyFilePath,
-    onReloadAgent,
-    onRenameTab,
-    onCloseTab,
-    onCloseTabsBefore: onCloseTabsAbove,
-    onCloseTabsAfter: onCloseTabsBelow,
-    onCloseOtherTabs,
-    labels: tabMenuLabels,
-  });
-
-  const fallbackLabels = useMemo(
-    () => ({
-      newTab: t("workspace.tabs.actions.newTab"),
-      newAgent: t("workspace.tabs.fallback.newAgent"),
-      setup: t("workspace.tabs.fallback.setup"),
-      terminal: t("workspace.tabs.fallback.terminal"),
-      browser: t("workspace.tabs.fallback.browser"),
-      agent: t("workspace.tabs.fallback.agent"),
-      changes: t("panels.diff.changesLabel"),
-      files: t("panels.files.label"),
-      pullRequest: t("panels.pullRequest.label"),
-    }),
-    [t],
-  );
-  const fallbackLabel = getFallbackTabOptionLabel(tab, fallbackLabels);
-  const trailingAccessory = useMemo(
-    () => (
-      <MobileTabTrailingAccessory
-        menuTestIDBase={menuTestIDBase}
-        presentationLabel={fallbackLabel}
-        menuEntries={menuEntries}
-      />
-    ),
-    [menuTestIDBase, fallbackLabel, menuEntries],
-  );
-
-  const renderPresentation = useCallback(
-    (presentation: WorkspaceTabPresentation) => (
-      <WorkspaceTabOptionRow
-        presentation={presentation}
-        selected={selected}
-        active={active}
-        onPress={onPress}
-        trailingAccessory={trailingAccessory}
-      />
-    ),
-    [selected, active, onPress, trailingAccessory],
-  );
-
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={tab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {renderPresentation}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
-const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
-  tabs,
-  activeTabKey,
-  activeTab,
-  tabSwitcherOptions,
-  tabByKey,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  onSelectSwitcherTab,
-  onCopyResumeCommand,
-  onCopyAgentId,
-  onCopyTerminalId,
-  onCopyFilePath,
-  onReloadAgent,
-  onRenameTab,
-  onCloseTab,
-  onCloseTabsAbove,
-  onCloseTabsBelow,
-  onCloseOtherTabs,
-}: MobileWorkspaceTabSwitcherProps) {
-  const { t } = useTranslation();
-  const [isOpen, setIsOpen] = useState(false);
-  const anchorRef = useRef<View>(null);
-  const tabIndexByKey = useMemo(() => {
-    const map = new Map<string, number>();
-    tabs.forEach((tab, index) => {
-      map.set(tab.key, index);
-    });
-    return map;
-  }, [tabs]);
-
-  const handleOpenSwitcher = useCallback(() => {
-    Keyboard.dismiss();
-    setIsOpen(true);
-  }, []);
-
-  const renderTabOption = useCallback(
-    ({
-      option,
-      selected,
-      active,
-      onPress,
-    }: {
-      option: ComboboxOption;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => {
-      const tab = tabByKey.get(option.id);
-      if (!tab) {
-        return <View />;
-      }
-      const tabIndex = tabIndexByKey.get(tab.key) ?? -1;
-      if (tabIndex < 0) {
-        return <View />;
-      }
-      return (
-        <MobileWorkspaceTabOption
-          tab={tab}
-          tabIndex={tabIndex}
-          tabCount={tabs.length}
-          normalizedServerId={normalizedServerId}
-          normalizedWorkspaceId={normalizedWorkspaceId}
-          selected={selected}
-          active={active}
-          onPress={onPress}
-          onCopyResumeCommand={onCopyResumeCommand}
-          onCopyAgentId={onCopyAgentId}
-          onCopyTerminalId={onCopyTerminalId}
-          onCopyFilePath={onCopyFilePath}
-          onReloadAgent={onReloadAgent}
-          onRenameTab={onRenameTab}
-          onCloseTab={onCloseTab}
-          onCloseTabsAbove={onCloseTabsAbove}
-          onCloseTabsBelow={onCloseTabsBelow}
-          onCloseOtherTabs={onCloseOtherTabs}
-        />
-      );
-    },
-    [
-      tabByKey,
-      tabIndexByKey,
-      tabs.length,
-      normalizedServerId,
-      normalizedWorkspaceId,
-      onCopyResumeCommand,
-      onCopyAgentId,
-      onCopyTerminalId,
-      onCopyFilePath,
-      onReloadAgent,
-      onRenameTab,
-      onCloseTab,
-      onCloseTabsAbove,
-      onCloseTabsBelow,
-      onCloseOtherTabs,
-    ],
-  );
-
-  return (
-    <View style={styles.mobileTabsRow} testID="workspace-tabs-row">
-      <Pressable
-        ref={anchorRef}
-        testID="workspace-tab-switcher-trigger"
-        accessibilityRole="button"
-        accessibilityLabel={t("workspace.tabs.switcher.trigger", { count: tabs.length })}
-        style={switcherTriggerStyle}
-        onPress={handleOpenSwitcher}
-      >
-        {({ pressed }) => (
-          <>
-            <View style={styles.switcherTriggerLeft}>
-              <MobileActiveTabTrigger
-                activeTab={activeTab}
-                normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                backdrop={pressed ? "surface1" : "surface0"}
-              />
-            </View>
-            <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-          </>
-        )}
-      </Pressable>
-
-      <Combobox
-        options={tabSwitcherOptions}
-        value={activeTabKey}
-        onSelect={onSelectSwitcherTab}
-        searchable={false}
-        title={t("workspace.tabs.switcher.title")}
-        searchPlaceholder={t("workspace.tabs.switcher.searchPlaceholder")}
-        open={isOpen}
-        onOpenChange={setIsOpen}
-        anchorRef={anchorRef}
-        renderOption={renderTabOption}
-      />
-    </View>
-  );
-});
-
 interface MobileMountedTabSlotProps {
   tabDescriptor: WorkspaceTabDescriptor;
   isVisible: boolean;
   isWorkspaceFocused: boolean;
   isPaneFocused: boolean;
   paneId: string | null;
+  onFocusPane: (paneId: string) => void;
   buildPaneContentModel: (input: {
     paneId: string | null;
     tab: WorkspaceTabDescriptor;
@@ -794,6 +332,7 @@ const MobileMountedTabSlot = memo(function MobileMountedTabSlot({
   isWorkspaceFocused,
   isPaneFocused,
   paneId,
+  onFocusPane,
   buildPaneContentModel,
 }: MobileMountedTabSlotProps) {
   const content = useMemo(
@@ -804,15 +343,21 @@ const MobileMountedTabSlot = memo(function MobileMountedTabSlot({
       }),
     [buildPaneContentModel, paneId, tabDescriptor],
   );
+  const handleTouch = useCallback(() => {
+    if (!isPaneFocused && paneId) onFocusPane(paneId);
+    return false;
+  }, [isPaneFocused, onFocusPane, paneId]);
 
   return (
     <RenderProfile id={`MobileMountedTabSlot:${tabDescriptor.kind}:${tabDescriptor.tabId}`}>
       <RetainedPanel active={isVisible} style={styles.mobileMountedTabSlot}>
-        <WorkspacePaneContent
-          content={content}
-          isWorkspaceFocused={isWorkspaceFocused}
-          isPaneFocused={isPaneFocused}
-        />
+        <View style={styles.mobileMountedTabSlot} onStartShouldSetResponderCapture={handleTouch}>
+          <WorkspacePaneContent
+            content={content}
+            isWorkspaceFocused={isWorkspaceFocused}
+            isPaneFocused={isPaneFocused}
+          />
+        </View>
       </RetainedPanel>
     </RenderProfile>
   );
@@ -850,7 +395,6 @@ export const WorkspaceScreen = memo(function WorkspaceScreen({
   workspaceId,
   isRouteFocused,
   recoveryRequested,
-  recoveryAgentId,
 }: WorkspaceScreenProps) {
   const navigationFocused = useIsFocused();
   useEffect(() => {
@@ -865,7 +409,6 @@ export const WorkspaceScreen = memo(function WorkspaceScreen({
       workspaceId={workspaceId}
       isRouteFocused={isRouteFocused ?? navigationFocused}
       recoveryRequested={recoveryRequested ?? false}
-      recoveryAgentId={recoveryAgentId ?? null}
     />
   );
 });
@@ -897,47 +440,6 @@ function useCloseTabs(): UseCloseTabsResult {
   return { closingTabIds, closeTab };
 }
 
-/**
- * Which project the workspace belongs to, and which machine it runs on.
- *
- * Compact gets both, on their own line under the workspace name: this header is the only thing on
- * screen that says where the workspace lives, because the sidebar that normally carries the host
- * badge is closed. It still follows the host's own badge setting, so a purely local setup stays
- * quiet. A project name that only repeats the workspace name is dropped on wide, where the two sit
- * side by side, and kept on compact, where the line exists for the host anyway.
- */
-function WorkspaceHeaderProjectRow({
-  subtitle,
-  isSubtitleDistinct,
-  serverId,
-}: {
-  subtitle: string;
-  isSubtitleDistinct: boolean;
-  serverId: string;
-}) {
-  const isCompact = useIsCompactFormFactor();
-  const hostBadge = useHostBadges({ enabled: isCompact }).get(serverId) ?? null;
-  const showProject = isSubtitleDistinct || isCompact;
-  if (!showProject && !hostBadge) {
-    return null;
-  }
-  return (
-    <View style={styles.headerProjectRow}>
-      {showProject ? (
-        <Text
-          testID="workspace-header-subtitle"
-          style={styles.headerProjectTitle}
-          numberOfLines={1}
-        >
-          {subtitle}
-        </Text>
-      ) : null}
-      {showProject && hostBadge ? <Text style={styles.headerProjectSeparator}>·</Text> : null}
-      {hostBadge ? <HostBadge badge={hostBadge} /> : null}
-    </View>
-  );
-}
-
 interface WorkspaceHeaderTitleBarProps {
   isLoading: boolean;
   title: string;
@@ -945,26 +447,13 @@ interface WorkspaceHeaderTitleBarProps {
   isSubtitleDistinct: boolean;
   currentBranchName: string | null;
   normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  workspaceScripts: WorkspaceDescriptor["scripts"];
-  liveTerminalIds: string[];
   showWorkspaceSetup: boolean;
-  showCreateBrowserTab: boolean;
-  isMobile: boolean;
-  createTerminalDisabled: boolean;
   importAgentDisabled: boolean;
   copyPathDisabled: boolean;
-  onCreateDraftTab: () => void;
-  onCreateTerminal: () => void;
-  onCreateTerminalWithProfile: (profile: TerminalProfile) => void;
-  onCreateBrowser: () => void;
   onOpenImportSheet: () => void;
   onCopyWorkspacePath: () => void;
   onCopyBranchName: () => void;
   onOpenSetupTab: () => void;
-  onScriptTerminalStarted: (terminalId: string) => void;
-  onViewScriptTerminal: (terminalId: string) => void;
-  onOpenUrlInBrowserTab: (url: string) => void;
 }
 
 function WorkspaceHeaderTitleBar({
@@ -974,26 +463,13 @@ function WorkspaceHeaderTitleBar({
   isSubtitleDistinct,
   currentBranchName,
   normalizedServerId,
-  normalizedWorkspaceId,
-  workspaceScripts,
-  liveTerminalIds,
   showWorkspaceSetup,
-  showCreateBrowserTab,
-  isMobile,
-  createTerminalDisabled,
   importAgentDisabled,
   copyPathDisabled,
-  onCreateDraftTab,
-  onCreateTerminal,
-  onCreateTerminalWithProfile,
-  onCreateBrowser,
   onOpenImportSheet,
   onCopyWorkspacePath,
   onCopyBranchName,
   onOpenSetupTab,
-  onScriptTerminalStarted,
-  onViewScriptTerminal,
-  onOpenUrlInBrowserTab,
 }: WorkspaceHeaderTitleBarProps) {
   return (
     <View style={styles.headerTitleContainer}>
@@ -1012,49 +488,16 @@ function WorkspaceHeaderTitleBar({
         </View>
       )}
       <View style={styles.compactHeaderMenuCluster}>
-        {isMobile ? (
-          <WorkspaceHeaderMenuMobile
-            normalizedServerId={normalizedServerId}
-            currentBranchName={currentBranchName}
-            showWorkspaceSetup={showWorkspaceSetup}
-            showCreateBrowserTab={showCreateBrowserTab}
-            createTerminalDisabled={createTerminalDisabled}
-            importAgentDisabled={importAgentDisabled}
-            copyPathDisabled={copyPathDisabled}
-            onCreateDraftTab={onCreateDraftTab}
-            onCreateTerminal={onCreateTerminal}
-            onCreateTerminalWithProfile={onCreateTerminalWithProfile}
-            onCreateBrowser={onCreateBrowser}
-            onOpenImportSheet={onOpenImportSheet}
-            onCopyWorkspacePath={onCopyWorkspacePath}
-            onCopyBranchName={onCopyBranchName}
-            onOpenSetupTab={onOpenSetupTab}
-          />
-        ) : (
-          <WorkspaceHeaderMenuDesktop
-            currentBranchName={currentBranchName}
-            showWorkspaceSetup={showWorkspaceSetup}
-            importAgentDisabled={importAgentDisabled}
-            copyPathDisabled={copyPathDisabled}
-            onOpenImportSheet={onOpenImportSheet}
-            onCopyWorkspacePath={onCopyWorkspacePath}
-            onCopyBranchName={onCopyBranchName}
-            onOpenSetupTab={onOpenSetupTab}
-          />
-        )}
-        {isMobile && workspaceScripts.length > 0 ? (
-          <WorkspaceScriptsButton
-            serverId={normalizedServerId}
-            workspaceId={normalizedWorkspaceId}
-            scripts={workspaceScripts}
-            liveTerminalIds={liveTerminalIds}
-            onScriptTerminalStarted={onScriptTerminalStarted}
-            onViewTerminal={onViewScriptTerminal}
-            onOpenUrlInBrowserTab={onOpenUrlInBrowserTab}
-            hideLabels
-            presentation="ghost"
-          />
-        ) : null}
+        <WorkspaceHeaderMenuDesktop
+          currentBranchName={currentBranchName}
+          showWorkspaceSetup={showWorkspaceSetup}
+          importAgentDisabled={importAgentDisabled}
+          copyPathDisabled={copyPathDisabled}
+          onOpenImportSheet={onOpenImportSheet}
+          onCopyWorkspacePath={onCopyWorkspacePath}
+          onCopyBranchName={onCopyBranchName}
+          onOpenSetupTab={onOpenSetupTab}
+        />
       </View>
     </View>
   );
@@ -1079,6 +522,8 @@ interface RenderWorkspaceContentInput {
   focusedPaneTabDescriptorMap: Map<string, WorkspaceTabDescriptor>;
   isRouteFocused: boolean;
   focusedPaneId: string | null;
+  paneFocusSuspended: boolean;
+  onFocusPane: (paneId: string) => void;
   buildMobilePaneContentModel: (input: {
     paneId: string | null;
     tab: WorkspaceTabDescriptor;
@@ -1095,6 +540,8 @@ function renderWorkspaceContent(input: RenderWorkspaceContentInput): React.React
     focusedPaneTabDescriptorMap,
     isRouteFocused,
     focusedPaneId,
+    paneFocusSuspended,
+    onFocusPane,
     buildMobilePaneContentModel,
   } = input;
 
@@ -1134,8 +581,9 @@ function renderWorkspaceContent(input: RenderWorkspaceContentInput): React.React
         tabDescriptor={tabDescriptor}
         isVisible={isRouteFocused && tabId === activeTabDescriptor.tabId}
         isWorkspaceFocused={isRouteFocused}
-        isPaneFocused={tabId === activeTabDescriptor.tabId}
+        isPaneFocused={!paneFocusSuspended && tabId === activeTabDescriptor.tabId}
         paneId={focusedPaneId}
+        onFocusPane={onFocusPane}
         buildPaneContentModel={buildMobilePaneContentModel}
       />
     );
@@ -1283,7 +731,7 @@ function shouldInspectWorkspaceRecovery(
 function WorkspaceScreenGateFrame({ children }: { children: ReactNode }) {
   return (
     <>
-      <ScreenHeader left={GATED_WORKSPACE_HEADER_LEFT} />
+      <MenuHeader />
       <View style={styles.centerContent}>{children}</View>
     </>
   );
@@ -1306,14 +754,20 @@ function WorkspaceContentProviders({
 function WorkspacePanelContent({
   launcher,
   content,
+  tabIds,
+  workspaceKey,
 }: {
+  workspaceKey: string;
   launcher: NewTabLauncher;
   content: ReactNode;
+  tabIds: readonly string[];
 }) {
   return (
-    <NewTabLauncherProvider value={launcher}>
-      <View style={styles.content}>{content}</View>
-    </NewTabLauncherProvider>
+    <WorkspaceComposerEditingSessionsProvider workspaceKey={workspaceKey} tabIds={tabIds}>
+      <NewTabLauncherProvider value={launcher}>
+        <View style={styles.content}>{content}</View>
+      </NewTabLauncherProvider>
+    </WorkspaceComposerEditingSessionsProvider>
   );
 }
 
@@ -1365,6 +819,10 @@ function WorkspaceDocumentTitleEffectSlot({
   );
 }
 
+function floatsHeaderOverContent(activeTab: WorkspaceTabDescriptor | null): boolean {
+  return supportsStreamTopOverlay && activeTab?.kind === "agent";
+}
+
 function shouldShowWorkspaceScreenHeader(input: {
   isFocusModeEnabled: boolean;
   isMobile: boolean;
@@ -1525,7 +983,6 @@ function WorkspaceScreenContent({
   workspaceId,
   isRouteFocused,
   recoveryRequested,
-  recoveryAgentId,
 }: WorkspaceScreenContentProps) {
   const { t } = useTranslation();
   const _insets = useSafeAreaInsets();
@@ -1651,7 +1108,6 @@ function WorkspaceScreenContent({
   const workspaceRecovery = useWorkspaceRecovery({
     serverId: normalizedServerId,
     workspaceId: normalizedWorkspaceId,
-    agentId: recoveryAgentId,
     enabled: shouldInspectWorkspaceRecovery(
       hasHydratedWorkspaces,
       workspaceDescriptor,
@@ -1752,10 +1208,16 @@ function WorkspaceScreenContent({
     workspace: workspaceDescriptor,
     checkoutState: workspaceHeaderCheckoutState,
   });
+  const canDetectPullRequestTab = canDetectPullRequest(isRouteFocused, isGitCheckout, isMobile);
   const hasPullRequest = useHasPullRequest({
     serverId: normalizedServerId,
     cwd: workspaceDirectory,
-    enabled: canDetectPullRequest(isRouteFocused, isGitCheckout, isMobile),
+    enabled: canDetectPullRequestTab,
+  });
+  usePullRequestAutoAdd({
+    workspaceKey: persistenceKey,
+    hasPullRequest,
+    enabled: canDetectPullRequestTab,
   });
 
   const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
@@ -1799,6 +1261,9 @@ function WorkspaceScreenContent({
   const workspaceLayout = useWorkspaceLayoutStore((state) =>
     persistenceKey ? (state.layoutByWorkspace[persistenceKey] ?? null) : null,
   );
+  const unfocusedPaneId = useWorkspaceLayoutStore((state) =>
+    persistenceKey ? state.focusRestorationByWorkspace[persistenceKey]?.restorePaneId : undefined,
+  );
   const explorerSidebarPaneId = useWorkspaceLayoutStore((state) =>
     persistenceKey ? selectExplorerSidebarPaneId(state, persistenceKey) : null,
   );
@@ -1898,8 +1363,9 @@ function WorkspaceScreenContent({
       deriveWorkspacePaneState({
         layout: workspaceLayout,
         tabs: uiTabs,
+        paneId: workspaceLayout?.focusedPaneId ?? unfocusedPaneId,
       }),
-    [uiTabs, workspaceLayout],
+    [uiTabs, workspaceLayout, unfocusedPaneId],
   );
   const viewedTimelineSync = useSessionStore(
     (state) => state.sessions[normalizedServerId]?.viewedTimelineSync ?? null,
@@ -2282,14 +1748,6 @@ function WorkspaceScreenContent({
       terminalsQueryKey,
     });
 
-  const tabByKey = useMemo(() => {
-    const map = new Map<string, WorkspaceTabDescriptor>();
-    for (const tab of tabs) {
-      map.set(tab.key, tab);
-    }
-    return map;
-  }, [tabs]);
-
   const allTabDescriptorsById = useMemo(() => {
     const map = new Map<string, WorkspaceTabDescriptor>();
     for (const tab of uiTabs) {
@@ -2335,32 +1793,6 @@ function WorkspaceScreenContent({
     : t("workspace.tabs.explorerSidebar.open");
 
   const activeTabKey = useMemo(() => activeTabId ?? "", [activeTabId]);
-  const tabFallbackLabels = useMemo(
-    () => ({
-      newTab: t("workspace.tabs.actions.newTab"),
-      newAgent: t("workspace.tabs.fallback.newAgent"),
-      setup: t("workspace.tabs.fallback.setup"),
-      workspaceSetup: t("workspace.tabs.fallback.workspaceSetup"),
-      terminal: t("workspace.tabs.fallback.terminal"),
-      browser: t("workspace.tabs.fallback.browser"),
-      agent: t("workspace.tabs.fallback.agent"),
-      changes: t("panels.diff.changesLabel"),
-      files: t("panels.files.label"),
-      pullRequest: t("panels.pullRequest.label"),
-    }),
-    [t],
-  );
-
-  const tabSwitcherOptions = useMemo(
-    () =>
-      tabs.map((tab) => ({
-        id: tab.key,
-        label: getFallbackTabOptionLabel(tab, tabFallbackLabels),
-        description: getFallbackTabOptionDescription(tab, tabFallbackLabels),
-      })),
-    [tabFallbackLabels, tabs],
-  );
-
   const handleCreateDraftTab = useCallback(
     (input?: { paneId?: string }) => {
       openWorkspaceDraftTab({ paneId: input?.paneId });
@@ -3621,6 +3053,12 @@ function WorkspaceScreenContent({
     },
     [buildPaneContentModel],
   );
+  const handleFocusPane = useStableEvent(function handleFocusPane(paneId: string) {
+    if (!persistenceKey || paneFocusSuppressedRef.current) {
+      return;
+    }
+    focusWorkspacePane(persistenceKey, paneId);
+  });
   const content = renderWorkspaceContent({
     isMissingWorkspaceDirectory,
     activeTabDescriptor,
@@ -3630,6 +3068,8 @@ function WorkspaceScreenContent({
     focusedPaneTabDescriptorMap,
     isRouteFocused,
     focusedPaneId,
+    paneFocusSuspended: Boolean(unfocusedPaneId),
+    onFocusPane: handleFocusPane,
     buildMobilePaneContentModel,
   });
 
@@ -3655,13 +3095,6 @@ function WorkspaceScreenContent({
     [activeTabDescriptor?.tabId, closingTabIds, hoveredCloseTabKey, tabs],
   );
 
-  const handleFocusPane = useStableEvent(function handleFocusPane(paneId: string) {
-    if (!persistenceKey || paneFocusSuppressedRef.current) {
-      return;
-    }
-    focusWorkspacePane(persistenceKey, paneId);
-  });
-
   const handleSplitPane = useCallback(
     function handleSplitPane(input: {
       tabId: string;
@@ -3739,7 +3172,8 @@ function WorkspaceScreenContent({
   const headerRight = useMemo(
     () => (
       <View style={styles.headerRight}>
-        {!isMobile && workspaceDescriptor && workspaceDescriptor.scripts.length > 0 ? (
+        <PluginHeaderButtons serverId={normalizedServerId} workspaceId={normalizedWorkspaceId} />
+        {workspaceDescriptor && workspaceDescriptor.scripts.length > 0 ? (
           <WorkspaceScriptsButton
             serverId={normalizedServerId}
             workspaceId={normalizedWorkspaceId}
@@ -3751,7 +3185,7 @@ function WorkspaceScreenContent({
             hideLabels
           />
         ) : null}
-        {!isMobile && workspaceDirectory ? (
+        {workspaceDirectory ? (
           <WorkspaceOpenInEditorButton
             serverId={normalizedServerId}
             cwd={workspaceDirectory}
@@ -3759,7 +3193,7 @@ function WorkspaceScreenContent({
             hideLabels
           />
         ) : null}
-        {!isMobile && workspaceDirectory ? (
+        {workspaceDirectory ? (
           <>
             <WorkspaceActions serverId={normalizedServerId} cwd={workspaceDirectory} />
             <WorkspaceHeaderExplorerToggle
@@ -3773,20 +3207,9 @@ function WorkspaceScreenContent({
             />
           </>
         ) : null}
-        {isMobile ? (
-          <WorkspaceExplorerToggle
-            onPress={handleToggleExplorerSidebar}
-            label={explorerSidebarToggleLabel}
-            tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
-            tooltipKeys={EXPLORER_TOGGLE_KEYS}
-            accessibilityState={explorerSidebarToggleAccessibilityState}
-            mobile
-          />
-        ) : null}
       </View>
     ),
     [
-      isMobile,
       workspaceDescriptor,
       normalizedServerId,
       normalizedWorkspaceId,
@@ -3872,26 +3295,13 @@ function WorkspaceScreenContent({
                 isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct}
                 currentBranchName={currentBranchName}
                 normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                workspaceScripts={workspaceScripts}
-                liveTerminalIds={liveTerminalIds}
                 showWorkspaceSetup={showWorkspaceSetup}
-                showCreateBrowserTab={showCreateBrowserTab}
-                isMobile={isMobile}
-                createTerminalDisabled={createTerminalDisabled}
                 importAgentDisabled={!canOpenImportSheet}
                 copyPathDisabled={!workspaceDirectory}
-                onCreateDraftTab={handleCreateDraftTab}
-                onCreateTerminal={handleCreateTerminal}
-                onCreateTerminalWithProfile={handleCreateTerminalWithProfile}
-                onCreateBrowser={handleCreateBrowserTab}
                 onOpenImportSheet={openImportSheet}
                 onCopyWorkspacePath={handleCopyWorkspacePath}
                 onCopyBranchName={handleCopyBranchName}
                 onOpenSetupTab={handleOpenSetupTab}
-                onScriptTerminalStarted={handleScriptTerminalStarted}
-                onViewScriptTerminal={handleViewScriptTerminal}
-                onOpenUrlInBrowserTab={handleOpenUrlInBrowserTab}
               />
             </>
           }
@@ -3900,33 +3310,110 @@ function WorkspaceScreenContent({
       ) : null,
     [
       canOpenImportSheet,
-      createTerminalDisabled,
       currentBranchName,
       handleCopyBranchName,
       handleCopyWorkspacePath,
-      handleCreateBrowserTab,
-      handleCreateDraftTab,
-      handleCreateTerminal,
-      handleCreateTerminalWithProfile,
       handleOpenSetupTab,
-      handleOpenUrlInBrowserTab,
-      handleScriptTerminalStarted,
-      handleViewScriptTerminal,
       headerRight,
-      isMobile,
       isWorkspaceHeaderLoading,
-      liveTerminalIds,
       normalizedServerId,
-      normalizedWorkspaceId,
       openImportSheet,
-      showCreateBrowserTab,
       showScreenHeader,
       showWorkspaceSetup,
       workspaceDirectory,
       workspaceHeaderSubtitle,
       workspaceHeaderTitle,
       isWorkspaceHeaderSubtitleDistinct,
-      workspaceScripts,
+    ],
+  );
+  const compactWorkspaceHeader = useMemo(
+    () =>
+      isMobile ? (
+        <CompactWorkspaceHeader
+          isLoading={isWorkspaceHeaderLoading}
+          title={workspaceHeaderTitle}
+          subtitle={workspaceHeaderSubtitle}
+          isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct}
+          serverId={normalizedServerId}
+          onToggleExplorer={handleToggleExplorerSidebar}
+          explorerToggleLabel={explorerSidebarToggleLabel}
+          explorerToggleAccessibilityState={explorerSidebarToggleAccessibilityState}
+        >
+          <MobileWorkspaceTabSwitcher
+            tabs={tabs}
+            activeTabKey={activeTabKey}
+            normalizedServerId={normalizedServerId}
+            normalizedWorkspaceId={normalizedWorkspaceId}
+            onSelectSwitcherTab={handleSelectSwitcherTab}
+            createTerminalDisabled={createTerminalDisabled}
+            onCreateDraftTab={handleCreateDraftTab}
+            onCreateTerminal={handleCreateTerminal}
+            onCopyResumeCommand={handleCopyResumeCommand}
+            onCopyAgentId={handleCopyAgentId}
+            onCopyTerminalId={handleCopyTerminalId}
+            onCopyFilePath={handleCopyFilePath}
+            onReloadAgent={handleReloadAgent}
+            onRenameTab={handleRenameTab}
+            onCloseTab={handleCloseTabById}
+            onCloseTabsAbove={handleCloseTabsToLeft}
+            onCloseTabsBelow={handleCloseTabsToRight}
+            onCloseOtherTabs={handleCloseOtherTabs}
+          />
+          <WorkspaceHeaderMenuMobile
+            normalizedServerId={normalizedServerId}
+            currentBranchName={currentBranchName}
+            showWorkspaceSetup={showWorkspaceSetup}
+            showCreateBrowserTab={showCreateBrowserTab}
+            createTerminalDisabled={createTerminalDisabled}
+            importAgentDisabled={!canOpenImportSheet}
+            copyPathDisabled={!workspaceDirectory}
+            onCreateTerminalWithProfile={handleCreateTerminalWithProfile}
+            onCreateBrowser={handleCreateBrowserTab}
+            onOpenImportSheet={openImportSheet}
+            onCopyWorkspacePath={handleCopyWorkspacePath}
+            onCopyBranchName={handleCopyBranchName}
+            onOpenSetupTab={handleOpenSetupTab}
+          />
+        </CompactWorkspaceHeader>
+      ) : null,
+    [
+      activeTabKey,
+      canOpenImportSheet,
+      createTerminalDisabled,
+      currentBranchName,
+      explorerSidebarToggleAccessibilityState,
+      explorerSidebarToggleLabel,
+      handleCloseOtherTabs,
+      handleCloseTabById,
+      handleCloseTabsToLeft,
+      handleCloseTabsToRight,
+      handleCopyAgentId,
+      handleCopyBranchName,
+      handleCopyFilePath,
+      handleCopyResumeCommand,
+      handleCopyTerminalId,
+      handleCopyWorkspacePath,
+      handleCreateBrowserTab,
+      handleCreateDraftTab,
+      handleCreateTerminal,
+      handleCreateTerminalWithProfile,
+      handleOpenSetupTab,
+      handleReloadAgent,
+      handleRenameTab,
+      handleSelectSwitcherTab,
+      handleToggleExplorerSidebar,
+      isMobile,
+      isWorkspaceHeaderLoading,
+      isWorkspaceHeaderSubtitleDistinct,
+      normalizedServerId,
+      normalizedWorkspaceId,
+      openImportSheet,
+      showCreateBrowserTab,
+      showWorkspaceSetup,
+      tabs,
+      workspaceDirectory,
+      workspaceHeaderSubtitle,
+      workspaceHeaderTitle,
     ],
   );
   const desktopSplitContent = useMemo(() => {
@@ -4011,37 +3498,29 @@ function WorkspaceScreenContent({
   const workspacePanelContent = (
     <WorkspacePanelContent
       launcher={newTabLauncher}
+      workspaceKey={`${normalizedServerId}:${normalizedWorkspaceId}`}
+      tabIds={uiTabs.map((tab) => tab.tabId)}
       content={isMobile ? content : desktopContent}
     />
   );
 
-  const workspaceCenterColumn = (
+  const workspaceCenterColumn = isMobile ? (
+    <View style={styles.centerColumn}>
+      <FloatingHeaderLayout
+        header={compactWorkspaceHeader}
+        floating={floatsHeaderOverContent(activeTabDescriptor)}
+      >
+        {(topOverlayInset) => (
+          <StreamTopOverlayProvider value={topOverlayInset}>
+            {workspacePanelContent}
+          </StreamTopOverlayProvider>
+        )}
+      </FloatingHeaderLayout>
+    </View>
+  ) : (
     <View style={styles.centerColumn}>
       {rendersDesktopSplitContent ? null : renderWorkspaceScreenHeader()}
 
-      {isMobile ? (
-        <MobileWorkspaceTabSwitcher
-          tabs={tabs}
-          activeTabKey={activeTabKey}
-          activeTab={activeTabDescriptor}
-          tabSwitcherOptions={tabSwitcherOptions}
-          tabByKey={tabByKey}
-          normalizedServerId={normalizedServerId}
-          normalizedWorkspaceId={normalizedWorkspaceId}
-          onSelectSwitcherTab={handleSelectSwitcherTab}
-          onCopyResumeCommand={handleCopyResumeCommand}
-          onCopyAgentId={handleCopyAgentId}
-          onCopyTerminalId={handleCopyTerminalId}
-          onCopyFilePath={handleCopyFilePath}
-          onReloadAgent={handleReloadAgent}
-          onRenameTab={handleRenameTab}
-          onCloseTab={handleCloseTabById}
-          onCloseTabsAbove={handleCloseTabsToLeft}
-          onCloseTabsBelow={handleCloseTabsToRight}
-          onCloseOtherTabs={handleCloseOtherTabs}
-        />
-      ) : null}
-
       {shouldRenderDesktopPaneFallback ? (
         <NewTabLauncherProvider value={newTabLauncher}>
           <WorkspaceDesktopTabsRow
@@ -4161,7 +3640,7 @@ const styles = StyleSheet.create((theme) => ({
       md: "row",
     },
     alignItems: {
-      xs: "flex-start",
+      xs: "stretch",
       md: "center",
     },
     justifyContent: "flex-start",
@@ -4170,30 +3649,6 @@ const styles = StyleSheet.create((theme) => ({
       md: theme.spacing[2],
     },
   },
-  // No width cap. A percentage cap resolves against the title group, whose own width comes from
-  // this row's content, so it clips the project name while there is still room beside it.
-  // `flexShrink` on both this row and the title already gives up space only when there is none.
-  headerProjectRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-    minWidth: 0,
-    flexShrink: 1,
-  },
-  headerProjectTitle: {
-    color: theme.colors.foregroundMuted,
-    fontSize: {
-      xs: theme.fontSize.sm,
-      md: theme.fontSize.base,
-    },
-    flexShrink: 1,
-    minWidth: 0,
-  },
-  headerProjectSeparator: {
-    color: theme.colors.foregroundExtraMuted,
-    fontSize: theme.fontSize.sm,
-    flexShrink: 0,
-  },
   headerTitleSkeleton: {
     width: 220,
     maxWidth: "100%",
@@ -4252,37 +3707,6 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   newTabTooltipShortcut: {},
-  mobileTabsRow: {
-    backgroundColor: theme.colors.surface0,
-    borderBottomWidth: theme.borderWidth[1],
-    borderBottomColor: theme.colors.border,
-  },
-  switcherTrigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[2] + theme.spacing[3],
-    paddingVertical: theme.spacing[2],
-  },
-  switcherTriggerPressed: {
-    backgroundColor: theme.colors.surface1,
-  },
-  switcherTriggerLeft: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    flex: 1,
-    minWidth: 0,
-  },
-  switcherTriggerIcon: {
-    flexShrink: 0,
-  },
-  switcherTriggerText: {
-    minWidth: 0,
-    flex: 1,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
   headerMenuProfileIconWrapper: {
     width: 16,
     height: 16,
@@ -4397,5 +3821,3 @@ const styles = StyleSheet.create((theme) => ({
     textAlign: "center",
   },
 }));
-
-const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
diff --git a/packages/app/src/screens/workspace/workspace-tab-layout.test.ts b/packages/app/src/screens/workspace/workspace-tab-layout.test.ts
index 3ccf39da35..b2b226e645 100644
--- a/packages/app/src/screens/workspace/workspace-tab-layout.test.ts
+++ b/packages/app/src/screens/workspace/workspace-tab-layout.test.ts
@@ -9,7 +9,7 @@ const metrics = {
   actionsReservedWidth: 120,
   rowPaddingHorizontal: 8,
   tabGap: 4,
-  minTabWidth: 96,
+  minTabWidth: 64,
   maxTabWidth: 160,
   tabIconWidth: 14,
   tabContentGap: 4,
@@ -29,7 +29,20 @@ describe("computeWorkspaceTabLayout", () => {
     expect(result.requiresHorizontalScrollFallback).toBe(false);
     expect(result.items).toHaveLength(3);
     expect(result.items.every((item) => item.showLabel)).toBe(true);
-    expect(result.items.map((item) => item.width)).toEqual([96, 104, 96]);
+    expect(result.items.map((item) => item.width)).toEqual([90, 104, 83]);
+  });
+
+  it("lets short labels use their content width below the old 96px floor", () => {
+    const result = computeWorkspaceTabLayout({
+      viewportWidth: 300,
+      tabLabelWidths: [29, 52],
+      metrics: { ...metrics, actionsReservedWidth: 36 },
+    });
+    expect(result.items).toEqual([
+      { width: 64, showLabel: true },
+      { width: 86, showLabel: true },
+    ]);
+    expect(result.requiresHorizontalScrollFallback).toBe(false);
   });
 
   it("sizes a single tab between the minimum and maximum from its content", () => {
@@ -52,7 +65,7 @@ describe("computeWorkspaceTabLayout", () => {
 
     expect(result.closeButtonPolicy).toBe("all");
     expect(result.requiresHorizontalScrollFallback).toBe(false);
-    expect(result.items.map((item) => item.width)).toEqual([117, 103, 96]);
+    expect(result.items.map((item) => item.width)).toEqual([132, 102, 82]);
     expect(result.items.every((item) => item.showLabel)).toBe(true);
   });
 
@@ -75,27 +88,27 @@ describe("computeWorkspaceTabLayout", () => {
 
   it("keeps every tab at the clickable minimum at the exact fit boundary", () => {
     const result = computeWorkspaceTabLayout({
-      viewportWidth: 532,
+      viewportWidth: 404,
       tabLabelWidths: [98, 98, 98, 98],
       metrics,
     });
 
     expect(result.closeButtonPolicy).toBe("all");
     expect(result.requiresHorizontalScrollFallback).toBe(false);
-    expect(result.items.map((item) => item.width)).toEqual([96, 96, 96, 96]);
+    expect(result.items.map((item) => item.width)).toEqual([64, 64, 64, 64]);
     expect(result.items.every((item) => item.showLabel)).toBe(true);
   });
 
   it("uses horizontal scroll rather than shrinking below the clickable minimum", () => {
     const result = computeWorkspaceTabLayout({
-      viewportWidth: 531,
+      viewportWidth: 403,
       tabLabelWidths: [98, 98, 98, 98],
       metrics,
     });
 
     expect(result.closeButtonPolicy).toBe("all");
     expect(result.requiresHorizontalScrollFallback).toBe(true);
-    expect(result.items.map((item) => item.width)).toEqual([96, 96, 96, 96]);
+    expect(result.items.map((item) => item.width)).toEqual([64, 64, 64, 64]);
     expect(result.items.every((item) => item.showLabel)).toBe(true);
   });
 
diff --git a/packages/app/src/screens/workspace/workspace-tab-presentation.tsx b/packages/app/src/screens/workspace/workspace-tab-presentation.tsx
index 07cd56e4fb..8b499429f0 100644
--- a/packages/app/src/screens/workspace/workspace-tab-presentation.tsx
+++ b/packages/app/src/screens/workspace/workspace-tab-presentation.tsx
@@ -26,6 +26,7 @@ export interface WorkspaceTabPresentation {
   subtitle: string;
   tooltip: string;
   modified: boolean;
+  showCloseButton: boolean;
   titleState: "ready" | "loading";
   icon: React.ComponentType<PanelIconProps>;
   statusBucket: SidebarStateBucket | null;
@@ -90,6 +91,7 @@ function WorkspaceTabPresentationResolverInner({
       subtitle: descriptor.subtitle,
       tooltip: descriptor.tooltip,
       modified: attributes.modified,
+      showCloseButton: registration.showCloseButton,
       titleState: descriptor.titleState,
       icon: descriptor.icon,
       statusBucket: descriptor.statusBucket,
@@ -104,6 +106,7 @@ function WorkspaceTabPresentationResolverInner({
       tab.key,
       tab.kind,
       attributes.modified,
+      registration.showCloseButton,
     ],
   );
 
diff --git a/packages/app/src/sidebar-nav/model.test.ts b/packages/app/src/sidebar-nav/model.test.ts
index fa1ef6763c..f7e7ba0933 100644
--- a/packages/app/src/sidebar-nav/model.test.ts
+++ b/packages/app/src/sidebar-nav/model.test.ts
@@ -12,11 +12,11 @@ import {
 
 function group(pluginId: string, contributionId: string): PluginSidebarGroup {
   return {
+    kind: "item",
     key: `${pluginId}/sidebar/${contributionId}`,
     pluginId,
     contributionId,
     title: contributionId,
-    icon: "puzzle",
     targets: [],
   };
 }
@@ -32,7 +32,11 @@ function summarize(items: readonly SidebarNavItem[]): SidebarNavPreference[] {
 
 describe("resolveSidebarNavItems", () => {
   it("yields builtins then plugins, all visible, when nothing is stored", () => {
-    const items = resolveSidebarNavItems({ pluginGroups: [kanban, notes], preferences: [] });
+    const items = resolveSidebarNavItems({
+      section: "header",
+      pluginGroups: [kanban, notes],
+      preferences: [],
+    });
 
     expect(summarize(items)).toEqual([
       { key: "new-workspace", visible: true },
@@ -53,6 +57,7 @@ describe("resolveSidebarNavItems", () => {
 
   it("keeps the stored order and appends newly available items as visible", () => {
     const items = resolveSidebarNavItems({
+      section: "header",
       pluginGroups: [notes, kanban],
       preferences: [
         { key: kanbanKey, visible: false },
@@ -73,6 +78,7 @@ describe("resolveSidebarNavItems", () => {
 
   it("skips keys that are unknown or not currently available", () => {
     const items = resolveSidebarNavItems({
+      section: "header",
       pluginGroups: [],
       preferences: [
         { key: notesKey, visible: false },
@@ -91,6 +97,7 @@ describe("resolveSidebarNavItems", () => {
 
   it("lets the first of duplicate keys win", () => {
     const items = resolveSidebarNavItems({
+      section: "header",
       pluginGroups: [],
       preferences: [
         { key: "history", visible: false },
@@ -107,9 +114,23 @@ describe("resolveSidebarNavItems", () => {
   });
 });
 
+describe("resolveSidebarNavItems for the Usage item", () => {
+  it("hides the Usage item until it is turned on", () => {
+    const resolve = (preferences: SidebarNavPreference[]) =>
+      summarize(resolveSidebarNavItems({ section: "footer", pluginGroups: [], preferences }));
+
+    expect(resolve([])).toEqual([{ key: "usage", visible: false }]);
+    expect(resolve([{ key: "usage", visible: true }])).toEqual([{ key: "usage", visible: true }]);
+  });
+});
+
 describe("setSidebarNavItemVisible", () => {
   it("toggles one item and writes the full resolved order", () => {
-    const items = resolveSidebarNavItems({ pluginGroups: [kanban], preferences: [] });
+    const items = resolveSidebarNavItems({
+      section: "header",
+      pluginGroups: [kanban],
+      preferences: [],
+    });
 
     const next = setSidebarNavItemVisible({ items, key: "search", visible: false, previous: [] });
 
@@ -127,7 +148,11 @@ describe("setSidebarNavItemVisible", () => {
       { key: notesKey, visible: false },
       { key: "history", visible: true },
     ];
-    const items = resolveSidebarNavItems({ pluginGroups: [], preferences: previous });
+    const items = resolveSidebarNavItems({
+      section: "header",
+      pluginGroups: [],
+      preferences: previous,
+    });
 
     const next = setSidebarNavItemVisible({ items, key: "history", visible: false, previous });
 
@@ -148,7 +173,11 @@ describe("setSidebarNavItemVisible", () => {
       { key: "search", visible: true },
       { key: "schedules", visible: true },
     ];
-    const items = resolveSidebarNavItems({ pluginGroups: [], preferences: previous });
+    const items = resolveSidebarNavItems({
+      section: "header",
+      pluginGroups: [],
+      preferences: previous,
+    });
 
     const next = setSidebarNavItemVisible({ items, key: "history", visible: false, previous });
 
@@ -159,13 +188,23 @@ describe("setSidebarNavItemVisible", () => {
       { key: "search", visible: true },
       { key: "schedules", visible: true },
     ]);
-    expect(summarize(resolveSidebarNavItems({ pluginGroups: [notes], preferences: next }))).toEqual(
-      next,
-    );
+    expect(
+      summarize(
+        resolveSidebarNavItems({
+          section: "header",
+          pluginGroups: [notes],
+          preferences: next,
+        }),
+      ),
+    ).toEqual(next);
   });
 
   it("returns the normalized list unchanged for an unknown key", () => {
-    const items = resolveSidebarNavItems({ pluginGroups: [], preferences: [] });
+    const items = resolveSidebarNavItems({
+      section: "header",
+      pluginGroups: [],
+      preferences: [],
+    });
 
     const next = setSidebarNavItemVisible({ items, key: "bogus", visible: false, previous: [] });
 
@@ -174,7 +213,11 @@ describe("setSidebarNavItemVisible", () => {
 });
 
 describe("moveSidebarNavItem", () => {
-  const items = resolveSidebarNavItems({ pluginGroups: [kanban], preferences: [] });
+  const items = resolveSidebarNavItems({
+    section: "header",
+    pluginGroups: [kanban],
+    preferences: [],
+  });
 
   it("moves an item up", () => {
     const next = moveSidebarNavItem({ items, key: "search", direction: "up", previous: [] });
@@ -241,3 +284,79 @@ describe("builtinSidebarNavShortcutAction", () => {
     expect(builtinSidebarNavShortcutAction("schedules")).toBeNull();
   });
 });
+
+describe("footer section", () => {
+  const sync = group("sync", "status");
+  const syncKey = pluginSidebarNavKey(sync);
+
+  it("resolves the Usage item first, then plugin rows", () => {
+    const items = resolveSidebarNavItems({
+      section: "footer",
+      pluginGroups: [sync],
+      preferences: [],
+    });
+
+    expect(summarize(items)).toEqual([
+      { key: "usage", visible: false },
+      { key: syncKey, visible: true },
+    ]);
+  });
+
+  it("ignores header built-ins stored in footer preferences", () => {
+    const items = resolveSidebarNavItems({
+      section: "footer",
+      pluginGroups: [],
+      preferences: [{ key: "history", visible: false }],
+    });
+
+    expect(summarize(items)).toEqual([{ key: "usage", visible: false }]);
+  });
+
+  it("ignores the footer icon buttons, which are fixed and not items", () => {
+    const items = resolveSidebarNavItems({
+      section: "footer",
+      pluginGroups: [sync],
+      preferences: [
+        { key: "add-project", visible: false },
+        { key: "hosts", visible: false },
+        { key: "import", visible: false },
+        { key: "help", visible: false },
+        { key: syncKey, visible: true },
+        { key: "usage", visible: false },
+      ],
+    });
+
+    expect(summarize(items)).toEqual([
+      { key: syncKey, visible: true },
+      { key: "usage", visible: false },
+    ]);
+  });
+
+  it("moves and shows footer rows while keeping an unavailable plugin's entry", () => {
+    const notesPreference = { key: notesKey, visible: false };
+    const previous: SidebarNavPreference[] = [notesPreference];
+    const items = resolveSidebarNavItems({
+      section: "footer",
+      pluginGroups: [sync],
+      preferences: previous,
+    });
+
+    const moved = moveSidebarNavItem({ items, key: syncKey, direction: "up", previous });
+    const shown = setSidebarNavItemVisible({
+      items: resolveSidebarNavItems({
+        section: "footer",
+        pluginGroups: [sync],
+        preferences: moved,
+      }),
+      key: "usage",
+      visible: true,
+      previous: moved,
+    });
+
+    expect(shown).toEqual([
+      notesPreference,
+      { key: syncKey, visible: true },
+      { key: "usage", visible: true },
+    ]);
+  });
+});
diff --git a/packages/app/src/sidebar-nav/model.ts b/packages/app/src/sidebar-nav/model.ts
index f3dbd33520..6b98821e93 100644
--- a/packages/app/src/sidebar-nav/model.ts
+++ b/packages/app/src/sidebar-nav/model.ts
@@ -1,7 +1,20 @@
 import type { PluginSidebarGroup } from "@/plugins/sidebar-groups";
+import type { PluginSidebarSection } from "@/plugins/types";
 
-export const BUILTIN_SIDEBAR_NAV_IDS = ["new-workspace", "history", "search", "schedules"] as const;
-export type BuiltinSidebarNavId = (typeof BUILTIN_SIDEBAR_NAV_IDS)[number];
+export type SidebarSection = PluginSidebarSection;
+
+/**
+ * Each section's built-in items in their default order. The footer's bottom line
+ * (Add project and the Hosts, Help and support, Settings icons) is fixed.
+ */
+export const BUILTIN_SIDEBAR_ITEM_IDS = {
+  header: ["new-workspace", "history", "search", "schedules"],
+  footer: ["usage"],
+} as const satisfies Record<SidebarSection, readonly string[]>;
+
+export type BuiltinSidebarItemId<Section extends SidebarSection = SidebarSection> =
+  (typeof BUILTIN_SIDEBAR_ITEM_IDS)[Section][number];
+export type BuiltinSidebarNavId = BuiltinSidebarItemId<"header">;
 
 /** Persisted shape. Array order is the display order. */
 export interface SidebarNavPreference {
@@ -9,10 +22,10 @@ export interface SidebarNavPreference {
   visible: boolean;
 }
 
-export interface BuiltinSidebarNavItem {
+export interface BuiltinSidebarNavItem<Section extends SidebarSection = SidebarSection> {
   kind: "builtin";
-  key: BuiltinSidebarNavId;
-  id: BuiltinSidebarNavId;
+  key: BuiltinSidebarItemId<Section>;
+  id: BuiltinSidebarItemId<Section>;
   visible: boolean;
 }
 
@@ -23,16 +36,19 @@ export interface PluginSidebarNavItem {
   visible: boolean;
 }
 
-export type SidebarNavItem = BuiltinSidebarNavItem | PluginSidebarNavItem;
+export type SidebarNavItem<Section extends SidebarSection = SidebarSection> =
+  | BuiltinSidebarNavItem<Section>
+  | PluginSidebarNavItem;
 
-const BUILTIN_LABEL_KEYS: Record<BuiltinSidebarNavId, string> = {
+const BUILTIN_LABEL_KEYS: Record<BuiltinSidebarItemId, string> = {
   "new-workspace": "sidebar.actions.newWorkspace",
   history: "sidebar.sections.sessions",
   search: "sidebar.sections.search",
   schedules: "sidebar.sections.schedules",
+  usage: "sidebar.footer.usage",
 };
 
-export function builtinSidebarNavLabelKey(id: BuiltinSidebarNavId): string {
+export function builtinSidebarNavLabelKey(id: BuiltinSidebarItemId): string {
   return BUILTIN_LABEL_KEYS[id];
 }
 
@@ -41,35 +57,50 @@ export function builtinSidebarNavLabelKey(id: BuiltinSidebarNavId): string {
  * Both the sidebar row and the Appearance settings row read the badge from here so the
  * two never disagree about which shortcut belongs to which item.
  */
-const BUILTIN_SHORTCUT_ACTIONS: Record<BuiltinSidebarNavId, string | null> = {
+const BUILTIN_SHORTCUT_ACTIONS: Record<BuiltinSidebarItemId, string | null> = {
   "new-workspace": "new-workspace",
   history: null,
   search: "toggle-command-center",
   schedules: null,
+  usage: null,
 };
 
-export function builtinSidebarNavShortcutAction(id: BuiltinSidebarNavId): string | null {
+export function builtinSidebarNavShortcutAction(id: BuiltinSidebarItemId): string | null {
   return BUILTIN_SHORTCUT_ACTIONS[id];
 }
 
+/** Builtins that start hidden until the user turns them on: the Usage summary is opt-in. */
+const HIDDEN_BY_DEFAULT: ReadonlySet<BuiltinSidebarItemId> = new Set(["usage"]);
+
+function builtinVisibleByDefault(id: BuiltinSidebarItemId): boolean {
+  return !HIDDEN_BY_DEFAULT.has(id);
+}
+
 export function pluginSidebarNavKey(
   group: Pick<PluginSidebarGroup, "pluginId" | "contributionId">,
 ): string {
   return `plugin:${group.pluginId}:${group.contributionId}`;
 }
 
-function isBuiltinSidebarNavId(key: string): key is BuiltinSidebarNavId {
-  return (BUILTIN_SIDEBAR_NAV_IDS as readonly string[]).includes(key);
+function isBuiltinSidebarItemId<Section extends SidebarSection>(
+  section: Section,
+  key: string,
+): key is BuiltinSidebarItemId<Section> {
+  const ids: readonly string[] = BUILTIN_SIDEBAR_ITEM_IDS[section];
+  return ids.includes(key);
 }
 
-export function resolveSidebarNavItems(input: {
+export function resolveSidebarNavItems<Section extends SidebarSection>(input: {
+  section: Section;
   pluginGroups: readonly PluginSidebarGroup[];
   preferences: readonly SidebarNavPreference[];
-}): SidebarNavItem[] {
+}): SidebarNavItem<Section>[] {
+  const builtinIds: readonly BuiltinSidebarItemId<Section>[] =
+    BUILTIN_SIDEBAR_ITEM_IDS[input.section];
   const groupsByKey = new Map(
     input.pluginGroups.map((group) => [pluginSidebarNavKey(group), group] as const),
   );
-  const items: SidebarNavItem[] = [];
+  const items: SidebarNavItem<Section>[] = [];
   const placed = new Set<string>();
 
   for (const preference of input.preferences) {
@@ -78,7 +109,7 @@ export function resolveSidebarNavItems(input: {
     if (group) {
       placed.add(preference.key);
       items.push({ kind: "plugin", key: preference.key, group, visible: preference.visible });
-    } else if (isBuiltinSidebarNavId(preference.key)) {
+    } else if (isBuiltinSidebarItemId(input.section, preference.key)) {
       placed.add(preference.key);
       items.push({
         kind: "builtin",
@@ -89,9 +120,14 @@ export function resolveSidebarNavItems(input: {
     }
   }
 
-  for (const id of BUILTIN_SIDEBAR_NAV_IDS) {
+  for (const id of builtinIds) {
     if (placed.has(id)) continue;
-    items.push({ kind: "builtin", key: id, id, visible: true });
+    items.push({
+      kind: "builtin",
+      key: id,
+      id,
+      visible: builtinVisibleByDefault(id),
+    });
   }
   for (const [key, group] of groupsByKey) {
     if (placed.has(key)) continue;
diff --git a/packages/app/src/sidebar-nav/use-sidebar-nav-items.ts b/packages/app/src/sidebar-nav/use-sidebar-nav-items.ts
index 634b9f96e7..dcebf670df 100644
--- a/packages/app/src/sidebar-nav/use-sidebar-nav-items.ts
+++ b/packages/app/src/sidebar-nav/use-sidebar-nav-items.ts
@@ -1,70 +1,74 @@
 import { useCallback, useMemo } from "react";
 import { useAppSettings } from "@/hooks/use-settings";
+import type { AppSettings } from "@/hooks/use-settings/storage";
 import { useInstalledPlugins } from "@/plugins/registry";
-import { groupPluginSidebarContributions } from "@/plugins/sidebar-groups";
+import { groupPluginSidebarItems } from "@/plugins/sidebar-groups";
 import {
   moveSidebarNavItem,
   resolveSidebarNavItems,
   setSidebarNavItemVisible,
   type SidebarNavItem,
+  type SidebarSection,
 } from "./model";
 
-export interface UseSidebarNavItemsReturn {
-  /** Every top-level item in display order, hidden ones included. */
-  items: SidebarNavItem[];
+const PREFERENCE_FIELDS = {
+  header: "sidebarNavItems",
+  footer: "sidebarFooterItems",
+} as const satisfies Record<SidebarSection, keyof AppSettings>;
+
+export interface UseSidebarNavItemsReturn<Section extends SidebarSection> {
+  /** Every item in the section in display order, hidden ones included. */
+  items: SidebarNavItem<Section>[];
   setVisible: (key: string, visible: boolean) => void;
   move: (key: string, direction: "up" | "down") => void;
 }
 
-export function useSidebarNavItems(): UseSidebarNavItemsReturn {
+export function useSidebarNavItems<Section extends SidebarSection>(
+  section: Section,
+): UseSidebarNavItemsReturn<Section> {
   const plugins = useInstalledPlugins();
   const { settings, updateSettings } = useAppSettings();
-  const preferences = settings.sidebarNavItems;
-  const pluginGroups = useMemo(() => groupPluginSidebarContributions(plugins), [plugins]);
+  const field = PREFERENCE_FIELDS[section];
+  const preferences = settings[field];
+  const pluginGroups = useMemo(() => groupPluginSidebarItems(plugins, section), [plugins, section]);
 
   const items = useMemo(
-    () =>
-      resolveSidebarNavItems({
-        pluginGroups,
-        preferences,
-      }),
-    [pluginGroups, preferences],
+    () => resolveSidebarNavItems({ section, pluginGroups, preferences }),
+    [pluginGroups, preferences, section],
   );
 
   const setVisible = useCallback(
     (key: string, visible: boolean) => {
       void updateSettings((current) => {
-        const previous = current.sidebarNavItems;
-        const currentItems = resolveSidebarNavItems({ pluginGroups, preferences: previous });
+        const previous = current[field];
+        const currentItems = resolveSidebarNavItems({
+          section,
+          pluginGroups,
+          preferences: previous,
+        });
         return {
-          sidebarNavItems: setSidebarNavItemVisible({
-            items: currentItems,
-            key,
-            visible,
-            previous,
-          }),
+          [field]: setSidebarNavItemVisible({ items: currentItems, key, visible, previous }),
         };
       });
     },
-    [pluginGroups, updateSettings],
+    [field, pluginGroups, section, updateSettings],
   );
 
   const move = useCallback(
     (key: string, direction: "up" | "down") => {
       void updateSettings((current) => {
-        const previous = current.sidebarNavItems;
-        const currentItems = resolveSidebarNavItems({ pluginGroups, preferences: previous });
+        const previous = current[field];
+        const currentItems = resolveSidebarNavItems({
+          section,
+          pluginGroups,
+          preferences: previous,
+        });
         return {
-          sidebarNavItems: moveSidebarNavItem({
-            items: currentItems,
-            key,
-            direction,
-            previous,
-          }),
+          [field]: moveSidebarNavItem({ items: currentItems, key, direction, previous }),
         };
       });
     },
-    [pluginGroups, updateSettings],
+    [field, pluginGroups, section, updateSettings],
   );
 
   return { items, setVisible, move };
diff --git a/packages/app/src/stores/create-flow-store.test.ts b/packages/app/src/stores/create-flow-store.test.ts
index c1b4ec8d77..4b5d73bd15 100644
--- a/packages/app/src/stores/create-flow-store.test.ts
+++ b/packages/app/src/stores/create-flow-store.test.ts
@@ -6,6 +6,33 @@ describe("create-flow-store", () => {
     useCreateFlowStore.setState({ pendingByDraftId: {} });
   });
 
+  it("accepts a retry after failure while rejecting repeated active or completed submissions", () => {
+    const store = useCreateFlowStore.getState();
+    const submission = {
+      draftId: "draft-retry",
+      serverId: "server-1",
+      workspaceId: "workspace-1",
+      agentId: null,
+      clientMessageId: "draft-retry:initial-message",
+      text: "hello",
+      timestamp: 1,
+    };
+    expect(store.trySetPending(submission)).toBe(true);
+    expect(store.trySetPending(submission)).toBe(false);
+    store.markLifecycle({
+      draftId: submission.draftId,
+      lifecycle: "abandoned",
+      errorMessage: "Disconnected",
+    });
+    expect(store.trySetPending(submission)).toBe(true);
+    expect(useCreateFlowStore.getState().pendingByDraftId[submission.draftId]).toEqual({
+      ...submission,
+      lifecycle: "active",
+    });
+    store.markLifecycle({ draftId: submission.draftId, lifecycle: "sent" });
+    expect(store.trySetPending(submission)).toBe(false);
+  });
+
   it("tracks lifecycle transitions explicitly", () => {
     const store = useCreateFlowStore.getState();
     store.setPending({
diff --git a/packages/app/src/stores/create-flow-store.ts b/packages/app/src/stores/create-flow-store.ts
index 2056e42c0f..95a85137a5 100644
--- a/packages/app/src/stores/create-flow-store.ts
+++ b/packages/app/src/stores/create-flow-store.ts
@@ -13,13 +13,14 @@ export interface PendingCreateAttempt {
   text: string;
   timestamp: number;
   lifecycle: CreateFlowLifecycleState;
+  errorMessage?: string;
   images?: UserMessageImageAttachment[];
   attachments?: AgentAttachment[];
 }
 
 export function isActiveCreateFlowForDraft(input: {
   pending: PendingCreateAttempt | null | undefined;
-  serverId: string;
+  serverId: string | null;
   draftId: string | null | undefined;
 }): boolean {
   const draftId = input.draftId?.trim();
@@ -34,15 +35,20 @@ export function isActiveCreateFlowForDraft(input: {
 interface CreateFlowState {
   pendingByDraftId: Record<string, PendingCreateAttempt>;
   setPending: (pending: Omit<PendingCreateAttempt, "lifecycle">) => void;
+  trySetPending: (pending: Omit<PendingCreateAttempt, "lifecycle">) => boolean;
   updateAgentId: (input: { draftId: string; agentId: string }) => void;
-  markLifecycle: (input: { draftId: string; lifecycle: CreateFlowLifecycleState }) => void;
+  markLifecycle: (input: {
+    draftId: string;
+    lifecycle: CreateFlowLifecycleState;
+    errorMessage?: string;
+  }) => void;
   rekeyDraft: (input: { fromDraftId: string; toDraftId: string }) => void;
   clear: (input: { draftId: string }) => void;
   clearByAgent: (input: { serverId: string; agentId: string }) => void;
   clearAll: () => void;
 }
 
-export const useCreateFlowStore = create<CreateFlowState>((set) => ({
+export const useCreateFlowStore = create<CreateFlowState>((set, get) => ({
   pendingByDraftId: {},
   setPending: (pending) =>
     set((state) => ({
@@ -54,6 +60,12 @@ export const useCreateFlowStore = create<CreateFlowState>((set) => ({
         },
       },
     })),
+  trySetPending: (pending) => {
+    const existing = get().pendingByDraftId[pending.draftId];
+    if (existing?.serverId === pending.serverId && existing.lifecycle !== "abandoned") return false;
+    get().setPending(pending);
+    return true;
+  },
   updateAgentId: ({ draftId, agentId }) =>
     set((state) => {
       const current = state.pendingByDraftId[draftId];
@@ -67,7 +79,7 @@ export const useCreateFlowStore = create<CreateFlowState>((set) => ({
         },
       };
     }),
-  markLifecycle: ({ draftId, lifecycle }) =>
+  markLifecycle: ({ draftId, lifecycle, errorMessage }) =>
     set((state) => {
       const current = state.pendingByDraftId[draftId];
       if (!current || current.lifecycle === lifecycle) {
@@ -76,7 +88,7 @@ export const useCreateFlowStore = create<CreateFlowState>((set) => ({
       return {
         pendingByDraftId: {
           ...state.pendingByDraftId,
-          [draftId]: { ...current, lifecycle },
+          [draftId]: { ...current, lifecycle, errorMessage },
         },
       };
     }),
diff --git a/packages/app/src/stores/draft-store/index.ts b/packages/app/src/stores/draft-store/index.ts
index 4b89ee98c0..9836d3dfec 100644
--- a/packages/app/src/stores/draft-store/index.ts
+++ b/packages/app/src/stores/draft-store/index.ts
@@ -14,6 +14,7 @@ import { useSessionStore, type SessionState } from "@/stores/session-store";
 import { useWorkspaceAttachmentsStore } from "@/attachments/workspace-attachments-store";
 import {
   applyClearDraftRecord,
+  editDraftRecordText,
   collectReferencedAttachmentIdsFromState,
   DRAFT_STORE_VERSION,
   isAttachmentMetadata,
@@ -42,6 +43,7 @@ interface DraftStoreActions {
   getDraftInput: (draftKey: string) => DraftInput | undefined;
   hydrateDraftInput: (input: { draftKey: string }) => Promise<DraftInput | undefined>;
   saveDraftInput: (input: { draftKey: string; draft: DraftInput }) => void;
+  editDraftText: (input: { draftKey: string; text: string }) => void;
   markDraftLifecycle: (input: { draftKey: string; lifecycle: DraftLifecycleState }) => void;
   clearDraftInput: (input: {
     draftKey: string;
@@ -316,6 +318,14 @@ export const useDraftStore = create<DraftStore>()(
         scheduleAttachmentGc();
       },
 
+      editDraftText: ({ draftKey, text }) => {
+        set((state) => {
+          const previous = state.drafts[draftKey];
+          const next = editDraftRecordText(previous, text, Date.now());
+          return next === previous ? state : { drafts: { ...state.drafts, [draftKey]: next } };
+        });
+      },
+
       markDraftLifecycle: ({ draftKey, lifecycle }) => {
         set((state) => {
           const existing = state.drafts[draftKey];
diff --git a/packages/app/src/stores/draft-store/state.test.ts b/packages/app/src/stores/draft-store/state.test.ts
index a71ea96668..f157a89d67 100644
--- a/packages/app/src/stores/draft-store/state.test.ts
+++ b/packages/app/src/stores/draft-store/state.test.ts
@@ -1,7 +1,33 @@
 import { describe, expect, it } from "vitest";
-import { applyClearDraftRecord, pruneFinalizedDraftRecords, toDraftInputIfReady } from "./state";
+import {
+  applyClearDraftRecord,
+  pruneFinalizedDraftRecords,
+  toDraftInputIfReady,
+  editDraftRecordText,
+  type DraftRecord,
+} from "./state";
 
 describe("draft-store lifecycle", () => {
+  it("edits text without invalidating attachment subscribers", () => {
+    const draft: DraftRecord = {
+      input: {
+        text: "hello",
+        attachments: [
+          { kind: "workspace_file", path: "README.md", selection: { kind: "whole_file" } },
+        ],
+      },
+      lifecycle: "active",
+      updatedAt: 1,
+      version: 1,
+    };
+    const edited = editDraftRecordText(draft, "hello\n", 2);
+    expect(edited.input.text).toBe("hello\n");
+    expect(edited.input.attachments).toBe(draft.input.attachments);
+    expect(edited.version).toBe(2);
+    expect(editDraftRecordText(edited, "hello\n", 3)).toBe(edited);
+    expect(editDraftRecordText(edited, "", 3).lifecycle).toBe("active");
+    expect(editDraftRecordText(undefined, "", 3).lifecycle).toBe("abandoned");
+  });
   it("prunes finalized tombstones after TTL", () => {
     const nowMs = 1_000_000;
     const drafts = {
diff --git a/packages/app/src/stores/draft-store/state.ts b/packages/app/src/stores/draft-store/state.ts
index 5d9fecd52f..4d88e507b4 100644
--- a/packages/app/src/stores/draft-store/state.ts
+++ b/packages/app/src/stores/draft-store/state.ts
@@ -32,6 +32,21 @@ export interface DraftRecord {
   version: number;
 }
 
+export function editDraftRecordText(
+  record: DraftRecord | undefined,
+  text: string,
+  now: number,
+): DraftRecord {
+  if (record?.lifecycle === "active" && record.input.text === text) return record;
+  const attachments = record?.lifecycle === "active" ? record.input.attachments : [];
+  return {
+    input: { text, attachments },
+    lifecycle: text.length > 0 || attachments.length > 0 ? "active" : "abandoned",
+    updatedAt: now,
+    version: (record?.version ?? 0) + 1,
+  };
+}
+
 export interface DraftStoreState {
   drafts: Record<string, DraftRecord>;
   createModalDraft: DraftRecord | null;
diff --git a/packages/app/src/stores/session-store.test.ts b/packages/app/src/stores/session-store.test.ts
index 3475f4779c..c53eae4c49 100644
--- a/packages/app/src/stores/session-store.test.ts
+++ b/packages/app/src/stores/session-store.test.ts
@@ -8,9 +8,57 @@ import {
   selectAgentTurnPresentation,
   selectAgentTimelineState,
   useSessionStore,
+  type Agent,
   type WorkspaceDescriptor,
 } from "./session-store";
 import type { StreamItem } from "../types/stream";
+import { reduceTurnLiveness, type TurnLivenessTransition } from "@/timeline/turn-liveness";
+
+function createTestAgent(agentId: string): Agent {
+  return {
+    serverId: "test-server",
+    id: agentId,
+    provider: "codex",
+    status: "idle",
+    turn: { phase: "idle", cancellationRequestId: null },
+    createdAt: new Date(0),
+    updatedAt: new Date(0),
+    lastUserMessageAt: null,
+    lastActivityAt: new Date(0),
+    capabilities: {
+      supportsStreaming: true,
+      supportsSessionPersistence: true,
+      supportsDynamicModes: false,
+      supportsMcpServers: false,
+      supportsReasoningStream: false,
+      supportsToolInvocations: false,
+    },
+    currentModeId: null,
+    availableModes: [],
+    pendingPermissions: [],
+    persistence: null,
+    title: null,
+    cwd: "/repo",
+    model: null,
+    parentAgentId: null,
+    labels: {},
+  };
+}
+
+function applyTestTurn(
+  serverId: string,
+  agentId: string,
+  transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
+): void {
+  useSessionStore.getState().setAgents(serverId, (agents) => {
+    const agent = agents.get(agentId) ?? createTestAgent(agentId);
+    const transitions = Array.isArray(transition) ? transition : [transition];
+    const turn = transitions.reduce(reduceTurnLiveness, agent.turn);
+    const next = new Map(agents);
+    next.set(agentId, { ...agent, status: turn.phase === "open" ? "running" : "idle", turn });
+    return next;
+  });
+}
 
 function createWorkspace(
   input: Partial<WorkspaceDescriptor> & Pick<WorkspaceDescriptor, "id">,
@@ -222,22 +270,25 @@ describe("agent timeline state", () => {
   it("stores turn liveness transitions without duplicating their policy", () => {
     initializeTestSession();
     const store = useSessionStore.getState();
-    store.applyAgentTurnLiveness("test-server", "agent-1", {
+    applyTestTurn("test-server", "agent-1", {
       type: "snapshot",
       activeTurn: { turnId: "turn-1", startedAt: null },
     });
-    expect(store.getSession("test-server")?.agentTurnLiveness.get("agent-1")).toEqual({
+    expect(store.getSession("test-server")?.agents.get("agent-1")?.turn).toEqual({
       phase: "open",
       turnId: "turn-1",
       startedAt: null,
       cancellationRequestId: null,
     });
 
-    store.applyAgentTurnLiveness("test-server", "agent-1", {
+    applyTestTurn("test-server", "agent-1", {
       type: "snapshot",
       activeTurn: null,
     });
-    expect(store.getSession("test-server")?.agentTurnLiveness.has("agent-1")).toBe(false);
+    expect(store.getSession("test-server")?.agents.get("agent-1")?.turn).toEqual({
+      phase: "idle",
+      cancellationRequestId: null,
+    });
   });
 });
 
@@ -267,27 +318,27 @@ describe("message submission ordering", () => {
       return;
     }
     if (step === "stream-open") {
-      store.applyAgentTurnLiveness("test-server", agentId, {
+      applyTestTurn("test-server", agentId, {
         type: "stream_open",
         turn: { turnId: "turn-1", startedAt },
       });
       return;
     }
     if (step === "snapshot-open") {
-      store.applyAgentTurnLiveness("test-server", agentId, {
+      applyTestTurn("test-server", agentId, {
         type: "snapshot",
         activeTurn: { turnId: "turn-1", startedAt },
       });
       return;
     }
     if (step === "snapshot-idle") {
-      store.applyAgentTurnLiveness("test-server", agentId, {
+      applyTestTurn("test-server", agentId, {
         type: "snapshot",
         activeTurn: null,
       });
       return;
     }
-    store.applyAgentTurnLiveness("test-server", agentId, {
+    applyTestTurn("test-server", agentId, {
       type: "stream_close",
       turnId: "turn-1",
     });
@@ -322,7 +373,7 @@ describe("message submission ordering", () => {
       store.setAgentStreamState("test-server", agentId, {
         acknowledgedClientMessageIds: [clientMessageId],
       });
-      store.applyAgentTurnLiveness("test-server", agentId, [
+      applyTestTurn("test-server", agentId, [
         { type: "stream_close", turnId: "turn-1" },
         { type: "snapshot", activeTurn: null },
       ]);
diff --git a/packages/app/src/stores/session-store.ts b/packages/app/src/stores/session-store.ts
index c2328a5b62..a741f99ddb 100644
--- a/packages/app/src/stores/session-store.ts
+++ b/packages/app/src/stores/session-store.ts
@@ -2,7 +2,7 @@ import equal from "fast-deep-equal";
 import { create } from "zustand";
 import { subscribeWithSelector } from "zustand/middleware";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { ViewedTimelineUiBridge } from "@/timeline/viewed-timeline-sync";
+import type { ViewedTimelineOwner } from "@/timeline/viewed-timeline-sync";
 import type { AgentDirectoryEntry } from "@/types/agent-directory";
 import {
   appendSubmittedUserMessage,
@@ -54,12 +54,10 @@ import {
   type WorkspaceAgentActivity,
 } from "@/utils/workspace-agent-activity";
 import {
-  applyTurnLivenessTransition,
   resolveTurnPresentation,
   TURN_LIVENESS_IDLE,
   type TurnLiveness,
   type TurnPresentation,
-  type TurnLivenessTransition,
 } from "@/timeline/turn-liveness";
 
 export interface AgentRuntimeInfo {
@@ -76,7 +74,7 @@ export interface Agent {
   id: string;
   provider: AgentProvider;
   status: AgentLifecycleStatus;
-  activeTurn: { turnId: string | null; startedAt: Date | null } | null;
+  turn: TurnLiveness;
   createdAt: Date;
   updatedAt: Date;
   lastUserMessageAt: Date | null;
@@ -115,6 +113,7 @@ export interface WorkspaceDescriptor {
   worktreeSlug?: WorkspaceDescriptorPayload["worktreeSlug"];
   projectKind: WorkspaceDescriptorPayload["projectKind"];
   workspaceKind: WorkspaceDescriptorPayload["workspaceKind"];
+  background?: boolean;
   name: string;
   title?: string | null;
   pinnedAt?: string | null;
@@ -152,6 +151,7 @@ export function normalizeWorkspaceDescriptor(
     worktreeSlug: payload.worktreeSlug,
     projectKind: payload.projectKind,
     workspaceKind: payload.workspaceKind,
+    background: payload.background ?? false,
     name: payload.name,
     title: payload.title ?? null,
     pinnedAt: payload.pinnedAt ?? null,
@@ -287,6 +287,19 @@ export interface DaemonServerInfo {
   features?: ServerInfoStatusPayload["features"];
 }
 
+export function toDaemonServerInfo(serverInfo: ServerInfoStatusPayload): DaemonServerInfo {
+  return {
+    serverId: serverInfo.serverId,
+    hostname: serverInfo.hostname ?? null,
+    version: serverInfo.version ?? null,
+    ...(serverInfo.desktopManaged !== undefined
+      ? { desktopManaged: serverInfo.desktopManaged }
+      : {}),
+    ...(serverInfo.capabilities ? { capabilities: serverInfo.capabilities } : {}),
+    ...(serverInfo.features ? { features: serverInfo.features } : {}),
+  };
+}
+
 export interface AgentTimelineCursorState {
   epoch: string;
   startSeq: number;
@@ -332,7 +345,9 @@ export function selectAgentTurnPresentation(
   agentId: string,
 ): TurnPresentation {
   return resolveTurnPresentation(
-    session?.agentTurnLiveness.get(agentId) ?? TURN_LIVENESS_IDLE,
+    session?.agents.get(agentId)?.turn ??
+      session?.agentDetails.get(agentId)?.turn ??
+      TURN_LIVENESS_IDLE,
     getActiveMessageSubmissions(session?.messageSubmissions.get(agentId)).length > 0,
   );
 }
@@ -366,7 +381,7 @@ export interface SessionState {
   // Daemon client (immutable reference)
   client: DaemonClient | null;
   clientGeneration: number;
-  viewedTimelineSync: ViewedTimelineUiBridge | null;
+  viewedTimelineSync: ViewedTimelineOwner | null;
 
   // Server metadata (from server_info handshake)
   serverInfo: DaemonServerInfo | null;
@@ -387,7 +402,6 @@ export interface SessionState {
   agentStreamTail: Map<string, StreamItem[]>;
   agentStreamHead: Map<string, StreamItem[]>;
   agentTasks: Map<string, TodoEntry[]>;
-  agentTurnLiveness: Map<string, TurnLiveness>;
   messageSubmissions: Map<string, MessageSubmissionRecord[]>;
   agentTimelineCursor: Map<string, AgentTimelineCursorState>;
   agentTimelineHasOlder: Map<string, boolean>;
@@ -443,7 +457,7 @@ interface SessionStoreActions {
   clearSession: (serverId: string) => void;
   getSession: (serverId: string) => SessionState | undefined;
   updateSessionClient: (serverId: string, client: DaemonClient, clientGeneration?: number) => void;
-  setViewedTimelineSync: (serverId: string, sync: ViewedTimelineUiBridge | null) => void;
+  setViewedTimelineSync: (serverId: string, sync: ViewedTimelineOwner | null) => void;
   updateSessionServerInfo: (serverId: string, info: DaemonServerInfo) => void;
 
   // Audio state
@@ -476,14 +490,6 @@ interface SessionStoreActions {
       taskSnapshot?: TodoEntry[];
     },
   ) => void;
-  applyAgentTurnLiveness: (
-    serverId: string,
-    agentId: string,
-    transition: TurnLivenessTransition | readonly TurnLivenessTransition[],
-  ) => void;
-  beginAgentCancellation: (serverId: string, agentId: string) => number;
-  settleAgentCancellation: (serverId: string, agentId: string, requestId: number) => void;
-  clearAgentTurnLiveness: (serverId: string) => void;
   beginAgentMessageSubmission: (
     serverId: string,
     agentId: string,
@@ -644,7 +650,6 @@ function createInitialSessionState(
     agentStreamTail: new Map(),
     agentStreamHead: new Map(),
     agentTasks: new Map(),
-    agentTurnLiveness: new Map(),
     messageSubmissions: new Map(),
     agentTimelineCursor: new Map(),
     agentTimelineHasOlder: new Map(),
@@ -711,7 +716,6 @@ function isSessionServerInfoUnchanged(input: {
 
 export const useSessionStore = create<SessionStore>()(
   subscribeWithSelector((set, get) => {
-    let nextCancellationRequestId = 0;
     const commitActivityUpdates: AgentLastActivityCommitter = (updates) => {
       set((prev) => {
         let nextActivity: Map<string, Date> | null = null;
@@ -1058,57 +1062,6 @@ export const useSessionStore = create<SessionStore>()(
         });
       },
 
-      applyAgentTurnLiveness: (serverId, agentId, transition) => {
-        set((prev) => {
-          const session = prev.sessions[serverId];
-          if (!session) return prev;
-          const agentTurnLiveness = applyTurnLivenessTransition(
-            session.agentTurnLiveness,
-            agentId,
-            transition,
-          );
-          if (agentTurnLiveness === session.agentTurnLiveness) return prev;
-          return {
-            ...prev,
-            sessions: {
-              ...prev.sessions,
-              [serverId]: { ...session, agentTurnLiveness },
-            },
-          };
-        });
-      },
-
-      beginAgentCancellation: (serverId, agentId) => {
-        nextCancellationRequestId += 1;
-        const requestId = nextCancellationRequestId;
-        get().applyAgentTurnLiveness(serverId, agentId, {
-          type: "cancellation_started",
-          requestId,
-        });
-        return requestId;
-      },
-
-      settleAgentCancellation: (serverId, agentId, requestId) => {
-        get().applyAgentTurnLiveness(serverId, agentId, {
-          type: "cancellation_settled",
-          requestId,
-        });
-      },
-
-      clearAgentTurnLiveness: (serverId) => {
-        set((prev) => {
-          const session = prev.sessions[serverId];
-          if (!session || session.agentTurnLiveness.size === 0) return prev;
-          return {
-            ...prev,
-            sessions: {
-              ...prev.sessions,
-              [serverId]: { ...session, agentTurnLiveness: new Map() },
-            },
-          };
-        });
-      },
-
       beginAgentMessageSubmission: (serverId, agentId, message) => {
         set((prev) => {
           const session = prev.sessions[serverId];
@@ -1924,6 +1877,7 @@ export const useSessionStore = create<SessionStore>()(
             serverId,
             title: agent.title ?? null,
             status: agent.status,
+            turn: agent.turn,
             lastActivityAt,
             cwd: agent.cwd,
             provider: agent.provider,
diff --git a/packages/app/src/stores/sidebar-order-store.test.ts b/packages/app/src/stores/sidebar-order-store.test.ts
index c58931ca69..a68ca206f9 100644
--- a/packages/app/src/stores/sidebar-order-store.test.ts
+++ b/packages/app/src/stores/sidebar-order-store.test.ts
@@ -1,5 +1,9 @@
-import { describe, expect, it } from "vitest";
-import { migrateSidebarOrderState } from "./sidebar-order-store";
+import { beforeEach, describe, expect, it } from "vitest";
+import {
+  computeSidebarOrderUpdates,
+  type SidebarProjectEntry,
+} from "@/hooks/sidebar-workspaces-view-model";
+import { migrateSidebarOrderState, useSidebarOrderStore } from "./sidebar-order-store";
 
 describe("migrateSidebarOrderState", () => {
   it("prefixes legacy per-server workspace order with the source server id", () => {
@@ -31,3 +35,71 @@ describe("migrateSidebarOrderState", () => {
     expect(migrated.pinnedWorkspaceOrder).toEqual(["host-a:one", "host-b:two"]);
   });
 });
+
+// A directory whose name ends in a space produces a view key that ends in a
+// space. Trimming it on write used to make the sidebar's reconcile effect loop
+// forever, crashing the app with React error #185 (see #4880).
+describe("sidebar order keys that end in whitespace", () => {
+  const PROJECT_KEY = "host:srv-1:/home/u/Reklamation ";
+
+  beforeEach(() => {
+    useSidebarOrderStore.setState({
+      projectOrder: [],
+      pinnedWorkspaceOrder: [],
+      workspaceOrderByProject: {},
+    });
+  });
+
+  it("stores a project key exactly as given", () => {
+    useSidebarOrderStore.getState().setProjectOrder([PROJECT_KEY]);
+
+    expect(useSidebarOrderStore.getState().projectOrder).toEqual([PROJECT_KEY]);
+  });
+
+  it("scopes a workspace order under the project key the sidebar indexes by", () => {
+    useSidebarOrderStore.getState().setWorkspaceOrder(PROJECT_KEY, ["srv-1:main"]);
+
+    // use-sidebar-workspaces-list reads workspaceOrderByProject by view key
+    // directly, so the scope has to be stored under that same key.
+    expect(useSidebarOrderStore.getState().workspaceOrderByProject[PROJECT_KEY]).toEqual([
+      "srv-1:main",
+    ]);
+    expect(useSidebarOrderStore.getState().getWorkspaceOrder(PROJECT_KEY)).toEqual(["srv-1:main"]);
+  });
+
+  it("settles the sidebar order reconcile instead of rewriting it forever", () => {
+    const projects: SidebarProjectEntry[] = [
+      {
+        viewKey: PROJECT_KEY,
+        projectName: "Reklamation ",
+        projectKind: "non_git",
+        iconWorkingDir: "/home/u/Reklamation ",
+        hosts: [],
+        workspaces: [],
+      },
+    ];
+    const runPass = () =>
+      computeSidebarOrderUpdates({
+        projects,
+        persistedProjectOrder: useSidebarOrderStore.getState().projectOrder,
+        getWorkspaceOrder: (key) => useSidebarOrderStore.getState().getWorkspaceOrder(key),
+      });
+
+    // First pass adds the newly visible project.
+    const first = runPass();
+    expect(first.projectOrder).toEqual([PROJECT_KEY]);
+    useSidebarOrderStore.getState().setProjectOrder(first.projectOrder ?? []);
+
+    // Second pass must find nothing left to do; otherwise the effect that
+    // applies these updates re-runs on every render.
+    expect(runPass().projectOrder).toBeNull();
+  });
+
+  it("still trims keys when migrating persisted state", () => {
+    const migrated = migrateSidebarOrderState({
+      projectOrder: [" host-a:one ", "host-a:one"],
+    });
+
+    expect(migrated.projectOrder).toEqual(["host-a:one"]);
+  });
+});
diff --git a/packages/app/src/stores/sidebar-order-store.ts b/packages/app/src/stores/sidebar-order-store.ts
index 27e7a190c8..10831480f8 100644
--- a/packages/app/src/stores/sidebar-order-store.ts
+++ b/packages/app/src/stores/sidebar-order-store.ts
@@ -38,6 +38,8 @@ interface SidebarWorkspaceOrderScope {
   projectViewKey: string;
 }
 
+// Trims each key. Only for persisted state read at migration time, where a
+// stray space is an artifact of an older format rather than part of the key.
 function normalizeKeys(keys: string[]): string[] {
   const seen = new Set<string>();
   const normalized: string[] = [];
@@ -54,6 +56,28 @@ function normalizeKeys(keys: string[]): string[] {
   return normalized;
 }
 
+/**
+ * Drops blank keys and duplicates but keeps each key exactly as given. View
+ * keys embed a project's path, so a directory whose name ends in a space
+ * produces a key that ends in a space. Trimming it stores a key that can never
+ * match the one the sidebar looks up, so the caller sees its key as missing,
+ * writes it again, and the effect that reconciles the order never settles.
+ */
+function dedupeKeys(keys: string[]): string[] {
+  const seen = new Set<string>();
+  const deduped: string[] = [];
+
+  for (const key of keys) {
+    if (!key.trim() || seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    deduped.push(key);
+  }
+
+  return deduped;
+}
+
 function normalizeWorkspaceOrderByProject(
   workspaceOrderByProject: Record<string, string[]> | undefined,
 ): Record<string, string[]> {
@@ -134,27 +158,22 @@ export const useSidebarOrderStore = create<SidebarOrderStoreState>()(
       workspaceOrderByProject: {},
       getProjectOrder: () => get().projectOrder,
       setProjectOrder: (keys) => {
-        const normalized = normalizeKeys(keys);
-        set({ projectOrder: normalized });
+        set({ projectOrder: dedupeKeys(keys) });
       },
       getPinnedWorkspaceOrder: () => get().pinnedWorkspaceOrder,
       setPinnedWorkspaceOrder: (keys) => {
-        const normalized = normalizeKeys(keys);
-        set({ pinnedWorkspaceOrder: normalized });
+        set({ pinnedWorkspaceOrder: dedupeKeys(keys) });
       },
       getWorkspaceOrder: (projectViewKey) => {
-        const scope = projectViewKey.trim();
-        if (!scope) return [];
-        return get().workspaceOrderByProject[scope] ?? [];
+        if (!projectViewKey.trim()) return [];
+        return get().workspaceOrderByProject[projectViewKey] ?? [];
       },
       setWorkspaceOrder: (projectViewKey, keys) => {
-        const scope = projectViewKey.trim();
-        if (!scope) return;
-        const normalized = normalizeKeys(keys);
+        if (!projectViewKey.trim()) return;
         set((state) => ({
           workspaceOrderByProject: {
             ...state.workspaceOrderByProject,
-            [scope]: normalized,
+            [projectViewKey]: dedupeKeys(keys),
           },
         }));
       },
diff --git a/packages/app/src/stores/sidebar-view-store.test.ts b/packages/app/src/stores/sidebar-view-store.test.ts
index b9df715fa2..e21c8f8a15 100644
--- a/packages/app/src/stores/sidebar-view-store.test.ts
+++ b/packages/app/src/stores/sidebar-view-store.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import type { StateStorage } from "zustand/middleware";
 import {
   createSidebarViewStorage,
@@ -8,14 +8,6 @@ import {
   useSidebarViewStore,
 } from "./sidebar-view-store";
 
-vi.mock("@react-native-async-storage/async-storage", () => ({
-  default: {
-    getItem: vi.fn().mockResolvedValue(null),
-    setItem: vi.fn().mockResolvedValue(undefined),
-    removeItem: vi.fn().mockResolvedValue(undefined),
-  },
-}));
-
 interface MemoryStorage extends StateStorage<Promise<void>> {
   reads: string[];
 }
@@ -40,6 +32,7 @@ function createMemoryStorage(entries: Record<string, string | null>): MemoryStor
 describe("sidebar view store", () => {
   beforeEach(() => {
     useSidebarViewStore.setState({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
@@ -92,6 +85,7 @@ describe("sidebar view store", () => {
         },
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: [],
       projectFilters: [],
@@ -106,6 +100,7 @@ describe("sidebar view store", () => {
         hostFilter: "host-a",
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: ["host-a"],
       projectFilters: [],
@@ -120,6 +115,7 @@ describe("sidebar view store", () => {
         hostFilters: ["host-a", "host-b"],
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: ["host-a", "host-b"],
       projectFilters: [],
@@ -230,6 +226,7 @@ describe("sidebar view store", () => {
         projectFilters: ["project-a", "project-b"],
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "project",
       hostFilters: ["host-a"],
       projectFilters: ["project-a", "project-b"],
@@ -239,6 +236,7 @@ describe("sidebar view store", () => {
 
   it("never keeps project filters from state the schema rejects", () => {
     expect(migrateSidebarViewState({ projectFilters: "project-a" })).toEqual({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
diff --git a/packages/app/src/stores/sidebar-view-store.ts b/packages/app/src/stores/sidebar-view-store.ts
index 19f559c89d..0e12c304a8 100644
--- a/packages/app/src/stores/sidebar-view-store.ts
+++ b/packages/app/src/stores/sidebar-view-store.ts
@@ -9,7 +9,7 @@ export type SidebarGroupMode = "project" | "status";
 
 const SIDEBAR_VIEW_STORAGE_KEY = "sidebar-view";
 const LEGACY_SIDEBAR_GROUP_MODE_STORAGE_KEY = "sidebar-group-mode";
-const SIDEBAR_VIEW_STORE_VERSION = 6;
+const SIDEBAR_VIEW_STORE_VERSION = 7;
 
 /**
  * The key standing for "this workspace carries no labels at all".
@@ -47,6 +47,7 @@ function toggleFilterEntry(list: readonly string[], key: string): string[] {
 
 interface SidebarViewStoreState {
   groupMode: SidebarGroupMode;
+  showBackground: boolean;
   // Empty means "all hosts". A non-empty list pins the sidebar to those hosts.
   hostFilters: string[];
   /**
@@ -61,6 +62,7 @@ interface SidebarViewStoreState {
    */
   projectFilters: string[];
   labelFilter: SidebarLabelFilter;
+  toggleBackground: () => void;
   setGroupMode: (mode: SidebarGroupMode) => void;
   toggleHostFilter: (serverId: string) => void;
   clearHostFilters: () => void;
@@ -74,6 +76,7 @@ interface SidebarViewStoreState {
 
 interface SidebarViewPersistedState {
   groupMode: SidebarGroupMode;
+  showBackground: boolean;
   hostFilters: string[];
   projectFilters: string[];
   labelFilter: SidebarLabelFilter;
@@ -84,6 +87,7 @@ const SidebarLabelFilterSchema = z.object({
   labels: z.array(z.string()),
 });
 const SidebarViewPersistedStateSchema = z.strictObject({
+  showBackground: z.boolean().optional(),
   groupMode: PersistedSidebarGroupModeSchema.optional(),
   hostFilters: z.array(z.string()).optional(),
   hostFilter: z.string().nullable().optional(),
@@ -122,6 +126,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   const result = SidebarViewPersistedStateSchema.safeParse(persistedState);
   if (!result.success) {
     return {
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
@@ -133,6 +138,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   const legacyGroupMode = readLegacyGroupMode(state);
   if (legacyGroupMode) {
     return {
+      showBackground: false,
       groupMode: legacyGroupMode,
       hostFilters: [],
       projectFilters: [],
@@ -141,6 +147,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   }
 
   return {
+    showBackground: state.showBackground ?? false,
     groupMode: state.groupMode === "status" ? "status" : "project",
     hostFilters: readHostFilters(state),
     projectFilters: state.projectFilters ?? [],
@@ -178,10 +185,12 @@ export function createSidebarViewStorage(
 export const useSidebarViewStore = create<SidebarViewStoreState>()(
   persist(
     (set) => ({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
       labelFilter: emptyLabelFilter(),
+      toggleBackground: () => set((state) => ({ showBackground: !state.showBackground })),
       setGroupMode: (mode) => set({ groupMode: mode }),
       toggleHostFilter: (serverId) =>
         set((state) => ({ hostFilters: toggleFilterEntry(state.hostFilters, serverId) })),
@@ -228,6 +237,7 @@ export const useSidebarViewStore = create<SidebarViewStoreState>()(
         SidebarViewPersistedStateSchema,
       ),
       partialize: (state) => ({
+        showBackground: state.showBackground ?? false,
         groupMode: state.groupMode,
         hostFilters: state.hostFilters,
         projectFilters: state.projectFilters,
diff --git a/packages/app/src/stores/workspace-draft-submission-store.test.ts b/packages/app/src/stores/workspace-draft-submission-store.test.ts
new file mode 100644
index 0000000000..73e1a40899
--- /dev/null
+++ b/packages/app/src/stores/workspace-draft-submission-store.test.ts
@@ -0,0 +1,71 @@
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+import { transformFileSync } from "@babel/core";
+import { expect, test } from "vitest";
+import type { useWorkspaceDraftSubmissionStore } from "./workspace-draft-submission-store";
+
+// Exercise the emitted app code: plain TypeScript execution misses Expo's omit bug.
+function loadProductionStore() {
+  const filename = fileURLToPath(new URL("./workspace-draft-submission-store.ts", import.meta.url));
+  const caller = { name: "metro", platform: "web", isDev: false, supportsStaticESM: false };
+  const result = transformFileSync(filename, {
+    cwd: fileURLToPath(new URL("../../", import.meta.url)),
+    envName: "production",
+    caller,
+  });
+  if (!result?.code) throw new Error("Expo produced no store code");
+  const module = {
+    exports: {} as { useWorkspaceDraftSubmissionStore: typeof useWorkspaceDraftSubmissionStore },
+  };
+  new Function("require", "module", "exports", result.code)(
+    createRequire(import.meta.url),
+    module,
+    module.exports,
+  );
+  return module.exports.useWorkspaceDraftSubmissionStore;
+}
+
+test("the production app consumes a draft once and leaves other drafts pending", () => {
+  const store = loadProductionStore();
+  const submission = {
+    serverId: "server",
+    workspaceId: "workspace",
+    draftId: "draft-1",
+    text: "hello",
+    attachments: [],
+    cwd: "/repo",
+    provider: "codex",
+    clientMessageId: "message",
+    timestamp: 1,
+  } as const;
+  store.getState().setPending({ ...submission, attachments: [] });
+  store.getState().setPending({ ...submission, attachments: [], draftId: "draft-2" });
+  expect(store.getState().consumePending({ ...submission, workspaceId: "wrong" })).toBeNull();
+  expect(store.getState().consumePending(submission)).toEqual(submission);
+  expect(store.getState().consumePending(submission)).toBeNull();
+  expect(Object.keys(store.getState().pendingByDraftId)).toEqual(["draft-2"]);
+});
+
+test("consuming draft presentation retains its running creation through remount and retry", () => {
+  const store = loadProductionStore();
+  const result = new Promise<never>(() => {});
+  const creation = { result, retry: () => result };
+  const submission = {
+    serverId: "server",
+    workspaceId: "workspace",
+    draftId: "draft-one",
+    text: "hello",
+    attachments: [],
+    cwd: "/repo",
+    provider: "codex",
+    clientMessageId: "message",
+    timestamp: 1,
+    agentCreation: creation,
+  };
+  store.getState().setPending(submission);
+  store.getState().consumePending(submission);
+  expect(store.getState().pendingByDraftId[submission.draftId]).toBeUndefined();
+  expect(store.getState().creationByDraftId[submission.draftId]).toBe(creation);
+  store.getState().clearDraftSetup({ draftId: submission.draftId });
+  expect(store.getState().creationByDraftId[submission.draftId]).toBeUndefined();
+});
diff --git a/packages/app/src/stores/workspace-draft-submission-store.ts b/packages/app/src/stores/workspace-draft-submission-store.ts
index 2dbd27f2a5..639701d740 100644
--- a/packages/app/src/stores/workspace-draft-submission-store.ts
+++ b/packages/app/src/stores/workspace-draft-submission-store.ts
@@ -1,9 +1,16 @@
+import type { CreateAgentRequestOptions } from "@getpaseo/client/internal/daemon-client";
+import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
 import { create } from "zustand";
 import type { ComposerAttachment } from "@/attachments/types";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { WorkspaceDraftTabSetup } from "@/workspace-tabs/model";
 
 export interface PendingWorkspaceDraftSubmission {
+  /** Already-running creation. Mounting the draft only observes its result. */
+  agentCreation?: {
+    result: Promise<AgentSnapshotPayload>;
+    retry: (input: CreateAgentRequestOptions) => Promise<AgentSnapshotPayload>;
+  };
   serverId: string;
   workspaceId: string;
   draftId: string;
@@ -28,6 +35,7 @@ export interface PendingWorkspaceDraftSetup {
 interface WorkspaceDraftSubmissionState {
   pendingByDraftId: Record<string, PendingWorkspaceDraftSubmission>;
   setupByDraftId: Record<string, PendingWorkspaceDraftSetup>;
+  creationByDraftId: Record<string, NonNullable<PendingWorkspaceDraftSubmission["agentCreation"]>>;
   setPending: (submission: PendingWorkspaceDraftSubmission) => void;
   setDraftSetup: (input: {
     draftId: string;
@@ -61,8 +69,12 @@ export const useWorkspaceDraftSubmissionStore = create<WorkspaceDraftSubmissionS
   (set, get) => ({
     pendingByDraftId: {},
     setupByDraftId: {},
+    creationByDraftId: {},
     setPending: (submission) =>
       set((state) => ({
+        creationByDraftId: submission.agentCreation
+          ? { ...state.creationByDraftId, [submission.draftId]: submission.agentCreation }
+          : state.creationByDraftId,
         pendingByDraftId: {
           ...state.pendingByDraftId,
           [submission.draftId]: submission,
@@ -82,9 +94,10 @@ export const useWorkspaceDraftSubmissionStore = create<WorkspaceDraftSubmissionS
       const normalizedDraftId = normalizeDraftId(draftId);
       if (!normalizedDraftId) return;
       set((state) => {
-        if (!state.setupByDraftId[normalizedDraftId]) return state;
+        const creationByDraftId = { ...state.creationByDraftId };
+        delete creationByDraftId[normalizedDraftId];
         const { [normalizedDraftId]: _removed, ...setupByDraftId } = state.setupByDraftId;
-        return { setupByDraftId };
+        return { setupByDraftId, creationByDraftId };
       });
     },
     consumePending: (input) => {
@@ -96,8 +109,10 @@ export const useWorkspaceDraftSubmissionStore = create<WorkspaceDraftSubmissionS
         if (!matchesPendingSubmission(state.pendingByDraftId[input.draftId], input)) {
           return state;
         }
-        const { [input.draftId]: _removed, ...rest } = state.pendingByDraftId;
-        return { pendingByDraftId: rest };
+        // Expo miscompiles computed member-key rest omissions; test the emitted code.
+        const pendingByDraftId = { ...state.pendingByDraftId };
+        delete pendingByDraftId[input.draftId];
+        return { pendingByDraftId };
       });
       return pending;
     },
diff --git a/packages/app/src/stores/workspace-layout-actions.ts b/packages/app/src/stores/workspace-layout-actions.ts
index 9496479f4e..5e87c2eb65 100644
--- a/packages/app/src/stores/workspace-layout-actions.ts
+++ b/packages/app/src/stores/workspace-layout-actions.ts
@@ -11,7 +11,6 @@ import {
   workspaceTabTargetsEqual,
 } from "@/workspace-tabs/identity";
 import { createNewWorkspaceTab } from "@/workspace-tabs/new-tab";
-import { generateDraftId } from "@/stores/draft-keys";
 
 export interface SplitPane {
   id: string;
@@ -85,6 +84,7 @@ interface DetachTabFromTreeResult {
 }
 
 interface InsertTabIntoPaneInput {
+  insertionPosition?: WorkspaceTabInsertionPosition;
   paneId: string;
   tab: WorkspaceTab;
   focusTabId?: string | null;
@@ -125,7 +125,12 @@ export type WorkspaceTabPlacement =
 export const FOCUSED_PANE_PLACEMENT: WorkspaceTabPlacement = { mode: "focused" };
 export const AMBIENT_PLACEMENT: WorkspaceTabPlacement = { mode: "ambient" };
 
+export interface WorkspaceTabInsertionPosition {
+  afterTabId: string;
+}
+
 interface OpenTabInLayoutInput {
+  insertionPosition?: WorkspaceTabInsertionPosition;
   layout: WorkspaceLayout;
   target: WorkspaceTabTarget;
   now: number;
@@ -145,12 +150,16 @@ interface OpenTabInLayoutResult {
 }
 
 interface RetargetTabInLayoutInput {
+  explorerSidebarPaneId: string | null;
   layout: WorkspaceLayout;
   tabId: string;
   target: WorkspaceTabTarget;
 }
 
-interface ReplaceTabTargetInLayoutInput extends RetargetTabInLayoutInput {
+interface ReplaceTabTargetInLayoutInput extends Omit<
+  RetargetTabInLayoutInput,
+  "explorerSidebarPaneId"
+> {
   createTabId: () => string;
   state?: JsonValue;
 }
@@ -161,6 +170,7 @@ interface RetargetTabInLayoutResult {
 }
 
 interface ConvertDraftToAgentInLayoutInput {
+  explorerSidebarPaneId: string | null;
   layout: WorkspaceLayout;
   tabId: string;
   agentId: string;
@@ -179,7 +189,7 @@ interface ReorderFocusedPaneTabsInLayoutInput {
 interface CloseTabInLayoutInput {
   layout: WorkspaceLayout;
   tabId: string;
-  preserveEmptyPaneId?: string | null;
+  explorerSidebarPaneId: string | null;
 }
 
 interface ClosePaneInLayoutInput {
@@ -252,7 +262,6 @@ interface ReorderPaneTabsInLayoutInput {
 export interface WorkspaceTabReconcileState {
   layout: WorkspaceLayout;
   pinnedAgentIds?: ReadonlySet<string> | null;
-  pendingAgentIds?: ReadonlySet<string> | null;
   hiddenAgentIds?: ReadonlySet<string> | null;
   explorerSidebarPaneId: string | null;
 }
@@ -262,7 +271,6 @@ export interface WorkspaceTabSnapshot {
   terminalsHydrated: boolean;
   activeAgentIds: Iterable<string>;
   autoOpenAgentIds: Iterable<string>;
-  knownAgentIds: Iterable<string>;
   knownTerminalIds?: Iterable<string>;
   standaloneTerminalIds: Iterable<string>;
   hasActivePendingTerminalCreate?: boolean;
@@ -846,7 +854,11 @@ function insertTabIntoPane(
     } else if (existingIndex >= 0) {
       nextTabs = node.pane.tabs.map((tab, index) => (index === existingIndex ? input.tab : tab));
     } else {
-      nextTabs = [...node.pane.tabs, input.tab];
+      nextTabs = [...node.pane.tabs];
+      const afterIndex = nextTabs.findIndex(
+        (tab) => tab.tabId === input.insertionPosition?.afterTabId,
+      );
+      nextTabs.splice(afterIndex >= 0 ? afterIndex + 1 : nextTabs.length, 0, input.tab);
     }
     return {
       kind: "pane",
@@ -1159,14 +1171,54 @@ function restoreEmptyPanesInNode(
   });
 }
 
-export function restoreEmptyPanesInLayout(
+function findOrdinaryPane(
+  root: SplitNodeInternal,
+  explorerSidebarPaneId: string | null,
+): SplitPaneInternal | null {
+  if (root.kind === "pane") return root.pane.id === explorerSidebarPaneId ? null : root.pane;
+  for (const child of root.group.children) {
+    const pane = findOrdinaryPane(child, explorerSidebarPaneId);
+    if (pane) return pane;
+  }
+  return null;
+}
+
+/** Restores the workspace canvas and empty tabs without changing Explorer or saved content. */
+export function restoreWorkspaceLayout(
   layout: WorkspaceLayout,
-  explorerSidebarPaneId: string | null = null,
+  explorerSidebarPaneId: string | null,
+  createNodeId = defaultWorkspaceLayoutIds.createNodeId,
 ): WorkspaceLayout {
   const normalized = normalizeLayout(layout);
+  let root = asInternalNode(normalized.root);
+  let focusedPaneId = normalized.focusedPaneId;
+  if (!collectAllPanes(root).some((pane) => pane.id !== explorerSidebarPaneId)) {
+    const ordinaryPane = findOrdinaryPane(root, explorerSidebarPaneId);
+    if (ordinaryPane) {
+      root = updatePaneInTree(root, {
+        paneId: ordinaryPane.id,
+        updater: (pane) => ({ ...pane, hidden: false }),
+      });
+      focusedPaneId = ordinaryPane.id;
+    } else {
+      // Explorer may have a generated persisted id; its role, not its spelling,
+      // determines whether it can serve as the workspace canvas.
+      focusedPaneId = DEFAULT_PANE_ID;
+      if (explorerSidebarPaneId === DEFAULT_PANE_ID) {
+        focusedPaneId = createNodeId("pane");
+      }
+      root = createGroupNode({
+        id: createNodeId("group"),
+        direction: "horizontal",
+        children: [createPaneNode({ id: focusedPaneId, tabs: [] }), root],
+        sizes: [0.78, 0.22],
+      });
+    }
+  }
   return {
     ...normalized,
-    root: restoreEmptyPanesInNode(asInternalNode(normalized.root), explorerSidebarPaneId),
+    focusedPaneId,
+    root: restoreEmptyPanesInNode(root, explorerSidebarPaneId),
   };
 }
 
@@ -1338,6 +1390,7 @@ function insertNewTabIntoPane(
       root: insertTabIntoPane(layout.root, {
         paneId: targetPane.id,
         tab: nextTab,
+        insertionPosition: input.insertionPosition,
         focusTabId: input.focus ? tabId : preservedFocusTabId,
       }),
       focusedPaneId: input.focus ? targetPane.id : layout.focusedPaneId,
@@ -1472,8 +1525,11 @@ export function closeTabInLayout(input: CloseTabInLayoutInput): WorkspaceLayout
     return null;
   }
   const preserveEmptyPaneId =
-    input.preserveEmptyPaneId ??
-    (pane.id === DEFAULT_PANE_ID || pane.id === EXPLORER_SIDEBAR_PANE_ID ? pane.id : null);
+    pane.id === DEFAULT_PANE_ID ||
+    pane.id === input.explorerSidebarPaneId ||
+    isLastVisibleOrdinaryPane(input.layout, pane.id, input.explorerSidebarPaneId)
+      ? pane.id
+      : null;
 
   const closeSuccessorTabId = getCloseSuccessorTabId({
     pane,
@@ -1516,6 +1572,17 @@ export function closeTabInLayout(input: CloseTabInLayoutInput): WorkspaceLayout
   return nextLayoutWithParentMap;
 }
 
+function isLastVisibleOrdinaryPane(
+  layout: WorkspaceLayout,
+  paneId: string,
+  explorerSidebarPaneId: string | null | undefined,
+): boolean {
+  const ordinaryPanes = collectAllPanes(layout.root).filter(
+    (pane) => pane.id !== explorerSidebarPaneId,
+  );
+  return ordinaryPanes.length === 1 && ordinaryPanes[0].id === paneId;
+}
+
 /**
  * Whether dismissing this pane would do anything — removing it, or hiding it if it
  * is the Explorer sidebar. A workspace always has somewhere to look, so the last pane the
@@ -1535,10 +1602,9 @@ export function canDismissPaneInLayout(
   if (!pane || pane.hidden === true) {
     return false;
   }
-  const ordinaryPanes = collectAllPanes(layout.root).filter(
-    (candidate) => candidate.id !== explorerSidebarPaneId,
-  );
-  return paneId === explorerSidebarPaneId ? ordinaryPanes.length > 0 : ordinaryPanes.length > 1;
+  return paneId === explorerSidebarPaneId
+    ? collectAllPanes(layout.root).some((candidate) => candidate.id !== explorerSidebarPaneId)
+    : !isLastVisibleOrdinaryPane(layout, paneId, explorerSidebarPaneId);
 }
 
 /**
@@ -1555,14 +1621,7 @@ export function closePaneInLayout(input: ClosePaneInLayoutInput): WorkspaceLayou
   if (!panePath) {
     return null;
   }
-  const visibleOrdinaryPaneIds = listPaneIds(layout.root).filter(
-    (paneId) => paneId !== input.explorerSidebarPaneId,
-  );
-  if (
-    input.paneId !== input.explorerSidebarPaneId &&
-    visibleOrdinaryPaneIds.length <= 1 &&
-    visibleOrdinaryPaneIds.includes(input.paneId)
-  ) {
+  if (isLastVisibleOrdinaryPane(input.layout, input.paneId, input.explorerSidebarPaneId)) {
     return null;
   }
 
@@ -1645,6 +1704,7 @@ export function retargetTabInLayout(
       closeTabInLayout({
         layout: input.layout,
         tabId: input.tabId,
+        explorerSidebarPaneId: input.explorerSidebarPaneId,
       }) ?? input.layout;
     return {
       layout:
@@ -1808,6 +1868,7 @@ export function convertDraftToAgentInLayout(
       closeTabInLayout({
         layout: input.layout,
         tabId: input.tabId,
+        explorerSidebarPaneId: input.explorerSidebarPaneId,
       }) ?? input.layout;
     return {
       layout:
@@ -2238,17 +2299,10 @@ interface EntityTabGroup {
 function applyPinnedAndHidden(input: {
   baseAgentIds: Set<string>;
   pinnedAgentIds: Set<string>;
-  pendingAgentIds: Set<string>;
   hiddenAgentIds: Set<string>;
-  knownAgentIds: Set<string>;
 }): Set<string> {
-  const { baseAgentIds, pinnedAgentIds, pendingAgentIds, hiddenAgentIds, knownAgentIds } = input;
-  const result = new Set(baseAgentIds);
-  for (const agentId of pinnedAgentIds) {
-    if (knownAgentIds.has(agentId) || pendingAgentIds.has(agentId)) {
-      result.add(agentId);
-    }
-  }
+  const { baseAgentIds, pinnedAgentIds, hiddenAgentIds } = input;
+  const result = new Set([...baseAgentIds, ...pinnedAgentIds]);
   for (const agentId of hiddenAgentIds) {
     result.delete(agentId);
   }
@@ -2284,6 +2338,7 @@ function collapseStaleEntityTabs(input: {
   snapshot: WorkspaceTabSnapshot;
   visibleAgentIds: Set<string>;
   knownTerminalIds: Set<string>;
+  explorerSidebarPaneId: string | null;
 }): WorkspaceLayout {
   const { snapshot, visibleAgentIds, knownTerminalIds } = input;
   let nextLayout = input.layout;
@@ -2293,6 +2348,7 @@ function collapseStaleEntityTabs(input: {
         closeTabInLayout({
           layout: nextLayout,
           tabId: tab.tabId,
+          explorerSidebarPaneId: input.explorerSidebarPaneId,
         }) ?? nextLayout;
     }
     if (
@@ -2304,6 +2360,7 @@ function collapseStaleEntityTabs(input: {
         closeTabInLayout({
           layout: nextLayout,
           tabId: tab.tabId,
+          explorerSidebarPaneId: input.explorerSidebarPaneId,
         }) ?? nextLayout;
     }
   }
@@ -2369,43 +2426,6 @@ function addMissingEntityTabs(input: {
   return nextLayout;
 }
 
-function seedDraftForEmptyWorkspace(input: {
-  layout: WorkspaceLayout;
-  snapshot: WorkspaceTabSnapshot;
-  activeAgentIds: Set<string>;
-  knownTerminalIds: Set<string>;
-  explorerSidebarPaneId: string | null;
-}): WorkspaceLayout {
-  const ready = input.snapshot.agentsHydrated && input.snapshot.terminalsHydrated;
-  const creatingContent =
-    input.snapshot.hasActivePendingDraftCreate === true ||
-    input.snapshot.hasActivePendingTerminalCreate === true;
-  const hasWorkspaceEntities = input.activeAgentIds.size > 0 || input.knownTerminalIds.size > 0;
-  const explorerTabIds = new Set(
-    input.explorerSidebarPaneId
-      ? (findPaneById(input.layout.root, input.explorerSidebarPaneId)?.tabIds ?? [])
-      : [],
-  );
-  const hasContentTab = collectAllTabs(input.layout.root).some(
-    (tab) => tab.target.kind !== "new_tab" && !explorerTabIds.has(tab.tabId),
-  );
-  if (!ready || creatingContent || hasWorkspaceEntities || hasContentTab) {
-    return input.layout;
-  }
-
-  const draftId = generateDraftId();
-  return (
-    createTabInLayout({
-      layout: input.layout,
-      target: { kind: "draft", draftId },
-      now: Date.now(),
-      placement: FOCUSED_PANE_PLACEMENT,
-      explorerSidebarPaneId: input.explorerSidebarPaneId,
-      createTabId: () => draftId,
-    })?.layout ?? input.layout
-  );
-}
-
 export function reconcileWorkspaceTabs(
   state: WorkspaceTabReconcileState,
   snapshot: WorkspaceTabSnapshot,
@@ -2414,12 +2434,17 @@ export function reconcileWorkspaceTabs(
   const originalFocusedTabId =
     findPaneById(nextLayout.root, nextLayout.focusedPaneId)?.focusedTabId ?? null;
   let reconciledFocusedTabId = originalFocusedTabId;
-  const pinnedAgentIds = new Set(state.pinnedAgentIds ?? []);
-  const pendingAgentIds = new Set(state.pendingAgentIds ?? []);
   const hiddenAgentIds = new Set(state.hiddenAgentIds ?? []);
   const activeAgentIds = normalizeStringSet(snapshot.activeAgentIds);
   const autoOpenAgentIds = normalizeStringSet(snapshot.autoOpenAgentIds);
-  const knownAgentIds = normalizeStringSet(snapshot.knownAgentIds);
+  // An explicit open owns the tab until the agent joins the active directory.
+  // From then on it follows the normal server archive lifecycle. Detail/cache
+  // hydration never decides whether the user's target is allowed to stay open.
+  const pinnedAgentIds = new Set(
+    [...(state.pinnedAgentIds ?? [])].filter(
+      (agentId) => !snapshot.agentsHydrated || !activeAgentIds.has(agentId),
+    ),
+  );
   const standaloneTerminalIds = normalizeStringSet(snapshot.standaloneTerminalIds);
   const knownTerminalIds = snapshot.knownTerminalIds
     ? normalizeStringSet(snapshot.knownTerminalIds)
@@ -2427,16 +2452,12 @@ export function reconcileWorkspaceTabs(
   const visibleAgentIds = applyPinnedAndHidden({
     baseAgentIds: activeAgentIds,
     pinnedAgentIds,
-    pendingAgentIds,
     hiddenAgentIds,
-    knownAgentIds,
   });
   const autoOpenSet = applyPinnedAndHidden({
     baseAgentIds: autoOpenAgentIds,
     pinnedAgentIds,
-    pendingAgentIds,
     hiddenAgentIds,
-    knownAgentIds,
   });
 
   const initialTabs = collectAllTabs(nextLayout.root);
@@ -2473,6 +2494,7 @@ export function reconcileWorkspaceTabs(
         closeTabInLayout({
           layout: nextLayout,
           tabId: tab.tabId,
+          explorerSidebarPaneId: state.explorerSidebarPaneId,
         }) ?? nextLayout;
     }
   }
@@ -2482,6 +2504,7 @@ export function reconcileWorkspaceTabs(
     snapshot,
     visibleAgentIds,
     knownTerminalIds,
+    explorerSidebarPaneId: state.explorerSidebarPaneId,
   });
 
   nextLayout = addMissingEntityTabs({
@@ -2494,14 +2517,6 @@ export function reconcileWorkspaceTabs(
     explorerSidebarPaneId: state.explorerSidebarPaneId,
   });
 
-  nextLayout = seedDraftForEmptyWorkspace({
-    layout: nextLayout,
-    snapshot,
-    activeAgentIds,
-    knownTerminalIds,
-    explorerSidebarPaneId: state.explorerSidebarPaneId,
-  });
-
   if (reconciledFocusedTabId) {
     nextLayout =
       focusTabInLayout({
@@ -2513,5 +2528,6 @@ export function reconcileWorkspaceTabs(
   return {
     ...state,
     layout: nextLayout,
+    pinnedAgentIds,
   };
 }
diff --git a/packages/app/src/stores/workspace-layout-storage.ts b/packages/app/src/stores/workspace-layout-storage.ts
new file mode 100644
index 0000000000..c105d40a06
--- /dev/null
+++ b/packages/app/src/stores/workspace-layout-storage.ts
@@ -0,0 +1,115 @@
+import { z } from "zod";
+import type { SplitNode, WorkspaceLayout } from "./workspace-layout-actions";
+
+const WorkspaceDraftTabSetupStorageSchema = z.strictObject({
+  provider: z.string(),
+  cwd: z.string(),
+  modeId: z.string().nullable(),
+  model: z.string().nullable(),
+  thinkingOptionId: z.string().nullable(),
+  featureValues: z.record(z.string(), z.union([z.boolean(), z.string(), z.null()])),
+});
+const WorkspaceTabTargetStorageSchema = z.discriminatedUnion("kind", [
+  z.strictObject({ kind: z.literal("new_tab") }),
+  z.strictObject({
+    kind: z.literal("draft"),
+    draftId: z.string(),
+    setup: WorkspaceDraftTabSetupStorageSchema.optional(),
+  }),
+  z.strictObject({ kind: z.literal("agent"), agentId: z.string() }),
+  z.strictObject({
+    kind: z.literal("provider_subagent"),
+    parentAgentId: z.string(),
+    subagentId: z.string(),
+  }),
+  z.strictObject({ kind: z.literal("terminal"), terminalId: z.string() }),
+  z.strictObject({ kind: z.literal("browser"), browserId: z.string() }),
+  z.strictObject({ kind: z.literal("changes_tree") }),
+  z.strictObject({ kind: z.literal("files") }),
+  z.strictObject({ kind: z.literal("pull_request") }),
+  z.strictObject({
+    kind: z.literal("file"),
+    path: z.string(),
+    lineStart: z.number().int().positive().optional(),
+    lineEnd: z.number().int().positive().optional(),
+  }),
+  z.strictObject({
+    kind: z.literal("working_diff"),
+    focusPath: z.string().optional(),
+    focusRequestId: z.number().optional(),
+    // COMPAT(workingDiffTarget): accepted from pre-canonical tab ids; normalization removes them.
+    mode: z.enum(["uncommitted", "base"]).optional(),
+    baseRef: z.string().nullable().optional(),
+    ignoreWhitespace: z.boolean().optional(),
+  }),
+  z.strictObject({ kind: z.literal("setup"), workspaceId: z.string() }),
+  z.strictObject({ kind: z.literal("commit_diff"), sha: z.string() }),
+  z.discriminatedUnion("context", [
+    z.strictObject({
+      kind: z.literal("plugin"),
+      pluginId: z.string(),
+      panelId: z.string(),
+      context: z.literal("workspace"),
+    }),
+    z.strictObject({
+      kind: z.literal("plugin"),
+      pluginId: z.string(),
+      panelId: z.string(),
+      context: z.literal("agent"),
+      agentId: z.string(),
+    }),
+  ]),
+]);
+const WorkspaceTabStorageSchema = z.strictObject({
+  tabId: z.string(),
+  target: WorkspaceTabTargetStorageSchema,
+  createdAt: z.number(),
+  state: z.json().optional(),
+});
+const SplitNodeStorageSchema: z.ZodType<SplitNode> = z.lazy(() =>
+  z.discriminatedUnion("kind", [
+    z.strictObject({
+      kind: z.literal("pane"),
+      pane: z.strictObject({
+        id: z.string(),
+        tabIds: z.array(z.string()),
+        focusedTabId: z.string().nullable(),
+        tabs: z.array(WorkspaceTabStorageSchema).optional(),
+        hidden: z.boolean().optional(),
+      }),
+    }),
+    z.strictObject({
+      kind: z.literal("group"),
+      group: z.strictObject({
+        id: z.string(),
+        direction: z.enum(["horizontal", "vertical"]),
+        children: z.array(SplitNodeStorageSchema),
+        sizes: z.array(z.number()),
+      }),
+    }),
+  ]),
+);
+const WorkspaceLayoutStorageSchema: z.ZodType<WorkspaceLayout> = z.strictObject({
+  root: SplitNodeStorageSchema,
+  focusedPaneId: z.string().nullable(),
+  parentTabIdByTabId: z.record(z.string(), z.string()).optional(),
+});
+export const WorkspaceLayoutPersistedStateSchema = z.strictObject({
+  pinnedAgentIdsByWorkspace: z.record(z.string(), z.array(z.string())).optional(),
+  layoutByWorkspace: z.record(z.string(), WorkspaceLayoutStorageSchema),
+  splitSizesByWorkspace: z.record(z.string(), z.record(z.string(), z.array(z.number()))).optional(),
+  explorerSidebarWidthByWorkspace: z.record(z.string(), z.number()).optional(),
+  // COMPAT(explorerSidebarWidth): added in v0.6, remove after 2027-08-25.
+  explorerSidebarRatioByWorkspace: z.record(z.string(), z.number()).optional(),
+  // COMPAT(explorerSidebarNaming): accepted from builds that called this dock the Side panel.
+  sidePanelRatioByWorkspace: z.record(z.string(), z.number()).optional(),
+  // The persisted keys keep their pre-rename spelling: the schema is strict, so a
+  // rename here would fail every existing blob and wipe the layout it describes.
+  explorerPaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
+  explorerSidebarPaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
+  sidePaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
+  pullRequestTabAutoOpenedByWorkspace: z.record(z.string(), z.literal(true)).optional(),
+  // COMPAT(pullRequestAutoAdd): PR detection stopped opening a tab in v0.5; accepted
+  // and ignored so upgrading does not discard the layout. Remove after 2027-08-20.
+  acknowledgedPullRequestByWorkspace: z.record(z.string(), z.string()).optional(),
+});
diff --git a/packages/app/src/stores/workspace-layout-store.test.ts b/packages/app/src/stores/workspace-layout-store.test.ts
index e53f9c1911..d1a4768cb5 100644
--- a/packages/app/src/stores/workspace-layout-store.test.ts
+++ b/packages/app/src/stores/workspace-layout-store.test.ts
@@ -16,6 +16,7 @@ vi.mock("@react-native-async-storage/async-storage", () => {
 });
 
 import AsyncStorage from "@react-native-async-storage/async-storage";
+import { createViewedTimelineSync } from "@/timeline/viewed-timeline-sync";
 import { buildWorkspaceTabPersistenceKey, type WorkspaceTab } from "@/workspace-tabs/model";
 import { defaultChangesState, type ChangesState } from "@/panels/changes/state";
 import { defaultFileState, type FileState } from "@/panels/file/state";
@@ -24,6 +25,7 @@ import {
   collectAllPanes,
   collectAllTabs,
   createWorkspaceLayoutStore,
+  observeOpenWorkspaceAgentIds,
   createDefaultLayout,
   createWorkspaceLayoutWithExplorerSidebar,
   findPaneById,
@@ -73,6 +75,92 @@ function createDeterministicWorkspaceLayoutIds() {
 const workspaceLayoutIds = createDeterministicWorkspaceLayoutIds();
 const workspaceLayoutStore = createWorkspaceLayoutStore(workspaceLayoutIds);
 
+it("observes open chats across unmounted workspaces until their tabs close", () => {
+  const store = createWorkspaceLayoutStore(workspaceLayoutIds);
+  store.setState({ layoutByWorkspace: {} });
+  const received: string[][] = [];
+  const stop = observeOpenWorkspaceAgentIds("server-1", (ids) => received.push(ids), store);
+  const first = store.getState().openTab({
+    workspaceKey: "server-1:workspace-a",
+    target: { kind: "agent", agentId: "agent-a" },
+    intent: "reveal",
+  });
+  store.getState().openTab({
+    workspaceKey: "server-1:workspace-b",
+    target: { kind: "agent", agentId: "agent-b" },
+    intent: "background",
+  });
+  store.getState().openTab({
+    workspaceKey: "server-2:workspace-a",
+    target: { kind: "agent", agentId: "other-host-agent" },
+    intent: "reveal",
+  });
+  expect(received).toEqual([[], ["agent-a"], ["agent-a", "agent-b"]]);
+  if (!first) throw new Error("Expected an open agent tab");
+  store.getState().closeTab("server-1:workspace-a", first);
+  expect(received.at(-1)).toEqual(["agent-b"]);
+  stop();
+  store.getState().openTab({
+    workspaceKey: "server-1:workspace-a",
+    target: { kind: "agent", agentId: "after-dispose" },
+    intent: "reveal",
+  });
+  expect(received).toEqual([[], ["agent-a"], ["agent-a", "agent-b"], ["agent-b"]]);
+});
+
+it("feeds restored layout to timeline sync as a release signal, not a subscription source", async () => {
+  const store = createWorkspaceLayoutStore(workspaceLayoutIds);
+  store.setState({ layoutByWorkspace: {} });
+  // Launch: layout rehydrates tabs the user opened in earlier sessions.
+  const restored = store.getState().openTab({
+    workspaceKey: "server-1:workspace-a",
+    target: { kind: "agent", agentId: "agent-a" },
+    intent: "reveal",
+  });
+  store.getState().openTab({
+    workspaceKey: "server-1:workspace-b",
+    target: { kind: "agent", agentId: "agent-b" },
+    intent: "background",
+  });
+
+  const observed: string[][] = [];
+  const sync = createViewedTimelineSync({
+    replaceDemandedAgentIds: () => undefined,
+    prepare: async () => undefined,
+    observe: (agentIds) => {
+      observed.push(agentIds);
+      return { ready: Promise.resolve(), release: async () => undefined };
+    },
+    readCursor: () => undefined,
+    fetchPage: async () => ({ hasNewer: false, endCursor: null }),
+    fetchLatestTail: async () => ({ hasNewer: false, endCursor: null }),
+    onCatchUpEnded: () => undefined,
+    reportError: () => undefined,
+    schedule: () => () => undefined,
+  });
+  // The edge session-context.tsx owns. Pointing it at subscription instead would resume every
+  // agent behind a restored tab on the daemon.
+  const stop = observeOpenWorkspaceAgentIds(
+    "server-1",
+    (agentIds) => sync.replaceOpenTabAgentIds(agentIds),
+    store,
+  );
+
+  sync.setConnected(true);
+  expect(observed).toEqual([]);
+
+  sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  await vi.waitFor(() => expect(observed).toEqual([["agent-a"]]));
+
+  if (!restored) throw new Error("Expected an open agent tab");
+  store.getState().closeTab("server-1:workspace-a", restored);
+  sync.replaceVisibleAgentIds("workspace", []);
+  await vi.waitFor(() => expect(observed.at(-1)).toEqual([]));
+
+  stop();
+  sync.dispose();
+});
+
 function useWorkspaceLayoutIds(...values: string[]) {
   workspaceLayoutIds.useValues(values);
 }
@@ -450,7 +538,7 @@ describe("workspace-layout-store version 2 migration", () => {
     });
   });
 
-  it("writes version 2 with the persisted Explorer key accepted by released v0.6", async () => {
+  it("writes version 2 preserving the existing Explorer key", async () => {
     await persistVersionOneLayout("v0.6");
     const restored = createWorkspaceLayoutStore(createDeterministicWorkspaceLayoutIds());
 
@@ -463,6 +551,8 @@ describe("workspace-layout-store version 2 migration", () => {
         "explorerPaneIdByWorkspace",
         "explorerSidebarWidthByWorkspace",
         "layoutByWorkspace",
+        "pinnedAgentIdsByWorkspace",
+        "pullRequestTabAutoOpenedByWorkspace",
         "sidePaneIdByWorkspace",
         "splitSizesByWorkspace",
       ]);
@@ -1084,6 +1174,118 @@ describe("workspace-layout-store actions", () => {
     expect(workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey]).toBe(before);
   });
 
+  it.each(["hideExplorerSidebar", "showExplorerSidebar"] as const)(
+    "retains the last ordinary split after %s",
+    (setExplorerVisibility) => {
+      const workspaceKey = createWorkspaceKey();
+      const store = workspaceLayoutStore.getState();
+      const tabId = store.openTab({
+        workspaceKey,
+        target: { kind: "draft", draftId: "draft-origin" },
+        intent: "new",
+      }) as string;
+      store[setExplorerVisibility](workspaceKey);
+      const splitPaneId = store.splitPaneEmpty(workspaceKey, {
+        targetPaneId: "main",
+        position: "right",
+      }) as string;
+      store.moveTabToPane(workspaceKey, tabId, splitPaneId);
+      expect(
+        findPaneById(workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey].root, "main"),
+      ).toBeNull();
+
+      store.closeTab(workspaceKey, tabId);
+
+      const layout = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
+      expect(
+        collectAllPanes(layout.root)
+          .filter((pane) => pane.id !== "explorer")
+          .map((pane) => pane.id),
+      ).toEqual([splitPaneId]);
+      expect(findPaneById(layout.root, splitPaneId)?.tabIds).toHaveLength(1);
+      expect(layout.focusedPaneId).toBe(splitPaneId);
+    },
+  );
+
+  it.each(["explorer", "pane_generated_explorer"])(
+    "restores an ordinary pane beside saved hidden %s without losing tabs",
+    async (explorerId) => {
+      const workspaceKey = createWorkspaceKey();
+      const saved = createPane({
+        id: explorerId,
+        hidden: true,
+        tabIds: ["files", "draft_saved"],
+        targetsByTabId: { files: { kind: "files" } },
+        stateByTabId: { draft_saved: { savedContent: "preserve me" } },
+      });
+      await AsyncStorage.setItem(
+        "workspace-layout-state",
+        JSON.stringify({
+          version: 2,
+          state: {
+            layoutByWorkspace: { [workspaceKey]: { root: saved, focusedPaneId: null } },
+            explorerPaneIdByWorkspace: { [workspaceKey]: explorerId },
+          },
+        }),
+      );
+      const restored = createWorkspaceLayoutStore(createDeterministicWorkspaceLayoutIds());
+      await restored.persist.rehydrate();
+      const state = restored.getState();
+      const layout = state.layoutByWorkspace[workspaceKey];
+      expect(collectAllPanes(layout.root).map((pane) => pane.id)).toEqual(["main"]);
+      expect(layout.focusedPaneId).toBe("main");
+      expect(findPaneById(layout.root, explorerId)).toEqual(
+        saved.kind === "pane" ? saved.pane : null,
+      );
+      expect(state.explorerSidebarPaneIdByWorkspace[workspaceKey]).toBe(explorerId);
+      const snapshot = {
+        agentsHydrated: true,
+        terminalsHydrated: true,
+        activeAgentIds: [],
+        autoOpenAgentIds: [],
+        standaloneTerminalIds: [],
+      };
+      state.reconcileTabs(workspaceKey, snapshot);
+      const afterFirstReconcile = restored.getState().layoutByWorkspace[workspaceKey];
+      state.reconcileTabs(workspaceKey, snapshot);
+      expect(restored.getState().layoutByWorkspace[workspaceKey]).toEqual(afterFirstReconcile);
+      expect(
+        collectAllTabs(afterFirstReconcile.root).filter((tab) => tab.target.kind === "draft"),
+      ).toHaveLength(1);
+      expect(
+        collectAllTabs(afterFirstReconcile.root).find((tab) => tab.tabId === "draft_saved")?.state,
+      ).toEqual({ savedContent: "preserve me" });
+    },
+  );
+
+  it("reveals a saved hidden ordinary pane without replacing its content", async () => {
+    const workspaceKey = createWorkspaceKey();
+    const saved = createPane({
+      id: "pane_saved_ordinary",
+      hidden: true,
+      tabIds: ["draft_saved"],
+      stateByTabId: { draft_saved: { savedContent: "preserve me" } },
+    });
+    await AsyncStorage.setItem(
+      "workspace-layout-state",
+      JSON.stringify({
+        version: 2,
+        state: {
+          layoutByWorkspace: { [workspaceKey]: { root: saved, focusedPaneId: null } },
+        },
+      }),
+    );
+    const restored = createWorkspaceLayoutStore(createDeterministicWorkspaceLayoutIds());
+    await restored.persist.rehydrate();
+    const layout = restored.getState().layoutByWorkspace[workspaceKey];
+    expect(collectAllPanes(layout.root).map((pane) => pane.id)).toEqual(["pane_saved_ordinary"]);
+    expect(layout.focusedPaneId).toBe("pane_saved_ordinary");
+    expect(findPaneById(layout.root, "pane_saved_ordinary")?.tabIds).toEqual(["draft_saved"]);
+    expect(collectAllTabs(layout.root).find((tab) => tab.tabId === "draft_saved")?.state).toEqual({
+      savedContent: "preserve me",
+    });
+  });
+
   it("migrates legacy layouts to include the hidden registered explorer pane", async () => {
     const legacyLayout = createDefaultLayout();
     await AsyncStorage.setItem(
@@ -1483,7 +1685,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       knownTerminalIds: ["terminal-1"],
       standaloneTerminalIds: ["terminal-1"],
       hasActivePendingTerminalCreate: true,
@@ -1497,7 +1698,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       knownTerminalIds: ["terminal-1"],
       standaloneTerminalIds: ["terminal-1"],
     });
@@ -1580,7 +1780,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["agent-1", "agent-2"],
       autoOpenAgentIds: ["agent-1", "agent-2"],
-      knownAgentIds: ["agent-1", "agent-2"],
       standaloneTerminalIds: [],
     });
 
@@ -2943,9 +3142,11 @@ describe("workspace-layout-store actions", () => {
 
     expect(persisted).toEqual({
       layoutByWorkspace: { [workspaceKey]: layout },
+      pinnedAgentIdsByWorkspace: {},
       splitSizesByWorkspace: currentState.splitSizesByWorkspace,
       explorerSidebarWidthByWorkspace: currentState.explorerSidebarWidthByWorkspace,
       explorerPaneIdByWorkspace: {},
+      pullRequestTabAutoOpenedByWorkspace: currentState.pullRequestTabAutoOpenedByWorkspace,
       sidePaneIdByWorkspace: currentState.sidePaneIdByWorkspace,
     });
     expect(layout && collectAllTabs(layout.root).map((tab) => tab.target)).toEqual([
@@ -3082,6 +3283,13 @@ describe("workspace-layout-store actions", () => {
       intent: "reveal",
     });
     store.closeTab(workspaceKey, tabId!);
+    store.reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: true,
+      activeAgentIds: [],
+      autoOpenAgentIds: [],
+      standaloneTerminalIds: [],
+    });
     const layout = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
 
     const mainTab = collectAllTabs(layout.root).find(
@@ -3092,7 +3300,7 @@ describe("workspace-layout-store actions", () => {
     expect(findPaneById(layout.root, "explorer")?.hidden).toBe(true);
   });
 
-  it("keeps explicitly opened pinned agents in memory per workspace without persisting them", () => {
+  it("persists explicit agent opens per workspace", () => {
     const workspaceKey = createWorkspaceKey();
     const otherWorkspaceKey = buildWorkspaceTabPersistenceKey({
       serverId: SERVER_ID,
@@ -3131,7 +3339,9 @@ describe("workspace-layout-store actions", () => {
 
     const partialize = workspaceLayoutStore.persist.getOptions().partialize;
     expect(partialize).toBeTypeOf("function");
-    expect(partialize?.(state)).not.toHaveProperty("pinnedAgentIdsByWorkspace");
+    expect(partialize?.(state)).toHaveProperty("pinnedAgentIdsByWorkspace", {
+      [otherWorkspaceKey as string]: ["agent-2"],
+    });
   });
 
   it("keeps hidden agent intents in memory per workspace without persisting them", () => {
@@ -3165,7 +3375,9 @@ describe("workspace-layout-store actions", () => {
     const partialize = workspaceLayoutStore.persist.getOptions().partialize;
     expect(partialize).toBeTypeOf("function");
     expect(partialize?.(state)).toEqual({
+      pullRequestTabAutoOpenedByWorkspace: {},
       layoutByWorkspace: {},
+      pinnedAgentIdsByWorkspace: {},
       splitSizesByWorkspace: {},
       explorerSidebarWidthByWorkspace: {},
       explorerPaneIdByWorkspace: {},
@@ -3258,7 +3470,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["agent-1"],
       autoOpenAgentIds: ["agent-1"],
-      knownAgentIds: ["agent-1", "agent-2"],
       standaloneTerminalIds: ["term-1"],
       hasActivePendingDraftCreate: false,
     });
@@ -3314,7 +3525,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["agent-1"],
       autoOpenAgentIds: ["agent-1"],
-      knownAgentIds: ["agent-1"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3346,7 +3556,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["agent-1"],
       autoOpenAgentIds: ["agent-1"],
-      knownAgentIds: ["agent-1"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3362,7 +3571,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["agent-1"],
       autoOpenAgentIds: ["agent-1"],
-      knownAgentIds: ["agent-1"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3372,121 +3580,129 @@ describe("workspace-layout-store actions", () => {
     expect(findPaneById(layout.root, "main")?.focusedTabId).toBe("agent_agent-1");
   });
 
-  it("reconcileTabs lands on a draft when the hydrated workspace is empty", () => {
-    const workspaceKey = createWorkspaceKey();
-
-    workspaceLayoutStore.getState().reconcileTabs(workspaceKey, {
-      agentsHydrated: true,
-      terminalsHydrated: true,
-      activeAgentIds: [],
-      autoOpenAgentIds: [],
-      knownAgentIds: [],
-      knownTerminalIds: [],
-      standaloneTerminalIds: [],
-      hasActivePendingDraftCreate: false,
-    });
-
-    const layout = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
-    const mainTab = collectAllTabs(layout.root).find(
-      (tab) => findPaneContainingTab(layout.root, tab.tabId)?.id === "main",
-    );
-    expect(mainTab?.target.kind).toBe("draft");
-    expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(mainTab?.tabId);
-  });
-
-  it("reconcileTabs stays stable when startup removes a duplicate agent kept in Explorer", () => {
+  it("reconcileTabs initializes the New launcher once when the hydrated workspace is empty", () => {
     const workspaceKey = createWorkspaceKey();
     const store = workspaceLayoutStore.getState();
-    workspaceLayoutStore.setState((state) => ({
-      layoutByWorkspace: {
-        ...state.layoutByWorkspace,
-        [workspaceKey]: {
-          root: {
-            kind: "group",
-            group: {
-              id: "root",
-              direction: "horizontal",
-              sizes: [0.78, 0.22],
-              children: [
-                createPane({
-                  id: "main",
-                  tabIds: ["new", "draft-origin-agent"],
-                  focusedTabId: "draft-origin-agent",
-                  targetsByTabId: {
-                    new: { kind: "new_tab" },
-                    "draft-origin-agent": { kind: "agent", agentId: "agent-1" },
-                  },
-                }),
-                createPane({
-                  id: "explorer",
-                  tabIds: ["files", "changes_tree", "agent_agent-1"],
-                  focusedTabId: "agent_agent-1",
-                  targetsByTabId: {
-                    files: { kind: "files" },
-                    changes_tree: { kind: "changes_tree" },
-                    "agent_agent-1": { kind: "agent", agentId: "agent-1" },
-                  },
-                }),
-              ],
-            },
-          },
-          focusedPaneId: "main",
-        },
-      },
-      explorerSidebarPaneIdByWorkspace: {
-        ...state.explorerSidebarPaneIdByWorkspace,
-        [workspaceKey]: "explorer",
-      },
-    }));
-
-    store.reconcileTabs(workspaceKey, {
-      agentsHydrated: false,
-      terminalsHydrated: false,
-      activeAgentIds: [],
-      autoOpenAgentIds: [],
-      knownAgentIds: [],
-      knownTerminalIds: [],
-      standaloneTerminalIds: [],
-    });
-    expect(workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey].focusedPaneId).toBe(
-      "main",
-    );
-
-    workspaceLayoutStore.setState((state) => ({
-      layoutByWorkspace: {
-        ...state.layoutByWorkspace,
-        [workspaceKey]: {
-          ...state.layoutByWorkspace[workspaceKey],
-          focusedPaneId: "explorer",
-        },
-      },
-    }));
-
-    const emptySnapshot = {
+    const snapshot = {
       agentsHydrated: true,
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       knownTerminalIds: [],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     };
-    store.reconcileTabs(workspaceKey, emptySnapshot);
-    store.reconcileTabs(workspaceKey, emptySnapshot);
-    const afterSecondReconcile = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
-    store.reconcileTabs(workspaceKey, emptySnapshot);
-    const afterThirdReconcile = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
 
-    expect(afterThirdReconcile).toBe(afterSecondReconcile);
-    const mainTabs = collectAllTabs(afterThirdReconcile.root).filter(
-      (tab) => findPaneContainingTab(afterThirdReconcile.root, tab.tabId)?.id === "main",
-    );
-    expect(mainTabs).toEqual([
-      expect.objectContaining({ target: expect.objectContaining({ kind: "draft" }) }),
+    store.reconcileTabs(workspaceKey, snapshot);
+
+    const initialized = workspaceLayoutStore.getState();
+    const layout = initialized.layoutByWorkspace[workspaceKey];
+    expect(collectAllTabs(layout.root).map((tab) => tab.target)).toEqual([
+      { kind: "new_tab" },
+      { kind: "files" },
+      { kind: "changes_tree" },
     ]);
+    expect(layout.focusedPaneId).toBe("main");
+
+    store.reconcileTabs(workspaceKey, snapshot);
+
+    expect(workspaceLayoutStore.getState()).toBe(initialized);
   });
 
+  it.each([
+    ["main", "explorer"],
+    ["pane_ordinary", "pane_generated_explorer"],
+  ])(
+    "reconcileTabs stays stable when startup removes a duplicate from %s beside %s",
+    (ordinaryPaneId, explorerPaneId) => {
+      const workspaceKey = createWorkspaceKey();
+      const store = workspaceLayoutStore.getState();
+      workspaceLayoutStore.setState((state) => ({
+        layoutByWorkspace: {
+          ...state.layoutByWorkspace,
+          [workspaceKey]: {
+            root: {
+              kind: "group",
+              group: {
+                id: "root",
+                direction: "horizontal",
+                sizes: [0.78, 0.22],
+                children: [
+                  createPane({
+                    id: ordinaryPaneId,
+                    tabIds: ["draft-origin-agent"],
+                    focusedTabId: "draft-origin-agent",
+                    targetsByTabId: {
+                      "draft-origin-agent": { kind: "agent", agentId: "agent-1" },
+                    },
+                  }),
+                  createPane({
+                    id: explorerPaneId,
+                    tabIds: ["files", "changes_tree", "agent_agent-1"],
+                    focusedTabId: "agent_agent-1",
+                    targetsByTabId: {
+                      files: { kind: "files" },
+                      changes_tree: { kind: "changes_tree" },
+                      "agent_agent-1": { kind: "agent", agentId: "agent-1" },
+                    },
+                  }),
+                ],
+              },
+            },
+            focusedPaneId: ordinaryPaneId,
+          },
+        },
+        explorerSidebarPaneIdByWorkspace: {
+          ...state.explorerSidebarPaneIdByWorkspace,
+          [workspaceKey]: explorerPaneId,
+        },
+      }));
+
+      store.reconcileTabs(workspaceKey, {
+        agentsHydrated: false,
+        terminalsHydrated: false,
+        activeAgentIds: [],
+        autoOpenAgentIds: [],
+        knownTerminalIds: [],
+        standaloneTerminalIds: [],
+      });
+      expect(workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey].focusedPaneId).toBe(
+        ordinaryPaneId,
+      );
+
+      workspaceLayoutStore.setState((state) => ({
+        layoutByWorkspace: {
+          ...state.layoutByWorkspace,
+          [workspaceKey]: {
+            ...state.layoutByWorkspace[workspaceKey],
+            focusedPaneId: explorerPaneId,
+          },
+        },
+      }));
+
+      const emptySnapshot = {
+        agentsHydrated: true,
+        terminalsHydrated: true,
+        activeAgentIds: [],
+        autoOpenAgentIds: [],
+        knownTerminalIds: [],
+        standaloneTerminalIds: [],
+        hasActivePendingDraftCreate: false,
+      };
+      store.reconcileTabs(workspaceKey, emptySnapshot);
+      store.reconcileTabs(workspaceKey, emptySnapshot);
+      const afterSecondReconcile = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
+      store.reconcileTabs(workspaceKey, emptySnapshot);
+      const afterThirdReconcile = workspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
+
+      expect(afterThirdReconcile).toBe(afterSecondReconcile);
+      const mainTabs = collectAllTabs(afterThirdReconcile.root).filter(
+        (tab) => findPaneContainingTab(afterThirdReconcile.root, tab.tabId)?.id === ordinaryPaneId,
+      );
+      expect(mainTabs).toEqual([expect.objectContaining({ target: { kind: "new_tab" } })]);
+    },
+  );
+
   it("reconcileTabs does not auto-open subagents omitted from autoOpenAgentIds", () => {
     const workspaceKey = createWorkspaceKey();
 
@@ -3495,7 +3711,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["parent-agent", "child-agent"],
       autoOpenAgentIds: ["parent-agent"],
-      knownAgentIds: ["parent-agent", "child-agent"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3522,7 +3737,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["parent-agent", "child-agent"],
       autoOpenAgentIds: ["parent-agent"],
-      knownAgentIds: ["parent-agent", "child-agent"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3549,7 +3763,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["parent-agent"],
       autoOpenAgentIds: ["parent-agent"],
-      knownAgentIds: ["parent-agent", "child-agent"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3571,7 +3784,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["child-agent"],
       autoOpenAgentIds: [],
-      knownAgentIds: ["child-agent"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
     });
@@ -3609,7 +3821,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       knownTerminalIds: ["term-script", "term-manual"],
       standaloneTerminalIds: ["term-manual"],
       hasActivePendingDraftCreate: false,
@@ -3629,7 +3840,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       knownTerminalIds: ["term-script"],
       standaloneTerminalIds: [],
       hasActivePendingDraftCreate: false,
@@ -3675,7 +3885,7 @@ describe("workspace-layout-store actions", () => {
     expect(Array.from(state.pinnedAgentIdsByWorkspace[workspaceKey] ?? [])).toEqual(["agent-1"]);
   });
 
-  it("keeps an explicitly pinned archived agent before its detail is hydrated", () => {
+  it("keeps an explicitly opened agent when its detail leaves client memory", () => {
     const workspaceKey = createWorkspaceKey();
     const store = workspaceLayoutStore.getState();
 
@@ -3690,7 +3900,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       standaloneTerminalIds: [],
     });
 
@@ -3706,7 +3915,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       standaloneTerminalIds: [],
     });
 
@@ -3717,13 +3925,11 @@ describe("workspace-layout-store actions", () => {
         .map((tab) => tab.tabId),
     ).toEqual(["agent_archived-agent"]);
 
-    store.resolvePendingAgent(workspaceKey, "archived-agent");
     store.reconcileTabs(workspaceKey, {
       agentsHydrated: true,
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       standaloneTerminalIds: [],
     });
 
@@ -3732,7 +3938,7 @@ describe("workspace-layout-store actions", () => {
         .getWorkspaceTabs(workspaceKey)
         .filter((tab) => tab.target.kind === "agent")
         .map((tab) => tab.tabId),
-    ).toEqual([]);
+    ).toEqual(["agent_archived-agent"]);
 
     store.openTab({
       workspaceKey: workspaceKey,
@@ -3745,7 +3951,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: [],
       autoOpenAgentIds: [],
-      knownAgentIds: [],
       standaloneTerminalIds: [],
     });
 
@@ -3757,6 +3962,57 @@ describe("workspace-layout-store actions", () => {
     ).toEqual(["agent_archived-agent"]);
   });
 
+  it("restores the selected historical agent before any server data or cache is available", async () => {
+    const workspaceKey = createWorkspaceKey();
+    workspaceLayoutStore.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "archived-agent" },
+      intent: "reveal",
+      pin: true,
+    });
+    const restored = createWorkspaceLayoutStore(createDeterministicWorkspaceLayoutIds());
+    await restored.persist.rehydrate();
+    restored.getState().reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: true,
+      activeAgentIds: [],
+      autoOpenAgentIds: [],
+      standaloneTerminalIds: [],
+    });
+    const layout = restored.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneById(layout.root, layout.focusedPaneId)?.focusedTabId).toBe(
+      "agent_archived-agent",
+    );
+  });
+
+  it("follows server archive after an explicitly opened agent becomes active", () => {
+    const workspaceKey = createWorkspaceKey();
+    const store = workspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+      pin: true,
+    });
+    store.reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: true,
+      activeAgentIds: ["agent-1"],
+      autoOpenAgentIds: ["agent-1"],
+      standaloneTerminalIds: [],
+    });
+    store.reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: true,
+      activeAgentIds: [],
+      autoOpenAgentIds: [],
+      standaloneTerminalIds: [],
+    });
+    expect(store.getWorkspaceTabs(workspaceKey).some((tab) => tab.target.kind === "agent")).toBe(
+      false,
+    );
+  });
+
   it("atomically reveals, focuses, and pins an archived agent against reconciliation", () => {
     const workspaceKey = createWorkspaceKey();
     const store = workspaceLayoutStore.getState();
@@ -3783,7 +4039,6 @@ describe("workspace-layout-store actions", () => {
       terminalsHydrated: true,
       activeAgentIds: ["first-agent", "second-agent"],
       autoOpenAgentIds: ["first-agent", "second-agent"],
-      knownAgentIds: ["first-agent", "second-agent"],
       standaloneTerminalIds: [],
     });
 
@@ -4161,3 +4416,25 @@ describe("workspace-layout-store actions", () => {
     expect(collectAllPanes(layout.root).map((pane) => pane.id)).toEqual(["main"]);
   });
 });
+
+it("persists the once-only PR add after closing, and clears it when purging the workspace", async () => {
+  await AsyncStorage.removeItem("workspace-layout-state");
+  const source = createWorkspaceLayoutStore(workspaceLayoutIds);
+  await source.persist.rehydrate();
+  const workspaceKey = "server-1:pr-once";
+  const placement = () => ({ placement: { mode: "prefer" as const, paneId: "explorer" } });
+  source.getState().autoOpenPullRequestTab(workspaceKey, placement);
+  source.getState().closeTab(workspaceKey, "pull_request");
+  const restored = createWorkspaceLayoutStore(workspaceLayoutIds);
+  await restored.persist.rehydrate();
+  expect(restored.getState().pullRequestTabAutoOpenedByWorkspace[workspaceKey]).toBe(true);
+  expect(restored.getState().autoOpenPullRequestTab(workspaceKey, placement)).toBeNull();
+  expect(
+    collectAllTabs(restored.getState().layoutByWorkspace[workspaceKey].root).map(
+      (tab) => tab.target.kind,
+    ),
+  ).not.toContain("pull_request");
+  restored.getState().purgeWorkspace(workspaceKey);
+  expect(restored.getState().pullRequestTabAutoOpenedByWorkspace[workspaceKey]).toBeUndefined();
+  expect(restored.getState().autoOpenPullRequestTab(workspaceKey, placement)).toBe("pull_request");
+});
diff --git a/packages/app/src/stores/workspace-layout-store.ts b/packages/app/src/stores/workspace-layout-store.ts
index 974b8c6964..5de128b631 100644
--- a/packages/app/src/stores/workspace-layout-store.ts
+++ b/packages/app/src/stores/workspace-layout-store.ts
@@ -2,7 +2,8 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useEffect, useState } from "react";
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
-import { z } from "zod";
+import type { z } from "zod";
+import { WorkspaceLayoutPersistedStateSchema } from "./workspace-layout-storage";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import type { WorkspaceTab, WorkspaceTabTarget } from "@/workspace-tabs/model";
 import {
@@ -36,7 +37,7 @@ import {
   openTabInLayoutBackground,
   replaceTabTargetInLayout,
   revealTargetInLayout,
-  restoreEmptyPanesInLayout,
+  restoreWorkspaceLayout,
   reconcileWorkspaceTabs,
   removePaneFromTree,
   removeTabFromTree,
@@ -53,6 +54,7 @@ import {
   type SplitNode,
   type SplitPane,
   type WorkspaceTabPlacement,
+  type WorkspaceTabInsertionPosition,
   type WorkspaceTabReconcileState,
   type WorkspaceTabSnapshot,
   type WorkspaceLayout,
@@ -98,6 +100,7 @@ export interface OpenWorkspaceTabInput {
   /** Keeps an explicitly opened agent visible even when it is archived. */
   pin?: boolean;
   placement?: WorkspaceTabPlacement;
+  insertionPosition?: WorkspaceTabInsertionPosition;
   parentTabId?: string;
   state?: JsonValue;
 }
@@ -107,17 +110,23 @@ interface WorkspaceLayoutStore {
   splitSizesByWorkspace: Record<string, Record<string, number[]>>;
   explorerSidebarWidthByWorkspace: Record<string, number>;
   pinnedAgentIdsByWorkspace: Record<string, Set<string>>;
-  pendingAgentIdsByWorkspace: Record<string, Set<string>>;
   hiddenAgentIdsByWorkspace: Record<string, Set<string>>;
   focusRestorationByWorkspace: Record<string, WorkspaceFocusRestorationState>;
   explorerSidebarPaneIdByWorkspace: Record<string, string | null>;
   sidePaneIdByWorkspace: Record<string, string | null>;
+  /** Workspaces where PR detection already added its tab once; a closed tab never returns. */
+  pullRequestTabAutoOpenedByWorkspace: Record<string, true>;
   openTab: (input: OpenWorkspaceTabInput) => string | null;
+  /** Placement resolves lazily so an already acknowledged workspace never creates a side pane. */
+  autoOpenPullRequestTab: (
+    workspaceKey: string,
+    resolvePlacement: () => Pick<OpenWorkspaceTabInput, "placement" | "insertionPosition">,
+  ) => string | null;
   /** Reveals the Explorer sidebar without selecting a view. Returns its pane id. */
   showExplorerSidebar: (workspaceKey: string) => string | null;
   hideExplorerSidebar: (workspaceKey: string) => void;
   /** Returns the ordinary right-side workspace pane, creating it when absent. */
-  ensureSidePane: (workspaceKey: string) => string | null;
+  ensureSidePane: (workspaceKey: string, options?: { focus: boolean }) => string | null;
   closeTab: (workspaceKey: string, tabId: string) => void;
   focusTab: (workspaceKey: string, tabId: string) => void;
   selectTabInPane: (workspaceKey: string, paneId: string, tabId: string) => void;
@@ -130,7 +139,6 @@ interface WorkspaceLayoutStore {
   setTabState: (workspaceKey: string, tabId: string, state: JsonValue | undefined) => void;
   convertDraftToAgent: (workspaceKey: string, tabId: string, agentId: string) => string | null;
   reconcileTabs: (workspaceKey: string, snapshot: WorkspaceTabSnapshot) => void;
-  resolvePendingAgent: (workspaceKey: string, agentId: string) => void;
   reorderTabs: (workspaceKey: string, tabIds: string[]) => void;
   getWorkspaceTabs: (workspaceKey: string) => WorkspaceTab[];
   splitPane: (
@@ -176,117 +184,6 @@ interface WorkspaceFocusRestorationState {
 // Preserve four user-created split levels beneath that bookkeeping node.
 const MAX_TREE_DEPTH = 5;
 
-const WorkspaceDraftTabSetupStorageSchema = z.strictObject({
-  provider: z.string(),
-  cwd: z.string(),
-  modeId: z.string().nullable(),
-  model: z.string().nullable(),
-  thinkingOptionId: z.string().nullable(),
-  featureValues: z.record(z.string(), z.union([z.boolean(), z.string(), z.null()])),
-});
-const WorkspaceTabTargetStorageSchema = z.discriminatedUnion("kind", [
-  z.strictObject({ kind: z.literal("new_tab") }),
-  z.strictObject({
-    kind: z.literal("draft"),
-    draftId: z.string(),
-    setup: WorkspaceDraftTabSetupStorageSchema.optional(),
-  }),
-  z.strictObject({ kind: z.literal("agent"), agentId: z.string() }),
-  z.strictObject({
-    kind: z.literal("provider_subagent"),
-    parentAgentId: z.string(),
-    subagentId: z.string(),
-  }),
-  z.strictObject({ kind: z.literal("terminal"), terminalId: z.string() }),
-  z.strictObject({ kind: z.literal("browser"), browserId: z.string() }),
-  z.strictObject({ kind: z.literal("changes_tree") }),
-  z.strictObject({ kind: z.literal("files") }),
-  z.strictObject({ kind: z.literal("pull_request") }),
-  z.strictObject({
-    kind: z.literal("file"),
-    path: z.string(),
-    lineStart: z.number().int().positive().optional(),
-    lineEnd: z.number().int().positive().optional(),
-  }),
-  z.strictObject({
-    kind: z.literal("working_diff"),
-    focusPath: z.string().optional(),
-    focusRequestId: z.number().optional(),
-    // COMPAT(workingDiffTarget): accepted from pre-canonical tab ids; normalization removes them.
-    mode: z.enum(["uncommitted", "base"]).optional(),
-    baseRef: z.string().nullable().optional(),
-    ignoreWhitespace: z.boolean().optional(),
-  }),
-  z.strictObject({ kind: z.literal("setup"), workspaceId: z.string() }),
-  z.strictObject({ kind: z.literal("commit_diff"), sha: z.string() }),
-  z.discriminatedUnion("context", [
-    z.strictObject({
-      kind: z.literal("plugin"),
-      pluginId: z.string(),
-      panelId: z.string(),
-      context: z.literal("workspace"),
-    }),
-    z.strictObject({
-      kind: z.literal("plugin"),
-      pluginId: z.string(),
-      panelId: z.string(),
-      context: z.literal("agent"),
-      agentId: z.string(),
-    }),
-  ]),
-]);
-const WorkspaceTabStorageSchema = z.strictObject({
-  tabId: z.string(),
-  target: WorkspaceTabTargetStorageSchema,
-  createdAt: z.number(),
-  state: z.json().optional(),
-});
-const SplitNodeStorageSchema: z.ZodType<SplitNode> = z.lazy(() =>
-  z.discriminatedUnion("kind", [
-    z.strictObject({
-      kind: z.literal("pane"),
-      pane: z.strictObject({
-        id: z.string(),
-        tabIds: z.array(z.string()),
-        focusedTabId: z.string().nullable(),
-        tabs: z.array(WorkspaceTabStorageSchema).optional(),
-        hidden: z.boolean().optional(),
-      }),
-    }),
-    z.strictObject({
-      kind: z.literal("group"),
-      group: z.strictObject({
-        id: z.string(),
-        direction: z.enum(["horizontal", "vertical"]),
-        children: z.array(SplitNodeStorageSchema),
-        sizes: z.array(z.number()),
-      }),
-    }),
-  ]),
-);
-const WorkspaceLayoutStorageSchema: z.ZodType<WorkspaceLayout> = z.strictObject({
-  root: SplitNodeStorageSchema,
-  focusedPaneId: z.string().nullable(),
-  parentTabIdByTabId: z.record(z.string(), z.string()).optional(),
-});
-const WorkspaceLayoutPersistedStateSchema = z.strictObject({
-  layoutByWorkspace: z.record(z.string(), WorkspaceLayoutStorageSchema),
-  splitSizesByWorkspace: z.record(z.string(), z.record(z.string(), z.array(z.number()))).optional(),
-  explorerSidebarWidthByWorkspace: z.record(z.string(), z.number()).optional(),
-  // COMPAT(explorerSidebarWidth): added in v0.6, remove after 2027-08-25.
-  explorerSidebarRatioByWorkspace: z.record(z.string(), z.number()).optional(),
-  // COMPAT(explorerSidebarNaming): accepted from builds that called this dock the Side panel.
-  sidePanelRatioByWorkspace: z.record(z.string(), z.number()).optional(),
-  // The persisted keys keep their pre-rename spelling: the schema is strict, so a
-  // rename here would fail every existing blob and wipe the layout it describes.
-  explorerPaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
-  explorerSidebarPaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
-  sidePaneIdByWorkspace: z.record(z.string(), z.string().nullable()).optional(),
-  // COMPAT(pullRequestAutoAdd): PR detection stopped opening a tab in v0.5; accepted
-  // and ignored so upgrading does not discard the layout. Remove after 2027-08-20.
-  acknowledgedPullRequestByWorkspace: z.record(z.string(), z.string()).optional(),
-});
-
 const LEGACY_EXPLORER_SIDEBAR_REFERENCE_WIDTH = 1440;
 const WORKSPACE_LAYOUT_PERSIST_VERSION = 2;
 
@@ -635,7 +532,7 @@ function ensurePersistedExplorerSidebarPane(input: {
     paneId: split.paneId,
     hidden: true,
   });
-  const seededLayout = restoreEmptyPanesInLayout(
+  const seededLayout = restoreWorkspaceLayout(
     stripEphemeralTabsFromLayout(hiddenLayout ?? split.layout),
     split.paneId,
   );
@@ -760,15 +657,34 @@ export function createWorkspaceLayoutStore(
   return create<WorkspaceLayoutStore>()(
     persist(
       (set, get) => ({
+        autoOpenPullRequestTab: (workspaceKey, resolvePlacement) => {
+          const key = trimNonEmpty(workspaceKey);
+          if (!key || get().pullRequestTabAutoOpenedByWorkspace[key]) return null;
+          const tabId = get().openTab({
+            workspaceKey: key,
+            target: { kind: "pull_request" },
+            intent: "background",
+            ...resolvePlacement(),
+          });
+          if (tabId) {
+            set((state) => ({
+              pullRequestTabAutoOpenedByWorkspace: {
+                ...state.pullRequestTabAutoOpenedByWorkspace,
+                [key]: true,
+              },
+            }));
+          }
+          return tabId;
+        },
         layoutByWorkspace: {},
         splitSizesByWorkspace: {},
         explorerSidebarWidthByWorkspace: {},
         pinnedAgentIdsByWorkspace: {},
-        pendingAgentIdsByWorkspace: {},
         hiddenAgentIdsByWorkspace: {},
         focusRestorationByWorkspace: {},
         explorerSidebarPaneIdByWorkspace: {},
         sidePaneIdByWorkspace: {},
+        pullRequestTabAutoOpenedByWorkspace: {},
         openTab: (input) => {
           const normalizedWorkspaceKey = trimNonEmpty(input.workspaceKey);
           const normalizedTarget = normalizeWorkspaceTabTarget(input.target);
@@ -785,6 +701,7 @@ export function createWorkspaceLayoutStore(
           if (input.intent === "new") {
             result = createTabInLayout({
               ...placement,
+              insertionPosition: input.insertionPosition,
               target: normalizedTarget,
               now: Date.now(),
               createTabId: createWorkspaceTabInstanceId,
@@ -793,12 +710,14 @@ export function createWorkspaceLayoutStore(
           } else if (input.intent === "background") {
             result = openTabInLayoutBackground({
               ...placement,
+              insertionPosition: input.insertionPosition,
               target: normalizedTarget,
               now: Date.now(),
             });
           } else {
             result = revealTargetInLayout({
               ...placement,
+              insertionPosition: input.insertionPosition,
               target: normalizedTarget,
               now: Date.now(),
               createTabId: createWorkspaceTabInstanceId,
@@ -830,13 +749,6 @@ export function createWorkspaceLayoutStore(
                   normalizedTarget.agentId,
                 )
               : state.pinnedAgentIdsByWorkspace,
-            pendingAgentIdsByWorkspace: shouldPinAgent
-              ? addAgentIdToWorkspaceSet(
-                  state.pendingAgentIdsByWorkspace,
-                  normalizedWorkspaceKey,
-                  normalizedTarget.agentId,
-                )
-              : state.pendingAgentIdsByWorkspace,
             layoutByWorkspace: {
               ...state.layoutByWorkspace,
               [normalizedWorkspaceKey]: input.parentTabId
@@ -918,7 +830,7 @@ export function createWorkspaceLayoutStore(
             };
           });
         },
-        ensureSidePane: (workspaceKey) => {
+        ensureSidePane: (workspaceKey, options) => {
           const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
           if (!normalizedWorkspaceKey) {
             return null;
@@ -949,7 +861,10 @@ export function createWorkspaceLayoutStore(
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
             layoutByWorkspace: {
               ...state.layoutByWorkspace,
-              [normalizedWorkspaceKey]: result.layout,
+              [normalizedWorkspaceKey]:
+                options?.focus === false
+                  ? { ...result.layout, focusedPaneId: layout.focusedPaneId }
+                  : result.layout,
             },
             sidePaneIdByWorkspace: {
               ...state.sidePaneIdByWorkspace,
@@ -1000,14 +915,10 @@ export function createWorkspaceLayoutStore(
                 },
               };
             }
-            const preserveEmptyPaneId =
-              closingPane?.id === "main" || closingPane?.id === explorerSidebarPaneId
-                ? closingPane.id
-                : null;
             const closedLayout = closeTabInLayout({
               layout,
               tabId: normalizedTabId,
-              preserveEmptyPaneId,
+              explorerSidebarPaneId,
             });
             const nextLayoutBeforeFocusNormalization =
               closedLayout &&
@@ -1165,8 +1076,13 @@ export function createWorkspaceLayoutStore(
             return null;
           }
 
+          const layout = getWorkspaceLayout(get().layoutByWorkspace, normalizedWorkspaceKey);
           const result = convertDraftToAgentInLayout({
-            layout: getWorkspaceLayout(get().layoutByWorkspace, normalizedWorkspaceKey),
+            layout,
+            explorerSidebarPaneId: resolveExplorerSidebarPaneId(
+              layout,
+              get().explorerSidebarPaneIdByWorkspace[normalizedWorkspaceKey],
+            ),
             tabId: normalizedTabId,
             agentId: normalizedAgentId,
           });
@@ -1212,7 +1128,6 @@ export function createWorkspaceLayoutStore(
               {
                 layout: currentLayout,
                 pinnedAgentIds: state.pinnedAgentIdsByWorkspace[normalizedWorkspaceKey] ?? null,
-                pendingAgentIds: state.pendingAgentIdsByWorkspace[normalizedWorkspaceKey] ?? null,
                 hiddenAgentIds: state.hiddenAgentIdsByWorkspace[normalizedWorkspaceKey] ?? null,
                 explorerSidebarPaneId,
               },
@@ -1223,11 +1138,26 @@ export function createWorkspaceLayoutStore(
               explorerSidebarPaneId,
               currentLayout.focusedPaneId,
             );
-            if (nextLayout === rawLayout) {
+            let pinnedAgentIdsByWorkspace = state.pinnedAgentIdsByWorkspace;
+            for (const agentId of state.pinnedAgentIdsByWorkspace[normalizedWorkspaceKey] ?? []) {
+              if (!nextState.pinnedAgentIds?.has(agentId)) {
+                pinnedAgentIdsByWorkspace = removeAgentIdFromWorkspaceSet(
+                  pinnedAgentIdsByWorkspace,
+                  normalizedWorkspaceKey,
+                  agentId,
+                );
+              }
+            }
+            if (
+              state.layoutByWorkspace[normalizedWorkspaceKey] &&
+              nextLayout === rawLayout &&
+              pinnedAgentIdsByWorkspace === state.pinnedAgentIdsByWorkspace
+            ) {
               return state;
             }
 
             return {
+              pinnedAgentIdsByWorkspace,
               layoutByWorkspace: {
                 ...state.layoutByWorkspace,
                 [normalizedWorkspaceKey]: nextLayout,
@@ -1235,25 +1165,6 @@ export function createWorkspaceLayoutStore(
             };
           });
         },
-        resolvePendingAgent: (workspaceKey, agentId) => {
-          const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
-          const normalizedAgentId = trimNonEmpty(agentId);
-          if (!normalizedWorkspaceKey || !normalizedAgentId) {
-            return;
-          }
-
-          set((state) => {
-            const pendingAgentIdsByWorkspace = removeAgentIdFromWorkspaceSet(
-              state.pendingAgentIdsByWorkspace,
-              normalizedWorkspaceKey,
-              normalizedAgentId,
-            );
-            if (pendingAgentIdsByWorkspace === state.pendingAgentIdsByWorkspace) {
-              return state;
-            }
-            return { pendingAgentIdsByWorkspace };
-          });
-        },
         reorderTabs: (workspaceKey, tabIds) => {
           const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
           if (!normalizedWorkspaceKey) {
@@ -1415,7 +1326,7 @@ export function createWorkspaceLayoutStore(
             }
             const restoredLayout =
               normalizedToPaneId === explorerSidebarPaneId
-                ? restoreEmptyPanesInLayout(nextLayout, explorerSidebarPaneId)
+                ? restoreWorkspaceLayout(nextLayout, explorerSidebarPaneId)
                 : nextLayout;
             const normalizedNextLayout = keepWorkspaceFocusOutOfExplorerSidebar(
               restoredLayout,
@@ -1676,11 +1587,6 @@ export function createWorkspaceLayoutStore(
               delete nextPinnedAgentIdsByWorkspace[normalizedWorkspaceKey];
               return {
                 pinnedAgentIdsByWorkspace: nextPinnedAgentIdsByWorkspace,
-                pendingAgentIdsByWorkspace: removeAgentIdFromWorkspaceSet(
-                  state.pendingAgentIdsByWorkspace,
-                  normalizedWorkspaceKey,
-                  normalizedAgentId,
-                ),
               };
             }
 
@@ -1692,11 +1598,6 @@ export function createWorkspaceLayoutStore(
                 ...state.pinnedAgentIdsByWorkspace,
                 [normalizedWorkspaceKey]: nextPinnedAgentIds,
               },
-              pendingAgentIdsByWorkspace: removeAgentIdFromWorkspaceSet(
-                state.pendingAgentIdsByWorkspace,
-                normalizedWorkspaceKey,
-                normalizedAgentId,
-              ),
             };
           });
         },
@@ -1756,14 +1657,18 @@ export function createWorkspaceLayoutStore(
               normalizedWorkspaceKey in state.splitSizesByWorkspace ||
               normalizedWorkspaceKey in state.explorerSidebarWidthByWorkspace ||
               normalizedWorkspaceKey in state.pinnedAgentIdsByWorkspace ||
-              normalizedWorkspaceKey in state.pendingAgentIdsByWorkspace ||
               normalizedWorkspaceKey in state.hiddenAgentIdsByWorkspace ||
               normalizedWorkspaceKey in state.focusRestorationByWorkspace ||
               normalizedWorkspaceKey in state.explorerSidebarPaneIdByWorkspace ||
-              normalizedWorkspaceKey in state.sidePaneIdByWorkspace;
+              normalizedWorkspaceKey in state.sidePaneIdByWorkspace ||
+              normalizedWorkspaceKey in state.pullRequestTabAutoOpenedByWorkspace;
             if (!hasAny) {
               return state;
             }
+            const {
+              [normalizedWorkspaceKey]: _autoOpened,
+              ...pullRequestTabAutoOpenedByWorkspace
+            } = state.pullRequestTabAutoOpenedByWorkspace;
             const { [normalizedWorkspaceKey]: _layout, ...layoutByWorkspace } =
               state.layoutByWorkspace;
             const { [normalizedWorkspaceKey]: _splits, ...splitSizesByWorkspace } =
@@ -1774,8 +1679,6 @@ export function createWorkspaceLayoutStore(
             } = state.explorerSidebarWidthByWorkspace;
             const { [normalizedWorkspaceKey]: _pinned, ...pinnedAgentIdsByWorkspace } =
               state.pinnedAgentIdsByWorkspace;
-            const { [normalizedWorkspaceKey]: _pending, ...pendingAgentIdsByWorkspace } =
-              state.pendingAgentIdsByWorkspace;
             const { [normalizedWorkspaceKey]: _hidden, ...hiddenAgentIdsByWorkspace } =
               state.hiddenAgentIdsByWorkspace;
             const { [normalizedWorkspaceKey]: _restoration, ...focusRestorationByWorkspace } =
@@ -1787,11 +1690,11 @@ export function createWorkspaceLayoutStore(
             const { [normalizedWorkspaceKey]: _sidePane, ...sidePaneIdByWorkspace } =
               state.sidePaneIdByWorkspace;
             return {
+              pullRequestTabAutoOpenedByWorkspace,
               layoutByWorkspace,
               splitSizesByWorkspace,
               explorerSidebarWidthByWorkspace,
               pinnedAgentIdsByWorkspace,
-              pendingAgentIdsByWorkspace,
               hiddenAgentIdsByWorkspace,
               focusRestorationByWorkspace,
               explorerSidebarPaneIdByWorkspace,
@@ -1817,10 +1720,17 @@ export function createWorkspaceLayoutStore(
           }
           return {
             layoutByWorkspace,
+            pinnedAgentIdsByWorkspace: Object.fromEntries(
+              Object.entries(state.pinnedAgentIdsByWorkspace).map(([key, agentIds]) => [
+                key,
+                Array.from(agentIds),
+              ]),
+            ),
             splitSizesByWorkspace: state.splitSizesByWorkspace,
             explorerSidebarWidthByWorkspace: state.explorerSidebarWidthByWorkspace,
             explorerPaneIdByWorkspace: state.explorerSidebarPaneIdByWorkspace,
             sidePaneIdByWorkspace: state.sidePaneIdByWorkspace,
+            pullRequestTabAutoOpenedByWorkspace: state.pullRequestTabAutoOpenedByWorkspace,
           };
         },
         merge: (persistedState, currentState) => {
@@ -1836,25 +1746,33 @@ export function createWorkspaceLayoutStore(
           for (const [workspaceKey, persistedLayout] of Object.entries(
             result.data.layoutByWorkspace,
           )) {
-            const strippedLayout = stripEphemeralTabsFromLayout(persistedLayout);
+            const restoredLayout = restoreWorkspaceLayout(
+              stripEphemeralTabsFromLayout(persistedLayout),
+              resolveExplorerSidebarPaneId(
+                persistedLayout,
+                explorerSidebarPaneIdByWorkspace[workspaceKey],
+              ),
+              ids.createNodeId,
+            );
             const explorerSidebar = ensurePersistedExplorerSidebarPane({
-              layout: strippedLayout,
+              layout: restoredLayout,
               registeredPaneId: explorerSidebarPaneIdByWorkspace[workspaceKey],
               ids,
             });
-            if (!explorerSidebar) {
-              layoutByWorkspace[workspaceKey] = restoreEmptyPanesInLayout(strippedLayout);
-              continue;
+            layoutByWorkspace[workspaceKey] = explorerSidebar?.layout ?? restoredLayout;
+            if (explorerSidebar) {
+              explorerSidebarPaneIdByWorkspace[workspaceKey] = explorerSidebar.paneId;
             }
-            layoutByWorkspace[workspaceKey] = restoreEmptyPanesInLayout(
-              explorerSidebar.layout,
-              explorerSidebar.paneId,
-            );
-            explorerSidebarPaneIdByWorkspace[workspaceKey] = explorerSidebar.paneId;
           }
           return {
             ...currentState,
             layoutByWorkspace,
+            pinnedAgentIdsByWorkspace: Object.fromEntries(
+              Object.entries(result.data.pinnedAgentIdsByWorkspace ?? {}).map(([key, agentIds]) => [
+                key,
+                new Set(agentIds),
+              ]),
+            ),
             splitSizesByWorkspace: result.data.splitSizesByWorkspace ?? {},
             explorerSidebarWidthByWorkspace:
               result.data.explorerSidebarWidthByWorkspace ??
@@ -1865,6 +1783,8 @@ export function createWorkspaceLayoutStore(
               ),
             explorerSidebarPaneIdByWorkspace,
             sidePaneIdByWorkspace: result.data.sidePaneIdByWorkspace ?? {},
+            pullRequestTabAutoOpenedByWorkspace:
+              result.data.pullRequestTabAutoOpenedByWorkspace ?? {},
           };
         },
       },
@@ -1874,6 +1794,39 @@ export function createWorkspaceLayoutStore(
 
 export const useWorkspaceLayoutStore = createWorkspaceLayoutStore();
 
+/**
+ * The agent tabs that exist right now, across every workspace of this host, independently
+ * of which workspace views are mounted. Timeline sync uses this to release a chat when its
+ * tab closes. It is not a subscription source: this layout is restored from disk at launch,
+ * so subscribing to it would resume every agent the user has ever opened.
+ */
+export function observeOpenWorkspaceAgentIds(
+  serverId: string,
+  listener: (agentIds: string[]) => void,
+  store = useWorkspaceLayoutStore,
+): () => void {
+  let previous: string[] | undefined;
+  const publish = (state: Pick<WorkspaceLayoutStore, "layoutByWorkspace">) => {
+    const ids = new Set<string>();
+    for (const [workspaceKey, layout] of Object.entries(state.layoutByWorkspace)) {
+      if (!workspaceKey.startsWith(`${serverId}:`)) continue;
+      for (const tab of collectAllTabs(layout.root)) {
+        if (tab.target.kind === "agent") ids.add(tab.target.agentId);
+      }
+    }
+    const next = [...ids].sort();
+    if (previous?.length === next.length && previous.every((id, index) => id === next[index]))
+      return;
+    previous = next;
+    listener(next);
+  };
+  const unsubscribe = store.subscribe((state, before) => {
+    if (state.layoutByWorkspace !== before.layoutByWorkspace) publish(state);
+  });
+  publish(store.getState());
+  return unsubscribe;
+}
+
 export function useWorkspaceLayoutStoreHydrated(): boolean {
   const [hasHydrated, setHasHydrated] = useState(() =>
     useWorkspaceLayoutStore.persist.hasHydrated(),
diff --git a/packages/app/src/stores/workspace-setup-store.test.ts b/packages/app/src/stores/workspace-setup-store.test.ts
index f826d8ffa0..85c2696f57 100644
--- a/packages/app/src/stores/workspace-setup-store.test.ts
+++ b/packages/app/src/stores/workspace-setup-store.test.ts
@@ -145,6 +145,8 @@ describe("workspace-setup-store", () => {
       sourceWorkspaceId: "42",
       displayName: "project",
       creationMethod: "open_project",
+      creationId: expect.any(String),
+      worktreeSlug: expect.any(String),
     });
   });
 
diff --git a/packages/app/src/stores/workspace-setup-store.ts b/packages/app/src/stores/workspace-setup-store.ts
index 31e3bfc024..d0205ba27a 100644
--- a/packages/app/src/stores/workspace-setup-store.ts
+++ b/packages/app/src/stores/workspace-setup-store.ts
@@ -1,3 +1,5 @@
+import { createNameId } from "mnemonic-id";
+import { generateDraftId } from "@/stores/draft-keys";
 import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { create } from "zustand";
 import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
@@ -44,7 +46,9 @@ export function shouldSeedWorkspaceSetupTab(snapshot: WorkspaceSetupSnapshot | n
 }
 
 interface WorkspaceSetupStoreState {
-  pendingWorkspaceSetup: PendingWorkspaceSetup | null;
+  pendingWorkspaceSetup:
+    | (PendingWorkspaceSetup & { creationId: string; worktreeSlug: string })
+    | null;
   snapshots: Record<string, WorkspaceSetupSnapshot>;
   requestedKeys: Set<string>;
   surfacedFailedSetupKeys: Set<string>;
@@ -71,7 +75,13 @@ export const useWorkspaceSetupStore = create<WorkspaceSetupStoreState>()((set, g
   requestedKeys: new Set(),
   surfacedFailedSetupKeys: new Set(),
   beginWorkspaceSetup: (value) => {
-    set({ pendingWorkspaceSetup: value });
+    set({
+      pendingWorkspaceSetup: {
+        ...value,
+        creationId: generateDraftId(),
+        worktreeSlug: createNameId(),
+      },
+    });
   },
   clearWorkspaceSetup: () => {
     set({ pendingWorkspaceSetup: null });
diff --git a/packages/app/src/stores/workspace-subagents-integration.test.ts b/packages/app/src/stores/workspace-subagents-integration.test.ts
index 29925efd42..5f04a39bd9 100644
--- a/packages/app/src/stores/workspace-subagents-integration.test.ts
+++ b/packages/app/src/stores/workspace-subagents-integration.test.ts
@@ -37,7 +37,7 @@ const AGENT_DEFAULTS: Agent = {
   id: "agent",
   provider: "codex",
   status: "idle",
-  activeTurn: null,
+  turn: { phase: "idle", cancellationRequestId: null },
   createdAt: AGENT_TIMESTAMP,
   updatedAt: AGENT_TIMESTAMP,
   lastUserMessageAt: null,
diff --git a/packages/app/src/styles/density.ts b/packages/app/src/styles/density.ts
new file mode 100644
index 0000000000..5b452bcb93
--- /dev/null
+++ b/packages/app/src/styles/density.ts
@@ -0,0 +1,57 @@
+import { isCompactBreakpoint } from "@/constants/layout";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+
+/**
+ * Density sizes for surfaces that opt into touch sizing: rows, icons, and text grow on compact
+ * layouts and keep their desktop sizes from the `md` breakpoint up. Plain theme tokens stay
+ * desktop-sized everywhere, so a surface migrates by swapping its sizes for these.
+ *
+ * Style values are Unistyles breakpoint values, resolved inside `StyleSheet.create`. Icon sizes
+ * are props, so icons take them through `DensityIcon` or a `densityIconProps` mapping.
+ */
+
+export type DensityIconSize = keyof typeof ICON_SIZE;
+type TextSize = "sm" | "base";
+
+const COMPACT_ICON_SIZE: Record<DensityIconSize, number> = { xs: 14, sm: 18, md: 20, lg: 24 };
+const COMPACT_TEXT_SIZE: Record<TextSize, keyof Theme["fontSize"]> = { sm: "base", base: "lg" };
+
+// Compact layouts end where `md` begins; see `isCompactBreakpoint`.
+function byLayout<T>(compact: T, desktop: T) {
+  return { xs: compact, md: desktop };
+}
+
+export const density = {
+  /** A list row such as a sidebar entry. */
+  rowHeight: byLayout(44, 36),
+  /** A row in a tight group, such as the sidebar's navigation rows. */
+  tightRowHeight: byLayout(40, 28),
+  /** The line height of a row's `base` text; slots that align to its first line share it. */
+  rowLineHeight: byLayout(22, 20),
+  /** A square icon-only button that sits in a row or toolbar. */
+  iconButton: byLayout(44, 28),
+};
+
+/** The width or height of a slot that holds an icon of `size`. */
+export function densityIconBox(size: DensityIconSize) {
+  return byLayout(COMPACT_ICON_SIZE[size], ICON_SIZE[size]);
+}
+
+export function densityFontSize(theme: Theme, size: TextSize) {
+  return byLayout(theme.fontSize[COMPACT_TEXT_SIZE[size]], theme.fontSize[size]);
+}
+
+export function densityIconSize(rt: { breakpoint?: string }, size: DensityIconSize): number {
+  return isCompactBreakpoint(rt.breakpoint) ? COMPACT_ICON_SIZE[size] : ICON_SIZE[size];
+}
+
+/** Extends a `withUnistyles` icon mapping so the icon also takes its density size. */
+export function densityIconProps<P extends object>(
+  size: DensityIconSize,
+  mapping: (theme: Theme) => P,
+) {
+  return (theme: Theme, rt: { breakpoint?: string }) => ({
+    ...mapping(theme),
+    size: densityIconSize(rt, size),
+  });
+}
diff --git a/packages/app/src/styles/theme.test.ts b/packages/app/src/styles/theme.test.ts
index 707085e7c9..461d980ecd 100644
--- a/packages/app/src/styles/theme.test.ts
+++ b/packages/app/src/styles/theme.test.ts
@@ -68,9 +68,9 @@ describe("Pure black theme", () => {
 });
 
 describe("Sidebar interaction surfaces", () => {
-  it("keeps Light selection distinct from the sidebar surface", () => {
-    expect(lightTheme.colors.surfaceSidebarHover).toBe(lightTheme.colors.surface1);
-    expect(lightTheme.colors.surfaceSidebarSelected).toBe(lightTheme.colors.surface3);
+  it("keeps Light hover and selection darker than the sidebar surface", () => {
+    expect(lightTheme.colors.surfaceSidebarHover).toBe(lightTheme.colors.surface3);
+    expect(lightTheme.colors.surfaceSidebarSelected).toBe(lightTheme.colors.surface4);
     expect(lightTheme.colors.surfaceSidebarSelected).not.toBe(lightTheme.colors.surfaceSidebar);
   });
 
diff --git a/packages/app/src/styles/theme.ts b/packages/app/src/styles/theme.ts
index 918c83b9ab..8e1e77aac7 100644
--- a/packages/app/src/styles/theme.ts
+++ b/packages/app/src/styles/theme.ts
@@ -159,6 +159,20 @@ const darkStatusColors = {
   statusMerged: "#a890d5",
 };
 
+// Status tints — the fill of a status badge. The status color itself at low opacity, so a
+// badge takes its state's hue from the same source as its text and never drifts from it.
+// Dark surfaces swallow more of the tint, so the dark band runs a little stronger.
+function statusTints(colors: typeof lightStatusColors, alphaHex: string) {
+  return {
+    statusSuccessTint: `${colors.statusSuccess}${alphaHex}`,
+    statusDangerTint: `${colors.statusDanger}${alphaHex}`,
+    statusWarningTint: `${colors.statusWarning}${alphaHex}`,
+  };
+}
+
+const lightStatusTints = statusTints(lightStatusColors, "1f"); // 12%
+const darkStatusTints = statusTints(darkStatusColors, "29"); // 16%
+
 // Status *dot* colors — the small filled discs on a sidebar row, and the glyphs that stand in
 // for them. Same four hues and the same generation rule as the status colors above, but its
 // own band, because a dot is doing a different job than a check icon or a host badge.
@@ -253,8 +267,8 @@ export function buildLightSemanticColors(tint: LightThemeConfig) {
     surface4: tint.surface4,
     surfaceDiffEmpty: tint.surfaceDiffEmpty,
     surfaceSidebar: tint.surfaceSidebar,
-    surfaceSidebarHover: tint.surface1,
-    surfaceSidebarSelected: tint.surface3,
+    surfaceSidebarHover: tint.surface3,
+    surfaceSidebarSelected: tint.surface4,
     surfaceWorkspace: tint.surface0,
     interactionHighlight: "rgba(0, 0, 0, 0.06)",
 
@@ -289,6 +303,7 @@ export function buildLightSemanticColors(tint: LightThemeConfig) {
 
     ...lightDiffColors,
     ...lightStatusColors,
+    ...lightStatusTints,
     ...lightStatusDotColors,
 
     terminal: {
@@ -420,6 +435,7 @@ export function buildDarkSemanticColors(tint: DarkThemeConfig) {
 
     ...darkDiffColors,
     ...darkStatusColors,
+    ...darkStatusTints,
     ...darkStatusDotColors,
 
     terminal: {
@@ -581,6 +597,8 @@ export const ICON_SIZE = {
   lg: 20,
 } as const;
 
+export const ICON_STROKE_WIDTH = 1.5;
+
 export const FONT_WEIGHT = {
   normal: "normal" as const,
   medium: "500" as const,
@@ -626,7 +644,10 @@ export const DEFAULT_MONO_FONT_STACK: string = Platform.select({
   web: "SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
 });
 
-// `fontSize`, `fontFamily`, and `lineHeight` are deliberately widened to plain
+// Chat and markdown content column; the appearance updater patches the user's width in.
+export const DEFAULT_CONTENT_MAX_WIDTH = 820;
+
+// `fontSize`, `fontFamily`, `lineHeight`, and `contentMaxWidth` are deliberately widened to plain
 // `number`/`string` (not narrowed by `as const`) so the appearance updater can patch
 // them at runtime via `UnistylesRuntime.updateTheme`. The remaining tokens keep their
 // literal types.
@@ -635,6 +656,7 @@ interface CommonTheme {
   fontSize: Record<keyof typeof FONT_SIZE, number>;
   fontFamily: { ui: string; mono: string };
   lineHeight: Record<keyof typeof LINE_HEIGHT, number>;
+  contentMaxWidth: number;
   iconSize: typeof ICON_SIZE;
   fontWeight: typeof FONT_WEIGHT;
   borderRadius: typeof BORDER_RADIUS;
@@ -647,6 +669,7 @@ const commonTheme: CommonTheme = {
   fontSize: FONT_SIZE,
   fontFamily: { ui: DEFAULT_UI_FONT_STACK, mono: DEFAULT_MONO_FONT_STACK },
   lineHeight: LINE_HEIGHT,
+  contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
   iconSize: ICON_SIZE,
   fontWeight: FONT_WEIGHT,
   borderRadius: BORDER_RADIUS,
diff --git a/packages/app/src/subagents/archive-finished.test.ts b/packages/app/src/subagents/archive-finished.test.ts
index 42a3e51ca6..5c1615d96c 100644
--- a/packages/app/src/subagents/archive-finished.test.ts
+++ b/packages/app/src/subagents/archive-finished.test.ts
@@ -11,6 +11,10 @@ function paseo(id: string, status: PaseoSubagentRow["status"] = "idle"): PaseoSu
     description: null,
     subtitle: null,
     status,
+    turn:
+      status === "running"
+        ? { phase: "open", turnId: null, startedAt: null, cancellationRequestId: null }
+        : { phase: "idle", cancellationRequestId: null },
     requiresAttention: false,
     createdAt: new Date(),
   };
diff --git a/packages/app/src/subagents/provider-store.test.ts b/packages/app/src/subagents/provider-store.test.ts
index ea863ea37a..01d6880d5b 100644
--- a/packages/app/src/subagents/provider-store.test.ts
+++ b/packages/app/src/subagents/provider-store.test.ts
@@ -1,5 +1,13 @@
+import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, describe, expect, test } from "vitest";
-import { providerSubagentKey, useProviderSubagentStore } from "./provider-store";
+import type { ProviderSubagentDescriptorPayload } from "@getpaseo/protocol/messages";
+import {
+  observeProviderSubagentTimeline,
+  providerSubagentKey,
+  refreshProviderSubagents,
+  resyncProviderSubagents,
+  useProviderSubagentStore,
+} from "./provider-store";
 
 const SERVER_ID = "server-1";
 const PARENT_ID = "parent-1";
@@ -10,6 +18,7 @@ afterEach(() => {
     descriptors: new Map(),
     timelines: new Map(),
     hiddenFromTrack: new Set(),
+    trackedParents: new Set(),
   });
 });
 
@@ -41,6 +50,7 @@ describe("provider subagent client store", () => {
       item: { type: "assistant_message", text: "New live output." },
     });
     subagents.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "history-1",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -103,12 +113,12 @@ describe("provider subagent client store", () => {
     const state = useProviderSubagentStore.getState();
     expect(state.descriptors.get(key)?.status).toBe("completed");
     expect(state.timelines.get(key)?.head).toEqual([]);
-    expect(state.timelines.get(key)?.tail).toEqual([
-      expect.objectContaining({
-        kind: "assistant_message",
-        text: "Older history.New live output.",
-      }),
-    ]);
+    expect(
+      state.timelines
+        .get(key)
+        ?.tail.map((item) => (item.kind === "assistant_message" ? item.text : ""))
+        .join(""),
+    ).toBe("Older history.New live output.");
   });
 
   test("removes timelines for children no longer returned by the provider", () => {
@@ -325,6 +335,7 @@ describe("provider subagent client store", () => {
   test("merges bounded older pages and tracks whether more history remains", () => {
     const store = useProviderSubagentStore.getState();
     store.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "tail-page",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -347,6 +358,7 @@ describe("provider subagent client store", () => {
       error: null,
     });
     store.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "older-page",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -373,8 +385,8 @@ describe("provider subagent client store", () => {
       .getState()
       .timelines.get(providerSubagentKey(SERVER_ID, PARENT_ID, SUBAGENT_ID));
     expect(timeline?.hasOlder).toBe(false);
-    expect([...timeline!.rows.keys()]).toEqual([2, 1]);
-    expect(timeline?.head).toEqual([
+    expect(timeline?.cursor).toMatchObject({ startSeq: 1, endSeq: 2 });
+    expect([...(timeline?.tail ?? []), ...(timeline?.head ?? [])]).toEqual([
       expect.objectContaining({ kind: "assistant_message", text: "Older output.Recent output." }),
     ]);
   });
@@ -382,6 +394,7 @@ describe("provider subagent client store", () => {
   test("ignores delayed live updates from a stale timeline epoch", () => {
     const store = useProviderSubagentStore.getState();
     store.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "current-page",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -419,8 +432,8 @@ describe("provider subagent client store", () => {
       .getState()
       .timelines.get(providerSubagentKey(SERVER_ID, PARENT_ID, SUBAGENT_ID));
     expect(timeline?.epoch).toBe("epoch-current");
-    expect([...timeline!.rows.keys()]).toEqual([2]);
-    expect(timeline?.head).toEqual([
+    expect(timeline?.cursor).toMatchObject({ startSeq: 2, endSeq: 2 });
+    expect([...(timeline?.tail ?? []), ...(timeline?.head ?? [])]).toEqual([
       expect.objectContaining({ kind: "assistant_message", text: "Current output." }),
     ]);
   });
@@ -428,6 +441,7 @@ describe("provider subagent client store", () => {
   test("replaces cached rows with an authoritative tail page after a reconnect gap", () => {
     const store = useProviderSubagentStore.getState();
     store.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "old-tail",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -450,6 +464,7 @@ describe("provider subagent client store", () => {
       error: null,
     });
     store.replaceTimeline(SERVER_ID, {
+      projection: "projected",
       requestId: "reconnect-tail",
       parentAgentId: PARENT_ID,
       subagentId: SUBAGENT_ID,
@@ -475,9 +490,337 @@ describe("provider subagent client store", () => {
     const timeline = useProviderSubagentStore
       .getState()
       .timelines.get(providerSubagentKey(SERVER_ID, PARENT_ID, SUBAGENT_ID));
-    expect([...timeline!.rows.keys()]).toEqual([401]);
-    expect(timeline?.head).toEqual([
+    expect(timeline?.cursor).toMatchObject({ startSeq: 401, endSeq: 401 });
+    expect([...(timeline?.tail ?? []), ...(timeline?.head ?? [])]).toEqual([
       expect.objectContaining({ kind: "assistant_message", text: "Current tail output." }),
     ]);
   });
 });
+
+describe("projected child history", () => {
+  const key = providerSubagentKey(SERVER_ID, PARENT_ID, SUBAGENT_ID);
+  const timestamp = "2026-09-14T00:00:00.000Z";
+  const current = () => useProviderSubagentStore.getState().timelines.get(key)!;
+  const text = () =>
+    [...current().tail, ...current().head]
+      .map((item) => (item.kind === "assistant_message" ? item.text : ""))
+      .join("");
+  function stream(seq: number, value: string) {
+    useProviderSubagentStore.getState().applyUpdate(SERVER_ID, {
+      kind: "timeline",
+      parentAgentId: PARENT_ID,
+      subagentId: SUBAGENT_ID,
+      provider: "codex",
+      epoch: "e",
+      seq,
+      timestamp,
+      item: { type: "assistant_message", messageId: "m", text: value },
+    });
+  }
+  type Payload = Parameters<
+    ReturnType<typeof useProviderSubagentStore.getState>["replaceTimeline"]
+  >[1];
+  function response(
+    value: string,
+    seqStart: number,
+    seqEnd: number,
+    direction: "tail" | "after" = "tail",
+  ): Payload {
+    return {
+      requestId: "r",
+      parentAgentId: PARENT_ID,
+      subagentId: SUBAGENT_ID,
+      provider: "codex",
+      epoch: "e",
+      direction,
+      projection: "projected",
+      reset: false,
+      staleCursor: false,
+      gap: false,
+      window: { minSeq: 1, maxSeq: seqEnd, nextSeq: seqEnd + 1 },
+      startCursor: { epoch: "e", seq: seqStart },
+      endCursor: { epoch: "e", seq: seqEnd },
+      hasOlder: false,
+      hasNewer: false,
+      error: null,
+      rows: [
+        {
+          seq: seqEnd,
+          seqStart,
+          seqEnd,
+          sourceSeqRanges: [{ startSeq: seqStart, endSeq: seqEnd }],
+          timestamp,
+          item: { type: "assistant_message", messageId: "m", text: value },
+        },
+      ],
+    };
+  }
+  function page(
+    value: string,
+    seqStart: number,
+    seqEnd: number,
+    direction: "tail" | "after" = "tail",
+  ) {
+    useProviderSubagentStore
+      .getState()
+      .replaceTimeline(SERVER_ID, response(value, seqStart, seqEnd, direction));
+  }
+  test("replaces overlapping fetched text and continues live streaming", () => {
+    page("AB", 1, 2);
+    stream(3, "C");
+    page("ABCD", 1, 4, "after");
+    expect(text()).toBe("ABCD");
+    stream(5, "E");
+    expect(text()).toBe("ABCDE");
+  });
+  test("reconciles a tail snapshot racing newer live text", () => {
+    stream(1, "A");
+    stream(2, "B");
+    stream(3, "C");
+    page("AB", 1, 2);
+    page("ABC", 1, 3);
+    expect(text()).toBe("ABC");
+    expect(current().needsRefresh).toBe(false);
+  });
+  test("recovers a live sequence gap while observed and stops fetching when closed", async () => {
+    let calls = 0;
+    const client = {
+      async fetchProviderSubagentTimeline() {
+        calls++;
+        return calls === 1 ? response("A", 1, 1) : response("ABC", 1, 3);
+      },
+    };
+    const errors: unknown[] = [];
+    const stop = observeProviderSubagentTimeline({
+      client,
+      serverId: SERVER_ID,
+      parentAgentId: PARENT_ID,
+      subagentId: SUBAGENT_ID,
+      limit: 100,
+      reportError: (error) => {
+        errors.push(error);
+      },
+    });
+    try {
+      await expect.poll(() => current()?.cursor?.endSeq).toBe(1);
+      stream(3, "C");
+      await expect.poll(text).toBe("ABC");
+      expect(calls).toBe(2);
+      expect(current().needsRefresh).toBe(false);
+    } finally {
+      stop();
+    }
+    stream(5, "E");
+    await Promise.resolve();
+    expect(calls).toBe(2);
+    expect(errors).toEqual([]);
+  });
+  test("retries a disconnected history read on the next stream update", async () => {
+    let calls = 0;
+    const errors: unknown[] = [];
+    const stop = observeProviderSubagentTimeline({
+      client: {
+        async fetchProviderSubagentTimeline() {
+          calls++;
+          if (calls === 2) throw new DaemonConnectionError("Connection lost");
+          return calls === 1 ? response("A", 1, 1) : response("ABCD", 1, 4);
+        },
+      },
+      serverId: SERVER_ID,
+      parentAgentId: PARENT_ID,
+      subagentId: SUBAGENT_ID,
+      limit: 100,
+      reportError: (error) => {
+        errors.push(error);
+      },
+    });
+    try {
+      await expect.poll(() => current()?.cursor?.endSeq).toBe(1);
+      stream(3, "C");
+      await expect.poll(() => calls).toBe(2);
+      expect(current().needsRefresh).toBe(true);
+      stream(4, "D");
+      await expect.poll(text).toBe("ABCD");
+      expect(current().needsRefresh).toBe(false);
+      expect(errors).toEqual([]);
+    } finally {
+      stop();
+    }
+  });
+  test("reports unexpected child history failures", async () => {
+    const failure = new TypeError("Invalid child timeline response");
+    const errors: unknown[] = [];
+    const stop = observeProviderSubagentTimeline({
+      client: {
+        async fetchProviderSubagentTimeline() {
+          throw failure;
+        },
+      },
+      serverId: SERVER_ID,
+      parentAgentId: PARENT_ID,
+      subagentId: SUBAGENT_ID,
+      limit: 100,
+      reportError: (error) => {
+        errors.push(error);
+      },
+    });
+    try {
+      await expect.poll(() => errors).toEqual([failure]);
+    } finally {
+      stop();
+    }
+  });
+  test("keeps a completed tool at its original position after fetching its latest update", () => {
+    const payload = response("Answer", 1, 5);
+    payload.rows = [
+      {
+        seq: 5,
+        seqStart: 1,
+        seqEnd: 5,
+        sourceSeqRanges: [
+          { startSeq: 1, endSeq: 1 },
+          { startSeq: 5, endSeq: 5 },
+        ],
+        timestamp,
+        item: {
+          type: "tool_call",
+          callId: "t",
+          name: "shell",
+          status: "completed",
+          error: null,
+          detail: { type: "plain_text", label: "work" },
+        },
+      },
+      {
+        seq: 4,
+        seqStart: 2,
+        seqEnd: 4,
+        sourceSeqRanges: [{ startSeq: 2, endSeq: 4 }],
+        timestamp,
+        item: { type: "assistant_message", text: "Answer", messageId: "m" },
+      },
+    ];
+    useProviderSubagentStore.getState().replaceTimeline(SERVER_ID, payload);
+    expect([...current().tail, ...current().head].map((item) => item.kind)).toEqual([
+      "tool_call",
+      "assistant_message",
+    ]);
+  });
+  test("retains projected display state rather than cumulative tool snapshots", () => {
+    for (let seq = 1; seq <= 2000; seq++) {
+      useProviderSubagentStore.getState().applyUpdate(SERVER_ID, {
+        kind: "timeline",
+        parentAgentId: PARENT_ID,
+        subagentId: SUBAGENT_ID,
+        provider: "codex",
+        epoch: "e",
+        seq,
+        timestamp,
+        item: {
+          type: "tool_call",
+          callId: "tool",
+          name: "task",
+          status: "running",
+          error: null,
+          detail: { type: "sub_agent", description: "Child", log: "x".repeat(seq * 128) },
+        },
+      });
+    }
+    expect([...current().tail, ...current().head]).toHaveLength(1);
+    expect(JSON.stringify(current()).length).toBeLessThan(1_000_000);
+    expect(current().lastSeq).toBe(2000);
+  });
+});
+
+describe("resyncing after the update feed resubscribes", () => {
+  function child(
+    id: string,
+    parentAgentId: string,
+    status: ProviderSubagentDescriptorPayload["status"],
+  ): ProviderSubagentDescriptorPayload {
+    return {
+      id,
+      parentAgentId,
+      provider: "claude",
+      title: "Explore",
+      description: null,
+      status,
+      createdAt: "2026-10-07T10:00:00.000Z",
+      updatedAt: "2026-10-07T10:00:00.000Z",
+      toolCallId: id,
+    };
+  }
+
+  function fakeDaemon(lists: Record<string, ProviderSubagentDescriptorPayload[]>) {
+    const requested: string[] = [];
+    return {
+      requested,
+      lists,
+      client: {
+        listProviderSubagents: async (parentAgentId: string) => {
+          requested.push(parentAgentId);
+          return {
+            requestId: "list",
+            parentAgentId,
+            subagents: lists[parentAgentId] ?? [],
+            error: null,
+          };
+        },
+      },
+    };
+  }
+
+  const status = (parentAgentId: string, subagentId: string) =>
+    useProviderSubagentStore
+      .getState()
+      .descriptors.get(providerSubagentKey(SERVER_ID, parentAgentId, subagentId))?.status;
+
+  test("catches up on children that finished or started while updates were not delivered", async () => {
+    const daemon = fakeDaemon({ [PARENT_ID]: [child("child-1", PARENT_ID, "running")] });
+    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
+    expect(status(PARENT_ID, "child-1")).toBe("running");
+
+    // The connection dropped: the daemon finished child-1 and ran child-2 without telling us.
+    daemon.lists[PARENT_ID] = [
+      child("child-1", PARENT_ID, "completed"),
+      child("child-2", PARENT_ID, "completed"),
+    ];
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(status(PARENT_ID, "child-1")).toBe("completed");
+    expect(status(PARENT_ID, "child-2")).toBe("completed");
+  });
+
+  test("catches up on a parent whose first list failed while disconnected", async () => {
+    const daemon = fakeDaemon({});
+    const disconnected = {
+      listProviderSubagents: async () => {
+        throw new DaemonConnectionError("Transport not connected");
+      },
+    };
+    await expect(
+      refreshProviderSubagents(disconnected, SERVER_ID, PARENT_ID),
+    ).rejects.toBeInstanceOf(DaemonConnectionError);
+    useProviderSubagentStore.getState().applyUpdate(SERVER_ID, {
+      kind: "upsert",
+      subagent: child("child-1", PARENT_ID, "running"),
+    });
+
+    // The connection dropped again: the daemon finished child-1 without telling us.
+    daemon.lists[PARENT_ID] = [child("child-1", PARENT_ID, "completed")];
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(status(PARENT_ID, "child-1")).toBe("completed");
+  });
+
+  test("lists again only the parents this server was showing", async () => {
+    const daemon = fakeDaemon({});
+    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
+    await refreshProviderSubagents(daemon.client, "server-2", "other-parent");
+    daemon.requested.length = 0;
+
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(daemon.requested).toEqual([PARENT_ID]);
+  });
+});
diff --git a/packages/app/src/subagents/provider-store.ts b/packages/app/src/subagents/provider-store.ts
index 15a9eb9b71..fd44dae8d2 100644
--- a/packages/app/src/subagents/provider-store.ts
+++ b/packages/app/src/subagents/provider-store.ts
@@ -3,36 +3,34 @@ import type {
   ProviderSubagentDescriptorPayload,
   SessionOutboundMessage,
 } from "@getpaseo/protocol/messages";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { DaemonConnectionError, type DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { create } from "zustand";
 import { applyStreamEvent } from "@/types/stream";
+import {
+  processTimelineResponse,
+  processAgentStreamEvent,
+  type TimelineCursor,
+} from "@/timeline/session-stream-reducers";
 import type { StreamItem } from "@/types/stream";
 import type { AgentLifecycleStatus } from "@getpaseo/protocol/agent-lifecycle";
 
-type ProviderSubagentTimelineItem = Extract<
-  Extract<SessionOutboundMessage, { type: "agent.provider_subagents.update" }>["payload"],
-  { kind: "timeline" }
->["item"];
-
-interface ProviderSubagentTimelineRow {
-  provider: ProviderSubagentDescriptorPayload["provider"];
-  item: ProviderSubagentTimelineItem;
-  timestamp: string;
-}
-
 export interface ProviderSubagentTimelineState {
   tail: StreamItem[];
   head: StreamItem[];
   epoch: string | null;
   lastSeq: number;
   hasOlder: boolean;
-  rows: Map<number, ProviderSubagentTimelineRow>;
+  cursor: TimelineCursor | undefined;
+  needsRefresh: boolean;
 }
 
 interface ProviderSubagentState {
   descriptors: Map<string, ProviderSubagentDescriptorPayload>;
   timelines: Map<string, ProviderSubagentTimelineState>;
   hiddenFromTrack: Set<string>;
+  /** Parents whose list this client asked for, so a resubscribed update feed can catch them up. */
+  trackedParents: Set<string>;
+  trackParent(serverId: string, parentAgentId: string): void;
   hideFromTrack(serverId: string, parentAgentId: string, subagentIds: readonly string[]): void;
   replaceList(
     serverId: string,
@@ -89,6 +87,7 @@ export function refreshProviderSubagents(
   const pending = clientRequests.get(requestKey);
   if (pending) return pending;
 
+  useProviderSubagentStore.getState().trackParent(serverId, parentAgentId);
   const request = client
     .listProviderSubagents(parentAgentId)
     .then((payload) => {
@@ -106,13 +105,35 @@ function parentPrefix(serverId: string, parentAgentId: string): string {
   return `${serverId}\0${parentAgentId}\0`;
 }
 
+/**
+ * Updates are not replayed across a reconnect, so a child that finished or started while the
+ * update feed was down stays stale until its parent is listed again. Call this once the feed has
+ * resubscribed, so every update after the list is delivered.
+ */
+export async function resyncProviderSubagents(
+  client: ProviderSubagentListClient,
+  serverId: string,
+): Promise<void> {
+  const serverPrefix = `${serverId}\0`;
+  const parentAgentIds = [...useProviderSubagentStore.getState().trackedParents]
+    .filter((key) => key.startsWith(serverPrefix))
+    .map((key) => key.slice(serverPrefix.length, -1));
+  await Promise.all(
+    parentAgentIds.map((parentAgentId) =>
+      // A parent that was archived meanwhile has nothing left to catch up.
+      refreshProviderSubagents(client, serverId, parentAgentId).catch(() => undefined),
+    ),
+  );
+}
+
 const EMPTY_TIMELINE: ProviderSubagentTimelineState = {
   tail: [],
   head: [],
   epoch: null,
   lastSeq: 0,
   hasOlder: false,
-  rows: new Map(),
+  cursor: undefined,
+  needsRefresh: false,
 };
 
 function providerSubagentTerminalEvent(
@@ -130,72 +151,35 @@ function providerSubagentTerminalEvent(
   return { type: "turn_completed", provider: subagent.provider };
 }
 
-function buildTimelineState(
-  rows: ProviderSubagentTimelineState["rows"],
-  epoch: string | null,
+function settleTimeline(
+  timeline: ProviderSubagentTimelineState,
   descriptor?: ProviderSubagentDescriptorPayload,
-  hasOlder = false,
 ): ProviderSubagentTimelineState {
-  let timeline = { tail: [] as StreamItem[], head: [] as StreamItem[] };
-  for (const [, row] of [...rows].sort(([left], [right]) => left - right)) {
-    timeline = applyStreamEvent({
-      ...timeline,
-      event: { type: "timeline", provider: row.provider, item: row.item },
-      timestamp: new Date(row.timestamp),
-    });
-  }
-  const terminalEvent = descriptor ? providerSubagentTerminalEvent(descriptor) : null;
-  if (terminalEvent && descriptor) {
-    timeline = applyStreamEvent({
-      ...timeline,
-      event: terminalEvent,
-      timestamp: new Date(descriptor.updatedAt),
-    });
-  }
+  const event = descriptor ? providerSubagentTerminalEvent(descriptor) : null;
+  if (!event || !descriptor) return timeline;
   return {
     ...timeline,
-    epoch,
-    lastSeq: rows.size ? Math.max(...rows.keys()) : 0,
-    hasOlder,
-    rows,
+    ...applyStreamEvent({
+      tail: timeline.tail,
+      head: timeline.head,
+      event,
+      timestamp: new Date(descriptor.updatedAt),
+    }),
   };
 }
 
-function buildTimelineResponseRows(
-  existing: ProviderSubagentTimelineState | undefined,
-  payload: Extract<
-    SessionOutboundMessage,
-    { type: "agent.provider_subagents.timeline.get.response" }
-  >["payload"],
-  provider: ProviderSubagentDescriptorPayload["provider"],
-): ProviderSubagentTimelineState["rows"] {
-  const rows = new Map<number, ProviderSubagentTimelineRow>();
-  for (const row of payload.rows) {
-    rows.set(row.seq, { provider, item: row.item, timestamp: row.timestamp });
-  }
-  if (payload.reset || existing?.epoch !== payload.epoch) {
-    return rows;
-  }
-  if (payload.direction !== "tail") {
-    return new Map([...existing.rows, ...rows]);
-  }
-
-  let nextSeq = payload.rows.length
-    ? Math.max(...payload.rows.map((row) => row.seq)) + 1
-    : payload.window.maxSeq + 1;
-  for (const [seq, row] of [...existing.rows].sort(([left], [right]) => left - right)) {
-    if (seq < nextSeq) continue;
-    if (seq !== nextSeq) break;
-    rows.set(seq, row);
-    nextSeq += 1;
-  }
-  return rows;
-}
-
 export const useProviderSubagentStore = create<ProviderSubagentState>((set) => ({
   descriptors: new Map(),
   timelines: new Map(),
   hiddenFromTrack: new Set(),
+  trackedParents: new Set(),
+  trackParent(serverId, parentAgentId) {
+    set((state) => {
+      const prefix = parentPrefix(serverId, parentAgentId);
+      if (state.trackedParents.has(prefix)) return state;
+      return { trackedParents: new Set(state.trackedParents).add(prefix) };
+    });
+  },
   hideFromTrack(serverId, parentAgentId, subagentIds) {
     set((state) => {
       const hiddenFromTrack = new Set(state.hiddenFromTrack);
@@ -229,10 +213,7 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
         const current = timelines.get(key);
         const previous = state.descriptors.get(key);
         if (current && previous?.status !== subagent.status) {
-          timelines.set(
-            key,
-            buildTimelineState(current.rows, current.epoch, subagent, current.hasOlder),
-          );
+          timelines.set(key, settleTimeline(current, subagent));
         }
       }
       return { descriptors, timelines, hiddenFromTrack };
@@ -257,10 +238,7 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
         const current = state.timelines.get(key);
         if (current && previous?.status !== payload.subagent.status) {
           timelines = new Map(state.timelines);
-          timelines.set(
-            key,
-            buildTimelineState(current.rows, current.epoch, payload.subagent, current.hasOlder),
-          );
+          timelines.set(key, settleTimeline(current, payload.subagent));
         }
         return { descriptors, timelines, hiddenFromTrack };
       }
@@ -281,30 +259,33 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
       if (payload.seq <= current.lastSeq) {
         return state;
       }
-      const rows = new Map(current.rows);
-      rows.set(payload.seq, {
-        provider: payload.provider,
-        item: payload.item,
-        timestamp: payload.timestamp,
-      });
-      const descriptor = state.descriptors.get(key);
-      const next =
-        descriptor && descriptor.status !== "running"
-          ? buildTimelineState(rows, payload.epoch, descriptor, current.hasOlder)
-          : applyStreamEvent({
-              tail: current.tail,
-              head: current.head,
-              event: { type: "timeline", provider: payload.provider, item: payload.item },
-              timestamp: new Date(payload.timestamp),
-            });
-      const timelines = new Map(state.timelines);
-      timelines.set(key, {
-        ...next,
+      const next = processAgentStreamEvent({
+        currentTail: current.tail,
+        currentHead: current.head,
+        currentCursor: current.cursor,
+        hasAuthoritativeBaseline: current.cursor !== undefined,
+        event: { type: "timeline", provider: payload.provider, item: payload.item },
+        timestamp: new Date(payload.timestamp),
+        seq: payload.seq,
         epoch: payload.epoch,
-        lastSeq: payload.seq,
-        hasOlder: current.hasOlder,
-        rows,
       });
+      const timelines = new Map(state.timelines);
+      timelines.set(
+        key,
+        settleTimeline(
+          {
+            tail: next.tail,
+            head: next.head,
+            epoch: payload.epoch,
+            lastSeq: payload.seq,
+            cursor: next.cursor ?? current.cursor,
+            hasOlder: current.hasOlder,
+            needsRefresh:
+              current.needsRefresh || next.sideEffects.some((effect) => effect.type === "catch_up"),
+          },
+          state.descriptors.get(key),
+        ),
+      );
       return { timelines };
     });
   },
@@ -316,11 +297,115 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
     set((state) => {
       const key = providerSubagentKey(serverId, payload.parentAgentId, payload.subagentId);
       const existing = state.timelines.get(key);
-      const rows = buildTimelineResponseRows(existing, payload, provider);
-      const descriptor = state.descriptors.get(key);
+      const current = existing ?? EMPTY_TIMELINE;
+      // Normalize optional wire metadata at the child timeline boundary. Legacy
+      // notices are complete singleton items; history always comes from a projected host.
+      const entries = payload.rows.map((row) => ({
+        ...row,
+        provider,
+        seqStart: row.seqStart ?? row.seq,
+        seqEnd: row.seqEnd ?? row.seq,
+      }));
+      const result = processTimelineResponse({
+        payload: {
+          ...payload,
+          agentId: payload.subagentId,
+          projection: "projected",
+          startCursor:
+            payload.startCursor ??
+            (entries.length ? { seq: Math.min(...entries.map((entry) => entry.seqStart)) } : null),
+          endCursor:
+            payload.endCursor ??
+            (entries.length ? { seq: Math.max(...entries.map((entry) => entry.seqEnd)) } : null),
+          entries,
+        },
+        currentTail: current.tail,
+        currentHead: current.head,
+        currentCursor: current.cursor,
+        isInitializing: current.cursor === undefined,
+        hasActiveInitDeferred: current.cursor === undefined,
+        initRequestDirection: "tail",
+        sendingClientMessageIds: [],
+      });
       const timelines = new Map(state.timelines);
-      timelines.set(key, buildTimelineState(rows, payload.epoch, descriptor, payload.hasOlder));
+      timelines.set(
+        key,
+        settleTimeline(
+          {
+            tail: result.tail,
+            head: result.head,
+            epoch: payload.epoch,
+            lastSeq:
+              payload.reset || current.epoch !== payload.epoch
+                ? (result.cursor?.endSeq ?? 0)
+                : Math.max(current.lastSeq, result.cursor?.endSeq ?? 0),
+            cursor: result.cursor ?? undefined,
+            hasOlder:
+              result.older === "unchanged" ? current.hasOlder : result.older === "available",
+            needsRefresh:
+              result.sideEffects.some((effect) => effect.type === "catch_up") &&
+              (payload.hasNewer || current.lastSeq > (result.cursor?.endSeq ?? 0)),
+          },
+          state.descriptors.get(key),
+        ),
+      );
       return { timelines };
     });
   },
 }));
+
+/** Owns child history bootstrap and recovery while a pane observes the child. */
+export function observeProviderSubagentTimeline({
+  client,
+  serverId,
+  parentAgentId,
+  subagentId,
+  limit,
+  reportError,
+}: {
+  client: Pick<DaemonClient, "fetchProviderSubagentTimeline">;
+  serverId: string;
+  parentAgentId: string;
+  subagentId: string;
+  limit: number;
+  reportError: (error: unknown) => void;
+}): () => void {
+  const key = providerSubagentKey(serverId, parentAgentId, subagentId);
+  let active = true;
+  let fetching = false;
+  const refresh = async () => {
+    if (!active || fetching) return;
+    fetching = true;
+    let succeeded = false;
+    try {
+      const payload = await client.fetchProviderSubagentTimeline(parentAgentId, subagentId, {
+        direction: "tail",
+        limit,
+      });
+      if (active) useProviderSubagentStore.getState().replaceTimeline(serverId, payload);
+      succeeded = true;
+    } catch (error) {
+      // A later stream update or reopening the pane retries a disconnected read.
+      if (!(error instanceof DaemonConnectionError)) throw error;
+    } finally {
+      fetching = false;
+      if (
+        succeeded &&
+        active &&
+        useProviderSubagentStore.getState().timelines.get(key)?.needsRefresh
+      )
+        requestRefresh();
+    }
+  };
+  const requestRefresh = () => {
+    void refresh().catch(reportError);
+  };
+  const unsubscribe = useProviderSubagentStore.subscribe((state) => {
+    if (state.timelines.get(key)?.needsRefresh) requestRefresh();
+  });
+  requestRefresh();
+  return () => {
+    active = false;
+    unsubscribe();
+  };
+}
diff --git a/packages/app/src/subagents/select.test.ts b/packages/app/src/subagents/select.test.ts
index 5229acf88d..6835260ca7 100644
--- a/packages/app/src/subagents/select.test.ts
+++ b/packages/app/src/subagents/select.test.ts
@@ -13,7 +13,7 @@ const AGENT_DEFAULTS: Agent = {
   id: "agent",
   provider: "codex",
   status: "idle",
-  activeTurn: null,
+  turn: { phase: "idle", cancellationRequestId: null },
   createdAt: AGENT_TIMESTAMP,
   updatedAt: AGENT_TIMESTAMP,
   lastUserMessageAt: null,
@@ -128,6 +128,54 @@ describe("selectSubagentsForParent", () => {
     expect(useProviderSubagentStore.getState().descriptors.size).toBe(1);
   });
 
+  it("places nested provider children only beneath their direct provider parent", () => {
+    const store = useProviderSubagentStore.getState();
+    const base = {
+      parentAgentId: "parent-a",
+      provider: "claude" as const,
+      title: "general-purpose",
+      subtitle: null,
+      status: "running" as const,
+      createdAt: "2026-09-04T10:00:00.000Z",
+      updatedAt: "2026-09-04T10:00:00.000Z",
+      toolCallId: null,
+    };
+    store.applyUpdate(SERVER_ID, {
+      kind: "upsert",
+      subagent: { ...base, id: "direct", description: "Direct", parentSubagentId: null },
+    });
+    store.applyUpdate(SERVER_ID, {
+      kind: "upsert",
+      subagent: {
+        ...base,
+        id: "nested",
+        description: "Nested",
+        parentSubagentId: "direct",
+      },
+    });
+
+    expect(
+      selectProviderSubagentsForParent(
+        useProviderSubagentStore.getState(),
+        { serverId: SERVER_ID, parentAgentId: "parent-a" },
+        true,
+        true,
+      ).map((row) => row.id),
+    ).toEqual(["direct"]);
+    expect(
+      selectProviderSubagentsForParent(
+        useProviderSubagentStore.getState(),
+        {
+          serverId: SERVER_ID,
+          parentAgentId: "parent-a",
+          providerParentSubagentId: "direct",
+        },
+        true,
+        true,
+      ).map((row) => row.id),
+    ).toEqual(["nested"]);
+  });
+
   it("returns only non-archived children for the requested parent", () => {
     setAgents([
       makeAgent({ id: "parent-a" }),
@@ -268,6 +316,7 @@ describe("selectSubagentsForParent", () => {
         description: null,
         subtitle: null,
         status: "running",
+        turn: { phase: "idle", cancellationRequestId: null },
         requiresAttention: true,
         createdAt,
       },
@@ -282,6 +331,7 @@ describe("selectSubagentsForParent", () => {
       "status",
       "subtitle",
       "title",
+      "turn",
     ]);
     expect(rows[0]).not.toHaveProperty("onOpen");
     expect(rows[0]).not.toHaveProperty("model");
diff --git a/packages/app/src/subagents/select.ts b/packages/app/src/subagents/select.ts
index cc07480b33..3bb3bddcb6 100644
--- a/packages/app/src/subagents/select.ts
+++ b/packages/app/src/subagents/select.ts
@@ -15,6 +15,7 @@ export interface PaseoSubagentRow {
   description: null;
   subtitle: null;
   status: Agent["status"];
+  turn: Agent["turn"];
   requiresAttention: Agent["requiresAttention"];
   createdAt: Agent["createdAt"];
 }
@@ -44,6 +45,8 @@ type ProviderSubagentStoreSnapshot = ReturnType<typeof useProviderSubagentStore.
 interface SelectSubagentsParams {
   serverId: string;
   parentAgentId: string;
+  /** Select children of this provider subagent instead of children of the managed agent. */
+  providerParentSubagentId?: string;
 }
 
 const EMPTY_SUBAGENT_ROWS: SubagentRow[] = [];
@@ -58,6 +61,7 @@ function toSubagentRow(agent: Agent): SubagentRow {
     description: null,
     subtitle: null,
     status: agent.status,
+    turn: agent.turn,
     requiresAttention: agent.requiresAttention,
     createdAt: agent.createdAt,
   };
@@ -97,12 +101,20 @@ export function selectProviderSubagentsForParent(
   state: ProviderSubagentStoreSnapshot,
   params: SelectSubagentsParams,
   supported: boolean,
+  nestingSupported = false,
 ): ProviderSubagentRow[] {
   if (!supported) return EMPTY_PROVIDER_SUBAGENT_ROWS;
+  if (params.providerParentSubagentId && !nestingSupported) return EMPTY_PROVIDER_SUBAGENT_ROWS;
   const rows: ProviderSubagentRow[] = [];
   const prefix = `${params.serverId}\0${params.parentAgentId}\0`;
   for (const [key, subagent] of state.descriptors) {
     if (!key.startsWith(prefix) || state.hiddenFromTrack.has(key)) continue;
+    if (
+      nestingSupported &&
+      (subagent.parentSubagentId ?? null) !== (params.providerParentSubagentId ?? null)
+    ) {
+      continue;
+    }
     rows.push({
       kind: "provider",
       id: subagent.id,
@@ -130,9 +142,13 @@ export function useSubagentsForParent(params: SelectSubagentsParams): SubagentRo
   const supported = useSessionStore(
     (state) => state.sessions[params.serverId]?.serverInfo?.features?.providerSubagents === true,
   );
+  const nestingSupported = useSessionStore(
+    (state) =>
+      state.sessions[params.serverId]?.serverInfo?.features?.providerSubagentNesting === true,
+  );
   const providerRows = useStoreWithEqualityFn(
     useProviderSubagentStore,
-    (state) => selectProviderSubagentsForParent(state, params, supported),
+    (state) => selectProviderSubagentsForParent(state, params, supported, nestingSupported),
     equal,
   );
   const client = useSessionStore((state) => state.sessions[params.serverId]?.client ?? null);
@@ -145,9 +161,10 @@ export function useSubagentsForParent(params: SelectSubagentsParams): SubagentRo
   }, [client, params.parentAgentId, params.serverId, supported]);
 
   return useMemo(() => {
+    if (params.providerParentSubagentId) return providerRows;
     if (providerRows.length === 0) return paseoRows;
     const rows = [...paseoRows, ...providerRows];
     rows.sort((left, right) => left.createdAt.getTime() - right.createdAt.getTime());
     return rows;
-  }, [paseoRows, providerRows]);
+  }, [params.providerParentSubagentId, paseoRows, providerRows]);
 }
diff --git a/packages/app/src/subagents/track-presentation.test.ts b/packages/app/src/subagents/track-presentation.test.ts
index 516e2fafb7..df009583be 100644
--- a/packages/app/src/subagents/track-presentation.test.ts
+++ b/packages/app/src/subagents/track-presentation.test.ts
@@ -19,6 +19,11 @@ function row(
     description: null,
     subtitle: null,
     status: overrides.status ?? "idle",
+    turn:
+      overrides.turn ??
+      (overrides.status === "running"
+        ? { phase: "open", turnId: null, startedAt: null, cancellationRequestId: null }
+        : { phase: "idle", cancellationRequestId: null }),
     requiresAttention: overrides.requiresAttention ?? false,
     createdAt: overrides.createdAt ?? new Date("2026-04-20T00:00:00.000Z"),
   };
diff --git a/packages/app/src/subagents/track-presentation.ts b/packages/app/src/subagents/track-presentation.ts
index 1e2ddbb8d8..d95082ca39 100644
--- a/packages/app/src/subagents/track-presentation.ts
+++ b/packages/app/src/subagents/track-presentation.ts
@@ -7,7 +7,10 @@ import { isFinishedSubagent } from "./archive-finished";
 import { providerSubagentLifecycleStatus } from "./provider-store";
 
 function presentationStatus(row: SubagentRow) {
-  if (row.kind === "paseo") return row.status;
+  if (row.kind === "paseo") {
+    if (row.turn.phase === "open") return "running";
+    return row.status === "running" ? "idle" : row.status;
+  }
   return providerSubagentLifecycleStatus(row.status);
 }
 
diff --git a/packages/app/src/subagents/track.tsx b/packages/app/src/subagents/track.tsx
index 31cbd4a70f..601030562f 100644
--- a/packages/app/src/subagents/track.tsx
+++ b/packages/app/src/subagents/track.tsx
@@ -1,9 +1,9 @@
-import { useCallback, useMemo, type ReactElement } from "react";
+import { useCallback, type ReactElement } from "react";
 import { Pressable, Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { Archive, Unlink } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { getProviderIcon } from "@/components/provider-icons";
+import { useProviderIcon } from "@/components/provider-icons";
 import { ComposerTrackActions, ComposerTrackPill, ComposerTrackRow } from "@/composer/tracks";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -13,6 +13,7 @@ import {
   type WorkspaceTabPresentation,
 } from "@/screens/workspace/workspace-tab-presentation";
 import type { Theme } from "@/styles/theme";
+import { getPanelManifest } from "@/panels/panel-manifest";
 import type { SubagentRow } from "./select";
 import type { ArchiveFinishedStatus } from "./use-archive-finished";
 import {
@@ -30,6 +31,7 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
 });
 
 export interface SubagentsTrackProps {
+  serverId: string;
   rows: SubagentRow[];
   onOpenSubagent: (id: string) => void;
   onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
@@ -44,17 +46,20 @@ const IDLE_ARCHIVE_FINISHED_STATUS: ArchiveFinishedStatus = { kind: "idle" };
 /** Leading and action glyphs share one size so rows keep a single icon column. */
 const ROW_ICON_SIZE = 14;
 
-function buildRowPresentation(row: SubagentRow): WorkspaceTabPresentation {
+function useRowPresentation(row: SubagentRow, serverId: string): WorkspaceTabPresentation {
+  const icon = useProviderIcon(row.provider, serverId);
   const data = buildSubagentRowPresentationData(row);
   return {
     ...data,
     tooltip: data.label,
     modified: false,
-    icon: getProviderIcon(row.provider),
+    showCloseButton: getPanelManifest(data.kind).showCloseButton,
+    icon,
   };
 }
 
 export function SubagentsTrack({
+  serverId,
   rows,
   onOpenSubagent,
   onOpenProviderSubagent,
@@ -95,6 +100,7 @@ export function SubagentsTrack({
         <SubagentsTrackRow
           key={row.id}
           row={row}
+          serverId={serverId}
           onOpenSubagent={onOpenSubagent}
           onOpenProviderSubagent={onOpenProviderSubagent}
           onArchiveSubagent={onArchiveSubagent}
@@ -164,6 +170,7 @@ function ArchiveFinishedRow({
 }
 
 interface SubagentsTrackRowProps {
+  serverId: string;
   row: SubagentRow;
   onOpenSubagent: (id: string) => void;
   onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
@@ -172,6 +179,7 @@ interface SubagentsTrackRowProps {
 }
 
 function SubagentsTrackRow({
+  serverId,
   row,
   onOpenSubagent,
   onOpenProviderSubagent,
@@ -180,7 +188,7 @@ function SubagentsTrackRow({
 }: SubagentsTrackRowProps): ReactElement {
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
-  const presentation = useMemo(() => buildRowPresentation(row), [row]);
+  const presentation = useRowPresentation(row, serverId);
   const displayLabel =
     presentation.titleState === "loading" ? t("common.states.loading") : presentation.label;
   const handlePress = useCallback(() => {
diff --git a/packages/app/src/terminal/find/index.tsx b/packages/app/src/terminal/find/index.tsx
new file mode 100644
index 0000000000..c8ecab5a04
--- /dev/null
+++ b/packages/app/src/terminal/find/index.tsx
@@ -0,0 +1,139 @@
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+  type RefObject,
+} from "react";
+import { View, type LayoutChangeEvent } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { PaneFind, findShortcutPlatform, isFindShortcut, type PaneFindHandle } from "@/pane-find";
+import { isWeb } from "@/constants/platform";
+import { hasActiveWebOverlay } from "@/lib/overlay-root";
+import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
+import type { TerminalEmulatorHandle } from "@/components/terminal-emulator-contract";
+import type { TerminalFindResult } from "../runtime/terminal-emulator-runtime";
+
+export interface TerminalPaneFindHandle {
+  open(): void;
+  update(result: TerminalFindResult): void;
+  reset(): void;
+}
+
+export const TerminalFind = forwardRef<
+  TerminalPaneFindHandle,
+  {
+    terminal: RefObject<TerminalEmulatorHandle | null>;
+    active: boolean;
+    focusTerminal(): void;
+  }
+>(function TerminalFind({ terminal, active, focusTerminal }, ref) {
+  const { t } = useTranslation();
+  const widget = useRef<PaneFindHandle>(null);
+  const [open, setOpen] = useState(false);
+  const [query, setQuery] = useState("");
+  const [result, setResult] = useState<TerminalFindResult>({
+    resultIndex: -1,
+    resultCount: 0,
+    limited: false,
+    placement: "top",
+  });
+  const show = useCallback(() => {
+    if (!active || !terminal.current?.find) return;
+    if (!open && query) terminal.current.find.search(query);
+    setOpen(true);
+    widget.current?.focus();
+  }, [active, open, query, terminal]);
+  useImperativeHandle(
+    ref,
+    () => ({
+      open: show,
+      update: setResult,
+      reset: () => {
+        setOpen(false);
+        setQuery("");
+      },
+    }),
+    [show],
+  );
+  useEffect(() => {
+    if (!isWeb || !active) return;
+    function onKeyDown(event: KeyboardEvent) {
+      if (event.defaultPrevented || hasActiveWebOverlay() || isImeComposingKeyboardEvent(event))
+        return;
+      if (isFindShortcut(event, findShortcutPlatform()) && terminal.current?.find) {
+        event.preventDefault();
+        show();
+      }
+    }
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
+  }, [active, show, terminal]);
+  const search = useCallback(
+    (text: string) => {
+      setQuery(text);
+      terminal.current?.find?.search(text);
+    },
+    [terminal],
+  );
+  const next = useCallback(() => terminal.current?.find?.search(query, "next"), [query, terminal]);
+  const previous = useCallback(
+    () => terminal.current?.find?.search(query, "previous"),
+    [query, terminal],
+  );
+  const measureWidget = useCallback(
+    (event: LayoutChangeEvent) => {
+      const { width, height } = event.nativeEvent.layout;
+      terminal.current?.find?.setWidgetSize({ width, height });
+    },
+    [terminal],
+  );
+  const close = useCallback(() => {
+    terminal.current?.find?.clear();
+    setOpen(false);
+    focusTerminal();
+  }, [focusTerminal, terminal]);
+  if (!open || !terminal.current?.find) return null;
+  const total = `${result.resultCount}${result.limited ? "+" : ""}`;
+  let status = "";
+  if (query) {
+    if (result.resultCount === 0) status = t("paneFind.noMatches");
+    else if (result.resultIndex < 0) status = t("paneFind.total", { total });
+    else status = t("paneFind.position", { current: result.resultIndex + 1, total });
+  }
+  return (
+    <View
+      pointerEvents="box-none"
+      style={[styles.overlay, result.placement === "top" ? styles.top : styles.bottom]}
+    >
+      <View onLayout={measureWidget} style={styles.frame}>
+        <PaneFind
+          ref={widget}
+          query={query}
+          status={status}
+          canNavigate={result.resultCount > 0}
+          onQueryChange={search}
+          onNext={next}
+          onPrevious={previous}
+          onClose={close}
+        />
+      </View>
+    </View>
+  );
+});
+
+const styles = StyleSheet.create((theme) => ({
+  overlay: {
+    position: "absolute",
+    left: 0,
+    right: 0,
+    alignItems: "flex-end",
+    zIndex: 2,
+  },
+  frame: { maxWidth: "100%", padding: theme.spacing[2] },
+  top: { top: 0 },
+  bottom: { bottom: 0 },
+}));
diff --git a/packages/app/src/terminal/runtime/terminal-emulator-runtime.browser.test.ts b/packages/app/src/terminal/runtime/terminal-emulator-runtime.browser.test.ts
index 58dfd7ff38..b173545abc 100644
--- a/packages/app/src/terminal/runtime/terminal-emulator-runtime.browser.test.ts
+++ b/packages/app/src/terminal/runtime/terminal-emulator-runtime.browser.test.ts
@@ -1,4 +1,4 @@
-import { page } from "@vitest/browser/context";
+import { page, userEvent } from "@vitest/browser/context";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { TerminalInputModeState } from "@getpaseo/protocol/terminal-input-mode";
 import { encodeTerminalOutput, TerminalEmulatorRuntime } from "./terminal-emulator-runtime";
@@ -40,6 +40,7 @@ interface MountedTerminal {
   sizes: TerminalSize[];
   terminalKeys: TerminalKeyRecord[];
   inputModeChanges: TerminalInputModeState[];
+  openedUrls: string[];
 }
 
 const mountedTerminals: MountedTerminal[] = [];
@@ -72,11 +73,14 @@ function settleMountRefits(): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, 2_600));
 }
 
-function createTerminalHost(input: {
+interface CreateTerminalHostInput {
   width: number;
   height: number;
   scrollback?: number;
-}): MountedTerminal {
+  isMac?: boolean;
+}
+
+function createTerminalHost(input: CreateTerminalHostInput): MountedTerminal {
   const root = document.createElement("div");
   root.style.width = `${input.width}px`;
   root.style.height = `${input.height}px`;
@@ -95,7 +99,10 @@ function createTerminalHost(input: {
   const inputs: string[] = [];
   const terminalKeys: TerminalKeyRecord[] = [];
   const inputModeChanges: TerminalInputModeState[] = [];
-  const runtime = new TerminalEmulatorRuntime();
+  const openedUrls: string[] = [];
+  const runtime = new TerminalEmulatorRuntime(
+    input.isMac === undefined ? undefined : { isMac: input.isMac },
+  );
   runtime.setCallbacks({
     callbacks: {
       onInput: (data) => {
@@ -110,6 +117,9 @@ function createTerminalHost(input: {
       onInputModeChange: (state) => {
         inputModeChanges.push(state);
       },
+      onOpenExternalUrl: (url) => {
+        openedUrls.push(url);
+      },
     },
   });
   runtime.mount({
@@ -124,7 +134,16 @@ function createTerminalHost(input: {
     },
   });
 
-  const mounted = { host, root, runtime, inputs, sizes, terminalKeys, inputModeChanges };
+  const mounted = {
+    host,
+    root,
+    runtime,
+    inputs,
+    sizes,
+    terminalKeys,
+    inputModeChanges,
+    openedUrls,
+  };
   mountedTerminals.push(mounted);
   return mounted;
 }
@@ -162,33 +181,76 @@ function getBrowserTerminal(): BrowserTerminal {
   return terminal;
 }
 
-function dispatchTerminalKey(input: {
+interface DispatchTerminalKeyInput {
   host: HTMLElement;
   key: string;
+  keyCode?: number;
   shiftKey?: boolean;
   ctrlKey?: boolean;
   altKey?: boolean;
   metaKey?: boolean;
-}): boolean {
+}
+
+function dispatchTerminalKey(input: DispatchTerminalKeyInput): boolean {
   const textarea = input.host.querySelector<HTMLTextAreaElement>("textarea");
   if (!textarea) {
     throw new Error("Expected xterm textarea to be mounted");
   }
   textarea.focus();
-  return textarea.dispatchEvent(
-    new KeyboardEvent("keydown", {
-      key: input.key,
-      shiftKey: input.shiftKey ?? false,
-      ctrlKey: input.ctrlKey ?? false,
-      altKey: input.altKey ?? false,
-      metaKey: input.metaKey ?? false,
-      bubbles: true,
-      cancelable: true,
-    }),
-  );
+  const event = new KeyboardEvent("keydown", {
+    key: input.key,
+    shiftKey: input.shiftKey ?? false,
+    ctrlKey: input.ctrlKey ?? false,
+    altKey: input.altKey ?? false,
+    metaKey: input.metaKey ?? false,
+    bubbles: true,
+    cancelable: true,
+  });
+  if (input.keyCode !== undefined) {
+    // Synthetic KeyboardEvents always report keyCode 0; xterm's fallback encoder
+    // switches on keyCode, so hardware-like events need it filled in.
+    Object.defineProperty(event, "keyCode", { value: input.keyCode });
+  }
+  return textarea.dispatchEvent(event);
+}
+
+/** An OSC 8 hyperlink, the escape sequence CLIs such as gh and ls --hyperlink print. */
+function hyperlink(input: { url: string; text: string }): string {
+  return `\x1b]8;;${input.url}\x1b\\${input.text}\x1b]8;;\x1b\\`;
+}
+
+function writeLines(mounted: MountedTerminal, lines: string[]): Promise<void> {
+  return new Promise((resolve) => {
+    mounted.runtime.write({
+      data: terminalOutput(lines.map((line) => `${line}\r\n`).join("")),
+      onCommitted: resolve,
+    });
+  });
+}
+
+async function clickTerminalLink(input: {
+  host: HTMLElement;
+  row: number;
+  col: number;
+}): Promise<void> {
+  const terminal = getBrowserTerminal();
+  const screen = input.host.querySelector<HTMLElement>(".xterm-screen");
+  if (!screen) {
+    throw new Error("Expected xterm screen to be mounted");
+  }
+  const position = {
+    x: (input.col + 0.5) * (screen.clientWidth / terminal.cols),
+    y: (input.row + 0.5) * (screen.clientHeight / terminal.rows),
+  };
+  await userEvent.hover(screen, { position });
+  await waitFor({
+    predicate: () => input.host.querySelector(".xterm-cursor-pointer") !== null,
+  });
+  await userEvent.click(screen, { position });
 }
 
 afterEach(() => {
+  vi.restoreAllMocks();
   for (const mounted of mountedTerminals.splice(0)) {
     mounted.runtime.unmount();
     mounted.root.remove();
@@ -464,6 +526,78 @@ describe("terminal emulator runtime in a real browser", () => {
     });
   });
 
+  it("translates mac editing shortcuts into shell editing sequences", async () => {
+    await page.viewport(900, 600);
+    const mounted = createTerminalHost({ width: 720, height: 360, isMac: true });
+
+    await waitFor({ predicate: () => mounted.sizes.length > 0 });
+
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowRight", keyCode: 39 });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowLeft", keyCode: 37, metaKey: true });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowRight", keyCode: 39, metaKey: true });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowLeft", keyCode: 37, altKey: true });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowRight", keyCode: 39, altKey: true });
+    dispatchTerminalKey({ host: mounted.host, key: "Backspace", keyCode: 8, metaKey: true });
+    await nextFrame();
+
+    expect(mounted.inputs).toEqual([
+      "\x1b[C", // plain arrow keeps xterm's default encoding
+      "\x01", // cmd+left -> line start
+      "\x05", // cmd+right -> line end
+      "\x1bb", // option+left -> word back
+      "\x1bf", // option+right -> word forward
+      "\x15", // cmd+backspace -> kill line
+    ]);
+    expect(mounted.terminalKeys).toEqual([]);
+  });
+
+  it.each([true, false])("keeps pending modifier chips authoritative (isMac=%s)", async (isMac) => {
+    const mounted = createTerminalHost({ width: 720, height: 360, isMac });
+    await waitFor({ predicate: () => mounted.sizes.length > 0 });
+    mounted.runtime.setPendingModifiers({
+      pendingModifiers: { ctrl: true, alt: false, shift: false },
+    });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowLeft", keyCode: 37, altKey: true });
+    await nextFrame();
+    expect(mounted.inputs).toEqual([]);
+    expect(mounted.terminalKeys).toEqual([
+      { key: "ArrowLeft", ctrl: true, alt: true, shift: false, meta: false },
+    ]);
+  });
+
+  it("keeps cmd+shift+arrow free for app-level shortcuts", async () => {
+    await page.viewport(900, 600);
+    const mounted = createTerminalHost({ width: 720, height: 360, isMac: true });
+
+    await waitFor({ predicate: () => mounted.sizes.length > 0 });
+
+    dispatchTerminalKey({
+      host: mounted.host,
+      key: "ArrowRight",
+      keyCode: 39,
+      metaKey: true,
+      shiftKey: true,
+    });
+    await nextFrame();
+
+    expect(mounted.inputs).toEqual([]);
+    expect(mounted.terminalKeys).toEqual([]);
+  });
+
+  it("does not remap modified arrows on non-mac platforms", async () => {
+    await page.viewport(900, 600);
+    const mounted = createTerminalHost({ width: 720, height: 360, isMac: false });
+
+    await waitFor({ predicate: () => mounted.sizes.length > 0 });
+
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowRight", keyCode: 39, metaKey: true });
+    dispatchTerminalKey({ host: mounted.host, key: "ArrowRight", keyCode: 39, altKey: true });
+    await nextFrame();
+
+    // Meta+arrow is ignored by xterm; alt+arrow takes xterm's generic encoding.
+    expect(mounted.inputs).toEqual(["\x1b[1;3C"]);
+  });
+
   it.each([
     { name: "DA1", bytes: "\x1b[c" },
     { name: "DA1-zero", bytes: "\x1b[0c" },
@@ -526,4 +660,23 @@ describe("terminal emulator runtime in a real browser", () => {
 
     expect(reset).not.toHaveBeenCalled();
   });
+
+  it("opens OSC 8 hyperlinks the same way as plain-text URLs", async () => {
+    await page.viewport(900, 600);
+    const mounted = createTerminalHost({ width: 720, height: 360 });
+    const confirm = vi.spyOn(window, "confirm").mockReturnValue(false);
+
+    await waitFor({ predicate: () => mounted.sizes.length > 0 });
+
+    await writeLines(mounted, [
+      hyperlink({ url: "https://example.com/osc8", text: "example" }),
+      "https://example.com/plain",
+    ]);
+
+    await clickTerminalLink({ host: mounted.host, row: 1, col: 4 });
+    await clickTerminalLink({ host: mounted.host, row: 0, col: 2 });
+
+    expect(mounted.openedUrls).toEqual(["https://example.com/plain", "https://example.com/osc8"]);
+    expect(confirm).not.toHaveBeenCalled();
+  });
 });
diff --git a/packages/app/src/terminal/runtime/terminal-emulator-runtime.test.ts b/packages/app/src/terminal/runtime/terminal-emulator-runtime.test.ts
index d739dcac34..a11cedbfe2 100644
--- a/packages/app/src/terminal/runtime/terminal-emulator-runtime.test.ts
+++ b/packages/app/src/terminal/runtime/terminal-emulator-runtime.test.ts
@@ -192,6 +192,65 @@ describe("terminal-emulator-runtime", () => {
     vi.useRealTimers();
   });
 
+  it.each([
+    { isMac: true, ctrlKey: true, metaKey: false, opensFind: false },
+    { isMac: true, ctrlKey: false, metaKey: true, opensFind: true },
+    { isMac: false, ctrlKey: true, metaKey: false, opensFind: true },
+    { isMac: false, ctrlKey: false, metaKey: true, opensFind: false },
+    { isMac: true, ctrlKey: false, metaKey: true, shiftKey: true, opensFind: false },
+    { isMac: true, ctrlKey: false, metaKey: true, altKey: true, opensFind: false },
+    { isMac: false, ctrlKey: true, metaKey: false, shiftKey: true, opensFind: false },
+    { isMac: false, ctrlKey: true, metaKey: false, altKey: true, opensFind: false },
+    { isMac: true, ctrlKey: true, metaKey: true, opensFind: false },
+    { isMac: false, ctrlKey: true, metaKey: true, opensFind: false },
+  ])(
+    "routes Find with isMac=$isMac ctrl=$ctrlKey meta=$metaKey shift=$shiftKey alt=$altKey",
+    ({ isMac, ctrlKey, metaKey, shiftKey = false, altKey = false, opensFind }) => {
+      const runtime = new TerminalEmulatorRuntime({ isMac });
+      let findRequests = 0;
+      let prevented = false;
+      let stopped = false;
+      runtime.setCallbacks({
+        callbacks: {
+          onFindRequest: () => {
+            findRequests += 1;
+          },
+        },
+      });
+      const event = {
+        type: "keydown",
+        key: "f",
+        ctrlKey,
+        metaKey,
+        shiftKey,
+        altKey,
+        isComposing: false,
+        preventDefault: () => {
+          prevented = true;
+        },
+        stopPropagation: () => {
+          stopped = true;
+        },
+      } as KeyboardEvent;
+
+      let passedToXterm: boolean | undefined;
+      runtime.attachKeyEventHandler({
+        attachCustomKeyEventHandler: (handler) => {
+          passedToXterm = handler(event);
+        },
+        hasSelection: () => false,
+        getSelection: () => "",
+        paste: () => {},
+        input: () => {},
+        scrollToBottom: () => {},
+      });
+      expect(passedToXterm).toBe(!opensFind);
+      expect(findRequests).toBe(opensFind ? 1 : 0);
+      expect(prevented).toBe(opensFind);
+      expect(stopped).toBe(opensFind);
+    },
+  );
+
   it("drains contiguous plain writes without waiting for each commit, gating a clear behind them", () => {
     const { runtime, terminal, writeCallbacks, writeTexts } = createRuntimeWithTerminal();
     const committed: string[] = [];
@@ -302,9 +361,10 @@ describe("terminal-emulator-runtime", () => {
       { kittyKeyboardFlags: 7, win32InputMode: false, bracketedPaste: false },
     ]);
 
-    // The plain write carries no onCommitted, so it registers no callback; writeCallbacks[0]
-    // is the barrier gate sentinel.
-    writeCallbacks[0]?.();
+    // Commit the plain write, then the sentinel that gates the snapshot.
+    writeCallbacks[0]();
+    expect(inputModeChanges).toHaveLength(1);
+    writeCallbacks[1]();
 
     expect(inputModeChanges).toEqual([
       { kittyKeyboardFlags: 7, win32InputMode: false, bracketedPaste: false },
@@ -413,14 +473,15 @@ describe("terminal-emulator-runtime", () => {
     runtime.write({ data: terminalOutput("output") });
     runtime.restoreOutput({ data: terminalOutput("snapshot") });
 
-    // The plain write carries no onCommitted so it registers no callback; writeCallbacks[0]
-    // is the sentinel gate. suppressInput only flips once the gate resolves the barrier.
+    // The plain write commits first. Only the following sentinel opens the barrier.
     expect(readSuppressInput()).toBe(false);
-    writeCallbacks[0]?.();
+    writeCallbacks[0]();
+    expect(readSuppressInput()).toBe(false);
+    writeCallbacks[1]();
     expect(readSuppressInput()).toBe(true);
 
-    // writeCallbacks[1] is the barrier's own snapshot write; committing it restores input.
-    writeCallbacks[1]?.();
+    // Committing the barrier's snapshot write restores input.
+    writeCallbacks[2]();
     expect(readSuppressInput()).toBe(false);
   });
 
diff --git a/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts b/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts
index 56350ef9b7..cc4462ff7b 100644
--- a/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts
+++ b/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts
@@ -6,7 +6,7 @@ import { Unicode11Addon } from "@xterm/addon-unicode11";
 import { WebLinksAddon } from "@xterm/addon-web-links";
 import { WebglAddon } from "@xterm/addon-webgl";
 import { LigaturesAddon } from "@xterm/addon-ligatures/lib/addon-ligatures.mjs";
-import { Terminal, type ITheme } from "@xterm/xterm";
+import { Terminal, type ITheme, type IMarker } from "@xterm/xterm";
 import type { TerminalState } from "@getpaseo/protocol/messages";
 import {
   type TerminalInputModeState,
@@ -15,11 +15,13 @@ import {
 } from "@getpaseo/protocol/terminal-input-mode";
 import {
   type PendingTerminalModifiers,
+  hasPendingTerminalModifiers,
   isAppleHandheldPlatform,
   isTerminalModifierDomKey,
   mergeTerminalModifiers,
   normalizeDomTerminalKey,
   normalizeTerminalTransportKey,
+  resolveMacTerminalEditingShortcut,
   shouldInterceptDomTerminalKey,
 } from "@/utils/terminal-keys";
 import { renderTerminalSnapshotToAnsi } from "./terminal-snapshot";
@@ -28,10 +30,27 @@ import {
   type TerminalLocalFileLinkSource,
   type TerminalLocalFileLinkTarget,
 } from "../local-links/terminal-local-link-provider";
+import { isFindShortcut, type FindShortcutPlatform } from "@/pane-find/find-shortcut";
+import { isMacUserAgent } from "@/utils/mac-user-agent";
 import { resolveTerminalFontFamily, resolveTerminalFontSize } from "./terminal-font";
 
 export type TerminalOutputData = Uint8Array;
 
+export interface TerminalFindHandle {
+  setWidgetSize(size: { width: number; height: number }): void;
+  search(query: string, direction?: "next" | "previous"): void;
+  clear(): void;
+}
+
+export interface TerminalFindResult {
+  resultIndex: number;
+  resultCount: number;
+  limited: boolean;
+  placement: "top" | "bottom";
+}
+
+const FIND_HIGHLIGHT_LIMIT = 20_000;
+
 export interface TerminalEmulatorRuntimeMountInput {
   root: HTMLDivElement;
   host: HTMLDivElement;
@@ -43,6 +62,8 @@ export interface TerminalEmulatorRuntimeMountInput {
 }
 
 export interface TerminalEmulatorRuntimeCallbacks {
+  onFindRequest?: () => void;
+  onFindResult?: (result: TerminalFindResult) => void;
   onInput?: (data: string) => Promise<void> | void;
   onResize?: (input: TerminalResizeEvent) => Promise<void> | void;
   onTerminalKey?: (input: {
@@ -123,11 +144,6 @@ declare global {
   }
 }
 
-const isMac =
-  typeof navigator !== "undefined" &&
-  (/Macintosh|Mac OS/i.test(navigator.userAgent ?? "") ||
-    /Mac/i.test((navigator as Navigator & { platform?: string }).platform ?? ""));
-
 const isAppleHandheld =
   typeof navigator !== "undefined" &&
   isAppleHandheldPlatform({
@@ -165,6 +181,8 @@ function withOverviewRulerBorderHidden(theme: ITheme): ITheme {
 }
 
 export class TerminalEmulatorRuntime {
+  constructor(private readonly options: FindShortcutPlatform = { isMac: isMacUserAgent() }) {}
+
   private callbacks: TerminalEmulatorRuntimeCallbacks = {};
   private pendingModifiers: PendingTerminalModifiers = {
     ctrl: false,
@@ -173,6 +191,48 @@ export class TerminalEmulatorRuntime {
   };
   private terminal: Terminal | null = null;
   private fitAddon: FitAddon | null = null;
+  private searchAddon: SearchAddon | null = null;
+  private findResult = { resultIndex: -1, resultCount: 0 };
+  private findQuery = "";
+  private findOutputAnchor: IMarker | undefined;
+  private findWidgetSize = { width: 0, height: 0 };
+
+  readonly find: TerminalFindHandle = {
+    setWidgetSize: (size) => {
+      this.findWidgetSize = size;
+      this.emitFindResult();
+    },
+    search: (query, direction) => {
+      this.releaseFindOutputAnchor();
+      this.findQuery = query;
+      if (this.terminal && !this.searchAddon) this.loadSearchAddon(this.terminal);
+      const theme = this.terminal?.options.theme;
+      const options = {
+        regex: false,
+        caseSensitive: false,
+        incremental: direction === undefined,
+        decorations: {
+          matchBorder: theme?.yellow ?? "#b58900",
+          matchOverviewRuler: theme?.yellow ?? "#b58900",
+          activeMatchBorder: theme?.blue ?? "#268bd2",
+          activeMatchColorOverviewRuler: theme?.blue ?? "#268bd2",
+        },
+      };
+      if (direction === "next") this.searchAddon?.findNext(query, options);
+      else this.searchAddon?.findPrevious(query, options);
+    },
+    clear: () => {
+      this.releaseFindOutputAnchor();
+      this.findQuery = "";
+      // clearDecorations leaves the addon's pending refresh alive. Disposal
+      // cancels its timers and listeners without touching terminal selection.
+      this.searchAddon?.dispose();
+      this.searchAddon = null;
+      this.findResult = { resultIndex: -1, resultCount: 0 };
+      this.emitFindResult();
+    },
+  };
+
   private fitAndEmitResize: ((input?: TerminalResizeRequest) => void) | null = null;
   private lastSize: { rows: number; cols: number } | null = null;
   private cleanup: (() => void) | null = null;
@@ -215,10 +275,188 @@ export class TerminalEmulatorRuntime {
     this.pendingModifiers = input.pendingModifiers;
   }
 
+  private loadSearchAddon(terminal: Terminal): void {
+    const searchAddon = new SearchAddon({ highlightLimit: FIND_HIGHLIGHT_LIMIT });
+    terminal.loadAddon(searchAddon);
+    this.searchAddon = searchAddon;
+    searchAddon.onDidChangeResults((result) => {
+      this.findResult = result;
+      this.emitFindResult();
+    });
+  }
+
+  private releaseFindOutputAnchor(): void {
+    this.findOutputAnchor?.dispose();
+    this.findOutputAnchor = undefined;
+  }
+
+  private preserveFindViewport(terminal: Terminal): void {
+    if (!this.findQuery || this.findResult.resultCount === 0 || this.findOutputAnchor) return;
+    const buffer = terminal.buffer.active;
+    this.findOutputAnchor = terminal.registerMarker(
+      buffer.viewportY - buffer.baseY - buffer.cursorY,
+    );
+  }
+
+  attachKeyEventHandler(
+    terminal: Pick<
+      Terminal,
+      | "attachCustomKeyEventHandler"
+      | "hasSelection"
+      | "getSelection"
+      | "paste"
+      | "input"
+      | "scrollToBottom"
+    >,
+  ): void {
+    terminal.attachCustomKeyEventHandler((event) => {
+      if (event.type !== "keydown" || event.isComposing) {
+        return true;
+      }
+
+      if (this.handleFindShortcut(event)) return false;
+
+      if (
+        !this.options.isMac &&
+        event.ctrlKey &&
+        !event.shiftKey &&
+        !event.altKey &&
+        !event.metaKey
+      ) {
+        const key = event.key.toLowerCase();
+
+        // Ctrl+C: copy selection to clipboard if text is selected, otherwise let xterm send SIGINT
+        if (key === "c" && terminal.hasSelection()) {
+          void navigator.clipboard.writeText(terminal.getSelection());
+          return false;
+        }
+
+        // Ctrl+V: paste from clipboard into terminal
+        if (key === "v") {
+          event.preventDefault();
+          void navigator.clipboard.readText().then((text) => {
+            if (text) {
+              terminal.paste(text);
+            }
+            return;
+          });
+          return false;
+        }
+
+        return true;
+      }
+
+      if (this.maybeSendMacEditingShortcut(terminal, event)) {
+        return false;
+      }
+
+      const normalizedKey = normalizeDomTerminalKey(event.key);
+      if (!normalizedKey || isTerminalModifierDomKey(event.key)) {
+        return true;
+      }
+
+      if (
+        !shouldInterceptDomTerminalKey({
+          key: normalizedKey,
+          ctrlKey: event.ctrlKey,
+          shiftKey: event.shiftKey,
+          altKey: event.altKey,
+          metaKey: event.metaKey,
+          pendingModifiers: this.pendingModifiers,
+          enhancedInputActive: this.inputModeTracker.supportsModifiedEnter(),
+          isAppleHandheld,
+        })
+      ) {
+        return true;
+      }
+
+      const modifiers = mergeTerminalModifiers({
+        pendingModifiers: this.pendingModifiers,
+        ctrlKey: event.ctrlKey,
+        shiftKey: event.shiftKey,
+        altKey: event.altKey,
+        metaKey: event.metaKey,
+      });
+      this.callbacks.onTerminalKey?.({
+        key: normalizeTerminalTransportKey(normalizedKey),
+        ...modifiers,
+      });
+
+      if (hasPendingTerminalModifiers(this.pendingModifiers)) {
+        this.callbacks.onPendingModifiersConsumed?.();
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    });
+  }
+
+  private handleFindShortcut(event: KeyboardEvent): boolean {
+    if (!isFindShortcut(event, this.options) || !this.callbacks.onFindRequest) return false;
+    event.preventDefault();
+    event.stopPropagation();
+    this.callbacks.onFindRequest();
+    return true;
+  }
+
+  private findWidgetCoversSelection(): boolean {
+    if (!this.findQuery) return false;
+    const terminal = this.terminal;
+    const element = terminal?.element;
+    const screen = element?.querySelector(".xterm-screen");
+    const selection = terminal?.getSelectionPosition();
+    if (!terminal || !element || !screen || !selection) return false;
+    const root = element.getBoundingClientRect();
+    const grid = screen.getBoundingClientRect();
+    const cellWidth = grid.width / terminal.cols;
+    const cellHeight = grid.height / terminal.rows;
+    const firstRow = terminal.buffer.active.viewportY;
+    const top = grid.top + (selection.start.y - firstRow) * cellHeight;
+    const bottom = grid.top + (selection.end.y - firstRow + 1) * cellHeight;
+    // A wrapped selection can occupy the right edge on its intermediate rows.
+    const rightCol = selection.start.y === selection.end.y ? selection.end.x : terminal.cols;
+    const right = grid.left + rightCol * cellWidth;
+    return (
+      top < root.top + this.findWidgetSize.height &&
+      bottom > root.top &&
+      right > root.right - this.findWidgetSize.width
+    );
+  }
+
+  private emitFindResult(): void {
+    const placement = this.findWidgetCoversSelection() ? "bottom" : "top";
+    this.callbacks.onFindResult?.({
+      ...this.findResult,
+      limited: this.findResult.resultCount >= FIND_HIGHLIGHT_LIMIT,
+      placement,
+    });
+  }
+
   getInputModeState(): TerminalInputModeState {
     return this.inputModeTracker.getState();
   }
 
+  private maybeSendMacEditingShortcut(
+    terminal: Pick<Terminal, "input" | "scrollToBottom">,
+    event: KeyboardEvent,
+  ): boolean {
+    if (!this.options.isMac || hasPendingTerminalModifiers(this.pendingModifiers)) {
+      return false;
+    }
+    const editingShortcutData = resolveMacTerminalEditingShortcut(event);
+    if (editingShortcutData === null) {
+      return false;
+    }
+    // Routed through terminal.input() so the data takes the same path as typed
+    // keys: onData -> callbacks.onInput, selection clearing included.
+    terminal.input(editingShortcutData, true);
+    terminal.scrollToBottom();
+    event.preventDefault();
+    event.stopPropagation();
+    return true;
+  }
+
   mount(input: TerminalEmulatorRuntimeMountInput): void {
     this.unmount();
 
@@ -227,6 +465,10 @@ export class TerminalEmulatorRuntime {
     this.inputModeTracker.reset();
     this.emitInputModeChange();
 
+    const openExternalLink = (event: MouseEvent, uri: string) => {
+      event.preventDefault();
+      void this.callbacks.onOpenExternalUrl?.(uri);
+    };
     const terminal = new Terminal({
       allowProposedApi: true,
       convertEol: false,
@@ -234,6 +476,8 @@ export class TerminalEmulatorRuntime {
       cursorStyle: "bar",
       fontFamily: resolveTerminalFontFamily(input.fontFamily),
       fontSize: resolveTerminalFontSize(input.fontSize),
+      // OSC 8 hyperlinks; without a handler xterm prompts and calls window.open().
+      linkHandler: { activate: openExternalLink },
       lineHeight: 1.0,
       macOptionIsMeta: true,
       minimumContrastRatio: 1,
@@ -250,12 +494,7 @@ export class TerminalEmulatorRuntime {
     let imageAddon: ImageAddon | null = null;
     terminal.loadAddon(fitAddon);
     terminal.loadAddon(unicode11Addon);
-    terminal.loadAddon(
-      new WebLinksAddon((event, uri) => {
-        event.preventDefault();
-        void this.callbacks.onOpenExternalUrl?.(uri);
-      }),
-    );
+    terminal.loadAddon(new WebLinksAddon(openExternalLink));
     const localFileLinkProvider = terminal.registerLinkProvider(
       createTerminalLocalFileLinkProvider(terminal, {
         resolveLink: async (source) => {
@@ -267,7 +506,19 @@ export class TerminalEmulatorRuntime {
         },
       }),
     );
-    terminal.loadAddon(new SearchAddon({ highlightLimit: 20_000 }));
+    this.loadSearchAddon(terminal);
+    terminal.onWriteParsed(() => {
+      // Even a bottom viewport is an inspected location while searching. A
+      // marker follows buffer trimming; output writes remain batched normally.
+      const anchor = this.findOutputAnchor;
+      if (anchor && !anchor.isDisposed) terminal.scrollToLine(anchor.line);
+      // A parser turn may yield with submitted writes still queued. Commit
+      // callbacks identify completion; plain writes still submit back-to-back.
+      if (this.pendingWriteCommits.size === 0) this.releaseFindOutputAnchor();
+    });
+    terminal.onScroll(() => {
+      if (this.findQuery) this.emitFindResult();
+    });
     terminal.loadAddon(new ClipboardAddon());
     try {
       terminal.loadAddon(new LigaturesAddon());
@@ -413,75 +664,7 @@ export class TerminalEmulatorRuntime {
       this.callbacks.onInput?.(data);
     });
 
-    terminal.attachCustomKeyEventHandler((event) => {
-      if (event.type !== "keydown" || event.isComposing) {
-        return true;
-      }
-
-      if (!isMac && event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey) {
-        const key = event.key.toLowerCase();
-
-        // Ctrl+C: copy selection to clipboard if text is selected, otherwise let xterm send SIGINT
-        if (key === "c" && terminal.hasSelection()) {
-          void navigator.clipboard.writeText(terminal.getSelection());
-          return false;
-        }
-
-        // Ctrl+V: paste from clipboard into terminal
-        if (key === "v") {
-          event.preventDefault();
-          void navigator.clipboard.readText().then((text) => {
-            if (text) {
-              terminal.paste(text);
-            }
-            return;
-          });
-          return false;
-        }
-
-        return true;
-      }
-
-      const normalizedKey = normalizeDomTerminalKey(event.key);
-      if (!normalizedKey || isTerminalModifierDomKey(event.key)) {
-        return true;
-      }
-
-      if (
-        !shouldInterceptDomTerminalKey({
-          key: normalizedKey,
-          ctrlKey: event.ctrlKey,
-          shiftKey: event.shiftKey,
-          altKey: event.altKey,
-          metaKey: event.metaKey,
-          pendingModifiers: this.pendingModifiers,
-          enhancedInputActive: this.inputModeTracker.supportsModifiedEnter(),
-          isAppleHandheld,
-        })
-      ) {
-        return true;
-      }
-
-      const modifiers = mergeTerminalModifiers({
-        pendingModifiers: this.pendingModifiers,
-        ctrlKey: event.ctrlKey,
-        shiftKey: event.shiftKey,
-        altKey: event.altKey,
-        metaKey: event.metaKey,
-      });
-      this.callbacks.onTerminalKey?.({
-        key: normalizeTerminalTransportKey(normalizedKey),
-        ...modifiers,
-      });
-
-      if (this.pendingModifiers.ctrl || this.pendingModifiers.shift || this.pendingModifiers.alt) {
-        this.callbacks.onPendingModifiersConsumed?.();
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-      return false;
-    });
+    this.attachKeyEventHandler(terminal);
 
     const removeTouchListeners = this.setupTouchScrollHandlers({
       root: input.root,
@@ -775,6 +958,7 @@ export class TerminalEmulatorRuntime {
   }
 
   unmount(): void {
+    this.releaseFindOutputAnchor();
     this.clearInFlightOutputTimeout();
     const inFlightOperation = this.inFlightOutputOperation;
     this.inFlightOutputOperation = null;
@@ -796,6 +980,9 @@ export class TerminalEmulatorRuntime {
       window.__paseoTerminal = undefined;
     }
     this.terminal = null;
+    this.searchAddon = null;
+    this.findQuery = "";
+    this.findResult = { resultIndex: -1, resultCount: 0 };
     this.fitAddon = null;
     this.fitAndEmitResize = null;
     this.lastSize = null;
@@ -870,6 +1057,7 @@ export class TerminalEmulatorRuntime {
   }
 
   private submitWrite(terminal: Terminal, operation: TerminalOutputOperation): void {
+    this.preserveFindViewport(terminal);
     // Synchronous per-write tracking must run in frame order; doing it here in the drain
     // loop preserves that ordering even though the writes are submitted without waiting.
     const text = this.inputModeDecoder.decode(operation.data, { stream: true });
@@ -879,19 +1067,11 @@ export class TerminalEmulatorRuntime {
     }
     this.hasUngatedWrites = true;
     const onCommitted = operation.onCommitted;
-    if (!onCommitted) {
-      try {
-        terminal.write(operation.data);
-      } catch {
-        // Match existing behavior: a failed write still proceeds with no commit callback.
-      }
-      return;
-    }
     const commit = () => {
       if (!this.pendingWriteCommits.delete(commit)) {
         return;
       }
-      onCommitted();
+      onCommitted?.();
     };
     this.pendingWriteCommits.add(commit);
     try {
diff --git a/packages/app/src/terminal/runtime/terminal-find.browser.test.ts b/packages/app/src/terminal/runtime/terminal-find.browser.test.ts
new file mode 100644
index 0000000000..8336925338
--- /dev/null
+++ b/packages/app/src/terminal/runtime/terminal-find.browser.test.ts
@@ -0,0 +1,205 @@
+import "@xterm/xterm/css/xterm.css";
+import { afterEach, expect, test } from "vitest";
+import {
+  TerminalEmulatorRuntime,
+  encodeTerminalOutput,
+  type TerminalFindResult,
+} from "./terminal-emulator-runtime";
+
+let runtime: TerminalEmulatorRuntime;
+let root: HTMLDivElement;
+afterEach(() => {
+  runtime?.unmount();
+  root?.remove();
+});
+function mount(options?: { isMac: boolean }) {
+  root = document.createElement("div");
+  Object.assign(root.style, { width: "480px", height: "200px" });
+  const host = document.createElement("div");
+  Object.assign(host.style, { width: "100%", height: "100%" });
+  root.append(host);
+  document.body.append(root);
+  runtime = new TerminalEmulatorRuntime(options);
+  const results: TerminalFindResult[] = [];
+  runtime.setCallbacks({
+    callbacks: {
+      onFindResult: (result) => {
+        results.push(result);
+      },
+    },
+  });
+  runtime.mount({
+    root,
+    host,
+    initialSnapshot: null,
+    scrollback: 1000,
+    theme: { background: "#ffffff", foreground: "#111111" },
+  });
+  return results;
+}
+function write(text: string) {
+  return new Promise<void>((resolve) =>
+    runtime.write({ data: encodeTerminalOutput(text), onCommitted: resolve }),
+  );
+}
+
+test("uses xterm's literal matching across wrapped cells and keeps selection when Find closes", async () => {
+  const results = mount();
+  // Initial font measurement schedules refits through 2 seconds. Settle them
+  // before choosing an exact column boundary for the wrapped text fixture.
+  await new Promise((resolve) => setTimeout(resolve, 2600));
+  await write("first [a.b] 界\r\n" + "padding\r\n".repeat(30) + "last [A.B] 界");
+  runtime.find.search("[a.b] 界");
+  expect(results.at(-1)).toMatchObject({ resultCount: 2, resultIndex: 1, limited: false });
+  runtime.find.search("[a.b] 界", "previous");
+  expect(results.at(-1)).toMatchObject({ resultCount: 2, resultIndex: 0, placement: "top" });
+  runtime.find.search("[a.b] 界", "previous");
+  expect(results.at(-1)).toMatchObject({ resultCount: 2, resultIndex: 1 });
+  const selection = window.__paseoTerminal!.getSelection();
+  runtime.find.clear();
+  expect(window.__paseoTerminal!.getSelection()).toBe(selection);
+  expect(results.at(-1)).toMatchObject({ resultCount: 0, resultIndex: -1 });
+  runtime.find.search("[aXb]");
+  expect(results.at(-1)).toMatchObject({ resultCount: 0 });
+  const cols = window.__paseoTerminal!.cols;
+  await write("\r\n" + "x".repeat(cols - 2) + "wrapped-needle");
+  runtime.find.search("wrapped-needle");
+  await expect.poll(() => results.at(-1)).toMatchObject({ resultCount: 1, resultIndex: 0 });
+});
+
+test("reports the addon's highlight limit without disabling navigation beyond the counted matches", async () => {
+  const results = mount();
+  await write(("a ".repeat(25) + "\r\n").repeat(801));
+  runtime.find.search("a");
+  expect(results.at(-1)).toMatchObject({ resultCount: 20000, limited: true, resultIndex: -1 });
+  expect(window.__paseoTerminal!.getSelection()).toBe("a");
+  runtime.find.search("a", "next");
+  expect(results.at(-1)).toMatchObject({ resultCount: 20000, limited: true, resultIndex: 0 });
+});
+
+test("keeps the inspected bottom viewport fixed when output arrives", async () => {
+  mount();
+  await write("padding\r\n".repeat(30) + "inspected needle");
+  runtime.find.search("needle");
+  const term = window.__paseoTerminal!;
+  const inspected = term.buffer.active.viewportY;
+  await write("\r\nnew output".repeat(30));
+  await expect.poll(() => term.buffer.active.viewportY).toBe(inspected);
+  expect(term.getSelection()).toBe("needle");
+});
+
+test("searches the active alternate buffer without moving the restored normal viewport", async () => {
+  const results = mount();
+  await write("normal needle\r\n" + "padding\r\n".repeat(30));
+  const normalViewport = window.__paseoTerminal!.buffer.active.viewportY;
+  await write("\x1b[?1049hAlt needle\r\nAlt NEEDLE");
+  runtime.find.search("needle");
+  expect(results.at(-1)).toMatchObject({ resultCount: 2, resultIndex: 1, limited: false });
+  expect(window.__paseoTerminal!.getSelection()).toBe("NEEDLE");
+  runtime.find.search("needle", "previous");
+  expect(window.__paseoTerminal!.getSelection()).toBe("needle");
+  await write("\x1b[?1049l");
+  await expect.poll(() => window.__paseoTerminal!.buffer.active.viewportY).toBe(normalViewport);
+  runtime.find.search("needle");
+  await expect.poll(() => results.at(-1)).toMatchObject({ resultCount: 1, resultIndex: 0 });
+});
+
+test("keeps Find at the top unless its measured frame covers the active match", async () => {
+  const results = mount();
+  await new Promise((resolve) => setTimeout(resolve, 2600));
+  runtime.find.setWidgetSize({ width: 356, height: 58 });
+  const cols = window.__paseoTerminal!.cols;
+  await write("left-needle\r\n" + " ".repeat(cols - 12) + "right-needle");
+  runtime.find.search("left-needle");
+  expect(results.at(-1)).toMatchObject({ resultCount: 1, placement: "top" });
+  runtime.find.search("right-needle");
+  expect(results.at(-1)).toMatchObject({ resultCount: 1, placement: "bottom" });
+});
+
+test("closing Find cancels pending refreshes without clearing old or new selections", async () => {
+  mount();
+  await write("first needle\r\n" + "padding\r\n".repeat(30) + "last needle");
+  const term = window.__paseoTerminal!;
+  for (const freshSelection of [false, true]) {
+    runtime.find.search("needle");
+    await write("\r\nnew output");
+    // onWriteParsed schedules the addon's refresh after the write callback.
+    await new Promise<void>((resolve) => {
+      const subscription = term.onWriteParsed(() => {
+        subscription.dispose();
+        resolve();
+      });
+      runtime.write({ data: encodeTerminalOutput("\rprogress") });
+    });
+    runtime.find.clear();
+    if (freshSelection) term.select(0, 0, 5);
+    const selection = term.getSelection();
+    expect(selection).toBe(freshSelection ? "first" : "needle");
+    await new Promise((resolve) => setTimeout(resolve, 350));
+    expect(term.getSelection()).toBe(selection);
+  }
+});
+
+test("preserves inspection through multiple real parser turns of queued output", async () => {
+  mount();
+  await new Promise((resolve) => setTimeout(resolve, 2600));
+  await write("padding\r\n".repeat(30) + "needle\r\nprogress");
+  runtime.find.search("needle");
+  const term = window.__paseoTerminal!;
+  const inspected = term.buffer.active.viewportY;
+  const samples: { viewport: number; base: number }[] = [];
+  const subscription = term.onWriteParsed(() => {
+    samples.push({ viewport: term.buffer.active.viewportY, base: term.buffer.active.baseY });
+  });
+  for (let i = 0; i < 150; i++) {
+    runtime.write({ data: encodeTerminalOutput("\rprogress".repeat(1000)) });
+  }
+  await write("\r\nnew output".repeat(100));
+  await new Promise((resolve) => setTimeout(resolve, 350));
+  subscription.dispose();
+  expect(samples.length).toBeGreaterThan(1);
+  expect(samples[0].base).toBe(inspected);
+  expect(samples.at(-1)!.base).toBeGreaterThan(inspected);
+  expect(term.buffer.active.viewportY).toBe(inspected);
+  expect(term.getSelection()).toBe("needle");
+});
+
+test.each([true, false])("routes Find and shell input through xterm with isMac=%s", (isMac) => {
+  mount({ isMac });
+  const input: string[] = [];
+  let findRequests = 0;
+  runtime.setCallbacks({
+    callbacks: {
+      onInput: (data) => {
+        input.push(data);
+      },
+      onFindRequest: () => {
+        findRequests += 1;
+      },
+    },
+  });
+  const textarea = root.querySelector("textarea")!;
+  textarea.focus();
+  const ctrlF = new KeyboardEvent("keydown", {
+    key: "f",
+    code: "KeyF",
+    keyCode: 70,
+    ctrlKey: true,
+    bubbles: true,
+    cancelable: true,
+  });
+  textarea.dispatchEvent(ctrlF);
+  expect(findRequests).toBe(isMac ? 0 : 1);
+  expect(input).toEqual(isMac ? ["\x06"] : []);
+  const metaF = new KeyboardEvent("keydown", {
+    key: "f",
+    code: "KeyF",
+    keyCode: 70,
+    metaKey: true,
+    bubbles: true,
+    cancelable: true,
+  });
+  textarea.dispatchEvent(metaF);
+  expect(findRequests).toBe(1);
+  expect(metaF.defaultPrevented).toBe(isMac);
+});
diff --git a/packages/app/src/terminal/runtime/terminal-stream-controller.test.ts b/packages/app/src/terminal/runtime/terminal-stream-controller.test.ts
index ccac3ecc93..388484d79d 100644
--- a/packages/app/src/terminal/runtime/terminal-stream-controller.test.ts
+++ b/packages/app/src/terminal/runtime/terminal-stream-controller.test.ts
@@ -1,3 +1,4 @@
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { describe, expect, it } from "vitest";
 
 import {
@@ -36,6 +37,10 @@ type TerminalStreamEvent =
   | { terminalId: string; type: "restore"; data: Uint8Array };
 
 class FakeTerminalStreamClient implements TerminalStreamControllerClient {
+  private readonly updates = new Set<(message: SessionOutboundMessage) => void>();
+  emitUpdate(message: SessionOutboundMessage): void {
+    for (const receive of this.updates) receive(message);
+  }
   private readonly listeners = new Set<(event: TerminalStreamEvent) => void>();
   public subscribeCalls: Array<{ terminalId: string; options?: unknown }> = [];
   public unsubscribeCalls: string[] = [];
@@ -47,18 +52,46 @@ class FakeTerminalStreamClient implements TerminalStreamControllerClient {
   }> = [];
   public nextSubscribeResults: Array<{ terminalId: string; error?: string | null }> = [];
 
-  async subscribeTerminal(terminalId: string, options?: unknown) {
+  observeTerminal: TerminalStreamControllerClient["observeTerminal"] = (
+    terminalId,
+    receive,
+    options,
+  ) => {
     this.subscribeCalls.push({ terminalId, ...(options ? { options } : {}) });
     const result = this.nextSubscribeResults.shift();
-    if (!result) {
-      throw new Error("Missing fake subscribe result");
-    }
-    return result;
-  }
-
-  unsubscribeTerminal(terminalId: string): void {
-    this.unsubscribeCalls.push(terminalId);
-  }
+    if (!result) throw new Error("Missing fake subscribe result");
+    const subscriptionId = `terminal-${this.subscribeCalls.length}`;
+    const listener = (event: TerminalStreamEvent) => {
+      if (event.terminalId === terminalId) receive({ ...event, subscriptionId });
+    };
+    this.listeners.add(listener);
+    const ready = result.error
+      ? Promise.reject(new Error(result.error))
+      : Promise.resolve({
+          terminalId,
+          subscriptionId,
+          slot: this.subscribeCalls.length,
+          error: null,
+          requestId: subscriptionId,
+        });
+    let released = false;
+    return {
+      subscriptionId,
+      ready,
+      subscribe: (observer) => {
+        this.updates.add(observer.update);
+        return () => {
+          this.updates.delete(observer.update);
+        };
+      },
+      release: async () => {
+        if (released) return;
+        released = true;
+        this.listeners.delete(listener);
+        this.unsubscribeCalls.push(terminalId);
+      },
+    };
+  };
 
   sendTerminalInput(
     terminalId: string,
@@ -72,13 +105,6 @@ class FakeTerminalStreamClient implements TerminalStreamControllerClient {
     });
   }
 
-  onTerminalStreamEvent(handler: (event: TerminalStreamEvent) => void): () => void {
-    this.listeners.add(handler);
-    return () => {
-      this.listeners.delete(handler);
-    };
-  }
-
   emit(event: TerminalStreamEvent): void {
     for (const listener of this.listeners) {
       listener(event);
@@ -92,8 +118,10 @@ function createHarness(input?: { client?: FakeTerminalStreamClient }) {
   const restores: Array<{ terminalId: string; data: Uint8Array }> = [];
   const snapshots: Array<{ terminalId: string; text: string }> = [];
   const statuses: TerminalStreamControllerStatus[] = [];
+  const exits: string[] = [];
   const controller = new TerminalStreamController({
     client,
+    onExit: (terminalId) => exits.push(terminalId),
     getPreferredSize: () => ({ rows: 24, cols: 80 }),
     onOutput: (output) => {
       outputs.push(output);
@@ -112,7 +140,7 @@ function createHarness(input?: { client?: FakeTerminalStreamClient }) {
     },
   });
 
-  return { client, controller, outputs, restores, snapshots, statuses };
+  return { client, controller, outputs, restores, snapshots, statuses, exits };
 }
 
 async function flushAsyncWork(): Promise<void> {
@@ -239,7 +267,9 @@ describe("terminal-stream-controller", () => {
         },
       },
     ]);
-    expect(client.resizeCalls).toEqual([]);
+    expect(client.resizeCalls).toEqual([
+      { terminalId: "term-1", rows: 24, cols: 80, intent: "claim" },
+    ]);
     expect(harness.restores[0]?.data).toBe(restoreData);
     expect(harness.restores).toEqual([{ terminalId: "term-1", data: terminalOutput("restored") }]);
     expect(harness.outputs).toEqual([]);
@@ -264,3 +294,28 @@ describe("terminal-stream-controller", () => {
     });
   });
 });
+
+it("reports observation failure without declaring the PTY exited, then allows reattach", async () => {
+  const h = createHarness();
+  h.client.nextSubscribeResults.push({ terminalId: "term-1", error: null });
+  h.controller.setTerminal({ terminalId: "term-1" });
+  await flushAsyncWork();
+  h.client.emitUpdate({
+    type: "terminal_stream_exit",
+    payload: { terminalId: "term-1", subscriptionId: "terminal-1", error: "Snapshot read failed" },
+  });
+  expect(h.statuses.at(-1)).toEqual({
+    terminalId: "term-1",
+    isAttaching: false,
+    error: "Snapshot read failed",
+  });
+  expect(h.exits).toEqual([]);
+  expect(h.client.unsubscribeCalls).toEqual(["term-1"]);
+  h.client.nextSubscribeResults.push({ terminalId: "term-1", error: null });
+  h.controller.setTerminal({ terminalId: "term-1" });
+  await flushAsyncWork();
+  h.client.emit({ terminalId: "term-1", type: "output", data: terminalOutput("STILL ALIVE") });
+  expect(h.outputs).toHaveLength(1);
+  expect(h.statuses.at(-1)?.error).toBe(null);
+  h.controller.dispose();
+});
diff --git a/packages/app/src/terminal/runtime/terminal-stream-controller.ts b/packages/app/src/terminal/runtime/terminal-stream-controller.ts
index 6b008a4ff0..90d54be4d4 100644
--- a/packages/app/src/terminal/runtime/terminal-stream-controller.ts
+++ b/packages/app/src/terminal/runtime/terminal-stream-controller.ts
@@ -1,29 +1,12 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { SubscribeTerminalRequest, TerminalState } from "@getpaseo/protocol/messages";
 import type { TerminalOutputData } from "./terminal-emulator-runtime";
 import { i18n } from "@/i18n/i18next";
 
-export interface TerminalStreamControllerClient {
-  subscribeTerminal: (
-    terminalId: string,
-    options?: { restore?: SubscribeTerminalRequest["restore"] },
-  ) => Promise<{
-    terminalId: string;
-    error?: string | null;
-  }>;
-  unsubscribeTerminal: (terminalId: string) => void;
-  sendTerminalInput: (
-    terminalId: string,
-    message: { type: "resize"; rows: number; cols: number; intent?: "claim" | "update" },
-  ) => void;
-  onTerminalStreamEvent: (
-    handler: (
-      event:
-        | { terminalId: string; type: "output"; data: Uint8Array }
-        | { terminalId: string; type: "snapshot"; state: TerminalState }
-        | { terminalId: string; type: "restore"; data: Uint8Array },
-    ) => void,
-  ) => () => void;
-}
+export type TerminalStreamControllerClient = Pick<
+  DaemonClient,
+  "observeTerminal" | "sendTerminalInput"
+>;
 
 export interface TerminalStreamControllerSize {
   rows: number;
@@ -41,6 +24,7 @@ export interface TerminalStreamControllerOptions {
   getPreferredSize: () => TerminalStreamControllerSize | null;
   onOutput: (input: { terminalId: string; data: TerminalOutputData }) => void;
   onSnapshot: (input: { terminalId: string; state: TerminalState }) => void;
+  onExit?: (terminalId: string) => void;
   onRestore?: (input: { terminalId: string; data: TerminalOutputData }) => void;
   getRestoreOptions?: () => SubscribeTerminalRequest["restore"] | undefined;
   onStatusChange?: (status: TerminalStreamControllerStatus) => void;
@@ -49,51 +33,76 @@ export interface TerminalStreamControllerOptions {
 const TERMINAL_EXITED_ERROR = "Terminal exited";
 
 export class TerminalStreamController {
-  private readonly unsubscribeStreamEvents: () => void;
+  private subscription: ReturnType<DaemonClient["observeTerminal"]> | null = null;
   private terminalId: string | null = null;
   private disposed = false;
 
-  constructor(private readonly options: TerminalStreamControllerOptions) {
-    this.unsubscribeStreamEvents = this.options.client.onTerminalStreamEvent((event) => {
-      if (this.disposed || event.terminalId !== this.terminalId) {
-        return;
-      }
-      if (event.type === "snapshot") {
-        this.options.onSnapshot({ terminalId: event.terminalId, state: event.state });
-        return;
-      }
-      if (event.type === "restore") {
-        if (event.data.length > 0) {
-          this.options.onRestore?.({ terminalId: event.terminalId, data: event.data });
-        }
-        return;
-      }
+  constructor(private readonly options: TerminalStreamControllerOptions) {}
+
+  private receive: Parameters<DaemonClient["observeTerminal"]>[1] = (event) => {
+    if (this.disposed || event.terminalId !== this.terminalId) {
+      return;
+    }
+    if (event.type === "snapshot") {
+      this.options.onSnapshot({ terminalId: event.terminalId, state: event.state });
+      return;
+    }
+    if (event.type === "restore") {
       if (event.data.length > 0) {
-        this.options.onOutput({ terminalId: event.terminalId, data: event.data });
+        this.options.onRestore?.({ terminalId: event.terminalId, data: event.data });
       }
-    });
-  }
+      return;
+    }
+    if (event.data.length > 0) {
+      this.options.onOutput({ terminalId: event.terminalId, data: event.data });
+    }
+  };
 
   setTerminal(input: { terminalId: string | null }): void {
     if (this.disposed || input.terminalId === this.terminalId) {
       return;
     }
     const nextTerminalId = input.terminalId;
-    const previousTerminalId = this.terminalId;
     this.terminalId = nextTerminalId;
-    if (previousTerminalId) {
-      this.options.client.unsubscribeTerminal(previousTerminalId);
-    }
+    void this.subscription?.release().catch(console.error);
+    this.subscription = null;
     if (!nextTerminalId) {
       this.options.onStatusChange?.({ terminalId: null, isAttaching: false, error: null });
       return;
     }
     const restore = this.options.getRestoreOptions?.();
     this.options.onStatusChange?.({ terminalId: nextTerminalId, isAttaching: true, error: null });
-    void this.options.client
-      .subscribeTerminal(nextTerminalId, restore ? { restore } : undefined)
+    let subscription: ReturnType<DaemonClient["observeTerminal"]>;
+    try {
+      const preferredSize = restore?.size ?? this.options.getPreferredSize();
+      if (preferredSize)
+        this.options.client.sendTerminalInput(nextTerminalId, {
+          type: "resize",
+          ...preferredSize,
+          intent: "claim",
+        });
+      subscription = this.options.client.observeTerminal(
+        nextTerminalId,
+        this.receive,
+        restore ? { restore } : undefined,
+      );
+    } catch (error) {
+      this.failAttach(nextTerminalId, error);
+      return;
+    }
+    this.subscription = subscription;
+    subscription.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type !== "terminal_stream_exit" || this.subscription !== subscription) return;
+        if (message.payload.error)
+          this.failAttach(nextTerminalId, new Error(message.payload.error));
+        else this.handleTerminalExit({ terminalId: nextTerminalId });
+      },
+    });
+    void subscription.ready
       .then((payload) => {
-        if (this.disposed || this.terminalId !== nextTerminalId) {
+        if (this.disposed || this.subscription !== subscription) {
           return;
         }
         if (payload.error) {
@@ -105,15 +114,6 @@ export class TerminalStreamController {
           });
           return;
         }
-        const preferredSize = restore?.size ? null : this.options.getPreferredSize();
-        if (preferredSize) {
-          this.options.client.sendTerminalInput(nextTerminalId, {
-            type: "resize",
-            rows: preferredSize.rows,
-            cols: preferredSize.cols,
-            intent: "claim",
-          });
-        }
         this.options.onStatusChange?.({
           terminalId: nextTerminalId,
           isAttaching: false,
@@ -122,24 +122,33 @@ export class TerminalStreamController {
         return;
       })
       .catch((error: unknown) => {
-        if (this.disposed || this.terminalId !== nextTerminalId) {
+        if (this.disposed || this.subscription !== subscription) {
           return;
         }
-        this.terminalId = null;
-        this.options.onStatusChange?.({
-          terminalId: nextTerminalId,
-          isAttaching: false,
-          error:
-            error instanceof Error ? error.message : i18n.t("workspace.terminal.unableToSubscribe"),
-        });
+        this.failAttach(nextTerminalId, error);
       });
   }
 
+  private failAttach(terminalId: string, error: unknown): void {
+    this.terminalId = null;
+    void this.subscription?.release().catch(console.error);
+    this.subscription = null;
+    this.options.onStatusChange?.({
+      terminalId,
+      isAttaching: false,
+      error:
+        error instanceof Error ? error.message : i18n.t("workspace.terminal.unableToSubscribe"),
+    });
+  }
+
   handleTerminalExit(input: { terminalId: string }): void {
     if (this.disposed || input.terminalId !== this.terminalId) {
       return;
     }
+    this.options.onExit?.(input.terminalId);
     this.terminalId = null;
+    void this.subscription?.release().catch(console.error);
+    this.subscription = null;
     this.options.onStatusChange?.({
       terminalId: input.terminalId,
       isAttaching: false,
@@ -152,12 +161,9 @@ export class TerminalStreamController {
       return;
     }
     this.disposed = true;
-    const terminalId = this.terminalId;
     this.terminalId = null;
-    if (terminalId) {
-      this.options.client.unsubscribeTerminal(terminalId);
-    }
-    this.unsubscribeStreamEvents();
+    void this.subscription?.release().catch(console.error);
+    this.subscription = null;
     this.options.onStatusChange?.({ terminalId: null, isAttaching: false, error: null });
   }
 }
diff --git a/packages/app/src/terminal/runtime/terminal-virtual-keyboard.test.ts b/packages/app/src/terminal/runtime/terminal-virtual-keyboard.test.ts
index b8541bcfe5..d2ef76fefd 100644
--- a/packages/app/src/terminal/runtime/terminal-virtual-keyboard.test.ts
+++ b/packages/app/src/terminal/runtime/terminal-virtual-keyboard.test.ts
@@ -2,9 +2,13 @@ import { describe, expect, it } from "vitest";
 
 import {
   getTerminalVirtualKeyboardControlId,
+  resolveTerminalVirtualKeyboardRows,
+  shouldShowTerminalVirtualKeyBar,
   shouldShowTerminalFloatingCopyAction,
   shouldShowTerminalPasteAction,
   TERMINAL_VIRTUAL_KEYBOARD_ROWS,
+  TERMINAL_VIRTUAL_KEYBOARD_THREE_COLUMN_ROWS,
+  TERMINAL_VIRTUAL_KEYBOARD_WIDE_ROWS,
   type TerminalVirtualKeyboardControl,
 } from "./terminal-virtual-keyboard";
 
@@ -41,6 +45,38 @@ function controlsByType(
 }
 
 describe("terminal virtual keyboard policy", () => {
+  it("keeps terminal controls on wide native touch screens with either IME state", () => {
+    expect(shouldShowTerminalVirtualKeyBar({ isNative: true, isCompact: false })).toBe(true);
+    expect(shouldShowTerminalVirtualKeyBar({ isNative: true, isCompact: true })).toBe(true);
+    expect(shouldShowTerminalVirtualKeyBar({ isNative: false, isCompact: true })).toBe(true);
+    expect(shouldShowTerminalVirtualKeyBar({ isNative: false, isCompact: false })).toBe(false);
+  });
+
+  it("selects the same controls in narrow and wide row arrangements", () => {
+    const ids = (rows: readonly (readonly TerminalVirtualKeyboardControl[])[]) =>
+      rows.flatMap((row) => row.map(getTerminalVirtualKeyboardControlId));
+    expect([...ids(TERMINAL_VIRTUAL_KEYBOARD_WIDE_ROWS)].sort()).toEqual(
+      [...ids(TERMINAL_VIRTUAL_KEYBOARD_ROWS)].sort(),
+    );
+    expect([...ids(TERMINAL_VIRTUAL_KEYBOARD_THREE_COLUMN_ROWS)].sort()).toEqual(
+      [...ids(TERMINAL_VIRTUAL_KEYBOARD_ROWS)].sort(),
+    );
+    expect(resolveTerminalVirtualKeyboardRows({ isCompact: false, availableWidth: 0 })).toBe(
+      TERMINAL_VIRTUAL_KEYBOARD_ROWS,
+    );
+    expect(resolveTerminalVirtualKeyboardRows({ isCompact: false, availableWidth: 515 })).toBe(
+      TERMINAL_VIRTUAL_KEYBOARD_ROWS,
+    );
+    expect(resolveTerminalVirtualKeyboardRows({ isCompact: false, availableWidth: 160 })).toBe(
+      TERMINAL_VIRTUAL_KEYBOARD_THREE_COLUMN_ROWS,
+    );
+    expect(resolveTerminalVirtualKeyboardRows({ isCompact: false, availableWidth: 698 })).toBe(
+      TERMINAL_VIRTUAL_KEYBOARD_WIDE_ROWS,
+    );
+    expect(resolveTerminalVirtualKeyboardRows({ isCompact: true, availableWidth: 700 })).toBe(
+      TERMINAL_VIRTUAL_KEYBOARD_ROWS,
+    );
+  });
   it("does not expose redundant Space or Backspace controls", () => {
     expect(controlIds()).toEqual([
       "terminal-key-esc",
diff --git a/packages/app/src/terminal/runtime/terminal-virtual-keyboard.ts b/packages/app/src/terminal/runtime/terminal-virtual-keyboard.ts
index f931881bce..3dd244fa95 100644
--- a/packages/app/src/terminal/runtime/terminal-virtual-keyboard.ts
+++ b/packages/app/src/terminal/runtime/terminal-virtual-keyboard.ts
@@ -41,6 +41,68 @@ export const TERMINAL_VIRTUAL_KEYBOARD_ROWS = [
   ],
 ] as const satisfies readonly (readonly TerminalVirtualKeyboardControl[])[];
 
+export const TERMINAL_VIRTUAL_KEYBOARD_WIDE_ROWS = [
+  [
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.esc },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.tab },
+    { type: "modifier", modifier: "ctrl" },
+    { type: "modifier", modifier: "alt" },
+    { type: "modifier", modifier: "shift" },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.left },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.down },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.up },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.right },
+    { type: "paste" },
+    { type: "keyboardToggle" },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.enter },
+  ],
+] as const satisfies readonly (readonly TerminalVirtualKeyboardControl[])[];
+
+export const TERMINAL_VIRTUAL_KEYBOARD_THREE_COLUMN_ROWS = [
+  [
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.esc },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.tab },
+    { type: "modifier", modifier: "ctrl" },
+  ],
+  [
+    { type: "modifier", modifier: "alt" },
+    { type: "modifier", modifier: "shift" },
+    { type: "keyboardToggle" },
+  ],
+  [
+    { type: "paste" },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.up },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.enter },
+  ],
+  [
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.left },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.down },
+    { type: "key", button: TERMINAL_VIRTUAL_KEY_BUTTONS.right },
+  ],
+] as const satisfies readonly (readonly TerminalVirtualKeyboardControl[])[];
+
+const TERMINAL_KEY_BAR_SINGLE_ROW_MIN_WIDTH = 660;
+const TERMINAL_KEY_BAR_THREE_COLUMN_MAX_WIDTH = 300;
+
+export function resolveTerminalVirtualKeyboardRows(input: {
+  isCompact: boolean;
+  availableWidth: number;
+}) {
+  if (input.availableWidth > 0 && input.availableWidth < TERMINAL_KEY_BAR_THREE_COLUMN_MAX_WIDTH) {
+    return TERMINAL_VIRTUAL_KEYBOARD_THREE_COLUMN_ROWS;
+  }
+  return !input.isCompact && input.availableWidth >= TERMINAL_KEY_BAR_SINGLE_ROW_MIN_WIDTH
+    ? TERMINAL_VIRTUAL_KEYBOARD_WIDE_ROWS
+    : TERMINAL_VIRTUAL_KEYBOARD_ROWS;
+}
+
+export function shouldShowTerminalVirtualKeyBar(input: {
+  isNative: boolean;
+  isCompact: boolean;
+}): boolean {
+  return input.isNative || input.isCompact;
+}
+
 export function getTerminalVirtualKeyboardControlId(
   control: TerminalVirtualKeyboardControl,
 ): string {
diff --git a/packages/app/src/terminal/webview/terminal-emulator-webview-entry.ts b/packages/app/src/terminal/webview/terminal-emulator-webview-entry.ts
index 99abe14e38..50f080b37c 100644
--- a/packages/app/src/terminal/webview/terminal-emulator-webview-entry.ts
+++ b/packages/app/src/terminal/webview/terminal-emulator-webview-entry.ts
@@ -1,3 +1,4 @@
+import type { TerminalFindResult } from "../runtime/terminal-emulator-runtime";
 import type { ITheme } from "@xterm/xterm";
 import xtermCss from "@xterm/xterm/css/xterm.css";
 import type { TerminalState } from "@getpaseo/protocol/messages";
@@ -32,6 +33,9 @@ type InboundMessage =
   | { type: "renderSnapshot"; streamKey: string; state: TerminalState | null }
   | { type: "paste"; streamKey: string; text: string }
   | { type: "clear"; streamKey: string }
+  | { type: "find"; streamKey: string; query: string; direction?: "next" | "previous" }
+  | { type: "clearFind"; streamKey: string }
+  | { type: "findWidgetSize"; streamKey: string; size: { width: number; height: number } }
   | { type: "focus"; streamKey: string; forceRefocus?: boolean }
   | { type: "resize"; streamKey: string; forceClaim: boolean; shouldClaim?: boolean }
   | { type: "setTheme"; streamKey: string; theme: ITheme }
@@ -50,6 +54,8 @@ type OutboundMessage =
   | { type: "bridgeReady" }
   | { type: "rendererReady"; streamKey: string; isReady: boolean }
   | { type: "input"; streamKey: string; data: string }
+  | { type: "findRequest"; streamKey: string }
+  | { type: "findResult"; streamKey: string; result: TerminalFindResult }
   | {
       type: "resize";
       streamKey: string;
@@ -229,6 +235,18 @@ class TerminalWebViewBridge {
       this.resolveLocalFileLinkRequest(message.requestId, message.target);
       return;
     }
+    if (message.type === "findWidgetSize") {
+      this.runtime?.find.setWidgetSize(message.size);
+      return;
+    }
+    if (message.type === "find") {
+      this.runtime?.find.search(message.query, message.direction);
+      return;
+    }
+    if (message.type === "clearFind") {
+      this.runtime?.find.clear();
+      return;
+    }
     this.receiveMounted(message);
   }
 
@@ -306,6 +324,9 @@ class TerminalWebViewBridge {
     this.runtime = runtime;
     runtime.setCallbacks({
       callbacks: {
+        onFindRequest: () => sendToNative({ type: "findRequest", streamKey: message.streamKey }),
+        onFindResult: (result) =>
+          sendToNative({ type: "findResult", streamKey: message.streamKey, result }),
         onInput: (data) => sendToNative({ type: "input", streamKey: message.streamKey, data }),
         onResize: ({ rows, cols, shouldClaim, forceClaim }) =>
           sendToNative({
diff --git a/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts b/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts
index b05a65c7a6..c7fc27652e 100644
--- a/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts
+++ b/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts
@@ -2,4 +2,4 @@
 // Do not edit by hand.
 
 export const terminalEmulatorWebViewHtml =
-  '<!doctype html>\n<html>\n  <head>\n    <meta charset="utf-8" />\n    <meta\n      name="viewport"\n      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"\n    />\n  </head>\n  <body>\n    <script>"use strict";\n(() => {\n  var __require = /* @__PURE__ */ ((x5) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x5, {\n    get: (a2, b4) => (typeof require !== "undefined" ? require : a2)[b4]\n  }) : x5)(function(x5) {\n    if (typeof require !== "undefined") return require.apply(this, arguments);\n    throw Error(\'Dynamic require of "\' + x5 + \'" is not supported\');\n  });\n\n  // node_modules/@xterm/xterm/css/xterm.css\n  var xterm_default = `/**\n * Copyright (c) 2014 The xterm.js authors. All rights reserved.\n * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n * https://github.com/chjj/term.js\n * @license MIT\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the "Software"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n *\n * Originally forked from (with the author\'s permission):\n *   Fabrice Bellard\'s javascript vt100 for jslinux:\n *   http://bellard.org/jslinux/\n *   Copyright (c) 2011 Fabrice Bellard\n *   The original design remains. The terminal itself\n *   has been extended to include xterm CSI codes, among\n *   other features.\n */\n\n/**\n *  Default styles for xterm.js\n */\n\n.xterm {\n    cursor: text;\n    position: relative;\n    user-select: none;\n    -ms-user-select: none;\n    -webkit-user-select: none;\n}\n\n.xterm.focus,\n.xterm:focus {\n    outline: none;\n}\n\n.xterm .xterm-helpers {\n    position: absolute;\n    top: 0;\n    /**\n     * The z-index of the helpers must be higher than the canvases in order for\n     * IMEs to appear on top.\n     */\n    z-index: 5;\n}\n\n.xterm .xterm-helper-textarea {\n    padding: 0;\n    border: 0;\n    margin: 0;\n    /* Move textarea out of the screen to the far left, so that the cursor is not visible */\n    position: absolute;\n    opacity: 0;\n    left: -9999em;\n    top: 0;\n    width: 0;\n    height: 0;\n    z-index: -5;\n    /** Prevent wrapping so the IME appears against the textarea at the correct position */\n    white-space: nowrap;\n    overflow: hidden;\n    resize: none;\n}\n\n.xterm .composition-view {\n    /* TODO: Composition position got messed up somewhere */\n    background: #000;\n    color: #FFF;\n    display: none;\n    position: absolute;\n    white-space: nowrap;\n    z-index: 1;\n}\n\n.xterm .composition-view.active {\n    display: block;\n}\n\n.xterm .xterm-viewport {\n    overflow-y: scroll;\n    cursor: default;\n    position: absolute;\n    right: 0;\n    left: 0;\n    top: 0;\n    bottom: 0;\n}\n\n.xterm:not(.allow-transparency) .xterm-viewport {\n    /* On OS X this is required in order for the scroll bar to appear fully opaque */\n    background-color: #000;\n}\n\n.xterm .xterm-screen {\n    position: relative;\n}\n\n.xterm .xterm-screen canvas {\n    position: absolute;\n    left: 0;\n    top: 0;\n}\n\n.xterm.enable-mouse-events {\n    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */\n    cursor: default;\n}\n\n.xterm.xterm-cursor-pointer,\n.xterm .xterm-cursor-pointer {\n    cursor: pointer;\n}\n\n.xterm.column-select.focus {\n    /* Column selection mode */\n    cursor: crosshair;\n}\n\n.xterm .xterm-accessibility:not(.debug),\n.xterm .xterm-message {\n    position: absolute;\n    left: 0;\n    top: 0;\n    bottom: 0;\n    right: 0;\n    z-index: 10;\n    color: transparent;\n    pointer-events: none;\n}\n\n.xterm .xterm-accessibility-tree:not(.debug) *::selection {\n  color: transparent;\n}\n\n.xterm .xterm-accessibility-tree {\n  font-family: monospace;\n  user-select: text;\n  white-space: pre;\n}\n\n.xterm .xterm-accessibility-tree > div {\n  transform-origin: left;\n  width: fit-content;\n}\n\n.xterm .live-region {\n    position: absolute;\n    left: -9999px;\n    width: 1px;\n    height: 1px;\n    overflow: hidden;\n}\n\n.xterm-dim {\n    /* Dim should not apply to background, so the opacity of the foreground color is applied\n     * explicitly in the generated class and reset to 1 here */\n    opacity: 1 !important;\n}\n\n.xterm-underline-1 { text-decoration: underline; }\n.xterm-underline-2 { text-decoration: double underline; }\n.xterm-underline-3 { text-decoration: wavy underline; }\n.xterm-underline-4 { text-decoration: dotted underline; }\n.xterm-underline-5 { text-decoration: dashed underline; }\n\n.xterm-overline {\n    text-decoration: overline;\n}\n\n.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }\n.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }\n.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }\n.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }\n.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }\n\n.xterm-strikethrough {\n    text-decoration: line-through;\n}\n\n.xterm-screen .xterm-decoration-container .xterm-decoration {\n\tz-index: 6;\n\tposition: absolute;\n}\n\n.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {\n\tz-index: 7;\n}\n\n.xterm-decoration-overview-ruler {\n    z-index: 8;\n    position: absolute;\n    top: 0;\n    right: 0;\n    pointer-events: none;\n}\n\n.xterm-decoration-top {\n    z-index: 2;\n    position: relative;\n}\n\n\n\n/* Derived from vs/base/browser/ui/scrollbar/media/scrollbar.css */\n\n/* xterm.js customization: Override xterm\'s cursor style */\n.xterm .xterm-scrollable-element > .xterm-scrollbar {\n    cursor: default;\n}\n\n/* Arrows */\n\n.xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-scra {\n\tcursor: pointer;\n    background-color: var(--vscode-scrollbarSliderBackground, rgba(100, 100, 100, 0.4));\n    mask-image: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 11 11\'><path d=\'M2.5 8.5 L5.5 2.5 L8.5 8.5 Z\' fill=\'black\'/></svg>");\n    -webkit-mask-image: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 11 11\'><path d=\'M2.5 8.5 L5.5 2.5 L8.5 8.5 Z\' fill=\'black\'/></svg>");\n    mask-repeat: no-repeat;\n    -webkit-mask-repeat: no-repeat;\n    mask-position: center center;\n    -webkit-mask-position: center center;\n    mask-size: 100% 100%;\n    -webkit-mask-size: 100% 100%;\n}\n\n.xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-scra.xterm-arrow-down {\n    transform: rotate(180deg);\n}\n\n.xterm .xterm-scrollable-element > .xterm-visible {\n\topacity: 1;\n\n\t/* Background rule added for IE9 - to allow clicks on dom node */\n\tbackground:rgba(0,0,0,0);\n\n\ttransition: opacity 100ms linear;\n\t/* In front of peek view */\n\tz-index: 11;\n}\n.xterm .xterm-scrollable-element > .xterm-invisible {\n\topacity: 0;\n\tpointer-events: none;\n}\n.xterm .xterm-scrollable-element > .xterm-invisible.xterm-fade {\n\ttransition: opacity 800ms linear;\n}\n\n/* Scrollable Content Inset Shadow */\n.xterm .xterm-scrollable-element > .xterm-shadow {\n\tposition: absolute;\n\tdisplay: none;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top {\n\tdisplay: block;\n\ttop: 0;\n\tleft: 3px;\n\theight: 3px;\n\twidth: 100%;\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-left {\n\tdisplay: block;\n\ttop: 3px;\n\tleft: 0;\n\theight: 100%;\n\twidth: 3px;\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top-left-corner {\n\tdisplay: block;\n\ttop: 0;\n\tleft: 0;\n\theight: 3px;\n\twidth: 3px;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top.xterm-shadow-left {\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;\n}\n`;\n\n  // node_modules/@xterm/addon-clipboard/lib/addon-clipboard.mjs\n  var U = "3.7.8";\n  var $ = U;\n  var f = typeof Buffer == "function";\n  var _ = typeof TextDecoder == "function" ? new TextDecoder() : void 0;\n  var C = typeof TextEncoder == "function" ? new TextEncoder() : void 0;\n  var N = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";\n  var c = Array.prototype.slice.call(N);\n  var d = ((e) => {\n    let t = {};\n    return e.forEach((r, o2) => t[r] = o2), t;\n  })(c);\n  var k = /^(?:[A-Za-z\\d+\\/]{4})*?(?:[A-Za-z\\d+\\/]{2}(?:==)?|[A-Za-z\\d+\\/]{3}=?)?$/;\n  var n = String.fromCharCode.bind(String);\n  var B = typeof Uint8Array.from == "function" ? Uint8Array.from.bind(Uint8Array) : (e) => new Uint8Array(Array.prototype.slice.call(e, 0));\n  var S = (e) => e.replace(/=/g, "").replace(/[+\\/]/g, (t) => t == "+" ? "-" : "_");\n  var I = (e) => e.replace(/[^A-Za-z0-9\\+\\/]/g, "");\n  var F = (e) => {\n    let t, r, o2, i5, s4 = "", l4 = e.length % 3;\n    for (let a2 = 0; a2 < e.length; ) {\n      if ((r = e.charCodeAt(a2++)) > 255 || (o2 = e.charCodeAt(a2++)) > 255 || (i5 = e.charCodeAt(a2++)) > 255) throw new TypeError("invalid character found");\n      t = r << 16 | o2 << 8 | i5, s4 += c[t >> 18 & 63] + c[t >> 12 & 63] + c[t >> 6 & 63] + c[t & 63];\n    }\n    return l4 ? s4.slice(0, l4 - 3) + "===".substring(l4) : s4;\n  };\n  var m = typeof btoa == "function" ? (e) => btoa(e) : f ? (e) => Buffer.from(e, "binary").toString("base64") : F;\n  var b = f ? (e) => Buffer.from(e).toString("base64") : (e) => {\n    let r = [];\n    for (let o2 = 0, i5 = e.length; o2 < i5; o2 += 4096) r.push(n.apply(null, e.subarray(o2, o2 + 4096)));\n    return m(r.join(""));\n  };\n  var x = (e, t = false) => t ? S(b(e)) : b(e);\n  var H = (e) => {\n    if (e.length < 2) {\n      var t = e.charCodeAt(0);\n      return t < 128 ? e : t < 2048 ? n(192 | t >>> 6) + n(128 | t & 63) : n(224 | t >>> 12 & 15) + n(128 | t >>> 6 & 63) + n(128 | t & 63);\n    } else {\n      var t = 65536 + (e.charCodeAt(0) - 55296) * 1024 + (e.charCodeAt(1) - 56320);\n      return n(240 | t >>> 18 & 7) + n(128 | t >>> 12 & 63) + n(128 | t >>> 6 & 63) + n(128 | t & 63);\n    }\n  };\n  var J = /[\\uD800-\\uDBFF][\\uDC00-\\uDFFFF]|[^\\x00-\\x7F]/g;\n  var P = (e) => e.replace(J, H);\n  var T = f ? (e) => Buffer.from(e, "utf8").toString("base64") : C ? (e) => b(C.encode(e)) : (e) => m(P(e));\n  var p = (e, t = false) => t ? S(T(e)) : T(e);\n  var v = (e) => p(e, true);\n  var q = /[\\xC0-\\xDF][\\x80-\\xBF]|[\\xE0-\\xEF][\\x80-\\xBF]{2}|[\\xF0-\\xF7][\\x80-\\xBF]{3}/g;\n  var G = (e) => {\n    switch (e.length) {\n      case 4:\n        var t = (7 & e.charCodeAt(0)) << 18 | (63 & e.charCodeAt(1)) << 12 | (63 & e.charCodeAt(2)) << 6 | 63 & e.charCodeAt(3), r = t - 65536;\n        return n((r >>> 10) + 55296) + n((r & 1023) + 56320);\n      case 3:\n        return n((15 & e.charCodeAt(0)) << 12 | (63 & e.charCodeAt(1)) << 6 | 63 & e.charCodeAt(2));\n      default:\n        return n((31 & e.charCodeAt(0)) << 6 | 63 & e.charCodeAt(1));\n    }\n  };\n  var D = (e) => e.replace(q, G);\n  var w = (e) => {\n    if (e = e.replace(/\\s+/g, ""), !k.test(e)) throw new TypeError("malformed base64.");\n    e += "==".slice(2 - (e.length & 3));\n    let t, r, o2, i5 = [];\n    for (let s4 = 0; s4 < e.length; ) t = d[e.charAt(s4++)] << 18 | d[e.charAt(s4++)] << 12 | (r = d[e.charAt(s4++)]) << 6 | (o2 = d[e.charAt(s4++)]), r === 64 ? i5.push(n(t >> 16 & 255)) : o2 === 64 ? i5.push(n(t >> 16 & 255, t >> 8 & 255)) : i5.push(n(t >> 16 & 255, t >> 8 & 255, t & 255));\n    return i5.join("");\n  };\n  var y = typeof atob == "function" ? (e) => atob(I(e)) : f ? (e) => Buffer.from(e, "base64").toString("binary") : w;\n  var R = f ? (e) => B(Buffer.from(e, "base64")) : (e) => B(y(e).split("").map((t) => t.charCodeAt(0)));\n  var E = (e) => R(O(e));\n  var K = f ? (e) => Buffer.from(e, "base64").toString("utf8") : _ ? (e) => _.decode(R(e)) : (e) => D(y(e));\n  var O = (e) => I(e.replace(/[-_]/g, (t) => t == "-" ? "+" : "/"));\n  var h = (e) => K(O(e));\n  var M = (e) => {\n    if (typeof e != "string") return false;\n    let t = e.replace(/\\s+/g, "").replace(/={0,2}$/, "");\n    return !/[^\\s0-9a-zA-Z\\+/]/.test(t) || !/[^\\s0-9a-zA-Z\\-_]/.test(t);\n  };\n  var z = (e) => ({ value: e, enumerable: false, writable: true, configurable: true });\n  var Z = function() {\n    let e = (t, r) => Object.defineProperty(String.prototype, t, z(r));\n    e("fromBase64", function() {\n      return h(this);\n    }), e("toBase64", function(t) {\n      return p(this, t);\n    }), e("toBase64URI", function() {\n      return p(this, true);\n    }), e("toBase64URL", function() {\n      return p(this, true);\n    }), e("toUint8Array", function() {\n      return E(this);\n    });\n  };\n  var V = function() {\n    let e = (t, r) => Object.defineProperty(Uint8Array.prototype, t, z(r));\n    e("toBase64", function(t) {\n      return x(this, t);\n    }), e("toBase64URI", function() {\n      return x(this, true);\n    }), e("toBase64URL", function() {\n      return x(this, true);\n    });\n  };\n  var Q = () => {\n    Z(), V();\n  };\n  var u = { version: U, VERSION: $, atob: y, atobPolyfill: w, btoa: m, btoaPolyfill: F, fromBase64: h, toBase64: p, encode: p, encodeURI: v, encodeURL: v, utob: P, btou: D, decode: h, isValid: M, fromUint8Array: x, toUint8Array: E, extendString: Z, extendUint8Array: V, extendBuiltins: Q };\n  var j = class {\n    constructor(t = new A(), r = new g()) {\n      this._base64 = t;\n      this._provider = r;\n    }\n    activate(t) {\n      this._terminal = t, this._disposable = t.parser.registerOscHandler(52, (r) => this._setOrReportClipboard(r));\n    }\n    dispose() {\n      return this._disposable?.dispose();\n    }\n    _readText(t, r) {\n      let o2 = this._base64.encodeText(r);\n      this._terminal?.input(`\\x1B]52;${t};${o2}\\x07`, false);\n    }\n    _setOrReportClipboard(t) {\n      let r = t.split(";");\n      if (r.length < 2) return true;\n      let o2 = r[0], i5 = r[1];\n      if (i5 === "?") {\n        let a2 = this._provider.readText(o2);\n        return a2 instanceof Promise ? a2.then((L6) => (this._readText(o2, L6), true)) : (this._readText(o2, a2), true);\n      }\n      let s4 = "";\n      try {\n        s4 = this._base64.decodeText(i5);\n      } catch {\n      }\n      let l4 = this._provider.writeText(o2, s4);\n      return l4 instanceof Promise ? l4.then(() => true) : true;\n    }\n  };\n  var g = class {\n    async readText(t) {\n      return t !== "c" ? Promise.resolve("") : navigator.clipboard.readText();\n    }\n    async writeText(t, r) {\n      return t !== "c" ? Promise.resolve() : navigator.clipboard.writeText(r);\n    }\n  };\n  var A = class {\n    encodeText(t) {\n      return u.encode(t);\n    }\n    decodeText(t) {\n      let r = u.decode(t);\n      return !u.isValid(t) || u.encode(r) !== t ? "" : r;\n    }\n  };\n\n  // node_modules/@xterm/addon-fit/lib/addon-fit.mjs\n  var f2 = 2;\n  var g2 = 1;\n  function _2(t) {\n    return t?.ownerDocument?.defaultView ? t.ownerDocument.defaultView : window;\n  }\n  function o(t) {\n    return _2(t).getComputedStyle(t, null);\n  }\n  var l = class {\n    activate(e) {\n      this._terminal = e;\n    }\n    dispose() {\n    }\n    fit() {\n      let e = this.proposeDimensions();\n      !e || !this._terminal || isNaN(e.cols) || isNaN(e.rows) || this._terminal.resize(e.cols, e.rows);\n    }\n    proposeDimensions() {\n      if (!this._terminal || !this._terminal.element || !this._terminal.element.parentElement) return;\n      let e = this._terminal.dimensions;\n      if (!e || e.css.cell.width === 0 || e.css.cell.height === 0) return;\n      let s4 = this._terminal.options.scrollbar?.showScrollbar ?? true, a2 = this._terminal.options.scrollback === 0 || !s4 ? 0 : this._terminal.options.scrollbar?.width ?? 14, r = o(this._terminal.element.parentElement), m4 = parseInt(r.getPropertyValue("height")), d3 = Math.max(0, parseInt(r.getPropertyValue("width"))), n11 = o(this._terminal.element), i5 = { top: parseInt(n11.getPropertyValue("padding-top")), bottom: parseInt(n11.getPropertyValue("padding-bottom")), right: parseInt(n11.getPropertyValue("padding-right")), left: parseInt(n11.getPropertyValue("padding-left")) }, c2 = i5.top + i5.bottom, p3 = i5.right + i5.left, h3 = m4 - c2, u3 = d3 - p3 - a2;\n      return { cols: Math.max(f2, Math.floor(u3 / e.css.cell.width)), rows: Math.max(g2, Math.floor(h3 / e.css.cell.height)) };\n    }\n  };\n\n  // node_modules/@xterm/addon-image/lib/addon-image.mjs\n  var it = Object.create;\n  var Te = Object.defineProperty;\n  var At = Object.getOwnPropertyDescriptor;\n  var rt = Object.getOwnPropertyNames;\n  var st = Object.getPrototypeOf;\n  var nt = Object.prototype.hasOwnProperty;\n  var L = (s4, e) => () => (e || s4((e = { exports: {} }).exports, e), e.exports);\n  var at = (s4, e, t, i5) => {\n    if (e && typeof e == "object" || typeof e == "function") for (let A4 of rt(e)) !nt.call(s4, A4) && A4 !== t && Te(s4, A4, { get: () => e[A4], enumerable: !(i5 = At(e, A4)) || i5.enumerable });\n    return s4;\n  };\n  var M2 = (s4, e, t) => (t = s4 != null ? it(st(s4)) : {}, at(e || !s4 || !s4.__esModule ? Te(t, "default", { value: s4, enumerable: true }) : t, s4));\n  var X = L((m4) => {\n    "use strict";\n    Object.defineProperty(m4, "__esModule", { value: true });\n    m4.DEFAULT_FOREGROUND = m4.DEFAULT_BACKGROUND = m4.PALETTE_ANSI_256 = m4.PALETTE_VT340_GREY = m4.PALETTE_VT340_COLOR = m4.normalizeHLS = m4.normalizeRGB = m4.nearestColorIndex = m4.fromRGBA8888 = m4.toRGBA8888 = m4.alpha = m4.blue = m4.green = m4.red = m4.BIG_ENDIAN = void 0;\n    m4.BIG_ENDIAN = new Uint8Array(new Uint32Array([4278190080]).buffer)[0] === 255;\n    m4.BIG_ENDIAN && console.warn("BE platform detected. This version of node-sixel works only on LE properly.");\n    function ve3(s4) {\n      return s4 & 255;\n    }\n    m4.red = ve3;\n    function Le3(s4) {\n      return s4 >>> 8 & 255;\n    }\n    m4.green = Le3;\n    function Me3(s4) {\n      return s4 >>> 16 & 255;\n    }\n    m4.blue = Me3;\n    function gt3(s4) {\n      return s4 >>> 24 & 255;\n    }\n    m4.alpha = gt3;\n    function B5(s4, e, t, i5 = 255) {\n      return ((i5 & 255) << 24 | (t & 255) << 16 | (e & 255) << 8 | s4 & 255) >>> 0;\n    }\n    m4.toRGBA8888 = B5;\n    function ht3(s4) {\n      return [s4 & 255, s4 >> 8 & 255, s4 >> 16 & 255, s4 >>> 24];\n    }\n    m4.fromRGBA8888 = ht3;\n    function dt3(s4, e) {\n      let t = ve3(s4), i5 = Le3(s4), A4 = Me3(s4), r = Number.MAX_SAFE_INTEGER, n11 = -1;\n      for (let a2 = 0; a2 < e.length; ++a2) {\n        let o2 = t - e[a2][0], h3 = i5 - e[a2][1], g6 = A4 - e[a2][2], d3 = o2 * o2 + h3 * h3 + g6 * g6;\n        if (!d3) return a2;\n        d3 < r && (r = d3, n11 = a2);\n      }\n      return n11;\n    }\n    m4.nearestColorIndex = dt3;\n    function Ie3(s4, e, t) {\n      return Math.max(s4, Math.min(t, e));\n    }\n    function le3(s4, e, t) {\n      return t < 0 && (t += 1), t > 1 && (t -= 1), t * 6 < 1 ? e + (s4 - e) * 6 * t : t * 2 < 1 ? s4 : t * 3 < 2 ? e + (s4 - e) * (4 - t * 6) : e;\n    }\n    function It3(s4, e, t) {\n      if (!t) {\n        let r = Math.round(e * 255);\n        return B5(r, r, r);\n      }\n      let i5 = e < 0.5 ? e * (1 + t) : e + t - e * t, A4 = 2 * e - i5;\n      return B5(Ie3(0, 255, Math.round(le3(i5, A4, s4 + 1 / 3) * 255)), Ie3(0, 255, Math.round(le3(i5, A4, s4) * 255)), Ie3(0, 255, Math.round(le3(i5, A4, s4 - 1 / 3) * 255)));\n    }\n    function c2(s4, e, t) {\n      return (4278190080 | Math.round(t / 100 * 255) << 16 | Math.round(e / 100 * 255) << 8 | Math.round(s4 / 100 * 255)) >>> 0;\n    }\n    m4.normalizeRGB = c2;\n    function lt4(s4, e, t) {\n      return It3((s4 + 240 % 360) / 360, e / 100, t / 100);\n    }\n    m4.normalizeHLS = lt4;\n    m4.PALETTE_VT340_COLOR = new Uint32Array([c2(0, 0, 0), c2(20, 20, 80), c2(80, 13, 13), c2(20, 80, 20), c2(80, 20, 80), c2(20, 80, 80), c2(80, 80, 20), c2(53, 53, 53), c2(26, 26, 26), c2(33, 33, 60), c2(60, 26, 26), c2(33, 60, 33), c2(60, 33, 60), c2(33, 60, 60), c2(60, 60, 33), c2(80, 80, 80)]);\n    m4.PALETTE_VT340_GREY = new Uint32Array([c2(0, 0, 0), c2(13, 13, 13), c2(26, 26, 26), c2(40, 40, 40), c2(6, 6, 6), c2(20, 20, 20), c2(33, 33, 33), c2(46, 46, 46), c2(0, 0, 0), c2(13, 13, 13), c2(26, 26, 26), c2(40, 40, 40), c2(6, 6, 6), c2(20, 20, 20), c2(33, 33, 33), c2(46, 46, 46)]);\n    m4.PALETTE_ANSI_256 = (() => {\n      let s4 = [B5(0, 0, 0), B5(205, 0, 0), B5(0, 205, 0), B5(205, 205, 0), B5(0, 0, 238), B5(205, 0, 205), B5(0, 250, 205), B5(229, 229, 229), B5(127, 127, 127), B5(255, 0, 0), B5(0, 255, 0), B5(255, 255, 0), B5(92, 92, 255), B5(255, 0, 255), B5(0, 255, 255), B5(255, 255, 255)], e = [0, 95, 135, 175, 215, 255];\n      for (let t = 0; t < 6; ++t) for (let i5 = 0; i5 < 6; ++i5) for (let A4 = 0; A4 < 6; ++A4) s4.push(B5(e[t], e[i5], e[A4]));\n      for (let t = 8; t <= 238; t += 10) s4.push(B5(t, t, t));\n      return new Uint32Array(s4);\n    })();\n    m4.DEFAULT_BACKGROUND = B5(0, 0, 0, 255);\n    m4.DEFAULT_FOREGROUND = B5(255, 255, 255, 255);\n  });\n  var Ce = L((_e3) => {\n    "use strict";\n    Object.defineProperty(_e3, "__esModule", { value: true });\n    _e3.InWasm = Bt2;\n    var R4 = (s4) => {\n      if (Uint8Array.fromBase64) return Uint8Array.fromBase64(s4);\n      if (typeof Buffer < "u") return Buffer.from(s4, "base64");\n      let e = atob(s4), t = new Uint8Array(e.length);\n      for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n      return t;\n    };\n    function Bt2(s4) {\n      if (s4.d) {\n        let { t: e, s: t, d: i5 } = s4, A4, r, n11 = WebAssembly;\n        return e === 0 ? t ? (a2) => new n11.Instance(r || (r = new n11.Module(A4 || (A4 = R4(i5)))), a2) : (a2) => r ? n11.instantiate(r, a2) : n11.instantiate(A4 || (A4 = R4(i5)), a2).then((o2) => (r = o2.module) && o2.instance) : e === 1 ? t ? () => r || (r = new n11.Module(A4 || (A4 = R4(i5)))) : () => r ? Promise.resolve(r) : n11.compile(A4 || (A4 = R4(i5))).then((a2) => r = a2) : t ? () => A4 || (A4 = R4(i5)) : () => Promise.resolve(A4 || (A4 = R4(i5)));\n      }\n      if (typeof _wasmCtx > "u") throw new Error(\'must run "inwasm"\');\n      _wasmCtx.add(s4);\n    }\n  });\n  var Be = L((Ee2) => {\n    "use strict";\n    Object.defineProperty(Ee2, "__esModule", { value: true });\n    var pt4 = Ce(), ft4 = (0, pt4.InWasm)({ s: 1, t: 0, d: "AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML" }), T4 = new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map((s4) => s4.charCodeAt(0))), k5 = new Uint32Array(1024);\n    k5.fill(4278190080);\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[T4[s4]] = s4 << 2;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[256 + T4[s4]] = s4 >> 4 | (s4 << 4 & 255) << 8;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[512 + T4[s4]] = s4 >> 2 << 8 | (s4 << 6 & 255) << 16;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[768 + T4[s4]] = s4 << 16;\n    var Qt3 = new Uint8Array(0), ue2 = class {\n      constructor(e, t, i5) {\n        if (this._inst = null, this._ended = true, this._bytes = 0, this.keepSize = e ?? 1048576, this.maxBytes = t ?? 4294901760, this._bytes = i5 ?? 32768, this._bytes > this.maxBytes || this.maxBytes > 4294901760) throw new Error("invalid byte settings");\n      }\n      get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282]) : Qt3;\n      }\n      release() {\n        this._inst && (this._bytes > this.keepSize ? this._inst = this._m32 = this._d = this._mem = null : (this._m32[1280] = 0, this._m32[1281] = 0, this._m32[1282] = 0));\n      }\n      init(e, t) {\n        if (this.maxBytes = e ?? this.maxBytes, this._bytes = t ?? Math.min(this._bytes, this.maxBytes), this._bytes > this.maxBytes || this.maxBytes > 4294901760) throw Error("invalid byte settings");\n        let i5 = this._m32, A4 = this._bytes + 5152;\n        this._inst ? this._mem.buffer.byteLength < A4 && (this._mem.grow(Math.ceil((A4 - this._mem.buffer.byteLength) / 65536)), i5 = new Uint32Array(this._mem.buffer, 0), this._d = new Uint8Array(this._mem.buffer, 5152)) : (this._mem = new WebAssembly.Memory({ initial: Math.ceil(A4 / 65536) }), this._inst = ft4({ env: { memory: this._mem } }), i5 = new Uint32Array(this._mem.buffer, 0), i5.set(k5, 256), this._d = new Uint8Array(this._mem.buffer, 5152)), i5[1280] = 0, i5[1281] = 0, i5[1282] = 0, this._m32 = i5, this._ended = false;\n      }\n      _realloc(e) {\n        let t = this._m32[1280] + e;\n        if (this._bytes < t) {\n          if (t > this.maxBytes) return -3;\n          let i5 = this._bytes;\n          for (; (i5 *= 2) < t; ) ;\n          if (i5 = Math.min(i5, this.maxBytes), i5 < t) return -3;\n          if (i5 + 5152 > this._mem.buffer.byteLength) {\n            let A4 = Math.ceil((i5 + 5152 - this._mem.buffer.byteLength) / 65536);\n            this._mem.grow(A4), this._m32 = new Uint32Array(this._mem.buffer, 0), this._d = new Uint8Array(this._mem.buffer, 5152);\n          }\n          this._bytes = i5;\n        }\n        return 0;\n      }\n      put(e) {\n        if (!this._inst || this._ended) return -2;\n        if (this._realloc(e.length)) return -3;\n        let t = this._m32;\n        return this._d.set(e, t[1280]), t[1280] += e.length, t[1280] - t[1281] >= 131072 ? this._inst.exports.dec() : 0;\n      }\n      end() {\n        return this._ended = true, this._inst ? this._inst.exports.end() : -2;\n      }\n      get loadedBytes() {\n        return this._inst ? this._m32[1280] : 0;\n      }\n      get freeBytes() {\n        return this._inst ? this.maxBytes - this._m32[1280] : 0;\n      }\n    };\n    Ee2.default = ue2;\n  });\n  var Re = L((fe3) => {\n    "use strict";\n    Object.defineProperty(fe3, "__esModule", { value: true });\n    var Dt3 = Ce(), wt2 = (0, Dt3.InWasm)({ s: 1, t: 0, d: "AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw==" }), pe2 = class {\n      constructor(e) {\n        this.keepSize = e, this.width = 0, this.height = 0;\n      }\n      decode(e) {\n        this.width = e[4] << 24 | e[5] << 16 | e[6] << 8 | e[7], this.height = e[8] << 24 | e[9] << 16 | e[10] << 8 | e[11];\n        let t = this.width * this.height, i5 = t * 4, A4 = e.length, r = Math.max(i5, A4) + (Math.min(i5, A4) >> 1) + 4096;\n        this._inst ? this._mem.buffer.byteLength < r && (this._mem.grow(Math.ceil((r - this._mem.buffer.byteLength) / 65536)), this._d = null) : (this._mem = new WebAssembly.Memory({ initial: Math.ceil(r / 65536) }), this._inst = wt2({ env: { memory: this._mem } })), this._d || (this._d = new Uint8Array(this._mem.buffer));\n        let n11 = this._mem.buffer.byteLength - A4 & -256;\n        return this._d.set(e, n11), this._inst.exports.dec(n11, A4, t), this._d.subarray(1024, 1024 + i5);\n      }\n      release() {\n        this._inst && this._mem.buffer.byteLength > this.keepSize && (this._inst = this._d = this._mem = null);\n      }\n    };\n    fe3.default = pe2;\n  });\n  var Pe = L((re3) => {\n    "use strict";\n    Object.defineProperty(re3, "__esModule", { value: true });\n    re3.LIMITS = void 0;\n    re3.LIMITS = { CHUNK_SIZE: 16384, PALETTE_SIZE: 4096, MAX_WIDTH: 16384, BYTES: "AGFzbQEAAAABJAdgAAF/YAJ/fwBgA39/fwF/YAF/AX9gAABgBH9/f38AYAF/AAIlAgNlbnYLaGFuZGxlX2JhbmQAAwNlbnYLbW9kZV9wYXJzZWQAAwMTEgQAAAAAAQQBAQUBAAACAgAGAwQFAXABBwcFBAEBBwcGCAF/AUGAihoLB9wBDgZtZW1vcnkCABFnZXRfc3RhdGVfYWRkcmVzcwADEWdldF9jaHVua19hZGRyZXNzAAQOZ2V0X3AwX2FkZHJlc3MABRNnZXRfcGFsZXR0ZV9hZGRyZXNzAAYEaW5pdAALBmRlY29kZQAMDWN1cnJlbnRfd2lkdGgADQ5jdXJyZW50X2hlaWdodAAOGV9faW5kaXJlY3RfZnVuY3Rpb25fdGFibGUBAAtfaW5pdGlhbGl6ZQACCXN0YWNrU2F2ZQARDHN0YWNrUmVzdG9yZQASCnN0YWNrQWxsb2MAEwkMAQBBAQsGCgcJDxACDAEBCq5UEgMAAQsFAEGgCAsGAEGQiQELBgBBsIkCCwUAQZAJC+okAQh/QeQIKAIAIQVB4AgoAgAhA0HoCCgCACEIIAFBkIkBaiIJQf8BOgAAIAAgAUgEQCAAQZCJAWohBgNAIAMhBCAGQQFqIQECQCAGLQAAQf8AcSIDQTBrQQlLBEAgASEGDAELQewIKAIAQQJ0QewIaiICKAIAIQADQCACIAMgAEEKbGpBMGsiADYCACABLQAAIQMgAUEBaiIGIQEgA0H/AHEiA0Ewa0EKSQ0ACwsCQAJAAkACQAJAAkACQAJ/AkACQCADQT9rIgBBP00EQCAERQ0BIARBIUYEQAJAQfAIKAIAIgFBASABGyIHIAhqIgFB1AgoAgAiA0gNACADQf//AEoNAANAIANBAnQiAkGgiQJqIgRBoAgpAwA3AwAgAkGoiQJqQaAIKQMANwMAIAJBsIkCakGgCCkDADcDACACQbiJAmpBoAgpAwA3AwAgAkHAiQJqQaAIKQMANwMAIAJByIkCakGgCCkDADcDACACQdCJAmpBoAgpAwA3AwAgAkHYiQJqQaAIKQMANwMAIAJB4IkCakGgCCkDADcDACACQeiJAmpBoAgpAwA3AwAgAkHwiQJqQaAIKQMANwMAIAJB+IkCakGgCCkDADcDACACQYCKAmpBoAgpAwA3AwAgAkGIigJqQaAIKQMANwMAIAJBkIoCakGgCCkDADcDACACQZiKAmpBoAgpAwA3AwAgAkGgigJqQaAIKQMANwMAIAJBqIoCakGgCCkDADcDACACQbCKAmpBoAgpAwA3AwAgAkG4igJqQaAIKQMANwMAIAJBwIoCakGgCCkDADcDACACQciKAmpBoAgpAwA3AwAgAkHQigJqQaAIKQMANwMAIAJB2IoCakGgCCkDADcDACACQeCKAmpBoAgpAwA3AwAgAkHoigJqQaAIKQMANwMAIAJB8IoCakGgCCkDADcDACACQfiKAmpBoAgpAwA3AwAgAkGAiwJqQaAIKQMANwMAIAJBiIsCakGgCCkDADcDACACQZCLAmpBoAgpAwA3AwAgAkGYiwJqQaAIKQMANwMAIAJBoIsCakGgCCkDADcDACACQaiLAmpBoAgpAwA3AwAgAkGwiwJqQaAIKQMANwMAIAJBuIsCakGgCCkDADcDACACQcCLAmpBoAgpAwA3AwAgAkHIiwJqQaAIKQMANwMAIAJB0IsCakGgCCkDADcDACACQdiLAmpBoAgpAwA3AwAgAkHgiwJqQaAIKQMANwMAIAJB6IsCakGgCCkDADcDACACQfCLAmpBoAgpAwA3AwAgAkH4iwJqQaAIKQMANwMAIAJBgIwCakGgCCkDADcDACACQYiMAmpBoAgpAwA3AwAgAkGQjAJqQaAIKQMANwMAIAJBmIwCakGgCCkDADcDACACQaCMAmpBoAgpAwA3AwAgAkGojAJqQaAIKQMANwMAIAJBsIwCakGgCCkDADcDACACQbiMAmpBoAgpAwA3AwAgAkHAjAJqQaAIKQMANwMAIAJByIwCakGgCCkDADcDACACQdCMAmpBoAgpAwA3AwAgAkHYjAJqQaAIKQMANwMAIAJB4IwCakGgCCkDADcDACACQeiMAmpBoAgpAwA3AwAgAkHwjAJqQaAIKQMANwMAIAJB+IwCakGgCCkDADcDACACQYCNAmpBoAgpAwA3AwAgAkGIjQJqQaAIKQMANwMAIAJBkI0CakGgCCkDADcDACACQZiNAmpBoAgpAwA3AwAgAkGwiQZqIARBgAT8CgAAQdQIKAIAQQJ0QcCJCmogBEGABPwKAABB1AgoAgBBAnRB0IkOaiAEQYAE/AoAAEHUCCgCAEECdEHgiRJqIARBgAT8CgAAQdQIKAIAQQJ0QfCJFmogBEGABPwKAABB1AhB1AgoAgAiAkGAAWoiAzYCACABIANIDQEgAkGA/wBIDQALCwJAIABFDQAgCEH//wBLDQBBgIABIAhrIAcgAUH//wBLGyECAkAgAEEBcUUNACACRQ0AIAhBAnRBoIkCaiEDIAIhBCACQQdxIgcEQANAIAMgBTYCACADQQRqIQMgBEEBayEEIAdBAWsiBw0ACwsgAkEBa0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgBEEIayIEDQALCwJAIABBAnFFDQAgAkUNACAIQQJ0QbCJBmohAyACIQQgAkEHcSIHBEADQCADIAU2AgAgA0EEaiEDIARBAWshBCAHQQFrIgcNAAsLIAJBAWtBB0kNAANAIAMgBTYCHCADIAU2AhggAyAFNgIUIAMgBTYCECADIAU2AgwgAyAFNgIIIAMgBTYCBCADIAU2AgAgA0EgaiEDIARBCGsiBA0ACwsCQCAAQQRxRQ0AIAJFDQAgCEECdEHAiQpqIQMgAiEEIAJBB3EiBwRAA0AgAyAFNgIAIANBBGohAyAEQQFrIQQgB0EBayIHDQALCyACQQFrQQdJDQADQCADIAU2AhwgAyAFNgIYIAMgBTYCFCADIAU2AhAgAyAFNgIMIAMgBTYCCCADIAU2AgQgAyAFNgIAIANBIGohAyAEQQhrIgQNAAsLAkAgAEEIcUUNACACRQ0AIAhBAnRB0IkOaiEDIAIhBCACQQdxIgcEQANAIAMgBTYCACADQQRqIQMgBEEBayEEIAdBAWsiBw0ACwsgAkEBa0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgBEEIayIEDQALCwJAIABBEHFFDQAgAkUNACAIQQJ0QeCJEmohAyACIQQgAkEHcSIHBEADQCADIAU2AgAgA0EEaiEDIARBAWshBCAHQQFrIgcNAAsLIAJBAWtBB0kNAANAIAMgBTYCHCADIAU2AhggAyAFNgIUIAMgBTYCECADIAU2AgwgAyAFNgIIIAMgBTYCBCADIAU2AgAgA0EgaiEDIARBCGsiBA0ACwsgAEEgcUUNACACRQ0AIAJBAWshByAIQQJ0QfCJFmohAyACQQdxIgQEQANAIAMgBTYCACADQQRqIQMgAkEBayECIARBAWsiBA0ACwsgB0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgAkEIayICDQALC0HcCEHcCCgCACAAcjYCACAGQQFqIgIgBi0AAEH/AHEiA0E/ayIAQT9LDQQaDAMLAkBB7AgoAgAiBEEBRgRAQfAIKAIAIgNBzAgoAgAiAUkNASADIAFwIQMMAQtB+AgoAgAhAkH0CCgCACEBAkACQCAEQQVHDQAgAUEBRw0AIAJB6QJODQQMAQsgAkHkAEoNA0H8CCgCAEHkAEoNA0GACSgCAEHkAEoNAwsCQCABRQ0AIAFBAkoNACACQfwIKAIAQYAJKAIAIAFBAnRBiAhqKAIAEQIAIQFB8AgoAgAiA0HMCCgCACICTwR/IAMgAnAFIAMLQQJ0QZAJaiABNgIAC0HwCCgCACIDQcwIKAIAIgFJDQAgAyABcCEDCyADQQJ0QZAJaigCACEFDAELIANB/QBxQSFHBEAgCCEBIAYhAgwECyAEQSNHDQQCQEHsCCgCACICQQFGBEBB8AgoAgAiAUHMCCgCACIASQ0BIAEgAHAhAQwBC0H4CCgCACEBQfQIKAIAIQACQAJAIAJBBUcNACAAQQFHDQAgAUHpAkgNAQwHCyABQeQASg0GQfwIKAIAQeQASg0GQYAJKAIAQeQASg0GCwJAIABFDQAgAEECSg0AIAFB/AgoAgBBgAkoAgAgAEECdEGICGooAgARAgAhAEHwCCgCACIBQcwIKAIAIgJPBH8gASACcAUgAQtBAnRBkAlqIAA2AgALQfAIKAIAIgFBzAgoAgAiAEkNACABIABwIQELIAFBAnRBkAlqKAIAIQUMBAsgCCEBIAYhAgtB1AgoAgAhBgNAAkAgASAGSA0AIAZB//8ASg0AIAZBAnQiBEGgiQJqIgZBoAgpAwA3AwAgBEGoiQJqQaAIKQMANwMAIARBsIkCakGgCCkDADcDACAEQbiJAmpBoAgpAwA3AwAgBEHAiQJqQaAIKQMANwMAIARByIkCakGgCCkDADcDACAEQdCJAmpBoAgpAwA3AwAgBEHYiQJqQaAIKQMANwMAIARB4IkCakGgCCkDADcDACAEQeiJAmpBoAgpAwA3AwAgBEHwiQJqQaAIKQMANwMAIARB+IkCakGgCCkDADcDACAEQYCKAmpBoAgpAwA3AwAgBEGIigJqQaAIKQMANwMAIARBkIoCakGgCCkDADcDACAEQZiKAmpBoAgpAwA3AwAgBEGgigJqQaAIKQMANwMAIARBqIoCakGgCCkDADcDACAEQbCKAmpBoAgpAwA3AwAgBEG4igJqQaAIKQMANwMAIARBwIoCakGgCCkDADcDACAEQciKAmpBoAgpAwA3AwAgBEHQigJqQaAIKQMANwMAIARB2IoCakGgCCkDADcDACAEQeCKAmpBoAgpAwA3AwAgBEHoigJqQaAIKQMANwMAIARB8IoCakGgCCkDADcDACAEQfiKAmpBoAgpAwA3AwAgBEGAiwJqQaAIKQMANwMAIARBiIsCakGgCCkDADcDACAEQZCLAmpBoAgpAwA3AwAgBEGYiwJqQaAIKQMANwMAIARBoIsCakGgCCkDADcDACAEQaiLAmpBoAgpAwA3AwAgBEGwiwJqQaAIKQMANwMAIARBuIsCakGgCCkDADcDACAEQcCLAmpBoAgpAwA3AwAgBEHIiwJqQaAIKQMANwMAIARB0IsCakGgCCkDADcDACAEQdiLAmpBoAgpAwA3AwAgBEHgiwJqQaAIKQMANwMAIARB6IsCakGgCCkDADcDACAEQfCLAmpBoAgpAwA3AwAgBEH4iwJqQaAIKQMANwMAIARBgIwCakGgCCkDADcDACAEQYiMAmpBoAgpAwA3AwAgBEGQjAJqQaAIKQMANwMAIARBmIwCakGgCCkDADcDACAEQaCMAmpBoAgpAwA3AwAgBEGojAJqQaAIKQMANwMAIARBsIwCakGgCCkDADcDACAEQbiMAmpBoAgpAwA3AwAgBEHAjAJqQaAIKQMANwMAIARByIwCakGgCCkDADcDACAEQdCMAmpBoAgpAwA3AwAgBEHYjAJqQaAIKQMANwMAIARB4IwCakGgCCkDADcDACAEQeiMAmpBoAgpAwA3AwAgBEHwjAJqQaAIKQMANwMAIARB+IwCakGgCCkDADcDACAEQYCNAmpBoAgpAwA3AwAgBEGIjQJqQaAIKQMANwMAIARBkI0CakGgCCkDADcDACAEQZiNAmpBoAgpAwA3AwAgBEGwiQZqIAZBgAT8CgAAQdQIKAIAQQJ0QcCJCmogBkGABPwKAABB1AgoAgBBAnRB0IkOaiAGQYAE/AoAAEHUCCgCAEECdEHgiRJqIAZBgAT8CgAAQdQIKAIAQQJ0QfCJFmogBkGABPwKAABB1AhB1AgoAgBBgAFqIgY2AgALIAFB//8ATQRAIABBAXEgAWxBAnRBoIkCaiAFNgIAIABBAXZBAXEgAWxBAnRBsIkGaiAFNgIAIABBAnZBAXEgAWxBAnRBwIkKaiAFNgIAIABBA3ZBAXEgAWxBAnRB0IkOaiAFNgIAIABBBHZBAXEgAWxBAnRB4IkSaiAFNgIAIABBBXYgAWxBAnRB8IkWaiAFNgIAQdQIKAIAIQYLIAFBAWohAUHcCEHcCCgCACAAcjYCACACLQAAIQAgAkEBaiIEIQIgAEH/AHEiA0E/ayIAQcAASQ0ACyAECyECQQAhBCACIQYgASEIIANB/QBxQSFGDQELIANBJGsOCgEDAwMDAwMDAwIDC0HsCEIBNwIADAQLQdgIIAFB2AgoAgAiACAAIAFIGyIAQYCAASAAQYCAAUgbNgIADAILQegIIAFB2AgoAgAiACAAIAFIGyIAQYCAASAAQYCAAUgbIgA2AgBB2AggADYCACAAQQRrEAAEQEHoCEEENgIAQdgIQQQ2AgBB0AhBATYCAA8LEAgMAQsCQCADQTtHDQBB7AgoAgAiAEEHSg0AQewIIABBAWo2AgAgAEECdEHwCGpBADYCAAsgAiEGIAQhAyABIQgMAQtBBCEIIAIhBiAEIQMLIAYgCUkNAAsLQeQIIAU2AgBB4AggAzYCAEHoCCAINgIAC9ELAgF+CH9B2AhCBDcDAEGojQJBoAgpAwAiADcDAEGgjQIgADcDAEGYjQIgADcDAEGQjQIgADcDAEGIjQIgADcDAEGAjQIgADcDAEH4jAIgADcDAEHwjAIgADcDAEHojAIgADcDAEHgjAIgADcDAEHYjAIgADcDAEHQjAIgADcDAEHIjAIgADcDAEHAjAIgADcDAEG4jAIgADcDAEGwjAIgADcDAEGojAIgADcDAEGgjAIgADcDAEGYjAIgADcDAEGQjAIgADcDAEGIjAIgADcDAEGAjAIgADcDAEH4iwIgADcDAEHwiwIgADcDAEHoiwIgADcDAEHgiwIgADcDAEHYiwIgADcDAEHQiwIgADcDAEHIiwIgADcDAEHAiwIgADcDAEG4iwIgADcDAEGwiwIgADcDAEGoiwIgADcDAEGgiwIgADcDAEGYiwIgADcDAEGQiwIgADcDAEGIiwIgADcDAEGAiwIgADcDAEH4igIgADcDAEHwigIgADcDAEHoigIgADcDAEHgigIgADcDAEHYigIgADcDAEHQigIgADcDAEHIigIgADcDAEHAigIgADcDAEG4igIgADcDAEGwigIgADcDAEGoigIgADcDAEGgigIgADcDAEGYigIgADcDAEGQigIgADcDAEGIigIgADcDAEGAigIgADcDAEH4iQIgADcDAEHwiQIgADcDAEHoiQIgADcDAEHgiQIgADcDAEHYiQIgADcDAEHQiQIgADcDAEHIiQIgADcDAEHAiQIgADcDAEG4iQIgADcDAEGwiQIgADcDAEGoCCgCACIEQf8AakGAAW0hCAJAIARBgQFIDQBBASEBIAhBAiAIQQJKG0EBayICQQFxIQMgBEGBAk4EQCACQX5xIQIDQCABQQl0IgdBEHJBoIkCakGwiQJBgAT8CgAAIAdBsI0CakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsLIANFDQAgAUEJdEEQckGgiQJqQbCJAkGABPwKAAALAkAgBEEBSA0AIAhBASAIQQFKGyIDQQFxIQUCQCADQQFrIgdFBEBBACEBDAELIANB/v///wdxIQJBACEBA0AgAUEJdCIGQRByQbCJBmpBsIkCQYAE/AoAACAGQZAEckGwiQZqQbCJAkGABPwKAAAgAUECaiEBIAJBAmsiAg0ACwsgBQRAIAFBCXRBEHJBsIkGakGwiQJBgAT8CgAACyAEQQFIDQAgA0EBcSEFIAcEfyADQf7///8HcSECQQAhAQNAIAFBCXQiBkEQckHAiQpqQbCJAkGABPwKAAAgBkGQBHJBwIkKakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsgAUEHdEEEcgVBBAshASAFBEAgAUECdEHAiQpqQbCJAkGABPwKAAALIARBAUgNACADQQFxIQUgBwR/IANB/v///wdxIQJBACEBA0AgAUEJdCIGQRByQdCJDmpBsIkCQYAE/AoAACAGQZAEckHQiQ5qQbCJAkGABPwKAAAgAUECaiEBIAJBAmsiAg0ACyABQQd0QQRyBUEECyEBIAUEQCABQQJ0QdCJDmpBsIkCQYAE/AoAAAsgBEEBSA0AIANBAXEhBSAHBH8gA0H+////B3EhAkEAIQEDQCABQQl0IgZBEHJB4IkSakGwiQJBgAT8CgAAIAZBkARyQeCJEmpBsIkCQYAE/AoAACABQQJqIQEgAkECayICDQALIAFBB3RBBHIFQQQLIQEgBQRAIAFBAnRB4IkSakGwiQJBgAT8CgAACyAEQQFIDQAgA0EBcSEEIAcEfyADQf7///8HcSECQQAhAQNAIAFBCXQiA0EQckHwiRZqQbCJAkGABPwKAAAgA0GQBHJB8IkWakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsgAUEHdEEEcgVBBAshASAERQ0AIAFBAnRB8IkWakGwiQJBgAT8CgAAC0HUCCAIQQd0QQRyNgIAC58TAgh/AX5B5AgoAgAhA0HgCCgCACECQegIKAIAIQcgAUGQiQFqIglB/wE6AAAgACABSARAIABBkIkBaiEIA0AgAiEEIAhBAWohAQJAIAgtAABB/wBxIgJBMGtBCUsEQCABIQgMAQtB7AgoAgBBAnRB7AhqIgUoAgAhAANAIAUgAiAAQQpsakEwayIANgIAIAEtAAAhAiABQQFqIgghASACQf8AcSICQTBrQQpJDQALCwJAAkACQAJAAkACQAJ/AkAgAkE/ayIAQT9NBEAgBEUNASAEQSFGBEBB8AgoAgAiAUEBIAEbIgQgB2ohAQJAIABFDQAgB0H//wBLDQBBgIABIAdrIAQgAUH//wBLGyEFAkAgAEEBcUUNACAHQQJ0QaCJAmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEECcUUNACAHQQJ0QbCJBmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEEcUUNACAHQQJ0QcCJCmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEIcUUNACAHQQJ0QdCJDmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEQcUUNACAHQQJ0QeCJEmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLIABBIHFFDQAgBUEBayEEIAdBAnRB8IkWaiEAIAVBB3EiAgRAA0AgACADNgIAIABBBGohACAFQQFrIQUgAkEBayICDQALCyAEQQdJDQADQCAAIAM2AhwgACADNgIYIAAgAzYCFCAAIAM2AhAgACADNgIMIAAgAzYCCCAAIAM2AgQgACADNgIAIABBIGohACAFQQhrIgUNAAsLIAhBAWoiBSAILQAAQf8AcSICQT9rIgBBP00NAxoMBAsCQEHsCCgCACIFQQFGBEBB8AgoAgAiAUHMCCgCACIESQ0BIAEgBHAhAQwBC0H4CCgCACEEQfQIKAIAIQECQAJAIAVBBUcNACABQQFHDQAgBEHpAk4NBAwBCyAEQeQASg0DQfwIKAIAQeQASg0DQYAJKAIAQeQASg0DCwJAIAFFDQAgAUECSg0AIARB/AgoAgBBgAkoAgAgAUECdEGICGooAgARAgAhBEHwCCgCACIBQcwIKAIAIgVPBH8gASAFcAUgAQtBAnRBkAlqIAQ2AgALQfAIKAIAIgFBzAgoAgAiBEkNACABIARwIQELIAFBAnRBkAlqKAIAIQMMAQsgAkH9AHFBIUcEQCAHIQEgAiEADAQLIARBI0cNBAJAQewIKAIAIgRBAUYEQEHwCCgCACIBQcwIKAIAIgBJDQEgASAAcCEBDAELQfgIKAIAIQFB9AgoAgAhAAJAAkAgBEEFRw0AIABBAUcNACABQekCSA0BDAcLIAFB5ABKDQZB/AgoAgBB5ABKDQZBgAkoAgBB5ABKDQYLAkAgAEUNACAAQQJKDQAgAUH8CCgCAEGACSgCACAAQQJ0QYgIaigCABECACEAQfAIKAIAIgFBzAgoAgAiBE8EfyABIARwBSABC0ECdEGQCWogADYCAAtB8AgoAgAiAUHMCCgCACIASQ0AIAEgAHAhAQsgAUECdEGQCWooAgAhAwwECyAHIQEgCAshBQNAIAFB//8ATQRAIABBAXEgAWxBAnRBoIkCaiADNgIAIABBAXZBAXEgAWxBAnRBsIkGaiADNgIAIABBAnZBAXEgAWxBAnRBwIkKaiADNgIAIABBA3ZBAXEgAWxBAnRB0IkOaiADNgIAIABBBHZBAXEgAWxBAnRB4IkSaiADNgIAIABBBXYgAWxBAnRB8IkWaiADNgIACyABQQFqIQEgBS0AACEAIAVBAWoiBCEFIABB/wBxIgJBP2siAEHAAEkNAAsgBCEFC0EAIQQgBSEIIAEhByACIQAgAkH9AHFBIUYNAQtBBCEHIAQhAiAAQSRrDgoDAgICAgICAgIBAgtB7AhCATcCAAwCC0GoCCgCAEEEaxAABEBB0AhBATYCAA8LAkBBqAgoAgAiBkEFSA0AQaAIKQMAIQogBkEDa0EBdiIBQQdxIQJBACEAIAFBAWtBB08EQCABQfj///8HcSEFA0AgAEEDdCIBQbCJAmogCjcDACABQQhyQbCJAmogCjcDACABQRByQbCJAmogCjcDACABQRhyQbCJAmogCjcDACABQSByQbCJAmogCjcDACABQShyQbCJAmogCjcDACABQTByQbCJAmogCjcDACABQThyQbCJAmogCjcDACAAQQhqIQAgBUEIayIFDQALCyACRQ0AA0AgAEEDdEGwiQJqIAo3AwAgAEEBaiEAIAJBAWsiAg0ACwtBwIkGQbCJAiAGQQJ0IgD8CgAAQdCJCkGwiQIgAPwKAABB4IkOQbCJAiAA/AoAAEHwiRJBsIkCIAD8CgAAQYCKFkGwiQIgAPwKAAAgBCECDAELAkAgAEE7Rw0AQewIKAIAIgBBB0oNAEHsCCAAQQFqNgIAIABBAnRB8AhqQQA2AgALIAEhBwsgCCAJSQ0ACwtB5AggAzYCAEHgCCACNgIAQegIIAc2AgAL4gcCBX8BfgJAQdAIAn8CQAJAIAAgAU4NACABQZCJAWohBiAAQZCJAWohBQNAIAUtAAAiA0H/AHEhAgJAAkACQAJAAkACQAJAQeAIKAIAIgRBIkcEQCAEDQcgAkEiRgRAQewIQgE3AgBB4AhBIjYCAAwICyACQT9rQcAASQ0GIANBIWsiAkEMTQ0BDAULAkAgAkEwayIEQQlNBEBB7AgoAgBBAnRB7AhqIgIgBCACKAIAQQpsajYCAAwBC0HsCCgCACEEIAJBO0YEQCAEQQdKDQFB7AggBEEBajYCACAEQQJ0QfAIakEANgIADAELIARBBEYEQEHECEECNgIAQbAIQfAIKQMANwMAQbgIQfgIKAIAIgI2AgBBvAhB/AgoAgAiBDYCAEHICEECQQFBwAgoAgAiAxs2AgBBrAggBEEAIAMbNgIAQagIIAJBgIABIAJBgIABSBtBBGpBACADGzYCAEHgCEEANgIADAoLIAJBP2tBwABJDQQLIANBIWsiAkEMTQ0BDAILQQEgAnRBjSBxRQ0DDAQLQQEgAnRBjSBxDQELIANBoQFrIgJBDEsNA0EBIAJ0QY0gcUUNAwtBxAhCgYCAgBA3AgBBsAhB8AgoAgBBAEHsCCgCACICQQBKGzYCAEG0CEH0CCgCAEEAIAJBAUobNgIAQbgIQfgIKAIAQQAgAkECShs2AgBB4AhBADYCAEG8CEEANgIADAQLIANBoQFrIgJBDEsNAUEBIAJ0QY0gcUUNAQtBxAhCgYCAgBA3AgBBsAhCADcDAEG4CEIANwMADAMLIAVBAWoiBSAGSQ0ACwsCQEHICCgCAA4DAwEAAQsCQEGoCCgCACIFQQVIDQBBoAgpAwAhByAFQQNrQQF2IgNBB3EhBEEAIQIgA0EBa0EHTwRAIANB+P///wdxIQYDQCACQQN0IgNBsIkCaiAHNwMAIANBCHJBsIkCaiAHNwMAIANBEHJBsIkCaiAHNwMAIANBGHJBsIkCaiAHNwMAIANBIHJBsIkCaiAHNwMAIANBKHJBsIkCaiAHNwMAIANBMHJBsIkCaiAHNwMAIANBOHJBsIkCaiAHNwMAIAJBCGohAiAGQQhrIgYNAAsLIARFDQADQCACQQN0QbCJAmogBzcDACACQQFqIQIgBEEBayIEDQALC0HAiQZBsIkCIAVBAnQiA/wKAABB0IkKQbCJAiAD/AoAAEHgiQ5BsIkCIAP8CgAAQfCJEkGwiQIgA/wKAABBgIoWQbCJAiAD/AoAAEECDAELEAhByAgoAgALEAEiAjYCACACDQAgACABQcgIKAIAQQJ0QYAIaigCABEBAAsLdABB6AhBBDYCAEHkCCAANgIAQewIQgE3AgBBxAhCADcCAEHACCADNgIAQdwIQgA3AgBBqAhCADcDAEGwCEIANwMAQbgIQgA3AwBBzAggAkGAICACQYAgSRs2AgBBoAggAa1CgYCAgBB+NwMAQdAIQQA2AgALIwBB0AgoAgBFBEAgACABQcgIKAIAQQJ0QYAIaigCABEBAAsLWgECfwJAAkACQEHICCgCAEEBaw4CAAECC0HYCEHoCCgCACIAQdgIKAIAIgEgACABShsiAEGAgAEgAEGAgAFIGyIANgIAIABBBGsPC0GoCCgCAEEEayEACyAAC0IBAX8Cf0EGQdwIKAIAIgBBIHENABpBBSAAQRBxDQAaQQQgAEEIcQ0AGkEDIABBBHENABpBAiAAQQFxIABBAnEbCwu9BQEFfQJ/IAJFBEAgAUH/AWxBMmpB5ABtIgBBCHQgAHIgAEEQdHIMAQsgArJDAADIQpUhBiAAQfABarJDAAC0Q5UhBQJ9IAGyQwAAyEKVIgNDAAAAP10EQCADIAZDAACAP5KUDAELIAYgA0MAAIA/IAaTlJILIQcgAyADkiEGAkAgBUOrqqo+kiIEQwAAAABdBEAgBEMAAIA/kiEEDAELIARDAACAP15FDQAgBEMAAIC/kiEECyAGIAeTIQMgBUMAAAAAXSEAAn8CfSADIAcgA5NDAADAQJQgBJSSIARDq6oqPl0NABogByAEQwAAAD9dDQAaIAMgBEOrqio/XUUNABogAyAHIAOTIARDAADAwJRDAACAQJKUkgtDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALIQECQCAABEAgBUMAAIA/kiEEDAELIAUiBEMAAIA/XkUNACAFQwAAgL+SIQQLIAVDq6qqvpIiBUMAAAAAXSECAn8CfSADIAcgA5NDAADAQJQgBJSSIARDq6oqPl0NABogByAEQwAAAD9dDQAaIAMgBEOrqio/XUUNABogAyAHIAOTIARDAADAwJRDAACAQJKUkgtDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALIQACQCACBEAgBUMAAIA/kiEFDAELIAVDAACAP15FDQAgBUMAAIC/kiEFCwJAIAVDq6oqPl0EQCADIAcgA5NDAADAQJQgBZSSIQcMAQsgBUMAAAA/XQ0AIAVDq6oqP11FBEAgAyEHDAELIAMgByADkyAFQwAAwMCUQwAAgECSlJIhBwsgAEEIdAJ/IAdDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALQRB0ciABcgtBgICAeHILNwAgAEH/AWxBMmpB5ABtIAFB/wFsQTJqQeQAbUEIdHIgAkH/AWxBMmpB5ABtQRB0ckGAgIB4cgsEACMACwYAIAAkAAsQACMAIABrQXBxIgAkACAACwsYAQBBgAgLEQEAAAACAAAAAwAAAAQAAAAF" };\n  });\n  var We = L((y5) => {\n    "use strict";\n    Object.defineProperty(y5, "__esModule", { value: true });\n    y5.decodeAsync = y5.decode = y5.Decoder = y5.DecoderAsync = void 0;\n    var K4 = X(), Q3 = Pe();\n    function Lt3(s4) {\n      if (typeof Buffer < "u") return Buffer.from(s4, "base64");\n      let e = atob(s4), t = new Uint8Array(e.length);\n      for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n      return t;\n    }\n    var Ye3 = Lt3(Q3.LIMITS.BYTES), P5, se3 = new Uint32Array(), ye3 = class {\n      constructor() {\n        this.bandHandler = (e) => 1, this.modeHandler = (e) => 1;\n      }\n      handle_band(e) {\n        return this.bandHandler(e);\n      }\n      mode_parsed(e) {\n        return this.modeHandler(e);\n      }\n    }, Mt2 = { memoryLimit: 2048 * 65536, sixelColor: K4.DEFAULT_FOREGROUND, fillColor: K4.DEFAULT_BACKGROUND, palette: K4.PALETTE_VT340_COLOR, paletteLimit: Q3.LIMITS.PALETTE_SIZE, truncate: true };\n    function qe2(s4) {\n      let e = new ye3(), t = { env: { handle_band: e.handle_band.bind(e), mode_parsed: e.mode_parsed.bind(e) } };\n      return WebAssembly.instantiate(P5 || Ye3, t).then((i5) => (P5 = P5 || i5.module, new Y2(s4, i5.instance || i5, e)));\n    }\n    y5.DecoderAsync = qe2;\n    var Y2 = class {\n      constructor(e, t, i5) {\n        if (this._PIXEL_OFFSET = Q3.LIMITS.MAX_WIDTH + 4, this._canvas = se3, this._bandWidths = [], this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._lastOffset = 0, this._currentHeight = 0, this._opts = Object.assign({}, Mt2, e), this._opts.paletteLimit > Q3.LIMITS.PALETTE_SIZE) throw new Error(`DecoderOptions.paletteLimit must not exceed ${Q3.LIMITS.PALETTE_SIZE}`);\n        if (t) i5.bandHandler = this._handle_band.bind(this), i5.modeHandler = this._initCanvas.bind(this);\n        else {\n          let A4 = P5 || (P5 = new WebAssembly.Module(Ye3));\n          t = new WebAssembly.Instance(A4, { env: { handle_band: this._handle_band.bind(this), mode_parsed: this._initCanvas.bind(this) } });\n        }\n        this._instance = t, this._wasm = this._instance.exports, this._chunk = new Uint8Array(this._wasm.memory.buffer, this._wasm.get_chunk_address(), Q3.LIMITS.CHUNK_SIZE), this._states = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_state_address(), 12), this._palette = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_palette_address(), Q3.LIMITS.PALETTE_SIZE), this._palette.set(this._opts.palette), this._pSrc = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_p0_address()), this._wasm.init(K4.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n      }\n      get _fillColor() {\n        return this._states[0];\n      }\n      get _truncate() {\n        return this._states[8];\n      }\n      get _rasterWidth() {\n        return this._states[6];\n      }\n      get _rasterHeight() {\n        return this._states[7];\n      }\n      get _width() {\n        return this._states[2] ? this._states[2] - 4 : 0;\n      }\n      get _height() {\n        return this._states[3];\n      }\n      get _level() {\n        return this._states[9];\n      }\n      get _mode() {\n        return this._states[10];\n      }\n      get _paletteLimit() {\n        return this._states[11];\n      }\n      _initCanvas(e) {\n        if (e === 2) {\n          let t = this.width * this.height;\n          if (t > this._canvas.length) {\n            if (this._opts.memoryLimit && t * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n            this._canvas = new Uint32Array(t);\n          }\n          this._maxWidth = this._width;\n        } else if (e === 1) if (this._level === 2) {\n          let t = Math.min(this._rasterWidth, Q3.LIMITS.MAX_WIDTH) * this._rasterHeight;\n          if (t > this._canvas.length) {\n            if (this._opts.memoryLimit && t * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n            this._canvas = new Uint32Array(t);\n          }\n        } else this._canvas.length < 65536 && (this._canvas = new Uint32Array(65536));\n        return 0;\n      }\n      _realloc(e, t) {\n        let i5 = e + t;\n        if (i5 > this._canvas.length) {\n          if (this._opts.memoryLimit && i5 * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n          let A4 = new Uint32Array(Math.ceil(i5 / 65536) * 65536);\n          A4.set(this._canvas), this._canvas = A4;\n        }\n      }\n      _handle_band(e) {\n        let t = this._PIXEL_OFFSET, i5 = this._lastOffset;\n        if (this._mode === 2) {\n          let A4 = this.height - this._currentHeight, r = 0;\n          for (; r < 6 && A4 > 0; ) this._canvas.set(this._pSrc.subarray(t * r, t * r + e), i5 + e * r), r++, A4--;\n          this._lastOffset += e * r, this._currentHeight += r;\n        } else if (this._mode === 1) {\n          this._realloc(i5, e * 6), this._maxWidth = Math.max(this._maxWidth, e), this._minWidth = Math.min(this._minWidth, e);\n          for (let A4 = 0; A4 < 6; ++A4) this._canvas.set(this._pSrc.subarray(t * A4, t * A4 + e), i5 + e * A4);\n          this._bandWidths.push(e), this._lastOffset += e * 6, this._currentHeight += 6;\n        }\n        return 0;\n      }\n      get width() {\n        return this._mode !== 1 ? this._width : Math.max(this._maxWidth, this._wasm.current_width());\n      }\n      get height() {\n        return this._mode !== 1 ? this._height : this._wasm.current_width() ? this._bandWidths.length * 6 + this._wasm.current_height() : this._bandWidths.length * 6;\n      }\n      get palette() {\n        return this._palette.subarray(0, this._paletteLimit);\n      }\n      get memoryUsage() {\n        return this._canvas.byteLength + this._wasm.memory.buffer.byteLength + 8 * this._bandWidths.length;\n      }\n      get properties() {\n        return { width: this.width, height: this.height, mode: this._mode, level: this._level, truncate: !!this._truncate, paletteLimit: this._paletteLimit, fillColor: this._fillColor, memUsage: this.memoryUsage, rasterAttributes: { numerator: this._states[4], denominator: this._states[5], width: this._rasterWidth, height: this._rasterHeight } };\n      }\n      init(e = this._opts.fillColor, t = this._opts.palette, i5 = this._opts.paletteLimit, A4 = this._opts.truncate) {\n        this._wasm.init(this._opts.sixelColor, e, i5, A4 ? 1 : 0), t && this._palette.set(t.subarray(0, Q3.LIMITS.PALETTE_SIZE)), this._bandWidths.length = 0, this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._lastOffset = 0, this._currentHeight = 0;\n      }\n      decode(e, t = 0, i5 = e.length) {\n        let A4 = t;\n        for (; A4 < i5; ) {\n          let r = Math.min(i5 - A4, Q3.LIMITS.CHUNK_SIZE);\n          this._chunk.set(e.subarray(A4, A4 += r)), this._wasm.decode(0, r);\n        }\n      }\n      decodeString(e, t = 0, i5 = e.length) {\n        let A4 = t;\n        for (; A4 < i5; ) {\n          let r = Math.min(i5 - A4, Q3.LIMITS.CHUNK_SIZE);\n          for (let n11 = 0, a2 = A4; n11 < r; ++n11, ++a2) this._chunk[n11] = e.charCodeAt(a2);\n          A4 += r, this._wasm.decode(0, r);\n        }\n      }\n      get data32() {\n        if (this._mode === 0 || !this.width || !this.height) return se3;\n        let e = this._wasm.current_width();\n        if (this._mode === 2) {\n          let t = this.height - this._currentHeight;\n          if (t > 0) {\n            let i5 = this._PIXEL_OFFSET, A4 = this._lastOffset, r = 0;\n            for (; r < 6 && t > 0; ) this._canvas.set(this._pSrc.subarray(i5 * r, i5 * r + e), A4 + e * r), r++, t--;\n            t && this._canvas.fill(this._fillColor, A4 + e * r);\n          }\n          return this._canvas.subarray(0, this.width * this.height);\n        }\n        if (this._mode === 1) {\n          if (this._minWidth === this._maxWidth) {\n            let r = false;\n            if (e) if (e !== this._minWidth) r = true;\n            else {\n              let n11 = this._PIXEL_OFFSET, a2 = this._lastOffset;\n              this._realloc(a2, e * 6);\n              for (let o2 = 0; o2 < 6; ++o2) this._canvas.set(this._pSrc.subarray(n11 * o2, n11 * o2 + e), a2 + e * o2);\n            }\n            if (!r) return this._canvas.subarray(0, this.width * this.height);\n          }\n          let t = new Uint32Array(this.width * this.height);\n          t.fill(this._fillColor);\n          let i5 = 0, A4 = 0;\n          for (let r = 0; r < this._bandWidths.length; ++r) {\n            let n11 = this._bandWidths[r];\n            for (let a2 = 0; a2 < 6; ++a2) t.set(this._canvas.subarray(A4, A4 += n11), i5), i5 += this.width;\n          }\n          if (e) {\n            let r = this._PIXEL_OFFSET, n11 = this._wasm.current_height();\n            for (let a2 = 0; a2 < n11; ++a2) t.set(this._pSrc.subarray(r * a2, r * a2 + e), i5 + this.width * a2);\n          }\n          return t;\n        }\n        return se3;\n      }\n      get data8() {\n        return new Uint8ClampedArray(this.data32.buffer, 0, this.width * this.height * 4);\n      }\n      release() {\n        this._canvas = se3, this._bandWidths.length = 0, this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._wasm.init(K4.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n      }\n    };\n    y5.Decoder = Y2;\n    function Rt3(s4, e) {\n      let t = new Y2(e);\n      return t.init(), typeof s4 == "string" ? t.decodeString(s4) : t.decode(s4), { width: t.width, height: t.height, data32: t.data32, data8: t.data8 };\n    }\n    y5.decode = Rt3;\n    async function kt2(s4, e) {\n      let t = await qe2(e);\n      return t.init(), typeof s4 == "string" ? t.decodeString(s4) : t.decode(s4), { width: t.width, height: t.height, data32: t.data32, data8: t.data8 };\n    }\n    y5.decodeAsync = kt2;\n  });\n  function G2(s4) {\n    return { dispose: s4 };\n  }\n  var F2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(e) {\n      return this._isDisposed ? e.dispose() : this._disposables.add(e), e;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let e of this._disposables) e.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.clear();\n    }\n  };\n  var H2 = class {\n    constructor() {\n      this._store = new F2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(e) {\n      return this._store.add(e);\n    }\n  };\n  H2.None = Object.freeze({ dispose() {\n  } });\n  var W = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(e) {\n      this._isDisposed || e === this._value || (this._value?.dispose(), this._value = e);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var z2 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (e, t, i5) => {\n        if (this._disposed) return G2(() => {\n        });\n        let A4 = { fn: e, thisArgs: t };\n        this._listeners.push(A4);\n        let r = G2(() => {\n          let n11 = this._listeners.indexOf(A4);\n          n11 !== -1 && this._listeners.splice(n11, 1);\n        });\n        return i5 && (Array.isArray(i5) ? i5.push(r) : i5.add(r)), r;\n      }, this._event);\n    }\n    fire(e) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: t, thisArgs: i5 } = this._listeners[0];\n          t.call(i5, e);\n          return;\n        }\n        default: {\n          let t = this._listeners.slice();\n          for (let { fn: i5, thisArgs: A4 } of t) i5.call(A4, e);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var ot;\n  ((A4) => {\n    function s4(r, n11) {\n      return r((a2) => n11.fire(a2));\n    }\n    A4.forward = s4;\n    function e(r, n11) {\n      return (a2, o2, h3) => r((g6) => a2.call(o2, n11(g6)), void 0, h3);\n    }\n    A4.map = e;\n    function t(...r) {\n      return (n11, a2, o2) => {\n        let h3 = new F2();\n        for (let g6 of r) h3.add(g6((d3) => n11.call(a2, d3)));\n        return o2 && (Array.isArray(o2) ? o2.push(h3) : o2.add(h3)), h3;\n      };\n    }\n    A4.any = t;\n    function i5(r, n11, a2) {\n      return n11(a2), r((o2) => n11(o2));\n    }\n    A4.runAndSubscribe = i5;\n  })(ot ||= {});\n  var me = M2(X());\n  var ct = 4096;\n  var ce = 24;\n  var D2 = class s extends H2 {\n    constructor(t) {\n      super();\n      this._terminal = t;\n      this._layers = /* @__PURE__ */ new Map();\n      this._optionsRefresh = this._register(new W());\n      this._oldOpen = this._terminal._core.open, this._terminal._core.open = (i5) => {\n        this._oldOpen?.call(this._terminal._core, i5), this._open();\n      }, this._terminal._core.screenElement && this._open(), this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange((i5) => {\n        i5 === "fontSize" && (this.rescaleCanvas(), this._renderService?.refreshRows(0, this._terminal.rows));\n      }), this._register(G2(() => {\n        this.removeLayerFromDom(), this.removeLayerFromDom("bottom"), this._terminal._core && this._oldOpen && (this._terminal._core.open = this._oldOpen, this._oldOpen = void 0), this._renderService && this._oldSetRenderer && (this._renderService.setRenderer = this._oldSetRenderer, this._oldSetRenderer = void 0), this._renderService = void 0, this._layers.clear(), this._placeholderBitmap?.close(), this._placeholderBitmap = void 0, this._placeholder = void 0;\n      }));\n    }\n    get canvas() {\n      return this._layers.get("top")?.canvas;\n    }\n    static createCanvas(t, i5, A4) {\n      let r = (t ?? document).createElement("canvas");\n      return r.width = i5 | 0, r.height = A4 | 0, r;\n    }\n    static createImageData(t, i5, A4, r) {\n      if (typeof ImageData != "function") {\n        let n11 = t.createImageData(i5, A4);\n        return r && n11.data.set(new Uint8ClampedArray(r, 0, i5 * A4 * 4)), n11;\n      }\n      return r ? new ImageData(new Uint8ClampedArray(r, 0, i5 * A4 * 4), i5, A4) : new ImageData(i5, A4);\n    }\n    static createImageBitmap(t) {\n      return typeof createImageBitmap != "function" ? Promise.resolve(void 0) : createImageBitmap(t);\n    }\n    showPlaceholder(t) {\n      t ? !this._placeholder && this.cellSize.height !== -1 && this._createPlaceHolder(Math.max(this.cellSize.height + 1, ce)) : (this._placeholderBitmap?.close(), this._placeholderBitmap = void 0, this._placeholder = void 0), this._renderService?.refreshRows(0, this._terminal.rows);\n    }\n    get dimensions() {\n      return this._terminal.dimensions;\n    }\n    get cellSize() {\n      return { width: this.dimensions?.css.cell.width || -1, height: this.dimensions?.css.cell.height || -1 };\n    }\n    clearLines(t, i5, A4) {\n      let r = t * (this.dimensions?.css.cell.height || 0), n11 = this.dimensions?.css.canvas.width || 0, a2 = (++i5 - t) * (this.dimensions?.css.cell.height || 0);\n      (!A4 || A4 === "top") && this._layers.get("top")?.clearRect(0, r, n11, a2), (!A4 || A4 === "bottom") && this._layers.get("bottom")?.clearRect(0, r, n11, a2);\n    }\n    clearAll(t) {\n      if (!t || t === "top") {\n        let i5 = this._layers.get("top");\n        i5?.clearRect(0, 0, i5.canvas.width, i5.canvas.height);\n      }\n      if (!t || t === "bottom") {\n        let i5 = this._layers.get("bottom");\n        i5?.clearRect(0, 0, i5.canvas.width, i5.canvas.height);\n      }\n    }\n    draw(t, i5, A4, r, n11 = 1) {\n      let a2 = this._layers.get(t.layer);\n      if (!a2) return;\n      let { width: o2, height: h3 } = this.cellSize;\n      if (o2 === -1 || h3 === -1) return;\n      this._rescaleImage(t, o2, h3);\n      let g6 = t.actual, d3 = Math.ceil(g6.width / o2), I4 = i5 % d3 * o2, _5 = Math.floor(i5 / d3) * h3, l4 = A4 * o2, u3 = r * h3, C4 = n11 * o2 + I4 > g6.width ? g6.width - I4 : n11 * o2, p3 = _5 + h3 > g6.height ? g6.height - _5 : h3;\n      a2.drawImage(g6, Math.floor(I4), Math.floor(_5), Math.ceil(C4), Math.ceil(p3), Math.floor(l4), Math.floor(u3), Math.ceil(C4), Math.ceil(p3));\n    }\n    extractTile(t, i5) {\n      let { width: A4, height: r } = this.cellSize;\n      if (A4 === -1 || r === -1) return;\n      this._rescaleImage(t, A4, r);\n      let n11 = t.actual, a2 = Math.ceil(n11.width / A4), o2 = i5 % a2 * A4, h3 = Math.floor(i5 / a2) * r, g6 = A4 + o2 > n11.width ? n11.width - o2 : A4, d3 = h3 + r > n11.height ? n11.height - h3 : r, I4 = s.createCanvas(this.document, g6, d3), _5 = I4.getContext("2d");\n      if (_5) return _5.drawImage(n11, Math.floor(o2), Math.floor(h3), Math.floor(g6), Math.floor(d3), 0, 0, Math.floor(g6), Math.floor(d3)), I4;\n    }\n    drawPlaceholder(t, i5, A4 = 1) {\n      let r = this._layers.get("top");\n      if (r) {\n        let { width: n11, height: a2 } = this.cellSize;\n        if (n11 === -1 || a2 === -1 || (this._placeholder ? a2 >= this._placeholder.height && this._createPlaceHolder(a2 + 1) : this._createPlaceHolder(Math.max(a2 + 1, ce)), !this._placeholder)) return;\n        r.drawImage(this._placeholderBitmap ?? this._placeholder, t * n11, i5 * a2 % 2 ? 0 : 1, n11 * A4, a2, t * n11, i5 * a2, n11 * A4, a2);\n      }\n    }\n    rescaleCanvas() {\n      let t = this.dimensions?.css.canvas.width || 0, i5 = this.dimensions?.css.canvas.height || 0;\n      for (let A4 of this._layers.values()) (A4.canvas.width !== t || A4.canvas.height !== i5) && (A4.canvas.width = t, A4.canvas.height = i5);\n    }\n    _rescaleImage(t, i5, A4) {\n      if (i5 === t.actualCellSize.width && A4 === t.actualCellSize.height) return;\n      let { width: r, height: n11 } = t.origCellSize;\n      if (i5 === r && A4 === n11) {\n        t.actual = t.orig, t.actualCellSize.width = r, t.actualCellSize.height = n11;\n        return;\n      }\n      let a2 = s.createCanvas(this.document, Math.ceil(t.orig.width * i5 / r), Math.ceil(t.orig.height * A4 / n11)), o2 = a2.getContext("2d");\n      o2 && (o2.drawImage(t.orig, 0, 0, a2.width, a2.height), t.actual = a2, t.actualCellSize.width = i5, t.actualCellSize.height = A4);\n    }\n    _open() {\n      this._renderService = this._terminal._core._renderService, this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService), this._renderService.setRenderer = (t) => {\n        for (let i5 of [...this._layers.keys()]) this.removeLayerFromDom(i5);\n        this._oldSetRenderer?.call(this._renderService, t);\n      };\n    }\n    insertLayerToDom(t = "top") {\n      if (!this.document || !this._terminal._core.screenElement) {\n        console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");\n        return;\n      }\n      if (this._layers.has(t)) return;\n      let i5 = s.createCanvas(this.document, this.dimensions?.css.canvas.width || 0, this.dimensions?.css.canvas.height || 0);\n      i5.classList.add(`xterm-image-layer-${t}`);\n      let A4 = this._terminal._core.screenElement;\n      A4.style.isolation = "isolate", t === "bottom" ? (i5.style.zIndex = "-1", A4.insertBefore(i5, A4.firstChild)) : (i5.style.zIndex = "0", A4.appendChild(i5));\n      let r = i5.getContext("2d", { alpha: true });\n      if (!r) {\n        i5.remove();\n        return;\n      }\n      this._layers.set(t, r), this.clearAll(t);\n    }\n    removeLayerFromDom(t = "top") {\n      let i5 = this._layers.get(t);\n      i5 && (i5.canvas.remove(), this._layers.delete(t));\n    }\n    hasLayer(t) {\n      return this._layers.has(t);\n    }\n    _createPlaceHolder(t = ce) {\n      this._placeholderBitmap?.close(), this._placeholderBitmap = void 0;\n      let i5 = 32, A4 = s.createCanvas(this.document, i5, t), r = A4.getContext("2d", { alpha: false });\n      if (!r) return;\n      let n11 = s.createImageData(r, i5, t), a2 = new Uint32Array(n11.data.buffer), o2 = (0, me.toRGBA8888)(0, 0, 0), h3 = (0, me.toRGBA8888)(255, 255, 255);\n      a2.fill(o2);\n      for (let I4 = 0; I4 < t; ++I4) {\n        let _5 = I4 % 2, l4 = I4 * i5;\n        for (let u3 = 0; u3 < i5; u3 += 2) a2[l4 + u3 + _5] = h3;\n      }\n      r.putImageData(n11, 0, 0);\n      let g6 = screen.width + i5 - 1 & ~(i5 - 1) || ct;\n      this._placeholder = s.createCanvas(this.document, g6, t);\n      let d3 = this._placeholder.getContext("2d", { alpha: false });\n      if (!d3) {\n        this._placeholder = void 0;\n        return;\n      }\n      for (let I4 = 0; I4 < g6; I4 += i5) d3.drawImage(A4, I4, 0);\n      s.createImageBitmap(this._placeholder).then((I4) => this._placeholderBitmap = I4);\n    }\n    get document() {\n      return this._terminal._core._coreBrowserService?.window.document;\n    }\n  };\n  var w2 = { width: 7, height: 14 };\n  var U2 = class s2 {\n    constructor(e = 0, t = 0, i5 = -1, A4 = -1) {\n      this.imageId = i5;\n      this.tileId = A4;\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = e, this._urlId = t;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(e) {\n      this._ext = e;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(e) {\n      this._ext &= -469762049, this._ext |= e << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(e) {\n      this._ext &= -67108864, this._ext |= e & 67108863;\n    }\n    get underlineVariantOffset() {\n      let e = (this._ext & 3758096384) >> 29;\n      return e < 0 ? e ^ 4294967288 : e;\n    }\n    set underlineVariantOffset(e) {\n      this._ext &= 536870911, this._ext |= e << 29 & 3758096384;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(e) {\n      this._urlId = e;\n    }\n    clone() {\n      return new s2(this._ext, this._urlId, this.imageId, this.tileId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0 && this.imageId === -1;\n    }\n  };\n  var Z2 = new U2();\n  var j2 = class {\n    constructor(e, t, i5) {\n      this._terminal = e;\n      this._renderer = t;\n      this._opts = i5;\n      this._images = /* @__PURE__ */ new Map();\n      this._lastId = 0;\n      this._lowestId = 0;\n      this._fullyCleared = false;\n      this._needsFullClear = false;\n      this._pixelLimit = 25e5;\n      try {\n        this.setLimit(this._opts.storageLimit);\n      } catch (A4) {\n        A4 instanceof Error && console.error(A4.message), console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n      }\n      this._viewportMetrics = { cols: this._terminal.cols, rows: this._terminal.rows };\n    }\n    dispose() {\n      this.reset();\n    }\n    reset() {\n      for (let e of this._images.values()) e.marker?.dispose();\n      this._images.clear(), this._renderer.clearAll();\n    }\n    getLimit() {\n      return this._pixelLimit * 4 / 1e6;\n    }\n    setLimit(e) {\n      if (e < 0.5 || e > 1e3) throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");\n      this._pixelLimit = e / 4 * 1e6 >>> 0, this._evictOldest(0);\n    }\n    getUsage() {\n      return this._getStoredPixels() * 4 / 1e6;\n    }\n    _getStoredPixels() {\n      let e = 0;\n      for (let t of this._images.values()) t.orig && (e += t.orig.width * t.orig.height, t.actual && t.actual !== t.orig && (e += t.actual.width * t.actual.height));\n      return e;\n    }\n    _delImg(e) {\n      let t = this._images.get(e);\n      t && (this._images.delete(e), window.ImageBitmap && t.orig instanceof ImageBitmap && t.orig.close(), this.onImageDeleted?.(e));\n    }\n    wipeAlternate() {\n      let e = [];\n      for (let [t, i5] of this._images.entries()) i5.bufferType === "alternate" && (i5.marker?.dispose(), e.push(t));\n      for (let t of e) this._delImg(t);\n      this._needsFullClear = true, this._fullyCleared = false;\n    }\n    deleteImage(e) {\n      let t = this._images.get(e);\n      t && (t.marker?.dispose(), this._delImg(e));\n    }\n    addImage(e, t, i5 = "top", A4 = 0) {\n      this._evictOldest(e.width * e.height);\n      let r = this._renderer.cellSize;\n      (r.width === -1 || r.height === -1) && (r = w2);\n      let n11 = Math.ceil(e.width / r.width), a2 = Math.ceil(e.height / r.height), o2 = ++this._lastId, h3 = this._terminal._core.buffer, g6 = this._terminal.cols, d3 = this._terminal.rows, I4 = h3.x, _5 = h3.y, l4 = I4, u3 = 0;\n      t || (h3.x = 0, h3.y = 0, l4 = 0), this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h3.y);\n      for (let f5 = 0; f5 < a2; ++f5) {\n        let S4 = h3.lines.get(h3.y + h3.ybase);\n        for (let b4 = 0; b4 < n11 && !(l4 + b4 >= g6); ++b4) this._writeToCell(S4, l4 + b4, o2, f5 * n11 + b4), u3++;\n        if (t) f5 < a2 - 1 && this._terminal._core._inputHandler.lineFeed();\n        else if (++h3.y >= d3) break;\n        h3.x = l4;\n      }\n      this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h3.y), t ? h3.x = l4 : (h3.x = I4, h3.y = _5);\n      let C4 = [];\n      for (let [f5, S4] of this._images.entries()) S4.tileCount < 1 && (S4.marker?.dispose(), C4.push(f5));\n      for (let f5 of C4) this._delImg(f5);\n      let p3 = this._terminal.registerMarker(0);\n      p3?.onDispose(() => {\n        this._images.get(o2) && this._delImg(o2);\n      }), this._terminal.buffer.active.type === "alternate" && this._evictOnAlternate();\n      let E5 = { orig: e, origCellSize: r, actual: e, actualCellSize: { ...r }, marker: p3 || void 0, tileCount: u3, bufferType: this._terminal.buffer.active.type, layer: i5, zIndex: A4 };\n      return this._images.set(o2, E5), this.onImageAdded?.(), o2;\n    }\n    render(e) {\n      let t = false, i5 = false;\n      for (let g6 of this._images.values()) if (g6.layer === "bottom" ? i5 = true : t = true, t && i5) break;\n      if (t && !this._renderer.hasLayer("top") && (this._renderer.insertLayerToDom("top"), !this._renderer.hasLayer("top"))) return;\n      if (i5 && !this._renderer.hasLayer("bottom") && this._renderer.insertLayerToDom("bottom"), this._renderer.rescaleCanvas(), !this._images.size) {\n        this._fullyCleared || (this._renderer.clearAll(), this._fullyCleared = true, this._needsFullClear = false), this._renderer.hasLayer("top") && this._renderer.removeLayerFromDom("top"), this._renderer.hasLayer("bottom") && this._renderer.removeLayerFromDom("bottom");\n        return;\n      }\n      !t && this._renderer.hasLayer("top") && (this._renderer.clearAll("top"), this._renderer.removeLayerFromDom("top")), !i5 && this._renderer.hasLayer("bottom") && (this._renderer.clearAll("bottom"), this._renderer.removeLayerFromDom("bottom")), this._needsFullClear && (this._renderer.clearAll(), this._fullyCleared = true, this._needsFullClear = false);\n      let { start: A4, end: r } = e, n11 = this._terminal._core.buffer, a2 = this._terminal._core.cols;\n      this._renderer.clearLines(A4, r);\n      let o2 = [], h3 = [];\n      for (let g6 = A4; g6 <= r; ++g6) {\n        let d3 = n11.lines.get(g6 + n11.ydisp);\n        if (!d3) return;\n        for (let I4 = 0; I4 < a2; ++I4) {\n          let _5;\n          if (d3.getBg(I4) & 268435456) _5 = d3._extendedAttrs[I4] ?? Z2;\n          else {\n            let C4 = d3._extendedAttrs[I4];\n            if (!C4 || C4.imageId === void 0 || C4.imageId === -1) continue;\n            _5 = C4;\n          }\n          let l4 = _5.imageId;\n          if (l4 === void 0 || l4 === -1) continue;\n          let u3 = this._images.get(l4);\n          if (_5.tileId !== -1) {\n            let C4 = _5.tileId, p3 = I4, E5 = 1;\n            for (; ++I4 < a2; ) {\n              let f5 = d3._extendedAttrs[I4];\n              if (!f5 || f5.imageId !== l4 || f5.tileId !== C4 + E5) break;\n              _5 = f5, E5++;\n            }\n            I4--, u3 ? u3.actual && o2.push({ imgSpec: u3, tileId: C4, col: p3, row: g6, count: E5 }) : this._opts.showPlaceholder && h3.push({ col: p3, row: g6, count: E5 }), this._fullyCleared = false;\n          }\n        }\n      }\n      o2.sort((g6, d3) => g6.imgSpec.zIndex - d3.imgSpec.zIndex);\n      for (let g6 of h3) this._renderer.drawPlaceholder(g6.col, g6.row, g6.count);\n      for (let g6 of o2) this._renderer.draw(g6.imgSpec, g6.tileId, g6.col, g6.row, g6.count);\n    }\n    viewportResize(e) {\n      if (!this._images.size) {\n        this._viewportMetrics = e;\n        return;\n      }\n      if (this._viewportMetrics.cols >= e.cols) {\n        this._viewportMetrics = e;\n        return;\n      }\n      let t = this._terminal._core.buffer, i5 = t.lines.length, A4 = this._viewportMetrics.cols - 1;\n      for (let r = 0; r < i5; ++r) {\n        let n11 = t.lines.get(r);\n        if (n11.getBg(A4) & 268435456) {\n          let a2 = n11._extendedAttrs[A4] ?? Z2, o2 = a2.imageId;\n          if (o2 === void 0 || o2 === -1) continue;\n          let h3 = this._images.get(o2);\n          if (!h3) continue;\n          let g6 = Math.ceil((h3.actual?.width || 0) / h3.actualCellSize.width);\n          if (a2.tileId % g6 + 1 >= g6) continue;\n          let d3 = false;\n          for (let l4 = A4 + 1; l4 > e.cols; ++l4) if (n11._data[l4 * 3 + 0] & 4194303) {\n            d3 = true;\n            break;\n          }\n          if (d3) continue;\n          let I4 = Math.min(e.cols, g6 - a2.tileId % g6 + A4), _5 = a2.tileId;\n          for (let l4 = A4 + 1; l4 < I4; ++l4) this._writeToCell(n11, l4, o2, ++_5), h3.tileCount++;\n        }\n      }\n      this._viewportMetrics = e;\n    }\n    getImageAtBufferCell(e, t) {\n      let A4 = this._terminal._core.buffer.lines.get(t);\n      if (A4 && A4.getBg(e) & 268435456) {\n        let r = A4._extendedAttrs[e] ?? Z2;\n        if (r.imageId && r.imageId !== -1) {\n          let n11 = this._images.get(r.imageId)?.orig;\n          if (window.ImageBitmap && n11 instanceof ImageBitmap) {\n            let a2 = D2.createCanvas(window.document, n11.width, n11.height);\n            return a2.getContext("2d")?.drawImage(n11, 0, 0, n11.width, n11.height), a2;\n          }\n          return n11;\n        }\n      }\n    }\n    extractTileAtBufferCell(e, t) {\n      let A4 = this._terminal._core.buffer.lines.get(t);\n      if (A4 && A4.getBg(e) & 268435456) {\n        let r = A4._extendedAttrs[e] ?? Z2;\n        if (r.imageId && r.imageId !== -1 && r.tileId !== -1) {\n          let n11 = this._images.get(r.imageId);\n          if (n11) return this._renderer.extractTile(n11, r.tileId);\n        }\n      }\n    }\n    _evictOldest(e) {\n      let t = this._getStoredPixels(), i5 = t;\n      for (; this._pixelLimit < i5 + e && this._images.size; ) {\n        let A4 = this._images.get(++this._lowestId);\n        A4 && A4.orig && (i5 -= A4.orig.width * A4.orig.height, A4.actual && A4.orig !== A4.actual && (i5 -= A4.actual.width * A4.actual.height), A4.marker?.dispose(), this._delImg(this._lowestId));\n      }\n      return t - i5;\n    }\n    _writeToCell(e, t, i5, A4) {\n      if (e._data[t * 3 + 2] & 268435456) {\n        let r = e._extendedAttrs[t];\n        if (r) {\n          if (r.imageId !== void 0) {\n            let n11 = this._images.get(r.imageId);\n            n11 && n11.tileCount--, r.imageId = i5, r.tileId = A4;\n            return;\n          }\n          e._extendedAttrs[t] = new U2(r.ext, r.urlId, i5, A4);\n          return;\n        }\n      }\n      e._data[t * 3 + 2] |= 268435456, e._extendedAttrs[t] = new U2(0, 0, i5, A4);\n    }\n    _evictOnAlternate() {\n      for (let i5 of this._images.values()) i5.bufferType === "alternate" && (i5.tileCount = 0);\n      let e = this._terminal._core.buffer;\n      for (let i5 = 0; i5 < this._terminal.rows; ++i5) {\n        let A4 = e.lines.get(i5);\n        if (A4) {\n          for (let r = 0; r < this._terminal.cols; ++r) if (A4._data[r * 3 + 2] & 268435456) {\n            let n11 = A4._extendedAttrs[r]?.imageId;\n            if (n11) {\n              let a2 = this._images.get(n11);\n              a2 && a2.tileCount++;\n            }\n          }\n        }\n      }\n      let t = [];\n      for (let [i5, A4] of this._images.entries()) A4.bufferType === "alternate" && !A4.tileCount && (A4.marker?.dispose(), t.push(i5));\n      for (let i5 of t) this._delImg(i5);\n    }\n  };\n  var Ge = M2(Be());\n  var Ue = M2(Re());\n  function V2(s4) {\n    let e = "";\n    for (let t = 0; t < s4.length; ++t) e += String.fromCharCode(s4[t]);\n    return e;\n  }\n  function Qe(s4) {\n    let e = 0;\n    for (let t = 0; t < s4.length; ++t) {\n      if (s4[t] < 48 || s4[t] > 57) throw new Error("illegal char");\n      e = e * 10 + s4[t] - 48;\n    }\n    return e;\n  }\n  function ke(s4) {\n    let e = V2(s4);\n    if (!e.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) throw new Error("illegal size");\n    return e;\n  }\n  function bt(s4) {\n    if (typeof Buffer < "u") return Buffer.from(V2(s4), "base64").toString();\n    let e = atob(V2(s4)), t = new Uint8Array(e.length);\n    for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n    return new TextDecoder().decode(t);\n  }\n  var Ne = { inline: Qe, size: Qe, name: bt, width: ke, height: ke, preserveAspectRatio: Qe };\n  var He = [70, 105, 108, 101];\n  var De = 1024;\n  var $2 = class {\n    constructor() {\n      this.state = 0;\n      this._buffer = new Uint32Array(De);\n      this._position = 0;\n      this._key = "";\n      this.fields = {};\n    }\n    reset() {\n      this._buffer.fill(0), this.state = 0, this._position = 0, this.fields = {}, this._key = "";\n    }\n    parse(e, t, i5) {\n      let A4 = this.state, r = this._position, n11 = this._buffer;\n      if (A4 === 1 || A4 === 4 || A4 === 0 && r > 6) return -1;\n      for (let a2 = t; a2 < i5; ++a2) {\n        let o2 = e[a2];\n        switch (o2) {\n          case 59:\n            if (!this._storeValue(r)) return this._a();\n            A4 = 2, r = 0;\n            break;\n          case 61:\n            if (A4 === 0) {\n              for (let h3 = 0; h3 < He.length; ++h3) if (n11[h3] !== He[h3]) return this._a();\n              A4 = 2, r = 0;\n            } else if (A4 === 2) {\n              if (!this._storeKey(r)) return this._a();\n              A4 = 3, r = 0;\n            } else if (A4 === 3) {\n              if (r >= De) return this._a();\n              n11[r++] = o2;\n            }\n            break;\n          case 58:\n            return A4 === 3 && !this._storeValue(r) ? this._a() : (this.state = 4, a2 + 1);\n          default:\n            if (r >= De) return this._a();\n            n11[r++] = o2;\n        }\n      }\n      return this.state = A4, this._position = r, -2;\n    }\n    _a() {\n      return this.state = 1, -1;\n    }\n    _storeKey(e) {\n      let t = V2(this._buffer.subarray(0, e));\n      return t ? (this._key = t, this.fields[t] = null, true) : false;\n    }\n    _storeValue(e) {\n      if (this._key) {\n        try {\n          let t = this._buffer.slice(0, e);\n          this.fields[this._key] = Ne[this._key] ? Ne[this._key](t) : t;\n        } catch {\n          return false;\n        }\n        return true;\n      }\n      return false;\n    }\n  };\n  var J2 = { mime: "unsupported", width: 0, height: 0 };\n  function Fe(s4) {\n    if (s4.length < 24) return J2;\n    let e = new Uint32Array(s4.buffer, s4.byteOffset, 6);\n    if (e[0] === 1196314761 && e[1] === 169478669 && e[3] === 1380206665) return { mime: "image/png", width: s4[16] << 24 | s4[17] << 16 | s4[18] << 8 | s4[19], height: s4[20] << 24 | s4[21] << 16 | s4[22] << 8 | s4[23] };\n    if (s4[0] === 255 && s4[1] === 216 && s4[2] === 255) {\n      let [t, i5] = yt(s4);\n      return { mime: "image/jpeg", width: t, height: i5 };\n    }\n    return e[0] === 944130375 && (s4[4] === 55 || s4[4] === 57) && s4[5] === 97 ? { mime: "image/gif", width: s4[7] << 8 | s4[6], height: s4[9] << 8 | s4[8] } : e[0] === 1718185841 ? { mime: "image/qoi", width: s4[4] << 24 | s4[5] << 16 | s4[6] << 8 | s4[7], height: s4[8] << 24 | s4[9] << 16 | s4[10] << 8 | s4[11] } : J2;\n  }\n  function yt(s4) {\n    let e = s4.length, t = 4, i5 = s4[t] << 8 | s4[t + 1];\n    for (; ; ) {\n      if (t += i5, t >= e) return [0, 0];\n      if (s4[t] !== 255) return [0, 0];\n      if (s4[t + 1] === 192 || s4[t + 1] === 194) return t + 8 < e ? [s4[t + 7] << 8 | s4[t + 8], s4[t + 5] << 8 | s4[t + 6]] : [0, 0];\n      t += 2, i5 = s4[t] << 8 | s4[t + 1];\n    }\n  }\n  var we = { name: "Unnamed file", size: 0, width: "auto", height: "auto", preserveAspectRatio: 1, inline: 0 };\n  var ee = class {\n    constructor(e, t, i5, A4) {\n      this._opts = e;\n      this._renderer = t;\n      this._storage = i5;\n      this._coreTerminal = A4;\n      this._aborted = false;\n      this._hp = new $2();\n      this._header = we;\n      this._metrics = J2;\n      let r = Math.ceil(this._opts.iipSizeLimit * 4 / 3), n11 = Math.min(1048576, r);\n      this._dec = new Ge.default(4194304, r, n11), this._qoiDec = new Ue.default(4194304);\n    }\n    reset() {\n    }\n    start() {\n      this._aborted = false, this._header = we, this._metrics = J2, this._hp.reset();\n    }\n    put(e, t, i5) {\n      if (!this._aborted) if (this._hp.state === 4) this._dec.put(e.subarray(t, i5)) !== 0 && (this._dec.release(), this._aborted = true);\n      else {\n        let A4 = this._hp.parse(e, t, i5);\n        if (A4 === -1) {\n          this._aborted = true;\n          return;\n        }\n        if (A4 > 0) {\n          if (this._header = Object.assign({}, we, this._hp.fields), !this._header.inline || !this._header.size || this._header.size > this._opts.iipSizeLimit) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init(), this._dec.put(e.subarray(A4, i5)) !== 0 && (this._dec.release(), this._aborted = true);\n        }\n      }\n    }\n    end(e) {\n      if (this._aborted) return true;\n      let t = 0, i5 = 0, A4 = true;\n      if ((A4 = e) && (A4 = !this._dec.end()) && (A4 = this._dec.data8.length === this._header.size) && (this._metrics = Fe(this._dec.data8), (A4 = this._metrics.mime !== "unsupported") && (t = this._metrics.width, i5 = this._metrics.height, (A4 = t && i5 && t * i5 < this._opts.pixelLimit) && ([t, i5] = this._resize(t, i5).map(Math.floor), A4 = t && i5 && t * i5 < this._opts.pixelLimit))), !A4) return this._dec.release(), true;\n      let r;\n      if (this._metrics.mime === "image/qoi") {\n        let n11 = this._qoiDec.decode(this._dec.data8);\n        if (r = new ImageData(new Uint8ClampedArray(n11.buffer, n11.byteOffset, n11.byteLength), this._qoiDec.width, this._qoiDec.height), this._qoiDec.release(), t === this._qoiDec.width && i5 === this._qoiDec.height) {\n          this._dec.release();\n          let a2 = D2.createCanvas(void 0, this._qoiDec.width, this._qoiDec.height);\n          return a2.getContext("2d")?.putImageData(r, 0, 0), this._storage.addImage(a2), true;\n        }\n      } else r = new Blob([this._dec.data8], { type: this._metrics.mime });\n      return this._dec.release(), createImageBitmap(r, { resizeWidth: t, resizeHeight: i5 }).then((n11) => (this._storage.addImage(n11), true));\n    }\n    _resize(e, t) {\n      let i5 = this._renderer.dimensions?.css.cell.width || w2.width, A4 = this._renderer.dimensions?.css.cell.height || w2.height, r = this._renderer.dimensions?.css.canvas.width || i5 * this._coreTerminal.cols, n11 = this._renderer.dimensions?.css.canvas.height || A4 * this._coreTerminal.rows, a2 = this._dim(this._header.width, r, i5), o2 = this._dim(this._header.height, n11, A4);\n      if (!a2 && !o2) {\n        let h3 = r / e, g6 = (n11 - A4) / t, d3 = Math.min(h3, g6);\n        return d3 < 1 ? [e * d3, t * d3] : [e, t];\n      }\n      return a2 ? this._header.preserveAspectRatio || !a2 || !o2 ? [a2, t * a2 / e] : [a2, o2] : [e * o2 / t, o2];\n    }\n    _dim(e, t, i5) {\n      return e === "auto" ? 0 : e.endsWith("%") ? parseInt(e.slice(0, -1)) * t / 100 : e.endsWith("px") ? parseInt(e.slice(0, -2)) : parseInt(e) * i5;\n    }\n  };\n  var Ke = M2(Be());\n  function be(s4) {\n    let e = {}, t = s4.split(",");\n    for (let i5 of t) {\n      let A4 = i5.indexOf("=");\n      if (A4 === -1) continue;\n      let r = i5.substring(0, A4), n11 = i5.substring(A4 + 1);\n      if (r === "a") {\n        e.action = n11;\n        continue;\n      }\n      if (r === "o") {\n        e.compression = n11;\n        continue;\n      }\n      if (r === "t") {\n        e.transmission = n11;\n        continue;\n      }\n      if (r === "d") {\n        e.deleteSelector = n11;\n        continue;\n      }\n      let a2 = parseInt(n11);\n      switch (r) {\n        case "f":\n          e.format = a2;\n          break;\n        case "i":\n          e.id = a2;\n          break;\n        case "I":\n          e.imageNumber = a2;\n          break;\n        case "s":\n          e.width = a2;\n          break;\n        case "v":\n          e.height = a2;\n          break;\n        case "x":\n          e.x = a2;\n          break;\n        case "y":\n          e.y = a2;\n          break;\n        case "w":\n          e.sourceWidth = a2;\n          break;\n        case "h":\n          e.sourceHeight = a2;\n          break;\n        case "X":\n          e.xOffset = a2;\n          break;\n        case "Y":\n          e.yOffset = a2;\n          break;\n        case "c":\n          e.columns = a2;\n          break;\n        case "r":\n          e.rows = a2;\n          break;\n        case "m":\n          e.more = a2;\n          break;\n        case "q":\n          e.quiet = a2;\n          break;\n        case "C":\n          e.cursorMovement = a2;\n          break;\n        case "z":\n          e.zIndex = a2;\n          break;\n        case "p":\n          e.placementId = a2;\n          break;\n      }\n    }\n    return e;\n  }\n  var xt = 4194304;\n  var Tt = 4194304;\n  var Je = 0;\n  var Oe = 512;\n  var vt = 59;\n  var ie = class {\n    constructor(e, t, i5, A4) {\n      this._opts = e;\n      this._renderer = t;\n      this._kittyStorage = i5;\n      this._coreTerminal = A4;\n      this._aborted = false;\n      this._decodeError = false;\n      this._activeDecoder = null;\n      this._inControlData = true;\n      this._controlData = new Uint32Array(Oe);\n      this._controlLength = 0;\n      this._encodedSizeLimit = 0;\n      this._totalEncodedSize = 0;\n      this._parsedCommand = null;\n      this._pendingTransmissions = /* @__PURE__ */ new Map();\n      this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3), this._initialEncodedBytes = Math.min(Tt, this._maxEncodedBytes);\n    }\n    reset() {\n      this._cleanupAllPending(), this._activeDecoder && (this._activeDecoder.release(), this._activeDecoder = null), this._kittyStorage.reset();\n    }\n    dispose() {\n      this.reset();\n    }\n    _removePendingEntry(e) {\n      this._pendingTransmissions.delete(e), this._lastPendingKey === e && (this._lastPendingKey = void 0);\n    }\n    _cleanupAllPending() {\n      for (let e of this._pendingTransmissions.values()) e.decoder.release();\n      this._pendingTransmissions.clear(), this._lastPendingKey = void 0;\n    }\n    start() {\n      this._aborted = false, this._decodeError = false, this._inControlData = true, this._controlLength = 0, this._parsedCommand = null, this._encodedSizeLimit = this._maxEncodedBytes, this._totalEncodedSize = 0, this._activeDecoder = null;\n    }\n    put(e, t, i5) {\n      if (!this._aborted) if (!this._inControlData) this._streamPayload(e, t, i5);\n      else {\n        let A4 = i5;\n        for (let n11 = t; n11 < i5; n11++) if (e[n11] === vt) {\n          this._inControlData = false, A4 = n11;\n          break;\n        }\n        let r = A4 - t;\n        if (this._controlLength + r > Oe) {\n          this._aborted = true;\n          return;\n        }\n        if (this._controlData.set(e.subarray(t, A4), this._controlLength), this._controlLength += r, !this._inControlData) {\n          if (this._parsedCommand = be(this._parseControlDataString()), this._parsedCommand.id !== void 0 && this._parsedCommand.imageNumber !== void 0) {\n            this._sendResponse(this._parsedCommand.id, "EINVAL:cannot specify both i and I keys", this._parsedCommand.quiet ?? 0), this._aborted = true;\n            return;\n          }\n          if (this._parsedCommand.action === "d") return;\n          let n11 = A4 + 1;\n          n11 < i5 && this._streamPayload(e, n11, i5);\n        }\n      }\n    }\n    _streamPayload(e, t, i5) {\n      if (this._aborted) return;\n      let A4 = this._parsedCommand?.id ?? this._lastPendingKey ?? 0, r = this._pendingTransmissions.get(A4), n11 = r?.totalEncodedSize ?? 0;\n      if (this._totalEncodedSize += i5 - t, n11 + this._totalEncodedSize > this._encodedSizeLimit) {\n        let o2 = this._activeDecoder ?? r?.decoder;\n        o2 && o2.release(), this._activeDecoder = null, r && this._removePendingEntry(A4), this._aborted = true;\n        return;\n      }\n      this._decodeError || (r?.decoder && !this._activeDecoder && (this._activeDecoder = r.decoder), this._activeDecoder || (this._activeDecoder = new Ke.default(xt, this._maxEncodedBytes, this._initialEncodedBytes), this._activeDecoder.init()), this._activeDecoder.put(e.subarray(t, i5)) !== Je && (this._activeDecoder.release(), this._activeDecoder = null, this._decodeError = true, r && this._removePendingEntry(A4)));\n    }\n    end(e) {\n      if (this._aborted || !e) return this._activeDecoder && (this._activeDecoder.release(), this._activeDecoder = null), true;\n      if (this._inControlData) return this._handleNoPayloadCommand();\n      let t = this._parsedCommand;\n      if (t.action === "d") return this._handleDelete(t);\n      let i5 = t.id ?? this._lastPendingKey ?? 0, A4 = t.more === 1, r = this._pendingTransmissions.get(i5);\n      if (A4) return this._activeDecoder && (r ? (r.totalEncodedSize += this._totalEncodedSize, r.decodeError = r.decodeError || this._decodeError) : this._pendingTransmissions.set(i5, { cmd: { ...t }, decoder: this._activeDecoder, totalEncodedSize: this._totalEncodedSize, decodeError: this._decodeError }), this._lastPendingKey = i5, this._activeDecoder = null), true;\n      r && (this._lastPendingKey = void 0);\n      let n11 = this._decodeError, a2 = t, o2 = this._activeDecoder;\n      r && (a2 = r.cmd, o2 = r.decoder, n11 = n11 || r.decodeError, this._pendingTransmissions.delete(i5));\n      let h3 = new Uint8Array(0);\n      o2 && (o2.end() !== Je && (n11 = true), h3 = o2.data8), this._activeDecoder = null;\n      let g6 = this._handleCommandWithBytesAndCmd(a2, h3, n11);\n      return o2 && o2.release(), g6;\n    }\n    _parseControlDataString() {\n      let e = "";\n      for (let t = 0; t < this._controlLength; t++) e += String.fromCodePoint(this._controlData[t]);\n      return e;\n    }\n    _handleNoPayloadCommand() {\n      let e = be(this._parseControlDataString());\n      if (e.id !== void 0 && e.imageNumber !== void 0) return this._sendResponse(e.id, "EINVAL:cannot specify both i and I keys", e.quiet ?? 0), true;\n      switch (e.action ?? "t") {\n        case "d":\n          return this._handleDelete(e);\n        case "q":\n          return this._sendResponse(e.id ?? 0, "OK", e.quiet ?? 0), true;\n        case "p":\n          return this._handlePlacement(e);\n        default:\n          return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported action", e.quiet ?? 0), true;\n      }\n    }\n    _handleCommandWithBytesAndCmd(e, t, i5) {\n      switch (e.action ?? "t") {\n        case "t": {\n          let r = this._handleTransmit(e, t, i5);\n          return (e.transmission ?? "d") === "d" && e.id !== void 0 && (i5 ? this._sendResponse(e.id, "EINVAL:invalid base64 data", e.quiet ?? 0) : t.length > 0 && this._sendResponse(e.id, "OK", e.quiet ?? 0)), r;\n        }\n        case "T":\n          return this._handleTransmitDisplay(e, t, i5);\n        case "q":\n          return this._handleQuery(e, t, i5);\n        case "p":\n          return this._handlePlacement(e);\n        default:\n          return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported action", e.quiet ?? 0), true;\n      }\n    }\n    _handlePlacement(e) {\n      if (e.id === void 0) return true;\n      let t = e.id, i5 = this._kittyStorage.getImage(t);\n      return i5 ? this._displayImage(i5, e).then((r) => (this._sendResponse(t, r ? "OK" : "EINVAL:image rendering failed", e.quiet ?? 0, e.placementId), true)) : (this._sendResponse(t, "ENOENT:image not found", e.quiet ?? 0, e.placementId), true);\n    }\n    _handleTransmit(e, t, i5) {\n      return (e.transmission ?? "d") !== "d" ? (e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported transmission medium", e.quiet ?? 0), true) : (i5 || t.length === 0 || this._kittyStorage.storeImage(e.id, { data: new Blob([t]), width: e.width ?? 0, height: e.height ?? 0, format: e.format ?? 32, compression: e.compression ?? "" }), true);\n    }\n    _handleTransmitDisplay(e, t, i5) {\n      if (i5) return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:invalid base64 data", e.quiet ?? 0), true;\n      this._handleTransmit(e, t, i5);\n      let A4 = e.id ?? this._kittyStorage.lastImageId, r = this._kittyStorage.getImage(A4);\n      if (r) {\n        let n11 = this._displayImage(r, e);\n        return e.id !== void 0 ? n11.then((a2) => (this._sendResponse(A4, a2 ? "OK" : "EINVAL:image rendering failed", e.quiet ?? 0), true)) : n11.then(() => true);\n      }\n      return true;\n    }\n    _handleQuery(e, t, i5) {\n      let A4 = e.id ?? 0, r = e.quiet ?? 0;\n      if ((e.transmission ?? "d") !== "d") return this._sendResponse(A4, "EINVAL:unsupported transmission medium", r), true;\n      if (i5) return this._sendResponse(A4, "EINVAL:invalid base64 data", r), true;\n      if (t.length === 0) return this._sendResponse(A4, "OK", r), true;\n      let a2 = e.format ?? 32;\n      if (a2 === 100) this._sendResponse(A4, "OK", r);\n      else {\n        let o2 = e.width ?? 0, h3 = e.height ?? 0;\n        if (!o2 || !h3) return this._sendResponse(A4, "EINVAL:width and height required for raw pixel data", r), true;\n        let g6 = a2 === 32 ? 4 : 3, d3 = o2 * h3 * g6;\n        if (t.length < d3) return this._sendResponse(A4, "EINVAL:insufficient pixel data", r), true;\n        this._sendResponse(A4, "OK", r);\n      }\n      return true;\n    }\n    _handleDelete(e) {\n      switch (e.deleteSelector ?? "a") {\n        case "a":\n        case "A":\n          this._cleanupAllPending(), this._kittyStorage.deleteAll();\n          break;\n        case "i":\n        case "I":\n          if (e.id !== void 0) {\n            let i5 = this._pendingTransmissions.get(e.id);\n            i5 && i5.decoder.release(), this._removePendingEntry(e.id), this._kittyStorage.deleteById(e.id);\n          }\n          break;\n        default:\n          break;\n      }\n      return true;\n    }\n    _sendResponse(e, t, i5, A4) {\n      let r = t === "OK";\n      if (r && i5 === 1 || !r && i5 === 2) return;\n      let n11 = A4 ? `,p=${A4}` : "", a2 = `\\x1B_Gi=${e}${n11};${t}\\x1B\\\\`;\n      this._coreTerminal._core.coreService.triggerDataEvent(a2);\n    }\n    _displayImage(e, t) {\n      return this._decodeAndDisplay(e, t).then(() => true).catch(() => false);\n    }\n    async _decodeAndDisplay(e, t) {\n      let i5 = await this._createBitmap(e);\n      try {\n        let A4 = Math.max(0, t.x ?? 0), r = Math.max(0, t.y ?? 0), n11 = t.sourceWidth || i5.width - A4, a2 = t.sourceHeight || i5.height - r, o2 = Math.max(0, i5.width - A4), h3 = Math.max(0, i5.height - r), g6 = Math.max(0, Math.min(n11, o2)), d3 = Math.max(0, Math.min(a2, h3));\n        if (g6 === 0 || d3 === 0) throw new Error("invalid source rectangle");\n        if (A4 !== 0 || r !== 0 || g6 !== i5.width || d3 !== i5.height) {\n          let v6 = await createImageBitmap(i5, A4, r, g6, d3);\n          i5.close(), i5 = v6;\n        }\n        let I4 = this._renderer.dimensions?.css.cell.width || w2.width, _5 = this._renderer.dimensions?.css.cell.height || w2.height, l4, u3;\n        t.columns !== void 0 && t.rows !== void 0 ? (l4 = t.columns, u3 = t.rows) : t.columns !== void 0 ? (l4 = t.columns, u3 = Math.max(1, Math.ceil(i5.height / i5.width * (l4 * I4) / _5))) : t.rows !== void 0 ? (u3 = t.rows, l4 = Math.max(1, Math.ceil(i5.width / i5.height * (u3 * _5) / I4))) : (l4 = Math.ceil(i5.width / I4), u3 = Math.ceil(i5.height / _5));\n        let C4 = i5.width, p3 = i5.height;\n        if ((t.columns !== void 0 || t.rows !== void 0) && (C4 = Math.round(l4 * I4), p3 = Math.round(u3 * _5)), C4 * p3 > this._opts.pixelLimit) throw new Error("image exceeds pixel limit");\n        let E5 = this._coreTerminal._core.buffer, f5 = E5.x, S4 = E5.y, b4 = E5.ybase, Ve3 = t.zIndex !== void 0 && t.zIndex < 0 ? "bottom" : "top";\n        if (C4 !== i5.width || p3 !== i5.height) {\n          let v6 = await createImageBitmap(i5, { resizeWidth: C4, resizeHeight: p3 });\n          i5.close(), i5 = v6;\n        }\n        let he3 = Math.min(Math.max(0, t.xOffset ?? 0), I4 - 1), de3 = Math.min(Math.max(0, t.yOffset ?? 0), _5 - 1);\n        if (he3 !== 0 || de3 !== 0) {\n          let v6 = t.columns !== void 0 ? Math.round(l4 * I4) : i5.width + he3, et3 = t.rows !== void 0 ? Math.round(u3 * _5) : i5.height + de3, q3 = D2.createCanvas(window.document, v6, et3), xe2 = q3.getContext("2d");\n          if (!xe2) throw new Error("Failed to create offset canvas context");\n          xe2.drawImage(i5, he3, de3);\n          let tt4 = await createImageBitmap(q3);\n          if (q3.width = q3.height = 0, i5.close(), i5 = tt4, C4 = i5.width, p3 = i5.height, C4 * p3 > this._opts.pixelLimit) throw new Error("image exceeds pixel limit");\n          t.columns === void 0 && (l4 = Math.ceil(i5.width / I4)), t.rows === void 0 && (u3 = Math.ceil(i5.height / _5));\n        }\n        let $e2 = t.zIndex ?? 0;\n        if (this._kittyStorage.addImage(e.id, i5, true, Ve3, $e2), i5 = void 0, t.cursorMovement === 1) {\n          let v6 = E5.ybase - b4;\n          E5.x = f5, E5.y = Math.max(S4 - v6, 0);\n        } else E5.x = Math.min(f5 + l4, this._coreTerminal.cols);\n      } catch (A4) {\n        throw i5?.close(), A4;\n      }\n    }\n    async _createBitmap(e) {\n      let t = new Uint8Array(await e.data.arrayBuffer());\n      if (e.compression === "z" && (t = await this._decompressZlib(t)), e.format === 100) {\n        let C4 = new Blob([t], { type: "image/png" });\n        if (!window.createImageBitmap) {\n          let p3 = URL.createObjectURL(C4), E5 = new Image();\n          return new Promise((f5, S4) => {\n            E5.addEventListener("load", () => {\n              URL.revokeObjectURL(p3);\n              let b4 = D2.createCanvas(window.document, E5.width, E5.height);\n              b4.getContext("2d")?.drawImage(E5, 0, 0), createImageBitmap(b4).then(f5).catch(S4);\n            }), E5.addEventListener("error", () => {\n              URL.revokeObjectURL(p3), S4(new Error("Failed to load image"));\n            }), E5.src = p3;\n          });\n        }\n        return createImageBitmap(C4);\n      }\n      let i5 = e.width, A4 = e.height;\n      if (!i5 || !A4) throw new Error("Width and height required for raw pixel data");\n      let r = e.format === 32 ? 4 : 3, n11 = i5 * A4 * r;\n      if (t.length < n11) throw new Error("Insufficient pixel data");\n      let a2 = i5 * A4;\n      if (e.format === 32) return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer, t.byteOffset, a2 * 4), i5, A4));\n      let o2 = new Uint8ClampedArray(a2 * 4), h3 = new Uint32Array(t.buffer, t.byteOffset, Math.floor(t.byteLength / 4)), g6 = new Uint32Array(o2.buffer), d3 = a2 & -4, I4 = 0, _5 = 0;\n      for (let C4 = 0; C4 < d3; C4 += 4) {\n        let p3 = h3[I4++], E5 = h3[I4++], f5 = h3[I4++];\n        g6[_5++] = 4278190080 | p3, g6[_5++] = 4278190080 | p3 >>> 24 | E5 << 8, g6[_5++] = 4278190080 | E5 >>> 16 | f5 << 16, g6[_5++] = 4278190080 | f5 >>> 8;\n      }\n      let l4 = d3 * 3, u3 = d3 * 4;\n      for (let C4 = d3; C4 < a2; C4++) o2[u3] = t[l4], o2[u3 + 1] = t[l4 + 1], o2[u3 + 2] = t[l4 + 2], o2[u3 + 3] = 255, l4 += 3, u3 += 4;\n      return createImageBitmap(new ImageData(o2, i5, A4));\n    }\n    async _decompressZlib(e) {\n      try {\n        return await this._decompress(e, "deflate");\n      } catch {\n        return await this._decompress(e, "deflate-raw");\n      }\n    }\n    async _decompress(e, t) {\n      let i5 = new DecompressionStream(t), A4 = i5.writable.getWriter();\n      A4.write(e), A4.close();\n      let r = [], n11 = i5.readable.getReader();\n      for (; ; ) {\n        let { done: g6, value: d3 } = await n11.read();\n        if (g6) break;\n        r.push(d3);\n      }\n      let a2 = r.reduce((g6, d3) => g6 + d3.length, 0), o2 = new Uint8Array(a2), h3 = 0;\n      for (let g6 of r) o2.set(g6, h3), h3 += g6.length;\n      return o2;\n    }\n    get images() {\n      return this._kittyStorage.images;\n    }\n    get _kittyIdToStorageId() {\n      return this._kittyStorage.kittyIdToStorageId;\n    }\n    get pendingTransmissions() {\n      return this._pendingTransmissions;\n    }\n  };\n  var O2 = class O3 {\n    constructor(e) {\n      this._storage = e;\n      this._nextImageId = 1;\n      this._images = /* @__PURE__ */ new Map();\n      this._kittyIdToStorageId = /* @__PURE__ */ new Map();\n      this._storageIdToKittyId = /* @__PURE__ */ new Map();\n      this._handleStorageImageDeleted = (e2) => {\n        let t = this._storageIdToKittyId.get(e2);\n        t !== void 0 && (this._kittyIdToStorageId.delete(t), this._storageIdToKittyId.delete(e2), this._images.delete(t));\n      };\n      this._previousOnImageDeleted = this._storage.onImageDeleted, this._wrappedOnImageDeleted = (t) => {\n        this._previousOnImageDeleted?.(t), this._handleStorageImageDeleted(t);\n      }, this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n    }\n    reset() {\n      this._nextImageId = 1, this._images.clear(), this._kittyIdToStorageId.clear(), this._storageIdToKittyId.clear();\n    }\n    dispose() {\n      this.reset(), this._storage.onImageDeleted === this._wrappedOnImageDeleted && (this._storage.onImageDeleted = this._previousOnImageDeleted);\n    }\n    storeImage(e, t) {\n      let i5 = e ?? this._nextImageId++, A4 = this._kittyIdToStorageId.get(i5);\n      return A4 !== void 0 && (this._storage.deleteImage(A4), this._kittyIdToStorageId.delete(i5), this._storageIdToKittyId.delete(A4)), !this._images.has(i5) && this._images.size >= O3._maxStoredImages && this._evictUndisplayedImages(), this._images.set(i5, { ...t, id: i5 }), i5;\n    }\n    addImage(e, t, i5, A4, r) {\n      let n11 = this._kittyIdToStorageId.get(e);\n      n11 !== void 0 && this._storageIdToKittyId.delete(n11);\n      let a2 = this._storage.addImage(t, i5, A4, r);\n      this._kittyIdToStorageId.set(e, a2), this._storageIdToKittyId.set(a2, e);\n    }\n    getImage(e) {\n      return this._images.get(e);\n    }\n    deleteById(e) {\n      this._images.delete(e);\n      let t = this._kittyIdToStorageId.get(e);\n      t !== void 0 && (this._storage.deleteImage(t), this._kittyIdToStorageId.delete(e), this._storageIdToKittyId.delete(t));\n    }\n    deleteAll() {\n      this._images.clear();\n      for (let e of this._kittyIdToStorageId.values()) this._storage.deleteImage(e);\n      this._kittyIdToStorageId.clear(), this._storageIdToKittyId.clear();\n    }\n    get images() {\n      return this._images;\n    }\n    get kittyIdToStorageId() {\n      return this._kittyIdToStorageId;\n    }\n    get lastImageId() {\n      return this._nextImageId - 1;\n    }\n    _evictUndisplayedImages() {\n      for (let [e] of this._images) {\n        if (this._images.size <= O3._maxStoredImages / 2) break;\n        this._kittyIdToStorageId.has(e) || this._images.delete(e);\n      }\n    }\n  };\n  O2._maxStoredImages = 256;\n  var Ae = O2;\n  var x2 = M2(X());\n  var ze = M2(We());\n  var Nt = 4194304;\n  var Se = x2.PALETTE_ANSI_256;\n  Se.set(x2.PALETTE_VT340_COLOR);\n  var ae = class {\n    constructor(e, t, i5) {\n      this._opts = e;\n      this._storage = t;\n      this._coreTerminal = i5;\n      this._size = 0;\n      this._aborted = false;\n      (0, ze.DecoderAsync)({ memoryLimit: this._opts.pixelLimit * 4, palette: Se, paletteLimit: this._opts.sixelPaletteLimit }).then((A4) => this._dec = A4);\n    }\n    reset() {\n      this._dec && (this._dec.release(), this._dec._palette.fill(0), this._dec.init(0, Se, this._opts.sixelPaletteLimit));\n    }\n    hook(e) {\n      if (this._size = 0, this._aborted = false, this._dec) {\n        let t = e.params[1] === 1 ? 0 : Ht(this._coreTerminal._core._inputHandler._curAttrData, this._coreTerminal._core._themeService?.colors);\n        this._dec.init(t, null, this._opts.sixelPaletteLimit);\n      }\n    }\n    put(e, t, i5) {\n      if (!(this._aborted || !this._dec)) {\n        if (this._size += i5 - t, this._size > this._opts.sixelSizeLimit) {\n          console.warn("SIXEL: too much data, aborting"), this._aborted = true, this._dec.release();\n          return;\n        }\n        try {\n          this._dec.decode(e, t, i5);\n        } catch (A4) {\n          console.warn(`SIXEL: error while decoding image - ${A4}`), this._aborted = true, this._dec.release();\n        }\n      }\n    }\n    unhook(e) {\n      if (this._aborted || !e || !this._dec) return true;\n      let t = this._dec.width, i5 = this._dec.height;\n      if (!t || !i5) return i5 && this._storage.advanceCursor(i5), true;\n      let A4 = D2.createCanvas(void 0, t, i5);\n      return A4.getContext("2d")?.putImageData(new ImageData(this._dec.data8, t, i5), 0, 0), this._dec.memoryUsage > Nt && this._dec.release(), this._storage.addImage(A4), true;\n    }\n  };\n  function Ht(s4, e) {\n    let t = 0;\n    if (!e) return t;\n    if (s4.isInverse()) if (s4.isFgDefault()) t = ne(e.foreground.rgba);\n    else if (s4.isFgRGB()) {\n      let i5 = s4.constructor.toColorRGB(s4.getFgColor());\n      t = (0, x2.toRGBA8888)(...i5);\n    } else t = ne(e.ansi[s4.getFgColor()].rgba);\n    else if (s4.isBgDefault()) t = ne(e.background.rgba);\n    else if (s4.isBgRGB()) {\n      let i5 = s4.constructor.toColorRGB(s4.getBgColor());\n      t = (0, x2.toRGBA8888)(...i5);\n    } else t = ne(e.ansi[s4.getBgColor()].rgba);\n    return t;\n  }\n  function ne(s4) {\n    return x2.BIG_ENDIAN ? s4 : (s4 & 255) << 24 | (s4 >>> 8 & 255) << 16 | (s4 >>> 16 & 255) << 8 | s4 >>> 24 & 255;\n  }\n  var oe = class {\n    constructor(e, t, i5, A4) {\n      this._storage = e;\n      this._opts = t;\n      this._renderer = i5;\n      this._terminal = A4;\n    }\n    addImage(e) {\n      this._storage.addImage(e, this._opts.sixelScrolling);\n    }\n    advanceCursor(e) {\n      if (this._opts.sixelScrolling) {\n        let t = this._renderer.cellSize;\n        (t.width === -1 || t.height === -1) && (t = w2);\n        let i5 = Math.ceil(e / t.height);\n        for (let A4 = 1; A4 < i5; ++A4) this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  };\n  var ge = class {\n    constructor(e) {\n      this._storage = e;\n    }\n    addImage(e) {\n      this._storage.addImage(e, true);\n    }\n  };\n  var Xe = { enableSizeReports: true, pixelLimit: 16777216, sixelSupport: true, sixelScrolling: true, sixelPaletteLimit: 4096, sixelSizeLimit: 33554432, storageLimit: 128, showPlaceholder: true, iipSupport: true, iipSizeLimit: 33554432, kittySupport: true, kittySizeLimit: 33554432 };\n  var Ze = 4096;\n  var je = class {\n    constructor(e) {\n      this._disposables = [];\n      this._handlers = /* @__PURE__ */ new Map();\n      this._onImageAdded = new z2();\n      this.onImageAdded = this._onImageAdded.event;\n      this._opts = Object.assign({}, Xe, e), this._defaultOpts = Object.assign({}, Xe, e);\n    }\n    dispose() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.length = 0, this._handlers.clear(), this._onImageAdded.dispose();\n    }\n    _disposeLater(...e) {\n      for (let t of e) this._disposables.push(t);\n    }\n    activate(e) {\n      if (this._terminal = e, this._renderer = new D2(e), this._storage = new j2(e, this._renderer, this._opts), this._storage.onImageAdded = () => this._onImageAdded.fire(), this._opts.enableSizeReports) {\n        let t = e.options.windowOptions ?? {};\n        t.getWinSizePixels = true, t.getCellSizePixels = true, t.getWinSizeChars = true, e.options.windowOptions = t;\n      }\n      if (this._disposeLater(this._renderer, this._storage, e.parser.registerCsiHandler({ prefix: "?", final: "h" }, (t) => this._decset(t)), e.parser.registerCsiHandler({ prefix: "?", final: "l" }, (t) => this._decrst(t)), e.parser.registerCsiHandler({ final: "c" }, (t) => this._da1(t)), e.parser.registerCsiHandler({ prefix: "?", final: "S" }, (t) => this._xtermGraphicsAttributes(t)), e.onRender((t) => this._storage?.render(t)), e.parser.registerCsiHandler({ intermediates: "!", final: "p" }, () => this.reset()), e.parser.registerEscHandler({ final: "c" }, () => this.reset()), e._core._inputHandler.onRequestReset(() => this.reset()), e.buffer.onBufferChange(() => this._storage?.wipeAlternate()), e.onResize((t) => this._storage?.viewportResize(t))), this._opts.sixelSupport) {\n        let t = new oe(this._storage, this._opts, this._renderer, e), i5 = new ae(this._opts, t, e);\n        this._handlers.set("sixel", i5), this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({ final: "q" }, i5));\n      }\n      if (this._opts.iipSupport) {\n        let t = new ge(this._storage), i5 = new ee(this._opts, this._renderer, t, e);\n        this._handlers.set("iip", i5), this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337, i5));\n      }\n      if (this._opts.kittySupport) {\n        let t = new Ae(this._storage), i5 = new ie(this._opts, this._renderer, t, e);\n        this._handlers.set("kitty", i5), this._disposeLater(t, i5, e._core._inputHandler._parser.registerApcHandler({ final: "G" }, i5));\n      }\n    }\n    reset() {\n      this._opts.sixelScrolling = this._defaultOpts.sixelScrolling, this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit, this._storage?.reset();\n      for (let e of this._handlers.values()) e.reset();\n      return false;\n    }\n    get storageLimit() {\n      return this._storage?.getLimit() || -1;\n    }\n    set storageLimit(e) {\n      this._storage?.setLimit(e), this._opts.storageLimit = e;\n    }\n    get storageUsage() {\n      return this._storage ? this._storage.getUsage() : -1;\n    }\n    get showPlaceholder() {\n      return this._opts.showPlaceholder;\n    }\n    set showPlaceholder(e) {\n      this._opts.showPlaceholder = e, this._renderer?.showPlaceholder(e);\n    }\n    getImageAtBufferCell(e, t) {\n      return this._storage?.getImageAtBufferCell(e, t);\n    }\n    extractTileAtBufferCell(e, t) {\n      return this._storage?.extractTileAtBufferCell(e, t);\n    }\n    _report(e) {\n      this._terminal?._core.coreService.triggerDataEvent(e);\n    }\n    _decset(e) {\n      for (let t = 0; t < e.length; ++t) switch (e[t]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n      return false;\n    }\n    _decrst(e) {\n      for (let t = 0; t < e.length; ++t) switch (e[t]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n      return false;\n    }\n    _da1(e) {\n      return e[0] ? true : this._opts.sixelSupport ? (this._report("\\x1B[?62;4;9;22c"), true) : false;\n    }\n    _xtermGraphicsAttributes(e) {\n      if (e.length < 2) return true;\n      if (e[0] === 1) switch (e[1]) {\n        case 1:\n          return this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`), true;\n        case 2:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit, this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);\n          for (let t of this._handlers.values()) t.reset();\n          return true;\n        case 3:\n          return e.length > 2 && !(e[2] instanceof Array) && e[2] <= Ze ? (this._opts.sixelPaletteLimit = e[2], this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)) : this._report(`\\x1B[?${e[0]};2S`), true;\n        case 4:\n          return this._report(`\\x1B[?${e[0]};0;${Ze}S`), true;\n        default:\n          return this._report(`\\x1B[?${e[0]};2S`), true;\n      }\n      if (e[0] === 2) switch (e[1]) {\n        case 1:\n          let t = this._renderer?.dimensions?.css.canvas.width, i5 = this._renderer?.dimensions?.css.canvas.height;\n          if (!t || !i5) {\n            let r = w2;\n            t = (this._terminal?.cols || 80) * r.width, i5 = (this._terminal?.rows || 24) * r.height;\n          }\n          if (t * i5 < this._opts.pixelLimit) this._report(`\\x1B[?${e[0]};0;${t.toFixed(0)};${i5.toFixed(0)}S`);\n          else {\n            let r = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1B[?${e[0]};0;${r};${r}S`);\n          }\n          return true;\n        case 4:\n          let A4 = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          return this._report(`\\x1B[?${e[0]};0;${A4};${A4}S`), true;\n        default:\n          return this._report(`\\x1B[?${e[0]};2S`), true;\n      }\n      return this._report(`\\x1B[?${e[0]};1S`), true;\n    }\n  };\n\n  // node_modules/@xterm/addon-search/lib/addon-search.mjs\n  function _3(h3) {\n    return { dispose: h3 };\n  }\n  function T2(h3) {\n    if (!h3) return h3;\n    if (Array.isArray(h3)) {\n      for (let i5 of h3) i5.dispose();\n      return [];\n    }\n    return h3.dispose(), h3;\n  }\n  function E2(...h3) {\n    return _3(() => T2(h3));\n  }\n  var S2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(i5) {\n      return this._isDisposed ? i5.dispose() : this._disposables.add(i5), i5;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let i5 of this._disposables) i5.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let i5 of this._disposables) i5.dispose();\n      this._disposables.clear();\n    }\n  };\n  var b2 = class {\n    constructor() {\n      this._store = new S2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(i5) {\n      return this._store.add(i5);\n    }\n  };\n  b2.None = Object.freeze({ dispose() {\n  } });\n  var v2 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(i5) {\n      this._isDisposed || i5 === this._value || (this._value?.dispose(), this._value = i5);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var I2 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (i5, e, t) => {\n        if (this._disposed) return _3(() => {\n        });\n        let r = { fn: i5, thisArgs: e };\n        this._listeners.push(r);\n        let s4 = _3(() => {\n          let n11 = this._listeners.indexOf(r);\n          n11 !== -1 && this._listeners.splice(n11, 1);\n        });\n        return t && (Array.isArray(t) ? t.push(s4) : t.add(s4)), s4;\n      }, this._event);\n    }\n    fire(i5) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: e, thisArgs: t } = this._listeners[0];\n          e.call(t, i5);\n          return;\n        }\n        default: {\n          let e = this._listeners.slice();\n          for (let { fn: t, thisArgs: r } of e) t.call(r, i5);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var W2;\n  ((r) => {\n    function h3(s4, n11) {\n      return s4((a2) => n11.fire(a2));\n    }\n    r.forward = h3;\n    function i5(s4, n11) {\n      return (a2, o2, l4) => s4((c2) => a2.call(o2, n11(c2)), void 0, l4);\n    }\n    r.map = i5;\n    function e(...s4) {\n      return (n11, a2, o2) => {\n        let l4 = new S2();\n        for (let c2 of s4) l4.add(c2((p3) => n11.call(a2, p3)));\n        return o2 && (Array.isArray(o2) ? o2.push(l4) : o2.add(l4)), l4;\n      };\n    }\n    r.any = e;\n    function t(s4, n11, a2) {\n      return n11(a2), s4((o2) => n11(o2));\n    }\n    r.runAndSubscribe = t;\n  })(W2 ||= {});\n  function D3(h3, i5 = 0, e) {\n    let t = setTimeout(() => {\n      h3(), e && r.dispose();\n    }, i5), r = _3(() => {\n      clearTimeout(t);\n    });\n    return e?.add(r), r;\n  }\n  var C2 = class extends b2 {\n    constructor(e) {\n      super();\n      this._terminal = e;\n      this._linesCacheTimeout = this._register(new v2());\n      this._linesCacheDisposables = this._register(new v2());\n      this._lastAccessTimestamp = 0;\n      this._register(_3(() => this._destroyLinesCache()));\n    }\n    initLinesCache() {\n      this._linesCache || (this._linesCache = new Array(this._terminal.buffer.active.length), this._linesCacheDisposables.value = E2(this._terminal.onLineFeed(() => this._destroyLinesCache()), this._terminal.onCursorMove(() => this._destroyLinesCache()), this._terminal.onResize(() => this._destroyLinesCache()))), this._lastAccessTimestamp = Date.now(), this._linesCacheTimeout.value || this._scheduleLinesCacheTimeout(15e3);\n    }\n    _destroyLinesCache() {\n      this._linesCache = void 0, this._lastAccessTimestamp = 0, this._linesCacheDisposables.clear(), this._linesCacheTimeout.clear();\n    }\n    _scheduleLinesCacheTimeout(e) {\n      this._linesCacheTimeout.value = D3(() => {\n        if (!this._linesCache) return;\n        let r = Date.now() - this._lastAccessTimestamp;\n        if (r >= 15e3) {\n          this._destroyLinesCache();\n          return;\n        }\n        this._scheduleLinesCacheTimeout(15e3 - r);\n      }, e);\n    }\n    getLineFromCache(e) {\n      return this._linesCache?.[e];\n    }\n    setLineInCache(e, t) {\n      this._linesCache && (this._linesCache[e] = t);\n    }\n    translateBufferLineToStringWithWrap(e, t) {\n      let r = [], s4 = [0], n11 = this._terminal.buffer.active.getLine(e);\n      for (; n11; ) {\n        let a2 = this._terminal.buffer.active.getLine(e + 1), o2 = a2 ? a2.isWrapped : false, l4 = n11.translateToString(!o2 && t);\n        if (o2 && a2) {\n          let c2 = n11.getCell(n11.length - 1);\n          c2 && c2.getCode() === 0 && c2.getWidth() === 1 && a2.getCell(0)?.getWidth() === 2 && (l4 = l4.slice(0, -1));\n        }\n        if (r.push(l4), o2) s4.push(s4[s4.length - 1] + l4.length);\n        else break;\n        e++, n11 = a2;\n      }\n      return [r.join(""), s4];\n    }\n  };\n  var x3 = class {\n    get cachedSearchTerm() {\n      return this._cachedSearchTerm;\n    }\n    set cachedSearchTerm(i5) {\n      this._cachedSearchTerm = i5;\n    }\n    get lastSearchOptions() {\n      return this._lastSearchOptions;\n    }\n    set lastSearchOptions(i5) {\n      this._lastSearchOptions = i5;\n    }\n    isValidSearchTerm(i5) {\n      return !!(i5 && i5.length > 0);\n    }\n    didOptionsChange(i5) {\n      return this._lastSearchOptions ? i5 ? this._lastSearchOptions.caseSensitive !== i5.caseSensitive || this._lastSearchOptions.regex !== i5.regex || this._lastSearchOptions.wholeWord !== i5.wholeWord : false : true;\n    }\n    shouldUpdateHighlighting(i5, e) {\n      return e?.decorations ? this._cachedSearchTerm === void 0 || i5 !== this._cachedSearchTerm || this.didOptionsChange(e) : false;\n    }\n    clearCachedTerm() {\n      this._cachedSearchTerm = void 0;\n    }\n    reset() {\n      this._cachedSearchTerm = void 0, this._lastSearchOptions = void 0;\n    }\n  };\n  var R2 = class {\n    constructor(i5, e) {\n      this._terminal = i5;\n      this._lineCache = e;\n    }\n    find(i5, e, t, r) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      if (t > this._terminal.cols) throw new Error(`Invalid col: ${t} to search in terminal of ${this._terminal.cols} cols`);\n      this._lineCache.initLinesCache();\n      let s4 = { startRow: e, startCol: t }, n11 = this._findInLine(i5, s4, r);\n      if (!n11) for (let a2 = e + 1; a2 < this._terminal.buffer.active.baseY + this._terminal.rows && (s4.startRow = a2, s4.startCol = 0, n11 = this._findInLine(i5, s4, r), !n11); a2++) ;\n      return n11;\n    }\n    findNextWithSelection(i5, e, t) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      let r = this._terminal.getSelectionPosition();\n      this._terminal.clearSelection();\n      let s4 = 0, n11 = 0;\n      r && (t === i5 ? (s4 = r.end.x, n11 = r.end.y) : (s4 = r.start.x, n11 = r.start.y)), this._lineCache.initLinesCache();\n      let a2 = { startRow: n11, startCol: s4 }, o2 = this._findInLine(i5, a2, e);\n      if (!o2) for (let l4 = n11 + 1; l4 < this._terminal.buffer.active.baseY + this._terminal.rows && (a2.startRow = l4, a2.startCol = 0, o2 = this._findInLine(i5, a2, e), !o2); l4++) ;\n      if (!o2 && n11 !== 0) for (let l4 = 0; l4 < n11 && (a2.startRow = l4, a2.startCol = 0, o2 = this._findInLine(i5, a2, e), !o2); l4++) ;\n      return !o2 && r && (a2.startRow = r.start.y, a2.startCol = 0, o2 = this._findInLine(i5, a2, e)), o2;\n    }\n    findPreviousWithSelection(i5, e, t) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      let r = this._terminal.getSelectionPosition();\n      this._terminal.clearSelection();\n      let s4 = this._terminal.buffer.active.baseY + this._terminal.rows - 1, n11 = this._terminal.cols, a2 = true;\n      this._lineCache.initLinesCache();\n      let o2 = { startRow: s4, startCol: n11 }, l4;\n      if (r && (o2.startRow = s4 = r.start.y, o2.startCol = n11 = r.start.x, t !== i5 && (l4 = this._findInLine(i5, o2, e, false), l4 || (o2.startRow = s4 = r.end.y, o2.startCol = n11 = r.end.x))), l4 ??= this._findInLine(i5, o2, e, a2), !l4) {\n        o2.startCol = Math.max(o2.startCol, this._terminal.cols);\n        for (let c2 = s4 - 1; c2 >= 0 && (o2.startRow = c2, l4 = this._findInLine(i5, o2, e, a2), !l4); c2--) ;\n      }\n      if (!l4 && s4 !== this._terminal.buffer.active.baseY + this._terminal.rows - 1) for (let c2 = this._terminal.buffer.active.baseY + this._terminal.rows - 1; c2 >= s4 && (o2.startRow = c2, l4 = this._findInLine(i5, o2, e, a2), !l4); c2--) ;\n      return l4;\n    }\n    _isWholeWord(i5, e, t) {\n      return (i5 === 0 || " ~!@#$%^&*()+`-=[]{}|\\\\;:\\"\',./<>?".includes(e[i5 - 1])) && (i5 + t.length === e.length || " ~!@#$%^&*()+`-=[]{}|\\\\;:\\"\',./<>?".includes(e[i5 + t.length]));\n    }\n    _findInLine(i5, e, t = {}, r = false) {\n      let s4 = e.startRow, n11 = e.startCol;\n      if (this._terminal.buffer.active.getLine(s4)?.isWrapped) {\n        if (r) {\n          e.startCol += this._terminal.cols;\n          return;\n        }\n        return e.startRow--, e.startCol += this._terminal.cols, this._findInLine(i5, e, t);\n      }\n      let o2 = this._lineCache.getLineFromCache(s4);\n      o2 || (o2 = this._lineCache.translateBufferLineToStringWithWrap(s4, true), this._lineCache.setLineInCache(s4, o2));\n      let [l4, c2] = o2, p3 = this._bufferColsToStringOffset(s4, n11), m4 = i5, g6 = l4;\n      t.regex || (m4 = t.caseSensitive ? i5 : i5.toLowerCase(), g6 = t.caseSensitive ? l4 : l4.toLowerCase());\n      let f5 = -1;\n      if (t.regex) {\n        let u3 = RegExp(m4, t.caseSensitive ? "g" : "gi"), d3;\n        if (r) for (; d3 = u3.exec(g6.slice(0, p3)); ) f5 = u3.lastIndex - d3[0].length, i5 = d3[0], u3.lastIndex -= i5.length - 1;\n        else d3 = u3.exec(g6.slice(p3)), d3 && d3[0].length > 0 && (f5 = p3 + (u3.lastIndex - d3[0].length), i5 = d3[0]);\n      } else r ? p3 - m4.length >= 0 && (f5 = g6.lastIndexOf(m4, p3 - m4.length)) : f5 = g6.indexOf(m4, p3);\n      if (f5 >= 0) {\n        if (t.wholeWord && !this._isWholeWord(f5, g6, i5)) return;\n        let u3 = 0;\n        for (; u3 < c2.length - 1 && f5 >= c2[u3 + 1]; ) u3++;\n        let d3 = u3;\n        for (; d3 < c2.length - 1 && f5 + i5.length >= c2[d3 + 1]; ) d3++;\n        let O4 = f5 - c2[u3], k5 = f5 + i5.length - c2[d3], y5 = this._stringLengthToBufferSize(s4 + u3, O4), M4 = this._stringLengthToBufferSize(s4 + d3, k5) - y5 + this._terminal.cols * (d3 - u3);\n        return { term: i5, col: y5, row: s4 + u3, size: M4 };\n      }\n    }\n    _stringLengthToBufferSize(i5, e) {\n      let t = this._terminal.buffer.active.getLine(i5);\n      if (!t) return 0;\n      for (let r = 0; r < e; r++) {\n        let s4 = t.getCell(r);\n        if (!s4) break;\n        let n11 = s4.getChars();\n        n11.length > 1 && (e -= n11.length - 1);\n        let a2 = t.getCell(r + 1);\n        a2 && a2.getWidth() === 0 && e++;\n      }\n      return e;\n    }\n    _bufferColsToStringOffset(i5, e) {\n      let t = i5, r = 0, s4 = this._terminal.buffer.active.getLine(t);\n      for (; e > 0 && s4; ) {\n        for (let n11 = 0; n11 < e && n11 < this._terminal.cols; n11++) {\n          let a2 = s4.getCell(n11);\n          if (!a2) break;\n          a2.getWidth() && (r += a2.getCode() === 0 ? 1 : a2.getChars().length);\n        }\n        if (t++, s4 = this._terminal.buffer.active.getLine(t), s4 && !s4.isWrapped) break;\n        e -= this._terminal.cols;\n      }\n      return r;\n    }\n  };\n  var w3 = class extends b2 {\n    constructor(e) {\n      super();\n      this._terminal = e;\n      this._highlightDecorations = [];\n      this._highlightedLines = /* @__PURE__ */ new Set();\n      this._register(_3(() => this.clearHighlightDecorations()));\n    }\n    createHighlightDecorations(e, t) {\n      this.clearHighlightDecorations();\n      for (let r of e) {\n        let s4 = this._createResultDecorations(r, t, false);\n        if (s4) for (let n11 of s4) this._storeDecoration(n11, r);\n      }\n    }\n    createActiveDecoration(e, t) {\n      let r = this._createResultDecorations(e, t, true);\n      if (r) return { decorations: r, match: e, dispose() {\n        T2(r);\n      } };\n    }\n    clearHighlightDecorations() {\n      T2(this._highlightDecorations), this._highlightDecorations = [], this._highlightedLines.clear();\n    }\n    _storeDecoration(e, t) {\n      this._highlightedLines.add(e.marker.line), this._highlightDecorations.push({ decoration: e, match: t, dispose() {\n        e.dispose();\n      } });\n    }\n    _applyStyles(e, t, r) {\n      e.classList.contains("xterm-find-result-decoration") || (e.classList.add("xterm-find-result-decoration"), t && (e.style.outline = `1px solid ${t}`)), r && e.classList.add("xterm-find-active-result-decoration");\n    }\n    _createResultDecorations(e, t, r) {\n      let s4 = [], n11 = e.col, a2 = e.size, o2 = -this._terminal.buffer.active.baseY - this._terminal.buffer.active.cursorY + e.row;\n      for (; a2 > 0; ) {\n        let c2 = Math.min(this._terminal.cols - n11, a2);\n        s4.push([o2, n11, c2]), n11 = 0, a2 -= c2, o2++;\n      }\n      let l4 = [];\n      for (let c2 of s4) {\n        let p3 = this._terminal.registerMarker(c2[0]), m4 = this._terminal.registerDecoration({ marker: p3, x: c2[1], width: c2[2], layer: r ? "top" : "bottom", backgroundColor: r ? t.activeMatchBackground : t.matchBackground, overviewRulerOptions: this._highlightedLines.has(p3.line) ? void 0 : { color: r ? t.activeMatchColorOverviewRuler : t.matchOverviewRuler, position: "center" } });\n        if (m4) {\n          let g6 = [];\n          g6.push(p3), g6.push(m4.onRender((f5) => this._applyStyles(f5, r ? t.activeMatchBorder : t.matchBorder, false))), g6.push(m4.onDispose(() => T2(g6))), l4.push(m4);\n        }\n      }\n      return l4.length === 0 ? void 0 : l4;\n    }\n  };\n  var L2 = class extends b2 {\n    constructor() {\n      super(...arguments);\n      this._searchResults = [];\n      this._onDidChangeResults = this._register(new I2());\n    }\n    get onDidChangeResults() {\n      return this._onDidChangeResults.event;\n    }\n    get searchResults() {\n      return this._searchResults;\n    }\n    get selectedDecoration() {\n      return this._selectedDecoration;\n    }\n    set selectedDecoration(e) {\n      this._selectedDecoration = e;\n    }\n    updateResults(e, t) {\n      this._searchResults = e.slice(0, t);\n    }\n    clearResults() {\n      this._searchResults = [];\n    }\n    clearSelectedDecoration() {\n      this._selectedDecoration && (this._selectedDecoration.dispose(), this._selectedDecoration = void 0);\n    }\n    findResultIndex(e) {\n      for (let t = 0; t < this._searchResults.length; t++) {\n        let r = this._searchResults[t];\n        if (r.row === e.row && r.col === e.col && r.size === e.size) return t;\n      }\n      return -1;\n    }\n    fireResultsChanged(e) {\n      if (!e) return;\n      let t = -1;\n      this._selectedDecoration && (t = this.findResultIndex(this._selectedDecoration.match)), this._onDidChangeResults.fire({ resultIndex: t, resultCount: this._searchResults.length });\n    }\n    reset() {\n      this.clearSelectedDecoration(), this.clearResults();\n    }\n  };\n  var A2 = class extends b2 {\n    constructor(e) {\n      super();\n      this._highlightTimeout = this._register(new v2());\n      this._lineCache = this._register(new v2());\n      this._state = new x3();\n      this._resultTracker = this._register(new L2());\n      this._onAfterSearch = this._register(new I2());\n      this.onAfterSearch = this._onAfterSearch.event;\n      this._onBeforeSearch = this._register(new I2());\n      this.onBeforeSearch = this._onBeforeSearch.event;\n      this._highlightLimit = e?.highlightLimit ?? 1e3;\n    }\n    get onDidChangeResults() {\n      return this._resultTracker.onDidChangeResults;\n    }\n    activate(e) {\n      this._terminal = e, this._lineCache.value = new C2(e), this._engine = new R2(e, this._lineCache.value), this._decorationManager = new w3(e), this._register(this._terminal.onWriteParsed(() => this._updateMatches())), this._register(this._terminal.onResize(() => this._updateMatches())), this._register(_3(() => this.clearDecorations()));\n    }\n    _updateMatches() {\n      this._highlightTimeout.clear(), this._state.cachedSearchTerm && this._state.lastSearchOptions?.decorations && (this._highlightTimeout.value = D3(() => {\n        let e = this._state.cachedSearchTerm;\n        this._state.clearCachedTerm(), this.findPrevious(e, { ...this._state.lastSearchOptions, incremental: true }, { noScroll: true });\n      }, 200));\n    }\n    clearDecorations(e) {\n      this._resultTracker.clearSelectedDecoration(), this._decorationManager?.clearHighlightDecorations(), this._resultTracker.clearResults(), e || this._state.clearCachedTerm();\n    }\n    clearActiveDecoration() {\n      this._resultTracker.clearSelectedDecoration();\n    }\n    findNext(e, t, r) {\n      if (!this._terminal || !this._engine) throw new Error("Cannot use addon until it has been loaded");\n      this._onBeforeSearch.fire(), this._state.lastSearchOptions = t, this._state.shouldUpdateHighlighting(e, t) && this._highlightAllMatches(e, t);\n      let s4 = this._findNextAndSelect(e, t, r);\n      return this._fireResults(t), this._state.cachedSearchTerm = e, this._onAfterSearch.fire(), s4;\n    }\n    _highlightAllMatches(e, t) {\n      if (!this._terminal || !this._engine || !this._decorationManager) throw new Error("Cannot use addon until it has been loaded");\n      if (!this._state.isValidSearchTerm(e)) {\n        this.clearDecorations();\n        return;\n      }\n      this.clearDecorations(true);\n      let r = [], s4, n11 = this._engine.find(e, 0, 0, t);\n      for (; n11 && (s4?.row !== n11.row || s4?.col !== n11.col) && !(r.length >= this._highlightLimit); ) s4 = n11, r.push(s4), n11 = this._engine.find(e, s4.col + s4.term.length >= this._terminal.cols ? s4.row + 1 : s4.row, s4.col + s4.term.length >= this._terminal.cols ? 0 : s4.col + 1, t);\n      this._resultTracker.updateResults(r, this._highlightLimit), t.decorations && this._decorationManager.createHighlightDecorations(r, t.decorations);\n    }\n    _findNextAndSelect(e, t, r) {\n      if (!this._terminal || !this._engine) return false;\n      if (!this._state.isValidSearchTerm(e)) return this._terminal.clearSelection(), this.clearDecorations(), false;\n      let s4 = this._engine.findNextWithSelection(e, t, this._state.cachedSearchTerm);\n      return this._selectResult(s4, t?.decorations, r?.noScroll);\n    }\n    findPrevious(e, t, r) {\n      if (!this._terminal || !this._engine) throw new Error("Cannot use addon until it has been loaded");\n      this._onBeforeSearch.fire(), this._state.lastSearchOptions = t, this._state.shouldUpdateHighlighting(e, t) && this._highlightAllMatches(e, t);\n      let s4 = this._findPreviousAndSelect(e, t, r);\n      return this._fireResults(t), this._state.cachedSearchTerm = e, this._onAfterSearch.fire(), s4;\n    }\n    _fireResults(e) {\n      this._resultTracker.fireResultsChanged(!!e?.decorations);\n    }\n    _findPreviousAndSelect(e, t, r) {\n      if (!this._terminal || !this._engine) return false;\n      if (!this._state.isValidSearchTerm(e)) return this._terminal.clearSelection(), this.clearDecorations(), false;\n      let s4 = this._engine.findPreviousWithSelection(e, t, this._state.cachedSearchTerm);\n      return this._selectResult(s4, t?.decorations, r?.noScroll);\n    }\n    _selectResult(e, t, r) {\n      if (!this._terminal || !this._decorationManager) return false;\n      if (this._resultTracker.clearSelectedDecoration(), !e) return this._terminal.clearSelection(), false;\n      if (this._terminal.select(e.col, e.row, e.size), t) {\n        let s4 = this._decorationManager.createActiveDecoration(e, t);\n        s4 && (this._resultTracker.selectedDecoration = s4);\n      }\n      if (!r && (e.row >= this._terminal.buffer.active.viewportY + this._terminal.rows || e.row < this._terminal.buffer.active.viewportY)) {\n        let s4 = e.row - this._terminal.buffer.active.viewportY;\n        s4 -= Math.floor(this._terminal.rows / 2), this._terminal.scrollLines(s4);\n      }\n      return true;\n    }\n  };\n\n  // node_modules/@xterm/addon-unicode11/lib/addon-unicode11.mjs\n  var p2 = [[768, 879], [1155, 1158], [1160, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1539], [1552, 1557], [1611, 1630], [1648, 1648], [1750, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2305, 2306], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2388], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2672, 2673], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2883], [2893, 2893], [2902, 2902], [2946, 2946], [3008, 3008], [3021, 3021], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3393, 3395], [3405, 3405], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3769], [3771, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3984, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4146], [4150, 4151], [4153, 4153], [4184, 4185], [4448, 4607], [4959, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6157], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7616, 7626], [7678, 7679], [8203, 8207], [8234, 8238], [8288, 8291], [8298, 8303], [8400, 8431], [12330, 12335], [12441, 12442], [43014, 43014], [43019, 43019], [43045, 43046], [64286, 64286], [65024, 65039], [65056, 65059], [65279, 65279], [65529, 65531]];\n  var T3 = [[68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var A3;\n  function m2(s4, x5) {\n    let i5 = 0, e = x5.length - 1, r;\n    if (s4 < x5[0][0] || s4 > x5[e][1]) return false;\n    for (; e >= i5; ) if (r = i5 + e >> 1, s4 > x5[r][1]) i5 = r + 1;\n    else if (s4 < x5[r][0]) e = r - 1;\n    else return true;\n    return false;\n  }\n  var d2 = class {\n    constructor() {\n      this.version = "6";\n      if (!A3) {\n        A3 = new Uint8Array(65536), A3.fill(1), A3[0] = 0, A3.fill(0, 1, 32), A3.fill(0, 127, 160), A3.fill(2, 4352, 4448), A3[9001] = 2, A3[9002] = 2, A3.fill(2, 11904, 42192), A3[12351] = 1, A3.fill(2, 44032, 55204), A3.fill(2, 63744, 64256), A3.fill(2, 65040, 65050), A3.fill(2, 65072, 65136), A3.fill(2, 65280, 65377), A3.fill(2, 65504, 65511);\n        for (let x5 = 0; x5 < p2.length; ++x5) A3.fill(0, p2[x5][0], p2[x5][1] + 1);\n      }\n    }\n    wcwidth(x5) {\n      return x5 < 32 ? 0 : x5 < 127 ? 1 : x5 < 65536 ? A3[x5] : m2(x5, T3) ? 0 : x5 >= 131072 && x5 <= 196605 || x5 >= 196608 && x5 <= 262141 ? 2 : 1;\n    }\n    charProperties(x5, i5) {\n      let e = this.wcwidth(x5), r = e === 0 && i5 !== 0;\n      if (r) {\n        let t = B2.extractWidth(i5);\n        t === 0 ? r = false : t > e && (e = t);\n      }\n      return B2.createPropertyValue(0, e, r);\n    }\n  };\n  function u2(s4) {\n    return { dispose: s4 };\n  }\n  var l2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(x5) {\n      return this._isDisposed ? x5.dispose() : this._disposables.add(x5), x5;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let x5 of this._disposables) x5.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let x5 of this._disposables) x5.dispose();\n      this._disposables.clear();\n    }\n  };\n  var f3 = class {\n    constructor() {\n      this._store = new l2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(x5) {\n      return this._store.add(x5);\n    }\n  };\n  f3.None = Object.freeze({ dispose() {\n  } });\n  var E3 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (x5, i5, e) => {\n        if (this._disposed) return u2(() => {\n        });\n        let r = { fn: x5, thisArgs: i5 };\n        this._listeners.push(r);\n        let t = u2(() => {\n          let F4 = this._listeners.indexOf(r);\n          F4 !== -1 && this._listeners.splice(F4, 1);\n        });\n        return e && (Array.isArray(e) ? e.push(t) : e.add(t)), t;\n      }, this._event);\n    }\n    fire(x5) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: i5, thisArgs: e } = this._listeners[0];\n          i5.call(e, x5);\n          return;\n        }\n        default: {\n          let i5 = this._listeners.slice();\n          for (let { fn: e, thisArgs: r } of i5) e.call(r, x5);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var U3;\n  ((r) => {\n    function s4(t, F4) {\n      return t((n11) => F4.fire(n11));\n    }\n    r.forward = s4;\n    function x5(t, F4) {\n      return (n11, o2, C4) => t((c2) => n11.call(o2, F4(c2)), void 0, C4);\n    }\n    r.map = x5;\n    function i5(...t) {\n      return (F4, n11, o2) => {\n        let C4 = new l2();\n        for (let c2 of t) C4.add(c2((_5) => F4.call(n11, _5)));\n        return o2 && (Array.isArray(o2) ? o2.push(C4) : o2.add(C4)), C4;\n      };\n    }\n    r.any = i5;\n    function e(t, F4, n11) {\n      return F4(n11), t((o2) => F4(o2));\n    }\n    r.runAndSubscribe = e;\n  })(U3 ||= {});\n  var B2 = class s3 {\n    constructor() {\n      this._providers = /* @__PURE__ */ Object.create(null);\n      this._active = "";\n      this._onChange = new E3();\n      this.onChange = this._onChange.event;\n      let x5 = new d2();\n      this.register(x5), this._active = x5.version, this._activeProvider = x5;\n    }\n    static extractShouldJoin(x5) {\n      return (x5 & 1) !== 0;\n    }\n    static extractWidth(x5) {\n      return x5 >> 1 & 3;\n    }\n    static extractCharKind(x5) {\n      return x5 >> 3;\n    }\n    static createPropertyValue(x5, i5, e = false) {\n      return (x5 & 16777215) << 3 | (i5 & 3) << 1 | (e ? 1 : 0);\n    }\n    dispose() {\n      this._onChange.dispose();\n    }\n    get versions() {\n      return Object.keys(this._providers);\n    }\n    get activeVersion() {\n      return this._active;\n    }\n    set activeVersion(x5) {\n      if (!this._providers[x5]) throw new Error(`unknown Unicode version "${x5}"`);\n      this._active = x5, this._activeProvider = this._providers[x5], this._onChange.fire(x5);\n    }\n    register(x5) {\n      this._providers[x5.version] = x5;\n    }\n    wcwidth(x5) {\n      return this._activeProvider.wcwidth(x5);\n    }\n    getStringCellWidth(x5) {\n      let i5 = 0, e = 0, r = x5.length;\n      for (let t = 0; t < r; ++t) {\n        let F4 = x5.charCodeAt(t);\n        if (55296 <= F4 && F4 <= 56319) {\n          if (++t >= r) return i5 + this.wcwidth(F4);\n          let C4 = x5.charCodeAt(t);\n          56320 <= C4 && C4 <= 57343 ? F4 = (F4 - 55296) * 1024 + C4 - 56320 + 65536 : i5 += this.wcwidth(C4);\n        }\n        let n11 = this.charProperties(F4, e), o2 = s3.extractWidth(n11);\n        s3.extractShouldJoin(n11) && (o2 -= s3.extractWidth(e)), i5 += o2, e = n11;\n      }\n      return i5;\n    }\n    charProperties(x5, i5) {\n      return this._activeProvider.charProperties(x5, i5);\n    }\n  };\n  var h2 = [[768, 879], [1155, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1541], [1552, 1562], [1564, 1564], [1611, 1631], [1648, 1648], [1750, 1757], [1759, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2045, 2045], [2070, 2073], [2075, 2083], [2085, 2087], [2089, 2093], [2137, 2139], [2259, 2306], [2362, 2362], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2391], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2558, 2558], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2641, 2641], [2672, 2673], [2677, 2677], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2810, 2815], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2884], [2893, 2893], [2902, 2902], [2914, 2915], [2946, 2946], [3008, 3008], [3021, 3021], [3072, 3072], [3076, 3076], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3170, 3171], [3201, 3201], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3328, 3329], [3387, 3388], [3393, 3396], [3405, 3405], [3426, 3427], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3981, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4151], [4153, 4154], [4157, 4158], [4184, 4185], [4190, 4192], [4209, 4212], [4226, 4226], [4229, 4230], [4237, 4237], [4253, 4253], [4448, 4607], [4957, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6158], [6277, 6278], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6683, 6683], [6742, 6742], [6744, 6750], [6752, 6752], [6754, 6754], [6757, 6764], [6771, 6780], [6783, 6783], [6832, 6846], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7040, 7041], [7074, 7077], [7080, 7081], [7083, 7085], [7142, 7142], [7144, 7145], [7149, 7149], [7151, 7153], [7212, 7219], [7222, 7223], [7376, 7378], [7380, 7392], [7394, 7400], [7405, 7405], [7412, 7412], [7416, 7417], [7616, 7673], [7675, 7679], [8203, 8207], [8234, 8238], [8288, 8292], [8294, 8303], [8400, 8432], [11503, 11505], [11647, 11647], [11744, 11775], [12330, 12333], [12441, 12442], [42607, 42610], [42612, 42621], [42654, 42655], [42736, 42737], [43010, 43010], [43014, 43014], [43019, 43019], [43045, 43046], [43204, 43205], [43232, 43249], [43263, 43263], [43302, 43309], [43335, 43345], [43392, 43394], [43443, 43443], [43446, 43449], [43452, 43453], [43493, 43493], [43561, 43566], [43569, 43570], [43573, 43574], [43587, 43587], [43596, 43596], [43644, 43644], [43696, 43696], [43698, 43700], [43703, 43704], [43710, 43711], [43713, 43713], [43756, 43757], [43766, 43766], [44005, 44005], [44008, 44008], [44013, 44013], [64286, 64286], [65024, 65039], [65056, 65071], [65279, 65279], [65529, 65531]];\n  var y2 = [[66045, 66045], [66272, 66272], [66422, 66426], [68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [68325, 68326], [68900, 68903], [69446, 69456], [69633, 69633], [69688, 69702], [69759, 69761], [69811, 69814], [69817, 69818], [69821, 69821], [69837, 69837], [69888, 69890], [69927, 69931], [69933, 69940], [70003, 70003], [70016, 70017], [70070, 70078], [70089, 70092], [70191, 70193], [70196, 70196], [70198, 70199], [70206, 70206], [70367, 70367], [70371, 70378], [70400, 70401], [70459, 70460], [70464, 70464], [70502, 70508], [70512, 70516], [70712, 70719], [70722, 70724], [70726, 70726], [70750, 70750], [70835, 70840], [70842, 70842], [70847, 70848], [70850, 70851], [71090, 71093], [71100, 71101], [71103, 71104], [71132, 71133], [71219, 71226], [71229, 71229], [71231, 71232], [71339, 71339], [71341, 71341], [71344, 71349], [71351, 71351], [71453, 71455], [71458, 71461], [71463, 71467], [71727, 71735], [71737, 71738], [72148, 72151], [72154, 72155], [72160, 72160], [72193, 72202], [72243, 72248], [72251, 72254], [72263, 72263], [72273, 72278], [72281, 72283], [72330, 72342], [72344, 72345], [72752, 72758], [72760, 72765], [72767, 72767], [72850, 72871], [72874, 72880], [72882, 72883], [72885, 72886], [73009, 73014], [73018, 73018], [73020, 73021], [73023, 73029], [73031, 73031], [73104, 73105], [73109, 73109], [73111, 73111], [73459, 73460], [78896, 78904], [92912, 92916], [92976, 92982], [94031, 94031], [94095, 94098], [113821, 113822], [113824, 113827], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [121344, 121398], [121403, 121452], [121461, 121461], [121476, 121476], [121499, 121503], [121505, 121519], [122880, 122886], [122888, 122904], [122907, 122913], [122915, 122916], [122918, 122922], [123184, 123190], [123628, 123631], [125136, 125142], [125252, 125258], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var b3 = [[4352, 4447], [8986, 8987], [9001, 9002], [9193, 9196], [9200, 9200], [9203, 9203], [9725, 9726], [9748, 9749], [9800, 9811], [9855, 9855], [9875, 9875], [9889, 9889], [9898, 9899], [9917, 9918], [9924, 9925], [9934, 9934], [9940, 9940], [9962, 9962], [9970, 9971], [9973, 9973], [9978, 9978], [9981, 9981], [9989, 9989], [9994, 9995], [10024, 10024], [10060, 10060], [10062, 10062], [10067, 10069], [10071, 10071], [10133, 10135], [10160, 10160], [10175, 10175], [11035, 11036], [11088, 11088], [11093, 11093], [11904, 11929], [11931, 12019], [12032, 12245], [12272, 12283], [12288, 12329], [12334, 12350], [12353, 12438], [12443, 12543], [12549, 12591], [12593, 12686], [12688, 12730], [12736, 12771], [12784, 12830], [12832, 12871], [12880, 19903], [19968, 42124], [42128, 42182], [43360, 43388], [44032, 55203], [63744, 64255], [65040, 65049], [65072, 65106], [65108, 65126], [65128, 65131], [65281, 65376], [65504, 65510]];\n  var P2 = [[94176, 94179], [94208, 100343], [100352, 101106], [110592, 110878], [110928, 110930], [110948, 110951], [110960, 111355], [126980, 126980], [127183, 127183], [127374, 127374], [127377, 127386], [127488, 127490], [127504, 127547], [127552, 127560], [127568, 127569], [127584, 127589], [127744, 127776], [127789, 127797], [127799, 127868], [127870, 127891], [127904, 127946], [127951, 127955], [127968, 127984], [127988, 127988], [127992, 128062], [128064, 128064], [128066, 128252], [128255, 128317], [128331, 128334], [128336, 128359], [128378, 128378], [128405, 128406], [128420, 128420], [128507, 128591], [128640, 128709], [128716, 128716], [128720, 128722], [128725, 128725], [128747, 128748], [128756, 128762], [128992, 129003], [129293, 129393], [129395, 129398], [129402, 129442], [129445, 129450], [129454, 129482], [129485, 129535], [129648, 129651], [129656, 129658], [129664, 129666], [129680, 129685], [131072, 196605], [196608, 262141]];\n  var D4;\n  function v3(s4, x5) {\n    let i5 = 0, e = x5.length - 1, r;\n    if (s4 < x5[0][0] || s4 > x5[e][1]) return false;\n    for (; e >= i5; ) if (r = i5 + e >> 1, s4 > x5[r][1]) i5 = r + 1;\n    else if (s4 < x5[r][0]) e = r - 1;\n    else return true;\n    return false;\n  }\n  var a = class {\n    constructor() {\n      this.version = "11";\n      if (!D4) {\n        D4 = new Uint8Array(65536), D4.fill(1), D4[0] = 0, D4.fill(0, 1, 32), D4.fill(0, 127, 160);\n        for (let x5 = 0; x5 < h2.length; ++x5) D4.fill(0, h2[x5][0], h2[x5][1] + 1);\n        for (let x5 = 0; x5 < b3.length; ++x5) D4.fill(2, b3[x5][0], b3[x5][1] + 1);\n      }\n    }\n    wcwidth(x5) {\n      return x5 < 32 ? 0 : x5 < 127 ? 1 : x5 < 65536 ? D4[x5] : v3(x5, y2) ? 0 : v3(x5, P2) ? 2 : 1;\n    }\n    charProperties(x5, i5) {\n      let e = this.wcwidth(x5), r = e === 0 && i5 !== 0;\n      if (r) {\n        let t = B2.extractWidth(i5);\n        t === 0 ? r = false : t > e && (e = t);\n      }\n      return B2.createPropertyValue(0, e, r);\n    }\n  };\n  var I3 = class {\n    activate(x5) {\n      x5.unicode.register(new a());\n    }\n    dispose() {\n    }\n  };\n\n  // node_modules/@xterm/addon-web-links/lib/addon-web-links.mjs\n  var v4 = class {\n    constructor(e, t, n11, o2 = {}) {\n      this._terminal = e;\n      this._regex = t;\n      this._handler = n11;\n      this._options = o2;\n    }\n    provideLinks(e, t) {\n      let n11 = g3.computeLink(e, this._regex, this._terminal, this._handler);\n      t(this._addCallbacks(n11));\n    }\n    _addCallbacks(e) {\n      return e.map((t) => (t.leave = this._options.leave, t.hover = (n11, o2) => {\n        if (this._options.hover) {\n          let { range: p3 } = t;\n          this._options.hover(n11, o2, p3);\n        }\n      }, t));\n    }\n  };\n  function k2(l4) {\n    try {\n      let e = new URL(l4), t = e.password && e.username ? `${e.protocol}//${e.username}:${e.password}@${e.host}` : e.username ? `${e.protocol}//${e.username}@${e.host}` : `${e.protocol}//${e.host}`;\n      return l4.toLocaleLowerCase().startsWith(t.toLocaleLowerCase());\n    } catch {\n      return false;\n    }\n  }\n  var g3 = class l3 {\n    static computeLink(e, t, n11, o2) {\n      let p3 = new RegExp(t.source, (t.flags || "") + "g"), [i5, r] = l3._getWindowedLineStrings(e - 1, n11), s4 = i5.join(""), a2, d3 = [];\n      for (; a2 = p3.exec(s4); ) {\n        let u3 = a2[0];\n        if (!k2(u3)) continue;\n        let [c2, h3] = l3._mapStrIdx(n11, r, 0, a2.index), [m4, f5] = l3._mapStrIdx(n11, c2, h3, u3.length);\n        if (c2 === -1 || h3 === -1 || m4 === -1 || f5 === -1) continue;\n        let b4 = { start: { x: h3 + 1, y: c2 + 1 }, end: { x: f5, y: m4 + 1 } };\n        d3.push({ range: b4, text: u3, activate: o2 });\n      }\n      return d3;\n    }\n    static _getWindowedLineStrings(e, t) {\n      let n11, o2 = e, p3 = e, i5 = 0, r = "", s4 = [];\n      if (n11 = t.buffer.active.getLine(e)) {\n        let a2 = n11.translateToString(true);\n        if (n11.isWrapped && a2[0] !== " ") {\n          for (i5 = 0; (n11 = t.buffer.active.getLine(--o2)) && i5 < 2048 && (r = n11.translateToString(true), i5 += r.length, s4.push(r), !(!n11.isWrapped || r.indexOf(" ") !== -1)); ) ;\n          s4.reverse();\n        }\n        for (s4.push(a2), i5 = 0; (n11 = t.buffer.active.getLine(++p3)) && n11.isWrapped && i5 < 2048 && (r = n11.translateToString(true), i5 += r.length, s4.push(r), r.indexOf(" ") === -1); ) ;\n      }\n      return [s4, o2];\n    }\n    static _mapStrIdx(e, t, n11, o2) {\n      let p3 = e.buffer.active, i5 = p3.getNullCell(), r = n11;\n      for (; o2; ) {\n        let s4 = p3.getLine(t);\n        if (!s4) return [-1, -1];\n        for (let a2 = r; a2 < s4.length; ++a2) {\n          s4.getCell(a2, i5);\n          let d3 = i5.getChars();\n          if (i5.getWidth() && (o2 -= d3.length || 1, a2 === s4.length - 1 && d3 === "")) {\n            let c2 = p3.getLine(t + 1);\n            c2 && c2.isWrapped && (c2.getCell(0, i5), i5.getWidth() === 2 && (o2 += 1));\n          }\n          if (o2 < 0) return [t, a2];\n        }\n        t++, r = 0;\n      }\n      return [t, r];\n    }\n  };\n  var _4 = /(https?|HTTPS?):[/]{2}[^\\s"\'!*(){}|\\\\\\^<>`]*[^\\s"\':,.!?{}|\\\\\\^~\\[\\]`()<>]/;\n  function w4(l4, e) {\n    let t = window.open();\n    if (t) {\n      try {\n        t.opener = null;\n      } catch {\n      }\n      t.location.href = e;\n    } else console.warn("Opening link blocked as opener could not be cleared");\n  }\n  var L3 = class {\n    constructor(e = w4, t = {}) {\n      this._handler = e;\n      this._options = t;\n    }\n    activate(e) {\n      this._terminal = e;\n      let t = this._options, n11 = t.urlRegex ?? _4;\n      this._linkProvider = this._terminal.registerLinkProvider(new v4(this._terminal, n11, this._handler, t));\n    }\n    dispose() {\n      this._linkProvider?.dispose();\n    }\n  };\n\n  // node_modules/@xterm/addon-webgl/lib/addon-webgl.mjs\n  function g4(i5) {\n    return { dispose: i5 };\n  }\n  function St(i5) {\n    if (!i5) return i5;\n    if (Array.isArray(i5)) {\n      for (let e of i5) e.dispose();\n      return [];\n    }\n    return i5.dispose(), i5;\n  }\n  function ke2(...i5) {\n    return g4(() => St(i5));\n  }\n  var B0 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(e) {\n      return this._isDisposed ? e.dispose() : this._disposables.add(e), e;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let e of this._disposables) e.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.clear();\n    }\n  };\n  var W3 = class {\n    constructor() {\n      this._store = new B0();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(e) {\n      return this._store.add(e);\n    }\n  };\n  W3.None = Object.freeze({ dispose() {\n  } });\n  var C0 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(e) {\n      this._isDisposed || e === this._value || (this._value?.dispose(), this._value = e);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var Ze2 = !!(typeof process < "u" && "title" in process && (typeof navigator > "u" || navigator.userAgent.startsWith("Node.js/")));\n  var O0 = Ze2 ? "node" : navigator.userAgent;\n  var me2 = Ze2 ? "node" : navigator.platform;\n  var Ue2 = O0.includes("Firefox");\n  var L1 = O0.includes("Chrome");\n  var We2 = O0.includes("Edge");\n  var fe = /^((?!chrome|android).)*safari/i.test(O0);\n  function Ve() {\n    if (!fe) return 0;\n    let i5 = O0.match(/Version\\/(\\d+)/);\n    return i5 === null || i5.length < 2 ? 0 : parseInt(i5[1]);\n  }\n  var h1 = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"].includes(me2);\n  var d1 = ["Windows", "Win16", "Win32", "WinCE"].includes(me2);\n  var _1 = me2.indexOf("Linux") >= 0;\n  var c1 = /\\bCrOS\\b/.test(O0);\n  var P3 = 0;\n  var B3 = 0;\n  var w5 = 0;\n  var x4 = 0;\n  var G3 = { css: "#00000000", rgba: 0 };\n  var Z3;\n  ((r) => {\n    function i5(n11, a2, s4, o2) {\n      return o2 !== void 0 ? `#${E0(n11)}${E0(a2)}${E0(s4)}${E0(o2)}` : `#${E0(n11)}${E0(a2)}${E0(s4)}`;\n    }\n    r.toCss = i5;\n    function e(n11, a2, s4, o2 = 255) {\n      return (n11 << 24 | a2 << 16 | s4 << 8 | o2) >>> 0;\n    }\n    r.toRgba = e;\n    function t(n11, a2, s4, o2) {\n      return { css: r.toCss(n11, a2, s4, o2), rgba: r.toRgba(n11, a2, s4, o2) };\n    }\n    r.toColor = t;\n  })(Z3 ||= {});\n  var I0;\n  ((o2) => {\n    function i5(l4, T4) {\n      if (x4 = (T4.rgba & 255) / 255, x4 === 1) return { css: T4.css, rgba: T4.rgba };\n      let h3 = T4.rgba >> 24 & 255, d3 = T4.rgba >> 16 & 255, _5 = T4.rgba >> 8 & 255, c2 = l4.rgba >> 24 & 255, u3 = l4.rgba >> 16 & 255, p3 = l4.rgba >> 8 & 255;\n      P3 = c2 + Math.round((h3 - c2) * x4), B3 = u3 + Math.round((d3 - u3) * x4), w5 = p3 + Math.round((_5 - p3) * x4);\n      let C4 = Z3.toCss(P3, B3, w5), Q3 = Z3.toRgba(P3, B3, w5);\n      return { css: C4, rgba: Q3 };\n    }\n    o2.blend = i5;\n    function e(l4) {\n      return (l4.rgba & 255) === 255;\n    }\n    o2.isOpaque = e;\n    function t(l4, T4, h3) {\n      let d3 = h0.ensureContrastRatio(l4.rgba, T4.rgba, h3);\n      if (d3) return Z3.toColor(d3 >> 24 & 255, d3 >> 16 & 255, d3 >> 8 & 255);\n    }\n    o2.ensureContrastRatio = t;\n    function r(l4) {\n      let T4 = (l4.rgba | 255) >>> 0;\n      return [P3, B3, w5] = h0.toChannels(T4), { css: Z3.toCss(P3, B3, w5), rgba: T4 };\n    }\n    o2.opaque = r;\n    function n11(l4, T4) {\n      return x4 = Math.round(T4 * 255), [P3, B3, w5] = h0.toChannels(l4.rgba), { css: Z3.toCss(P3, B3, w5, x4), rgba: Z3.toRgba(P3, B3, w5, x4) };\n    }\n    o2.opacity = n11;\n    function a2(l4, T4) {\n      return x4 = l4.rgba & 255, n11(l4, x4 * T4 / 255);\n    }\n    o2.multiplyOpacity = a2;\n    function s4(l4) {\n      return [l4.rgba >> 24 & 255, l4.rgba >> 16 & 255, l4.rgba >> 8 & 255];\n    }\n    o2.toColorRGB = s4;\n  })(I0 ||= {});\n  var Rt;\n  ((r) => {\n    let i5, e;\n    try {\n      let n11 = document.createElement("canvas");\n      n11.width = 1, n11.height = 1;\n      let a2 = n11.getContext("2d", { willReadFrequently: true });\n      a2 && (i5 = a2, i5.globalCompositeOperation = "copy", e = i5.createLinearGradient(0, 0, 1, 1));\n    } catch {\n    }\n    function t(n11) {\n      if (n11.match(/#[\\da-f]{3,8}/i)) switch (n11.length) {\n        case 4:\n          return P3 = parseInt(n11.slice(1, 2).repeat(2), 16), B3 = parseInt(n11.slice(2, 3).repeat(2), 16), w5 = parseInt(n11.slice(3, 4).repeat(2), 16), Z3.toColor(P3, B3, w5);\n        case 5:\n          return P3 = parseInt(n11.slice(1, 2).repeat(2), 16), B3 = parseInt(n11.slice(2, 3).repeat(2), 16), w5 = parseInt(n11.slice(3, 4).repeat(2), 16), x4 = parseInt(n11.slice(4, 5).repeat(2), 16), Z3.toColor(P3, B3, w5, x4);\n        case 7:\n          return { css: n11, rgba: (parseInt(n11.slice(1), 16) << 8 | 255) >>> 0 };\n        case 9:\n          return { css: n11, rgba: parseInt(n11.slice(1), 16) >>> 0 };\n      }\n      let a2 = n11.match(/rgba?\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*(,\\s*(0|1|\\d?\\.(\\d+))\\s*)?\\)/);\n      if (a2) return P3 = parseInt(a2[1]), B3 = parseInt(a2[2]), w5 = parseInt(a2[3]), x4 = Math.round((a2[5] === void 0 ? 1 : parseFloat(a2[5])) * 255), Z3.toColor(P3, B3, w5, x4);\n      if (n11 === "transparent") return { css: "transparent", rgba: 0 };\n      if (!i5 || !e) throw new Error("css.toColor: Unsupported css format");\n      if (i5.fillStyle = e, i5.fillStyle = n11, typeof i5.fillStyle != "string") throw new Error("css.toColor: Unsupported css format");\n      if (i5.fillRect(0, 0, 1, 1), [P3, B3, w5, x4] = i5.getImageData(0, 0, 1, 1).data, x4 !== 255) throw new Error("css.toColor: Unsupported css format");\n      return { rgba: Z3.toRgba(P3, B3, w5, x4), css: n11 };\n    }\n    r.toColor = t;\n  })(Rt ||= {});\n  var V3;\n  ((t) => {\n    function i5(r) {\n      return e(r >> 16 & 255, r >> 8 & 255, r & 255);\n    }\n    t.relativeLuminance = i5;\n    function e(r, n11, a2) {\n      let s4 = r / 255, o2 = n11 / 255, l4 = a2 / 255, T4 = s4 <= 0.03928 ? s4 / 12.92 : Math.pow((s4 + 0.055) / 1.055, 2.4), h3 = o2 <= 0.03928 ? o2 / 12.92 : Math.pow((o2 + 0.055) / 1.055, 2.4), d3 = l4 <= 0.03928 ? l4 / 12.92 : Math.pow((l4 + 0.055) / 1.055, 2.4);\n      return T4 * 0.2126 + h3 * 0.7152 + d3 * 0.0722;\n    }\n    t.relativeLuminance2 = e;\n  })(V3 ||= {});\n  var h0;\n  ((a2) => {\n    function i5(s4, o2) {\n      if (x4 = (o2 & 255) / 255, x4 === 1) return o2;\n      let l4 = o2 >> 24 & 255, T4 = o2 >> 16 & 255, h3 = o2 >> 8 & 255, d3 = s4 >> 24 & 255, _5 = s4 >> 16 & 255, c2 = s4 >> 8 & 255;\n      return P3 = d3 + Math.round((l4 - d3) * x4), B3 = _5 + Math.round((T4 - _5) * x4), w5 = c2 + Math.round((h3 - c2) * x4), Z3.toRgba(P3, B3, w5);\n    }\n    a2.blend = i5;\n    function e(s4, o2, l4) {\n      let T4 = V3.relativeLuminance(s4 >> 8), h3 = V3.relativeLuminance(o2 >> 8);\n      if (L0(T4, h3) < l4) {\n        if (h3 < T4) {\n          let u3 = t(s4, o2, l4), p3 = L0(T4, V3.relativeLuminance(u3 >> 8));\n          if (p3 < l4) {\n            let C4 = r(s4, o2, l4), Q3 = L0(T4, V3.relativeLuminance(C4 >> 8));\n            return p3 > Q3 ? u3 : C4;\n          }\n          return u3;\n        }\n        let _5 = r(s4, o2, l4), c2 = L0(T4, V3.relativeLuminance(_5 >> 8));\n        if (c2 < l4) {\n          let u3 = t(s4, o2, l4), p3 = L0(T4, V3.relativeLuminance(u3 >> 8));\n          return c2 > p3 ? _5 : u3;\n        }\n        return _5;\n      }\n    }\n    a2.ensureContrastRatio = e;\n    function t(s4, o2, l4) {\n      let T4 = s4 >> 24 & 255, h3 = s4 >> 16 & 255, d3 = s4 >> 8 & 255, _5 = o2 >> 24 & 255, c2 = o2 >> 16 & 255, u3 = o2 >> 8 & 255, p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      for (; p3 < l4 && (_5 > 0 || c2 > 0 || u3 > 0); ) _5 -= Math.max(0, Math.ceil(_5 * 0.1)), c2 -= Math.max(0, Math.ceil(c2 * 0.1)), u3 -= Math.max(0, Math.ceil(u3 * 0.1)), p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      return (_5 << 24 | c2 << 16 | u3 << 8 | 255) >>> 0;\n    }\n    a2.reduceLuminance = t;\n    function r(s4, o2, l4) {\n      let T4 = s4 >> 24 & 255, h3 = s4 >> 16 & 255, d3 = s4 >> 8 & 255, _5 = o2 >> 24 & 255, c2 = o2 >> 16 & 255, u3 = o2 >> 8 & 255, p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      for (; p3 < l4 && (_5 < 255 || c2 < 255 || u3 < 255); ) _5 = Math.min(255, _5 + Math.ceil((255 - _5) * 0.1)), c2 = Math.min(255, c2 + Math.ceil((255 - c2) * 0.1)), u3 = Math.min(255, u3 + Math.ceil((255 - u3) * 0.1)), p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      return (_5 << 24 | c2 << 16 | u3 << 8 | 255) >>> 0;\n    }\n    a2.increaseLuminance = r;\n    function n11(s4) {\n      return [s4 >> 24 & 255, s4 >> 16 & 255, s4 >> 8 & 255, s4 & 255];\n    }\n    a2.toChannels = n11;\n  })(h0 ||= {});\n  function E0(i5) {\n    let e = i5.toString(16);\n    return e.length < 2 ? "0" + e : e;\n  }\n  function L0(i5, e) {\n    return i5 < e ? (e + 0.05) / (i5 + 0.05) : (i5 + 0.05) / (e + 0.05);\n  }\n  function y3(i5) {\n    if (!i5) throw new Error("value must not be falsy");\n    return i5;\n  }\n  function K0(i5) {\n    return 57508 <= i5 && i5 <= 57558;\n  }\n  function $e(i5) {\n    return 57520 <= i5 && i5 <= 57527;\n  }\n  function xt2(i5) {\n    return 57344 <= i5 && i5 <= 63743;\n  }\n  function Dt(i5) {\n    return 9472 <= i5 && i5 <= 9631;\n  }\n  function Nt2(i5) {\n    return i5 >= 128512 && i5 <= 128591 || i5 >= 127744 && i5 <= 128511 || i5 >= 128640 && i5 <= 128767 || i5 >= 9728 && i5 <= 9983 || i5 >= 9984 && i5 <= 10175 || i5 >= 65024 && i5 <= 65039 || i5 >= 129280 && i5 <= 129535 || i5 >= 127462 && i5 <= 127487;\n  }\n  function Ge2(i5, e, t, r) {\n    return e === 1 && t > Math.ceil(r * 1.5) && i5 !== void 0 && i5 > 255 && !Nt2(i5) && !K0(i5) && !xt2(i5);\n  }\n  function z0(i5) {\n    return K0(i5) || Dt(i5);\n  }\n  function Ke2() {\n    return { css: { canvas: G0(), cell: G0() }, device: { canvas: G0(), cell: G0(), char: { width: 0, height: 0, left: 0, top: 0 } } };\n  }\n  function G0() {\n    return { width: 0, height: 0 };\n  }\n  function ze2(i5, e, t = 0) {\n    return (i5 - (Math.round(e) * 2 - t)) % (Math.round(e) * 2);\n  }\n  var L4;\n  ((C4) => (C4.LINE_H = Object.freeze({ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }), C4.LINE_V = Object.freeze({ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }), C4.FADE_RIGHT = Object.freeze({ type: 2, data: "M0,.5 L.28,.5 M.32,.5 L.52,.5 M.60,.5 L.72,.5 M.84,.5 L.90,.5", strokeWidth: 1 }), C4.FADE_LEFT = Object.freeze({ type: 2, data: "M.10,.5 L.16,.5 M.28,.5 L.40,.5 M.48,.5 L.68,.5 M.72,.5 L1,.5", strokeWidth: 1 }), C4.FADE_DOWN = Object.freeze({ type: 2, data: "M.5,0 L.5,.28 M.5,.32 L.5,.52 M.5,.60 L.5,.72 M.5,.84 L.5,.90", strokeWidth: 1 }), C4.FADE_UP = Object.freeze({ type: 2, data: "M.5,.10 L.5,.16 M.5,.28 L.5,.40 M.5,.48 L.5,.68 M.5,.72 L.5,1", strokeWidth: 1 }), C4.CURVE_DOWN_RIGHT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,1 L.5,${0.5 + m4 / 0.15 * 0.5} C.5,${0.5 + m4 / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }), C4.CURVE_DOWN_LEFT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,1 L.5,${0.5 + m4 / 0.15 * 0.5} C.5,${0.5 + m4 / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }), C4.CURVE_UP_RIGHT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,0 L.5,${0.5 - m4 / 0.15 * 0.5} C.5,${0.5 - m4 / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }), C4.CURVE_UP_LEFT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,0 L.5,${0.5 - m4 / 0.15 * 0.5} C.5,${0.5 - m4 / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }), C4.NODE_FILL = Object.freeze({ type: 3, data: "M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5" }), C4.NODE_STROKE = Object.freeze({ type: 3, data: "M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5", strokeWidth: 1 }), C4.NODE_LINE_RIGHT = Object.freeze({ type: 3, data: "M1,.5 L.85,.5", strokeWidth: 1 }), C4.NODE_LINE_LEFT = Object.freeze({ type: 3, data: "M0,.5 L.15,.5", strokeWidth: 1 }), C4.NODE_LINE_DOWN = Object.freeze({ type: 3, data: "M.5,1 L.5,.7", strokeWidth: 1 }), C4.NODE_LINE_UP = Object.freeze({ type: 3, data: "M.5,0 L.5,.3", strokeWidth: 1 })))(L4 ||= {});\n  var Xe2 = { "\\u2500": { type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, "\\u2501": { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }, "\\u2502": { type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, "\\u2503": { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }, "\\u2504": { type: 2, data: "M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5", strokeWidth: 1 }, "\\u2505": { type: 2, data: "M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5", strokeWidth: 3 }, "\\u2506": { type: 2, data: "M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333", strokeWidth: 1 }, "\\u2507": { type: 2, data: "M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333", strokeWidth: 3 }, "\\u2508": { type: 2, data: "M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5", strokeWidth: 1 }, "\\u2509": { type: 2, data: "M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5", strokeWidth: 3 }, "\\u250A": { type: 2, data: "M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95", strokeWidth: 1 }, "\\u250B": { type: 2, data: "M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95", strokeWidth: 3 }, "\\u250C": { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, "\\u250D": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u250E": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u250F": { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }, "\\u2510": { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, "\\u2511": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2512": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2513": { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }, "\\u2514": { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, "\\u2515": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u2516": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2517": { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }, "\\u2518": { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, "\\u2519": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u251A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u251B": { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }, "\\u251C": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 1 }, "\\u251D": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u251E": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u251F": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2520": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2521": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2522": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2523": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 3 }, "\\u2524": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 1 }, "\\u2525": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2526": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2527": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2528": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2529": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u252A": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u252B": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 3 }, "\\u252C": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 1 }, "\\u252D": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u252E": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u252F": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2530": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2531": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u2532": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2533": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 3 }, "\\u2534": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,0", strokeWidth: 1 }, "\\u2535": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2536": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u2537": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2538": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2539": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u253A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u253B": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,0", strokeWidth: 3 }, "\\u253C": { type: 2, data: "M0,.5 L1,.5 M.5,0 L.5,1", strokeWidth: 1 }, "\\u253D": [{ type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u253E": [{ type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u253F": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2540": [{ type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2541": [{ type: 2, data: "M.5,.5 L.5,0 M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2542": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2543": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u2544": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2545": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u2546": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2547": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0 M0,.5 L1,.5", strokeWidth: 3 }], "\\u2548": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2549": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 3 }], "\\u254A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 3 }], "\\u254B": { type: 2, data: "M0,.5 L1,.5 M.5,0 L.5,1", strokeWidth: 3 }, "\\u254C": { type: 2, data: "M.1,.5 L.4,.5 M.6,.5 L.9,.5", strokeWidth: 1 }, "\\u254D": { type: 2, data: "M.1,.5 L.4,.5 M.6,.5 L.9,.5", strokeWidth: 3 }, "\\u254E": { type: 2, data: "M.5,.1 L.5,.4 M.5,.6 L.5,.9", strokeWidth: 1 }, "\\u254F": { type: 2, data: "M.5,.1 L.5,.4 M.5,.6 L.5,.9", strokeWidth: 3 }, "\\u2550": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2551": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2552": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 - e} L1,${0.5 - e} M.5,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2553": { type: 2, data: (i5, e) => `M${0.5 - i5},1 L${0.5 - i5},.5 L1,.5 M${0.5 + i5},.5 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2554": { type: 2, data: (i5, e) => `M1,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2555": { type: 2, data: (i5, e) => `M0,${0.5 - e} L.5,${0.5 - e} L.5,1 M0,${0.5 + e} L.5,${0.5 + e}`, strokeWidth: 1 }, "\\u2556": { type: 2, data: (i5, e) => `M${0.5 + i5},1 L${0.5 + i5},.5 L0,.5 M${0.5 - i5},.5 L${0.5 - i5},1`, strokeWidth: 1 }, "\\u2557": { type: 2, data: (i5, e) => `M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M0,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2558": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 + e} L1,${0.5 + e} M.5,${0.5 - e} L1,${0.5 - e}`, strokeWidth: 1 }, "\\u2559": { type: 2, data: (i5, e) => `M1,.5 L${0.5 - i5},.5 L${0.5 - i5},0 M${0.5 + i5},.5 L${0.5 + i5},0`, strokeWidth: 1 }, "\\u255A": { type: 2, data: (i5, e) => `M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0 M1,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},0`, strokeWidth: 1 }, "\\u255B": { type: 2, data: (i5, e) => `M0,${0.5 + e} L.5,${0.5 + e} L.5,0 M0,${0.5 - e} L.5,${0.5 - e}`, strokeWidth: 1 }, "\\u255C": { type: 2, data: (i5, e) => `M0,.5 L${0.5 + i5},.5 L${0.5 + i5},0 M${0.5 - i5},.5 L${0.5 - i5},0`, strokeWidth: 1 }, "\\u255D": { type: 2, data: (i5, e) => `M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M0,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u255E": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M.5,${0.5 - e} L1,${0.5 - e} M.5,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u255F": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1 M${0.5 + i5},.5 L1,.5`, strokeWidth: 1 }, "\\u2560": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u2561": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M0,${0.5 - e} L.5,${0.5 - e} M0,${0.5 + e} L.5,${0.5 + e}`, strokeWidth: 1 }, "\\u2562": { type: 2, data: (i5, e) => `M0,.5 L${0.5 - i5},.5 M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2563": { type: 2, data: (i5, e) => `M${0.5 + i5},0 L${0.5 + i5},1 M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0`, strokeWidth: 1 }, "\\u2564": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e} M.5,${0.5 + e} L.5,1`, strokeWidth: 1 }, "\\u2565": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},.5 L${0.5 - i5},1 M${0.5 + i5},.5 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2566": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2567": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e} M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2568": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},.5 L${0.5 - i5},0 M${0.5 + i5},.5 L${0.5 + i5},0`, strokeWidth: 1 }, "\\u2569": { type: 2, data: (i5, e) => `M0,${0.5 + e} L1,${0.5 + e} M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u256A": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u256B": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u256C": { type: 2, data: (i5, e) => `M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1 M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u256D": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 + e / 0.15 * 0.5} C.5,${0.5 + e / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }, "\\u256E": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 + e / 0.15 * 0.5} C.5,${0.5 + e / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }, "\\u256F": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e / 0.15 * 0.5} C.5,${0.5 - e / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }, "\\u2570": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e / 0.15 * 0.5} C.5,${0.5 - e / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }, "\\u2571": { type: 2, data: "M1,0 L0,1", strokeWidth: 1 }, "\\u2572": { type: 2, data: "M0,0 L1,1", strokeWidth: 1 }, "\\u2573": { type: 2, data: "M1,0 L0,1 M0,0 L1,1", strokeWidth: 1 }, "\\u2574": { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, "\\u2575": { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, "\\u2576": { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, "\\u2577": { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, "\\u2578": { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }, "\\u2579": { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }, "\\u257A": { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }, "\\u257B": { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }, "\\u257C": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u257D": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u257E": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u257F": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2580": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }] }, "\\u2581": { type: 0, data: [{ x: 0, y: 7, w: 8, h: 1 }] }, "\\u2582": { type: 0, data: [{ x: 0, y: 6, w: 8, h: 2 }] }, "\\u2583": { type: 0, data: [{ x: 0, y: 5, w: 8, h: 3 }] }, "\\u2584": { type: 0, data: [{ x: 0, y: 4, w: 8, h: 4 }] }, "\\u2585": { type: 0, data: [{ x: 0, y: 3, w: 8, h: 5 }] }, "\\u2586": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 6 }] }, "\\u2587": { type: 0, data: [{ x: 0, y: 1, w: 8, h: 7 }] }, "\\u2588": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 8 }] }, "\\u2589": { type: 0, data: [{ x: 0, y: 0, w: 7, h: 8 }] }, "\\u258A": { type: 0, data: [{ x: 0, y: 0, w: 6, h: 8 }] }, "\\u258B": { type: 0, data: [{ x: 0, y: 0, w: 5, h: 8 }] }, "\\u258C": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }] }, "\\u258D": { type: 0, data: [{ x: 0, y: 0, w: 3, h: 8 }] }, "\\u258E": { type: 0, data: [{ x: 0, y: 0, w: 2, h: 8 }] }, "\\u258F": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }] }, "\\u2590": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }] }, "\\u2591": { type: 1, data: [[1, 0], [0, 0]] }, "\\u2592": { type: 1, data: [[1, 0], [0, 1]] }, "\\u2593": { type: 1, data: [[1, 1], [1, 0]] }, "\\u2594": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }] }, "\\u2595": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }] }, "\\u2596": { type: 0, data: [{ x: 0, y: 4, w: 4, h: 4 }] }, "\\u2597": { type: 0, data: [{ x: 4, y: 4, w: 4, h: 4 }] }, "\\u2598": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 4 }] }, "\\u2599": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }, { x: 0, y: 4, w: 8, h: 4 }] }, "\\u259A": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 4 }, { x: 4, y: 4, w: 4, h: 4 }] }, "\\u259B": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }, { x: 4, y: 0, w: 4, h: 4 }] }, "\\u259C": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }, { x: 4, y: 0, w: 4, h: 8 }] }, "\\u259D": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 4 }] }, "\\u259E": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 4 }, { x: 0, y: 4, w: 4, h: 4 }] }, "\\u259F": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }, { x: 0, y: 4, w: 8, h: 4 }] }, "\\uE0A0": { type: 5, data: { d: "M.3,1 L.03,1 L.03,.88 C.03,.82,.06,.78,.11,.73 C.15,.7,.2,.68,.28,.65 L.43,.6 C.49,.58,.53,.56,.56,.53 C.59,.5,.6,.47,.6,.43 L.6,.27 L.4,.27 L.69,.1 L.98,.27 L.78,.27 L.78,.46 C.78,.52,.76,.56,.72,.61 C.68,.66,.63,.67,.56,.7 L.48,.72 C.42,.74,.38,.76,.35,.78 C.32,.8,.31,.84,.31,.88 L.31,1 M.3,.5 L.03,.59 L.03,.09 L.3,.09 L.3,.655", type: 0 } }, "\\uE0A1": { type: 5, data: { d: "M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.355,.03 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5", type: 0 } }, "\\uE0A2": { type: 5, data: { d: "M.25,.94 C.16,.94,.11,.92,.11,.87 L.11,.53 C.11,.48,.15,.455,.23,.45 L.23,.3 C.23,.25,.26,.22,.31,.19 C.36,.16,.43,.15,.51,.15 C.59,.15,.66,.16,.71,.19 C.77,.22,.79,.26,.79,.3 L.79,.45 C.87,.45,.91,.48,.91,.53 L.91,.87 C.91,.92,.86,.94,.77,.94 L.24,.94 M.53,.2 C.49,.2,.45,.21,.42,.23 C.39,.25,.38,.27,.38,.3 L.38,.45 L.68,.45 L.68,.3 C.68,.27,.67,.25,.64,.23 C.61,.21,.58,.2,.53,.2 M.58,.82 L.58,.66 C.63,.65,.65,.63,.65,.6 C.65,.58,.64,.57,.61,.56 C.58,.55,.56,.54,.52,.54 C.48,.54,.46,.55,.43,.56 C.4,.57,.39,.59,.39,.6 C.39,.63,.41,.64,.46,.66 L.46,.82 L.57,.82", type: 0 } }, "\\uE0A3": { type: 5, data: { d: "M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.7,.03 L.7,.1 L.355,.1 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5", type: 0 } }, "\\uE0B0": { type: 5, data: { d: "M0,0 L1,.5 L0,1", type: 0, rightPadding: 2 } }, "\\uE0B1": { type: 5, data: { d: "M-1,-.5 L1,.5 L-1,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0B2": { type: 5, data: { d: "M1,0 L0,.5 L1,1", type: 0, leftPadding: 2 } }, "\\uE0B3": { type: 5, data: { d: "M2,-.5 L0,.5 L2,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0B4": { type: 5, data: { d: "M0,0 L0,1 C0.552,1,1,0.776,1,.5 C1,0.224,0.552,0,0,0", type: 0, rightPadding: 1 } }, "\\uE0B5": { type: 5, data: { d: "M.2,1 C.422,1,.8,.826,.78,.5 C.8,.174,0.422,0,.2,0", type: 1, rightPadding: 1 } }, "\\uE0B6": { type: 5, data: { d: "M1,0 L1,1 C0.448,1,0,0.776,0,.5 C0,0.224,0.448,0,1,0", type: 0, leftPadding: 1 } }, "\\uE0B7": { type: 5, data: { d: "M.8,1 C0.578,1,0.2,.826,.22,.5 C0.2,0.174,0.578,0,0.8,0", type: 1, leftPadding: 1 } }, "\\uE0B8": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5 L-.5,1.5", type: 0 } }, "\\uE0B9": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BA": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5 L1.5,1.5", type: 0 } }, "\\uE0BB": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BC": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5 L-.5,-.5", type: 0 } }, "\\uE0BD": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BE": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5 L1.5,-.5", type: 0 } }, "\\uE0BF": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0C0": { type: 5, data: { d: "M0.8069,0.6075 Q0.7991,0.612,0.7815,0.6218 T0.7542,0.6369 T0.7282,0.6508 T0.7016,0.6644 T0.6778,0.6758 T0.6551,0.6854 T0.637,0.6911 T0.622,0.6936 Q0.6186,0.6936,0.6128,0.6942 T0.6018,0.6952 T0.5894,0.6956 T0.5757,0.6952 T0.561,0.693 T0.5451,0.6879 Q0.5342,0.6834,0.5193,0.6756 T0.4925,0.6614 T0.4673,0.6485 T0.4436,0.6389 T0.4239,0.6363 T0.4089,0.6422 Q0.4045,0.6467,0.3958,0.6554 T0.3843,0.6669 T0.3748,0.6746 T0.3613,0.683 T0.3442,0.6903 L0.3499,0.6956 Q0.3584,0.7042,0.3679,0.7177 T0.3836,0.7403 T0.4019,0.7583 T0.4295,0.7703 Q0.4688,0.7785,0.5203,0.7605 Q0.4902,0.7817,0.449,0.7911 T0.3696,0.8001 Q0.3567,0.7997,0.341,0.7942 T0.3111,0.7813 T0.2805,0.766 T0.2493,0.753 T0.218,0.7472 T0.187,0.754 Q0.1762,0.7589,0.1653,0.7681 T0.1453,0.7895 T0.1308,0.818 T0.1264,0.8507 L0.1264,0.858 Q0.1453,0.8462,0.1607,0.8433 T0.1899,0.8452 T0.2226,0.8625 Q0.2344,0.8707,0.2485,0.8752 T0.2813,0.8831 T0.3089,0.889 Q0.2981,0.8915,0.2846,0.8956 T0.2603,0.9037 T0.2368,0.9115 T0.2129,0.9174 T0.1894,0.9194 T0.1653,0.9155 Q0.1504,0.9115,0.1328,0.9196 T0.0986,0.9421 T0.0655,0.9708 T0.0317,0.9943 T0,1 Q0.001,0.94,0.0017,0.6508 T0.0024,0.2322 Q0.002,0.2109,0.0007,0.1379 T0,0.0249 Q0.0058,0.0253,0.009,0.0257 T0.0156,0.0288 T0.0203,0.0333 T0.0264,0.0422 T0.0349,0.0539 Q0.044,0.0657,0.0542,0.072 T0.0752,0.0789 T0.096,0.0775 T0.1175,0.0694 T0.1379,0.0573 T0.1579,0.0432 Q0.2141,0,0.2673,0.0318 Q0.2588,0.0318,0.2517,0.033 T0.239,0.0361 T0.2276,0.0424 T0.218,0.0504 T0.2085,0.0612 T0.1997,0.0732 T0.1899,0.0875 T0.1795,0.1028 Q0.1748,0.1093,0.1507,0.1234 T0.1186,0.1448 Q0.0999,0.1612,0.1108,0.1783 Q0.1162,0.1877,0.1238,0.1928 T0.1404,0.1979 T0.158,0.1967 T0.1775,0.1895 T0.1963,0.1791 T0.2151,0.1663 T0.2314,0.1534 T0.2458,0.141 T0.2561,0.1322 Q0.2815,0.1106,0.3017,0.101 T0.344,0.0926 T0.3919,0.1077 Q0.4099,0.1175,0.4265,0.1206 T0.4588,0.1202 T0.488,0.1098 T0.5176,0.0914 Q0.5071,0.1032,0.4963,0.1122 T0.4722,0.1285 T0.4497,0.1401 T0.4223,0.1518 T0.3943,0.1636 Q0.374,0.1726,0.3623,0.1863 T0.3482,0.2162 Q0.3445,0.2403,0.3608,0.2605 T0.4072,0.2876 Q0.4194,0.2909,0.4326,0.2899 T0.457,0.2856 T0.4805,0.2764 T0.5032,0.264 T0.5256,0.2497 T0.5478,0.2352 T0.5698,0.2222 T0.5921,0.2118 Q0.6982,0.173,0.81,0.2436 Q0.833,0.2583,0.8496,0.2674 T0.887,0.2846 T0.925,0.294 T0.9617,0.2911 T1,0.2746 Q0.9817,0.2946,0.96,0.3056 T0.9175,0.3191 T0.8731,0.3209 T0.8277,0.3164 T0.7818,0.3109 T0.7359,0.3101 T0.6907,0.3197 T0.647,0.3448 Q0.6443,0.3472,0.6333,0.3562 T0.6194,0.3674 T0.6076,0.3766 T0.594,0.386 T0.5815,0.3931 T0.5661,0.4007 T0.5501,0.4064 L0.5556,0.4121 Q0.5627,0.4198,0.5722,0.4251 T0.5926,0.4337 T0.6131,0.439 T0.6343,0.4431 T0.6521,0.4468 Q0.6762,0.4529,0.7056,0.4463 Q0.6772,0.4623,0.6543,0.471 T0.604,0.4814 Q0.5962,0.4818,0.5815,0.4825 T0.5591,0.4835 T0.5393,0.4857 T0.519,0.4908 T0.5007,0.4996 T0.4812,0.5141 T0.4627,0.5353 L0.4549,0.5451 L0.4661,0.543 Q0.4759,0.541,0.4909,0.55 T0.5315,0.5796 T0.5684,0.6083 Q0.5799,0.6161,0.5915,0.6212 T0.6181,0.6308 L0.6331,0.6353 Q0.6514,0.6418,0.7004,0.633 T0.8069,0.6075 Z", type: 0 } }, "\\uE0C1": { type: 5, data: { d: "M0.011,0.0469 Q0.0152,0.0412,0.02,0.0361 T0.0292,0.0281 T0.0365,0.0253 Q0.0426,0.0257,0.0461,0.0263 T0.0534,0.03 T0.0582,0.0345 T0.0645,0.0434 T0.0723,0.0546 Q0.0807,0.0653,0.0897,0.0712 T0.1081,0.0775 T0.1255,0.0765 T0.1438,0.0695 T0.1605,0.0593 T0.1772,0.0473 Q0.2388,0,0.2927,0.0326 L0.2614,0.0767 L0.2581,0.0767 Q0.2494,0.0767,0.2444,0.0773 T0.2359,0.0789 T0.2291,0.0842 T0.2233,0.0922 T0.2146,0.1054 T0.2026,0.1236 Q0.1943,0.1354,0.1843,0.1444 T0.1675,0.1574 T0.1526,0.1654 T0.1429,0.1701 Q0.1436,0.1717,0.1446,0.1733 Q0.1504,0.1823,0.1581,0.1866 T0.1733,0.1915 T0.1909,0.1884 T0.2085,0.1809 T0.2265,0.169 T0.2427,0.1564 T0.2575,0.1436 T0.2688,0.1338 Q0.2969,0.1101,0.3195,0.0995 T0.3643,0.0901 T0.4114,0.1048 Q0.4279,0.1138,0.4426,0.1168 T0.4705,0.117 T0.4945,0.1089 T0.5186,0.0942 L0.5211,0.0926 L0.5289,0.0922 Q0.5411,0.095,0.5189,0.1203 Q0.505,0.1358,0.4913,0.1474 T0.4634,0.167 T0.4389,0.1796 T0.4121,0.1909 T0.3866,0.2011 Q0.3782,0.2047,0.3727,0.2092 Q0.3717,0.2117,0.3714,0.2141 Q0.3695,0.2263,0.3751,0.2388 T0.394,0.2616 T0.4253,0.2761 Q0.4398,0.2785,0.4513,0.2779 T0.4756,0.2724 T0.4987,0.2616 T0.5216,0.2476 T0.5453,0.2321 T0.5703,0.217 T0.5976,0.2043 Q0.7015,0.166,0.8099,0.2345 Q0.8361,0.2512,0.8572,0.2616 T0.9006,0.2779 T0.9432,0.281 T0.9819,0.2663 L0.9887,0.2671 Q1,0.272,0.9768,0.2969 Q0.9558,0.3193,0.9319,0.333 T0.8858,0.3513 T0.8391,0.3569 T0.793,0.3546 T0.7485,0.3497 T0.7065,0.3473 T0.6681,0.3522 T0.6344,0.3699 Q0.5963,0.4005,0.5847,0.4082 Q0.595,0.4139,0.6079,0.4174 T0.6367,0.4237 T0.6586,0.4278 Q0.6793,0.4331,0.7044,0.4278 Q0.7057,0.4278,0.707,0.4274 Q0.7067,0.429,0.7062,0.4313 T0.7036,0.4398 T0.6993,0.4513 T0.6931,0.4619 T0.6851,0.4698 Q0.6573,0.4857,0.6336,0.4947 T0.5831,0.5053 Q0.577,0.5057,0.5615,0.5065 T0.5394,0.508 T0.5221,0.51 T0.5042,0.5139 T0.4905,0.5204 Q0.5008,0.5232,0.515,0.5328 T0.549,0.5585 T0.5799,0.5824 Q0.5905,0.5897,0.6013,0.5946 T0.6262,0.6036 T0.6409,0.6081 Q0.6567,0.6134,0.7035,0.605 T0.8028,0.5816 L0.7974,0.5922 T0.7867,0.6134 L0.7812,0.624 Q0.7799,0.6248,0.7786,0.6252 Q0.7709,0.6297,0.7573,0.6372 T0.7346,0.6499 T0.7123,0.6621 T0.6897,0.6741 T0.6686,0.6847 T0.648,0.6941 T0.6297,0.7013 T0.6129,0.7062 T0.5995,0.7076 Q0.5992,0.7076,0.5831,0.7092 T0.5529,0.7092 T0.525,0.7019 Q0.5105,0.6958,0.4824,0.6811 T0.4356,0.6586 T0.4079,0.6533 Q0.3872,0.6741,0.3827,0.6782 Q0.3872,0.6835,0.3934,0.6929 T0.4037,0.7078 T0.4142,0.7198 T0.4284,0.7304 T0.4466,0.7365 Q0.4824,0.7443,0.5292,0.728 L0.5292,0.7294 T0.529,0.7333 T0.5284,0.7392 T0.5266,0.7463 T0.5236,0.7539 T0.5186,0.7612 T0.5111,0.7679 Q0.5086,0.77,0.5056,0.7716 Q0.4466,0.8104,0.3591,0.8091 Q0.344,0.8091,0.3246,0.802 T0.2893,0.7863 T0.2543,0.77 T0.2206,0.76 T0.1894,0.7643 Q0.1804,0.7684,0.1733,0.7753 Q0.1591,0.7892,0.1601,0.8169 Q0.1784,0.8067,0.1938,0.8053 T0.2212,0.8087 T0.2507,0.825 Q0.2614,0.8324,0.2744,0.8365 T0.3053,0.844 T0.332,0.8499 L0.303,0.894 L0.2998,0.8948 Q0.2904,0.8968,0.278,0.9009 T0.2554,0.9086 T0.233,0.9158 T0.2099,0.9213 T0.1868,0.9229 T0.1633,0.9192 Q0.1517,0.916,0.1367,0.9241 T0.1065,0.9462 T0.0753,0.9737 T0.041,0.9955 T0.0061,1 Q0,0.9984,0.0068,0.9845 Q0.009,0.9804,0.0123,0.9755 Q0.0187,0.9666,0.0261,0.9606 T0.0374,0.9555 Q0.0481,0.958,0.0629,0.949 T0.0931,0.9262 T0.1247,0.8987 T0.1597,0.8777 T0.1949,0.8752 Q0.213,0.8805,0.2343,0.8772 Q0.2249,0.8736,0.2172,0.8683 Q0.1914,0.8511,0.1738,0.8497 T0.1349,0.8617 Q0.1304,0.865,0.1273,0.8646 T0.1242,0.8605 L0.1239,0.8536 Q0.1226,0.8295,0.1354,0.8016 T0.1723,0.7496 Q0.1914,0.7308,0.2104,0.7219 Q0.2259,0.7145,0.2425,0.7141 T0.273,0.7182 T0.3022,0.7296 T0.3301,0.7439 T0.3569,0.7571 T0.3821,0.7643 Q0.373,0.7561,0.3598,0.7367 T0.3382,0.7088 L0.3327,0.7035 Q0.3282,0.699,0.3353,0.6884 T0.3517,0.6692 L0.3611,0.6607 Q0.3711,0.657,0.3751,0.6554 T0.3837,0.6507 T0.3898,0.6458 T0.3979,0.637 T0.4111,0.6236 Q0.4172,0.6175,0.4234,0.6138 Q0.4327,0.6081,0.4439,0.6077 T0.4655,0.6105 T0.4884,0.6201 T0.5113,0.633 T0.5347,0.6468 T0.5573,0.6578 Q0.5705,0.6635,0.5833,0.665 T0.6112,0.665 T0.6286,0.6635 Q0.6421,0.6631,0.6718,0.6501 Q0.626,0.6578,0.6089,0.6517 Q0.6063,0.6509,0.6002,0.6491 T0.5884,0.6454 T0.5757,0.6409 T0.561,0.6344 T0.5466,0.6256 Q0.536,0.6183,0.5108,0.5989 T0.4722,0.5712 T0.4527,0.564 L0.4418,0.5661 Q0.4308,0.5681,0.4366,0.5563 Q0.4401,0.5485,0.4476,0.5392 L0.455,0.5298 Q0.4631,0.5188,0.4714,0.51 T0.4866,0.4947 T0.5021,0.4831 T0.516,0.4749 T0.53,0.4694 T0.5428,0.4657 T0.5558,0.4637 T0.5674,0.4629 T0.5795,0.4625 Q0.5489,0.4543,0.534,0.4384 L0.5286,0.4327 Q0.5244,0.4282,0.5318,0.4174 T0.5486,0.398 L0.5579,0.3899 Q0.567,0.387,0.5749,0.3834 T0.5878,0.3772 T0.6012,0.3687 T0.6126,0.3603 T0.6268,0.3487 T0.6421,0.3361 Q0.6567,0.3242,0.6712,0.3159 T0.7009,0.3034 T0.7277,0.2973 T0.7556,0.2961 T0.7809,0.2977 T0.8074,0.301 Q0.8096,0.3014,0.8109,0.3016 T0.8143,0.302 T0.818,0.3026 Q0.8012,0.2936,0.7767,0.2781 Q0.6718,0.2117,0.5744,0.2476 Q0.5637,0.2516,0.5492,0.2604 T0.5218,0.2779 T0.4923,0.2965 T0.461,0.3124 T0.4282,0.3216 T0.394,0.3206 Q0.3637,0.3136,0.3474,0.2936 T0.3353,0.2459 Q0.3385,0.2247,0.355,0.2023 Q0.3646,0.1892,0.3763,0.179 Q0.3898,0.1672,0.4063,0.1595 Q0.3927,0.1562,0.3785,0.1485 Q0.3604,0.1387,0.3453,0.1354 T0.3161,0.1354 T0.2899,0.1458 T0.2627,0.166 Q0.262,0.1664,0.254,0.1733 T0.2414,0.1841 T0.2267,0.196 T0.2094,0.2086 T0.1915,0.2196 T0.1725,0.2288 T0.1546,0.2337 T0.1373,0.2343 T0.1223,0.228 T0.1097,0.2145 Q0.0962,0.1929,0.1258,0.1582 Q0.131,0.1517,0.1371,0.1464 Q0.1462,0.1387,0.156,0.1321 T0.1752,0.1205 T0.1878,0.1134 Q0.1891,0.1117,0.1947,0.103 T0.2035,0.0899 T0.2125,0.0781 T0.2243,0.064 Q0.1949,0.0616,0.1672,0.0828 Q0.153,0.0934,0.1412,0.1009 T0.1146,0.1146 T0.0873,0.1213 T0.0616,0.116 T0.0374,0.0962 Q0.0339,0.0909,0.0295,0.0846 T0.024,0.0767 T0.0202,0.0728 T0.0148,0.0704 T0.0068,0.0697 Q0.0003,0.0693,0.0058,0.0567 Q0.0077,0.0522,0.011,0.0469 Z", type: 0 } }, "\\uE0C2": { type: 5, data: { d: "M0.1934,0.6075 Q0.2012,0.612,0.2188,0.6218 T0.2459,0.6369 T0.2718,0.6508 T0.2983,0.6644 T0.322,0.6758 T0.3447,0.6854 T0.363,0.6911 T0.3783,0.6936 Q0.3796,0.6936,0.396,0.6952 T0.4265,0.6952 T0.4548,0.6879 Q0.4656,0.6834,0.4805,0.6756 T0.5073,0.6614 T0.5327,0.6485 T0.5564,0.6389 T0.5759,0.6363 T0.5909,0.6422 Q0.5953,0.6467,0.604,0.6554 T0.6155,0.6669 T0.6251,0.6746 T0.6387,0.683 T0.6556,0.6903 L0.6498,0.6956 Q0.6414,0.7042,0.6319,0.7177 T0.6162,0.7403 T0.5979,0.7583 T0.5703,0.7703 Q0.5313,0.7785,0.4799,0.7605 Q0.5097,0.7817,0.5508,0.7911 T0.6302,0.8001 Q0.6431,0.7997,0.659,0.7942 T0.6888,0.7813 T0.7194,0.766 T0.7506,0.753 T0.7819,0.7472 T0.8131,0.754 Q0.8239,0.7589,0.8346,0.7681 T0.8544,0.7895 T0.8689,0.818 T0.8737,0.8507 L0.8733,0.858 Q0.8591,0.849,0.8474,0.845 T0.8242,0.8421 T0.8021,0.8482 T0.7772,0.8625 Q0.7653,0.8707,0.7513,0.8752 T0.7184,0.8831 T0.6908,0.889 Q0.7017,0.8915,0.7152,0.8956 T0.7396,0.9037 T0.7633,0.9115 T0.7872,0.9174 T0.8107,0.9194 T0.8347,0.9155 Q0.8493,0.9115,0.8671,0.9196 T0.9015,0.9421 T0.9345,0.9708 T0.9682,0.9943 T0.9997,1 Q0.999,0.94,0.9983,0.6508 T0.9976,0.2322 Q0.9976,0.2109,0.9992,0.1379 T1,0.0249 Q0.9949,0.0249,0.9917,0.0257 T0.9863,0.0273 T0.9817,0.0308 T0.9776,0.0357 T0.9721,0.0437 T0.9651,0.0539 Q0.956,0.0657,0.9456,0.072 T0.9247,0.0789 T0.904,0.0775 T0.8823,0.0694 T0.862,0.0573 T0.8422,0.0432 Q0.7856,0,0.7328,0.0318 Q0.7392,0.0318,0.7452,0.0324 T0.756,0.0345 T0.7657,0.0386 T0.7741,0.0437 T0.7821,0.0506 T0.7894,0.0588 T0.7966,0.0683 T0.8039,0.0787 T0.8119,0.0904 T0.8202,0.1028 Q0.8249,0.1093,0.849,0.1234 T0.8811,0.1448 Q0.8998,0.1612,0.8893,0.1783 Q0.8835,0.1877,0.8759,0.1928 T0.8593,0.1979 T0.8417,0.1967 T0.8222,0.1895 T0.8034,0.1791 T0.7848,0.1663 T0.7687,0.1534 T0.7543,0.141 T0.744,0.1322 Q0.7186,0.1106,0.6984,0.101 T0.6559,0.0926 T0.6082,0.1077 Q0.5899,0.1175,0.5733,0.1206 T0.5411,0.1202 T0.5122,0.1098 T0.4822,0.0914 Q0.4927,0.1032,0.5036,0.1122 T0.5276,0.1285 T0.5503,0.1401 T0.5777,0.1518 T0.6055,0.1636 Q0.6258,0.1726,0.6375,0.1863 T0.6519,0.2162 Q0.6556,0.2403,0.6392,0.2605 T0.5926,0.2876 Q0.5804,0.2909,0.5672,0.2899 T0.5428,0.2856 T0.5193,0.2764 T0.4966,0.264 T0.4744,0.2497 T0.4523,0.2352 T0.4301,0.2222 T0.4077,0.2118 Q0.3021,0.173,0.1903,0.2436 Q0.1669,0.2583,0.1504,0.2674 T0.1129,0.2846 T0.075,0.294 T0.0384,0.2911 T0,0.2746 Q0.021,0.297,0.0459,0.3082 T0.0953,0.3207 T0.146,0.3193 T0.1988,0.3131 T0.2508,0.3095 T0.3029,0.3176 T0.3529,0.3448 Q0.3566,0.348,0.3652,0.355 T0.3771,0.3645 T0.3877,0.3731 T0.3993,0.3815 T0.4103,0.3884 T0.4226,0.3953 T0.4352,0.4009 T0.4497,0.4064 L0.4443,0.4121 Q0.4372,0.4198,0.4277,0.4251 T0.4072,0.4337 T0.3867,0.439 T0.3656,0.4431 T0.3481,0.4468 Q0.3241,0.4529,0.2943,0.4463 Q0.3227,0.4623,0.3458,0.471 T0.3959,0.4814 Q0.404,0.4818,0.4187,0.4825 T0.4409,0.4835 T0.4605,0.4857 T0.4809,0.4908 T0.4992,0.4996 T0.5186,0.5141 T0.5371,0.5353 L0.5449,0.5451 L0.5337,0.543 Q0.5242,0.541,0.5091,0.55 T0.4683,0.5796 T0.4314,0.6083 Q0.4203,0.6161,0.4086,0.6212 T0.382,0.6308 T0.3667,0.6353 Q0.3485,0.6418,0.2995,0.633 T0.1934,0.6075 Z", type: 0 } }, "\\uE0C3": { type: 5, data: { d: "M0.989,0.0469 Q0.9829,0.0379,0.9753,0.0316 T0.9635,0.0253 Q0.9574,0.0257,0.9539,0.0263 T0.9466,0.03 T0.9418,0.0345 T0.9355,0.0434 T0.9277,0.0546 Q0.9193,0.0653,0.9103,0.0712 T0.8919,0.0775 T0.8745,0.0765 T0.8564,0.0695 T0.8396,0.0593 T0.8228,0.0473 Q0.7612,0,0.7073,0.0326 L0.7386,0.0767 L0.7419,0.0767 Q0.7506,0.0767,0.7556,0.0773 T0.7641,0.0789 T0.7709,0.0842 T0.7767,0.0922 T0.7854,0.1054 T0.7974,0.1236 Q0.8057,0.1354,0.8157,0.1444 T0.8325,0.1574 T0.8474,0.1654 T0.8571,0.1701 Q0.8564,0.1717,0.8554,0.1733 Q0.8503,0.1815,0.844,0.186 T0.8301,0.1909 T0.8153,0.1903 T0.7993,0.1845 T0.7836,0.1758 T0.768,0.1648 T0.754,0.1535 T0.741,0.1425 T0.7312,0.1338 Q0.7031,0.1101,0.6805,0.0995 T0.6357,0.0901 T0.5886,0.1048 Q0.5721,0.1138,0.5574,0.1168 T0.5295,0.117 T0.5055,0.1089 T0.4814,0.0942 L0.4789,0.0926 L0.4711,0.0922 Q0.4589,0.095,0.4811,0.1203 Q0.495,0.1358,0.5087,0.1474 T0.5366,0.167 T0.5611,0.1796 T0.5879,0.1909 T0.6134,0.2011 Q0.6218,0.2047,0.6273,0.2092 Q0.6283,0.2117,0.6286,0.2141 Q0.6305,0.2263,0.6249,0.2388 T0.606,0.2616 T0.5747,0.2761 Q0.5602,0.2785,0.5487,0.2779 T0.5245,0.2724 T0.5015,0.2616 T0.4784,0.2476 T0.4547,0.2321 T0.4297,0.217 T0.4024,0.2043 Q0.2985,0.166,0.1901,0.2345 Q0.1694,0.248,0.1523,0.2569 T0.1165,0.2726 T0.0818,0.2812 T0.0494,0.2796 T0.0181,0.2663 L0.0116,0.2671 Q0,0.272,0.0232,0.2969 Q0.0468,0.3222,0.0742,0.3365 T0.1278,0.3542 T0.1807,0.3564 T0.233,0.352 T0.2815,0.3473 T0.3269,0.3509 T0.3656,0.3699 Q0.4037,0.4005,0.4153,0.4082 Q0.405,0.4139,0.3921,0.4174 T0.3633,0.4237 T0.3414,0.4278 Q0.3207,0.4331,0.2956,0.4278 Q0.2943,0.4278,0.293,0.4274 Q0.2933,0.429,0.2938,0.4313 T0.2964,0.4398 T0.3007,0.4513 T0.3069,0.4619 T0.3149,0.4698 Q0.3427,0.4857,0.3664,0.4947 T0.4169,0.5053 Q0.423,0.5057,0.4385,0.5065 T0.4606,0.508 T0.4779,0.51 T0.4958,0.5139 T0.5095,0.5204 Q0.4992,0.5232,0.485,0.5328 T0.451,0.5585 T0.4201,0.5824 Q0.4095,0.5897,0.3987,0.5946 T0.3738,0.6036 T0.3591,0.6081 Q0.3433,0.6134,0.2965,0.605 T0.1972,0.5816 L0.2026,0.5922 T0.2133,0.6134 L0.2188,0.624 Q0.2201,0.6248,0.2214,0.6252 Q0.2291,0.6297,0.2486,0.6405 T0.2786,0.657 T0.3066,0.6721 T0.3353,0.6866 T0.3598,0.6972 T0.383,0.7051 T0.4005,0.7076 Q0.4008,0.7076,0.4169,0.7092 T0.4471,0.7092 T0.475,0.7019 Q0.4895,0.6958,0.5176,0.6811 T0.5644,0.6586 T0.5921,0.6533 Q0.6128,0.6741,0.6173,0.6782 Q0.6131,0.6835,0.6068,0.6929 T0.5963,0.7078 T0.5858,0.7198 T0.5716,0.7304 T0.5534,0.7365 Q0.5179,0.7443,0.4708,0.728 L0.4708,0.7294 T0.471,0.7333 T0.4716,0.7392 T0.4734,0.7463 T0.4764,0.7539 T0.4814,0.7612 T0.4889,0.7679 Q0.4914,0.77,0.4944,0.7716 Q0.5534,0.8104,0.6409,0.8091 Q0.6521,0.8091,0.6654,0.8053 T0.6907,0.7959 T0.7157,0.7838 T0.741,0.772 T0.7652,0.7631 T0.7888,0.7594 T0.8106,0.7643 Q0.8196,0.7684,0.8267,0.7753 Q0.8409,0.7892,0.8399,0.8169 Q0.8216,0.8067,0.8062,0.8053 T0.7788,0.8087 T0.7493,0.825 Q0.7386,0.8324,0.7256,0.8365 T0.6947,0.844 T0.668,0.8499 L0.697,0.894 L0.7002,0.8948 Q0.7099,0.8968,0.7222,0.9009 T0.7446,0.9086 T0.767,0.9158 T0.7901,0.9213 T0.8132,0.9229 T0.8367,0.9192 Q0.8483,0.916,0.8633,0.9241 T0.8937,0.9462 T0.9248,0.9737 T0.959,0.9955 T0.9939,1 Q1,0.9984,0.9932,0.9845 Q0.991,0.9804,0.9877,0.9755 Q0.9813,0.9666,0.9739,0.9606 T0.9626,0.9555 Q0.9519,0.958,0.9372,0.949 T0.9071,0.9262 T0.8753,0.8987 T0.8403,0.8777 T0.8051,0.8752 Q0.787,0.8805,0.7657,0.8772 Q0.7751,0.8736,0.7828,0.8683 Q0.8086,0.8511,0.8262,0.8497 T0.8651,0.8617 Q0.8696,0.865,0.8727,0.8646 T0.8758,0.8605 L0.8761,0.8536 Q0.8774,0.8295,0.8646,0.8016 T0.8277,0.7496 Q0.8086,0.7308,0.7896,0.7219 Q0.7741,0.7145,0.7575,0.7141 T0.727,0.7182 T0.6978,0.7296 T0.6699,0.7439 T0.6433,0.7571 T0.6179,0.7643 Q0.627,0.7561,0.6402,0.7367 T0.6618,0.7088 L0.6673,0.7035 Q0.6718,0.699,0.6647,0.6884 T0.6483,0.6692 L0.6389,0.6607 Q0.6289,0.657,0.6249,0.6554 T0.6163,0.6507 T0.6102,0.6458 T0.6021,0.637 T0.5889,0.6236 Q0.5828,0.6175,0.5766,0.6138 Q0.5673,0.6081,0.5561,0.6077 T0.5345,0.6105 T0.5116,0.6201 T0.4887,0.633 T0.4653,0.6468 T0.4427,0.6578 Q0.4295,0.6635,0.4167,0.665 T0.3888,0.665 T0.3714,0.6635 Q0.3579,0.6631,0.3282,0.6501 Q0.374,0.6578,0.3911,0.6517 Q0.3937,0.6509,0.4024,0.6482 T0.4179,0.6434 T0.4348,0.6364 T0.4534,0.6256 Q0.464,0.6183,0.4892,0.5989 T0.5278,0.5712 T0.5476,0.564 L0.5582,0.5661 Q0.5692,0.5681,0.5634,0.5563 Q0.5599,0.5485,0.5524,0.5392 L0.545,0.5298 Q0.5369,0.5188,0.5286,0.51 T0.5134,0.4947 T0.4979,0.4831 T0.484,0.4749 T0.47,0.4694 T0.4572,0.4657 T0.4442,0.4637 T0.4326,0.4629 T0.4205,0.4625 Q0.4511,0.4543,0.466,0.4384 L0.4714,0.4327 Q0.4795,0.4237,0.4469,0.394 L0.4421,0.3899 Q0.433,0.387,0.4251,0.3834 T0.4122,0.3772 T0.3988,0.3687 T0.3874,0.3603 T0.3732,0.3487 T0.3579,0.3361 Q0.3433,0.3242,0.3288,0.3159 T0.2993,0.3034 T0.2725,0.2973 T0.2446,0.2961 T0.2193,0.2977 T0.1926,0.301 Q0.1855,0.3022,0.182,0.3026 Q0.1991,0.2936,0.2233,0.2781 Q0.3282,0.2117,0.4256,0.2476 Q0.4363,0.2516,0.451,0.2604 T0.4784,0.2779 T0.5077,0.2965 T0.539,0.3124 T0.5718,0.3216 T0.606,0.3206 Q0.6363,0.3136,0.6526,0.2936 T0.6647,0.2459 Q0.6615,0.2247,0.645,0.2023 Q0.6354,0.1892,0.6237,0.179 Q0.6102,0.1672,0.5937,0.1595 Q0.6073,0.1562,0.6215,0.1485 Q0.6396,0.1387,0.6547,0.1354 T0.6839,0.1354 T0.7101,0.1458 T0.7373,0.166 Q0.738,0.1664,0.746,0.1733 T0.7586,0.1841 T0.7733,0.196 T0.7907,0.2086 T0.8086,0.2196 T0.8275,0.2288 T0.8454,0.2337 T0.8627,0.2343 T0.8777,0.228 T0.8903,0.2145 Q0.9038,0.1929,0.8742,0.1582 Q0.869,0.1517,0.8629,0.1464 Q0.8538,0.1387,0.844,0.1321 T0.8248,0.1205 T0.8122,0.1134 Q0.8109,0.1117,0.8053,0.103 T0.7965,0.0899 T0.7875,0.0781 T0.7757,0.064 Q0.8051,0.0616,0.8328,0.0828 Q0.847,0.0934,0.8588,0.1009 T0.8854,0.1146 T0.9127,0.1213 T0.9384,0.116 T0.9626,0.0962 Q0.9664,0.0909,0.9706,0.0846 T0.976,0.0767 T0.9798,0.0728 T0.9852,0.0704 T0.9932,0.0697 Q0.9997,0.0693,0.9942,0.0567 Q0.9923,0.0522,0.989,0.0469 Z", type: 0 } }, "\\uE0C4": { type: 5, data: { d: "M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0.9099,0.1158 L0.9099,0.1888 L0.9951,0.1888 L0.9951,0.1158 L0.9099,0.1158 Z M0.9075,0.1116 L0.9976,0.1116 Q1,0.1116,1,0.1137 L1,0.1909 Q1,0.193,0.9976,0.193 L0.9075,0.193 Q0.905,0.193,0.905,0.1909 L0.905,0.1137 Q0.905,0.1116,0.9075,0.1116 Z M0.7852,0.6086 L0.7852,0.682 L0.8704,0.682 L0.8704,0.6086 L0.7852,0.6086 Z M0.7828,0.6044 L0.8729,0.6044 Q0.8753,0.6044,0.8753,0.6065 L0.8753,0.6841 Q0.8753,0.6862,0.8729,0.6862 L0.7828,0.6862 Q0.7803,0.6862,0.7803,0.6841 L0.7803,0.6065 Q0.7803,0.6044,0.7828,0.6044 Z M0.66,0.1137 L0.7501,0.1137 L0.7501,0.1909 L0.66,0.1909 L0.66,0.1137 Z M0.6624,0.4102 L0.6624,0.4836 L0.7477,0.4836 L0.7477,0.4102 L0.6624,0.4102 Z M0.66,0.406 L0.7501,0.406 Q0.7526,0.406,0.7526,0.4081 L0.7526,0.4857 Q0.7526,0.4878,0.7501,0.4878 L0.66,0.4878 Q0.6576,0.4878,0.6576,0.4857 L0.6576,0.4081 Q0.6576,0.406,0.66,0.406 Z M0.6624,0.7131 L0.6624,0.7865 L0.7477,0.7865 L0.7477,0.7131 L0.6624,0.7131 Z M0.66,0.7089 L0.7501,0.7089 Q0.7526,0.7089,0.7526,0.711 L0.7526,0.7886 Q0.7526,0.7907,0.7501,0.7907 L0.66,0.7907 Q0.6576,0.7907,0.6576,0.7886 L0.6576,0.711 Q0.6576,0.7089,0.66,0.7089 Z M0.5407,0.2227 L0.5407,0.2836 L0.6113,0.2836 L0.6113,0.2227 L0.5407,0.2227 Z M0.5309,0.206 L0.621,0.206 Q0.623,0.206,0.6249,0.2068 T0.6281,0.2089 T0.6301,0.2116 T0.6308,0.2143 L0.6308,0.2919 Q0.6308,0.2957,0.6276,0.298 T0.621,0.3003 L0.5309,0.3003 Q0.5265,0.3003,0.5239,0.2976 T0.5212,0.2919 L0.5212,0.2143 Q0.5212,0.211,0.5244,0.2085 T0.5309,0.206 Z M0.5407,0.3184 L0.5407,0.3792 L0.6113,0.3792 L0.6113,0.3184 L0.5407,0.3184 Z M0.5309,0.3016 L0.621,0.3016 Q0.6254,0.3016,0.6281,0.3043 T0.6308,0.31 L0.6308,0.3876 Q0.6308,0.3914,0.6276,0.3937 T0.621,0.396 L0.5309,0.396 Q0.5265,0.396,0.5239,0.3932 T0.5212,0.3876 L0.5212,0.31 Q0.5212,0.3062,0.5244,0.3039 T0.5309,0.3016 Z M0.5309,0.4081 L0.621,0.4081 L0.621,0.4857 L0.5309,0.4857 L0.5309,0.4081 Z M0.5309,0.5059 L0.621,0.5059 L0.621,0.5835 L0.5309,0.5835 L0.5309,0.5059 Z M0.5407,0.6149 L0.5407,0.6758 L0.6113,0.6758 L0.6113,0.6149 L0.5407,0.6149 Z M0.5309,0.5982 L0.621,0.5982 Q0.6254,0.5982,0.6281,0.6009 T0.6308,0.6065 L0.6308,0.6841 Q0.6308,0.6879,0.6276,0.6902 T0.621,0.6925 L0.5309,0.6925 Q0.5265,0.6925,0.5239,0.6898 T0.5212,0.6841 L0.5212,0.6065 Q0.5212,0.6028,0.5244,0.6005 T0.5309,0.5982 Z M0.4062,0.1137 L0.4963,0.1137 L0.4963,0.1909 L0.4062,0.1909 L0.4062,0.1137 Z M0.4062,0.2143 L0.4963,0.2143 L0.4963,0.2919 L0.4062,0.2919 L0.4062,0.2143 Z M0.4184,0.4186 L0.4184,0.4753 L0.4842,0.4753 L0.4842,0.4186 L0.4184,0.4186 Z M0.4062,0.3977 L0.4963,0.3977 Q0.5017,0.3977,0.5051,0.401 T0.5085,0.4081 L0.5085,0.4857 Q0.5085,0.4904,0.5046,0.4933 T0.4963,0.4962 L0.4062,0.4962 Q0.4009,0.4962,0.3975,0.4929 T0.3941,0.4857 L0.3941,0.4081 Q0.3941,0.4035,0.398,0.4006 T0.4062,0.3977 Z M0.4062,0.5059 L0.4963,0.5059 L0.4963,0.5835 L0.4062,0.5835 L0.4062,0.5059 Z M0.4087,0.7131 L0.4087,0.7865 L0.4939,0.7865 L0.4939,0.7131 L0.4087,0.7131 Z M0.4062,0.7089 L0.4963,0.7089 Q0.4988,0.7089,0.4988,0.711 L0.4988,0.7886 Q0.4988,0.7907,0.4963,0.7907 L0.4062,0.7907 Q0.4038,0.7907,0.4038,0.7886 L0.4038,0.711 Q0.4038,0.7089,0.4062,0.7089 Z M0.2689,0.1137 L0.359,0.1137 L0.359,0.1909 L0.2689,0.1909 L0.2689,0.1137 Z M0.2689,0.2143 L0.359,0.2143 L0.359,0.2919 L0.2689,0.2919 L0.2689,0.2143 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.31 L0.359,0.31 L0.359,0.3876 L0.2689,0.3876 L0.2689,0.31 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.4081 L0.359,0.4081 L0.359,0.4857 L0.2689,0.4857 L0.2689,0.4081 Z M0.2689,0.5059 L0.359,0.5059 L0.359,0.5835 L0.2689,0.5835 L0.2689,0.5059 Z M0.2689,0.711 L0.359,0.711 L0.359,0.7886 L0.2689,0.7886 L0.2689,0.711 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.1374,0.1137 L0.2275,0.1137 L0.2275,0.1909 L0.1374,0.1909 L0.1374,0.1137 Z M0.1374,0.2143 L0.2275,0.2143 L0.2275,0.2919 L0.1374,0.2919 L0.1374,0.2143 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.31 L0.2275,0.31 L0.2275,0.3876 L0.1374,0.3876 L0.1374,0.31 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.4081 L0.2275,0.4081 L0.2275,0.4857 L0.1374,0.4857 L0.1374,0.4081 Z M0.1374,0.5059 L0.2275,0.5059 L0.2275,0.5835 L0.1374,0.5835 L0.1374,0.5059 Z M0.1374,0.6065 L0.2275,0.6065 L0.2275,0.6841 L0.1374,0.6841 L0.1374,0.6065 Z M0.1374,0.711 L0.2275,0.711 L0.2275,0.7886 L0.1374,0.7886 L0.1374,0.711 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0,0.1137 L0.0901,0.1137 L0.0901,0.1909 L0,0.1909 L0,0.1137 Z M0,0.2143 L0.0901,0.2143 L0.0901,0.2919 L0,0.2919 L0,0.2143 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.31 L0.0901,0.31 L0.0901,0.3876 L0,0.3876 L0,0.31 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.4081 L0.0901,0.4081 L0.0901,0.4857 L0,0.4857 L0,0.4081 Z M0,0.5059 L0.0901,0.5059 L0.0901,0.5835 L0,0.5835 L0,0.5059 Z M0,0.6065 L0.0901,0.6065 L0.0901,0.6841 L0,0.6841 L0,0.6065 Z M0,0.711 L0.0901,0.711 L0.0901,0.7886 L0,0.7886 L0,0.711 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z", type: 0 } }, "\\uE0C5": { type: 5, data: { d: "M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M0.0901,0.1158 L0.0901,0.1888 L0.0049,0.1888 L0.0049,0.1158 L0.0901,0.1158 Z M0.0925,0.1116 L0.0024,0.1116 Q0,0.1116,0,0.1137 L0,0.1909 Q0,0.193,0.0024,0.193 L0.0925,0.193 Q0.095,0.193,0.095,0.1909 L0.095,0.1137 Q0.095,0.1116,0.0925,0.1116 Z M0.2148,0.6086 L0.2148,0.682 L0.1296,0.682 L0.1296,0.6086 L0.2148,0.6086 Z M0.2172,0.6044 L0.1271,0.6044 Q0.1247,0.6044,0.1247,0.6065 L0.1247,0.6841 Q0.1247,0.6862,0.1271,0.6862 L0.2172,0.6862 Q0.2197,0.6862,0.2197,0.6841 L0.2197,0.6065 Q0.2197,0.6044,0.2172,0.6044 Z M0.34,0.1137 L0.2499,0.1137 L0.2499,0.1909 L0.34,0.1909 L0.34,0.1137 Z M0.3376,0.4102 L0.3376,0.4836 L0.2523,0.4836 L0.2523,0.4102 L0.3376,0.4102 Z M0.34,0.406 L0.2499,0.406 Q0.2474,0.406,0.2474,0.4081 L0.2474,0.4857 Q0.2474,0.4878,0.2499,0.4878 L0.34,0.4878 Q0.3424,0.4878,0.3424,0.4857 L0.3424,0.4081 Q0.3424,0.406,0.34,0.406 Z M0.3376,0.7131 L0.3376,0.7865 L0.2523,0.7865 L0.2523,0.7131 L0.3376,0.7131 Z M0.34,0.7089 L0.2499,0.7089 Q0.2474,0.7089,0.2474,0.711 L0.2474,0.7886 Q0.2474,0.7907,0.2499,0.7907 L0.34,0.7907 Q0.3424,0.7907,0.3424,0.7886 L0.3424,0.711 Q0.3424,0.7089,0.34,0.7089 Z M0.4593,0.2227 L0.4593,0.2836 L0.3887,0.2836 L0.3887,0.2227 L0.4593,0.2227 Z M0.4691,0.206 L0.379,0.206 Q0.3746,0.206,0.3719,0.2087 T0.3692,0.2143 L0.3692,0.2919 Q0.3692,0.2957,0.3724,0.298 T0.379,0.3003 L0.4691,0.3003 Q0.4735,0.3003,0.4761,0.2976 T0.4788,0.2919 L0.4788,0.2143 Q0.4788,0.211,0.4756,0.2085 T0.4691,0.206 Z M0.4593,0.3184 L0.4593,0.3792 L0.3887,0.3792 L0.3887,0.3184 L0.4593,0.3184 Z M0.4691,0.3016 L0.379,0.3016 Q0.3746,0.3016,0.3719,0.3043 T0.3692,0.31 L0.3692,0.3876 Q0.3692,0.3914,0.3724,0.3937 T0.379,0.396 L0.4691,0.396 Q0.4735,0.396,0.4761,0.3932 T0.4788,0.3876 L0.4788,0.31 Q0.4788,0.3062,0.4756,0.3039 T0.4691,0.3016 Z M0.4691,0.4081 L0.379,0.4081 L0.379,0.4857 L0.4691,0.4857 L0.4691,0.4081 Z M0.4691,0.5059 L0.379,0.5059 L0.379,0.5835 L0.4691,0.5835 L0.4691,0.5059 Z M0.4593,0.6149 L0.4593,0.6758 L0.3887,0.6758 L0.3887,0.6149 L0.4593,0.6149 Z M0.4691,0.5982 L0.379,0.5982 Q0.3746,0.5982,0.3719,0.6009 T0.3692,0.6065 L0.3692,0.6841 Q0.3692,0.6879,0.3724,0.6902 T0.379,0.6925 L0.4691,0.6925 Q0.4735,0.6925,0.4761,0.6898 T0.4788,0.6841 L0.4788,0.6065 Q0.4788,0.6028,0.4756,0.6005 T0.4691,0.5982 Z M0.5938,0.1137 L0.5037,0.1137 L0.5037,0.1909 L0.5938,0.1909 L0.5938,0.1137 Z M0.5938,0.2143 L0.5037,0.2143 L0.5037,0.2919 L0.5938,0.2919 L0.5938,0.2143 Z M0.5816,0.4186 L0.5816,0.4753 L0.5158,0.4753 L0.5158,0.4186 L0.5816,0.4186 Z M0.5938,0.3977 L0.5037,0.3977 Q0.4983,0.3977,0.4949,0.401 T0.4915,0.4081 L0.4915,0.4857 Q0.4915,0.4904,0.4954,0.4933 T0.5037,0.4962 L0.5938,0.4962 Q0.5991,0.4962,0.6025,0.4929 T0.6059,0.4857 L0.6059,0.4081 Q0.6059,0.4035,0.602,0.4006 T0.5938,0.3977 Z M0.5938,0.5059 L0.5037,0.5059 L0.5037,0.5835 L0.5938,0.5835 L0.5938,0.5059 Z M0.5913,0.7131 L0.5913,0.7865 L0.5061,0.7865 L0.5061,0.7131 L0.5913,0.7131 Z M0.5938,0.7089 L0.5037,0.7089 Q0.5012,0.7089,0.5012,0.711 L0.5012,0.7886 Q0.5012,0.7907,0.5037,0.7907 L0.5938,0.7907 Q0.5962,0.7907,0.5962,0.7886 L0.5962,0.711 Q0.5962,0.7089,0.5938,0.7089 Z M0.7311,0.1137 L0.641,0.1137 L0.641,0.1909 L0.7311,0.1909 L0.7311,0.1137 Z M0.7311,0.2143 L0.641,0.2143 L0.641,0.2919 L0.7311,0.2919 L0.7311,0.2143 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.31 L0.641,0.31 L0.641,0.3876 L0.7311,0.3876 L0.7311,0.31 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.4081 L0.641,0.4081 L0.641,0.4857 L0.7311,0.4857 L0.7311,0.4081 Z M0.7311,0.5059 L0.641,0.5059 L0.641,0.5835 L0.7311,0.5835 L0.7311,0.5059 Z M0.7311,0.711 L0.641,0.711 L0.641,0.7886 L0.7311,0.7886 L0.7311,0.711 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.8626,0.1137 L0.7725,0.1137 L0.7725,0.1909 L0.8626,0.1909 L0.8626,0.1137 Z M0.8626,0.2143 L0.7725,0.2143 L0.7725,0.2919 L0.8626,0.2919 L0.8626,0.2143 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.31 L0.7725,0.31 L0.7725,0.3876 L0.8626,0.3876 L0.8626,0.31 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.4081 L0.7725,0.4081 L0.7725,0.4857 L0.8626,0.4857 L0.8626,0.4081 Z M0.8626,0.5059 L0.7725,0.5059 L0.7725,0.5835 L0.8626,0.5835 L0.8626,0.5059 Z M0.8626,0.6065 L0.7725,0.6065 L0.7725,0.6841 L0.8626,0.6841 L0.8626,0.6065 Z M0.8626,0.711 L0.7725,0.711 L0.7725,0.7886 L0.8626,0.7886 L0.8626,0.711 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M1,0.1137 L0.9099,0.1137 L0.9099,0.1909 L1,0.1909 L1,0.1137 Z M1,0.2143 L0.9099,0.2143 L0.9099,0.2919 L1,0.2919 L1,0.2143 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.31 L0.9099,0.31 L0.9099,0.3876 L1,0.3876 L1,0.31 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.4081 L0.9099,0.4081 L0.9099,0.4857 L1,0.4857 L1,0.4081 Z M1,0.5059 L0.9099,0.5059 L0.9099,0.5835 L1,0.5835 L1,0.5059 Z M1,0.6065 L0.9099,0.6065 L0.9099,0.6841 L1,0.6841 L1,0.6065 Z M1,0.711 L0.9099,0.711 L0.9099,0.7886 L1,0.7886 L1,0.711 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z", type: 0 } }, "\\uE0C6": { type: 5, data: { d: "M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0.8574,0.3217 L0.8574,0.4098 L0.9691,0.4098 L0.9691,0.3217 L0.8574,0.3217 Z M0.8419,0.2978 L0.9846,0.2978 Q0.9892,0.2978,0.9928,0.2997 T0.9982,0.3043 T1,0.31 L1,0.4216 Q1,0.427,0.9951,0.4304 T0.9846,0.4337 L0.8419,0.4337 Q0.8352,0.4337,0.8308,0.4299 T0.8265,0.4216 L0.8265,0.31 Q0.8265,0.3062,0.829,0.3035 T0.835,0.2993 T0.8419,0.2978 Z M0.8574,0.888 L0.8574,0.9757 L0.9691,0.9757 L0.9691,0.888 L0.8574,0.888 Z M0.8419,0.8637 L0.9846,0.8637 Q0.9892,0.8637,0.9928,0.8658 T0.9982,0.8706 T1,0.8758 L1,0.9878 Q1,0.9929,0.9951,0.9964 T0.9846,1 L0.8419,1 Q0.8352,1,0.8308,0.996 T0.8265,0.9878 L0.8265,0.8758 Q0.8265,0.8708,0.8314,0.8672 T0.8419,0.8637 Z M0.6509,0.169 L0.6509,0.2706 L0.7806,0.2706 L0.7806,0.169 L0.6509,0.169 Z M0.6442,0.159 L0.7868,0.159 Q0.7899,0.159,0.7917,0.1604 T0.7935,0.164 L0.7935,0.2756 Q0.7935,0.2781,0.7915,0.2796 T0.7868,0.281 L0.6442,0.281 Q0.6416,0.281,0.6395,0.2794 T0.6375,0.2756 L0.6375,0.164 Q0.6375,0.1619,0.6398,0.1604 T0.6442,0.159 Z M0.6632,0.6044 L0.6632,0.6858 L0.7678,0.6858 L0.7678,0.6044 L0.6632,0.6044 Z M0.6442,0.5742 L0.7868,0.5742 Q0.7951,0.5742,0.8007,0.5791 T0.8064,0.5893 L0.8064,0.7013 Q0.8064,0.7076,0.8002,0.712 T0.7868,0.7164 L0.6442,0.7164 Q0.6359,0.7164,0.6305,0.7114 T0.6251,0.7013 L0.6251,0.5893 Q0.6251,0.5847,0.6282,0.5812 T0.6357,0.5759 T0.6442,0.5742 Z M0.4264,0.164 L0.5695,0.164 L0.5695,0.2756 L0.4264,0.2756 L0.4264,0.164 Z M0.4325,0.315 L0.4325,0.4165 L0.5628,0.4165 L0.5628,0.315 L0.4325,0.315 Z M0.4264,0.3049 L0.5695,0.3049 Q0.5721,0.3049,0.5739,0.3064 T0.5757,0.31 L0.5757,0.4216 Q0.5757,0.4237,0.5736,0.4251 T0.5695,0.4266 L0.4264,0.4266 Q0.4238,0.4266,0.422,0.4251 T0.4202,0.4216 L0.4202,0.31 Q0.4202,0.3087,0.4207,0.3077 T0.4222,0.306 T0.4243,0.3052 T0.4264,0.3049 Z M0.4264,0.4476 L0.5695,0.4476 L0.5695,0.5596 L0.4264,0.5596 L0.4264,0.4476 Z M0.4392,0.7408 L0.4392,0.8326 L0.5561,0.8326 L0.5561,0.7408 L0.4392,0.7408 Z M0.4264,0.7206 L0.5695,0.7206 Q0.5747,0.7206,0.5783,0.724 T0.5819,0.7307 L0.5819,0.8427 Q0.5819,0.8469,0.5778,0.8498 T0.5695,0.8528 L0.4264,0.8528 Q0.4207,0.8528,0.4171,0.8496 T0.4135,0.8427 L0.4135,0.7307 Q0.4135,0.7265,0.4176,0.7236 T0.4264,0.7206 Z M0.2178,0.164 L0.3605,0.164 L0.3605,0.2756 L0.2178,0.2756 L0.2178,0.164 Z M0.2178,0.31 L0.3605,0.31 L0.3605,0.4216 L0.2178,0.4216 L0.2178,0.31 Z M0.2178,0.5893 L0.3605,0.5893 L0.3605,0.7013 L0.2178,0.7013 L0.2178,0.5893 Z M0.2178,0.7307 L0.3605,0.7307 L0.3605,0.8427 L0.2178,0.8427 L0.2178,0.7307 Z M0.2178,0.8758 L0.3605,0.8758 L0.3605,0.9878 L0.2178,0.9878 L0.2178,0.8758 Z M0,0.164 L0.1432,0.164 L0.1432,0.2756 L0,0.2756 L0,0.164 Z M0,0.31 L0.1432,0.31 L0.1432,0.4216 L0,0.4216 L0,0.31 Z M0,0.4476 L0.1432,0.4476 L0.1432,0.5596 L0,0.5596 L0,0.4476 Z M0,0.5893 L0.1432,0.5893 L0.1432,0.7013 L0,0.7013 L0,0.5893 Z M0,0.7307 L0.1432,0.7307 L0.1432,0.8427 L0,0.8427 L0,0.7307 Z M0,0.8758 L0.1432,0.8758 L0.1432,0.9878 L0,0.9878 L0,0.8758 Z", type: 0 } }, "\\uE0C7": { type: 5, data: { d: "M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M0.1432,0.3217 L0.1432,0.4098 L0.0309,0.4098 L0.0309,0.3217 L0.1432,0.3217 Z M0.1586,0.2978 L0.0154,0.2978 Q0.0088,0.2978,0.0044,0.3016 T0,0.31 L0,0.4216 Q0,0.427,0.0049,0.4304 T0.0154,0.4337 L0.1586,0.4337 Q0.1648,0.4337,0.1694,0.4299 T0.174,0.4216 L0.174,0.31 Q0.174,0.3062,0.1715,0.3035 T0.1653,0.2993 T0.1586,0.2978 Z M0.1432,0.888 L0.1432,0.9757 L0.0309,0.9757 L0.0309,0.888 L0.1432,0.888 Z M0.1586,0.8637 L0.0154,0.8637 Q0.0108,0.8637,0.0072,0.8658 T0.0018,0.8706 T0,0.8758 L0,0.9878 Q0,0.9929,0.0049,0.9964 T0.0154,1 L0.1586,1 Q0.1648,1,0.1694,0.996 T0.174,0.9878 L0.174,0.8758 Q0.174,0.8725,0.1715,0.8695 T0.1653,0.8651 T0.1586,0.8637 Z M0.3496,0.169 L0.3496,0.2706 L0.2194,0.2706 L0.2194,0.169 L0.3496,0.169 Z M0.3563,0.159 L0.2132,0.159 Q0.2106,0.159,0.2088,0.1604 T0.207,0.164 L0.207,0.2756 Q0.207,0.2781,0.2091,0.2796 T0.2132,0.281 L0.3563,0.281 Q0.3589,0.281,0.3607,0.2794 T0.3625,0.2756 L0.3625,0.164 Q0.3625,0.1619,0.3605,0.1604 T0.3563,0.159 Z M0.3368,0.6044 L0.3368,0.6858 L0.2327,0.6858 L0.2327,0.6044 L0.3368,0.6044 Z M0.3563,0.5742 L0.2132,0.5742 Q0.2049,0.5742,0.1993,0.5791 T0.1936,0.5893 L0.1936,0.7013 Q0.1936,0.7076,0.2001,0.712 T0.2132,0.7164 L0.3563,0.7164 Q0.3641,0.7164,0.3697,0.7114 T0.3754,0.7013 L0.3754,0.5893 Q0.3754,0.5847,0.3723,0.5812 T0.3648,0.5759 T0.3563,0.5742 Z M0.5736,0.164 L0.431,0.164 L0.431,0.2756 L0.5736,0.2756 L0.5736,0.164 Z M0.5675,0.315 L0.5675,0.4165 L0.4377,0.4165 L0.4377,0.315 L0.5675,0.315 Z M0.5736,0.3049 L0.431,0.3049 Q0.4284,0.3049,0.4264,0.3064 T0.4243,0.31 L0.4243,0.4216 Q0.4243,0.4237,0.4266,0.4251 T0.431,0.4266 L0.5736,0.4266 Q0.5767,0.4266,0.5785,0.4251 T0.5803,0.4216 L0.5803,0.31 Q0.5803,0.3087,0.5798,0.3077 T0.5783,0.306 T0.5762,0.3052 T0.5736,0.3049 Z M0.5736,0.4476 L0.431,0.4476 L0.431,0.5596 L0.5736,0.5596 L0.5736,0.4476 Z M0.5613,0.7408 L0.5613,0.8326 L0.4439,0.8326 L0.4439,0.7408 L0.5613,0.7408 Z M0.5736,0.7206 L0.431,0.7206 Q0.4253,0.7206,0.4217,0.724 T0.4181,0.7307 L0.4181,0.8427 Q0.4181,0.8469,0.4222,0.8498 T0.431,0.8528 L0.5736,0.8528 Q0.5778,0.8528,0.5808,0.8511 T0.5855,0.8471 T0.587,0.8427 L0.587,0.7307 Q0.587,0.7265,0.5826,0.7236 T0.5736,0.7206 Z M0.7827,0.164 L0.6395,0.164 L0.6395,0.2756 L0.7827,0.2756 L0.7827,0.164 Z M0.7827,0.31 L0.6395,0.31 L0.6395,0.4216 L0.7827,0.4216 L0.7827,0.31 Z M0.7827,0.5893 L0.6395,0.5893 L0.6395,0.7013 L0.7827,0.7013 L0.7827,0.5893 Z M0.7827,0.7307 L0.6395,0.7307 L0.6395,0.8427 L0.7827,0.8427 L0.7827,0.7307 Z M0.7827,0.8758 L0.6395,0.8758 L0.6395,0.9878 L0.7827,0.9878 L0.7827,0.8758 Z M1,0.164 L0.8574,0.164 L0.8574,0.2756 L1,0.2756 L1,0.164 Z M1,0.31 L0.8574,0.31 L0.8574,0.4216 L1,0.4216 L1,0.31 Z M1,0.4476 L0.8574,0.4476 L0.8574,0.5596 L1,0.5596 L1,0.4476 Z M1,0.5893 L0.8574,0.5893 L0.8574,0.7013 L1,0.7013 L1,0.5893 Z M1,0.7307 L0.8574,0.7307 L0.8574,0.8427 L1,0.8427 L1,0.7307 Z M1,0.8758 L0.8574,0.8758 L0.8574,0.9878 L1,0.9878 L1,0.8758 Z", type: 0 } }, "\\uE0C8": { type: 5, data: { d: "M0.0008,0.9979 Q0.0008,1,0.0032,1 Q0.0482,1,0.0602,0.9975 Q0.0667,0.9963,0.0847,0.9917 T0.1084,0.9859 Q0.1124,0.9851,0.1221,0.9851 L0.1253,0.9851 L0.1285,0.9851 Q0.1518,0.9851,0.1655,0.9809 Q0.1695,0.9801,0.1731,0.9788 T0.1791,0.9766 T0.1839,0.9747 T0.1888,0.9732 L0.1936,0.972 T0.1988,0.9712 T0.2048,0.971 L0.2096,0.971 Q0.2201,0.9714,0.2233,0.9714 T0.2345,0.9693 Q0.2386,0.9685,0.2502,0.9674 T0.2715,0.966 L0.2811,0.9656 Q0.2916,0.9647,0.2916,0.9573 Q0.2916,0.954,0.2892,0.9515 T0.2819,0.9486 Q0.2755,0.9482,0.2683,0.9482 Q0.2643,0.9482,0.2582,0.9484 T0.2498,0.9486 Q0.2426,0.9486,0.2402,0.9473 Q0.2386,0.9469,0.2317,0.943 T0.2161,0.937 Q0.2104,0.9357,0.1992,0.933 T0.1831,0.9291 Q0.1807,0.9287,0.1783,0.9285 T0.1739,0.928 T0.1703,0.9276 T0.1675,0.9272 T0.1655,0.9266 T0.1639,0.9253 Q0.1598,0.9216,0.1462,0.9216 L0.143,0.9216 L0.1398,0.9216 L0.1365,0.9216 Q0.1197,0.9195,0.1197,0.9154 L0.1197,0.9154 Q0.1205,0.9121,0.1373,0.9088 T0.1703,0.9054 Q0.1791,0.9054,0.1863,0.904 T0.1984,0.9011 T0.2064,0.8992 Q0.2402,0.8967,0.2506,0.8934 Q0.2538,0.8926,0.2602,0.8899 T0.2707,0.8872 Q0.2715,0.8872,0.2731,0.8876 Q0.2795,0.8884,0.2884,0.8884 Q0.3068,0.8884,0.3092,0.8826 L0.3092,0.8797 Q0.3092,0.8772,0.3076,0.8747 T0.3044,0.8706 T0.3028,0.8681 Q0.3076,0.8656,0.3237,0.8656 Q0.3317,0.8656,0.3622,0.8623 Q0.3655,0.8623,0.3867,0.8617 T0.4217,0.8602 Q0.4241,0.8598,0.4289,0.8598 L0.4345,0.8598 L0.441,0.8598 Q0.4578,0.8598,0.4667,0.8586 Q0.4739,0.8573,0.4851,0.8567 T0.5004,0.8552 Q0.5012,0.8552,0.5108,0.855 T0.5269,0.853 T0.5333,0.8461 Q0.5333,0.8445,0.5325,0.8432 T0.5309,0.8409 T0.5289,0.8391 T0.5261,0.8378 L0.5229,0.837 T0.5185,0.8362 T0.5133,0.8355 T0.5076,0.8349 T0.502,0.8341 Q0.4932,0.8324,0.4859,0.8324 Q0.4827,0.8324,0.4787,0.8328 T0.4731,0.8333 Q0.4707,0.8333,0.4683,0.8324 Q0.4482,0.825,0.4394,0.825 Q0.4369,0.825,0.4345,0.8254 Q0.4225,0.827,0.4153,0.827 Q0.4088,0.827,0.4064,0.8258 Q0.3976,0.8204,0.3751,0.8204 Q0.3703,0.8204,0.3667,0.8214 T0.3622,0.8225 Q0.3598,0.8225,0.3558,0.82 Q0.351,0.8175,0.3402,0.8167 T0.3177,0.8156 T0.3028,0.8146 L0.2956,0.8121 T0.2871,0.8094 T0.2771,0.8073 T0.2635,0.8063 Q0.261,0.8063,0.2586,0.8067 Q0.2378,0.8071,0.2273,0.8071 Q0.2072,0.8071,0.2024,0.8051 Q0.1976,0.8034,0.1932,0.8026 T0.1867,0.8013 T0.1847,0.8001 L0.1847,0.7993 Q0.1855,0.7984,0.1855,0.7978 T0.1859,0.7966 T0.1867,0.7959 T0.188,0.7955 T0.1896,0.7951 T0.1916,0.7949 T0.1944,0.7945 T0.1984,0.7941 T0.2032,0.7939 Q0.212,0.7926,0.2325,0.7918 T0.2562,0.7905 Q0.2691,0.7893,0.2787,0.7847 Q0.2835,0.7827,0.2968,0.7791 T0.3149,0.7756 Q0.3189,0.7756,0.3305,0.7733 T0.3446,0.771 L0.3454,0.771 Q0.3462,0.771,0.3498,0.7721 T0.3574,0.774 T0.3655,0.7748 Q0.3703,0.7748,0.3743,0.7731 T0.3823,0.7708 T0.3916,0.77 T0.3992,0.7694 Q0.4008,0.7694,0.4076,0.7688 T0.4205,0.7675 L0.4305,0.7665 Q0.4345,0.7657,0.4402,0.7617 T0.4458,0.7545 Q0.4458,0.7503,0.4353,0.7487 Q0.4297,0.7478,0.4209,0.7462 T0.4044,0.7433 T0.3904,0.7416 L0.3847,0.7416 Q0.3807,0.7416,0.3747,0.7422 T0.3663,0.7428 T0.3606,0.7424 Q0.3582,0.742,0.3562,0.7418 T0.3522,0.7412 T0.3482,0.7406 T0.3446,0.7401 T0.341,0.7397 T0.3373,0.7393 T0.3341,0.7391 L0.3293,0.7391 Q0.3277,0.7395,0.3253,0.7395 Q0.3205,0.7395,0.3052,0.7387 T0.2835,0.7379 Q0.2755,0.7379,0.253,0.7325 Q0.2506,0.7316,0.2462,0.731 T0.2382,0.7296 T0.2305,0.7271 T0.2181,0.7234 T0.2048,0.7196 T0.2,0.7155 Q0.2,0.7142,0.2016,0.713 Q0.208,0.7059,0.2285,0.6978 T0.2618,0.6898 Q0.2739,0.6898,0.2831,0.6848 T0.2956,0.6794 Q0.3028,0.6786,0.3289,0.6765 T0.3566,0.674 Q0.3582,0.674,0.3855,0.6723 T0.4406,0.6688 T0.4755,0.6653 Q0.5004,0.6607,0.5124,0.6599 L0.5165,0.6599 Q0.5213,0.6599,0.5277,0.6605 T0.5373,0.6611 Q0.543,0.6611,0.5494,0.6599 Q0.592,0.6524,0.6,0.6524 Q0.6064,0.6524,0.61,0.6499 T0.6161,0.6474 Q0.6177,0.6474,0.6261,0.6495 T0.6418,0.6516 L0.6482,0.6516 Q0.653,0.6512,0.6651,0.6506 T0.6876,0.6493 T0.7084,0.6477 T0.7229,0.645 Q0.7269,0.6437,0.7333,0.6437 Q0.7373,0.6437,0.7458,0.6443 T0.7574,0.645 Q0.7614,0.645,0.7631,0.6445 T0.7655,0.6441 Q0.7671,0.6441,0.7723,0.6448 T0.7823,0.6454 Q0.788,0.6454,0.7952,0.6445 Q0.8233,0.6408,0.8723,0.6367 Q0.9012,0.6342,0.9092,0.6342 L0.9165,0.6342 L0.9205,0.6342 Q0.9277,0.6342,0.9382,0.6323 T0.9526,0.6304 Q0.9534,0.6304,0.9594,0.6307 T0.9695,0.6309 Q0.9976,0.6309,0.9992,0.6234 Q1,0.6201,1,0.618 Q1,0.6089,0.9775,0.608 Q0.9703,0.6076,0.9582,0.6076 Q0.9518,0.6076,0.9394,0.6078 T0.9213,0.608 Q0.9036,0.608,0.8972,0.6072 Q0.894,0.6068,0.8871,0.6058 T0.8751,0.6039 T0.8627,0.6024 T0.8506,0.6018 L0.8474,0.6018 Q0.841,0.6022,0.8281,0.6041 T0.8112,0.606 Q0.8096,0.606,0.808,0.6056 Q0.7783,0.6002,0.7647,0.6002 Q0.7598,0.6002,0.7454,0.6006 T0.7261,0.601 Q0.7221,0.601,0.7145,0.6022 T0.7036,0.6035 Q0.6996,0.6035,0.6964,0.6022 Q0.6723,0.5902,0.6442,0.5902 Q0.6426,0.5902,0.6386,0.5904 T0.6337,0.5906 Q0.6273,0.5906,0.6249,0.5894 L0.6177,0.5856 T0.6116,0.5838 T0.6016,0.5825 T0.5855,0.5823 Q0.5719,0.5823,0.5574,0.5798 T0.5373,0.5774 L0.5341,0.5774 Q0.5293,0.5778,0.5213,0.5786 T0.51,0.5794 Q0.5036,0.5794,0.4988,0.5769 Q0.4932,0.574,0.4771,0.574 Q0.4723,0.574,0.4631,0.5745 T0.4498,0.5749 Q0.4418,0.5749,0.4394,0.5736 Q0.4353,0.5724,0.4305,0.5715 T0.4225,0.5707 T0.4145,0.5705 T0.4056,0.5699 Q0.4008,0.5691,0.398,0.5689 T0.394,0.5689 T0.3908,0.5686 T0.3855,0.5674 Q0.3831,0.567,0.3811,0.5662 T0.3779,0.5645 T0.3743,0.563 T0.3695,0.5624 Q0.3655,0.5624,0.3594,0.5635 T0.3494,0.5645 T0.3406,0.5635 T0.3325,0.5624 Q0.3309,0.5624,0.3301,0.5628 L0.3141,0.5628 Q0.2635,0.5628,0.2506,0.5612 Q0.2474,0.5608,0.2434,0.5608 Q0.2402,0.5608,0.2349,0.561 T0.2273,0.5612 Q0.2209,0.5612,0.2177,0.5595 Q0.2145,0.557,0.2145,0.5558 Q0.2169,0.5537,0.2345,0.5521 Q0.2876,0.5475,0.3028,0.5425 Q0.3068,0.5413,0.3149,0.5396 T0.3309,0.5367 T0.3478,0.5338 T0.3606,0.5309 Q0.3631,0.5305,0.3755,0.5259 T0.3968,0.5214 Q0.3992,0.5214,0.4024,0.5218 T0.4096,0.5222 Q0.4161,0.5222,0.4213,0.5209 T0.4313,0.5185 T0.4402,0.5172 Q0.4418,0.5168,0.447,0.5168 L0.4558,0.5168 T0.4639,0.5162 T0.4707,0.5141 T0.4731,0.5102 Q0.4731,0.5089,0.4723,0.5081 Q0.4699,0.5019,0.4627,0.4994 T0.4369,0.4965 Q0.4273,0.4961,0.4193,0.4946 T0.4048,0.4915 T0.3952,0.4894 Q0.392,0.4886,0.388,0.4886 Q0.3847,0.4886,0.3775,0.4892 T0.3647,0.4898 Q0.3598,0.4898,0.355,0.4894 Q0.3165,0.4861,0.3141,0.4853 Q0.2779,0.4774,0.2715,0.4774 Q0.2699,0.4774,0.2683,0.4776 T0.2627,0.4778 Q0.2498,0.4778,0.2281,0.4762 Q0.2241,0.4749,0.2233,0.4737 Q0.2249,0.472,0.2321,0.4708 Q0.2402,0.4695,0.2554,0.4695 L0.2675,0.4695 L0.2795,0.4695 Q0.294,0.4695,0.2996,0.4679 Q0.3141,0.4629,0.3373,0.4616 Q0.3414,0.4612,0.3466,0.4606 T0.3582,0.4589 T0.3687,0.4562 T0.3727,0.4525 Q0.3727,0.4509,0.3703,0.4492 Q0.3639,0.4455,0.3474,0.4419 T0.3213,0.4384 L0.3157,0.4384 L0.31,0.4384 Q0.294,0.4384,0.2859,0.4363 Q0.2795,0.4347,0.2691,0.4347 L0.2618,0.4347 L0.2546,0.4347 Q0.2458,0.4347,0.2394,0.4338 Q0.2257,0.4318,0.2193,0.4303 T0.2092,0.4266 T0.2052,0.4224 T0.2024,0.4154 T0.196,0.4052 Q0.1912,0.3994,0.1867,0.3949 T0.1807,0.3884 T0.1791,0.3849 Q0.1791,0.3824,0.1839,0.3745 Q0.1871,0.3687,0.1944,0.3637 T0.2072,0.3561 T0.2221,0.3501 T0.2321,0.3463 Q0.2353,0.3455,0.241,0.3445 T0.2522,0.3428 T0.2639,0.3411 T0.2731,0.3384 T0.2956,0.3351 T0.3197,0.3326 Q0.3213,0.3322,0.3237,0.3322 T0.3325,0.3331 T0.3414,0.3339 Q0.3478,0.3339,0.3518,0.3314 Q0.3606,0.3264,0.3703,0.3264 Q0.3775,0.3264,0.3847,0.3293 Q0.3888,0.331,0.396,0.331 Q0.4024,0.331,0.4116,0.3295 T0.4265,0.3266 T0.4414,0.3227 T0.4514,0.3202 Q0.4578,0.3181,0.4839,0.3152 T0.5112,0.3123 T0.5177,0.3119 T0.5285,0.3111 T0.5398,0.3096 T0.549,0.3065 T0.5526,0.3015 Q0.5526,0.2999,0.5518,0.2982 Q0.547,0.2903,0.5386,0.2883 T0.5165,0.2862 Q0.5116,0.2862,0.5056,0.2866 T0.4972,0.287 Q0.4884,0.287,0.4787,0.2833 Q0.4594,0.2758,0.4265,0.2758 Q0.4169,0.2758,0.4129,0.2766 Q0.4112,0.2771,0.4104,0.2771 Q0.4088,0.2771,0.4056,0.2748 T0.3968,0.2721 Q0.3695,0.2696,0.359,0.2659 Q0.355,0.2646,0.351,0.2646 T0.3426,0.2661 T0.3365,0.2675 T0.3333,0.2659 Q0.3277,0.2605,0.3116,0.2553 T0.2859,0.2501 L0.2843,0.2501 L0.2819,0.2501 Q0.2779,0.2501,0.2723,0.2493 T0.2586,0.2472 T0.2474,0.2455 Q0.1799,0.236,0.1719,0.236 Q0.1663,0.236,0.1606,0.235 T0.1502,0.2316 T0.1454,0.2265 Q0.1454,0.2223,0.1558,0.2173 Q0.1679,0.2115,0.1859,0.2092 T0.2185,0.207 T0.2353,0.2057 Q0.2369,0.2049,0.2502,0.2041 T0.2799,0.2022 T0.302,0.2007 Q0.3084,0.1999,0.3245,0.1954 T0.347,0.1908 Q0.3502,0.1908,0.3534,0.1916 Q0.3663,0.197,0.388,0.197 Q0.404,0.197,0.4088,0.1929 Q0.4096,0.192,0.4108,0.192 T0.4177,0.1945 T0.4277,0.197 T0.4369,0.1949 Q0.4442,0.1908,0.4843,0.1875 Q0.4892,0.1871,0.4968,0.1839 T0.5084,0.1808 L0.5108,0.1808 Q0.5213,0.1825,0.5454,0.1825 Q0.5823,0.1825,0.5992,0.1779 Q0.6096,0.1746,0.6217,0.1746 Q0.6249,0.1746,0.6309,0.1748 T0.6394,0.175 Q0.6434,0.175,0.6466,0.1746 Q0.6474,0.1746,0.6594,0.1738 T0.6787,0.1713 T0.6892,0.1659 Q0.6924,0.1634,0.6924,0.1593 Q0.6924,0.1547,0.6888,0.151 T0.6795,0.1472 Q0.6779,0.1472,0.6763,0.1477 Q0.6699,0.1493,0.6667,0.1493 Q0.661,0.1493,0.6506,0.1456 Q0.6329,0.1394,0.6129,0.1394 Q0.6048,0.1394,0.5992,0.1377 T0.5888,0.136 T0.5803,0.1377 T0.5751,0.1394 Q0.5711,0.1394,0.5639,0.1369 Q0.5365,0.1273,0.5116,0.1273 Q0.4876,0.1273,0.4667,0.1253 Q0.4627,0.1248,0.4542,0.1211 T0.4337,0.1174 L0.4305,0.1174 Q0.4217,0.1178,0.4153,0.119 T0.408,0.1203 Q0.4056,0.1203,0.4,0.117 Q0.3976,0.1153,0.396,0.1136 T0.3932,0.1112 T0.39,0.1099 T0.3847,0.1095 Q0.3799,0.1095,0.3687,0.1103 Q0.355,0.1112,0.3434,0.1141 T0.3301,0.117 Q0.3261,0.117,0.3229,0.1145 Q0.3181,0.1116,0.3052,0.1087 T0.2787,0.1043 T0.2546,0.1029 Q0.2506,0.1029,0.2474,0.1033 Q0.2418,0.1037,0.2349,0.1054 T0.2249,0.107 Q0.2225,0.107,0.2193,0.1066 Q0.2024,0.1024,0.1863,0.1024 Q0.1823,0.1024,0.1562,0.0971 T0.1269,0.0917 T0.1161,0.0896 T0.106,0.0854 Q0.1076,0.0846,0.11,0.0842 Q0.1173,0.0821,0.1261,0.0821 Q0.1301,0.0821,0.1369,0.0825 T0.1462,0.083 Q0.1494,0.083,0.151,0.0825 T0.1831,0.0813 T0.2201,0.0784 T0.243,0.074 T0.2667,0.0718 Q0.2707,0.0718,0.2755,0.0724 T0.2843,0.073 T0.2936,0.0724 T0.3024,0.0705 T0.3072,0.068 T0.3092,0.0657 T0.3108,0.0647 Q0.3116,0.0643,0.3133,0.0643 L0.3157,0.0643 L0.3181,0.0643 Q0.3446,0.0643,0.3446,0.0556 T0.3205,0.0469 L0.3189,0.0469 Q0.3157,0.0469,0.3157,0.0465 Q0.3084,0.0427,0.2835,0.0386 Q0.2739,0.0369,0.2675,0.0342 T0.2538,0.0299 Q0.249,0.029,0.245,0.029 T0.2378,0.0303 T0.2321,0.0315 Q0.2305,0.0315,0.2273,0.0307 Q0.2201,0.0286,0.2004,0.0272 T0.1775,0.0245 Q0.1735,0.0228,0.1663,0.0226 T0.1522,0.0197 T0.1345,0.0145 T0.1124,0.0079 Q0.0996,0.0033,0.0671,0.0044 T0.0297,0.0041 Q0.0169,0,0.0024,0.0017 Q0,0.0021,0,0.0037 Z M0.0064,0.9954 L0.0056,0.0058 Q0.0177,0.005,0.0281,0.0083 Q0.0345,0.01,0.0675,0.0089 T0.1108,0.012 Q0.1221,0.0162,0.1329,0.0187 T0.1498,0.0236 T0.1606,0.0268 T0.1691,0.0274 T0.1759,0.0286 Q0.1807,0.0303,0.2,0.0315 T0.2257,0.0348 Q0.2305,0.0361,0.2337,0.0361 Q0.2361,0.0361,0.2398,0.0348 T0.2466,0.0336 Q0.249,0.0336,0.2522,0.034 Q0.2586,0.0353,0.2655,0.0382 T0.2827,0.0427 Q0.3068,0.0469,0.3124,0.0502 Q0.3157,0.0523,0.3237,0.0523 L0.3277,0.0523 L0.3309,0.0523 Q0.3398,0.0523,0.3398,0.0556 Q0.3398,0.0581,0.3341,0.0587 T0.3205,0.0593 T0.3092,0.0603 T0.3036,0.0643 T0.2932,0.068 Q0.2884,0.0684,0.2843,0.0684 Q0.2811,0.0684,0.2763,0.0678 T0.2667,0.0672 Q0.2586,0.0672,0.2422,0.0697 T0.2177,0.0747 Q0.2137,0.0759,0.1831,0.0767 T0.1494,0.0784 L0.1474,0.0784 T0.1398,0.078 T0.1285,0.0776 Q0.1173,0.0776,0.1084,0.08 Q0.1004,0.0817,0.1004,0.0846 Q0.1004,0.0867,0.104,0.0888 T0.1124,0.0923 T0.1213,0.0948 T0.1269,0.0958 T0.155,0.1014 T0.1863,0.107 Q0.2016,0.107,0.2185,0.1107 Q0.2217,0.1116,0.2257,0.1116 Q0.2289,0.1116,0.2365,0.1099 T0.2482,0.1074 L0.2538,0.1074 Q0.2683,0.1074,0.2912,0.1107 T0.3197,0.1182 Q0.3245,0.1215,0.3301,0.1215 Q0.3333,0.1215,0.3454,0.1184 T0.3687,0.1145 Q0.3735,0.1141,0.3779,0.1139 T0.3843,0.1134 T0.3871,0.1132 Q0.3896,0.1132,0.39,0.1136 T0.392,0.1161 T0.3968,0.1203 Q0.404,0.1248,0.408,0.1248 Q0.4096,0.1248,0.4165,0.1234 T0.4305,0.1215 L0.4337,0.1215 Q0.4442,0.1215,0.4518,0.1251 T0.4659,0.1294 Q0.4876,0.1319,0.5116,0.1319 T0.5622,0.141 Q0.5703,0.1439,0.5751,0.1439 Q0.5791,0.1439,0.5831,0.1423 T0.5888,0.1406 Q0.592,0.1406,0.5944,0.1412 T0.6012,0.1427 T0.6129,0.1435 Q0.6313,0.1435,0.649,0.1497 Q0.6602,0.1535,0.6667,0.1535 Q0.6715,0.1535,0.6779,0.1522 Q0.6787,0.1518,0.6795,0.1518 Q0.6827,0.1518,0.6847,0.1541 T0.6867,0.1593 Q0.6867,0.1618,0.6851,0.1634 Q0.6835,0.1655,0.6775,0.1667 T0.6598,0.169 T0.6458,0.1705 T0.6402,0.1709 Q0.6378,0.1709,0.6321,0.1705 T0.6225,0.1701 Q0.6096,0.1701,0.5968,0.1738 Q0.5823,0.1779,0.5446,0.1779 Q0.5205,0.1779,0.5116,0.1767 Q0.51,0.1763,0.5084,0.1763 Q0.5028,0.1763,0.4944,0.1796 T0.4835,0.1829 L0.4771,0.1833 T0.4659,0.1844 L0.4546,0.1858 T0.443,0.1881 T0.4337,0.1912 Q0.4321,0.1916,0.4305,0.1916 Q0.4273,0.1916,0.4209,0.1895 T0.412,0.1875 Q0.408,0.1875,0.4056,0.19 Q0.4024,0.1925,0.388,0.1925 Q0.3663,0.1925,0.3558,0.1879 Q0.3518,0.1862,0.3462,0.1862 Q0.3373,0.1862,0.3213,0.191 T0.3012,0.1962 Q0.2964,0.1966,0.2799,0.1976 T0.2494,0.1997 T0.2313,0.2024 L0.2313,0.2024 L0.2293,0.2024 L0.2261,0.2024 L0.2217,0.2024 Q0.204,0.2024,0.1851,0.2047 T0.1526,0.2136 Q0.1406,0.2198,0.1406,0.226 Q0.1406,0.2319,0.1518,0.2362 T0.1719,0.2406 Q0.1791,0.2406,0.2466,0.2497 Q0.2498,0.2501,0.2574,0.2516 T0.2711,0.2538 T0.2819,0.2547 L0.2851,0.2547 Q0.2851,0.2543,0.2859,0.2543 Q0.294,0.2543,0.3096,0.2592 T0.3285,0.2684 Q0.3317,0.2721,0.3373,0.2721 Q0.3406,0.2721,0.3462,0.2708 T0.3542,0.2696 Q0.3558,0.2696,0.3574,0.27 Q0.3679,0.2737,0.3968,0.2762 Q0.3984,0.2766,0.4004,0.2779 L0.4044,0.2804 T0.4096,0.2816 Q0.412,0.2816,0.4145,0.2808 Q0.4177,0.2804,0.4249,0.2804 Q0.4586,0.2804,0.4763,0.287 Q0.4867,0.2912,0.4972,0.2912 Q0.5004,0.2912,0.5064,0.2908 T0.5165,0.2903 Q0.5293,0.2903,0.5361,0.2922 T0.547,0.3003 L0.547,0.3011 Q0.547,0.3036,0.5414,0.3049 T0.5249,0.3067 T0.51,0.3082 Q0.5092,0.3082,0.4831,0.3111 T0.4498,0.3161 Q0.408,0.3264,0.3952,0.3264 Q0.3896,0.3264,0.3863,0.3252 Q0.3783,0.3223,0.3703,0.3223 Q0.359,0.3223,0.3494,0.3277 Q0.347,0.3293,0.343,0.3293 Q0.3414,0.3293,0.3353,0.3285 T0.3253,0.3277 T0.3181,0.3285 Q0.3149,0.3289,0.2952,0.3306 T0.2699,0.3347 Q0.2675,0.3364,0.2598,0.3372 T0.2434,0.3395 T0.2297,0.3426 L0.2205,0.3461 T0.2048,0.3523 T0.1908,0.3606 T0.1791,0.3725 Q0.1743,0.3803,0.1743,0.3845 Q0.1743,0.3874,0.1763,0.3901 T0.1827,0.3976 T0.1912,0.4073 T0.198,0.4189 T0.2032,0.4276 T0.2137,0.4326 T0.2386,0.438 Q0.2458,0.4392,0.2562,0.4392 L0.2639,0.4392 L0.2699,0.4392 Q0.2795,0.4392,0.2843,0.4405 Q0.2932,0.443,0.3092,0.443 L0.3157,0.443 L0.3213,0.443 Q0.3293,0.443,0.3458,0.4463 T0.3671,0.4525 Q0.3598,0.4558,0.3373,0.4571 Q0.3124,0.4587,0.298,0.4637 Q0.294,0.465,0.2811,0.465 L0.2703,0.465 L0.2586,0.465 Q0.241,0.465,0.2305,0.4666 Q0.2185,0.4687,0.2185,0.4728 Q0.2185,0.4745,0.2205,0.4764 T0.2241,0.4791 L0.2265,0.4803 L0.2273,0.4803 Q0.2506,0.4824,0.261,0.4824 Q0.2675,0.4824,0.2699,0.482 Q0.2699,0.4815,0.2707,0.4815 Q0.2771,0.4815,0.3124,0.4898 Q0.3173,0.4907,0.3229,0.4913 T0.3386,0.4925 T0.3542,0.4936 T0.3663,0.494 Q0.3711,0.494,0.3787,0.4936 T0.3888,0.4932 Q0.392,0.4932,0.3944,0.4936 T0.4032,0.4959 T0.4181,0.499 T0.4369,0.5006 Q0.449,0.501,0.455,0.5021 T0.4639,0.5048 T0.4675,0.5093 L0.4675,0.5097 Q0.4675,0.5106,0.4663,0.511 T0.4622,0.5116 L0.4566,0.512 T0.4486,0.5124 T0.4402,0.5127 Q0.4345,0.5131,0.4257,0.5153 T0.4096,0.5176 Q0.4064,0.5176,0.4024,0.5172 L0.3968,0.5172 Q0.3863,0.5172,0.3731,0.522 T0.359,0.5268 Q0.355,0.528,0.3317,0.5321 T0.3004,0.5388 Q0.2867,0.5433,0.2337,0.5479 Q0.2096,0.55,0.2096,0.5562 Q0.2096,0.5591,0.2145,0.5628 Q0.2193,0.5662,0.2289,0.5662 Q0.2313,0.5662,0.2373,0.5657 T0.2458,0.5653 L0.2498,0.5653 Q0.2635,0.5674,0.3124,0.5674 Q0.3261,0.5674,0.3301,0.567 L0.3317,0.567 Q0.3341,0.567,0.3394,0.568 T0.3486,0.5691 Q0.3542,0.5691,0.3606,0.5678 T0.3699,0.5666 T0.3759,0.5686 T0.3839,0.5718 T0.3908,0.573 T0.3964,0.5734 T0.4048,0.5742 T0.4165,0.5751 T0.4277,0.5757 T0.4369,0.5778 Q0.4426,0.5794,0.4538,0.5794 Q0.4586,0.5794,0.4679,0.5792 T0.4811,0.579 Q0.4924,0.579,0.4956,0.5807 Q0.502,0.584,0.5108,0.584 L0.5137,0.584 T0.5173,0.5838 L0.5205,0.5834 L0.5237,0.583 L0.5269,0.5825 T0.5305,0.5821 T0.5341,0.5819 L0.5365,0.5819 Q0.5414,0.5819,0.5562,0.5842 T0.5855,0.5865 Q0.5912,0.5865,0.5948,0.5867 T0.6012,0.5869 T0.6064,0.5873 T0.61,0.5877 T0.6133,0.5886 T0.6157,0.5896 L0.6185,0.591 T0.6217,0.5931 Q0.6265,0.5952,0.6369,0.5952 L0.6418,0.5952 L0.6466,0.5952 Q0.6723,0.5952,0.6932,0.606 Q0.698,0.608,0.7044,0.608 Q0.7084,0.608,0.7161,0.6068 T0.7261,0.6056 Q0.7309,0.6056,0.7454,0.6051 T0.7647,0.6047 Q0.7775,0.6047,0.8072,0.6101 Q0.8096,0.6105,0.812,0.6105 Q0.8177,0.6105,0.8297,0.6085 T0.8474,0.606 L0.8506,0.606 Q0.8562,0.606,0.8647,0.607 T0.8831,0.6095 T0.8964,0.6118 Q0.9036,0.6122,0.9221,0.6122 L0.9406,0.6122 L0.959,0.6122 L0.9767,0.6122 Q0.9952,0.613,0.9952,0.6172 Q0.9952,0.6176,0.9944,0.6221 Q0.9936,0.6259,0.9574,0.6259 L0.955,0.6259 L0.9526,0.6259 Q0.9478,0.6259,0.9373,0.628 T0.9205,0.63 L0.9173,0.63 Q0.9133,0.6296,0.9084,0.6296 Q0.9004,0.6296,0.8715,0.6321 Q0.8233,0.6367,0.7944,0.64 Q0.7888,0.6408,0.7839,0.6408 T0.7739,0.6402 T0.7671,0.6396 Q0.7639,0.6396,0.7622,0.64 Q0.7614,0.6404,0.759,0.6404 Q0.7574,0.6404,0.749,0.6398 T0.7357,0.6392 Q0.7261,0.6392,0.7213,0.6412 Q0.7173,0.6425,0.7032,0.6437 T0.6711,0.6458 T0.6474,0.647 Q0.645,0.6474,0.6418,0.6474 Q0.6353,0.6474,0.6277,0.6454 T0.6161,0.6433 Q0.6104,0.6433,0.6072,0.6456 T0.6,0.6479 Q0.5912,0.6479,0.5486,0.6557 Q0.5422,0.657,0.5373,0.657 Q0.5349,0.657,0.5289,0.6564 T0.5173,0.6557 L0.5124,0.6557 Q0.4996,0.6562,0.4739,0.6611 Q0.4675,0.6624,0.4398,0.6645 T0.3851,0.668 T0.3558,0.6698 Q0.355,0.6698,0.3285,0.6721 T0.2948,0.6752 Q0.2892,0.6761,0.2843,0.6786 T0.2747,0.6831 T0.2618,0.6852 Q0.253,0.6852,0.2394,0.6893 T0.2141,0.6993 T0.1968,0.7105 Q0.1944,0.713,0.1944,0.7155 Q0.1944,0.7196,0.2012,0.7229 T0.2177,0.7285 T0.2281,0.7308 Q0.2321,0.7329,0.2365,0.7339 T0.245,0.7356 T0.2514,0.7366 Q0.2522,0.737,0.2554,0.7379 T0.2614,0.7393 T0.2679,0.7406 T0.2755,0.7416 T0.2835,0.742 Q0.29,0.742,0.3048,0.7428 T0.3253,0.7437 L0.3301,0.7437 L0.3333,0.7437 Q0.3341,0.7437,0.3598,0.7466 Q0.3639,0.7474,0.3671,0.7474 T0.3759,0.7466 T0.3855,0.7457 Q0.388,0.7457,0.3904,0.7462 Q0.3984,0.7466,0.4137,0.7495 T0.4349,0.7532 T0.441,0.7557 Q0.441,0.7599,0.4289,0.7619 Q0.4257,0.7628,0.4197,0.7634 T0.4072,0.7644 T0.3984,0.7652 Q0.3968,0.7652,0.3912,0.7655 T0.3811,0.7665 T0.3719,0.7694 Q0.3695,0.7702,0.3655,0.7702 T0.3546,0.7686 T0.3462,0.7665 L0.3446,0.7665 Q0.3406,0.7665,0.3293,0.769 T0.3149,0.7715 Q0.3084,0.7715,0.2952,0.7748 T0.2763,0.781 Q0.2675,0.7847,0.2554,0.7864 Q0.253,0.7864,0.2325,0.7874 T0.2024,0.7893 Q0.2008,0.7893,0.1984,0.7897 T0.1948,0.7901 T0.1916,0.7903 T0.1888,0.7908 T0.1867,0.7914 T0.1847,0.7922 L0.1831,0.793 T0.1819,0.7943 L0.1811,0.7959 T0.1799,0.7976 Q0.1791,0.7993,0.1791,0.8001 Q0.1791,0.8034,0.1831,0.8051 T0.1932,0.8078 T0.2,0.8092 Q0.2072,0.8117,0.2257,0.8117 Q0.2337,0.8117,0.2586,0.8109 L0.2635,0.8109 Q0.2707,0.8109,0.2767,0.8117 T0.2859,0.8136 T0.2936,0.8163 T0.3012,0.8187 Q0.3068,0.82,0.3277,0.8206 T0.3526,0.8237 Q0.3582,0.8266,0.3622,0.8266 Q0.3647,0.8266,0.3687,0.8258 T0.3751,0.825 Q0.396,0.825,0.404,0.8291 Q0.408,0.8316,0.4161,0.8316 Q0.4217,0.8316,0.4353,0.8295 L0.4394,0.8295 Q0.4466,0.8295,0.4659,0.8366 Q0.4699,0.8378,0.4747,0.8378 Q0.4763,0.8378,0.4807,0.8374 T0.4884,0.837 Q0.494,0.837,0.5004,0.8382 Q0.5052,0.8391,0.5124,0.8399 Q0.5221,0.8411,0.5249,0.8422 T0.5277,0.8461 Q0.5277,0.8482,0.5233,0.849 T0.5112,0.8501 T0.4996,0.8511 Q0.4964,0.8519,0.4851,0.8523 T0.4659,0.8544 Q0.4578,0.8557,0.4402,0.8557 L0.4349,0.8557 L0.4297,0.8557 L0.4209,0.8557 Q0.408,0.8565,0.3867,0.8571 T0.3614,0.8582 Q0.3317,0.8611,0.3237,0.8611 L0.3225,0.8611 L0.3213,0.8611 Q0.2972,0.8611,0.2972,0.8681 Q0.2972,0.8714,0.3008,0.8747 T0.3044,0.8805 Q0.3044,0.881,0.3036,0.8814 Q0.3012,0.8839,0.2851,0.8839 Q0.2779,0.8839,0.2739,0.883 Q0.2723,0.8826,0.2699,0.8826 T0.2643,0.8835 T0.259,0.8853 T0.2542,0.8876 T0.249,0.8893 Q0.2386,0.8922,0.2056,0.8946 Q0.2016,0.8951,0.1916,0.898 T0.1703,0.9009 Q0.1518,0.9009,0.1337,0.9044 T0.1149,0.9146 L0.1149,0.9158 Q0.1149,0.9175,0.1157,0.9187 T0.1173,0.921 T0.1201,0.9226 T0.1233,0.9237 T0.1269,0.9245 L0.1305,0.9251 T0.1337,0.9255 L0.1357,0.9258 Q0.139,0.9262,0.1446,0.9262 T0.1542,0.9266 T0.1598,0.9282 Q0.1614,0.9303,0.1647,0.9314 T0.1739,0.9328 T0.1815,0.9336 Q0.1863,0.9345,0.1976,0.9372 T0.2145,0.9415 Q0.2225,0.9432,0.2285,0.9467 T0.2378,0.9515 Q0.2426,0.9531,0.2514,0.9531 Q0.2538,0.9531,0.2602,0.9529 T0.2707,0.9527 Q0.2763,0.9527,0.2815,0.9531 T0.2867,0.9569 T0.2811,0.9614 Q0.2434,0.9627,0.2329,0.9652 Q0.2249,0.9672,0.2241,0.9672 L0.2096,0.9668 L0.2056,0.9668 Q0.2,0.9668,0.196,0.9672 T0.1884,0.9687 T0.1815,0.9708 T0.1731,0.9737 T0.1639,0.9772 Q0.1518,0.9805,0.1285,0.9805 L0.1253,0.9805 Q0.1124,0.9805,0.1076,0.9818 Q0.1012,0.983,0.0831,0.9876 T0.0594,0.9934 Q0.049,0.9954,0.0064,0.9954 Z M0.0032,0.9979 L0.0024,0.0037 Q0.0161,0.0021,0.0289,0.0062 Q0.0337,0.0075,0.0671,0.0066 T0.1116,0.01 T0.1337,0.0166 T0.151,0.022 Q0.1582,0.0249,0.1659,0.0251 T0.1767,0.0265 Q0.1807,0.0278,0.2,0.0292 T0.2265,0.0328 Q0.2305,0.034,0.2329,0.034 T0.239,0.0326 T0.2458,0.0311 T0.253,0.0319 Q0.2578,0.0332,0.2614,0.0342 T0.2667,0.0363 T0.2723,0.0384 T0.2827,0.0406 Q0.3084,0.0448,0.3141,0.0485 Q0.3149,0.0494,0.3225,0.0494 T0.3361,0.0504 T0.3422,0.0554 T0.3357,0.0606 T0.3205,0.0618 T0.31,0.0626 Q0.3092,0.0626,0.3056,0.0659 T0.2932,0.0701 Q0.2884,0.0709,0.2843,0.0709 Q0.2811,0.0709,0.2759,0.0701 T0.2667,0.0693 Q0.2586,0.0693,0.2422,0.0718 T0.2193,0.0763 Q0.2137,0.0784,0.1831,0.079 T0.1502,0.0805 Q0.1494,0.0809,0.147,0.0809 Q0.1454,0.0809,0.1386,0.0803 T0.1277,0.0796 Q0.1173,0.0796,0.1092,0.0821 Q0.1036,0.0834,0.1036,0.0854 Q0.1036,0.0879,0.1129,0.0908 T0.1269,0.0937 Q0.1293,0.0937,0.1558,0.0991 T0.1863,0.1045 Q0.2016,0.1045,0.2193,0.1087 Q0.2225,0.1091,0.2249,0.1091 Q0.2289,0.1091,0.2357,0.1076 T0.2482,0.1054 Q0.2506,0.1049,0.2546,0.1049 Q0.2699,0.1049,0.2924,0.1085 T0.3213,0.1165 Q0.3253,0.119,0.3301,0.119 Q0.3325,0.119,0.3446,0.1161 T0.3687,0.1124 Q0.3831,0.1112,0.3863,0.1112 T0.3908,0.1118 T0.3936,0.1145 T0.3984,0.1186 Q0.4048,0.1228,0.408,0.1228 Q0.4096,0.1228,0.4161,0.1213 T0.4305,0.1195 L0.4337,0.1195 Q0.4426,0.1195,0.4474,0.1211 T0.4566,0.1246 T0.4667,0.1273 Q0.4876,0.1298,0.5116,0.1298 Q0.5365,0.1298,0.5631,0.1389 Q0.5703,0.1414,0.5751,0.1414 Q0.5783,0.1414,0.5819,0.1398 T0.5888,0.1381 Q0.5928,0.1381,0.5984,0.1398 T0.6129,0.1414 Q0.6321,0.1414,0.6498,0.1477 Q0.661,0.1514,0.6667,0.1514 Q0.6707,0.1514,0.6771,0.1501 Q0.6787,0.1497,0.6795,0.1497 Q0.6835,0.1497,0.6863,0.1526 T0.6892,0.1593 Q0.6892,0.1626,0.6876,0.1647 Q0.6851,0.1672,0.6799,0.1686 T0.6695,0.1705 T0.6566,0.1715 T0.6458,0.1725 Q0.6434,0.173,0.6402,0.173 Q0.6378,0.173,0.6317,0.1727 T0.6225,0.1725 Q0.6096,0.1725,0.5984,0.1759 Q0.5823,0.1804,0.5454,0.1804 Q0.5205,0.1804,0.5116,0.1788 L0.5084,0.1788 Q0.5036,0.1788,0.4956,0.1819 T0.4843,0.185 Q0.4434,0.1887,0.4353,0.1929 Q0.4321,0.1945,0.4289,0.1945 T0.4197,0.1922 T0.4112,0.19 T0.4072,0.1912 Q0.4032,0.1949,0.388,0.1949 Q0.3663,0.1949,0.3542,0.19 Q0.351,0.1883,0.3462,0.1883 Q0.3406,0.1883,0.3321,0.1906 T0.3153,0.1954 T0.302,0.1983 Q0.2972,0.1991,0.2859,0.1997 T0.2643,0.201 T0.245,0.2024 T0.2337,0.2041 Q0.2321,0.2045,0.2181,0.2045 T0.1851,0.207 T0.1542,0.2157 Q0.143,0.2211,0.143,0.226 Q0.143,0.2314,0.153,0.2348 T0.1719,0.2381 Q0.1791,0.2381,0.2474,0.2476 Q0.2506,0.248,0.2558,0.2489 T0.2651,0.2505 T0.2739,0.252 T0.2819,0.2526 Q0.2835,0.2526,0.2851,0.2522 L0.2859,0.2522 Q0.2948,0.2522,0.3104,0.2574 T0.3309,0.2671 Q0.3333,0.2696,0.3365,0.2696 Q0.339,0.2696,0.3442,0.2684 T0.3526,0.2671 T0.3582,0.2679 Q0.3687,0.2717,0.3968,0.2742 Q0.4,0.2746,0.4036,0.2771 T0.4096,0.2796 Q0.4112,0.2796,0.4137,0.2787 Q0.4169,0.2779,0.4257,0.2779 Q0.4594,0.2779,0.4779,0.2849 Q0.4876,0.2891,0.4972,0.2891 Q0.4996,0.2891,0.506,0.2887 T0.5165,0.2883 Q0.5253,0.2883,0.5305,0.2889 T0.541,0.292 T0.5494,0.299 L0.5494,0.3015 Q0.5494,0.3036,0.5466,0.3051 T0.5386,0.3073 T0.5285,0.3086 T0.5181,0.3094 T0.5108,0.3102 Q0.5068,0.3107,0.494,0.3121 L0.4683,0.315 T0.4506,0.3181 Q0.449,0.3181,0.4426,0.32 T0.4313,0.3229 T0.4197,0.3256 T0.4064,0.3281 T0.3952,0.3289 Q0.3888,0.3289,0.3855,0.3273 Q0.3783,0.3243,0.3703,0.3243 Q0.3598,0.3243,0.351,0.3297 Q0.3478,0.3314,0.3422,0.3314 Q0.3398,0.3314,0.3337,0.3306 T0.3245,0.3297 T0.3189,0.3306 Q0.3149,0.3314,0.2956,0.3328 T0.2715,0.3368 Q0.2691,0.338,0.2635,0.3391 T0.2522,0.3407 T0.2406,0.3424 T0.2313,0.3447 Q0.2305,0.3447,0.2213,0.348 T0.206,0.354 T0.1924,0.3621 T0.1815,0.3733 Q0.1767,0.3816,0.1767,0.3849 Q0.1767,0.387,0.1783,0.3893 T0.1847,0.3961 T0.1936,0.4063 T0.2004,0.4181 T0.2052,0.4264 T0.2145,0.4309 T0.2386,0.4359 Q0.2458,0.4372,0.2554,0.4372 Q0.2578,0.4372,0.2627,0.437 T0.2699,0.4367 Q0.2795,0.4367,0.2851,0.4384 Q0.294,0.4409,0.3092,0.4409 Q0.3116,0.4409,0.3157,0.4407 T0.3213,0.4405 Q0.3301,0.4405,0.3466,0.444 T0.3687,0.4509 Q0.3703,0.4517,0.3703,0.4525 Q0.3703,0.4575,0.3373,0.4596 Q0.3133,0.4608,0.2988,0.4658 Q0.294,0.4674,0.2803,0.4674 Q0.2763,0.4674,0.2687,0.4672 T0.257,0.467 Q0.2402,0.467,0.2313,0.4687 Q0.2209,0.4708,0.2209,0.4737 Q0.2209,0.4741,0.2213,0.4749 T0.2229,0.4764 L0.2249,0.4774 T0.2265,0.4778 L0.2273,0.4782 Q0.2498,0.4803,0.2618,0.4803 Q0.2667,0.4803,0.2691,0.4799 Q0.2699,0.4795,0.2715,0.4795 Q0.2779,0.4795,0.3133,0.4873 Q0.3181,0.4886,0.3233,0.4892 T0.3386,0.4905 T0.3542,0.4915 T0.3655,0.4919 Q0.3703,0.4919,0.3779,0.4915 T0.3888,0.4911 T0.3952,0.4915 Q0.3976,0.4919,0.4008,0.4927 L0.4072,0.4944 T0.4149,0.4961 T0.4249,0.4975 T0.4369,0.4985 Q0.449,0.499,0.4554,0.5 T0.4651,0.5031 T0.4699,0.5085 Q0.4707,0.5093,0.4707,0.5097 Q0.4707,0.5114,0.4687,0.5124 T0.4631,0.5139 T0.4562,0.5145 T0.4478,0.5147 L0.4402,0.5147 Q0.4353,0.5151,0.4265,0.5174 T0.4096,0.5197 L0.4024,0.5197 Q0.4,0.5193,0.3968,0.5193 Q0.3896,0.5193,0.3831,0.5209 T0.3703,0.5253 T0.3598,0.5288 Q0.3558,0.5301,0.3321,0.5342 T0.302,0.5409 Q0.2876,0.5454,0.2337,0.55 Q0.2112,0.5521,0.2112,0.5558 Q0.2112,0.5574,0.2161,0.5612 Q0.2201,0.5637,0.2281,0.5637 Q0.2305,0.5637,0.2361,0.5633 T0.2442,0.5628 Q0.2474,0.5628,0.2498,0.5633 Q0.2635,0.5653,0.3133,0.5653 Q0.3261,0.5653,0.3301,0.5649 L0.3325,0.5649 Q0.3349,0.5649,0.3402,0.5657 T0.3494,0.5666 Q0.3542,0.5666,0.3598,0.5657 Q0.3663,0.5645,0.3695,0.5645 Q0.3735,0.5645,0.3775,0.5666 T0.3847,0.5695 Q0.3888,0.5707,0.3912,0.5709 T0.3968,0.5711 T0.4048,0.572 Q0.4096,0.5724,0.4165,0.5726 T0.4281,0.5734 T0.4378,0.5757 Q0.4418,0.5774,0.4522,0.5774 Q0.4562,0.5774,0.4655,0.5769 T0.4795,0.5765 Q0.4932,0.5765,0.4972,0.579 Q0.5028,0.5819,0.51,0.5819 Q0.5141,0.5819,0.5221,0.5809 T0.5341,0.5798 L0.5373,0.5798 Q0.5422,0.5798,0.557,0.5821 T0.5855,0.5844 L0.5936,0.5844 L0.5992,0.5844 T0.604,0.5848 T0.6076,0.5852 T0.6108,0.5859 T0.6137,0.5865 T0.6161,0.5873 T0.6181,0.5881 T0.6209,0.5896 L0.6233,0.591 Q0.6265,0.5927,0.6353,0.5927 L0.6402,0.5927 L0.645,0.5927 Q0.6723,0.5927,0.6948,0.6039 Q0.6988,0.606,0.7036,0.606 Q0.7076,0.606,0.7153,0.6045 T0.7261,0.6031 Q0.7309,0.6031,0.7454,0.6027 T0.7647,0.6022 Q0.7783,0.6022,0.808,0.608 L0.812,0.608 Q0.8169,0.608,0.8293,0.6062 T0.8474,0.6039 L0.8506,0.6039 Q0.857,0.6039,0.8655,0.6049 T0.8835,0.6074 T0.8972,0.6093 Q0.9036,0.6101,0.9213,0.6101 L0.9398,0.6101 L0.959,0.6101 L0.9767,0.6101 Q0.9976,0.6109,0.9976,0.6176 Q0.9976,0.6188,0.9968,0.6226 Q0.9952,0.6284,0.9671,0.6284 L0.959,0.6284 L0.9526,0.6284 Q0.9486,0.6284,0.9382,0.6302 T0.9205,0.6321 L0.9173,0.6321 Q0.9133,0.6317,0.9092,0.6317 Q0.9012,0.6317,0.8715,0.6346 Q0.8233,0.6387,0.7944,0.6421 Q0.7888,0.6429,0.7831,0.6429 Q0.7783,0.6429,0.7731,0.6425 T0.7663,0.6421 L0.7622,0.6421 Q0.7614,0.6425,0.7586,0.6425 T0.7474,0.6421 T0.7349,0.6416 Q0.7261,0.6416,0.7221,0.6429 Q0.7173,0.645,0.7032,0.646 T0.6711,0.6479 T0.6482,0.6491 Q0.645,0.6495,0.6418,0.6495 Q0.6353,0.6495,0.6273,0.6474 T0.6161,0.6454 Q0.612,0.6454,0.6088,0.6477 T0.6,0.6499 Q0.5912,0.6499,0.5494,0.6578 Q0.5422,0.6591,0.5373,0.6591 Q0.5341,0.6591,0.5281,0.6584 T0.5173,0.6578 L0.5124,0.6578 Q0.5004,0.6582,0.4747,0.6632 Q0.4675,0.6649,0.4398,0.6667 T0.3851,0.6703 T0.3566,0.6719 Q0.3534,0.6723,0.3406,0.6734 T0.3141,0.6757 T0.2948,0.6773 Q0.2908,0.6781,0.2819,0.6829 T0.2618,0.6877 Q0.2482,0.6877,0.2273,0.6958 T0.1992,0.7117 Q0.1976,0.7138,0.1976,0.7155 Q0.1976,0.7188,0.2032,0.7213 T0.2181,0.7258 T0.2289,0.7292 Q0.2337,0.7308,0.2378,0.7316 L0.2458,0.7333 T0.2522,0.7345 Q0.2747,0.7399,0.2835,0.7399 Q0.29,0.7399,0.3048,0.7408 T0.3253,0.7416 Q0.3277,0.7416,0.3297,0.7414 T0.3341,0.7412 L0.3598,0.7445 Q0.3639,0.7449,0.3663,0.7449 Q0.3695,0.7449,0.3751,0.7443 T0.3855,0.7437 L0.3904,0.7437 Q0.3984,0.7441,0.4141,0.7472 T0.4353,0.7507 Q0.4434,0.752,0.4434,0.7553 Q0.4434,0.7578,0.439,0.7605 T0.4297,0.764 Q0.4257,0.7648,0.4201,0.7655 T0.4076,0.7665 T0.3984,0.7673 Q0.3968,0.7673,0.3912,0.7677 T0.3815,0.7688 T0.3735,0.771 T0.3655,0.7727 Q0.3606,0.7727,0.3534,0.7708 T0.3458,0.769 L0.3446,0.769 Q0.3414,0.769,0.3297,0.7713 T0.3149,0.7735 Q0.3092,0.7735,0.296,0.7771 T0.2771,0.7831 Q0.2683,0.7872,0.2554,0.7885 Q0.253,0.7889,0.2325,0.7897 T0.2032,0.7914 Q0.2008,0.7918,0.198,0.792 T0.194,0.7924 T0.1912,0.7928 T0.1888,0.793 T0.1867,0.7934 T0.1851,0.7943 T0.1843,0.7953 T0.1835,0.7968 T0.1823,0.7984 T0.1815,0.8001 Q0.1815,0.8022,0.1847,0.8032 T0.1932,0.8053 T0.2008,0.8071 Q0.2072,0.8092,0.2265,0.8092 Q0.2361,0.8092,0.2586,0.8088 L0.2635,0.8088 Q0.2731,0.8088,0.2795,0.8098 T0.2928,0.8134 T0.302,0.8167 Q0.306,0.8179,0.3277,0.8183 T0.3542,0.8221 Q0.359,0.8246,0.3622,0.8246 Q0.3639,0.8246,0.3675,0.8237 T0.3751,0.8229 Q0.3968,0.8229,0.4048,0.8275 Q0.4088,0.8291,0.4161,0.8291 Q0.4225,0.8291,0.4353,0.8275 Q0.4369,0.827,0.4394,0.827 Q0.4474,0.827,0.4675,0.8345 Q0.4707,0.8358,0.4739,0.8358 Q0.4755,0.8358,0.4799,0.8353 T0.4876,0.8349 Q0.494,0.8349,0.5012,0.8362 L0.5076,0.837 T0.5133,0.8376 T0.5181,0.8382 T0.5221,0.8391 L0.5253,0.8399 T0.5277,0.8409 L0.5293,0.8422 T0.5301,0.8438 L0.5301,0.8461 Q0.5301,0.8499,0.5249,0.8511 T0.5112,0.8526 T0.5004,0.8532 Q0.4964,0.854,0.4851,0.8546 T0.4667,0.8565 Q0.4578,0.8577,0.441,0.8577 L0.4345,0.8577 L0.4289,0.8577 L0.4209,0.8577 Q0.4153,0.8582,0.4088,0.8586 T0.3968,0.8592 T0.3855,0.8594 T0.3755,0.8596 T0.3675,0.86 T0.3622,0.8602 Q0.3317,0.8635,0.3237,0.8635 Q0.2996,0.8635,0.2996,0.8681 Q0.2996,0.8698,0.3032,0.8733 T0.3068,0.8797 L0.3068,0.8822 Q0.3052,0.8859,0.2859,0.8859 Q0.2787,0.8859,0.2739,0.8851 L0.2699,0.8851 Q0.2659,0.8851,0.259,0.888 T0.2498,0.8913 Q0.2394,0.8946,0.2056,0.8971 Q0.2032,0.8971,0.1928,0.9002 T0.1703,0.9034 Q0.1526,0.9034,0.1353,0.9067 T0.1173,0.915 L0.1173,0.9158 Q0.1173,0.9166,0.1177,0.9175 T0.1189,0.9191 T0.1205,0.9204 T0.1229,0.9212 T0.1257,0.922 T0.1285,0.9226 T0.1309,0.9231 T0.1337,0.9235 T0.1365,0.9237 L0.1446,0.9237 T0.1554,0.9243 T0.1614,0.9268 T0.1659,0.9293 T0.1743,0.9303 T0.1823,0.9316 Q0.1863,0.932,0.1912,0.9332 T0.2028,0.9361 T0.2153,0.939 Q0.2233,0.9411,0.2297,0.9448 T0.2386,0.9494 Q0.2426,0.9506,0.2506,0.9506 Q0.253,0.9506,0.2594,0.9504 T0.2699,0.9502 Q0.2763,0.9502,0.2819,0.9511 Q0.2851,0.9511,0.2871,0.9529 T0.2892,0.9573 Q0.2892,0.9627,0.2811,0.9635 Q0.2434,0.9652,0.2337,0.9672 Q0.2257,0.9693,0.2241,0.9693 Q0.2217,0.9693,0.2096,0.9689 L0.2056,0.9689 Q0.1976,0.9689,0.1924,0.9699 T0.1787,0.9741 L0.1647,0.9793 Q0.1518,0.983,0.1285,0.983 L0.1261,0.983 L0.1237,0.983 Q0.1124,0.983,0.1076,0.9838 Q0.102,0.9851,0.0839,0.9896 T0.0602,0.9954 T0.0406,0.9971 T0.0153,0.9979 L0.0032,0.9979 Z", type: 0 } }, "\\uE0CA": { type: 5, data: { d: "M0.9992,0.998 Q0.9992,1,0.9968,1 Q0.9521,1,0.9392,0.998 Q0.9335,0.997,0.9152,0.9921 T0.8913,0.9862 Q0.8873,0.9852,0.8783,0.9852 L0.8747,0.9852 L0.871,0.9852 Q0.8483,0.9852,0.8345,0.9812 Q0.8289,0.9792,0.8228,0.9773 T0.8135,0.9743 T0.8054,0.9723 T0.7948,0.9713 L0.7908,0.9713 L0.777,0.9713 T0.7656,0.9693 Q0.7616,0.9683,0.7498,0.9674 T0.7283,0.9664 L0.7186,0.9654 Q0.708,0.9644,0.708,0.9575 Q0.708,0.9545,0.7109,0.952 T0.7178,0.9486 L0.7315,0.9486 L0.7417,0.9486 L0.7502,0.9486 Q0.7575,0.9486,0.7599,0.9476 Q0.7616,0.9466,0.7685,0.9426 T0.7843,0.9377 Q0.7899,0.9357,0.8009,0.9332 T0.8175,0.9298 Q0.82,0.9288,0.8228,0.9283 T0.8277,0.9278 T0.8313,0.9273 T0.8341,0.9263 T0.8362,0.9258 Q0.8402,0.9219,0.854,0.9219 L0.8569,0.9219 L0.8597,0.9219 L0.8637,0.9219 Q0.88,0.9199,0.88,0.9159 L0.88,0.9149 Q0.88,0.913,0.8719,0.911 T0.852,0.9075 T0.8297,0.906 Q0.8224,0.906,0.8167,0.905 T0.8074,0.9031 T0.8001,0.9006 T0.794,0.8991 Q0.7599,0.8971,0.7494,0.8942 Q0.7461,0.8932,0.7397,0.8902 T0.7299,0.8872 L0.7267,0.8872 Q0.721,0.8882,0.7121,0.8882 Q0.6926,0.8882,0.691,0.8833 L0.691,0.8803 Q0.691,0.8773,0.6922,0.8749 T0.6955,0.8704 L0.6975,0.8684 Q0.6926,0.8655,0.6764,0.8655 Q0.6683,0.8655,0.6375,0.8625 Q0.6358,0.8625,0.629,0.862 T0.6148,0.8615 T0.5973,0.861 T0.5791,0.8605 L0.5718,0.8605 L0.5661,0.8605 L0.5596,0.8605 Q0.5426,0.8605,0.5337,0.8586 Q0.5264,0.8576,0.515,0.8571 T0.4996,0.8556 Q0.498,0.8556,0.4947,0.8551 T0.4882,0.8546 T0.4809,0.8541 T0.474,0.8531 T0.4692,0.8506 T0.4672,0.8467 Q0.4672,0.8437,0.468,0.8422 T0.4704,0.8398 T0.4736,0.8383 T0.4781,0.8368 T0.4838,0.8358 T0.4911,0.8353 T0.4988,0.8338 Q0.5069,0.8328,0.5142,0.8328 Q0.5174,0.8328,0.5215,0.8333 T0.5264,0.8338 Q0.5296,0.8338,0.532,0.8328 Q0.5523,0.8249,0.5604,0.8249 L0.5653,0.8249 Q0.5775,0.8269,0.5848,0.8269 Q0.5912,0.8269,0.5937,0.8259 Q0.6026,0.821,0.6253,0.821 Q0.6294,0.821,0.6334,0.822 T0.6383,0.8229 Q0.6399,0.8229,0.644,0.82 Q0.6504,0.817,0.6723,0.816 T0.6975,0.814 Q0.6999,0.814,0.7048,0.8121 T0.7129,0.8091 T0.7226,0.8071 T0.7372,0.8061 L0.7421,0.8061 Q0.7624,0.8071,0.7721,0.8071 Q0.7924,0.8071,0.7981,0.8051 Q0.8021,0.8032,0.807,0.8027 T0.8135,0.8017 T0.8151,0.8002 L0.8151,0.7992 Q0.8143,0.7962,0.8127,0.7957 T0.8045,0.7943 Q0.7997,0.7943,0.7964,0.7933 Q0.7883,0.7933,0.7676,0.7923 T0.7437,0.7903 Q0.7307,0.7893,0.7218,0.7844 Q0.7194,0.7834,0.7141,0.7819 L0.7036,0.7789 T0.693,0.7765 T0.6853,0.7755 Q0.6805,0.7755,0.6691,0.773 T0.6553,0.7705 Q0.6545,0.7705,0.6545,0.7715 Q0.6537,0.7715,0.65,0.7725 T0.6423,0.774 T0.635,0.7745 Q0.6294,0.7745,0.6257,0.773 T0.618,0.771 T0.6083,0.77 T0.601,0.7695 Q0.5985,0.7695,0.5921,0.769 T0.5795,0.7676 T0.5702,0.7666 Q0.5653,0.7656,0.5596,0.7616 T0.5539,0.7547 Q0.5539,0.7498,0.5645,0.7488 Q0.5693,0.7478,0.5852,0.7448 T0.6099,0.7418 L0.6148,0.7418 Q0.6196,0.7418,0.6253,0.7423 T0.6338,0.7428 L0.6399,0.7428 Q0.6431,0.7418,0.6488,0.7409 T0.6586,0.7394 T0.6659,0.7389 L0.6707,0.7389 Q0.6723,0.7399,0.6748,0.7399 Q0.6796,0.7399,0.6946,0.7389 T0.7161,0.7379 Q0.7251,0.7379,0.7478,0.7319 Q0.7494,0.7319,0.7539,0.7315 T0.762,0.73 T0.7697,0.727 T0.7818,0.723 T0.7948,0.7196 T0.7997,0.7151 Q0.7997,0.7141,0.7989,0.7132 Q0.7924,0.7062,0.7717,0.6978 T0.738,0.6894 Q0.7267,0.6894,0.717,0.6845 T0.7048,0.6795 Q0.6975,0.6785,0.6711,0.6766 T0.6431,0.6746 Q0.6415,0.6736,0.6144,0.6721 T0.5596,0.6686 T0.5247,0.6657 Q0.4996,0.6607,0.4874,0.6597 L0.4834,0.6597 Q0.4785,0.6597,0.4724,0.6607 T0.4631,0.6617 Q0.4574,0.6617,0.4501,0.6597 Q0.4088,0.6518,0.4006,0.6518 Q0.3933,0.6518,0.3901,0.6499 T0.3844,0.6479 T0.3739,0.6499 T0.3585,0.6518 L0.352,0.6518 Q0.3471,0.6508,0.335,0.6503 T0.3122,0.6494 T0.2912,0.6479 T0.2766,0.6449 Q0.2733,0.6439,0.2668,0.6439 Q0.2628,0.6439,0.2543,0.6444 T0.2425,0.6449 T0.2368,0.6439 L0.2344,0.6439 Q0.2336,0.6439,0.2283,0.6444 T0.2182,0.6449 Q0.2117,0.6449,0.2052,0.6439 Q0.1768,0.6409,0.1281,0.637 Q0.0989,0.634,0.0916,0.634 L0.0835,0.634 L0.0795,0.634 Q0.0722,0.634,0.0616,0.632 T0.0479,0.6301 Q0.0462,0.6301,0.0406,0.6306 T0.0308,0.6311 Q0.0032,0.6311,0.0008,0.6231 Q0,0.6202,0,0.6182 Q0,0.6083,0.0227,0.6083 Q0.03,0.6073,0.0422,0.6073 Q0.0487,0.6073,0.0608,0.6078 T0.0787,0.6083 Q0.0973,0.6083,0.103,0.6073 Q0.1062,0.6063,0.1131,0.6053 T0.1253,0.6039 T0.1375,0.6024 T0.1492,0.6014 L0.1533,0.6014 Q0.1598,0.6024,0.1723,0.6044 T0.189,0.6063 Q0.1906,0.6063,0.1922,0.6053 Q0.2214,0.6004,0.236,0.6004 Q0.2409,0.6004,0.2551,0.6009 T0.2741,0.6014 Q0.2782,0.6014,0.2859,0.6024 T0.2968,0.6034 Q0.3009,0.6034,0.3041,0.6024 Q0.3277,0.5905,0.356,0.5905 L0.3613,0.5905 L0.3666,0.5905 Q0.3731,0.5905,0.3755,0.5895 Q0.382,0.5856,0.3844,0.5846 T0.3938,0.5831 T0.4144,0.5826 T0.4428,0.5801 T0.4631,0.5776 L0.4663,0.5776 Q0.4704,0.5776,0.4785,0.5786 T0.4899,0.5796 Q0.4964,0.5796,0.5012,0.5767 Q0.5069,0.5737,0.5223,0.5737 Q0.5272,0.5737,0.5369,0.5742 T0.5499,0.5747 Q0.558,0.5747,0.5612,0.5737 Q0.5661,0.5717,0.5714,0.5712 T0.5835,0.5702 T0.5945,0.5692 T0.6018,0.5687 L0.6062,0.5687 T0.6095,0.5682 T0.6148,0.5678 Q0.6172,0.5668,0.6196,0.5653 T0.6245,0.5633 T0.631,0.5628 T0.6407,0.5638 T0.6504,0.5648 T0.6594,0.5638 T0.6675,0.5628 L0.6707,0.5628 L0.6861,0.5628 Q0.7364,0.5628,0.7494,0.5608 L0.7567,0.5608 L0.7652,0.5608 L0.7729,0.5608 Q0.7794,0.5608,0.7818,0.5589 Q0.7851,0.5569,0.7859,0.5559 Q0.7835,0.5539,0.7656,0.5519 Q0.7121,0.547,0.6975,0.543 Q0.6934,0.541,0.6853,0.5396 L0.6691,0.5366 T0.6525,0.5336 T0.6391,0.5312 Q0.6367,0.5302,0.6245,0.5257 T0.6034,0.5213 L0.5977,0.5213 Q0.5945,0.5223,0.5904,0.5223 Q0.5839,0.5223,0.5787,0.5208 T0.5685,0.5183 T0.5596,0.5173 Q0.558,0.5173,0.5552,0.5168 T0.5495,0.5163 L0.5434,0.5163 T0.5373,0.5158 T0.532,0.5148 T0.5284,0.5129 T0.5272,0.5104 L0.5272,0.5074 Q0.5304,0.5015,0.5377,0.499 T0.5629,0.4965 Q0.5734,0.4955,0.5811,0.4946 T0.5953,0.4916 T0.605,0.4896 Q0.6083,0.4886,0.6123,0.4886 Q0.6148,0.4886,0.6225,0.4891 T0.635,0.4896 L0.6456,0.4896 Q0.6837,0.4857,0.6861,0.4857 Q0.7226,0.4768,0.7283,0.4768 Q0.7307,0.4768,0.732,0.4773 T0.7372,0.4777 Q0.7502,0.4777,0.7721,0.4758 Q0.7753,0.4748,0.777,0.4738 Q0.7745,0.4718,0.768,0.4708 Q0.7599,0.4688,0.7445,0.4688 Q0.7405,0.4688,0.7324,0.4693 T0.721,0.4698 Q0.7056,0.4698,0.6999,0.4679 Q0.6861,0.4629,0.6626,0.4619 Q0.6586,0.4609,0.6533,0.4604 T0.6419,0.459 T0.6314,0.456 T0.6269,0.452 Q0.6269,0.451,0.6302,0.4491 Q0.6358,0.4451,0.6525,0.4416 T0.6788,0.4382 L0.6845,0.4382 L0.6902,0.4382 Q0.7064,0.4382,0.7145,0.4362 Q0.7202,0.4342,0.7307,0.4342 L0.7356,0.4342 L0.7409,0.4342 L0.7453,0.4342 Q0.7543,0.4342,0.7607,0.4332 Q0.7778,0.4313,0.7847,0.4288 T0.7932,0.4248 T0.7972,0.4169 T0.8045,0.4045 L0.8094,0.3986 T0.8135,0.3942 L0.8167,0.3912 T0.8191,0.3887 T0.8204,0.3867 T0.8208,0.3848 Q0.8208,0.3818,0.8167,0.3739 Q0.8127,0.3689,0.8054,0.3635 T0.7924,0.3556 T0.7778,0.3497 T0.768,0.3462 Q0.764,0.3442,0.7478,0.3427 T0.7267,0.3383 Q0.7234,0.3363,0.7044,0.3348 T0.6805,0.3323 L0.6764,0.3323 T0.6679,0.3328 T0.6586,0.3333 Q0.6521,0.3333,0.648,0.3314 Q0.6391,0.3264,0.6294,0.3264 Q0.6229,0.3264,0.6156,0.3294 Q0.6115,0.3304,0.6042,0.3304 Q0.5977,0.3304,0.5888,0.3289 T0.5738,0.3264 T0.5584,0.3225 L0.5491,0.3195 Q0.5418,0.3185,0.5162,0.3155 T0.4895,0.3121 T0.4826,0.3116 T0.4716,0.3111 T0.4607,0.3096 T0.4513,0.3066 T0.4477,0.3017 Q0.4477,0.2997,0.4485,0.2977 Q0.4526,0.2898,0.4611,0.2878 T0.4842,0.2859 Q0.4882,0.2859,0.4943,0.2864 T0.5028,0.2868 Q0.5118,0.2868,0.5215,0.2829 Q0.5401,0.276,0.5734,0.276 Q0.5831,0.276,0.5872,0.277 L0.5904,0.277 T0.5949,0.2745 T0.6034,0.272 Q0.631,0.269,0.6407,0.2661 Q0.6448,0.2641,0.6488,0.2641 T0.6573,0.2656 T0.6634,0.2671 Q0.6659,0.2671,0.6675,0.2651 Q0.6723,0.2601,0.6886,0.2552 T0.7137,0.2502 L0.7153,0.2502 L0.7178,0.2502 Q0.7218,0.2502,0.7279,0.2493 T0.7417,0.2468 T0.7526,0.2453 Q0.8208,0.2354,0.8281,0.2354 Q0.8337,0.2354,0.8394,0.2344 T0.8496,0.2315 T0.854,0.2265 Q0.854,0.2216,0.8443,0.2176 Q0.8354,0.2127,0.8216,0.2102 T0.7972,0.2072 T0.777,0.2067 T0.7648,0.2057 Q0.7632,0.2047,0.7498,0.2038 T0.7202,0.2018 T0.6983,0.1998 Q0.6918,0.1998,0.676,0.1949 T0.6537,0.1899 Q0.6496,0.1899,0.6472,0.1919 Q0.6342,0.1968,0.6123,0.1968 Q0.5961,0.1968,0.5912,0.1929 Q0.5904,0.1919,0.5892,0.1919 T0.5823,0.1944 T0.5722,0.1968 T0.5637,0.1949 Q0.5556,0.1909,0.5158,0.1869 Q0.5109,0.1869,0.5032,0.1835 T0.4915,0.18 Q0.4907,0.18,0.4891,0.181 Q0.4793,0.182,0.455,0.182 Q0.4177,0.182,0.4015,0.1771 Q0.3901,0.1741,0.3779,0.1741 Q0.3747,0.1741,0.369,0.1746 T0.3609,0.1751 Q0.3569,0.1751,0.3536,0.1741 Q0.3512,0.1741,0.3459,0.1736 T0.3358,0.1726 T0.3256,0.1716 T0.3167,0.1696 T0.3106,0.1662 Q0.3082,0.1632,0.3082,0.1592 Q0.3082,0.1543,0.3114,0.1508 T0.3204,0.1474 L0.3236,0.1474 Q0.3301,0.1494,0.3333,0.1494 Q0.339,0.1494,0.3496,0.1454 Q0.3674,0.1385,0.3869,0.1385 Q0.395,0.1385,0.4011,0.137 T0.4116,0.1355 T0.4197,0.1375 T0.425,0.1395 Q0.429,0.1395,0.4355,0.1365 Q0.4631,0.1266,0.4882,0.1266 Q0.5126,0.1266,0.5337,0.1246 Q0.5369,0.1246,0.5458,0.1207 T0.5661,0.1167 L0.5693,0.1167 Q0.5791,0.1177,0.5852,0.1187 T0.5921,0.1197 Q0.5945,0.1197,0.6002,0.1167 Q0.6026,0.1147,0.605,0.1123 T0.6091,0.1093 T0.6156,0.1088 T0.6318,0.1098 Q0.6456,0.1108,0.6569,0.1137 T0.6707,0.1167 Q0.674,0.1167,0.6772,0.1147 Q0.6821,0.1108,0.6946,0.1083 T0.721,0.1044 T0.7453,0.1029 L0.7526,0.1029 Q0.7583,0.1039,0.7652,0.1053 T0.7753,0.1068 Q0.7778,0.1068,0.7802,0.1058 Q0.7981,0.1019,0.8143,0.1019 Q0.8175,0.1019,0.8439,0.0964 T0.8735,0.091 Q0.8759,0.091,0.8836,0.089 T0.8938,0.0851 Q0.8929,0.0841,0.8905,0.0841 Q0.8832,0.0821,0.8735,0.0821 Q0.8694,0.0821,0.8629,0.0826 T0.854,0.0831 Q0.8508,0.0831,0.8491,0.0821 Q0.8475,0.0821,0.8171,0.0811 T0.7802,0.0781 T0.7571,0.0737 T0.7332,0.0712 Q0.7299,0.0712,0.7247,0.0717 T0.7161,0.0722 L0.7064,0.0722 Q0.7032,0.0712,0.7003,0.0707 T0.6959,0.0692 T0.693,0.0678 T0.6914,0.0663 T0.6902,0.0648 T0.689,0.0643 L0.6869,0.0643 L0.6845,0.0643 L0.6821,0.0643 Q0.6553,0.0643,0.6553,0.0554 T0.6796,0.0465 L0.6813,0.0465 L0.6845,0.0465 Q0.6918,0.0425,0.717,0.0376 Q0.7226,0.0366,0.7267,0.0356 T0.7324,0.0336 T0.7376,0.0317 T0.747,0.0297 Q0.7518,0.0287,0.7551,0.0287 T0.762,0.0297 T0.768,0.0307 L0.7729,0.0307 Q0.7802,0.0277,0.7997,0.0267 T0.8224,0.0237 Q0.8273,0.0227,0.8341,0.0223 T0.8475,0.0193 T0.8654,0.0143 T0.8873,0.0079 Q0.9002,0.003,0.9331,0.004 T0.97,0.004 Q0.9838,0,0.9976,0.001 Q1,0.001,1,0.003 Z M0.9935,0.996 L0.9951,0.0049 Q0.9822,0.0049,0.9716,0.0079 Q0.9659,0.0099,0.9327,0.0089 T0.8897,0.0119 Q0.8775,0.0158,0.8666,0.0183 T0.85,0.0237 Q0.8418,0.0267,0.8341,0.0272 T0.8248,0.0277 Q0.82,0.0297,0.8001,0.0312 T0.7745,0.0346 Q0.7697,0.0356,0.7664,0.0356 Q0.764,0.0356,0.7603,0.0341 T0.7534,0.0326 Q0.751,0.0326,0.7478,0.0336 Q0.7429,0.0346,0.7397,0.0356 T0.7344,0.0376 T0.7283,0.0401 T0.7178,0.0425 Q0.6926,0.0465,0.6878,0.0495 Q0.6845,0.0514,0.6764,0.0514 L0.6723,0.0514 L0.6691,0.0514 Q0.6602,0.0514,0.6602,0.0554 Q0.6602,0.0574,0.6659,0.0579 T0.6796,0.0589 T0.691,0.0603 T0.6967,0.0643 T0.7072,0.0673 Q0.7121,0.0682,0.7153,0.0682 T0.7238,0.0678 T0.7332,0.0673 Q0.7413,0.0673,0.7579,0.0692 T0.7818,0.0742 Q0.7867,0.0752,0.8171,0.0762 T0.8508,0.0781 L0.852,0.0781 T0.8601,0.0776 T0.8719,0.0772 Q0.8832,0.0772,0.8921,0.0791 Q0.8994,0.0811,0.8994,0.0841 T0.8933,0.0895 T0.8812,0.094 T0.8735,0.0959 T0.8451,0.1014 T0.8143,0.1068 Q0.7989,0.1068,0.7818,0.1098 Q0.7778,0.1108,0.7745,0.1108 T0.768,0.1103 T0.7603,0.1088 T0.7518,0.1068 L0.7461,0.1068 Q0.7315,0.1068,0.7088,0.1103 T0.6805,0.1177 Q0.6756,0.1207,0.6699,0.1207 Q0.6667,0.1207,0.6545,0.1177 T0.631,0.1147 Q0.6269,0.1137,0.6225,0.1133 T0.616,0.1128 L0.6123,0.1128 T0.6103,0.1133 L0.6083,0.1157 T0.6034,0.1197 Q0.5961,0.1246,0.5921,0.1246 Q0.5904,0.1246,0.5835,0.1231 T0.5693,0.1217 L0.5661,0.1217 Q0.558,0.1217,0.5535,0.1231 T0.5446,0.1266 T0.5345,0.1296 Q0.5126,0.1316,0.4882,0.1316 T0.438,0.1405 Q0.4298,0.1434,0.425,0.1434 Q0.4209,0.1434,0.4173,0.1419 T0.4112,0.1405 T0.4027,0.1419 T0.3869,0.1434 Q0.3682,0.1434,0.3512,0.1494 Q0.3398,0.1533,0.3333,0.1533 Q0.3285,0.1533,0.3228,0.1513 L0.3212,0.1513 Q0.3179,0.1513,0.3155,0.1538 T0.3131,0.1592 Q0.3131,0.1612,0.3147,0.1632 Q0.3171,0.1652,0.3232,0.1667 T0.3406,0.1691 T0.3544,0.1701 L0.3601,0.1701 L0.3678,0.1701 L0.3771,0.1701 Q0.3909,0.1701,0.4031,0.1731 Q0.4177,0.178,0.4558,0.178 Q0.4793,0.178,0.4882,0.1761 L0.4915,0.1761 Q0.498,0.1761,0.5061,0.179 T0.5158,0.183 Q0.5166,0.183,0.5231,0.1835 T0.5341,0.1845 T0.545,0.1855 T0.5572,0.1874 T0.5661,0.1909 Q0.5677,0.1919,0.5702,0.1919 T0.5791,0.1894 T0.588,0.1869 Q0.5921,0.1869,0.5945,0.1899 Q0.5977,0.1919,0.6123,0.1919 Q0.6334,0.1919,0.6448,0.1879 Q0.6488,0.186,0.6537,0.186 Q0.6626,0.186,0.6784,0.1909 T0.6983,0.1958 Q0.704,0.1968,0.7206,0.1973 T0.7506,0.1993 T0.7689,0.2018 L0.7705,0.2018 L0.7741,0.2018 L0.7786,0.2018 Q0.8248,0.2018,0.8475,0.2136 Q0.8597,0.2196,0.8597,0.2255 T0.8483,0.2359 T0.8281,0.2404 Q0.8208,0.2404,0.7534,0.2493 Q0.7502,0.2502,0.7425,0.2512 T0.7287,0.2532 T0.7178,0.2542 L0.7153,0.2542 L0.7137,0.2542 Q0.7064,0.2542,0.6906,0.2591 T0.6715,0.2681 T0.6626,0.272 Q0.6594,0.272,0.6541,0.2705 T0.6464,0.269 T0.6431,0.27 Q0.6318,0.273,0.6034,0.276 Q0.6018,0.276,0.5998,0.2774 T0.5957,0.2799 T0.5904,0.2809 L0.5856,0.2809 Q0.5823,0.2799,0.575,0.2799 Q0.541,0.2799,0.5239,0.2868 Q0.5134,0.2908,0.5028,0.2908 Q0.4996,0.2908,0.4935,0.2903 T0.4842,0.2898 Q0.4704,0.2898,0.4635,0.2918 T0.4534,0.2997 L0.4534,0.3007 Q0.4534,0.3037,0.459,0.3046 T0.4753,0.3066 T0.4899,0.3076 Q0.4907,0.3076,0.5166,0.3106 T0.5507,0.3155 Q0.5921,0.3264,0.605,0.3264 Q0.6107,0.3264,0.6131,0.3254 Q0.6212,0.3225,0.6294,0.3225 Q0.6407,0.3225,0.6513,0.3274 Q0.6529,0.3294,0.6569,0.3294 Q0.6594,0.3294,0.665,0.3284 T0.6748,0.3274 T0.6821,0.3284 Q0.6861,0.3294,0.6967,0.3299 T0.7165,0.3314 T0.7299,0.3343 Q0.7324,0.3363,0.7486,0.3383 T0.7697,0.3422 Q0.7713,0.3432,0.7774,0.3452 T0.7887,0.3492 T0.8005,0.3546 T0.8127,0.3625 T0.8208,0.3719 Q0.8256,0.3798,0.8256,0.3848 Q0.8256,0.3877,0.8236,0.3902 T0.8171,0.3976 T0.809,0.4075 T0.8021,0.4189 T0.7968,0.4273 T0.7867,0.4322 T0.7616,0.4382 Q0.7543,0.4392,0.7437,0.4392 L0.7364,0.4392 L0.7299,0.4392 Q0.7202,0.4392,0.7161,0.4402 Q0.7072,0.4431,0.691,0.4431 L0.6845,0.4431 L0.6788,0.4431 Q0.6707,0.4431,0.6545,0.4461 T0.6334,0.452 Q0.6399,0.456,0.6626,0.457 Q0.6878,0.458,0.7024,0.4639 Q0.7064,0.4649,0.7186,0.4649 L0.7295,0.4649 L0.7413,0.4649 Q0.7591,0.4649,0.7697,0.4669 Q0.7818,0.4688,0.7818,0.4728 Q0.7818,0.4748,0.7798,0.4763 T0.7753,0.4787 L0.7737,0.4797 L0.7729,0.4797 Q0.7494,0.4827,0.7388,0.4827 Q0.7332,0.4827,0.7307,0.4817 L0.7291,0.4817 Q0.7226,0.4817,0.6878,0.4896 Q0.6829,0.4906,0.6772,0.4911 T0.6618,0.4921 T0.646,0.4931 T0.6342,0.4936 T0.6212,0.4931 T0.6115,0.4926 Q0.6083,0.4926,0.6058,0.4931 T0.5969,0.4955 T0.5819,0.499 T0.5629,0.5005 Q0.5572,0.5005,0.5527,0.501 T0.545,0.502 T0.5397,0.503 T0.5361,0.5045 T0.5337,0.5064 T0.5328,0.5094 L0.532,0.5094 Q0.532,0.5104,0.5337,0.5109 T0.5381,0.5114 T0.5438,0.5119 T0.5515,0.5124 L0.5604,0.5124 Q0.5661,0.5134,0.5746,0.5153 T0.5912,0.5173 L0.5977,0.5173 L0.6026,0.5173 Q0.6139,0.5173,0.6273,0.5218 T0.6407,0.5272 Q0.6448,0.5282,0.6683,0.5321 T0.6991,0.5381 Q0.7137,0.543,0.7664,0.548 Q0.7908,0.55,0.7908,0.5559 Q0.7908,0.5589,0.7859,0.5628 Q0.781,0.5658,0.7713,0.5658 Q0.7689,0.5658,0.7628,0.5653 T0.7543,0.5648 T0.7502,0.5658 Q0.7364,0.5678,0.6878,0.5678 Q0.674,0.5678,0.6699,0.5668 L0.6683,0.5668 Q0.6659,0.5668,0.6606,0.5678 T0.6513,0.5687 Q0.6464,0.5687,0.6391,0.5678 Q0.6334,0.5668,0.6302,0.5668 T0.6241,0.5687 T0.6164,0.5717 Q0.6123,0.5727,0.6099,0.5727 L0.6062,0.5727 T0.6022,0.5732 T0.5953,0.5737 Q0.5904,0.5747,0.5839,0.5747 T0.5726,0.5752 T0.5629,0.5776 T0.5458,0.5796 Q0.5418,0.5796,0.5324,0.5791 T0.5191,0.5786 Q0.5077,0.5786,0.5045,0.5806 Q0.498,0.5836,0.4899,0.5836 Q0.4858,0.5836,0.4777,0.5826 T0.4655,0.5816 L0.4631,0.5816 Q0.4582,0.5816,0.4436,0.5841 T0.4144,0.5865 L0.4051,0.5865 L0.3986,0.5865 T0.3933,0.587 T0.3897,0.5875 T0.3869,0.5885 T0.3844,0.5895 T0.3812,0.591 T0.3779,0.5925 Q0.3739,0.5955,0.3633,0.5955 L0.3585,0.5955 L0.3536,0.5955 Q0.3277,0.5955,0.3066,0.6053 Q0.3017,0.6083,0.296,0.6083 Q0.2912,0.6083,0.2839,0.6068 T0.2741,0.6053 Q0.2693,0.6053,0.2547,0.6048 T0.236,0.6044 Q0.2222,0.6044,0.193,0.6103 L0.1882,0.6103 Q0.1825,0.6103,0.1703,0.6083 T0.1525,0.6063 L0.15,0.6063 Q0.1436,0.6063,0.135,0.6073 T0.1168,0.6098 T0.1038,0.6113 Q0.0973,0.6123,0.0787,0.6123 L0.06,0.6123 L0.0414,0.6123 L0.0235,0.6123 Q0.0049,0.6133,0.0049,0.6172 L0.0057,0.6222 Q0.0073,0.6261,0.043,0.6261 L0.0454,0.6261 L0.0479,0.6261 Q0.0527,0.6261,0.0633,0.6281 T0.0803,0.6301 L0.0835,0.6301 L0.0916,0.6301 Q0.0998,0.6301,0.129,0.632 Q0.1768,0.636,0.206,0.64 Q0.2117,0.6409,0.2165,0.6409 Q0.2206,0.6409,0.2263,0.6405 T0.2336,0.64 L0.2384,0.64 L0.2409,0.64 T0.251,0.6395 T0.2644,0.639 Q0.2741,0.639,0.279,0.6409 Q0.283,0.6429,0.2972,0.6439 T0.3293,0.6459 T0.3528,0.6469 L0.3577,0.6469 Q0.3642,0.6469,0.3723,0.6449 T0.3844,0.6429 Q0.3901,0.6429,0.3933,0.6454 T0.4006,0.6479 Q0.4088,0.6479,0.4517,0.6558 Q0.4582,0.6568,0.4623,0.6568 Q0.4655,0.6568,0.4716,0.6563 T0.4826,0.6558 L0.4882,0.6558 Q0.5004,0.6558,0.5255,0.6607 Q0.5328,0.6627,0.5604,0.6647 T0.6152,0.6682 T0.644,0.6696 T0.6719,0.6721 T0.7056,0.6756 Q0.7113,0.6756,0.7198,0.6805 T0.738,0.6855 Q0.7453,0.6855,0.7551,0.6879 T0.7741,0.6939 T0.7912,0.7018 T0.8029,0.7102 Q0.8054,0.7132,0.8054,0.7151 Q0.8054,0.7191,0.8009,0.7216 T0.7908,0.7255 T0.779,0.7285 T0.7721,0.731 Q0.7672,0.7329,0.7632,0.7339 T0.7551,0.7354 T0.7486,0.7369 Q0.7478,0.7369,0.7445,0.7379 T0.7388,0.7394 T0.7324,0.7404 L0.7242,0.7413 T0.7161,0.7418 Q0.7105,0.7418,0.6955,0.7428 T0.6748,0.7438 L0.6699,0.7438 L0.6667,0.7438 Q0.6659,0.7438,0.6407,0.7468 Q0.6367,0.7478,0.6334,0.7478 T0.6245,0.7468 T0.6148,0.7458 L0.6099,0.7458 Q0.6018,0.7468,0.5864,0.7498 T0.5653,0.7532 T0.5596,0.7557 Q0.5596,0.7596,0.571,0.7616 Q0.5742,0.7626,0.5803,0.7631 T0.5929,0.7641 T0.6018,0.7656 L0.6087,0.7656 T0.6192,0.7666 T0.6277,0.7695 Q0.631,0.7705,0.6342,0.7705 Q0.6383,0.7705,0.6452,0.7685 T0.6537,0.7666 L0.6553,0.7666 Q0.6602,0.7666,0.6711,0.769 T0.6853,0.7715 Q0.691,0.7715,0.7048,0.775 T0.7242,0.7814 Q0.7324,0.7854,0.7445,0.7864 Q0.7478,0.7864,0.768,0.7873 T0.7972,0.7893 Q0.7989,0.7893,0.8017,0.7898 T0.8054,0.7903 L0.8082,0.7903 T0.811,0.7908 T0.8131,0.7913 T0.8151,0.7918 L0.8167,0.7928 T0.8179,0.7943 T0.8191,0.7957 T0.8204,0.7977 T0.8208,0.8002 Q0.8208,0.8032,0.8171,0.8051 T0.8074,0.8081 T0.7997,0.8091 Q0.7932,0.8121,0.7737,0.8121 Q0.7664,0.8121,0.7413,0.8111 L0.7364,0.8111 Q0.7275,0.8111,0.7214,0.8121 T0.7084,0.8155 T0.6991,0.819 Q0.6934,0.82,0.6723,0.8205 T0.6472,0.8239 Q0.6423,0.8269,0.6375,0.8269 Q0.6358,0.8269,0.6338,0.8264 T0.6294,0.8254 T0.6253,0.8249 Q0.6042,0.8249,0.5961,0.8289 Q0.5921,0.8318,0.5839,0.8318 Q0.5783,0.8318,0.5645,0.8299 L0.5604,0.8299 Q0.5531,0.8299,0.5337,0.8368 Q0.5296,0.8378,0.5255,0.8378 Q0.5239,0.8378,0.5195,0.8373 T0.5118,0.8368 Q0.5061,0.8368,0.4996,0.8388 Q0.4947,0.8388,0.4882,0.8398 Q0.4777,0.8417,0.4753,0.8427 T0.4728,0.8467 Q0.4728,0.8487,0.4769,0.8492 T0.4886,0.8501 T0.5004,0.8516 Q0.5036,0.8516,0.515,0.8521 T0.5345,0.8546 Q0.5426,0.8556,0.5596,0.8556 L0.5649,0.8556 L0.5702,0.8556 L0.5791,0.8556 Q0.5921,0.8566,0.6135,0.8571 T0.6383,0.8586 Q0.6683,0.8615,0.6764,0.8615 L0.6776,0.8615 L0.6788,0.8615 Q0.7032,0.8615,0.7032,0.8684 Q0.7032,0.8714,0.6995,0.8749 T0.6959,0.8803 L0.6959,0.8813 Q0.6991,0.8843,0.7153,0.8843 Q0.7218,0.8843,0.7259,0.8833 L0.7299,0.8833 Q0.7324,0.8833,0.7348,0.8838 T0.7393,0.8848 T0.7433,0.8863 L0.7474,0.8882 T0.751,0.8892 Q0.7616,0.8922,0.7948,0.8952 Q0.7981,0.8952,0.8082,0.8981 T0.8297,0.9011 T0.8528,0.9026 T0.8747,0.907 T0.8856,0.9149 L0.8856,0.9159 Q0.8856,0.9179,0.8848,0.9189 T0.8828,0.9209 T0.88,0.9228 T0.8767,0.9243 T0.8731,0.9248 T0.8698,0.9253 T0.8666,0.9258 L0.8646,0.9258 Q0.8621,0.9258,0.8577,0.9263 T0.85,0.9268 T0.8439,0.9273 T0.8402,0.9278 Q0.8386,0.9298,0.8358,0.9308 T0.8305,0.9322 T0.8244,0.9332 T0.8183,0.9337 Q0.8135,0.9347,0.8025,0.9372 T0.7859,0.9416 Q0.7778,0.9436,0.7717,0.9471 T0.7624,0.9515 Q0.7575,0.9535,0.7486,0.9535 Q0.7461,0.9535,0.7397,0.953 T0.7291,0.9525 Q0.7234,0.9525,0.7186,0.953 T0.7137,0.957 T0.7194,0.9614 Q0.7567,0.9634,0.7664,0.9654 Q0.7745,0.9674,0.7762,0.9674 L0.7908,0.9674 Q0.7924,0.9664,0.7948,0.9664 Q0.8029,0.9664,0.8082,0.9679 T0.8224,0.9723 T0.8362,0.9773 Q0.8483,0.9812,0.871,0.9812 L0.8751,0.9812 Q0.8873,0.9812,0.8929,0.9822 T0.9165,0.9876 T0.9408,0.9931 Q0.9513,0.996,0.9935,0.996 Z M0.9968,0.998 L0.9976,0.003 Q0.9838,0.002,0.9708,0.0059 Q0.9659,0.0069,0.9327,0.0059 T0.8881,0.0099 Q0.8767,0.0138,0.8658,0.0163 T0.8491,0.0218 Q0.8418,0.0247,0.8341,0.0247 T0.8232,0.0257 Q0.8191,0.0277,0.7997,0.0292 T0.7737,0.0326 Q0.7697,0.0336,0.7672,0.0336 T0.7612,0.0321 T0.7543,0.0307 T0.747,0.0317 Q0.7397,0.0326,0.7336,0.0356 T0.717,0.0406 Q0.6918,0.0445,0.6861,0.0475 Q0.6845,0.0485,0.6772,0.0485 T0.6638,0.05 T0.6577,0.0549 T0.6642,0.0598 T0.6796,0.0613 T0.6902,0.0623 Q0.691,0.0623,0.6946,0.0658 T0.7064,0.0702 L0.7161,0.0702 Q0.7194,0.0702,0.7242,0.0697 T0.7332,0.0692 Q0.7413,0.0692,0.7579,0.0717 T0.781,0.0762 Q0.7867,0.0781,0.8171,0.0786 T0.85,0.0801 L0.8532,0.0801 Q0.8548,0.0801,0.8613,0.0796 T0.8727,0.0791 Q0.8832,0.0791,0.8913,0.0811 Q0.897,0.0831,0.897,0.0851 Q0.897,0.088,0.8873,0.0905 T0.8735,0.093 Q0.871,0.093,0.8447,0.0984 T0.8143,0.1039 Q0.7981,0.1039,0.781,0.1078 Q0.7778,0.1088,0.7745,0.1088 T0.7644,0.1073 T0.7518,0.1048 L0.7453,0.1048 Q0.7299,0.1048,0.7076,0.1083 T0.6788,0.1157 Q0.6748,0.1187,0.6699,0.1187 Q0.6675,0.1187,0.6557,0.1157 T0.6318,0.1118 Q0.6164,0.1108,0.6135,0.1108 T0.6095,0.1113 T0.6067,0.1142 T0.6018,0.1187 Q0.5953,0.1227,0.5921,0.1227 Q0.5904,0.1227,0.5839,0.1212 T0.5693,0.1187 L0.5661,0.1187 Q0.558,0.1187,0.5527,0.1207 T0.5434,0.1246 T0.5337,0.1266 Q0.5126,0.1296,0.4882,0.1296 T0.4371,0.1385 Q0.4298,0.1414,0.425,0.1414 Q0.4225,0.1414,0.4189,0.1395 T0.4112,0.1375 Q0.4079,0.1375,0.4019,0.1395 T0.3869,0.1414 Q0.3682,0.1414,0.3504,0.1474 Q0.3398,0.1513,0.3333,0.1513 Q0.3293,0.1513,0.3228,0.1494 L0.3204,0.1494 Q0.3179,0.1494,0.3155,0.1508 T0.3118,0.1543 T0.3106,0.1592 T0.3127,0.1642 T0.32,0.1677 T0.3305,0.1701 T0.3435,0.1716 T0.3544,0.1721 Q0.3569,0.1731,0.3601,0.1731 Q0.3625,0.1731,0.3686,0.1726 T0.3779,0.1721 Q0.3901,0.1721,0.4023,0.1751 Q0.4177,0.18,0.455,0.18 Q0.4793,0.18,0.4882,0.178 L0.4915,0.178 Q0.4964,0.178,0.5045,0.1815 T0.5158,0.185 Q0.5564,0.1889,0.5645,0.1929 Q0.5677,0.1939,0.571,0.1939 Q0.575,0.1939,0.5807,0.1919 T0.5888,0.1899 T0.5929,0.1909 Q0.5969,0.1949,0.6123,0.1949 Q0.6334,0.1949,0.6456,0.1899 Q0.6488,0.1879,0.6537,0.1879 Q0.661,0.1879,0.6772,0.1929 T0.6983,0.1978 Q0.704,0.1988,0.7206,0.1998 T0.7502,0.2018 T0.7664,0.2038 Q0.7672,0.2038,0.7818,0.2043 T0.8151,0.2067 T0.8459,0.2156 Q0.8573,0.2206,0.8573,0.2255 Q0.8573,0.2295,0.8516,0.2324 T0.8394,0.2369 T0.8281,0.2384 Q0.8208,0.2384,0.7526,0.2473 Q0.7494,0.2483,0.7421,0.2493 T0.7287,0.2512 T0.7178,0.2522 L0.7153,0.2522 L0.7137,0.2522 Q0.7056,0.2522,0.6898,0.2572 T0.6691,0.2671 Q0.6667,0.269,0.6634,0.269 Q0.661,0.269,0.6557,0.2681 T0.6472,0.2671 Q0.6448,0.2671,0.6415,0.2681 Q0.631,0.271,0.6034,0.274 Q0.5994,0.274,0.5961,0.2765 T0.5904,0.2789 L0.5864,0.2789 Q0.5831,0.2779,0.5742,0.2779 Q0.541,0.2779,0.5223,0.2849 Q0.5126,0.2888,0.5028,0.2888 Q0.5004,0.2888,0.4943,0.2883 T0.4842,0.2878 Q0.4704,0.2878,0.4627,0.2898 T0.4509,0.2987 Q0.4501,0.2997,0.4501,0.3007 Q0.4501,0.3046,0.4574,0.3066 T0.4765,0.3091 T0.4899,0.3096 Q0.4931,0.3106,0.5061,0.3121 T0.5316,0.315 T0.5499,0.3175 Q0.5507,0.3175,0.5572,0.3195 T0.5685,0.3225 T0.5803,0.3254 T0.5933,0.3279 T0.605,0.3284 T0.6148,0.3274 Q0.6221,0.3244,0.6294,0.3244 Q0.6399,0.3244,0.6496,0.3294 Q0.6529,0.3314,0.6577,0.3314 Q0.6602,0.3314,0.6663,0.3304 T0.6756,0.3294 T0.6813,0.3304 Q0.6837,0.3304,0.6873,0.3309 L0.6946,0.3318 T0.7024,0.3323 T0.7105,0.3328 T0.7178,0.3338 T0.7238,0.3348 T0.7283,0.3363 Q0.7324,0.3383,0.7482,0.3403 T0.7689,0.3442 Q0.7697,0.3442,0.779,0.3477 T0.794,0.3536 T0.8074,0.3615 T0.8183,0.3729 Q0.8232,0.3808,0.8232,0.3848 Q0.8232,0.3867,0.8216,0.3892 T0.8151,0.3961 T0.8062,0.406 T0.7997,0.4179 T0.7952,0.4263 T0.7855,0.4308 T0.7616,0.4362 Q0.7543,0.4372,0.7445,0.4372 L0.7372,0.4372 L0.7307,0.4372 Q0.7202,0.4372,0.7153,0.4382 Q0.7064,0.4402,0.691,0.4402 L0.6845,0.4402 L0.6788,0.4402 Q0.6699,0.4402,0.6533,0.4436 T0.6318,0.451 Q0.6302,0.451,0.6302,0.452 Q0.6302,0.457,0.6626,0.459 Q0.6869,0.4609,0.7015,0.4659 Q0.7064,0.4669,0.7202,0.4669 L0.7311,0.4669 L0.7429,0.4669 Q0.7599,0.4669,0.7689,0.4688 Q0.7794,0.4708,0.7794,0.4738 L0.7786,0.4748 T0.777,0.4763 T0.7749,0.4773 L0.7737,0.4777 L0.7729,0.4777 Q0.7502,0.4797,0.738,0.4797 L0.7315,0.4797 L0.7291,0.4797 Q0.7226,0.4797,0.6869,0.4876 Q0.6821,0.4886,0.6768,0.4891 T0.6614,0.4901 T0.6456,0.4916 L0.6342,0.4916 Q0.6294,0.4916,0.6217,0.4911 T0.6115,0.4906 Q0.6083,0.4906,0.6054,0.4911 T0.5961,0.4936 T0.5815,0.4965 T0.5629,0.4985 Q0.5507,0.4985,0.5442,0.4995 T0.5345,0.5025 T0.5304,0.5084 L0.5296,0.5094 Q0.5296,0.5114,0.5316,0.5124 T0.5373,0.5138 T0.5442,0.5143 L0.5523,0.5143 L0.5604,0.5143 Q0.5637,0.5153,0.5677,0.5158 T0.5742,0.5173 T0.5811,0.5188 T0.5904,0.5193 L0.5977,0.5193 L0.6026,0.5193 Q0.6107,0.5193,0.6168,0.5208 T0.6294,0.5252 T0.6399,0.5292 Q0.6448,0.5302,0.6679,0.5341 T0.6983,0.541 Q0.7129,0.545,0.7664,0.55 Q0.7883,0.5519,0.7883,0.5559 Q0.7883,0.5579,0.7843,0.5608 T0.7721,0.5638 Q0.7697,0.5638,0.764,0.5633 T0.7559,0.5628 L0.7502,0.5628 Q0.7364,0.5648,0.6869,0.5648 L0.6699,0.5648 L0.6675,0.5648 Q0.665,0.5648,0.6602,0.5658 T0.6513,0.5668 Q0.6464,0.5668,0.6399,0.5658 Q0.6342,0.5648,0.6302,0.5648 T0.6225,0.5668 T0.6156,0.5697 Q0.6107,0.5707,0.6087,0.5707 T0.6034,0.5712 T0.5953,0.5717 Q0.5904,0.5727,0.5835,0.5727 T0.5718,0.5732 T0.562,0.5757 Q0.558,0.5767,0.5483,0.5767 L0.5349,0.5767 L0.5207,0.5767 Q0.5069,0.5767,0.5028,0.5786 Q0.4972,0.5816,0.4899,0.5816 Q0.4858,0.5816,0.4781,0.5806 T0.4663,0.5796 L0.4631,0.5796 Q0.4582,0.5796,0.4432,0.5821 T0.4144,0.5846 L0.4071,0.5846 L0.4011,0.5846 T0.3958,0.5851 T0.3921,0.5856 T0.3889,0.5861 T0.3865,0.5865 T0.384,0.5875 L0.382,0.5885 L0.3796,0.5895 L0.3771,0.5905 Q0.3731,0.5925,0.365,0.5925 L0.3601,0.5925 L0.3552,0.5925 Q0.3277,0.5925,0.3049,0.6044 Q0.3017,0.6053,0.296,0.6053 Q0.292,0.6053,0.2847,0.6044 T0.2741,0.6034 Q0.2693,0.6034,0.2547,0.6029 T0.236,0.6024 Q0.2222,0.6024,0.1922,0.6073 Q0.1906,0.6083,0.1882,0.6083 Q0.1833,0.6083,0.1711,0.6063 T0.1533,0.6044 Q0.1517,0.6034,0.1492,0.6034 Q0.1436,0.6034,0.135,0.6048 T0.1168,0.6078 T0.103,0.6093 Q0.0973,0.6103,0.0787,0.6103 L0.0604,0.6103 L0.0414,0.6103 L0.0235,0.6103 Q0.0024,0.6113,0.0024,0.6172 Q0.0024,0.6192,0.0032,0.6231 Q0.0049,0.6281,0.0333,0.6281 L0.0414,0.6281 L0.0479,0.6281 Q0.0519,0.6281,0.0624,0.6301 T0.0803,0.632 L0.0835,0.632 L0.0916,0.632 Q0.0989,0.632,0.1281,0.634 L0.206,0.6419 Q0.2117,0.6429,0.2174,0.6429 Q0.2214,0.6429,0.2271,0.6424 T0.2344,0.6419 L0.2376,0.6419 Q0.2393,0.6429,0.2417,0.6429 T0.2526,0.6419 T0.2652,0.6409 Q0.2741,0.6409,0.2782,0.6429 T0.2968,0.6459 T0.3293,0.6479 T0.352,0.6489 Q0.3552,0.6499,0.3585,0.6499 Q0.365,0.6499,0.3731,0.6474 T0.3844,0.6449 Q0.3885,0.6449,0.3917,0.6474 T0.4006,0.6499 Q0.4088,0.6499,0.4509,0.6578 Q0.4574,0.6588,0.4631,0.6588 Q0.4655,0.6588,0.4716,0.6583 T0.4834,0.6578 L0.4874,0.6578 Q0.5004,0.6588,0.5255,0.6637 Q0.532,0.6647,0.56,0.6667 T0.6148,0.6701 T0.644,0.6716 Q0.6464,0.6726,0.6594,0.6736 T0.6861,0.6756 T0.7048,0.6775 Q0.7097,0.6775,0.7186,0.6825 T0.738,0.6874 Q0.7518,0.6874,0.7729,0.6958 T0.8005,0.7122 Q0.8029,0.7141,0.8029,0.7151 Q0.8029,0.7191,0.7968,0.7216 T0.7818,0.726 T0.7705,0.729 L0.764,0.731 T0.7583,0.7324 T0.753,0.7334 T0.7486,0.7349 Q0.7251,0.7399,0.7161,0.7399 Q0.7097,0.7399,0.6951,0.7409 T0.6748,0.7418 L0.6703,0.7418 L0.6667,0.7418 Q0.6659,0.7418,0.6399,0.7448 L0.6334,0.7448 Q0.631,0.7448,0.6249,0.7443 T0.6148,0.7438 L0.6099,0.7438 Q0.601,0.7448,0.5856,0.7473 T0.5645,0.7507 Q0.5572,0.7517,0.5572,0.7547 T0.5616,0.7606 T0.5702,0.7646 Q0.5734,0.7646,0.5779,0.7651 T0.5864,0.7661 T0.5949,0.7671 T0.6018,0.7676 L0.6071,0.7676 T0.6135,0.7681 T0.62,0.769 T0.6269,0.771 T0.6342,0.7725 Q0.6391,0.7725,0.6464,0.7705 T0.6541,0.7685 L0.6553,0.7685 Q0.6586,0.7685,0.6699,0.771 T0.6853,0.7735 Q0.6902,0.7735,0.704,0.777 T0.7226,0.7834 Q0.7315,0.7873,0.7445,0.7883 Q0.747,0.7883,0.7676,0.7893 T0.7972,0.7913 Q0.7989,0.7913,0.8017,0.7918 T0.8058,0.7923 T0.809,0.7928 T0.8114,0.7933 T0.8131,0.7938 T0.8147,0.7943 T0.8159,0.7953 L0.8171,0.7967 T0.8175,0.7982 Q0.8183,0.7992,0.8183,0.8002 Q0.8183,0.8022,0.8155,0.8032 T0.807,0.8051 T0.7989,0.8071 Q0.7932,0.8091,0.7737,0.8091 L0.7413,0.8091 L0.7372,0.8091 Q0.7275,0.8091,0.721,0.8101 T0.7072,0.8136 T0.6983,0.817 Q0.6942,0.818,0.6825,0.818 T0.6602,0.819 T0.6456,0.822 Q0.6415,0.8249,0.6375,0.8249 Q0.6367,0.8249,0.6326,0.8239 T0.6253,0.8229 Q0.6034,0.8229,0.5953,0.8279 Q0.5912,0.8289,0.5848,0.8289 Q0.5775,0.8289,0.5645,0.8279 Q0.5629,0.8269,0.5604,0.8269 Q0.5523,0.8269,0.5328,0.8348 Q0.5296,0.8358,0.5264,0.8358 Q0.5247,0.8358,0.5203,0.8353 T0.5126,0.8348 Q0.5061,0.8348,0.4988,0.8358 Q0.4947,0.8368,0.4882,0.8378 Q0.4826,0.8388,0.4797,0.8388 T0.474,0.8398 T0.4704,0.8422 T0.4696,0.8462 T0.472,0.8501 T0.4781,0.8521 T0.4854,0.8526 L0.4935,0.8526 T0.4996,0.8536 Q0.5036,0.8536,0.515,0.8546 T0.5337,0.8566 Q0.5426,0.8576,0.5596,0.8576 L0.5657,0.8576 L0.571,0.8576 L0.5791,0.8576 Q0.5921,0.8586,0.6135,0.8591 T0.6383,0.8605 Q0.6683,0.8635,0.6764,0.8635 Q0.6999,0.8635,0.6999,0.8684 Q0.6999,0.8694,0.6967,0.8734 T0.6934,0.8803 L0.6934,0.8823 Q0.6951,0.8863,0.7137,0.8863 Q0.7218,0.8863,0.7267,0.8853 L0.7299,0.8853 Q0.734,0.8853,0.7409,0.8882 T0.7502,0.8912 Q0.7607,0.8942,0.794,0.8971 Q0.7972,0.8971,0.8078,0.9001 T0.8297,0.9031 Q0.8475,0.9031,0.8646,0.9065 T0.8824,0.9149 L0.8824,0.9159 Q0.8824,0.9169,0.882,0.9179 T0.8808,0.9194 L0.8792,0.9204 T0.8767,0.9214 T0.8743,0.9224 T0.8715,0.9228 L0.8686,0.9228 T0.8662,0.9233 T0.8637,0.9238 L0.8556,0.9238 T0.8447,0.9243 T0.8386,0.9268 Q0.837,0.9278,0.835,0.9288 T0.8305,0.9303 T0.8244,0.9308 T0.8175,0.9318 Q0.8127,0.9327,0.8017,0.9352 T0.7851,0.9397 Q0.777,0.9416,0.7705,0.9451 T0.7616,0.9496 Q0.7575,0.9505,0.7494,0.9505 L0.7405,0.9505 L0.7307,0.9505 Q0.7234,0.9505,0.7178,0.9515 Q0.7145,0.9515,0.7125,0.9535 T0.7105,0.9575 Q0.7105,0.9624,0.7194,0.9634 Q0.7567,0.9654,0.7664,0.9674 Q0.7745,0.9693,0.7762,0.9693 L0.7908,0.9693 L0.7948,0.9693 Q0.8005,0.9693,0.8058,0.9698 T0.8143,0.9718 T0.824,0.9753 T0.8354,0.9792 Q0.8483,0.9832,0.871,0.9832 L0.8739,0.9832 L0.8767,0.9832 Q0.8873,0.9832,0.8921,0.9842 Q0.8978,0.9852,0.9157,0.9896 T0.94,0.996 Q0.9424,0.996,0.9469,0.9965 T0.9566,0.997 T0.9676,0.9975 T0.9781,0.998 L0.9874,0.998 L0.9943,0.998 L0.9968,0.998 Z", type: 0 } }, "\\uE0CC": { type: 5, data: { d: "M1,0.5071 L0.8623,0.7102 L0.5865,0.7102 L0.4489,0.5071 L0.5865,0.3045 L0.8623,0.3045 Z M0.4135,0.7974 L0.2758,1 L0,1 L0,0.5944 L0.2758,0.5944 Z M0.4135,0.2026 L0.2758,0.4056 L0,0.4056 L0,0 L0.2758,0 Z", type: 0 } }, "\\uE0CD": { type: 5, data: { d: "M0.9726,0.5071 L0.8451,0.3184 L0.59,0.3184 L0.4624,0.5071 L0.59,0.6955 L0.8451,0.6955 Z M1,0.5071 L0.8588,0.716 L0.5768,0.716 L0.4355,0.5071 L0.5768,0.2982 L0.8588,0.2982 Z M0.401,0.7911 L0.2735,0.6028 L0.0236,0.6028 L0.0236,0.9799 L0.2735,0.9799 Z M0.4284,0.7911 L0.2872,1 L0,1 L0,0.5826 L0.2872,0.5826 Z M0.401,0.2089 L0.2735,0.0201 L0.0236,0.0201 L0.0236,0.3972 L0.2735,0.3972 Z M0.4284,0.2089 L0.2872,0.4174 L0,0.4174 L0,0 L0.2872,0 Z", type: 0 } }, "\\uE0CE": { type: 5, data: { d: "M1,0.4996 Q1,0.5365,0.9924,0.568 T0.9718,0.6177 T0.9433,0.6363 L0.9425,0.6367 Q0.9355,0.6367,0.9285,0.6326 L0.9308,0.6326 Q0.9129,0.6195,0.9013,0.587 T0.8871,0.5164 T0.8943,0.4373 T0.9254,0.3687 L0.9254,0.3691 Q0.9339,0.3628,0.9425,0.3628 Q0.9584,0.3628,0.9716,0.3811 T0.9924,0.431 T1,0.4996 Z M0.9234,0.6321 L0.8776,0.7169 Q0.8791,0.732,0.8791,0.7441 Q0.8791,0.781,0.8716,0.8123 T0.8508,0.862 T0.8224,0.8809 L0.8216,0.8809 Q0.8154,0.8809,0.8092,0.8775 L0.8088,0.8775 Q0.7905,0.8633,0.7792,0.8297 T0.766,0.7571 T0.775,0.6768 T0.8088,0.6086 L0.7431,0.6065 Q0.719,0.6313,0.7072,0.6705 T0.6965,0.7487 T0.7097,0.823 T0.7423,0.8763 L0.7913,0.8775 L0.7314,0.9895 L0.4648,0.5038 L0.7299,0.0176 L0.7882,0.1229 L0.7404,0.1212 Q0.7244,0.138,0.7136,0.1617 T0.6982,0.2108 T0.6943,0.2632 T0.7003,0.3144 T0.7159,0.3586 T0.7396,0.3909 L0.8072,0.3926 Q0.7894,0.3796,0.7777,0.3479 T0.7635,0.2789 T0.7697,0.2011 T0.7987,0.1326 Q0.8092,0.1225,0.8204,0.1225 Q0.8321,0.1225,0.8426,0.1332 T0.8609,0.1623 T0.8731,0.2062 T0.8776,0.2592 Q0.8776,0.268,0.8768,0.2815 L0.9219,0.3628 L0.8644,0.3612 Q0.8403,0.3855,0.8284,0.4247 T0.8177,0.5029 T0.8309,0.5772 T0.8632,0.6305 Z M0.6759,0.6384 Q0.6576,0.625,0.6457,0.5914 T0.6319,0.5185 T0.6407,0.4375 T0.6751,0.3691 L0.609,0.367 Q0.5849,0.3918,0.5731,0.431 T0.5626,0.509 T0.5758,0.5833 T0.6082,0.6367 Z M0.6459,0.0025 L0.391,0.4551 L0.0035,0.4551 L0.246,0 Z M0.6553,1 L0.2421,1 L0,0.5449 L0.3875,0.5449 Z", type: 0 } }, "\\uE0CF": { type: 5, data: { d: "M0.4996,0 Q0.5562,0,0.5961,0.0166 T0.6364,0.0566 L0.6368,0.0575 Q0.6368,0.0646,0.6324,0.0713 L0.6324,0.0692 Q0.6196,0.0868,0.5872,0.0986 T0.5166,0.1128 T0.4373,0.1057 T0.3689,0.0747 L0.3694,0.0747 Q0.3627,0.0663,0.3627,0.0575 Q0.3627,0.0336,0.4028,0.0168 T0.4996,0 Z M0.6324,0.0768 L0.717,0.1225 Q0.7321,0.1212,0.744,0.1212 Q0.8007,0.1212,0.8406,0.1378 T0.8809,0.1779 L0.8813,0.1783 Q0.8813,0.1846,0.8778,0.1909 Q0.8636,0.2093,0.8299,0.2208 T0.7573,0.2343 T0.6769,0.2253 T0.6089,0.1913 L0.6067,0.2567 Q0.6315,0.281,0.6707,0.2928 T0.7489,0.3035 T0.8231,0.2903 T0.8764,0.258 L0.8778,0.2085 L0.9898,0.2685 L0.504,0.5352 L0.0177,0.2701 L0.1227,0.2118 L0.1213,0.2596 Q0.1457,0.2836,0.1851,0.2955 T0.2635,0.3062 T0.3377,0.293 T0.3911,0.2605 L0.3928,0.193 Q0.38,0.2106,0.3483,0.2221 T0.2792,0.2364 T0.2013,0.2303 T0.1324,0.2013 Q0.1222,0.1909,0.1222,0.1795 Q0.1222,0.156,0.1623,0.1393 T0.2591,0.1225 Q0.2679,0.1225,0.2817,0.1233 L0.3627,0.078 L0.3609,0.1359 Q0.3857,0.1598,0.4249,0.1718 T0.5031,0.1825 T0.5773,0.1693 T0.6306,0.1367 Z M0.6386,0.3242 Q0.6253,0.3427,0.5917,0.3544 T0.5186,0.3683 T0.4376,0.3595 T0.3689,0.3251 L0.3671,0.3909 Q0.3915,0.4148,0.4309,0.4268 T0.5093,0.4375 T0.5835,0.4243 T0.6368,0.3918 Z M0.0027,0.354 L0.4553,0.6091 L0.4553,0.9962 L0,0.7542 Z M1,0.3448 L1,0.7576 L0.5447,1 L0.5447,0.6128 Z", type: 0 } }, "\\uE0D0": { type: 5, data: { d: "M0,0.7699 Q0,0.7172,0.0277,0.6731 T0.103,0.6032 T0.2066,0.5774 Q0.2487,0.5774,0.2865,0.5922 T0.3526,0.6339 L0.3935,0.6715 Q0.4218,0.6984,0.438,0.7336 T0.4541,0.8075 Q0.4541,0.8602,0.4264,0.9046 T0.3511,0.9745 T0.2475,1 Q0.2054,1,0.1676,0.9852 T0.1016,0.9435 L0.0606,0.9059 Q0.0317,0.879,0.0159,0.8438 T0,0.7699 Z M0.5459,0.7699 Q0.5459,0.7172,0.5736,0.6731 T0.6489,0.6032 T0.7525,0.5774 Q0.7946,0.5774,0.8324,0.5922 T0.8984,0.6339 L0.9394,0.6715 Q0.9579,0.6892,0.9714,0.7105 T0.9925,0.7567 T1,0.8075 Q1,0.8602,0.9723,0.9046 T0.897,0.9745 T0.7934,1 Q0.7513,1,0.7135,0.9852 T0.6474,0.9435 L0.6065,0.9059 Q0.5776,0.879,0.5617,0.8438 T0.5459,0.7699 Z M0,0.1925 Q0,0.1398,0.0277,0.0957 T0.103,0.0258 T0.2066,0 Q0.2487,0,0.2865,0.0148 T0.3526,0.0565 L0.3935,0.0941 Q0.4218,0.121,0.438,0.1562 T0.4541,0.2301 Q0.4541,0.2828,0.4264,0.3269 T0.3511,0.3968 T0.2475,0.4226 Q0.2054,0.4226,0.1676,0.4078 T0.1016,0.3661 L0.0606,0.3285 Q0.0317,0.3016,0.0159,0.2664 T0,0.1925 Z M0.5459,0.1925 Q0.5459,0.1398,0.5736,0.0957 T0.6489,0.0258 T0.7525,0 Q0.7946,0,0.8324,0.0148 T0.8984,0.0565 L0.9394,0.0941 Q0.9677,0.121,0.9838,0.1562 T1,0.2301 Q1,0.2828,0.9723,0.3269 T0.897,0.3968 T0.7934,0.4226 Q0.7513,0.4226,0.7135,0.4078 T0.6474,0.3661 L0.6065,0.3285 Q0.5874,0.3108,0.5741,0.2895 T0.5534,0.2433 T0.5459,0.1925 Z M0.3301,0.6403 Q0.3306,0.6403,0.3312,0.6409 L0.3272,0.6371 L0.3272,0.6371 Z M0.8759,0.6403 Q0.8765,0.6403,0.8771,0.6409 Q0.8748,0.6387,0.8725,0.6371 L0.8731,0.6371 Z M0.3301,0.0629 Q0.3306,0.0629,0.3312,0.0634 L0.3272,0.0597 L0.3272,0.0602 Z M0.8759,0.0629 Q0.8765,0.0629,0.8771,0.0634 Q0.8748,0.0613,0.8725,0.0597 Q0.8731,0.0597,0.8731,0.0602 Z M0.779,0.4113 L0.7501,0.3849 Q0.7046,0.3844,0.6636,0.3661 Q0.7132,0.407,0.779,0.4113 Z M0.7957,0.4118 Q0.8477,0.4113,0.8918,0.3874 T0.9619,0.3223 T0.9885,0.2323 L0.9585,0.2048 Q0.9538,0.2769,0.8987,0.3282 T0.7657,0.3844 Z M0.9879,0.2167 Q0.9827,0.1554,0.9388,0.1097 Q0.9585,0.1478,0.959,0.1898 Z M0.2331,0.4113 L0.2043,0.3849 Q0.1587,0.3844,0.1177,0.3661 Q0.1673,0.407,0.2331,0.4113 Z M0.2499,0.4118 Q0.2885,0.4118,0.324,0.3973 T0.3852,0.3589 T0.4264,0.3019 T0.4426,0.2323 L0.4126,0.2048 Q0.408,0.2769,0.3529,0.3282 T0.2198,0.3844 Z M0.442,0.2167 Q0.4368,0.1554,0.393,0.1097 Q0.4126,0.1478,0.4132,0.1903 Z M0.779,0.9887 L0.7501,0.9624 Q0.7046,0.9618,0.6636,0.9435 Q0.7132,0.9844,0.779,0.9887 Z M0.7957,0.9892 Q0.8477,0.9887,0.8918,0.9648 T0.9619,0.8997 T0.9885,0.8097 L0.9585,0.7823 Q0.9538,0.8543,0.8987,0.9056 T0.7657,0.9618 Z M0.9879,0.7941 Q0.9827,0.7328,0.9388,0.6871 Q0.9585,0.7253,0.959,0.7672 Z M0.2331,0.9887 L0.2043,0.9624 Q0.1587,0.9618,0.1177,0.9435 Q0.1673,0.9844,0.2331,0.9887 Z M0.2499,0.9892 Q0.3018,0.9887,0.3459,0.9648 T0.416,0.8997 T0.4426,0.8102 L0.4126,0.7823 Q0.408,0.8543,0.3529,0.9056 T0.2198,0.9618 Z M0.442,0.7941 Q0.4368,0.7328,0.393,0.6871 Q0.4126,0.7253,0.4132,0.7672 Z M0.3191,0.6452 Q0.2943,0.622,0.2643,0.6091 T0.2066,0.5962 Q0.1795,0.5962,0.1497,0.6091 T0.0949,0.6441 T0.0537,0.6995 T0.0375,0.7699 Q0.0375,0.8419,0.0941,0.8941 Q0.1189,0.9172,0.1489,0.9304 T0.2066,0.9435 Q0.2337,0.9435,0.2634,0.9304 T0.3182,0.8952 T0.3595,0.8398 T0.3756,0.7699 Q0.3756,0.6978,0.3191,0.6452 Z M0.026,0.7731 L0.026,0.7699 Q0.026,0.6935,0.0854,0.6376 Q0.0658,0.6538,0.0514,0.6739 T0.0289,0.718 T0.0202,0.7677 Z M0.0271,0.7892 L0.0208,0.7833 Q0.0254,0.8419,0.0681,0.886 Q0.0664,0.8828,0.0646,0.879 Q0.0329,0.8382,0.0271,0.7892 Z M0.3866,0.7823 Q0.382,0.8511,0.3278,0.9016 Q0.3843,0.8565,0.3918,0.7871 Z M0.3872,0.7677 L0.393,0.7726 L0.393,0.7699 Q0.393,0.7349,0.3791,0.7038 Q0.3739,0.6973,0.3681,0.6914 Q0.3866,0.7274,0.3872,0.7677 Z M0.865,0.6452 Q0.8402,0.622,0.8102,0.6091 T0.7525,0.5962 Q0.7305,0.5962,0.7072,0.6043 T0.6619,0.628 T0.6223,0.6642 T0.5941,0.7124 T0.5834,0.7699 Q0.5834,0.8419,0.6399,0.8941 Q0.6561,0.9097,0.6757,0.9207 T0.7149,0.9376 T0.7525,0.9435 Q0.7796,0.9435,0.8093,0.9304 T0.8641,0.8952 T0.9054,0.8398 T0.9215,0.7699 Q0.9215,0.6978,0.865,0.6452 Z M0.5718,0.7731 L0.5718,0.7699 Q0.5718,0.6935,0.6313,0.6376 Q0.6013,0.6618,0.584,0.6954 T0.5661,0.7677 Z M0.573,0.7892 L0.5666,0.7833 Q0.5713,0.8419,0.614,0.886 Q0.6122,0.8828,0.6105,0.879 Q0.5788,0.8382,0.573,0.7892 Z M0.9325,0.7823 Q0.9279,0.8511,0.8736,0.9016 Q0.9308,0.8565,0.9377,0.7871 Z M0.9331,0.7672 L0.9388,0.7726 L0.9388,0.7699 Q0.9388,0.7349,0.925,0.7038 Q0.9198,0.6973,0.914,0.6914 Q0.9325,0.7274,0.9331,0.7672 Z M0.3191,0.0677 Q0.2943,0.0446,0.2643,0.0317 T0.2066,0.0188 Q0.1795,0.0188,0.1497,0.0317 T0.0949,0.0667 T0.0537,0.122 T0.0375,0.1925 Q0.0375,0.2645,0.0941,0.3167 Q0.1189,0.3398,0.1489,0.353 T0.2066,0.3661 Q0.2337,0.3661,0.2634,0.353 T0.3182,0.3177 T0.3595,0.2624 T0.3756,0.1925 Q0.3756,0.1204,0.3191,0.0677 Z M0.026,0.1957 L0.026,0.1925 Q0.026,0.1161,0.0854,0.0602 Q0.0554,0.0844,0.0381,0.118 T0.0202,0.1903 Z M0.0271,0.2118 L0.0208,0.2059 Q0.0254,0.2645,0.0681,0.3086 Q0.0664,0.3054,0.0646,0.3016 Q0.0329,0.2608,0.0271,0.2118 Z M0.3866,0.2048 Q0.382,0.2737,0.3278,0.3242 Q0.3849,0.279,0.3918,0.2097 Z M0.3872,0.1903 L0.393,0.1952 L0.393,0.1925 Q0.393,0.1581,0.3791,0.1263 Q0.3739,0.1199,0.3681,0.114 Q0.3866,0.15,0.3872,0.1903 Z M0.865,0.0677 Q0.8402,0.0446,0.8102,0.0317 T0.7525,0.0188 Q0.7253,0.0188,0.6956,0.0317 T0.6408,0.0667 T0.5995,0.122 T0.5834,0.1925 Q0.5834,0.2645,0.6399,0.3167 Q0.6647,0.3398,0.6947,0.353 T0.7525,0.3661 Q0.7796,0.3661,0.8093,0.353 T0.8641,0.3177 T0.9054,0.2624 T0.9215,0.1925 Q0.9215,0.1204,0.865,0.0677 Z M0.5718,0.1957 L0.5718,0.1925 Q0.5718,0.1161,0.6313,0.0602 Q0.6013,0.0844,0.584,0.118 T0.5661,0.1903 Z M0.573,0.2118 L0.5666,0.2059 Q0.5713,0.2645,0.614,0.3086 Q0.6122,0.3054,0.6105,0.3016 Q0.5788,0.2608,0.573,0.2118 Z M0.9325,0.2048 Q0.9279,0.2737,0.8736,0.3242 Q0.9308,0.279,0.9377,0.2097 Z M0.9331,0.1898 L0.9388,0.1952 L0.9388,0.1925 Q0.9388,0.1575,0.925,0.1263 Q0.9198,0.1199,0.914,0.114 Q0.9325,0.15,0.9331,0.1898 Z", type: 0 } }, "\\uE0D1": { type: 5, data: { d: "M0.7639,0.1974 L0.9593,0.1974 L0.9593,0.1443 L0.7639,0.1443 L0.7639,0.1974 Z M0.7586,0.109 L0.9727,0.109 Q0.9839,0.109,0.992,0.1153 T1,0.1291 L1,0.382 Q1,0.3906,0.9912,0.3964 T0.9727,0.4021 L0.7586,0.4021 Q0.7468,0.4021,0.739,0.3956 T0.7313,0.382 L0.7313,0.1291 Q0.7313,0.1246,0.7339,0.1207 T0.7406,0.1143 T0.7495,0.1104 T0.7586,0.109 Z M0.7639,0.6575 L0.9593,0.6575 L0.9593,0.6044 L0.7639,0.6044 L0.7639,0.6575 Z M0.7313,0.8347 L0.7313,0.5843 Q0.7313,0.5757,0.7401,0.5699 T0.7586,0.5641 L0.9706,0.5641 Q0.9818,0.5641,0.9898,0.5705 T0.9979,0.5843 L0.9979,0.8347 Q0.9979,0.8433,0.989,0.8491 T0.9706,0.8549 L0.7586,0.8549 Q0.7468,0.8549,0.739,0.8483 T0.7313,0.8347 Z M0,1 L0,0 L0.7607,0 L0.7607,1 L0,1 Z", type: 0 } }, "\\uE0D2": { type: 5, data: { d: "M0.9764,0.0029 L0.3179,0.4552 L0,0.4552 L0,0 Z M1,1 L0,1 L0,0.5448 L0.3091,0.5448 Z", type: 0 } }, "\\uE0D4": { type: 5, data: { d: "M0.0236,0.0029 L0.6824,0.4552 L1,0.4552 L1,0 Z M0,1 L1,1 L1,0.5448 L0.6912,0.5448 Z", type: 0 } }, "\\uEE00": { type: 3, data: "M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z" }, "\\uEE01": { type: 3, data: "M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z" }, "\\uEE02": { type: 3, data: "M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z" }, "\\uEE03": { type: 3, data: "M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z M.25,.15 L1,.15 L1,.85 L.25,.85 Z" }, "\\uEE04": { type: 3, data: "M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z M0,.15 L1,.15 L1,.85 L0,.85 Z" }, "\\uEE05": { type: 3, data: "M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z M0,.15 L.75,.15 L.75,.85 L0,.85 Z" }, "\\uEE06": { type: 5, data: { d: "M0.6574,0.303 Q0.623,0.291,0.5852,0.285 T0.5082,0.279 T0.4311,0.285 T0.359,0.303 L0.3082,0.248 Q0.3525,0.232,0.4041,0.2235 T0.5082,0.215 T0.6123,0.2235 T0.7082,0.248 Z", type: 0 }, scaleType: 1 }, "\\uEE07": { type: 5, data: { d: "M0.8557,0.582 L0.7656,0.551 Q0.7852,0.53,0.7951,0.507 T0.8049,0.46 Q0.8049,0.424,0.782,0.3905 T0.718,0.332 T0.6221,0.293 T0.5082,0.279 L0.5082,0.215 Q0.5607,0.215,0.6123,0.2235 T0.709,0.248 T0.7918,0.287 T0.8557,0.3375 T0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.582 Z", type: 0 }, scaleType: 1 }, "\\uEE08": { type: 5, data: { d: "M0.5082,0.705 Q0.482,0.705,0.4557,0.703 T0.4049,0.697 L0.4311,0.635 Q0.4508,0.638,0.4697,0.6395 T0.5082,0.641 Q0.5672,0.641,0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 Q0.8049,0.436,0.7951,0.413 T0.7656,0.369 L0.8557,0.338 Q0.882,0.365,0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE09": { type: 5, data: { d: "M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 L0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 T0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 L0.9098,0.46 Q0.9098,0.492,0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE0A": { type: 5, data: { d: "M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.338 L0.2508,0.369 Q0.2311,0.39,0.2213,0.413 T0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 Q0.5279,0.641,0.5467,0.6395 T0.5852,0.635 L0.6115,0.697 Q0.5869,0.701,0.5607,0.703 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE0B": { type: 5, data: { d: "M0.1607,0.582 Q0.1344,0.555,0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.3375 T0.2246,0.287 T0.3074,0.248 T0.4041,0.2235 T0.5082,0.215 L0.5082,0.279 Q0.4492,0.279,0.3943,0.293 T0.2984,0.332 T0.2344,0.3905 T0.2115,0.46 Q0.2115,0.484,0.2213,0.507 T0.2508,0.551 Z", type: 0 }, scaleType: 1 }, "\\uF5D0": L4.LINE_H, "\\uF5D1": L4.LINE_V, "\\uF5D2": L4.FADE_RIGHT, "\\uF5D3": L4.FADE_LEFT, "\\uF5D4": L4.FADE_DOWN, "\\uF5D5": L4.FADE_UP, "\\uF5D6": L4.CURVE_DOWN_RIGHT, "\\uF5D7": L4.CURVE_DOWN_LEFT, "\\uF5D8": L4.CURVE_UP_RIGHT, "\\uF5D9": L4.CURVE_UP_LEFT, "\\uF5DA": [L4.LINE_V, L4.CURVE_UP_RIGHT], "\\uF5DB": [L4.LINE_V, L4.CURVE_DOWN_RIGHT], "\\uF5DC": [L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_RIGHT], "\\uF5DD": [L4.LINE_V, L4.CURVE_UP_LEFT], "\\uF5DE": [L4.LINE_V, L4.CURVE_DOWN_LEFT], "\\uF5DF": [L4.CURVE_DOWN_LEFT, L4.CURVE_UP_LEFT], "\\uF5E0": [L4.LINE_H, L4.CURVE_DOWN_LEFT], "\\uF5E1": [L4.LINE_H, L4.CURVE_DOWN_RIGHT], "\\uF5E2": [L4.CURVE_DOWN_LEFT, L4.CURVE_DOWN_RIGHT], "\\uF5E3": [L4.LINE_H, L4.CURVE_UP_LEFT], "\\uF5E4": [L4.LINE_H, L4.CURVE_UP_RIGHT], "\\uF5E5": [L4.CURVE_UP_LEFT, L4.CURVE_UP_RIGHT], "\\uF5E6": [L4.LINE_V, L4.CURVE_UP_LEFT, L4.CURVE_UP_RIGHT], "\\uF5E7": [L4.LINE_V, L4.CURVE_DOWN_LEFT, L4.CURVE_DOWN_RIGHT], "\\uF5E8": [L4.LINE_H, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_LEFT], "\\uF5E9": [L4.LINE_H, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_RIGHT], "\\uF5EA": [L4.LINE_V, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_LEFT], "\\uF5EB": [L4.LINE_V, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_RIGHT], "\\uF5EC": [L4.LINE_H, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_LEFT], "\\uF5ED": [L4.LINE_H, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_RIGHT], "\\uF5EE": [L4.NODE_FILL, L4.NODE_STROKE], "\\uF5EF": L4.NODE_STROKE, "\\uF5F0": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_RIGHT], "\\uF5F1": [L4.NODE_STROKE, L4.NODE_LINE_RIGHT], "\\uF5F2": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_LEFT], "\\uF5F3": [L4.NODE_STROKE, L4.NODE_LINE_LEFT], "\\uF5F4": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF5F5": [L4.NODE_STROKE, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF5F6": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN], "\\uF5F7": [L4.NODE_STROKE, L4.NODE_LINE_DOWN], "\\uF5F8": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP], "\\uF5F9": [L4.NODE_STROKE, L4.NODE_LINE_UP], "\\uF5FA": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_UP], "\\uF5FB": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_UP], "\\uF5FC": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF5FD": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF5FE": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF5FF": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF600": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_RIGHT], "\\uF601": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_RIGHT], "\\uF602": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT], "\\uF603": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT], "\\uF604": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF605": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF606": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF607": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF608": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF609": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60A": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60B": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60C": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60D": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\u{1FB00}": f4(1), "\\u{1FB01}": f4(2), "\\u{1FB02}": f4(3), "\\u{1FB03}": f4(4), "\\u{1FB04}": f4(5), "\\u{1FB05}": f4(6), "\\u{1FB06}": f4(7), "\\u{1FB07}": f4(8), "\\u{1FB08}": f4(9), "\\u{1FB09}": f4(10), "\\u{1FB0A}": f4(11), "\\u{1FB0B}": f4(12), "\\u{1FB0C}": f4(13), "\\u{1FB0D}": f4(14), "\\u{1FB0E}": f4(15), "\\u{1FB0F}": f4(16), "\\u{1FB10}": f4(17), "\\u{1FB11}": f4(18), "\\u{1FB12}": f4(19), "\\u{1FB13}": f4(20), "\\u{1FB14}": f4(22), "\\u{1FB15}": f4(23), "\\u{1FB16}": f4(24), "\\u{1FB17}": f4(25), "\\u{1FB18}": f4(26), "\\u{1FB19}": f4(27), "\\u{1FB1A}": f4(28), "\\u{1FB1B}": f4(29), "\\u{1FB1C}": f4(30), "\\u{1FB1D}": f4(31), "\\u{1FB1E}": f4(32), "\\u{1FB1F}": f4(33), "\\u{1FB20}": f4(34), "\\u{1FB21}": f4(35), "\\u{1FB22}": f4(36), "\\u{1FB23}": f4(37), "\\u{1FB24}": f4(38), "\\u{1FB25}": f4(39), "\\u{1FB26}": f4(40), "\\u{1FB27}": f4(41), "\\u{1FB28}": f4(43), "\\u{1FB29}": f4(44), "\\u{1FB2A}": f4(45), "\\u{1FB2B}": f4(46), "\\u{1FB2C}": f4(47), "\\u{1FB2D}": f4(48), "\\u{1FB2E}": f4(49), "\\u{1FB2F}": f4(50), "\\u{1FB30}": f4(51), "\\u{1FB31}": f4(52), "\\u{1FB32}": f4(53), "\\u{1FB33}": f4(54), "\\u{1FB34}": f4(55), "\\u{1FB35}": f4(56), "\\u{1FB36}": f4(57), "\\u{1FB37}": f4(58), "\\u{1FB38}": f4(59), "\\u{1FB39}": f4(60), "\\u{1FB3A}": f4(61), "\\u{1FB3B}": f4(62), "\\u{1FB3C}": { type: 3, data: "M0,0.6667 L0,1 L0.5,1 Z" }, "\\u{1FB3D}": { type: 3, data: "M0,0.6667 L0,1 L1,1 Z" }, "\\u{1FB3E}": { type: 3, data: "M0,0.3333 L0,1 L0.5,1 Z" }, "\\u{1FB3F}": { type: 3, data: "M0,0.3333 L0,1 L1,1 Z" }, "\\u{1FB40}": { type: 3, data: "M0,0 L0,1 L0.5,1 Z" }, "\\u{1FB41}": { type: 3, data: "M0,0.3333 L0.5,0 L1,0 L1,1 L0,1 Z" }, "\\u{1FB42}": { type: 3, data: "M0,0.3333 L1,0 L1,1 L0,1 Z" }, "\\u{1FB43}": { type: 3, data: "M0,0.6667 L0.5,0 L1,0 L1,1 L0,1 Z" }, "\\u{1FB44}": { type: 3, data: "M0,0.6667 L1,0 L1,1 L0,1 Z" }, "\\u{1FB45}": { type: 3, data: "M0,1 L0.5,0 L1,0 L1,1 Z" }, "\\u{1FB46}": { type: 3, data: "M0,0.6667 L1,0.3333 L1,1 L0,1 Z" }, "\\u{1FB47}": { type: 3, data: "M0.5,1 L1,0.6667 L1,1 Z" }, "\\u{1FB48}": { type: 3, data: "M0,1 L1,0.6667 L1,1 Z" }, "\\u{1FB49}": { type: 3, data: "M0.5,1 L1,0.3333 L1,1 Z" }, "\\u{1FB4A}": { type: 3, data: "M0,1 L1,0.3333 L1,1 Z" }, "\\u{1FB4B}": { type: 3, data: "M0.5,1 L1,0 L1,1 Z" }, "\\u{1FB4C}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 L1,0.3333 Z" }, "\\u{1FB4D}": { type: 3, data: "M0,0 L0,1 L1,1 L1,0.3333 Z" }, "\\u{1FB4E}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB4F}": { type: 3, data: "M0,0 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB50}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 Z" }, "\\u{1FB51}": { type: 3, data: "M0,0.3333 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB52}": { type: 3, data: "M0,0.6667 L0.5,1 L1,1 L1,0 L0,0 Z" }, "\\u{1FB53}": { type: 3, data: "M0,0.6667 L1,1 L1,0 L0,0 Z" }, "\\u{1FB54}": { type: 3, data: "M0,0.3333 L0.5,1 L1,1 L1,0 L0,0 Z" }, "\\u{1FB55}": { type: 3, data: "M0,0.3333 L1,1 L1,0 L0,0 Z" }, "\\u{1FB56}": { type: 3, data: "M0,0 L0.5,1 L1,1 L1,0 Z" }, "\\u{1FB57}": { type: 3, data: "M0,0.3333 L0,0 L0.5,0 Z" }, "\\u{1FB58}": { type: 3, data: "M0,0.3333 L0,0 L1,0 Z" }, "\\u{1FB59}": { type: 3, data: "M0,0.6667 L0,0 L0.5,0 Z" }, "\\u{1FB5A}": { type: 3, data: "M0,0.6667 L0,0 L1,0 Z" }, "\\u{1FB5B}": { type: 3, data: "M0,1 L0,0 L0.5,0 Z" }, "\\u{1FB5C}": { type: 3, data: "M0,0.6667 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB5D}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB5E}": { type: 3, data: "M0,1 L0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB5F}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB60}": { type: 3, data: "M0,1 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB61}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 Z" }, "\\u{1FB62}": { type: 3, data: "M0.5,0 L1,0 L1,0.3333 Z" }, "\\u{1FB63}": { type: 3, data: "M0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB64}": { type: 3, data: "M0.5,0 L1,0 L1,0.6667 Z" }, "\\u{1FB65}": { type: 3, data: "M0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB66}": { type: 3, data: "M0.5,0 L1,0 L1,1 Z" }, "\\u{1FB67}": { type: 3, data: "M0,0.3333 L1,0.6667 L1,0 L0,0 Z" }, "\\u{1FB68}": { type: 3, data: "M0,0 L1,0 L1,1 L0,1 L0.5,0.5 Z" }, "\\u{1FB69}": { type: 3, data: "M0,0 L0.5,0.5 L1,0 L1,1 L0,1 Z" }, "\\u{1FB6A}": { type: 3, data: "M0,0 L1,0 L0.5,0.5 L1,1 L0,1 Z" }, "\\u{1FB6B}": { type: 3, data: "M0,0 L1,0 L1,1 L0.5,0.5 L0,1 Z" }, "\\u{1FB6C}": { type: 3, data: "M0,0 L0.5,0.5 L0,1 Z" }, "\\u{1FB6D}": { type: 3, data: "M0,0 L1,0 L0.5,0.5 Z" }, "\\u{1FB6E}": { type: 3, data: "M1,0 L1,1 L0.5,0.5 Z" }, "\\u{1FB6F}": { type: 3, data: "M0,1 L1,1 L0.5,0.5 Z" }, "\\u{1FB70}": { type: 0, data: [{ x: 1, y: 0, w: 1, h: 8 }] }, "\\u{1FB71}": { type: 0, data: [{ x: 2, y: 0, w: 1, h: 8 }] }, "\\u{1FB72}": { type: 0, data: [{ x: 3, y: 0, w: 1, h: 8 }] }, "\\u{1FB73}": { type: 0, data: [{ x: 4, y: 0, w: 1, h: 8 }] }, "\\u{1FB74}": { type: 0, data: [{ x: 5, y: 0, w: 1, h: 8 }] }, "\\u{1FB75}": { type: 0, data: [{ x: 6, y: 0, w: 1, h: 8 }] }, "\\u{1FB76}": { type: 0, data: [{ x: 0, y: 1, w: 8, h: 1 }] }, "\\u{1FB77}": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 1 }] }, "\\u{1FB78}": { type: 0, data: [{ x: 0, y: 3, w: 8, h: 1 }] }, "\\u{1FB79}": { type: 0, data: [{ x: 0, y: 4, w: 8, h: 1 }] }, "\\u{1FB7A}": { type: 0, data: [{ x: 0, y: 5, w: 8, h: 1 }] }, "\\u{1FB7B}": { type: 0, data: [{ x: 0, y: 6, w: 8, h: 1 }] }, "\\u{1FB7C}": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB7D}": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }, { x: 0, y: 0, w: 8, h: 1 }] }, "\\u{1FB7E}": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }, { x: 0, y: 0, w: 8, h: 1 }] }, "\\u{1FB7F}": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB80}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB81}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }, { x: 0, y: 2, w: 8, h: 1 }, { x: 0, y: 4, w: 8, h: 1 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB82}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 2 }] }, "\\u{1FB83}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 3 }] }, "\\u{1FB84}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 5 }] }, "\\u{1FB85}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 6 }] }, "\\u{1FB86}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 7 }] }, "\\u{1FB87}": { type: 0, data: [{ x: 6, y: 0, w: 2, h: 8 }] }, "\\u{1FB88}": { type: 0, data: [{ x: 5, y: 0, w: 3, h: 8 }] }, "\\u{1FB89}": { type: 0, data: [{ x: 3, y: 0, w: 5, h: 8 }] }, "\\u{1FB8A}": { type: 0, data: [{ x: 2, y: 0, w: 6, h: 8 }] }, "\\u{1FB8B}": { type: 0, data: [{ x: 1, y: 0, w: 7, h: 8 }] }, "\\u{1FB8C}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L0.5,0 L0.5,1 L0,1 Z" }, "\\u{1FB8D}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0.5,0 L1,0 L1,1 L0.5,1 Z" }, "\\u{1FB8E}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L1,0.5 L0,0.5 Z" }, "\\u{1FB8F}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0.5 L1,0.5 L1,1 L0,1 Z" }, "\\u{1FB90}": { type: 1, data: [[0, 1], [1, 0]] }, "\\u{1FB91}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0.5 L1,0.5 L1,1 L0,1 Z" }, { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }] }], "\\u{1FB92}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0 L1,0 L1,0.5 L0,0.5 Z" }, { type: 0, data: [{ x: 0, y: 4, w: 8, h: 4 }] }], "\\u{1FB94}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0 L0.5,0 L0.5,1 L0,1 Z" }, { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }] }], "\\u{1FB95}": { type: 0, data: [{ x: 0, y: 0, w: 2, h: 2 }, { x: 4, y: 0, w: 2, h: 2 }, { x: 2, y: 2, w: 2, h: 2 }, { x: 6, y: 2, w: 2, h: 2 }, { x: 0, y: 4, w: 2, h: 2 }, { x: 4, y: 4, w: 2, h: 2 }, { x: 2, y: 6, w: 2, h: 2 }, { x: 6, y: 6, w: 2, h: 2 }] }, "\\u{1FB96}": { type: 0, data: [{ x: 2, y: 0, w: 2, h: 2 }, { x: 6, y: 0, w: 2, h: 2 }, { x: 0, y: 2, w: 2, h: 2 }, { x: 4, y: 2, w: 2, h: 2 }, { x: 2, y: 4, w: 2, h: 2 }, { x: 6, y: 4, w: 2, h: 2 }, { x: 0, y: 6, w: 2, h: 2 }, { x: 4, y: 6, w: 2, h: 2 }] }, "\\u{1FB97}": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 2 }, { x: 0, y: 6, w: 8, h: 2 }] }, "\\u{1FB98}": { type: 2, data: "M-0.25,-0.25 L1.25,1.25 M-0.25,0 L1,1.25 M-0.25,0.25 L0.75,1.25 M-0.25,0.5 L0.5,1.25 M0,-0.25 L1.25,1 M0.25,-0.25 L1.25,0.75 M0.5,-0.25 L1.25,0.5 M-0.25,0.75 L0.25,1.25 M0.75,-0.25 L1.25,0.25", strokeWidth: 1 }, "\\u{1FB99}": { type: 2, data: "M-0.25,0.5 L0.5,-0.25 M-0.25,0.75 L0.75,-0.25 M-0.25,1 L1,-0.25 M-0.25,1.25 L1.25,-0.25 M0,1.25 L1.25,0 M0.25,1.25 L1.25,0.25 M0.5,1.25 L1.25,0.5 M-0.25,0.25 L0.25,-0.25 M0.75,1.25 L1.25,0.75", strokeWidth: 1 }, "\\u{1FB9A}": { type: 5, data: { d: "M0,0 L.5,.5 L0,1 L1,1 L.5,.5 L1,0", type: 0 } }, "\\u{1FB9B}": { type: 5, data: { d: "M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1", type: 0 } }, "\\u{1FB9C}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L0,1 Z" }, "\\u{1FB9D}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L1,1 Z" }, "\\u{1FB9E}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M1,0 L1,1 L0,1 Z" }, "\\u{1FB9F}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,1 L0,1 Z" }, "\\u{1FBA0}": { type: 2, data: "M.5,0 L0,.5", strokeWidth: 1 }, "\\u{1FBA1}": { type: 2, data: "M.5,0 L1,.5", strokeWidth: 1 }, "\\u{1FBA2}": { type: 2, data: "M0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA3}": { type: 2, data: "M1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA4}": { type: 2, data: "M.5,0 L0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA5}": { type: 2, data: "M.5,0 L1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA6}": { type: 2, data: "M0,.5 L.5,1 L1,.5", strokeWidth: 1 }, "\\u{1FBA7}": { type: 2, data: "M0,.5 L.5,0 L1,.5", strokeWidth: 1 }, "\\u{1FBA8}": { type: 2, data: "M.5,0 L0,.5 M1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA9}": { type: 2, data: "M.5,0 L1,.5 M0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAA}": { type: 2, data: "M.5,0 L1,.5 L.5,1 L0,.5", strokeWidth: 1 }, "\\u{1FBAB}": { type: 2, data: "M.5,0 L0,.5 L.5,1 L1,.5", strokeWidth: 1 }, "\\u{1FBAC}": { type: 2, data: "M0,.5 L.5,0 L1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAD}": { type: 2, data: "M1,.5 L.5,0 L0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAE}": { type: 2, data: "M.5,0 L1,.5 L.5,1 L0,.5 Z", strokeWidth: 1 }, "\\u{1FBAF}": { type: 2, data: "M0,.5 L1,.5 M.5,.35 L.5,.65", strokeWidth: 1 }, "\\u{1FBB0}": { type: 3, data: "M0.1,0.2 L0.1,.8 L.4,.6 L.9,0.6 Z", scaleType: 1 }, "\\u{1FBB1}": { type: 4, data: { d: "M.1,.525 L.35,.675 L.9,.35", type: 1 }, scaleType: 1 }, "\\u{1FBB2}": { type: 3, data: "M.29,.27 L0.13,.56 L.22,.59 L.35,0.35 L.67,.35 L.57,.57 L.71,.76 L.22,.76 L.42,1 L.53,.98 L.43,.86 L.9,.86 L.71,.6 L1,.6 L1,.52 L.83,.52 L.92,.36 L1,.36 L1,.27Z M.99,.13 A.12,.12,0,1,1,.75,.13 A.12,.12,0,1,1,.99,.13" }, "\\u{1FBB3}": { type: 3, data: "M0,.27 L.3,.27 L.55,.12 L.63,.18 L.33,.36 L0,.36 M0,.52 L.33,.52 L.59,.89 L.73,.89 L.73,.98 L.53,.98 L.28,.6 L0,.6" }, "\\u{1FBB4}": { type: 4, data: { d: "M.15,.55 L.5,.4 L.5,.45 L.65,.45 L.65,.35 L.85,.35 L.85,.625 L.5,.625 L.5,.7 Z", type: 0 }, scaleType: 1 }, "\\u{1FBB5}": [{ type: 5, data: { d: "M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z", type: 0 } }, { type: 5, data: { d: "M.15,.5 L.5,.35 L.5,.425 L.85,.425 L.85,.575 L.5,.575 L.5,.65 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB6}": [{ type: 5, data: { d: "M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z", type: 0 } }, { type: 5, data: { d: "M.85,.5 L.5,.35 L.5,.425 L.15,.425 L.15,.575 L.5,.575 L.5,.65 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB7}": [{ type: 5, data: { d: "M.875,0 L1,0 L1,1 L.875,1 Z", type: 0 } }, { type: 5, data: { d: "M.5,.675 L.2,.5 L.35,.5 L.35,.325 L.65,.325 L.65,.5 L.8,.5 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB8}": [{ type: 5, data: { d: "M.875,0 L1,0 L1,1 L.875,1 Z", type: 0 } }, { type: 5, data: { d: "M.5,.325 L.2,.5 L.35,.5 L.35,.675 L.65,.675 L.65,.5 L.8,.5 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB9}": { type: 5, data: { d: "M1,.89 L.11,.89 L.11,.37 L.36,.12 L.74,.12 L.96,.34 L1,.34 L1,.405 L.92,.405 L.69,.185 L.41,.185 L.21,.42 L.21,.825 L1,.825 Z", type: 0 } }, "\\u{1FBBA}": { type: 5, data: { d: "M0,.89 L0,.825 L.78,.825 L.78,.53 L.7,.415 L0,.415 L0,.35 L.75,.35 L.88,.48 L.88,.89 Z", type: 0 } }, "\\u{1FBBB}": { type: 5, data: { d: "M.31,.275 L.44,.275 L.44,.47 L.05,.47 L.05,.405 L.31,.405 Z M.56,.275 L.69,.275 L.69,.405 L.95,.405 L.95,.47 L.56,.47 Z M.05,.53 L.44,.53 L.44,.725 L.31,.725 L.31,.595 L.05,.595 Z M.56,.53 L.95,.53 L.95,.595 L.69,.595 L.69,.725 L.56,.725 Z", type: 0 }, scaleType: 1 }, "\\u{1FBBC}": [{ type: 3, data: "M0,0 L1,0 L1,1 L0,1 L0,.935 L.885,.935 L.885,.065 L0,.065 Z" }, { type: 3, data: "M.67,.5 A.17,.085,0,1,1,.33,.5 A.17,.085,0,1,1,.67,.5", scaleType: 1 }], "\\u{1FBBD}": { type: 4, data: { d: "M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1 Z", type: 1 } }, "\\u{1FBBE}": { type: 4, data: { d: "M1,.5 L.5,1", type: 1 } }, "\\u{1FBBF}": { type: 4, data: { d: "M.5,0 L1,.5 L.5,1 L0,.5 Z", type: 1 } }, "\\u{1FBC0}": { type: 3, data: "M.16,.445 A.02,.01,0,0,1,.39,.33 L.5,.375 L.61,.33 A.02,.01,0,0,1,.84,.445 L.75,.5 L.84,.555 A.02,.01,0,0,1,.61,.67 L.5,.625 L.39,.67 A.02,.01,0,0,1,.16,.555 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z", scaleType: 1 }, "\\u{1FBC1}": { type: 3, data: "M0.142308,0.924 Q0.130770,0.924,0.120193,0.922 T0.101924,0.916 T0.089424,0.9065 T0.084616,0.895 V0.025 Q0.084616,0.019,0.089424,0.0135 T0.101924,0.004 T0.120193,-0.002 T0.142308,-0.004 Q0.150000,-0.004,0.157693,-0.003 T0.173078,0.000 L0.430770,0.085 Q0.451924,0.059,0.494232,0.041 T0.587501,0.013 T0.692309,-0.0005 T0.800001,-0.004 H1 V0.055 H0.800001 Q0.771155,0.055,0.742309,0.056 T0.685578,0.060 T0.630770,0.0685 T0.580770,0.0825 T0.543270,0.1045 T0.528847,0.133 V0.647 H0.530770 Q0.596155,0.645,0.659616,0.638 T0.782693,0.6165 T0.893270,0.5805 T1,0.531 V0.623 Q0.934616,0.644,0.880770,0.6595 T0.769232,0.685 T0.650963,0.700 T0.528847,0.707 V0.787 Q0.528847,0.802,0.543270,0.8155 T0.580770,0.8375 T0.630770,0.8515 T0.685578,0.860 T0.742309,0.864 T0.800001,0.865 H1 V0.924 H0.800001 Q0.746155,0.924,0.692309,0.9205 T0.587501,0.907 T0.494232,0.879 T0.430770,0.835 L0.173078,0.920 Q0.165386,0.922,0.157693,0.923 T0.142308,0.924 Z M0.2,0.841 L0.415385,0.770 V0.150 L0.2,0.079 V0.841 Z M1,0.698 Q0.973077,0.694,0.969231,0.6885 T0.965385,0.677 Q0.965385,0.672,0.969231,0.6665 T1,0.657 V0.698 Z" }, "\\u{1FBC2}": { type: 3, data: "M0,0.623 V0.531 Q0.044231,0.512,0.0625,0.4905 T0.092308,0.4465 T0.108654,0.4005 T0.113462,0.354 V0.351 Q0.113462,0.345,0.117308,0.3395 T0.129808,0.3305 T0.148846,0.3245 T0.171154,0.323 H0.501923 Q0.532692,0.323,0.563462,0.3185 T0.617308,0.303 T0.651923,0.2765 T0.663462,0.2435 V0.241 Q0.663462,0.219,0.657692,0.197 T0.639423,0.1545 T0.604808,0.115 T0.549615,0.082 T0.475577,0.0615 T0.392308,0.055 H0 V-0.004 H1 V0.055 H0.667308 Q0.694231,0.071,0.713462,0.09 T0.746154,0.129 T0.766346,0.1705 T0.775,0.213 H1 V0.316 Q0.971154,0.305,0.955769,0.2965 T0.920192,0.2825 T0.876923,0.2745 T0.830769,0.272 H0.773077 Q0.767308,0.297,0.743269,0.319 T0.680769,0.355 T0.595192,0.375 T0.501923,0.381 H0.227308 Q0.223462,0.415,0.211,0.4485 T0.172692,0.5135 T0.108269,0.573 T0,0.623 Z M0.611538,0.924 H0 V0.865 H0.611538 Q0.642308,0.865,0.673077,0.8605 T0.727885,0.845 T0.762308,0.8185 T0.773077,0.787 V0.785 Q0.773077,0.769,0.762308,0.7535 T0.727885,0.727 T0.673077,0.7115 T0.611538,0.707 H0.059615 Q0.048077,0.707,0.037115,0.7045 T0,0.694 V0.653 Q0.026923,0.648,0.037115,0.646 T0.059615,0.644 H0.722692 Q0.753462,0.644,0.784231,0.6395 T0.839038,0.624 T0.873846,0.5975 T0.884615,0.566 V0.564 Q0.884615,0.548,0.873846,0.532 T0.839038,0.5055 T0.784231,0.49 T0.722692,0.4855 H0.392308 Q0.380769,0.4855,0.370192,0.483 T0.351923,0.4765 T0.339423,0.467 T0.334615,0.4555 T0.339423,0.444 T0.351923,0.4345 T0.370192,0.428 T0.392308,0.4255 H0.832692 Q0.855769,0.4255,0.878846,0.4235 T0.922115,0.416 T0.957692,0.4015 T1,0.3815 V0.4685 Q0.975,0.4705,0.966346,0.4725 T0.95,0.4765 Q0.961538,0.4835,0.969231,0.4915 T1,0.5075 V0.6205 Q0.965385,0.6455,0.926923,0.665 T0.84,0.6935 Q0.866923,0.7115,0.877596,0.7345 T0.894231,0.7855 V0.787 Q0.894231,0.815,0.876923,0.8425 T0.820192,0.8895 T0.726923,0.916 T0.611538,0.924 Z" }, "\\u{1FBC3}": { type: 3, data: "M0,0.473 V0.386 Q0.025490,0.378,0.028431,0.3695 T0.031373,0.352 V0.35 Q0.031373,0.342,0.028431,0.333 T0,0.316 V0.213 H0.652941 Q0.684314,0.213,0.715686,0.2085 T0.770588,0.193 T0.804902,0.1665 T0.815686,0.135 V0.133 Q0.815686,0.117,0.804902,0.101 T0.770588,0.0745 T0.715686,0.0595 T0.652941,0.055 H0 V-0.004 H0.652941 Q0.707843,-0.004,0.761765,0.004 T0.856863,0.031 T0.915686,0.0775 T0.933333,0.133 V0.135 Q0.933333,0.163,0.915686,0.1905 T0.856863,0.237 T0.761765,0.264 T0.652941,0.272 H0.109804 Q0.131373,0.29,0.140196,0.31 T0.149020,0.35 V0.352 Q0.149020,0.37,0.142157,0.388 T0.118627,0.4225 T0.076471,0.452 T0,0.473 Z M0,0.625 V0.513 Q0.029412,0.526,0.032353,0.54 T0.035294,0.568 V0.57 Q0.035294,0.584,0.032353,0.598 T0,0.625 Z" }, "\\u{1FBC4}": { type: 3, data: "M0.019231,1.085 V-0.165 H0.980769 V1.085 H0.019231 Z M0.446154,0.527 H0.553846 Q0.553846,0.511,0.5625,0.495 T0.591346,0.466 T0.631731,0.4405 T0.666346,0.4135 T0.688462,0.3825 T0.696154,0.35 Q0.696154,0.33,0.682692,0.311 T0.641346,0.2785 T0.575,0.259 T0.498077,0.253 T0.421154,0.259 T0.356731,0.279 T0.315385,0.3125 T0.301923,0.352 V0.357 H0.409615 V0.354 Q0.409615,0.345,0.414423,0.335 T0.431731,0.318 T0.4625,0.3075 T0.498077,0.304 Q0.517308,0.304,0.534615,0.307 T0.564423,0.3165 T0.582692,0.332 T0.588462,0.35 Q0.588462,0.366,0.572115,0.3805 T0.535577,0.4075 T0.496154,0.4335 T0.465385,0.4625 T0.45,0.4945 T0.446154,0.527 Z M0.5,0.667 Q0.519231,0.667,0.5375,0.664 T0.569231,0.654 T0.588462,0.637 T0.594231,0.617 T0.588462,0.5975 T0.569231,0.581 T0.5375,0.571 T0.5,0.568 T0.4625,0.571 T0.430769,0.581 T0.411538,0.5975 T0.405769,0.617 T0.411538,0.637 T0.430769,0.654 T0.4625,0.664 T0.5,0.667 Z", scaleType: 1 }, "\\u{1FBC5}": { type: 5, data: { d: "M.44,.425 L.44,.51 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.51 L.56,.425 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC6}": { type: 5, data: { d: "M.44,.425 L.44,.46 L.23,.385 L.19,.43 L.44,.51 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.61,.735 L.7,.71 L.56,.56 L.56,.51 L.81,.43 L.77,.385 L.56,.46 L.56,.425 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC7}": { type: 5, data: { d: "M.44,.425 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.425 Z M.18,.53 L.23,.575 L.81,.43 L.77,.385 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC8}": { type: 5, data: { d: "M.44,.425 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.62,.735 L.71,.71 L.56,.56 L.56,.425 Z M.23,.385 L.18,.43 L.77,.575 L.81,.53 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC9}": { type: 5, data: { d: "M.44,.425 L.45,.495 L.15,.645 L.34,.645 L.34,.7 L.44,.7 L.44,.645 L.56,.645 L.56,.7 L.66,.7 L.66,.645 L.84,.645 L.54,.495 L.56,.425 Z M.39,.6 L.5,.55 L.60,.6 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCA}": { type: 5, data: { d: "M.26,.375 L.5,.255 L.74,.375 L.74,.665 L.5,.55 L.26,.665 Z M.37,.395 L.37,.54 L.5,.475 L.63,.54 L.63,.395 L.5,.33 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCB}": { type: 5, data: { d: "M.09,.41 L.32,.295 L.5,.375 L.68,.295 L.91,.41 L.75,.5 L.91,.59 L.68,.705 L.5,.625 L.32,.705 L.09,.59 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCC}": { type: 5, data: { d: "M.55,.305 L.88,.305 L.88,.355 L.65,.355 L.65,.47 L.88,.47 L.88,.52 L.55,.52 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCD}": { type: 5, data: { d: "M.38,.39 L.5,.33 L.62,.39 L.62,.53 L.5,.47 L.38,.53 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCE}": { type: 3, data: "M0,0 L0.6667,0 L0.6667,1 L0,1 Z" }, "\\u{1FBCF}": { type: 3, data: "M0,0 L0.3333,0 L0.3333,1 L0,1 Z" }, "\\u{1FBD0}": { type: 2, data: "M1,.5 L0,1", strokeWidth: 1 }, "\\u{1FBD1}": { type: 2, data: "M1,0 L0,.5", strokeWidth: 1 }, "\\u{1FBD2}": { type: 2, data: "M0,0 L1,.5", strokeWidth: 1 }, "\\u{1FBD3}": { type: 2, data: "M0,.5 L1,1", strokeWidth: 1 }, "\\u{1FBD4}": { type: 2, data: "M0,0 L.5,1", strokeWidth: 1 }, "\\u{1FBD5}": { type: 2, data: "M.5,0 L1,1", strokeWidth: 1 }, "\\u{1FBD6}": { type: 2, data: "M1,0 L.5,1", strokeWidth: 1 }, "\\u{1FBD7}": { type: 2, data: "M.5,0 L0,1", strokeWidth: 1 }, "\\u{1FBD8}": { type: 2, data: "M0,0 L.5,.5 L1,0", strokeWidth: 1 }, "\\u{1FBD9}": { type: 2, data: "M1,0 L.5,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDA}": { type: 2, data: "M0,1 L.5,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDB}": { type: 2, data: "M0,0 L.5,.5 L0,1", strokeWidth: 1 }, "\\u{1FBDC}": { type: 2, data: "M0,0 L.5,1 L1,0", strokeWidth: 1 }, "\\u{1FBDD}": { type: 2, data: "M1,0 L0,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDE}": { type: 2, data: "M0,1 L.5,0 L1,1", strokeWidth: 1 }, "\\u{1FBDF}": { type: 2, data: "M0,0 L1,.5 L0,1", strokeWidth: 1 }, "\\u{1FBE0}": { type: 5, data: { d: "M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0", type: 1 } }, "\\u{1FBE1}": { type: 5, data: { d: "M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1", type: 1 } }, "\\u{1FBE2}": { type: 5, data: { d: "M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1", type: 1 } }, "\\u{1FBE3}": { type: 5, data: { d: "M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1", type: 1 } }, "\\u{1FBE4}": { type: 0, data: [{ x: 2, y: 0, w: 4, h: 4 }] }, "\\u{1FBE5}": { type: 0, data: [{ x: 2, y: 4, w: 4, h: 4 }] }, "\\u{1FBE6}": { type: 0, data: [{ x: 0, y: 2, w: 4, h: 4 }] }, "\\u{1FBE7}": { type: 0, data: [{ x: 4, y: 2, w: 4, h: 4 }] }, "\\u{1FBE8}": { type: 5, data: { d: "M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0 Z", type: 0 } }, "\\u{1FBE9}": { type: 5, data: { d: "M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1 Z", type: 0 } }, "\\u{1FBEA}": { type: 5, data: { d: "M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1 Z", type: 0 } }, "\\u{1FBEB}": { type: 5, data: { d: "M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1 Z", type: 0 } }, "\\u{1FBEC}": { type: 5, data: { d: "M1,0 L.5,0 C.5,.276,.724,.5,1,.5 Z", type: 0 } }, "\\u{1FBED}": { type: 5, data: { d: "M0,1 L.5,1 C.5,.724,.276,.5,0,.5 Z", type: 0 } }, "\\u{1FBEE}": { type: 5, data: { d: "M1,1 L1,.5 C.724,.5,.5,.724,.5,1 Z", type: 0 } }, "\\u{1FBEF}": { type: 5, data: { d: "M0,0 L0,.5 C.276,.5,.5,.276,.5,0 Z", type: 0 } }, "\\u{1FBF0}": { type: 5, data: { d: a0(126), type: 0 }, scaleType: 1 }, "\\u{1FBF1}": { type: 5, data: { d: a0(48), type: 0 }, scaleType: 1 }, "\\u{1FBF2}": { type: 5, data: { d: a0(109), type: 0 }, scaleType: 1 }, "\\u{1FBF3}": { type: 5, data: { d: a0(121), type: 0 }, scaleType: 1 }, "\\u{1FBF4}": { type: 5, data: { d: a0(51), type: 0 }, scaleType: 1 }, "\\u{1FBF5}": { type: 5, data: { d: a0(91), type: 0 }, scaleType: 1 }, "\\u{1FBF6}": { type: 5, data: { d: a0(95), type: 0 }, scaleType: 1 }, "\\u{1FBF7}": { type: 5, data: { d: a0(114), type: 0 }, scaleType: 1 }, "\\u{1FBF8}": { type: 5, data: { d: a0(127), type: 0 }, scaleType: 1 }, "\\u{1FBF9}": { type: 5, data: { d: a0(123), type: 0 }, scaleType: 1 }, "\\u{1FBFA}": { type: 5, data: { d: "M.5,.175 C.2,.175,.15,.305,.15,.435 L.05,.63 L.35,.63 C.35,.682,.42,.76,.5,.76 C.58,.76,.65,.682,.65,.63 L.95,.63 L.85,.435 C.85,.305,.8,.175,.5,.175 Z", type: 0 }, scaleType: 1 }, ...Object.fromEntries(Array.from({ length: 256 }, (i5, e) => [String.fromCodePoint(10240 + e), { type: 6, data: e }])) };\n  var Ye = /* @__PURE__ */ new Set([9617, 9618, 9619, 129932, 129933, 129934, 129935, 129936, 129937, 129938, 129940, 129948, 129949, 129950, 129951]);\n  function f4(i5) {\n    return { type: 2, data: () => {\n      let e = [], r = [0.375, 0.25, 0.375], n11 = [0, 3 / 8, 5 / 8];\n      for (let a2 = 0; a2 < 3; a2++) {\n        let s4 = i5 >> a2 * 2 & 1, o2 = i5 >> a2 * 2 + 1 & 1;\n        s4 && o2 ? e.push(`M0,${n11[a2]} L1,${n11[a2]} L1,${n11[a2] + r[a2]} L0,${n11[a2] + r[a2]} Z`) : s4 ? e.push(`M0,${n11[a2]} L${0.5},${n11[a2]} L${0.5},${n11[a2] + r[a2]} L0,${n11[a2] + r[a2]} Z`) : o2 && e.push(`M${0.5},${n11[a2]} L1,${n11[a2]} L1,${n11[a2] + r[a2]} L${0.5},${n11[a2] + r[a2]} Z`);\n      }\n      return e.join(" ");\n    } };\n  }\n  function a0(i5) {\n    let e = [];\n    if (i5 & 64) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.2125} L${Q3 + 0.075},${0.175} L${m4 - 0.075},${0.175} L${m4},${0.2125} L${m4 - 0.075},${0.25} L${Q3 + 0.075},${0.25} Z`);\n    }\n    if (i5 & 32) {\n      let u3 = 0.7999999999999999, p3 = 0.95 - 0.15 / 2, C4 = 0.95, Q3 = 0.175 + 0.075 + 0.015, m4 = 0.5 - 0.015;\n      e.push(`M${p3},${Q3} L${C4},${Q3 + 0.0375} L${C4},${m4 - 0.0375} L${p3},${m4} L${u3},${m4 - 0.0375} L${u3},${Q3 + 0.0375} Z`);\n    }\n    if (i5 & 16) {\n      let u3 = 0.7999999999999999, p3 = 0.95 - 0.15 / 2, C4 = 0.95, Q3 = 0.5 + 0.015, m4 = 0.825 - 0.075 - 0.015;\n      e.push(`M${p3},${Q3} L${C4},${Q3 + 0.0375} L${C4},${m4 - 0.0375} L${p3},${m4} L${u3},${m4 - 0.0375} L${u3},${Q3 + 0.0375} Z`);\n    }\n    if (i5 & 8) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.7875} L${Q3 + 0.075},${0.75} L${m4 - 0.075},${0.75} L${m4},${0.7875} L${m4 - 0.075},${0.825} L${Q3 + 0.075},${0.825} Z`);\n    }\n    if (i5 & 4 && e.push(`M${0.125},${0.515} L${0.2},${0.515 + 0.0375} L${0.2},${0.735 - 0.0375} L${0.125},${0.735} L${0.05},${0.735 - 0.0375} L${0.05},${0.515 + 0.0375} Z`), i5 & 2 && e.push(`M${0.125},${0.265} L${0.2},${0.265 + 0.0375} L${0.2},${0.485 - 0.0375} L${0.125},${0.485} L${0.05},${0.485 - 0.0375} L${0.05},${0.265 + 0.0375} Z`), i5 & 1) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.5} L${Q3 + 0.075},${0.4625} L${m4 - 0.075},${0.4625} L${m4},${0.5} L${m4 - 0.075},${0.5375} L${Q3 + 0.075},${0.5375} Z`);\n    }\n    return e.join(" ");\n  }\n  var k3 = 0;\n  var H3 = 0;\n  var o0 = false;\n  var d0 = false;\n  var X0 = false;\n  var K2;\n  var w0 = 0;\n  var Y0 = class {\n    constructor(e, t, r, n11, a2, s4) {\n      this._terminal = e;\n      this._optionService = t;\n      this._selectionRenderModel = r;\n      this._decorationService = n11;\n      this._coreBrowserService = a2;\n      this._themeService = s4;\n      this.result = { fg: 0, bg: 0, ext: 0 };\n    }\n    resolve(e, t, r, n11, a2) {\n      this.result.bg = e.bg, this.result.fg = e.fg, this.result.ext = e.bg & 268435456 ? e.extended.ext : 0, H3 = 0, k3 = 0, d0 = false, o0 = false, X0 = false, K2 = this._themeService.colors, w0 = 0;\n      let s4 = e.getCode();\n      if (s4 !== 0 && e.extended.underlineStyle === 4) {\n        let o2 = Math.max(1, Math.floor(this._optionService.rawOptions.fontSize * this._coreBrowserService.dpr / 15));\n        w0 = t * n11 % (Math.round(o2) * 2);\n      }\n      if (w0 === 0 && Ye.has(s4) && (w0 = t * n11 % 2 * 2 + r * a2 % 2), this._decorationService.forEachDecorationAtCell(t, r, "bottom", (o2) => {\n        o2.backgroundColorRGB && (H3 = o2.backgroundColorRGB.rgba >> 8 & 16777215, d0 = true), o2.foregroundColorRGB && (k3 = o2.foregroundColorRGB.rgba >> 8 & 16777215, o0 = true);\n      }), X0 = this._selectionRenderModel.isCellSelected(this._terminal, t, r), X0) {\n        if (this.result.fg & 67108864 || (this.result.bg & 50331648) !== 0) {\n          if (this.result.fg & 67108864) switch (this.result.fg & 50331648) {\n            case 16777216:\n            case 33554432:\n              H3 = this._themeService.colors.ansi[this.result.fg & 255].rgba;\n              break;\n            case 50331648:\n              H3 = (this.result.fg & 16777215) << 8 | 255;\n              break;\n            case 0:\n            default:\n              H3 = this._themeService.colors.foreground.rgba;\n          }\n          else switch (this.result.bg & 50331648) {\n            case 16777216:\n            case 33554432:\n              H3 = this._themeService.colors.ansi[this.result.bg & 255].rgba;\n              break;\n            case 50331648:\n              H3 = (this.result.bg & 16777215) << 8 | 255;\n              break;\n          }\n          H3 = h0.blend(H3, (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba & 4294967040 | 128) >> 8 & 16777215;\n        } else H3 = (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba >> 8 & 16777215;\n        if (d0 = true, K2.selectionForeground && (k3 = K2.selectionForeground.rgba >> 8 & 16777215, o0 = true), z0(e.getCode())) {\n          if (this.result.fg & 67108864 && (this.result.bg & 50331648) === 0) k3 = (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba >> 8 & 16777215;\n          else {\n            if (this.result.fg & 67108864) switch (this.result.bg & 50331648) {\n              case 16777216:\n              case 33554432:\n                k3 = this._themeService.colors.ansi[this.result.bg & 255].rgba;\n                break;\n              case 50331648:\n                k3 = (this.result.bg & 16777215) << 8 | 255;\n                break;\n            }\n            else switch (this.result.fg & 50331648) {\n              case 16777216:\n              case 33554432:\n                k3 = this._themeService.colors.ansi[this.result.fg & 255].rgba;\n                break;\n              case 50331648:\n                k3 = (this.result.fg & 16777215) << 8 | 255;\n                break;\n              case 0:\n              default:\n                k3 = this._themeService.colors.foreground.rgba;\n            }\n            k3 = h0.blend(k3, (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba & 4294967040 | 128) >> 8 & 16777215;\n          }\n          o0 = true;\n        }\n      }\n      this._decorationService.forEachDecorationAtCell(t, r, "top", (o2) => {\n        o2.backgroundColorRGB && (H3 = o2.backgroundColorRGB.rgba >> 8 & 16777215, d0 = true), o2.foregroundColorRGB && (k3 = o2.foregroundColorRGB.rgba >> 8 & 16777215, o0 = true);\n      }), d0 && (X0 ? H3 = e.bg & -16777216 & -134217729 | H3 | 50331648 : H3 = e.bg & -16777216 | H3 | 50331648), o0 && (k3 = e.fg & -16777216 & -67108865 | k3 | 50331648), this.result.fg & 67108864 && (d0 && !o0 && ((this.result.bg & 50331648) === 0 ? k3 = this.result.fg & -134217728 | K2.background.rgba >> 8 & 16777215 & 16777215 | 50331648 : k3 = this.result.fg & -134217728 | this.result.bg & 67108863, o0 = true), !d0 && o0 && ((this.result.fg & 50331648) === 0 ? H3 = this.result.bg & -67108864 | K2.foreground.rgba >> 8 & 16777215 & 16777215 | 50331648 : H3 = this.result.bg & -67108864 | this.result.fg & 67108863, d0 = true)), K2 = void 0, this.result.bg = d0 ? H3 : this.result.bg, this.result.fg = o0 ? k3 : this.result.fg, this.result.ext &= 536870911, this.result.ext |= w0 << 29 & 3758096384;\n    }\n  };\n  var je2 = 0.5;\n  var q0 = Ue2 || We2 ? "bottom" : "ideographic";\n  function it2(i5, e, t, r, n11, a2, s4, o2, l4, T4, h3, d3 = 0) {\n    let _5 = Xe2[e];\n    if (_5) {\n      let c2 = Array.isArray(_5) ? _5 : [_5];\n      for (let u3 of c2) Zt(i5, u3, t, r, n11, a2, s4, o2, l4, T4, h3, d3);\n      return true;\n    }\n    return false;\n  }\n  function Zt(i5, e, t, r, n11, a2, s4, o2, l4, T4, h3, d3 = 0) {\n    let _5 = n11, c2 = a2, u3 = t, p3 = r;\n    switch (e.scaleType === 1 && (_5 = s4, c2 = o2, u3 = t + (n11 - s4) / 2, p3 = r + (a2 - o2) / 2), e.clipPath && (i5.save(), Xt(i5, e.clipPath, u3, p3, _5, c2)), e.type) {\n      case 0:\n        Ut(i5, e.data, u3, p3, _5, c2);\n        break;\n      case 1:\n        Kt(i5, e.data, u3, p3, _5, c2, d3);\n        break;\n      case 2:\n        zt(i5, e.data, u3, p3, _5, c2, T4, e.strokeWidth);\n        break;\n      case 3:\n        Vt(i5, e.data, u3, p3, _5, c2, T4, e.strokeWidth);\n        break;\n      case 4:\n        Gt(i5, e.data, u3, p3, _5, c2, T4, h3);\n        break;\n      case 5:\n        Yt(i5, e.data, u3, p3, _5, c2, l4, T4);\n        break;\n      case 6:\n        Wt(i5, e.data, u3, p3, _5, c2);\n        break;\n    }\n    e.clipPath && i5.restore();\n  }\n  function Ut(i5, e, t, r, n11, a2) {\n    for (let s4 = 0; s4 < e.length; s4++) {\n      let o2 = e[s4], l4 = n11 / 8, T4 = a2 / 8;\n      i5.fillRect(t + o2.x * l4, r + o2.y * T4, o2.w * l4, o2.h * T4);\n    }\n  }\n  var Je2 = new Uint8Array([1, 0, 1, 2, 1, 4, 5, 0, 5, 2, 5, 4, 1, 6, 5, 6]);\n  function Wt(i5, e, t, r, n11, a2) {\n    let s4 = n11 / 8, o2 = a2 * 0.1, T4 = a2 * 0.8 / 8, h3 = Math.min(s4, T4);\n    for (let d3 = 0; d3 < 8; d3++) if (e & 1 << d3) {\n      let _5 = Je2[d3 * 2], c2 = Je2[d3 * 2 + 1], u3 = t + (_5 + 1) * s4, p3 = r + o2 + (c2 + 1) * T4;\n      i5.beginPath(), i5.arc(u3, p3, h3, 0, Math.PI * 2), i5.fill();\n    }\n  }\n  function Vt(i5, e, t, r, n11, a2, s4, o2) {\n    let l4 = typeof e == "string" ? e : e(0, 0);\n    i5.beginPath();\n    let T4 = 0, h3 = 0, d3 = 0, _5 = 0, c2 = "";\n    for (let u3 of l4.split(" ")) {\n      let p3 = u3[0], C4 = u3.substring(1).split(",");\n      if (p3 === "Z") {\n        i5.closePath(), c2 = p3;\n        continue;\n      }\n      if (p3 === "V") {\n        let m4 = r + parseFloat(C4[0]) * a2;\n        i5.lineTo(T4, m4), h3 = m4, d3 = T4, _5 = h3, c2 = p3;\n        continue;\n      }\n      if (p3 === "H") {\n        let m4 = t + parseFloat(C4[0]) * n11;\n        i5.lineTo(m4, h3), T4 = m4, d3 = T4, _5 = h3, c2 = p3;\n        continue;\n      }\n      if (!C4[0] || !C4[1]) continue;\n      if (p3 === "A") {\n        let m4 = parseFloat(C4[0]) * n11, R4 = parseFloat(C4[1]) * a2, F4 = parseFloat(C4[2]) * Math.PI / 180, b4 = parseInt(C4[3]), A4 = parseInt(C4[4]), X3 = t + parseFloat(C4[5]) * n11, z4 = r + parseFloat(C4[6]) * a2;\n        $t(i5, T4, h3, m4, R4, F4, b4, A4, X3, z4), T4 = X3, h3 = z4;\n        continue;\n      }\n      let Q3 = C4.map((m4, R4) => {\n        let F4 = parseFloat(m4);\n        return R4 % 2 === 0 ? t + F4 * n11 : r + F4 * a2;\n      });\n      if (p3 === "M") i5.moveTo(Q3[0], Q3[1]), T4 = Q3[0], h3 = Q3[1], d3 = T4, _5 = h3;\n      else if (p3 === "L") i5.lineTo(Q3[0], Q3[1]), T4 = Q3[0], h3 = Q3[1], d3 = T4, _5 = h3;\n      else if (p3 === "Q") i5.quadraticCurveTo(Q3[0], Q3[1], Q3[2], Q3[3]), d3 = Q3[0], _5 = Q3[1], T4 = Q3[2], h3 = Q3[3];\n      else if (p3 === "T") {\n        let m4, R4;\n        c2 === "Q" || c2 === "T" ? (m4 = 2 * T4 - d3, R4 = 2 * h3 - _5) : (m4 = T4, R4 = h3), i5.quadraticCurveTo(m4, R4, Q3[0], Q3[1]), d3 = m4, _5 = R4, T4 = Q3[0], h3 = Q3[1];\n      } else p3 === "C" && (i5.bezierCurveTo(Q3[0], Q3[1], Q3[2], Q3[3], Q3[4], Q3[5]), d3 = Q3[2], _5 = Q3[3], T4 = Q3[4], h3 = Q3[5]);\n      c2 = p3;\n    }\n    o2 !== void 0 ? (i5.strokeStyle = i5.fillStyle, i5.lineWidth = s4 * o2, i5.stroke()) : i5.fill();\n  }\n  function $t(i5, e, t, r, n11, a2, s4, o2, l4, T4) {\n    if (r === 0 || n11 === 0) {\n      i5.lineTo(l4, T4);\n      return;\n    }\n    r = Math.abs(r), n11 = Math.abs(n11);\n    let h3 = Math.cos(a2), d3 = Math.sin(a2), _5 = (e - l4) / 2, c2 = (t - T4) / 2, u3 = h3 * _5 + d3 * c2, p3 = -d3 * _5 + h3 * c2, C4 = r * r, Q3 = n11 * n11, m4 = u3 * u3, R4 = p3 * p3, F4 = m4 / C4 + R4 / Q3;\n    if (F4 > 1) {\n      let I4 = Math.sqrt(F4);\n      r *= I4, n11 *= I4, C4 = r * r, Q3 = n11 * n11;\n    }\n    let b4 = (C4 * Q3 - C4 * R4 - Q3 * m4) / (C4 * R4 + Q3 * m4);\n    b4 < 0 && (b4 = 0);\n    let A4 = (s4 === o2 ? -1 : 1) * Math.sqrt(b4), X3 = A4 * (r * p3 / n11), z4 = A4 * -(n11 * u3 / r), x0 = h3 * X3 - d3 * z4 + (e + l4) / 2, e0 = d3 * X3 + h3 * z4 + (t + T4) / 2, T0 = (u3 - X3) / r, M4 = (p3 - z4) / n11, l0 = (-u3 - X3) / r, t0 = (-p3 - z4) / n11, Y2 = Math.atan2(M4, T0), n0 = Math.atan2(t0, l0) - Y2;\n    o2 === 0 && n0 > 0 ? n0 -= 2 * Math.PI : o2 === 1 && n0 < 0 && (n0 += 2 * Math.PI);\n    let D0 = Y2 + n0;\n    i5.ellipse(x0, e0, r, n11, a2, Y2, D0, o2 === 0);\n  }\n  function Gt(i5, e, t, r, n11, a2, s4, o2) {\n    i5.save(), i5.fillRect(t, r, n11, a2), o2 && (i5.fillStyle = o2, i5.strokeStyle = o2), i5.lineWidth = s4, i5.lineCap = "square", i5.beginPath();\n    for (let l4 of e.d.split(" ")) {\n      let T4 = l4[0], h3 = l4.substring(1).split(",");\n      if (!h3[0] || !h3[1]) {\n        T4 === "Z" && i5.closePath();\n        continue;\n      }\n      let d3 = h3.map((_5, c2) => {\n        let u3 = parseFloat(_5);\n        return c2 % 2 === 0 ? t + u3 * n11 : r + u3 * a2;\n      });\n      T4 === "M" ? i5.moveTo(d3[0], d3[1]) : T4 === "L" && i5.lineTo(d3[0], d3[1]);\n    }\n    e.type === 1 ? i5.stroke() : i5.fill(), i5.restore();\n  }\n  var et = /* @__PURE__ */ new Map();\n  function Kt(i5, e, t, r, n11, a2, s4 = 0) {\n    let o2 = et.get(e);\n    o2 || (o2 = /* @__PURE__ */ new Map(), et.set(e, o2));\n    let l4 = i5.fillStyle;\n    if (typeof l4 != "string") throw new Error(`Unexpected fillStyle type "${l4}"`);\n    let T4 = o2.get(l4);\n    if (!T4) {\n      let _5 = e[0].length, c2 = e.length, u3 = i5.canvas.ownerDocument.createElement("canvas");\n      u3.width = _5, u3.height = c2;\n      let p3 = y3(u3.getContext("2d")), C4 = new ImageData(_5, c2), Q3, m4, R4, F4;\n      if (l4.startsWith("#")) Q3 = parseInt(l4.slice(1, 3), 16), m4 = parseInt(l4.slice(3, 5), 16), R4 = parseInt(l4.slice(5, 7), 16), F4 = l4.length > 7 && parseInt(l4.slice(7, 9), 16) || 1;\n      else if (l4.startsWith("rgba")) [Q3, m4, R4, F4] = l4.substring(5, l4.length - 1).split(",").map((b4) => parseFloat(b4));\n      else throw new Error(`Unexpected fillStyle color format "${l4}" when drawing pattern glyph`);\n      for (let b4 = 0; b4 < c2; b4++) for (let A4 = 0; A4 < _5; A4++) C4.data[(b4 * _5 + A4) * 4] = Q3, C4.data[(b4 * _5 + A4) * 4 + 1] = m4, C4.data[(b4 * _5 + A4) * 4 + 2] = R4, C4.data[(b4 * _5 + A4) * 4 + 3] = e[b4][A4] * (F4 * 255);\n      p3.putImageData(C4, 0, 0), T4 = y3(i5.createPattern(u3, null)), o2.set(l4, T4);\n    }\n    let h3 = s4 >> 1 & 1, d3 = s4 & 1;\n    h3 !== 0 || d3 !== 0 ? T4.setTransform(new DOMMatrix().translateSelf(-h3, -d3)) : T4.setTransform(new DOMMatrix()), i5.fillStyle = T4, i5.fillRect(t, r, n11, a2);\n  }\n  function zt(i5, e, t, r, n11, a2, s4, o2) {\n    i5.save(), i5.beginPath(), i5.rect(t, r, n11, a2), i5.clip(), i5.beginPath();\n    let l4;\n    if (typeof e == "function") {\n      let d3 = 0.15 / a2 * n11;\n      l4 = e(0.15, d3);\n    } else l4 = e;\n    let T4 = { currentX: 0, currentY: 0, lastControlX: 0, lastControlY: 0, lastCommand: "" };\n    for (let h3 of l4.split(" ")) {\n      let d3 = h3[0];\n      if (d3 === "Z") {\n        i5.closePath(), T4.lastCommand = d3;\n        continue;\n      }\n      let _5 = rt2[d3];\n      if (!_5) {\n        console.error(`Could not find drawing instructions for "${d3}"`);\n        continue;\n      }\n      let c2 = h3.substring(1).split(",");\n      !c2[0] || !c2[1] || (_5(i5, st2(c2, n11, a2, t, r, true, s4, 0, 0, false), T4), T4.lastCommand = d3);\n    }\n    o2 !== void 0 ? (i5.strokeStyle = i5.fillStyle, i5.lineWidth = s4 * o2, i5.stroke()) : i5.fill(), i5.closePath(), i5.restore();\n  }\n  function Xt(i5, e, t, r, n11, a2) {\n    i5.beginPath();\n    for (let s4 of e.split(" ")) {\n      let o2 = s4[0];\n      if (o2 === "Z") {\n        i5.closePath();\n        continue;\n      }\n      let l4 = s4.substring(1).split(",");\n      if (!l4[0] || !l4[1]) continue;\n      let T4 = t + parseFloat(l4[0]) * n11, h3 = r + parseFloat(l4[1]) * a2;\n      o2 === "M" ? i5.moveTo(T4, h3) : o2 === "L" && i5.lineTo(T4, h3);\n    }\n    i5.clip();\n  }\n  function Yt(i5, e, t, r, n11, a2, s4, o2) {\n    let l4 = new Path2D();\n    l4.rect(t, r, n11, a2), i5.clip(l4), i5.beginPath();\n    let T4 = s4 / 12;\n    i5.lineWidth = o2 * T4;\n    let h3 = { currentX: 0, currentY: 0, lastControlX: 0, lastControlY: 0, lastCommand: "" };\n    for (let d3 of e.d.split(" ")) {\n      let _5 = d3[0];\n      if (_5 === "Z") {\n        i5.closePath(), h3.lastCommand = _5;\n        continue;\n      }\n      let c2 = rt2[_5];\n      if (!c2) {\n        console.error(`Could not find drawing instructions for "${_5}"`);\n        continue;\n      }\n      let u3 = d3.substring(1).split(",");\n      !u3[0] || !u3[1] || (c2(i5, st2(u3, n11, a2, t, r, false, o2, (e.leftPadding ?? 0) * (T4 / 2), (e.rightPadding ?? 0) * (T4 / 2)), h3), h3.lastCommand = _5);\n    }\n    e.type === 1 ? (i5.strokeStyle = i5.fillStyle, i5.stroke()) : i5.fill(), i5.closePath();\n  }\n  function tt(i5, e, t = 0) {\n    return Math.max(Math.min(i5, e), t);\n  }\n  var rt2 = { C: (i5, e, t) => {\n    i5.bezierCurveTo(e[0], e[1], e[2], e[3], e[4], e[5]), t.lastControlX = e[2], t.lastControlY = e[3], t.currentX = e[4], t.currentY = e[5];\n  }, L: (i5, e, t) => {\n    i5.lineTo(e[0], e[1]), t.lastControlX = t.currentX = e[0], t.lastControlY = t.currentY = e[1];\n  }, M: (i5, e, t) => {\n    i5.moveTo(e[0], e[1]), t.lastControlX = t.currentX = e[0], t.lastControlY = t.currentY = e[1];\n  }, Q: (i5, e, t) => {\n    i5.quadraticCurveTo(e[0], e[1], e[2], e[3]), t.lastControlX = e[0], t.lastControlY = e[1], t.currentX = e[2], t.currentY = e[3];\n  }, T: (i5, e, t) => {\n    let r, n11;\n    t.lastCommand === "Q" || t.lastCommand === "T" ? (r = 2 * t.currentX - t.lastControlX, n11 = 2 * t.currentY - t.lastControlY) : (r = t.currentX, n11 = t.currentY), i5.quadraticCurveTo(r, n11, e[0], e[1]), t.lastControlX = r, t.lastControlY = n11, t.currentX = e[0], t.currentY = e[1];\n  } };\n  function st2(i5, e, t, r, n11, a2, s4, o2 = 0, l4 = 0, T4 = true) {\n    let h3 = i5.map((d3) => parseFloat(d3) || parseInt(d3));\n    if (h3.length < 2) throw new Error("Too few arguments for instruction");\n    for (let d3 = 0; d3 < h3.length; d3 += 2) {\n      if (h3[d3] *= e - o2 * s4 - l4 * s4, a2 && h3[d3] !== 0) {\n        let _5 = Math.round(h3[d3] + 0.5) - 0.5;\n        h3[d3] = T4 ? tt(_5, e, 0) : _5;\n      }\n      h3[d3] += r + o2 * s4;\n    }\n    for (let d3 = 1; d3 < h3.length; d3 += 2) {\n      if (h3[d3] *= t, a2 && h3[d3] !== 0) {\n        let _5 = Math.round(h3[d3] + 0.5) - 0.5;\n        h3[d3] = T4 ? tt(_5, t, 0) : _5;\n      }\n      h3[d3] += n11;\n    }\n    return h3;\n  }\n  var j0 = class {\n    constructor() {\n      this._data = {};\n    }\n    set(e, t, r) {\n      this._data[e] || (this._data[e] = {}), this._data[e][t] = r;\n    }\n    get(e, t) {\n      return this._data[e] ? this._data[e][t] : void 0;\n    }\n    clear() {\n      this._data = {};\n    }\n  };\n  var k0 = class {\n    constructor() {\n      this._data = new j0();\n    }\n    set(e, t, r, n11, a2) {\n      this._data.get(e, t) || this._data.set(e, t, new j0()), this._data.get(e, t).set(r, n11, a2);\n    }\n    get(e, t, r, n11) {\n      return this._data.get(e, t)?.get(r, n11);\n    }\n    clear() {\n      this._data.clear();\n    }\n  };\n  var J0 = class {\n    constructor(e) {\n      this._tasks = [];\n      this._i = 0;\n      this._logService = e;\n    }\n    enqueue(e) {\n      this._tasks.push(e), this._start();\n    }\n    flush() {\n      for (; this._i < this._tasks.length; ) this._tasks[this._i]() || this._i++;\n      this.clear();\n    }\n    clear() {\n      this._idleCallback && (this._cancelCallback(this._idleCallback), this._idleCallback = void 0), this._i = 0, this._tasks.length = 0;\n    }\n    _start() {\n      this._idleCallback || (this._idleCallback = this._requestCallback(this._process.bind(this)));\n    }\n    _process(e) {\n      this._idleCallback = void 0;\n      let t = 0, r = 0, n11 = e.timeRemaining(), a2 = 0;\n      for (; this._i < this._tasks.length; ) {\n        if (t = performance.now(), this._tasks[this._i]() || this._i++, t = Math.max(1, performance.now() - t), r = Math.max(t, r), a2 = e.timeRemaining(), r * 1.5 > a2) {\n          n11 - t < -20 && this._logService.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(n11 - t))}ms`), this._start();\n          return;\n        }\n        n11 = a2;\n      }\n      this.clear();\n    }\n  };\n  var be2 = class extends J0 {\n    _requestCallback(e) {\n      return setTimeout(() => e(this._createDeadline(16)));\n    }\n    _cancelCallback(e) {\n      clearTimeout(e);\n    }\n    _createDeadline(e) {\n      let t = performance.now() + e;\n      return { timeRemaining: () => Math.max(0, t - performance.now()) };\n    }\n  };\n  var ve = class extends J0 {\n    _requestCallback(e) {\n      return requestIdleCallback(e);\n    }\n    _cancelCallback(e) {\n      cancelIdleCallback(e);\n    }\n  };\n  var nt2 = "requestIdleCallback" in globalThis ? ve : be2;\n  var s0 = class i {\n    constructor() {\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Z0();\n    }\n    static toColorRGB(e) {\n      return [e >>> 16 & 255, e >>> 8 & 255, e & 255];\n    }\n    static fromColorRGB(e) {\n      return (e[0] & 255) << 16 | (e[1] & 255) << 8 | e[2] & 255;\n    }\n    clone() {\n      let e = new i();\n      return e.fg = this.fg, e.bg = this.bg, e.extended = this.extended.clone(), e;\n    }\n    isInverse() {\n      return this.fg & 67108864;\n    }\n    isBold() {\n      return this.fg & 134217728;\n    }\n    isUnderline() {\n      return this.hasExtendedAttrs() && this.extended.underlineStyle !== 0 ? 1 : this.fg & 268435456;\n    }\n    isBlink() {\n      return this.fg & 536870912;\n    }\n    isInvisible() {\n      return this.fg & 1073741824;\n    }\n    isItalic() {\n      return this.bg & 67108864;\n    }\n    isDim() {\n      return this.bg & 134217728;\n    }\n    isStrikethrough() {\n      return this.fg & 2147483648;\n    }\n    isProtected() {\n      return this.bg & 536870912;\n    }\n    isOverline() {\n      return this.bg & 1073741824;\n    }\n    getFgColorMode() {\n      return this.fg & 50331648;\n    }\n    getBgColorMode() {\n      return this.bg & 50331648;\n    }\n    isFgRGB() {\n      return (this.fg & 50331648) === 50331648;\n    }\n    isBgRGB() {\n      return (this.bg & 50331648) === 50331648;\n    }\n    isFgPalette() {\n      return (this.fg & 50331648) === 16777216 || (this.fg & 50331648) === 33554432;\n    }\n    isBgPalette() {\n      return (this.bg & 50331648) === 16777216 || (this.bg & 50331648) === 33554432;\n    }\n    isFgDefault() {\n      return (this.fg & 50331648) === 0;\n    }\n    isBgDefault() {\n      return (this.bg & 50331648) === 0;\n    }\n    isAttributeDefault() {\n      return this.fg === 0 && this.bg === 0;\n    }\n    getFgColor() {\n      switch (this.fg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.fg & 255;\n        case 50331648:\n          return this.fg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    getBgColor() {\n      switch (this.bg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.bg & 255;\n        case 50331648:\n          return this.bg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    hasExtendedAttrs() {\n      return this.bg & 268435456;\n    }\n    updateExtended() {\n      this.extended.isEmpty() ? this.bg &= -268435457 : this.bg |= 268435456;\n    }\n    getUnderlineColor() {\n      if (this.bg & 268435456 && ~this.extended.underlineColor) switch (this.extended.underlineColor & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.extended.underlineColor & 255;\n        case 50331648:\n          return this.extended.underlineColor & 16777215;\n        default:\n          return this.getFgColor();\n      }\n      return this.getFgColor();\n    }\n    getUnderlineColorMode() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? this.extended.underlineColor & 50331648 : this.getFgColorMode();\n    }\n    isUnderlineColorRGB() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 50331648 : this.isFgRGB();\n    }\n    isUnderlineColorPalette() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 16777216 || (this.extended.underlineColor & 50331648) === 33554432 : this.isFgPalette();\n    }\n    isUnderlineColorDefault() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 0 : this.isFgDefault();\n    }\n    getUnderlineStyle() {\n      return this.fg & 268435456 ? this.bg & 268435456 ? this.extended.underlineStyle : 1 : 0;\n    }\n    getUnderlineVariantOffset() {\n      return this.extended.underlineVariantOffset;\n    }\n  };\n  var Z0 = class i2 {\n    constructor(e = 0, t = 0) {\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = e, this._urlId = t;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(e) {\n      this._ext = e;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(e) {\n      this._ext &= -469762049, this._ext |= e << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(e) {\n      this._ext &= -67108864, this._ext |= e & 67108863;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(e) {\n      this._urlId = e;\n    }\n    get underlineVariantOffset() {\n      let e = (this._ext & 3758096384) >> 29;\n      return e < 0 ? e ^ 4294967288 : e;\n    }\n    set underlineVariantOffset(e) {\n      this._ext &= 536870911, this._ext |= e << 29 & 3758096384;\n    }\n    clone() {\n      return new i2(this._ext, this._urlId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0;\n    }\n  };\n  var U4 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (e, t, r) => {\n        if (this._disposed) return g4(() => {\n        });\n        let n11 = { fn: e, thisArgs: t };\n        this._listeners.push(n11);\n        let a2 = g4(() => {\n          let s4 = this._listeners.indexOf(n11);\n          s4 !== -1 && this._listeners.splice(s4, 1);\n        });\n        return r && (Array.isArray(r) ? r.push(a2) : r.add(a2)), a2;\n      }, this._event);\n    }\n    fire(e) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: t, thisArgs: r } = this._listeners[0];\n          t.call(r, e);\n          return;\n        }\n        default: {\n          let t = this._listeners.slice();\n          for (let { fn: r, thisArgs: n11 } of t) r.call(n11, e);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var _0;\n  ((n11) => {\n    function i5(a2, s4) {\n      return a2((o2) => s4.fire(o2));\n    }\n    n11.forward = i5;\n    function e(a2, s4) {\n      return (o2, l4, T4) => a2((h3) => o2.call(l4, s4(h3)), void 0, T4);\n    }\n    n11.map = e;\n    function t(...a2) {\n      return (s4, o2, l4) => {\n        let T4 = new B0();\n        for (let h3 of a2) T4.add(h3((d3) => s4.call(o2, d3)));\n        return l4 && (Array.isArray(l4) ? l4.push(T4) : l4.add(T4)), T4;\n      };\n    }\n    n11.any = t;\n    function r(a2, s4, o2) {\n      return s4(o2), a2((l4) => s4(l4));\n    }\n    n11.runAndSubscribe = r;\n  })(_0 ||= {});\n  var at2 = { texturePage: 0, texturePosition: { x: 0, y: 0 }, texturePositionClipSpace: { x: 0, y: 0 }, offset: { x: 0, y: 0 }, size: { x: 0, y: 0 }, sizeClipSpace: { x: 0, y: 0 } };\n  var U0 = 2;\n  var W0;\n  var j3 = class i3 {\n    constructor(e, t, r, n11) {\n      this._document = e;\n      this._config = t;\n      this._unicodeService = r;\n      this._logService = n11;\n      this._didWarmUp = false;\n      this._cacheMap = new k0();\n      this._cacheMapCombined = new k0();\n      this._pages = [];\n      this._activePages = [];\n      this._workBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 };\n      this._workAttributeData = new s0();\n      this._textureSize = 512;\n      this._onAddTextureAtlasCanvas = new U4();\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = new U4();\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._requestClearModel = false;\n      this._createNewPage(), this._tmpCanvas = ot2(e, this._config.deviceCellWidth * 4 + U0 * 2, this._config.deviceCellHeight + U0 * 2), this._tmpCtx = y3(this._tmpCanvas.getContext("2d", { alpha: this._config.allowTransparency, willReadFrequently: true }));\n    }\n    get pages() {\n      return this._pages;\n    }\n    dispose() {\n      this._tmpCanvas.remove();\n      for (let e of this.pages) e.canvas.remove();\n      this._onAddTextureAtlasCanvas.dispose();\n    }\n    warmUp() {\n      this._didWarmUp || (this._doWarmUp(), this._didWarmUp = true);\n    }\n    _doWarmUp() {\n      let e = new nt2(this._logService);\n      for (let t = 33; t < 126; t++) e.enqueue(() => {\n        if (!this._cacheMap.get(t, 0, 0, 0)) {\n          let r = this._drawToCache(t, 0, 0, 0, false, void 0);\n          this._cacheMap.set(t, 0, 0, 0, r);\n        }\n      });\n    }\n    beginFrame() {\n      return this._requestClearModel;\n    }\n    clearTexture() {\n      if (!(this._pages[0].currentRow.x === 0 && this._pages[0].currentRow.y === 0)) {\n        for (let e of this._pages) e.clear();\n        this._cacheMap.clear(), this._cacheMapCombined.clear(), this._didWarmUp = false;\n      }\n    }\n    _createNewPage() {\n      if (i3.maxAtlasPages && this._pages.length >= Math.max(4, i3.maxAtlasPages)) {\n        let t = this._pages.filter((T4) => T4.canvas.width * 2 <= (i3.maxTextureSize || 4096)).sort((T4, h3) => h3.canvas.width !== T4.canvas.width ? h3.canvas.width - T4.canvas.width : h3.percentageUsed - T4.percentageUsed), r = -1, n11 = 0;\n        for (let T4 = 0; T4 < t.length; T4++) if (t[T4].canvas.width !== n11) r = T4, n11 = t[T4].canvas.width;\n        else if (T4 - r === 3) break;\n        let a2 = t.slice(r, r + 4);\n        if (a2.length < 4 || a2.some((T4) => T4.canvas.width !== a2[0].canvas.width)) {\n          let T4 = new M0(this._document, this._textureSize);\n          return this._pages.push(T4), this._activePages.push(T4), this._onAddTextureAtlasCanvas.fire(T4.canvas), T4;\n        }\n        let s4 = a2.map((T4) => T4.glyphs[0].texturePage).sort((T4, h3) => T4 > h3 ? 1 : -1), o2 = this.pages.length - a2.length, l4 = this._mergePages(a2, o2);\n        l4.version++;\n        for (let T4 = s4.length - 1; T4 >= 0; T4--) this._deletePage(s4[T4]);\n        this.pages.push(l4), this._requestClearModel = true, this._onAddTextureAtlasCanvas.fire(l4.canvas);\n      }\n      let e = new M0(this._document, this._textureSize);\n      return this._pages.push(e), this._activePages.push(e), this._onAddTextureAtlasCanvas.fire(e.canvas), e;\n    }\n    _mergePages(e, t) {\n      let r = e[0].canvas.width * 2, n11 = new M0(this._document, r, e);\n      for (let [a2, s4] of e.entries()) {\n        let o2 = a2 * s4.canvas.width % r, l4 = Math.floor(a2 / 2) * s4.canvas.height;\n        n11.ctx.drawImage(s4.canvas, o2, l4);\n        for (let h3 of s4.glyphs) h3.texturePage = t, h3.sizeClipSpace.x = h3.size.x / r, h3.sizeClipSpace.y = h3.size.y / r, h3.texturePosition.x += o2, h3.texturePosition.y += l4, h3.texturePositionClipSpace.x = h3.texturePosition.x / r, h3.texturePositionClipSpace.y = h3.texturePosition.y / r;\n        this._onRemoveTextureAtlasCanvas.fire(s4.canvas);\n        let T4 = this._activePages.indexOf(s4);\n        T4 !== -1 && this._activePages.splice(T4, 1);\n      }\n      return n11;\n    }\n    _deletePage(e) {\n      this._pages.splice(e, 1);\n      for (let t = e; t < this._pages.length; t++) {\n        let r = this._pages[t];\n        for (let n11 of r.glyphs) n11.texturePage--;\n        r.version++;\n      }\n    }\n    getRasterizedGlyphCombinedChar(e, t, r, n11, a2, s4) {\n      return this._getFromCacheMap(this._cacheMapCombined, e, t, r, n11, a2, s4);\n    }\n    getRasterizedGlyph(e, t, r, n11, a2, s4) {\n      return this._getFromCacheMap(this._cacheMap, e, t, r, n11, a2, s4);\n    }\n    _getFromCacheMap(e, t, r, n11, a2, s4, o2) {\n      return W0 = e.get(t, r, n11, a2), W0 || (W0 = this._drawToCache(t, r, n11, a2, s4, o2), e.set(t, r, n11, a2, W0)), W0;\n    }\n    _getColorFromAnsiIndex(e) {\n      if (e >= this._config.colors.ansi.length) throw new Error("No color found for idx " + e);\n      return this._config.colors.ansi[e];\n    }\n    _getBackgroundColor(e, t, r, n11) {\n      if (this._config.allowTransparency) return G3;\n      let a2;\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          a2 = this._getColorFromAnsiIndex(t);\n          break;\n        case 50331648:\n          let s4 = s0.toColorRGB(t);\n          a2 = Z3.toColor(s4[0], s4[1], s4[2]);\n          break;\n        case 0:\n        default:\n          r ? a2 = I0.opaque(this._config.colors.foreground) : a2 = this._config.colors.background;\n          break;\n      }\n      return this._config.allowTransparency || (a2 = I0.opaque(a2)), a2;\n    }\n    _getForegroundColor(e, t, r, n11, a2, s4, o2, l4, T4, h3) {\n      let d3 = this._getMinimumContrastColor(e, t, r, n11, a2, s4, o2, T4, l4, h3);\n      if (d3) return d3;\n      let _5;\n      switch (a2) {\n        case 16777216:\n        case 33554432:\n          this._config.drawBoldTextInBrightColors && T4 && s4 < 8 && (s4 += 8), _5 = this._getColorFromAnsiIndex(s4);\n          break;\n        case 50331648:\n          let c2 = s0.toColorRGB(s4);\n          _5 = Z3.toColor(c2[0], c2[1], c2[2]);\n          break;\n        case 0:\n        default:\n          o2 ? _5 = this._config.colors.background : _5 = this._config.colors.foreground;\n      }\n      return this._config.allowTransparency && (_5 = I0.opaque(_5)), l4 && (_5 = I0.multiplyOpacity(_5, je2)), _5;\n    }\n    _resolveBackgroundRgba(e, t, r) {\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          return this._getColorFromAnsiIndex(t).rgba;\n        case 50331648:\n          return t << 8;\n        case 0:\n        default:\n          return r ? this._config.colors.foreground.rgba : this._config.colors.background.rgba;\n      }\n    }\n    _resolveForegroundRgba(e, t, r, n11) {\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          return this._config.drawBoldTextInBrightColors && n11 && t < 8 && (t += 8), this._getColorFromAnsiIndex(t).rgba;\n        case 50331648:\n          return t << 8;\n        case 0:\n        default:\n          return r ? this._config.colors.background.rgba : this._config.colors.foreground.rgba;\n      }\n    }\n    _getMinimumContrastColor(e, t, r, n11, a2, s4, o2, l4, T4, h3) {\n      if (this._config.minimumContrastRatio === 1 || h3) return;\n      let d3 = this._getContrastCache(T4), _5 = d3.getColor(e, n11);\n      if (_5 !== void 0) return _5 ?? void 0;\n      let c2 = this._resolveBackgroundRgba(t, r, o2), u3 = this._resolveForegroundRgba(a2, s4, o2, l4), p3 = h0.ensureContrastRatio(c2, u3, this._config.minimumContrastRatio / (T4 ? 2 : 1));\n      if (!p3) {\n        d3.setColor(e, n11, null);\n        return;\n      }\n      let C4 = Z3.toColor(p3 >> 24 & 255, p3 >> 16 & 255, p3 >> 8 & 255);\n      return d3.setColor(e, n11, C4), C4;\n    }\n    _getContrastCache(e) {\n      return e ? this._config.colors.halfContrastCache : this._config.colors.contrastCache;\n    }\n    _drawToCache(e, t, r, n11, a2, s4) {\n      let o2 = typeof e == "number" ? String.fromCharCode(e) : e;\n      s4 && this._tmpCanvas.parentElement !== s4 && (this._tmpCanvas.style.display = "none", s4.append(this._tmpCanvas));\n      let l4 = Math.min(this._config.deviceCellWidth * Math.max(o2.length, 2) + U0 * 2, this._config.deviceMaxTextureSize);\n      this._tmpCanvas.width < l4 && (this._tmpCanvas.width = l4);\n      let T4 = Math.min(this._config.deviceCellHeight + U0 * 4, this._textureSize);\n      if (this._tmpCanvas.height < T4 && (this._tmpCanvas.height = T4), this._tmpCtx.save(), this._workAttributeData.fg = r, this._workAttributeData.bg = t, this._workAttributeData.extended.ext = n11, !!this._workAttributeData.isInvisible()) return at2;\n      let d3 = !!this._workAttributeData.isBold(), _5 = !!this._workAttributeData.isInverse(), c2 = !!this._workAttributeData.isDim(), u3 = !!this._workAttributeData.isItalic(), p3 = !!this._workAttributeData.isUnderline(), C4 = !!this._workAttributeData.isStrikethrough(), Q3 = !!this._workAttributeData.isOverline(), m4 = this._workAttributeData.getFgColor(), R4 = this._workAttributeData.getFgColorMode(), F4 = this._workAttributeData.getBgColor(), b4 = this._workAttributeData.getBgColorMode();\n      if (_5) {\n        let E5 = m4;\n        m4 = F4, F4 = E5;\n        let N3 = R4;\n        R4 = b4, b4 = N3;\n      }\n      let A4 = this._getBackgroundColor(b4, F4, _5, c2);\n      this._tmpCtx.globalCompositeOperation = "copy", this._tmpCtx.fillStyle = A4.css, this._tmpCtx.fillRect(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), this._tmpCtx.globalCompositeOperation = "source-over";\n      let X3 = d3 ? this._config.fontWeightBold : this._config.fontWeight, z4 = u3 ? "italic" : "";\n      this._tmpCtx.font = `${z4} ${X3} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`, this._tmpCtx.textBaseline = q0;\n      let x0 = o2.length === 1 && K0(o2.charCodeAt(0)), e0 = o2.length === 1 && $e(o2.charCodeAt(0)), T0 = this._getForegroundColor(t, b4, F4, r, R4, m4, _5, c2, d3, z0(o2.charCodeAt(0)));\n      this._tmpCtx.fillStyle = T0.css;\n      let M4 = e0 ? 0 : U0 * 2, l0 = false;\n      if (this._config.customGlyphs !== false) {\n        let E5 = this._workAttributeData.getUnderlineVariantOffset();\n        l0 = it2(this._tmpCtx, o2, M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, A4.css, E5);\n      }\n      let t0 = !x0, Y2;\n      if (typeof e == "number" ? Y2 = this._unicodeService.wcwidth(e) : Y2 = this._unicodeService.getStringCellWidth(e), p3) {\n        this._tmpCtx.save();\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 15)), N3 = E5 % 2 === 1 ? 0.5 : 0;\n        if (this._tmpCtx.lineWidth = E5, this._workAttributeData.isUnderlineColorDefault()) this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle;\n        else if (this._workAttributeData.isUnderlineColorRGB()) t0 = false, this._tmpCtx.strokeStyle = `rgb(${s0.toColorRGB(this._workAttributeData.getUnderlineColor()).join(",")})`;\n        else {\n          t0 = false;\n          let r0 = this._workAttributeData.getUnderlineColor();\n          this._config.drawBoldTextInBrightColors && this._workAttributeData.isBold() && r0 < 8 && (r0 += 8), this._tmpCtx.strokeStyle = this._getColorFromAnsiIndex(r0).css;\n        }\n        this._tmpCtx.fillStyle = this._tmpCtx.strokeStyle, this._tmpCtx.beginPath();\n        let i0 = M4, $4 = Math.ceil(M4 + this._config.deviceCharHeight) - N3 - (a2 ? E5 * 2 : 0), pe2 = $4 + E5 * 2, f0 = this._workAttributeData.getUnderlineVariantOffset(), p0 = 0, v0 = 0;\n        for (let r0 = 0; r0 < Y2; r0++) {\n          let N0 = false;\n          this._tmpCtx.save(), p0 = $4, v0 = pe2;\n          let q3 = i0 + r0 * this._config.deviceCellWidth, Q0 = i0 + (r0 + 1) * this._config.deviceCellWidth;\n          switch (this._workAttributeData.extended.underlineStyle) {\n            case 2:\n              this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4), this._tmpCtx.moveTo(q3, pe2), this._tmpCtx.lineTo(Q0, pe2);\n              break;\n            case 3:\n              p0 = this._config.deviceCharHeight + 1, v0 = p0 + 3 * this._config.devicePixelRatio;\n              let Ne4 = new Path2D();\n              Ne4.rect(q3, p0, this._config.deviceCellWidth, v0 - p0), this._tmpCtx.clip(Ne4);\n              let vt3 = this._config.deviceCellWidth, Ot2 = v0 - p0, It3 = vt3 / 6, Ft = Ot2 / 3, Mt2 = [[0, 2, 1, 3, 2.4, 3, 0, 0.6], [5.5, 0, 2.5, 3, 1.1, 3, 4.1, 0], [4, 0, 6, 2, 6, 0.6, 5.4, 0]];\n              for (let Ce3 of Mt2) {\n                this._tmpCtx.beginPath();\n                for (let P0 = 0; P0 < Ce3.length; P0 += 2) {\n                  let we3 = q3 + Ce3[P0] * It3, He3 = v0 - Ce3[P0 + 1] * Ft;\n                  P0 === 0 ? this._tmpCtx.moveTo(we3, He3) : this._tmpCtx.lineTo(we3, He3);\n                }\n                this._tmpCtx.closePath(), this._tmpCtx.fill();\n              }\n              N0 = true;\n              break;\n            case 4:\n              let $0 = f0 === 0 ? 0 : f0 >= E5 ? E5 * 2 - f0 : E5 - f0;\n              !(f0 >= E5) === false || $0 === 0 ? (this._tmpCtx.setLineDash([Math.round(E5), Math.round(E5)]), this._tmpCtx.moveTo(q3 + $0, $4), this._tmpCtx.lineTo(Q0, $4)) : (this._tmpCtx.setLineDash([Math.round(E5), Math.round(E5)]), this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(q3 + $0, $4), this._tmpCtx.moveTo(q3 + $0 + E5, $4), this._tmpCtx.lineTo(Q0, $4)), f0 = ze2(Q0 - q3, E5, f0);\n              break;\n            case 5:\n              let At3 = 0.6, gt3 = 0.3, Qe3 = Q0 - q3, Pe3 = Math.floor(At3 * Qe3), Be3 = Math.floor(gt3 * Qe3), yt4 = Qe3 - Pe3 - Be3;\n              this._tmpCtx.setLineDash([Pe3, Be3, yt4]), this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4);\n              break;\n            case 1:\n            default:\n              this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4);\n              break;\n          }\n          N0 || this._tmpCtx.stroke(), this._tmpCtx.restore();\n        }\n        if (this._tmpCtx.restore(), !l0 && this._config.fontSize >= 12 && !this._config.allowTransparency && o2 !== " ") {\n          this._tmpCtx.save(), this._tmpCtx.textBaseline = "alphabetic";\n          let r0 = this._tmpCtx.measureText(o2);\n          if (this._tmpCtx.restore(), "actualBoundingBoxDescent" in r0 && r0.actualBoundingBoxDescent > 0) {\n            this._tmpCtx.save();\n            let N0 = new Path2D();\n            N0.rect(i0, p0 - Math.ceil(E5 / 2), this._config.deviceCellWidth * Y2, v0 - p0 + Math.ceil(E5 / 2)), this._tmpCtx.clip(N0), this._tmpCtx.lineWidth = this._config.devicePixelRatio * 3, this._tmpCtx.strokeStyle = A4.css, this._tmpCtx.strokeText(o2, M4, M4 + this._config.deviceCharHeight), this._tmpCtx.restore();\n          }\n        }\n      }\n      if (Q3) {\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 15)), N3 = E5 % 2 === 1 ? 0.5 : 0;\n        this._tmpCtx.lineWidth = E5, this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle, this._tmpCtx.beginPath(), this._tmpCtx.moveTo(M4, M4 + N3), this._tmpCtx.lineTo(M4 + this._config.deviceCharWidth * Y2, M4 + N3), this._tmpCtx.stroke();\n      }\n      if (l0 || this._tmpCtx.fillText(o2, M4, M4 + this._config.deviceCharHeight), o2 === "_" && !this._config.allowTransparency) {\n        let E5 = Ie(this._tmpCtx.getImageData(M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight), A4, T0, t0);\n        if (E5) for (let N3 = 1; N3 <= 5 && (this._tmpCtx.save(), this._tmpCtx.fillStyle = A4.css, this._tmpCtx.fillRect(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), this._tmpCtx.restore(), this._tmpCtx.fillText(o2, M4, M4 + this._config.deviceCharHeight - N3), E5 = Ie(this._tmpCtx.getImageData(M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight), A4, T0, t0), !!E5); N3++) ;\n      }\n      if (C4) {\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 10)), N3 = this._tmpCtx.lineWidth % 2 === 1 ? 0.5 : 0;\n        this._tmpCtx.lineWidth = E5, this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle, this._tmpCtx.beginPath(), this._tmpCtx.moveTo(M4, M4 + Math.floor(this._config.deviceCharHeight / 2) - N3), this._tmpCtx.lineTo(M4 + this._config.deviceCharWidth * Y2, M4 + Math.floor(this._config.deviceCharHeight / 2) - N3), this._tmpCtx.stroke();\n      }\n      this._tmpCtx.restore();\n      let n0 = this._tmpCtx.getImageData(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), D0;\n      if (this._config.allowTransparency ? D0 = qt(n0) : D0 = Ie(n0, A4, T0, t0), D0) return at2;\n      let I4 = this._findGlyphBoundingBox(n0, this._workBoundingBox, l4, e0, l0, M4), O4, v6;\n      for (; ; ) {\n        if (this._activePages.length === 0) {\n          let E5 = this._createNewPage();\n          O4 = E5, v6 = E5.currentRow, v6.height = I4.size.y;\n          break;\n        }\n        O4 = this._activePages[this._activePages.length - 1], v6 = O4.currentRow;\n        for (let E5 of this._activePages) I4.size.y <= E5.currentRow.height && (O4 = E5, v6 = E5.currentRow);\n        for (let E5 = this._activePages.length - 1; E5 >= 0; E5--) for (let N3 of this._activePages[E5].fixedRows) N3.height <= v6.height && I4.size.y <= N3.height && (O4 = this._activePages[E5], v6 = N3);\n        if (I4.size.x > this._textureSize) {\n          this._overflowSizePage || (this._overflowSizePage = new M0(this._document, this._config.deviceMaxTextureSize), this.pages.push(this._overflowSizePage), this._requestClearModel = true, this._onAddTextureAtlasCanvas.fire(this._overflowSizePage.canvas)), O4 = this._overflowSizePage, v6 = this._overflowSizePage.currentRow, v6.x + I4.size.x >= O4.canvas.width && (v6.x = 0, v6.y += v6.height, v6.height = 0);\n          break;\n        }\n        if (v6.y + I4.size.y >= O4.canvas.height || v6.height > I4.size.y + 2) {\n          let E5 = false;\n          if (O4.currentRow.y + O4.currentRow.height + I4.size.y >= O4.canvas.height) {\n            let N3;\n            for (let i0 of this._activePages) if (i0.currentRow.y + i0.currentRow.height + I4.size.y < i0.canvas.height) {\n              N3 = i0;\n              break;\n            }\n            if (N3) O4 = N3;\n            else if (i3.maxAtlasPages && this._pages.length >= i3.maxAtlasPages && v6.y + I4.size.y <= O4.canvas.height && v6.height >= I4.size.y && v6.x + I4.size.x <= O4.canvas.width) E5 = true;\n            else {\n              let i0 = this._createNewPage();\n              O4 = i0, v6 = i0.currentRow, v6.height = I4.size.y, E5 = true;\n            }\n          }\n          E5 || (O4.currentRow.height > 0 && O4.fixedRows.push(O4.currentRow), v6 = { x: 0, y: O4.currentRow.y + O4.currentRow.height, height: I4.size.y }, O4.fixedRows.push(v6), O4.currentRow = { x: 0, y: v6.y + v6.height, height: 0 });\n        }\n        if (v6.x + I4.size.x <= O4.canvas.width) break;\n        v6 === O4.currentRow ? (v6.x = 0, v6.y += v6.height, v6.height = 0) : O4.fixedRows.splice(O4.fixedRows.indexOf(v6), 1);\n      }\n      return I4.texturePage = this._pages.indexOf(O4), I4.texturePosition.x = v6.x, I4.texturePosition.y = v6.y, I4.texturePositionClipSpace.x = v6.x / O4.canvas.width, I4.texturePositionClipSpace.y = v6.y / O4.canvas.height, I4.sizeClipSpace.x /= O4.canvas.width, I4.sizeClipSpace.y /= O4.canvas.height, v6.height = Math.max(v6.height, I4.size.y), v6.x += I4.size.x, O4.ctx.putImageData(n0, I4.texturePosition.x - this._workBoundingBox.left, I4.texturePosition.y - this._workBoundingBox.top, this._workBoundingBox.left, this._workBoundingBox.top, I4.size.x, I4.size.y), O4.addGlyph(I4), O4.version++, I4;\n    }\n    _findGlyphBoundingBox(e, t, r, n11, a2, s4) {\n      t.top = 0;\n      let o2 = n11 ? this._config.deviceCellHeight : this._tmpCanvas.height, l4 = n11 ? this._config.deviceCellWidth : r, T4 = false;\n      for (let h3 = 0; h3 < o2; h3++) {\n        for (let d3 = 0; d3 < l4; d3++) {\n          let _5 = h3 * this._tmpCanvas.width * 4 + d3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.top = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.left = 0, T4 = false;\n      for (let h3 = 0; h3 < s4 + l4; h3++) {\n        for (let d3 = 0; d3 < o2; d3++) {\n          let _5 = d3 * this._tmpCanvas.width * 4 + h3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.left = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.right = l4, T4 = false;\n      for (let h3 = s4 + l4 - 1; h3 >= s4; h3--) {\n        for (let d3 = 0; d3 < o2; d3++) {\n          let _5 = d3 * this._tmpCanvas.width * 4 + h3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.right = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.bottom = o2, T4 = false;\n      for (let h3 = o2 - 1; h3 >= 0; h3--) {\n        for (let d3 = 0; d3 < l4; d3++) {\n          let _5 = h3 * this._tmpCanvas.width * 4 + d3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.bottom = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      return { texturePage: 0, texturePosition: { x: 0, y: 0 }, texturePositionClipSpace: { x: 0, y: 0 }, size: { x: t.right - t.left + 1, y: t.bottom - t.top + 1 }, sizeClipSpace: { x: t.right - t.left + 1, y: t.bottom - t.top + 1 }, offset: { x: -t.left + s4 + (n11 || a2 ? Math.floor((this._config.deviceCellWidth - this._config.deviceCharWidth) / 2) : 0), y: -t.top + s4 + (n11 || a2 ? this._config.lineHeight === 1 ? 0 : Math.round((this._config.deviceCellHeight - this._config.deviceCharHeight) / 2) : 0) } };\n    }\n  };\n  var M0 = class {\n    constructor(e, t, r) {\n      this._usedPixels = 0;\n      this._glyphs = [];\n      this.version = 0;\n      this.currentRow = { x: 0, y: 0, height: 0 };\n      this.fixedRows = [];\n      if (r) for (let n11 of r) this._glyphs.push(...n11.glyphs), this._usedPixels += n11._usedPixels;\n      this.canvas = ot2(e, t, t), this.ctx = y3(this.canvas.getContext("2d", { alpha: true }));\n    }\n    get percentageUsed() {\n      return this._usedPixels / (this.canvas.width * this.canvas.height);\n    }\n    get glyphs() {\n      return this._glyphs;\n    }\n    addGlyph(e) {\n      this._glyphs.push(e), this._usedPixels += e.size.x * e.size.y;\n    }\n    clear() {\n      this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height), this.currentRow.x = 0, this.currentRow.y = 0, this.currentRow.height = 0, this.fixedRows.length = 0, this.version++;\n    }\n  };\n  function Ie(i5, e, t, r) {\n    let n11 = e.rgba >>> 24, a2 = e.rgba >>> 16 & 255, s4 = e.rgba >>> 8 & 255, o2 = t.rgba >>> 24, l4 = t.rgba >>> 16 & 255, T4 = t.rgba >>> 8 & 255, h3 = Math.floor((Math.abs(n11 - o2) + Math.abs(a2 - l4) + Math.abs(s4 - T4)) / 12), d3 = true;\n    for (let _5 = 0; _5 < i5.data.length; _5 += 4) i5.data[_5] === n11 && i5.data[_5 + 1] === a2 && i5.data[_5 + 2] === s4 || r && Math.abs(i5.data[_5] - n11) + Math.abs(i5.data[_5 + 1] - a2) + Math.abs(i5.data[_5 + 2] - s4) < h3 ? i5.data[_5 + 3] = 0 : d3 = false;\n    return d3;\n  }\n  function qt(i5) {\n    for (let e = 0; e < i5.data.length; e += 4) if (i5.data[e + 3] > 0) return false;\n    return true;\n  }\n  function ot2(i5, e, t) {\n    let r = i5.createElement("canvas");\n    return r.width = e, r.height = t, r;\n  }\n  function Tt2(i5, e, t, r, n11, a2, s4, o2, l4 = true) {\n    let T4 = { foreground: a2.foreground, background: a2.background, cursor: G3, cursorAccent: G3, selectionForeground: G3, selectionBackgroundTransparent: G3, selectionBackgroundOpaque: G3, selectionInactiveBackgroundTransparent: G3, selectionInactiveBackgroundOpaque: G3, overviewRulerBorder: G3, scrollbarSliderBackground: G3, scrollbarSliderHoverBackground: G3, scrollbarSliderActiveBackground: G3, ansi: a2.ansi.slice(), contrastCache: a2.contrastCache, halfContrastCache: a2.halfContrastCache };\n    return { customGlyphs: l4, devicePixelRatio: s4, deviceMaxTextureSize: o2, letterSpacing: n11.letterSpacing, lineHeight: n11.lineHeight, deviceCellWidth: i5, deviceCellHeight: e, deviceCharWidth: t, deviceCharHeight: r, fontFamily: n11.fontFamily, fontSize: n11.fontSize, fontWeight: n11.fontWeight, fontWeightBold: n11.fontWeightBold, allowTransparency: n11.allowTransparency, drawBoldTextInBrightColors: n11.drawBoldTextInBrightColors, minimumContrastRatio: n11.minimumContrastRatio, colors: T4 };\n  }\n  function Fe2(i5, e) {\n    for (let t = 0; t < i5.colors.ansi.length; t++) if (i5.colors.ansi[t].rgba !== e.colors.ansi[t].rgba) return false;\n    return i5.devicePixelRatio === e.devicePixelRatio && i5.customGlyphs === e.customGlyphs && i5.lineHeight === e.lineHeight && i5.letterSpacing === e.letterSpacing && i5.fontFamily === e.fontFamily && i5.fontSize === e.fontSize && i5.fontWeight === e.fontWeight && i5.fontWeightBold === e.fontWeightBold && i5.allowTransparency === e.allowTransparency && i5.deviceCharWidth === e.deviceCharWidth && i5.deviceCharHeight === e.deviceCharHeight && i5.drawBoldTextInBrightColors === e.drawBoldTextInBrightColors && i5.minimumContrastRatio === e.minimumContrastRatio && i5.colors.foreground.rgba === e.colors.foreground.rgba && i5.colors.background.rgba === e.colors.background.rgba;\n  }\n  function lt(i5) {\n    return (i5 & 50331648) === 16777216 || (i5 & 50331648) === 33554432;\n  }\n  var J3 = [];\n  function ee2(i5, e, t, r, n11, a2, s4, o2, l4, T4 = true) {\n    let h3 = Tt2(r, n11, a2, s4, e, t, o2, l4, T4);\n    for (let u3 = 0; u3 < J3.length; u3++) {\n      let p3 = J3[u3], C4 = p3.ownedBy.indexOf(i5);\n      if (C4 >= 0) {\n        if (Fe2(p3.config, h3)) return p3.atlas;\n        p3.ownedBy.length === 1 ? (p3.atlas.dispose(), J3.splice(u3, 1)) : p3.ownedBy.splice(C4, 1);\n        break;\n      }\n    }\n    for (let u3 = 0; u3 < J3.length; u3++) {\n      let p3 = J3[u3];\n      if (Fe2(p3.config, h3)) return p3.ownedBy.push(i5), p3.atlas;\n    }\n    let d3 = i5._core, _5 = d3._logService, c2 = { atlas: new j3(document, h3, d3.unicodeService, _5), config: h3, ownedBy: [i5] };\n    return J3.push(c2), c2.atlas;\n  }\n  function Me(i5) {\n    for (let e = 0; e < J3.length; e++) {\n      let t = J3[e].ownedBy.indexOf(i5);\n      if (t !== -1) {\n        J3[e].ownedBy.length === 1 ? (J3[e].atlas.dispose(), J3.splice(e, 1)) : J3[e].ownedBy.splice(t, 1);\n        break;\n      }\n    }\n  }\n  var te = class {\n    constructor(e, t) {\n      this._renderCallback = e;\n      this._coreBrowserService = t;\n      this._isIdlePaused = false;\n      this.isCursorVisible = true, this._coreBrowserService.isFocused && (this._restartInterval(), this._resetIdleTimer());\n    }\n    get isPaused() {\n      return !(this._blinkStartTimeout || this._blinkInterval);\n    }\n    dispose() {\n      this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    restartBlinkAnimation() {\n      this._isIdlePaused && this._resetIdleTimer(), !this.isPaused && (this._animationTimeRestarted = Date.now(), this.isCursorVisible = true, this._animationFrame || (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n        this._renderCallback(), this._animationFrame = void 0;\n      })));\n    }\n    _restartInterval(e = 600) {\n      this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout = this._coreBrowserService.window.setTimeout(() => {\n        if (this._animationTimeRestarted) {\n          let t = 600 - (Date.now() - this._animationTimeRestarted);\n          if (this._animationTimeRestarted = void 0, t > 0) {\n            this._restartInterval(t);\n            return;\n          }\n        }\n        this.isCursorVisible = false, this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n          this._renderCallback(), this._animationFrame = void 0;\n        }), this._blinkInterval = this._coreBrowserService.window.setInterval(() => {\n          if (this._animationTimeRestarted) {\n            let t = 600 - (Date.now() - this._animationTimeRestarted);\n            this._animationTimeRestarted = void 0, this._restartInterval(t);\n            return;\n          }\n          this.isCursorVisible = !this.isCursorVisible, this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n            this._renderCallback(), this._animationFrame = void 0;\n          });\n        }, 600);\n      }, e);\n    }\n    pause() {\n      this.isCursorVisible = true, this._isIdlePaused = false, this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    resume() {\n      this.pause(), this._animationTimeRestarted = void 0, this._restartInterval(), this._resetIdleTimer(), this.restartBlinkAnimation();\n    }\n    _resetIdleTimer() {\n      this._isIdlePaused = false, this._idleTimeout && this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = this._coreBrowserService.window.setTimeout(() => {\n        this._stopBlinkingDueToIdle();\n      }, 3e5);\n    }\n    _stopBlinkingDueToIdle() {\n      this.isCursorVisible = true, this._isIdlePaused = true, this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0, this._renderCallback();\n    }\n  };\n  function Ae2(i5, e, t) {\n    let r = new e.ResizeObserver((n11) => {\n      let a2 = n11.find((l4) => l4.target === i5);\n      if (!a2) return;\n      if (!("devicePixelContentBoxSize" in a2)) {\n        r?.disconnect(), r = void 0;\n        return;\n      }\n      let s4 = a2.devicePixelContentBoxSize[0].inlineSize, o2 = a2.devicePixelContentBoxSize[0].blockSize;\n      s4 > 0 && o2 > 0 && t(s4, o2);\n    });\n    try {\n      r.observe(i5, { box: ["device-pixel-content-box"] });\n    } catch {\n      r.disconnect(), r = void 0;\n    }\n    return g4(() => r?.disconnect());\n  }\n  function Lt(i5) {\n    return i5 > 65535 ? (i5 -= 65536, String.fromCharCode((i5 >> 10) + 55296) + String.fromCharCode(i5 % 1024 + 56320)) : String.fromCharCode(i5);\n  }\n  var ie2 = class i4 extends s0 {\n    constructor() {\n      super(...arguments);\n      this.content = 0;\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Z0();\n      this.combinedData = "";\n    }\n    static fromCharData(t) {\n      let r = new i4();\n      return r.setFromCharData(t), r;\n    }\n    isCombined() {\n      return this.content & 2097152;\n    }\n    getWidth() {\n      return this.content >> 22;\n    }\n    getChars() {\n      return this.content & 2097152 ? this.combinedData : this.content & 2097151 ? Lt(this.content & 2097151) : "";\n    }\n    getCode() {\n      return this.isCombined() ? this.combinedData.charCodeAt(this.combinedData.length - 1) : this.content & 2097151;\n    }\n    setFromCharData(t) {\n      this.fg = t[0], this.bg = 0;\n      let r = false;\n      if (t[1].length > 2) r = true;\n      else if (t[1].length === 2) {\n        let n11 = t[1].charCodeAt(0);\n        if (55296 <= n11 && n11 <= 56319) {\n          let a2 = t[1].charCodeAt(1);\n          56320 <= a2 && a2 <= 57343 ? this.content = (n11 - 55296) * 1024 + a2 - 56320 + 65536 | t[2] << 22 : r = true;\n        } else r = true;\n      } else this.content = t[1].charCodeAt(0) | t[2] << 22;\n      r && (this.combinedData = t[1], this.content = 2097152 | t[2] << 22);\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n    attributesEquals(t) {\n      if (this.getFgColorMode() !== t.getFgColorMode() || this.getFgColor() !== t.getFgColor() || this.getBgColorMode() !== t.getBgColorMode() || this.getBgColor() !== t.getBgColor() || this.isInverse() !== t.isInverse() || this.isBold() !== t.isBold() || this.isUnderline() !== t.isUnderline()) return false;\n      if (this.isUnderline()) {\n        if (this.getUnderlineStyle() !== t.getUnderlineStyle()) return false;\n        let r = this.isUnderlineColorDefault(), n11 = t.isUnderlineColorDefault();\n        if (!(r && n11) && (r !== n11 || this.getUnderlineColor() !== t.getUnderlineColor() || this.getUnderlineColorMode() !== t.getUnderlineColorMode())) return false;\n      }\n      return !(this.isOverline() !== t.isOverline() || this.isBlink() !== t.isBlink() || this.isInvisible() !== t.isInvisible() || this.isItalic() !== t.isItalic() || this.isDim() !== t.isDim() || this.isStrikethrough() !== t.isStrikethrough());\n    }\n  };\n  var re = class extends W3 {\n    constructor(t, r, n11) {\n      super();\n      this._renderCallback = t;\n      this._coreBrowserService = r;\n      this._optionsService = n11;\n      this._intervalDuration = 0;\n      this._blinkOn = true;\n      this._needsBlinkInViewport = false;\n      this._isViewportVisible = true;\n      this._register(this._optionsService.onSpecificOptionChange("blinkIntervalDuration", (a2) => {\n        this.setIntervalDuration(a2);\n      })), this.setIntervalDuration(this._optionsService.rawOptions.blinkIntervalDuration), this._register(g4(() => this._clearInterval()));\n    }\n    get isBlinkOn() {\n      return this._blinkOn;\n    }\n    get isEnabled() {\n      return this._intervalDuration > 0;\n    }\n    setNeedsBlinkInViewport(t) {\n      this._needsBlinkInViewport !== t && (this._needsBlinkInViewport = t, this._updateIntervalState());\n    }\n    setViewportVisible(t) {\n      this._isViewportVisible !== t && (this._isViewportVisible = t, this._updateIntervalState());\n    }\n    setIntervalDuration(t) {\n      t !== this._intervalDuration && (this._intervalDuration = t, this._clearInterval(), this._updateIntervalState());\n    }\n    _updateIntervalState() {\n      if (this._intervalDuration > 0 && this._needsBlinkInViewport && this._isViewportVisible) {\n        if (this._interval !== void 0) return;\n        let r = this._blinkOn;\n        this._blinkOn = true, this._interval = this._coreBrowserService.window.setInterval(() => {\n          this._blinkOn = !this._blinkOn, this._renderCallback();\n        }, this._intervalDuration), r || this._renderCallback();\n        return;\n      }\n      this._clearInterval(), this._blinkOn || (this._blinkOn = true, this._renderCallback());\n    }\n    _clearInterval() {\n      this._interval !== void 0 && (this._coreBrowserService.window.clearInterval(this._interval), this._interval = void 0);\n    }\n  };\n  var ne2 = new Float32Array([2, 0, 0, 0, 0, -2, 0, 0, 0, 0, 1, 0, -1, 1, 0, 1]);\n  function ae2(i5, e, t) {\n    let r = y3(i5.createProgram());\n    if (i5.attachShader(r, y3(ht(i5, i5.VERTEX_SHADER, e))), i5.attachShader(r, y3(ht(i5, i5.FRAGMENT_SHADER, t))), i5.linkProgram(r), i5.getProgramParameter(r, i5.LINK_STATUS)) return r;\n    console.error(i5.getProgramInfoLog(r)), i5.deleteProgram(r);\n  }\n  function ht(i5, e, t) {\n    let r = y3(i5.createShader(e));\n    if (i5.shaderSource(r, t), i5.compileShader(r), i5.getShaderParameter(r, i5.COMPILE_STATUS)) return r;\n    console.error(i5.getShaderInfoLog(r)), i5.deleteShader(r);\n  }\n  function dt(i5, e) {\n    let t = Math.min(i5.length * 2, e), r = new Float32Array(t);\n    for (let n11 = 0; n11 < i5.length; n11++) r[n11] = i5[n11];\n    return r;\n  }\n  var se = class {\n    constructor(e) {\n      this.texture = e, this.version = -1;\n    }\n  };\n  var e1 = `#version 300 es\nlayout (location = 0) in vec2 a_unitquad;\nlayout (location = 1) in vec2 a_cellpos;\nlayout (location = 2) in vec2 a_offset;\nlayout (location = 3) in vec2 a_size;\nlayout (location = 4) in float a_texpage;\nlayout (location = 5) in vec2 a_texcoord;\nlayout (location = 6) in vec2 a_texsize;\n\nuniform mat4 u_projection;\nuniform vec2 u_resolution;\n\nout vec2 v_texcoord;\nflat out int v_texpage;\n\nvoid main() {\n  vec2 zeroToOne = (a_offset / u_resolution) + a_cellpos + (a_unitquad * a_size);\n  gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n  v_texpage = int(a_texpage);\n  v_texcoord = a_texcoord + a_unitquad * a_texsize;\n}`;\n  function t1(i5) {\n    let e = "";\n    for (let t = 1; t < i5; t++) e += ` else if (v_texpage == ${t}) { outColor = texture(u_texture[${t}], v_texcoord); }`;\n    return `#version 300 es\nprecision lowp float;\n\nin vec2 v_texcoord;\nflat in int v_texpage;\n\nuniform sampler2D u_texture[${i5}];\n\nout vec4 outColor;\n\nvoid main() {\n  if (v_texpage == 0) {\n    outColor = texture(u_texture[0], v_texcoord);\n  } ${e}\n}`;\n  }\n  var m0 = 11;\n  var g0 = m0 * Float32Array.BYTES_PER_ELEMENT;\n  var i1 = 2;\n  var D5 = 0;\n  var S3;\n  var ye = 0;\n  var V0 = 0;\n  var oe2 = class extends W3 {\n    constructor(t, r, n11, a2) {\n      super();\n      this._terminal = t;\n      this._gl = r;\n      this._dimensions = n11;\n      this._optionsService = a2;\n      this._activeBuffer = 0;\n      this._vertices = { count: 0, attributes: new Float32Array(0), attributesBuffers: [new Float32Array(0), new Float32Array(0)] };\n      let s4 = this._gl;\n      j3.maxAtlasPages === void 0 && (j3.maxAtlasPages = Math.min(32, y3(s4.getParameter(s4.MAX_TEXTURE_IMAGE_UNITS))), j3.maxTextureSize = y3(s4.getParameter(s4.MAX_TEXTURE_SIZE))), this._program = y3(ae2(s4, e1, t1(j3.maxAtlasPages))), this._register(g4(() => s4.deleteProgram(this._program))), this._projectionLocation = y3(s4.getUniformLocation(this._program, "u_projection")), this._resolutionLocation = y3(s4.getUniformLocation(this._program, "u_resolution")), this._textureLocation = y3(s4.getUniformLocation(this._program, "u_texture")), this._vertexArrayObject = s4.createVertexArray(), s4.bindVertexArray(this._vertexArrayObject);\n      let o2 = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]), l4 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(l4))), s4.bindBuffer(s4.ARRAY_BUFFER, l4), s4.bufferData(s4.ARRAY_BUFFER, o2, s4.STATIC_DRAW), s4.enableVertexAttribArray(0), s4.vertexAttribPointer(0, 2, this._gl.FLOAT, false, 0, 0);\n      let T4 = new Uint8Array([0, 1, 2, 3]), h3 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(h3))), s4.bindBuffer(s4.ELEMENT_ARRAY_BUFFER, h3), s4.bufferData(s4.ELEMENT_ARRAY_BUFFER, T4, s4.STATIC_DRAW), this._attributesBuffer = y3(s4.createBuffer()), this._register(g4(() => s4.deleteBuffer(this._attributesBuffer))), s4.bindBuffer(s4.ARRAY_BUFFER, this._attributesBuffer), s4.enableVertexAttribArray(2), s4.vertexAttribPointer(2, 2, s4.FLOAT, false, g0, 0), s4.vertexAttribDivisor(2, 1), s4.enableVertexAttribArray(3), s4.vertexAttribPointer(3, 2, s4.FLOAT, false, g0, 2 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(3, 1), s4.enableVertexAttribArray(4), s4.vertexAttribPointer(4, 1, s4.FLOAT, false, g0, 4 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(4, 1), s4.enableVertexAttribArray(5), s4.vertexAttribPointer(5, 2, s4.FLOAT, false, g0, 5 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(5, 1), s4.enableVertexAttribArray(6), s4.vertexAttribPointer(6, 2, s4.FLOAT, false, g0, 7 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(6, 1), s4.enableVertexAttribArray(1), s4.vertexAttribPointer(1, 2, s4.FLOAT, false, g0, 9 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(1, 1), s4.useProgram(this._program);\n      let d3 = new Int32Array(j3.maxAtlasPages);\n      for (let _5 = 0; _5 < j3.maxAtlasPages; _5++) d3[_5] = _5;\n      s4.uniform1iv(this._textureLocation, d3), s4.uniformMatrix4fv(this._projectionLocation, false, ne2), this._atlasTextures = [];\n      for (let _5 = 0; _5 < j3.maxAtlasPages; _5++) {\n        let c2 = new se(y3(s4.createTexture()));\n        this._register(g4(() => s4.deleteTexture(c2.texture))), s4.activeTexture(s4.TEXTURE0 + _5), s4.bindTexture(s4.TEXTURE_2D, c2.texture), s4.texParameteri(s4.TEXTURE_2D, s4.TEXTURE_WRAP_S, s4.CLAMP_TO_EDGE), s4.texParameteri(s4.TEXTURE_2D, s4.TEXTURE_WRAP_T, s4.CLAMP_TO_EDGE), s4.texImage2D(s4.TEXTURE_2D, 0, s4.RGBA, 1, 1, 0, s4.RGBA, s4.UNSIGNED_BYTE, new Uint8Array([255, 0, 0, 255])), this._atlasTextures[_5] = c2;\n      }\n      s4.enable(s4.BLEND), s4.blendFunc(s4.SRC_ALPHA, s4.ONE_MINUS_SRC_ALPHA), this.handleResize();\n    }\n    beginFrame() {\n      return this._atlas ? this._atlas.beginFrame() : true;\n    }\n    updateCell(t, r, n11, a2, s4, o2, l4, T4, h3) {\n      this._updateCell(this._vertices.attributes, t, r, n11, a2, s4, o2, l4, T4, h3);\n    }\n    _updateCell(t, r, n11, a2, s4, o2, l4, T4, h3, d3) {\n      if (D5 = (n11 * this._terminal.cols + r) * m0, a2 === 0 || a2 === void 0) {\n        t.fill(0, D5, D5 + m0 - 1 - i1);\n        return;\n      }\n      this._atlas && (T4 && T4.length > 1 ? S3 = this._atlas.getRasterizedGlyphCombinedChar(T4, s4, o2, l4, false, this._terminal.element) : S3 = this._atlas.getRasterizedGlyph(a2, s4, o2, l4, false, this._terminal.element), ye = Math.floor((this._dimensions.device.cell.width - this._dimensions.device.char.width) / 2), s4 !== d3 && S3.offset.x > ye ? (V0 = S3.offset.x - ye, t[D5] = -(S3.offset.x - V0) + this._dimensions.device.char.left, t[D5 + 1] = -S3.offset.y + this._dimensions.device.char.top, t[D5 + 2] = (S3.size.x - V0) / this._dimensions.device.canvas.width, t[D5 + 3] = S3.size.y / this._dimensions.device.canvas.height, t[D5 + 4] = S3.texturePage, t[D5 + 5] = S3.texturePositionClipSpace.x + V0 / this._atlas.pages[S3.texturePage].canvas.width, t[D5 + 6] = S3.texturePositionClipSpace.y, t[D5 + 7] = S3.sizeClipSpace.x - V0 / this._atlas.pages[S3.texturePage].canvas.width, t[D5 + 8] = S3.sizeClipSpace.y) : (t[D5] = -S3.offset.x + this._dimensions.device.char.left, t[D5 + 1] = -S3.offset.y + this._dimensions.device.char.top, t[D5 + 2] = S3.size.x / this._dimensions.device.canvas.width, t[D5 + 3] = S3.size.y / this._dimensions.device.canvas.height, t[D5 + 4] = S3.texturePage, t[D5 + 5] = S3.texturePositionClipSpace.x, t[D5 + 6] = S3.texturePositionClipSpace.y, t[D5 + 7] = S3.sizeClipSpace.x, t[D5 + 8] = S3.sizeClipSpace.y), this._optionsService.rawOptions.rescaleOverlappingGlyphs && Ge2(a2, h3, S3.size.x, this._dimensions.device.cell.width) && (t[D5 + 2] = (this._dimensions.device.cell.width - 1) / this._dimensions.device.canvas.width));\n    }\n    clear() {\n      let t = this._terminal, r = t.cols * t.rows * m0;\n      this._vertices.count !== r ? this._vertices.attributes = new Float32Array(r) : this._vertices.attributes.fill(0);\n      let n11 = 0;\n      for (; n11 < this._vertices.attributesBuffers.length; n11++) this._vertices.count !== r ? this._vertices.attributesBuffers[n11] = new Float32Array(r) : this._vertices.attributesBuffers[n11].fill(0);\n      this._vertices.count = r, n11 = 0;\n      for (let a2 = 0; a2 < t.rows; a2++) for (let s4 = 0; s4 < t.cols; s4++) this._vertices.attributes[n11 + 9] = s4 / t.cols, this._vertices.attributes[n11 + 10] = a2 / t.rows, n11 += m0;\n    }\n    handleResize() {\n      let t = this._gl;\n      t.useProgram(this._program), t.viewport(0, 0, this._dimensions.device.canvas.width, this._dimensions.device.canvas.height), t.uniform2f(this._resolutionLocation, this._dimensions.device.canvas.width, this._dimensions.device.canvas.height), this.clear();\n    }\n    render(t) {\n      if (!this._atlas) return;\n      let r = this._gl;\n      r.useProgram(this._program), r.bindVertexArray(this._vertexArrayObject), this._activeBuffer = (this._activeBuffer + 1) % 2;\n      let n11 = this._vertices.attributesBuffers[this._activeBuffer], a2 = 0;\n      for (let s4 = 0; s4 < t.lineLengths.length; s4++) {\n        let o2 = s4 * this._terminal.cols * m0, l4 = this._vertices.attributes.subarray(o2, o2 + t.lineLengths[s4] * m0);\n        n11.set(l4, a2), a2 += l4.length;\n      }\n      r.bindBuffer(r.ARRAY_BUFFER, this._attributesBuffer), r.bufferData(r.ARRAY_BUFFER, n11.subarray(0, a2), r.STREAM_DRAW);\n      for (let s4 = 0; s4 < this._atlas.pages.length; s4++) this._atlas.pages[s4].version !== this._atlasTextures[s4].version && this._bindAtlasPageTexture(r, this._atlas, s4);\n      r.drawElementsInstanced(r.TRIANGLE_STRIP, 4, r.UNSIGNED_BYTE, 0, a2 / m0);\n    }\n    setAtlas(t) {\n      this._atlas = t;\n      for (let r of this._atlasTextures) r.version = -1;\n    }\n    _bindAtlasPageTexture(t, r, n11) {\n      t.activeTexture(t.TEXTURE0 + n11), t.bindTexture(t.TEXTURE_2D, this._atlasTextures[n11].texture), t.texParameteri(t.TEXTURE_2D, t.TEXTURE_WRAP_S, t.CLAMP_TO_EDGE), t.texParameteri(t.TEXTURE_2D, t.TEXTURE_WRAP_T, t.CLAMP_TO_EDGE), t.texImage2D(t.TEXTURE_2D, 0, t.RGBA, t.RGBA, t.UNSIGNED_BYTE, r.pages[n11].canvas), t.generateMipmap(t.TEXTURE_2D), this._atlasTextures[n11].version = r.pages[n11].version;\n    }\n    setDimensions(t) {\n      this._dimensions = t;\n    }\n  };\n  var Se2 = class {\n    constructor() {\n      this.clear();\n    }\n    clear() {\n      this.hasSelection = false, this.columnSelectMode = false, this.viewportStartRow = 0, this.viewportEndRow = 0, this.viewportCappedStartRow = 0, this.viewportCappedEndRow = 0, this.startCol = 0, this.endCol = 0, this.selectionStart = void 0, this.selectionEnd = void 0;\n    }\n    update(e, t, r, n11 = false) {\n      if (this.selectionStart = t, this.selectionEnd = r, !t || !r || t[0] === r[0] && t[1] === r[1]) {\n        this.clear();\n        return;\n      }\n      let a2 = e.buffers.active.ydisp, s4 = t[1] - a2, o2 = r[1] - a2, l4 = Math.max(s4, 0), T4 = Math.min(o2, e.rows - 1);\n      if (l4 >= e.rows || T4 < 0) {\n        this.clear();\n        return;\n      }\n      this.hasSelection = true, this.columnSelectMode = n11, this.viewportStartRow = s4, this.viewportEndRow = o2, this.viewportCappedStartRow = l4, this.viewportCappedEndRow = T4, this.startCol = t[0], this.endCol = r[0];\n    }\n    isCellSelected(e, t, r) {\n      return this.hasSelection ? (r -= e.buffer.active.viewportY, this.columnSelectMode ? this.startCol <= this.endCol ? t >= this.startCol && r >= this.viewportCappedStartRow && t < this.endCol && r <= this.viewportCappedEndRow : t < this.startCol && r >= this.viewportCappedStartRow && t >= this.endCol && r <= this.viewportCappedEndRow : r > this.viewportStartRow && r < this.viewportEndRow || this.viewportStartRow === this.viewportEndRow && r === this.viewportStartRow && t >= this.startCol && t < this.endCol || this.viewportStartRow < this.viewportEndRow && r === this.viewportEndRow && t < this.endCol || this.viewportStartRow < this.viewportEndRow && r === this.viewportStartRow && t >= this.startCol) : false;\n    }\n  };\n  function _t() {\n    return new Se2();\n  }\n  var y0 = 4;\n  var S0 = 1;\n  var R0 = 2;\n  var le = 3;\n  var ct2 = 2147483648;\n  var Te2 = class {\n    constructor() {\n      this.cells = new Uint32Array(0), this.lineLengths = new Uint32Array(0), this.selection = _t();\n    }\n    resize(e, t) {\n      let r = e * t * y0;\n      r !== this.cells.length && (this.cells = new Uint32Array(r), this.lineLengths = new Uint32Array(t));\n    }\n    clear() {\n      this.cells.fill(0, 0), this.lineLengths.fill(0, 0);\n    }\n  };\n  var r1 = `#version 300 es\nlayout (location = 0) in vec2 a_position;\nlayout (location = 1) in vec2 a_size;\nlayout (location = 2) in vec4 a_color;\nlayout (location = 3) in vec2 a_unitquad;\n\nuniform mat4 u_projection;\n\nout vec4 v_color;\n\nvoid main() {\n  vec2 zeroToOne = a_position + (a_unitquad * a_size);\n  gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n  v_color = a_color;\n}`;\n  var s1 = `#version 300 es\nprecision lowp float;\n\nin vec4 v_color;\n\nout vec4 outColor;\n\nvoid main() {\n  outColor = v_color;\n}`;\n  var u0 = 8;\n  var Re2 = u0 * Float32Array.BYTES_PER_ELEMENT;\n  var n1 = 20 * u0;\n  var Le = class {\n    constructor() {\n      this.attributes = new Float32Array(n1), this.count = 0;\n    }\n  };\n  var c0 = 0;\n  var ut = 0;\n  var pt = 0;\n  var Qt = 0;\n  var Ct = 0;\n  var mt = 0;\n  var ft = 0;\n  var he = class extends W3 {\n    constructor(t, r, n11, a2) {\n      super();\n      this._terminal = t;\n      this._gl = r;\n      this._dimensions = n11;\n      this._themeService = a2;\n      this._vertices = new Le();\n      this._verticesCursor = new Le();\n      let s4 = this._gl;\n      this._program = y3(ae2(s4, r1, s1)), this._register(g4(() => s4.deleteProgram(this._program))), this._projectionLocation = y3(s4.getUniformLocation(this._program, "u_projection")), this._vertexArrayObject = s4.createVertexArray(), s4.bindVertexArray(this._vertexArrayObject);\n      let o2 = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]), l4 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(l4))), s4.bindBuffer(s4.ARRAY_BUFFER, l4), s4.bufferData(s4.ARRAY_BUFFER, o2, s4.STATIC_DRAW), s4.enableVertexAttribArray(3), s4.vertexAttribPointer(3, 2, this._gl.FLOAT, false, 0, 0);\n      let T4 = new Uint8Array([0, 1, 2, 3]), h3 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(h3))), s4.bindBuffer(s4.ELEMENT_ARRAY_BUFFER, h3), s4.bufferData(s4.ELEMENT_ARRAY_BUFFER, T4, s4.STATIC_DRAW), this._attributesBuffer = y3(s4.createBuffer()), this._register(g4(() => s4.deleteBuffer(this._attributesBuffer))), s4.bindBuffer(s4.ARRAY_BUFFER, this._attributesBuffer), s4.enableVertexAttribArray(0), s4.vertexAttribPointer(0, 2, s4.FLOAT, false, Re2, 0), s4.vertexAttribDivisor(0, 1), s4.enableVertexAttribArray(1), s4.vertexAttribPointer(1, 2, s4.FLOAT, false, Re2, 2 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(1, 1), s4.enableVertexAttribArray(2), s4.vertexAttribPointer(2, 4, s4.FLOAT, false, Re2, 4 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(2, 1), this._updateCachedColors(a2.colors), this._register(this._themeService.onChangeColors((d3) => {\n        this._updateCachedColors(d3), this._updateViewportRectangle();\n      }));\n    }\n    renderBackgrounds() {\n      this._renderVertices(this._vertices);\n    }\n    renderCursor() {\n      this._renderVertices(this._verticesCursor);\n    }\n    _renderVertices(t) {\n      let r = this._gl;\n      r.useProgram(this._program), r.bindVertexArray(this._vertexArrayObject), r.uniformMatrix4fv(this._projectionLocation, false, ne2), r.bindBuffer(r.ARRAY_BUFFER, this._attributesBuffer), r.bufferData(r.ARRAY_BUFFER, t.attributes, r.DYNAMIC_DRAW), r.drawElementsInstanced(this._gl.TRIANGLE_STRIP, 4, r.UNSIGNED_BYTE, 0, t.count);\n    }\n    handleResize() {\n      this._updateViewportRectangle();\n    }\n    setDimensions(t) {\n      this._dimensions = t;\n    }\n    _updateCachedColors(t) {\n      this._bgFloat = this._colorToFloat32Array(t.background), this._cursorFloat = this._colorToFloat32Array(t.cursor);\n    }\n    _updateViewportRectangle() {\n      this._addRectangleFloat(this._vertices.attributes, 0, 0, 0, this._terminal.cols * this._dimensions.device.cell.width, this._terminal.rows * this._dimensions.device.cell.height, this._bgFloat);\n    }\n    updateBackgrounds(t) {\n      let r = this._terminal, n11 = this._vertices, a2 = 1, s4, o2, l4, T4, h3, d3, _5, c2, u3, p3, C4;\n      for (s4 = 0; s4 < r.rows; s4++) {\n        for (l4 = -1, T4 = 0, h3 = 0, d3 = false, o2 = 0; o2 < r.cols; o2++) _5 = (s4 * r.cols + o2) * y0, c2 = t.cells[_5 + S0], u3 = t.cells[_5 + R0], p3 = !!(u3 & 67108864), (c2 !== T4 || u3 !== h3 && (d3 || p3)) && ((T4 !== 0 || d3 && h3 !== 0) && (C4 = a2++ * u0, this._updateRectangle(n11, C4, h3, T4, l4, o2, s4)), l4 = o2, T4 = c2, h3 = u3, d3 = p3);\n        (T4 !== 0 || d3 && h3 !== 0) && (C4 = a2++ * u0, this._updateRectangle(n11, C4, h3, T4, l4, r.cols, s4));\n      }\n      n11.count = a2;\n    }\n    updateCursor(t) {\n      let r = this._verticesCursor, n11 = t.cursor;\n      if (!n11 || n11.style === "block") {\n        r.count = 0;\n        return;\n      }\n      let a2, s4 = 0;\n      (n11.style === "bar" || n11.style === "outline") && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, n11.y * this._dimensions.device.cell.height, n11.style === "bar" ? n11.dpr * n11.cursorWidth : n11.dpr, this._dimensions.device.cell.height, this._cursorFloat)), (n11.style === "underline" || n11.style === "outline") && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, (n11.y + 1) * this._dimensions.device.cell.height - n11.dpr, n11.width * this._dimensions.device.cell.width, n11.dpr, this._cursorFloat)), n11.style === "outline" && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, n11.y * this._dimensions.device.cell.height, n11.width * this._dimensions.device.cell.width, n11.dpr, this._cursorFloat), a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, (n11.x + n11.width) * this._dimensions.device.cell.width - n11.dpr, n11.y * this._dimensions.device.cell.height, n11.dpr, this._dimensions.device.cell.height, this._cursorFloat)), r.count = s4;\n    }\n    _updateRectangle(t, r, n11, a2, s4, o2, l4) {\n      if (n11 & 67108864) switch (n11 & 50331648) {\n        case 16777216:\n        case 33554432:\n          c0 = this._themeService.colors.ansi[n11 & 255].rgba;\n          break;\n        case 50331648:\n          c0 = (n11 & 16777215) << 8;\n          break;\n        case 0:\n        default:\n          c0 = this._themeService.colors.foreground.rgba;\n      }\n      else switch (a2 & 50331648) {\n        case 16777216:\n        case 33554432:\n          c0 = this._themeService.colors.ansi[a2 & 255].rgba;\n          break;\n        case 50331648:\n          c0 = (a2 & 16777215) << 8;\n          break;\n        case 0:\n        default:\n          c0 = this._themeService.colors.background.rgba;\n      }\n      t.attributes.length < r + 4 && (t.attributes = dt(t.attributes, this._terminal.rows * this._terminal.cols * u0)), ut = s4 * this._dimensions.device.cell.width, pt = l4 * this._dimensions.device.cell.height, Qt = (c0 >> 24 & 255) / 255, Ct = (c0 >> 16 & 255) / 255, mt = (c0 >> 8 & 255) / 255, ft = 1, this._addRectangle(t.attributes, r, ut, pt, (o2 - s4) * this._dimensions.device.cell.width, this._dimensions.device.cell.height, Qt, Ct, mt, ft);\n    }\n    _addRectangle(t, r, n11, a2, s4, o2, l4, T4, h3, d3) {\n      t[r] = n11 / this._dimensions.device.canvas.width, t[r + 1] = a2 / this._dimensions.device.canvas.height, t[r + 2] = s4 / this._dimensions.device.canvas.width, t[r + 3] = o2 / this._dimensions.device.canvas.height, t[r + 4] = l4, t[r + 5] = T4, t[r + 6] = h3, t[r + 7] = d3;\n    }\n    _addRectangleFloat(t, r, n11, a2, s4, o2, l4) {\n      t[r] = n11 / this._dimensions.device.canvas.width, t[r + 1] = a2 / this._dimensions.device.canvas.height, t[r + 2] = s4 / this._dimensions.device.canvas.width, t[r + 3] = o2 / this._dimensions.device.canvas.height, t[r + 4] = l4[0], t[r + 5] = l4[1], t[r + 6] = l4[2], t[r + 7] = l4[3];\n    }\n    _colorToFloat32Array(t) {\n      return new Float32Array([(t.rgba >> 24 & 255) / 255, (t.rgba >> 16 & 255) / 255, (t.rgba >> 8 & 255) / 255, (t.rgba & 255) / 255]);\n    }\n  };\n  var de = class extends W3 {\n    constructor(t, r, n11, a2, s4, o2, l4, T4) {\n      super();\n      this._container = r;\n      this._alpha = s4;\n      this._coreBrowserService = o2;\n      this._optionsService = l4;\n      this._themeService = T4;\n      this._deviceCharWidth = 0;\n      this._deviceCharHeight = 0;\n      this._deviceCellWidth = 0;\n      this._deviceCellHeight = 0;\n      this._deviceCharLeft = 0;\n      this._deviceCharTop = 0;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas"), this._canvas.classList.add(`xterm-${n11}-layer`), this._canvas.style.zIndex = a2.toString(), this._initCanvas(), this._container.appendChild(this._canvas), this._register(this._themeService.onChangeColors((h3) => {\n        this._refreshCharAtlas(t, h3), this.reset(t);\n      })), this._register(g4(() => {\n        this._canvas.remove();\n      }));\n    }\n    _initCanvas() {\n      this._ctx = y3(this._canvas.getContext("2d", { alpha: this._alpha })), this._alpha || this._clearAll();\n    }\n    handleBlur(t) {\n    }\n    handleFocus(t) {\n    }\n    handleCursorMove(t) {\n    }\n    handleGridChanged(t, r, n11) {\n    }\n    handleSelectionChanged(t, r, n11, a2 = false) {\n    }\n    _setTransparency(t, r) {\n      if (r === this._alpha) return;\n      let n11 = this._canvas;\n      this._alpha = r, this._canvas = this._canvas.cloneNode(), this._initCanvas(), this._container.replaceChild(this._canvas, n11), this._refreshCharAtlas(t, this._themeService.colors), this.handleGridChanged(t, 0, t.rows - 1);\n    }\n    _refreshCharAtlas(t, r) {\n      this._deviceCharWidth <= 0 && this._deviceCharHeight <= 0 || (this._charAtlas = ee2(t, this._optionsService.rawOptions, r, this._deviceCellWidth, this._deviceCellHeight, this._deviceCharWidth, this._deviceCharHeight, this._coreBrowserService.dpr, 2048), this._charAtlas.warmUp());\n    }\n    resize(t, r) {\n      this._deviceCellWidth = r.device.cell.width, this._deviceCellHeight = r.device.cell.height, this._deviceCharWidth = r.device.char.width, this._deviceCharHeight = r.device.char.height, this._deviceCharLeft = r.device.char.left, this._deviceCharTop = r.device.char.top, this._canvas.width = r.device.canvas.width, this._canvas.height = r.device.canvas.height, this._canvas.style.width = `${r.css.canvas.width}px`, this._canvas.style.height = `${r.css.canvas.height}px`, this._alpha || this._clearAll(), this._refreshCharAtlas(t, this._themeService.colors);\n    }\n    _fillBottomLineAtCells(t, r, n11 = 1) {\n      this._ctx.fillRect(t * this._deviceCellWidth, (r + 1) * this._deviceCellHeight - this._coreBrowserService.dpr - 1, n11 * this._deviceCellWidth, this._coreBrowserService.dpr);\n    }\n    _clearAll() {\n      this._alpha ? this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height) : (this._ctx.fillStyle = this._themeService.colors.background.css, this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height));\n    }\n    _clearCells(t, r, n11, a2) {\n      this._alpha ? this._ctx.clearRect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, a2 * this._deviceCellHeight) : (this._ctx.fillStyle = this._themeService.colors.background.css, this._ctx.fillRect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, a2 * this._deviceCellHeight));\n    }\n    _fillCharTrueColor(t, r, n11, a2) {\n      this._ctx.font = this._getFont(t, false, false), this._ctx.textBaseline = q0, this._clipCell(n11, a2, r.getWidth()), this._ctx.fillText(r.getChars(), n11 * this._deviceCellWidth + this._deviceCharLeft, a2 * this._deviceCellHeight + this._deviceCharTop + this._deviceCharHeight);\n    }\n    _clipCell(t, r, n11) {\n      this._ctx.beginPath(), this._ctx.rect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, this._deviceCellHeight), this._ctx.clip();\n    }\n    _getFont(t, r, n11) {\n      let a2 = r ? t.options.fontWeightBold : t.options.fontWeight;\n      return `${n11 ? "italic" : ""} ${a2} ${t.options.fontSize * this._coreBrowserService.dpr}px ${t.options.fontFamily}`;\n    }\n  };\n  var _e = class extends de {\n    constructor(e, t, r, n11, a2, s4, o2) {\n      super(r, e, "link", t, true, a2, s4, o2), this._register(n11.onShowLinkUnderline((l4) => this._handleShowLinkUnderline(l4))), this._register(n11.onHideLinkUnderline((l4) => this._handleHideLinkUnderline(l4)));\n    }\n    resize(e, t) {\n      super.resize(e, t), this._state = void 0;\n    }\n    reset(e) {\n      this._clearCurrentLink();\n    }\n    _clearCurrentLink() {\n      if (this._state) {\n        this._clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1);\n        let e = this._state.y2 - this._state.y1 - 1;\n        e > 0 && this._clearCells(0, this._state.y1 + 1, this._state.cols, e), this._clearCells(0, this._state.y2, this._state.x2, 1), this._state = void 0;\n      }\n    }\n    _handleShowLinkUnderline(e) {\n      if (e.fg === 257 ? this._ctx.fillStyle = this._themeService.colors.background.css : e.fg !== void 0 && lt(e.fg) ? this._ctx.fillStyle = this._themeService.colors.ansi[e.fg].css : this._ctx.fillStyle = this._themeService.colors.foreground.css, e.y1 === e.y2) this._fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1);\n      else {\n        this._fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1);\n        for (let t = e.y1 + 1; t < e.y2; t++) this._fillBottomLineAtCells(0, t, e.cols);\n        this._fillBottomLineAtCells(0, e.y2, e.x2);\n      }\n      this._state = e;\n    }\n    _handleHideLinkUnderline(e) {\n      this._clearCurrentLink();\n    }\n  };\n  var xe = class {\n    constructor(e, t, r, n11) {\n      this._node = e, this._type = t, this._handler = r, this._options = n11, e.addEventListener(t, r, n11);\n    }\n    dispose() {\n      !this._node || !this._handler || (this._node.removeEventListener(this._type, this._handler, this._options), this._node = null, this._handler = null);\n    }\n  };\n  function ce2(i5, e, t, r) {\n    return new xe(i5, e, t, r);\n  }\n  var ue = class extends W3 {\n    constructor(t, r, n11, a2, s4, o2, l4, T4, h3 = true, d3) {\n      super();\n      this._terminal = t;\n      this._characterJoinerService = r;\n      this._charSizeService = n11;\n      this._coreBrowserService = a2;\n      this._coreService = s4;\n      this._decorationService = o2;\n      this._optionsService = l4;\n      this._themeService = T4;\n      this._customGlyphs = h3;\n      this._cursorBlinkStateManager = this._register(new C0());\n      this._charAtlasDisposable = this._register(new C0());\n      this._observerDisposable = this._register(new C0());\n      this._model = new Te2();\n      this._rowHasBlinkingCells = [];\n      this._rowHasBlinkingCellsCount = 0;\n      this._workCell = new ie2();\n      this._rectangleRenderer = this._register(new C0());\n      this._glyphRenderer = this._register(new C0());\n      this._onChangeTextureAtlas = this._register(new U4());\n      this.onChangeTextureAtlas = this._onChangeTextureAtlas.event;\n      this._onAddTextureAtlasCanvas = this._register(new U4());\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = this._register(new U4());\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._onRequestRedraw = this._register(new U4());\n      this.onRequestRedraw = this._onRequestRedraw.event;\n      this._onContextLoss = this._register(new U4());\n      this.onContextLoss = this._onContextLoss.event;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas");\n      let _5 = { antialias: false, depth: false, preserveDrawingBuffer: d3 };\n      if (this._gl = this._canvas.getContext("webgl2", _5), !this._gl) throw new Error("WebGL2 not supported " + this._gl);\n      this._register(this._themeService.onChangeColors(() => this._handleColorChange())), this._cellColorResolver = new Y0(this._terminal, this._optionsService, this._model.selection, this._decorationService, this._coreBrowserService, this._themeService), this._core = this._terminal._core, this._renderLayers = [new _e(this._core.screenElement, 2, this._terminal, this._core.linkifier, this._coreBrowserService, l4, this._themeService)], this.dimensions = Ke2(), this._devicePixelRatio = this._coreBrowserService.dpr, this._updateDimensions(), this._updateCursorBlink(), this._register(l4.onOptionChange(() => this._handleOptionsChanged())), this._textBlinkStateManager = this._register(new re(() => this._requestRedrawViewport(), this._coreBrowserService, this._optionsService)), this._resetBlinkingRowState(), this._deviceMaxTextureSize = this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE), this._register(ce2(this._canvas, "webglcontextlost", (c2) => {\n        console.log("webglcontextlost event received"), c2.preventDefault(), this._contextRestorationTimeout = setTimeout(() => {\n          this._contextRestorationTimeout = void 0, console.warn("webgl context not restored; firing onContextLoss"), this._onContextLoss.fire(c2);\n        }, 3e3);\n      })), this._register(ce2(this._canvas, "webglcontextrestored", (c2) => {\n        console.warn("webglcontextrestored event received"), clearTimeout(this._contextRestorationTimeout), this._contextRestorationTimeout = void 0, Me(this._terminal), this._initializeWebGLState(), this._requestRedrawViewport();\n      })), this._observerDisposable.value = Ae2(this._canvas, this._coreBrowserService.window, (c2, u3) => this._setCanvasDevicePixelDimensions(c2, u3)), this._register(this._coreBrowserService.onWindowChange((c2) => {\n        this._observerDisposable.value = Ae2(this._canvas, c2, (u3, p3) => this._setCanvasDevicePixelDimensions(u3, p3));\n      })), this._register(ce2(this._coreBrowserService.mainDocument, "mousedown", () => this._cursorBlinkStateManager.value?.restartBlinkAnimation())), this._core.screenElement.appendChild(this._canvas), [this._rectangleRenderer.value, this._glyphRenderer.value] = this._initializeWebGLState(), this._isAttached = this._core.screenElement.isConnected, this._register(g4(() => {\n        for (let c2 of this._renderLayers) c2.dispose();\n        this._canvas.parentElement?.removeChild(this._canvas), Me(this._terminal);\n      }));\n    }\n    get textureAtlas() {\n      return this._charAtlas?.pages[0].canvas;\n    }\n    _handleColorChange() {\n      this._refreshCharAtlas(), this._clearModel(true);\n    }\n    handleDevicePixelRatioChange() {\n      this._devicePixelRatio !== this._coreBrowserService.dpr && (this._devicePixelRatio = this._coreBrowserService.dpr, this.handleResize(this._terminal.cols, this._terminal.rows));\n    }\n    handleResize(t, r) {\n      this._updateDimensions(), this._model.resize(this._terminal.cols, this._terminal.rows), this._resetBlinkingRowState();\n      for (let n11 of this._renderLayers) n11.resize(this._terminal, this.dimensions);\n      this._canvas.width = this.dimensions.device.canvas.width, this._canvas.height = this.dimensions.device.canvas.height, this._canvas.style.width = `${this.dimensions.css.canvas.width}px`, this._canvas.style.height = `${this.dimensions.css.canvas.height}px`, this._core.screenElement.style.width = `${this.dimensions.css.canvas.width}px`, this._core.screenElement.style.height = `${this.dimensions.css.canvas.height}px`, this._rectangleRenderer.value?.setDimensions(this.dimensions), this._rectangleRenderer.value?.handleResize(), this._glyphRenderer.value?.setDimensions(this.dimensions), this._glyphRenderer.value?.handleResize(), this._refreshCharAtlas(), this._clearModel(false), this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1, sync: true });\n    }\n    handleCharSizeChanged() {\n      this.handleResize(this._terminal.cols, this._terminal.rows);\n    }\n    handleBlur() {\n      for (let t of this._renderLayers) t.handleBlur(this._terminal);\n      this._cursorBlinkStateManager.value?.pause(), this._requestRedrawViewport();\n    }\n    handleFocus() {\n      for (let t of this._renderLayers) t.handleFocus(this._terminal);\n      this._cursorBlinkStateManager.value?.resume(), this._requestRedrawViewport();\n    }\n    handleViewportVisibilityChange(t) {\n      this._textBlinkStateManager.setViewportVisible(t);\n    }\n    handleSelectionChanged(t, r, n11) {\n      for (let a2 of this._renderLayers) a2.handleSelectionChanged(this._terminal, t, r, n11);\n      this._model.selection.update(this._core, t, r, n11), this._requestRedrawViewport();\n    }\n    handleCursorMove() {\n      for (let t of this._renderLayers) t.handleCursorMove(this._terminal);\n      this._cursorBlinkStateManager.value?.restartBlinkAnimation();\n    }\n    _handleOptionsChanged() {\n      this._updateDimensions(), this._refreshCharAtlas(), this._updateCursorBlink();\n    }\n    _initializeWebGLState() {\n      return this._rectangleRenderer.value = new he(this._terminal, this._gl, this.dimensions, this._themeService), this._glyphRenderer.value = new oe2(this._terminal, this._gl, this.dimensions, this._optionsService), this.handleCharSizeChanged(), [this._rectangleRenderer.value, this._glyphRenderer.value];\n    }\n    _refreshCharAtlas() {\n      if (this.dimensions.device.char.width <= 0 && this.dimensions.device.char.height <= 0) {\n        this._isAttached = false;\n        return;\n      }\n      let t = ee2(this._terminal, this._optionsService.rawOptions, this._themeService.colors, this.dimensions.device.cell.width, this.dimensions.device.cell.height, this.dimensions.device.char.width, this.dimensions.device.char.height, this._coreBrowserService.dpr, this._deviceMaxTextureSize, this._customGlyphs);\n      this._charAtlas !== t && (this._onChangeTextureAtlas.fire(t.pages[0].canvas), this._charAtlasDisposable.value = ke2(_0.forward(t.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas), _0.forward(t.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas))), this._charAtlas = t, this._charAtlas.warmUp(), this._glyphRenderer.value?.setAtlas(this._charAtlas);\n    }\n    _clearModel(t) {\n      this._model.clear(), t && this._glyphRenderer.value?.clear();\n    }\n    clearTextureAtlas() {\n      this._charAtlas?.clearTexture(), this._clearModel(true), this._requestRedrawViewport();\n    }\n    clear() {\n      this._clearModel(true);\n      for (let t of this._renderLayers) t.reset(this._terminal);\n      this._resetBlinkingRowState(), this._textBlinkStateManager.setNeedsBlinkInViewport(false), this._cursorBlinkStateManager.value?.restartBlinkAnimation(), this._updateCursorBlink();\n    }\n    renderRows(t, r) {\n      if (!this._isAttached) if (this._core.screenElement?.isConnected && this._charSizeService.width && this._charSizeService.height) this._updateDimensions(), this._refreshCharAtlas(), this._isAttached = true;\n      else return;\n      for (let n11 of this._renderLayers) n11.handleGridChanged(this._terminal, t, r);\n      !this._glyphRenderer.value || !this._rectangleRenderer.value || (this._glyphRenderer.value.beginFrame() ? (this._clearModel(true), this._updateModel(0, this._terminal.rows - 1)) : this._updateModel(t, r), this._rectangleRenderer.value.renderBackgrounds(), this._glyphRenderer.value.render(this._model), (!this._cursorBlinkStateManager.value || this._cursorBlinkStateManager.value.isCursorVisible) && this._rectangleRenderer.value.renderCursor());\n    }\n    _updateCursorBlink() {\n      this._coreService.decPrivateModes.cursorBlink ?? this._terminal.options.cursorBlink ? this._cursorBlinkStateManager.value = new te(() => {\n        this._requestRedrawCursor();\n      }, this._coreBrowserService) : this._cursorBlinkStateManager.clear(), this._requestRedrawCursor();\n    }\n    _updateModel(t, r) {\n      let n11 = this._core, a2 = this._workCell, s4, o2, l4, T4, h3, d3, _5 = 0, c2 = true, u3, p3, C4, Q3, m4, R4, F4, b4, A4;\n      t = Et(t, n11.rows - 1, 0), r = Et(r, n11.rows - 1, 0);\n      let X3 = this._coreService.decPrivateModes.cursorStyle ?? n11.options.cursorStyle ?? "block", z4 = this._terminal.buffer.active.baseY + this._terminal.buffer.active.cursorY, x0 = z4 - n11.buffer.ydisp, e0 = Math.min(this._terminal.buffer.active.cursorX, n11.cols - 1), T0 = -1, M4 = this._coreService.isCursorInitialized && !this._coreService.isCursorHidden && (!this._cursorBlinkStateManager.value || this._cursorBlinkStateManager.value.isCursorVisible);\n      this._model.cursor = void 0;\n      let l0 = false;\n      for (o2 = t; o2 <= r; o2++) {\n        l4 = o2 + n11.buffer.ydisp, T4 = n11.buffer.lines.get(l4);\n        let t0 = false;\n        for (this._model.lineLengths[o2] = 0, C4 = z4 === l4, _5 = 0, h3 = this._characterJoinerService.getJoinedCharacters(l4), b4 = 0; b4 < n11.cols; b4++) {\n          if (s4 = this._cellColorResolver.result.bg, T4.loadCell(b4, a2), b4 === 0 && (s4 = this._cellColorResolver.result.bg), d3 = false, c2 = b4 >= _5, u3 = b4, h3.length > 0 && b4 === h3[0][0] && c2) {\n            p3 = h3.shift();\n            let Y2 = this._model.selection.isCellSelected(this._terminal, p3[0], l4);\n            for (F4 = p3[0] + 1; F4 < p3[1]; F4++) c2 &&= Y2 === this._model.selection.isCellSelected(this._terminal, F4, l4);\n            c2 &&= !C4 || e0 < p3[0] || e0 >= p3[1], c2 ? (d3 = true, a2 = new De2(a2, T4.translateToString(true, p3[0], p3[1]), p3[1] - p3[0]), u3 = p3[1] - 1) : _5 = p3[1];\n          }\n          if (Q3 = a2.getChars(), m4 = a2.getCode(), F4 = (o2 * n11.cols + b4) * y0, !t0 && a2.isBlink() && (t0 = true), this._cellColorResolver.resolve(a2, b4, l4, this.dimensions.device.cell.width, this.dimensions.device.cell.height), M4 && l4 === z4 && (b4 === e0 && (this._model.cursor = { x: e0, y: x0, width: a2.getWidth(), style: this._coreBrowserService.isFocused ? X3 : n11.options.cursorInactiveStyle, cursorWidth: n11.options.cursorWidth, dpr: this._devicePixelRatio }, T0 = e0 + a2.getWidth() - 1), b4 >= e0 && b4 <= T0 && (this._coreBrowserService.isFocused && X3 === "block" || this._coreBrowserService.isFocused === false && n11.options.cursorInactiveStyle === "block") && (this._cellColorResolver.result.fg = 50331648 | this._themeService.colors.cursorAccent.rgba >> 8 & 16777215, this._cellColorResolver.result.bg = 50331648 | this._themeService.colors.cursor.rgba >> 8 & 16777215)), this._textBlinkStateManager.isEnabled && !this._textBlinkStateManager.isBlinkOn && a2.isBlink() && (this._cellColorResolver.result.fg |= 1073741824), m4 !== 0 && (this._model.lineLengths[o2] = b4 + 1), !(this._model.cells[F4] === m4 && this._model.cells[F4 + S0] === this._cellColorResolver.result.bg && this._model.cells[F4 + R0] === this._cellColorResolver.result.fg && this._model.cells[F4 + le] === this._cellColorResolver.result.ext) && (l0 = true, Q3.length > 1 && (m4 |= ct2), this._model.cells[F4] = m4, this._model.cells[F4 + S0] = this._cellColorResolver.result.bg, this._model.cells[F4 + R0] = this._cellColorResolver.result.fg, this._model.cells[F4 + le] = this._cellColorResolver.result.ext, R4 = a2.getWidth(), this._glyphRenderer.value.updateCell(b4, o2, m4, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext, Q3, R4, s4), d3)) {\n            for (a2 = this._workCell, b4++; b4 <= u3; b4++) A4 = (o2 * n11.cols + b4) * y0, this._glyphRenderer.value.updateCell(b4, o2, 0, 0, 0, 0, "", 0, 0), this._model.cells[A4] = 0, this._model.cells[A4 + S0] = this._cellColorResolver.result.bg, this._model.cells[A4 + R0] = this._cellColorResolver.result.fg, this._model.cells[A4 + le] = this._cellColorResolver.result.ext;\n            b4--;\n          }\n        }\n        this._setRowBlinkState(o2, t0);\n      }\n      l0 && this._rectangleRenderer.value.updateBackgrounds(this._model), this._rectangleRenderer.value.updateCursor(this._model), this._updateTextBlinkState();\n    }\n    _resetBlinkingRowState() {\n      this._rowHasBlinkingCells = new Array(this._terminal.rows).fill(false), this._rowHasBlinkingCellsCount = 0;\n    }\n    _setRowBlinkState(t, r) {\n      this._rowHasBlinkingCells[t] !== r && (this._rowHasBlinkingCells[t] = r, this._rowHasBlinkingCellsCount += r ? 1 : -1);\n    }\n    _updateTextBlinkState() {\n      this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount > 0);\n    }\n    _updateDimensions() {\n      !this._charSizeService.width || !this._charSizeService.height || (this.dimensions.device.char.width = Math.floor(this._charSizeService.width * this._devicePixelRatio), this.dimensions.device.char.height = Math.ceil(this._charSizeService.height * this._devicePixelRatio), this.dimensions.device.cell.height = Math.floor(this.dimensions.device.char.height * this._optionsService.rawOptions.lineHeight), this.dimensions.device.char.top = this._optionsService.rawOptions.lineHeight === 1 ? 0 : Math.round((this.dimensions.device.cell.height - this.dimensions.device.char.height) / 2), this.dimensions.device.cell.width = this.dimensions.device.char.width + Math.round(this._optionsService.rawOptions.letterSpacing), this.dimensions.device.char.left = Math.floor(this._optionsService.rawOptions.letterSpacing / 2), this.dimensions.device.canvas.height = this._terminal.rows * this.dimensions.device.cell.height, this.dimensions.device.canvas.width = this._terminal.cols * this.dimensions.device.cell.width, this.dimensions.css.canvas.height = Math.round(this.dimensions.device.canvas.height / this._devicePixelRatio), this.dimensions.css.canvas.width = Math.round(this.dimensions.device.canvas.width / this._devicePixelRatio), this.dimensions.css.cell.height = this.dimensions.device.cell.height / this._devicePixelRatio, this.dimensions.css.cell.width = this.dimensions.device.cell.width / this._devicePixelRatio);\n    }\n    _setCanvasDevicePixelDimensions(t, r) {\n      this._canvas.width === t && this._canvas.height === r || (this._canvas.width = t, this._canvas.height = r, this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1, sync: true }));\n    }\n    _requestRedrawViewport() {\n      this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1 });\n    }\n    _requestRedrawCursor() {\n      let t = this._terminal.buffer.active.cursorY;\n      this._onRequestRedraw.fire({ start: t, end: t });\n    }\n  };\n  var De2 = class extends s0 {\n    constructor(t, r, n11) {\n      super();\n      this.content = 0;\n      this.combinedData = "";\n      this.fg = t.fg, this.bg = t.bg, this.combinedData = r, this._width = n11;\n    }\n    isCombined() {\n      return 2097152;\n    }\n    getWidth() {\n      return this._width;\n    }\n    getChars() {\n      return this.combinedData;\n    }\n    getCode() {\n      return 2097151;\n    }\n    setFromCharData(t) {\n      throw new Error("not implemented");\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n  };\n  function Et(i5, e, t = 0) {\n    return Math.max(Math.min(i5, e), t);\n  }\n  var bt2 = class extends W3 {\n    constructor(t) {\n      if (fe && Ve() < 16) {\n        let r = { antialias: false, depth: false, preserveDrawingBuffer: true };\n        if (!document.createElement("canvas").getContext("webgl2", r)) throw new Error("Webgl2 is only supported on Safari 16 and above");\n      }\n      super();\n      this._onChangeTextureAtlas = this._register(new U4());\n      this.onChangeTextureAtlas = this._onChangeTextureAtlas.event;\n      this._onAddTextureAtlasCanvas = this._register(new U4());\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = this._register(new U4());\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._onContextLoss = this._register(new U4());\n      this.onContextLoss = this._onContextLoss.event;\n      this._customGlyphs = t?.customGlyphs ?? true, this._preserveDrawingBuffer = t?.preserveDrawingBuffer;\n    }\n    activate(t) {\n      let r = t._core;\n      if (!t.element) {\n        this._register(r.onWillOpen(() => this.activate(t)));\n        return;\n      }\n      this._terminal = t;\n      let n11 = r.coreService, a2 = r.optionsService, s4 = r, o2 = s4._renderService, l4 = s4._characterJoinerService, T4 = s4._charSizeService, h3 = s4._coreBrowserService, d3 = s4._decorationService, _5 = s4._themeService;\n      this._renderer = this._register(new ue(t, l4, T4, h3, n11, d3, a2, _5, this._customGlyphs, this._preserveDrawingBuffer)), this._register(_0.forward(this._renderer.onContextLoss, this._onContextLoss)), this._register(_0.forward(this._renderer.onChangeTextureAtlas, this._onChangeTextureAtlas)), this._register(_0.forward(this._renderer.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas)), this._register(_0.forward(this._renderer.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas)), o2.setRenderer(this._renderer), this._register(g4(() => {\n        if (this._terminal._core._store._isDisposed) return;\n        let c2 = this._terminal._core._renderService;\n        c2.setRenderer(this._terminal._core._createRenderer()), c2.handleResize(t.cols, t.rows);\n      }));\n    }\n    get textureAtlas() {\n      return this._renderer?.textureAtlas;\n    }\n    clearTextureAtlas() {\n      this._renderer?.clearTextureAtlas();\n    }\n  };\n\n  // node_modules/@xterm/addon-ligatures/lib/addon-ligatures.mjs\n  var Po = Object.create;\n  var _n = Object.defineProperty;\n  var Go = Object.getOwnPropertyDescriptor;\n  var No = Object.getOwnPropertyNames;\n  var Ho = Object.getPrototypeOf;\n  var _o = Object.prototype.hasOwnProperty;\n  var tt2 = ((s4) => typeof __require < "u" ? __require : typeof Proxy < "u" ? new Proxy(s4, { get: (f5, p3) => (typeof __require < "u" ? __require : f5)[p3] }) : s4)(function(s4) {\n    if (typeof __require < "u") return __require.apply(this, arguments);\n    throw Error(\'Dynamic require of "\' + s4 + \'" is not supported\');\n  });\n  var Ur = (s4, f5) => () => (f5 || s4((f5 = { exports: {} }).exports, f5), f5.exports);\n  var zo = (s4, f5, p3, h3) => {\n    if (f5 && typeof f5 == "object" || typeof f5 == "function") for (let v6 of No(f5)) !_o.call(s4, v6) && v6 !== p3 && _n(s4, v6, { get: () => f5[v6], enumerable: !(h3 = Go(f5, v6)) || h3.enumerable });\n    return s4;\n  };\n  var Wo = (s4, f5, p3) => (p3 = s4 != null ? Po(Ho(s4)) : {}, zo(f5 || !s4 || !s4.__esModule ? _n(p3, "default", { value: s4, enumerable: true }) : p3, s4));\n  var Wn = Ur((Or, zn2) => {\n    (function(s4, f5) {\n      typeof Or == "object" && typeof zn2 < "u" ? f5(Or) : typeof define == "function" && define.amd ? define(["exports"], f5) : f5(s4.opentype = s4.opentype || {});\n    })(Or, (function(s4) {\n      "use strict";\n      var f5 = 0, p3 = -3;\n      function h3() {\n        this.table = new Uint16Array(16), this.trans = new Uint16Array(288);\n      }\n      function v6(e, r) {\n        this.source = e, this.sourceIndex = 0, this.tag = 0, this.bitcount = 0, this.dest = r, this.destLen = 0, this.ltree = new h3(), this.dtree = new h3();\n      }\n      var x5 = new h3(), S4 = new h3(), L6 = new Uint8Array(30), k5 = new Uint16Array(30), D7 = new Uint8Array(30), V5 = new Uint16Array(30), N3 = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]), W6 = new h3(), X3 = new Uint8Array(320);\n      function ve3(e, r, t, n11) {\n        var a2, i5;\n        for (a2 = 0; a2 < t; ++a2) e[a2] = 0;\n        for (a2 = 0; a2 < 30 - t; ++a2) e[a2 + t] = a2 / t | 0;\n        for (i5 = n11, a2 = 0; a2 < 30; ++a2) r[a2] = i5, i5 += 1 << e[a2];\n      }\n      function Ae3(e, r) {\n        var t;\n        for (t = 0; t < 7; ++t) e.table[t] = 0;\n        for (e.table[7] = 24, e.table[8] = 152, e.table[9] = 112, t = 0; t < 24; ++t) e.trans[t] = 256 + t;\n        for (t = 0; t < 144; ++t) e.trans[24 + t] = t;\n        for (t = 0; t < 8; ++t) e.trans[168 + t] = 280 + t;\n        for (t = 0; t < 112; ++t) e.trans[176 + t] = 144 + t;\n        for (t = 0; t < 5; ++t) r.table[t] = 0;\n        for (r.table[5] = 32, t = 0; t < 32; ++t) r.trans[t] = t;\n      }\n      var xt4 = new Uint16Array(16);\n      function Dr2(e, r, t, n11) {\n        var a2, i5;\n        for (a2 = 0; a2 < 16; ++a2) e.table[a2] = 0;\n        for (a2 = 0; a2 < n11; ++a2) e.table[r[t + a2]]++;\n        for (e.table[0] = 0, i5 = 0, a2 = 0; a2 < 16; ++a2) xt4[a2] = i5, i5 += e.table[a2];\n        for (a2 = 0; a2 < n11; ++a2) r[t + a2] && (e.trans[xt4[r[t + a2]]++] = a2);\n      }\n      function oa(e) {\n        e.bitcount-- || (e.tag = e.source[e.sourceIndex++], e.bitcount = 7);\n        var r = e.tag & 1;\n        return e.tag >>>= 1, r;\n      }\n      function Se3(e, r, t) {\n        if (!r) return t;\n        for (; e.bitcount < 24; ) e.tag |= e.source[e.sourceIndex++] << e.bitcount, e.bitcount += 8;\n        var n11 = e.tag & 65535 >>> 16 - r;\n        return e.tag >>>= r, e.bitcount -= r, n11 + t;\n      }\n      function Ar(e, r) {\n        for (; e.bitcount < 24; ) e.tag |= e.source[e.sourceIndex++] << e.bitcount, e.bitcount += 8;\n        var t = 0, n11 = 0, a2 = 0, i5 = e.tag;\n        do\n          n11 = 2 * n11 + (i5 & 1), i5 >>>= 1, ++a2, t += r.table[a2], n11 -= r.table[a2];\n        while (n11 >= 0);\n        return e.tag = i5, e.bitcount -= a2, r.trans[t + n11];\n      }\n      function ua(e, r, t) {\n        var n11, a2, i5, o2, l4, u3;\n        for (n11 = Se3(e, 5, 257), a2 = Se3(e, 5, 1), i5 = Se3(e, 4, 4), o2 = 0; o2 < 19; ++o2) X3[o2] = 0;\n        for (o2 = 0; o2 < i5; ++o2) {\n          var c2 = Se3(e, 3, 0);\n          X3[N3[o2]] = c2;\n        }\n        for (Dr2(W6, X3, 0, 19), l4 = 0; l4 < n11 + a2; ) {\n          var d3 = Ar(e, W6);\n          switch (d3) {\n            case 16:\n              var y5 = X3[l4 - 1];\n              for (u3 = Se3(e, 2, 3); u3; --u3) X3[l4++] = y5;\n              break;\n            case 17:\n              for (u3 = Se3(e, 3, 3); u3; --u3) X3[l4++] = 0;\n              break;\n            case 18:\n              for (u3 = Se3(e, 7, 11); u3; --u3) X3[l4++] = 0;\n              break;\n            default:\n              X3[l4++] = d3;\n              break;\n          }\n        }\n        Dr2(r, X3, 0, n11), Dr2(t, X3, n11, a2);\n      }\n      function St3(e, r, t) {\n        for (; ; ) {\n          var n11 = Ar(e, r);\n          if (n11 === 256) return f5;\n          if (n11 < 256) e.dest[e.destLen++] = n11;\n          else {\n            var a2, i5, o2, l4;\n            for (n11 -= 257, a2 = Se3(e, L6[n11], k5[n11]), i5 = Ar(e, t), o2 = e.destLen - Se3(e, D7[i5], V5[i5]), l4 = o2; l4 < o2 + a2; ++l4) e.dest[e.destLen++] = e.dest[l4];\n          }\n        }\n      }\n      function la(e) {\n        for (var r, t, n11; e.bitcount > 8; ) e.sourceIndex--, e.bitcount -= 8;\n        if (r = e.source[e.sourceIndex + 1], r = 256 * r + e.source[e.sourceIndex], t = e.source[e.sourceIndex + 3], t = 256 * t + e.source[e.sourceIndex + 2], r !== (~t & 65535)) return p3;\n        for (e.sourceIndex += 4, n11 = r; n11; --n11) e.dest[e.destLen++] = e.source[e.sourceIndex++];\n        return e.bitcount = 0, f5;\n      }\n      function fa(e, r) {\n        var t = new v6(e, r), n11, a2, i5;\n        do {\n          switch (n11 = oa(t), a2 = Se3(t, 2, 0), a2) {\n            case 0:\n              i5 = la(t);\n              break;\n            case 1:\n              i5 = St3(t, x5, S4);\n              break;\n            case 2:\n              ua(t, t.ltree, t.dtree), i5 = St3(t, t.ltree, t.dtree);\n              break;\n            default:\n              i5 = p3;\n          }\n          if (i5 !== f5) throw new Error("Data error");\n        } while (!n11);\n        return t.destLen < t.dest.length ? typeof t.dest.slice == "function" ? t.dest.slice(0, t.destLen) : t.dest.subarray(0, t.destLen) : t.dest;\n      }\n      Ae3(x5, S4), ve3(L6, k5, 4, 3), ve3(D7, V5, 2, 1), L6[28] = 0, k5[28] = 258;\n      var pa = fa;\n      function We4(e, r, t, n11, a2) {\n        return Math.pow(1 - a2, 3) * e + 3 * Math.pow(1 - a2, 2) * a2 * r + 3 * (1 - a2) * Math.pow(a2, 2) * t + Math.pow(a2, 3) * n11;\n      }\n      function ke3() {\n        this.x1 = Number.NaN, this.y1 = Number.NaN, this.x2 = Number.NaN, this.y2 = Number.NaN;\n      }\n      ke3.prototype.isEmpty = function() {\n        return isNaN(this.x1) || isNaN(this.y1) || isNaN(this.x2) || isNaN(this.y2);\n      }, ke3.prototype.addPoint = function(e, r) {\n        typeof e == "number" && ((isNaN(this.x1) || isNaN(this.x2)) && (this.x1 = e, this.x2 = e), e < this.x1 && (this.x1 = e), e > this.x2 && (this.x2 = e)), typeof r == "number" && ((isNaN(this.y1) || isNaN(this.y2)) && (this.y1 = r, this.y2 = r), r < this.y1 && (this.y1 = r), r > this.y2 && (this.y2 = r));\n      }, ke3.prototype.addX = function(e) {\n        this.addPoint(e, null);\n      }, ke3.prototype.addY = function(e) {\n        this.addPoint(null, e);\n      }, ke3.prototype.addBezier = function(e, r, t, n11, a2, i5, o2, l4) {\n        var u3 = this, c2 = [e, r], d3 = [t, n11], y5 = [a2, i5], g6 = [o2, l4];\n        this.addPoint(e, r), this.addPoint(o2, l4);\n        for (var m4 = 0; m4 <= 1; m4++) {\n          var T4 = 6 * c2[m4] - 12 * d3[m4] + 6 * y5[m4], O4 = -3 * c2[m4] + 9 * d3[m4] - 9 * y5[m4] + 3 * g6[m4], F4 = 3 * d3[m4] - 3 * c2[m4];\n          if (O4 === 0) {\n            if (T4 === 0) continue;\n            var U6 = -F4 / T4;\n            0 < U6 && U6 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], U6)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], U6)));\n            continue;\n          }\n          var P5 = Math.pow(T4, 2) - 4 * F4 * O4;\n          if (!(P5 < 0)) {\n            var I4 = (-T4 + Math.sqrt(P5)) / (2 * O4);\n            0 < I4 && I4 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], I4)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], I4)));\n            var H5 = (-T4 - Math.sqrt(P5)) / (2 * O4);\n            0 < H5 && H5 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], H5)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], H5)));\n          }\n        }\n      }, ke3.prototype.addQuad = function(e, r, t, n11, a2, i5) {\n        var o2 = e + 0.6666666666666666 * (t - e), l4 = r + 2 / 3 * (n11 - r), u3 = o2 + 1 / 3 * (a2 - e), c2 = l4 + 1 / 3 * (i5 - r);\n        this.addBezier(e, r, o2, l4, u3, c2, a2, i5);\n      };\n      function Z5() {\n        this.commands = [], this.fill = "black", this.stroke = null, this.strokeWidth = 1;\n      }\n      Z5.prototype.moveTo = function(e, r) {\n        this.commands.push({ type: "M", x: e, y: r });\n      }, Z5.prototype.lineTo = function(e, r) {\n        this.commands.push({ type: "L", x: e, y: r });\n      }, Z5.prototype.curveTo = Z5.prototype.bezierCurveTo = function(e, r, t, n11, a2, i5) {\n        this.commands.push({ type: "C", x1: e, y1: r, x2: t, y2: n11, x: a2, y: i5 });\n      }, Z5.prototype.quadTo = Z5.prototype.quadraticCurveTo = function(e, r, t, n11) {\n        this.commands.push({ type: "Q", x1: e, y1: r, x: t, y: n11 });\n      }, Z5.prototype.close = Z5.prototype.closePath = function() {\n        this.commands.push({ type: "Z" });\n      }, Z5.prototype.extend = function(e) {\n        if (e.commands) e = e.commands;\n        else if (e instanceof ke3) {\n          var r = e;\n          this.moveTo(r.x1, r.y1), this.lineTo(r.x2, r.y1), this.lineTo(r.x2, r.y2), this.lineTo(r.x1, r.y2), this.close();\n          return;\n        }\n        Array.prototype.push.apply(this.commands, e);\n      }, Z5.prototype.getBoundingBox = function() {\n        for (var e = this, r = new ke3(), t = 0, n11 = 0, a2 = 0, i5 = 0, o2 = 0; o2 < this.commands.length; o2++) {\n          var l4 = e.commands[o2];\n          switch (l4.type) {\n            case "M":\n              r.addPoint(l4.x, l4.y), t = a2 = l4.x, n11 = i5 = l4.y;\n              break;\n            case "L":\n              r.addPoint(l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "Q":\n              r.addQuad(a2, i5, l4.x1, l4.y1, l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "C":\n              r.addBezier(a2, i5, l4.x1, l4.y1, l4.x2, l4.y2, l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "Z":\n              a2 = t, i5 = n11;\n              break;\n            default:\n              throw new Error("Unexpected path command " + l4.type);\n          }\n        }\n        return r.isEmpty() && r.addPoint(0, 0), r;\n      }, Z5.prototype.draw = function(e) {\n        var r = this;\n        e.beginPath();\n        for (var t = 0; t < this.commands.length; t += 1) {\n          var n11 = r.commands[t];\n          n11.type === "M" ? e.moveTo(n11.x, n11.y) : n11.type === "L" ? e.lineTo(n11.x, n11.y) : n11.type === "C" ? e.bezierCurveTo(n11.x1, n11.y1, n11.x2, n11.y2, n11.x, n11.y) : n11.type === "Q" ? e.quadraticCurveTo(n11.x1, n11.y1, n11.x, n11.y) : n11.type === "Z" && e.closePath();\n        }\n        this.fill && (e.fillStyle = this.fill, e.fill()), this.stroke && (e.strokeStyle = this.stroke, e.lineWidth = this.strokeWidth, e.stroke());\n      }, Z5.prototype.toPathData = function(e) {\n        var r = this;\n        e = e !== void 0 ? e : 2;\n        function t(l4) {\n          return Math.round(l4) === l4 ? "" + Math.round(l4) : l4.toFixed(e);\n        }\n        function n11() {\n          for (var l4 = arguments, u3 = "", c2 = 0; c2 < arguments.length; c2 += 1) {\n            var d3 = l4[c2];\n            d3 >= 0 && c2 > 0 && (u3 += " "), u3 += t(d3);\n          }\n          return u3;\n        }\n        for (var a2 = "", i5 = 0; i5 < this.commands.length; i5 += 1) {\n          var o2 = r.commands[i5];\n          o2.type === "M" ? a2 += "M" + n11(o2.x, o2.y) : o2.type === "L" ? a2 += "L" + n11(o2.x, o2.y) : o2.type === "C" ? a2 += "C" + n11(o2.x1, o2.y1, o2.x2, o2.y2, o2.x, o2.y) : o2.type === "Q" ? a2 += "Q" + n11(o2.x1, o2.y1, o2.x, o2.y) : o2.type === "Z" && (a2 += "Z");\n        }\n        return a2;\n      }, Z5.prototype.toSVG = function(e) {\n        var r = \'<path d="\';\n        return r += this.toPathData(e), r += \'"\', this.fill && this.fill !== "black" && (this.fill === null ? r += \' fill="none"\' : r += \' fill="\' + this.fill + \'"\'), this.stroke && (r += \' stroke="\' + this.stroke + \'" stroke-width="\' + this.strokeWidth + \'"\'), r += "/>", r;\n      }, Z5.prototype.toDOMElement = function(e) {\n        var r = this.toPathData(e), t = document.createElementNS("http://www.w3.org/2000/svg", "path");\n        return t.setAttribute("d", r), t;\n      };\n      function Tt4(e) {\n        throw new Error(e);\n      }\n      function kt2(e, r) {\n        e || Tt4(r);\n      }\n      var G5 = { fail: Tt4, argument: kt2, assert: kt2 }, Ft = 32768, Lt3 = 2147483648, Ve3 = {}, E5 = {}, M4 = {};\n      function ge2(e) {\n        return function() {\n          return e;\n        };\n      }\n      E5.BYTE = function(e) {\n        return G5.argument(e >= 0 && e <= 255, "Byte value should be between 0 and 255."), [e];\n      }, M4.BYTE = ge2(1), E5.CHAR = function(e) {\n        return [e.charCodeAt(0)];\n      }, M4.CHAR = ge2(1), E5.CHARARRAY = function(e) {\n        for (var r = [], t = 0; t < e.length; t += 1) r[t] = e.charCodeAt(t);\n        return r;\n      }, M4.CHARARRAY = function(e) {\n        return e.length;\n      }, E5.USHORT = function(e) {\n        return [e >> 8 & 255, e & 255];\n      }, M4.USHORT = ge2(2), E5.SHORT = function(e) {\n        return e >= Ft && (e = -(2 * Ft - e)), [e >> 8 & 255, e & 255];\n      }, M4.SHORT = ge2(2), E5.UINT24 = function(e) {\n        return [e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.UINT24 = ge2(3), E5.ULONG = function(e) {\n        return [e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.ULONG = ge2(4), E5.LONG = function(e) {\n        return e >= Lt3 && (e = -(2 * Lt3 - e)), [e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.LONG = ge2(4), E5.FIXED = E5.ULONG, M4.FIXED = M4.ULONG, E5.FWORD = E5.SHORT, M4.FWORD = M4.SHORT, E5.UFWORD = E5.USHORT, M4.UFWORD = M4.USHORT, E5.LONGDATETIME = function(e) {\n        return [0, 0, 0, 0, e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.LONGDATETIME = ge2(8), E5.TAG = function(e) {\n        return G5.argument(e.length === 4, "Tag should be exactly 4 ASCII characters."), [e.charCodeAt(0), e.charCodeAt(1), e.charCodeAt(2), e.charCodeAt(3)];\n      }, M4.TAG = ge2(4), E5.Card8 = E5.BYTE, M4.Card8 = M4.BYTE, E5.Card16 = E5.USHORT, M4.Card16 = M4.USHORT, E5.OffSize = E5.BYTE, M4.OffSize = M4.BYTE, E5.SID = E5.USHORT, M4.SID = M4.USHORT, E5.NUMBER = function(e) {\n        return e >= -107 && e <= 107 ? [e + 139] : e >= 108 && e <= 1131 ? (e = e - 108, [(e >> 8) + 247, e & 255]) : e >= -1131 && e <= -108 ? (e = -e - 108, [(e >> 8) + 251, e & 255]) : e >= -32768 && e <= 32767 ? E5.NUMBER16(e) : E5.NUMBER32(e);\n      }, M4.NUMBER = function(e) {\n        return E5.NUMBER(e).length;\n      }, E5.NUMBER16 = function(e) {\n        return [28, e >> 8 & 255, e & 255];\n      }, M4.NUMBER16 = ge2(3), E5.NUMBER32 = function(e) {\n        return [29, e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.NUMBER32 = ge2(5), E5.REAL = function(e) {\n        var r = e.toString(), t = /\\.(\\d*?)(?:9{5,20}|0{5,20})\\d{0,2}(?:e(.+)|$)/.exec(r);\n        if (t) {\n          var n11 = parseFloat("1e" + ((t[2] ? +t[2] : 0) + t[1].length));\n          r = (Math.round(e * n11) / n11).toString();\n        }\n        for (var a2 = "", i5 = 0, o2 = r.length; i5 < o2; i5 += 1) {\n          var l4 = r[i5];\n          l4 === "e" ? a2 += r[++i5] === "-" ? "c" : "b" : l4 === "." ? a2 += "a" : l4 === "-" ? a2 += "e" : a2 += l4;\n        }\n        a2 += a2.length & 1 ? "f" : "ff";\n        for (var u3 = [30], c2 = 0, d3 = a2.length; c2 < d3; c2 += 2) u3.push(parseInt(a2.substr(c2, 2), 16));\n        return u3;\n      }, M4.REAL = function(e) {\n        return E5.REAL(e).length;\n      }, E5.NAME = E5.CHARARRAY, M4.NAME = M4.CHARARRAY, E5.STRING = E5.CHARARRAY, M4.STRING = M4.CHARARRAY, Ve3.UTF8 = function(e, r, t) {\n        for (var n11 = [], a2 = t, i5 = 0; i5 < a2; i5++, r += 1) n11[i5] = e.getUint8(r);\n        return String.fromCharCode.apply(null, n11);\n      }, Ve3.UTF16 = function(e, r, t) {\n        for (var n11 = [], a2 = t / 2, i5 = 0; i5 < a2; i5++, r += 2) n11[i5] = e.getUint16(r);\n        return String.fromCharCode.apply(null, n11);\n      }, E5.UTF16 = function(e) {\n        for (var r = [], t = 0; t < e.length; t += 1) {\n          var n11 = e.charCodeAt(t);\n          r[r.length] = n11 >> 8 & 255, r[r.length] = n11 & 255;\n        }\n        return r;\n      }, M4.UTF16 = function(e) {\n        return e.length * 2;\n      };\n      var Mr = { "x-mac-croatian": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\u0160\\u2122\\xB4\\xA8\\u2260\\u017D\\xD8\\u221E\\xB1\\u2264\\u2265\\u2206\\xB5\\u2202\\u2211\\u220F\\u0161\\u222B\\xAA\\xBA\\u03A9\\u017E\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u0106\\xAB\\u010C\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u0110\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\uF8FF\\xA9\\u2044\\u20AC\\u2039\\u203A\\xC6\\xBB\\u2013\\xB7\\u201A\\u201E\\u2030\\xC2\\u0107\\xC1\\u010D\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\u0111\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u03C0\\xCB\\u02DA\\xB8\\xCA\\xE6\\u02C7", "x-mac-cyrillic": "\\u0410\\u0411\\u0412\\u0413\\u0414\\u0415\\u0416\\u0417\\u0418\\u0419\\u041A\\u041B\\u041C\\u041D\\u041E\\u041F\\u0420\\u0421\\u0422\\u0423\\u0424\\u0425\\u0426\\u0427\\u0428\\u0429\\u042A\\u042B\\u042C\\u042D\\u042E\\u042F\\u2020\\xB0\\u0490\\xA3\\xA7\\u2022\\xB6\\u0406\\xAE\\xA9\\u2122\\u0402\\u0452\\u2260\\u0403\\u0453\\u221E\\xB1\\u2264\\u2265\\u0456\\xB5\\u0491\\u0408\\u0404\\u0454\\u0407\\u0457\\u0409\\u0459\\u040A\\u045A\\u0458\\u0405\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\u040B\\u045B\\u040C\\u045C\\u0455\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u201E\\u040E\\u045E\\u040F\\u045F\\u2116\\u0401\\u0451\\u044F\\u0430\\u0431\\u0432\\u0433\\u0434\\u0435\\u0436\\u0437\\u0438\\u0439\\u043A\\u043B\\u043C\\u043D\\u043E\\u043F\\u0440\\u0441\\u0442\\u0443\\u0444\\u0445\\u0446\\u0447\\u0448\\u0449\\u044A\\u044B\\u044C\\u044D\\u044E", "x-mac-gaelic": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u1E02\\xB1\\u2264\\u2265\\u1E03\\u010A\\u010B\\u1E0A\\u1E0B\\u1E1E\\u1E1F\\u0120\\u0121\\u1E40\\xE6\\xF8\\u1E41\\u1E56\\u1E57\\u027C\\u0192\\u017F\\u1E60\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\u1E61\\u1E9B\\xFF\\u0178\\u1E6A\\u20AC\\u2039\\u203A\\u0176\\u0177\\u1E6B\\xB7\\u1EF2\\u1EF3\\u204A\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\u2663\\xD2\\xDA\\xDB\\xD9\\u0131\\xDD\\xFD\\u0174\\u0175\\u1E84\\u1E85\\u1E80\\u1E81\\u1E82\\u1E83", "x-mac-greek": "\\xC4\\xB9\\xB2\\xC9\\xB3\\xD6\\xDC\\u0385\\xE0\\xE2\\xE4\\u0384\\xA8\\xE7\\xE9\\xE8\\xEA\\xEB\\xA3\\u2122\\xEE\\xEF\\u2022\\xBD\\u2030\\xF4\\xF6\\xA6\\u20AC\\xF9\\xFB\\xFC\\u2020\\u0393\\u0394\\u0398\\u039B\\u039E\\u03A0\\xDF\\xAE\\xA9\\u03A3\\u03AA\\xA7\\u2260\\xB0\\xB7\\u0391\\xB1\\u2264\\u2265\\xA5\\u0392\\u0395\\u0396\\u0397\\u0399\\u039A\\u039C\\u03A6\\u03AB\\u03A8\\u03A9\\u03AC\\u039D\\xAC\\u039F\\u03A1\\u2248\\u03A4\\xAB\\xBB\\u2026\\xA0\\u03A5\\u03A7\\u0386\\u0388\\u0153\\u2013\\u2015\\u201C\\u201D\\u2018\\u2019\\xF7\\u0389\\u038A\\u038C\\u038E\\u03AD\\u03AE\\u03AF\\u03CC\\u038F\\u03CD\\u03B1\\u03B2\\u03C8\\u03B4\\u03B5\\u03C6\\u03B3\\u03B7\\u03B9\\u03BE\\u03BA\\u03BB\\u03BC\\u03BD\\u03BF\\u03C0\\u03CE\\u03C1\\u03C3\\u03C4\\u03B8\\u03C9\\u03C2\\u03C7\\u03C5\\u03B6\\u03CA\\u03CB\\u0390\\u03B0\\xAD", "x-mac-icelandic": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\xDD\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\xD0\\xF0\\xDE\\xFE\\xFD\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-inuit": "\\u1403\\u1404\\u1405\\u1406\\u140A\\u140B\\u1431\\u1432\\u1433\\u1434\\u1438\\u1439\\u1449\\u144E\\u144F\\u1450\\u1451\\u1455\\u1456\\u1466\\u146D\\u146E\\u146F\\u1470\\u1472\\u1473\\u1483\\u148B\\u148C\\u148D\\u148E\\u1490\\u1491\\xB0\\u14A1\\u14A5\\u14A6\\u2022\\xB6\\u14A7\\xAE\\xA9\\u2122\\u14A8\\u14AA\\u14AB\\u14BB\\u14C2\\u14C3\\u14C4\\u14C5\\u14C7\\u14C8\\u14D0\\u14EF\\u14F0\\u14F1\\u14F2\\u14F4\\u14F5\\u1505\\u14D5\\u14D6\\u14D7\\u14D8\\u14DA\\u14DB\\u14EA\\u1528\\u1529\\u152A\\u152B\\u152D\\u2026\\xA0\\u152E\\u153E\\u1555\\u1556\\u1557\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\u1558\\u1559\\u155A\\u155D\\u1546\\u1547\\u1548\\u1549\\u154B\\u154C\\u1550\\u157F\\u1580\\u1581\\u1582\\u1583\\u1584\\u1585\\u158F\\u1590\\u1591\\u1592\\u1593\\u1594\\u1595\\u1671\\u1672\\u1673\\u1674\\u1675\\u1676\\u1596\\u15A0\\u15A1\\u15A2\\u15A3\\u15A4\\u15A5\\u15A6\\u157C\\u0141\\u0142", "x-mac-ce": "\\xC4\\u0100\\u0101\\xC9\\u0104\\xD6\\xDC\\xE1\\u0105\\u010C\\xE4\\u010D\\u0106\\u0107\\xE9\\u0179\\u017A\\u010E\\xED\\u010F\\u0112\\u0113\\u0116\\xF3\\u0117\\xF4\\xF6\\xF5\\xFA\\u011A\\u011B\\xFC\\u2020\\xB0\\u0118\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\u0119\\xA8\\u2260\\u0123\\u012E\\u012F\\u012A\\u2264\\u2265\\u012B\\u0136\\u2202\\u2211\\u0142\\u013B\\u013C\\u013D\\u013E\\u0139\\u013A\\u0145\\u0146\\u0143\\xAC\\u221A\\u0144\\u0147\\u2206\\xAB\\xBB\\u2026\\xA0\\u0148\\u0150\\xD5\\u0151\\u014C\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\u014D\\u0154\\u0155\\u0158\\u2039\\u203A\\u0159\\u0156\\u0157\\u0160\\u201A\\u201E\\u0161\\u015A\\u015B\\xC1\\u0164\\u0165\\xCD\\u017D\\u017E\\u016A\\xD3\\xD4\\u016B\\u016E\\xDA\\u016F\\u0170\\u0171\\u0172\\u0173\\xDD\\xFD\\u0137\\u017B\\u0141\\u017C\\u0122\\u02C7", macintosh: "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\u2039\\u203A\\uFB01\\uFB02\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-romanian": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\u0102\\u0218\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\u0103\\u0219\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\u2039\\u203A\\u021A\\u021B\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-turkish": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u011E\\u011F\\u0130\\u0131\\u015E\\u015F\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\uF8A0\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7" };\n      Ve3.MACSTRING = function(e, r, t, n11) {\n        var a2 = Mr[n11];\n        if (a2 !== void 0) {\n          for (var i5 = "", o2 = 0; o2 < t; o2++) {\n            var l4 = e.getUint8(r + o2);\n            l4 <= 127 ? i5 += String.fromCharCode(l4) : i5 += a2[l4 & 127];\n          }\n          return i5;\n        }\n      };\n      var fr3 = typeof WeakMap == "function" && /* @__PURE__ */ new WeakMap(), pr2, ha = function(e) {\n        if (!pr2) {\n          pr2 = {};\n          for (var r in Mr) pr2[r] = new String(r);\n        }\n        var t = pr2[e];\n        if (t !== void 0) {\n          if (fr3) {\n            var n11 = fr3.get(t);\n            if (n11 !== void 0) return n11;\n          }\n          var a2 = Mr[e];\n          if (a2 !== void 0) {\n            for (var i5 = {}, o2 = 0; o2 < a2.length; o2++) i5[a2.charCodeAt(o2)] = o2 + 128;\n            return fr3 && fr3.set(t, i5), i5;\n          }\n        }\n      };\n      E5.MACSTRING = function(e, r) {\n        var t = ha(r);\n        if (t !== void 0) {\n          for (var n11 = [], a2 = 0; a2 < e.length; a2++) {\n            var i5 = e.charCodeAt(a2);\n            if (i5 >= 128 && (i5 = t[i5], i5 === void 0)) return;\n            n11[a2] = i5;\n          }\n          return n11;\n        }\n      }, M4.MACSTRING = function(e, r) {\n        var t = E5.MACSTRING(e, r);\n        return t !== void 0 ? t.length : 0;\n      };\n      function Br(e) {\n        return e >= -128 && e <= 127;\n      }\n      function ca(e, r, t) {\n        for (var n11 = 0, a2 = e.length; r < a2 && n11 < 64 && e[r] === 0; ) ++r, ++n11;\n        return t.push(128 | n11 - 1), r;\n      }\n      function va(e, r, t) {\n        for (var n11 = 0, a2 = e.length, i5 = r; i5 < a2 && n11 < 64; ) {\n          var o2 = e[i5];\n          if (!Br(o2) || o2 === 0 && i5 + 1 < a2 && e[i5 + 1] === 0) break;\n          ++i5, ++n11;\n        }\n        t.push(n11 - 1);\n        for (var l4 = r; l4 < i5; ++l4) t.push(e[l4] + 256 & 255);\n        return i5;\n      }\n      function da(e, r, t) {\n        for (var n11 = 0, a2 = e.length, i5 = r; i5 < a2 && n11 < 64; ) {\n          var o2 = e[i5];\n          if (o2 === 0 || Br(o2) && i5 + 1 < a2 && Br(e[i5 + 1])) break;\n          ++i5, ++n11;\n        }\n        t.push(64 | n11 - 1);\n        for (var l4 = r; l4 < i5; ++l4) {\n          var u3 = e[l4];\n          t.push(u3 + 65536 >> 8 & 255, u3 + 256 & 255);\n        }\n        return i5;\n      }\n      E5.VARDELTAS = function(e) {\n        for (var r = 0, t = []; r < e.length; ) {\n          var n11 = e[r];\n          n11 === 0 ? r = ca(e, r, t) : n11 >= -128 && n11 <= 127 ? r = va(e, r, t) : r = da(e, r, t);\n        }\n        return t;\n      }, E5.INDEX = function(e) {\n        for (var r = 1, t = [r], n11 = [], a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = E5.OBJECT(e[a2]);\n          Array.prototype.push.apply(n11, i5), r += i5.length, t.push(r);\n        }\n        if (n11.length === 0) return [0, 0];\n        for (var o2 = [], l4 = 1 + Math.floor(Math.log(r) / Math.log(2)) / 8 | 0, u3 = [void 0, E5.BYTE, E5.USHORT, E5.UINT24, E5.ULONG][l4], c2 = 0; c2 < t.length; c2 += 1) {\n          var d3 = u3(t[c2]);\n          Array.prototype.push.apply(o2, d3);\n        }\n        return Array.prototype.concat(E5.Card16(e.length), E5.OffSize(l4), o2, n11);\n      }, M4.INDEX = function(e) {\n        return E5.INDEX(e).length;\n      }, E5.DICT = function(e) {\n        for (var r = [], t = Object.keys(e), n11 = t.length, a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = parseInt(t[a2], 0), o2 = e[i5];\n          r = r.concat(E5.OPERAND(o2.value, o2.type)), r = r.concat(E5.OPERATOR(i5));\n        }\n        return r;\n      }, M4.DICT = function(e) {\n        return E5.DICT(e).length;\n      }, E5.OPERATOR = function(e) {\n        return e < 1200 ? [e] : [12, e - 1200];\n      }, E5.OPERAND = function(e, r) {\n        var t = [];\n        if (Array.isArray(r)) for (var n11 = 0; n11 < r.length; n11 += 1) G5.argument(e.length === r.length, "Not enough arguments given for type" + r), t = t.concat(E5.OPERAND(e[n11], r[n11]));\n        else if (r === "SID") t = t.concat(E5.NUMBER(e));\n        else if (r === "offset") t = t.concat(E5.NUMBER32(e));\n        else if (r === "number") t = t.concat(E5.NUMBER(e));\n        else if (r === "real") t = t.concat(E5.REAL(e));\n        else throw new Error("Unknown operand type " + r);\n        return t;\n      }, E5.OP = E5.BYTE, M4.OP = M4.BYTE;\n      var hr2 = typeof WeakMap == "function" && /* @__PURE__ */ new WeakMap();\n      E5.CHARSTRING = function(e) {\n        if (hr2) {\n          var r = hr2.get(e);\n          if (r !== void 0) return r;\n        }\n        for (var t = [], n11 = e.length, a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = e[a2];\n          t = t.concat(E5[i5.type](i5.value));\n        }\n        return hr2 && hr2.set(e, t), t;\n      }, M4.CHARSTRING = function(e) {\n        return E5.CHARSTRING(e).length;\n      }, E5.OBJECT = function(e) {\n        var r = E5[e.type];\n        return G5.argument(r !== void 0, "No encoding function for type " + e.type), r(e.value);\n      }, M4.OBJECT = function(e) {\n        var r = M4[e.type];\n        return G5.argument(r !== void 0, "No sizeOf function for type " + e.type), r(e.value);\n      }, E5.TABLE = function(e) {\n        for (var r = [], t = e.fields.length, n11 = [], a2 = [], i5 = 0; i5 < t; i5 += 1) {\n          var o2 = e.fields[i5], l4 = E5[o2.type];\n          G5.argument(l4 !== void 0, "No encoding function for field type " + o2.type + " (" + o2.name + ")");\n          var u3 = e[o2.name];\n          u3 === void 0 && (u3 = o2.value);\n          var c2 = l4(u3);\n          o2.type === "TABLE" ? (a2.push(r.length), r = r.concat([0, 0]), n11.push(c2)) : r = r.concat(c2);\n        }\n        for (var d3 = 0; d3 < n11.length; d3 += 1) {\n          var y5 = a2[d3], g6 = r.length;\n          G5.argument(g6 < 65536, "Table " + e.tableName + " too big."), r[y5] = g6 >> 8, r[y5 + 1] = g6 & 255, r = r.concat(n11[d3]);\n        }\n        return r;\n      }, M4.TABLE = function(e) {\n        for (var r = 0, t = e.fields.length, n11 = 0; n11 < t; n11 += 1) {\n          var a2 = e.fields[n11], i5 = M4[a2.type];\n          G5.argument(i5 !== void 0, "No sizeOf function for field type " + a2.type + " (" + a2.name + ")");\n          var o2 = e[a2.name];\n          o2 === void 0 && (o2 = a2.value), r += i5(o2), a2.type === "TABLE" && (r += 2);\n        }\n        return r;\n      }, E5.RECORD = E5.TABLE, M4.RECORD = M4.TABLE, E5.LITERAL = function(e) {\n        return e;\n      }, M4.LITERAL = function(e) {\n        return e.length;\n      };\n      function ee4(e, r, t) {\n        for (var n11 = this, a2 = 0; a2 < r.length; a2 += 1) {\n          var i5 = r[a2];\n          n11[i5.name] = i5.value;\n        }\n        if (this.tableName = e, this.fields = r, t) for (var o2 = Object.keys(t), l4 = 0; l4 < o2.length; l4 += 1) {\n          var u3 = o2[l4], c2 = t[u3];\n          n11[u3] !== void 0 && (n11[u3] = c2);\n        }\n      }\n      ee4.prototype.encode = function() {\n        return E5.TABLE(this);\n      }, ee4.prototype.sizeOf = function() {\n        return M4.TABLE(this);\n      };\n      function je4(e, r, t) {\n        t === void 0 && (t = r.length);\n        var n11 = new Array(r.length + 1);\n        n11[0] = { name: e + "Count", type: "USHORT", value: t };\n        for (var a2 = 0; a2 < r.length; a2++) n11[a2 + 1] = { name: e + a2, type: "USHORT", value: r[a2] };\n        return n11;\n      }\n      function Pr(e, r, t) {\n        var n11 = r.length, a2 = new Array(n11 + 1);\n        a2[0] = { name: e + "Count", type: "USHORT", value: n11 };\n        for (var i5 = 0; i5 < n11; i5++) a2[i5 + 1] = { name: e + i5, type: "TABLE", value: t(r[i5], i5) };\n        return a2;\n      }\n      function cr2(e, r, t) {\n        var n11 = r.length, a2 = [];\n        a2[0] = { name: e + "Count", type: "USHORT", value: n11 };\n        for (var i5 = 0; i5 < n11; i5++) a2 = a2.concat(t(r[i5], i5));\n        return a2;\n      }\n      function vr3(e) {\n        e.format === 1 ? ee4.call(this, "coverageTable", [{ name: "coverageFormat", type: "USHORT", value: 1 }].concat(je4("glyph", e.glyphs))) : G5.assert(false, "Can\'t create coverage table format 2 yet.");\n      }\n      vr3.prototype = Object.create(ee4.prototype), vr3.prototype.constructor = vr3;\n      function dr2(e) {\n        ee4.call(this, "scriptListTable", cr2("scriptRecord", e, function(r, t) {\n          var n11 = r.script, a2 = n11.defaultLangSys;\n          return G5.assert(!!a2, "Unable to write GSUB: script " + r.tag + " has no default language system."), [{ name: "scriptTag" + t, type: "TAG", value: r.tag }, { name: "script" + t, type: "TABLE", value: new ee4("scriptTable", [{ name: "defaultLangSys", type: "TABLE", value: new ee4("defaultLangSys", [{ name: "lookupOrder", type: "USHORT", value: 0 }, { name: "reqFeatureIndex", type: "USHORT", value: a2.reqFeatureIndex }].concat(je4("featureIndex", a2.featureIndexes))) }].concat(cr2("langSys", n11.langSysRecords, function(i5, o2) {\n            var l4 = i5.langSys;\n            return [{ name: "langSysTag" + o2, type: "TAG", value: i5.tag }, { name: "langSys" + o2, type: "TABLE", value: new ee4("langSys", [{ name: "lookupOrder", type: "USHORT", value: 0 }, { name: "reqFeatureIndex", type: "USHORT", value: l4.reqFeatureIndex }].concat(je4("featureIndex", l4.featureIndexes))) }];\n          }))) }];\n        }));\n      }\n      dr2.prototype = Object.create(ee4.prototype), dr2.prototype.constructor = dr2;\n      function gr2(e) {\n        ee4.call(this, "featureListTable", cr2("featureRecord", e, function(r, t) {\n          var n11 = r.feature;\n          return [{ name: "featureTag" + t, type: "TAG", value: r.tag }, { name: "feature" + t, type: "TABLE", value: new ee4("featureTable", [{ name: "featureParams", type: "USHORT", value: n11.featureParams }].concat(je4("lookupListIndex", n11.lookupListIndexes))) }];\n        }));\n      }\n      gr2.prototype = Object.create(ee4.prototype), gr2.prototype.constructor = gr2;\n      function mr2(e, r) {\n        ee4.call(this, "lookupListTable", Pr("lookup", e, function(t) {\n          var n11 = r[t.lookupType];\n          return G5.assert(!!n11, "Unable to write GSUB lookup type " + t.lookupType + " tables."), new ee4("lookupTable", [{ name: "lookupType", type: "USHORT", value: t.lookupType }, { name: "lookupFlag", type: "USHORT", value: t.lookupFlag }].concat(Pr("subtable", t.subtables, n11)));\n        }));\n      }\n      mr2.prototype = Object.create(ee4.prototype), mr2.prototype.constructor = mr2;\n      var A4 = { Table: ee4, Record: ee4, Coverage: vr3, ScriptList: dr2, FeatureList: gr2, LookupList: mr2, ushortList: je4, tableList: Pr, recordList: cr2 };\n      function Et3(e, r) {\n        return e.getUint8(r);\n      }\n      function yr2(e, r) {\n        return e.getUint16(r, false);\n      }\n      function ga(e, r) {\n        return e.getInt16(r, false);\n      }\n      function Gr(e, r) {\n        return e.getUint32(r, false);\n      }\n      function Ut2(e, r) {\n        var t = e.getInt16(r, false), n11 = e.getUint16(r + 2, false);\n        return t + n11 / 65535;\n      }\n      function ma(e, r) {\n        for (var t = "", n11 = r; n11 < r + 4; n11 += 1) t += String.fromCharCode(e.getInt8(n11));\n        return t;\n      }\n      function ya(e, r, t) {\n        for (var n11 = 0, a2 = 0; a2 < t; a2 += 1) n11 <<= 8, n11 += e.getUint8(r + a2);\n        return n11;\n      }\n      function ba(e, r, t) {\n        for (var n11 = [], a2 = r; a2 < t; a2 += 1) n11.push(e.getUint8(a2));\n        return n11;\n      }\n      function xa(e) {\n        for (var r = "", t = 0; t < e.length; t += 1) r += String.fromCharCode(e[t]);\n        return r;\n      }\n      var Sa = { byte: 1, uShort: 2, short: 2, uLong: 4, fixed: 4, longDateTime: 8, tag: 4 };\n      function b4(e, r) {\n        this.data = e, this.offset = r, this.relativeOffset = 0;\n      }\n      b4.prototype.parseByte = function() {\n        var e = this.data.getUint8(this.offset + this.relativeOffset);\n        return this.relativeOffset += 1, e;\n      }, b4.prototype.parseChar = function() {\n        var e = this.data.getInt8(this.offset + this.relativeOffset);\n        return this.relativeOffset += 1, e;\n      }, b4.prototype.parseCard8 = b4.prototype.parseByte, b4.prototype.parseUShort = function() {\n        var e = this.data.getUint16(this.offset + this.relativeOffset);\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseCard16 = b4.prototype.parseUShort, b4.prototype.parseSID = b4.prototype.parseUShort, b4.prototype.parseOffset16 = b4.prototype.parseUShort, b4.prototype.parseShort = function() {\n        var e = this.data.getInt16(this.offset + this.relativeOffset);\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseF2Dot14 = function() {\n        var e = this.data.getInt16(this.offset + this.relativeOffset) / 16384;\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseULong = function() {\n        var e = Gr(this.data, this.offset + this.relativeOffset);\n        return this.relativeOffset += 4, e;\n      }, b4.prototype.parseOffset32 = b4.prototype.parseULong, b4.prototype.parseFixed = function() {\n        var e = Ut2(this.data, this.offset + this.relativeOffset);\n        return this.relativeOffset += 4, e;\n      }, b4.prototype.parseString = function(e) {\n        var r = this.data, t = this.offset + this.relativeOffset, n11 = "";\n        this.relativeOffset += e;\n        for (var a2 = 0; a2 < e; a2++) n11 += String.fromCharCode(r.getUint8(t + a2));\n        return n11;\n      }, b4.prototype.parseTag = function() {\n        return this.parseString(4);\n      }, b4.prototype.parseLongDateTime = function() {\n        var e = Gr(this.data, this.offset + this.relativeOffset + 4);\n        return e -= 2082844800, this.relativeOffset += 8, e;\n      }, b4.prototype.parseVersion = function(e) {\n        var r = yr2(this.data, this.offset + this.relativeOffset), t = yr2(this.data, this.offset + this.relativeOffset + 2);\n        return this.relativeOffset += 4, e === void 0 && (e = 4096), r + t / e / 10;\n      }, b4.prototype.skip = function(e, r) {\n        r === void 0 && (r = 1), this.relativeOffset += Sa[e] * r;\n      }, b4.prototype.parseULongList = function(e) {\n        e === void 0 && (e = this.parseULong());\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint32(n11), n11 += 4;\n        return this.relativeOffset += e * 4, r;\n      }, b4.prototype.parseOffset16List = b4.prototype.parseUShortList = function(e) {\n        e === void 0 && (e = this.parseUShort());\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint16(n11), n11 += 2;\n        return this.relativeOffset += e * 2, r;\n      }, b4.prototype.parseShortList = function(e) {\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getInt16(n11), n11 += 2;\n        return this.relativeOffset += e * 2, r;\n      }, b4.prototype.parseByteList = function(e) {\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint8(n11++);\n        return this.relativeOffset += e, r;\n      }, b4.prototype.parseList = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseUShort());\n        for (var n11 = new Array(e), a2 = 0; a2 < e; a2++) n11[a2] = r.call(t);\n        return n11;\n      }, b4.prototype.parseList32 = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseULong());\n        for (var n11 = new Array(e), a2 = 0; a2 < e; a2++) n11[a2] = r.call(t);\n        return n11;\n      }, b4.prototype.parseRecordList = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseUShort());\n        for (var n11 = new Array(e), a2 = Object.keys(r), i5 = 0; i5 < e; i5++) {\n          for (var o2 = {}, l4 = 0; l4 < a2.length; l4++) {\n            var u3 = a2[l4], c2 = r[u3];\n            o2[u3] = c2.call(t);\n          }\n          n11[i5] = o2;\n        }\n        return n11;\n      }, b4.prototype.parseRecordList32 = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseULong());\n        for (var n11 = new Array(e), a2 = Object.keys(r), i5 = 0; i5 < e; i5++) {\n          for (var o2 = {}, l4 = 0; l4 < a2.length; l4++) {\n            var u3 = a2[l4], c2 = r[u3];\n            o2[u3] = c2.call(t);\n          }\n          n11[i5] = o2;\n        }\n        return n11;\n      }, b4.prototype.parseStruct = function(e) {\n        var r = this;\n        if (typeof e == "function") return e.call(this);\n        for (var t = Object.keys(e), n11 = {}, a2 = 0; a2 < t.length; a2++) {\n          var i5 = t[a2], o2 = e[i5];\n          n11[i5] = o2.call(r);\n        }\n        return n11;\n      }, b4.prototype.parseValueRecord = function(e) {\n        if (e === void 0 && (e = this.parseUShort()), e !== 0) {\n          var r = {};\n          return e & 1 && (r.xPlacement = this.parseShort()), e & 2 && (r.yPlacement = this.parseShort()), e & 4 && (r.xAdvance = this.parseShort()), e & 8 && (r.yAdvance = this.parseShort()), e & 16 && (r.xPlaDevice = void 0, this.parseShort()), e & 32 && (r.yPlaDevice = void 0, this.parseShort()), e & 64 && (r.xAdvDevice = void 0, this.parseShort()), e & 128 && (r.yAdvDevice = void 0, this.parseShort()), r;\n        }\n      }, b4.prototype.parseValueRecordList = function() {\n        for (var e = this, r = this.parseUShort(), t = this.parseUShort(), n11 = new Array(t), a2 = 0; a2 < t; a2++) n11[a2] = e.parseValueRecord(r);\n        return n11;\n      }, b4.prototype.parsePointer = function(e) {\n        var r = this.parseOffset16();\n        if (r > 0) return new b4(this.data, this.offset + r).parseStruct(e);\n      }, b4.prototype.parsePointer32 = function(e) {\n        var r = this.parseOffset32();\n        if (r > 0) return new b4(this.data, this.offset + r).parseStruct(e);\n      }, b4.prototype.parseListOfLists = function(e) {\n        for (var r = this, t = this.parseOffset16List(), n11 = t.length, a2 = this.relativeOffset, i5 = new Array(n11), o2 = 0; o2 < n11; o2++) {\n          var l4 = t[o2];\n          if (l4 === 0) {\n            i5[o2] = void 0;\n            continue;\n          }\n          if (r.relativeOffset = l4, e) {\n            for (var u3 = r.parseOffset16List(), c2 = new Array(u3.length), d3 = 0; d3 < u3.length; d3++) r.relativeOffset = l4 + u3[d3], c2[d3] = e.call(r);\n            i5[o2] = c2;\n          } else i5[o2] = r.parseUShortList();\n        }\n        return this.relativeOffset = a2, i5;\n      }, b4.prototype.parseCoverage = function() {\n        var e = this, r = this.offset + this.relativeOffset, t = this.parseUShort(), n11 = this.parseUShort();\n        if (t === 1) return { format: 1, glyphs: this.parseUShortList(n11) };\n        if (t === 2) {\n          for (var a2 = new Array(n11), i5 = 0; i5 < n11; i5++) a2[i5] = { start: e.parseUShort(), end: e.parseUShort(), index: e.parseUShort() };\n          return { format: 2, ranges: a2 };\n        }\n        throw new Error("0x" + r.toString(16) + ": Coverage format must be 1 or 2.");\n      }, b4.prototype.parseClassDef = function() {\n        var e = this.offset + this.relativeOffset, r = this.parseUShort();\n        if (r === 1) return { format: 1, startGlyph: this.parseUShort(), classes: this.parseUShortList() };\n        if (r === 2) return { format: 2, ranges: this.parseRecordList({ start: b4.uShort, end: b4.uShort, classId: b4.uShort }) };\n        throw new Error("0x" + e.toString(16) + ": ClassDef format must be 1 or 2.");\n      }, b4.list = function(e, r) {\n        return function() {\n          return this.parseList(e, r);\n        };\n      }, b4.list32 = function(e, r) {\n        return function() {\n          return this.parseList32(e, r);\n        };\n      }, b4.recordList = function(e, r) {\n        return function() {\n          return this.parseRecordList(e, r);\n        };\n      }, b4.recordList32 = function(e, r) {\n        return function() {\n          return this.parseRecordList32(e, r);\n        };\n      }, b4.pointer = function(e) {\n        return function() {\n          return this.parsePointer(e);\n        };\n      }, b4.pointer32 = function(e) {\n        return function() {\n          return this.parsePointer32(e);\n        };\n      }, b4.tag = b4.prototype.parseTag, b4.byte = b4.prototype.parseByte, b4.uShort = b4.offset16 = b4.prototype.parseUShort, b4.uShortList = b4.prototype.parseUShortList, b4.uLong = b4.offset32 = b4.prototype.parseULong, b4.uLongList = b4.prototype.parseULongList, b4.struct = b4.prototype.parseStruct, b4.coverage = b4.prototype.parseCoverage, b4.classDef = b4.prototype.parseClassDef;\n      var Ot2 = { reserved: b4.uShort, reqFeatureIndex: b4.uShort, featureIndexes: b4.uShortList };\n      b4.prototype.parseScriptList = function() {\n        return this.parsePointer(b4.recordList({ tag: b4.tag, script: b4.pointer({ defaultLangSys: b4.pointer(Ot2), langSysRecords: b4.recordList({ tag: b4.tag, langSys: b4.pointer(Ot2) }) }) })) || [];\n      }, b4.prototype.parseFeatureList = function() {\n        return this.parsePointer(b4.recordList({ tag: b4.tag, feature: b4.pointer({ featureParams: b4.offset16, lookupListIndexes: b4.uShortList }) })) || [];\n      }, b4.prototype.parseLookupList = function(e) {\n        return this.parsePointer(b4.list(b4.pointer(function() {\n          var r = this.parseUShort();\n          G5.argument(1 <= r && r <= 9, "GPOS/GSUB lookup type " + r + " unknown.");\n          var t = this.parseUShort(), n11 = t & 16;\n          return { lookupType: r, lookupFlag: t, subtables: this.parseList(b4.pointer(e[r])), markFilteringSet: n11 ? this.parseUShort() : void 0 };\n        }))) || [];\n      }, b4.prototype.parseFeatureVariationsList = function() {\n        return this.parsePointer32(function() {\n          var e = this.parseUShort(), r = this.parseUShort();\n          G5.argument(e === 1 && r < 1, "GPOS/GSUB feature variations table unknown.");\n          var t = this.parseRecordList32({ conditionSetOffset: b4.offset32, featureTableSubstitutionOffset: b4.offset32 });\n          return t;\n        }) || [];\n      };\n      var w6 = { getByte: Et3, getCard8: Et3, getUShort: yr2, getCard16: yr2, getShort: ga, getULong: Gr, getFixed: Ut2, getTag: ma, getOffset: ya, getBytes: ba, bytesToString: xa, Parser: b4 };\n      function Ta(e, r) {\n        r.parseUShort(), e.length = r.parseULong(), e.language = r.parseULong();\n        var t;\n        e.groupCount = t = r.parseULong(), e.glyphIndexMap = {};\n        for (var n11 = 0; n11 < t; n11 += 1) for (var a2 = r.parseULong(), i5 = r.parseULong(), o2 = r.parseULong(), l4 = a2; l4 <= i5; l4 += 1) e.glyphIndexMap[l4] = o2, o2++;\n      }\n      function ka(e, r, t, n11, a2) {\n        e.length = r.parseUShort(), e.language = r.parseUShort();\n        var i5;\n        e.segCount = i5 = r.parseUShort() >> 1, r.skip("uShort", 3), e.glyphIndexMap = {};\n        for (var o2 = new w6.Parser(t, n11 + a2 + 14), l4 = new w6.Parser(t, n11 + a2 + 16 + i5 * 2), u3 = new w6.Parser(t, n11 + a2 + 16 + i5 * 4), c2 = new w6.Parser(t, n11 + a2 + 16 + i5 * 6), d3 = n11 + a2 + 16 + i5 * 8, y5 = 0; y5 < i5 - 1; y5 += 1) for (var g6 = void 0, m4 = o2.parseUShort(), T4 = l4.parseUShort(), O4 = u3.parseShort(), F4 = c2.parseUShort(), U6 = T4; U6 <= m4; U6 += 1) F4 !== 0 ? (d3 = c2.offset + c2.relativeOffset - 2, d3 += F4, d3 += (U6 - T4) * 2, g6 = w6.getUShort(t, d3), g6 !== 0 && (g6 = g6 + O4 & 65535)) : g6 = U6 + O4 & 65535, e.glyphIndexMap[U6] = g6;\n      }\n      function Fa(e, r) {\n        var t = {};\n        t.version = w6.getUShort(e, r), G5.argument(t.version === 0, "cmap table version should be 0."), t.numTables = w6.getUShort(e, r + 2);\n        for (var n11 = -1, a2 = t.numTables - 1; a2 >= 0; a2 -= 1) {\n          var i5 = w6.getUShort(e, r + 4 + a2 * 8), o2 = w6.getUShort(e, r + 4 + a2 * 8 + 2);\n          if (i5 === 3 && (o2 === 0 || o2 === 1 || o2 === 10)) {\n            n11 = w6.getULong(e, r + 4 + a2 * 8 + 4);\n            break;\n          }\n        }\n        if (n11 === -1) throw new Error("No valid cmap sub-tables found.");\n        var l4 = new w6.Parser(e, r + n11);\n        if (t.format = l4.parseUShort(), t.format === 12) Ta(t, l4);\n        else if (t.format === 4) ka(t, l4, e, r, n11);\n        else throw new Error("Only format 4 and 12 cmap tables are supported (found format " + t.format + ").");\n        return t;\n      }\n      function La(e, r, t) {\n        e.segments.push({ end: r, start: r, delta: -(r - t), offset: 0, glyphIndex: t });\n      }\n      function Ea(e) {\n        e.segments.push({ end: 65535, start: 65535, delta: 1, offset: 0 });\n      }\n      function Ua(e) {\n        var r = true, t;\n        for (t = e.length - 1; t > 0; t -= 1) {\n          var n11 = e.get(t);\n          if (n11.unicode > 65535) {\n            console.log("Adding CMAP format 12 (needed!)"), r = false;\n            break;\n          }\n        }\n        var a2 = [{ name: "version", type: "USHORT", value: 0 }, { name: "numTables", type: "USHORT", value: r ? 1 : 2 }, { name: "platformID", type: "USHORT", value: 3 }, { name: "encodingID", type: "USHORT", value: 1 }, { name: "offset", type: "ULONG", value: r ? 12 : 20 }];\n        r || (a2 = a2.concat([{ name: "cmap12PlatformID", type: "USHORT", value: 3 }, { name: "cmap12EncodingID", type: "USHORT", value: 10 }, { name: "cmap12Offset", type: "ULONG", value: 0 }])), a2 = a2.concat([{ name: "format", type: "USHORT", value: 4 }, { name: "cmap4Length", type: "USHORT", value: 0 }, { name: "language", type: "USHORT", value: 0 }, { name: "segCountX2", type: "USHORT", value: 0 }, { name: "searchRange", type: "USHORT", value: 0 }, { name: "entrySelector", type: "USHORT", value: 0 }, { name: "rangeShift", type: "USHORT", value: 0 }]);\n        var i5 = new A4.Table("cmap", a2);\n        for (i5.segments = [], t = 0; t < e.length; t += 1) {\n          for (var o2 = e.get(t), l4 = 0; l4 < o2.unicodes.length; l4 += 1) La(i5, o2.unicodes[l4], t);\n          i5.segments = i5.segments.sort(function(P5, I4) {\n            return P5.start - I4.start;\n          });\n        }\n        Ea(i5);\n        var u3 = i5.segments.length, c2 = 0, d3 = [], y5 = [], g6 = [], m4 = [], T4 = [], O4 = [];\n        for (t = 0; t < u3; t += 1) {\n          var F4 = i5.segments[t];\n          F4.end <= 65535 && F4.start <= 65535 ? (d3 = d3.concat({ name: "end_" + t, type: "USHORT", value: F4.end }), y5 = y5.concat({ name: "start_" + t, type: "USHORT", value: F4.start }), g6 = g6.concat({ name: "idDelta_" + t, type: "SHORT", value: F4.delta }), m4 = m4.concat({ name: "idRangeOffset_" + t, type: "USHORT", value: F4.offset }), F4.glyphId !== void 0 && (T4 = T4.concat({ name: "glyph_" + t, type: "USHORT", value: F4.glyphId }))) : c2 += 1, !r && F4.glyphIndex !== void 0 && (O4 = O4.concat({ name: "cmap12Start_" + t, type: "ULONG", value: F4.start }), O4 = O4.concat({ name: "cmap12End_" + t, type: "ULONG", value: F4.end }), O4 = O4.concat({ name: "cmap12Glyph_" + t, type: "ULONG", value: F4.glyphIndex }));\n        }\n        if (i5.segCountX2 = (u3 - c2) * 2, i5.searchRange = Math.pow(2, Math.floor(Math.log(u3 - c2) / Math.log(2))) * 2, i5.entrySelector = Math.log(i5.searchRange / 2) / Math.log(2), i5.rangeShift = i5.segCountX2 - i5.searchRange, i5.fields = i5.fields.concat(d3), i5.fields.push({ name: "reservedPad", type: "USHORT", value: 0 }), i5.fields = i5.fields.concat(y5), i5.fields = i5.fields.concat(g6), i5.fields = i5.fields.concat(m4), i5.fields = i5.fields.concat(T4), i5.cmap4Length = 14 + d3.length * 2 + 2 + y5.length * 2 + g6.length * 2 + m4.length * 2 + T4.length * 2, !r) {\n          var U6 = 16 + O4.length * 4;\n          i5.cmap12Offset = 20 + i5.cmap4Length, i5.fields = i5.fields.concat([{ name: "cmap12Format", type: "USHORT", value: 12 }, { name: "cmap12Reserved", type: "USHORT", value: 0 }, { name: "cmap12Length", type: "ULONG", value: U6 }, { name: "cmap12Language", type: "ULONG", value: 0 }, { name: "cmap12nGroups", type: "ULONG", value: O4.length / 3 }]), i5.fields = i5.fields.concat(O4);\n        }\n        return i5;\n      }\n      var It3 = { parse: Fa, make: Ua }, br2 = [".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "266 ff", "onedotenleader", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "ffi", "ffl", "parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold"], Oa = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "", "endash", "dagger", "daggerdbl", "periodcentered", "", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "", "questiondown", "", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "", "ring", "cedilla", "", "hungarumlaut", "ogonek", "caron", "emdash", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "AE", "", "ordfeminine", "", "", "", "", "Lslash", "Oslash", "OE", "ordmasculine", "", "", "", "", "", "ae", "", "", "", "dotlessi", "", "", "lslash", "oslash", "oe", "germandbls"], Ia = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclamsmall", "Hungarumlautsmall", "", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "comma", "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "colon", "semicolon", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "", "", "isuperior", "", "", "lsuperior", "msuperior", "nsuperior", "osuperior", "", "", "rsuperior", "ssuperior", "tsuperior", "", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior", "", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "exclamdownsmall", "centoldstyle", "Lslashsmall", "", "", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "", "Dotaccentsmall", "", "", "Macronsmall", "", "", "figuredash", "hypheninferior", "", "", "Ogoneksmall", "Ringsmall", "Cedillasmall", "", "", "", "onequarter", "onehalf", "threequarters", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "", "", "zerosuperior", "onesuperior", "twosuperior", "threesuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall"], Me3 = [".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quotesingle", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde", "aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute", "ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave", "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling", "section", "bullet", "paragraph", "germandbls", "registered", "copyright", "trademark", "acute", "dieresis", "notequal", "AE", "Oslash", "infinity", "plusminus", "lessequal", "greaterequal", "yen", "mu", "partialdiff", "summation", "product", "pi", "integral", "ordfeminine", "ordmasculine", "Omega", "ae", "oslash", "questiondown", "exclamdown", "logicalnot", "radical", "florin", "approxequal", "Delta", "guillemotleft", "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", "lozenge", "ydieresis", "Ydieresis", "fraction", "currency", "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase", "quotedblbase", "perthousand", "Acircumflex", "Ecircumflex", "Aacute", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Oacute", "Ocircumflex", "apple", "Ograve", "Uacute", "Ucircumflex", "Ugrave", "dotlessi", "circumflex", "tilde", "macron", "breve", "dotaccent", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "Lslash", "lslash", "Scaron", "scaron", "Zcaron", "zcaron", "brokenbar", "Eth", "eth", "Yacute", "yacute", "Thorn", "thorn", "minus", "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", "threequarters", "franc", "Gbreve", "gbreve", "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", "Ccaron", "ccaron", "dcroat"];\n      function Ct3(e) {\n        this.font = e;\n      }\n      Ct3.prototype.charToGlyphIndex = function(e) {\n        var r = e.charCodeAt(0), t = this.font.glyphs;\n        if (t) {\n          for (var n11 = 0; n11 < t.length; n11 += 1) for (var a2 = t.get(n11), i5 = 0; i5 < a2.unicodes.length; i5 += 1) if (a2.unicodes[i5] === r) return n11;\n        }\n        return null;\n      };\n      function wt2(e) {\n        this.cmap = e;\n      }\n      wt2.prototype.charToGlyphIndex = function(e) {\n        return this.cmap.glyphIndexMap[e.charCodeAt(0)] || 0;\n      };\n      function xr2(e, r) {\n        this.encoding = e, this.charset = r;\n      }\n      xr2.prototype.charToGlyphIndex = function(e) {\n        var r = e.charCodeAt(0), t = this.encoding[r];\n        return this.charset.indexOf(t);\n      };\n      function Nr(e) {\n        var r = this;\n        switch (e.version) {\n          case 1:\n            this.names = Me3.slice();\n            break;\n          case 2:\n            this.names = new Array(e.numberOfGlyphs);\n            for (var t = 0; t < e.numberOfGlyphs; t++) e.glyphNameIndex[t] < Me3.length ? r.names[t] = Me3[e.glyphNameIndex[t]] : r.names[t] = e.names[e.glyphNameIndex[t] - Me3.length];\n            break;\n          case 2.5:\n            this.names = new Array(e.numberOfGlyphs);\n            for (var n11 = 0; n11 < e.numberOfGlyphs; n11++) r.names[n11] = Me3[n11 + e.glyphNameIndex[n11]];\n            break;\n          case 3:\n            this.names = [];\n            break;\n          default:\n            this.names = [];\n            break;\n        }\n      }\n      Nr.prototype.nameToGlyphIndex = function(e) {\n        return this.names.indexOf(e);\n      }, Nr.prototype.glyphIndexToName = function(e) {\n        return this.names[e];\n      };\n      function Ca(e) {\n        for (var r, t = e.tables.cmap.glyphIndexMap, n11 = Object.keys(t), a2 = 0; a2 < n11.length; a2 += 1) {\n          var i5 = n11[a2], o2 = t[i5];\n          r = e.glyphs.get(o2), r.addUnicode(parseInt(i5));\n        }\n        for (var l4 = 0; l4 < e.glyphs.length; l4 += 1) r = e.glyphs.get(l4), e.cffEncoding ? e.isCIDFont ? r.name = "gid" + l4 : r.name = e.cffEncoding.charset[l4] : e.glyphNames.names && (r.name = e.glyphNames.glyphIndexToName(l4));\n      }\n      function wa(e, r, t, n11, a2) {\n        e.beginPath(), e.moveTo(r, t), e.lineTo(n11, a2), e.stroke();\n      }\n      var Be3 = { line: wa };\n      function Rt3(e, r, t, n11, a2) {\n        var i5;\n        return (r & n11) > 0 ? (i5 = e.parseByte(), (r & a2) === 0 && (i5 = -i5), i5 = t + i5) : (r & a2) > 0 ? i5 = t : i5 = t + e.parseShort(), i5;\n      }\n      function Ra(e, r, t) {\n        var n11 = new w6.Parser(r, t);\n        e.numberOfContours = n11.parseShort(), e._xMin = n11.parseShort(), e._yMin = n11.parseShort(), e._xMax = n11.parseShort(), e._yMax = n11.parseShort();\n        var a2, i5;\n        if (e.numberOfContours > 0) {\n          for (var o2 = e.endPointIndices = [], l4 = 0; l4 < e.numberOfContours; l4 += 1) o2.push(n11.parseUShort());\n          e.instructionLength = n11.parseUShort(), e.instructions = [];\n          for (var u3 = 0; u3 < e.instructionLength; u3 += 1) e.instructions.push(n11.parseByte());\n          var c2 = o2[o2.length - 1] + 1;\n          a2 = [];\n          for (var d3 = 0; d3 < c2; d3 += 1) if (i5 = n11.parseByte(), a2.push(i5), (i5 & 8) > 0) for (var y5 = n11.parseByte(), g6 = 0; g6 < y5; g6 += 1) a2.push(i5), d3 += 1;\n          if (G5.argument(a2.length === c2, "Bad flags."), o2.length > 0) {\n            var m4 = [], T4;\n            if (c2 > 0) {\n              for (var O4 = 0; O4 < c2; O4 += 1) i5 = a2[O4], T4 = {}, T4.onCurve = !!(i5 & 1), T4.lastPointOfContour = o2.indexOf(O4) >= 0, m4.push(T4);\n              for (var F4 = 0, U6 = 0; U6 < c2; U6 += 1) i5 = a2[U6], T4 = m4[U6], T4.x = Rt3(n11, i5, F4, 2, 16), F4 = T4.x;\n              for (var P5 = 0, I4 = 0; I4 < c2; I4 += 1) i5 = a2[I4], T4 = m4[I4], T4.y = Rt3(n11, i5, P5, 4, 32), P5 = T4.y;\n            }\n            e.points = m4;\n          } else e.points = [];\n        } else if (e.numberOfContours === 0) e.points = [];\n        else {\n          e.isComposite = true, e.points = [], e.components = [];\n          for (var H5 = true; H5; ) {\n            a2 = n11.parseUShort();\n            var R4 = { glyphIndex: n11.parseUShort(), xScale: 1, scale01: 0, scale10: 0, yScale: 1, dx: 0, dy: 0 };\n            (a2 & 1) > 0 ? (a2 & 2) > 0 ? (R4.dx = n11.parseShort(), R4.dy = n11.parseShort()) : R4.matchedPoints = [n11.parseUShort(), n11.parseUShort()] : (a2 & 2) > 0 ? (R4.dx = n11.parseChar(), R4.dy = n11.parseChar()) : R4.matchedPoints = [n11.parseByte(), n11.parseByte()], (a2 & 8) > 0 ? R4.xScale = R4.yScale = n11.parseF2Dot14() : (a2 & 64) > 0 ? (R4.xScale = n11.parseF2Dot14(), R4.yScale = n11.parseF2Dot14()) : (a2 & 128) > 0 && (R4.xScale = n11.parseF2Dot14(), R4.scale01 = n11.parseF2Dot14(), R4.scale10 = n11.parseF2Dot14(), R4.yScale = n11.parseF2Dot14()), e.components.push(R4), H5 = !!(a2 & 32);\n          }\n          if (a2 & 256) {\n            e.instructionLength = n11.parseUShort(), e.instructions = [];\n            for (var B5 = 0; B5 < e.instructionLength; B5 += 1) e.instructions.push(n11.parseByte());\n          }\n        }\n      }\n      function Hr2(e, r) {\n        for (var t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11], i5 = { x: r.xScale * a2.x + r.scale01 * a2.y + r.dx, y: r.scale10 * a2.x + r.yScale * a2.y + r.dy, onCurve: a2.onCurve, lastPointOfContour: a2.lastPointOfContour };\n          t.push(i5);\n        }\n        return t;\n      }\n      function Da(e) {\n        for (var r = [], t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11];\n          t.push(a2), a2.lastPointOfContour && (r.push(t), t = []);\n        }\n        return G5.argument(t.length === 0, "There are still points left in the current contour."), r;\n      }\n      function Dt3(e) {\n        var r = new Z5();\n        if (!e) return r;\n        for (var t = Da(e), n11 = 0; n11 < t.length; ++n11) {\n          var a2 = t[n11], i5 = null, o2 = a2[a2.length - 1], l4 = a2[0];\n          if (o2.onCurve) r.moveTo(o2.x, o2.y);\n          else if (l4.onCurve) r.moveTo(l4.x, l4.y);\n          else {\n            var u3 = { x: (o2.x + l4.x) * 0.5, y: (o2.y + l4.y) * 0.5 };\n            r.moveTo(u3.x, u3.y);\n          }\n          for (var c2 = 0; c2 < a2.length; ++c2) if (i5 = o2, o2 = l4, l4 = a2[(c2 + 1) % a2.length], o2.onCurve) r.lineTo(o2.x, o2.y);\n          else {\n            var d3 = i5, y5 = l4;\n            i5.onCurve || (d3 = { x: (o2.x + i5.x) * 0.5, y: (o2.y + i5.y) * 0.5 }, r.lineTo(d3.x, d3.y)), l4.onCurve || (y5 = { x: (o2.x + l4.x) * 0.5, y: (o2.y + l4.y) * 0.5 }), r.lineTo(d3.x, d3.y), r.quadraticCurveTo(o2.x, o2.y, y5.x, y5.y);\n          }\n          r.closePath();\n        }\n        return r;\n      }\n      function Aa(e, r) {\n        if (r.isComposite) for (var t = 0; t < r.components.length; t += 1) {\n          var n11 = r.components[t], a2 = e.get(n11.glyphIndex);\n          if (a2.getPath(), a2.points) {\n            var i5 = void 0;\n            if (n11.matchedPoints === void 0) i5 = Hr2(a2.points, n11);\n            else {\n              if (n11.matchedPoints[0] > r.points.length - 1 || n11.matchedPoints[1] > a2.points.length - 1) throw Error("Matched points out of range in " + r.name);\n              var o2 = r.points[n11.matchedPoints[0]], l4 = a2.points[n11.matchedPoints[1]], u3 = { xScale: n11.xScale, scale01: n11.scale01, scale10: n11.scale10, yScale: n11.yScale, dx: 0, dy: 0 };\n              l4 = Hr2([l4], u3)[0], u3.dx = o2.x - l4.x, u3.dy = o2.y - l4.y, i5 = Hr2(a2.points, u3);\n            }\n            r.points = r.points.concat(i5);\n          }\n        }\n        return Dt3(r.points);\n      }\n      function Ma(e, r, t, n11) {\n        for (var a2 = new qe2.GlyphSet(n11), i5 = 0; i5 < t.length - 1; i5 += 1) {\n          var o2 = t[i5], l4 = t[i5 + 1];\n          o2 !== l4 ? a2.push(i5, qe2.ttfGlyphLoader(n11, i5, Ra, e, r + o2, Aa)) : a2.push(i5, qe2.glyphLoader(n11, i5));\n        }\n        return a2;\n      }\n      var At3 = { getPath: Dt3, parse: Ma };\n      function Ba(e, r) {\n        var t = r || new Z5();\n        return { configurable: true, get: function() {\n          return typeof t == "function" && (t = t()), t;\n        }, set: function(n11) {\n          t = n11;\n        } };\n      }\n      function fe3(e) {\n        this.bindConstructorValues(e);\n      }\n      fe3.prototype.bindConstructorValues = function(e) {\n        this.index = e.index || 0, this.name = e.name || null, this.unicode = e.unicode || void 0, this.unicodes = e.unicodes || e.unicode !== void 0 ? [e.unicode] : [], e.xMin && (this.xMin = e.xMin), e.yMin && (this.yMin = e.yMin), e.xMax && (this.xMax = e.xMax), e.yMax && (this.yMax = e.yMax), e.advanceWidth && (this.advanceWidth = e.advanceWidth), Object.defineProperty(this, "path", Ba(this, e.path));\n      }, fe3.prototype.addUnicode = function(e) {\n        this.unicodes.length === 0 && (this.unicode = e), this.unicodes.push(e);\n      }, fe3.prototype.getBoundingBox = function() {\n        return this.path.getBoundingBox();\n      }, fe3.prototype.getPath = function(e, r, t, n11, a2) {\n        e = e !== void 0 ? e : 0, r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 72;\n        var i5, o2;\n        n11 || (n11 = {});\n        var l4 = n11.xScale, u3 = n11.yScale;\n        if (n11.hinting && a2 && a2.hinting && (o2 = this.path && a2.hinting.exec(this, t)), o2) i5 = At3.getPath(o2).commands, e = Math.round(e), r = Math.round(r), l4 = u3 = 1;\n        else {\n          i5 = this.path.commands;\n          var c2 = 1 / this.path.unitsPerEm * t;\n          l4 === void 0 && (l4 = c2), u3 === void 0 && (u3 = c2);\n        }\n        for (var d3 = new Z5(), y5 = 0; y5 < i5.length; y5 += 1) {\n          var g6 = i5[y5];\n          g6.type === "M" ? d3.moveTo(e + g6.x * l4, r + -g6.y * u3) : g6.type === "L" ? d3.lineTo(e + g6.x * l4, r + -g6.y * u3) : g6.type === "Q" ? d3.quadraticCurveTo(e + g6.x1 * l4, r + -g6.y1 * u3, e + g6.x * l4, r + -g6.y * u3) : g6.type === "C" ? d3.curveTo(e + g6.x1 * l4, r + -g6.y1 * u3, e + g6.x2 * l4, r + -g6.y2 * u3, e + g6.x * l4, r + -g6.y * u3) : g6.type === "Z" && d3.closePath();\n        }\n        return d3;\n      }, fe3.prototype.getContours = function() {\n        var e = this;\n        if (this.points === void 0) return [];\n        for (var r = [], t = [], n11 = 0; n11 < this.points.length; n11 += 1) {\n          var a2 = e.points[n11];\n          t.push(a2), a2.lastPointOfContour && (r.push(t), t = []);\n        }\n        return G5.argument(t.length === 0, "There are still points left in the current contour."), r;\n      }, fe3.prototype.getMetrics = function() {\n        for (var e = this.path.commands, r = [], t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11];\n          a2.type !== "Z" && (r.push(a2.x), t.push(a2.y)), (a2.type === "Q" || a2.type === "C") && (r.push(a2.x1), t.push(a2.y1)), a2.type === "C" && (r.push(a2.x2), t.push(a2.y2));\n        }\n        var i5 = { xMin: Math.min.apply(null, r), yMin: Math.min.apply(null, t), xMax: Math.max.apply(null, r), yMax: Math.max.apply(null, t), leftSideBearing: this.leftSideBearing };\n        return isFinite(i5.xMin) || (i5.xMin = 0), isFinite(i5.xMax) || (i5.xMax = this.advanceWidth), isFinite(i5.yMin) || (i5.yMin = 0), isFinite(i5.yMax) || (i5.yMax = 0), i5.rightSideBearing = this.advanceWidth - i5.leftSideBearing - (i5.xMax - i5.xMin), i5;\n      }, fe3.prototype.draw = function(e, r, t, n11, a2) {\n        this.getPath(r, t, n11, a2).draw(e);\n      }, fe3.prototype.drawPoints = function(e, r, t, n11) {\n        function a2(y5, g6, m4, T4) {\n          var O4 = Math.PI * 2;\n          e.beginPath();\n          for (var F4 = 0; F4 < y5.length; F4 += 1) e.moveTo(g6 + y5[F4].x * T4, m4 + y5[F4].y * T4), e.arc(g6 + y5[F4].x * T4, m4 + y5[F4].y * T4, 2, 0, O4, false);\n          e.closePath(), e.fill();\n        }\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 24;\n        for (var i5 = 1 / this.path.unitsPerEm * n11, o2 = [], l4 = [], u3 = this.path, c2 = 0; c2 < u3.commands.length; c2 += 1) {\n          var d3 = u3.commands[c2];\n          d3.x !== void 0 && o2.push({ x: d3.x, y: -d3.y }), d3.x1 !== void 0 && l4.push({ x: d3.x1, y: -d3.y1 }), d3.x2 !== void 0 && l4.push({ x: d3.x2, y: -d3.y2 });\n        }\n        e.fillStyle = "blue", a2(o2, r, t, i5), e.fillStyle = "red", a2(l4, r, t, i5);\n      }, fe3.prototype.drawMetrics = function(e, r, t, n11) {\n        var a2;\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 24, a2 = 1 / this.path.unitsPerEm * n11, e.lineWidth = 1, e.strokeStyle = "black", Be3.line(e, r, -1e4, r, 1e4), Be3.line(e, -1e4, t, 1e4, t);\n        var i5 = this.xMin || 0, o2 = this.yMin || 0, l4 = this.xMax || 0, u3 = this.yMax || 0, c2 = this.advanceWidth || 0;\n        e.strokeStyle = "blue", Be3.line(e, r + i5 * a2, -1e4, r + i5 * a2, 1e4), Be3.line(e, r + l4 * a2, -1e4, r + l4 * a2, 1e4), Be3.line(e, -1e4, t + -o2 * a2, 1e4, t + -o2 * a2), Be3.line(e, -1e4, t + -u3 * a2, 1e4, t + -u3 * a2), e.strokeStyle = "green", Be3.line(e, r + c2 * a2, -1e4, r + c2 * a2, 1e4);\n      };\n      function Sr2(e, r, t) {\n        Object.defineProperty(e, r, { get: function() {\n          return e.path, e[t];\n        }, set: function(n11) {\n          e[t] = n11;\n        }, enumerable: true, configurable: true });\n      }\n      function _r3(e, r) {\n        var t = this;\n        if (this.font = e, this.glyphs = {}, Array.isArray(r)) for (var n11 = 0; n11 < r.length; n11++) t.glyphs[n11] = r[n11];\n        this.length = r && r.length || 0;\n      }\n      _r3.prototype.get = function(e) {\n        return typeof this.glyphs[e] == "function" && (this.glyphs[e] = this.glyphs[e]()), this.glyphs[e];\n      }, _r3.prototype.push = function(e, r) {\n        this.glyphs[e] = r, this.length++;\n      };\n      function Pa(e, r) {\n        return new fe3({ index: r, font: e });\n      }\n      function Ga(e, r, t, n11, a2, i5) {\n        return function() {\n          var o2 = new fe3({ index: r, font: e });\n          return o2.path = function() {\n            t(o2, n11, a2);\n            var l4 = i5(e.glyphs, o2);\n            return l4.unitsPerEm = e.unitsPerEm, l4;\n          }, Sr2(o2, "xMin", "_xMin"), Sr2(o2, "xMax", "_xMax"), Sr2(o2, "yMin", "_yMin"), Sr2(o2, "yMax", "_yMax"), o2;\n        };\n      }\n      function Na(e, r, t, n11) {\n        return function() {\n          var a2 = new fe3({ index: r, font: e });\n          return a2.path = function() {\n            var i5 = t(e, a2, n11);\n            return i5.unitsPerEm = e.unitsPerEm, i5;\n          }, a2;\n        };\n      }\n      var qe2 = { GlyphSet: _r3, glyphLoader: Pa, ttfGlyphLoader: Ga, cffGlyphLoader: Na };\n      function Mt2(e, r) {\n        if (e === r) return true;\n        if (Array.isArray(e) && Array.isArray(r)) {\n          if (e.length !== r.length) return false;\n          for (var t = 0; t < e.length; t += 1) if (!Mt2(e[t], r[t])) return false;\n          return true;\n        } else return false;\n      }\n      function zr(e) {\n        var r;\n        return e.length < 1240 ? r = 107 : e.length < 33900 ? r = 1131 : r = 32768, r;\n      }\n      function Oe3(e, r, t) {\n        var n11 = [], a2 = [], i5 = w6.getCard16(e, r), o2, l4;\n        if (i5 !== 0) {\n          var u3 = w6.getByte(e, r + 2);\n          o2 = r + (i5 + 1) * u3 + 2;\n          for (var c2 = r + 3, d3 = 0; d3 < i5 + 1; d3 += 1) n11.push(w6.getOffset(e, c2, u3)), c2 += u3;\n          l4 = o2 + n11[i5];\n        } else l4 = r + 2;\n        for (var y5 = 0; y5 < n11.length - 1; y5 += 1) {\n          var g6 = w6.getBytes(e, o2 + n11[y5], o2 + n11[y5 + 1]);\n          t && (g6 = t(g6)), a2.push(g6);\n        }\n        return { objects: a2, startOffset: r, endOffset: l4 };\n      }\n      function Ha(e) {\n        for (var r = "", t = 15, n11 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "E", "E-", null, "-"]; ; ) {\n          var a2 = e.parseByte(), i5 = a2 >> 4, o2 = a2 & 15;\n          if (i5 === t || (r += n11[i5], o2 === t)) break;\n          r += n11[o2];\n        }\n        return parseFloat(r);\n      }\n      function _a(e, r) {\n        var t, n11, a2, i5;\n        if (r === 28) return t = e.parseByte(), n11 = e.parseByte(), t << 8 | n11;\n        if (r === 29) return t = e.parseByte(), n11 = e.parseByte(), a2 = e.parseByte(), i5 = e.parseByte(), t << 24 | n11 << 16 | a2 << 8 | i5;\n        if (r === 30) return Ha(e);\n        if (r >= 32 && r <= 246) return r - 139;\n        if (r >= 247 && r <= 250) return t = e.parseByte(), (r - 247) * 256 + t + 108;\n        if (r >= 251 && r <= 254) return t = e.parseByte(), -(r - 251) * 256 - t - 108;\n        throw new Error("Invalid b0 " + r);\n      }\n      function za(e) {\n        for (var r = {}, t = 0; t < e.length; t += 1) {\n          var n11 = e[t][0], a2 = e[t][1], i5 = void 0;\n          if (a2.length === 1 ? i5 = a2[0] : i5 = a2, r.hasOwnProperty(n11) && !isNaN(r[n11])) throw new Error("Object " + r + " already has key " + n11);\n          r[n11] = i5;\n        }\n        return r;\n      }\n      function Bt2(e, r, t) {\n        r = r !== void 0 ? r : 0;\n        var n11 = new w6.Parser(e, r), a2 = [], i5 = [];\n        for (t = t !== void 0 ? t : e.length; n11.relativeOffset < t; ) {\n          var o2 = n11.parseByte();\n          o2 <= 21 ? (o2 === 12 && (o2 = 1200 + n11.parseByte()), a2.push([o2, i5]), i5 = []) : i5.push(_a(n11, o2));\n        }\n        return za(a2);\n      }\n      function $e2(e, r) {\n        return r <= 390 ? r = br2[r] : r = e[r - 391], r;\n      }\n      function Pt2(e, r, t) {\n        for (var n11 = {}, a2, i5 = 0; i5 < r.length; i5 += 1) {\n          var o2 = r[i5];\n          if (Array.isArray(o2.type)) {\n            var l4 = [];\n            l4.length = o2.type.length;\n            for (var u3 = 0; u3 < o2.type.length; u3++) a2 = e[o2.op] !== void 0 ? e[o2.op][u3] : void 0, a2 === void 0 && (a2 = o2.value !== void 0 && o2.value[u3] !== void 0 ? o2.value[u3] : null), o2.type[u3] === "SID" && (a2 = $e2(t, a2)), l4[u3] = a2;\n            n11[o2.name] = l4;\n          } else a2 = e[o2.op], a2 === void 0 && (a2 = o2.value !== void 0 ? o2.value : null), o2.type === "SID" && (a2 = $e2(t, a2)), n11[o2.name] = a2;\n        }\n        return n11;\n      }\n      function Wa(e, r) {\n        var t = {};\n        return t.formatMajor = w6.getCard8(e, r), t.formatMinor = w6.getCard8(e, r + 1), t.size = w6.getCard8(e, r + 2), t.offsetSize = w6.getCard8(e, r + 3), t.startOffset = r, t.endOffset = r + 4, t;\n      }\n      var Gt3 = [{ name: "version", op: 0, type: "SID" }, { name: "notice", op: 1, type: "SID" }, { name: "copyright", op: 1200, type: "SID" }, { name: "fullName", op: 2, type: "SID" }, { name: "familyName", op: 3, type: "SID" }, { name: "weight", op: 4, type: "SID" }, { name: "isFixedPitch", op: 1201, type: "number", value: 0 }, { name: "italicAngle", op: 1202, type: "number", value: 0 }, { name: "underlinePosition", op: 1203, type: "number", value: -100 }, { name: "underlineThickness", op: 1204, type: "number", value: 50 }, { name: "paintType", op: 1205, type: "number", value: 0 }, { name: "charstringType", op: 1206, type: "number", value: 2 }, { name: "fontMatrix", op: 1207, type: ["real", "real", "real", "real", "real", "real"], value: [1e-3, 0, 0, 1e-3, 0, 0] }, { name: "uniqueId", op: 13, type: "number" }, { name: "fontBBox", op: 5, type: ["number", "number", "number", "number"], value: [0, 0, 0, 0] }, { name: "strokeWidth", op: 1208, type: "number", value: 0 }, { name: "xuid", op: 14, type: [], value: null }, { name: "charset", op: 15, type: "offset", value: 0 }, { name: "encoding", op: 16, type: "offset", value: 0 }, { name: "charStrings", op: 17, type: "offset", value: 0 }, { name: "private", op: 18, type: ["number", "offset"], value: [0, 0] }, { name: "ros", op: 1230, type: ["SID", "SID", "number"] }, { name: "cidFontVersion", op: 1231, type: "number", value: 0 }, { name: "cidFontRevision", op: 1232, type: "number", value: 0 }, { name: "cidFontType", op: 1233, type: "number", value: 0 }, { name: "cidCount", op: 1234, type: "number", value: 8720 }, { name: "uidBase", op: 1235, type: "number" }, { name: "fdArray", op: 1236, type: "offset" }, { name: "fdSelect", op: 1237, type: "offset" }, { name: "fontName", op: 1238, type: "SID" }], Nt4 = [{ name: "subrs", op: 19, type: "offset", value: 0 }, { name: "defaultWidthX", op: 20, type: "number", value: 0 }, { name: "nominalWidthX", op: 21, type: "number", value: 0 }];\n      function Va(e, r) {\n        var t = Bt2(e, 0, e.byteLength);\n        return Pt2(t, Gt3, r);\n      }\n      function Ht2(e, r, t, n11) {\n        var a2 = Bt2(e, r, t);\n        return Pt2(a2, Nt4, n11);\n      }\n      function _t3(e, r, t, n11) {\n        for (var a2 = [], i5 = 0; i5 < t.length; i5 += 1) {\n          var o2 = new DataView(new Uint8Array(t[i5]).buffer), l4 = Va(o2, n11);\n          l4._subrs = [], l4._subrsBias = 0;\n          var u3 = l4.private[0], c2 = l4.private[1];\n          if (u3 !== 0 && c2 !== 0) {\n            var d3 = Ht2(e, c2 + r, u3, n11);\n            if (l4._defaultWidthX = d3.defaultWidthX, l4._nominalWidthX = d3.nominalWidthX, d3.subrs !== 0) {\n              var y5 = c2 + d3.subrs, g6 = Oe3(e, y5 + r);\n              l4._subrs = g6.objects, l4._subrsBias = zr(l4._subrs);\n            }\n            l4._privateDict = d3;\n          }\n          a2.push(l4);\n        }\n        return a2;\n      }\n      function qa(e, r, t, n11) {\n        var a2, i5, o2 = new w6.Parser(e, r);\n        t -= 1;\n        var l4 = [".notdef"], u3 = o2.parseCard8();\n        if (u3 === 0) for (var c2 = 0; c2 < t; c2 += 1) a2 = o2.parseSID(), l4.push($e2(n11, a2));\n        else if (u3 === 1) for (; l4.length <= t; ) {\n          a2 = o2.parseSID(), i5 = o2.parseCard8();\n          for (var d3 = 0; d3 <= i5; d3 += 1) l4.push($e2(n11, a2)), a2 += 1;\n        }\n        else if (u3 === 2) for (; l4.length <= t; ) {\n          a2 = o2.parseSID(), i5 = o2.parseCard16();\n          for (var y5 = 0; y5 <= i5; y5 += 1) l4.push($e2(n11, a2)), a2 += 1;\n        }\n        else throw new Error("Unknown charset format " + u3);\n        return l4;\n      }\n      function Xa(e, r, t) {\n        var n11, a2 = {}, i5 = new w6.Parser(e, r), o2 = i5.parseCard8();\n        if (o2 === 0) for (var l4 = i5.parseCard8(), u3 = 0; u3 < l4; u3 += 1) n11 = i5.parseCard8(), a2[n11] = u3;\n        else if (o2 === 1) {\n          var c2 = i5.parseCard8();\n          n11 = 1;\n          for (var d3 = 0; d3 < c2; d3 += 1) for (var y5 = i5.parseCard8(), g6 = i5.parseCard8(), m4 = y5; m4 <= y5 + g6; m4 += 1) a2[m4] = n11, n11 += 1;\n        } else throw new Error("Unknown encoding format " + o2);\n        return new xr2(a2, t);\n      }\n      function Ya(e, r, t) {\n        var n11, a2, i5, o2, l4 = new Z5(), u3 = [], c2 = 0, d3 = false, y5 = false, g6 = 0, m4 = 0, T4, O4, F4, U6;\n        if (e.isCIDFont) {\n          var P5 = e.tables.cff.topDict._fdSelect[r.index], I4 = e.tables.cff.topDict._fdArray[P5];\n          T4 = I4._subrs, O4 = I4._subrsBias, F4 = I4._defaultWidthX, U6 = I4._nominalWidthX;\n        } else T4 = e.tables.cff.topDict._subrs, O4 = e.tables.cff.topDict._subrsBias, F4 = e.tables.cff.topDict._defaultWidthX, U6 = e.tables.cff.topDict._nominalWidthX;\n        var H5 = F4;\n        function R4(q3, K4) {\n          y5 && l4.closePath(), l4.moveTo(q3, K4), y5 = true;\n        }\n        function B5() {\n          var q3;\n          q3 = u3.length % 2 !== 0, q3 && !d3 && (H5 = u3.shift() + U6), c2 += u3.length >> 1, u3.length = 0, d3 = true;\n        }\n        function ue2(q3) {\n          for (var K4, se3, le3, pe2, de3, J5, j5, re3, te3, ne3, oe4, he3, Y2 = 0; Y2 < q3.length; ) {\n            var ae4 = q3[Y2];\n            switch (Y2 += 1, ae4) {\n              case 1:\n                B5();\n                break;\n              case 3:\n                B5();\n                break;\n              case 4:\n                u3.length > 1 && !d3 && (H5 = u3.shift() + U6, d3 = true), m4 += u3.pop(), R4(g6, m4);\n                break;\n              case 5:\n                for (; u3.length > 0; ) g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 6:\n                for (; u3.length > 0 && (g6 += u3.shift(), l4.lineTo(g6, m4), u3.length !== 0); ) m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 7:\n                for (; u3.length > 0 && (m4 += u3.shift(), l4.lineTo(g6, m4), u3.length !== 0); ) g6 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 8:\n                for (; u3.length > 0; ) n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 10:\n                de3 = u3.pop() + O4, J5 = T4[de3], J5 && ue2(J5);\n                break;\n              case 11:\n                return;\n              case 12:\n                switch (ae4 = q3[Y2], Y2 += 1, ae4) {\n                  case 35:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2 + u3.shift(), te3 = j5 + u3.shift(), ne3 = re3 + u3.shift(), oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), g6 = oe4 + u3.shift(), m4 = he3 + u3.shift(), u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 34:\n                    n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2, te3 = j5 + u3.shift(), ne3 = o2, oe4 = te3 + u3.shift(), he3 = m4, g6 = oe4 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 36:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2, te3 = j5 + u3.shift(), ne3 = o2, oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), g6 = oe4 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 37:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2 + u3.shift(), te3 = j5 + u3.shift(), ne3 = re3 + u3.shift(), oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), Math.abs(oe4 - g6) > Math.abs(he3 - m4) ? g6 = oe4 + u3.shift() : m4 = he3 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  default:\n                    console.log("Glyph " + r.index + ": unknown operator 1200" + ae4), u3.length = 0;\n                }\n                break;\n              case 14:\n                u3.length > 0 && !d3 && (H5 = u3.shift() + U6, d3 = true), y5 && (l4.closePath(), y5 = false);\n                break;\n              case 18:\n                B5();\n                break;\n              case 19:\n              case 20:\n                B5(), Y2 += c2 + 7 >> 3;\n                break;\n              case 21:\n                u3.length > 2 && !d3 && (H5 = u3.shift() + U6, d3 = true), m4 += u3.pop(), g6 += u3.pop(), R4(g6, m4);\n                break;\n              case 22:\n                u3.length > 1 && !d3 && (H5 = u3.shift() + U6, d3 = true), g6 += u3.pop(), R4(g6, m4);\n                break;\n              case 23:\n                B5();\n                break;\n              case 24:\n                for (; u3.length > 2; ) n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 25:\n                for (; u3.length > 6; ) g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 26:\n                for (u3.length % 2 && (g6 += u3.shift()); u3.length > 0; ) n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5, m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 27:\n                for (u3.length % 2 && (m4 += u3.shift()); u3.length > 0; ) n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2, l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 28:\n                K4 = q3[Y2], se3 = q3[Y2 + 1], u3.push((K4 << 24 | se3 << 16) >> 16), Y2 += 2;\n                break;\n              case 29:\n                de3 = u3.pop() + e.gsubrsBias, J5 = e.gsubrs[de3], J5 && ue2(J5);\n                break;\n              case 30:\n                for (; u3.length > 0 && (n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4), u3.length !== 0); ) n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), m4 = o2 + u3.shift(), g6 = i5 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 31:\n                for (; u3.length > 0 && (n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), m4 = o2 + u3.shift(), g6 = i5 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4), u3.length !== 0); ) n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              default:\n                ae4 < 32 ? console.log("Glyph " + r.index + ": unknown operator " + ae4) : ae4 < 247 ? u3.push(ae4 - 139) : ae4 < 251 ? (K4 = q3[Y2], Y2 += 1, u3.push((ae4 - 247) * 256 + K4 + 108)) : ae4 < 255 ? (K4 = q3[Y2], Y2 += 1, u3.push(-(ae4 - 251) * 256 - K4 - 108)) : (K4 = q3[Y2], se3 = q3[Y2 + 1], le3 = q3[Y2 + 2], pe2 = q3[Y2 + 3], Y2 += 4, u3.push((K4 << 24 | se3 << 16 | le3 << 8 | pe2) / 65536));\n            }\n          }\n        }\n        return ue2(t), r.advanceWidth = H5, l4;\n      }\n      function Za(e, r, t, n11) {\n        var a2 = [], i5, o2 = new w6.Parser(e, r), l4 = o2.parseCard8();\n        if (l4 === 0) for (var u3 = 0; u3 < t; u3++) {\n          if (i5 = o2.parseCard8(), i5 >= n11) throw new Error("CFF table CID Font FDSelect has bad FD index value " + i5 + " (FD count " + n11 + ")");\n          a2.push(i5);\n        }\n        else if (l4 === 3) {\n          var c2 = o2.parseCard16(), d3 = o2.parseCard16();\n          if (d3 !== 0) throw new Error("CFF Table CID Font FDSelect format 3 range has bad initial GID " + d3);\n          for (var y5, g6 = 0; g6 < c2; g6++) {\n            if (i5 = o2.parseCard8(), y5 = o2.parseCard16(), i5 >= n11) throw new Error("CFF table CID Font FDSelect has bad FD index value " + i5 + " (FD count " + n11 + ")");\n            if (y5 > t) throw new Error("CFF Table CID Font FDSelect format 3 range has bad GID " + y5);\n            for (; d3 < y5; d3++) a2.push(i5);\n            d3 = y5;\n          }\n          if (y5 !== t) throw new Error("CFF Table CID Font FDSelect format 3 range has bad final GID " + y5);\n        } else throw new Error("CFF Table CID Font FDSelect table has unsupported format " + l4);\n        return a2;\n      }\n      function Qa(e, r, t) {\n        t.tables.cff = {};\n        var n11 = Wa(e, r), a2 = Oe3(e, n11.endOffset, w6.bytesToString), i5 = Oe3(e, a2.endOffset), o2 = Oe3(e, i5.endOffset, w6.bytesToString), l4 = Oe3(e, o2.endOffset);\n        t.gsubrs = l4.objects, t.gsubrsBias = zr(t.gsubrs);\n        var u3 = _t3(e, r, i5.objects, o2.objects);\n        if (u3.length !== 1) throw new Error("CFF table has too many fonts in \'FontSet\' - count of fonts NameIndex.length = " + u3.length);\n        var c2 = u3[0];\n        if (t.tables.cff.topDict = c2, c2._privateDict && (t.defaultWidthX = c2._privateDict.defaultWidthX, t.nominalWidthX = c2._privateDict.nominalWidthX), c2.ros[0] !== void 0 && c2.ros[1] !== void 0 && (t.isCIDFont = true), t.isCIDFont) {\n          var d3 = c2.fdArray, y5 = c2.fdSelect;\n          if (d3 === 0 || y5 === 0) throw new Error("Font is marked as a CID font, but FDArray and/or FDSelect information is missing");\n          d3 += r;\n          var g6 = Oe3(e, d3), m4 = _t3(e, r, g6.objects, o2.objects);\n          c2._fdArray = m4, y5 += r, c2._fdSelect = Za(e, y5, t.numGlyphs, m4.length);\n        }\n        var T4 = r + c2.private[1], O4 = Ht2(e, T4, c2.private[0], o2.objects);\n        if (t.defaultWidthX = O4.defaultWidthX, t.nominalWidthX = O4.nominalWidthX, O4.subrs !== 0) {\n          var F4 = T4 + O4.subrs, U6 = Oe3(e, F4);\n          t.subrs = U6.objects, t.subrsBias = zr(t.subrs);\n        } else t.subrs = [], t.subrsBias = 0;\n        var P5 = Oe3(e, r + c2.charStrings);\n        t.nGlyphs = P5.objects.length;\n        var I4 = qa(e, r + c2.charset, t.nGlyphs, o2.objects);\n        c2.encoding === 0 ? t.cffEncoding = new xr2(Oa, I4) : c2.encoding === 1 ? t.cffEncoding = new xr2(Ia, I4) : t.cffEncoding = Xa(e, r + c2.encoding, I4), t.encoding = t.encoding || t.cffEncoding, t.glyphs = new qe2.GlyphSet(t);\n        for (var H5 = 0; H5 < t.nGlyphs; H5 += 1) {\n          var R4 = P5.objects[H5];\n          t.glyphs.push(H5, qe2.cffGlyphLoader(t, H5, Ya, R4));\n        }\n      }\n      function zt3(e, r) {\n        var t, n11 = br2.indexOf(e);\n        return n11 >= 0 && (t = n11), n11 = r.indexOf(e), n11 >= 0 ? t = n11 + br2.length : (t = br2.length + r.length, r.push(e)), t;\n      }\n      function Ja() {\n        return new A4.Record("Header", [{ name: "major", type: "Card8", value: 1 }, { name: "minor", type: "Card8", value: 0 }, { name: "hdrSize", type: "Card8", value: 4 }, { name: "major", type: "Card8", value: 1 }]);\n      }\n      function Ka(e) {\n        var r = new A4.Record("Name INDEX", [{ name: "names", type: "INDEX", value: [] }]);\n        r.names = [];\n        for (var t = 0; t < e.length; t += 1) r.names.push({ name: "name_" + t, type: "NAME", value: e[t] });\n        return r;\n      }\n      function Wt2(e, r, t) {\n        for (var n11 = {}, a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = e[a2], o2 = r[i5.name];\n          o2 !== void 0 && !Mt2(o2, i5.value) && (i5.type === "SID" && (o2 = zt3(o2, t)), n11[i5.op] = { name: i5.name, type: i5.type, value: o2 });\n        }\n        return n11;\n      }\n      function Vt3(e, r) {\n        var t = new A4.Record("Top DICT", [{ name: "dict", type: "DICT", value: {} }]);\n        return t.dict = Wt2(Gt3, e, r), t;\n      }\n      function qt3(e) {\n        var r = new A4.Record("Top DICT INDEX", [{ name: "topDicts", type: "INDEX", value: [] }]);\n        return r.topDicts = [{ name: "topDict_0", type: "TABLE", value: e }], r;\n      }\n      function ja(e) {\n        var r = new A4.Record("String INDEX", [{ name: "strings", type: "INDEX", value: [] }]);\n        r.strings = [];\n        for (var t = 0; t < e.length; t += 1) r.strings.push({ name: "string_" + t, type: "STRING", value: e[t] });\n        return r;\n      }\n      function $a() {\n        return new A4.Record("Global Subr INDEX", [{ name: "subrs", type: "INDEX", value: [] }]);\n      }\n      function ei2(e, r) {\n        for (var t = new A4.Record("Charsets", [{ name: "format", type: "Card8", value: 0 }]), n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11], i5 = zt3(a2, r);\n          t.fields.push({ name: "glyph_" + n11, type: "SID", value: i5 });\n        }\n        return t;\n      }\n      function ri2(e) {\n        var r = [], t = e.path;\n        r.push({ name: "width", type: "NUMBER", value: e.advanceWidth });\n        for (var n11 = 0, a2 = 0, i5 = 0; i5 < t.commands.length; i5 += 1) {\n          var o2 = void 0, l4 = void 0, u3 = t.commands[i5];\n          if (u3.type === "Q") {\n            var c2 = 0.3333333333333333, d3 = 2 / 3;\n            u3 = { type: "C", x: u3.x, y: u3.y, x1: c2 * n11 + d3 * u3.x1, y1: c2 * a2 + d3 * u3.y1, x2: c2 * u3.x + d3 * u3.x1, y2: c2 * u3.y + d3 * u3.y1 };\n          }\n          if (u3.type === "M") o2 = Math.round(u3.x - n11), l4 = Math.round(u3.y - a2), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rmoveto", type: "OP", value: 21 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          else if (u3.type === "L") o2 = Math.round(u3.x - n11), l4 = Math.round(u3.y - a2), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rlineto", type: "OP", value: 5 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          else if (u3.type === "C") {\n            var y5 = Math.round(u3.x1 - n11), g6 = Math.round(u3.y1 - a2), m4 = Math.round(u3.x2 - u3.x1), T4 = Math.round(u3.y2 - u3.y1);\n            o2 = Math.round(u3.x - u3.x2), l4 = Math.round(u3.y - u3.y2), r.push({ name: "dx1", type: "NUMBER", value: y5 }), r.push({ name: "dy1", type: "NUMBER", value: g6 }), r.push({ name: "dx2", type: "NUMBER", value: m4 }), r.push({ name: "dy2", type: "NUMBER", value: T4 }), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rrcurveto", type: "OP", value: 8 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          }\n        }\n        return r.push({ name: "endchar", type: "OP", value: 14 }), r;\n      }\n      function ti2(e) {\n        for (var r = new A4.Record("CharStrings INDEX", [{ name: "charStrings", type: "INDEX", value: [] }]), t = 0; t < e.length; t += 1) {\n          var n11 = e.get(t), a2 = ri2(n11);\n          r.charStrings.push({ name: n11.name, type: "CHARSTRING", value: a2 });\n        }\n        return r;\n      }\n      function ni(e, r) {\n        var t = new A4.Record("Private DICT", [{ name: "dict", type: "DICT", value: {} }]);\n        return t.dict = Wt2(Nt4, e, r), t;\n      }\n      function ai2(e, r) {\n        for (var t = new A4.Table("CFF ", [{ name: "header", type: "RECORD" }, { name: "nameIndex", type: "RECORD" }, { name: "topDictIndex", type: "RECORD" }, { name: "stringIndex", type: "RECORD" }, { name: "globalSubrIndex", type: "RECORD" }, { name: "charsets", type: "RECORD" }, { name: "charStringsIndex", type: "RECORD" }, { name: "privateDict", type: "RECORD" }]), n11 = 1 / r.unitsPerEm, a2 = { version: r.version, fullName: r.fullName, familyName: r.familyName, weight: r.weightName, fontBBox: r.fontBBox || [0, 0, 0, 0], fontMatrix: [n11, 0, 0, n11, 0, 0], charset: 999, encoding: 0, charStrings: 999, private: [0, 999] }, i5 = {}, o2 = [], l4, u3 = 1; u3 < e.length; u3 += 1) l4 = e.get(u3), o2.push(l4.name);\n        var c2 = [];\n        t.header = Ja(), t.nameIndex = Ka([r.postScriptName]);\n        var d3 = Vt3(a2, c2);\n        t.topDictIndex = qt3(d3), t.globalSubrIndex = $a(), t.charsets = ei2(o2, c2), t.charStringsIndex = ti2(e), t.privateDict = ni(i5, c2), t.stringIndex = ja(c2);\n        var y5 = t.header.sizeOf() + t.nameIndex.sizeOf() + t.topDictIndex.sizeOf() + t.stringIndex.sizeOf() + t.globalSubrIndex.sizeOf();\n        return a2.charset = y5, a2.encoding = 0, a2.charStrings = a2.charset + t.charsets.sizeOf(), a2.private[1] = a2.charStrings + t.charStringsIndex.sizeOf(), d3 = Vt3(a2, c2), t.topDictIndex = qt3(d3), t;\n      }\n      var Xt3 = { parse: Qa, make: ai2 };\n      function ii2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.fontRevision = Math.round(n11.parseFixed() * 1e3) / 1e3, t.checkSumAdjustment = n11.parseULong(), t.magicNumber = n11.parseULong(), G5.argument(t.magicNumber === 1594834165, "Font header has wrong magic number."), t.flags = n11.parseUShort(), t.unitsPerEm = n11.parseUShort(), t.created = n11.parseLongDateTime(), t.modified = n11.parseLongDateTime(), t.xMin = n11.parseShort(), t.yMin = n11.parseShort(), t.xMax = n11.parseShort(), t.yMax = n11.parseShort(), t.macStyle = n11.parseUShort(), t.lowestRecPPEM = n11.parseUShort(), t.fontDirectionHint = n11.parseShort(), t.indexToLocFormat = n11.parseShort(), t.glyphDataFormat = n11.parseShort(), t;\n      }\n      function si2(e) {\n        var r = Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3) + 2082844800, t = r;\n        return e.createdTimestamp && (t = e.createdTimestamp + 2082844800), new A4.Table("head", [{ name: "version", type: "FIXED", value: 65536 }, { name: "fontRevision", type: "FIXED", value: 65536 }, { name: "checkSumAdjustment", type: "ULONG", value: 0 }, { name: "magicNumber", type: "ULONG", value: 1594834165 }, { name: "flags", type: "USHORT", value: 0 }, { name: "unitsPerEm", type: "USHORT", value: 1e3 }, { name: "created", type: "LONGDATETIME", value: t }, { name: "modified", type: "LONGDATETIME", value: r }, { name: "xMin", type: "SHORT", value: 0 }, { name: "yMin", type: "SHORT", value: 0 }, { name: "xMax", type: "SHORT", value: 0 }, { name: "yMax", type: "SHORT", value: 0 }, { name: "macStyle", type: "USHORT", value: 0 }, { name: "lowestRecPPEM", type: "USHORT", value: 0 }, { name: "fontDirectionHint", type: "SHORT", value: 2 }, { name: "indexToLocFormat", type: "SHORT", value: 0 }, { name: "glyphDataFormat", type: "SHORT", value: 0 }], e);\n      }\n      var Yt3 = { parse: ii2, make: si2 };\n      function oi2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.ascender = n11.parseShort(), t.descender = n11.parseShort(), t.lineGap = n11.parseShort(), t.advanceWidthMax = n11.parseUShort(), t.minLeftSideBearing = n11.parseShort(), t.minRightSideBearing = n11.parseShort(), t.xMaxExtent = n11.parseShort(), t.caretSlopeRise = n11.parseShort(), t.caretSlopeRun = n11.parseShort(), t.caretOffset = n11.parseShort(), n11.relativeOffset += 8, t.metricDataFormat = n11.parseShort(), t.numberOfHMetrics = n11.parseUShort(), t;\n      }\n      function ui2(e) {\n        return new A4.Table("hhea", [{ name: "version", type: "FIXED", value: 65536 }, { name: "ascender", type: "FWORD", value: 0 }, { name: "descender", type: "FWORD", value: 0 }, { name: "lineGap", type: "FWORD", value: 0 }, { name: "advanceWidthMax", type: "UFWORD", value: 0 }, { name: "minLeftSideBearing", type: "FWORD", value: 0 }, { name: "minRightSideBearing", type: "FWORD", value: 0 }, { name: "xMaxExtent", type: "FWORD", value: 0 }, { name: "caretSlopeRise", type: "SHORT", value: 1 }, { name: "caretSlopeRun", type: "SHORT", value: 0 }, { name: "caretOffset", type: "SHORT", value: 0 }, { name: "reserved1", type: "SHORT", value: 0 }, { name: "reserved2", type: "SHORT", value: 0 }, { name: "reserved3", type: "SHORT", value: 0 }, { name: "reserved4", type: "SHORT", value: 0 }, { name: "metricDataFormat", type: "SHORT", value: 0 }, { name: "numberOfHMetrics", type: "USHORT", value: 0 }], e);\n      }\n      var Zt3 = { parse: oi2, make: ui2 };\n      function li2(e, r, t, n11, a2) {\n        for (var i5, o2, l4 = new w6.Parser(e, r), u3 = 0; u3 < n11; u3 += 1) {\n          u3 < t && (i5 = l4.parseUShort(), o2 = l4.parseShort());\n          var c2 = a2.get(u3);\n          c2.advanceWidth = i5, c2.leftSideBearing = o2;\n        }\n      }\n      function fi2(e) {\n        for (var r = new A4.Table("hmtx", []), t = 0; t < e.length; t += 1) {\n          var n11 = e.get(t), a2 = n11.advanceWidth || 0, i5 = n11.leftSideBearing || 0;\n          r.fields.push({ name: "advanceWidth_" + t, type: "USHORT", value: a2 }), r.fields.push({ name: "leftSideBearing_" + t, type: "SHORT", value: i5 });\n        }\n        return r;\n      }\n      var Qt3 = { parse: li2, make: fi2 };\n      function pi2(e) {\n        for (var r = new A4.Table("ltag", [{ name: "version", type: "ULONG", value: 1 }, { name: "flags", type: "ULONG", value: 0 }, { name: "numTags", type: "ULONG", value: e.length }]), t = "", n11 = 12 + e.length * 4, a2 = 0; a2 < e.length; ++a2) {\n          var i5 = t.indexOf(e[a2]);\n          i5 < 0 && (i5 = t.length, t += e[a2]), r.fields.push({ name: "offset " + a2, type: "USHORT", value: n11 + i5 }), r.fields.push({ name: "length " + a2, type: "USHORT", value: e[a2].length });\n        }\n        return r.fields.push({ name: "stringPool", type: "CHARARRAY", value: t }), r;\n      }\n      function hi2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseULong();\n        G5.argument(n11 === 1, "Unsupported ltag table version."), t.skip("uLong", 1);\n        for (var a2 = t.parseULong(), i5 = [], o2 = 0; o2 < a2; o2++) {\n          for (var l4 = "", u3 = r + t.parseUShort(), c2 = t.parseUShort(), d3 = u3; d3 < u3 + c2; ++d3) l4 += String.fromCharCode(e.getInt8(d3));\n          i5.push(l4);\n        }\n        return i5;\n      }\n      var Jt2 = { make: pi2, parse: hi2 };\n      function ci2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.numGlyphs = n11.parseUShort(), t.version === 1 && (t.maxPoints = n11.parseUShort(), t.maxContours = n11.parseUShort(), t.maxCompositePoints = n11.parseUShort(), t.maxCompositeContours = n11.parseUShort(), t.maxZones = n11.parseUShort(), t.maxTwilightPoints = n11.parseUShort(), t.maxStorage = n11.parseUShort(), t.maxFunctionDefs = n11.parseUShort(), t.maxInstructionDefs = n11.parseUShort(), t.maxStackElements = n11.parseUShort(), t.maxSizeOfInstructions = n11.parseUShort(), t.maxComponentElements = n11.parseUShort(), t.maxComponentDepth = n11.parseUShort()), t;\n      }\n      function vi(e) {\n        return new A4.Table("maxp", [{ name: "version", type: "FIXED", value: 20480 }, { name: "numGlyphs", type: "USHORT", value: e }]);\n      }\n      var Kt2 = { parse: ci2, make: vi }, jt2 = ["copyright", "fontFamily", "fontSubfamily", "uniqueID", "fullName", "version", "postScriptName", "trademark", "manufacturer", "designer", "description", "manufacturerURL", "designerURL", "license", "licenseURL", "reserved", "preferredFamily", "preferredSubfamily", "compatibleFullName", "sampleText", "postScriptFindFontName", "wwsFamily", "wwsSubfamily"], $t3 = { 0: "en", 1: "fr", 2: "de", 3: "it", 4: "nl", 5: "sv", 6: "es", 7: "da", 8: "pt", 9: "no", 10: "he", 11: "ja", 12: "ar", 13: "fi", 14: "el", 15: "is", 16: "mt", 17: "tr", 18: "hr", 19: "zh-Hant", 20: "ur", 21: "hi", 22: "th", 23: "ko", 24: "lt", 25: "pl", 26: "hu", 27: "es", 28: "lv", 29: "se", 30: "fo", 31: "fa", 32: "ru", 33: "zh", 34: "nl-BE", 35: "ga", 36: "sq", 37: "ro", 38: "cz", 39: "sk", 40: "si", 41: "yi", 42: "sr", 43: "mk", 44: "bg", 45: "uk", 46: "be", 47: "uz", 48: "kk", 49: "az-Cyrl", 50: "az-Arab", 51: "hy", 52: "ka", 53: "mo", 54: "ky", 55: "tg", 56: "tk", 57: "mn-CN", 58: "mn", 59: "ps", 60: "ks", 61: "ku", 62: "sd", 63: "bo", 64: "ne", 65: "sa", 66: "mr", 67: "bn", 68: "as", 69: "gu", 70: "pa", 71: "or", 72: "ml", 73: "kn", 74: "ta", 75: "te", 76: "si", 77: "my", 78: "km", 79: "lo", 80: "vi", 81: "id", 82: "tl", 83: "ms", 84: "ms-Arab", 85: "am", 86: "ti", 87: "om", 88: "so", 89: "sw", 90: "rw", 91: "rn", 92: "ny", 93: "mg", 94: "eo", 128: "cy", 129: "eu", 130: "ca", 131: "la", 132: "qu", 133: "gn", 134: "ay", 135: "tt", 136: "ug", 137: "dz", 138: "jv", 139: "su", 140: "gl", 141: "af", 142: "br", 143: "iu", 144: "gd", 145: "gv", 146: "ga", 147: "to", 148: "el-polyton", 149: "kl", 150: "az", 151: "nn" }, di2 = { 0: 0, 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0, 9: 0, 10: 5, 11: 1, 12: 4, 13: 0, 14: 6, 15: 0, 16: 0, 17: 0, 18: 0, 19: 2, 20: 4, 21: 9, 22: 21, 23: 3, 24: 29, 25: 29, 26: 29, 27: 29, 28: 29, 29: 0, 30: 0, 31: 4, 32: 7, 33: 25, 34: 0, 35: 0, 36: 0, 37: 0, 38: 29, 39: 29, 40: 0, 41: 5, 42: 7, 43: 7, 44: 7, 45: 7, 46: 7, 47: 7, 48: 7, 49: 7, 50: 4, 51: 24, 52: 23, 53: 7, 54: 7, 55: 7, 56: 7, 57: 27, 58: 7, 59: 4, 60: 4, 61: 4, 62: 4, 63: 26, 64: 9, 65: 9, 66: 9, 67: 13, 68: 13, 69: 11, 70: 10, 71: 12, 72: 17, 73: 16, 74: 14, 75: 15, 76: 18, 77: 19, 78: 20, 79: 22, 80: 30, 81: 0, 82: 0, 83: 0, 84: 4, 85: 28, 86: 28, 87: 28, 88: 0, 89: 0, 90: 0, 91: 0, 92: 0, 93: 0, 94: 0, 128: 0, 129: 0, 130: 0, 131: 0, 132: 0, 133: 0, 134: 0, 135: 7, 136: 4, 137: 26, 138: 0, 139: 0, 140: 0, 141: 0, 142: 0, 143: 28, 144: 0, 145: 0, 146: 0, 147: 0, 148: 6, 149: 0, 150: 0, 151: 0 }, en2 = { 1078: "af", 1052: "sq", 1156: "gsw", 1118: "am", 5121: "ar-DZ", 15361: "ar-BH", 3073: "ar", 2049: "ar-IQ", 11265: "ar-JO", 13313: "ar-KW", 12289: "ar-LB", 4097: "ar-LY", 6145: "ary", 8193: "ar-OM", 16385: "ar-QA", 1025: "ar-SA", 10241: "ar-SY", 7169: "aeb", 14337: "ar-AE", 9217: "ar-YE", 1067: "hy", 1101: "as", 2092: "az-Cyrl", 1068: "az", 1133: "ba", 1069: "eu", 1059: "be", 2117: "bn", 1093: "bn-IN", 8218: "bs-Cyrl", 5146: "bs", 1150: "br", 1026: "bg", 1027: "ca", 3076: "zh-HK", 5124: "zh-MO", 2052: "zh", 4100: "zh-SG", 1028: "zh-TW", 1155: "co", 1050: "hr", 4122: "hr-BA", 1029: "cs", 1030: "da", 1164: "prs", 1125: "dv", 2067: "nl-BE", 1043: "nl", 3081: "en-AU", 10249: "en-BZ", 4105: "en-CA", 9225: "en-029", 16393: "en-IN", 6153: "en-IE", 8201: "en-JM", 17417: "en-MY", 5129: "en-NZ", 13321: "en-PH", 18441: "en-SG", 7177: "en-ZA", 11273: "en-TT", 2057: "en-GB", 1033: "en", 12297: "en-ZW", 1061: "et", 1080: "fo", 1124: "fil", 1035: "fi", 2060: "fr-BE", 3084: "fr-CA", 1036: "fr", 5132: "fr-LU", 6156: "fr-MC", 4108: "fr-CH", 1122: "fy", 1110: "gl", 1079: "ka", 3079: "de-AT", 1031: "de", 5127: "de-LI", 4103: "de-LU", 2055: "de-CH", 1032: "el", 1135: "kl", 1095: "gu", 1128: "ha", 1037: "he", 1081: "hi", 1038: "hu", 1039: "is", 1136: "ig", 1057: "id", 1117: "iu", 2141: "iu-Latn", 2108: "ga", 1076: "xh", 1077: "zu", 1040: "it", 2064: "it-CH", 1041: "ja", 1099: "kn", 1087: "kk", 1107: "km", 1158: "quc", 1159: "rw", 1089: "sw", 1111: "kok", 1042: "ko", 1088: "ky", 1108: "lo", 1062: "lv", 1063: "lt", 2094: "dsb", 1134: "lb", 1071: "mk", 2110: "ms-BN", 1086: "ms", 1100: "ml", 1082: "mt", 1153: "mi", 1146: "arn", 1102: "mr", 1148: "moh", 1104: "mn", 2128: "mn-CN", 1121: "ne", 1044: "nb", 2068: "nn", 1154: "oc", 1096: "or", 1123: "ps", 1045: "pl", 1046: "pt", 2070: "pt-PT", 1094: "pa", 1131: "qu-BO", 2155: "qu-EC", 3179: "qu", 1048: "ro", 1047: "rm", 1049: "ru", 9275: "smn", 4155: "smj-NO", 5179: "smj", 3131: "se-FI", 1083: "se", 2107: "se-SE", 8251: "sms", 6203: "sma-NO", 7227: "sms", 1103: "sa", 7194: "sr-Cyrl-BA", 3098: "sr", 6170: "sr-Latn-BA", 2074: "sr-Latn", 1132: "nso", 1074: "tn", 1115: "si", 1051: "sk", 1060: "sl", 11274: "es-AR", 16394: "es-BO", 13322: "es-CL", 9226: "es-CO", 5130: "es-CR", 7178: "es-DO", 12298: "es-EC", 17418: "es-SV", 4106: "es-GT", 18442: "es-HN", 2058: "es-MX", 19466: "es-NI", 6154: "es-PA", 15370: "es-PY", 10250: "es-PE", 20490: "es-PR", 3082: "es", 1034: "es", 21514: "es-US", 14346: "es-UY", 8202: "es-VE", 2077: "sv-FI", 1053: "sv", 1114: "syr", 1064: "tg", 2143: "tzm", 1097: "ta", 1092: "tt", 1098: "te", 1054: "th", 1105: "bo", 1055: "tr", 1090: "tk", 1152: "ug", 1058: "uk", 1070: "hsb", 1056: "ur", 2115: "uz-Cyrl", 1091: "uz", 1066: "vi", 1106: "cy", 1160: "wo", 1157: "sah", 1144: "ii", 1130: "yo" };\n      function gi2(e, r, t) {\n        switch (e) {\n          case 0:\n            if (r === 65535) return "und";\n            if (t) return t[r];\n            break;\n          case 1:\n            return $t3[r];\n          case 3:\n            return en2[r];\n        }\n      }\n      var Wr2 = "utf-16", mi = { 0: "macintosh", 1: "x-mac-japanese", 2: "x-mac-chinesetrad", 3: "x-mac-korean", 6: "x-mac-greek", 7: "x-mac-cyrillic", 9: "x-mac-devanagai", 10: "x-mac-gurmukhi", 11: "x-mac-gujarati", 12: "x-mac-oriya", 13: "x-mac-bengali", 14: "x-mac-tamil", 15: "x-mac-telugu", 16: "x-mac-kannada", 17: "x-mac-malayalam", 18: "x-mac-sinhalese", 19: "x-mac-burmese", 20: "x-mac-khmer", 21: "x-mac-thai", 22: "x-mac-lao", 23: "x-mac-georgian", 24: "x-mac-armenian", 25: "x-mac-chinesesimp", 26: "x-mac-tibetan", 27: "x-mac-mongolian", 28: "x-mac-ethiopic", 29: "x-mac-ce", 30: "x-mac-vietnamese", 31: "x-mac-extarabic" }, yi2 = { 15: "x-mac-icelandic", 17: "x-mac-turkish", 18: "x-mac-croatian", 24: "x-mac-ce", 25: "x-mac-ce", 26: "x-mac-ce", 27: "x-mac-ce", 28: "x-mac-ce", 30: "x-mac-icelandic", 37: "x-mac-romanian", 38: "x-mac-ce", 39: "x-mac-ce", 40: "x-mac-ce", 143: "x-mac-inuit", 146: "x-mac-gaelic" };\n      function rn2(e, r, t) {\n        switch (e) {\n          case 0:\n            return Wr2;\n          case 1:\n            return yi2[t] || mi[r];\n          case 3:\n            if (r === 1 || r === 10) return Wr2;\n            break;\n        }\n      }\n      function bi(e, r, t) {\n        for (var n11 = {}, a2 = new w6.Parser(e, r), i5 = a2.parseUShort(), o2 = a2.parseUShort(), l4 = a2.offset + a2.parseUShort(), u3 = 0; u3 < o2; u3++) {\n          var c2 = a2.parseUShort(), d3 = a2.parseUShort(), y5 = a2.parseUShort(), g6 = a2.parseUShort(), m4 = jt2[g6] || g6, T4 = a2.parseUShort(), O4 = a2.parseUShort(), F4 = gi2(c2, y5, t), U6 = rn2(c2, d3, y5);\n          if (U6 !== void 0 && F4 !== void 0) {\n            var P5 = void 0;\n            if (U6 === Wr2 ? P5 = Ve3.UTF16(e, l4 + O4, T4) : P5 = Ve3.MACSTRING(e, l4 + O4, T4, U6), P5) {\n              var I4 = n11[m4];\n              I4 === void 0 && (I4 = n11[m4] = {}), I4[F4] = P5;\n            }\n          }\n        }\n        var H5 = 0;\n        return i5 === 1 && (H5 = a2.parseUShort()), n11;\n      }\n      function Vr2(e) {\n        var r = {};\n        for (var t in e) r[e[t]] = parseInt(t);\n        return r;\n      }\n      function tn2(e, r, t, n11, a2, i5) {\n        return new A4.Record("NameRecord", [{ name: "platformID", type: "USHORT", value: e }, { name: "encodingID", type: "USHORT", value: r }, { name: "languageID", type: "USHORT", value: t }, { name: "nameID", type: "USHORT", value: n11 }, { name: "length", type: "USHORT", value: a2 }, { name: "offset", type: "USHORT", value: i5 }]);\n      }\n      function xi2(e, r) {\n        var t = e.length, n11 = r.length - t + 1;\n        e: for (var a2 = 0; a2 < n11; a2++) for (; a2 < n11; a2++) {\n          for (var i5 = 0; i5 < t; i5++) if (r[a2 + i5] !== e[i5]) continue e;\n          return a2;\n        }\n        return -1;\n      }\n      function nn(e, r) {\n        var t = xi2(e, r);\n        if (t < 0) {\n          t = r.length;\n          for (var n11 = 0, a2 = e.length; n11 < a2; ++n11) r.push(e[n11]);\n        }\n        return t;\n      }\n      function Si2(e, r) {\n        var t, n11 = [], a2 = {}, i5 = Vr2(jt2);\n        for (var o2 in e) {\n          var l4 = i5[o2];\n          if (l4 === void 0 && (l4 = o2), t = parseInt(l4), isNaN(t)) throw new Error(\'Name table entry "\' + o2 + \'" does not exist, see nameTableNames for complete list.\');\n          a2[t] = e[o2], n11.push(t);\n        }\n        for (var u3 = Vr2($t3), c2 = Vr2(en2), d3 = [], y5 = [], g6 = 0; g6 < n11.length; g6++) {\n          t = n11[g6];\n          var m4 = a2[t];\n          for (var T4 in m4) {\n            var O4 = m4[T4], F4 = 1, U6 = u3[T4], P5 = di2[U6], I4 = rn2(F4, P5, U6), H5 = E5.MACSTRING(O4, I4);\n            H5 === void 0 && (F4 = 0, U6 = r.indexOf(T4), U6 < 0 && (U6 = r.length, r.push(T4)), P5 = 4, H5 = E5.UTF16(O4));\n            var R4 = nn(H5, y5);\n            d3.push(tn2(F4, P5, U6, t, H5.length, R4));\n            var B5 = c2[T4];\n            if (B5 !== void 0) {\n              var ue2 = E5.UTF16(O4), q3 = nn(ue2, y5);\n              d3.push(tn2(3, 1, B5, t, ue2.length, q3));\n            }\n          }\n        }\n        d3.sort(function(le3, pe2) {\n          return le3.platformID - pe2.platformID || le3.encodingID - pe2.encodingID || le3.languageID - pe2.languageID || le3.nameID - pe2.nameID;\n        });\n        for (var K4 = new A4.Table("name", [{ name: "format", type: "USHORT", value: 0 }, { name: "count", type: "USHORT", value: d3.length }, { name: "stringOffset", type: "USHORT", value: 6 + d3.length * 12 }]), se3 = 0; se3 < d3.length; se3++) K4.fields.push({ name: "record_" + se3, type: "RECORD", value: d3[se3] });\n        return K4.fields.push({ name: "strings", type: "LITERAL", value: y5 }), K4;\n      }\n      var an2 = { parse: bi, make: Si2 }, qr2 = [{ begin: 0, end: 127 }, { begin: 128, end: 255 }, { begin: 256, end: 383 }, { begin: 384, end: 591 }, { begin: 592, end: 687 }, { begin: 688, end: 767 }, { begin: 768, end: 879 }, { begin: 880, end: 1023 }, { begin: 11392, end: 11519 }, { begin: 1024, end: 1279 }, { begin: 1328, end: 1423 }, { begin: 1424, end: 1535 }, { begin: 42240, end: 42559 }, { begin: 1536, end: 1791 }, { begin: 1984, end: 2047 }, { begin: 2304, end: 2431 }, { begin: 2432, end: 2559 }, { begin: 2560, end: 2687 }, { begin: 2688, end: 2815 }, { begin: 2816, end: 2943 }, { begin: 2944, end: 3071 }, { begin: 3072, end: 3199 }, { begin: 3200, end: 3327 }, { begin: 3328, end: 3455 }, { begin: 3584, end: 3711 }, { begin: 3712, end: 3839 }, { begin: 4256, end: 4351 }, { begin: 6912, end: 7039 }, { begin: 4352, end: 4607 }, { begin: 7680, end: 7935 }, { begin: 7936, end: 8191 }, { begin: 8192, end: 8303 }, { begin: 8304, end: 8351 }, { begin: 8352, end: 8399 }, { begin: 8400, end: 8447 }, { begin: 8448, end: 8527 }, { begin: 8528, end: 8591 }, { begin: 8592, end: 8703 }, { begin: 8704, end: 8959 }, { begin: 8960, end: 9215 }, { begin: 9216, end: 9279 }, { begin: 9280, end: 9311 }, { begin: 9312, end: 9471 }, { begin: 9472, end: 9599 }, { begin: 9600, end: 9631 }, { begin: 9632, end: 9727 }, { begin: 9728, end: 9983 }, { begin: 9984, end: 10175 }, { begin: 12288, end: 12351 }, { begin: 12352, end: 12447 }, { begin: 12448, end: 12543 }, { begin: 12544, end: 12591 }, { begin: 12592, end: 12687 }, { begin: 43072, end: 43135 }, { begin: 12800, end: 13055 }, { begin: 13056, end: 13311 }, { begin: 44032, end: 55215 }, { begin: 55296, end: 57343 }, { begin: 67840, end: 67871 }, { begin: 19968, end: 40959 }, { begin: 57344, end: 63743 }, { begin: 12736, end: 12783 }, { begin: 64256, end: 64335 }, { begin: 64336, end: 65023 }, { begin: 65056, end: 65071 }, { begin: 65040, end: 65055 }, { begin: 65104, end: 65135 }, { begin: 65136, end: 65279 }, { begin: 65280, end: 65519 }, { begin: 65520, end: 65535 }, { begin: 3840, end: 4095 }, { begin: 1792, end: 1871 }, { begin: 1920, end: 1983 }, { begin: 3456, end: 3583 }, { begin: 4096, end: 4255 }, { begin: 4608, end: 4991 }, { begin: 5024, end: 5119 }, { begin: 5120, end: 5759 }, { begin: 5760, end: 5791 }, { begin: 5792, end: 5887 }, { begin: 6016, end: 6143 }, { begin: 6144, end: 6319 }, { begin: 10240, end: 10495 }, { begin: 40960, end: 42127 }, { begin: 5888, end: 5919 }, { begin: 66304, end: 66351 }, { begin: 66352, end: 66383 }, { begin: 66560, end: 66639 }, { begin: 118784, end: 119039 }, { begin: 119808, end: 120831 }, { begin: 1044480, end: 1048573 }, { begin: 65024, end: 65039 }, { begin: 917504, end: 917631 }, { begin: 6400, end: 6479 }, { begin: 6480, end: 6527 }, { begin: 6528, end: 6623 }, { begin: 6656, end: 6687 }, { begin: 11264, end: 11359 }, { begin: 11568, end: 11647 }, { begin: 19904, end: 19967 }, { begin: 43008, end: 43055 }, { begin: 65536, end: 65663 }, { begin: 65856, end: 65935 }, { begin: 66432, end: 66463 }, { begin: 66464, end: 66527 }, { begin: 66640, end: 66687 }, { begin: 66688, end: 66735 }, { begin: 67584, end: 67647 }, { begin: 68096, end: 68191 }, { begin: 119552, end: 119647 }, { begin: 73728, end: 74751 }, { begin: 119648, end: 119679 }, { begin: 7040, end: 7103 }, { begin: 7168, end: 7247 }, { begin: 7248, end: 7295 }, { begin: 43136, end: 43231 }, { begin: 43264, end: 43311 }, { begin: 43312, end: 43359 }, { begin: 43520, end: 43615 }, { begin: 65936, end: 65999 }, { begin: 66e3, end: 66047 }, { begin: 66208, end: 66271 }, { begin: 127024, end: 127135 }];\n      function Ti2(e) {\n        for (var r = 0; r < qr2.length; r += 1) {\n          var t = qr2[r];\n          if (e >= t.begin && e < t.end) return r;\n        }\n        return -1;\n      }\n      function ki(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        t.version = n11.parseUShort(), t.xAvgCharWidth = n11.parseShort(), t.usWeightClass = n11.parseUShort(), t.usWidthClass = n11.parseUShort(), t.fsType = n11.parseUShort(), t.ySubscriptXSize = n11.parseShort(), t.ySubscriptYSize = n11.parseShort(), t.ySubscriptXOffset = n11.parseShort(), t.ySubscriptYOffset = n11.parseShort(), t.ySuperscriptXSize = n11.parseShort(), t.ySuperscriptYSize = n11.parseShort(), t.ySuperscriptXOffset = n11.parseShort(), t.ySuperscriptYOffset = n11.parseShort(), t.yStrikeoutSize = n11.parseShort(), t.yStrikeoutPosition = n11.parseShort(), t.sFamilyClass = n11.parseShort(), t.panose = [];\n        for (var a2 = 0; a2 < 10; a2++) t.panose[a2] = n11.parseByte();\n        return t.ulUnicodeRange1 = n11.parseULong(), t.ulUnicodeRange2 = n11.parseULong(), t.ulUnicodeRange3 = n11.parseULong(), t.ulUnicodeRange4 = n11.parseULong(), t.achVendID = String.fromCharCode(n11.parseByte(), n11.parseByte(), n11.parseByte(), n11.parseByte()), t.fsSelection = n11.parseUShort(), t.usFirstCharIndex = n11.parseUShort(), t.usLastCharIndex = n11.parseUShort(), t.sTypoAscender = n11.parseShort(), t.sTypoDescender = n11.parseShort(), t.sTypoLineGap = n11.parseShort(), t.usWinAscent = n11.parseUShort(), t.usWinDescent = n11.parseUShort(), t.version >= 1 && (t.ulCodePageRange1 = n11.parseULong(), t.ulCodePageRange2 = n11.parseULong()), t.version >= 2 && (t.sxHeight = n11.parseShort(), t.sCapHeight = n11.parseShort(), t.usDefaultChar = n11.parseUShort(), t.usBreakChar = n11.parseUShort(), t.usMaxContent = n11.parseUShort()), t;\n      }\n      function Fi2(e) {\n        return new A4.Table("OS/2", [{ name: "version", type: "USHORT", value: 3 }, { name: "xAvgCharWidth", type: "SHORT", value: 0 }, { name: "usWeightClass", type: "USHORT", value: 0 }, { name: "usWidthClass", type: "USHORT", value: 0 }, { name: "fsType", type: "USHORT", value: 0 }, { name: "ySubscriptXSize", type: "SHORT", value: 650 }, { name: "ySubscriptYSize", type: "SHORT", value: 699 }, { name: "ySubscriptXOffset", type: "SHORT", value: 0 }, { name: "ySubscriptYOffset", type: "SHORT", value: 140 }, { name: "ySuperscriptXSize", type: "SHORT", value: 650 }, { name: "ySuperscriptYSize", type: "SHORT", value: 699 }, { name: "ySuperscriptXOffset", type: "SHORT", value: 0 }, { name: "ySuperscriptYOffset", type: "SHORT", value: 479 }, { name: "yStrikeoutSize", type: "SHORT", value: 49 }, { name: "yStrikeoutPosition", type: "SHORT", value: 258 }, { name: "sFamilyClass", type: "SHORT", value: 0 }, { name: "bFamilyType", type: "BYTE", value: 0 }, { name: "bSerifStyle", type: "BYTE", value: 0 }, { name: "bWeight", type: "BYTE", value: 0 }, { name: "bProportion", type: "BYTE", value: 0 }, { name: "bContrast", type: "BYTE", value: 0 }, { name: "bStrokeVariation", type: "BYTE", value: 0 }, { name: "bArmStyle", type: "BYTE", value: 0 }, { name: "bLetterform", type: "BYTE", value: 0 }, { name: "bMidline", type: "BYTE", value: 0 }, { name: "bXHeight", type: "BYTE", value: 0 }, { name: "ulUnicodeRange1", type: "ULONG", value: 0 }, { name: "ulUnicodeRange2", type: "ULONG", value: 0 }, { name: "ulUnicodeRange3", type: "ULONG", value: 0 }, { name: "ulUnicodeRange4", type: "ULONG", value: 0 }, { name: "achVendID", type: "CHARARRAY", value: "XXXX" }, { name: "fsSelection", type: "USHORT", value: 0 }, { name: "usFirstCharIndex", type: "USHORT", value: 0 }, { name: "usLastCharIndex", type: "USHORT", value: 0 }, { name: "sTypoAscender", type: "SHORT", value: 0 }, { name: "sTypoDescender", type: "SHORT", value: 0 }, { name: "sTypoLineGap", type: "SHORT", value: 0 }, { name: "usWinAscent", type: "USHORT", value: 0 }, { name: "usWinDescent", type: "USHORT", value: 0 }, { name: "ulCodePageRange1", type: "ULONG", value: 0 }, { name: "ulCodePageRange2", type: "ULONG", value: 0 }, { name: "sxHeight", type: "SHORT", value: 0 }, { name: "sCapHeight", type: "SHORT", value: 0 }, { name: "usDefaultChar", type: "USHORT", value: 0 }, { name: "usBreakChar", type: "USHORT", value: 0 }, { name: "usMaxContext", type: "USHORT", value: 0 }], e);\n      }\n      var Xr2 = { parse: ki, make: Fi2, unicodeRanges: qr2, getUnicodeRange: Ti2 };\n      function Li2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        switch (t.version = n11.parseVersion(), t.italicAngle = n11.parseFixed(), t.underlinePosition = n11.parseShort(), t.underlineThickness = n11.parseShort(), t.isFixedPitch = n11.parseULong(), t.minMemType42 = n11.parseULong(), t.maxMemType42 = n11.parseULong(), t.minMemType1 = n11.parseULong(), t.maxMemType1 = n11.parseULong(), t.version) {\n          case 1:\n            t.names = Me3.slice();\n            break;\n          case 2:\n            t.numberOfGlyphs = n11.parseUShort(), t.glyphNameIndex = new Array(t.numberOfGlyphs);\n            for (var a2 = 0; a2 < t.numberOfGlyphs; a2++) t.glyphNameIndex[a2] = n11.parseUShort();\n            t.names = [];\n            for (var i5 = 0; i5 < t.numberOfGlyphs; i5++) if (t.glyphNameIndex[i5] >= Me3.length) {\n              var o2 = n11.parseChar();\n              t.names.push(n11.parseString(o2));\n            }\n            break;\n          case 2.5:\n            t.numberOfGlyphs = n11.parseUShort(), t.offset = new Array(t.numberOfGlyphs);\n            for (var l4 = 0; l4 < t.numberOfGlyphs; l4++) t.offset[l4] = n11.parseChar();\n            break;\n        }\n        return t;\n      }\n      function Ei2() {\n        return new A4.Table("post", [{ name: "version", type: "FIXED", value: 196608 }, { name: "italicAngle", type: "FIXED", value: 0 }, { name: "underlinePosition", type: "FWORD", value: 0 }, { name: "underlineThickness", type: "FWORD", value: 0 }, { name: "isFixedPitch", type: "ULONG", value: 0 }, { name: "minMemType42", type: "ULONG", value: 0 }, { name: "maxMemType42", type: "ULONG", value: 0 }, { name: "minMemType1", type: "ULONG", value: 0 }, { name: "maxMemType1", type: "ULONG", value: 0 }]);\n      }\n      var sn2 = { parse: Li2, make: Ei2 }, me4 = new Array(9);\n      me4[1] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: 1, coverage: this.parsePointer(b4.coverage), deltaGlyphId: this.parseUShort() };\n        if (t === 2) return { substFormat: 2, coverage: this.parsePointer(b4.coverage), substitute: this.parseOffset16List() };\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 1 format must be 1 or 2.");\n      }, me4[2] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Multiple Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), sequences: this.parseListOfLists() };\n      }, me4[3] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Alternate Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), alternateSets: this.parseListOfLists() };\n      }, me4[4] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB ligature table identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), ligatureSets: this.parseListOfLists(function() {\n          return { ligGlyph: this.parseUShort(), components: this.parseUShortList(this.parseUShort() - 1) };\n        }) };\n      };\n      var Xe3 = { sequenceIndex: b4.uShort, lookupListIndex: b4.uShort };\n      me4[5] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: t, coverage: this.parsePointer(b4.coverage), ruleSets: this.parseListOfLists(function() {\n          var i5 = this.parseUShort(), o2 = this.parseUShort();\n          return { input: this.parseUShortList(i5 - 1), lookupRecords: this.parseRecordList(o2, Xe3) };\n        }) };\n        if (t === 2) return { substFormat: t, coverage: this.parsePointer(b4.coverage), classDef: this.parsePointer(b4.classDef), classSets: this.parseListOfLists(function() {\n          var i5 = this.parseUShort(), o2 = this.parseUShort();\n          return { classes: this.parseUShortList(i5 - 1), lookupRecords: this.parseRecordList(o2, Xe3) };\n        }) };\n        if (t === 3) {\n          var n11 = this.parseUShort(), a2 = this.parseUShort();\n          return { substFormat: t, coverages: this.parseList(n11, b4.pointer(b4.coverage)), lookupRecords: this.parseRecordList(a2, Xe3) };\n        }\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 5 format must be 1, 2 or 3.");\n      }, me4[6] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: 1, coverage: this.parsePointer(b4.coverage), chainRuleSets: this.parseListOfLists(function() {\n          return { backtrack: this.parseUShortList(), input: this.parseUShortList(this.parseShort() - 1), lookahead: this.parseUShortList(), lookupRecords: this.parseRecordList(Xe3) };\n        }) };\n        if (t === 2) return { substFormat: 2, coverage: this.parsePointer(b4.coverage), backtrackClassDef: this.parsePointer(b4.classDef), inputClassDef: this.parsePointer(b4.classDef), lookaheadClassDef: this.parsePointer(b4.classDef), chainClassSet: this.parseListOfLists(function() {\n          return { backtrack: this.parseUShortList(), input: this.parseUShortList(this.parseShort() - 1), lookahead: this.parseUShortList(), lookupRecords: this.parseRecordList(Xe3) };\n        }) };\n        if (t === 3) return { substFormat: 3, backtrackCoverage: this.parseList(b4.pointer(b4.coverage)), inputCoverage: this.parseList(b4.pointer(b4.coverage)), lookaheadCoverage: this.parseList(b4.pointer(b4.coverage)), lookupRecords: this.parseRecordList(Xe3) };\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 6 format must be 1, 2 or 3.");\n      }, me4[7] = function() {\n        var r = this.parseUShort();\n        G5.argument(r === 1, "GSUB Extension Substitution subtable identifier-format must be 1");\n        var t = this.parseUShort(), n11 = new b4(this.data, this.offset + this.parseULong());\n        return { substFormat: 1, lookupType: t, extension: me4[t].call(n11) };\n      }, me4[8] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Reverse Chaining Contextual Single Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), backtrackCoverage: this.parseList(b4.pointer(b4.coverage)), lookaheadCoverage: this.parseList(b4.pointer(b4.coverage)), substitutes: this.parseUShortList() };\n      };\n      function Ui2(e, r) {\n        r = r || 0;\n        var t = new b4(e, r), n11 = t.parseVersion(1);\n        return G5.argument(n11 === 1 || n11 === 1.1, "Unsupported GSUB table version."), n11 === 1 ? { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(me4) } : { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(me4), variations: t.parseFeatureVariationsList() };\n      }\n      var Tr2 = new Array(9);\n      Tr2[1] = function(r) {\n        return r.substFormat === 1 ? new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }, { name: "deltaGlyphID", type: "USHORT", value: r.deltaGlyphId }]) : new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 2 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.ushortList("substitute", r.substitute)));\n      }, Tr2[3] = function(r) {\n        return G5.assert(r.substFormat === 1, "Lookup type 3 substFormat must be 1."), new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.tableList("altSet", r.alternateSets, function(t) {\n          return new A4.Table("alternateSetTable", A4.ushortList("alternate", t));\n        })));\n      }, Tr2[4] = function(r) {\n        return G5.assert(r.substFormat === 1, "Lookup type 4 substFormat must be 1."), new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.tableList("ligSet", r.ligatureSets, function(t) {\n          return new A4.Table("ligatureSetTable", A4.tableList("ligature", t, function(n11) {\n            return new A4.Table("ligatureTable", [{ name: "ligGlyph", type: "USHORT", value: n11.ligGlyph }].concat(A4.ushortList("component", n11.components, n11.components.length + 1)));\n          }));\n        })));\n      };\n      function Oi3(e) {\n        return new A4.Table("GSUB", [{ name: "version", type: "ULONG", value: 65536 }, { name: "scripts", type: "TABLE", value: new A4.ScriptList(e.scripts) }, { name: "features", type: "TABLE", value: new A4.FeatureList(e.features) }, { name: "lookups", type: "TABLE", value: new A4.LookupList(e.lookups, Tr2) }]);\n      }\n      var on2 = { parse: Ui2, make: Oi3 };\n      function Ii2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseULong();\n        G5.argument(n11 === 1, "Unsupported META table version."), t.parseULong(), t.parseULong();\n        for (var a2 = t.parseULong(), i5 = {}, o2 = 0; o2 < a2; o2++) {\n          var l4 = t.parseTag(), u3 = t.parseULong(), c2 = t.parseULong(), d3 = Ve3.UTF8(e, r + u3, c2);\n          i5[l4] = d3;\n        }\n        return i5;\n      }\n      function Ci2(e) {\n        var r = Object.keys(e).length, t = "", n11 = 16 + r * 12, a2 = new A4.Table("meta", [{ name: "version", type: "ULONG", value: 1 }, { name: "flags", type: "ULONG", value: 0 }, { name: "offset", type: "ULONG", value: n11 }, { name: "numTags", type: "ULONG", value: r }]);\n        for (var i5 in e) {\n          var o2 = t.length;\n          t += e[i5], a2.fields.push({ name: "tag " + i5, type: "TAG", value: i5 }), a2.fields.push({ name: "offset " + i5, type: "ULONG", value: n11 + o2 }), a2.fields.push({ name: "length " + i5, type: "ULONG", value: e[i5].length });\n        }\n        return a2.fields.push({ name: "stringPool", type: "CHARARRAY", value: t }), a2;\n      }\n      var un2 = { parse: Ii2, make: Ci2 };\n      function ln2(e) {\n        return Math.log(e) / Math.log(2) | 0;\n      }\n      function Yr2(e) {\n        for (; e.length % 4 !== 0; ) e.push(0);\n        for (var r = 0, t = 0; t < e.length; t += 4) r += (e[t] << 24) + (e[t + 1] << 16) + (e[t + 2] << 8) + e[t + 3];\n        return r %= Math.pow(2, 32), r;\n      }\n      function fn2(e, r, t, n11) {\n        return new A4.Record("Table Record", [{ name: "tag", type: "TAG", value: e !== void 0 ? e : "" }, { name: "checkSum", type: "ULONG", value: r !== void 0 ? r : 0 }, { name: "offset", type: "ULONG", value: t !== void 0 ? t : 0 }, { name: "length", type: "ULONG", value: n11 !== void 0 ? n11 : 0 }]);\n      }\n      function pn2(e) {\n        var r = new A4.Table("sfnt", [{ name: "version", type: "TAG", value: "OTTO" }, { name: "numTables", type: "USHORT", value: 0 }, { name: "searchRange", type: "USHORT", value: 0 }, { name: "entrySelector", type: "USHORT", value: 0 }, { name: "rangeShift", type: "USHORT", value: 0 }]);\n        r.tables = e, r.numTables = e.length;\n        var t = Math.pow(2, ln2(r.numTables));\n        r.searchRange = 16 * t, r.entrySelector = ln2(t), r.rangeShift = r.numTables * 16 - r.searchRange;\n        for (var n11 = [], a2 = [], i5 = r.sizeOf() + fn2().sizeOf() * r.numTables; i5 % 4 !== 0; ) i5 += 1, a2.push({ name: "padding", type: "BYTE", value: 0 });\n        for (var o2 = 0; o2 < e.length; o2 += 1) {\n          var l4 = e[o2];\n          G5.argument(l4.tableName.length === 4, "Table name" + l4.tableName + " is invalid.");\n          var u3 = l4.sizeOf(), c2 = fn2(l4.tableName, Yr2(l4.encode()), i5, u3);\n          for (n11.push({ name: c2.tag + " Table Record", type: "RECORD", value: c2 }), a2.push({ name: l4.tableName + " table", type: "RECORD", value: l4 }), i5 += u3, G5.argument(!isNaN(i5), "Something went wrong calculating the offset."); i5 % 4 !== 0; ) i5 += 1, a2.push({ name: "padding", type: "BYTE", value: 0 });\n        }\n        return n11.sort(function(d3, y5) {\n          return d3.value.tag > y5.value.tag ? 1 : -1;\n        }), r.fields = r.fields.concat(n11), r.fields = r.fields.concat(a2), r;\n      }\n      function hn2(e, r, t) {\n        for (var n11 = 0; n11 < r.length; n11 += 1) {\n          var a2 = e.charToGlyphIndex(r[n11]);\n          if (a2 > 0) {\n            var i5 = e.glyphs.get(a2);\n            return i5.getMetrics();\n          }\n        }\n        return t;\n      }\n      function wi2(e) {\n        for (var r = 0, t = 0; t < e.length; t += 1) r += e[t];\n        return r / e.length;\n      }\n      function Ri2(e) {\n        for (var r = [], t = [], n11 = [], a2 = [], i5 = [], o2 = [], l4 = [], u3, c2 = 0, d3 = 0, y5 = 0, g6 = 0, m4 = 0, T4 = 0; T4 < e.glyphs.length; T4 += 1) {\n          var O4 = e.glyphs.get(T4), F4 = O4.unicode | 0;\n          if (isNaN(O4.advanceWidth)) throw new Error("Glyph " + O4.name + " (" + T4 + "): advanceWidth is not a number.");\n          (u3 > F4 || u3 === void 0) && F4 > 0 && (u3 = F4), c2 < F4 && (c2 = F4);\n          var U6 = Xr2.getUnicodeRange(F4);\n          if (U6 < 32) d3 |= 1 << U6;\n          else if (U6 < 64) y5 |= 1 << U6 - 32;\n          else if (U6 < 96) g6 |= 1 << U6 - 64;\n          else if (U6 < 123) m4 |= 1 << U6 - 96;\n          else throw new Error("Unicode ranges bits > 123 are reserved for internal usage");\n          if (O4.name !== ".notdef") {\n            var P5 = O4.getMetrics();\n            r.push(P5.xMin), t.push(P5.yMin), n11.push(P5.xMax), a2.push(P5.yMax), o2.push(P5.leftSideBearing), l4.push(P5.rightSideBearing), i5.push(O4.advanceWidth);\n          }\n        }\n        var I4 = { xMin: Math.min.apply(null, r), yMin: Math.min.apply(null, t), xMax: Math.max.apply(null, n11), yMax: Math.max.apply(null, a2), advanceWidthMax: Math.max.apply(null, i5), advanceWidthAvg: wi2(i5), minLeftSideBearing: Math.min.apply(null, o2), maxLeftSideBearing: Math.max.apply(null, o2), minRightSideBearing: Math.min.apply(null, l4) };\n        I4.ascender = e.ascender, I4.descender = e.descender;\n        var H5 = Yt3.make({ flags: 3, unitsPerEm: e.unitsPerEm, xMin: I4.xMin, yMin: I4.yMin, xMax: I4.xMax, yMax: I4.yMax, lowestRecPPEM: 3, createdTimestamp: e.createdTimestamp }), R4 = Zt3.make({ ascender: I4.ascender, descender: I4.descender, advanceWidthMax: I4.advanceWidthMax, minLeftSideBearing: I4.minLeftSideBearing, minRightSideBearing: I4.minRightSideBearing, xMaxExtent: I4.maxLeftSideBearing + (I4.xMax - I4.xMin), numberOfHMetrics: e.glyphs.length }), B5 = Kt2.make(e.glyphs.length), ue2 = Xr2.make({ xAvgCharWidth: Math.round(I4.advanceWidthAvg), usWeightClass: e.tables.os2.usWeightClass, usWidthClass: e.tables.os2.usWidthClass, usFirstCharIndex: u3, usLastCharIndex: c2, ulUnicodeRange1: d3, ulUnicodeRange2: y5, ulUnicodeRange3: g6, ulUnicodeRange4: m4, fsSelection: e.tables.os2.fsSelection, sTypoAscender: I4.ascender, sTypoDescender: I4.descender, sTypoLineGap: 0, usWinAscent: I4.yMax, usWinDescent: Math.abs(I4.yMin), ulCodePageRange1: 1, sxHeight: hn2(e, "xyvw", { yMax: Math.round(I4.ascender / 2) }).yMax, sCapHeight: hn2(e, "HIKLEFJMNTZBDPRAGOQSUVWXY", I4).yMax, usDefaultChar: e.hasChar(" ") ? 32 : 0, usBreakChar: e.hasChar(" ") ? 32 : 0 }), q3 = Qt3.make(e.glyphs), K4 = It3.make(e.glyphs), se3 = e.getEnglishName("fontFamily"), le3 = e.getEnglishName("fontSubfamily"), pe2 = se3 + " " + le3, de3 = e.getEnglishName("postScriptName");\n        de3 || (de3 = se3.replace(/\\s/g, "") + "-" + le3);\n        var J5 = {};\n        for (var j5 in e.names) J5[j5] = e.names[j5];\n        J5.uniqueID || (J5.uniqueID = { en: e.getEnglishName("manufacturer") + ":" + pe2 }), J5.postScriptName || (J5.postScriptName = { en: de3 }), J5.preferredFamily || (J5.preferredFamily = e.names.fontFamily), J5.preferredSubfamily || (J5.preferredSubfamily = e.names.fontSubfamily);\n        var re3 = [], te3 = an2.make(J5, re3), ne3 = re3.length > 0 ? Jt2.make(re3) : void 0, oe4 = sn2.make(), he3 = Xt3.make(e.glyphs, { version: e.getEnglishName("version"), fullName: pe2, familyName: se3, weightName: le3, postScriptName: de3, unitsPerEm: e.unitsPerEm, fontBBox: [0, I4.yMin, I4.ascender, I4.advanceWidthMax] }), Y2 = e.metas && Object.keys(e.metas).length > 0 ? un2.make(e.metas) : void 0, ae4 = [H5, R4, B5, ue2, te3, K4, oe4, he3, q3];\n        ne3 && ae4.push(ne3), e.tables.gsub && ae4.push(on2.make(e.tables.gsub)), Y2 && ae4.push(Y2);\n        for (var et3 = pn2(ae4), Mo = et3.encode(), Bo2 = Yr2(Mo), rt4 = et3.fields, Hn2 = false, Er2 = 0; Er2 < rt4.length; Er2 += 1) if (rt4[Er2].name === "head table") {\n          rt4[Er2].value.checkSumAdjustment = 2981146554 - Bo2, Hn2 = true;\n          break;\n        }\n        if (!Hn2) throw new Error("Could not find head table with checkSum to adjust.");\n        return et3;\n      }\n      var Di2 = { make: pn2, fontToTable: Ri2, computeCheckSum: Yr2 };\n      function Zr2(e, r) {\n        for (var t = 0, n11 = e.length - 1; t <= n11; ) {\n          var a2 = t + n11 >>> 1, i5 = e[a2].tag;\n          if (i5 === r) return a2;\n          i5 < r ? t = a2 + 1 : n11 = a2 - 1;\n        }\n        return -t - 1;\n      }\n      function cn2(e, r) {\n        for (var t = 0, n11 = e.length - 1; t <= n11; ) {\n          var a2 = t + n11 >>> 1, i5 = e[a2];\n          if (i5 === r) return a2;\n          i5 < r ? t = a2 + 1 : n11 = a2 - 1;\n        }\n        return -t - 1;\n      }\n      function vn2(e, r) {\n        for (var t, n11 = 0, a2 = e.length - 1; n11 <= a2; ) {\n          var i5 = n11 + a2 >>> 1;\n          t = e[i5];\n          var o2 = t.start;\n          if (o2 === r) return t;\n          o2 < r ? n11 = i5 + 1 : a2 = i5 - 1;\n        }\n        if (n11 > 0) return t = e[n11 - 1], r > t.end ? 0 : t;\n      }\n      function er2(e, r) {\n        this.font = e, this.tableName = r;\n      }\n      er2.prototype = { searchTag: Zr2, binSearch: cn2, getTable: function(e) {\n        var r = this.font.tables[this.tableName];\n        return !r && e && (r = this.font.tables[this.tableName] = this.createDefaultTable()), r;\n      }, getScriptNames: function() {\n        var e = this.getTable();\n        return e ? e.scripts.map(function(r) {\n          return r.tag;\n        }) : [];\n      }, getDefaultScriptName: function() {\n        var e = this.getTable();\n        if (e) {\n          for (var r = false, t = 0; t < e.scripts.length; t++) {\n            var n11 = e.scripts[t].tag;\n            if (n11 === "DFLT") return n11;\n            n11 === "latn" && (r = true);\n          }\n          if (r) return "latn";\n        }\n      }, getScriptTable: function(e, r) {\n        var t = this.getTable(r);\n        if (t) {\n          e = e || "DFLT";\n          var n11 = t.scripts, a2 = Zr2(t.scripts, e);\n          if (a2 >= 0) return n11[a2].script;\n          if (r) {\n            var i5 = { tag: e, script: { defaultLangSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] }, langSysRecords: [] } };\n            return n11.splice(-1 - a2, 0, i5), i5.script;\n          }\n        }\n      }, getLangSysTable: function(e, r, t) {\n        var n11 = this.getScriptTable(e, t);\n        if (n11) {\n          if (!r || r === "dflt" || r === "DFLT") return n11.defaultLangSys;\n          var a2 = Zr2(n11.langSysRecords, r);\n          if (a2 >= 0) return n11.langSysRecords[a2].langSys;\n          if (t) {\n            var i5 = { tag: r, langSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] } };\n            return n11.langSysRecords.splice(-1 - a2, 0, i5), i5.langSys;\n          }\n        }\n      }, getFeatureTable: function(e, r, t, n11) {\n        var a2 = this.getLangSysTable(e, r, n11);\n        if (a2) {\n          for (var i5, o2 = a2.featureIndexes, l4 = this.font.tables[this.tableName].features, u3 = 0; u3 < o2.length; u3++) if (i5 = l4[o2[u3]], i5.tag === t) return i5.feature;\n          if (n11) {\n            var c2 = l4.length;\n            return G5.assert(c2 === 0 || t >= l4[c2 - 1].tag, "Features must be added in alphabetical order."), i5 = { tag: t, feature: { params: 0, lookupListIndexes: [] } }, l4.push(i5), o2.push(c2), i5.feature;\n          }\n        }\n      }, getLookupTables: function(e, r, t, n11, a2) {\n        var i5 = this.getFeatureTable(e, r, t, a2), o2 = [];\n        if (i5) {\n          for (var l4, u3 = i5.lookupListIndexes, c2 = this.font.tables[this.tableName].lookups, d3 = 0; d3 < u3.length; d3++) l4 = c2[u3[d3]], l4.lookupType === n11 && o2.push(l4);\n          if (o2.length === 0 && a2) {\n            l4 = { lookupType: n11, lookupFlag: 0, subtables: [], markFilteringSet: void 0 };\n            var y5 = c2.length;\n            return c2.push(l4), u3.push(y5), [l4];\n          }\n        }\n        return o2;\n      }, getGlyphClass: function(e, r) {\n        switch (e.format) {\n          case 1:\n            return e.startGlyph <= r && r < e.startGlyph + e.classes.length ? e.classes[r - e.startGlyph] : 0;\n          case 2:\n            var t = vn2(e.ranges, r);\n            return t ? t.classId : 0;\n        }\n      }, getCoverageIndex: function(e, r) {\n        switch (e.format) {\n          case 1:\n            var t = cn2(e.glyphs, r);\n            return t >= 0 ? t : -1;\n          case 2:\n            var n11 = vn2(e.ranges, r);\n            return n11 ? n11.index + r - n11.start : -1;\n        }\n      }, expandCoverage: function(e) {\n        if (e.format === 1) return e.glyphs;\n        for (var r = [], t = e.ranges, n11 = 0; n11 < t.length; n11++) for (var a2 = t[n11], i5 = a2.start, o2 = a2.end, l4 = i5; l4 <= o2; l4++) r.push(l4);\n        return r;\n      } };\n      function kr(e) {\n        er2.call(this, e, "gpos");\n      }\n      kr.prototype = er2.prototype, kr.prototype.getKerningValue = function(e, r, t) {\n        for (var n11 = this, a2 = 0; a2 < e.length; a2++) for (var i5 = e[a2].subtables, o2 = 0; o2 < i5.length; o2++) {\n          var l4 = i5[o2], u3 = n11.getCoverageIndex(l4.coverage, r);\n          if (!(u3 < 0)) switch (l4.posFormat) {\n            case 1:\n              for (var c2 = l4.pairSets[u3], d3 = 0; d3 < c2.length; d3++) {\n                var y5 = c2[d3];\n                if (y5.secondGlyph === t) return y5.value1 && y5.value1.xAdvance || 0;\n              }\n              break;\n            case 2:\n              var g6 = n11.getGlyphClass(l4.classDef1, r), m4 = n11.getGlyphClass(l4.classDef2, t), T4 = l4.classRecords[g6][m4];\n              return T4.value1 && T4.value1.xAdvance || 0;\n          }\n        }\n        return 0;\n      }, kr.prototype.getKerningTables = function(e, r) {\n        if (this.font.tables.gpos) return this.getLookupTables(e, r, "kern", 2);\n      };\n      function ye3(e) {\n        er2.call(this, e, "gsub");\n      }\n      function Ai2(e, r) {\n        var t = e.length;\n        if (t !== r.length) return false;\n        for (var n11 = 0; n11 < t; n11++) if (e[n11] !== r[n11]) return false;\n        return true;\n      }\n      function dn2(e, r, t) {\n        for (var n11 = e.subtables, a2 = 0; a2 < n11.length; a2++) {\n          var i5 = n11[a2];\n          if (i5.substFormat === r) return i5;\n        }\n        if (t) return n11.push(t), t;\n      }\n      ye3.prototype = er2.prototype, ye3.prototype.createDefaultTable = function() {\n        return { version: 1, scripts: [{ tag: "DFLT", script: { defaultLangSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] }, langSysRecords: [] } }], features: [], lookups: [] };\n      }, ye3.prototype.getSingle = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 1), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) {\n          var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = void 0;\n          if (c2.substFormat === 1) {\n            var g6 = c2.deltaGlyphId;\n            for (y5 = 0; y5 < d3.length; y5++) {\n              var m4 = d3[y5];\n              a2.push({ sub: m4, by: m4 + g6 });\n            }\n          } else {\n            var T4 = c2.substitute;\n            for (y5 = 0; y5 < d3.length; y5++) a2.push({ sub: d3[y5], by: T4[y5] });\n          }\n        }\n        return a2;\n      }, ye3.prototype.getAlternates = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 3), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) for (var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = c2.alternateSets, g6 = 0; g6 < d3.length; g6++) a2.push({ sub: d3[g6], by: y5[g6] });\n        return a2;\n      }, ye3.prototype.getLigatures = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 4), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) for (var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = c2.ligatureSets, g6 = 0; g6 < d3.length; g6++) for (var m4 = d3[g6], T4 = y5[g6], O4 = 0; O4 < T4.length; O4++) {\n          var F4 = T4[O4];\n          a2.push({ sub: [m4].concat(F4.components), by: F4.ligGlyph });\n        }\n        return a2;\n      }, ye3.prototype.addSingle = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 1, true)[0], i5 = dn2(a2, 2, { substFormat: 2, coverage: { format: 1, glyphs: [] }, substitute: [] });\n        G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub, l4 = this.binSearch(i5.coverage.glyphs, o2);\n        l4 < 0 && (l4 = -1 - l4, i5.coverage.glyphs.splice(l4, 0, o2), i5.substitute.splice(l4, 0, 0)), i5.substitute[l4] = r.by;\n      }, ye3.prototype.addAlternate = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 3, true)[0], i5 = dn2(a2, 1, { substFormat: 1, coverage: { format: 1, glyphs: [] }, alternateSets: [] });\n        G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub, l4 = this.binSearch(i5.coverage.glyphs, o2);\n        l4 < 0 && (l4 = -1 - l4, i5.coverage.glyphs.splice(l4, 0, o2), i5.alternateSets.splice(l4, 0, 0)), i5.alternateSets[l4] = r.by;\n      }, ye3.prototype.addLigature = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 4, true)[0], i5 = a2.subtables[0];\n        i5 || (i5 = { substFormat: 1, coverage: { format: 1, glyphs: [] }, ligatureSets: [] }, a2.subtables[0] = i5), G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub[0], l4 = r.sub.slice(1), u3 = { ligGlyph: r.by, components: l4 }, c2 = this.binSearch(i5.coverage.glyphs, o2);\n        if (c2 >= 0) {\n          for (var d3 = i5.ligatureSets[c2], y5 = 0; y5 < d3.length; y5++) if (Ai2(d3[y5].components, l4)) return;\n          d3.push(u3);\n        } else c2 = -1 - c2, i5.coverage.glyphs.splice(c2, 0, o2), i5.ligatureSets.splice(c2, 0, [u3]);\n      }, ye3.prototype.getFeature = function(e, r, t) {\n        if (/ss\\d\\d/.test(e)) return this.getSingle(e, r, t);\n        switch (e) {\n          case "aalt":\n          case "salt":\n            return this.getSingle(e, r, t).concat(this.getAlternates(e, r, t));\n          case "dlig":\n          case "liga":\n          case "rlig":\n            return this.getLigatures(e, r, t);\n        }\n      }, ye3.prototype.add = function(e, r, t, n11) {\n        if (/ss\\d\\d/.test(e)) return this.addSingle(e, r, t, n11);\n        switch (e) {\n          case "aalt":\n          case "salt":\n            return typeof r.by == "number" ? this.addSingle(e, r, t, n11) : this.addAlternate(e, r, t, n11);\n          case "dlig":\n          case "liga":\n          case "rlig":\n            return this.addLigature(e, r, t, n11);\n        }\n      };\n      function Mi2() {\n        return typeof window < "u";\n      }\n      function gn2(e) {\n        for (var r = new ArrayBuffer(e.length), t = new Uint8Array(r), n11 = 0; n11 < e.length; ++n11) t[n11] = e[n11];\n        return r;\n      }\n      function Bi2(e) {\n        for (var r = new Buffer(e.byteLength), t = new Uint8Array(e), n11 = 0; n11 < r.length; ++n11) r[n11] = t[n11];\n        return r;\n      }\n      function Ye3(e, r) {\n        if (!e) throw r;\n      }\n      var mn2, Pe3, yn2, Qr2;\n      function bn(e) {\n        this.font = e, this._fpgmState = this._prepState = void 0, this._errorState = 0;\n      }\n      function Pi2(e) {\n        return e;\n      }\n      function xn2(e) {\n        return Math.sign(e) * Math.round(Math.abs(e));\n      }\n      function Gi2(e) {\n        return Math.sign(e) * Math.round(Math.abs(e * 2)) / 2;\n      }\n      function Ni2(e) {\n        return Math.sign(e) * (Math.round(Math.abs(e) + 0.5) - 0.5);\n      }\n      function Hi2(e) {\n        return Math.sign(e) * Math.ceil(Math.abs(e));\n      }\n      function _i(e) {\n        return Math.sign(e) * Math.floor(Math.abs(e));\n      }\n      var Sn = function(e) {\n        var r = this.srPeriod, t = this.srPhase, n11 = this.srThreshold, a2 = 1;\n        return e < 0 && (e = -e, a2 = -1), e += n11 - t, e = Math.trunc(e / r) * r, e += t, e < 0 ? t * a2 : e * a2;\n      }, Te4 = { x: 1, y: 0, axis: "x", distance: function(e, r, t, n11) {\n        return (t ? e.xo : e.x) - (n11 ? r.xo : r.x);\n      }, interpolate: function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (!n11 || n11 === this) {\n          if (a2 = e.xo - r.xo, i5 = e.xo - t.xo, u3 = r.x - r.xo, c2 = t.x - t.xo, o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n            e.x = e.xo + (u3 + c2) / 2;\n            return;\n          }\n          e.x = e.xo + (u3 * l4 + c2 * o2) / d3;\n          return;\n        }\n        if (a2 = n11.distance(e, r, true, true), i5 = n11.distance(e, t, true, true), u3 = n11.distance(r, r, false, true), c2 = n11.distance(t, t, false, true), o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n          Te4.setRelative(e, e, (u3 + c2) / 2, n11, true);\n          return;\n        }\n        Te4.setRelative(e, e, (u3 * l4 + c2 * o2) / d3, n11, true);\n      }, normalSlope: Number.NEGATIVE_INFINITY, setRelative: function(e, r, t, n11, a2) {\n        if (!n11 || n11 === this) {\n          e.x = (a2 ? r.xo : r.x) + t;\n          return;\n        }\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y;\n        e.x = l4 + (e.y - u3) / n11.normalSlope;\n      }, slope: 0, touch: function(e) {\n        e.xTouched = true;\n      }, touched: function(e) {\n        return e.xTouched;\n      }, untouch: function(e) {\n        e.xTouched = false;\n      } }, Fe4 = { x: 0, y: 1, axis: "y", distance: function(e, r, t, n11) {\n        return (t ? e.yo : e.y) - (n11 ? r.yo : r.y);\n      }, interpolate: function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (!n11 || n11 === this) {\n          if (a2 = e.yo - r.yo, i5 = e.yo - t.yo, u3 = r.y - r.yo, c2 = t.y - t.yo, o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n            e.y = e.yo + (u3 + c2) / 2;\n            return;\n          }\n          e.y = e.yo + (u3 * l4 + c2 * o2) / d3;\n          return;\n        }\n        if (a2 = n11.distance(e, r, true, true), i5 = n11.distance(e, t, true, true), u3 = n11.distance(r, r, false, true), c2 = n11.distance(t, t, false, true), o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n          Fe4.setRelative(e, e, (u3 + c2) / 2, n11, true);\n          return;\n        }\n        Fe4.setRelative(e, e, (u3 * l4 + c2 * o2) / d3, n11, true);\n      }, normalSlope: 0, setRelative: function(e, r, t, n11, a2) {\n        if (!n11 || n11 === this) {\n          e.y = (a2 ? r.yo : r.y) + t;\n          return;\n        }\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y;\n        e.y = u3 + n11.normalSlope * (e.x - l4);\n      }, slope: Number.POSITIVE_INFINITY, touch: function(e) {\n        e.yTouched = true;\n      }, touched: function(e) {\n        return e.yTouched;\n      }, untouch: function(e) {\n        e.yTouched = false;\n      } };\n      Object.freeze(Te4), Object.freeze(Fe4);\n      function rr2(e, r) {\n        this.x = e, this.y = r, this.axis = void 0, this.slope = r / e, this.normalSlope = -e / r, Object.freeze(this);\n      }\n      rr2.prototype.distance = function(e, r, t, n11) {\n        return this.x * Te4.distance(e, r, t, n11) + this.y * Fe4.distance(e, r, t, n11);\n      }, rr2.prototype.interpolate = function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (o2 = n11.distance(e, r, true, true), l4 = n11.distance(e, t, true, true), a2 = n11.distance(r, r, false, true), i5 = n11.distance(t, t, false, true), u3 = Math.abs(o2), c2 = Math.abs(l4), d3 = u3 + c2, d3 === 0) {\n          this.setRelative(e, e, (a2 + i5) / 2, n11, true);\n          return;\n        }\n        this.setRelative(e, e, (a2 * c2 + i5 * u3) / d3, n11, true);\n      }, rr2.prototype.setRelative = function(e, r, t, n11, a2) {\n        n11 = n11 || this;\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y, c2 = n11.normalSlope, d3 = this.slope, y5 = e.x, g6 = e.y;\n        e.x = (d3 * y5 - c2 * l4 + u3 - g6) / (d3 - c2), e.y = d3 * (e.x - y5) + g6;\n      }, rr2.prototype.touch = function(e) {\n        e.xTouched = true, e.yTouched = true;\n      };\n      function tr2(e, r) {\n        var t = Math.sqrt(e * e + r * r);\n        return e /= t, r /= t, e === 1 && r === 0 ? Te4 : e === 0 && r === 1 ? Fe4 : new rr2(e, r);\n      }\n      function Le3(e, r, t, n11) {\n        this.x = this.xo = Math.round(e * 64) / 64, this.y = this.yo = Math.round(r * 64) / 64, this.lastPointOfContour = t, this.onCurve = n11, this.prevPointOnContour = void 0, this.nextPointOnContour = void 0, this.xTouched = false, this.yTouched = false, Object.preventExtensions(this);\n      }\n      Le3.prototype.nextTouched = function(e) {\n        for (var r = this.nextPointOnContour; !e.touched(r) && r !== this; ) r = r.nextPointOnContour;\n        return r;\n      }, Le3.prototype.prevTouched = function(e) {\n        for (var r = this.prevPointOnContour; !e.touched(r) && r !== this; ) r = r.prevPointOnContour;\n        return r;\n      };\n      var nr2 = Object.freeze(new Le3(0, 0)), zi2 = { cvCutIn: 17 / 16, deltaBase: 9, deltaShift: 0.125, loop: 1, minDis: 1, autoFlip: true };\n      function Ie3(e, r) {\n        switch (this.env = e, this.stack = [], this.prog = r, e) {\n          case "glyf":\n            this.zp0 = this.zp1 = this.zp2 = 1, this.rp0 = this.rp1 = this.rp2 = 0;\n          case "prep":\n            this.fv = this.pv = this.dpv = Te4, this.round = xn2;\n        }\n      }\n      bn.prototype.exec = function(e, r) {\n        if (typeof r != "number") throw new Error("Point size is not a number!");\n        if (!(this._errorState > 2)) {\n          var t = this.font, n11 = this._prepState;\n          if (!n11 || n11.ppem !== r) {\n            var a2 = this._fpgmState;\n            if (!a2) {\n              Ie3.prototype = zi2, a2 = this._fpgmState = new Ie3("fpgm", t.tables.fpgm), a2.funcs = [], a2.font = t, s4.DEBUG && (console.log("---EXEC FPGM---"), a2.step = -1);\n              try {\n                Pe3(a2);\n              } catch (c2) {\n                console.log("Hinting error in FPGM:" + c2), this._errorState = 3;\n                return;\n              }\n            }\n            Ie3.prototype = a2, n11 = this._prepState = new Ie3("prep", t.tables.prep), n11.ppem = r;\n            var i5 = t.tables.cvt;\n            if (i5) for (var o2 = n11.cvt = new Array(i5.length), l4 = r / t.unitsPerEm, u3 = 0; u3 < i5.length; u3++) o2[u3] = i5[u3] * l4;\n            else n11.cvt = [];\n            s4.DEBUG && (console.log("---EXEC PREP---"), n11.step = -1);\n            try {\n              Pe3(n11);\n            } catch (c2) {\n              this._errorState < 2 && console.log("Hinting error in PREP:" + c2), this._errorState = 2;\n            }\n          }\n          if (!(this._errorState > 1)) try {\n            return yn2(e, n11);\n          } catch (c2) {\n            this._errorState < 1 && (console.log("Hinting error:" + c2), console.log("Note: further hinting errors are silenced")), this._errorState = 1;\n            return;\n          }\n        }\n      }, yn2 = function(e, r) {\n        var t = r.ppem / r.font.unitsPerEm, n11 = t, a2 = e.components, i5, o2, l4;\n        if (Ie3.prototype = r, !a2) l4 = new Ie3("glyf", e.instructions), s4.DEBUG && (console.log("---EXEC GLYPH---"), l4.step = -1), Qr2(e, l4, t, n11), o2 = l4.gZone;\n        else {\n          var u3 = r.font;\n          o2 = [], i5 = [];\n          for (var c2 = 0; c2 < a2.length; c2++) {\n            var d3 = a2[c2], y5 = u3.glyphs.get(d3.glyphIndex);\n            l4 = new Ie3("glyf", y5.instructions), s4.DEBUG && (console.log("---EXEC COMP " + c2 + "---"), l4.step = -1), Qr2(y5, l4, t, n11);\n            for (var g6 = Math.round(d3.dx * t), m4 = Math.round(d3.dy * n11), T4 = l4.gZone, O4 = l4.contours, F4 = 0; F4 < T4.length; F4++) {\n              var U6 = T4[F4];\n              U6.xTouched = U6.yTouched = false, U6.xo = U6.x = U6.x + g6, U6.yo = U6.y = U6.y + m4;\n            }\n            var P5 = o2.length;\n            o2.push.apply(o2, T4);\n            for (var I4 = 0; I4 < O4.length; I4++) i5.push(O4[I4] + P5);\n          }\n          e.instructions && !l4.inhibitGridFit && (l4 = new Ie3("glyf", e.instructions), l4.gZone = l4.z0 = l4.z1 = l4.z2 = o2, l4.contours = i5, o2.push(new Le3(0, 0), new Le3(Math.round(e.advanceWidth * t), 0)), s4.DEBUG && (console.log("---EXEC COMPOSITE---"), l4.step = -1), Pe3(l4), o2.length -= 2);\n        }\n        return o2;\n      }, Qr2 = function(e, r, t, n11) {\n        for (var a2 = e.points || [], i5 = a2.length, o2 = r.gZone = r.z0 = r.z1 = r.z2 = [], l4 = r.contours = [], u3, c2 = 0; c2 < i5; c2++) u3 = a2[c2], o2[c2] = new Le3(u3.x * t, u3.y * n11, u3.lastPointOfContour, u3.onCurve);\n        for (var d3, y5, g6 = 0; g6 < i5; g6++) u3 = o2[g6], d3 || (d3 = u3, l4.push(g6)), u3.lastPointOfContour ? (u3.nextPointOnContour = d3, d3.prevPointOnContour = u3, d3 = void 0) : (y5 = o2[g6 + 1], u3.nextPointOnContour = y5, y5.prevPointOnContour = u3);\n        if (!r.inhibitGridFit) {\n          if (s4.DEBUG) {\n            console.log("PROCESSING GLYPH", r.stack);\n            for (var m4 = 0; m4 < i5; m4++) console.log(m4, o2[m4].x, o2[m4].y);\n          }\n          if (o2.push(new Le3(0, 0), new Le3(Math.round(e.advanceWidth * t), 0)), Pe3(r), o2.length -= 2, s4.DEBUG) {\n            console.log("FINISHED GLYPH", r.stack);\n            for (var T4 = 0; T4 < i5; T4++) console.log(T4, o2[T4].x, o2[T4].y);\n          }\n        }\n      }, Pe3 = function(e) {\n        var r = e.prog;\n        if (r) {\n          var t = r.length, n11;\n          for (e.ip = 0; e.ip < t; e.ip++) {\n            if (s4.DEBUG && e.step++, n11 = mn2[r[e.ip]], !n11) throw new Error("unknown instruction: 0x" + Number(r[e.ip]).toString(16));\n            n11(e);\n          }\n        }\n      };\n      function Fr(e) {\n        for (var r = e.tZone = new Array(e.gZone.length), t = 0; t < r.length; t++) r[t] = new Le3(0, 0);\n      }\n      function Tn2(e, r) {\n        var t = e.prog, n11 = e.ip, a2 = 1, i5;\n        do\n          if (i5 = t[++n11], i5 === 88) a2++;\n          else if (i5 === 89) a2--;\n          else if (i5 === 64) n11 += t[n11 + 1] + 1;\n          else if (i5 === 65) n11 += 2 * t[n11 + 1] + 1;\n          else if (i5 >= 176 && i5 <= 183) n11 += i5 - 176 + 1;\n          else if (i5 >= 184 && i5 <= 191) n11 += (i5 - 184 + 1) * 2;\n          else if (r && a2 === 1 && i5 === 27) break;\n        while (a2 > 0);\n        e.ip = n11;\n      }\n      function kn(e, r) {\n        s4.DEBUG && console.log(r.step, "SVTCA[" + e.axis + "]"), r.fv = r.pv = r.dpv = e;\n      }\n      function Fn2(e, r) {\n        s4.DEBUG && console.log(r.step, "SPVTCA[" + e.axis + "]"), r.pv = r.dpv = e;\n      }\n      function Ln2(e, r) {\n        s4.DEBUG && console.log(r.step, "SFVTCA[" + e.axis + "]"), r.fv = e;\n      }\n      function En2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log("SPVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.pv = r.dpv = tr2(l4, u3);\n      }\n      function Un2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log("SFVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.fv = tr2(l4, u3);\n      }\n      function Wi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SPVFS[]", t, n11), e.pv = e.dpv = tr2(n11, t);\n      }\n      function Vi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SPVFS[]", t, n11), e.fv = tr2(n11, t);\n      }\n      function qi2(e) {\n        var r = e.stack, t = e.pv;\n        s4.DEBUG && console.log(e.step, "GPV[]"), r.push(t.x * 16384), r.push(t.y * 16384);\n      }\n      function Xi2(e) {\n        var r = e.stack, t = e.fv;\n        s4.DEBUG && console.log(e.step, "GFV[]"), r.push(t.x * 16384), r.push(t.y * 16384);\n      }\n      function Yi2(e) {\n        e.fv = e.pv, s4.DEBUG && console.log(e.step, "SFVTPV[]");\n      }\n      function Zi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop(), a2 = r.pop(), i5 = r.pop(), o2 = r.pop(), l4 = e.z0, u3 = e.z1, c2 = l4[t], d3 = l4[n11], y5 = u3[a2], g6 = u3[i5], m4 = e.z2[o2];\n        s4.DEBUG && console.log("ISECT[], ", t, n11, a2, i5, o2);\n        var T4 = c2.x, O4 = c2.y, F4 = d3.x, U6 = d3.y, P5 = y5.x, I4 = y5.y, H5 = g6.x, R4 = g6.y, B5 = (T4 - F4) * (I4 - R4) - (O4 - U6) * (P5 - H5), ue2 = T4 * U6 - O4 * F4, q3 = P5 * R4 - I4 * H5;\n        m4.x = (ue2 * (P5 - H5) - q3 * (T4 - F4)) / B5, m4.y = (ue2 * (I4 - R4) - q3 * (O4 - U6)) / B5;\n      }\n      function Qi2(e) {\n        e.rp0 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP0[]", e.rp0);\n      }\n      function Ji2(e) {\n        e.rp1 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP1[]", e.rp1);\n      }\n      function Ki2(e) {\n        e.rp2 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP2[]", e.rp2);\n      }\n      function ji2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP0[]", r), e.zp0 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z0 = e.tZone;\n            break;\n          case 1:\n            e.z0 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function $i2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP1[]", r), e.zp1 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z1 = e.tZone;\n            break;\n          case 1:\n            e.z1 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function es2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP2[]", r), e.zp2 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z2 = e.tZone;\n            break;\n          case 1:\n            e.z2 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function rs2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZPS[]", r), e.zp0 = e.zp1 = e.zp2 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z0 = e.z1 = e.z2 = e.tZone;\n            break;\n          case 1:\n            e.z0 = e.z1 = e.z2 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function ts2(e) {\n        e.loop = e.stack.pop(), s4.DEBUG && console.log(e.step, "SLOOP[]", e.loop);\n      }\n      function ns2(e) {\n        s4.DEBUG && console.log(e.step, "RTG[]"), e.round = xn2;\n      }\n      function as2(e) {\n        s4.DEBUG && console.log(e.step, "RTHG[]"), e.round = Ni2;\n      }\n      function is2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SMD[]", r), e.minDis = r / 64;\n      }\n      function ss2(e) {\n        s4.DEBUG && console.log(e.step, "ELSE[]"), Tn2(e, false);\n      }\n      function os2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "JMPR[]", r), e.ip += r - 1;\n      }\n      function us2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCVTCI[]", r), e.cvCutIn = r / 64;\n      }\n      function ls2(e) {\n        var r = e.stack;\n        s4.DEBUG && console.log(e.step, "DUP[]"), r.push(r[r.length - 1]);\n      }\n      function Jr2(e) {\n        s4.DEBUG && console.log(e.step, "POP[]"), e.stack.pop();\n      }\n      function fs2(e) {\n        s4.DEBUG && console.log(e.step, "CLEAR[]"), e.stack.length = 0;\n      }\n      function ps2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SWAP[]"), r.push(t), r.push(n11);\n      }\n      function hs2(e) {\n        var r = e.stack;\n        s4.DEBUG && console.log(e.step, "DEPTH[]"), r.push(r.length);\n      }\n      function cs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LOOPCALL[]", t, n11);\n        var a2 = e.ip, i5 = e.prog;\n        e.prog = e.funcs[t];\n        for (var o2 = 0; o2 < n11; o2++) Pe3(e), s4.DEBUG && console.log(++e.step, o2 + 1 < n11 ? "next loopcall" : "done loopcall", o2);\n        e.ip = a2, e.prog = i5;\n      }\n      function vs(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "CALL[]", r);\n        var t = e.ip, n11 = e.prog;\n        e.prog = e.funcs[r], Pe3(e), e.ip = t, e.prog = n11, s4.DEBUG && console.log(++e.step, "returning from", r);\n      }\n      function ds2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "CINDEX[]", t), r.push(r[r.length - t]);\n      }\n      function gs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "MINDEX[]", t), r.push(r.splice(r.length - t, 1)[0]);\n      }\n      function ms2(e) {\n        if (e.env !== "fpgm") throw new Error("FDEF not allowed here");\n        var r = e.stack, t = e.prog, n11 = e.ip, a2 = r.pop(), i5 = n11;\n        for (s4.DEBUG && console.log(e.step, "FDEF[]", a2); t[++n11] !== 45; ) ;\n        e.ip = n11, e.funcs[a2] = t.slice(i5 + 1, n11);\n      }\n      function On2(e, r) {\n        var t = r.stack.pop(), n11 = r.z0[t], a2 = r.fv, i5 = r.pv;\n        s4.DEBUG && console.log(r.step, "MDAP[" + e + "]", t);\n        var o2 = i5.distance(n11, nr2);\n        e && (o2 = r.round(o2)), a2.setRelative(n11, nr2, o2, i5), a2.touch(n11), r.rp0 = r.rp1 = t;\n      }\n      function In2(e, r) {\n        var t = r.z2, n11 = t.length - 2, a2, i5, o2;\n        s4.DEBUG && console.log(r.step, "IUP[" + e.axis + "]");\n        for (var l4 = 0; l4 < n11; l4++) a2 = t[l4], !e.touched(a2) && (i5 = a2.prevTouched(e), i5 !== a2 && (o2 = a2.nextTouched(e), i5 === o2 && e.setRelative(a2, a2, e.distance(i5, i5, false, true), e, true), e.interpolate(a2, i5, o2, e)));\n      }\n      function Cn2(e, r) {\n        for (var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = r.loop, u3 = r.z2; l4--; ) {\n          var c2 = t.pop(), d3 = u3[c2], y5 = o2.distance(a2, a2, false, true);\n          i5.setRelative(d3, d3, y5, o2), i5.touch(d3), s4.DEBUG && console.log(r.step, (r.loop > 1 ? "loop " + (r.loop - l4) + ": " : "") + "SHP[" + (e ? "rp1" : "rp2") + "]", c2);\n        }\n        r.loop = 1;\n      }\n      function wn2(e, r) {\n        var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = t.pop(), u3 = r.z2[r.contours[l4]], c2 = u3;\n        s4.DEBUG && console.log(r.step, "SHC[" + e + "]", l4);\n        var d3 = o2.distance(a2, a2, false, true);\n        do\n          c2 !== a2 && i5.setRelative(c2, c2, d3, o2), c2 = c2.nextPointOnContour;\n        while (c2 !== u3);\n      }\n      function Rn2(e, r) {\n        var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = t.pop();\n        s4.DEBUG && console.log(r.step, "SHZ[" + e + "]", l4);\n        var u3;\n        switch (l4) {\n          case 0:\n            u3 = r.tZone;\n            break;\n          case 1:\n            u3 = r.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone");\n        }\n        for (var c2, d3 = o2.distance(a2, a2, false, true), y5 = u3.length - 2, g6 = 0; g6 < y5; g6++) c2 = u3[g6], i5.setRelative(c2, c2, d3, o2);\n      }\n      function ys2(e) {\n        for (var r = e.stack, t = e.loop, n11 = e.fv, a2 = r.pop() / 64, i5 = e.z2; t--; ) {\n          var o2 = r.pop(), l4 = i5[o2];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - t) + ": " : "") + "SHPIX[]", o2, a2), n11.setRelative(l4, l4, a2), n11.touch(l4);\n        }\n        e.loop = 1;\n      }\n      function bs2(e) {\n        for (var r = e.stack, t = e.rp1, n11 = e.rp2, a2 = e.loop, i5 = e.z0[t], o2 = e.z1[n11], l4 = e.fv, u3 = e.dpv, c2 = e.z2; a2--; ) {\n          var d3 = r.pop(), y5 = c2[d3];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - a2) + ": " : "") + "IP[]", d3, t, "<->", n11), l4.interpolate(y5, i5, o2, u3), l4.touch(y5);\n        }\n        e.loop = 1;\n      }\n      function Dn2(e, r) {\n        var t = r.stack, n11 = t.pop() / 64, a2 = t.pop(), i5 = r.z1[a2], o2 = r.z0[r.rp0], l4 = r.fv, u3 = r.pv;\n        l4.setRelative(i5, o2, n11, u3), l4.touch(i5), s4.DEBUG && console.log(r.step, "MSIRP[" + e + "]", n11, a2), r.rp1 = r.rp0, r.rp2 = a2, e && (r.rp0 = a2);\n      }\n      function xs2(e) {\n        for (var r = e.stack, t = e.rp0, n11 = e.z0[t], a2 = e.loop, i5 = e.fv, o2 = e.pv, l4 = e.z1; a2--; ) {\n          var u3 = r.pop(), c2 = l4[u3];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - a2) + ": " : "") + "ALIGNRP[]", u3), i5.setRelative(c2, n11, 0, o2), i5.touch(c2);\n        }\n        e.loop = 1;\n      }\n      function Ss2(e) {\n        s4.DEBUG && console.log(e.step, "RTDG[]"), e.round = Gi2;\n      }\n      function An(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z0[a2], o2 = r.fv, l4 = r.pv, u3 = r.cvt[n11];\n        s4.DEBUG && console.log(r.step, "MIAP[" + e + "]", n11, "(", u3, ")", a2);\n        var c2 = l4.distance(i5, nr2);\n        e && (Math.abs(c2 - u3) < r.cvCutIn && (c2 = u3), c2 = r.round(c2)), o2.setRelative(i5, nr2, c2, l4), r.zp0 === 0 && (i5.xo = i5.x, i5.yo = i5.y), o2.touch(i5), r.rp0 = r.rp1 = a2;\n      }\n      function Ts2(e) {\n        var r = e.prog, t = e.ip, n11 = e.stack, a2 = r[++t];\n        s4.DEBUG && console.log(e.step, "NPUSHB[]", a2);\n        for (var i5 = 0; i5 < a2; i5++) n11.push(r[++t]);\n        e.ip = t;\n      }\n      function ks2(e) {\n        var r = e.ip, t = e.prog, n11 = e.stack, a2 = t[++r];\n        s4.DEBUG && console.log(e.step, "NPUSHW[]", a2);\n        for (var i5 = 0; i5 < a2; i5++) {\n          var o2 = t[++r] << 8 | t[++r];\n          o2 & 32768 && (o2 = -((o2 ^ 65535) + 1)), n11.push(o2);\n        }\n        e.ip = r;\n      }\n      function Fs(e) {\n        var r = e.stack, t = e.store;\n        t || (t = e.store = []);\n        var n11 = r.pop(), a2 = r.pop();\n        s4.DEBUG && console.log(e.step, "WS", n11, a2), t[a2] = n11;\n      }\n      function Ls2(e) {\n        var r = e.stack, t = e.store, n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "RS", n11);\n        var a2 = t && t[n11] || 0;\n        r.push(a2);\n      }\n      function Es2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "WCVTP", t, n11), e.cvt[n11] = t / 64;\n      }\n      function Us2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "RCVT", t), r.push(e.cvt[t] * 64);\n      }\n      function Mn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.z2[n11];\n        s4.DEBUG && console.log(r.step, "GC[" + e + "]", n11), t.push(r.dpv.distance(a2, nr2, e, false) * 64);\n      }\n      function Bn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z1[n11], o2 = r.z0[a2], l4 = r.dpv.distance(o2, i5, e, e);\n        s4.DEBUG && console.log(r.step, "MD[" + e + "]", n11, a2, "->", l4), r.stack.push(Math.round(l4 * 64));\n      }\n      function Os(e) {\n        s4.DEBUG && console.log(e.step, "MPPEM[]"), e.stack.push(e.ppem);\n      }\n      function Is(e) {\n        s4.DEBUG && console.log(e.step, "FLIPON[]"), e.autoFlip = true;\n      }\n      function Cs(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LT[]", t, n11), r.push(n11 < t ? 1 : 0);\n      }\n      function ws2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LTEQ[]", t, n11), r.push(n11 <= t ? 1 : 0);\n      }\n      function Rs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "GT[]", t, n11), r.push(n11 > t ? 1 : 0);\n      }\n      function Ds2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "GTEQ[]", t, n11), r.push(n11 >= t ? 1 : 0);\n      }\n      function As2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "EQ[]", t, n11), r.push(t === n11 ? 1 : 0);\n      }\n      function Ms2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "NEQ[]", t, n11), r.push(t !== n11 ? 1 : 0);\n      }\n      function Bs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "ODD[]", t), r.push(Math.trunc(t) % 2 ? 1 : 0);\n      }\n      function Ps2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "EVEN[]", t), r.push(Math.trunc(t) % 2 ? 0 : 1);\n      }\n      function Gs2(e) {\n        var r = e.stack.pop(), t;\n        s4.DEBUG && console.log(e.step, "IF[]", r), r || (Tn2(e, true), s4.DEBUG && console.log(e.step, t === 27 ? "ELSE[]" : "EIF[]"));\n      }\n      function Ns(e) {\n        s4.DEBUG && console.log(e.step, "EIF[]");\n      }\n      function Hs(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "AND[]", t, n11), r.push(t && n11 ? 1 : 0);\n      }\n      function _s2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "OR[]", t, n11), r.push(t || n11 ? 1 : 0);\n      }\n      function zs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "NOT[]", t), r.push(t ? 0 : 1);\n      }\n      function Kr(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.fv, i5 = r.pv, o2 = r.ppem, l4 = r.deltaBase + (e - 1) * 16, u3 = r.deltaShift, c2 = r.z0;\n        s4.DEBUG && console.log(r.step, "DELTAP[" + e + "]", n11, t);\n        for (var d3 = 0; d3 < n11; d3++) {\n          var y5 = t.pop(), g6 = t.pop(), m4 = l4 + ((g6 & 240) >> 4);\n          if (m4 === o2) {\n            var T4 = (g6 & 15) - 8;\n            T4 >= 0 && T4++, s4.DEBUG && console.log(r.step, "DELTAPFIX", y5, "by", T4 * u3);\n            var O4 = c2[y5];\n            a2.setRelative(O4, O4, T4 * u3, i5);\n          }\n        }\n      }\n      function Ws(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "SDB[]", t), e.deltaBase = t;\n      }\n      function Vs(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "SDS[]", t), e.deltaShift = Math.pow(0.5, t);\n      }\n      function qs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "ADD[]", t, n11), r.push(n11 + t);\n      }\n      function Xs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SUB[]", t, n11), r.push(n11 - t);\n      }\n      function Ys2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "DIV[]", t, n11), r.push(n11 * 64 / t);\n      }\n      function Zs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MUL[]", t, n11), r.push(n11 * t / 64);\n      }\n      function Qs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "ABS[]", t), r.push(Math.abs(t));\n      }\n      function Js2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "NEG[]", t), r.push(-t);\n      }\n      function Ks2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "FLOOR[]", t), r.push(Math.floor(t / 64) * 64);\n      }\n      function js2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "CEILING[]", t), r.push(Math.ceil(t / 64) * 64);\n      }\n      function Lr2(e, r) {\n        var t = r.stack, n11 = t.pop();\n        s4.DEBUG && console.log(r.step, "ROUND[]"), t.push(r.round(n11 / 64) * 64);\n      }\n      function $s2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "WCVTF[]", t, n11), e.cvt[n11] = t * e.ppem / e.font.unitsPerEm;\n      }\n      function jr2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.ppem, i5 = r.deltaBase + (e - 1) * 16, o2 = r.deltaShift;\n        s4.DEBUG && console.log(r.step, "DELTAC[" + e + "]", n11, t);\n        for (var l4 = 0; l4 < n11; l4++) {\n          var u3 = t.pop(), c2 = t.pop(), d3 = i5 + ((c2 & 240) >> 4);\n          if (d3 === a2) {\n            var y5 = (c2 & 15) - 8;\n            y5 >= 0 && y5++;\n            var g6 = y5 * o2;\n            s4.DEBUG && console.log(r.step, "DELTACFIX", u3, "by", g6), r.cvt[u3] += g6;\n          }\n        }\n      }\n      function eo2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SROUND[]", r), e.round = Sn;\n        var t;\n        switch (r & 192) {\n          case 0:\n            t = 0.5;\n            break;\n          case 64:\n            t = 1;\n            break;\n          case 128:\n            t = 2;\n            break;\n          default:\n            throw new Error("invalid SROUND value");\n        }\n        switch (e.srPeriod = t, r & 48) {\n          case 0:\n            e.srPhase = 0;\n            break;\n          case 16:\n            e.srPhase = 0.25 * t;\n            break;\n          case 32:\n            e.srPhase = 0.5 * t;\n            break;\n          case 48:\n            e.srPhase = 0.75 * t;\n            break;\n          default:\n            throw new Error("invalid SROUND value");\n        }\n        r &= 15, r === 0 ? e.srThreshold = 0 : e.srThreshold = (r / 8 - 0.5) * t;\n      }\n      function ro2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "S45ROUND[]", r), e.round = Sn;\n        var t;\n        switch (r & 192) {\n          case 0:\n            t = Math.sqrt(2) / 2;\n            break;\n          case 64:\n            t = Math.sqrt(2);\n            break;\n          case 128:\n            t = 2 * Math.sqrt(2);\n            break;\n          default:\n            throw new Error("invalid S45ROUND value");\n        }\n        switch (e.srPeriod = t, r & 48) {\n          case 0:\n            e.srPhase = 0;\n            break;\n          case 16:\n            e.srPhase = 0.25 * t;\n            break;\n          case 32:\n            e.srPhase = 0.5 * t;\n            break;\n          case 48:\n            e.srPhase = 0.75 * t;\n            break;\n          default:\n            throw new Error("invalid S45ROUND value");\n        }\n        r &= 15, r === 0 ? e.srThreshold = 0 : e.srThreshold = (r / 8 - 0.5) * t;\n      }\n      function to2(e) {\n        s4.DEBUG && console.log(e.step, "ROFF[]"), e.round = Pi2;\n      }\n      function no2(e) {\n        s4.DEBUG && console.log(e.step, "RUTG[]"), e.round = Hi2;\n      }\n      function ao2(e) {\n        s4.DEBUG && console.log(e.step, "RDTG[]"), e.round = _i;\n      }\n      function io2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCANCTRL[]", r);\n      }\n      function Pn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log(r.step, "SDPVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.dpv = tr2(l4, u3);\n      }\n      function so2(e) {\n        var r = e.stack, t = r.pop(), n11 = 0;\n        s4.DEBUG && console.log(e.step, "GETINFO[]", t), t & 1 && (n11 = 35), t & 32 && (n11 |= 4096), r.push(n11);\n      }\n      function oo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop(), a2 = r.pop();\n        s4.DEBUG && console.log(e.step, "ROLL[]"), r.push(n11), r.push(t), r.push(a2);\n      }\n      function uo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MAX[]", t, n11), r.push(Math.max(n11, t));\n      }\n      function lo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MIN[]", t, n11), r.push(Math.min(n11, t));\n      }\n      function fo2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCANTYPE[]", r);\n      }\n      function po2(e) {\n        var r = e.stack.pop(), t = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "INSTCTRL[]", r, t), r) {\n          case 1:\n            e.inhibitGridFit = !!t;\n            return;\n          case 2:\n            e.ignoreCvt = !!t;\n            return;\n          default:\n            throw new Error("invalid INSTCTRL[] selector");\n        }\n      }\n      function Ce3(e, r) {\n        var t = r.stack, n11 = r.prog, a2 = r.ip;\n        s4.DEBUG && console.log(r.step, "PUSHB[" + e + "]");\n        for (var i5 = 0; i5 < e; i5++) t.push(n11[++a2]);\n        r.ip = a2;\n      }\n      function we3(e, r) {\n        var t = r.ip, n11 = r.prog, a2 = r.stack;\n        s4.DEBUG && console.log(r.ip, "PUSHW[" + e + "]");\n        for (var i5 = 0; i5 < e; i5++) {\n          var o2 = n11[++t] << 8 | n11[++t];\n          o2 & 32768 && (o2 = -((o2 ^ 65535) + 1)), a2.push(o2);\n        }\n        r.ip = t;\n      }\n      function C4(e, r, t, n11, a2, i5) {\n        var o2 = i5.stack, l4 = e && o2.pop(), u3 = o2.pop(), c2 = i5.rp0, d3 = i5.z0[c2], y5 = i5.z1[u3], g6 = i5.minDis, m4 = i5.fv, T4 = i5.dpv, O4, F4, U6, P5;\n        F4 = O4 = T4.distance(y5, d3, true, true), U6 = F4 >= 0 ? 1 : -1, F4 = Math.abs(F4), e && (P5 = i5.cvt[l4], n11 && Math.abs(F4 - P5) < i5.cvCutIn && (F4 = P5)), t && F4 < g6 && (F4 = g6), n11 && (F4 = i5.round(F4)), m4.setRelative(y5, d3, U6 * F4, T4), m4.touch(y5), s4.DEBUG && console.log(i5.step, (e ? "MIRP[" : "MDRP[") + (r ? "M" : "m") + (t ? ">" : "_") + (n11 ? "R" : "_") + (a2 === 0 ? "Gr" : a2 === 1 ? "Bl" : a2 === 2 ? "Wh" : "") + "]", e ? l4 + "(" + i5.cvt[l4] + "," + P5 + ")" : "", u3, "(d =", O4, "->", U6 * F4, ")"), i5.rp1 = i5.rp0, i5.rp2 = u3, r && (i5.rp0 = u3);\n      }\n      mn2 = [kn.bind(void 0, Fe4), kn.bind(void 0, Te4), Fn2.bind(void 0, Fe4), Fn2.bind(void 0, Te4), Ln2.bind(void 0, Fe4), Ln2.bind(void 0, Te4), En2.bind(void 0, 0), En2.bind(void 0, 1), Un2.bind(void 0, 0), Un2.bind(void 0, 1), Wi2, Vi2, qi2, Xi2, Yi2, Zi2, Qi2, Ji2, Ki2, ji2, $i2, es2, rs2, ts2, ns2, as2, is2, ss2, os2, us2, void 0, void 0, ls2, Jr2, fs2, ps2, hs2, ds2, gs2, void 0, void 0, void 0, cs2, vs, ms2, void 0, On2.bind(void 0, 0), On2.bind(void 0, 1), In2.bind(void 0, Fe4), In2.bind(void 0, Te4), Cn2.bind(void 0, 0), Cn2.bind(void 0, 1), wn2.bind(void 0, 0), wn2.bind(void 0, 1), Rn2.bind(void 0, 0), Rn2.bind(void 0, 1), ys2, bs2, Dn2.bind(void 0, 0), Dn2.bind(void 0, 1), xs2, Ss2, An.bind(void 0, 0), An.bind(void 0, 1), Ts2, ks2, Fs, Ls2, Es2, Us2, Mn2.bind(void 0, 0), Mn2.bind(void 0, 1), void 0, Bn2.bind(void 0, 0), Bn2.bind(void 0, 1), Os, void 0, Is, void 0, void 0, Cs, ws2, Rs2, Ds2, As2, Ms2, Bs2, Ps2, Gs2, Ns, Hs, _s2, zs2, Kr.bind(void 0, 1), Ws, Vs, qs2, Xs2, Ys2, Zs2, Qs2, Js2, Ks2, js2, Lr2.bind(void 0, 0), Lr2.bind(void 0, 1), Lr2.bind(void 0, 2), Lr2.bind(void 0, 3), void 0, void 0, void 0, void 0, $s2, Kr.bind(void 0, 2), Kr.bind(void 0, 3), jr2.bind(void 0, 1), jr2.bind(void 0, 2), jr2.bind(void 0, 3), eo2, ro2, void 0, void 0, to2, void 0, no2, ao2, Jr2, Jr2, void 0, void 0, void 0, void 0, void 0, io2, Pn2.bind(void 0, 0), Pn2.bind(void 0, 1), so2, void 0, oo2, uo2, lo2, fo2, po2, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, Ce3.bind(void 0, 1), Ce3.bind(void 0, 2), Ce3.bind(void 0, 3), Ce3.bind(void 0, 4), Ce3.bind(void 0, 5), Ce3.bind(void 0, 6), Ce3.bind(void 0, 7), Ce3.bind(void 0, 8), we3.bind(void 0, 1), we3.bind(void 0, 2), we3.bind(void 0, 3), we3.bind(void 0, 4), we3.bind(void 0, 5), we3.bind(void 0, 6), we3.bind(void 0, 7), we3.bind(void 0, 8), C4.bind(void 0, 0, 0, 0, 0, 0), C4.bind(void 0, 0, 0, 0, 0, 1), C4.bind(void 0, 0, 0, 0, 0, 2), C4.bind(void 0, 0, 0, 0, 0, 3), C4.bind(void 0, 0, 0, 0, 1, 0), C4.bind(void 0, 0, 0, 0, 1, 1), C4.bind(void 0, 0, 0, 0, 1, 2), C4.bind(void 0, 0, 0, 0, 1, 3), C4.bind(void 0, 0, 0, 1, 0, 0), C4.bind(void 0, 0, 0, 1, 0, 1), C4.bind(void 0, 0, 0, 1, 0, 2), C4.bind(void 0, 0, 0, 1, 0, 3), C4.bind(void 0, 0, 0, 1, 1, 0), C4.bind(void 0, 0, 0, 1, 1, 1), C4.bind(void 0, 0, 0, 1, 1, 2), C4.bind(void 0, 0, 0, 1, 1, 3), C4.bind(void 0, 0, 1, 0, 0, 0), C4.bind(void 0, 0, 1, 0, 0, 1), C4.bind(void 0, 0, 1, 0, 0, 2), C4.bind(void 0, 0, 1, 0, 0, 3), C4.bind(void 0, 0, 1, 0, 1, 0), C4.bind(void 0, 0, 1, 0, 1, 1), C4.bind(void 0, 0, 1, 0, 1, 2), C4.bind(void 0, 0, 1, 0, 1, 3), C4.bind(void 0, 0, 1, 1, 0, 0), C4.bind(void 0, 0, 1, 1, 0, 1), C4.bind(void 0, 0, 1, 1, 0, 2), C4.bind(void 0, 0, 1, 1, 0, 3), C4.bind(void 0, 0, 1, 1, 1, 0), C4.bind(void 0, 0, 1, 1, 1, 1), C4.bind(void 0, 0, 1, 1, 1, 2), C4.bind(void 0, 0, 1, 1, 1, 3), C4.bind(void 0, 1, 0, 0, 0, 0), C4.bind(void 0, 1, 0, 0, 0, 1), C4.bind(void 0, 1, 0, 0, 0, 2), C4.bind(void 0, 1, 0, 0, 0, 3), C4.bind(void 0, 1, 0, 0, 1, 0), C4.bind(void 0, 1, 0, 0, 1, 1), C4.bind(void 0, 1, 0, 0, 1, 2), C4.bind(void 0, 1, 0, 0, 1, 3), C4.bind(void 0, 1, 0, 1, 0, 0), C4.bind(void 0, 1, 0, 1, 0, 1), C4.bind(void 0, 1, 0, 1, 0, 2), C4.bind(void 0, 1, 0, 1, 0, 3), C4.bind(void 0, 1, 0, 1, 1, 0), C4.bind(void 0, 1, 0, 1, 1, 1), C4.bind(void 0, 1, 0, 1, 1, 2), C4.bind(void 0, 1, 0, 1, 1, 3), C4.bind(void 0, 1, 1, 0, 0, 0), C4.bind(void 0, 1, 1, 0, 0, 1), C4.bind(void 0, 1, 1, 0, 0, 2), C4.bind(void 0, 1, 1, 0, 0, 3), C4.bind(void 0, 1, 1, 0, 1, 0), C4.bind(void 0, 1, 1, 0, 1, 1), C4.bind(void 0, 1, 1, 0, 1, 2), C4.bind(void 0, 1, 1, 0, 1, 3), C4.bind(void 0, 1, 1, 1, 0, 0), C4.bind(void 0, 1, 1, 1, 0, 1), C4.bind(void 0, 1, 1, 1, 0, 2), C4.bind(void 0, 1, 1, 1, 0, 3), C4.bind(void 0, 1, 1, 1, 1, 0), C4.bind(void 0, 1, 1, 1, 1, 1), C4.bind(void 0, 1, 1, 1, 1, 2), C4.bind(void 0, 1, 1, 1, 1, 3)];\n      function z4(e) {\n        e = e || {}, e.empty || (Ye3(e.familyName, "When creating a new Font object, familyName is required."), Ye3(e.styleName, "When creating a new Font object, styleName is required."), Ye3(e.unitsPerEm, "When creating a new Font object, unitsPerEm is required."), Ye3(e.ascender, "When creating a new Font object, ascender is required."), Ye3(e.descender, "When creating a new Font object, descender is required."), Ye3(e.descender < 0, "Descender should be negative (e.g. -512)."), this.names = { fontFamily: { en: e.familyName || " " }, fontSubfamily: { en: e.styleName || " " }, fullName: { en: e.fullName || e.familyName + " " + e.styleName }, postScriptName: { en: e.postScriptName || e.familyName + e.styleName }, designer: { en: e.designer || " " }, designerURL: { en: e.designerURL || " " }, manufacturer: { en: e.manufacturer || " " }, manufacturerURL: { en: e.manufacturerURL || " " }, license: { en: e.license || " " }, licenseURL: { en: e.licenseURL || " " }, version: { en: e.version || "Version 0.1" }, description: { en: e.description || " " }, copyright: { en: e.copyright || " " }, trademark: { en: e.trademark || " " } }, this.unitsPerEm = e.unitsPerEm || 1e3, this.ascender = e.ascender, this.descender = e.descender, this.createdTimestamp = e.createdTimestamp, this.tables = { os2: { usWeightClass: e.weightClass || this.usWeightClasses.MEDIUM, usWidthClass: e.widthClass || this.usWidthClasses.MEDIUM, fsSelection: e.fsSelection || this.fsSelectionValues.REGULAR } }), this.supported = true, this.glyphs = new qe2.GlyphSet(this, e.glyphs || []), this.encoding = new Ct3(this), this.position = new kr(this), this.substitution = new ye3(this), this.tables = this.tables || {}, Object.defineProperty(this, "hinting", { get: function() {\n          if (this._hinting) return this._hinting;\n          if (this.outlinesFormat === "truetype") return this._hinting = new bn(this);\n        } });\n      }\n      z4.prototype.hasChar = function(e) {\n        return this.encoding.charToGlyphIndex(e) !== null;\n      }, z4.prototype.charToGlyphIndex = function(e) {\n        return this.encoding.charToGlyphIndex(e);\n      }, z4.prototype.charToGlyph = function(e) {\n        var r = this.charToGlyphIndex(e), t = this.glyphs.get(r);\n        return t || (t = this.glyphs.get(0)), t;\n      }, z4.prototype.stringToGlyphs = function(e, r) {\n        var t = this;\n        r = r || this.defaultRenderOptions;\n        for (var n11 = [], a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = e[a2];\n          n11.push(t.charToGlyphIndex(i5));\n        }\n        var o2 = n11.length;\n        if (r.features) {\n          var l4 = r.script || this.substitution.getDefaultScriptName(), u3 = [];\n          r.features.liga && (u3 = u3.concat(this.substitution.getFeature("liga", l4, r.language))), r.features.rlig && (u3 = u3.concat(this.substitution.getFeature("rlig", l4, r.language)));\n          for (var c2 = 0; c2 < o2; c2 += 1) for (var d3 = 0; d3 < u3.length; d3++) {\n            for (var y5 = u3[d3], g6 = y5.sub, m4 = g6.length, T4 = 0; T4 < m4 && g6[T4] === n11[c2 + T4]; ) T4++;\n            T4 === m4 && (n11.splice(c2, m4, y5.by), o2 = o2 - m4 + 1);\n          }\n        }\n        for (var O4 = new Array(o2), F4 = this.glyphs.get(0), U6 = 0; U6 < o2; U6 += 1) O4[U6] = t.glyphs.get(n11[U6]) || F4;\n        return O4;\n      }, z4.prototype.nameToGlyphIndex = function(e) {\n        return this.glyphNames.nameToGlyphIndex(e);\n      }, z4.prototype.nameToGlyph = function(e) {\n        var r = this.nameToGlyphIndex(e), t = this.glyphs.get(r);\n        return t || (t = this.glyphs.get(0)), t;\n      }, z4.prototype.glyphIndexToName = function(e) {\n        return this.glyphNames.glyphIndexToName ? this.glyphNames.glyphIndexToName(e) : "";\n      }, z4.prototype.getKerningValue = function(e, r) {\n        return e = e.index || e, r = r.index || r, this.kerningPairs[e + "," + r] || 0;\n      }, z4.prototype.defaultRenderOptions = { kerning: true, features: { liga: true, rlig: true } }, z4.prototype.forEachGlyph = function(e, r, t, n11, a2, i5) {\n        var o2 = this;\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 72, a2 = a2 || this.defaultRenderOptions;\n        var l4 = 1 / this.unitsPerEm * n11, u3 = this.stringToGlyphs(e, a2), c2;\n        if (a2.kerning) {\n          var d3 = a2.script || this.position.getDefaultScriptName();\n          c2 = this.position.getKerningTables(d3, a2.language);\n        }\n        for (var y5 = 0; y5 < u3.length; y5 += 1) {\n          var g6 = u3[y5];\n          if (i5.call(o2, g6, r, t, n11, a2), g6.advanceWidth && (r += g6.advanceWidth * l4), a2.kerning && y5 < u3.length - 1) {\n            var m4 = c2 ? o2.position.getKerningValue(c2, g6.index, u3[y5 + 1].index) : o2.getKerningValue(g6, u3[y5 + 1]);\n            r += m4 * l4;\n          }\n          a2.letterSpacing ? r += a2.letterSpacing * n11 : a2.tracking && (r += a2.tracking / 1e3 * n11);\n        }\n        return r;\n      }, z4.prototype.getPath = function(e, r, t, n11, a2) {\n        var i5 = new Z5();\n        return this.forEachGlyph(e, r, t, n11, a2, function(o2, l4, u3, c2) {\n          var d3 = o2.getPath(l4, u3, c2, a2, this);\n          i5.extend(d3);\n        }), i5;\n      }, z4.prototype.getPaths = function(e, r, t, n11, a2) {\n        var i5 = [];\n        return this.forEachGlyph(e, r, t, n11, a2, function(o2, l4, u3, c2) {\n          var d3 = o2.getPath(l4, u3, c2, a2, this);\n          i5.push(d3);\n        }), i5;\n      }, z4.prototype.getAdvanceWidth = function(e, r, t) {\n        return this.forEachGlyph(e, 0, 0, r, t, function() {\n        });\n      }, z4.prototype.draw = function(e, r, t, n11, a2, i5) {\n        this.getPath(r, t, n11, a2, i5).draw(e);\n      }, z4.prototype.drawPoints = function(e, r, t, n11, a2, i5) {\n        this.forEachGlyph(r, t, n11, a2, i5, function(o2, l4, u3, c2) {\n          o2.drawPoints(e, l4, u3, c2);\n        });\n      }, z4.prototype.drawMetrics = function(e, r, t, n11, a2, i5) {\n        this.forEachGlyph(r, t, n11, a2, i5, function(o2, l4, u3, c2) {\n          o2.drawMetrics(e, l4, u3, c2);\n        });\n      }, z4.prototype.getEnglishName = function(e) {\n        var r = this.names[e];\n        if (r) return r.en;\n      }, z4.prototype.validate = function() {\n        var e = [], r = this;\n        function t(a2, i5) {\n          a2 || e.push(i5);\n        }\n        function n11(a2) {\n          var i5 = r.getEnglishName(a2);\n          t(i5 && i5.trim().length > 0, "No English " + a2 + " specified.");\n        }\n        n11("fontFamily"), n11("weightName"), n11("manufacturer"), n11("copyright"), n11("version"), t(this.unitsPerEm > 0, "No unitsPerEm specified.");\n      }, z4.prototype.toTables = function() {\n        return Di2.fontToTable(this);\n      }, z4.prototype.toBuffer = function() {\n        return console.warn("Font.toBuffer is deprecated. Use Font.toArrayBuffer instead."), this.toArrayBuffer();\n      }, z4.prototype.toArrayBuffer = function() {\n        for (var e = this.toTables(), r = e.encode(), t = new ArrayBuffer(r.length), n11 = new Uint8Array(t), a2 = 0; a2 < r.length; a2++) n11[a2] = r[a2];\n        return t;\n      }, z4.prototype.download = function(e) {\n        var r = this.getEnglishName("fontFamily"), t = this.getEnglishName("fontSubfamily");\n        e = e || r.replace(/\\s/g, "") + "-" + t + ".otf";\n        var n11 = this.toArrayBuffer();\n        if (Mi2()) window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem, window.requestFileSystem(window.TEMPORARY, n11.byteLength, function(o2) {\n          o2.root.getFile(e, { create: true }, function(l4) {\n            l4.createWriter(function(u3) {\n              var c2 = new DataView(n11), d3 = new Blob([c2], { type: "font/opentype" });\n              u3.write(d3), u3.addEventListener("writeend", function() {\n                location.href = l4.toURL();\n              }, false);\n            });\n          });\n        }, function(o2) {\n          throw new Error(o2.name + ": " + o2.message);\n        });\n        else {\n          var a2 = tt2("fs"), i5 = Bi2(n11);\n          a2.writeFileSync(e, i5);\n        }\n      }, z4.prototype.fsSelectionValues = { ITALIC: 1, UNDERSCORE: 2, NEGATIVE: 4, OUTLINED: 8, STRIKEOUT: 16, BOLD: 32, REGULAR: 64, USER_TYPO_METRICS: 128, WWS: 256, OBLIQUE: 512 }, z4.prototype.usWidthClasses = { ULTRA_CONDENSED: 1, EXTRA_CONDENSED: 2, CONDENSED: 3, SEMI_CONDENSED: 4, MEDIUM: 5, SEMI_EXPANDED: 6, EXPANDED: 7, EXTRA_EXPANDED: 8, ULTRA_EXPANDED: 9 }, z4.prototype.usWeightClasses = { THIN: 100, EXTRA_LIGHT: 200, LIGHT: 300, NORMAL: 400, MEDIUM: 500, SEMI_BOLD: 600, BOLD: 700, EXTRA_BOLD: 800, BLACK: 900 };\n      function Gn2(e, r) {\n        var t = JSON.stringify(e), n11 = 256;\n        for (var a2 in r) {\n          var i5 = parseInt(a2);\n          if (!(!i5 || i5 < 256)) {\n            if (JSON.stringify(r[a2]) === t) return i5;\n            n11 <= i5 && (n11 = i5 + 1);\n          }\n        }\n        return r[n11] = e, n11;\n      }\n      function ho2(e, r, t) {\n        var n11 = Gn2(r.name, t);\n        return [{ name: "tag_" + e, type: "TAG", value: r.tag }, { name: "minValue_" + e, type: "FIXED", value: r.minValue << 16 }, { name: "defaultValue_" + e, type: "FIXED", value: r.defaultValue << 16 }, { name: "maxValue_" + e, type: "FIXED", value: r.maxValue << 16 }, { name: "flags_" + e, type: "USHORT", value: 0 }, { name: "nameID_" + e, type: "USHORT", value: n11 }];\n      }\n      function co2(e, r, t) {\n        var n11 = {}, a2 = new w6.Parser(e, r);\n        return n11.tag = a2.parseTag(), n11.minValue = a2.parseFixed(), n11.defaultValue = a2.parseFixed(), n11.maxValue = a2.parseFixed(), a2.skip("uShort", 1), n11.name = t[a2.parseUShort()] || {}, n11;\n      }\n      function vo(e, r, t, n11) {\n        for (var a2 = Gn2(r.name, n11), i5 = [{ name: "nameID_" + e, type: "USHORT", value: a2 }, { name: "flags_" + e, type: "USHORT", value: 0 }], o2 = 0; o2 < t.length; ++o2) {\n          var l4 = t[o2].tag;\n          i5.push({ name: "axis_" + e + " " + l4, type: "FIXED", value: r.coordinates[l4] << 16 });\n        }\n        return i5;\n      }\n      function go2(e, r, t, n11) {\n        var a2 = {}, i5 = new w6.Parser(e, r);\n        a2.name = n11[i5.parseUShort()] || {}, i5.skip("uShort", 1), a2.coordinates = {};\n        for (var o2 = 0; o2 < t.length; ++o2) a2.coordinates[t[o2].tag] = i5.parseFixed();\n        return a2;\n      }\n      function mo2(e, r) {\n        var t = new A4.Table("fvar", [{ name: "version", type: "ULONG", value: 65536 }, { name: "offsetToData", type: "USHORT", value: 0 }, { name: "countSizePairs", type: "USHORT", value: 2 }, { name: "axisCount", type: "USHORT", value: e.axes.length }, { name: "axisSize", type: "USHORT", value: 20 }, { name: "instanceCount", type: "USHORT", value: e.instances.length }, { name: "instanceSize", type: "USHORT", value: 4 + e.axes.length * 4 }]);\n        t.offsetToData = t.sizeOf();\n        for (var n11 = 0; n11 < e.axes.length; n11++) t.fields = t.fields.concat(ho2(n11, e.axes[n11], r));\n        for (var a2 = 0; a2 < e.instances.length; a2++) t.fields = t.fields.concat(vo(a2, e.instances[a2], e.axes, r));\n        return t;\n      }\n      function yo2(e, r, t) {\n        var n11 = new w6.Parser(e, r), a2 = n11.parseULong();\n        G5.argument(a2 === 65536, "Unsupported fvar table version.");\n        var i5 = n11.parseOffset16();\n        n11.skip("uShort", 1);\n        for (var o2 = n11.parseUShort(), l4 = n11.parseUShort(), u3 = n11.parseUShort(), c2 = n11.parseUShort(), d3 = [], y5 = 0; y5 < o2; y5++) d3.push(co2(e, r + i5 + y5 * l4, t));\n        for (var g6 = [], m4 = r + i5 + o2 * l4, T4 = 0; T4 < u3; T4++) g6.push(go2(e, m4 + T4 * c2, d3, t));\n        return { axes: d3, instances: g6 };\n      }\n      var bo = { make: mo2, parse: yo2 }, be4 = new Array(10);\n      be4[1] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { posFormat: 1, coverage: this.parsePointer(b4.coverage), value: this.parseValueRecord() };\n        if (t === 2) return { posFormat: 2, coverage: this.parsePointer(b4.coverage), values: this.parseValueRecordList() };\n        G5.assert(false, "0x" + r.toString(16) + ": GPOS lookup type 1 format must be 1 or 2.");\n      }, be4[2] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort(), n11 = this.parsePointer(b4.coverage), a2 = this.parseUShort(), i5 = this.parseUShort();\n        if (t === 1) return { posFormat: t, coverage: n11, valueFormat1: a2, valueFormat2: i5, pairSets: this.parseList(b4.pointer(b4.list(function() {\n          return { secondGlyph: this.parseUShort(), value1: this.parseValueRecord(a2), value2: this.parseValueRecord(i5) };\n        }))) };\n        if (t === 2) {\n          var o2 = this.parsePointer(b4.classDef), l4 = this.parsePointer(b4.classDef), u3 = this.parseUShort(), c2 = this.parseUShort();\n          return { posFormat: t, coverage: n11, valueFormat1: a2, valueFormat2: i5, classDef1: o2, classDef2: l4, class1Count: u3, class2Count: c2, classRecords: this.parseList(u3, b4.list(c2, function() {\n            return { value1: this.parseValueRecord(a2), value2: this.parseValueRecord(i5) };\n          })) };\n        }\n        G5.assert(false, "0x" + r.toString(16) + ": GPOS lookup type 2 format must be 1 or 2.");\n      }, be4[3] = function() {\n        return { error: "GPOS Lookup 3 not supported" };\n      }, be4[4] = function() {\n        return { error: "GPOS Lookup 4 not supported" };\n      }, be4[5] = function() {\n        return { error: "GPOS Lookup 5 not supported" };\n      }, be4[6] = function() {\n        return { error: "GPOS Lookup 6 not supported" };\n      }, be4[7] = function() {\n        return { error: "GPOS Lookup 7 not supported" };\n      }, be4[8] = function() {\n        return { error: "GPOS Lookup 8 not supported" };\n      }, be4[9] = function() {\n        return { error: "GPOS Lookup 9 not supported" };\n      };\n      function xo2(e, r) {\n        r = r || 0;\n        var t = new b4(e, r), n11 = t.parseVersion(1);\n        return G5.argument(n11 === 1 || n11 === 1.1, "Unsupported GPOS table version " + n11), n11 === 1 ? { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(be4) } : { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(be4), variations: t.parseFeatureVariationsList() };\n      }\n      var So2 = new Array(10);\n      function To2(e) {\n        return new A4.Table("GPOS", [{ name: "version", type: "ULONG", value: 65536 }, { name: "scripts", type: "TABLE", value: new A4.ScriptList(e.scripts) }, { name: "features", type: "TABLE", value: new A4.FeatureList(e.features) }, { name: "lookups", type: "TABLE", value: new A4.LookupList(e.lookups, So2) }]);\n      }\n      var ko2 = { parse: xo2, make: To2 };\n      function Fo2(e) {\n        var r = {};\n        e.skip("uShort");\n        var t = e.parseUShort();\n        G5.argument(t === 0, "Unsupported kern sub-table version."), e.skip("uShort", 2);\n        var n11 = e.parseUShort();\n        e.skip("uShort", 3);\n        for (var a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = e.parseUShort(), o2 = e.parseUShort(), l4 = e.parseShort();\n          r[i5 + "," + o2] = l4;\n        }\n        return r;\n      }\n      function Lo2(e) {\n        var r = {};\n        e.skip("uShort");\n        var t = e.parseULong();\n        t > 1 && console.warn("Only the first kern subtable is supported."), e.skip("uLong");\n        var n11 = e.parseUShort(), a2 = n11 & 255;\n        if (e.skip("uShort"), a2 === 0) {\n          var i5 = e.parseUShort();\n          e.skip("uShort", 3);\n          for (var o2 = 0; o2 < i5; o2 += 1) {\n            var l4 = e.parseUShort(), u3 = e.parseUShort(), c2 = e.parseShort();\n            r[l4 + "," + u3] = c2;\n          }\n        }\n        return r;\n      }\n      function Eo2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseUShort();\n        if (n11 === 0) return Fo2(t);\n        if (n11 === 1) return Lo2(t);\n        throw new Error("Unsupported kern table version (" + n11 + ").");\n      }\n      var Uo2 = { parse: Eo2 };\n      function Oo2(e, r, t, n11) {\n        for (var a2 = new w6.Parser(e, r), i5 = n11 ? a2.parseUShort : a2.parseULong, o2 = [], l4 = 0; l4 < t + 1; l4 += 1) {\n          var u3 = i5.call(a2);\n          n11 && (u3 *= 2), o2.push(u3);\n        }\n        return o2;\n      }\n      var Io2 = { parse: Oo2 };\n      function Co2(e, r) {\n        var t = tt2("fs");\n        t.readFile(e, function(n11, a2) {\n          if (n11) return r(n11.message);\n          r(null, gn2(a2));\n        });\n      }\n      function wo2(e, r) {\n        var t = new XMLHttpRequest();\n        t.open("get", e, true), t.responseType = "arraybuffer", t.onload = function() {\n          return t.response ? r(null, t.response) : r("Font could not be loaded: " + t.statusText);\n        }, t.onerror = function() {\n          r("Font could not be loaded");\n        }, t.send();\n      }\n      function Nn2(e, r) {\n        for (var t = [], n11 = 12, a2 = 0; a2 < r; a2 += 1) {\n          var i5 = w6.getTag(e, n11), o2 = w6.getULong(e, n11 + 4), l4 = w6.getULong(e, n11 + 8), u3 = w6.getULong(e, n11 + 12);\n          t.push({ tag: i5, checksum: o2, offset: l4, length: u3, compression: false }), n11 += 16;\n        }\n        return t;\n      }\n      function Ro2(e, r) {\n        for (var t = [], n11 = 44, a2 = 0; a2 < r; a2 += 1) {\n          var i5 = w6.getTag(e, n11), o2 = w6.getULong(e, n11 + 4), l4 = w6.getULong(e, n11 + 8), u3 = w6.getULong(e, n11 + 12), c2 = void 0;\n          l4 < u3 ? c2 = "WOFF" : c2 = false, t.push({ tag: i5, offset: o2, compression: c2, compressedLength: l4, length: u3 }), n11 += 20;\n        }\n        return t;\n      }\n      function Q3(e, r) {\n        if (r.compression === "WOFF") {\n          var t = new Uint8Array(e.buffer, r.offset + 2, r.compressedLength - 2), n11 = new Uint8Array(r.length);\n          if (pa(t, n11), n11.byteLength !== r.length) throw new Error("Decompression error: " + r.tag + " decompressed length doesn\'t match recorded length");\n          var a2 = new DataView(n11.buffer, 0);\n          return { data: a2, offset: 0 };\n        } else return { data: e, offset: r.offset };\n      }\n      function $r2(e) {\n        var r, t, n11 = new z4({ empty: true }), a2 = new DataView(e, 0), i5, o2 = [], l4 = w6.getTag(a2, 0);\n        if (l4 === "\\0\u0001\\0\\0" || l4 === "true" || l4 === "typ1") n11.outlinesFormat = "truetype", i5 = w6.getUShort(a2, 4), o2 = Nn2(a2, i5);\n        else if (l4 === "OTTO") n11.outlinesFormat = "cff", i5 = w6.getUShort(a2, 4), o2 = Nn2(a2, i5);\n        else if (l4 === "wOFF") {\n          var u3 = w6.getTag(a2, 4);\n          if (u3 === "\\0\u0001\\0\\0") n11.outlinesFormat = "truetype";\n          else if (u3 === "OTTO") n11.outlinesFormat = "cff";\n          else throw new Error("Unsupported OpenType flavor " + l4);\n          i5 = w6.getUShort(a2, 12), o2 = Ro2(a2, i5);\n        } else throw new Error("Unsupported OpenType signature " + l4);\n        for (var c2, d3, y5, g6, m4, T4, O4, F4, U6, P5, I4, H5 = 0; H5 < i5; H5 += 1) {\n          var R4 = o2[H5], B5 = void 0;\n          switch (R4.tag) {\n            case "cmap":\n              B5 = Q3(a2, R4), n11.tables.cmap = It3.parse(B5.data, B5.offset), n11.encoding = new wt2(n11.tables.cmap);\n              break;\n            case "cvt ":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.cvt = I4.parseShortList(R4.length / 2);\n              break;\n            case "fvar":\n              d3 = R4;\n              break;\n            case "fpgm":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.fpgm = I4.parseByteList(R4.length);\n              break;\n            case "head":\n              B5 = Q3(a2, R4), n11.tables.head = Yt3.parse(B5.data, B5.offset), n11.unitsPerEm = n11.tables.head.unitsPerEm, r = n11.tables.head.indexToLocFormat;\n              break;\n            case "hhea":\n              B5 = Q3(a2, R4), n11.tables.hhea = Zt3.parse(B5.data, B5.offset), n11.ascender = n11.tables.hhea.ascender, n11.descender = n11.tables.hhea.descender, n11.numberOfHMetrics = n11.tables.hhea.numberOfHMetrics;\n              break;\n            case "hmtx":\n              T4 = R4;\n              break;\n            case "ltag":\n              B5 = Q3(a2, R4), t = Jt2.parse(B5.data, B5.offset);\n              break;\n            case "maxp":\n              B5 = Q3(a2, R4), n11.tables.maxp = Kt2.parse(B5.data, B5.offset), n11.numGlyphs = n11.tables.maxp.numGlyphs;\n              break;\n            case "name":\n              U6 = R4;\n              break;\n            case "OS/2":\n              B5 = Q3(a2, R4), n11.tables.os2 = Xr2.parse(B5.data, B5.offset);\n              break;\n            case "post":\n              B5 = Q3(a2, R4), n11.tables.post = sn2.parse(B5.data, B5.offset), n11.glyphNames = new Nr(n11.tables.post);\n              break;\n            case "prep":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.prep = I4.parseByteList(R4.length);\n              break;\n            case "glyf":\n              y5 = R4;\n              break;\n            case "loca":\n              F4 = R4;\n              break;\n            case "CFF ":\n              c2 = R4;\n              break;\n            case "kern":\n              O4 = R4;\n              break;\n            case "GPOS":\n              g6 = R4;\n              break;\n            case "GSUB":\n              m4 = R4;\n              break;\n            case "meta":\n              P5 = R4;\n              break;\n          }\n        }\n        var ue2 = Q3(a2, U6);\n        if (n11.tables.name = an2.parse(ue2.data, ue2.offset, t), n11.names = n11.tables.name, y5 && F4) {\n          var q3 = r === 0, K4 = Q3(a2, F4), se3 = Io2.parse(K4.data, K4.offset, n11.numGlyphs, q3), le3 = Q3(a2, y5);\n          n11.glyphs = At3.parse(le3.data, le3.offset, se3, n11);\n        } else if (c2) {\n          var pe2 = Q3(a2, c2);\n          Xt3.parse(pe2.data, pe2.offset, n11);\n        } else throw new Error("Font doesn\'t contain TrueType or CFF outlines.");\n        var de3 = Q3(a2, T4);\n        if (Qt3.parse(de3.data, de3.offset, n11.numberOfHMetrics, n11.numGlyphs, n11.glyphs), Ca(n11), O4) {\n          var J5 = Q3(a2, O4);\n          n11.kerningPairs = Uo2.parse(J5.data, J5.offset);\n        } else n11.kerningPairs = {};\n        if (g6) {\n          var j5 = Q3(a2, g6);\n          n11.tables.gpos = ko2.parse(j5.data, j5.offset);\n        }\n        if (m4) {\n          var re3 = Q3(a2, m4);\n          n11.tables.gsub = on2.parse(re3.data, re3.offset);\n        }\n        if (d3) {\n          var te3 = Q3(a2, d3);\n          n11.tables.fvar = bo.parse(te3.data, te3.offset, n11.names);\n        }\n        if (P5) {\n          var ne3 = Q3(a2, P5);\n          n11.tables.meta = un2.parse(ne3.data, ne3.offset), n11.metas = n11.tables.meta;\n        }\n        return n11;\n      }\n      function Do2(e, r) {\n        var t = typeof window > "u", n11 = t ? Co2 : wo2;\n        n11(e, function(a2, i5) {\n          if (a2) return r(a2);\n          var o2;\n          try {\n            o2 = $r2(i5);\n          } catch (l4) {\n            return r(l4, null);\n          }\n          return r(null, o2);\n        });\n      }\n      function Ao2(e) {\n        var r = tt2("fs"), t = r.readFileSync(e);\n        return $r2(gn2(t));\n      }\n      s4.Font = z4, s4.Glyph = fe3, s4.Path = Z5, s4.BoundingBox = ke3, s4._parse = w6, s4.parse = $r2, s4.load = Do2, s4.loadSync = Ao2, Object.defineProperty(s4, "__esModule", { value: true });\n    }));\n  });\n  var Zn = Ur((Au, Yn2) => {\n    "use strict";\n    Yn2.exports = function(s4) {\n      s4.prototype[Symbol.iterator] = function* () {\n        for (let f5 = this.head; f5; f5 = f5.next) yield f5.value;\n      };\n    };\n  });\n  var Jn = Ur((Mu, Qn) => {\n    "use strict";\n    Qn.exports = _5;\n    _5.Node = He3;\n    _5.create = _5;\n    function _5(s4) {\n      var f5 = this;\n      if (f5 instanceof _5 || (f5 = new _5()), f5.tail = null, f5.head = null, f5.length = 0, s4 && typeof s4.forEach == "function") s4.forEach(function(v6) {\n        f5.push(v6);\n      });\n      else if (arguments.length > 0) for (var p3 = 0, h3 = arguments.length; p3 < h3; p3++) f5.push(arguments[p3]);\n      return f5;\n    }\n    _5.prototype.removeNode = function(s4) {\n      if (s4.list !== this) throw new Error("removing node which does not belong to this list");\n      var f5 = s4.next, p3 = s4.prev;\n      return f5 && (f5.prev = p3), p3 && (p3.next = f5), s4 === this.head && (this.head = f5), s4 === this.tail && (this.tail = p3), s4.list.length--, s4.next = null, s4.prev = null, s4.list = null, f5;\n    };\n    _5.prototype.unshiftNode = function(s4) {\n      if (s4 !== this.head) {\n        s4.list && s4.list.removeNode(s4);\n        var f5 = this.head;\n        s4.list = this, s4.next = f5, f5 && (f5.prev = s4), this.head = s4, this.tail || (this.tail = s4), this.length++;\n      }\n    };\n    _5.prototype.pushNode = function(s4) {\n      if (s4 !== this.tail) {\n        s4.list && s4.list.removeNode(s4);\n        var f5 = this.tail;\n        s4.list = this, s4.prev = f5, f5 && (f5.next = s4), this.tail = s4, this.head || (this.head = s4), this.length++;\n      }\n    };\n    _5.prototype.push = function() {\n      for (var s4 = 0, f5 = arguments.length; s4 < f5; s4++) Jo(this, arguments[s4]);\n      return this.length;\n    };\n    _5.prototype.unshift = function() {\n      for (var s4 = 0, f5 = arguments.length; s4 < f5; s4++) Ko2(this, arguments[s4]);\n      return this.length;\n    };\n    _5.prototype.pop = function() {\n      if (this.tail) {\n        var s4 = this.tail.value;\n        return this.tail = this.tail.prev, this.tail ? this.tail.next = null : this.head = null, this.length--, s4;\n      }\n    };\n    _5.prototype.shift = function() {\n      if (this.head) {\n        var s4 = this.head.value;\n        return this.head = this.head.next, this.head ? this.head.prev = null : this.tail = null, this.length--, s4;\n      }\n    };\n    _5.prototype.forEach = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = this.head, h3 = 0; p3 !== null; h3++) s4.call(f5, p3.value, h3, this), p3 = p3.next;\n    };\n    _5.prototype.forEachReverse = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = this.tail, h3 = this.length - 1; p3 !== null; h3--) s4.call(f5, p3.value, h3, this), p3 = p3.prev;\n    };\n    _5.prototype.get = function(s4) {\n      for (var f5 = 0, p3 = this.head; p3 !== null && f5 < s4; f5++) p3 = p3.next;\n      if (f5 === s4 && p3 !== null) return p3.value;\n    };\n    _5.prototype.getReverse = function(s4) {\n      for (var f5 = 0, p3 = this.tail; p3 !== null && f5 < s4; f5++) p3 = p3.prev;\n      if (f5 === s4 && p3 !== null) return p3.value;\n    };\n    _5.prototype.map = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = new _5(), h3 = this.head; h3 !== null; ) p3.push(s4.call(f5, h3.value, this)), h3 = h3.next;\n      return p3;\n    };\n    _5.prototype.mapReverse = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = new _5(), h3 = this.tail; h3 !== null; ) p3.push(s4.call(f5, h3.value, this)), h3 = h3.prev;\n      return p3;\n    };\n    _5.prototype.reduce = function(s4, f5) {\n      var p3, h3 = this.head;\n      if (arguments.length > 1) p3 = f5;\n      else if (this.head) h3 = this.head.next, p3 = this.head.value;\n      else throw new TypeError("Reduce of empty list with no initial value");\n      for (var v6 = 0; h3 !== null; v6++) p3 = s4(p3, h3.value, v6), h3 = h3.next;\n      return p3;\n    };\n    _5.prototype.reduceReverse = function(s4, f5) {\n      var p3, h3 = this.tail;\n      if (arguments.length > 1) p3 = f5;\n      else if (this.tail) h3 = this.tail.prev, p3 = this.tail.value;\n      else throw new TypeError("Reduce of empty list with no initial value");\n      for (var v6 = this.length - 1; h3 !== null; v6--) p3 = s4(p3, h3.value, v6), h3 = h3.prev;\n      return p3;\n    };\n    _5.prototype.toArray = function() {\n      for (var s4 = new Array(this.length), f5 = 0, p3 = this.head; p3 !== null; f5++) s4[f5] = p3.value, p3 = p3.next;\n      return s4;\n    };\n    _5.prototype.toArrayReverse = function() {\n      for (var s4 = new Array(this.length), f5 = 0, p3 = this.tail; p3 !== null; f5++) s4[f5] = p3.value, p3 = p3.prev;\n      return s4;\n    };\n    _5.prototype.slice = function(s4, f5) {\n      f5 = f5 || this.length, f5 < 0 && (f5 += this.length), s4 = s4 || 0, s4 < 0 && (s4 += this.length);\n      var p3 = new _5();\n      if (f5 < s4 || f5 < 0) return p3;\n      s4 < 0 && (s4 = 0), f5 > this.length && (f5 = this.length);\n      for (var h3 = 0, v6 = this.head; v6 !== null && h3 < s4; h3++) v6 = v6.next;\n      for (; v6 !== null && h3 < f5; h3++, v6 = v6.next) p3.push(v6.value);\n      return p3;\n    };\n    _5.prototype.sliceReverse = function(s4, f5) {\n      f5 = f5 || this.length, f5 < 0 && (f5 += this.length), s4 = s4 || 0, s4 < 0 && (s4 += this.length);\n      var p3 = new _5();\n      if (f5 < s4 || f5 < 0) return p3;\n      s4 < 0 && (s4 = 0), f5 > this.length && (f5 = this.length);\n      for (var h3 = this.length, v6 = this.tail; v6 !== null && h3 > f5; h3--) v6 = v6.prev;\n      for (; v6 !== null && h3 > s4; h3--, v6 = v6.prev) p3.push(v6.value);\n      return p3;\n    };\n    _5.prototype.splice = function(s4, f5, ...p3) {\n      s4 > this.length && (s4 = this.length - 1), s4 < 0 && (s4 = this.length + s4);\n      for (var h3 = 0, v6 = this.head; v6 !== null && h3 < s4; h3++) v6 = v6.next;\n      for (var x5 = [], h3 = 0; v6 && h3 < f5; h3++) x5.push(v6.value), v6 = this.removeNode(v6);\n      v6 === null && (v6 = this.tail), v6 !== this.head && v6 !== this.tail && (v6 = v6.prev);\n      for (var h3 = 0; h3 < p3.length; h3++) v6 = Qo(this, v6, p3[h3]);\n      return x5;\n    };\n    _5.prototype.reverse = function() {\n      for (var s4 = this.head, f5 = this.tail, p3 = s4; p3 !== null; p3 = p3.prev) {\n        var h3 = p3.prev;\n        p3.prev = p3.next, p3.next = h3;\n      }\n      return this.head = f5, this.tail = s4, this;\n    };\n    function Qo(s4, f5, p3) {\n      var h3 = f5 === s4.head ? new He3(p3, null, f5, s4) : new He3(p3, f5, f5.next, s4);\n      return h3.next === null && (s4.tail = h3), h3.prev === null && (s4.head = h3), s4.length++, h3;\n    }\n    function Jo(s4, f5) {\n      s4.tail = new He3(f5, s4.tail, null, s4), s4.head || (s4.head = s4.tail), s4.length++;\n    }\n    function Ko2(s4, f5) {\n      s4.head = new He3(f5, null, s4.head, s4), s4.tail || (s4.tail = s4.head), s4.length++;\n    }\n    function He3(s4, f5, p3, h3) {\n      if (!(this instanceof He3)) return new He3(s4, f5, p3, h3);\n      this.list = h3, this.value = s4, f5 ? (f5.next = this, this.prev = f5) : this.prev = null, p3 ? (p3.prev = this, this.next = p3) : this.next = null;\n    }\n    try {\n      Zn()(_5);\n    } catch {\n    }\n  });\n  var ra = Ur((Bu, ea) => {\n    "use strict";\n    var jo = Jn(), _e3 = /* @__PURE__ */ Symbol("max"), Ue4 = /* @__PURE__ */ Symbol("length"), Je4 = /* @__PURE__ */ Symbol("lengthCalculator"), ur2 = /* @__PURE__ */ Symbol("allowStale"), ze4 = /* @__PURE__ */ Symbol("maxAge"), Ee2 = /* @__PURE__ */ Symbol("dispose"), Kn2 = /* @__PURE__ */ Symbol("noDisposeOnSet"), $4 = /* @__PURE__ */ Symbol("lruList"), xe2 = /* @__PURE__ */ Symbol("cache"), $n2 = /* @__PURE__ */ Symbol("updateAgeOnGet"), ht3 = () => 1, vt3 = class {\n      constructor(f5) {\n        if (typeof f5 == "number" && (f5 = { max: f5 }), f5 || (f5 = {}), f5.max && (typeof f5.max != "number" || f5.max < 0)) throw new TypeError("max must be a non-negative number");\n        let p3 = this[_e3] = f5.max || 1 / 0, h3 = f5.length || ht3;\n        if (this[Je4] = typeof h3 != "function" ? ht3 : h3, this[ur2] = f5.stale || false, f5.maxAge && typeof f5.maxAge != "number") throw new TypeError("maxAge must be a number");\n        this[ze4] = f5.maxAge || 0, this[Ee2] = f5.dispose, this[Kn2] = f5.noDisposeOnSet || false, this[$n2] = f5.updateAgeOnGet || false, this.reset();\n      }\n      set max(f5) {\n        if (typeof f5 != "number" || f5 < 0) throw new TypeError("max must be a non-negative number");\n        this[_e3] = f5 || 1 / 0, or3(this);\n      }\n      get max() {\n        return this[_e3];\n      }\n      set allowStale(f5) {\n        this[ur2] = !!f5;\n      }\n      get allowStale() {\n        return this[ur2];\n      }\n      set maxAge(f5) {\n        if (typeof f5 != "number") throw new TypeError("maxAge must be a non-negative number");\n        this[ze4] = f5, or3(this);\n      }\n      get maxAge() {\n        return this[ze4];\n      }\n      set lengthCalculator(f5) {\n        typeof f5 != "function" && (f5 = ht3), f5 !== this[Je4] && (this[Je4] = f5, this[Ue4] = 0, this[$4].forEach((p3) => {\n          p3.length = this[Je4](p3.value, p3.key), this[Ue4] += p3.length;\n        })), or3(this);\n      }\n      get lengthCalculator() {\n        return this[Je4];\n      }\n      get length() {\n        return this[Ue4];\n      }\n      get itemCount() {\n        return this[$4].length;\n      }\n      rforEach(f5, p3) {\n        p3 = p3 || this;\n        for (let h3 = this[$4].tail; h3 !== null; ) {\n          let v6 = h3.prev;\n          jn2(this, f5, h3, p3), h3 = v6;\n        }\n      }\n      forEach(f5, p3) {\n        p3 = p3 || this;\n        for (let h3 = this[$4].head; h3 !== null; ) {\n          let v6 = h3.next;\n          jn2(this, f5, h3, p3), h3 = v6;\n        }\n      }\n      keys() {\n        return this[$4].toArray().map((f5) => f5.key);\n      }\n      values() {\n        return this[$4].toArray().map((f5) => f5.value);\n      }\n      reset() {\n        this[Ee2] && this[$4] && this[$4].length && this[$4].forEach((f5) => this[Ee2](f5.key, f5.value)), this[xe2] = /* @__PURE__ */ new Map(), this[$4] = new jo(), this[Ue4] = 0;\n      }\n      dump() {\n        return this[$4].map((f5) => Rr2(this, f5) ? false : { k: f5.key, v: f5.value, e: f5.now + (f5.maxAge || 0) }).toArray().filter((f5) => f5);\n      }\n      dumpLru() {\n        return this[$4];\n      }\n      set(f5, p3, h3) {\n        if (h3 = h3 || this[ze4], h3 && typeof h3 != "number") throw new TypeError("maxAge must be a number");\n        let v6 = h3 ? Date.now() : 0, x5 = this[Je4](p3, f5);\n        if (this[xe2].has(f5)) {\n          if (x5 > this[_e3]) return Ke4(this, this[xe2].get(f5)), false;\n          let k5 = this[xe2].get(f5).value;\n          return this[Ee2] && (this[Kn2] || this[Ee2](f5, k5.value)), k5.now = v6, k5.maxAge = h3, k5.value = p3, this[Ue4] += x5 - k5.length, k5.length = x5, this.get(f5), or3(this), true;\n        }\n        let S4 = new dt3(f5, p3, x5, v6, h3);\n        return S4.length > this[_e3] ? (this[Ee2] && this[Ee2](f5, p3), false) : (this[Ue4] += S4.length, this[$4].unshift(S4), this[xe2].set(f5, this[$4].head), or3(this), true);\n      }\n      has(f5) {\n        if (!this[xe2].has(f5)) return false;\n        let p3 = this[xe2].get(f5).value;\n        return !Rr2(this, p3);\n      }\n      get(f5) {\n        return ct4(this, f5, true);\n      }\n      peek(f5) {\n        return ct4(this, f5, false);\n      }\n      pop() {\n        let f5 = this[$4].tail;\n        return f5 ? (Ke4(this, f5), f5.value) : null;\n      }\n      del(f5) {\n        Ke4(this, this[xe2].get(f5));\n      }\n      load(f5) {\n        this.reset();\n        let p3 = Date.now();\n        for (let h3 = f5.length - 1; h3 >= 0; h3--) {\n          let v6 = f5[h3], x5 = v6.e || 0;\n          if (x5 === 0) this.set(v6.k, v6.v);\n          else {\n            let S4 = x5 - p3;\n            S4 > 0 && this.set(v6.k, v6.v, S4);\n          }\n        }\n      }\n      prune() {\n        this[xe2].forEach((f5, p3) => ct4(this, p3, false));\n      }\n    }, ct4 = (s4, f5, p3) => {\n      let h3 = s4[xe2].get(f5);\n      if (h3) {\n        let v6 = h3.value;\n        if (Rr2(s4, v6)) {\n          if (Ke4(s4, h3), !s4[ur2]) return;\n        } else p3 && (s4[$n2] && (h3.value.now = Date.now()), s4[$4].unshiftNode(h3));\n        return v6.value;\n      }\n    }, Rr2 = (s4, f5) => {\n      if (!f5 || !f5.maxAge && !s4[ze4]) return false;\n      let p3 = Date.now() - f5.now;\n      return f5.maxAge ? p3 > f5.maxAge : s4[ze4] && p3 > s4[ze4];\n    }, or3 = (s4) => {\n      if (s4[Ue4] > s4[_e3]) for (let f5 = s4[$4].tail; s4[Ue4] > s4[_e3] && f5 !== null; ) {\n        let p3 = f5.prev;\n        Ke4(s4, f5), f5 = p3;\n      }\n    }, Ke4 = (s4, f5) => {\n      if (f5) {\n        let p3 = f5.value;\n        s4[Ee2] && s4[Ee2](p3.key, p3.value), s4[Ue4] -= p3.length, s4[xe2].delete(p3.key), s4[$4].removeNode(f5);\n      }\n    }, dt3 = class {\n      constructor(f5, p3, h3, v6, x5) {\n        this.key = f5, this.value = p3, this.length = h3, this.now = v6, this.maxAge = x5 || 0;\n      }\n    }, jn2 = (s4, f5, p3, h3) => {\n      let v6 = p3.value;\n      Rr2(s4, v6) && (Ke4(s4, p3), s4[ur2] || (v6 = void 0)), v6 && f5.call(h3, v6.value, v6.key, s4);\n    };\n    ea.exports = vt3;\n  });\n  var ta = Wo(Wn());\n  function ar(s4) {\n    let f5 = { individual: {}, range: [] }, p3 = /* @__PURE__ */ new WeakMap();\n    for (let h3 of s4) at3(f5, h3, p3);\n    return f5;\n  }\n  function at3(s4, f5, p3) {\n    for (let [h3, v6] of Object.entries(f5.individual)) if (s4.individual[h3]) Ze3(s4.individual[h3], v6, p3);\n    else {\n      let x5 = false;\n      for (let [S4, { range: L6, entry: k5 }] of s4.range.entries()) {\n        let D7 = nt3(Number(h3), L6);\n        if (D7.both !== null) {\n          x5 = true, s4.individual[h3] = v6, Ze3(s4.individual[h3], ie3(k5), p3), s4.range.splice(S4, 1);\n          for (let V5 of D7.second) Array.isArray(V5) ? s4.range.push({ range: V5, entry: ie3(k5) }) : s4.individual[V5] = ie3(k5);\n        }\n      }\n      x5 || (s4.individual[h3] = v6);\n    }\n    for (let { range: h3, entry: v6 } of f5.range) {\n      let x5 = [h3];\n      for (let S4 = 0; S4 < s4.range.length; S4++) {\n        let { range: L6, entry: k5 } = s4.range[S4];\n        for (let [D7, V5] of x5.entries()) if (Array.isArray(V5)) {\n          let N3 = Vo(V5, L6);\n          if (N3.both === null) continue;\n          s4.range.splice(S4, 1), S4--;\n          let W6 = ie3(k5);\n          Array.isArray(N3.both) ? s4.range.push({ range: N3.both, entry: W6 }) : s4.individual[N3.both] = W6, Ze3(W6, ie3(v6), p3);\n          for (let X3 of N3.second) Array.isArray(X3) ? s4.range.push({ range: X3, entry: ie3(k5) }) : s4.individual[X3] = ie3(k5);\n          x5 = N3.first;\n        } else {\n          let N3 = nt3(V5, L6);\n          if (N3.both === null) continue;\n          s4.individual[V5] = ie3(v6), Ze3(s4.individual[V5], ie3(k5), p3), s4.range.splice(S4, 1), S4--;\n          for (let W6 of N3.second) Array.isArray(W6) ? s4.range.push({ range: W6, entry: ie3(k5) }) : s4.individual[W6] = ie3(k5);\n          x5.splice(D7, 1, ...N3.first);\n          break;\n        }\n      }\n      for (let S4 of Object.keys(s4.individual)) for (let [L6, k5] of x5.entries()) if (Array.isArray(k5)) {\n        let D7 = nt3(Number(S4), k5);\n        if (D7.both === null) continue;\n        Ze3(s4.individual[S4], ie3(v6), p3), x5.splice(L6, 1, ...D7.second);\n        break;\n      } else if (Number(S4) === k5) {\n        Ze3(s4.individual[S4], ie3(v6), p3);\n        break;\n      }\n      for (let S4 of x5) Array.isArray(S4) ? s4.range.push({ range: S4, entry: ie3(v6) }) : s4.individual[S4] = ie3(v6);\n    }\n  }\n  function Ze3(s4, f5, p3) {\n    let h3 = p3.get(s4);\n    h3?.has(f5) || (h3 || (h3 = /* @__PURE__ */ new Set(), p3.set(s4, h3)), h3.add(f5), f5.lookup && (!s4.lookup || s4.lookup.index > f5.lookup.index || s4.lookup.index === f5.lookup.index && s4.lookup.subIndex > f5.lookup.subIndex) && (s4.lookup = f5.lookup), f5.forward && (s4.forward ? at3(s4.forward, f5.forward, p3) : s4.forward = f5.forward), f5.reverse && (s4.reverse ? at3(s4.reverse, f5.reverse, p3) : s4.reverse = f5.reverse));\n  }\n  function Vo(s4, f5) {\n    let p3 = { first: [], second: [], both: null };\n    if (s4[0] < f5[1] && f5[0] < s4[1]) {\n      let h3 = Math.max(s4[0], f5[0]), v6 = Math.min(s4[1], f5[1]);\n      p3.both = Ge3(h3, v6);\n    }\n    if (s4[0] < f5[0]) {\n      let h3 = s4[0], v6 = Math.min(f5[0], s4[1]);\n      p3.first.push(Ge3(h3, v6));\n    } else if (f5[0] < s4[0]) {\n      let h3 = f5[0], v6 = Math.min(f5[1], s4[0]);\n      p3.second.push(Ge3(h3, v6));\n    }\n    if (s4[1] > f5[1]) {\n      let h3 = Math.max(s4[0], f5[1]), v6 = s4[1];\n      p3.first.push(Ge3(h3, v6));\n    } else if (f5[1] > s4[1]) {\n      let h3 = Math.max(s4[1], f5[0]), v6 = f5[1];\n      p3.second.push(Ge3(h3, v6));\n    }\n    return p3;\n  }\n  function nt3(s4, f5) {\n    if (s4 < f5[0] || s4 > f5[1]) return { first: [s4], second: [f5], both: null };\n    let p3 = { first: [], second: [], both: s4 };\n    return f5[0] < s4 && p3.second.push(Ge3(f5[0], s4)), f5[1] > s4 && p3.second.push(Ge3(s4 + 1, f5[1])), p3;\n  }\n  function Ge3(s4, f5) {\n    return f5 - s4 === 1 ? s4 : [s4, f5];\n  }\n  function ie3(s4, f5 = /* @__PURE__ */ new Map()) {\n    if (f5.has(s4)) return f5.get(s4);\n    let p3 = {};\n    return f5.set(s4, p3), s4.forward && (p3.forward = Vn(s4.forward, f5)), s4.reverse && (p3.reverse = Vn(s4.reverse, f5)), s4.lookup && (p3.lookup = { contextRange: s4.lookup.contextRange.slice(), index: s4.lookup.index, length: s4.lookup.length, subIndex: s4.lookup.subIndex, substitutions: s4.lookup.substitutions.slice() }), p3;\n  }\n  function Vn(s4, f5 = /* @__PURE__ */ new Map()) {\n    let p3 = {};\n    for (let [h3, v6] of Object.entries(s4.individual)) p3[h3] = ie3(v6, f5);\n    return { individual: p3, range: s4.range.map(({ range: h3, entry: v6 }) => ({ range: h3.slice(), entry: ie3(v6, f5) })) };\n  }\n  function ir(s4, f5, p3, h3) {\n    let v6 = f5[h3], x5 = s4[v6];\n    if (!x5) return;\n    let S4 = x5.lookup;\n    if (x5.reverse) {\n      let k5 = qo(x5.reverse, f5, p3);\n      (!S4 && k5 || k5 && S4 && (S4.index > k5.index || S4.index === k5.index && S4.subIndex > k5.subIndex)) && (S4 = k5);\n    }\n    if (++h3 >= f5.length || !x5.forward) return S4;\n    let L6 = ir(x5.forward, f5, p3, h3);\n    return (!S4 && L6 || L6 && S4 && (S4.index > L6.index || S4.index === L6.index && S4.subIndex > L6.subIndex)) && (S4 = L6), S4;\n  }\n  function qo(s4, f5, p3) {\n    let h3 = s4[f5[--p3]], v6 = h3 && h3.lookup;\n    for (; h3 && ((!v6 && h3.lookup || h3.lookup && v6 && v6.index > h3.lookup.index) && (v6 = h3.lookup), !(--p3 < 0 || !h3.reverse)); ) h3 = h3.reverse[f5[p3]];\n    return v6;\n  }\n  function Ir(s4, f5, p3) {\n    let h3 = false;\n    for (let v6 = 0; v6 < s4.length; v6++) {\n      let x5 = s4[v6];\n      if (h3) {\n        if (p3 <= x5[0]) return s4[v6 - 1][1] = p3, s4;\n        if (p3 <= x5[1]) return s4[v6 - 1][1] = Math.max(p3, x5[1]), s4.splice(v6, 1), h3 = false, s4;\n        s4.splice(v6, 1), v6--;\n      } else {\n        if (p3 <= x5[0]) return s4.splice(v6, 0, [f5, p3]), s4;\n        if (p3 <= x5[1]) return x5[0] = Math.min(f5, x5[0]), s4;\n        if (f5 < x5[1]) x5[0] = Math.min(f5, x5[0]), h3 = true;\n        else continue;\n      }\n    }\n    return h3 ? s4[s4.length - 1][1] = p3 : s4.push([f5, p3]), s4;\n  }\n  function it3(s4, f5) {\n    switch (s4.format) {\n      case 1:\n        let p3 = s4.glyphs.indexOf(f5);\n        return p3 !== -1 ? p3 : null;\n      case 2:\n        let h3 = s4.ranges.find((v6) => v6.start <= f5 && v6.end >= f5);\n        return h3 ? h3.index : null;\n    }\n  }\n  function ce3(s4) {\n    switch (s4.format) {\n      case 1:\n        return s4.glyphs.map((p3, h3) => ({ glyphId: p3, index: h3 }));\n      case 2:\n        let f5 = [];\n        for (let [p3, h3] of s4.ranges.entries()) h3.end === h3.start ? f5.push({ glyphId: h3.start, index: p3 }) : f5.push({ glyphId: [h3.start, h3.end + 1], index: p3 });\n        return f5;\n    }\n  }\n  function qn(s4, f5) {\n    let p3 = f5[0], h3 = Cr(s4, p3), v6 = f5[0] + 1, x5 = /* @__PURE__ */ new Map();\n    for (; v6 < f5[1]; ) Cr(s4, v6) !== h3 && (v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3)), v6++;\n    return v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3), x5;\n  }\n  function Cr(s4, f5) {\n    let p3 = it3(s4.coverage, f5);\n    if (p3 === null) return null;\n    switch (s4.substFormat) {\n      case 1:\n        return (f5 + s4.deltaGlyphId) % 2 ** 16;\n      case 2:\n        return s4.substitute[p3] ?? null;\n    }\n  }\n  function Qe2(s4, f5, p3, h3, v6) {\n    let x5 = [];\n    for (let S4 of p3) {\n      S4.entry.forward = { individual: {}, range: [] };\n      for (let L6 of s4) x5.push(...Ne2(S4.entry.forward, h3, v6, f5, L6).map(({ entry: k5, substitution: D7 }) => ({ entry: k5, substitutions: [...S4.substitutions, D7] })));\n    }\n    return x5;\n  }\n  function Re3(s4, f5) {\n    let p3 = [], h3 = /* @__PURE__ */ new Set();\n    for (let v6 of f5) {\n      if (h3.has(v6.entry)) continue;\n      h3.add(v6.entry), v6.entry.forward ??= { individual: {}, range: [] };\n      let x5 = {};\n      for (let S4 of s4) Array.isArray(S4) ? v6.entry.forward.range.push({ entry: x5, range: S4 }) : v6.entry.forward.individual[S4] = x5;\n      p3.push({ entry: x5, substitutions: v6.substitutions });\n    }\n    return p3;\n  }\n  function De3(s4, f5) {\n    let p3 = [], h3 = /* @__PURE__ */ new Set();\n    for (let v6 of f5) {\n      if (h3.has(v6.entry)) continue;\n      h3.add(v6.entry), v6.entry.reverse ??= { individual: {}, range: [] };\n      let x5 = {};\n      for (let S4 of s4) Array.isArray(S4) ? v6.entry.reverse.range.push({ entry: x5, range: S4 }) : v6.entry.reverse.individual[S4] = x5;\n      p3.push({ entry: x5, substitutions: v6.substitutions });\n    }\n    return p3;\n  }\n  function Ne2(s4, f5, p3, h3, v6) {\n    let x5 = [];\n    if (!Array.isArray(v6)) s4.individual[v6] = {}, x5.push({ entry: s4.individual[v6], substitution: Yo(f5, p3, h3, v6) });\n    else {\n      let S4 = Xo(f5, p3, h3, v6);\n      for (let [L6, k5] of S4) {\n        let D7 = {};\n        Array.isArray(L6) ? s4.range.push({ range: L6, entry: D7 }) : s4.individual[L6] = {}, x5.push({ entry: D7, substitution: k5 });\n      }\n    }\n    return x5;\n  }\n  function Xo(s4, f5, p3, h3) {\n    for (let v6 of s4.filter((x5) => x5.sequenceIndex === p3)) for (let x5 of f5[v6.lookupListIndex].subtables) {\n      let S4 = qn(x5, h3);\n      if (!Array.from(S4.values()).every((L6) => L6 !== null)) return S4;\n    }\n    return /* @__PURE__ */ new Map([[h3, null]]);\n  }\n  function Yo(s4, f5, p3, h3) {\n    for (let v6 of s4.filter((x5) => x5.sequenceIndex === p3)) for (let x5 of f5[v6.lookupListIndex].subtables) {\n      let S4 = Cr(x5, h3);\n      if (S4 !== null) return S4;\n    }\n    return null;\n  }\n  function st3(s4, f5, p3) {\n    let h3 = { individual: {}, range: [] }, v6 = ce3(s4.coverage);\n    for (let { glyphId: x5, index: S4 } of v6) {\n      let L6 = s4.chainRuleSets[S4];\n      if (L6) for (let [k5, D7] of L6.entries()) {\n        let V5 = Ne2(h3, D7.lookupRecords, f5, 0, x5).map(({ entry: N3, substitution: W6 }) => ({ entry: N3, substitutions: [W6] }));\n        for (let [N3, W6] of D7.input.entries()) V5 = Qe2([W6], N3 + 1, V5, D7.lookupRecords, f5);\n        for (let N3 of D7.lookahead) V5 = Re3([N3], V5);\n        for (let N3 of D7.backtrack) V5 = De3([N3], V5);\n        for (let { entry: N3, substitutions: W6 } of V5) N3.lookup = { substitutions: W6, length: D7.input.length + 1, index: p3, subIndex: k5, contextRange: [-1 * D7.backtrack.length, 1 + D7.input.length + D7.lookahead.length] };\n      }\n    }\n    return h3;\n  }\n  function ut2(s4, f5) {\n    switch (s4.format) {\n      case 2:\n        return Array.isArray(f5) ? Zo(s4, f5) : /* @__PURE__ */ new Map([[f5, ot3(s4, f5)]]);\n      default:\n        return /* @__PURE__ */ new Map([[f5, null]]);\n    }\n  }\n  function Zo(s4, f5) {\n    let p3 = f5[0], h3 = ot3(s4, p3), v6 = f5[0] + 1, x5 = /* @__PURE__ */ new Map();\n    for (; v6 < f5[1]; ) ot3(s4, v6) !== h3 && (v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3)), v6++;\n    return v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3), x5;\n  }\n  function ot3(s4, f5) {\n    for (let p3 of s4.ranges) if (p3.start <= f5 && p3.end >= f5) return p3.classId;\n    return null;\n  }\n  function wr(s4, f5) {\n    switch (s4.format) {\n      case 2:\n        let p3 = [];\n        for (let h3 of s4.ranges) h3.classId === f5 && (h3.end === h3.start ? p3.push(h3.start) : p3.push([h3.start, h3.end + 1]));\n        return p3;\n      default:\n        return [];\n    }\n  }\n  function lt2(s4, f5, p3) {\n    let h3 = [], v6 = ce3(s4.coverage);\n    for (let { glyphId: x5 } of v6) {\n      let S4 = ut2(s4.inputClassDef, x5);\n      for (let [L6, k5] of S4.entries()) {\n        if (k5 === null) continue;\n        let D7 = s4.chainClassSet[k5];\n        if (D7) for (let [V5, N3] of D7.entries()) {\n          let W6 = { individual: {}, range: [] }, X3 = Ne2(W6, N3.lookupRecords, f5, 0, L6).map(({ entry: ve3, substitution: Ae3 }) => ({ entry: ve3, substitutions: [Ae3] }));\n          for (let [ve3, Ae3] of N3.input.entries()) X3 = Qe2(wr(s4.inputClassDef, Ae3), ve3 + 1, X3, N3.lookupRecords, f5);\n          for (let ve3 of N3.lookahead) X3 = Re3(wr(s4.lookaheadClassDef, ve3), X3);\n          for (let ve3 of N3.backtrack) X3 = De3(wr(s4.backtrackClassDef, ve3), X3);\n          for (let { entry: ve3, substitutions: Ae3 } of X3) ve3.lookup = { substitutions: Ae3, index: p3, subIndex: V5, length: N3.input.length + 1, contextRange: [-1 * N3.backtrack.length, 1 + N3.input.length + N3.lookahead.length] };\n          h3.push(W6);\n        }\n      }\n    }\n    return ar(h3);\n  }\n  function ft2(s4, f5, p3) {\n    let h3 = { individual: {}, range: [] }, v6 = ce3(s4.inputCoverage[0]);\n    for (let { glyphId: x5 } of v6) {\n      let S4 = Ne2(h3, s4.lookupRecords, f5, 0, x5).map(({ entry: L6, substitution: k5 }) => ({ entry: L6, substitutions: [k5] }));\n      for (let [L6, k5] of s4.inputCoverage.slice(1).entries()) S4 = Qe2(ce3(k5).map((D7) => D7.glyphId), L6 + 1, S4, s4.lookupRecords, f5);\n      for (let L6 of s4.lookaheadCoverage) S4 = Re3(ce3(L6).map((k5) => k5.glyphId), S4);\n      for (let L6 of s4.backtrackCoverage) S4 = De3(ce3(L6).map((k5) => k5.glyphId), S4);\n      for (let { entry: L6, substitutions: k5 } of S4) L6.lookup = { substitutions: k5, index: p3, subIndex: 0, length: s4.inputCoverage.length, contextRange: [-1 * s4.backtrackCoverage.length, s4.inputCoverage.length + s4.lookaheadCoverage.length] };\n    }\n    return h3;\n  }\n  function pt2(s4, f5) {\n    let p3 = { individual: {}, range: [] }, h3 = ce3(s4.coverage);\n    for (let { glyphId: v6, index: x5 } of h3) {\n      let S4 = {};\n      Array.isArray(v6) ? p3.range.push({ entry: S4, range: v6 }) : p3.individual[v6] = S4;\n      let L6 = [{ entry: S4, substitutions: [s4.substitutes[x5]] }];\n      for (let k5 of s4.lookaheadCoverage) L6 = Re3(ce3(k5).map((D7) => D7.glyphId), L6);\n      for (let k5 of s4.backtrackCoverage) L6 = De3(ce3(k5).map((D7) => D7.glyphId), L6);\n      for (let { entry: k5, substitutions: D7 } of L6) k5.lookup = { substitutions: D7, index: f5, subIndex: 0, length: 1, contextRange: [-1 * s4.backtrackCoverage.length, 1 + s4.lookaheadCoverage.length] };\n    }\n    return p3;\n  }\n  function sr(s4, f5 = /* @__PURE__ */ new Map()) {\n    let p3 = {};\n    for (let [h3, v6] of Object.entries(s4.individual)) p3[h3] = Xn(v6, f5);\n    for (let { range: h3, entry: v6 } of s4.range) {\n      let x5 = Xn(v6, f5);\n      for (let S4 = h3[0]; S4 < h3[1]; S4++) p3[S4] = x5;\n    }\n    return p3;\n  }\n  function Xn(s4, f5) {\n    if (f5.has(s4)) return f5.get(s4);\n    let p3 = {};\n    return f5.set(s4, p3), s4.forward && (p3.forward = sr(s4.forward, f5)), s4.reverse && (p3.reverse = sr(s4.reverse, f5)), s4.lookup && (p3.lookup = s4.lookup), p3;\n  }\n  var $o = ra();\n  var gt = class {\n    constructor(f5, p3) {\n      this._lookupTrees = [];\n      this._glyphLookups = {};\n      this._font = f5, p3.cacheSize > 0 && (this._cache = new $o({ max: p3.cacheSize, length: ((L6, k5) => k5.length) }));\n      let v6 = (this._font.tables.gsub && this._font.tables.gsub.features.filter((L6) => L6.tag === "calt") || []).reduce((L6, k5) => [...L6, ...k5.feature.lookupListIndexes], []), x5 = this._font.tables.gsub && this._font.tables.gsub.lookups || [], S4 = x5.filter((L6, k5) => v6.some((D7) => D7 === k5));\n      for (let [L6, k5] of S4.entries()) {\n        let D7 = [];\n        switch (k5.lookupType) {\n          case 6:\n            for (let [N3, W6] of k5.subtables.entries()) switch (W6.substFormat) {\n              case 1:\n                D7.push(st3(W6, x5, N3));\n                break;\n              case 2:\n                D7.push(lt2(W6, x5, N3));\n                break;\n              case 3:\n                D7.push(ft2(W6, x5, N3));\n                break;\n            }\n            break;\n          case 8:\n            for (let [N3, W6] of k5.subtables.entries()) D7.push(pt2(W6, N3));\n            break;\n        }\n        let V5 = sr(ar(D7));\n        this._lookupTrees.push({ tree: V5, processForward: k5.lookupType !== 8 });\n        for (let N3 of Object.keys(V5)) this._glyphLookups[N3] || (this._glyphLookups[N3] = []), this._glyphLookups[N3].push(L6);\n      }\n    }\n    findLigatures(f5) {\n      let p3 = this._cache && this._cache.get(f5);\n      if (p3 && !Array.isArray(p3)) return p3;\n      let h3 = [];\n      for (let S4 of f5) h3.push(this._font.charToGlyphIndex(S4));\n      if (this._lookupTrees.length === 0) return { inputGlyphs: h3, outputGlyphs: h3, contextRanges: [] };\n      let v6 = this._findInternal(h3.slice()), x5 = { inputGlyphs: h3, outputGlyphs: v6.sequence, contextRanges: v6.ranges };\n      return this._cache && this._cache.set(f5, x5), x5;\n    }\n    findLigatureRanges(f5) {\n      if (this._lookupTrees.length === 0) return [];\n      let p3 = this._cache && this._cache.get(f5);\n      if (p3) return Array.isArray(p3) ? p3 : p3.contextRanges;\n      let h3 = [];\n      for (let x5 of f5) h3.push(this._font.charToGlyphIndex(x5));\n      let v6 = this._findInternal(h3);\n      return this._cache && this._cache.set(f5, v6.ranges), v6.ranges;\n    }\n    _findInternal(f5) {\n      let p3 = [], h3 = this._getNextLookup(f5, 0);\n      for (; h3.index !== null; ) {\n        let v6 = this._lookupTrees[h3.index];\n        if (v6.processForward) {\n          let x5 = h3.last;\n          for (let S4 = h3.first; S4 < x5; S4++) {\n            let L6 = ir(v6.tree, f5, S4, S4);\n            if (L6) {\n              for (let k5 = 0; k5 < L6.substitutions.length; k5++) {\n                let D7 = L6.substitutions[k5];\n                D7 !== null && (f5[S4 + k5] = D7);\n              }\n              Ir(p3, L6.contextRange[0] + S4, L6.contextRange[1] + S4), S4 + L6.length >= x5 && (x5 = S4 + L6.length + 1), S4 += L6.length - 1;\n            }\n          }\n        } else for (let x5 = h3.last - 1; x5 >= h3.first; x5--) {\n          let S4 = ir(v6.tree, f5, x5, x5);\n          if (S4) {\n            for (let L6 = 0; L6 < S4.substitutions.length; L6++) {\n              let k5 = S4.substitutions[L6];\n              k5 !== null && (f5[x5 + L6] = k5);\n            }\n            Ir(p3, S4.contextRange[0] + x5, S4.contextRange[1] + x5), x5 -= S4.length - 1;\n          }\n        }\n        h3 = this._getNextLookup(f5, h3.index + 1);\n      }\n      return { sequence: f5, ranges: p3 };\n    }\n    _getNextLookup(f5, p3) {\n      let h3 = { index: null, first: 1 / 0, last: -1 };\n      for (let v6 = 0; v6 < f5.length; v6++) {\n        let x5 = this._glyphLookups[f5[v6]];\n        if (x5) for (let S4 = 0; S4 < x5.length; S4++) {\n          let L6 = x5[S4];\n          if (L6 >= p3) {\n            (h3.index === null || L6 <= h3.index) && (h3.index = L6, h3.first > v6 && (h3.first = v6), h3.last = v6 + 1);\n            break;\n          }\n        }\n      }\n      return h3;\n    }\n  };\n  function na(s4, f5) {\n    let p3 = ta.parse(s4);\n    return new gt(p3, { cacheSize: 0, ...f5 });\n  }\n  function yt2(s4) {\n    if (typeof s4 != "string") throw new Error("Font family must be a string");\n    let f5 = { input: s4, offset: 0 }, p3 = [], h3 = "";\n    for (; f5.offset < f5.input.length; ) {\n      let v6 = f5.input[f5.offset++];\n      switch (v6) {\n        case "\'":\n        case \'"\':\n          h3 += eu(f5, v6);\n          break;\n        case ",":\n          p3.push(h3), h3 = "";\n          break;\n        default:\n          /\\s/.test(v6) || (f5.offset--, h3 += ru(f5), p3.push(h3), h3 = "");\n      }\n    }\n    return p3;\n  }\n  function eu(s4, f5) {\n    let p3 = "", h3 = false;\n    for (; s4.offset < s4.input.length; ) {\n      let v6 = s4.input[s4.offset++];\n      if (h3) /[\\dA-Fa-f]/.test(v6) ? (s4.offset--, p3 += aa(s4)) : v6 !== `\n` && (p3 += v6), h3 = false;\n      else switch (v6) {\n        case f5:\n          return p3;\n        case "\\\\":\n          h3 = true;\n          break;\n        default:\n          p3 += v6;\n      }\n    }\n    throw new Error("Unterminated string");\n  }\n  function ru(s4) {\n    let f5 = "", p3 = false;\n    for (; s4.offset < s4.input.length; ) {\n      let h3 = s4.input[s4.offset++];\n      if (p3) /[\\dA-Fa-f]/.test(h3) ? (s4.offset--, f5 += aa(s4)) : f5 += h3, p3 = false;\n      else switch (h3) {\n        case "\\\\":\n          p3 = true;\n          break;\n        case ",":\n          return f5;\n        default:\n          /\\s/.test(h3) ? f5.endsWith(" ") || (f5 += " ") : f5 += h3;\n      }\n    }\n    return f5;\n  }\n  function aa(s4) {\n    let f5 = "";\n    for (; s4.offset < s4.input.length; ) {\n      let p3 = s4.input[s4.offset++];\n      if (/\\s/.test(p3)) return mt2(f5);\n      if (f5.length >= 6 || !/[\\dA-Fa-f]/.test(p3)) return s4.offset--, mt2(f5);\n      f5 += p3;\n    }\n    return mt2(f5);\n  }\n  function mt2(s4) {\n    return String.fromCodePoint(parseInt(s4, 16));\n  }\n  var lr;\n  async function bt3(s4, f5) {\n    if (!lr) {\n      if (typeof navigator < "u" && "fonts" in navigator) {\n        try {\n          let v6 = await navigator.permissions.request?.({ name: "local-fonts" });\n          if (v6 && v6.state !== "granted") throw new Error("Permission to access local fonts not granted.");\n        } catch (v6) {\n          if (v6 instanceof Error && v6.name !== "TypeError") throw v6;\n        }\n        let h3 = {};\n        try {\n          let v6 = await navigator.fonts.query();\n          for (let x5 of v6) h3.hasOwnProperty(x5.family) || (h3[x5.family] = []), h3[x5.family].push(x5);\n          lr = Promise.resolve(h3);\n        } catch (v6) {\n          v6 instanceof Error && console.error(v6.name, v6.message);\n        }\n      } else if (typeof window < "u" && "queryLocalFonts" in window) {\n        let h3 = {};\n        try {\n          let v6 = await window.queryLocalFonts();\n          for (let x5 of v6) h3.hasOwnProperty(x5.family) || (h3[x5.family] = []), h3[x5.family].push(x5);\n          lr = Promise.resolve(h3);\n        } catch (v6) {\n          v6 instanceof Error && console.error(v6.name, v6.message);\n        }\n      }\n      lr ??= Promise.resolve({});\n    }\n    let p3 = await lr;\n    for (let h3 of yt2(s4)) {\n      if (tu.includes(h3)) return;\n      if (p3.hasOwnProperty(h3) && p3[h3].length > 0) {\n        let v6 = p3[h3][0];\n        if ("blob" in v6) {\n          let S4 = await (await v6.blob()).arrayBuffer();\n          return na(S4, { cacheSize: f5 });\n        }\n        return;\n      }\n    }\n  }\n  var tu = ["serif", "sans-serif", "cursive", "fantasy", "monospace", "system-ui", "emoji", "math", "fangsong"];\n  var nu = 1e5;\n  function ia(s4, f5 = []) {\n    let p3, h3, v6 = 0, x5;\n    return s4.registerCharacterJoiner((S4) => {\n      let L6 = s4.options.fontFamily;\n      if (L6 && (v6 === 0 || p3 !== L6)) {\n        h3 = void 0, v6 = 1, p3 = L6;\n        let k5 = p3;\n        bt3(k5, nu).then((D7) => {\n          k5 === s4.options.fontFamily && (v6 = 2, h3 = D7, D7 && s4.refresh(0, s4.rows - 1));\n        }).catch((D7) => {\n          k5 === s4.options.fontFamily && (v6 = 3, s4.options.logLevel === "debug" && console.debug(x5, new Error("Failure while loading font")), h3 = void 0, x5 = D7);\n        });\n      }\n      return h3 && v6 === 2 ? h3.findLigatureRanges(S4).map((k5) => [k5[0], k5[1]]) : au(S4, f5);\n    });\n  }\n  function au(s4, f5) {\n    let p3 = [];\n    for (let h3 = 0; h3 < s4.length; h3++) for (let v6 = 0; v6 < f5.length; v6++) if (s4.startsWith(f5[v6], h3)) {\n      p3.push([h3, h3 + f5[v6].length]), h3 += f5[v6].length - 1;\n      break;\n    }\n    return p3;\n  }\n  var sa = class {\n    constructor(f5) {\n      this._fallbackLigatures = (f5?.fallbackLigatures ?? ["<--", "<---", "<<-", "<-", "->", "->>", "-->", "--->", "<==", "<===", "<<=", "<=", "=>", "=>>", "==>", "===>", ">=", ">>=", "<->", "<-->", "<--->", "<---->", "<=>", "<==>", "<===>", "<====>", "::", ":::", "<~~", "</", "</>", "/>", "~~>", "==", "!=", "/=", "~=", "<>", "===", "!==", "!===", "<:", ":=", "*=", "*+", "<*", "<*>", "*>", "<|", "<|>", "|>", "+*", "=*", "=:", ":>", "/*", "*/", "+++", "<!--", "<!---"]).sort((p3, h3) => h3.length - p3.length), this._fontFeatureSettings = f5?.fontFeatureSettings;\n    }\n    activate(f5) {\n      if (!f5.element) throw new Error("Cannot activate LigaturesAddon before open is called");\n      this._terminal = f5, this._characterJoinerId = ia(f5, this._fallbackLigatures), f5.element.style.fontFeatureSettings = this._fontFeatureSettings ?? \'"calt" on\';\n    }\n    dispose() {\n      this._characterJoinerId !== void 0 && (this._terminal?.deregisterCharacterJoiner(this._characterJoinerId), this._characterJoinerId = void 0), this._terminal?.element && (this._terminal.element.style.fontFeatureSettings = "");\n    }\n  };\n\n  // node_modules/@xterm/xterm/lib/xterm.mjs\n  var Us = Object.defineProperty;\n  var Yn = Object.getOwnPropertyDescriptor;\n  var Xn2 = (n11, t) => {\n    for (var e in t) Us(n11, e, { get: t[e], enumerable: true });\n  };\n  var E4 = (n11, t, e, i5) => {\n    for (var r = i5 > 1 ? void 0 : i5 ? Yn(t, e) : t, s4 = n11.length - 1, o2; s4 >= 0; s4--) (o2 = n11[s4]) && (r = (i5 ? o2(t, e, r) : o2(r)) || r);\n    return i5 && r && Us(t, e, r), r;\n  };\n  var m3 = (n11, t) => (e, i5) => t(e, i5, n11);\n  var Ks = "Terminal input";\n  var zt2 = { get: () => Ks, set: (n11) => Ks = n11 };\n  var zs = "Too much output to announce, navigate to rows manually to read";\n  var Je3 = { get: () => zs, set: (n11) => zs = n11 };\n  function jn(n11) {\n    return n11.replace(/\\r?\\n/g, "\\r");\n  }\n  function Zn2(n11, t) {\n    return t ? `\\x1B[200~${n11.replace(/\\x1b/g, "\\u241B")}\\x1B[201~` : n11;\n  }\n  function Gs(n11, t) {\n    n11.clipboardData && n11.clipboardData.setData("text/plain", t.selectionText), n11.preventDefault();\n  }\n  function $s(n11, t, e, i5) {\n    if (n11.stopPropagation(), n11.clipboardData) {\n      let r = n11.clipboardData.getData("text/plain");\n      Hr(r, t, e, i5);\n    }\n  }\n  function Hr(n11, t, e, i5) {\n    n11 = jn(n11), n11 = Zn2(n11, e.decPrivateModes.bracketedPasteMode && i5.rawOptions.ignoreBracketedPasteMode !== true), e.triggerDataEvent(n11, true), t.value = "";\n  }\n  function Wr(n11, t, e) {\n    let i5 = e.getBoundingClientRect(), r = n11.clientX - i5.left - 10, s4 = n11.clientY - i5.top - 10;\n    t.style.width = "20px", t.style.height = "20px", t.style.left = `${r}px`, t.style.top = `${s4}px`, t.style.zIndex = "1000", t.focus();\n  }\n  function Ur2(n11, t, e, i5, r) {\n    Wr(n11, t, e), r && i5.rightClickSelect(n11), t.value = i5.selectionText, t.select();\n  }\n  function ve2(n11) {\n    return n11 > 65535 ? (n11 -= 65536, String.fromCharCode((n11 >> 10) + 55296) + String.fromCharCode(n11 % 1024 + 56320)) : String.fromCharCode(n11);\n  }\n  function ye2(n11, t = 0, e = n11.length) {\n    let i5 = "";\n    for (let r = t; r < e; ++r) {\n      let s4 = n11[r];\n      s4 > 65535 ? (s4 -= 65536, i5 += String.fromCharCode((s4 >> 10) + 55296) + String.fromCharCode(s4 % 1024 + 56320)) : i5 += String.fromCharCode(s4);\n    }\n    return i5;\n  }\n  var Si = class {\n    constructor() {\n      this._interim = 0;\n    }\n    clear() {\n      this._interim = 0;\n    }\n    decode(t, e) {\n      let i5 = t.length;\n      if (!i5) return 0;\n      let r = 0, s4 = 0;\n      if (this._interim) {\n        let o2 = t.charCodeAt(s4++);\n        56320 <= o2 && o2 <= 57343 ? e[r++] = (this._interim - 55296) * 1024 + o2 - 56320 + 65536 : (e[r++] = this._interim, e[r++] = o2), this._interim = 0;\n      }\n      for (let o2 = s4; o2 < i5; ++o2) {\n        let a2 = t.charCodeAt(o2);\n        if (55296 <= a2 && a2 <= 56319) {\n          if (++o2 >= i5) return this._interim = a2, r;\n          let l4 = t.charCodeAt(o2);\n          56320 <= l4 && l4 <= 57343 ? e[r++] = (a2 - 55296) * 1024 + l4 - 56320 + 65536 : (e[r++] = a2, e[r++] = l4);\n          continue;\n        }\n        a2 !== 65279 && (e[r++] = a2);\n      }\n      return r;\n    }\n  };\n  var gi = class {\n    constructor() {\n      this.interim = new Uint8Array(3);\n    }\n    clear() {\n      this.interim.fill(0);\n    }\n    decode(t, e) {\n      let i5 = t.length;\n      if (!i5) return 0;\n      let r = 0, s4, o2, a2, l4, h3 = 0, d3 = 0;\n      if (this.interim[0]) {\n        let _5 = false, p3 = this.interim[0];\n        p3 &= (p3 & 224) === 192 ? 31 : (p3 & 240) === 224 ? 15 : 7;\n        let b4 = 0, f5;\n        for (; (f5 = this.interim[++b4] & 63) && b4 < 4; ) p3 <<= 6, p3 |= f5;\n        let S4 = (this.interim[0] & 224) === 192 ? 2 : (this.interim[0] & 240) === 224 ? 3 : 4, I4 = S4 - b4;\n        for (; d3 < I4; ) {\n          if (d3 >= i5) return 0;\n          if (f5 = t[d3++], (f5 & 192) !== 128) {\n            d3--, _5 = true;\n            break;\n          } else this.interim[b4++] = f5, p3 <<= 6, p3 |= f5 & 63;\n        }\n        _5 || (S4 === 2 ? p3 < 128 ? d3-- : e[r++] = p3 : S4 === 3 ? p3 < 2048 || p3 >= 55296 && p3 <= 57343 || p3 === 65279 || (e[r++] = p3) : p3 < 65536 || p3 > 1114111 || (e[r++] = p3)), this.interim.fill(0);\n      }\n      let c2 = i5 - 4, u3 = d3;\n      for (; u3 < i5; ) {\n        for (; u3 < c2 && !((s4 = t[u3]) & 128) && !((o2 = t[u3 + 1]) & 128) && !((a2 = t[u3 + 2]) & 128) && !((l4 = t[u3 + 3]) & 128); ) e[r++] = s4, e[r++] = o2, e[r++] = a2, e[r++] = l4, u3 += 4;\n        if (s4 = t[u3++], s4 < 128) e[r++] = s4;\n        else if ((s4 & 224) === 192) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 31) << 6 | o2 & 63, h3 < 128) {\n            u3--;\n            continue;\n          }\n          e[r++] = h3;\n        } else if ((s4 & 240) === 224) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, r;\n          if (a2 = t[u3++], (a2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 15) << 12 | (o2 & 63) << 6 | a2 & 63, h3 < 2048 || h3 >= 55296 && h3 <= 57343 || h3 === 65279) continue;\n          e[r++] = h3;\n        } else if ((s4 & 248) === 240) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, r;\n          if (a2 = t[u3++], (a2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, this.interim[2] = a2, r;\n          if (l4 = t[u3++], (l4 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 7) << 18 | (o2 & 63) << 12 | (a2 & 63) << 6 | l4 & 63, h3 < 65536 || h3 > 1114111) continue;\n          e[r++] = h3;\n        }\n      }\n      return r;\n    }\n  };\n  var fe2 = class n2 {\n    constructor() {\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Pe2();\n    }\n    static toColorRGB(t) {\n      return [t >>> 16 & 255, t >>> 8 & 255, t & 255];\n    }\n    static fromColorRGB(t) {\n      return (t[0] & 255) << 16 | (t[1] & 255) << 8 | t[2] & 255;\n    }\n    clone() {\n      let t = new n2();\n      return t.fg = this.fg, t.bg = this.bg, t.extended = this.extended.clone(), t;\n    }\n    isInverse() {\n      return this.fg & 67108864;\n    }\n    isBold() {\n      return this.fg & 134217728;\n    }\n    isUnderline() {\n      return this.hasExtendedAttrs() && this.extended.underlineStyle !== 0 ? 1 : this.fg & 268435456;\n    }\n    isBlink() {\n      return this.fg & 536870912;\n    }\n    isInvisible() {\n      return this.fg & 1073741824;\n    }\n    isItalic() {\n      return this.bg & 67108864;\n    }\n    isDim() {\n      return this.bg & 134217728;\n    }\n    isStrikethrough() {\n      return this.fg & 2147483648;\n    }\n    isProtected() {\n      return this.bg & 536870912;\n    }\n    isOverline() {\n      return this.bg & 1073741824;\n    }\n    getFgColorMode() {\n      return this.fg & 50331648;\n    }\n    getBgColorMode() {\n      return this.bg & 50331648;\n    }\n    isFgRGB() {\n      return (this.fg & 50331648) === 50331648;\n    }\n    isBgRGB() {\n      return (this.bg & 50331648) === 50331648;\n    }\n    isFgPalette() {\n      return (this.fg & 50331648) === 16777216 || (this.fg & 50331648) === 33554432;\n    }\n    isBgPalette() {\n      return (this.bg & 50331648) === 16777216 || (this.bg & 50331648) === 33554432;\n    }\n    isFgDefault() {\n      return (this.fg & 50331648) === 0;\n    }\n    isBgDefault() {\n      return (this.bg & 50331648) === 0;\n    }\n    isAttributeDefault() {\n      return this.fg === 0 && this.bg === 0;\n    }\n    getFgColor() {\n      switch (this.fg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.fg & 255;\n        case 50331648:\n          return this.fg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    getBgColor() {\n      switch (this.bg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.bg & 255;\n        case 50331648:\n          return this.bg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    hasExtendedAttrs() {\n      return this.bg & 268435456;\n    }\n    updateExtended() {\n      this.extended.isEmpty() ? this.bg &= -268435457 : this.bg |= 268435456;\n    }\n    getUnderlineColor() {\n      if (this.bg & 268435456 && ~this.extended.underlineColor) switch (this.extended.underlineColor & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.extended.underlineColor & 255;\n        case 50331648:\n          return this.extended.underlineColor & 16777215;\n        default:\n          return this.getFgColor();\n      }\n      return this.getFgColor();\n    }\n    getUnderlineColorMode() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? this.extended.underlineColor & 50331648 : this.getFgColorMode();\n    }\n    isUnderlineColorRGB() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 50331648 : this.isFgRGB();\n    }\n    isUnderlineColorPalette() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 16777216 || (this.extended.underlineColor & 50331648) === 33554432 : this.isFgPalette();\n    }\n    isUnderlineColorDefault() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 0 : this.isFgDefault();\n    }\n    getUnderlineStyle() {\n      return this.fg & 268435456 ? this.bg & 268435456 ? this.extended.underlineStyle : 1 : 0;\n    }\n    getUnderlineVariantOffset() {\n      return this.extended.underlineVariantOffset;\n    }\n  };\n  var Pe2 = class n3 {\n    constructor(t = 0, e = 0) {\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = t, this._urlId = e;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(t) {\n      this._ext = t;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(t) {\n      this._ext &= -469762049, this._ext |= t << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(t) {\n      this._ext &= -67108864, this._ext |= t & 67108863;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(t) {\n      this._urlId = t;\n    }\n    get underlineVariantOffset() {\n      let t = (this._ext & 3758096384) >> 29;\n      return t < 0 ? t ^ 4294967288 : t;\n    }\n    set underlineVariantOffset(t) {\n      this._ext &= 536870911, this._ext |= t << 29 & 3758096384;\n    }\n    clone() {\n      return new n3(this._ext, this._urlId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0;\n    }\n  };\n  var N2 = class n4 extends fe2 {\n    constructor() {\n      super(...arguments);\n      this.content = 0;\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Pe2();\n      this.combinedData = "";\n    }\n    static fromCharData(e) {\n      let i5 = new n4();\n      return i5.setFromCharData(e), i5;\n    }\n    isCombined() {\n      return this.content & 2097152;\n    }\n    getWidth() {\n      return this.content >> 22;\n    }\n    getChars() {\n      return this.content & 2097152 ? this.combinedData : this.content & 2097151 ? ve2(this.content & 2097151) : "";\n    }\n    getCode() {\n      return this.isCombined() ? this.combinedData.charCodeAt(this.combinedData.length - 1) : this.content & 2097151;\n    }\n    setFromCharData(e) {\n      this.fg = e[0], this.bg = 0;\n      let i5 = false;\n      if (e[1].length > 2) i5 = true;\n      else if (e[1].length === 2) {\n        let r = e[1].charCodeAt(0);\n        if (55296 <= r && r <= 56319) {\n          let s4 = e[1].charCodeAt(1);\n          56320 <= s4 && s4 <= 57343 ? this.content = (r - 55296) * 1024 + s4 - 56320 + 65536 | e[2] << 22 : i5 = true;\n        } else i5 = true;\n      } else this.content = e[1].charCodeAt(0) | e[2] << 22;\n      i5 && (this.combinedData = e[1], this.content = 2097152 | e[2] << 22);\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n    attributesEquals(e) {\n      if (this.getFgColorMode() !== e.getFgColorMode() || this.getFgColor() !== e.getFgColor() || this.getBgColorMode() !== e.getBgColorMode() || this.getBgColor() !== e.getBgColor() || this.isInverse() !== e.isInverse() || this.isBold() !== e.isBold() || this.isUnderline() !== e.isUnderline()) return false;\n      if (this.isUnderline()) {\n        if (this.getUnderlineStyle() !== e.getUnderlineStyle()) return false;\n        let i5 = this.isUnderlineColorDefault(), r = e.isUnderlineColorDefault();\n        if (!(i5 && r) && (i5 !== r || this.getUnderlineColor() !== e.getUnderlineColor() || this.getUnderlineColorMode() !== e.getUnderlineColorMode())) return false;\n      }\n      return !(this.isOverline() !== e.isOverline() || this.isBlink() !== e.isBlink() || this.isInvisible() !== e.isInvisible() || this.isItalic() !== e.isItalic() || this.isDim() !== e.isDim() || this.isStrikethrough() !== e.isStrikethrough());\n    }\n  };\n  var qs = "di$target";\n  var Vr = "di$dependencies";\n  var $r = /* @__PURE__ */ new Map();\n  function Ys(n11) {\n    return n11[Vr] || [];\n  }\n  function F3(n11) {\n    if ($r.has(n11)) return $r.get(n11);\n    let t = function(e, i5, r) {\n      if (arguments.length !== 3) throw new Error("@IServiceName-decorator can only be used to decorate a parameter");\n      eo(t, e, r);\n    };\n    return t._id = n11, $r.set(n11, t), t;\n  }\n  function eo(n11, t, e) {\n    t[qs] === t ? t[Vr].push({ id: n11, index: e }) : (t[Vr] = [{ id: n11, index: e }], t[qs] = t);\n  }\n  var L5 = F3("BufferService");\n  var et2 = F3("MouseStateService");\n  var Y = F3("CoreService");\n  var Xs = F3("CharsetService");\n  var tt3 = F3("InstantiationService");\n  var pe = F3("LogService");\n  var R3 = F3("OptionsService");\n  var Ii = F3("OscLinkService");\n  var js = F3("UnicodeService");\n  var Ie2 = F3("DecorationService");\n  var it4 = class {\n    constructor(t, e, i5) {\n      this._bufferService = t;\n      this._optionsService = e;\n      this._oscLinkService = i5;\n      this._workCell = new N2();\n    }\n    provideLinks(t, e) {\n      let i5 = this._bufferService.buffer.lines.get(t - 1);\n      if (!i5) {\n        e(void 0);\n        return;\n      }\n      let r = [], s4 = this._optionsService.rawOptions.linkHandler, o2 = this._workCell, a2 = i5.getTrimmedLength(), l4 = -1, h3 = -1, d3 = false;\n      for (let c2 = 0; c2 < a2; c2++) if (!(h3 === -1 && !i5.hasContent(c2))) {\n        if (i5.loadCell(c2, o2), o2.hasExtendedAttrs() && o2.extended.urlId) if (h3 === -1) {\n          h3 = c2, l4 = o2.extended.urlId;\n          continue;\n        } else d3 = o2.extended.urlId !== l4;\n        else h3 !== -1 && (d3 = true);\n        if (d3 || h3 !== -1 && c2 === a2 - 1) {\n          let u3 = this._oscLinkService.getLinkData(l4)?.uri;\n          if (u3) {\n            let _5 = { start: { x: h3 + 1, y: t }, end: { x: c2 + (!d3 && c2 === a2 - 1 ? 1 : 0), y: t } }, p3 = false;\n            if (!s4?.allowNonHttpProtocols) try {\n              let b4 = new URL(u3);\n              ["http:", "https:"].includes(b4.protocol) || (p3 = true);\n            } catch {\n              p3 = true;\n            }\n            p3 || r.push({ text: u3, range: _5, activate: (b4, f5) => s4 ? s4.activate(b4, f5, _5) : to(b4, f5), hover: (b4, f5) => s4?.hover?.(b4, f5, _5), leave: (b4, f5) => s4?.leave?.(b4, f5, _5) });\n          }\n          d3 = false, o2.hasExtendedAttrs() && o2.extended.urlId ? (h3 = c2, l4 = o2.extended.urlId) : (h3 = -1, l4 = -1);\n        }\n      }\n      e(r);\n    }\n  };\n  it4 = E4([m3(0, L5), m3(1, R3), m3(2, Ii)], it4);\n  function to(n11, t) {\n    if (confirm(`Do you want to navigate to ${t}?\n\nWARNING: This link could potentially be dangerous`)) {\n      let i5 = window.open();\n      if (i5) {\n        try {\n          i5.opener = null;\n        } catch {\n        }\n        i5.location.href = t;\n      } else console.warn("Opening link blocked as opener could not be cleared");\n    }\n  }\n  var Me2 = F3("CharSizeService");\n  var z3 = F3("CoreBrowserService");\n  var Be2 = F3("MouseCoordsService");\n  var Zs = F3("MouseService");\n  var G4 = F3("RenderService");\n  var Ci = F3("SelectionService");\n  var Ei = F3("CharacterJoinerService");\n  var _e2 = F3("ThemeService");\n  var yi = F3("LinkProviderService");\n  var Js = F3("KeyboardService");\n  function y4(n11) {\n    return { dispose: n11 };\n  }\n  function Oe2(n11) {\n    if (!n11) return n11;\n    if (Array.isArray(n11)) {\n      for (let t of n11) t.dispose();\n      return [];\n    }\n    return n11.dispose(), n11;\n  }\n  var we2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(t) {\n      return this._isDisposed ? t.dispose() : this._disposables.add(t), t;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let t of this._disposables) t.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let t of this._disposables) t.dispose();\n      this._disposables.clear();\n    }\n  };\n  var g5 = class {\n    constructor() {\n      this._store = new we2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(t) {\n      return this._store.add(t);\n    }\n  };\n  g5.None = Object.freeze({ dispose() {\n  } });\n  var me3 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(t) {\n      this._isDisposed || t === this._value || (this._value?.dispose(), this._value = t);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var Ne3 = class {\n    constructor() {\n      this._token = -1;\n      this._isDisposed = false;\n    }\n    dispose() {\n      this.cancel(), this._isDisposed = true;\n    }\n    cancel() {\n      this._token !== -1 && (clearTimeout(this._token), this._token = -1);\n    }\n    cancelAndSet(t, e) {\n      if (this._isDisposed) throw new Error("Calling cancelAndSet on a disposed TimeoutTimer");\n      this.cancel(), this._token = setTimeout(() => {\n        this._token = -1, t();\n      }, e);\n    }\n    setIfNotSet(t, e) {\n      if (this._isDisposed) throw new Error("Calling setIfNotSet on a disposed TimeoutTimer");\n      this._token === -1 && (this._token = setTimeout(() => {\n        this._token = -1, t();\n      }, e));\n    }\n  };\n  var xi = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    cancel() {\n      this._disposable?.dispose(), this._disposable = void 0;\n    }\n    cancelAndSet(t, e, i5 = globalThis) {\n      if (this._isDisposed) throw new Error("Calling cancelAndSet on a disposed IntervalTimer");\n      this.cancel();\n      let r = i5.setInterval(() => {\n        t();\n      }, e);\n      this._disposable = { dispose: () => {\n        i5.clearInterval(r), this._disposable = void 0;\n      } };\n    }\n    dispose() {\n      this.cancel(), this._isDisposed = true;\n    }\n  };\n  function oe3(n11) {\n    let t = n11;\n    if (t?.ownerDocument?.defaultView) return t.ownerDocument.defaultView;\n    let e = n11;\n    return e?.view ? e.view : window;\n  }\n  var qr = class {\n    constructor(t, e, i5, r) {\n      this._node = t, this._type = e, this._handler = i5, this._options = r, t.addEventListener(e, i5, r);\n    }\n    dispose() {\n      !this._node || !this._handler || (this._node.removeEventListener(this._type, this._handler, this._options), this._node = null, this._handler = null);\n    }\n  };\n  function C3(n11, t, e, i5) {\n    return new qr(n11, t, e, i5);\n  }\n  function Yr(n11, t, e, i5) {\n    return C3(n11, t, e, i5);\n  }\n  var ae3 = { CLICK: "click", MOUSE_DOWN: "mousedown", MOUSE_OVER: "mouseover", MOUSE_LEAVE: "mouseleave", KEY_DOWN: "keydown", KEY_UP: "keyup", INPUT: "input", BLUR: "blur", FOCUS: "focus", CHANGE: "change", POINTER_DOWN: "pointerdown", POINTER_MOVE: "pointermove", POINTER_UP: "pointerup", MOUSE_WHEEL: "wheel", WHEEL: "wheel" };\n  function en(n11) {\n    let t = n11.getBoundingClientRect(), e = oe3(n11);\n    return { left: t.left + e.scrollX, top: t.top + e.scrollY, width: t.width, height: t.height };\n  }\n  var wi = class {\n    constructor(t, e) {\n      this._runner = t;\n      this.priority = e;\n      this._canceled = false;\n    }\n    dispose() {\n      this._canceled = true;\n    }\n    execute() {\n      if (!this._canceled) try {\n        this._runner();\n      } catch (t) {\n        console.error(t);\n      }\n    }\n    static sort(t, e) {\n      return e.priority - t.priority;\n    }\n  };\n  var Qs = /* @__PURE__ */ new Map();\n  function tn(n11) {\n    let t = Qs.get(n11);\n    return t || (t = { next: [], current: [], animFrameRequested: false, inAnimationFrameRunner: false }, Qs.set(n11, t)), t;\n  }\n  function io(n11) {\n    let t = tn(n11);\n    for (t.animFrameRequested = false, t.current = t.next, t.next = [], t.inAnimationFrameRunner = true; t.current.length > 0; ) t.current.sort(wi.sort), t.current.shift().execute();\n    t.inAnimationFrameRunner = false;\n  }\n  function rt3(n11, t, e = 0) {\n    let i5 = tn(n11), r = new wi(t, e);\n    return i5.next.push(r), i5.animFrameRequested || (i5.animFrameRequested = true, n11.requestAnimationFrame(() => io(n11))), r;\n  }\n  var Ti = class extends xi {\n    constructor(t) {\n      super(), this._defaultTarget = t ? oe3(t) : void 0;\n    }\n    cancelAndSet(t, e, i5) {\n      super.cancelAndSet(t, e, i5 ?? this._defaultTarget ?? window);\n    }\n  };\n  var Te3 = class {\n    constructor(t) {\n      this.domNode = t;\n      this._width = "";\n      this._height = "";\n      this._top = "";\n      this._left = "";\n      this._bottom = "";\n      this._right = "";\n      this._className = "";\n      this._position = "";\n      this._layerHint = false;\n      this._contain = "none";\n    }\n    setWidth(t) {\n      let e = nt4(t);\n      this._width !== e && (this._width = e, this.domNode.style.width = this._width);\n    }\n    setHeight(t) {\n      let e = nt4(t);\n      this._height !== e && (this._height = e, this.domNode.style.height = this._height);\n    }\n    setTop(t) {\n      let e = nt4(t);\n      this._top !== e && (this._top = e, this.domNode.style.top = this._top);\n    }\n    setLeft(t) {\n      let e = nt4(t);\n      this._left !== e && (this._left = e, this.domNode.style.left = this._left);\n    }\n    setBottom(t) {\n      let e = nt4(t);\n      this._bottom !== e && (this._bottom = e, this.domNode.style.bottom = this._bottom);\n    }\n    setRight(t) {\n      let e = nt4(t);\n      this._right !== e && (this._right = e, this.domNode.style.right = this._right);\n    }\n    setClassName(t) {\n      this._className !== t && (this._className = t, this.domNode.className = this._className);\n    }\n    toggleClassName(t, e) {\n      this.domNode.classList.toggle(t, e), this._className = this.domNode.className;\n    }\n    setPosition(t) {\n      this._position !== t && (this._position = t, this.domNode.style.position = this._position);\n    }\n    setLayerHinting(t) {\n      this._layerHint !== t && (this._layerHint = t, t ? this.domNode.style.transform = "translate3d(0px, 0px, 0px)" : this.domNode.style.transform = "");\n    }\n    setContain(t) {\n      this._contain !== t && (this._contain = t, this.domNode.style.contain = this._contain);\n    }\n    setAttribute(t, e) {\n      this.domNode.setAttribute(t, e);\n    }\n  };\n  function nt4(n11) {\n    return typeof n11 == "number" ? `${n11}px` : n11;\n  }\n  var ze3 = {};\n  Xn2(ze3, { getSafariVersion: () => so, getZoomFactor: () => Zr, isChrome: () => Gt2, isChromeOS: () => Jr, isFirefox: () => at4, isLegacyEdge: () => ro, isLinux: () => $t2, isMac: () => ee3, isNode: () => Xr, isSafari: () => Di, isWindows: () => Ke3 });\n  var Xr = !!(typeof process < "u" && "title" in process && (typeof navigator > "u" || navigator.userAgent.startsWith("Node.js/")));\n  var ot4 = Xr ? "node" : navigator.userAgent;\n  var jr = Xr ? "node" : navigator.platform;\n  var at4 = ot4.includes("Firefox");\n  var Gt2 = ot4.includes("Chrome");\n  var ro = ot4.includes("Edge");\n  var Di = /^((?!chrome|android).)*safari/i.test(ot4);\n  function Zr(n11) {\n    return 1;\n  }\n  function so() {\n    if (!Di) return 0;\n    let n11 = ot4.match(/Version\\/(\\d+)/);\n    return n11 === null || n11.length < 2 ? 0 : parseInt(n11[1]);\n  }\n  var ee3 = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"].includes(jr);\n  var Ke3 = ["Windows", "Win16", "Win32", "WinCE"].includes(jr);\n  var $t2 = jr.indexOf("Linux") >= 0;\n  var Jr = /\\bCrOS\\b/.test(ot4);\n  var rn = /* @__PURE__ */ new WeakMap();\n  function no(n11) {\n    if (!n11.parent || n11.parent === n11) return null;\n    try {\n      let t = n11.location, e = n11.parent.location;\n      if (t.origin !== "null" && e.origin !== "null" && t.origin !== e.origin) return null;\n    } catch {\n      return null;\n    }\n    return n11.parent;\n  }\n  var Qr = class {\n    static _getSameOriginWindowChain(t) {\n      let e = rn.get(t);\n      if (!e) {\n        e = [], rn.set(t, e);\n        let i5 = t, r;\n        do\n          r = no(i5), r ? e.push({ window: new WeakRef(i5), iframeElement: i5.frameElement ?? null }) : e.push({ window: new WeakRef(i5), iframeElement: null }), i5 = r;\n        while (i5);\n      }\n      return e.slice(0);\n    }\n    static getPositionOfChildWindowRelativeToAncestorWindow(t, e) {\n      if (!e || t === e) return { top: 0, left: 0 };\n      let i5 = 0, r = 0, s4 = this._getSameOriginWindowChain(t);\n      for (let o2 of s4) {\n        let a2 = o2.window.deref();\n        if (i5 += a2?.scrollY ?? 0, r += a2?.scrollX ?? 0, a2 === e || !o2.iframeElement) break;\n        let l4 = o2.iframeElement.getBoundingClientRect();\n        i5 += l4.top, r += l4.left;\n      }\n      return { top: i5, left: r };\n    }\n  };\n  var lt3 = class {\n    constructor(t, e) {\n      this.timestamp = Date.now(), this.browserEvent = e, this.leftButton = e.button === 0, this.middleButton = e.button === 1, this.rightButton = e.button === 2, this.buttons = e.buttons, this.target = e.target, this.detail = e.detail ?? 1, e.type === "dblclick" && (this.detail = 2), this.ctrlKey = e.ctrlKey, this.shiftKey = e.shiftKey, this.altKey = e.altKey, this.metaKey = e.metaKey, typeof e.pageX == "number" ? (this.posx = e.pageX, this.posy = e.pageY) : (this.posx = e.clientX + this.target.ownerDocument.body.scrollLeft + this.target.ownerDocument.documentElement.scrollLeft, this.posy = e.clientY + this.target.ownerDocument.body.scrollTop + this.target.ownerDocument.documentElement.scrollTop);\n      let i5 = Qr.getPositionOfChildWindowRelativeToAncestorWindow(t, e.view);\n      this.posx -= i5.left, this.posy -= i5.top;\n    }\n    preventDefault() {\n      this.browserEvent.preventDefault();\n    }\n    stopPropagation() {\n      this.browserEvent.stopPropagation();\n    }\n  };\n  var Vt2 = class {\n    constructor(t, e = 0, i5 = 0) {\n      this.browserEvent = t ?? null, this.target = t ? t.target ?? t.targetNode ?? t.srcElement ?? null : null, this.deltaY = i5, this.deltaX = e;\n      let r = false;\n      if (Gt2) {\n        let s4 = navigator.userAgent.match(/Chrome\\/(\\d+)/);\n        r = (s4 ? parseInt(s4[1]) : 123) <= 122;\n      }\n      if (t) {\n        let s4 = t, o2 = t, a2 = t.view?.devicePixelRatio ?? 1;\n        if (typeof s4.wheelDeltaY < "u") r ? this.deltaY = s4.wheelDeltaY / (120 * a2) : this.deltaY = s4.wheelDeltaY / 120;\n        else if (typeof o2.VERTICAL_AXIS < "u" && o2.axis === o2.VERTICAL_AXIS) this.deltaY = -o2.detail / 3;\n        else if (t.type === "wheel") {\n          let l4 = t;\n          l4.deltaMode === l4.DOM_DELTA_LINE ? at4 && !ee3 ? this.deltaY = -t.deltaY / 3 : this.deltaY = -t.deltaY : this.deltaY = -t.deltaY / 40;\n        }\n        if (typeof s4.wheelDeltaX < "u") Di && Ke3 ? this.deltaX = -(s4.wheelDeltaX / 120) : r ? this.deltaX = s4.wheelDeltaX / (120 * a2) : this.deltaX = s4.wheelDeltaX / 120;\n        else if (typeof o2.HORIZONTAL_AXIS < "u" && o2.axis === o2.HORIZONTAL_AXIS) this.deltaX = -t.detail / 3;\n        else if (t.type === "wheel") {\n          let l4 = t;\n          l4.deltaMode === l4.DOM_DELTA_LINE ? at4 && !ee3 ? this.deltaX = -t.deltaX / 3 : this.deltaX = -t.deltaX : this.deltaX = -t.deltaX / 40;\n        }\n        this.deltaY === 0 && this.deltaX === 0 && t.wheelDelta && (r ? this.deltaY = t.wheelDelta / (120 * a2) : this.deltaY = t.wheelDelta / 120);\n      }\n    }\n    preventDefault() {\n      this.browserEvent?.preventDefault();\n    }\n    stopPropagation() {\n      this.browserEvent?.stopPropagation();\n    }\n  };\n  var ct3 = class {\n    constructor() {\n      this._hooks = new we2();\n      this._pointerMoveCallback = null;\n      this._onStopCallback = null;\n    }\n    dispose() {\n      this.stopMonitoring(false), this._hooks.dispose();\n    }\n    stopMonitoring(t) {\n      if (!this.isMonitoring()) return;\n      this._hooks.clear(), this._pointerMoveCallback = null;\n      let e = this._onStopCallback;\n      this._onStopCallback = null, t && e && e();\n    }\n    isMonitoring() {\n      return !!this._pointerMoveCallback;\n    }\n    startMonitoring(t, e, i5, r, s4) {\n      this.isMonitoring() && this.stopMonitoring(false), this._pointerMoveCallback = r, this._onStopCallback = s4;\n      let o2 = t;\n      try {\n        t.setPointerCapture(e), this._hooks.add(y4(() => {\n          try {\n            t.releasePointerCapture(e);\n          } catch {\n          }\n        }));\n      } catch {\n        o2 = oe3(t);\n      }\n      this._hooks.add(C3(o2, ae3.POINTER_MOVE, (a2) => {\n        if (a2.buttons !== i5) {\n          this.stopMonitoring(true);\n          return;\n        }\n        a2.preventDefault(), this._pointerMoveCallback(a2);\n      })), this._hooks.add(C3(o2, ae3.POINTER_UP, (a2) => this.stopMonitoring(true)));\n    }\n  };\n  var Fe3 = class extends g5 {\n    _onclick(t, e) {\n      this._register(C3(t, ae3.CLICK, (i5) => e(new lt3(oe3(t), i5))));\n    }\n    _onmouseover(t, e) {\n      this._register(C3(t, ae3.MOUSE_OVER, (i5) => e(new lt3(oe3(t), i5))));\n    }\n    _onmouseleave(t, e) {\n      this._register(C3(t, ae3.MOUSE_LEAVE, (i5) => e(new lt3(oe3(t), i5))));\n    }\n  };\n  var Ri = class extends Fe3 {\n    constructor(t) {\n      super(), this._handleActivate = t.handleActivate, this.bgDomNode = document.createElement("div"), this.bgDomNode.className = "xterm-arrow-background", this.bgDomNode.style.position = "absolute", this.bgDomNode.style.width = t.bgWidth + "px", this.bgDomNode.style.height = t.bgHeight + "px", typeof t.top < "u" && (this.bgDomNode.style.top = "0px"), typeof t.left < "u" && (this.bgDomNode.style.left = "0px"), typeof t.bottom < "u" && (this.bgDomNode.style.bottom = "0px"), typeof t.right < "u" && (this.bgDomNode.style.right = "0px"), this.domNode = document.createElement("div"), this.domNode.className = t.className, this.domNode.style.position = "absolute";\n      let e = Math.min(t.bgWidth, t.bgHeight);\n      this.domNode.style.width = e + "px", this.domNode.style.height = e + "px", typeof t.top < "u" && (this.domNode.style.top = t.top + "px"), typeof t.left < "u" && (this.domNode.style.left = t.left + "px"), typeof t.bottom < "u" && (this.domNode.style.bottom = t.bottom + "px"), typeof t.right < "u" && (this.domNode.style.right = t.right + "px"), this._pointerMoveMonitor = this._register(new ct3()), this._register(Yr(this.bgDomNode, ae3.POINTER_DOWN, (i5) => this._arrowPointerDown(i5))), this._register(Yr(this.domNode, ae3.POINTER_DOWN, (i5) => this._arrowPointerDown(i5))), this._pointerdownRepeatTimer = this._register(new Ti()), this._pointerdownScheduleRepeatTimer = this._register(new Ne3());\n    }\n    _arrowPointerDown(t) {\n      if (!t.target || !(t.target instanceof Element)) return;\n      let e = () => {\n        this._pointerdownRepeatTimer.cancelAndSet(() => this._handleActivate(), 1e3 / 24, oe3(t));\n      };\n      this._handleActivate(), this._pointerdownRepeatTimer.cancel(), this._pointerdownScheduleRepeatTimer.cancelAndSet(e, 200), this._pointerMoveMonitor.startMonitoring(t.target, t.pointerId, t.buttons, (i5) => {\n      }, () => {\n        this._pointerdownRepeatTimer.cancel(), this._pointerdownScheduleRepeatTimer.cancel();\n      }), t.preventDefault();\n    }\n  };\n  var v5 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (t, e, i5) => {\n        if (this._disposed) return y4(() => {\n        });\n        let r = { fn: t, thisArgs: e };\n        this._listeners.push(r);\n        let s4 = y4(() => {\n          let o2 = this._listeners.indexOf(r);\n          o2 !== -1 && this._listeners.splice(o2, 1);\n        });\n        return i5 && (Array.isArray(i5) ? i5.push(s4) : i5.add(s4)), s4;\n      }, this._event);\n    }\n    fire(t) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: e, thisArgs: i5 } = this._listeners[0];\n          e.call(i5, t);\n          return;\n        }\n        default: {\n          let e = this._listeners.slice();\n          for (let { fn: i5, thisArgs: r } of e) i5.call(r, t);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var X2;\n  ((r) => {\n    function n11(s4, o2) {\n      return s4((a2) => o2.fire(a2));\n    }\n    r.forward = n11;\n    function t(s4, o2) {\n      return (a2, l4, h3) => s4((d3) => a2.call(l4, o2(d3)), void 0, h3);\n    }\n    r.map = t;\n    function e(...s4) {\n      return (o2, a2, l4) => {\n        let h3 = new we2();\n        for (let d3 of s4) h3.add(d3((c2) => o2.call(a2, c2)));\n        return l4 && (Array.isArray(l4) ? l4.push(h3) : l4.add(h3)), h3;\n      };\n    }\n    r.any = e;\n    function i5(s4, o2, a2) {\n      return o2(a2), s4((l4) => o2(l4));\n    }\n    r.runAndSubscribe = i5;\n  })(X2 ||= {});\n  var ts = class n5 {\n    constructor(t, e, i5, r, s4, o2, a2) {\n      this._forceIntegerValues = t;\n      this._scrollStateBrand = void 0;\n      this._forceIntegerValues && (e = e | 0, i5 = i5 | 0, r = r | 0, s4 = s4 | 0, o2 = o2 | 0, a2 = a2 | 0), this.rawScrollLeft = r, this.rawScrollTop = a2, e < 0 && (e = 0), r + e > i5 && (r = i5 - e), r < 0 && (r = 0), s4 < 0 && (s4 = 0), a2 + s4 > o2 && (a2 = o2 - s4), a2 < 0 && (a2 = 0), this.width = e, this.scrollWidth = i5, this.scrollLeft = r, this.height = s4, this.scrollHeight = o2, this.scrollTop = a2;\n    }\n    equals(t) {\n      return this.rawScrollLeft === t.rawScrollLeft && this.rawScrollTop === t.rawScrollTop && this.width === t.width && this.scrollWidth === t.scrollWidth && this.scrollLeft === t.scrollLeft && this.height === t.height && this.scrollHeight === t.scrollHeight && this.scrollTop === t.scrollTop;\n    }\n    withScrollDimensions(t, e) {\n      return new n5(this._forceIntegerValues, typeof t.width < "u" ? t.width : this.width, typeof t.scrollWidth < "u" ? t.scrollWidth : this.scrollWidth, e ? this.rawScrollLeft : this.scrollLeft, typeof t.height < "u" ? t.height : this.height, typeof t.scrollHeight < "u" ? t.scrollHeight : this.scrollHeight, e ? this.rawScrollTop : this.scrollTop);\n    }\n    withScrollPosition(t) {\n      return new n5(this._forceIntegerValues, this.width, this.scrollWidth, typeof t.scrollLeft < "u" ? t.scrollLeft : this.rawScrollLeft, this.height, this.scrollHeight, typeof t.scrollTop < "u" ? t.scrollTop : this.rawScrollTop);\n    }\n    createScrollEvent(t, e) {\n      let i5 = this.width !== t.width, r = this.scrollWidth !== t.scrollWidth, s4 = this.scrollLeft !== t.scrollLeft, o2 = this.height !== t.height, a2 = this.scrollHeight !== t.scrollHeight, l4 = this.scrollTop !== t.scrollTop;\n      return { inSmoothScrolling: e, oldWidth: t.width, oldScrollWidth: t.scrollWidth, oldScrollLeft: t.scrollLeft, width: this.width, scrollWidth: this.scrollWidth, scrollLeft: this.scrollLeft, oldHeight: t.height, oldScrollHeight: t.scrollHeight, oldScrollTop: t.scrollTop, height: this.height, scrollHeight: this.scrollHeight, scrollTop: this.scrollTop, widthChanged: i5, scrollWidthChanged: r, scrollLeftChanged: s4, heightChanged: o2, scrollHeightChanged: a2, scrollTopChanged: l4 };\n    }\n  };\n  var ht2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._scrollableBrand = void 0;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this._smoothScrollDuration = e.smoothScrollDuration, this._scheduleAtNextAnimationFrame = e.scheduleAtNextAnimationFrame, this._state = new ts(e.forceIntegerValues, 0, 0, 0, 0, 0, 0), this._smoothScrolling = null;\n    }\n    dispose() {\n      this._smoothScrolling && (this._smoothScrolling.dispose(), this._smoothScrolling = null), super.dispose();\n    }\n    setSmoothScrollDuration(e) {\n      this._smoothScrollDuration = e;\n    }\n    validateScrollPosition(e) {\n      return this._state.withScrollPosition(e);\n    }\n    getScrollDimensions() {\n      return this._state;\n    }\n    setScrollDimensions(e, i5) {\n      let r = this._state.withScrollDimensions(e, i5);\n      this._setState(r, !!this._smoothScrolling), this._smoothScrolling?.acceptScrollDimensions(this._state);\n    }\n    getFutureScrollPosition() {\n      return this._smoothScrolling ? this._smoothScrolling.to : this._state;\n    }\n    getCurrentScrollPosition() {\n      return this._state;\n    }\n    setScrollPositionNow(e) {\n      let i5 = this._state.withScrollPosition(e);\n      this._smoothScrolling && (this._smoothScrolling.dispose(), this._smoothScrolling = null), this._setState(i5, false);\n    }\n    setScrollPositionSmooth(e, i5) {\n      if (this._smoothScrollDuration === 0) {\n        this.setScrollPositionNow(e);\n        return;\n      }\n      if (this._smoothScrolling) {\n        e = { scrollLeft: typeof e.scrollLeft > "u" ? this._smoothScrolling.to.scrollLeft : e.scrollLeft, scrollTop: typeof e.scrollTop > "u" ? this._smoothScrolling.to.scrollTop : e.scrollTop };\n        let r = this._state.withScrollPosition(e);\n        if (this._smoothScrolling.to.scrollLeft === r.scrollLeft && this._smoothScrolling.to.scrollTop === r.scrollTop) return;\n        let s4;\n        i5 ? s4 = new qt2(this._smoothScrolling.from, r, this._smoothScrolling.startTime, this._smoothScrolling.duration) : s4 = qt2.start(this._state, r, this._smoothScrollDuration), this._smoothScrolling.dispose(), this._smoothScrolling = s4;\n      } else {\n        let r = this._state.withScrollPosition(e);\n        this._smoothScrolling = qt2.start(this._state, r, this._smoothScrollDuration);\n      }\n      this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {\n        this._smoothScrolling && (this._smoothScrolling.animationFrameDisposable = null, this._performSmoothScrolling());\n      });\n    }\n    hasPendingScrollAnimation() {\n      return !!this._smoothScrolling;\n    }\n    _performSmoothScrolling() {\n      if (!this._smoothScrolling) return;\n      let e = this._smoothScrolling.tick(), i5 = this._state.withScrollPosition(e);\n      if (this._setState(i5, true), !!this._smoothScrolling) {\n        if (e.isDone) {\n          this._smoothScrolling.dispose(), this._smoothScrolling = null;\n          return;\n        }\n        this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {\n          this._smoothScrolling && (this._smoothScrolling.animationFrameDisposable = null, this._performSmoothScrolling());\n        });\n      }\n    }\n    _setState(e, i5) {\n      let r = this._state;\n      r.equals(e) || (this._state = e, this._onScroll.fire(this._state.createScrollEvent(r, i5)));\n    }\n  };\n  var Li = class {\n    constructor(t, e, i5) {\n      this.scrollLeft = t, this.scrollTop = e, this.isDone = i5;\n    }\n  };\n  function es(n11, t) {\n    let e = t - n11;\n    return function(i5) {\n      return n11 + e * lo(i5);\n    };\n  }\n  function oo(n11, t, e) {\n    return function(i5) {\n      return i5 < e ? n11(i5 / e) : t((i5 - e) / (1 - e));\n    };\n  }\n  var qt2 = class n6 {\n    constructor(t, e, i5, r) {\n      this.from = t, this.to = e, this.duration = r, this.startTime = i5, this.animationFrameDisposable = null, this._initAnimations();\n    }\n    _initAnimations() {\n      this._scrollLeft = this._initAnimation(this.from.scrollLeft, this.to.scrollLeft, this.to.width), this._scrollTop = this._initAnimation(this.from.scrollTop, this.to.scrollTop, this.to.height);\n    }\n    _initAnimation(t, e, i5) {\n      if (Math.abs(t - e) > 2.5 * i5) {\n        let s4, o2;\n        return t < e ? (s4 = t + 0.75 * i5, o2 = e - 0.75 * i5) : (s4 = t - 0.75 * i5, o2 = e + 0.75 * i5), oo(es(t, s4), es(o2, e), 0.33);\n      }\n      return es(t, e);\n    }\n    dispose() {\n      this.animationFrameDisposable !== null && (this.animationFrameDisposable.dispose(), this.animationFrameDisposable = null);\n    }\n    acceptScrollDimensions(t) {\n      this.to = t.withScrollPosition(this.to), this._initAnimations();\n    }\n    tick() {\n      return this._tick(Date.now());\n    }\n    _tick(t) {\n      let e = (t - this.startTime) / this.duration;\n      if (e < 1) {\n        let i5 = this._scrollLeft(e), r = this._scrollTop(e);\n        return new Li(i5, r, false);\n      }\n      return new Li(this.to.scrollLeft, this.to.scrollTop, true);\n    }\n    static start(t, e, i5) {\n      i5 = i5 + 10;\n      let r = Date.now() - 10;\n      return new n6(t, e, r, i5);\n    }\n  };\n  function ao(n11) {\n    return Math.pow(n11, 3);\n  }\n  function lo(n11) {\n    return 1 - ao(1 - n11);\n  }\n  var Ai = class extends g5 {\n    constructor(t, e, i5) {\n      super(), this._visibility = t, this._visibleClassName = e, this._invisibleClassName = i5, this._domNode = null, this._isVisible = false, this._isNeeded = false, this._rawShouldBeVisible = false, this._shouldBeVisible = false, this._revealTimer = this._register(new Ne3());\n    }\n    setVisibility(t) {\n      this._visibility !== t && (this._visibility = t, this._updateShouldBeVisible());\n    }\n    setShouldBeVisible(t) {\n      this._rawShouldBeVisible = t, this._updateShouldBeVisible();\n    }\n    _applyVisibilitySetting() {\n      return this._visibility === 2 ? false : this._visibility === 3 ? true : this._rawShouldBeVisible;\n    }\n    _updateShouldBeVisible() {\n      let t = this._applyVisibilitySetting();\n      this._shouldBeVisible !== t && (this._shouldBeVisible = t, this.ensureVisibility());\n    }\n    setIsNeeded(t) {\n      this._isNeeded !== t && (this._isNeeded = t, this.ensureVisibility());\n    }\n    setDomNode(t) {\n      this._domNode = t, this._domNode.setClassName(this._invisibleClassName), this.setShouldBeVisible(false);\n    }\n    ensureVisibility() {\n      if (!this._isNeeded) {\n        this._hide(false);\n        return;\n      }\n      this._shouldBeVisible ? this._reveal() : this._hide(true);\n    }\n    _reveal() {\n      this._isVisible || (this._isVisible = true, this._revealTimer.setIfNotSet(() => {\n        this._domNode?.setClassName(this._visibleClassName);\n      }, 0));\n    }\n    _hide(t) {\n      this._revealTimer.cancel(), this._isVisible && (this._isVisible = false, this._domNode?.setClassName(this._invisibleClassName + (t ? " xterm-fade" : "")));\n    }\n  };\n  var co = 140;\n  var dt2 = class extends Fe3 {\n    constructor(t) {\n      super(), this._lazyRender = t.lazyRender, this._host = t.host, this._scrollable = t.scrollable, this._scrollByPage = t.scrollByPage, this._scrollbarState = t.scrollbarState, this._visibilityController = this._register(new Ai(t.visibility, "xterm-visible xterm-scrollbar " + t.extraScrollbarClassName, "xterm-invisible xterm-scrollbar " + t.extraScrollbarClassName)), this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._pointerMoveMonitor = this._register(new ct3()), this._shouldRender = true, this.domNode = new Te3(document.createElement("div")), this.domNode.setAttribute("role", "presentation"), this.domNode.setAttribute("aria-hidden", "true"), this._visibilityController.setDomNode(this.domNode), this.domNode.setPosition("absolute"), this._register(C3(this.domNode.domNode, ae3.POINTER_DOWN, (e) => this._domNodePointerDown(e)));\n    }\n    _createArrow(t) {\n      let e = this._register(new Ri(t));\n      return this.domNode.domNode.appendChild(e.bgDomNode), this.domNode.domNode.appendChild(e.domNode), e;\n    }\n    _createSlider(t, e, i5, r) {\n      this.slider = new Te3(document.createElement("div")), this.slider.setClassName("xterm-slider"), this.slider.setPosition("absolute"), this.slider.setTop(t), this.slider.setLeft(e), typeof i5 == "number" && this.slider.setWidth(i5), typeof r == "number" && this.slider.setHeight(r), this.slider.setLayerHinting(true), this.slider.setContain("strict"), this.domNode.domNode.appendChild(this.slider.domNode), this._register(C3(this.slider.domNode, ae3.POINTER_DOWN, (s4) => {\n        s4.button === 0 && (s4.preventDefault(), this._sliderPointerDown(s4));\n      })), this._onclick(this.slider.domNode, (s4) => {\n        s4.leftButton && s4.stopPropagation();\n      });\n    }\n    _handleElementSize(t) {\n      return this._scrollbarState.setVisibleSize(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    _handleElementScrollSize(t) {\n      return this._scrollbarState.setScrollSize(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    _handleElementScrollPosition(t) {\n      return this._scrollbarState.setScrollPosition(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    beginReveal() {\n      this._visibilityController.setShouldBeVisible(true);\n    }\n    beginHide() {\n      this._visibilityController.setShouldBeVisible(false);\n    }\n    render() {\n      this._shouldRender && (this._shouldRender = false, this._renderDomNode(this._scrollbarState.getRectangleLargeSize(), this._scrollbarState.getRectangleSmallSize()), this._updateSlider(this._scrollbarState.getSliderSize(), this._scrollbarState.getArrowSize() + this._scrollbarState.getSliderPosition()));\n    }\n    _domNodePointerDown(t) {\n      t.target === this.domNode.domNode && this._handlePointerDown(t);\n    }\n    delegatePointerDown(t) {\n      let e = this.domNode.domNode.getClientRects()[0].top, i5 = e + this._scrollbarState.getSliderPosition(), r = e + this._scrollbarState.getSliderPosition() + this._scrollbarState.getSliderSize(), s4 = this._sliderPointerPosition(t);\n      i5 <= s4 && s4 <= r ? t.button === 0 && (t.preventDefault(), this._sliderPointerDown(t)) : this._handlePointerDown(t);\n    }\n    _handlePointerDown(t) {\n      let e, i5;\n      if (t.target === this.domNode.domNode && typeof t.offsetX == "number" && typeof t.offsetY == "number") e = t.offsetX, i5 = t.offsetY;\n      else {\n        let s4 = en(this.domNode.domNode);\n        e = t.pageX - s4.left, i5 = t.pageY - s4.top;\n      }\n      let r = this._pointerDownRelativePosition(e, i5);\n      this._setDesiredScrollPositionNow(this._scrollByPage ? this._scrollbarState.getDesiredScrollPositionFromOffsetPaged(r) : this._scrollbarState.getDesiredScrollPositionFromOffset(r)), t.button === 0 && (t.preventDefault(), this._sliderPointerDown(t));\n    }\n    _sliderPointerDown(t) {\n      if (!t.target || !(t.target instanceof Element)) return;\n      let e = this._sliderPointerPosition(t), i5 = this._sliderOrthogonalPointerPosition(t), r = this._scrollbarState.clone();\n      this.slider.toggleClassName("xterm-active", true), this._pointerMoveMonitor.startMonitoring(t.target, t.pointerId, t.buttons, (s4) => {\n        let o2 = this._sliderOrthogonalPointerPosition(s4), a2 = Math.abs(o2 - i5);\n        if (Ke3 && a2 > co) {\n          this._setDesiredScrollPositionNow(r.getScrollPosition());\n          return;\n        }\n        let h3 = this._sliderPointerPosition(s4) - e;\n        this._setDesiredScrollPositionNow(r.getDesiredScrollPositionFromDelta(h3));\n      }, () => {\n        this.slider.toggleClassName("xterm-active", false), this._host.handleDragEnd();\n      }), this._host.handleDragStart();\n    }\n    _setDesiredScrollPositionNow(t) {\n      let e = {};\n      this.writeScrollPosition(e, t), this._scrollable.setScrollPositionNow(e);\n    }\n    updateScrollbarSize(t) {\n      this._updateScrollbarSize(t), this._scrollbarState.setScrollbarSize(t), this._shouldRender = true, this._lazyRender || this.render();\n    }\n    isNeeded() {\n      return this._scrollbarState.isNeeded();\n    }\n  };\n  var ut3 = class n7 {\n    constructor(t, e, i5, r, s4, o2) {\n      this._scrollbarSize = Math.round(e), this._oppositeScrollbarSize = Math.round(i5), this._arrowSize = Math.round(t), this._visibleSize = r, this._scrollSize = s4, this._scrollPosition = o2, this._computedAvailableSize = 0, this._computedIsNeeded = false, this._computedSliderSize = 0, this._computedSliderRatio = 0, this._computedSliderPosition = 0, this._refreshComputedValues();\n    }\n    clone() {\n      return new n7(this._arrowSize, this._scrollbarSize, this._oppositeScrollbarSize, this._visibleSize, this._scrollSize, this._scrollPosition);\n    }\n    setVisibleSize(t) {\n      let e = Math.round(t);\n      return this._visibleSize !== e ? (this._visibleSize = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollSize(t) {\n      let e = Math.round(t);\n      return this._scrollSize !== e ? (this._scrollSize = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollPosition(t) {\n      let e = Math.round(t);\n      return this._scrollPosition !== e ? (this._scrollPosition = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollbarSize(t) {\n      this._scrollbarSize = Math.round(t);\n    }\n    setArrowSize(t) {\n      let e = Math.round(t);\n      this._arrowSize !== e && (this._arrowSize = e, this._refreshComputedValues());\n    }\n    setOppositeScrollbarSize(t) {\n      this._oppositeScrollbarSize = Math.round(t);\n    }\n    static _computeValues(t, e, i5, r, s4) {\n      let o2 = Math.max(0, i5 - t), a2 = Math.max(0, o2 - 2 * e), l4 = r > 0 && r > i5;\n      if (!l4) return { computedAvailableSize: Math.round(o2), computedIsNeeded: l4, computedSliderSize: Math.round(a2), computedSliderRatio: 0, computedSliderPosition: 0 };\n      let h3 = Math.round(Math.max(20, Math.floor(i5 * a2 / r))), d3 = (a2 - h3) / (r - i5), c2 = s4 * d3;\n      return { computedAvailableSize: Math.round(o2), computedIsNeeded: l4, computedSliderSize: Math.round(h3), computedSliderRatio: d3, computedSliderPosition: Math.round(c2) };\n    }\n    _refreshComputedValues() {\n      let t = n7._computeValues(this._oppositeScrollbarSize, this._arrowSize, this._visibleSize, this._scrollSize, this._scrollPosition);\n      this._computedAvailableSize = t.computedAvailableSize, this._computedIsNeeded = t.computedIsNeeded, this._computedSliderSize = t.computedSliderSize, this._computedSliderRatio = t.computedSliderRatio, this._computedSliderPosition = t.computedSliderPosition;\n    }\n    getArrowSize() {\n      return this._arrowSize;\n    }\n    getScrollPosition() {\n      return this._scrollPosition;\n    }\n    getRectangleLargeSize() {\n      return this._computedAvailableSize;\n    }\n    getRectangleSmallSize() {\n      return this._scrollbarSize;\n    }\n    isNeeded() {\n      return this._computedIsNeeded;\n    }\n    getSliderSize() {\n      return this._computedSliderSize;\n    }\n    getSliderPosition() {\n      return this._computedSliderPosition;\n    }\n    getDesiredScrollPositionFromOffset(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = t - this._arrowSize - this._computedSliderSize / 2;\n      return Math.round(e / this._computedSliderRatio);\n    }\n    getDesiredScrollPositionFromOffsetPaged(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = t - this._arrowSize, i5 = this._scrollPosition;\n      return e < this._computedSliderPosition ? i5 -= this._visibleSize : i5 += this._visibleSize, i5;\n    }\n    getDesiredScrollPositionFromDelta(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = this._computedSliderPosition + t;\n      return Math.round(e / this._computedSliderRatio);\n    }\n  };\n  var Pi = class extends dt2 {\n    constructor(t, e, i5) {\n      let r = t.getScrollDimensions(), s4 = t.getCurrentScrollPosition();\n      if (super({ lazyRender: e.lazyRender, host: i5, scrollbarState: new ut3(e.horizontalHasArrows ? e.horizontalScrollbarSize : 0, e.horizontal === 2 ? 0 : e.horizontalScrollbarSize, e.vertical === 2 ? 0 : e.verticalScrollbarSize, r.width, r.scrollWidth, s4.scrollLeft), visibility: e.horizontal, extraScrollbarClassName: "xterm-horizontal", scrollable: t, scrollByPage: e.scrollByPage }), e.horizontalHasArrows) throw new Error("horizontalHasArrows is not supported in xterm.js");\n      this._createSlider(Math.floor((e.horizontalScrollbarSize - e.horizontalSliderSize) / 2), 0, void 0, e.horizontalSliderSize);\n    }\n    _updateSlider(t, e) {\n      this.slider.setWidth(t), this.slider.setLeft(e);\n    }\n    _renderDomNode(t, e) {\n      this.domNode.setWidth(t), this.domNode.setHeight(e), this.domNode.setLeft(0), this.domNode.setBottom(0);\n    }\n    handleScroll(t) {\n      return this._shouldRender = this._handleElementScrollSize(t.scrollWidth) || this._shouldRender, this._shouldRender = this._handleElementScrollPosition(t.scrollLeft) || this._shouldRender, this._shouldRender = this._handleElementSize(t.width) || this._shouldRender, this._shouldRender;\n    }\n    _pointerDownRelativePosition(t, e) {\n      return t;\n    }\n    _sliderPointerPosition(t) {\n      return t.pageX;\n    }\n    _sliderOrthogonalPointerPosition(t) {\n      return t.pageY;\n    }\n    _updateScrollbarSize(t) {\n      this.slider.setHeight(t);\n    }\n    writeScrollPosition(t, e) {\n      t.scrollLeft = e;\n    }\n    updateOptions(t) {\n      this.updateScrollbarSize(t.horizontal === 2 ? 0 : t.horizontalScrollbarSize), this._scrollbarState.setOppositeScrollbarSize(t.vertical === 2 ? 0 : t.verticalScrollbarSize), this._visibilityController.setVisibility(t.horizontal), this._scrollByPage = t.scrollByPage;\n    }\n  };\n  var Mi = class extends dt2 {\n    constructor(e, i5, r) {\n      let s4 = e.getScrollDimensions(), o2 = e.getCurrentScrollPosition(), a2 = i5.verticalHasArrows;\n      super({ lazyRender: i5.lazyRender, host: r, scrollbarState: new ut3(a2 ? i5.verticalScrollbarSize : 0, i5.vertical === 2 ? 0 : i5.verticalScrollbarSize, 0, s4.height, s4.scrollHeight, o2.scrollTop), visibility: i5.vertical, extraScrollbarClassName: "xterm-vertical", scrollable: e, scrollByPage: i5.scrollByPage });\n      this._arrowScrollDelta = 0;\n      this._setArrows(a2, i5.verticalScrollbarSize), this._createSlider(0, Math.floor((i5.verticalScrollbarSize - i5.verticalSliderSize) / 2), i5.verticalSliderSize, void 0);\n    }\n    _updateSlider(e, i5) {\n      this.slider.setHeight(e), this.slider.setTop(i5);\n    }\n    _renderDomNode(e, i5) {\n      this.domNode.setWidth(i5), this.domNode.setHeight(e), this.domNode.setRight(0), this.domNode.setTop(0);\n    }\n    handleScroll(e) {\n      return this._shouldRender = this._handleElementScrollSize(e.scrollHeight) || this._shouldRender, this._shouldRender = this._handleElementScrollPosition(e.scrollTop) || this._shouldRender, this._shouldRender = this._handleElementSize(e.height) || this._shouldRender, this._shouldRender;\n    }\n    _pointerDownRelativePosition(e, i5) {\n      return i5;\n    }\n    _sliderPointerPosition(e) {\n      return e.pageY;\n    }\n    _sliderOrthogonalPointerPosition(e) {\n      return e.pageX;\n    }\n    _updateScrollbarSize(e) {\n      this.slider.setWidth(e);\n    }\n    writeScrollPosition(e, i5) {\n      e.scrollTop = i5;\n    }\n    _arrowScroll(e) {\n      let i5 = this._scrollable.getCurrentScrollPosition();\n      this._scrollable.setScrollPositionNow({ scrollTop: i5.scrollTop + e });\n    }\n    _setArrows(e, i5) {\n      if (this._arrowScrollDelta = i5, (!this._arrowUp || !this._arrowDown) && (this._arrowUp = this._createArrow({ className: "xterm-scra xterm-arrow-up", top: 0, left: 0, bgWidth: i5, bgHeight: i5, handleActivate: () => this._arrowScroll(-this._arrowScrollDelta) }), this._arrowDown = this._createArrow({ className: "xterm-scra xterm-arrow-down", bottom: 0, left: 0, bgWidth: i5, bgHeight: i5, handleActivate: () => this._arrowScroll(this._arrowScrollDelta) })), this._updateArrowSize(this._arrowUp, i5), this._updateArrowSize(this._arrowDown, i5), !this._arrowUp || !this._arrowDown) return;\n      let r = e ? "" : "none";\n      this._arrowUp.bgDomNode.style.display = r, this._arrowUp.domNode.style.display = r, this._arrowDown.bgDomNode.style.display = r, this._arrowDown.domNode.style.display = r;\n    }\n    _updateArrowSize(e, i5) {\n      e && (e.bgDomNode.style.width = `${i5}px`, e.bgDomNode.style.height = `${i5}px`, e.domNode.style.width = `${i5}px`, e.domNode.style.height = `${i5}px`);\n    }\n    updateOptions(e) {\n      let i5 = e.verticalHasArrows ? e.verticalScrollbarSize : 0;\n      this._scrollbarState.setArrowSize(i5), this._setArrows(e.verticalHasArrows, e.verticalScrollbarSize), this.updateScrollbarSize(e.vertical === 2 ? 0 : e.verticalScrollbarSize), this._scrollbarState.setOppositeScrollbarSize(0), this._visibilityController.setVisibility(e.vertical), this._scrollByPage = e.scrollByPage;\n    }\n  };\n  var ho = 500;\n  var sn = 50;\n  var is = class {\n    constructor(t, e, i5) {\n      this.timestamp = t, this.deltaX = e, this.deltaY = i5, this.score = 0;\n    }\n  };\n  var Oi = class Oi2 {\n    constructor() {\n      this._capacity = 5, this._memory = [], this._front = -1, this._rear = -1;\n    }\n    isPhysicalMouseWheel() {\n      if (this._front === -1 && this._rear === -1) return false;\n      let t = 1, e = 0, i5 = 1, r = this._rear;\n      for (; r !== -1; ) {\n        let s4 = r === this._front ? t : Math.pow(2, -i5);\n        if (t -= s4, e += this._memory[r].score * s4, r === this._front) break;\n        r = (this._capacity + r - 1) % this._capacity, i5++;\n      }\n      return e <= 0.5;\n    }\n    acceptStandardWheelEvent(t) {\n      if (Gt2) {\n        let e = oe3(t.browserEvent), i5 = Zr(e);\n        this.accept(Date.now(), t.deltaX * i5, t.deltaY * i5);\n      } else this.accept(Date.now(), t.deltaX, t.deltaY);\n    }\n    accept(t, e, i5) {\n      let r = null, s4 = new is(t, e, i5);\n      this._front === -1 && this._rear === -1 ? (this._memory[0] = s4, this._front = 0, this._rear = 0) : (r = this._memory[this._rear], this._rear = (this._rear + 1) % this._capacity, this._rear === this._front && (this._front = (this._front + 1) % this._capacity), this._memory[this._rear] = s4), s4.score = this._computeScore(s4, r);\n    }\n    _computeScore(t, e) {\n      if (Math.abs(t.deltaX) > 0 && Math.abs(t.deltaY) > 0) return 1;\n      let i5 = 0.5;\n      if ((!this._isAlmostInt(t.deltaX) || !this._isAlmostInt(t.deltaY)) && (i5 += 0.25), e) {\n        let r = Math.abs(t.deltaX), s4 = Math.abs(t.deltaY), o2 = Math.abs(e.deltaX), a2 = Math.abs(e.deltaY), l4 = Math.max(Math.min(r, o2), 1), h3 = Math.max(Math.min(s4, a2), 1), d3 = Math.max(r, o2), c2 = Math.max(s4, a2);\n        d3 % l4 === 0 && c2 % h3 === 0 && (i5 -= 0.5);\n      }\n      return Math.min(Math.max(i5, 0), 1);\n    }\n    _isAlmostInt(t) {\n      return Math.abs(Math.round(t) - t) < 0.01;\n    }\n  };\n  Oi.INSTANCE = new Oi();\n  var rs = Oi;\n  var Bi = class extends Fe3 {\n    constructor(e, i5, r) {\n      super();\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      i5 = i5 ?? {};\n      let s4, o2 = !r;\n      r ? s4 = r : (i5.mouseWheelSmoothScroll = false, s4 = new ht2({ forceIntegerValues: true, smoothScrollDuration: 0, scheduleAtNextAnimationFrame: (l4) => rt3(oe3(e), l4) })), this._options = uo(i5), this._scrollable = s4, this._register(this._scrollable.onScroll((l4) => {\n        this._handleScroll(l4), this._onScroll.fire(l4);\n      })), o2 && this._register(this._scrollable);\n      let a2 = { handleMouseWheel: (l4) => this._handleMouseWheel(l4), handleDragStart: () => this._handleDragStart(), handleDragEnd: () => this._handleDragEnd() };\n      this._verticalScrollbar = this._register(new Mi(this._scrollable, this._options, a2)), this._horizontalScrollbar = this._register(new Pi(this._scrollable, this._options, a2)), this._domNode = document.createElement("div"), this._domNode.className = "xterm-scrollable-element " + this._options.className, this._domNode.setAttribute("role", "presentation"), this._domNode.style.position = "relative", this._domNode.appendChild(e), this._domNode.appendChild(this._horizontalScrollbar.domNode.domNode), this._domNode.appendChild(this._verticalScrollbar.domNode.domNode), this._options.useShadows ? (this._leftShadowDomNode = new Te3(document.createElement("div")), this._leftShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._leftShadowDomNode.domNode), this._topShadowDomNode = new Te3(document.createElement("div")), this._topShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._topShadowDomNode.domNode), this._topLeftShadowDomNode = new Te3(document.createElement("div")), this._topLeftShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._topLeftShadowDomNode.domNode)) : (this._leftShadowDomNode = null, this._topShadowDomNode = null, this._topLeftShadowDomNode = null), this._listenOnDomNode = this._options.listenOnDomNode ?? this._domNode, this._mouseWheelToDispose = [], this._setListeningToMouseWheel(this._options.handleMouseWheel), this._onmouseover(this._listenOnDomNode, (l4) => this._handleMouseOver(l4)), this._onmouseleave(this._listenOnDomNode, (l4) => this._handleMouseLeave(l4)), this._hideTimeout = this._register(new Ne3()), this._isDragging = false, this._mouseIsOver = false, this._shouldRender = true, this._revealOnScroll = true;\n    }\n    get options() {\n      return this._options;\n    }\n    dispose() {\n      this._mouseWheelToDispose = Oe2(this._mouseWheelToDispose), super.dispose();\n    }\n    getDomNode() {\n      return this._domNode;\n    }\n    getScrollDimensions() {\n      return this._scrollable.getScrollDimensions();\n    }\n    setScrollDimensions(e) {\n      this._scrollable.setScrollDimensions(e, false);\n    }\n    setScrollPosition(e) {\n      e.reuseAnimation ? this._scrollable.setScrollPositionSmooth(e, e.reuseAnimation) : this._scrollable.setScrollPositionNow(e);\n    }\n    getScrollPosition() {\n      return this._scrollable.getCurrentScrollPosition();\n    }\n    updateClassName(e) {\n      this._options.className = e, ee3 && (this._options.className += " xterm-mac"), this._domNode.className = "xterm-scrollable-element " + this._options.className;\n    }\n    updateOptions(e) {\n      typeof e.handleMouseWheel < "u" && (this._options.handleMouseWheel = e.handleMouseWheel, this._setListeningToMouseWheel(this._options.handleMouseWheel)), typeof e.mouseWheelScrollSensitivity < "u" && (this._options.mouseWheelScrollSensitivity = e.mouseWheelScrollSensitivity), typeof e.fastScrollSensitivity < "u" && (this._options.fastScrollSensitivity = e.fastScrollSensitivity), typeof e.scrollPredominantAxis < "u" && (this._options.scrollPredominantAxis = e.scrollPredominantAxis), typeof e.horizontal < "u" && (this._options.horizontal = e.horizontal), typeof e.vertical < "u" && (this._options.vertical = e.vertical), typeof e.horizontalHasArrows < "u" && (this._options.horizontalHasArrows = e.horizontalHasArrows), typeof e.verticalHasArrows < "u" && (this._options.verticalHasArrows = e.verticalHasArrows), typeof e.horizontalScrollbarSize < "u" && (this._options.horizontalScrollbarSize = e.horizontalScrollbarSize), typeof e.verticalScrollbarSize < "u" && (this._options.verticalScrollbarSize = e.verticalScrollbarSize), typeof e.scrollByPage < "u" && (this._options.scrollByPage = e.scrollByPage), this._horizontalScrollbar.updateOptions(this._options), this._verticalScrollbar.updateOptions(this._options), this._options.lazyRender || this._render();\n    }\n    delegateScrollFromMouseWheelEvent(e) {\n      this._handleMouseWheel(new Vt2(e));\n    }\n    _setListeningToMouseWheel(e) {\n      if (this._mouseWheelToDispose.length > 0 !== e && (this._mouseWheelToDispose = Oe2(this._mouseWheelToDispose), e)) {\n        let r = (s4) => {\n          this._handleMouseWheel(new Vt2(s4));\n        };\n        this._mouseWheelToDispose.push(C3(this._listenOnDomNode, ae3.MOUSE_WHEEL, r, { passive: false }));\n      }\n    }\n    _handleMouseWheel(e) {\n      if (e.browserEvent?.defaultPrevented) return;\n      let i5 = rs.INSTANCE;\n      i5.acceptStandardWheelEvent(e);\n      let r = false;\n      if (e.deltaY || e.deltaX) {\n        let o2 = e.deltaY * this._options.mouseWheelScrollSensitivity, a2 = e.deltaX * this._options.mouseWheelScrollSensitivity;\n        this._options.scrollPredominantAxis && (this._options.scrollYToX && a2 + o2 === 0 ? a2 = o2 = 0 : Math.abs(o2) >= Math.abs(a2) ? a2 = 0 : o2 = 0), this._options.flipAxes && ([o2, a2] = [a2, o2]);\n        let l4 = !ee3 && e.browserEvent && e.browserEvent.shiftKey;\n        (this._options.scrollYToX || l4) && !a2 && (a2 = o2, o2 = 0), e.browserEvent && e.browserEvent.altKey && (a2 = a2 * this._options.fastScrollSensitivity, o2 = o2 * this._options.fastScrollSensitivity);\n        let h3 = this._scrollable.getFutureScrollPosition(), d3 = {};\n        if (o2) {\n          let c2 = sn * o2, u3 = h3.scrollTop - (c2 < 0 ? Math.floor(c2) : Math.ceil(c2));\n          this._verticalScrollbar.writeScrollPosition(d3, u3);\n        }\n        if (a2) {\n          let c2 = sn * a2, u3 = h3.scrollLeft - (c2 < 0 ? Math.floor(c2) : Math.ceil(c2));\n          this._horizontalScrollbar.writeScrollPosition(d3, u3);\n        }\n        d3 = this._scrollable.validateScrollPosition(d3), (h3.scrollLeft !== d3.scrollLeft || h3.scrollTop !== d3.scrollTop) && (this._options.mouseWheelSmoothScroll && i5.isPhysicalMouseWheel() ? this._scrollable.setScrollPositionSmooth(d3) : this._scrollable.setScrollPositionNow(d3), r = true);\n      }\n      let s4 = r;\n      !s4 && this._options.alwaysConsumeMouseWheel && (s4 = true), !s4 && this._options.consumeMouseWheelIfScrollbarIsNeeded && (this._verticalScrollbar.isNeeded() || this._horizontalScrollbar.isNeeded()) && (s4 = true), s4 && (e.preventDefault(), e.stopPropagation());\n    }\n    _handleScroll(e) {\n      this._shouldRender = this._horizontalScrollbar.handleScroll(e) || this._shouldRender, this._shouldRender = this._verticalScrollbar.handleScroll(e) || this._shouldRender, this._options.useShadows && (this._shouldRender = true), this._revealOnScroll && this._reveal(), this._options.lazyRender || this._render();\n    }\n    renderNow() {\n      if (!this._options.lazyRender) throw new Error("Please use `lazyRender` together with `renderNow`!");\n      this._render();\n    }\n    _render() {\n      if (this._shouldRender && (this._shouldRender = false, this._horizontalScrollbar.render(), this._verticalScrollbar.render(), this._options.useShadows)) {\n        let e = this._scrollable.getCurrentScrollPosition(), i5 = e.scrollTop > 0, r = e.scrollLeft > 0, s4 = r ? " xterm-shadow-left" : "", o2 = i5 ? " xterm-shadow-top" : "", a2 = r || i5 ? " xterm-shadow-top-left-corner" : "";\n        this._leftShadowDomNode.setClassName(`xterm-shadow${s4}`), this._topShadowDomNode.setClassName(`xterm-shadow${o2}`), this._topLeftShadowDomNode.setClassName(`xterm-shadow${a2}${o2}${s4}`);\n      }\n    }\n    _handleDragStart() {\n      this._isDragging = true, this._reveal();\n    }\n    _handleDragEnd() {\n      this._isDragging = false, this._hide();\n    }\n    _handleMouseLeave(e) {\n      this._mouseIsOver = false, this._hide();\n    }\n    _handleMouseOver(e) {\n      this._mouseIsOver = true, this._reveal();\n    }\n    _reveal() {\n      this._verticalScrollbar.beginReveal(), this._horizontalScrollbar.beginReveal(), this._scheduleHide();\n    }\n    _hide() {\n      !this._mouseIsOver && !this._isDragging && (this._verticalScrollbar.beginHide(), this._horizontalScrollbar.beginHide());\n    }\n    _scheduleHide() {\n      !this._mouseIsOver && !this._isDragging && this._hideTimeout.cancelAndSet(() => this._hide(), ho);\n    }\n  };\n  function uo(n11) {\n    let t = { lazyRender: typeof n11.lazyRender < "u" ? n11.lazyRender : false, className: typeof n11.className < "u" ? n11.className : "", useShadows: typeof n11.useShadows < "u" ? n11.useShadows : true, handleMouseWheel: typeof n11.handleMouseWheel < "u" ? n11.handleMouseWheel : true, flipAxes: typeof n11.flipAxes < "u" ? n11.flipAxes : false, consumeMouseWheelIfScrollbarIsNeeded: typeof n11.consumeMouseWheelIfScrollbarIsNeeded < "u" ? n11.consumeMouseWheelIfScrollbarIsNeeded : false, alwaysConsumeMouseWheel: typeof n11.alwaysConsumeMouseWheel < "u" ? n11.alwaysConsumeMouseWheel : false, scrollYToX: typeof n11.scrollYToX < "u" ? n11.scrollYToX : false, mouseWheelScrollSensitivity: typeof n11.mouseWheelScrollSensitivity < "u" ? n11.mouseWheelScrollSensitivity : 1, fastScrollSensitivity: typeof n11.fastScrollSensitivity < "u" ? n11.fastScrollSensitivity : 5, scrollPredominantAxis: typeof n11.scrollPredominantAxis < "u" ? n11.scrollPredominantAxis : true, mouseWheelSmoothScroll: typeof n11.mouseWheelSmoothScroll < "u" ? n11.mouseWheelSmoothScroll : true, listenOnDomNode: typeof n11.listenOnDomNode < "u" ? n11.listenOnDomNode : null, horizontal: typeof n11.horizontal < "u" ? n11.horizontal : 1, horizontalScrollbarSize: typeof n11.horizontalScrollbarSize < "u" ? n11.horizontalScrollbarSize : 10, horizontalSliderSize: typeof n11.horizontalSliderSize < "u" ? n11.horizontalSliderSize : 0, horizontalHasArrows: typeof n11.horizontalHasArrows < "u" ? n11.horizontalHasArrows : false, vertical: typeof n11.vertical < "u" ? n11.vertical : 1, verticalScrollbarSize: typeof n11.verticalScrollbarSize < "u" ? n11.verticalScrollbarSize : 10, verticalHasArrows: typeof n11.verticalHasArrows < "u" ? n11.verticalHasArrows : false, verticalSliderSize: typeof n11.verticalSliderSize < "u" ? n11.verticalSliderSize : 0, scrollByPage: typeof n11.scrollByPage < "u" ? n11.scrollByPage : false };\n    return t.horizontalSliderSize = typeof n11.horizontalSliderSize < "u" ? n11.horizontalSliderSize : t.horizontalScrollbarSize, t.verticalSliderSize = typeof n11.verticalSliderSize < "u" ? n11.verticalSliderSize : t.verticalScrollbarSize, ee3 && (t.className += " xterm-mac"), t;\n  }\n  var ft3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      super();\n      this._bufferService = r;\n      this._coreService = o2;\n      this._optionsService = h3;\n      this._renderService = d3;\n      this._onRequestScrollLines = this._register(new v5());\n      this.onRequestScrollLines = this._onRequestScrollLines.event;\n      this._isSyncing = false;\n      this._isHandlingScroll = false;\n      this._suppressOnScrollHandler = false;\n      this._needsSyncOnRender = false;\n      let c2 = this._register(new ht2({ forceIntegerValues: false, smoothScrollDuration: this._optionsService.rawOptions.smoothScrollDuration, scheduleAtNextAnimationFrame: (u3) => rt3(s4.window, u3) }));\n      this._register(this._optionsService.onSpecificOptionChange("smoothScrollDuration", () => {\n        c2.setSmoothScrollDuration(this._optionsService.rawOptions.smoothScrollDuration);\n      })), this._scrollableElement = this._register(new Bi(i5, { vertical: 1, horizontal: 2, useShadows: false, mouseWheelSmoothScroll: true, verticalHasArrows: this._optionsService.rawOptions.scrollbar?.showArrows ?? false, ...this._getChangeOptions() }, c2)), this._register(this._optionsService.onMultipleOptionChange(["scrollSensitivity", "fastScrollSensitivity", "scrollbar"], () => this._scrollableElement.updateOptions(this._getChangeOptions()))), this._register(a2.onProtocolChange((u3) => {\n        this._scrollableElement.updateOptions({ handleMouseWheel: !(u3 & 16) });\n      })), this._scrollableElement.setScrollDimensions({ height: 0, scrollHeight: 0 }), this._register(X2.runAndSubscribe(l4.onChangeColors, () => {\n        e.style.backgroundColor = l4.colors.background.css, this._scrollableElement.getDomNode().style.backgroundColor = l4.colors.background.css;\n      })), e.appendChild(this._scrollableElement.getDomNode()), this._register(y4(() => this._scrollableElement.getDomNode().remove())), this._styleElement = s4.mainDocument.createElement("style"), i5.appendChild(this._styleElement), this._register(y4(() => this._styleElement.remove())), this._register(X2.runAndSubscribe(l4.onChangeColors, () => {\n        this._styleElement.textContent = [".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider {", `  background: ${l4.colors.scrollbarSliderBackground.css};`, "}", ".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider:hover {", `  background: ${l4.colors.scrollbarSliderHoverBackground.css};`, "}", ".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider.xterm-active {", `  background: ${l4.colors.scrollbarSliderActiveBackground.css};`, "}"].join(`\n`);\n      })), this._register(this._bufferService.onResize(() => this.queueSync())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._latestYDisp = void 0, this.queueSync();\n      })), this._register(this._bufferService.onScroll(() => this._sync())), this._register(this._renderService.onRender(() => {\n        this._needsSyncOnRender && (this._needsSyncOnRender = false, this._sync());\n      })), this._register(this._scrollableElement.onScroll((u3) => this._handleScroll(u3)));\n    }\n    scrollLines(e) {\n      let i5 = this._scrollableElement.getScrollPosition();\n      this._scrollableElement.setScrollPosition({ reuseAnimation: true, scrollTop: i5.scrollTop + e * this._renderService.dimensions.css.cell.height });\n    }\n    scrollToLine(e, i5) {\n      i5 && (this._latestYDisp = e), this._scrollableElement.setScrollPosition({ reuseAnimation: !i5, scrollTop: e * this._renderService.dimensions.css.cell.height });\n    }\n    _getChangeOptions() {\n      let e = this._optionsService.rawOptions.scrollbar?.showScrollbar ?? true, i5 = this._optionsService.rawOptions.scrollbar?.showArrows ?? false, r = e ? this._optionsService.rawOptions.scrollbar?.width ?? 14 : 0;\n      return { mouseWheelScrollSensitivity: this._optionsService.rawOptions.scrollSensitivity, fastScrollSensitivity: this._optionsService.rawOptions.fastScrollSensitivity, vertical: e ? 1 : 2, verticalScrollbarSize: r, verticalHasArrows: i5 };\n    }\n    queueSync(e) {\n      e !== void 0 && (this._latestYDisp = e), this._queuedAnimationFrame === void 0 && (this._queuedAnimationFrame = this._renderService.addRefreshCallback(() => {\n        this._queuedAnimationFrame = void 0, this._sync(this._latestYDisp);\n      }));\n    }\n    _sync(e = this._bufferService.buffer.ydisp) {\n      if (!(!this._renderService || this._isSyncing)) {\n        if (this._coreService.decPrivateModes.synchronizedOutput) {\n          this._needsSyncOnRender = true;\n          return;\n        }\n        this._isSyncing = true, this._suppressOnScrollHandler = true, this._scrollableElement.setScrollDimensions({ height: this._renderService.dimensions.css.canvas.height, scrollHeight: this._renderService.dimensions.css.cell.height * this._bufferService.buffer.lines.length }), this._suppressOnScrollHandler = false, e !== this._latestYDisp && this._scrollableElement.setScrollPosition({ scrollTop: e * this._renderService.dimensions.css.cell.height }), this._isSyncing = false;\n      }\n    }\n    _handleScroll(e) {\n      if (!this._renderService || this._isHandlingScroll || this._suppressOnScrollHandler) return;\n      this._isHandlingScroll = true;\n      let i5 = Math.round(e.scrollTop / this._renderService.dimensions.css.cell.height), r = i5 - this._bufferService.buffer.ydisp;\n      r !== 0 && (this._latestYDisp = i5, this._onRequestScrollLines.fire(r)), this._isHandlingScroll = false;\n    }\n    handleTouchScroll(e) {\n      let i5 = this._scrollableElement.getScrollPosition();\n      this._scrollableElement.setScrollPosition({ scrollTop: i5.scrollTop - e });\n    }\n  };\n  ft3 = E4([m3(2, L5), m3(3, z3), m3(4, Y), m3(5, et2), m3(6, _e2), m3(7, R3), m3(8, G4)], ft3);\n  var pt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2) {\n      super();\n      this._screenElement = e;\n      this._bufferService = i5;\n      this._coreBrowserService = r;\n      this._decorationService = s4;\n      this._renderService = o2;\n      this._decorationElements = /* @__PURE__ */ new Map();\n      this._altBufferIsActive = false;\n      this._dimensionsChanged = false;\n      this._container = document.createElement("div"), this._container.classList.add("xterm-decoration-container"), this._screenElement.appendChild(this._container), this._register(this._renderService.onRenderedViewportChange(() => this._doRefreshDecorations())), this._register(this._renderService.onDimensionsChange(() => {\n        this._dimensionsChanged = true, this._queueRefresh();\n      })), this._register(this._coreBrowserService.onDprChange(() => this._queueRefresh())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._altBufferIsActive = this._bufferService.buffer === this._bufferService.buffers.alt;\n      })), this._register(this._decorationService.onDecorationRegistered(() => this._queueRefresh())), this._register(this._decorationService.onDecorationRemoved((a2) => this._removeDecoration(a2))), this._register(y4(() => {\n        this._container.remove(), this._decorationElements.clear();\n      }));\n    }\n    _queueRefresh() {\n      this._animationFrame === void 0 && (this._animationFrame = this._renderService.addRefreshCallback(() => {\n        this._doRefreshDecorations(), this._animationFrame = void 0;\n      }));\n    }\n    _doRefreshDecorations() {\n      for (let e of this._decorationService.decorations) this._renderDecoration(e);\n      this._dimensionsChanged = false;\n    }\n    _renderDecoration(e) {\n      this._refreshStyle(e), this._dimensionsChanged && this._refreshXPosition(e);\n    }\n    _createElement(e) {\n      let i5 = this._coreBrowserService.mainDocument.createElement("div");\n      i5.classList.add("xterm-decoration"), i5.classList.toggle("xterm-decoration-top-layer", e?.options?.layer === "top"), i5.style.width = `${Math.round((e.options.width || 1) * this._renderService.dimensions.css.cell.width)}px`, i5.style.height = `${(e.options.height || 1) * this._renderService.dimensions.css.cell.height}px`, i5.style.top = `${(e.marker.line - this._bufferService.buffers.active.ydisp) * this._renderService.dimensions.css.cell.height}px`, i5.style.lineHeight = `${this._renderService.dimensions.css.cell.height}px`;\n      let r = e.options.x ?? 0;\n      return r && r > this._bufferService.cols && (i5.style.display = "none"), this._refreshXPosition(e, i5), i5;\n    }\n    _refreshStyle(e) {\n      let i5 = e.marker.line - this._bufferService.buffers.active.ydisp;\n      if (i5 < 0 || i5 >= this._bufferService.rows) e.element && (e.element.style.display = "none", e.onRenderEmitter.fire(e.element));\n      else {\n        let r = this._decorationElements.get(e);\n        r || (r = this._createElement(e), e.element = r, this._decorationElements.set(e, r), this._container.appendChild(r), e.onDispose(() => {\n          this._decorationElements.delete(e), r.remove();\n        })), r.style.display = this._altBufferIsActive ? "none" : "block", this._altBufferIsActive || (r.style.width = `${Math.round((e.options.width || 1) * this._renderService.dimensions.css.cell.width)}px`, r.style.height = `${(e.options.height || 1) * this._renderService.dimensions.css.cell.height}px`, r.style.top = `${i5 * this._renderService.dimensions.css.cell.height}px`, r.style.lineHeight = `${this._renderService.dimensions.css.cell.height}px`), e.onRenderEmitter.fire(r);\n      }\n    }\n    _refreshXPosition(e, i5 = e.element) {\n      if (!i5) return;\n      let r = e.options.x ?? 0;\n      (e.options.anchor || "left") === "right" ? i5.style.right = r ? `${r * this._renderService.dimensions.css.cell.width}px` : "" : i5.style.left = r ? `${r * this._renderService.dimensions.css.cell.width}px` : "";\n    }\n    _removeDecoration(e) {\n      this._decorationElements.get(e)?.remove(), this._decorationElements.delete(e), e.dispose();\n    }\n  };\n  pt3 = E4([m3(1, L5), m3(2, z3), m3(3, Ie2), m3(4, G4)], pt3);\n  var Ni = class {\n    constructor() {\n      this._zones = [];\n      this._zonePool = [];\n      this._zonePoolIndex = 0;\n      this._linePadding = { full: 0, left: 0, center: 0, right: 0 };\n    }\n    get zones() {\n      return this._zonePool.length = Math.min(this._zonePool.length, this._zones.length), this._zones;\n    }\n    clear() {\n      this._zones.length = 0, this._zonePoolIndex = 0;\n    }\n    addDecoration(t) {\n      if (t.options.overviewRulerOptions) {\n        for (let e of this._zones) if (e.color === t.options.overviewRulerOptions.color && e.position === t.options.overviewRulerOptions.position) {\n          if (this._lineIntersectsZone(e, t.marker.line)) return;\n          if (this._lineAdjacentToZone(e, t.marker.line, t.options.overviewRulerOptions.position)) {\n            this._addLineToZone(e, t.marker.line);\n            return;\n          }\n        }\n        if (this._zonePoolIndex < this._zonePool.length) {\n          this._zonePool[this._zonePoolIndex].color = t.options.overviewRulerOptions.color, this._zonePool[this._zonePoolIndex].position = t.options.overviewRulerOptions.position, this._zonePool[this._zonePoolIndex].startBufferLine = t.marker.line, this._zonePool[this._zonePoolIndex].endBufferLine = t.marker.line, this._zones.push(this._zonePool[this._zonePoolIndex++]);\n          return;\n        }\n        this._zones.push({ color: t.options.overviewRulerOptions.color, position: t.options.overviewRulerOptions.position, startBufferLine: t.marker.line, endBufferLine: t.marker.line }), this._zonePool.push(this._zones[this._zones.length - 1]), this._zonePoolIndex++;\n      }\n    }\n    setPadding(t) {\n      this._linePadding = t;\n    }\n    _lineIntersectsZone(t, e) {\n      return e >= t.startBufferLine && e <= t.endBufferLine;\n    }\n    _lineAdjacentToZone(t, e, i5) {\n      return e >= t.startBufferLine - this._linePadding[i5 || "full"] && e <= t.endBufferLine + this._linePadding[i5 || "full"];\n    }\n    _addLineToZone(t, e) {\n      t.startBufferLine = Math.min(t.startBufferLine, e), t.endBufferLine = Math.max(t.endBufferLine, e);\n    }\n  };\n  var Ce2 = { full: 0, left: 0, center: 0, right: 0 };\n  var He2 = { full: 0, left: 0, center: 0, right: 0 };\n  var Yt2 = { full: 0, left: 0, center: 0, right: 0 };\n  var Ge4 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3) {\n      super();\n      this._viewportElement = e;\n      this._screenElement = i5;\n      this._bufferService = r;\n      this._decorationService = s4;\n      this._renderService = o2;\n      this._optionsService = a2;\n      this._themeService = l4;\n      this._coreBrowserService = h3;\n      this._colorZoneStore = new Ni();\n      this._shouldUpdateDimensions = true;\n      this._shouldUpdateAnchor = true;\n      this._lastKnownBufferLength = 0;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas"), this._canvas.classList.add("xterm-decoration-overview-ruler"), this._refreshCanvasDimensions(), this._viewportElement.parentElement?.insertBefore(this._canvas, this._viewportElement), this._register(y4(() => this._canvas?.remove()));\n      let d3 = this._canvas.getContext("2d");\n      if (d3) this._ctx = d3;\n      else throw new Error("Ctx cannot be null");\n      this._register(this._decorationService.onDecorationRegistered(() => this._queueRefresh(void 0, true))), this._register(this._decorationService.onDecorationRemoved(() => this._queueRefresh(void 0, true))), this._register(this._renderService.onRenderedViewportChange(() => this._queueRefresh())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._canvas.style.display = this._bufferService.buffer === this._bufferService.buffers.alt ? "none" : "block";\n      })), this._register(this._bufferService.onScroll(() => {\n        this._lastKnownBufferLength !== this._bufferService.buffers.normal.lines.length && (this._refreshDrawHeightConstants(), this._refreshColorZonePadding());\n      })), this._register(this._renderService.onDimensionsChange(() => this._queueRefresh(true))), this._register(this._coreBrowserService.onDprChange(() => this._queueRefresh(true))), this._register(this._optionsService.onSpecificOptionChange("scrollbar", () => this._queueRefresh(true))), this._register(this._themeService.onChangeColors(() => this._queueRefresh())), this._register(y4(() => {\n        this._animationFrame !== void 0 && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0);\n      })), this._queueRefresh(true);\n    }\n    get _width() {\n      let e = this._optionsService.rawOptions.scrollbar;\n      return e?.showScrollbar ?? true ? e?.width ?? 0 : 0;\n    }\n    _refreshDrawConstants() {\n      let e = Math.floor((this._canvas.width - 1) / 3), i5 = Math.ceil((this._canvas.width - 1) / 3);\n      He2.full = this._canvas.width, He2.left = e, He2.center = i5, He2.right = e, this._refreshDrawHeightConstants(), Yt2.full = 1, Yt2.left = 1, Yt2.center = 1 + He2.left, Yt2.right = 1 + He2.left + He2.center;\n    }\n    _refreshDrawHeightConstants() {\n      Ce2.full = Math.round(2 * this._coreBrowserService.dpr);\n      let e = this._canvas.height / this._bufferService.buffer.lines.length, i5 = Math.round(Math.max(Math.min(e, 12), 6) * this._coreBrowserService.dpr);\n      Ce2.left = i5, Ce2.center = i5, Ce2.right = i5;\n    }\n    _refreshColorZonePadding() {\n      this._colorZoneStore.setPadding({ full: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.full), left: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.left), center: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.center), right: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.right) }), this._lastKnownBufferLength = this._bufferService.buffers.normal.lines.length;\n    }\n    _refreshCanvasDimensions() {\n      if (this._store.isDisposed || !this._renderService.hasRenderer()) return;\n      let e = this._renderService.dimensions.css.canvas.height, i5 = this._renderService.dimensions.device.canvas.height;\n      this._canvas.style.width = `${this._width}px`, this._canvas.width = Math.round(this._width * this._coreBrowserService.dpr), this._canvas.style.height = `${e}px`, this._canvas.height = i5, this._refreshDrawConstants(), this._refreshColorZonePadding();\n    }\n    _refreshDecorations() {\n      if (this._store.isDisposed || !this._renderService.hasRenderer()) return;\n      this._shouldUpdateDimensions && this._refreshCanvasDimensions(), this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height), this._colorZoneStore.clear();\n      for (let i5 of this._decorationService.decorations) this._colorZoneStore.addDecoration(i5);\n      this._ctx.lineWidth = 1, this._renderRulerOutline();\n      let e = this._colorZoneStore.zones;\n      for (let i5 of e) i5.position !== "full" && this._renderColorZone(i5);\n      for (let i5 of e) i5.position === "full" && this._renderColorZone(i5);\n      this._shouldUpdateDimensions = false, this._shouldUpdateAnchor = false;\n    }\n    _renderRulerOutline() {\n      this._ctx.fillStyle = this._themeService.colors.overviewRulerBorder.css, this._ctx.fillRect(0, 0, 1, this._canvas.height), this._optionsService.rawOptions.scrollbar?.overviewRuler?.showTopBorder && this._ctx.fillRect(1, 0, this._canvas.width - 1, 1), this._optionsService.rawOptions.scrollbar?.overviewRuler?.showBottomBorder && this._ctx.fillRect(1, this._canvas.height - 1, this._canvas.width - 1, this._canvas.height);\n    }\n    _renderColorZone(e) {\n      this._ctx.fillStyle = e.color, this._ctx.fillRect(Yt2[e.position || "full"], Math.round((this._canvas.height - 1) * (e.startBufferLine / this._bufferService.buffers.active.lines.length) - Ce2[e.position || "full"] / 2), He2[e.position || "full"], Math.round((this._canvas.height - 1) * ((e.endBufferLine - e.startBufferLine) / this._bufferService.buffers.active.lines.length) + Ce2[e.position || "full"]));\n    }\n    _queueRefresh(e, i5) {\n      this._store.isDisposed || (this._shouldUpdateDimensions = e || this._shouldUpdateDimensions, this._shouldUpdateAnchor = i5 || this._shouldUpdateAnchor, this._animationFrame === void 0 && (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n        this._store.isDisposed || this._refreshDecorations(), this._animationFrame = void 0;\n      })));\n    }\n  };\n  Ge4 = E4([m3(2, L5), m3(3, Ie2), m3(4, G4), m3(5, R3), m3(6, _e2), m3(7, z3)], Ge4);\n  var _t2 = class {\n    constructor(t, e, i5, r, s4, o2) {\n      this._textarea = t;\n      this._compositionView = e;\n      this._bufferService = i5;\n      this._optionsService = r;\n      this._coreService = s4;\n      this._renderService = o2;\n      this._isComposing = false, this._isSendingComposition = false, this._compositionPosition = { start: 0, end: 0 }, this._compositionSuffix = "", this._dataAlreadySent = "";\n    }\n    get isComposing() {\n      return this._isComposing;\n    }\n    compositionstart() {\n      this._isComposing = true;\n      let t = this._textarea.selectionStart ?? this._textarea.value.length, e = this._textarea.selectionEnd ?? t;\n      this._compositionPosition.start = Math.min(t, e), this._compositionPosition.end = Math.max(t, e), this._compositionSuffix = this._textarea.value.substring(this._compositionPosition.end), this._compositionView.textContent = "", this._dataAlreadySent = "", this._compositionView.classList.add("active");\n    }\n    compositionupdate(t) {\n      this._compositionView.textContent = `\\u200E${t.data}\\u200E`, this.updateCompositionElements(), setTimeout(() => {\n        let e = this._textarea.selectionEnd ?? this._textarea.value.length;\n        this._compositionPosition.end = Math.max(this._compositionPosition.start, e);\n      }, 0);\n    }\n    compositionend() {\n      this._finalizeComposition(true);\n    }\n    keydown(t) {\n      if (this._isComposing || this._isSendingComposition) {\n        if (t.keyCode === 20 || t.keyCode === 229 || t.keyCode === 16 || t.keyCode === 17 || t.keyCode === 18) return false;\n        this._finalizeComposition(false);\n      }\n      return t.keyCode === 229 ? (this._handleAnyTextareaChanges(), false) : true;\n    }\n    _finalizeComposition(t) {\n      if (this._compositionView.classList.remove("active"), this._isComposing = false, t) {\n        let e = { start: this._compositionPosition.start, end: this._compositionPosition.end }, i5 = this._compositionSuffix;\n        this._isSendingComposition = true, setTimeout(() => {\n          if (this._isSendingComposition) {\n            this._isSendingComposition = false;\n            let r;\n            if (e.start += this._dataAlreadySent.length, this._isComposing) r = this._textarea.value.substring(e.start, this._compositionPosition.start);\n            else {\n              let s4 = this._textarea.value, o2 = i5.length > 0 && s4.endsWith(i5) ? s4.length - i5.length : s4.length;\n              r = s4.substring(e.start, Math.max(e.start, o2));\n            }\n            r.length > 0 && this._coreService.triggerDataEvent(r, true);\n          }\n        }, 0);\n      } else {\n        this._isSendingComposition = false;\n        let e = this._textarea.value.substring(this._compositionPosition.start, this._compositionPosition.end);\n        this._coreService.triggerDataEvent(e, true);\n      }\n    }\n    _handleAnyTextareaChanges() {\n      if (this._textareaChangeTimer) return;\n      let t = this._textarea.value;\n      this._textareaChangeTimer = window.setTimeout(() => {\n        if (this._textareaChangeTimer = void 0, !this._isComposing) {\n          let e = this._textarea.value, i5 = e.replace(t, "");\n          this._dataAlreadySent = i5, e.length > t.length ? this._coreService.triggerDataEvent(i5, true) : e.length < t.length ? this._coreService.triggerDataEvent("\\x7F", true) : e.length === t.length && e !== t && this._coreService.triggerDataEvent(e, true);\n        }\n      }, 0);\n    }\n    updateCompositionElements(t) {\n      if (this._isComposing) {\n        if (this._bufferService.buffer.isCursorInViewport) {\n          let e = Math.min(this._bufferService.buffer.x, this._bufferService.cols - 1), i5 = this._renderService.dimensions.css.cell.height, r = this._bufferService.buffer.y * this._renderService.dimensions.css.cell.height, s4 = e * this._renderService.dimensions.css.cell.width;\n          this._compositionView.style.left = s4 + "px", this._compositionView.style.top = r + "px", this._compositionView.style.height = i5 + "px", this._compositionView.style.lineHeight = i5 + "px", this._compositionView.style.fontFamily = this._optionsService.rawOptions.fontFamily, this._compositionView.style.fontSize = this._optionsService.rawOptions.fontSize + "px";\n          let o2 = this._bufferService.cols * this._renderService.dimensions.css.cell.width - s4;\n          this._compositionView.style.maxWidth = o2 + "px", this._compositionView.style.overflow = "hidden", this._compositionView.style.direction = "rtl";\n          let a2 = this._compositionView.getBoundingClientRect();\n          this._textarea.style.left = s4 + "px", this._textarea.style.top = r + "px", this._textarea.style.width = Math.max(a2.width, 1) + "px", this._textarea.style.height = Math.max(a2.height, 1) + "px", this._textarea.style.lineHeight = a2.height + "px";\n        }\n        t || setTimeout(() => this.updateCompositionElements(true), 0);\n      }\n    }\n  };\n  _t2 = E4([m3(2, L5), m3(3, R3), m3(4, Y), m3(5, G4)], _t2);\n  var Z4 = 0;\n  var J4 = 0;\n  var Q2 = 0;\n  var H4 = 0;\n  var ss = { css: "#00000000", rgba: 0 };\n  var B4;\n  ((i5) => {\n    function n11(r, s4, o2, a2) {\n      return a2 !== void 0 ? `#${Ve2(r)}${Ve2(s4)}${Ve2(o2)}${Ve2(a2)}` : `#${Ve2(r)}${Ve2(s4)}${Ve2(o2)}`;\n    }\n    i5.toCss = n11;\n    function t(r, s4, o2, a2 = 255) {\n      return (r << 24 | s4 << 16 | o2 << 8 | a2) >>> 0;\n    }\n    i5.toRgba = t;\n    function e(r, s4, o2, a2) {\n      return { css: i5.toCss(r, s4, o2, a2), rgba: i5.toRgba(r, s4, o2, a2) };\n    }\n    i5.toColor = e;\n  })(B4 ||= {});\n  var k4;\n  ((a2) => {\n    function n11(l4, h3) {\n      if (H4 = (h3.rgba & 255) / 255, H4 === 1) return { css: h3.css, rgba: h3.rgba };\n      let d3 = h3.rgba >> 24 & 255, c2 = h3.rgba >> 16 & 255, u3 = h3.rgba >> 8 & 255, _5 = l4.rgba >> 24 & 255, p3 = l4.rgba >> 16 & 255, b4 = l4.rgba >> 8 & 255;\n      Z4 = _5 + Math.round((d3 - _5) * H4), J4 = p3 + Math.round((c2 - p3) * H4), Q2 = b4 + Math.round((u3 - b4) * H4);\n      let f5 = B4.toCss(Z4, J4, Q2), S4 = B4.toRgba(Z4, J4, Q2);\n      return { css: f5, rgba: S4 };\n    }\n    a2.blend = n11;\n    function t(l4) {\n      return (l4.rgba & 255) === 255;\n    }\n    a2.isOpaque = t;\n    function e(l4, h3, d3) {\n      let c2 = Fi.ensureContrastRatio(l4.rgba, h3.rgba, d3);\n      if (c2) return B4.toColor(c2 >> 24 & 255, c2 >> 16 & 255, c2 >> 8 & 255);\n    }\n    a2.ensureContrastRatio = e;\n    function i5(l4) {\n      let h3 = (l4.rgba | 255) >>> 0;\n      return [Z4, J4, Q2] = Fi.toChannels(h3), { css: B4.toCss(Z4, J4, Q2), rgba: h3 };\n    }\n    a2.opaque = i5;\n    function r(l4, h3) {\n      return H4 = Math.round(h3 * 255), [Z4, J4, Q2] = Fi.toChannels(l4.rgba), { css: B4.toCss(Z4, J4, Q2, H4), rgba: B4.toRgba(Z4, J4, Q2, H4) };\n    }\n    a2.opacity = r;\n    function s4(l4, h3) {\n      return H4 = l4.rgba & 255, r(l4, H4 * h3 / 255);\n    }\n    a2.multiplyOpacity = s4;\n    function o2(l4) {\n      return [l4.rgba >> 24 & 255, l4.rgba >> 16 & 255, l4.rgba >> 8 & 255];\n    }\n    a2.toColorRGB = o2;\n  })(k4 ||= {});\n  var M3;\n  ((i5) => {\n    let n11, t;\n    try {\n      let r = document.createElement("canvas");\n      r.width = 1, r.height = 1;\n      let s4 = r.getContext("2d", { willReadFrequently: true });\n      s4 && (n11 = s4, n11.globalCompositeOperation = "copy", t = n11.createLinearGradient(0, 0, 1, 1));\n    } catch {\n    }\n    function e(r) {\n      if (r.match(/#[\\da-f]{3,8}/i)) switch (r.length) {\n        case 4:\n          return Z4 = parseInt(r.slice(1, 2).repeat(2), 16), J4 = parseInt(r.slice(2, 3).repeat(2), 16), Q2 = parseInt(r.slice(3, 4).repeat(2), 16), B4.toColor(Z4, J4, Q2);\n        case 5:\n          return Z4 = parseInt(r.slice(1, 2).repeat(2), 16), J4 = parseInt(r.slice(2, 3).repeat(2), 16), Q2 = parseInt(r.slice(3, 4).repeat(2), 16), H4 = parseInt(r.slice(4, 5).repeat(2), 16), B4.toColor(Z4, J4, Q2, H4);\n        case 7:\n          return { css: r, rgba: (parseInt(r.slice(1), 16) << 8 | 255) >>> 0 };\n        case 9:\n          return { css: r, rgba: parseInt(r.slice(1), 16) >>> 0 };\n      }\n      let s4 = r.match(/rgba?\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*(,\\s*(0|1|\\d?\\.(\\d+))\\s*)?\\)/);\n      if (s4) return Z4 = parseInt(s4[1]), J4 = parseInt(s4[2]), Q2 = parseInt(s4[3]), H4 = Math.round((s4[5] === void 0 ? 1 : parseFloat(s4[5])) * 255), B4.toColor(Z4, J4, Q2, H4);\n      if (r === "transparent") return { css: "transparent", rgba: 0 };\n      if (!n11 || !t) throw new Error("css.toColor: Unsupported css format");\n      if (n11.fillStyle = t, n11.fillStyle = r, typeof n11.fillStyle != "string") throw new Error("css.toColor: Unsupported css format");\n      if (n11.fillRect(0, 0, 1, 1), [Z4, J4, Q2, H4] = n11.getImageData(0, 0, 1, 1).data, H4 !== 255) throw new Error("css.toColor: Unsupported css format");\n      return { rgba: B4.toRgba(Z4, J4, Q2, H4), css: r };\n    }\n    i5.toColor = e;\n  })(M3 ||= {});\n  var j4;\n  ((e) => {\n    function n11(i5) {\n      return t(i5 >> 16 & 255, i5 >> 8 & 255, i5 & 255);\n    }\n    e.relativeLuminance = n11;\n    function t(i5, r, s4) {\n      let o2 = i5 / 255, a2 = r / 255, l4 = s4 / 255, h3 = o2 <= 0.03928 ? o2 / 12.92 : Math.pow((o2 + 0.055) / 1.055, 2.4), d3 = a2 <= 0.03928 ? a2 / 12.92 : Math.pow((a2 + 0.055) / 1.055, 2.4), c2 = l4 <= 0.03928 ? l4 / 12.92 : Math.pow((l4 + 0.055) / 1.055, 2.4);\n      return h3 * 0.2126 + d3 * 0.7152 + c2 * 0.0722;\n    }\n    e.relativeLuminance2 = t;\n  })(j4 ||= {});\n  var Fi;\n  ((s4) => {\n    function n11(o2, a2) {\n      if (H4 = (a2 & 255) / 255, H4 === 1) return a2;\n      let l4 = a2 >> 24 & 255, h3 = a2 >> 16 & 255, d3 = a2 >> 8 & 255, c2 = o2 >> 24 & 255, u3 = o2 >> 16 & 255, _5 = o2 >> 8 & 255;\n      return Z4 = c2 + Math.round((l4 - c2) * H4), J4 = u3 + Math.round((h3 - u3) * H4), Q2 = _5 + Math.round((d3 - _5) * H4), B4.toRgba(Z4, J4, Q2);\n    }\n    s4.blend = n11;\n    function t(o2, a2, l4) {\n      let h3 = j4.relativeLuminance(o2 >> 8), d3 = j4.relativeLuminance(a2 >> 8);\n      if (De4(h3, d3) < l4) {\n        if (d3 < h3) {\n          let p3 = e(o2, a2, l4), b4 = De4(h3, j4.relativeLuminance(p3 >> 8));\n          if (b4 < l4) {\n            let f5 = i5(o2, a2, l4), S4 = De4(h3, j4.relativeLuminance(f5 >> 8));\n            return b4 > S4 ? p3 : f5;\n          }\n          return p3;\n        }\n        let u3 = i5(o2, a2, l4), _5 = De4(h3, j4.relativeLuminance(u3 >> 8));\n        if (_5 < l4) {\n          let p3 = e(o2, a2, l4), b4 = De4(h3, j4.relativeLuminance(p3 >> 8));\n          return _5 > b4 ? u3 : p3;\n        }\n        return u3;\n      }\n    }\n    s4.ensureContrastRatio = t;\n    function e(o2, a2, l4) {\n      let h3 = o2 >> 24 & 255, d3 = o2 >> 16 & 255, c2 = o2 >> 8 & 255, u3 = a2 >> 24 & 255, _5 = a2 >> 16 & 255, p3 = a2 >> 8 & 255, b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      for (; b4 < l4 && (u3 > 0 || _5 > 0 || p3 > 0); ) u3 -= Math.max(0, Math.ceil(u3 * 0.1)), _5 -= Math.max(0, Math.ceil(_5 * 0.1)), p3 -= Math.max(0, Math.ceil(p3 * 0.1)), b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      return (u3 << 24 | _5 << 16 | p3 << 8 | 255) >>> 0;\n    }\n    s4.reduceLuminance = e;\n    function i5(o2, a2, l4) {\n      let h3 = o2 >> 24 & 255, d3 = o2 >> 16 & 255, c2 = o2 >> 8 & 255, u3 = a2 >> 24 & 255, _5 = a2 >> 16 & 255, p3 = a2 >> 8 & 255, b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      for (; b4 < l4 && (u3 < 255 || _5 < 255 || p3 < 255); ) u3 = Math.min(255, u3 + Math.ceil((255 - u3) * 0.1)), _5 = Math.min(255, _5 + Math.ceil((255 - _5) * 0.1)), p3 = Math.min(255, p3 + Math.ceil((255 - p3) * 0.1)), b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      return (u3 << 24 | _5 << 16 | p3 << 8 | 255) >>> 0;\n    }\n    s4.increaseLuminance = i5;\n    function r(o2) {\n      return [o2 >> 24 & 255, o2 >> 16 & 255, o2 >> 8 & 255, o2 & 255];\n    }\n    s4.toChannels = r;\n  })(Fi ||= {});\n  function Ve2(n11) {\n    let t = n11.toString(16);\n    return t.length < 2 ? "0" + t : t;\n  }\n  function De4(n11, t) {\n    return n11 < t ? (t + 0.05) / (n11 + 0.05) : (n11 + 0.05) / (t + 0.05);\n  }\n  var Hi = class extends fe2 {\n    constructor(e, i5, r) {\n      super();\n      this.content = 0;\n      this.combinedData = "";\n      this.fg = e.fg, this.bg = e.bg, this.combinedData = i5, this._width = r;\n    }\n    isCombined() {\n      return 2097152;\n    }\n    getWidth() {\n      return this._width;\n    }\n    getChars() {\n      return this.combinedData;\n    }\n    getCode() {\n      return 2097151;\n    }\n    setFromCharData(e) {\n      throw new Error("not implemented");\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n  };\n  var We3 = class {\n    constructor(t) {\n      this._bufferService = t;\n      this._characterJoiners = [];\n      this._nextCharacterJoinerId = 0;\n      this._workCell = new N2();\n    }\n    register(t) {\n      let e = { id: this._nextCharacterJoinerId++, handler: t };\n      return this._characterJoiners.push(e), e.id;\n    }\n    deregister(t) {\n      for (let e = 0; e < this._characterJoiners.length; e++) if (this._characterJoiners[e].id === t) return this._characterJoiners.splice(e, 1), true;\n      return false;\n    }\n    getJoinedCharacters(t) {\n      if (this._characterJoiners.length === 0) return [];\n      let e = this._bufferService.buffer.lines.get(t);\n      if (!e || e.length === 0) return [];\n      let i5 = [], r = e.translateToString(true), s4 = 0, o2 = 0, a2 = 0, l4 = e.getFg(0), h3 = e.getBg(0);\n      for (let d3 = 0; d3 < e.getTrimmedLength(); d3++) if (e.loadCell(d3, this._workCell), this._workCell.getWidth() !== 0) {\n        if (this._workCell.fg !== l4 || this._workCell.bg !== h3) {\n          if (d3 - s4 > 1) {\n            let c2 = this._getJoinedRanges(r, a2, o2, e, s4);\n            for (let u3 = 0; u3 < c2.length; u3++) i5.push(c2[u3]);\n          }\n          s4 = d3, a2 = o2, l4 = this._workCell.fg, h3 = this._workCell.bg;\n        }\n        o2 += this._workCell.getChars().length || " ".length;\n      }\n      if (this._bufferService.cols - s4 > 1) {\n        let d3 = this._getJoinedRanges(r, a2, o2, e, s4);\n        for (let c2 = 0; c2 < d3.length; c2++) i5.push(d3[c2]);\n      }\n      return i5;\n    }\n    _getJoinedRanges(t, e, i5, r, s4) {\n      let o2 = t.substring(e, i5), a2 = [];\n      try {\n        a2 = this._characterJoiners[0].handler(o2);\n      } catch (l4) {\n        console.error(l4);\n      }\n      for (let l4 = 1; l4 < this._characterJoiners.length; l4++) try {\n        let h3 = this._characterJoiners[l4].handler(o2);\n        for (let d3 = 0; d3 < h3.length; d3++) We3._mergeRanges(a2, h3[d3]);\n      } catch (h3) {\n        console.error(h3);\n      }\n      return this._stringRangesToCellRanges(a2, r, s4), a2;\n    }\n    _stringRangesToCellRanges(t, e, i5) {\n      let r = 0, s4 = false, o2 = 0, a2 = t[r];\n      if (a2) {\n        for (let l4 = i5; l4 < this._bufferService.cols; l4++) {\n          let h3 = e.getWidth(l4), d3 = e.getString(l4).length || " ".length;\n          if (h3 !== 0) {\n            if (!s4 && a2[0] <= o2 && (a2[0] = l4, s4 = true), a2[1] <= o2) {\n              if (a2[1] = l4, a2 = t[++r], !a2) break;\n              a2[0] <= o2 ? (a2[0] = l4, s4 = true) : s4 = false;\n            }\n            o2 += d3;\n          }\n        }\n        a2 && (a2[1] = this._bufferService.cols);\n      }\n    }\n    static _mergeRanges(t, e) {\n      let i5 = false;\n      for (let r = 0; r < t.length; r++) {\n        let s4 = t[r];\n        if (i5) {\n          if (e[1] <= s4[0]) return t[r - 1][1] = e[1], t;\n          if (e[1] <= s4[1]) return t[r - 1][1] = Math.max(e[1], s4[1]), t.splice(r, 1), t;\n          t.splice(r, 1), r--;\n        } else {\n          if (e[1] <= s4[0]) return t.splice(r, 0, e), t;\n          if (e[1] <= s4[1]) return s4[0] = Math.min(e[0], s4[0]), t;\n          e[0] < s4[1] && (s4[0] = Math.min(e[0], s4[0]), i5 = true);\n          continue;\n        }\n      }\n      return i5 ? t[t.length - 1][1] = e[1] : t.push(e), t;\n    }\n  };\n  We3 = E4([m3(0, L5)], We3);\n  function ns(n11) {\n    if (!n11) throw new Error("value must not be falsy");\n    return n11;\n  }\n  function fo(n11) {\n    return 57508 <= n11 && n11 <= 57558;\n  }\n  function po(n11) {\n    return 9472 <= n11 && n11 <= 9631;\n  }\n  function on(n11) {\n    return fo(n11) || po(n11);\n  }\n  function an() {\n    return { css: { canvas: Wi(), cell: Wi() }, device: { canvas: Wi(), cell: Wi(), char: { width: 0, height: 0, left: 0, top: 0 } } };\n  }\n  function Wi() {\n    return { width: 0, height: 0 };\n  }\n  var mt3 = class {\n    constructor(t, e, i5, r, s4, o2, a2) {\n      this._document = t;\n      this._characterJoinerService = e;\n      this._optionsService = i5;\n      this._coreBrowserService = r;\n      this._coreService = s4;\n      this._decorationService = o2;\n      this._themeService = a2;\n      this._workCell = new N2();\n      this._columnSelectMode = false;\n      this.defaultSpacing = 0;\n    }\n    handleSelectionChanged(t, e, i5) {\n      this._selectionStart = t, this._selectionEnd = e, this._columnSelectMode = i5;\n    }\n    createRow(t, e, i5, r, s4, o2, a2, l4, h3, d3, c2, u3, _5) {\n      let p3 = [];\n      _5 && (_5.hasBlinkingCells = false);\n      let b4 = this._characterJoinerService.getJoinedCharacters(e), f5 = this._themeService.colors, S4 = t.getNoBgTrimmedLength();\n      i5 && S4 < o2 + 1 && (S4 = o2 + 1);\n      let I4, w6 = 0, x5 = "", ie4 = 0, ce4 = 0, Os = 0, Ns = 0, Fs = false, Hs = 0, _i = false, Ft = 0, Ws = 0, O4 = [], qn2 = c2 !== -1 && u3 !== -1;\n      for (let ne3 = 0; ne3 < S4; ne3++) {\n        t.loadCell(ne3, this._workCell);\n        let Ar = this._workCell.getWidth();\n        if (Ar === 0) continue;\n        let mi = false, Ze4 = ne3 >= Ws, kr = ne3, T4 = this._workCell;\n        if (b4.length > 0 && ne3 === b4[0][0] && Ze4) {\n          let A4 = b4.shift(), Nr = this._isCellInSelection(A4[0], e);\n          for (ie4 = A4[0] + 1; ie4 < A4[1]; ie4++) Ze4 &&= Nr === this._isCellInSelection(ie4, e);\n          Ze4 &&= !i5 || o2 < A4[0] || o2 >= A4[1], Ze4 ? (mi = true, T4 = new Hi(this._workCell, t.translateToString(true, A4[0], A4[1]), A4[1] - A4[0]), kr = A4[1] - 1, Ar = T4.getWidth()) : Ws = A4[1];\n        }\n        let Ht2 = this._isCellInSelection(ne3, e), Pr = i5 && ne3 === o2, Mr = qn2 && ne3 >= c2 && ne3 <= u3;\n        _5 && T4.isBlink() && (_5.hasBlinkingCells = true), !l4 && T4.isBlink() && O4.push("xterm-blink-hidden");\n        let Br = false;\n        this._decorationService.forEachDecorationAtCell(ne3, e, void 0, (A4) => {\n          Br = true;\n        });\n        let bi = T4.getChars() || " ";\n        if (bi === " " && (T4.isUnderline() || T4.isOverline()) && (bi = "\\xA0"), Ft = Ar * h3 - d3.get(bi, T4.isBold(), T4.isItalic()), !I4) I4 = this._document.createElement("span");\n        else if (w6 && (Ht2 && _i || !Ht2 && !_i && T4.bg === ce4) && (Ht2 && _i && f5.selectionForeground || T4.fg === Os) && T4.extended.ext === Ns && Mr === Fs && Ft === Hs && !Pr && !mi && !Br && Ze4) {\n          T4.isInvisible() ? x5 += " " : x5 += bi, w6++;\n          continue;\n        } else w6 && (I4.textContent = x5), I4 = this._document.createElement("span"), w6 = 0, x5 = "";\n        if (ce4 = T4.bg, Os = T4.fg, Ns = T4.extended.ext, Fs = Mr, Hs = Ft, _i = Ht2, mi && o2 >= ne3 && o2 <= kr && (o2 = ne3), !this._coreService.isCursorHidden && Pr && this._coreService.isCursorInitialized) {\n          if (O4.push("xterm-cursor"), this._coreBrowserService.isFocused) a2 && O4.push("xterm-cursor-blink"), O4.push(r === "bar" ? "xterm-cursor-bar" : r === "underline" ? "xterm-cursor-underline" : "xterm-cursor-block");\n          else if (s4) switch (s4) {\n            case "outline":\n              O4.push("xterm-cursor-outline");\n              break;\n            case "block":\n              O4.push("xterm-cursor-block");\n              break;\n            case "bar":\n              O4.push("xterm-cursor-bar");\n              break;\n            case "underline":\n              O4.push("xterm-cursor-underline");\n              break;\n            default:\n              break;\n          }\n        }\n        if (T4.isBold() && O4.push("xterm-bold"), T4.isItalic() && O4.push("xterm-italic"), T4.isDim() && O4.push("xterm-dim"), T4.isInvisible() ? x5 = " " : x5 = T4.getChars() || " ", T4.isUnderline() && (O4.push(`xterm-underline-${T4.extended.underlineStyle}`), x5 === " " && (x5 = "\\xA0"), !T4.isUnderlineColorDefault())) if (T4.isUnderlineColorRGB()) I4.style.textDecorationColor = `rgb(${fe2.toColorRGB(T4.getUnderlineColor()).join(",")})`;\n        else {\n          let A4 = T4.getUnderlineColor();\n          this._optionsService.rawOptions.drawBoldTextInBrightColors && T4.isBold() && A4 < 8 && (A4 += 8), I4.style.textDecorationColor = f5.ansi[A4].css;\n        }\n        T4.isOverline() && (O4.push("xterm-overline"), x5 === " " && (x5 = "\\xA0")), T4.isStrikethrough() && O4.push("xterm-strikethrough"), Mr && (I4.style.textDecoration = "underline");\n        let ue2 = T4.getFgColor(), Wt2 = T4.getFgColorMode(), ge2 = T4.getBgColor(), Ut2 = T4.getBgColorMode(), Or = !!T4.isInverse();\n        if (Or) {\n          let A4 = ue2;\n          ue2 = ge2, ge2 = A4;\n          let Nr = Wt2;\n          Wt2 = Ut2, Ut2 = Nr;\n        }\n        let Ae3, vi, Kt2 = false;\n        this._decorationService.forEachDecorationAtCell(ne3, e, void 0, (A4) => {\n          A4.options.layer !== "top" && Kt2 || (A4.backgroundColorRGB && (Ut2 = 50331648, ge2 = A4.backgroundColorRGB.rgba >> 8 & 16777215, Ae3 = A4.backgroundColorRGB), A4.foregroundColorRGB && (Wt2 = 50331648, ue2 = A4.foregroundColorRGB.rgba >> 8 & 16777215, vi = A4.foregroundColorRGB), Kt2 = A4.options.layer === "top");\n        }), !Kt2 && Ht2 && (Ae3 = this._coreBrowserService.isFocused ? f5.selectionBackgroundOpaque : f5.selectionInactiveBackgroundOpaque, ge2 = Ae3.rgba >> 8 & 16777215, Ut2 = 50331648, Kt2 = true, f5.selectionForeground && (Wt2 = 50331648, ue2 = f5.selectionForeground.rgba >> 8 & 16777215, vi = f5.selectionForeground)), Kt2 && O4.push("xterm-decoration-top");\n        let ke3;\n        switch (Ut2) {\n          case 16777216:\n          case 33554432:\n            ke3 = f5.ansi[ge2], O4.push(`xterm-bg-${ge2}`);\n            break;\n          case 50331648:\n            ke3 = B4.toColor(ge2 >> 16, ge2 >> 8 & 255, ge2 & 255), this._addStyle(I4, `background-color:#${(ge2 >>> 0).toString(16).padStart(6, "0")}`);\n            break;\n          case 0:\n          default:\n            Or ? (ke3 = f5.foreground, O4.push(`xterm-bg-${257}`)) : ke3 = f5.background;\n        }\n        switch (Ae3 || T4.isDim() && (Ae3 = k4.multiplyOpacity(ke3, 0.5)), Wt2) {\n          case 16777216:\n          case 33554432:\n            T4.isBold() && ue2 < 8 && this._optionsService.rawOptions.drawBoldTextInBrightColors && (ue2 += 8), this._applyMinimumContrast(I4, ke3, f5.ansi[ue2], T4, Ae3, void 0) || O4.push(`xterm-fg-${ue2}`);\n            break;\n          case 50331648:\n            let A4 = B4.toColor(ue2 >> 16 & 255, ue2 >> 8 & 255, ue2 & 255);\n            this._applyMinimumContrast(I4, ke3, A4, T4, Ae3, vi) || this._addStyle(I4, `color:#${ue2.toString(16).padStart(6, "0")}`);\n            break;\n          case 0:\n          default:\n            this._applyMinimumContrast(I4, ke3, f5.foreground, T4, Ae3, vi) || Or && O4.push(`xterm-fg-${257}`);\n        }\n        O4.length && (I4.className = O4.join(" "), O4.length = 0), !Pr && !mi && !Br && Ze4 ? w6++ : I4.textContent = x5, Ft !== this.defaultSpacing && (I4.style.letterSpacing = `${Ft}px`), p3.push(I4), ne3 = kr;\n      }\n      return I4 && w6 && (I4.textContent = x5), p3;\n    }\n    _applyMinimumContrast(t, e, i5, r, s4, o2) {\n      if (this._optionsService.rawOptions.minimumContrastRatio === 1 || on(r.getCode())) return false;\n      let a2 = this._getContrastCache(r), l4;\n      if (!s4 && !o2 && (l4 = a2.getColor(e.rgba, i5.rgba)), l4 === void 0) {\n        let h3 = this._optionsService.rawOptions.minimumContrastRatio / (r.isDim() ? 2 : 1);\n        l4 = k4.ensureContrastRatio(s4 ?? e, o2 ?? i5, h3), a2.setColor((s4 ?? e).rgba, (o2 ?? i5).rgba, l4 ?? null);\n      }\n      return l4 ? (this._addStyle(t, `color:${l4.css}`), true) : false;\n    }\n    _getContrastCache(t) {\n      return t.isDim() ? this._themeService.colors.halfContrastCache : this._themeService.colors.contrastCache;\n    }\n    _addStyle(t, e) {\n      t.setAttribute("style", `${t.getAttribute("style") || ""}${e};`);\n    }\n    _isCellInSelection(t, e) {\n      let i5 = this._selectionStart, r = this._selectionEnd;\n      return !i5 || !r ? false : this._columnSelectMode ? i5[0] <= r[0] ? t >= i5[0] && e >= i5[1] && t < r[0] && e <= r[1] : t < i5[0] && e >= i5[1] && t >= r[0] && e <= r[1] : e > i5[1] && e < r[1] || i5[1] === r[1] && e === i5[1] && t >= i5[0] && t < r[0] || i5[1] < r[1] && e === r[1] && t < r[0] || i5[1] < r[1] && e === i5[1] && t >= i5[0];\n    }\n  };\n  mt3 = E4([m3(1, Ei), m3(2, R3), m3(3, z3), m3(4, Y), m3(5, Ie2), m3(6, _e2)], mt3);\n  var Ui = class {\n    constructor(t = () => new os()) {\n      this._flat = new Float32Array(256);\n      this._font = "";\n      this._fontSize = 0;\n      this._weight = "normal";\n      this._weightBold = "bold";\n      this._canvasElements = [];\n      this._canvasElements = [t(), t(), t(), t()], this.clear();\n    }\n    dispose() {\n      this._canvasElements.length = 0, this._holey = void 0;\n    }\n    clear() {\n      this._flat.fill(-9999), this._holey = /* @__PURE__ */ new Map();\n    }\n    setFont(t, e, i5, r) {\n      t === this._font && e === this._fontSize && i5 === this._weight && r === this._weightBold || (this._font = t, this._fontSize = e, this._weight = i5, this._weightBold = r, this._canvasElements[0].setFont(t, e, i5, false), this._canvasElements[1].setFont(t, e, r, false), this._canvasElements[2].setFont(t, e, i5, true), this._canvasElements[3].setFont(t, e, r, true), this.clear());\n    }\n    get(t, e, i5) {\n      let r = 0;\n      if (!e && !i5 && t.length === 1 && (r = t.charCodeAt(0)) < 256) {\n        if (this._flat[r] !== -9999) return this._flat[r];\n        let a2 = this._measure(t, 0);\n        return a2 > 0 && (this._flat[r] = a2), a2;\n      }\n      let s4 = t;\n      e && (s4 += "B"), i5 && (s4 += "I");\n      let o2 = this._holey.get(s4);\n      if (o2 === void 0) {\n        let a2 = 0;\n        e && (a2 |= 1), i5 && (a2 |= 2), o2 = this._measure(t, a2), o2 > 0 && this._holey.set(s4, o2);\n      }\n      return o2;\n    }\n    _measure(t, e) {\n      return this._canvasElements[e].measure(t);\n    }\n  };\n  var os = class {\n    constructor() {\n      typeof OffscreenCanvas < "u" ? (this._canvas = new OffscreenCanvas(1, 1), this._ctx = ns(this._canvas.getContext("2d"))) : (this._canvas = document.createElement("canvas"), this._canvas.width = 1, this._canvas.height = 1, this._ctx = ns(this._canvas.getContext("2d")));\n    }\n    setFont(t, e, i5, r) {\n      let s4 = r ? "italic" : "";\n      this._ctx.font = `${s4} ${i5} ${e}px ${t}`.trim();\n    }\n    measure(t) {\n      return this._ctx.measureText(t).width;\n    }\n  };\n  var as = class {\n    constructor() {\n      this.clear();\n    }\n    clear() {\n      this.hasSelection = false, this.columnSelectMode = false, this.viewportStartRow = 0, this.viewportEndRow = 0, this.viewportCappedStartRow = 0, this.viewportCappedEndRow = 0, this.startCol = 0, this.endCol = 0, this.selectionStart = void 0, this.selectionEnd = void 0;\n    }\n    update(t, e, i5, r = false) {\n      if (this.selectionStart = e, this.selectionEnd = i5, !e || !i5 || e[0] === i5[0] && e[1] === i5[1]) {\n        this.clear();\n        return;\n      }\n      let s4 = t.buffers.active.ydisp, o2 = e[1] - s4, a2 = i5[1] - s4, l4 = Math.max(o2, 0), h3 = Math.min(a2, t.rows - 1);\n      if (l4 >= t.rows || h3 < 0) {\n        this.clear();\n        return;\n      }\n      this.hasSelection = true, this.columnSelectMode = r, this.viewportStartRow = o2, this.viewportEndRow = a2, this.viewportCappedStartRow = l4, this.viewportCappedEndRow = h3, this.startCol = e[0], this.endCol = i5[0];\n    }\n    isCellSelected(t, e, i5) {\n      return this.hasSelection ? (i5 -= t.buffer.active.viewportY, this.columnSelectMode ? this.startCol <= this.endCol ? e >= this.startCol && i5 >= this.viewportCappedStartRow && e < this.endCol && i5 <= this.viewportCappedEndRow : e < this.startCol && i5 >= this.viewportCappedStartRow && e >= this.endCol && i5 <= this.viewportCappedEndRow : i5 > this.viewportStartRow && i5 < this.viewportEndRow || this.viewportStartRow === this.viewportEndRow && i5 === this.viewportStartRow && e >= this.startCol && e < this.endCol || this.viewportStartRow < this.viewportEndRow && i5 === this.viewportEndRow && e < this.endCol || this.viewportStartRow < this.viewportEndRow && i5 === this.viewportStartRow && e >= this.startCol) : false;\n    }\n  };\n  function ln() {\n    return new as();\n  }\n  var Ki = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._renderCallback = e;\n      this._coreBrowserService = i5;\n      this._optionsService = r;\n      this._intervalDuration = 0;\n      this._blinkOn = true;\n      this._needsBlinkInViewport = false;\n      this._isViewportVisible = true;\n      this._register(this._optionsService.onSpecificOptionChange("blinkIntervalDuration", (s4) => {\n        this.setIntervalDuration(s4);\n      })), this.setIntervalDuration(this._optionsService.rawOptions.blinkIntervalDuration), this._register(y4(() => this._clearInterval()));\n    }\n    get isBlinkOn() {\n      return this._blinkOn;\n    }\n    get isEnabled() {\n      return this._intervalDuration > 0;\n    }\n    setNeedsBlinkInViewport(e) {\n      this._needsBlinkInViewport !== e && (this._needsBlinkInViewport = e, this._updateIntervalState());\n    }\n    setViewportVisible(e) {\n      this._isViewportVisible !== e && (this._isViewportVisible = e, this._updateIntervalState());\n    }\n    setIntervalDuration(e) {\n      e !== this._intervalDuration && (this._intervalDuration = e, this._clearInterval(), this._updateIntervalState());\n    }\n    _updateIntervalState() {\n      if (this._intervalDuration > 0 && this._needsBlinkInViewport && this._isViewportVisible) {\n        if (this._interval !== void 0) return;\n        let i5 = this._blinkOn;\n        this._blinkOn = true, this._interval = this._coreBrowserService.window.setInterval(() => {\n          this._blinkOn = !this._blinkOn, this._renderCallback();\n        }, this._intervalDuration), i5 || this._renderCallback();\n        return;\n      }\n      this._clearInterval(), this._blinkOn || (this._blinkOn = true, this._renderCallback());\n    }\n    _clearInterval() {\n      this._interval !== void 0 && (this._coreBrowserService.window.clearInterval(this._interval), this._interval = void 0);\n    }\n  };\n  var ls = "xterm-dom-renderer-owner-";\n  var le2 = "xterm-rows";\n  var zi = "xterm-fg-";\n  var cn = "xterm-bg-";\n  var Xt2 = "xterm-focus";\n  var Gi = "xterm-selection";\n  var $i = "xterm-cursor-blink-idle";\n  var _o2 = 1;\n  var vt2 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3, c2, u3, _5, p3, b4) {\n      super();\n      this._terminal = e;\n      this._document = i5;\n      this._element = r;\n      this._screenElement = s4;\n      this._viewportElement = o2;\n      this._helperContainer = a2;\n      this._linkifier2 = l4;\n      this._charSizeService = d3;\n      this._optionsService = c2;\n      this._bufferService = u3;\n      this._coreService = _5;\n      this._coreBrowserService = p3;\n      this._themeService = b4;\n      this._terminalClass = _o2++;\n      this._rowElements = [];\n      this._selectionRenderModel = ln();\n      this._lastSelectionColumnMode = false;\n      this._rowHasBlinkingCells = [];\n      this._rowHasBlinkingCellsCount = 0;\n      this._onRequestRedraw = this._register(new v5());\n      this.onRequestRedraw = this._onRequestRedraw.event;\n      this._rowContainer = this._document.createElement("div"), this._rowContainer.classList.add(le2), this._rowContainer.style.lineHeight = "normal", this._rowContainer.setAttribute("aria-hidden", "true"), this._refreshRowElements(this._bufferService.cols, this._bufferService.rows), this._selectionContainer = this._document.createElement("div"), this._selectionContainer.classList.add(Gi), this._selectionContainer.setAttribute("aria-hidden", "true"), this.dimensions = an(), this._updateDimensions(), this._register(this._optionsService.onOptionChange(() => this._handleOptionsChanged())), this._register(this._themeService.onChangeColors((f5) => this._injectCss(f5))), this._injectCss(this._themeService.colors), this._rowFactory = h3.createInstance(mt3, document), this._element.classList.add(ls + this._terminalClass), this._screenElement.appendChild(this._rowContainer), this._screenElement.appendChild(this._selectionContainer), this._register(this._linkifier2.onShowLinkUnderline((f5) => this._handleLinkHover(f5))), this._register(this._linkifier2.onHideLinkUnderline((f5) => this._handleLinkLeave(f5))), this._cursorBlinkStateManager = new cs(this._rowContainer, this._coreBrowserService), this._register(C3(this._document, "mousedown", () => this._cursorBlinkStateManager.restartBlinkAnimation())), this._register(y4(() => this._cursorBlinkStateManager.dispose())), this._textBlinkStateManager = this._register(new Ki(() => this._onRequestRedraw.fire({ start: 0, end: this._bufferService.rows - 1 }), this._coreBrowserService, this._optionsService)), this._register(y4(() => {\n        this._element.classList.remove(ls + this._terminalClass), this._rowContainer.remove(), this._selectionContainer.remove(), this._widthCache.dispose(), this._themeStyleElement.remove(), this._dimensionsStyleElement.remove();\n      })), this._widthCache = new Ui(), this._widthCache.setFont(this._optionsService.rawOptions.fontFamily, this._optionsService.rawOptions.fontSize, this._optionsService.rawOptions.fontWeight, this._optionsService.rawOptions.fontWeightBold), this._setDefaultSpacing();\n    }\n    _updateDimensions() {\n      let e = this._coreBrowserService.dpr;\n      this.dimensions.device.char.width = this._charSizeService.width * e, this.dimensions.device.char.height = Math.ceil(this._charSizeService.height * e), this.dimensions.device.cell.width = this.dimensions.device.char.width + Math.round(this._optionsService.rawOptions.letterSpacing), this.dimensions.device.cell.height = Math.floor(this.dimensions.device.char.height * this._optionsService.rawOptions.lineHeight), this.dimensions.device.char.left = 0, this.dimensions.device.char.top = 0, this.dimensions.device.canvas.width = this.dimensions.device.cell.width * this._bufferService.cols, this.dimensions.device.canvas.height = this.dimensions.device.cell.height * this._bufferService.rows, this.dimensions.css.canvas.width = Math.round(this.dimensions.device.canvas.width / e), this.dimensions.css.canvas.height = Math.round(this.dimensions.device.canvas.height / e), this.dimensions.css.cell.width = this.dimensions.css.canvas.width / this._bufferService.cols, this.dimensions.css.cell.height = this.dimensions.css.canvas.height / this._bufferService.rows;\n      for (let r of this._rowElements) r.style.width = `${this.dimensions.css.canvas.width}px`, r.style.height = `${this.dimensions.css.cell.height}px`, r.style.lineHeight = `${this.dimensions.css.cell.height}px`, r.style.overflow = "hidden";\n      this._dimensionsStyleElement || (this._dimensionsStyleElement = this._document.createElement("style"), this._screenElement.appendChild(this._dimensionsStyleElement));\n      let i5 = `${this._terminalSelector} .${le2} span { display: inline-block; height: 100%; vertical-align: top;}`;\n      this._dimensionsStyleElement.textContent = i5, this._selectionContainer.style.height = this._viewportElement.style.height, this._screenElement.style.width = `${this.dimensions.css.canvas.width}px`, this._screenElement.style.height = `${this.dimensions.css.canvas.height}px`;\n    }\n    _injectCss(e) {\n      this._themeStyleElement || (this._themeStyleElement = this._document.createElement("style"), this._screenElement.appendChild(this._themeStyleElement));\n      let i5 = `${this._terminalSelector} .${le2} { pointer-events: none; color: ${e.foreground.css};}`;\n      i5 += `${this._terminalSelector} .${le2}, ${this._terminalSelector} .${le2} span { font-family: ${this._optionsService.rawOptions.fontFamily}; font-size: ${this._optionsService.rawOptions.fontSize}px; font-kerning: none; white-space: pre}`, i5 += `${this._terminalSelector} .${le2} .xterm-dim { color: ${k4.multiplyOpacity(e.foreground, 0.5).css};}`, i5 += `${this._terminalSelector} span:not(.xterm-bold) { font-weight: ${this._optionsService.rawOptions.fontWeight};}${this._terminalSelector} span.xterm-bold { font-weight: ${this._optionsService.rawOptions.fontWeightBold};}${this._terminalSelector} span.xterm-italic { font-style: italic;}${this._terminalSelector} span.xterm-blink-hidden { visibility: hidden;}`;\n      let r = `blink_underline_${this._terminalClass}`, s4 = `blink_bar_${this._terminalClass}`, o2 = `blink_block_${this._terminalClass}`;\n      i5 += `@keyframes ${r} { 50% {  border-bottom-style: hidden; }}`, i5 += `@keyframes ${s4} { 50% {  box-shadow: none; }}`, i5 += `@keyframes ${o2} { 0% {  background-color: ${e.cursor.css};  color: ${e.cursorAccent.css}; } 50% {  background-color: inherit;  color: ${e.cursor.css}; }}`, i5 += `${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-underline { animation: ${r} 1s step-end infinite;}${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-bar { animation: ${s4} 1s step-end infinite;}${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-block { animation: ${o2} 1s step-end infinite;}${this._terminalSelector} .${le2}.${$i} .xterm-cursor.xterm-cursor-blink { animation: none !important;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-block { background-color: ${e.cursor.css}; color: ${e.cursorAccent.css};}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-block:not(.xterm-cursor-blink) { background-color: ${e.cursor.css} !important; color: ${e.cursorAccent.css} !important;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-outline { outline: 1px solid ${e.cursor.css}; outline-offset: -1px;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-bar { box-shadow: ${this._optionsService.rawOptions.cursorWidth}px 0 0 ${e.cursor.css} inset;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-underline { border-bottom: 1px ${e.cursor.css}; border-bottom-style: solid; height: calc(100% - 1px);}`, i5 += `${this._terminalSelector} .${Gi} { position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;}${this._terminalSelector}.focus .${Gi} div { position: absolute; background-color: ${e.selectionBackgroundOpaque.css};}${this._terminalSelector} .${Gi} div { position: absolute; background-color: ${e.selectionInactiveBackgroundOpaque.css};}`;\n      for (let [a2, l4] of e.ansi.entries()) i5 += `${this._terminalSelector} .${zi}${a2} { color: ${l4.css}; }${this._terminalSelector} .${zi}${a2}.xterm-dim { color: ${k4.multiplyOpacity(l4, 0.5).css}; }${this._terminalSelector} .${cn}${a2} { background-color: ${l4.css}; }`;\n      i5 += `${this._terminalSelector} .${zi}${257} { color: ${k4.opaque(e.background).css}; }${this._terminalSelector} .${zi}${257}.xterm-dim { color: ${k4.multiplyOpacity(k4.opaque(e.background), 0.5).css}; }${this._terminalSelector} .${cn}${257} { background-color: ${e.foreground.css}; }`, this._themeStyleElement.textContent = i5;\n    }\n    _setDefaultSpacing() {\n      let e = this.dimensions.css.cell.width - this._widthCache.get("W", false, false);\n      this._rowContainer.style.letterSpacing = `${e}px`, this._rowFactory.defaultSpacing = e;\n    }\n    handleDevicePixelRatioChange() {\n      this._updateDimensions(), this._widthCache.clear(), this._setDefaultSpacing();\n    }\n    _refreshRowElements(e, i5) {\n      for (let r = this._rowElements.length; r <= i5; r++) {\n        let s4 = this._document.createElement("div");\n        this._rowContainer.appendChild(s4), this._rowElements.push(s4), this._rowHasBlinkingCells.push(false);\n      }\n      for (; this._rowElements.length > i5; ) this._rowContainer.removeChild(this._rowElements.pop()), this._rowHasBlinkingCells.pop() && this._rowHasBlinkingCellsCount--;\n    }\n    handleResize(e, i5) {\n      this._refreshRowElements(e, i5), this._updateDimensions(), this.handleSelectionChanged(this._selectionRenderModel.selectionStart, this._selectionRenderModel.selectionEnd, this._selectionRenderModel.columnSelectMode);\n    }\n    handleCharSizeChanged() {\n      this._updateDimensions(), this._widthCache.clear(), this._setDefaultSpacing();\n    }\n    handleBlur() {\n      this._rowContainer.classList.remove(Xt2), this._cursorBlinkStateManager.pause(), this.renderRows(0, this._bufferService.rows - 1);\n    }\n    handleFocus() {\n      this._rowContainer.classList.add(Xt2), this._cursorBlinkStateManager.resume(), this.renderRows(this._bufferService.buffer.y, this._bufferService.buffer.y);\n    }\n    handleViewportVisibilityChange(e) {\n      this._textBlinkStateManager.setViewportVisible(e);\n    }\n    handleSelectionChanged(e, i5, r) {\n      let s4 = this._bufferService.rows;\n      this._selectionContainer.replaceChildren(), this._rowFactory.handleSelectionChanged(e, i5, r);\n      let o2 = 0, a2 = -1;\n      this._lastSelectionStart && this._lastSelectionEnd && (this._selectionRenderModel.update(this._terminal, this._lastSelectionStart, this._lastSelectionEnd, this._lastSelectionColumnMode), this._selectionRenderModel.hasSelection && (o2 = this._selectionRenderModel.viewportCappedStartRow, a2 = this._selectionRenderModel.viewportCappedEndRow));\n      let l4 = 0, h3 = -1;\n      if (!e || !i5) return;\n      if (this._selectionRenderModel.update(this._terminal, e, i5, r), this._selectionRenderModel.hasSelection) {\n        let u3 = this._selectionRenderModel.viewportStartRow, _5 = this._selectionRenderModel.viewportEndRow, p3 = this._selectionRenderModel.viewportCappedStartRow, b4 = this._selectionRenderModel.viewportCappedEndRow;\n        l4 = p3, h3 = b4;\n        let f5 = this._document.createDocumentFragment();\n        if (r) {\n          let S4 = e[0] > i5[0];\n          f5.appendChild(this._createSelectionElement(p3, S4 ? i5[0] : e[0], S4 ? e[0] : i5[0], b4 - p3 + 1));\n        } else {\n          let S4 = u3 === p3 ? e[0] : 0, I4 = p3 === _5 ? i5[0] : this._bufferService.cols;\n          f5.appendChild(this._createSelectionElement(p3, S4, I4));\n          let w6 = b4 - p3 - 1;\n          if (f5.appendChild(this._createSelectionElement(p3 + 1, 0, this._bufferService.cols, w6)), p3 !== b4) {\n            let x5 = _5 === b4 ? i5[0] : this._bufferService.cols;\n            f5.appendChild(this._createSelectionElement(b4, 0, x5));\n          }\n        }\n        this._selectionContainer.appendChild(f5);\n      }\n      let d3 = Math.min(o2, l4), c2 = Math.max(a2, h3);\n      if (c2 >= 0) {\n        d3 = Math.max(d3, 0), c2 = Math.min(c2, s4 - 1);\n        let _5 = this._bufferService.buffer.y;\n        this._selectionRenderModel.hasSelection && _5 >= 0 && _5 < s4 && (d3 = Math.min(d3, _5), c2 = Math.max(c2, _5)), this.renderRows(d3, c2);\n      }\n      this._lastSelectionStart = e, this._lastSelectionEnd = i5, this._lastSelectionColumnMode = r;\n    }\n    _createSelectionElement(e, i5, r, s4 = 1) {\n      let o2 = this._document.createElement("div"), a2 = i5 * this.dimensions.css.cell.width, l4 = this.dimensions.css.cell.width * (r - i5);\n      return a2 + l4 > this.dimensions.css.canvas.width && (l4 = this.dimensions.css.canvas.width - a2), o2.style.height = `${s4 * this.dimensions.css.cell.height}px`, o2.style.top = `${e * this.dimensions.css.cell.height}px`, o2.style.left = `${a2}px`, o2.style.width = `${l4}px`, o2;\n    }\n    handleCursorMove() {\n      this._cursorBlinkStateManager.restartBlinkAnimation();\n    }\n    _handleOptionsChanged() {\n      this._updateDimensions(), this._injectCss(this._themeService.colors), this._widthCache.setFont(this._optionsService.rawOptions.fontFamily, this._optionsService.rawOptions.fontSize, this._optionsService.rawOptions.fontWeight, this._optionsService.rawOptions.fontWeightBold), this._setDefaultSpacing();\n    }\n    clear() {\n      for (let e of this._rowElements) e.replaceChildren();\n      this._rowHasBlinkingCellsCount > 0 && (this._rowHasBlinkingCells.fill(false), this._rowHasBlinkingCellsCount = 0, this._textBlinkStateManager.setNeedsBlinkInViewport(false));\n    }\n    renderRows(e, i5) {\n      let r = this._bufferService.buffer, s4 = r.ybase + r.y, o2 = Math.min(r.x, this._bufferService.cols - 1), a2 = this._coreService.decPrivateModes.cursorBlink ?? this._optionsService.rawOptions.cursorBlink, l4 = this._coreService.decPrivateModes.cursorStyle ?? this._optionsService.rawOptions.cursorStyle, h3 = this._optionsService.rawOptions.cursorInactiveStyle, d3 = { hasBlinkingCells: false };\n      for (let c2 = e; c2 <= i5; c2++) {\n        let u3 = c2 + r.ydisp, _5 = this._rowElements[c2], p3 = r.lines.get(u3);\n        if (!_5 || !p3) break;\n        _5.replaceChildren(...this._rowFactory.createRow(p3, u3, u3 === s4, l4, h3, o2, a2, this._textBlinkStateManager.isBlinkOn, this.dimensions.css.cell.width, this._widthCache, -1, -1, d3)), this._setRowBlinkState(c2, d3.hasBlinkingCells);\n      }\n      this._updateTextBlinkState();\n    }\n    get _terminalSelector() {\n      return `.${ls}${this._terminalClass}`;\n    }\n    _handleLinkHover(e) {\n      this._setCellUnderline(e.x1, e.x2, e.y1, e.y2, e.cols, true);\n    }\n    _handleLinkLeave(e) {\n      this._setCellUnderline(e.x1, e.x2, e.y1, e.y2, e.cols, false);\n    }\n    _setCellUnderline(e, i5, r, s4, o2, a2) {\n      r < 0 && (e = 0), s4 < 0 && (i5 = 0);\n      let l4 = this._bufferService.rows - 1;\n      r = Math.max(Math.min(r, l4), 0), s4 = Math.max(Math.min(s4, l4), 0), o2 = Math.min(o2, this._bufferService.cols);\n      let h3 = this._bufferService.buffer, d3 = h3.ybase + h3.y, c2 = Math.min(h3.x, o2 - 1), u3 = this._optionsService.rawOptions.cursorBlink, _5 = this._optionsService.rawOptions.cursorStyle, p3 = this._optionsService.rawOptions.cursorInactiveStyle, b4 = { hasBlinkingCells: false };\n      for (let f5 = r; f5 <= s4; ++f5) {\n        let S4 = f5 + h3.ydisp, I4 = this._rowElements[f5], w6 = h3.lines.get(S4);\n        if (!I4 || !w6) break;\n        I4.replaceChildren(...this._rowFactory.createRow(w6, S4, S4 === d3, _5, p3, c2, u3, this._textBlinkStateManager.isBlinkOn, this.dimensions.css.cell.width, this._widthCache, a2 ? f5 === r ? e : 0 : -1, a2 ? (f5 === s4 ? i5 : o2) - 1 : -1, b4)), this._setRowBlinkState(f5, b4.hasBlinkingCells);\n      }\n      this._updateTextBlinkState();\n    }\n    _setRowBlinkState(e, i5) {\n      this._rowHasBlinkingCells[e] !== i5 && (this._rowHasBlinkingCells[e] = i5, this._rowHasBlinkingCellsCount += i5 ? 1 : -1);\n    }\n    _updateTextBlinkState() {\n      this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount > 0);\n    }\n  };\n  vt2 = E4([m3(7, tt3), m3(8, Me2), m3(9, R3), m3(10, L5), m3(11, Y), m3(12, z3), m3(13, _e2)], vt2);\n  var cs = class {\n    constructor(t, e) {\n      this._rowContainer = t;\n      this._coreBrowserService = e;\n      this._isIdlePaused = false;\n      this._coreBrowserService.isFocused && this._resetIdleTimer();\n    }\n    dispose() {\n      this._clearIdleTimer();\n    }\n    restartBlinkAnimation() {\n      this._isIdlePaused && this._rowContainer.classList.remove($i), this._resetIdleTimer();\n    }\n    pause() {\n      this._isIdlePaused = false, this._clearIdleTimer();\n    }\n    resume() {\n      this._isIdlePaused = false, this._rowContainer.classList.remove($i), this._resetIdleTimer();\n    }\n    _resetIdleTimer() {\n      this._isIdlePaused = false, this._clearIdleTimer(), this._idleTimeout = this._coreBrowserService.window.setTimeout(() => {\n        this._stopBlinkingDueToIdle();\n      }, 3e5);\n    }\n    _clearIdleTimer() {\n      this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    _stopBlinkingDueToIdle() {\n      this._rowContainer.classList.add($i), this._isIdlePaused = true, this._idleTimeout = void 0;\n    }\n  };\n  var St2 = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._optionsService = r;\n      this.width = 0;\n      this.height = 0;\n      this._onCharSizeChange = this._register(new v5());\n      this.onCharSizeChange = this._onCharSizeChange.event;\n      try {\n        this._measureStrategy = this._register(new ds(this._optionsService));\n      } catch {\n        this._measureStrategy = this._register(new hs(e, i5, this._optionsService));\n      }\n      this._register(this._optionsService.onMultipleOptionChange(["fontFamily", "fontSize"], () => this.measure()));\n    }\n    get hasValidSize() {\n      return this.width > 0 && this.height > 0;\n    }\n    measure() {\n      let e = this._measureStrategy.measure();\n      (e.width !== this.width || e.height !== this.height) && (this.width = e.width, this.height = e.height, this._onCharSizeChange.fire());\n    }\n  };\n  St2 = E4([m3(2, R3)], St2);\n  var Vi = class extends g5 {\n    constructor() {\n      super(...arguments);\n      this._result = { width: 0, height: 0 };\n    }\n    _validateAndSet(e, i5) {\n      e !== void 0 && e > 0 && i5 !== void 0 && i5 > 0 && (this._result.width = e, this._result.height = i5);\n    }\n  };\n  var hs = class extends Vi {\n    constructor(e, i5, r) {\n      super();\n      this._document = e;\n      this._parentElement = i5;\n      this._optionsService = r;\n      this._measureElement = this._document.createElement("span"), this._measureElement.classList.add("xterm-char-measure-element"), this._measureElement.textContent = "W".repeat(32), this._measureElement.setAttribute("aria-hidden", "true"), this._measureElement.style.whiteSpace = "pre", this._measureElement.style.fontKerning = "none", this._parentElement.appendChild(this._measureElement);\n    }\n    measure() {\n      return this._measureElement.style.fontFamily = this._optionsService.rawOptions.fontFamily, this._measureElement.style.fontSize = `${this._optionsService.rawOptions.fontSize}px`, this._validateAndSet(Number(this._measureElement.offsetWidth) / 32, Number(this._measureElement.offsetHeight)), this._result;\n    }\n  };\n  var ds = class extends Vi {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._canvas = new OffscreenCanvas(100, 100), this._ctx = this._canvas.getContext("2d");\n      let i5 = this._ctx.measureText("W");\n      if (!("width" in i5 && "fontBoundingBoxAscent" in i5 && "fontBoundingBoxDescent" in i5)) throw new Error("Required font metrics not supported");\n    }\n    measure() {\n      this._ctx.font = `${this._optionsService.rawOptions.fontSize}px ${this._optionsService.rawOptions.fontFamily}`;\n      let e = this._ctx.measureText("W");\n      return this._validateAndSet(e.width, e.fontBoundingBoxAscent + e.fontBoundingBoxDescent), this._result;\n    }\n  };\n  var qi = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._textarea = e;\n      this._window = i5;\n      this.mainDocument = r;\n      this._isFocused = false;\n      this._cachedIsFocused = void 0;\n      this._onDprChange = this._register(new v5());\n      this.onDprChange = this._onDprChange.event;\n      this._onWindowChange = this._register(new v5());\n      this.onWindowChange = this._onWindowChange.event;\n      this._screenDprMonitor = this._register(new us(this._window)), this._register(this.onWindowChange((s4) => this._screenDprMonitor.setWindow(s4))), this._register(X2.forward(this._screenDprMonitor.onDprChange, this._onDprChange)), this._register(C3(this._textarea, "focus", () => this._isFocused = true)), this._register(C3(this._textarea, "blur", () => this._isFocused = false));\n    }\n    get window() {\n      return this._window;\n    }\n    set window(e) {\n      this._window !== e && (this._window = e, this._onWindowChange.fire(this._window));\n    }\n    get dpr() {\n      return this.window.devicePixelRatio;\n    }\n    get isFocused() {\n      return this._cachedIsFocused === void 0 && (this._cachedIsFocused = this._isFocused && this._textarea.ownerDocument.hasFocus(), queueMicrotask(() => this._cachedIsFocused = void 0)), this._cachedIsFocused;\n    }\n  };\n  var us = class extends g5 {\n    constructor(e) {\n      super();\n      this._parentWindow = e;\n      this._windowResizeListener = this._register(new me3());\n      this._onDprChange = this._register(new v5());\n      this.onDprChange = this._onDprChange.event;\n      this._outerListener = () => this._setDprAndFireIfDiffers(), this._currentDevicePixelRatio = this._parentWindow.devicePixelRatio, this._updateDpr(), this._setWindowResizeListener(), this._register(y4(() => this.clearListener()));\n    }\n    setWindow(e) {\n      this._parentWindow = e, this._setWindowResizeListener(), this._setDprAndFireIfDiffers();\n    }\n    _setWindowResizeListener() {\n      this._windowResizeListener.value = C3(this._parentWindow, "resize", () => this._setDprAndFireIfDiffers());\n    }\n    _setDprAndFireIfDiffers() {\n      this._parentWindow.devicePixelRatio !== this._currentDevicePixelRatio && this._onDprChange.fire(this._parentWindow.devicePixelRatio), this._updateDpr();\n    }\n    _updateDpr() {\n      this._outerListener && (this._resolutionMediaMatchList?.removeListener(this._outerListener), this._currentDevicePixelRatio = this._parentWindow.devicePixelRatio, this._resolutionMediaMatchList = this._parentWindow.matchMedia(`screen and (resolution: ${this._parentWindow.devicePixelRatio}dppx)`), this._resolutionMediaMatchList.addListener(this._outerListener));\n    }\n    clearListener() {\n      !this._resolutionMediaMatchList || !this._outerListener || (this._resolutionMediaMatchList.removeListener(this._outerListener), this._resolutionMediaMatchList = void 0, this._outerListener = void 0);\n    }\n  };\n  var Yi = class extends g5 {\n    constructor() {\n      super();\n      this.linkProviders = [];\n      this._register(y4(() => this.linkProviders.length = 0));\n    }\n    registerLinkProvider(e) {\n      return this.linkProviders.push(e), { dispose: () => {\n        let i5 = this.linkProviders.indexOf(e);\n        i5 !== -1 && this.linkProviders.splice(i5, 1);\n      } };\n    }\n  };\n  function jt(n11, t, e) {\n    let i5 = e.getBoundingClientRect(), r = n11.getComputedStyle(e), s4 = parseInt(r.getPropertyValue("padding-left")), o2 = parseInt(r.getPropertyValue("padding-top"));\n    return [t.clientX - i5.left - s4, t.clientY - i5.top - o2];\n  }\n  function hn(n11, t, e, i5, r, s4, o2, a2, l4) {\n    if (!s4) return;\n    let h3 = jt(n11, t, e);\n    if (h3) return h3[0] = Math.ceil((h3[0] + (l4 ? o2 / 2 : 0)) / o2), h3[1] = Math.ceil(h3[1] / a2), h3[0] = Math.min(Math.max(h3[0], 1), i5 + (l4 ? 1 : 0)), h3[1] = Math.min(Math.max(h3[1], 1), r), h3;\n  }\n  var gt2 = class {\n    constructor(t, e) {\n      this._charSizeService = t;\n      this._renderService = e;\n    }\n    getCoords(t, e, i5, r, s4) {\n      return hn(window, t, e, i5, r, this._charSizeService.hasValidSize, this._renderService.dimensions.css.cell.width, this._renderService.dimensions.css.cell.height, s4);\n    }\n    getMouseReportCoords(t, e) {\n      let i5 = jt(oe3(e), t, e);\n      if (this._charSizeService.hasValidSize) return i5[0] = Math.min(Math.max(i5[0], 0), this._renderService.dimensions.css.canvas.width - 1), i5[1] = Math.min(Math.max(i5[1], 0), this._renderService.dimensions.css.canvas.height - 1), { col: Math.floor(i5[0] / this._renderService.dimensions.css.cell.width), row: Math.floor(i5[1] / this._renderService.dimensions.css.cell.height), x: Math.floor(i5[0]), y: Math.floor(i5[1]) };\n    }\n  };\n  gt2 = E4([m3(0, Me2), m3(1, G4)], gt2);\n  var dn = typeof window == "object" ? window : globalThis;\n  function he2(n11, t = 0) {\n    return n11[n11.length - (1 + t)];\n  }\n  function mo(n11, t, e) {\n    let i5 = null, r = null;\n    if (typeof e.value == "function" ? (i5 = "value", r = e.value, r.length !== 0 && console.warn("Memoize should only be used in functions with zero parameters")) : typeof e.get == "function" && (i5 = "get", r = e.get), !r || !i5) throw new Error("not supported");\n    let s4 = `$memoize$${t}`, o2 = e;\n    o2[i5] = function(...a2) {\n      return this.hasOwnProperty(s4) || Object.defineProperty(this, s4, { configurable: false, enumerable: false, writable: false, value: r.apply(this, a2) }), this[s4];\n    };\n  }\n  var It = class It2 {\n    constructor(t) {\n      this.element = t, this.next = It2.Undefined, this.prev = It2.Undefined;\n    }\n  };\n  It.Undefined = new It(void 0);\n  var te2 = It;\n  var Xi = class {\n    constructor() {\n      this._first = te2.Undefined;\n      this._last = te2.Undefined;\n    }\n    push(t) {\n      return this._insert(t, true);\n    }\n    _insert(t, e) {\n      let i5 = new te2(t);\n      if (this._first === te2.Undefined) this._first = i5, this._last = i5;\n      else if (e) {\n        let s4 = this._last;\n        this._last = i5, i5.prev = s4, s4.next = i5;\n      } else {\n        let s4 = this._first;\n        this._first = i5, i5.next = s4, s4.prev = i5;\n      }\n      let r = false;\n      return () => {\n        r || (r = true, this._remove(i5));\n      };\n    }\n    _remove(t) {\n      if (t.prev !== te2.Undefined && t.next !== te2.Undefined) {\n        let e = t.prev;\n        e.next = t.next, t.next.prev = e;\n      } else t.prev === te2.Undefined && t.next === te2.Undefined ? (this._first = te2.Undefined, this._last = te2.Undefined) : t.next === te2.Undefined ? (this._last = this._last.prev, this._last.next = te2.Undefined) : t.prev === te2.Undefined && (this._first = this._first.next, this._first.prev = te2.Undefined);\n    }\n    *[Symbol.iterator]() {\n      let t = this._first;\n      for (; t !== te2.Undefined; ) yield t.element, t = t.next;\n    }\n  };\n  var de2;\n  ((s4) => (s4.TAP = "-xterm-gesturetap", s4.CHANGE = "-xterm-gesturechange", s4.START = "-xterm-gesturestart", s4.END = "-xterm-gesturesend", s4.CONTEXT_MENU = "-xterm-gesturecontextmenu"))(de2 ||= {});\n  var W4 = class W5 extends g5 {\n    constructor() {\n      super();\n      this._dispatched = false;\n      this._targets = new Xi();\n      this._ignoreTargets = new Xi();\n      this._activeTouches = {}, this._handle = null, this._lastSetTapCountTime = 0;\n      let e = dn;\n      this._register(C3(e.document, "touchstart", (i5) => this._handleTouchStart(i5), { passive: false })), this._register(C3(e.document, "touchend", (i5) => this._handleTouchEnd(e, i5))), this._register(C3(e.document, "touchmove", (i5) => this._handleTouchMove(i5), { passive: false }));\n    }\n    static addTarget(e) {\n      if (!W5.isTouchDevice()) return g5.None;\n      W5._instance || (W5._instance = new W5());\n      let i5 = W5._instance._targets.push(e);\n      return y4(i5);\n    }\n    static ignoreTarget(e) {\n      if (!W5.isTouchDevice()) return g5.None;\n      W5._instance || (W5._instance = new W5());\n      let i5 = W5._instance._ignoreTargets.push(e);\n      return y4(i5);\n    }\n    static isTouchDevice() {\n      return "ontouchstart" in dn || navigator.maxTouchPoints > 0;\n    }\n    dispose() {\n      this._handle && (this._handle.dispose(), this._handle = null), super.dispose();\n    }\n    _handleTouchStart(e) {\n      let i5 = Date.now();\n      this._handle && (this._handle.dispose(), this._handle = null);\n      for (let r = 0, s4 = e.targetTouches.length; r < s4; r++) {\n        let o2 = e.targetTouches.item(r);\n        this._activeTouches[o2.identifier] = { id: o2.identifier, initialTarget: o2.target, initialTimeStamp: i5, initialPageX: o2.pageX, initialPageY: o2.pageY, rollingTimestamps: [i5], rollingPageX: [o2.pageX], rollingPageY: [o2.pageY] };\n        let a2 = this._newGestureEvent(de2.START, o2.target);\n        a2.pageX = o2.pageX, a2.pageY = o2.pageY, this._dispatchEvent(a2);\n      }\n      this._dispatched && (e.preventDefault(), e.stopPropagation(), this._dispatched = false);\n    }\n    _handleTouchEnd(e, i5) {\n      let r = Date.now(), s4 = Object.keys(this._activeTouches).length;\n      for (let o2 = 0, a2 = i5.changedTouches.length; o2 < a2; o2++) {\n        let l4 = i5.changedTouches.item(o2);\n        if (!this._activeTouches.hasOwnProperty(String(l4.identifier))) {\n          console.warn("move of an UNKNOWN touch", l4);\n          continue;\n        }\n        let h3 = this._activeTouches[l4.identifier], d3 = Date.now() - h3.initialTimeStamp;\n        if (d3 < W5._holdDelay && Math.abs(h3.initialPageX - he2(h3.rollingPageX)) < 30 && Math.abs(h3.initialPageY - he2(h3.rollingPageY)) < 30) {\n          let c2 = this._newGestureEvent(de2.TAP, h3.initialTarget);\n          c2.pageX = he2(h3.rollingPageX), c2.pageY = he2(h3.rollingPageY), this._dispatchEvent(c2);\n        } else if (d3 >= W5._holdDelay && Math.abs(h3.initialPageX - he2(h3.rollingPageX)) < 30 && Math.abs(h3.initialPageY - he2(h3.rollingPageY)) < 30) {\n          let c2 = this._newGestureEvent(de2.CONTEXT_MENU, h3.initialTarget);\n          c2.pageX = he2(h3.rollingPageX), c2.pageY = he2(h3.rollingPageY), this._dispatchEvent(c2);\n        } else if (s4 === 1) {\n          let c2 = he2(h3.rollingPageX), u3 = he2(h3.rollingPageY), _5 = he2(h3.rollingTimestamps) - h3.rollingTimestamps[0], p3 = c2 - h3.rollingPageX[0], b4 = u3 - h3.rollingPageY[0], f5 = [...this._targets].filter((S4) => h3.initialTarget instanceof Node && S4.contains(h3.initialTarget));\n          this._inertia(e, f5, r, Math.abs(p3) / _5, p3 > 0 ? 1 : -1, c2, Math.abs(b4) / _5, b4 > 0 ? 1 : -1, u3);\n        }\n        this._dispatchEvent(this._newGestureEvent(de2.END, h3.initialTarget)), delete this._activeTouches[l4.identifier];\n      }\n      this._dispatched && (i5.preventDefault(), i5.stopPropagation(), this._dispatched = false);\n    }\n    _newGestureEvent(e, i5) {\n      let r = document.createEvent("CustomEvent");\n      return r.initEvent(e, false, true), r.initialTarget = i5, r.tapCount = 0, r;\n    }\n    _dispatchEvent(e) {\n      if (e.type === de2.TAP) {\n        let i5 = (/* @__PURE__ */ new Date()).getTime(), r = 0;\n        i5 - this._lastSetTapCountTime > W5._clearTapCountTime ? r = 1 : r = 2, this._lastSetTapCountTime = i5, e.tapCount = r;\n      } else (e.type === de2.CHANGE || e.type === de2.CONTEXT_MENU) && (this._lastSetTapCountTime = 0);\n      if (e.initialTarget instanceof Node) {\n        for (let r of this._ignoreTargets) if (r.contains(e.initialTarget)) return;\n        let i5 = [];\n        for (let r of this._targets) if (r.contains(e.initialTarget)) {\n          let s4 = 0, o2 = e.initialTarget;\n          for (; o2 && o2 !== r; ) s4++, o2 = o2.parentElement;\n          i5.push([s4, r]);\n        }\n        i5.sort((r, s4) => r[0] - s4[0]);\n        for (let [, r] of i5) r.dispatchEvent(e), this._dispatched = true;\n      }\n    }\n    _inertia(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      this._handle = rt3(e, () => {\n        let c2 = Date.now(), u3 = c2 - r, _5 = 0, p3 = 0, b4 = true;\n        s4 += W5._scrollFriction * u3, l4 += W5._scrollFriction * u3, s4 > 0 && (b4 = false, _5 = o2 * s4 * u3), l4 > 0 && (b4 = false, p3 = h3 * l4 * u3);\n        let f5 = this._newGestureEvent(de2.CHANGE);\n        f5.translationX = _5, f5.translationY = p3, i5.forEach((S4) => S4.dispatchEvent(f5)), b4 || this._inertia(e, i5, c2, s4, o2, a2 + _5, l4, h3, d3 + p3);\n      });\n    }\n    _handleTouchMove(e) {\n      let i5 = Date.now();\n      for (let r = 0, s4 = e.changedTouches.length; r < s4; r++) {\n        let o2 = e.changedTouches.item(r);\n        if (!this._activeTouches.hasOwnProperty(String(o2.identifier))) {\n          console.warn("end of an UNKNOWN touch", o2);\n          continue;\n        }\n        let a2 = this._activeTouches[o2.identifier], l4 = this._newGestureEvent(de2.CHANGE, a2.initialTarget);\n        l4.translationX = o2.pageX - he2(a2.rollingPageX), l4.translationY = o2.pageY - he2(a2.rollingPageY), l4.pageX = o2.pageX, l4.pageY = o2.pageY, l4.clientX = o2.clientX, l4.clientY = o2.clientY, this._dispatchEvent(l4), a2.rollingPageX.length > 3 && (a2.rollingPageX.shift(), a2.rollingPageY.shift(), a2.rollingTimestamps.shift()), a2.rollingPageX.push(o2.pageX), a2.rollingPageY.push(o2.pageY), a2.rollingTimestamps.push(i5);\n      }\n      this._dispatched && (e.preventDefault(), e.stopPropagation(), this._dispatched = false);\n    }\n  };\n  W4._scrollFriction = -5e-3, W4._holdDelay = 700, W4._clearTapCountTime = 400, E4([mo], W4, "isTouchDevice", 1);\n  var ji = W4;\n  var Ct2 = class {\n    constructor(t, e, i5, r, s4, o2, a2, l4, h3) {\n      this._renderService = t;\n      this._mouseCoordsService = e;\n      this._mouseStateService = i5;\n      this._coreService = r;\n      this._bufferService = s4;\n      this._optionsService = o2;\n      this._selectionService = a2;\n      this._logService = l4;\n      this._coreBrowserService = h3;\n      this._lastEvent = null;\n      this._wheelPartialScroll = 0;\n      this._touchScrollAccumulator = 0;\n    }\n    bindMouse(t, e, i5) {\n      let { element: r, document: s4 } = t, o2 = { mouseup: null, wheel: null, mousedrag: null, mousemove: null }, a2 = { target: t, focus: i5, requestedEvents: o2 }, l4 = { mouseup: (h3) => this._handleMouseUp(a2, h3), wheel: (h3) => this._handleWheel(a2, h3), mousedrag: (h3) => this._handleMouseDrag(a2, h3), mousemove: (h3) => this._handleMouseMove(a2, h3) };\n      e(this._mouseStateService.onProtocolChange((h3) => {\n        this._handleProtocolChange(a2, l4, h3);\n      })), this._mouseStateService.activeProtocol = this._mouseStateService.activeProtocol, e(y4(() => {\n        o2.mouseup && s4.removeEventListener("mouseup", o2.mouseup), o2.mousedrag && s4.removeEventListener("mousemove", o2.mousedrag);\n      })), e(C3(r, "mousedown", (h3) => this._handleMouseDown(a2, h3))), e(C3(r, "wheel", (h3) => this._handlePassiveWheel(a2, h3), { passive: false })), e(ji.addTarget(t.screenElement)), e(C3(t.screenElement, de2.START, () => this._handleTouchStart())), e(C3(t.screenElement, de2.CHANGE, (h3) => this._handleTouchChange(a2, h3)));\n    }\n    _sendEvent(t, e) {\n      let i5 = this._mouseCoordsService.getMouseReportCoords(e, t.target.screenElement);\n      if (!i5) return false;\n      let r, s4;\n      switch (e.overrideType || e.type) {\n        case "mousemove":\n          s4 = 32, e.buttons === void 0 ? (r = 3, e.button !== void 0 && (r = e.button < 3 ? e.button : 3)) : r = e.buttons & 1 ? 0 : e.buttons & 4 ? 1 : e.buttons & 2 ? 2 : 3;\n          break;\n        case "mouseup":\n          s4 = 0, r = e.button < 3 ? e.button : 3;\n          break;\n        case "mousedown":\n          s4 = 1, r = e.button < 3 ? e.button : 3;\n          break;\n        case "wheel":\n          if (!this._mouseStateService.allowCustomWheelEvent(e)) return false;\n          let o2 = e.deltaY;\n          if (o2 === 0 || this._consumeWheelEvent(e, this._renderService?.dimensions?.device?.cell?.height, this._coreBrowserService?.dpr) === 0) return false;\n          s4 = o2 < 0 ? 0 : 1, r = 4;\n          break;\n        default:\n          return false;\n      }\n      return s4 === void 0 || r === void 0 || r > 4 ? false : this._triggerMouseEvent({ col: i5.col, row: i5.row, x: i5.x, y: i5.y, button: r, action: s4, ctrl: e.ctrlKey, alt: e.altKey, shift: e.shiftKey });\n    }\n    _handleMouseUp(t, e) {\n      this._sendEvent(t, e), e.buttons || (t.requestedEvents.mouseup && t.target.document.removeEventListener("mouseup", t.requestedEvents.mouseup), t.requestedEvents.mousedrag && t.target.document.removeEventListener("mousemove", t.requestedEvents.mousedrag));\n    }\n    _handleWheel(t, e) {\n      return this._sendEvent(t, e), e.preventDefault(), e.stopPropagation(), false;\n    }\n    _handleMouseDrag(t, e) {\n      e.buttons && this._sendEvent(t, e);\n    }\n    _handleMouseMove(t, e) {\n      e.buttons || this._sendEvent(t, e);\n    }\n    _handleMouseDown(t, e) {\n      e.preventDefault(), t.focus(), !(!this._mouseStateService.areMouseEventsActive || this._selectionService.shouldForceSelection(e)) && (this._sendEvent(t, e), t.requestedEvents.mouseup && t.target.document.addEventListener("mouseup", t.requestedEvents.mouseup), t.requestedEvents.mousedrag && t.target.document.addEventListener("mousemove", t.requestedEvents.mousedrag));\n    }\n    _handlePassiveWheel(t, e) {\n      if (!t.requestedEvents.wheel) {\n        if (!this._mouseStateService.allowCustomWheelEvent(e)) return false;\n        if (!this._bufferService.buffer.hasScrollback) {\n          if (e.deltaY === 0) return false;\n          if (this._consumeWheelEvent(e, this._renderService?.dimensions?.device?.cell?.height, this._coreBrowserService?.dpr) === 0) return e.preventDefault(), e.stopPropagation(), false;\n          let s4 = "\\x1B" + (this._coreService.decPrivateModes.applicationCursorKeys ? "O" : "[") + (e.deltaY < 0 ? "A" : "B");\n          return this._coreService.triggerDataEvent(s4, true), e.preventDefault(), e.stopPropagation(), false;\n        }\n      }\n    }\n    _handleTouchStart() {\n      this._touchScrollAccumulator = 0;\n    }\n    _handleTouchChange(t, e) {\n      if (e.preventDefault(), e.stopPropagation(), t.requestedEvents.wheel) {\n        this._handleTouchScrollAsWheel(t, e);\n        return;\n      }\n      if (!this._bufferService.buffer.hasScrollback) {\n        this._handleTouchScrollAsKeys(e);\n        return;\n      }\n      t.target.handleTouchScroll?.(e.translationY);\n    }\n    _handleTouchScrollAsKeys(t) {\n      let e = this._renderService?.dimensions.css.cell.height;\n      if (!e) return;\n      this._touchScrollAccumulator -= t.translationY;\n      let i5 = Math.trunc(this._touchScrollAccumulator / e);\n      if (i5 === 0) return;\n      this._touchScrollAccumulator -= i5 * e;\n      let r = "\\x1B" + (this._coreService.decPrivateModes.applicationCursorKeys ? "O" : "[") + (i5 < 0 ? "A" : "B");\n      for (let s4 = 0; s4 < Math.abs(i5); s4++) this._coreService.triggerDataEvent(r, true);\n    }\n    _handleTouchScrollAsWheel(t, e) {\n      let i5 = this._renderService?.dimensions.css.cell.height;\n      if (!i5) return;\n      this._touchScrollAccumulator -= e.translationY;\n      let r = Math.trunc(this._touchScrollAccumulator / i5);\n      if (r === 0) return;\n      this._touchScrollAccumulator -= r * i5;\n      let s4 = this._mouseCoordsService.getMouseReportCoords(e, t.target.screenElement);\n      if (s4) for (let o2 = 0; o2 < Math.abs(r); o2++) this._triggerMouseEvent({ col: s4.col, row: s4.row, x: s4.x, y: s4.y, button: 4, action: r < 0 ? 0 : 1, ctrl: false, alt: false, shift: false });\n    }\n    reset() {\n      this._lastEvent = null, this._wheelPartialScroll = 0, this._touchScrollAccumulator = 0;\n    }\n    _handleProtocolChange(t, e, i5) {\n      let { element: r, document: s4 } = t.target, { requestedEvents: o2 } = t;\n      i5 ? (this._optionsService.rawOptions.logLevel === "debug" && this._logService.debug("Binding to mouse events:", this._explainEvents(i5)), r.classList.add("enable-mouse-events"), this._selectionService.disable()) : (this._logService.debug("Unbinding from mouse events."), r.classList.remove("enable-mouse-events"), this._selectionService.enable()), i5 & 8 ? o2.mousemove || (r.addEventListener("mousemove", e.mousemove), o2.mousemove = e.mousemove) : (o2.mousemove && r.removeEventListener("mousemove", o2.mousemove), o2.mousemove = null), i5 & 16 ? o2.wheel || (r.addEventListener("wheel", e.wheel, { passive: false }), o2.wheel = e.wheel) : (o2.wheel && r.removeEventListener("wheel", o2.wheel), o2.wheel = null), i5 & 2 ? o2.mouseup ??= e.mouseup : (o2.mouseup && s4.removeEventListener("mouseup", o2.mouseup), o2.mouseup = null), i5 & 4 ? o2.mousedrag ??= e.mousedrag : (o2.mousedrag && s4.removeEventListener("mousemove", o2.mousedrag), o2.mousedrag = null);\n    }\n    _applyScrollModifier(t, e) {\n      return e.altKey || e.ctrlKey || e.shiftKey ? t * this._optionsService.rawOptions.fastScrollSensitivity * this._optionsService.rawOptions.scrollSensitivity : t * this._optionsService.rawOptions.scrollSensitivity;\n    }\n    _consumeWheelEvent(t, e, i5) {\n      if (t.deltaY === 0 || t.shiftKey || e === void 0 || i5 === void 0) return 0;\n      let r = e / i5, s4 = this._applyScrollModifier(t.deltaY, t);\n      return t.deltaMode === WheelEvent.DOM_DELTA_PIXEL ? (s4 /= r + 0, Math.abs(t.deltaY) < 50 && (s4 *= 0.3), this._wheelPartialScroll += s4, s4 = Math.floor(Math.abs(this._wheelPartialScroll)) * (this._wheelPartialScroll > 0 ? 1 : -1), this._wheelPartialScroll %= 1) : t.deltaMode === WheelEvent.DOM_DELTA_PAGE && (s4 *= this._bufferService.rows), s4;\n    }\n    _triggerMouseEvent(t) {\n      if (t.col < 0 || t.col >= this._bufferService.cols || t.row < 0 || t.row >= this._bufferService.rows || t.button === 4 && t.action === 32 || t.button === 3 && t.action !== 32 || t.button !== 4 && (t.action === 2 || t.action === 3) || (t.col++, t.row++, t.action === 32 && this._lastEvent && this._equalEvents(this._lastEvent, t, this._mouseStateService.isPixelEncoding)) || !this._mouseStateService.restrictMouseEvent(t)) return false;\n      let e = this._mouseStateService.encodeMouseEvent(t);\n      return e && (this._mouseStateService.isDefaultEncoding ? this._coreService.triggerBinaryEvent(e) : this._coreService.triggerDataEvent(e, true)), this._lastEvent = t, true;\n    }\n    _explainEvents(t) {\n      return { down: !!(t & 1), up: !!(t & 2), drag: !!(t & 4), move: !!(t & 8), wheel: !!(t & 16) };\n    }\n    _equalEvents(t, e, i5) {\n      if (i5) {\n        if (t.x !== e.x || t.y !== e.y) return false;\n      } else if (t.col !== e.col || t.row !== e.row) return false;\n      return !(t.button !== e.button || t.action !== e.action || t.ctrl !== e.ctrl || t.alt !== e.alt || t.shift !== e.shift);\n    }\n  };\n  Ct2 = E4([m3(0, G4), m3(1, Be2), m3(2, et2), m3(3, Y), m3(4, L5), m3(5, R3), m3(6, Ci), m3(7, pe), m3(8, z3)], Ct2);\n  var Zi = class {\n    constructor(t, e) {\n      this._renderCallback = t;\n      this._coreBrowserService = e;\n      this._refreshCallbacks = [];\n    }\n    dispose() {\n      this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0);\n    }\n    addRefreshCallback(t) {\n      return this._refreshCallbacks.push(t), this._animationFrame || (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh())), this._animationFrame;\n    }\n    refresh(t, e, i5) {\n      this._rowCount = i5, t = t ?? 0, e = e ?? this._rowCount - 1, this._rowStart = this._rowStart !== void 0 ? Math.min(this._rowStart, t) : t, this._rowEnd = this._rowEnd !== void 0 ? Math.max(this._rowEnd, e) : e, !this._animationFrame && (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh()));\n    }\n    _innerRefresh() {\n      if (this._animationFrame = void 0, this._rowStart === void 0 || this._rowEnd === void 0 || this._rowCount === void 0) {\n        this._runRefreshCallbacks();\n        return;\n      }\n      let t = Math.max(this._rowStart, 0), e = Math.min(this._rowEnd, this._rowCount - 1);\n      this._rowStart = void 0, this._rowEnd = void 0, this._renderCallback(t, e), this._runRefreshCallbacks();\n    }\n    _runRefreshCallbacks() {\n      for (let t of this._refreshCallbacks) t(0);\n      this._refreshCallbacks = [];\n    }\n  };\n  var Ji = class {\n    constructor(t) {\n      this._tasks = [];\n      this._i = 0;\n      this._logService = t;\n    }\n    enqueue(t) {\n      this._tasks.push(t), this._start();\n    }\n    flush() {\n      for (; this._i < this._tasks.length; ) this._tasks[this._i]() || this._i++;\n      this.clear();\n    }\n    clear() {\n      this._idleCallback && (this._cancelCallback(this._idleCallback), this._idleCallback = void 0), this._i = 0, this._tasks.length = 0;\n    }\n    _start() {\n      this._idleCallback || (this._idleCallback = this._requestCallback(this._process.bind(this)));\n    }\n    _process(t) {\n      this._idleCallback = void 0;\n      let e = 0, i5 = 0, r = t.timeRemaining(), s4 = 0;\n      for (; this._i < this._tasks.length; ) {\n        if (e = performance.now(), this._tasks[this._i]() || this._i++, e = Math.max(1, performance.now() - e), i5 = Math.max(e, i5), s4 = t.timeRemaining(), i5 * 1.5 > s4) {\n          r - e < -20 && this._logService.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(r - e))}ms`), this._start();\n          return;\n        }\n        r = s4;\n      }\n      this.clear();\n    }\n  };\n  var fs = class extends Ji {\n    _requestCallback(t) {\n      return setTimeout(() => t(this._createDeadline(16)));\n    }\n    _cancelCallback(t) {\n      clearTimeout(t);\n    }\n    _createDeadline(t) {\n      let e = performance.now() + t;\n      return { timeRemaining: () => Math.max(0, e - performance.now()) };\n    }\n  };\n  var ps = class extends Ji {\n    _requestCallback(t) {\n      return requestIdleCallback(t);\n    }\n    _cancelCallback(t) {\n      cancelIdleCallback(t);\n    }\n  };\n  var Et2 = "requestIdleCallback" in globalThis ? ps : fs;\n  var Qi = class {\n    constructor(t) {\n      this._queue = new Et2(t);\n    }\n    set(t) {\n      this._queue.clear(), this._queue.enqueue(t);\n    }\n    flush() {\n      this._queue.flush();\n    }\n    dispose() {\n      this._queue.clear();\n    }\n  };\n  var yt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3, c2) {\n      super();\n      this._rowCount = e;\n      this._optionsService = r;\n      this._logService = s4;\n      this._charSizeService = o2;\n      this._coreService = a2;\n      this._coreBrowserService = d3;\n      this._renderer = this._register(new me3());\n      this._observerDisposable = this._register(new me3());\n      this._isPaused = false;\n      this._needsFullRefresh = false;\n      this._isNextRenderRedrawOnly = true;\n      this._needsSelectionRefresh = false;\n      this._canvasWidth = 0;\n      this._canvasHeight = 0;\n      this._selectionState = { start: void 0, end: void 0, columnSelectMode: false };\n      this._onDimensionsChange = this._register(new v5());\n      this.onDimensionsChange = this._onDimensionsChange.event;\n      this._onRenderedViewportChange = this._register(new v5());\n      this.onRenderedViewportChange = this._onRenderedViewportChange.event;\n      this._onRender = this._register(new v5());\n      this.onRender = this._onRender.event;\n      this._onRefreshRequest = this._register(new v5());\n      this.onRefreshRequest = this._onRefreshRequest.event;\n      this._pausedResizeTask = this._register(new Qi(this._logService)), this._renderDebouncer = new Zi((u3, _5) => this._renderRows(u3, _5), this._coreBrowserService), this._register(this._renderDebouncer), this._syncOutputHandler = new _s(this._coreBrowserService, this._coreService, () => this._fullRefresh()), this._register(y4(() => this._syncOutputHandler.dispose())), this._register(this._coreBrowserService.onDprChange(() => this.handleDevicePixelRatioChange())), this._register(h3.onResize(() => this._fullRefresh())), this._register(h3.buffers.onBufferActivate(() => this._renderer.value?.clear())), this._register(this._optionsService.onOptionChange(() => this._handleOptionsChanged())), this._register(this._charSizeService.onCharSizeChange(() => this.handleCharSizeChanged())), this._register(l4.onDecorationRegistered(() => this._fullRefresh())), this._register(l4.onDecorationRemoved(() => this._fullRefresh())), this._register(this._optionsService.onMultipleOptionChange(["drawBoldTextInBrightColors", "letterSpacing", "lineHeight", "fontFamily", "fontSize", "fontWeight", "fontWeightBold", "minimumContrastRatio", "rescaleOverlappingGlyphs"], () => {\n        this.clear(), this.handleResize(h3.cols, h3.rows), this._fullRefresh();\n      })), this._register(this._optionsService.onMultipleOptionChange(["cursorBlink", "cursorStyle"], () => this.refreshRows(h3.buffer.y, h3.buffer.y, void 0, true))), this._register(c2.onChangeColors(() => this._fullRefresh())), this._registerIntersectionObserver(this._coreBrowserService.window, i5), this._register(this._coreBrowserService.onWindowChange((u3) => this._registerIntersectionObserver(u3, i5)));\n    }\n    get dimensions() {\n      return this._renderer.value.dimensions;\n    }\n    _registerIntersectionObserver(e, i5) {\n      if ("IntersectionObserver" in e) {\n        let r = new e.IntersectionObserver((s4) => this._handleIntersectionChange(s4[s4.length - 1]), { threshold: 0 });\n        r.observe(i5), this._observerDisposable.value = y4(() => r.disconnect());\n      }\n    }\n    _handleIntersectionChange(e) {\n      this._isPaused = e.isIntersecting === void 0 ? e.intersectionRatio === 0 : !e.isIntersecting, this._renderer.value?.handleViewportVisibilityChange?.(!this._isPaused), !this._isPaused && !this._charSizeService.hasValidSize && this._charSizeService.measure(), !this._isPaused && this._needsFullRefresh && (this._pausedResizeTask.flush(), this.refreshRows(0, this._rowCount - 1), this._needsFullRefresh = false);\n    }\n    refreshRows(e, i5, r = false, s4 = false) {\n      if (this._isPaused) {\n        this._needsFullRefresh = true;\n        return;\n      }\n      if (this._coreService.decPrivateModes.synchronizedOutput) {\n        this._syncOutputHandler.bufferRows(e, i5);\n        return;\n      }\n      let o2 = this._syncOutputHandler.flush();\n      o2 && (e = Math.min(e, o2.start), i5 = Math.max(i5, o2.end)), s4 || (this._isNextRenderRedrawOnly = false), r ? this._renderRows(e, i5) : this._renderDebouncer.refresh(e, i5, this._rowCount);\n    }\n    _renderRows(e, i5) {\n      if (this._renderer.value) {\n        if (this._coreService.decPrivateModes.synchronizedOutput) {\n          this._syncOutputHandler.bufferRows(e, i5);\n          return;\n        }\n        e = Math.min(e, this._rowCount - 1), i5 = Math.min(i5, this._rowCount - 1), this._renderer.value.renderRows(e, i5), this._needsSelectionRefresh && (this._renderer.value.handleSelectionChanged(this._selectionState.start, this._selectionState.end, this._selectionState.columnSelectMode), this._needsSelectionRefresh = false), this._isNextRenderRedrawOnly || this._onRenderedViewportChange.fire({ start: e, end: i5 }), this._onRender.fire({ start: e, end: i5 }), this._isNextRenderRedrawOnly = true;\n      }\n    }\n    resize(e, i5) {\n      this._rowCount = i5, this._fireOnCanvasResize();\n    }\n    _handleOptionsChanged() {\n      this._renderer.value && (this.refreshRows(0, this._rowCount - 1), this._fireOnCanvasResize());\n    }\n    _fireOnCanvasResize() {\n      this._renderer.value && (this._renderer.value.dimensions.css.canvas.width === this._canvasWidth && this._renderer.value.dimensions.css.canvas.height === this._canvasHeight || this._onDimensionsChange.fire(this._renderer.value.dimensions));\n    }\n    hasRenderer() {\n      return !!this._renderer.value;\n    }\n    setRenderer(e) {\n      this._renderer.value = e, this._renderer.value && (this._renderer.value.onRequestRedraw((i5) => this.refreshRows(i5.start, i5.end, i5.sync, true)), this._needsSelectionRefresh = true, this._fullRefresh());\n    }\n    addRefreshCallback(e) {\n      return this._renderDebouncer.addRefreshCallback(e);\n    }\n    _fullRefresh() {\n      this._isPaused ? this._needsFullRefresh = true : this.refreshRows(0, this._rowCount - 1);\n    }\n    clearTextureAtlas() {\n      this._renderer.value && (this._renderer.value.clearTextureAtlas?.(), this._fullRefresh());\n    }\n    handleDevicePixelRatioChange() {\n      this._charSizeService.measure(), this._renderer.value && (this._renderer.value.handleDevicePixelRatioChange(), this.refreshRows(0, this._rowCount - 1));\n    }\n    handleResize(e, i5) {\n      this._renderer.value && (this._isPaused ? this._pausedResizeTask.set(() => this._renderer.value?.handleResize(e, i5)) : this._renderer.value.handleResize(e, i5), this._fullRefresh());\n    }\n    handleCharSizeChanged() {\n      this._renderer.value?.handleCharSizeChanged();\n    }\n    handleBlur() {\n      this._renderer.value?.handleBlur();\n    }\n    handleFocus() {\n      this._renderer.value?.handleFocus();\n    }\n    handleSelectionChanged(e, i5, r) {\n      this._selectionState.start = e, this._selectionState.end = i5, this._selectionState.columnSelectMode = r, this._renderer.value?.handleSelectionChanged(e, i5, r);\n    }\n    handleCursorMove() {\n      this._renderer.value?.handleCursorMove();\n    }\n    clear() {\n      this._renderer.value?.clear();\n    }\n  };\n  yt3 = E4([m3(2, R3), m3(3, pe), m3(4, Me2), m3(5, Y), m3(6, Ie2), m3(7, L5), m3(8, z3), m3(9, _e2)], yt3);\n  var _s = class {\n    constructor(t, e, i5) {\n      this._coreBrowserService = t;\n      this._coreService = e;\n      this._onTimeout = i5;\n      this._start = 0;\n      this._end = 0;\n      this._isBuffering = false;\n    }\n    bufferRows(t, e) {\n      this._isBuffering ? (this._start = Math.min(this._start, t), this._end = Math.max(this._end, e)) : (this._start = t, this._end = e, this._isBuffering = true), this._timeout ??= this._coreBrowserService.window.setTimeout(() => {\n        this._timeout = void 0, this._coreService.decPrivateModes.synchronizedOutput = false, this._onTimeout();\n      }, 1e3);\n    }\n    flush() {\n      if (this._timeout !== void 0 && (this._coreBrowserService.window.clearTimeout(this._timeout), this._timeout = void 0), !this._isBuffering) return;\n      let t = { start: this._start, end: this._end };\n      return this._isBuffering = false, t;\n    }\n    dispose() {\n      this._timeout !== void 0 && (this._coreBrowserService.window.clearTimeout(this._timeout), this._timeout = void 0);\n    }\n  };\n  function un(n11, t, e, i5) {\n    let r = e.buffer.x, s4 = e.buffer.y;\n    if (!e.buffer.hasScrollback) return Io(r, s4, n11, t, e, i5) + er(s4, t, e, i5) + Co(r, s4, n11, t, e, i5);\n    let o2;\n    if (s4 === t) return o2 = r > n11 ? "D" : "C", Jt(Math.abs(r - n11), Zt2(o2, i5));\n    o2 = s4 > t ? "D" : "C";\n    let a2 = Math.abs(s4 - t), l4 = go(s4 > t ? n11 : r, e) + (a2 - 1) * e.cols + 1 + So(s4 > t ? r : n11, e);\n    return Jt(l4, Zt2(o2, i5));\n  }\n  function So(n11, t) {\n    return n11 - 1;\n  }\n  function go(n11, t) {\n    return t.cols - n11;\n  }\n  function Io(n11, t, e, i5, r, s4) {\n    return er(t, i5, r, s4).length === 0 ? "" : Jt(pn(n11, t, n11, t - qe(t, r), false, r).length, Zt2("D", s4));\n  }\n  function er(n11, t, e, i5) {\n    let r = n11 - qe(n11, e), s4 = t - qe(t, e), o2 = Math.abs(r - s4) - Eo(n11, t, e);\n    return Jt(o2, Zt2(fn(n11, t), i5));\n  }\n  function Co(n11, t, e, i5, r, s4) {\n    let o2;\n    er(t, i5, r, s4).length > 0 ? o2 = i5 - qe(i5, r) : o2 = t;\n    let a2 = i5, l4 = yo(n11, t, e, i5, r, s4);\n    return Jt(pn(n11, o2, e, a2, l4 === "C", r).length, Zt2(l4, s4));\n  }\n  function Eo(n11, t, e) {\n    let i5 = 0, r = n11 - qe(n11, e), s4 = t - qe(t, e);\n    for (let o2 = 0; o2 < Math.abs(r - s4); o2++) {\n      let a2 = fn(n11, t) === "A" ? -1 : 1;\n      e.buffer.lines.get(r + a2 * o2)?.isWrapped && i5++;\n    }\n    return i5;\n  }\n  function qe(n11, t) {\n    let e = 0, i5 = t.buffer.lines.get(n11), r = i5?.isWrapped;\n    for (; r && n11 >= 0 && n11 < t.rows; ) e++, i5 = t.buffer.lines.get(--n11), r = i5?.isWrapped;\n    return e;\n  }\n  function yo(n11, t, e, i5, r, s4) {\n    let o2;\n    return er(e, i5, r, s4).length > 0 ? o2 = i5 - qe(i5, r) : o2 = t, n11 < e && o2 <= i5 || n11 >= e && o2 < i5 ? "C" : "D";\n  }\n  function fn(n11, t) {\n    return n11 > t ? "A" : "B";\n  }\n  function pn(n11, t, e, i5, r, s4) {\n    let o2 = n11, a2 = t, l4 = "";\n    for (; (o2 !== e || a2 !== i5) && a2 >= 0 && a2 < s4.buffer.lines.length; ) o2 += r ? 1 : -1, r && o2 > s4.cols - 1 ? (l4 += s4.buffer.translateBufferLineToString(a2, false, n11, o2), o2 = 0, n11 = 0, a2++) : !r && o2 < 0 && (l4 += s4.buffer.translateBufferLineToString(a2, false, 0, n11 + 1), o2 = s4.cols - 1, n11 = o2, a2--);\n    return l4 + s4.buffer.translateBufferLineToString(a2, false, n11, o2);\n  }\n  function Zt2(n11, t) {\n    let e = t ? "O" : "[";\n    return "\\x1B" + e + n11;\n  }\n  function Jt(n11, t) {\n    n11 = Math.floor(n11);\n    let e = "";\n    for (let i5 = 0; i5 < n11; i5++) e += t;\n    return e;\n  }\n  var tr = class {\n    constructor(t) {\n      this._bufferService = t;\n      this.isSelectAllActive = false;\n      this.selectionStartLength = 0;\n    }\n    clearSelection() {\n      this.selectionStart = void 0, this.selectionEnd = void 0, this.isSelectAllActive = false, this.selectionStartLength = 0;\n    }\n    get finalSelectionStart() {\n      return this.isSelectAllActive ? [0, 0] : !this.selectionEnd || !this.selectionStart ? this.selectionStart : this.areSelectionValuesReversed() ? this.selectionEnd : this.selectionStart;\n    }\n    get finalSelectionEnd() {\n      if (this.isSelectAllActive) return [this._bufferService.cols, this._bufferService.buffer.ybase + this._bufferService.rows - 1];\n      if (this.selectionStart) {\n        if (!this.selectionEnd || this.areSelectionValuesReversed()) {\n          let t = this.selectionStart[0] + this.selectionStartLength;\n          return t > this._bufferService.cols ? t % this._bufferService.cols === 0 ? [this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols) - 1] : [t % this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols)] : [t, this.selectionStart[1]];\n        }\n        if (this.selectionStartLength && this.selectionEnd[1] === this.selectionStart[1]) {\n          let t = this.selectionStart[0] + this.selectionStartLength;\n          return t > this._bufferService.cols ? [t % this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols)] : [Math.max(t, this.selectionEnd[0]), this.selectionEnd[1]];\n        }\n        return this.selectionEnd;\n      }\n    }\n    areSelectionValuesReversed() {\n      let t = this.selectionStart, e = this.selectionEnd;\n      return !t || !e ? false : t[1] > e[1] || t[1] === e[1] && t[0] > e[0];\n    }\n    handleTrim(t) {\n      return this.selectionStart && (this.selectionStart[1] -= t), this.selectionEnd && (this.selectionEnd[1] -= t), this.selectionEnd && this.selectionEnd[1] < 0 ? (this.clearSelection(), true) : (this.selectionStart && this.selectionStart[1] < 0 && (this.selectionStart[1] = 0), false);\n    }\n  };\n  function ms(n11, t) {\n    if (n11.start.y > n11.end.y) throw new Error(`Buffer range end (${n11.end.x}, ${n11.end.y}) cannot be before start (${n11.start.x}, ${n11.start.y})`);\n    return t * (n11.end.y - n11.start.y) + (n11.end.x - n11.start.x + 1);\n  }\n  var bs = 50;\n  var xo = 15;\n  var wo = 50;\n  var To = 500;\n  var Do = "\\xA0";\n  var Ro = new RegExp(Do, "g");\n  var xt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      super();\n      this._element = e;\n      this._screenElement = i5;\n      this._linkifier = r;\n      this._bufferService = s4;\n      this._coreService = o2;\n      this._mouseCoordsService = a2;\n      this._optionsService = l4;\n      this._renderService = h3;\n      this._coreBrowserService = d3;\n      this._dragScrollAmount = 0;\n      this._enabled = true;\n      this._workCell = new N2();\n      this._mouseDownTimeStamp = 0;\n      this._oldHasSelection = false;\n      this._oldSelectionStart = void 0;\n      this._oldSelectionEnd = void 0;\n      this._onLinuxMouseSelection = this._register(new v5());\n      this.onLinuxMouseSelection = this._onLinuxMouseSelection.event;\n      this._onRedrawRequest = this._register(new v5());\n      this.onRequestRedraw = this._onRedrawRequest.event;\n      this._onSelectionChange = this._register(new v5());\n      this.onSelectionChange = this._onSelectionChange.event;\n      this._onRequestScrollLines = this._register(new v5());\n      this.onRequestScrollLines = this._onRequestScrollLines.event;\n      this._mouseMoveListener = (c2) => this._handleMouseMove(c2), this._mouseUpListener = (c2) => this._handleMouseUp(c2), this._coreService.onUserInput(() => {\n        this.hasSelection && this.clearSelection();\n      }), this._trimListener = this._bufferService.buffer.lines.onTrim((c2) => this._handleTrim(c2)), this._register(this._bufferService.buffers.onBufferActivate((c2) => this._handleBufferActivate(c2))), this.enable(), this._model = new tr(this._bufferService), this._activeSelectionMode = 0, this._register(y4(() => {\n        this._removeMouseDownListeners();\n      })), this._register(this._bufferService.onResize((c2) => {\n        c2.rowsChanged && this.clearSelection();\n      }));\n    }\n    reset() {\n      this.clearSelection();\n    }\n    disable() {\n      this.clearSelection(), this._enabled = false;\n    }\n    enable() {\n      this._enabled = true;\n    }\n    get selectionStart() {\n      return this._model.finalSelectionStart;\n    }\n    get selectionEnd() {\n      return this._model.finalSelectionEnd;\n    }\n    get hasSelection() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd;\n      return !e || !i5 ? false : e[0] !== i5[0] || e[1] !== i5[1];\n    }\n    get selectionText() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd;\n      if (!e || !i5) return "";\n      let r = this._bufferService.buffer, s4 = [];\n      if (this._activeSelectionMode === 3) {\n        if (e[0] === i5[0]) return "";\n        let a2 = e[0] < i5[0] ? e[0] : i5[0], l4 = e[0] < i5[0] ? i5[0] : e[0];\n        for (let h3 = e[1]; h3 <= i5[1]; h3++) {\n          let d3 = r.translateBufferLineToString(h3, true, a2, l4);\n          s4.push(d3);\n        }\n      } else {\n        let a2 = e[1] === i5[1] ? i5[0] : void 0;\n        s4.push(r.translateBufferLineToString(e[1], true, e[0], a2));\n        for (let l4 = e[1] + 1; l4 <= i5[1] - 1; l4++) {\n          let h3 = r.lines.get(l4), d3 = r.translateBufferLineToString(l4, true);\n          h3?.isWrapped ? s4[s4.length - 1] += d3 : s4.push(d3);\n        }\n        if (e[1] !== i5[1]) {\n          let l4 = r.lines.get(i5[1]), h3 = r.translateBufferLineToString(i5[1], true, 0, i5[0]);\n          l4 && l4.isWrapped ? s4[s4.length - 1] += h3 : s4.push(h3);\n        }\n      }\n      return s4.map((a2) => a2.replace(Ro, " ")).join(Ke3 ? `\\r\n` : `\n`);\n    }\n    clearSelection() {\n      this._model.clearSelection(), this._removeMouseDownListeners(), this.refresh(), this._onSelectionChange.fire();\n    }\n    refresh(e) {\n      this._refreshAnimationFrame || (this._refreshAnimationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._refresh())), $t2 && e && this.selectionText.length && this._onLinuxMouseSelection.fire(this.selectionText);\n    }\n    _refresh() {\n      this._refreshAnimationFrame = void 0, this._onRedrawRequest.fire({ start: this._model.finalSelectionStart, end: this._model.finalSelectionEnd, columnSelectMode: this._activeSelectionMode === 3 });\n    }\n    _isClickInSelection(e) {\n      let i5 = this._getMouseBufferCoords(e), r = this._model.finalSelectionStart, s4 = this._model.finalSelectionEnd;\n      return !r || !s4 || !i5 ? false : this._areCoordsInSelection(i5, r, s4);\n    }\n    isCellInSelection(e, i5) {\n      let r = this._model.finalSelectionStart, s4 = this._model.finalSelectionEnd;\n      return !r || !s4 ? false : this._areCoordsInSelection([e, i5], r, s4);\n    }\n    _areCoordsInSelection(e, i5, r) {\n      return e[1] > i5[1] && e[1] < r[1] || i5[1] === r[1] && e[1] === i5[1] && e[0] >= i5[0] && e[0] < r[0] || i5[1] < r[1] && e[1] === r[1] && e[0] < r[0] || i5[1] < r[1] && e[1] === i5[1] && e[0] >= i5[0];\n    }\n    _selectWordAtCursor(e, i5) {\n      let r = this._linkifier.currentLink?.link?.range;\n      if (r) return this._model.selectionStart = [r.start.x - 1, r.start.y - 1], this._model.selectionStartLength = ms(r, this._bufferService.cols), this._model.selectionEnd = void 0, true;\n      let s4 = this._getMouseBufferCoords(e);\n      return s4 ? (this._selectWordAt(s4, i5), this._model.selectionEnd = void 0, true) : false;\n    }\n    selectAll() {\n      this._model.isSelectAllActive = true, this.refresh(), this._onSelectionChange.fire();\n    }\n    selectLines(e, i5) {\n      this._model.clearSelection(), e = Math.max(e, 0), i5 = Math.min(i5, this._bufferService.buffer.lines.length - 1), this._model.selectionStart = [0, e], this._model.selectionEnd = [this._bufferService.cols, i5], this.refresh(), this._onSelectionChange.fire();\n    }\n    _handleTrim(e) {\n      this._model.handleTrim(e) && this.refresh();\n    }\n    _getMouseBufferCoords(e) {\n      let i5 = this._mouseCoordsService.getCoords(e, this._screenElement, this._bufferService.cols, this._bufferService.rows, true);\n      if (i5) return i5[0]--, i5[1]--, i5[1] += this._bufferService.buffer.ydisp, i5;\n    }\n    _getMouseEventScrollAmount(e) {\n      let i5 = jt(this._coreBrowserService.window, e, this._screenElement)[1], r = this._renderService.dimensions.css.canvas.height;\n      return i5 >= 0 && i5 <= r ? 0 : (i5 > r && (i5 -= r), i5 = Math.min(Math.max(i5, -bs), bs), i5 /= bs, i5 / Math.abs(i5) + Math.round(i5 * (xo - 1)));\n    }\n    shouldForceSelection(e) {\n      return ee3 ? e.altKey && this._optionsService.rawOptions.macOptionClickForcesSelection : e.shiftKey;\n    }\n    handleMouseDown(e) {\n      if (this._mouseDownTimeStamp = e.timeStamp, !(e.button === 2 && this.hasSelection) && e.button === 0) {\n        if (!this._enabled) {\n          if (!this.shouldForceSelection(e)) return;\n          e.stopPropagation();\n        }\n        e.preventDefault(), this._dragScrollAmount = 0, this._enabled && e.shiftKey ? this._handleIncrementalClick(e) : e.detail === 1 ? this._handleSingleClick(e) : e.detail === 2 ? this._handleDoubleClick(e) : e.detail === 3 && this._handleTripleClick(e), this._addMouseDownListeners(), this.refresh(true);\n      }\n    }\n    _addMouseDownListeners() {\n      this._screenElement.ownerDocument && (this._screenElement.ownerDocument.addEventListener("mousemove", this._mouseMoveListener), this._screenElement.ownerDocument.addEventListener("mouseup", this._mouseUpListener)), this._dragScrollIntervalTimer = this._coreBrowserService.window.setInterval(() => this._dragScroll(), wo);\n    }\n    _removeMouseDownListeners() {\n      this._screenElement.ownerDocument && (this._screenElement.ownerDocument.removeEventListener("mousemove", this._mouseMoveListener), this._screenElement.ownerDocument.removeEventListener("mouseup", this._mouseUpListener)), this._coreBrowserService.window.clearInterval(this._dragScrollIntervalTimer), this._dragScrollIntervalTimer = void 0;\n    }\n    _handleIncrementalClick(e) {\n      this._model.selectionStart && (this._model.selectionEnd = this._getMouseBufferCoords(e));\n    }\n    _handleSingleClick(e) {\n      let i5 = this.hasSelection;\n      if (this._model.selectionStartLength = 0, this._model.isSelectAllActive = false, this._activeSelectionMode = this.shouldColumnSelect(e) ? 3 : 0, this._model.selectionStart = this._getMouseBufferCoords(e), !this._model.selectionStart) return;\n      this._model.selectionEnd = void 0, i5 && this._fireOnSelectionChange(this._model.finalSelectionStart, this._model.finalSelectionEnd, false);\n      let r = this._bufferService.buffer.lines.get(this._model.selectionStart[1]);\n      r && r.length !== this._model.selectionStart[0] && r.hasWidth(this._model.selectionStart[0]) === 0 && this._model.selectionStart[0]++;\n    }\n    _handleDoubleClick(e) {\n      this._selectWordAtCursor(e, true) && (this._activeSelectionMode = 1);\n    }\n    _handleTripleClick(e) {\n      let i5 = this._getMouseBufferCoords(e);\n      i5 && (this._activeSelectionMode = 2, this._selectLineAt(i5[1]));\n    }\n    shouldColumnSelect(e) {\n      return e.altKey && !(ee3 && this._optionsService.rawOptions.macOptionClickForcesSelection);\n    }\n    _handleMouseMove(e) {\n      if (e.stopImmediatePropagation(), !this._model.selectionStart) return;\n      let i5 = this._model.selectionEnd ? [this._model.selectionEnd[0], this._model.selectionEnd[1]] : null;\n      if (this._model.selectionEnd = this._getMouseBufferCoords(e), !this._model.selectionEnd) {\n        this.refresh(true);\n        return;\n      }\n      this._activeSelectionMode === 2 ? this._model.selectionEnd[1] < this._model.selectionStart[1] ? this._model.selectionEnd[0] = 0 : this._model.selectionEnd[0] = this._bufferService.cols : this._activeSelectionMode === 1 && this._selectToWordAt(this._model.selectionEnd), this._dragScrollAmount = this._getMouseEventScrollAmount(e), this._activeSelectionMode !== 3 && (this._dragScrollAmount > 0 ? this._model.selectionEnd[0] = this._bufferService.cols : this._dragScrollAmount < 0 && (this._model.selectionEnd[0] = 0));\n      let r = this._bufferService.buffer;\n      if (this._model.selectionEnd[1] < r.lines.length) {\n        let s4 = r.lines.get(this._model.selectionEnd[1]);\n        s4 && s4.hasWidth(this._model.selectionEnd[0]) === 0 && this._model.selectionEnd[0] < this._bufferService.cols && this._model.selectionEnd[0]++;\n      }\n      (!i5 || i5[0] !== this._model.selectionEnd[0] || i5[1] !== this._model.selectionEnd[1]) && this.refresh(true);\n    }\n    _dragScroll() {\n      if (!(!this._model.selectionEnd || !this._model.selectionStart) && this._dragScrollAmount) {\n        this._onRequestScrollLines.fire({ amount: this._dragScrollAmount, suppressScrollEvent: false });\n        let e = this._bufferService.buffer;\n        this._dragScrollAmount > 0 ? (this._activeSelectionMode !== 3 && (this._model.selectionEnd[0] = this._bufferService.cols), this._model.selectionEnd[1] = Math.min(e.ydisp + this._bufferService.rows, e.lines.length - 1)) : (this._activeSelectionMode !== 3 && (this._model.selectionEnd[0] = 0), this._model.selectionEnd[1] = e.ydisp), this.refresh();\n      }\n    }\n    _handleMouseUp(e) {\n      let i5 = e.timeStamp - this._mouseDownTimeStamp;\n      if (this._removeMouseDownListeners(), this.selectionText.length <= 1 && i5 < To && e.altKey && this._optionsService.rawOptions.altClickMovesCursor) {\n        if (this._bufferService.buffer.ybase === this._bufferService.buffer.ydisp) {\n          let r = this._mouseCoordsService.getCoords(e, this._element, this._bufferService.cols, this._bufferService.rows, false);\n          if (r && r[0] !== void 0 && r[1] !== void 0) {\n            let s4 = un(r[0] - 1, r[1] - 1, this._bufferService, this._coreService.decPrivateModes.applicationCursorKeys);\n            this._coreService.triggerDataEvent(s4, true);\n          }\n        }\n      } else this._fireEventIfSelectionChanged();\n    }\n    _fireEventIfSelectionChanged() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd, r = !!e && !!i5 && (e[0] !== i5[0] || e[1] !== i5[1]);\n      if (!r) {\n        this._oldHasSelection && this._fireOnSelectionChange(e, i5, r);\n        return;\n      }\n      !e || !i5 || (!this._oldSelectionStart || !this._oldSelectionEnd || e[0] !== this._oldSelectionStart[0] || e[1] !== this._oldSelectionStart[1] || i5[0] !== this._oldSelectionEnd[0] || i5[1] !== this._oldSelectionEnd[1]) && this._fireOnSelectionChange(e, i5, r);\n    }\n    _fireOnSelectionChange(e, i5, r) {\n      this._oldSelectionStart = e, this._oldSelectionEnd = i5, this._oldHasSelection = r, this._onSelectionChange.fire();\n    }\n    _handleBufferActivate(e) {\n      this.clearSelection(), this._trimListener.dispose(), this._trimListener = e.activeBuffer.lines.onTrim((i5) => this._handleTrim(i5));\n    }\n    _convertViewportColToCharacterIndex(e, i5) {\n      let r = i5;\n      for (let s4 = 0; i5 >= s4; s4++) {\n        let o2 = e.loadCell(s4, this._workCell).getChars().length;\n        this._workCell.getWidth() === 0 ? r-- : o2 > 1 && i5 !== s4 && (r += o2 - 1);\n      }\n      return r;\n    }\n    setSelection(e, i5, r) {\n      this._model.clearSelection(), this._removeMouseDownListeners(), this._model.selectionStart = [e, i5], this._model.selectionStartLength = r, this.refresh(), this._fireEventIfSelectionChanged();\n    }\n    rightClickSelect(e) {\n      this._isClickInSelection(e) || (this._selectWordAtCursor(e, false) && this.refresh(true), this._fireEventIfSelectionChanged());\n    }\n    _getWordAt(e, i5, r = true, s4 = true) {\n      if (e[0] >= this._bufferService.cols) return;\n      let o2 = this._bufferService.buffer, a2 = o2.lines.get(e[1]);\n      if (!a2) return;\n      let l4 = o2.translateBufferLineToString(e[1], false), h3 = this._convertViewportColToCharacterIndex(a2, e[0]), d3 = h3, c2 = e[0] - h3, u3 = 0, _5 = 0, p3 = 0, b4 = 0;\n      if (l4.charAt(h3) === " ") {\n        for (; h3 > 0 && l4.charAt(h3 - 1) === " "; ) h3--;\n        for (; d3 < l4.length && l4.charAt(d3 + 1) === " "; ) d3++;\n      } else {\n        let I4 = e[0], w6 = e[0];\n        a2.getWidth(I4) === 0 && (u3++, I4--), a2.getWidth(w6) === 2 && (_5++, w6++);\n        let x5 = a2.getString(w6).length;\n        for (x5 > 1 && (b4 += x5 - 1, d3 += x5 - 1); I4 > 0 && h3 > 0 && !this._isCharWordSeparator(a2.loadCell(I4 - 1, this._workCell)); ) {\n          a2.loadCell(I4 - 1, this._workCell);\n          let ie4 = this._workCell.getChars().length;\n          this._workCell.getWidth() === 0 ? (u3++, I4--) : ie4 > 1 && (p3 += ie4 - 1, h3 -= ie4 - 1), h3--, I4--;\n        }\n        for (; w6 < a2.length && d3 + 1 < l4.length && !this._isCharWordSeparator(a2.loadCell(w6 + 1, this._workCell)); ) {\n          a2.loadCell(w6 + 1, this._workCell);\n          let ie4 = this._workCell.getChars().length;\n          this._workCell.getWidth() === 2 ? (_5++, w6++) : ie4 > 1 && (b4 += ie4 - 1, d3 += ie4 - 1), d3++, w6++;\n        }\n      }\n      d3++;\n      let f5 = h3 + c2 - u3 + p3, S4 = Math.min(this._bufferService.cols, d3 - h3 + u3 + _5 - p3 - b4);\n      if (!(!i5 && l4.slice(h3, d3).trim() === "")) {\n        if (r && f5 === 0 && a2.getCodePoint(0) !== 32) {\n          let I4 = o2.lines.get(e[1] - 1);\n          if (I4 && a2.isWrapped && I4.getCodePoint(this._bufferService.cols - 1) !== 32) {\n            let w6 = this._getWordAt([this._bufferService.cols - 1, e[1] - 1], false, true, false);\n            if (w6) {\n              let x5 = this._bufferService.cols - w6.start;\n              f5 -= x5, S4 += x5;\n            }\n          }\n        }\n        if (s4 && f5 + S4 === this._bufferService.cols && a2.getCodePoint(this._bufferService.cols - 1) !== 32) {\n          let I4 = o2.lines.get(e[1] + 1);\n          if (I4?.isWrapped && I4.getCodePoint(0) !== 32) {\n            let w6 = this._getWordAt([0, e[1] + 1], false, false, true);\n            w6 && (S4 += w6.length);\n          }\n        }\n        return { start: f5, length: S4 };\n      }\n    }\n    _selectWordAt(e, i5) {\n      let r = this._getWordAt(e, i5);\n      if (r) {\n        for (; r.start < 0; ) r.start += this._bufferService.cols, e[1]--;\n        this._model.selectionStart = [r.start, e[1]], this._model.selectionStartLength = r.length;\n      }\n    }\n    _selectToWordAt(e) {\n      let i5 = this._getWordAt(e, true);\n      if (i5) {\n        let r = e[1];\n        for (; i5.start < 0; ) i5.start += this._bufferService.cols, r--;\n        if (!this._model.areSelectionValuesReversed()) for (; i5.start + i5.length > this._bufferService.cols; ) i5.length -= this._bufferService.cols, r++;\n        this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? i5.start : i5.start + i5.length, r];\n      }\n    }\n    _isCharWordSeparator(e) {\n      return e.getWidth() === 0 ? false : this._optionsService.rawOptions.wordSeparator.indexOf(e.getChars()) >= 0;\n    }\n    _selectLineAt(e) {\n      let i5 = this._bufferService.buffer.getWrappedRangeForLine(e), r = { start: { x: 0, y: i5.first }, end: { x: this._bufferService.cols - 1, y: i5.last } };\n      this._model.selectionStart = [0, i5.first], this._model.selectionEnd = void 0, this._model.selectionStartLength = ms(r, this._bufferService.cols);\n    }\n  };\n  xt3 = E4([m3(3, L5), m3(4, Y), m3(5, Be2), m3(6, R3), m3(7, G4), m3(8, z3)], xt3);\n  var Qt2 = class {\n    constructor() {\n      this._data = {};\n    }\n    set(t, e, i5) {\n      this._data[t] || (this._data[t] = {}), this._data[t][e] = i5;\n    }\n    get(t, e) {\n      return this._data[t] ? this._data[t][e] : void 0;\n    }\n    clear() {\n      this._data = {};\n    }\n  };\n  var ei = class {\n    constructor() {\n      this._color = new Qt2();\n      this._css = new Qt2();\n    }\n    setCss(t, e, i5) {\n      this._css.set(t, e, i5);\n    }\n    getCss(t, e) {\n      return this._css.get(t, e);\n    }\n    setColor(t, e, i5) {\n      this._color.set(t, e, i5);\n    }\n    getColor(t, e) {\n      return this._color.get(t, e);\n    }\n    clear() {\n      this._color.clear(), this._css.clear();\n    }\n  };\n  var $3 = Object.freeze((() => {\n    let n11 = [M3.toColor("#2e3436"), M3.toColor("#cc0000"), M3.toColor("#4e9a06"), M3.toColor("#c4a000"), M3.toColor("#3465a4"), M3.toColor("#75507b"), M3.toColor("#06989a"), M3.toColor("#d3d7cf"), M3.toColor("#555753"), M3.toColor("#ef2929"), M3.toColor("#8ae234"), M3.toColor("#fce94f"), M3.toColor("#729fcf"), M3.toColor("#ad7fa8"), M3.toColor("#34e2e2"), M3.toColor("#eeeeec")], t = [0, 95, 135, 175, 215, 255];\n    for (let e = 0; e < 216; e++) {\n      let i5 = t[e / 36 % 6 | 0], r = t[e / 6 % 6 | 0], s4 = t[e % 6];\n      n11.push({ css: B4.toCss(i5, r, s4), rgba: B4.toRgba(i5, r, s4) });\n    }\n    for (let e = 0; e < 24; e++) {\n      let i5 = 8 + e * 10;\n      n11.push({ css: B4.toCss(i5, i5, i5), rgba: B4.toRgba(i5, i5, i5) });\n    }\n    return n11;\n  })());\n  var Ye2 = M3.toColor("#ffffff");\n  var ii = M3.toColor("#000000");\n  var _n2 = M3.toColor("#ffffff");\n  var mn = ii;\n  var ti = { css: "rgba(255, 255, 255, 0.3)", rgba: 4294967117 };\n  var Lo = Ye2;\n  var wt = class extends g5 {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._contrastCache = new ei();\n      this._halfContrastCache = new ei();\n      this._onChangeColors = this._register(new v5());\n      this.onChangeColors = this._onChangeColors.event;\n      this._colors = { foreground: Ye2, background: ii, cursor: _n2, cursorAccent: mn, selectionForeground: void 0, selectionBackgroundTransparent: ti, selectionBackgroundOpaque: k4.blend(ii, ti), selectionInactiveBackgroundTransparent: ti, selectionInactiveBackgroundOpaque: k4.blend(ii, ti), scrollbarSliderBackground: k4.opacity(Ye2, 0.2), scrollbarSliderHoverBackground: k4.opacity(Ye2, 0.4), scrollbarSliderActiveBackground: k4.opacity(Ye2, 0.5), overviewRulerBorder: Ye2, ansi: $3.slice(), contrastCache: this._contrastCache, halfContrastCache: this._halfContrastCache }, this._updateRestoreColors(), this._setTheme(this._optionsService.rawOptions.theme), this._register(this._optionsService.onSpecificOptionChange("minimumContrastRatio", () => this._contrastCache.clear())), this._register(this._optionsService.onSpecificOptionChange("theme", () => this._setTheme(this._optionsService.rawOptions.theme)));\n    }\n    get colors() {\n      return this._colors;\n    }\n    _setTheme(e = {}) {\n      let i5 = this._colors;\n      if (i5.foreground = P4(e.foreground, Ye2), i5.background = P4(e.background, ii), i5.cursor = k4.blend(i5.background, P4(e.cursor, _n2)), i5.cursorAccent = k4.blend(i5.background, P4(e.cursorAccent, mn)), i5.selectionBackgroundTransparent = P4(e.selectionBackground, ti), i5.selectionBackgroundOpaque = k4.blend(i5.background, i5.selectionBackgroundTransparent), i5.selectionInactiveBackgroundTransparent = P4(e.selectionInactiveBackground, i5.selectionBackgroundTransparent), i5.selectionInactiveBackgroundOpaque = k4.blend(i5.background, i5.selectionInactiveBackgroundTransparent), i5.selectionForeground = e.selectionForeground ? P4(e.selectionForeground, ss) : void 0, i5.selectionForeground === ss && (i5.selectionForeground = void 0), k4.isOpaque(i5.selectionBackgroundTransparent) && (i5.selectionBackgroundTransparent = k4.opacity(i5.selectionBackgroundTransparent, 0.3)), k4.isOpaque(i5.selectionInactiveBackgroundTransparent) && (i5.selectionInactiveBackgroundTransparent = k4.opacity(i5.selectionInactiveBackgroundTransparent, 0.3)), i5.scrollbarSliderBackground = P4(e.scrollbarSliderBackground, k4.opacity(i5.foreground, 0.2)), i5.scrollbarSliderHoverBackground = P4(e.scrollbarSliderHoverBackground, k4.opacity(i5.foreground, 0.4)), i5.scrollbarSliderActiveBackground = P4(e.scrollbarSliderActiveBackground, k4.opacity(i5.foreground, 0.5)), i5.overviewRulerBorder = P4(e.overviewRulerBorder, Lo), i5.ansi = $3.slice(), i5.ansi[0] = P4(e.black, $3[0]), i5.ansi[1] = P4(e.red, $3[1]), i5.ansi[2] = P4(e.green, $3[2]), i5.ansi[3] = P4(e.yellow, $3[3]), i5.ansi[4] = P4(e.blue, $3[4]), i5.ansi[5] = P4(e.magenta, $3[5]), i5.ansi[6] = P4(e.cyan, $3[6]), i5.ansi[7] = P4(e.white, $3[7]), i5.ansi[8] = P4(e.brightBlack, $3[8]), i5.ansi[9] = P4(e.brightRed, $3[9]), i5.ansi[10] = P4(e.brightGreen, $3[10]), i5.ansi[11] = P4(e.brightYellow, $3[11]), i5.ansi[12] = P4(e.brightBlue, $3[12]), i5.ansi[13] = P4(e.brightMagenta, $3[13]), i5.ansi[14] = P4(e.brightCyan, $3[14]), i5.ansi[15] = P4(e.brightWhite, $3[15]), e.extendedAnsi) {\n        let r = Math.min(i5.ansi.length - 16, e.extendedAnsi.length);\n        for (let s4 = 0; s4 < r; s4++) i5.ansi[s4 + 16] = P4(e.extendedAnsi[s4], $3[s4 + 16]);\n      }\n      this._contrastCache.clear(), this._halfContrastCache.clear(), this._updateRestoreColors(), this._onChangeColors.fire(this.colors);\n    }\n    restoreColor(e) {\n      this._restoreColor(e), this._onChangeColors.fire(this.colors);\n    }\n    _restoreColor(e) {\n      if (e === void 0) {\n        for (let i5 = 0; i5 < this._restoreColors.ansi.length; ++i5) this._colors.ansi[i5] = this._restoreColors.ansi[i5];\n        return;\n      }\n      switch (e) {\n        case 256:\n          this._colors.foreground = this._restoreColors.foreground;\n          break;\n        case 257:\n          this._colors.background = this._restoreColors.background;\n          break;\n        case 258:\n          this._colors.cursor = this._restoreColors.cursor;\n          break;\n        default:\n          this._colors.ansi[e] = this._restoreColors.ansi[e];\n      }\n    }\n    modifyColors(e) {\n      e(this._colors), this._onChangeColors.fire(this.colors);\n    }\n    _updateRestoreColors() {\n      this._restoreColors = { foreground: this._colors.foreground, background: this._colors.background, cursor: this._colors.cursor, ansi: this._colors.ansi.slice() };\n    }\n  };\n  wt = E4([m3(0, R3)], wt);\n  function P4(n11, t) {\n    if (n11 !== void 0) try {\n      return M3.toColor(n11);\n    } catch {\n    }\n    return t;\n  }\n  var Ao = { 48: ["0", ")"], 49: ["1", "!"], 50: ["2", "@"], 51: ["3", "#"], 52: ["4", "$"], 53: ["5", "%"], 54: ["6", "^"], 55: ["7", "&"], 56: ["8", "*"], 57: ["9", "("], 186: [";", ":"], 187: ["=", "+"], 188: [",", "<"], 189: ["-", "_"], 190: [".", ">"], 191: ["/", "?"], 192: ["`", "~"], 219: ["[", "{"], 220: ["\\\\", "|"], 221: ["]", "}"], 222: ["\'", \'"\'] };\n  function vn(n11, t, e, i5) {\n    let r = { type: 0, cancel: false, key: void 0 }, s4 = (n11.shiftKey ? 1 : 0) | (n11.altKey ? 2 : 0) | (n11.ctrlKey ? 4 : 0) | (n11.metaKey ? 8 : 0);\n    switch (n11.keyCode) {\n      case 0:\n        n11.key === "UIKeyInputUpArrow" ? t ? r.key = "\\x1BOA" : r.key = "\\x1B[A" : n11.key === "UIKeyInputLeftArrow" ? t ? r.key = "\\x1BOD" : r.key = "\\x1B[D" : n11.key === "UIKeyInputRightArrow" ? t ? r.key = "\\x1BOC" : r.key = "\\x1B[C" : n11.key === "UIKeyInputDownArrow" && (t ? r.key = "\\x1BOB" : r.key = "\\x1B[B");\n        break;\n      case 8:\n        r.key = n11.ctrlKey ? "\\b" : "\\x7F", n11.altKey && (r.key = "\\x1B" + r.key);\n        break;\n      case 9:\n        if (n11.shiftKey) {\n          r.key = "\\x1B[Z";\n          break;\n        }\n        r.key = "\t", r.cancel = true;\n        break;\n      case 13:\n        n11.key === "c" && n11.ctrlKey ? r.key = "\u0003" : r.key = n11.altKey ? "\\x1B\\r" : "\\r", r.cancel = true;\n        break;\n      case 27:\n        r.key = "\\x1B", n11.altKey && (r.key = "\\x1B\\x1B"), r.cancel = true;\n        break;\n      case 37:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "D" : t ? r.key = "\\x1BOD" : r.key = "\\x1B[D";\n        break;\n      case 39:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "C" : t ? r.key = "\\x1BOC" : r.key = "\\x1B[C";\n        break;\n      case 38:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "A" : t ? r.key = "\\x1BOA" : r.key = "\\x1B[A";\n        break;\n      case 40:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "B" : t ? r.key = "\\x1BOB" : r.key = "\\x1B[B";\n        break;\n      case 45:\n        !n11.shiftKey && !n11.ctrlKey && (r.key = "\\x1B[2~");\n        break;\n      case 46:\n        s4 ? r.key = "\\x1B[3;" + (s4 + 1) + "~" : r.key = "\\x1B[3~";\n        break;\n      case 36:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "H" : t ? r.key = "\\x1BOH" : r.key = "\\x1B[H";\n        break;\n      case 35:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "F" : t ? r.key = "\\x1BOF" : r.key = "\\x1B[F";\n        break;\n      case 33:\n        n11.shiftKey ? r.type = 2 : n11.ctrlKey ? r.key = "\\x1B[5;" + (s4 + 1) + "~" : r.key = "\\x1B[5~";\n        break;\n      case 34:\n        n11.shiftKey ? r.type = 3 : n11.ctrlKey ? r.key = "\\x1B[6;" + (s4 + 1) + "~" : r.key = "\\x1B[6~";\n        break;\n      case 112:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "P" : r.key = "\\x1BOP";\n        break;\n      case 113:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "Q" : r.key = "\\x1BOQ";\n        break;\n      case 114:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "R" : r.key = "\\x1BOR";\n        break;\n      case 115:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "S" : r.key = "\\x1BOS";\n        break;\n      case 116:\n        s4 ? r.key = "\\x1B[15;" + (s4 + 1) + "~" : r.key = "\\x1B[15~";\n        break;\n      case 117:\n        s4 ? r.key = "\\x1B[17;" + (s4 + 1) + "~" : r.key = "\\x1B[17~";\n        break;\n      case 118:\n        s4 ? r.key = "\\x1B[18;" + (s4 + 1) + "~" : r.key = "\\x1B[18~";\n        break;\n      case 119:\n        s4 ? r.key = "\\x1B[19;" + (s4 + 1) + "~" : r.key = "\\x1B[19~";\n        break;\n      case 120:\n        s4 ? r.key = "\\x1B[20;" + (s4 + 1) + "~" : r.key = "\\x1B[20~";\n        break;\n      case 121:\n        s4 ? r.key = "\\x1B[21;" + (s4 + 1) + "~" : r.key = "\\x1B[21~";\n        break;\n      case 122:\n        s4 ? r.key = "\\x1B[23;" + (s4 + 1) + "~" : r.key = "\\x1B[23~";\n        break;\n      case 123:\n        s4 ? r.key = "\\x1B[24;" + (s4 + 1) + "~" : r.key = "\\x1B[24~";\n        break;\n      default:\n        if (n11.ctrlKey && !n11.shiftKey && !n11.altKey && !n11.metaKey) n11.keyCode >= 65 && n11.keyCode <= 90 ? r.key = String.fromCharCode(n11.keyCode - 64) : n11.keyCode === 32 ? r.key = "\\0" : n11.keyCode >= 51 && n11.keyCode <= 55 ? r.key = String.fromCharCode(n11.keyCode - 51 + 27) : n11.keyCode === 56 ? r.key = "\\x7F" : n11.key === "/" ? r.key = "\u001f" : n11.keyCode === 219 ? r.key = "\\x1B" : n11.keyCode === 220 ? r.key = "\u001c" : n11.keyCode === 221 && (r.key = "\u001d");\n        else if ((!e || i5) && n11.altKey && !n11.metaKey) {\n          let a2 = Ao[n11.keyCode]?.[n11.shiftKey ? 1 : 0];\n          if (a2) r.key = "\\x1B" + a2;\n          else if (n11.keyCode >= 65 && n11.keyCode <= 90) {\n            let l4 = n11.ctrlKey ? n11.keyCode - 64 : n11.keyCode + 32, h3 = String.fromCharCode(l4);\n            n11.shiftKey && (h3 = h3.toUpperCase()), r.key = "\\x1B" + h3;\n          } else if (n11.keyCode === 32) r.key = "\\x1B" + (n11.ctrlKey ? "\\0" : " ");\n          else if (n11.key === "Dead" && n11.code.startsWith("Key")) {\n            let l4 = n11.code.slice(3, 4);\n            n11.shiftKey || (l4 = l4.toLowerCase()), r.key = "\\x1B" + l4, r.cancel = true;\n          }\n        } else if (e && !n11.altKey && !n11.ctrlKey && !n11.shiftKey && n11.metaKey) n11.keyCode === 65 && (r.type = 1);\n        else if (n11.key && !n11.ctrlKey && !n11.altKey && !n11.metaKey && n11.keyCode >= 48 && n11.key.length === 1) r.key = n11.key;\n        else if (n11.key && n11.ctrlKey && n11.shiftKey) switch (n11.code) {\n          case "Minus":\n            r.key = "\u001f";\n            break;\n          case "Digit2":\n            r.key = "\\0";\n            break;\n          case "Digit6":\n            r.key = "\u001e";\n            break;\n        }\n        break;\n    }\n    return r;\n  }\n  var ri = class {\n    constructor() {\n      this._functionalKeyCodes = { Escape: 27, Enter: 13, Tab: 9, Backspace: 127, CapsLock: 57358, ScrollLock: 57359, NumLock: 57360, PrintScreen: 57361, Pause: 57362, ContextMenu: 57363, F13: 57376, F14: 57377, F15: 57378, F16: 57379, F17: 57380, F18: 57381, F19: 57382, F20: 57383, F21: 57384, F22: 57385, F23: 57386, F24: 57387, F25: 57388, KP_0: 57399, KP_1: 57400, KP_2: 57401, KP_3: 57402, KP_4: 57403, KP_5: 57404, KP_6: 57405, KP_7: 57406, KP_8: 57407, KP_9: 57408, KP_Decimal: 57409, KP_Divide: 57410, KP_Multiply: 57411, KP_Subtract: 57412, KP_Add: 57413, KP_Enter: 57414, KP_Equal: 57415, ShiftLeft: 57441, ShiftRight: 57447, ControlLeft: 57442, ControlRight: 57448, AltLeft: 57443, AltRight: 57449, MetaLeft: 57444, MetaRight: 57450, MediaPlayPause: 57430, MediaStop: 57432, MediaTrackNext: 57435, MediaTrackPrevious: 57436, AudioVolumeDown: 57438, AudioVolumeUp: 57439, AudioVolumeMute: 57440 };\n      this._csiTildeKeys = { Insert: 2, Delete: 3, PageUp: 5, PageDown: 6, F5: 15, F6: 17, F7: 18, F8: 19, F9: 20, F10: 21, F11: 23, F12: 24 };\n      this._csiLetterKeys = { ArrowUp: "A", ArrowDown: "B", ArrowRight: "C", ArrowLeft: "D", Home: "H", End: "F" };\n      this._ss3FunctionKeys = { F1: "P", F2: "Q", F3: "R", F4: "S" };\n    }\n    _getNumpadKeyCode(t) {\n      if (t.code.startsWith("Numpad")) {\n        let e = t.code.slice(6);\n        if (e >= "0" && e <= "9") return 57399 + parseInt(e, 10);\n        switch (e) {\n          case "Decimal":\n            return 57409;\n          case "Divide":\n            return 57410;\n          case "Multiply":\n            return 57411;\n          case "Subtract":\n            return 57412;\n          case "Add":\n            return 57413;\n          case "Enter":\n            return 57414;\n          case "Equal":\n            return 57415;\n        }\n      }\n    }\n    _getModifierKeyCode(t) {\n      switch (t.code) {\n        case "ShiftLeft":\n          return 57441;\n        case "ShiftRight":\n          return 57447;\n        case "ControlLeft":\n          return 57442;\n        case "ControlRight":\n          return 57448;\n        case "AltLeft":\n          return 57443;\n        case "AltRight":\n          return 57449;\n        case "MetaLeft":\n          return 57444;\n        case "MetaRight":\n          return 57450;\n      }\n    }\n    _encodeModifiers(t) {\n      let e = 0;\n      return t.shiftKey && (e |= 1), t.altKey && (e |= 2), t.ctrlKey && (e |= 4), t.metaKey && (e |= 8), e > 0 ? e + 1 : 0;\n    }\n    _getKeyCode(t, e) {\n      let i5 = this._getNumpadKeyCode(t);\n      if (i5 !== void 0) return i5;\n      let r = this._getModifierKeyCode(t);\n      if (r !== void 0) return r;\n      let s4 = this._functionalKeyCodes[t.key];\n      if (s4 !== void 0) return s4;\n      if ((t.shiftKey || e && t.altKey) && t.code) {\n        if (t.code.startsWith("Digit") && t.code.length === 6) {\n          let o2 = t.code.charAt(5);\n          if (o2 >= "0" && o2 <= "9") return o2.charCodeAt(0);\n        }\n        if (t.code.startsWith("Key") && t.code.length === 4) return t.code.charAt(3).toLowerCase().charCodeAt(0);\n      }\n      if (t.key.length === 1) {\n        let o2 = t.key.codePointAt(0);\n        return o2 >= 65 && o2 <= 90 ? o2 + 32 : o2;\n      }\n    }\n    _isModifierKey(t) {\n      return t.key === "Shift" || t.key === "Control" || t.key === "Alt" || t.key === "Meta";\n    }\n    _isLockKey(t) {\n      return t.key === "CapsLock" || t.key === "NumLock" || t.key === "ScrollLock";\n    }\n    _buildCsiLetterSequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1;\n      if (e > 0 || s4) {\n        let o2 = "\\x1B[1;" + (e > 0 ? e : "1");\n        return s4 && (o2 += ":" + i5), o2 += t, o2;\n      }\n      return "\\x1B[" + t;\n    }\n    _buildSs3Sequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1;\n      if (e > 0 || s4) {\n        let o2 = "\\x1B[1;" + (e > 0 ? e : "1");\n        return s4 && (o2 += ":" + i5), o2 += t, o2;\n      }\n      return "\\x1BO" + t;\n    }\n    _buildCsiTildeSequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1, o2 = "\\x1B[" + t;\n      return (e > 0 || s4) && (o2 += ";" + (e > 0 ? e : "1"), s4 && (o2 += ":" + i5)), o2 += "~", o2;\n    }\n    _buildCsiUSequence(t, e, i5, r, s4, o2, a2) {\n      let l4 = !!(s4 & 2), h3 = !!(s4 & 4), d3 = "\\x1B[" + e, c2;\n      h3 && t.shiftKey && t.key.length === 1 && !o2 && !a2 && (c2 = t.key.codePointAt(0), d3 += ":" + c2);\n      let _5 = !!(s4 & 16) && r !== 3 && t.key.length === 1 && !o2 && !a2 && !t.ctrlKey ? t.key.codePointAt(0) : void 0, p3 = l4 && r !== 1 && (r === 3 || _5 === void 0);\n      return (i5 > 0 || p3 || _5 !== void 0) && (d3 += ";", i5 > 0 ? d3 += i5 : p3 && (d3 += "1"), p3 && (d3 += ":" + r)), _5 !== void 0 && (d3 += ";" + _5), d3 += "u", d3;\n    }\n    evaluate(t, e, i5 = 1, r = false) {\n      let s4 = { type: 0, cancel: false, key: void 0 }, o2 = this._encodeModifiers(t), a2 = this._isModifierKey(t), l4 = !!(e & 2);\n      if (!l4 && i5 === 3 || a2 && !(e & 8) || this._isLockKey(t) && !(e & 8)) return s4;\n      let h3 = this._csiLetterKeys[t.key];\n      if (h3) return s4.key = this._buildCsiLetterSequence(h3, o2, i5, l4), s4.cancel = true, s4;\n      let d3 = this._ss3FunctionKeys[t.key];\n      if (d3) return s4.key = this._buildSs3Sequence(d3, o2, i5, l4), s4.cancel = true, s4;\n      let c2 = this._csiTildeKeys[t.key];\n      if (c2 !== void 0) return s4.key = this._buildCsiTildeSequence(c2, o2, i5, l4), s4.cancel = true, s4;\n      let u3 = this._getKeyCode(t, r);\n      if (u3 === void 0) return s4;\n      let _5 = this._functionalKeyCodes[t.key] !== void 0 || this._getNumpadKeyCode(t) !== void 0, p3 = false;\n      if (e & 8 || l4 ? p3 = true : e & 1 && (_5 && !(u3 === 13 || u3 === 9 || u3 === 127) ? p3 = true : o2 > 0 && (t.shiftKey && !t.ctrlKey && !t.altKey && !t.metaKey && t.key.length === 1 ? p3 = false : p3 = true)), p3) s4.key = this._buildCsiUSequence(t, u3, o2, i5, e, _5, a2), s4.cancel = true;\n      else {\n        let b4 = u3 === 13 ? "\\r" : u3 === 9 ? "\t" : u3 === 127 ? "\\x7F" : void 0;\n        b4 ? s4.key = b4 : t.key.length === 1 && !t.ctrlKey && !t.altKey && !t.metaKey && (s4.key = t.key);\n      }\n      return s4;\n    }\n    static shouldUseProtocol(t) {\n      return t > 0;\n    }\n  };\n  var ir2 = class {\n    constructor() {\n      this._codeToVk = { KeyA: 65, KeyB: 66, KeyC: 67, KeyD: 68, KeyE: 69, KeyF: 70, KeyG: 71, KeyH: 72, KeyI: 73, KeyJ: 74, KeyK: 75, KeyL: 76, KeyM: 77, KeyN: 78, KeyO: 79, KeyP: 80, KeyQ: 81, KeyR: 82, KeyS: 83, KeyT: 84, KeyU: 85, KeyV: 86, KeyW: 87, KeyX: 88, KeyY: 89, KeyZ: 90, Digit0: 48, Digit1: 49, Digit2: 50, Digit3: 51, Digit4: 52, Digit5: 53, Digit6: 54, Digit7: 55, Digit8: 56, Digit9: 57, F1: 112, F2: 113, F3: 114, F4: 115, F5: 116, F6: 117, F7: 118, F8: 119, F9: 120, F10: 121, F11: 122, F12: 123, F13: 124, F14: 125, F15: 126, F16: 127, F17: 128, F18: 129, F19: 130, F20: 131, F21: 132, F22: 133, F23: 134, F24: 135, Numpad0: 96, Numpad1: 97, Numpad2: 98, Numpad3: 99, Numpad4: 100, Numpad5: 101, Numpad6: 102, Numpad7: 103, Numpad8: 104, Numpad9: 105, NumpadMultiply: 106, NumpadAdd: 107, NumpadSeparator: 108, NumpadSubtract: 109, NumpadDecimal: 110, NumpadDivide: 111, NumpadEnter: 13, NumLock: 144, ArrowUp: 38, ArrowDown: 40, ArrowLeft: 37, ArrowRight: 39, Home: 36, End: 35, PageUp: 33, PageDown: 34, Insert: 45, Delete: 46, ShiftLeft: 16, ShiftRight: 16, ControlLeft: 17, ControlRight: 17, AltLeft: 18, AltRight: 18, MetaLeft: 91, MetaRight: 92, CapsLock: 20, ScrollLock: 145, Escape: 27, Enter: 13, Tab: 9, Space: 32, Backspace: 8, Pause: 19, ContextMenu: 93, PrintScreen: 44, Semicolon: 186, Equal: 187, Comma: 188, Minus: 189, Period: 190, Slash: 191, Backquote: 192, BracketLeft: 219, Backslash: 220, BracketRight: 221, Quote: 222, IntlBackslash: 226 };\n      this._codeToScancode = { KeyQ: 16, KeyW: 17, KeyE: 18, KeyR: 19, KeyT: 20, KeyY: 21, KeyU: 22, KeyI: 23, KeyO: 24, KeyP: 25, KeyA: 30, KeyS: 31, KeyD: 32, KeyF: 33, KeyG: 34, KeyH: 35, KeyJ: 36, KeyK: 37, KeyL: 38, KeyZ: 44, KeyX: 45, KeyC: 46, KeyV: 47, KeyB: 48, KeyN: 49, KeyM: 50, Digit1: 2, Digit2: 3, Digit3: 4, Digit4: 5, Digit5: 6, Digit6: 7, Digit7: 8, Digit8: 9, Digit9: 10, Digit0: 11, F1: 59, F2: 60, F3: 61, F4: 62, F5: 63, F6: 64, F7: 65, F8: 66, F9: 67, F10: 68, F11: 87, F12: 88, Numpad0: 82, Numpad1: 79, Numpad2: 80, Numpad3: 81, Numpad4: 75, Numpad5: 76, Numpad6: 77, Numpad7: 71, Numpad8: 72, Numpad9: 73, NumpadMultiply: 55, NumpadAdd: 78, NumpadSubtract: 74, NumpadDecimal: 83, NumpadDivide: 53, NumpadEnter: 28, NumLock: 69, ArrowUp: 72, ArrowDown: 80, ArrowLeft: 75, ArrowRight: 77, Home: 71, End: 79, PageUp: 73, PageDown: 81, Insert: 82, Delete: 83, ShiftLeft: 42, ShiftRight: 54, ControlLeft: 29, ControlRight: 29, AltLeft: 56, AltRight: 56, CapsLock: 58, ScrollLock: 70, Escape: 1, Enter: 28, Tab: 15, Space: 57, Backspace: 14, Pause: 69, Semicolon: 39, Equal: 13, Comma: 51, Minus: 12, Period: 52, Slash: 53, Backquote: 41, BracketLeft: 26, Backslash: 43, BracketRight: 27, Quote: 40 };\n      this._enhancedKeyCodes = /* @__PURE__ */ new Set(["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Home", "End", "PageUp", "PageDown", "Insert", "Delete", "NumpadEnter", "NumpadDivide", "ControlRight", "AltRight", "PrintScreen", "Pause", "ContextMenu", "MetaLeft", "MetaRight"]);\n      this._keyToControlChar = { Enter: 13, Backspace: 8, Tab: 9, Escape: 27 };\n    }\n    _getVirtualKeyCode(t) {\n      let e = this._codeToVk[t.code];\n      return e !== void 0 ? e : t.keyCode || 0;\n    }\n    _getScanCode(t) {\n      return this._codeToScancode[t.code] || 0;\n    }\n    _getUnicodeChar(t) {\n      if (t.ctrlKey && !t.altKey && !t.metaKey) {\n        if (t.key === "Enter") return 10;\n        if (t.key === "Backspace") return 127;\n      }\n      let e = this._keyToControlChar[t.key];\n      if (e !== void 0) return e;\n      if (t.key.length === 1) {\n        let i5 = t.key.codePointAt(0) || 0;\n        if (t.ctrlKey && !t.altKey && !t.metaKey) {\n          if (i5 >= 65 && i5 <= 90) return i5 - 64;\n          if (i5 >= 97 && i5 <= 122) return i5 - 96;\n        }\n        return i5;\n      }\n      return 0;\n    }\n    _getControlKeyState(t) {\n      let e = 0;\n      return t.shiftKey && (e |= 16), t.ctrlKey && (t.code === "ControlRight" ? e |= 4 : e |= 8), t.altKey && (t.code === "AltRight" ? e |= 1 : e |= 2), this._enhancedKeyCodes.has(t.code) && (e |= 256), e;\n    }\n    evaluateKeyboardEvent(t, e) {\n      let i5 = this._getVirtualKeyCode(t), r = this._getScanCode(t), s4 = this._getUnicodeChar(t), o2 = e ? 1 : 0, a2 = this._getControlKeyState(t);\n      return { type: 0, cancel: true, key: `\\x1B[${i5};${r};${s4};${o2};${a2};1_` };\n    }\n  };\n  var Tt3 = class {\n    constructor(t, e) {\n      this._coreService = t;\n      this._optionsService = e;\n    }\n    _getWin32InputMode() {\n      return this._win32InputMode ??= new ir2(), this._win32InputMode;\n    }\n    _getKittyKeyboard() {\n      return this._kittyKeyboard ??= new ri(), this._kittyKeyboard;\n    }\n    evaluateKeyDown(t) {\n      if (this.useWin32InputMode) return this._getWin32InputMode().evaluateKeyboardEvent(t, true);\n      let e = this._coreService.kittyKeyboard.flags;\n      return this.useKitty ? this._getKittyKeyboard().evaluate(t, e, t.repeat ? 2 : 1, ee3 && this._optionsService.rawOptions.macOptionIsMeta) : vn(t, this._coreService.decPrivateModes.applicationCursorKeys, ee3, this._optionsService.rawOptions.macOptionIsMeta);\n    }\n    evaluateKeyUp(t) {\n      if (this.useWin32InputMode) return this._getWin32InputMode().evaluateKeyboardEvent(t, false);\n      let e = this._coreService.kittyKeyboard.flags;\n      if (this.useKitty && e & 2) return this._getKittyKeyboard().evaluate(t, e, 3, ee3 && this._optionsService.rawOptions.macOptionIsMeta);\n    }\n    get useKitty() {\n      let t = this._coreService.kittyKeyboard.flags;\n      return !!(this._optionsService.rawOptions.vtExtensions?.kittyKeyboard && ri.shouldUseProtocol(t));\n    }\n    get useWin32InputMode() {\n      return !!(this._optionsService.rawOptions.vtExtensions?.win32InputMode && this._coreService.decPrivateModes.win32InputMode);\n    }\n  };\n  Tt3 = E4([m3(0, Y), m3(1, R3)], Tt3);\n  var Ss = class {\n    constructor(...t) {\n      this._entries = /* @__PURE__ */ new Map();\n      for (let [e, i5] of t) this.set(e, i5);\n    }\n    set(t, e) {\n      let i5 = this._entries.get(t);\n      return this._entries.set(t, e), i5;\n    }\n    forEach(t) {\n      for (let [e, i5] of this._entries.entries()) t(e, i5);\n    }\n    has(t) {\n      return this._entries.has(t);\n    }\n    get(t) {\n      return this._entries.get(t);\n    }\n  };\n  var rr = class {\n    constructor() {\n      this._services = new Ss();\n      this._services.set(tt3, this);\n    }\n    setService(t, e) {\n      this._services.set(t, e);\n    }\n    getService(t) {\n      return this._services.get(t);\n    }\n    createInstance(t, ...e) {\n      let i5 = Ys(t).sort((o2, a2) => o2.index - a2.index), r = [];\n      for (let o2 of i5) {\n        let a2 = this._services.get(o2.id);\n        if (!a2) throw new Error(`[createInstance] ${t.name} depends on UNKNOWN service ${o2.id._id}.`);\n        r.push(a2);\n      }\n      let s4 = i5.length > 0 ? i5[0].index : e.length;\n      if (e.length !== s4) throw new Error(`[createInstance] First service dependency of ${t.name} at position ${s4 + 1} conflicts with ${e.length} static arguments`);\n      return new t(...e, ...r);\n    }\n  };\n  var ko = { trace: 0, debug: 1, info: 2, warn: 3, error: 4, off: 5 };\n  var Po2 = "xterm.js: ";\n  var Dt2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._logLevel = 5;\n      this._updateLogLevel(), this._register(this._optionsService.onSpecificOptionChange("logLevel", () => this._updateLogLevel()));\n    }\n    get logLevel() {\n      return this._logLevel;\n    }\n    _updateLogLevel() {\n      this._logLevel = ko[this._optionsService.rawOptions.logLevel];\n    }\n    _evalLazyOptionalParams(e) {\n      for (let i5 = 0; i5 < e.length; i5++) typeof e[i5] == "function" && (e[i5] = e[i5]());\n    }\n    _log(e, i5, r) {\n      this._evalLazyOptionalParams(r), e.call(console, (this._optionsService.options.logger ? "" : Po2) + i5, ...r);\n    }\n    trace(e, ...i5) {\n      this._logLevel <= 0 && this._log(this._optionsService.options.logger?.trace.bind(this._optionsService.options.logger) ?? console.log, e, i5);\n    }\n    debug(e, ...i5) {\n      this._logLevel <= 1 && this._log(this._optionsService.options.logger?.debug.bind(this._optionsService.options.logger) ?? console.log, e, i5);\n    }\n    info(e, ...i5) {\n      this._logLevel <= 2 && this._log(this._optionsService.options.logger?.info.bind(this._optionsService.options.logger) ?? console.info, e, i5);\n    }\n    warn(e, ...i5) {\n      this._logLevel <= 3 && this._log(this._optionsService.options.logger?.warn.bind(this._optionsService.options.logger) ?? console.warn, e, i5);\n    }\n    error(e, ...i5) {\n      this._logLevel <= 4 && this._log(this._optionsService.options.logger?.error.bind(this._optionsService.options.logger) ?? console.error, e, i5);\n    }\n  };\n  Dt2 = E4([m3(0, R3)], Dt2);\n  var si = class extends g5 {\n    constructor(e) {\n      super();\n      this._maxLength = e;\n      this.onDeleteEmitter = this._register(new v5());\n      this.onDelete = this.onDeleteEmitter.event;\n      this.onInsertEmitter = this._register(new v5());\n      this.onInsert = this.onInsertEmitter.event;\n      this.onTrimEmitter = this._register(new v5());\n      this.onTrim = this.onTrimEmitter.event;\n      this._array = new Array(this._maxLength), this._startIndex = 0, this._length = 0;\n    }\n    get maxLength() {\n      return this._maxLength;\n    }\n    set maxLength(e) {\n      if (this._maxLength === e) return;\n      let i5 = new Array(e);\n      for (let r = 0; r < Math.min(e, this.length); r++) i5[r] = this._array[this._getCyclicIndex(r)];\n      this._array = i5, this._maxLength = e, this._startIndex = 0;\n    }\n    get length() {\n      return this._length;\n    }\n    set length(e) {\n      if (e > this._length) for (let i5 = this._length; i5 < e; i5++) this._array[i5] = void 0;\n      this._length = e;\n    }\n    get(e) {\n      return this._array[this._getCyclicIndex(e)];\n    }\n    set(e, i5) {\n      this._array[this._getCyclicIndex(e)] = i5;\n    }\n    push(e) {\n      this._array[this._getCyclicIndex(this._length)] = e, this._length === this._maxLength ? (this._startIndex = ++this._startIndex % this._maxLength, this.onTrimEmitter.fire(1)) : this._length++;\n    }\n    recycle() {\n      if (this._length !== this._maxLength) throw new Error("Can only recycle when the buffer is full");\n      return this._startIndex = ++this._startIndex % this._maxLength, this.onTrimEmitter.fire(1), this._array[this._getCyclicIndex(this._length - 1)];\n    }\n    get isFull() {\n      return this._length === this._maxLength;\n    }\n    pop() {\n      return this._array[this._getCyclicIndex(this._length-- - 1)];\n    }\n    splice(e, i5, ...r) {\n      if (i5) {\n        for (let s4 = e; s4 < this._length - i5; s4++) this._array[this._getCyclicIndex(s4)] = this._array[this._getCyclicIndex(s4 + i5)];\n        this._length -= i5, this.onDeleteEmitter.fire({ index: e, amount: i5 });\n      }\n      for (let s4 = this._length - 1; s4 >= e; s4--) this._array[this._getCyclicIndex(s4 + r.length)] = this._array[this._getCyclicIndex(s4)];\n      for (let s4 = 0; s4 < r.length; s4++) this._array[this._getCyclicIndex(e + s4)] = r[s4];\n      if (r.length && this.onInsertEmitter.fire({ index: e, amount: r.length }), this._length + r.length > this._maxLength) {\n        let s4 = this._length + r.length - this._maxLength;\n        this._startIndex += s4, this._length = this._maxLength, this.onTrimEmitter.fire(s4);\n      } else this._length += r.length;\n    }\n    trimStart(e) {\n      e > this._length && (e = this._length), this._startIndex += e, this._length -= e, this.onTrimEmitter.fire(e);\n    }\n    shiftElements(e, i5, r) {\n      if (!(i5 <= 0)) {\n        if (e < 0 || e >= this._length) throw new Error("start argument out of range");\n        if (e + r < 0) throw new Error("Cannot shift elements in list beyond index 0");\n        if (r > 0) {\n          for (let o2 = i5 - 1; o2 >= 0; o2--) this.set(e + o2 + r, this.get(e + o2));\n          let s4 = e + i5 + r - this._length;\n          if (s4 > 0) for (this._length += s4; this._length > this._maxLength; ) this._length--, this._startIndex++, this.onTrimEmitter.fire(1);\n        } else for (let s4 = 0; s4 < i5; s4++) this.set(e + s4 + r, this.get(e + s4));\n      }\n    }\n    _getCyclicIndex(e) {\n      return (this._startIndex + e) % this._maxLength;\n    }\n  };\n  var D6 = 3;\n  var U5 = Object.freeze(new fe2());\n  var sr2 = 0;\n  var gn = new N2();\n  var gs = 2;\n  var Re4 = class n8 {\n    constructor(t, e, i5 = false) {\n      this.isWrapped = i5;\n      this._combined = {};\n      this._extendedAttrs = {};\n      this._data = new Uint32Array(t * D6);\n      let r = e ?? N2.fromCharData([0, "", 1, 0]);\n      for (let s4 = 0; s4 < t; ++s4) this.setCell(s4, r);\n      this.length = t;\n    }\n    get(t) {\n      let e = this._data[t * D6 + 0], i5 = e & 2097151;\n      return [this._data[t * D6 + 1], e & 2097152 ? this._combined[t] : i5 ? ve2(i5) : "", e >> 22, e & 2097152 ? this._combined[t].charCodeAt(this._combined[t].length - 1) : i5];\n    }\n    set(t, e) {\n      this._data[t * D6 + 1] = e[0], e[1].length > 1 ? (this._combined[t] = e[1], this._data[t * D6 + 0] = t | 2097152 | e[2] << 22) : this._data[t * D6 + 0] = e[1].charCodeAt(0) | e[2] << 22;\n    }\n    getWidth(t) {\n      return this._data[t * D6 + 0] >> 22;\n    }\n    hasWidth(t) {\n      return this._data[t * D6 + 0] & 12582912;\n    }\n    getFg(t) {\n      return this._data[t * D6 + 1];\n    }\n    getBg(t) {\n      return this._data[t * D6 + 2];\n    }\n    hasContent(t) {\n      return this._data[t * D6 + 0] & 4194303;\n    }\n    getCodePoint(t) {\n      let e = this._data[t * D6 + 0];\n      return e & 2097152 ? this._combined[t].charCodeAt(this._combined[t].length - 1) : e & 2097151;\n    }\n    isCombined(t) {\n      return this._data[t * D6 + 0] & 2097152;\n    }\n    getString(t) {\n      let e = this._data[t * D6 + 0];\n      return e & 2097152 ? this._combined[t] : e & 2097151 ? ve2(e & 2097151) : "";\n    }\n    isProtected(t) {\n      return this._data[t * D6 + 2] & 536870912;\n    }\n    loadCell(t, e) {\n      return sr2 = t * D6, e.content = this._data[sr2 + 0], e.fg = this._data[sr2 + 1], e.bg = this._data[sr2 + 2], e.content & 2097152 && (e.combinedData = this._combined[t]), e.bg & 268435456 && (e.extended = this._extendedAttrs[t]), e;\n    }\n    setCell(t, e) {\n      e.content & 2097152 && (this._combined[t] = e.combinedData), e.bg & 268435456 && (this._extendedAttrs[t] = e.extended), this._data[t * D6 + 0] = e.content, this._data[t * D6 + 1] = e.fg, this._data[t * D6 + 2] = e.bg;\n    }\n    setCellFromCodepoint(t, e, i5, r) {\n      r.bg & 268435456 && (this._extendedAttrs[t] = r.extended), this._data[t * D6 + 0] = e | i5 << 22, this._data[t * D6 + 1] = r.fg, this._data[t * D6 + 2] = r.bg;\n    }\n    addCodepointToCell(t, e, i5) {\n      let r = this._data[t * D6 + 0];\n      r & 2097152 ? this._combined[t] += ve2(e) : r & 2097151 ? (this._combined[t] = ve2(r & 2097151) + ve2(e), r &= -2097152, r |= 2097152) : r = e | 1 << 22, i5 && (r &= -12582913, r |= i5 << 22), this._data[t * D6 + 0] = r;\n    }\n    insertCells(t, e, i5) {\n      if (t %= this.length, t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length - t) {\n        for (let r = this.length - t - e - 1; r >= 0; --r) this.setCell(t + e + r, this.loadCell(t + r, gn));\n        for (let r = 0; r < e; ++r) this.setCell(t + r, i5);\n      } else for (let r = t; r < this.length; ++r) this.setCell(r, i5);\n      this.getWidth(this.length - 1) === 2 && this.setCellFromCodepoint(this.length - 1, 0, 1, i5);\n    }\n    deleteCells(t, e, i5) {\n      if (t %= this.length, e < this.length - t) {\n        for (let r = 0; r < this.length - t - e; ++r) this.setCell(t + r, this.loadCell(t + e + r, gn));\n        for (let r = this.length - e; r < this.length; ++r) this.setCell(r, i5);\n      } else for (let r = t; r < this.length; ++r) this.setCell(r, i5);\n      t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), this.getWidth(t) === 0 && !this.hasContent(t) && this.setCellFromCodepoint(t, 0, 1, i5);\n    }\n    replaceCells(t, e, i5, r = false) {\n      if (r) {\n        for (t && this.getWidth(t - 1) === 2 && !this.isProtected(t - 1) && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length && this.getWidth(e - 1) === 2 && !this.isProtected(e) && this.setCellFromCodepoint(e, 0, 1, i5); t < e && t < this.length; ) this.isProtected(t) || this.setCell(t, i5), t++;\n        return;\n      }\n      for (t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length && this.getWidth(e - 1) === 2 && this.setCellFromCodepoint(e, 0, 1, i5); t < e && t < this.length; ) this.setCell(t++, i5);\n    }\n    resize(t, e) {\n      if (t === this.length) return this._data.length * 4 * gs < this._data.buffer.byteLength;\n      let i5 = t * D6;\n      if (t > this.length) {\n        if (this._data.buffer.byteLength >= i5 * 4) this._data = new Uint32Array(this._data.buffer, 0, i5);\n        else {\n          let r = new Uint32Array(i5);\n          r.set(this._data), this._data = r;\n        }\n        for (let r = this.length; r < t; ++r) this.setCell(r, e);\n      } else {\n        this._data = this._data.subarray(0, i5);\n        let r = Object.keys(this._combined);\n        for (let o2 = 0; o2 < r.length; o2++) {\n          let a2 = parseInt(r[o2], 10);\n          a2 >= t && delete this._combined[a2];\n        }\n        let s4 = Object.keys(this._extendedAttrs);\n        for (let o2 = 0; o2 < s4.length; o2++) {\n          let a2 = parseInt(s4[o2], 10);\n          a2 >= t && delete this._extendedAttrs[a2];\n        }\n      }\n      return this.length = t, i5 * 4 * gs < this._data.buffer.byteLength;\n    }\n    cleanupMemory() {\n      if (this._data.length * 4 * gs < this._data.buffer.byteLength) {\n        let t = new Uint32Array(this._data.length);\n        return t.set(this._data), this._data = t, 1;\n      }\n      return 0;\n    }\n    fill(t, e = false) {\n      if (e) {\n        for (let i5 = 0; i5 < this.length; ++i5) this.isProtected(i5) || this.setCell(i5, t);\n        return;\n      }\n      this._combined = {}, this._extendedAttrs = {};\n      for (let i5 = 0; i5 < this.length; ++i5) this.setCell(i5, t);\n    }\n    copyFrom(t) {\n      this.length !== t.length ? this._data = new Uint32Array(t._data) : this._data.set(t._data), this.length = t.length, this._combined = {};\n      for (let e in t._combined) this._combined[e] = t._combined[e];\n      this._extendedAttrs = {};\n      for (let e in t._extendedAttrs) this._extendedAttrs[e] = t._extendedAttrs[e];\n      this.isWrapped = t.isWrapped;\n    }\n    clone() {\n      let t = new n8(0);\n      t._data = new Uint32Array(this._data), t.length = this.length;\n      for (let e in this._combined) t._combined[e] = this._combined[e];\n      for (let e in this._extendedAttrs) t._extendedAttrs[e] = this._extendedAttrs[e];\n      return t.isWrapped = this.isWrapped, t;\n    }\n    getTrimmedLength() {\n      for (let t = this.length - 1; t >= 0; --t) if (this._data[t * D6 + 0] & 4194303) return t + (this._data[t * D6 + 0] >> 22);\n      return 0;\n    }\n    getNoBgTrimmedLength() {\n      for (let t = this.length - 1; t >= 0; --t) if (this._data[t * D6 + 0] & 4194303 || this._data[t * D6 + 2] & 50331648) return t + (this._data[t * D6 + 0] >> 22);\n      return 0;\n    }\n    copyCellsFrom(t, e, i5, r, s4) {\n      let o2 = t._data;\n      if (s4) for (let l4 = r - 1; l4 >= 0; l4--) {\n        for (let h3 = 0; h3 < D6; h3++) this._data[(i5 + l4) * D6 + h3] = o2[(e + l4) * D6 + h3];\n        o2[(e + l4) * D6 + 2] & 268435456 && (this._extendedAttrs[i5 + l4] = t._extendedAttrs[e + l4]);\n      }\n      else for (let l4 = 0; l4 < r; l4++) {\n        for (let h3 = 0; h3 < D6; h3++) this._data[(i5 + l4) * D6 + h3] = o2[(e + l4) * D6 + h3];\n        o2[(e + l4) * D6 + 2] & 268435456 && (this._extendedAttrs[i5 + l4] = t._extendedAttrs[e + l4]);\n      }\n      let a2 = Object.keys(t._combined);\n      for (let l4 = 0; l4 < a2.length; l4++) {\n        let h3 = parseInt(a2[l4], 10);\n        h3 >= e && (this._combined[h3 - e + i5] = t._combined[h3]);\n      }\n    }\n    translateToString(t, e, i5, r) {\n      e = e ?? 0, i5 = i5 ?? this.length, t && (i5 = Math.min(i5, this.getTrimmedLength())), r && (r.length = 0);\n      let s4 = "";\n      for (; e < i5; ) {\n        let o2 = this._data[e * D6 + 0], a2 = o2 & 2097151, l4 = o2 & 2097152 ? this._combined[e] : a2 ? ve2(a2) : " ";\n        if (s4 += l4, r) for (let h3 = 0; h3 < l4.length; ++h3) r.push(e);\n        e += o2 >> 22 || 1;\n      }\n      return r && r.push(e), s4;\n    }\n  };\n  function In(n11, t, e, i5, r, s4) {\n    let o2 = [];\n    for (let a2 = 0; a2 < n11.length - 1; a2++) {\n      let l4 = a2, h3 = n11.get(++l4);\n      if (!h3.isWrapped) continue;\n      let d3 = [n11.get(a2)];\n      for (; l4 < n11.length && h3.isWrapped; ) d3.push(h3), h3 = n11.get(++l4);\n      if (!s4 && i5 >= a2 && i5 < l4) {\n        a2 += d3.length - 1;\n        continue;\n      }\n      let c2 = 0, u3 = Rt2(d3, c2, t), _5 = 1, p3 = 0;\n      for (; _5 < d3.length; ) {\n        let f5 = Rt2(d3, _5, t), S4 = f5 - p3, I4 = e - u3, w6 = Math.min(S4, I4);\n        d3[c2].copyCellsFrom(d3[_5], p3, u3, w6, false), u3 += w6, u3 === e && (c2++, u3 = 0), p3 += w6, p3 === f5 && (_5++, p3 = 0), u3 === 0 && c2 !== 0 && d3[c2 - 1].getWidth(e - 1) === 2 && (d3[c2].copyCellsFrom(d3[c2 - 1], e - 1, u3++, 1, false), d3[c2 - 1].setCell(e - 1, r));\n      }\n      d3[c2].replaceCells(u3, e, r);\n      let b4 = 0;\n      for (let f5 = d3.length - 1; f5 > 0 && (f5 > c2 || d3[f5].getTrimmedLength() === 0); f5--) b4++;\n      b4 > 0 && (o2.push(a2 + d3.length - b4), o2.push(b4)), a2 += d3.length - 1;\n    }\n    return o2;\n  }\n  function Cn(n11, t) {\n    let e = [], i5 = 0, r = t[i5], s4 = 0;\n    for (let o2 = 0; o2 < n11.length; o2++) if (r === o2) {\n      let a2 = t[++i5];\n      n11.onDeleteEmitter.fire({ index: o2 - s4, amount: a2 }), o2 += a2 - 1, s4 += a2, r = t[++i5];\n    } else e.push(o2);\n    return { layout: e, countRemoved: s4 };\n  }\n  function En(n11, t) {\n    let e = [];\n    for (let i5 = 0; i5 < t.length; i5++) e.push(n11.get(t[i5]));\n    for (let i5 = 0; i5 < e.length; i5++) n11.set(i5, e[i5]);\n    n11.length = t.length;\n  }\n  function yn(n11, t, e) {\n    let i5 = [], r = n11.map((l4, h3) => Rt2(n11, h3, t)).reduce((l4, h3) => l4 + h3), s4 = 0, o2 = 0, a2 = 0;\n    for (; a2 < r; ) {\n      if (r - a2 < e) {\n        i5.push(r - a2);\n        break;\n      }\n      s4 += e;\n      let l4 = Rt2(n11, o2, t);\n      s4 > l4 && (s4 -= l4, o2++);\n      let h3 = n11[o2].getWidth(s4 - 1) === 2;\n      h3 && s4--;\n      let d3 = h3 ? e - 1 : e;\n      i5.push(d3), a2 += d3;\n    }\n    return i5;\n  }\n  function Rt2(n11, t, e) {\n    if (t === n11.length - 1) return n11[t].getTrimmedLength();\n    let i5 = !n11[t].hasContent(e - 1) && n11[t].getWidth(e - 1) === 1, r = n11[t + 1].getWidth(0) === 2;\n    return i5 && r ? e - 1 : e;\n  }\n  var or = class or2 {\n    constructor(t) {\n      this.line = t;\n      this.isDisposed = false;\n      this._disposables = [];\n      this._id = or2._nextId++;\n      this._onDispose = this.register(new v5());\n      this.onDispose = this._onDispose.event;\n    }\n    get id() {\n      return this._id;\n    }\n    dispose() {\n      this.isDisposed || (this.isDisposed = true, this.line = -1, this._onDispose.fire(), Oe2(this._disposables), this._disposables.length = 0);\n    }\n    register(t) {\n      return this._disposables.push(t), t;\n    }\n  };\n  or._nextId = 1;\n  var nr = or;\n  var V4 = {};\n  var Le2 = V4.B;\n  V4[0] = { "`": "\\u25C6", a: "\\u2592", b: "\\u2409", c: "\\u240C", d: "\\u240D", e: "\\u240A", f: "\\xB0", g: "\\xB1", h: "\\u2424", i: "\\u240B", j: "\\u2518", k: "\\u2510", l: "\\u250C", m: "\\u2514", n: "\\u253C", o: "\\u23BA", p: "\\u23BB", q: "\\u2500", r: "\\u23BC", s: "\\u23BD", t: "\\u251C", u: "\\u2524", v: "\\u2534", w: "\\u252C", x: "\\u2502", y: "\\u2264", z: "\\u2265", "{": "\\u03C0", "|": "\\u2260", "}": "\\xA3", "~": "\\xB7" };\n  V4.A = { "#": "\\xA3" };\n  V4.B = void 0;\n  V4[4] = { "#": "\\xA3", "@": "\\xBE", "[": "ij", "\\\\": "\\xBD", "]": "|", "{": "\\xA8", "|": "f", "}": "\\xBC", "~": "\\xB4" };\n  V4.C = V4[5] = { "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xC5", "^": "\\xDC", "`": "\\xE9", "{": "\\xE4", "|": "\\xF6", "}": "\\xE5", "~": "\\xFC" };\n  V4.R = { "#": "\\xA3", "@": "\\xE0", "[": "\\xB0", "\\\\": "\\xE7", "]": "\\xA7", "{": "\\xE9", "|": "\\xF9", "}": "\\xE8", "~": "\\xA8" };\n  V4.Q = { "@": "\\xE0", "[": "\\xE2", "\\\\": "\\xE7", "]": "\\xEA", "^": "\\xEE", "`": "\\xF4", "{": "\\xE9", "|": "\\xF9", "}": "\\xE8", "~": "\\xFB" };\n  V4.K = { "@": "\\xA7", "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xDC", "{": "\\xE4", "|": "\\xF6", "}": "\\xFC", "~": "\\xDF" };\n  V4.Y = { "#": "\\xA3", "@": "\\xA7", "[": "\\xB0", "\\\\": "\\xE7", "]": "\\xE9", "`": "\\xF9", "{": "\\xE0", "|": "\\xF2", "}": "\\xE8", "~": "\\xEC" };\n  V4.E = V4[6] = { "@": "\\xC4", "[": "\\xC6", "\\\\": "\\xD8", "]": "\\xC5", "^": "\\xDC", "`": "\\xE4", "{": "\\xE6", "|": "\\xF8", "}": "\\xE5", "~": "\\xFC" };\n  V4.Z = { "#": "\\xA3", "@": "\\xA7", "[": "\\xA1", "\\\\": "\\xD1", "]": "\\xBF", "{": "\\xB0", "|": "\\xF1", "}": "\\xE7" };\n  V4.H = V4[7] = { "@": "\\xC9", "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xC5", "^": "\\xDC", "`": "\\xE9", "{": "\\xE4", "|": "\\xF6", "}": "\\xE5", "~": "\\xFC" };\n  V4["="] = { "#": "\\xF9", "@": "\\xE0", "[": "\\xE9", "\\\\": "\\xE7", "]": "\\xEA", "^": "\\xEE", _: "\\xE8", "`": "\\xF4", "{": "\\xE4", "|": "\\xF6", "}": "\\xFC", "~": "\\xFB" };\n  var xn = 4294967295;\n  var oi = class {\n    constructor(t, e, i5, r) {\n      this._hasScrollback = t;\n      this._optionsService = e;\n      this._bufferService = i5;\n      this._logService = r;\n      this.ydisp = 0;\n      this.ybase = 0;\n      this.y = 0;\n      this.x = 0;\n      this.tabs = {};\n      this.savedY = 0;\n      this.savedX = 0;\n      this.savedCurAttrData = U5.clone();\n      this.savedCharset = Le2;\n      this.savedCharsets = [];\n      this.savedGlevel = 0;\n      this.savedOriginMode = false;\n      this.savedWraparoundMode = true;\n      this.markers = [];\n      this._nullCell = N2.fromCharData([0, "", 1, 0]);\n      this._whitespaceCell = N2.fromCharData([0, " ", 1, 32]);\n      this._isClearing = false;\n      this._memoryCleanupPosition = 0;\n      this._cols = this._bufferService.cols, this._rows = this._bufferService.rows, this.lines = new si(this._getCorrectBufferLength(this._rows)), this.scrollTop = 0, this.scrollBottom = this._rows - 1, this.setupTabStops(), this._memoryCleanupQueue = new Et2(this._logService);\n    }\n    getNullCell(t) {\n      return t ? (this._nullCell.fg = t.fg, this._nullCell.bg = t.bg, this._nullCell.extended = t.extended) : (this._nullCell.fg = 0, this._nullCell.bg = 0, this._nullCell.extended = new Pe2()), this._nullCell;\n    }\n    getWhitespaceCell(t) {\n      return t ? (this._whitespaceCell.fg = t.fg, this._whitespaceCell.bg = t.bg, this._whitespaceCell.extended = t.extended) : (this._whitespaceCell.fg = 0, this._whitespaceCell.bg = 0, this._whitespaceCell.extended = new Pe2()), this._whitespaceCell;\n    }\n    getBlankLine(t, e) {\n      return new Re4(this._bufferService.cols, this.getNullCell(t), e);\n    }\n    get hasScrollback() {\n      return this._hasScrollback && this.lines.maxLength > this._rows;\n    }\n    get isCursorInViewport() {\n      let e = this.ybase + this.y - this.ydisp;\n      return e >= 0 && e < this._rows;\n    }\n    _getCorrectBufferLength(t) {\n      if (!this._hasScrollback) return t;\n      let e = t + this._optionsService.rawOptions.scrollback;\n      return e > xn ? xn : e;\n    }\n    fillViewportRows(t) {\n      if (this.lines.length === 0) {\n        t ??= U5;\n        let e = this._rows;\n        for (; e--; ) this.lines.push(this.getBlankLine(t));\n      }\n    }\n    clear() {\n      this.ydisp = 0, this.ybase = 0, this.y = 0, this.x = 0, this.lines = new si(this._getCorrectBufferLength(this._rows)), this.scrollTop = 0, this.scrollBottom = this._rows - 1, this.setupTabStops();\n    }\n    resize(t, e) {\n      let i5 = this.getNullCell(U5), r = 0, s4 = this._getCorrectBufferLength(e);\n      if (s4 > this.lines.maxLength && (this.lines.maxLength = s4), this.lines.length > 0) {\n        if (this._cols < t) for (let a2 = 0; a2 < this.lines.length; a2++) r += +this.lines.get(a2).resize(t, i5);\n        let o2 = 0;\n        if (this._rows < e) for (let a2 = this._rows; a2 < e; a2++) this.lines.length < e + this.ybase && (this._optionsService.rawOptions.windowsPty.backend !== void 0 || this._optionsService.rawOptions.windowsPty.buildNumber !== void 0 ? this.lines.push(new Re4(t, i5)) : this.ybase > 0 && this.lines.length <= this.ybase + this.y + o2 + 1 ? (this.ybase--, o2++, this.ydisp > 0 && this.ydisp--) : this.lines.push(new Re4(t, i5)));\n        else for (let a2 = this._rows; a2 > e; a2--) this.lines.length > e + this.ybase && (this.lines.length > this.ybase + this.y + 1 ? this.lines.pop() : (this.ybase++, this.ydisp++));\n        if (s4 < this.lines.maxLength) {\n          let a2 = this.lines.length - s4;\n          a2 > 0 && (this.lines.trimStart(a2), this.ybase = Math.max(this.ybase - a2, 0), this.ydisp = Math.max(this.ydisp - a2, 0), this.savedY = Math.max(this.savedY - a2, 0)), this.lines.maxLength = s4;\n        }\n        this.x = Math.min(this.x, t - 1), this.y = Math.min(this.y, e - 1), o2 && (this.y += o2), this.savedX = Math.min(this.savedX, t - 1), this.scrollTop = 0;\n      }\n      if (this.scrollBottom = e - 1, this._isReflowEnabled && (this._reflow(t, e), this._cols > t)) for (let o2 = 0; o2 < this.lines.length; o2++) r += +this.lines.get(o2).resize(t, i5);\n      if (this._cols = t, this._rows = e, this.lines.length > 0) {\n        let o2 = Math.max(0, this.lines.length - this.ybase - 1);\n        this.y = Math.min(this.y, o2);\n      }\n      this._memoryCleanupQueue.clear(), r > 0.1 * this.lines.length && (this._memoryCleanupPosition = 0, this._memoryCleanupQueue.enqueue(() => this._batchedMemoryCleanup()));\n    }\n    _batchedMemoryCleanup() {\n      let t = true;\n      this._memoryCleanupPosition >= this.lines.length && (this._memoryCleanupPosition = 0, t = false);\n      let e = 0;\n      for (; this._memoryCleanupPosition < this.lines.length; ) if (e += this.lines.get(this._memoryCleanupPosition++).cleanupMemory(), e > 100) return true;\n      return t;\n    }\n    get _isReflowEnabled() {\n      let t = this._optionsService.rawOptions.windowsPty;\n      return t && t.buildNumber ? this._hasScrollback && t.backend === "conpty" && t.buildNumber >= 21376 : this._hasScrollback;\n    }\n    _reflow(t, e) {\n      this._cols !== t && (t > this._cols ? this._reflowLarger(t, e) : this._reflowSmaller(t, e));\n    }\n    _reflowLarger(t, e) {\n      let i5 = this._optionsService.rawOptions.reflowCursorLine, r = In(this.lines, this._cols, t, this.ybase + this.y, this.getNullCell(U5), i5);\n      if (r.length > 0) {\n        let s4 = Cn(this.lines, r);\n        En(this.lines, s4.layout), this._reflowLargerAdjustViewport(t, e, s4.countRemoved);\n      }\n    }\n    _reflowLargerAdjustViewport(t, e, i5) {\n      let r = this.getNullCell(U5), s4 = i5;\n      for (; s4-- > 0; ) this.ybase === 0 ? (this.y > 0 && this.y--, this.lines.length < e && this.lines.push(new Re4(t, r))) : (this.ydisp === this.ybase && this.ydisp--, this.ybase--);\n      this.savedY = Math.max(this.savedY - i5, 0);\n    }\n    _reflowSmaller(t, e) {\n      let i5 = this._optionsService.rawOptions.reflowCursorLine, r = this.getNullCell(U5), s4 = [], o2 = 0;\n      for (let a2 = this.lines.length - 1; a2 >= 0; a2--) {\n        let l4 = this.lines.get(a2);\n        if (!l4 || !l4.isWrapped && l4.getTrimmedLength() <= t) continue;\n        let h3 = [l4];\n        for (; l4.isWrapped && a2 > 0; ) l4 = this.lines.get(--a2), h3.unshift(l4);\n        if (!i5) {\n          let x5 = this.ybase + this.y;\n          if (x5 >= a2 && x5 < a2 + h3.length) continue;\n        }\n        let d3 = h3[h3.length - 1].getTrimmedLength(), c2 = yn(h3, this._cols, t), u3 = c2.length - h3.length, _5;\n        this.ybase === 0 && this.y !== this.lines.length - 1 ? _5 = Math.max(0, this.y - this.lines.maxLength + u3) : _5 = Math.max(0, this.lines.length - this.lines.maxLength + u3);\n        let p3 = [];\n        for (let x5 = 0; x5 < u3; x5++) {\n          let ie4 = this.getBlankLine(U5, true);\n          p3.push(ie4);\n        }\n        p3.length > 0 && (s4.push({ start: a2 + h3.length + o2, newLines: p3 }), o2 += p3.length), h3.push(...p3);\n        let b4 = c2.length - 1, f5 = c2[b4];\n        f5 === 0 && (b4--, f5 = c2[b4]);\n        let S4 = h3.length - u3 - 1, I4 = d3;\n        for (; S4 >= 0; ) {\n          let x5 = Math.min(I4, f5);\n          if (h3[b4] === void 0) break;\n          if (h3[b4].copyCellsFrom(h3[S4], I4 - x5, f5 - x5, x5, true), f5 -= x5, f5 === 0 && (b4--, f5 = c2[b4]), I4 -= x5, I4 === 0) {\n            S4--;\n            let ie4 = Math.max(S4, 0);\n            I4 = Rt2(h3, ie4, this._cols);\n          }\n        }\n        for (let x5 = 0; x5 < h3.length; x5++) c2[x5] < t && h3[x5].setCell(c2[x5], r);\n        let w6 = u3 - _5;\n        for (; w6-- > 0; ) this.ybase === 0 ? this.y < e - 1 ? (this.y++, this.lines.pop()) : (this.ybase++, this.ydisp++) : this.ybase < Math.min(this.lines.maxLength, this.lines.length + o2) - e && (this.ybase === this.ydisp && this.ydisp++, this.ybase++);\n        this.savedY = Math.min(this.savedY + u3, this.ybase + e - 1);\n      }\n      if (s4.length > 0) {\n        let a2 = [], l4 = [];\n        for (let f5 = 0; f5 < this.lines.length; f5++) l4.push(this.lines.get(f5));\n        let h3 = this.lines.length, d3 = h3 - 1, c2 = 0, u3 = s4[c2];\n        this.lines.length = Math.min(this.lines.maxLength, this.lines.length + o2);\n        let _5 = 0;\n        for (let f5 = Math.min(this.lines.maxLength - 1, h3 + o2 - 1); f5 >= 0; f5--) if (u3 && u3.start > d3 + _5) {\n          for (let S4 = u3.newLines.length - 1; S4 >= 0; S4--) this.lines.set(f5--, u3.newLines[S4]);\n          f5++, a2.push({ index: d3 + 1, amount: u3.newLines.length }), _5 += u3.newLines.length, u3 = s4[++c2];\n        } else this.lines.set(f5, l4[d3--]);\n        let p3 = 0;\n        for (let f5 = a2.length - 1; f5 >= 0; f5--) a2[f5].index += p3, this.lines.onInsertEmitter.fire(a2[f5]), p3 += a2[f5].amount;\n        let b4 = Math.max(0, h3 + o2 - this.lines.maxLength);\n        b4 > 0 && this.lines.onTrimEmitter.fire(b4);\n      }\n    }\n    translateBufferLineToString(t, e, i5 = 0, r) {\n      let s4 = this.lines.get(t);\n      return s4 ? s4.translateToString(e, i5, r) : "";\n    }\n    getWrappedRangeForLine(t) {\n      let e = t, i5 = t;\n      for (; e > 0 && this.lines.get(e).isWrapped; ) e--;\n      for (; i5 + 1 < this.lines.length && this.lines.get(i5 + 1).isWrapped; ) i5++;\n      return { first: e, last: i5 };\n    }\n    setupTabStops(t) {\n      for (t != null ? this.tabs[t] || (t = this.prevStop(t)) : (this.tabs = {}, t = 0); t < this._cols; t += this._optionsService.rawOptions.tabStopWidth) this.tabs[t] = true;\n    }\n    prevStop(t) {\n      for (t ??= this.x; !this.tabs[--t] && t > 0; ) ;\n      return t >= this._cols ? this._cols - 1 : t < 0 ? 0 : t;\n    }\n    nextStop(t) {\n      for (t ??= this.x; !this.tabs[++t] && t < this._cols; ) ;\n      return t >= this._cols ? this._cols - 1 : t < 0 ? 0 : t;\n    }\n    clearMarkers(t) {\n      this._isClearing = true;\n      for (let e = 0; e < this.markers.length; e++) this.markers[e].line === t && (this.markers[e].dispose(), this.markers.splice(e--, 1));\n      this._isClearing = false;\n    }\n    clearAllMarkers() {\n      this._isClearing = true;\n      for (let t = 0; t < this.markers.length; t++) this.markers[t].dispose();\n      this.markers.length = 0, this._isClearing = false;\n    }\n    addMarker(t) {\n      let e = new nr(t);\n      return this.markers.push(e), e.register(this.lines.onTrim((i5) => {\n        e.line -= i5, e.line < 0 && e.dispose();\n      })), e.register(this.lines.onInsert((i5) => {\n        e.line >= i5.index && (e.line += i5.amount);\n      })), e.register(this.lines.onDelete((i5) => {\n        e.line >= i5.index && e.line < i5.index + i5.amount && e.dispose(), e.line > i5.index && (e.line -= i5.amount);\n      })), e.register(e.onDispose(() => this._removeMarker(e))), e;\n    }\n    _removeMarker(t) {\n      this._isClearing || this.markers.splice(this.markers.indexOf(t), 1);\n    }\n  };\n  var ar2 = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._optionsService = e;\n      this._bufferService = i5;\n      this._logService = r;\n      this._onBufferActivate = this._register(new v5());\n      this.onBufferActivate = this._onBufferActivate.event;\n      this.reset(), this._register(this._optionsService.onSpecificOptionChange("scrollback", () => this.resize(this._bufferService.cols, this._bufferService.rows))), this._register(this._optionsService.onSpecificOptionChange("tabStopWidth", () => this.setupTabStops()));\n    }\n    reset() {\n      this._normal = new oi(true, this._optionsService, this._bufferService, this._logService), this._normal.fillViewportRows(), this._alt = new oi(false, this._optionsService, this._bufferService, this._logService), this._activeBuffer = this._normal, this._onBufferActivate.fire({ activeBuffer: this._normal, inactiveBuffer: this._alt }), this.setupTabStops();\n    }\n    get alt() {\n      return this._alt;\n    }\n    get active() {\n      return this._activeBuffer;\n    }\n    get normal() {\n      return this._normal;\n    }\n    activateNormalBuffer() {\n      this._activeBuffer !== this._normal && (this._normal.x = this._alt.x, this._normal.y = this._alt.y, this._alt.clearAllMarkers(), this._alt.clear(), this._activeBuffer = this._normal, this._onBufferActivate.fire({ activeBuffer: this._normal, inactiveBuffer: this._alt }));\n    }\n    activateAltBuffer(e) {\n      this._activeBuffer !== this._alt && (this._alt.fillViewportRows(e), this._alt.x = this._normal.x, this._alt.y = this._normal.y, this._activeBuffer = this._alt, this._onBufferActivate.fire({ activeBuffer: this._alt, inactiveBuffer: this._normal }));\n    }\n    resize(e, i5) {\n      this._normal.resize(e, i5), this._alt.resize(e, i5), this.setupTabStops(e);\n    }\n    setupTabStops(e) {\n      this._normal.setupTabStops(e), this._alt.setupTabStops(e);\n    }\n  };\n  var Es = 2;\n  var ys = 1;\n  var Lt2 = class extends g5 {\n    constructor(e, i5) {\n      super();\n      this.isUserScrolling = false;\n      this._onResize = this._register(new v5());\n      this.onResize = this._onResize.event;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this.cols = Math.max(e.rawOptions.cols || 0, Es), this.rows = Math.max(e.rawOptions.rows || 0, ys), this.buffers = this._register(new ar2(e, this, i5)), this._register(this.buffers.onBufferActivate((r) => {\n        this._onScroll.fire(r.activeBuffer.ydisp);\n      }));\n    }\n    get buffer() {\n      return this.buffers.active;\n    }\n    resize(e, i5) {\n      let r = this.cols !== e, s4 = this.rows !== i5;\n      this.cols = e, this.rows = i5, this.buffers.resize(e, i5), this._onResize.fire({ cols: e, rows: i5, colsChanged: r, rowsChanged: s4 });\n    }\n    reset() {\n      this.buffers.reset(), this.isUserScrolling = false;\n    }\n    scroll(e, i5 = false) {\n      let r = this.buffer, s4;\n      s4 = this._cachedBlankLine, (!s4 || s4.length !== this.cols || s4.getFg(0) !== e.fg || s4.getBg(0) !== e.bg) && (s4 = r.getBlankLine(e, i5), this._cachedBlankLine = s4), s4.isWrapped = i5;\n      let o2 = r.ybase + r.scrollTop, a2 = r.ybase + r.scrollBottom;\n      if (r.scrollTop === 0) {\n        let l4 = r.lines.isFull;\n        a2 === r.lines.length - 1 ? l4 ? r.lines.recycle().copyFrom(s4) : r.lines.push(s4.clone()) : r.lines.splice(a2 + 1, 0, s4.clone()), l4 ? this.isUserScrolling && (r.ydisp = Math.max(r.ydisp - 1, 0)) : (r.ybase++, this.isUserScrolling || r.ydisp++);\n      } else {\n        let l4 = a2 - o2 + 1;\n        r.lines.shiftElements(o2 + 1, l4 - 1, -1), r.lines.set(a2, s4.clone());\n      }\n      this.isUserScrolling || (r.ydisp = r.ybase), this._onScroll.fire(r.ydisp);\n    }\n    scrollLines(e, i5) {\n      let r = this.buffer;\n      if (e < 0) {\n        if (r.ydisp === 0) return;\n        this.isUserScrolling = true;\n      } else e + r.ydisp >= r.ybase && (this.isUserScrolling = false);\n      let s4 = r.ydisp;\n      r.ydisp = Math.max(Math.min(r.ydisp + e, r.ybase), 0), s4 !== r.ydisp && (i5 || this._onScroll.fire(r.ydisp));\n    }\n  };\n  Lt2 = E4([m3(0, R3), m3(1, pe)], Lt2);\n  var At2 = { cols: 80, rows: 24, showCursorImmediately: false, cursorBlink: false, blinkIntervalDuration: 0, cursorStyle: "block", cursorWidth: 1, cursorInactiveStyle: "outline", drawBoldTextInBrightColors: true, documentOverride: null, fastScrollSensitivity: 5, fontFamily: "monospace", fontSize: 15, fontWeight: "normal", fontWeightBold: "bold", ignoreBracketedPasteMode: false, lineHeight: 1, letterSpacing: 0, linkHandler: null, logLevel: "info", logger: null, scrollback: 1e3, scrollbar: { showScrollbar: true }, scrollOnEraseInDisplay: false, scrollOnUserInput: true, scrollSensitivity: 1, screenReaderMode: false, smoothScrollDuration: 0, macOptionIsMeta: false, macOptionClickForcesSelection: false, minimumContrastRatio: 1, disableStdin: false, allowProposedApi: false, allowTransparency: false, tabStopWidth: 8, theme: {}, reflowCursorLine: false, rescaleOverlappingGlyphs: false, rightClickSelectsWord: ee3, windowOptions: {}, windowsPty: {}, wordSeparator: " ()[]{}\',\\"`", altClickMovesCursor: true, convertEol: false, termName: "xterm", quirks: {}, vtExtensions: {} };\n  var Bo = ["normal", "bold", "100", "200", "300", "400", "500", "600", "700", "800", "900"];\n  var lr2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._onOptionChange = this._register(new v5());\n      this.onOptionChange = this._onOptionChange.event;\n      let i5 = { ...At2 };\n      for (let r in e) if (r in i5) try {\n        let s4 = e[r];\n        i5[r] = this._sanitizeAndValidateOption(r, s4);\n      } catch (s4) {\n        console.error(s4);\n      }\n      this.rawOptions = i5, this.options = { ...i5 }, this._setupOptions(), this._register(y4(() => {\n        this.rawOptions.linkHandler = null, this.rawOptions.documentOverride = null;\n      }));\n    }\n    onSpecificOptionChange(e, i5) {\n      return this.onOptionChange((r) => {\n        r === e && i5(this.rawOptions[e]);\n      });\n    }\n    onMultipleOptionChange(e, i5) {\n      return this.onOptionChange((r) => {\n        e.indexOf(r) !== -1 && i5();\n      });\n    }\n    _setupOptions() {\n      let e = (r) => {\n        if (!(r in At2)) throw new Error(`No option with key "${r}"`);\n        return this.rawOptions[r];\n      }, i5 = (r, s4) => {\n        if (!(r in At2)) throw new Error(`No option with key "${r}"`);\n        s4 = this._sanitizeAndValidateOption(r, s4), this.rawOptions[r] !== s4 && (this.rawOptions[r] = s4, this._onOptionChange.fire(r));\n      };\n      for (let r in this.rawOptions) {\n        let s4 = { get: e.bind(this, r), set: i5.bind(this, r) };\n        Object.defineProperty(this.options, r, s4);\n      }\n    }\n    _sanitizeAndValidateOption(e, i5) {\n      switch (e) {\n        case "cursorStyle":\n          if (i5 || (i5 = At2[e]), !Oo(i5)) throw new Error(`"${i5}" is not a valid value for ${e}`);\n          break;\n        case "wordSeparator":\n          i5 || (i5 = At2[e]);\n          break;\n        case "fontWeight":\n        case "fontWeightBold":\n          if (typeof i5 == "number" && 1 <= i5 && i5 <= 1e3) break;\n          i5 = Bo.includes(i5) ? i5 : At2[e];\n          break;\n        case "blinkIntervalDuration":\n          if (i5 = Math.floor(i5), i5 < 0) throw new Error(`${e} cannot be less than 0, value: ${i5}`);\n          break;\n        case "cursorWidth":\n          i5 = Math.floor(i5);\n        case "lineHeight":\n        case "tabStopWidth":\n          if (i5 < 1) throw new Error(`${e} cannot be less than 1, value: ${i5}`);\n          break;\n        case "minimumContrastRatio":\n          i5 = Math.max(1, Math.min(21, Math.round(i5 * 10) / 10));\n          break;\n        case "scrollback":\n          if (i5 = Math.min(i5, 4294967295), i5 < 0) throw new Error(`${e} cannot be less than 0, value: ${i5}`);\n          break;\n        case "fastScrollSensitivity":\n        case "scrollSensitivity":\n          if (i5 <= 0) throw new Error(`${e} cannot be less than or equal to 0, value: ${i5}`);\n          break;\n        case "rows":\n        case "cols":\n          if (!i5 && i5 !== 0) throw new Error(`${e} must be numeric, value: ${i5}`);\n          break;\n        case "windowsPty":\n          i5 = i5 ?? {};\n          break;\n      }\n      return i5;\n    }\n  };\n  function Oo(n11) {\n    return n11 === "block" || n11 === "underline" || n11 === "bar";\n  }\n  function kt(n11, t = 5) {\n    if (typeof n11 != "object") return n11;\n    let e = Array.isArray(n11) ? [] : {};\n    for (let i5 in n11) e[i5] = t <= 1 ? n11[i5] : n11[i5] && kt(n11[i5], t - 1);\n    return e;\n  }\n  var wn = Object.freeze({ insertMode: false });\n  var Tn = Object.freeze({ applicationCursorKeys: false, applicationKeypad: false, bracketedPasteMode: false, colorSchemeUpdates: false, cursorBlink: void 0, cursorStyle: void 0, origin: false, reverseWraparound: false, sendFocus: false, synchronizedOutput: false, win32InputMode: false, wraparound: true });\n  var Dn = () => ({ flags: 0, mainFlags: 0, altFlags: 0, mainStack: [], altStack: [] });\n  var Pt = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._bufferService = e;\n      this._logService = i5;\n      this._optionsService = r;\n      this.isCursorHidden = false;\n      this._onData = this._register(new v5());\n      this.onData = this._onData.event;\n      this._onUserInput = this._register(new v5());\n      this.onUserInput = this._onUserInput.event;\n      this._onBinary = this._register(new v5());\n      this.onBinary = this._onBinary.event;\n      this._onRequestScrollToBottom = this._register(new v5());\n      this.onRequestScrollToBottom = this._onRequestScrollToBottom.event;\n      this.isCursorInitialized = r.rawOptions.showCursorImmediately ?? false, this.modes = kt(wn), this.decPrivateModes = kt(Tn), this.kittyKeyboard = Dn();\n    }\n    reset() {\n      this.modes = kt(wn), this.decPrivateModes = kt(Tn), this.kittyKeyboard = Dn();\n    }\n    triggerDataEvent(e, i5 = false) {\n      if (this._optionsService.rawOptions.disableStdin) return;\n      let r = this._bufferService.buffer;\n      i5 && this._optionsService.rawOptions.scrollOnUserInput && r.ybase !== r.ydisp && this._onRequestScrollToBottom.fire(), i5 && this._onUserInput.fire(), this._logService.debug(`sending data "${e}"`), this._logService.trace("sending data (codes)", () => e.split("").map((s4) => s4.charCodeAt(0))), this._onData.fire(e);\n    }\n    triggerBinaryEvent(e) {\n      this._optionsService.rawOptions.disableStdin || (this._logService.debug(`sending binary "${e}"`), this._logService.trace("sending binary (codes)", () => e.split("").map((i5) => i5.charCodeAt(0))), this._onBinary.fire(e));\n    }\n  };\n  Pt = E4([m3(0, L5), m3(1, pe), m3(2, R3)], Pt);\n  var Rn = { NONE: { events: 0, restrict: () => false }, X10: { events: 1, restrict: (n11) => n11.button === 4 || n11.action !== 1 ? false : (n11.ctrl = false, n11.alt = false, n11.shift = false, true) }, VT200: { events: 19, restrict: (n11) => n11.action !== 32 }, DRAG: { events: 23, restrict: (n11) => !(n11.action === 32 && n11.button === 3) }, ANY: { events: 31, restrict: (n11) => true } };\n  function xs(n11, t) {\n    let e = (n11.ctrl ? 16 : 0) | (n11.shift ? 4 : 0) | (n11.alt ? 8 : 0);\n    return n11.button === 4 ? (e |= 64, e |= n11.action) : (e |= n11.button & 3, n11.button & 4 && (e |= 64), n11.button & 8 && (e |= 128), n11.action === 32 ? e |= 32 : n11.action === 0 && !t && (e |= 3)), e;\n  }\n  var ws = String.fromCharCode;\n  var Ln = { DEFAULT: (n11) => {\n    let t = [xs(n11, false) + 32, n11.col + 32, n11.row + 32];\n    return t[0] > 255 || t[1] > 255 || t[2] > 255 ? "" : `\\x1B[M${ws(t[0])}${ws(t[1])}${ws(t[2])}`;\n  }, SGR: (n11) => {\n    let t = n11.action === 0 && n11.button !== 4 ? "m" : "M";\n    return `\\x1B[<${xs(n11, true)};${n11.col};${n11.row}${t}`;\n  }, SGR_PIXELS: (n11) => {\n    let t = n11.action === 0 && n11.button !== 4 ? "m" : "M";\n    return `\\x1B[<${xs(n11, true)};${n11.x};${n11.y}${t}`;\n  } };\n  var cr = class extends g5 {\n    constructor() {\n      super();\n      this._protocols = {};\n      this._encodings = {};\n      this._activeProtocol = "";\n      this._activeEncoding = "";\n      this._onProtocolChange = this._register(new v5());\n      this.onProtocolChange = this._onProtocolChange.event;\n      for (let e of Object.keys(Rn)) this.addProtocol(e, Rn[e]);\n      for (let e of Object.keys(Ln)) this.addEncoding(e, Ln[e]);\n      this.reset();\n    }\n    addProtocol(e, i5) {\n      this._protocols[e] = i5;\n    }\n    addEncoding(e, i5) {\n      this._encodings[e] = i5;\n    }\n    get activeProtocol() {\n      return this._activeProtocol;\n    }\n    get areMouseEventsActive() {\n      return this._protocols[this._activeProtocol].events !== 0;\n    }\n    set activeProtocol(e) {\n      if (!this._protocols[e]) throw new Error(`unknown protocol "${e}"`);\n      this._activeProtocol = e, this._onProtocolChange.fire(this._protocols[e].events);\n    }\n    get activeEncoding() {\n      return this._activeEncoding;\n    }\n    set activeEncoding(e) {\n      if (!this._encodings[e]) throw new Error(`unknown encoding "${e}"`);\n      this._activeEncoding = e;\n    }\n    reset() {\n      this.activeProtocol = "NONE", this.activeEncoding = "DEFAULT";\n    }\n    setCustomWheelEventHandler(e) {\n      this._customWheelEventHandler = e;\n    }\n    allowCustomWheelEvent(e) {\n      return this._customWheelEventHandler ? this._customWheelEventHandler(e) !== false : true;\n    }\n    restrictMouseEvent(e) {\n      return this._protocols[this._activeProtocol].restrict(e);\n    }\n    encodeMouseEvent(e) {\n      return this._encodings[this._activeEncoding](e);\n    }\n    get isDefaultEncoding() {\n      return this._activeEncoding === "DEFAULT";\n    }\n    get isPixelEncoding() {\n      return this._activeEncoding === "SGR_PIXELS";\n    }\n  };\n  var Ts = [[768, 879], [1155, 1158], [1160, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1539], [1552, 1557], [1611, 1630], [1648, 1648], [1750, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2305, 2306], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2388], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2672, 2673], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2883], [2893, 2893], [2902, 2902], [2946, 2946], [3008, 3008], [3021, 3021], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3393, 3395], [3405, 3405], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3769], [3771, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3984, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4146], [4150, 4151], [4153, 4153], [4184, 4185], [4448, 4607], [4959, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6157], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7616, 7626], [7678, 7679], [8203, 8207], [8234, 8238], [8288, 8291], [8298, 8303], [8400, 8431], [12330, 12335], [12441, 12442], [43014, 43014], [43019, 43019], [43045, 43046], [64286, 64286], [65024, 65039], [65056, 65059], [65279, 65279], [65529, 65531]];\n  var No2 = [[68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var q2;\n  function Fo(n11, t) {\n    let e = 0, i5 = t.length - 1, r;\n    if (n11 < t[0][0] || n11 > t[i5][1]) return false;\n    for (; i5 >= e; ) if (r = e + i5 >> 1, n11 > t[r][1]) e = r + 1;\n    else if (n11 < t[r][0]) i5 = r - 1;\n    else return true;\n    return false;\n  }\n  var hr = class {\n    constructor() {\n      this.version = "6";\n      if (!q2) {\n        q2 = new Uint8Array(65536), q2.fill(1), q2[0] = 0, q2.fill(0, 1, 32), q2.fill(0, 127, 160), q2.fill(2, 4352, 4448), q2[9001] = 2, q2[9002] = 2, q2.fill(2, 11904, 42192), q2[12351] = 1, q2.fill(2, 44032, 55204), q2.fill(2, 63744, 64256), q2.fill(2, 65040, 65050), q2.fill(2, 65072, 65136), q2.fill(2, 65280, 65377), q2.fill(2, 65504, 65511);\n        for (let t = 0; t < Ts.length; ++t) q2.fill(0, Ts[t][0], Ts[t][1] + 1);\n      }\n    }\n    wcwidth(t) {\n      return t < 32 ? 0 : t < 127 ? 1 : t < 65536 ? q2[t] : Fo(t, No2) ? 0 : t >= 131072 && t <= 196605 || t >= 196608 && t <= 262141 ? 2 : 1;\n    }\n    charProperties(t, e) {\n      let i5 = this.wcwidth(t), r = i5 === 0 && e !== 0;\n      if (r) {\n        let s4 = be3.extractWidth(e);\n        s4 === 0 ? r = false : s4 > i5 && (i5 = s4);\n      }\n      return be3.createPropertyValue(0, i5, r);\n    }\n  };\n  var be3 = class n9 {\n    constructor() {\n      this._providers = /* @__PURE__ */ Object.create(null);\n      this._active = "";\n      this._onChange = new v5();\n      this.onChange = this._onChange.event;\n      let t = new hr();\n      this.register(t), this._active = t.version, this._activeProvider = t;\n    }\n    static extractShouldJoin(t) {\n      return (t & 1) !== 0;\n    }\n    static extractWidth(t) {\n      return t >> 1 & 3;\n    }\n    static extractCharKind(t) {\n      return t >> 3;\n    }\n    static createPropertyValue(t, e, i5 = false) {\n      return (t & 16777215) << 3 | (e & 3) << 1 | (i5 ? 1 : 0);\n    }\n    dispose() {\n      this._onChange.dispose();\n    }\n    get versions() {\n      return Object.keys(this._providers);\n    }\n    get activeVersion() {\n      return this._active;\n    }\n    set activeVersion(t) {\n      if (!this._providers[t]) throw new Error(`unknown Unicode version "${t}"`);\n      this._active = t, this._activeProvider = this._providers[t], this._onChange.fire(t);\n    }\n    register(t) {\n      this._providers[t.version] = t;\n    }\n    wcwidth(t) {\n      return this._activeProvider.wcwidth(t);\n    }\n    getStringCellWidth(t) {\n      let e = 0, i5 = 0, r = t.length;\n      for (let s4 = 0; s4 < r; ++s4) {\n        let o2 = t.charCodeAt(s4);\n        if (55296 <= o2 && o2 <= 56319) {\n          if (++s4 >= r) return e + this.wcwidth(o2);\n          let h3 = t.charCodeAt(s4);\n          56320 <= h3 && h3 <= 57343 ? o2 = (o2 - 55296) * 1024 + h3 - 56320 + 65536 : e += this.wcwidth(h3);\n        }\n        let a2 = this.charProperties(o2, i5), l4 = n9.extractWidth(a2);\n        n9.extractShouldJoin(a2) && (l4 -= n9.extractWidth(i5)), e += l4, i5 = a2;\n      }\n      return e;\n    }\n    charProperties(t, e) {\n      return this._activeProvider.charProperties(t, e);\n    }\n  };\n  var dr = class {\n    constructor() {\n      this.glevel = 0;\n      this._charsets = [];\n    }\n    get charsets() {\n      return this._charsets;\n    }\n    reset() {\n      this.charset = void 0, this._charsets = [], this.glevel = 0;\n    }\n    setgLevel(t) {\n      this.glevel = t, this.charset = this._charsets[t];\n    }\n    setgCharset(t, e) {\n      this._charsets[t] = e, this.glevel === t && (this.charset = e);\n    }\n  };\n  function Ds(n11) {\n    let e = n11.buffer.lines.get(n11.buffer.ybase + n11.buffer.y - 1)?.get(n11.cols - 1), i5 = n11.buffer.lines.get(n11.buffer.ybase + n11.buffer.y);\n    i5 && e && (i5.isWrapped = e[3] !== 0 && e[3] !== 32);\n  }\n  var ai = 2147483647;\n  var Ho2 = 256;\n  var Mt = class n10 {\n    constructor(t = 32, e = 32) {\n      this.maxLength = t;\n      this.maxSubParamsLength = e;\n      if (e > Ho2) throw new Error("maxSubParamsLength must not be greater than 256");\n      this.params = new Int32Array(t), this.length = 0, this._subParams = new Int32Array(e), this._subParamsLength = 0, this._subParamsIdx = new Uint16Array(t), this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false;\n    }\n    static fromArray(t) {\n      let e = new n10();\n      if (!t.length) return e;\n      for (let i5 = Array.isArray(t[0]) ? 1 : 0; i5 < t.length; ++i5) {\n        let r = t[i5];\n        if (Array.isArray(r)) for (let s4 = 0; s4 < r.length; ++s4) e.addSubParam(r[s4]);\n        else e.addParam(r);\n      }\n      return e;\n    }\n    clone() {\n      let t = new n10(this.maxLength, this.maxSubParamsLength);\n      return t.params.set(this.params), t.length = this.length, t._subParams.set(this._subParams), t._subParamsLength = this._subParamsLength, t._subParamsIdx.set(this._subParamsIdx), t._rejectDigits = this._rejectDigits, t._rejectSubDigits = this._rejectSubDigits, t._digitIsSub = this._digitIsSub, t;\n    }\n    toArray() {\n      let t = [];\n      for (let e = 0; e < this.length; ++e) {\n        t.push(this.params[e]);\n        let i5 = this._subParamsIdx[e] >> 8, r = this._subParamsIdx[e] & 255;\n        r - i5 > 0 && t.push(Array.prototype.slice.call(this._subParams, i5, r));\n      }\n      return t;\n    }\n    reset() {\n      this.length = 0, this._subParamsLength = 0, this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false;\n    }\n    resetZdm() {\n      this.length = 1, this._subParamsLength = 0, this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false, this._subParamsIdx[0] = 0, this.params[0] = 0;\n    }\n    addParam(t) {\n      if (this._digitIsSub = false, this.length >= this.maxLength) {\n        this._rejectDigits = true;\n        return;\n      }\n      if (t < -1) throw new Error("values lesser than -1 are not allowed");\n      this._subParamsIdx[this.length] = this._subParamsLength << 8 | this._subParamsLength, this.params[this.length++] = t > ai ? ai : t;\n    }\n    addSubParam(t) {\n      if (this._digitIsSub = true, !!this.length) {\n        if (this._rejectDigits || this._subParamsLength >= this.maxSubParamsLength) {\n          this._rejectSubDigits = true;\n          return;\n        }\n        if (t < -1) throw new Error("values lesser than -1 are not allowed");\n        this._subParams[this._subParamsLength++] = t > ai ? ai : t, this._subParamsIdx[this.length - 1]++;\n      }\n    }\n    hasSubParams(t) {\n      return (this._subParamsIdx[t] & 255) - (this._subParamsIdx[t] >> 8) > 0;\n    }\n    getSubParams(t) {\n      let e = this._subParamsIdx[t] >> 8, i5 = this._subParamsIdx[t] & 255;\n      return i5 - e > 0 ? this._subParams.subarray(e, i5) : null;\n    }\n    getSubParamsAll() {\n      let t = {};\n      for (let e = 0; e < this.length; ++e) {\n        let i5 = this._subParamsIdx[e] >> 8, r = this._subParamsIdx[e] & 255;\n        r - i5 > 0 && (t[e] = this._subParams.slice(i5, r));\n      }\n      return t;\n    }\n    addDigit(t) {\n      let e;\n      if (this._rejectDigits || !(e = this._digitIsSub ? this._subParamsLength : this.length) || this._digitIsSub && this._rejectSubDigits) return;\n      let i5 = this._digitIsSub ? this._subParams : this.params, r = i5[e - 1];\n      i5[e - 1] = ~r ? Math.min(r * 10 + t, ai) : t;\n    }\n  };\n  var li = [];\n  var ur = class {\n    constructor() {\n      this._state = 0;\n      this._active = li;\n      this._id = -1;\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = li;\n    }\n    reset() {\n      if (this._state === 2) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].end(false);\n      this._stack.paused = false, this._active = li, this._id = -1, this._state = 0;\n    }\n    _start() {\n      if (this._active = this._handlers[this._id] || li, !this._active.length) this._handlerFb(this._id, "START");\n      else for (let t = this._active.length - 1; t >= 0; t--) this._active[t].start();\n    }\n    _put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._id, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    start() {\n      this.reset(), this._state = 1;\n    }\n    put(t, e, i5) {\n      if (this._state !== 3) {\n        if (this._state === 1) for (; e < i5; ) {\n          let r = t[e++];\n          if (r === 59) {\n            this._state = 2, this._start();\n            break;\n          }\n          if (r < 48 || 57 < r) {\n            this._state = 3;\n            return;\n          }\n          this._id === -1 && (this._id = 0), this._id = this._id * 10 + r - 48;\n        }\n        this._state === 2 && i5 - e > 0 && this._put(t, e, i5);\n      }\n    }\n    end(t, e = true) {\n      if (this._state !== 0) {\n        if (this._state !== 3) if (this._state === 1 && this._start(), !this._active.length) this._handlerFb(this._id, "END", t);\n        else {\n          let i5 = false, r = this._active.length - 1, s4 = false;\n          if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n            for (; r >= 0 && (i5 = this._active[r].end(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n            r--;\n          }\n          for (; r >= 0; r--) if (i5 = this._active[r].end(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n        }\n        this._active = li, this._id = -1, this._state = 0;\n      }\n    }\n  };\n  var fr = class fr2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._hitLimit = false;\n    }\n    start() {\n      this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > fr2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    end(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data), e instanceof Promise)) return e.then((i5) => (this._data = "", this._hitLimit = false, i5));\n      return this._data = "", this._hitLimit = false, e;\n    }\n  };\n  fr._payloadLimit = 1e7;\n  var re2 = fr;\n  var ci = [];\n  var pr = class {\n    constructor() {\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._active = ci;\n      this._ident = 0;\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = ci;\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    reset() {\n      if (this._active.length) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].unhook(false);\n      this._stack.paused = false, this._active = ci, this._ident = 0;\n    }\n    hook(t, e) {\n      if (this.reset(), this._ident = t, this._active = this._handlers[t] || ci, !this._active.length) this._handlerFb(this._ident, "HOOK", e);\n      else for (let i5 = this._active.length - 1; i5 >= 0; i5--) this._active[i5].hook(e);\n    }\n    put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._ident, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    unhook(t, e = true) {\n      if (!this._active.length) this._handlerFb(this._ident, "UNHOOK", t);\n      else {\n        let i5 = false, r = this._active.length - 1, s4 = false;\n        if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n          for (; r >= 0 && (i5 = this._active[r].unhook(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n          r--;\n        }\n        for (; r >= 0; r--) if (i5 = this._active[r].unhook(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n      }\n      this._active = ci, this._ident = 0;\n    }\n  };\n  var hi = new Mt();\n  hi.addParam(0);\n  var _r = class _r2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._params = hi;\n      this._hitLimit = false;\n    }\n    hook(t) {\n      this._params = t.length > 1 || t.params[0] ? t.clone() : hi, this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > _r2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    unhook(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data, this._params), e instanceof Promise)) return e.then((i5) => (this._params = hi, this._data = "", this._hitLimit = false, i5));\n      return this._params = hi, this._data = "", this._hitLimit = false, e;\n    }\n  };\n  _r._payloadLimit = 1e7;\n  var di = _r;\n  var ui = [];\n  var mr = class {\n    constructor() {\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._active = ui;\n      this._ident = 0;\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = ui;\n    }\n    reset() {\n      if (this._active.length) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].end(false);\n      this._stack.paused = false, this._active = ui, this._ident = 0;\n    }\n    start(t) {\n      if (this.reset(), this._ident = t, this._active = this._handlers[t] || ui, !this._active.length) this._handlerFb(this._ident, "START");\n      else for (let e = this._active.length - 1; e >= 0; e--) this._active[e].start();\n    }\n    put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._ident, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    end(t, e = true) {\n      if (!this._active.length) this._handlerFb(this._ident, "END", t);\n      else {\n        let i5 = false, r = this._active.length - 1, s4 = false;\n        if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n          for (; r >= 0 && (i5 = this._active[r].end(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n          r--;\n        }\n        for (; r >= 0; r--) if (i5 = this._active[r].end(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n      }\n      this._active = ui, this._ident = 0;\n    }\n  };\n  var vr = class vr2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._hitLimit = false;\n    }\n    start() {\n      this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > vr2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    end(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data), e instanceof Promise)) return e.then((i5) => (this._data = "", this._hitLimit = false, i5));\n      return this._data = "", this._hitLimit = false, e;\n    }\n  };\n  vr._payloadLimit = 1e7;\n  var br = vr;\n  var Rs = class {\n    constructor(t) {\n      this.table = new Uint16Array(t);\n    }\n    setDefault(t, e) {\n      this.table.fill(t << 8 | e);\n    }\n    add(t, e, i5, r) {\n      this.table[e << 8 | t] = i5 << 8 | r;\n    }\n    addMany(t, e, i5, r) {\n      for (let s4 = 0; s4 < t.length; s4++) this.table[e << 8 | t[s4]] = i5 << 8 | r;\n    }\n  };\n  var se2 = 160;\n  var Wo2 = (function() {\n    let n11 = new Rs(4257), e = Array.apply(null, Array(256)).map((a2, l4) => l4), i5 = (a2, l4) => e.slice(a2, l4), r = i5(32, 127), s4 = i5(0, 24);\n    s4.push(25), s4.push.apply(s4, i5(28, 32));\n    let o2 = i5(0, 17);\n    n11.setDefault(1, 0), n11.addMany(r, 0, 2, 0);\n    for (let a2 of o2) n11.addMany([24, 26, 153, 154], a2, 3, 0), n11.addMany(i5(128, 144), a2, 3, 0), n11.addMany(i5(144, 152), a2, 3, 0), n11.add(156, a2, 0, 0), n11.add(27, a2, 11, 1), n11.add(157, a2, 4, 8), n11.addMany([152, 158], a2, 0, 7), n11.add(159, a2, 11, 14), n11.add(155, a2, 11, 3), n11.add(144, a2, 11, 9);\n    return n11.addMany(s4, 0, 3, 0), n11.addMany(s4, 1, 3, 1), n11.add(127, 1, 0, 1), n11.addMany(s4, 8, 0, 8), n11.addMany(s4, 3, 3, 3), n11.add(127, 3, 0, 3), n11.addMany(s4, 4, 3, 4), n11.add(127, 4, 0, 4), n11.addMany(s4, 6, 3, 6), n11.addMany(s4, 5, 3, 5), n11.add(127, 5, 0, 5), n11.addMany(s4, 2, 3, 2), n11.add(127, 2, 0, 2), n11.add(93, 1, 4, 8), n11.addMany(r, 8, 5, 8), n11.add(127, 8, 5, 8), n11.addMany([156, 27, 24, 26, 7], 8, 6, 0), n11.addMany(i5(28, 32), 8, 0, 8), n11.addMany([88, 94], 1, 0, 7), n11.addMany(r, 7, 0, 7), n11.addMany(s4, 7, 0, 7), n11.add(156, 7, 0, 0), n11.add(127, 7, 0, 7), n11.add(95, 1, 11, 14), n11.addMany(s4, 14, 0, 14), n11.add(127, 14, 0, 14), n11.addMany(i5(32, 48), 14, 9, 15), n11.addMany(i5(48, 127), 14, 15, 16), n11.addMany(i5(48, 127), 15, 15, 16), n11.addMany(s4, 15, 0, 15), n11.addMany(i5(32, 48), 15, 9, 15), n11.add(127, 15, 0, 15), n11.addMany(r, 16, 16, 16), n11.addMany(s4, 16, 0, 16), n11.addMany(i5(8, 14), 16, 16, 16), n11.add(127, 16, 0, 16), n11.addMany([27, 156, 24, 26], 16, 17, 0), n11.add(91, 1, 11, 3), n11.addMany(i5(64, 127), 3, 7, 0), n11.addMany(i5(48, 60), 3, 8, 4), n11.addMany([60, 61, 62, 63], 3, 9, 4), n11.addMany(i5(48, 60), 4, 8, 4), n11.addMany(i5(64, 127), 4, 7, 0), n11.addMany([60, 61, 62, 63], 4, 0, 6), n11.addMany(i5(32, 64), 6, 0, 6), n11.add(127, 6, 0, 6), n11.addMany(i5(64, 127), 6, 0, 0), n11.addMany(i5(32, 48), 3, 9, 5), n11.addMany(i5(32, 48), 5, 9, 5), n11.addMany(i5(48, 64), 5, 0, 6), n11.addMany(i5(64, 127), 5, 7, 0), n11.addMany(i5(32, 48), 4, 9, 5), n11.addMany(i5(32, 48), 1, 9, 2), n11.addMany(i5(32, 48), 2, 9, 2), n11.addMany(i5(48, 127), 2, 10, 0), n11.addMany(i5(48, 80), 1, 10, 0), n11.addMany(i5(81, 88), 1, 10, 0), n11.addMany([89, 90, 92], 1, 10, 0), n11.addMany(i5(96, 127), 1, 10, 0), n11.add(80, 1, 11, 9), n11.addMany(s4, 9, 0, 9), n11.add(127, 9, 0, 9), n11.addMany(i5(32, 48), 9, 9, 12), n11.addMany(i5(48, 60), 9, 8, 10), n11.addMany([60, 61, 62, 63], 9, 9, 10), n11.addMany(s4, 11, 0, 11), n11.addMany(i5(32, 128), 11, 0, 11), n11.addMany(s4, 10, 0, 10), n11.add(127, 10, 0, 10), n11.addMany(i5(48, 60), 10, 8, 10), n11.addMany([60, 61, 62, 63], 10, 0, 11), n11.addMany(i5(32, 48), 10, 9, 12), n11.addMany(s4, 12, 0, 12), n11.add(127, 12, 0, 12), n11.addMany(i5(32, 48), 12, 9, 12), n11.addMany(i5(48, 64), 12, 0, 11), n11.addMany(i5(64, 127), 12, 12, 13), n11.addMany(i5(64, 127), 10, 12, 13), n11.addMany(i5(64, 127), 9, 12, 13), n11.addMany(s4, 13, 13, 13), n11.addMany(r, 13, 13, 13), n11.add(127, 13, 0, 13), n11.addMany([27, 156, 24, 26], 13, 14, 0), n11.add(se2, 0, 2, 0), n11.add(se2, 8, 5, 8), n11.add(se2, 6, 0, 6), n11.add(se2, 11, 0, 11), n11.add(se2, 13, 13, 13), n11.add(se2, 16, 16, 16), n11;\n  })();\n  var Sr = class extends g5 {\n    constructor(e = Wo2) {\n      super();\n      this._transitions = e;\n      this._parseStack = { state: 0, handlers: [], handlerPos: 0, transition: 0, chunkPos: 0 };\n      this.initialState = 0, this.currentState = this.initialState, this._params = new Mt(), this._params.addParam(0), this._collect = 0, this.precedingJoinState = 0, this._printHandlerFb = (i5, r, s4) => {\n      }, this._executeHandlerFb = (i5) => {\n      }, this._csiHandlerFb = (i5, r) => {\n      }, this._escHandlerFb = (i5) => {\n      }, this._errorHandlerFb = (i5) => i5, this._printHandler = this._printHandlerFb, this._executeHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlersArr = new Array(24).fill(void 0), this._csiHandlers = /* @__PURE__ */ Object.create(null), this._escHandlers = /* @__PURE__ */ Object.create(null), this._register(y4(() => {\n        this._csiHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlersArr = new Array(24).fill(void 0), this._escHandlers = /* @__PURE__ */ Object.create(null);\n      })), this._oscParser = this._register(new ur()), this._dcsParser = this._register(new pr()), this._apcParser = this._register(new mr()), this._errorHandler = this._errorHandlerFb, this.registerEscHandler({ final: "\\\\" }, () => true);\n    }\n    _identifier(e, i5 = [64, 126]) {\n      let r = 0;\n      if (e.prefix) {\n        if (e.prefix.length > 1) throw new Error("only one byte as prefix supported");\n        if (r = e.prefix.charCodeAt(0), r && 60 > r || r > 63) throw new Error("prefix must be in range 0x3c .. 0x3f");\n      }\n      if (e.intermediates) {\n        if (e.intermediates.length > 2) throw new Error("only two bytes as intermediates are supported");\n        for (let o2 = 0; o2 < e.intermediates.length; ++o2) {\n          let a2 = e.intermediates.charCodeAt(o2);\n          if (32 > a2 || a2 > 47) throw new Error("intermediate must be in range 0x20 .. 0x2f");\n          r <<= 8, r |= a2;\n        }\n      }\n      if (e.final.length !== 1) throw new Error("final must be a single byte");\n      let s4 = e.final.charCodeAt(0);\n      if (i5[0] > s4 || s4 > i5[1]) throw new Error(`final must be in range ${i5[0]} .. ${i5[1]}`);\n      return r <<= 8, r |= s4, r;\n    }\n    identToString(e) {\n      let i5 = [];\n      for (; e; ) i5.push(String.fromCharCode(e & 255)), e >>= 8;\n      return i5.reverse().join("");\n    }\n    setPrintHandler(e) {\n      this._printHandler = e;\n    }\n    clearPrintHandler() {\n      this._printHandler = this._printHandlerFb;\n    }\n    registerEscHandler(e, i5) {\n      let r = this._identifier(e, [48, 126]);\n      this._escHandlers[r] ??= [];\n      let s4 = this._escHandlers[r];\n      return s4.push(i5), { dispose: () => {\n        let o2 = s4.indexOf(i5);\n        o2 !== -1 && s4.splice(o2, 1);\n      } };\n    }\n    clearEscHandler(e) {\n      this._escHandlers[this._identifier(e, [48, 126])] && delete this._escHandlers[this._identifier(e, [48, 126])];\n    }\n    setEscHandlerFallback(e) {\n      this._escHandlerFb = e;\n    }\n    setExecuteHandler(e, i5) {\n      let r = e.charCodeAt(0);\n      this._executeHandlers[r] = i5, r < 24 && (this._executeHandlersArr[r] = i5);\n    }\n    clearExecuteHandler(e) {\n      let i5 = e.charCodeAt(0);\n      this._executeHandlers[i5] && delete this._executeHandlers[i5], i5 < 24 && (this._executeHandlersArr[i5] = void 0);\n    }\n    setExecuteHandlerFallback(e) {\n      this._executeHandlerFb = e;\n    }\n    registerCsiHandler(e, i5) {\n      let r = this._identifier(e);\n      this._csiHandlers[r] ??= [];\n      let s4 = this._csiHandlers[r];\n      return s4.push(i5), { dispose: () => {\n        let o2 = s4.indexOf(i5);\n        o2 !== -1 && s4.splice(o2, 1);\n      } };\n    }\n    clearCsiHandler(e) {\n      this._csiHandlers[this._identifier(e)] && delete this._csiHandlers[this._identifier(e)];\n    }\n    setCsiHandlerFallback(e) {\n      this._csiHandlerFb = e;\n    }\n    registerDcsHandler(e, i5) {\n      return this._dcsParser.registerHandler(this._identifier(e), i5);\n    }\n    clearDcsHandler(e) {\n      this._dcsParser.clearHandler(this._identifier(e));\n    }\n    setDcsHandlerFallback(e) {\n      this._dcsParser.setHandlerFallback(e);\n    }\n    registerOscHandler(e, i5) {\n      return this._oscParser.registerHandler(e, i5);\n    }\n    clearOscHandler(e) {\n      this._oscParser.clearHandler(e);\n    }\n    setOscHandlerFallback(e) {\n      this._oscParser.setHandlerFallback(e);\n    }\n    registerApcHandler(e, i5) {\n      return e.prefix = void 0, this._apcParser.registerHandler(this._identifier(e, [48, 126]), i5);\n    }\n    clearApcHandler(e) {\n      e.prefix = void 0, this._apcParser.clearHandler(this._identifier(e, [48, 126]));\n    }\n    setApcHandlerFallback(e) {\n      this._apcParser.setHandlerFallback(e);\n    }\n    setErrorHandler(e) {\n      this._errorHandler = e;\n    }\n    clearErrorHandler() {\n      this._errorHandler = this._errorHandlerFb;\n    }\n    reset() {\n      this.currentState = this.initialState, this._oscParser.reset(), this._dcsParser.reset(), this._apcParser.reset(), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0, this._parseStack.state !== 0 && (this._parseStack.state = 2, this._parseStack.handlers = []);\n    }\n    _preserveStack(e, i5, r, s4, o2) {\n      this._parseStack.state = e, this._parseStack.handlers = i5, this._parseStack.handlerPos = r, this._parseStack.transition = s4, this._parseStack.chunkPos = o2;\n    }\n    parse(e, i5, r) {\n      let s4 = 0, o2 = 0, a2 = 0, l4;\n      if (this._parseStack.state) if (this._parseStack.state === 2) this._parseStack.state = 0, a2 = this._parseStack.chunkPos + 1;\n      else {\n        if (r === void 0 || this._parseStack.state === 1) throw this._parseStack.state = 1, new Error("improper continuation due to previous async handler, giving up parsing");\n        let h3 = this._parseStack.handlers, d3 = this._parseStack.handlerPos - 1;\n        switch (this._parseStack.state) {\n          case 3:\n            if (r === false && d3 > -1) {\n              for (; d3 >= 0 && (l4 = h3[d3](this._params), l4 !== true); d3--) if (l4 instanceof Promise) return this._parseStack.handlerPos = d3, l4;\n            }\n            this._parseStack.handlers = [];\n            break;\n          case 4:\n            if (r === false && d3 > -1) {\n              for (; d3 >= 0 && (l4 = h3[d3](), l4 !== true); d3--) if (l4 instanceof Promise) return this._parseStack.handlerPos = d3, l4;\n            }\n            this._parseStack.handlers = [];\n            break;\n          case 6:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._dcsParser.unhook(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n          case 5:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._oscParser.end(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n          case 7:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._apcParser.end(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n        }\n        this._parseStack.state = 0, a2 = this._parseStack.chunkPos + 1, this.precedingJoinState = 0, this.currentState = this._parseStack.transition & 255;\n      }\n      for (let h3 = a2; h3 < i5; ++h3) {\n        if (s4 = e[h3], s4 < 24 && this.currentState <= 6) {\n          (this._executeHandlersArr[s4] ?? this._executeHandlerFb)(s4), this.precedingJoinState = 0;\n          continue;\n        }\n        if (s4 === 27 && this.currentState < 8 && h3 + 2 < i5 && e[h3 + 1] === 91) {\n          this._params.resetZdm(), this._collect = 0;\n          let d3 = h3 + 2, c2 = e[d3];\n          c2 >= 60 && c2 <= 63 && (this._collect = c2, d3++);\n          let u3 = false;\n          for (; d3 < i5; d3++) if (c2 = e[d3], c2 >= 48 && c2 <= 57) this._params.addDigit(c2 - 48);\n          else if (c2 === 59) this._params.addParam(0);\n          else if (c2 === 58) this._params.addSubParam(-1);\n          else if (c2 >= 64 && c2 <= 126) {\n            let _5 = this._csiHandlers[this._collect << 8 | c2], p3 = _5 ? _5.length - 1 : -1;\n            for (; p3 >= 0 && (l4 = _5[p3](this._params), l4 !== true); p3--) if (l4 instanceof Promise) return o2 = 1792, this._preserveStack(3, _5, p3, o2, d3), l4;\n            p3 < 0 && this._csiHandlerFb(this._collect << 8 | c2, this._params), this.precedingJoinState = 0, h3 = d3, this.currentState = 0, u3 = true;\n            break;\n          } else break;\n          u3 || (h3 = d3 - 1, this.currentState = 4);\n          continue;\n        }\n        switch (o2 = this._transitions.table[this.currentState << 8 | (s4 < se2 ? s4 : se2)], o2 >> 8) {\n          case 2:\n            let d3 = h3, c2 = i5 - 4;\n            for (; d3 < c2 && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2); ) ;\n            if (d3 >= c2) for (; d3 < i5 && e[d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2); ) d3++;\n            this._printHandler(e, h3, d3), h3 = d3 - 1;\n            break;\n          case 3:\n            this._executeHandlers[s4] ? this._executeHandlers[s4]() : this._executeHandlerFb(s4), this.precedingJoinState = 0;\n            break;\n          case 0:\n            break;\n          case 1:\n            if (this._errorHandler({ position: h3, code: s4, currentState: this.currentState, collect: this._collect, params: this._params, abort: false }).abort) return;\n            break;\n          case 7:\n            let _5 = this._csiHandlers[this._collect << 8 | s4], p3 = _5 ? _5.length - 1 : -1;\n            for (; p3 >= 0 && (l4 = _5[p3](this._params), l4 !== true); p3--) if (l4 instanceof Promise) return this._preserveStack(3, _5, p3, o2, h3), l4;\n            p3 < 0 && this._csiHandlerFb(this._collect << 8 | s4, this._params), this.precedingJoinState = 0;\n            break;\n          case 8:\n            do\n              switch (s4) {\n                case 59:\n                  this._params.addParam(0);\n                  break;\n                case 58:\n                  this._params.addSubParam(-1);\n                  break;\n                default:\n                  this._params.addDigit(s4 - 48);\n              }\n            while (++h3 < i5 && (s4 = e[h3]) > 47 && s4 < 60);\n            h3--;\n            break;\n          case 9:\n            this._collect <<= 8, this._collect |= s4;\n            break;\n          case 10:\n            let b4 = this._escHandlers[this._collect << 8 | s4], f5 = b4 ? b4.length - 1 : -1;\n            for (; f5 >= 0 && (l4 = b4[f5](), l4 !== true); f5--) if (l4 instanceof Promise) return this._preserveStack(4, b4, f5, o2, h3), l4;\n            f5 < 0 && this._escHandlerFb(this._collect << 8 | s4), this.precedingJoinState = 0;\n            break;\n          case 11:\n            this._params.resetZdm(), this._collect = 0;\n            break;\n          case 12:\n            this._dcsParser.hook(this._collect << 8 | s4, this._params);\n            break;\n          case 13:\n            for (let S4 = h3 + 1; ; ++S4) if (S4 >= i5 || (s4 = e[S4]) === 24 || s4 === 26 || s4 === 27 || s4 > 127 && s4 < se2) {\n              this._dcsParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 14:\n            if (l4 = this._dcsParser.unhook(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(6, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n          case 4:\n            this._oscParser.start();\n            break;\n          case 5:\n            for (let S4 = h3 + 1; ; S4++) if (S4 >= i5 || (s4 = e[S4]) < 32 || s4 > 127 && s4 < se2) {\n              this._oscParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 6:\n            if (l4 = this._oscParser.end(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(5, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n          case 15:\n            this._apcParser.start(this._collect << 8 | s4);\n            break;\n          case 16:\n            for (let S4 = h3 + 1; ; ++S4) if (!(S4 < i5 && (e[S4] >= 32 && e[S4] < 127 || e[S4] >= 8 && e[S4] < 14 || e[S4] >= se2))) {\n              this._apcParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 17:\n            if (l4 = this._apcParser.end(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(7, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n        }\n        this.currentState = o2 & 255;\n      }\n    }\n  };\n  var Uo = /^([\\da-f])\\/([\\da-f])\\/([\\da-f])$|^([\\da-f]{2})\\/([\\da-f]{2})\\/([\\da-f]{2})$|^([\\da-f]{3})\\/([\\da-f]{3})\\/([\\da-f]{3})$|^([\\da-f]{4})\\/([\\da-f]{4})\\/([\\da-f]{4})$/;\n  var Ko = /^[\\da-f]+$/;\n  function As(n11) {\n    if (!n11) return;\n    let t = n11.toLowerCase();\n    if (t.startsWith("rgb:")) {\n      t = t.slice(4);\n      let e = Uo.exec(t);\n      if (e) {\n        let i5 = e[1] ? 15 : e[4] ? 255 : e[7] ? 4095 : 65535;\n        return [Math.round(parseInt(e[1] || e[4] || e[7] || e[10], 16) / i5 * 255), Math.round(parseInt(e[2] || e[5] || e[8] || e[11], 16) / i5 * 255), Math.round(parseInt(e[3] || e[6] || e[9] || e[12], 16) / i5 * 255)];\n      }\n    } else if (t.startsWith("#") && (t = t.slice(1), Ko.exec(t) && [3, 6, 9, 12].includes(t.length))) {\n      let e = t.length / 3, i5 = [0, 0, 0];\n      for (let r = 0; r < 3; ++r) {\n        let s4 = parseInt(t.slice(e * r, e * r + e), 16);\n        i5[r] = e === 1 ? s4 << 4 : e === 2 ? s4 : e === 3 ? s4 >> 4 : s4 >> 8;\n      }\n      return i5;\n    }\n  }\n  function Ls(n11, t) {\n    let e = n11.toString(16), i5 = e.length < 2 ? "0" + e : e;\n    switch (t) {\n      case 4:\n        return e[0];\n      case 8:\n        return i5;\n      case 12:\n        return (i5 + i5).slice(0, 3);\n      default:\n        return i5 + i5;\n    }\n  }\n  function Pn(n11, t = 16) {\n    let [e, i5, r] = n11;\n    return `rgb:${Ls(e, t)}/${Ls(i5, t)}/${Ls(r, t)}`;\n  }\n  var Mn = "6.1.0-beta.213";\n  var Go2 = { "(": 0, ")": 1, "*": 2, "+": 3, "-": 1, ".": 2 };\n  var Ue3 = 131072;\n  var Bn = 10;\n  function On(n11, t) {\n    if (n11 > 24) return t.setWinLines || false;\n    switch (n11) {\n      case 1:\n        return !!t.restoreWin;\n      case 2:\n        return !!t.minimizeWin;\n      case 3:\n        return !!t.setWinPosition;\n      case 4:\n        return !!t.setWinSizePixels;\n      case 5:\n        return !!t.raiseWin;\n      case 6:\n        return !!t.lowerWin;\n      case 7:\n        return !!t.refreshWin;\n      case 8:\n        return !!t.setWinSizeChars;\n      case 9:\n        return !!t.maximizeWin;\n      case 10:\n        return !!t.fullscreenWin;\n      case 11:\n        return !!t.getWinState;\n      case 13:\n        return !!t.getWinPosition;\n      case 14:\n        return !!t.getWinSizePixels;\n      case 15:\n        return !!t.getScreenSizePixels;\n      case 16:\n        return !!t.getCellSizePixels;\n      case 18:\n        return !!t.getWinSizeChars;\n      case 19:\n        return !!t.getScreenSizeChars;\n      case 20:\n        return !!t.getIconTitle;\n      case 21:\n        return !!t.getWinTitle;\n      case 22:\n        return !!t.pushTitle;\n      case 23:\n        return !!t.popTitle;\n      case 24:\n        return !!t.setWinLines;\n    }\n    return false;\n  }\n  var Nn = 5e3;\n  var Fn = 0;\n  var gr = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3 = new Sr()) {\n      super();\n      this._bufferService = e;\n      this._charsetService = i5;\n      this._coreService = r;\n      this._logService = s4;\n      this._optionsService = o2;\n      this._oscLinkService = a2;\n      this._mouseStateService = l4;\n      this._unicodeService = h3;\n      this._parser = d3;\n      this._parseBuffer = new Uint32Array(4096);\n      this._stringDecoder = new Si();\n      this._utf8Decoder = new gi();\n      this._windowTitle = "";\n      this._iconName = "";\n      this._windowTitleStack = [];\n      this._iconNameStack = [];\n      this._curAttrData = U5.clone();\n      this._eraseAttrDataInternal = U5.clone();\n      this._onRequestBell = this._register(new v5());\n      this.onRequestBell = this._onRequestBell.event;\n      this._onRequestRefreshRows = this._register(new v5());\n      this.onRequestRefreshRows = this._onRequestRefreshRows.event;\n      this._onRequestReset = this._register(new v5());\n      this.onRequestReset = this._onRequestReset.event;\n      this._onRequestSendFocus = this._register(new v5());\n      this.onRequestSendFocus = this._onRequestSendFocus.event;\n      this._onRequestSyncScrollBar = this._register(new v5());\n      this.onRequestSyncScrollBar = this._onRequestSyncScrollBar.event;\n      this._onRequestWindowsOptionsReport = this._register(new v5());\n      this.onRequestWindowsOptionsReport = this._onRequestWindowsOptionsReport.event;\n      this._onA11yChar = this._register(new v5());\n      this.onA11yChar = this._onA11yChar.event;\n      this._onA11yTab = this._register(new v5());\n      this.onA11yTab = this._onA11yTab.event;\n      this._onCursorMove = this._register(new v5());\n      this.onCursorMove = this._onCursorMove.event;\n      this._onLineFeed = this._register(new v5());\n      this.onLineFeed = this._onLineFeed.event;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this._onTitleChange = this._register(new v5());\n      this.onTitleChange = this._onTitleChange.event;\n      this._onColor = this._register(new v5());\n      this.onColor = this._onColor.event;\n      this._onRequestColorSchemeQuery = this._register(new v5());\n      this.onRequestColorSchemeQuery = this._onRequestColorSchemeQuery.event;\n      this._parseStack = { paused: false, cursorStartX: 0, cursorStartY: 0, decodedLength: 0, position: 0 };\n      this._specialColors = [256, 257, 258];\n      this._register(this._parser), this._dirtyRowTracker = new fi(this._bufferService), this._activeBuffer = this._bufferService.buffer, this._register(this._bufferService.buffers.onBufferActivate((c2) => this._activeBuffer = c2.activeBuffer)), this._parser.setCsiHandlerFallback((c2, u3) => {\n        this._logService.debug("Unknown CSI code: ", { identifier: this._parser.identToString(c2), params: u3.toArray() });\n      }), this._parser.setEscHandlerFallback((c2) => {\n        this._logService.debug("Unknown ESC code: ", { identifier: this._parser.identToString(c2) });\n      }), this._parser.setExecuteHandlerFallback((c2) => {\n        this._logService.debug("Unknown EXECUTE code: ", { code: c2 });\n      }), this._parser.setOscHandlerFallback((c2, u3, _5) => {\n        this._logService.debug("Unknown OSC code: ", { identifier: c2, action: u3, data: _5 });\n      }), this._parser.setDcsHandlerFallback((c2, u3, _5) => {\n        u3 === "HOOK" && (_5 = _5.toArray()), this._logService.debug("Unknown DCS code: ", { identifier: this._parser.identToString(c2), action: u3, payload: _5 });\n      }), this._parser.setApcHandlerFallback((c2, u3, _5) => {\n        this._logService.debug("Unknown APC code: ", { identifier: this._parser.identToString(c2), action: u3, payload: _5 });\n      }), this._parser.setPrintHandler((c2, u3, _5) => this.print(c2, u3, _5)), this._parser.registerCsiHandler({ final: "@" }, (c2) => this.insertChars(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "@" }, (c2) => this.scrollLeft(c2)), this._parser.registerCsiHandler({ final: "A" }, (c2) => this.cursorUp(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "A" }, (c2) => this.scrollRight(c2)), this._parser.registerCsiHandler({ final: "B" }, (c2) => this.cursorDown(c2)), this._parser.registerCsiHandler({ final: "C" }, (c2) => this.cursorForward(c2)), this._parser.registerCsiHandler({ final: "D" }, (c2) => this.cursorBackward(c2)), this._parser.registerCsiHandler({ final: "E" }, (c2) => this.cursorNextLine(c2)), this._parser.registerCsiHandler({ final: "F" }, (c2) => this.cursorPrecedingLine(c2)), this._parser.registerCsiHandler({ final: "G" }, (c2) => this.cursorCharAbsolute(c2)), this._parser.registerCsiHandler({ final: "H" }, (c2) => this.cursorPosition(c2)), this._parser.registerCsiHandler({ final: "I" }, (c2) => this.cursorForwardTab(c2)), this._parser.registerCsiHandler({ final: "J" }, (c2) => this.eraseInDisplay(c2, false)), this._parser.registerCsiHandler({ prefix: "?", final: "J" }, (c2) => this.eraseInDisplay(c2, true)), this._parser.registerCsiHandler({ final: "K" }, (c2) => this.eraseInLine(c2, false)), this._parser.registerCsiHandler({ prefix: "?", final: "K" }, (c2) => this.eraseInLine(c2, true)), this._parser.registerCsiHandler({ final: "L" }, (c2) => this.insertLines(c2)), this._parser.registerCsiHandler({ final: "M" }, (c2) => this.deleteLines(c2)), this._parser.registerCsiHandler({ final: "P" }, (c2) => this.deleteChars(c2)), this._parser.registerCsiHandler({ final: "S" }, (c2) => this.scrollUp(c2)), this._parser.registerCsiHandler({ final: "T" }, (c2) => this.scrollDown(c2)), this._parser.registerCsiHandler({ final: "X" }, (c2) => this.eraseChars(c2)), this._parser.registerCsiHandler({ final: "Z" }, (c2) => this.cursorBackwardTab(c2)), this._parser.registerCsiHandler({ final: "^" }, (c2) => this.scrollDown(c2)), this._parser.registerCsiHandler({ final: "`" }, (c2) => this.charPosAbsolute(c2)), this._parser.registerCsiHandler({ final: "a" }, (c2) => this.hPositionRelative(c2)), this._parser.registerCsiHandler({ final: "b" }, (c2) => this.repeatPrecedingCharacter(c2)), this._parser.registerCsiHandler({ final: "c" }, (c2) => this.sendDeviceAttributesPrimary(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "c" }, (c2) => this.sendDeviceAttributesSecondary(c2)), this._parser.registerCsiHandler({ final: "d" }, (c2) => this.linePosAbsolute(c2)), this._parser.registerCsiHandler({ final: "e" }, (c2) => this.vPositionRelative(c2)), this._parser.registerCsiHandler({ final: "f" }, (c2) => this.hVPosition(c2)), this._parser.registerCsiHandler({ final: "g" }, (c2) => this.tabClear(c2)), this._parser.registerCsiHandler({ final: "h" }, (c2) => this.setMode(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "h" }, (c2) => this.setModePrivate(c2)), this._parser.registerCsiHandler({ final: "l" }, (c2) => this.resetMode(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "l" }, (c2) => this.resetModePrivate(c2)), this._parser.registerCsiHandler({ final: "m" }, (c2) => this.charAttributes(c2)), this._parser.registerCsiHandler({ final: "n" }, (c2) => this.deviceStatus(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "n" }, (c2) => this.deviceStatusPrivate(c2)), this._parser.registerCsiHandler({ intermediates: "!", final: "p" }, (c2) => this.softReset(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "q" }, (c2) => this.sendXtVersion(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "q" }, (c2) => this.setCursorStyle(c2)), this._parser.registerCsiHandler({ final: "r" }, (c2) => this.setScrollRegion(c2)), this._parser.registerCsiHandler({ final: "s" }, (c2) => this.saveCursor(c2)), this._parser.registerCsiHandler({ final: "t" }, (c2) => this.windowOptions(c2)), this._parser.registerCsiHandler({ final: "u" }, (c2) => this.restoreCursor(c2)), this._parser.registerCsiHandler({ intermediates: "\'", final: "}" }, (c2) => this.insertColumns(c2)), this._parser.registerCsiHandler({ intermediates: "\'", final: "~" }, (c2) => this.deleteColumns(c2)), this._parser.registerCsiHandler({ intermediates: \'"\', final: "q" }, (c2) => this.selectProtected(c2)), this._parser.registerCsiHandler({ intermediates: "$", final: "p" }, (c2) => this.requestMode(c2, true)), this._parser.registerCsiHandler({ prefix: "?", intermediates: "$", final: "p" }, (c2) => this.requestMode(c2, false)), this._parser.registerCsiHandler({ prefix: "=", final: "u" }, (c2) => this.kittyKeyboardSet(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "u" }, (c2) => this.kittyKeyboardQuery(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "u" }, (c2) => this.kittyKeyboardPush(c2)), this._parser.registerCsiHandler({ prefix: "<", final: "u" }, (c2) => this.kittyKeyboardPop(c2)), this._parser.setExecuteHandler("\\x07", () => this.bell()), this._parser.setExecuteHandler(`\n`, () => this.lineFeed()), this._parser.setExecuteHandler("\\v", () => this.lineFeed()), this._parser.setExecuteHandler("\\f", () => this.lineFeed()), this._parser.setExecuteHandler("\\r", () => this.carriageReturn()), this._parser.setExecuteHandler("\\b", () => this.backspace()), this._parser.setExecuteHandler("\t", () => this.tab()), this._parser.setExecuteHandler("\u000e", () => this.shiftOut()), this._parser.setExecuteHandler("\u000f", () => this.shiftIn()), this._parser.setExecuteHandler("\\x84", () => this.index()), this._parser.setExecuteHandler("\\x85", () => this.nextLine()), this._parser.setExecuteHandler("\\x88", () => this.tabSet()), this._parser.registerOscHandler(0, new re2((c2) => (this.setTitle(c2), this.setIconName(c2), true))), this._parser.registerOscHandler(1, new re2((c2) => this.setIconName(c2))), this._parser.registerOscHandler(2, new re2((c2) => this.setTitle(c2))), this._parser.registerOscHandler(4, new re2((c2) => this.setOrReportIndexedColor(c2))), this._parser.registerOscHandler(8, new re2((c2) => this.setHyperlink(c2))), this._parser.registerOscHandler(10, new re2((c2) => this.setOrReportFgColor(c2))), this._parser.registerOscHandler(11, new re2((c2) => this.setOrReportBgColor(c2))), this._parser.registerOscHandler(12, new re2((c2) => this.setOrReportCursorColor(c2))), this._parser.registerOscHandler(104, new re2((c2) => this.restoreIndexedColor(c2))), this._parser.registerOscHandler(110, new re2((c2) => this.restoreFgColor(c2))), this._parser.registerOscHandler(111, new re2((c2) => this.restoreBgColor(c2))), this._parser.registerOscHandler(112, new re2((c2) => this.restoreCursorColor(c2))), this._parser.registerEscHandler({ final: "7" }, () => this.saveCursor()), this._parser.registerEscHandler({ final: "8" }, () => this.restoreCursor()), this._parser.registerEscHandler({ final: "D" }, () => this.index()), this._parser.registerEscHandler({ final: "E" }, () => this.nextLine()), this._parser.registerEscHandler({ final: "H" }, () => this.tabSet()), this._parser.registerEscHandler({ final: "M" }, () => this.reverseIndex()), this._parser.registerEscHandler({ final: "=" }, () => this.keypadApplicationMode()), this._parser.registerEscHandler({ final: ">" }, () => this.keypadNumericMode()), this._parser.registerEscHandler({ final: "c" }, () => this.fullReset()), this._parser.registerEscHandler({ final: "n" }, () => this.setgLevel(2)), this._parser.registerEscHandler({ final: "o" }, () => this.setgLevel(3)), this._parser.registerEscHandler({ final: "|" }, () => this.setgLevel(3)), this._parser.registerEscHandler({ final: "}" }, () => this.setgLevel(2)), this._parser.registerEscHandler({ final: "~" }, () => this.setgLevel(1)), this._parser.registerEscHandler({ intermediates: "%", final: "@" }, () => this.selectDefaultCharset()), this._parser.registerEscHandler({ intermediates: "%", final: "G" }, () => this.selectDefaultCharset());\n      for (let c2 in V4) this._parser.registerEscHandler({ intermediates: "(", final: c2 }, () => this.selectCharset("(" + c2)), this._parser.registerEscHandler({ intermediates: ")", final: c2 }, () => this.selectCharset(")" + c2)), this._parser.registerEscHandler({ intermediates: "*", final: c2 }, () => this.selectCharset("*" + c2)), this._parser.registerEscHandler({ intermediates: "+", final: c2 }, () => this.selectCharset("+" + c2)), this._parser.registerEscHandler({ intermediates: "-", final: c2 }, () => this.selectCharset("-" + c2)), this._parser.registerEscHandler({ intermediates: ".", final: c2 }, () => this.selectCharset("." + c2)), this._parser.registerEscHandler({ intermediates: "/", final: c2 }, () => this.selectCharset("/" + c2));\n      this._parser.registerEscHandler({ intermediates: "#", final: "8" }, () => this.screenAlignmentPattern()), this._parser.setErrorHandler((c2) => (this._logService.error("Parsing error: ", c2), c2)), this._parser.registerDcsHandler({ intermediates: "$", final: "q" }, new di((c2, u3) => this.requestStatusString(c2, u3)));\n    }\n    getAttrData() {\n      return this._curAttrData;\n    }\n    _preserveStack(e, i5, r, s4) {\n      this._parseStack.paused = true, this._parseStack.cursorStartX = e, this._parseStack.cursorStartY = i5, this._parseStack.decodedLength = r, this._parseStack.position = s4;\n    }\n    _logSlowResolvingAsync(e) {\n      if (this._logService.logLevel <= 3) {\n        let i5, r = new Promise((s4, o2) => {\n          i5 = setTimeout(() => o2("#SLOW_TIMEOUT"), Nn);\n        });\n        Promise.race([e, r]).then(() => {\n          i5 !== void 0 && clearTimeout(i5);\n        }, (s4) => {\n          if (i5 !== void 0 && clearTimeout(i5), s4 !== "#SLOW_TIMEOUT") throw s4;\n          console.warn(`async parser handler taking longer than ${Nn} ms`);\n        });\n      }\n    }\n    _getCurrentLinkId() {\n      return this._curAttrData.extended.urlId;\n    }\n    parse(e, i5) {\n      let r, s4 = this._activeBuffer.x, o2 = this._activeBuffer.y, a2 = 0, l4 = this._parseStack.paused;\n      if (l4) {\n        if (r = this._parser.parse(this._parseBuffer, this._parseStack.decodedLength, i5)) return this._logSlowResolvingAsync(r), r;\n        s4 = this._parseStack.cursorStartX, o2 = this._parseStack.cursorStartY, this._parseStack.paused = false, e.length > Ue3 && (a2 = this._parseStack.position + Ue3);\n      }\n      if (this._logService.logLevel <= 1 && this._logService.debug(`parsing data ${typeof e == "string" ? ` "${e}"` : ` "${Array.prototype.map.call(e, (c2) => String.fromCharCode(c2)).join("")}"`}`), this._logService.logLevel === 0 && this._logService.trace("parsing data (codes)", typeof e == "string" ? e.split("").map((c2) => c2.charCodeAt(0)) : e), this._parseBuffer.length < e.length && this._parseBuffer.length < Ue3 && (this._parseBuffer = new Uint32Array(Math.min(e.length, Ue3))), l4 || this._dirtyRowTracker.clearRange(), e.length > Ue3) for (let c2 = a2; c2 < e.length; c2 += Ue3) {\n        let u3 = c2 + Ue3 < e.length ? c2 + Ue3 : e.length, _5 = typeof e == "string" ? this._stringDecoder.decode(e.substring(c2, u3), this._parseBuffer) : this._utf8Decoder.decode(e.subarray(c2, u3), this._parseBuffer);\n        if (r = this._parser.parse(this._parseBuffer, _5)) return this._preserveStack(s4, o2, _5, c2), this._logSlowResolvingAsync(r), r;\n      }\n      else if (!l4) {\n        let c2 = typeof e == "string" ? this._stringDecoder.decode(e, this._parseBuffer) : this._utf8Decoder.decode(e, this._parseBuffer);\n        if (r = this._parser.parse(this._parseBuffer, c2)) return this._preserveStack(s4, o2, c2, 0), this._logSlowResolvingAsync(r), r;\n      }\n      (this._activeBuffer.x !== s4 || this._activeBuffer.y !== o2) && this._onCursorMove.fire();\n      let h3 = this._dirtyRowTracker.end + (this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp), d3 = this._dirtyRowTracker.start + (this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n      d3 < this._bufferService.rows && this._onRequestRefreshRows.fire({ start: Math.min(d3, this._bufferService.rows - 1), end: Math.min(h3, this._bufferService.rows - 1) });\n    }\n    print(e, i5, r) {\n      let s4, o2, a2 = this._charsetService.charset, l4 = this._optionsService.rawOptions.screenReaderMode, h3 = this._bufferService.cols, d3 = this._coreService.decPrivateModes.wraparound, c2 = this._coreService.modes.insertMode, u3 = this._curAttrData, _5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      if (!_5) return;\n      this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._activeBuffer.x && r - i5 > 0 && _5.getWidth(this._activeBuffer.x - 1) === 2 && _5.setCellFromCodepoint(this._activeBuffer.x - 1, 0, 1, u3);\n      let p3 = this._parser.precedingJoinState;\n      for (let b4 = i5; b4 < r; ++b4) {\n        if (s4 = e[b4], s4 === 173) continue;\n        if (s4 < 127 && a2) {\n          let w6 = a2[String.fromCharCode(s4)];\n          w6 && (s4 = w6.charCodeAt(0));\n        }\n        let f5 = this._unicodeService.charProperties(s4, p3);\n        o2 = be3.extractWidth(f5);\n        let S4 = be3.extractShouldJoin(f5), I4 = S4 ? be3.extractWidth(p3) : 0;\n        if (p3 = f5, l4 && this._onA11yChar.fire(ve2(s4)), this._getCurrentLinkId() && this._oscLinkService.addLineToLink(this._getCurrentLinkId(), this._activeBuffer.ybase + this._activeBuffer.y), this._activeBuffer.x + o2 - I4 > h3) {\n          if (d3) {\n            let w6 = _5, x5 = this._activeBuffer.x - I4;\n            if (this._activeBuffer.x = I4, this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData(), true)) : (this._activeBuffer.y >= this._bufferService.rows && (this._activeBuffer.y = this._bufferService.rows - 1), this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = true), _5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y), !_5) return;\n            for (I4 > 0 && _5 instanceof Re4 && _5.copyCellsFrom(w6, x5, 0, I4, false); x5 < h3; ) w6.setCellFromCodepoint(x5++, 0, 1, u3);\n          } else if (this._activeBuffer.x = h3 - 1, o2 === 2) continue;\n        }\n        if (S4 && this._activeBuffer.x) {\n          let w6 = _5.getWidth(this._activeBuffer.x - 1) ? 1 : 2;\n          _5.addCodepointToCell(this._activeBuffer.x - w6, s4, o2);\n          for (let x5 = o2 - I4; --x5 >= 0; ) _5.setCellFromCodepoint(this._activeBuffer.x++, 0, 0, u3);\n          continue;\n        }\n        if (c2 && (_5.insertCells(this._activeBuffer.x, o2 - I4, this._activeBuffer.getNullCell(u3)), _5.getWidth(h3 - 1) === 2 && _5.setCellFromCodepoint(h3 - 1, 0, 1, u3)), _5.setCellFromCodepoint(this._activeBuffer.x++, s4, o2, u3), o2 > 0) for (; --o2; ) _5.setCellFromCodepoint(this._activeBuffer.x++, 0, 0, u3);\n      }\n      this._parser.precedingJoinState = p3, this._activeBuffer.x < h3 && r - i5 > 0 && _5.getWidth(this._activeBuffer.x) === 0 && !_5.hasContent(this._activeBuffer.x) && _5.setCellFromCodepoint(this._activeBuffer.x, 0, 1, u3), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    registerCsiHandler(e, i5) {\n      return e.final === "t" && !e.prefix && !e.intermediates ? this._parser.registerCsiHandler(e, (r) => On(r.params[0], this._optionsService.rawOptions.windowOptions) ? i5(r) : true) : this._parser.registerCsiHandler(e, i5);\n    }\n    registerDcsHandler(e, i5) {\n      return this._parser.registerDcsHandler(e, new di(i5));\n    }\n    registerEscHandler(e, i5) {\n      return this._parser.registerEscHandler(e, i5);\n    }\n    registerOscHandler(e, i5) {\n      return this._parser.registerOscHandler(e, new re2(i5));\n    }\n    registerApcHandler(e, i5) {\n      return this._parser.registerApcHandler(e, new br(i5));\n    }\n    bell() {\n      return this._onRequestBell.fire(), true;\n    }\n    lineFeed() {\n      return this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._optionsService.rawOptions.convertEol && (this._activeBuffer.x = 0), this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData())) : this._activeBuffer.y >= this._bufferService.rows ? this._activeBuffer.y = this._bufferService.rows - 1 : this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = false, this._activeBuffer.x >= this._bufferService.cols && this._activeBuffer.x--, this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._onLineFeed.fire(), true;\n    }\n    carriageReturn() {\n      return this._activeBuffer.x = 0, true;\n    }\n    backspace() {\n      if (!this._coreService.decPrivateModes.reverseWraparound) return this._restrictCursor(), this._activeBuffer.x > 0 && this._activeBuffer.x--, true;\n      if (this._restrictCursor(this._bufferService.cols), this._activeBuffer.x > 0) this._activeBuffer.x--;\n      else if (this._activeBuffer.x === 0 && this._activeBuffer.y > this._activeBuffer.scrollTop && this._activeBuffer.y <= this._activeBuffer.scrollBottom && this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y)?.isWrapped) {\n        this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = false, this._activeBuffer.y--, this._activeBuffer.x = this._bufferService.cols - 1;\n        let e = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n        e.hasWidth(this._activeBuffer.x) && !e.hasContent(this._activeBuffer.x) && this._activeBuffer.x--;\n      }\n      return this._restrictCursor(), true;\n    }\n    tab() {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let e = this._activeBuffer.x;\n      return this._activeBuffer.x = this._activeBuffer.nextStop(), this._optionsService.rawOptions.screenReaderMode && this._onA11yTab.fire(this._activeBuffer.x - e), true;\n    }\n    shiftOut() {\n      return this._charsetService.setgLevel(1), true;\n    }\n    shiftIn() {\n      return this._charsetService.setgLevel(0), true;\n    }\n    _restrictCursor(e = this._bufferService.cols - 1) {\n      this._activeBuffer.x = Math.min(e, Math.max(0, this._activeBuffer.x)), this._activeBuffer.y = this._coreService.decPrivateModes.origin ? Math.min(this._activeBuffer.scrollBottom, Math.max(this._activeBuffer.scrollTop, this._activeBuffer.y)) : Math.min(this._bufferService.rows - 1, Math.max(0, this._activeBuffer.y)), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    _setCursor(e, i5) {\n      this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._coreService.decPrivateModes.origin ? (this._activeBuffer.x = e, this._activeBuffer.y = this._activeBuffer.scrollTop + i5) : (this._activeBuffer.x = e, this._activeBuffer.y = i5), this._restrictCursor(), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    _moveCursor(e, i5) {\n      this._restrictCursor(), this._setCursor(this._activeBuffer.x + e, this._activeBuffer.y + i5);\n    }\n    cursorUp(e) {\n      let i5 = this._activeBuffer.y - this._activeBuffer.scrollTop;\n      return i5 >= 0 ? this._moveCursor(0, -Math.min(i5, e.params[0] || 1)) : this._moveCursor(0, -(e.params[0] || 1)), true;\n    }\n    cursorDown(e) {\n      let i5 = this._activeBuffer.scrollBottom - this._activeBuffer.y;\n      return i5 >= 0 ? this._moveCursor(0, Math.min(i5, e.params[0] || 1)) : this._moveCursor(0, e.params[0] || 1), true;\n    }\n    cursorForward(e) {\n      return this._moveCursor(e.params[0] || 1, 0), true;\n    }\n    cursorBackward(e) {\n      return this._moveCursor(-(e.params[0] || 1), 0), true;\n    }\n    cursorNextLine(e) {\n      return this.cursorDown(e), this._activeBuffer.x = 0, true;\n    }\n    cursorPrecedingLine(e) {\n      return this.cursorUp(e), this._activeBuffer.x = 0, true;\n    }\n    cursorCharAbsolute(e) {\n      return this._setCursor((e.params[0] || 1) - 1, this._activeBuffer.y), true;\n    }\n    cursorPosition(e) {\n      return this._setCursor(e.length >= 2 ? (e.params[1] || 1) - 1 : 0, (e.params[0] || 1) - 1), true;\n    }\n    charPosAbsolute(e) {\n      return this._setCursor((e.params[0] || 1) - 1, this._activeBuffer.y), true;\n    }\n    hPositionRelative(e) {\n      return this._moveCursor(e.params[0] || 1, 0), true;\n    }\n    linePosAbsolute(e) {\n      return this._setCursor(this._activeBuffer.x, (e.params[0] || 1) - 1), true;\n    }\n    vPositionRelative(e) {\n      return this._moveCursor(0, e.params[0] || 1), true;\n    }\n    hVPosition(e) {\n      return this.cursorPosition(e), true;\n    }\n    tabClear(e) {\n      let i5 = e.params[0];\n      return i5 === 0 ? delete this._activeBuffer.tabs[this._activeBuffer.x] : i5 === 3 && (this._activeBuffer.tabs = {}), true;\n    }\n    cursorForwardTab(e) {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.x = this._activeBuffer.nextStop();\n      return true;\n    }\n    cursorBackwardTab(e) {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.x = this._activeBuffer.prevStop();\n      return true;\n    }\n    selectProtected(e) {\n      let i5 = e.params[0];\n      return i5 === 1 && (this._curAttrData.bg |= 536870912), (i5 === 2 || i5 === 0) && (this._curAttrData.bg &= -536870913), true;\n    }\n    _eraseInBufferLine(e, i5, r, s4 = false, o2 = false) {\n      let a2 = this._activeBuffer.lines.get(this._activeBuffer.ybase + e);\n      a2 && (a2.replaceCells(i5, r, this._activeBuffer.getNullCell(this._eraseAttrData()), o2), s4 && (a2.isWrapped = false));\n    }\n    _resetBufferLine(e, i5 = false) {\n      let r = this._activeBuffer.lines.get(this._activeBuffer.ybase + e);\n      r && (r.fill(this._activeBuffer.getNullCell(this._eraseAttrData()), i5), this._bufferService.buffer.clearMarkers(this._activeBuffer.ybase + e), r.isWrapped = false);\n    }\n    eraseInDisplay(e, i5 = false) {\n      this._restrictCursor(this._bufferService.cols);\n      let r;\n      switch (e.params[0]) {\n        case 0:\n          for (r = this._activeBuffer.y, this._dirtyRowTracker.markDirty(r), this._eraseInBufferLine(r++, this._activeBuffer.x, this._bufferService.cols, this._activeBuffer.x === 0, i5); r < this._bufferService.rows; r++) this._resetBufferLine(r, i5);\n          this._dirtyRowTracker.markDirty(r);\n          break;\n        case 1:\n          if (r = this._activeBuffer.y, this._dirtyRowTracker.markDirty(r), this._eraseInBufferLine(r, 0, this._activeBuffer.x + 1, true, i5), this._activeBuffer.x + 1 >= this._bufferService.cols) {\n            let o2 = this._activeBuffer.lines.get(r + 1);\n            o2 && (o2.isWrapped = false);\n          }\n          for (; r--; ) this._resetBufferLine(r, i5);\n          this._dirtyRowTracker.markDirty(0);\n          break;\n        case 2:\n          if (this._optionsService.rawOptions.scrollOnEraseInDisplay) {\n            for (r = this._bufferService.rows, this._dirtyRowTracker.markRangeDirty(0, r - 1); r-- && !this._activeBuffer.lines.get(this._activeBuffer.ybase + r)?.getTrimmedLength(); ) ;\n            for (; r >= 0; r--) this._bufferService.scroll(this._eraseAttrData());\n          } else {\n            for (r = this._bufferService.rows, this._dirtyRowTracker.markDirty(r - 1); r--; ) this._resetBufferLine(r, i5);\n            this._dirtyRowTracker.markDirty(0);\n          }\n          break;\n        case 3:\n          let s4 = this._activeBuffer.lines.length - this._bufferService.rows;\n          s4 > 0 && (this._activeBuffer.lines.trimStart(s4), this._activeBuffer.ybase = Math.max(this._activeBuffer.ybase - s4, 0), this._activeBuffer.ydisp = Math.max(this._activeBuffer.ydisp - s4, 0), this._onScroll.fire(0));\n          break;\n      }\n      return true;\n    }\n    eraseInLine(e, i5 = false) {\n      switch (this._restrictCursor(this._bufferService.cols), e.params[0]) {\n        case 0:\n          this._eraseInBufferLine(this._activeBuffer.y, this._activeBuffer.x, this._bufferService.cols, this._activeBuffer.x === 0, i5);\n          break;\n        case 1:\n          this._eraseInBufferLine(this._activeBuffer.y, 0, this._activeBuffer.x + 1, false, i5);\n          break;\n        case 2:\n          this._eraseInBufferLine(this._activeBuffer.y, 0, this._bufferService.cols, true, i5);\n          break;\n      }\n      return this._dirtyRowTracker.markDirty(this._activeBuffer.y), true;\n    }\n    insertLines(e) {\n      this._restrictCursor();\n      let i5 = e.params[0] || 1;\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let r = this._activeBuffer.ybase + this._activeBuffer.y, s4 = this._bufferService.rows - 1 - this._activeBuffer.scrollBottom, o2 = this._bufferService.rows - 1 + this._activeBuffer.ybase - s4 + 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(o2 - 1, 1), this._activeBuffer.lines.splice(r, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y, this._activeBuffer.scrollBottom), this._activeBuffer.x = 0, true;\n    }\n    deleteLines(e) {\n      this._restrictCursor();\n      let i5 = e.params[0] || 1;\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let r = this._activeBuffer.ybase + this._activeBuffer.y, s4;\n      for (s4 = this._bufferService.rows - 1 - this._activeBuffer.scrollBottom, s4 = this._bufferService.rows - 1 + this._activeBuffer.ybase - s4; i5--; ) this._activeBuffer.lines.splice(r, 1), this._activeBuffer.lines.splice(s4, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y, this._activeBuffer.scrollBottom), this._activeBuffer.x = 0, true;\n    }\n    insertChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.insertCells(this._activeBuffer.x, e.params[0] || 1, this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    deleteChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.deleteCells(this._activeBuffer.x, e.params[0] || 1, this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    scrollUp(e) {\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollTop, 1), this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollBottom, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollDown(e) {\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollBottom, 1), this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollTop, 0, this._activeBuffer.getBlankLine(U5));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollLeft(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.deleteCells(0, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollRight(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.insertCells(0, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    insertColumns(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.insertCells(this._activeBuffer.x, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    deleteColumns(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.deleteCells(this._activeBuffer.x, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    eraseChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.replaceCells(this._activeBuffer.x, this._activeBuffer.x + (e.params[0] || 1), this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    repeatPrecedingCharacter(e) {\n      let i5 = this._parser.precedingJoinState;\n      if (!i5) return true;\n      let r = e.params[0] || 1, s4 = be3.extractWidth(i5), o2 = this._activeBuffer.x - s4, l4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).getString(o2), h3 = new Uint32Array(l4.length * r), d3 = 0;\n      for (let u3 = 0; u3 < l4.length; ) {\n        let _5 = l4.codePointAt(u3) || 0;\n        h3[d3++] = _5, u3 += _5 > 65535 ? 2 : 1;\n      }\n      let c2 = d3;\n      for (let u3 = 1; u3 < r; ++u3) h3.copyWithin(c2, 0, d3), c2 += d3;\n      return this.print(h3, 0, c2), true;\n    }\n    sendDeviceAttributesPrimary(e) {\n      return e.params[0] > 0 || (this._is("xterm") || this._is("rxvt-unicode") || this._is("screen") ? this._coreService.triggerDataEvent("\\x1B[?1;2c") : this._is("linux") && this._coreService.triggerDataEvent("\\x1B[?6c")), true;\n    }\n    sendDeviceAttributesSecondary(e) {\n      return e.params[0] > 0 || (this._is("xterm") ? this._coreService.triggerDataEvent("\\x1B[>0;276;0c") : this._is("rxvt-unicode") ? this._coreService.triggerDataEvent("\\x1B[>85;95;0c") : this._is("linux") ? this._coreService.triggerDataEvent(e.params[0] + "c") : this._is("screen") && this._coreService.triggerDataEvent("\\x1B[>83;40003;0c")), true;\n    }\n    sendXtVersion(e) {\n      return e.params[0] > 0 || this._coreService.triggerDataEvent(`\\x1BP>|xterm.js(${Mn})\\x1B\\\\`), true;\n    }\n    _is(e) {\n      return (this._optionsService.rawOptions.termName + "").startsWith(e);\n    }\n    setMode(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 4:\n          this._coreService.modes.insertMode = true;\n          break;\n        case 20:\n          this._optionsService.options.convertEol = true;\n          break;\n      }\n      return true;\n    }\n    setModePrivate(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 1:\n          this._coreService.decPrivateModes.applicationCursorKeys = true;\n          break;\n        case 2:\n          this._charsetService.setgCharset(0, Le2), this._charsetService.setgCharset(1, Le2), this._charsetService.setgCharset(2, Le2), this._charsetService.setgCharset(3, Le2);\n          break;\n        case 3:\n          this._optionsService.rawOptions.windowOptions.setWinLines && (this._bufferService.resize(132, this._bufferService.rows), this._onRequestReset.fire());\n          break;\n        case 6:\n          this._coreService.decPrivateModes.origin = true, this._setCursor(0, 0);\n          break;\n        case 7:\n          this._coreService.decPrivateModes.wraparound = true;\n          break;\n        case 12:\n          this._optionsService.rawOptions.quirks?.allowSetCursorBlink && (this._optionsService.options.cursorBlink = true);\n          break;\n        case 45:\n          this._coreService.decPrivateModes.reverseWraparound = true;\n          break;\n        case 66:\n          this._logService.debug("Serial port requested application keypad."), this._coreService.decPrivateModes.applicationKeypad = true, this._onRequestSyncScrollBar.fire();\n          break;\n        case 9:\n          this._mouseStateService.activeProtocol = "X10";\n          break;\n        case 1e3:\n          this._mouseStateService.activeProtocol = "VT200";\n          break;\n        case 1002:\n          this._mouseStateService.activeProtocol = "DRAG";\n          break;\n        case 1003:\n          this._mouseStateService.activeProtocol = "ANY";\n          break;\n        case 1004:\n          this._coreService.decPrivateModes.sendFocus = true, this._onRequestSendFocus.fire();\n          break;\n        case 1005:\n          this._logService.debug("DECSET 1005 not supported (see #2507)");\n          break;\n        case 1006:\n          this._mouseStateService.activeEncoding = "SGR";\n          break;\n        case 1015:\n          this._logService.debug("DECSET 1015 not supported (see #2507)");\n          break;\n        case 1016:\n          this._mouseStateService.activeEncoding = "SGR_PIXELS";\n          break;\n        case 25:\n          this._coreService.isCursorHidden = false;\n          break;\n        case 1048:\n          this.saveCursor();\n          break;\n        case 1049:\n          this.saveCursor();\n        case 47:\n        case 1047:\n          if (this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) {\n            let r = this._coreService.kittyKeyboard;\n            r.mainFlags = r.flags, r.flags = r.altFlags;\n          }\n          this._bufferService.buffers.activateAltBuffer(this._eraseAttrData()), this._coreService.isCursorInitialized = true, this._onRequestRefreshRows.fire(void 0), this._onRequestSyncScrollBar.fire();\n          break;\n        case 2004:\n          this._coreService.decPrivateModes.bracketedPasteMode = true;\n          break;\n        case 2026:\n          this._coreService.decPrivateModes.synchronizedOutput = true;\n          break;\n        case 2031:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && (this._coreService.decPrivateModes.colorSchemeUpdates = true);\n          break;\n        case 9001:\n          this._optionsService.rawOptions.vtExtensions?.win32InputMode && (this._coreService.decPrivateModes.win32InputMode = true);\n          break;\n      }\n      return true;\n    }\n    resetMode(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 4:\n          this._coreService.modes.insertMode = false;\n          break;\n        case 20:\n          this._optionsService.options.convertEol = false;\n          break;\n      }\n      return true;\n    }\n    resetModePrivate(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 1:\n          this._coreService.decPrivateModes.applicationCursorKeys = false;\n          break;\n        case 3:\n          this._optionsService.rawOptions.windowOptions.setWinLines && (this._bufferService.resize(80, this._bufferService.rows), this._onRequestReset.fire());\n          break;\n        case 6:\n          this._coreService.decPrivateModes.origin = false, this._setCursor(0, 0);\n          break;\n        case 7:\n          this._coreService.decPrivateModes.wraparound = false;\n          break;\n        case 12:\n          this._optionsService.rawOptions.quirks?.allowSetCursorBlink && (this._optionsService.options.cursorBlink = false);\n          break;\n        case 45:\n          this._coreService.decPrivateModes.reverseWraparound = false;\n          break;\n        case 66:\n          this._logService.debug("Switching back to normal keypad."), this._coreService.decPrivateModes.applicationKeypad = false, this._onRequestSyncScrollBar.fire();\n          break;\n        case 9:\n        case 1e3:\n        case 1002:\n        case 1003:\n          this._mouseStateService.activeProtocol = "NONE";\n          break;\n        case 1004:\n          this._coreService.decPrivateModes.sendFocus = false;\n          break;\n        case 1005:\n          this._logService.debug("DECRST 1005 not supported (see #2507)");\n          break;\n        case 1006:\n          this._mouseStateService.activeEncoding = "DEFAULT";\n          break;\n        case 1015:\n          this._logService.debug("DECRST 1015 not supported (see #2507)");\n          break;\n        case 1016:\n          this._mouseStateService.activeEncoding = "DEFAULT";\n          break;\n        case 25:\n          this._coreService.isCursorHidden = true;\n          break;\n        case 1048:\n          this.restoreCursor();\n          break;\n        case 1049:\n        case 47:\n        case 1047:\n          if (this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) {\n            let r = this._coreService.kittyKeyboard;\n            r.altFlags = r.flags, r.flags = r.mainFlags;\n          }\n          this._bufferService.buffers.activateNormalBuffer(), e.params[i5] === 1049 && this.restoreCursor(), this._coreService.isCursorInitialized = true, this._onRequestRefreshRows.fire(void 0), this._onRequestSyncScrollBar.fire();\n          break;\n        case 2004:\n          this._coreService.decPrivateModes.bracketedPasteMode = false;\n          break;\n        case 2026:\n          this._coreService.decPrivateModes.synchronizedOutput = false, this._onRequestRefreshRows.fire(void 0);\n          break;\n        case 2031:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && (this._coreService.decPrivateModes.colorSchemeUpdates = false);\n          break;\n        case 9001:\n          this._optionsService.rawOptions.vtExtensions?.win32InputMode && (this._coreService.decPrivateModes.win32InputMode = false);\n          break;\n      }\n      return true;\n    }\n    requestMode(e, i5) {\n      let r;\n      ((ce4) => (ce4[ce4.NOT_RECOGNIZED = 0] = "NOT_RECOGNIZED", ce4[ce4.SET = 1] = "SET", ce4[ce4.RESET = 2] = "RESET", ce4[ce4.PERMANENTLY_SET = 3] = "PERMANENTLY_SET", ce4[ce4.PERMANENTLY_RESET = 4] = "PERMANENTLY_RESET"))(r ||= {});\n      let s4 = this._coreService.decPrivateModes, { activeProtocol: o2, activeEncoding: a2 } = this._mouseStateService, l4 = this._coreService, { buffers: h3, cols: d3 } = this._bufferService, { active: c2, alt: u3 } = h3, _5 = this._optionsService.rawOptions, p3 = (S4, I4) => (l4.triggerDataEvent(`\\x1B[${i5 ? "" : "?"}${S4};${I4}$y`), true), b4 = (S4) => S4 ? 1 : 2, f5 = e.params[0];\n      return i5 ? f5 === 2 ? p3(f5, 4) : f5 === 4 ? p3(f5, b4(l4.modes.insertMode)) : f5 === 12 ? p3(f5, 3) : f5 === 20 ? p3(f5, b4(_5.convertEol)) : p3(f5, 0) : f5 === 1 ? p3(f5, b4(s4.applicationCursorKeys)) : f5 === 3 ? p3(f5, _5.windowOptions.setWinLines ? d3 === 80 ? 2 : d3 === 132 ? 1 : 0 : 0) : f5 === 6 ? p3(f5, b4(s4.origin)) : f5 === 7 ? p3(f5, b4(s4.wraparound)) : f5 === 8 ? p3(f5, 3) : f5 === 9 ? p3(f5, b4(o2 === "X10")) : f5 === 12 ? p3(f5, b4(_5.cursorBlink)) : f5 === 25 ? p3(f5, b4(!l4.isCursorHidden)) : f5 === 45 ? p3(f5, b4(s4.reverseWraparound)) : f5 === 66 ? p3(f5, b4(s4.applicationKeypad)) : f5 === 67 ? p3(f5, 4) : f5 === 1e3 ? p3(f5, b4(o2 === "VT200")) : f5 === 1002 ? p3(f5, b4(o2 === "DRAG")) : f5 === 1003 ? p3(f5, b4(o2 === "ANY")) : f5 === 1004 ? p3(f5, b4(s4.sendFocus)) : f5 === 1005 ? p3(f5, 4) : f5 === 1006 ? p3(f5, b4(a2 === "SGR")) : f5 === 1015 ? p3(f5, 4) : f5 === 1016 ? p3(f5, b4(a2 === "SGR_PIXELS")) : f5 === 1048 ? p3(f5, 1) : f5 === 47 || f5 === 1047 || f5 === 1049 ? p3(f5, b4(c2 === u3)) : f5 === 2004 ? p3(f5, b4(s4.bracketedPasteMode)) : f5 === 2026 ? p3(f5, b4(s4.synchronizedOutput)) : f5 === 9001 && this._optionsService.rawOptions.vtExtensions?.win32InputMode ? p3(f5, b4(s4.win32InputMode)) : p3(f5, 0);\n    }\n    _updateAttrColor(e, i5, r, s4, o2) {\n      return i5 === 2 ? (e |= 50331648, e &= -16777216, e |= fe2.fromColorRGB([r, s4, o2])) : i5 === 5 && (e &= -67108864, e |= 33554432 | r & 255), e;\n    }\n    _extractColor(e, i5, r) {\n      let s4 = [0, 0, -1, 0, 0, 0], o2 = 0, a2 = 0;\n      do {\n        if (s4[a2 + o2] = e.params[i5 + a2], e.hasSubParams(i5 + a2)) {\n          let l4 = e.getSubParams(i5 + a2), h3 = 0;\n          do\n            s4[1] === 5 && (o2 = 1), s4[a2 + h3 + 1 + o2] = l4[h3];\n          while (++h3 < l4.length && h3 + a2 + 1 + o2 < s4.length);\n          break;\n        }\n        if (s4[1] === 5 && a2 + o2 >= 2 || s4[1] === 2 && a2 + o2 >= 5) break;\n        s4[1] && (o2 = 1);\n      } while (++a2 + i5 < e.length && a2 + o2 < s4.length);\n      for (let l4 = 2; l4 < s4.length; ++l4) s4[l4] === -1 && (s4[l4] = 0);\n      switch (s4[0]) {\n        case 38:\n          r.fg = this._updateAttrColor(r.fg, s4[1], s4[3], s4[4], s4[5]);\n          break;\n        case 48:\n          r.bg = this._updateAttrColor(r.bg, s4[1], s4[3], s4[4], s4[5]);\n          break;\n        case 58:\n          r.extended = r.extended.clone(), r.extended.underlineColor = this._updateAttrColor(r.extended.underlineColor, s4[1], s4[3], s4[4], s4[5]);\n      }\n      return a2;\n    }\n    _processUnderline(e, i5) {\n      i5.extended = i5.extended.clone(), (!~e || e > 5) && (e = 1), i5.extended.underlineStyle = e, i5.fg |= 268435456, e === 0 && (i5.fg &= -268435457), i5.updateExtended();\n    }\n    _processSGR0(e) {\n      e.fg = U5.fg, e.bg = U5.bg, e.extended = e.extended.clone(), e.extended.underlineStyle = 0, e.extended.underlineColor &= -67108864, e.updateExtended();\n    }\n    charAttributes(e) {\n      if (e.length === 1 && e.params[0] === 0) return this._processSGR0(this._curAttrData), true;\n      let i5 = e.length, r, s4 = this._curAttrData;\n      for (let o2 = 0; o2 < i5; o2++) r = e.params[o2], r >= 30 && r <= 37 ? (s4.fg &= -67108864, s4.fg |= 16777216 | r - 30) : r >= 40 && r <= 47 ? (s4.bg &= -67108864, s4.bg |= 16777216 | r - 40) : r >= 90 && r <= 97 ? (s4.fg &= -67108864, s4.fg |= 16777216 | r - 90 | 8) : r >= 100 && r <= 107 ? (s4.bg &= -67108864, s4.bg |= 16777216 | r - 100 | 8) : r === 0 ? this._processSGR0(s4) : r === 1 ? s4.fg |= 134217728 : r === 3 ? s4.bg |= 67108864 : r === 4 ? (s4.fg |= 268435456, this._processUnderline(e.hasSubParams(o2) ? e.getSubParams(o2)[0] : 1, s4)) : r === 5 ? s4.fg |= 536870912 : r === 7 ? s4.fg |= 67108864 : r === 8 ? s4.fg |= 1073741824 : r === 9 ? s4.fg |= 2147483648 : r === 2 ? s4.bg |= 134217728 : r === 21 ? this._processUnderline(2, s4) : r === 22 ? (s4.fg &= -134217729, s4.bg &= -134217729) : r === 23 ? s4.bg &= -67108865 : r === 24 ? (s4.fg &= -268435457, this._processUnderline(0, s4)) : r === 25 ? s4.fg &= -536870913 : r === 27 ? s4.fg &= -67108865 : r === 28 ? s4.fg &= -1073741825 : r === 29 ? s4.fg &= 2147483647 : r === 39 ? (s4.fg &= -67108864, s4.fg |= U5.fg & 16777215) : r === 49 ? (s4.bg &= -67108864, s4.bg |= U5.bg & 16777215) : r === 38 || r === 48 || r === 58 ? o2 += this._extractColor(e, o2, s4) : r === 53 ? s4.bg |= 1073741824 : r === 55 ? s4.bg &= -1073741825 : r === 221 && (this._optionsService.rawOptions.vtExtensions?.kittySgrBoldFaintControl ?? true) ? s4.fg &= -134217729 : r === 222 && (this._optionsService.rawOptions.vtExtensions?.kittySgrBoldFaintControl ?? true) ? s4.bg &= -134217729 : r === 59 ? (s4.extended = s4.extended.clone(), s4.extended.underlineColor = -1, s4.updateExtended()) : this._logService.debug("Unknown SGR attribute: %d.", r);\n      return true;\n    }\n    deviceStatus(e) {\n      switch (e.params[0]) {\n        case 5:\n          this._coreService.triggerDataEvent("\\x1B[0n");\n          break;\n        case 6:\n          let i5 = this._activeBuffer.y + 1, r = this._activeBuffer.x + 1;\n          this._coreService.triggerDataEvent(`\\x1B[${i5};${r}R`);\n          break;\n      }\n      return true;\n    }\n    deviceStatusPrivate(e) {\n      switch (e.params[0]) {\n        case 6:\n          let i5 = this._activeBuffer.y + 1, r = this._activeBuffer.x + 1;\n          this._coreService.triggerDataEvent(`\\x1B[?${i5};${r}R`);\n          break;\n        case 15:\n          break;\n        case 25:\n          break;\n        case 26:\n          break;\n        case 53:\n          break;\n        case 996:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && this._onRequestColorSchemeQuery.fire();\n          break;\n      }\n      return true;\n    }\n    softReset(e) {\n      return this._coreService.isCursorHidden = false, this._onRequestSyncScrollBar.fire(), this._activeBuffer.scrollTop = 0, this._activeBuffer.scrollBottom = this._bufferService.rows - 1, this._curAttrData = U5.clone(), this._coreService.reset(), this._charsetService.reset(), this._activeBuffer.savedX = 0, this._activeBuffer.savedY = this._activeBuffer.ybase, this._activeBuffer.savedCurAttrData.fg = this._curAttrData.fg, this._activeBuffer.savedCurAttrData.bg = this._curAttrData.bg, this._activeBuffer.savedCharset = this._charsetService.charset, this._coreService.decPrivateModes.origin = false, true;\n    }\n    setCursorStyle(e) {\n      let i5 = e.length === 0 ? 1 : e.params[0];\n      if (i5 === 0) this._coreService.decPrivateModes.cursorStyle = void 0, this._coreService.decPrivateModes.cursorBlink = void 0;\n      else {\n        switch (i5) {\n          case 1:\n          case 2:\n            this._coreService.decPrivateModes.cursorStyle = "block";\n            break;\n          case 3:\n          case 4:\n            this._coreService.decPrivateModes.cursorStyle = "underline";\n            break;\n          case 5:\n          case 6:\n            this._coreService.decPrivateModes.cursorStyle = "bar";\n            break;\n        }\n        let r = i5 % 2 === 1;\n        this._coreService.decPrivateModes.cursorBlink = r;\n      }\n      return true;\n    }\n    setScrollRegion(e) {\n      let i5 = e.params[0] || 1, r;\n      return (e.length < 2 || (r = e.params[1]) > this._bufferService.rows || r === 0) && (r = this._bufferService.rows), r > i5 && (this._activeBuffer.scrollTop = i5 - 1, this._activeBuffer.scrollBottom = r - 1, this._setCursor(0, 0)), true;\n    }\n    windowOptions(e) {\n      if (!On(e.params[0], this._optionsService.rawOptions.windowOptions)) return true;\n      let i5 = e.length > 1 ? e.params[1] : 0;\n      switch (e.params[0]) {\n        case 14:\n          i5 !== 2 && this._onRequestWindowsOptionsReport.fire(0);\n          break;\n        case 16:\n          this._onRequestWindowsOptionsReport.fire(1);\n          break;\n        case 18:\n          this._bufferService && this._coreService.triggerDataEvent(`\\x1B[8;${this._bufferService.rows};${this._bufferService.cols}t`);\n          break;\n        case 22:\n          (i5 === 0 || i5 === 2) && (this._windowTitleStack.push(this._windowTitle), this._windowTitleStack.length > Bn && this._windowTitleStack.shift()), (i5 === 0 || i5 === 1) && (this._iconNameStack.push(this._iconName), this._iconNameStack.length > Bn && this._iconNameStack.shift());\n          break;\n        case 23:\n          (i5 === 0 || i5 === 2) && this._windowTitleStack.length && this.setTitle(this._windowTitleStack.pop()), (i5 === 0 || i5 === 1) && this._iconNameStack.length && this.setIconName(this._iconNameStack.pop());\n          break;\n      }\n      return true;\n    }\n    saveCursor(e) {\n      return this._activeBuffer.savedX = this._activeBuffer.x, this._activeBuffer.savedY = this._activeBuffer.ybase + this._activeBuffer.y, this._activeBuffer.savedCurAttrData.fg = this._curAttrData.fg, this._activeBuffer.savedCurAttrData.bg = this._curAttrData.bg, this._activeBuffer.savedCharset = this._charsetService.charset, this._activeBuffer.savedCharsets = this._charsetService.charsets.slice(), this._activeBuffer.savedGlevel = this._charsetService.glevel, this._activeBuffer.savedOriginMode = this._coreService.decPrivateModes.origin, this._activeBuffer.savedWraparoundMode = this._coreService.decPrivateModes.wraparound, true;\n    }\n    restoreCursor(e) {\n      this._activeBuffer.x = this._activeBuffer.savedX || 0, this._activeBuffer.y = Math.max(this._activeBuffer.savedY - this._activeBuffer.ybase, 0), this._curAttrData.fg = this._activeBuffer.savedCurAttrData.fg, this._curAttrData.bg = this._activeBuffer.savedCurAttrData.bg;\n      for (let i5 = 0; i5 < this._activeBuffer.savedCharsets.length; i5++) this._charsetService.setgCharset(i5, this._activeBuffer.savedCharsets[i5]);\n      return this._charsetService.setgLevel(this._activeBuffer.savedGlevel), this._coreService.decPrivateModes.origin = this._activeBuffer.savedOriginMode, this._coreService.decPrivateModes.wraparound = this._activeBuffer.savedWraparoundMode, this._restrictCursor(), true;\n    }\n    setTitle(e) {\n      return this._windowTitle = e, this._onTitleChange.fire(e), true;\n    }\n    setIconName(e) {\n      return this._iconName = e, true;\n    }\n    setOrReportIndexedColor(e) {\n      let i5 = [], r = e.split(";");\n      for (; r.length > 1; ) {\n        let s4 = r.shift(), o2 = r.shift();\n        if (/^\\d+$/.exec(s4)) {\n          let a2 = parseInt(s4);\n          if (Hn(a2)) if (o2 === "?") i5.push({ type: 0, index: a2 });\n          else {\n            let l4 = As(o2);\n            l4 && i5.push({ type: 1, index: a2, color: l4 });\n          }\n        }\n      }\n      return i5.length && this._onColor.fire(i5), true;\n    }\n    setHyperlink(e) {\n      let i5 = e.indexOf(";");\n      if (i5 === -1) return true;\n      let r = e.slice(0, i5).trim(), s4 = e.slice(i5 + 1);\n      return s4 ? this._createHyperlink(r, s4) : r.trim() ? false : this._finishHyperlink();\n    }\n    _createHyperlink(e, i5) {\n      this._getCurrentLinkId() && this._finishHyperlink();\n      let r = e.split(":"), s4, o2 = r.findIndex((a2) => a2.startsWith("id="));\n      return o2 !== -1 && (s4 = r[o2].slice(3) || void 0), this._curAttrData.extended = this._curAttrData.extended.clone(), this._curAttrData.extended.urlId = this._oscLinkService.registerLink({ id: s4, uri: i5 }), this._curAttrData.updateExtended(), true;\n    }\n    _finishHyperlink() {\n      return this._curAttrData.extended = this._curAttrData.extended.clone(), this._curAttrData.extended.urlId = 0, this._curAttrData.updateExtended(), true;\n    }\n    _setOrReportSpecialColor(e, i5) {\n      let r = e.split(";");\n      for (let s4 = 0; s4 < r.length && !(i5 >= this._specialColors.length); ++s4, ++i5) if (r[s4] === "?") this._onColor.fire([{ type: 0, index: this._specialColors[i5] }]);\n      else {\n        let o2 = As(r[s4]);\n        o2 && this._onColor.fire([{ type: 1, index: this._specialColors[i5], color: o2 }]);\n      }\n      return true;\n    }\n    setOrReportFgColor(e) {\n      return this._setOrReportSpecialColor(e, 0);\n    }\n    setOrReportBgColor(e) {\n      return this._setOrReportSpecialColor(e, 1);\n    }\n    setOrReportCursorColor(e) {\n      return this._setOrReportSpecialColor(e, 2);\n    }\n    restoreIndexedColor(e) {\n      if (!e) return this._onColor.fire([{ type: 2 }]), true;\n      let i5 = [], r = e.split(";");\n      for (let s4 = 0; s4 < r.length; ++s4) if (/^\\d+$/.exec(r[s4])) {\n        let o2 = parseInt(r[s4]);\n        Hn(o2) && i5.push({ type: 2, index: o2 });\n      }\n      return i5.length && this._onColor.fire(i5), true;\n    }\n    restoreFgColor(e) {\n      return this._onColor.fire([{ type: 2, index: 256 }]), true;\n    }\n    restoreBgColor(e) {\n      return this._onColor.fire([{ type: 2, index: 257 }]), true;\n    }\n    restoreCursorColor(e) {\n      return this._onColor.fire([{ type: 2, index: 258 }]), true;\n    }\n    nextLine() {\n      return this._activeBuffer.x = 0, this.index(), true;\n    }\n    keypadApplicationMode() {\n      return this._logService.debug("Serial port requested application keypad."), this._coreService.decPrivateModes.applicationKeypad = true, this._onRequestSyncScrollBar.fire(), true;\n    }\n    keypadNumericMode() {\n      return this._logService.debug("Switching back to normal keypad."), this._coreService.decPrivateModes.applicationKeypad = false, this._onRequestSyncScrollBar.fire(), true;\n    }\n    selectDefaultCharset() {\n      return this._charsetService.setgLevel(0), this._charsetService.setgCharset(0, Le2), true;\n    }\n    selectCharset(e) {\n      return e.length !== 2 ? (this.selectDefaultCharset(), true) : (e[0] === "/" || this._charsetService.setgCharset(Go2[e[0]], V4[e[1]] ?? Le2), true);\n    }\n    index() {\n      return this._restrictCursor(), this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData())) : this._activeBuffer.y >= this._bufferService.rows && (this._activeBuffer.y = this._bufferService.rows - 1), this._restrictCursor(), true;\n    }\n    tabSet() {\n      return this._activeBuffer.tabs[this._activeBuffer.x] = true, true;\n    }\n    reverseIndex() {\n      if (this._restrictCursor(), this._activeBuffer.y === this._activeBuffer.scrollTop) {\n        let e = this._activeBuffer.scrollBottom - this._activeBuffer.scrollTop;\n        this._activeBuffer.lines.shiftElements(this._activeBuffer.ybase + this._activeBuffer.y, e, 1), this._activeBuffer.lines.set(this._activeBuffer.ybase + this._activeBuffer.y, this._activeBuffer.getBlankLine(this._eraseAttrData())), this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);\n      } else this._activeBuffer.y--, this._restrictCursor();\n      return true;\n    }\n    fullReset() {\n      return this._parser.reset(), this._onRequestReset.fire(), true;\n    }\n    reset() {\n      this._curAttrData = U5.clone(), this._eraseAttrDataInternal = U5.clone();\n    }\n    _eraseAttrData() {\n      return this._eraseAttrDataInternal.bg &= -67108864, this._eraseAttrDataInternal.bg |= this._curAttrData.bg & 67108863, this._eraseAttrDataInternal;\n    }\n    setgLevel(e) {\n      return this._charsetService.setgLevel(e), true;\n    }\n    screenAlignmentPattern() {\n      let e = new N2();\n      e.content = 1 << 22 | 69, e.fg = this._curAttrData.fg, e.bg = this._curAttrData.bg, this._setCursor(0, 0);\n      for (let i5 = 0; i5 < this._bufferService.rows; ++i5) {\n        let r = this._activeBuffer.ybase + this._activeBuffer.y + i5, s4 = this._activeBuffer.lines.get(r);\n        s4 && (s4.fill(e), s4.isWrapped = false);\n      }\n      return this._dirtyRowTracker.markAllDirty(), this._setCursor(0, 0), true;\n    }\n    requestStatusString(e, i5) {\n      let r = (l4) => (this._coreService.triggerDataEvent(`\\x1B${l4}\\x1B\\\\`), true), s4 = this._bufferService.buffer, o2 = this._optionsService.rawOptions, a2 = { block: 2, underline: 4, bar: 6 };\n      return r(e === \'"q\' ? `P1$r${this._curAttrData.isProtected() ? 1 : 0}"q` : e === \'"p\' ? \'P1$r61;1"p\' : e === "r" ? `P1$r${s4.scrollTop + 1};${s4.scrollBottom + 1}r` : e === "m" ? "P1$r0m" : e === " q" ? `P1$r${a2[o2.cursorStyle] - (o2.cursorBlink ? 1 : 0)} q` : "P0$r");\n    }\n    markRangeDirty(e, i5) {\n      this._dirtyRowTracker.markRangeDirty(e, i5);\n    }\n    kittyKeyboardSet(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = e.params[0] || 0, r = e.length > 1 && e.params[1] || 1, s4 = this._coreService.kittyKeyboard;\n      switch (r) {\n        case 1:\n          s4.flags = i5;\n          break;\n        case 2:\n          s4.flags |= i5;\n          break;\n        case 3:\n          s4.flags &= ~i5;\n          break;\n      }\n      return true;\n    }\n    kittyKeyboardQuery(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = this._coreService.kittyKeyboard.flags;\n      return this._coreService.triggerDataEvent(`\\x1B[?${i5}u`), true;\n    }\n    kittyKeyboardPush(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = e.params[0] || 0, r = this._coreService.kittyKeyboard, o2 = this._bufferService.buffer === this._bufferService.buffers.alt ? r.altStack : r.mainStack;\n      return o2.length >= 16 && o2.shift(), o2.push(r.flags), r.flags = i5, true;\n    }\n    kittyKeyboardPop(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = Math.max(1, e.params[0] || 1), r = this._coreService.kittyKeyboard, o2 = this._bufferService.buffer === this._bufferService.buffers.alt ? r.altStack : r.mainStack;\n      for (let a2 = 0; a2 < i5 && o2.length > 0; a2++) r.flags = o2.pop();\n      return o2.length === 0 && i5 > 0 && (r.flags = 0), true;\n    }\n  };\n  var fi = class {\n    constructor(t) {\n      this._bufferService = t;\n      this.clearRange();\n    }\n    clearRange() {\n      this.start = this._bufferService.buffer.y, this.end = this._bufferService.buffer.y;\n    }\n    markDirty(t) {\n      t < this.start ? this.start = t : t > this.end && (this.end = t);\n    }\n    markRangeDirty(t, e) {\n      t > e && (Fn = t, t = e, e = Fn), t < this.start && (this.start = t), e > this.end && (this.end = e);\n    }\n    markAllDirty() {\n      this.markRangeDirty(0, this._bufferService.rows - 1);\n    }\n  };\n  fi = E4([m3(0, L5)], fi);\n  function Hn(n11) {\n    return 0 <= n11 && n11 < 256;\n  }\n  var $o2 = 5e7;\n  var Wn2 = 12;\n  var Vo2 = 50;\n  var Ir2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._action = e;\n      this._writeBuffer = [];\n      this._callbacks = [];\n      this._pendingData = 0;\n      this._bufferOffset = 0;\n      this._isSyncWriting = false;\n      this._syncCalls = 0;\n      this._didUserInput = false;\n      this._onWriteParsed = this._register(new v5());\n      this.onWriteParsed = this._onWriteParsed.event;\n    }\n    handleUserInput() {\n      this._didUserInput = true;\n    }\n    flushSync() {\n      if (this._isSyncWriting) return;\n      this._isSyncWriting = true;\n      let e;\n      for (; e = this._writeBuffer.shift(); ) {\n        this._action(e);\n        let i5 = this._callbacks.shift();\n        i5 && i5();\n      }\n      this._pendingData = 0, this._bufferOffset = 2147483647, this._writeBuffer.length = 0, this._callbacks.length = 0, this._isSyncWriting = false;\n    }\n    writeSync(e, i5) {\n      if (i5 !== void 0 && this._syncCalls > i5) {\n        this._syncCalls = 0;\n        return;\n      }\n      if (this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(void 0), this._syncCalls++, this._isSyncWriting) return;\n      this._isSyncWriting = true;\n      let r;\n      for (; r = this._writeBuffer.shift(); ) {\n        this._action(r);\n        let s4 = this._callbacks.shift();\n        s4 && s4();\n      }\n      this._pendingData = 0, this._bufferOffset = 2147483647, this._isSyncWriting = false, this._syncCalls = 0;\n    }\n    write(e, i5) {\n      if (this._pendingData > $o2) throw new Error("write data discarded, use flow control to avoid losing data");\n      if (!this._writeBuffer.length) {\n        if (this._bufferOffset = 0, this._didUserInput) {\n          this._didUserInput = false, this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(i5), this._innerWrite();\n          return;\n        }\n        setTimeout(() => this._innerWrite());\n      }\n      this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(i5);\n    }\n    _innerWrite(e = 0, i5 = true) {\n      let r = e || performance.now();\n      for (; this._writeBuffer.length > this._bufferOffset; ) {\n        let s4 = this._writeBuffer[this._bufferOffset], o2 = this._action(s4, i5);\n        if (o2) {\n          let l4 = (h3) => performance.now() - r >= Wn2 ? setTimeout(() => this._innerWrite(0, h3)) : this._innerWrite(r, h3);\n          o2.catch((h3) => (queueMicrotask(() => {\n            throw h3;\n          }), Promise.resolve(false))).then(l4);\n          return;\n        }\n        let a2 = this._callbacks[this._bufferOffset];\n        if (a2 && a2(), this._bufferOffset++, this._pendingData -= s4.length, performance.now() - r >= Wn2) break;\n      }\n      this._writeBuffer.length > this._bufferOffset ? (this._bufferOffset > Vo2 && (this._writeBuffer = this._writeBuffer.slice(this._bufferOffset), this._callbacks = this._callbacks.slice(this._bufferOffset), this._bufferOffset = 0), setTimeout(() => this._innerWrite())) : (this._writeBuffer.length = 0, this._callbacks.length = 0, this._pendingData = 0, this._bufferOffset = 0), this._onWriteParsed.fire();\n    }\n  };\n  var Bt = class {\n    constructor(t) {\n      this._bufferService = t;\n      this._nextId = 1;\n      this._entriesWithId = /* @__PURE__ */ new Map();\n      this._dataByLinkId = /* @__PURE__ */ new Map();\n    }\n    registerLink(t) {\n      let e = this._bufferService.buffer;\n      if (t.id === void 0) {\n        let l4 = e.addMarker(e.ybase + e.y), h3 = { data: t, id: this._nextId++, lines: [l4] };\n        return l4.onDispose(() => this._removeMarkerFromLink(h3, l4)), this._dataByLinkId.set(h3.id, h3), h3.id;\n      }\n      let i5 = t, r = this._getEntryIdKey(i5), s4 = this._entriesWithId.get(r);\n      if (s4) return this.addLineToLink(s4.id, e.ybase + e.y), s4.id;\n      let o2 = e.addMarker(e.ybase + e.y), a2 = { id: this._nextId++, key: this._getEntryIdKey(i5), data: i5, lines: [o2] };\n      return o2.onDispose(() => this._removeMarkerFromLink(a2, o2)), this._entriesWithId.set(a2.key, a2), this._dataByLinkId.set(a2.id, a2), a2.id;\n    }\n    addLineToLink(t, e) {\n      let i5 = this._dataByLinkId.get(t);\n      if (i5 && i5.lines.every((r) => r.line !== e)) {\n        let r = this._bufferService.buffer.addMarker(e);\n        i5.lines.push(r), r.onDispose(() => this._removeMarkerFromLink(i5, r));\n      }\n    }\n    getLinkData(t) {\n      return this._dataByLinkId.get(t)?.data;\n    }\n    _getEntryIdKey(t) {\n      return `${t.id};;${t.uri}`;\n    }\n    _removeMarkerFromLink(t, e) {\n      let i5 = t.lines.indexOf(e);\n      i5 !== -1 && (t.lines.splice(i5, 1), t.lines.length === 0 && (t.data.id !== void 0 && this._entriesWithId.delete(t.key), this._dataByLinkId.delete(t.id)));\n    }\n  };\n  Bt = E4([m3(0, L5)], Bt);\n  var Un = false;\n  var Cr2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._windowsWrappingHeuristics = this._register(new me3());\n      this._onBinary = this._register(new v5());\n      this.onBinary = this._onBinary.event;\n      this._onData = this._register(new v5());\n      this.onData = this._onData.event;\n      this._onLineFeed = this._register(new v5());\n      this.onLineFeed = this._onLineFeed.event;\n      this._onRender = this._register(new v5());\n      this.onRender = this._onRender.event;\n      this._onResize = this._register(new v5());\n      this.onResize = this._onResize.event;\n      this._onWriteParsed = this._register(new v5());\n      this.onWriteParsed = this._onWriteParsed.event;\n      this._onScroll = this._register(new v5());\n      this._instantiationService = new rr(), this.optionsService = this._register(new lr2(e)), this._instantiationService.setService(R3, this.optionsService), this._logService = this._register(this._instantiationService.createInstance(Dt2)), this._instantiationService.setService(pe, this._logService), this._bufferService = this._register(this._instantiationService.createInstance(Lt2)), this._instantiationService.setService(L5, this._bufferService), this.coreService = this._register(this._instantiationService.createInstance(Pt)), this._instantiationService.setService(Y, this.coreService), this.mouseStateService = this._register(this._instantiationService.createInstance(cr)), this._instantiationService.setService(et2, this.mouseStateService), this.unicodeService = this._register(this._instantiationService.createInstance(be3)), this._instantiationService.setService(js, this.unicodeService), this._charsetService = this._instantiationService.createInstance(dr), this._instantiationService.setService(Xs, this._charsetService), this._oscLinkService = this._instantiationService.createInstance(Bt), this._instantiationService.setService(Ii, this._oscLinkService), this._inputHandler = this._register(new gr(this._bufferService, this._charsetService, this.coreService, this._logService, this.optionsService, this._oscLinkService, this.mouseStateService, this.unicodeService)), this._register(X2.forward(this._inputHandler.onLineFeed, this._onLineFeed)), this._register(X2.forward(this._bufferService.onResize, this._onResize)), this._register(X2.forward(this.coreService.onData, this._onData)), this._register(X2.forward(this.coreService.onBinary, this._onBinary)), this._register(this.coreService.onRequestScrollToBottom(() => this.scrollToBottom(true))), this._register(this.coreService.onUserInput(() => this._writeBuffer.handleUserInput())), this._register(this.optionsService.onMultipleOptionChange(["windowsPty"], () => this._handleWindowsPtyOptionChange())), this._register(this._bufferService.onScroll(() => {\n        this._onScroll.fire({ position: this._bufferService.buffer.ydisp }), this._inputHandler.markRangeDirty(this._bufferService.buffer.scrollTop, this._bufferService.buffer.scrollBottom);\n      })), this._writeBuffer = this._register(new Ir2((i5, r) => this._inputHandler.parse(i5, r))), this._register(X2.forward(this._writeBuffer.onWriteParsed, this._onWriteParsed));\n    }\n    get onScroll() {\n      return this._onScrollApi || (this._onScrollApi = this._register(new v5()), this._onScroll.event((e) => {\n        this._onScrollApi?.fire(e.position);\n      })), this._onScrollApi.event;\n    }\n    get cols() {\n      return this._bufferService.cols;\n    }\n    get rows() {\n      return this._bufferService.rows;\n    }\n    get buffers() {\n      return this._bufferService.buffers;\n    }\n    get options() {\n      return this.optionsService.options;\n    }\n    set options(e) {\n      for (let i5 in e) this.optionsService.options[i5] = e[i5];\n    }\n    write(e, i5) {\n      this._writeBuffer.write(e, i5);\n    }\n    writeSync(e, i5) {\n      this._logService.logLevel <= 3 && !Un && (this._logService.warn("writeSync is unreliable and will be removed soon."), Un = true), this._writeBuffer.writeSync(e, i5);\n    }\n    input(e, i5 = true) {\n      this.coreService.triggerDataEvent(e, i5);\n    }\n    resize(e, i5) {\n      isNaN(e) || isNaN(i5) || (e = Math.max(e, Es), i5 = Math.max(i5, ys), this._writeBuffer.flushSync(), this._bufferService.resize(e, i5));\n    }\n    scroll(e, i5 = false) {\n      this._bufferService.scroll(e, i5);\n    }\n    scrollLines(e, i5) {\n      this._bufferService.scrollLines(e, i5);\n    }\n    scrollPages(e) {\n      this.scrollLines(e * (this.rows - 1));\n    }\n    scrollToTop() {\n      this.scrollLines(-this._bufferService.buffer.ydisp);\n    }\n    scrollToBottom(e) {\n      this.scrollLines(this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n    }\n    scrollToLine(e) {\n      let i5 = e - this._bufferService.buffer.ydisp;\n      i5 !== 0 && this.scrollLines(i5);\n    }\n    registerEscHandler(e, i5) {\n      return this._inputHandler.registerEscHandler(e, i5);\n    }\n    registerDcsHandler(e, i5) {\n      return this._inputHandler.registerDcsHandler(e, i5);\n    }\n    registerCsiHandler(e, i5) {\n      return this._inputHandler.registerCsiHandler(e, i5);\n    }\n    registerOscHandler(e, i5) {\n      return this._inputHandler.registerOscHandler(e, i5);\n    }\n    registerApcHandler(e, i5) {\n      return this._inputHandler.registerApcHandler(e, i5);\n    }\n    _setup() {\n      this._handleWindowsPtyOptionChange();\n    }\n    reset() {\n      this._inputHandler.reset(), this._bufferService.reset(), this._charsetService.reset(), this.coreService.reset(), this.mouseStateService.reset();\n    }\n    _handleWindowsPtyOptionChange() {\n      let e = false, i5 = this.optionsService.rawOptions.windowsPty;\n      i5 && i5.buildNumber !== void 0 && i5.buildNumber !== void 0 && (e = i5.backend === "conpty" && i5.buildNumber < 21376), e ? this._enableWindowsWrappingHeuristics() : this._windowsWrappingHeuristics.clear();\n    }\n    _enableWindowsWrappingHeuristics() {\n      if (!this._windowsWrappingHeuristics.value) {\n        let e = [];\n        e.push(this.onLineFeed(Ds.bind(null, this._bufferService))), e.push(this.registerCsiHandler({ final: "H" }, () => (Ds(this._bufferService), false))), this._windowsWrappingHeuristics.value = y4(() => {\n          for (let i5 of e) i5.dispose();\n        });\n      }\n    }\n  };\n  var K3 = 0;\n  var Er = class {\n    constructor(t, e) {\n      this._getKey = t;\n      this._array = [];\n      this._insertedValues = [];\n      this._isFlushingInserted = false;\n      this._deletedIndices = [];\n      this._isFlushingDeleted = false;\n      this._flushInsertedTask = new Et2(e), this._flushDeletedTask = new Et2(e);\n    }\n    clear() {\n      this._array.length = 0, this._insertedValues.length = 0, this._flushInsertedTask.clear(), this._isFlushingInserted = false, this._deletedIndices.length = 0, this._flushDeletedTask.clear(), this._isFlushingDeleted = false;\n    }\n    insert(t) {\n      this._flushCleanupDeleted(), this._insertedValues.length === 0 && this._flushInsertedTask.enqueue(() => this._flushInserted()), this._insertedValues.push(t);\n    }\n    _flushInserted() {\n      let t = this._insertedValues.sort((s4, o2) => this._getKey(s4) - this._getKey(o2)), e = 0, i5 = 0, r = new Array(this._array.length + this._insertedValues.length);\n      for (let s4 = 0; s4 < r.length; s4++) i5 >= this._array.length || this._getKey(t[e]) <= this._getKey(this._array[i5]) ? (r[s4] = t[e], e++) : r[s4] = this._array[i5++];\n      this._array = r, this._insertedValues.length = 0;\n    }\n    _flushCleanupInserted() {\n      !this._isFlushingInserted && this._insertedValues.length > 0 && this._flushInsertedTask.flush();\n    }\n    delete(t) {\n      if (this._flushCleanupInserted(), this._array.length === 0) return false;\n      let e = this._getKey(t);\n      if (e === void 0 || (K3 = this._search(e), K3 === -1) || this._getKey(this._array[K3]) !== e) return false;\n      do\n        if (this._array[K3] === t) return this._deletedIndices.length === 0 && this._flushDeletedTask.enqueue(() => this._flushDeleted()), this._deletedIndices.push(K3), true;\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === e);\n      return false;\n    }\n    _flushDeleted() {\n      this._isFlushingDeleted = true;\n      let t = this._deletedIndices.sort((s4, o2) => s4 - o2), e = 0, i5 = new Array(this._array.length - t.length), r = 0;\n      for (let s4 = 0; s4 < this._array.length; s4++) t[e] === s4 ? e++ : i5[r++] = this._array[s4];\n      this._array = i5, this._deletedIndices.length = 0, this._isFlushingDeleted = false;\n    }\n    _flushCleanupDeleted() {\n      !this._isFlushingDeleted && this._deletedIndices.length > 0 && this._flushDeletedTask.flush();\n    }\n    *getKeyIterator(t) {\n      if (this._flushCleanupInserted(), this._flushCleanupDeleted(), this._array.length !== 0 && (K3 = this._search(t), !(K3 < 0 || K3 >= this._array.length) && this._getKey(this._array[K3]) === t)) do\n        yield this._array[K3];\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === t);\n    }\n    forEachByKey(t, e) {\n      if (this._flushCleanupInserted(), this._flushCleanupDeleted(), this._array.length !== 0 && (K3 = this._search(t), !(K3 < 0 || K3 >= this._array.length) && this._getKey(this._array[K3]) === t)) do\n        e(this._array[K3]);\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === t);\n    }\n    values() {\n      return this._flushCleanupInserted(), this._flushCleanupDeleted(), [...this._array].values();\n    }\n    _search(t) {\n      let e = 0, i5 = this._array.length - 1;\n      for (; i5 >= e; ) {\n        let r = e + i5 >> 1, s4 = this._getKey(this._array[r]);\n        if (s4 > t) i5 = r - 1;\n        else if (s4 < t) e = r + 1;\n        else {\n          for (; r > 0 && this._getKey(this._array[r - 1]) === t; ) r--;\n          return r;\n        }\n      }\n      return e;\n    }\n  };\n  var ks = 0;\n  var Kn = 0;\n  var Ps = 0;\n  var zn = 0;\n  var Ot = class extends g5 {\n    constructor(e) {\n      super();\n      this._logService = e;\n      this._onDecorationRegistered = this._register(new v5());\n      this.onDecorationRegistered = this._onDecorationRegistered.event;\n      this._onDecorationRemoved = this._register(new v5());\n      this.onDecorationRemoved = this._onDecorationRemoved.event;\n      this._decorations = new Er((i5) => i5?.marker.line, this._logService), this._register(y4(() => this.reset()));\n    }\n    get decorations() {\n      return this._decorations.values();\n    }\n    registerDecoration(e) {\n      if (e.marker.isDisposed) return;\n      let i5 = new Ms(e);\n      if (i5) {\n        let r = i5.marker.onDispose(() => i5.dispose()), s4 = i5.onDispose(() => {\n          s4.dispose(), i5 && (this._decorations.delete(i5) && this._onDecorationRemoved.fire(i5), r.dispose());\n        });\n        this._decorations.insert(i5), this._onDecorationRegistered.fire(i5);\n      }\n      return i5;\n    }\n    reset() {\n      for (let e of this._decorations.values()) e.dispose();\n      this._decorations.clear();\n    }\n    *getDecorationsAtCell(e, i5, r) {\n      let s4 = 0, o2 = 0, a2 = 0, l4 = 0;\n      for (let h3 of this._decorations.values()) a2 = h3.marker.line, l4 = a2 + (h3.options.height ?? 1), !(i5 < a2 || i5 >= l4) && (s4 = h3.options.x ?? 0, o2 = s4 + (h3.options.width ?? 1), e >= s4 && e < o2 && (!r || (h3.options.layer ?? "bottom") === r) && (yield h3));\n    }\n    forEachDecorationAtCell(e, i5, r, s4) {\n      for (let o2 of this._decorations.values()) Ps = o2.marker.line, zn = Ps + (o2.options.height ?? 1), !(i5 < Ps || i5 >= zn) && (ks = o2.options.x ?? 0, Kn = ks + (o2.options.width ?? 1), e >= ks && e < Kn && (!r || (o2.options.layer ?? "bottom") === r) && s4(o2));\n    }\n  };\n  Ot = E4([m3(0, pe)], Ot);\n  var Ms = class extends we2 {\n    constructor(e) {\n      super();\n      this.options = e;\n      this.onRenderEmitter = this.add(new v5());\n      this.onRender = this.onRenderEmitter.event;\n      this._onDispose = this.add(new v5());\n      this.onDispose = this._onDispose.event;\n      this._cachedBg = null;\n      this._cachedFg = null;\n      this.marker = e.marker, this.options.overviewRulerOptions && !this.options.overviewRulerOptions.position && (this.options.overviewRulerOptions.position = "full");\n    }\n    get backgroundColorRGB() {\n      return this._cachedBg === null && (this.options.backgroundColor ? this._cachedBg = M3.toColor(this.options.backgroundColor) : this._cachedBg = void 0), this._cachedBg;\n    }\n    get foregroundColorRGB() {\n      return this._cachedFg === null && (this.options.foregroundColor ? this._cachedFg = M3.toColor(this.options.foregroundColor) : this._cachedFg = void 0), this._cachedFg;\n    }\n    dispose() {\n      this._onDispose.fire(), super.dispose();\n    }\n  };\n  var qo2 = 1e3;\n  var yr = class {\n    constructor(t, e = qo2) {\n      this._renderCallback = t;\n      this._debounceThresholdMS = e;\n      this._lastRefreshMs = 0;\n      this._additionalRefreshRequested = false;\n    }\n    dispose() {\n      this._refreshTimeoutID && clearTimeout(this._refreshTimeoutID);\n    }\n    refresh(t, e, i5) {\n      this._rowCount = i5, t = t ?? 0, e = e ?? this._rowCount - 1, this._rowStart = this._rowStart !== void 0 ? Math.min(this._rowStart, t) : t, this._rowEnd = this._rowEnd !== void 0 ? Math.max(this._rowEnd, e) : e;\n      let r = performance.now();\n      if (r - this._lastRefreshMs >= this._debounceThresholdMS) this._lastRefreshMs = r, this._innerRefresh();\n      else if (!this._additionalRefreshRequested) {\n        let s4 = r - this._lastRefreshMs, o2 = this._debounceThresholdMS - s4;\n        this._additionalRefreshRequested = true, this._refreshTimeoutID = window.setTimeout(() => {\n          this._lastRefreshMs = performance.now(), this._innerRefresh(), this._additionalRefreshRequested = false, this._refreshTimeoutID = void 0;\n        }, o2);\n      }\n    }\n    _innerRefresh() {\n      if (this._rowStart === void 0 || this._rowEnd === void 0 || this._rowCount === void 0) return;\n      let t = Math.max(this._rowStart, 0), e = Math.min(this._rowEnd, this._rowCount - 1);\n      this._rowStart = void 0, this._rowEnd = void 0, this._renderCallback(t, e);\n    }\n  };\n  var Gn = 20;\n  var $n = false;\n  var je3 = class extends g5 {\n    constructor(e, i5, r, s4) {\n      super();\n      this._terminal = e;\n      this._coreBrowserService = r;\n      this._renderService = s4;\n      this._rowColumns = /* @__PURE__ */ new WeakMap();\n      this._liveRegionLineCount = 0;\n      this._charsToConsume = [];\n      this._charsToAnnounce = "";\n      let o2 = this._coreBrowserService.mainDocument;\n      this._accessibilityContainer = o2.createElement("div"), this._accessibilityContainer.classList.add("xterm-accessibility"), this._rowContainer = o2.createElement("div"), this._rowContainer.setAttribute("role", "list"), this._rowContainer.classList.add("xterm-accessibility-tree"), this._rowElements = [];\n      for (let a2 = 0; a2 < this._terminal.rows; a2++) this._rowElements[a2] = this._createAccessibilityTreeNode(), this._rowContainer.appendChild(this._rowElements[a2]);\n      if (this._topBoundaryFocusListener = (a2) => this._handleBoundaryFocus(a2, 0), this._bottomBoundaryFocusListener = (a2) => this._handleBoundaryFocus(a2, 1), this._rowElements[0].addEventListener("focus", this._topBoundaryFocusListener), this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._accessibilityContainer.appendChild(this._rowContainer), this._liveRegion = o2.createElement("div"), this._liveRegion.classList.add("live-region"), this._liveRegion.setAttribute("aria-live", "assertive"), this._accessibilityContainer.appendChild(this._liveRegion), this._liveRegionDebouncer = this._register(new yr(this._renderRows.bind(this))), !this._terminal.element) throw new Error("Cannot enable accessibility before Terminal.open");\n      $n ? (this._accessibilityContainer.classList.add("debug"), this._rowContainer.classList.add("debug"), this._debugRootContainer = o2.createElement("div"), this._debugRootContainer.classList.add("xterm"), this._debugRootContainer.appendChild(o2.createTextNode("------start a11y------")), this._debugRootContainer.appendChild(this._accessibilityContainer), this._debugRootContainer.appendChild(o2.createTextNode("------end a11y------")), this._terminal.element.insertAdjacentElement("afterend", this._debugRootContainer)) : this._terminal.element.insertAdjacentElement("afterbegin", this._accessibilityContainer), this._register(this._terminal.onResize((a2) => this._handleResize(a2.rows))), this._register(this._terminal.onRender((a2) => this._refreshRows(a2.start, a2.end))), this._register(this._terminal.onScroll(() => this._refreshRows())), this._register(this._terminal.onA11yChar((a2) => this._handleChar(a2))), this._register(this._terminal.onLineFeed(() => this._handleChar(`\n`))), this._register(this._terminal.onA11yTab((a2) => this._handleTab(a2))), this._register(this._terminal.onKey((a2) => this._handleKey(a2.key))), this._register(this._terminal.onBlur(() => this._clearLiveRegion())), this._register(this._renderService.onDimensionsChange(() => this._refreshRowsDimensions())), this._register(C3(o2, "selectionchange", () => this._handleSelectionChange())), this._register(this._coreBrowserService.onDprChange(() => this._refreshRowsDimensions())), this._refreshRowsDimensions(), this._refreshRows(), this._register(y4(() => {\n        $n ? this._debugRootContainer.remove() : this._accessibilityContainer.remove(), this._rowElements.length = 0;\n      }));\n    }\n    _handleTab(e) {\n      for (let i5 = 0; i5 < e; i5++) this._handleChar(" ");\n    }\n    _handleChar(e) {\n      this._liveRegionLineCount < Gn + 1 && (this._charsToConsume.length > 0 ? this._charsToConsume.shift() !== e && (this._charsToAnnounce += e) : this._charsToAnnounce += e, e === `\n` && (this._liveRegionLineCount++, this._liveRegionLineCount === Gn + 1 && (this._liveRegion.textContent = Je3.get())));\n    }\n    _clearLiveRegion() {\n      this._liveRegion.textContent = "", this._liveRegionLineCount = 0;\n    }\n    _handleKey(e) {\n      this._clearLiveRegion(), new RegExp("\\\\p{Control}", "u").test(e) || this._charsToConsume.push(e);\n    }\n    _refreshRows(e, i5) {\n      this._liveRegionDebouncer.refresh(e, i5, this._terminal.rows);\n    }\n    _renderRows(e, i5) {\n      let r = this._terminal.buffer, s4 = r.lines.length.toString();\n      for (let o2 = e; o2 <= i5; o2++) {\n        let a2 = r.lines.get(r.ydisp + o2), l4 = [], h3 = a2?.translateToString(true, void 0, void 0, l4) || "", d3 = (r.ydisp + o2 + 1).toString(), c2 = this._rowElements[o2];\n        c2 && (h3.length === 0 ? (c2.textContent = "\\xA0", this._rowColumns.set(c2, [0, 1])) : (c2.textContent = h3, this._rowColumns.set(c2, l4)), c2.setAttribute("aria-posinset", d3), c2.setAttribute("aria-setsize", s4), this._alignRowWidth(c2));\n      }\n      this._announceCharacters();\n    }\n    _announceCharacters() {\n      this._charsToAnnounce.length !== 0 && (this._liveRegion.textContent === Je3.get() && this._clearLiveRegion(), this._liveRegion.textContent += this._charsToAnnounce, this._charsToAnnounce = "");\n    }\n    _handleBoundaryFocus(e, i5) {\n      let r = e.target, s4 = this._rowElements[i5 === 0 ? 1 : this._rowElements.length - 2], o2 = r.getAttribute("aria-posinset"), a2 = i5 === 0 ? "1" : `${this._terminal.buffer.lines.length}`;\n      if (o2 === a2 || e.relatedTarget !== s4) return;\n      let l4, h3;\n      if (i5 === 0 ? (l4 = r, h3 = this._rowElements.pop(), this._rowContainer.removeChild(h3)) : (l4 = this._rowElements.shift(), h3 = r, this._rowContainer.removeChild(l4)), l4.removeEventListener("focus", this._topBoundaryFocusListener), h3.removeEventListener("focus", this._bottomBoundaryFocusListener), i5 === 0) {\n        let d3 = this._createAccessibilityTreeNode();\n        this._rowElements.unshift(d3), this._rowContainer.insertAdjacentElement("afterbegin", d3);\n      } else {\n        let d3 = this._createAccessibilityTreeNode();\n        this._rowElements.push(d3), this._rowContainer.appendChild(d3);\n      }\n      this._rowElements[0].addEventListener("focus", this._topBoundaryFocusListener), this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._terminal.scrollLines(i5 === 0 ? -1 : 1), this._rowElements[i5 === 0 ? 1 : this._rowElements.length - 2].focus(), e.preventDefault(), e.stopImmediatePropagation();\n    }\n    _handleSelectionChange() {\n      if (this._rowElements.length === 0) return;\n      let e = this._coreBrowserService.mainDocument.getSelection();\n      if (!e) return;\n      if (e.isCollapsed) {\n        this._rowContainer.contains(e.anchorNode) && this._terminal.clearSelection();\n        return;\n      }\n      if (!e.anchorNode || !e.focusNode) {\n        console.error("anchorNode and/or focusNode are null");\n        return;\n      }\n      let i5 = { node: e.anchorNode, offset: e.anchorOffset }, r = { node: e.focusNode, offset: e.focusOffset };\n      if ((i5.node.compareDocumentPosition(r.node) & Node.DOCUMENT_POSITION_PRECEDING || i5.node === r.node && i5.offset > r.offset) && ([i5, r] = [r, i5]), i5.node.compareDocumentPosition(this._rowElements[0]) & (Node.DOCUMENT_POSITION_CONTAINED_BY | Node.DOCUMENT_POSITION_FOLLOWING) && (i5 = { node: this._rowElements[0].childNodes[0], offset: 0 }), !this._rowContainer.contains(i5.node)) return;\n      let s4 = this._rowElements.slice(-1)[0];\n      if (r.node.compareDocumentPosition(s4) & (Node.DOCUMENT_POSITION_CONTAINED_BY | Node.DOCUMENT_POSITION_PRECEDING) && (r = { node: s4, offset: s4.textContent?.length ?? 0 }), !this._rowContainer.contains(r.node)) return;\n      let o2 = ({ node: h3, offset: d3 }) => {\n        let c2 = h3 instanceof Text ? h3.parentNode : h3, u3 = parseInt(c2?.getAttribute("aria-posinset"), 10) - 1;\n        if (isNaN(u3)) return console.warn("row is invalid. Race condition?"), null;\n        let _5 = this._rowColumns.get(c2);\n        if (!_5) return console.warn("columns is null. Race condition?"), null;\n        let p3 = d3 < _5.length ? _5[d3] : _5.slice(-1)[0] + 1;\n        return p3 >= this._terminal.cols && (++u3, p3 = 0), { row: u3, column: p3 };\n      }, a2 = o2(i5), l4 = o2(r);\n      if (!(!a2 || !l4)) {\n        if (a2.row > l4.row || a2.row === l4.row && a2.column >= l4.column) throw new Error("invalid range");\n        this._terminal.select(a2.column, a2.row, (l4.row - a2.row) * this._terminal.cols - a2.column + l4.column);\n      }\n    }\n    _handleResize(e) {\n      this._rowElements[this._rowElements.length - 1].removeEventListener("focus", this._bottomBoundaryFocusListener);\n      for (let i5 = this._rowContainer.children.length; i5 < this._terminal.rows; i5++) this._rowElements[i5] = this._createAccessibilityTreeNode(), this._rowContainer.appendChild(this._rowElements[i5]);\n      for (; this._rowElements.length > e; ) this._rowContainer.removeChild(this._rowElements.pop());\n      this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._refreshRowsDimensions();\n    }\n    _createAccessibilityTreeNode() {\n      let e = this._coreBrowserService.mainDocument.createElement("div");\n      return e.setAttribute("role", "listitem"), e.tabIndex = -1, this._refreshRowDimensions(e), e;\n    }\n    _refreshRowsDimensions() {\n      if (this._renderService.dimensions.css.cell.height) {\n        Object.assign(this._accessibilityContainer.style, { width: `${this._renderService.dimensions.css.canvas.width}px`, fontSize: `${this._terminal.options.fontSize}px` }), this._rowElements.length !== this._terminal.rows && this._handleResize(this._terminal.rows);\n        for (let e = 0; e < this._terminal.rows; e++) this._refreshRowDimensions(this._rowElements[e]), this._alignRowWidth(this._rowElements[e]);\n      }\n    }\n    _refreshRowDimensions(e) {\n      e.style.height = `${this._renderService.dimensions.css.cell.height}px`;\n    }\n    _alignRowWidth(e) {\n      e.style.transform = "";\n      let i5 = e.getBoundingClientRect().width, r = this._rowColumns.get(e)?.slice(-1)?.[0];\n      if (!r) return;\n      let s4 = r * this._renderService.dimensions.css.cell.width;\n      e.style.transform = `scaleX(${s4 / i5})`;\n    }\n  };\n  je3 = E4([m3(1, tt3), m3(2, z3), m3(3, G4)], je3);\n  var Nt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2) {\n      super();\n      this._element = e;\n      this._mouseCoordsService = i5;\n      this._renderService = r;\n      this._bufferService = s4;\n      this._linkProviderService = o2;\n      this._linkCacheDisposables = [];\n      this._isMouseOut = true;\n      this._wasResized = false;\n      this._activeLine = -1;\n      this._onShowLinkUnderline = this._register(new v5());\n      this.onShowLinkUnderline = this._onShowLinkUnderline.event;\n      this._onHideLinkUnderline = this._register(new v5());\n      this.onHideLinkUnderline = this._onHideLinkUnderline.event;\n      this._register(y4(() => {\n        Oe2(this._linkCacheDisposables), this._linkCacheDisposables.length = 0, this._lastMouseEvent = void 0, this._activeProviderReplies?.clear();\n      })), this._register(this._bufferService.onResize(() => {\n        this._clearCurrentLink(), this._wasResized = true;\n      })), this._register(C3(this._element, "mouseleave", () => {\n        this._isMouseOut = true, this._clearCurrentLink();\n      })), this._register(C3(this._element, "mousemove", this._handleMouseMove.bind(this))), this._register(C3(this._element, "mousedown", this._handleMouseDown.bind(this))), this._register(C3(this._element, "mouseup", this._handleMouseUp.bind(this)));\n    }\n    get currentLink() {\n      return this._currentLink;\n    }\n    _handleMouseMove(e) {\n      this._lastMouseEvent = e;\n      let i5 = this._positionFromMouseEvent(e, this._element);\n      if (!i5) return;\n      this._isMouseOut = false;\n      let r = e.composedPath();\n      for (let s4 = 0; s4 < r.length; s4++) {\n        let o2 = r[s4];\n        if (o2.classList.contains("xterm")) break;\n        if (o2.classList.contains("xterm-hover")) return;\n      }\n      (!this._lastBufferCell || i5.x !== this._lastBufferCell.x || i5.y !== this._lastBufferCell.y) && (this._handleHover(i5), this._lastBufferCell = i5);\n    }\n    _handleHover(e) {\n      if (this._activeLine !== e.y || this._wasResized) {\n        this._clearCurrentLink(), this._askForLink(e, false), this._wasResized = false;\n        return;\n      }\n      this._currentLink && this._linkAtPosition(this._currentLink.link, e) || (this._clearCurrentLink(), this._askForLink(e, true));\n    }\n    _askForLink(e, i5) {\n      (!this._activeProviderReplies || !i5) && (this._activeProviderReplies?.forEach((s4) => {\n        s4?.forEach((o2) => {\n          o2.link.dispose && o2.link.dispose();\n        });\n      }), this._activeProviderReplies = /* @__PURE__ */ new Map(), this._activeLine = e.y);\n      let r = false;\n      for (let [s4, o2] of this._linkProviderService.linkProviders.entries()) i5 ? this._activeProviderReplies?.get(s4) && (r = this._checkLinkProviderResult(s4, e, r)) : o2.provideLinks(e.y, (a2) => {\n        if (this._isMouseOut) return;\n        let l4 = a2?.map((h3) => ({ link: h3 }));\n        this._activeProviderReplies?.set(s4, l4), r = this._checkLinkProviderResult(s4, e, r), this._activeProviderReplies?.size === this._linkProviderService.linkProviders.length && this._removeIntersectingLinks(e.y, this._activeProviderReplies);\n      });\n    }\n    _removeIntersectingLinks(e, i5) {\n      let r = /* @__PURE__ */ new Set();\n      for (let s4 = 0; s4 < i5.size; s4++) {\n        let o2 = i5.get(s4);\n        if (o2) for (let a2 = 0; a2 < o2.length; a2++) {\n          let l4 = o2[a2], h3 = l4.link.range.start.y < e ? 0 : l4.link.range.start.x, d3 = l4.link.range.end.y > e ? this._bufferService.cols : l4.link.range.end.x;\n          for (let c2 = h3; c2 <= d3; c2++) {\n            if (r.has(c2)) {\n              o2.splice(a2--, 1);\n              break;\n            }\n            r.add(c2);\n          }\n        }\n      }\n    }\n    _checkLinkProviderResult(e, i5, r) {\n      if (!this._activeProviderReplies) return r;\n      let s4 = this._activeProviderReplies.get(e), o2 = false;\n      for (let a2 = 0; a2 < e; a2++) (!this._activeProviderReplies.has(a2) || this._activeProviderReplies.get(a2)) && (o2 = true);\n      if (!o2 && s4) {\n        let a2 = s4.find((l4) => this._linkAtPosition(l4.link, i5));\n        a2 && (r = true, this._handleNewLink(a2));\n      }\n      if (this._activeProviderReplies.size === this._linkProviderService.linkProviders.length && !r) for (let a2 = 0; a2 < this._activeProviderReplies.size; a2++) {\n        let l4 = this._activeProviderReplies.get(a2)?.find((h3) => this._linkAtPosition(h3.link, i5));\n        if (l4) {\n          r = true, this._handleNewLink(l4);\n          break;\n        }\n      }\n      return r;\n    }\n    _handleMouseDown() {\n      this._mouseDownLink = this._currentLink;\n    }\n    _handleMouseUp(e) {\n      if (!this._currentLink) return;\n      let i5 = this._positionFromMouseEvent(e, this._element);\n      i5 && this._mouseDownLink && Yo2(this._mouseDownLink.link, this._currentLink.link) && this._linkAtPosition(this._currentLink.link, i5) && this._currentLink.link.activate(e, this._currentLink.link.text);\n    }\n    _clearCurrentLink(e, i5) {\n      !this._currentLink || !this._lastMouseEvent || (!e || !i5 || this._currentLink.link.range.start.y >= e && this._currentLink.link.range.end.y <= i5) && (this._linkLeave(this._element, this._currentLink.link, this._lastMouseEvent), this._currentLink = void 0, Oe2(this._linkCacheDisposables), this._linkCacheDisposables.length = 0);\n    }\n    _handleNewLink(e) {\n      if (!this._lastMouseEvent) return;\n      let i5 = this._positionFromMouseEvent(this._lastMouseEvent, this._element);\n      i5 && this._linkAtPosition(e.link, i5) && (this._currentLink = e, this._currentLink.state = { decorations: { underline: e.link.decorations === void 0 ? true : e.link.decorations.underline, pointerCursor: e.link.decorations === void 0 ? true : e.link.decorations.pointerCursor }, isHovered: true }, this._linkHover(this._element, e.link, this._lastMouseEvent), e.link.decorations = {}, Object.defineProperties(e.link.decorations, { pointerCursor: { get: () => this._currentLink?.state?.decorations.pointerCursor, set: (r) => {\n        this._currentLink?.state && this._currentLink.state.decorations.pointerCursor !== r && (this._currentLink.state.decorations.pointerCursor = r, this._currentLink.state.isHovered && this._element.classList.toggle("xterm-cursor-pointer", r));\n      } }, underline: { get: () => this._currentLink?.state?.decorations.underline, set: (r) => {\n        this._currentLink?.state && this._currentLink?.state?.decorations.underline !== r && (this._currentLink.state.decorations.underline = r, this._currentLink.state.isHovered && this._fireUnderlineEvent(e.link, r));\n      } } }), this._linkCacheDisposables.push(this._renderService.onRenderedViewportChange((r) => {\n        if (!this._currentLink) return;\n        let s4 = r.start === 0 ? 0 : r.start + 1 + this._bufferService.buffer.ydisp, o2 = this._bufferService.buffer.ydisp + 1 + r.end;\n        if (this._currentLink.link.range.start.y >= s4 && this._currentLink.link.range.end.y <= o2 && (this._clearCurrentLink(s4, o2), this._lastMouseEvent)) {\n          let a2 = this._positionFromMouseEvent(this._lastMouseEvent, this._element);\n          a2 && this._askForLink(a2, false);\n        }\n      })));\n    }\n    _linkHover(e, i5, r) {\n      this._currentLink?.state && (this._currentLink.state.isHovered = true, this._currentLink.state.decorations.underline && this._fireUnderlineEvent(i5, true), this._currentLink.state.decorations.pointerCursor && e.classList.add("xterm-cursor-pointer")), i5.hover && i5.hover(r, i5.text);\n    }\n    _fireUnderlineEvent(e, i5) {\n      let r = e.range, s4 = this._bufferService.buffer.ydisp, o2 = this._createLinkUnderlineEvent(r.start.x - 1, r.start.y - s4 - 1, r.end.x, r.end.y - s4 - 1, void 0);\n      (i5 ? this._onShowLinkUnderline : this._onHideLinkUnderline).fire(o2);\n    }\n    _linkLeave(e, i5, r) {\n      this._currentLink?.state && (this._currentLink.state.isHovered = false, this._currentLink.state.decorations.underline && this._fireUnderlineEvent(i5, false), this._currentLink.state.decorations.pointerCursor && e.classList.remove("xterm-cursor-pointer")), i5.leave && i5.leave(r, i5.text);\n    }\n    _linkAtPosition(e, i5) {\n      let r = e.range.start.y * this._bufferService.cols + e.range.start.x, s4 = e.range.end.y * this._bufferService.cols + e.range.end.x, o2 = i5.y * this._bufferService.cols + i5.x;\n      return r <= o2 && o2 <= s4;\n    }\n    _positionFromMouseEvent(e, i5) {\n      let r = this._mouseCoordsService.getCoords(e, i5, this._bufferService.cols, this._bufferService.rows);\n      if (r) return { x: r[0], y: r[1] + this._bufferService.buffer.ydisp };\n    }\n    _createLinkUnderlineEvent(e, i5, r, s4, o2) {\n      return { x1: e, y1: i5, x2: r, y2: s4, cols: this._bufferService.cols, fg: o2 };\n    }\n  };\n  Nt3 = E4([m3(1, Be2), m3(2, G4), m3(3, L5), m3(4, yi)], Nt3);\n  function Yo2(n11, t) {\n    return n11.text === t.text && n11.range.start.x === t.range.start.x && n11.range.start.y === t.range.start.y && n11.range.end.x === t.range.end.x && n11.range.end.y === t.range.end.y;\n  }\n  var xr = class extends Cr2 {\n    constructor(e = {}) {\n      super(e);\n      this._linkifier = this._register(new me3());\n      this.browser = ze3;\n      this._keyDownHandled = false;\n      this._keyDownSeen = false;\n      this._keyPressHandled = false;\n      this._unprocessedDeadKey = false;\n      this._accessibilityManager = this._register(new me3());\n      this._onCursorMove = this._register(new v5());\n      this.onCursorMove = this._onCursorMove.event;\n      this._onKey = this._register(new v5());\n      this.onKey = this._onKey.event;\n      this._onSelectionChange = this._register(new v5());\n      this.onSelectionChange = this._onSelectionChange.event;\n      this._onTitleChange = this._register(new v5());\n      this.onTitleChange = this._onTitleChange.event;\n      this._onBell = this._register(new v5());\n      this.onBell = this._onBell.event;\n      this._onFocus = this._register(new v5());\n      this._onBlur = this._register(new v5());\n      this._onA11yCharEmitter = this._register(new v5());\n      this._onA11yTabEmitter = this._register(new v5());\n      this._onWillOpen = this._register(new v5());\n      this._onDimensionsChange = this._register(new v5());\n      this.onDimensionsChange = this._onDimensionsChange.event;\n      this._setup(), this._decorationService = this._instantiationService.createInstance(Ot), this._instantiationService.setService(Ie2, this._decorationService), this._keyboardService = this._instantiationService.createInstance(Tt3), this._instantiationService.setService(Js, this._keyboardService), this._linkProviderService = this._instantiationService.createInstance(Yi), this._instantiationService.setService(yi, this._linkProviderService), this._linkProviderService.registerLinkProvider(this._instantiationService.createInstance(it4)), this._register(this._inputHandler.onRequestBell(() => this._onBell.fire())), this._register(this._inputHandler.onRequestRefreshRows((i5) => this.refresh(i5?.start ?? 0, i5?.end ?? this.rows - 1))), this._register(this._inputHandler.onRequestSendFocus(() => this._reportFocus())), this._register(this._inputHandler.onRequestReset(() => this.reset())), this._register(this._inputHandler.onRequestWindowsOptionsReport((i5) => this._reportWindowsOptions(i5))), this._register(this._inputHandler.onColor((i5) => this._handleColorEvent(i5))), this._register(X2.forward(this._inputHandler.onCursorMove, this._onCursorMove)), this._register(X2.forward(this._inputHandler.onTitleChange, this._onTitleChange)), this._register(X2.forward(this._inputHandler.onA11yChar, this._onA11yCharEmitter)), this._register(X2.forward(this._inputHandler.onA11yTab, this._onA11yTabEmitter)), this._register(this._bufferService.onResize((i5) => this._afterResize(i5.cols, i5.rows))), this._register(y4(() => {\n        this._customKeyEventHandler = void 0, this.element?.parentNode?.removeChild(this.element);\n      }));\n    }\n    get linkifier() {\n      return this._linkifier.value;\n    }\n    get onFocus() {\n      return this._onFocus.event;\n    }\n    get onBlur() {\n      return this._onBlur.event;\n    }\n    get onA11yChar() {\n      return this._onA11yCharEmitter.event;\n    }\n    get onA11yTab() {\n      return this._onA11yTabEmitter.event;\n    }\n    get onWillOpen() {\n      return this._onWillOpen.event;\n    }\n    get dimensions() {\n      if (!this._renderService) return;\n      let e = this._renderService.dimensions;\n      return { css: { canvas: { ...e.css.canvas }, cell: { ...e.css.cell } }, device: { canvas: { ...e.device.canvas }, cell: { ...e.device.cell }, char: { ...e.device.char } } };\n    }\n    _handleColorEvent(e) {\n      if (this._themeService) for (let i5 of e) {\n        let r, s4 = "";\n        switch (i5.index) {\n          case 256:\n            r = "foreground", s4 = "10";\n            break;\n          case 257:\n            r = "background", s4 = "11";\n            break;\n          case 258:\n            r = "cursor", s4 = "12";\n            break;\n          default:\n            r = "ansi", s4 = "4;" + i5.index;\n        }\n        switch (i5.type) {\n          case 0:\n            let o2 = k4.toColorRGB(r === "ansi" ? this._themeService.colors.ansi[i5.index] : this._themeService.colors[r]);\n            this.coreService.triggerDataEvent(`\\x1B]${s4};${Pn(o2)}\\x1B\\\\`);\n            break;\n          case 1:\n            if (r === "ansi") this._themeService.modifyColors((a2) => a2.ansi[i5.index] = B4.toColor(...i5.color));\n            else {\n              let a2 = r;\n              this._themeService.modifyColors((l4) => l4[a2] = B4.toColor(...i5.color));\n            }\n            break;\n          case 2:\n            this._themeService.restoreColor(i5.index);\n            break;\n        }\n      }\n    }\n    _reportColorScheme() {\n      if (!this._themeService) return;\n      let e = j4.relativeLuminance(this._themeService.colors.background.rgba >> 8), i5 = j4.relativeLuminance(this._themeService.colors.foreground.rgba >> 8), r = e < i5 ? 1 : 2;\n      this.coreService.triggerDataEvent(`\\x1B[?997;${r}n`);\n    }\n    _setup() {\n      super._setup(), this._customKeyEventHandler = void 0;\n    }\n    get buffer() {\n      return this.buffers.active;\n    }\n    focus() {\n      this.textarea && this.textarea.focus({ preventScroll: true });\n    }\n    _handleScreenReaderModeOptionChange(e) {\n      e ? !this._accessibilityManager.value && this._renderService && (this._accessibilityManager.value = this._instantiationService.createInstance(je3, this)) : this._accessibilityManager.clear();\n    }\n    _handleTextAreaFocus(e) {\n      this.coreService.decPrivateModes.sendFocus && this.coreService.triggerDataEvent("\\x1B[I"), this.element.classList.add("focus"), this._showCursor(), this._onFocus.fire();\n    }\n    blur() {\n      return this.textarea?.blur();\n    }\n    _handleTextAreaBlur() {\n      this.textarea.value = "", this.refresh(this.buffer.y, this.buffer.y), this.coreService.decPrivateModes.sendFocus && this.coreService.triggerDataEvent("\\x1B[O"), this.element.classList.remove("focus"), this._onBlur.fire();\n    }\n    _syncTextArea() {\n      if (!this.textarea || !this.buffer.isCursorInViewport || this._compositionHelper.isComposing || !this._renderService) return;\n      let e = this.buffer.ybase + this.buffer.y, i5 = this.buffer.lines.get(e);\n      if (!i5) return;\n      let r = Math.min(this.buffer.x, this.cols - 1), s4 = this._renderService.dimensions.css.cell.height, o2 = i5.getWidth(r), a2 = this._renderService.dimensions.css.cell.width * o2, l4 = this.buffer.y * this._renderService.dimensions.css.cell.height, h3 = r * this._renderService.dimensions.css.cell.width;\n      this.textarea.style.left = h3 + "px", this.textarea.style.top = l4 + "px", this.textarea.style.width = a2 + "px", this.textarea.style.height = s4 + "px", this.textarea.style.lineHeight = s4 + "px", this.textarea.style.zIndex = "-5";\n    }\n    _initGlobal() {\n      this._bindKeys(), this._register(C3(this.element, "copy", (i5) => {\n        this.hasSelection() && Gs(i5, this._selectionService);\n      }));\n      let e = (i5) => $s(i5, this.textarea, this.coreService, this.optionsService);\n      this._register(C3(this.textarea, "paste", e)), this._register(C3(this.element, "paste", e)), at4 ? this._register(C3(this.element, "mousedown", (i5) => {\n        i5.button === 2 && Ur2(i5, this.textarea, this.screenElement, this._selectionService, this.options.rightClickSelectsWord);\n      })) : this._register(C3(this.element, "contextmenu", (i5) => {\n        Ur2(i5, this.textarea, this.screenElement, this._selectionService, this.options.rightClickSelectsWord);\n      })), $t2 && this._register(C3(this.element, "auxclick", (i5) => {\n        i5.button === 1 && Wr(i5, this.textarea, this.screenElement);\n      }));\n    }\n    _bindKeys() {\n      this._register(C3(this.textarea, "keyup", (e) => this._keyUp(e), true)), this._register(C3(this.textarea, "keydown", (e) => this._keyDown(e), true)), this._register(C3(this.textarea, "keypress", (e) => this._keyPress(e), true)), this._register(C3(this.textarea, "compositionstart", () => {\n        this._syncTextArea(), this._compositionHelper.compositionstart(), this._compositionHelper.updateCompositionElements();\n      })), this._register(C3(this.textarea, "compositionupdate", (e) => this._compositionHelper.compositionupdate(e))), this._register(C3(this.textarea, "compositionend", () => this._compositionHelper.compositionend())), this._register(C3(this.textarea, "input", (e) => this._inputEvent(e), true)), this._register(this.onRender(() => this._compositionHelper.updateCompositionElements()));\n    }\n    open(e) {\n      if (!e) throw new Error("Terminal requires a parent element.");\n      if (e.isConnected || this._logService.debug("Terminal.open was called on an element that was not attached to the DOM"), this.element?.ownerDocument.defaultView && this._coreBrowserService) {\n        this.element.ownerDocument.defaultView !== this._coreBrowserService.window && (this._coreBrowserService.window = this.element.ownerDocument.defaultView);\n        return;\n      }\n      this._document = e.ownerDocument, this.options.documentOverride && this.options.documentOverride instanceof Document && (this._document = this.optionsService.rawOptions.documentOverride), this.element = this._document.createElement("div"), this.element.dir = "ltr", this.element.classList.add("terminal"), this.element.classList.add("xterm"), this.element.classList.toggle("allow-transparency", this.options.allowTransparency), this._register(this.optionsService.onSpecificOptionChange("allowTransparency", (l4) => this.element.classList.toggle("allow-transparency", l4))), e.appendChild(this.element);\n      let i5 = this._document.createDocumentFragment();\n      this._viewportElement = this._document.createElement("div"), this._viewportElement.classList.add("xterm-viewport"), i5.appendChild(this._viewportElement), this.screenElement = this._document.createElement("div"), this.screenElement.classList.add("xterm-screen"), this._register(C3(this.screenElement, "mousemove", (l4) => this.updateCursorStyle(l4))), this._helperContainer = this._document.createElement("div"), this._helperContainer.classList.add("xterm-helpers"), this.screenElement.appendChild(this._helperContainer), i5.appendChild(this.screenElement);\n      let r = this.textarea = this._document.createElement("textarea");\n      this.textarea.classList.add("xterm-helper-textarea"), this.textarea.setAttribute("aria-label", zt2.get()), Jr || this.textarea.setAttribute("aria-multiline", "false"), this.textarea.setAttribute("autocorrect", "off"), this.textarea.setAttribute("autocapitalize", "off"), this.textarea.setAttribute("spellcheck", "false"), this.textarea.tabIndex = 0, this._register(this.optionsService.onSpecificOptionChange("disableStdin", () => r.readOnly = this.optionsService.rawOptions.disableStdin)), this.textarea.readOnly = this.optionsService.rawOptions.disableStdin, this._coreBrowserService = this._register(this._instantiationService.createInstance(qi, this.textarea, e.ownerDocument.defaultView ?? window, this._document ?? typeof window < "u" ? window.document : null)), this._instantiationService.setService(z3, this._coreBrowserService), this._register(C3(this.textarea, "focus", (l4) => this._handleTextAreaFocus(l4))), this._register(C3(this.textarea, "blur", () => this._handleTextAreaBlur())), this._helperContainer.appendChild(this.textarea), this._charSizeService = this._instantiationService.createInstance(St2, this._document, this._helperContainer), this._instantiationService.setService(Me2, this._charSizeService), this._themeService = this._instantiationService.createInstance(wt), this._instantiationService.setService(_e2, this._themeService), this._register(this._inputHandler.onRequestColorSchemeQuery(() => this._reportColorScheme())), this._register(this._themeService.onChangeColors(() => {\n        this.coreService.decPrivateModes.colorSchemeUpdates && this._reportColorScheme();\n      })), this._characterJoinerService = this._instantiationService.createInstance(We3), this._instantiationService.setService(Ei, this._characterJoinerService), this._renderService = this._register(this._instantiationService.createInstance(yt3, this.rows, this.screenElement)), this._instantiationService.setService(G4, this._renderService), this._register(this._renderService.onRenderedViewportChange((l4) => this._onRender.fire(l4))), this._register(this._renderService.onDimensionsChange((l4) => this._onDimensionsChange.fire({ css: { canvas: { ...l4.css.canvas }, cell: { ...l4.css.cell } }, device: { canvas: { ...l4.device.canvas }, cell: { ...l4.device.cell }, char: { ...l4.device.char } } }))), this.onResize((l4) => this._renderService.resize(l4.cols, l4.rows)), this._compositionView = this._document.createElement("div"), this._compositionView.classList.add("composition-view"), this._compositionHelper = this._instantiationService.createInstance(_t2, this.textarea, this._compositionView), this._helperContainer.appendChild(this._compositionView), this._mouseCoordsService = this._instantiationService.createInstance(gt2), this._instantiationService.setService(Be2, this._mouseCoordsService);\n      let s4 = this._linkifier.value = this._register(this._instantiationService.createInstance(Nt3, this.screenElement));\n      this.element.appendChild(i5);\n      try {\n        this._onWillOpen.fire(this.element);\n      } catch {\n      }\n      this._renderService.hasRenderer() || this._renderService.setRenderer(this._createRenderer()), this._register(this.onCursorMove(() => {\n        this._renderService.handleCursorMove(), this._syncTextArea();\n      })), this._register(this.onResize(() => {\n        this._renderService.handleResize(this.cols, this.rows), this._syncTextArea();\n      })), this._register(this.onBlur(() => this._renderService.handleBlur())), this._register(this.onFocus(() => this._renderService.handleFocus())), this._viewport = this._register(this._instantiationService.createInstance(ft3, this.element, this.screenElement)), this._register(this._viewport.onRequestScrollLines((l4) => {\n        super.scrollLines(l4, false), this.refresh(0, this.rows - 1);\n      })), this._selectionService = this._register(this._instantiationService.createInstance(xt3, this.element, this.screenElement, s4)), this._instantiationService.setService(Ci, this._selectionService), this._mouseService = this._instantiationService.createInstance(Ct2), this._instantiationService.setService(Zs, this._mouseService), this._register(this._selectionService.onRequestScrollLines((l4) => this.scrollLines(l4.amount, l4.suppressScrollEvent))), this._register(this._selectionService.onSelectionChange(() => this._onSelectionChange.fire())), this._register(this._selectionService.onRequestRedraw((l4) => this._renderService.handleSelectionChanged(l4.start, l4.end, l4.columnSelectMode))), this._register(this._selectionService.onLinuxMouseSelection((l4) => {\n        this.textarea.value = l4, this.textarea.focus(), this.textarea.select();\n      })), this._register(X2.any(this._onScroll.event, this._inputHandler.onScroll)(() => {\n        this._selectionService.refresh(), this._viewport?.queueSync();\n      })), this._register(this._instantiationService.createInstance(pt3, this.screenElement)), this._register(C3(this.element, "mousedown", (l4) => this._selectionService.handleMouseDown(l4))), this.mouseStateService.areMouseEventsActive ? (this._selectionService.disable(), this.element.classList.add("enable-mouse-events")) : this._selectionService.enable(), this.options.screenReaderMode && (this._accessibilityManager.value = this._instantiationService.createInstance(je3, this)), this._register(this.optionsService.onSpecificOptionChange("screenReaderMode", (l4) => this._handleScreenReaderModeOptionChange(l4)));\n      let o2 = this.options.scrollbar?.showScrollbar ?? true, a2 = this.options.scrollbar?.width;\n      o2 && a2 && (this._overviewRulerRenderer = this._register(this._instantiationService.createInstance(Ge4, this._viewportElement, this.screenElement))), this.optionsService.onSpecificOptionChange("scrollbar", (l4) => {\n        let h3 = (l4?.showScrollbar ?? true) && !!l4?.width;\n        !this._overviewRulerRenderer && h3 && this._viewportElement && this.screenElement && (this._overviewRulerRenderer = this._register(this._instantiationService.createInstance(Ge4, this._viewportElement, this.screenElement)));\n      }), this._charSizeService.measure(), this.refresh(0, this.rows - 1), this._initGlobal(), this._mouseService.bindMouse({ element: this.element, screenElement: this.screenElement, document: this._document, handleTouchScroll: (l4) => this._viewport?.handleTouchScroll(l4) }, (l4) => this._register(l4), () => this.focus());\n    }\n    _createRenderer() {\n      return this._instantiationService.createInstance(vt2, this, this._document, this.element, this.screenElement, this._viewportElement, this._helperContainer, this.linkifier);\n    }\n    refresh(e, i5, r = false) {\n      this._renderService?.refreshRows(e, i5, r);\n    }\n    updateCursorStyle(e) {\n      this._selectionService?.shouldColumnSelect(e) ? this.element.classList.add("column-select") : this.element.classList.remove("column-select");\n    }\n    _showCursor() {\n      this.coreService.isCursorInitialized || (this.coreService.isCursorInitialized = true, this.refresh(this.buffer.y, this.buffer.y));\n    }\n    scrollLines(e, i5) {\n      this._viewport ? this._viewport.scrollLines(e) : super.scrollLines(e, i5), this.refresh(0, this.rows - 1);\n    }\n    scrollPages(e) {\n      this.scrollLines(e * (this.rows - 1));\n    }\n    scrollToTop() {\n      this.scrollLines(-this._bufferService.buffer.ydisp);\n    }\n    scrollToBottom(e) {\n      e && this._viewport ? this._viewport.scrollToLine(this.buffer.ybase, true) : this.scrollLines(this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n    }\n    scrollToLine(e) {\n      let i5 = e - this._bufferService.buffer.ydisp;\n      i5 !== 0 && this.scrollLines(i5);\n    }\n    paste(e) {\n      Hr(e, this.textarea, this.coreService, this.optionsService);\n    }\n    attachCustomKeyEventHandler(e) {\n      this._customKeyEventHandler = e;\n    }\n    attachCustomWheelEventHandler(e) {\n      this.mouseStateService.setCustomWheelEventHandler(e);\n    }\n    registerLinkProvider(e) {\n      return this._linkProviderService.registerLinkProvider(e);\n    }\n    registerCharacterJoiner(e) {\n      if (!this._characterJoinerService) throw new Error("Terminal must be opened first");\n      let i5 = this._characterJoinerService.register(e);\n      return this.refresh(0, this.rows - 1), i5;\n    }\n    deregisterCharacterJoiner(e) {\n      if (!this._characterJoinerService) throw new Error("Terminal must be opened first");\n      this._characterJoinerService.deregister(e) && this.refresh(0, this.rows - 1);\n    }\n    get markers() {\n      return this.buffer.markers;\n    }\n    registerMarker(e) {\n      return this.buffer.addMarker(this.buffer.ybase + this.buffer.y + e);\n    }\n    registerDecoration(e) {\n      return this._decorationService.registerDecoration(e);\n    }\n    hasSelection() {\n      return this._selectionService ? this._selectionService.hasSelection : false;\n    }\n    select(e, i5, r) {\n      this._selectionService.setSelection(e, i5, r);\n    }\n    getSelection() {\n      return this._selectionService ? this._selectionService.selectionText : "";\n    }\n    getSelectionPosition() {\n      if (!(!this._selectionService || !this._selectionService.hasSelection)) return { start: { x: this._selectionService.selectionStart[0], y: this._selectionService.selectionStart[1] }, end: { x: this._selectionService.selectionEnd[0], y: this._selectionService.selectionEnd[1] } };\n    }\n    clearSelection() {\n      this._selectionService?.clearSelection();\n    }\n    selectAll() {\n      this._selectionService?.selectAll();\n    }\n    selectLines(e, i5) {\n      this._selectionService?.selectLines(e, i5);\n    }\n    _keyDown(e) {\n      if (this._keyDownHandled = false, this._keyDownSeen = true, this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return false;\n      let i5 = this.browser.isMac && this.options.macOptionIsMeta && e.altKey;\n      if (!i5 && !this._compositionHelper.keydown(e)) return this.options.scrollOnUserInput && this.buffer.ybase !== this.buffer.ydisp && this.scrollToBottom(true), false;\n      !i5 && (e.key === "Dead" || e.key === "AltGraph") && (this._unprocessedDeadKey = true);\n      let r = this._keyboardService.evaluateKeyDown(e);\n      if (this.updateCursorStyle(e), r.type === 3 || r.type === 2) {\n        let o2 = this.rows - 1;\n        return this.scrollLines(r.type === 2 ? -o2 : o2), e.preventDefault(), e.stopPropagation(), false;\n      }\n      if (r.type === 1 && this.selectAll(), this._isThirdLevelShift(this.browser, e) || (r.cancel && (e.preventDefault(), e.stopPropagation()), !r.key) || !this._keyboardService.useKitty && !this._keyboardService.useWin32InputMode && e.key && !e.ctrlKey && !e.altKey && !e.metaKey && e.key.length === 1 && e.key.charCodeAt(0) >= 65 && e.key.charCodeAt(0) <= 90) return true;\n      if (this._unprocessedDeadKey) return this._unprocessedDeadKey = false, true;\n      (r.key === "\u0003" || r.key === "\\r") && (this.textarea.value = "");\n      let s4 = this._keyboardService.useWin32InputMode && Bs(e);\n      if (this._onKey.fire({ key: r.key, domEvent: e }), this._showCursor(), this.coreService.triggerDataEvent(r.key, !s4), !this.optionsService.rawOptions.screenReaderMode || e.altKey || e.ctrlKey) return e.preventDefault(), e.stopPropagation(), false;\n      this._keyDownHandled = true;\n    }\n    _isThirdLevelShift(e, i5) {\n      let r = e.isMac && !this.options.macOptionIsMeta && i5.altKey && !i5.ctrlKey && !i5.metaKey || e.isWindows && i5.altKey && i5.ctrlKey && !i5.metaKey || e.isWindows && i5.getModifierState("AltGraph");\n      return i5.type === "keypress" ? r : r && (!i5.keyCode || i5.keyCode > 47);\n    }\n    _keyUp(e) {\n      if (this._keyDownSeen = false, this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return;\n      Bs(e) || this.focus();\n      let i5 = this._keyboardService.evaluateKeyUp(e);\n      if (i5?.key) {\n        let r = this._keyboardService.useWin32InputMode && Bs(e);\n        this.coreService.triggerDataEvent(i5.key, !r);\n      }\n      this.updateCursorStyle(e), this._keyPressHandled = false;\n    }\n    _keyPress(e) {\n      let i5;\n      if (this._keyPressHandled = false, this._keyDownHandled || this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return false;\n      if (e.charCode) i5 = e.charCode;\n      else if (e.which === null || e.which === void 0) i5 = e.keyCode;\n      else if (e.which !== 0 && e.charCode !== 0) i5 = e.which;\n      else return false;\n      return !i5 || (e.altKey || e.ctrlKey || e.metaKey) && !this._isThirdLevelShift(this.browser, e) ? false : (i5 = String.fromCharCode(i5), this._onKey.fire({ key: i5, domEvent: e }), this._showCursor(), this.coreService.triggerDataEvent(i5, true), this._keyPressHandled = true, this._unprocessedDeadKey = false, true);\n    }\n    _inputEvent(e) {\n      if (e.data && e.inputType === "insertText" && (!e.composed || !this._keyDownSeen) && !this.optionsService.rawOptions.screenReaderMode) {\n        if (this._keyPressHandled) return false;\n        this._unprocessedDeadKey = false;\n        let i5 = e.data;\n        return this.coreService.triggerDataEvent(i5, true), true;\n      }\n      return false;\n    }\n    resize(e, i5) {\n      if (e === this.cols && i5 === this.rows) {\n        this._charSizeService && !this._charSizeService.hasValidSize && this._charSizeService.measure();\n        return;\n      }\n      super.resize(e, i5);\n    }\n    _afterResize(e, i5) {\n      this._charSizeService?.measure();\n    }\n    clear() {\n      if (!(this.buffer.ybase === 0 && this.buffer.y === 0)) {\n        this.buffer.clearAllMarkers(), this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y)), this.buffer.lines.length = 1, this.buffer.ydisp = 0, this.buffer.ybase = 0, this.buffer.y = 0;\n        for (let e = 1; e < this.rows; e++) this.buffer.lines.push(this.buffer.getBlankLine(U5));\n        this._onScroll.fire({ position: this.buffer.ydisp }), this.refresh(0, this.rows - 1);\n      }\n    }\n    reset() {\n      this.options.rows = this.rows, this.options.cols = this.cols;\n      let e = this._customKeyEventHandler;\n      this._setup(), super.reset(), this._mouseService?.reset(), this._selectionService?.reset(), this._decorationService.reset(), this._customKeyEventHandler = e, this.refresh(0, this.rows - 1, true);\n    }\n    clearTextureAtlas() {\n      this._renderService?.clearTextureAtlas();\n    }\n    _reportFocus() {\n      this.element?.classList.contains("focus") ? this.coreService.triggerDataEvent("\\x1B[I") : this.coreService.triggerDataEvent("\\x1B[O");\n    }\n    _reportWindowsOptions(e) {\n      if (this._renderService) switch (e) {\n        case 0:\n          let i5 = this._renderService.dimensions.css.canvas.width.toFixed(0), r = this._renderService.dimensions.css.canvas.height.toFixed(0);\n          this.coreService.triggerDataEvent(`\\x1B[4;${r};${i5}t`);\n          break;\n        case 1:\n          let s4 = this._renderService.dimensions.css.cell.width.toFixed(0), o2 = this._renderService.dimensions.css.cell.height.toFixed(0);\n          this.coreService.triggerDataEvent(`\\x1B[6;${o2};${s4}t`);\n          break;\n      }\n    }\n  };\n  function Bs(n11) {\n    return n11.keyCode === 16 || n11.keyCode === 17 || n11.keyCode === 18 || n11.keyCode === 91 || n11.keyCode === 92 || n11.keyCode === 93 || n11.keyCode === 224 || n11.key === "Meta";\n  }\n  var wr2 = class {\n    constructor() {\n      this._addons = [];\n    }\n    dispose() {\n      for (let t = this._addons.length - 1; t >= 0; t--) this._addons[t].instance.dispose();\n    }\n    loadAddon(t, e) {\n      let i5 = { instance: e, dispose: e.dispose, isDisposed: false };\n      this._addons.push(i5), e.dispose = () => this._wrappedAddonDispose(i5), e.activate(t);\n    }\n    _wrappedAddonDispose(t) {\n      if (t.isDisposed) return;\n      let e = -1;\n      for (let i5 = 0; i5 < this._addons.length; i5++) if (this._addons[i5] === t) {\n        e = i5;\n        break;\n      }\n      if (e === -1) throw new Error("Could not dispose an addon that has not been loaded");\n      t.isDisposed = true, t.dispose.apply(t.instance), this._addons.splice(e, 1);\n    }\n  };\n  var Tr = class {\n    constructor(t) {\n      this._line = t;\n    }\n    get isWrapped() {\n      return this._line.isWrapped;\n    }\n    get length() {\n      return this._line.length;\n    }\n    getCell(t, e) {\n      if (!(t < 0 || t >= this._line.length)) return e ? (this._line.loadCell(t, e), e) : this._line.loadCell(t, new N2());\n    }\n    translateToString(t, e, i5) {\n      return this._line.translateToString(t, e, i5);\n    }\n  };\n  var pi = class {\n    constructor(t, e) {\n      this._buffer = t;\n      this.type = e;\n    }\n    init(t) {\n      return this._buffer = t, this;\n    }\n    get cursorY() {\n      return this._buffer.y;\n    }\n    get cursorX() {\n      return this._buffer.x;\n    }\n    get viewportY() {\n      return this._buffer.ydisp;\n    }\n    get baseY() {\n      return this._buffer.ybase;\n    }\n    get length() {\n      return this._buffer.lines.length;\n    }\n    getLine(t) {\n      let e = this._buffer.lines.get(t);\n      if (e) return new Tr(e);\n    }\n    getNullCell() {\n      return new N2();\n    }\n  };\n  var Dr = class extends g5 {\n    constructor(e) {\n      super();\n      this._core = e;\n      this._onBufferChange = this._register(new v5());\n      this.onBufferChange = this._onBufferChange.event;\n      this._normal = new pi(this._core.buffers.normal, "normal"), this._alternate = new pi(this._core.buffers.alt, "alternate"), this._core.buffers.onBufferActivate(() => this._onBufferChange.fire(this.active));\n    }\n    get active() {\n      if (this._core.buffers.active === this._core.buffers.normal) return this.normal;\n      if (this._core.buffers.active === this._core.buffers.alt) return this.alternate;\n      throw new Error("Active buffer is neither normal nor alternate");\n    }\n    get normal() {\n      return this._normal.init(this._core.buffers.normal);\n    }\n    get alternate() {\n      return this._alternate.init(this._core.buffers.alt);\n    }\n  };\n  var Rr = class {\n    constructor(t) {\n      this._core = t;\n    }\n    registerCsiHandler(t, e) {\n      return this._core.registerCsiHandler(t, (i5) => e(i5.toArray()));\n    }\n    addCsiHandler(t, e) {\n      return this.registerCsiHandler(t, e);\n    }\n    registerDcsHandler(t, e) {\n      return this._core.registerDcsHandler(t, (i5, r) => e(i5, r.toArray()));\n    }\n    addDcsHandler(t, e) {\n      return this.registerDcsHandler(t, e);\n    }\n    registerEscHandler(t, e) {\n      return this._core.registerEscHandler(t, e);\n    }\n    addEscHandler(t, e) {\n      return this.registerEscHandler(t, e);\n    }\n    registerOscHandler(t, e) {\n      return this._core.registerOscHandler(t, e);\n    }\n    addOscHandler(t, e) {\n      return this.registerOscHandler(t, e);\n    }\n    registerApcHandler(t, e) {\n      return this._core.registerApcHandler(t, e);\n    }\n  };\n  var Lr = class {\n    constructor(t) {\n      this._core = t;\n    }\n    register(t) {\n      this._core.unicodeService.register(t);\n    }\n    get versions() {\n      return this._core.unicodeService.versions;\n    }\n    get activeVersion() {\n      return this._core.unicodeService.activeVersion;\n    }\n    set activeVersion(t) {\n      this._core.unicodeService.activeVersion = t;\n    }\n  };\n  var Xo2 = ["cols", "rows"];\n  var Ee = 0;\n  var Vn2 = class extends g5 {\n    constructor(t) {\n      super(), this._core = this._register(new xr(t)), this._addonManager = this._register(new wr2()), this._publicOptions = { ...this._core.options };\n      let e = (r) => this._core.options[r], i5 = (r, s4) => {\n        this._checkReadonlyOptions(r), this._core.options[r] = s4;\n      };\n      for (let r in this._core.options) {\n        let s4 = { get: e.bind(this, r), set: i5.bind(this, r) };\n        Object.defineProperty(this._publicOptions, r, s4);\n      }\n    }\n    _checkReadonlyOptions(t) {\n      if (Xo2.includes(t)) throw new Error(`Option "${t}" can only be set in the constructor`);\n    }\n    _checkProposedApi() {\n      if (!this._core.optionsService.rawOptions.allowProposedApi) throw new Error("You must set the allowProposedApi option to true to use proposed API");\n    }\n    get onBell() {\n      return this._core.onBell;\n    }\n    get onBinary() {\n      return this._core.onBinary;\n    }\n    get onCursorMove() {\n      return this._core.onCursorMove;\n    }\n    get onData() {\n      return this._core.onData;\n    }\n    get onKey() {\n      return this._core.onKey;\n    }\n    get onLineFeed() {\n      return this._core.onLineFeed;\n    }\n    get onRender() {\n      return this._core.onRender;\n    }\n    get onResize() {\n      return this._core.onResize;\n    }\n    get onScroll() {\n      return this._core.onScroll;\n    }\n    get onSelectionChange() {\n      return this._core.onSelectionChange;\n    }\n    get onTitleChange() {\n      return this._core.onTitleChange;\n    }\n    get onWriteParsed() {\n      return this._core.onWriteParsed;\n    }\n    get onDimensionsChange() {\n      return this._core.onDimensionsChange;\n    }\n    get element() {\n      return this._core.element;\n    }\n    get screenElement() {\n      return this._core.screenElement;\n    }\n    get parser() {\n      return this._parser ??= new Rr(this._core);\n    }\n    get unicode() {\n      return this._checkProposedApi(), new Lr(this._core);\n    }\n    get textarea() {\n      return this._core.textarea;\n    }\n    get rows() {\n      return this._core.rows;\n    }\n    get cols() {\n      return this._core.cols;\n    }\n    get buffer() {\n      return this._buffer ??= this._register(new Dr(this._core));\n    }\n    get markers() {\n      return this._core.markers;\n    }\n    get modes() {\n      let t = this._core.coreService.decPrivateModes, e = "none";\n      switch (this._core.mouseStateService.activeProtocol) {\n        case "X10":\n          e = "x10";\n          break;\n        case "VT200":\n          e = "vt200";\n          break;\n        case "DRAG":\n          e = "drag";\n          break;\n        case "ANY":\n          e = "any";\n          break;\n      }\n      return { applicationCursorKeysMode: t.applicationCursorKeys, applicationKeypadMode: t.applicationKeypad, bracketedPasteMode: t.bracketedPasteMode, insertMode: this._core.coreService.modes.insertMode, mouseTrackingMode: e, originMode: t.origin, reverseWraparoundMode: t.reverseWraparound, sendFocusMode: t.sendFocus, showCursor: !this._core.coreService.isCursorHidden, synchronizedOutputMode: t.synchronizedOutput, win32InputMode: t.win32InputMode, wraparoundMode: t.wraparound };\n    }\n    get dimensions() {\n      return this._core.dimensions;\n    }\n    get options() {\n      return this._publicOptions;\n    }\n    set options(t) {\n      for (let e in t) this._publicOptions[e] = t[e];\n    }\n    blur() {\n      this._core.blur();\n    }\n    focus() {\n      this._core.focus();\n    }\n    input(t, e = true) {\n      this._core.input(t, e);\n    }\n    resize(t, e) {\n      this._verifyIntegers(t, e), this._core.resize(t, e);\n    }\n    open(t) {\n      this._core.open(t);\n    }\n    attachCustomKeyEventHandler(t) {\n      this._core.attachCustomKeyEventHandler(t);\n    }\n    attachCustomWheelEventHandler(t) {\n      this._core.attachCustomWheelEventHandler(t);\n    }\n    registerLinkProvider(t) {\n      return this._core.registerLinkProvider(t);\n    }\n    registerCharacterJoiner(t) {\n      return this._core.registerCharacterJoiner(t);\n    }\n    deregisterCharacterJoiner(t) {\n      this._core.deregisterCharacterJoiner(t);\n    }\n    registerMarker(t = 0) {\n      return this._verifyIntegers(t), this._core.registerMarker(t);\n    }\n    registerDecoration(t) {\n      return this._verifyPositiveIntegers(t.x ?? 0, t.width ?? 0, t.height ?? 0), this._core.registerDecoration(t);\n    }\n    hasSelection() {\n      return this._core.hasSelection();\n    }\n    select(t, e, i5) {\n      this._verifyIntegers(t, e, i5), this._core.select(t, e, i5);\n    }\n    getSelection() {\n      return this._core.getSelection();\n    }\n    getSelectionPosition() {\n      return this._core.getSelectionPosition();\n    }\n    clearSelection() {\n      this._core.clearSelection();\n    }\n    selectAll() {\n      this._core.selectAll();\n    }\n    selectLines(t, e) {\n      this._verifyIntegers(t, e), this._core.selectLines(t, e);\n    }\n    dispose() {\n      super.dispose();\n    }\n    scrollLines(t) {\n      this._verifyIntegers(t), this._core.scrollLines(t);\n    }\n    scrollPages(t) {\n      this._verifyIntegers(t), this._core.scrollPages(t);\n    }\n    scrollToTop() {\n      this._core.scrollToTop();\n    }\n    scrollToBottom() {\n      this._core.scrollToBottom();\n    }\n    scrollToLine(t) {\n      this._verifyIntegers(t), this._core.scrollToLine(t);\n    }\n    clear() {\n      this._core.clear();\n    }\n    write(t, e) {\n      this._core.write(t, e);\n    }\n    writeln(t, e) {\n      this._core.write(t), this._core.write(`\\r\n`, e);\n    }\n    paste(t) {\n      this._core.paste(t);\n    }\n    refresh(t, e) {\n      this._verifyIntegers(t, e), this._core.refresh(t, e);\n    }\n    reset() {\n      this._core.reset();\n    }\n    clearTextureAtlas() {\n      this._core.clearTextureAtlas();\n    }\n    loadAddon(t) {\n      this._addonManager.loadAddon(this, t);\n    }\n    static get strings() {\n      return { get promptLabel() {\n        return zt2.get();\n      }, set promptLabel(t) {\n        zt2.set(t);\n      }, get tooMuchOutput() {\n        return Je3.get();\n      }, set tooMuchOutput(t) {\n        Je3.set(t);\n      } };\n    }\n    _verifyIntegers(...t) {\n      for (Ee of t) if (Ee === 1 / 0 || isNaN(Ee) || Ee % 1 !== 0) throw new Error("This API only accepts integers");\n    }\n    _verifyPositiveIntegers(...t) {\n      for (Ee of t) if (Ee && (Ee === 1 / 0 || isNaN(Ee) || Ee % 1 !== 0 || Ee < 0)) throw new Error("This API only accepts positive integers");\n    }\n  };\n\n  // ../protocol/dist/terminal-input-mode.js\n  var ESC = String.fromCharCode(27);\n  var APPLICATION_CURSOR_KEYS_MODE = 1;\n  var WIN32_INPUT_MODE = 9001;\n  var BRACKETED_PASTE_MODE = 2004;\n  var CSI_INPUT_MODE_SEQUENCE = new RegExp(`${ESC}\\\\[(?:([<>=?]?)([0-9;]*)u|\\\\?([0-9;]*)([hl]))`, "g");\n  var INCOMPLETE_CSI_INPUT_MODE_SEQUENCE = new RegExp(`${ESC}\\\\[[<>=?]?[0-9;]*$`);\n  function parseFirstParam(params) {\n    const first = params.split(";")[0];\n    if (!first || !/^\\d+$/.test(first)) {\n      return null;\n    }\n    return Number(first);\n  }\n  function parseSecondParam(params) {\n    const second = params.split(";")[1];\n    if (!second || !/^\\d+$/.test(second)) {\n      return null;\n    }\n    return Number(second);\n  }\n  function parsePrivateModeParams(params) {\n    const modes = /* @__PURE__ */ new Set();\n    for (const param of params.split(";")) {\n      if (/^\\d+$/.test(param)) {\n        modes.add(Number(param));\n      }\n    }\n    return modes;\n  }\n  function terminalInputModeSupportsModifiedEnter(state) {\n    return state.kittyKeyboardFlags > 0 || state.win32InputMode;\n  }\n  function terminalInputModeStatesEqual(left, right) {\n    return left.kittyKeyboardFlags === right.kittyKeyboardFlags && left.win32InputMode === right.win32InputMode && Boolean(left.applicationCursorKeys) === Boolean(right.applicationCursorKeys) && Boolean(left.bracketedPaste) === Boolean(right.bracketedPaste);\n  }\n  var TerminalInputModeTracker = class {\n    constructor() {\n      this.kittyKeyboardFlags = 0;\n      this.win32InputMode = false;\n      this.applicationCursorKeys = false;\n      this.bracketedPaste = false;\n      this.kittyKeyboardStack = [];\n      this.pending = "";\n    }\n    feed(data) {\n      if (data.length === 0) {\n        return { changed: false, responses: [] };\n      }\n      const text = `${this.pending}${data}`;\n      this.pending = "";\n      let changed = false;\n      const responses = [];\n      let consumedUntil = 0;\n      CSI_INPUT_MODE_SEQUENCE.lastIndex = 0;\n      for (; ; ) {\n        const match = CSI_INPUT_MODE_SEQUENCE.exec(text);\n        if (!match) {\n          break;\n        }\n        consumedUntil = CSI_INPUT_MODE_SEQUENCE.lastIndex;\n        if (match[4]) {\n          changed = this.applyPrivateModeSequence(match[3] ?? "", match[4]) || changed;\n          continue;\n        }\n        const result = this.applyKittyKeyboardSequence(match[1] ?? "", match[2] ?? "");\n        changed = changed || result.changed;\n        responses.push(...result.responses);\n      }\n      const tail = text.slice(consumedUntil);\n      const pendingStart = tail.lastIndexOf(`${ESC}[`);\n      if (pendingStart >= 0) {\n        const pending = tail.slice(pendingStart);\n        if (INCOMPLETE_CSI_INPUT_MODE_SEQUENCE.test(pending)) {\n          this.pending = pending;\n        }\n      }\n      return { changed, responses };\n    }\n    reset() {\n      this.kittyKeyboardFlags = 0;\n      this.win32InputMode = false;\n      this.applicationCursorKeys = false;\n      this.bracketedPaste = false;\n      this.kittyKeyboardStack.length = 0;\n      this.pending = "";\n    }\n    getState() {\n      return {\n        kittyKeyboardFlags: this.kittyKeyboardFlags,\n        win32InputMode: this.win32InputMode,\n        applicationCursorKeys: this.applicationCursorKeys,\n        bracketedPaste: this.bracketedPaste\n      };\n    }\n    getKittyKeyboardFlags() {\n      return this.kittyKeyboardFlags;\n    }\n    supportsModifiedEnter() {\n      return terminalInputModeSupportsModifiedEnter(this.getState());\n    }\n    getPreamble() {\n      const parts = [];\n      if (this.kittyKeyboardFlags > 0) {\n        parts.push(`\\x1B[=${this.kittyKeyboardFlags};1u`);\n      }\n      if (this.win32InputMode) {\n        parts.push("\\x1B[?9001h");\n      }\n      if (this.applicationCursorKeys) {\n        parts.push("\\x1B[?1h");\n      }\n      if (this.bracketedPaste) {\n        parts.push("\\x1B[?2004h");\n      }\n      return parts.join("");\n    }\n    applyKittyKeyboardSequence(prefix, params) {\n      const previousFlags = this.kittyKeyboardFlags;\n      switch (prefix) {\n        case ">": {\n          this.kittyKeyboardStack.push(this.kittyKeyboardFlags);\n          this.kittyKeyboardFlags = parseFirstParam(params) ?? 1;\n          break;\n        }\n        case "=": {\n          const mode = parseSecondParam(params) ?? 1;\n          this.kittyKeyboardFlags = mode === 0 ? 0 : parseFirstParam(params) ?? 0;\n          break;\n        }\n        case "<": {\n          const count = Math.max(1, parseFirstParam(params) ?? 1);\n          for (let index = 0; index < count; index += 1) {\n            this.kittyKeyboardFlags = this.kittyKeyboardStack.pop() ?? 0;\n          }\n          break;\n        }\n        case "?":\n          return {\n            changed: false,\n            responses: [`\\x1B[?${this.kittyKeyboardFlags}u`]\n          };\n        default:\n          return { changed: false, responses: [] };\n      }\n      return {\n        changed: this.kittyKeyboardFlags !== previousFlags,\n        responses: []\n      };\n    }\n    applyPrivateModeSequence(params, final) {\n      const modes = parsePrivateModeParams(params);\n      let changed = false;\n      if (modes.has(WIN32_INPUT_MODE)) {\n        const previous = this.win32InputMode;\n        this.win32InputMode = final === "h";\n        changed = this.win32InputMode !== previous || changed;\n      }\n      if (modes.has(APPLICATION_CURSOR_KEYS_MODE)) {\n        const previous = this.applicationCursorKeys;\n        this.applicationCursorKeys = final === "h";\n        changed = this.applicationCursorKeys !== previous || changed;\n      }\n      if (modes.has(BRACKETED_PASTE_MODE)) {\n        const previous = this.bracketedPaste;\n        this.bracketedPaste = final === "h";\n        changed = this.bracketedPaste !== previous || changed;\n      }\n      return changed;\n    }\n  };\n\n  // src/utils/terminal-keys.ts\n  var MODIFIER_DOM_KEYS = /* @__PURE__ */ new Set(["Control", "Shift", "Alt", "Meta", "AltGraph", "OS"]);\n  var DOM_KEY_ALIASES = {\n    Esc: "Escape",\n    Left: "ArrowLeft",\n    Right: "ArrowRight",\n    Up: "ArrowUp",\n    Down: "ArrowDown",\n    Del: "Delete",\n    Spacebar: " ",\n    Space: " "\n  };\n  var SUPPORTED_SPECIAL_KEYS = /* @__PURE__ */ new Set([\n    "Enter",\n    "Tab",\n    "Backspace",\n    "Escape",\n    "ArrowUp",\n    "ArrowDown",\n    "ArrowLeft",\n    "ArrowRight",\n    "Home",\n    "End",\n    "Insert",\n    "Delete",\n    "PageUp",\n    "PageDown",\n    "F1",\n    "F2",\n    "F3",\n    "F4",\n    "F5",\n    "F6",\n    "F7",\n    "F8",\n    "F9",\n    "F10",\n    "F11",\n    "F12"\n  ]);\n  function isTerminalModifierDomKey(rawKey) {\n    return MODIFIER_DOM_KEYS.has(rawKey);\n  }\n  function normalizeDomTerminalKey(rawKey) {\n    if (!rawKey) {\n      return null;\n    }\n    const key = DOM_KEY_ALIASES[rawKey] ?? rawKey;\n    if (key === "Unidentified" || key === "Dead" || key === "Compose" || key === "Process") {\n      return null;\n    }\n    if (key.length === 1) {\n      return key;\n    }\n    if (SUPPORTED_SPECIAL_KEYS.has(key)) {\n      return key;\n    }\n    return null;\n  }\n  function normalizeTerminalTransportKey(key) {\n    if (key.length === 1) {\n      return key.toLowerCase();\n    }\n    return key;\n  }\n  function hasPendingTerminalModifiers(modifiers) {\n    return modifiers.ctrl || modifiers.shift || modifiers.alt;\n  }\n  function isAppleHandheldPlatform(input) {\n    const userAgent = input.userAgent ?? "";\n    const platform = input.platform ?? "";\n    const touchPoints = input.maxTouchPoints ?? 0;\n    if (/iPad|iPhone|iPod/.test(userAgent)) {\n      return true;\n    }\n    if (/Mac/i.test(platform) && touchPoints > 1) {\n      return true;\n    }\n    return false;\n  }\n  function shouldInterceptDomTerminalKey(args) {\n    if (hasPendingTerminalModifiers(args.pendingModifiers)) {\n      return true;\n    }\n    if (args.key === "Enter" && (args.shiftKey || args.ctrlKey || args.altKey || args.metaKey)) {\n      return Boolean(args.enhancedInputActive);\n    }\n    if (args.isAppleHandheld && args.ctrlKey && !args.metaKey && !args.altKey && !args.shiftKey && (args.key === "c" || args.key === "C")) {\n      return true;\n    }\n    return false;\n  }\n  function mergeTerminalModifiers(args) {\n    const { pendingModifiers, ctrlKey, shiftKey, altKey, metaKey } = args;\n    return {\n      ctrl: ctrlKey || pendingModifiers.ctrl,\n      shift: shiftKey || pendingModifiers.shift,\n      alt: altKey || pendingModifiers.alt,\n      meta: metaKey\n    };\n  }\n\n  // ../protocol/dist/terminal-snapshot.js\n  var DEFAULT_STYLE = {\n    fg: void 0,\n    bg: void 0,\n    fgMode: void 0,\n    bgMode: void 0,\n    bold: false,\n    italic: false,\n    underline: false,\n    dim: false,\n    inverse: false,\n    strikethrough: false\n  };\n  function renderTerminalSnapshotToAnsi(state) {\n    const rows = [...state.scrollback, ...state.grid];\n    const wrapFlags = [...state.scrollbackWrapped ?? [], ...state.gridWrapped ?? []];\n    const hasWrapInfo = wrapFlags.length === rows.length;\n    const lines = hasWrapInfo ? [] : ["\\x1B[?7l"];\n    for (let rowIndex = 0; rowIndex < rows.length; rowIndex += 1) {\n      const row = rows[rowIndex] ?? [];\n      const continuesToNextRow = hasWrapInfo && wrapFlags[rowIndex] === true;\n      lines.push(renderTerminalRow(row, continuesToNextRow ? state.cols : void 0));\n      if (rowIndex < rows.length - 1 && !continuesToNextRow) {\n        lines.push("\\r\\n");\n      }\n    }\n    lines.push("\\x1B[0m");\n    const cursorPresentationAnsi = renderCursorPresentationToAnsi(state.cursor);\n    if (cursorPresentationAnsi) {\n      lines.push(cursorPresentationAnsi);\n    }\n    lines.push(`\\x1B[${state.cursor.row + 1};${state.cursor.col + 1}H`);\n    lines.push(state.cursor.hidden ? "\\x1B[?25l" : "\\x1B[?25h");\n    if (!hasWrapInfo) {\n      lines.push("\\x1B[?7h");\n    }\n    return lines.join("");\n  }\n  function renderCursorPresentationToAnsi(cursor) {\n    if (!cursor.style) {\n      return null;\n    }\n    const cursorStyleCode = (() => {\n      if (cursor.style === "block") {\n        return cursor.blink === false ? 2 : 1;\n      }\n      if (cursor.style === "underline") {\n        return cursor.blink === false ? 4 : 3;\n      }\n      return cursor.blink === false ? 6 : 5;\n    })();\n    return `\\x1B[${cursorStyleCode} q`;\n  }\n  function renderTerminalRow(row, padToCols) {\n    const output = [];\n    const contentLength = getTerminalRowLength(row);\n    const length = padToCols !== void 0 ? Math.max(contentLength, padToCols) : contentLength;\n    let previousStyle = DEFAULT_STYLE;\n    for (let index = 0; index < length; index += 1) {\n      const cell = row[index] ?? { char: " " };\n      const nextStyle = getTerminalStyle(cell);\n      if (!terminalStylesEqual(previousStyle, nextStyle)) {\n        output.push(styleToAnsi(nextStyle));\n        previousStyle = nextStyle;\n      }\n      output.push(cell.char || " ");\n    }\n    if (!terminalStylesEqual(previousStyle, DEFAULT_STYLE)) {\n      output.push("\\x1B[0m");\n    }\n    return output.join("");\n  }\n  function getTerminalRowLength(row) {\n    for (let index = row.length - 1; index >= 0; index -= 1) {\n      const cell = row[index];\n      if (!cell) {\n        continue;\n      }\n      if (cell.char !== " ") {\n        return index + 1;\n      }\n      if (cell.fg !== void 0 || cell.bg !== void 0 || cell.fgMode !== void 0 || cell.bgMode !== void 0 || cell.bold || cell.italic || cell.underline || cell.dim || cell.inverse || cell.strikethrough) {\n        return index + 1;\n      }\n    }\n    return 0;\n  }\n  function getTerminalStyle(cell) {\n    return {\n      fg: cell.fg,\n      bg: cell.bg,\n      fgMode: cell.fgMode,\n      bgMode: cell.bgMode,\n      bold: Boolean(cell.bold),\n      italic: Boolean(cell.italic),\n      underline: Boolean(cell.underline),\n      dim: Boolean(cell.dim),\n      inverse: Boolean(cell.inverse),\n      strikethrough: Boolean(cell.strikethrough)\n    };\n  }\n  function terminalStylesEqual(left, right) {\n    return left.fg === right.fg && left.bg === right.bg && left.fgMode === right.fgMode && left.bgMode === right.bgMode && left.bold === right.bold && left.italic === right.italic && left.underline === right.underline && left.dim === right.dim && left.inverse === right.inverse && left.strikethrough === right.strikethrough;\n  }\n  function styleToAnsi(style) {\n    const codes = ["0"];\n    if (style.bold) {\n      codes.push("1");\n    }\n    if (style.dim) {\n      codes.push("2");\n    }\n    if (style.italic) {\n      codes.push("3");\n    }\n    if (style.underline) {\n      codes.push("4");\n    }\n    if (style.inverse) {\n      codes.push("7");\n    }\n    if (style.strikethrough) {\n      codes.push("9");\n    }\n    if (style.fg !== void 0 && style.fgMode !== void 0) {\n      codes.push(...colorToSgr(style.fgMode, style.fg, false));\n    }\n    if (style.bg !== void 0 && style.bgMode !== void 0) {\n      codes.push(...colorToSgr(style.bgMode, style.bg, true));\n    }\n    return `\\x1B[${codes.join(";")}m`;\n  }\n  function colorToSgr(mode, value, background) {\n    if (mode === 1) {\n      if (value >= 8) {\n        return [String((background ? 100 : 90) + (value - 8))];\n      }\n      return [String((background ? 40 : 30) + value)];\n    }\n    if (mode === 2) {\n      return [background ? "48" : "38", "5", String(value)];\n    }\n    if (mode === 3) {\n      return [\n        background ? "48" : "38",\n        "2",\n        String(value >> 16 & 255),\n        String(value >> 8 & 255),\n        String(value & 255)\n      ];\n    }\n    return [];\n  }\n\n  // src/terminal/local-links/terminal-local-link-parsing.ts\n  var linkSuffixRegexEol = generateLinkSuffixRegex(true);\n  var linkSuffixRegex = generateLinkSuffixRegex(false);\n  function generateLinkSuffixRegex(eolOnly) {\n    let rowIndex = 0;\n    let colIndex = 0;\n    let rowEndIndex = 0;\n    let colEndIndex = 0;\n    const row = () => `(?<row${rowIndex++}>\\\\d+)`;\n    const col = () => `(?<col${colIndex++}>\\\\d+)`;\n    const rowEnd = () => `(?<rowEnd${rowEndIndex++}>\\\\d+)`;\n    const colEnd = () => `(?<colEnd${colEndIndex++}>\\\\d+)`;\n    const eolSuffix = eolOnly ? "$" : "";\n    const clauses = [\n      `(?::|#| |[\'"],|, )${row()}([:.]${col()}(?:-(?:${rowEnd()}\\\\.)?${colEnd()})?)?${eolSuffix}`,\n      `[\'"]?(?:,? |: ?| on )lines? ${row()}(?:-${rowEnd()})?(?:,? (?:col(?:umn)?|characters?) ${col()}(?:-${colEnd()})?)?${eolSuffix}`,\n      `:? ?[\\\\[\\\\(]${row()}(?:(?:, ?|:)${col()})?[\\\\]\\\\)]${eolSuffix}`\n    ];\n    return new RegExp(`(${clauses.join("|").replace(/ /g, "[\\xA0 ]")})`, eolOnly ? void 0 : "g");\n  }\n  function detectLinkSuffixes(line) {\n    const results = [];\n    linkSuffixRegex.lastIndex = 0;\n    let match;\n    while ((match = linkSuffixRegex.exec(line)) !== null) {\n      const suffix = toLinkSuffix(match);\n      if (!suffix) {\n        break;\n      }\n      results.push(suffix);\n    }\n    return results;\n  }\n  function toLinkSuffix(match) {\n    const groups = match?.groups;\n    if (!groups || match.length < 1) {\n      return null;\n    }\n    return {\n      row: parseIntOptional(groups.row0 || groups.row1 || groups.row2),\n      col: parseIntOptional(groups.col0 || groups.col1 || groups.col2),\n      rowEnd: parseIntOptional(groups.rowEnd0 || groups.rowEnd1 || groups.rowEnd2),\n      colEnd: parseIntOptional(groups.colEnd0 || groups.colEnd1 || groups.colEnd2),\n      suffix: { index: match.index, text: match[0] }\n    };\n  }\n  function parseIntOptional(value) {\n    return value === void 0 ? void 0 : parseInt(value, 10);\n  }\n  var linkWithSuffixPathCharacters = /(?<path>(?:file:\\/\\/\\/)?[^\\s|<>[({][^\\s|<>]*)$/;\n  var unixLocalLinkClause = `(?:(?:${"(?:\\\\.\\\\.?|\\\\~|file:\\\\/\\\\/)" /* PathPrefix */}|(?:${"[^\\\\0<>\\\\?\\\\s!`&*()\\\\[\\\\]\'\\":;\\\\\\\\]" /* ExcludedStartPathCharactersClause */}${"[^\\\\0<>\\\\?\\\\s!`&*()\'\\":;\\\\\\\\]" /* ExcludedPathCharactersClause */}*))?(?:${"\\\\/" /* PathSeparatorClause */}(?:${"[^\\\\0<>\\\\?\\\\s!`&*()\'\\":;\\\\\\\\]" /* ExcludedPathCharactersClause */})+)+)`;\n  var winDrivePrefix = "(?:\\\\\\\\\\\\\\\\\\\\?\\\\\\\\|file:\\\\/\\\\/\\\\/)?[a-zA-Z]:";\n  var winLocalLinkClause = `(?:(?:(?:${winDrivePrefix}|${"\\\\.\\\\.?|\\\\~" /* WinOtherPathPrefix */})|(?:${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\\\\[\\\\]\'\\":;]" /* WinExcludedStartPathCharactersClause */}${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\'\\":;]" /* WinExcludedPathCharactersClause */}*))?(?:${"(?:\\\\\\\\|\\\\/)" /* WinPathSeparatorClause */}(?:${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\'\\":;]" /* WinExcludedPathCharactersClause */})+)+)`;\n  function detectTerminalLocalLinks(line) {\n    const results = detectLinksViaSuffix(line);\n    insertNonConflicting(results, detectPathsNoSuffix(line, unixLocalLinkClause));\n    insertNonConflicting(results, detectPathsNoSuffix(line, winLocalLinkClause));\n    return results;\n  }\n  function detectLinksViaSuffix(line) {\n    const results = [];\n    const suffixes = detectLinkSuffixes(line);\n    for (const suffix of suffixes) {\n      results.push(...detectLinksForSuffix(line, suffix));\n    }\n    return results;\n  }\n  function detectLinksForSuffix(line, suffix) {\n    const beforeSuffix = line.substring(0, suffix.suffix.index);\n    const possiblePathMatch = beforeSuffix.match(linkWithSuffixPathCharacters);\n    if (!possiblePathMatch?.groups?.path || possiblePathMatch.index === void 0) {\n      return [];\n    }\n    const pathWithPrefix = trimPathPrefix({\n      path: possiblePathMatch.groups.path,\n      startIndex: possiblePathMatch.index,\n      suffix\n    });\n    if (!pathWithPrefix) {\n      return [];\n    }\n    const pathIndex = pathWithPrefix.startIndex + (pathWithPrefix.prefix?.text.length ?? 0);\n    const links = [\n      {\n        path: {\n          index: pathIndex,\n          text: pathWithPrefix.path\n        },\n        prefix: pathWithPrefix.prefix,\n        suffix\n      }\n    ];\n    for (const match of pathWithPrefix.path.matchAll(/(?<bracket>[[(])/g)) {\n      const bracket = match.groups?.bracket;\n      if (!bracket) {\n        continue;\n      }\n      const nextCharacter = pathWithPrefix.path[match.index + bracket.length];\n      if (nextCharacter === "]" || nextCharacter === ")") {\n        continue;\n      }\n      links.push({\n        path: {\n          index: pathIndex + match.index + 1,\n          text: pathWithPrefix.path.substring(match.index + bracket.length)\n        },\n        prefix: pathWithPrefix.prefix,\n        suffix\n      });\n    }\n    return links;\n  }\n  function trimPathPrefix(input) {\n    const prefixMatch = input.path.match(/^(?<prefix>[\'"]+)/);\n    if (!prefixMatch?.groups?.prefix) {\n      return { path: input.path, startIndex: input.startIndex };\n    }\n    const prefix = {\n      index: input.startIndex,\n      text: prefixMatch.groups.prefix\n    };\n    const path = input.path.substring(prefix.text.length);\n    if (path.trim().length === 0) {\n      return null;\n    }\n    const trimPrefixAmount = getTrimPrefixAmount(prefix.text, input.suffix);\n    if (trimPrefixAmount === 0) {\n      return { path, startIndex: input.startIndex, prefix };\n    }\n    prefix.index += trimPrefixAmount;\n    prefix.text = prefix.text[prefix.text.length - 1] ?? prefix.text;\n    return { path, startIndex: input.startIndex + trimPrefixAmount, prefix };\n  }\n  function getTrimPrefixAmount(prefixText, suffix) {\n    const suffixQuote = suffix.suffix.text[0];\n    if (prefixText.length > 1 && suffixQuote?.match(/[\'"]/) && prefixText[prefixText.length - 1] === suffixQuote) {\n      return prefixText.length - 1;\n    }\n    return 0;\n  }\n  function detectPathsNoSuffix(line, clause) {\n    const results = [];\n    const regex = new RegExp(clause, "g");\n    let match;\n    while ((match = regex.exec(line)) !== null) {\n      let text = match[0];\n      let index = match.index;\n      if (!text) {\n        break;\n      }\n      if ((line.startsWith("--- a/") || line.startsWith("+++ b/")) && index === 4 || line.startsWith("diff --git") && (text.startsWith("a/") || text.startsWith("b/"))) {\n        text = text.substring(2);\n        index += 2;\n      }\n      results.push({\n        path: { index, text },\n        prefix: void 0,\n        suffix: void 0\n      });\n    }\n    return results;\n  }\n  function insertNonConflicting(list, newItems) {\n    for (const item of newItems) {\n      const start = item.path.index;\n      const end = item.path.index + item.path.text.length;\n      const hasConflict = list.some((existing) => {\n        const existingStart = existing.path.index;\n        const existingEnd = existing.suffix?.suffix.index !== void 0 ? existing.suffix.suffix.index + existing.suffix.suffix.text.length : existing.path.index + existing.path.text.length;\n        return start < existingEnd && end > existingStart;\n      });\n      if (!hasConflict) {\n        list.push(item);\n      }\n    }\n    list.sort((left, right) => left.path.index - right.path.index);\n  }\n\n  // src/terminal/local-links/terminal-local-link-provider.ts\n  var MAX_LINE_LENGTH = 2e3;\n  var MAX_LINK_LENGTH = 500;\n  var MAX_RESOLVED_LINKS_IN_LINE = 10;\n  function createTerminalLocalFileLinkProvider(terminal, options) {\n    return new TerminalLocalFileLinkProvider(terminal, options);\n  }\n  var TerminalLocalFileLinkProvider = class {\n    constructor(terminal, options) {\n      this.terminal = terminal;\n      this.options = options;\n    }\n    terminal;\n    options;\n    activeRequests = /* @__PURE__ */ new Map();\n    async provideLinks(bufferLineNumber, callback) {\n      let activeRequest = this.activeRequests.get(bufferLineNumber);\n      if (activeRequest) {\n        callback(await activeRequest);\n        return;\n      }\n      activeRequest = this.provideLinksForLine(bufferLineNumber);\n      this.activeRequests.set(bufferLineNumber, activeRequest);\n      const links = await activeRequest;\n      this.activeRequests.delete(bufferLineNumber);\n      callback(links.length > 0 ? links : void 0);\n    }\n    async provideLinksForLine(bufferLineNumber) {\n      const windowed = getWindowedLineContent(this.terminal, bufferLineNumber - 1);\n      if (!windowed || windowed.text.length === 0 || windowed.text.length > MAX_LINE_LENGTH) {\n        return [];\n      }\n      const parsedLinks = detectTerminalLocalLinks(windowed.text);\n      const links = [];\n      let resolvedLinkCount = 0;\n      for (const parsedLink of parsedLinks) {\n        if (parsedLink.path.text.length > MAX_LINK_LENGTH) {\n          continue;\n        }\n        const source = toLinkSource(windowed.text, parsedLink);\n        if (!source) {\n          continue;\n        }\n        const target = await this.options.resolveLink(source);\n        if (!target) {\n          continue;\n        }\n        const range = toBufferRange({\n          terminal: this.terminal,\n          startLine: windowed.startLine,\n          startIndex: parsedLink.prefix?.index ?? parsedLink.path.index,\n          endIndex: getParsedLinkEndIndex(parsedLink)\n        });\n        if (!range) {\n          continue;\n        }\n        links.push(createLocalFileLink({ range, source, target, options: this.options }));\n        resolvedLinkCount += 1;\n        if (resolvedLinkCount >= MAX_RESOLVED_LINKS_IN_LINE) {\n          break;\n        }\n      }\n      return links;\n    }\n  };\n  function createLocalFileLink(input) {\n    return {\n      range: input.range,\n      text: input.source.text,\n      decorations: {\n        pointerCursor: true,\n        underline: true\n      },\n      activate: (event) => {\n        event.preventDefault();\n        const disposition = event.metaKey || event.ctrlKey ? "side" : "main";\n        input.options.openLink(input.target, disposition, event);\n      }\n    };\n  }\n  function toLinkSource(lineText, parsedLink) {\n    const path = trimLikelyTrailingPunctuation(parsedLink.path.text);\n    if (!path || path.length !== parsedLink.path.text.length) {\n      return null;\n    }\n    const lineStart = parsedLink.suffix?.row;\n    const lineEnd = parsedLink.suffix?.rowEnd;\n    const text = formatLinkSourceText({ path, suffix: parsedLink.suffix });\n    if (!text) {\n      return null;\n    }\n    const rawLinkText = lineText.slice(\n      parsedLink.prefix?.index ?? parsedLink.path.index,\n      getParsedLinkEndIndex(parsedLink)\n    );\n    if (!rawLinkText.trim()) {\n      return null;\n    }\n    return {\n      text,\n      path,\n      ...lineStart ? { lineStart } : {},\n      ...lineEnd && lineStart && lineEnd >= lineStart ? { lineEnd } : {}\n    };\n  }\n  function formatLinkSourceText(input) {\n    const { path, suffix } = input;\n    if (!suffix?.row) {\n      return path;\n    }\n    let text = `${path}:${suffix.row}`;\n    if (suffix.col) {\n      text += `:${suffix.col}`;\n    }\n    if (suffix.rowEnd) {\n      text += `-${suffix.rowEnd}`;\n      if (suffix.colEnd) {\n        text += `:${suffix.colEnd}`;\n      }\n    }\n    return text;\n  }\n  function trimLikelyTrailingPunctuation(value) {\n    return value.replace(/[\\][["\'.]+$/, "");\n  }\n  function getParsedLinkEndIndex(parsedLink) {\n    if (parsedLink.suffix) {\n      return parsedLink.suffix.suffix.index + parsedLink.suffix.suffix.text.length;\n    }\n    return parsedLink.path.index + parsedLink.path.text.length;\n  }\n  function getWindowedLineContent(terminal, requestedLine) {\n    let startLine = requestedLine;\n    let endLine = requestedLine;\n    const line = terminal.buffer.active.getLine(requestedLine);\n    if (!line) {\n      return null;\n    }\n    const lineStrings = [];\n    let contextLength = 0;\n    while (startLine > 0 && terminal.buffer.active.getLine(startLine)?.isWrapped && contextLength < MAX_LINK_LENGTH) {\n      startLine -= 1;\n      const previous = terminal.buffer.active.getLine(startLine);\n      if (!previous) {\n        break;\n      }\n      contextLength += previous.translateToString(true).length;\n    }\n    for (let y5 = startLine; y5 <= endLine; y5 += 1) {\n      const current = terminal.buffer.active.getLine(y5);\n      if (current) {\n        lineStrings.push(current.translateToString(true));\n      }\n    }\n    contextLength = 0;\n    while (endLine + 1 < terminal.buffer.active.length && terminal.buffer.active.getLine(endLine + 1)?.isWrapped && contextLength < MAX_LINK_LENGTH) {\n      endLine += 1;\n      const next = terminal.buffer.active.getLine(endLine);\n      if (!next) {\n        break;\n      }\n      const nextText = next.translateToString(true);\n      contextLength += nextText.length;\n      lineStrings.push(nextText);\n    }\n    return {\n      text: lineStrings.join(""),\n      startLine\n    };\n  }\n  function toBufferRange(input) {\n    const start = mapStringOffsetToBuffer(input.terminal, input.startLine, input.startIndex);\n    if (!start) {\n      return null;\n    }\n    const end = mapStringOffsetToBuffer(input.terminal, input.startLine, input.endIndex);\n    if (!start || !end) {\n      return null;\n    }\n    return {\n      start: { x: start.x + 1, y: start.y + 1 },\n      end: { x: end.x, y: end.y + 1 }\n    };\n  }\n  function mapStringOffsetToBuffer(terminal, startLine, offset) {\n    const buffer = terminal.buffer.active;\n    const cell = buffer.getNullCell();\n    let y5 = startLine;\n    let charsRemaining = offset;\n    while (true) {\n      const line = buffer.getLine(y5);\n      if (!line) {\n        return null;\n      }\n      for (let column = 0; column < line.length; column += 1) {\n        if (charsRemaining <= 0) {\n          return { y: y5, x: column };\n        }\n        const currentCell = line.getCell(column, cell);\n        const chars = currentCell?.getChars() ?? "";\n        const width = currentCell?.getWidth() ?? 0;\n        if (width) {\n          charsRemaining -= chars.length || 1;\n          if (isWrappedWideCharacterContinuation({\n            buffer,\n            cell,\n            lineLength: line.length,\n            column,\n            y: y5,\n            chars\n          })) {\n            charsRemaining += 1;\n          }\n        }\n        if (charsRemaining <= 0) {\n          return { y: y5, x: column + width };\n        }\n      }\n      if (charsRemaining <= 0) {\n        return { y: y5, x: line.length };\n      }\n      y5 += 1;\n    }\n  }\n  function isWrappedWideCharacterContinuation(input) {\n    if (input.column !== input.lineLength - 1 || input.chars !== "") {\n      return false;\n    }\n    const nextLine = input.buffer.getLine(input.y + 1);\n    const nextCell = nextLine?.getCell(0, input.cell);\n    return Boolean(nextLine?.isWrapped && nextCell?.getWidth() === 2);\n  }\n\n  // src/terminal/runtime/terminal-font.ts\n  var DEFAULT_TERMINAL_FONT_SIZE = 13;\n  var DEFAULT_TERMINAL_FONT_FAMILY = [\n    // Prefer common developer fonts, with Nerd Font variants for prompt/TUI glyphs.\n    "JetBrains Mono",\n    "JetBrainsMono Nerd Font",\n    "JetBrainsMono NF",\n    "MesloLGM Nerd Font",\n    "MesloLGM NF",\n    "Hack Nerd Font",\n    "FiraCode Nerd Font",\n    // PUA-only fallback (many Nerd glyphs live here on some systems).\n    "Symbols Nerd Font",\n    // System fallbacks.\n    "SF Mono",\n    "Menlo",\n    "Monaco",\n    "Consolas",\n    "\'Liberation Mono\'",\n    "monospace"\n  ].join(", ");\n  function resolveTerminalFontFamily(fontFamily) {\n    const trimmed = fontFamily?.trim();\n    return trimmed && trimmed.length > 0 ? trimmed : DEFAULT_TERMINAL_FONT_FAMILY;\n  }\n  function resolveTerminalFontSize(fontSize) {\n    return typeof fontSize === "number" && Number.isFinite(fontSize) && fontSize > 0 ? fontSize : DEFAULT_TERMINAL_FONT_SIZE;\n  }\n\n  // src/terminal/runtime/terminal-emulator-runtime.ts\n  function createTerminalResizeEvent(input) {\n    return {\n      rows: input.rows,\n      cols: input.cols,\n      shouldClaim: input.shouldClaim,\n      forceClaim: input.shouldClaim && input.forceClaim\n    };\n  }\n  var isMac = typeof navigator !== "undefined" && (/Macintosh|Mac OS/i.test(navigator.userAgent ?? "") || /Mac/i.test(navigator.platform ?? ""));\n  var isAppleHandheld = typeof navigator !== "undefined" && isAppleHandheldPlatform({\n    userAgent: navigator.userAgent,\n    platform: navigator.platform,\n    maxTouchPoints: navigator.maxTouchPoints\n  });\n  var DEFAULT_TOUCH_SCROLL_LINE_HEIGHT_PX = 18;\n  var FIT_TIMEOUT_DELAYS_MS = [0, 16, 48, 120, 250, 500, 1e3, 2e3];\n  var OUTPUT_OPERATION_TIMEOUT_MS = 5e3;\n  var EMPTY_TERMINAL_OUTPUT = new Uint8Array(0);\n  var RESET_TERMINAL_OUTPUT = new Uint8Array([27, 99]);\n  var terminalOutputEncoder = new TextEncoder();\n  function encodeTerminalOutput(text) {\n    return terminalOutputEncoder.encode(text);\n  }\n  function prependTerminalOutput(prefix, data) {\n    const output = new Uint8Array(prefix.length + data.length);\n    output.set(prefix, 0);\n    output.set(data, prefix.length);\n    return output;\n  }\n  function withOverviewRulerBorderHidden(theme) {\n    return {\n      ...theme,\n      overviewRulerBorder: theme.background ?? "transparent"\n    };\n  }\n  var TerminalEmulatorRuntime = class {\n    callbacks = {};\n    pendingModifiers = {\n      ctrl: false,\n      shift: false,\n      alt: false\n    };\n    terminal = null;\n    fitAddon = null;\n    fitAndEmitResize = null;\n    lastSize = null;\n    cleanup = null;\n    outputOperations = [];\n    inFlightOutputOperation = null;\n    inFlightOutputOperationTimeout = null;\n    // Plain writes are submitted to xterm without waiting, so their onCommitted callbacks are\n    // pending until xterm commits the write. unmount() disposes xterm before those fire, so we\n    // track them here to flush remaining callbacks and avoid stalling upstream backpressure.\n    pendingWriteCommits = /* @__PURE__ */ new Set();\n    // True once a plain write has been submitted to xterm that no later barrier has gated\n    // yet. A barrier only needs the sentinel-write gate when this is set; at mount or right\n    // after another barrier it\'s false and the barrier applies immediately, saving a parse\n    // cycle of latency. Cleared when a barrier starts (it gates every write before it).\n    hasUngatedWrites = false;\n    inputModeDecoder = new TextDecoder();\n    suppressInput = false;\n    inputModeTracker = new TerminalInputModeTracker();\n    lastInputModeState = this.inputModeTracker.getState();\n    themeBackgroundElements = [];\n    handleVisibilityRestore = () => {\n      if (typeof document !== "undefined" && document.visibilityState !== "visible") {\n        return;\n      }\n      this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      if (typeof window.requestAnimationFrame === "function") {\n        window.requestAnimationFrame(() => {\n          this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n        });\n      }\n    };\n    setCallbacks(input) {\n      this.callbacks = input.callbacks;\n    }\n    setPendingModifiers(input) {\n      this.pendingModifiers = input.pendingModifiers;\n    }\n    getInputModeState() {\n      return this.inputModeTracker.getState();\n    }\n    mount(input) {\n      this.unmount();\n      input.host.innerHTML = "";\n      this.lastSize = null;\n      this.inputModeTracker.reset();\n      this.emitInputModeChange();\n      const terminal = new Vn2({\n        allowProposedApi: true,\n        convertEol: false,\n        cursorBlink: true,\n        cursorStyle: "bar",\n        fontFamily: resolveTerminalFontFamily(input.fontFamily),\n        fontSize: resolveTerminalFontSize(input.fontSize),\n        lineHeight: 1,\n        macOptionIsMeta: true,\n        minimumContrastRatio: 1,\n        rescaleOverlappingGlyphs: true,\n        scrollbar: {\n          width: 8\n        },\n        scrollback: input.scrollback,\n        theme: withOverviewRulerBorderHidden(input.theme)\n      });\n      const fitAddon = new l();\n      const unicode11Addon = new I3();\n      let webglAddon = null;\n      let imageAddon = null;\n      terminal.loadAddon(fitAddon);\n      terminal.loadAddon(unicode11Addon);\n      terminal.loadAddon(\n        new L3((event, uri) => {\n          event.preventDefault();\n          void this.callbacks.onOpenExternalUrl?.(uri);\n        })\n      );\n      const localFileLinkProvider = terminal.registerLinkProvider(\n        createTerminalLocalFileLinkProvider(terminal, {\n          resolveLink: async (source) => {\n            const target = await this.callbacks.onResolveLocalFileLink?.(source);\n            return target ?? null;\n          },\n          openLink: (target, disposition) => {\n            void this.callbacks.onOpenLocalFileLink?.(target, disposition);\n          }\n        })\n      );\n      terminal.loadAddon(new A2({ highlightLimit: 2e4 }));\n      terminal.loadAddon(new j());\n      try {\n        terminal.loadAddon(new sa());\n      } catch {\n      }\n      terminal.open(input.host);\n      this.themeBackgroundElements = this.collectThemeBackgroundElements(input);\n      this.applyThemeBackground(input.theme);\n      try {\n        terminal.unicode.activeVersion = "11";\n      } catch {\n      }\n      const disposeImageAddon = () => {\n        try {\n          imageAddon?.dispose();\n        } catch {\n        }\n        imageAddon = null;\n      };\n      const disposeWebglRenderer = () => {\n        if (!webglAddon) {\n          return;\n        }\n        try {\n          webglAddon.dispose();\n        } catch {\n        }\n        webglAddon = null;\n        disposeImageAddon();\n        this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      };\n      const registerProtocolQuerySuppression = () => {\n        terminal.parser.registerCsiHandler({ final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: ">", final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: "=", final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ final: "n" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: "?", final: "n" }, () => true);\n        terminal.parser.registerCsiHandler({ final: "R" }, () => true);\n        terminal.parser.registerCsiHandler({ intermediates: "$", final: "p" }, () => true);\n        terminal.parser.registerCsiHandler(\n          { prefix: "?", intermediates: "$", final: "p" },\n          () => true\n        );\n        for (const code of [10, 11, 12]) {\n          terminal.parser.registerOscHandler(code, (data) => data.trim() === "?");\n        }\n      };\n      registerProtocolQuerySuppression();\n      let webglAddonRaf = requestAnimationFrame(() => {\n        webglAddonRaf = null;\n        try {\n          disposeWebglRenderer();\n          webglAddon = new bt2();\n          webglAddon.onContextLoss(() => {\n            disposeWebglRenderer();\n          });\n          terminal.loadAddon(webglAddon);\n          imageAddon = new je();\n          terminal.loadAddon(imageAddon);\n          registerProtocolQuerySuppression();\n          this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n        } catch {\n          disposeWebglRenderer();\n        }\n      });\n      const restoreDocumentStyles = this.applyDocumentBoundsStyles({\n        root: input.root\n      });\n      const restoreViewportStyles = this.applyViewportTouchStyles({\n        host: input.host\n      });\n      this.terminal = terminal;\n      this.fitAddon = fitAddon;\n      window.__paseoTerminal = terminal;\n      const fitAndEmitResize = (resizeInput) => {\n        const forceRefresh = resizeInput?.forceRefresh ?? false;\n        const shouldClaim = resizeInput?.shouldClaim ?? true;\n        const forceClaim = resizeInput?.forceClaim ?? false;\n        const currentTerminal = this.terminal;\n        const currentFitAddon = this.fitAddon;\n        if (!currentTerminal || !currentFitAddon) {\n          return;\n        }\n        if (input.root.offsetWidth === 0 || input.root.offsetHeight === 0) {\n          return;\n        }\n        try {\n          currentFitAddon.fit();\n        } catch {\n          return;\n        }\n        const nextRows = currentTerminal.rows;\n        const nextCols = currentTerminal.cols;\n        const previous = this.lastSize;\n        if (!forceRefresh && !forceClaim && previous && previous.rows === nextRows && previous.cols === nextCols) {\n          return;\n        }\n        this.lastSize = { rows: nextRows, cols: nextCols };\n        this.refreshVisibleRows();\n        this.callbacks.onResize?.(\n          createTerminalResizeEvent({\n            rows: nextRows,\n            cols: nextCols,\n            shouldClaim,\n            forceClaim\n          })\n        );\n      };\n      this.fitAndEmitResize = fitAndEmitResize;\n      fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      const inputDisposable = terminal.onData((data) => {\n        if (this.suppressInput) {\n          return;\n        }\n        this.callbacks.onInput?.(data);\n      });\n      terminal.attachCustomKeyEventHandler((event) => {\n        if (event.type !== "keydown" || event.isComposing) {\n          return true;\n        }\n        if (!isMac && event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey) {\n          const key = event.key.toLowerCase();\n          if (key === "c" && terminal.hasSelection()) {\n            void navigator.clipboard.writeText(terminal.getSelection());\n            return false;\n          }\n          if (key === "v") {\n            event.preventDefault();\n            void navigator.clipboard.readText().then((text) => {\n              if (text) {\n                terminal.paste(text);\n              }\n              return;\n            });\n            return false;\n          }\n          return true;\n        }\n        const normalizedKey = normalizeDomTerminalKey(event.key);\n        if (!normalizedKey || isTerminalModifierDomKey(event.key)) {\n          return true;\n        }\n        if (!shouldInterceptDomTerminalKey({\n          key: normalizedKey,\n          ctrlKey: event.ctrlKey,\n          shiftKey: event.shiftKey,\n          altKey: event.altKey,\n          metaKey: event.metaKey,\n          pendingModifiers: this.pendingModifiers,\n          enhancedInputActive: this.inputModeTracker.supportsModifiedEnter(),\n          isAppleHandheld\n        })) {\n          return true;\n        }\n        const modifiers = mergeTerminalModifiers({\n          pendingModifiers: this.pendingModifiers,\n          ctrlKey: event.ctrlKey,\n          shiftKey: event.shiftKey,\n          altKey: event.altKey,\n          metaKey: event.metaKey\n        });\n        this.callbacks.onTerminalKey?.({\n          key: normalizeTerminalTransportKey(normalizedKey),\n          ...modifiers\n        });\n        if (this.pendingModifiers.ctrl || this.pendingModifiers.shift || this.pendingModifiers.alt) {\n          this.callbacks.onPendingModifiersConsumed?.();\n        }\n        event.preventDefault();\n        event.stopPropagation();\n        return false;\n      });\n      const removeTouchListeners = this.setupTouchScrollHandlers({\n        root: input.root,\n        host: input.host,\n        terminal\n      });\n      const resizeObserver = new ResizeObserver(() => {\n        fitAndEmitResize({ shouldClaim: false });\n      });\n      resizeObserver.observe(input.root);\n      resizeObserver.observe(input.host);\n      const windowResizeHandler = () => {\n        fitAndEmitResize({ shouldClaim: false });\n      };\n      window.addEventListener("resize", windowResizeHandler);\n      const windowFocusHandler = () => {\n        this.handleVisibilityRestore();\n      };\n      window.addEventListener("focus", windowFocusHandler);\n      const documentVisibilityChangeHandler = () => {\n        this.handleVisibilityRestore();\n      };\n      document.addEventListener("visibilitychange", documentVisibilityChangeHandler);\n      const visualViewport = window.visualViewport;\n      const visualViewportResizeHandler = () => {\n        fitAndEmitResize({ shouldClaim: false });\n      };\n      visualViewport?.addEventListener("resize", visualViewportResizeHandler);\n      const fitTimeouts = FIT_TIMEOUT_DELAYS_MS.map(\n        (delayMs) => window.setTimeout(() => {\n          fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n        }, delayMs)\n      );\n      const fontSet = document.fonts;\n      const fontReadyHandler = () => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      };\n      fontSet?.addEventListener?.("loadingdone", fontReadyHandler);\n      void fontSet?.ready.then(() => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n        return;\n      }).catch(() => {\n      });\n      window.setTimeout(() => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      }, 0);\n      if (input.initialSnapshot) {\n        this.renderSnapshot({ state: input.initialSnapshot });\n      }\n      this.processOutputQueue();\n      const disposables = {\n        disposeInput: () => {\n          inputDisposable.dispose();\n        },\n        disconnectResizeObserver: () => {\n          resizeObserver.disconnect();\n        },\n        removeWindowResize: () => {\n          window.removeEventListener("resize", windowResizeHandler);\n        },\n        removeWindowFocus: () => {\n          window.removeEventListener("focus", windowFocusHandler);\n        },\n        removeDocumentVisibilityChange: () => {\n          document.removeEventListener("visibilitychange", documentVisibilityChangeHandler);\n        },\n        removeVisualViewportResize: () => {\n          visualViewport?.removeEventListener("resize", visualViewportResizeHandler);\n        },\n        clearFitTimeouts: () => {\n          for (const handle of fitTimeouts) {\n            window.clearTimeout(handle);\n          }\n        },\n        removeFontListeners: () => {\n          fontSet?.removeEventListener?.("loadingdone", fontReadyHandler);\n        },\n        removeTouchListeners,\n        restoreDocumentStyles,\n        restoreViewportStyles,\n        disposeFitAddon: () => {\n          fitAddon.dispose();\n        },\n        disposeWebglAddon: () => {\n          if (webglAddonRaf !== null) {\n            cancelAnimationFrame(webglAddonRaf);\n            webglAddonRaf = null;\n          }\n          disposeWebglRenderer();\n          disposeImageAddon();\n        },\n        disposeTerminal: () => {\n          localFileLinkProvider.dispose();\n          terminal.dispose();\n        }\n      };\n      this.cleanup = () => {\n        disposables.disposeInput();\n        disposables.disconnectResizeObserver();\n        disposables.removeWindowResize();\n        disposables.removeWindowFocus();\n        disposables.removeDocumentVisibilityChange();\n        disposables.removeVisualViewportResize();\n        disposables.clearFitTimeouts();\n        disposables.removeFontListeners();\n        disposables.removeTouchListeners();\n        disposables.disposeFitAddon();\n        disposables.disposeWebglAddon();\n        disposables.disposeTerminal();\n        disposables.restoreDocumentStyles();\n        disposables.restoreViewportStyles();\n      };\n    }\n    write(input) {\n      if (input.data.length === 0) {\n        input.onCommitted?.();\n        return;\n      }\n      this.outputOperations.push({\n        type: "write",\n        data: input.data,\n        suppressInput: input.suppressInput ?? false,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    clear(input) {\n      this.outputOperations.push({\n        type: "clear",\n        data: EMPTY_TERMINAL_OUTPUT,\n        suppressInput: false,\n        ...input?.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    paste(text) {\n      this.terminal?.paste(text);\n    }\n    renderSnapshot(input) {\n      if (!input.state) {\n        this.clear(input);\n        return;\n      }\n      this.restoreOutput({\n        data: encodeTerminalOutput(renderTerminalSnapshotToAnsi(input.state)),\n        rows: input.state.rows,\n        cols: input.state.cols,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n    }\n    restoreOutput(input) {\n      this.outputOperations.push({\n        type: "snapshot",\n        data: prependTerminalOutput(RESET_TERMINAL_OUTPUT, input.data),\n        rows: input.rows,\n        cols: input.cols,\n        suppressInput: true,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    resize(input) {\n      this.fitAndEmitResize?.(input);\n    }\n    setTheme(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.theme = withOverviewRulerBorderHidden(input.theme);\n      } catch {\n        return;\n      }\n      this.applyThemeBackground(input.theme);\n      this.refreshVisibleRows();\n    }\n    setScrollback(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.scrollback = input.lines;\n      } catch {\n        return;\n      }\n      this.refreshVisibleRows();\n    }\n    setFont(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.fontFamily = resolveTerminalFontFamily(input.fontFamily);\n        terminal.options.fontSize = resolveTerminalFontSize(input.fontSize);\n      } catch {\n        return;\n      }\n      this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      this.refreshVisibleRows();\n    }\n    focus(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      if (input?.forceRefocus) {\n        terminal.blur();\n      }\n      terminal.focus();\n    }\n    blur() {\n      this.terminal?.blur();\n    }\n    refreshVisibleRows() {\n      const terminal = this.terminal;\n      if (!terminal || terminal.rows <= 0) {\n        return;\n      }\n      try {\n        terminal.refresh(0, terminal.rows - 1);\n      } catch {\n      }\n    }\n    collectThemeBackgroundElements(input) {\n      return [\n        input.root,\n        input.host,\n        ...Array.from(\n          input.host.querySelectorAll(".xterm, .xterm-screen, .xterm-viewport")\n        )\n      ];\n    }\n    applyThemeBackground(theme) {\n      const background = theme.background ?? "#0b0b0b";\n      for (const element of this.themeBackgroundElements) {\n        element.style.backgroundColor = background;\n      }\n    }\n    unmount() {\n      this.clearInFlightOutputTimeout();\n      const inFlightOperation = this.inFlightOutputOperation;\n      this.inFlightOutputOperation = null;\n      if (inFlightOperation?.onCommitted) {\n        inFlightOperation.onCommitted();\n      }\n      const pendingOperations = this.outputOperations.splice(0, this.outputOperations.length);\n      for (const operation of pendingOperations) {\n        operation.onCommitted?.();\n      }\n      for (const commit of Array.from(this.pendingWriteCommits)) {\n        commit();\n      }\n      this.hasUngatedWrites = false;\n      this.cleanup?.();\n      this.cleanup = null;\n      if (window.__paseoTerminal === this.terminal) {\n        window.__paseoTerminal = void 0;\n      }\n      this.terminal = null;\n      this.fitAddon = null;\n      this.fitAndEmitResize = null;\n      this.lastSize = null;\n      this.themeBackgroundElements = [];\n      this.suppressInput = false;\n      this.inputModeDecoder.decode();\n      this.inputModeTracker.reset();\n      this.emitInputModeChange();\n    }\n    // A barrier op mutates terminal geometry or toggles suppressInput and must apply in\n    // isolation: clear/snapshot reset/resize the terminal, and any write carrying\n    // suppressInput flips input handling around the commit. Plain writes are fast-pathed.\n    isBarrierOperation(operation) {\n      return operation.type !== "write" || Boolean(operation.suppressInput);\n    }\n    processOutputQueue() {\n      if (this.inFlightOutputOperation) {\n        return;\n      }\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      while (this.outputOperations[0] && !this.isBarrierOperation(this.outputOperations[0])) {\n        const writeOperation = this.outputOperations.shift();\n        if (!writeOperation) {\n          break;\n        }\n        this.submitWrite(terminal, writeOperation);\n      }\n      const operation = this.outputOperations.shift();\n      if (!operation) {\n        return;\n      }\n      if (!this.hasUngatedWrites) {\n        this.startBarrierOperation(terminal, operation);\n        return;\n      }\n      let started = false;\n      const startBarrier = () => {\n        if (started || this.inFlightOutputOperation !== operation || this.terminal !== terminal) {\n          return;\n        }\n        started = true;\n        this.clearInFlightOutputTimeout();\n        this.startBarrierOperation(terminal, operation);\n      };\n      this.inFlightOutputOperation = operation;\n      this.inFlightOutputOperationTimeout = setTimeout(startBarrier, OUTPUT_OPERATION_TIMEOUT_MS);\n      try {\n        terminal.write(EMPTY_TERMINAL_OUTPUT, startBarrier);\n      } catch {\n        startBarrier();\n      }\n    }\n    submitWrite(terminal, operation) {\n      const text = this.inputModeDecoder.decode(operation.data, { stream: true });\n      const result = this.inputModeTracker.feed(text);\n      if (result.changed) {\n        this.emitInputModeChange();\n      }\n      this.hasUngatedWrites = true;\n      const onCommitted = operation.onCommitted;\n      if (!onCommitted) {\n        try {\n          terminal.write(operation.data);\n        } catch {\n        }\n        return;\n      }\n      const commit = () => {\n        if (!this.pendingWriteCommits.delete(commit)) {\n          return;\n        }\n        onCommitted();\n      };\n      this.pendingWriteCommits.add(commit);\n      try {\n        terminal.write(operation.data, commit);\n      } catch {\n        commit();\n      }\n    }\n    startBarrierOperation(terminal, operation) {\n      this.inFlightOutputOperation = operation;\n      this.hasUngatedWrites = false;\n      const previousSuppressInput = this.suppressInput;\n      if (operation.suppressInput) {\n        this.suppressInput = Boolean(operation.suppressInput);\n      }\n      const finalizeOperation = (expectedOperation) => {\n        if (this.inFlightOutputOperation !== expectedOperation) {\n          return;\n        }\n        this.inFlightOutputOperation = null;\n        this.clearInFlightOutputTimeout();\n        this.suppressInput = previousSuppressInput;\n        expectedOperation.onCommitted?.();\n        this.processOutputQueue();\n      };\n      if (operation.type === "clear") {\n        this.inputModeDecoder.decode();\n        this.inputModeTracker.reset();\n        this.emitInputModeChange();\n        terminal.reset();\n        finalizeOperation(operation);\n        return;\n      }\n      if (operation.type === "snapshot") {\n        this.inputModeDecoder.decode();\n        this.inputModeTracker.reset();\n        this.emitInputModeChange();\n        try {\n          if (typeof operation.cols === "number" && typeof operation.rows === "number" && (terminal.cols !== operation.cols || terminal.rows !== operation.rows)) {\n            terminal.resize(operation.cols, operation.rows);\n          }\n        } catch {\n          finalizeOperation(operation);\n          return;\n        }\n      }\n      const data = operation.data;\n      if (operation.type === "write") {\n        const text = this.inputModeDecoder.decode(data, { stream: true });\n        const result = this.inputModeTracker.feed(text);\n        if (result.changed) {\n          this.emitInputModeChange();\n        }\n      }\n      this.inFlightOutputOperationTimeout = setTimeout(() => {\n        finalizeOperation(operation);\n      }, OUTPUT_OPERATION_TIMEOUT_MS);\n      try {\n        terminal.write(data, () => {\n          finalizeOperation(operation);\n        });\n      } catch {\n        finalizeOperation(operation);\n      }\n    }\n    clearInFlightOutputTimeout() {\n      if (!this.inFlightOutputOperationTimeout) {\n        return;\n      }\n      clearTimeout(this.inFlightOutputOperationTimeout);\n      this.inFlightOutputOperationTimeout = null;\n    }\n    emitInputModeChange() {\n      const state = this.inputModeTracker.getState();\n      if (terminalInputModeStatesEqual(state, this.lastInputModeState)) {\n        return;\n      }\n      this.lastInputModeState = state;\n      this.callbacks.onInputModeChange?.(state);\n    }\n    applyDocumentBoundsStyles(input) {\n      const documentElement = document.documentElement;\n      const body = document.body;\n      const rootContainer = input.root.parentElement;\n      const previousDocumentElementOverflow = documentElement.style.overflow;\n      const previousDocumentElementWidth = documentElement.style.width;\n      const previousDocumentElementHeight = documentElement.style.height;\n      const previousDocumentElementTextSizeAdjust = documentElement.style.getPropertyValue("text-size-adjust");\n      const previousDocumentElementWebkitTextSizeAdjust = documentElement.style.getPropertyValue(\n        "-webkit-text-size-adjust"\n      );\n      const previousBodyOverflow = body.style.overflow;\n      const previousBodyWidth = body.style.width;\n      const previousBodyHeight = body.style.height;\n      const previousBodyMargin = body.style.margin;\n      const previousBodyPadding = body.style.padding;\n      const previousBodyTextSizeAdjust = body.style.getPropertyValue("text-size-adjust");\n      const previousBodyWebkitTextSizeAdjust = body.style.getPropertyValue(\n        "-webkit-text-size-adjust"\n      );\n      const previousRootOverflow = rootContainer?.style.overflow ?? "";\n      const previousRootWidth = rootContainer?.style.width ?? "";\n      const previousRootHeight = rootContainer?.style.height ?? "";\n      documentElement.style.overflow = "hidden";\n      documentElement.style.width = "100%";\n      documentElement.style.height = "100%";\n      documentElement.style.setProperty("text-size-adjust", "100%");\n      documentElement.style.setProperty("-webkit-text-size-adjust", "100%");\n      body.style.overflow = "hidden";\n      body.style.width = "100%";\n      body.style.height = "100%";\n      body.style.margin = "0";\n      body.style.padding = "0";\n      body.style.setProperty("text-size-adjust", "100%");\n      body.style.setProperty("-webkit-text-size-adjust", "100%");\n      if (rootContainer) {\n        rootContainer.style.overflow = "hidden";\n        rootContainer.style.width = "100%";\n        rootContainer.style.height = "100%";\n      }\n      return () => {\n        documentElement.style.overflow = previousDocumentElementOverflow;\n        documentElement.style.width = previousDocumentElementWidth;\n        documentElement.style.height = previousDocumentElementHeight;\n        documentElement.style.setProperty("text-size-adjust", previousDocumentElementTextSizeAdjust);\n        documentElement.style.setProperty(\n          "-webkit-text-size-adjust",\n          previousDocumentElementWebkitTextSizeAdjust\n        );\n        body.style.overflow = previousBodyOverflow;\n        body.style.width = previousBodyWidth;\n        body.style.height = previousBodyHeight;\n        body.style.margin = previousBodyMargin;\n        body.style.padding = previousBodyPadding;\n        body.style.setProperty("text-size-adjust", previousBodyTextSizeAdjust);\n        body.style.setProperty("-webkit-text-size-adjust", previousBodyWebkitTextSizeAdjust);\n        if (rootContainer) {\n          rootContainer.style.overflow = previousRootOverflow;\n          rootContainer.style.width = previousRootWidth;\n          rootContainer.style.height = previousRootHeight;\n        }\n      };\n    }\n    applyViewportTouchStyles(input) {\n      const viewportElement = input.host.querySelector(".xterm-viewport");\n      const previousViewportOverscroll = viewportElement?.style.overscrollBehavior ?? "";\n      const previousViewportTouchAction = viewportElement?.style.touchAction ?? "";\n      const previousViewportOverflowY = viewportElement?.style.overflowY ?? "";\n      const previousViewportOverflowX = viewportElement?.style.overflowX ?? "";\n      const previousViewportPointerEvents = viewportElement?.style.pointerEvents ?? "";\n      const previousViewportWebkitOverflowScrolling = viewportElement?.style.getPropertyValue("-webkit-overflow-scrolling") ?? "";\n      if (viewportElement) {\n        viewportElement.style.overscrollBehavior = "none";\n        viewportElement.style.touchAction = "pan-y";\n        viewportElement.style.overflowY = "auto";\n        viewportElement.style.overflowX = "hidden";\n        viewportElement.style.pointerEvents = "auto";\n        viewportElement.style.setProperty("-webkit-overflow-scrolling", "touch");\n      }\n      return () => {\n        if (viewportElement) {\n          viewportElement.style.overscrollBehavior = previousViewportOverscroll;\n          viewportElement.style.touchAction = previousViewportTouchAction;\n          viewportElement.style.overflowY = previousViewportOverflowY;\n          viewportElement.style.overflowX = previousViewportOverflowX;\n          viewportElement.style.pointerEvents = previousViewportPointerEvents;\n          viewportElement.style.setProperty(\n            "-webkit-overflow-scrolling",\n            previousViewportWebkitOverflowScrolling\n          );\n        }\n      };\n    }\n    setupTouchScrollHandlers(input) {\n      let touchScrollRemainderPx = 0;\n      const measuredLineHeight = input.host.querySelector(".xterm-rows > div")?.getBoundingClientRect().height ?? 0;\n      const touchScrollLineHeightPx = measuredLineHeight > 0 ? measuredLineHeight : DEFAULT_TOUCH_SCROLL_LINE_HEIGHT_PX;\n      const activeTouch = {\n        identifier: -1,\n        startX: 0,\n        startY: 0,\n        lastX: 0,\n        lastY: 0,\n        mode: null\n      };\n      const touchStartHandler = (event) => {\n        if (event.touches.length !== 1) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n          return;\n        }\n        const touch = event.touches[0];\n        if (!touch) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n          return;\n        }\n        activeTouch.identifier = touch.identifier;\n        activeTouch.startX = touch.clientX;\n        activeTouch.startY = touch.clientY;\n        activeTouch.lastX = touch.clientX;\n        activeTouch.lastY = touch.clientY;\n        activeTouch.mode = null;\n        touchScrollRemainderPx = 0;\n      };\n      const touchMoveHandler = (event) => {\n        if (event.touches.length !== 1) {\n          return;\n        }\n        const touch = Array.from(event.touches).find(\n          (candidate) => candidate.identifier === activeTouch.identifier\n        );\n        if (!touch) {\n          return;\n        }\n        const totalDeltaX = touch.clientX - activeTouch.startX;\n        const totalDeltaY = touch.clientY - activeTouch.startY;\n        if (activeTouch.mode === null) {\n          const absX = Math.abs(totalDeltaX);\n          const absY = Math.abs(totalDeltaY);\n          if (absX > 8 || absY > 8) {\n            activeTouch.mode = absY >= absX ? "vertical" : "horizontal";\n          }\n        }\n        const deltaY = touch.clientY - activeTouch.lastY;\n        activeTouch.lastX = touch.clientX;\n        activeTouch.lastY = touch.clientY;\n        if (activeTouch.mode !== "vertical") {\n          return;\n        }\n        touchScrollRemainderPx += deltaY;\n        const lineDelta = Math.trunc(touchScrollRemainderPx / touchScrollLineHeightPx);\n        if (lineDelta !== 0) {\n          input.terminal.scrollLines(-lineDelta);\n          touchScrollRemainderPx -= lineDelta * touchScrollLineHeightPx;\n        }\n        event.preventDefault();\n      };\n      const touchEndHandler = (event) => {\n        const activeTouchEnded = Array.from(event.changedTouches).some(\n          (touch) => touch.identifier === activeTouch.identifier\n        );\n        if (activeTouchEnded || event.touches.length === 0) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n        }\n      };\n      const touchCancelHandler = () => {\n        touchScrollRemainderPx = 0;\n        activeTouch.identifier = -1;\n        activeTouch.mode = null;\n      };\n      input.root.addEventListener("touchstart", touchStartHandler, { passive: true });\n      input.root.addEventListener("touchmove", touchMoveHandler, { passive: false });\n      input.root.addEventListener("touchend", touchEndHandler, { passive: true });\n      input.root.addEventListener("touchcancel", touchCancelHandler, { passive: true });\n      return () => {\n        input.root.removeEventListener("touchstart", touchStartHandler);\n        input.root.removeEventListener("touchmove", touchMoveHandler);\n        input.root.removeEventListener("touchend", touchEndHandler);\n        input.root.removeEventListener("touchcancel", touchCancelHandler);\n      };\n    }\n  };\n\n  // src/terminal/webview/terminal-emulator-webview-entry.ts\n  var sendToNative = (message) => {\n    window.ReactNativeWebView?.postMessage?.(JSON.stringify(message));\n  };\n  var TERMINAL_BACKGROUND_CSS_VAR = "--paseo-terminal-background";\n  var DEFAULT_TERMINAL_BACKGROUND = "#0b0b0b";\n  var TERMINAL_TAP_MOVE_TOLERANCE_PX = 8;\n  function getTerminalBackground(theme) {\n    return theme.background ?? DEFAULT_TERMINAL_BACKGROUND;\n  }\n  var installStyles = () => {\n    const style = document.createElement("style");\n    style.textContent = `\n${xterm_default}\n:root {\n  ${TERMINAL_BACKGROUND_CSS_VAR}: transparent;\n}\nhtml,\nbody,\n#terminal-root {\n  width: 100%;\n  height: 100%;\n  margin: 0;\n  padding: 0;\n  overflow: hidden;\n  overscroll-behavior: none;\n  background: var(${TERMINAL_BACKGROUND_CSS_VAR});\n}\n#terminal-root {\n  display: flex;\n  min-width: 0;\n  min-height: 0;\n}\n#terminal-host {\n  flex: 1;\n  min-width: 0;\n  min-height: 0;\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  background: var(${TERMINAL_BACKGROUND_CSS_VAR});\n}\n#terminal-root .xterm,\n#terminal-root .xterm-screen,\n#terminal-root .xterm-viewport {\n  background-color: var(${TERMINAL_BACKGROUND_CSS_VAR}) !important;\n}\n[data-terminal-scrollbar-root="true"] .xterm-viewport {\n  scrollbar-width: none;\n  -ms-overflow-style: none;\n}\n[data-terminal-scrollbar-root="true"] .xterm-viewport::-webkit-scrollbar {\n  width: 0;\n  height: 0;\n}\n#terminal-root .xterm .xterm-helper-textarea {\n  opacity: 0.01;\n  width: 1px;\n  height: 1px;\n  min-width: 1px;\n  min-height: 1px;\n  color: transparent;\n  background: transparent;\n  caret-color: transparent;\n  z-index: 5 !important;\n}\n`;\n    document.head.appendChild(style);\n  };\n  var TerminalWebViewBridge = class {\n    constructor(root2, host2) {\n      this.root = root2;\n      this.host = host2;\n      this.root.addEventListener("pointerdown", this.handlePointerDown, { passive: true });\n      this.root.addEventListener("touchstart", this.handleTouchStart, { passive: true });\n      this.root.addEventListener("touchmove", this.handleTouchMove, { passive: true });\n      this.root.addEventListener("touchend", this.handleTouchEnd, { passive: true });\n      this.root.addEventListener("touchcancel", this.handleTouchCancel, { passive: true });\n      this.root.addEventListener("pointermove", this.handlePointerMove, { passive: false });\n      this.root.addEventListener("pointerup", this.handlePointerUp, { passive: true });\n      this.root.addEventListener("pointercancel", this.handlePointerUp, { passive: true });\n    }\n    root;\n    host;\n    runtime = null;\n    streamKey = null;\n    nextLocalFileLinkRequestId = 1;\n    pendingLocalFileLinkResolutions = /* @__PURE__ */ new Map();\n    swipeGesturesEnabled = false;\n    trackingSwipe = false;\n    activePointerId = null;\n    startX = 0;\n    startY = 0;\n    firedSwipe = false;\n    tapTouchIdentifier = null;\n    tapStartX = 0;\n    tapStartY = 0;\n    tapMoved = false;\n    receive = (message) => {\n      try {\n        this.receiveUnsafe(message);\n      } catch (error) {\n        sendToNative({\n          type: "debug",\n          message: "terminal webview receive failed",\n          details: error instanceof Error ? { message: error.message, stack: error.stack } : error\n        });\n      }\n    };\n    receiveUnsafe(message) {\n      if (message.type === "mount") {\n        this.mount(message);\n        return;\n      }\n      if (message.type === "unmount") {\n        this.unmount(message.streamKey);\n        return;\n      }\n      if (!this.matches(message.streamKey)) {\n        return;\n      }\n      if (message.type === "resolveLocalFileLinkResponse") {\n        this.resolveLocalFileLinkRequest(message.requestId, message.target);\n        return;\n      }\n      this.receiveMounted(message);\n    }\n    receiveMounted(message) {\n      if (this.receiveConfigurationMessage(message)) return;\n      switch (message.type) {\n        case "writeOutput":\n          this.runtime?.write({ data: encodeTerminalOutput(message.text) });\n          break;\n        case "restoreOutput":\n          this.runtime?.restoreOutput({ data: encodeTerminalOutput(message.text) });\n          break;\n        case "renderSnapshot":\n          this.runtime?.renderSnapshot({ state: message.state });\n          break;\n        case "paste":\n          this.runtime?.paste(message.text);\n          break;\n        case "clear":\n          this.runtime?.clear();\n          break;\n        case "focus":\n          this.runtime?.focus({ forceRefocus: message.forceRefocus });\n          break;\n        case "resize":\n          this.runtime?.resize({\n            shouldClaim: message.shouldClaim ?? true,\n            forceClaim: message.forceClaim\n          });\n          break;\n      }\n    }\n    receiveConfigurationMessage(message) {\n      switch (message.type) {\n        case "setTheme":\n          this.applyThemeBackground(message.theme);\n          this.runtime?.setTheme({ theme: message.theme });\n          return true;\n        case "setScrollback":\n          this.runtime?.setScrollback({ lines: message.lines });\n          return true;\n        case "setFont":\n          this.runtime?.setFont({ fontFamily: message.fontFamily, fontSize: message.fontSize });\n          return true;\n        case "setPendingModifiers":\n          this.runtime?.setPendingModifiers({ pendingModifiers: message.pendingModifiers });\n          return true;\n        case "setSwipeGesturesEnabled":\n          this.swipeGesturesEnabled = message.enabled;\n          return true;\n        default:\n          return false;\n      }\n    }\n    mount(message) {\n      this.unmount(this.streamKey);\n      this.streamKey = message.streamKey;\n      this.swipeGesturesEnabled = message.swipeGesturesEnabled;\n      this.applyThemeBackground(message.theme);\n      const runtime = new TerminalEmulatorRuntime();\n      this.runtime = runtime;\n      runtime.setCallbacks({\n        callbacks: {\n          onInput: (data) => sendToNative({ type: "input", streamKey: message.streamKey, data }),\n          onResize: ({ rows, cols, shouldClaim, forceClaim }) => sendToNative({\n            type: "resize",\n            streamKey: message.streamKey,\n            rows,\n            cols,\n            shouldClaim,\n            forceClaim\n          }),\n          onTerminalKey: (input) => sendToNative({ type: "terminalKey", streamKey: message.streamKey, ...input }),\n          onPendingModifiersConsumed: () => sendToNative({ type: "pendingModifiersConsumed", streamKey: message.streamKey }),\n          onInputModeChange: (state) => sendToNative({ type: "inputModeChange", streamKey: message.streamKey, state }),\n          onOpenExternalUrl: (url) => sendToNative({ type: "openExternalUrl", streamKey: message.streamKey, url }),\n          onResolveLocalFileLink: (source) => this.requestLocalFileLinkResolution(source),\n          onOpenLocalFileLink: (target, disposition) => sendToNative({\n            type: "openLocalFileLink",\n            streamKey: message.streamKey,\n            target,\n            disposition\n          })\n        }\n      });\n      runtime.setPendingModifiers({ pendingModifiers: message.pendingModifiers });\n      runtime.mount({\n        root: this.root,\n        host: this.host,\n        initialSnapshot: message.initialSnapshot,\n        scrollback: message.scrollbackLines,\n        theme: message.theme,\n        fontFamily: message.fontFamily,\n        fontSize: message.fontSize\n      });\n      sendToNative({ type: "rendererReady", streamKey: message.streamKey, isReady: true });\n    }\n    applyThemeBackground(theme) {\n      const background = getTerminalBackground(theme);\n      document.documentElement.style.setProperty(TERMINAL_BACKGROUND_CSS_VAR, background);\n      document.body.style.backgroundColor = background;\n      this.root.style.backgroundColor = background;\n      this.host.style.backgroundColor = background;\n    }\n    blur = () => {\n      this.runtime?.blur();\n    };\n    unmount(streamKey) {\n      if (!this.runtime) {\n        return;\n      }\n      const previousStreamKey = this.streamKey;\n      this.runtime.unmount();\n      this.runtime = null;\n      this.streamKey = null;\n      this.resolveAllLocalFileLinkRequests(null);\n      if (previousStreamKey && (!streamKey || streamKey === previousStreamKey)) {\n        sendToNative({ type: "rendererReady", streamKey: previousStreamKey, isReady: false });\n      }\n    }\n    matches(streamKey) {\n      return this.streamKey === streamKey;\n    }\n    requestLocalFileLinkResolution(source) {\n      const streamKey = this.streamKey;\n      if (!streamKey) {\n        return Promise.resolve(null);\n      }\n      const requestId = this.nextLocalFileLinkRequestId++;\n      return new Promise((resolve) => {\n        this.pendingLocalFileLinkResolutions.set(requestId, resolve);\n        sendToNative({\n          type: "resolveLocalFileLink",\n          streamKey,\n          requestId,\n          source\n        });\n      });\n    }\n    resolveLocalFileLinkRequest(requestId, target) {\n      const resolve = this.pendingLocalFileLinkResolutions.get(requestId);\n      if (!resolve) {\n        return;\n      }\n      this.pendingLocalFileLinkResolutions.delete(requestId);\n      resolve(target);\n    }\n    resolveAllLocalFileLinkRequests(target) {\n      const requests = Array.from(this.pendingLocalFileLinkResolutions.values());\n      this.pendingLocalFileLinkResolutions.clear();\n      for (const resolve of requests) {\n        resolve(target);\n      }\n    }\n    handlePointerDown = (event) => {\n      if (!event.isPrimary) {\n        return;\n      }\n      if (!this.swipeGesturesEnabled) {\n        return;\n      }\n      this.trackingSwipe = true;\n      this.firedSwipe = false;\n      this.activePointerId = event.pointerId;\n      this.startX = event.clientX;\n      this.startY = event.clientY;\n    };\n    handleTouchStart = (event) => {\n      if (event.touches.length !== 1) {\n        this.resetTap();\n        return;\n      }\n      const touch = event.touches[0];\n      this.tapTouchIdentifier = touch.identifier;\n      this.tapStartX = touch.clientX;\n      this.tapStartY = touch.clientY;\n      this.tapMoved = false;\n    };\n    handleTouchMove = (event) => {\n      const touch = this.findTrackedTouch(event.touches);\n      if (!touch) {\n        return;\n      }\n      const dx = touch.clientX - this.tapStartX;\n      const dy = touch.clientY - this.tapStartY;\n      if (Math.abs(dx) > TERMINAL_TAP_MOVE_TOLERANCE_PX || Math.abs(dy) > TERMINAL_TAP_MOVE_TOLERANCE_PX) {\n        this.tapMoved = true;\n      }\n    };\n    handleTouchEnd = (event) => {\n      const completedTap = Boolean(this.findTrackedTouch(event.changedTouches) && !this.tapMoved);\n      this.resetTap();\n      if (completedTap) {\n        this.runtime?.focus({ forceRefocus: true });\n      }\n    };\n    handleTouchCancel = () => {\n      this.resetTap();\n    };\n    handlePointerMove = (event) => {\n      if (!this.trackingSwipe || this.firedSwipe || !this.streamKey) {\n        return;\n      }\n      if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {\n        return;\n      }\n      const dx = event.clientX - this.startX;\n      const dy = event.clientY - this.startY;\n      const absDx = Math.abs(dx);\n      const absDy = Math.abs(dy);\n      if (absDy >= 12 && absDy > absDx) {\n        this.resetSwipe();\n        return;\n      }\n      if (absDx < 22 || absDy !== 0 && absDx / absDy < 1.2) {\n        return;\n      }\n      this.firedSwipe = true;\n      sendToNative({ type: dx > 0 ? "swipeRight" : "swipeLeft", streamKey: this.streamKey });\n      if (event.cancelable) event.preventDefault();\n    };\n    handlePointerUp = (event) => {\n      if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {\n        return;\n      }\n      this.resetSwipe();\n    };\n    resetSwipe() {\n      this.trackingSwipe = false;\n      this.activePointerId = null;\n      this.startX = 0;\n      this.startY = 0;\n      this.firedSwipe = false;\n    }\n    findTrackedTouch(touches) {\n      if (this.tapTouchIdentifier === null) {\n        return null;\n      }\n      for (let index = 0; index < touches.length; index += 1) {\n        const touch = touches.item(index);\n        if (touch?.identifier === this.tapTouchIdentifier) {\n          return touch;\n        }\n      }\n      return null;\n    }\n    resetTap() {\n      this.tapTouchIdentifier = null;\n      this.tapStartX = 0;\n      this.tapStartY = 0;\n      this.tapMoved = false;\n    }\n  };\n  installStyles();\n  var root = document.createElement("div");\n  root.id = "terminal-root";\n  root.dataset.terminalScrollbarRoot = "true";\n  var host = document.createElement("div");\n  host.id = "terminal-host";\n  root.appendChild(host);\n  document.body.appendChild(root);\n  var bridge = new TerminalWebViewBridge(root, host);\n  window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__ = bridge.receive;\n  window.__PASEO_TERMINAL_WEBVIEW_BLUR__ = bridge.blur;\n  sendToNative({ type: "bridgeReady" });\n})();\n/*! Bundled license information:\n\n@xterm/addon-clipboard/lib/addon-clipboard.mjs:\n@xterm/addon-fit/lib/addon-fit.mjs:\n@xterm/addon-image/lib/addon-image.mjs:\n@xterm/addon-search/lib/addon-search.mjs:\n@xterm/addon-unicode11/lib/addon-unicode11.mjs:\n@xterm/addon-web-links/lib/addon-web-links.mjs:\n@xterm/addon-webgl/lib/addon-webgl.mjs:\n@xterm/addon-ligatures/lib/addon-ligatures.mjs:\n@xterm/xterm/lib/xterm.mjs:\n  (**\n   * Copyright (c) 2014-2024 The xterm.js authors. All rights reserved.\n   * @license MIT\n   *\n   * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n   * @license MIT\n   *\n   * Originally forked from (with the author\'s permission):\n   *   Fabrice Bellard\'s javascript vt100 for jslinux:\n   *   http://bellard.org/jslinux/\n   *   Copyright (c) 2011 Fabrice Bellard\n   *)\n*/\n</script>\n  </body>\n</html>';
+  '<!doctype html>\n<html>\n  <head>\n    <meta charset="utf-8" />\n    <meta\n      name="viewport"\n      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"\n    />\n  </head>\n  <body>\n    <script>"use strict";\n(() => {\n  var __require = /* @__PURE__ */ ((x5) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x5, {\n    get: (a2, b4) => (typeof require !== "undefined" ? require : a2)[b4]\n  }) : x5)(function(x5) {\n    if (typeof require !== "undefined") return require.apply(this, arguments);\n    throw Error(\'Dynamic require of "\' + x5 + \'" is not supported\');\n  });\n\n  // node_modules/@xterm/xterm/css/xterm.css\n  var xterm_default = `/**\n * Copyright (c) 2014 The xterm.js authors. All rights reserved.\n * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n * https://github.com/chjj/term.js\n * @license MIT\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the "Software"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n *\n * Originally forked from (with the author\'s permission):\n *   Fabrice Bellard\'s javascript vt100 for jslinux:\n *   http://bellard.org/jslinux/\n *   Copyright (c) 2011 Fabrice Bellard\n *   The original design remains. The terminal itself\n *   has been extended to include xterm CSI codes, among\n *   other features.\n */\n\n/**\n *  Default styles for xterm.js\n */\n\n.xterm {\n    cursor: text;\n    position: relative;\n    user-select: none;\n    -ms-user-select: none;\n    -webkit-user-select: none;\n}\n\n.xterm.focus,\n.xterm:focus {\n    outline: none;\n}\n\n.xterm .xterm-helpers {\n    position: absolute;\n    top: 0;\n    /**\n     * The z-index of the helpers must be higher than the canvases in order for\n     * IMEs to appear on top.\n     */\n    z-index: 5;\n}\n\n.xterm .xterm-helper-textarea {\n    padding: 0;\n    border: 0;\n    margin: 0;\n    /* Move textarea out of the screen to the far left, so that the cursor is not visible */\n    position: absolute;\n    opacity: 0;\n    left: -9999em;\n    top: 0;\n    width: 0;\n    height: 0;\n    z-index: -5;\n    /** Prevent wrapping so the IME appears against the textarea at the correct position */\n    white-space: nowrap;\n    overflow: hidden;\n    resize: none;\n}\n\n.xterm .composition-view {\n    /* TODO: Composition position got messed up somewhere */\n    background: #000;\n    color: #FFF;\n    display: none;\n    position: absolute;\n    white-space: nowrap;\n    z-index: 1;\n}\n\n.xterm .composition-view.active {\n    display: block;\n}\n\n.xterm .xterm-viewport {\n    overflow-y: scroll;\n    cursor: default;\n    position: absolute;\n    right: 0;\n    left: 0;\n    top: 0;\n    bottom: 0;\n}\n\n.xterm:not(.allow-transparency) .xterm-viewport {\n    /* On OS X this is required in order for the scroll bar to appear fully opaque */\n    background-color: #000;\n}\n\n.xterm .xterm-screen {\n    position: relative;\n}\n\n.xterm .xterm-screen canvas {\n    position: absolute;\n    left: 0;\n    top: 0;\n}\n\n.xterm.enable-mouse-events {\n    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */\n    cursor: default;\n}\n\n.xterm.xterm-cursor-pointer,\n.xterm .xterm-cursor-pointer {\n    cursor: pointer;\n}\n\n.xterm.column-select.focus {\n    /* Column selection mode */\n    cursor: crosshair;\n}\n\n.xterm .xterm-accessibility:not(.debug),\n.xterm .xterm-message {\n    position: absolute;\n    left: 0;\n    top: 0;\n    bottom: 0;\n    right: 0;\n    z-index: 10;\n    color: transparent;\n    pointer-events: none;\n}\n\n.xterm .xterm-accessibility-tree:not(.debug) *::selection {\n  color: transparent;\n}\n\n.xterm .xterm-accessibility-tree {\n  font-family: monospace;\n  user-select: text;\n  white-space: pre;\n}\n\n.xterm .xterm-accessibility-tree > div {\n  transform-origin: left;\n  width: fit-content;\n}\n\n.xterm .live-region {\n    position: absolute;\n    left: -9999px;\n    width: 1px;\n    height: 1px;\n    overflow: hidden;\n}\n\n.xterm-dim {\n    /* Dim should not apply to background, so the opacity of the foreground color is applied\n     * explicitly in the generated class and reset to 1 here */\n    opacity: 1 !important;\n}\n\n.xterm-underline-1 { text-decoration: underline; }\n.xterm-underline-2 { text-decoration: double underline; }\n.xterm-underline-3 { text-decoration: wavy underline; }\n.xterm-underline-4 { text-decoration: dotted underline; }\n.xterm-underline-5 { text-decoration: dashed underline; }\n\n.xterm-overline {\n    text-decoration: overline;\n}\n\n.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }\n.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }\n.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }\n.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }\n.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }\n\n.xterm-strikethrough {\n    text-decoration: line-through;\n}\n\n.xterm-screen .xterm-decoration-container .xterm-decoration {\n\tz-index: 6;\n\tposition: absolute;\n}\n\n.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {\n\tz-index: 7;\n}\n\n.xterm-decoration-overview-ruler {\n    z-index: 8;\n    position: absolute;\n    top: 0;\n    right: 0;\n    pointer-events: none;\n}\n\n.xterm-decoration-top {\n    z-index: 2;\n    position: relative;\n}\n\n\n\n/* Derived from vs/base/browser/ui/scrollbar/media/scrollbar.css */\n\n/* xterm.js customization: Override xterm\'s cursor style */\n.xterm .xterm-scrollable-element > .xterm-scrollbar {\n    cursor: default;\n}\n\n/* Arrows */\n\n.xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-scra {\n\tcursor: pointer;\n    background-color: var(--vscode-scrollbarSliderBackground, rgba(100, 100, 100, 0.4));\n    mask-image: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 11 11\'><path d=\'M2.5 8.5 L5.5 2.5 L8.5 8.5 Z\' fill=\'black\'/></svg>");\n    -webkit-mask-image: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 11 11\'><path d=\'M2.5 8.5 L5.5 2.5 L8.5 8.5 Z\' fill=\'black\'/></svg>");\n    mask-repeat: no-repeat;\n    -webkit-mask-repeat: no-repeat;\n    mask-position: center center;\n    -webkit-mask-position: center center;\n    mask-size: 100% 100%;\n    -webkit-mask-size: 100% 100%;\n}\n\n.xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-scra.xterm-arrow-down {\n    transform: rotate(180deg);\n}\n\n.xterm .xterm-scrollable-element > .xterm-visible {\n\topacity: 1;\n\n\t/* Background rule added for IE9 - to allow clicks on dom node */\n\tbackground:rgba(0,0,0,0);\n\n\ttransition: opacity 100ms linear;\n\t/* In front of peek view */\n\tz-index: 11;\n}\n.xterm .xterm-scrollable-element > .xterm-invisible {\n\topacity: 0;\n\tpointer-events: none;\n}\n.xterm .xterm-scrollable-element > .xterm-invisible.xterm-fade {\n\ttransition: opacity 800ms linear;\n}\n\n/* Scrollable Content Inset Shadow */\n.xterm .xterm-scrollable-element > .xterm-shadow {\n\tposition: absolute;\n\tdisplay: none;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top {\n\tdisplay: block;\n\ttop: 0;\n\tleft: 3px;\n\theight: 3px;\n\twidth: 100%;\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-left {\n\tdisplay: block;\n\ttop: 3px;\n\tleft: 0;\n\theight: 100%;\n\twidth: 3px;\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top-left-corner {\n\tdisplay: block;\n\ttop: 0;\n\tleft: 0;\n\theight: 3px;\n\twidth: 3px;\n}\n.xterm .xterm-scrollable-element > .xterm-shadow.xterm-shadow-top.xterm-shadow-left {\n\tbox-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;\n}\n`;\n\n  // node_modules/@xterm/addon-clipboard/lib/addon-clipboard.mjs\n  var U = "3.7.8";\n  var $ = U;\n  var f = typeof Buffer == "function";\n  var _ = typeof TextDecoder == "function" ? new TextDecoder() : void 0;\n  var C = typeof TextEncoder == "function" ? new TextEncoder() : void 0;\n  var N = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";\n  var c = Array.prototype.slice.call(N);\n  var d = ((e) => {\n    let t = {};\n    return e.forEach((r, o2) => t[r] = o2), t;\n  })(c);\n  var k = /^(?:[A-Za-z\\d+\\/]{4})*?(?:[A-Za-z\\d+\\/]{2}(?:==)?|[A-Za-z\\d+\\/]{3}=?)?$/;\n  var n = String.fromCharCode.bind(String);\n  var B = typeof Uint8Array.from == "function" ? Uint8Array.from.bind(Uint8Array) : (e) => new Uint8Array(Array.prototype.slice.call(e, 0));\n  var S = (e) => e.replace(/=/g, "").replace(/[+\\/]/g, (t) => t == "+" ? "-" : "_");\n  var I = (e) => e.replace(/[^A-Za-z0-9\\+\\/]/g, "");\n  var F = (e) => {\n    let t, r, o2, i5, s4 = "", l4 = e.length % 3;\n    for (let a2 = 0; a2 < e.length; ) {\n      if ((r = e.charCodeAt(a2++)) > 255 || (o2 = e.charCodeAt(a2++)) > 255 || (i5 = e.charCodeAt(a2++)) > 255) throw new TypeError("invalid character found");\n      t = r << 16 | o2 << 8 | i5, s4 += c[t >> 18 & 63] + c[t >> 12 & 63] + c[t >> 6 & 63] + c[t & 63];\n    }\n    return l4 ? s4.slice(0, l4 - 3) + "===".substring(l4) : s4;\n  };\n  var m = typeof btoa == "function" ? (e) => btoa(e) : f ? (e) => Buffer.from(e, "binary").toString("base64") : F;\n  var b = f ? (e) => Buffer.from(e).toString("base64") : (e) => {\n    let r = [];\n    for (let o2 = 0, i5 = e.length; o2 < i5; o2 += 4096) r.push(n.apply(null, e.subarray(o2, o2 + 4096)));\n    return m(r.join(""));\n  };\n  var x = (e, t = false) => t ? S(b(e)) : b(e);\n  var H = (e) => {\n    if (e.length < 2) {\n      var t = e.charCodeAt(0);\n      return t < 128 ? e : t < 2048 ? n(192 | t >>> 6) + n(128 | t & 63) : n(224 | t >>> 12 & 15) + n(128 | t >>> 6 & 63) + n(128 | t & 63);\n    } else {\n      var t = 65536 + (e.charCodeAt(0) - 55296) * 1024 + (e.charCodeAt(1) - 56320);\n      return n(240 | t >>> 18 & 7) + n(128 | t >>> 12 & 63) + n(128 | t >>> 6 & 63) + n(128 | t & 63);\n    }\n  };\n  var J = /[\\uD800-\\uDBFF][\\uDC00-\\uDFFFF]|[^\\x00-\\x7F]/g;\n  var P = (e) => e.replace(J, H);\n  var T = f ? (e) => Buffer.from(e, "utf8").toString("base64") : C ? (e) => b(C.encode(e)) : (e) => m(P(e));\n  var p = (e, t = false) => t ? S(T(e)) : T(e);\n  var v = (e) => p(e, true);\n  var q = /[\\xC0-\\xDF][\\x80-\\xBF]|[\\xE0-\\xEF][\\x80-\\xBF]{2}|[\\xF0-\\xF7][\\x80-\\xBF]{3}/g;\n  var G = (e) => {\n    switch (e.length) {\n      case 4:\n        var t = (7 & e.charCodeAt(0)) << 18 | (63 & e.charCodeAt(1)) << 12 | (63 & e.charCodeAt(2)) << 6 | 63 & e.charCodeAt(3), r = t - 65536;\n        return n((r >>> 10) + 55296) + n((r & 1023) + 56320);\n      case 3:\n        return n((15 & e.charCodeAt(0)) << 12 | (63 & e.charCodeAt(1)) << 6 | 63 & e.charCodeAt(2));\n      default:\n        return n((31 & e.charCodeAt(0)) << 6 | 63 & e.charCodeAt(1));\n    }\n  };\n  var D = (e) => e.replace(q, G);\n  var w = (e) => {\n    if (e = e.replace(/\\s+/g, ""), !k.test(e)) throw new TypeError("malformed base64.");\n    e += "==".slice(2 - (e.length & 3));\n    let t, r, o2, i5 = [];\n    for (let s4 = 0; s4 < e.length; ) t = d[e.charAt(s4++)] << 18 | d[e.charAt(s4++)] << 12 | (r = d[e.charAt(s4++)]) << 6 | (o2 = d[e.charAt(s4++)]), r === 64 ? i5.push(n(t >> 16 & 255)) : o2 === 64 ? i5.push(n(t >> 16 & 255, t >> 8 & 255)) : i5.push(n(t >> 16 & 255, t >> 8 & 255, t & 255));\n    return i5.join("");\n  };\n  var y = typeof atob == "function" ? (e) => atob(I(e)) : f ? (e) => Buffer.from(e, "base64").toString("binary") : w;\n  var R = f ? (e) => B(Buffer.from(e, "base64")) : (e) => B(y(e).split("").map((t) => t.charCodeAt(0)));\n  var E = (e) => R(O(e));\n  var K = f ? (e) => Buffer.from(e, "base64").toString("utf8") : _ ? (e) => _.decode(R(e)) : (e) => D(y(e));\n  var O = (e) => I(e.replace(/[-_]/g, (t) => t == "-" ? "+" : "/"));\n  var h = (e) => K(O(e));\n  var M = (e) => {\n    if (typeof e != "string") return false;\n    let t = e.replace(/\\s+/g, "").replace(/={0,2}$/, "");\n    return !/[^\\s0-9a-zA-Z\\+/]/.test(t) || !/[^\\s0-9a-zA-Z\\-_]/.test(t);\n  };\n  var z = (e) => ({ value: e, enumerable: false, writable: true, configurable: true });\n  var Z = function() {\n    let e = (t, r) => Object.defineProperty(String.prototype, t, z(r));\n    e("fromBase64", function() {\n      return h(this);\n    }), e("toBase64", function(t) {\n      return p(this, t);\n    }), e("toBase64URI", function() {\n      return p(this, true);\n    }), e("toBase64URL", function() {\n      return p(this, true);\n    }), e("toUint8Array", function() {\n      return E(this);\n    });\n  };\n  var V = function() {\n    let e = (t, r) => Object.defineProperty(Uint8Array.prototype, t, z(r));\n    e("toBase64", function(t) {\n      return x(this, t);\n    }), e("toBase64URI", function() {\n      return x(this, true);\n    }), e("toBase64URL", function() {\n      return x(this, true);\n    });\n  };\n  var Q = () => {\n    Z(), V();\n  };\n  var u = { version: U, VERSION: $, atob: y, atobPolyfill: w, btoa: m, btoaPolyfill: F, fromBase64: h, toBase64: p, encode: p, encodeURI: v, encodeURL: v, utob: P, btou: D, decode: h, isValid: M, fromUint8Array: x, toUint8Array: E, extendString: Z, extendUint8Array: V, extendBuiltins: Q };\n  var j = class {\n    constructor(t = new A(), r = new g()) {\n      this._base64 = t;\n      this._provider = r;\n    }\n    activate(t) {\n      this._terminal = t, this._disposable = t.parser.registerOscHandler(52, (r) => this._setOrReportClipboard(r));\n    }\n    dispose() {\n      return this._disposable?.dispose();\n    }\n    _readText(t, r) {\n      let o2 = this._base64.encodeText(r);\n      this._terminal?.input(`\\x1B]52;${t};${o2}\\x07`, false);\n    }\n    _setOrReportClipboard(t) {\n      let r = t.split(";");\n      if (r.length < 2) return true;\n      let o2 = r[0], i5 = r[1];\n      if (i5 === "?") {\n        let a2 = this._provider.readText(o2);\n        return a2 instanceof Promise ? a2.then((L6) => (this._readText(o2, L6), true)) : (this._readText(o2, a2), true);\n      }\n      let s4 = "";\n      try {\n        s4 = this._base64.decodeText(i5);\n      } catch {\n      }\n      let l4 = this._provider.writeText(o2, s4);\n      return l4 instanceof Promise ? l4.then(() => true) : true;\n    }\n  };\n  var g = class {\n    async readText(t) {\n      return t !== "c" ? Promise.resolve("") : navigator.clipboard.readText();\n    }\n    async writeText(t, r) {\n      return t !== "c" ? Promise.resolve() : navigator.clipboard.writeText(r);\n    }\n  };\n  var A = class {\n    encodeText(t) {\n      return u.encode(t);\n    }\n    decodeText(t) {\n      let r = u.decode(t);\n      return !u.isValid(t) || u.encode(r) !== t ? "" : r;\n    }\n  };\n\n  // node_modules/@xterm/addon-fit/lib/addon-fit.mjs\n  var f2 = 2;\n  var g2 = 1;\n  function _2(t) {\n    return t?.ownerDocument?.defaultView ? t.ownerDocument.defaultView : window;\n  }\n  function o(t) {\n    return _2(t).getComputedStyle(t, null);\n  }\n  var l = class {\n    activate(e) {\n      this._terminal = e;\n    }\n    dispose() {\n    }\n    fit() {\n      let e = this.proposeDimensions();\n      !e || !this._terminal || isNaN(e.cols) || isNaN(e.rows) || this._terminal.resize(e.cols, e.rows);\n    }\n    proposeDimensions() {\n      if (!this._terminal || !this._terminal.element || !this._terminal.element.parentElement) return;\n      let e = this._terminal.dimensions;\n      if (!e || e.css.cell.width === 0 || e.css.cell.height === 0) return;\n      let s4 = this._terminal.options.scrollbar?.showScrollbar ?? true, a2 = this._terminal.options.scrollback === 0 || !s4 ? 0 : this._terminal.options.scrollbar?.width ?? 14, r = o(this._terminal.element.parentElement), m4 = parseInt(r.getPropertyValue("height")), d3 = Math.max(0, parseInt(r.getPropertyValue("width"))), n11 = o(this._terminal.element), i5 = { top: parseInt(n11.getPropertyValue("padding-top")), bottom: parseInt(n11.getPropertyValue("padding-bottom")), right: parseInt(n11.getPropertyValue("padding-right")), left: parseInt(n11.getPropertyValue("padding-left")) }, c2 = i5.top + i5.bottom, p3 = i5.right + i5.left, h3 = m4 - c2, u3 = d3 - p3 - a2;\n      return { cols: Math.max(f2, Math.floor(u3 / e.css.cell.width)), rows: Math.max(g2, Math.floor(h3 / e.css.cell.height)) };\n    }\n  };\n\n  // node_modules/@xterm/addon-image/lib/addon-image.mjs\n  var it = Object.create;\n  var Te = Object.defineProperty;\n  var At = Object.getOwnPropertyDescriptor;\n  var rt = Object.getOwnPropertyNames;\n  var st = Object.getPrototypeOf;\n  var nt = Object.prototype.hasOwnProperty;\n  var L = (s4, e) => () => (e || s4((e = { exports: {} }).exports, e), e.exports);\n  var at = (s4, e, t, i5) => {\n    if (e && typeof e == "object" || typeof e == "function") for (let A4 of rt(e)) !nt.call(s4, A4) && A4 !== t && Te(s4, A4, { get: () => e[A4], enumerable: !(i5 = At(e, A4)) || i5.enumerable });\n    return s4;\n  };\n  var M2 = (s4, e, t) => (t = s4 != null ? it(st(s4)) : {}, at(e || !s4 || !s4.__esModule ? Te(t, "default", { value: s4, enumerable: true }) : t, s4));\n  var X = L((m4) => {\n    "use strict";\n    Object.defineProperty(m4, "__esModule", { value: true });\n    m4.DEFAULT_FOREGROUND = m4.DEFAULT_BACKGROUND = m4.PALETTE_ANSI_256 = m4.PALETTE_VT340_GREY = m4.PALETTE_VT340_COLOR = m4.normalizeHLS = m4.normalizeRGB = m4.nearestColorIndex = m4.fromRGBA8888 = m4.toRGBA8888 = m4.alpha = m4.blue = m4.green = m4.red = m4.BIG_ENDIAN = void 0;\n    m4.BIG_ENDIAN = new Uint8Array(new Uint32Array([4278190080]).buffer)[0] === 255;\n    m4.BIG_ENDIAN && console.warn("BE platform detected. This version of node-sixel works only on LE properly.");\n    function ve3(s4) {\n      return s4 & 255;\n    }\n    m4.red = ve3;\n    function Le3(s4) {\n      return s4 >>> 8 & 255;\n    }\n    m4.green = Le3;\n    function Me3(s4) {\n      return s4 >>> 16 & 255;\n    }\n    m4.blue = Me3;\n    function gt3(s4) {\n      return s4 >>> 24 & 255;\n    }\n    m4.alpha = gt3;\n    function B5(s4, e, t, i5 = 255) {\n      return ((i5 & 255) << 24 | (t & 255) << 16 | (e & 255) << 8 | s4 & 255) >>> 0;\n    }\n    m4.toRGBA8888 = B5;\n    function ht3(s4) {\n      return [s4 & 255, s4 >> 8 & 255, s4 >> 16 & 255, s4 >>> 24];\n    }\n    m4.fromRGBA8888 = ht3;\n    function dt3(s4, e) {\n      let t = ve3(s4), i5 = Le3(s4), A4 = Me3(s4), r = Number.MAX_SAFE_INTEGER, n11 = -1;\n      for (let a2 = 0; a2 < e.length; ++a2) {\n        let o2 = t - e[a2][0], h3 = i5 - e[a2][1], g6 = A4 - e[a2][2], d3 = o2 * o2 + h3 * h3 + g6 * g6;\n        if (!d3) return a2;\n        d3 < r && (r = d3, n11 = a2);\n      }\n      return n11;\n    }\n    m4.nearestColorIndex = dt3;\n    function Ie3(s4, e, t) {\n      return Math.max(s4, Math.min(t, e));\n    }\n    function le3(s4, e, t) {\n      return t < 0 && (t += 1), t > 1 && (t -= 1), t * 6 < 1 ? e + (s4 - e) * 6 * t : t * 2 < 1 ? s4 : t * 3 < 2 ? e + (s4 - e) * (4 - t * 6) : e;\n    }\n    function It3(s4, e, t) {\n      if (!t) {\n        let r = Math.round(e * 255);\n        return B5(r, r, r);\n      }\n      let i5 = e < 0.5 ? e * (1 + t) : e + t - e * t, A4 = 2 * e - i5;\n      return B5(Ie3(0, 255, Math.round(le3(i5, A4, s4 + 1 / 3) * 255)), Ie3(0, 255, Math.round(le3(i5, A4, s4) * 255)), Ie3(0, 255, Math.round(le3(i5, A4, s4 - 1 / 3) * 255)));\n    }\n    function c2(s4, e, t) {\n      return (4278190080 | Math.round(t / 100 * 255) << 16 | Math.round(e / 100 * 255) << 8 | Math.round(s4 / 100 * 255)) >>> 0;\n    }\n    m4.normalizeRGB = c2;\n    function lt4(s4, e, t) {\n      return It3((s4 + 240 % 360) / 360, e / 100, t / 100);\n    }\n    m4.normalizeHLS = lt4;\n    m4.PALETTE_VT340_COLOR = new Uint32Array([c2(0, 0, 0), c2(20, 20, 80), c2(80, 13, 13), c2(20, 80, 20), c2(80, 20, 80), c2(20, 80, 80), c2(80, 80, 20), c2(53, 53, 53), c2(26, 26, 26), c2(33, 33, 60), c2(60, 26, 26), c2(33, 60, 33), c2(60, 33, 60), c2(33, 60, 60), c2(60, 60, 33), c2(80, 80, 80)]);\n    m4.PALETTE_VT340_GREY = new Uint32Array([c2(0, 0, 0), c2(13, 13, 13), c2(26, 26, 26), c2(40, 40, 40), c2(6, 6, 6), c2(20, 20, 20), c2(33, 33, 33), c2(46, 46, 46), c2(0, 0, 0), c2(13, 13, 13), c2(26, 26, 26), c2(40, 40, 40), c2(6, 6, 6), c2(20, 20, 20), c2(33, 33, 33), c2(46, 46, 46)]);\n    m4.PALETTE_ANSI_256 = (() => {\n      let s4 = [B5(0, 0, 0), B5(205, 0, 0), B5(0, 205, 0), B5(205, 205, 0), B5(0, 0, 238), B5(205, 0, 205), B5(0, 250, 205), B5(229, 229, 229), B5(127, 127, 127), B5(255, 0, 0), B5(0, 255, 0), B5(255, 255, 0), B5(92, 92, 255), B5(255, 0, 255), B5(0, 255, 255), B5(255, 255, 255)], e = [0, 95, 135, 175, 215, 255];\n      for (let t = 0; t < 6; ++t) for (let i5 = 0; i5 < 6; ++i5) for (let A4 = 0; A4 < 6; ++A4) s4.push(B5(e[t], e[i5], e[A4]));\n      for (let t = 8; t <= 238; t += 10) s4.push(B5(t, t, t));\n      return new Uint32Array(s4);\n    })();\n    m4.DEFAULT_BACKGROUND = B5(0, 0, 0, 255);\n    m4.DEFAULT_FOREGROUND = B5(255, 255, 255, 255);\n  });\n  var Ce = L((_e3) => {\n    "use strict";\n    Object.defineProperty(_e3, "__esModule", { value: true });\n    _e3.InWasm = Bt2;\n    var R4 = (s4) => {\n      if (Uint8Array.fromBase64) return Uint8Array.fromBase64(s4);\n      if (typeof Buffer < "u") return Buffer.from(s4, "base64");\n      let e = atob(s4), t = new Uint8Array(e.length);\n      for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n      return t;\n    };\n    function Bt2(s4) {\n      if (s4.d) {\n        let { t: e, s: t, d: i5 } = s4, A4, r, n11 = WebAssembly;\n        return e === 0 ? t ? (a2) => new n11.Instance(r || (r = new n11.Module(A4 || (A4 = R4(i5)))), a2) : (a2) => r ? n11.instantiate(r, a2) : n11.instantiate(A4 || (A4 = R4(i5)), a2).then((o2) => (r = o2.module) && o2.instance) : e === 1 ? t ? () => r || (r = new n11.Module(A4 || (A4 = R4(i5)))) : () => r ? Promise.resolve(r) : n11.compile(A4 || (A4 = R4(i5))).then((a2) => r = a2) : t ? () => A4 || (A4 = R4(i5)) : () => Promise.resolve(A4 || (A4 = R4(i5)));\n      }\n      if (typeof _wasmCtx > "u") throw new Error(\'must run "inwasm"\');\n      _wasmCtx.add(s4);\n    }\n  });\n  var Be = L((Ee2) => {\n    "use strict";\n    Object.defineProperty(Ee2, "__esModule", { value: true });\n    var pt4 = Ce(), ft4 = (0, pt4.InWasm)({ s: 1, t: 0, d: "AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML" }), T4 = new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map((s4) => s4.charCodeAt(0))), k5 = new Uint32Array(1024);\n    k5.fill(4278190080);\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[T4[s4]] = s4 << 2;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[256 + T4[s4]] = s4 >> 4 | (s4 << 4 & 255) << 8;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[512 + T4[s4]] = s4 >> 2 << 8 | (s4 << 6 & 255) << 16;\n    for (let s4 = 0; s4 < T4.length; ++s4) k5[768 + T4[s4]] = s4 << 16;\n    var Qt3 = new Uint8Array(0), ue2 = class {\n      constructor(e, t, i5) {\n        if (this._inst = null, this._ended = true, this._bytes = 0, this.keepSize = e ?? 1048576, this.maxBytes = t ?? 4294901760, this._bytes = i5 ?? 32768, this._bytes > this.maxBytes || this.maxBytes > 4294901760) throw new Error("invalid byte settings");\n      }\n      get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282]) : Qt3;\n      }\n      release() {\n        this._inst && (this._bytes > this.keepSize ? this._inst = this._m32 = this._d = this._mem = null : (this._m32[1280] = 0, this._m32[1281] = 0, this._m32[1282] = 0));\n      }\n      init(e, t) {\n        if (this.maxBytes = e ?? this.maxBytes, this._bytes = t ?? Math.min(this._bytes, this.maxBytes), this._bytes > this.maxBytes || this.maxBytes > 4294901760) throw Error("invalid byte settings");\n        let i5 = this._m32, A4 = this._bytes + 5152;\n        this._inst ? this._mem.buffer.byteLength < A4 && (this._mem.grow(Math.ceil((A4 - this._mem.buffer.byteLength) / 65536)), i5 = new Uint32Array(this._mem.buffer, 0), this._d = new Uint8Array(this._mem.buffer, 5152)) : (this._mem = new WebAssembly.Memory({ initial: Math.ceil(A4 / 65536) }), this._inst = ft4({ env: { memory: this._mem } }), i5 = new Uint32Array(this._mem.buffer, 0), i5.set(k5, 256), this._d = new Uint8Array(this._mem.buffer, 5152)), i5[1280] = 0, i5[1281] = 0, i5[1282] = 0, this._m32 = i5, this._ended = false;\n      }\n      _realloc(e) {\n        let t = this._m32[1280] + e;\n        if (this._bytes < t) {\n          if (t > this.maxBytes) return -3;\n          let i5 = this._bytes;\n          for (; (i5 *= 2) < t; ) ;\n          if (i5 = Math.min(i5, this.maxBytes), i5 < t) return -3;\n          if (i5 + 5152 > this._mem.buffer.byteLength) {\n            let A4 = Math.ceil((i5 + 5152 - this._mem.buffer.byteLength) / 65536);\n            this._mem.grow(A4), this._m32 = new Uint32Array(this._mem.buffer, 0), this._d = new Uint8Array(this._mem.buffer, 5152);\n          }\n          this._bytes = i5;\n        }\n        return 0;\n      }\n      put(e) {\n        if (!this._inst || this._ended) return -2;\n        if (this._realloc(e.length)) return -3;\n        let t = this._m32;\n        return this._d.set(e, t[1280]), t[1280] += e.length, t[1280] - t[1281] >= 131072 ? this._inst.exports.dec() : 0;\n      }\n      end() {\n        return this._ended = true, this._inst ? this._inst.exports.end() : -2;\n      }\n      get loadedBytes() {\n        return this._inst ? this._m32[1280] : 0;\n      }\n      get freeBytes() {\n        return this._inst ? this.maxBytes - this._m32[1280] : 0;\n      }\n    };\n    Ee2.default = ue2;\n  });\n  var Re = L((fe3) => {\n    "use strict";\n    Object.defineProperty(fe3, "__esModule", { value: true });\n    var Dt3 = Ce(), wt2 = (0, Dt3.InWasm)({ s: 1, t: 0, d: "AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw==" }), pe2 = class {\n      constructor(e) {\n        this.keepSize = e, this.width = 0, this.height = 0;\n      }\n      decode(e) {\n        this.width = e[4] << 24 | e[5] << 16 | e[6] << 8 | e[7], this.height = e[8] << 24 | e[9] << 16 | e[10] << 8 | e[11];\n        let t = this.width * this.height, i5 = t * 4, A4 = e.length, r = Math.max(i5, A4) + (Math.min(i5, A4) >> 1) + 4096;\n        this._inst ? this._mem.buffer.byteLength < r && (this._mem.grow(Math.ceil((r - this._mem.buffer.byteLength) / 65536)), this._d = null) : (this._mem = new WebAssembly.Memory({ initial: Math.ceil(r / 65536) }), this._inst = wt2({ env: { memory: this._mem } })), this._d || (this._d = new Uint8Array(this._mem.buffer));\n        let n11 = this._mem.buffer.byteLength - A4 & -256;\n        return this._d.set(e, n11), this._inst.exports.dec(n11, A4, t), this._d.subarray(1024, 1024 + i5);\n      }\n      release() {\n        this._inst && this._mem.buffer.byteLength > this.keepSize && (this._inst = this._d = this._mem = null);\n      }\n    };\n    fe3.default = pe2;\n  });\n  var Pe = L((re3) => {\n    "use strict";\n    Object.defineProperty(re3, "__esModule", { value: true });\n    re3.LIMITS = void 0;\n    re3.LIMITS = { CHUNK_SIZE: 16384, PALETTE_SIZE: 4096, MAX_WIDTH: 16384, BYTES: "AGFzbQEAAAABJAdgAAF/YAJ/fwBgA39/fwF/YAF/AX9gAABgBH9/f38AYAF/AAIlAgNlbnYLaGFuZGxlX2JhbmQAAwNlbnYLbW9kZV9wYXJzZWQAAwMTEgQAAAAAAQQBAQUBAAACAgAGAwQFAXABBwcFBAEBBwcGCAF/AUGAihoLB9wBDgZtZW1vcnkCABFnZXRfc3RhdGVfYWRkcmVzcwADEWdldF9jaHVua19hZGRyZXNzAAQOZ2V0X3AwX2FkZHJlc3MABRNnZXRfcGFsZXR0ZV9hZGRyZXNzAAYEaW5pdAALBmRlY29kZQAMDWN1cnJlbnRfd2lkdGgADQ5jdXJyZW50X2hlaWdodAAOGV9faW5kaXJlY3RfZnVuY3Rpb25fdGFibGUBAAtfaW5pdGlhbGl6ZQACCXN0YWNrU2F2ZQARDHN0YWNrUmVzdG9yZQASCnN0YWNrQWxsb2MAEwkMAQBBAQsGCgcJDxACDAEBCq5UEgMAAQsFAEGgCAsGAEGQiQELBgBBsIkCCwUAQZAJC+okAQh/QeQIKAIAIQVB4AgoAgAhA0HoCCgCACEIIAFBkIkBaiIJQf8BOgAAIAAgAUgEQCAAQZCJAWohBgNAIAMhBCAGQQFqIQECQCAGLQAAQf8AcSIDQTBrQQlLBEAgASEGDAELQewIKAIAQQJ0QewIaiICKAIAIQADQCACIAMgAEEKbGpBMGsiADYCACABLQAAIQMgAUEBaiIGIQEgA0H/AHEiA0Ewa0EKSQ0ACwsCQAJAAkACQAJAAkACQAJ/AkACQCADQT9rIgBBP00EQCAERQ0BIARBIUYEQAJAQfAIKAIAIgFBASABGyIHIAhqIgFB1AgoAgAiA0gNACADQf//AEoNAANAIANBAnQiAkGgiQJqIgRBoAgpAwA3AwAgAkGoiQJqQaAIKQMANwMAIAJBsIkCakGgCCkDADcDACACQbiJAmpBoAgpAwA3AwAgAkHAiQJqQaAIKQMANwMAIAJByIkCakGgCCkDADcDACACQdCJAmpBoAgpAwA3AwAgAkHYiQJqQaAIKQMANwMAIAJB4IkCakGgCCkDADcDACACQeiJAmpBoAgpAwA3AwAgAkHwiQJqQaAIKQMANwMAIAJB+IkCakGgCCkDADcDACACQYCKAmpBoAgpAwA3AwAgAkGIigJqQaAIKQMANwMAIAJBkIoCakGgCCkDADcDACACQZiKAmpBoAgpAwA3AwAgAkGgigJqQaAIKQMANwMAIAJBqIoCakGgCCkDADcDACACQbCKAmpBoAgpAwA3AwAgAkG4igJqQaAIKQMANwMAIAJBwIoCakGgCCkDADcDACACQciKAmpBoAgpAwA3AwAgAkHQigJqQaAIKQMANwMAIAJB2IoCakGgCCkDADcDACACQeCKAmpBoAgpAwA3AwAgAkHoigJqQaAIKQMANwMAIAJB8IoCakGgCCkDADcDACACQfiKAmpBoAgpAwA3AwAgAkGAiwJqQaAIKQMANwMAIAJBiIsCakGgCCkDADcDACACQZCLAmpBoAgpAwA3AwAgAkGYiwJqQaAIKQMANwMAIAJBoIsCakGgCCkDADcDACACQaiLAmpBoAgpAwA3AwAgAkGwiwJqQaAIKQMANwMAIAJBuIsCakGgCCkDADcDACACQcCLAmpBoAgpAwA3AwAgAkHIiwJqQaAIKQMANwMAIAJB0IsCakGgCCkDADcDACACQdiLAmpBoAgpAwA3AwAgAkHgiwJqQaAIKQMANwMAIAJB6IsCakGgCCkDADcDACACQfCLAmpBoAgpAwA3AwAgAkH4iwJqQaAIKQMANwMAIAJBgIwCakGgCCkDADcDACACQYiMAmpBoAgpAwA3AwAgAkGQjAJqQaAIKQMANwMAIAJBmIwCakGgCCkDADcDACACQaCMAmpBoAgpAwA3AwAgAkGojAJqQaAIKQMANwMAIAJBsIwCakGgCCkDADcDACACQbiMAmpBoAgpAwA3AwAgAkHAjAJqQaAIKQMANwMAIAJByIwCakGgCCkDADcDACACQdCMAmpBoAgpAwA3AwAgAkHYjAJqQaAIKQMANwMAIAJB4IwCakGgCCkDADcDACACQeiMAmpBoAgpAwA3AwAgAkHwjAJqQaAIKQMANwMAIAJB+IwCakGgCCkDADcDACACQYCNAmpBoAgpAwA3AwAgAkGIjQJqQaAIKQMANwMAIAJBkI0CakGgCCkDADcDACACQZiNAmpBoAgpAwA3AwAgAkGwiQZqIARBgAT8CgAAQdQIKAIAQQJ0QcCJCmogBEGABPwKAABB1AgoAgBBAnRB0IkOaiAEQYAE/AoAAEHUCCgCAEECdEHgiRJqIARBgAT8CgAAQdQIKAIAQQJ0QfCJFmogBEGABPwKAABB1AhB1AgoAgAiAkGAAWoiAzYCACABIANIDQEgAkGA/wBIDQALCwJAIABFDQAgCEH//wBLDQBBgIABIAhrIAcgAUH//wBLGyECAkAgAEEBcUUNACACRQ0AIAhBAnRBoIkCaiEDIAIhBCACQQdxIgcEQANAIAMgBTYCACADQQRqIQMgBEEBayEEIAdBAWsiBw0ACwsgAkEBa0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgBEEIayIEDQALCwJAIABBAnFFDQAgAkUNACAIQQJ0QbCJBmohAyACIQQgAkEHcSIHBEADQCADIAU2AgAgA0EEaiEDIARBAWshBCAHQQFrIgcNAAsLIAJBAWtBB0kNAANAIAMgBTYCHCADIAU2AhggAyAFNgIUIAMgBTYCECADIAU2AgwgAyAFNgIIIAMgBTYCBCADIAU2AgAgA0EgaiEDIARBCGsiBA0ACwsCQCAAQQRxRQ0AIAJFDQAgCEECdEHAiQpqIQMgAiEEIAJBB3EiBwRAA0AgAyAFNgIAIANBBGohAyAEQQFrIQQgB0EBayIHDQALCyACQQFrQQdJDQADQCADIAU2AhwgAyAFNgIYIAMgBTYCFCADIAU2AhAgAyAFNgIMIAMgBTYCCCADIAU2AgQgAyAFNgIAIANBIGohAyAEQQhrIgQNAAsLAkAgAEEIcUUNACACRQ0AIAhBAnRB0IkOaiEDIAIhBCACQQdxIgcEQANAIAMgBTYCACADQQRqIQMgBEEBayEEIAdBAWsiBw0ACwsgAkEBa0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgBEEIayIEDQALCwJAIABBEHFFDQAgAkUNACAIQQJ0QeCJEmohAyACIQQgAkEHcSIHBEADQCADIAU2AgAgA0EEaiEDIARBAWshBCAHQQFrIgcNAAsLIAJBAWtBB0kNAANAIAMgBTYCHCADIAU2AhggAyAFNgIUIAMgBTYCECADIAU2AgwgAyAFNgIIIAMgBTYCBCADIAU2AgAgA0EgaiEDIARBCGsiBA0ACwsgAEEgcUUNACACRQ0AIAJBAWshByAIQQJ0QfCJFmohAyACQQdxIgQEQANAIAMgBTYCACADQQRqIQMgAkEBayECIARBAWsiBA0ACwsgB0EHSQ0AA0AgAyAFNgIcIAMgBTYCGCADIAU2AhQgAyAFNgIQIAMgBTYCDCADIAU2AgggAyAFNgIEIAMgBTYCACADQSBqIQMgAkEIayICDQALC0HcCEHcCCgCACAAcjYCACAGQQFqIgIgBi0AAEH/AHEiA0E/ayIAQT9LDQQaDAMLAkBB7AgoAgAiBEEBRgRAQfAIKAIAIgNBzAgoAgAiAUkNASADIAFwIQMMAQtB+AgoAgAhAkH0CCgCACEBAkACQCAEQQVHDQAgAUEBRw0AIAJB6QJODQQMAQsgAkHkAEoNA0H8CCgCAEHkAEoNA0GACSgCAEHkAEoNAwsCQCABRQ0AIAFBAkoNACACQfwIKAIAQYAJKAIAIAFBAnRBiAhqKAIAEQIAIQFB8AgoAgAiA0HMCCgCACICTwR/IAMgAnAFIAMLQQJ0QZAJaiABNgIAC0HwCCgCACIDQcwIKAIAIgFJDQAgAyABcCEDCyADQQJ0QZAJaigCACEFDAELIANB/QBxQSFHBEAgCCEBIAYhAgwECyAEQSNHDQQCQEHsCCgCACICQQFGBEBB8AgoAgAiAUHMCCgCACIASQ0BIAEgAHAhAQwBC0H4CCgCACEBQfQIKAIAIQACQAJAIAJBBUcNACAAQQFHDQAgAUHpAkgNAQwHCyABQeQASg0GQfwIKAIAQeQASg0GQYAJKAIAQeQASg0GCwJAIABFDQAgAEECSg0AIAFB/AgoAgBBgAkoAgAgAEECdEGICGooAgARAgAhAEHwCCgCACIBQcwIKAIAIgJPBH8gASACcAUgAQtBAnRBkAlqIAA2AgALQfAIKAIAIgFBzAgoAgAiAEkNACABIABwIQELIAFBAnRBkAlqKAIAIQUMBAsgCCEBIAYhAgtB1AgoAgAhBgNAAkAgASAGSA0AIAZB//8ASg0AIAZBAnQiBEGgiQJqIgZBoAgpAwA3AwAgBEGoiQJqQaAIKQMANwMAIARBsIkCakGgCCkDADcDACAEQbiJAmpBoAgpAwA3AwAgBEHAiQJqQaAIKQMANwMAIARByIkCakGgCCkDADcDACAEQdCJAmpBoAgpAwA3AwAgBEHYiQJqQaAIKQMANwMAIARB4IkCakGgCCkDADcDACAEQeiJAmpBoAgpAwA3AwAgBEHwiQJqQaAIKQMANwMAIARB+IkCakGgCCkDADcDACAEQYCKAmpBoAgpAwA3AwAgBEGIigJqQaAIKQMANwMAIARBkIoCakGgCCkDADcDACAEQZiKAmpBoAgpAwA3AwAgBEGgigJqQaAIKQMANwMAIARBqIoCakGgCCkDADcDACAEQbCKAmpBoAgpAwA3AwAgBEG4igJqQaAIKQMANwMAIARBwIoCakGgCCkDADcDACAEQciKAmpBoAgpAwA3AwAgBEHQigJqQaAIKQMANwMAIARB2IoCakGgCCkDADcDACAEQeCKAmpBoAgpAwA3AwAgBEHoigJqQaAIKQMANwMAIARB8IoCakGgCCkDADcDACAEQfiKAmpBoAgpAwA3AwAgBEGAiwJqQaAIKQMANwMAIARBiIsCakGgCCkDADcDACAEQZCLAmpBoAgpAwA3AwAgBEGYiwJqQaAIKQMANwMAIARBoIsCakGgCCkDADcDACAEQaiLAmpBoAgpAwA3AwAgBEGwiwJqQaAIKQMANwMAIARBuIsCakGgCCkDADcDACAEQcCLAmpBoAgpAwA3AwAgBEHIiwJqQaAIKQMANwMAIARB0IsCakGgCCkDADcDACAEQdiLAmpBoAgpAwA3AwAgBEHgiwJqQaAIKQMANwMAIARB6IsCakGgCCkDADcDACAEQfCLAmpBoAgpAwA3AwAgBEH4iwJqQaAIKQMANwMAIARBgIwCakGgCCkDADcDACAEQYiMAmpBoAgpAwA3AwAgBEGQjAJqQaAIKQMANwMAIARBmIwCakGgCCkDADcDACAEQaCMAmpBoAgpAwA3AwAgBEGojAJqQaAIKQMANwMAIARBsIwCakGgCCkDADcDACAEQbiMAmpBoAgpAwA3AwAgBEHAjAJqQaAIKQMANwMAIARByIwCakGgCCkDADcDACAEQdCMAmpBoAgpAwA3AwAgBEHYjAJqQaAIKQMANwMAIARB4IwCakGgCCkDADcDACAEQeiMAmpBoAgpAwA3AwAgBEHwjAJqQaAIKQMANwMAIARB+IwCakGgCCkDADcDACAEQYCNAmpBoAgpAwA3AwAgBEGIjQJqQaAIKQMANwMAIARBkI0CakGgCCkDADcDACAEQZiNAmpBoAgpAwA3AwAgBEGwiQZqIAZBgAT8CgAAQdQIKAIAQQJ0QcCJCmogBkGABPwKAABB1AgoAgBBAnRB0IkOaiAGQYAE/AoAAEHUCCgCAEECdEHgiRJqIAZBgAT8CgAAQdQIKAIAQQJ0QfCJFmogBkGABPwKAABB1AhB1AgoAgBBgAFqIgY2AgALIAFB//8ATQRAIABBAXEgAWxBAnRBoIkCaiAFNgIAIABBAXZBAXEgAWxBAnRBsIkGaiAFNgIAIABBAnZBAXEgAWxBAnRBwIkKaiAFNgIAIABBA3ZBAXEgAWxBAnRB0IkOaiAFNgIAIABBBHZBAXEgAWxBAnRB4IkSaiAFNgIAIABBBXYgAWxBAnRB8IkWaiAFNgIAQdQIKAIAIQYLIAFBAWohAUHcCEHcCCgCACAAcjYCACACLQAAIQAgAkEBaiIEIQIgAEH/AHEiA0E/ayIAQcAASQ0ACyAECyECQQAhBCACIQYgASEIIANB/QBxQSFGDQELIANBJGsOCgEDAwMDAwMDAwIDC0HsCEIBNwIADAQLQdgIIAFB2AgoAgAiACAAIAFIGyIAQYCAASAAQYCAAUgbNgIADAILQegIIAFB2AgoAgAiACAAIAFIGyIAQYCAASAAQYCAAUgbIgA2AgBB2AggADYCACAAQQRrEAAEQEHoCEEENgIAQdgIQQQ2AgBB0AhBATYCAA8LEAgMAQsCQCADQTtHDQBB7AgoAgAiAEEHSg0AQewIIABBAWo2AgAgAEECdEHwCGpBADYCAAsgAiEGIAQhAyABIQgMAQtBBCEIIAIhBiAEIQMLIAYgCUkNAAsLQeQIIAU2AgBB4AggAzYCAEHoCCAINgIAC9ELAgF+CH9B2AhCBDcDAEGojQJBoAgpAwAiADcDAEGgjQIgADcDAEGYjQIgADcDAEGQjQIgADcDAEGIjQIgADcDAEGAjQIgADcDAEH4jAIgADcDAEHwjAIgADcDAEHojAIgADcDAEHgjAIgADcDAEHYjAIgADcDAEHQjAIgADcDAEHIjAIgADcDAEHAjAIgADcDAEG4jAIgADcDAEGwjAIgADcDAEGojAIgADcDAEGgjAIgADcDAEGYjAIgADcDAEGQjAIgADcDAEGIjAIgADcDAEGAjAIgADcDAEH4iwIgADcDAEHwiwIgADcDAEHoiwIgADcDAEHgiwIgADcDAEHYiwIgADcDAEHQiwIgADcDAEHIiwIgADcDAEHAiwIgADcDAEG4iwIgADcDAEGwiwIgADcDAEGoiwIgADcDAEGgiwIgADcDAEGYiwIgADcDAEGQiwIgADcDAEGIiwIgADcDAEGAiwIgADcDAEH4igIgADcDAEHwigIgADcDAEHoigIgADcDAEHgigIgADcDAEHYigIgADcDAEHQigIgADcDAEHIigIgADcDAEHAigIgADcDAEG4igIgADcDAEGwigIgADcDAEGoigIgADcDAEGgigIgADcDAEGYigIgADcDAEGQigIgADcDAEGIigIgADcDAEGAigIgADcDAEH4iQIgADcDAEHwiQIgADcDAEHoiQIgADcDAEHgiQIgADcDAEHYiQIgADcDAEHQiQIgADcDAEHIiQIgADcDAEHAiQIgADcDAEG4iQIgADcDAEGwiQIgADcDAEGoCCgCACIEQf8AakGAAW0hCAJAIARBgQFIDQBBASEBIAhBAiAIQQJKG0EBayICQQFxIQMgBEGBAk4EQCACQX5xIQIDQCABQQl0IgdBEHJBoIkCakGwiQJBgAT8CgAAIAdBsI0CakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsLIANFDQAgAUEJdEEQckGgiQJqQbCJAkGABPwKAAALAkAgBEEBSA0AIAhBASAIQQFKGyIDQQFxIQUCQCADQQFrIgdFBEBBACEBDAELIANB/v///wdxIQJBACEBA0AgAUEJdCIGQRByQbCJBmpBsIkCQYAE/AoAACAGQZAEckGwiQZqQbCJAkGABPwKAAAgAUECaiEBIAJBAmsiAg0ACwsgBQRAIAFBCXRBEHJBsIkGakGwiQJBgAT8CgAACyAEQQFIDQAgA0EBcSEFIAcEfyADQf7///8HcSECQQAhAQNAIAFBCXQiBkEQckHAiQpqQbCJAkGABPwKAAAgBkGQBHJBwIkKakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsgAUEHdEEEcgVBBAshASAFBEAgAUECdEHAiQpqQbCJAkGABPwKAAALIARBAUgNACADQQFxIQUgBwR/IANB/v///wdxIQJBACEBA0AgAUEJdCIGQRByQdCJDmpBsIkCQYAE/AoAACAGQZAEckHQiQ5qQbCJAkGABPwKAAAgAUECaiEBIAJBAmsiAg0ACyABQQd0QQRyBUEECyEBIAUEQCABQQJ0QdCJDmpBsIkCQYAE/AoAAAsgBEEBSA0AIANBAXEhBSAHBH8gA0H+////B3EhAkEAIQEDQCABQQl0IgZBEHJB4IkSakGwiQJBgAT8CgAAIAZBkARyQeCJEmpBsIkCQYAE/AoAACABQQJqIQEgAkECayICDQALIAFBB3RBBHIFQQQLIQEgBQRAIAFBAnRB4IkSakGwiQJBgAT8CgAACyAEQQFIDQAgA0EBcSEEIAcEfyADQf7///8HcSECQQAhAQNAIAFBCXQiA0EQckHwiRZqQbCJAkGABPwKAAAgA0GQBHJB8IkWakGwiQJBgAT8CgAAIAFBAmohASACQQJrIgINAAsgAUEHdEEEcgVBBAshASAERQ0AIAFBAnRB8IkWakGwiQJBgAT8CgAAC0HUCCAIQQd0QQRyNgIAC58TAgh/AX5B5AgoAgAhA0HgCCgCACECQegIKAIAIQcgAUGQiQFqIglB/wE6AAAgACABSARAIABBkIkBaiEIA0AgAiEEIAhBAWohAQJAIAgtAABB/wBxIgJBMGtBCUsEQCABIQgMAQtB7AgoAgBBAnRB7AhqIgUoAgAhAANAIAUgAiAAQQpsakEwayIANgIAIAEtAAAhAiABQQFqIgghASACQf8AcSICQTBrQQpJDQALCwJAAkACQAJAAkACQAJ/AkAgAkE/ayIAQT9NBEAgBEUNASAEQSFGBEBB8AgoAgAiAUEBIAEbIgQgB2ohAQJAIABFDQAgB0H//wBLDQBBgIABIAdrIAQgAUH//wBLGyEFAkAgAEEBcUUNACAHQQJ0QaCJAmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEECcUUNACAHQQJ0QbCJBmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEEcUUNACAHQQJ0QcCJCmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEIcUUNACAHQQJ0QdCJDmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLAkAgAEEQcUUNACAHQQJ0QeCJEmohAiAFIgRBB3EiBgRAA0AgAiADNgIAIAJBBGohAiAEQQFrIQQgBkEBayIGDQALCyAFQQFrQQdJDQADQCACIAM2AhwgAiADNgIYIAIgAzYCFCACIAM2AhAgAiADNgIMIAIgAzYCCCACIAM2AgQgAiADNgIAIAJBIGohAiAEQQhrIgQNAAsLIABBIHFFDQAgBUEBayEEIAdBAnRB8IkWaiEAIAVBB3EiAgRAA0AgACADNgIAIABBBGohACAFQQFrIQUgAkEBayICDQALCyAEQQdJDQADQCAAIAM2AhwgACADNgIYIAAgAzYCFCAAIAM2AhAgACADNgIMIAAgAzYCCCAAIAM2AgQgACADNgIAIABBIGohACAFQQhrIgUNAAsLIAhBAWoiBSAILQAAQf8AcSICQT9rIgBBP00NAxoMBAsCQEHsCCgCACIFQQFGBEBB8AgoAgAiAUHMCCgCACIESQ0BIAEgBHAhAQwBC0H4CCgCACEEQfQIKAIAIQECQAJAIAVBBUcNACABQQFHDQAgBEHpAk4NBAwBCyAEQeQASg0DQfwIKAIAQeQASg0DQYAJKAIAQeQASg0DCwJAIAFFDQAgAUECSg0AIARB/AgoAgBBgAkoAgAgAUECdEGICGooAgARAgAhBEHwCCgCACIBQcwIKAIAIgVPBH8gASAFcAUgAQtBAnRBkAlqIAQ2AgALQfAIKAIAIgFBzAgoAgAiBEkNACABIARwIQELIAFBAnRBkAlqKAIAIQMMAQsgAkH9AHFBIUcEQCAHIQEgAiEADAQLIARBI0cNBAJAQewIKAIAIgRBAUYEQEHwCCgCACIBQcwIKAIAIgBJDQEgASAAcCEBDAELQfgIKAIAIQFB9AgoAgAhAAJAAkAgBEEFRw0AIABBAUcNACABQekCSA0BDAcLIAFB5ABKDQZB/AgoAgBB5ABKDQZBgAkoAgBB5ABKDQYLAkAgAEUNACAAQQJKDQAgAUH8CCgCAEGACSgCACAAQQJ0QYgIaigCABECACEAQfAIKAIAIgFBzAgoAgAiBE8EfyABIARwBSABC0ECdEGQCWogADYCAAtB8AgoAgAiAUHMCCgCACIASQ0AIAEgAHAhAQsgAUECdEGQCWooAgAhAwwECyAHIQEgCAshBQNAIAFB//8ATQRAIABBAXEgAWxBAnRBoIkCaiADNgIAIABBAXZBAXEgAWxBAnRBsIkGaiADNgIAIABBAnZBAXEgAWxBAnRBwIkKaiADNgIAIABBA3ZBAXEgAWxBAnRB0IkOaiADNgIAIABBBHZBAXEgAWxBAnRB4IkSaiADNgIAIABBBXYgAWxBAnRB8IkWaiADNgIACyABQQFqIQEgBS0AACEAIAVBAWoiBCEFIABB/wBxIgJBP2siAEHAAEkNAAsgBCEFC0EAIQQgBSEIIAEhByACIQAgAkH9AHFBIUYNAQtBBCEHIAQhAiAAQSRrDgoDAgICAgICAgIBAgtB7AhCATcCAAwCC0GoCCgCAEEEaxAABEBB0AhBATYCAA8LAkBBqAgoAgAiBkEFSA0AQaAIKQMAIQogBkEDa0EBdiIBQQdxIQJBACEAIAFBAWtBB08EQCABQfj///8HcSEFA0AgAEEDdCIBQbCJAmogCjcDACABQQhyQbCJAmogCjcDACABQRByQbCJAmogCjcDACABQRhyQbCJAmogCjcDACABQSByQbCJAmogCjcDACABQShyQbCJAmogCjcDACABQTByQbCJAmogCjcDACABQThyQbCJAmogCjcDACAAQQhqIQAgBUEIayIFDQALCyACRQ0AA0AgAEEDdEGwiQJqIAo3AwAgAEEBaiEAIAJBAWsiAg0ACwtBwIkGQbCJAiAGQQJ0IgD8CgAAQdCJCkGwiQIgAPwKAABB4IkOQbCJAiAA/AoAAEHwiRJBsIkCIAD8CgAAQYCKFkGwiQIgAPwKAAAgBCECDAELAkAgAEE7Rw0AQewIKAIAIgBBB0oNAEHsCCAAQQFqNgIAIABBAnRB8AhqQQA2AgALIAEhBwsgCCAJSQ0ACwtB5AggAzYCAEHgCCACNgIAQegIIAc2AgAL4gcCBX8BfgJAQdAIAn8CQAJAIAAgAU4NACABQZCJAWohBiAAQZCJAWohBQNAIAUtAAAiA0H/AHEhAgJAAkACQAJAAkACQAJAQeAIKAIAIgRBIkcEQCAEDQcgAkEiRgRAQewIQgE3AgBB4AhBIjYCAAwICyACQT9rQcAASQ0GIANBIWsiAkEMTQ0BDAULAkAgAkEwayIEQQlNBEBB7AgoAgBBAnRB7AhqIgIgBCACKAIAQQpsajYCAAwBC0HsCCgCACEEIAJBO0YEQCAEQQdKDQFB7AggBEEBajYCACAEQQJ0QfAIakEANgIADAELIARBBEYEQEHECEECNgIAQbAIQfAIKQMANwMAQbgIQfgIKAIAIgI2AgBBvAhB/AgoAgAiBDYCAEHICEECQQFBwAgoAgAiAxs2AgBBrAggBEEAIAMbNgIAQagIIAJBgIABIAJBgIABSBtBBGpBACADGzYCAEHgCEEANgIADAoLIAJBP2tBwABJDQQLIANBIWsiAkEMTQ0BDAILQQEgAnRBjSBxRQ0DDAQLQQEgAnRBjSBxDQELIANBoQFrIgJBDEsNA0EBIAJ0QY0gcUUNAwtBxAhCgYCAgBA3AgBBsAhB8AgoAgBBAEHsCCgCACICQQBKGzYCAEG0CEH0CCgCAEEAIAJBAUobNgIAQbgIQfgIKAIAQQAgAkECShs2AgBB4AhBADYCAEG8CEEANgIADAQLIANBoQFrIgJBDEsNAUEBIAJ0QY0gcUUNAQtBxAhCgYCAgBA3AgBBsAhCADcDAEG4CEIANwMADAMLIAVBAWoiBSAGSQ0ACwsCQEHICCgCAA4DAwEAAQsCQEGoCCgCACIFQQVIDQBBoAgpAwAhByAFQQNrQQF2IgNBB3EhBEEAIQIgA0EBa0EHTwRAIANB+P///wdxIQYDQCACQQN0IgNBsIkCaiAHNwMAIANBCHJBsIkCaiAHNwMAIANBEHJBsIkCaiAHNwMAIANBGHJBsIkCaiAHNwMAIANBIHJBsIkCaiAHNwMAIANBKHJBsIkCaiAHNwMAIANBMHJBsIkCaiAHNwMAIANBOHJBsIkCaiAHNwMAIAJBCGohAiAGQQhrIgYNAAsLIARFDQADQCACQQN0QbCJAmogBzcDACACQQFqIQIgBEEBayIEDQALC0HAiQZBsIkCIAVBAnQiA/wKAABB0IkKQbCJAiAD/AoAAEHgiQ5BsIkCIAP8CgAAQfCJEkGwiQIgA/wKAABBgIoWQbCJAiAD/AoAAEECDAELEAhByAgoAgALEAEiAjYCACACDQAgACABQcgIKAIAQQJ0QYAIaigCABEBAAsLdABB6AhBBDYCAEHkCCAANgIAQewIQgE3AgBBxAhCADcCAEHACCADNgIAQdwIQgA3AgBBqAhCADcDAEGwCEIANwMAQbgIQgA3AwBBzAggAkGAICACQYAgSRs2AgBBoAggAa1CgYCAgBB+NwMAQdAIQQA2AgALIwBB0AgoAgBFBEAgACABQcgIKAIAQQJ0QYAIaigCABEBAAsLWgECfwJAAkACQEHICCgCAEEBaw4CAAECC0HYCEHoCCgCACIAQdgIKAIAIgEgACABShsiAEGAgAEgAEGAgAFIGyIANgIAIABBBGsPC0GoCCgCAEEEayEACyAAC0IBAX8Cf0EGQdwIKAIAIgBBIHENABpBBSAAQRBxDQAaQQQgAEEIcQ0AGkEDIABBBHENABpBAiAAQQFxIABBAnEbCwu9BQEFfQJ/IAJFBEAgAUH/AWxBMmpB5ABtIgBBCHQgAHIgAEEQdHIMAQsgArJDAADIQpUhBiAAQfABarJDAAC0Q5UhBQJ9IAGyQwAAyEKVIgNDAAAAP10EQCADIAZDAACAP5KUDAELIAYgA0MAAIA/IAaTlJILIQcgAyADkiEGAkAgBUOrqqo+kiIEQwAAAABdBEAgBEMAAIA/kiEEDAELIARDAACAP15FDQAgBEMAAIC/kiEECyAGIAeTIQMgBUMAAAAAXSEAAn8CfSADIAcgA5NDAADAQJQgBJSSIARDq6oqPl0NABogByAEQwAAAD9dDQAaIAMgBEOrqio/XUUNABogAyAHIAOTIARDAADAwJRDAACAQJKUkgtDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALIQECQCAABEAgBUMAAIA/kiEEDAELIAUiBEMAAIA/XkUNACAFQwAAgL+SIQQLIAVDq6qqvpIiBUMAAAAAXSECAn8CfSADIAcgA5NDAADAQJQgBJSSIARDq6oqPl0NABogByAEQwAAAD9dDQAaIAMgBEOrqio/XUUNABogAyAHIAOTIARDAADAwJRDAACAQJKUkgtDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALIQACQCACBEAgBUMAAIA/kiEFDAELIAVDAACAP15FDQAgBUMAAIC/kiEFCwJAIAVDq6oqPl0EQCADIAcgA5NDAADAQJQgBZSSIQcMAQsgBUMAAAA/XQ0AIAVDq6oqP11FBEAgAyEHDAELIAMgByADkyAFQwAAwMCUQwAAgECSlJIhBwsgAEEIdAJ/IAdDAAB/Q5RDAAAAP5IiBkMAAIBPXSAGQwAAAABgcQRAIAapDAELQQALQRB0ciABcgtBgICAeHILNwAgAEH/AWxBMmpB5ABtIAFB/wFsQTJqQeQAbUEIdHIgAkH/AWxBMmpB5ABtQRB0ckGAgIB4cgsEACMACwYAIAAkAAsQACMAIABrQXBxIgAkACAACwsYAQBBgAgLEQEAAAACAAAAAwAAAAQAAAAF" };\n  });\n  var We = L((y5) => {\n    "use strict";\n    Object.defineProperty(y5, "__esModule", { value: true });\n    y5.decodeAsync = y5.decode = y5.Decoder = y5.DecoderAsync = void 0;\n    var K4 = X(), Q3 = Pe();\n    function Lt3(s4) {\n      if (typeof Buffer < "u") return Buffer.from(s4, "base64");\n      let e = atob(s4), t = new Uint8Array(e.length);\n      for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n      return t;\n    }\n    var Ye3 = Lt3(Q3.LIMITS.BYTES), P5, se3 = new Uint32Array(), ye3 = class {\n      constructor() {\n        this.bandHandler = (e) => 1, this.modeHandler = (e) => 1;\n      }\n      handle_band(e) {\n        return this.bandHandler(e);\n      }\n      mode_parsed(e) {\n        return this.modeHandler(e);\n      }\n    }, Mt2 = { memoryLimit: 2048 * 65536, sixelColor: K4.DEFAULT_FOREGROUND, fillColor: K4.DEFAULT_BACKGROUND, palette: K4.PALETTE_VT340_COLOR, paletteLimit: Q3.LIMITS.PALETTE_SIZE, truncate: true };\n    function qe2(s4) {\n      let e = new ye3(), t = { env: { handle_band: e.handle_band.bind(e), mode_parsed: e.mode_parsed.bind(e) } };\n      return WebAssembly.instantiate(P5 || Ye3, t).then((i5) => (P5 = P5 || i5.module, new Y2(s4, i5.instance || i5, e)));\n    }\n    y5.DecoderAsync = qe2;\n    var Y2 = class {\n      constructor(e, t, i5) {\n        if (this._PIXEL_OFFSET = Q3.LIMITS.MAX_WIDTH + 4, this._canvas = se3, this._bandWidths = [], this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._lastOffset = 0, this._currentHeight = 0, this._opts = Object.assign({}, Mt2, e), this._opts.paletteLimit > Q3.LIMITS.PALETTE_SIZE) throw new Error(`DecoderOptions.paletteLimit must not exceed ${Q3.LIMITS.PALETTE_SIZE}`);\n        if (t) i5.bandHandler = this._handle_band.bind(this), i5.modeHandler = this._initCanvas.bind(this);\n        else {\n          let A4 = P5 || (P5 = new WebAssembly.Module(Ye3));\n          t = new WebAssembly.Instance(A4, { env: { handle_band: this._handle_band.bind(this), mode_parsed: this._initCanvas.bind(this) } });\n        }\n        this._instance = t, this._wasm = this._instance.exports, this._chunk = new Uint8Array(this._wasm.memory.buffer, this._wasm.get_chunk_address(), Q3.LIMITS.CHUNK_SIZE), this._states = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_state_address(), 12), this._palette = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_palette_address(), Q3.LIMITS.PALETTE_SIZE), this._palette.set(this._opts.palette), this._pSrc = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_p0_address()), this._wasm.init(K4.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n      }\n      get _fillColor() {\n        return this._states[0];\n      }\n      get _truncate() {\n        return this._states[8];\n      }\n      get _rasterWidth() {\n        return this._states[6];\n      }\n      get _rasterHeight() {\n        return this._states[7];\n      }\n      get _width() {\n        return this._states[2] ? this._states[2] - 4 : 0;\n      }\n      get _height() {\n        return this._states[3];\n      }\n      get _level() {\n        return this._states[9];\n      }\n      get _mode() {\n        return this._states[10];\n      }\n      get _paletteLimit() {\n        return this._states[11];\n      }\n      _initCanvas(e) {\n        if (e === 2) {\n          let t = this.width * this.height;\n          if (t > this._canvas.length) {\n            if (this._opts.memoryLimit && t * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n            this._canvas = new Uint32Array(t);\n          }\n          this._maxWidth = this._width;\n        } else if (e === 1) if (this._level === 2) {\n          let t = Math.min(this._rasterWidth, Q3.LIMITS.MAX_WIDTH) * this._rasterHeight;\n          if (t > this._canvas.length) {\n            if (this._opts.memoryLimit && t * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n            this._canvas = new Uint32Array(t);\n          }\n        } else this._canvas.length < 65536 && (this._canvas = new Uint32Array(65536));\n        return 0;\n      }\n      _realloc(e, t) {\n        let i5 = e + t;\n        if (i5 > this._canvas.length) {\n          if (this._opts.memoryLimit && i5 * 4 > this._opts.memoryLimit) throw this.release(), new Error("image exceeds memory limit");\n          let A4 = new Uint32Array(Math.ceil(i5 / 65536) * 65536);\n          A4.set(this._canvas), this._canvas = A4;\n        }\n      }\n      _handle_band(e) {\n        let t = this._PIXEL_OFFSET, i5 = this._lastOffset;\n        if (this._mode === 2) {\n          let A4 = this.height - this._currentHeight, r = 0;\n          for (; r < 6 && A4 > 0; ) this._canvas.set(this._pSrc.subarray(t * r, t * r + e), i5 + e * r), r++, A4--;\n          this._lastOffset += e * r, this._currentHeight += r;\n        } else if (this._mode === 1) {\n          this._realloc(i5, e * 6), this._maxWidth = Math.max(this._maxWidth, e), this._minWidth = Math.min(this._minWidth, e);\n          for (let A4 = 0; A4 < 6; ++A4) this._canvas.set(this._pSrc.subarray(t * A4, t * A4 + e), i5 + e * A4);\n          this._bandWidths.push(e), this._lastOffset += e * 6, this._currentHeight += 6;\n        }\n        return 0;\n      }\n      get width() {\n        return this._mode !== 1 ? this._width : Math.max(this._maxWidth, this._wasm.current_width());\n      }\n      get height() {\n        return this._mode !== 1 ? this._height : this._wasm.current_width() ? this._bandWidths.length * 6 + this._wasm.current_height() : this._bandWidths.length * 6;\n      }\n      get palette() {\n        return this._palette.subarray(0, this._paletteLimit);\n      }\n      get memoryUsage() {\n        return this._canvas.byteLength + this._wasm.memory.buffer.byteLength + 8 * this._bandWidths.length;\n      }\n      get properties() {\n        return { width: this.width, height: this.height, mode: this._mode, level: this._level, truncate: !!this._truncate, paletteLimit: this._paletteLimit, fillColor: this._fillColor, memUsage: this.memoryUsage, rasterAttributes: { numerator: this._states[4], denominator: this._states[5], width: this._rasterWidth, height: this._rasterHeight } };\n      }\n      init(e = this._opts.fillColor, t = this._opts.palette, i5 = this._opts.paletteLimit, A4 = this._opts.truncate) {\n        this._wasm.init(this._opts.sixelColor, e, i5, A4 ? 1 : 0), t && this._palette.set(t.subarray(0, Q3.LIMITS.PALETTE_SIZE)), this._bandWidths.length = 0, this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._lastOffset = 0, this._currentHeight = 0;\n      }\n      decode(e, t = 0, i5 = e.length) {\n        let A4 = t;\n        for (; A4 < i5; ) {\n          let r = Math.min(i5 - A4, Q3.LIMITS.CHUNK_SIZE);\n          this._chunk.set(e.subarray(A4, A4 += r)), this._wasm.decode(0, r);\n        }\n      }\n      decodeString(e, t = 0, i5 = e.length) {\n        let A4 = t;\n        for (; A4 < i5; ) {\n          let r = Math.min(i5 - A4, Q3.LIMITS.CHUNK_SIZE);\n          for (let n11 = 0, a2 = A4; n11 < r; ++n11, ++a2) this._chunk[n11] = e.charCodeAt(a2);\n          A4 += r, this._wasm.decode(0, r);\n        }\n      }\n      get data32() {\n        if (this._mode === 0 || !this.width || !this.height) return se3;\n        let e = this._wasm.current_width();\n        if (this._mode === 2) {\n          let t = this.height - this._currentHeight;\n          if (t > 0) {\n            let i5 = this._PIXEL_OFFSET, A4 = this._lastOffset, r = 0;\n            for (; r < 6 && t > 0; ) this._canvas.set(this._pSrc.subarray(i5 * r, i5 * r + e), A4 + e * r), r++, t--;\n            t && this._canvas.fill(this._fillColor, A4 + e * r);\n          }\n          return this._canvas.subarray(0, this.width * this.height);\n        }\n        if (this._mode === 1) {\n          if (this._minWidth === this._maxWidth) {\n            let r = false;\n            if (e) if (e !== this._minWidth) r = true;\n            else {\n              let n11 = this._PIXEL_OFFSET, a2 = this._lastOffset;\n              this._realloc(a2, e * 6);\n              for (let o2 = 0; o2 < 6; ++o2) this._canvas.set(this._pSrc.subarray(n11 * o2, n11 * o2 + e), a2 + e * o2);\n            }\n            if (!r) return this._canvas.subarray(0, this.width * this.height);\n          }\n          let t = new Uint32Array(this.width * this.height);\n          t.fill(this._fillColor);\n          let i5 = 0, A4 = 0;\n          for (let r = 0; r < this._bandWidths.length; ++r) {\n            let n11 = this._bandWidths[r];\n            for (let a2 = 0; a2 < 6; ++a2) t.set(this._canvas.subarray(A4, A4 += n11), i5), i5 += this.width;\n          }\n          if (e) {\n            let r = this._PIXEL_OFFSET, n11 = this._wasm.current_height();\n            for (let a2 = 0; a2 < n11; ++a2) t.set(this._pSrc.subarray(r * a2, r * a2 + e), i5 + this.width * a2);\n          }\n          return t;\n        }\n        return se3;\n      }\n      get data8() {\n        return new Uint8ClampedArray(this.data32.buffer, 0, this.width * this.height * 4);\n      }\n      release() {\n        this._canvas = se3, this._bandWidths.length = 0, this._maxWidth = 0, this._minWidth = Q3.LIMITS.MAX_WIDTH, this._wasm.init(K4.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n      }\n    };\n    y5.Decoder = Y2;\n    function Rt3(s4, e) {\n      let t = new Y2(e);\n      return t.init(), typeof s4 == "string" ? t.decodeString(s4) : t.decode(s4), { width: t.width, height: t.height, data32: t.data32, data8: t.data8 };\n    }\n    y5.decode = Rt3;\n    async function kt2(s4, e) {\n      let t = await qe2(e);\n      return t.init(), typeof s4 == "string" ? t.decodeString(s4) : t.decode(s4), { width: t.width, height: t.height, data32: t.data32, data8: t.data8 };\n    }\n    y5.decodeAsync = kt2;\n  });\n  function G2(s4) {\n    return { dispose: s4 };\n  }\n  var F2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(e) {\n      return this._isDisposed ? e.dispose() : this._disposables.add(e), e;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let e of this._disposables) e.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.clear();\n    }\n  };\n  var H2 = class {\n    constructor() {\n      this._store = new F2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(e) {\n      return this._store.add(e);\n    }\n  };\n  H2.None = Object.freeze({ dispose() {\n  } });\n  var W = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(e) {\n      this._isDisposed || e === this._value || (this._value?.dispose(), this._value = e);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var z2 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (e, t, i5) => {\n        if (this._disposed) return G2(() => {\n        });\n        let A4 = { fn: e, thisArgs: t };\n        this._listeners.push(A4);\n        let r = G2(() => {\n          let n11 = this._listeners.indexOf(A4);\n          n11 !== -1 && this._listeners.splice(n11, 1);\n        });\n        return i5 && (Array.isArray(i5) ? i5.push(r) : i5.add(r)), r;\n      }, this._event);\n    }\n    fire(e) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: t, thisArgs: i5 } = this._listeners[0];\n          t.call(i5, e);\n          return;\n        }\n        default: {\n          let t = this._listeners.slice();\n          for (let { fn: i5, thisArgs: A4 } of t) i5.call(A4, e);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var ot;\n  ((A4) => {\n    function s4(r, n11) {\n      return r((a2) => n11.fire(a2));\n    }\n    A4.forward = s4;\n    function e(r, n11) {\n      return (a2, o2, h3) => r((g6) => a2.call(o2, n11(g6)), void 0, h3);\n    }\n    A4.map = e;\n    function t(...r) {\n      return (n11, a2, o2) => {\n        let h3 = new F2();\n        for (let g6 of r) h3.add(g6((d3) => n11.call(a2, d3)));\n        return o2 && (Array.isArray(o2) ? o2.push(h3) : o2.add(h3)), h3;\n      };\n    }\n    A4.any = t;\n    function i5(r, n11, a2) {\n      return n11(a2), r((o2) => n11(o2));\n    }\n    A4.runAndSubscribe = i5;\n  })(ot ||= {});\n  var me = M2(X());\n  var ct = 4096;\n  var ce = 24;\n  var D2 = class s extends H2 {\n    constructor(t) {\n      super();\n      this._terminal = t;\n      this._layers = /* @__PURE__ */ new Map();\n      this._optionsRefresh = this._register(new W());\n      this._oldOpen = this._terminal._core.open, this._terminal._core.open = (i5) => {\n        this._oldOpen?.call(this._terminal._core, i5), this._open();\n      }, this._terminal._core.screenElement && this._open(), this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange((i5) => {\n        i5 === "fontSize" && (this.rescaleCanvas(), this._renderService?.refreshRows(0, this._terminal.rows));\n      }), this._register(G2(() => {\n        this.removeLayerFromDom(), this.removeLayerFromDom("bottom"), this._terminal._core && this._oldOpen && (this._terminal._core.open = this._oldOpen, this._oldOpen = void 0), this._renderService && this._oldSetRenderer && (this._renderService.setRenderer = this._oldSetRenderer, this._oldSetRenderer = void 0), this._renderService = void 0, this._layers.clear(), this._placeholderBitmap?.close(), this._placeholderBitmap = void 0, this._placeholder = void 0;\n      }));\n    }\n    get canvas() {\n      return this._layers.get("top")?.canvas;\n    }\n    static createCanvas(t, i5, A4) {\n      let r = (t ?? document).createElement("canvas");\n      return r.width = i5 | 0, r.height = A4 | 0, r;\n    }\n    static createImageData(t, i5, A4, r) {\n      if (typeof ImageData != "function") {\n        let n11 = t.createImageData(i5, A4);\n        return r && n11.data.set(new Uint8ClampedArray(r, 0, i5 * A4 * 4)), n11;\n      }\n      return r ? new ImageData(new Uint8ClampedArray(r, 0, i5 * A4 * 4), i5, A4) : new ImageData(i5, A4);\n    }\n    static createImageBitmap(t) {\n      return typeof createImageBitmap != "function" ? Promise.resolve(void 0) : createImageBitmap(t);\n    }\n    showPlaceholder(t) {\n      t ? !this._placeholder && this.cellSize.height !== -1 && this._createPlaceHolder(Math.max(this.cellSize.height + 1, ce)) : (this._placeholderBitmap?.close(), this._placeholderBitmap = void 0, this._placeholder = void 0), this._renderService?.refreshRows(0, this._terminal.rows);\n    }\n    get dimensions() {\n      return this._terminal.dimensions;\n    }\n    get cellSize() {\n      return { width: this.dimensions?.css.cell.width || -1, height: this.dimensions?.css.cell.height || -1 };\n    }\n    clearLines(t, i5, A4) {\n      let r = t * (this.dimensions?.css.cell.height || 0), n11 = this.dimensions?.css.canvas.width || 0, a2 = (++i5 - t) * (this.dimensions?.css.cell.height || 0);\n      (!A4 || A4 === "top") && this._layers.get("top")?.clearRect(0, r, n11, a2), (!A4 || A4 === "bottom") && this._layers.get("bottom")?.clearRect(0, r, n11, a2);\n    }\n    clearAll(t) {\n      if (!t || t === "top") {\n        let i5 = this._layers.get("top");\n        i5?.clearRect(0, 0, i5.canvas.width, i5.canvas.height);\n      }\n      if (!t || t === "bottom") {\n        let i5 = this._layers.get("bottom");\n        i5?.clearRect(0, 0, i5.canvas.width, i5.canvas.height);\n      }\n    }\n    draw(t, i5, A4, r, n11 = 1) {\n      let a2 = this._layers.get(t.layer);\n      if (!a2) return;\n      let { width: o2, height: h3 } = this.cellSize;\n      if (o2 === -1 || h3 === -1) return;\n      this._rescaleImage(t, o2, h3);\n      let g6 = t.actual, d3 = Math.ceil(g6.width / o2), I4 = i5 % d3 * o2, _5 = Math.floor(i5 / d3) * h3, l4 = A4 * o2, u3 = r * h3, C4 = n11 * o2 + I4 > g6.width ? g6.width - I4 : n11 * o2, p3 = _5 + h3 > g6.height ? g6.height - _5 : h3;\n      a2.drawImage(g6, Math.floor(I4), Math.floor(_5), Math.ceil(C4), Math.ceil(p3), Math.floor(l4), Math.floor(u3), Math.ceil(C4), Math.ceil(p3));\n    }\n    extractTile(t, i5) {\n      let { width: A4, height: r } = this.cellSize;\n      if (A4 === -1 || r === -1) return;\n      this._rescaleImage(t, A4, r);\n      let n11 = t.actual, a2 = Math.ceil(n11.width / A4), o2 = i5 % a2 * A4, h3 = Math.floor(i5 / a2) * r, g6 = A4 + o2 > n11.width ? n11.width - o2 : A4, d3 = h3 + r > n11.height ? n11.height - h3 : r, I4 = s.createCanvas(this.document, g6, d3), _5 = I4.getContext("2d");\n      if (_5) return _5.drawImage(n11, Math.floor(o2), Math.floor(h3), Math.floor(g6), Math.floor(d3), 0, 0, Math.floor(g6), Math.floor(d3)), I4;\n    }\n    drawPlaceholder(t, i5, A4 = 1) {\n      let r = this._layers.get("top");\n      if (r) {\n        let { width: n11, height: a2 } = this.cellSize;\n        if (n11 === -1 || a2 === -1 || (this._placeholder ? a2 >= this._placeholder.height && this._createPlaceHolder(a2 + 1) : this._createPlaceHolder(Math.max(a2 + 1, ce)), !this._placeholder)) return;\n        r.drawImage(this._placeholderBitmap ?? this._placeholder, t * n11, i5 * a2 % 2 ? 0 : 1, n11 * A4, a2, t * n11, i5 * a2, n11 * A4, a2);\n      }\n    }\n    rescaleCanvas() {\n      let t = this.dimensions?.css.canvas.width || 0, i5 = this.dimensions?.css.canvas.height || 0;\n      for (let A4 of this._layers.values()) (A4.canvas.width !== t || A4.canvas.height !== i5) && (A4.canvas.width = t, A4.canvas.height = i5);\n    }\n    _rescaleImage(t, i5, A4) {\n      if (i5 === t.actualCellSize.width && A4 === t.actualCellSize.height) return;\n      let { width: r, height: n11 } = t.origCellSize;\n      if (i5 === r && A4 === n11) {\n        t.actual = t.orig, t.actualCellSize.width = r, t.actualCellSize.height = n11;\n        return;\n      }\n      let a2 = s.createCanvas(this.document, Math.ceil(t.orig.width * i5 / r), Math.ceil(t.orig.height * A4 / n11)), o2 = a2.getContext("2d");\n      o2 && (o2.drawImage(t.orig, 0, 0, a2.width, a2.height), t.actual = a2, t.actualCellSize.width = i5, t.actualCellSize.height = A4);\n    }\n    _open() {\n      this._renderService = this._terminal._core._renderService, this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService), this._renderService.setRenderer = (t) => {\n        for (let i5 of [...this._layers.keys()]) this.removeLayerFromDom(i5);\n        this._oldSetRenderer?.call(this._renderService, t);\n      };\n    }\n    insertLayerToDom(t = "top") {\n      if (!this.document || !this._terminal._core.screenElement) {\n        console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");\n        return;\n      }\n      if (this._layers.has(t)) return;\n      let i5 = s.createCanvas(this.document, this.dimensions?.css.canvas.width || 0, this.dimensions?.css.canvas.height || 0);\n      i5.classList.add(`xterm-image-layer-${t}`);\n      let A4 = this._terminal._core.screenElement;\n      A4.style.isolation = "isolate", t === "bottom" ? (i5.style.zIndex = "-1", A4.insertBefore(i5, A4.firstChild)) : (i5.style.zIndex = "0", A4.appendChild(i5));\n      let r = i5.getContext("2d", { alpha: true });\n      if (!r) {\n        i5.remove();\n        return;\n      }\n      this._layers.set(t, r), this.clearAll(t);\n    }\n    removeLayerFromDom(t = "top") {\n      let i5 = this._layers.get(t);\n      i5 && (i5.canvas.remove(), this._layers.delete(t));\n    }\n    hasLayer(t) {\n      return this._layers.has(t);\n    }\n    _createPlaceHolder(t = ce) {\n      this._placeholderBitmap?.close(), this._placeholderBitmap = void 0;\n      let i5 = 32, A4 = s.createCanvas(this.document, i5, t), r = A4.getContext("2d", { alpha: false });\n      if (!r) return;\n      let n11 = s.createImageData(r, i5, t), a2 = new Uint32Array(n11.data.buffer), o2 = (0, me.toRGBA8888)(0, 0, 0), h3 = (0, me.toRGBA8888)(255, 255, 255);\n      a2.fill(o2);\n      for (let I4 = 0; I4 < t; ++I4) {\n        let _5 = I4 % 2, l4 = I4 * i5;\n        for (let u3 = 0; u3 < i5; u3 += 2) a2[l4 + u3 + _5] = h3;\n      }\n      r.putImageData(n11, 0, 0);\n      let g6 = screen.width + i5 - 1 & ~(i5 - 1) || ct;\n      this._placeholder = s.createCanvas(this.document, g6, t);\n      let d3 = this._placeholder.getContext("2d", { alpha: false });\n      if (!d3) {\n        this._placeholder = void 0;\n        return;\n      }\n      for (let I4 = 0; I4 < g6; I4 += i5) d3.drawImage(A4, I4, 0);\n      s.createImageBitmap(this._placeholder).then((I4) => this._placeholderBitmap = I4);\n    }\n    get document() {\n      return this._terminal._core._coreBrowserService?.window.document;\n    }\n  };\n  var w2 = { width: 7, height: 14 };\n  var U2 = class s2 {\n    constructor(e = 0, t = 0, i5 = -1, A4 = -1) {\n      this.imageId = i5;\n      this.tileId = A4;\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = e, this._urlId = t;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(e) {\n      this._ext = e;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(e) {\n      this._ext &= -469762049, this._ext |= e << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(e) {\n      this._ext &= -67108864, this._ext |= e & 67108863;\n    }\n    get underlineVariantOffset() {\n      let e = (this._ext & 3758096384) >> 29;\n      return e < 0 ? e ^ 4294967288 : e;\n    }\n    set underlineVariantOffset(e) {\n      this._ext &= 536870911, this._ext |= e << 29 & 3758096384;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(e) {\n      this._urlId = e;\n    }\n    clone() {\n      return new s2(this._ext, this._urlId, this.imageId, this.tileId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0 && this.imageId === -1;\n    }\n  };\n  var Z2 = new U2();\n  var j2 = class {\n    constructor(e, t, i5) {\n      this._terminal = e;\n      this._renderer = t;\n      this._opts = i5;\n      this._images = /* @__PURE__ */ new Map();\n      this._lastId = 0;\n      this._lowestId = 0;\n      this._fullyCleared = false;\n      this._needsFullClear = false;\n      this._pixelLimit = 25e5;\n      try {\n        this.setLimit(this._opts.storageLimit);\n      } catch (A4) {\n        A4 instanceof Error && console.error(A4.message), console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n      }\n      this._viewportMetrics = { cols: this._terminal.cols, rows: this._terminal.rows };\n    }\n    dispose() {\n      this.reset();\n    }\n    reset() {\n      for (let e of this._images.values()) e.marker?.dispose();\n      this._images.clear(), this._renderer.clearAll();\n    }\n    getLimit() {\n      return this._pixelLimit * 4 / 1e6;\n    }\n    setLimit(e) {\n      if (e < 0.5 || e > 1e3) throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");\n      this._pixelLimit = e / 4 * 1e6 >>> 0, this._evictOldest(0);\n    }\n    getUsage() {\n      return this._getStoredPixels() * 4 / 1e6;\n    }\n    _getStoredPixels() {\n      let e = 0;\n      for (let t of this._images.values()) t.orig && (e += t.orig.width * t.orig.height, t.actual && t.actual !== t.orig && (e += t.actual.width * t.actual.height));\n      return e;\n    }\n    _delImg(e) {\n      let t = this._images.get(e);\n      t && (this._images.delete(e), window.ImageBitmap && t.orig instanceof ImageBitmap && t.orig.close(), this.onImageDeleted?.(e));\n    }\n    wipeAlternate() {\n      let e = [];\n      for (let [t, i5] of this._images.entries()) i5.bufferType === "alternate" && (i5.marker?.dispose(), e.push(t));\n      for (let t of e) this._delImg(t);\n      this._needsFullClear = true, this._fullyCleared = false;\n    }\n    deleteImage(e) {\n      let t = this._images.get(e);\n      t && (t.marker?.dispose(), this._delImg(e));\n    }\n    addImage(e, t, i5 = "top", A4 = 0) {\n      this._evictOldest(e.width * e.height);\n      let r = this._renderer.cellSize;\n      (r.width === -1 || r.height === -1) && (r = w2);\n      let n11 = Math.ceil(e.width / r.width), a2 = Math.ceil(e.height / r.height), o2 = ++this._lastId, h3 = this._terminal._core.buffer, g6 = this._terminal.cols, d3 = this._terminal.rows, I4 = h3.x, _5 = h3.y, l4 = I4, u3 = 0;\n      t || (h3.x = 0, h3.y = 0, l4 = 0), this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h3.y);\n      for (let f5 = 0; f5 < a2; ++f5) {\n        let S4 = h3.lines.get(h3.y + h3.ybase);\n        for (let b4 = 0; b4 < n11 && !(l4 + b4 >= g6); ++b4) this._writeToCell(S4, l4 + b4, o2, f5 * n11 + b4), u3++;\n        if (t) f5 < a2 - 1 && this._terminal._core._inputHandler.lineFeed();\n        else if (++h3.y >= d3) break;\n        h3.x = l4;\n      }\n      this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h3.y), t ? h3.x = l4 : (h3.x = I4, h3.y = _5);\n      let C4 = [];\n      for (let [f5, S4] of this._images.entries()) S4.tileCount < 1 && (S4.marker?.dispose(), C4.push(f5));\n      for (let f5 of C4) this._delImg(f5);\n      let p3 = this._terminal.registerMarker(0);\n      p3?.onDispose(() => {\n        this._images.get(o2) && this._delImg(o2);\n      }), this._terminal.buffer.active.type === "alternate" && this._evictOnAlternate();\n      let E5 = { orig: e, origCellSize: r, actual: e, actualCellSize: { ...r }, marker: p3 || void 0, tileCount: u3, bufferType: this._terminal.buffer.active.type, layer: i5, zIndex: A4 };\n      return this._images.set(o2, E5), this.onImageAdded?.(), o2;\n    }\n    render(e) {\n      let t = false, i5 = false;\n      for (let g6 of this._images.values()) if (g6.layer === "bottom" ? i5 = true : t = true, t && i5) break;\n      if (t && !this._renderer.hasLayer("top") && (this._renderer.insertLayerToDom("top"), !this._renderer.hasLayer("top"))) return;\n      if (i5 && !this._renderer.hasLayer("bottom") && this._renderer.insertLayerToDom("bottom"), this._renderer.rescaleCanvas(), !this._images.size) {\n        this._fullyCleared || (this._renderer.clearAll(), this._fullyCleared = true, this._needsFullClear = false), this._renderer.hasLayer("top") && this._renderer.removeLayerFromDom("top"), this._renderer.hasLayer("bottom") && this._renderer.removeLayerFromDom("bottom");\n        return;\n      }\n      !t && this._renderer.hasLayer("top") && (this._renderer.clearAll("top"), this._renderer.removeLayerFromDom("top")), !i5 && this._renderer.hasLayer("bottom") && (this._renderer.clearAll("bottom"), this._renderer.removeLayerFromDom("bottom")), this._needsFullClear && (this._renderer.clearAll(), this._fullyCleared = true, this._needsFullClear = false);\n      let { start: A4, end: r } = e, n11 = this._terminal._core.buffer, a2 = this._terminal._core.cols;\n      this._renderer.clearLines(A4, r);\n      let o2 = [], h3 = [];\n      for (let g6 = A4; g6 <= r; ++g6) {\n        let d3 = n11.lines.get(g6 + n11.ydisp);\n        if (!d3) return;\n        for (let I4 = 0; I4 < a2; ++I4) {\n          let _5;\n          if (d3.getBg(I4) & 268435456) _5 = d3._extendedAttrs[I4] ?? Z2;\n          else {\n            let C4 = d3._extendedAttrs[I4];\n            if (!C4 || C4.imageId === void 0 || C4.imageId === -1) continue;\n            _5 = C4;\n          }\n          let l4 = _5.imageId;\n          if (l4 === void 0 || l4 === -1) continue;\n          let u3 = this._images.get(l4);\n          if (_5.tileId !== -1) {\n            let C4 = _5.tileId, p3 = I4, E5 = 1;\n            for (; ++I4 < a2; ) {\n              let f5 = d3._extendedAttrs[I4];\n              if (!f5 || f5.imageId !== l4 || f5.tileId !== C4 + E5) break;\n              _5 = f5, E5++;\n            }\n            I4--, u3 ? u3.actual && o2.push({ imgSpec: u3, tileId: C4, col: p3, row: g6, count: E5 }) : this._opts.showPlaceholder && h3.push({ col: p3, row: g6, count: E5 }), this._fullyCleared = false;\n          }\n        }\n      }\n      o2.sort((g6, d3) => g6.imgSpec.zIndex - d3.imgSpec.zIndex);\n      for (let g6 of h3) this._renderer.drawPlaceholder(g6.col, g6.row, g6.count);\n      for (let g6 of o2) this._renderer.draw(g6.imgSpec, g6.tileId, g6.col, g6.row, g6.count);\n    }\n    viewportResize(e) {\n      if (!this._images.size) {\n        this._viewportMetrics = e;\n        return;\n      }\n      if (this._viewportMetrics.cols >= e.cols) {\n        this._viewportMetrics = e;\n        return;\n      }\n      let t = this._terminal._core.buffer, i5 = t.lines.length, A4 = this._viewportMetrics.cols - 1;\n      for (let r = 0; r < i5; ++r) {\n        let n11 = t.lines.get(r);\n        if (n11.getBg(A4) & 268435456) {\n          let a2 = n11._extendedAttrs[A4] ?? Z2, o2 = a2.imageId;\n          if (o2 === void 0 || o2 === -1) continue;\n          let h3 = this._images.get(o2);\n          if (!h3) continue;\n          let g6 = Math.ceil((h3.actual?.width || 0) / h3.actualCellSize.width);\n          if (a2.tileId % g6 + 1 >= g6) continue;\n          let d3 = false;\n          for (let l4 = A4 + 1; l4 > e.cols; ++l4) if (n11._data[l4 * 3 + 0] & 4194303) {\n            d3 = true;\n            break;\n          }\n          if (d3) continue;\n          let I4 = Math.min(e.cols, g6 - a2.tileId % g6 + A4), _5 = a2.tileId;\n          for (let l4 = A4 + 1; l4 < I4; ++l4) this._writeToCell(n11, l4, o2, ++_5), h3.tileCount++;\n        }\n      }\n      this._viewportMetrics = e;\n    }\n    getImageAtBufferCell(e, t) {\n      let A4 = this._terminal._core.buffer.lines.get(t);\n      if (A4 && A4.getBg(e) & 268435456) {\n        let r = A4._extendedAttrs[e] ?? Z2;\n        if (r.imageId && r.imageId !== -1) {\n          let n11 = this._images.get(r.imageId)?.orig;\n          if (window.ImageBitmap && n11 instanceof ImageBitmap) {\n            let a2 = D2.createCanvas(window.document, n11.width, n11.height);\n            return a2.getContext("2d")?.drawImage(n11, 0, 0, n11.width, n11.height), a2;\n          }\n          return n11;\n        }\n      }\n    }\n    extractTileAtBufferCell(e, t) {\n      let A4 = this._terminal._core.buffer.lines.get(t);\n      if (A4 && A4.getBg(e) & 268435456) {\n        let r = A4._extendedAttrs[e] ?? Z2;\n        if (r.imageId && r.imageId !== -1 && r.tileId !== -1) {\n          let n11 = this._images.get(r.imageId);\n          if (n11) return this._renderer.extractTile(n11, r.tileId);\n        }\n      }\n    }\n    _evictOldest(e) {\n      let t = this._getStoredPixels(), i5 = t;\n      for (; this._pixelLimit < i5 + e && this._images.size; ) {\n        let A4 = this._images.get(++this._lowestId);\n        A4 && A4.orig && (i5 -= A4.orig.width * A4.orig.height, A4.actual && A4.orig !== A4.actual && (i5 -= A4.actual.width * A4.actual.height), A4.marker?.dispose(), this._delImg(this._lowestId));\n      }\n      return t - i5;\n    }\n    _writeToCell(e, t, i5, A4) {\n      if (e._data[t * 3 + 2] & 268435456) {\n        let r = e._extendedAttrs[t];\n        if (r) {\n          if (r.imageId !== void 0) {\n            let n11 = this._images.get(r.imageId);\n            n11 && n11.tileCount--, r.imageId = i5, r.tileId = A4;\n            return;\n          }\n          e._extendedAttrs[t] = new U2(r.ext, r.urlId, i5, A4);\n          return;\n        }\n      }\n      e._data[t * 3 + 2] |= 268435456, e._extendedAttrs[t] = new U2(0, 0, i5, A4);\n    }\n    _evictOnAlternate() {\n      for (let i5 of this._images.values()) i5.bufferType === "alternate" && (i5.tileCount = 0);\n      let e = this._terminal._core.buffer;\n      for (let i5 = 0; i5 < this._terminal.rows; ++i5) {\n        let A4 = e.lines.get(i5);\n        if (A4) {\n          for (let r = 0; r < this._terminal.cols; ++r) if (A4._data[r * 3 + 2] & 268435456) {\n            let n11 = A4._extendedAttrs[r]?.imageId;\n            if (n11) {\n              let a2 = this._images.get(n11);\n              a2 && a2.tileCount++;\n            }\n          }\n        }\n      }\n      let t = [];\n      for (let [i5, A4] of this._images.entries()) A4.bufferType === "alternate" && !A4.tileCount && (A4.marker?.dispose(), t.push(i5));\n      for (let i5 of t) this._delImg(i5);\n    }\n  };\n  var Ge = M2(Be());\n  var Ue = M2(Re());\n  function V2(s4) {\n    let e = "";\n    for (let t = 0; t < s4.length; ++t) e += String.fromCharCode(s4[t]);\n    return e;\n  }\n  function Qe(s4) {\n    let e = 0;\n    for (let t = 0; t < s4.length; ++t) {\n      if (s4[t] < 48 || s4[t] > 57) throw new Error("illegal char");\n      e = e * 10 + s4[t] - 48;\n    }\n    return e;\n  }\n  function ke(s4) {\n    let e = V2(s4);\n    if (!e.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) throw new Error("illegal size");\n    return e;\n  }\n  function bt(s4) {\n    if (typeof Buffer < "u") return Buffer.from(V2(s4), "base64").toString();\n    let e = atob(V2(s4)), t = new Uint8Array(e.length);\n    for (let i5 = 0; i5 < t.length; ++i5) t[i5] = e.charCodeAt(i5);\n    return new TextDecoder().decode(t);\n  }\n  var Ne = { inline: Qe, size: Qe, name: bt, width: ke, height: ke, preserveAspectRatio: Qe };\n  var He = [70, 105, 108, 101];\n  var De = 1024;\n  var $2 = class {\n    constructor() {\n      this.state = 0;\n      this._buffer = new Uint32Array(De);\n      this._position = 0;\n      this._key = "";\n      this.fields = {};\n    }\n    reset() {\n      this._buffer.fill(0), this.state = 0, this._position = 0, this.fields = {}, this._key = "";\n    }\n    parse(e, t, i5) {\n      let A4 = this.state, r = this._position, n11 = this._buffer;\n      if (A4 === 1 || A4 === 4 || A4 === 0 && r > 6) return -1;\n      for (let a2 = t; a2 < i5; ++a2) {\n        let o2 = e[a2];\n        switch (o2) {\n          case 59:\n            if (!this._storeValue(r)) return this._a();\n            A4 = 2, r = 0;\n            break;\n          case 61:\n            if (A4 === 0) {\n              for (let h3 = 0; h3 < He.length; ++h3) if (n11[h3] !== He[h3]) return this._a();\n              A4 = 2, r = 0;\n            } else if (A4 === 2) {\n              if (!this._storeKey(r)) return this._a();\n              A4 = 3, r = 0;\n            } else if (A4 === 3) {\n              if (r >= De) return this._a();\n              n11[r++] = o2;\n            }\n            break;\n          case 58:\n            return A4 === 3 && !this._storeValue(r) ? this._a() : (this.state = 4, a2 + 1);\n          default:\n            if (r >= De) return this._a();\n            n11[r++] = o2;\n        }\n      }\n      return this.state = A4, this._position = r, -2;\n    }\n    _a() {\n      return this.state = 1, -1;\n    }\n    _storeKey(e) {\n      let t = V2(this._buffer.subarray(0, e));\n      return t ? (this._key = t, this.fields[t] = null, true) : false;\n    }\n    _storeValue(e) {\n      if (this._key) {\n        try {\n          let t = this._buffer.slice(0, e);\n          this.fields[this._key] = Ne[this._key] ? Ne[this._key](t) : t;\n        } catch {\n          return false;\n        }\n        return true;\n      }\n      return false;\n    }\n  };\n  var J2 = { mime: "unsupported", width: 0, height: 0 };\n  function Fe(s4) {\n    if (s4.length < 24) return J2;\n    let e = new Uint32Array(s4.buffer, s4.byteOffset, 6);\n    if (e[0] === 1196314761 && e[1] === 169478669 && e[3] === 1380206665) return { mime: "image/png", width: s4[16] << 24 | s4[17] << 16 | s4[18] << 8 | s4[19], height: s4[20] << 24 | s4[21] << 16 | s4[22] << 8 | s4[23] };\n    if (s4[0] === 255 && s4[1] === 216 && s4[2] === 255) {\n      let [t, i5] = yt(s4);\n      return { mime: "image/jpeg", width: t, height: i5 };\n    }\n    return e[0] === 944130375 && (s4[4] === 55 || s4[4] === 57) && s4[5] === 97 ? { mime: "image/gif", width: s4[7] << 8 | s4[6], height: s4[9] << 8 | s4[8] } : e[0] === 1718185841 ? { mime: "image/qoi", width: s4[4] << 24 | s4[5] << 16 | s4[6] << 8 | s4[7], height: s4[8] << 24 | s4[9] << 16 | s4[10] << 8 | s4[11] } : J2;\n  }\n  function yt(s4) {\n    let e = s4.length, t = 4, i5 = s4[t] << 8 | s4[t + 1];\n    for (; ; ) {\n      if (t += i5, t >= e) return [0, 0];\n      if (s4[t] !== 255) return [0, 0];\n      if (s4[t + 1] === 192 || s4[t + 1] === 194) return t + 8 < e ? [s4[t + 7] << 8 | s4[t + 8], s4[t + 5] << 8 | s4[t + 6]] : [0, 0];\n      t += 2, i5 = s4[t] << 8 | s4[t + 1];\n    }\n  }\n  var we = { name: "Unnamed file", size: 0, width: "auto", height: "auto", preserveAspectRatio: 1, inline: 0 };\n  var ee = class {\n    constructor(e, t, i5, A4) {\n      this._opts = e;\n      this._renderer = t;\n      this._storage = i5;\n      this._coreTerminal = A4;\n      this._aborted = false;\n      this._hp = new $2();\n      this._header = we;\n      this._metrics = J2;\n      let r = Math.ceil(this._opts.iipSizeLimit * 4 / 3), n11 = Math.min(1048576, r);\n      this._dec = new Ge.default(4194304, r, n11), this._qoiDec = new Ue.default(4194304);\n    }\n    reset() {\n    }\n    start() {\n      this._aborted = false, this._header = we, this._metrics = J2, this._hp.reset();\n    }\n    put(e, t, i5) {\n      if (!this._aborted) if (this._hp.state === 4) this._dec.put(e.subarray(t, i5)) !== 0 && (this._dec.release(), this._aborted = true);\n      else {\n        let A4 = this._hp.parse(e, t, i5);\n        if (A4 === -1) {\n          this._aborted = true;\n          return;\n        }\n        if (A4 > 0) {\n          if (this._header = Object.assign({}, we, this._hp.fields), !this._header.inline || !this._header.size || this._header.size > this._opts.iipSizeLimit) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init(), this._dec.put(e.subarray(A4, i5)) !== 0 && (this._dec.release(), this._aborted = true);\n        }\n      }\n    }\n    end(e) {\n      if (this._aborted) return true;\n      let t = 0, i5 = 0, A4 = true;\n      if ((A4 = e) && (A4 = !this._dec.end()) && (A4 = this._dec.data8.length === this._header.size) && (this._metrics = Fe(this._dec.data8), (A4 = this._metrics.mime !== "unsupported") && (t = this._metrics.width, i5 = this._metrics.height, (A4 = t && i5 && t * i5 < this._opts.pixelLimit) && ([t, i5] = this._resize(t, i5).map(Math.floor), A4 = t && i5 && t * i5 < this._opts.pixelLimit))), !A4) return this._dec.release(), true;\n      let r;\n      if (this._metrics.mime === "image/qoi") {\n        let n11 = this._qoiDec.decode(this._dec.data8);\n        if (r = new ImageData(new Uint8ClampedArray(n11.buffer, n11.byteOffset, n11.byteLength), this._qoiDec.width, this._qoiDec.height), this._qoiDec.release(), t === this._qoiDec.width && i5 === this._qoiDec.height) {\n          this._dec.release();\n          let a2 = D2.createCanvas(void 0, this._qoiDec.width, this._qoiDec.height);\n          return a2.getContext("2d")?.putImageData(r, 0, 0), this._storage.addImage(a2), true;\n        }\n      } else r = new Blob([this._dec.data8], { type: this._metrics.mime });\n      return this._dec.release(), createImageBitmap(r, { resizeWidth: t, resizeHeight: i5 }).then((n11) => (this._storage.addImage(n11), true));\n    }\n    _resize(e, t) {\n      let i5 = this._renderer.dimensions?.css.cell.width || w2.width, A4 = this._renderer.dimensions?.css.cell.height || w2.height, r = this._renderer.dimensions?.css.canvas.width || i5 * this._coreTerminal.cols, n11 = this._renderer.dimensions?.css.canvas.height || A4 * this._coreTerminal.rows, a2 = this._dim(this._header.width, r, i5), o2 = this._dim(this._header.height, n11, A4);\n      if (!a2 && !o2) {\n        let h3 = r / e, g6 = (n11 - A4) / t, d3 = Math.min(h3, g6);\n        return d3 < 1 ? [e * d3, t * d3] : [e, t];\n      }\n      return a2 ? this._header.preserveAspectRatio || !a2 || !o2 ? [a2, t * a2 / e] : [a2, o2] : [e * o2 / t, o2];\n    }\n    _dim(e, t, i5) {\n      return e === "auto" ? 0 : e.endsWith("%") ? parseInt(e.slice(0, -1)) * t / 100 : e.endsWith("px") ? parseInt(e.slice(0, -2)) : parseInt(e) * i5;\n    }\n  };\n  var Ke = M2(Be());\n  function be(s4) {\n    let e = {}, t = s4.split(",");\n    for (let i5 of t) {\n      let A4 = i5.indexOf("=");\n      if (A4 === -1) continue;\n      let r = i5.substring(0, A4), n11 = i5.substring(A4 + 1);\n      if (r === "a") {\n        e.action = n11;\n        continue;\n      }\n      if (r === "o") {\n        e.compression = n11;\n        continue;\n      }\n      if (r === "t") {\n        e.transmission = n11;\n        continue;\n      }\n      if (r === "d") {\n        e.deleteSelector = n11;\n        continue;\n      }\n      let a2 = parseInt(n11);\n      switch (r) {\n        case "f":\n          e.format = a2;\n          break;\n        case "i":\n          e.id = a2;\n          break;\n        case "I":\n          e.imageNumber = a2;\n          break;\n        case "s":\n          e.width = a2;\n          break;\n        case "v":\n          e.height = a2;\n          break;\n        case "x":\n          e.x = a2;\n          break;\n        case "y":\n          e.y = a2;\n          break;\n        case "w":\n          e.sourceWidth = a2;\n          break;\n        case "h":\n          e.sourceHeight = a2;\n          break;\n        case "X":\n          e.xOffset = a2;\n          break;\n        case "Y":\n          e.yOffset = a2;\n          break;\n        case "c":\n          e.columns = a2;\n          break;\n        case "r":\n          e.rows = a2;\n          break;\n        case "m":\n          e.more = a2;\n          break;\n        case "q":\n          e.quiet = a2;\n          break;\n        case "C":\n          e.cursorMovement = a2;\n          break;\n        case "z":\n          e.zIndex = a2;\n          break;\n        case "p":\n          e.placementId = a2;\n          break;\n      }\n    }\n    return e;\n  }\n  var xt = 4194304;\n  var Tt = 4194304;\n  var Je = 0;\n  var Oe = 512;\n  var vt = 59;\n  var ie = class {\n    constructor(e, t, i5, A4) {\n      this._opts = e;\n      this._renderer = t;\n      this._kittyStorage = i5;\n      this._coreTerminal = A4;\n      this._aborted = false;\n      this._decodeError = false;\n      this._activeDecoder = null;\n      this._inControlData = true;\n      this._controlData = new Uint32Array(Oe);\n      this._controlLength = 0;\n      this._encodedSizeLimit = 0;\n      this._totalEncodedSize = 0;\n      this._parsedCommand = null;\n      this._pendingTransmissions = /* @__PURE__ */ new Map();\n      this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3), this._initialEncodedBytes = Math.min(Tt, this._maxEncodedBytes);\n    }\n    reset() {\n      this._cleanupAllPending(), this._activeDecoder && (this._activeDecoder.release(), this._activeDecoder = null), this._kittyStorage.reset();\n    }\n    dispose() {\n      this.reset();\n    }\n    _removePendingEntry(e) {\n      this._pendingTransmissions.delete(e), this._lastPendingKey === e && (this._lastPendingKey = void 0);\n    }\n    _cleanupAllPending() {\n      for (let e of this._pendingTransmissions.values()) e.decoder.release();\n      this._pendingTransmissions.clear(), this._lastPendingKey = void 0;\n    }\n    start() {\n      this._aborted = false, this._decodeError = false, this._inControlData = true, this._controlLength = 0, this._parsedCommand = null, this._encodedSizeLimit = this._maxEncodedBytes, this._totalEncodedSize = 0, this._activeDecoder = null;\n    }\n    put(e, t, i5) {\n      if (!this._aborted) if (!this._inControlData) this._streamPayload(e, t, i5);\n      else {\n        let A4 = i5;\n        for (let n11 = t; n11 < i5; n11++) if (e[n11] === vt) {\n          this._inControlData = false, A4 = n11;\n          break;\n        }\n        let r = A4 - t;\n        if (this._controlLength + r > Oe) {\n          this._aborted = true;\n          return;\n        }\n        if (this._controlData.set(e.subarray(t, A4), this._controlLength), this._controlLength += r, !this._inControlData) {\n          if (this._parsedCommand = be(this._parseControlDataString()), this._parsedCommand.id !== void 0 && this._parsedCommand.imageNumber !== void 0) {\n            this._sendResponse(this._parsedCommand.id, "EINVAL:cannot specify both i and I keys", this._parsedCommand.quiet ?? 0), this._aborted = true;\n            return;\n          }\n          if (this._parsedCommand.action === "d") return;\n          let n11 = A4 + 1;\n          n11 < i5 && this._streamPayload(e, n11, i5);\n        }\n      }\n    }\n    _streamPayload(e, t, i5) {\n      if (this._aborted) return;\n      let A4 = this._parsedCommand?.id ?? this._lastPendingKey ?? 0, r = this._pendingTransmissions.get(A4), n11 = r?.totalEncodedSize ?? 0;\n      if (this._totalEncodedSize += i5 - t, n11 + this._totalEncodedSize > this._encodedSizeLimit) {\n        let o2 = this._activeDecoder ?? r?.decoder;\n        o2 && o2.release(), this._activeDecoder = null, r && this._removePendingEntry(A4), this._aborted = true;\n        return;\n      }\n      this._decodeError || (r?.decoder && !this._activeDecoder && (this._activeDecoder = r.decoder), this._activeDecoder || (this._activeDecoder = new Ke.default(xt, this._maxEncodedBytes, this._initialEncodedBytes), this._activeDecoder.init()), this._activeDecoder.put(e.subarray(t, i5)) !== Je && (this._activeDecoder.release(), this._activeDecoder = null, this._decodeError = true, r && this._removePendingEntry(A4)));\n    }\n    end(e) {\n      if (this._aborted || !e) return this._activeDecoder && (this._activeDecoder.release(), this._activeDecoder = null), true;\n      if (this._inControlData) return this._handleNoPayloadCommand();\n      let t = this._parsedCommand;\n      if (t.action === "d") return this._handleDelete(t);\n      let i5 = t.id ?? this._lastPendingKey ?? 0, A4 = t.more === 1, r = this._pendingTransmissions.get(i5);\n      if (A4) return this._activeDecoder && (r ? (r.totalEncodedSize += this._totalEncodedSize, r.decodeError = r.decodeError || this._decodeError) : this._pendingTransmissions.set(i5, { cmd: { ...t }, decoder: this._activeDecoder, totalEncodedSize: this._totalEncodedSize, decodeError: this._decodeError }), this._lastPendingKey = i5, this._activeDecoder = null), true;\n      r && (this._lastPendingKey = void 0);\n      let n11 = this._decodeError, a2 = t, o2 = this._activeDecoder;\n      r && (a2 = r.cmd, o2 = r.decoder, n11 = n11 || r.decodeError, this._pendingTransmissions.delete(i5));\n      let h3 = new Uint8Array(0);\n      o2 && (o2.end() !== Je && (n11 = true), h3 = o2.data8), this._activeDecoder = null;\n      let g6 = this._handleCommandWithBytesAndCmd(a2, h3, n11);\n      return o2 && o2.release(), g6;\n    }\n    _parseControlDataString() {\n      let e = "";\n      for (let t = 0; t < this._controlLength; t++) e += String.fromCodePoint(this._controlData[t]);\n      return e;\n    }\n    _handleNoPayloadCommand() {\n      let e = be(this._parseControlDataString());\n      if (e.id !== void 0 && e.imageNumber !== void 0) return this._sendResponse(e.id, "EINVAL:cannot specify both i and I keys", e.quiet ?? 0), true;\n      switch (e.action ?? "t") {\n        case "d":\n          return this._handleDelete(e);\n        case "q":\n          return this._sendResponse(e.id ?? 0, "OK", e.quiet ?? 0), true;\n        case "p":\n          return this._handlePlacement(e);\n        default:\n          return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported action", e.quiet ?? 0), true;\n      }\n    }\n    _handleCommandWithBytesAndCmd(e, t, i5) {\n      switch (e.action ?? "t") {\n        case "t": {\n          let r = this._handleTransmit(e, t, i5);\n          return (e.transmission ?? "d") === "d" && e.id !== void 0 && (i5 ? this._sendResponse(e.id, "EINVAL:invalid base64 data", e.quiet ?? 0) : t.length > 0 && this._sendResponse(e.id, "OK", e.quiet ?? 0)), r;\n        }\n        case "T":\n          return this._handleTransmitDisplay(e, t, i5);\n        case "q":\n          return this._handleQuery(e, t, i5);\n        case "p":\n          return this._handlePlacement(e);\n        default:\n          return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported action", e.quiet ?? 0), true;\n      }\n    }\n    _handlePlacement(e) {\n      if (e.id === void 0) return true;\n      let t = e.id, i5 = this._kittyStorage.getImage(t);\n      return i5 ? this._displayImage(i5, e).then((r) => (this._sendResponse(t, r ? "OK" : "EINVAL:image rendering failed", e.quiet ?? 0, e.placementId), true)) : (this._sendResponse(t, "ENOENT:image not found", e.quiet ?? 0, e.placementId), true);\n    }\n    _handleTransmit(e, t, i5) {\n      return (e.transmission ?? "d") !== "d" ? (e.id !== void 0 && this._sendResponse(e.id, "EINVAL:unsupported transmission medium", e.quiet ?? 0), true) : (i5 || t.length === 0 || this._kittyStorage.storeImage(e.id, { data: new Blob([t]), width: e.width ?? 0, height: e.height ?? 0, format: e.format ?? 32, compression: e.compression ?? "" }), true);\n    }\n    _handleTransmitDisplay(e, t, i5) {\n      if (i5) return e.id !== void 0 && this._sendResponse(e.id, "EINVAL:invalid base64 data", e.quiet ?? 0), true;\n      this._handleTransmit(e, t, i5);\n      let A4 = e.id ?? this._kittyStorage.lastImageId, r = this._kittyStorage.getImage(A4);\n      if (r) {\n        let n11 = this._displayImage(r, e);\n        return e.id !== void 0 ? n11.then((a2) => (this._sendResponse(A4, a2 ? "OK" : "EINVAL:image rendering failed", e.quiet ?? 0), true)) : n11.then(() => true);\n      }\n      return true;\n    }\n    _handleQuery(e, t, i5) {\n      let A4 = e.id ?? 0, r = e.quiet ?? 0;\n      if ((e.transmission ?? "d") !== "d") return this._sendResponse(A4, "EINVAL:unsupported transmission medium", r), true;\n      if (i5) return this._sendResponse(A4, "EINVAL:invalid base64 data", r), true;\n      if (t.length === 0) return this._sendResponse(A4, "OK", r), true;\n      let a2 = e.format ?? 32;\n      if (a2 === 100) this._sendResponse(A4, "OK", r);\n      else {\n        let o2 = e.width ?? 0, h3 = e.height ?? 0;\n        if (!o2 || !h3) return this._sendResponse(A4, "EINVAL:width and height required for raw pixel data", r), true;\n        let g6 = a2 === 32 ? 4 : 3, d3 = o2 * h3 * g6;\n        if (t.length < d3) return this._sendResponse(A4, "EINVAL:insufficient pixel data", r), true;\n        this._sendResponse(A4, "OK", r);\n      }\n      return true;\n    }\n    _handleDelete(e) {\n      switch (e.deleteSelector ?? "a") {\n        case "a":\n        case "A":\n          this._cleanupAllPending(), this._kittyStorage.deleteAll();\n          break;\n        case "i":\n        case "I":\n          if (e.id !== void 0) {\n            let i5 = this._pendingTransmissions.get(e.id);\n            i5 && i5.decoder.release(), this._removePendingEntry(e.id), this._kittyStorage.deleteById(e.id);\n          }\n          break;\n        default:\n          break;\n      }\n      return true;\n    }\n    _sendResponse(e, t, i5, A4) {\n      let r = t === "OK";\n      if (r && i5 === 1 || !r && i5 === 2) return;\n      let n11 = A4 ? `,p=${A4}` : "", a2 = `\\x1B_Gi=${e}${n11};${t}\\x1B\\\\`;\n      this._coreTerminal._core.coreService.triggerDataEvent(a2);\n    }\n    _displayImage(e, t) {\n      return this._decodeAndDisplay(e, t).then(() => true).catch(() => false);\n    }\n    async _decodeAndDisplay(e, t) {\n      let i5 = await this._createBitmap(e);\n      try {\n        let A4 = Math.max(0, t.x ?? 0), r = Math.max(0, t.y ?? 0), n11 = t.sourceWidth || i5.width - A4, a2 = t.sourceHeight || i5.height - r, o2 = Math.max(0, i5.width - A4), h3 = Math.max(0, i5.height - r), g6 = Math.max(0, Math.min(n11, o2)), d3 = Math.max(0, Math.min(a2, h3));\n        if (g6 === 0 || d3 === 0) throw new Error("invalid source rectangle");\n        if (A4 !== 0 || r !== 0 || g6 !== i5.width || d3 !== i5.height) {\n          let v6 = await createImageBitmap(i5, A4, r, g6, d3);\n          i5.close(), i5 = v6;\n        }\n        let I4 = this._renderer.dimensions?.css.cell.width || w2.width, _5 = this._renderer.dimensions?.css.cell.height || w2.height, l4, u3;\n        t.columns !== void 0 && t.rows !== void 0 ? (l4 = t.columns, u3 = t.rows) : t.columns !== void 0 ? (l4 = t.columns, u3 = Math.max(1, Math.ceil(i5.height / i5.width * (l4 * I4) / _5))) : t.rows !== void 0 ? (u3 = t.rows, l4 = Math.max(1, Math.ceil(i5.width / i5.height * (u3 * _5) / I4))) : (l4 = Math.ceil(i5.width / I4), u3 = Math.ceil(i5.height / _5));\n        let C4 = i5.width, p3 = i5.height;\n        if ((t.columns !== void 0 || t.rows !== void 0) && (C4 = Math.round(l4 * I4), p3 = Math.round(u3 * _5)), C4 * p3 > this._opts.pixelLimit) throw new Error("image exceeds pixel limit");\n        let E5 = this._coreTerminal._core.buffer, f5 = E5.x, S4 = E5.y, b4 = E5.ybase, Ve3 = t.zIndex !== void 0 && t.zIndex < 0 ? "bottom" : "top";\n        if (C4 !== i5.width || p3 !== i5.height) {\n          let v6 = await createImageBitmap(i5, { resizeWidth: C4, resizeHeight: p3 });\n          i5.close(), i5 = v6;\n        }\n        let he3 = Math.min(Math.max(0, t.xOffset ?? 0), I4 - 1), de3 = Math.min(Math.max(0, t.yOffset ?? 0), _5 - 1);\n        if (he3 !== 0 || de3 !== 0) {\n          let v6 = t.columns !== void 0 ? Math.round(l4 * I4) : i5.width + he3, et3 = t.rows !== void 0 ? Math.round(u3 * _5) : i5.height + de3, q3 = D2.createCanvas(window.document, v6, et3), xe2 = q3.getContext("2d");\n          if (!xe2) throw new Error("Failed to create offset canvas context");\n          xe2.drawImage(i5, he3, de3);\n          let tt4 = await createImageBitmap(q3);\n          if (q3.width = q3.height = 0, i5.close(), i5 = tt4, C4 = i5.width, p3 = i5.height, C4 * p3 > this._opts.pixelLimit) throw new Error("image exceeds pixel limit");\n          t.columns === void 0 && (l4 = Math.ceil(i5.width / I4)), t.rows === void 0 && (u3 = Math.ceil(i5.height / _5));\n        }\n        let $e2 = t.zIndex ?? 0;\n        if (this._kittyStorage.addImage(e.id, i5, true, Ve3, $e2), i5 = void 0, t.cursorMovement === 1) {\n          let v6 = E5.ybase - b4;\n          E5.x = f5, E5.y = Math.max(S4 - v6, 0);\n        } else E5.x = Math.min(f5 + l4, this._coreTerminal.cols);\n      } catch (A4) {\n        throw i5?.close(), A4;\n      }\n    }\n    async _createBitmap(e) {\n      let t = new Uint8Array(await e.data.arrayBuffer());\n      if (e.compression === "z" && (t = await this._decompressZlib(t)), e.format === 100) {\n        let C4 = new Blob([t], { type: "image/png" });\n        if (!window.createImageBitmap) {\n          let p3 = URL.createObjectURL(C4), E5 = new Image();\n          return new Promise((f5, S4) => {\n            E5.addEventListener("load", () => {\n              URL.revokeObjectURL(p3);\n              let b4 = D2.createCanvas(window.document, E5.width, E5.height);\n              b4.getContext("2d")?.drawImage(E5, 0, 0), createImageBitmap(b4).then(f5).catch(S4);\n            }), E5.addEventListener("error", () => {\n              URL.revokeObjectURL(p3), S4(new Error("Failed to load image"));\n            }), E5.src = p3;\n          });\n        }\n        return createImageBitmap(C4);\n      }\n      let i5 = e.width, A4 = e.height;\n      if (!i5 || !A4) throw new Error("Width and height required for raw pixel data");\n      let r = e.format === 32 ? 4 : 3, n11 = i5 * A4 * r;\n      if (t.length < n11) throw new Error("Insufficient pixel data");\n      let a2 = i5 * A4;\n      if (e.format === 32) return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer, t.byteOffset, a2 * 4), i5, A4));\n      let o2 = new Uint8ClampedArray(a2 * 4), h3 = new Uint32Array(t.buffer, t.byteOffset, Math.floor(t.byteLength / 4)), g6 = new Uint32Array(o2.buffer), d3 = a2 & -4, I4 = 0, _5 = 0;\n      for (let C4 = 0; C4 < d3; C4 += 4) {\n        let p3 = h3[I4++], E5 = h3[I4++], f5 = h3[I4++];\n        g6[_5++] = 4278190080 | p3, g6[_5++] = 4278190080 | p3 >>> 24 | E5 << 8, g6[_5++] = 4278190080 | E5 >>> 16 | f5 << 16, g6[_5++] = 4278190080 | f5 >>> 8;\n      }\n      let l4 = d3 * 3, u3 = d3 * 4;\n      for (let C4 = d3; C4 < a2; C4++) o2[u3] = t[l4], o2[u3 + 1] = t[l4 + 1], o2[u3 + 2] = t[l4 + 2], o2[u3 + 3] = 255, l4 += 3, u3 += 4;\n      return createImageBitmap(new ImageData(o2, i5, A4));\n    }\n    async _decompressZlib(e) {\n      try {\n        return await this._decompress(e, "deflate");\n      } catch {\n        return await this._decompress(e, "deflate-raw");\n      }\n    }\n    async _decompress(e, t) {\n      let i5 = new DecompressionStream(t), A4 = i5.writable.getWriter();\n      A4.write(e), A4.close();\n      let r = [], n11 = i5.readable.getReader();\n      for (; ; ) {\n        let { done: g6, value: d3 } = await n11.read();\n        if (g6) break;\n        r.push(d3);\n      }\n      let a2 = r.reduce((g6, d3) => g6 + d3.length, 0), o2 = new Uint8Array(a2), h3 = 0;\n      for (let g6 of r) o2.set(g6, h3), h3 += g6.length;\n      return o2;\n    }\n    get images() {\n      return this._kittyStorage.images;\n    }\n    get _kittyIdToStorageId() {\n      return this._kittyStorage.kittyIdToStorageId;\n    }\n    get pendingTransmissions() {\n      return this._pendingTransmissions;\n    }\n  };\n  var O2 = class O3 {\n    constructor(e) {\n      this._storage = e;\n      this._nextImageId = 1;\n      this._images = /* @__PURE__ */ new Map();\n      this._kittyIdToStorageId = /* @__PURE__ */ new Map();\n      this._storageIdToKittyId = /* @__PURE__ */ new Map();\n      this._handleStorageImageDeleted = (e2) => {\n        let t = this._storageIdToKittyId.get(e2);\n        t !== void 0 && (this._kittyIdToStorageId.delete(t), this._storageIdToKittyId.delete(e2), this._images.delete(t));\n      };\n      this._previousOnImageDeleted = this._storage.onImageDeleted, this._wrappedOnImageDeleted = (t) => {\n        this._previousOnImageDeleted?.(t), this._handleStorageImageDeleted(t);\n      }, this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n    }\n    reset() {\n      this._nextImageId = 1, this._images.clear(), this._kittyIdToStorageId.clear(), this._storageIdToKittyId.clear();\n    }\n    dispose() {\n      this.reset(), this._storage.onImageDeleted === this._wrappedOnImageDeleted && (this._storage.onImageDeleted = this._previousOnImageDeleted);\n    }\n    storeImage(e, t) {\n      let i5 = e ?? this._nextImageId++, A4 = this._kittyIdToStorageId.get(i5);\n      return A4 !== void 0 && (this._storage.deleteImage(A4), this._kittyIdToStorageId.delete(i5), this._storageIdToKittyId.delete(A4)), !this._images.has(i5) && this._images.size >= O3._maxStoredImages && this._evictUndisplayedImages(), this._images.set(i5, { ...t, id: i5 }), i5;\n    }\n    addImage(e, t, i5, A4, r) {\n      let n11 = this._kittyIdToStorageId.get(e);\n      n11 !== void 0 && this._storageIdToKittyId.delete(n11);\n      let a2 = this._storage.addImage(t, i5, A4, r);\n      this._kittyIdToStorageId.set(e, a2), this._storageIdToKittyId.set(a2, e);\n    }\n    getImage(e) {\n      return this._images.get(e);\n    }\n    deleteById(e) {\n      this._images.delete(e);\n      let t = this._kittyIdToStorageId.get(e);\n      t !== void 0 && (this._storage.deleteImage(t), this._kittyIdToStorageId.delete(e), this._storageIdToKittyId.delete(t));\n    }\n    deleteAll() {\n      this._images.clear();\n      for (let e of this._kittyIdToStorageId.values()) this._storage.deleteImage(e);\n      this._kittyIdToStorageId.clear(), this._storageIdToKittyId.clear();\n    }\n    get images() {\n      return this._images;\n    }\n    get kittyIdToStorageId() {\n      return this._kittyIdToStorageId;\n    }\n    get lastImageId() {\n      return this._nextImageId - 1;\n    }\n    _evictUndisplayedImages() {\n      for (let [e] of this._images) {\n        if (this._images.size <= O3._maxStoredImages / 2) break;\n        this._kittyIdToStorageId.has(e) || this._images.delete(e);\n      }\n    }\n  };\n  O2._maxStoredImages = 256;\n  var Ae = O2;\n  var x2 = M2(X());\n  var ze = M2(We());\n  var Nt = 4194304;\n  var Se = x2.PALETTE_ANSI_256;\n  Se.set(x2.PALETTE_VT340_COLOR);\n  var ae = class {\n    constructor(e, t, i5) {\n      this._opts = e;\n      this._storage = t;\n      this._coreTerminal = i5;\n      this._size = 0;\n      this._aborted = false;\n      (0, ze.DecoderAsync)({ memoryLimit: this._opts.pixelLimit * 4, palette: Se, paletteLimit: this._opts.sixelPaletteLimit }).then((A4) => this._dec = A4);\n    }\n    reset() {\n      this._dec && (this._dec.release(), this._dec._palette.fill(0), this._dec.init(0, Se, this._opts.sixelPaletteLimit));\n    }\n    hook(e) {\n      if (this._size = 0, this._aborted = false, this._dec) {\n        let t = e.params[1] === 1 ? 0 : Ht(this._coreTerminal._core._inputHandler._curAttrData, this._coreTerminal._core._themeService?.colors);\n        this._dec.init(t, null, this._opts.sixelPaletteLimit);\n      }\n    }\n    put(e, t, i5) {\n      if (!(this._aborted || !this._dec)) {\n        if (this._size += i5 - t, this._size > this._opts.sixelSizeLimit) {\n          console.warn("SIXEL: too much data, aborting"), this._aborted = true, this._dec.release();\n          return;\n        }\n        try {\n          this._dec.decode(e, t, i5);\n        } catch (A4) {\n          console.warn(`SIXEL: error while decoding image - ${A4}`), this._aborted = true, this._dec.release();\n        }\n      }\n    }\n    unhook(e) {\n      if (this._aborted || !e || !this._dec) return true;\n      let t = this._dec.width, i5 = this._dec.height;\n      if (!t || !i5) return i5 && this._storage.advanceCursor(i5), true;\n      let A4 = D2.createCanvas(void 0, t, i5);\n      return A4.getContext("2d")?.putImageData(new ImageData(this._dec.data8, t, i5), 0, 0), this._dec.memoryUsage > Nt && this._dec.release(), this._storage.addImage(A4), true;\n    }\n  };\n  function Ht(s4, e) {\n    let t = 0;\n    if (!e) return t;\n    if (s4.isInverse()) if (s4.isFgDefault()) t = ne(e.foreground.rgba);\n    else if (s4.isFgRGB()) {\n      let i5 = s4.constructor.toColorRGB(s4.getFgColor());\n      t = (0, x2.toRGBA8888)(...i5);\n    } else t = ne(e.ansi[s4.getFgColor()].rgba);\n    else if (s4.isBgDefault()) t = ne(e.background.rgba);\n    else if (s4.isBgRGB()) {\n      let i5 = s4.constructor.toColorRGB(s4.getBgColor());\n      t = (0, x2.toRGBA8888)(...i5);\n    } else t = ne(e.ansi[s4.getBgColor()].rgba);\n    return t;\n  }\n  function ne(s4) {\n    return x2.BIG_ENDIAN ? s4 : (s4 & 255) << 24 | (s4 >>> 8 & 255) << 16 | (s4 >>> 16 & 255) << 8 | s4 >>> 24 & 255;\n  }\n  var oe = class {\n    constructor(e, t, i5, A4) {\n      this._storage = e;\n      this._opts = t;\n      this._renderer = i5;\n      this._terminal = A4;\n    }\n    addImage(e) {\n      this._storage.addImage(e, this._opts.sixelScrolling);\n    }\n    advanceCursor(e) {\n      if (this._opts.sixelScrolling) {\n        let t = this._renderer.cellSize;\n        (t.width === -1 || t.height === -1) && (t = w2);\n        let i5 = Math.ceil(e / t.height);\n        for (let A4 = 1; A4 < i5; ++A4) this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  };\n  var ge = class {\n    constructor(e) {\n      this._storage = e;\n    }\n    addImage(e) {\n      this._storage.addImage(e, true);\n    }\n  };\n  var Xe = { enableSizeReports: true, pixelLimit: 16777216, sixelSupport: true, sixelScrolling: true, sixelPaletteLimit: 4096, sixelSizeLimit: 33554432, storageLimit: 128, showPlaceholder: true, iipSupport: true, iipSizeLimit: 33554432, kittySupport: true, kittySizeLimit: 33554432 };\n  var Ze = 4096;\n  var je = class {\n    constructor(e) {\n      this._disposables = [];\n      this._handlers = /* @__PURE__ */ new Map();\n      this._onImageAdded = new z2();\n      this.onImageAdded = this._onImageAdded.event;\n      this._opts = Object.assign({}, Xe, e), this._defaultOpts = Object.assign({}, Xe, e);\n    }\n    dispose() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.length = 0, this._handlers.clear(), this._onImageAdded.dispose();\n    }\n    _disposeLater(...e) {\n      for (let t of e) this._disposables.push(t);\n    }\n    activate(e) {\n      if (this._terminal = e, this._renderer = new D2(e), this._storage = new j2(e, this._renderer, this._opts), this._storage.onImageAdded = () => this._onImageAdded.fire(), this._opts.enableSizeReports) {\n        let t = e.options.windowOptions ?? {};\n        t.getWinSizePixels = true, t.getCellSizePixels = true, t.getWinSizeChars = true, e.options.windowOptions = t;\n      }\n      if (this._disposeLater(this._renderer, this._storage, e.parser.registerCsiHandler({ prefix: "?", final: "h" }, (t) => this._decset(t)), e.parser.registerCsiHandler({ prefix: "?", final: "l" }, (t) => this._decrst(t)), e.parser.registerCsiHandler({ final: "c" }, (t) => this._da1(t)), e.parser.registerCsiHandler({ prefix: "?", final: "S" }, (t) => this._xtermGraphicsAttributes(t)), e.onRender((t) => this._storage?.render(t)), e.parser.registerCsiHandler({ intermediates: "!", final: "p" }, () => this.reset()), e.parser.registerEscHandler({ final: "c" }, () => this.reset()), e._core._inputHandler.onRequestReset(() => this.reset()), e.buffer.onBufferChange(() => this._storage?.wipeAlternate()), e.onResize((t) => this._storage?.viewportResize(t))), this._opts.sixelSupport) {\n        let t = new oe(this._storage, this._opts, this._renderer, e), i5 = new ae(this._opts, t, e);\n        this._handlers.set("sixel", i5), this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({ final: "q" }, i5));\n      }\n      if (this._opts.iipSupport) {\n        let t = new ge(this._storage), i5 = new ee(this._opts, this._renderer, t, e);\n        this._handlers.set("iip", i5), this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337, i5));\n      }\n      if (this._opts.kittySupport) {\n        let t = new Ae(this._storage), i5 = new ie(this._opts, this._renderer, t, e);\n        this._handlers.set("kitty", i5), this._disposeLater(t, i5, e._core._inputHandler._parser.registerApcHandler({ final: "G" }, i5));\n      }\n    }\n    reset() {\n      this._opts.sixelScrolling = this._defaultOpts.sixelScrolling, this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit, this._storage?.reset();\n      for (let e of this._handlers.values()) e.reset();\n      return false;\n    }\n    get storageLimit() {\n      return this._storage?.getLimit() || -1;\n    }\n    set storageLimit(e) {\n      this._storage?.setLimit(e), this._opts.storageLimit = e;\n    }\n    get storageUsage() {\n      return this._storage ? this._storage.getUsage() : -1;\n    }\n    get showPlaceholder() {\n      return this._opts.showPlaceholder;\n    }\n    set showPlaceholder(e) {\n      this._opts.showPlaceholder = e, this._renderer?.showPlaceholder(e);\n    }\n    getImageAtBufferCell(e, t) {\n      return this._storage?.getImageAtBufferCell(e, t);\n    }\n    extractTileAtBufferCell(e, t) {\n      return this._storage?.extractTileAtBufferCell(e, t);\n    }\n    _report(e) {\n      this._terminal?._core.coreService.triggerDataEvent(e);\n    }\n    _decset(e) {\n      for (let t = 0; t < e.length; ++t) switch (e[t]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n      return false;\n    }\n    _decrst(e) {\n      for (let t = 0; t < e.length; ++t) switch (e[t]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n      return false;\n    }\n    _da1(e) {\n      return e[0] ? true : this._opts.sixelSupport ? (this._report("\\x1B[?62;4;9;22c"), true) : false;\n    }\n    _xtermGraphicsAttributes(e) {\n      if (e.length < 2) return true;\n      if (e[0] === 1) switch (e[1]) {\n        case 1:\n          return this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`), true;\n        case 2:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit, this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);\n          for (let t of this._handlers.values()) t.reset();\n          return true;\n        case 3:\n          return e.length > 2 && !(e[2] instanceof Array) && e[2] <= Ze ? (this._opts.sixelPaletteLimit = e[2], this._report(`\\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)) : this._report(`\\x1B[?${e[0]};2S`), true;\n        case 4:\n          return this._report(`\\x1B[?${e[0]};0;${Ze}S`), true;\n        default:\n          return this._report(`\\x1B[?${e[0]};2S`), true;\n      }\n      if (e[0] === 2) switch (e[1]) {\n        case 1:\n          let t = this._renderer?.dimensions?.css.canvas.width, i5 = this._renderer?.dimensions?.css.canvas.height;\n          if (!t || !i5) {\n            let r = w2;\n            t = (this._terminal?.cols || 80) * r.width, i5 = (this._terminal?.rows || 24) * r.height;\n          }\n          if (t * i5 < this._opts.pixelLimit) this._report(`\\x1B[?${e[0]};0;${t.toFixed(0)};${i5.toFixed(0)}S`);\n          else {\n            let r = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1B[?${e[0]};0;${r};${r}S`);\n          }\n          return true;\n        case 4:\n          let A4 = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          return this._report(`\\x1B[?${e[0]};0;${A4};${A4}S`), true;\n        default:\n          return this._report(`\\x1B[?${e[0]};2S`), true;\n      }\n      return this._report(`\\x1B[?${e[0]};1S`), true;\n    }\n  };\n\n  // node_modules/@xterm/addon-search/lib/addon-search.mjs\n  function _3(h3) {\n    return { dispose: h3 };\n  }\n  function T2(h3) {\n    if (!h3) return h3;\n    if (Array.isArray(h3)) {\n      for (let i5 of h3) i5.dispose();\n      return [];\n    }\n    return h3.dispose(), h3;\n  }\n  function E2(...h3) {\n    return _3(() => T2(h3));\n  }\n  var S2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(i5) {\n      return this._isDisposed ? i5.dispose() : this._disposables.add(i5), i5;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let i5 of this._disposables) i5.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let i5 of this._disposables) i5.dispose();\n      this._disposables.clear();\n    }\n  };\n  var b2 = class {\n    constructor() {\n      this._store = new S2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(i5) {\n      return this._store.add(i5);\n    }\n  };\n  b2.None = Object.freeze({ dispose() {\n  } });\n  var v2 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(i5) {\n      this._isDisposed || i5 === this._value || (this._value?.dispose(), this._value = i5);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var I2 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (i5, e, t) => {\n        if (this._disposed) return _3(() => {\n        });\n        let r = { fn: i5, thisArgs: e };\n        this._listeners.push(r);\n        let s4 = _3(() => {\n          let n11 = this._listeners.indexOf(r);\n          n11 !== -1 && this._listeners.splice(n11, 1);\n        });\n        return t && (Array.isArray(t) ? t.push(s4) : t.add(s4)), s4;\n      }, this._event);\n    }\n    fire(i5) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: e, thisArgs: t } = this._listeners[0];\n          e.call(t, i5);\n          return;\n        }\n        default: {\n          let e = this._listeners.slice();\n          for (let { fn: t, thisArgs: r } of e) t.call(r, i5);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var W2;\n  ((r) => {\n    function h3(s4, n11) {\n      return s4((a2) => n11.fire(a2));\n    }\n    r.forward = h3;\n    function i5(s4, n11) {\n      return (a2, o2, l4) => s4((c2) => a2.call(o2, n11(c2)), void 0, l4);\n    }\n    r.map = i5;\n    function e(...s4) {\n      return (n11, a2, o2) => {\n        let l4 = new S2();\n        for (let c2 of s4) l4.add(c2((p3) => n11.call(a2, p3)));\n        return o2 && (Array.isArray(o2) ? o2.push(l4) : o2.add(l4)), l4;\n      };\n    }\n    r.any = e;\n    function t(s4, n11, a2) {\n      return n11(a2), s4((o2) => n11(o2));\n    }\n    r.runAndSubscribe = t;\n  })(W2 ||= {});\n  function D3(h3, i5 = 0, e) {\n    let t = setTimeout(() => {\n      h3(), e && r.dispose();\n    }, i5), r = _3(() => {\n      clearTimeout(t);\n    });\n    return e?.add(r), r;\n  }\n  var C2 = class extends b2 {\n    constructor(e) {\n      super();\n      this._terminal = e;\n      this._linesCacheTimeout = this._register(new v2());\n      this._linesCacheDisposables = this._register(new v2());\n      this._lastAccessTimestamp = 0;\n      this._register(_3(() => this._destroyLinesCache()));\n    }\n    initLinesCache() {\n      this._linesCache || (this._linesCache = new Array(this._terminal.buffer.active.length), this._linesCacheDisposables.value = E2(this._terminal.onLineFeed(() => this._destroyLinesCache()), this._terminal.onCursorMove(() => this._destroyLinesCache()), this._terminal.onResize(() => this._destroyLinesCache()))), this._lastAccessTimestamp = Date.now(), this._linesCacheTimeout.value || this._scheduleLinesCacheTimeout(15e3);\n    }\n    _destroyLinesCache() {\n      this._linesCache = void 0, this._lastAccessTimestamp = 0, this._linesCacheDisposables.clear(), this._linesCacheTimeout.clear();\n    }\n    _scheduleLinesCacheTimeout(e) {\n      this._linesCacheTimeout.value = D3(() => {\n        if (!this._linesCache) return;\n        let r = Date.now() - this._lastAccessTimestamp;\n        if (r >= 15e3) {\n          this._destroyLinesCache();\n          return;\n        }\n        this._scheduleLinesCacheTimeout(15e3 - r);\n      }, e);\n    }\n    getLineFromCache(e) {\n      return this._linesCache?.[e];\n    }\n    setLineInCache(e, t) {\n      this._linesCache && (this._linesCache[e] = t);\n    }\n    translateBufferLineToStringWithWrap(e, t) {\n      let r = [], s4 = [0], n11 = this._terminal.buffer.active.getLine(e);\n      for (; n11; ) {\n        let a2 = this._terminal.buffer.active.getLine(e + 1), o2 = a2 ? a2.isWrapped : false, l4 = n11.translateToString(!o2 && t);\n        if (o2 && a2) {\n          let c2 = n11.getCell(n11.length - 1);\n          c2 && c2.getCode() === 0 && c2.getWidth() === 1 && a2.getCell(0)?.getWidth() === 2 && (l4 = l4.slice(0, -1));\n        }\n        if (r.push(l4), o2) s4.push(s4[s4.length - 1] + l4.length);\n        else break;\n        e++, n11 = a2;\n      }\n      return [r.join(""), s4];\n    }\n  };\n  var x3 = class {\n    get cachedSearchTerm() {\n      return this._cachedSearchTerm;\n    }\n    set cachedSearchTerm(i5) {\n      this._cachedSearchTerm = i5;\n    }\n    get lastSearchOptions() {\n      return this._lastSearchOptions;\n    }\n    set lastSearchOptions(i5) {\n      this._lastSearchOptions = i5;\n    }\n    isValidSearchTerm(i5) {\n      return !!(i5 && i5.length > 0);\n    }\n    didOptionsChange(i5) {\n      return this._lastSearchOptions ? i5 ? this._lastSearchOptions.caseSensitive !== i5.caseSensitive || this._lastSearchOptions.regex !== i5.regex || this._lastSearchOptions.wholeWord !== i5.wholeWord : false : true;\n    }\n    shouldUpdateHighlighting(i5, e) {\n      return e?.decorations ? this._cachedSearchTerm === void 0 || i5 !== this._cachedSearchTerm || this.didOptionsChange(e) : false;\n    }\n    clearCachedTerm() {\n      this._cachedSearchTerm = void 0;\n    }\n    reset() {\n      this._cachedSearchTerm = void 0, this._lastSearchOptions = void 0;\n    }\n  };\n  var R2 = class {\n    constructor(i5, e) {\n      this._terminal = i5;\n      this._lineCache = e;\n    }\n    find(i5, e, t, r) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      if (t > this._terminal.cols) throw new Error(`Invalid col: ${t} to search in terminal of ${this._terminal.cols} cols`);\n      this._lineCache.initLinesCache();\n      let s4 = { startRow: e, startCol: t }, n11 = this._findInLine(i5, s4, r);\n      if (!n11) for (let a2 = e + 1; a2 < this._terminal.buffer.active.baseY + this._terminal.rows && (s4.startRow = a2, s4.startCol = 0, n11 = this._findInLine(i5, s4, r), !n11); a2++) ;\n      return n11;\n    }\n    findNextWithSelection(i5, e, t) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      let r = this._terminal.getSelectionPosition();\n      this._terminal.clearSelection();\n      let s4 = 0, n11 = 0;\n      r && (t === i5 ? (s4 = r.end.x, n11 = r.end.y) : (s4 = r.start.x, n11 = r.start.y)), this._lineCache.initLinesCache();\n      let a2 = { startRow: n11, startCol: s4 }, o2 = this._findInLine(i5, a2, e);\n      if (!o2) for (let l4 = n11 + 1; l4 < this._terminal.buffer.active.baseY + this._terminal.rows && (a2.startRow = l4, a2.startCol = 0, o2 = this._findInLine(i5, a2, e), !o2); l4++) ;\n      if (!o2 && n11 !== 0) for (let l4 = 0; l4 < n11 && (a2.startRow = l4, a2.startCol = 0, o2 = this._findInLine(i5, a2, e), !o2); l4++) ;\n      return !o2 && r && (a2.startRow = r.start.y, a2.startCol = 0, o2 = this._findInLine(i5, a2, e)), o2;\n    }\n    findPreviousWithSelection(i5, e, t) {\n      if (!i5 || i5.length === 0) {\n        this._terminal.clearSelection();\n        return;\n      }\n      let r = this._terminal.getSelectionPosition();\n      this._terminal.clearSelection();\n      let s4 = this._terminal.buffer.active.baseY + this._terminal.rows - 1, n11 = this._terminal.cols, a2 = true;\n      this._lineCache.initLinesCache();\n      let o2 = { startRow: s4, startCol: n11 }, l4;\n      if (r && (o2.startRow = s4 = r.start.y, o2.startCol = n11 = r.start.x, t !== i5 && (l4 = this._findInLine(i5, o2, e, false), l4 || (o2.startRow = s4 = r.end.y, o2.startCol = n11 = r.end.x))), l4 ??= this._findInLine(i5, o2, e, a2), !l4) {\n        o2.startCol = Math.max(o2.startCol, this._terminal.cols);\n        for (let c2 = s4 - 1; c2 >= 0 && (o2.startRow = c2, l4 = this._findInLine(i5, o2, e, a2), !l4); c2--) ;\n      }\n      if (!l4 && s4 !== this._terminal.buffer.active.baseY + this._terminal.rows - 1) for (let c2 = this._terminal.buffer.active.baseY + this._terminal.rows - 1; c2 >= s4 && (o2.startRow = c2, l4 = this._findInLine(i5, o2, e, a2), !l4); c2--) ;\n      return l4;\n    }\n    _isWholeWord(i5, e, t) {\n      return (i5 === 0 || " ~!@#$%^&*()+`-=[]{}|\\\\;:\\"\',./<>?".includes(e[i5 - 1])) && (i5 + t.length === e.length || " ~!@#$%^&*()+`-=[]{}|\\\\;:\\"\',./<>?".includes(e[i5 + t.length]));\n    }\n    _findInLine(i5, e, t = {}, r = false) {\n      let s4 = e.startRow, n11 = e.startCol;\n      if (this._terminal.buffer.active.getLine(s4)?.isWrapped) {\n        if (r) {\n          e.startCol += this._terminal.cols;\n          return;\n        }\n        return e.startRow--, e.startCol += this._terminal.cols, this._findInLine(i5, e, t);\n      }\n      let o2 = this._lineCache.getLineFromCache(s4);\n      o2 || (o2 = this._lineCache.translateBufferLineToStringWithWrap(s4, true), this._lineCache.setLineInCache(s4, o2));\n      let [l4, c2] = o2, p3 = this._bufferColsToStringOffset(s4, n11), m4 = i5, g6 = l4;\n      t.regex || (m4 = t.caseSensitive ? i5 : i5.toLowerCase(), g6 = t.caseSensitive ? l4 : l4.toLowerCase());\n      let f5 = -1;\n      if (t.regex) {\n        let u3 = RegExp(m4, t.caseSensitive ? "g" : "gi"), d3;\n        if (r) for (; d3 = u3.exec(g6.slice(0, p3)); ) f5 = u3.lastIndex - d3[0].length, i5 = d3[0], u3.lastIndex -= i5.length - 1;\n        else d3 = u3.exec(g6.slice(p3)), d3 && d3[0].length > 0 && (f5 = p3 + (u3.lastIndex - d3[0].length), i5 = d3[0]);\n      } else r ? p3 - m4.length >= 0 && (f5 = g6.lastIndexOf(m4, p3 - m4.length)) : f5 = g6.indexOf(m4, p3);\n      if (f5 >= 0) {\n        if (t.wholeWord && !this._isWholeWord(f5, g6, i5)) return;\n        let u3 = 0;\n        for (; u3 < c2.length - 1 && f5 >= c2[u3 + 1]; ) u3++;\n        let d3 = u3;\n        for (; d3 < c2.length - 1 && f5 + i5.length >= c2[d3 + 1]; ) d3++;\n        let O4 = f5 - c2[u3], k5 = f5 + i5.length - c2[d3], y5 = this._stringLengthToBufferSize(s4 + u3, O4), M4 = this._stringLengthToBufferSize(s4 + d3, k5) - y5 + this._terminal.cols * (d3 - u3);\n        return { term: i5, col: y5, row: s4 + u3, size: M4 };\n      }\n    }\n    _stringLengthToBufferSize(i5, e) {\n      let t = this._terminal.buffer.active.getLine(i5);\n      if (!t) return 0;\n      for (let r = 0; r < e; r++) {\n        let s4 = t.getCell(r);\n        if (!s4) break;\n        let n11 = s4.getChars();\n        n11.length > 1 && (e -= n11.length - 1);\n        let a2 = t.getCell(r + 1);\n        a2 && a2.getWidth() === 0 && e++;\n      }\n      return e;\n    }\n    _bufferColsToStringOffset(i5, e) {\n      let t = i5, r = 0, s4 = this._terminal.buffer.active.getLine(t);\n      for (; e > 0 && s4; ) {\n        for (let n11 = 0; n11 < e && n11 < this._terminal.cols; n11++) {\n          let a2 = s4.getCell(n11);\n          if (!a2) break;\n          a2.getWidth() && (r += a2.getCode() === 0 ? 1 : a2.getChars().length);\n        }\n        if (t++, s4 = this._terminal.buffer.active.getLine(t), s4 && !s4.isWrapped) break;\n        e -= this._terminal.cols;\n      }\n      return r;\n    }\n  };\n  var w3 = class extends b2 {\n    constructor(e) {\n      super();\n      this._terminal = e;\n      this._highlightDecorations = [];\n      this._highlightedLines = /* @__PURE__ */ new Set();\n      this._register(_3(() => this.clearHighlightDecorations()));\n    }\n    createHighlightDecorations(e, t) {\n      this.clearHighlightDecorations();\n      for (let r of e) {\n        let s4 = this._createResultDecorations(r, t, false);\n        if (s4) for (let n11 of s4) this._storeDecoration(n11, r);\n      }\n    }\n    createActiveDecoration(e, t) {\n      let r = this._createResultDecorations(e, t, true);\n      if (r) return { decorations: r, match: e, dispose() {\n        T2(r);\n      } };\n    }\n    clearHighlightDecorations() {\n      T2(this._highlightDecorations), this._highlightDecorations = [], this._highlightedLines.clear();\n    }\n    _storeDecoration(e, t) {\n      this._highlightedLines.add(e.marker.line), this._highlightDecorations.push({ decoration: e, match: t, dispose() {\n        e.dispose();\n      } });\n    }\n    _applyStyles(e, t, r) {\n      e.classList.contains("xterm-find-result-decoration") || (e.classList.add("xterm-find-result-decoration"), t && (e.style.outline = `1px solid ${t}`)), r && e.classList.add("xterm-find-active-result-decoration");\n    }\n    _createResultDecorations(e, t, r) {\n      let s4 = [], n11 = e.col, a2 = e.size, o2 = -this._terminal.buffer.active.baseY - this._terminal.buffer.active.cursorY + e.row;\n      for (; a2 > 0; ) {\n        let c2 = Math.min(this._terminal.cols - n11, a2);\n        s4.push([o2, n11, c2]), n11 = 0, a2 -= c2, o2++;\n      }\n      let l4 = [];\n      for (let c2 of s4) {\n        let p3 = this._terminal.registerMarker(c2[0]), m4 = this._terminal.registerDecoration({ marker: p3, x: c2[1], width: c2[2], layer: r ? "top" : "bottom", backgroundColor: r ? t.activeMatchBackground : t.matchBackground, overviewRulerOptions: this._highlightedLines.has(p3.line) ? void 0 : { color: r ? t.activeMatchColorOverviewRuler : t.matchOverviewRuler, position: "center" } });\n        if (m4) {\n          let g6 = [];\n          g6.push(p3), g6.push(m4.onRender((f5) => this._applyStyles(f5, r ? t.activeMatchBorder : t.matchBorder, false))), g6.push(m4.onDispose(() => T2(g6))), l4.push(m4);\n        }\n      }\n      return l4.length === 0 ? void 0 : l4;\n    }\n  };\n  var L2 = class extends b2 {\n    constructor() {\n      super(...arguments);\n      this._searchResults = [];\n      this._onDidChangeResults = this._register(new I2());\n    }\n    get onDidChangeResults() {\n      return this._onDidChangeResults.event;\n    }\n    get searchResults() {\n      return this._searchResults;\n    }\n    get selectedDecoration() {\n      return this._selectedDecoration;\n    }\n    set selectedDecoration(e) {\n      this._selectedDecoration = e;\n    }\n    updateResults(e, t) {\n      this._searchResults = e.slice(0, t);\n    }\n    clearResults() {\n      this._searchResults = [];\n    }\n    clearSelectedDecoration() {\n      this._selectedDecoration && (this._selectedDecoration.dispose(), this._selectedDecoration = void 0);\n    }\n    findResultIndex(e) {\n      for (let t = 0; t < this._searchResults.length; t++) {\n        let r = this._searchResults[t];\n        if (r.row === e.row && r.col === e.col && r.size === e.size) return t;\n      }\n      return -1;\n    }\n    fireResultsChanged(e) {\n      if (!e) return;\n      let t = -1;\n      this._selectedDecoration && (t = this.findResultIndex(this._selectedDecoration.match)), this._onDidChangeResults.fire({ resultIndex: t, resultCount: this._searchResults.length });\n    }\n    reset() {\n      this.clearSelectedDecoration(), this.clearResults();\n    }\n  };\n  var A2 = class extends b2 {\n    constructor(e) {\n      super();\n      this._highlightTimeout = this._register(new v2());\n      this._lineCache = this._register(new v2());\n      this._state = new x3();\n      this._resultTracker = this._register(new L2());\n      this._onAfterSearch = this._register(new I2());\n      this.onAfterSearch = this._onAfterSearch.event;\n      this._onBeforeSearch = this._register(new I2());\n      this.onBeforeSearch = this._onBeforeSearch.event;\n      this._highlightLimit = e?.highlightLimit ?? 1e3;\n    }\n    get onDidChangeResults() {\n      return this._resultTracker.onDidChangeResults;\n    }\n    activate(e) {\n      this._terminal = e, this._lineCache.value = new C2(e), this._engine = new R2(e, this._lineCache.value), this._decorationManager = new w3(e), this._register(this._terminal.onWriteParsed(() => this._updateMatches())), this._register(this._terminal.onResize(() => this._updateMatches())), this._register(_3(() => this.clearDecorations()));\n    }\n    _updateMatches() {\n      this._highlightTimeout.clear(), this._state.cachedSearchTerm && this._state.lastSearchOptions?.decorations && (this._highlightTimeout.value = D3(() => {\n        let e = this._state.cachedSearchTerm;\n        this._state.clearCachedTerm(), this.findPrevious(e, { ...this._state.lastSearchOptions, incremental: true }, { noScroll: true });\n      }, 200));\n    }\n    clearDecorations(e) {\n      this._resultTracker.clearSelectedDecoration(), this._decorationManager?.clearHighlightDecorations(), this._resultTracker.clearResults(), e || this._state.clearCachedTerm();\n    }\n    clearActiveDecoration() {\n      this._resultTracker.clearSelectedDecoration();\n    }\n    findNext(e, t, r) {\n      if (!this._terminal || !this._engine) throw new Error("Cannot use addon until it has been loaded");\n      this._onBeforeSearch.fire(), this._state.lastSearchOptions = t, this._state.shouldUpdateHighlighting(e, t) && this._highlightAllMatches(e, t);\n      let s4 = this._findNextAndSelect(e, t, r);\n      return this._fireResults(t), this._state.cachedSearchTerm = e, this._onAfterSearch.fire(), s4;\n    }\n    _highlightAllMatches(e, t) {\n      if (!this._terminal || !this._engine || !this._decorationManager) throw new Error("Cannot use addon until it has been loaded");\n      if (!this._state.isValidSearchTerm(e)) {\n        this.clearDecorations();\n        return;\n      }\n      this.clearDecorations(true);\n      let r = [], s4, n11 = this._engine.find(e, 0, 0, t);\n      for (; n11 && (s4?.row !== n11.row || s4?.col !== n11.col) && !(r.length >= this._highlightLimit); ) s4 = n11, r.push(s4), n11 = this._engine.find(e, s4.col + s4.term.length >= this._terminal.cols ? s4.row + 1 : s4.row, s4.col + s4.term.length >= this._terminal.cols ? 0 : s4.col + 1, t);\n      this._resultTracker.updateResults(r, this._highlightLimit), t.decorations && this._decorationManager.createHighlightDecorations(r, t.decorations);\n    }\n    _findNextAndSelect(e, t, r) {\n      if (!this._terminal || !this._engine) return false;\n      if (!this._state.isValidSearchTerm(e)) return this._terminal.clearSelection(), this.clearDecorations(), false;\n      let s4 = this._engine.findNextWithSelection(e, t, this._state.cachedSearchTerm);\n      return this._selectResult(s4, t?.decorations, r?.noScroll);\n    }\n    findPrevious(e, t, r) {\n      if (!this._terminal || !this._engine) throw new Error("Cannot use addon until it has been loaded");\n      this._onBeforeSearch.fire(), this._state.lastSearchOptions = t, this._state.shouldUpdateHighlighting(e, t) && this._highlightAllMatches(e, t);\n      let s4 = this._findPreviousAndSelect(e, t, r);\n      return this._fireResults(t), this._state.cachedSearchTerm = e, this._onAfterSearch.fire(), s4;\n    }\n    _fireResults(e) {\n      this._resultTracker.fireResultsChanged(!!e?.decorations);\n    }\n    _findPreviousAndSelect(e, t, r) {\n      if (!this._terminal || !this._engine) return false;\n      if (!this._state.isValidSearchTerm(e)) return this._terminal.clearSelection(), this.clearDecorations(), false;\n      let s4 = this._engine.findPreviousWithSelection(e, t, this._state.cachedSearchTerm);\n      return this._selectResult(s4, t?.decorations, r?.noScroll);\n    }\n    _selectResult(e, t, r) {\n      if (!this._terminal || !this._decorationManager) return false;\n      if (this._resultTracker.clearSelectedDecoration(), !e) return this._terminal.clearSelection(), false;\n      if (this._terminal.select(e.col, e.row, e.size), t) {\n        let s4 = this._decorationManager.createActiveDecoration(e, t);\n        s4 && (this._resultTracker.selectedDecoration = s4);\n      }\n      if (!r && (e.row >= this._terminal.buffer.active.viewportY + this._terminal.rows || e.row < this._terminal.buffer.active.viewportY)) {\n        let s4 = e.row - this._terminal.buffer.active.viewportY;\n        s4 -= Math.floor(this._terminal.rows / 2), this._terminal.scrollLines(s4);\n      }\n      return true;\n    }\n  };\n\n  // node_modules/@xterm/addon-unicode11/lib/addon-unicode11.mjs\n  var p2 = [[768, 879], [1155, 1158], [1160, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1539], [1552, 1557], [1611, 1630], [1648, 1648], [1750, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2305, 2306], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2388], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2672, 2673], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2883], [2893, 2893], [2902, 2902], [2946, 2946], [3008, 3008], [3021, 3021], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3393, 3395], [3405, 3405], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3769], [3771, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3984, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4146], [4150, 4151], [4153, 4153], [4184, 4185], [4448, 4607], [4959, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6157], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7616, 7626], [7678, 7679], [8203, 8207], [8234, 8238], [8288, 8291], [8298, 8303], [8400, 8431], [12330, 12335], [12441, 12442], [43014, 43014], [43019, 43019], [43045, 43046], [64286, 64286], [65024, 65039], [65056, 65059], [65279, 65279], [65529, 65531]];\n  var T3 = [[68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var A3;\n  function m2(s4, x5) {\n    let i5 = 0, e = x5.length - 1, r;\n    if (s4 < x5[0][0] || s4 > x5[e][1]) return false;\n    for (; e >= i5; ) if (r = i5 + e >> 1, s4 > x5[r][1]) i5 = r + 1;\n    else if (s4 < x5[r][0]) e = r - 1;\n    else return true;\n    return false;\n  }\n  var d2 = class {\n    constructor() {\n      this.version = "6";\n      if (!A3) {\n        A3 = new Uint8Array(65536), A3.fill(1), A3[0] = 0, A3.fill(0, 1, 32), A3.fill(0, 127, 160), A3.fill(2, 4352, 4448), A3[9001] = 2, A3[9002] = 2, A3.fill(2, 11904, 42192), A3[12351] = 1, A3.fill(2, 44032, 55204), A3.fill(2, 63744, 64256), A3.fill(2, 65040, 65050), A3.fill(2, 65072, 65136), A3.fill(2, 65280, 65377), A3.fill(2, 65504, 65511);\n        for (let x5 = 0; x5 < p2.length; ++x5) A3.fill(0, p2[x5][0], p2[x5][1] + 1);\n      }\n    }\n    wcwidth(x5) {\n      return x5 < 32 ? 0 : x5 < 127 ? 1 : x5 < 65536 ? A3[x5] : m2(x5, T3) ? 0 : x5 >= 131072 && x5 <= 196605 || x5 >= 196608 && x5 <= 262141 ? 2 : 1;\n    }\n    charProperties(x5, i5) {\n      let e = this.wcwidth(x5), r = e === 0 && i5 !== 0;\n      if (r) {\n        let t = B2.extractWidth(i5);\n        t === 0 ? r = false : t > e && (e = t);\n      }\n      return B2.createPropertyValue(0, e, r);\n    }\n  };\n  function u2(s4) {\n    return { dispose: s4 };\n  }\n  var l2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(x5) {\n      return this._isDisposed ? x5.dispose() : this._disposables.add(x5), x5;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let x5 of this._disposables) x5.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let x5 of this._disposables) x5.dispose();\n      this._disposables.clear();\n    }\n  };\n  var f3 = class {\n    constructor() {\n      this._store = new l2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(x5) {\n      return this._store.add(x5);\n    }\n  };\n  f3.None = Object.freeze({ dispose() {\n  } });\n  var E3 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (x5, i5, e) => {\n        if (this._disposed) return u2(() => {\n        });\n        let r = { fn: x5, thisArgs: i5 };\n        this._listeners.push(r);\n        let t = u2(() => {\n          let F4 = this._listeners.indexOf(r);\n          F4 !== -1 && this._listeners.splice(F4, 1);\n        });\n        return e && (Array.isArray(e) ? e.push(t) : e.add(t)), t;\n      }, this._event);\n    }\n    fire(x5) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: i5, thisArgs: e } = this._listeners[0];\n          i5.call(e, x5);\n          return;\n        }\n        default: {\n          let i5 = this._listeners.slice();\n          for (let { fn: e, thisArgs: r } of i5) e.call(r, x5);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var U3;\n  ((r) => {\n    function s4(t, F4) {\n      return t((n11) => F4.fire(n11));\n    }\n    r.forward = s4;\n    function x5(t, F4) {\n      return (n11, o2, C4) => t((c2) => n11.call(o2, F4(c2)), void 0, C4);\n    }\n    r.map = x5;\n    function i5(...t) {\n      return (F4, n11, o2) => {\n        let C4 = new l2();\n        for (let c2 of t) C4.add(c2((_5) => F4.call(n11, _5)));\n        return o2 && (Array.isArray(o2) ? o2.push(C4) : o2.add(C4)), C4;\n      };\n    }\n    r.any = i5;\n    function e(t, F4, n11) {\n      return F4(n11), t((o2) => F4(o2));\n    }\n    r.runAndSubscribe = e;\n  })(U3 ||= {});\n  var B2 = class s3 {\n    constructor() {\n      this._providers = /* @__PURE__ */ Object.create(null);\n      this._active = "";\n      this._onChange = new E3();\n      this.onChange = this._onChange.event;\n      let x5 = new d2();\n      this.register(x5), this._active = x5.version, this._activeProvider = x5;\n    }\n    static extractShouldJoin(x5) {\n      return (x5 & 1) !== 0;\n    }\n    static extractWidth(x5) {\n      return x5 >> 1 & 3;\n    }\n    static extractCharKind(x5) {\n      return x5 >> 3;\n    }\n    static createPropertyValue(x5, i5, e = false) {\n      return (x5 & 16777215) << 3 | (i5 & 3) << 1 | (e ? 1 : 0);\n    }\n    dispose() {\n      this._onChange.dispose();\n    }\n    get versions() {\n      return Object.keys(this._providers);\n    }\n    get activeVersion() {\n      return this._active;\n    }\n    set activeVersion(x5) {\n      if (!this._providers[x5]) throw new Error(`unknown Unicode version "${x5}"`);\n      this._active = x5, this._activeProvider = this._providers[x5], this._onChange.fire(x5);\n    }\n    register(x5) {\n      this._providers[x5.version] = x5;\n    }\n    wcwidth(x5) {\n      return this._activeProvider.wcwidth(x5);\n    }\n    getStringCellWidth(x5) {\n      let i5 = 0, e = 0, r = x5.length;\n      for (let t = 0; t < r; ++t) {\n        let F4 = x5.charCodeAt(t);\n        if (55296 <= F4 && F4 <= 56319) {\n          if (++t >= r) return i5 + this.wcwidth(F4);\n          let C4 = x5.charCodeAt(t);\n          56320 <= C4 && C4 <= 57343 ? F4 = (F4 - 55296) * 1024 + C4 - 56320 + 65536 : i5 += this.wcwidth(C4);\n        }\n        let n11 = this.charProperties(F4, e), o2 = s3.extractWidth(n11);\n        s3.extractShouldJoin(n11) && (o2 -= s3.extractWidth(e)), i5 += o2, e = n11;\n      }\n      return i5;\n    }\n    charProperties(x5, i5) {\n      return this._activeProvider.charProperties(x5, i5);\n    }\n  };\n  var h2 = [[768, 879], [1155, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1541], [1552, 1562], [1564, 1564], [1611, 1631], [1648, 1648], [1750, 1757], [1759, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2045, 2045], [2070, 2073], [2075, 2083], [2085, 2087], [2089, 2093], [2137, 2139], [2259, 2306], [2362, 2362], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2391], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2558, 2558], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2641, 2641], [2672, 2673], [2677, 2677], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2810, 2815], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2884], [2893, 2893], [2902, 2902], [2914, 2915], [2946, 2946], [3008, 3008], [3021, 3021], [3072, 3072], [3076, 3076], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3170, 3171], [3201, 3201], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3328, 3329], [3387, 3388], [3393, 3396], [3405, 3405], [3426, 3427], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3981, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4151], [4153, 4154], [4157, 4158], [4184, 4185], [4190, 4192], [4209, 4212], [4226, 4226], [4229, 4230], [4237, 4237], [4253, 4253], [4448, 4607], [4957, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6158], [6277, 6278], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6683, 6683], [6742, 6742], [6744, 6750], [6752, 6752], [6754, 6754], [6757, 6764], [6771, 6780], [6783, 6783], [6832, 6846], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7040, 7041], [7074, 7077], [7080, 7081], [7083, 7085], [7142, 7142], [7144, 7145], [7149, 7149], [7151, 7153], [7212, 7219], [7222, 7223], [7376, 7378], [7380, 7392], [7394, 7400], [7405, 7405], [7412, 7412], [7416, 7417], [7616, 7673], [7675, 7679], [8203, 8207], [8234, 8238], [8288, 8292], [8294, 8303], [8400, 8432], [11503, 11505], [11647, 11647], [11744, 11775], [12330, 12333], [12441, 12442], [42607, 42610], [42612, 42621], [42654, 42655], [42736, 42737], [43010, 43010], [43014, 43014], [43019, 43019], [43045, 43046], [43204, 43205], [43232, 43249], [43263, 43263], [43302, 43309], [43335, 43345], [43392, 43394], [43443, 43443], [43446, 43449], [43452, 43453], [43493, 43493], [43561, 43566], [43569, 43570], [43573, 43574], [43587, 43587], [43596, 43596], [43644, 43644], [43696, 43696], [43698, 43700], [43703, 43704], [43710, 43711], [43713, 43713], [43756, 43757], [43766, 43766], [44005, 44005], [44008, 44008], [44013, 44013], [64286, 64286], [65024, 65039], [65056, 65071], [65279, 65279], [65529, 65531]];\n  var y2 = [[66045, 66045], [66272, 66272], [66422, 66426], [68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [68325, 68326], [68900, 68903], [69446, 69456], [69633, 69633], [69688, 69702], [69759, 69761], [69811, 69814], [69817, 69818], [69821, 69821], [69837, 69837], [69888, 69890], [69927, 69931], [69933, 69940], [70003, 70003], [70016, 70017], [70070, 70078], [70089, 70092], [70191, 70193], [70196, 70196], [70198, 70199], [70206, 70206], [70367, 70367], [70371, 70378], [70400, 70401], [70459, 70460], [70464, 70464], [70502, 70508], [70512, 70516], [70712, 70719], [70722, 70724], [70726, 70726], [70750, 70750], [70835, 70840], [70842, 70842], [70847, 70848], [70850, 70851], [71090, 71093], [71100, 71101], [71103, 71104], [71132, 71133], [71219, 71226], [71229, 71229], [71231, 71232], [71339, 71339], [71341, 71341], [71344, 71349], [71351, 71351], [71453, 71455], [71458, 71461], [71463, 71467], [71727, 71735], [71737, 71738], [72148, 72151], [72154, 72155], [72160, 72160], [72193, 72202], [72243, 72248], [72251, 72254], [72263, 72263], [72273, 72278], [72281, 72283], [72330, 72342], [72344, 72345], [72752, 72758], [72760, 72765], [72767, 72767], [72850, 72871], [72874, 72880], [72882, 72883], [72885, 72886], [73009, 73014], [73018, 73018], [73020, 73021], [73023, 73029], [73031, 73031], [73104, 73105], [73109, 73109], [73111, 73111], [73459, 73460], [78896, 78904], [92912, 92916], [92976, 92982], [94031, 94031], [94095, 94098], [113821, 113822], [113824, 113827], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [121344, 121398], [121403, 121452], [121461, 121461], [121476, 121476], [121499, 121503], [121505, 121519], [122880, 122886], [122888, 122904], [122907, 122913], [122915, 122916], [122918, 122922], [123184, 123190], [123628, 123631], [125136, 125142], [125252, 125258], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var b3 = [[4352, 4447], [8986, 8987], [9001, 9002], [9193, 9196], [9200, 9200], [9203, 9203], [9725, 9726], [9748, 9749], [9800, 9811], [9855, 9855], [9875, 9875], [9889, 9889], [9898, 9899], [9917, 9918], [9924, 9925], [9934, 9934], [9940, 9940], [9962, 9962], [9970, 9971], [9973, 9973], [9978, 9978], [9981, 9981], [9989, 9989], [9994, 9995], [10024, 10024], [10060, 10060], [10062, 10062], [10067, 10069], [10071, 10071], [10133, 10135], [10160, 10160], [10175, 10175], [11035, 11036], [11088, 11088], [11093, 11093], [11904, 11929], [11931, 12019], [12032, 12245], [12272, 12283], [12288, 12329], [12334, 12350], [12353, 12438], [12443, 12543], [12549, 12591], [12593, 12686], [12688, 12730], [12736, 12771], [12784, 12830], [12832, 12871], [12880, 19903], [19968, 42124], [42128, 42182], [43360, 43388], [44032, 55203], [63744, 64255], [65040, 65049], [65072, 65106], [65108, 65126], [65128, 65131], [65281, 65376], [65504, 65510]];\n  var P2 = [[94176, 94179], [94208, 100343], [100352, 101106], [110592, 110878], [110928, 110930], [110948, 110951], [110960, 111355], [126980, 126980], [127183, 127183], [127374, 127374], [127377, 127386], [127488, 127490], [127504, 127547], [127552, 127560], [127568, 127569], [127584, 127589], [127744, 127776], [127789, 127797], [127799, 127868], [127870, 127891], [127904, 127946], [127951, 127955], [127968, 127984], [127988, 127988], [127992, 128062], [128064, 128064], [128066, 128252], [128255, 128317], [128331, 128334], [128336, 128359], [128378, 128378], [128405, 128406], [128420, 128420], [128507, 128591], [128640, 128709], [128716, 128716], [128720, 128722], [128725, 128725], [128747, 128748], [128756, 128762], [128992, 129003], [129293, 129393], [129395, 129398], [129402, 129442], [129445, 129450], [129454, 129482], [129485, 129535], [129648, 129651], [129656, 129658], [129664, 129666], [129680, 129685], [131072, 196605], [196608, 262141]];\n  var D4;\n  function v3(s4, x5) {\n    let i5 = 0, e = x5.length - 1, r;\n    if (s4 < x5[0][0] || s4 > x5[e][1]) return false;\n    for (; e >= i5; ) if (r = i5 + e >> 1, s4 > x5[r][1]) i5 = r + 1;\n    else if (s4 < x5[r][0]) e = r - 1;\n    else return true;\n    return false;\n  }\n  var a = class {\n    constructor() {\n      this.version = "11";\n      if (!D4) {\n        D4 = new Uint8Array(65536), D4.fill(1), D4[0] = 0, D4.fill(0, 1, 32), D4.fill(0, 127, 160);\n        for (let x5 = 0; x5 < h2.length; ++x5) D4.fill(0, h2[x5][0], h2[x5][1] + 1);\n        for (let x5 = 0; x5 < b3.length; ++x5) D4.fill(2, b3[x5][0], b3[x5][1] + 1);\n      }\n    }\n    wcwidth(x5) {\n      return x5 < 32 ? 0 : x5 < 127 ? 1 : x5 < 65536 ? D4[x5] : v3(x5, y2) ? 0 : v3(x5, P2) ? 2 : 1;\n    }\n    charProperties(x5, i5) {\n      let e = this.wcwidth(x5), r = e === 0 && i5 !== 0;\n      if (r) {\n        let t = B2.extractWidth(i5);\n        t === 0 ? r = false : t > e && (e = t);\n      }\n      return B2.createPropertyValue(0, e, r);\n    }\n  };\n  var I3 = class {\n    activate(x5) {\n      x5.unicode.register(new a());\n    }\n    dispose() {\n    }\n  };\n\n  // node_modules/@xterm/addon-web-links/lib/addon-web-links.mjs\n  var v4 = class {\n    constructor(e, t, n11, o2 = {}) {\n      this._terminal = e;\n      this._regex = t;\n      this._handler = n11;\n      this._options = o2;\n    }\n    provideLinks(e, t) {\n      let n11 = g3.computeLink(e, this._regex, this._terminal, this._handler);\n      t(this._addCallbacks(n11));\n    }\n    _addCallbacks(e) {\n      return e.map((t) => (t.leave = this._options.leave, t.hover = (n11, o2) => {\n        if (this._options.hover) {\n          let { range: p3 } = t;\n          this._options.hover(n11, o2, p3);\n        }\n      }, t));\n    }\n  };\n  function k2(l4) {\n    try {\n      let e = new URL(l4), t = e.password && e.username ? `${e.protocol}//${e.username}:${e.password}@${e.host}` : e.username ? `${e.protocol}//${e.username}@${e.host}` : `${e.protocol}//${e.host}`;\n      return l4.toLocaleLowerCase().startsWith(t.toLocaleLowerCase());\n    } catch {\n      return false;\n    }\n  }\n  var g3 = class l3 {\n    static computeLink(e, t, n11, o2) {\n      let p3 = new RegExp(t.source, (t.flags || "") + "g"), [i5, r] = l3._getWindowedLineStrings(e - 1, n11), s4 = i5.join(""), a2, d3 = [];\n      for (; a2 = p3.exec(s4); ) {\n        let u3 = a2[0];\n        if (!k2(u3)) continue;\n        let [c2, h3] = l3._mapStrIdx(n11, r, 0, a2.index), [m4, f5] = l3._mapStrIdx(n11, c2, h3, u3.length);\n        if (c2 === -1 || h3 === -1 || m4 === -1 || f5 === -1) continue;\n        let b4 = { start: { x: h3 + 1, y: c2 + 1 }, end: { x: f5, y: m4 + 1 } };\n        d3.push({ range: b4, text: u3, activate: o2 });\n      }\n      return d3;\n    }\n    static _getWindowedLineStrings(e, t) {\n      let n11, o2 = e, p3 = e, i5 = 0, r = "", s4 = [];\n      if (n11 = t.buffer.active.getLine(e)) {\n        let a2 = n11.translateToString(true);\n        if (n11.isWrapped && a2[0] !== " ") {\n          for (i5 = 0; (n11 = t.buffer.active.getLine(--o2)) && i5 < 2048 && (r = n11.translateToString(true), i5 += r.length, s4.push(r), !(!n11.isWrapped || r.indexOf(" ") !== -1)); ) ;\n          s4.reverse();\n        }\n        for (s4.push(a2), i5 = 0; (n11 = t.buffer.active.getLine(++p3)) && n11.isWrapped && i5 < 2048 && (r = n11.translateToString(true), i5 += r.length, s4.push(r), r.indexOf(" ") === -1); ) ;\n      }\n      return [s4, o2];\n    }\n    static _mapStrIdx(e, t, n11, o2) {\n      let p3 = e.buffer.active, i5 = p3.getNullCell(), r = n11;\n      for (; o2; ) {\n        let s4 = p3.getLine(t);\n        if (!s4) return [-1, -1];\n        for (let a2 = r; a2 < s4.length; ++a2) {\n          s4.getCell(a2, i5);\n          let d3 = i5.getChars();\n          if (i5.getWidth() && (o2 -= d3.length || 1, a2 === s4.length - 1 && d3 === "")) {\n            let c2 = p3.getLine(t + 1);\n            c2 && c2.isWrapped && (c2.getCell(0, i5), i5.getWidth() === 2 && (o2 += 1));\n          }\n          if (o2 < 0) return [t, a2];\n        }\n        t++, r = 0;\n      }\n      return [t, r];\n    }\n  };\n  var _4 = /(https?|HTTPS?):[/]{2}[^\\s"\'!*(){}|\\\\\\^<>`]*[^\\s"\':,.!?{}|\\\\\\^~\\[\\]`()<>]/;\n  function w4(l4, e) {\n    let t = window.open();\n    if (t) {\n      try {\n        t.opener = null;\n      } catch {\n      }\n      t.location.href = e;\n    } else console.warn("Opening link blocked as opener could not be cleared");\n  }\n  var L3 = class {\n    constructor(e = w4, t = {}) {\n      this._handler = e;\n      this._options = t;\n    }\n    activate(e) {\n      this._terminal = e;\n      let t = this._options, n11 = t.urlRegex ?? _4;\n      this._linkProvider = this._terminal.registerLinkProvider(new v4(this._terminal, n11, this._handler, t));\n    }\n    dispose() {\n      this._linkProvider?.dispose();\n    }\n  };\n\n  // node_modules/@xterm/addon-webgl/lib/addon-webgl.mjs\n  function g4(i5) {\n    return { dispose: i5 };\n  }\n  function St(i5) {\n    if (!i5) return i5;\n    if (Array.isArray(i5)) {\n      for (let e of i5) e.dispose();\n      return [];\n    }\n    return i5.dispose(), i5;\n  }\n  function ke2(...i5) {\n    return g4(() => St(i5));\n  }\n  var B0 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(e) {\n      return this._isDisposed ? e.dispose() : this._disposables.add(e), e;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let e of this._disposables) e.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let e of this._disposables) e.dispose();\n      this._disposables.clear();\n    }\n  };\n  var W3 = class {\n    constructor() {\n      this._store = new B0();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(e) {\n      return this._store.add(e);\n    }\n  };\n  W3.None = Object.freeze({ dispose() {\n  } });\n  var C0 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(e) {\n      this._isDisposed || e === this._value || (this._value?.dispose(), this._value = e);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var Ze2 = !!(typeof process < "u" && "title" in process && (typeof navigator > "u" || navigator.userAgent.startsWith("Node.js/")));\n  var O0 = Ze2 ? "node" : navigator.userAgent;\n  var me2 = Ze2 ? "node" : navigator.platform;\n  var Ue2 = O0.includes("Firefox");\n  var L1 = O0.includes("Chrome");\n  var We2 = O0.includes("Edge");\n  var fe = /^((?!chrome|android).)*safari/i.test(O0);\n  function Ve() {\n    if (!fe) return 0;\n    let i5 = O0.match(/Version\\/(\\d+)/);\n    return i5 === null || i5.length < 2 ? 0 : parseInt(i5[1]);\n  }\n  var h1 = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"].includes(me2);\n  var d1 = ["Windows", "Win16", "Win32", "WinCE"].includes(me2);\n  var _1 = me2.indexOf("Linux") >= 0;\n  var c1 = /\\bCrOS\\b/.test(O0);\n  var P3 = 0;\n  var B3 = 0;\n  var w5 = 0;\n  var x4 = 0;\n  var G3 = { css: "#00000000", rgba: 0 };\n  var Z3;\n  ((r) => {\n    function i5(n11, a2, s4, o2) {\n      return o2 !== void 0 ? `#${E0(n11)}${E0(a2)}${E0(s4)}${E0(o2)}` : `#${E0(n11)}${E0(a2)}${E0(s4)}`;\n    }\n    r.toCss = i5;\n    function e(n11, a2, s4, o2 = 255) {\n      return (n11 << 24 | a2 << 16 | s4 << 8 | o2) >>> 0;\n    }\n    r.toRgba = e;\n    function t(n11, a2, s4, o2) {\n      return { css: r.toCss(n11, a2, s4, o2), rgba: r.toRgba(n11, a2, s4, o2) };\n    }\n    r.toColor = t;\n  })(Z3 ||= {});\n  var I0;\n  ((o2) => {\n    function i5(l4, T4) {\n      if (x4 = (T4.rgba & 255) / 255, x4 === 1) return { css: T4.css, rgba: T4.rgba };\n      let h3 = T4.rgba >> 24 & 255, d3 = T4.rgba >> 16 & 255, _5 = T4.rgba >> 8 & 255, c2 = l4.rgba >> 24 & 255, u3 = l4.rgba >> 16 & 255, p3 = l4.rgba >> 8 & 255;\n      P3 = c2 + Math.round((h3 - c2) * x4), B3 = u3 + Math.round((d3 - u3) * x4), w5 = p3 + Math.round((_5 - p3) * x4);\n      let C4 = Z3.toCss(P3, B3, w5), Q3 = Z3.toRgba(P3, B3, w5);\n      return { css: C4, rgba: Q3 };\n    }\n    o2.blend = i5;\n    function e(l4) {\n      return (l4.rgba & 255) === 255;\n    }\n    o2.isOpaque = e;\n    function t(l4, T4, h3) {\n      let d3 = h0.ensureContrastRatio(l4.rgba, T4.rgba, h3);\n      if (d3) return Z3.toColor(d3 >> 24 & 255, d3 >> 16 & 255, d3 >> 8 & 255);\n    }\n    o2.ensureContrastRatio = t;\n    function r(l4) {\n      let T4 = (l4.rgba | 255) >>> 0;\n      return [P3, B3, w5] = h0.toChannels(T4), { css: Z3.toCss(P3, B3, w5), rgba: T4 };\n    }\n    o2.opaque = r;\n    function n11(l4, T4) {\n      return x4 = Math.round(T4 * 255), [P3, B3, w5] = h0.toChannels(l4.rgba), { css: Z3.toCss(P3, B3, w5, x4), rgba: Z3.toRgba(P3, B3, w5, x4) };\n    }\n    o2.opacity = n11;\n    function a2(l4, T4) {\n      return x4 = l4.rgba & 255, n11(l4, x4 * T4 / 255);\n    }\n    o2.multiplyOpacity = a2;\n    function s4(l4) {\n      return [l4.rgba >> 24 & 255, l4.rgba >> 16 & 255, l4.rgba >> 8 & 255];\n    }\n    o2.toColorRGB = s4;\n  })(I0 ||= {});\n  var Rt;\n  ((r) => {\n    let i5, e;\n    try {\n      let n11 = document.createElement("canvas");\n      n11.width = 1, n11.height = 1;\n      let a2 = n11.getContext("2d", { willReadFrequently: true });\n      a2 && (i5 = a2, i5.globalCompositeOperation = "copy", e = i5.createLinearGradient(0, 0, 1, 1));\n    } catch {\n    }\n    function t(n11) {\n      if (n11.match(/#[\\da-f]{3,8}/i)) switch (n11.length) {\n        case 4:\n          return P3 = parseInt(n11.slice(1, 2).repeat(2), 16), B3 = parseInt(n11.slice(2, 3).repeat(2), 16), w5 = parseInt(n11.slice(3, 4).repeat(2), 16), Z3.toColor(P3, B3, w5);\n        case 5:\n          return P3 = parseInt(n11.slice(1, 2).repeat(2), 16), B3 = parseInt(n11.slice(2, 3).repeat(2), 16), w5 = parseInt(n11.slice(3, 4).repeat(2), 16), x4 = parseInt(n11.slice(4, 5).repeat(2), 16), Z3.toColor(P3, B3, w5, x4);\n        case 7:\n          return { css: n11, rgba: (parseInt(n11.slice(1), 16) << 8 | 255) >>> 0 };\n        case 9:\n          return { css: n11, rgba: parseInt(n11.slice(1), 16) >>> 0 };\n      }\n      let a2 = n11.match(/rgba?\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*(,\\s*(0|1|\\d?\\.(\\d+))\\s*)?\\)/);\n      if (a2) return P3 = parseInt(a2[1]), B3 = parseInt(a2[2]), w5 = parseInt(a2[3]), x4 = Math.round((a2[5] === void 0 ? 1 : parseFloat(a2[5])) * 255), Z3.toColor(P3, B3, w5, x4);\n      if (n11 === "transparent") return { css: "transparent", rgba: 0 };\n      if (!i5 || !e) throw new Error("css.toColor: Unsupported css format");\n      if (i5.fillStyle = e, i5.fillStyle = n11, typeof i5.fillStyle != "string") throw new Error("css.toColor: Unsupported css format");\n      if (i5.fillRect(0, 0, 1, 1), [P3, B3, w5, x4] = i5.getImageData(0, 0, 1, 1).data, x4 !== 255) throw new Error("css.toColor: Unsupported css format");\n      return { rgba: Z3.toRgba(P3, B3, w5, x4), css: n11 };\n    }\n    r.toColor = t;\n  })(Rt ||= {});\n  var V3;\n  ((t) => {\n    function i5(r) {\n      return e(r >> 16 & 255, r >> 8 & 255, r & 255);\n    }\n    t.relativeLuminance = i5;\n    function e(r, n11, a2) {\n      let s4 = r / 255, o2 = n11 / 255, l4 = a2 / 255, T4 = s4 <= 0.03928 ? s4 / 12.92 : Math.pow((s4 + 0.055) / 1.055, 2.4), h3 = o2 <= 0.03928 ? o2 / 12.92 : Math.pow((o2 + 0.055) / 1.055, 2.4), d3 = l4 <= 0.03928 ? l4 / 12.92 : Math.pow((l4 + 0.055) / 1.055, 2.4);\n      return T4 * 0.2126 + h3 * 0.7152 + d3 * 0.0722;\n    }\n    t.relativeLuminance2 = e;\n  })(V3 ||= {});\n  var h0;\n  ((a2) => {\n    function i5(s4, o2) {\n      if (x4 = (o2 & 255) / 255, x4 === 1) return o2;\n      let l4 = o2 >> 24 & 255, T4 = o2 >> 16 & 255, h3 = o2 >> 8 & 255, d3 = s4 >> 24 & 255, _5 = s4 >> 16 & 255, c2 = s4 >> 8 & 255;\n      return P3 = d3 + Math.round((l4 - d3) * x4), B3 = _5 + Math.round((T4 - _5) * x4), w5 = c2 + Math.round((h3 - c2) * x4), Z3.toRgba(P3, B3, w5);\n    }\n    a2.blend = i5;\n    function e(s4, o2, l4) {\n      let T4 = V3.relativeLuminance(s4 >> 8), h3 = V3.relativeLuminance(o2 >> 8);\n      if (L0(T4, h3) < l4) {\n        if (h3 < T4) {\n          let u3 = t(s4, o2, l4), p3 = L0(T4, V3.relativeLuminance(u3 >> 8));\n          if (p3 < l4) {\n            let C4 = r(s4, o2, l4), Q3 = L0(T4, V3.relativeLuminance(C4 >> 8));\n            return p3 > Q3 ? u3 : C4;\n          }\n          return u3;\n        }\n        let _5 = r(s4, o2, l4), c2 = L0(T4, V3.relativeLuminance(_5 >> 8));\n        if (c2 < l4) {\n          let u3 = t(s4, o2, l4), p3 = L0(T4, V3.relativeLuminance(u3 >> 8));\n          return c2 > p3 ? _5 : u3;\n        }\n        return _5;\n      }\n    }\n    a2.ensureContrastRatio = e;\n    function t(s4, o2, l4) {\n      let T4 = s4 >> 24 & 255, h3 = s4 >> 16 & 255, d3 = s4 >> 8 & 255, _5 = o2 >> 24 & 255, c2 = o2 >> 16 & 255, u3 = o2 >> 8 & 255, p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      for (; p3 < l4 && (_5 > 0 || c2 > 0 || u3 > 0); ) _5 -= Math.max(0, Math.ceil(_5 * 0.1)), c2 -= Math.max(0, Math.ceil(c2 * 0.1)), u3 -= Math.max(0, Math.ceil(u3 * 0.1)), p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      return (_5 << 24 | c2 << 16 | u3 << 8 | 255) >>> 0;\n    }\n    a2.reduceLuminance = t;\n    function r(s4, o2, l4) {\n      let T4 = s4 >> 24 & 255, h3 = s4 >> 16 & 255, d3 = s4 >> 8 & 255, _5 = o2 >> 24 & 255, c2 = o2 >> 16 & 255, u3 = o2 >> 8 & 255, p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      for (; p3 < l4 && (_5 < 255 || c2 < 255 || u3 < 255); ) _5 = Math.min(255, _5 + Math.ceil((255 - _5) * 0.1)), c2 = Math.min(255, c2 + Math.ceil((255 - c2) * 0.1)), u3 = Math.min(255, u3 + Math.ceil((255 - u3) * 0.1)), p3 = L0(V3.relativeLuminance2(_5, c2, u3), V3.relativeLuminance2(T4, h3, d3));\n      return (_5 << 24 | c2 << 16 | u3 << 8 | 255) >>> 0;\n    }\n    a2.increaseLuminance = r;\n    function n11(s4) {\n      return [s4 >> 24 & 255, s4 >> 16 & 255, s4 >> 8 & 255, s4 & 255];\n    }\n    a2.toChannels = n11;\n  })(h0 ||= {});\n  function E0(i5) {\n    let e = i5.toString(16);\n    return e.length < 2 ? "0" + e : e;\n  }\n  function L0(i5, e) {\n    return i5 < e ? (e + 0.05) / (i5 + 0.05) : (i5 + 0.05) / (e + 0.05);\n  }\n  function y3(i5) {\n    if (!i5) throw new Error("value must not be falsy");\n    return i5;\n  }\n  function K0(i5) {\n    return 57508 <= i5 && i5 <= 57558;\n  }\n  function $e(i5) {\n    return 57520 <= i5 && i5 <= 57527;\n  }\n  function xt2(i5) {\n    return 57344 <= i5 && i5 <= 63743;\n  }\n  function Dt(i5) {\n    return 9472 <= i5 && i5 <= 9631;\n  }\n  function Nt2(i5) {\n    return i5 >= 128512 && i5 <= 128591 || i5 >= 127744 && i5 <= 128511 || i5 >= 128640 && i5 <= 128767 || i5 >= 9728 && i5 <= 9983 || i5 >= 9984 && i5 <= 10175 || i5 >= 65024 && i5 <= 65039 || i5 >= 129280 && i5 <= 129535 || i5 >= 127462 && i5 <= 127487;\n  }\n  function Ge2(i5, e, t, r) {\n    return e === 1 && t > Math.ceil(r * 1.5) && i5 !== void 0 && i5 > 255 && !Nt2(i5) && !K0(i5) && !xt2(i5);\n  }\n  function z0(i5) {\n    return K0(i5) || Dt(i5);\n  }\n  function Ke2() {\n    return { css: { canvas: G0(), cell: G0() }, device: { canvas: G0(), cell: G0(), char: { width: 0, height: 0, left: 0, top: 0 } } };\n  }\n  function G0() {\n    return { width: 0, height: 0 };\n  }\n  function ze2(i5, e, t = 0) {\n    return (i5 - (Math.round(e) * 2 - t)) % (Math.round(e) * 2);\n  }\n  var L4;\n  ((C4) => (C4.LINE_H = Object.freeze({ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }), C4.LINE_V = Object.freeze({ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }), C4.FADE_RIGHT = Object.freeze({ type: 2, data: "M0,.5 L.28,.5 M.32,.5 L.52,.5 M.60,.5 L.72,.5 M.84,.5 L.90,.5", strokeWidth: 1 }), C4.FADE_LEFT = Object.freeze({ type: 2, data: "M.10,.5 L.16,.5 M.28,.5 L.40,.5 M.48,.5 L.68,.5 M.72,.5 L1,.5", strokeWidth: 1 }), C4.FADE_DOWN = Object.freeze({ type: 2, data: "M.5,0 L.5,.28 M.5,.32 L.5,.52 M.5,.60 L.5,.72 M.5,.84 L.5,.90", strokeWidth: 1 }), C4.FADE_UP = Object.freeze({ type: 2, data: "M.5,.10 L.5,.16 M.5,.28 L.5,.40 M.5,.48 L.5,.68 M.5,.72 L.5,1", strokeWidth: 1 }), C4.CURVE_DOWN_RIGHT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,1 L.5,${0.5 + m4 / 0.15 * 0.5} C.5,${0.5 + m4 / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }), C4.CURVE_DOWN_LEFT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,1 L.5,${0.5 + m4 / 0.15 * 0.5} C.5,${0.5 + m4 / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }), C4.CURVE_UP_RIGHT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,0 L.5,${0.5 - m4 / 0.15 * 0.5} C.5,${0.5 - m4 / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }), C4.CURVE_UP_LEFT = Object.freeze({ type: 2, data: (Q3, m4) => `M.5,0 L.5,${0.5 - m4 / 0.15 * 0.5} C.5,${0.5 - m4 / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }), C4.NODE_FILL = Object.freeze({ type: 3, data: "M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5" }), C4.NODE_STROKE = Object.freeze({ type: 3, data: "M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5", strokeWidth: 1 }), C4.NODE_LINE_RIGHT = Object.freeze({ type: 3, data: "M1,.5 L.85,.5", strokeWidth: 1 }), C4.NODE_LINE_LEFT = Object.freeze({ type: 3, data: "M0,.5 L.15,.5", strokeWidth: 1 }), C4.NODE_LINE_DOWN = Object.freeze({ type: 3, data: "M.5,1 L.5,.7", strokeWidth: 1 }), C4.NODE_LINE_UP = Object.freeze({ type: 3, data: "M.5,0 L.5,.3", strokeWidth: 1 })))(L4 ||= {});\n  var Xe2 = { "\\u2500": { type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, "\\u2501": { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }, "\\u2502": { type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, "\\u2503": { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }, "\\u2504": { type: 2, data: "M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5", strokeWidth: 1 }, "\\u2505": { type: 2, data: "M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5", strokeWidth: 3 }, "\\u2506": { type: 2, data: "M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333", strokeWidth: 1 }, "\\u2507": { type: 2, data: "M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333", strokeWidth: 3 }, "\\u2508": { type: 2, data: "M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5", strokeWidth: 1 }, "\\u2509": { type: 2, data: "M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5", strokeWidth: 3 }, "\\u250A": { type: 2, data: "M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95", strokeWidth: 1 }, "\\u250B": { type: 2, data: "M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95", strokeWidth: 3 }, "\\u250C": { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, "\\u250D": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u250E": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u250F": { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }, "\\u2510": { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, "\\u2511": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2512": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2513": { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }, "\\u2514": { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, "\\u2515": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u2516": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2517": { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }, "\\u2518": { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, "\\u2519": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u251A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u251B": { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }, "\\u251C": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 1 }, "\\u251D": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u251E": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u251F": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2520": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2521": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2522": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2523": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 3 }, "\\u2524": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 1 }, "\\u2525": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2526": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2527": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2528": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2529": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u252A": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u252B": { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 3 }, "\\u252C": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 1 }, "\\u252D": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u252E": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u252F": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2530": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2531": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u2532": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2533": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 3 }, "\\u2534": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,0", strokeWidth: 1 }, "\\u2535": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u2536": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u2537": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2538": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2539": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u253A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u253B": { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,0", strokeWidth: 3 }, "\\u253C": { type: 2, data: "M0,.5 L1,.5 M.5,0 L.5,1", strokeWidth: 1 }, "\\u253D": [{ type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u253E": [{ type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u253F": [{ type: 2, data: "M.5,0 L.5,1", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5", strokeWidth: 3 }], "\\u2540": [{ type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2541": [{ type: 2, data: "M.5,.5 L.5,0 M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2542": [{ type: 2, data: "M0,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1", strokeWidth: 3 }], "\\u2543": [{ type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 3 }], "\\u2544": [{ type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2545": [{ type: 2, data: "M.5,0 L.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M0,.5 L.5,.5 L.5,1", strokeWidth: 3 }], "\\u2546": [{ type: 2, data: "M.5,0 L.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M0.5,1 L.5,.5 L1,.5", strokeWidth: 3 }], "\\u2547": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0 M0,.5 L1,.5", strokeWidth: 3 }], "\\u2548": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M0,.5 L1,.5 M.5,.5 L.5,1", strokeWidth: 3 }], "\\u2549": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1 M.5,.5 L0,.5", strokeWidth: 3 }], "\\u254A": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,0 L.5,1 M.5,.5 L1,.5", strokeWidth: 3 }], "\\u254B": { type: 2, data: "M0,.5 L1,.5 M.5,0 L.5,1", strokeWidth: 3 }, "\\u254C": { type: 2, data: "M.1,.5 L.4,.5 M.6,.5 L.9,.5", strokeWidth: 1 }, "\\u254D": { type: 2, data: "M.1,.5 L.4,.5 M.6,.5 L.9,.5", strokeWidth: 3 }, "\\u254E": { type: 2, data: "M.5,.1 L.5,.4 M.5,.6 L.5,.9", strokeWidth: 1 }, "\\u254F": { type: 2, data: "M.5,.1 L.5,.4 M.5,.6 L.5,.9", strokeWidth: 3 }, "\\u2550": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2551": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2552": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 - e} L1,${0.5 - e} M.5,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2553": { type: 2, data: (i5, e) => `M${0.5 - i5},1 L${0.5 - i5},.5 L1,.5 M${0.5 + i5},.5 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2554": { type: 2, data: (i5, e) => `M1,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2555": { type: 2, data: (i5, e) => `M0,${0.5 - e} L.5,${0.5 - e} L.5,1 M0,${0.5 + e} L.5,${0.5 + e}`, strokeWidth: 1 }, "\\u2556": { type: 2, data: (i5, e) => `M${0.5 + i5},1 L${0.5 + i5},.5 L0,.5 M${0.5 - i5},.5 L${0.5 - i5},1`, strokeWidth: 1 }, "\\u2557": { type: 2, data: (i5, e) => `M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M0,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2558": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 + e} L1,${0.5 + e} M.5,${0.5 - e} L1,${0.5 - e}`, strokeWidth: 1 }, "\\u2559": { type: 2, data: (i5, e) => `M1,.5 L${0.5 - i5},.5 L${0.5 - i5},0 M${0.5 + i5},.5 L${0.5 + i5},0`, strokeWidth: 1 }, "\\u255A": { type: 2, data: (i5, e) => `M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0 M1,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},0`, strokeWidth: 1 }, "\\u255B": { type: 2, data: (i5, e) => `M0,${0.5 + e} L.5,${0.5 + e} L.5,0 M0,${0.5 - e} L.5,${0.5 - e}`, strokeWidth: 1 }, "\\u255C": { type: 2, data: (i5, e) => `M0,.5 L${0.5 + i5},.5 L${0.5 + i5},0 M${0.5 - i5},.5 L${0.5 - i5},0`, strokeWidth: 1 }, "\\u255D": { type: 2, data: (i5, e) => `M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M0,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u255E": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M.5,${0.5 - e} L1,${0.5 - e} M.5,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u255F": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1 M${0.5 + i5},.5 L1,.5`, strokeWidth: 1 }, "\\u2560": { type: 2, data: (i5, e) => `M${0.5 - i5},0 L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u2561": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M0,${0.5 - e} L.5,${0.5 - e} M0,${0.5 + e} L.5,${0.5 + e}`, strokeWidth: 1 }, "\\u2562": { type: 2, data: (i5, e) => `M0,.5 L${0.5 - i5},.5 M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2563": { type: 2, data: (i5, e) => `M${0.5 + i5},0 L${0.5 + i5},1 M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0`, strokeWidth: 1 }, "\\u2564": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e} M.5,${0.5 + e} L.5,1`, strokeWidth: 1 }, "\\u2565": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},.5 L${0.5 - i5},1 M${0.5 + i5},.5 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2566": { type: 2, data: (i5, e) => `M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1`, strokeWidth: 1 }, "\\u2567": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e} M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u2568": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},.5 L${0.5 - i5},0 M${0.5 + i5},.5 L${0.5 + i5},0`, strokeWidth: 1 }, "\\u2569": { type: 2, data: (i5, e) => `M0,${0.5 + e} L1,${0.5 + e} M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u256A": { type: 2, data: (i5, e) => `M.5,0 L.5,1 M0,${0.5 - e} L1,${0.5 - e} M0,${0.5 + e} L1,${0.5 + e}`, strokeWidth: 1 }, "\\u256B": { type: 2, data: (i5, e) => `M0,.5 L1,.5 M${0.5 - i5},0 L${0.5 - i5},1 M${0.5 + i5},0 L${0.5 + i5},1`, strokeWidth: 1 }, "\\u256C": { type: 2, data: (i5, e) => `M0,${0.5 + e} L${0.5 - i5},${0.5 + e} L${0.5 - i5},1 M1,${0.5 + e} L${0.5 + i5},${0.5 + e} L${0.5 + i5},1 M0,${0.5 - e} L${0.5 - i5},${0.5 - e} L${0.5 - i5},0 M1,${0.5 - e} L${0.5 + i5},${0.5 - e} L${0.5 + i5},0`, strokeWidth: 1 }, "\\u256D": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 + e / 0.15 * 0.5} C.5,${0.5 + e / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }, "\\u256E": { type: 2, data: (i5, e) => `M.5,1 L.5,${0.5 + e / 0.15 * 0.5} C.5,${0.5 + e / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }, "\\u256F": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e / 0.15 * 0.5} C.5,${0.5 - e / 0.15 * 0.5},.5,.5,0,.5`, strokeWidth: 1 }, "\\u2570": { type: 2, data: (i5, e) => `M.5,0 L.5,${0.5 - e / 0.15 * 0.5} C.5,${0.5 - e / 0.15 * 0.5},.5,.5,1,.5`, strokeWidth: 1 }, "\\u2571": { type: 2, data: "M1,0 L0,1", strokeWidth: 1 }, "\\u2572": { type: 2, data: "M0,0 L1,1", strokeWidth: 1 }, "\\u2573": { type: 2, data: "M1,0 L0,1 M0,0 L1,1", strokeWidth: 1 }, "\\u2574": { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, "\\u2575": { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, "\\u2576": { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, "\\u2577": { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, "\\u2578": { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }, "\\u2579": { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }, "\\u257A": { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }, "\\u257B": { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }, "\\u257C": [{ type: 2, data: "M.5,.5 L0,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L1,.5", strokeWidth: 3 }], "\\u257D": [{ type: 2, data: "M.5,.5 L.5,0", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,1", strokeWidth: 3 }], "\\u257E": [{ type: 2, data: "M.5,.5 L1,.5", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L0,.5", strokeWidth: 3 }], "\\u257F": [{ type: 2, data: "M.5,.5 L.5,1", strokeWidth: 1 }, { type: 2, data: "M.5,.5 L.5,0", strokeWidth: 3 }], "\\u2580": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }] }, "\\u2581": { type: 0, data: [{ x: 0, y: 7, w: 8, h: 1 }] }, "\\u2582": { type: 0, data: [{ x: 0, y: 6, w: 8, h: 2 }] }, "\\u2583": { type: 0, data: [{ x: 0, y: 5, w: 8, h: 3 }] }, "\\u2584": { type: 0, data: [{ x: 0, y: 4, w: 8, h: 4 }] }, "\\u2585": { type: 0, data: [{ x: 0, y: 3, w: 8, h: 5 }] }, "\\u2586": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 6 }] }, "\\u2587": { type: 0, data: [{ x: 0, y: 1, w: 8, h: 7 }] }, "\\u2588": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 8 }] }, "\\u2589": { type: 0, data: [{ x: 0, y: 0, w: 7, h: 8 }] }, "\\u258A": { type: 0, data: [{ x: 0, y: 0, w: 6, h: 8 }] }, "\\u258B": { type: 0, data: [{ x: 0, y: 0, w: 5, h: 8 }] }, "\\u258C": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }] }, "\\u258D": { type: 0, data: [{ x: 0, y: 0, w: 3, h: 8 }] }, "\\u258E": { type: 0, data: [{ x: 0, y: 0, w: 2, h: 8 }] }, "\\u258F": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }] }, "\\u2590": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }] }, "\\u2591": { type: 1, data: [[1, 0], [0, 0]] }, "\\u2592": { type: 1, data: [[1, 0], [0, 1]] }, "\\u2593": { type: 1, data: [[1, 1], [1, 0]] }, "\\u2594": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }] }, "\\u2595": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }] }, "\\u2596": { type: 0, data: [{ x: 0, y: 4, w: 4, h: 4 }] }, "\\u2597": { type: 0, data: [{ x: 4, y: 4, w: 4, h: 4 }] }, "\\u2598": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 4 }] }, "\\u2599": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }, { x: 0, y: 4, w: 8, h: 4 }] }, "\\u259A": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 4 }, { x: 4, y: 4, w: 4, h: 4 }] }, "\\u259B": { type: 0, data: [{ x: 0, y: 0, w: 4, h: 8 }, { x: 4, y: 0, w: 4, h: 4 }] }, "\\u259C": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }, { x: 4, y: 0, w: 4, h: 8 }] }, "\\u259D": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 4 }] }, "\\u259E": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 4 }, { x: 0, y: 4, w: 4, h: 4 }] }, "\\u259F": { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }, { x: 0, y: 4, w: 8, h: 4 }] }, "\\uE0A0": { type: 5, data: { d: "M.3,1 L.03,1 L.03,.88 C.03,.82,.06,.78,.11,.73 C.15,.7,.2,.68,.28,.65 L.43,.6 C.49,.58,.53,.56,.56,.53 C.59,.5,.6,.47,.6,.43 L.6,.27 L.4,.27 L.69,.1 L.98,.27 L.78,.27 L.78,.46 C.78,.52,.76,.56,.72,.61 C.68,.66,.63,.67,.56,.7 L.48,.72 C.42,.74,.38,.76,.35,.78 C.32,.8,.31,.84,.31,.88 L.31,1 M.3,.5 L.03,.59 L.03,.09 L.3,.09 L.3,.655", type: 0 } }, "\\uE0A1": { type: 5, data: { d: "M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.355,.03 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5", type: 0 } }, "\\uE0A2": { type: 5, data: { d: "M.25,.94 C.16,.94,.11,.92,.11,.87 L.11,.53 C.11,.48,.15,.455,.23,.45 L.23,.3 C.23,.25,.26,.22,.31,.19 C.36,.16,.43,.15,.51,.15 C.59,.15,.66,.16,.71,.19 C.77,.22,.79,.26,.79,.3 L.79,.45 C.87,.45,.91,.48,.91,.53 L.91,.87 C.91,.92,.86,.94,.77,.94 L.24,.94 M.53,.2 C.49,.2,.45,.21,.42,.23 C.39,.25,.38,.27,.38,.3 L.38,.45 L.68,.45 L.68,.3 C.68,.27,.67,.25,.64,.23 C.61,.21,.58,.2,.53,.2 M.58,.82 L.58,.66 C.63,.65,.65,.63,.65,.6 C.65,.58,.64,.57,.61,.56 C.58,.55,.56,.54,.52,.54 C.48,.54,.46,.55,.43,.56 C.4,.57,.39,.59,.39,.6 C.39,.63,.41,.64,.46,.66 L.46,.82 L.57,.82", type: 0 } }, "\\uE0A3": { type: 5, data: { d: "M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.7,.03 L.7,.1 L.355,.1 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5", type: 0 } }, "\\uE0B0": { type: 5, data: { d: "M0,0 L1,.5 L0,1", type: 0, rightPadding: 2 } }, "\\uE0B1": { type: 5, data: { d: "M-1,-.5 L1,.5 L-1,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0B2": { type: 5, data: { d: "M1,0 L0,.5 L1,1", type: 0, leftPadding: 2 } }, "\\uE0B3": { type: 5, data: { d: "M2,-.5 L0,.5 L2,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0B4": { type: 5, data: { d: "M0,0 L0,1 C0.552,1,1,0.776,1,.5 C1,0.224,0.552,0,0,0", type: 0, rightPadding: 1 } }, "\\uE0B5": { type: 5, data: { d: "M.2,1 C.422,1,.8,.826,.78,.5 C.8,.174,0.422,0,.2,0", type: 1, rightPadding: 1 } }, "\\uE0B6": { type: 5, data: { d: "M1,0 L1,1 C0.448,1,0,0.776,0,.5 C0,0.224,0.448,0,1,0", type: 0, leftPadding: 1 } }, "\\uE0B7": { type: 5, data: { d: "M.8,1 C0.578,1,0.2,.826,.22,.5 C0.2,0.174,0.578,0,0.8,0", type: 1, leftPadding: 1 } }, "\\uE0B8": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5 L-.5,1.5", type: 0 } }, "\\uE0B9": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BA": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5 L1.5,1.5", type: 0 } }, "\\uE0BB": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BC": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5 L-.5,-.5", type: 0 } }, "\\uE0BD": { type: 5, data: { d: "M1.5,-.5 L-.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0BE": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5 L1.5,-.5", type: 0 } }, "\\uE0BF": { type: 5, data: { d: "M-.5,-.5 L1.5,1.5", type: 1, leftPadding: 1, rightPadding: 1 } }, "\\uE0C0": { type: 5, data: { d: "M0.8069,0.6075 Q0.7991,0.612,0.7815,0.6218 T0.7542,0.6369 T0.7282,0.6508 T0.7016,0.6644 T0.6778,0.6758 T0.6551,0.6854 T0.637,0.6911 T0.622,0.6936 Q0.6186,0.6936,0.6128,0.6942 T0.6018,0.6952 T0.5894,0.6956 T0.5757,0.6952 T0.561,0.693 T0.5451,0.6879 Q0.5342,0.6834,0.5193,0.6756 T0.4925,0.6614 T0.4673,0.6485 T0.4436,0.6389 T0.4239,0.6363 T0.4089,0.6422 Q0.4045,0.6467,0.3958,0.6554 T0.3843,0.6669 T0.3748,0.6746 T0.3613,0.683 T0.3442,0.6903 L0.3499,0.6956 Q0.3584,0.7042,0.3679,0.7177 T0.3836,0.7403 T0.4019,0.7583 T0.4295,0.7703 Q0.4688,0.7785,0.5203,0.7605 Q0.4902,0.7817,0.449,0.7911 T0.3696,0.8001 Q0.3567,0.7997,0.341,0.7942 T0.3111,0.7813 T0.2805,0.766 T0.2493,0.753 T0.218,0.7472 T0.187,0.754 Q0.1762,0.7589,0.1653,0.7681 T0.1453,0.7895 T0.1308,0.818 T0.1264,0.8507 L0.1264,0.858 Q0.1453,0.8462,0.1607,0.8433 T0.1899,0.8452 T0.2226,0.8625 Q0.2344,0.8707,0.2485,0.8752 T0.2813,0.8831 T0.3089,0.889 Q0.2981,0.8915,0.2846,0.8956 T0.2603,0.9037 T0.2368,0.9115 T0.2129,0.9174 T0.1894,0.9194 T0.1653,0.9155 Q0.1504,0.9115,0.1328,0.9196 T0.0986,0.9421 T0.0655,0.9708 T0.0317,0.9943 T0,1 Q0.001,0.94,0.0017,0.6508 T0.0024,0.2322 Q0.002,0.2109,0.0007,0.1379 T0,0.0249 Q0.0058,0.0253,0.009,0.0257 T0.0156,0.0288 T0.0203,0.0333 T0.0264,0.0422 T0.0349,0.0539 Q0.044,0.0657,0.0542,0.072 T0.0752,0.0789 T0.096,0.0775 T0.1175,0.0694 T0.1379,0.0573 T0.1579,0.0432 Q0.2141,0,0.2673,0.0318 Q0.2588,0.0318,0.2517,0.033 T0.239,0.0361 T0.2276,0.0424 T0.218,0.0504 T0.2085,0.0612 T0.1997,0.0732 T0.1899,0.0875 T0.1795,0.1028 Q0.1748,0.1093,0.1507,0.1234 T0.1186,0.1448 Q0.0999,0.1612,0.1108,0.1783 Q0.1162,0.1877,0.1238,0.1928 T0.1404,0.1979 T0.158,0.1967 T0.1775,0.1895 T0.1963,0.1791 T0.2151,0.1663 T0.2314,0.1534 T0.2458,0.141 T0.2561,0.1322 Q0.2815,0.1106,0.3017,0.101 T0.344,0.0926 T0.3919,0.1077 Q0.4099,0.1175,0.4265,0.1206 T0.4588,0.1202 T0.488,0.1098 T0.5176,0.0914 Q0.5071,0.1032,0.4963,0.1122 T0.4722,0.1285 T0.4497,0.1401 T0.4223,0.1518 T0.3943,0.1636 Q0.374,0.1726,0.3623,0.1863 T0.3482,0.2162 Q0.3445,0.2403,0.3608,0.2605 T0.4072,0.2876 Q0.4194,0.2909,0.4326,0.2899 T0.457,0.2856 T0.4805,0.2764 T0.5032,0.264 T0.5256,0.2497 T0.5478,0.2352 T0.5698,0.2222 T0.5921,0.2118 Q0.6982,0.173,0.81,0.2436 Q0.833,0.2583,0.8496,0.2674 T0.887,0.2846 T0.925,0.294 T0.9617,0.2911 T1,0.2746 Q0.9817,0.2946,0.96,0.3056 T0.9175,0.3191 T0.8731,0.3209 T0.8277,0.3164 T0.7818,0.3109 T0.7359,0.3101 T0.6907,0.3197 T0.647,0.3448 Q0.6443,0.3472,0.6333,0.3562 T0.6194,0.3674 T0.6076,0.3766 T0.594,0.386 T0.5815,0.3931 T0.5661,0.4007 T0.5501,0.4064 L0.5556,0.4121 Q0.5627,0.4198,0.5722,0.4251 T0.5926,0.4337 T0.6131,0.439 T0.6343,0.4431 T0.6521,0.4468 Q0.6762,0.4529,0.7056,0.4463 Q0.6772,0.4623,0.6543,0.471 T0.604,0.4814 Q0.5962,0.4818,0.5815,0.4825 T0.5591,0.4835 T0.5393,0.4857 T0.519,0.4908 T0.5007,0.4996 T0.4812,0.5141 T0.4627,0.5353 L0.4549,0.5451 L0.4661,0.543 Q0.4759,0.541,0.4909,0.55 T0.5315,0.5796 T0.5684,0.6083 Q0.5799,0.6161,0.5915,0.6212 T0.6181,0.6308 L0.6331,0.6353 Q0.6514,0.6418,0.7004,0.633 T0.8069,0.6075 Z", type: 0 } }, "\\uE0C1": { type: 5, data: { d: "M0.011,0.0469 Q0.0152,0.0412,0.02,0.0361 T0.0292,0.0281 T0.0365,0.0253 Q0.0426,0.0257,0.0461,0.0263 T0.0534,0.03 T0.0582,0.0345 T0.0645,0.0434 T0.0723,0.0546 Q0.0807,0.0653,0.0897,0.0712 T0.1081,0.0775 T0.1255,0.0765 T0.1438,0.0695 T0.1605,0.0593 T0.1772,0.0473 Q0.2388,0,0.2927,0.0326 L0.2614,0.0767 L0.2581,0.0767 Q0.2494,0.0767,0.2444,0.0773 T0.2359,0.0789 T0.2291,0.0842 T0.2233,0.0922 T0.2146,0.1054 T0.2026,0.1236 Q0.1943,0.1354,0.1843,0.1444 T0.1675,0.1574 T0.1526,0.1654 T0.1429,0.1701 Q0.1436,0.1717,0.1446,0.1733 Q0.1504,0.1823,0.1581,0.1866 T0.1733,0.1915 T0.1909,0.1884 T0.2085,0.1809 T0.2265,0.169 T0.2427,0.1564 T0.2575,0.1436 T0.2688,0.1338 Q0.2969,0.1101,0.3195,0.0995 T0.3643,0.0901 T0.4114,0.1048 Q0.4279,0.1138,0.4426,0.1168 T0.4705,0.117 T0.4945,0.1089 T0.5186,0.0942 L0.5211,0.0926 L0.5289,0.0922 Q0.5411,0.095,0.5189,0.1203 Q0.505,0.1358,0.4913,0.1474 T0.4634,0.167 T0.4389,0.1796 T0.4121,0.1909 T0.3866,0.2011 Q0.3782,0.2047,0.3727,0.2092 Q0.3717,0.2117,0.3714,0.2141 Q0.3695,0.2263,0.3751,0.2388 T0.394,0.2616 T0.4253,0.2761 Q0.4398,0.2785,0.4513,0.2779 T0.4756,0.2724 T0.4987,0.2616 T0.5216,0.2476 T0.5453,0.2321 T0.5703,0.217 T0.5976,0.2043 Q0.7015,0.166,0.8099,0.2345 Q0.8361,0.2512,0.8572,0.2616 T0.9006,0.2779 T0.9432,0.281 T0.9819,0.2663 L0.9887,0.2671 Q1,0.272,0.9768,0.2969 Q0.9558,0.3193,0.9319,0.333 T0.8858,0.3513 T0.8391,0.3569 T0.793,0.3546 T0.7485,0.3497 T0.7065,0.3473 T0.6681,0.3522 T0.6344,0.3699 Q0.5963,0.4005,0.5847,0.4082 Q0.595,0.4139,0.6079,0.4174 T0.6367,0.4237 T0.6586,0.4278 Q0.6793,0.4331,0.7044,0.4278 Q0.7057,0.4278,0.707,0.4274 Q0.7067,0.429,0.7062,0.4313 T0.7036,0.4398 T0.6993,0.4513 T0.6931,0.4619 T0.6851,0.4698 Q0.6573,0.4857,0.6336,0.4947 T0.5831,0.5053 Q0.577,0.5057,0.5615,0.5065 T0.5394,0.508 T0.5221,0.51 T0.5042,0.5139 T0.4905,0.5204 Q0.5008,0.5232,0.515,0.5328 T0.549,0.5585 T0.5799,0.5824 Q0.5905,0.5897,0.6013,0.5946 T0.6262,0.6036 T0.6409,0.6081 Q0.6567,0.6134,0.7035,0.605 T0.8028,0.5816 L0.7974,0.5922 T0.7867,0.6134 L0.7812,0.624 Q0.7799,0.6248,0.7786,0.6252 Q0.7709,0.6297,0.7573,0.6372 T0.7346,0.6499 T0.7123,0.6621 T0.6897,0.6741 T0.6686,0.6847 T0.648,0.6941 T0.6297,0.7013 T0.6129,0.7062 T0.5995,0.7076 Q0.5992,0.7076,0.5831,0.7092 T0.5529,0.7092 T0.525,0.7019 Q0.5105,0.6958,0.4824,0.6811 T0.4356,0.6586 T0.4079,0.6533 Q0.3872,0.6741,0.3827,0.6782 Q0.3872,0.6835,0.3934,0.6929 T0.4037,0.7078 T0.4142,0.7198 T0.4284,0.7304 T0.4466,0.7365 Q0.4824,0.7443,0.5292,0.728 L0.5292,0.7294 T0.529,0.7333 T0.5284,0.7392 T0.5266,0.7463 T0.5236,0.7539 T0.5186,0.7612 T0.5111,0.7679 Q0.5086,0.77,0.5056,0.7716 Q0.4466,0.8104,0.3591,0.8091 Q0.344,0.8091,0.3246,0.802 T0.2893,0.7863 T0.2543,0.77 T0.2206,0.76 T0.1894,0.7643 Q0.1804,0.7684,0.1733,0.7753 Q0.1591,0.7892,0.1601,0.8169 Q0.1784,0.8067,0.1938,0.8053 T0.2212,0.8087 T0.2507,0.825 Q0.2614,0.8324,0.2744,0.8365 T0.3053,0.844 T0.332,0.8499 L0.303,0.894 L0.2998,0.8948 Q0.2904,0.8968,0.278,0.9009 T0.2554,0.9086 T0.233,0.9158 T0.2099,0.9213 T0.1868,0.9229 T0.1633,0.9192 Q0.1517,0.916,0.1367,0.9241 T0.1065,0.9462 T0.0753,0.9737 T0.041,0.9955 T0.0061,1 Q0,0.9984,0.0068,0.9845 Q0.009,0.9804,0.0123,0.9755 Q0.0187,0.9666,0.0261,0.9606 T0.0374,0.9555 Q0.0481,0.958,0.0629,0.949 T0.0931,0.9262 T0.1247,0.8987 T0.1597,0.8777 T0.1949,0.8752 Q0.213,0.8805,0.2343,0.8772 Q0.2249,0.8736,0.2172,0.8683 Q0.1914,0.8511,0.1738,0.8497 T0.1349,0.8617 Q0.1304,0.865,0.1273,0.8646 T0.1242,0.8605 L0.1239,0.8536 Q0.1226,0.8295,0.1354,0.8016 T0.1723,0.7496 Q0.1914,0.7308,0.2104,0.7219 Q0.2259,0.7145,0.2425,0.7141 T0.273,0.7182 T0.3022,0.7296 T0.3301,0.7439 T0.3569,0.7571 T0.3821,0.7643 Q0.373,0.7561,0.3598,0.7367 T0.3382,0.7088 L0.3327,0.7035 Q0.3282,0.699,0.3353,0.6884 T0.3517,0.6692 L0.3611,0.6607 Q0.3711,0.657,0.3751,0.6554 T0.3837,0.6507 T0.3898,0.6458 T0.3979,0.637 T0.4111,0.6236 Q0.4172,0.6175,0.4234,0.6138 Q0.4327,0.6081,0.4439,0.6077 T0.4655,0.6105 T0.4884,0.6201 T0.5113,0.633 T0.5347,0.6468 T0.5573,0.6578 Q0.5705,0.6635,0.5833,0.665 T0.6112,0.665 T0.6286,0.6635 Q0.6421,0.6631,0.6718,0.6501 Q0.626,0.6578,0.6089,0.6517 Q0.6063,0.6509,0.6002,0.6491 T0.5884,0.6454 T0.5757,0.6409 T0.561,0.6344 T0.5466,0.6256 Q0.536,0.6183,0.5108,0.5989 T0.4722,0.5712 T0.4527,0.564 L0.4418,0.5661 Q0.4308,0.5681,0.4366,0.5563 Q0.4401,0.5485,0.4476,0.5392 L0.455,0.5298 Q0.4631,0.5188,0.4714,0.51 T0.4866,0.4947 T0.5021,0.4831 T0.516,0.4749 T0.53,0.4694 T0.5428,0.4657 T0.5558,0.4637 T0.5674,0.4629 T0.5795,0.4625 Q0.5489,0.4543,0.534,0.4384 L0.5286,0.4327 Q0.5244,0.4282,0.5318,0.4174 T0.5486,0.398 L0.5579,0.3899 Q0.567,0.387,0.5749,0.3834 T0.5878,0.3772 T0.6012,0.3687 T0.6126,0.3603 T0.6268,0.3487 T0.6421,0.3361 Q0.6567,0.3242,0.6712,0.3159 T0.7009,0.3034 T0.7277,0.2973 T0.7556,0.2961 T0.7809,0.2977 T0.8074,0.301 Q0.8096,0.3014,0.8109,0.3016 T0.8143,0.302 T0.818,0.3026 Q0.8012,0.2936,0.7767,0.2781 Q0.6718,0.2117,0.5744,0.2476 Q0.5637,0.2516,0.5492,0.2604 T0.5218,0.2779 T0.4923,0.2965 T0.461,0.3124 T0.4282,0.3216 T0.394,0.3206 Q0.3637,0.3136,0.3474,0.2936 T0.3353,0.2459 Q0.3385,0.2247,0.355,0.2023 Q0.3646,0.1892,0.3763,0.179 Q0.3898,0.1672,0.4063,0.1595 Q0.3927,0.1562,0.3785,0.1485 Q0.3604,0.1387,0.3453,0.1354 T0.3161,0.1354 T0.2899,0.1458 T0.2627,0.166 Q0.262,0.1664,0.254,0.1733 T0.2414,0.1841 T0.2267,0.196 T0.2094,0.2086 T0.1915,0.2196 T0.1725,0.2288 T0.1546,0.2337 T0.1373,0.2343 T0.1223,0.228 T0.1097,0.2145 Q0.0962,0.1929,0.1258,0.1582 Q0.131,0.1517,0.1371,0.1464 Q0.1462,0.1387,0.156,0.1321 T0.1752,0.1205 T0.1878,0.1134 Q0.1891,0.1117,0.1947,0.103 T0.2035,0.0899 T0.2125,0.0781 T0.2243,0.064 Q0.1949,0.0616,0.1672,0.0828 Q0.153,0.0934,0.1412,0.1009 T0.1146,0.1146 T0.0873,0.1213 T0.0616,0.116 T0.0374,0.0962 Q0.0339,0.0909,0.0295,0.0846 T0.024,0.0767 T0.0202,0.0728 T0.0148,0.0704 T0.0068,0.0697 Q0.0003,0.0693,0.0058,0.0567 Q0.0077,0.0522,0.011,0.0469 Z", type: 0 } }, "\\uE0C2": { type: 5, data: { d: "M0.1934,0.6075 Q0.2012,0.612,0.2188,0.6218 T0.2459,0.6369 T0.2718,0.6508 T0.2983,0.6644 T0.322,0.6758 T0.3447,0.6854 T0.363,0.6911 T0.3783,0.6936 Q0.3796,0.6936,0.396,0.6952 T0.4265,0.6952 T0.4548,0.6879 Q0.4656,0.6834,0.4805,0.6756 T0.5073,0.6614 T0.5327,0.6485 T0.5564,0.6389 T0.5759,0.6363 T0.5909,0.6422 Q0.5953,0.6467,0.604,0.6554 T0.6155,0.6669 T0.6251,0.6746 T0.6387,0.683 T0.6556,0.6903 L0.6498,0.6956 Q0.6414,0.7042,0.6319,0.7177 T0.6162,0.7403 T0.5979,0.7583 T0.5703,0.7703 Q0.5313,0.7785,0.4799,0.7605 Q0.5097,0.7817,0.5508,0.7911 T0.6302,0.8001 Q0.6431,0.7997,0.659,0.7942 T0.6888,0.7813 T0.7194,0.766 T0.7506,0.753 T0.7819,0.7472 T0.8131,0.754 Q0.8239,0.7589,0.8346,0.7681 T0.8544,0.7895 T0.8689,0.818 T0.8737,0.8507 L0.8733,0.858 Q0.8591,0.849,0.8474,0.845 T0.8242,0.8421 T0.8021,0.8482 T0.7772,0.8625 Q0.7653,0.8707,0.7513,0.8752 T0.7184,0.8831 T0.6908,0.889 Q0.7017,0.8915,0.7152,0.8956 T0.7396,0.9037 T0.7633,0.9115 T0.7872,0.9174 T0.8107,0.9194 T0.8347,0.9155 Q0.8493,0.9115,0.8671,0.9196 T0.9015,0.9421 T0.9345,0.9708 T0.9682,0.9943 T0.9997,1 Q0.999,0.94,0.9983,0.6508 T0.9976,0.2322 Q0.9976,0.2109,0.9992,0.1379 T1,0.0249 Q0.9949,0.0249,0.9917,0.0257 T0.9863,0.0273 T0.9817,0.0308 T0.9776,0.0357 T0.9721,0.0437 T0.9651,0.0539 Q0.956,0.0657,0.9456,0.072 T0.9247,0.0789 T0.904,0.0775 T0.8823,0.0694 T0.862,0.0573 T0.8422,0.0432 Q0.7856,0,0.7328,0.0318 Q0.7392,0.0318,0.7452,0.0324 T0.756,0.0345 T0.7657,0.0386 T0.7741,0.0437 T0.7821,0.0506 T0.7894,0.0588 T0.7966,0.0683 T0.8039,0.0787 T0.8119,0.0904 T0.8202,0.1028 Q0.8249,0.1093,0.849,0.1234 T0.8811,0.1448 Q0.8998,0.1612,0.8893,0.1783 Q0.8835,0.1877,0.8759,0.1928 T0.8593,0.1979 T0.8417,0.1967 T0.8222,0.1895 T0.8034,0.1791 T0.7848,0.1663 T0.7687,0.1534 T0.7543,0.141 T0.744,0.1322 Q0.7186,0.1106,0.6984,0.101 T0.6559,0.0926 T0.6082,0.1077 Q0.5899,0.1175,0.5733,0.1206 T0.5411,0.1202 T0.5122,0.1098 T0.4822,0.0914 Q0.4927,0.1032,0.5036,0.1122 T0.5276,0.1285 T0.5503,0.1401 T0.5777,0.1518 T0.6055,0.1636 Q0.6258,0.1726,0.6375,0.1863 T0.6519,0.2162 Q0.6556,0.2403,0.6392,0.2605 T0.5926,0.2876 Q0.5804,0.2909,0.5672,0.2899 T0.5428,0.2856 T0.5193,0.2764 T0.4966,0.264 T0.4744,0.2497 T0.4523,0.2352 T0.4301,0.2222 T0.4077,0.2118 Q0.3021,0.173,0.1903,0.2436 Q0.1669,0.2583,0.1504,0.2674 T0.1129,0.2846 T0.075,0.294 T0.0384,0.2911 T0,0.2746 Q0.021,0.297,0.0459,0.3082 T0.0953,0.3207 T0.146,0.3193 T0.1988,0.3131 T0.2508,0.3095 T0.3029,0.3176 T0.3529,0.3448 Q0.3566,0.348,0.3652,0.355 T0.3771,0.3645 T0.3877,0.3731 T0.3993,0.3815 T0.4103,0.3884 T0.4226,0.3953 T0.4352,0.4009 T0.4497,0.4064 L0.4443,0.4121 Q0.4372,0.4198,0.4277,0.4251 T0.4072,0.4337 T0.3867,0.439 T0.3656,0.4431 T0.3481,0.4468 Q0.3241,0.4529,0.2943,0.4463 Q0.3227,0.4623,0.3458,0.471 T0.3959,0.4814 Q0.404,0.4818,0.4187,0.4825 T0.4409,0.4835 T0.4605,0.4857 T0.4809,0.4908 T0.4992,0.4996 T0.5186,0.5141 T0.5371,0.5353 L0.5449,0.5451 L0.5337,0.543 Q0.5242,0.541,0.5091,0.55 T0.4683,0.5796 T0.4314,0.6083 Q0.4203,0.6161,0.4086,0.6212 T0.382,0.6308 T0.3667,0.6353 Q0.3485,0.6418,0.2995,0.633 T0.1934,0.6075 Z", type: 0 } }, "\\uE0C3": { type: 5, data: { d: "M0.989,0.0469 Q0.9829,0.0379,0.9753,0.0316 T0.9635,0.0253 Q0.9574,0.0257,0.9539,0.0263 T0.9466,0.03 T0.9418,0.0345 T0.9355,0.0434 T0.9277,0.0546 Q0.9193,0.0653,0.9103,0.0712 T0.8919,0.0775 T0.8745,0.0765 T0.8564,0.0695 T0.8396,0.0593 T0.8228,0.0473 Q0.7612,0,0.7073,0.0326 L0.7386,0.0767 L0.7419,0.0767 Q0.7506,0.0767,0.7556,0.0773 T0.7641,0.0789 T0.7709,0.0842 T0.7767,0.0922 T0.7854,0.1054 T0.7974,0.1236 Q0.8057,0.1354,0.8157,0.1444 T0.8325,0.1574 T0.8474,0.1654 T0.8571,0.1701 Q0.8564,0.1717,0.8554,0.1733 Q0.8503,0.1815,0.844,0.186 T0.8301,0.1909 T0.8153,0.1903 T0.7993,0.1845 T0.7836,0.1758 T0.768,0.1648 T0.754,0.1535 T0.741,0.1425 T0.7312,0.1338 Q0.7031,0.1101,0.6805,0.0995 T0.6357,0.0901 T0.5886,0.1048 Q0.5721,0.1138,0.5574,0.1168 T0.5295,0.117 T0.5055,0.1089 T0.4814,0.0942 L0.4789,0.0926 L0.4711,0.0922 Q0.4589,0.095,0.4811,0.1203 Q0.495,0.1358,0.5087,0.1474 T0.5366,0.167 T0.5611,0.1796 T0.5879,0.1909 T0.6134,0.2011 Q0.6218,0.2047,0.6273,0.2092 Q0.6283,0.2117,0.6286,0.2141 Q0.6305,0.2263,0.6249,0.2388 T0.606,0.2616 T0.5747,0.2761 Q0.5602,0.2785,0.5487,0.2779 T0.5245,0.2724 T0.5015,0.2616 T0.4784,0.2476 T0.4547,0.2321 T0.4297,0.217 T0.4024,0.2043 Q0.2985,0.166,0.1901,0.2345 Q0.1694,0.248,0.1523,0.2569 T0.1165,0.2726 T0.0818,0.2812 T0.0494,0.2796 T0.0181,0.2663 L0.0116,0.2671 Q0,0.272,0.0232,0.2969 Q0.0468,0.3222,0.0742,0.3365 T0.1278,0.3542 T0.1807,0.3564 T0.233,0.352 T0.2815,0.3473 T0.3269,0.3509 T0.3656,0.3699 Q0.4037,0.4005,0.4153,0.4082 Q0.405,0.4139,0.3921,0.4174 T0.3633,0.4237 T0.3414,0.4278 Q0.3207,0.4331,0.2956,0.4278 Q0.2943,0.4278,0.293,0.4274 Q0.2933,0.429,0.2938,0.4313 T0.2964,0.4398 T0.3007,0.4513 T0.3069,0.4619 T0.3149,0.4698 Q0.3427,0.4857,0.3664,0.4947 T0.4169,0.5053 Q0.423,0.5057,0.4385,0.5065 T0.4606,0.508 T0.4779,0.51 T0.4958,0.5139 T0.5095,0.5204 Q0.4992,0.5232,0.485,0.5328 T0.451,0.5585 T0.4201,0.5824 Q0.4095,0.5897,0.3987,0.5946 T0.3738,0.6036 T0.3591,0.6081 Q0.3433,0.6134,0.2965,0.605 T0.1972,0.5816 L0.2026,0.5922 T0.2133,0.6134 L0.2188,0.624 Q0.2201,0.6248,0.2214,0.6252 Q0.2291,0.6297,0.2486,0.6405 T0.2786,0.657 T0.3066,0.6721 T0.3353,0.6866 T0.3598,0.6972 T0.383,0.7051 T0.4005,0.7076 Q0.4008,0.7076,0.4169,0.7092 T0.4471,0.7092 T0.475,0.7019 Q0.4895,0.6958,0.5176,0.6811 T0.5644,0.6586 T0.5921,0.6533 Q0.6128,0.6741,0.6173,0.6782 Q0.6131,0.6835,0.6068,0.6929 T0.5963,0.7078 T0.5858,0.7198 T0.5716,0.7304 T0.5534,0.7365 Q0.5179,0.7443,0.4708,0.728 L0.4708,0.7294 T0.471,0.7333 T0.4716,0.7392 T0.4734,0.7463 T0.4764,0.7539 T0.4814,0.7612 T0.4889,0.7679 Q0.4914,0.77,0.4944,0.7716 Q0.5534,0.8104,0.6409,0.8091 Q0.6521,0.8091,0.6654,0.8053 T0.6907,0.7959 T0.7157,0.7838 T0.741,0.772 T0.7652,0.7631 T0.7888,0.7594 T0.8106,0.7643 Q0.8196,0.7684,0.8267,0.7753 Q0.8409,0.7892,0.8399,0.8169 Q0.8216,0.8067,0.8062,0.8053 T0.7788,0.8087 T0.7493,0.825 Q0.7386,0.8324,0.7256,0.8365 T0.6947,0.844 T0.668,0.8499 L0.697,0.894 L0.7002,0.8948 Q0.7099,0.8968,0.7222,0.9009 T0.7446,0.9086 T0.767,0.9158 T0.7901,0.9213 T0.8132,0.9229 T0.8367,0.9192 Q0.8483,0.916,0.8633,0.9241 T0.8937,0.9462 T0.9248,0.9737 T0.959,0.9955 T0.9939,1 Q1,0.9984,0.9932,0.9845 Q0.991,0.9804,0.9877,0.9755 Q0.9813,0.9666,0.9739,0.9606 T0.9626,0.9555 Q0.9519,0.958,0.9372,0.949 T0.9071,0.9262 T0.8753,0.8987 T0.8403,0.8777 T0.8051,0.8752 Q0.787,0.8805,0.7657,0.8772 Q0.7751,0.8736,0.7828,0.8683 Q0.8086,0.8511,0.8262,0.8497 T0.8651,0.8617 Q0.8696,0.865,0.8727,0.8646 T0.8758,0.8605 L0.8761,0.8536 Q0.8774,0.8295,0.8646,0.8016 T0.8277,0.7496 Q0.8086,0.7308,0.7896,0.7219 Q0.7741,0.7145,0.7575,0.7141 T0.727,0.7182 T0.6978,0.7296 T0.6699,0.7439 T0.6433,0.7571 T0.6179,0.7643 Q0.627,0.7561,0.6402,0.7367 T0.6618,0.7088 L0.6673,0.7035 Q0.6718,0.699,0.6647,0.6884 T0.6483,0.6692 L0.6389,0.6607 Q0.6289,0.657,0.6249,0.6554 T0.6163,0.6507 T0.6102,0.6458 T0.6021,0.637 T0.5889,0.6236 Q0.5828,0.6175,0.5766,0.6138 Q0.5673,0.6081,0.5561,0.6077 T0.5345,0.6105 T0.5116,0.6201 T0.4887,0.633 T0.4653,0.6468 T0.4427,0.6578 Q0.4295,0.6635,0.4167,0.665 T0.3888,0.665 T0.3714,0.6635 Q0.3579,0.6631,0.3282,0.6501 Q0.374,0.6578,0.3911,0.6517 Q0.3937,0.6509,0.4024,0.6482 T0.4179,0.6434 T0.4348,0.6364 T0.4534,0.6256 Q0.464,0.6183,0.4892,0.5989 T0.5278,0.5712 T0.5476,0.564 L0.5582,0.5661 Q0.5692,0.5681,0.5634,0.5563 Q0.5599,0.5485,0.5524,0.5392 L0.545,0.5298 Q0.5369,0.5188,0.5286,0.51 T0.5134,0.4947 T0.4979,0.4831 T0.484,0.4749 T0.47,0.4694 T0.4572,0.4657 T0.4442,0.4637 T0.4326,0.4629 T0.4205,0.4625 Q0.4511,0.4543,0.466,0.4384 L0.4714,0.4327 Q0.4795,0.4237,0.4469,0.394 L0.4421,0.3899 Q0.433,0.387,0.4251,0.3834 T0.4122,0.3772 T0.3988,0.3687 T0.3874,0.3603 T0.3732,0.3487 T0.3579,0.3361 Q0.3433,0.3242,0.3288,0.3159 T0.2993,0.3034 T0.2725,0.2973 T0.2446,0.2961 T0.2193,0.2977 T0.1926,0.301 Q0.1855,0.3022,0.182,0.3026 Q0.1991,0.2936,0.2233,0.2781 Q0.3282,0.2117,0.4256,0.2476 Q0.4363,0.2516,0.451,0.2604 T0.4784,0.2779 T0.5077,0.2965 T0.539,0.3124 T0.5718,0.3216 T0.606,0.3206 Q0.6363,0.3136,0.6526,0.2936 T0.6647,0.2459 Q0.6615,0.2247,0.645,0.2023 Q0.6354,0.1892,0.6237,0.179 Q0.6102,0.1672,0.5937,0.1595 Q0.6073,0.1562,0.6215,0.1485 Q0.6396,0.1387,0.6547,0.1354 T0.6839,0.1354 T0.7101,0.1458 T0.7373,0.166 Q0.738,0.1664,0.746,0.1733 T0.7586,0.1841 T0.7733,0.196 T0.7907,0.2086 T0.8086,0.2196 T0.8275,0.2288 T0.8454,0.2337 T0.8627,0.2343 T0.8777,0.228 T0.8903,0.2145 Q0.9038,0.1929,0.8742,0.1582 Q0.869,0.1517,0.8629,0.1464 Q0.8538,0.1387,0.844,0.1321 T0.8248,0.1205 T0.8122,0.1134 Q0.8109,0.1117,0.8053,0.103 T0.7965,0.0899 T0.7875,0.0781 T0.7757,0.064 Q0.8051,0.0616,0.8328,0.0828 Q0.847,0.0934,0.8588,0.1009 T0.8854,0.1146 T0.9127,0.1213 T0.9384,0.116 T0.9626,0.0962 Q0.9664,0.0909,0.9706,0.0846 T0.976,0.0767 T0.9798,0.0728 T0.9852,0.0704 T0.9932,0.0697 Q0.9997,0.0693,0.9942,0.0567 Q0.9923,0.0522,0.989,0.0469 Z", type: 0 } }, "\\uE0C4": { type: 5, data: { d: "M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0.9099,0.1158 L0.9099,0.1888 L0.9951,0.1888 L0.9951,0.1158 L0.9099,0.1158 Z M0.9075,0.1116 L0.9976,0.1116 Q1,0.1116,1,0.1137 L1,0.1909 Q1,0.193,0.9976,0.193 L0.9075,0.193 Q0.905,0.193,0.905,0.1909 L0.905,0.1137 Q0.905,0.1116,0.9075,0.1116 Z M0.7852,0.6086 L0.7852,0.682 L0.8704,0.682 L0.8704,0.6086 L0.7852,0.6086 Z M0.7828,0.6044 L0.8729,0.6044 Q0.8753,0.6044,0.8753,0.6065 L0.8753,0.6841 Q0.8753,0.6862,0.8729,0.6862 L0.7828,0.6862 Q0.7803,0.6862,0.7803,0.6841 L0.7803,0.6065 Q0.7803,0.6044,0.7828,0.6044 Z M0.66,0.1137 L0.7501,0.1137 L0.7501,0.1909 L0.66,0.1909 L0.66,0.1137 Z M0.6624,0.4102 L0.6624,0.4836 L0.7477,0.4836 L0.7477,0.4102 L0.6624,0.4102 Z M0.66,0.406 L0.7501,0.406 Q0.7526,0.406,0.7526,0.4081 L0.7526,0.4857 Q0.7526,0.4878,0.7501,0.4878 L0.66,0.4878 Q0.6576,0.4878,0.6576,0.4857 L0.6576,0.4081 Q0.6576,0.406,0.66,0.406 Z M0.6624,0.7131 L0.6624,0.7865 L0.7477,0.7865 L0.7477,0.7131 L0.6624,0.7131 Z M0.66,0.7089 L0.7501,0.7089 Q0.7526,0.7089,0.7526,0.711 L0.7526,0.7886 Q0.7526,0.7907,0.7501,0.7907 L0.66,0.7907 Q0.6576,0.7907,0.6576,0.7886 L0.6576,0.711 Q0.6576,0.7089,0.66,0.7089 Z M0.5407,0.2227 L0.5407,0.2836 L0.6113,0.2836 L0.6113,0.2227 L0.5407,0.2227 Z M0.5309,0.206 L0.621,0.206 Q0.623,0.206,0.6249,0.2068 T0.6281,0.2089 T0.6301,0.2116 T0.6308,0.2143 L0.6308,0.2919 Q0.6308,0.2957,0.6276,0.298 T0.621,0.3003 L0.5309,0.3003 Q0.5265,0.3003,0.5239,0.2976 T0.5212,0.2919 L0.5212,0.2143 Q0.5212,0.211,0.5244,0.2085 T0.5309,0.206 Z M0.5407,0.3184 L0.5407,0.3792 L0.6113,0.3792 L0.6113,0.3184 L0.5407,0.3184 Z M0.5309,0.3016 L0.621,0.3016 Q0.6254,0.3016,0.6281,0.3043 T0.6308,0.31 L0.6308,0.3876 Q0.6308,0.3914,0.6276,0.3937 T0.621,0.396 L0.5309,0.396 Q0.5265,0.396,0.5239,0.3932 T0.5212,0.3876 L0.5212,0.31 Q0.5212,0.3062,0.5244,0.3039 T0.5309,0.3016 Z M0.5309,0.4081 L0.621,0.4081 L0.621,0.4857 L0.5309,0.4857 L0.5309,0.4081 Z M0.5309,0.5059 L0.621,0.5059 L0.621,0.5835 L0.5309,0.5835 L0.5309,0.5059 Z M0.5407,0.6149 L0.5407,0.6758 L0.6113,0.6758 L0.6113,0.6149 L0.5407,0.6149 Z M0.5309,0.5982 L0.621,0.5982 Q0.6254,0.5982,0.6281,0.6009 T0.6308,0.6065 L0.6308,0.6841 Q0.6308,0.6879,0.6276,0.6902 T0.621,0.6925 L0.5309,0.6925 Q0.5265,0.6925,0.5239,0.6898 T0.5212,0.6841 L0.5212,0.6065 Q0.5212,0.6028,0.5244,0.6005 T0.5309,0.5982 Z M0.4062,0.1137 L0.4963,0.1137 L0.4963,0.1909 L0.4062,0.1909 L0.4062,0.1137 Z M0.4062,0.2143 L0.4963,0.2143 L0.4963,0.2919 L0.4062,0.2919 L0.4062,0.2143 Z M0.4184,0.4186 L0.4184,0.4753 L0.4842,0.4753 L0.4842,0.4186 L0.4184,0.4186 Z M0.4062,0.3977 L0.4963,0.3977 Q0.5017,0.3977,0.5051,0.401 T0.5085,0.4081 L0.5085,0.4857 Q0.5085,0.4904,0.5046,0.4933 T0.4963,0.4962 L0.4062,0.4962 Q0.4009,0.4962,0.3975,0.4929 T0.3941,0.4857 L0.3941,0.4081 Q0.3941,0.4035,0.398,0.4006 T0.4062,0.3977 Z M0.4062,0.5059 L0.4963,0.5059 L0.4963,0.5835 L0.4062,0.5835 L0.4062,0.5059 Z M0.4087,0.7131 L0.4087,0.7865 L0.4939,0.7865 L0.4939,0.7131 L0.4087,0.7131 Z M0.4062,0.7089 L0.4963,0.7089 Q0.4988,0.7089,0.4988,0.711 L0.4988,0.7886 Q0.4988,0.7907,0.4963,0.7907 L0.4062,0.7907 Q0.4038,0.7907,0.4038,0.7886 L0.4038,0.711 Q0.4038,0.7089,0.4062,0.7089 Z M0.2689,0.1137 L0.359,0.1137 L0.359,0.1909 L0.2689,0.1909 L0.2689,0.1137 Z M0.2689,0.2143 L0.359,0.2143 L0.359,0.2919 L0.2689,0.2919 L0.2689,0.2143 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.31 L0.359,0.31 L0.359,0.3876 L0.2689,0.3876 L0.2689,0.31 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.4081 L0.359,0.4081 L0.359,0.4857 L0.2689,0.4857 L0.2689,0.4081 Z M0.2689,0.5059 L0.359,0.5059 L0.359,0.5835 L0.2689,0.5835 L0.2689,0.5059 Z M0.2689,0.711 L0.359,0.711 L0.359,0.7886 L0.2689,0.7886 L0.2689,0.711 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.1374,0.1137 L0.2275,0.1137 L0.2275,0.1909 L0.1374,0.1909 L0.1374,0.1137 Z M0.1374,0.2143 L0.2275,0.2143 L0.2275,0.2919 L0.1374,0.2919 L0.1374,0.2143 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.31 L0.2275,0.31 L0.2275,0.3876 L0.1374,0.3876 L0.1374,0.31 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.4081 L0.2275,0.4081 L0.2275,0.4857 L0.1374,0.4857 L0.1374,0.4081 Z M0.1374,0.5059 L0.2275,0.5059 L0.2275,0.5835 L0.1374,0.5835 L0.1374,0.5059 Z M0.1374,0.6065 L0.2275,0.6065 L0.2275,0.6841 L0.1374,0.6841 L0.1374,0.6065 Z M0.1374,0.711 L0.2275,0.711 L0.2275,0.7886 L0.1374,0.7886 L0.1374,0.711 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0,0.1137 L0.0901,0.1137 L0.0901,0.1909 L0,0.1909 L0,0.1137 Z M0,0.2143 L0.0901,0.2143 L0.0901,0.2919 L0,0.2919 L0,0.2143 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.31 L0.0901,0.31 L0.0901,0.3876 L0,0.3876 L0,0.31 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.4081 L0.0901,0.4081 L0.0901,0.4857 L0,0.4857 L0,0.4081 Z M0,0.5059 L0.0901,0.5059 L0.0901,0.5835 L0,0.5835 L0,0.5059 Z M0,0.6065 L0.0901,0.6065 L0.0901,0.6841 L0,0.6841 L0,0.6065 Z M0,0.711 L0.0901,0.711 L0.0901,0.7886 L0,0.7886 L0,0.711 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z", type: 0 } }, "\\uE0C5": { type: 5, data: { d: "M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M0.0901,0.1158 L0.0901,0.1888 L0.0049,0.1888 L0.0049,0.1158 L0.0901,0.1158 Z M0.0925,0.1116 L0.0024,0.1116 Q0,0.1116,0,0.1137 L0,0.1909 Q0,0.193,0.0024,0.193 L0.0925,0.193 Q0.095,0.193,0.095,0.1909 L0.095,0.1137 Q0.095,0.1116,0.0925,0.1116 Z M0.2148,0.6086 L0.2148,0.682 L0.1296,0.682 L0.1296,0.6086 L0.2148,0.6086 Z M0.2172,0.6044 L0.1271,0.6044 Q0.1247,0.6044,0.1247,0.6065 L0.1247,0.6841 Q0.1247,0.6862,0.1271,0.6862 L0.2172,0.6862 Q0.2197,0.6862,0.2197,0.6841 L0.2197,0.6065 Q0.2197,0.6044,0.2172,0.6044 Z M0.34,0.1137 L0.2499,0.1137 L0.2499,0.1909 L0.34,0.1909 L0.34,0.1137 Z M0.3376,0.4102 L0.3376,0.4836 L0.2523,0.4836 L0.2523,0.4102 L0.3376,0.4102 Z M0.34,0.406 L0.2499,0.406 Q0.2474,0.406,0.2474,0.4081 L0.2474,0.4857 Q0.2474,0.4878,0.2499,0.4878 L0.34,0.4878 Q0.3424,0.4878,0.3424,0.4857 L0.3424,0.4081 Q0.3424,0.406,0.34,0.406 Z M0.3376,0.7131 L0.3376,0.7865 L0.2523,0.7865 L0.2523,0.7131 L0.3376,0.7131 Z M0.34,0.7089 L0.2499,0.7089 Q0.2474,0.7089,0.2474,0.711 L0.2474,0.7886 Q0.2474,0.7907,0.2499,0.7907 L0.34,0.7907 Q0.3424,0.7907,0.3424,0.7886 L0.3424,0.711 Q0.3424,0.7089,0.34,0.7089 Z M0.4593,0.2227 L0.4593,0.2836 L0.3887,0.2836 L0.3887,0.2227 L0.4593,0.2227 Z M0.4691,0.206 L0.379,0.206 Q0.3746,0.206,0.3719,0.2087 T0.3692,0.2143 L0.3692,0.2919 Q0.3692,0.2957,0.3724,0.298 T0.379,0.3003 L0.4691,0.3003 Q0.4735,0.3003,0.4761,0.2976 T0.4788,0.2919 L0.4788,0.2143 Q0.4788,0.211,0.4756,0.2085 T0.4691,0.206 Z M0.4593,0.3184 L0.4593,0.3792 L0.3887,0.3792 L0.3887,0.3184 L0.4593,0.3184 Z M0.4691,0.3016 L0.379,0.3016 Q0.3746,0.3016,0.3719,0.3043 T0.3692,0.31 L0.3692,0.3876 Q0.3692,0.3914,0.3724,0.3937 T0.379,0.396 L0.4691,0.396 Q0.4735,0.396,0.4761,0.3932 T0.4788,0.3876 L0.4788,0.31 Q0.4788,0.3062,0.4756,0.3039 T0.4691,0.3016 Z M0.4691,0.4081 L0.379,0.4081 L0.379,0.4857 L0.4691,0.4857 L0.4691,0.4081 Z M0.4691,0.5059 L0.379,0.5059 L0.379,0.5835 L0.4691,0.5835 L0.4691,0.5059 Z M0.4593,0.6149 L0.4593,0.6758 L0.3887,0.6758 L0.3887,0.6149 L0.4593,0.6149 Z M0.4691,0.5982 L0.379,0.5982 Q0.3746,0.5982,0.3719,0.6009 T0.3692,0.6065 L0.3692,0.6841 Q0.3692,0.6879,0.3724,0.6902 T0.379,0.6925 L0.4691,0.6925 Q0.4735,0.6925,0.4761,0.6898 T0.4788,0.6841 L0.4788,0.6065 Q0.4788,0.6028,0.4756,0.6005 T0.4691,0.5982 Z M0.5938,0.1137 L0.5037,0.1137 L0.5037,0.1909 L0.5938,0.1909 L0.5938,0.1137 Z M0.5938,0.2143 L0.5037,0.2143 L0.5037,0.2919 L0.5938,0.2919 L0.5938,0.2143 Z M0.5816,0.4186 L0.5816,0.4753 L0.5158,0.4753 L0.5158,0.4186 L0.5816,0.4186 Z M0.5938,0.3977 L0.5037,0.3977 Q0.4983,0.3977,0.4949,0.401 T0.4915,0.4081 L0.4915,0.4857 Q0.4915,0.4904,0.4954,0.4933 T0.5037,0.4962 L0.5938,0.4962 Q0.5991,0.4962,0.6025,0.4929 T0.6059,0.4857 L0.6059,0.4081 Q0.6059,0.4035,0.602,0.4006 T0.5938,0.3977 Z M0.5938,0.5059 L0.5037,0.5059 L0.5037,0.5835 L0.5938,0.5835 L0.5938,0.5059 Z M0.5913,0.7131 L0.5913,0.7865 L0.5061,0.7865 L0.5061,0.7131 L0.5913,0.7131 Z M0.5938,0.7089 L0.5037,0.7089 Q0.5012,0.7089,0.5012,0.711 L0.5012,0.7886 Q0.5012,0.7907,0.5037,0.7907 L0.5938,0.7907 Q0.5962,0.7907,0.5962,0.7886 L0.5962,0.711 Q0.5962,0.7089,0.5938,0.7089 Z M0.7311,0.1137 L0.641,0.1137 L0.641,0.1909 L0.7311,0.1909 L0.7311,0.1137 Z M0.7311,0.2143 L0.641,0.2143 L0.641,0.2919 L0.7311,0.2919 L0.7311,0.2143 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.31 L0.641,0.31 L0.641,0.3876 L0.7311,0.3876 L0.7311,0.31 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.4081 L0.641,0.4081 L0.641,0.4857 L0.7311,0.4857 L0.7311,0.4081 Z M0.7311,0.5059 L0.641,0.5059 L0.641,0.5835 L0.7311,0.5835 L0.7311,0.5059 Z M0.7311,0.711 L0.641,0.711 L0.641,0.7886 L0.7311,0.7886 L0.7311,0.711 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.8626,0.1137 L0.7725,0.1137 L0.7725,0.1909 L0.8626,0.1909 L0.8626,0.1137 Z M0.8626,0.2143 L0.7725,0.2143 L0.7725,0.2919 L0.8626,0.2919 L0.8626,0.2143 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.31 L0.7725,0.31 L0.7725,0.3876 L0.8626,0.3876 L0.8626,0.31 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.4081 L0.7725,0.4081 L0.7725,0.4857 L0.8626,0.4857 L0.8626,0.4081 Z M0.8626,0.5059 L0.7725,0.5059 L0.7725,0.5835 L0.8626,0.5835 L0.8626,0.5059 Z M0.8626,0.6065 L0.7725,0.6065 L0.7725,0.6841 L0.8626,0.6841 L0.8626,0.6065 Z M0.8626,0.711 L0.7725,0.711 L0.7725,0.7886 L0.8626,0.7886 L0.8626,0.711 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M1,0.1137 L0.9099,0.1137 L0.9099,0.1909 L1,0.1909 L1,0.1137 Z M1,0.2143 L0.9099,0.2143 L0.9099,0.2919 L1,0.2919 L1,0.2143 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.31 L0.9099,0.31 L0.9099,0.3876 L1,0.3876 L1,0.31 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.4081 L0.9099,0.4081 L0.9099,0.4857 L1,0.4857 L1,0.4081 Z M1,0.5059 L0.9099,0.5059 L0.9099,0.5835 L1,0.5835 L1,0.5059 Z M1,0.6065 L0.9099,0.6065 L0.9099,0.6841 L1,0.6841 L1,0.6065 Z M1,0.711 L0.9099,0.711 L0.9099,0.7886 L1,0.7886 L1,0.711 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z", type: 0 } }, "\\uE0C6": { type: 5, data: { d: "M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0.8574,0.3217 L0.8574,0.4098 L0.9691,0.4098 L0.9691,0.3217 L0.8574,0.3217 Z M0.8419,0.2978 L0.9846,0.2978 Q0.9892,0.2978,0.9928,0.2997 T0.9982,0.3043 T1,0.31 L1,0.4216 Q1,0.427,0.9951,0.4304 T0.9846,0.4337 L0.8419,0.4337 Q0.8352,0.4337,0.8308,0.4299 T0.8265,0.4216 L0.8265,0.31 Q0.8265,0.3062,0.829,0.3035 T0.835,0.2993 T0.8419,0.2978 Z M0.8574,0.888 L0.8574,0.9757 L0.9691,0.9757 L0.9691,0.888 L0.8574,0.888 Z M0.8419,0.8637 L0.9846,0.8637 Q0.9892,0.8637,0.9928,0.8658 T0.9982,0.8706 T1,0.8758 L1,0.9878 Q1,0.9929,0.9951,0.9964 T0.9846,1 L0.8419,1 Q0.8352,1,0.8308,0.996 T0.8265,0.9878 L0.8265,0.8758 Q0.8265,0.8708,0.8314,0.8672 T0.8419,0.8637 Z M0.6509,0.169 L0.6509,0.2706 L0.7806,0.2706 L0.7806,0.169 L0.6509,0.169 Z M0.6442,0.159 L0.7868,0.159 Q0.7899,0.159,0.7917,0.1604 T0.7935,0.164 L0.7935,0.2756 Q0.7935,0.2781,0.7915,0.2796 T0.7868,0.281 L0.6442,0.281 Q0.6416,0.281,0.6395,0.2794 T0.6375,0.2756 L0.6375,0.164 Q0.6375,0.1619,0.6398,0.1604 T0.6442,0.159 Z M0.6632,0.6044 L0.6632,0.6858 L0.7678,0.6858 L0.7678,0.6044 L0.6632,0.6044 Z M0.6442,0.5742 L0.7868,0.5742 Q0.7951,0.5742,0.8007,0.5791 T0.8064,0.5893 L0.8064,0.7013 Q0.8064,0.7076,0.8002,0.712 T0.7868,0.7164 L0.6442,0.7164 Q0.6359,0.7164,0.6305,0.7114 T0.6251,0.7013 L0.6251,0.5893 Q0.6251,0.5847,0.6282,0.5812 T0.6357,0.5759 T0.6442,0.5742 Z M0.4264,0.164 L0.5695,0.164 L0.5695,0.2756 L0.4264,0.2756 L0.4264,0.164 Z M0.4325,0.315 L0.4325,0.4165 L0.5628,0.4165 L0.5628,0.315 L0.4325,0.315 Z M0.4264,0.3049 L0.5695,0.3049 Q0.5721,0.3049,0.5739,0.3064 T0.5757,0.31 L0.5757,0.4216 Q0.5757,0.4237,0.5736,0.4251 T0.5695,0.4266 L0.4264,0.4266 Q0.4238,0.4266,0.422,0.4251 T0.4202,0.4216 L0.4202,0.31 Q0.4202,0.3087,0.4207,0.3077 T0.4222,0.306 T0.4243,0.3052 T0.4264,0.3049 Z M0.4264,0.4476 L0.5695,0.4476 L0.5695,0.5596 L0.4264,0.5596 L0.4264,0.4476 Z M0.4392,0.7408 L0.4392,0.8326 L0.5561,0.8326 L0.5561,0.7408 L0.4392,0.7408 Z M0.4264,0.7206 L0.5695,0.7206 Q0.5747,0.7206,0.5783,0.724 T0.5819,0.7307 L0.5819,0.8427 Q0.5819,0.8469,0.5778,0.8498 T0.5695,0.8528 L0.4264,0.8528 Q0.4207,0.8528,0.4171,0.8496 T0.4135,0.8427 L0.4135,0.7307 Q0.4135,0.7265,0.4176,0.7236 T0.4264,0.7206 Z M0.2178,0.164 L0.3605,0.164 L0.3605,0.2756 L0.2178,0.2756 L0.2178,0.164 Z M0.2178,0.31 L0.3605,0.31 L0.3605,0.4216 L0.2178,0.4216 L0.2178,0.31 Z M0.2178,0.5893 L0.3605,0.5893 L0.3605,0.7013 L0.2178,0.7013 L0.2178,0.5893 Z M0.2178,0.7307 L0.3605,0.7307 L0.3605,0.8427 L0.2178,0.8427 L0.2178,0.7307 Z M0.2178,0.8758 L0.3605,0.8758 L0.3605,0.9878 L0.2178,0.9878 L0.2178,0.8758 Z M0,0.164 L0.1432,0.164 L0.1432,0.2756 L0,0.2756 L0,0.164 Z M0,0.31 L0.1432,0.31 L0.1432,0.4216 L0,0.4216 L0,0.31 Z M0,0.4476 L0.1432,0.4476 L0.1432,0.5596 L0,0.5596 L0,0.4476 Z M0,0.5893 L0.1432,0.5893 L0.1432,0.7013 L0,0.7013 L0,0.5893 Z M0,0.7307 L0.1432,0.7307 L0.1432,0.8427 L0,0.8427 L0,0.7307 Z M0,0.8758 L0.1432,0.8758 L0.1432,0.9878 L0,0.9878 L0,0.8758 Z", type: 0 } }, "\\uE0C7": { type: 5, data: { d: "M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M0.1432,0.3217 L0.1432,0.4098 L0.0309,0.4098 L0.0309,0.3217 L0.1432,0.3217 Z M0.1586,0.2978 L0.0154,0.2978 Q0.0088,0.2978,0.0044,0.3016 T0,0.31 L0,0.4216 Q0,0.427,0.0049,0.4304 T0.0154,0.4337 L0.1586,0.4337 Q0.1648,0.4337,0.1694,0.4299 T0.174,0.4216 L0.174,0.31 Q0.174,0.3062,0.1715,0.3035 T0.1653,0.2993 T0.1586,0.2978 Z M0.1432,0.888 L0.1432,0.9757 L0.0309,0.9757 L0.0309,0.888 L0.1432,0.888 Z M0.1586,0.8637 L0.0154,0.8637 Q0.0108,0.8637,0.0072,0.8658 T0.0018,0.8706 T0,0.8758 L0,0.9878 Q0,0.9929,0.0049,0.9964 T0.0154,1 L0.1586,1 Q0.1648,1,0.1694,0.996 T0.174,0.9878 L0.174,0.8758 Q0.174,0.8725,0.1715,0.8695 T0.1653,0.8651 T0.1586,0.8637 Z M0.3496,0.169 L0.3496,0.2706 L0.2194,0.2706 L0.2194,0.169 L0.3496,0.169 Z M0.3563,0.159 L0.2132,0.159 Q0.2106,0.159,0.2088,0.1604 T0.207,0.164 L0.207,0.2756 Q0.207,0.2781,0.2091,0.2796 T0.2132,0.281 L0.3563,0.281 Q0.3589,0.281,0.3607,0.2794 T0.3625,0.2756 L0.3625,0.164 Q0.3625,0.1619,0.3605,0.1604 T0.3563,0.159 Z M0.3368,0.6044 L0.3368,0.6858 L0.2327,0.6858 L0.2327,0.6044 L0.3368,0.6044 Z M0.3563,0.5742 L0.2132,0.5742 Q0.2049,0.5742,0.1993,0.5791 T0.1936,0.5893 L0.1936,0.7013 Q0.1936,0.7076,0.2001,0.712 T0.2132,0.7164 L0.3563,0.7164 Q0.3641,0.7164,0.3697,0.7114 T0.3754,0.7013 L0.3754,0.5893 Q0.3754,0.5847,0.3723,0.5812 T0.3648,0.5759 T0.3563,0.5742 Z M0.5736,0.164 L0.431,0.164 L0.431,0.2756 L0.5736,0.2756 L0.5736,0.164 Z M0.5675,0.315 L0.5675,0.4165 L0.4377,0.4165 L0.4377,0.315 L0.5675,0.315 Z M0.5736,0.3049 L0.431,0.3049 Q0.4284,0.3049,0.4264,0.3064 T0.4243,0.31 L0.4243,0.4216 Q0.4243,0.4237,0.4266,0.4251 T0.431,0.4266 L0.5736,0.4266 Q0.5767,0.4266,0.5785,0.4251 T0.5803,0.4216 L0.5803,0.31 Q0.5803,0.3087,0.5798,0.3077 T0.5783,0.306 T0.5762,0.3052 T0.5736,0.3049 Z M0.5736,0.4476 L0.431,0.4476 L0.431,0.5596 L0.5736,0.5596 L0.5736,0.4476 Z M0.5613,0.7408 L0.5613,0.8326 L0.4439,0.8326 L0.4439,0.7408 L0.5613,0.7408 Z M0.5736,0.7206 L0.431,0.7206 Q0.4253,0.7206,0.4217,0.724 T0.4181,0.7307 L0.4181,0.8427 Q0.4181,0.8469,0.4222,0.8498 T0.431,0.8528 L0.5736,0.8528 Q0.5778,0.8528,0.5808,0.8511 T0.5855,0.8471 T0.587,0.8427 L0.587,0.7307 Q0.587,0.7265,0.5826,0.7236 T0.5736,0.7206 Z M0.7827,0.164 L0.6395,0.164 L0.6395,0.2756 L0.7827,0.2756 L0.7827,0.164 Z M0.7827,0.31 L0.6395,0.31 L0.6395,0.4216 L0.7827,0.4216 L0.7827,0.31 Z M0.7827,0.5893 L0.6395,0.5893 L0.6395,0.7013 L0.7827,0.7013 L0.7827,0.5893 Z M0.7827,0.7307 L0.6395,0.7307 L0.6395,0.8427 L0.7827,0.8427 L0.7827,0.7307 Z M0.7827,0.8758 L0.6395,0.8758 L0.6395,0.9878 L0.7827,0.9878 L0.7827,0.8758 Z M1,0.164 L0.8574,0.164 L0.8574,0.2756 L1,0.2756 L1,0.164 Z M1,0.31 L0.8574,0.31 L0.8574,0.4216 L1,0.4216 L1,0.31 Z M1,0.4476 L0.8574,0.4476 L0.8574,0.5596 L1,0.5596 L1,0.4476 Z M1,0.5893 L0.8574,0.5893 L0.8574,0.7013 L1,0.7013 L1,0.5893 Z M1,0.7307 L0.8574,0.7307 L0.8574,0.8427 L1,0.8427 L1,0.7307 Z M1,0.8758 L0.8574,0.8758 L0.8574,0.9878 L1,0.9878 L1,0.8758 Z", type: 0 } }, "\\uE0C8": { type: 5, data: { d: "M0.0008,0.9979 Q0.0008,1,0.0032,1 Q0.0482,1,0.0602,0.9975 Q0.0667,0.9963,0.0847,0.9917 T0.1084,0.9859 Q0.1124,0.9851,0.1221,0.9851 L0.1253,0.9851 L0.1285,0.9851 Q0.1518,0.9851,0.1655,0.9809 Q0.1695,0.9801,0.1731,0.9788 T0.1791,0.9766 T0.1839,0.9747 T0.1888,0.9732 L0.1936,0.972 T0.1988,0.9712 T0.2048,0.971 L0.2096,0.971 Q0.2201,0.9714,0.2233,0.9714 T0.2345,0.9693 Q0.2386,0.9685,0.2502,0.9674 T0.2715,0.966 L0.2811,0.9656 Q0.2916,0.9647,0.2916,0.9573 Q0.2916,0.954,0.2892,0.9515 T0.2819,0.9486 Q0.2755,0.9482,0.2683,0.9482 Q0.2643,0.9482,0.2582,0.9484 T0.2498,0.9486 Q0.2426,0.9486,0.2402,0.9473 Q0.2386,0.9469,0.2317,0.943 T0.2161,0.937 Q0.2104,0.9357,0.1992,0.933 T0.1831,0.9291 Q0.1807,0.9287,0.1783,0.9285 T0.1739,0.928 T0.1703,0.9276 T0.1675,0.9272 T0.1655,0.9266 T0.1639,0.9253 Q0.1598,0.9216,0.1462,0.9216 L0.143,0.9216 L0.1398,0.9216 L0.1365,0.9216 Q0.1197,0.9195,0.1197,0.9154 L0.1197,0.9154 Q0.1205,0.9121,0.1373,0.9088 T0.1703,0.9054 Q0.1791,0.9054,0.1863,0.904 T0.1984,0.9011 T0.2064,0.8992 Q0.2402,0.8967,0.2506,0.8934 Q0.2538,0.8926,0.2602,0.8899 T0.2707,0.8872 Q0.2715,0.8872,0.2731,0.8876 Q0.2795,0.8884,0.2884,0.8884 Q0.3068,0.8884,0.3092,0.8826 L0.3092,0.8797 Q0.3092,0.8772,0.3076,0.8747 T0.3044,0.8706 T0.3028,0.8681 Q0.3076,0.8656,0.3237,0.8656 Q0.3317,0.8656,0.3622,0.8623 Q0.3655,0.8623,0.3867,0.8617 T0.4217,0.8602 Q0.4241,0.8598,0.4289,0.8598 L0.4345,0.8598 L0.441,0.8598 Q0.4578,0.8598,0.4667,0.8586 Q0.4739,0.8573,0.4851,0.8567 T0.5004,0.8552 Q0.5012,0.8552,0.5108,0.855 T0.5269,0.853 T0.5333,0.8461 Q0.5333,0.8445,0.5325,0.8432 T0.5309,0.8409 T0.5289,0.8391 T0.5261,0.8378 L0.5229,0.837 T0.5185,0.8362 T0.5133,0.8355 T0.5076,0.8349 T0.502,0.8341 Q0.4932,0.8324,0.4859,0.8324 Q0.4827,0.8324,0.4787,0.8328 T0.4731,0.8333 Q0.4707,0.8333,0.4683,0.8324 Q0.4482,0.825,0.4394,0.825 Q0.4369,0.825,0.4345,0.8254 Q0.4225,0.827,0.4153,0.827 Q0.4088,0.827,0.4064,0.8258 Q0.3976,0.8204,0.3751,0.8204 Q0.3703,0.8204,0.3667,0.8214 T0.3622,0.8225 Q0.3598,0.8225,0.3558,0.82 Q0.351,0.8175,0.3402,0.8167 T0.3177,0.8156 T0.3028,0.8146 L0.2956,0.8121 T0.2871,0.8094 T0.2771,0.8073 T0.2635,0.8063 Q0.261,0.8063,0.2586,0.8067 Q0.2378,0.8071,0.2273,0.8071 Q0.2072,0.8071,0.2024,0.8051 Q0.1976,0.8034,0.1932,0.8026 T0.1867,0.8013 T0.1847,0.8001 L0.1847,0.7993 Q0.1855,0.7984,0.1855,0.7978 T0.1859,0.7966 T0.1867,0.7959 T0.188,0.7955 T0.1896,0.7951 T0.1916,0.7949 T0.1944,0.7945 T0.1984,0.7941 T0.2032,0.7939 Q0.212,0.7926,0.2325,0.7918 T0.2562,0.7905 Q0.2691,0.7893,0.2787,0.7847 Q0.2835,0.7827,0.2968,0.7791 T0.3149,0.7756 Q0.3189,0.7756,0.3305,0.7733 T0.3446,0.771 L0.3454,0.771 Q0.3462,0.771,0.3498,0.7721 T0.3574,0.774 T0.3655,0.7748 Q0.3703,0.7748,0.3743,0.7731 T0.3823,0.7708 T0.3916,0.77 T0.3992,0.7694 Q0.4008,0.7694,0.4076,0.7688 T0.4205,0.7675 L0.4305,0.7665 Q0.4345,0.7657,0.4402,0.7617 T0.4458,0.7545 Q0.4458,0.7503,0.4353,0.7487 Q0.4297,0.7478,0.4209,0.7462 T0.4044,0.7433 T0.3904,0.7416 L0.3847,0.7416 Q0.3807,0.7416,0.3747,0.7422 T0.3663,0.7428 T0.3606,0.7424 Q0.3582,0.742,0.3562,0.7418 T0.3522,0.7412 T0.3482,0.7406 T0.3446,0.7401 T0.341,0.7397 T0.3373,0.7393 T0.3341,0.7391 L0.3293,0.7391 Q0.3277,0.7395,0.3253,0.7395 Q0.3205,0.7395,0.3052,0.7387 T0.2835,0.7379 Q0.2755,0.7379,0.253,0.7325 Q0.2506,0.7316,0.2462,0.731 T0.2382,0.7296 T0.2305,0.7271 T0.2181,0.7234 T0.2048,0.7196 T0.2,0.7155 Q0.2,0.7142,0.2016,0.713 Q0.208,0.7059,0.2285,0.6978 T0.2618,0.6898 Q0.2739,0.6898,0.2831,0.6848 T0.2956,0.6794 Q0.3028,0.6786,0.3289,0.6765 T0.3566,0.674 Q0.3582,0.674,0.3855,0.6723 T0.4406,0.6688 T0.4755,0.6653 Q0.5004,0.6607,0.5124,0.6599 L0.5165,0.6599 Q0.5213,0.6599,0.5277,0.6605 T0.5373,0.6611 Q0.543,0.6611,0.5494,0.6599 Q0.592,0.6524,0.6,0.6524 Q0.6064,0.6524,0.61,0.6499 T0.6161,0.6474 Q0.6177,0.6474,0.6261,0.6495 T0.6418,0.6516 L0.6482,0.6516 Q0.653,0.6512,0.6651,0.6506 T0.6876,0.6493 T0.7084,0.6477 T0.7229,0.645 Q0.7269,0.6437,0.7333,0.6437 Q0.7373,0.6437,0.7458,0.6443 T0.7574,0.645 Q0.7614,0.645,0.7631,0.6445 T0.7655,0.6441 Q0.7671,0.6441,0.7723,0.6448 T0.7823,0.6454 Q0.788,0.6454,0.7952,0.6445 Q0.8233,0.6408,0.8723,0.6367 Q0.9012,0.6342,0.9092,0.6342 L0.9165,0.6342 L0.9205,0.6342 Q0.9277,0.6342,0.9382,0.6323 T0.9526,0.6304 Q0.9534,0.6304,0.9594,0.6307 T0.9695,0.6309 Q0.9976,0.6309,0.9992,0.6234 Q1,0.6201,1,0.618 Q1,0.6089,0.9775,0.608 Q0.9703,0.6076,0.9582,0.6076 Q0.9518,0.6076,0.9394,0.6078 T0.9213,0.608 Q0.9036,0.608,0.8972,0.6072 Q0.894,0.6068,0.8871,0.6058 T0.8751,0.6039 T0.8627,0.6024 T0.8506,0.6018 L0.8474,0.6018 Q0.841,0.6022,0.8281,0.6041 T0.8112,0.606 Q0.8096,0.606,0.808,0.6056 Q0.7783,0.6002,0.7647,0.6002 Q0.7598,0.6002,0.7454,0.6006 T0.7261,0.601 Q0.7221,0.601,0.7145,0.6022 T0.7036,0.6035 Q0.6996,0.6035,0.6964,0.6022 Q0.6723,0.5902,0.6442,0.5902 Q0.6426,0.5902,0.6386,0.5904 T0.6337,0.5906 Q0.6273,0.5906,0.6249,0.5894 L0.6177,0.5856 T0.6116,0.5838 T0.6016,0.5825 T0.5855,0.5823 Q0.5719,0.5823,0.5574,0.5798 T0.5373,0.5774 L0.5341,0.5774 Q0.5293,0.5778,0.5213,0.5786 T0.51,0.5794 Q0.5036,0.5794,0.4988,0.5769 Q0.4932,0.574,0.4771,0.574 Q0.4723,0.574,0.4631,0.5745 T0.4498,0.5749 Q0.4418,0.5749,0.4394,0.5736 Q0.4353,0.5724,0.4305,0.5715 T0.4225,0.5707 T0.4145,0.5705 T0.4056,0.5699 Q0.4008,0.5691,0.398,0.5689 T0.394,0.5689 T0.3908,0.5686 T0.3855,0.5674 Q0.3831,0.567,0.3811,0.5662 T0.3779,0.5645 T0.3743,0.563 T0.3695,0.5624 Q0.3655,0.5624,0.3594,0.5635 T0.3494,0.5645 T0.3406,0.5635 T0.3325,0.5624 Q0.3309,0.5624,0.3301,0.5628 L0.3141,0.5628 Q0.2635,0.5628,0.2506,0.5612 Q0.2474,0.5608,0.2434,0.5608 Q0.2402,0.5608,0.2349,0.561 T0.2273,0.5612 Q0.2209,0.5612,0.2177,0.5595 Q0.2145,0.557,0.2145,0.5558 Q0.2169,0.5537,0.2345,0.5521 Q0.2876,0.5475,0.3028,0.5425 Q0.3068,0.5413,0.3149,0.5396 T0.3309,0.5367 T0.3478,0.5338 T0.3606,0.5309 Q0.3631,0.5305,0.3755,0.5259 T0.3968,0.5214 Q0.3992,0.5214,0.4024,0.5218 T0.4096,0.5222 Q0.4161,0.5222,0.4213,0.5209 T0.4313,0.5185 T0.4402,0.5172 Q0.4418,0.5168,0.447,0.5168 L0.4558,0.5168 T0.4639,0.5162 T0.4707,0.5141 T0.4731,0.5102 Q0.4731,0.5089,0.4723,0.5081 Q0.4699,0.5019,0.4627,0.4994 T0.4369,0.4965 Q0.4273,0.4961,0.4193,0.4946 T0.4048,0.4915 T0.3952,0.4894 Q0.392,0.4886,0.388,0.4886 Q0.3847,0.4886,0.3775,0.4892 T0.3647,0.4898 Q0.3598,0.4898,0.355,0.4894 Q0.3165,0.4861,0.3141,0.4853 Q0.2779,0.4774,0.2715,0.4774 Q0.2699,0.4774,0.2683,0.4776 T0.2627,0.4778 Q0.2498,0.4778,0.2281,0.4762 Q0.2241,0.4749,0.2233,0.4737 Q0.2249,0.472,0.2321,0.4708 Q0.2402,0.4695,0.2554,0.4695 L0.2675,0.4695 L0.2795,0.4695 Q0.294,0.4695,0.2996,0.4679 Q0.3141,0.4629,0.3373,0.4616 Q0.3414,0.4612,0.3466,0.4606 T0.3582,0.4589 T0.3687,0.4562 T0.3727,0.4525 Q0.3727,0.4509,0.3703,0.4492 Q0.3639,0.4455,0.3474,0.4419 T0.3213,0.4384 L0.3157,0.4384 L0.31,0.4384 Q0.294,0.4384,0.2859,0.4363 Q0.2795,0.4347,0.2691,0.4347 L0.2618,0.4347 L0.2546,0.4347 Q0.2458,0.4347,0.2394,0.4338 Q0.2257,0.4318,0.2193,0.4303 T0.2092,0.4266 T0.2052,0.4224 T0.2024,0.4154 T0.196,0.4052 Q0.1912,0.3994,0.1867,0.3949 T0.1807,0.3884 T0.1791,0.3849 Q0.1791,0.3824,0.1839,0.3745 Q0.1871,0.3687,0.1944,0.3637 T0.2072,0.3561 T0.2221,0.3501 T0.2321,0.3463 Q0.2353,0.3455,0.241,0.3445 T0.2522,0.3428 T0.2639,0.3411 T0.2731,0.3384 T0.2956,0.3351 T0.3197,0.3326 Q0.3213,0.3322,0.3237,0.3322 T0.3325,0.3331 T0.3414,0.3339 Q0.3478,0.3339,0.3518,0.3314 Q0.3606,0.3264,0.3703,0.3264 Q0.3775,0.3264,0.3847,0.3293 Q0.3888,0.331,0.396,0.331 Q0.4024,0.331,0.4116,0.3295 T0.4265,0.3266 T0.4414,0.3227 T0.4514,0.3202 Q0.4578,0.3181,0.4839,0.3152 T0.5112,0.3123 T0.5177,0.3119 T0.5285,0.3111 T0.5398,0.3096 T0.549,0.3065 T0.5526,0.3015 Q0.5526,0.2999,0.5518,0.2982 Q0.547,0.2903,0.5386,0.2883 T0.5165,0.2862 Q0.5116,0.2862,0.5056,0.2866 T0.4972,0.287 Q0.4884,0.287,0.4787,0.2833 Q0.4594,0.2758,0.4265,0.2758 Q0.4169,0.2758,0.4129,0.2766 Q0.4112,0.2771,0.4104,0.2771 Q0.4088,0.2771,0.4056,0.2748 T0.3968,0.2721 Q0.3695,0.2696,0.359,0.2659 Q0.355,0.2646,0.351,0.2646 T0.3426,0.2661 T0.3365,0.2675 T0.3333,0.2659 Q0.3277,0.2605,0.3116,0.2553 T0.2859,0.2501 L0.2843,0.2501 L0.2819,0.2501 Q0.2779,0.2501,0.2723,0.2493 T0.2586,0.2472 T0.2474,0.2455 Q0.1799,0.236,0.1719,0.236 Q0.1663,0.236,0.1606,0.235 T0.1502,0.2316 T0.1454,0.2265 Q0.1454,0.2223,0.1558,0.2173 Q0.1679,0.2115,0.1859,0.2092 T0.2185,0.207 T0.2353,0.2057 Q0.2369,0.2049,0.2502,0.2041 T0.2799,0.2022 T0.302,0.2007 Q0.3084,0.1999,0.3245,0.1954 T0.347,0.1908 Q0.3502,0.1908,0.3534,0.1916 Q0.3663,0.197,0.388,0.197 Q0.404,0.197,0.4088,0.1929 Q0.4096,0.192,0.4108,0.192 T0.4177,0.1945 T0.4277,0.197 T0.4369,0.1949 Q0.4442,0.1908,0.4843,0.1875 Q0.4892,0.1871,0.4968,0.1839 T0.5084,0.1808 L0.5108,0.1808 Q0.5213,0.1825,0.5454,0.1825 Q0.5823,0.1825,0.5992,0.1779 Q0.6096,0.1746,0.6217,0.1746 Q0.6249,0.1746,0.6309,0.1748 T0.6394,0.175 Q0.6434,0.175,0.6466,0.1746 Q0.6474,0.1746,0.6594,0.1738 T0.6787,0.1713 T0.6892,0.1659 Q0.6924,0.1634,0.6924,0.1593 Q0.6924,0.1547,0.6888,0.151 T0.6795,0.1472 Q0.6779,0.1472,0.6763,0.1477 Q0.6699,0.1493,0.6667,0.1493 Q0.661,0.1493,0.6506,0.1456 Q0.6329,0.1394,0.6129,0.1394 Q0.6048,0.1394,0.5992,0.1377 T0.5888,0.136 T0.5803,0.1377 T0.5751,0.1394 Q0.5711,0.1394,0.5639,0.1369 Q0.5365,0.1273,0.5116,0.1273 Q0.4876,0.1273,0.4667,0.1253 Q0.4627,0.1248,0.4542,0.1211 T0.4337,0.1174 L0.4305,0.1174 Q0.4217,0.1178,0.4153,0.119 T0.408,0.1203 Q0.4056,0.1203,0.4,0.117 Q0.3976,0.1153,0.396,0.1136 T0.3932,0.1112 T0.39,0.1099 T0.3847,0.1095 Q0.3799,0.1095,0.3687,0.1103 Q0.355,0.1112,0.3434,0.1141 T0.3301,0.117 Q0.3261,0.117,0.3229,0.1145 Q0.3181,0.1116,0.3052,0.1087 T0.2787,0.1043 T0.2546,0.1029 Q0.2506,0.1029,0.2474,0.1033 Q0.2418,0.1037,0.2349,0.1054 T0.2249,0.107 Q0.2225,0.107,0.2193,0.1066 Q0.2024,0.1024,0.1863,0.1024 Q0.1823,0.1024,0.1562,0.0971 T0.1269,0.0917 T0.1161,0.0896 T0.106,0.0854 Q0.1076,0.0846,0.11,0.0842 Q0.1173,0.0821,0.1261,0.0821 Q0.1301,0.0821,0.1369,0.0825 T0.1462,0.083 Q0.1494,0.083,0.151,0.0825 T0.1831,0.0813 T0.2201,0.0784 T0.243,0.074 T0.2667,0.0718 Q0.2707,0.0718,0.2755,0.0724 T0.2843,0.073 T0.2936,0.0724 T0.3024,0.0705 T0.3072,0.068 T0.3092,0.0657 T0.3108,0.0647 Q0.3116,0.0643,0.3133,0.0643 L0.3157,0.0643 L0.3181,0.0643 Q0.3446,0.0643,0.3446,0.0556 T0.3205,0.0469 L0.3189,0.0469 Q0.3157,0.0469,0.3157,0.0465 Q0.3084,0.0427,0.2835,0.0386 Q0.2739,0.0369,0.2675,0.0342 T0.2538,0.0299 Q0.249,0.029,0.245,0.029 T0.2378,0.0303 T0.2321,0.0315 Q0.2305,0.0315,0.2273,0.0307 Q0.2201,0.0286,0.2004,0.0272 T0.1775,0.0245 Q0.1735,0.0228,0.1663,0.0226 T0.1522,0.0197 T0.1345,0.0145 T0.1124,0.0079 Q0.0996,0.0033,0.0671,0.0044 T0.0297,0.0041 Q0.0169,0,0.0024,0.0017 Q0,0.0021,0,0.0037 Z M0.0064,0.9954 L0.0056,0.0058 Q0.0177,0.005,0.0281,0.0083 Q0.0345,0.01,0.0675,0.0089 T0.1108,0.012 Q0.1221,0.0162,0.1329,0.0187 T0.1498,0.0236 T0.1606,0.0268 T0.1691,0.0274 T0.1759,0.0286 Q0.1807,0.0303,0.2,0.0315 T0.2257,0.0348 Q0.2305,0.0361,0.2337,0.0361 Q0.2361,0.0361,0.2398,0.0348 T0.2466,0.0336 Q0.249,0.0336,0.2522,0.034 Q0.2586,0.0353,0.2655,0.0382 T0.2827,0.0427 Q0.3068,0.0469,0.3124,0.0502 Q0.3157,0.0523,0.3237,0.0523 L0.3277,0.0523 L0.3309,0.0523 Q0.3398,0.0523,0.3398,0.0556 Q0.3398,0.0581,0.3341,0.0587 T0.3205,0.0593 T0.3092,0.0603 T0.3036,0.0643 T0.2932,0.068 Q0.2884,0.0684,0.2843,0.0684 Q0.2811,0.0684,0.2763,0.0678 T0.2667,0.0672 Q0.2586,0.0672,0.2422,0.0697 T0.2177,0.0747 Q0.2137,0.0759,0.1831,0.0767 T0.1494,0.0784 L0.1474,0.0784 T0.1398,0.078 T0.1285,0.0776 Q0.1173,0.0776,0.1084,0.08 Q0.1004,0.0817,0.1004,0.0846 Q0.1004,0.0867,0.104,0.0888 T0.1124,0.0923 T0.1213,0.0948 T0.1269,0.0958 T0.155,0.1014 T0.1863,0.107 Q0.2016,0.107,0.2185,0.1107 Q0.2217,0.1116,0.2257,0.1116 Q0.2289,0.1116,0.2365,0.1099 T0.2482,0.1074 L0.2538,0.1074 Q0.2683,0.1074,0.2912,0.1107 T0.3197,0.1182 Q0.3245,0.1215,0.3301,0.1215 Q0.3333,0.1215,0.3454,0.1184 T0.3687,0.1145 Q0.3735,0.1141,0.3779,0.1139 T0.3843,0.1134 T0.3871,0.1132 Q0.3896,0.1132,0.39,0.1136 T0.392,0.1161 T0.3968,0.1203 Q0.404,0.1248,0.408,0.1248 Q0.4096,0.1248,0.4165,0.1234 T0.4305,0.1215 L0.4337,0.1215 Q0.4442,0.1215,0.4518,0.1251 T0.4659,0.1294 Q0.4876,0.1319,0.5116,0.1319 T0.5622,0.141 Q0.5703,0.1439,0.5751,0.1439 Q0.5791,0.1439,0.5831,0.1423 T0.5888,0.1406 Q0.592,0.1406,0.5944,0.1412 T0.6012,0.1427 T0.6129,0.1435 Q0.6313,0.1435,0.649,0.1497 Q0.6602,0.1535,0.6667,0.1535 Q0.6715,0.1535,0.6779,0.1522 Q0.6787,0.1518,0.6795,0.1518 Q0.6827,0.1518,0.6847,0.1541 T0.6867,0.1593 Q0.6867,0.1618,0.6851,0.1634 Q0.6835,0.1655,0.6775,0.1667 T0.6598,0.169 T0.6458,0.1705 T0.6402,0.1709 Q0.6378,0.1709,0.6321,0.1705 T0.6225,0.1701 Q0.6096,0.1701,0.5968,0.1738 Q0.5823,0.1779,0.5446,0.1779 Q0.5205,0.1779,0.5116,0.1767 Q0.51,0.1763,0.5084,0.1763 Q0.5028,0.1763,0.4944,0.1796 T0.4835,0.1829 L0.4771,0.1833 T0.4659,0.1844 L0.4546,0.1858 T0.443,0.1881 T0.4337,0.1912 Q0.4321,0.1916,0.4305,0.1916 Q0.4273,0.1916,0.4209,0.1895 T0.412,0.1875 Q0.408,0.1875,0.4056,0.19 Q0.4024,0.1925,0.388,0.1925 Q0.3663,0.1925,0.3558,0.1879 Q0.3518,0.1862,0.3462,0.1862 Q0.3373,0.1862,0.3213,0.191 T0.3012,0.1962 Q0.2964,0.1966,0.2799,0.1976 T0.2494,0.1997 T0.2313,0.2024 L0.2313,0.2024 L0.2293,0.2024 L0.2261,0.2024 L0.2217,0.2024 Q0.204,0.2024,0.1851,0.2047 T0.1526,0.2136 Q0.1406,0.2198,0.1406,0.226 Q0.1406,0.2319,0.1518,0.2362 T0.1719,0.2406 Q0.1791,0.2406,0.2466,0.2497 Q0.2498,0.2501,0.2574,0.2516 T0.2711,0.2538 T0.2819,0.2547 L0.2851,0.2547 Q0.2851,0.2543,0.2859,0.2543 Q0.294,0.2543,0.3096,0.2592 T0.3285,0.2684 Q0.3317,0.2721,0.3373,0.2721 Q0.3406,0.2721,0.3462,0.2708 T0.3542,0.2696 Q0.3558,0.2696,0.3574,0.27 Q0.3679,0.2737,0.3968,0.2762 Q0.3984,0.2766,0.4004,0.2779 L0.4044,0.2804 T0.4096,0.2816 Q0.412,0.2816,0.4145,0.2808 Q0.4177,0.2804,0.4249,0.2804 Q0.4586,0.2804,0.4763,0.287 Q0.4867,0.2912,0.4972,0.2912 Q0.5004,0.2912,0.5064,0.2908 T0.5165,0.2903 Q0.5293,0.2903,0.5361,0.2922 T0.547,0.3003 L0.547,0.3011 Q0.547,0.3036,0.5414,0.3049 T0.5249,0.3067 T0.51,0.3082 Q0.5092,0.3082,0.4831,0.3111 T0.4498,0.3161 Q0.408,0.3264,0.3952,0.3264 Q0.3896,0.3264,0.3863,0.3252 Q0.3783,0.3223,0.3703,0.3223 Q0.359,0.3223,0.3494,0.3277 Q0.347,0.3293,0.343,0.3293 Q0.3414,0.3293,0.3353,0.3285 T0.3253,0.3277 T0.3181,0.3285 Q0.3149,0.3289,0.2952,0.3306 T0.2699,0.3347 Q0.2675,0.3364,0.2598,0.3372 T0.2434,0.3395 T0.2297,0.3426 L0.2205,0.3461 T0.2048,0.3523 T0.1908,0.3606 T0.1791,0.3725 Q0.1743,0.3803,0.1743,0.3845 Q0.1743,0.3874,0.1763,0.3901 T0.1827,0.3976 T0.1912,0.4073 T0.198,0.4189 T0.2032,0.4276 T0.2137,0.4326 T0.2386,0.438 Q0.2458,0.4392,0.2562,0.4392 L0.2639,0.4392 L0.2699,0.4392 Q0.2795,0.4392,0.2843,0.4405 Q0.2932,0.443,0.3092,0.443 L0.3157,0.443 L0.3213,0.443 Q0.3293,0.443,0.3458,0.4463 T0.3671,0.4525 Q0.3598,0.4558,0.3373,0.4571 Q0.3124,0.4587,0.298,0.4637 Q0.294,0.465,0.2811,0.465 L0.2703,0.465 L0.2586,0.465 Q0.241,0.465,0.2305,0.4666 Q0.2185,0.4687,0.2185,0.4728 Q0.2185,0.4745,0.2205,0.4764 T0.2241,0.4791 L0.2265,0.4803 L0.2273,0.4803 Q0.2506,0.4824,0.261,0.4824 Q0.2675,0.4824,0.2699,0.482 Q0.2699,0.4815,0.2707,0.4815 Q0.2771,0.4815,0.3124,0.4898 Q0.3173,0.4907,0.3229,0.4913 T0.3386,0.4925 T0.3542,0.4936 T0.3663,0.494 Q0.3711,0.494,0.3787,0.4936 T0.3888,0.4932 Q0.392,0.4932,0.3944,0.4936 T0.4032,0.4959 T0.4181,0.499 T0.4369,0.5006 Q0.449,0.501,0.455,0.5021 T0.4639,0.5048 T0.4675,0.5093 L0.4675,0.5097 Q0.4675,0.5106,0.4663,0.511 T0.4622,0.5116 L0.4566,0.512 T0.4486,0.5124 T0.4402,0.5127 Q0.4345,0.5131,0.4257,0.5153 T0.4096,0.5176 Q0.4064,0.5176,0.4024,0.5172 L0.3968,0.5172 Q0.3863,0.5172,0.3731,0.522 T0.359,0.5268 Q0.355,0.528,0.3317,0.5321 T0.3004,0.5388 Q0.2867,0.5433,0.2337,0.5479 Q0.2096,0.55,0.2096,0.5562 Q0.2096,0.5591,0.2145,0.5628 Q0.2193,0.5662,0.2289,0.5662 Q0.2313,0.5662,0.2373,0.5657 T0.2458,0.5653 L0.2498,0.5653 Q0.2635,0.5674,0.3124,0.5674 Q0.3261,0.5674,0.3301,0.567 L0.3317,0.567 Q0.3341,0.567,0.3394,0.568 T0.3486,0.5691 Q0.3542,0.5691,0.3606,0.5678 T0.3699,0.5666 T0.3759,0.5686 T0.3839,0.5718 T0.3908,0.573 T0.3964,0.5734 T0.4048,0.5742 T0.4165,0.5751 T0.4277,0.5757 T0.4369,0.5778 Q0.4426,0.5794,0.4538,0.5794 Q0.4586,0.5794,0.4679,0.5792 T0.4811,0.579 Q0.4924,0.579,0.4956,0.5807 Q0.502,0.584,0.5108,0.584 L0.5137,0.584 T0.5173,0.5838 L0.5205,0.5834 L0.5237,0.583 L0.5269,0.5825 T0.5305,0.5821 T0.5341,0.5819 L0.5365,0.5819 Q0.5414,0.5819,0.5562,0.5842 T0.5855,0.5865 Q0.5912,0.5865,0.5948,0.5867 T0.6012,0.5869 T0.6064,0.5873 T0.61,0.5877 T0.6133,0.5886 T0.6157,0.5896 L0.6185,0.591 T0.6217,0.5931 Q0.6265,0.5952,0.6369,0.5952 L0.6418,0.5952 L0.6466,0.5952 Q0.6723,0.5952,0.6932,0.606 Q0.698,0.608,0.7044,0.608 Q0.7084,0.608,0.7161,0.6068 T0.7261,0.6056 Q0.7309,0.6056,0.7454,0.6051 T0.7647,0.6047 Q0.7775,0.6047,0.8072,0.6101 Q0.8096,0.6105,0.812,0.6105 Q0.8177,0.6105,0.8297,0.6085 T0.8474,0.606 L0.8506,0.606 Q0.8562,0.606,0.8647,0.607 T0.8831,0.6095 T0.8964,0.6118 Q0.9036,0.6122,0.9221,0.6122 L0.9406,0.6122 L0.959,0.6122 L0.9767,0.6122 Q0.9952,0.613,0.9952,0.6172 Q0.9952,0.6176,0.9944,0.6221 Q0.9936,0.6259,0.9574,0.6259 L0.955,0.6259 L0.9526,0.6259 Q0.9478,0.6259,0.9373,0.628 T0.9205,0.63 L0.9173,0.63 Q0.9133,0.6296,0.9084,0.6296 Q0.9004,0.6296,0.8715,0.6321 Q0.8233,0.6367,0.7944,0.64 Q0.7888,0.6408,0.7839,0.6408 T0.7739,0.6402 T0.7671,0.6396 Q0.7639,0.6396,0.7622,0.64 Q0.7614,0.6404,0.759,0.6404 Q0.7574,0.6404,0.749,0.6398 T0.7357,0.6392 Q0.7261,0.6392,0.7213,0.6412 Q0.7173,0.6425,0.7032,0.6437 T0.6711,0.6458 T0.6474,0.647 Q0.645,0.6474,0.6418,0.6474 Q0.6353,0.6474,0.6277,0.6454 T0.6161,0.6433 Q0.6104,0.6433,0.6072,0.6456 T0.6,0.6479 Q0.5912,0.6479,0.5486,0.6557 Q0.5422,0.657,0.5373,0.657 Q0.5349,0.657,0.5289,0.6564 T0.5173,0.6557 L0.5124,0.6557 Q0.4996,0.6562,0.4739,0.6611 Q0.4675,0.6624,0.4398,0.6645 T0.3851,0.668 T0.3558,0.6698 Q0.355,0.6698,0.3285,0.6721 T0.2948,0.6752 Q0.2892,0.6761,0.2843,0.6786 T0.2747,0.6831 T0.2618,0.6852 Q0.253,0.6852,0.2394,0.6893 T0.2141,0.6993 T0.1968,0.7105 Q0.1944,0.713,0.1944,0.7155 Q0.1944,0.7196,0.2012,0.7229 T0.2177,0.7285 T0.2281,0.7308 Q0.2321,0.7329,0.2365,0.7339 T0.245,0.7356 T0.2514,0.7366 Q0.2522,0.737,0.2554,0.7379 T0.2614,0.7393 T0.2679,0.7406 T0.2755,0.7416 T0.2835,0.742 Q0.29,0.742,0.3048,0.7428 T0.3253,0.7437 L0.3301,0.7437 L0.3333,0.7437 Q0.3341,0.7437,0.3598,0.7466 Q0.3639,0.7474,0.3671,0.7474 T0.3759,0.7466 T0.3855,0.7457 Q0.388,0.7457,0.3904,0.7462 Q0.3984,0.7466,0.4137,0.7495 T0.4349,0.7532 T0.441,0.7557 Q0.441,0.7599,0.4289,0.7619 Q0.4257,0.7628,0.4197,0.7634 T0.4072,0.7644 T0.3984,0.7652 Q0.3968,0.7652,0.3912,0.7655 T0.3811,0.7665 T0.3719,0.7694 Q0.3695,0.7702,0.3655,0.7702 T0.3546,0.7686 T0.3462,0.7665 L0.3446,0.7665 Q0.3406,0.7665,0.3293,0.769 T0.3149,0.7715 Q0.3084,0.7715,0.2952,0.7748 T0.2763,0.781 Q0.2675,0.7847,0.2554,0.7864 Q0.253,0.7864,0.2325,0.7874 T0.2024,0.7893 Q0.2008,0.7893,0.1984,0.7897 T0.1948,0.7901 T0.1916,0.7903 T0.1888,0.7908 T0.1867,0.7914 T0.1847,0.7922 L0.1831,0.793 T0.1819,0.7943 L0.1811,0.7959 T0.1799,0.7976 Q0.1791,0.7993,0.1791,0.8001 Q0.1791,0.8034,0.1831,0.8051 T0.1932,0.8078 T0.2,0.8092 Q0.2072,0.8117,0.2257,0.8117 Q0.2337,0.8117,0.2586,0.8109 L0.2635,0.8109 Q0.2707,0.8109,0.2767,0.8117 T0.2859,0.8136 T0.2936,0.8163 T0.3012,0.8187 Q0.3068,0.82,0.3277,0.8206 T0.3526,0.8237 Q0.3582,0.8266,0.3622,0.8266 Q0.3647,0.8266,0.3687,0.8258 T0.3751,0.825 Q0.396,0.825,0.404,0.8291 Q0.408,0.8316,0.4161,0.8316 Q0.4217,0.8316,0.4353,0.8295 L0.4394,0.8295 Q0.4466,0.8295,0.4659,0.8366 Q0.4699,0.8378,0.4747,0.8378 Q0.4763,0.8378,0.4807,0.8374 T0.4884,0.837 Q0.494,0.837,0.5004,0.8382 Q0.5052,0.8391,0.5124,0.8399 Q0.5221,0.8411,0.5249,0.8422 T0.5277,0.8461 Q0.5277,0.8482,0.5233,0.849 T0.5112,0.8501 T0.4996,0.8511 Q0.4964,0.8519,0.4851,0.8523 T0.4659,0.8544 Q0.4578,0.8557,0.4402,0.8557 L0.4349,0.8557 L0.4297,0.8557 L0.4209,0.8557 Q0.408,0.8565,0.3867,0.8571 T0.3614,0.8582 Q0.3317,0.8611,0.3237,0.8611 L0.3225,0.8611 L0.3213,0.8611 Q0.2972,0.8611,0.2972,0.8681 Q0.2972,0.8714,0.3008,0.8747 T0.3044,0.8805 Q0.3044,0.881,0.3036,0.8814 Q0.3012,0.8839,0.2851,0.8839 Q0.2779,0.8839,0.2739,0.883 Q0.2723,0.8826,0.2699,0.8826 T0.2643,0.8835 T0.259,0.8853 T0.2542,0.8876 T0.249,0.8893 Q0.2386,0.8922,0.2056,0.8946 Q0.2016,0.8951,0.1916,0.898 T0.1703,0.9009 Q0.1518,0.9009,0.1337,0.9044 T0.1149,0.9146 L0.1149,0.9158 Q0.1149,0.9175,0.1157,0.9187 T0.1173,0.921 T0.1201,0.9226 T0.1233,0.9237 T0.1269,0.9245 L0.1305,0.9251 T0.1337,0.9255 L0.1357,0.9258 Q0.139,0.9262,0.1446,0.9262 T0.1542,0.9266 T0.1598,0.9282 Q0.1614,0.9303,0.1647,0.9314 T0.1739,0.9328 T0.1815,0.9336 Q0.1863,0.9345,0.1976,0.9372 T0.2145,0.9415 Q0.2225,0.9432,0.2285,0.9467 T0.2378,0.9515 Q0.2426,0.9531,0.2514,0.9531 Q0.2538,0.9531,0.2602,0.9529 T0.2707,0.9527 Q0.2763,0.9527,0.2815,0.9531 T0.2867,0.9569 T0.2811,0.9614 Q0.2434,0.9627,0.2329,0.9652 Q0.2249,0.9672,0.2241,0.9672 L0.2096,0.9668 L0.2056,0.9668 Q0.2,0.9668,0.196,0.9672 T0.1884,0.9687 T0.1815,0.9708 T0.1731,0.9737 T0.1639,0.9772 Q0.1518,0.9805,0.1285,0.9805 L0.1253,0.9805 Q0.1124,0.9805,0.1076,0.9818 Q0.1012,0.983,0.0831,0.9876 T0.0594,0.9934 Q0.049,0.9954,0.0064,0.9954 Z M0.0032,0.9979 L0.0024,0.0037 Q0.0161,0.0021,0.0289,0.0062 Q0.0337,0.0075,0.0671,0.0066 T0.1116,0.01 T0.1337,0.0166 T0.151,0.022 Q0.1582,0.0249,0.1659,0.0251 T0.1767,0.0265 Q0.1807,0.0278,0.2,0.0292 T0.2265,0.0328 Q0.2305,0.034,0.2329,0.034 T0.239,0.0326 T0.2458,0.0311 T0.253,0.0319 Q0.2578,0.0332,0.2614,0.0342 T0.2667,0.0363 T0.2723,0.0384 T0.2827,0.0406 Q0.3084,0.0448,0.3141,0.0485 Q0.3149,0.0494,0.3225,0.0494 T0.3361,0.0504 T0.3422,0.0554 T0.3357,0.0606 T0.3205,0.0618 T0.31,0.0626 Q0.3092,0.0626,0.3056,0.0659 T0.2932,0.0701 Q0.2884,0.0709,0.2843,0.0709 Q0.2811,0.0709,0.2759,0.0701 T0.2667,0.0693 Q0.2586,0.0693,0.2422,0.0718 T0.2193,0.0763 Q0.2137,0.0784,0.1831,0.079 T0.1502,0.0805 Q0.1494,0.0809,0.147,0.0809 Q0.1454,0.0809,0.1386,0.0803 T0.1277,0.0796 Q0.1173,0.0796,0.1092,0.0821 Q0.1036,0.0834,0.1036,0.0854 Q0.1036,0.0879,0.1129,0.0908 T0.1269,0.0937 Q0.1293,0.0937,0.1558,0.0991 T0.1863,0.1045 Q0.2016,0.1045,0.2193,0.1087 Q0.2225,0.1091,0.2249,0.1091 Q0.2289,0.1091,0.2357,0.1076 T0.2482,0.1054 Q0.2506,0.1049,0.2546,0.1049 Q0.2699,0.1049,0.2924,0.1085 T0.3213,0.1165 Q0.3253,0.119,0.3301,0.119 Q0.3325,0.119,0.3446,0.1161 T0.3687,0.1124 Q0.3831,0.1112,0.3863,0.1112 T0.3908,0.1118 T0.3936,0.1145 T0.3984,0.1186 Q0.4048,0.1228,0.408,0.1228 Q0.4096,0.1228,0.4161,0.1213 T0.4305,0.1195 L0.4337,0.1195 Q0.4426,0.1195,0.4474,0.1211 T0.4566,0.1246 T0.4667,0.1273 Q0.4876,0.1298,0.5116,0.1298 Q0.5365,0.1298,0.5631,0.1389 Q0.5703,0.1414,0.5751,0.1414 Q0.5783,0.1414,0.5819,0.1398 T0.5888,0.1381 Q0.5928,0.1381,0.5984,0.1398 T0.6129,0.1414 Q0.6321,0.1414,0.6498,0.1477 Q0.661,0.1514,0.6667,0.1514 Q0.6707,0.1514,0.6771,0.1501 Q0.6787,0.1497,0.6795,0.1497 Q0.6835,0.1497,0.6863,0.1526 T0.6892,0.1593 Q0.6892,0.1626,0.6876,0.1647 Q0.6851,0.1672,0.6799,0.1686 T0.6695,0.1705 T0.6566,0.1715 T0.6458,0.1725 Q0.6434,0.173,0.6402,0.173 Q0.6378,0.173,0.6317,0.1727 T0.6225,0.1725 Q0.6096,0.1725,0.5984,0.1759 Q0.5823,0.1804,0.5454,0.1804 Q0.5205,0.1804,0.5116,0.1788 L0.5084,0.1788 Q0.5036,0.1788,0.4956,0.1819 T0.4843,0.185 Q0.4434,0.1887,0.4353,0.1929 Q0.4321,0.1945,0.4289,0.1945 T0.4197,0.1922 T0.4112,0.19 T0.4072,0.1912 Q0.4032,0.1949,0.388,0.1949 Q0.3663,0.1949,0.3542,0.19 Q0.351,0.1883,0.3462,0.1883 Q0.3406,0.1883,0.3321,0.1906 T0.3153,0.1954 T0.302,0.1983 Q0.2972,0.1991,0.2859,0.1997 T0.2643,0.201 T0.245,0.2024 T0.2337,0.2041 Q0.2321,0.2045,0.2181,0.2045 T0.1851,0.207 T0.1542,0.2157 Q0.143,0.2211,0.143,0.226 Q0.143,0.2314,0.153,0.2348 T0.1719,0.2381 Q0.1791,0.2381,0.2474,0.2476 Q0.2506,0.248,0.2558,0.2489 T0.2651,0.2505 T0.2739,0.252 T0.2819,0.2526 Q0.2835,0.2526,0.2851,0.2522 L0.2859,0.2522 Q0.2948,0.2522,0.3104,0.2574 T0.3309,0.2671 Q0.3333,0.2696,0.3365,0.2696 Q0.339,0.2696,0.3442,0.2684 T0.3526,0.2671 T0.3582,0.2679 Q0.3687,0.2717,0.3968,0.2742 Q0.4,0.2746,0.4036,0.2771 T0.4096,0.2796 Q0.4112,0.2796,0.4137,0.2787 Q0.4169,0.2779,0.4257,0.2779 Q0.4594,0.2779,0.4779,0.2849 Q0.4876,0.2891,0.4972,0.2891 Q0.4996,0.2891,0.506,0.2887 T0.5165,0.2883 Q0.5253,0.2883,0.5305,0.2889 T0.541,0.292 T0.5494,0.299 L0.5494,0.3015 Q0.5494,0.3036,0.5466,0.3051 T0.5386,0.3073 T0.5285,0.3086 T0.5181,0.3094 T0.5108,0.3102 Q0.5068,0.3107,0.494,0.3121 L0.4683,0.315 T0.4506,0.3181 Q0.449,0.3181,0.4426,0.32 T0.4313,0.3229 T0.4197,0.3256 T0.4064,0.3281 T0.3952,0.3289 Q0.3888,0.3289,0.3855,0.3273 Q0.3783,0.3243,0.3703,0.3243 Q0.3598,0.3243,0.351,0.3297 Q0.3478,0.3314,0.3422,0.3314 Q0.3398,0.3314,0.3337,0.3306 T0.3245,0.3297 T0.3189,0.3306 Q0.3149,0.3314,0.2956,0.3328 T0.2715,0.3368 Q0.2691,0.338,0.2635,0.3391 T0.2522,0.3407 T0.2406,0.3424 T0.2313,0.3447 Q0.2305,0.3447,0.2213,0.348 T0.206,0.354 T0.1924,0.3621 T0.1815,0.3733 Q0.1767,0.3816,0.1767,0.3849 Q0.1767,0.387,0.1783,0.3893 T0.1847,0.3961 T0.1936,0.4063 T0.2004,0.4181 T0.2052,0.4264 T0.2145,0.4309 T0.2386,0.4359 Q0.2458,0.4372,0.2554,0.4372 Q0.2578,0.4372,0.2627,0.437 T0.2699,0.4367 Q0.2795,0.4367,0.2851,0.4384 Q0.294,0.4409,0.3092,0.4409 Q0.3116,0.4409,0.3157,0.4407 T0.3213,0.4405 Q0.3301,0.4405,0.3466,0.444 T0.3687,0.4509 Q0.3703,0.4517,0.3703,0.4525 Q0.3703,0.4575,0.3373,0.4596 Q0.3133,0.4608,0.2988,0.4658 Q0.294,0.4674,0.2803,0.4674 Q0.2763,0.4674,0.2687,0.4672 T0.257,0.467 Q0.2402,0.467,0.2313,0.4687 Q0.2209,0.4708,0.2209,0.4737 Q0.2209,0.4741,0.2213,0.4749 T0.2229,0.4764 L0.2249,0.4774 T0.2265,0.4778 L0.2273,0.4782 Q0.2498,0.4803,0.2618,0.4803 Q0.2667,0.4803,0.2691,0.4799 Q0.2699,0.4795,0.2715,0.4795 Q0.2779,0.4795,0.3133,0.4873 Q0.3181,0.4886,0.3233,0.4892 T0.3386,0.4905 T0.3542,0.4915 T0.3655,0.4919 Q0.3703,0.4919,0.3779,0.4915 T0.3888,0.4911 T0.3952,0.4915 Q0.3976,0.4919,0.4008,0.4927 L0.4072,0.4944 T0.4149,0.4961 T0.4249,0.4975 T0.4369,0.4985 Q0.449,0.499,0.4554,0.5 T0.4651,0.5031 T0.4699,0.5085 Q0.4707,0.5093,0.4707,0.5097 Q0.4707,0.5114,0.4687,0.5124 T0.4631,0.5139 T0.4562,0.5145 T0.4478,0.5147 L0.4402,0.5147 Q0.4353,0.5151,0.4265,0.5174 T0.4096,0.5197 L0.4024,0.5197 Q0.4,0.5193,0.3968,0.5193 Q0.3896,0.5193,0.3831,0.5209 T0.3703,0.5253 T0.3598,0.5288 Q0.3558,0.5301,0.3321,0.5342 T0.302,0.5409 Q0.2876,0.5454,0.2337,0.55 Q0.2112,0.5521,0.2112,0.5558 Q0.2112,0.5574,0.2161,0.5612 Q0.2201,0.5637,0.2281,0.5637 Q0.2305,0.5637,0.2361,0.5633 T0.2442,0.5628 Q0.2474,0.5628,0.2498,0.5633 Q0.2635,0.5653,0.3133,0.5653 Q0.3261,0.5653,0.3301,0.5649 L0.3325,0.5649 Q0.3349,0.5649,0.3402,0.5657 T0.3494,0.5666 Q0.3542,0.5666,0.3598,0.5657 Q0.3663,0.5645,0.3695,0.5645 Q0.3735,0.5645,0.3775,0.5666 T0.3847,0.5695 Q0.3888,0.5707,0.3912,0.5709 T0.3968,0.5711 T0.4048,0.572 Q0.4096,0.5724,0.4165,0.5726 T0.4281,0.5734 T0.4378,0.5757 Q0.4418,0.5774,0.4522,0.5774 Q0.4562,0.5774,0.4655,0.5769 T0.4795,0.5765 Q0.4932,0.5765,0.4972,0.579 Q0.5028,0.5819,0.51,0.5819 Q0.5141,0.5819,0.5221,0.5809 T0.5341,0.5798 L0.5373,0.5798 Q0.5422,0.5798,0.557,0.5821 T0.5855,0.5844 L0.5936,0.5844 L0.5992,0.5844 T0.604,0.5848 T0.6076,0.5852 T0.6108,0.5859 T0.6137,0.5865 T0.6161,0.5873 T0.6181,0.5881 T0.6209,0.5896 L0.6233,0.591 Q0.6265,0.5927,0.6353,0.5927 L0.6402,0.5927 L0.645,0.5927 Q0.6723,0.5927,0.6948,0.6039 Q0.6988,0.606,0.7036,0.606 Q0.7076,0.606,0.7153,0.6045 T0.7261,0.6031 Q0.7309,0.6031,0.7454,0.6027 T0.7647,0.6022 Q0.7783,0.6022,0.808,0.608 L0.812,0.608 Q0.8169,0.608,0.8293,0.6062 T0.8474,0.6039 L0.8506,0.6039 Q0.857,0.6039,0.8655,0.6049 T0.8835,0.6074 T0.8972,0.6093 Q0.9036,0.6101,0.9213,0.6101 L0.9398,0.6101 L0.959,0.6101 L0.9767,0.6101 Q0.9976,0.6109,0.9976,0.6176 Q0.9976,0.6188,0.9968,0.6226 Q0.9952,0.6284,0.9671,0.6284 L0.959,0.6284 L0.9526,0.6284 Q0.9486,0.6284,0.9382,0.6302 T0.9205,0.6321 L0.9173,0.6321 Q0.9133,0.6317,0.9092,0.6317 Q0.9012,0.6317,0.8715,0.6346 Q0.8233,0.6387,0.7944,0.6421 Q0.7888,0.6429,0.7831,0.6429 Q0.7783,0.6429,0.7731,0.6425 T0.7663,0.6421 L0.7622,0.6421 Q0.7614,0.6425,0.7586,0.6425 T0.7474,0.6421 T0.7349,0.6416 Q0.7261,0.6416,0.7221,0.6429 Q0.7173,0.645,0.7032,0.646 T0.6711,0.6479 T0.6482,0.6491 Q0.645,0.6495,0.6418,0.6495 Q0.6353,0.6495,0.6273,0.6474 T0.6161,0.6454 Q0.612,0.6454,0.6088,0.6477 T0.6,0.6499 Q0.5912,0.6499,0.5494,0.6578 Q0.5422,0.6591,0.5373,0.6591 Q0.5341,0.6591,0.5281,0.6584 T0.5173,0.6578 L0.5124,0.6578 Q0.5004,0.6582,0.4747,0.6632 Q0.4675,0.6649,0.4398,0.6667 T0.3851,0.6703 T0.3566,0.6719 Q0.3534,0.6723,0.3406,0.6734 T0.3141,0.6757 T0.2948,0.6773 Q0.2908,0.6781,0.2819,0.6829 T0.2618,0.6877 Q0.2482,0.6877,0.2273,0.6958 T0.1992,0.7117 Q0.1976,0.7138,0.1976,0.7155 Q0.1976,0.7188,0.2032,0.7213 T0.2181,0.7258 T0.2289,0.7292 Q0.2337,0.7308,0.2378,0.7316 L0.2458,0.7333 T0.2522,0.7345 Q0.2747,0.7399,0.2835,0.7399 Q0.29,0.7399,0.3048,0.7408 T0.3253,0.7416 Q0.3277,0.7416,0.3297,0.7414 T0.3341,0.7412 L0.3598,0.7445 Q0.3639,0.7449,0.3663,0.7449 Q0.3695,0.7449,0.3751,0.7443 T0.3855,0.7437 L0.3904,0.7437 Q0.3984,0.7441,0.4141,0.7472 T0.4353,0.7507 Q0.4434,0.752,0.4434,0.7553 Q0.4434,0.7578,0.439,0.7605 T0.4297,0.764 Q0.4257,0.7648,0.4201,0.7655 T0.4076,0.7665 T0.3984,0.7673 Q0.3968,0.7673,0.3912,0.7677 T0.3815,0.7688 T0.3735,0.771 T0.3655,0.7727 Q0.3606,0.7727,0.3534,0.7708 T0.3458,0.769 L0.3446,0.769 Q0.3414,0.769,0.3297,0.7713 T0.3149,0.7735 Q0.3092,0.7735,0.296,0.7771 T0.2771,0.7831 Q0.2683,0.7872,0.2554,0.7885 Q0.253,0.7889,0.2325,0.7897 T0.2032,0.7914 Q0.2008,0.7918,0.198,0.792 T0.194,0.7924 T0.1912,0.7928 T0.1888,0.793 T0.1867,0.7934 T0.1851,0.7943 T0.1843,0.7953 T0.1835,0.7968 T0.1823,0.7984 T0.1815,0.8001 Q0.1815,0.8022,0.1847,0.8032 T0.1932,0.8053 T0.2008,0.8071 Q0.2072,0.8092,0.2265,0.8092 Q0.2361,0.8092,0.2586,0.8088 L0.2635,0.8088 Q0.2731,0.8088,0.2795,0.8098 T0.2928,0.8134 T0.302,0.8167 Q0.306,0.8179,0.3277,0.8183 T0.3542,0.8221 Q0.359,0.8246,0.3622,0.8246 Q0.3639,0.8246,0.3675,0.8237 T0.3751,0.8229 Q0.3968,0.8229,0.4048,0.8275 Q0.4088,0.8291,0.4161,0.8291 Q0.4225,0.8291,0.4353,0.8275 Q0.4369,0.827,0.4394,0.827 Q0.4474,0.827,0.4675,0.8345 Q0.4707,0.8358,0.4739,0.8358 Q0.4755,0.8358,0.4799,0.8353 T0.4876,0.8349 Q0.494,0.8349,0.5012,0.8362 L0.5076,0.837 T0.5133,0.8376 T0.5181,0.8382 T0.5221,0.8391 L0.5253,0.8399 T0.5277,0.8409 L0.5293,0.8422 T0.5301,0.8438 L0.5301,0.8461 Q0.5301,0.8499,0.5249,0.8511 T0.5112,0.8526 T0.5004,0.8532 Q0.4964,0.854,0.4851,0.8546 T0.4667,0.8565 Q0.4578,0.8577,0.441,0.8577 L0.4345,0.8577 L0.4289,0.8577 L0.4209,0.8577 Q0.4153,0.8582,0.4088,0.8586 T0.3968,0.8592 T0.3855,0.8594 T0.3755,0.8596 T0.3675,0.86 T0.3622,0.8602 Q0.3317,0.8635,0.3237,0.8635 Q0.2996,0.8635,0.2996,0.8681 Q0.2996,0.8698,0.3032,0.8733 T0.3068,0.8797 L0.3068,0.8822 Q0.3052,0.8859,0.2859,0.8859 Q0.2787,0.8859,0.2739,0.8851 L0.2699,0.8851 Q0.2659,0.8851,0.259,0.888 T0.2498,0.8913 Q0.2394,0.8946,0.2056,0.8971 Q0.2032,0.8971,0.1928,0.9002 T0.1703,0.9034 Q0.1526,0.9034,0.1353,0.9067 T0.1173,0.915 L0.1173,0.9158 Q0.1173,0.9166,0.1177,0.9175 T0.1189,0.9191 T0.1205,0.9204 T0.1229,0.9212 T0.1257,0.922 T0.1285,0.9226 T0.1309,0.9231 T0.1337,0.9235 T0.1365,0.9237 L0.1446,0.9237 T0.1554,0.9243 T0.1614,0.9268 T0.1659,0.9293 T0.1743,0.9303 T0.1823,0.9316 Q0.1863,0.932,0.1912,0.9332 T0.2028,0.9361 T0.2153,0.939 Q0.2233,0.9411,0.2297,0.9448 T0.2386,0.9494 Q0.2426,0.9506,0.2506,0.9506 Q0.253,0.9506,0.2594,0.9504 T0.2699,0.9502 Q0.2763,0.9502,0.2819,0.9511 Q0.2851,0.9511,0.2871,0.9529 T0.2892,0.9573 Q0.2892,0.9627,0.2811,0.9635 Q0.2434,0.9652,0.2337,0.9672 Q0.2257,0.9693,0.2241,0.9693 Q0.2217,0.9693,0.2096,0.9689 L0.2056,0.9689 Q0.1976,0.9689,0.1924,0.9699 T0.1787,0.9741 L0.1647,0.9793 Q0.1518,0.983,0.1285,0.983 L0.1261,0.983 L0.1237,0.983 Q0.1124,0.983,0.1076,0.9838 Q0.102,0.9851,0.0839,0.9896 T0.0602,0.9954 T0.0406,0.9971 T0.0153,0.9979 L0.0032,0.9979 Z", type: 0 } }, "\\uE0CA": { type: 5, data: { d: "M0.9992,0.998 Q0.9992,1,0.9968,1 Q0.9521,1,0.9392,0.998 Q0.9335,0.997,0.9152,0.9921 T0.8913,0.9862 Q0.8873,0.9852,0.8783,0.9852 L0.8747,0.9852 L0.871,0.9852 Q0.8483,0.9852,0.8345,0.9812 Q0.8289,0.9792,0.8228,0.9773 T0.8135,0.9743 T0.8054,0.9723 T0.7948,0.9713 L0.7908,0.9713 L0.777,0.9713 T0.7656,0.9693 Q0.7616,0.9683,0.7498,0.9674 T0.7283,0.9664 L0.7186,0.9654 Q0.708,0.9644,0.708,0.9575 Q0.708,0.9545,0.7109,0.952 T0.7178,0.9486 L0.7315,0.9486 L0.7417,0.9486 L0.7502,0.9486 Q0.7575,0.9486,0.7599,0.9476 Q0.7616,0.9466,0.7685,0.9426 T0.7843,0.9377 Q0.7899,0.9357,0.8009,0.9332 T0.8175,0.9298 Q0.82,0.9288,0.8228,0.9283 T0.8277,0.9278 T0.8313,0.9273 T0.8341,0.9263 T0.8362,0.9258 Q0.8402,0.9219,0.854,0.9219 L0.8569,0.9219 L0.8597,0.9219 L0.8637,0.9219 Q0.88,0.9199,0.88,0.9159 L0.88,0.9149 Q0.88,0.913,0.8719,0.911 T0.852,0.9075 T0.8297,0.906 Q0.8224,0.906,0.8167,0.905 T0.8074,0.9031 T0.8001,0.9006 T0.794,0.8991 Q0.7599,0.8971,0.7494,0.8942 Q0.7461,0.8932,0.7397,0.8902 T0.7299,0.8872 L0.7267,0.8872 Q0.721,0.8882,0.7121,0.8882 Q0.6926,0.8882,0.691,0.8833 L0.691,0.8803 Q0.691,0.8773,0.6922,0.8749 T0.6955,0.8704 L0.6975,0.8684 Q0.6926,0.8655,0.6764,0.8655 Q0.6683,0.8655,0.6375,0.8625 Q0.6358,0.8625,0.629,0.862 T0.6148,0.8615 T0.5973,0.861 T0.5791,0.8605 L0.5718,0.8605 L0.5661,0.8605 L0.5596,0.8605 Q0.5426,0.8605,0.5337,0.8586 Q0.5264,0.8576,0.515,0.8571 T0.4996,0.8556 Q0.498,0.8556,0.4947,0.8551 T0.4882,0.8546 T0.4809,0.8541 T0.474,0.8531 T0.4692,0.8506 T0.4672,0.8467 Q0.4672,0.8437,0.468,0.8422 T0.4704,0.8398 T0.4736,0.8383 T0.4781,0.8368 T0.4838,0.8358 T0.4911,0.8353 T0.4988,0.8338 Q0.5069,0.8328,0.5142,0.8328 Q0.5174,0.8328,0.5215,0.8333 T0.5264,0.8338 Q0.5296,0.8338,0.532,0.8328 Q0.5523,0.8249,0.5604,0.8249 L0.5653,0.8249 Q0.5775,0.8269,0.5848,0.8269 Q0.5912,0.8269,0.5937,0.8259 Q0.6026,0.821,0.6253,0.821 Q0.6294,0.821,0.6334,0.822 T0.6383,0.8229 Q0.6399,0.8229,0.644,0.82 Q0.6504,0.817,0.6723,0.816 T0.6975,0.814 Q0.6999,0.814,0.7048,0.8121 T0.7129,0.8091 T0.7226,0.8071 T0.7372,0.8061 L0.7421,0.8061 Q0.7624,0.8071,0.7721,0.8071 Q0.7924,0.8071,0.7981,0.8051 Q0.8021,0.8032,0.807,0.8027 T0.8135,0.8017 T0.8151,0.8002 L0.8151,0.7992 Q0.8143,0.7962,0.8127,0.7957 T0.8045,0.7943 Q0.7997,0.7943,0.7964,0.7933 Q0.7883,0.7933,0.7676,0.7923 T0.7437,0.7903 Q0.7307,0.7893,0.7218,0.7844 Q0.7194,0.7834,0.7141,0.7819 L0.7036,0.7789 T0.693,0.7765 T0.6853,0.7755 Q0.6805,0.7755,0.6691,0.773 T0.6553,0.7705 Q0.6545,0.7705,0.6545,0.7715 Q0.6537,0.7715,0.65,0.7725 T0.6423,0.774 T0.635,0.7745 Q0.6294,0.7745,0.6257,0.773 T0.618,0.771 T0.6083,0.77 T0.601,0.7695 Q0.5985,0.7695,0.5921,0.769 T0.5795,0.7676 T0.5702,0.7666 Q0.5653,0.7656,0.5596,0.7616 T0.5539,0.7547 Q0.5539,0.7498,0.5645,0.7488 Q0.5693,0.7478,0.5852,0.7448 T0.6099,0.7418 L0.6148,0.7418 Q0.6196,0.7418,0.6253,0.7423 T0.6338,0.7428 L0.6399,0.7428 Q0.6431,0.7418,0.6488,0.7409 T0.6586,0.7394 T0.6659,0.7389 L0.6707,0.7389 Q0.6723,0.7399,0.6748,0.7399 Q0.6796,0.7399,0.6946,0.7389 T0.7161,0.7379 Q0.7251,0.7379,0.7478,0.7319 Q0.7494,0.7319,0.7539,0.7315 T0.762,0.73 T0.7697,0.727 T0.7818,0.723 T0.7948,0.7196 T0.7997,0.7151 Q0.7997,0.7141,0.7989,0.7132 Q0.7924,0.7062,0.7717,0.6978 T0.738,0.6894 Q0.7267,0.6894,0.717,0.6845 T0.7048,0.6795 Q0.6975,0.6785,0.6711,0.6766 T0.6431,0.6746 Q0.6415,0.6736,0.6144,0.6721 T0.5596,0.6686 T0.5247,0.6657 Q0.4996,0.6607,0.4874,0.6597 L0.4834,0.6597 Q0.4785,0.6597,0.4724,0.6607 T0.4631,0.6617 Q0.4574,0.6617,0.4501,0.6597 Q0.4088,0.6518,0.4006,0.6518 Q0.3933,0.6518,0.3901,0.6499 T0.3844,0.6479 T0.3739,0.6499 T0.3585,0.6518 L0.352,0.6518 Q0.3471,0.6508,0.335,0.6503 T0.3122,0.6494 T0.2912,0.6479 T0.2766,0.6449 Q0.2733,0.6439,0.2668,0.6439 Q0.2628,0.6439,0.2543,0.6444 T0.2425,0.6449 T0.2368,0.6439 L0.2344,0.6439 Q0.2336,0.6439,0.2283,0.6444 T0.2182,0.6449 Q0.2117,0.6449,0.2052,0.6439 Q0.1768,0.6409,0.1281,0.637 Q0.0989,0.634,0.0916,0.634 L0.0835,0.634 L0.0795,0.634 Q0.0722,0.634,0.0616,0.632 T0.0479,0.6301 Q0.0462,0.6301,0.0406,0.6306 T0.0308,0.6311 Q0.0032,0.6311,0.0008,0.6231 Q0,0.6202,0,0.6182 Q0,0.6083,0.0227,0.6083 Q0.03,0.6073,0.0422,0.6073 Q0.0487,0.6073,0.0608,0.6078 T0.0787,0.6083 Q0.0973,0.6083,0.103,0.6073 Q0.1062,0.6063,0.1131,0.6053 T0.1253,0.6039 T0.1375,0.6024 T0.1492,0.6014 L0.1533,0.6014 Q0.1598,0.6024,0.1723,0.6044 T0.189,0.6063 Q0.1906,0.6063,0.1922,0.6053 Q0.2214,0.6004,0.236,0.6004 Q0.2409,0.6004,0.2551,0.6009 T0.2741,0.6014 Q0.2782,0.6014,0.2859,0.6024 T0.2968,0.6034 Q0.3009,0.6034,0.3041,0.6024 Q0.3277,0.5905,0.356,0.5905 L0.3613,0.5905 L0.3666,0.5905 Q0.3731,0.5905,0.3755,0.5895 Q0.382,0.5856,0.3844,0.5846 T0.3938,0.5831 T0.4144,0.5826 T0.4428,0.5801 T0.4631,0.5776 L0.4663,0.5776 Q0.4704,0.5776,0.4785,0.5786 T0.4899,0.5796 Q0.4964,0.5796,0.5012,0.5767 Q0.5069,0.5737,0.5223,0.5737 Q0.5272,0.5737,0.5369,0.5742 T0.5499,0.5747 Q0.558,0.5747,0.5612,0.5737 Q0.5661,0.5717,0.5714,0.5712 T0.5835,0.5702 T0.5945,0.5692 T0.6018,0.5687 L0.6062,0.5687 T0.6095,0.5682 T0.6148,0.5678 Q0.6172,0.5668,0.6196,0.5653 T0.6245,0.5633 T0.631,0.5628 T0.6407,0.5638 T0.6504,0.5648 T0.6594,0.5638 T0.6675,0.5628 L0.6707,0.5628 L0.6861,0.5628 Q0.7364,0.5628,0.7494,0.5608 L0.7567,0.5608 L0.7652,0.5608 L0.7729,0.5608 Q0.7794,0.5608,0.7818,0.5589 Q0.7851,0.5569,0.7859,0.5559 Q0.7835,0.5539,0.7656,0.5519 Q0.7121,0.547,0.6975,0.543 Q0.6934,0.541,0.6853,0.5396 L0.6691,0.5366 T0.6525,0.5336 T0.6391,0.5312 Q0.6367,0.5302,0.6245,0.5257 T0.6034,0.5213 L0.5977,0.5213 Q0.5945,0.5223,0.5904,0.5223 Q0.5839,0.5223,0.5787,0.5208 T0.5685,0.5183 T0.5596,0.5173 Q0.558,0.5173,0.5552,0.5168 T0.5495,0.5163 L0.5434,0.5163 T0.5373,0.5158 T0.532,0.5148 T0.5284,0.5129 T0.5272,0.5104 L0.5272,0.5074 Q0.5304,0.5015,0.5377,0.499 T0.5629,0.4965 Q0.5734,0.4955,0.5811,0.4946 T0.5953,0.4916 T0.605,0.4896 Q0.6083,0.4886,0.6123,0.4886 Q0.6148,0.4886,0.6225,0.4891 T0.635,0.4896 L0.6456,0.4896 Q0.6837,0.4857,0.6861,0.4857 Q0.7226,0.4768,0.7283,0.4768 Q0.7307,0.4768,0.732,0.4773 T0.7372,0.4777 Q0.7502,0.4777,0.7721,0.4758 Q0.7753,0.4748,0.777,0.4738 Q0.7745,0.4718,0.768,0.4708 Q0.7599,0.4688,0.7445,0.4688 Q0.7405,0.4688,0.7324,0.4693 T0.721,0.4698 Q0.7056,0.4698,0.6999,0.4679 Q0.6861,0.4629,0.6626,0.4619 Q0.6586,0.4609,0.6533,0.4604 T0.6419,0.459 T0.6314,0.456 T0.6269,0.452 Q0.6269,0.451,0.6302,0.4491 Q0.6358,0.4451,0.6525,0.4416 T0.6788,0.4382 L0.6845,0.4382 L0.6902,0.4382 Q0.7064,0.4382,0.7145,0.4362 Q0.7202,0.4342,0.7307,0.4342 L0.7356,0.4342 L0.7409,0.4342 L0.7453,0.4342 Q0.7543,0.4342,0.7607,0.4332 Q0.7778,0.4313,0.7847,0.4288 T0.7932,0.4248 T0.7972,0.4169 T0.8045,0.4045 L0.8094,0.3986 T0.8135,0.3942 L0.8167,0.3912 T0.8191,0.3887 T0.8204,0.3867 T0.8208,0.3848 Q0.8208,0.3818,0.8167,0.3739 Q0.8127,0.3689,0.8054,0.3635 T0.7924,0.3556 T0.7778,0.3497 T0.768,0.3462 Q0.764,0.3442,0.7478,0.3427 T0.7267,0.3383 Q0.7234,0.3363,0.7044,0.3348 T0.6805,0.3323 L0.6764,0.3323 T0.6679,0.3328 T0.6586,0.3333 Q0.6521,0.3333,0.648,0.3314 Q0.6391,0.3264,0.6294,0.3264 Q0.6229,0.3264,0.6156,0.3294 Q0.6115,0.3304,0.6042,0.3304 Q0.5977,0.3304,0.5888,0.3289 T0.5738,0.3264 T0.5584,0.3225 L0.5491,0.3195 Q0.5418,0.3185,0.5162,0.3155 T0.4895,0.3121 T0.4826,0.3116 T0.4716,0.3111 T0.4607,0.3096 T0.4513,0.3066 T0.4477,0.3017 Q0.4477,0.2997,0.4485,0.2977 Q0.4526,0.2898,0.4611,0.2878 T0.4842,0.2859 Q0.4882,0.2859,0.4943,0.2864 T0.5028,0.2868 Q0.5118,0.2868,0.5215,0.2829 Q0.5401,0.276,0.5734,0.276 Q0.5831,0.276,0.5872,0.277 L0.5904,0.277 T0.5949,0.2745 T0.6034,0.272 Q0.631,0.269,0.6407,0.2661 Q0.6448,0.2641,0.6488,0.2641 T0.6573,0.2656 T0.6634,0.2671 Q0.6659,0.2671,0.6675,0.2651 Q0.6723,0.2601,0.6886,0.2552 T0.7137,0.2502 L0.7153,0.2502 L0.7178,0.2502 Q0.7218,0.2502,0.7279,0.2493 T0.7417,0.2468 T0.7526,0.2453 Q0.8208,0.2354,0.8281,0.2354 Q0.8337,0.2354,0.8394,0.2344 T0.8496,0.2315 T0.854,0.2265 Q0.854,0.2216,0.8443,0.2176 Q0.8354,0.2127,0.8216,0.2102 T0.7972,0.2072 T0.777,0.2067 T0.7648,0.2057 Q0.7632,0.2047,0.7498,0.2038 T0.7202,0.2018 T0.6983,0.1998 Q0.6918,0.1998,0.676,0.1949 T0.6537,0.1899 Q0.6496,0.1899,0.6472,0.1919 Q0.6342,0.1968,0.6123,0.1968 Q0.5961,0.1968,0.5912,0.1929 Q0.5904,0.1919,0.5892,0.1919 T0.5823,0.1944 T0.5722,0.1968 T0.5637,0.1949 Q0.5556,0.1909,0.5158,0.1869 Q0.5109,0.1869,0.5032,0.1835 T0.4915,0.18 Q0.4907,0.18,0.4891,0.181 Q0.4793,0.182,0.455,0.182 Q0.4177,0.182,0.4015,0.1771 Q0.3901,0.1741,0.3779,0.1741 Q0.3747,0.1741,0.369,0.1746 T0.3609,0.1751 Q0.3569,0.1751,0.3536,0.1741 Q0.3512,0.1741,0.3459,0.1736 T0.3358,0.1726 T0.3256,0.1716 T0.3167,0.1696 T0.3106,0.1662 Q0.3082,0.1632,0.3082,0.1592 Q0.3082,0.1543,0.3114,0.1508 T0.3204,0.1474 L0.3236,0.1474 Q0.3301,0.1494,0.3333,0.1494 Q0.339,0.1494,0.3496,0.1454 Q0.3674,0.1385,0.3869,0.1385 Q0.395,0.1385,0.4011,0.137 T0.4116,0.1355 T0.4197,0.1375 T0.425,0.1395 Q0.429,0.1395,0.4355,0.1365 Q0.4631,0.1266,0.4882,0.1266 Q0.5126,0.1266,0.5337,0.1246 Q0.5369,0.1246,0.5458,0.1207 T0.5661,0.1167 L0.5693,0.1167 Q0.5791,0.1177,0.5852,0.1187 T0.5921,0.1197 Q0.5945,0.1197,0.6002,0.1167 Q0.6026,0.1147,0.605,0.1123 T0.6091,0.1093 T0.6156,0.1088 T0.6318,0.1098 Q0.6456,0.1108,0.6569,0.1137 T0.6707,0.1167 Q0.674,0.1167,0.6772,0.1147 Q0.6821,0.1108,0.6946,0.1083 T0.721,0.1044 T0.7453,0.1029 L0.7526,0.1029 Q0.7583,0.1039,0.7652,0.1053 T0.7753,0.1068 Q0.7778,0.1068,0.7802,0.1058 Q0.7981,0.1019,0.8143,0.1019 Q0.8175,0.1019,0.8439,0.0964 T0.8735,0.091 Q0.8759,0.091,0.8836,0.089 T0.8938,0.0851 Q0.8929,0.0841,0.8905,0.0841 Q0.8832,0.0821,0.8735,0.0821 Q0.8694,0.0821,0.8629,0.0826 T0.854,0.0831 Q0.8508,0.0831,0.8491,0.0821 Q0.8475,0.0821,0.8171,0.0811 T0.7802,0.0781 T0.7571,0.0737 T0.7332,0.0712 Q0.7299,0.0712,0.7247,0.0717 T0.7161,0.0722 L0.7064,0.0722 Q0.7032,0.0712,0.7003,0.0707 T0.6959,0.0692 T0.693,0.0678 T0.6914,0.0663 T0.6902,0.0648 T0.689,0.0643 L0.6869,0.0643 L0.6845,0.0643 L0.6821,0.0643 Q0.6553,0.0643,0.6553,0.0554 T0.6796,0.0465 L0.6813,0.0465 L0.6845,0.0465 Q0.6918,0.0425,0.717,0.0376 Q0.7226,0.0366,0.7267,0.0356 T0.7324,0.0336 T0.7376,0.0317 T0.747,0.0297 Q0.7518,0.0287,0.7551,0.0287 T0.762,0.0297 T0.768,0.0307 L0.7729,0.0307 Q0.7802,0.0277,0.7997,0.0267 T0.8224,0.0237 Q0.8273,0.0227,0.8341,0.0223 T0.8475,0.0193 T0.8654,0.0143 T0.8873,0.0079 Q0.9002,0.003,0.9331,0.004 T0.97,0.004 Q0.9838,0,0.9976,0.001 Q1,0.001,1,0.003 Z M0.9935,0.996 L0.9951,0.0049 Q0.9822,0.0049,0.9716,0.0079 Q0.9659,0.0099,0.9327,0.0089 T0.8897,0.0119 Q0.8775,0.0158,0.8666,0.0183 T0.85,0.0237 Q0.8418,0.0267,0.8341,0.0272 T0.8248,0.0277 Q0.82,0.0297,0.8001,0.0312 T0.7745,0.0346 Q0.7697,0.0356,0.7664,0.0356 Q0.764,0.0356,0.7603,0.0341 T0.7534,0.0326 Q0.751,0.0326,0.7478,0.0336 Q0.7429,0.0346,0.7397,0.0356 T0.7344,0.0376 T0.7283,0.0401 T0.7178,0.0425 Q0.6926,0.0465,0.6878,0.0495 Q0.6845,0.0514,0.6764,0.0514 L0.6723,0.0514 L0.6691,0.0514 Q0.6602,0.0514,0.6602,0.0554 Q0.6602,0.0574,0.6659,0.0579 T0.6796,0.0589 T0.691,0.0603 T0.6967,0.0643 T0.7072,0.0673 Q0.7121,0.0682,0.7153,0.0682 T0.7238,0.0678 T0.7332,0.0673 Q0.7413,0.0673,0.7579,0.0692 T0.7818,0.0742 Q0.7867,0.0752,0.8171,0.0762 T0.8508,0.0781 L0.852,0.0781 T0.8601,0.0776 T0.8719,0.0772 Q0.8832,0.0772,0.8921,0.0791 Q0.8994,0.0811,0.8994,0.0841 T0.8933,0.0895 T0.8812,0.094 T0.8735,0.0959 T0.8451,0.1014 T0.8143,0.1068 Q0.7989,0.1068,0.7818,0.1098 Q0.7778,0.1108,0.7745,0.1108 T0.768,0.1103 T0.7603,0.1088 T0.7518,0.1068 L0.7461,0.1068 Q0.7315,0.1068,0.7088,0.1103 T0.6805,0.1177 Q0.6756,0.1207,0.6699,0.1207 Q0.6667,0.1207,0.6545,0.1177 T0.631,0.1147 Q0.6269,0.1137,0.6225,0.1133 T0.616,0.1128 L0.6123,0.1128 T0.6103,0.1133 L0.6083,0.1157 T0.6034,0.1197 Q0.5961,0.1246,0.5921,0.1246 Q0.5904,0.1246,0.5835,0.1231 T0.5693,0.1217 L0.5661,0.1217 Q0.558,0.1217,0.5535,0.1231 T0.5446,0.1266 T0.5345,0.1296 Q0.5126,0.1316,0.4882,0.1316 T0.438,0.1405 Q0.4298,0.1434,0.425,0.1434 Q0.4209,0.1434,0.4173,0.1419 T0.4112,0.1405 T0.4027,0.1419 T0.3869,0.1434 Q0.3682,0.1434,0.3512,0.1494 Q0.3398,0.1533,0.3333,0.1533 Q0.3285,0.1533,0.3228,0.1513 L0.3212,0.1513 Q0.3179,0.1513,0.3155,0.1538 T0.3131,0.1592 Q0.3131,0.1612,0.3147,0.1632 Q0.3171,0.1652,0.3232,0.1667 T0.3406,0.1691 T0.3544,0.1701 L0.3601,0.1701 L0.3678,0.1701 L0.3771,0.1701 Q0.3909,0.1701,0.4031,0.1731 Q0.4177,0.178,0.4558,0.178 Q0.4793,0.178,0.4882,0.1761 L0.4915,0.1761 Q0.498,0.1761,0.5061,0.179 T0.5158,0.183 Q0.5166,0.183,0.5231,0.1835 T0.5341,0.1845 T0.545,0.1855 T0.5572,0.1874 T0.5661,0.1909 Q0.5677,0.1919,0.5702,0.1919 T0.5791,0.1894 T0.588,0.1869 Q0.5921,0.1869,0.5945,0.1899 Q0.5977,0.1919,0.6123,0.1919 Q0.6334,0.1919,0.6448,0.1879 Q0.6488,0.186,0.6537,0.186 Q0.6626,0.186,0.6784,0.1909 T0.6983,0.1958 Q0.704,0.1968,0.7206,0.1973 T0.7506,0.1993 T0.7689,0.2018 L0.7705,0.2018 L0.7741,0.2018 L0.7786,0.2018 Q0.8248,0.2018,0.8475,0.2136 Q0.8597,0.2196,0.8597,0.2255 T0.8483,0.2359 T0.8281,0.2404 Q0.8208,0.2404,0.7534,0.2493 Q0.7502,0.2502,0.7425,0.2512 T0.7287,0.2532 T0.7178,0.2542 L0.7153,0.2542 L0.7137,0.2542 Q0.7064,0.2542,0.6906,0.2591 T0.6715,0.2681 T0.6626,0.272 Q0.6594,0.272,0.6541,0.2705 T0.6464,0.269 T0.6431,0.27 Q0.6318,0.273,0.6034,0.276 Q0.6018,0.276,0.5998,0.2774 T0.5957,0.2799 T0.5904,0.2809 L0.5856,0.2809 Q0.5823,0.2799,0.575,0.2799 Q0.541,0.2799,0.5239,0.2868 Q0.5134,0.2908,0.5028,0.2908 Q0.4996,0.2908,0.4935,0.2903 T0.4842,0.2898 Q0.4704,0.2898,0.4635,0.2918 T0.4534,0.2997 L0.4534,0.3007 Q0.4534,0.3037,0.459,0.3046 T0.4753,0.3066 T0.4899,0.3076 Q0.4907,0.3076,0.5166,0.3106 T0.5507,0.3155 Q0.5921,0.3264,0.605,0.3264 Q0.6107,0.3264,0.6131,0.3254 Q0.6212,0.3225,0.6294,0.3225 Q0.6407,0.3225,0.6513,0.3274 Q0.6529,0.3294,0.6569,0.3294 Q0.6594,0.3294,0.665,0.3284 T0.6748,0.3274 T0.6821,0.3284 Q0.6861,0.3294,0.6967,0.3299 T0.7165,0.3314 T0.7299,0.3343 Q0.7324,0.3363,0.7486,0.3383 T0.7697,0.3422 Q0.7713,0.3432,0.7774,0.3452 T0.7887,0.3492 T0.8005,0.3546 T0.8127,0.3625 T0.8208,0.3719 Q0.8256,0.3798,0.8256,0.3848 Q0.8256,0.3877,0.8236,0.3902 T0.8171,0.3976 T0.809,0.4075 T0.8021,0.4189 T0.7968,0.4273 T0.7867,0.4322 T0.7616,0.4382 Q0.7543,0.4392,0.7437,0.4392 L0.7364,0.4392 L0.7299,0.4392 Q0.7202,0.4392,0.7161,0.4402 Q0.7072,0.4431,0.691,0.4431 L0.6845,0.4431 L0.6788,0.4431 Q0.6707,0.4431,0.6545,0.4461 T0.6334,0.452 Q0.6399,0.456,0.6626,0.457 Q0.6878,0.458,0.7024,0.4639 Q0.7064,0.4649,0.7186,0.4649 L0.7295,0.4649 L0.7413,0.4649 Q0.7591,0.4649,0.7697,0.4669 Q0.7818,0.4688,0.7818,0.4728 Q0.7818,0.4748,0.7798,0.4763 T0.7753,0.4787 L0.7737,0.4797 L0.7729,0.4797 Q0.7494,0.4827,0.7388,0.4827 Q0.7332,0.4827,0.7307,0.4817 L0.7291,0.4817 Q0.7226,0.4817,0.6878,0.4896 Q0.6829,0.4906,0.6772,0.4911 T0.6618,0.4921 T0.646,0.4931 T0.6342,0.4936 T0.6212,0.4931 T0.6115,0.4926 Q0.6083,0.4926,0.6058,0.4931 T0.5969,0.4955 T0.5819,0.499 T0.5629,0.5005 Q0.5572,0.5005,0.5527,0.501 T0.545,0.502 T0.5397,0.503 T0.5361,0.5045 T0.5337,0.5064 T0.5328,0.5094 L0.532,0.5094 Q0.532,0.5104,0.5337,0.5109 T0.5381,0.5114 T0.5438,0.5119 T0.5515,0.5124 L0.5604,0.5124 Q0.5661,0.5134,0.5746,0.5153 T0.5912,0.5173 L0.5977,0.5173 L0.6026,0.5173 Q0.6139,0.5173,0.6273,0.5218 T0.6407,0.5272 Q0.6448,0.5282,0.6683,0.5321 T0.6991,0.5381 Q0.7137,0.543,0.7664,0.548 Q0.7908,0.55,0.7908,0.5559 Q0.7908,0.5589,0.7859,0.5628 Q0.781,0.5658,0.7713,0.5658 Q0.7689,0.5658,0.7628,0.5653 T0.7543,0.5648 T0.7502,0.5658 Q0.7364,0.5678,0.6878,0.5678 Q0.674,0.5678,0.6699,0.5668 L0.6683,0.5668 Q0.6659,0.5668,0.6606,0.5678 T0.6513,0.5687 Q0.6464,0.5687,0.6391,0.5678 Q0.6334,0.5668,0.6302,0.5668 T0.6241,0.5687 T0.6164,0.5717 Q0.6123,0.5727,0.6099,0.5727 L0.6062,0.5727 T0.6022,0.5732 T0.5953,0.5737 Q0.5904,0.5747,0.5839,0.5747 T0.5726,0.5752 T0.5629,0.5776 T0.5458,0.5796 Q0.5418,0.5796,0.5324,0.5791 T0.5191,0.5786 Q0.5077,0.5786,0.5045,0.5806 Q0.498,0.5836,0.4899,0.5836 Q0.4858,0.5836,0.4777,0.5826 T0.4655,0.5816 L0.4631,0.5816 Q0.4582,0.5816,0.4436,0.5841 T0.4144,0.5865 L0.4051,0.5865 L0.3986,0.5865 T0.3933,0.587 T0.3897,0.5875 T0.3869,0.5885 T0.3844,0.5895 T0.3812,0.591 T0.3779,0.5925 Q0.3739,0.5955,0.3633,0.5955 L0.3585,0.5955 L0.3536,0.5955 Q0.3277,0.5955,0.3066,0.6053 Q0.3017,0.6083,0.296,0.6083 Q0.2912,0.6083,0.2839,0.6068 T0.2741,0.6053 Q0.2693,0.6053,0.2547,0.6048 T0.236,0.6044 Q0.2222,0.6044,0.193,0.6103 L0.1882,0.6103 Q0.1825,0.6103,0.1703,0.6083 T0.1525,0.6063 L0.15,0.6063 Q0.1436,0.6063,0.135,0.6073 T0.1168,0.6098 T0.1038,0.6113 Q0.0973,0.6123,0.0787,0.6123 L0.06,0.6123 L0.0414,0.6123 L0.0235,0.6123 Q0.0049,0.6133,0.0049,0.6172 L0.0057,0.6222 Q0.0073,0.6261,0.043,0.6261 L0.0454,0.6261 L0.0479,0.6261 Q0.0527,0.6261,0.0633,0.6281 T0.0803,0.6301 L0.0835,0.6301 L0.0916,0.6301 Q0.0998,0.6301,0.129,0.632 Q0.1768,0.636,0.206,0.64 Q0.2117,0.6409,0.2165,0.6409 Q0.2206,0.6409,0.2263,0.6405 T0.2336,0.64 L0.2384,0.64 L0.2409,0.64 T0.251,0.6395 T0.2644,0.639 Q0.2741,0.639,0.279,0.6409 Q0.283,0.6429,0.2972,0.6439 T0.3293,0.6459 T0.3528,0.6469 L0.3577,0.6469 Q0.3642,0.6469,0.3723,0.6449 T0.3844,0.6429 Q0.3901,0.6429,0.3933,0.6454 T0.4006,0.6479 Q0.4088,0.6479,0.4517,0.6558 Q0.4582,0.6568,0.4623,0.6568 Q0.4655,0.6568,0.4716,0.6563 T0.4826,0.6558 L0.4882,0.6558 Q0.5004,0.6558,0.5255,0.6607 Q0.5328,0.6627,0.5604,0.6647 T0.6152,0.6682 T0.644,0.6696 T0.6719,0.6721 T0.7056,0.6756 Q0.7113,0.6756,0.7198,0.6805 T0.738,0.6855 Q0.7453,0.6855,0.7551,0.6879 T0.7741,0.6939 T0.7912,0.7018 T0.8029,0.7102 Q0.8054,0.7132,0.8054,0.7151 Q0.8054,0.7191,0.8009,0.7216 T0.7908,0.7255 T0.779,0.7285 T0.7721,0.731 Q0.7672,0.7329,0.7632,0.7339 T0.7551,0.7354 T0.7486,0.7369 Q0.7478,0.7369,0.7445,0.7379 T0.7388,0.7394 T0.7324,0.7404 L0.7242,0.7413 T0.7161,0.7418 Q0.7105,0.7418,0.6955,0.7428 T0.6748,0.7438 L0.6699,0.7438 L0.6667,0.7438 Q0.6659,0.7438,0.6407,0.7468 Q0.6367,0.7478,0.6334,0.7478 T0.6245,0.7468 T0.6148,0.7458 L0.6099,0.7458 Q0.6018,0.7468,0.5864,0.7498 T0.5653,0.7532 T0.5596,0.7557 Q0.5596,0.7596,0.571,0.7616 Q0.5742,0.7626,0.5803,0.7631 T0.5929,0.7641 T0.6018,0.7656 L0.6087,0.7656 T0.6192,0.7666 T0.6277,0.7695 Q0.631,0.7705,0.6342,0.7705 Q0.6383,0.7705,0.6452,0.7685 T0.6537,0.7666 L0.6553,0.7666 Q0.6602,0.7666,0.6711,0.769 T0.6853,0.7715 Q0.691,0.7715,0.7048,0.775 T0.7242,0.7814 Q0.7324,0.7854,0.7445,0.7864 Q0.7478,0.7864,0.768,0.7873 T0.7972,0.7893 Q0.7989,0.7893,0.8017,0.7898 T0.8054,0.7903 L0.8082,0.7903 T0.811,0.7908 T0.8131,0.7913 T0.8151,0.7918 L0.8167,0.7928 T0.8179,0.7943 T0.8191,0.7957 T0.8204,0.7977 T0.8208,0.8002 Q0.8208,0.8032,0.8171,0.8051 T0.8074,0.8081 T0.7997,0.8091 Q0.7932,0.8121,0.7737,0.8121 Q0.7664,0.8121,0.7413,0.8111 L0.7364,0.8111 Q0.7275,0.8111,0.7214,0.8121 T0.7084,0.8155 T0.6991,0.819 Q0.6934,0.82,0.6723,0.8205 T0.6472,0.8239 Q0.6423,0.8269,0.6375,0.8269 Q0.6358,0.8269,0.6338,0.8264 T0.6294,0.8254 T0.6253,0.8249 Q0.6042,0.8249,0.5961,0.8289 Q0.5921,0.8318,0.5839,0.8318 Q0.5783,0.8318,0.5645,0.8299 L0.5604,0.8299 Q0.5531,0.8299,0.5337,0.8368 Q0.5296,0.8378,0.5255,0.8378 Q0.5239,0.8378,0.5195,0.8373 T0.5118,0.8368 Q0.5061,0.8368,0.4996,0.8388 Q0.4947,0.8388,0.4882,0.8398 Q0.4777,0.8417,0.4753,0.8427 T0.4728,0.8467 Q0.4728,0.8487,0.4769,0.8492 T0.4886,0.8501 T0.5004,0.8516 Q0.5036,0.8516,0.515,0.8521 T0.5345,0.8546 Q0.5426,0.8556,0.5596,0.8556 L0.5649,0.8556 L0.5702,0.8556 L0.5791,0.8556 Q0.5921,0.8566,0.6135,0.8571 T0.6383,0.8586 Q0.6683,0.8615,0.6764,0.8615 L0.6776,0.8615 L0.6788,0.8615 Q0.7032,0.8615,0.7032,0.8684 Q0.7032,0.8714,0.6995,0.8749 T0.6959,0.8803 L0.6959,0.8813 Q0.6991,0.8843,0.7153,0.8843 Q0.7218,0.8843,0.7259,0.8833 L0.7299,0.8833 Q0.7324,0.8833,0.7348,0.8838 T0.7393,0.8848 T0.7433,0.8863 L0.7474,0.8882 T0.751,0.8892 Q0.7616,0.8922,0.7948,0.8952 Q0.7981,0.8952,0.8082,0.8981 T0.8297,0.9011 T0.8528,0.9026 T0.8747,0.907 T0.8856,0.9149 L0.8856,0.9159 Q0.8856,0.9179,0.8848,0.9189 T0.8828,0.9209 T0.88,0.9228 T0.8767,0.9243 T0.8731,0.9248 T0.8698,0.9253 T0.8666,0.9258 L0.8646,0.9258 Q0.8621,0.9258,0.8577,0.9263 T0.85,0.9268 T0.8439,0.9273 T0.8402,0.9278 Q0.8386,0.9298,0.8358,0.9308 T0.8305,0.9322 T0.8244,0.9332 T0.8183,0.9337 Q0.8135,0.9347,0.8025,0.9372 T0.7859,0.9416 Q0.7778,0.9436,0.7717,0.9471 T0.7624,0.9515 Q0.7575,0.9535,0.7486,0.9535 Q0.7461,0.9535,0.7397,0.953 T0.7291,0.9525 Q0.7234,0.9525,0.7186,0.953 T0.7137,0.957 T0.7194,0.9614 Q0.7567,0.9634,0.7664,0.9654 Q0.7745,0.9674,0.7762,0.9674 L0.7908,0.9674 Q0.7924,0.9664,0.7948,0.9664 Q0.8029,0.9664,0.8082,0.9679 T0.8224,0.9723 T0.8362,0.9773 Q0.8483,0.9812,0.871,0.9812 L0.8751,0.9812 Q0.8873,0.9812,0.8929,0.9822 T0.9165,0.9876 T0.9408,0.9931 Q0.9513,0.996,0.9935,0.996 Z M0.9968,0.998 L0.9976,0.003 Q0.9838,0.002,0.9708,0.0059 Q0.9659,0.0069,0.9327,0.0059 T0.8881,0.0099 Q0.8767,0.0138,0.8658,0.0163 T0.8491,0.0218 Q0.8418,0.0247,0.8341,0.0247 T0.8232,0.0257 Q0.8191,0.0277,0.7997,0.0292 T0.7737,0.0326 Q0.7697,0.0336,0.7672,0.0336 T0.7612,0.0321 T0.7543,0.0307 T0.747,0.0317 Q0.7397,0.0326,0.7336,0.0356 T0.717,0.0406 Q0.6918,0.0445,0.6861,0.0475 Q0.6845,0.0485,0.6772,0.0485 T0.6638,0.05 T0.6577,0.0549 T0.6642,0.0598 T0.6796,0.0613 T0.6902,0.0623 Q0.691,0.0623,0.6946,0.0658 T0.7064,0.0702 L0.7161,0.0702 Q0.7194,0.0702,0.7242,0.0697 T0.7332,0.0692 Q0.7413,0.0692,0.7579,0.0717 T0.781,0.0762 Q0.7867,0.0781,0.8171,0.0786 T0.85,0.0801 L0.8532,0.0801 Q0.8548,0.0801,0.8613,0.0796 T0.8727,0.0791 Q0.8832,0.0791,0.8913,0.0811 Q0.897,0.0831,0.897,0.0851 Q0.897,0.088,0.8873,0.0905 T0.8735,0.093 Q0.871,0.093,0.8447,0.0984 T0.8143,0.1039 Q0.7981,0.1039,0.781,0.1078 Q0.7778,0.1088,0.7745,0.1088 T0.7644,0.1073 T0.7518,0.1048 L0.7453,0.1048 Q0.7299,0.1048,0.7076,0.1083 T0.6788,0.1157 Q0.6748,0.1187,0.6699,0.1187 Q0.6675,0.1187,0.6557,0.1157 T0.6318,0.1118 Q0.6164,0.1108,0.6135,0.1108 T0.6095,0.1113 T0.6067,0.1142 T0.6018,0.1187 Q0.5953,0.1227,0.5921,0.1227 Q0.5904,0.1227,0.5839,0.1212 T0.5693,0.1187 L0.5661,0.1187 Q0.558,0.1187,0.5527,0.1207 T0.5434,0.1246 T0.5337,0.1266 Q0.5126,0.1296,0.4882,0.1296 T0.4371,0.1385 Q0.4298,0.1414,0.425,0.1414 Q0.4225,0.1414,0.4189,0.1395 T0.4112,0.1375 Q0.4079,0.1375,0.4019,0.1395 T0.3869,0.1414 Q0.3682,0.1414,0.3504,0.1474 Q0.3398,0.1513,0.3333,0.1513 Q0.3293,0.1513,0.3228,0.1494 L0.3204,0.1494 Q0.3179,0.1494,0.3155,0.1508 T0.3118,0.1543 T0.3106,0.1592 T0.3127,0.1642 T0.32,0.1677 T0.3305,0.1701 T0.3435,0.1716 T0.3544,0.1721 Q0.3569,0.1731,0.3601,0.1731 Q0.3625,0.1731,0.3686,0.1726 T0.3779,0.1721 Q0.3901,0.1721,0.4023,0.1751 Q0.4177,0.18,0.455,0.18 Q0.4793,0.18,0.4882,0.178 L0.4915,0.178 Q0.4964,0.178,0.5045,0.1815 T0.5158,0.185 Q0.5564,0.1889,0.5645,0.1929 Q0.5677,0.1939,0.571,0.1939 Q0.575,0.1939,0.5807,0.1919 T0.5888,0.1899 T0.5929,0.1909 Q0.5969,0.1949,0.6123,0.1949 Q0.6334,0.1949,0.6456,0.1899 Q0.6488,0.1879,0.6537,0.1879 Q0.661,0.1879,0.6772,0.1929 T0.6983,0.1978 Q0.704,0.1988,0.7206,0.1998 T0.7502,0.2018 T0.7664,0.2038 Q0.7672,0.2038,0.7818,0.2043 T0.8151,0.2067 T0.8459,0.2156 Q0.8573,0.2206,0.8573,0.2255 Q0.8573,0.2295,0.8516,0.2324 T0.8394,0.2369 T0.8281,0.2384 Q0.8208,0.2384,0.7526,0.2473 Q0.7494,0.2483,0.7421,0.2493 T0.7287,0.2512 T0.7178,0.2522 L0.7153,0.2522 L0.7137,0.2522 Q0.7056,0.2522,0.6898,0.2572 T0.6691,0.2671 Q0.6667,0.269,0.6634,0.269 Q0.661,0.269,0.6557,0.2681 T0.6472,0.2671 Q0.6448,0.2671,0.6415,0.2681 Q0.631,0.271,0.6034,0.274 Q0.5994,0.274,0.5961,0.2765 T0.5904,0.2789 L0.5864,0.2789 Q0.5831,0.2779,0.5742,0.2779 Q0.541,0.2779,0.5223,0.2849 Q0.5126,0.2888,0.5028,0.2888 Q0.5004,0.2888,0.4943,0.2883 T0.4842,0.2878 Q0.4704,0.2878,0.4627,0.2898 T0.4509,0.2987 Q0.4501,0.2997,0.4501,0.3007 Q0.4501,0.3046,0.4574,0.3066 T0.4765,0.3091 T0.4899,0.3096 Q0.4931,0.3106,0.5061,0.3121 T0.5316,0.315 T0.5499,0.3175 Q0.5507,0.3175,0.5572,0.3195 T0.5685,0.3225 T0.5803,0.3254 T0.5933,0.3279 T0.605,0.3284 T0.6148,0.3274 Q0.6221,0.3244,0.6294,0.3244 Q0.6399,0.3244,0.6496,0.3294 Q0.6529,0.3314,0.6577,0.3314 Q0.6602,0.3314,0.6663,0.3304 T0.6756,0.3294 T0.6813,0.3304 Q0.6837,0.3304,0.6873,0.3309 L0.6946,0.3318 T0.7024,0.3323 T0.7105,0.3328 T0.7178,0.3338 T0.7238,0.3348 T0.7283,0.3363 Q0.7324,0.3383,0.7482,0.3403 T0.7689,0.3442 Q0.7697,0.3442,0.779,0.3477 T0.794,0.3536 T0.8074,0.3615 T0.8183,0.3729 Q0.8232,0.3808,0.8232,0.3848 Q0.8232,0.3867,0.8216,0.3892 T0.8151,0.3961 T0.8062,0.406 T0.7997,0.4179 T0.7952,0.4263 T0.7855,0.4308 T0.7616,0.4362 Q0.7543,0.4372,0.7445,0.4372 L0.7372,0.4372 L0.7307,0.4372 Q0.7202,0.4372,0.7153,0.4382 Q0.7064,0.4402,0.691,0.4402 L0.6845,0.4402 L0.6788,0.4402 Q0.6699,0.4402,0.6533,0.4436 T0.6318,0.451 Q0.6302,0.451,0.6302,0.452 Q0.6302,0.457,0.6626,0.459 Q0.6869,0.4609,0.7015,0.4659 Q0.7064,0.4669,0.7202,0.4669 L0.7311,0.4669 L0.7429,0.4669 Q0.7599,0.4669,0.7689,0.4688 Q0.7794,0.4708,0.7794,0.4738 L0.7786,0.4748 T0.777,0.4763 T0.7749,0.4773 L0.7737,0.4777 L0.7729,0.4777 Q0.7502,0.4797,0.738,0.4797 L0.7315,0.4797 L0.7291,0.4797 Q0.7226,0.4797,0.6869,0.4876 Q0.6821,0.4886,0.6768,0.4891 T0.6614,0.4901 T0.6456,0.4916 L0.6342,0.4916 Q0.6294,0.4916,0.6217,0.4911 T0.6115,0.4906 Q0.6083,0.4906,0.6054,0.4911 T0.5961,0.4936 T0.5815,0.4965 T0.5629,0.4985 Q0.5507,0.4985,0.5442,0.4995 T0.5345,0.5025 T0.5304,0.5084 L0.5296,0.5094 Q0.5296,0.5114,0.5316,0.5124 T0.5373,0.5138 T0.5442,0.5143 L0.5523,0.5143 L0.5604,0.5143 Q0.5637,0.5153,0.5677,0.5158 T0.5742,0.5173 T0.5811,0.5188 T0.5904,0.5193 L0.5977,0.5193 L0.6026,0.5193 Q0.6107,0.5193,0.6168,0.5208 T0.6294,0.5252 T0.6399,0.5292 Q0.6448,0.5302,0.6679,0.5341 T0.6983,0.541 Q0.7129,0.545,0.7664,0.55 Q0.7883,0.5519,0.7883,0.5559 Q0.7883,0.5579,0.7843,0.5608 T0.7721,0.5638 Q0.7697,0.5638,0.764,0.5633 T0.7559,0.5628 L0.7502,0.5628 Q0.7364,0.5648,0.6869,0.5648 L0.6699,0.5648 L0.6675,0.5648 Q0.665,0.5648,0.6602,0.5658 T0.6513,0.5668 Q0.6464,0.5668,0.6399,0.5658 Q0.6342,0.5648,0.6302,0.5648 T0.6225,0.5668 T0.6156,0.5697 Q0.6107,0.5707,0.6087,0.5707 T0.6034,0.5712 T0.5953,0.5717 Q0.5904,0.5727,0.5835,0.5727 T0.5718,0.5732 T0.562,0.5757 Q0.558,0.5767,0.5483,0.5767 L0.5349,0.5767 L0.5207,0.5767 Q0.5069,0.5767,0.5028,0.5786 Q0.4972,0.5816,0.4899,0.5816 Q0.4858,0.5816,0.4781,0.5806 T0.4663,0.5796 L0.4631,0.5796 Q0.4582,0.5796,0.4432,0.5821 T0.4144,0.5846 L0.4071,0.5846 L0.4011,0.5846 T0.3958,0.5851 T0.3921,0.5856 T0.3889,0.5861 T0.3865,0.5865 T0.384,0.5875 L0.382,0.5885 L0.3796,0.5895 L0.3771,0.5905 Q0.3731,0.5925,0.365,0.5925 L0.3601,0.5925 L0.3552,0.5925 Q0.3277,0.5925,0.3049,0.6044 Q0.3017,0.6053,0.296,0.6053 Q0.292,0.6053,0.2847,0.6044 T0.2741,0.6034 Q0.2693,0.6034,0.2547,0.6029 T0.236,0.6024 Q0.2222,0.6024,0.1922,0.6073 Q0.1906,0.6083,0.1882,0.6083 Q0.1833,0.6083,0.1711,0.6063 T0.1533,0.6044 Q0.1517,0.6034,0.1492,0.6034 Q0.1436,0.6034,0.135,0.6048 T0.1168,0.6078 T0.103,0.6093 Q0.0973,0.6103,0.0787,0.6103 L0.0604,0.6103 L0.0414,0.6103 L0.0235,0.6103 Q0.0024,0.6113,0.0024,0.6172 Q0.0024,0.6192,0.0032,0.6231 Q0.0049,0.6281,0.0333,0.6281 L0.0414,0.6281 L0.0479,0.6281 Q0.0519,0.6281,0.0624,0.6301 T0.0803,0.632 L0.0835,0.632 L0.0916,0.632 Q0.0989,0.632,0.1281,0.634 L0.206,0.6419 Q0.2117,0.6429,0.2174,0.6429 Q0.2214,0.6429,0.2271,0.6424 T0.2344,0.6419 L0.2376,0.6419 Q0.2393,0.6429,0.2417,0.6429 T0.2526,0.6419 T0.2652,0.6409 Q0.2741,0.6409,0.2782,0.6429 T0.2968,0.6459 T0.3293,0.6479 T0.352,0.6489 Q0.3552,0.6499,0.3585,0.6499 Q0.365,0.6499,0.3731,0.6474 T0.3844,0.6449 Q0.3885,0.6449,0.3917,0.6474 T0.4006,0.6499 Q0.4088,0.6499,0.4509,0.6578 Q0.4574,0.6588,0.4631,0.6588 Q0.4655,0.6588,0.4716,0.6583 T0.4834,0.6578 L0.4874,0.6578 Q0.5004,0.6588,0.5255,0.6637 Q0.532,0.6647,0.56,0.6667 T0.6148,0.6701 T0.644,0.6716 Q0.6464,0.6726,0.6594,0.6736 T0.6861,0.6756 T0.7048,0.6775 Q0.7097,0.6775,0.7186,0.6825 T0.738,0.6874 Q0.7518,0.6874,0.7729,0.6958 T0.8005,0.7122 Q0.8029,0.7141,0.8029,0.7151 Q0.8029,0.7191,0.7968,0.7216 T0.7818,0.726 T0.7705,0.729 L0.764,0.731 T0.7583,0.7324 T0.753,0.7334 T0.7486,0.7349 Q0.7251,0.7399,0.7161,0.7399 Q0.7097,0.7399,0.6951,0.7409 T0.6748,0.7418 L0.6703,0.7418 L0.6667,0.7418 Q0.6659,0.7418,0.6399,0.7448 L0.6334,0.7448 Q0.631,0.7448,0.6249,0.7443 T0.6148,0.7438 L0.6099,0.7438 Q0.601,0.7448,0.5856,0.7473 T0.5645,0.7507 Q0.5572,0.7517,0.5572,0.7547 T0.5616,0.7606 T0.5702,0.7646 Q0.5734,0.7646,0.5779,0.7651 T0.5864,0.7661 T0.5949,0.7671 T0.6018,0.7676 L0.6071,0.7676 T0.6135,0.7681 T0.62,0.769 T0.6269,0.771 T0.6342,0.7725 Q0.6391,0.7725,0.6464,0.7705 T0.6541,0.7685 L0.6553,0.7685 Q0.6586,0.7685,0.6699,0.771 T0.6853,0.7735 Q0.6902,0.7735,0.704,0.777 T0.7226,0.7834 Q0.7315,0.7873,0.7445,0.7883 Q0.747,0.7883,0.7676,0.7893 T0.7972,0.7913 Q0.7989,0.7913,0.8017,0.7918 T0.8058,0.7923 T0.809,0.7928 T0.8114,0.7933 T0.8131,0.7938 T0.8147,0.7943 T0.8159,0.7953 L0.8171,0.7967 T0.8175,0.7982 Q0.8183,0.7992,0.8183,0.8002 Q0.8183,0.8022,0.8155,0.8032 T0.807,0.8051 T0.7989,0.8071 Q0.7932,0.8091,0.7737,0.8091 L0.7413,0.8091 L0.7372,0.8091 Q0.7275,0.8091,0.721,0.8101 T0.7072,0.8136 T0.6983,0.817 Q0.6942,0.818,0.6825,0.818 T0.6602,0.819 T0.6456,0.822 Q0.6415,0.8249,0.6375,0.8249 Q0.6367,0.8249,0.6326,0.8239 T0.6253,0.8229 Q0.6034,0.8229,0.5953,0.8279 Q0.5912,0.8289,0.5848,0.8289 Q0.5775,0.8289,0.5645,0.8279 Q0.5629,0.8269,0.5604,0.8269 Q0.5523,0.8269,0.5328,0.8348 Q0.5296,0.8358,0.5264,0.8358 Q0.5247,0.8358,0.5203,0.8353 T0.5126,0.8348 Q0.5061,0.8348,0.4988,0.8358 Q0.4947,0.8368,0.4882,0.8378 Q0.4826,0.8388,0.4797,0.8388 T0.474,0.8398 T0.4704,0.8422 T0.4696,0.8462 T0.472,0.8501 T0.4781,0.8521 T0.4854,0.8526 L0.4935,0.8526 T0.4996,0.8536 Q0.5036,0.8536,0.515,0.8546 T0.5337,0.8566 Q0.5426,0.8576,0.5596,0.8576 L0.5657,0.8576 L0.571,0.8576 L0.5791,0.8576 Q0.5921,0.8586,0.6135,0.8591 T0.6383,0.8605 Q0.6683,0.8635,0.6764,0.8635 Q0.6999,0.8635,0.6999,0.8684 Q0.6999,0.8694,0.6967,0.8734 T0.6934,0.8803 L0.6934,0.8823 Q0.6951,0.8863,0.7137,0.8863 Q0.7218,0.8863,0.7267,0.8853 L0.7299,0.8853 Q0.734,0.8853,0.7409,0.8882 T0.7502,0.8912 Q0.7607,0.8942,0.794,0.8971 Q0.7972,0.8971,0.8078,0.9001 T0.8297,0.9031 Q0.8475,0.9031,0.8646,0.9065 T0.8824,0.9149 L0.8824,0.9159 Q0.8824,0.9169,0.882,0.9179 T0.8808,0.9194 L0.8792,0.9204 T0.8767,0.9214 T0.8743,0.9224 T0.8715,0.9228 L0.8686,0.9228 T0.8662,0.9233 T0.8637,0.9238 L0.8556,0.9238 T0.8447,0.9243 T0.8386,0.9268 Q0.837,0.9278,0.835,0.9288 T0.8305,0.9303 T0.8244,0.9308 T0.8175,0.9318 Q0.8127,0.9327,0.8017,0.9352 T0.7851,0.9397 Q0.777,0.9416,0.7705,0.9451 T0.7616,0.9496 Q0.7575,0.9505,0.7494,0.9505 L0.7405,0.9505 L0.7307,0.9505 Q0.7234,0.9505,0.7178,0.9515 Q0.7145,0.9515,0.7125,0.9535 T0.7105,0.9575 Q0.7105,0.9624,0.7194,0.9634 Q0.7567,0.9654,0.7664,0.9674 Q0.7745,0.9693,0.7762,0.9693 L0.7908,0.9693 L0.7948,0.9693 Q0.8005,0.9693,0.8058,0.9698 T0.8143,0.9718 T0.824,0.9753 T0.8354,0.9792 Q0.8483,0.9832,0.871,0.9832 L0.8739,0.9832 L0.8767,0.9832 Q0.8873,0.9832,0.8921,0.9842 Q0.8978,0.9852,0.9157,0.9896 T0.94,0.996 Q0.9424,0.996,0.9469,0.9965 T0.9566,0.997 T0.9676,0.9975 T0.9781,0.998 L0.9874,0.998 L0.9943,0.998 L0.9968,0.998 Z", type: 0 } }, "\\uE0CC": { type: 5, data: { d: "M1,0.5071 L0.8623,0.7102 L0.5865,0.7102 L0.4489,0.5071 L0.5865,0.3045 L0.8623,0.3045 Z M0.4135,0.7974 L0.2758,1 L0,1 L0,0.5944 L0.2758,0.5944 Z M0.4135,0.2026 L0.2758,0.4056 L0,0.4056 L0,0 L0.2758,0 Z", type: 0 } }, "\\uE0CD": { type: 5, data: { d: "M0.9726,0.5071 L0.8451,0.3184 L0.59,0.3184 L0.4624,0.5071 L0.59,0.6955 L0.8451,0.6955 Z M1,0.5071 L0.8588,0.716 L0.5768,0.716 L0.4355,0.5071 L0.5768,0.2982 L0.8588,0.2982 Z M0.401,0.7911 L0.2735,0.6028 L0.0236,0.6028 L0.0236,0.9799 L0.2735,0.9799 Z M0.4284,0.7911 L0.2872,1 L0,1 L0,0.5826 L0.2872,0.5826 Z M0.401,0.2089 L0.2735,0.0201 L0.0236,0.0201 L0.0236,0.3972 L0.2735,0.3972 Z M0.4284,0.2089 L0.2872,0.4174 L0,0.4174 L0,0 L0.2872,0 Z", type: 0 } }, "\\uE0CE": { type: 5, data: { d: "M1,0.4996 Q1,0.5365,0.9924,0.568 T0.9718,0.6177 T0.9433,0.6363 L0.9425,0.6367 Q0.9355,0.6367,0.9285,0.6326 L0.9308,0.6326 Q0.9129,0.6195,0.9013,0.587 T0.8871,0.5164 T0.8943,0.4373 T0.9254,0.3687 L0.9254,0.3691 Q0.9339,0.3628,0.9425,0.3628 Q0.9584,0.3628,0.9716,0.3811 T0.9924,0.431 T1,0.4996 Z M0.9234,0.6321 L0.8776,0.7169 Q0.8791,0.732,0.8791,0.7441 Q0.8791,0.781,0.8716,0.8123 T0.8508,0.862 T0.8224,0.8809 L0.8216,0.8809 Q0.8154,0.8809,0.8092,0.8775 L0.8088,0.8775 Q0.7905,0.8633,0.7792,0.8297 T0.766,0.7571 T0.775,0.6768 T0.8088,0.6086 L0.7431,0.6065 Q0.719,0.6313,0.7072,0.6705 T0.6965,0.7487 T0.7097,0.823 T0.7423,0.8763 L0.7913,0.8775 L0.7314,0.9895 L0.4648,0.5038 L0.7299,0.0176 L0.7882,0.1229 L0.7404,0.1212 Q0.7244,0.138,0.7136,0.1617 T0.6982,0.2108 T0.6943,0.2632 T0.7003,0.3144 T0.7159,0.3586 T0.7396,0.3909 L0.8072,0.3926 Q0.7894,0.3796,0.7777,0.3479 T0.7635,0.2789 T0.7697,0.2011 T0.7987,0.1326 Q0.8092,0.1225,0.8204,0.1225 Q0.8321,0.1225,0.8426,0.1332 T0.8609,0.1623 T0.8731,0.2062 T0.8776,0.2592 Q0.8776,0.268,0.8768,0.2815 L0.9219,0.3628 L0.8644,0.3612 Q0.8403,0.3855,0.8284,0.4247 T0.8177,0.5029 T0.8309,0.5772 T0.8632,0.6305 Z M0.6759,0.6384 Q0.6576,0.625,0.6457,0.5914 T0.6319,0.5185 T0.6407,0.4375 T0.6751,0.3691 L0.609,0.367 Q0.5849,0.3918,0.5731,0.431 T0.5626,0.509 T0.5758,0.5833 T0.6082,0.6367 Z M0.6459,0.0025 L0.391,0.4551 L0.0035,0.4551 L0.246,0 Z M0.6553,1 L0.2421,1 L0,0.5449 L0.3875,0.5449 Z", type: 0 } }, "\\uE0CF": { type: 5, data: { d: "M0.4996,0 Q0.5562,0,0.5961,0.0166 T0.6364,0.0566 L0.6368,0.0575 Q0.6368,0.0646,0.6324,0.0713 L0.6324,0.0692 Q0.6196,0.0868,0.5872,0.0986 T0.5166,0.1128 T0.4373,0.1057 T0.3689,0.0747 L0.3694,0.0747 Q0.3627,0.0663,0.3627,0.0575 Q0.3627,0.0336,0.4028,0.0168 T0.4996,0 Z M0.6324,0.0768 L0.717,0.1225 Q0.7321,0.1212,0.744,0.1212 Q0.8007,0.1212,0.8406,0.1378 T0.8809,0.1779 L0.8813,0.1783 Q0.8813,0.1846,0.8778,0.1909 Q0.8636,0.2093,0.8299,0.2208 T0.7573,0.2343 T0.6769,0.2253 T0.6089,0.1913 L0.6067,0.2567 Q0.6315,0.281,0.6707,0.2928 T0.7489,0.3035 T0.8231,0.2903 T0.8764,0.258 L0.8778,0.2085 L0.9898,0.2685 L0.504,0.5352 L0.0177,0.2701 L0.1227,0.2118 L0.1213,0.2596 Q0.1457,0.2836,0.1851,0.2955 T0.2635,0.3062 T0.3377,0.293 T0.3911,0.2605 L0.3928,0.193 Q0.38,0.2106,0.3483,0.2221 T0.2792,0.2364 T0.2013,0.2303 T0.1324,0.2013 Q0.1222,0.1909,0.1222,0.1795 Q0.1222,0.156,0.1623,0.1393 T0.2591,0.1225 Q0.2679,0.1225,0.2817,0.1233 L0.3627,0.078 L0.3609,0.1359 Q0.3857,0.1598,0.4249,0.1718 T0.5031,0.1825 T0.5773,0.1693 T0.6306,0.1367 Z M0.6386,0.3242 Q0.6253,0.3427,0.5917,0.3544 T0.5186,0.3683 T0.4376,0.3595 T0.3689,0.3251 L0.3671,0.3909 Q0.3915,0.4148,0.4309,0.4268 T0.5093,0.4375 T0.5835,0.4243 T0.6368,0.3918 Z M0.0027,0.354 L0.4553,0.6091 L0.4553,0.9962 L0,0.7542 Z M1,0.3448 L1,0.7576 L0.5447,1 L0.5447,0.6128 Z", type: 0 } }, "\\uE0D0": { type: 5, data: { d: "M0,0.7699 Q0,0.7172,0.0277,0.6731 T0.103,0.6032 T0.2066,0.5774 Q0.2487,0.5774,0.2865,0.5922 T0.3526,0.6339 L0.3935,0.6715 Q0.4218,0.6984,0.438,0.7336 T0.4541,0.8075 Q0.4541,0.8602,0.4264,0.9046 T0.3511,0.9745 T0.2475,1 Q0.2054,1,0.1676,0.9852 T0.1016,0.9435 L0.0606,0.9059 Q0.0317,0.879,0.0159,0.8438 T0,0.7699 Z M0.5459,0.7699 Q0.5459,0.7172,0.5736,0.6731 T0.6489,0.6032 T0.7525,0.5774 Q0.7946,0.5774,0.8324,0.5922 T0.8984,0.6339 L0.9394,0.6715 Q0.9579,0.6892,0.9714,0.7105 T0.9925,0.7567 T1,0.8075 Q1,0.8602,0.9723,0.9046 T0.897,0.9745 T0.7934,1 Q0.7513,1,0.7135,0.9852 T0.6474,0.9435 L0.6065,0.9059 Q0.5776,0.879,0.5617,0.8438 T0.5459,0.7699 Z M0,0.1925 Q0,0.1398,0.0277,0.0957 T0.103,0.0258 T0.2066,0 Q0.2487,0,0.2865,0.0148 T0.3526,0.0565 L0.3935,0.0941 Q0.4218,0.121,0.438,0.1562 T0.4541,0.2301 Q0.4541,0.2828,0.4264,0.3269 T0.3511,0.3968 T0.2475,0.4226 Q0.2054,0.4226,0.1676,0.4078 T0.1016,0.3661 L0.0606,0.3285 Q0.0317,0.3016,0.0159,0.2664 T0,0.1925 Z M0.5459,0.1925 Q0.5459,0.1398,0.5736,0.0957 T0.6489,0.0258 T0.7525,0 Q0.7946,0,0.8324,0.0148 T0.8984,0.0565 L0.9394,0.0941 Q0.9677,0.121,0.9838,0.1562 T1,0.2301 Q1,0.2828,0.9723,0.3269 T0.897,0.3968 T0.7934,0.4226 Q0.7513,0.4226,0.7135,0.4078 T0.6474,0.3661 L0.6065,0.3285 Q0.5874,0.3108,0.5741,0.2895 T0.5534,0.2433 T0.5459,0.1925 Z M0.3301,0.6403 Q0.3306,0.6403,0.3312,0.6409 L0.3272,0.6371 L0.3272,0.6371 Z M0.8759,0.6403 Q0.8765,0.6403,0.8771,0.6409 Q0.8748,0.6387,0.8725,0.6371 L0.8731,0.6371 Z M0.3301,0.0629 Q0.3306,0.0629,0.3312,0.0634 L0.3272,0.0597 L0.3272,0.0602 Z M0.8759,0.0629 Q0.8765,0.0629,0.8771,0.0634 Q0.8748,0.0613,0.8725,0.0597 Q0.8731,0.0597,0.8731,0.0602 Z M0.779,0.4113 L0.7501,0.3849 Q0.7046,0.3844,0.6636,0.3661 Q0.7132,0.407,0.779,0.4113 Z M0.7957,0.4118 Q0.8477,0.4113,0.8918,0.3874 T0.9619,0.3223 T0.9885,0.2323 L0.9585,0.2048 Q0.9538,0.2769,0.8987,0.3282 T0.7657,0.3844 Z M0.9879,0.2167 Q0.9827,0.1554,0.9388,0.1097 Q0.9585,0.1478,0.959,0.1898 Z M0.2331,0.4113 L0.2043,0.3849 Q0.1587,0.3844,0.1177,0.3661 Q0.1673,0.407,0.2331,0.4113 Z M0.2499,0.4118 Q0.2885,0.4118,0.324,0.3973 T0.3852,0.3589 T0.4264,0.3019 T0.4426,0.2323 L0.4126,0.2048 Q0.408,0.2769,0.3529,0.3282 T0.2198,0.3844 Z M0.442,0.2167 Q0.4368,0.1554,0.393,0.1097 Q0.4126,0.1478,0.4132,0.1903 Z M0.779,0.9887 L0.7501,0.9624 Q0.7046,0.9618,0.6636,0.9435 Q0.7132,0.9844,0.779,0.9887 Z M0.7957,0.9892 Q0.8477,0.9887,0.8918,0.9648 T0.9619,0.8997 T0.9885,0.8097 L0.9585,0.7823 Q0.9538,0.8543,0.8987,0.9056 T0.7657,0.9618 Z M0.9879,0.7941 Q0.9827,0.7328,0.9388,0.6871 Q0.9585,0.7253,0.959,0.7672 Z M0.2331,0.9887 L0.2043,0.9624 Q0.1587,0.9618,0.1177,0.9435 Q0.1673,0.9844,0.2331,0.9887 Z M0.2499,0.9892 Q0.3018,0.9887,0.3459,0.9648 T0.416,0.8997 T0.4426,0.8102 L0.4126,0.7823 Q0.408,0.8543,0.3529,0.9056 T0.2198,0.9618 Z M0.442,0.7941 Q0.4368,0.7328,0.393,0.6871 Q0.4126,0.7253,0.4132,0.7672 Z M0.3191,0.6452 Q0.2943,0.622,0.2643,0.6091 T0.2066,0.5962 Q0.1795,0.5962,0.1497,0.6091 T0.0949,0.6441 T0.0537,0.6995 T0.0375,0.7699 Q0.0375,0.8419,0.0941,0.8941 Q0.1189,0.9172,0.1489,0.9304 T0.2066,0.9435 Q0.2337,0.9435,0.2634,0.9304 T0.3182,0.8952 T0.3595,0.8398 T0.3756,0.7699 Q0.3756,0.6978,0.3191,0.6452 Z M0.026,0.7731 L0.026,0.7699 Q0.026,0.6935,0.0854,0.6376 Q0.0658,0.6538,0.0514,0.6739 T0.0289,0.718 T0.0202,0.7677 Z M0.0271,0.7892 L0.0208,0.7833 Q0.0254,0.8419,0.0681,0.886 Q0.0664,0.8828,0.0646,0.879 Q0.0329,0.8382,0.0271,0.7892 Z M0.3866,0.7823 Q0.382,0.8511,0.3278,0.9016 Q0.3843,0.8565,0.3918,0.7871 Z M0.3872,0.7677 L0.393,0.7726 L0.393,0.7699 Q0.393,0.7349,0.3791,0.7038 Q0.3739,0.6973,0.3681,0.6914 Q0.3866,0.7274,0.3872,0.7677 Z M0.865,0.6452 Q0.8402,0.622,0.8102,0.6091 T0.7525,0.5962 Q0.7305,0.5962,0.7072,0.6043 T0.6619,0.628 T0.6223,0.6642 T0.5941,0.7124 T0.5834,0.7699 Q0.5834,0.8419,0.6399,0.8941 Q0.6561,0.9097,0.6757,0.9207 T0.7149,0.9376 T0.7525,0.9435 Q0.7796,0.9435,0.8093,0.9304 T0.8641,0.8952 T0.9054,0.8398 T0.9215,0.7699 Q0.9215,0.6978,0.865,0.6452 Z M0.5718,0.7731 L0.5718,0.7699 Q0.5718,0.6935,0.6313,0.6376 Q0.6013,0.6618,0.584,0.6954 T0.5661,0.7677 Z M0.573,0.7892 L0.5666,0.7833 Q0.5713,0.8419,0.614,0.886 Q0.6122,0.8828,0.6105,0.879 Q0.5788,0.8382,0.573,0.7892 Z M0.9325,0.7823 Q0.9279,0.8511,0.8736,0.9016 Q0.9308,0.8565,0.9377,0.7871 Z M0.9331,0.7672 L0.9388,0.7726 L0.9388,0.7699 Q0.9388,0.7349,0.925,0.7038 Q0.9198,0.6973,0.914,0.6914 Q0.9325,0.7274,0.9331,0.7672 Z M0.3191,0.0677 Q0.2943,0.0446,0.2643,0.0317 T0.2066,0.0188 Q0.1795,0.0188,0.1497,0.0317 T0.0949,0.0667 T0.0537,0.122 T0.0375,0.1925 Q0.0375,0.2645,0.0941,0.3167 Q0.1189,0.3398,0.1489,0.353 T0.2066,0.3661 Q0.2337,0.3661,0.2634,0.353 T0.3182,0.3177 T0.3595,0.2624 T0.3756,0.1925 Q0.3756,0.1204,0.3191,0.0677 Z M0.026,0.1957 L0.026,0.1925 Q0.026,0.1161,0.0854,0.0602 Q0.0554,0.0844,0.0381,0.118 T0.0202,0.1903 Z M0.0271,0.2118 L0.0208,0.2059 Q0.0254,0.2645,0.0681,0.3086 Q0.0664,0.3054,0.0646,0.3016 Q0.0329,0.2608,0.0271,0.2118 Z M0.3866,0.2048 Q0.382,0.2737,0.3278,0.3242 Q0.3849,0.279,0.3918,0.2097 Z M0.3872,0.1903 L0.393,0.1952 L0.393,0.1925 Q0.393,0.1581,0.3791,0.1263 Q0.3739,0.1199,0.3681,0.114 Q0.3866,0.15,0.3872,0.1903 Z M0.865,0.0677 Q0.8402,0.0446,0.8102,0.0317 T0.7525,0.0188 Q0.7253,0.0188,0.6956,0.0317 T0.6408,0.0667 T0.5995,0.122 T0.5834,0.1925 Q0.5834,0.2645,0.6399,0.3167 Q0.6647,0.3398,0.6947,0.353 T0.7525,0.3661 Q0.7796,0.3661,0.8093,0.353 T0.8641,0.3177 T0.9054,0.2624 T0.9215,0.1925 Q0.9215,0.1204,0.865,0.0677 Z M0.5718,0.1957 L0.5718,0.1925 Q0.5718,0.1161,0.6313,0.0602 Q0.6013,0.0844,0.584,0.118 T0.5661,0.1903 Z M0.573,0.2118 L0.5666,0.2059 Q0.5713,0.2645,0.614,0.3086 Q0.6122,0.3054,0.6105,0.3016 Q0.5788,0.2608,0.573,0.2118 Z M0.9325,0.2048 Q0.9279,0.2737,0.8736,0.3242 Q0.9308,0.279,0.9377,0.2097 Z M0.9331,0.1898 L0.9388,0.1952 L0.9388,0.1925 Q0.9388,0.1575,0.925,0.1263 Q0.9198,0.1199,0.914,0.114 Q0.9325,0.15,0.9331,0.1898 Z", type: 0 } }, "\\uE0D1": { type: 5, data: { d: "M0.7639,0.1974 L0.9593,0.1974 L0.9593,0.1443 L0.7639,0.1443 L0.7639,0.1974 Z M0.7586,0.109 L0.9727,0.109 Q0.9839,0.109,0.992,0.1153 T1,0.1291 L1,0.382 Q1,0.3906,0.9912,0.3964 T0.9727,0.4021 L0.7586,0.4021 Q0.7468,0.4021,0.739,0.3956 T0.7313,0.382 L0.7313,0.1291 Q0.7313,0.1246,0.7339,0.1207 T0.7406,0.1143 T0.7495,0.1104 T0.7586,0.109 Z M0.7639,0.6575 L0.9593,0.6575 L0.9593,0.6044 L0.7639,0.6044 L0.7639,0.6575 Z M0.7313,0.8347 L0.7313,0.5843 Q0.7313,0.5757,0.7401,0.5699 T0.7586,0.5641 L0.9706,0.5641 Q0.9818,0.5641,0.9898,0.5705 T0.9979,0.5843 L0.9979,0.8347 Q0.9979,0.8433,0.989,0.8491 T0.9706,0.8549 L0.7586,0.8549 Q0.7468,0.8549,0.739,0.8483 T0.7313,0.8347 Z M0,1 L0,0 L0.7607,0 L0.7607,1 L0,1 Z", type: 0 } }, "\\uE0D2": { type: 5, data: { d: "M0.9764,0.0029 L0.3179,0.4552 L0,0.4552 L0,0 Z M1,1 L0,1 L0,0.5448 L0.3091,0.5448 Z", type: 0 } }, "\\uE0D4": { type: 5, data: { d: "M0.0236,0.0029 L0.6824,0.4552 L1,0.4552 L1,0 Z M0,1 L1,1 L1,0.5448 L0.6912,0.5448 Z", type: 0 } }, "\\uEE00": { type: 3, data: "M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z" }, "\\uEE01": { type: 3, data: "M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z" }, "\\uEE02": { type: 3, data: "M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z" }, "\\uEE03": { type: 3, data: "M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z M.25,.15 L1,.15 L1,.85 L.25,.85 Z" }, "\\uEE04": { type: 3, data: "M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z M0,.15 L1,.15 L1,.85 L0,.85 Z" }, "\\uEE05": { type: 3, data: "M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z M0,.15 L.75,.15 L.75,.85 L0,.85 Z" }, "\\uEE06": { type: 5, data: { d: "M0.6574,0.303 Q0.623,0.291,0.5852,0.285 T0.5082,0.279 T0.4311,0.285 T0.359,0.303 L0.3082,0.248 Q0.3525,0.232,0.4041,0.2235 T0.5082,0.215 T0.6123,0.2235 T0.7082,0.248 Z", type: 0 }, scaleType: 1 }, "\\uEE07": { type: 5, data: { d: "M0.8557,0.582 L0.7656,0.551 Q0.7852,0.53,0.7951,0.507 T0.8049,0.46 Q0.8049,0.424,0.782,0.3905 T0.718,0.332 T0.6221,0.293 T0.5082,0.279 L0.5082,0.215 Q0.5607,0.215,0.6123,0.2235 T0.709,0.248 T0.7918,0.287 T0.8557,0.3375 T0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.582 Z", type: 0 }, scaleType: 1 }, "\\uEE08": { type: 5, data: { d: "M0.5082,0.705 Q0.482,0.705,0.4557,0.703 T0.4049,0.697 L0.4311,0.635 Q0.4508,0.638,0.4697,0.6395 T0.5082,0.641 Q0.5672,0.641,0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 Q0.8049,0.436,0.7951,0.413 T0.7656,0.369 L0.8557,0.338 Q0.882,0.365,0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE09": { type: 5, data: { d: "M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 L0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 T0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 L0.9098,0.46 Q0.9098,0.492,0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE0A": { type: 5, data: { d: "M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.338 L0.2508,0.369 Q0.2311,0.39,0.2213,0.413 T0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 Q0.5279,0.641,0.5467,0.6395 T0.5852,0.635 L0.6115,0.697 Q0.5869,0.701,0.5607,0.703 T0.5082,0.705 Z", type: 0 }, scaleType: 1 }, "\\uEE0B": { type: 5, data: { d: "M0.1607,0.582 Q0.1344,0.555,0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.3375 T0.2246,0.287 T0.3074,0.248 T0.4041,0.2235 T0.5082,0.215 L0.5082,0.279 Q0.4492,0.279,0.3943,0.293 T0.2984,0.332 T0.2344,0.3905 T0.2115,0.46 Q0.2115,0.484,0.2213,0.507 T0.2508,0.551 Z", type: 0 }, scaleType: 1 }, "\\uF5D0": L4.LINE_H, "\\uF5D1": L4.LINE_V, "\\uF5D2": L4.FADE_RIGHT, "\\uF5D3": L4.FADE_LEFT, "\\uF5D4": L4.FADE_DOWN, "\\uF5D5": L4.FADE_UP, "\\uF5D6": L4.CURVE_DOWN_RIGHT, "\\uF5D7": L4.CURVE_DOWN_LEFT, "\\uF5D8": L4.CURVE_UP_RIGHT, "\\uF5D9": L4.CURVE_UP_LEFT, "\\uF5DA": [L4.LINE_V, L4.CURVE_UP_RIGHT], "\\uF5DB": [L4.LINE_V, L4.CURVE_DOWN_RIGHT], "\\uF5DC": [L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_RIGHT], "\\uF5DD": [L4.LINE_V, L4.CURVE_UP_LEFT], "\\uF5DE": [L4.LINE_V, L4.CURVE_DOWN_LEFT], "\\uF5DF": [L4.CURVE_DOWN_LEFT, L4.CURVE_UP_LEFT], "\\uF5E0": [L4.LINE_H, L4.CURVE_DOWN_LEFT], "\\uF5E1": [L4.LINE_H, L4.CURVE_DOWN_RIGHT], "\\uF5E2": [L4.CURVE_DOWN_LEFT, L4.CURVE_DOWN_RIGHT], "\\uF5E3": [L4.LINE_H, L4.CURVE_UP_LEFT], "\\uF5E4": [L4.LINE_H, L4.CURVE_UP_RIGHT], "\\uF5E5": [L4.CURVE_UP_LEFT, L4.CURVE_UP_RIGHT], "\\uF5E6": [L4.LINE_V, L4.CURVE_UP_LEFT, L4.CURVE_UP_RIGHT], "\\uF5E7": [L4.LINE_V, L4.CURVE_DOWN_LEFT, L4.CURVE_DOWN_RIGHT], "\\uF5E8": [L4.LINE_H, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_LEFT], "\\uF5E9": [L4.LINE_H, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_RIGHT], "\\uF5EA": [L4.LINE_V, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_LEFT], "\\uF5EB": [L4.LINE_V, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_RIGHT], "\\uF5EC": [L4.LINE_H, L4.CURVE_DOWN_RIGHT, L4.CURVE_UP_LEFT], "\\uF5ED": [L4.LINE_H, L4.CURVE_DOWN_LEFT, L4.CURVE_UP_RIGHT], "\\uF5EE": [L4.NODE_FILL, L4.NODE_STROKE], "\\uF5EF": L4.NODE_STROKE, "\\uF5F0": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_RIGHT], "\\uF5F1": [L4.NODE_STROKE, L4.NODE_LINE_RIGHT], "\\uF5F2": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_LEFT], "\\uF5F3": [L4.NODE_STROKE, L4.NODE_LINE_LEFT], "\\uF5F4": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF5F5": [L4.NODE_STROKE, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF5F6": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN], "\\uF5F7": [L4.NODE_STROKE, L4.NODE_LINE_DOWN], "\\uF5F8": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP], "\\uF5F9": [L4.NODE_STROKE, L4.NODE_LINE_UP], "\\uF5FA": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_UP], "\\uF5FB": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_UP], "\\uF5FC": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF5FD": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF5FE": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF5FF": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF600": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_RIGHT], "\\uF601": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_RIGHT], "\\uF602": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT], "\\uF603": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT], "\\uF604": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF605": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_RIGHT], "\\uF606": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF607": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT], "\\uF608": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF609": [L4.NODE_STROKE, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60A": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60B": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60C": [L4.NODE_FILL, L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\uF60D": [L4.NODE_STROKE, L4.NODE_LINE_UP, L4.NODE_LINE_DOWN, L4.NODE_LINE_LEFT, L4.NODE_LINE_RIGHT], "\\u{1FB00}": f4(1), "\\u{1FB01}": f4(2), "\\u{1FB02}": f4(3), "\\u{1FB03}": f4(4), "\\u{1FB04}": f4(5), "\\u{1FB05}": f4(6), "\\u{1FB06}": f4(7), "\\u{1FB07}": f4(8), "\\u{1FB08}": f4(9), "\\u{1FB09}": f4(10), "\\u{1FB0A}": f4(11), "\\u{1FB0B}": f4(12), "\\u{1FB0C}": f4(13), "\\u{1FB0D}": f4(14), "\\u{1FB0E}": f4(15), "\\u{1FB0F}": f4(16), "\\u{1FB10}": f4(17), "\\u{1FB11}": f4(18), "\\u{1FB12}": f4(19), "\\u{1FB13}": f4(20), "\\u{1FB14}": f4(22), "\\u{1FB15}": f4(23), "\\u{1FB16}": f4(24), "\\u{1FB17}": f4(25), "\\u{1FB18}": f4(26), "\\u{1FB19}": f4(27), "\\u{1FB1A}": f4(28), "\\u{1FB1B}": f4(29), "\\u{1FB1C}": f4(30), "\\u{1FB1D}": f4(31), "\\u{1FB1E}": f4(32), "\\u{1FB1F}": f4(33), "\\u{1FB20}": f4(34), "\\u{1FB21}": f4(35), "\\u{1FB22}": f4(36), "\\u{1FB23}": f4(37), "\\u{1FB24}": f4(38), "\\u{1FB25}": f4(39), "\\u{1FB26}": f4(40), "\\u{1FB27}": f4(41), "\\u{1FB28}": f4(43), "\\u{1FB29}": f4(44), "\\u{1FB2A}": f4(45), "\\u{1FB2B}": f4(46), "\\u{1FB2C}": f4(47), "\\u{1FB2D}": f4(48), "\\u{1FB2E}": f4(49), "\\u{1FB2F}": f4(50), "\\u{1FB30}": f4(51), "\\u{1FB31}": f4(52), "\\u{1FB32}": f4(53), "\\u{1FB33}": f4(54), "\\u{1FB34}": f4(55), "\\u{1FB35}": f4(56), "\\u{1FB36}": f4(57), "\\u{1FB37}": f4(58), "\\u{1FB38}": f4(59), "\\u{1FB39}": f4(60), "\\u{1FB3A}": f4(61), "\\u{1FB3B}": f4(62), "\\u{1FB3C}": { type: 3, data: "M0,0.6667 L0,1 L0.5,1 Z" }, "\\u{1FB3D}": { type: 3, data: "M0,0.6667 L0,1 L1,1 Z" }, "\\u{1FB3E}": { type: 3, data: "M0,0.3333 L0,1 L0.5,1 Z" }, "\\u{1FB3F}": { type: 3, data: "M0,0.3333 L0,1 L1,1 Z" }, "\\u{1FB40}": { type: 3, data: "M0,0 L0,1 L0.5,1 Z" }, "\\u{1FB41}": { type: 3, data: "M0,0.3333 L0.5,0 L1,0 L1,1 L0,1 Z" }, "\\u{1FB42}": { type: 3, data: "M0,0.3333 L1,0 L1,1 L0,1 Z" }, "\\u{1FB43}": { type: 3, data: "M0,0.6667 L0.5,0 L1,0 L1,1 L0,1 Z" }, "\\u{1FB44}": { type: 3, data: "M0,0.6667 L1,0 L1,1 L0,1 Z" }, "\\u{1FB45}": { type: 3, data: "M0,1 L0.5,0 L1,0 L1,1 Z" }, "\\u{1FB46}": { type: 3, data: "M0,0.6667 L1,0.3333 L1,1 L0,1 Z" }, "\\u{1FB47}": { type: 3, data: "M0.5,1 L1,0.6667 L1,1 Z" }, "\\u{1FB48}": { type: 3, data: "M0,1 L1,0.6667 L1,1 Z" }, "\\u{1FB49}": { type: 3, data: "M0.5,1 L1,0.3333 L1,1 Z" }, "\\u{1FB4A}": { type: 3, data: "M0,1 L1,0.3333 L1,1 Z" }, "\\u{1FB4B}": { type: 3, data: "M0.5,1 L1,0 L1,1 Z" }, "\\u{1FB4C}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 L1,0.3333 Z" }, "\\u{1FB4D}": { type: 3, data: "M0,0 L0,1 L1,1 L1,0.3333 Z" }, "\\u{1FB4E}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB4F}": { type: 3, data: "M0,0 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB50}": { type: 3, data: "M0.5,0 L0,0 L0,1 L1,1 Z" }, "\\u{1FB51}": { type: 3, data: "M0,0.3333 L0,1 L1,1 L1,0.6667 Z" }, "\\u{1FB52}": { type: 3, data: "M0,0.6667 L0.5,1 L1,1 L1,0 L0,0 Z" }, "\\u{1FB53}": { type: 3, data: "M0,0.6667 L1,1 L1,0 L0,0 Z" }, "\\u{1FB54}": { type: 3, data: "M0,0.3333 L0.5,1 L1,1 L1,0 L0,0 Z" }, "\\u{1FB55}": { type: 3, data: "M0,0.3333 L1,1 L1,0 L0,0 Z" }, "\\u{1FB56}": { type: 3, data: "M0,0 L0.5,1 L1,1 L1,0 Z" }, "\\u{1FB57}": { type: 3, data: "M0,0.3333 L0,0 L0.5,0 Z" }, "\\u{1FB58}": { type: 3, data: "M0,0.3333 L0,0 L1,0 Z" }, "\\u{1FB59}": { type: 3, data: "M0,0.6667 L0,0 L0.5,0 Z" }, "\\u{1FB5A}": { type: 3, data: "M0,0.6667 L0,0 L1,0 Z" }, "\\u{1FB5B}": { type: 3, data: "M0,1 L0,0 L0.5,0 Z" }, "\\u{1FB5C}": { type: 3, data: "M0,0.6667 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB5D}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB5E}": { type: 3, data: "M0,1 L0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB5F}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB60}": { type: 3, data: "M0,1 L0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB61}": { type: 3, data: "M0.5,1 L0,1 L0,0 L1,0 Z" }, "\\u{1FB62}": { type: 3, data: "M0.5,0 L1,0 L1,0.3333 Z" }, "\\u{1FB63}": { type: 3, data: "M0,0 L1,0 L1,0.3333 Z" }, "\\u{1FB64}": { type: 3, data: "M0.5,0 L1,0 L1,0.6667 Z" }, "\\u{1FB65}": { type: 3, data: "M0,0 L1,0 L1,0.6667 Z" }, "\\u{1FB66}": { type: 3, data: "M0.5,0 L1,0 L1,1 Z" }, "\\u{1FB67}": { type: 3, data: "M0,0.3333 L1,0.6667 L1,0 L0,0 Z" }, "\\u{1FB68}": { type: 3, data: "M0,0 L1,0 L1,1 L0,1 L0.5,0.5 Z" }, "\\u{1FB69}": { type: 3, data: "M0,0 L0.5,0.5 L1,0 L1,1 L0,1 Z" }, "\\u{1FB6A}": { type: 3, data: "M0,0 L1,0 L0.5,0.5 L1,1 L0,1 Z" }, "\\u{1FB6B}": { type: 3, data: "M0,0 L1,0 L1,1 L0.5,0.5 L0,1 Z" }, "\\u{1FB6C}": { type: 3, data: "M0,0 L0.5,0.5 L0,1 Z" }, "\\u{1FB6D}": { type: 3, data: "M0,0 L1,0 L0.5,0.5 Z" }, "\\u{1FB6E}": { type: 3, data: "M1,0 L1,1 L0.5,0.5 Z" }, "\\u{1FB6F}": { type: 3, data: "M0,1 L1,1 L0.5,0.5 Z" }, "\\u{1FB70}": { type: 0, data: [{ x: 1, y: 0, w: 1, h: 8 }] }, "\\u{1FB71}": { type: 0, data: [{ x: 2, y: 0, w: 1, h: 8 }] }, "\\u{1FB72}": { type: 0, data: [{ x: 3, y: 0, w: 1, h: 8 }] }, "\\u{1FB73}": { type: 0, data: [{ x: 4, y: 0, w: 1, h: 8 }] }, "\\u{1FB74}": { type: 0, data: [{ x: 5, y: 0, w: 1, h: 8 }] }, "\\u{1FB75}": { type: 0, data: [{ x: 6, y: 0, w: 1, h: 8 }] }, "\\u{1FB76}": { type: 0, data: [{ x: 0, y: 1, w: 8, h: 1 }] }, "\\u{1FB77}": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 1 }] }, "\\u{1FB78}": { type: 0, data: [{ x: 0, y: 3, w: 8, h: 1 }] }, "\\u{1FB79}": { type: 0, data: [{ x: 0, y: 4, w: 8, h: 1 }] }, "\\u{1FB7A}": { type: 0, data: [{ x: 0, y: 5, w: 8, h: 1 }] }, "\\u{1FB7B}": { type: 0, data: [{ x: 0, y: 6, w: 8, h: 1 }] }, "\\u{1FB7C}": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB7D}": { type: 0, data: [{ x: 0, y: 0, w: 1, h: 8 }, { x: 0, y: 0, w: 8, h: 1 }] }, "\\u{1FB7E}": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }, { x: 0, y: 0, w: 8, h: 1 }] }, "\\u{1FB7F}": { type: 0, data: [{ x: 7, y: 0, w: 1, h: 8 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB80}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB81}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 1 }, { x: 0, y: 2, w: 8, h: 1 }, { x: 0, y: 4, w: 8, h: 1 }, { x: 0, y: 7, w: 8, h: 1 }] }, "\\u{1FB82}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 2 }] }, "\\u{1FB83}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 3 }] }, "\\u{1FB84}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 5 }] }, "\\u{1FB85}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 6 }] }, "\\u{1FB86}": { type: 0, data: [{ x: 0, y: 0, w: 8, h: 7 }] }, "\\u{1FB87}": { type: 0, data: [{ x: 6, y: 0, w: 2, h: 8 }] }, "\\u{1FB88}": { type: 0, data: [{ x: 5, y: 0, w: 3, h: 8 }] }, "\\u{1FB89}": { type: 0, data: [{ x: 3, y: 0, w: 5, h: 8 }] }, "\\u{1FB8A}": { type: 0, data: [{ x: 2, y: 0, w: 6, h: 8 }] }, "\\u{1FB8B}": { type: 0, data: [{ x: 1, y: 0, w: 7, h: 8 }] }, "\\u{1FB8C}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L0.5,0 L0.5,1 L0,1 Z" }, "\\u{1FB8D}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0.5,0 L1,0 L1,1 L0.5,1 Z" }, "\\u{1FB8E}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L1,0.5 L0,0.5 Z" }, "\\u{1FB8F}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0.5 L1,0.5 L1,1 L0,1 Z" }, "\\u{1FB90}": { type: 1, data: [[0, 1], [1, 0]] }, "\\u{1FB91}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0.5 L1,0.5 L1,1 L0,1 Z" }, { type: 0, data: [{ x: 0, y: 0, w: 8, h: 4 }] }], "\\u{1FB92}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0 L1,0 L1,0.5 L0,0.5 Z" }, { type: 0, data: [{ x: 0, y: 4, w: 8, h: 4 }] }], "\\u{1FB94}": [{ type: 1, data: [[0, 1], [1, 0]], clipPath: "M0,0 L0.5,0 L0.5,1 L0,1 Z" }, { type: 0, data: [{ x: 4, y: 0, w: 4, h: 8 }] }], "\\u{1FB95}": { type: 0, data: [{ x: 0, y: 0, w: 2, h: 2 }, { x: 4, y: 0, w: 2, h: 2 }, { x: 2, y: 2, w: 2, h: 2 }, { x: 6, y: 2, w: 2, h: 2 }, { x: 0, y: 4, w: 2, h: 2 }, { x: 4, y: 4, w: 2, h: 2 }, { x: 2, y: 6, w: 2, h: 2 }, { x: 6, y: 6, w: 2, h: 2 }] }, "\\u{1FB96}": { type: 0, data: [{ x: 2, y: 0, w: 2, h: 2 }, { x: 6, y: 0, w: 2, h: 2 }, { x: 0, y: 2, w: 2, h: 2 }, { x: 4, y: 2, w: 2, h: 2 }, { x: 2, y: 4, w: 2, h: 2 }, { x: 6, y: 4, w: 2, h: 2 }, { x: 0, y: 6, w: 2, h: 2 }, { x: 4, y: 6, w: 2, h: 2 }] }, "\\u{1FB97}": { type: 0, data: [{ x: 0, y: 2, w: 8, h: 2 }, { x: 0, y: 6, w: 8, h: 2 }] }, "\\u{1FB98}": { type: 2, data: "M-0.25,-0.25 L1.25,1.25 M-0.25,0 L1,1.25 M-0.25,0.25 L0.75,1.25 M-0.25,0.5 L0.5,1.25 M0,-0.25 L1.25,1 M0.25,-0.25 L1.25,0.75 M0.5,-0.25 L1.25,0.5 M-0.25,0.75 L0.25,1.25 M0.75,-0.25 L1.25,0.25", strokeWidth: 1 }, "\\u{1FB99}": { type: 2, data: "M-0.25,0.5 L0.5,-0.25 M-0.25,0.75 L0.75,-0.25 M-0.25,1 L1,-0.25 M-0.25,1.25 L1.25,-0.25 M0,1.25 L1.25,0 M0.25,1.25 L1.25,0.25 M0.5,1.25 L1.25,0.5 M-0.25,0.25 L0.25,-0.25 M0.75,1.25 L1.25,0.75", strokeWidth: 1 }, "\\u{1FB9A}": { type: 5, data: { d: "M0,0 L.5,.5 L0,1 L1,1 L.5,.5 L1,0", type: 0 } }, "\\u{1FB9B}": { type: 5, data: { d: "M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1", type: 0 } }, "\\u{1FB9C}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L0,1 Z" }, "\\u{1FB9D}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,0 L1,1 Z" }, "\\u{1FB9E}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M1,0 L1,1 L0,1 Z" }, "\\u{1FB9F}": { type: 1, data: [[1, 0], [0, 1]], clipPath: "M0,0 L1,1 L0,1 Z" }, "\\u{1FBA0}": { type: 2, data: "M.5,0 L0,.5", strokeWidth: 1 }, "\\u{1FBA1}": { type: 2, data: "M.5,0 L1,.5", strokeWidth: 1 }, "\\u{1FBA2}": { type: 2, data: "M0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA3}": { type: 2, data: "M1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA4}": { type: 2, data: "M.5,0 L0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA5}": { type: 2, data: "M.5,0 L1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA6}": { type: 2, data: "M0,.5 L.5,1 L1,.5", strokeWidth: 1 }, "\\u{1FBA7}": { type: 2, data: "M0,.5 L.5,0 L1,.5", strokeWidth: 1 }, "\\u{1FBA8}": { type: 2, data: "M.5,0 L0,.5 M1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBA9}": { type: 2, data: "M.5,0 L1,.5 M0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAA}": { type: 2, data: "M.5,0 L1,.5 L.5,1 L0,.5", strokeWidth: 1 }, "\\u{1FBAB}": { type: 2, data: "M.5,0 L0,.5 L.5,1 L1,.5", strokeWidth: 1 }, "\\u{1FBAC}": { type: 2, data: "M0,.5 L.5,0 L1,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAD}": { type: 2, data: "M1,.5 L.5,0 L0,.5 L.5,1", strokeWidth: 1 }, "\\u{1FBAE}": { type: 2, data: "M.5,0 L1,.5 L.5,1 L0,.5 Z", strokeWidth: 1 }, "\\u{1FBAF}": { type: 2, data: "M0,.5 L1,.5 M.5,.35 L.5,.65", strokeWidth: 1 }, "\\u{1FBB0}": { type: 3, data: "M0.1,0.2 L0.1,.8 L.4,.6 L.9,0.6 Z", scaleType: 1 }, "\\u{1FBB1}": { type: 4, data: { d: "M.1,.525 L.35,.675 L.9,.35", type: 1 }, scaleType: 1 }, "\\u{1FBB2}": { type: 3, data: "M.29,.27 L0.13,.56 L.22,.59 L.35,0.35 L.67,.35 L.57,.57 L.71,.76 L.22,.76 L.42,1 L.53,.98 L.43,.86 L.9,.86 L.71,.6 L1,.6 L1,.52 L.83,.52 L.92,.36 L1,.36 L1,.27Z M.99,.13 A.12,.12,0,1,1,.75,.13 A.12,.12,0,1,1,.99,.13" }, "\\u{1FBB3}": { type: 3, data: "M0,.27 L.3,.27 L.55,.12 L.63,.18 L.33,.36 L0,.36 M0,.52 L.33,.52 L.59,.89 L.73,.89 L.73,.98 L.53,.98 L.28,.6 L0,.6" }, "\\u{1FBB4}": { type: 4, data: { d: "M.15,.55 L.5,.4 L.5,.45 L.65,.45 L.65,.35 L.85,.35 L.85,.625 L.5,.625 L.5,.7 Z", type: 0 }, scaleType: 1 }, "\\u{1FBB5}": [{ type: 5, data: { d: "M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z", type: 0 } }, { type: 5, data: { d: "M.15,.5 L.5,.35 L.5,.425 L.85,.425 L.85,.575 L.5,.575 L.5,.65 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB6}": [{ type: 5, data: { d: "M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z", type: 0 } }, { type: 5, data: { d: "M.85,.5 L.5,.35 L.5,.425 L.15,.425 L.15,.575 L.5,.575 L.5,.65 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB7}": [{ type: 5, data: { d: "M.875,0 L1,0 L1,1 L.875,1 Z", type: 0 } }, { type: 5, data: { d: "M.5,.675 L.2,.5 L.35,.5 L.35,.325 L.65,.325 L.65,.5 L.8,.5 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB8}": [{ type: 5, data: { d: "M.875,0 L1,0 L1,1 L.875,1 Z", type: 0 } }, { type: 5, data: { d: "M.5,.325 L.2,.5 L.35,.5 L.35,.675 L.65,.675 L.65,.5 L.8,.5 Z", type: 0 }, scaleType: 1 }], "\\u{1FBB9}": { type: 5, data: { d: "M1,.89 L.11,.89 L.11,.37 L.36,.12 L.74,.12 L.96,.34 L1,.34 L1,.405 L.92,.405 L.69,.185 L.41,.185 L.21,.42 L.21,.825 L1,.825 Z", type: 0 } }, "\\u{1FBBA}": { type: 5, data: { d: "M0,.89 L0,.825 L.78,.825 L.78,.53 L.7,.415 L0,.415 L0,.35 L.75,.35 L.88,.48 L.88,.89 Z", type: 0 } }, "\\u{1FBBB}": { type: 5, data: { d: "M.31,.275 L.44,.275 L.44,.47 L.05,.47 L.05,.405 L.31,.405 Z M.56,.275 L.69,.275 L.69,.405 L.95,.405 L.95,.47 L.56,.47 Z M.05,.53 L.44,.53 L.44,.725 L.31,.725 L.31,.595 L.05,.595 Z M.56,.53 L.95,.53 L.95,.595 L.69,.595 L.69,.725 L.56,.725 Z", type: 0 }, scaleType: 1 }, "\\u{1FBBC}": [{ type: 3, data: "M0,0 L1,0 L1,1 L0,1 L0,.935 L.885,.935 L.885,.065 L0,.065 Z" }, { type: 3, data: "M.67,.5 A.17,.085,0,1,1,.33,.5 A.17,.085,0,1,1,.67,.5", scaleType: 1 }], "\\u{1FBBD}": { type: 4, data: { d: "M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1 Z", type: 1 } }, "\\u{1FBBE}": { type: 4, data: { d: "M1,.5 L.5,1", type: 1 } }, "\\u{1FBBF}": { type: 4, data: { d: "M.5,0 L1,.5 L.5,1 L0,.5 Z", type: 1 } }, "\\u{1FBC0}": { type: 3, data: "M.16,.445 A.02,.01,0,0,1,.39,.33 L.5,.375 L.61,.33 A.02,.01,0,0,1,.84,.445 L.75,.5 L.84,.555 A.02,.01,0,0,1,.61,.67 L.5,.625 L.39,.67 A.02,.01,0,0,1,.16,.555 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z", scaleType: 1 }, "\\u{1FBC1}": { type: 3, data: "M0.142308,0.924 Q0.130770,0.924,0.120193,0.922 T0.101924,0.916 T0.089424,0.9065 T0.084616,0.895 V0.025 Q0.084616,0.019,0.089424,0.0135 T0.101924,0.004 T0.120193,-0.002 T0.142308,-0.004 Q0.150000,-0.004,0.157693,-0.003 T0.173078,0.000 L0.430770,0.085 Q0.451924,0.059,0.494232,0.041 T0.587501,0.013 T0.692309,-0.0005 T0.800001,-0.004 H1 V0.055 H0.800001 Q0.771155,0.055,0.742309,0.056 T0.685578,0.060 T0.630770,0.0685 T0.580770,0.0825 T0.543270,0.1045 T0.528847,0.133 V0.647 H0.530770 Q0.596155,0.645,0.659616,0.638 T0.782693,0.6165 T0.893270,0.5805 T1,0.531 V0.623 Q0.934616,0.644,0.880770,0.6595 T0.769232,0.685 T0.650963,0.700 T0.528847,0.707 V0.787 Q0.528847,0.802,0.543270,0.8155 T0.580770,0.8375 T0.630770,0.8515 T0.685578,0.860 T0.742309,0.864 T0.800001,0.865 H1 V0.924 H0.800001 Q0.746155,0.924,0.692309,0.9205 T0.587501,0.907 T0.494232,0.879 T0.430770,0.835 L0.173078,0.920 Q0.165386,0.922,0.157693,0.923 T0.142308,0.924 Z M0.2,0.841 L0.415385,0.770 V0.150 L0.2,0.079 V0.841 Z M1,0.698 Q0.973077,0.694,0.969231,0.6885 T0.965385,0.677 Q0.965385,0.672,0.969231,0.6665 T1,0.657 V0.698 Z" }, "\\u{1FBC2}": { type: 3, data: "M0,0.623 V0.531 Q0.044231,0.512,0.0625,0.4905 T0.092308,0.4465 T0.108654,0.4005 T0.113462,0.354 V0.351 Q0.113462,0.345,0.117308,0.3395 T0.129808,0.3305 T0.148846,0.3245 T0.171154,0.323 H0.501923 Q0.532692,0.323,0.563462,0.3185 T0.617308,0.303 T0.651923,0.2765 T0.663462,0.2435 V0.241 Q0.663462,0.219,0.657692,0.197 T0.639423,0.1545 T0.604808,0.115 T0.549615,0.082 T0.475577,0.0615 T0.392308,0.055 H0 V-0.004 H1 V0.055 H0.667308 Q0.694231,0.071,0.713462,0.09 T0.746154,0.129 T0.766346,0.1705 T0.775,0.213 H1 V0.316 Q0.971154,0.305,0.955769,0.2965 T0.920192,0.2825 T0.876923,0.2745 T0.830769,0.272 H0.773077 Q0.767308,0.297,0.743269,0.319 T0.680769,0.355 T0.595192,0.375 T0.501923,0.381 H0.227308 Q0.223462,0.415,0.211,0.4485 T0.172692,0.5135 T0.108269,0.573 T0,0.623 Z M0.611538,0.924 H0 V0.865 H0.611538 Q0.642308,0.865,0.673077,0.8605 T0.727885,0.845 T0.762308,0.8185 T0.773077,0.787 V0.785 Q0.773077,0.769,0.762308,0.7535 T0.727885,0.727 T0.673077,0.7115 T0.611538,0.707 H0.059615 Q0.048077,0.707,0.037115,0.7045 T0,0.694 V0.653 Q0.026923,0.648,0.037115,0.646 T0.059615,0.644 H0.722692 Q0.753462,0.644,0.784231,0.6395 T0.839038,0.624 T0.873846,0.5975 T0.884615,0.566 V0.564 Q0.884615,0.548,0.873846,0.532 T0.839038,0.5055 T0.784231,0.49 T0.722692,0.4855 H0.392308 Q0.380769,0.4855,0.370192,0.483 T0.351923,0.4765 T0.339423,0.467 T0.334615,0.4555 T0.339423,0.444 T0.351923,0.4345 T0.370192,0.428 T0.392308,0.4255 H0.832692 Q0.855769,0.4255,0.878846,0.4235 T0.922115,0.416 T0.957692,0.4015 T1,0.3815 V0.4685 Q0.975,0.4705,0.966346,0.4725 T0.95,0.4765 Q0.961538,0.4835,0.969231,0.4915 T1,0.5075 V0.6205 Q0.965385,0.6455,0.926923,0.665 T0.84,0.6935 Q0.866923,0.7115,0.877596,0.7345 T0.894231,0.7855 V0.787 Q0.894231,0.815,0.876923,0.8425 T0.820192,0.8895 T0.726923,0.916 T0.611538,0.924 Z" }, "\\u{1FBC3}": { type: 3, data: "M0,0.473 V0.386 Q0.025490,0.378,0.028431,0.3695 T0.031373,0.352 V0.35 Q0.031373,0.342,0.028431,0.333 T0,0.316 V0.213 H0.652941 Q0.684314,0.213,0.715686,0.2085 T0.770588,0.193 T0.804902,0.1665 T0.815686,0.135 V0.133 Q0.815686,0.117,0.804902,0.101 T0.770588,0.0745 T0.715686,0.0595 T0.652941,0.055 H0 V-0.004 H0.652941 Q0.707843,-0.004,0.761765,0.004 T0.856863,0.031 T0.915686,0.0775 T0.933333,0.133 V0.135 Q0.933333,0.163,0.915686,0.1905 T0.856863,0.237 T0.761765,0.264 T0.652941,0.272 H0.109804 Q0.131373,0.29,0.140196,0.31 T0.149020,0.35 V0.352 Q0.149020,0.37,0.142157,0.388 T0.118627,0.4225 T0.076471,0.452 T0,0.473 Z M0,0.625 V0.513 Q0.029412,0.526,0.032353,0.54 T0.035294,0.568 V0.57 Q0.035294,0.584,0.032353,0.598 T0,0.625 Z" }, "\\u{1FBC4}": { type: 3, data: "M0.019231,1.085 V-0.165 H0.980769 V1.085 H0.019231 Z M0.446154,0.527 H0.553846 Q0.553846,0.511,0.5625,0.495 T0.591346,0.466 T0.631731,0.4405 T0.666346,0.4135 T0.688462,0.3825 T0.696154,0.35 Q0.696154,0.33,0.682692,0.311 T0.641346,0.2785 T0.575,0.259 T0.498077,0.253 T0.421154,0.259 T0.356731,0.279 T0.315385,0.3125 T0.301923,0.352 V0.357 H0.409615 V0.354 Q0.409615,0.345,0.414423,0.335 T0.431731,0.318 T0.4625,0.3075 T0.498077,0.304 Q0.517308,0.304,0.534615,0.307 T0.564423,0.3165 T0.582692,0.332 T0.588462,0.35 Q0.588462,0.366,0.572115,0.3805 T0.535577,0.4075 T0.496154,0.4335 T0.465385,0.4625 T0.45,0.4945 T0.446154,0.527 Z M0.5,0.667 Q0.519231,0.667,0.5375,0.664 T0.569231,0.654 T0.588462,0.637 T0.594231,0.617 T0.588462,0.5975 T0.569231,0.581 T0.5375,0.571 T0.5,0.568 T0.4625,0.571 T0.430769,0.581 T0.411538,0.5975 T0.405769,0.617 T0.411538,0.637 T0.430769,0.654 T0.4625,0.664 T0.5,0.667 Z", scaleType: 1 }, "\\u{1FBC5}": { type: 5, data: { d: "M.44,.425 L.44,.51 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.51 L.56,.425 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC6}": { type: 5, data: { d: "M.44,.425 L.44,.46 L.23,.385 L.19,.43 L.44,.51 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.61,.735 L.7,.71 L.56,.56 L.56,.51 L.81,.43 L.77,.385 L.56,.46 L.56,.425 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC7}": { type: 5, data: { d: "M.44,.425 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.425 Z M.18,.53 L.23,.575 L.81,.43 L.77,.385 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC8}": { type: 5, data: { d: "M.44,.425 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.62,.735 L.71,.71 L.56,.56 L.56,.425 Z M.23,.385 L.18,.43 L.77,.575 L.81,.53 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBC9}": { type: 5, data: { d: "M.44,.425 L.45,.495 L.15,.645 L.34,.645 L.34,.7 L.44,.7 L.44,.645 L.56,.645 L.56,.7 L.66,.7 L.66,.645 L.84,.645 L.54,.495 L.56,.425 Z M.39,.6 L.5,.55 L.60,.6 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCA}": { type: 5, data: { d: "M.26,.375 L.5,.255 L.74,.375 L.74,.665 L.5,.55 L.26,.665 Z M.37,.395 L.37,.54 L.5,.475 L.63,.54 L.63,.395 L.5,.33 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCB}": { type: 5, data: { d: "M.09,.41 L.32,.295 L.5,.375 L.68,.295 L.91,.41 L.75,.5 L.91,.59 L.68,.705 L.5,.625 L.32,.705 L.09,.59 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCC}": { type: 5, data: { d: "M.55,.305 L.88,.305 L.88,.355 L.65,.355 L.65,.47 L.88,.47 L.88,.52 L.55,.52 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCD}": { type: 5, data: { d: "M.38,.39 L.5,.33 L.62,.39 L.62,.53 L.5,.47 L.38,.53 Z", type: 0 }, scaleType: 1 }, "\\u{1FBCE}": { type: 3, data: "M0,0 L0.6667,0 L0.6667,1 L0,1 Z" }, "\\u{1FBCF}": { type: 3, data: "M0,0 L0.3333,0 L0.3333,1 L0,1 Z" }, "\\u{1FBD0}": { type: 2, data: "M1,.5 L0,1", strokeWidth: 1 }, "\\u{1FBD1}": { type: 2, data: "M1,0 L0,.5", strokeWidth: 1 }, "\\u{1FBD2}": { type: 2, data: "M0,0 L1,.5", strokeWidth: 1 }, "\\u{1FBD3}": { type: 2, data: "M0,.5 L1,1", strokeWidth: 1 }, "\\u{1FBD4}": { type: 2, data: "M0,0 L.5,1", strokeWidth: 1 }, "\\u{1FBD5}": { type: 2, data: "M.5,0 L1,1", strokeWidth: 1 }, "\\u{1FBD6}": { type: 2, data: "M1,0 L.5,1", strokeWidth: 1 }, "\\u{1FBD7}": { type: 2, data: "M.5,0 L0,1", strokeWidth: 1 }, "\\u{1FBD8}": { type: 2, data: "M0,0 L.5,.5 L1,0", strokeWidth: 1 }, "\\u{1FBD9}": { type: 2, data: "M1,0 L.5,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDA}": { type: 2, data: "M0,1 L.5,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDB}": { type: 2, data: "M0,0 L.5,.5 L0,1", strokeWidth: 1 }, "\\u{1FBDC}": { type: 2, data: "M0,0 L.5,1 L1,0", strokeWidth: 1 }, "\\u{1FBDD}": { type: 2, data: "M1,0 L0,.5 L1,1", strokeWidth: 1 }, "\\u{1FBDE}": { type: 2, data: "M0,1 L.5,0 L1,1", strokeWidth: 1 }, "\\u{1FBDF}": { type: 2, data: "M0,0 L1,.5 L0,1", strokeWidth: 1 }, "\\u{1FBE0}": { type: 5, data: { d: "M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0", type: 1 } }, "\\u{1FBE1}": { type: 5, data: { d: "M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1", type: 1 } }, "\\u{1FBE2}": { type: 5, data: { d: "M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1", type: 1 } }, "\\u{1FBE3}": { type: 5, data: { d: "M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1", type: 1 } }, "\\u{1FBE4}": { type: 0, data: [{ x: 2, y: 0, w: 4, h: 4 }] }, "\\u{1FBE5}": { type: 0, data: [{ x: 2, y: 4, w: 4, h: 4 }] }, "\\u{1FBE6}": { type: 0, data: [{ x: 0, y: 2, w: 4, h: 4 }] }, "\\u{1FBE7}": { type: 0, data: [{ x: 4, y: 2, w: 4, h: 4 }] }, "\\u{1FBE8}": { type: 5, data: { d: "M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0 Z", type: 0 } }, "\\u{1FBE9}": { type: 5, data: { d: "M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1 Z", type: 0 } }, "\\u{1FBEA}": { type: 5, data: { d: "M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1 Z", type: 0 } }, "\\u{1FBEB}": { type: 5, data: { d: "M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1 Z", type: 0 } }, "\\u{1FBEC}": { type: 5, data: { d: "M1,0 L.5,0 C.5,.276,.724,.5,1,.5 Z", type: 0 } }, "\\u{1FBED}": { type: 5, data: { d: "M0,1 L.5,1 C.5,.724,.276,.5,0,.5 Z", type: 0 } }, "\\u{1FBEE}": { type: 5, data: { d: "M1,1 L1,.5 C.724,.5,.5,.724,.5,1 Z", type: 0 } }, "\\u{1FBEF}": { type: 5, data: { d: "M0,0 L0,.5 C.276,.5,.5,.276,.5,0 Z", type: 0 } }, "\\u{1FBF0}": { type: 5, data: { d: a0(126), type: 0 }, scaleType: 1 }, "\\u{1FBF1}": { type: 5, data: { d: a0(48), type: 0 }, scaleType: 1 }, "\\u{1FBF2}": { type: 5, data: { d: a0(109), type: 0 }, scaleType: 1 }, "\\u{1FBF3}": { type: 5, data: { d: a0(121), type: 0 }, scaleType: 1 }, "\\u{1FBF4}": { type: 5, data: { d: a0(51), type: 0 }, scaleType: 1 }, "\\u{1FBF5}": { type: 5, data: { d: a0(91), type: 0 }, scaleType: 1 }, "\\u{1FBF6}": { type: 5, data: { d: a0(95), type: 0 }, scaleType: 1 }, "\\u{1FBF7}": { type: 5, data: { d: a0(114), type: 0 }, scaleType: 1 }, "\\u{1FBF8}": { type: 5, data: { d: a0(127), type: 0 }, scaleType: 1 }, "\\u{1FBF9}": { type: 5, data: { d: a0(123), type: 0 }, scaleType: 1 }, "\\u{1FBFA}": { type: 5, data: { d: "M.5,.175 C.2,.175,.15,.305,.15,.435 L.05,.63 L.35,.63 C.35,.682,.42,.76,.5,.76 C.58,.76,.65,.682,.65,.63 L.95,.63 L.85,.435 C.85,.305,.8,.175,.5,.175 Z", type: 0 }, scaleType: 1 }, ...Object.fromEntries(Array.from({ length: 256 }, (i5, e) => [String.fromCodePoint(10240 + e), { type: 6, data: e }])) };\n  var Ye = /* @__PURE__ */ new Set([9617, 9618, 9619, 129932, 129933, 129934, 129935, 129936, 129937, 129938, 129940, 129948, 129949, 129950, 129951]);\n  function f4(i5) {\n    return { type: 2, data: () => {\n      let e = [], r = [0.375, 0.25, 0.375], n11 = [0, 3 / 8, 5 / 8];\n      for (let a2 = 0; a2 < 3; a2++) {\n        let s4 = i5 >> a2 * 2 & 1, o2 = i5 >> a2 * 2 + 1 & 1;\n        s4 && o2 ? e.push(`M0,${n11[a2]} L1,${n11[a2]} L1,${n11[a2] + r[a2]} L0,${n11[a2] + r[a2]} Z`) : s4 ? e.push(`M0,${n11[a2]} L${0.5},${n11[a2]} L${0.5},${n11[a2] + r[a2]} L0,${n11[a2] + r[a2]} Z`) : o2 && e.push(`M${0.5},${n11[a2]} L1,${n11[a2]} L1,${n11[a2] + r[a2]} L${0.5},${n11[a2] + r[a2]} Z`);\n      }\n      return e.join(" ");\n    } };\n  }\n  function a0(i5) {\n    let e = [];\n    if (i5 & 64) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.2125} L${Q3 + 0.075},${0.175} L${m4 - 0.075},${0.175} L${m4},${0.2125} L${m4 - 0.075},${0.25} L${Q3 + 0.075},${0.25} Z`);\n    }\n    if (i5 & 32) {\n      let u3 = 0.7999999999999999, p3 = 0.95 - 0.15 / 2, C4 = 0.95, Q3 = 0.175 + 0.075 + 0.015, m4 = 0.5 - 0.015;\n      e.push(`M${p3},${Q3} L${C4},${Q3 + 0.0375} L${C4},${m4 - 0.0375} L${p3},${m4} L${u3},${m4 - 0.0375} L${u3},${Q3 + 0.0375} Z`);\n    }\n    if (i5 & 16) {\n      let u3 = 0.7999999999999999, p3 = 0.95 - 0.15 / 2, C4 = 0.95, Q3 = 0.5 + 0.015, m4 = 0.825 - 0.075 - 0.015;\n      e.push(`M${p3},${Q3} L${C4},${Q3 + 0.0375} L${C4},${m4 - 0.0375} L${p3},${m4} L${u3},${m4 - 0.0375} L${u3},${Q3 + 0.0375} Z`);\n    }\n    if (i5 & 8) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.7875} L${Q3 + 0.075},${0.75} L${m4 - 0.075},${0.75} L${m4},${0.7875} L${m4 - 0.075},${0.825} L${Q3 + 0.075},${0.825} Z`);\n    }\n    if (i5 & 4 && e.push(`M${0.125},${0.515} L${0.2},${0.515 + 0.0375} L${0.2},${0.735 - 0.0375} L${0.125},${0.735} L${0.05},${0.735 - 0.0375} L${0.05},${0.515 + 0.0375} Z`), i5 & 2 && e.push(`M${0.125},${0.265} L${0.2},${0.265 + 0.0375} L${0.2},${0.485 - 0.0375} L${0.125},${0.485} L${0.05},${0.485 - 0.0375} L${0.05},${0.265 + 0.0375} Z`), i5 & 1) {\n      let Q3 = 0.21500000000000002, m4 = 0.95 - 0.15 - 0.015;\n      e.push(`M${Q3},${0.5} L${Q3 + 0.075},${0.4625} L${m4 - 0.075},${0.4625} L${m4},${0.5} L${m4 - 0.075},${0.5375} L${Q3 + 0.075},${0.5375} Z`);\n    }\n    return e.join(" ");\n  }\n  var k3 = 0;\n  var H3 = 0;\n  var o0 = false;\n  var d0 = false;\n  var X0 = false;\n  var K2;\n  var w0 = 0;\n  var Y0 = class {\n    constructor(e, t, r, n11, a2, s4) {\n      this._terminal = e;\n      this._optionService = t;\n      this._selectionRenderModel = r;\n      this._decorationService = n11;\n      this._coreBrowserService = a2;\n      this._themeService = s4;\n      this.result = { fg: 0, bg: 0, ext: 0 };\n    }\n    resolve(e, t, r, n11, a2) {\n      this.result.bg = e.bg, this.result.fg = e.fg, this.result.ext = e.bg & 268435456 ? e.extended.ext : 0, H3 = 0, k3 = 0, d0 = false, o0 = false, X0 = false, K2 = this._themeService.colors, w0 = 0;\n      let s4 = e.getCode();\n      if (s4 !== 0 && e.extended.underlineStyle === 4) {\n        let o2 = Math.max(1, Math.floor(this._optionService.rawOptions.fontSize * this._coreBrowserService.dpr / 15));\n        w0 = t * n11 % (Math.round(o2) * 2);\n      }\n      if (w0 === 0 && Ye.has(s4) && (w0 = t * n11 % 2 * 2 + r * a2 % 2), this._decorationService.forEachDecorationAtCell(t, r, "bottom", (o2) => {\n        o2.backgroundColorRGB && (H3 = o2.backgroundColorRGB.rgba >> 8 & 16777215, d0 = true), o2.foregroundColorRGB && (k3 = o2.foregroundColorRGB.rgba >> 8 & 16777215, o0 = true);\n      }), X0 = this._selectionRenderModel.isCellSelected(this._terminal, t, r), X0) {\n        if (this.result.fg & 67108864 || (this.result.bg & 50331648) !== 0) {\n          if (this.result.fg & 67108864) switch (this.result.fg & 50331648) {\n            case 16777216:\n            case 33554432:\n              H3 = this._themeService.colors.ansi[this.result.fg & 255].rgba;\n              break;\n            case 50331648:\n              H3 = (this.result.fg & 16777215) << 8 | 255;\n              break;\n            case 0:\n            default:\n              H3 = this._themeService.colors.foreground.rgba;\n          }\n          else switch (this.result.bg & 50331648) {\n            case 16777216:\n            case 33554432:\n              H3 = this._themeService.colors.ansi[this.result.bg & 255].rgba;\n              break;\n            case 50331648:\n              H3 = (this.result.bg & 16777215) << 8 | 255;\n              break;\n          }\n          H3 = h0.blend(H3, (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba & 4294967040 | 128) >> 8 & 16777215;\n        } else H3 = (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba >> 8 & 16777215;\n        if (d0 = true, K2.selectionForeground && (k3 = K2.selectionForeground.rgba >> 8 & 16777215, o0 = true), z0(e.getCode())) {\n          if (this.result.fg & 67108864 && (this.result.bg & 50331648) === 0) k3 = (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba >> 8 & 16777215;\n          else {\n            if (this.result.fg & 67108864) switch (this.result.bg & 50331648) {\n              case 16777216:\n              case 33554432:\n                k3 = this._themeService.colors.ansi[this.result.bg & 255].rgba;\n                break;\n              case 50331648:\n                k3 = (this.result.bg & 16777215) << 8 | 255;\n                break;\n            }\n            else switch (this.result.fg & 50331648) {\n              case 16777216:\n              case 33554432:\n                k3 = this._themeService.colors.ansi[this.result.fg & 255].rgba;\n                break;\n              case 50331648:\n                k3 = (this.result.fg & 16777215) << 8 | 255;\n                break;\n              case 0:\n              default:\n                k3 = this._themeService.colors.foreground.rgba;\n            }\n            k3 = h0.blend(k3, (this._coreBrowserService.isFocused ? K2.selectionBackgroundOpaque : K2.selectionInactiveBackgroundOpaque).rgba & 4294967040 | 128) >> 8 & 16777215;\n          }\n          o0 = true;\n        }\n      }\n      this._decorationService.forEachDecorationAtCell(t, r, "top", (o2) => {\n        o2.backgroundColorRGB && (H3 = o2.backgroundColorRGB.rgba >> 8 & 16777215, d0 = true), o2.foregroundColorRGB && (k3 = o2.foregroundColorRGB.rgba >> 8 & 16777215, o0 = true);\n      }), d0 && (X0 ? H3 = e.bg & -16777216 & -134217729 | H3 | 50331648 : H3 = e.bg & -16777216 | H3 | 50331648), o0 && (k3 = e.fg & -16777216 & -67108865 | k3 | 50331648), this.result.fg & 67108864 && (d0 && !o0 && ((this.result.bg & 50331648) === 0 ? k3 = this.result.fg & -134217728 | K2.background.rgba >> 8 & 16777215 & 16777215 | 50331648 : k3 = this.result.fg & -134217728 | this.result.bg & 67108863, o0 = true), !d0 && o0 && ((this.result.fg & 50331648) === 0 ? H3 = this.result.bg & -67108864 | K2.foreground.rgba >> 8 & 16777215 & 16777215 | 50331648 : H3 = this.result.bg & -67108864 | this.result.fg & 67108863, d0 = true)), K2 = void 0, this.result.bg = d0 ? H3 : this.result.bg, this.result.fg = o0 ? k3 : this.result.fg, this.result.ext &= 536870911, this.result.ext |= w0 << 29 & 3758096384;\n    }\n  };\n  var je2 = 0.5;\n  var q0 = Ue2 || We2 ? "bottom" : "ideographic";\n  function it2(i5, e, t, r, n11, a2, s4, o2, l4, T4, h3, d3 = 0) {\n    let _5 = Xe2[e];\n    if (_5) {\n      let c2 = Array.isArray(_5) ? _5 : [_5];\n      for (let u3 of c2) Zt(i5, u3, t, r, n11, a2, s4, o2, l4, T4, h3, d3);\n      return true;\n    }\n    return false;\n  }\n  function Zt(i5, e, t, r, n11, a2, s4, o2, l4, T4, h3, d3 = 0) {\n    let _5 = n11, c2 = a2, u3 = t, p3 = r;\n    switch (e.scaleType === 1 && (_5 = s4, c2 = o2, u3 = t + (n11 - s4) / 2, p3 = r + (a2 - o2) / 2), e.clipPath && (i5.save(), Xt(i5, e.clipPath, u3, p3, _5, c2)), e.type) {\n      case 0:\n        Ut(i5, e.data, u3, p3, _5, c2);\n        break;\n      case 1:\n        Kt(i5, e.data, u3, p3, _5, c2, d3);\n        break;\n      case 2:\n        zt(i5, e.data, u3, p3, _5, c2, T4, e.strokeWidth);\n        break;\n      case 3:\n        Vt(i5, e.data, u3, p3, _5, c2, T4, e.strokeWidth);\n        break;\n      case 4:\n        Gt(i5, e.data, u3, p3, _5, c2, T4, h3);\n        break;\n      case 5:\n        Yt(i5, e.data, u3, p3, _5, c2, l4, T4);\n        break;\n      case 6:\n        Wt(i5, e.data, u3, p3, _5, c2);\n        break;\n    }\n    e.clipPath && i5.restore();\n  }\n  function Ut(i5, e, t, r, n11, a2) {\n    for (let s4 = 0; s4 < e.length; s4++) {\n      let o2 = e[s4], l4 = n11 / 8, T4 = a2 / 8;\n      i5.fillRect(t + o2.x * l4, r + o2.y * T4, o2.w * l4, o2.h * T4);\n    }\n  }\n  var Je2 = new Uint8Array([1, 0, 1, 2, 1, 4, 5, 0, 5, 2, 5, 4, 1, 6, 5, 6]);\n  function Wt(i5, e, t, r, n11, a2) {\n    let s4 = n11 / 8, o2 = a2 * 0.1, T4 = a2 * 0.8 / 8, h3 = Math.min(s4, T4);\n    for (let d3 = 0; d3 < 8; d3++) if (e & 1 << d3) {\n      let _5 = Je2[d3 * 2], c2 = Je2[d3 * 2 + 1], u3 = t + (_5 + 1) * s4, p3 = r + o2 + (c2 + 1) * T4;\n      i5.beginPath(), i5.arc(u3, p3, h3, 0, Math.PI * 2), i5.fill();\n    }\n  }\n  function Vt(i5, e, t, r, n11, a2, s4, o2) {\n    let l4 = typeof e == "string" ? e : e(0, 0);\n    i5.beginPath();\n    let T4 = 0, h3 = 0, d3 = 0, _5 = 0, c2 = "";\n    for (let u3 of l4.split(" ")) {\n      let p3 = u3[0], C4 = u3.substring(1).split(",");\n      if (p3 === "Z") {\n        i5.closePath(), c2 = p3;\n        continue;\n      }\n      if (p3 === "V") {\n        let m4 = r + parseFloat(C4[0]) * a2;\n        i5.lineTo(T4, m4), h3 = m4, d3 = T4, _5 = h3, c2 = p3;\n        continue;\n      }\n      if (p3 === "H") {\n        let m4 = t + parseFloat(C4[0]) * n11;\n        i5.lineTo(m4, h3), T4 = m4, d3 = T4, _5 = h3, c2 = p3;\n        continue;\n      }\n      if (!C4[0] || !C4[1]) continue;\n      if (p3 === "A") {\n        let m4 = parseFloat(C4[0]) * n11, R4 = parseFloat(C4[1]) * a2, F4 = parseFloat(C4[2]) * Math.PI / 180, b4 = parseInt(C4[3]), A4 = parseInt(C4[4]), X3 = t + parseFloat(C4[5]) * n11, z4 = r + parseFloat(C4[6]) * a2;\n        $t(i5, T4, h3, m4, R4, F4, b4, A4, X3, z4), T4 = X3, h3 = z4;\n        continue;\n      }\n      let Q3 = C4.map((m4, R4) => {\n        let F4 = parseFloat(m4);\n        return R4 % 2 === 0 ? t + F4 * n11 : r + F4 * a2;\n      });\n      if (p3 === "M") i5.moveTo(Q3[0], Q3[1]), T4 = Q3[0], h3 = Q3[1], d3 = T4, _5 = h3;\n      else if (p3 === "L") i5.lineTo(Q3[0], Q3[1]), T4 = Q3[0], h3 = Q3[1], d3 = T4, _5 = h3;\n      else if (p3 === "Q") i5.quadraticCurveTo(Q3[0], Q3[1], Q3[2], Q3[3]), d3 = Q3[0], _5 = Q3[1], T4 = Q3[2], h3 = Q3[3];\n      else if (p3 === "T") {\n        let m4, R4;\n        c2 === "Q" || c2 === "T" ? (m4 = 2 * T4 - d3, R4 = 2 * h3 - _5) : (m4 = T4, R4 = h3), i5.quadraticCurveTo(m4, R4, Q3[0], Q3[1]), d3 = m4, _5 = R4, T4 = Q3[0], h3 = Q3[1];\n      } else p3 === "C" && (i5.bezierCurveTo(Q3[0], Q3[1], Q3[2], Q3[3], Q3[4], Q3[5]), d3 = Q3[2], _5 = Q3[3], T4 = Q3[4], h3 = Q3[5]);\n      c2 = p3;\n    }\n    o2 !== void 0 ? (i5.strokeStyle = i5.fillStyle, i5.lineWidth = s4 * o2, i5.stroke()) : i5.fill();\n  }\n  function $t(i5, e, t, r, n11, a2, s4, o2, l4, T4) {\n    if (r === 0 || n11 === 0) {\n      i5.lineTo(l4, T4);\n      return;\n    }\n    r = Math.abs(r), n11 = Math.abs(n11);\n    let h3 = Math.cos(a2), d3 = Math.sin(a2), _5 = (e - l4) / 2, c2 = (t - T4) / 2, u3 = h3 * _5 + d3 * c2, p3 = -d3 * _5 + h3 * c2, C4 = r * r, Q3 = n11 * n11, m4 = u3 * u3, R4 = p3 * p3, F4 = m4 / C4 + R4 / Q3;\n    if (F4 > 1) {\n      let I4 = Math.sqrt(F4);\n      r *= I4, n11 *= I4, C4 = r * r, Q3 = n11 * n11;\n    }\n    let b4 = (C4 * Q3 - C4 * R4 - Q3 * m4) / (C4 * R4 + Q3 * m4);\n    b4 < 0 && (b4 = 0);\n    let A4 = (s4 === o2 ? -1 : 1) * Math.sqrt(b4), X3 = A4 * (r * p3 / n11), z4 = A4 * -(n11 * u3 / r), x0 = h3 * X3 - d3 * z4 + (e + l4) / 2, e0 = d3 * X3 + h3 * z4 + (t + T4) / 2, T0 = (u3 - X3) / r, M4 = (p3 - z4) / n11, l0 = (-u3 - X3) / r, t0 = (-p3 - z4) / n11, Y2 = Math.atan2(M4, T0), n0 = Math.atan2(t0, l0) - Y2;\n    o2 === 0 && n0 > 0 ? n0 -= 2 * Math.PI : o2 === 1 && n0 < 0 && (n0 += 2 * Math.PI);\n    let D0 = Y2 + n0;\n    i5.ellipse(x0, e0, r, n11, a2, Y2, D0, o2 === 0);\n  }\n  function Gt(i5, e, t, r, n11, a2, s4, o2) {\n    i5.save(), i5.fillRect(t, r, n11, a2), o2 && (i5.fillStyle = o2, i5.strokeStyle = o2), i5.lineWidth = s4, i5.lineCap = "square", i5.beginPath();\n    for (let l4 of e.d.split(" ")) {\n      let T4 = l4[0], h3 = l4.substring(1).split(",");\n      if (!h3[0] || !h3[1]) {\n        T4 === "Z" && i5.closePath();\n        continue;\n      }\n      let d3 = h3.map((_5, c2) => {\n        let u3 = parseFloat(_5);\n        return c2 % 2 === 0 ? t + u3 * n11 : r + u3 * a2;\n      });\n      T4 === "M" ? i5.moveTo(d3[0], d3[1]) : T4 === "L" && i5.lineTo(d3[0], d3[1]);\n    }\n    e.type === 1 ? i5.stroke() : i5.fill(), i5.restore();\n  }\n  var et = /* @__PURE__ */ new Map();\n  function Kt(i5, e, t, r, n11, a2, s4 = 0) {\n    let o2 = et.get(e);\n    o2 || (o2 = /* @__PURE__ */ new Map(), et.set(e, o2));\n    let l4 = i5.fillStyle;\n    if (typeof l4 != "string") throw new Error(`Unexpected fillStyle type "${l4}"`);\n    let T4 = o2.get(l4);\n    if (!T4) {\n      let _5 = e[0].length, c2 = e.length, u3 = i5.canvas.ownerDocument.createElement("canvas");\n      u3.width = _5, u3.height = c2;\n      let p3 = y3(u3.getContext("2d")), C4 = new ImageData(_5, c2), Q3, m4, R4, F4;\n      if (l4.startsWith("#")) Q3 = parseInt(l4.slice(1, 3), 16), m4 = parseInt(l4.slice(3, 5), 16), R4 = parseInt(l4.slice(5, 7), 16), F4 = l4.length > 7 && parseInt(l4.slice(7, 9), 16) || 1;\n      else if (l4.startsWith("rgba")) [Q3, m4, R4, F4] = l4.substring(5, l4.length - 1).split(",").map((b4) => parseFloat(b4));\n      else throw new Error(`Unexpected fillStyle color format "${l4}" when drawing pattern glyph`);\n      for (let b4 = 0; b4 < c2; b4++) for (let A4 = 0; A4 < _5; A4++) C4.data[(b4 * _5 + A4) * 4] = Q3, C4.data[(b4 * _5 + A4) * 4 + 1] = m4, C4.data[(b4 * _5 + A4) * 4 + 2] = R4, C4.data[(b4 * _5 + A4) * 4 + 3] = e[b4][A4] * (F4 * 255);\n      p3.putImageData(C4, 0, 0), T4 = y3(i5.createPattern(u3, null)), o2.set(l4, T4);\n    }\n    let h3 = s4 >> 1 & 1, d3 = s4 & 1;\n    h3 !== 0 || d3 !== 0 ? T4.setTransform(new DOMMatrix().translateSelf(-h3, -d3)) : T4.setTransform(new DOMMatrix()), i5.fillStyle = T4, i5.fillRect(t, r, n11, a2);\n  }\n  function zt(i5, e, t, r, n11, a2, s4, o2) {\n    i5.save(), i5.beginPath(), i5.rect(t, r, n11, a2), i5.clip(), i5.beginPath();\n    let l4;\n    if (typeof e == "function") {\n      let d3 = 0.15 / a2 * n11;\n      l4 = e(0.15, d3);\n    } else l4 = e;\n    let T4 = { currentX: 0, currentY: 0, lastControlX: 0, lastControlY: 0, lastCommand: "" };\n    for (let h3 of l4.split(" ")) {\n      let d3 = h3[0];\n      if (d3 === "Z") {\n        i5.closePath(), T4.lastCommand = d3;\n        continue;\n      }\n      let _5 = rt2[d3];\n      if (!_5) {\n        console.error(`Could not find drawing instructions for "${d3}"`);\n        continue;\n      }\n      let c2 = h3.substring(1).split(",");\n      !c2[0] || !c2[1] || (_5(i5, st2(c2, n11, a2, t, r, true, s4, 0, 0, false), T4), T4.lastCommand = d3);\n    }\n    o2 !== void 0 ? (i5.strokeStyle = i5.fillStyle, i5.lineWidth = s4 * o2, i5.stroke()) : i5.fill(), i5.closePath(), i5.restore();\n  }\n  function Xt(i5, e, t, r, n11, a2) {\n    i5.beginPath();\n    for (let s4 of e.split(" ")) {\n      let o2 = s4[0];\n      if (o2 === "Z") {\n        i5.closePath();\n        continue;\n      }\n      let l4 = s4.substring(1).split(",");\n      if (!l4[0] || !l4[1]) continue;\n      let T4 = t + parseFloat(l4[0]) * n11, h3 = r + parseFloat(l4[1]) * a2;\n      o2 === "M" ? i5.moveTo(T4, h3) : o2 === "L" && i5.lineTo(T4, h3);\n    }\n    i5.clip();\n  }\n  function Yt(i5, e, t, r, n11, a2, s4, o2) {\n    let l4 = new Path2D();\n    l4.rect(t, r, n11, a2), i5.clip(l4), i5.beginPath();\n    let T4 = s4 / 12;\n    i5.lineWidth = o2 * T4;\n    let h3 = { currentX: 0, currentY: 0, lastControlX: 0, lastControlY: 0, lastCommand: "" };\n    for (let d3 of e.d.split(" ")) {\n      let _5 = d3[0];\n      if (_5 === "Z") {\n        i5.closePath(), h3.lastCommand = _5;\n        continue;\n      }\n      let c2 = rt2[_5];\n      if (!c2) {\n        console.error(`Could not find drawing instructions for "${_5}"`);\n        continue;\n      }\n      let u3 = d3.substring(1).split(",");\n      !u3[0] || !u3[1] || (c2(i5, st2(u3, n11, a2, t, r, false, o2, (e.leftPadding ?? 0) * (T4 / 2), (e.rightPadding ?? 0) * (T4 / 2)), h3), h3.lastCommand = _5);\n    }\n    e.type === 1 ? (i5.strokeStyle = i5.fillStyle, i5.stroke()) : i5.fill(), i5.closePath();\n  }\n  function tt(i5, e, t = 0) {\n    return Math.max(Math.min(i5, e), t);\n  }\n  var rt2 = { C: (i5, e, t) => {\n    i5.bezierCurveTo(e[0], e[1], e[2], e[3], e[4], e[5]), t.lastControlX = e[2], t.lastControlY = e[3], t.currentX = e[4], t.currentY = e[5];\n  }, L: (i5, e, t) => {\n    i5.lineTo(e[0], e[1]), t.lastControlX = t.currentX = e[0], t.lastControlY = t.currentY = e[1];\n  }, M: (i5, e, t) => {\n    i5.moveTo(e[0], e[1]), t.lastControlX = t.currentX = e[0], t.lastControlY = t.currentY = e[1];\n  }, Q: (i5, e, t) => {\n    i5.quadraticCurveTo(e[0], e[1], e[2], e[3]), t.lastControlX = e[0], t.lastControlY = e[1], t.currentX = e[2], t.currentY = e[3];\n  }, T: (i5, e, t) => {\n    let r, n11;\n    t.lastCommand === "Q" || t.lastCommand === "T" ? (r = 2 * t.currentX - t.lastControlX, n11 = 2 * t.currentY - t.lastControlY) : (r = t.currentX, n11 = t.currentY), i5.quadraticCurveTo(r, n11, e[0], e[1]), t.lastControlX = r, t.lastControlY = n11, t.currentX = e[0], t.currentY = e[1];\n  } };\n  function st2(i5, e, t, r, n11, a2, s4, o2 = 0, l4 = 0, T4 = true) {\n    let h3 = i5.map((d3) => parseFloat(d3) || parseInt(d3));\n    if (h3.length < 2) throw new Error("Too few arguments for instruction");\n    for (let d3 = 0; d3 < h3.length; d3 += 2) {\n      if (h3[d3] *= e - o2 * s4 - l4 * s4, a2 && h3[d3] !== 0) {\n        let _5 = Math.round(h3[d3] + 0.5) - 0.5;\n        h3[d3] = T4 ? tt(_5, e, 0) : _5;\n      }\n      h3[d3] += r + o2 * s4;\n    }\n    for (let d3 = 1; d3 < h3.length; d3 += 2) {\n      if (h3[d3] *= t, a2 && h3[d3] !== 0) {\n        let _5 = Math.round(h3[d3] + 0.5) - 0.5;\n        h3[d3] = T4 ? tt(_5, t, 0) : _5;\n      }\n      h3[d3] += n11;\n    }\n    return h3;\n  }\n  var j0 = class {\n    constructor() {\n      this._data = {};\n    }\n    set(e, t, r) {\n      this._data[e] || (this._data[e] = {}), this._data[e][t] = r;\n    }\n    get(e, t) {\n      return this._data[e] ? this._data[e][t] : void 0;\n    }\n    clear() {\n      this._data = {};\n    }\n  };\n  var k0 = class {\n    constructor() {\n      this._data = new j0();\n    }\n    set(e, t, r, n11, a2) {\n      this._data.get(e, t) || this._data.set(e, t, new j0()), this._data.get(e, t).set(r, n11, a2);\n    }\n    get(e, t, r, n11) {\n      return this._data.get(e, t)?.get(r, n11);\n    }\n    clear() {\n      this._data.clear();\n    }\n  };\n  var J0 = class {\n    constructor(e) {\n      this._tasks = [];\n      this._i = 0;\n      this._logService = e;\n    }\n    enqueue(e) {\n      this._tasks.push(e), this._start();\n    }\n    flush() {\n      for (; this._i < this._tasks.length; ) this._tasks[this._i]() || this._i++;\n      this.clear();\n    }\n    clear() {\n      this._idleCallback && (this._cancelCallback(this._idleCallback), this._idleCallback = void 0), this._i = 0, this._tasks.length = 0;\n    }\n    _start() {\n      this._idleCallback || (this._idleCallback = this._requestCallback(this._process.bind(this)));\n    }\n    _process(e) {\n      this._idleCallback = void 0;\n      let t = 0, r = 0, n11 = e.timeRemaining(), a2 = 0;\n      for (; this._i < this._tasks.length; ) {\n        if (t = performance.now(), this._tasks[this._i]() || this._i++, t = Math.max(1, performance.now() - t), r = Math.max(t, r), a2 = e.timeRemaining(), r * 1.5 > a2) {\n          n11 - t < -20 && this._logService.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(n11 - t))}ms`), this._start();\n          return;\n        }\n        n11 = a2;\n      }\n      this.clear();\n    }\n  };\n  var be2 = class extends J0 {\n    _requestCallback(e) {\n      return setTimeout(() => e(this._createDeadline(16)));\n    }\n    _cancelCallback(e) {\n      clearTimeout(e);\n    }\n    _createDeadline(e) {\n      let t = performance.now() + e;\n      return { timeRemaining: () => Math.max(0, t - performance.now()) };\n    }\n  };\n  var ve = class extends J0 {\n    _requestCallback(e) {\n      return requestIdleCallback(e);\n    }\n    _cancelCallback(e) {\n      cancelIdleCallback(e);\n    }\n  };\n  var nt2 = "requestIdleCallback" in globalThis ? ve : be2;\n  var s0 = class i {\n    constructor() {\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Z0();\n    }\n    static toColorRGB(e) {\n      return [e >>> 16 & 255, e >>> 8 & 255, e & 255];\n    }\n    static fromColorRGB(e) {\n      return (e[0] & 255) << 16 | (e[1] & 255) << 8 | e[2] & 255;\n    }\n    clone() {\n      let e = new i();\n      return e.fg = this.fg, e.bg = this.bg, e.extended = this.extended.clone(), e;\n    }\n    isInverse() {\n      return this.fg & 67108864;\n    }\n    isBold() {\n      return this.fg & 134217728;\n    }\n    isUnderline() {\n      return this.hasExtendedAttrs() && this.extended.underlineStyle !== 0 ? 1 : this.fg & 268435456;\n    }\n    isBlink() {\n      return this.fg & 536870912;\n    }\n    isInvisible() {\n      return this.fg & 1073741824;\n    }\n    isItalic() {\n      return this.bg & 67108864;\n    }\n    isDim() {\n      return this.bg & 134217728;\n    }\n    isStrikethrough() {\n      return this.fg & 2147483648;\n    }\n    isProtected() {\n      return this.bg & 536870912;\n    }\n    isOverline() {\n      return this.bg & 1073741824;\n    }\n    getFgColorMode() {\n      return this.fg & 50331648;\n    }\n    getBgColorMode() {\n      return this.bg & 50331648;\n    }\n    isFgRGB() {\n      return (this.fg & 50331648) === 50331648;\n    }\n    isBgRGB() {\n      return (this.bg & 50331648) === 50331648;\n    }\n    isFgPalette() {\n      return (this.fg & 50331648) === 16777216 || (this.fg & 50331648) === 33554432;\n    }\n    isBgPalette() {\n      return (this.bg & 50331648) === 16777216 || (this.bg & 50331648) === 33554432;\n    }\n    isFgDefault() {\n      return (this.fg & 50331648) === 0;\n    }\n    isBgDefault() {\n      return (this.bg & 50331648) === 0;\n    }\n    isAttributeDefault() {\n      return this.fg === 0 && this.bg === 0;\n    }\n    getFgColor() {\n      switch (this.fg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.fg & 255;\n        case 50331648:\n          return this.fg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    getBgColor() {\n      switch (this.bg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.bg & 255;\n        case 50331648:\n          return this.bg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    hasExtendedAttrs() {\n      return this.bg & 268435456;\n    }\n    updateExtended() {\n      this.extended.isEmpty() ? this.bg &= -268435457 : this.bg |= 268435456;\n    }\n    getUnderlineColor() {\n      if (this.bg & 268435456 && ~this.extended.underlineColor) switch (this.extended.underlineColor & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.extended.underlineColor & 255;\n        case 50331648:\n          return this.extended.underlineColor & 16777215;\n        default:\n          return this.getFgColor();\n      }\n      return this.getFgColor();\n    }\n    getUnderlineColorMode() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? this.extended.underlineColor & 50331648 : this.getFgColorMode();\n    }\n    isUnderlineColorRGB() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 50331648 : this.isFgRGB();\n    }\n    isUnderlineColorPalette() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 16777216 || (this.extended.underlineColor & 50331648) === 33554432 : this.isFgPalette();\n    }\n    isUnderlineColorDefault() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 0 : this.isFgDefault();\n    }\n    getUnderlineStyle() {\n      return this.fg & 268435456 ? this.bg & 268435456 ? this.extended.underlineStyle : 1 : 0;\n    }\n    getUnderlineVariantOffset() {\n      return this.extended.underlineVariantOffset;\n    }\n  };\n  var Z0 = class i2 {\n    constructor(e = 0, t = 0) {\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = e, this._urlId = t;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(e) {\n      this._ext = e;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(e) {\n      this._ext &= -469762049, this._ext |= e << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(e) {\n      this._ext &= -67108864, this._ext |= e & 67108863;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(e) {\n      this._urlId = e;\n    }\n    get underlineVariantOffset() {\n      let e = (this._ext & 3758096384) >> 29;\n      return e < 0 ? e ^ 4294967288 : e;\n    }\n    set underlineVariantOffset(e) {\n      this._ext &= 536870911, this._ext |= e << 29 & 3758096384;\n    }\n    clone() {\n      return new i2(this._ext, this._urlId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0;\n    }\n  };\n  var U4 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (e, t, r) => {\n        if (this._disposed) return g4(() => {\n        });\n        let n11 = { fn: e, thisArgs: t };\n        this._listeners.push(n11);\n        let a2 = g4(() => {\n          let s4 = this._listeners.indexOf(n11);\n          s4 !== -1 && this._listeners.splice(s4, 1);\n        });\n        return r && (Array.isArray(r) ? r.push(a2) : r.add(a2)), a2;\n      }, this._event);\n    }\n    fire(e) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: t, thisArgs: r } = this._listeners[0];\n          t.call(r, e);\n          return;\n        }\n        default: {\n          let t = this._listeners.slice();\n          for (let { fn: r, thisArgs: n11 } of t) r.call(n11, e);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var _0;\n  ((n11) => {\n    function i5(a2, s4) {\n      return a2((o2) => s4.fire(o2));\n    }\n    n11.forward = i5;\n    function e(a2, s4) {\n      return (o2, l4, T4) => a2((h3) => o2.call(l4, s4(h3)), void 0, T4);\n    }\n    n11.map = e;\n    function t(...a2) {\n      return (s4, o2, l4) => {\n        let T4 = new B0();\n        for (let h3 of a2) T4.add(h3((d3) => s4.call(o2, d3)));\n        return l4 && (Array.isArray(l4) ? l4.push(T4) : l4.add(T4)), T4;\n      };\n    }\n    n11.any = t;\n    function r(a2, s4, o2) {\n      return s4(o2), a2((l4) => s4(l4));\n    }\n    n11.runAndSubscribe = r;\n  })(_0 ||= {});\n  var at2 = { texturePage: 0, texturePosition: { x: 0, y: 0 }, texturePositionClipSpace: { x: 0, y: 0 }, offset: { x: 0, y: 0 }, size: { x: 0, y: 0 }, sizeClipSpace: { x: 0, y: 0 } };\n  var U0 = 2;\n  var W0;\n  var j3 = class i3 {\n    constructor(e, t, r, n11) {\n      this._document = e;\n      this._config = t;\n      this._unicodeService = r;\n      this._logService = n11;\n      this._didWarmUp = false;\n      this._cacheMap = new k0();\n      this._cacheMapCombined = new k0();\n      this._pages = [];\n      this._activePages = [];\n      this._workBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 };\n      this._workAttributeData = new s0();\n      this._textureSize = 512;\n      this._onAddTextureAtlasCanvas = new U4();\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = new U4();\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._requestClearModel = false;\n      this._createNewPage(), this._tmpCanvas = ot2(e, this._config.deviceCellWidth * 4 + U0 * 2, this._config.deviceCellHeight + U0 * 2), this._tmpCtx = y3(this._tmpCanvas.getContext("2d", { alpha: this._config.allowTransparency, willReadFrequently: true }));\n    }\n    get pages() {\n      return this._pages;\n    }\n    dispose() {\n      this._tmpCanvas.remove();\n      for (let e of this.pages) e.canvas.remove();\n      this._onAddTextureAtlasCanvas.dispose();\n    }\n    warmUp() {\n      this._didWarmUp || (this._doWarmUp(), this._didWarmUp = true);\n    }\n    _doWarmUp() {\n      let e = new nt2(this._logService);\n      for (let t = 33; t < 126; t++) e.enqueue(() => {\n        if (!this._cacheMap.get(t, 0, 0, 0)) {\n          let r = this._drawToCache(t, 0, 0, 0, false, void 0);\n          this._cacheMap.set(t, 0, 0, 0, r);\n        }\n      });\n    }\n    beginFrame() {\n      return this._requestClearModel;\n    }\n    clearTexture() {\n      if (!(this._pages[0].currentRow.x === 0 && this._pages[0].currentRow.y === 0)) {\n        for (let e of this._pages) e.clear();\n        this._cacheMap.clear(), this._cacheMapCombined.clear(), this._didWarmUp = false;\n      }\n    }\n    _createNewPage() {\n      if (i3.maxAtlasPages && this._pages.length >= Math.max(4, i3.maxAtlasPages)) {\n        let t = this._pages.filter((T4) => T4.canvas.width * 2 <= (i3.maxTextureSize || 4096)).sort((T4, h3) => h3.canvas.width !== T4.canvas.width ? h3.canvas.width - T4.canvas.width : h3.percentageUsed - T4.percentageUsed), r = -1, n11 = 0;\n        for (let T4 = 0; T4 < t.length; T4++) if (t[T4].canvas.width !== n11) r = T4, n11 = t[T4].canvas.width;\n        else if (T4 - r === 3) break;\n        let a2 = t.slice(r, r + 4);\n        if (a2.length < 4 || a2.some((T4) => T4.canvas.width !== a2[0].canvas.width)) {\n          let T4 = new M0(this._document, this._textureSize);\n          return this._pages.push(T4), this._activePages.push(T4), this._onAddTextureAtlasCanvas.fire(T4.canvas), T4;\n        }\n        let s4 = a2.map((T4) => T4.glyphs[0].texturePage).sort((T4, h3) => T4 > h3 ? 1 : -1), o2 = this.pages.length - a2.length, l4 = this._mergePages(a2, o2);\n        l4.version++;\n        for (let T4 = s4.length - 1; T4 >= 0; T4--) this._deletePage(s4[T4]);\n        this.pages.push(l4), this._requestClearModel = true, this._onAddTextureAtlasCanvas.fire(l4.canvas);\n      }\n      let e = new M0(this._document, this._textureSize);\n      return this._pages.push(e), this._activePages.push(e), this._onAddTextureAtlasCanvas.fire(e.canvas), e;\n    }\n    _mergePages(e, t) {\n      let r = e[0].canvas.width * 2, n11 = new M0(this._document, r, e);\n      for (let [a2, s4] of e.entries()) {\n        let o2 = a2 * s4.canvas.width % r, l4 = Math.floor(a2 / 2) * s4.canvas.height;\n        n11.ctx.drawImage(s4.canvas, o2, l4);\n        for (let h3 of s4.glyphs) h3.texturePage = t, h3.sizeClipSpace.x = h3.size.x / r, h3.sizeClipSpace.y = h3.size.y / r, h3.texturePosition.x += o2, h3.texturePosition.y += l4, h3.texturePositionClipSpace.x = h3.texturePosition.x / r, h3.texturePositionClipSpace.y = h3.texturePosition.y / r;\n        this._onRemoveTextureAtlasCanvas.fire(s4.canvas);\n        let T4 = this._activePages.indexOf(s4);\n        T4 !== -1 && this._activePages.splice(T4, 1);\n      }\n      return n11;\n    }\n    _deletePage(e) {\n      this._pages.splice(e, 1);\n      for (let t = e; t < this._pages.length; t++) {\n        let r = this._pages[t];\n        for (let n11 of r.glyphs) n11.texturePage--;\n        r.version++;\n      }\n    }\n    getRasterizedGlyphCombinedChar(e, t, r, n11, a2, s4) {\n      return this._getFromCacheMap(this._cacheMapCombined, e, t, r, n11, a2, s4);\n    }\n    getRasterizedGlyph(e, t, r, n11, a2, s4) {\n      return this._getFromCacheMap(this._cacheMap, e, t, r, n11, a2, s4);\n    }\n    _getFromCacheMap(e, t, r, n11, a2, s4, o2) {\n      return W0 = e.get(t, r, n11, a2), W0 || (W0 = this._drawToCache(t, r, n11, a2, s4, o2), e.set(t, r, n11, a2, W0)), W0;\n    }\n    _getColorFromAnsiIndex(e) {\n      if (e >= this._config.colors.ansi.length) throw new Error("No color found for idx " + e);\n      return this._config.colors.ansi[e];\n    }\n    _getBackgroundColor(e, t, r, n11) {\n      if (this._config.allowTransparency) return G3;\n      let a2;\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          a2 = this._getColorFromAnsiIndex(t);\n          break;\n        case 50331648:\n          let s4 = s0.toColorRGB(t);\n          a2 = Z3.toColor(s4[0], s4[1], s4[2]);\n          break;\n        case 0:\n        default:\n          r ? a2 = I0.opaque(this._config.colors.foreground) : a2 = this._config.colors.background;\n          break;\n      }\n      return this._config.allowTransparency || (a2 = I0.opaque(a2)), a2;\n    }\n    _getForegroundColor(e, t, r, n11, a2, s4, o2, l4, T4, h3) {\n      let d3 = this._getMinimumContrastColor(e, t, r, n11, a2, s4, o2, T4, l4, h3);\n      if (d3) return d3;\n      let _5;\n      switch (a2) {\n        case 16777216:\n        case 33554432:\n          this._config.drawBoldTextInBrightColors && T4 && s4 < 8 && (s4 += 8), _5 = this._getColorFromAnsiIndex(s4);\n          break;\n        case 50331648:\n          let c2 = s0.toColorRGB(s4);\n          _5 = Z3.toColor(c2[0], c2[1], c2[2]);\n          break;\n        case 0:\n        default:\n          o2 ? _5 = this._config.colors.background : _5 = this._config.colors.foreground;\n      }\n      return this._config.allowTransparency && (_5 = I0.opaque(_5)), l4 && (_5 = I0.multiplyOpacity(_5, je2)), _5;\n    }\n    _resolveBackgroundRgba(e, t, r) {\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          return this._getColorFromAnsiIndex(t).rgba;\n        case 50331648:\n          return t << 8;\n        case 0:\n        default:\n          return r ? this._config.colors.foreground.rgba : this._config.colors.background.rgba;\n      }\n    }\n    _resolveForegroundRgba(e, t, r, n11) {\n      switch (e) {\n        case 16777216:\n        case 33554432:\n          return this._config.drawBoldTextInBrightColors && n11 && t < 8 && (t += 8), this._getColorFromAnsiIndex(t).rgba;\n        case 50331648:\n          return t << 8;\n        case 0:\n        default:\n          return r ? this._config.colors.background.rgba : this._config.colors.foreground.rgba;\n      }\n    }\n    _getMinimumContrastColor(e, t, r, n11, a2, s4, o2, l4, T4, h3) {\n      if (this._config.minimumContrastRatio === 1 || h3) return;\n      let d3 = this._getContrastCache(T4), _5 = d3.getColor(e, n11);\n      if (_5 !== void 0) return _5 ?? void 0;\n      let c2 = this._resolveBackgroundRgba(t, r, o2), u3 = this._resolveForegroundRgba(a2, s4, o2, l4), p3 = h0.ensureContrastRatio(c2, u3, this._config.minimumContrastRatio / (T4 ? 2 : 1));\n      if (!p3) {\n        d3.setColor(e, n11, null);\n        return;\n      }\n      let C4 = Z3.toColor(p3 >> 24 & 255, p3 >> 16 & 255, p3 >> 8 & 255);\n      return d3.setColor(e, n11, C4), C4;\n    }\n    _getContrastCache(e) {\n      return e ? this._config.colors.halfContrastCache : this._config.colors.contrastCache;\n    }\n    _drawToCache(e, t, r, n11, a2, s4) {\n      let o2 = typeof e == "number" ? String.fromCharCode(e) : e;\n      s4 && this._tmpCanvas.parentElement !== s4 && (this._tmpCanvas.style.display = "none", s4.append(this._tmpCanvas));\n      let l4 = Math.min(this._config.deviceCellWidth * Math.max(o2.length, 2) + U0 * 2, this._config.deviceMaxTextureSize);\n      this._tmpCanvas.width < l4 && (this._tmpCanvas.width = l4);\n      let T4 = Math.min(this._config.deviceCellHeight + U0 * 4, this._textureSize);\n      if (this._tmpCanvas.height < T4 && (this._tmpCanvas.height = T4), this._tmpCtx.save(), this._workAttributeData.fg = r, this._workAttributeData.bg = t, this._workAttributeData.extended.ext = n11, !!this._workAttributeData.isInvisible()) return at2;\n      let d3 = !!this._workAttributeData.isBold(), _5 = !!this._workAttributeData.isInverse(), c2 = !!this._workAttributeData.isDim(), u3 = !!this._workAttributeData.isItalic(), p3 = !!this._workAttributeData.isUnderline(), C4 = !!this._workAttributeData.isStrikethrough(), Q3 = !!this._workAttributeData.isOverline(), m4 = this._workAttributeData.getFgColor(), R4 = this._workAttributeData.getFgColorMode(), F4 = this._workAttributeData.getBgColor(), b4 = this._workAttributeData.getBgColorMode();\n      if (_5) {\n        let E5 = m4;\n        m4 = F4, F4 = E5;\n        let N3 = R4;\n        R4 = b4, b4 = N3;\n      }\n      let A4 = this._getBackgroundColor(b4, F4, _5, c2);\n      this._tmpCtx.globalCompositeOperation = "copy", this._tmpCtx.fillStyle = A4.css, this._tmpCtx.fillRect(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), this._tmpCtx.globalCompositeOperation = "source-over";\n      let X3 = d3 ? this._config.fontWeightBold : this._config.fontWeight, z4 = u3 ? "italic" : "";\n      this._tmpCtx.font = `${z4} ${X3} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`, this._tmpCtx.textBaseline = q0;\n      let x0 = o2.length === 1 && K0(o2.charCodeAt(0)), e0 = o2.length === 1 && $e(o2.charCodeAt(0)), T0 = this._getForegroundColor(t, b4, F4, r, R4, m4, _5, c2, d3, z0(o2.charCodeAt(0)));\n      this._tmpCtx.fillStyle = T0.css;\n      let M4 = e0 ? 0 : U0 * 2, l0 = false;\n      if (this._config.customGlyphs !== false) {\n        let E5 = this._workAttributeData.getUnderlineVariantOffset();\n        l0 = it2(this._tmpCtx, o2, M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, A4.css, E5);\n      }\n      let t0 = !x0, Y2;\n      if (typeof e == "number" ? Y2 = this._unicodeService.wcwidth(e) : Y2 = this._unicodeService.getStringCellWidth(e), p3) {\n        this._tmpCtx.save();\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 15)), N3 = E5 % 2 === 1 ? 0.5 : 0;\n        if (this._tmpCtx.lineWidth = E5, this._workAttributeData.isUnderlineColorDefault()) this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle;\n        else if (this._workAttributeData.isUnderlineColorRGB()) t0 = false, this._tmpCtx.strokeStyle = `rgb(${s0.toColorRGB(this._workAttributeData.getUnderlineColor()).join(",")})`;\n        else {\n          t0 = false;\n          let r0 = this._workAttributeData.getUnderlineColor();\n          this._config.drawBoldTextInBrightColors && this._workAttributeData.isBold() && r0 < 8 && (r0 += 8), this._tmpCtx.strokeStyle = this._getColorFromAnsiIndex(r0).css;\n        }\n        this._tmpCtx.fillStyle = this._tmpCtx.strokeStyle, this._tmpCtx.beginPath();\n        let i0 = M4, $4 = Math.ceil(M4 + this._config.deviceCharHeight) - N3 - (a2 ? E5 * 2 : 0), pe2 = $4 + E5 * 2, f0 = this._workAttributeData.getUnderlineVariantOffset(), p0 = 0, v0 = 0;\n        for (let r0 = 0; r0 < Y2; r0++) {\n          let N0 = false;\n          this._tmpCtx.save(), p0 = $4, v0 = pe2;\n          let q3 = i0 + r0 * this._config.deviceCellWidth, Q0 = i0 + (r0 + 1) * this._config.deviceCellWidth;\n          switch (this._workAttributeData.extended.underlineStyle) {\n            case 2:\n              this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4), this._tmpCtx.moveTo(q3, pe2), this._tmpCtx.lineTo(Q0, pe2);\n              break;\n            case 3:\n              p0 = this._config.deviceCharHeight + 1, v0 = p0 + 3 * this._config.devicePixelRatio;\n              let Ne4 = new Path2D();\n              Ne4.rect(q3, p0, this._config.deviceCellWidth, v0 - p0), this._tmpCtx.clip(Ne4);\n              let vt3 = this._config.deviceCellWidth, Ot2 = v0 - p0, It3 = vt3 / 6, Ft = Ot2 / 3, Mt2 = [[0, 2, 1, 3, 2.4, 3, 0, 0.6], [5.5, 0, 2.5, 3, 1.1, 3, 4.1, 0], [4, 0, 6, 2, 6, 0.6, 5.4, 0]];\n              for (let Ce3 of Mt2) {\n                this._tmpCtx.beginPath();\n                for (let P0 = 0; P0 < Ce3.length; P0 += 2) {\n                  let we3 = q3 + Ce3[P0] * It3, He3 = v0 - Ce3[P0 + 1] * Ft;\n                  P0 === 0 ? this._tmpCtx.moveTo(we3, He3) : this._tmpCtx.lineTo(we3, He3);\n                }\n                this._tmpCtx.closePath(), this._tmpCtx.fill();\n              }\n              N0 = true;\n              break;\n            case 4:\n              let $0 = f0 === 0 ? 0 : f0 >= E5 ? E5 * 2 - f0 : E5 - f0;\n              !(f0 >= E5) === false || $0 === 0 ? (this._tmpCtx.setLineDash([Math.round(E5), Math.round(E5)]), this._tmpCtx.moveTo(q3 + $0, $4), this._tmpCtx.lineTo(Q0, $4)) : (this._tmpCtx.setLineDash([Math.round(E5), Math.round(E5)]), this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(q3 + $0, $4), this._tmpCtx.moveTo(q3 + $0 + E5, $4), this._tmpCtx.lineTo(Q0, $4)), f0 = ze2(Q0 - q3, E5, f0);\n              break;\n            case 5:\n              let At3 = 0.6, gt3 = 0.3, Qe3 = Q0 - q3, Pe3 = Math.floor(At3 * Qe3), Be3 = Math.floor(gt3 * Qe3), yt4 = Qe3 - Pe3 - Be3;\n              this._tmpCtx.setLineDash([Pe3, Be3, yt4]), this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4);\n              break;\n            case 1:\n            default:\n              this._tmpCtx.moveTo(q3, $4), this._tmpCtx.lineTo(Q0, $4);\n              break;\n          }\n          N0 || this._tmpCtx.stroke(), this._tmpCtx.restore();\n        }\n        if (this._tmpCtx.restore(), !l0 && this._config.fontSize >= 12 && !this._config.allowTransparency && o2 !== " ") {\n          this._tmpCtx.save(), this._tmpCtx.textBaseline = "alphabetic";\n          let r0 = this._tmpCtx.measureText(o2);\n          if (this._tmpCtx.restore(), "actualBoundingBoxDescent" in r0 && r0.actualBoundingBoxDescent > 0) {\n            this._tmpCtx.save();\n            let N0 = new Path2D();\n            N0.rect(i0, p0 - Math.ceil(E5 / 2), this._config.deviceCellWidth * Y2, v0 - p0 + Math.ceil(E5 / 2)), this._tmpCtx.clip(N0), this._tmpCtx.lineWidth = this._config.devicePixelRatio * 3, this._tmpCtx.strokeStyle = A4.css, this._tmpCtx.strokeText(o2, M4, M4 + this._config.deviceCharHeight), this._tmpCtx.restore();\n          }\n        }\n      }\n      if (Q3) {\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 15)), N3 = E5 % 2 === 1 ? 0.5 : 0;\n        this._tmpCtx.lineWidth = E5, this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle, this._tmpCtx.beginPath(), this._tmpCtx.moveTo(M4, M4 + N3), this._tmpCtx.lineTo(M4 + this._config.deviceCharWidth * Y2, M4 + N3), this._tmpCtx.stroke();\n      }\n      if (l0 || this._tmpCtx.fillText(o2, M4, M4 + this._config.deviceCharHeight), o2 === "_" && !this._config.allowTransparency) {\n        let E5 = Ie(this._tmpCtx.getImageData(M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight), A4, T0, t0);\n        if (E5) for (let N3 = 1; N3 <= 5 && (this._tmpCtx.save(), this._tmpCtx.fillStyle = A4.css, this._tmpCtx.fillRect(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), this._tmpCtx.restore(), this._tmpCtx.fillText(o2, M4, M4 + this._config.deviceCharHeight - N3), E5 = Ie(this._tmpCtx.getImageData(M4, M4, this._config.deviceCellWidth, this._config.deviceCellHeight), A4, T0, t0), !!E5); N3++) ;\n      }\n      if (C4) {\n        let E5 = Math.max(1, Math.floor(this._config.fontSize * this._config.devicePixelRatio / 10)), N3 = this._tmpCtx.lineWidth % 2 === 1 ? 0.5 : 0;\n        this._tmpCtx.lineWidth = E5, this._tmpCtx.strokeStyle = this._tmpCtx.fillStyle, this._tmpCtx.beginPath(), this._tmpCtx.moveTo(M4, M4 + Math.floor(this._config.deviceCharHeight / 2) - N3), this._tmpCtx.lineTo(M4 + this._config.deviceCharWidth * Y2, M4 + Math.floor(this._config.deviceCharHeight / 2) - N3), this._tmpCtx.stroke();\n      }\n      this._tmpCtx.restore();\n      let n0 = this._tmpCtx.getImageData(0, 0, this._tmpCanvas.width, this._tmpCanvas.height), D0;\n      if (this._config.allowTransparency ? D0 = qt(n0) : D0 = Ie(n0, A4, T0, t0), D0) return at2;\n      let I4 = this._findGlyphBoundingBox(n0, this._workBoundingBox, l4, e0, l0, M4), O4, v6;\n      for (; ; ) {\n        if (this._activePages.length === 0) {\n          let E5 = this._createNewPage();\n          O4 = E5, v6 = E5.currentRow, v6.height = I4.size.y;\n          break;\n        }\n        O4 = this._activePages[this._activePages.length - 1], v6 = O4.currentRow;\n        for (let E5 of this._activePages) I4.size.y <= E5.currentRow.height && (O4 = E5, v6 = E5.currentRow);\n        for (let E5 = this._activePages.length - 1; E5 >= 0; E5--) for (let N3 of this._activePages[E5].fixedRows) N3.height <= v6.height && I4.size.y <= N3.height && (O4 = this._activePages[E5], v6 = N3);\n        if (I4.size.x > this._textureSize) {\n          this._overflowSizePage || (this._overflowSizePage = new M0(this._document, this._config.deviceMaxTextureSize), this.pages.push(this._overflowSizePage), this._requestClearModel = true, this._onAddTextureAtlasCanvas.fire(this._overflowSizePage.canvas)), O4 = this._overflowSizePage, v6 = this._overflowSizePage.currentRow, v6.x + I4.size.x >= O4.canvas.width && (v6.x = 0, v6.y += v6.height, v6.height = 0);\n          break;\n        }\n        if (v6.y + I4.size.y >= O4.canvas.height || v6.height > I4.size.y + 2) {\n          let E5 = false;\n          if (O4.currentRow.y + O4.currentRow.height + I4.size.y >= O4.canvas.height) {\n            let N3;\n            for (let i0 of this._activePages) if (i0.currentRow.y + i0.currentRow.height + I4.size.y < i0.canvas.height) {\n              N3 = i0;\n              break;\n            }\n            if (N3) O4 = N3;\n            else if (i3.maxAtlasPages && this._pages.length >= i3.maxAtlasPages && v6.y + I4.size.y <= O4.canvas.height && v6.height >= I4.size.y && v6.x + I4.size.x <= O4.canvas.width) E5 = true;\n            else {\n              let i0 = this._createNewPage();\n              O4 = i0, v6 = i0.currentRow, v6.height = I4.size.y, E5 = true;\n            }\n          }\n          E5 || (O4.currentRow.height > 0 && O4.fixedRows.push(O4.currentRow), v6 = { x: 0, y: O4.currentRow.y + O4.currentRow.height, height: I4.size.y }, O4.fixedRows.push(v6), O4.currentRow = { x: 0, y: v6.y + v6.height, height: 0 });\n        }\n        if (v6.x + I4.size.x <= O4.canvas.width) break;\n        v6 === O4.currentRow ? (v6.x = 0, v6.y += v6.height, v6.height = 0) : O4.fixedRows.splice(O4.fixedRows.indexOf(v6), 1);\n      }\n      return I4.texturePage = this._pages.indexOf(O4), I4.texturePosition.x = v6.x, I4.texturePosition.y = v6.y, I4.texturePositionClipSpace.x = v6.x / O4.canvas.width, I4.texturePositionClipSpace.y = v6.y / O4.canvas.height, I4.sizeClipSpace.x /= O4.canvas.width, I4.sizeClipSpace.y /= O4.canvas.height, v6.height = Math.max(v6.height, I4.size.y), v6.x += I4.size.x, O4.ctx.putImageData(n0, I4.texturePosition.x - this._workBoundingBox.left, I4.texturePosition.y - this._workBoundingBox.top, this._workBoundingBox.left, this._workBoundingBox.top, I4.size.x, I4.size.y), O4.addGlyph(I4), O4.version++, I4;\n    }\n    _findGlyphBoundingBox(e, t, r, n11, a2, s4) {\n      t.top = 0;\n      let o2 = n11 ? this._config.deviceCellHeight : this._tmpCanvas.height, l4 = n11 ? this._config.deviceCellWidth : r, T4 = false;\n      for (let h3 = 0; h3 < o2; h3++) {\n        for (let d3 = 0; d3 < l4; d3++) {\n          let _5 = h3 * this._tmpCanvas.width * 4 + d3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.top = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.left = 0, T4 = false;\n      for (let h3 = 0; h3 < s4 + l4; h3++) {\n        for (let d3 = 0; d3 < o2; d3++) {\n          let _5 = d3 * this._tmpCanvas.width * 4 + h3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.left = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.right = l4, T4 = false;\n      for (let h3 = s4 + l4 - 1; h3 >= s4; h3--) {\n        for (let d3 = 0; d3 < o2; d3++) {\n          let _5 = d3 * this._tmpCanvas.width * 4 + h3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.right = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      t.bottom = o2, T4 = false;\n      for (let h3 = o2 - 1; h3 >= 0; h3--) {\n        for (let d3 = 0; d3 < l4; d3++) {\n          let _5 = h3 * this._tmpCanvas.width * 4 + d3 * 4 + 3;\n          if (e.data[_5] !== 0) {\n            t.bottom = h3, T4 = true;\n            break;\n          }\n        }\n        if (T4) break;\n      }\n      return { texturePage: 0, texturePosition: { x: 0, y: 0 }, texturePositionClipSpace: { x: 0, y: 0 }, size: { x: t.right - t.left + 1, y: t.bottom - t.top + 1 }, sizeClipSpace: { x: t.right - t.left + 1, y: t.bottom - t.top + 1 }, offset: { x: -t.left + s4 + (n11 || a2 ? Math.floor((this._config.deviceCellWidth - this._config.deviceCharWidth) / 2) : 0), y: -t.top + s4 + (n11 || a2 ? this._config.lineHeight === 1 ? 0 : Math.round((this._config.deviceCellHeight - this._config.deviceCharHeight) / 2) : 0) } };\n    }\n  };\n  var M0 = class {\n    constructor(e, t, r) {\n      this._usedPixels = 0;\n      this._glyphs = [];\n      this.version = 0;\n      this.currentRow = { x: 0, y: 0, height: 0 };\n      this.fixedRows = [];\n      if (r) for (let n11 of r) this._glyphs.push(...n11.glyphs), this._usedPixels += n11._usedPixels;\n      this.canvas = ot2(e, t, t), this.ctx = y3(this.canvas.getContext("2d", { alpha: true }));\n    }\n    get percentageUsed() {\n      return this._usedPixels / (this.canvas.width * this.canvas.height);\n    }\n    get glyphs() {\n      return this._glyphs;\n    }\n    addGlyph(e) {\n      this._glyphs.push(e), this._usedPixels += e.size.x * e.size.y;\n    }\n    clear() {\n      this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height), this.currentRow.x = 0, this.currentRow.y = 0, this.currentRow.height = 0, this.fixedRows.length = 0, this.version++;\n    }\n  };\n  function Ie(i5, e, t, r) {\n    let n11 = e.rgba >>> 24, a2 = e.rgba >>> 16 & 255, s4 = e.rgba >>> 8 & 255, o2 = t.rgba >>> 24, l4 = t.rgba >>> 16 & 255, T4 = t.rgba >>> 8 & 255, h3 = Math.floor((Math.abs(n11 - o2) + Math.abs(a2 - l4) + Math.abs(s4 - T4)) / 12), d3 = true;\n    for (let _5 = 0; _5 < i5.data.length; _5 += 4) i5.data[_5] === n11 && i5.data[_5 + 1] === a2 && i5.data[_5 + 2] === s4 || r && Math.abs(i5.data[_5] - n11) + Math.abs(i5.data[_5 + 1] - a2) + Math.abs(i5.data[_5 + 2] - s4) < h3 ? i5.data[_5 + 3] = 0 : d3 = false;\n    return d3;\n  }\n  function qt(i5) {\n    for (let e = 0; e < i5.data.length; e += 4) if (i5.data[e + 3] > 0) return false;\n    return true;\n  }\n  function ot2(i5, e, t) {\n    let r = i5.createElement("canvas");\n    return r.width = e, r.height = t, r;\n  }\n  function Tt2(i5, e, t, r, n11, a2, s4, o2, l4 = true) {\n    let T4 = { foreground: a2.foreground, background: a2.background, cursor: G3, cursorAccent: G3, selectionForeground: G3, selectionBackgroundTransparent: G3, selectionBackgroundOpaque: G3, selectionInactiveBackgroundTransparent: G3, selectionInactiveBackgroundOpaque: G3, overviewRulerBorder: G3, scrollbarSliderBackground: G3, scrollbarSliderHoverBackground: G3, scrollbarSliderActiveBackground: G3, ansi: a2.ansi.slice(), contrastCache: a2.contrastCache, halfContrastCache: a2.halfContrastCache };\n    return { customGlyphs: l4, devicePixelRatio: s4, deviceMaxTextureSize: o2, letterSpacing: n11.letterSpacing, lineHeight: n11.lineHeight, deviceCellWidth: i5, deviceCellHeight: e, deviceCharWidth: t, deviceCharHeight: r, fontFamily: n11.fontFamily, fontSize: n11.fontSize, fontWeight: n11.fontWeight, fontWeightBold: n11.fontWeightBold, allowTransparency: n11.allowTransparency, drawBoldTextInBrightColors: n11.drawBoldTextInBrightColors, minimumContrastRatio: n11.minimumContrastRatio, colors: T4 };\n  }\n  function Fe2(i5, e) {\n    for (let t = 0; t < i5.colors.ansi.length; t++) if (i5.colors.ansi[t].rgba !== e.colors.ansi[t].rgba) return false;\n    return i5.devicePixelRatio === e.devicePixelRatio && i5.customGlyphs === e.customGlyphs && i5.lineHeight === e.lineHeight && i5.letterSpacing === e.letterSpacing && i5.fontFamily === e.fontFamily && i5.fontSize === e.fontSize && i5.fontWeight === e.fontWeight && i5.fontWeightBold === e.fontWeightBold && i5.allowTransparency === e.allowTransparency && i5.deviceCharWidth === e.deviceCharWidth && i5.deviceCharHeight === e.deviceCharHeight && i5.drawBoldTextInBrightColors === e.drawBoldTextInBrightColors && i5.minimumContrastRatio === e.minimumContrastRatio && i5.colors.foreground.rgba === e.colors.foreground.rgba && i5.colors.background.rgba === e.colors.background.rgba;\n  }\n  function lt(i5) {\n    return (i5 & 50331648) === 16777216 || (i5 & 50331648) === 33554432;\n  }\n  var J3 = [];\n  function ee2(i5, e, t, r, n11, a2, s4, o2, l4, T4 = true) {\n    let h3 = Tt2(r, n11, a2, s4, e, t, o2, l4, T4);\n    for (let u3 = 0; u3 < J3.length; u3++) {\n      let p3 = J3[u3], C4 = p3.ownedBy.indexOf(i5);\n      if (C4 >= 0) {\n        if (Fe2(p3.config, h3)) return p3.atlas;\n        p3.ownedBy.length === 1 ? (p3.atlas.dispose(), J3.splice(u3, 1)) : p3.ownedBy.splice(C4, 1);\n        break;\n      }\n    }\n    for (let u3 = 0; u3 < J3.length; u3++) {\n      let p3 = J3[u3];\n      if (Fe2(p3.config, h3)) return p3.ownedBy.push(i5), p3.atlas;\n    }\n    let d3 = i5._core, _5 = d3._logService, c2 = { atlas: new j3(document, h3, d3.unicodeService, _5), config: h3, ownedBy: [i5] };\n    return J3.push(c2), c2.atlas;\n  }\n  function Me(i5) {\n    for (let e = 0; e < J3.length; e++) {\n      let t = J3[e].ownedBy.indexOf(i5);\n      if (t !== -1) {\n        J3[e].ownedBy.length === 1 ? (J3[e].atlas.dispose(), J3.splice(e, 1)) : J3[e].ownedBy.splice(t, 1);\n        break;\n      }\n    }\n  }\n  var te = class {\n    constructor(e, t) {\n      this._renderCallback = e;\n      this._coreBrowserService = t;\n      this._isIdlePaused = false;\n      this.isCursorVisible = true, this._coreBrowserService.isFocused && (this._restartInterval(), this._resetIdleTimer());\n    }\n    get isPaused() {\n      return !(this._blinkStartTimeout || this._blinkInterval);\n    }\n    dispose() {\n      this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    restartBlinkAnimation() {\n      this._isIdlePaused && this._resetIdleTimer(), !this.isPaused && (this._animationTimeRestarted = Date.now(), this.isCursorVisible = true, this._animationFrame || (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n        this._renderCallback(), this._animationFrame = void 0;\n      })));\n    }\n    _restartInterval(e = 600) {\n      this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout = this._coreBrowserService.window.setTimeout(() => {\n        if (this._animationTimeRestarted) {\n          let t = 600 - (Date.now() - this._animationTimeRestarted);\n          if (this._animationTimeRestarted = void 0, t > 0) {\n            this._restartInterval(t);\n            return;\n          }\n        }\n        this.isCursorVisible = false, this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n          this._renderCallback(), this._animationFrame = void 0;\n        }), this._blinkInterval = this._coreBrowserService.window.setInterval(() => {\n          if (this._animationTimeRestarted) {\n            let t = 600 - (Date.now() - this._animationTimeRestarted);\n            this._animationTimeRestarted = void 0, this._restartInterval(t);\n            return;\n          }\n          this.isCursorVisible = !this.isCursorVisible, this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n            this._renderCallback(), this._animationFrame = void 0;\n          });\n        }, 600);\n      }, e);\n    }\n    pause() {\n      this.isCursorVisible = true, this._isIdlePaused = false, this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    resume() {\n      this.pause(), this._animationTimeRestarted = void 0, this._restartInterval(), this._resetIdleTimer(), this.restartBlinkAnimation();\n    }\n    _resetIdleTimer() {\n      this._isIdlePaused = false, this._idleTimeout && this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = this._coreBrowserService.window.setTimeout(() => {\n        this._stopBlinkingDueToIdle();\n      }, 3e5);\n    }\n    _stopBlinkingDueToIdle() {\n      this.isCursorVisible = true, this._isIdlePaused = true, this._blinkInterval && (this._coreBrowserService.window.clearInterval(this._blinkInterval), this._blinkInterval = void 0), this._blinkStartTimeout && (this._coreBrowserService.window.clearTimeout(this._blinkStartTimeout), this._blinkStartTimeout = void 0), this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0), this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0, this._renderCallback();\n    }\n  };\n  function Ae2(i5, e, t) {\n    let r = new e.ResizeObserver((n11) => {\n      let a2 = n11.find((l4) => l4.target === i5);\n      if (!a2) return;\n      if (!("devicePixelContentBoxSize" in a2)) {\n        r?.disconnect(), r = void 0;\n        return;\n      }\n      let s4 = a2.devicePixelContentBoxSize[0].inlineSize, o2 = a2.devicePixelContentBoxSize[0].blockSize;\n      s4 > 0 && o2 > 0 && t(s4, o2);\n    });\n    try {\n      r.observe(i5, { box: ["device-pixel-content-box"] });\n    } catch {\n      r.disconnect(), r = void 0;\n    }\n    return g4(() => r?.disconnect());\n  }\n  function Lt(i5) {\n    return i5 > 65535 ? (i5 -= 65536, String.fromCharCode((i5 >> 10) + 55296) + String.fromCharCode(i5 % 1024 + 56320)) : String.fromCharCode(i5);\n  }\n  var ie2 = class i4 extends s0 {\n    constructor() {\n      super(...arguments);\n      this.content = 0;\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Z0();\n      this.combinedData = "";\n    }\n    static fromCharData(t) {\n      let r = new i4();\n      return r.setFromCharData(t), r;\n    }\n    isCombined() {\n      return this.content & 2097152;\n    }\n    getWidth() {\n      return this.content >> 22;\n    }\n    getChars() {\n      return this.content & 2097152 ? this.combinedData : this.content & 2097151 ? Lt(this.content & 2097151) : "";\n    }\n    getCode() {\n      return this.isCombined() ? this.combinedData.charCodeAt(this.combinedData.length - 1) : this.content & 2097151;\n    }\n    setFromCharData(t) {\n      this.fg = t[0], this.bg = 0;\n      let r = false;\n      if (t[1].length > 2) r = true;\n      else if (t[1].length === 2) {\n        let n11 = t[1].charCodeAt(0);\n        if (55296 <= n11 && n11 <= 56319) {\n          let a2 = t[1].charCodeAt(1);\n          56320 <= a2 && a2 <= 57343 ? this.content = (n11 - 55296) * 1024 + a2 - 56320 + 65536 | t[2] << 22 : r = true;\n        } else r = true;\n      } else this.content = t[1].charCodeAt(0) | t[2] << 22;\n      r && (this.combinedData = t[1], this.content = 2097152 | t[2] << 22);\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n    attributesEquals(t) {\n      if (this.getFgColorMode() !== t.getFgColorMode() || this.getFgColor() !== t.getFgColor() || this.getBgColorMode() !== t.getBgColorMode() || this.getBgColor() !== t.getBgColor() || this.isInverse() !== t.isInverse() || this.isBold() !== t.isBold() || this.isUnderline() !== t.isUnderline()) return false;\n      if (this.isUnderline()) {\n        if (this.getUnderlineStyle() !== t.getUnderlineStyle()) return false;\n        let r = this.isUnderlineColorDefault(), n11 = t.isUnderlineColorDefault();\n        if (!(r && n11) && (r !== n11 || this.getUnderlineColor() !== t.getUnderlineColor() || this.getUnderlineColorMode() !== t.getUnderlineColorMode())) return false;\n      }\n      return !(this.isOverline() !== t.isOverline() || this.isBlink() !== t.isBlink() || this.isInvisible() !== t.isInvisible() || this.isItalic() !== t.isItalic() || this.isDim() !== t.isDim() || this.isStrikethrough() !== t.isStrikethrough());\n    }\n  };\n  var re = class extends W3 {\n    constructor(t, r, n11) {\n      super();\n      this._renderCallback = t;\n      this._coreBrowserService = r;\n      this._optionsService = n11;\n      this._intervalDuration = 0;\n      this._blinkOn = true;\n      this._needsBlinkInViewport = false;\n      this._isViewportVisible = true;\n      this._register(this._optionsService.onSpecificOptionChange("blinkIntervalDuration", (a2) => {\n        this.setIntervalDuration(a2);\n      })), this.setIntervalDuration(this._optionsService.rawOptions.blinkIntervalDuration), this._register(g4(() => this._clearInterval()));\n    }\n    get isBlinkOn() {\n      return this._blinkOn;\n    }\n    get isEnabled() {\n      return this._intervalDuration > 0;\n    }\n    setNeedsBlinkInViewport(t) {\n      this._needsBlinkInViewport !== t && (this._needsBlinkInViewport = t, this._updateIntervalState());\n    }\n    setViewportVisible(t) {\n      this._isViewportVisible !== t && (this._isViewportVisible = t, this._updateIntervalState());\n    }\n    setIntervalDuration(t) {\n      t !== this._intervalDuration && (this._intervalDuration = t, this._clearInterval(), this._updateIntervalState());\n    }\n    _updateIntervalState() {\n      if (this._intervalDuration > 0 && this._needsBlinkInViewport && this._isViewportVisible) {\n        if (this._interval !== void 0) return;\n        let r = this._blinkOn;\n        this._blinkOn = true, this._interval = this._coreBrowserService.window.setInterval(() => {\n          this._blinkOn = !this._blinkOn, this._renderCallback();\n        }, this._intervalDuration), r || this._renderCallback();\n        return;\n      }\n      this._clearInterval(), this._blinkOn || (this._blinkOn = true, this._renderCallback());\n    }\n    _clearInterval() {\n      this._interval !== void 0 && (this._coreBrowserService.window.clearInterval(this._interval), this._interval = void 0);\n    }\n  };\n  var ne2 = new Float32Array([2, 0, 0, 0, 0, -2, 0, 0, 0, 0, 1, 0, -1, 1, 0, 1]);\n  function ae2(i5, e, t) {\n    let r = y3(i5.createProgram());\n    if (i5.attachShader(r, y3(ht(i5, i5.VERTEX_SHADER, e))), i5.attachShader(r, y3(ht(i5, i5.FRAGMENT_SHADER, t))), i5.linkProgram(r), i5.getProgramParameter(r, i5.LINK_STATUS)) return r;\n    console.error(i5.getProgramInfoLog(r)), i5.deleteProgram(r);\n  }\n  function ht(i5, e, t) {\n    let r = y3(i5.createShader(e));\n    if (i5.shaderSource(r, t), i5.compileShader(r), i5.getShaderParameter(r, i5.COMPILE_STATUS)) return r;\n    console.error(i5.getShaderInfoLog(r)), i5.deleteShader(r);\n  }\n  function dt(i5, e) {\n    let t = Math.min(i5.length * 2, e), r = new Float32Array(t);\n    for (let n11 = 0; n11 < i5.length; n11++) r[n11] = i5[n11];\n    return r;\n  }\n  var se = class {\n    constructor(e) {\n      this.texture = e, this.version = -1;\n    }\n  };\n  var e1 = `#version 300 es\nlayout (location = 0) in vec2 a_unitquad;\nlayout (location = 1) in vec2 a_cellpos;\nlayout (location = 2) in vec2 a_offset;\nlayout (location = 3) in vec2 a_size;\nlayout (location = 4) in float a_texpage;\nlayout (location = 5) in vec2 a_texcoord;\nlayout (location = 6) in vec2 a_texsize;\n\nuniform mat4 u_projection;\nuniform vec2 u_resolution;\n\nout vec2 v_texcoord;\nflat out int v_texpage;\n\nvoid main() {\n  vec2 zeroToOne = (a_offset / u_resolution) + a_cellpos + (a_unitquad * a_size);\n  gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n  v_texpage = int(a_texpage);\n  v_texcoord = a_texcoord + a_unitquad * a_texsize;\n}`;\n  function t1(i5) {\n    let e = "";\n    for (let t = 1; t < i5; t++) e += ` else if (v_texpage == ${t}) { outColor = texture(u_texture[${t}], v_texcoord); }`;\n    return `#version 300 es\nprecision lowp float;\n\nin vec2 v_texcoord;\nflat in int v_texpage;\n\nuniform sampler2D u_texture[${i5}];\n\nout vec4 outColor;\n\nvoid main() {\n  if (v_texpage == 0) {\n    outColor = texture(u_texture[0], v_texcoord);\n  } ${e}\n}`;\n  }\n  var m0 = 11;\n  var g0 = m0 * Float32Array.BYTES_PER_ELEMENT;\n  var i1 = 2;\n  var D5 = 0;\n  var S3;\n  var ye = 0;\n  var V0 = 0;\n  var oe2 = class extends W3 {\n    constructor(t, r, n11, a2) {\n      super();\n      this._terminal = t;\n      this._gl = r;\n      this._dimensions = n11;\n      this._optionsService = a2;\n      this._activeBuffer = 0;\n      this._vertices = { count: 0, attributes: new Float32Array(0), attributesBuffers: [new Float32Array(0), new Float32Array(0)] };\n      let s4 = this._gl;\n      j3.maxAtlasPages === void 0 && (j3.maxAtlasPages = Math.min(32, y3(s4.getParameter(s4.MAX_TEXTURE_IMAGE_UNITS))), j3.maxTextureSize = y3(s4.getParameter(s4.MAX_TEXTURE_SIZE))), this._program = y3(ae2(s4, e1, t1(j3.maxAtlasPages))), this._register(g4(() => s4.deleteProgram(this._program))), this._projectionLocation = y3(s4.getUniformLocation(this._program, "u_projection")), this._resolutionLocation = y3(s4.getUniformLocation(this._program, "u_resolution")), this._textureLocation = y3(s4.getUniformLocation(this._program, "u_texture")), this._vertexArrayObject = s4.createVertexArray(), s4.bindVertexArray(this._vertexArrayObject);\n      let o2 = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]), l4 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(l4))), s4.bindBuffer(s4.ARRAY_BUFFER, l4), s4.bufferData(s4.ARRAY_BUFFER, o2, s4.STATIC_DRAW), s4.enableVertexAttribArray(0), s4.vertexAttribPointer(0, 2, this._gl.FLOAT, false, 0, 0);\n      let T4 = new Uint8Array([0, 1, 2, 3]), h3 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(h3))), s4.bindBuffer(s4.ELEMENT_ARRAY_BUFFER, h3), s4.bufferData(s4.ELEMENT_ARRAY_BUFFER, T4, s4.STATIC_DRAW), this._attributesBuffer = y3(s4.createBuffer()), this._register(g4(() => s4.deleteBuffer(this._attributesBuffer))), s4.bindBuffer(s4.ARRAY_BUFFER, this._attributesBuffer), s4.enableVertexAttribArray(2), s4.vertexAttribPointer(2, 2, s4.FLOAT, false, g0, 0), s4.vertexAttribDivisor(2, 1), s4.enableVertexAttribArray(3), s4.vertexAttribPointer(3, 2, s4.FLOAT, false, g0, 2 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(3, 1), s4.enableVertexAttribArray(4), s4.vertexAttribPointer(4, 1, s4.FLOAT, false, g0, 4 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(4, 1), s4.enableVertexAttribArray(5), s4.vertexAttribPointer(5, 2, s4.FLOAT, false, g0, 5 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(5, 1), s4.enableVertexAttribArray(6), s4.vertexAttribPointer(6, 2, s4.FLOAT, false, g0, 7 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(6, 1), s4.enableVertexAttribArray(1), s4.vertexAttribPointer(1, 2, s4.FLOAT, false, g0, 9 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(1, 1), s4.useProgram(this._program);\n      let d3 = new Int32Array(j3.maxAtlasPages);\n      for (let _5 = 0; _5 < j3.maxAtlasPages; _5++) d3[_5] = _5;\n      s4.uniform1iv(this._textureLocation, d3), s4.uniformMatrix4fv(this._projectionLocation, false, ne2), this._atlasTextures = [];\n      for (let _5 = 0; _5 < j3.maxAtlasPages; _5++) {\n        let c2 = new se(y3(s4.createTexture()));\n        this._register(g4(() => s4.deleteTexture(c2.texture))), s4.activeTexture(s4.TEXTURE0 + _5), s4.bindTexture(s4.TEXTURE_2D, c2.texture), s4.texParameteri(s4.TEXTURE_2D, s4.TEXTURE_WRAP_S, s4.CLAMP_TO_EDGE), s4.texParameteri(s4.TEXTURE_2D, s4.TEXTURE_WRAP_T, s4.CLAMP_TO_EDGE), s4.texImage2D(s4.TEXTURE_2D, 0, s4.RGBA, 1, 1, 0, s4.RGBA, s4.UNSIGNED_BYTE, new Uint8Array([255, 0, 0, 255])), this._atlasTextures[_5] = c2;\n      }\n      s4.enable(s4.BLEND), s4.blendFunc(s4.SRC_ALPHA, s4.ONE_MINUS_SRC_ALPHA), this.handleResize();\n    }\n    beginFrame() {\n      return this._atlas ? this._atlas.beginFrame() : true;\n    }\n    updateCell(t, r, n11, a2, s4, o2, l4, T4, h3) {\n      this._updateCell(this._vertices.attributes, t, r, n11, a2, s4, o2, l4, T4, h3);\n    }\n    _updateCell(t, r, n11, a2, s4, o2, l4, T4, h3, d3) {\n      if (D5 = (n11 * this._terminal.cols + r) * m0, a2 === 0 || a2 === void 0) {\n        t.fill(0, D5, D5 + m0 - 1 - i1);\n        return;\n      }\n      this._atlas && (T4 && T4.length > 1 ? S3 = this._atlas.getRasterizedGlyphCombinedChar(T4, s4, o2, l4, false, this._terminal.element) : S3 = this._atlas.getRasterizedGlyph(a2, s4, o2, l4, false, this._terminal.element), ye = Math.floor((this._dimensions.device.cell.width - this._dimensions.device.char.width) / 2), s4 !== d3 && S3.offset.x > ye ? (V0 = S3.offset.x - ye, t[D5] = -(S3.offset.x - V0) + this._dimensions.device.char.left, t[D5 + 1] = -S3.offset.y + this._dimensions.device.char.top, t[D5 + 2] = (S3.size.x - V0) / this._dimensions.device.canvas.width, t[D5 + 3] = S3.size.y / this._dimensions.device.canvas.height, t[D5 + 4] = S3.texturePage, t[D5 + 5] = S3.texturePositionClipSpace.x + V0 / this._atlas.pages[S3.texturePage].canvas.width, t[D5 + 6] = S3.texturePositionClipSpace.y, t[D5 + 7] = S3.sizeClipSpace.x - V0 / this._atlas.pages[S3.texturePage].canvas.width, t[D5 + 8] = S3.sizeClipSpace.y) : (t[D5] = -S3.offset.x + this._dimensions.device.char.left, t[D5 + 1] = -S3.offset.y + this._dimensions.device.char.top, t[D5 + 2] = S3.size.x / this._dimensions.device.canvas.width, t[D5 + 3] = S3.size.y / this._dimensions.device.canvas.height, t[D5 + 4] = S3.texturePage, t[D5 + 5] = S3.texturePositionClipSpace.x, t[D5 + 6] = S3.texturePositionClipSpace.y, t[D5 + 7] = S3.sizeClipSpace.x, t[D5 + 8] = S3.sizeClipSpace.y), this._optionsService.rawOptions.rescaleOverlappingGlyphs && Ge2(a2, h3, S3.size.x, this._dimensions.device.cell.width) && (t[D5 + 2] = (this._dimensions.device.cell.width - 1) / this._dimensions.device.canvas.width));\n    }\n    clear() {\n      let t = this._terminal, r = t.cols * t.rows * m0;\n      this._vertices.count !== r ? this._vertices.attributes = new Float32Array(r) : this._vertices.attributes.fill(0);\n      let n11 = 0;\n      for (; n11 < this._vertices.attributesBuffers.length; n11++) this._vertices.count !== r ? this._vertices.attributesBuffers[n11] = new Float32Array(r) : this._vertices.attributesBuffers[n11].fill(0);\n      this._vertices.count = r, n11 = 0;\n      for (let a2 = 0; a2 < t.rows; a2++) for (let s4 = 0; s4 < t.cols; s4++) this._vertices.attributes[n11 + 9] = s4 / t.cols, this._vertices.attributes[n11 + 10] = a2 / t.rows, n11 += m0;\n    }\n    handleResize() {\n      let t = this._gl;\n      t.useProgram(this._program), t.viewport(0, 0, this._dimensions.device.canvas.width, this._dimensions.device.canvas.height), t.uniform2f(this._resolutionLocation, this._dimensions.device.canvas.width, this._dimensions.device.canvas.height), this.clear();\n    }\n    render(t) {\n      if (!this._atlas) return;\n      let r = this._gl;\n      r.useProgram(this._program), r.bindVertexArray(this._vertexArrayObject), this._activeBuffer = (this._activeBuffer + 1) % 2;\n      let n11 = this._vertices.attributesBuffers[this._activeBuffer], a2 = 0;\n      for (let s4 = 0; s4 < t.lineLengths.length; s4++) {\n        let o2 = s4 * this._terminal.cols * m0, l4 = this._vertices.attributes.subarray(o2, o2 + t.lineLengths[s4] * m0);\n        n11.set(l4, a2), a2 += l4.length;\n      }\n      r.bindBuffer(r.ARRAY_BUFFER, this._attributesBuffer), r.bufferData(r.ARRAY_BUFFER, n11.subarray(0, a2), r.STREAM_DRAW);\n      for (let s4 = 0; s4 < this._atlas.pages.length; s4++) this._atlas.pages[s4].version !== this._atlasTextures[s4].version && this._bindAtlasPageTexture(r, this._atlas, s4);\n      r.drawElementsInstanced(r.TRIANGLE_STRIP, 4, r.UNSIGNED_BYTE, 0, a2 / m0);\n    }\n    setAtlas(t) {\n      this._atlas = t;\n      for (let r of this._atlasTextures) r.version = -1;\n    }\n    _bindAtlasPageTexture(t, r, n11) {\n      t.activeTexture(t.TEXTURE0 + n11), t.bindTexture(t.TEXTURE_2D, this._atlasTextures[n11].texture), t.texParameteri(t.TEXTURE_2D, t.TEXTURE_WRAP_S, t.CLAMP_TO_EDGE), t.texParameteri(t.TEXTURE_2D, t.TEXTURE_WRAP_T, t.CLAMP_TO_EDGE), t.texImage2D(t.TEXTURE_2D, 0, t.RGBA, t.RGBA, t.UNSIGNED_BYTE, r.pages[n11].canvas), t.generateMipmap(t.TEXTURE_2D), this._atlasTextures[n11].version = r.pages[n11].version;\n    }\n    setDimensions(t) {\n      this._dimensions = t;\n    }\n  };\n  var Se2 = class {\n    constructor() {\n      this.clear();\n    }\n    clear() {\n      this.hasSelection = false, this.columnSelectMode = false, this.viewportStartRow = 0, this.viewportEndRow = 0, this.viewportCappedStartRow = 0, this.viewportCappedEndRow = 0, this.startCol = 0, this.endCol = 0, this.selectionStart = void 0, this.selectionEnd = void 0;\n    }\n    update(e, t, r, n11 = false) {\n      if (this.selectionStart = t, this.selectionEnd = r, !t || !r || t[0] === r[0] && t[1] === r[1]) {\n        this.clear();\n        return;\n      }\n      let a2 = e.buffers.active.ydisp, s4 = t[1] - a2, o2 = r[1] - a2, l4 = Math.max(s4, 0), T4 = Math.min(o2, e.rows - 1);\n      if (l4 >= e.rows || T4 < 0) {\n        this.clear();\n        return;\n      }\n      this.hasSelection = true, this.columnSelectMode = n11, this.viewportStartRow = s4, this.viewportEndRow = o2, this.viewportCappedStartRow = l4, this.viewportCappedEndRow = T4, this.startCol = t[0], this.endCol = r[0];\n    }\n    isCellSelected(e, t, r) {\n      return this.hasSelection ? (r -= e.buffer.active.viewportY, this.columnSelectMode ? this.startCol <= this.endCol ? t >= this.startCol && r >= this.viewportCappedStartRow && t < this.endCol && r <= this.viewportCappedEndRow : t < this.startCol && r >= this.viewportCappedStartRow && t >= this.endCol && r <= this.viewportCappedEndRow : r > this.viewportStartRow && r < this.viewportEndRow || this.viewportStartRow === this.viewportEndRow && r === this.viewportStartRow && t >= this.startCol && t < this.endCol || this.viewportStartRow < this.viewportEndRow && r === this.viewportEndRow && t < this.endCol || this.viewportStartRow < this.viewportEndRow && r === this.viewportStartRow && t >= this.startCol) : false;\n    }\n  };\n  function _t() {\n    return new Se2();\n  }\n  var y0 = 4;\n  var S0 = 1;\n  var R0 = 2;\n  var le = 3;\n  var ct2 = 2147483648;\n  var Te2 = class {\n    constructor() {\n      this.cells = new Uint32Array(0), this.lineLengths = new Uint32Array(0), this.selection = _t();\n    }\n    resize(e, t) {\n      let r = e * t * y0;\n      r !== this.cells.length && (this.cells = new Uint32Array(r), this.lineLengths = new Uint32Array(t));\n    }\n    clear() {\n      this.cells.fill(0, 0), this.lineLengths.fill(0, 0);\n    }\n  };\n  var r1 = `#version 300 es\nlayout (location = 0) in vec2 a_position;\nlayout (location = 1) in vec2 a_size;\nlayout (location = 2) in vec4 a_color;\nlayout (location = 3) in vec2 a_unitquad;\n\nuniform mat4 u_projection;\n\nout vec4 v_color;\n\nvoid main() {\n  vec2 zeroToOne = a_position + (a_unitquad * a_size);\n  gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n  v_color = a_color;\n}`;\n  var s1 = `#version 300 es\nprecision lowp float;\n\nin vec4 v_color;\n\nout vec4 outColor;\n\nvoid main() {\n  outColor = v_color;\n}`;\n  var u0 = 8;\n  var Re2 = u0 * Float32Array.BYTES_PER_ELEMENT;\n  var n1 = 20 * u0;\n  var Le = class {\n    constructor() {\n      this.attributes = new Float32Array(n1), this.count = 0;\n    }\n  };\n  var c0 = 0;\n  var ut = 0;\n  var pt = 0;\n  var Qt = 0;\n  var Ct = 0;\n  var mt = 0;\n  var ft = 0;\n  var he = class extends W3 {\n    constructor(t, r, n11, a2) {\n      super();\n      this._terminal = t;\n      this._gl = r;\n      this._dimensions = n11;\n      this._themeService = a2;\n      this._vertices = new Le();\n      this._verticesCursor = new Le();\n      let s4 = this._gl;\n      this._program = y3(ae2(s4, r1, s1)), this._register(g4(() => s4.deleteProgram(this._program))), this._projectionLocation = y3(s4.getUniformLocation(this._program, "u_projection")), this._vertexArrayObject = s4.createVertexArray(), s4.bindVertexArray(this._vertexArrayObject);\n      let o2 = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]), l4 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(l4))), s4.bindBuffer(s4.ARRAY_BUFFER, l4), s4.bufferData(s4.ARRAY_BUFFER, o2, s4.STATIC_DRAW), s4.enableVertexAttribArray(3), s4.vertexAttribPointer(3, 2, this._gl.FLOAT, false, 0, 0);\n      let T4 = new Uint8Array([0, 1, 2, 3]), h3 = s4.createBuffer();\n      this._register(g4(() => s4.deleteBuffer(h3))), s4.bindBuffer(s4.ELEMENT_ARRAY_BUFFER, h3), s4.bufferData(s4.ELEMENT_ARRAY_BUFFER, T4, s4.STATIC_DRAW), this._attributesBuffer = y3(s4.createBuffer()), this._register(g4(() => s4.deleteBuffer(this._attributesBuffer))), s4.bindBuffer(s4.ARRAY_BUFFER, this._attributesBuffer), s4.enableVertexAttribArray(0), s4.vertexAttribPointer(0, 2, s4.FLOAT, false, Re2, 0), s4.vertexAttribDivisor(0, 1), s4.enableVertexAttribArray(1), s4.vertexAttribPointer(1, 2, s4.FLOAT, false, Re2, 2 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(1, 1), s4.enableVertexAttribArray(2), s4.vertexAttribPointer(2, 4, s4.FLOAT, false, Re2, 4 * Float32Array.BYTES_PER_ELEMENT), s4.vertexAttribDivisor(2, 1), this._updateCachedColors(a2.colors), this._register(this._themeService.onChangeColors((d3) => {\n        this._updateCachedColors(d3), this._updateViewportRectangle();\n      }));\n    }\n    renderBackgrounds() {\n      this._renderVertices(this._vertices);\n    }\n    renderCursor() {\n      this._renderVertices(this._verticesCursor);\n    }\n    _renderVertices(t) {\n      let r = this._gl;\n      r.useProgram(this._program), r.bindVertexArray(this._vertexArrayObject), r.uniformMatrix4fv(this._projectionLocation, false, ne2), r.bindBuffer(r.ARRAY_BUFFER, this._attributesBuffer), r.bufferData(r.ARRAY_BUFFER, t.attributes, r.DYNAMIC_DRAW), r.drawElementsInstanced(this._gl.TRIANGLE_STRIP, 4, r.UNSIGNED_BYTE, 0, t.count);\n    }\n    handleResize() {\n      this._updateViewportRectangle();\n    }\n    setDimensions(t) {\n      this._dimensions = t;\n    }\n    _updateCachedColors(t) {\n      this._bgFloat = this._colorToFloat32Array(t.background), this._cursorFloat = this._colorToFloat32Array(t.cursor);\n    }\n    _updateViewportRectangle() {\n      this._addRectangleFloat(this._vertices.attributes, 0, 0, 0, this._terminal.cols * this._dimensions.device.cell.width, this._terminal.rows * this._dimensions.device.cell.height, this._bgFloat);\n    }\n    updateBackgrounds(t) {\n      let r = this._terminal, n11 = this._vertices, a2 = 1, s4, o2, l4, T4, h3, d3, _5, c2, u3, p3, C4;\n      for (s4 = 0; s4 < r.rows; s4++) {\n        for (l4 = -1, T4 = 0, h3 = 0, d3 = false, o2 = 0; o2 < r.cols; o2++) _5 = (s4 * r.cols + o2) * y0, c2 = t.cells[_5 + S0], u3 = t.cells[_5 + R0], p3 = !!(u3 & 67108864), (c2 !== T4 || u3 !== h3 && (d3 || p3)) && ((T4 !== 0 || d3 && h3 !== 0) && (C4 = a2++ * u0, this._updateRectangle(n11, C4, h3, T4, l4, o2, s4)), l4 = o2, T4 = c2, h3 = u3, d3 = p3);\n        (T4 !== 0 || d3 && h3 !== 0) && (C4 = a2++ * u0, this._updateRectangle(n11, C4, h3, T4, l4, r.cols, s4));\n      }\n      n11.count = a2;\n    }\n    updateCursor(t) {\n      let r = this._verticesCursor, n11 = t.cursor;\n      if (!n11 || n11.style === "block") {\n        r.count = 0;\n        return;\n      }\n      let a2, s4 = 0;\n      (n11.style === "bar" || n11.style === "outline") && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, n11.y * this._dimensions.device.cell.height, n11.style === "bar" ? n11.dpr * n11.cursorWidth : n11.dpr, this._dimensions.device.cell.height, this._cursorFloat)), (n11.style === "underline" || n11.style === "outline") && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, (n11.y + 1) * this._dimensions.device.cell.height - n11.dpr, n11.width * this._dimensions.device.cell.width, n11.dpr, this._cursorFloat)), n11.style === "outline" && (a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, n11.x * this._dimensions.device.cell.width, n11.y * this._dimensions.device.cell.height, n11.width * this._dimensions.device.cell.width, n11.dpr, this._cursorFloat), a2 = s4++ * u0, this._addRectangleFloat(r.attributes, a2, (n11.x + n11.width) * this._dimensions.device.cell.width - n11.dpr, n11.y * this._dimensions.device.cell.height, n11.dpr, this._dimensions.device.cell.height, this._cursorFloat)), r.count = s4;\n    }\n    _updateRectangle(t, r, n11, a2, s4, o2, l4) {\n      if (n11 & 67108864) switch (n11 & 50331648) {\n        case 16777216:\n        case 33554432:\n          c0 = this._themeService.colors.ansi[n11 & 255].rgba;\n          break;\n        case 50331648:\n          c0 = (n11 & 16777215) << 8;\n          break;\n        case 0:\n        default:\n          c0 = this._themeService.colors.foreground.rgba;\n      }\n      else switch (a2 & 50331648) {\n        case 16777216:\n        case 33554432:\n          c0 = this._themeService.colors.ansi[a2 & 255].rgba;\n          break;\n        case 50331648:\n          c0 = (a2 & 16777215) << 8;\n          break;\n        case 0:\n        default:\n          c0 = this._themeService.colors.background.rgba;\n      }\n      t.attributes.length < r + 4 && (t.attributes = dt(t.attributes, this._terminal.rows * this._terminal.cols * u0)), ut = s4 * this._dimensions.device.cell.width, pt = l4 * this._dimensions.device.cell.height, Qt = (c0 >> 24 & 255) / 255, Ct = (c0 >> 16 & 255) / 255, mt = (c0 >> 8 & 255) / 255, ft = 1, this._addRectangle(t.attributes, r, ut, pt, (o2 - s4) * this._dimensions.device.cell.width, this._dimensions.device.cell.height, Qt, Ct, mt, ft);\n    }\n    _addRectangle(t, r, n11, a2, s4, o2, l4, T4, h3, d3) {\n      t[r] = n11 / this._dimensions.device.canvas.width, t[r + 1] = a2 / this._dimensions.device.canvas.height, t[r + 2] = s4 / this._dimensions.device.canvas.width, t[r + 3] = o2 / this._dimensions.device.canvas.height, t[r + 4] = l4, t[r + 5] = T4, t[r + 6] = h3, t[r + 7] = d3;\n    }\n    _addRectangleFloat(t, r, n11, a2, s4, o2, l4) {\n      t[r] = n11 / this._dimensions.device.canvas.width, t[r + 1] = a2 / this._dimensions.device.canvas.height, t[r + 2] = s4 / this._dimensions.device.canvas.width, t[r + 3] = o2 / this._dimensions.device.canvas.height, t[r + 4] = l4[0], t[r + 5] = l4[1], t[r + 6] = l4[2], t[r + 7] = l4[3];\n    }\n    _colorToFloat32Array(t) {\n      return new Float32Array([(t.rgba >> 24 & 255) / 255, (t.rgba >> 16 & 255) / 255, (t.rgba >> 8 & 255) / 255, (t.rgba & 255) / 255]);\n    }\n  };\n  var de = class extends W3 {\n    constructor(t, r, n11, a2, s4, o2, l4, T4) {\n      super();\n      this._container = r;\n      this._alpha = s4;\n      this._coreBrowserService = o2;\n      this._optionsService = l4;\n      this._themeService = T4;\n      this._deviceCharWidth = 0;\n      this._deviceCharHeight = 0;\n      this._deviceCellWidth = 0;\n      this._deviceCellHeight = 0;\n      this._deviceCharLeft = 0;\n      this._deviceCharTop = 0;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas"), this._canvas.classList.add(`xterm-${n11}-layer`), this._canvas.style.zIndex = a2.toString(), this._initCanvas(), this._container.appendChild(this._canvas), this._register(this._themeService.onChangeColors((h3) => {\n        this._refreshCharAtlas(t, h3), this.reset(t);\n      })), this._register(g4(() => {\n        this._canvas.remove();\n      }));\n    }\n    _initCanvas() {\n      this._ctx = y3(this._canvas.getContext("2d", { alpha: this._alpha })), this._alpha || this._clearAll();\n    }\n    handleBlur(t) {\n    }\n    handleFocus(t) {\n    }\n    handleCursorMove(t) {\n    }\n    handleGridChanged(t, r, n11) {\n    }\n    handleSelectionChanged(t, r, n11, a2 = false) {\n    }\n    _setTransparency(t, r) {\n      if (r === this._alpha) return;\n      let n11 = this._canvas;\n      this._alpha = r, this._canvas = this._canvas.cloneNode(), this._initCanvas(), this._container.replaceChild(this._canvas, n11), this._refreshCharAtlas(t, this._themeService.colors), this.handleGridChanged(t, 0, t.rows - 1);\n    }\n    _refreshCharAtlas(t, r) {\n      this._deviceCharWidth <= 0 && this._deviceCharHeight <= 0 || (this._charAtlas = ee2(t, this._optionsService.rawOptions, r, this._deviceCellWidth, this._deviceCellHeight, this._deviceCharWidth, this._deviceCharHeight, this._coreBrowserService.dpr, 2048), this._charAtlas.warmUp());\n    }\n    resize(t, r) {\n      this._deviceCellWidth = r.device.cell.width, this._deviceCellHeight = r.device.cell.height, this._deviceCharWidth = r.device.char.width, this._deviceCharHeight = r.device.char.height, this._deviceCharLeft = r.device.char.left, this._deviceCharTop = r.device.char.top, this._canvas.width = r.device.canvas.width, this._canvas.height = r.device.canvas.height, this._canvas.style.width = `${r.css.canvas.width}px`, this._canvas.style.height = `${r.css.canvas.height}px`, this._alpha || this._clearAll(), this._refreshCharAtlas(t, this._themeService.colors);\n    }\n    _fillBottomLineAtCells(t, r, n11 = 1) {\n      this._ctx.fillRect(t * this._deviceCellWidth, (r + 1) * this._deviceCellHeight - this._coreBrowserService.dpr - 1, n11 * this._deviceCellWidth, this._coreBrowserService.dpr);\n    }\n    _clearAll() {\n      this._alpha ? this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height) : (this._ctx.fillStyle = this._themeService.colors.background.css, this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height));\n    }\n    _clearCells(t, r, n11, a2) {\n      this._alpha ? this._ctx.clearRect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, a2 * this._deviceCellHeight) : (this._ctx.fillStyle = this._themeService.colors.background.css, this._ctx.fillRect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, a2 * this._deviceCellHeight));\n    }\n    _fillCharTrueColor(t, r, n11, a2) {\n      this._ctx.font = this._getFont(t, false, false), this._ctx.textBaseline = q0, this._clipCell(n11, a2, r.getWidth()), this._ctx.fillText(r.getChars(), n11 * this._deviceCellWidth + this._deviceCharLeft, a2 * this._deviceCellHeight + this._deviceCharTop + this._deviceCharHeight);\n    }\n    _clipCell(t, r, n11) {\n      this._ctx.beginPath(), this._ctx.rect(t * this._deviceCellWidth, r * this._deviceCellHeight, n11 * this._deviceCellWidth, this._deviceCellHeight), this._ctx.clip();\n    }\n    _getFont(t, r, n11) {\n      let a2 = r ? t.options.fontWeightBold : t.options.fontWeight;\n      return `${n11 ? "italic" : ""} ${a2} ${t.options.fontSize * this._coreBrowserService.dpr}px ${t.options.fontFamily}`;\n    }\n  };\n  var _e = class extends de {\n    constructor(e, t, r, n11, a2, s4, o2) {\n      super(r, e, "link", t, true, a2, s4, o2), this._register(n11.onShowLinkUnderline((l4) => this._handleShowLinkUnderline(l4))), this._register(n11.onHideLinkUnderline((l4) => this._handleHideLinkUnderline(l4)));\n    }\n    resize(e, t) {\n      super.resize(e, t), this._state = void 0;\n    }\n    reset(e) {\n      this._clearCurrentLink();\n    }\n    _clearCurrentLink() {\n      if (this._state) {\n        this._clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1);\n        let e = this._state.y2 - this._state.y1 - 1;\n        e > 0 && this._clearCells(0, this._state.y1 + 1, this._state.cols, e), this._clearCells(0, this._state.y2, this._state.x2, 1), this._state = void 0;\n      }\n    }\n    _handleShowLinkUnderline(e) {\n      if (e.fg === 257 ? this._ctx.fillStyle = this._themeService.colors.background.css : e.fg !== void 0 && lt(e.fg) ? this._ctx.fillStyle = this._themeService.colors.ansi[e.fg].css : this._ctx.fillStyle = this._themeService.colors.foreground.css, e.y1 === e.y2) this._fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1);\n      else {\n        this._fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1);\n        for (let t = e.y1 + 1; t < e.y2; t++) this._fillBottomLineAtCells(0, t, e.cols);\n        this._fillBottomLineAtCells(0, e.y2, e.x2);\n      }\n      this._state = e;\n    }\n    _handleHideLinkUnderline(e) {\n      this._clearCurrentLink();\n    }\n  };\n  var xe = class {\n    constructor(e, t, r, n11) {\n      this._node = e, this._type = t, this._handler = r, this._options = n11, e.addEventListener(t, r, n11);\n    }\n    dispose() {\n      !this._node || !this._handler || (this._node.removeEventListener(this._type, this._handler, this._options), this._node = null, this._handler = null);\n    }\n  };\n  function ce2(i5, e, t, r) {\n    return new xe(i5, e, t, r);\n  }\n  var ue = class extends W3 {\n    constructor(t, r, n11, a2, s4, o2, l4, T4, h3 = true, d3) {\n      super();\n      this._terminal = t;\n      this._characterJoinerService = r;\n      this._charSizeService = n11;\n      this._coreBrowserService = a2;\n      this._coreService = s4;\n      this._decorationService = o2;\n      this._optionsService = l4;\n      this._themeService = T4;\n      this._customGlyphs = h3;\n      this._cursorBlinkStateManager = this._register(new C0());\n      this._charAtlasDisposable = this._register(new C0());\n      this._observerDisposable = this._register(new C0());\n      this._model = new Te2();\n      this._rowHasBlinkingCells = [];\n      this._rowHasBlinkingCellsCount = 0;\n      this._workCell = new ie2();\n      this._rectangleRenderer = this._register(new C0());\n      this._glyphRenderer = this._register(new C0());\n      this._onChangeTextureAtlas = this._register(new U4());\n      this.onChangeTextureAtlas = this._onChangeTextureAtlas.event;\n      this._onAddTextureAtlasCanvas = this._register(new U4());\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = this._register(new U4());\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._onRequestRedraw = this._register(new U4());\n      this.onRequestRedraw = this._onRequestRedraw.event;\n      this._onContextLoss = this._register(new U4());\n      this.onContextLoss = this._onContextLoss.event;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas");\n      let _5 = { antialias: false, depth: false, preserveDrawingBuffer: d3 };\n      if (this._gl = this._canvas.getContext("webgl2", _5), !this._gl) throw new Error("WebGL2 not supported " + this._gl);\n      this._register(this._themeService.onChangeColors(() => this._handleColorChange())), this._cellColorResolver = new Y0(this._terminal, this._optionsService, this._model.selection, this._decorationService, this._coreBrowserService, this._themeService), this._core = this._terminal._core, this._renderLayers = [new _e(this._core.screenElement, 2, this._terminal, this._core.linkifier, this._coreBrowserService, l4, this._themeService)], this.dimensions = Ke2(), this._devicePixelRatio = this._coreBrowserService.dpr, this._updateDimensions(), this._updateCursorBlink(), this._register(l4.onOptionChange(() => this._handleOptionsChanged())), this._textBlinkStateManager = this._register(new re(() => this._requestRedrawViewport(), this._coreBrowserService, this._optionsService)), this._resetBlinkingRowState(), this._deviceMaxTextureSize = this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE), this._register(ce2(this._canvas, "webglcontextlost", (c2) => {\n        console.log("webglcontextlost event received"), c2.preventDefault(), this._contextRestorationTimeout = setTimeout(() => {\n          this._contextRestorationTimeout = void 0, console.warn("webgl context not restored; firing onContextLoss"), this._onContextLoss.fire(c2);\n        }, 3e3);\n      })), this._register(ce2(this._canvas, "webglcontextrestored", (c2) => {\n        console.warn("webglcontextrestored event received"), clearTimeout(this._contextRestorationTimeout), this._contextRestorationTimeout = void 0, Me(this._terminal), this._initializeWebGLState(), this._requestRedrawViewport();\n      })), this._observerDisposable.value = Ae2(this._canvas, this._coreBrowserService.window, (c2, u3) => this._setCanvasDevicePixelDimensions(c2, u3)), this._register(this._coreBrowserService.onWindowChange((c2) => {\n        this._observerDisposable.value = Ae2(this._canvas, c2, (u3, p3) => this._setCanvasDevicePixelDimensions(u3, p3));\n      })), this._register(ce2(this._coreBrowserService.mainDocument, "mousedown", () => this._cursorBlinkStateManager.value?.restartBlinkAnimation())), this._core.screenElement.appendChild(this._canvas), [this._rectangleRenderer.value, this._glyphRenderer.value] = this._initializeWebGLState(), this._isAttached = this._core.screenElement.isConnected, this._register(g4(() => {\n        for (let c2 of this._renderLayers) c2.dispose();\n        this._canvas.parentElement?.removeChild(this._canvas), Me(this._terminal);\n      }));\n    }\n    get textureAtlas() {\n      return this._charAtlas?.pages[0].canvas;\n    }\n    _handleColorChange() {\n      this._refreshCharAtlas(), this._clearModel(true);\n    }\n    handleDevicePixelRatioChange() {\n      this._devicePixelRatio !== this._coreBrowserService.dpr && (this._devicePixelRatio = this._coreBrowserService.dpr, this.handleResize(this._terminal.cols, this._terminal.rows));\n    }\n    handleResize(t, r) {\n      this._updateDimensions(), this._model.resize(this._terminal.cols, this._terminal.rows), this._resetBlinkingRowState();\n      for (let n11 of this._renderLayers) n11.resize(this._terminal, this.dimensions);\n      this._canvas.width = this.dimensions.device.canvas.width, this._canvas.height = this.dimensions.device.canvas.height, this._canvas.style.width = `${this.dimensions.css.canvas.width}px`, this._canvas.style.height = `${this.dimensions.css.canvas.height}px`, this._core.screenElement.style.width = `${this.dimensions.css.canvas.width}px`, this._core.screenElement.style.height = `${this.dimensions.css.canvas.height}px`, this._rectangleRenderer.value?.setDimensions(this.dimensions), this._rectangleRenderer.value?.handleResize(), this._glyphRenderer.value?.setDimensions(this.dimensions), this._glyphRenderer.value?.handleResize(), this._refreshCharAtlas(), this._clearModel(false), this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1, sync: true });\n    }\n    handleCharSizeChanged() {\n      this.handleResize(this._terminal.cols, this._terminal.rows);\n    }\n    handleBlur() {\n      for (let t of this._renderLayers) t.handleBlur(this._terminal);\n      this._cursorBlinkStateManager.value?.pause(), this._requestRedrawViewport();\n    }\n    handleFocus() {\n      for (let t of this._renderLayers) t.handleFocus(this._terminal);\n      this._cursorBlinkStateManager.value?.resume(), this._requestRedrawViewport();\n    }\n    handleViewportVisibilityChange(t) {\n      this._textBlinkStateManager.setViewportVisible(t);\n    }\n    handleSelectionChanged(t, r, n11) {\n      for (let a2 of this._renderLayers) a2.handleSelectionChanged(this._terminal, t, r, n11);\n      this._model.selection.update(this._core, t, r, n11), this._requestRedrawViewport();\n    }\n    handleCursorMove() {\n      for (let t of this._renderLayers) t.handleCursorMove(this._terminal);\n      this._cursorBlinkStateManager.value?.restartBlinkAnimation();\n    }\n    _handleOptionsChanged() {\n      this._updateDimensions(), this._refreshCharAtlas(), this._updateCursorBlink();\n    }\n    _initializeWebGLState() {\n      return this._rectangleRenderer.value = new he(this._terminal, this._gl, this.dimensions, this._themeService), this._glyphRenderer.value = new oe2(this._terminal, this._gl, this.dimensions, this._optionsService), this.handleCharSizeChanged(), [this._rectangleRenderer.value, this._glyphRenderer.value];\n    }\n    _refreshCharAtlas() {\n      if (this.dimensions.device.char.width <= 0 && this.dimensions.device.char.height <= 0) {\n        this._isAttached = false;\n        return;\n      }\n      let t = ee2(this._terminal, this._optionsService.rawOptions, this._themeService.colors, this.dimensions.device.cell.width, this.dimensions.device.cell.height, this.dimensions.device.char.width, this.dimensions.device.char.height, this._coreBrowserService.dpr, this._deviceMaxTextureSize, this._customGlyphs);\n      this._charAtlas !== t && (this._onChangeTextureAtlas.fire(t.pages[0].canvas), this._charAtlasDisposable.value = ke2(_0.forward(t.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas), _0.forward(t.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas))), this._charAtlas = t, this._charAtlas.warmUp(), this._glyphRenderer.value?.setAtlas(this._charAtlas);\n    }\n    _clearModel(t) {\n      this._model.clear(), t && this._glyphRenderer.value?.clear();\n    }\n    clearTextureAtlas() {\n      this._charAtlas?.clearTexture(), this._clearModel(true), this._requestRedrawViewport();\n    }\n    clear() {\n      this._clearModel(true);\n      for (let t of this._renderLayers) t.reset(this._terminal);\n      this._resetBlinkingRowState(), this._textBlinkStateManager.setNeedsBlinkInViewport(false), this._cursorBlinkStateManager.value?.restartBlinkAnimation(), this._updateCursorBlink();\n    }\n    renderRows(t, r) {\n      if (!this._isAttached) if (this._core.screenElement?.isConnected && this._charSizeService.width && this._charSizeService.height) this._updateDimensions(), this._refreshCharAtlas(), this._isAttached = true;\n      else return;\n      for (let n11 of this._renderLayers) n11.handleGridChanged(this._terminal, t, r);\n      !this._glyphRenderer.value || !this._rectangleRenderer.value || (this._glyphRenderer.value.beginFrame() ? (this._clearModel(true), this._updateModel(0, this._terminal.rows - 1)) : this._updateModel(t, r), this._rectangleRenderer.value.renderBackgrounds(), this._glyphRenderer.value.render(this._model), (!this._cursorBlinkStateManager.value || this._cursorBlinkStateManager.value.isCursorVisible) && this._rectangleRenderer.value.renderCursor());\n    }\n    _updateCursorBlink() {\n      this._coreService.decPrivateModes.cursorBlink ?? this._terminal.options.cursorBlink ? this._cursorBlinkStateManager.value = new te(() => {\n        this._requestRedrawCursor();\n      }, this._coreBrowserService) : this._cursorBlinkStateManager.clear(), this._requestRedrawCursor();\n    }\n    _updateModel(t, r) {\n      let n11 = this._core, a2 = this._workCell, s4, o2, l4, T4, h3, d3, _5 = 0, c2 = true, u3, p3, C4, Q3, m4, R4, F4, b4, A4;\n      t = Et(t, n11.rows - 1, 0), r = Et(r, n11.rows - 1, 0);\n      let X3 = this._coreService.decPrivateModes.cursorStyle ?? n11.options.cursorStyle ?? "block", z4 = this._terminal.buffer.active.baseY + this._terminal.buffer.active.cursorY, x0 = z4 - n11.buffer.ydisp, e0 = Math.min(this._terminal.buffer.active.cursorX, n11.cols - 1), T0 = -1, M4 = this._coreService.isCursorInitialized && !this._coreService.isCursorHidden && (!this._cursorBlinkStateManager.value || this._cursorBlinkStateManager.value.isCursorVisible);\n      this._model.cursor = void 0;\n      let l0 = false;\n      for (o2 = t; o2 <= r; o2++) {\n        l4 = o2 + n11.buffer.ydisp, T4 = n11.buffer.lines.get(l4);\n        let t0 = false;\n        for (this._model.lineLengths[o2] = 0, C4 = z4 === l4, _5 = 0, h3 = this._characterJoinerService.getJoinedCharacters(l4), b4 = 0; b4 < n11.cols; b4++) {\n          if (s4 = this._cellColorResolver.result.bg, T4.loadCell(b4, a2), b4 === 0 && (s4 = this._cellColorResolver.result.bg), d3 = false, c2 = b4 >= _5, u3 = b4, h3.length > 0 && b4 === h3[0][0] && c2) {\n            p3 = h3.shift();\n            let Y2 = this._model.selection.isCellSelected(this._terminal, p3[0], l4);\n            for (F4 = p3[0] + 1; F4 < p3[1]; F4++) c2 &&= Y2 === this._model.selection.isCellSelected(this._terminal, F4, l4);\n            c2 &&= !C4 || e0 < p3[0] || e0 >= p3[1], c2 ? (d3 = true, a2 = new De2(a2, T4.translateToString(true, p3[0], p3[1]), p3[1] - p3[0]), u3 = p3[1] - 1) : _5 = p3[1];\n          }\n          if (Q3 = a2.getChars(), m4 = a2.getCode(), F4 = (o2 * n11.cols + b4) * y0, !t0 && a2.isBlink() && (t0 = true), this._cellColorResolver.resolve(a2, b4, l4, this.dimensions.device.cell.width, this.dimensions.device.cell.height), M4 && l4 === z4 && (b4 === e0 && (this._model.cursor = { x: e0, y: x0, width: a2.getWidth(), style: this._coreBrowserService.isFocused ? X3 : n11.options.cursorInactiveStyle, cursorWidth: n11.options.cursorWidth, dpr: this._devicePixelRatio }, T0 = e0 + a2.getWidth() - 1), b4 >= e0 && b4 <= T0 && (this._coreBrowserService.isFocused && X3 === "block" || this._coreBrowserService.isFocused === false && n11.options.cursorInactiveStyle === "block") && (this._cellColorResolver.result.fg = 50331648 | this._themeService.colors.cursorAccent.rgba >> 8 & 16777215, this._cellColorResolver.result.bg = 50331648 | this._themeService.colors.cursor.rgba >> 8 & 16777215)), this._textBlinkStateManager.isEnabled && !this._textBlinkStateManager.isBlinkOn && a2.isBlink() && (this._cellColorResolver.result.fg |= 1073741824), m4 !== 0 && (this._model.lineLengths[o2] = b4 + 1), !(this._model.cells[F4] === m4 && this._model.cells[F4 + S0] === this._cellColorResolver.result.bg && this._model.cells[F4 + R0] === this._cellColorResolver.result.fg && this._model.cells[F4 + le] === this._cellColorResolver.result.ext) && (l0 = true, Q3.length > 1 && (m4 |= ct2), this._model.cells[F4] = m4, this._model.cells[F4 + S0] = this._cellColorResolver.result.bg, this._model.cells[F4 + R0] = this._cellColorResolver.result.fg, this._model.cells[F4 + le] = this._cellColorResolver.result.ext, R4 = a2.getWidth(), this._glyphRenderer.value.updateCell(b4, o2, m4, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext, Q3, R4, s4), d3)) {\n            for (a2 = this._workCell, b4++; b4 <= u3; b4++) A4 = (o2 * n11.cols + b4) * y0, this._glyphRenderer.value.updateCell(b4, o2, 0, 0, 0, 0, "", 0, 0), this._model.cells[A4] = 0, this._model.cells[A4 + S0] = this._cellColorResolver.result.bg, this._model.cells[A4 + R0] = this._cellColorResolver.result.fg, this._model.cells[A4 + le] = this._cellColorResolver.result.ext;\n            b4--;\n          }\n        }\n        this._setRowBlinkState(o2, t0);\n      }\n      l0 && this._rectangleRenderer.value.updateBackgrounds(this._model), this._rectangleRenderer.value.updateCursor(this._model), this._updateTextBlinkState();\n    }\n    _resetBlinkingRowState() {\n      this._rowHasBlinkingCells = new Array(this._terminal.rows).fill(false), this._rowHasBlinkingCellsCount = 0;\n    }\n    _setRowBlinkState(t, r) {\n      this._rowHasBlinkingCells[t] !== r && (this._rowHasBlinkingCells[t] = r, this._rowHasBlinkingCellsCount += r ? 1 : -1);\n    }\n    _updateTextBlinkState() {\n      this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount > 0);\n    }\n    _updateDimensions() {\n      !this._charSizeService.width || !this._charSizeService.height || (this.dimensions.device.char.width = Math.floor(this._charSizeService.width * this._devicePixelRatio), this.dimensions.device.char.height = Math.ceil(this._charSizeService.height * this._devicePixelRatio), this.dimensions.device.cell.height = Math.floor(this.dimensions.device.char.height * this._optionsService.rawOptions.lineHeight), this.dimensions.device.char.top = this._optionsService.rawOptions.lineHeight === 1 ? 0 : Math.round((this.dimensions.device.cell.height - this.dimensions.device.char.height) / 2), this.dimensions.device.cell.width = this.dimensions.device.char.width + Math.round(this._optionsService.rawOptions.letterSpacing), this.dimensions.device.char.left = Math.floor(this._optionsService.rawOptions.letterSpacing / 2), this.dimensions.device.canvas.height = this._terminal.rows * this.dimensions.device.cell.height, this.dimensions.device.canvas.width = this._terminal.cols * this.dimensions.device.cell.width, this.dimensions.css.canvas.height = Math.round(this.dimensions.device.canvas.height / this._devicePixelRatio), this.dimensions.css.canvas.width = Math.round(this.dimensions.device.canvas.width / this._devicePixelRatio), this.dimensions.css.cell.height = this.dimensions.device.cell.height / this._devicePixelRatio, this.dimensions.css.cell.width = this.dimensions.device.cell.width / this._devicePixelRatio);\n    }\n    _setCanvasDevicePixelDimensions(t, r) {\n      this._canvas.width === t && this._canvas.height === r || (this._canvas.width = t, this._canvas.height = r, this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1, sync: true }));\n    }\n    _requestRedrawViewport() {\n      this._onRequestRedraw.fire({ start: 0, end: this._terminal.rows - 1 });\n    }\n    _requestRedrawCursor() {\n      let t = this._terminal.buffer.active.cursorY;\n      this._onRequestRedraw.fire({ start: t, end: t });\n    }\n  };\n  var De2 = class extends s0 {\n    constructor(t, r, n11) {\n      super();\n      this.content = 0;\n      this.combinedData = "";\n      this.fg = t.fg, this.bg = t.bg, this.combinedData = r, this._width = n11;\n    }\n    isCombined() {\n      return 2097152;\n    }\n    getWidth() {\n      return this._width;\n    }\n    getChars() {\n      return this.combinedData;\n    }\n    getCode() {\n      return 2097151;\n    }\n    setFromCharData(t) {\n      throw new Error("not implemented");\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n  };\n  function Et(i5, e, t = 0) {\n    return Math.max(Math.min(i5, e), t);\n  }\n  var bt2 = class extends W3 {\n    constructor(t) {\n      if (fe && Ve() < 16) {\n        let r = { antialias: false, depth: false, preserveDrawingBuffer: true };\n        if (!document.createElement("canvas").getContext("webgl2", r)) throw new Error("Webgl2 is only supported on Safari 16 and above");\n      }\n      super();\n      this._onChangeTextureAtlas = this._register(new U4());\n      this.onChangeTextureAtlas = this._onChangeTextureAtlas.event;\n      this._onAddTextureAtlasCanvas = this._register(new U4());\n      this.onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event;\n      this._onRemoveTextureAtlasCanvas = this._register(new U4());\n      this.onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event;\n      this._onContextLoss = this._register(new U4());\n      this.onContextLoss = this._onContextLoss.event;\n      this._customGlyphs = t?.customGlyphs ?? true, this._preserveDrawingBuffer = t?.preserveDrawingBuffer;\n    }\n    activate(t) {\n      let r = t._core;\n      if (!t.element) {\n        this._register(r.onWillOpen(() => this.activate(t)));\n        return;\n      }\n      this._terminal = t;\n      let n11 = r.coreService, a2 = r.optionsService, s4 = r, o2 = s4._renderService, l4 = s4._characterJoinerService, T4 = s4._charSizeService, h3 = s4._coreBrowserService, d3 = s4._decorationService, _5 = s4._themeService;\n      this._renderer = this._register(new ue(t, l4, T4, h3, n11, d3, a2, _5, this._customGlyphs, this._preserveDrawingBuffer)), this._register(_0.forward(this._renderer.onContextLoss, this._onContextLoss)), this._register(_0.forward(this._renderer.onChangeTextureAtlas, this._onChangeTextureAtlas)), this._register(_0.forward(this._renderer.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas)), this._register(_0.forward(this._renderer.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas)), o2.setRenderer(this._renderer), this._register(g4(() => {\n        if (this._terminal._core._store._isDisposed) return;\n        let c2 = this._terminal._core._renderService;\n        c2.setRenderer(this._terminal._core._createRenderer()), c2.handleResize(t.cols, t.rows);\n      }));\n    }\n    get textureAtlas() {\n      return this._renderer?.textureAtlas;\n    }\n    clearTextureAtlas() {\n      this._renderer?.clearTextureAtlas();\n    }\n  };\n\n  // node_modules/@xterm/addon-ligatures/lib/addon-ligatures.mjs\n  var Po = Object.create;\n  var _n = Object.defineProperty;\n  var Go = Object.getOwnPropertyDescriptor;\n  var No = Object.getOwnPropertyNames;\n  var Ho = Object.getPrototypeOf;\n  var _o = Object.prototype.hasOwnProperty;\n  var tt2 = ((s4) => typeof __require < "u" ? __require : typeof Proxy < "u" ? new Proxy(s4, { get: (f5, p3) => (typeof __require < "u" ? __require : f5)[p3] }) : s4)(function(s4) {\n    if (typeof __require < "u") return __require.apply(this, arguments);\n    throw Error(\'Dynamic require of "\' + s4 + \'" is not supported\');\n  });\n  var Ur = (s4, f5) => () => (f5 || s4((f5 = { exports: {} }).exports, f5), f5.exports);\n  var zo = (s4, f5, p3, h3) => {\n    if (f5 && typeof f5 == "object" || typeof f5 == "function") for (let v6 of No(f5)) !_o.call(s4, v6) && v6 !== p3 && _n(s4, v6, { get: () => f5[v6], enumerable: !(h3 = Go(f5, v6)) || h3.enumerable });\n    return s4;\n  };\n  var Wo = (s4, f5, p3) => (p3 = s4 != null ? Po(Ho(s4)) : {}, zo(f5 || !s4 || !s4.__esModule ? _n(p3, "default", { value: s4, enumerable: true }) : p3, s4));\n  var Wn = Ur((Or, zn2) => {\n    (function(s4, f5) {\n      typeof Or == "object" && typeof zn2 < "u" ? f5(Or) : typeof define == "function" && define.amd ? define(["exports"], f5) : f5(s4.opentype = s4.opentype || {});\n    })(Or, (function(s4) {\n      "use strict";\n      var f5 = 0, p3 = -3;\n      function h3() {\n        this.table = new Uint16Array(16), this.trans = new Uint16Array(288);\n      }\n      function v6(e, r) {\n        this.source = e, this.sourceIndex = 0, this.tag = 0, this.bitcount = 0, this.dest = r, this.destLen = 0, this.ltree = new h3(), this.dtree = new h3();\n      }\n      var x5 = new h3(), S4 = new h3(), L6 = new Uint8Array(30), k5 = new Uint16Array(30), D7 = new Uint8Array(30), V5 = new Uint16Array(30), N3 = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]), W6 = new h3(), X3 = new Uint8Array(320);\n      function ve3(e, r, t, n11) {\n        var a2, i5;\n        for (a2 = 0; a2 < t; ++a2) e[a2] = 0;\n        for (a2 = 0; a2 < 30 - t; ++a2) e[a2 + t] = a2 / t | 0;\n        for (i5 = n11, a2 = 0; a2 < 30; ++a2) r[a2] = i5, i5 += 1 << e[a2];\n      }\n      function Ae3(e, r) {\n        var t;\n        for (t = 0; t < 7; ++t) e.table[t] = 0;\n        for (e.table[7] = 24, e.table[8] = 152, e.table[9] = 112, t = 0; t < 24; ++t) e.trans[t] = 256 + t;\n        for (t = 0; t < 144; ++t) e.trans[24 + t] = t;\n        for (t = 0; t < 8; ++t) e.trans[168 + t] = 280 + t;\n        for (t = 0; t < 112; ++t) e.trans[176 + t] = 144 + t;\n        for (t = 0; t < 5; ++t) r.table[t] = 0;\n        for (r.table[5] = 32, t = 0; t < 32; ++t) r.trans[t] = t;\n      }\n      var xt4 = new Uint16Array(16);\n      function Dr2(e, r, t, n11) {\n        var a2, i5;\n        for (a2 = 0; a2 < 16; ++a2) e.table[a2] = 0;\n        for (a2 = 0; a2 < n11; ++a2) e.table[r[t + a2]]++;\n        for (e.table[0] = 0, i5 = 0, a2 = 0; a2 < 16; ++a2) xt4[a2] = i5, i5 += e.table[a2];\n        for (a2 = 0; a2 < n11; ++a2) r[t + a2] && (e.trans[xt4[r[t + a2]]++] = a2);\n      }\n      function oa(e) {\n        e.bitcount-- || (e.tag = e.source[e.sourceIndex++], e.bitcount = 7);\n        var r = e.tag & 1;\n        return e.tag >>>= 1, r;\n      }\n      function Se3(e, r, t) {\n        if (!r) return t;\n        for (; e.bitcount < 24; ) e.tag |= e.source[e.sourceIndex++] << e.bitcount, e.bitcount += 8;\n        var n11 = e.tag & 65535 >>> 16 - r;\n        return e.tag >>>= r, e.bitcount -= r, n11 + t;\n      }\n      function Ar(e, r) {\n        for (; e.bitcount < 24; ) e.tag |= e.source[e.sourceIndex++] << e.bitcount, e.bitcount += 8;\n        var t = 0, n11 = 0, a2 = 0, i5 = e.tag;\n        do\n          n11 = 2 * n11 + (i5 & 1), i5 >>>= 1, ++a2, t += r.table[a2], n11 -= r.table[a2];\n        while (n11 >= 0);\n        return e.tag = i5, e.bitcount -= a2, r.trans[t + n11];\n      }\n      function ua(e, r, t) {\n        var n11, a2, i5, o2, l4, u3;\n        for (n11 = Se3(e, 5, 257), a2 = Se3(e, 5, 1), i5 = Se3(e, 4, 4), o2 = 0; o2 < 19; ++o2) X3[o2] = 0;\n        for (o2 = 0; o2 < i5; ++o2) {\n          var c2 = Se3(e, 3, 0);\n          X3[N3[o2]] = c2;\n        }\n        for (Dr2(W6, X3, 0, 19), l4 = 0; l4 < n11 + a2; ) {\n          var d3 = Ar(e, W6);\n          switch (d3) {\n            case 16:\n              var y5 = X3[l4 - 1];\n              for (u3 = Se3(e, 2, 3); u3; --u3) X3[l4++] = y5;\n              break;\n            case 17:\n              for (u3 = Se3(e, 3, 3); u3; --u3) X3[l4++] = 0;\n              break;\n            case 18:\n              for (u3 = Se3(e, 7, 11); u3; --u3) X3[l4++] = 0;\n              break;\n            default:\n              X3[l4++] = d3;\n              break;\n          }\n        }\n        Dr2(r, X3, 0, n11), Dr2(t, X3, n11, a2);\n      }\n      function St3(e, r, t) {\n        for (; ; ) {\n          var n11 = Ar(e, r);\n          if (n11 === 256) return f5;\n          if (n11 < 256) e.dest[e.destLen++] = n11;\n          else {\n            var a2, i5, o2, l4;\n            for (n11 -= 257, a2 = Se3(e, L6[n11], k5[n11]), i5 = Ar(e, t), o2 = e.destLen - Se3(e, D7[i5], V5[i5]), l4 = o2; l4 < o2 + a2; ++l4) e.dest[e.destLen++] = e.dest[l4];\n          }\n        }\n      }\n      function la(e) {\n        for (var r, t, n11; e.bitcount > 8; ) e.sourceIndex--, e.bitcount -= 8;\n        if (r = e.source[e.sourceIndex + 1], r = 256 * r + e.source[e.sourceIndex], t = e.source[e.sourceIndex + 3], t = 256 * t + e.source[e.sourceIndex + 2], r !== (~t & 65535)) return p3;\n        for (e.sourceIndex += 4, n11 = r; n11; --n11) e.dest[e.destLen++] = e.source[e.sourceIndex++];\n        return e.bitcount = 0, f5;\n      }\n      function fa(e, r) {\n        var t = new v6(e, r), n11, a2, i5;\n        do {\n          switch (n11 = oa(t), a2 = Se3(t, 2, 0), a2) {\n            case 0:\n              i5 = la(t);\n              break;\n            case 1:\n              i5 = St3(t, x5, S4);\n              break;\n            case 2:\n              ua(t, t.ltree, t.dtree), i5 = St3(t, t.ltree, t.dtree);\n              break;\n            default:\n              i5 = p3;\n          }\n          if (i5 !== f5) throw new Error("Data error");\n        } while (!n11);\n        return t.destLen < t.dest.length ? typeof t.dest.slice == "function" ? t.dest.slice(0, t.destLen) : t.dest.subarray(0, t.destLen) : t.dest;\n      }\n      Ae3(x5, S4), ve3(L6, k5, 4, 3), ve3(D7, V5, 2, 1), L6[28] = 0, k5[28] = 258;\n      var pa = fa;\n      function We4(e, r, t, n11, a2) {\n        return Math.pow(1 - a2, 3) * e + 3 * Math.pow(1 - a2, 2) * a2 * r + 3 * (1 - a2) * Math.pow(a2, 2) * t + Math.pow(a2, 3) * n11;\n      }\n      function ke3() {\n        this.x1 = Number.NaN, this.y1 = Number.NaN, this.x2 = Number.NaN, this.y2 = Number.NaN;\n      }\n      ke3.prototype.isEmpty = function() {\n        return isNaN(this.x1) || isNaN(this.y1) || isNaN(this.x2) || isNaN(this.y2);\n      }, ke3.prototype.addPoint = function(e, r) {\n        typeof e == "number" && ((isNaN(this.x1) || isNaN(this.x2)) && (this.x1 = e, this.x2 = e), e < this.x1 && (this.x1 = e), e > this.x2 && (this.x2 = e)), typeof r == "number" && ((isNaN(this.y1) || isNaN(this.y2)) && (this.y1 = r, this.y2 = r), r < this.y1 && (this.y1 = r), r > this.y2 && (this.y2 = r));\n      }, ke3.prototype.addX = function(e) {\n        this.addPoint(e, null);\n      }, ke3.prototype.addY = function(e) {\n        this.addPoint(null, e);\n      }, ke3.prototype.addBezier = function(e, r, t, n11, a2, i5, o2, l4) {\n        var u3 = this, c2 = [e, r], d3 = [t, n11], y5 = [a2, i5], g6 = [o2, l4];\n        this.addPoint(e, r), this.addPoint(o2, l4);\n        for (var m4 = 0; m4 <= 1; m4++) {\n          var T4 = 6 * c2[m4] - 12 * d3[m4] + 6 * y5[m4], O4 = -3 * c2[m4] + 9 * d3[m4] - 9 * y5[m4] + 3 * g6[m4], F4 = 3 * d3[m4] - 3 * c2[m4];\n          if (O4 === 0) {\n            if (T4 === 0) continue;\n            var U6 = -F4 / T4;\n            0 < U6 && U6 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], U6)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], U6)));\n            continue;\n          }\n          var P5 = Math.pow(T4, 2) - 4 * F4 * O4;\n          if (!(P5 < 0)) {\n            var I4 = (-T4 + Math.sqrt(P5)) / (2 * O4);\n            0 < I4 && I4 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], I4)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], I4)));\n            var H5 = (-T4 - Math.sqrt(P5)) / (2 * O4);\n            0 < H5 && H5 < 1 && (m4 === 0 && u3.addX(We4(c2[m4], d3[m4], y5[m4], g6[m4], H5)), m4 === 1 && u3.addY(We4(c2[m4], d3[m4], y5[m4], g6[m4], H5)));\n          }\n        }\n      }, ke3.prototype.addQuad = function(e, r, t, n11, a2, i5) {\n        var o2 = e + 0.6666666666666666 * (t - e), l4 = r + 2 / 3 * (n11 - r), u3 = o2 + 1 / 3 * (a2 - e), c2 = l4 + 1 / 3 * (i5 - r);\n        this.addBezier(e, r, o2, l4, u3, c2, a2, i5);\n      };\n      function Z5() {\n        this.commands = [], this.fill = "black", this.stroke = null, this.strokeWidth = 1;\n      }\n      Z5.prototype.moveTo = function(e, r) {\n        this.commands.push({ type: "M", x: e, y: r });\n      }, Z5.prototype.lineTo = function(e, r) {\n        this.commands.push({ type: "L", x: e, y: r });\n      }, Z5.prototype.curveTo = Z5.prototype.bezierCurveTo = function(e, r, t, n11, a2, i5) {\n        this.commands.push({ type: "C", x1: e, y1: r, x2: t, y2: n11, x: a2, y: i5 });\n      }, Z5.prototype.quadTo = Z5.prototype.quadraticCurveTo = function(e, r, t, n11) {\n        this.commands.push({ type: "Q", x1: e, y1: r, x: t, y: n11 });\n      }, Z5.prototype.close = Z5.prototype.closePath = function() {\n        this.commands.push({ type: "Z" });\n      }, Z5.prototype.extend = function(e) {\n        if (e.commands) e = e.commands;\n        else if (e instanceof ke3) {\n          var r = e;\n          this.moveTo(r.x1, r.y1), this.lineTo(r.x2, r.y1), this.lineTo(r.x2, r.y2), this.lineTo(r.x1, r.y2), this.close();\n          return;\n        }\n        Array.prototype.push.apply(this.commands, e);\n      }, Z5.prototype.getBoundingBox = function() {\n        for (var e = this, r = new ke3(), t = 0, n11 = 0, a2 = 0, i5 = 0, o2 = 0; o2 < this.commands.length; o2++) {\n          var l4 = e.commands[o2];\n          switch (l4.type) {\n            case "M":\n              r.addPoint(l4.x, l4.y), t = a2 = l4.x, n11 = i5 = l4.y;\n              break;\n            case "L":\n              r.addPoint(l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "Q":\n              r.addQuad(a2, i5, l4.x1, l4.y1, l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "C":\n              r.addBezier(a2, i5, l4.x1, l4.y1, l4.x2, l4.y2, l4.x, l4.y), a2 = l4.x, i5 = l4.y;\n              break;\n            case "Z":\n              a2 = t, i5 = n11;\n              break;\n            default:\n              throw new Error("Unexpected path command " + l4.type);\n          }\n        }\n        return r.isEmpty() && r.addPoint(0, 0), r;\n      }, Z5.prototype.draw = function(e) {\n        var r = this;\n        e.beginPath();\n        for (var t = 0; t < this.commands.length; t += 1) {\n          var n11 = r.commands[t];\n          n11.type === "M" ? e.moveTo(n11.x, n11.y) : n11.type === "L" ? e.lineTo(n11.x, n11.y) : n11.type === "C" ? e.bezierCurveTo(n11.x1, n11.y1, n11.x2, n11.y2, n11.x, n11.y) : n11.type === "Q" ? e.quadraticCurveTo(n11.x1, n11.y1, n11.x, n11.y) : n11.type === "Z" && e.closePath();\n        }\n        this.fill && (e.fillStyle = this.fill, e.fill()), this.stroke && (e.strokeStyle = this.stroke, e.lineWidth = this.strokeWidth, e.stroke());\n      }, Z5.prototype.toPathData = function(e) {\n        var r = this;\n        e = e !== void 0 ? e : 2;\n        function t(l4) {\n          return Math.round(l4) === l4 ? "" + Math.round(l4) : l4.toFixed(e);\n        }\n        function n11() {\n          for (var l4 = arguments, u3 = "", c2 = 0; c2 < arguments.length; c2 += 1) {\n            var d3 = l4[c2];\n            d3 >= 0 && c2 > 0 && (u3 += " "), u3 += t(d3);\n          }\n          return u3;\n        }\n        for (var a2 = "", i5 = 0; i5 < this.commands.length; i5 += 1) {\n          var o2 = r.commands[i5];\n          o2.type === "M" ? a2 += "M" + n11(o2.x, o2.y) : o2.type === "L" ? a2 += "L" + n11(o2.x, o2.y) : o2.type === "C" ? a2 += "C" + n11(o2.x1, o2.y1, o2.x2, o2.y2, o2.x, o2.y) : o2.type === "Q" ? a2 += "Q" + n11(o2.x1, o2.y1, o2.x, o2.y) : o2.type === "Z" && (a2 += "Z");\n        }\n        return a2;\n      }, Z5.prototype.toSVG = function(e) {\n        var r = \'<path d="\';\n        return r += this.toPathData(e), r += \'"\', this.fill && this.fill !== "black" && (this.fill === null ? r += \' fill="none"\' : r += \' fill="\' + this.fill + \'"\'), this.stroke && (r += \' stroke="\' + this.stroke + \'" stroke-width="\' + this.strokeWidth + \'"\'), r += "/>", r;\n      }, Z5.prototype.toDOMElement = function(e) {\n        var r = this.toPathData(e), t = document.createElementNS("http://www.w3.org/2000/svg", "path");\n        return t.setAttribute("d", r), t;\n      };\n      function Tt4(e) {\n        throw new Error(e);\n      }\n      function kt2(e, r) {\n        e || Tt4(r);\n      }\n      var G5 = { fail: Tt4, argument: kt2, assert: kt2 }, Ft = 32768, Lt3 = 2147483648, Ve3 = {}, E5 = {}, M4 = {};\n      function ge2(e) {\n        return function() {\n          return e;\n        };\n      }\n      E5.BYTE = function(e) {\n        return G5.argument(e >= 0 && e <= 255, "Byte value should be between 0 and 255."), [e];\n      }, M4.BYTE = ge2(1), E5.CHAR = function(e) {\n        return [e.charCodeAt(0)];\n      }, M4.CHAR = ge2(1), E5.CHARARRAY = function(e) {\n        for (var r = [], t = 0; t < e.length; t += 1) r[t] = e.charCodeAt(t);\n        return r;\n      }, M4.CHARARRAY = function(e) {\n        return e.length;\n      }, E5.USHORT = function(e) {\n        return [e >> 8 & 255, e & 255];\n      }, M4.USHORT = ge2(2), E5.SHORT = function(e) {\n        return e >= Ft && (e = -(2 * Ft - e)), [e >> 8 & 255, e & 255];\n      }, M4.SHORT = ge2(2), E5.UINT24 = function(e) {\n        return [e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.UINT24 = ge2(3), E5.ULONG = function(e) {\n        return [e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.ULONG = ge2(4), E5.LONG = function(e) {\n        return e >= Lt3 && (e = -(2 * Lt3 - e)), [e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.LONG = ge2(4), E5.FIXED = E5.ULONG, M4.FIXED = M4.ULONG, E5.FWORD = E5.SHORT, M4.FWORD = M4.SHORT, E5.UFWORD = E5.USHORT, M4.UFWORD = M4.USHORT, E5.LONGDATETIME = function(e) {\n        return [0, 0, 0, 0, e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.LONGDATETIME = ge2(8), E5.TAG = function(e) {\n        return G5.argument(e.length === 4, "Tag should be exactly 4 ASCII characters."), [e.charCodeAt(0), e.charCodeAt(1), e.charCodeAt(2), e.charCodeAt(3)];\n      }, M4.TAG = ge2(4), E5.Card8 = E5.BYTE, M4.Card8 = M4.BYTE, E5.Card16 = E5.USHORT, M4.Card16 = M4.USHORT, E5.OffSize = E5.BYTE, M4.OffSize = M4.BYTE, E5.SID = E5.USHORT, M4.SID = M4.USHORT, E5.NUMBER = function(e) {\n        return e >= -107 && e <= 107 ? [e + 139] : e >= 108 && e <= 1131 ? (e = e - 108, [(e >> 8) + 247, e & 255]) : e >= -1131 && e <= -108 ? (e = -e - 108, [(e >> 8) + 251, e & 255]) : e >= -32768 && e <= 32767 ? E5.NUMBER16(e) : E5.NUMBER32(e);\n      }, M4.NUMBER = function(e) {\n        return E5.NUMBER(e).length;\n      }, E5.NUMBER16 = function(e) {\n        return [28, e >> 8 & 255, e & 255];\n      }, M4.NUMBER16 = ge2(3), E5.NUMBER32 = function(e) {\n        return [29, e >> 24 & 255, e >> 16 & 255, e >> 8 & 255, e & 255];\n      }, M4.NUMBER32 = ge2(5), E5.REAL = function(e) {\n        var r = e.toString(), t = /\\.(\\d*?)(?:9{5,20}|0{5,20})\\d{0,2}(?:e(.+)|$)/.exec(r);\n        if (t) {\n          var n11 = parseFloat("1e" + ((t[2] ? +t[2] : 0) + t[1].length));\n          r = (Math.round(e * n11) / n11).toString();\n        }\n        for (var a2 = "", i5 = 0, o2 = r.length; i5 < o2; i5 += 1) {\n          var l4 = r[i5];\n          l4 === "e" ? a2 += r[++i5] === "-" ? "c" : "b" : l4 === "." ? a2 += "a" : l4 === "-" ? a2 += "e" : a2 += l4;\n        }\n        a2 += a2.length & 1 ? "f" : "ff";\n        for (var u3 = [30], c2 = 0, d3 = a2.length; c2 < d3; c2 += 2) u3.push(parseInt(a2.substr(c2, 2), 16));\n        return u3;\n      }, M4.REAL = function(e) {\n        return E5.REAL(e).length;\n      }, E5.NAME = E5.CHARARRAY, M4.NAME = M4.CHARARRAY, E5.STRING = E5.CHARARRAY, M4.STRING = M4.CHARARRAY, Ve3.UTF8 = function(e, r, t) {\n        for (var n11 = [], a2 = t, i5 = 0; i5 < a2; i5++, r += 1) n11[i5] = e.getUint8(r);\n        return String.fromCharCode.apply(null, n11);\n      }, Ve3.UTF16 = function(e, r, t) {\n        for (var n11 = [], a2 = t / 2, i5 = 0; i5 < a2; i5++, r += 2) n11[i5] = e.getUint16(r);\n        return String.fromCharCode.apply(null, n11);\n      }, E5.UTF16 = function(e) {\n        for (var r = [], t = 0; t < e.length; t += 1) {\n          var n11 = e.charCodeAt(t);\n          r[r.length] = n11 >> 8 & 255, r[r.length] = n11 & 255;\n        }\n        return r;\n      }, M4.UTF16 = function(e) {\n        return e.length * 2;\n      };\n      var Mr = { "x-mac-croatian": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\u0160\\u2122\\xB4\\xA8\\u2260\\u017D\\xD8\\u221E\\xB1\\u2264\\u2265\\u2206\\xB5\\u2202\\u2211\\u220F\\u0161\\u222B\\xAA\\xBA\\u03A9\\u017E\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u0106\\xAB\\u010C\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u0110\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\uF8FF\\xA9\\u2044\\u20AC\\u2039\\u203A\\xC6\\xBB\\u2013\\xB7\\u201A\\u201E\\u2030\\xC2\\u0107\\xC1\\u010D\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\u0111\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u03C0\\xCB\\u02DA\\xB8\\xCA\\xE6\\u02C7", "x-mac-cyrillic": "\\u0410\\u0411\\u0412\\u0413\\u0414\\u0415\\u0416\\u0417\\u0418\\u0419\\u041A\\u041B\\u041C\\u041D\\u041E\\u041F\\u0420\\u0421\\u0422\\u0423\\u0424\\u0425\\u0426\\u0427\\u0428\\u0429\\u042A\\u042B\\u042C\\u042D\\u042E\\u042F\\u2020\\xB0\\u0490\\xA3\\xA7\\u2022\\xB6\\u0406\\xAE\\xA9\\u2122\\u0402\\u0452\\u2260\\u0403\\u0453\\u221E\\xB1\\u2264\\u2265\\u0456\\xB5\\u0491\\u0408\\u0404\\u0454\\u0407\\u0457\\u0409\\u0459\\u040A\\u045A\\u0458\\u0405\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\u040B\\u045B\\u040C\\u045C\\u0455\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u201E\\u040E\\u045E\\u040F\\u045F\\u2116\\u0401\\u0451\\u044F\\u0430\\u0431\\u0432\\u0433\\u0434\\u0435\\u0436\\u0437\\u0438\\u0439\\u043A\\u043B\\u043C\\u043D\\u043E\\u043F\\u0440\\u0441\\u0442\\u0443\\u0444\\u0445\\u0446\\u0447\\u0448\\u0449\\u044A\\u044B\\u044C\\u044D\\u044E", "x-mac-gaelic": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u1E02\\xB1\\u2264\\u2265\\u1E03\\u010A\\u010B\\u1E0A\\u1E0B\\u1E1E\\u1E1F\\u0120\\u0121\\u1E40\\xE6\\xF8\\u1E41\\u1E56\\u1E57\\u027C\\u0192\\u017F\\u1E60\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\u1E61\\u1E9B\\xFF\\u0178\\u1E6A\\u20AC\\u2039\\u203A\\u0176\\u0177\\u1E6B\\xB7\\u1EF2\\u1EF3\\u204A\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\u2663\\xD2\\xDA\\xDB\\xD9\\u0131\\xDD\\xFD\\u0174\\u0175\\u1E84\\u1E85\\u1E80\\u1E81\\u1E82\\u1E83", "x-mac-greek": "\\xC4\\xB9\\xB2\\xC9\\xB3\\xD6\\xDC\\u0385\\xE0\\xE2\\xE4\\u0384\\xA8\\xE7\\xE9\\xE8\\xEA\\xEB\\xA3\\u2122\\xEE\\xEF\\u2022\\xBD\\u2030\\xF4\\xF6\\xA6\\u20AC\\xF9\\xFB\\xFC\\u2020\\u0393\\u0394\\u0398\\u039B\\u039E\\u03A0\\xDF\\xAE\\xA9\\u03A3\\u03AA\\xA7\\u2260\\xB0\\xB7\\u0391\\xB1\\u2264\\u2265\\xA5\\u0392\\u0395\\u0396\\u0397\\u0399\\u039A\\u039C\\u03A6\\u03AB\\u03A8\\u03A9\\u03AC\\u039D\\xAC\\u039F\\u03A1\\u2248\\u03A4\\xAB\\xBB\\u2026\\xA0\\u03A5\\u03A7\\u0386\\u0388\\u0153\\u2013\\u2015\\u201C\\u201D\\u2018\\u2019\\xF7\\u0389\\u038A\\u038C\\u038E\\u03AD\\u03AE\\u03AF\\u03CC\\u038F\\u03CD\\u03B1\\u03B2\\u03C8\\u03B4\\u03B5\\u03C6\\u03B3\\u03B7\\u03B9\\u03BE\\u03BA\\u03BB\\u03BC\\u03BD\\u03BF\\u03C0\\u03CE\\u03C1\\u03C3\\u03C4\\u03B8\\u03C9\\u03C2\\u03C7\\u03C5\\u03B6\\u03CA\\u03CB\\u0390\\u03B0\\xAD", "x-mac-icelandic": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\xDD\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\xD0\\xF0\\xDE\\xFE\\xFD\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-inuit": "\\u1403\\u1404\\u1405\\u1406\\u140A\\u140B\\u1431\\u1432\\u1433\\u1434\\u1438\\u1439\\u1449\\u144E\\u144F\\u1450\\u1451\\u1455\\u1456\\u1466\\u146D\\u146E\\u146F\\u1470\\u1472\\u1473\\u1483\\u148B\\u148C\\u148D\\u148E\\u1490\\u1491\\xB0\\u14A1\\u14A5\\u14A6\\u2022\\xB6\\u14A7\\xAE\\xA9\\u2122\\u14A8\\u14AA\\u14AB\\u14BB\\u14C2\\u14C3\\u14C4\\u14C5\\u14C7\\u14C8\\u14D0\\u14EF\\u14F0\\u14F1\\u14F2\\u14F4\\u14F5\\u1505\\u14D5\\u14D6\\u14D7\\u14D8\\u14DA\\u14DB\\u14EA\\u1528\\u1529\\u152A\\u152B\\u152D\\u2026\\xA0\\u152E\\u153E\\u1555\\u1556\\u1557\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\u1558\\u1559\\u155A\\u155D\\u1546\\u1547\\u1548\\u1549\\u154B\\u154C\\u1550\\u157F\\u1580\\u1581\\u1582\\u1583\\u1584\\u1585\\u158F\\u1590\\u1591\\u1592\\u1593\\u1594\\u1595\\u1671\\u1672\\u1673\\u1674\\u1675\\u1676\\u1596\\u15A0\\u15A1\\u15A2\\u15A3\\u15A4\\u15A5\\u15A6\\u157C\\u0141\\u0142", "x-mac-ce": "\\xC4\\u0100\\u0101\\xC9\\u0104\\xD6\\xDC\\xE1\\u0105\\u010C\\xE4\\u010D\\u0106\\u0107\\xE9\\u0179\\u017A\\u010E\\xED\\u010F\\u0112\\u0113\\u0116\\xF3\\u0117\\xF4\\xF6\\xF5\\xFA\\u011A\\u011B\\xFC\\u2020\\xB0\\u0118\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\u0119\\xA8\\u2260\\u0123\\u012E\\u012F\\u012A\\u2264\\u2265\\u012B\\u0136\\u2202\\u2211\\u0142\\u013B\\u013C\\u013D\\u013E\\u0139\\u013A\\u0145\\u0146\\u0143\\xAC\\u221A\\u0144\\u0147\\u2206\\xAB\\xBB\\u2026\\xA0\\u0148\\u0150\\xD5\\u0151\\u014C\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\u014D\\u0154\\u0155\\u0158\\u2039\\u203A\\u0159\\u0156\\u0157\\u0160\\u201A\\u201E\\u0161\\u015A\\u015B\\xC1\\u0164\\u0165\\xCD\\u017D\\u017E\\u016A\\xD3\\xD4\\u016B\\u016E\\xDA\\u016F\\u0170\\u0171\\u0172\\u0173\\xDD\\xFD\\u0137\\u017B\\u0141\\u017C\\u0122\\u02C7", macintosh: "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\u2039\\u203A\\uFB01\\uFB02\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-romanian": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\u0102\\u0218\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\u0103\\u0219\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u2044\\u20AC\\u2039\\u203A\\u021A\\u021B\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\u0131\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7", "x-mac-turkish": "\\xC4\\xC5\\xC7\\xC9\\xD1\\xD6\\xDC\\xE1\\xE0\\xE2\\xE4\\xE3\\xE5\\xE7\\xE9\\xE8\\xEA\\xEB\\xED\\xEC\\xEE\\xEF\\xF1\\xF3\\xF2\\xF4\\xF6\\xF5\\xFA\\xF9\\xFB\\xFC\\u2020\\xB0\\xA2\\xA3\\xA7\\u2022\\xB6\\xDF\\xAE\\xA9\\u2122\\xB4\\xA8\\u2260\\xC6\\xD8\\u221E\\xB1\\u2264\\u2265\\xA5\\xB5\\u2202\\u2211\\u220F\\u03C0\\u222B\\xAA\\xBA\\u03A9\\xE6\\xF8\\xBF\\xA1\\xAC\\u221A\\u0192\\u2248\\u2206\\xAB\\xBB\\u2026\\xA0\\xC0\\xC3\\xD5\\u0152\\u0153\\u2013\\u2014\\u201C\\u201D\\u2018\\u2019\\xF7\\u25CA\\xFF\\u0178\\u011E\\u011F\\u0130\\u0131\\u015E\\u015F\\u2021\\xB7\\u201A\\u201E\\u2030\\xC2\\xCA\\xC1\\xCB\\xC8\\xCD\\xCE\\xCF\\xCC\\xD3\\xD4\\uF8FF\\xD2\\xDA\\xDB\\xD9\\uF8A0\\u02C6\\u02DC\\xAF\\u02D8\\u02D9\\u02DA\\xB8\\u02DD\\u02DB\\u02C7" };\n      Ve3.MACSTRING = function(e, r, t, n11) {\n        var a2 = Mr[n11];\n        if (a2 !== void 0) {\n          for (var i5 = "", o2 = 0; o2 < t; o2++) {\n            var l4 = e.getUint8(r + o2);\n            l4 <= 127 ? i5 += String.fromCharCode(l4) : i5 += a2[l4 & 127];\n          }\n          return i5;\n        }\n      };\n      var fr3 = typeof WeakMap == "function" && /* @__PURE__ */ new WeakMap(), pr2, ha = function(e) {\n        if (!pr2) {\n          pr2 = {};\n          for (var r in Mr) pr2[r] = new String(r);\n        }\n        var t = pr2[e];\n        if (t !== void 0) {\n          if (fr3) {\n            var n11 = fr3.get(t);\n            if (n11 !== void 0) return n11;\n          }\n          var a2 = Mr[e];\n          if (a2 !== void 0) {\n            for (var i5 = {}, o2 = 0; o2 < a2.length; o2++) i5[a2.charCodeAt(o2)] = o2 + 128;\n            return fr3 && fr3.set(t, i5), i5;\n          }\n        }\n      };\n      E5.MACSTRING = function(e, r) {\n        var t = ha(r);\n        if (t !== void 0) {\n          for (var n11 = [], a2 = 0; a2 < e.length; a2++) {\n            var i5 = e.charCodeAt(a2);\n            if (i5 >= 128 && (i5 = t[i5], i5 === void 0)) return;\n            n11[a2] = i5;\n          }\n          return n11;\n        }\n      }, M4.MACSTRING = function(e, r) {\n        var t = E5.MACSTRING(e, r);\n        return t !== void 0 ? t.length : 0;\n      };\n      function Br(e) {\n        return e >= -128 && e <= 127;\n      }\n      function ca(e, r, t) {\n        for (var n11 = 0, a2 = e.length; r < a2 && n11 < 64 && e[r] === 0; ) ++r, ++n11;\n        return t.push(128 | n11 - 1), r;\n      }\n      function va(e, r, t) {\n        for (var n11 = 0, a2 = e.length, i5 = r; i5 < a2 && n11 < 64; ) {\n          var o2 = e[i5];\n          if (!Br(o2) || o2 === 0 && i5 + 1 < a2 && e[i5 + 1] === 0) break;\n          ++i5, ++n11;\n        }\n        t.push(n11 - 1);\n        for (var l4 = r; l4 < i5; ++l4) t.push(e[l4] + 256 & 255);\n        return i5;\n      }\n      function da(e, r, t) {\n        for (var n11 = 0, a2 = e.length, i5 = r; i5 < a2 && n11 < 64; ) {\n          var o2 = e[i5];\n          if (o2 === 0 || Br(o2) && i5 + 1 < a2 && Br(e[i5 + 1])) break;\n          ++i5, ++n11;\n        }\n        t.push(64 | n11 - 1);\n        for (var l4 = r; l4 < i5; ++l4) {\n          var u3 = e[l4];\n          t.push(u3 + 65536 >> 8 & 255, u3 + 256 & 255);\n        }\n        return i5;\n      }\n      E5.VARDELTAS = function(e) {\n        for (var r = 0, t = []; r < e.length; ) {\n          var n11 = e[r];\n          n11 === 0 ? r = ca(e, r, t) : n11 >= -128 && n11 <= 127 ? r = va(e, r, t) : r = da(e, r, t);\n        }\n        return t;\n      }, E5.INDEX = function(e) {\n        for (var r = 1, t = [r], n11 = [], a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = E5.OBJECT(e[a2]);\n          Array.prototype.push.apply(n11, i5), r += i5.length, t.push(r);\n        }\n        if (n11.length === 0) return [0, 0];\n        for (var o2 = [], l4 = 1 + Math.floor(Math.log(r) / Math.log(2)) / 8 | 0, u3 = [void 0, E5.BYTE, E5.USHORT, E5.UINT24, E5.ULONG][l4], c2 = 0; c2 < t.length; c2 += 1) {\n          var d3 = u3(t[c2]);\n          Array.prototype.push.apply(o2, d3);\n        }\n        return Array.prototype.concat(E5.Card16(e.length), E5.OffSize(l4), o2, n11);\n      }, M4.INDEX = function(e) {\n        return E5.INDEX(e).length;\n      }, E5.DICT = function(e) {\n        for (var r = [], t = Object.keys(e), n11 = t.length, a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = parseInt(t[a2], 0), o2 = e[i5];\n          r = r.concat(E5.OPERAND(o2.value, o2.type)), r = r.concat(E5.OPERATOR(i5));\n        }\n        return r;\n      }, M4.DICT = function(e) {\n        return E5.DICT(e).length;\n      }, E5.OPERATOR = function(e) {\n        return e < 1200 ? [e] : [12, e - 1200];\n      }, E5.OPERAND = function(e, r) {\n        var t = [];\n        if (Array.isArray(r)) for (var n11 = 0; n11 < r.length; n11 += 1) G5.argument(e.length === r.length, "Not enough arguments given for type" + r), t = t.concat(E5.OPERAND(e[n11], r[n11]));\n        else if (r === "SID") t = t.concat(E5.NUMBER(e));\n        else if (r === "offset") t = t.concat(E5.NUMBER32(e));\n        else if (r === "number") t = t.concat(E5.NUMBER(e));\n        else if (r === "real") t = t.concat(E5.REAL(e));\n        else throw new Error("Unknown operand type " + r);\n        return t;\n      }, E5.OP = E5.BYTE, M4.OP = M4.BYTE;\n      var hr2 = typeof WeakMap == "function" && /* @__PURE__ */ new WeakMap();\n      E5.CHARSTRING = function(e) {\n        if (hr2) {\n          var r = hr2.get(e);\n          if (r !== void 0) return r;\n        }\n        for (var t = [], n11 = e.length, a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = e[a2];\n          t = t.concat(E5[i5.type](i5.value));\n        }\n        return hr2 && hr2.set(e, t), t;\n      }, M4.CHARSTRING = function(e) {\n        return E5.CHARSTRING(e).length;\n      }, E5.OBJECT = function(e) {\n        var r = E5[e.type];\n        return G5.argument(r !== void 0, "No encoding function for type " + e.type), r(e.value);\n      }, M4.OBJECT = function(e) {\n        var r = M4[e.type];\n        return G5.argument(r !== void 0, "No sizeOf function for type " + e.type), r(e.value);\n      }, E5.TABLE = function(e) {\n        for (var r = [], t = e.fields.length, n11 = [], a2 = [], i5 = 0; i5 < t; i5 += 1) {\n          var o2 = e.fields[i5], l4 = E5[o2.type];\n          G5.argument(l4 !== void 0, "No encoding function for field type " + o2.type + " (" + o2.name + ")");\n          var u3 = e[o2.name];\n          u3 === void 0 && (u3 = o2.value);\n          var c2 = l4(u3);\n          o2.type === "TABLE" ? (a2.push(r.length), r = r.concat([0, 0]), n11.push(c2)) : r = r.concat(c2);\n        }\n        for (var d3 = 0; d3 < n11.length; d3 += 1) {\n          var y5 = a2[d3], g6 = r.length;\n          G5.argument(g6 < 65536, "Table " + e.tableName + " too big."), r[y5] = g6 >> 8, r[y5 + 1] = g6 & 255, r = r.concat(n11[d3]);\n        }\n        return r;\n      }, M4.TABLE = function(e) {\n        for (var r = 0, t = e.fields.length, n11 = 0; n11 < t; n11 += 1) {\n          var a2 = e.fields[n11], i5 = M4[a2.type];\n          G5.argument(i5 !== void 0, "No sizeOf function for field type " + a2.type + " (" + a2.name + ")");\n          var o2 = e[a2.name];\n          o2 === void 0 && (o2 = a2.value), r += i5(o2), a2.type === "TABLE" && (r += 2);\n        }\n        return r;\n      }, E5.RECORD = E5.TABLE, M4.RECORD = M4.TABLE, E5.LITERAL = function(e) {\n        return e;\n      }, M4.LITERAL = function(e) {\n        return e.length;\n      };\n      function ee4(e, r, t) {\n        for (var n11 = this, a2 = 0; a2 < r.length; a2 += 1) {\n          var i5 = r[a2];\n          n11[i5.name] = i5.value;\n        }\n        if (this.tableName = e, this.fields = r, t) for (var o2 = Object.keys(t), l4 = 0; l4 < o2.length; l4 += 1) {\n          var u3 = o2[l4], c2 = t[u3];\n          n11[u3] !== void 0 && (n11[u3] = c2);\n        }\n      }\n      ee4.prototype.encode = function() {\n        return E5.TABLE(this);\n      }, ee4.prototype.sizeOf = function() {\n        return M4.TABLE(this);\n      };\n      function je4(e, r, t) {\n        t === void 0 && (t = r.length);\n        var n11 = new Array(r.length + 1);\n        n11[0] = { name: e + "Count", type: "USHORT", value: t };\n        for (var a2 = 0; a2 < r.length; a2++) n11[a2 + 1] = { name: e + a2, type: "USHORT", value: r[a2] };\n        return n11;\n      }\n      function Pr(e, r, t) {\n        var n11 = r.length, a2 = new Array(n11 + 1);\n        a2[0] = { name: e + "Count", type: "USHORT", value: n11 };\n        for (var i5 = 0; i5 < n11; i5++) a2[i5 + 1] = { name: e + i5, type: "TABLE", value: t(r[i5], i5) };\n        return a2;\n      }\n      function cr2(e, r, t) {\n        var n11 = r.length, a2 = [];\n        a2[0] = { name: e + "Count", type: "USHORT", value: n11 };\n        for (var i5 = 0; i5 < n11; i5++) a2 = a2.concat(t(r[i5], i5));\n        return a2;\n      }\n      function vr3(e) {\n        e.format === 1 ? ee4.call(this, "coverageTable", [{ name: "coverageFormat", type: "USHORT", value: 1 }].concat(je4("glyph", e.glyphs))) : G5.assert(false, "Can\'t create coverage table format 2 yet.");\n      }\n      vr3.prototype = Object.create(ee4.prototype), vr3.prototype.constructor = vr3;\n      function dr2(e) {\n        ee4.call(this, "scriptListTable", cr2("scriptRecord", e, function(r, t) {\n          var n11 = r.script, a2 = n11.defaultLangSys;\n          return G5.assert(!!a2, "Unable to write GSUB: script " + r.tag + " has no default language system."), [{ name: "scriptTag" + t, type: "TAG", value: r.tag }, { name: "script" + t, type: "TABLE", value: new ee4("scriptTable", [{ name: "defaultLangSys", type: "TABLE", value: new ee4("defaultLangSys", [{ name: "lookupOrder", type: "USHORT", value: 0 }, { name: "reqFeatureIndex", type: "USHORT", value: a2.reqFeatureIndex }].concat(je4("featureIndex", a2.featureIndexes))) }].concat(cr2("langSys", n11.langSysRecords, function(i5, o2) {\n            var l4 = i5.langSys;\n            return [{ name: "langSysTag" + o2, type: "TAG", value: i5.tag }, { name: "langSys" + o2, type: "TABLE", value: new ee4("langSys", [{ name: "lookupOrder", type: "USHORT", value: 0 }, { name: "reqFeatureIndex", type: "USHORT", value: l4.reqFeatureIndex }].concat(je4("featureIndex", l4.featureIndexes))) }];\n          }))) }];\n        }));\n      }\n      dr2.prototype = Object.create(ee4.prototype), dr2.prototype.constructor = dr2;\n      function gr2(e) {\n        ee4.call(this, "featureListTable", cr2("featureRecord", e, function(r, t) {\n          var n11 = r.feature;\n          return [{ name: "featureTag" + t, type: "TAG", value: r.tag }, { name: "feature" + t, type: "TABLE", value: new ee4("featureTable", [{ name: "featureParams", type: "USHORT", value: n11.featureParams }].concat(je4("lookupListIndex", n11.lookupListIndexes))) }];\n        }));\n      }\n      gr2.prototype = Object.create(ee4.prototype), gr2.prototype.constructor = gr2;\n      function mr2(e, r) {\n        ee4.call(this, "lookupListTable", Pr("lookup", e, function(t) {\n          var n11 = r[t.lookupType];\n          return G5.assert(!!n11, "Unable to write GSUB lookup type " + t.lookupType + " tables."), new ee4("lookupTable", [{ name: "lookupType", type: "USHORT", value: t.lookupType }, { name: "lookupFlag", type: "USHORT", value: t.lookupFlag }].concat(Pr("subtable", t.subtables, n11)));\n        }));\n      }\n      mr2.prototype = Object.create(ee4.prototype), mr2.prototype.constructor = mr2;\n      var A4 = { Table: ee4, Record: ee4, Coverage: vr3, ScriptList: dr2, FeatureList: gr2, LookupList: mr2, ushortList: je4, tableList: Pr, recordList: cr2 };\n      function Et3(e, r) {\n        return e.getUint8(r);\n      }\n      function yr2(e, r) {\n        return e.getUint16(r, false);\n      }\n      function ga(e, r) {\n        return e.getInt16(r, false);\n      }\n      function Gr(e, r) {\n        return e.getUint32(r, false);\n      }\n      function Ut2(e, r) {\n        var t = e.getInt16(r, false), n11 = e.getUint16(r + 2, false);\n        return t + n11 / 65535;\n      }\n      function ma(e, r) {\n        for (var t = "", n11 = r; n11 < r + 4; n11 += 1) t += String.fromCharCode(e.getInt8(n11));\n        return t;\n      }\n      function ya(e, r, t) {\n        for (var n11 = 0, a2 = 0; a2 < t; a2 += 1) n11 <<= 8, n11 += e.getUint8(r + a2);\n        return n11;\n      }\n      function ba(e, r, t) {\n        for (var n11 = [], a2 = r; a2 < t; a2 += 1) n11.push(e.getUint8(a2));\n        return n11;\n      }\n      function xa(e) {\n        for (var r = "", t = 0; t < e.length; t += 1) r += String.fromCharCode(e[t]);\n        return r;\n      }\n      var Sa = { byte: 1, uShort: 2, short: 2, uLong: 4, fixed: 4, longDateTime: 8, tag: 4 };\n      function b4(e, r) {\n        this.data = e, this.offset = r, this.relativeOffset = 0;\n      }\n      b4.prototype.parseByte = function() {\n        var e = this.data.getUint8(this.offset + this.relativeOffset);\n        return this.relativeOffset += 1, e;\n      }, b4.prototype.parseChar = function() {\n        var e = this.data.getInt8(this.offset + this.relativeOffset);\n        return this.relativeOffset += 1, e;\n      }, b4.prototype.parseCard8 = b4.prototype.parseByte, b4.prototype.parseUShort = function() {\n        var e = this.data.getUint16(this.offset + this.relativeOffset);\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseCard16 = b4.prototype.parseUShort, b4.prototype.parseSID = b4.prototype.parseUShort, b4.prototype.parseOffset16 = b4.prototype.parseUShort, b4.prototype.parseShort = function() {\n        var e = this.data.getInt16(this.offset + this.relativeOffset);\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseF2Dot14 = function() {\n        var e = this.data.getInt16(this.offset + this.relativeOffset) / 16384;\n        return this.relativeOffset += 2, e;\n      }, b4.prototype.parseULong = function() {\n        var e = Gr(this.data, this.offset + this.relativeOffset);\n        return this.relativeOffset += 4, e;\n      }, b4.prototype.parseOffset32 = b4.prototype.parseULong, b4.prototype.parseFixed = function() {\n        var e = Ut2(this.data, this.offset + this.relativeOffset);\n        return this.relativeOffset += 4, e;\n      }, b4.prototype.parseString = function(e) {\n        var r = this.data, t = this.offset + this.relativeOffset, n11 = "";\n        this.relativeOffset += e;\n        for (var a2 = 0; a2 < e; a2++) n11 += String.fromCharCode(r.getUint8(t + a2));\n        return n11;\n      }, b4.prototype.parseTag = function() {\n        return this.parseString(4);\n      }, b4.prototype.parseLongDateTime = function() {\n        var e = Gr(this.data, this.offset + this.relativeOffset + 4);\n        return e -= 2082844800, this.relativeOffset += 8, e;\n      }, b4.prototype.parseVersion = function(e) {\n        var r = yr2(this.data, this.offset + this.relativeOffset), t = yr2(this.data, this.offset + this.relativeOffset + 2);\n        return this.relativeOffset += 4, e === void 0 && (e = 4096), r + t / e / 10;\n      }, b4.prototype.skip = function(e, r) {\n        r === void 0 && (r = 1), this.relativeOffset += Sa[e] * r;\n      }, b4.prototype.parseULongList = function(e) {\n        e === void 0 && (e = this.parseULong());\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint32(n11), n11 += 4;\n        return this.relativeOffset += e * 4, r;\n      }, b4.prototype.parseOffset16List = b4.prototype.parseUShortList = function(e) {\n        e === void 0 && (e = this.parseUShort());\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint16(n11), n11 += 2;\n        return this.relativeOffset += e * 2, r;\n      }, b4.prototype.parseShortList = function(e) {\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getInt16(n11), n11 += 2;\n        return this.relativeOffset += e * 2, r;\n      }, b4.prototype.parseByteList = function(e) {\n        for (var r = new Array(e), t = this.data, n11 = this.offset + this.relativeOffset, a2 = 0; a2 < e; a2++) r[a2] = t.getUint8(n11++);\n        return this.relativeOffset += e, r;\n      }, b4.prototype.parseList = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseUShort());\n        for (var n11 = new Array(e), a2 = 0; a2 < e; a2++) n11[a2] = r.call(t);\n        return n11;\n      }, b4.prototype.parseList32 = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseULong());\n        for (var n11 = new Array(e), a2 = 0; a2 < e; a2++) n11[a2] = r.call(t);\n        return n11;\n      }, b4.prototype.parseRecordList = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseUShort());\n        for (var n11 = new Array(e), a2 = Object.keys(r), i5 = 0; i5 < e; i5++) {\n          for (var o2 = {}, l4 = 0; l4 < a2.length; l4++) {\n            var u3 = a2[l4], c2 = r[u3];\n            o2[u3] = c2.call(t);\n          }\n          n11[i5] = o2;\n        }\n        return n11;\n      }, b4.prototype.parseRecordList32 = function(e, r) {\n        var t = this;\n        r || (r = e, e = this.parseULong());\n        for (var n11 = new Array(e), a2 = Object.keys(r), i5 = 0; i5 < e; i5++) {\n          for (var o2 = {}, l4 = 0; l4 < a2.length; l4++) {\n            var u3 = a2[l4], c2 = r[u3];\n            o2[u3] = c2.call(t);\n          }\n          n11[i5] = o2;\n        }\n        return n11;\n      }, b4.prototype.parseStruct = function(e) {\n        var r = this;\n        if (typeof e == "function") return e.call(this);\n        for (var t = Object.keys(e), n11 = {}, a2 = 0; a2 < t.length; a2++) {\n          var i5 = t[a2], o2 = e[i5];\n          n11[i5] = o2.call(r);\n        }\n        return n11;\n      }, b4.prototype.parseValueRecord = function(e) {\n        if (e === void 0 && (e = this.parseUShort()), e !== 0) {\n          var r = {};\n          return e & 1 && (r.xPlacement = this.parseShort()), e & 2 && (r.yPlacement = this.parseShort()), e & 4 && (r.xAdvance = this.parseShort()), e & 8 && (r.yAdvance = this.parseShort()), e & 16 && (r.xPlaDevice = void 0, this.parseShort()), e & 32 && (r.yPlaDevice = void 0, this.parseShort()), e & 64 && (r.xAdvDevice = void 0, this.parseShort()), e & 128 && (r.yAdvDevice = void 0, this.parseShort()), r;\n        }\n      }, b4.prototype.parseValueRecordList = function() {\n        for (var e = this, r = this.parseUShort(), t = this.parseUShort(), n11 = new Array(t), a2 = 0; a2 < t; a2++) n11[a2] = e.parseValueRecord(r);\n        return n11;\n      }, b4.prototype.parsePointer = function(e) {\n        var r = this.parseOffset16();\n        if (r > 0) return new b4(this.data, this.offset + r).parseStruct(e);\n      }, b4.prototype.parsePointer32 = function(e) {\n        var r = this.parseOffset32();\n        if (r > 0) return new b4(this.data, this.offset + r).parseStruct(e);\n      }, b4.prototype.parseListOfLists = function(e) {\n        for (var r = this, t = this.parseOffset16List(), n11 = t.length, a2 = this.relativeOffset, i5 = new Array(n11), o2 = 0; o2 < n11; o2++) {\n          var l4 = t[o2];\n          if (l4 === 0) {\n            i5[o2] = void 0;\n            continue;\n          }\n          if (r.relativeOffset = l4, e) {\n            for (var u3 = r.parseOffset16List(), c2 = new Array(u3.length), d3 = 0; d3 < u3.length; d3++) r.relativeOffset = l4 + u3[d3], c2[d3] = e.call(r);\n            i5[o2] = c2;\n          } else i5[o2] = r.parseUShortList();\n        }\n        return this.relativeOffset = a2, i5;\n      }, b4.prototype.parseCoverage = function() {\n        var e = this, r = this.offset + this.relativeOffset, t = this.parseUShort(), n11 = this.parseUShort();\n        if (t === 1) return { format: 1, glyphs: this.parseUShortList(n11) };\n        if (t === 2) {\n          for (var a2 = new Array(n11), i5 = 0; i5 < n11; i5++) a2[i5] = { start: e.parseUShort(), end: e.parseUShort(), index: e.parseUShort() };\n          return { format: 2, ranges: a2 };\n        }\n        throw new Error("0x" + r.toString(16) + ": Coverage format must be 1 or 2.");\n      }, b4.prototype.parseClassDef = function() {\n        var e = this.offset + this.relativeOffset, r = this.parseUShort();\n        if (r === 1) return { format: 1, startGlyph: this.parseUShort(), classes: this.parseUShortList() };\n        if (r === 2) return { format: 2, ranges: this.parseRecordList({ start: b4.uShort, end: b4.uShort, classId: b4.uShort }) };\n        throw new Error("0x" + e.toString(16) + ": ClassDef format must be 1 or 2.");\n      }, b4.list = function(e, r) {\n        return function() {\n          return this.parseList(e, r);\n        };\n      }, b4.list32 = function(e, r) {\n        return function() {\n          return this.parseList32(e, r);\n        };\n      }, b4.recordList = function(e, r) {\n        return function() {\n          return this.parseRecordList(e, r);\n        };\n      }, b4.recordList32 = function(e, r) {\n        return function() {\n          return this.parseRecordList32(e, r);\n        };\n      }, b4.pointer = function(e) {\n        return function() {\n          return this.parsePointer(e);\n        };\n      }, b4.pointer32 = function(e) {\n        return function() {\n          return this.parsePointer32(e);\n        };\n      }, b4.tag = b4.prototype.parseTag, b4.byte = b4.prototype.parseByte, b4.uShort = b4.offset16 = b4.prototype.parseUShort, b4.uShortList = b4.prototype.parseUShortList, b4.uLong = b4.offset32 = b4.prototype.parseULong, b4.uLongList = b4.prototype.parseULongList, b4.struct = b4.prototype.parseStruct, b4.coverage = b4.prototype.parseCoverage, b4.classDef = b4.prototype.parseClassDef;\n      var Ot2 = { reserved: b4.uShort, reqFeatureIndex: b4.uShort, featureIndexes: b4.uShortList };\n      b4.prototype.parseScriptList = function() {\n        return this.parsePointer(b4.recordList({ tag: b4.tag, script: b4.pointer({ defaultLangSys: b4.pointer(Ot2), langSysRecords: b4.recordList({ tag: b4.tag, langSys: b4.pointer(Ot2) }) }) })) || [];\n      }, b4.prototype.parseFeatureList = function() {\n        return this.parsePointer(b4.recordList({ tag: b4.tag, feature: b4.pointer({ featureParams: b4.offset16, lookupListIndexes: b4.uShortList }) })) || [];\n      }, b4.prototype.parseLookupList = function(e) {\n        return this.parsePointer(b4.list(b4.pointer(function() {\n          var r = this.parseUShort();\n          G5.argument(1 <= r && r <= 9, "GPOS/GSUB lookup type " + r + " unknown.");\n          var t = this.parseUShort(), n11 = t & 16;\n          return { lookupType: r, lookupFlag: t, subtables: this.parseList(b4.pointer(e[r])), markFilteringSet: n11 ? this.parseUShort() : void 0 };\n        }))) || [];\n      }, b4.prototype.parseFeatureVariationsList = function() {\n        return this.parsePointer32(function() {\n          var e = this.parseUShort(), r = this.parseUShort();\n          G5.argument(e === 1 && r < 1, "GPOS/GSUB feature variations table unknown.");\n          var t = this.parseRecordList32({ conditionSetOffset: b4.offset32, featureTableSubstitutionOffset: b4.offset32 });\n          return t;\n        }) || [];\n      };\n      var w6 = { getByte: Et3, getCard8: Et3, getUShort: yr2, getCard16: yr2, getShort: ga, getULong: Gr, getFixed: Ut2, getTag: ma, getOffset: ya, getBytes: ba, bytesToString: xa, Parser: b4 };\n      function Ta(e, r) {\n        r.parseUShort(), e.length = r.parseULong(), e.language = r.parseULong();\n        var t;\n        e.groupCount = t = r.parseULong(), e.glyphIndexMap = {};\n        for (var n11 = 0; n11 < t; n11 += 1) for (var a2 = r.parseULong(), i5 = r.parseULong(), o2 = r.parseULong(), l4 = a2; l4 <= i5; l4 += 1) e.glyphIndexMap[l4] = o2, o2++;\n      }\n      function ka(e, r, t, n11, a2) {\n        e.length = r.parseUShort(), e.language = r.parseUShort();\n        var i5;\n        e.segCount = i5 = r.parseUShort() >> 1, r.skip("uShort", 3), e.glyphIndexMap = {};\n        for (var o2 = new w6.Parser(t, n11 + a2 + 14), l4 = new w6.Parser(t, n11 + a2 + 16 + i5 * 2), u3 = new w6.Parser(t, n11 + a2 + 16 + i5 * 4), c2 = new w6.Parser(t, n11 + a2 + 16 + i5 * 6), d3 = n11 + a2 + 16 + i5 * 8, y5 = 0; y5 < i5 - 1; y5 += 1) for (var g6 = void 0, m4 = o2.parseUShort(), T4 = l4.parseUShort(), O4 = u3.parseShort(), F4 = c2.parseUShort(), U6 = T4; U6 <= m4; U6 += 1) F4 !== 0 ? (d3 = c2.offset + c2.relativeOffset - 2, d3 += F4, d3 += (U6 - T4) * 2, g6 = w6.getUShort(t, d3), g6 !== 0 && (g6 = g6 + O4 & 65535)) : g6 = U6 + O4 & 65535, e.glyphIndexMap[U6] = g6;\n      }\n      function Fa(e, r) {\n        var t = {};\n        t.version = w6.getUShort(e, r), G5.argument(t.version === 0, "cmap table version should be 0."), t.numTables = w6.getUShort(e, r + 2);\n        for (var n11 = -1, a2 = t.numTables - 1; a2 >= 0; a2 -= 1) {\n          var i5 = w6.getUShort(e, r + 4 + a2 * 8), o2 = w6.getUShort(e, r + 4 + a2 * 8 + 2);\n          if (i5 === 3 && (o2 === 0 || o2 === 1 || o2 === 10)) {\n            n11 = w6.getULong(e, r + 4 + a2 * 8 + 4);\n            break;\n          }\n        }\n        if (n11 === -1) throw new Error("No valid cmap sub-tables found.");\n        var l4 = new w6.Parser(e, r + n11);\n        if (t.format = l4.parseUShort(), t.format === 12) Ta(t, l4);\n        else if (t.format === 4) ka(t, l4, e, r, n11);\n        else throw new Error("Only format 4 and 12 cmap tables are supported (found format " + t.format + ").");\n        return t;\n      }\n      function La(e, r, t) {\n        e.segments.push({ end: r, start: r, delta: -(r - t), offset: 0, glyphIndex: t });\n      }\n      function Ea(e) {\n        e.segments.push({ end: 65535, start: 65535, delta: 1, offset: 0 });\n      }\n      function Ua(e) {\n        var r = true, t;\n        for (t = e.length - 1; t > 0; t -= 1) {\n          var n11 = e.get(t);\n          if (n11.unicode > 65535) {\n            console.log("Adding CMAP format 12 (needed!)"), r = false;\n            break;\n          }\n        }\n        var a2 = [{ name: "version", type: "USHORT", value: 0 }, { name: "numTables", type: "USHORT", value: r ? 1 : 2 }, { name: "platformID", type: "USHORT", value: 3 }, { name: "encodingID", type: "USHORT", value: 1 }, { name: "offset", type: "ULONG", value: r ? 12 : 20 }];\n        r || (a2 = a2.concat([{ name: "cmap12PlatformID", type: "USHORT", value: 3 }, { name: "cmap12EncodingID", type: "USHORT", value: 10 }, { name: "cmap12Offset", type: "ULONG", value: 0 }])), a2 = a2.concat([{ name: "format", type: "USHORT", value: 4 }, { name: "cmap4Length", type: "USHORT", value: 0 }, { name: "language", type: "USHORT", value: 0 }, { name: "segCountX2", type: "USHORT", value: 0 }, { name: "searchRange", type: "USHORT", value: 0 }, { name: "entrySelector", type: "USHORT", value: 0 }, { name: "rangeShift", type: "USHORT", value: 0 }]);\n        var i5 = new A4.Table("cmap", a2);\n        for (i5.segments = [], t = 0; t < e.length; t += 1) {\n          for (var o2 = e.get(t), l4 = 0; l4 < o2.unicodes.length; l4 += 1) La(i5, o2.unicodes[l4], t);\n          i5.segments = i5.segments.sort(function(P5, I4) {\n            return P5.start - I4.start;\n          });\n        }\n        Ea(i5);\n        var u3 = i5.segments.length, c2 = 0, d3 = [], y5 = [], g6 = [], m4 = [], T4 = [], O4 = [];\n        for (t = 0; t < u3; t += 1) {\n          var F4 = i5.segments[t];\n          F4.end <= 65535 && F4.start <= 65535 ? (d3 = d3.concat({ name: "end_" + t, type: "USHORT", value: F4.end }), y5 = y5.concat({ name: "start_" + t, type: "USHORT", value: F4.start }), g6 = g6.concat({ name: "idDelta_" + t, type: "SHORT", value: F4.delta }), m4 = m4.concat({ name: "idRangeOffset_" + t, type: "USHORT", value: F4.offset }), F4.glyphId !== void 0 && (T4 = T4.concat({ name: "glyph_" + t, type: "USHORT", value: F4.glyphId }))) : c2 += 1, !r && F4.glyphIndex !== void 0 && (O4 = O4.concat({ name: "cmap12Start_" + t, type: "ULONG", value: F4.start }), O4 = O4.concat({ name: "cmap12End_" + t, type: "ULONG", value: F4.end }), O4 = O4.concat({ name: "cmap12Glyph_" + t, type: "ULONG", value: F4.glyphIndex }));\n        }\n        if (i5.segCountX2 = (u3 - c2) * 2, i5.searchRange = Math.pow(2, Math.floor(Math.log(u3 - c2) / Math.log(2))) * 2, i5.entrySelector = Math.log(i5.searchRange / 2) / Math.log(2), i5.rangeShift = i5.segCountX2 - i5.searchRange, i5.fields = i5.fields.concat(d3), i5.fields.push({ name: "reservedPad", type: "USHORT", value: 0 }), i5.fields = i5.fields.concat(y5), i5.fields = i5.fields.concat(g6), i5.fields = i5.fields.concat(m4), i5.fields = i5.fields.concat(T4), i5.cmap4Length = 14 + d3.length * 2 + 2 + y5.length * 2 + g6.length * 2 + m4.length * 2 + T4.length * 2, !r) {\n          var U6 = 16 + O4.length * 4;\n          i5.cmap12Offset = 20 + i5.cmap4Length, i5.fields = i5.fields.concat([{ name: "cmap12Format", type: "USHORT", value: 12 }, { name: "cmap12Reserved", type: "USHORT", value: 0 }, { name: "cmap12Length", type: "ULONG", value: U6 }, { name: "cmap12Language", type: "ULONG", value: 0 }, { name: "cmap12nGroups", type: "ULONG", value: O4.length / 3 }]), i5.fields = i5.fields.concat(O4);\n        }\n        return i5;\n      }\n      var It3 = { parse: Fa, make: Ua }, br2 = [".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "266 ff", "onedotenleader", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "ffi", "ffl", "parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold"], Oa = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "exclamdown", "cent", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi", "fl", "", "endash", "dagger", "daggerdbl", "periodcentered", "", "paragraph", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "", "questiondown", "", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "", "ring", "cedilla", "", "hungarumlaut", "ogonek", "caron", "emdash", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "AE", "", "ordfeminine", "", "", "", "", "Lslash", "Oslash", "OE", "ordmasculine", "", "", "", "", "", "ae", "", "", "", "dotlessi", "", "", "lslash", "oslash", "oe", "germandbls"], Ia = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "space", "exclamsmall", "Hungarumlautsmall", "", "dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "twodotenleader", "onedotenleader", "comma", "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "colon", "semicolon", "commasuperior", "threequartersemdash", "periodsuperior", "questionsmall", "", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "", "", "isuperior", "", "", "lsuperior", "msuperior", "nsuperior", "osuperior", "", "", "rsuperior", "ssuperior", "tsuperior", "", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior", "", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "exclamdownsmall", "centoldstyle", "Lslashsmall", "", "", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "", "Dotaccentsmall", "", "", "Macronsmall", "", "", "figuredash", "hypheninferior", "", "", "Ogoneksmall", "Ringsmall", "Cedillasmall", "", "", "", "onequarter", "onehalf", "threequarters", "questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "", "", "zerosuperior", "onesuperior", "twosuperior", "threesuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall"], Me3 = [".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quotesingle", "parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde", "aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute", "ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave", "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling", "section", "bullet", "paragraph", "germandbls", "registered", "copyright", "trademark", "acute", "dieresis", "notequal", "AE", "Oslash", "infinity", "plusminus", "lessequal", "greaterequal", "yen", "mu", "partialdiff", "summation", "product", "pi", "integral", "ordfeminine", "ordmasculine", "Omega", "ae", "oslash", "questiondown", "exclamdown", "logicalnot", "radical", "florin", "approxequal", "Delta", "guillemotleft", "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", "lozenge", "ydieresis", "Ydieresis", "fraction", "currency", "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase", "quotedblbase", "perthousand", "Acircumflex", "Ecircumflex", "Aacute", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Oacute", "Ocircumflex", "apple", "Ograve", "Uacute", "Ucircumflex", "Ugrave", "dotlessi", "circumflex", "tilde", "macron", "breve", "dotaccent", "ring", "cedilla", "hungarumlaut", "ogonek", "caron", "Lslash", "lslash", "Scaron", "scaron", "Zcaron", "zcaron", "brokenbar", "Eth", "eth", "Yacute", "yacute", "Thorn", "thorn", "minus", "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", "threequarters", "franc", "Gbreve", "gbreve", "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", "Ccaron", "ccaron", "dcroat"];\n      function Ct3(e) {\n        this.font = e;\n      }\n      Ct3.prototype.charToGlyphIndex = function(e) {\n        var r = e.charCodeAt(0), t = this.font.glyphs;\n        if (t) {\n          for (var n11 = 0; n11 < t.length; n11 += 1) for (var a2 = t.get(n11), i5 = 0; i5 < a2.unicodes.length; i5 += 1) if (a2.unicodes[i5] === r) return n11;\n        }\n        return null;\n      };\n      function wt2(e) {\n        this.cmap = e;\n      }\n      wt2.prototype.charToGlyphIndex = function(e) {\n        return this.cmap.glyphIndexMap[e.charCodeAt(0)] || 0;\n      };\n      function xr2(e, r) {\n        this.encoding = e, this.charset = r;\n      }\n      xr2.prototype.charToGlyphIndex = function(e) {\n        var r = e.charCodeAt(0), t = this.encoding[r];\n        return this.charset.indexOf(t);\n      };\n      function Nr(e) {\n        var r = this;\n        switch (e.version) {\n          case 1:\n            this.names = Me3.slice();\n            break;\n          case 2:\n            this.names = new Array(e.numberOfGlyphs);\n            for (var t = 0; t < e.numberOfGlyphs; t++) e.glyphNameIndex[t] < Me3.length ? r.names[t] = Me3[e.glyphNameIndex[t]] : r.names[t] = e.names[e.glyphNameIndex[t] - Me3.length];\n            break;\n          case 2.5:\n            this.names = new Array(e.numberOfGlyphs);\n            for (var n11 = 0; n11 < e.numberOfGlyphs; n11++) r.names[n11] = Me3[n11 + e.glyphNameIndex[n11]];\n            break;\n          case 3:\n            this.names = [];\n            break;\n          default:\n            this.names = [];\n            break;\n        }\n      }\n      Nr.prototype.nameToGlyphIndex = function(e) {\n        return this.names.indexOf(e);\n      }, Nr.prototype.glyphIndexToName = function(e) {\n        return this.names[e];\n      };\n      function Ca(e) {\n        for (var r, t = e.tables.cmap.glyphIndexMap, n11 = Object.keys(t), a2 = 0; a2 < n11.length; a2 += 1) {\n          var i5 = n11[a2], o2 = t[i5];\n          r = e.glyphs.get(o2), r.addUnicode(parseInt(i5));\n        }\n        for (var l4 = 0; l4 < e.glyphs.length; l4 += 1) r = e.glyphs.get(l4), e.cffEncoding ? e.isCIDFont ? r.name = "gid" + l4 : r.name = e.cffEncoding.charset[l4] : e.glyphNames.names && (r.name = e.glyphNames.glyphIndexToName(l4));\n      }\n      function wa(e, r, t, n11, a2) {\n        e.beginPath(), e.moveTo(r, t), e.lineTo(n11, a2), e.stroke();\n      }\n      var Be3 = { line: wa };\n      function Rt3(e, r, t, n11, a2) {\n        var i5;\n        return (r & n11) > 0 ? (i5 = e.parseByte(), (r & a2) === 0 && (i5 = -i5), i5 = t + i5) : (r & a2) > 0 ? i5 = t : i5 = t + e.parseShort(), i5;\n      }\n      function Ra(e, r, t) {\n        var n11 = new w6.Parser(r, t);\n        e.numberOfContours = n11.parseShort(), e._xMin = n11.parseShort(), e._yMin = n11.parseShort(), e._xMax = n11.parseShort(), e._yMax = n11.parseShort();\n        var a2, i5;\n        if (e.numberOfContours > 0) {\n          for (var o2 = e.endPointIndices = [], l4 = 0; l4 < e.numberOfContours; l4 += 1) o2.push(n11.parseUShort());\n          e.instructionLength = n11.parseUShort(), e.instructions = [];\n          for (var u3 = 0; u3 < e.instructionLength; u3 += 1) e.instructions.push(n11.parseByte());\n          var c2 = o2[o2.length - 1] + 1;\n          a2 = [];\n          for (var d3 = 0; d3 < c2; d3 += 1) if (i5 = n11.parseByte(), a2.push(i5), (i5 & 8) > 0) for (var y5 = n11.parseByte(), g6 = 0; g6 < y5; g6 += 1) a2.push(i5), d3 += 1;\n          if (G5.argument(a2.length === c2, "Bad flags."), o2.length > 0) {\n            var m4 = [], T4;\n            if (c2 > 0) {\n              for (var O4 = 0; O4 < c2; O4 += 1) i5 = a2[O4], T4 = {}, T4.onCurve = !!(i5 & 1), T4.lastPointOfContour = o2.indexOf(O4) >= 0, m4.push(T4);\n              for (var F4 = 0, U6 = 0; U6 < c2; U6 += 1) i5 = a2[U6], T4 = m4[U6], T4.x = Rt3(n11, i5, F4, 2, 16), F4 = T4.x;\n              for (var P5 = 0, I4 = 0; I4 < c2; I4 += 1) i5 = a2[I4], T4 = m4[I4], T4.y = Rt3(n11, i5, P5, 4, 32), P5 = T4.y;\n            }\n            e.points = m4;\n          } else e.points = [];\n        } else if (e.numberOfContours === 0) e.points = [];\n        else {\n          e.isComposite = true, e.points = [], e.components = [];\n          for (var H5 = true; H5; ) {\n            a2 = n11.parseUShort();\n            var R4 = { glyphIndex: n11.parseUShort(), xScale: 1, scale01: 0, scale10: 0, yScale: 1, dx: 0, dy: 0 };\n            (a2 & 1) > 0 ? (a2 & 2) > 0 ? (R4.dx = n11.parseShort(), R4.dy = n11.parseShort()) : R4.matchedPoints = [n11.parseUShort(), n11.parseUShort()] : (a2 & 2) > 0 ? (R4.dx = n11.parseChar(), R4.dy = n11.parseChar()) : R4.matchedPoints = [n11.parseByte(), n11.parseByte()], (a2 & 8) > 0 ? R4.xScale = R4.yScale = n11.parseF2Dot14() : (a2 & 64) > 0 ? (R4.xScale = n11.parseF2Dot14(), R4.yScale = n11.parseF2Dot14()) : (a2 & 128) > 0 && (R4.xScale = n11.parseF2Dot14(), R4.scale01 = n11.parseF2Dot14(), R4.scale10 = n11.parseF2Dot14(), R4.yScale = n11.parseF2Dot14()), e.components.push(R4), H5 = !!(a2 & 32);\n          }\n          if (a2 & 256) {\n            e.instructionLength = n11.parseUShort(), e.instructions = [];\n            for (var B5 = 0; B5 < e.instructionLength; B5 += 1) e.instructions.push(n11.parseByte());\n          }\n        }\n      }\n      function Hr2(e, r) {\n        for (var t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11], i5 = { x: r.xScale * a2.x + r.scale01 * a2.y + r.dx, y: r.scale10 * a2.x + r.yScale * a2.y + r.dy, onCurve: a2.onCurve, lastPointOfContour: a2.lastPointOfContour };\n          t.push(i5);\n        }\n        return t;\n      }\n      function Da(e) {\n        for (var r = [], t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11];\n          t.push(a2), a2.lastPointOfContour && (r.push(t), t = []);\n        }\n        return G5.argument(t.length === 0, "There are still points left in the current contour."), r;\n      }\n      function Dt3(e) {\n        var r = new Z5();\n        if (!e) return r;\n        for (var t = Da(e), n11 = 0; n11 < t.length; ++n11) {\n          var a2 = t[n11], i5 = null, o2 = a2[a2.length - 1], l4 = a2[0];\n          if (o2.onCurve) r.moveTo(o2.x, o2.y);\n          else if (l4.onCurve) r.moveTo(l4.x, l4.y);\n          else {\n            var u3 = { x: (o2.x + l4.x) * 0.5, y: (o2.y + l4.y) * 0.5 };\n            r.moveTo(u3.x, u3.y);\n          }\n          for (var c2 = 0; c2 < a2.length; ++c2) if (i5 = o2, o2 = l4, l4 = a2[(c2 + 1) % a2.length], o2.onCurve) r.lineTo(o2.x, o2.y);\n          else {\n            var d3 = i5, y5 = l4;\n            i5.onCurve || (d3 = { x: (o2.x + i5.x) * 0.5, y: (o2.y + i5.y) * 0.5 }, r.lineTo(d3.x, d3.y)), l4.onCurve || (y5 = { x: (o2.x + l4.x) * 0.5, y: (o2.y + l4.y) * 0.5 }), r.lineTo(d3.x, d3.y), r.quadraticCurveTo(o2.x, o2.y, y5.x, y5.y);\n          }\n          r.closePath();\n        }\n        return r;\n      }\n      function Aa(e, r) {\n        if (r.isComposite) for (var t = 0; t < r.components.length; t += 1) {\n          var n11 = r.components[t], a2 = e.get(n11.glyphIndex);\n          if (a2.getPath(), a2.points) {\n            var i5 = void 0;\n            if (n11.matchedPoints === void 0) i5 = Hr2(a2.points, n11);\n            else {\n              if (n11.matchedPoints[0] > r.points.length - 1 || n11.matchedPoints[1] > a2.points.length - 1) throw Error("Matched points out of range in " + r.name);\n              var o2 = r.points[n11.matchedPoints[0]], l4 = a2.points[n11.matchedPoints[1]], u3 = { xScale: n11.xScale, scale01: n11.scale01, scale10: n11.scale10, yScale: n11.yScale, dx: 0, dy: 0 };\n              l4 = Hr2([l4], u3)[0], u3.dx = o2.x - l4.x, u3.dy = o2.y - l4.y, i5 = Hr2(a2.points, u3);\n            }\n            r.points = r.points.concat(i5);\n          }\n        }\n        return Dt3(r.points);\n      }\n      function Ma(e, r, t, n11) {\n        for (var a2 = new qe2.GlyphSet(n11), i5 = 0; i5 < t.length - 1; i5 += 1) {\n          var o2 = t[i5], l4 = t[i5 + 1];\n          o2 !== l4 ? a2.push(i5, qe2.ttfGlyphLoader(n11, i5, Ra, e, r + o2, Aa)) : a2.push(i5, qe2.glyphLoader(n11, i5));\n        }\n        return a2;\n      }\n      var At3 = { getPath: Dt3, parse: Ma };\n      function Ba(e, r) {\n        var t = r || new Z5();\n        return { configurable: true, get: function() {\n          return typeof t == "function" && (t = t()), t;\n        }, set: function(n11) {\n          t = n11;\n        } };\n      }\n      function fe3(e) {\n        this.bindConstructorValues(e);\n      }\n      fe3.prototype.bindConstructorValues = function(e) {\n        this.index = e.index || 0, this.name = e.name || null, this.unicode = e.unicode || void 0, this.unicodes = e.unicodes || e.unicode !== void 0 ? [e.unicode] : [], e.xMin && (this.xMin = e.xMin), e.yMin && (this.yMin = e.yMin), e.xMax && (this.xMax = e.xMax), e.yMax && (this.yMax = e.yMax), e.advanceWidth && (this.advanceWidth = e.advanceWidth), Object.defineProperty(this, "path", Ba(this, e.path));\n      }, fe3.prototype.addUnicode = function(e) {\n        this.unicodes.length === 0 && (this.unicode = e), this.unicodes.push(e);\n      }, fe3.prototype.getBoundingBox = function() {\n        return this.path.getBoundingBox();\n      }, fe3.prototype.getPath = function(e, r, t, n11, a2) {\n        e = e !== void 0 ? e : 0, r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 72;\n        var i5, o2;\n        n11 || (n11 = {});\n        var l4 = n11.xScale, u3 = n11.yScale;\n        if (n11.hinting && a2 && a2.hinting && (o2 = this.path && a2.hinting.exec(this, t)), o2) i5 = At3.getPath(o2).commands, e = Math.round(e), r = Math.round(r), l4 = u3 = 1;\n        else {\n          i5 = this.path.commands;\n          var c2 = 1 / this.path.unitsPerEm * t;\n          l4 === void 0 && (l4 = c2), u3 === void 0 && (u3 = c2);\n        }\n        for (var d3 = new Z5(), y5 = 0; y5 < i5.length; y5 += 1) {\n          var g6 = i5[y5];\n          g6.type === "M" ? d3.moveTo(e + g6.x * l4, r + -g6.y * u3) : g6.type === "L" ? d3.lineTo(e + g6.x * l4, r + -g6.y * u3) : g6.type === "Q" ? d3.quadraticCurveTo(e + g6.x1 * l4, r + -g6.y1 * u3, e + g6.x * l4, r + -g6.y * u3) : g6.type === "C" ? d3.curveTo(e + g6.x1 * l4, r + -g6.y1 * u3, e + g6.x2 * l4, r + -g6.y2 * u3, e + g6.x * l4, r + -g6.y * u3) : g6.type === "Z" && d3.closePath();\n        }\n        return d3;\n      }, fe3.prototype.getContours = function() {\n        var e = this;\n        if (this.points === void 0) return [];\n        for (var r = [], t = [], n11 = 0; n11 < this.points.length; n11 += 1) {\n          var a2 = e.points[n11];\n          t.push(a2), a2.lastPointOfContour && (r.push(t), t = []);\n        }\n        return G5.argument(t.length === 0, "There are still points left in the current contour."), r;\n      }, fe3.prototype.getMetrics = function() {\n        for (var e = this.path.commands, r = [], t = [], n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11];\n          a2.type !== "Z" && (r.push(a2.x), t.push(a2.y)), (a2.type === "Q" || a2.type === "C") && (r.push(a2.x1), t.push(a2.y1)), a2.type === "C" && (r.push(a2.x2), t.push(a2.y2));\n        }\n        var i5 = { xMin: Math.min.apply(null, r), yMin: Math.min.apply(null, t), xMax: Math.max.apply(null, r), yMax: Math.max.apply(null, t), leftSideBearing: this.leftSideBearing };\n        return isFinite(i5.xMin) || (i5.xMin = 0), isFinite(i5.xMax) || (i5.xMax = this.advanceWidth), isFinite(i5.yMin) || (i5.yMin = 0), isFinite(i5.yMax) || (i5.yMax = 0), i5.rightSideBearing = this.advanceWidth - i5.leftSideBearing - (i5.xMax - i5.xMin), i5;\n      }, fe3.prototype.draw = function(e, r, t, n11, a2) {\n        this.getPath(r, t, n11, a2).draw(e);\n      }, fe3.prototype.drawPoints = function(e, r, t, n11) {\n        function a2(y5, g6, m4, T4) {\n          var O4 = Math.PI * 2;\n          e.beginPath();\n          for (var F4 = 0; F4 < y5.length; F4 += 1) e.moveTo(g6 + y5[F4].x * T4, m4 + y5[F4].y * T4), e.arc(g6 + y5[F4].x * T4, m4 + y5[F4].y * T4, 2, 0, O4, false);\n          e.closePath(), e.fill();\n        }\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 24;\n        for (var i5 = 1 / this.path.unitsPerEm * n11, o2 = [], l4 = [], u3 = this.path, c2 = 0; c2 < u3.commands.length; c2 += 1) {\n          var d3 = u3.commands[c2];\n          d3.x !== void 0 && o2.push({ x: d3.x, y: -d3.y }), d3.x1 !== void 0 && l4.push({ x: d3.x1, y: -d3.y1 }), d3.x2 !== void 0 && l4.push({ x: d3.x2, y: -d3.y2 });\n        }\n        e.fillStyle = "blue", a2(o2, r, t, i5), e.fillStyle = "red", a2(l4, r, t, i5);\n      }, fe3.prototype.drawMetrics = function(e, r, t, n11) {\n        var a2;\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 24, a2 = 1 / this.path.unitsPerEm * n11, e.lineWidth = 1, e.strokeStyle = "black", Be3.line(e, r, -1e4, r, 1e4), Be3.line(e, -1e4, t, 1e4, t);\n        var i5 = this.xMin || 0, o2 = this.yMin || 0, l4 = this.xMax || 0, u3 = this.yMax || 0, c2 = this.advanceWidth || 0;\n        e.strokeStyle = "blue", Be3.line(e, r + i5 * a2, -1e4, r + i5 * a2, 1e4), Be3.line(e, r + l4 * a2, -1e4, r + l4 * a2, 1e4), Be3.line(e, -1e4, t + -o2 * a2, 1e4, t + -o2 * a2), Be3.line(e, -1e4, t + -u3 * a2, 1e4, t + -u3 * a2), e.strokeStyle = "green", Be3.line(e, r + c2 * a2, -1e4, r + c2 * a2, 1e4);\n      };\n      function Sr2(e, r, t) {\n        Object.defineProperty(e, r, { get: function() {\n          return e.path, e[t];\n        }, set: function(n11) {\n          e[t] = n11;\n        }, enumerable: true, configurable: true });\n      }\n      function _r3(e, r) {\n        var t = this;\n        if (this.font = e, this.glyphs = {}, Array.isArray(r)) for (var n11 = 0; n11 < r.length; n11++) t.glyphs[n11] = r[n11];\n        this.length = r && r.length || 0;\n      }\n      _r3.prototype.get = function(e) {\n        return typeof this.glyphs[e] == "function" && (this.glyphs[e] = this.glyphs[e]()), this.glyphs[e];\n      }, _r3.prototype.push = function(e, r) {\n        this.glyphs[e] = r, this.length++;\n      };\n      function Pa(e, r) {\n        return new fe3({ index: r, font: e });\n      }\n      function Ga(e, r, t, n11, a2, i5) {\n        return function() {\n          var o2 = new fe3({ index: r, font: e });\n          return o2.path = function() {\n            t(o2, n11, a2);\n            var l4 = i5(e.glyphs, o2);\n            return l4.unitsPerEm = e.unitsPerEm, l4;\n          }, Sr2(o2, "xMin", "_xMin"), Sr2(o2, "xMax", "_xMax"), Sr2(o2, "yMin", "_yMin"), Sr2(o2, "yMax", "_yMax"), o2;\n        };\n      }\n      function Na(e, r, t, n11) {\n        return function() {\n          var a2 = new fe3({ index: r, font: e });\n          return a2.path = function() {\n            var i5 = t(e, a2, n11);\n            return i5.unitsPerEm = e.unitsPerEm, i5;\n          }, a2;\n        };\n      }\n      var qe2 = { GlyphSet: _r3, glyphLoader: Pa, ttfGlyphLoader: Ga, cffGlyphLoader: Na };\n      function Mt2(e, r) {\n        if (e === r) return true;\n        if (Array.isArray(e) && Array.isArray(r)) {\n          if (e.length !== r.length) return false;\n          for (var t = 0; t < e.length; t += 1) if (!Mt2(e[t], r[t])) return false;\n          return true;\n        } else return false;\n      }\n      function zr(e) {\n        var r;\n        return e.length < 1240 ? r = 107 : e.length < 33900 ? r = 1131 : r = 32768, r;\n      }\n      function Oe3(e, r, t) {\n        var n11 = [], a2 = [], i5 = w6.getCard16(e, r), o2, l4;\n        if (i5 !== 0) {\n          var u3 = w6.getByte(e, r + 2);\n          o2 = r + (i5 + 1) * u3 + 2;\n          for (var c2 = r + 3, d3 = 0; d3 < i5 + 1; d3 += 1) n11.push(w6.getOffset(e, c2, u3)), c2 += u3;\n          l4 = o2 + n11[i5];\n        } else l4 = r + 2;\n        for (var y5 = 0; y5 < n11.length - 1; y5 += 1) {\n          var g6 = w6.getBytes(e, o2 + n11[y5], o2 + n11[y5 + 1]);\n          t && (g6 = t(g6)), a2.push(g6);\n        }\n        return { objects: a2, startOffset: r, endOffset: l4 };\n      }\n      function Ha(e) {\n        for (var r = "", t = 15, n11 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "E", "E-", null, "-"]; ; ) {\n          var a2 = e.parseByte(), i5 = a2 >> 4, o2 = a2 & 15;\n          if (i5 === t || (r += n11[i5], o2 === t)) break;\n          r += n11[o2];\n        }\n        return parseFloat(r);\n      }\n      function _a(e, r) {\n        var t, n11, a2, i5;\n        if (r === 28) return t = e.parseByte(), n11 = e.parseByte(), t << 8 | n11;\n        if (r === 29) return t = e.parseByte(), n11 = e.parseByte(), a2 = e.parseByte(), i5 = e.parseByte(), t << 24 | n11 << 16 | a2 << 8 | i5;\n        if (r === 30) return Ha(e);\n        if (r >= 32 && r <= 246) return r - 139;\n        if (r >= 247 && r <= 250) return t = e.parseByte(), (r - 247) * 256 + t + 108;\n        if (r >= 251 && r <= 254) return t = e.parseByte(), -(r - 251) * 256 - t - 108;\n        throw new Error("Invalid b0 " + r);\n      }\n      function za(e) {\n        for (var r = {}, t = 0; t < e.length; t += 1) {\n          var n11 = e[t][0], a2 = e[t][1], i5 = void 0;\n          if (a2.length === 1 ? i5 = a2[0] : i5 = a2, r.hasOwnProperty(n11) && !isNaN(r[n11])) throw new Error("Object " + r + " already has key " + n11);\n          r[n11] = i5;\n        }\n        return r;\n      }\n      function Bt2(e, r, t) {\n        r = r !== void 0 ? r : 0;\n        var n11 = new w6.Parser(e, r), a2 = [], i5 = [];\n        for (t = t !== void 0 ? t : e.length; n11.relativeOffset < t; ) {\n          var o2 = n11.parseByte();\n          o2 <= 21 ? (o2 === 12 && (o2 = 1200 + n11.parseByte()), a2.push([o2, i5]), i5 = []) : i5.push(_a(n11, o2));\n        }\n        return za(a2);\n      }\n      function $e2(e, r) {\n        return r <= 390 ? r = br2[r] : r = e[r - 391], r;\n      }\n      function Pt2(e, r, t) {\n        for (var n11 = {}, a2, i5 = 0; i5 < r.length; i5 += 1) {\n          var o2 = r[i5];\n          if (Array.isArray(o2.type)) {\n            var l4 = [];\n            l4.length = o2.type.length;\n            for (var u3 = 0; u3 < o2.type.length; u3++) a2 = e[o2.op] !== void 0 ? e[o2.op][u3] : void 0, a2 === void 0 && (a2 = o2.value !== void 0 && o2.value[u3] !== void 0 ? o2.value[u3] : null), o2.type[u3] === "SID" && (a2 = $e2(t, a2)), l4[u3] = a2;\n            n11[o2.name] = l4;\n          } else a2 = e[o2.op], a2 === void 0 && (a2 = o2.value !== void 0 ? o2.value : null), o2.type === "SID" && (a2 = $e2(t, a2)), n11[o2.name] = a2;\n        }\n        return n11;\n      }\n      function Wa(e, r) {\n        var t = {};\n        return t.formatMajor = w6.getCard8(e, r), t.formatMinor = w6.getCard8(e, r + 1), t.size = w6.getCard8(e, r + 2), t.offsetSize = w6.getCard8(e, r + 3), t.startOffset = r, t.endOffset = r + 4, t;\n      }\n      var Gt3 = [{ name: "version", op: 0, type: "SID" }, { name: "notice", op: 1, type: "SID" }, { name: "copyright", op: 1200, type: "SID" }, { name: "fullName", op: 2, type: "SID" }, { name: "familyName", op: 3, type: "SID" }, { name: "weight", op: 4, type: "SID" }, { name: "isFixedPitch", op: 1201, type: "number", value: 0 }, { name: "italicAngle", op: 1202, type: "number", value: 0 }, { name: "underlinePosition", op: 1203, type: "number", value: -100 }, { name: "underlineThickness", op: 1204, type: "number", value: 50 }, { name: "paintType", op: 1205, type: "number", value: 0 }, { name: "charstringType", op: 1206, type: "number", value: 2 }, { name: "fontMatrix", op: 1207, type: ["real", "real", "real", "real", "real", "real"], value: [1e-3, 0, 0, 1e-3, 0, 0] }, { name: "uniqueId", op: 13, type: "number" }, { name: "fontBBox", op: 5, type: ["number", "number", "number", "number"], value: [0, 0, 0, 0] }, { name: "strokeWidth", op: 1208, type: "number", value: 0 }, { name: "xuid", op: 14, type: [], value: null }, { name: "charset", op: 15, type: "offset", value: 0 }, { name: "encoding", op: 16, type: "offset", value: 0 }, { name: "charStrings", op: 17, type: "offset", value: 0 }, { name: "private", op: 18, type: ["number", "offset"], value: [0, 0] }, { name: "ros", op: 1230, type: ["SID", "SID", "number"] }, { name: "cidFontVersion", op: 1231, type: "number", value: 0 }, { name: "cidFontRevision", op: 1232, type: "number", value: 0 }, { name: "cidFontType", op: 1233, type: "number", value: 0 }, { name: "cidCount", op: 1234, type: "number", value: 8720 }, { name: "uidBase", op: 1235, type: "number" }, { name: "fdArray", op: 1236, type: "offset" }, { name: "fdSelect", op: 1237, type: "offset" }, { name: "fontName", op: 1238, type: "SID" }], Nt4 = [{ name: "subrs", op: 19, type: "offset", value: 0 }, { name: "defaultWidthX", op: 20, type: "number", value: 0 }, { name: "nominalWidthX", op: 21, type: "number", value: 0 }];\n      function Va(e, r) {\n        var t = Bt2(e, 0, e.byteLength);\n        return Pt2(t, Gt3, r);\n      }\n      function Ht2(e, r, t, n11) {\n        var a2 = Bt2(e, r, t);\n        return Pt2(a2, Nt4, n11);\n      }\n      function _t3(e, r, t, n11) {\n        for (var a2 = [], i5 = 0; i5 < t.length; i5 += 1) {\n          var o2 = new DataView(new Uint8Array(t[i5]).buffer), l4 = Va(o2, n11);\n          l4._subrs = [], l4._subrsBias = 0;\n          var u3 = l4.private[0], c2 = l4.private[1];\n          if (u3 !== 0 && c2 !== 0) {\n            var d3 = Ht2(e, c2 + r, u3, n11);\n            if (l4._defaultWidthX = d3.defaultWidthX, l4._nominalWidthX = d3.nominalWidthX, d3.subrs !== 0) {\n              var y5 = c2 + d3.subrs, g6 = Oe3(e, y5 + r);\n              l4._subrs = g6.objects, l4._subrsBias = zr(l4._subrs);\n            }\n            l4._privateDict = d3;\n          }\n          a2.push(l4);\n        }\n        return a2;\n      }\n      function qa(e, r, t, n11) {\n        var a2, i5, o2 = new w6.Parser(e, r);\n        t -= 1;\n        var l4 = [".notdef"], u3 = o2.parseCard8();\n        if (u3 === 0) for (var c2 = 0; c2 < t; c2 += 1) a2 = o2.parseSID(), l4.push($e2(n11, a2));\n        else if (u3 === 1) for (; l4.length <= t; ) {\n          a2 = o2.parseSID(), i5 = o2.parseCard8();\n          for (var d3 = 0; d3 <= i5; d3 += 1) l4.push($e2(n11, a2)), a2 += 1;\n        }\n        else if (u3 === 2) for (; l4.length <= t; ) {\n          a2 = o2.parseSID(), i5 = o2.parseCard16();\n          for (var y5 = 0; y5 <= i5; y5 += 1) l4.push($e2(n11, a2)), a2 += 1;\n        }\n        else throw new Error("Unknown charset format " + u3);\n        return l4;\n      }\n      function Xa(e, r, t) {\n        var n11, a2 = {}, i5 = new w6.Parser(e, r), o2 = i5.parseCard8();\n        if (o2 === 0) for (var l4 = i5.parseCard8(), u3 = 0; u3 < l4; u3 += 1) n11 = i5.parseCard8(), a2[n11] = u3;\n        else if (o2 === 1) {\n          var c2 = i5.parseCard8();\n          n11 = 1;\n          for (var d3 = 0; d3 < c2; d3 += 1) for (var y5 = i5.parseCard8(), g6 = i5.parseCard8(), m4 = y5; m4 <= y5 + g6; m4 += 1) a2[m4] = n11, n11 += 1;\n        } else throw new Error("Unknown encoding format " + o2);\n        return new xr2(a2, t);\n      }\n      function Ya(e, r, t) {\n        var n11, a2, i5, o2, l4 = new Z5(), u3 = [], c2 = 0, d3 = false, y5 = false, g6 = 0, m4 = 0, T4, O4, F4, U6;\n        if (e.isCIDFont) {\n          var P5 = e.tables.cff.topDict._fdSelect[r.index], I4 = e.tables.cff.topDict._fdArray[P5];\n          T4 = I4._subrs, O4 = I4._subrsBias, F4 = I4._defaultWidthX, U6 = I4._nominalWidthX;\n        } else T4 = e.tables.cff.topDict._subrs, O4 = e.tables.cff.topDict._subrsBias, F4 = e.tables.cff.topDict._defaultWidthX, U6 = e.tables.cff.topDict._nominalWidthX;\n        var H5 = F4;\n        function R4(q3, K4) {\n          y5 && l4.closePath(), l4.moveTo(q3, K4), y5 = true;\n        }\n        function B5() {\n          var q3;\n          q3 = u3.length % 2 !== 0, q3 && !d3 && (H5 = u3.shift() + U6), c2 += u3.length >> 1, u3.length = 0, d3 = true;\n        }\n        function ue2(q3) {\n          for (var K4, se3, le3, pe2, de3, J5, j5, re3, te3, ne3, oe4, he3, Y2 = 0; Y2 < q3.length; ) {\n            var ae4 = q3[Y2];\n            switch (Y2 += 1, ae4) {\n              case 1:\n                B5();\n                break;\n              case 3:\n                B5();\n                break;\n              case 4:\n                u3.length > 1 && !d3 && (H5 = u3.shift() + U6, d3 = true), m4 += u3.pop(), R4(g6, m4);\n                break;\n              case 5:\n                for (; u3.length > 0; ) g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 6:\n                for (; u3.length > 0 && (g6 += u3.shift(), l4.lineTo(g6, m4), u3.length !== 0); ) m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 7:\n                for (; u3.length > 0 && (m4 += u3.shift(), l4.lineTo(g6, m4), u3.length !== 0); ) g6 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 8:\n                for (; u3.length > 0; ) n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 10:\n                de3 = u3.pop() + O4, J5 = T4[de3], J5 && ue2(J5);\n                break;\n              case 11:\n                return;\n              case 12:\n                switch (ae4 = q3[Y2], Y2 += 1, ae4) {\n                  case 35:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2 + u3.shift(), te3 = j5 + u3.shift(), ne3 = re3 + u3.shift(), oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), g6 = oe4 + u3.shift(), m4 = he3 + u3.shift(), u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 34:\n                    n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2, te3 = j5 + u3.shift(), ne3 = o2, oe4 = te3 + u3.shift(), he3 = m4, g6 = oe4 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 36:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2, te3 = j5 + u3.shift(), ne3 = o2, oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), g6 = oe4 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  case 37:\n                    n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), j5 = i5 + u3.shift(), re3 = o2 + u3.shift(), te3 = j5 + u3.shift(), ne3 = re3 + u3.shift(), oe4 = te3 + u3.shift(), he3 = ne3 + u3.shift(), Math.abs(oe4 - g6) > Math.abs(he3 - m4) ? g6 = oe4 + u3.shift() : m4 = he3 + u3.shift(), l4.curveTo(n11, a2, i5, o2, j5, re3), l4.curveTo(te3, ne3, oe4, he3, g6, m4);\n                    break;\n                  default:\n                    console.log("Glyph " + r.index + ": unknown operator 1200" + ae4), u3.length = 0;\n                }\n                break;\n              case 14:\n                u3.length > 0 && !d3 && (H5 = u3.shift() + U6, d3 = true), y5 && (l4.closePath(), y5 = false);\n                break;\n              case 18:\n                B5();\n                break;\n              case 19:\n              case 20:\n                B5(), Y2 += c2 + 7 >> 3;\n                break;\n              case 21:\n                u3.length > 2 && !d3 && (H5 = u3.shift() + U6, d3 = true), m4 += u3.pop(), g6 += u3.pop(), R4(g6, m4);\n                break;\n              case 22:\n                u3.length > 1 && !d3 && (H5 = u3.shift() + U6, d3 = true), g6 += u3.pop(), R4(g6, m4);\n                break;\n              case 23:\n                B5();\n                break;\n              case 24:\n                for (; u3.length > 2; ) n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                break;\n              case 25:\n                for (; u3.length > 6; ) g6 += u3.shift(), m4 += u3.shift(), l4.lineTo(g6, m4);\n                n11 = g6 + u3.shift(), a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 26:\n                for (u3.length % 2 && (g6 += u3.shift()); u3.length > 0; ) n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5, m4 = o2 + u3.shift(), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 27:\n                for (u3.length % 2 && (m4 += u3.shift()); u3.length > 0; ) n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2, l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 28:\n                K4 = q3[Y2], se3 = q3[Y2 + 1], u3.push((K4 << 24 | se3 << 16) >> 16), Y2 += 2;\n                break;\n              case 29:\n                de3 = u3.pop() + e.gsubrsBias, J5 = e.gsubrs[de3], J5 && ue2(J5);\n                break;\n              case 30:\n                for (; u3.length > 0 && (n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4), u3.length !== 0); ) n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), m4 = o2 + u3.shift(), g6 = i5 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              case 31:\n                for (; u3.length > 0 && (n11 = g6 + u3.shift(), a2 = m4, i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), m4 = o2 + u3.shift(), g6 = i5 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4), u3.length !== 0); ) n11 = g6, a2 = m4 + u3.shift(), i5 = n11 + u3.shift(), o2 = a2 + u3.shift(), g6 = i5 + u3.shift(), m4 = o2 + (u3.length === 1 ? u3.shift() : 0), l4.curveTo(n11, a2, i5, o2, g6, m4);\n                break;\n              default:\n                ae4 < 32 ? console.log("Glyph " + r.index + ": unknown operator " + ae4) : ae4 < 247 ? u3.push(ae4 - 139) : ae4 < 251 ? (K4 = q3[Y2], Y2 += 1, u3.push((ae4 - 247) * 256 + K4 + 108)) : ae4 < 255 ? (K4 = q3[Y2], Y2 += 1, u3.push(-(ae4 - 251) * 256 - K4 - 108)) : (K4 = q3[Y2], se3 = q3[Y2 + 1], le3 = q3[Y2 + 2], pe2 = q3[Y2 + 3], Y2 += 4, u3.push((K4 << 24 | se3 << 16 | le3 << 8 | pe2) / 65536));\n            }\n          }\n        }\n        return ue2(t), r.advanceWidth = H5, l4;\n      }\n      function Za(e, r, t, n11) {\n        var a2 = [], i5, o2 = new w6.Parser(e, r), l4 = o2.parseCard8();\n        if (l4 === 0) for (var u3 = 0; u3 < t; u3++) {\n          if (i5 = o2.parseCard8(), i5 >= n11) throw new Error("CFF table CID Font FDSelect has bad FD index value " + i5 + " (FD count " + n11 + ")");\n          a2.push(i5);\n        }\n        else if (l4 === 3) {\n          var c2 = o2.parseCard16(), d3 = o2.parseCard16();\n          if (d3 !== 0) throw new Error("CFF Table CID Font FDSelect format 3 range has bad initial GID " + d3);\n          for (var y5, g6 = 0; g6 < c2; g6++) {\n            if (i5 = o2.parseCard8(), y5 = o2.parseCard16(), i5 >= n11) throw new Error("CFF table CID Font FDSelect has bad FD index value " + i5 + " (FD count " + n11 + ")");\n            if (y5 > t) throw new Error("CFF Table CID Font FDSelect format 3 range has bad GID " + y5);\n            for (; d3 < y5; d3++) a2.push(i5);\n            d3 = y5;\n          }\n          if (y5 !== t) throw new Error("CFF Table CID Font FDSelect format 3 range has bad final GID " + y5);\n        } else throw new Error("CFF Table CID Font FDSelect table has unsupported format " + l4);\n        return a2;\n      }\n      function Qa(e, r, t) {\n        t.tables.cff = {};\n        var n11 = Wa(e, r), a2 = Oe3(e, n11.endOffset, w6.bytesToString), i5 = Oe3(e, a2.endOffset), o2 = Oe3(e, i5.endOffset, w6.bytesToString), l4 = Oe3(e, o2.endOffset);\n        t.gsubrs = l4.objects, t.gsubrsBias = zr(t.gsubrs);\n        var u3 = _t3(e, r, i5.objects, o2.objects);\n        if (u3.length !== 1) throw new Error("CFF table has too many fonts in \'FontSet\' - count of fonts NameIndex.length = " + u3.length);\n        var c2 = u3[0];\n        if (t.tables.cff.topDict = c2, c2._privateDict && (t.defaultWidthX = c2._privateDict.defaultWidthX, t.nominalWidthX = c2._privateDict.nominalWidthX), c2.ros[0] !== void 0 && c2.ros[1] !== void 0 && (t.isCIDFont = true), t.isCIDFont) {\n          var d3 = c2.fdArray, y5 = c2.fdSelect;\n          if (d3 === 0 || y5 === 0) throw new Error("Font is marked as a CID font, but FDArray and/or FDSelect information is missing");\n          d3 += r;\n          var g6 = Oe3(e, d3), m4 = _t3(e, r, g6.objects, o2.objects);\n          c2._fdArray = m4, y5 += r, c2._fdSelect = Za(e, y5, t.numGlyphs, m4.length);\n        }\n        var T4 = r + c2.private[1], O4 = Ht2(e, T4, c2.private[0], o2.objects);\n        if (t.defaultWidthX = O4.defaultWidthX, t.nominalWidthX = O4.nominalWidthX, O4.subrs !== 0) {\n          var F4 = T4 + O4.subrs, U6 = Oe3(e, F4);\n          t.subrs = U6.objects, t.subrsBias = zr(t.subrs);\n        } else t.subrs = [], t.subrsBias = 0;\n        var P5 = Oe3(e, r + c2.charStrings);\n        t.nGlyphs = P5.objects.length;\n        var I4 = qa(e, r + c2.charset, t.nGlyphs, o2.objects);\n        c2.encoding === 0 ? t.cffEncoding = new xr2(Oa, I4) : c2.encoding === 1 ? t.cffEncoding = new xr2(Ia, I4) : t.cffEncoding = Xa(e, r + c2.encoding, I4), t.encoding = t.encoding || t.cffEncoding, t.glyphs = new qe2.GlyphSet(t);\n        for (var H5 = 0; H5 < t.nGlyphs; H5 += 1) {\n          var R4 = P5.objects[H5];\n          t.glyphs.push(H5, qe2.cffGlyphLoader(t, H5, Ya, R4));\n        }\n      }\n      function zt3(e, r) {\n        var t, n11 = br2.indexOf(e);\n        return n11 >= 0 && (t = n11), n11 = r.indexOf(e), n11 >= 0 ? t = n11 + br2.length : (t = br2.length + r.length, r.push(e)), t;\n      }\n      function Ja() {\n        return new A4.Record("Header", [{ name: "major", type: "Card8", value: 1 }, { name: "minor", type: "Card8", value: 0 }, { name: "hdrSize", type: "Card8", value: 4 }, { name: "major", type: "Card8", value: 1 }]);\n      }\n      function Ka(e) {\n        var r = new A4.Record("Name INDEX", [{ name: "names", type: "INDEX", value: [] }]);\n        r.names = [];\n        for (var t = 0; t < e.length; t += 1) r.names.push({ name: "name_" + t, type: "NAME", value: e[t] });\n        return r;\n      }\n      function Wt2(e, r, t) {\n        for (var n11 = {}, a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = e[a2], o2 = r[i5.name];\n          o2 !== void 0 && !Mt2(o2, i5.value) && (i5.type === "SID" && (o2 = zt3(o2, t)), n11[i5.op] = { name: i5.name, type: i5.type, value: o2 });\n        }\n        return n11;\n      }\n      function Vt3(e, r) {\n        var t = new A4.Record("Top DICT", [{ name: "dict", type: "DICT", value: {} }]);\n        return t.dict = Wt2(Gt3, e, r), t;\n      }\n      function qt3(e) {\n        var r = new A4.Record("Top DICT INDEX", [{ name: "topDicts", type: "INDEX", value: [] }]);\n        return r.topDicts = [{ name: "topDict_0", type: "TABLE", value: e }], r;\n      }\n      function ja(e) {\n        var r = new A4.Record("String INDEX", [{ name: "strings", type: "INDEX", value: [] }]);\n        r.strings = [];\n        for (var t = 0; t < e.length; t += 1) r.strings.push({ name: "string_" + t, type: "STRING", value: e[t] });\n        return r;\n      }\n      function $a() {\n        return new A4.Record("Global Subr INDEX", [{ name: "subrs", type: "INDEX", value: [] }]);\n      }\n      function ei2(e, r) {\n        for (var t = new A4.Record("Charsets", [{ name: "format", type: "Card8", value: 0 }]), n11 = 0; n11 < e.length; n11 += 1) {\n          var a2 = e[n11], i5 = zt3(a2, r);\n          t.fields.push({ name: "glyph_" + n11, type: "SID", value: i5 });\n        }\n        return t;\n      }\n      function ri2(e) {\n        var r = [], t = e.path;\n        r.push({ name: "width", type: "NUMBER", value: e.advanceWidth });\n        for (var n11 = 0, a2 = 0, i5 = 0; i5 < t.commands.length; i5 += 1) {\n          var o2 = void 0, l4 = void 0, u3 = t.commands[i5];\n          if (u3.type === "Q") {\n            var c2 = 0.3333333333333333, d3 = 2 / 3;\n            u3 = { type: "C", x: u3.x, y: u3.y, x1: c2 * n11 + d3 * u3.x1, y1: c2 * a2 + d3 * u3.y1, x2: c2 * u3.x + d3 * u3.x1, y2: c2 * u3.y + d3 * u3.y1 };\n          }\n          if (u3.type === "M") o2 = Math.round(u3.x - n11), l4 = Math.round(u3.y - a2), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rmoveto", type: "OP", value: 21 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          else if (u3.type === "L") o2 = Math.round(u3.x - n11), l4 = Math.round(u3.y - a2), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rlineto", type: "OP", value: 5 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          else if (u3.type === "C") {\n            var y5 = Math.round(u3.x1 - n11), g6 = Math.round(u3.y1 - a2), m4 = Math.round(u3.x2 - u3.x1), T4 = Math.round(u3.y2 - u3.y1);\n            o2 = Math.round(u3.x - u3.x2), l4 = Math.round(u3.y - u3.y2), r.push({ name: "dx1", type: "NUMBER", value: y5 }), r.push({ name: "dy1", type: "NUMBER", value: g6 }), r.push({ name: "dx2", type: "NUMBER", value: m4 }), r.push({ name: "dy2", type: "NUMBER", value: T4 }), r.push({ name: "dx", type: "NUMBER", value: o2 }), r.push({ name: "dy", type: "NUMBER", value: l4 }), r.push({ name: "rrcurveto", type: "OP", value: 8 }), n11 = Math.round(u3.x), a2 = Math.round(u3.y);\n          }\n        }\n        return r.push({ name: "endchar", type: "OP", value: 14 }), r;\n      }\n      function ti2(e) {\n        for (var r = new A4.Record("CharStrings INDEX", [{ name: "charStrings", type: "INDEX", value: [] }]), t = 0; t < e.length; t += 1) {\n          var n11 = e.get(t), a2 = ri2(n11);\n          r.charStrings.push({ name: n11.name, type: "CHARSTRING", value: a2 });\n        }\n        return r;\n      }\n      function ni(e, r) {\n        var t = new A4.Record("Private DICT", [{ name: "dict", type: "DICT", value: {} }]);\n        return t.dict = Wt2(Nt4, e, r), t;\n      }\n      function ai2(e, r) {\n        for (var t = new A4.Table("CFF ", [{ name: "header", type: "RECORD" }, { name: "nameIndex", type: "RECORD" }, { name: "topDictIndex", type: "RECORD" }, { name: "stringIndex", type: "RECORD" }, { name: "globalSubrIndex", type: "RECORD" }, { name: "charsets", type: "RECORD" }, { name: "charStringsIndex", type: "RECORD" }, { name: "privateDict", type: "RECORD" }]), n11 = 1 / r.unitsPerEm, a2 = { version: r.version, fullName: r.fullName, familyName: r.familyName, weight: r.weightName, fontBBox: r.fontBBox || [0, 0, 0, 0], fontMatrix: [n11, 0, 0, n11, 0, 0], charset: 999, encoding: 0, charStrings: 999, private: [0, 999] }, i5 = {}, o2 = [], l4, u3 = 1; u3 < e.length; u3 += 1) l4 = e.get(u3), o2.push(l4.name);\n        var c2 = [];\n        t.header = Ja(), t.nameIndex = Ka([r.postScriptName]);\n        var d3 = Vt3(a2, c2);\n        t.topDictIndex = qt3(d3), t.globalSubrIndex = $a(), t.charsets = ei2(o2, c2), t.charStringsIndex = ti2(e), t.privateDict = ni(i5, c2), t.stringIndex = ja(c2);\n        var y5 = t.header.sizeOf() + t.nameIndex.sizeOf() + t.topDictIndex.sizeOf() + t.stringIndex.sizeOf() + t.globalSubrIndex.sizeOf();\n        return a2.charset = y5, a2.encoding = 0, a2.charStrings = a2.charset + t.charsets.sizeOf(), a2.private[1] = a2.charStrings + t.charStringsIndex.sizeOf(), d3 = Vt3(a2, c2), t.topDictIndex = qt3(d3), t;\n      }\n      var Xt3 = { parse: Qa, make: ai2 };\n      function ii2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.fontRevision = Math.round(n11.parseFixed() * 1e3) / 1e3, t.checkSumAdjustment = n11.parseULong(), t.magicNumber = n11.parseULong(), G5.argument(t.magicNumber === 1594834165, "Font header has wrong magic number."), t.flags = n11.parseUShort(), t.unitsPerEm = n11.parseUShort(), t.created = n11.parseLongDateTime(), t.modified = n11.parseLongDateTime(), t.xMin = n11.parseShort(), t.yMin = n11.parseShort(), t.xMax = n11.parseShort(), t.yMax = n11.parseShort(), t.macStyle = n11.parseUShort(), t.lowestRecPPEM = n11.parseUShort(), t.fontDirectionHint = n11.parseShort(), t.indexToLocFormat = n11.parseShort(), t.glyphDataFormat = n11.parseShort(), t;\n      }\n      function si2(e) {\n        var r = Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3) + 2082844800, t = r;\n        return e.createdTimestamp && (t = e.createdTimestamp + 2082844800), new A4.Table("head", [{ name: "version", type: "FIXED", value: 65536 }, { name: "fontRevision", type: "FIXED", value: 65536 }, { name: "checkSumAdjustment", type: "ULONG", value: 0 }, { name: "magicNumber", type: "ULONG", value: 1594834165 }, { name: "flags", type: "USHORT", value: 0 }, { name: "unitsPerEm", type: "USHORT", value: 1e3 }, { name: "created", type: "LONGDATETIME", value: t }, { name: "modified", type: "LONGDATETIME", value: r }, { name: "xMin", type: "SHORT", value: 0 }, { name: "yMin", type: "SHORT", value: 0 }, { name: "xMax", type: "SHORT", value: 0 }, { name: "yMax", type: "SHORT", value: 0 }, { name: "macStyle", type: "USHORT", value: 0 }, { name: "lowestRecPPEM", type: "USHORT", value: 0 }, { name: "fontDirectionHint", type: "SHORT", value: 2 }, { name: "indexToLocFormat", type: "SHORT", value: 0 }, { name: "glyphDataFormat", type: "SHORT", value: 0 }], e);\n      }\n      var Yt3 = { parse: ii2, make: si2 };\n      function oi2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.ascender = n11.parseShort(), t.descender = n11.parseShort(), t.lineGap = n11.parseShort(), t.advanceWidthMax = n11.parseUShort(), t.minLeftSideBearing = n11.parseShort(), t.minRightSideBearing = n11.parseShort(), t.xMaxExtent = n11.parseShort(), t.caretSlopeRise = n11.parseShort(), t.caretSlopeRun = n11.parseShort(), t.caretOffset = n11.parseShort(), n11.relativeOffset += 8, t.metricDataFormat = n11.parseShort(), t.numberOfHMetrics = n11.parseUShort(), t;\n      }\n      function ui2(e) {\n        return new A4.Table("hhea", [{ name: "version", type: "FIXED", value: 65536 }, { name: "ascender", type: "FWORD", value: 0 }, { name: "descender", type: "FWORD", value: 0 }, { name: "lineGap", type: "FWORD", value: 0 }, { name: "advanceWidthMax", type: "UFWORD", value: 0 }, { name: "minLeftSideBearing", type: "FWORD", value: 0 }, { name: "minRightSideBearing", type: "FWORD", value: 0 }, { name: "xMaxExtent", type: "FWORD", value: 0 }, { name: "caretSlopeRise", type: "SHORT", value: 1 }, { name: "caretSlopeRun", type: "SHORT", value: 0 }, { name: "caretOffset", type: "SHORT", value: 0 }, { name: "reserved1", type: "SHORT", value: 0 }, { name: "reserved2", type: "SHORT", value: 0 }, { name: "reserved3", type: "SHORT", value: 0 }, { name: "reserved4", type: "SHORT", value: 0 }, { name: "metricDataFormat", type: "SHORT", value: 0 }, { name: "numberOfHMetrics", type: "USHORT", value: 0 }], e);\n      }\n      var Zt3 = { parse: oi2, make: ui2 };\n      function li2(e, r, t, n11, a2) {\n        for (var i5, o2, l4 = new w6.Parser(e, r), u3 = 0; u3 < n11; u3 += 1) {\n          u3 < t && (i5 = l4.parseUShort(), o2 = l4.parseShort());\n          var c2 = a2.get(u3);\n          c2.advanceWidth = i5, c2.leftSideBearing = o2;\n        }\n      }\n      function fi2(e) {\n        for (var r = new A4.Table("hmtx", []), t = 0; t < e.length; t += 1) {\n          var n11 = e.get(t), a2 = n11.advanceWidth || 0, i5 = n11.leftSideBearing || 0;\n          r.fields.push({ name: "advanceWidth_" + t, type: "USHORT", value: a2 }), r.fields.push({ name: "leftSideBearing_" + t, type: "SHORT", value: i5 });\n        }\n        return r;\n      }\n      var Qt3 = { parse: li2, make: fi2 };\n      function pi2(e) {\n        for (var r = new A4.Table("ltag", [{ name: "version", type: "ULONG", value: 1 }, { name: "flags", type: "ULONG", value: 0 }, { name: "numTags", type: "ULONG", value: e.length }]), t = "", n11 = 12 + e.length * 4, a2 = 0; a2 < e.length; ++a2) {\n          var i5 = t.indexOf(e[a2]);\n          i5 < 0 && (i5 = t.length, t += e[a2]), r.fields.push({ name: "offset " + a2, type: "USHORT", value: n11 + i5 }), r.fields.push({ name: "length " + a2, type: "USHORT", value: e[a2].length });\n        }\n        return r.fields.push({ name: "stringPool", type: "CHARARRAY", value: t }), r;\n      }\n      function hi2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseULong();\n        G5.argument(n11 === 1, "Unsupported ltag table version."), t.skip("uLong", 1);\n        for (var a2 = t.parseULong(), i5 = [], o2 = 0; o2 < a2; o2++) {\n          for (var l4 = "", u3 = r + t.parseUShort(), c2 = t.parseUShort(), d3 = u3; d3 < u3 + c2; ++d3) l4 += String.fromCharCode(e.getInt8(d3));\n          i5.push(l4);\n        }\n        return i5;\n      }\n      var Jt2 = { make: pi2, parse: hi2 };\n      function ci2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        return t.version = n11.parseVersion(), t.numGlyphs = n11.parseUShort(), t.version === 1 && (t.maxPoints = n11.parseUShort(), t.maxContours = n11.parseUShort(), t.maxCompositePoints = n11.parseUShort(), t.maxCompositeContours = n11.parseUShort(), t.maxZones = n11.parseUShort(), t.maxTwilightPoints = n11.parseUShort(), t.maxStorage = n11.parseUShort(), t.maxFunctionDefs = n11.parseUShort(), t.maxInstructionDefs = n11.parseUShort(), t.maxStackElements = n11.parseUShort(), t.maxSizeOfInstructions = n11.parseUShort(), t.maxComponentElements = n11.parseUShort(), t.maxComponentDepth = n11.parseUShort()), t;\n      }\n      function vi(e) {\n        return new A4.Table("maxp", [{ name: "version", type: "FIXED", value: 20480 }, { name: "numGlyphs", type: "USHORT", value: e }]);\n      }\n      var Kt2 = { parse: ci2, make: vi }, jt2 = ["copyright", "fontFamily", "fontSubfamily", "uniqueID", "fullName", "version", "postScriptName", "trademark", "manufacturer", "designer", "description", "manufacturerURL", "designerURL", "license", "licenseURL", "reserved", "preferredFamily", "preferredSubfamily", "compatibleFullName", "sampleText", "postScriptFindFontName", "wwsFamily", "wwsSubfamily"], $t3 = { 0: "en", 1: "fr", 2: "de", 3: "it", 4: "nl", 5: "sv", 6: "es", 7: "da", 8: "pt", 9: "no", 10: "he", 11: "ja", 12: "ar", 13: "fi", 14: "el", 15: "is", 16: "mt", 17: "tr", 18: "hr", 19: "zh-Hant", 20: "ur", 21: "hi", 22: "th", 23: "ko", 24: "lt", 25: "pl", 26: "hu", 27: "es", 28: "lv", 29: "se", 30: "fo", 31: "fa", 32: "ru", 33: "zh", 34: "nl-BE", 35: "ga", 36: "sq", 37: "ro", 38: "cz", 39: "sk", 40: "si", 41: "yi", 42: "sr", 43: "mk", 44: "bg", 45: "uk", 46: "be", 47: "uz", 48: "kk", 49: "az-Cyrl", 50: "az-Arab", 51: "hy", 52: "ka", 53: "mo", 54: "ky", 55: "tg", 56: "tk", 57: "mn-CN", 58: "mn", 59: "ps", 60: "ks", 61: "ku", 62: "sd", 63: "bo", 64: "ne", 65: "sa", 66: "mr", 67: "bn", 68: "as", 69: "gu", 70: "pa", 71: "or", 72: "ml", 73: "kn", 74: "ta", 75: "te", 76: "si", 77: "my", 78: "km", 79: "lo", 80: "vi", 81: "id", 82: "tl", 83: "ms", 84: "ms-Arab", 85: "am", 86: "ti", 87: "om", 88: "so", 89: "sw", 90: "rw", 91: "rn", 92: "ny", 93: "mg", 94: "eo", 128: "cy", 129: "eu", 130: "ca", 131: "la", 132: "qu", 133: "gn", 134: "ay", 135: "tt", 136: "ug", 137: "dz", 138: "jv", 139: "su", 140: "gl", 141: "af", 142: "br", 143: "iu", 144: "gd", 145: "gv", 146: "ga", 147: "to", 148: "el-polyton", 149: "kl", 150: "az", 151: "nn" }, di2 = { 0: 0, 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0, 9: 0, 10: 5, 11: 1, 12: 4, 13: 0, 14: 6, 15: 0, 16: 0, 17: 0, 18: 0, 19: 2, 20: 4, 21: 9, 22: 21, 23: 3, 24: 29, 25: 29, 26: 29, 27: 29, 28: 29, 29: 0, 30: 0, 31: 4, 32: 7, 33: 25, 34: 0, 35: 0, 36: 0, 37: 0, 38: 29, 39: 29, 40: 0, 41: 5, 42: 7, 43: 7, 44: 7, 45: 7, 46: 7, 47: 7, 48: 7, 49: 7, 50: 4, 51: 24, 52: 23, 53: 7, 54: 7, 55: 7, 56: 7, 57: 27, 58: 7, 59: 4, 60: 4, 61: 4, 62: 4, 63: 26, 64: 9, 65: 9, 66: 9, 67: 13, 68: 13, 69: 11, 70: 10, 71: 12, 72: 17, 73: 16, 74: 14, 75: 15, 76: 18, 77: 19, 78: 20, 79: 22, 80: 30, 81: 0, 82: 0, 83: 0, 84: 4, 85: 28, 86: 28, 87: 28, 88: 0, 89: 0, 90: 0, 91: 0, 92: 0, 93: 0, 94: 0, 128: 0, 129: 0, 130: 0, 131: 0, 132: 0, 133: 0, 134: 0, 135: 7, 136: 4, 137: 26, 138: 0, 139: 0, 140: 0, 141: 0, 142: 0, 143: 28, 144: 0, 145: 0, 146: 0, 147: 0, 148: 6, 149: 0, 150: 0, 151: 0 }, en2 = { 1078: "af", 1052: "sq", 1156: "gsw", 1118: "am", 5121: "ar-DZ", 15361: "ar-BH", 3073: "ar", 2049: "ar-IQ", 11265: "ar-JO", 13313: "ar-KW", 12289: "ar-LB", 4097: "ar-LY", 6145: "ary", 8193: "ar-OM", 16385: "ar-QA", 1025: "ar-SA", 10241: "ar-SY", 7169: "aeb", 14337: "ar-AE", 9217: "ar-YE", 1067: "hy", 1101: "as", 2092: "az-Cyrl", 1068: "az", 1133: "ba", 1069: "eu", 1059: "be", 2117: "bn", 1093: "bn-IN", 8218: "bs-Cyrl", 5146: "bs", 1150: "br", 1026: "bg", 1027: "ca", 3076: "zh-HK", 5124: "zh-MO", 2052: "zh", 4100: "zh-SG", 1028: "zh-TW", 1155: "co", 1050: "hr", 4122: "hr-BA", 1029: "cs", 1030: "da", 1164: "prs", 1125: "dv", 2067: "nl-BE", 1043: "nl", 3081: "en-AU", 10249: "en-BZ", 4105: "en-CA", 9225: "en-029", 16393: "en-IN", 6153: "en-IE", 8201: "en-JM", 17417: "en-MY", 5129: "en-NZ", 13321: "en-PH", 18441: "en-SG", 7177: "en-ZA", 11273: "en-TT", 2057: "en-GB", 1033: "en", 12297: "en-ZW", 1061: "et", 1080: "fo", 1124: "fil", 1035: "fi", 2060: "fr-BE", 3084: "fr-CA", 1036: "fr", 5132: "fr-LU", 6156: "fr-MC", 4108: "fr-CH", 1122: "fy", 1110: "gl", 1079: "ka", 3079: "de-AT", 1031: "de", 5127: "de-LI", 4103: "de-LU", 2055: "de-CH", 1032: "el", 1135: "kl", 1095: "gu", 1128: "ha", 1037: "he", 1081: "hi", 1038: "hu", 1039: "is", 1136: "ig", 1057: "id", 1117: "iu", 2141: "iu-Latn", 2108: "ga", 1076: "xh", 1077: "zu", 1040: "it", 2064: "it-CH", 1041: "ja", 1099: "kn", 1087: "kk", 1107: "km", 1158: "quc", 1159: "rw", 1089: "sw", 1111: "kok", 1042: "ko", 1088: "ky", 1108: "lo", 1062: "lv", 1063: "lt", 2094: "dsb", 1134: "lb", 1071: "mk", 2110: "ms-BN", 1086: "ms", 1100: "ml", 1082: "mt", 1153: "mi", 1146: "arn", 1102: "mr", 1148: "moh", 1104: "mn", 2128: "mn-CN", 1121: "ne", 1044: "nb", 2068: "nn", 1154: "oc", 1096: "or", 1123: "ps", 1045: "pl", 1046: "pt", 2070: "pt-PT", 1094: "pa", 1131: "qu-BO", 2155: "qu-EC", 3179: "qu", 1048: "ro", 1047: "rm", 1049: "ru", 9275: "smn", 4155: "smj-NO", 5179: "smj", 3131: "se-FI", 1083: "se", 2107: "se-SE", 8251: "sms", 6203: "sma-NO", 7227: "sms", 1103: "sa", 7194: "sr-Cyrl-BA", 3098: "sr", 6170: "sr-Latn-BA", 2074: "sr-Latn", 1132: "nso", 1074: "tn", 1115: "si", 1051: "sk", 1060: "sl", 11274: "es-AR", 16394: "es-BO", 13322: "es-CL", 9226: "es-CO", 5130: "es-CR", 7178: "es-DO", 12298: "es-EC", 17418: "es-SV", 4106: "es-GT", 18442: "es-HN", 2058: "es-MX", 19466: "es-NI", 6154: "es-PA", 15370: "es-PY", 10250: "es-PE", 20490: "es-PR", 3082: "es", 1034: "es", 21514: "es-US", 14346: "es-UY", 8202: "es-VE", 2077: "sv-FI", 1053: "sv", 1114: "syr", 1064: "tg", 2143: "tzm", 1097: "ta", 1092: "tt", 1098: "te", 1054: "th", 1105: "bo", 1055: "tr", 1090: "tk", 1152: "ug", 1058: "uk", 1070: "hsb", 1056: "ur", 2115: "uz-Cyrl", 1091: "uz", 1066: "vi", 1106: "cy", 1160: "wo", 1157: "sah", 1144: "ii", 1130: "yo" };\n      function gi2(e, r, t) {\n        switch (e) {\n          case 0:\n            if (r === 65535) return "und";\n            if (t) return t[r];\n            break;\n          case 1:\n            return $t3[r];\n          case 3:\n            return en2[r];\n        }\n      }\n      var Wr2 = "utf-16", mi = { 0: "macintosh", 1: "x-mac-japanese", 2: "x-mac-chinesetrad", 3: "x-mac-korean", 6: "x-mac-greek", 7: "x-mac-cyrillic", 9: "x-mac-devanagai", 10: "x-mac-gurmukhi", 11: "x-mac-gujarati", 12: "x-mac-oriya", 13: "x-mac-bengali", 14: "x-mac-tamil", 15: "x-mac-telugu", 16: "x-mac-kannada", 17: "x-mac-malayalam", 18: "x-mac-sinhalese", 19: "x-mac-burmese", 20: "x-mac-khmer", 21: "x-mac-thai", 22: "x-mac-lao", 23: "x-mac-georgian", 24: "x-mac-armenian", 25: "x-mac-chinesesimp", 26: "x-mac-tibetan", 27: "x-mac-mongolian", 28: "x-mac-ethiopic", 29: "x-mac-ce", 30: "x-mac-vietnamese", 31: "x-mac-extarabic" }, yi2 = { 15: "x-mac-icelandic", 17: "x-mac-turkish", 18: "x-mac-croatian", 24: "x-mac-ce", 25: "x-mac-ce", 26: "x-mac-ce", 27: "x-mac-ce", 28: "x-mac-ce", 30: "x-mac-icelandic", 37: "x-mac-romanian", 38: "x-mac-ce", 39: "x-mac-ce", 40: "x-mac-ce", 143: "x-mac-inuit", 146: "x-mac-gaelic" };\n      function rn2(e, r, t) {\n        switch (e) {\n          case 0:\n            return Wr2;\n          case 1:\n            return yi2[t] || mi[r];\n          case 3:\n            if (r === 1 || r === 10) return Wr2;\n            break;\n        }\n      }\n      function bi(e, r, t) {\n        for (var n11 = {}, a2 = new w6.Parser(e, r), i5 = a2.parseUShort(), o2 = a2.parseUShort(), l4 = a2.offset + a2.parseUShort(), u3 = 0; u3 < o2; u3++) {\n          var c2 = a2.parseUShort(), d3 = a2.parseUShort(), y5 = a2.parseUShort(), g6 = a2.parseUShort(), m4 = jt2[g6] || g6, T4 = a2.parseUShort(), O4 = a2.parseUShort(), F4 = gi2(c2, y5, t), U6 = rn2(c2, d3, y5);\n          if (U6 !== void 0 && F4 !== void 0) {\n            var P5 = void 0;\n            if (U6 === Wr2 ? P5 = Ve3.UTF16(e, l4 + O4, T4) : P5 = Ve3.MACSTRING(e, l4 + O4, T4, U6), P5) {\n              var I4 = n11[m4];\n              I4 === void 0 && (I4 = n11[m4] = {}), I4[F4] = P5;\n            }\n          }\n        }\n        var H5 = 0;\n        return i5 === 1 && (H5 = a2.parseUShort()), n11;\n      }\n      function Vr2(e) {\n        var r = {};\n        for (var t in e) r[e[t]] = parseInt(t);\n        return r;\n      }\n      function tn2(e, r, t, n11, a2, i5) {\n        return new A4.Record("NameRecord", [{ name: "platformID", type: "USHORT", value: e }, { name: "encodingID", type: "USHORT", value: r }, { name: "languageID", type: "USHORT", value: t }, { name: "nameID", type: "USHORT", value: n11 }, { name: "length", type: "USHORT", value: a2 }, { name: "offset", type: "USHORT", value: i5 }]);\n      }\n      function xi2(e, r) {\n        var t = e.length, n11 = r.length - t + 1;\n        e: for (var a2 = 0; a2 < n11; a2++) for (; a2 < n11; a2++) {\n          for (var i5 = 0; i5 < t; i5++) if (r[a2 + i5] !== e[i5]) continue e;\n          return a2;\n        }\n        return -1;\n      }\n      function nn(e, r) {\n        var t = xi2(e, r);\n        if (t < 0) {\n          t = r.length;\n          for (var n11 = 0, a2 = e.length; n11 < a2; ++n11) r.push(e[n11]);\n        }\n        return t;\n      }\n      function Si2(e, r) {\n        var t, n11 = [], a2 = {}, i5 = Vr2(jt2);\n        for (var o2 in e) {\n          var l4 = i5[o2];\n          if (l4 === void 0 && (l4 = o2), t = parseInt(l4), isNaN(t)) throw new Error(\'Name table entry "\' + o2 + \'" does not exist, see nameTableNames for complete list.\');\n          a2[t] = e[o2], n11.push(t);\n        }\n        for (var u3 = Vr2($t3), c2 = Vr2(en2), d3 = [], y5 = [], g6 = 0; g6 < n11.length; g6++) {\n          t = n11[g6];\n          var m4 = a2[t];\n          for (var T4 in m4) {\n            var O4 = m4[T4], F4 = 1, U6 = u3[T4], P5 = di2[U6], I4 = rn2(F4, P5, U6), H5 = E5.MACSTRING(O4, I4);\n            H5 === void 0 && (F4 = 0, U6 = r.indexOf(T4), U6 < 0 && (U6 = r.length, r.push(T4)), P5 = 4, H5 = E5.UTF16(O4));\n            var R4 = nn(H5, y5);\n            d3.push(tn2(F4, P5, U6, t, H5.length, R4));\n            var B5 = c2[T4];\n            if (B5 !== void 0) {\n              var ue2 = E5.UTF16(O4), q3 = nn(ue2, y5);\n              d3.push(tn2(3, 1, B5, t, ue2.length, q3));\n            }\n          }\n        }\n        d3.sort(function(le3, pe2) {\n          return le3.platformID - pe2.platformID || le3.encodingID - pe2.encodingID || le3.languageID - pe2.languageID || le3.nameID - pe2.nameID;\n        });\n        for (var K4 = new A4.Table("name", [{ name: "format", type: "USHORT", value: 0 }, { name: "count", type: "USHORT", value: d3.length }, { name: "stringOffset", type: "USHORT", value: 6 + d3.length * 12 }]), se3 = 0; se3 < d3.length; se3++) K4.fields.push({ name: "record_" + se3, type: "RECORD", value: d3[se3] });\n        return K4.fields.push({ name: "strings", type: "LITERAL", value: y5 }), K4;\n      }\n      var an2 = { parse: bi, make: Si2 }, qr2 = [{ begin: 0, end: 127 }, { begin: 128, end: 255 }, { begin: 256, end: 383 }, { begin: 384, end: 591 }, { begin: 592, end: 687 }, { begin: 688, end: 767 }, { begin: 768, end: 879 }, { begin: 880, end: 1023 }, { begin: 11392, end: 11519 }, { begin: 1024, end: 1279 }, { begin: 1328, end: 1423 }, { begin: 1424, end: 1535 }, { begin: 42240, end: 42559 }, { begin: 1536, end: 1791 }, { begin: 1984, end: 2047 }, { begin: 2304, end: 2431 }, { begin: 2432, end: 2559 }, { begin: 2560, end: 2687 }, { begin: 2688, end: 2815 }, { begin: 2816, end: 2943 }, { begin: 2944, end: 3071 }, { begin: 3072, end: 3199 }, { begin: 3200, end: 3327 }, { begin: 3328, end: 3455 }, { begin: 3584, end: 3711 }, { begin: 3712, end: 3839 }, { begin: 4256, end: 4351 }, { begin: 6912, end: 7039 }, { begin: 4352, end: 4607 }, { begin: 7680, end: 7935 }, { begin: 7936, end: 8191 }, { begin: 8192, end: 8303 }, { begin: 8304, end: 8351 }, { begin: 8352, end: 8399 }, { begin: 8400, end: 8447 }, { begin: 8448, end: 8527 }, { begin: 8528, end: 8591 }, { begin: 8592, end: 8703 }, { begin: 8704, end: 8959 }, { begin: 8960, end: 9215 }, { begin: 9216, end: 9279 }, { begin: 9280, end: 9311 }, { begin: 9312, end: 9471 }, { begin: 9472, end: 9599 }, { begin: 9600, end: 9631 }, { begin: 9632, end: 9727 }, { begin: 9728, end: 9983 }, { begin: 9984, end: 10175 }, { begin: 12288, end: 12351 }, { begin: 12352, end: 12447 }, { begin: 12448, end: 12543 }, { begin: 12544, end: 12591 }, { begin: 12592, end: 12687 }, { begin: 43072, end: 43135 }, { begin: 12800, end: 13055 }, { begin: 13056, end: 13311 }, { begin: 44032, end: 55215 }, { begin: 55296, end: 57343 }, { begin: 67840, end: 67871 }, { begin: 19968, end: 40959 }, { begin: 57344, end: 63743 }, { begin: 12736, end: 12783 }, { begin: 64256, end: 64335 }, { begin: 64336, end: 65023 }, { begin: 65056, end: 65071 }, { begin: 65040, end: 65055 }, { begin: 65104, end: 65135 }, { begin: 65136, end: 65279 }, { begin: 65280, end: 65519 }, { begin: 65520, end: 65535 }, { begin: 3840, end: 4095 }, { begin: 1792, end: 1871 }, { begin: 1920, end: 1983 }, { begin: 3456, end: 3583 }, { begin: 4096, end: 4255 }, { begin: 4608, end: 4991 }, { begin: 5024, end: 5119 }, { begin: 5120, end: 5759 }, { begin: 5760, end: 5791 }, { begin: 5792, end: 5887 }, { begin: 6016, end: 6143 }, { begin: 6144, end: 6319 }, { begin: 10240, end: 10495 }, { begin: 40960, end: 42127 }, { begin: 5888, end: 5919 }, { begin: 66304, end: 66351 }, { begin: 66352, end: 66383 }, { begin: 66560, end: 66639 }, { begin: 118784, end: 119039 }, { begin: 119808, end: 120831 }, { begin: 1044480, end: 1048573 }, { begin: 65024, end: 65039 }, { begin: 917504, end: 917631 }, { begin: 6400, end: 6479 }, { begin: 6480, end: 6527 }, { begin: 6528, end: 6623 }, { begin: 6656, end: 6687 }, { begin: 11264, end: 11359 }, { begin: 11568, end: 11647 }, { begin: 19904, end: 19967 }, { begin: 43008, end: 43055 }, { begin: 65536, end: 65663 }, { begin: 65856, end: 65935 }, { begin: 66432, end: 66463 }, { begin: 66464, end: 66527 }, { begin: 66640, end: 66687 }, { begin: 66688, end: 66735 }, { begin: 67584, end: 67647 }, { begin: 68096, end: 68191 }, { begin: 119552, end: 119647 }, { begin: 73728, end: 74751 }, { begin: 119648, end: 119679 }, { begin: 7040, end: 7103 }, { begin: 7168, end: 7247 }, { begin: 7248, end: 7295 }, { begin: 43136, end: 43231 }, { begin: 43264, end: 43311 }, { begin: 43312, end: 43359 }, { begin: 43520, end: 43615 }, { begin: 65936, end: 65999 }, { begin: 66e3, end: 66047 }, { begin: 66208, end: 66271 }, { begin: 127024, end: 127135 }];\n      function Ti2(e) {\n        for (var r = 0; r < qr2.length; r += 1) {\n          var t = qr2[r];\n          if (e >= t.begin && e < t.end) return r;\n        }\n        return -1;\n      }\n      function ki(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        t.version = n11.parseUShort(), t.xAvgCharWidth = n11.parseShort(), t.usWeightClass = n11.parseUShort(), t.usWidthClass = n11.parseUShort(), t.fsType = n11.parseUShort(), t.ySubscriptXSize = n11.parseShort(), t.ySubscriptYSize = n11.parseShort(), t.ySubscriptXOffset = n11.parseShort(), t.ySubscriptYOffset = n11.parseShort(), t.ySuperscriptXSize = n11.parseShort(), t.ySuperscriptYSize = n11.parseShort(), t.ySuperscriptXOffset = n11.parseShort(), t.ySuperscriptYOffset = n11.parseShort(), t.yStrikeoutSize = n11.parseShort(), t.yStrikeoutPosition = n11.parseShort(), t.sFamilyClass = n11.parseShort(), t.panose = [];\n        for (var a2 = 0; a2 < 10; a2++) t.panose[a2] = n11.parseByte();\n        return t.ulUnicodeRange1 = n11.parseULong(), t.ulUnicodeRange2 = n11.parseULong(), t.ulUnicodeRange3 = n11.parseULong(), t.ulUnicodeRange4 = n11.parseULong(), t.achVendID = String.fromCharCode(n11.parseByte(), n11.parseByte(), n11.parseByte(), n11.parseByte()), t.fsSelection = n11.parseUShort(), t.usFirstCharIndex = n11.parseUShort(), t.usLastCharIndex = n11.parseUShort(), t.sTypoAscender = n11.parseShort(), t.sTypoDescender = n11.parseShort(), t.sTypoLineGap = n11.parseShort(), t.usWinAscent = n11.parseUShort(), t.usWinDescent = n11.parseUShort(), t.version >= 1 && (t.ulCodePageRange1 = n11.parseULong(), t.ulCodePageRange2 = n11.parseULong()), t.version >= 2 && (t.sxHeight = n11.parseShort(), t.sCapHeight = n11.parseShort(), t.usDefaultChar = n11.parseUShort(), t.usBreakChar = n11.parseUShort(), t.usMaxContent = n11.parseUShort()), t;\n      }\n      function Fi2(e) {\n        return new A4.Table("OS/2", [{ name: "version", type: "USHORT", value: 3 }, { name: "xAvgCharWidth", type: "SHORT", value: 0 }, { name: "usWeightClass", type: "USHORT", value: 0 }, { name: "usWidthClass", type: "USHORT", value: 0 }, { name: "fsType", type: "USHORT", value: 0 }, { name: "ySubscriptXSize", type: "SHORT", value: 650 }, { name: "ySubscriptYSize", type: "SHORT", value: 699 }, { name: "ySubscriptXOffset", type: "SHORT", value: 0 }, { name: "ySubscriptYOffset", type: "SHORT", value: 140 }, { name: "ySuperscriptXSize", type: "SHORT", value: 650 }, { name: "ySuperscriptYSize", type: "SHORT", value: 699 }, { name: "ySuperscriptXOffset", type: "SHORT", value: 0 }, { name: "ySuperscriptYOffset", type: "SHORT", value: 479 }, { name: "yStrikeoutSize", type: "SHORT", value: 49 }, { name: "yStrikeoutPosition", type: "SHORT", value: 258 }, { name: "sFamilyClass", type: "SHORT", value: 0 }, { name: "bFamilyType", type: "BYTE", value: 0 }, { name: "bSerifStyle", type: "BYTE", value: 0 }, { name: "bWeight", type: "BYTE", value: 0 }, { name: "bProportion", type: "BYTE", value: 0 }, { name: "bContrast", type: "BYTE", value: 0 }, { name: "bStrokeVariation", type: "BYTE", value: 0 }, { name: "bArmStyle", type: "BYTE", value: 0 }, { name: "bLetterform", type: "BYTE", value: 0 }, { name: "bMidline", type: "BYTE", value: 0 }, { name: "bXHeight", type: "BYTE", value: 0 }, { name: "ulUnicodeRange1", type: "ULONG", value: 0 }, { name: "ulUnicodeRange2", type: "ULONG", value: 0 }, { name: "ulUnicodeRange3", type: "ULONG", value: 0 }, { name: "ulUnicodeRange4", type: "ULONG", value: 0 }, { name: "achVendID", type: "CHARARRAY", value: "XXXX" }, { name: "fsSelection", type: "USHORT", value: 0 }, { name: "usFirstCharIndex", type: "USHORT", value: 0 }, { name: "usLastCharIndex", type: "USHORT", value: 0 }, { name: "sTypoAscender", type: "SHORT", value: 0 }, { name: "sTypoDescender", type: "SHORT", value: 0 }, { name: "sTypoLineGap", type: "SHORT", value: 0 }, { name: "usWinAscent", type: "USHORT", value: 0 }, { name: "usWinDescent", type: "USHORT", value: 0 }, { name: "ulCodePageRange1", type: "ULONG", value: 0 }, { name: "ulCodePageRange2", type: "ULONG", value: 0 }, { name: "sxHeight", type: "SHORT", value: 0 }, { name: "sCapHeight", type: "SHORT", value: 0 }, { name: "usDefaultChar", type: "USHORT", value: 0 }, { name: "usBreakChar", type: "USHORT", value: 0 }, { name: "usMaxContext", type: "USHORT", value: 0 }], e);\n      }\n      var Xr2 = { parse: ki, make: Fi2, unicodeRanges: qr2, getUnicodeRange: Ti2 };\n      function Li2(e, r) {\n        var t = {}, n11 = new w6.Parser(e, r);\n        switch (t.version = n11.parseVersion(), t.italicAngle = n11.parseFixed(), t.underlinePosition = n11.parseShort(), t.underlineThickness = n11.parseShort(), t.isFixedPitch = n11.parseULong(), t.minMemType42 = n11.parseULong(), t.maxMemType42 = n11.parseULong(), t.minMemType1 = n11.parseULong(), t.maxMemType1 = n11.parseULong(), t.version) {\n          case 1:\n            t.names = Me3.slice();\n            break;\n          case 2:\n            t.numberOfGlyphs = n11.parseUShort(), t.glyphNameIndex = new Array(t.numberOfGlyphs);\n            for (var a2 = 0; a2 < t.numberOfGlyphs; a2++) t.glyphNameIndex[a2] = n11.parseUShort();\n            t.names = [];\n            for (var i5 = 0; i5 < t.numberOfGlyphs; i5++) if (t.glyphNameIndex[i5] >= Me3.length) {\n              var o2 = n11.parseChar();\n              t.names.push(n11.parseString(o2));\n            }\n            break;\n          case 2.5:\n            t.numberOfGlyphs = n11.parseUShort(), t.offset = new Array(t.numberOfGlyphs);\n            for (var l4 = 0; l4 < t.numberOfGlyphs; l4++) t.offset[l4] = n11.parseChar();\n            break;\n        }\n        return t;\n      }\n      function Ei2() {\n        return new A4.Table("post", [{ name: "version", type: "FIXED", value: 196608 }, { name: "italicAngle", type: "FIXED", value: 0 }, { name: "underlinePosition", type: "FWORD", value: 0 }, { name: "underlineThickness", type: "FWORD", value: 0 }, { name: "isFixedPitch", type: "ULONG", value: 0 }, { name: "minMemType42", type: "ULONG", value: 0 }, { name: "maxMemType42", type: "ULONG", value: 0 }, { name: "minMemType1", type: "ULONG", value: 0 }, { name: "maxMemType1", type: "ULONG", value: 0 }]);\n      }\n      var sn2 = { parse: Li2, make: Ei2 }, me4 = new Array(9);\n      me4[1] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: 1, coverage: this.parsePointer(b4.coverage), deltaGlyphId: this.parseUShort() };\n        if (t === 2) return { substFormat: 2, coverage: this.parsePointer(b4.coverage), substitute: this.parseOffset16List() };\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 1 format must be 1 or 2.");\n      }, me4[2] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Multiple Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), sequences: this.parseListOfLists() };\n      }, me4[3] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Alternate Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), alternateSets: this.parseListOfLists() };\n      }, me4[4] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB ligature table identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), ligatureSets: this.parseListOfLists(function() {\n          return { ligGlyph: this.parseUShort(), components: this.parseUShortList(this.parseUShort() - 1) };\n        }) };\n      };\n      var Xe3 = { sequenceIndex: b4.uShort, lookupListIndex: b4.uShort };\n      me4[5] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: t, coverage: this.parsePointer(b4.coverage), ruleSets: this.parseListOfLists(function() {\n          var i5 = this.parseUShort(), o2 = this.parseUShort();\n          return { input: this.parseUShortList(i5 - 1), lookupRecords: this.parseRecordList(o2, Xe3) };\n        }) };\n        if (t === 2) return { substFormat: t, coverage: this.parsePointer(b4.coverage), classDef: this.parsePointer(b4.classDef), classSets: this.parseListOfLists(function() {\n          var i5 = this.parseUShort(), o2 = this.parseUShort();\n          return { classes: this.parseUShortList(i5 - 1), lookupRecords: this.parseRecordList(o2, Xe3) };\n        }) };\n        if (t === 3) {\n          var n11 = this.parseUShort(), a2 = this.parseUShort();\n          return { substFormat: t, coverages: this.parseList(n11, b4.pointer(b4.coverage)), lookupRecords: this.parseRecordList(a2, Xe3) };\n        }\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 5 format must be 1, 2 or 3.");\n      }, me4[6] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { substFormat: 1, coverage: this.parsePointer(b4.coverage), chainRuleSets: this.parseListOfLists(function() {\n          return { backtrack: this.parseUShortList(), input: this.parseUShortList(this.parseShort() - 1), lookahead: this.parseUShortList(), lookupRecords: this.parseRecordList(Xe3) };\n        }) };\n        if (t === 2) return { substFormat: 2, coverage: this.parsePointer(b4.coverage), backtrackClassDef: this.parsePointer(b4.classDef), inputClassDef: this.parsePointer(b4.classDef), lookaheadClassDef: this.parsePointer(b4.classDef), chainClassSet: this.parseListOfLists(function() {\n          return { backtrack: this.parseUShortList(), input: this.parseUShortList(this.parseShort() - 1), lookahead: this.parseUShortList(), lookupRecords: this.parseRecordList(Xe3) };\n        }) };\n        if (t === 3) return { substFormat: 3, backtrackCoverage: this.parseList(b4.pointer(b4.coverage)), inputCoverage: this.parseList(b4.pointer(b4.coverage)), lookaheadCoverage: this.parseList(b4.pointer(b4.coverage)), lookupRecords: this.parseRecordList(Xe3) };\n        G5.assert(false, "0x" + r.toString(16) + ": lookup type 6 format must be 1, 2 or 3.");\n      }, me4[7] = function() {\n        var r = this.parseUShort();\n        G5.argument(r === 1, "GSUB Extension Substitution subtable identifier-format must be 1");\n        var t = this.parseUShort(), n11 = new b4(this.data, this.offset + this.parseULong());\n        return { substFormat: 1, lookupType: t, extension: me4[t].call(n11) };\n      }, me4[8] = function() {\n        var r = this.parseUShort();\n        return G5.argument(r === 1, "GSUB Reverse Chaining Contextual Single Substitution Subtable identifier-format must be 1"), { substFormat: r, coverage: this.parsePointer(b4.coverage), backtrackCoverage: this.parseList(b4.pointer(b4.coverage)), lookaheadCoverage: this.parseList(b4.pointer(b4.coverage)), substitutes: this.parseUShortList() };\n      };\n      function Ui2(e, r) {\n        r = r || 0;\n        var t = new b4(e, r), n11 = t.parseVersion(1);\n        return G5.argument(n11 === 1 || n11 === 1.1, "Unsupported GSUB table version."), n11 === 1 ? { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(me4) } : { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(me4), variations: t.parseFeatureVariationsList() };\n      }\n      var Tr2 = new Array(9);\n      Tr2[1] = function(r) {\n        return r.substFormat === 1 ? new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }, { name: "deltaGlyphID", type: "USHORT", value: r.deltaGlyphId }]) : new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 2 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.ushortList("substitute", r.substitute)));\n      }, Tr2[3] = function(r) {\n        return G5.assert(r.substFormat === 1, "Lookup type 3 substFormat must be 1."), new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.tableList("altSet", r.alternateSets, function(t) {\n          return new A4.Table("alternateSetTable", A4.ushortList("alternate", t));\n        })));\n      }, Tr2[4] = function(r) {\n        return G5.assert(r.substFormat === 1, "Lookup type 4 substFormat must be 1."), new A4.Table("substitutionTable", [{ name: "substFormat", type: "USHORT", value: 1 }, { name: "coverage", type: "TABLE", value: new A4.Coverage(r.coverage) }].concat(A4.tableList("ligSet", r.ligatureSets, function(t) {\n          return new A4.Table("ligatureSetTable", A4.tableList("ligature", t, function(n11) {\n            return new A4.Table("ligatureTable", [{ name: "ligGlyph", type: "USHORT", value: n11.ligGlyph }].concat(A4.ushortList("component", n11.components, n11.components.length + 1)));\n          }));\n        })));\n      };\n      function Oi3(e) {\n        return new A4.Table("GSUB", [{ name: "version", type: "ULONG", value: 65536 }, { name: "scripts", type: "TABLE", value: new A4.ScriptList(e.scripts) }, { name: "features", type: "TABLE", value: new A4.FeatureList(e.features) }, { name: "lookups", type: "TABLE", value: new A4.LookupList(e.lookups, Tr2) }]);\n      }\n      var on2 = { parse: Ui2, make: Oi3 };\n      function Ii2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseULong();\n        G5.argument(n11 === 1, "Unsupported META table version."), t.parseULong(), t.parseULong();\n        for (var a2 = t.parseULong(), i5 = {}, o2 = 0; o2 < a2; o2++) {\n          var l4 = t.parseTag(), u3 = t.parseULong(), c2 = t.parseULong(), d3 = Ve3.UTF8(e, r + u3, c2);\n          i5[l4] = d3;\n        }\n        return i5;\n      }\n      function Ci2(e) {\n        var r = Object.keys(e).length, t = "", n11 = 16 + r * 12, a2 = new A4.Table("meta", [{ name: "version", type: "ULONG", value: 1 }, { name: "flags", type: "ULONG", value: 0 }, { name: "offset", type: "ULONG", value: n11 }, { name: "numTags", type: "ULONG", value: r }]);\n        for (var i5 in e) {\n          var o2 = t.length;\n          t += e[i5], a2.fields.push({ name: "tag " + i5, type: "TAG", value: i5 }), a2.fields.push({ name: "offset " + i5, type: "ULONG", value: n11 + o2 }), a2.fields.push({ name: "length " + i5, type: "ULONG", value: e[i5].length });\n        }\n        return a2.fields.push({ name: "stringPool", type: "CHARARRAY", value: t }), a2;\n      }\n      var un2 = { parse: Ii2, make: Ci2 };\n      function ln2(e) {\n        return Math.log(e) / Math.log(2) | 0;\n      }\n      function Yr2(e) {\n        for (; e.length % 4 !== 0; ) e.push(0);\n        for (var r = 0, t = 0; t < e.length; t += 4) r += (e[t] << 24) + (e[t + 1] << 16) + (e[t + 2] << 8) + e[t + 3];\n        return r %= Math.pow(2, 32), r;\n      }\n      function fn2(e, r, t, n11) {\n        return new A4.Record("Table Record", [{ name: "tag", type: "TAG", value: e !== void 0 ? e : "" }, { name: "checkSum", type: "ULONG", value: r !== void 0 ? r : 0 }, { name: "offset", type: "ULONG", value: t !== void 0 ? t : 0 }, { name: "length", type: "ULONG", value: n11 !== void 0 ? n11 : 0 }]);\n      }\n      function pn2(e) {\n        var r = new A4.Table("sfnt", [{ name: "version", type: "TAG", value: "OTTO" }, { name: "numTables", type: "USHORT", value: 0 }, { name: "searchRange", type: "USHORT", value: 0 }, { name: "entrySelector", type: "USHORT", value: 0 }, { name: "rangeShift", type: "USHORT", value: 0 }]);\n        r.tables = e, r.numTables = e.length;\n        var t = Math.pow(2, ln2(r.numTables));\n        r.searchRange = 16 * t, r.entrySelector = ln2(t), r.rangeShift = r.numTables * 16 - r.searchRange;\n        for (var n11 = [], a2 = [], i5 = r.sizeOf() + fn2().sizeOf() * r.numTables; i5 % 4 !== 0; ) i5 += 1, a2.push({ name: "padding", type: "BYTE", value: 0 });\n        for (var o2 = 0; o2 < e.length; o2 += 1) {\n          var l4 = e[o2];\n          G5.argument(l4.tableName.length === 4, "Table name" + l4.tableName + " is invalid.");\n          var u3 = l4.sizeOf(), c2 = fn2(l4.tableName, Yr2(l4.encode()), i5, u3);\n          for (n11.push({ name: c2.tag + " Table Record", type: "RECORD", value: c2 }), a2.push({ name: l4.tableName + " table", type: "RECORD", value: l4 }), i5 += u3, G5.argument(!isNaN(i5), "Something went wrong calculating the offset."); i5 % 4 !== 0; ) i5 += 1, a2.push({ name: "padding", type: "BYTE", value: 0 });\n        }\n        return n11.sort(function(d3, y5) {\n          return d3.value.tag > y5.value.tag ? 1 : -1;\n        }), r.fields = r.fields.concat(n11), r.fields = r.fields.concat(a2), r;\n      }\n      function hn2(e, r, t) {\n        for (var n11 = 0; n11 < r.length; n11 += 1) {\n          var a2 = e.charToGlyphIndex(r[n11]);\n          if (a2 > 0) {\n            var i5 = e.glyphs.get(a2);\n            return i5.getMetrics();\n          }\n        }\n        return t;\n      }\n      function wi2(e) {\n        for (var r = 0, t = 0; t < e.length; t += 1) r += e[t];\n        return r / e.length;\n      }\n      function Ri2(e) {\n        for (var r = [], t = [], n11 = [], a2 = [], i5 = [], o2 = [], l4 = [], u3, c2 = 0, d3 = 0, y5 = 0, g6 = 0, m4 = 0, T4 = 0; T4 < e.glyphs.length; T4 += 1) {\n          var O4 = e.glyphs.get(T4), F4 = O4.unicode | 0;\n          if (isNaN(O4.advanceWidth)) throw new Error("Glyph " + O4.name + " (" + T4 + "): advanceWidth is not a number.");\n          (u3 > F4 || u3 === void 0) && F4 > 0 && (u3 = F4), c2 < F4 && (c2 = F4);\n          var U6 = Xr2.getUnicodeRange(F4);\n          if (U6 < 32) d3 |= 1 << U6;\n          else if (U6 < 64) y5 |= 1 << U6 - 32;\n          else if (U6 < 96) g6 |= 1 << U6 - 64;\n          else if (U6 < 123) m4 |= 1 << U6 - 96;\n          else throw new Error("Unicode ranges bits > 123 are reserved for internal usage");\n          if (O4.name !== ".notdef") {\n            var P5 = O4.getMetrics();\n            r.push(P5.xMin), t.push(P5.yMin), n11.push(P5.xMax), a2.push(P5.yMax), o2.push(P5.leftSideBearing), l4.push(P5.rightSideBearing), i5.push(O4.advanceWidth);\n          }\n        }\n        var I4 = { xMin: Math.min.apply(null, r), yMin: Math.min.apply(null, t), xMax: Math.max.apply(null, n11), yMax: Math.max.apply(null, a2), advanceWidthMax: Math.max.apply(null, i5), advanceWidthAvg: wi2(i5), minLeftSideBearing: Math.min.apply(null, o2), maxLeftSideBearing: Math.max.apply(null, o2), minRightSideBearing: Math.min.apply(null, l4) };\n        I4.ascender = e.ascender, I4.descender = e.descender;\n        var H5 = Yt3.make({ flags: 3, unitsPerEm: e.unitsPerEm, xMin: I4.xMin, yMin: I4.yMin, xMax: I4.xMax, yMax: I4.yMax, lowestRecPPEM: 3, createdTimestamp: e.createdTimestamp }), R4 = Zt3.make({ ascender: I4.ascender, descender: I4.descender, advanceWidthMax: I4.advanceWidthMax, minLeftSideBearing: I4.minLeftSideBearing, minRightSideBearing: I4.minRightSideBearing, xMaxExtent: I4.maxLeftSideBearing + (I4.xMax - I4.xMin), numberOfHMetrics: e.glyphs.length }), B5 = Kt2.make(e.glyphs.length), ue2 = Xr2.make({ xAvgCharWidth: Math.round(I4.advanceWidthAvg), usWeightClass: e.tables.os2.usWeightClass, usWidthClass: e.tables.os2.usWidthClass, usFirstCharIndex: u3, usLastCharIndex: c2, ulUnicodeRange1: d3, ulUnicodeRange2: y5, ulUnicodeRange3: g6, ulUnicodeRange4: m4, fsSelection: e.tables.os2.fsSelection, sTypoAscender: I4.ascender, sTypoDescender: I4.descender, sTypoLineGap: 0, usWinAscent: I4.yMax, usWinDescent: Math.abs(I4.yMin), ulCodePageRange1: 1, sxHeight: hn2(e, "xyvw", { yMax: Math.round(I4.ascender / 2) }).yMax, sCapHeight: hn2(e, "HIKLEFJMNTZBDPRAGOQSUVWXY", I4).yMax, usDefaultChar: e.hasChar(" ") ? 32 : 0, usBreakChar: e.hasChar(" ") ? 32 : 0 }), q3 = Qt3.make(e.glyphs), K4 = It3.make(e.glyphs), se3 = e.getEnglishName("fontFamily"), le3 = e.getEnglishName("fontSubfamily"), pe2 = se3 + " " + le3, de3 = e.getEnglishName("postScriptName");\n        de3 || (de3 = se3.replace(/\\s/g, "") + "-" + le3);\n        var J5 = {};\n        for (var j5 in e.names) J5[j5] = e.names[j5];\n        J5.uniqueID || (J5.uniqueID = { en: e.getEnglishName("manufacturer") + ":" + pe2 }), J5.postScriptName || (J5.postScriptName = { en: de3 }), J5.preferredFamily || (J5.preferredFamily = e.names.fontFamily), J5.preferredSubfamily || (J5.preferredSubfamily = e.names.fontSubfamily);\n        var re3 = [], te3 = an2.make(J5, re3), ne3 = re3.length > 0 ? Jt2.make(re3) : void 0, oe4 = sn2.make(), he3 = Xt3.make(e.glyphs, { version: e.getEnglishName("version"), fullName: pe2, familyName: se3, weightName: le3, postScriptName: de3, unitsPerEm: e.unitsPerEm, fontBBox: [0, I4.yMin, I4.ascender, I4.advanceWidthMax] }), Y2 = e.metas && Object.keys(e.metas).length > 0 ? un2.make(e.metas) : void 0, ae4 = [H5, R4, B5, ue2, te3, K4, oe4, he3, q3];\n        ne3 && ae4.push(ne3), e.tables.gsub && ae4.push(on2.make(e.tables.gsub)), Y2 && ae4.push(Y2);\n        for (var et3 = pn2(ae4), Mo = et3.encode(), Bo2 = Yr2(Mo), rt4 = et3.fields, Hn2 = false, Er2 = 0; Er2 < rt4.length; Er2 += 1) if (rt4[Er2].name === "head table") {\n          rt4[Er2].value.checkSumAdjustment = 2981146554 - Bo2, Hn2 = true;\n          break;\n        }\n        if (!Hn2) throw new Error("Could not find head table with checkSum to adjust.");\n        return et3;\n      }\n      var Di2 = { make: pn2, fontToTable: Ri2, computeCheckSum: Yr2 };\n      function Zr2(e, r) {\n        for (var t = 0, n11 = e.length - 1; t <= n11; ) {\n          var a2 = t + n11 >>> 1, i5 = e[a2].tag;\n          if (i5 === r) return a2;\n          i5 < r ? t = a2 + 1 : n11 = a2 - 1;\n        }\n        return -t - 1;\n      }\n      function cn2(e, r) {\n        for (var t = 0, n11 = e.length - 1; t <= n11; ) {\n          var a2 = t + n11 >>> 1, i5 = e[a2];\n          if (i5 === r) return a2;\n          i5 < r ? t = a2 + 1 : n11 = a2 - 1;\n        }\n        return -t - 1;\n      }\n      function vn2(e, r) {\n        for (var t, n11 = 0, a2 = e.length - 1; n11 <= a2; ) {\n          var i5 = n11 + a2 >>> 1;\n          t = e[i5];\n          var o2 = t.start;\n          if (o2 === r) return t;\n          o2 < r ? n11 = i5 + 1 : a2 = i5 - 1;\n        }\n        if (n11 > 0) return t = e[n11 - 1], r > t.end ? 0 : t;\n      }\n      function er2(e, r) {\n        this.font = e, this.tableName = r;\n      }\n      er2.prototype = { searchTag: Zr2, binSearch: cn2, getTable: function(e) {\n        var r = this.font.tables[this.tableName];\n        return !r && e && (r = this.font.tables[this.tableName] = this.createDefaultTable()), r;\n      }, getScriptNames: function() {\n        var e = this.getTable();\n        return e ? e.scripts.map(function(r) {\n          return r.tag;\n        }) : [];\n      }, getDefaultScriptName: function() {\n        var e = this.getTable();\n        if (e) {\n          for (var r = false, t = 0; t < e.scripts.length; t++) {\n            var n11 = e.scripts[t].tag;\n            if (n11 === "DFLT") return n11;\n            n11 === "latn" && (r = true);\n          }\n          if (r) return "latn";\n        }\n      }, getScriptTable: function(e, r) {\n        var t = this.getTable(r);\n        if (t) {\n          e = e || "DFLT";\n          var n11 = t.scripts, a2 = Zr2(t.scripts, e);\n          if (a2 >= 0) return n11[a2].script;\n          if (r) {\n            var i5 = { tag: e, script: { defaultLangSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] }, langSysRecords: [] } };\n            return n11.splice(-1 - a2, 0, i5), i5.script;\n          }\n        }\n      }, getLangSysTable: function(e, r, t) {\n        var n11 = this.getScriptTable(e, t);\n        if (n11) {\n          if (!r || r === "dflt" || r === "DFLT") return n11.defaultLangSys;\n          var a2 = Zr2(n11.langSysRecords, r);\n          if (a2 >= 0) return n11.langSysRecords[a2].langSys;\n          if (t) {\n            var i5 = { tag: r, langSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] } };\n            return n11.langSysRecords.splice(-1 - a2, 0, i5), i5.langSys;\n          }\n        }\n      }, getFeatureTable: function(e, r, t, n11) {\n        var a2 = this.getLangSysTable(e, r, n11);\n        if (a2) {\n          for (var i5, o2 = a2.featureIndexes, l4 = this.font.tables[this.tableName].features, u3 = 0; u3 < o2.length; u3++) if (i5 = l4[o2[u3]], i5.tag === t) return i5.feature;\n          if (n11) {\n            var c2 = l4.length;\n            return G5.assert(c2 === 0 || t >= l4[c2 - 1].tag, "Features must be added in alphabetical order."), i5 = { tag: t, feature: { params: 0, lookupListIndexes: [] } }, l4.push(i5), o2.push(c2), i5.feature;\n          }\n        }\n      }, getLookupTables: function(e, r, t, n11, a2) {\n        var i5 = this.getFeatureTable(e, r, t, a2), o2 = [];\n        if (i5) {\n          for (var l4, u3 = i5.lookupListIndexes, c2 = this.font.tables[this.tableName].lookups, d3 = 0; d3 < u3.length; d3++) l4 = c2[u3[d3]], l4.lookupType === n11 && o2.push(l4);\n          if (o2.length === 0 && a2) {\n            l4 = { lookupType: n11, lookupFlag: 0, subtables: [], markFilteringSet: void 0 };\n            var y5 = c2.length;\n            return c2.push(l4), u3.push(y5), [l4];\n          }\n        }\n        return o2;\n      }, getGlyphClass: function(e, r) {\n        switch (e.format) {\n          case 1:\n            return e.startGlyph <= r && r < e.startGlyph + e.classes.length ? e.classes[r - e.startGlyph] : 0;\n          case 2:\n            var t = vn2(e.ranges, r);\n            return t ? t.classId : 0;\n        }\n      }, getCoverageIndex: function(e, r) {\n        switch (e.format) {\n          case 1:\n            var t = cn2(e.glyphs, r);\n            return t >= 0 ? t : -1;\n          case 2:\n            var n11 = vn2(e.ranges, r);\n            return n11 ? n11.index + r - n11.start : -1;\n        }\n      }, expandCoverage: function(e) {\n        if (e.format === 1) return e.glyphs;\n        for (var r = [], t = e.ranges, n11 = 0; n11 < t.length; n11++) for (var a2 = t[n11], i5 = a2.start, o2 = a2.end, l4 = i5; l4 <= o2; l4++) r.push(l4);\n        return r;\n      } };\n      function kr(e) {\n        er2.call(this, e, "gpos");\n      }\n      kr.prototype = er2.prototype, kr.prototype.getKerningValue = function(e, r, t) {\n        for (var n11 = this, a2 = 0; a2 < e.length; a2++) for (var i5 = e[a2].subtables, o2 = 0; o2 < i5.length; o2++) {\n          var l4 = i5[o2], u3 = n11.getCoverageIndex(l4.coverage, r);\n          if (!(u3 < 0)) switch (l4.posFormat) {\n            case 1:\n              for (var c2 = l4.pairSets[u3], d3 = 0; d3 < c2.length; d3++) {\n                var y5 = c2[d3];\n                if (y5.secondGlyph === t) return y5.value1 && y5.value1.xAdvance || 0;\n              }\n              break;\n            case 2:\n              var g6 = n11.getGlyphClass(l4.classDef1, r), m4 = n11.getGlyphClass(l4.classDef2, t), T4 = l4.classRecords[g6][m4];\n              return T4.value1 && T4.value1.xAdvance || 0;\n          }\n        }\n        return 0;\n      }, kr.prototype.getKerningTables = function(e, r) {\n        if (this.font.tables.gpos) return this.getLookupTables(e, r, "kern", 2);\n      };\n      function ye3(e) {\n        er2.call(this, e, "gsub");\n      }\n      function Ai2(e, r) {\n        var t = e.length;\n        if (t !== r.length) return false;\n        for (var n11 = 0; n11 < t; n11++) if (e[n11] !== r[n11]) return false;\n        return true;\n      }\n      function dn2(e, r, t) {\n        for (var n11 = e.subtables, a2 = 0; a2 < n11.length; a2++) {\n          var i5 = n11[a2];\n          if (i5.substFormat === r) return i5;\n        }\n        if (t) return n11.push(t), t;\n      }\n      ye3.prototype = er2.prototype, ye3.prototype.createDefaultTable = function() {\n        return { version: 1, scripts: [{ tag: "DFLT", script: { defaultLangSys: { reserved: 0, reqFeatureIndex: 65535, featureIndexes: [] }, langSysRecords: [] } }], features: [], lookups: [] };\n      }, ye3.prototype.getSingle = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 1), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) {\n          var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = void 0;\n          if (c2.substFormat === 1) {\n            var g6 = c2.deltaGlyphId;\n            for (y5 = 0; y5 < d3.length; y5++) {\n              var m4 = d3[y5];\n              a2.push({ sub: m4, by: m4 + g6 });\n            }\n          } else {\n            var T4 = c2.substitute;\n            for (y5 = 0; y5 < d3.length; y5++) a2.push({ sub: d3[y5], by: T4[y5] });\n          }\n        }\n        return a2;\n      }, ye3.prototype.getAlternates = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 3), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) for (var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = c2.alternateSets, g6 = 0; g6 < d3.length; g6++) a2.push({ sub: d3[g6], by: y5[g6] });\n        return a2;\n      }, ye3.prototype.getLigatures = function(e, r, t) {\n        for (var n11 = this, a2 = [], i5 = this.getLookupTables(r, t, e, 4), o2 = 0; o2 < i5.length; o2++) for (var l4 = i5[o2].subtables, u3 = 0; u3 < l4.length; u3++) for (var c2 = l4[u3], d3 = n11.expandCoverage(c2.coverage), y5 = c2.ligatureSets, g6 = 0; g6 < d3.length; g6++) for (var m4 = d3[g6], T4 = y5[g6], O4 = 0; O4 < T4.length; O4++) {\n          var F4 = T4[O4];\n          a2.push({ sub: [m4].concat(F4.components), by: F4.ligGlyph });\n        }\n        return a2;\n      }, ye3.prototype.addSingle = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 1, true)[0], i5 = dn2(a2, 2, { substFormat: 2, coverage: { format: 1, glyphs: [] }, substitute: [] });\n        G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub, l4 = this.binSearch(i5.coverage.glyphs, o2);\n        l4 < 0 && (l4 = -1 - l4, i5.coverage.glyphs.splice(l4, 0, o2), i5.substitute.splice(l4, 0, 0)), i5.substitute[l4] = r.by;\n      }, ye3.prototype.addAlternate = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 3, true)[0], i5 = dn2(a2, 1, { substFormat: 1, coverage: { format: 1, glyphs: [] }, alternateSets: [] });\n        G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub, l4 = this.binSearch(i5.coverage.glyphs, o2);\n        l4 < 0 && (l4 = -1 - l4, i5.coverage.glyphs.splice(l4, 0, o2), i5.alternateSets.splice(l4, 0, 0)), i5.alternateSets[l4] = r.by;\n      }, ye3.prototype.addLigature = function(e, r, t, n11) {\n        var a2 = this.getLookupTables(t, n11, e, 4, true)[0], i5 = a2.subtables[0];\n        i5 || (i5 = { substFormat: 1, coverage: { format: 1, glyphs: [] }, ligatureSets: [] }, a2.subtables[0] = i5), G5.assert(i5.coverage.format === 1, "Ligature: unable to modify coverage table format " + i5.coverage.format);\n        var o2 = r.sub[0], l4 = r.sub.slice(1), u3 = { ligGlyph: r.by, components: l4 }, c2 = this.binSearch(i5.coverage.glyphs, o2);\n        if (c2 >= 0) {\n          for (var d3 = i5.ligatureSets[c2], y5 = 0; y5 < d3.length; y5++) if (Ai2(d3[y5].components, l4)) return;\n          d3.push(u3);\n        } else c2 = -1 - c2, i5.coverage.glyphs.splice(c2, 0, o2), i5.ligatureSets.splice(c2, 0, [u3]);\n      }, ye3.prototype.getFeature = function(e, r, t) {\n        if (/ss\\d\\d/.test(e)) return this.getSingle(e, r, t);\n        switch (e) {\n          case "aalt":\n          case "salt":\n            return this.getSingle(e, r, t).concat(this.getAlternates(e, r, t));\n          case "dlig":\n          case "liga":\n          case "rlig":\n            return this.getLigatures(e, r, t);\n        }\n      }, ye3.prototype.add = function(e, r, t, n11) {\n        if (/ss\\d\\d/.test(e)) return this.addSingle(e, r, t, n11);\n        switch (e) {\n          case "aalt":\n          case "salt":\n            return typeof r.by == "number" ? this.addSingle(e, r, t, n11) : this.addAlternate(e, r, t, n11);\n          case "dlig":\n          case "liga":\n          case "rlig":\n            return this.addLigature(e, r, t, n11);\n        }\n      };\n      function Mi2() {\n        return typeof window < "u";\n      }\n      function gn2(e) {\n        for (var r = new ArrayBuffer(e.length), t = new Uint8Array(r), n11 = 0; n11 < e.length; ++n11) t[n11] = e[n11];\n        return r;\n      }\n      function Bi2(e) {\n        for (var r = new Buffer(e.byteLength), t = new Uint8Array(e), n11 = 0; n11 < r.length; ++n11) r[n11] = t[n11];\n        return r;\n      }\n      function Ye3(e, r) {\n        if (!e) throw r;\n      }\n      var mn2, Pe3, yn2, Qr2;\n      function bn(e) {\n        this.font = e, this._fpgmState = this._prepState = void 0, this._errorState = 0;\n      }\n      function Pi2(e) {\n        return e;\n      }\n      function xn2(e) {\n        return Math.sign(e) * Math.round(Math.abs(e));\n      }\n      function Gi2(e) {\n        return Math.sign(e) * Math.round(Math.abs(e * 2)) / 2;\n      }\n      function Ni2(e) {\n        return Math.sign(e) * (Math.round(Math.abs(e) + 0.5) - 0.5);\n      }\n      function Hi2(e) {\n        return Math.sign(e) * Math.ceil(Math.abs(e));\n      }\n      function _i(e) {\n        return Math.sign(e) * Math.floor(Math.abs(e));\n      }\n      var Sn = function(e) {\n        var r = this.srPeriod, t = this.srPhase, n11 = this.srThreshold, a2 = 1;\n        return e < 0 && (e = -e, a2 = -1), e += n11 - t, e = Math.trunc(e / r) * r, e += t, e < 0 ? t * a2 : e * a2;\n      }, Te4 = { x: 1, y: 0, axis: "x", distance: function(e, r, t, n11) {\n        return (t ? e.xo : e.x) - (n11 ? r.xo : r.x);\n      }, interpolate: function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (!n11 || n11 === this) {\n          if (a2 = e.xo - r.xo, i5 = e.xo - t.xo, u3 = r.x - r.xo, c2 = t.x - t.xo, o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n            e.x = e.xo + (u3 + c2) / 2;\n            return;\n          }\n          e.x = e.xo + (u3 * l4 + c2 * o2) / d3;\n          return;\n        }\n        if (a2 = n11.distance(e, r, true, true), i5 = n11.distance(e, t, true, true), u3 = n11.distance(r, r, false, true), c2 = n11.distance(t, t, false, true), o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n          Te4.setRelative(e, e, (u3 + c2) / 2, n11, true);\n          return;\n        }\n        Te4.setRelative(e, e, (u3 * l4 + c2 * o2) / d3, n11, true);\n      }, normalSlope: Number.NEGATIVE_INFINITY, setRelative: function(e, r, t, n11, a2) {\n        if (!n11 || n11 === this) {\n          e.x = (a2 ? r.xo : r.x) + t;\n          return;\n        }\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y;\n        e.x = l4 + (e.y - u3) / n11.normalSlope;\n      }, slope: 0, touch: function(e) {\n        e.xTouched = true;\n      }, touched: function(e) {\n        return e.xTouched;\n      }, untouch: function(e) {\n        e.xTouched = false;\n      } }, Fe4 = { x: 0, y: 1, axis: "y", distance: function(e, r, t, n11) {\n        return (t ? e.yo : e.y) - (n11 ? r.yo : r.y);\n      }, interpolate: function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (!n11 || n11 === this) {\n          if (a2 = e.yo - r.yo, i5 = e.yo - t.yo, u3 = r.y - r.yo, c2 = t.y - t.yo, o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n            e.y = e.yo + (u3 + c2) / 2;\n            return;\n          }\n          e.y = e.yo + (u3 * l4 + c2 * o2) / d3;\n          return;\n        }\n        if (a2 = n11.distance(e, r, true, true), i5 = n11.distance(e, t, true, true), u3 = n11.distance(r, r, false, true), c2 = n11.distance(t, t, false, true), o2 = Math.abs(a2), l4 = Math.abs(i5), d3 = o2 + l4, d3 === 0) {\n          Fe4.setRelative(e, e, (u3 + c2) / 2, n11, true);\n          return;\n        }\n        Fe4.setRelative(e, e, (u3 * l4 + c2 * o2) / d3, n11, true);\n      }, normalSlope: 0, setRelative: function(e, r, t, n11, a2) {\n        if (!n11 || n11 === this) {\n          e.y = (a2 ? r.yo : r.y) + t;\n          return;\n        }\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y;\n        e.y = u3 + n11.normalSlope * (e.x - l4);\n      }, slope: Number.POSITIVE_INFINITY, touch: function(e) {\n        e.yTouched = true;\n      }, touched: function(e) {\n        return e.yTouched;\n      }, untouch: function(e) {\n        e.yTouched = false;\n      } };\n      Object.freeze(Te4), Object.freeze(Fe4);\n      function rr2(e, r) {\n        this.x = e, this.y = r, this.axis = void 0, this.slope = r / e, this.normalSlope = -e / r, Object.freeze(this);\n      }\n      rr2.prototype.distance = function(e, r, t, n11) {\n        return this.x * Te4.distance(e, r, t, n11) + this.y * Fe4.distance(e, r, t, n11);\n      }, rr2.prototype.interpolate = function(e, r, t, n11) {\n        var a2, i5, o2, l4, u3, c2, d3;\n        if (o2 = n11.distance(e, r, true, true), l4 = n11.distance(e, t, true, true), a2 = n11.distance(r, r, false, true), i5 = n11.distance(t, t, false, true), u3 = Math.abs(o2), c2 = Math.abs(l4), d3 = u3 + c2, d3 === 0) {\n          this.setRelative(e, e, (a2 + i5) / 2, n11, true);\n          return;\n        }\n        this.setRelative(e, e, (a2 * c2 + i5 * u3) / d3, n11, true);\n      }, rr2.prototype.setRelative = function(e, r, t, n11, a2) {\n        n11 = n11 || this;\n        var i5 = a2 ? r.xo : r.x, o2 = a2 ? r.yo : r.y, l4 = i5 + t * n11.x, u3 = o2 + t * n11.y, c2 = n11.normalSlope, d3 = this.slope, y5 = e.x, g6 = e.y;\n        e.x = (d3 * y5 - c2 * l4 + u3 - g6) / (d3 - c2), e.y = d3 * (e.x - y5) + g6;\n      }, rr2.prototype.touch = function(e) {\n        e.xTouched = true, e.yTouched = true;\n      };\n      function tr2(e, r) {\n        var t = Math.sqrt(e * e + r * r);\n        return e /= t, r /= t, e === 1 && r === 0 ? Te4 : e === 0 && r === 1 ? Fe4 : new rr2(e, r);\n      }\n      function Le3(e, r, t, n11) {\n        this.x = this.xo = Math.round(e * 64) / 64, this.y = this.yo = Math.round(r * 64) / 64, this.lastPointOfContour = t, this.onCurve = n11, this.prevPointOnContour = void 0, this.nextPointOnContour = void 0, this.xTouched = false, this.yTouched = false, Object.preventExtensions(this);\n      }\n      Le3.prototype.nextTouched = function(e) {\n        for (var r = this.nextPointOnContour; !e.touched(r) && r !== this; ) r = r.nextPointOnContour;\n        return r;\n      }, Le3.prototype.prevTouched = function(e) {\n        for (var r = this.prevPointOnContour; !e.touched(r) && r !== this; ) r = r.prevPointOnContour;\n        return r;\n      };\n      var nr2 = Object.freeze(new Le3(0, 0)), zi2 = { cvCutIn: 17 / 16, deltaBase: 9, deltaShift: 0.125, loop: 1, minDis: 1, autoFlip: true };\n      function Ie3(e, r) {\n        switch (this.env = e, this.stack = [], this.prog = r, e) {\n          case "glyf":\n            this.zp0 = this.zp1 = this.zp2 = 1, this.rp0 = this.rp1 = this.rp2 = 0;\n          case "prep":\n            this.fv = this.pv = this.dpv = Te4, this.round = xn2;\n        }\n      }\n      bn.prototype.exec = function(e, r) {\n        if (typeof r != "number") throw new Error("Point size is not a number!");\n        if (!(this._errorState > 2)) {\n          var t = this.font, n11 = this._prepState;\n          if (!n11 || n11.ppem !== r) {\n            var a2 = this._fpgmState;\n            if (!a2) {\n              Ie3.prototype = zi2, a2 = this._fpgmState = new Ie3("fpgm", t.tables.fpgm), a2.funcs = [], a2.font = t, s4.DEBUG && (console.log("---EXEC FPGM---"), a2.step = -1);\n              try {\n                Pe3(a2);\n              } catch (c2) {\n                console.log("Hinting error in FPGM:" + c2), this._errorState = 3;\n                return;\n              }\n            }\n            Ie3.prototype = a2, n11 = this._prepState = new Ie3("prep", t.tables.prep), n11.ppem = r;\n            var i5 = t.tables.cvt;\n            if (i5) for (var o2 = n11.cvt = new Array(i5.length), l4 = r / t.unitsPerEm, u3 = 0; u3 < i5.length; u3++) o2[u3] = i5[u3] * l4;\n            else n11.cvt = [];\n            s4.DEBUG && (console.log("---EXEC PREP---"), n11.step = -1);\n            try {\n              Pe3(n11);\n            } catch (c2) {\n              this._errorState < 2 && console.log("Hinting error in PREP:" + c2), this._errorState = 2;\n            }\n          }\n          if (!(this._errorState > 1)) try {\n            return yn2(e, n11);\n          } catch (c2) {\n            this._errorState < 1 && (console.log("Hinting error:" + c2), console.log("Note: further hinting errors are silenced")), this._errorState = 1;\n            return;\n          }\n        }\n      }, yn2 = function(e, r) {\n        var t = r.ppem / r.font.unitsPerEm, n11 = t, a2 = e.components, i5, o2, l4;\n        if (Ie3.prototype = r, !a2) l4 = new Ie3("glyf", e.instructions), s4.DEBUG && (console.log("---EXEC GLYPH---"), l4.step = -1), Qr2(e, l4, t, n11), o2 = l4.gZone;\n        else {\n          var u3 = r.font;\n          o2 = [], i5 = [];\n          for (var c2 = 0; c2 < a2.length; c2++) {\n            var d3 = a2[c2], y5 = u3.glyphs.get(d3.glyphIndex);\n            l4 = new Ie3("glyf", y5.instructions), s4.DEBUG && (console.log("---EXEC COMP " + c2 + "---"), l4.step = -1), Qr2(y5, l4, t, n11);\n            for (var g6 = Math.round(d3.dx * t), m4 = Math.round(d3.dy * n11), T4 = l4.gZone, O4 = l4.contours, F4 = 0; F4 < T4.length; F4++) {\n              var U6 = T4[F4];\n              U6.xTouched = U6.yTouched = false, U6.xo = U6.x = U6.x + g6, U6.yo = U6.y = U6.y + m4;\n            }\n            var P5 = o2.length;\n            o2.push.apply(o2, T4);\n            for (var I4 = 0; I4 < O4.length; I4++) i5.push(O4[I4] + P5);\n          }\n          e.instructions && !l4.inhibitGridFit && (l4 = new Ie3("glyf", e.instructions), l4.gZone = l4.z0 = l4.z1 = l4.z2 = o2, l4.contours = i5, o2.push(new Le3(0, 0), new Le3(Math.round(e.advanceWidth * t), 0)), s4.DEBUG && (console.log("---EXEC COMPOSITE---"), l4.step = -1), Pe3(l4), o2.length -= 2);\n        }\n        return o2;\n      }, Qr2 = function(e, r, t, n11) {\n        for (var a2 = e.points || [], i5 = a2.length, o2 = r.gZone = r.z0 = r.z1 = r.z2 = [], l4 = r.contours = [], u3, c2 = 0; c2 < i5; c2++) u3 = a2[c2], o2[c2] = new Le3(u3.x * t, u3.y * n11, u3.lastPointOfContour, u3.onCurve);\n        for (var d3, y5, g6 = 0; g6 < i5; g6++) u3 = o2[g6], d3 || (d3 = u3, l4.push(g6)), u3.lastPointOfContour ? (u3.nextPointOnContour = d3, d3.prevPointOnContour = u3, d3 = void 0) : (y5 = o2[g6 + 1], u3.nextPointOnContour = y5, y5.prevPointOnContour = u3);\n        if (!r.inhibitGridFit) {\n          if (s4.DEBUG) {\n            console.log("PROCESSING GLYPH", r.stack);\n            for (var m4 = 0; m4 < i5; m4++) console.log(m4, o2[m4].x, o2[m4].y);\n          }\n          if (o2.push(new Le3(0, 0), new Le3(Math.round(e.advanceWidth * t), 0)), Pe3(r), o2.length -= 2, s4.DEBUG) {\n            console.log("FINISHED GLYPH", r.stack);\n            for (var T4 = 0; T4 < i5; T4++) console.log(T4, o2[T4].x, o2[T4].y);\n          }\n        }\n      }, Pe3 = function(e) {\n        var r = e.prog;\n        if (r) {\n          var t = r.length, n11;\n          for (e.ip = 0; e.ip < t; e.ip++) {\n            if (s4.DEBUG && e.step++, n11 = mn2[r[e.ip]], !n11) throw new Error("unknown instruction: 0x" + Number(r[e.ip]).toString(16));\n            n11(e);\n          }\n        }\n      };\n      function Fr(e) {\n        for (var r = e.tZone = new Array(e.gZone.length), t = 0; t < r.length; t++) r[t] = new Le3(0, 0);\n      }\n      function Tn2(e, r) {\n        var t = e.prog, n11 = e.ip, a2 = 1, i5;\n        do\n          if (i5 = t[++n11], i5 === 88) a2++;\n          else if (i5 === 89) a2--;\n          else if (i5 === 64) n11 += t[n11 + 1] + 1;\n          else if (i5 === 65) n11 += 2 * t[n11 + 1] + 1;\n          else if (i5 >= 176 && i5 <= 183) n11 += i5 - 176 + 1;\n          else if (i5 >= 184 && i5 <= 191) n11 += (i5 - 184 + 1) * 2;\n          else if (r && a2 === 1 && i5 === 27) break;\n        while (a2 > 0);\n        e.ip = n11;\n      }\n      function kn(e, r) {\n        s4.DEBUG && console.log(r.step, "SVTCA[" + e.axis + "]"), r.fv = r.pv = r.dpv = e;\n      }\n      function Fn2(e, r) {\n        s4.DEBUG && console.log(r.step, "SPVTCA[" + e.axis + "]"), r.pv = r.dpv = e;\n      }\n      function Ln2(e, r) {\n        s4.DEBUG && console.log(r.step, "SFVTCA[" + e.axis + "]"), r.fv = e;\n      }\n      function En2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log("SPVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.pv = r.dpv = tr2(l4, u3);\n      }\n      function Un2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log("SFVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.fv = tr2(l4, u3);\n      }\n      function Wi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SPVFS[]", t, n11), e.pv = e.dpv = tr2(n11, t);\n      }\n      function Vi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SPVFS[]", t, n11), e.fv = tr2(n11, t);\n      }\n      function qi2(e) {\n        var r = e.stack, t = e.pv;\n        s4.DEBUG && console.log(e.step, "GPV[]"), r.push(t.x * 16384), r.push(t.y * 16384);\n      }\n      function Xi2(e) {\n        var r = e.stack, t = e.fv;\n        s4.DEBUG && console.log(e.step, "GFV[]"), r.push(t.x * 16384), r.push(t.y * 16384);\n      }\n      function Yi2(e) {\n        e.fv = e.pv, s4.DEBUG && console.log(e.step, "SFVTPV[]");\n      }\n      function Zi2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop(), a2 = r.pop(), i5 = r.pop(), o2 = r.pop(), l4 = e.z0, u3 = e.z1, c2 = l4[t], d3 = l4[n11], y5 = u3[a2], g6 = u3[i5], m4 = e.z2[o2];\n        s4.DEBUG && console.log("ISECT[], ", t, n11, a2, i5, o2);\n        var T4 = c2.x, O4 = c2.y, F4 = d3.x, U6 = d3.y, P5 = y5.x, I4 = y5.y, H5 = g6.x, R4 = g6.y, B5 = (T4 - F4) * (I4 - R4) - (O4 - U6) * (P5 - H5), ue2 = T4 * U6 - O4 * F4, q3 = P5 * R4 - I4 * H5;\n        m4.x = (ue2 * (P5 - H5) - q3 * (T4 - F4)) / B5, m4.y = (ue2 * (I4 - R4) - q3 * (O4 - U6)) / B5;\n      }\n      function Qi2(e) {\n        e.rp0 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP0[]", e.rp0);\n      }\n      function Ji2(e) {\n        e.rp1 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP1[]", e.rp1);\n      }\n      function Ki2(e) {\n        e.rp2 = e.stack.pop(), s4.DEBUG && console.log(e.step, "SRP2[]", e.rp2);\n      }\n      function ji2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP0[]", r), e.zp0 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z0 = e.tZone;\n            break;\n          case 1:\n            e.z0 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function $i2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP1[]", r), e.zp1 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z1 = e.tZone;\n            break;\n          case 1:\n            e.z1 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function es2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZP2[]", r), e.zp2 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z2 = e.tZone;\n            break;\n          case 1:\n            e.z2 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function rs2(e) {\n        var r = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "SZPS[]", r), e.zp0 = e.zp1 = e.zp2 = r, r) {\n          case 0:\n            e.tZone || Fr(e), e.z0 = e.z1 = e.z2 = e.tZone;\n            break;\n          case 1:\n            e.z0 = e.z1 = e.z2 = e.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone pointer");\n        }\n      }\n      function ts2(e) {\n        e.loop = e.stack.pop(), s4.DEBUG && console.log(e.step, "SLOOP[]", e.loop);\n      }\n      function ns2(e) {\n        s4.DEBUG && console.log(e.step, "RTG[]"), e.round = xn2;\n      }\n      function as2(e) {\n        s4.DEBUG && console.log(e.step, "RTHG[]"), e.round = Ni2;\n      }\n      function is2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SMD[]", r), e.minDis = r / 64;\n      }\n      function ss2(e) {\n        s4.DEBUG && console.log(e.step, "ELSE[]"), Tn2(e, false);\n      }\n      function os2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "JMPR[]", r), e.ip += r - 1;\n      }\n      function us2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCVTCI[]", r), e.cvCutIn = r / 64;\n      }\n      function ls2(e) {\n        var r = e.stack;\n        s4.DEBUG && console.log(e.step, "DUP[]"), r.push(r[r.length - 1]);\n      }\n      function Jr2(e) {\n        s4.DEBUG && console.log(e.step, "POP[]"), e.stack.pop();\n      }\n      function fs2(e) {\n        s4.DEBUG && console.log(e.step, "CLEAR[]"), e.stack.length = 0;\n      }\n      function ps2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SWAP[]"), r.push(t), r.push(n11);\n      }\n      function hs2(e) {\n        var r = e.stack;\n        s4.DEBUG && console.log(e.step, "DEPTH[]"), r.push(r.length);\n      }\n      function cs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LOOPCALL[]", t, n11);\n        var a2 = e.ip, i5 = e.prog;\n        e.prog = e.funcs[t];\n        for (var o2 = 0; o2 < n11; o2++) Pe3(e), s4.DEBUG && console.log(++e.step, o2 + 1 < n11 ? "next loopcall" : "done loopcall", o2);\n        e.ip = a2, e.prog = i5;\n      }\n      function vs(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "CALL[]", r);\n        var t = e.ip, n11 = e.prog;\n        e.prog = e.funcs[r], Pe3(e), e.ip = t, e.prog = n11, s4.DEBUG && console.log(++e.step, "returning from", r);\n      }\n      function ds2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "CINDEX[]", t), r.push(r[r.length - t]);\n      }\n      function gs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "MINDEX[]", t), r.push(r.splice(r.length - t, 1)[0]);\n      }\n      function ms2(e) {\n        if (e.env !== "fpgm") throw new Error("FDEF not allowed here");\n        var r = e.stack, t = e.prog, n11 = e.ip, a2 = r.pop(), i5 = n11;\n        for (s4.DEBUG && console.log(e.step, "FDEF[]", a2); t[++n11] !== 45; ) ;\n        e.ip = n11, e.funcs[a2] = t.slice(i5 + 1, n11);\n      }\n      function On2(e, r) {\n        var t = r.stack.pop(), n11 = r.z0[t], a2 = r.fv, i5 = r.pv;\n        s4.DEBUG && console.log(r.step, "MDAP[" + e + "]", t);\n        var o2 = i5.distance(n11, nr2);\n        e && (o2 = r.round(o2)), a2.setRelative(n11, nr2, o2, i5), a2.touch(n11), r.rp0 = r.rp1 = t;\n      }\n      function In2(e, r) {\n        var t = r.z2, n11 = t.length - 2, a2, i5, o2;\n        s4.DEBUG && console.log(r.step, "IUP[" + e.axis + "]");\n        for (var l4 = 0; l4 < n11; l4++) a2 = t[l4], !e.touched(a2) && (i5 = a2.prevTouched(e), i5 !== a2 && (o2 = a2.nextTouched(e), i5 === o2 && e.setRelative(a2, a2, e.distance(i5, i5, false, true), e, true), e.interpolate(a2, i5, o2, e)));\n      }\n      function Cn2(e, r) {\n        for (var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = r.loop, u3 = r.z2; l4--; ) {\n          var c2 = t.pop(), d3 = u3[c2], y5 = o2.distance(a2, a2, false, true);\n          i5.setRelative(d3, d3, y5, o2), i5.touch(d3), s4.DEBUG && console.log(r.step, (r.loop > 1 ? "loop " + (r.loop - l4) + ": " : "") + "SHP[" + (e ? "rp1" : "rp2") + "]", c2);\n        }\n        r.loop = 1;\n      }\n      function wn2(e, r) {\n        var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = t.pop(), u3 = r.z2[r.contours[l4]], c2 = u3;\n        s4.DEBUG && console.log(r.step, "SHC[" + e + "]", l4);\n        var d3 = o2.distance(a2, a2, false, true);\n        do\n          c2 !== a2 && i5.setRelative(c2, c2, d3, o2), c2 = c2.nextPointOnContour;\n        while (c2 !== u3);\n      }\n      function Rn2(e, r) {\n        var t = r.stack, n11 = e ? r.rp1 : r.rp2, a2 = (e ? r.z0 : r.z1)[n11], i5 = r.fv, o2 = r.pv, l4 = t.pop();\n        s4.DEBUG && console.log(r.step, "SHZ[" + e + "]", l4);\n        var u3;\n        switch (l4) {\n          case 0:\n            u3 = r.tZone;\n            break;\n          case 1:\n            u3 = r.gZone;\n            break;\n          default:\n            throw new Error("Invalid zone");\n        }\n        for (var c2, d3 = o2.distance(a2, a2, false, true), y5 = u3.length - 2, g6 = 0; g6 < y5; g6++) c2 = u3[g6], i5.setRelative(c2, c2, d3, o2);\n      }\n      function ys2(e) {\n        for (var r = e.stack, t = e.loop, n11 = e.fv, a2 = r.pop() / 64, i5 = e.z2; t--; ) {\n          var o2 = r.pop(), l4 = i5[o2];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - t) + ": " : "") + "SHPIX[]", o2, a2), n11.setRelative(l4, l4, a2), n11.touch(l4);\n        }\n        e.loop = 1;\n      }\n      function bs2(e) {\n        for (var r = e.stack, t = e.rp1, n11 = e.rp2, a2 = e.loop, i5 = e.z0[t], o2 = e.z1[n11], l4 = e.fv, u3 = e.dpv, c2 = e.z2; a2--; ) {\n          var d3 = r.pop(), y5 = c2[d3];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - a2) + ": " : "") + "IP[]", d3, t, "<->", n11), l4.interpolate(y5, i5, o2, u3), l4.touch(y5);\n        }\n        e.loop = 1;\n      }\n      function Dn2(e, r) {\n        var t = r.stack, n11 = t.pop() / 64, a2 = t.pop(), i5 = r.z1[a2], o2 = r.z0[r.rp0], l4 = r.fv, u3 = r.pv;\n        l4.setRelative(i5, o2, n11, u3), l4.touch(i5), s4.DEBUG && console.log(r.step, "MSIRP[" + e + "]", n11, a2), r.rp1 = r.rp0, r.rp2 = a2, e && (r.rp0 = a2);\n      }\n      function xs2(e) {\n        for (var r = e.stack, t = e.rp0, n11 = e.z0[t], a2 = e.loop, i5 = e.fv, o2 = e.pv, l4 = e.z1; a2--; ) {\n          var u3 = r.pop(), c2 = l4[u3];\n          s4.DEBUG && console.log(e.step, (e.loop > 1 ? "loop " + (e.loop - a2) + ": " : "") + "ALIGNRP[]", u3), i5.setRelative(c2, n11, 0, o2), i5.touch(c2);\n        }\n        e.loop = 1;\n      }\n      function Ss2(e) {\n        s4.DEBUG && console.log(e.step, "RTDG[]"), e.round = Gi2;\n      }\n      function An(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z0[a2], o2 = r.fv, l4 = r.pv, u3 = r.cvt[n11];\n        s4.DEBUG && console.log(r.step, "MIAP[" + e + "]", n11, "(", u3, ")", a2);\n        var c2 = l4.distance(i5, nr2);\n        e && (Math.abs(c2 - u3) < r.cvCutIn && (c2 = u3), c2 = r.round(c2)), o2.setRelative(i5, nr2, c2, l4), r.zp0 === 0 && (i5.xo = i5.x, i5.yo = i5.y), o2.touch(i5), r.rp0 = r.rp1 = a2;\n      }\n      function Ts2(e) {\n        var r = e.prog, t = e.ip, n11 = e.stack, a2 = r[++t];\n        s4.DEBUG && console.log(e.step, "NPUSHB[]", a2);\n        for (var i5 = 0; i5 < a2; i5++) n11.push(r[++t]);\n        e.ip = t;\n      }\n      function ks2(e) {\n        var r = e.ip, t = e.prog, n11 = e.stack, a2 = t[++r];\n        s4.DEBUG && console.log(e.step, "NPUSHW[]", a2);\n        for (var i5 = 0; i5 < a2; i5++) {\n          var o2 = t[++r] << 8 | t[++r];\n          o2 & 32768 && (o2 = -((o2 ^ 65535) + 1)), n11.push(o2);\n        }\n        e.ip = r;\n      }\n      function Fs(e) {\n        var r = e.stack, t = e.store;\n        t || (t = e.store = []);\n        var n11 = r.pop(), a2 = r.pop();\n        s4.DEBUG && console.log(e.step, "WS", n11, a2), t[a2] = n11;\n      }\n      function Ls2(e) {\n        var r = e.stack, t = e.store, n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "RS", n11);\n        var a2 = t && t[n11] || 0;\n        r.push(a2);\n      }\n      function Es2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "WCVTP", t, n11), e.cvt[n11] = t / 64;\n      }\n      function Us2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "RCVT", t), r.push(e.cvt[t] * 64);\n      }\n      function Mn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.z2[n11];\n        s4.DEBUG && console.log(r.step, "GC[" + e + "]", n11), t.push(r.dpv.distance(a2, nr2, e, false) * 64);\n      }\n      function Bn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z1[n11], o2 = r.z0[a2], l4 = r.dpv.distance(o2, i5, e, e);\n        s4.DEBUG && console.log(r.step, "MD[" + e + "]", n11, a2, "->", l4), r.stack.push(Math.round(l4 * 64));\n      }\n      function Os(e) {\n        s4.DEBUG && console.log(e.step, "MPPEM[]"), e.stack.push(e.ppem);\n      }\n      function Is(e) {\n        s4.DEBUG && console.log(e.step, "FLIPON[]"), e.autoFlip = true;\n      }\n      function Cs(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LT[]", t, n11), r.push(n11 < t ? 1 : 0);\n      }\n      function ws2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "LTEQ[]", t, n11), r.push(n11 <= t ? 1 : 0);\n      }\n      function Rs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "GT[]", t, n11), r.push(n11 > t ? 1 : 0);\n      }\n      function Ds2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "GTEQ[]", t, n11), r.push(n11 >= t ? 1 : 0);\n      }\n      function As2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "EQ[]", t, n11), r.push(t === n11 ? 1 : 0);\n      }\n      function Ms2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "NEQ[]", t, n11), r.push(t !== n11 ? 1 : 0);\n      }\n      function Bs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "ODD[]", t), r.push(Math.trunc(t) % 2 ? 1 : 0);\n      }\n      function Ps2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "EVEN[]", t), r.push(Math.trunc(t) % 2 ? 0 : 1);\n      }\n      function Gs2(e) {\n        var r = e.stack.pop(), t;\n        s4.DEBUG && console.log(e.step, "IF[]", r), r || (Tn2(e, true), s4.DEBUG && console.log(e.step, t === 27 ? "ELSE[]" : "EIF[]"));\n      }\n      function Ns(e) {\n        s4.DEBUG && console.log(e.step, "EIF[]");\n      }\n      function Hs(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "AND[]", t, n11), r.push(t && n11 ? 1 : 0);\n      }\n      function _s2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "OR[]", t, n11), r.push(t || n11 ? 1 : 0);\n      }\n      function zs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "NOT[]", t), r.push(t ? 0 : 1);\n      }\n      function Kr(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.fv, i5 = r.pv, o2 = r.ppem, l4 = r.deltaBase + (e - 1) * 16, u3 = r.deltaShift, c2 = r.z0;\n        s4.DEBUG && console.log(r.step, "DELTAP[" + e + "]", n11, t);\n        for (var d3 = 0; d3 < n11; d3++) {\n          var y5 = t.pop(), g6 = t.pop(), m4 = l4 + ((g6 & 240) >> 4);\n          if (m4 === o2) {\n            var T4 = (g6 & 15) - 8;\n            T4 >= 0 && T4++, s4.DEBUG && console.log(r.step, "DELTAPFIX", y5, "by", T4 * u3);\n            var O4 = c2[y5];\n            a2.setRelative(O4, O4, T4 * u3, i5);\n          }\n        }\n      }\n      function Ws(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "SDB[]", t), e.deltaBase = t;\n      }\n      function Vs(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "SDS[]", t), e.deltaShift = Math.pow(0.5, t);\n      }\n      function qs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "ADD[]", t, n11), r.push(n11 + t);\n      }\n      function Xs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "SUB[]", t, n11), r.push(n11 - t);\n      }\n      function Ys2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "DIV[]", t, n11), r.push(n11 * 64 / t);\n      }\n      function Zs2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MUL[]", t, n11), r.push(n11 * t / 64);\n      }\n      function Qs2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "ABS[]", t), r.push(Math.abs(t));\n      }\n      function Js2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "NEG[]", t), r.push(-t);\n      }\n      function Ks2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "FLOOR[]", t), r.push(Math.floor(t / 64) * 64);\n      }\n      function js2(e) {\n        var r = e.stack, t = r.pop();\n        s4.DEBUG && console.log(e.step, "CEILING[]", t), r.push(Math.ceil(t / 64) * 64);\n      }\n      function Lr2(e, r) {\n        var t = r.stack, n11 = t.pop();\n        s4.DEBUG && console.log(r.step, "ROUND[]"), t.push(r.round(n11 / 64) * 64);\n      }\n      function $s2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "WCVTF[]", t, n11), e.cvt[n11] = t * e.ppem / e.font.unitsPerEm;\n      }\n      function jr2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = r.ppem, i5 = r.deltaBase + (e - 1) * 16, o2 = r.deltaShift;\n        s4.DEBUG && console.log(r.step, "DELTAC[" + e + "]", n11, t);\n        for (var l4 = 0; l4 < n11; l4++) {\n          var u3 = t.pop(), c2 = t.pop(), d3 = i5 + ((c2 & 240) >> 4);\n          if (d3 === a2) {\n            var y5 = (c2 & 15) - 8;\n            y5 >= 0 && y5++;\n            var g6 = y5 * o2;\n            s4.DEBUG && console.log(r.step, "DELTACFIX", u3, "by", g6), r.cvt[u3] += g6;\n          }\n        }\n      }\n      function eo2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SROUND[]", r), e.round = Sn;\n        var t;\n        switch (r & 192) {\n          case 0:\n            t = 0.5;\n            break;\n          case 64:\n            t = 1;\n            break;\n          case 128:\n            t = 2;\n            break;\n          default:\n            throw new Error("invalid SROUND value");\n        }\n        switch (e.srPeriod = t, r & 48) {\n          case 0:\n            e.srPhase = 0;\n            break;\n          case 16:\n            e.srPhase = 0.25 * t;\n            break;\n          case 32:\n            e.srPhase = 0.5 * t;\n            break;\n          case 48:\n            e.srPhase = 0.75 * t;\n            break;\n          default:\n            throw new Error("invalid SROUND value");\n        }\n        r &= 15, r === 0 ? e.srThreshold = 0 : e.srThreshold = (r / 8 - 0.5) * t;\n      }\n      function ro2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "S45ROUND[]", r), e.round = Sn;\n        var t;\n        switch (r & 192) {\n          case 0:\n            t = Math.sqrt(2) / 2;\n            break;\n          case 64:\n            t = Math.sqrt(2);\n            break;\n          case 128:\n            t = 2 * Math.sqrt(2);\n            break;\n          default:\n            throw new Error("invalid S45ROUND value");\n        }\n        switch (e.srPeriod = t, r & 48) {\n          case 0:\n            e.srPhase = 0;\n            break;\n          case 16:\n            e.srPhase = 0.25 * t;\n            break;\n          case 32:\n            e.srPhase = 0.5 * t;\n            break;\n          case 48:\n            e.srPhase = 0.75 * t;\n            break;\n          default:\n            throw new Error("invalid S45ROUND value");\n        }\n        r &= 15, r === 0 ? e.srThreshold = 0 : e.srThreshold = (r / 8 - 0.5) * t;\n      }\n      function to2(e) {\n        s4.DEBUG && console.log(e.step, "ROFF[]"), e.round = Pi2;\n      }\n      function no2(e) {\n        s4.DEBUG && console.log(e.step, "RUTG[]"), e.round = Hi2;\n      }\n      function ao2(e) {\n        s4.DEBUG && console.log(e.step, "RDTG[]"), e.round = _i;\n      }\n      function io2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCANCTRL[]", r);\n      }\n      function Pn2(e, r) {\n        var t = r.stack, n11 = t.pop(), a2 = t.pop(), i5 = r.z2[n11], o2 = r.z1[a2];\n        s4.DEBUG && console.log(r.step, "SDPVTL[" + e + "]", n11, a2);\n        var l4, u3;\n        e ? (l4 = i5.y - o2.y, u3 = o2.x - i5.x) : (l4 = o2.x - i5.x, u3 = o2.y - i5.y), r.dpv = tr2(l4, u3);\n      }\n      function so2(e) {\n        var r = e.stack, t = r.pop(), n11 = 0;\n        s4.DEBUG && console.log(e.step, "GETINFO[]", t), t & 1 && (n11 = 35), t & 32 && (n11 |= 4096), r.push(n11);\n      }\n      function oo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop(), a2 = r.pop();\n        s4.DEBUG && console.log(e.step, "ROLL[]"), r.push(n11), r.push(t), r.push(a2);\n      }\n      function uo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MAX[]", t, n11), r.push(Math.max(n11, t));\n      }\n      function lo2(e) {\n        var r = e.stack, t = r.pop(), n11 = r.pop();\n        s4.DEBUG && console.log(e.step, "MIN[]", t, n11), r.push(Math.min(n11, t));\n      }\n      function fo2(e) {\n        var r = e.stack.pop();\n        s4.DEBUG && console.log(e.step, "SCANTYPE[]", r);\n      }\n      function po2(e) {\n        var r = e.stack.pop(), t = e.stack.pop();\n        switch (s4.DEBUG && console.log(e.step, "INSTCTRL[]", r, t), r) {\n          case 1:\n            e.inhibitGridFit = !!t;\n            return;\n          case 2:\n            e.ignoreCvt = !!t;\n            return;\n          default:\n            throw new Error("invalid INSTCTRL[] selector");\n        }\n      }\n      function Ce3(e, r) {\n        var t = r.stack, n11 = r.prog, a2 = r.ip;\n        s4.DEBUG && console.log(r.step, "PUSHB[" + e + "]");\n        for (var i5 = 0; i5 < e; i5++) t.push(n11[++a2]);\n        r.ip = a2;\n      }\n      function we3(e, r) {\n        var t = r.ip, n11 = r.prog, a2 = r.stack;\n        s4.DEBUG && console.log(r.ip, "PUSHW[" + e + "]");\n        for (var i5 = 0; i5 < e; i5++) {\n          var o2 = n11[++t] << 8 | n11[++t];\n          o2 & 32768 && (o2 = -((o2 ^ 65535) + 1)), a2.push(o2);\n        }\n        r.ip = t;\n      }\n      function C4(e, r, t, n11, a2, i5) {\n        var o2 = i5.stack, l4 = e && o2.pop(), u3 = o2.pop(), c2 = i5.rp0, d3 = i5.z0[c2], y5 = i5.z1[u3], g6 = i5.minDis, m4 = i5.fv, T4 = i5.dpv, O4, F4, U6, P5;\n        F4 = O4 = T4.distance(y5, d3, true, true), U6 = F4 >= 0 ? 1 : -1, F4 = Math.abs(F4), e && (P5 = i5.cvt[l4], n11 && Math.abs(F4 - P5) < i5.cvCutIn && (F4 = P5)), t && F4 < g6 && (F4 = g6), n11 && (F4 = i5.round(F4)), m4.setRelative(y5, d3, U6 * F4, T4), m4.touch(y5), s4.DEBUG && console.log(i5.step, (e ? "MIRP[" : "MDRP[") + (r ? "M" : "m") + (t ? ">" : "_") + (n11 ? "R" : "_") + (a2 === 0 ? "Gr" : a2 === 1 ? "Bl" : a2 === 2 ? "Wh" : "") + "]", e ? l4 + "(" + i5.cvt[l4] + "," + P5 + ")" : "", u3, "(d =", O4, "->", U6 * F4, ")"), i5.rp1 = i5.rp0, i5.rp2 = u3, r && (i5.rp0 = u3);\n      }\n      mn2 = [kn.bind(void 0, Fe4), kn.bind(void 0, Te4), Fn2.bind(void 0, Fe4), Fn2.bind(void 0, Te4), Ln2.bind(void 0, Fe4), Ln2.bind(void 0, Te4), En2.bind(void 0, 0), En2.bind(void 0, 1), Un2.bind(void 0, 0), Un2.bind(void 0, 1), Wi2, Vi2, qi2, Xi2, Yi2, Zi2, Qi2, Ji2, Ki2, ji2, $i2, es2, rs2, ts2, ns2, as2, is2, ss2, os2, us2, void 0, void 0, ls2, Jr2, fs2, ps2, hs2, ds2, gs2, void 0, void 0, void 0, cs2, vs, ms2, void 0, On2.bind(void 0, 0), On2.bind(void 0, 1), In2.bind(void 0, Fe4), In2.bind(void 0, Te4), Cn2.bind(void 0, 0), Cn2.bind(void 0, 1), wn2.bind(void 0, 0), wn2.bind(void 0, 1), Rn2.bind(void 0, 0), Rn2.bind(void 0, 1), ys2, bs2, Dn2.bind(void 0, 0), Dn2.bind(void 0, 1), xs2, Ss2, An.bind(void 0, 0), An.bind(void 0, 1), Ts2, ks2, Fs, Ls2, Es2, Us2, Mn2.bind(void 0, 0), Mn2.bind(void 0, 1), void 0, Bn2.bind(void 0, 0), Bn2.bind(void 0, 1), Os, void 0, Is, void 0, void 0, Cs, ws2, Rs2, Ds2, As2, Ms2, Bs2, Ps2, Gs2, Ns, Hs, _s2, zs2, Kr.bind(void 0, 1), Ws, Vs, qs2, Xs2, Ys2, Zs2, Qs2, Js2, Ks2, js2, Lr2.bind(void 0, 0), Lr2.bind(void 0, 1), Lr2.bind(void 0, 2), Lr2.bind(void 0, 3), void 0, void 0, void 0, void 0, $s2, Kr.bind(void 0, 2), Kr.bind(void 0, 3), jr2.bind(void 0, 1), jr2.bind(void 0, 2), jr2.bind(void 0, 3), eo2, ro2, void 0, void 0, to2, void 0, no2, ao2, Jr2, Jr2, void 0, void 0, void 0, void 0, void 0, io2, Pn2.bind(void 0, 0), Pn2.bind(void 0, 1), so2, void 0, oo2, uo2, lo2, fo2, po2, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, Ce3.bind(void 0, 1), Ce3.bind(void 0, 2), Ce3.bind(void 0, 3), Ce3.bind(void 0, 4), Ce3.bind(void 0, 5), Ce3.bind(void 0, 6), Ce3.bind(void 0, 7), Ce3.bind(void 0, 8), we3.bind(void 0, 1), we3.bind(void 0, 2), we3.bind(void 0, 3), we3.bind(void 0, 4), we3.bind(void 0, 5), we3.bind(void 0, 6), we3.bind(void 0, 7), we3.bind(void 0, 8), C4.bind(void 0, 0, 0, 0, 0, 0), C4.bind(void 0, 0, 0, 0, 0, 1), C4.bind(void 0, 0, 0, 0, 0, 2), C4.bind(void 0, 0, 0, 0, 0, 3), C4.bind(void 0, 0, 0, 0, 1, 0), C4.bind(void 0, 0, 0, 0, 1, 1), C4.bind(void 0, 0, 0, 0, 1, 2), C4.bind(void 0, 0, 0, 0, 1, 3), C4.bind(void 0, 0, 0, 1, 0, 0), C4.bind(void 0, 0, 0, 1, 0, 1), C4.bind(void 0, 0, 0, 1, 0, 2), C4.bind(void 0, 0, 0, 1, 0, 3), C4.bind(void 0, 0, 0, 1, 1, 0), C4.bind(void 0, 0, 0, 1, 1, 1), C4.bind(void 0, 0, 0, 1, 1, 2), C4.bind(void 0, 0, 0, 1, 1, 3), C4.bind(void 0, 0, 1, 0, 0, 0), C4.bind(void 0, 0, 1, 0, 0, 1), C4.bind(void 0, 0, 1, 0, 0, 2), C4.bind(void 0, 0, 1, 0, 0, 3), C4.bind(void 0, 0, 1, 0, 1, 0), C4.bind(void 0, 0, 1, 0, 1, 1), C4.bind(void 0, 0, 1, 0, 1, 2), C4.bind(void 0, 0, 1, 0, 1, 3), C4.bind(void 0, 0, 1, 1, 0, 0), C4.bind(void 0, 0, 1, 1, 0, 1), C4.bind(void 0, 0, 1, 1, 0, 2), C4.bind(void 0, 0, 1, 1, 0, 3), C4.bind(void 0, 0, 1, 1, 1, 0), C4.bind(void 0, 0, 1, 1, 1, 1), C4.bind(void 0, 0, 1, 1, 1, 2), C4.bind(void 0, 0, 1, 1, 1, 3), C4.bind(void 0, 1, 0, 0, 0, 0), C4.bind(void 0, 1, 0, 0, 0, 1), C4.bind(void 0, 1, 0, 0, 0, 2), C4.bind(void 0, 1, 0, 0, 0, 3), C4.bind(void 0, 1, 0, 0, 1, 0), C4.bind(void 0, 1, 0, 0, 1, 1), C4.bind(void 0, 1, 0, 0, 1, 2), C4.bind(void 0, 1, 0, 0, 1, 3), C4.bind(void 0, 1, 0, 1, 0, 0), C4.bind(void 0, 1, 0, 1, 0, 1), C4.bind(void 0, 1, 0, 1, 0, 2), C4.bind(void 0, 1, 0, 1, 0, 3), C4.bind(void 0, 1, 0, 1, 1, 0), C4.bind(void 0, 1, 0, 1, 1, 1), C4.bind(void 0, 1, 0, 1, 1, 2), C4.bind(void 0, 1, 0, 1, 1, 3), C4.bind(void 0, 1, 1, 0, 0, 0), C4.bind(void 0, 1, 1, 0, 0, 1), C4.bind(void 0, 1, 1, 0, 0, 2), C4.bind(void 0, 1, 1, 0, 0, 3), C4.bind(void 0, 1, 1, 0, 1, 0), C4.bind(void 0, 1, 1, 0, 1, 1), C4.bind(void 0, 1, 1, 0, 1, 2), C4.bind(void 0, 1, 1, 0, 1, 3), C4.bind(void 0, 1, 1, 1, 0, 0), C4.bind(void 0, 1, 1, 1, 0, 1), C4.bind(void 0, 1, 1, 1, 0, 2), C4.bind(void 0, 1, 1, 1, 0, 3), C4.bind(void 0, 1, 1, 1, 1, 0), C4.bind(void 0, 1, 1, 1, 1, 1), C4.bind(void 0, 1, 1, 1, 1, 2), C4.bind(void 0, 1, 1, 1, 1, 3)];\n      function z4(e) {\n        e = e || {}, e.empty || (Ye3(e.familyName, "When creating a new Font object, familyName is required."), Ye3(e.styleName, "When creating a new Font object, styleName is required."), Ye3(e.unitsPerEm, "When creating a new Font object, unitsPerEm is required."), Ye3(e.ascender, "When creating a new Font object, ascender is required."), Ye3(e.descender, "When creating a new Font object, descender is required."), Ye3(e.descender < 0, "Descender should be negative (e.g. -512)."), this.names = { fontFamily: { en: e.familyName || " " }, fontSubfamily: { en: e.styleName || " " }, fullName: { en: e.fullName || e.familyName + " " + e.styleName }, postScriptName: { en: e.postScriptName || e.familyName + e.styleName }, designer: { en: e.designer || " " }, designerURL: { en: e.designerURL || " " }, manufacturer: { en: e.manufacturer || " " }, manufacturerURL: { en: e.manufacturerURL || " " }, license: { en: e.license || " " }, licenseURL: { en: e.licenseURL || " " }, version: { en: e.version || "Version 0.1" }, description: { en: e.description || " " }, copyright: { en: e.copyright || " " }, trademark: { en: e.trademark || " " } }, this.unitsPerEm = e.unitsPerEm || 1e3, this.ascender = e.ascender, this.descender = e.descender, this.createdTimestamp = e.createdTimestamp, this.tables = { os2: { usWeightClass: e.weightClass || this.usWeightClasses.MEDIUM, usWidthClass: e.widthClass || this.usWidthClasses.MEDIUM, fsSelection: e.fsSelection || this.fsSelectionValues.REGULAR } }), this.supported = true, this.glyphs = new qe2.GlyphSet(this, e.glyphs || []), this.encoding = new Ct3(this), this.position = new kr(this), this.substitution = new ye3(this), this.tables = this.tables || {}, Object.defineProperty(this, "hinting", { get: function() {\n          if (this._hinting) return this._hinting;\n          if (this.outlinesFormat === "truetype") return this._hinting = new bn(this);\n        } });\n      }\n      z4.prototype.hasChar = function(e) {\n        return this.encoding.charToGlyphIndex(e) !== null;\n      }, z4.prototype.charToGlyphIndex = function(e) {\n        return this.encoding.charToGlyphIndex(e);\n      }, z4.prototype.charToGlyph = function(e) {\n        var r = this.charToGlyphIndex(e), t = this.glyphs.get(r);\n        return t || (t = this.glyphs.get(0)), t;\n      }, z4.prototype.stringToGlyphs = function(e, r) {\n        var t = this;\n        r = r || this.defaultRenderOptions;\n        for (var n11 = [], a2 = 0; a2 < e.length; a2 += 1) {\n          var i5 = e[a2];\n          n11.push(t.charToGlyphIndex(i5));\n        }\n        var o2 = n11.length;\n        if (r.features) {\n          var l4 = r.script || this.substitution.getDefaultScriptName(), u3 = [];\n          r.features.liga && (u3 = u3.concat(this.substitution.getFeature("liga", l4, r.language))), r.features.rlig && (u3 = u3.concat(this.substitution.getFeature("rlig", l4, r.language)));\n          for (var c2 = 0; c2 < o2; c2 += 1) for (var d3 = 0; d3 < u3.length; d3++) {\n            for (var y5 = u3[d3], g6 = y5.sub, m4 = g6.length, T4 = 0; T4 < m4 && g6[T4] === n11[c2 + T4]; ) T4++;\n            T4 === m4 && (n11.splice(c2, m4, y5.by), o2 = o2 - m4 + 1);\n          }\n        }\n        for (var O4 = new Array(o2), F4 = this.glyphs.get(0), U6 = 0; U6 < o2; U6 += 1) O4[U6] = t.glyphs.get(n11[U6]) || F4;\n        return O4;\n      }, z4.prototype.nameToGlyphIndex = function(e) {\n        return this.glyphNames.nameToGlyphIndex(e);\n      }, z4.prototype.nameToGlyph = function(e) {\n        var r = this.nameToGlyphIndex(e), t = this.glyphs.get(r);\n        return t || (t = this.glyphs.get(0)), t;\n      }, z4.prototype.glyphIndexToName = function(e) {\n        return this.glyphNames.glyphIndexToName ? this.glyphNames.glyphIndexToName(e) : "";\n      }, z4.prototype.getKerningValue = function(e, r) {\n        return e = e.index || e, r = r.index || r, this.kerningPairs[e + "," + r] || 0;\n      }, z4.prototype.defaultRenderOptions = { kerning: true, features: { liga: true, rlig: true } }, z4.prototype.forEachGlyph = function(e, r, t, n11, a2, i5) {\n        var o2 = this;\n        r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n11 = n11 !== void 0 ? n11 : 72, a2 = a2 || this.defaultRenderOptions;\n        var l4 = 1 / this.unitsPerEm * n11, u3 = this.stringToGlyphs(e, a2), c2;\n        if (a2.kerning) {\n          var d3 = a2.script || this.position.getDefaultScriptName();\n          c2 = this.position.getKerningTables(d3, a2.language);\n        }\n        for (var y5 = 0; y5 < u3.length; y5 += 1) {\n          var g6 = u3[y5];\n          if (i5.call(o2, g6, r, t, n11, a2), g6.advanceWidth && (r += g6.advanceWidth * l4), a2.kerning && y5 < u3.length - 1) {\n            var m4 = c2 ? o2.position.getKerningValue(c2, g6.index, u3[y5 + 1].index) : o2.getKerningValue(g6, u3[y5 + 1]);\n            r += m4 * l4;\n          }\n          a2.letterSpacing ? r += a2.letterSpacing * n11 : a2.tracking && (r += a2.tracking / 1e3 * n11);\n        }\n        return r;\n      }, z4.prototype.getPath = function(e, r, t, n11, a2) {\n        var i5 = new Z5();\n        return this.forEachGlyph(e, r, t, n11, a2, function(o2, l4, u3, c2) {\n          var d3 = o2.getPath(l4, u3, c2, a2, this);\n          i5.extend(d3);\n        }), i5;\n      }, z4.prototype.getPaths = function(e, r, t, n11, a2) {\n        var i5 = [];\n        return this.forEachGlyph(e, r, t, n11, a2, function(o2, l4, u3, c2) {\n          var d3 = o2.getPath(l4, u3, c2, a2, this);\n          i5.push(d3);\n        }), i5;\n      }, z4.prototype.getAdvanceWidth = function(e, r, t) {\n        return this.forEachGlyph(e, 0, 0, r, t, function() {\n        });\n      }, z4.prototype.draw = function(e, r, t, n11, a2, i5) {\n        this.getPath(r, t, n11, a2, i5).draw(e);\n      }, z4.prototype.drawPoints = function(e, r, t, n11, a2, i5) {\n        this.forEachGlyph(r, t, n11, a2, i5, function(o2, l4, u3, c2) {\n          o2.drawPoints(e, l4, u3, c2);\n        });\n      }, z4.prototype.drawMetrics = function(e, r, t, n11, a2, i5) {\n        this.forEachGlyph(r, t, n11, a2, i5, function(o2, l4, u3, c2) {\n          o2.drawMetrics(e, l4, u3, c2);\n        });\n      }, z4.prototype.getEnglishName = function(e) {\n        var r = this.names[e];\n        if (r) return r.en;\n      }, z4.prototype.validate = function() {\n        var e = [], r = this;\n        function t(a2, i5) {\n          a2 || e.push(i5);\n        }\n        function n11(a2) {\n          var i5 = r.getEnglishName(a2);\n          t(i5 && i5.trim().length > 0, "No English " + a2 + " specified.");\n        }\n        n11("fontFamily"), n11("weightName"), n11("manufacturer"), n11("copyright"), n11("version"), t(this.unitsPerEm > 0, "No unitsPerEm specified.");\n      }, z4.prototype.toTables = function() {\n        return Di2.fontToTable(this);\n      }, z4.prototype.toBuffer = function() {\n        return console.warn("Font.toBuffer is deprecated. Use Font.toArrayBuffer instead."), this.toArrayBuffer();\n      }, z4.prototype.toArrayBuffer = function() {\n        for (var e = this.toTables(), r = e.encode(), t = new ArrayBuffer(r.length), n11 = new Uint8Array(t), a2 = 0; a2 < r.length; a2++) n11[a2] = r[a2];\n        return t;\n      }, z4.prototype.download = function(e) {\n        var r = this.getEnglishName("fontFamily"), t = this.getEnglishName("fontSubfamily");\n        e = e || r.replace(/\\s/g, "") + "-" + t + ".otf";\n        var n11 = this.toArrayBuffer();\n        if (Mi2()) window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem, window.requestFileSystem(window.TEMPORARY, n11.byteLength, function(o2) {\n          o2.root.getFile(e, { create: true }, function(l4) {\n            l4.createWriter(function(u3) {\n              var c2 = new DataView(n11), d3 = new Blob([c2], { type: "font/opentype" });\n              u3.write(d3), u3.addEventListener("writeend", function() {\n                location.href = l4.toURL();\n              }, false);\n            });\n          });\n        }, function(o2) {\n          throw new Error(o2.name + ": " + o2.message);\n        });\n        else {\n          var a2 = tt2("fs"), i5 = Bi2(n11);\n          a2.writeFileSync(e, i5);\n        }\n      }, z4.prototype.fsSelectionValues = { ITALIC: 1, UNDERSCORE: 2, NEGATIVE: 4, OUTLINED: 8, STRIKEOUT: 16, BOLD: 32, REGULAR: 64, USER_TYPO_METRICS: 128, WWS: 256, OBLIQUE: 512 }, z4.prototype.usWidthClasses = { ULTRA_CONDENSED: 1, EXTRA_CONDENSED: 2, CONDENSED: 3, SEMI_CONDENSED: 4, MEDIUM: 5, SEMI_EXPANDED: 6, EXPANDED: 7, EXTRA_EXPANDED: 8, ULTRA_EXPANDED: 9 }, z4.prototype.usWeightClasses = { THIN: 100, EXTRA_LIGHT: 200, LIGHT: 300, NORMAL: 400, MEDIUM: 500, SEMI_BOLD: 600, BOLD: 700, EXTRA_BOLD: 800, BLACK: 900 };\n      function Gn2(e, r) {\n        var t = JSON.stringify(e), n11 = 256;\n        for (var a2 in r) {\n          var i5 = parseInt(a2);\n          if (!(!i5 || i5 < 256)) {\n            if (JSON.stringify(r[a2]) === t) return i5;\n            n11 <= i5 && (n11 = i5 + 1);\n          }\n        }\n        return r[n11] = e, n11;\n      }\n      function ho2(e, r, t) {\n        var n11 = Gn2(r.name, t);\n        return [{ name: "tag_" + e, type: "TAG", value: r.tag }, { name: "minValue_" + e, type: "FIXED", value: r.minValue << 16 }, { name: "defaultValue_" + e, type: "FIXED", value: r.defaultValue << 16 }, { name: "maxValue_" + e, type: "FIXED", value: r.maxValue << 16 }, { name: "flags_" + e, type: "USHORT", value: 0 }, { name: "nameID_" + e, type: "USHORT", value: n11 }];\n      }\n      function co2(e, r, t) {\n        var n11 = {}, a2 = new w6.Parser(e, r);\n        return n11.tag = a2.parseTag(), n11.minValue = a2.parseFixed(), n11.defaultValue = a2.parseFixed(), n11.maxValue = a2.parseFixed(), a2.skip("uShort", 1), n11.name = t[a2.parseUShort()] || {}, n11;\n      }\n      function vo(e, r, t, n11) {\n        for (var a2 = Gn2(r.name, n11), i5 = [{ name: "nameID_" + e, type: "USHORT", value: a2 }, { name: "flags_" + e, type: "USHORT", value: 0 }], o2 = 0; o2 < t.length; ++o2) {\n          var l4 = t[o2].tag;\n          i5.push({ name: "axis_" + e + " " + l4, type: "FIXED", value: r.coordinates[l4] << 16 });\n        }\n        return i5;\n      }\n      function go2(e, r, t, n11) {\n        var a2 = {}, i5 = new w6.Parser(e, r);\n        a2.name = n11[i5.parseUShort()] || {}, i5.skip("uShort", 1), a2.coordinates = {};\n        for (var o2 = 0; o2 < t.length; ++o2) a2.coordinates[t[o2].tag] = i5.parseFixed();\n        return a2;\n      }\n      function mo2(e, r) {\n        var t = new A4.Table("fvar", [{ name: "version", type: "ULONG", value: 65536 }, { name: "offsetToData", type: "USHORT", value: 0 }, { name: "countSizePairs", type: "USHORT", value: 2 }, { name: "axisCount", type: "USHORT", value: e.axes.length }, { name: "axisSize", type: "USHORT", value: 20 }, { name: "instanceCount", type: "USHORT", value: e.instances.length }, { name: "instanceSize", type: "USHORT", value: 4 + e.axes.length * 4 }]);\n        t.offsetToData = t.sizeOf();\n        for (var n11 = 0; n11 < e.axes.length; n11++) t.fields = t.fields.concat(ho2(n11, e.axes[n11], r));\n        for (var a2 = 0; a2 < e.instances.length; a2++) t.fields = t.fields.concat(vo(a2, e.instances[a2], e.axes, r));\n        return t;\n      }\n      function yo2(e, r, t) {\n        var n11 = new w6.Parser(e, r), a2 = n11.parseULong();\n        G5.argument(a2 === 65536, "Unsupported fvar table version.");\n        var i5 = n11.parseOffset16();\n        n11.skip("uShort", 1);\n        for (var o2 = n11.parseUShort(), l4 = n11.parseUShort(), u3 = n11.parseUShort(), c2 = n11.parseUShort(), d3 = [], y5 = 0; y5 < o2; y5++) d3.push(co2(e, r + i5 + y5 * l4, t));\n        for (var g6 = [], m4 = r + i5 + o2 * l4, T4 = 0; T4 < u3; T4++) g6.push(go2(e, m4 + T4 * c2, d3, t));\n        return { axes: d3, instances: g6 };\n      }\n      var bo = { make: mo2, parse: yo2 }, be4 = new Array(10);\n      be4[1] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort();\n        if (t === 1) return { posFormat: 1, coverage: this.parsePointer(b4.coverage), value: this.parseValueRecord() };\n        if (t === 2) return { posFormat: 2, coverage: this.parsePointer(b4.coverage), values: this.parseValueRecordList() };\n        G5.assert(false, "0x" + r.toString(16) + ": GPOS lookup type 1 format must be 1 or 2.");\n      }, be4[2] = function() {\n        var r = this.offset + this.relativeOffset, t = this.parseUShort(), n11 = this.parsePointer(b4.coverage), a2 = this.parseUShort(), i5 = this.parseUShort();\n        if (t === 1) return { posFormat: t, coverage: n11, valueFormat1: a2, valueFormat2: i5, pairSets: this.parseList(b4.pointer(b4.list(function() {\n          return { secondGlyph: this.parseUShort(), value1: this.parseValueRecord(a2), value2: this.parseValueRecord(i5) };\n        }))) };\n        if (t === 2) {\n          var o2 = this.parsePointer(b4.classDef), l4 = this.parsePointer(b4.classDef), u3 = this.parseUShort(), c2 = this.parseUShort();\n          return { posFormat: t, coverage: n11, valueFormat1: a2, valueFormat2: i5, classDef1: o2, classDef2: l4, class1Count: u3, class2Count: c2, classRecords: this.parseList(u3, b4.list(c2, function() {\n            return { value1: this.parseValueRecord(a2), value2: this.parseValueRecord(i5) };\n          })) };\n        }\n        G5.assert(false, "0x" + r.toString(16) + ": GPOS lookup type 2 format must be 1 or 2.");\n      }, be4[3] = function() {\n        return { error: "GPOS Lookup 3 not supported" };\n      }, be4[4] = function() {\n        return { error: "GPOS Lookup 4 not supported" };\n      }, be4[5] = function() {\n        return { error: "GPOS Lookup 5 not supported" };\n      }, be4[6] = function() {\n        return { error: "GPOS Lookup 6 not supported" };\n      }, be4[7] = function() {\n        return { error: "GPOS Lookup 7 not supported" };\n      }, be4[8] = function() {\n        return { error: "GPOS Lookup 8 not supported" };\n      }, be4[9] = function() {\n        return { error: "GPOS Lookup 9 not supported" };\n      };\n      function xo2(e, r) {\n        r = r || 0;\n        var t = new b4(e, r), n11 = t.parseVersion(1);\n        return G5.argument(n11 === 1 || n11 === 1.1, "Unsupported GPOS table version " + n11), n11 === 1 ? { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(be4) } : { version: n11, scripts: t.parseScriptList(), features: t.parseFeatureList(), lookups: t.parseLookupList(be4), variations: t.parseFeatureVariationsList() };\n      }\n      var So2 = new Array(10);\n      function To2(e) {\n        return new A4.Table("GPOS", [{ name: "version", type: "ULONG", value: 65536 }, { name: "scripts", type: "TABLE", value: new A4.ScriptList(e.scripts) }, { name: "features", type: "TABLE", value: new A4.FeatureList(e.features) }, { name: "lookups", type: "TABLE", value: new A4.LookupList(e.lookups, So2) }]);\n      }\n      var ko2 = { parse: xo2, make: To2 };\n      function Fo2(e) {\n        var r = {};\n        e.skip("uShort");\n        var t = e.parseUShort();\n        G5.argument(t === 0, "Unsupported kern sub-table version."), e.skip("uShort", 2);\n        var n11 = e.parseUShort();\n        e.skip("uShort", 3);\n        for (var a2 = 0; a2 < n11; a2 += 1) {\n          var i5 = e.parseUShort(), o2 = e.parseUShort(), l4 = e.parseShort();\n          r[i5 + "," + o2] = l4;\n        }\n        return r;\n      }\n      function Lo2(e) {\n        var r = {};\n        e.skip("uShort");\n        var t = e.parseULong();\n        t > 1 && console.warn("Only the first kern subtable is supported."), e.skip("uLong");\n        var n11 = e.parseUShort(), a2 = n11 & 255;\n        if (e.skip("uShort"), a2 === 0) {\n          var i5 = e.parseUShort();\n          e.skip("uShort", 3);\n          for (var o2 = 0; o2 < i5; o2 += 1) {\n            var l4 = e.parseUShort(), u3 = e.parseUShort(), c2 = e.parseShort();\n            r[l4 + "," + u3] = c2;\n          }\n        }\n        return r;\n      }\n      function Eo2(e, r) {\n        var t = new w6.Parser(e, r), n11 = t.parseUShort();\n        if (n11 === 0) return Fo2(t);\n        if (n11 === 1) return Lo2(t);\n        throw new Error("Unsupported kern table version (" + n11 + ").");\n      }\n      var Uo2 = { parse: Eo2 };\n      function Oo2(e, r, t, n11) {\n        for (var a2 = new w6.Parser(e, r), i5 = n11 ? a2.parseUShort : a2.parseULong, o2 = [], l4 = 0; l4 < t + 1; l4 += 1) {\n          var u3 = i5.call(a2);\n          n11 && (u3 *= 2), o2.push(u3);\n        }\n        return o2;\n      }\n      var Io2 = { parse: Oo2 };\n      function Co2(e, r) {\n        var t = tt2("fs");\n        t.readFile(e, function(n11, a2) {\n          if (n11) return r(n11.message);\n          r(null, gn2(a2));\n        });\n      }\n      function wo2(e, r) {\n        var t = new XMLHttpRequest();\n        t.open("get", e, true), t.responseType = "arraybuffer", t.onload = function() {\n          return t.response ? r(null, t.response) : r("Font could not be loaded: " + t.statusText);\n        }, t.onerror = function() {\n          r("Font could not be loaded");\n        }, t.send();\n      }\n      function Nn2(e, r) {\n        for (var t = [], n11 = 12, a2 = 0; a2 < r; a2 += 1) {\n          var i5 = w6.getTag(e, n11), o2 = w6.getULong(e, n11 + 4), l4 = w6.getULong(e, n11 + 8), u3 = w6.getULong(e, n11 + 12);\n          t.push({ tag: i5, checksum: o2, offset: l4, length: u3, compression: false }), n11 += 16;\n        }\n        return t;\n      }\n      function Ro2(e, r) {\n        for (var t = [], n11 = 44, a2 = 0; a2 < r; a2 += 1) {\n          var i5 = w6.getTag(e, n11), o2 = w6.getULong(e, n11 + 4), l4 = w6.getULong(e, n11 + 8), u3 = w6.getULong(e, n11 + 12), c2 = void 0;\n          l4 < u3 ? c2 = "WOFF" : c2 = false, t.push({ tag: i5, offset: o2, compression: c2, compressedLength: l4, length: u3 }), n11 += 20;\n        }\n        return t;\n      }\n      function Q3(e, r) {\n        if (r.compression === "WOFF") {\n          var t = new Uint8Array(e.buffer, r.offset + 2, r.compressedLength - 2), n11 = new Uint8Array(r.length);\n          if (pa(t, n11), n11.byteLength !== r.length) throw new Error("Decompression error: " + r.tag + " decompressed length doesn\'t match recorded length");\n          var a2 = new DataView(n11.buffer, 0);\n          return { data: a2, offset: 0 };\n        } else return { data: e, offset: r.offset };\n      }\n      function $r2(e) {\n        var r, t, n11 = new z4({ empty: true }), a2 = new DataView(e, 0), i5, o2 = [], l4 = w6.getTag(a2, 0);\n        if (l4 === "\\0\u0001\\0\\0" || l4 === "true" || l4 === "typ1") n11.outlinesFormat = "truetype", i5 = w6.getUShort(a2, 4), o2 = Nn2(a2, i5);\n        else if (l4 === "OTTO") n11.outlinesFormat = "cff", i5 = w6.getUShort(a2, 4), o2 = Nn2(a2, i5);\n        else if (l4 === "wOFF") {\n          var u3 = w6.getTag(a2, 4);\n          if (u3 === "\\0\u0001\\0\\0") n11.outlinesFormat = "truetype";\n          else if (u3 === "OTTO") n11.outlinesFormat = "cff";\n          else throw new Error("Unsupported OpenType flavor " + l4);\n          i5 = w6.getUShort(a2, 12), o2 = Ro2(a2, i5);\n        } else throw new Error("Unsupported OpenType signature " + l4);\n        for (var c2, d3, y5, g6, m4, T4, O4, F4, U6, P5, I4, H5 = 0; H5 < i5; H5 += 1) {\n          var R4 = o2[H5], B5 = void 0;\n          switch (R4.tag) {\n            case "cmap":\n              B5 = Q3(a2, R4), n11.tables.cmap = It3.parse(B5.data, B5.offset), n11.encoding = new wt2(n11.tables.cmap);\n              break;\n            case "cvt ":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.cvt = I4.parseShortList(R4.length / 2);\n              break;\n            case "fvar":\n              d3 = R4;\n              break;\n            case "fpgm":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.fpgm = I4.parseByteList(R4.length);\n              break;\n            case "head":\n              B5 = Q3(a2, R4), n11.tables.head = Yt3.parse(B5.data, B5.offset), n11.unitsPerEm = n11.tables.head.unitsPerEm, r = n11.tables.head.indexToLocFormat;\n              break;\n            case "hhea":\n              B5 = Q3(a2, R4), n11.tables.hhea = Zt3.parse(B5.data, B5.offset), n11.ascender = n11.tables.hhea.ascender, n11.descender = n11.tables.hhea.descender, n11.numberOfHMetrics = n11.tables.hhea.numberOfHMetrics;\n              break;\n            case "hmtx":\n              T4 = R4;\n              break;\n            case "ltag":\n              B5 = Q3(a2, R4), t = Jt2.parse(B5.data, B5.offset);\n              break;\n            case "maxp":\n              B5 = Q3(a2, R4), n11.tables.maxp = Kt2.parse(B5.data, B5.offset), n11.numGlyphs = n11.tables.maxp.numGlyphs;\n              break;\n            case "name":\n              U6 = R4;\n              break;\n            case "OS/2":\n              B5 = Q3(a2, R4), n11.tables.os2 = Xr2.parse(B5.data, B5.offset);\n              break;\n            case "post":\n              B5 = Q3(a2, R4), n11.tables.post = sn2.parse(B5.data, B5.offset), n11.glyphNames = new Nr(n11.tables.post);\n              break;\n            case "prep":\n              B5 = Q3(a2, R4), I4 = new w6.Parser(B5.data, B5.offset), n11.tables.prep = I4.parseByteList(R4.length);\n              break;\n            case "glyf":\n              y5 = R4;\n              break;\n            case "loca":\n              F4 = R4;\n              break;\n            case "CFF ":\n              c2 = R4;\n              break;\n            case "kern":\n              O4 = R4;\n              break;\n            case "GPOS":\n              g6 = R4;\n              break;\n            case "GSUB":\n              m4 = R4;\n              break;\n            case "meta":\n              P5 = R4;\n              break;\n          }\n        }\n        var ue2 = Q3(a2, U6);\n        if (n11.tables.name = an2.parse(ue2.data, ue2.offset, t), n11.names = n11.tables.name, y5 && F4) {\n          var q3 = r === 0, K4 = Q3(a2, F4), se3 = Io2.parse(K4.data, K4.offset, n11.numGlyphs, q3), le3 = Q3(a2, y5);\n          n11.glyphs = At3.parse(le3.data, le3.offset, se3, n11);\n        } else if (c2) {\n          var pe2 = Q3(a2, c2);\n          Xt3.parse(pe2.data, pe2.offset, n11);\n        } else throw new Error("Font doesn\'t contain TrueType or CFF outlines.");\n        var de3 = Q3(a2, T4);\n        if (Qt3.parse(de3.data, de3.offset, n11.numberOfHMetrics, n11.numGlyphs, n11.glyphs), Ca(n11), O4) {\n          var J5 = Q3(a2, O4);\n          n11.kerningPairs = Uo2.parse(J5.data, J5.offset);\n        } else n11.kerningPairs = {};\n        if (g6) {\n          var j5 = Q3(a2, g6);\n          n11.tables.gpos = ko2.parse(j5.data, j5.offset);\n        }\n        if (m4) {\n          var re3 = Q3(a2, m4);\n          n11.tables.gsub = on2.parse(re3.data, re3.offset);\n        }\n        if (d3) {\n          var te3 = Q3(a2, d3);\n          n11.tables.fvar = bo.parse(te3.data, te3.offset, n11.names);\n        }\n        if (P5) {\n          var ne3 = Q3(a2, P5);\n          n11.tables.meta = un2.parse(ne3.data, ne3.offset), n11.metas = n11.tables.meta;\n        }\n        return n11;\n      }\n      function Do2(e, r) {\n        var t = typeof window > "u", n11 = t ? Co2 : wo2;\n        n11(e, function(a2, i5) {\n          if (a2) return r(a2);\n          var o2;\n          try {\n            o2 = $r2(i5);\n          } catch (l4) {\n            return r(l4, null);\n          }\n          return r(null, o2);\n        });\n      }\n      function Ao2(e) {\n        var r = tt2("fs"), t = r.readFileSync(e);\n        return $r2(gn2(t));\n      }\n      s4.Font = z4, s4.Glyph = fe3, s4.Path = Z5, s4.BoundingBox = ke3, s4._parse = w6, s4.parse = $r2, s4.load = Do2, s4.loadSync = Ao2, Object.defineProperty(s4, "__esModule", { value: true });\n    }));\n  });\n  var Zn = Ur((Au, Yn2) => {\n    "use strict";\n    Yn2.exports = function(s4) {\n      s4.prototype[Symbol.iterator] = function* () {\n        for (let f5 = this.head; f5; f5 = f5.next) yield f5.value;\n      };\n    };\n  });\n  var Jn = Ur((Mu, Qn) => {\n    "use strict";\n    Qn.exports = _5;\n    _5.Node = He3;\n    _5.create = _5;\n    function _5(s4) {\n      var f5 = this;\n      if (f5 instanceof _5 || (f5 = new _5()), f5.tail = null, f5.head = null, f5.length = 0, s4 && typeof s4.forEach == "function") s4.forEach(function(v6) {\n        f5.push(v6);\n      });\n      else if (arguments.length > 0) for (var p3 = 0, h3 = arguments.length; p3 < h3; p3++) f5.push(arguments[p3]);\n      return f5;\n    }\n    _5.prototype.removeNode = function(s4) {\n      if (s4.list !== this) throw new Error("removing node which does not belong to this list");\n      var f5 = s4.next, p3 = s4.prev;\n      return f5 && (f5.prev = p3), p3 && (p3.next = f5), s4 === this.head && (this.head = f5), s4 === this.tail && (this.tail = p3), s4.list.length--, s4.next = null, s4.prev = null, s4.list = null, f5;\n    };\n    _5.prototype.unshiftNode = function(s4) {\n      if (s4 !== this.head) {\n        s4.list && s4.list.removeNode(s4);\n        var f5 = this.head;\n        s4.list = this, s4.next = f5, f5 && (f5.prev = s4), this.head = s4, this.tail || (this.tail = s4), this.length++;\n      }\n    };\n    _5.prototype.pushNode = function(s4) {\n      if (s4 !== this.tail) {\n        s4.list && s4.list.removeNode(s4);\n        var f5 = this.tail;\n        s4.list = this, s4.prev = f5, f5 && (f5.next = s4), this.tail = s4, this.head || (this.head = s4), this.length++;\n      }\n    };\n    _5.prototype.push = function() {\n      for (var s4 = 0, f5 = arguments.length; s4 < f5; s4++) Jo(this, arguments[s4]);\n      return this.length;\n    };\n    _5.prototype.unshift = function() {\n      for (var s4 = 0, f5 = arguments.length; s4 < f5; s4++) Ko2(this, arguments[s4]);\n      return this.length;\n    };\n    _5.prototype.pop = function() {\n      if (this.tail) {\n        var s4 = this.tail.value;\n        return this.tail = this.tail.prev, this.tail ? this.tail.next = null : this.head = null, this.length--, s4;\n      }\n    };\n    _5.prototype.shift = function() {\n      if (this.head) {\n        var s4 = this.head.value;\n        return this.head = this.head.next, this.head ? this.head.prev = null : this.tail = null, this.length--, s4;\n      }\n    };\n    _5.prototype.forEach = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = this.head, h3 = 0; p3 !== null; h3++) s4.call(f5, p3.value, h3, this), p3 = p3.next;\n    };\n    _5.prototype.forEachReverse = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = this.tail, h3 = this.length - 1; p3 !== null; h3--) s4.call(f5, p3.value, h3, this), p3 = p3.prev;\n    };\n    _5.prototype.get = function(s4) {\n      for (var f5 = 0, p3 = this.head; p3 !== null && f5 < s4; f5++) p3 = p3.next;\n      if (f5 === s4 && p3 !== null) return p3.value;\n    };\n    _5.prototype.getReverse = function(s4) {\n      for (var f5 = 0, p3 = this.tail; p3 !== null && f5 < s4; f5++) p3 = p3.prev;\n      if (f5 === s4 && p3 !== null) return p3.value;\n    };\n    _5.prototype.map = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = new _5(), h3 = this.head; h3 !== null; ) p3.push(s4.call(f5, h3.value, this)), h3 = h3.next;\n      return p3;\n    };\n    _5.prototype.mapReverse = function(s4, f5) {\n      f5 = f5 || this;\n      for (var p3 = new _5(), h3 = this.tail; h3 !== null; ) p3.push(s4.call(f5, h3.value, this)), h3 = h3.prev;\n      return p3;\n    };\n    _5.prototype.reduce = function(s4, f5) {\n      var p3, h3 = this.head;\n      if (arguments.length > 1) p3 = f5;\n      else if (this.head) h3 = this.head.next, p3 = this.head.value;\n      else throw new TypeError("Reduce of empty list with no initial value");\n      for (var v6 = 0; h3 !== null; v6++) p3 = s4(p3, h3.value, v6), h3 = h3.next;\n      return p3;\n    };\n    _5.prototype.reduceReverse = function(s4, f5) {\n      var p3, h3 = this.tail;\n      if (arguments.length > 1) p3 = f5;\n      else if (this.tail) h3 = this.tail.prev, p3 = this.tail.value;\n      else throw new TypeError("Reduce of empty list with no initial value");\n      for (var v6 = this.length - 1; h3 !== null; v6--) p3 = s4(p3, h3.value, v6), h3 = h3.prev;\n      return p3;\n    };\n    _5.prototype.toArray = function() {\n      for (var s4 = new Array(this.length), f5 = 0, p3 = this.head; p3 !== null; f5++) s4[f5] = p3.value, p3 = p3.next;\n      return s4;\n    };\n    _5.prototype.toArrayReverse = function() {\n      for (var s4 = new Array(this.length), f5 = 0, p3 = this.tail; p3 !== null; f5++) s4[f5] = p3.value, p3 = p3.prev;\n      return s4;\n    };\n    _5.prototype.slice = function(s4, f5) {\n      f5 = f5 || this.length, f5 < 0 && (f5 += this.length), s4 = s4 || 0, s4 < 0 && (s4 += this.length);\n      var p3 = new _5();\n      if (f5 < s4 || f5 < 0) return p3;\n      s4 < 0 && (s4 = 0), f5 > this.length && (f5 = this.length);\n      for (var h3 = 0, v6 = this.head; v6 !== null && h3 < s4; h3++) v6 = v6.next;\n      for (; v6 !== null && h3 < f5; h3++, v6 = v6.next) p3.push(v6.value);\n      return p3;\n    };\n    _5.prototype.sliceReverse = function(s4, f5) {\n      f5 = f5 || this.length, f5 < 0 && (f5 += this.length), s4 = s4 || 0, s4 < 0 && (s4 += this.length);\n      var p3 = new _5();\n      if (f5 < s4 || f5 < 0) return p3;\n      s4 < 0 && (s4 = 0), f5 > this.length && (f5 = this.length);\n      for (var h3 = this.length, v6 = this.tail; v6 !== null && h3 > f5; h3--) v6 = v6.prev;\n      for (; v6 !== null && h3 > s4; h3--, v6 = v6.prev) p3.push(v6.value);\n      return p3;\n    };\n    _5.prototype.splice = function(s4, f5, ...p3) {\n      s4 > this.length && (s4 = this.length - 1), s4 < 0 && (s4 = this.length + s4);\n      for (var h3 = 0, v6 = this.head; v6 !== null && h3 < s4; h3++) v6 = v6.next;\n      for (var x5 = [], h3 = 0; v6 && h3 < f5; h3++) x5.push(v6.value), v6 = this.removeNode(v6);\n      v6 === null && (v6 = this.tail), v6 !== this.head && v6 !== this.tail && (v6 = v6.prev);\n      for (var h3 = 0; h3 < p3.length; h3++) v6 = Qo(this, v6, p3[h3]);\n      return x5;\n    };\n    _5.prototype.reverse = function() {\n      for (var s4 = this.head, f5 = this.tail, p3 = s4; p3 !== null; p3 = p3.prev) {\n        var h3 = p3.prev;\n        p3.prev = p3.next, p3.next = h3;\n      }\n      return this.head = f5, this.tail = s4, this;\n    };\n    function Qo(s4, f5, p3) {\n      var h3 = f5 === s4.head ? new He3(p3, null, f5, s4) : new He3(p3, f5, f5.next, s4);\n      return h3.next === null && (s4.tail = h3), h3.prev === null && (s4.head = h3), s4.length++, h3;\n    }\n    function Jo(s4, f5) {\n      s4.tail = new He3(f5, s4.tail, null, s4), s4.head || (s4.head = s4.tail), s4.length++;\n    }\n    function Ko2(s4, f5) {\n      s4.head = new He3(f5, null, s4.head, s4), s4.tail || (s4.tail = s4.head), s4.length++;\n    }\n    function He3(s4, f5, p3, h3) {\n      if (!(this instanceof He3)) return new He3(s4, f5, p3, h3);\n      this.list = h3, this.value = s4, f5 ? (f5.next = this, this.prev = f5) : this.prev = null, p3 ? (p3.prev = this, this.next = p3) : this.next = null;\n    }\n    try {\n      Zn()(_5);\n    } catch {\n    }\n  });\n  var ra = Ur((Bu, ea) => {\n    "use strict";\n    var jo = Jn(), _e3 = /* @__PURE__ */ Symbol("max"), Ue4 = /* @__PURE__ */ Symbol("length"), Je4 = /* @__PURE__ */ Symbol("lengthCalculator"), ur2 = /* @__PURE__ */ Symbol("allowStale"), ze4 = /* @__PURE__ */ Symbol("maxAge"), Ee2 = /* @__PURE__ */ Symbol("dispose"), Kn2 = /* @__PURE__ */ Symbol("noDisposeOnSet"), $4 = /* @__PURE__ */ Symbol("lruList"), xe2 = /* @__PURE__ */ Symbol("cache"), $n2 = /* @__PURE__ */ Symbol("updateAgeOnGet"), ht3 = () => 1, vt3 = class {\n      constructor(f5) {\n        if (typeof f5 == "number" && (f5 = { max: f5 }), f5 || (f5 = {}), f5.max && (typeof f5.max != "number" || f5.max < 0)) throw new TypeError("max must be a non-negative number");\n        let p3 = this[_e3] = f5.max || 1 / 0, h3 = f5.length || ht3;\n        if (this[Je4] = typeof h3 != "function" ? ht3 : h3, this[ur2] = f5.stale || false, f5.maxAge && typeof f5.maxAge != "number") throw new TypeError("maxAge must be a number");\n        this[ze4] = f5.maxAge || 0, this[Ee2] = f5.dispose, this[Kn2] = f5.noDisposeOnSet || false, this[$n2] = f5.updateAgeOnGet || false, this.reset();\n      }\n      set max(f5) {\n        if (typeof f5 != "number" || f5 < 0) throw new TypeError("max must be a non-negative number");\n        this[_e3] = f5 || 1 / 0, or3(this);\n      }\n      get max() {\n        return this[_e3];\n      }\n      set allowStale(f5) {\n        this[ur2] = !!f5;\n      }\n      get allowStale() {\n        return this[ur2];\n      }\n      set maxAge(f5) {\n        if (typeof f5 != "number") throw new TypeError("maxAge must be a non-negative number");\n        this[ze4] = f5, or3(this);\n      }\n      get maxAge() {\n        return this[ze4];\n      }\n      set lengthCalculator(f5) {\n        typeof f5 != "function" && (f5 = ht3), f5 !== this[Je4] && (this[Je4] = f5, this[Ue4] = 0, this[$4].forEach((p3) => {\n          p3.length = this[Je4](p3.value, p3.key), this[Ue4] += p3.length;\n        })), or3(this);\n      }\n      get lengthCalculator() {\n        return this[Je4];\n      }\n      get length() {\n        return this[Ue4];\n      }\n      get itemCount() {\n        return this[$4].length;\n      }\n      rforEach(f5, p3) {\n        p3 = p3 || this;\n        for (let h3 = this[$4].tail; h3 !== null; ) {\n          let v6 = h3.prev;\n          jn2(this, f5, h3, p3), h3 = v6;\n        }\n      }\n      forEach(f5, p3) {\n        p3 = p3 || this;\n        for (let h3 = this[$4].head; h3 !== null; ) {\n          let v6 = h3.next;\n          jn2(this, f5, h3, p3), h3 = v6;\n        }\n      }\n      keys() {\n        return this[$4].toArray().map((f5) => f5.key);\n      }\n      values() {\n        return this[$4].toArray().map((f5) => f5.value);\n      }\n      reset() {\n        this[Ee2] && this[$4] && this[$4].length && this[$4].forEach((f5) => this[Ee2](f5.key, f5.value)), this[xe2] = /* @__PURE__ */ new Map(), this[$4] = new jo(), this[Ue4] = 0;\n      }\n      dump() {\n        return this[$4].map((f5) => Rr2(this, f5) ? false : { k: f5.key, v: f5.value, e: f5.now + (f5.maxAge || 0) }).toArray().filter((f5) => f5);\n      }\n      dumpLru() {\n        return this[$4];\n      }\n      set(f5, p3, h3) {\n        if (h3 = h3 || this[ze4], h3 && typeof h3 != "number") throw new TypeError("maxAge must be a number");\n        let v6 = h3 ? Date.now() : 0, x5 = this[Je4](p3, f5);\n        if (this[xe2].has(f5)) {\n          if (x5 > this[_e3]) return Ke4(this, this[xe2].get(f5)), false;\n          let k5 = this[xe2].get(f5).value;\n          return this[Ee2] && (this[Kn2] || this[Ee2](f5, k5.value)), k5.now = v6, k5.maxAge = h3, k5.value = p3, this[Ue4] += x5 - k5.length, k5.length = x5, this.get(f5), or3(this), true;\n        }\n        let S4 = new dt3(f5, p3, x5, v6, h3);\n        return S4.length > this[_e3] ? (this[Ee2] && this[Ee2](f5, p3), false) : (this[Ue4] += S4.length, this[$4].unshift(S4), this[xe2].set(f5, this[$4].head), or3(this), true);\n      }\n      has(f5) {\n        if (!this[xe2].has(f5)) return false;\n        let p3 = this[xe2].get(f5).value;\n        return !Rr2(this, p3);\n      }\n      get(f5) {\n        return ct4(this, f5, true);\n      }\n      peek(f5) {\n        return ct4(this, f5, false);\n      }\n      pop() {\n        let f5 = this[$4].tail;\n        return f5 ? (Ke4(this, f5), f5.value) : null;\n      }\n      del(f5) {\n        Ke4(this, this[xe2].get(f5));\n      }\n      load(f5) {\n        this.reset();\n        let p3 = Date.now();\n        for (let h3 = f5.length - 1; h3 >= 0; h3--) {\n          let v6 = f5[h3], x5 = v6.e || 0;\n          if (x5 === 0) this.set(v6.k, v6.v);\n          else {\n            let S4 = x5 - p3;\n            S4 > 0 && this.set(v6.k, v6.v, S4);\n          }\n        }\n      }\n      prune() {\n        this[xe2].forEach((f5, p3) => ct4(this, p3, false));\n      }\n    }, ct4 = (s4, f5, p3) => {\n      let h3 = s4[xe2].get(f5);\n      if (h3) {\n        let v6 = h3.value;\n        if (Rr2(s4, v6)) {\n          if (Ke4(s4, h3), !s4[ur2]) return;\n        } else p3 && (s4[$n2] && (h3.value.now = Date.now()), s4[$4].unshiftNode(h3));\n        return v6.value;\n      }\n    }, Rr2 = (s4, f5) => {\n      if (!f5 || !f5.maxAge && !s4[ze4]) return false;\n      let p3 = Date.now() - f5.now;\n      return f5.maxAge ? p3 > f5.maxAge : s4[ze4] && p3 > s4[ze4];\n    }, or3 = (s4) => {\n      if (s4[Ue4] > s4[_e3]) for (let f5 = s4[$4].tail; s4[Ue4] > s4[_e3] && f5 !== null; ) {\n        let p3 = f5.prev;\n        Ke4(s4, f5), f5 = p3;\n      }\n    }, Ke4 = (s4, f5) => {\n      if (f5) {\n        let p3 = f5.value;\n        s4[Ee2] && s4[Ee2](p3.key, p3.value), s4[Ue4] -= p3.length, s4[xe2].delete(p3.key), s4[$4].removeNode(f5);\n      }\n    }, dt3 = class {\n      constructor(f5, p3, h3, v6, x5) {\n        this.key = f5, this.value = p3, this.length = h3, this.now = v6, this.maxAge = x5 || 0;\n      }\n    }, jn2 = (s4, f5, p3, h3) => {\n      let v6 = p3.value;\n      Rr2(s4, v6) && (Ke4(s4, p3), s4[ur2] || (v6 = void 0)), v6 && f5.call(h3, v6.value, v6.key, s4);\n    };\n    ea.exports = vt3;\n  });\n  var ta = Wo(Wn());\n  function ar(s4) {\n    let f5 = { individual: {}, range: [] }, p3 = /* @__PURE__ */ new WeakMap();\n    for (let h3 of s4) at3(f5, h3, p3);\n    return f5;\n  }\n  function at3(s4, f5, p3) {\n    for (let [h3, v6] of Object.entries(f5.individual)) if (s4.individual[h3]) Ze3(s4.individual[h3], v6, p3);\n    else {\n      let x5 = false;\n      for (let [S4, { range: L6, entry: k5 }] of s4.range.entries()) {\n        let D7 = nt3(Number(h3), L6);\n        if (D7.both !== null) {\n          x5 = true, s4.individual[h3] = v6, Ze3(s4.individual[h3], ie3(k5), p3), s4.range.splice(S4, 1);\n          for (let V5 of D7.second) Array.isArray(V5) ? s4.range.push({ range: V5, entry: ie3(k5) }) : s4.individual[V5] = ie3(k5);\n        }\n      }\n      x5 || (s4.individual[h3] = v6);\n    }\n    for (let { range: h3, entry: v6 } of f5.range) {\n      let x5 = [h3];\n      for (let S4 = 0; S4 < s4.range.length; S4++) {\n        let { range: L6, entry: k5 } = s4.range[S4];\n        for (let [D7, V5] of x5.entries()) if (Array.isArray(V5)) {\n          let N3 = Vo(V5, L6);\n          if (N3.both === null) continue;\n          s4.range.splice(S4, 1), S4--;\n          let W6 = ie3(k5);\n          Array.isArray(N3.both) ? s4.range.push({ range: N3.both, entry: W6 }) : s4.individual[N3.both] = W6, Ze3(W6, ie3(v6), p3);\n          for (let X3 of N3.second) Array.isArray(X3) ? s4.range.push({ range: X3, entry: ie3(k5) }) : s4.individual[X3] = ie3(k5);\n          x5 = N3.first;\n        } else {\n          let N3 = nt3(V5, L6);\n          if (N3.both === null) continue;\n          s4.individual[V5] = ie3(v6), Ze3(s4.individual[V5], ie3(k5), p3), s4.range.splice(S4, 1), S4--;\n          for (let W6 of N3.second) Array.isArray(W6) ? s4.range.push({ range: W6, entry: ie3(k5) }) : s4.individual[W6] = ie3(k5);\n          x5.splice(D7, 1, ...N3.first);\n          break;\n        }\n      }\n      for (let S4 of Object.keys(s4.individual)) for (let [L6, k5] of x5.entries()) if (Array.isArray(k5)) {\n        let D7 = nt3(Number(S4), k5);\n        if (D7.both === null) continue;\n        Ze3(s4.individual[S4], ie3(v6), p3), x5.splice(L6, 1, ...D7.second);\n        break;\n      } else if (Number(S4) === k5) {\n        Ze3(s4.individual[S4], ie3(v6), p3);\n        break;\n      }\n      for (let S4 of x5) Array.isArray(S4) ? s4.range.push({ range: S4, entry: ie3(v6) }) : s4.individual[S4] = ie3(v6);\n    }\n  }\n  function Ze3(s4, f5, p3) {\n    let h3 = p3.get(s4);\n    h3?.has(f5) || (h3 || (h3 = /* @__PURE__ */ new Set(), p3.set(s4, h3)), h3.add(f5), f5.lookup && (!s4.lookup || s4.lookup.index > f5.lookup.index || s4.lookup.index === f5.lookup.index && s4.lookup.subIndex > f5.lookup.subIndex) && (s4.lookup = f5.lookup), f5.forward && (s4.forward ? at3(s4.forward, f5.forward, p3) : s4.forward = f5.forward), f5.reverse && (s4.reverse ? at3(s4.reverse, f5.reverse, p3) : s4.reverse = f5.reverse));\n  }\n  function Vo(s4, f5) {\n    let p3 = { first: [], second: [], both: null };\n    if (s4[0] < f5[1] && f5[0] < s4[1]) {\n      let h3 = Math.max(s4[0], f5[0]), v6 = Math.min(s4[1], f5[1]);\n      p3.both = Ge3(h3, v6);\n    }\n    if (s4[0] < f5[0]) {\n      let h3 = s4[0], v6 = Math.min(f5[0], s4[1]);\n      p3.first.push(Ge3(h3, v6));\n    } else if (f5[0] < s4[0]) {\n      let h3 = f5[0], v6 = Math.min(f5[1], s4[0]);\n      p3.second.push(Ge3(h3, v6));\n    }\n    if (s4[1] > f5[1]) {\n      let h3 = Math.max(s4[0], f5[1]), v6 = s4[1];\n      p3.first.push(Ge3(h3, v6));\n    } else if (f5[1] > s4[1]) {\n      let h3 = Math.max(s4[1], f5[0]), v6 = f5[1];\n      p3.second.push(Ge3(h3, v6));\n    }\n    return p3;\n  }\n  function nt3(s4, f5) {\n    if (s4 < f5[0] || s4 > f5[1]) return { first: [s4], second: [f5], both: null };\n    let p3 = { first: [], second: [], both: s4 };\n    return f5[0] < s4 && p3.second.push(Ge3(f5[0], s4)), f5[1] > s4 && p3.second.push(Ge3(s4 + 1, f5[1])), p3;\n  }\n  function Ge3(s4, f5) {\n    return f5 - s4 === 1 ? s4 : [s4, f5];\n  }\n  function ie3(s4, f5 = /* @__PURE__ */ new Map()) {\n    if (f5.has(s4)) return f5.get(s4);\n    let p3 = {};\n    return f5.set(s4, p3), s4.forward && (p3.forward = Vn(s4.forward, f5)), s4.reverse && (p3.reverse = Vn(s4.reverse, f5)), s4.lookup && (p3.lookup = { contextRange: s4.lookup.contextRange.slice(), index: s4.lookup.index, length: s4.lookup.length, subIndex: s4.lookup.subIndex, substitutions: s4.lookup.substitutions.slice() }), p3;\n  }\n  function Vn(s4, f5 = /* @__PURE__ */ new Map()) {\n    let p3 = {};\n    for (let [h3, v6] of Object.entries(s4.individual)) p3[h3] = ie3(v6, f5);\n    return { individual: p3, range: s4.range.map(({ range: h3, entry: v6 }) => ({ range: h3.slice(), entry: ie3(v6, f5) })) };\n  }\n  function ir(s4, f5, p3, h3) {\n    let v6 = f5[h3], x5 = s4[v6];\n    if (!x5) return;\n    let S4 = x5.lookup;\n    if (x5.reverse) {\n      let k5 = qo(x5.reverse, f5, p3);\n      (!S4 && k5 || k5 && S4 && (S4.index > k5.index || S4.index === k5.index && S4.subIndex > k5.subIndex)) && (S4 = k5);\n    }\n    if (++h3 >= f5.length || !x5.forward) return S4;\n    let L6 = ir(x5.forward, f5, p3, h3);\n    return (!S4 && L6 || L6 && S4 && (S4.index > L6.index || S4.index === L6.index && S4.subIndex > L6.subIndex)) && (S4 = L6), S4;\n  }\n  function qo(s4, f5, p3) {\n    let h3 = s4[f5[--p3]], v6 = h3 && h3.lookup;\n    for (; h3 && ((!v6 && h3.lookup || h3.lookup && v6 && v6.index > h3.lookup.index) && (v6 = h3.lookup), !(--p3 < 0 || !h3.reverse)); ) h3 = h3.reverse[f5[p3]];\n    return v6;\n  }\n  function Ir(s4, f5, p3) {\n    let h3 = false;\n    for (let v6 = 0; v6 < s4.length; v6++) {\n      let x5 = s4[v6];\n      if (h3) {\n        if (p3 <= x5[0]) return s4[v6 - 1][1] = p3, s4;\n        if (p3 <= x5[1]) return s4[v6 - 1][1] = Math.max(p3, x5[1]), s4.splice(v6, 1), h3 = false, s4;\n        s4.splice(v6, 1), v6--;\n      } else {\n        if (p3 <= x5[0]) return s4.splice(v6, 0, [f5, p3]), s4;\n        if (p3 <= x5[1]) return x5[0] = Math.min(f5, x5[0]), s4;\n        if (f5 < x5[1]) x5[0] = Math.min(f5, x5[0]), h3 = true;\n        else continue;\n      }\n    }\n    return h3 ? s4[s4.length - 1][1] = p3 : s4.push([f5, p3]), s4;\n  }\n  function it3(s4, f5) {\n    switch (s4.format) {\n      case 1:\n        let p3 = s4.glyphs.indexOf(f5);\n        return p3 !== -1 ? p3 : null;\n      case 2:\n        let h3 = s4.ranges.find((v6) => v6.start <= f5 && v6.end >= f5);\n        return h3 ? h3.index : null;\n    }\n  }\n  function ce3(s4) {\n    switch (s4.format) {\n      case 1:\n        return s4.glyphs.map((p3, h3) => ({ glyphId: p3, index: h3 }));\n      case 2:\n        let f5 = [];\n        for (let [p3, h3] of s4.ranges.entries()) h3.end === h3.start ? f5.push({ glyphId: h3.start, index: p3 }) : f5.push({ glyphId: [h3.start, h3.end + 1], index: p3 });\n        return f5;\n    }\n  }\n  function qn(s4, f5) {\n    let p3 = f5[0], h3 = Cr(s4, p3), v6 = f5[0] + 1, x5 = /* @__PURE__ */ new Map();\n    for (; v6 < f5[1]; ) Cr(s4, v6) !== h3 && (v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3)), v6++;\n    return v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3), x5;\n  }\n  function Cr(s4, f5) {\n    let p3 = it3(s4.coverage, f5);\n    if (p3 === null) return null;\n    switch (s4.substFormat) {\n      case 1:\n        return (f5 + s4.deltaGlyphId) % 2 ** 16;\n      case 2:\n        return s4.substitute[p3] ?? null;\n    }\n  }\n  function Qe2(s4, f5, p3, h3, v6) {\n    let x5 = [];\n    for (let S4 of p3) {\n      S4.entry.forward = { individual: {}, range: [] };\n      for (let L6 of s4) x5.push(...Ne2(S4.entry.forward, h3, v6, f5, L6).map(({ entry: k5, substitution: D7 }) => ({ entry: k5, substitutions: [...S4.substitutions, D7] })));\n    }\n    return x5;\n  }\n  function Re3(s4, f5) {\n    let p3 = [], h3 = /* @__PURE__ */ new Set();\n    for (let v6 of f5) {\n      if (h3.has(v6.entry)) continue;\n      h3.add(v6.entry), v6.entry.forward ??= { individual: {}, range: [] };\n      let x5 = {};\n      for (let S4 of s4) Array.isArray(S4) ? v6.entry.forward.range.push({ entry: x5, range: S4 }) : v6.entry.forward.individual[S4] = x5;\n      p3.push({ entry: x5, substitutions: v6.substitutions });\n    }\n    return p3;\n  }\n  function De3(s4, f5) {\n    let p3 = [], h3 = /* @__PURE__ */ new Set();\n    for (let v6 of f5) {\n      if (h3.has(v6.entry)) continue;\n      h3.add(v6.entry), v6.entry.reverse ??= { individual: {}, range: [] };\n      let x5 = {};\n      for (let S4 of s4) Array.isArray(S4) ? v6.entry.reverse.range.push({ entry: x5, range: S4 }) : v6.entry.reverse.individual[S4] = x5;\n      p3.push({ entry: x5, substitutions: v6.substitutions });\n    }\n    return p3;\n  }\n  function Ne2(s4, f5, p3, h3, v6) {\n    let x5 = [];\n    if (!Array.isArray(v6)) s4.individual[v6] = {}, x5.push({ entry: s4.individual[v6], substitution: Yo(f5, p3, h3, v6) });\n    else {\n      let S4 = Xo(f5, p3, h3, v6);\n      for (let [L6, k5] of S4) {\n        let D7 = {};\n        Array.isArray(L6) ? s4.range.push({ range: L6, entry: D7 }) : s4.individual[L6] = {}, x5.push({ entry: D7, substitution: k5 });\n      }\n    }\n    return x5;\n  }\n  function Xo(s4, f5, p3, h3) {\n    for (let v6 of s4.filter((x5) => x5.sequenceIndex === p3)) for (let x5 of f5[v6.lookupListIndex].subtables) {\n      let S4 = qn(x5, h3);\n      if (!Array.from(S4.values()).every((L6) => L6 !== null)) return S4;\n    }\n    return /* @__PURE__ */ new Map([[h3, null]]);\n  }\n  function Yo(s4, f5, p3, h3) {\n    for (let v6 of s4.filter((x5) => x5.sequenceIndex === p3)) for (let x5 of f5[v6.lookupListIndex].subtables) {\n      let S4 = Cr(x5, h3);\n      if (S4 !== null) return S4;\n    }\n    return null;\n  }\n  function st3(s4, f5, p3) {\n    let h3 = { individual: {}, range: [] }, v6 = ce3(s4.coverage);\n    for (let { glyphId: x5, index: S4 } of v6) {\n      let L6 = s4.chainRuleSets[S4];\n      if (L6) for (let [k5, D7] of L6.entries()) {\n        let V5 = Ne2(h3, D7.lookupRecords, f5, 0, x5).map(({ entry: N3, substitution: W6 }) => ({ entry: N3, substitutions: [W6] }));\n        for (let [N3, W6] of D7.input.entries()) V5 = Qe2([W6], N3 + 1, V5, D7.lookupRecords, f5);\n        for (let N3 of D7.lookahead) V5 = Re3([N3], V5);\n        for (let N3 of D7.backtrack) V5 = De3([N3], V5);\n        for (let { entry: N3, substitutions: W6 } of V5) N3.lookup = { substitutions: W6, length: D7.input.length + 1, index: p3, subIndex: k5, contextRange: [-1 * D7.backtrack.length, 1 + D7.input.length + D7.lookahead.length] };\n      }\n    }\n    return h3;\n  }\n  function ut2(s4, f5) {\n    switch (s4.format) {\n      case 2:\n        return Array.isArray(f5) ? Zo(s4, f5) : /* @__PURE__ */ new Map([[f5, ot3(s4, f5)]]);\n      default:\n        return /* @__PURE__ */ new Map([[f5, null]]);\n    }\n  }\n  function Zo(s4, f5) {\n    let p3 = f5[0], h3 = ot3(s4, p3), v6 = f5[0] + 1, x5 = /* @__PURE__ */ new Map();\n    for (; v6 < f5[1]; ) ot3(s4, v6) !== h3 && (v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3)), v6++;\n    return v6 - p3 <= 1 ? x5.set(p3, h3) : x5.set([p3, v6], h3), x5;\n  }\n  function ot3(s4, f5) {\n    for (let p3 of s4.ranges) if (p3.start <= f5 && p3.end >= f5) return p3.classId;\n    return null;\n  }\n  function wr(s4, f5) {\n    switch (s4.format) {\n      case 2:\n        let p3 = [];\n        for (let h3 of s4.ranges) h3.classId === f5 && (h3.end === h3.start ? p3.push(h3.start) : p3.push([h3.start, h3.end + 1]));\n        return p3;\n      default:\n        return [];\n    }\n  }\n  function lt2(s4, f5, p3) {\n    let h3 = [], v6 = ce3(s4.coverage);\n    for (let { glyphId: x5 } of v6) {\n      let S4 = ut2(s4.inputClassDef, x5);\n      for (let [L6, k5] of S4.entries()) {\n        if (k5 === null) continue;\n        let D7 = s4.chainClassSet[k5];\n        if (D7) for (let [V5, N3] of D7.entries()) {\n          let W6 = { individual: {}, range: [] }, X3 = Ne2(W6, N3.lookupRecords, f5, 0, L6).map(({ entry: ve3, substitution: Ae3 }) => ({ entry: ve3, substitutions: [Ae3] }));\n          for (let [ve3, Ae3] of N3.input.entries()) X3 = Qe2(wr(s4.inputClassDef, Ae3), ve3 + 1, X3, N3.lookupRecords, f5);\n          for (let ve3 of N3.lookahead) X3 = Re3(wr(s4.lookaheadClassDef, ve3), X3);\n          for (let ve3 of N3.backtrack) X3 = De3(wr(s4.backtrackClassDef, ve3), X3);\n          for (let { entry: ve3, substitutions: Ae3 } of X3) ve3.lookup = { substitutions: Ae3, index: p3, subIndex: V5, length: N3.input.length + 1, contextRange: [-1 * N3.backtrack.length, 1 + N3.input.length + N3.lookahead.length] };\n          h3.push(W6);\n        }\n      }\n    }\n    return ar(h3);\n  }\n  function ft2(s4, f5, p3) {\n    let h3 = { individual: {}, range: [] }, v6 = ce3(s4.inputCoverage[0]);\n    for (let { glyphId: x5 } of v6) {\n      let S4 = Ne2(h3, s4.lookupRecords, f5, 0, x5).map(({ entry: L6, substitution: k5 }) => ({ entry: L6, substitutions: [k5] }));\n      for (let [L6, k5] of s4.inputCoverage.slice(1).entries()) S4 = Qe2(ce3(k5).map((D7) => D7.glyphId), L6 + 1, S4, s4.lookupRecords, f5);\n      for (let L6 of s4.lookaheadCoverage) S4 = Re3(ce3(L6).map((k5) => k5.glyphId), S4);\n      for (let L6 of s4.backtrackCoverage) S4 = De3(ce3(L6).map((k5) => k5.glyphId), S4);\n      for (let { entry: L6, substitutions: k5 } of S4) L6.lookup = { substitutions: k5, index: p3, subIndex: 0, length: s4.inputCoverage.length, contextRange: [-1 * s4.backtrackCoverage.length, s4.inputCoverage.length + s4.lookaheadCoverage.length] };\n    }\n    return h3;\n  }\n  function pt2(s4, f5) {\n    let p3 = { individual: {}, range: [] }, h3 = ce3(s4.coverage);\n    for (let { glyphId: v6, index: x5 } of h3) {\n      let S4 = {};\n      Array.isArray(v6) ? p3.range.push({ entry: S4, range: v6 }) : p3.individual[v6] = S4;\n      let L6 = [{ entry: S4, substitutions: [s4.substitutes[x5]] }];\n      for (let k5 of s4.lookaheadCoverage) L6 = Re3(ce3(k5).map((D7) => D7.glyphId), L6);\n      for (let k5 of s4.backtrackCoverage) L6 = De3(ce3(k5).map((D7) => D7.glyphId), L6);\n      for (let { entry: k5, substitutions: D7 } of L6) k5.lookup = { substitutions: D7, index: f5, subIndex: 0, length: 1, contextRange: [-1 * s4.backtrackCoverage.length, 1 + s4.lookaheadCoverage.length] };\n    }\n    return p3;\n  }\n  function sr(s4, f5 = /* @__PURE__ */ new Map()) {\n    let p3 = {};\n    for (let [h3, v6] of Object.entries(s4.individual)) p3[h3] = Xn(v6, f5);\n    for (let { range: h3, entry: v6 } of s4.range) {\n      let x5 = Xn(v6, f5);\n      for (let S4 = h3[0]; S4 < h3[1]; S4++) p3[S4] = x5;\n    }\n    return p3;\n  }\n  function Xn(s4, f5) {\n    if (f5.has(s4)) return f5.get(s4);\n    let p3 = {};\n    return f5.set(s4, p3), s4.forward && (p3.forward = sr(s4.forward, f5)), s4.reverse && (p3.reverse = sr(s4.reverse, f5)), s4.lookup && (p3.lookup = s4.lookup), p3;\n  }\n  var $o = ra();\n  var gt = class {\n    constructor(f5, p3) {\n      this._lookupTrees = [];\n      this._glyphLookups = {};\n      this._font = f5, p3.cacheSize > 0 && (this._cache = new $o({ max: p3.cacheSize, length: ((L6, k5) => k5.length) }));\n      let v6 = (this._font.tables.gsub && this._font.tables.gsub.features.filter((L6) => L6.tag === "calt") || []).reduce((L6, k5) => [...L6, ...k5.feature.lookupListIndexes], []), x5 = this._font.tables.gsub && this._font.tables.gsub.lookups || [], S4 = x5.filter((L6, k5) => v6.some((D7) => D7 === k5));\n      for (let [L6, k5] of S4.entries()) {\n        let D7 = [];\n        switch (k5.lookupType) {\n          case 6:\n            for (let [N3, W6] of k5.subtables.entries()) switch (W6.substFormat) {\n              case 1:\n                D7.push(st3(W6, x5, N3));\n                break;\n              case 2:\n                D7.push(lt2(W6, x5, N3));\n                break;\n              case 3:\n                D7.push(ft2(W6, x5, N3));\n                break;\n            }\n            break;\n          case 8:\n            for (let [N3, W6] of k5.subtables.entries()) D7.push(pt2(W6, N3));\n            break;\n        }\n        let V5 = sr(ar(D7));\n        this._lookupTrees.push({ tree: V5, processForward: k5.lookupType !== 8 });\n        for (let N3 of Object.keys(V5)) this._glyphLookups[N3] || (this._glyphLookups[N3] = []), this._glyphLookups[N3].push(L6);\n      }\n    }\n    findLigatures(f5) {\n      let p3 = this._cache && this._cache.get(f5);\n      if (p3 && !Array.isArray(p3)) return p3;\n      let h3 = [];\n      for (let S4 of f5) h3.push(this._font.charToGlyphIndex(S4));\n      if (this._lookupTrees.length === 0) return { inputGlyphs: h3, outputGlyphs: h3, contextRanges: [] };\n      let v6 = this._findInternal(h3.slice()), x5 = { inputGlyphs: h3, outputGlyphs: v6.sequence, contextRanges: v6.ranges };\n      return this._cache && this._cache.set(f5, x5), x5;\n    }\n    findLigatureRanges(f5) {\n      if (this._lookupTrees.length === 0) return [];\n      let p3 = this._cache && this._cache.get(f5);\n      if (p3) return Array.isArray(p3) ? p3 : p3.contextRanges;\n      let h3 = [];\n      for (let x5 of f5) h3.push(this._font.charToGlyphIndex(x5));\n      let v6 = this._findInternal(h3);\n      return this._cache && this._cache.set(f5, v6.ranges), v6.ranges;\n    }\n    _findInternal(f5) {\n      let p3 = [], h3 = this._getNextLookup(f5, 0);\n      for (; h3.index !== null; ) {\n        let v6 = this._lookupTrees[h3.index];\n        if (v6.processForward) {\n          let x5 = h3.last;\n          for (let S4 = h3.first; S4 < x5; S4++) {\n            let L6 = ir(v6.tree, f5, S4, S4);\n            if (L6) {\n              for (let k5 = 0; k5 < L6.substitutions.length; k5++) {\n                let D7 = L6.substitutions[k5];\n                D7 !== null && (f5[S4 + k5] = D7);\n              }\n              Ir(p3, L6.contextRange[0] + S4, L6.contextRange[1] + S4), S4 + L6.length >= x5 && (x5 = S4 + L6.length + 1), S4 += L6.length - 1;\n            }\n          }\n        } else for (let x5 = h3.last - 1; x5 >= h3.first; x5--) {\n          let S4 = ir(v6.tree, f5, x5, x5);\n          if (S4) {\n            for (let L6 = 0; L6 < S4.substitutions.length; L6++) {\n              let k5 = S4.substitutions[L6];\n              k5 !== null && (f5[x5 + L6] = k5);\n            }\n            Ir(p3, S4.contextRange[0] + x5, S4.contextRange[1] + x5), x5 -= S4.length - 1;\n          }\n        }\n        h3 = this._getNextLookup(f5, h3.index + 1);\n      }\n      return { sequence: f5, ranges: p3 };\n    }\n    _getNextLookup(f5, p3) {\n      let h3 = { index: null, first: 1 / 0, last: -1 };\n      for (let v6 = 0; v6 < f5.length; v6++) {\n        let x5 = this._glyphLookups[f5[v6]];\n        if (x5) for (let S4 = 0; S4 < x5.length; S4++) {\n          let L6 = x5[S4];\n          if (L6 >= p3) {\n            (h3.index === null || L6 <= h3.index) && (h3.index = L6, h3.first > v6 && (h3.first = v6), h3.last = v6 + 1);\n            break;\n          }\n        }\n      }\n      return h3;\n    }\n  };\n  function na(s4, f5) {\n    let p3 = ta.parse(s4);\n    return new gt(p3, { cacheSize: 0, ...f5 });\n  }\n  function yt2(s4) {\n    if (typeof s4 != "string") throw new Error("Font family must be a string");\n    let f5 = { input: s4, offset: 0 }, p3 = [], h3 = "";\n    for (; f5.offset < f5.input.length; ) {\n      let v6 = f5.input[f5.offset++];\n      switch (v6) {\n        case "\'":\n        case \'"\':\n          h3 += eu(f5, v6);\n          break;\n        case ",":\n          p3.push(h3), h3 = "";\n          break;\n        default:\n          /\\s/.test(v6) || (f5.offset--, h3 += ru(f5), p3.push(h3), h3 = "");\n      }\n    }\n    return p3;\n  }\n  function eu(s4, f5) {\n    let p3 = "", h3 = false;\n    for (; s4.offset < s4.input.length; ) {\n      let v6 = s4.input[s4.offset++];\n      if (h3) /[\\dA-Fa-f]/.test(v6) ? (s4.offset--, p3 += aa(s4)) : v6 !== `\n` && (p3 += v6), h3 = false;\n      else switch (v6) {\n        case f5:\n          return p3;\n        case "\\\\":\n          h3 = true;\n          break;\n        default:\n          p3 += v6;\n      }\n    }\n    throw new Error("Unterminated string");\n  }\n  function ru(s4) {\n    let f5 = "", p3 = false;\n    for (; s4.offset < s4.input.length; ) {\n      let h3 = s4.input[s4.offset++];\n      if (p3) /[\\dA-Fa-f]/.test(h3) ? (s4.offset--, f5 += aa(s4)) : f5 += h3, p3 = false;\n      else switch (h3) {\n        case "\\\\":\n          p3 = true;\n          break;\n        case ",":\n          return f5;\n        default:\n          /\\s/.test(h3) ? f5.endsWith(" ") || (f5 += " ") : f5 += h3;\n      }\n    }\n    return f5;\n  }\n  function aa(s4) {\n    let f5 = "";\n    for (; s4.offset < s4.input.length; ) {\n      let p3 = s4.input[s4.offset++];\n      if (/\\s/.test(p3)) return mt2(f5);\n      if (f5.length >= 6 || !/[\\dA-Fa-f]/.test(p3)) return s4.offset--, mt2(f5);\n      f5 += p3;\n    }\n    return mt2(f5);\n  }\n  function mt2(s4) {\n    return String.fromCodePoint(parseInt(s4, 16));\n  }\n  var lr;\n  async function bt3(s4, f5) {\n    if (!lr) {\n      if (typeof navigator < "u" && "fonts" in navigator) {\n        try {\n          let v6 = await navigator.permissions.request?.({ name: "local-fonts" });\n          if (v6 && v6.state !== "granted") throw new Error("Permission to access local fonts not granted.");\n        } catch (v6) {\n          if (v6 instanceof Error && v6.name !== "TypeError") throw v6;\n        }\n        let h3 = {};\n        try {\n          let v6 = await navigator.fonts.query();\n          for (let x5 of v6) h3.hasOwnProperty(x5.family) || (h3[x5.family] = []), h3[x5.family].push(x5);\n          lr = Promise.resolve(h3);\n        } catch (v6) {\n          v6 instanceof Error && console.error(v6.name, v6.message);\n        }\n      } else if (typeof window < "u" && "queryLocalFonts" in window) {\n        let h3 = {};\n        try {\n          let v6 = await window.queryLocalFonts();\n          for (let x5 of v6) h3.hasOwnProperty(x5.family) || (h3[x5.family] = []), h3[x5.family].push(x5);\n          lr = Promise.resolve(h3);\n        } catch (v6) {\n          v6 instanceof Error && console.error(v6.name, v6.message);\n        }\n      }\n      lr ??= Promise.resolve({});\n    }\n    let p3 = await lr;\n    for (let h3 of yt2(s4)) {\n      if (tu.includes(h3)) return;\n      if (p3.hasOwnProperty(h3) && p3[h3].length > 0) {\n        let v6 = p3[h3][0];\n        if ("blob" in v6) {\n          let S4 = await (await v6.blob()).arrayBuffer();\n          return na(S4, { cacheSize: f5 });\n        }\n        return;\n      }\n    }\n  }\n  var tu = ["serif", "sans-serif", "cursive", "fantasy", "monospace", "system-ui", "emoji", "math", "fangsong"];\n  var nu = 1e5;\n  function ia(s4, f5 = []) {\n    let p3, h3, v6 = 0, x5;\n    return s4.registerCharacterJoiner((S4) => {\n      let L6 = s4.options.fontFamily;\n      if (L6 && (v6 === 0 || p3 !== L6)) {\n        h3 = void 0, v6 = 1, p3 = L6;\n        let k5 = p3;\n        bt3(k5, nu).then((D7) => {\n          k5 === s4.options.fontFamily && (v6 = 2, h3 = D7, D7 && s4.refresh(0, s4.rows - 1));\n        }).catch((D7) => {\n          k5 === s4.options.fontFamily && (v6 = 3, s4.options.logLevel === "debug" && console.debug(x5, new Error("Failure while loading font")), h3 = void 0, x5 = D7);\n        });\n      }\n      return h3 && v6 === 2 ? h3.findLigatureRanges(S4).map((k5) => [k5[0], k5[1]]) : au(S4, f5);\n    });\n  }\n  function au(s4, f5) {\n    let p3 = [];\n    for (let h3 = 0; h3 < s4.length; h3++) for (let v6 = 0; v6 < f5.length; v6++) if (s4.startsWith(f5[v6], h3)) {\n      p3.push([h3, h3 + f5[v6].length]), h3 += f5[v6].length - 1;\n      break;\n    }\n    return p3;\n  }\n  var sa = class {\n    constructor(f5) {\n      this._fallbackLigatures = (f5?.fallbackLigatures ?? ["<--", "<---", "<<-", "<-", "->", "->>", "-->", "--->", "<==", "<===", "<<=", "<=", "=>", "=>>", "==>", "===>", ">=", ">>=", "<->", "<-->", "<--->", "<---->", "<=>", "<==>", "<===>", "<====>", "::", ":::", "<~~", "</", "</>", "/>", "~~>", "==", "!=", "/=", "~=", "<>", "===", "!==", "!===", "<:", ":=", "*=", "*+", "<*", "<*>", "*>", "<|", "<|>", "|>", "+*", "=*", "=:", ":>", "/*", "*/", "+++", "<!--", "<!---"]).sort((p3, h3) => h3.length - p3.length), this._fontFeatureSettings = f5?.fontFeatureSettings;\n    }\n    activate(f5) {\n      if (!f5.element) throw new Error("Cannot activate LigaturesAddon before open is called");\n      this._terminal = f5, this._characterJoinerId = ia(f5, this._fallbackLigatures), f5.element.style.fontFeatureSettings = this._fontFeatureSettings ?? \'"calt" on\';\n    }\n    dispose() {\n      this._characterJoinerId !== void 0 && (this._terminal?.deregisterCharacterJoiner(this._characterJoinerId), this._characterJoinerId = void 0), this._terminal?.element && (this._terminal.element.style.fontFeatureSettings = "");\n    }\n  };\n\n  // node_modules/@xterm/xterm/lib/xterm.mjs\n  var Us = Object.defineProperty;\n  var Yn = Object.getOwnPropertyDescriptor;\n  var Xn2 = (n11, t) => {\n    for (var e in t) Us(n11, e, { get: t[e], enumerable: true });\n  };\n  var E4 = (n11, t, e, i5) => {\n    for (var r = i5 > 1 ? void 0 : i5 ? Yn(t, e) : t, s4 = n11.length - 1, o2; s4 >= 0; s4--) (o2 = n11[s4]) && (r = (i5 ? o2(t, e, r) : o2(r)) || r);\n    return i5 && r && Us(t, e, r), r;\n  };\n  var m3 = (n11, t) => (e, i5) => t(e, i5, n11);\n  var Ks = "Terminal input";\n  var zt2 = { get: () => Ks, set: (n11) => Ks = n11 };\n  var zs = "Too much output to announce, navigate to rows manually to read";\n  var Je3 = { get: () => zs, set: (n11) => zs = n11 };\n  function jn(n11) {\n    return n11.replace(/\\r?\\n/g, "\\r");\n  }\n  function Zn2(n11, t) {\n    return t ? `\\x1B[200~${n11.replace(/\\x1b/g, "\\u241B")}\\x1B[201~` : n11;\n  }\n  function Gs(n11, t) {\n    n11.clipboardData && n11.clipboardData.setData("text/plain", t.selectionText), n11.preventDefault();\n  }\n  function $s(n11, t, e, i5) {\n    if (n11.stopPropagation(), n11.clipboardData) {\n      let r = n11.clipboardData.getData("text/plain");\n      Hr(r, t, e, i5);\n    }\n  }\n  function Hr(n11, t, e, i5) {\n    n11 = jn(n11), n11 = Zn2(n11, e.decPrivateModes.bracketedPasteMode && i5.rawOptions.ignoreBracketedPasteMode !== true), e.triggerDataEvent(n11, true), t.value = "";\n  }\n  function Wr(n11, t, e) {\n    let i5 = e.getBoundingClientRect(), r = n11.clientX - i5.left - 10, s4 = n11.clientY - i5.top - 10;\n    t.style.width = "20px", t.style.height = "20px", t.style.left = `${r}px`, t.style.top = `${s4}px`, t.style.zIndex = "1000", t.focus();\n  }\n  function Ur2(n11, t, e, i5, r) {\n    Wr(n11, t, e), r && i5.rightClickSelect(n11), t.value = i5.selectionText, t.select();\n  }\n  function ve2(n11) {\n    return n11 > 65535 ? (n11 -= 65536, String.fromCharCode((n11 >> 10) + 55296) + String.fromCharCode(n11 % 1024 + 56320)) : String.fromCharCode(n11);\n  }\n  function ye2(n11, t = 0, e = n11.length) {\n    let i5 = "";\n    for (let r = t; r < e; ++r) {\n      let s4 = n11[r];\n      s4 > 65535 ? (s4 -= 65536, i5 += String.fromCharCode((s4 >> 10) + 55296) + String.fromCharCode(s4 % 1024 + 56320)) : i5 += String.fromCharCode(s4);\n    }\n    return i5;\n  }\n  var Si = class {\n    constructor() {\n      this._interim = 0;\n    }\n    clear() {\n      this._interim = 0;\n    }\n    decode(t, e) {\n      let i5 = t.length;\n      if (!i5) return 0;\n      let r = 0, s4 = 0;\n      if (this._interim) {\n        let o2 = t.charCodeAt(s4++);\n        56320 <= o2 && o2 <= 57343 ? e[r++] = (this._interim - 55296) * 1024 + o2 - 56320 + 65536 : (e[r++] = this._interim, e[r++] = o2), this._interim = 0;\n      }\n      for (let o2 = s4; o2 < i5; ++o2) {\n        let a2 = t.charCodeAt(o2);\n        if (55296 <= a2 && a2 <= 56319) {\n          if (++o2 >= i5) return this._interim = a2, r;\n          let l4 = t.charCodeAt(o2);\n          56320 <= l4 && l4 <= 57343 ? e[r++] = (a2 - 55296) * 1024 + l4 - 56320 + 65536 : (e[r++] = a2, e[r++] = l4);\n          continue;\n        }\n        a2 !== 65279 && (e[r++] = a2);\n      }\n      return r;\n    }\n  };\n  var gi = class {\n    constructor() {\n      this.interim = new Uint8Array(3);\n    }\n    clear() {\n      this.interim.fill(0);\n    }\n    decode(t, e) {\n      let i5 = t.length;\n      if (!i5) return 0;\n      let r = 0, s4, o2, a2, l4, h3 = 0, d3 = 0;\n      if (this.interim[0]) {\n        let _5 = false, p3 = this.interim[0];\n        p3 &= (p3 & 224) === 192 ? 31 : (p3 & 240) === 224 ? 15 : 7;\n        let b4 = 0, f5;\n        for (; (f5 = this.interim[++b4] & 63) && b4 < 4; ) p3 <<= 6, p3 |= f5;\n        let S4 = (this.interim[0] & 224) === 192 ? 2 : (this.interim[0] & 240) === 224 ? 3 : 4, I4 = S4 - b4;\n        for (; d3 < I4; ) {\n          if (d3 >= i5) return 0;\n          if (f5 = t[d3++], (f5 & 192) !== 128) {\n            d3--, _5 = true;\n            break;\n          } else this.interim[b4++] = f5, p3 <<= 6, p3 |= f5 & 63;\n        }\n        _5 || (S4 === 2 ? p3 < 128 ? d3-- : e[r++] = p3 : S4 === 3 ? p3 < 2048 || p3 >= 55296 && p3 <= 57343 || p3 === 65279 || (e[r++] = p3) : p3 < 65536 || p3 > 1114111 || (e[r++] = p3)), this.interim.fill(0);\n      }\n      let c2 = i5 - 4, u3 = d3;\n      for (; u3 < i5; ) {\n        for (; u3 < c2 && !((s4 = t[u3]) & 128) && !((o2 = t[u3 + 1]) & 128) && !((a2 = t[u3 + 2]) & 128) && !((l4 = t[u3 + 3]) & 128); ) e[r++] = s4, e[r++] = o2, e[r++] = a2, e[r++] = l4, u3 += 4;\n        if (s4 = t[u3++], s4 < 128) e[r++] = s4;\n        else if ((s4 & 224) === 192) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 31) << 6 | o2 & 63, h3 < 128) {\n            u3--;\n            continue;\n          }\n          e[r++] = h3;\n        } else if ((s4 & 240) === 224) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, r;\n          if (a2 = t[u3++], (a2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 15) << 12 | (o2 & 63) << 6 | a2 & 63, h3 < 2048 || h3 >= 55296 && h3 <= 57343 || h3 === 65279) continue;\n          e[r++] = h3;\n        } else if ((s4 & 248) === 240) {\n          if (u3 >= i5) return this.interim[0] = s4, r;\n          if (o2 = t[u3++], (o2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, r;\n          if (a2 = t[u3++], (a2 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (u3 >= i5) return this.interim[0] = s4, this.interim[1] = o2, this.interim[2] = a2, r;\n          if (l4 = t[u3++], (l4 & 192) !== 128) {\n            u3--;\n            continue;\n          }\n          if (h3 = (s4 & 7) << 18 | (o2 & 63) << 12 | (a2 & 63) << 6 | l4 & 63, h3 < 65536 || h3 > 1114111) continue;\n          e[r++] = h3;\n        }\n      }\n      return r;\n    }\n  };\n  var fe2 = class n2 {\n    constructor() {\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Pe2();\n    }\n    static toColorRGB(t) {\n      return [t >>> 16 & 255, t >>> 8 & 255, t & 255];\n    }\n    static fromColorRGB(t) {\n      return (t[0] & 255) << 16 | (t[1] & 255) << 8 | t[2] & 255;\n    }\n    clone() {\n      let t = new n2();\n      return t.fg = this.fg, t.bg = this.bg, t.extended = this.extended.clone(), t;\n    }\n    isInverse() {\n      return this.fg & 67108864;\n    }\n    isBold() {\n      return this.fg & 134217728;\n    }\n    isUnderline() {\n      return this.hasExtendedAttrs() && this.extended.underlineStyle !== 0 ? 1 : this.fg & 268435456;\n    }\n    isBlink() {\n      return this.fg & 536870912;\n    }\n    isInvisible() {\n      return this.fg & 1073741824;\n    }\n    isItalic() {\n      return this.bg & 67108864;\n    }\n    isDim() {\n      return this.bg & 134217728;\n    }\n    isStrikethrough() {\n      return this.fg & 2147483648;\n    }\n    isProtected() {\n      return this.bg & 536870912;\n    }\n    isOverline() {\n      return this.bg & 1073741824;\n    }\n    getFgColorMode() {\n      return this.fg & 50331648;\n    }\n    getBgColorMode() {\n      return this.bg & 50331648;\n    }\n    isFgRGB() {\n      return (this.fg & 50331648) === 50331648;\n    }\n    isBgRGB() {\n      return (this.bg & 50331648) === 50331648;\n    }\n    isFgPalette() {\n      return (this.fg & 50331648) === 16777216 || (this.fg & 50331648) === 33554432;\n    }\n    isBgPalette() {\n      return (this.bg & 50331648) === 16777216 || (this.bg & 50331648) === 33554432;\n    }\n    isFgDefault() {\n      return (this.fg & 50331648) === 0;\n    }\n    isBgDefault() {\n      return (this.bg & 50331648) === 0;\n    }\n    isAttributeDefault() {\n      return this.fg === 0 && this.bg === 0;\n    }\n    getFgColor() {\n      switch (this.fg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.fg & 255;\n        case 50331648:\n          return this.fg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    getBgColor() {\n      switch (this.bg & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.bg & 255;\n        case 50331648:\n          return this.bg & 16777215;\n        default:\n          return -1;\n      }\n    }\n    hasExtendedAttrs() {\n      return this.bg & 268435456;\n    }\n    updateExtended() {\n      this.extended.isEmpty() ? this.bg &= -268435457 : this.bg |= 268435456;\n    }\n    getUnderlineColor() {\n      if (this.bg & 268435456 && ~this.extended.underlineColor) switch (this.extended.underlineColor & 50331648) {\n        case 16777216:\n        case 33554432:\n          return this.extended.underlineColor & 255;\n        case 50331648:\n          return this.extended.underlineColor & 16777215;\n        default:\n          return this.getFgColor();\n      }\n      return this.getFgColor();\n    }\n    getUnderlineColorMode() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? this.extended.underlineColor & 50331648 : this.getFgColorMode();\n    }\n    isUnderlineColorRGB() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 50331648 : this.isFgRGB();\n    }\n    isUnderlineColorPalette() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 16777216 || (this.extended.underlineColor & 50331648) === 33554432 : this.isFgPalette();\n    }\n    isUnderlineColorDefault() {\n      return this.bg & 268435456 && ~this.extended.underlineColor ? (this.extended.underlineColor & 50331648) === 0 : this.isFgDefault();\n    }\n    getUnderlineStyle() {\n      return this.fg & 268435456 ? this.bg & 268435456 ? this.extended.underlineStyle : 1 : 0;\n    }\n    getUnderlineVariantOffset() {\n      return this.extended.underlineVariantOffset;\n    }\n  };\n  var Pe2 = class n3 {\n    constructor(t = 0, e = 0) {\n      this._ext = 0;\n      this._urlId = 0;\n      this._ext = t, this._urlId = e;\n    }\n    get ext() {\n      return this._urlId ? this._ext & -469762049 | this.underlineStyle << 26 : this._ext;\n    }\n    set ext(t) {\n      this._ext = t;\n    }\n    get underlineStyle() {\n      return this._urlId ? 5 : (this._ext & 469762048) >> 26;\n    }\n    set underlineStyle(t) {\n      this._ext &= -469762049, this._ext |= t << 26 & 469762048;\n    }\n    get underlineColor() {\n      return this._ext & 67108863;\n    }\n    set underlineColor(t) {\n      this._ext &= -67108864, this._ext |= t & 67108863;\n    }\n    get urlId() {\n      return this._urlId;\n    }\n    set urlId(t) {\n      this._urlId = t;\n    }\n    get underlineVariantOffset() {\n      let t = (this._ext & 3758096384) >> 29;\n      return t < 0 ? t ^ 4294967288 : t;\n    }\n    set underlineVariantOffset(t) {\n      this._ext &= 536870911, this._ext |= t << 29 & 3758096384;\n    }\n    clone() {\n      return new n3(this._ext, this._urlId);\n    }\n    isEmpty() {\n      return this.underlineStyle === 0 && this._urlId === 0;\n    }\n  };\n  var N2 = class n4 extends fe2 {\n    constructor() {\n      super(...arguments);\n      this.content = 0;\n      this.fg = 0;\n      this.bg = 0;\n      this.extended = new Pe2();\n      this.combinedData = "";\n    }\n    static fromCharData(e) {\n      let i5 = new n4();\n      return i5.setFromCharData(e), i5;\n    }\n    isCombined() {\n      return this.content & 2097152;\n    }\n    getWidth() {\n      return this.content >> 22;\n    }\n    getChars() {\n      return this.content & 2097152 ? this.combinedData : this.content & 2097151 ? ve2(this.content & 2097151) : "";\n    }\n    getCode() {\n      return this.isCombined() ? this.combinedData.charCodeAt(this.combinedData.length - 1) : this.content & 2097151;\n    }\n    setFromCharData(e) {\n      this.fg = e[0], this.bg = 0;\n      let i5 = false;\n      if (e[1].length > 2) i5 = true;\n      else if (e[1].length === 2) {\n        let r = e[1].charCodeAt(0);\n        if (55296 <= r && r <= 56319) {\n          let s4 = e[1].charCodeAt(1);\n          56320 <= s4 && s4 <= 57343 ? this.content = (r - 55296) * 1024 + s4 - 56320 + 65536 | e[2] << 22 : i5 = true;\n        } else i5 = true;\n      } else this.content = e[1].charCodeAt(0) | e[2] << 22;\n      i5 && (this.combinedData = e[1], this.content = 2097152 | e[2] << 22);\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n    attributesEquals(e) {\n      if (this.getFgColorMode() !== e.getFgColorMode() || this.getFgColor() !== e.getFgColor() || this.getBgColorMode() !== e.getBgColorMode() || this.getBgColor() !== e.getBgColor() || this.isInverse() !== e.isInverse() || this.isBold() !== e.isBold() || this.isUnderline() !== e.isUnderline()) return false;\n      if (this.isUnderline()) {\n        if (this.getUnderlineStyle() !== e.getUnderlineStyle()) return false;\n        let i5 = this.isUnderlineColorDefault(), r = e.isUnderlineColorDefault();\n        if (!(i5 && r) && (i5 !== r || this.getUnderlineColor() !== e.getUnderlineColor() || this.getUnderlineColorMode() !== e.getUnderlineColorMode())) return false;\n      }\n      return !(this.isOverline() !== e.isOverline() || this.isBlink() !== e.isBlink() || this.isInvisible() !== e.isInvisible() || this.isItalic() !== e.isItalic() || this.isDim() !== e.isDim() || this.isStrikethrough() !== e.isStrikethrough());\n    }\n  };\n  var qs = "di$target";\n  var Vr = "di$dependencies";\n  var $r = /* @__PURE__ */ new Map();\n  function Ys(n11) {\n    return n11[Vr] || [];\n  }\n  function F3(n11) {\n    if ($r.has(n11)) return $r.get(n11);\n    let t = function(e, i5, r) {\n      if (arguments.length !== 3) throw new Error("@IServiceName-decorator can only be used to decorate a parameter");\n      eo(t, e, r);\n    };\n    return t._id = n11, $r.set(n11, t), t;\n  }\n  function eo(n11, t, e) {\n    t[qs] === t ? t[Vr].push({ id: n11, index: e }) : (t[Vr] = [{ id: n11, index: e }], t[qs] = t);\n  }\n  var L5 = F3("BufferService");\n  var et2 = F3("MouseStateService");\n  var Y = F3("CoreService");\n  var Xs = F3("CharsetService");\n  var tt3 = F3("InstantiationService");\n  var pe = F3("LogService");\n  var R3 = F3("OptionsService");\n  var Ii = F3("OscLinkService");\n  var js = F3("UnicodeService");\n  var Ie2 = F3("DecorationService");\n  var it4 = class {\n    constructor(t, e, i5) {\n      this._bufferService = t;\n      this._optionsService = e;\n      this._oscLinkService = i5;\n      this._workCell = new N2();\n    }\n    provideLinks(t, e) {\n      let i5 = this._bufferService.buffer.lines.get(t - 1);\n      if (!i5) {\n        e(void 0);\n        return;\n      }\n      let r = [], s4 = this._optionsService.rawOptions.linkHandler, o2 = this._workCell, a2 = i5.getTrimmedLength(), l4 = -1, h3 = -1, d3 = false;\n      for (let c2 = 0; c2 < a2; c2++) if (!(h3 === -1 && !i5.hasContent(c2))) {\n        if (i5.loadCell(c2, o2), o2.hasExtendedAttrs() && o2.extended.urlId) if (h3 === -1) {\n          h3 = c2, l4 = o2.extended.urlId;\n          continue;\n        } else d3 = o2.extended.urlId !== l4;\n        else h3 !== -1 && (d3 = true);\n        if (d3 || h3 !== -1 && c2 === a2 - 1) {\n          let u3 = this._oscLinkService.getLinkData(l4)?.uri;\n          if (u3) {\n            let _5 = { start: { x: h3 + 1, y: t }, end: { x: c2 + (!d3 && c2 === a2 - 1 ? 1 : 0), y: t } }, p3 = false;\n            if (!s4?.allowNonHttpProtocols) try {\n              let b4 = new URL(u3);\n              ["http:", "https:"].includes(b4.protocol) || (p3 = true);\n            } catch {\n              p3 = true;\n            }\n            p3 || r.push({ text: u3, range: _5, activate: (b4, f5) => s4 ? s4.activate(b4, f5, _5) : to(b4, f5), hover: (b4, f5) => s4?.hover?.(b4, f5, _5), leave: (b4, f5) => s4?.leave?.(b4, f5, _5) });\n          }\n          d3 = false, o2.hasExtendedAttrs() && o2.extended.urlId ? (h3 = c2, l4 = o2.extended.urlId) : (h3 = -1, l4 = -1);\n        }\n      }\n      e(r);\n    }\n  };\n  it4 = E4([m3(0, L5), m3(1, R3), m3(2, Ii)], it4);\n  function to(n11, t) {\n    if (confirm(`Do you want to navigate to ${t}?\n\nWARNING: This link could potentially be dangerous`)) {\n      let i5 = window.open();\n      if (i5) {\n        try {\n          i5.opener = null;\n        } catch {\n        }\n        i5.location.href = t;\n      } else console.warn("Opening link blocked as opener could not be cleared");\n    }\n  }\n  var Me2 = F3("CharSizeService");\n  var z3 = F3("CoreBrowserService");\n  var Be2 = F3("MouseCoordsService");\n  var Zs = F3("MouseService");\n  var G4 = F3("RenderService");\n  var Ci = F3("SelectionService");\n  var Ei = F3("CharacterJoinerService");\n  var _e2 = F3("ThemeService");\n  var yi = F3("LinkProviderService");\n  var Js = F3("KeyboardService");\n  function y4(n11) {\n    return { dispose: n11 };\n  }\n  function Oe2(n11) {\n    if (!n11) return n11;\n    if (Array.isArray(n11)) {\n      for (let t of n11) t.dispose();\n      return [];\n    }\n    return n11.dispose(), n11;\n  }\n  var we2 = class {\n    constructor() {\n      this._disposables = /* @__PURE__ */ new Set();\n      this._isDisposed = false;\n    }\n    get isDisposed() {\n      return this._isDisposed;\n    }\n    add(t) {\n      return this._isDisposed ? t.dispose() : this._disposables.add(t), t;\n    }\n    dispose() {\n      if (!this._isDisposed) {\n        this._isDisposed = true;\n        for (let t of this._disposables) t.dispose();\n        this._disposables.clear();\n      }\n    }\n    clear() {\n      for (let t of this._disposables) t.dispose();\n      this._disposables.clear();\n    }\n  };\n  var g5 = class {\n    constructor() {\n      this._store = new we2();\n    }\n    dispose() {\n      this._store.dispose();\n    }\n    _register(t) {\n      return this._store.add(t);\n    }\n  };\n  g5.None = Object.freeze({ dispose() {\n  } });\n  var me3 = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    get value() {\n      return this._isDisposed ? void 0 : this._value;\n    }\n    set value(t) {\n      this._isDisposed || t === this._value || (this._value?.dispose(), this._value = t);\n    }\n    clear() {\n      this.value = void 0;\n    }\n    dispose() {\n      this._isDisposed = true, this._value?.dispose(), this._value = void 0;\n    }\n  };\n  var Ne3 = class {\n    constructor() {\n      this._token = -1;\n      this._isDisposed = false;\n    }\n    dispose() {\n      this.cancel(), this._isDisposed = true;\n    }\n    cancel() {\n      this._token !== -1 && (clearTimeout(this._token), this._token = -1);\n    }\n    cancelAndSet(t, e) {\n      if (this._isDisposed) throw new Error("Calling cancelAndSet on a disposed TimeoutTimer");\n      this.cancel(), this._token = setTimeout(() => {\n        this._token = -1, t();\n      }, e);\n    }\n    setIfNotSet(t, e) {\n      if (this._isDisposed) throw new Error("Calling setIfNotSet on a disposed TimeoutTimer");\n      this._token === -1 && (this._token = setTimeout(() => {\n        this._token = -1, t();\n      }, e));\n    }\n  };\n  var xi = class {\n    constructor() {\n      this._isDisposed = false;\n    }\n    cancel() {\n      this._disposable?.dispose(), this._disposable = void 0;\n    }\n    cancelAndSet(t, e, i5 = globalThis) {\n      if (this._isDisposed) throw new Error("Calling cancelAndSet on a disposed IntervalTimer");\n      this.cancel();\n      let r = i5.setInterval(() => {\n        t();\n      }, e);\n      this._disposable = { dispose: () => {\n        i5.clearInterval(r), this._disposable = void 0;\n      } };\n    }\n    dispose() {\n      this.cancel(), this._isDisposed = true;\n    }\n  };\n  function oe3(n11) {\n    let t = n11;\n    if (t?.ownerDocument?.defaultView) return t.ownerDocument.defaultView;\n    let e = n11;\n    return e?.view ? e.view : window;\n  }\n  var qr = class {\n    constructor(t, e, i5, r) {\n      this._node = t, this._type = e, this._handler = i5, this._options = r, t.addEventListener(e, i5, r);\n    }\n    dispose() {\n      !this._node || !this._handler || (this._node.removeEventListener(this._type, this._handler, this._options), this._node = null, this._handler = null);\n    }\n  };\n  function C3(n11, t, e, i5) {\n    return new qr(n11, t, e, i5);\n  }\n  function Yr(n11, t, e, i5) {\n    return C3(n11, t, e, i5);\n  }\n  var ae3 = { CLICK: "click", MOUSE_DOWN: "mousedown", MOUSE_OVER: "mouseover", MOUSE_LEAVE: "mouseleave", KEY_DOWN: "keydown", KEY_UP: "keyup", INPUT: "input", BLUR: "blur", FOCUS: "focus", CHANGE: "change", POINTER_DOWN: "pointerdown", POINTER_MOVE: "pointermove", POINTER_UP: "pointerup", MOUSE_WHEEL: "wheel", WHEEL: "wheel" };\n  function en(n11) {\n    let t = n11.getBoundingClientRect(), e = oe3(n11);\n    return { left: t.left + e.scrollX, top: t.top + e.scrollY, width: t.width, height: t.height };\n  }\n  var wi = class {\n    constructor(t, e) {\n      this._runner = t;\n      this.priority = e;\n      this._canceled = false;\n    }\n    dispose() {\n      this._canceled = true;\n    }\n    execute() {\n      if (!this._canceled) try {\n        this._runner();\n      } catch (t) {\n        console.error(t);\n      }\n    }\n    static sort(t, e) {\n      return e.priority - t.priority;\n    }\n  };\n  var Qs = /* @__PURE__ */ new Map();\n  function tn(n11) {\n    let t = Qs.get(n11);\n    return t || (t = { next: [], current: [], animFrameRequested: false, inAnimationFrameRunner: false }, Qs.set(n11, t)), t;\n  }\n  function io(n11) {\n    let t = tn(n11);\n    for (t.animFrameRequested = false, t.current = t.next, t.next = [], t.inAnimationFrameRunner = true; t.current.length > 0; ) t.current.sort(wi.sort), t.current.shift().execute();\n    t.inAnimationFrameRunner = false;\n  }\n  function rt3(n11, t, e = 0) {\n    let i5 = tn(n11), r = new wi(t, e);\n    return i5.next.push(r), i5.animFrameRequested || (i5.animFrameRequested = true, n11.requestAnimationFrame(() => io(n11))), r;\n  }\n  var Ti = class extends xi {\n    constructor(t) {\n      super(), this._defaultTarget = t ? oe3(t) : void 0;\n    }\n    cancelAndSet(t, e, i5) {\n      super.cancelAndSet(t, e, i5 ?? this._defaultTarget ?? window);\n    }\n  };\n  var Te3 = class {\n    constructor(t) {\n      this.domNode = t;\n      this._width = "";\n      this._height = "";\n      this._top = "";\n      this._left = "";\n      this._bottom = "";\n      this._right = "";\n      this._className = "";\n      this._position = "";\n      this._layerHint = false;\n      this._contain = "none";\n    }\n    setWidth(t) {\n      let e = nt4(t);\n      this._width !== e && (this._width = e, this.domNode.style.width = this._width);\n    }\n    setHeight(t) {\n      let e = nt4(t);\n      this._height !== e && (this._height = e, this.domNode.style.height = this._height);\n    }\n    setTop(t) {\n      let e = nt4(t);\n      this._top !== e && (this._top = e, this.domNode.style.top = this._top);\n    }\n    setLeft(t) {\n      let e = nt4(t);\n      this._left !== e && (this._left = e, this.domNode.style.left = this._left);\n    }\n    setBottom(t) {\n      let e = nt4(t);\n      this._bottom !== e && (this._bottom = e, this.domNode.style.bottom = this._bottom);\n    }\n    setRight(t) {\n      let e = nt4(t);\n      this._right !== e && (this._right = e, this.domNode.style.right = this._right);\n    }\n    setClassName(t) {\n      this._className !== t && (this._className = t, this.domNode.className = this._className);\n    }\n    toggleClassName(t, e) {\n      this.domNode.classList.toggle(t, e), this._className = this.domNode.className;\n    }\n    setPosition(t) {\n      this._position !== t && (this._position = t, this.domNode.style.position = this._position);\n    }\n    setLayerHinting(t) {\n      this._layerHint !== t && (this._layerHint = t, t ? this.domNode.style.transform = "translate3d(0px, 0px, 0px)" : this.domNode.style.transform = "");\n    }\n    setContain(t) {\n      this._contain !== t && (this._contain = t, this.domNode.style.contain = this._contain);\n    }\n    setAttribute(t, e) {\n      this.domNode.setAttribute(t, e);\n    }\n  };\n  function nt4(n11) {\n    return typeof n11 == "number" ? `${n11}px` : n11;\n  }\n  var ze3 = {};\n  Xn2(ze3, { getSafariVersion: () => so, getZoomFactor: () => Zr, isChrome: () => Gt2, isChromeOS: () => Jr, isFirefox: () => at4, isLegacyEdge: () => ro, isLinux: () => $t2, isMac: () => ee3, isNode: () => Xr, isSafari: () => Di, isWindows: () => Ke3 });\n  var Xr = !!(typeof process < "u" && "title" in process && (typeof navigator > "u" || navigator.userAgent.startsWith("Node.js/")));\n  var ot4 = Xr ? "node" : navigator.userAgent;\n  var jr = Xr ? "node" : navigator.platform;\n  var at4 = ot4.includes("Firefox");\n  var Gt2 = ot4.includes("Chrome");\n  var ro = ot4.includes("Edge");\n  var Di = /^((?!chrome|android).)*safari/i.test(ot4);\n  function Zr(n11) {\n    return 1;\n  }\n  function so() {\n    if (!Di) return 0;\n    let n11 = ot4.match(/Version\\/(\\d+)/);\n    return n11 === null || n11.length < 2 ? 0 : parseInt(n11[1]);\n  }\n  var ee3 = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"].includes(jr);\n  var Ke3 = ["Windows", "Win16", "Win32", "WinCE"].includes(jr);\n  var $t2 = jr.indexOf("Linux") >= 0;\n  var Jr = /\\bCrOS\\b/.test(ot4);\n  var rn = /* @__PURE__ */ new WeakMap();\n  function no(n11) {\n    if (!n11.parent || n11.parent === n11) return null;\n    try {\n      let t = n11.location, e = n11.parent.location;\n      if (t.origin !== "null" && e.origin !== "null" && t.origin !== e.origin) return null;\n    } catch {\n      return null;\n    }\n    return n11.parent;\n  }\n  var Qr = class {\n    static _getSameOriginWindowChain(t) {\n      let e = rn.get(t);\n      if (!e) {\n        e = [], rn.set(t, e);\n        let i5 = t, r;\n        do\n          r = no(i5), r ? e.push({ window: new WeakRef(i5), iframeElement: i5.frameElement ?? null }) : e.push({ window: new WeakRef(i5), iframeElement: null }), i5 = r;\n        while (i5);\n      }\n      return e.slice(0);\n    }\n    static getPositionOfChildWindowRelativeToAncestorWindow(t, e) {\n      if (!e || t === e) return { top: 0, left: 0 };\n      let i5 = 0, r = 0, s4 = this._getSameOriginWindowChain(t);\n      for (let o2 of s4) {\n        let a2 = o2.window.deref();\n        if (i5 += a2?.scrollY ?? 0, r += a2?.scrollX ?? 0, a2 === e || !o2.iframeElement) break;\n        let l4 = o2.iframeElement.getBoundingClientRect();\n        i5 += l4.top, r += l4.left;\n      }\n      return { top: i5, left: r };\n    }\n  };\n  var lt3 = class {\n    constructor(t, e) {\n      this.timestamp = Date.now(), this.browserEvent = e, this.leftButton = e.button === 0, this.middleButton = e.button === 1, this.rightButton = e.button === 2, this.buttons = e.buttons, this.target = e.target, this.detail = e.detail ?? 1, e.type === "dblclick" && (this.detail = 2), this.ctrlKey = e.ctrlKey, this.shiftKey = e.shiftKey, this.altKey = e.altKey, this.metaKey = e.metaKey, typeof e.pageX == "number" ? (this.posx = e.pageX, this.posy = e.pageY) : (this.posx = e.clientX + this.target.ownerDocument.body.scrollLeft + this.target.ownerDocument.documentElement.scrollLeft, this.posy = e.clientY + this.target.ownerDocument.body.scrollTop + this.target.ownerDocument.documentElement.scrollTop);\n      let i5 = Qr.getPositionOfChildWindowRelativeToAncestorWindow(t, e.view);\n      this.posx -= i5.left, this.posy -= i5.top;\n    }\n    preventDefault() {\n      this.browserEvent.preventDefault();\n    }\n    stopPropagation() {\n      this.browserEvent.stopPropagation();\n    }\n  };\n  var Vt2 = class {\n    constructor(t, e = 0, i5 = 0) {\n      this.browserEvent = t ?? null, this.target = t ? t.target ?? t.targetNode ?? t.srcElement ?? null : null, this.deltaY = i5, this.deltaX = e;\n      let r = false;\n      if (Gt2) {\n        let s4 = navigator.userAgent.match(/Chrome\\/(\\d+)/);\n        r = (s4 ? parseInt(s4[1]) : 123) <= 122;\n      }\n      if (t) {\n        let s4 = t, o2 = t, a2 = t.view?.devicePixelRatio ?? 1;\n        if (typeof s4.wheelDeltaY < "u") r ? this.deltaY = s4.wheelDeltaY / (120 * a2) : this.deltaY = s4.wheelDeltaY / 120;\n        else if (typeof o2.VERTICAL_AXIS < "u" && o2.axis === o2.VERTICAL_AXIS) this.deltaY = -o2.detail / 3;\n        else if (t.type === "wheel") {\n          let l4 = t;\n          l4.deltaMode === l4.DOM_DELTA_LINE ? at4 && !ee3 ? this.deltaY = -t.deltaY / 3 : this.deltaY = -t.deltaY : this.deltaY = -t.deltaY / 40;\n        }\n        if (typeof s4.wheelDeltaX < "u") Di && Ke3 ? this.deltaX = -(s4.wheelDeltaX / 120) : r ? this.deltaX = s4.wheelDeltaX / (120 * a2) : this.deltaX = s4.wheelDeltaX / 120;\n        else if (typeof o2.HORIZONTAL_AXIS < "u" && o2.axis === o2.HORIZONTAL_AXIS) this.deltaX = -t.detail / 3;\n        else if (t.type === "wheel") {\n          let l4 = t;\n          l4.deltaMode === l4.DOM_DELTA_LINE ? at4 && !ee3 ? this.deltaX = -t.deltaX / 3 : this.deltaX = -t.deltaX : this.deltaX = -t.deltaX / 40;\n        }\n        this.deltaY === 0 && this.deltaX === 0 && t.wheelDelta && (r ? this.deltaY = t.wheelDelta / (120 * a2) : this.deltaY = t.wheelDelta / 120);\n      }\n    }\n    preventDefault() {\n      this.browserEvent?.preventDefault();\n    }\n    stopPropagation() {\n      this.browserEvent?.stopPropagation();\n    }\n  };\n  var ct3 = class {\n    constructor() {\n      this._hooks = new we2();\n      this._pointerMoveCallback = null;\n      this._onStopCallback = null;\n    }\n    dispose() {\n      this.stopMonitoring(false), this._hooks.dispose();\n    }\n    stopMonitoring(t) {\n      if (!this.isMonitoring()) return;\n      this._hooks.clear(), this._pointerMoveCallback = null;\n      let e = this._onStopCallback;\n      this._onStopCallback = null, t && e && e();\n    }\n    isMonitoring() {\n      return !!this._pointerMoveCallback;\n    }\n    startMonitoring(t, e, i5, r, s4) {\n      this.isMonitoring() && this.stopMonitoring(false), this._pointerMoveCallback = r, this._onStopCallback = s4;\n      let o2 = t;\n      try {\n        t.setPointerCapture(e), this._hooks.add(y4(() => {\n          try {\n            t.releasePointerCapture(e);\n          } catch {\n          }\n        }));\n      } catch {\n        o2 = oe3(t);\n      }\n      this._hooks.add(C3(o2, ae3.POINTER_MOVE, (a2) => {\n        if (a2.buttons !== i5) {\n          this.stopMonitoring(true);\n          return;\n        }\n        a2.preventDefault(), this._pointerMoveCallback(a2);\n      })), this._hooks.add(C3(o2, ae3.POINTER_UP, (a2) => this.stopMonitoring(true)));\n    }\n  };\n  var Fe3 = class extends g5 {\n    _onclick(t, e) {\n      this._register(C3(t, ae3.CLICK, (i5) => e(new lt3(oe3(t), i5))));\n    }\n    _onmouseover(t, e) {\n      this._register(C3(t, ae3.MOUSE_OVER, (i5) => e(new lt3(oe3(t), i5))));\n    }\n    _onmouseleave(t, e) {\n      this._register(C3(t, ae3.MOUSE_LEAVE, (i5) => e(new lt3(oe3(t), i5))));\n    }\n  };\n  var Ri = class extends Fe3 {\n    constructor(t) {\n      super(), this._handleActivate = t.handleActivate, this.bgDomNode = document.createElement("div"), this.bgDomNode.className = "xterm-arrow-background", this.bgDomNode.style.position = "absolute", this.bgDomNode.style.width = t.bgWidth + "px", this.bgDomNode.style.height = t.bgHeight + "px", typeof t.top < "u" && (this.bgDomNode.style.top = "0px"), typeof t.left < "u" && (this.bgDomNode.style.left = "0px"), typeof t.bottom < "u" && (this.bgDomNode.style.bottom = "0px"), typeof t.right < "u" && (this.bgDomNode.style.right = "0px"), this.domNode = document.createElement("div"), this.domNode.className = t.className, this.domNode.style.position = "absolute";\n      let e = Math.min(t.bgWidth, t.bgHeight);\n      this.domNode.style.width = e + "px", this.domNode.style.height = e + "px", typeof t.top < "u" && (this.domNode.style.top = t.top + "px"), typeof t.left < "u" && (this.domNode.style.left = t.left + "px"), typeof t.bottom < "u" && (this.domNode.style.bottom = t.bottom + "px"), typeof t.right < "u" && (this.domNode.style.right = t.right + "px"), this._pointerMoveMonitor = this._register(new ct3()), this._register(Yr(this.bgDomNode, ae3.POINTER_DOWN, (i5) => this._arrowPointerDown(i5))), this._register(Yr(this.domNode, ae3.POINTER_DOWN, (i5) => this._arrowPointerDown(i5))), this._pointerdownRepeatTimer = this._register(new Ti()), this._pointerdownScheduleRepeatTimer = this._register(new Ne3());\n    }\n    _arrowPointerDown(t) {\n      if (!t.target || !(t.target instanceof Element)) return;\n      let e = () => {\n        this._pointerdownRepeatTimer.cancelAndSet(() => this._handleActivate(), 1e3 / 24, oe3(t));\n      };\n      this._handleActivate(), this._pointerdownRepeatTimer.cancel(), this._pointerdownScheduleRepeatTimer.cancelAndSet(e, 200), this._pointerMoveMonitor.startMonitoring(t.target, t.pointerId, t.buttons, (i5) => {\n      }, () => {\n        this._pointerdownRepeatTimer.cancel(), this._pointerdownScheduleRepeatTimer.cancel();\n      }), t.preventDefault();\n    }\n  };\n  var v5 = class {\n    constructor() {\n      this._listeners = [];\n      this._disposed = false;\n    }\n    get event() {\n      return this._event ? this._event : (this._event = (t, e, i5) => {\n        if (this._disposed) return y4(() => {\n        });\n        let r = { fn: t, thisArgs: e };\n        this._listeners.push(r);\n        let s4 = y4(() => {\n          let o2 = this._listeners.indexOf(r);\n          o2 !== -1 && this._listeners.splice(o2, 1);\n        });\n        return i5 && (Array.isArray(i5) ? i5.push(s4) : i5.add(s4)), s4;\n      }, this._event);\n    }\n    fire(t) {\n      if (!this._disposed) switch (this._listeners.length) {\n        case 0:\n          return;\n        case 1: {\n          let { fn: e, thisArgs: i5 } = this._listeners[0];\n          e.call(i5, t);\n          return;\n        }\n        default: {\n          let e = this._listeners.slice();\n          for (let { fn: i5, thisArgs: r } of e) i5.call(r, t);\n        }\n      }\n    }\n    dispose() {\n      this._disposed || (this._disposed = true, this._listeners.length = 0);\n    }\n  };\n  var X2;\n  ((r) => {\n    function n11(s4, o2) {\n      return s4((a2) => o2.fire(a2));\n    }\n    r.forward = n11;\n    function t(s4, o2) {\n      return (a2, l4, h3) => s4((d3) => a2.call(l4, o2(d3)), void 0, h3);\n    }\n    r.map = t;\n    function e(...s4) {\n      return (o2, a2, l4) => {\n        let h3 = new we2();\n        for (let d3 of s4) h3.add(d3((c2) => o2.call(a2, c2)));\n        return l4 && (Array.isArray(l4) ? l4.push(h3) : l4.add(h3)), h3;\n      };\n    }\n    r.any = e;\n    function i5(s4, o2, a2) {\n      return o2(a2), s4((l4) => o2(l4));\n    }\n    r.runAndSubscribe = i5;\n  })(X2 ||= {});\n  var ts = class n5 {\n    constructor(t, e, i5, r, s4, o2, a2) {\n      this._forceIntegerValues = t;\n      this._scrollStateBrand = void 0;\n      this._forceIntegerValues && (e = e | 0, i5 = i5 | 0, r = r | 0, s4 = s4 | 0, o2 = o2 | 0, a2 = a2 | 0), this.rawScrollLeft = r, this.rawScrollTop = a2, e < 0 && (e = 0), r + e > i5 && (r = i5 - e), r < 0 && (r = 0), s4 < 0 && (s4 = 0), a2 + s4 > o2 && (a2 = o2 - s4), a2 < 0 && (a2 = 0), this.width = e, this.scrollWidth = i5, this.scrollLeft = r, this.height = s4, this.scrollHeight = o2, this.scrollTop = a2;\n    }\n    equals(t) {\n      return this.rawScrollLeft === t.rawScrollLeft && this.rawScrollTop === t.rawScrollTop && this.width === t.width && this.scrollWidth === t.scrollWidth && this.scrollLeft === t.scrollLeft && this.height === t.height && this.scrollHeight === t.scrollHeight && this.scrollTop === t.scrollTop;\n    }\n    withScrollDimensions(t, e) {\n      return new n5(this._forceIntegerValues, typeof t.width < "u" ? t.width : this.width, typeof t.scrollWidth < "u" ? t.scrollWidth : this.scrollWidth, e ? this.rawScrollLeft : this.scrollLeft, typeof t.height < "u" ? t.height : this.height, typeof t.scrollHeight < "u" ? t.scrollHeight : this.scrollHeight, e ? this.rawScrollTop : this.scrollTop);\n    }\n    withScrollPosition(t) {\n      return new n5(this._forceIntegerValues, this.width, this.scrollWidth, typeof t.scrollLeft < "u" ? t.scrollLeft : this.rawScrollLeft, this.height, this.scrollHeight, typeof t.scrollTop < "u" ? t.scrollTop : this.rawScrollTop);\n    }\n    createScrollEvent(t, e) {\n      let i5 = this.width !== t.width, r = this.scrollWidth !== t.scrollWidth, s4 = this.scrollLeft !== t.scrollLeft, o2 = this.height !== t.height, a2 = this.scrollHeight !== t.scrollHeight, l4 = this.scrollTop !== t.scrollTop;\n      return { inSmoothScrolling: e, oldWidth: t.width, oldScrollWidth: t.scrollWidth, oldScrollLeft: t.scrollLeft, width: this.width, scrollWidth: this.scrollWidth, scrollLeft: this.scrollLeft, oldHeight: t.height, oldScrollHeight: t.scrollHeight, oldScrollTop: t.scrollTop, height: this.height, scrollHeight: this.scrollHeight, scrollTop: this.scrollTop, widthChanged: i5, scrollWidthChanged: r, scrollLeftChanged: s4, heightChanged: o2, scrollHeightChanged: a2, scrollTopChanged: l4 };\n    }\n  };\n  var ht2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._scrollableBrand = void 0;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this._smoothScrollDuration = e.smoothScrollDuration, this._scheduleAtNextAnimationFrame = e.scheduleAtNextAnimationFrame, this._state = new ts(e.forceIntegerValues, 0, 0, 0, 0, 0, 0), this._smoothScrolling = null;\n    }\n    dispose() {\n      this._smoothScrolling && (this._smoothScrolling.dispose(), this._smoothScrolling = null), super.dispose();\n    }\n    setSmoothScrollDuration(e) {\n      this._smoothScrollDuration = e;\n    }\n    validateScrollPosition(e) {\n      return this._state.withScrollPosition(e);\n    }\n    getScrollDimensions() {\n      return this._state;\n    }\n    setScrollDimensions(e, i5) {\n      let r = this._state.withScrollDimensions(e, i5);\n      this._setState(r, !!this._smoothScrolling), this._smoothScrolling?.acceptScrollDimensions(this._state);\n    }\n    getFutureScrollPosition() {\n      return this._smoothScrolling ? this._smoothScrolling.to : this._state;\n    }\n    getCurrentScrollPosition() {\n      return this._state;\n    }\n    setScrollPositionNow(e) {\n      let i5 = this._state.withScrollPosition(e);\n      this._smoothScrolling && (this._smoothScrolling.dispose(), this._smoothScrolling = null), this._setState(i5, false);\n    }\n    setScrollPositionSmooth(e, i5) {\n      if (this._smoothScrollDuration === 0) {\n        this.setScrollPositionNow(e);\n        return;\n      }\n      if (this._smoothScrolling) {\n        e = { scrollLeft: typeof e.scrollLeft > "u" ? this._smoothScrolling.to.scrollLeft : e.scrollLeft, scrollTop: typeof e.scrollTop > "u" ? this._smoothScrolling.to.scrollTop : e.scrollTop };\n        let r = this._state.withScrollPosition(e);\n        if (this._smoothScrolling.to.scrollLeft === r.scrollLeft && this._smoothScrolling.to.scrollTop === r.scrollTop) return;\n        let s4;\n        i5 ? s4 = new qt2(this._smoothScrolling.from, r, this._smoothScrolling.startTime, this._smoothScrolling.duration) : s4 = qt2.start(this._state, r, this._smoothScrollDuration), this._smoothScrolling.dispose(), this._smoothScrolling = s4;\n      } else {\n        let r = this._state.withScrollPosition(e);\n        this._smoothScrolling = qt2.start(this._state, r, this._smoothScrollDuration);\n      }\n      this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {\n        this._smoothScrolling && (this._smoothScrolling.animationFrameDisposable = null, this._performSmoothScrolling());\n      });\n    }\n    hasPendingScrollAnimation() {\n      return !!this._smoothScrolling;\n    }\n    _performSmoothScrolling() {\n      if (!this._smoothScrolling) return;\n      let e = this._smoothScrolling.tick(), i5 = this._state.withScrollPosition(e);\n      if (this._setState(i5, true), !!this._smoothScrolling) {\n        if (e.isDone) {\n          this._smoothScrolling.dispose(), this._smoothScrolling = null;\n          return;\n        }\n        this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {\n          this._smoothScrolling && (this._smoothScrolling.animationFrameDisposable = null, this._performSmoothScrolling());\n        });\n      }\n    }\n    _setState(e, i5) {\n      let r = this._state;\n      r.equals(e) || (this._state = e, this._onScroll.fire(this._state.createScrollEvent(r, i5)));\n    }\n  };\n  var Li = class {\n    constructor(t, e, i5) {\n      this.scrollLeft = t, this.scrollTop = e, this.isDone = i5;\n    }\n  };\n  function es(n11, t) {\n    let e = t - n11;\n    return function(i5) {\n      return n11 + e * lo(i5);\n    };\n  }\n  function oo(n11, t, e) {\n    return function(i5) {\n      return i5 < e ? n11(i5 / e) : t((i5 - e) / (1 - e));\n    };\n  }\n  var qt2 = class n6 {\n    constructor(t, e, i5, r) {\n      this.from = t, this.to = e, this.duration = r, this.startTime = i5, this.animationFrameDisposable = null, this._initAnimations();\n    }\n    _initAnimations() {\n      this._scrollLeft = this._initAnimation(this.from.scrollLeft, this.to.scrollLeft, this.to.width), this._scrollTop = this._initAnimation(this.from.scrollTop, this.to.scrollTop, this.to.height);\n    }\n    _initAnimation(t, e, i5) {\n      if (Math.abs(t - e) > 2.5 * i5) {\n        let s4, o2;\n        return t < e ? (s4 = t + 0.75 * i5, o2 = e - 0.75 * i5) : (s4 = t - 0.75 * i5, o2 = e + 0.75 * i5), oo(es(t, s4), es(o2, e), 0.33);\n      }\n      return es(t, e);\n    }\n    dispose() {\n      this.animationFrameDisposable !== null && (this.animationFrameDisposable.dispose(), this.animationFrameDisposable = null);\n    }\n    acceptScrollDimensions(t) {\n      this.to = t.withScrollPosition(this.to), this._initAnimations();\n    }\n    tick() {\n      return this._tick(Date.now());\n    }\n    _tick(t) {\n      let e = (t - this.startTime) / this.duration;\n      if (e < 1) {\n        let i5 = this._scrollLeft(e), r = this._scrollTop(e);\n        return new Li(i5, r, false);\n      }\n      return new Li(this.to.scrollLeft, this.to.scrollTop, true);\n    }\n    static start(t, e, i5) {\n      i5 = i5 + 10;\n      let r = Date.now() - 10;\n      return new n6(t, e, r, i5);\n    }\n  };\n  function ao(n11) {\n    return Math.pow(n11, 3);\n  }\n  function lo(n11) {\n    return 1 - ao(1 - n11);\n  }\n  var Ai = class extends g5 {\n    constructor(t, e, i5) {\n      super(), this._visibility = t, this._visibleClassName = e, this._invisibleClassName = i5, this._domNode = null, this._isVisible = false, this._isNeeded = false, this._rawShouldBeVisible = false, this._shouldBeVisible = false, this._revealTimer = this._register(new Ne3());\n    }\n    setVisibility(t) {\n      this._visibility !== t && (this._visibility = t, this._updateShouldBeVisible());\n    }\n    setShouldBeVisible(t) {\n      this._rawShouldBeVisible = t, this._updateShouldBeVisible();\n    }\n    _applyVisibilitySetting() {\n      return this._visibility === 2 ? false : this._visibility === 3 ? true : this._rawShouldBeVisible;\n    }\n    _updateShouldBeVisible() {\n      let t = this._applyVisibilitySetting();\n      this._shouldBeVisible !== t && (this._shouldBeVisible = t, this.ensureVisibility());\n    }\n    setIsNeeded(t) {\n      this._isNeeded !== t && (this._isNeeded = t, this.ensureVisibility());\n    }\n    setDomNode(t) {\n      this._domNode = t, this._domNode.setClassName(this._invisibleClassName), this.setShouldBeVisible(false);\n    }\n    ensureVisibility() {\n      if (!this._isNeeded) {\n        this._hide(false);\n        return;\n      }\n      this._shouldBeVisible ? this._reveal() : this._hide(true);\n    }\n    _reveal() {\n      this._isVisible || (this._isVisible = true, this._revealTimer.setIfNotSet(() => {\n        this._domNode?.setClassName(this._visibleClassName);\n      }, 0));\n    }\n    _hide(t) {\n      this._revealTimer.cancel(), this._isVisible && (this._isVisible = false, this._domNode?.setClassName(this._invisibleClassName + (t ? " xterm-fade" : "")));\n    }\n  };\n  var co = 140;\n  var dt2 = class extends Fe3 {\n    constructor(t) {\n      super(), this._lazyRender = t.lazyRender, this._host = t.host, this._scrollable = t.scrollable, this._scrollByPage = t.scrollByPage, this._scrollbarState = t.scrollbarState, this._visibilityController = this._register(new Ai(t.visibility, "xterm-visible xterm-scrollbar " + t.extraScrollbarClassName, "xterm-invisible xterm-scrollbar " + t.extraScrollbarClassName)), this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._pointerMoveMonitor = this._register(new ct3()), this._shouldRender = true, this.domNode = new Te3(document.createElement("div")), this.domNode.setAttribute("role", "presentation"), this.domNode.setAttribute("aria-hidden", "true"), this._visibilityController.setDomNode(this.domNode), this.domNode.setPosition("absolute"), this._register(C3(this.domNode.domNode, ae3.POINTER_DOWN, (e) => this._domNodePointerDown(e)));\n    }\n    _createArrow(t) {\n      let e = this._register(new Ri(t));\n      return this.domNode.domNode.appendChild(e.bgDomNode), this.domNode.domNode.appendChild(e.domNode), e;\n    }\n    _createSlider(t, e, i5, r) {\n      this.slider = new Te3(document.createElement("div")), this.slider.setClassName("xterm-slider"), this.slider.setPosition("absolute"), this.slider.setTop(t), this.slider.setLeft(e), typeof i5 == "number" && this.slider.setWidth(i5), typeof r == "number" && this.slider.setHeight(r), this.slider.setLayerHinting(true), this.slider.setContain("strict"), this.domNode.domNode.appendChild(this.slider.domNode), this._register(C3(this.slider.domNode, ae3.POINTER_DOWN, (s4) => {\n        s4.button === 0 && (s4.preventDefault(), this._sliderPointerDown(s4));\n      })), this._onclick(this.slider.domNode, (s4) => {\n        s4.leftButton && s4.stopPropagation();\n      });\n    }\n    _handleElementSize(t) {\n      return this._scrollbarState.setVisibleSize(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    _handleElementScrollSize(t) {\n      return this._scrollbarState.setScrollSize(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    _handleElementScrollPosition(t) {\n      return this._scrollbarState.setScrollPosition(t) && (this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()), this._shouldRender = true, this._lazyRender || this.render()), this._shouldRender;\n    }\n    beginReveal() {\n      this._visibilityController.setShouldBeVisible(true);\n    }\n    beginHide() {\n      this._visibilityController.setShouldBeVisible(false);\n    }\n    render() {\n      this._shouldRender && (this._shouldRender = false, this._renderDomNode(this._scrollbarState.getRectangleLargeSize(), this._scrollbarState.getRectangleSmallSize()), this._updateSlider(this._scrollbarState.getSliderSize(), this._scrollbarState.getArrowSize() + this._scrollbarState.getSliderPosition()));\n    }\n    _domNodePointerDown(t) {\n      t.target === this.domNode.domNode && this._handlePointerDown(t);\n    }\n    delegatePointerDown(t) {\n      let e = this.domNode.domNode.getClientRects()[0].top, i5 = e + this._scrollbarState.getSliderPosition(), r = e + this._scrollbarState.getSliderPosition() + this._scrollbarState.getSliderSize(), s4 = this._sliderPointerPosition(t);\n      i5 <= s4 && s4 <= r ? t.button === 0 && (t.preventDefault(), this._sliderPointerDown(t)) : this._handlePointerDown(t);\n    }\n    _handlePointerDown(t) {\n      let e, i5;\n      if (t.target === this.domNode.domNode && typeof t.offsetX == "number" && typeof t.offsetY == "number") e = t.offsetX, i5 = t.offsetY;\n      else {\n        let s4 = en(this.domNode.domNode);\n        e = t.pageX - s4.left, i5 = t.pageY - s4.top;\n      }\n      let r = this._pointerDownRelativePosition(e, i5);\n      this._setDesiredScrollPositionNow(this._scrollByPage ? this._scrollbarState.getDesiredScrollPositionFromOffsetPaged(r) : this._scrollbarState.getDesiredScrollPositionFromOffset(r)), t.button === 0 && (t.preventDefault(), this._sliderPointerDown(t));\n    }\n    _sliderPointerDown(t) {\n      if (!t.target || !(t.target instanceof Element)) return;\n      let e = this._sliderPointerPosition(t), i5 = this._sliderOrthogonalPointerPosition(t), r = this._scrollbarState.clone();\n      this.slider.toggleClassName("xterm-active", true), this._pointerMoveMonitor.startMonitoring(t.target, t.pointerId, t.buttons, (s4) => {\n        let o2 = this._sliderOrthogonalPointerPosition(s4), a2 = Math.abs(o2 - i5);\n        if (Ke3 && a2 > co) {\n          this._setDesiredScrollPositionNow(r.getScrollPosition());\n          return;\n        }\n        let h3 = this._sliderPointerPosition(s4) - e;\n        this._setDesiredScrollPositionNow(r.getDesiredScrollPositionFromDelta(h3));\n      }, () => {\n        this.slider.toggleClassName("xterm-active", false), this._host.handleDragEnd();\n      }), this._host.handleDragStart();\n    }\n    _setDesiredScrollPositionNow(t) {\n      let e = {};\n      this.writeScrollPosition(e, t), this._scrollable.setScrollPositionNow(e);\n    }\n    updateScrollbarSize(t) {\n      this._updateScrollbarSize(t), this._scrollbarState.setScrollbarSize(t), this._shouldRender = true, this._lazyRender || this.render();\n    }\n    isNeeded() {\n      return this._scrollbarState.isNeeded();\n    }\n  };\n  var ut3 = class n7 {\n    constructor(t, e, i5, r, s4, o2) {\n      this._scrollbarSize = Math.round(e), this._oppositeScrollbarSize = Math.round(i5), this._arrowSize = Math.round(t), this._visibleSize = r, this._scrollSize = s4, this._scrollPosition = o2, this._computedAvailableSize = 0, this._computedIsNeeded = false, this._computedSliderSize = 0, this._computedSliderRatio = 0, this._computedSliderPosition = 0, this._refreshComputedValues();\n    }\n    clone() {\n      return new n7(this._arrowSize, this._scrollbarSize, this._oppositeScrollbarSize, this._visibleSize, this._scrollSize, this._scrollPosition);\n    }\n    setVisibleSize(t) {\n      let e = Math.round(t);\n      return this._visibleSize !== e ? (this._visibleSize = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollSize(t) {\n      let e = Math.round(t);\n      return this._scrollSize !== e ? (this._scrollSize = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollPosition(t) {\n      let e = Math.round(t);\n      return this._scrollPosition !== e ? (this._scrollPosition = e, this._refreshComputedValues(), true) : false;\n    }\n    setScrollbarSize(t) {\n      this._scrollbarSize = Math.round(t);\n    }\n    setArrowSize(t) {\n      let e = Math.round(t);\n      this._arrowSize !== e && (this._arrowSize = e, this._refreshComputedValues());\n    }\n    setOppositeScrollbarSize(t) {\n      this._oppositeScrollbarSize = Math.round(t);\n    }\n    static _computeValues(t, e, i5, r, s4) {\n      let o2 = Math.max(0, i5 - t), a2 = Math.max(0, o2 - 2 * e), l4 = r > 0 && r > i5;\n      if (!l4) return { computedAvailableSize: Math.round(o2), computedIsNeeded: l4, computedSliderSize: Math.round(a2), computedSliderRatio: 0, computedSliderPosition: 0 };\n      let h3 = Math.round(Math.max(20, Math.floor(i5 * a2 / r))), d3 = (a2 - h3) / (r - i5), c2 = s4 * d3;\n      return { computedAvailableSize: Math.round(o2), computedIsNeeded: l4, computedSliderSize: Math.round(h3), computedSliderRatio: d3, computedSliderPosition: Math.round(c2) };\n    }\n    _refreshComputedValues() {\n      let t = n7._computeValues(this._oppositeScrollbarSize, this._arrowSize, this._visibleSize, this._scrollSize, this._scrollPosition);\n      this._computedAvailableSize = t.computedAvailableSize, this._computedIsNeeded = t.computedIsNeeded, this._computedSliderSize = t.computedSliderSize, this._computedSliderRatio = t.computedSliderRatio, this._computedSliderPosition = t.computedSliderPosition;\n    }\n    getArrowSize() {\n      return this._arrowSize;\n    }\n    getScrollPosition() {\n      return this._scrollPosition;\n    }\n    getRectangleLargeSize() {\n      return this._computedAvailableSize;\n    }\n    getRectangleSmallSize() {\n      return this._scrollbarSize;\n    }\n    isNeeded() {\n      return this._computedIsNeeded;\n    }\n    getSliderSize() {\n      return this._computedSliderSize;\n    }\n    getSliderPosition() {\n      return this._computedSliderPosition;\n    }\n    getDesiredScrollPositionFromOffset(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = t - this._arrowSize - this._computedSliderSize / 2;\n      return Math.round(e / this._computedSliderRatio);\n    }\n    getDesiredScrollPositionFromOffsetPaged(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = t - this._arrowSize, i5 = this._scrollPosition;\n      return e < this._computedSliderPosition ? i5 -= this._visibleSize : i5 += this._visibleSize, i5;\n    }\n    getDesiredScrollPositionFromDelta(t) {\n      if (!this._computedIsNeeded) return 0;\n      let e = this._computedSliderPosition + t;\n      return Math.round(e / this._computedSliderRatio);\n    }\n  };\n  var Pi = class extends dt2 {\n    constructor(t, e, i5) {\n      let r = t.getScrollDimensions(), s4 = t.getCurrentScrollPosition();\n      if (super({ lazyRender: e.lazyRender, host: i5, scrollbarState: new ut3(e.horizontalHasArrows ? e.horizontalScrollbarSize : 0, e.horizontal === 2 ? 0 : e.horizontalScrollbarSize, e.vertical === 2 ? 0 : e.verticalScrollbarSize, r.width, r.scrollWidth, s4.scrollLeft), visibility: e.horizontal, extraScrollbarClassName: "xterm-horizontal", scrollable: t, scrollByPage: e.scrollByPage }), e.horizontalHasArrows) throw new Error("horizontalHasArrows is not supported in xterm.js");\n      this._createSlider(Math.floor((e.horizontalScrollbarSize - e.horizontalSliderSize) / 2), 0, void 0, e.horizontalSliderSize);\n    }\n    _updateSlider(t, e) {\n      this.slider.setWidth(t), this.slider.setLeft(e);\n    }\n    _renderDomNode(t, e) {\n      this.domNode.setWidth(t), this.domNode.setHeight(e), this.domNode.setLeft(0), this.domNode.setBottom(0);\n    }\n    handleScroll(t) {\n      return this._shouldRender = this._handleElementScrollSize(t.scrollWidth) || this._shouldRender, this._shouldRender = this._handleElementScrollPosition(t.scrollLeft) || this._shouldRender, this._shouldRender = this._handleElementSize(t.width) || this._shouldRender, this._shouldRender;\n    }\n    _pointerDownRelativePosition(t, e) {\n      return t;\n    }\n    _sliderPointerPosition(t) {\n      return t.pageX;\n    }\n    _sliderOrthogonalPointerPosition(t) {\n      return t.pageY;\n    }\n    _updateScrollbarSize(t) {\n      this.slider.setHeight(t);\n    }\n    writeScrollPosition(t, e) {\n      t.scrollLeft = e;\n    }\n    updateOptions(t) {\n      this.updateScrollbarSize(t.horizontal === 2 ? 0 : t.horizontalScrollbarSize), this._scrollbarState.setOppositeScrollbarSize(t.vertical === 2 ? 0 : t.verticalScrollbarSize), this._visibilityController.setVisibility(t.horizontal), this._scrollByPage = t.scrollByPage;\n    }\n  };\n  var Mi = class extends dt2 {\n    constructor(e, i5, r) {\n      let s4 = e.getScrollDimensions(), o2 = e.getCurrentScrollPosition(), a2 = i5.verticalHasArrows;\n      super({ lazyRender: i5.lazyRender, host: r, scrollbarState: new ut3(a2 ? i5.verticalScrollbarSize : 0, i5.vertical === 2 ? 0 : i5.verticalScrollbarSize, 0, s4.height, s4.scrollHeight, o2.scrollTop), visibility: i5.vertical, extraScrollbarClassName: "xterm-vertical", scrollable: e, scrollByPage: i5.scrollByPage });\n      this._arrowScrollDelta = 0;\n      this._setArrows(a2, i5.verticalScrollbarSize), this._createSlider(0, Math.floor((i5.verticalScrollbarSize - i5.verticalSliderSize) / 2), i5.verticalSliderSize, void 0);\n    }\n    _updateSlider(e, i5) {\n      this.slider.setHeight(e), this.slider.setTop(i5);\n    }\n    _renderDomNode(e, i5) {\n      this.domNode.setWidth(i5), this.domNode.setHeight(e), this.domNode.setRight(0), this.domNode.setTop(0);\n    }\n    handleScroll(e) {\n      return this._shouldRender = this._handleElementScrollSize(e.scrollHeight) || this._shouldRender, this._shouldRender = this._handleElementScrollPosition(e.scrollTop) || this._shouldRender, this._shouldRender = this._handleElementSize(e.height) || this._shouldRender, this._shouldRender;\n    }\n    _pointerDownRelativePosition(e, i5) {\n      return i5;\n    }\n    _sliderPointerPosition(e) {\n      return e.pageY;\n    }\n    _sliderOrthogonalPointerPosition(e) {\n      return e.pageX;\n    }\n    _updateScrollbarSize(e) {\n      this.slider.setWidth(e);\n    }\n    writeScrollPosition(e, i5) {\n      e.scrollTop = i5;\n    }\n    _arrowScroll(e) {\n      let i5 = this._scrollable.getCurrentScrollPosition();\n      this._scrollable.setScrollPositionNow({ scrollTop: i5.scrollTop + e });\n    }\n    _setArrows(e, i5) {\n      if (this._arrowScrollDelta = i5, (!this._arrowUp || !this._arrowDown) && (this._arrowUp = this._createArrow({ className: "xterm-scra xterm-arrow-up", top: 0, left: 0, bgWidth: i5, bgHeight: i5, handleActivate: () => this._arrowScroll(-this._arrowScrollDelta) }), this._arrowDown = this._createArrow({ className: "xterm-scra xterm-arrow-down", bottom: 0, left: 0, bgWidth: i5, bgHeight: i5, handleActivate: () => this._arrowScroll(this._arrowScrollDelta) })), this._updateArrowSize(this._arrowUp, i5), this._updateArrowSize(this._arrowDown, i5), !this._arrowUp || !this._arrowDown) return;\n      let r = e ? "" : "none";\n      this._arrowUp.bgDomNode.style.display = r, this._arrowUp.domNode.style.display = r, this._arrowDown.bgDomNode.style.display = r, this._arrowDown.domNode.style.display = r;\n    }\n    _updateArrowSize(e, i5) {\n      e && (e.bgDomNode.style.width = `${i5}px`, e.bgDomNode.style.height = `${i5}px`, e.domNode.style.width = `${i5}px`, e.domNode.style.height = `${i5}px`);\n    }\n    updateOptions(e) {\n      let i5 = e.verticalHasArrows ? e.verticalScrollbarSize : 0;\n      this._scrollbarState.setArrowSize(i5), this._setArrows(e.verticalHasArrows, e.verticalScrollbarSize), this.updateScrollbarSize(e.vertical === 2 ? 0 : e.verticalScrollbarSize), this._scrollbarState.setOppositeScrollbarSize(0), this._visibilityController.setVisibility(e.vertical), this._scrollByPage = e.scrollByPage;\n    }\n  };\n  var ho = 500;\n  var sn = 50;\n  var is = class {\n    constructor(t, e, i5) {\n      this.timestamp = t, this.deltaX = e, this.deltaY = i5, this.score = 0;\n    }\n  };\n  var Oi = class Oi2 {\n    constructor() {\n      this._capacity = 5, this._memory = [], this._front = -1, this._rear = -1;\n    }\n    isPhysicalMouseWheel() {\n      if (this._front === -1 && this._rear === -1) return false;\n      let t = 1, e = 0, i5 = 1, r = this._rear;\n      for (; r !== -1; ) {\n        let s4 = r === this._front ? t : Math.pow(2, -i5);\n        if (t -= s4, e += this._memory[r].score * s4, r === this._front) break;\n        r = (this._capacity + r - 1) % this._capacity, i5++;\n      }\n      return e <= 0.5;\n    }\n    acceptStandardWheelEvent(t) {\n      if (Gt2) {\n        let e = oe3(t.browserEvent), i5 = Zr(e);\n        this.accept(Date.now(), t.deltaX * i5, t.deltaY * i5);\n      } else this.accept(Date.now(), t.deltaX, t.deltaY);\n    }\n    accept(t, e, i5) {\n      let r = null, s4 = new is(t, e, i5);\n      this._front === -1 && this._rear === -1 ? (this._memory[0] = s4, this._front = 0, this._rear = 0) : (r = this._memory[this._rear], this._rear = (this._rear + 1) % this._capacity, this._rear === this._front && (this._front = (this._front + 1) % this._capacity), this._memory[this._rear] = s4), s4.score = this._computeScore(s4, r);\n    }\n    _computeScore(t, e) {\n      if (Math.abs(t.deltaX) > 0 && Math.abs(t.deltaY) > 0) return 1;\n      let i5 = 0.5;\n      if ((!this._isAlmostInt(t.deltaX) || !this._isAlmostInt(t.deltaY)) && (i5 += 0.25), e) {\n        let r = Math.abs(t.deltaX), s4 = Math.abs(t.deltaY), o2 = Math.abs(e.deltaX), a2 = Math.abs(e.deltaY), l4 = Math.max(Math.min(r, o2), 1), h3 = Math.max(Math.min(s4, a2), 1), d3 = Math.max(r, o2), c2 = Math.max(s4, a2);\n        d3 % l4 === 0 && c2 % h3 === 0 && (i5 -= 0.5);\n      }\n      return Math.min(Math.max(i5, 0), 1);\n    }\n    _isAlmostInt(t) {\n      return Math.abs(Math.round(t) - t) < 0.01;\n    }\n  };\n  Oi.INSTANCE = new Oi();\n  var rs = Oi;\n  var Bi = class extends Fe3 {\n    constructor(e, i5, r) {\n      super();\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      i5 = i5 ?? {};\n      let s4, o2 = !r;\n      r ? s4 = r : (i5.mouseWheelSmoothScroll = false, s4 = new ht2({ forceIntegerValues: true, smoothScrollDuration: 0, scheduleAtNextAnimationFrame: (l4) => rt3(oe3(e), l4) })), this._options = uo(i5), this._scrollable = s4, this._register(this._scrollable.onScroll((l4) => {\n        this._handleScroll(l4), this._onScroll.fire(l4);\n      })), o2 && this._register(this._scrollable);\n      let a2 = { handleMouseWheel: (l4) => this._handleMouseWheel(l4), handleDragStart: () => this._handleDragStart(), handleDragEnd: () => this._handleDragEnd() };\n      this._verticalScrollbar = this._register(new Mi(this._scrollable, this._options, a2)), this._horizontalScrollbar = this._register(new Pi(this._scrollable, this._options, a2)), this._domNode = document.createElement("div"), this._domNode.className = "xterm-scrollable-element " + this._options.className, this._domNode.setAttribute("role", "presentation"), this._domNode.style.position = "relative", this._domNode.appendChild(e), this._domNode.appendChild(this._horizontalScrollbar.domNode.domNode), this._domNode.appendChild(this._verticalScrollbar.domNode.domNode), this._options.useShadows ? (this._leftShadowDomNode = new Te3(document.createElement("div")), this._leftShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._leftShadowDomNode.domNode), this._topShadowDomNode = new Te3(document.createElement("div")), this._topShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._topShadowDomNode.domNode), this._topLeftShadowDomNode = new Te3(document.createElement("div")), this._topLeftShadowDomNode.setClassName("xterm-shadow"), this._domNode.appendChild(this._topLeftShadowDomNode.domNode)) : (this._leftShadowDomNode = null, this._topShadowDomNode = null, this._topLeftShadowDomNode = null), this._listenOnDomNode = this._options.listenOnDomNode ?? this._domNode, this._mouseWheelToDispose = [], this._setListeningToMouseWheel(this._options.handleMouseWheel), this._onmouseover(this._listenOnDomNode, (l4) => this._handleMouseOver(l4)), this._onmouseleave(this._listenOnDomNode, (l4) => this._handleMouseLeave(l4)), this._hideTimeout = this._register(new Ne3()), this._isDragging = false, this._mouseIsOver = false, this._shouldRender = true, this._revealOnScroll = true;\n    }\n    get options() {\n      return this._options;\n    }\n    dispose() {\n      this._mouseWheelToDispose = Oe2(this._mouseWheelToDispose), super.dispose();\n    }\n    getDomNode() {\n      return this._domNode;\n    }\n    getScrollDimensions() {\n      return this._scrollable.getScrollDimensions();\n    }\n    setScrollDimensions(e) {\n      this._scrollable.setScrollDimensions(e, false);\n    }\n    setScrollPosition(e) {\n      e.reuseAnimation ? this._scrollable.setScrollPositionSmooth(e, e.reuseAnimation) : this._scrollable.setScrollPositionNow(e);\n    }\n    getScrollPosition() {\n      return this._scrollable.getCurrentScrollPosition();\n    }\n    updateClassName(e) {\n      this._options.className = e, ee3 && (this._options.className += " xterm-mac"), this._domNode.className = "xterm-scrollable-element " + this._options.className;\n    }\n    updateOptions(e) {\n      typeof e.handleMouseWheel < "u" && (this._options.handleMouseWheel = e.handleMouseWheel, this._setListeningToMouseWheel(this._options.handleMouseWheel)), typeof e.mouseWheelScrollSensitivity < "u" && (this._options.mouseWheelScrollSensitivity = e.mouseWheelScrollSensitivity), typeof e.fastScrollSensitivity < "u" && (this._options.fastScrollSensitivity = e.fastScrollSensitivity), typeof e.scrollPredominantAxis < "u" && (this._options.scrollPredominantAxis = e.scrollPredominantAxis), typeof e.horizontal < "u" && (this._options.horizontal = e.horizontal), typeof e.vertical < "u" && (this._options.vertical = e.vertical), typeof e.horizontalHasArrows < "u" && (this._options.horizontalHasArrows = e.horizontalHasArrows), typeof e.verticalHasArrows < "u" && (this._options.verticalHasArrows = e.verticalHasArrows), typeof e.horizontalScrollbarSize < "u" && (this._options.horizontalScrollbarSize = e.horizontalScrollbarSize), typeof e.verticalScrollbarSize < "u" && (this._options.verticalScrollbarSize = e.verticalScrollbarSize), typeof e.scrollByPage < "u" && (this._options.scrollByPage = e.scrollByPage), this._horizontalScrollbar.updateOptions(this._options), this._verticalScrollbar.updateOptions(this._options), this._options.lazyRender || this._render();\n    }\n    delegateScrollFromMouseWheelEvent(e) {\n      this._handleMouseWheel(new Vt2(e));\n    }\n    _setListeningToMouseWheel(e) {\n      if (this._mouseWheelToDispose.length > 0 !== e && (this._mouseWheelToDispose = Oe2(this._mouseWheelToDispose), e)) {\n        let r = (s4) => {\n          this._handleMouseWheel(new Vt2(s4));\n        };\n        this._mouseWheelToDispose.push(C3(this._listenOnDomNode, ae3.MOUSE_WHEEL, r, { passive: false }));\n      }\n    }\n    _handleMouseWheel(e) {\n      if (e.browserEvent?.defaultPrevented) return;\n      let i5 = rs.INSTANCE;\n      i5.acceptStandardWheelEvent(e);\n      let r = false;\n      if (e.deltaY || e.deltaX) {\n        let o2 = e.deltaY * this._options.mouseWheelScrollSensitivity, a2 = e.deltaX * this._options.mouseWheelScrollSensitivity;\n        this._options.scrollPredominantAxis && (this._options.scrollYToX && a2 + o2 === 0 ? a2 = o2 = 0 : Math.abs(o2) >= Math.abs(a2) ? a2 = 0 : o2 = 0), this._options.flipAxes && ([o2, a2] = [a2, o2]);\n        let l4 = !ee3 && e.browserEvent && e.browserEvent.shiftKey;\n        (this._options.scrollYToX || l4) && !a2 && (a2 = o2, o2 = 0), e.browserEvent && e.browserEvent.altKey && (a2 = a2 * this._options.fastScrollSensitivity, o2 = o2 * this._options.fastScrollSensitivity);\n        let h3 = this._scrollable.getFutureScrollPosition(), d3 = {};\n        if (o2) {\n          let c2 = sn * o2, u3 = h3.scrollTop - (c2 < 0 ? Math.floor(c2) : Math.ceil(c2));\n          this._verticalScrollbar.writeScrollPosition(d3, u3);\n        }\n        if (a2) {\n          let c2 = sn * a2, u3 = h3.scrollLeft - (c2 < 0 ? Math.floor(c2) : Math.ceil(c2));\n          this._horizontalScrollbar.writeScrollPosition(d3, u3);\n        }\n        d3 = this._scrollable.validateScrollPosition(d3), (h3.scrollLeft !== d3.scrollLeft || h3.scrollTop !== d3.scrollTop) && (this._options.mouseWheelSmoothScroll && i5.isPhysicalMouseWheel() ? this._scrollable.setScrollPositionSmooth(d3) : this._scrollable.setScrollPositionNow(d3), r = true);\n      }\n      let s4 = r;\n      !s4 && this._options.alwaysConsumeMouseWheel && (s4 = true), !s4 && this._options.consumeMouseWheelIfScrollbarIsNeeded && (this._verticalScrollbar.isNeeded() || this._horizontalScrollbar.isNeeded()) && (s4 = true), s4 && (e.preventDefault(), e.stopPropagation());\n    }\n    _handleScroll(e) {\n      this._shouldRender = this._horizontalScrollbar.handleScroll(e) || this._shouldRender, this._shouldRender = this._verticalScrollbar.handleScroll(e) || this._shouldRender, this._options.useShadows && (this._shouldRender = true), this._revealOnScroll && this._reveal(), this._options.lazyRender || this._render();\n    }\n    renderNow() {\n      if (!this._options.lazyRender) throw new Error("Please use `lazyRender` together with `renderNow`!");\n      this._render();\n    }\n    _render() {\n      if (this._shouldRender && (this._shouldRender = false, this._horizontalScrollbar.render(), this._verticalScrollbar.render(), this._options.useShadows)) {\n        let e = this._scrollable.getCurrentScrollPosition(), i5 = e.scrollTop > 0, r = e.scrollLeft > 0, s4 = r ? " xterm-shadow-left" : "", o2 = i5 ? " xterm-shadow-top" : "", a2 = r || i5 ? " xterm-shadow-top-left-corner" : "";\n        this._leftShadowDomNode.setClassName(`xterm-shadow${s4}`), this._topShadowDomNode.setClassName(`xterm-shadow${o2}`), this._topLeftShadowDomNode.setClassName(`xterm-shadow${a2}${o2}${s4}`);\n      }\n    }\n    _handleDragStart() {\n      this._isDragging = true, this._reveal();\n    }\n    _handleDragEnd() {\n      this._isDragging = false, this._hide();\n    }\n    _handleMouseLeave(e) {\n      this._mouseIsOver = false, this._hide();\n    }\n    _handleMouseOver(e) {\n      this._mouseIsOver = true, this._reveal();\n    }\n    _reveal() {\n      this._verticalScrollbar.beginReveal(), this._horizontalScrollbar.beginReveal(), this._scheduleHide();\n    }\n    _hide() {\n      !this._mouseIsOver && !this._isDragging && (this._verticalScrollbar.beginHide(), this._horizontalScrollbar.beginHide());\n    }\n    _scheduleHide() {\n      !this._mouseIsOver && !this._isDragging && this._hideTimeout.cancelAndSet(() => this._hide(), ho);\n    }\n  };\n  function uo(n11) {\n    let t = { lazyRender: typeof n11.lazyRender < "u" ? n11.lazyRender : false, className: typeof n11.className < "u" ? n11.className : "", useShadows: typeof n11.useShadows < "u" ? n11.useShadows : true, handleMouseWheel: typeof n11.handleMouseWheel < "u" ? n11.handleMouseWheel : true, flipAxes: typeof n11.flipAxes < "u" ? n11.flipAxes : false, consumeMouseWheelIfScrollbarIsNeeded: typeof n11.consumeMouseWheelIfScrollbarIsNeeded < "u" ? n11.consumeMouseWheelIfScrollbarIsNeeded : false, alwaysConsumeMouseWheel: typeof n11.alwaysConsumeMouseWheel < "u" ? n11.alwaysConsumeMouseWheel : false, scrollYToX: typeof n11.scrollYToX < "u" ? n11.scrollYToX : false, mouseWheelScrollSensitivity: typeof n11.mouseWheelScrollSensitivity < "u" ? n11.mouseWheelScrollSensitivity : 1, fastScrollSensitivity: typeof n11.fastScrollSensitivity < "u" ? n11.fastScrollSensitivity : 5, scrollPredominantAxis: typeof n11.scrollPredominantAxis < "u" ? n11.scrollPredominantAxis : true, mouseWheelSmoothScroll: typeof n11.mouseWheelSmoothScroll < "u" ? n11.mouseWheelSmoothScroll : true, listenOnDomNode: typeof n11.listenOnDomNode < "u" ? n11.listenOnDomNode : null, horizontal: typeof n11.horizontal < "u" ? n11.horizontal : 1, horizontalScrollbarSize: typeof n11.horizontalScrollbarSize < "u" ? n11.horizontalScrollbarSize : 10, horizontalSliderSize: typeof n11.horizontalSliderSize < "u" ? n11.horizontalSliderSize : 0, horizontalHasArrows: typeof n11.horizontalHasArrows < "u" ? n11.horizontalHasArrows : false, vertical: typeof n11.vertical < "u" ? n11.vertical : 1, verticalScrollbarSize: typeof n11.verticalScrollbarSize < "u" ? n11.verticalScrollbarSize : 10, verticalHasArrows: typeof n11.verticalHasArrows < "u" ? n11.verticalHasArrows : false, verticalSliderSize: typeof n11.verticalSliderSize < "u" ? n11.verticalSliderSize : 0, scrollByPage: typeof n11.scrollByPage < "u" ? n11.scrollByPage : false };\n    return t.horizontalSliderSize = typeof n11.horizontalSliderSize < "u" ? n11.horizontalSliderSize : t.horizontalScrollbarSize, t.verticalSliderSize = typeof n11.verticalSliderSize < "u" ? n11.verticalSliderSize : t.verticalScrollbarSize, ee3 && (t.className += " xterm-mac"), t;\n  }\n  var ft3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      super();\n      this._bufferService = r;\n      this._coreService = o2;\n      this._optionsService = h3;\n      this._renderService = d3;\n      this._onRequestScrollLines = this._register(new v5());\n      this.onRequestScrollLines = this._onRequestScrollLines.event;\n      this._isSyncing = false;\n      this._isHandlingScroll = false;\n      this._suppressOnScrollHandler = false;\n      this._needsSyncOnRender = false;\n      let c2 = this._register(new ht2({ forceIntegerValues: false, smoothScrollDuration: this._optionsService.rawOptions.smoothScrollDuration, scheduleAtNextAnimationFrame: (u3) => rt3(s4.window, u3) }));\n      this._register(this._optionsService.onSpecificOptionChange("smoothScrollDuration", () => {\n        c2.setSmoothScrollDuration(this._optionsService.rawOptions.smoothScrollDuration);\n      })), this._scrollableElement = this._register(new Bi(i5, { vertical: 1, horizontal: 2, useShadows: false, mouseWheelSmoothScroll: true, verticalHasArrows: this._optionsService.rawOptions.scrollbar?.showArrows ?? false, ...this._getChangeOptions() }, c2)), this._register(this._optionsService.onMultipleOptionChange(["scrollSensitivity", "fastScrollSensitivity", "scrollbar"], () => this._scrollableElement.updateOptions(this._getChangeOptions()))), this._register(a2.onProtocolChange((u3) => {\n        this._scrollableElement.updateOptions({ handleMouseWheel: !(u3 & 16) });\n      })), this._scrollableElement.setScrollDimensions({ height: 0, scrollHeight: 0 }), this._register(X2.runAndSubscribe(l4.onChangeColors, () => {\n        e.style.backgroundColor = l4.colors.background.css, this._scrollableElement.getDomNode().style.backgroundColor = l4.colors.background.css;\n      })), e.appendChild(this._scrollableElement.getDomNode()), this._register(y4(() => this._scrollableElement.getDomNode().remove())), this._styleElement = s4.mainDocument.createElement("style"), i5.appendChild(this._styleElement), this._register(y4(() => this._styleElement.remove())), this._register(X2.runAndSubscribe(l4.onChangeColors, () => {\n        this._styleElement.textContent = [".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider {", `  background: ${l4.colors.scrollbarSliderBackground.css};`, "}", ".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider:hover {", `  background: ${l4.colors.scrollbarSliderHoverBackground.css};`, "}", ".xterm .xterm-scrollable-element > .xterm-scrollbar > .xterm-slider.xterm-active {", `  background: ${l4.colors.scrollbarSliderActiveBackground.css};`, "}"].join(`\n`);\n      })), this._register(this._bufferService.onResize(() => this.queueSync())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._latestYDisp = void 0, this.queueSync();\n      })), this._register(this._bufferService.onScroll(() => this._sync())), this._register(this._renderService.onRender(() => {\n        this._needsSyncOnRender && (this._needsSyncOnRender = false, this._sync());\n      })), this._register(this._scrollableElement.onScroll((u3) => this._handleScroll(u3)));\n    }\n    scrollLines(e) {\n      let i5 = this._scrollableElement.getScrollPosition();\n      this._scrollableElement.setScrollPosition({ reuseAnimation: true, scrollTop: i5.scrollTop + e * this._renderService.dimensions.css.cell.height });\n    }\n    scrollToLine(e, i5) {\n      i5 && (this._latestYDisp = e), this._scrollableElement.setScrollPosition({ reuseAnimation: !i5, scrollTop: e * this._renderService.dimensions.css.cell.height });\n    }\n    _getChangeOptions() {\n      let e = this._optionsService.rawOptions.scrollbar?.showScrollbar ?? true, i5 = this._optionsService.rawOptions.scrollbar?.showArrows ?? false, r = e ? this._optionsService.rawOptions.scrollbar?.width ?? 14 : 0;\n      return { mouseWheelScrollSensitivity: this._optionsService.rawOptions.scrollSensitivity, fastScrollSensitivity: this._optionsService.rawOptions.fastScrollSensitivity, vertical: e ? 1 : 2, verticalScrollbarSize: r, verticalHasArrows: i5 };\n    }\n    queueSync(e) {\n      e !== void 0 && (this._latestYDisp = e), this._queuedAnimationFrame === void 0 && (this._queuedAnimationFrame = this._renderService.addRefreshCallback(() => {\n        this._queuedAnimationFrame = void 0, this._sync(this._latestYDisp);\n      }));\n    }\n    _sync(e = this._bufferService.buffer.ydisp) {\n      if (!(!this._renderService || this._isSyncing)) {\n        if (this._coreService.decPrivateModes.synchronizedOutput) {\n          this._needsSyncOnRender = true;\n          return;\n        }\n        this._isSyncing = true, this._suppressOnScrollHandler = true, this._scrollableElement.setScrollDimensions({ height: this._renderService.dimensions.css.canvas.height, scrollHeight: this._renderService.dimensions.css.cell.height * this._bufferService.buffer.lines.length }), this._suppressOnScrollHandler = false, e !== this._latestYDisp && this._scrollableElement.setScrollPosition({ scrollTop: e * this._renderService.dimensions.css.cell.height }), this._isSyncing = false;\n      }\n    }\n    _handleScroll(e) {\n      if (!this._renderService || this._isHandlingScroll || this._suppressOnScrollHandler) return;\n      this._isHandlingScroll = true;\n      let i5 = Math.round(e.scrollTop / this._renderService.dimensions.css.cell.height), r = i5 - this._bufferService.buffer.ydisp;\n      r !== 0 && (this._latestYDisp = i5, this._onRequestScrollLines.fire(r)), this._isHandlingScroll = false;\n    }\n    handleTouchScroll(e) {\n      let i5 = this._scrollableElement.getScrollPosition();\n      this._scrollableElement.setScrollPosition({ scrollTop: i5.scrollTop - e });\n    }\n  };\n  ft3 = E4([m3(2, L5), m3(3, z3), m3(4, Y), m3(5, et2), m3(6, _e2), m3(7, R3), m3(8, G4)], ft3);\n  var pt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2) {\n      super();\n      this._screenElement = e;\n      this._bufferService = i5;\n      this._coreBrowserService = r;\n      this._decorationService = s4;\n      this._renderService = o2;\n      this._decorationElements = /* @__PURE__ */ new Map();\n      this._altBufferIsActive = false;\n      this._dimensionsChanged = false;\n      this._container = document.createElement("div"), this._container.classList.add("xterm-decoration-container"), this._screenElement.appendChild(this._container), this._register(this._renderService.onRenderedViewportChange(() => this._doRefreshDecorations())), this._register(this._renderService.onDimensionsChange(() => {\n        this._dimensionsChanged = true, this._queueRefresh();\n      })), this._register(this._coreBrowserService.onDprChange(() => this._queueRefresh())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._altBufferIsActive = this._bufferService.buffer === this._bufferService.buffers.alt;\n      })), this._register(this._decorationService.onDecorationRegistered(() => this._queueRefresh())), this._register(this._decorationService.onDecorationRemoved((a2) => this._removeDecoration(a2))), this._register(y4(() => {\n        this._container.remove(), this._decorationElements.clear();\n      }));\n    }\n    _queueRefresh() {\n      this._animationFrame === void 0 && (this._animationFrame = this._renderService.addRefreshCallback(() => {\n        this._doRefreshDecorations(), this._animationFrame = void 0;\n      }));\n    }\n    _doRefreshDecorations() {\n      for (let e of this._decorationService.decorations) this._renderDecoration(e);\n      this._dimensionsChanged = false;\n    }\n    _renderDecoration(e) {\n      this._refreshStyle(e), this._dimensionsChanged && this._refreshXPosition(e);\n    }\n    _createElement(e) {\n      let i5 = this._coreBrowserService.mainDocument.createElement("div");\n      i5.classList.add("xterm-decoration"), i5.classList.toggle("xterm-decoration-top-layer", e?.options?.layer === "top"), i5.style.width = `${Math.round((e.options.width || 1) * this._renderService.dimensions.css.cell.width)}px`, i5.style.height = `${(e.options.height || 1) * this._renderService.dimensions.css.cell.height}px`, i5.style.top = `${(e.marker.line - this._bufferService.buffers.active.ydisp) * this._renderService.dimensions.css.cell.height}px`, i5.style.lineHeight = `${this._renderService.dimensions.css.cell.height}px`;\n      let r = e.options.x ?? 0;\n      return r && r > this._bufferService.cols && (i5.style.display = "none"), this._refreshXPosition(e, i5), i5;\n    }\n    _refreshStyle(e) {\n      let i5 = e.marker.line - this._bufferService.buffers.active.ydisp;\n      if (i5 < 0 || i5 >= this._bufferService.rows) e.element && (e.element.style.display = "none", e.onRenderEmitter.fire(e.element));\n      else {\n        let r = this._decorationElements.get(e);\n        r || (r = this._createElement(e), e.element = r, this._decorationElements.set(e, r), this._container.appendChild(r), e.onDispose(() => {\n          this._decorationElements.delete(e), r.remove();\n        })), r.style.display = this._altBufferIsActive ? "none" : "block", this._altBufferIsActive || (r.style.width = `${Math.round((e.options.width || 1) * this._renderService.dimensions.css.cell.width)}px`, r.style.height = `${(e.options.height || 1) * this._renderService.dimensions.css.cell.height}px`, r.style.top = `${i5 * this._renderService.dimensions.css.cell.height}px`, r.style.lineHeight = `${this._renderService.dimensions.css.cell.height}px`), e.onRenderEmitter.fire(r);\n      }\n    }\n    _refreshXPosition(e, i5 = e.element) {\n      if (!i5) return;\n      let r = e.options.x ?? 0;\n      (e.options.anchor || "left") === "right" ? i5.style.right = r ? `${r * this._renderService.dimensions.css.cell.width}px` : "" : i5.style.left = r ? `${r * this._renderService.dimensions.css.cell.width}px` : "";\n    }\n    _removeDecoration(e) {\n      this._decorationElements.get(e)?.remove(), this._decorationElements.delete(e), e.dispose();\n    }\n  };\n  pt3 = E4([m3(1, L5), m3(2, z3), m3(3, Ie2), m3(4, G4)], pt3);\n  var Ni = class {\n    constructor() {\n      this._zones = [];\n      this._zonePool = [];\n      this._zonePoolIndex = 0;\n      this._linePadding = { full: 0, left: 0, center: 0, right: 0 };\n    }\n    get zones() {\n      return this._zonePool.length = Math.min(this._zonePool.length, this._zones.length), this._zones;\n    }\n    clear() {\n      this._zones.length = 0, this._zonePoolIndex = 0;\n    }\n    addDecoration(t) {\n      if (t.options.overviewRulerOptions) {\n        for (let e of this._zones) if (e.color === t.options.overviewRulerOptions.color && e.position === t.options.overviewRulerOptions.position) {\n          if (this._lineIntersectsZone(e, t.marker.line)) return;\n          if (this._lineAdjacentToZone(e, t.marker.line, t.options.overviewRulerOptions.position)) {\n            this._addLineToZone(e, t.marker.line);\n            return;\n          }\n        }\n        if (this._zonePoolIndex < this._zonePool.length) {\n          this._zonePool[this._zonePoolIndex].color = t.options.overviewRulerOptions.color, this._zonePool[this._zonePoolIndex].position = t.options.overviewRulerOptions.position, this._zonePool[this._zonePoolIndex].startBufferLine = t.marker.line, this._zonePool[this._zonePoolIndex].endBufferLine = t.marker.line, this._zones.push(this._zonePool[this._zonePoolIndex++]);\n          return;\n        }\n        this._zones.push({ color: t.options.overviewRulerOptions.color, position: t.options.overviewRulerOptions.position, startBufferLine: t.marker.line, endBufferLine: t.marker.line }), this._zonePool.push(this._zones[this._zones.length - 1]), this._zonePoolIndex++;\n      }\n    }\n    setPadding(t) {\n      this._linePadding = t;\n    }\n    _lineIntersectsZone(t, e) {\n      return e >= t.startBufferLine && e <= t.endBufferLine;\n    }\n    _lineAdjacentToZone(t, e, i5) {\n      return e >= t.startBufferLine - this._linePadding[i5 || "full"] && e <= t.endBufferLine + this._linePadding[i5 || "full"];\n    }\n    _addLineToZone(t, e) {\n      t.startBufferLine = Math.min(t.startBufferLine, e), t.endBufferLine = Math.max(t.endBufferLine, e);\n    }\n  };\n  var Ce2 = { full: 0, left: 0, center: 0, right: 0 };\n  var He2 = { full: 0, left: 0, center: 0, right: 0 };\n  var Yt2 = { full: 0, left: 0, center: 0, right: 0 };\n  var Ge4 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3) {\n      super();\n      this._viewportElement = e;\n      this._screenElement = i5;\n      this._bufferService = r;\n      this._decorationService = s4;\n      this._renderService = o2;\n      this._optionsService = a2;\n      this._themeService = l4;\n      this._coreBrowserService = h3;\n      this._colorZoneStore = new Ni();\n      this._shouldUpdateDimensions = true;\n      this._shouldUpdateAnchor = true;\n      this._lastKnownBufferLength = 0;\n      this._canvas = this._coreBrowserService.mainDocument.createElement("canvas"), this._canvas.classList.add("xterm-decoration-overview-ruler"), this._refreshCanvasDimensions(), this._viewportElement.parentElement?.insertBefore(this._canvas, this._viewportElement), this._register(y4(() => this._canvas?.remove()));\n      let d3 = this._canvas.getContext("2d");\n      if (d3) this._ctx = d3;\n      else throw new Error("Ctx cannot be null");\n      this._register(this._decorationService.onDecorationRegistered(() => this._queueRefresh(void 0, true))), this._register(this._decorationService.onDecorationRemoved(() => this._queueRefresh(void 0, true))), this._register(this._renderService.onRenderedViewportChange(() => this._queueRefresh())), this._register(this._bufferService.buffers.onBufferActivate(() => {\n        this._canvas.style.display = this._bufferService.buffer === this._bufferService.buffers.alt ? "none" : "block";\n      })), this._register(this._bufferService.onScroll(() => {\n        this._lastKnownBufferLength !== this._bufferService.buffers.normal.lines.length && (this._refreshDrawHeightConstants(), this._refreshColorZonePadding());\n      })), this._register(this._renderService.onDimensionsChange(() => this._queueRefresh(true))), this._register(this._coreBrowserService.onDprChange(() => this._queueRefresh(true))), this._register(this._optionsService.onSpecificOptionChange("scrollbar", () => this._queueRefresh(true))), this._register(this._themeService.onChangeColors(() => this._queueRefresh())), this._register(y4(() => {\n        this._animationFrame !== void 0 && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0);\n      })), this._queueRefresh(true);\n    }\n    get _width() {\n      let e = this._optionsService.rawOptions.scrollbar;\n      return e?.showScrollbar ?? true ? e?.width ?? 0 : 0;\n    }\n    _refreshDrawConstants() {\n      let e = Math.floor((this._canvas.width - 1) / 3), i5 = Math.ceil((this._canvas.width - 1) / 3);\n      He2.full = this._canvas.width, He2.left = e, He2.center = i5, He2.right = e, this._refreshDrawHeightConstants(), Yt2.full = 1, Yt2.left = 1, Yt2.center = 1 + He2.left, Yt2.right = 1 + He2.left + He2.center;\n    }\n    _refreshDrawHeightConstants() {\n      Ce2.full = Math.round(2 * this._coreBrowserService.dpr);\n      let e = this._canvas.height / this._bufferService.buffer.lines.length, i5 = Math.round(Math.max(Math.min(e, 12), 6) * this._coreBrowserService.dpr);\n      Ce2.left = i5, Ce2.center = i5, Ce2.right = i5;\n    }\n    _refreshColorZonePadding() {\n      this._colorZoneStore.setPadding({ full: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.full), left: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.left), center: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.center), right: Math.floor(this._bufferService.buffers.active.lines.length / (this._canvas.height - 1) * Ce2.right) }), this._lastKnownBufferLength = this._bufferService.buffers.normal.lines.length;\n    }\n    _refreshCanvasDimensions() {\n      if (this._store.isDisposed || !this._renderService.hasRenderer()) return;\n      let e = this._renderService.dimensions.css.canvas.height, i5 = this._renderService.dimensions.device.canvas.height;\n      this._canvas.style.width = `${this._width}px`, this._canvas.width = Math.round(this._width * this._coreBrowserService.dpr), this._canvas.style.height = `${e}px`, this._canvas.height = i5, this._refreshDrawConstants(), this._refreshColorZonePadding();\n    }\n    _refreshDecorations() {\n      if (this._store.isDisposed || !this._renderService.hasRenderer()) return;\n      this._shouldUpdateDimensions && this._refreshCanvasDimensions(), this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height), this._colorZoneStore.clear();\n      for (let i5 of this._decorationService.decorations) this._colorZoneStore.addDecoration(i5);\n      this._ctx.lineWidth = 1, this._renderRulerOutline();\n      let e = this._colorZoneStore.zones;\n      for (let i5 of e) i5.position !== "full" && this._renderColorZone(i5);\n      for (let i5 of e) i5.position === "full" && this._renderColorZone(i5);\n      this._shouldUpdateDimensions = false, this._shouldUpdateAnchor = false;\n    }\n    _renderRulerOutline() {\n      this._ctx.fillStyle = this._themeService.colors.overviewRulerBorder.css, this._ctx.fillRect(0, 0, 1, this._canvas.height), this._optionsService.rawOptions.scrollbar?.overviewRuler?.showTopBorder && this._ctx.fillRect(1, 0, this._canvas.width - 1, 1), this._optionsService.rawOptions.scrollbar?.overviewRuler?.showBottomBorder && this._ctx.fillRect(1, this._canvas.height - 1, this._canvas.width - 1, this._canvas.height);\n    }\n    _renderColorZone(e) {\n      this._ctx.fillStyle = e.color, this._ctx.fillRect(Yt2[e.position || "full"], Math.round((this._canvas.height - 1) * (e.startBufferLine / this._bufferService.buffers.active.lines.length) - Ce2[e.position || "full"] / 2), He2[e.position || "full"], Math.round((this._canvas.height - 1) * ((e.endBufferLine - e.startBufferLine) / this._bufferService.buffers.active.lines.length) + Ce2[e.position || "full"]));\n    }\n    _queueRefresh(e, i5) {\n      this._store.isDisposed || (this._shouldUpdateDimensions = e || this._shouldUpdateDimensions, this._shouldUpdateAnchor = i5 || this._shouldUpdateAnchor, this._animationFrame === void 0 && (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => {\n        this._store.isDisposed || this._refreshDecorations(), this._animationFrame = void 0;\n      })));\n    }\n  };\n  Ge4 = E4([m3(2, L5), m3(3, Ie2), m3(4, G4), m3(5, R3), m3(6, _e2), m3(7, z3)], Ge4);\n  var _t2 = class {\n    constructor(t, e, i5, r, s4, o2) {\n      this._textarea = t;\n      this._compositionView = e;\n      this._bufferService = i5;\n      this._optionsService = r;\n      this._coreService = s4;\n      this._renderService = o2;\n      this._isComposing = false, this._isSendingComposition = false, this._compositionPosition = { start: 0, end: 0 }, this._compositionSuffix = "", this._dataAlreadySent = "";\n    }\n    get isComposing() {\n      return this._isComposing;\n    }\n    compositionstart() {\n      this._isComposing = true;\n      let t = this._textarea.selectionStart ?? this._textarea.value.length, e = this._textarea.selectionEnd ?? t;\n      this._compositionPosition.start = Math.min(t, e), this._compositionPosition.end = Math.max(t, e), this._compositionSuffix = this._textarea.value.substring(this._compositionPosition.end), this._compositionView.textContent = "", this._dataAlreadySent = "", this._compositionView.classList.add("active");\n    }\n    compositionupdate(t) {\n      this._compositionView.textContent = `\\u200E${t.data}\\u200E`, this.updateCompositionElements(), setTimeout(() => {\n        let e = this._textarea.selectionEnd ?? this._textarea.value.length;\n        this._compositionPosition.end = Math.max(this._compositionPosition.start, e);\n      }, 0);\n    }\n    compositionend() {\n      this._finalizeComposition(true);\n    }\n    keydown(t) {\n      if (this._isComposing || this._isSendingComposition) {\n        if (t.keyCode === 20 || t.keyCode === 229 || t.keyCode === 16 || t.keyCode === 17 || t.keyCode === 18) return false;\n        this._finalizeComposition(false);\n      }\n      return t.keyCode === 229 ? (this._handleAnyTextareaChanges(), false) : true;\n    }\n    _finalizeComposition(t) {\n      if (this._compositionView.classList.remove("active"), this._isComposing = false, t) {\n        let e = { start: this._compositionPosition.start, end: this._compositionPosition.end }, i5 = this._compositionSuffix;\n        this._isSendingComposition = true, setTimeout(() => {\n          if (this._isSendingComposition) {\n            this._isSendingComposition = false;\n            let r;\n            if (e.start += this._dataAlreadySent.length, this._isComposing) r = this._textarea.value.substring(e.start, this._compositionPosition.start);\n            else {\n              let s4 = this._textarea.value, o2 = i5.length > 0 && s4.endsWith(i5) ? s4.length - i5.length : s4.length;\n              r = s4.substring(e.start, Math.max(e.start, o2));\n            }\n            r.length > 0 && this._coreService.triggerDataEvent(r, true);\n          }\n        }, 0);\n      } else {\n        this._isSendingComposition = false;\n        let e = this._textarea.value.substring(this._compositionPosition.start, this._compositionPosition.end);\n        this._coreService.triggerDataEvent(e, true);\n      }\n    }\n    _handleAnyTextareaChanges() {\n      if (this._textareaChangeTimer) return;\n      let t = this._textarea.value;\n      this._textareaChangeTimer = window.setTimeout(() => {\n        if (this._textareaChangeTimer = void 0, !this._isComposing) {\n          let e = this._textarea.value, i5 = e.replace(t, "");\n          this._dataAlreadySent = i5, e.length > t.length ? this._coreService.triggerDataEvent(i5, true) : e.length < t.length ? this._coreService.triggerDataEvent("\\x7F", true) : e.length === t.length && e !== t && this._coreService.triggerDataEvent(e, true);\n        }\n      }, 0);\n    }\n    updateCompositionElements(t) {\n      if (this._isComposing) {\n        if (this._bufferService.buffer.isCursorInViewport) {\n          let e = Math.min(this._bufferService.buffer.x, this._bufferService.cols - 1), i5 = this._renderService.dimensions.css.cell.height, r = this._bufferService.buffer.y * this._renderService.dimensions.css.cell.height, s4 = e * this._renderService.dimensions.css.cell.width;\n          this._compositionView.style.left = s4 + "px", this._compositionView.style.top = r + "px", this._compositionView.style.height = i5 + "px", this._compositionView.style.lineHeight = i5 + "px", this._compositionView.style.fontFamily = this._optionsService.rawOptions.fontFamily, this._compositionView.style.fontSize = this._optionsService.rawOptions.fontSize + "px";\n          let o2 = this._bufferService.cols * this._renderService.dimensions.css.cell.width - s4;\n          this._compositionView.style.maxWidth = o2 + "px", this._compositionView.style.overflow = "hidden", this._compositionView.style.direction = "rtl";\n          let a2 = this._compositionView.getBoundingClientRect();\n          this._textarea.style.left = s4 + "px", this._textarea.style.top = r + "px", this._textarea.style.width = Math.max(a2.width, 1) + "px", this._textarea.style.height = Math.max(a2.height, 1) + "px", this._textarea.style.lineHeight = a2.height + "px";\n        }\n        t || setTimeout(() => this.updateCompositionElements(true), 0);\n      }\n    }\n  };\n  _t2 = E4([m3(2, L5), m3(3, R3), m3(4, Y), m3(5, G4)], _t2);\n  var Z4 = 0;\n  var J4 = 0;\n  var Q2 = 0;\n  var H4 = 0;\n  var ss = { css: "#00000000", rgba: 0 };\n  var B4;\n  ((i5) => {\n    function n11(r, s4, o2, a2) {\n      return a2 !== void 0 ? `#${Ve2(r)}${Ve2(s4)}${Ve2(o2)}${Ve2(a2)}` : `#${Ve2(r)}${Ve2(s4)}${Ve2(o2)}`;\n    }\n    i5.toCss = n11;\n    function t(r, s4, o2, a2 = 255) {\n      return (r << 24 | s4 << 16 | o2 << 8 | a2) >>> 0;\n    }\n    i5.toRgba = t;\n    function e(r, s4, o2, a2) {\n      return { css: i5.toCss(r, s4, o2, a2), rgba: i5.toRgba(r, s4, o2, a2) };\n    }\n    i5.toColor = e;\n  })(B4 ||= {});\n  var k4;\n  ((a2) => {\n    function n11(l4, h3) {\n      if (H4 = (h3.rgba & 255) / 255, H4 === 1) return { css: h3.css, rgba: h3.rgba };\n      let d3 = h3.rgba >> 24 & 255, c2 = h3.rgba >> 16 & 255, u3 = h3.rgba >> 8 & 255, _5 = l4.rgba >> 24 & 255, p3 = l4.rgba >> 16 & 255, b4 = l4.rgba >> 8 & 255;\n      Z4 = _5 + Math.round((d3 - _5) * H4), J4 = p3 + Math.round((c2 - p3) * H4), Q2 = b4 + Math.round((u3 - b4) * H4);\n      let f5 = B4.toCss(Z4, J4, Q2), S4 = B4.toRgba(Z4, J4, Q2);\n      return { css: f5, rgba: S4 };\n    }\n    a2.blend = n11;\n    function t(l4) {\n      return (l4.rgba & 255) === 255;\n    }\n    a2.isOpaque = t;\n    function e(l4, h3, d3) {\n      let c2 = Fi.ensureContrastRatio(l4.rgba, h3.rgba, d3);\n      if (c2) return B4.toColor(c2 >> 24 & 255, c2 >> 16 & 255, c2 >> 8 & 255);\n    }\n    a2.ensureContrastRatio = e;\n    function i5(l4) {\n      let h3 = (l4.rgba | 255) >>> 0;\n      return [Z4, J4, Q2] = Fi.toChannels(h3), { css: B4.toCss(Z4, J4, Q2), rgba: h3 };\n    }\n    a2.opaque = i5;\n    function r(l4, h3) {\n      return H4 = Math.round(h3 * 255), [Z4, J4, Q2] = Fi.toChannels(l4.rgba), { css: B4.toCss(Z4, J4, Q2, H4), rgba: B4.toRgba(Z4, J4, Q2, H4) };\n    }\n    a2.opacity = r;\n    function s4(l4, h3) {\n      return H4 = l4.rgba & 255, r(l4, H4 * h3 / 255);\n    }\n    a2.multiplyOpacity = s4;\n    function o2(l4) {\n      return [l4.rgba >> 24 & 255, l4.rgba >> 16 & 255, l4.rgba >> 8 & 255];\n    }\n    a2.toColorRGB = o2;\n  })(k4 ||= {});\n  var M3;\n  ((i5) => {\n    let n11, t;\n    try {\n      let r = document.createElement("canvas");\n      r.width = 1, r.height = 1;\n      let s4 = r.getContext("2d", { willReadFrequently: true });\n      s4 && (n11 = s4, n11.globalCompositeOperation = "copy", t = n11.createLinearGradient(0, 0, 1, 1));\n    } catch {\n    }\n    function e(r) {\n      if (r.match(/#[\\da-f]{3,8}/i)) switch (r.length) {\n        case 4:\n          return Z4 = parseInt(r.slice(1, 2).repeat(2), 16), J4 = parseInt(r.slice(2, 3).repeat(2), 16), Q2 = parseInt(r.slice(3, 4).repeat(2), 16), B4.toColor(Z4, J4, Q2);\n        case 5:\n          return Z4 = parseInt(r.slice(1, 2).repeat(2), 16), J4 = parseInt(r.slice(2, 3).repeat(2), 16), Q2 = parseInt(r.slice(3, 4).repeat(2), 16), H4 = parseInt(r.slice(4, 5).repeat(2), 16), B4.toColor(Z4, J4, Q2, H4);\n        case 7:\n          return { css: r, rgba: (parseInt(r.slice(1), 16) << 8 | 255) >>> 0 };\n        case 9:\n          return { css: r, rgba: parseInt(r.slice(1), 16) >>> 0 };\n      }\n      let s4 = r.match(/rgba?\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*(,\\s*(0|1|\\d?\\.(\\d+))\\s*)?\\)/);\n      if (s4) return Z4 = parseInt(s4[1]), J4 = parseInt(s4[2]), Q2 = parseInt(s4[3]), H4 = Math.round((s4[5] === void 0 ? 1 : parseFloat(s4[5])) * 255), B4.toColor(Z4, J4, Q2, H4);\n      if (r === "transparent") return { css: "transparent", rgba: 0 };\n      if (!n11 || !t) throw new Error("css.toColor: Unsupported css format");\n      if (n11.fillStyle = t, n11.fillStyle = r, typeof n11.fillStyle != "string") throw new Error("css.toColor: Unsupported css format");\n      if (n11.fillRect(0, 0, 1, 1), [Z4, J4, Q2, H4] = n11.getImageData(0, 0, 1, 1).data, H4 !== 255) throw new Error("css.toColor: Unsupported css format");\n      return { rgba: B4.toRgba(Z4, J4, Q2, H4), css: r };\n    }\n    i5.toColor = e;\n  })(M3 ||= {});\n  var j4;\n  ((e) => {\n    function n11(i5) {\n      return t(i5 >> 16 & 255, i5 >> 8 & 255, i5 & 255);\n    }\n    e.relativeLuminance = n11;\n    function t(i5, r, s4) {\n      let o2 = i5 / 255, a2 = r / 255, l4 = s4 / 255, h3 = o2 <= 0.03928 ? o2 / 12.92 : Math.pow((o2 + 0.055) / 1.055, 2.4), d3 = a2 <= 0.03928 ? a2 / 12.92 : Math.pow((a2 + 0.055) / 1.055, 2.4), c2 = l4 <= 0.03928 ? l4 / 12.92 : Math.pow((l4 + 0.055) / 1.055, 2.4);\n      return h3 * 0.2126 + d3 * 0.7152 + c2 * 0.0722;\n    }\n    e.relativeLuminance2 = t;\n  })(j4 ||= {});\n  var Fi;\n  ((s4) => {\n    function n11(o2, a2) {\n      if (H4 = (a2 & 255) / 255, H4 === 1) return a2;\n      let l4 = a2 >> 24 & 255, h3 = a2 >> 16 & 255, d3 = a2 >> 8 & 255, c2 = o2 >> 24 & 255, u3 = o2 >> 16 & 255, _5 = o2 >> 8 & 255;\n      return Z4 = c2 + Math.round((l4 - c2) * H4), J4 = u3 + Math.round((h3 - u3) * H4), Q2 = _5 + Math.round((d3 - _5) * H4), B4.toRgba(Z4, J4, Q2);\n    }\n    s4.blend = n11;\n    function t(o2, a2, l4) {\n      let h3 = j4.relativeLuminance(o2 >> 8), d3 = j4.relativeLuminance(a2 >> 8);\n      if (De4(h3, d3) < l4) {\n        if (d3 < h3) {\n          let p3 = e(o2, a2, l4), b4 = De4(h3, j4.relativeLuminance(p3 >> 8));\n          if (b4 < l4) {\n            let f5 = i5(o2, a2, l4), S4 = De4(h3, j4.relativeLuminance(f5 >> 8));\n            return b4 > S4 ? p3 : f5;\n          }\n          return p3;\n        }\n        let u3 = i5(o2, a2, l4), _5 = De4(h3, j4.relativeLuminance(u3 >> 8));\n        if (_5 < l4) {\n          let p3 = e(o2, a2, l4), b4 = De4(h3, j4.relativeLuminance(p3 >> 8));\n          return _5 > b4 ? u3 : p3;\n        }\n        return u3;\n      }\n    }\n    s4.ensureContrastRatio = t;\n    function e(o2, a2, l4) {\n      let h3 = o2 >> 24 & 255, d3 = o2 >> 16 & 255, c2 = o2 >> 8 & 255, u3 = a2 >> 24 & 255, _5 = a2 >> 16 & 255, p3 = a2 >> 8 & 255, b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      for (; b4 < l4 && (u3 > 0 || _5 > 0 || p3 > 0); ) u3 -= Math.max(0, Math.ceil(u3 * 0.1)), _5 -= Math.max(0, Math.ceil(_5 * 0.1)), p3 -= Math.max(0, Math.ceil(p3 * 0.1)), b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      return (u3 << 24 | _5 << 16 | p3 << 8 | 255) >>> 0;\n    }\n    s4.reduceLuminance = e;\n    function i5(o2, a2, l4) {\n      let h3 = o2 >> 24 & 255, d3 = o2 >> 16 & 255, c2 = o2 >> 8 & 255, u3 = a2 >> 24 & 255, _5 = a2 >> 16 & 255, p3 = a2 >> 8 & 255, b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      for (; b4 < l4 && (u3 < 255 || _5 < 255 || p3 < 255); ) u3 = Math.min(255, u3 + Math.ceil((255 - u3) * 0.1)), _5 = Math.min(255, _5 + Math.ceil((255 - _5) * 0.1)), p3 = Math.min(255, p3 + Math.ceil((255 - p3) * 0.1)), b4 = De4(j4.relativeLuminance2(u3, _5, p3), j4.relativeLuminance2(h3, d3, c2));\n      return (u3 << 24 | _5 << 16 | p3 << 8 | 255) >>> 0;\n    }\n    s4.increaseLuminance = i5;\n    function r(o2) {\n      return [o2 >> 24 & 255, o2 >> 16 & 255, o2 >> 8 & 255, o2 & 255];\n    }\n    s4.toChannels = r;\n  })(Fi ||= {});\n  function Ve2(n11) {\n    let t = n11.toString(16);\n    return t.length < 2 ? "0" + t : t;\n  }\n  function De4(n11, t) {\n    return n11 < t ? (t + 0.05) / (n11 + 0.05) : (n11 + 0.05) / (t + 0.05);\n  }\n  var Hi = class extends fe2 {\n    constructor(e, i5, r) {\n      super();\n      this.content = 0;\n      this.combinedData = "";\n      this.fg = e.fg, this.bg = e.bg, this.combinedData = i5, this._width = r;\n    }\n    isCombined() {\n      return 2097152;\n    }\n    getWidth() {\n      return this._width;\n    }\n    getChars() {\n      return this.combinedData;\n    }\n    getCode() {\n      return 2097151;\n    }\n    setFromCharData(e) {\n      throw new Error("not implemented");\n    }\n    getAsCharData() {\n      return [this.fg, this.getChars(), this.getWidth(), this.getCode()];\n    }\n  };\n  var We3 = class {\n    constructor(t) {\n      this._bufferService = t;\n      this._characterJoiners = [];\n      this._nextCharacterJoinerId = 0;\n      this._workCell = new N2();\n    }\n    register(t) {\n      let e = { id: this._nextCharacterJoinerId++, handler: t };\n      return this._characterJoiners.push(e), e.id;\n    }\n    deregister(t) {\n      for (let e = 0; e < this._characterJoiners.length; e++) if (this._characterJoiners[e].id === t) return this._characterJoiners.splice(e, 1), true;\n      return false;\n    }\n    getJoinedCharacters(t) {\n      if (this._characterJoiners.length === 0) return [];\n      let e = this._bufferService.buffer.lines.get(t);\n      if (!e || e.length === 0) return [];\n      let i5 = [], r = e.translateToString(true), s4 = 0, o2 = 0, a2 = 0, l4 = e.getFg(0), h3 = e.getBg(0);\n      for (let d3 = 0; d3 < e.getTrimmedLength(); d3++) if (e.loadCell(d3, this._workCell), this._workCell.getWidth() !== 0) {\n        if (this._workCell.fg !== l4 || this._workCell.bg !== h3) {\n          if (d3 - s4 > 1) {\n            let c2 = this._getJoinedRanges(r, a2, o2, e, s4);\n            for (let u3 = 0; u3 < c2.length; u3++) i5.push(c2[u3]);\n          }\n          s4 = d3, a2 = o2, l4 = this._workCell.fg, h3 = this._workCell.bg;\n        }\n        o2 += this._workCell.getChars().length || " ".length;\n      }\n      if (this._bufferService.cols - s4 > 1) {\n        let d3 = this._getJoinedRanges(r, a2, o2, e, s4);\n        for (let c2 = 0; c2 < d3.length; c2++) i5.push(d3[c2]);\n      }\n      return i5;\n    }\n    _getJoinedRanges(t, e, i5, r, s4) {\n      let o2 = t.substring(e, i5), a2 = [];\n      try {\n        a2 = this._characterJoiners[0].handler(o2);\n      } catch (l4) {\n        console.error(l4);\n      }\n      for (let l4 = 1; l4 < this._characterJoiners.length; l4++) try {\n        let h3 = this._characterJoiners[l4].handler(o2);\n        for (let d3 = 0; d3 < h3.length; d3++) We3._mergeRanges(a2, h3[d3]);\n      } catch (h3) {\n        console.error(h3);\n      }\n      return this._stringRangesToCellRanges(a2, r, s4), a2;\n    }\n    _stringRangesToCellRanges(t, e, i5) {\n      let r = 0, s4 = false, o2 = 0, a2 = t[r];\n      if (a2) {\n        for (let l4 = i5; l4 < this._bufferService.cols; l4++) {\n          let h3 = e.getWidth(l4), d3 = e.getString(l4).length || " ".length;\n          if (h3 !== 0) {\n            if (!s4 && a2[0] <= o2 && (a2[0] = l4, s4 = true), a2[1] <= o2) {\n              if (a2[1] = l4, a2 = t[++r], !a2) break;\n              a2[0] <= o2 ? (a2[0] = l4, s4 = true) : s4 = false;\n            }\n            o2 += d3;\n          }\n        }\n        a2 && (a2[1] = this._bufferService.cols);\n      }\n    }\n    static _mergeRanges(t, e) {\n      let i5 = false;\n      for (let r = 0; r < t.length; r++) {\n        let s4 = t[r];\n        if (i5) {\n          if (e[1] <= s4[0]) return t[r - 1][1] = e[1], t;\n          if (e[1] <= s4[1]) return t[r - 1][1] = Math.max(e[1], s4[1]), t.splice(r, 1), t;\n          t.splice(r, 1), r--;\n        } else {\n          if (e[1] <= s4[0]) return t.splice(r, 0, e), t;\n          if (e[1] <= s4[1]) return s4[0] = Math.min(e[0], s4[0]), t;\n          e[0] < s4[1] && (s4[0] = Math.min(e[0], s4[0]), i5 = true);\n          continue;\n        }\n      }\n      return i5 ? t[t.length - 1][1] = e[1] : t.push(e), t;\n    }\n  };\n  We3 = E4([m3(0, L5)], We3);\n  function ns(n11) {\n    if (!n11) throw new Error("value must not be falsy");\n    return n11;\n  }\n  function fo(n11) {\n    return 57508 <= n11 && n11 <= 57558;\n  }\n  function po(n11) {\n    return 9472 <= n11 && n11 <= 9631;\n  }\n  function on(n11) {\n    return fo(n11) || po(n11);\n  }\n  function an() {\n    return { css: { canvas: Wi(), cell: Wi() }, device: { canvas: Wi(), cell: Wi(), char: { width: 0, height: 0, left: 0, top: 0 } } };\n  }\n  function Wi() {\n    return { width: 0, height: 0 };\n  }\n  var mt3 = class {\n    constructor(t, e, i5, r, s4, o2, a2) {\n      this._document = t;\n      this._characterJoinerService = e;\n      this._optionsService = i5;\n      this._coreBrowserService = r;\n      this._coreService = s4;\n      this._decorationService = o2;\n      this._themeService = a2;\n      this._workCell = new N2();\n      this._columnSelectMode = false;\n      this.defaultSpacing = 0;\n    }\n    handleSelectionChanged(t, e, i5) {\n      this._selectionStart = t, this._selectionEnd = e, this._columnSelectMode = i5;\n    }\n    createRow(t, e, i5, r, s4, o2, a2, l4, h3, d3, c2, u3, _5) {\n      let p3 = [];\n      _5 && (_5.hasBlinkingCells = false);\n      let b4 = this._characterJoinerService.getJoinedCharacters(e), f5 = this._themeService.colors, S4 = t.getNoBgTrimmedLength();\n      i5 && S4 < o2 + 1 && (S4 = o2 + 1);\n      let I4, w6 = 0, x5 = "", ie4 = 0, ce4 = 0, Os = 0, Ns = 0, Fs = false, Hs = 0, _i = false, Ft = 0, Ws = 0, O4 = [], qn2 = c2 !== -1 && u3 !== -1;\n      for (let ne3 = 0; ne3 < S4; ne3++) {\n        t.loadCell(ne3, this._workCell);\n        let Ar = this._workCell.getWidth();\n        if (Ar === 0) continue;\n        let mi = false, Ze4 = ne3 >= Ws, kr = ne3, T4 = this._workCell;\n        if (b4.length > 0 && ne3 === b4[0][0] && Ze4) {\n          let A4 = b4.shift(), Nr = this._isCellInSelection(A4[0], e);\n          for (ie4 = A4[0] + 1; ie4 < A4[1]; ie4++) Ze4 &&= Nr === this._isCellInSelection(ie4, e);\n          Ze4 &&= !i5 || o2 < A4[0] || o2 >= A4[1], Ze4 ? (mi = true, T4 = new Hi(this._workCell, t.translateToString(true, A4[0], A4[1]), A4[1] - A4[0]), kr = A4[1] - 1, Ar = T4.getWidth()) : Ws = A4[1];\n        }\n        let Ht2 = this._isCellInSelection(ne3, e), Pr = i5 && ne3 === o2, Mr = qn2 && ne3 >= c2 && ne3 <= u3;\n        _5 && T4.isBlink() && (_5.hasBlinkingCells = true), !l4 && T4.isBlink() && O4.push("xterm-blink-hidden");\n        let Br = false;\n        this._decorationService.forEachDecorationAtCell(ne3, e, void 0, (A4) => {\n          Br = true;\n        });\n        let bi = T4.getChars() || " ";\n        if (bi === " " && (T4.isUnderline() || T4.isOverline()) && (bi = "\\xA0"), Ft = Ar * h3 - d3.get(bi, T4.isBold(), T4.isItalic()), !I4) I4 = this._document.createElement("span");\n        else if (w6 && (Ht2 && _i || !Ht2 && !_i && T4.bg === ce4) && (Ht2 && _i && f5.selectionForeground || T4.fg === Os) && T4.extended.ext === Ns && Mr === Fs && Ft === Hs && !Pr && !mi && !Br && Ze4) {\n          T4.isInvisible() ? x5 += " " : x5 += bi, w6++;\n          continue;\n        } else w6 && (I4.textContent = x5), I4 = this._document.createElement("span"), w6 = 0, x5 = "";\n        if (ce4 = T4.bg, Os = T4.fg, Ns = T4.extended.ext, Fs = Mr, Hs = Ft, _i = Ht2, mi && o2 >= ne3 && o2 <= kr && (o2 = ne3), !this._coreService.isCursorHidden && Pr && this._coreService.isCursorInitialized) {\n          if (O4.push("xterm-cursor"), this._coreBrowserService.isFocused) a2 && O4.push("xterm-cursor-blink"), O4.push(r === "bar" ? "xterm-cursor-bar" : r === "underline" ? "xterm-cursor-underline" : "xterm-cursor-block");\n          else if (s4) switch (s4) {\n            case "outline":\n              O4.push("xterm-cursor-outline");\n              break;\n            case "block":\n              O4.push("xterm-cursor-block");\n              break;\n            case "bar":\n              O4.push("xterm-cursor-bar");\n              break;\n            case "underline":\n              O4.push("xterm-cursor-underline");\n              break;\n            default:\n              break;\n          }\n        }\n        if (T4.isBold() && O4.push("xterm-bold"), T4.isItalic() && O4.push("xterm-italic"), T4.isDim() && O4.push("xterm-dim"), T4.isInvisible() ? x5 = " " : x5 = T4.getChars() || " ", T4.isUnderline() && (O4.push(`xterm-underline-${T4.extended.underlineStyle}`), x5 === " " && (x5 = "\\xA0"), !T4.isUnderlineColorDefault())) if (T4.isUnderlineColorRGB()) I4.style.textDecorationColor = `rgb(${fe2.toColorRGB(T4.getUnderlineColor()).join(",")})`;\n        else {\n          let A4 = T4.getUnderlineColor();\n          this._optionsService.rawOptions.drawBoldTextInBrightColors && T4.isBold() && A4 < 8 && (A4 += 8), I4.style.textDecorationColor = f5.ansi[A4].css;\n        }\n        T4.isOverline() && (O4.push("xterm-overline"), x5 === " " && (x5 = "\\xA0")), T4.isStrikethrough() && O4.push("xterm-strikethrough"), Mr && (I4.style.textDecoration = "underline");\n        let ue2 = T4.getFgColor(), Wt2 = T4.getFgColorMode(), ge2 = T4.getBgColor(), Ut2 = T4.getBgColorMode(), Or = !!T4.isInverse();\n        if (Or) {\n          let A4 = ue2;\n          ue2 = ge2, ge2 = A4;\n          let Nr = Wt2;\n          Wt2 = Ut2, Ut2 = Nr;\n        }\n        let Ae3, vi, Kt2 = false;\n        this._decorationService.forEachDecorationAtCell(ne3, e, void 0, (A4) => {\n          A4.options.layer !== "top" && Kt2 || (A4.backgroundColorRGB && (Ut2 = 50331648, ge2 = A4.backgroundColorRGB.rgba >> 8 & 16777215, Ae3 = A4.backgroundColorRGB), A4.foregroundColorRGB && (Wt2 = 50331648, ue2 = A4.foregroundColorRGB.rgba >> 8 & 16777215, vi = A4.foregroundColorRGB), Kt2 = A4.options.layer === "top");\n        }), !Kt2 && Ht2 && (Ae3 = this._coreBrowserService.isFocused ? f5.selectionBackgroundOpaque : f5.selectionInactiveBackgroundOpaque, ge2 = Ae3.rgba >> 8 & 16777215, Ut2 = 50331648, Kt2 = true, f5.selectionForeground && (Wt2 = 50331648, ue2 = f5.selectionForeground.rgba >> 8 & 16777215, vi = f5.selectionForeground)), Kt2 && O4.push("xterm-decoration-top");\n        let ke3;\n        switch (Ut2) {\n          case 16777216:\n          case 33554432:\n            ke3 = f5.ansi[ge2], O4.push(`xterm-bg-${ge2}`);\n            break;\n          case 50331648:\n            ke3 = B4.toColor(ge2 >> 16, ge2 >> 8 & 255, ge2 & 255), this._addStyle(I4, `background-color:#${(ge2 >>> 0).toString(16).padStart(6, "0")}`);\n            break;\n          case 0:\n          default:\n            Or ? (ke3 = f5.foreground, O4.push(`xterm-bg-${257}`)) : ke3 = f5.background;\n        }\n        switch (Ae3 || T4.isDim() && (Ae3 = k4.multiplyOpacity(ke3, 0.5)), Wt2) {\n          case 16777216:\n          case 33554432:\n            T4.isBold() && ue2 < 8 && this._optionsService.rawOptions.drawBoldTextInBrightColors && (ue2 += 8), this._applyMinimumContrast(I4, ke3, f5.ansi[ue2], T4, Ae3, void 0) || O4.push(`xterm-fg-${ue2}`);\n            break;\n          case 50331648:\n            let A4 = B4.toColor(ue2 >> 16 & 255, ue2 >> 8 & 255, ue2 & 255);\n            this._applyMinimumContrast(I4, ke3, A4, T4, Ae3, vi) || this._addStyle(I4, `color:#${ue2.toString(16).padStart(6, "0")}`);\n            break;\n          case 0:\n          default:\n            this._applyMinimumContrast(I4, ke3, f5.foreground, T4, Ae3, vi) || Or && O4.push(`xterm-fg-${257}`);\n        }\n        O4.length && (I4.className = O4.join(" "), O4.length = 0), !Pr && !mi && !Br && Ze4 ? w6++ : I4.textContent = x5, Ft !== this.defaultSpacing && (I4.style.letterSpacing = `${Ft}px`), p3.push(I4), ne3 = kr;\n      }\n      return I4 && w6 && (I4.textContent = x5), p3;\n    }\n    _applyMinimumContrast(t, e, i5, r, s4, o2) {\n      if (this._optionsService.rawOptions.minimumContrastRatio === 1 || on(r.getCode())) return false;\n      let a2 = this._getContrastCache(r), l4;\n      if (!s4 && !o2 && (l4 = a2.getColor(e.rgba, i5.rgba)), l4 === void 0) {\n        let h3 = this._optionsService.rawOptions.minimumContrastRatio / (r.isDim() ? 2 : 1);\n        l4 = k4.ensureContrastRatio(s4 ?? e, o2 ?? i5, h3), a2.setColor((s4 ?? e).rgba, (o2 ?? i5).rgba, l4 ?? null);\n      }\n      return l4 ? (this._addStyle(t, `color:${l4.css}`), true) : false;\n    }\n    _getContrastCache(t) {\n      return t.isDim() ? this._themeService.colors.halfContrastCache : this._themeService.colors.contrastCache;\n    }\n    _addStyle(t, e) {\n      t.setAttribute("style", `${t.getAttribute("style") || ""}${e};`);\n    }\n    _isCellInSelection(t, e) {\n      let i5 = this._selectionStart, r = this._selectionEnd;\n      return !i5 || !r ? false : this._columnSelectMode ? i5[0] <= r[0] ? t >= i5[0] && e >= i5[1] && t < r[0] && e <= r[1] : t < i5[0] && e >= i5[1] && t >= r[0] && e <= r[1] : e > i5[1] && e < r[1] || i5[1] === r[1] && e === i5[1] && t >= i5[0] && t < r[0] || i5[1] < r[1] && e === r[1] && t < r[0] || i5[1] < r[1] && e === i5[1] && t >= i5[0];\n    }\n  };\n  mt3 = E4([m3(1, Ei), m3(2, R3), m3(3, z3), m3(4, Y), m3(5, Ie2), m3(6, _e2)], mt3);\n  var Ui = class {\n    constructor(t = () => new os()) {\n      this._flat = new Float32Array(256);\n      this._font = "";\n      this._fontSize = 0;\n      this._weight = "normal";\n      this._weightBold = "bold";\n      this._canvasElements = [];\n      this._canvasElements = [t(), t(), t(), t()], this.clear();\n    }\n    dispose() {\n      this._canvasElements.length = 0, this._holey = void 0;\n    }\n    clear() {\n      this._flat.fill(-9999), this._holey = /* @__PURE__ */ new Map();\n    }\n    setFont(t, e, i5, r) {\n      t === this._font && e === this._fontSize && i5 === this._weight && r === this._weightBold || (this._font = t, this._fontSize = e, this._weight = i5, this._weightBold = r, this._canvasElements[0].setFont(t, e, i5, false), this._canvasElements[1].setFont(t, e, r, false), this._canvasElements[2].setFont(t, e, i5, true), this._canvasElements[3].setFont(t, e, r, true), this.clear());\n    }\n    get(t, e, i5) {\n      let r = 0;\n      if (!e && !i5 && t.length === 1 && (r = t.charCodeAt(0)) < 256) {\n        if (this._flat[r] !== -9999) return this._flat[r];\n        let a2 = this._measure(t, 0);\n        return a2 > 0 && (this._flat[r] = a2), a2;\n      }\n      let s4 = t;\n      e && (s4 += "B"), i5 && (s4 += "I");\n      let o2 = this._holey.get(s4);\n      if (o2 === void 0) {\n        let a2 = 0;\n        e && (a2 |= 1), i5 && (a2 |= 2), o2 = this._measure(t, a2), o2 > 0 && this._holey.set(s4, o2);\n      }\n      return o2;\n    }\n    _measure(t, e) {\n      return this._canvasElements[e].measure(t);\n    }\n  };\n  var os = class {\n    constructor() {\n      typeof OffscreenCanvas < "u" ? (this._canvas = new OffscreenCanvas(1, 1), this._ctx = ns(this._canvas.getContext("2d"))) : (this._canvas = document.createElement("canvas"), this._canvas.width = 1, this._canvas.height = 1, this._ctx = ns(this._canvas.getContext("2d")));\n    }\n    setFont(t, e, i5, r) {\n      let s4 = r ? "italic" : "";\n      this._ctx.font = `${s4} ${i5} ${e}px ${t}`.trim();\n    }\n    measure(t) {\n      return this._ctx.measureText(t).width;\n    }\n  };\n  var as = class {\n    constructor() {\n      this.clear();\n    }\n    clear() {\n      this.hasSelection = false, this.columnSelectMode = false, this.viewportStartRow = 0, this.viewportEndRow = 0, this.viewportCappedStartRow = 0, this.viewportCappedEndRow = 0, this.startCol = 0, this.endCol = 0, this.selectionStart = void 0, this.selectionEnd = void 0;\n    }\n    update(t, e, i5, r = false) {\n      if (this.selectionStart = e, this.selectionEnd = i5, !e || !i5 || e[0] === i5[0] && e[1] === i5[1]) {\n        this.clear();\n        return;\n      }\n      let s4 = t.buffers.active.ydisp, o2 = e[1] - s4, a2 = i5[1] - s4, l4 = Math.max(o2, 0), h3 = Math.min(a2, t.rows - 1);\n      if (l4 >= t.rows || h3 < 0) {\n        this.clear();\n        return;\n      }\n      this.hasSelection = true, this.columnSelectMode = r, this.viewportStartRow = o2, this.viewportEndRow = a2, this.viewportCappedStartRow = l4, this.viewportCappedEndRow = h3, this.startCol = e[0], this.endCol = i5[0];\n    }\n    isCellSelected(t, e, i5) {\n      return this.hasSelection ? (i5 -= t.buffer.active.viewportY, this.columnSelectMode ? this.startCol <= this.endCol ? e >= this.startCol && i5 >= this.viewportCappedStartRow && e < this.endCol && i5 <= this.viewportCappedEndRow : e < this.startCol && i5 >= this.viewportCappedStartRow && e >= this.endCol && i5 <= this.viewportCappedEndRow : i5 > this.viewportStartRow && i5 < this.viewportEndRow || this.viewportStartRow === this.viewportEndRow && i5 === this.viewportStartRow && e >= this.startCol && e < this.endCol || this.viewportStartRow < this.viewportEndRow && i5 === this.viewportEndRow && e < this.endCol || this.viewportStartRow < this.viewportEndRow && i5 === this.viewportStartRow && e >= this.startCol) : false;\n    }\n  };\n  function ln() {\n    return new as();\n  }\n  var Ki = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._renderCallback = e;\n      this._coreBrowserService = i5;\n      this._optionsService = r;\n      this._intervalDuration = 0;\n      this._blinkOn = true;\n      this._needsBlinkInViewport = false;\n      this._isViewportVisible = true;\n      this._register(this._optionsService.onSpecificOptionChange("blinkIntervalDuration", (s4) => {\n        this.setIntervalDuration(s4);\n      })), this.setIntervalDuration(this._optionsService.rawOptions.blinkIntervalDuration), this._register(y4(() => this._clearInterval()));\n    }\n    get isBlinkOn() {\n      return this._blinkOn;\n    }\n    get isEnabled() {\n      return this._intervalDuration > 0;\n    }\n    setNeedsBlinkInViewport(e) {\n      this._needsBlinkInViewport !== e && (this._needsBlinkInViewport = e, this._updateIntervalState());\n    }\n    setViewportVisible(e) {\n      this._isViewportVisible !== e && (this._isViewportVisible = e, this._updateIntervalState());\n    }\n    setIntervalDuration(e) {\n      e !== this._intervalDuration && (this._intervalDuration = e, this._clearInterval(), this._updateIntervalState());\n    }\n    _updateIntervalState() {\n      if (this._intervalDuration > 0 && this._needsBlinkInViewport && this._isViewportVisible) {\n        if (this._interval !== void 0) return;\n        let i5 = this._blinkOn;\n        this._blinkOn = true, this._interval = this._coreBrowserService.window.setInterval(() => {\n          this._blinkOn = !this._blinkOn, this._renderCallback();\n        }, this._intervalDuration), i5 || this._renderCallback();\n        return;\n      }\n      this._clearInterval(), this._blinkOn || (this._blinkOn = true, this._renderCallback());\n    }\n    _clearInterval() {\n      this._interval !== void 0 && (this._coreBrowserService.window.clearInterval(this._interval), this._interval = void 0);\n    }\n  };\n  var ls = "xterm-dom-renderer-owner-";\n  var le2 = "xterm-rows";\n  var zi = "xterm-fg-";\n  var cn = "xterm-bg-";\n  var Xt2 = "xterm-focus";\n  var Gi = "xterm-selection";\n  var $i = "xterm-cursor-blink-idle";\n  var _o2 = 1;\n  var vt2 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3, c2, u3, _5, p3, b4) {\n      super();\n      this._terminal = e;\n      this._document = i5;\n      this._element = r;\n      this._screenElement = s4;\n      this._viewportElement = o2;\n      this._helperContainer = a2;\n      this._linkifier2 = l4;\n      this._charSizeService = d3;\n      this._optionsService = c2;\n      this._bufferService = u3;\n      this._coreService = _5;\n      this._coreBrowserService = p3;\n      this._themeService = b4;\n      this._terminalClass = _o2++;\n      this._rowElements = [];\n      this._selectionRenderModel = ln();\n      this._lastSelectionColumnMode = false;\n      this._rowHasBlinkingCells = [];\n      this._rowHasBlinkingCellsCount = 0;\n      this._onRequestRedraw = this._register(new v5());\n      this.onRequestRedraw = this._onRequestRedraw.event;\n      this._rowContainer = this._document.createElement("div"), this._rowContainer.classList.add(le2), this._rowContainer.style.lineHeight = "normal", this._rowContainer.setAttribute("aria-hidden", "true"), this._refreshRowElements(this._bufferService.cols, this._bufferService.rows), this._selectionContainer = this._document.createElement("div"), this._selectionContainer.classList.add(Gi), this._selectionContainer.setAttribute("aria-hidden", "true"), this.dimensions = an(), this._updateDimensions(), this._register(this._optionsService.onOptionChange(() => this._handleOptionsChanged())), this._register(this._themeService.onChangeColors((f5) => this._injectCss(f5))), this._injectCss(this._themeService.colors), this._rowFactory = h3.createInstance(mt3, document), this._element.classList.add(ls + this._terminalClass), this._screenElement.appendChild(this._rowContainer), this._screenElement.appendChild(this._selectionContainer), this._register(this._linkifier2.onShowLinkUnderline((f5) => this._handleLinkHover(f5))), this._register(this._linkifier2.onHideLinkUnderline((f5) => this._handleLinkLeave(f5))), this._cursorBlinkStateManager = new cs(this._rowContainer, this._coreBrowserService), this._register(C3(this._document, "mousedown", () => this._cursorBlinkStateManager.restartBlinkAnimation())), this._register(y4(() => this._cursorBlinkStateManager.dispose())), this._textBlinkStateManager = this._register(new Ki(() => this._onRequestRedraw.fire({ start: 0, end: this._bufferService.rows - 1 }), this._coreBrowserService, this._optionsService)), this._register(y4(() => {\n        this._element.classList.remove(ls + this._terminalClass), this._rowContainer.remove(), this._selectionContainer.remove(), this._widthCache.dispose(), this._themeStyleElement.remove(), this._dimensionsStyleElement.remove();\n      })), this._widthCache = new Ui(), this._widthCache.setFont(this._optionsService.rawOptions.fontFamily, this._optionsService.rawOptions.fontSize, this._optionsService.rawOptions.fontWeight, this._optionsService.rawOptions.fontWeightBold), this._setDefaultSpacing();\n    }\n    _updateDimensions() {\n      let e = this._coreBrowserService.dpr;\n      this.dimensions.device.char.width = this._charSizeService.width * e, this.dimensions.device.char.height = Math.ceil(this._charSizeService.height * e), this.dimensions.device.cell.width = this.dimensions.device.char.width + Math.round(this._optionsService.rawOptions.letterSpacing), this.dimensions.device.cell.height = Math.floor(this.dimensions.device.char.height * this._optionsService.rawOptions.lineHeight), this.dimensions.device.char.left = 0, this.dimensions.device.char.top = 0, this.dimensions.device.canvas.width = this.dimensions.device.cell.width * this._bufferService.cols, this.dimensions.device.canvas.height = this.dimensions.device.cell.height * this._bufferService.rows, this.dimensions.css.canvas.width = Math.round(this.dimensions.device.canvas.width / e), this.dimensions.css.canvas.height = Math.round(this.dimensions.device.canvas.height / e), this.dimensions.css.cell.width = this.dimensions.css.canvas.width / this._bufferService.cols, this.dimensions.css.cell.height = this.dimensions.css.canvas.height / this._bufferService.rows;\n      for (let r of this._rowElements) r.style.width = `${this.dimensions.css.canvas.width}px`, r.style.height = `${this.dimensions.css.cell.height}px`, r.style.lineHeight = `${this.dimensions.css.cell.height}px`, r.style.overflow = "hidden";\n      this._dimensionsStyleElement || (this._dimensionsStyleElement = this._document.createElement("style"), this._screenElement.appendChild(this._dimensionsStyleElement));\n      let i5 = `${this._terminalSelector} .${le2} span { display: inline-block; height: 100%; vertical-align: top;}`;\n      this._dimensionsStyleElement.textContent = i5, this._selectionContainer.style.height = this._viewportElement.style.height, this._screenElement.style.width = `${this.dimensions.css.canvas.width}px`, this._screenElement.style.height = `${this.dimensions.css.canvas.height}px`;\n    }\n    _injectCss(e) {\n      this._themeStyleElement || (this._themeStyleElement = this._document.createElement("style"), this._screenElement.appendChild(this._themeStyleElement));\n      let i5 = `${this._terminalSelector} .${le2} { pointer-events: none; color: ${e.foreground.css};}`;\n      i5 += `${this._terminalSelector} .${le2}, ${this._terminalSelector} .${le2} span { font-family: ${this._optionsService.rawOptions.fontFamily}; font-size: ${this._optionsService.rawOptions.fontSize}px; font-kerning: none; white-space: pre}`, i5 += `${this._terminalSelector} .${le2} .xterm-dim { color: ${k4.multiplyOpacity(e.foreground, 0.5).css};}`, i5 += `${this._terminalSelector} span:not(.xterm-bold) { font-weight: ${this._optionsService.rawOptions.fontWeight};}${this._terminalSelector} span.xterm-bold { font-weight: ${this._optionsService.rawOptions.fontWeightBold};}${this._terminalSelector} span.xterm-italic { font-style: italic;}${this._terminalSelector} span.xterm-blink-hidden { visibility: hidden;}`;\n      let r = `blink_underline_${this._terminalClass}`, s4 = `blink_bar_${this._terminalClass}`, o2 = `blink_block_${this._terminalClass}`;\n      i5 += `@keyframes ${r} { 50% {  border-bottom-style: hidden; }}`, i5 += `@keyframes ${s4} { 50% {  box-shadow: none; }}`, i5 += `@keyframes ${o2} { 0% {  background-color: ${e.cursor.css};  color: ${e.cursorAccent.css}; } 50% {  background-color: inherit;  color: ${e.cursor.css}; }}`, i5 += `${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-underline { animation: ${r} 1s step-end infinite;}${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-bar { animation: ${s4} 1s step-end infinite;}${this._terminalSelector} .${le2}.${Xt2} .xterm-cursor.xterm-cursor-blink.xterm-cursor-block { animation: ${o2} 1s step-end infinite;}${this._terminalSelector} .${le2}.${$i} .xterm-cursor.xterm-cursor-blink { animation: none !important;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-block { background-color: ${e.cursor.css}; color: ${e.cursorAccent.css};}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-block:not(.xterm-cursor-blink) { background-color: ${e.cursor.css} !important; color: ${e.cursorAccent.css} !important;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-outline { outline: 1px solid ${e.cursor.css}; outline-offset: -1px;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-bar { box-shadow: ${this._optionsService.rawOptions.cursorWidth}px 0 0 ${e.cursor.css} inset;}${this._terminalSelector} .${le2} .xterm-cursor.xterm-cursor-underline { border-bottom: 1px ${e.cursor.css}; border-bottom-style: solid; height: calc(100% - 1px);}`, i5 += `${this._terminalSelector} .${Gi} { position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;}${this._terminalSelector}.focus .${Gi} div { position: absolute; background-color: ${e.selectionBackgroundOpaque.css};}${this._terminalSelector} .${Gi} div { position: absolute; background-color: ${e.selectionInactiveBackgroundOpaque.css};}`;\n      for (let [a2, l4] of e.ansi.entries()) i5 += `${this._terminalSelector} .${zi}${a2} { color: ${l4.css}; }${this._terminalSelector} .${zi}${a2}.xterm-dim { color: ${k4.multiplyOpacity(l4, 0.5).css}; }${this._terminalSelector} .${cn}${a2} { background-color: ${l4.css}; }`;\n      i5 += `${this._terminalSelector} .${zi}${257} { color: ${k4.opaque(e.background).css}; }${this._terminalSelector} .${zi}${257}.xterm-dim { color: ${k4.multiplyOpacity(k4.opaque(e.background), 0.5).css}; }${this._terminalSelector} .${cn}${257} { background-color: ${e.foreground.css}; }`, this._themeStyleElement.textContent = i5;\n    }\n    _setDefaultSpacing() {\n      let e = this.dimensions.css.cell.width - this._widthCache.get("W", false, false);\n      this._rowContainer.style.letterSpacing = `${e}px`, this._rowFactory.defaultSpacing = e;\n    }\n    handleDevicePixelRatioChange() {\n      this._updateDimensions(), this._widthCache.clear(), this._setDefaultSpacing();\n    }\n    _refreshRowElements(e, i5) {\n      for (let r = this._rowElements.length; r <= i5; r++) {\n        let s4 = this._document.createElement("div");\n        this._rowContainer.appendChild(s4), this._rowElements.push(s4), this._rowHasBlinkingCells.push(false);\n      }\n      for (; this._rowElements.length > i5; ) this._rowContainer.removeChild(this._rowElements.pop()), this._rowHasBlinkingCells.pop() && this._rowHasBlinkingCellsCount--;\n    }\n    handleResize(e, i5) {\n      this._refreshRowElements(e, i5), this._updateDimensions(), this.handleSelectionChanged(this._selectionRenderModel.selectionStart, this._selectionRenderModel.selectionEnd, this._selectionRenderModel.columnSelectMode);\n    }\n    handleCharSizeChanged() {\n      this._updateDimensions(), this._widthCache.clear(), this._setDefaultSpacing();\n    }\n    handleBlur() {\n      this._rowContainer.classList.remove(Xt2), this._cursorBlinkStateManager.pause(), this.renderRows(0, this._bufferService.rows - 1);\n    }\n    handleFocus() {\n      this._rowContainer.classList.add(Xt2), this._cursorBlinkStateManager.resume(), this.renderRows(this._bufferService.buffer.y, this._bufferService.buffer.y);\n    }\n    handleViewportVisibilityChange(e) {\n      this._textBlinkStateManager.setViewportVisible(e);\n    }\n    handleSelectionChanged(e, i5, r) {\n      let s4 = this._bufferService.rows;\n      this._selectionContainer.replaceChildren(), this._rowFactory.handleSelectionChanged(e, i5, r);\n      let o2 = 0, a2 = -1;\n      this._lastSelectionStart && this._lastSelectionEnd && (this._selectionRenderModel.update(this._terminal, this._lastSelectionStart, this._lastSelectionEnd, this._lastSelectionColumnMode), this._selectionRenderModel.hasSelection && (o2 = this._selectionRenderModel.viewportCappedStartRow, a2 = this._selectionRenderModel.viewportCappedEndRow));\n      let l4 = 0, h3 = -1;\n      if (!e || !i5) return;\n      if (this._selectionRenderModel.update(this._terminal, e, i5, r), this._selectionRenderModel.hasSelection) {\n        let u3 = this._selectionRenderModel.viewportStartRow, _5 = this._selectionRenderModel.viewportEndRow, p3 = this._selectionRenderModel.viewportCappedStartRow, b4 = this._selectionRenderModel.viewportCappedEndRow;\n        l4 = p3, h3 = b4;\n        let f5 = this._document.createDocumentFragment();\n        if (r) {\n          let S4 = e[0] > i5[0];\n          f5.appendChild(this._createSelectionElement(p3, S4 ? i5[0] : e[0], S4 ? e[0] : i5[0], b4 - p3 + 1));\n        } else {\n          let S4 = u3 === p3 ? e[0] : 0, I4 = p3 === _5 ? i5[0] : this._bufferService.cols;\n          f5.appendChild(this._createSelectionElement(p3, S4, I4));\n          let w6 = b4 - p3 - 1;\n          if (f5.appendChild(this._createSelectionElement(p3 + 1, 0, this._bufferService.cols, w6)), p3 !== b4) {\n            let x5 = _5 === b4 ? i5[0] : this._bufferService.cols;\n            f5.appendChild(this._createSelectionElement(b4, 0, x5));\n          }\n        }\n        this._selectionContainer.appendChild(f5);\n      }\n      let d3 = Math.min(o2, l4), c2 = Math.max(a2, h3);\n      if (c2 >= 0) {\n        d3 = Math.max(d3, 0), c2 = Math.min(c2, s4 - 1);\n        let _5 = this._bufferService.buffer.y;\n        this._selectionRenderModel.hasSelection && _5 >= 0 && _5 < s4 && (d3 = Math.min(d3, _5), c2 = Math.max(c2, _5)), this.renderRows(d3, c2);\n      }\n      this._lastSelectionStart = e, this._lastSelectionEnd = i5, this._lastSelectionColumnMode = r;\n    }\n    _createSelectionElement(e, i5, r, s4 = 1) {\n      let o2 = this._document.createElement("div"), a2 = i5 * this.dimensions.css.cell.width, l4 = this.dimensions.css.cell.width * (r - i5);\n      return a2 + l4 > this.dimensions.css.canvas.width && (l4 = this.dimensions.css.canvas.width - a2), o2.style.height = `${s4 * this.dimensions.css.cell.height}px`, o2.style.top = `${e * this.dimensions.css.cell.height}px`, o2.style.left = `${a2}px`, o2.style.width = `${l4}px`, o2;\n    }\n    handleCursorMove() {\n      this._cursorBlinkStateManager.restartBlinkAnimation();\n    }\n    _handleOptionsChanged() {\n      this._updateDimensions(), this._injectCss(this._themeService.colors), this._widthCache.setFont(this._optionsService.rawOptions.fontFamily, this._optionsService.rawOptions.fontSize, this._optionsService.rawOptions.fontWeight, this._optionsService.rawOptions.fontWeightBold), this._setDefaultSpacing();\n    }\n    clear() {\n      for (let e of this._rowElements) e.replaceChildren();\n      this._rowHasBlinkingCellsCount > 0 && (this._rowHasBlinkingCells.fill(false), this._rowHasBlinkingCellsCount = 0, this._textBlinkStateManager.setNeedsBlinkInViewport(false));\n    }\n    renderRows(e, i5) {\n      let r = this._bufferService.buffer, s4 = r.ybase + r.y, o2 = Math.min(r.x, this._bufferService.cols - 1), a2 = this._coreService.decPrivateModes.cursorBlink ?? this._optionsService.rawOptions.cursorBlink, l4 = this._coreService.decPrivateModes.cursorStyle ?? this._optionsService.rawOptions.cursorStyle, h3 = this._optionsService.rawOptions.cursorInactiveStyle, d3 = { hasBlinkingCells: false };\n      for (let c2 = e; c2 <= i5; c2++) {\n        let u3 = c2 + r.ydisp, _5 = this._rowElements[c2], p3 = r.lines.get(u3);\n        if (!_5 || !p3) break;\n        _5.replaceChildren(...this._rowFactory.createRow(p3, u3, u3 === s4, l4, h3, o2, a2, this._textBlinkStateManager.isBlinkOn, this.dimensions.css.cell.width, this._widthCache, -1, -1, d3)), this._setRowBlinkState(c2, d3.hasBlinkingCells);\n      }\n      this._updateTextBlinkState();\n    }\n    get _terminalSelector() {\n      return `.${ls}${this._terminalClass}`;\n    }\n    _handleLinkHover(e) {\n      this._setCellUnderline(e.x1, e.x2, e.y1, e.y2, e.cols, true);\n    }\n    _handleLinkLeave(e) {\n      this._setCellUnderline(e.x1, e.x2, e.y1, e.y2, e.cols, false);\n    }\n    _setCellUnderline(e, i5, r, s4, o2, a2) {\n      r < 0 && (e = 0), s4 < 0 && (i5 = 0);\n      let l4 = this._bufferService.rows - 1;\n      r = Math.max(Math.min(r, l4), 0), s4 = Math.max(Math.min(s4, l4), 0), o2 = Math.min(o2, this._bufferService.cols);\n      let h3 = this._bufferService.buffer, d3 = h3.ybase + h3.y, c2 = Math.min(h3.x, o2 - 1), u3 = this._optionsService.rawOptions.cursorBlink, _5 = this._optionsService.rawOptions.cursorStyle, p3 = this._optionsService.rawOptions.cursorInactiveStyle, b4 = { hasBlinkingCells: false };\n      for (let f5 = r; f5 <= s4; ++f5) {\n        let S4 = f5 + h3.ydisp, I4 = this._rowElements[f5], w6 = h3.lines.get(S4);\n        if (!I4 || !w6) break;\n        I4.replaceChildren(...this._rowFactory.createRow(w6, S4, S4 === d3, _5, p3, c2, u3, this._textBlinkStateManager.isBlinkOn, this.dimensions.css.cell.width, this._widthCache, a2 ? f5 === r ? e : 0 : -1, a2 ? (f5 === s4 ? i5 : o2) - 1 : -1, b4)), this._setRowBlinkState(f5, b4.hasBlinkingCells);\n      }\n      this._updateTextBlinkState();\n    }\n    _setRowBlinkState(e, i5) {\n      this._rowHasBlinkingCells[e] !== i5 && (this._rowHasBlinkingCells[e] = i5, this._rowHasBlinkingCellsCount += i5 ? 1 : -1);\n    }\n    _updateTextBlinkState() {\n      this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount > 0);\n    }\n  };\n  vt2 = E4([m3(7, tt3), m3(8, Me2), m3(9, R3), m3(10, L5), m3(11, Y), m3(12, z3), m3(13, _e2)], vt2);\n  var cs = class {\n    constructor(t, e) {\n      this._rowContainer = t;\n      this._coreBrowserService = e;\n      this._isIdlePaused = false;\n      this._coreBrowserService.isFocused && this._resetIdleTimer();\n    }\n    dispose() {\n      this._clearIdleTimer();\n    }\n    restartBlinkAnimation() {\n      this._isIdlePaused && this._rowContainer.classList.remove($i), this._resetIdleTimer();\n    }\n    pause() {\n      this._isIdlePaused = false, this._clearIdleTimer();\n    }\n    resume() {\n      this._isIdlePaused = false, this._rowContainer.classList.remove($i), this._resetIdleTimer();\n    }\n    _resetIdleTimer() {\n      this._isIdlePaused = false, this._clearIdleTimer(), this._idleTimeout = this._coreBrowserService.window.setTimeout(() => {\n        this._stopBlinkingDueToIdle();\n      }, 3e5);\n    }\n    _clearIdleTimer() {\n      this._idleTimeout && (this._coreBrowserService.window.clearTimeout(this._idleTimeout), this._idleTimeout = void 0);\n    }\n    _stopBlinkingDueToIdle() {\n      this._rowContainer.classList.add($i), this._isIdlePaused = true, this._idleTimeout = void 0;\n    }\n  };\n  var St2 = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._optionsService = r;\n      this.width = 0;\n      this.height = 0;\n      this._onCharSizeChange = this._register(new v5());\n      this.onCharSizeChange = this._onCharSizeChange.event;\n      try {\n        this._measureStrategy = this._register(new ds(this._optionsService));\n      } catch {\n        this._measureStrategy = this._register(new hs(e, i5, this._optionsService));\n      }\n      this._register(this._optionsService.onMultipleOptionChange(["fontFamily", "fontSize"], () => this.measure()));\n    }\n    get hasValidSize() {\n      return this.width > 0 && this.height > 0;\n    }\n    measure() {\n      let e = this._measureStrategy.measure();\n      (e.width !== this.width || e.height !== this.height) && (this.width = e.width, this.height = e.height, this._onCharSizeChange.fire());\n    }\n  };\n  St2 = E4([m3(2, R3)], St2);\n  var Vi = class extends g5 {\n    constructor() {\n      super(...arguments);\n      this._result = { width: 0, height: 0 };\n    }\n    _validateAndSet(e, i5) {\n      e !== void 0 && e > 0 && i5 !== void 0 && i5 > 0 && (this._result.width = e, this._result.height = i5);\n    }\n  };\n  var hs = class extends Vi {\n    constructor(e, i5, r) {\n      super();\n      this._document = e;\n      this._parentElement = i5;\n      this._optionsService = r;\n      this._measureElement = this._document.createElement("span"), this._measureElement.classList.add("xterm-char-measure-element"), this._measureElement.textContent = "W".repeat(32), this._measureElement.setAttribute("aria-hidden", "true"), this._measureElement.style.whiteSpace = "pre", this._measureElement.style.fontKerning = "none", this._parentElement.appendChild(this._measureElement);\n    }\n    measure() {\n      return this._measureElement.style.fontFamily = this._optionsService.rawOptions.fontFamily, this._measureElement.style.fontSize = `${this._optionsService.rawOptions.fontSize}px`, this._validateAndSet(Number(this._measureElement.offsetWidth) / 32, Number(this._measureElement.offsetHeight)), this._result;\n    }\n  };\n  var ds = class extends Vi {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._canvas = new OffscreenCanvas(100, 100), this._ctx = this._canvas.getContext("2d");\n      let i5 = this._ctx.measureText("W");\n      if (!("width" in i5 && "fontBoundingBoxAscent" in i5 && "fontBoundingBoxDescent" in i5)) throw new Error("Required font metrics not supported");\n    }\n    measure() {\n      this._ctx.font = `${this._optionsService.rawOptions.fontSize}px ${this._optionsService.rawOptions.fontFamily}`;\n      let e = this._ctx.measureText("W");\n      return this._validateAndSet(e.width, e.fontBoundingBoxAscent + e.fontBoundingBoxDescent), this._result;\n    }\n  };\n  var qi = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._textarea = e;\n      this._window = i5;\n      this.mainDocument = r;\n      this._isFocused = false;\n      this._cachedIsFocused = void 0;\n      this._onDprChange = this._register(new v5());\n      this.onDprChange = this._onDprChange.event;\n      this._onWindowChange = this._register(new v5());\n      this.onWindowChange = this._onWindowChange.event;\n      this._screenDprMonitor = this._register(new us(this._window)), this._register(this.onWindowChange((s4) => this._screenDprMonitor.setWindow(s4))), this._register(X2.forward(this._screenDprMonitor.onDprChange, this._onDprChange)), this._register(C3(this._textarea, "focus", () => this._isFocused = true)), this._register(C3(this._textarea, "blur", () => this._isFocused = false));\n    }\n    get window() {\n      return this._window;\n    }\n    set window(e) {\n      this._window !== e && (this._window = e, this._onWindowChange.fire(this._window));\n    }\n    get dpr() {\n      return this.window.devicePixelRatio;\n    }\n    get isFocused() {\n      return this._cachedIsFocused === void 0 && (this._cachedIsFocused = this._isFocused && this._textarea.ownerDocument.hasFocus(), queueMicrotask(() => this._cachedIsFocused = void 0)), this._cachedIsFocused;\n    }\n  };\n  var us = class extends g5 {\n    constructor(e) {\n      super();\n      this._parentWindow = e;\n      this._windowResizeListener = this._register(new me3());\n      this._onDprChange = this._register(new v5());\n      this.onDprChange = this._onDprChange.event;\n      this._outerListener = () => this._setDprAndFireIfDiffers(), this._currentDevicePixelRatio = this._parentWindow.devicePixelRatio, this._updateDpr(), this._setWindowResizeListener(), this._register(y4(() => this.clearListener()));\n    }\n    setWindow(e) {\n      this._parentWindow = e, this._setWindowResizeListener(), this._setDprAndFireIfDiffers();\n    }\n    _setWindowResizeListener() {\n      this._windowResizeListener.value = C3(this._parentWindow, "resize", () => this._setDprAndFireIfDiffers());\n    }\n    _setDprAndFireIfDiffers() {\n      this._parentWindow.devicePixelRatio !== this._currentDevicePixelRatio && this._onDprChange.fire(this._parentWindow.devicePixelRatio), this._updateDpr();\n    }\n    _updateDpr() {\n      this._outerListener && (this._resolutionMediaMatchList?.removeListener(this._outerListener), this._currentDevicePixelRatio = this._parentWindow.devicePixelRatio, this._resolutionMediaMatchList = this._parentWindow.matchMedia(`screen and (resolution: ${this._parentWindow.devicePixelRatio}dppx)`), this._resolutionMediaMatchList.addListener(this._outerListener));\n    }\n    clearListener() {\n      !this._resolutionMediaMatchList || !this._outerListener || (this._resolutionMediaMatchList.removeListener(this._outerListener), this._resolutionMediaMatchList = void 0, this._outerListener = void 0);\n    }\n  };\n  var Yi = class extends g5 {\n    constructor() {\n      super();\n      this.linkProviders = [];\n      this._register(y4(() => this.linkProviders.length = 0));\n    }\n    registerLinkProvider(e) {\n      return this.linkProviders.push(e), { dispose: () => {\n        let i5 = this.linkProviders.indexOf(e);\n        i5 !== -1 && this.linkProviders.splice(i5, 1);\n      } };\n    }\n  };\n  function jt(n11, t, e) {\n    let i5 = e.getBoundingClientRect(), r = n11.getComputedStyle(e), s4 = parseInt(r.getPropertyValue("padding-left")), o2 = parseInt(r.getPropertyValue("padding-top"));\n    return [t.clientX - i5.left - s4, t.clientY - i5.top - o2];\n  }\n  function hn(n11, t, e, i5, r, s4, o2, a2, l4) {\n    if (!s4) return;\n    let h3 = jt(n11, t, e);\n    if (h3) return h3[0] = Math.ceil((h3[0] + (l4 ? o2 / 2 : 0)) / o2), h3[1] = Math.ceil(h3[1] / a2), h3[0] = Math.min(Math.max(h3[0], 1), i5 + (l4 ? 1 : 0)), h3[1] = Math.min(Math.max(h3[1], 1), r), h3;\n  }\n  var gt2 = class {\n    constructor(t, e) {\n      this._charSizeService = t;\n      this._renderService = e;\n    }\n    getCoords(t, e, i5, r, s4) {\n      return hn(window, t, e, i5, r, this._charSizeService.hasValidSize, this._renderService.dimensions.css.cell.width, this._renderService.dimensions.css.cell.height, s4);\n    }\n    getMouseReportCoords(t, e) {\n      let i5 = jt(oe3(e), t, e);\n      if (this._charSizeService.hasValidSize) return i5[0] = Math.min(Math.max(i5[0], 0), this._renderService.dimensions.css.canvas.width - 1), i5[1] = Math.min(Math.max(i5[1], 0), this._renderService.dimensions.css.canvas.height - 1), { col: Math.floor(i5[0] / this._renderService.dimensions.css.cell.width), row: Math.floor(i5[1] / this._renderService.dimensions.css.cell.height), x: Math.floor(i5[0]), y: Math.floor(i5[1]) };\n    }\n  };\n  gt2 = E4([m3(0, Me2), m3(1, G4)], gt2);\n  var dn = typeof window == "object" ? window : globalThis;\n  function he2(n11, t = 0) {\n    return n11[n11.length - (1 + t)];\n  }\n  function mo(n11, t, e) {\n    let i5 = null, r = null;\n    if (typeof e.value == "function" ? (i5 = "value", r = e.value, r.length !== 0 && console.warn("Memoize should only be used in functions with zero parameters")) : typeof e.get == "function" && (i5 = "get", r = e.get), !r || !i5) throw new Error("not supported");\n    let s4 = `$memoize$${t}`, o2 = e;\n    o2[i5] = function(...a2) {\n      return this.hasOwnProperty(s4) || Object.defineProperty(this, s4, { configurable: false, enumerable: false, writable: false, value: r.apply(this, a2) }), this[s4];\n    };\n  }\n  var It = class It2 {\n    constructor(t) {\n      this.element = t, this.next = It2.Undefined, this.prev = It2.Undefined;\n    }\n  };\n  It.Undefined = new It(void 0);\n  var te2 = It;\n  var Xi = class {\n    constructor() {\n      this._first = te2.Undefined;\n      this._last = te2.Undefined;\n    }\n    push(t) {\n      return this._insert(t, true);\n    }\n    _insert(t, e) {\n      let i5 = new te2(t);\n      if (this._first === te2.Undefined) this._first = i5, this._last = i5;\n      else if (e) {\n        let s4 = this._last;\n        this._last = i5, i5.prev = s4, s4.next = i5;\n      } else {\n        let s4 = this._first;\n        this._first = i5, i5.next = s4, s4.prev = i5;\n      }\n      let r = false;\n      return () => {\n        r || (r = true, this._remove(i5));\n      };\n    }\n    _remove(t) {\n      if (t.prev !== te2.Undefined && t.next !== te2.Undefined) {\n        let e = t.prev;\n        e.next = t.next, t.next.prev = e;\n      } else t.prev === te2.Undefined && t.next === te2.Undefined ? (this._first = te2.Undefined, this._last = te2.Undefined) : t.next === te2.Undefined ? (this._last = this._last.prev, this._last.next = te2.Undefined) : t.prev === te2.Undefined && (this._first = this._first.next, this._first.prev = te2.Undefined);\n    }\n    *[Symbol.iterator]() {\n      let t = this._first;\n      for (; t !== te2.Undefined; ) yield t.element, t = t.next;\n    }\n  };\n  var de2;\n  ((s4) => (s4.TAP = "-xterm-gesturetap", s4.CHANGE = "-xterm-gesturechange", s4.START = "-xterm-gesturestart", s4.END = "-xterm-gesturesend", s4.CONTEXT_MENU = "-xterm-gesturecontextmenu"))(de2 ||= {});\n  var W4 = class W5 extends g5 {\n    constructor() {\n      super();\n      this._dispatched = false;\n      this._targets = new Xi();\n      this._ignoreTargets = new Xi();\n      this._activeTouches = {}, this._handle = null, this._lastSetTapCountTime = 0;\n      let e = dn;\n      this._register(C3(e.document, "touchstart", (i5) => this._handleTouchStart(i5), { passive: false })), this._register(C3(e.document, "touchend", (i5) => this._handleTouchEnd(e, i5))), this._register(C3(e.document, "touchmove", (i5) => this._handleTouchMove(i5), { passive: false }));\n    }\n    static addTarget(e) {\n      if (!W5.isTouchDevice()) return g5.None;\n      W5._instance || (W5._instance = new W5());\n      let i5 = W5._instance._targets.push(e);\n      return y4(i5);\n    }\n    static ignoreTarget(e) {\n      if (!W5.isTouchDevice()) return g5.None;\n      W5._instance || (W5._instance = new W5());\n      let i5 = W5._instance._ignoreTargets.push(e);\n      return y4(i5);\n    }\n    static isTouchDevice() {\n      return "ontouchstart" in dn || navigator.maxTouchPoints > 0;\n    }\n    dispose() {\n      this._handle && (this._handle.dispose(), this._handle = null), super.dispose();\n    }\n    _handleTouchStart(e) {\n      let i5 = Date.now();\n      this._handle && (this._handle.dispose(), this._handle = null);\n      for (let r = 0, s4 = e.targetTouches.length; r < s4; r++) {\n        let o2 = e.targetTouches.item(r);\n        this._activeTouches[o2.identifier] = { id: o2.identifier, initialTarget: o2.target, initialTimeStamp: i5, initialPageX: o2.pageX, initialPageY: o2.pageY, rollingTimestamps: [i5], rollingPageX: [o2.pageX], rollingPageY: [o2.pageY] };\n        let a2 = this._newGestureEvent(de2.START, o2.target);\n        a2.pageX = o2.pageX, a2.pageY = o2.pageY, this._dispatchEvent(a2);\n      }\n      this._dispatched && (e.preventDefault(), e.stopPropagation(), this._dispatched = false);\n    }\n    _handleTouchEnd(e, i5) {\n      let r = Date.now(), s4 = Object.keys(this._activeTouches).length;\n      for (let o2 = 0, a2 = i5.changedTouches.length; o2 < a2; o2++) {\n        let l4 = i5.changedTouches.item(o2);\n        if (!this._activeTouches.hasOwnProperty(String(l4.identifier))) {\n          console.warn("move of an UNKNOWN touch", l4);\n          continue;\n        }\n        let h3 = this._activeTouches[l4.identifier], d3 = Date.now() - h3.initialTimeStamp;\n        if (d3 < W5._holdDelay && Math.abs(h3.initialPageX - he2(h3.rollingPageX)) < 30 && Math.abs(h3.initialPageY - he2(h3.rollingPageY)) < 30) {\n          let c2 = this._newGestureEvent(de2.TAP, h3.initialTarget);\n          c2.pageX = he2(h3.rollingPageX), c2.pageY = he2(h3.rollingPageY), this._dispatchEvent(c2);\n        } else if (d3 >= W5._holdDelay && Math.abs(h3.initialPageX - he2(h3.rollingPageX)) < 30 && Math.abs(h3.initialPageY - he2(h3.rollingPageY)) < 30) {\n          let c2 = this._newGestureEvent(de2.CONTEXT_MENU, h3.initialTarget);\n          c2.pageX = he2(h3.rollingPageX), c2.pageY = he2(h3.rollingPageY), this._dispatchEvent(c2);\n        } else if (s4 === 1) {\n          let c2 = he2(h3.rollingPageX), u3 = he2(h3.rollingPageY), _5 = he2(h3.rollingTimestamps) - h3.rollingTimestamps[0], p3 = c2 - h3.rollingPageX[0], b4 = u3 - h3.rollingPageY[0], f5 = [...this._targets].filter((S4) => h3.initialTarget instanceof Node && S4.contains(h3.initialTarget));\n          this._inertia(e, f5, r, Math.abs(p3) / _5, p3 > 0 ? 1 : -1, c2, Math.abs(b4) / _5, b4 > 0 ? 1 : -1, u3);\n        }\n        this._dispatchEvent(this._newGestureEvent(de2.END, h3.initialTarget)), delete this._activeTouches[l4.identifier];\n      }\n      this._dispatched && (i5.preventDefault(), i5.stopPropagation(), this._dispatched = false);\n    }\n    _newGestureEvent(e, i5) {\n      let r = document.createEvent("CustomEvent");\n      return r.initEvent(e, false, true), r.initialTarget = i5, r.tapCount = 0, r;\n    }\n    _dispatchEvent(e) {\n      if (e.type === de2.TAP) {\n        let i5 = (/* @__PURE__ */ new Date()).getTime(), r = 0;\n        i5 - this._lastSetTapCountTime > W5._clearTapCountTime ? r = 1 : r = 2, this._lastSetTapCountTime = i5, e.tapCount = r;\n      } else (e.type === de2.CHANGE || e.type === de2.CONTEXT_MENU) && (this._lastSetTapCountTime = 0);\n      if (e.initialTarget instanceof Node) {\n        for (let r of this._ignoreTargets) if (r.contains(e.initialTarget)) return;\n        let i5 = [];\n        for (let r of this._targets) if (r.contains(e.initialTarget)) {\n          let s4 = 0, o2 = e.initialTarget;\n          for (; o2 && o2 !== r; ) s4++, o2 = o2.parentElement;\n          i5.push([s4, r]);\n        }\n        i5.sort((r, s4) => r[0] - s4[0]);\n        for (let [, r] of i5) r.dispatchEvent(e), this._dispatched = true;\n      }\n    }\n    _inertia(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      this._handle = rt3(e, () => {\n        let c2 = Date.now(), u3 = c2 - r, _5 = 0, p3 = 0, b4 = true;\n        s4 += W5._scrollFriction * u3, l4 += W5._scrollFriction * u3, s4 > 0 && (b4 = false, _5 = o2 * s4 * u3), l4 > 0 && (b4 = false, p3 = h3 * l4 * u3);\n        let f5 = this._newGestureEvent(de2.CHANGE);\n        f5.translationX = _5, f5.translationY = p3, i5.forEach((S4) => S4.dispatchEvent(f5)), b4 || this._inertia(e, i5, c2, s4, o2, a2 + _5, l4, h3, d3 + p3);\n      });\n    }\n    _handleTouchMove(e) {\n      let i5 = Date.now();\n      for (let r = 0, s4 = e.changedTouches.length; r < s4; r++) {\n        let o2 = e.changedTouches.item(r);\n        if (!this._activeTouches.hasOwnProperty(String(o2.identifier))) {\n          console.warn("end of an UNKNOWN touch", o2);\n          continue;\n        }\n        let a2 = this._activeTouches[o2.identifier], l4 = this._newGestureEvent(de2.CHANGE, a2.initialTarget);\n        l4.translationX = o2.pageX - he2(a2.rollingPageX), l4.translationY = o2.pageY - he2(a2.rollingPageY), l4.pageX = o2.pageX, l4.pageY = o2.pageY, l4.clientX = o2.clientX, l4.clientY = o2.clientY, this._dispatchEvent(l4), a2.rollingPageX.length > 3 && (a2.rollingPageX.shift(), a2.rollingPageY.shift(), a2.rollingTimestamps.shift()), a2.rollingPageX.push(o2.pageX), a2.rollingPageY.push(o2.pageY), a2.rollingTimestamps.push(i5);\n      }\n      this._dispatched && (e.preventDefault(), e.stopPropagation(), this._dispatched = false);\n    }\n  };\n  W4._scrollFriction = -5e-3, W4._holdDelay = 700, W4._clearTapCountTime = 400, E4([mo], W4, "isTouchDevice", 1);\n  var ji = W4;\n  var Ct2 = class {\n    constructor(t, e, i5, r, s4, o2, a2, l4, h3) {\n      this._renderService = t;\n      this._mouseCoordsService = e;\n      this._mouseStateService = i5;\n      this._coreService = r;\n      this._bufferService = s4;\n      this._optionsService = o2;\n      this._selectionService = a2;\n      this._logService = l4;\n      this._coreBrowserService = h3;\n      this._lastEvent = null;\n      this._wheelPartialScroll = 0;\n      this._touchScrollAccumulator = 0;\n    }\n    bindMouse(t, e, i5) {\n      let { element: r, document: s4 } = t, o2 = { mouseup: null, wheel: null, mousedrag: null, mousemove: null }, a2 = { target: t, focus: i5, requestedEvents: o2 }, l4 = { mouseup: (h3) => this._handleMouseUp(a2, h3), wheel: (h3) => this._handleWheel(a2, h3), mousedrag: (h3) => this._handleMouseDrag(a2, h3), mousemove: (h3) => this._handleMouseMove(a2, h3) };\n      e(this._mouseStateService.onProtocolChange((h3) => {\n        this._handleProtocolChange(a2, l4, h3);\n      })), this._mouseStateService.activeProtocol = this._mouseStateService.activeProtocol, e(y4(() => {\n        o2.mouseup && s4.removeEventListener("mouseup", o2.mouseup), o2.mousedrag && s4.removeEventListener("mousemove", o2.mousedrag);\n      })), e(C3(r, "mousedown", (h3) => this._handleMouseDown(a2, h3))), e(C3(r, "wheel", (h3) => this._handlePassiveWheel(a2, h3), { passive: false })), e(ji.addTarget(t.screenElement)), e(C3(t.screenElement, de2.START, () => this._handleTouchStart())), e(C3(t.screenElement, de2.CHANGE, (h3) => this._handleTouchChange(a2, h3)));\n    }\n    _sendEvent(t, e) {\n      let i5 = this._mouseCoordsService.getMouseReportCoords(e, t.target.screenElement);\n      if (!i5) return false;\n      let r, s4;\n      switch (e.overrideType || e.type) {\n        case "mousemove":\n          s4 = 32, e.buttons === void 0 ? (r = 3, e.button !== void 0 && (r = e.button < 3 ? e.button : 3)) : r = e.buttons & 1 ? 0 : e.buttons & 4 ? 1 : e.buttons & 2 ? 2 : 3;\n          break;\n        case "mouseup":\n          s4 = 0, r = e.button < 3 ? e.button : 3;\n          break;\n        case "mousedown":\n          s4 = 1, r = e.button < 3 ? e.button : 3;\n          break;\n        case "wheel":\n          if (!this._mouseStateService.allowCustomWheelEvent(e)) return false;\n          let o2 = e.deltaY;\n          if (o2 === 0 || this._consumeWheelEvent(e, this._renderService?.dimensions?.device?.cell?.height, this._coreBrowserService?.dpr) === 0) return false;\n          s4 = o2 < 0 ? 0 : 1, r = 4;\n          break;\n        default:\n          return false;\n      }\n      return s4 === void 0 || r === void 0 || r > 4 ? false : this._triggerMouseEvent({ col: i5.col, row: i5.row, x: i5.x, y: i5.y, button: r, action: s4, ctrl: e.ctrlKey, alt: e.altKey, shift: e.shiftKey });\n    }\n    _handleMouseUp(t, e) {\n      this._sendEvent(t, e), e.buttons || (t.requestedEvents.mouseup && t.target.document.removeEventListener("mouseup", t.requestedEvents.mouseup), t.requestedEvents.mousedrag && t.target.document.removeEventListener("mousemove", t.requestedEvents.mousedrag));\n    }\n    _handleWheel(t, e) {\n      return this._sendEvent(t, e), e.preventDefault(), e.stopPropagation(), false;\n    }\n    _handleMouseDrag(t, e) {\n      e.buttons && this._sendEvent(t, e);\n    }\n    _handleMouseMove(t, e) {\n      e.buttons || this._sendEvent(t, e);\n    }\n    _handleMouseDown(t, e) {\n      e.preventDefault(), t.focus(), !(!this._mouseStateService.areMouseEventsActive || this._selectionService.shouldForceSelection(e)) && (this._sendEvent(t, e), t.requestedEvents.mouseup && t.target.document.addEventListener("mouseup", t.requestedEvents.mouseup), t.requestedEvents.mousedrag && t.target.document.addEventListener("mousemove", t.requestedEvents.mousedrag));\n    }\n    _handlePassiveWheel(t, e) {\n      if (!t.requestedEvents.wheel) {\n        if (!this._mouseStateService.allowCustomWheelEvent(e)) return false;\n        if (!this._bufferService.buffer.hasScrollback) {\n          if (e.deltaY === 0) return false;\n          if (this._consumeWheelEvent(e, this._renderService?.dimensions?.device?.cell?.height, this._coreBrowserService?.dpr) === 0) return e.preventDefault(), e.stopPropagation(), false;\n          let s4 = "\\x1B" + (this._coreService.decPrivateModes.applicationCursorKeys ? "O" : "[") + (e.deltaY < 0 ? "A" : "B");\n          return this._coreService.triggerDataEvent(s4, true), e.preventDefault(), e.stopPropagation(), false;\n        }\n      }\n    }\n    _handleTouchStart() {\n      this._touchScrollAccumulator = 0;\n    }\n    _handleTouchChange(t, e) {\n      if (e.preventDefault(), e.stopPropagation(), t.requestedEvents.wheel) {\n        this._handleTouchScrollAsWheel(t, e);\n        return;\n      }\n      if (!this._bufferService.buffer.hasScrollback) {\n        this._handleTouchScrollAsKeys(e);\n        return;\n      }\n      t.target.handleTouchScroll?.(e.translationY);\n    }\n    _handleTouchScrollAsKeys(t) {\n      let e = this._renderService?.dimensions.css.cell.height;\n      if (!e) return;\n      this._touchScrollAccumulator -= t.translationY;\n      let i5 = Math.trunc(this._touchScrollAccumulator / e);\n      if (i5 === 0) return;\n      this._touchScrollAccumulator -= i5 * e;\n      let r = "\\x1B" + (this._coreService.decPrivateModes.applicationCursorKeys ? "O" : "[") + (i5 < 0 ? "A" : "B");\n      for (let s4 = 0; s4 < Math.abs(i5); s4++) this._coreService.triggerDataEvent(r, true);\n    }\n    _handleTouchScrollAsWheel(t, e) {\n      let i5 = this._renderService?.dimensions.css.cell.height;\n      if (!i5) return;\n      this._touchScrollAccumulator -= e.translationY;\n      let r = Math.trunc(this._touchScrollAccumulator / i5);\n      if (r === 0) return;\n      this._touchScrollAccumulator -= r * i5;\n      let s4 = this._mouseCoordsService.getMouseReportCoords(e, t.target.screenElement);\n      if (s4) for (let o2 = 0; o2 < Math.abs(r); o2++) this._triggerMouseEvent({ col: s4.col, row: s4.row, x: s4.x, y: s4.y, button: 4, action: r < 0 ? 0 : 1, ctrl: false, alt: false, shift: false });\n    }\n    reset() {\n      this._lastEvent = null, this._wheelPartialScroll = 0, this._touchScrollAccumulator = 0;\n    }\n    _handleProtocolChange(t, e, i5) {\n      let { element: r, document: s4 } = t.target, { requestedEvents: o2 } = t;\n      i5 ? (this._optionsService.rawOptions.logLevel === "debug" && this._logService.debug("Binding to mouse events:", this._explainEvents(i5)), r.classList.add("enable-mouse-events"), this._selectionService.disable()) : (this._logService.debug("Unbinding from mouse events."), r.classList.remove("enable-mouse-events"), this._selectionService.enable()), i5 & 8 ? o2.mousemove || (r.addEventListener("mousemove", e.mousemove), o2.mousemove = e.mousemove) : (o2.mousemove && r.removeEventListener("mousemove", o2.mousemove), o2.mousemove = null), i5 & 16 ? o2.wheel || (r.addEventListener("wheel", e.wheel, { passive: false }), o2.wheel = e.wheel) : (o2.wheel && r.removeEventListener("wheel", o2.wheel), o2.wheel = null), i5 & 2 ? o2.mouseup ??= e.mouseup : (o2.mouseup && s4.removeEventListener("mouseup", o2.mouseup), o2.mouseup = null), i5 & 4 ? o2.mousedrag ??= e.mousedrag : (o2.mousedrag && s4.removeEventListener("mousemove", o2.mousedrag), o2.mousedrag = null);\n    }\n    _applyScrollModifier(t, e) {\n      return e.altKey || e.ctrlKey || e.shiftKey ? t * this._optionsService.rawOptions.fastScrollSensitivity * this._optionsService.rawOptions.scrollSensitivity : t * this._optionsService.rawOptions.scrollSensitivity;\n    }\n    _consumeWheelEvent(t, e, i5) {\n      if (t.deltaY === 0 || t.shiftKey || e === void 0 || i5 === void 0) return 0;\n      let r = e / i5, s4 = this._applyScrollModifier(t.deltaY, t);\n      return t.deltaMode === WheelEvent.DOM_DELTA_PIXEL ? (s4 /= r + 0, Math.abs(t.deltaY) < 50 && (s4 *= 0.3), this._wheelPartialScroll += s4, s4 = Math.floor(Math.abs(this._wheelPartialScroll)) * (this._wheelPartialScroll > 0 ? 1 : -1), this._wheelPartialScroll %= 1) : t.deltaMode === WheelEvent.DOM_DELTA_PAGE && (s4 *= this._bufferService.rows), s4;\n    }\n    _triggerMouseEvent(t) {\n      if (t.col < 0 || t.col >= this._bufferService.cols || t.row < 0 || t.row >= this._bufferService.rows || t.button === 4 && t.action === 32 || t.button === 3 && t.action !== 32 || t.button !== 4 && (t.action === 2 || t.action === 3) || (t.col++, t.row++, t.action === 32 && this._lastEvent && this._equalEvents(this._lastEvent, t, this._mouseStateService.isPixelEncoding)) || !this._mouseStateService.restrictMouseEvent(t)) return false;\n      let e = this._mouseStateService.encodeMouseEvent(t);\n      return e && (this._mouseStateService.isDefaultEncoding ? this._coreService.triggerBinaryEvent(e) : this._coreService.triggerDataEvent(e, true)), this._lastEvent = t, true;\n    }\n    _explainEvents(t) {\n      return { down: !!(t & 1), up: !!(t & 2), drag: !!(t & 4), move: !!(t & 8), wheel: !!(t & 16) };\n    }\n    _equalEvents(t, e, i5) {\n      if (i5) {\n        if (t.x !== e.x || t.y !== e.y) return false;\n      } else if (t.col !== e.col || t.row !== e.row) return false;\n      return !(t.button !== e.button || t.action !== e.action || t.ctrl !== e.ctrl || t.alt !== e.alt || t.shift !== e.shift);\n    }\n  };\n  Ct2 = E4([m3(0, G4), m3(1, Be2), m3(2, et2), m3(3, Y), m3(4, L5), m3(5, R3), m3(6, Ci), m3(7, pe), m3(8, z3)], Ct2);\n  var Zi = class {\n    constructor(t, e) {\n      this._renderCallback = t;\n      this._coreBrowserService = e;\n      this._refreshCallbacks = [];\n    }\n    dispose() {\n      this._animationFrame && (this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame), this._animationFrame = void 0);\n    }\n    addRefreshCallback(t) {\n      return this._refreshCallbacks.push(t), this._animationFrame || (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh())), this._animationFrame;\n    }\n    refresh(t, e, i5) {\n      this._rowCount = i5, t = t ?? 0, e = e ?? this._rowCount - 1, this._rowStart = this._rowStart !== void 0 ? Math.min(this._rowStart, t) : t, this._rowEnd = this._rowEnd !== void 0 ? Math.max(this._rowEnd, e) : e, !this._animationFrame && (this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh()));\n    }\n    _innerRefresh() {\n      if (this._animationFrame = void 0, this._rowStart === void 0 || this._rowEnd === void 0 || this._rowCount === void 0) {\n        this._runRefreshCallbacks();\n        return;\n      }\n      let t = Math.max(this._rowStart, 0), e = Math.min(this._rowEnd, this._rowCount - 1);\n      this._rowStart = void 0, this._rowEnd = void 0, this._renderCallback(t, e), this._runRefreshCallbacks();\n    }\n    _runRefreshCallbacks() {\n      for (let t of this._refreshCallbacks) t(0);\n      this._refreshCallbacks = [];\n    }\n  };\n  var Ji = class {\n    constructor(t) {\n      this._tasks = [];\n      this._i = 0;\n      this._logService = t;\n    }\n    enqueue(t) {\n      this._tasks.push(t), this._start();\n    }\n    flush() {\n      for (; this._i < this._tasks.length; ) this._tasks[this._i]() || this._i++;\n      this.clear();\n    }\n    clear() {\n      this._idleCallback && (this._cancelCallback(this._idleCallback), this._idleCallback = void 0), this._i = 0, this._tasks.length = 0;\n    }\n    _start() {\n      this._idleCallback || (this._idleCallback = this._requestCallback(this._process.bind(this)));\n    }\n    _process(t) {\n      this._idleCallback = void 0;\n      let e = 0, i5 = 0, r = t.timeRemaining(), s4 = 0;\n      for (; this._i < this._tasks.length; ) {\n        if (e = performance.now(), this._tasks[this._i]() || this._i++, e = Math.max(1, performance.now() - e), i5 = Math.max(e, i5), s4 = t.timeRemaining(), i5 * 1.5 > s4) {\n          r - e < -20 && this._logService.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(r - e))}ms`), this._start();\n          return;\n        }\n        r = s4;\n      }\n      this.clear();\n    }\n  };\n  var fs = class extends Ji {\n    _requestCallback(t) {\n      return setTimeout(() => t(this._createDeadline(16)));\n    }\n    _cancelCallback(t) {\n      clearTimeout(t);\n    }\n    _createDeadline(t) {\n      let e = performance.now() + t;\n      return { timeRemaining: () => Math.max(0, e - performance.now()) };\n    }\n  };\n  var ps = class extends Ji {\n    _requestCallback(t) {\n      return requestIdleCallback(t);\n    }\n    _cancelCallback(t) {\n      cancelIdleCallback(t);\n    }\n  };\n  var Et2 = "requestIdleCallback" in globalThis ? ps : fs;\n  var Qi = class {\n    constructor(t) {\n      this._queue = new Et2(t);\n    }\n    set(t) {\n      this._queue.clear(), this._queue.enqueue(t);\n    }\n    flush() {\n      this._queue.flush();\n    }\n    dispose() {\n      this._queue.clear();\n    }\n  };\n  var yt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3, c2) {\n      super();\n      this._rowCount = e;\n      this._optionsService = r;\n      this._logService = s4;\n      this._charSizeService = o2;\n      this._coreService = a2;\n      this._coreBrowserService = d3;\n      this._renderer = this._register(new me3());\n      this._observerDisposable = this._register(new me3());\n      this._isPaused = false;\n      this._needsFullRefresh = false;\n      this._isNextRenderRedrawOnly = true;\n      this._needsSelectionRefresh = false;\n      this._canvasWidth = 0;\n      this._canvasHeight = 0;\n      this._selectionState = { start: void 0, end: void 0, columnSelectMode: false };\n      this._onDimensionsChange = this._register(new v5());\n      this.onDimensionsChange = this._onDimensionsChange.event;\n      this._onRenderedViewportChange = this._register(new v5());\n      this.onRenderedViewportChange = this._onRenderedViewportChange.event;\n      this._onRender = this._register(new v5());\n      this.onRender = this._onRender.event;\n      this._onRefreshRequest = this._register(new v5());\n      this.onRefreshRequest = this._onRefreshRequest.event;\n      this._pausedResizeTask = this._register(new Qi(this._logService)), this._renderDebouncer = new Zi((u3, _5) => this._renderRows(u3, _5), this._coreBrowserService), this._register(this._renderDebouncer), this._syncOutputHandler = new _s(this._coreBrowserService, this._coreService, () => this._fullRefresh()), this._register(y4(() => this._syncOutputHandler.dispose())), this._register(this._coreBrowserService.onDprChange(() => this.handleDevicePixelRatioChange())), this._register(h3.onResize(() => this._fullRefresh())), this._register(h3.buffers.onBufferActivate(() => this._renderer.value?.clear())), this._register(this._optionsService.onOptionChange(() => this._handleOptionsChanged())), this._register(this._charSizeService.onCharSizeChange(() => this.handleCharSizeChanged())), this._register(l4.onDecorationRegistered(() => this._fullRefresh())), this._register(l4.onDecorationRemoved(() => this._fullRefresh())), this._register(this._optionsService.onMultipleOptionChange(["drawBoldTextInBrightColors", "letterSpacing", "lineHeight", "fontFamily", "fontSize", "fontWeight", "fontWeightBold", "minimumContrastRatio", "rescaleOverlappingGlyphs"], () => {\n        this.clear(), this.handleResize(h3.cols, h3.rows), this._fullRefresh();\n      })), this._register(this._optionsService.onMultipleOptionChange(["cursorBlink", "cursorStyle"], () => this.refreshRows(h3.buffer.y, h3.buffer.y, void 0, true))), this._register(c2.onChangeColors(() => this._fullRefresh())), this._registerIntersectionObserver(this._coreBrowserService.window, i5), this._register(this._coreBrowserService.onWindowChange((u3) => this._registerIntersectionObserver(u3, i5)));\n    }\n    get dimensions() {\n      return this._renderer.value.dimensions;\n    }\n    _registerIntersectionObserver(e, i5) {\n      if ("IntersectionObserver" in e) {\n        let r = new e.IntersectionObserver((s4) => this._handleIntersectionChange(s4[s4.length - 1]), { threshold: 0 });\n        r.observe(i5), this._observerDisposable.value = y4(() => r.disconnect());\n      }\n    }\n    _handleIntersectionChange(e) {\n      this._isPaused = e.isIntersecting === void 0 ? e.intersectionRatio === 0 : !e.isIntersecting, this._renderer.value?.handleViewportVisibilityChange?.(!this._isPaused), !this._isPaused && !this._charSizeService.hasValidSize && this._charSizeService.measure(), !this._isPaused && this._needsFullRefresh && (this._pausedResizeTask.flush(), this.refreshRows(0, this._rowCount - 1), this._needsFullRefresh = false);\n    }\n    refreshRows(e, i5, r = false, s4 = false) {\n      if (this._isPaused) {\n        this._needsFullRefresh = true;\n        return;\n      }\n      if (this._coreService.decPrivateModes.synchronizedOutput) {\n        this._syncOutputHandler.bufferRows(e, i5);\n        return;\n      }\n      let o2 = this._syncOutputHandler.flush();\n      o2 && (e = Math.min(e, o2.start), i5 = Math.max(i5, o2.end)), s4 || (this._isNextRenderRedrawOnly = false), r ? this._renderRows(e, i5) : this._renderDebouncer.refresh(e, i5, this._rowCount);\n    }\n    _renderRows(e, i5) {\n      if (this._renderer.value) {\n        if (this._coreService.decPrivateModes.synchronizedOutput) {\n          this._syncOutputHandler.bufferRows(e, i5);\n          return;\n        }\n        e = Math.min(e, this._rowCount - 1), i5 = Math.min(i5, this._rowCount - 1), this._renderer.value.renderRows(e, i5), this._needsSelectionRefresh && (this._renderer.value.handleSelectionChanged(this._selectionState.start, this._selectionState.end, this._selectionState.columnSelectMode), this._needsSelectionRefresh = false), this._isNextRenderRedrawOnly || this._onRenderedViewportChange.fire({ start: e, end: i5 }), this._onRender.fire({ start: e, end: i5 }), this._isNextRenderRedrawOnly = true;\n      }\n    }\n    resize(e, i5) {\n      this._rowCount = i5, this._fireOnCanvasResize();\n    }\n    _handleOptionsChanged() {\n      this._renderer.value && (this.refreshRows(0, this._rowCount - 1), this._fireOnCanvasResize());\n    }\n    _fireOnCanvasResize() {\n      this._renderer.value && (this._renderer.value.dimensions.css.canvas.width === this._canvasWidth && this._renderer.value.dimensions.css.canvas.height === this._canvasHeight || this._onDimensionsChange.fire(this._renderer.value.dimensions));\n    }\n    hasRenderer() {\n      return !!this._renderer.value;\n    }\n    setRenderer(e) {\n      this._renderer.value = e, this._renderer.value && (this._renderer.value.onRequestRedraw((i5) => this.refreshRows(i5.start, i5.end, i5.sync, true)), this._needsSelectionRefresh = true, this._fullRefresh());\n    }\n    addRefreshCallback(e) {\n      return this._renderDebouncer.addRefreshCallback(e);\n    }\n    _fullRefresh() {\n      this._isPaused ? this._needsFullRefresh = true : this.refreshRows(0, this._rowCount - 1);\n    }\n    clearTextureAtlas() {\n      this._renderer.value && (this._renderer.value.clearTextureAtlas?.(), this._fullRefresh());\n    }\n    handleDevicePixelRatioChange() {\n      this._charSizeService.measure(), this._renderer.value && (this._renderer.value.handleDevicePixelRatioChange(), this.refreshRows(0, this._rowCount - 1));\n    }\n    handleResize(e, i5) {\n      this._renderer.value && (this._isPaused ? this._pausedResizeTask.set(() => this._renderer.value?.handleResize(e, i5)) : this._renderer.value.handleResize(e, i5), this._fullRefresh());\n    }\n    handleCharSizeChanged() {\n      this._renderer.value?.handleCharSizeChanged();\n    }\n    handleBlur() {\n      this._renderer.value?.handleBlur();\n    }\n    handleFocus() {\n      this._renderer.value?.handleFocus();\n    }\n    handleSelectionChanged(e, i5, r) {\n      this._selectionState.start = e, this._selectionState.end = i5, this._selectionState.columnSelectMode = r, this._renderer.value?.handleSelectionChanged(e, i5, r);\n    }\n    handleCursorMove() {\n      this._renderer.value?.handleCursorMove();\n    }\n    clear() {\n      this._renderer.value?.clear();\n    }\n  };\n  yt3 = E4([m3(2, R3), m3(3, pe), m3(4, Me2), m3(5, Y), m3(6, Ie2), m3(7, L5), m3(8, z3), m3(9, _e2)], yt3);\n  var _s = class {\n    constructor(t, e, i5) {\n      this._coreBrowserService = t;\n      this._coreService = e;\n      this._onTimeout = i5;\n      this._start = 0;\n      this._end = 0;\n      this._isBuffering = false;\n    }\n    bufferRows(t, e) {\n      this._isBuffering ? (this._start = Math.min(this._start, t), this._end = Math.max(this._end, e)) : (this._start = t, this._end = e, this._isBuffering = true), this._timeout ??= this._coreBrowserService.window.setTimeout(() => {\n        this._timeout = void 0, this._coreService.decPrivateModes.synchronizedOutput = false, this._onTimeout();\n      }, 1e3);\n    }\n    flush() {\n      if (this._timeout !== void 0 && (this._coreBrowserService.window.clearTimeout(this._timeout), this._timeout = void 0), !this._isBuffering) return;\n      let t = { start: this._start, end: this._end };\n      return this._isBuffering = false, t;\n    }\n    dispose() {\n      this._timeout !== void 0 && (this._coreBrowserService.window.clearTimeout(this._timeout), this._timeout = void 0);\n    }\n  };\n  function un(n11, t, e, i5) {\n    let r = e.buffer.x, s4 = e.buffer.y;\n    if (!e.buffer.hasScrollback) return Io(r, s4, n11, t, e, i5) + er(s4, t, e, i5) + Co(r, s4, n11, t, e, i5);\n    let o2;\n    if (s4 === t) return o2 = r > n11 ? "D" : "C", Jt(Math.abs(r - n11), Zt2(o2, i5));\n    o2 = s4 > t ? "D" : "C";\n    let a2 = Math.abs(s4 - t), l4 = go(s4 > t ? n11 : r, e) + (a2 - 1) * e.cols + 1 + So(s4 > t ? r : n11, e);\n    return Jt(l4, Zt2(o2, i5));\n  }\n  function So(n11, t) {\n    return n11 - 1;\n  }\n  function go(n11, t) {\n    return t.cols - n11;\n  }\n  function Io(n11, t, e, i5, r, s4) {\n    return er(t, i5, r, s4).length === 0 ? "" : Jt(pn(n11, t, n11, t - qe(t, r), false, r).length, Zt2("D", s4));\n  }\n  function er(n11, t, e, i5) {\n    let r = n11 - qe(n11, e), s4 = t - qe(t, e), o2 = Math.abs(r - s4) - Eo(n11, t, e);\n    return Jt(o2, Zt2(fn(n11, t), i5));\n  }\n  function Co(n11, t, e, i5, r, s4) {\n    let o2;\n    er(t, i5, r, s4).length > 0 ? o2 = i5 - qe(i5, r) : o2 = t;\n    let a2 = i5, l4 = yo(n11, t, e, i5, r, s4);\n    return Jt(pn(n11, o2, e, a2, l4 === "C", r).length, Zt2(l4, s4));\n  }\n  function Eo(n11, t, e) {\n    let i5 = 0, r = n11 - qe(n11, e), s4 = t - qe(t, e);\n    for (let o2 = 0; o2 < Math.abs(r - s4); o2++) {\n      let a2 = fn(n11, t) === "A" ? -1 : 1;\n      e.buffer.lines.get(r + a2 * o2)?.isWrapped && i5++;\n    }\n    return i5;\n  }\n  function qe(n11, t) {\n    let e = 0, i5 = t.buffer.lines.get(n11), r = i5?.isWrapped;\n    for (; r && n11 >= 0 && n11 < t.rows; ) e++, i5 = t.buffer.lines.get(--n11), r = i5?.isWrapped;\n    return e;\n  }\n  function yo(n11, t, e, i5, r, s4) {\n    let o2;\n    return er(e, i5, r, s4).length > 0 ? o2 = i5 - qe(i5, r) : o2 = t, n11 < e && o2 <= i5 || n11 >= e && o2 < i5 ? "C" : "D";\n  }\n  function fn(n11, t) {\n    return n11 > t ? "A" : "B";\n  }\n  function pn(n11, t, e, i5, r, s4) {\n    let o2 = n11, a2 = t, l4 = "";\n    for (; (o2 !== e || a2 !== i5) && a2 >= 0 && a2 < s4.buffer.lines.length; ) o2 += r ? 1 : -1, r && o2 > s4.cols - 1 ? (l4 += s4.buffer.translateBufferLineToString(a2, false, n11, o2), o2 = 0, n11 = 0, a2++) : !r && o2 < 0 && (l4 += s4.buffer.translateBufferLineToString(a2, false, 0, n11 + 1), o2 = s4.cols - 1, n11 = o2, a2--);\n    return l4 + s4.buffer.translateBufferLineToString(a2, false, n11, o2);\n  }\n  function Zt2(n11, t) {\n    let e = t ? "O" : "[";\n    return "\\x1B" + e + n11;\n  }\n  function Jt(n11, t) {\n    n11 = Math.floor(n11);\n    let e = "";\n    for (let i5 = 0; i5 < n11; i5++) e += t;\n    return e;\n  }\n  var tr = class {\n    constructor(t) {\n      this._bufferService = t;\n      this.isSelectAllActive = false;\n      this.selectionStartLength = 0;\n    }\n    clearSelection() {\n      this.selectionStart = void 0, this.selectionEnd = void 0, this.isSelectAllActive = false, this.selectionStartLength = 0;\n    }\n    get finalSelectionStart() {\n      return this.isSelectAllActive ? [0, 0] : !this.selectionEnd || !this.selectionStart ? this.selectionStart : this.areSelectionValuesReversed() ? this.selectionEnd : this.selectionStart;\n    }\n    get finalSelectionEnd() {\n      if (this.isSelectAllActive) return [this._bufferService.cols, this._bufferService.buffer.ybase + this._bufferService.rows - 1];\n      if (this.selectionStart) {\n        if (!this.selectionEnd || this.areSelectionValuesReversed()) {\n          let t = this.selectionStart[0] + this.selectionStartLength;\n          return t > this._bufferService.cols ? t % this._bufferService.cols === 0 ? [this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols) - 1] : [t % this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols)] : [t, this.selectionStart[1]];\n        }\n        if (this.selectionStartLength && this.selectionEnd[1] === this.selectionStart[1]) {\n          let t = this.selectionStart[0] + this.selectionStartLength;\n          return t > this._bufferService.cols ? [t % this._bufferService.cols, this.selectionStart[1] + Math.floor(t / this._bufferService.cols)] : [Math.max(t, this.selectionEnd[0]), this.selectionEnd[1]];\n        }\n        return this.selectionEnd;\n      }\n    }\n    areSelectionValuesReversed() {\n      let t = this.selectionStart, e = this.selectionEnd;\n      return !t || !e ? false : t[1] > e[1] || t[1] === e[1] && t[0] > e[0];\n    }\n    handleTrim(t) {\n      return this.selectionStart && (this.selectionStart[1] -= t), this.selectionEnd && (this.selectionEnd[1] -= t), this.selectionEnd && this.selectionEnd[1] < 0 ? (this.clearSelection(), true) : (this.selectionStart && this.selectionStart[1] < 0 && (this.selectionStart[1] = 0), false);\n    }\n  };\n  function ms(n11, t) {\n    if (n11.start.y > n11.end.y) throw new Error(`Buffer range end (${n11.end.x}, ${n11.end.y}) cannot be before start (${n11.start.x}, ${n11.start.y})`);\n    return t * (n11.end.y - n11.start.y) + (n11.end.x - n11.start.x + 1);\n  }\n  var bs = 50;\n  var xo = 15;\n  var wo = 50;\n  var To = 500;\n  var Do = "\\xA0";\n  var Ro = new RegExp(Do, "g");\n  var xt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3) {\n      super();\n      this._element = e;\n      this._screenElement = i5;\n      this._linkifier = r;\n      this._bufferService = s4;\n      this._coreService = o2;\n      this._mouseCoordsService = a2;\n      this._optionsService = l4;\n      this._renderService = h3;\n      this._coreBrowserService = d3;\n      this._dragScrollAmount = 0;\n      this._enabled = true;\n      this._workCell = new N2();\n      this._mouseDownTimeStamp = 0;\n      this._oldHasSelection = false;\n      this._oldSelectionStart = void 0;\n      this._oldSelectionEnd = void 0;\n      this._onLinuxMouseSelection = this._register(new v5());\n      this.onLinuxMouseSelection = this._onLinuxMouseSelection.event;\n      this._onRedrawRequest = this._register(new v5());\n      this.onRequestRedraw = this._onRedrawRequest.event;\n      this._onSelectionChange = this._register(new v5());\n      this.onSelectionChange = this._onSelectionChange.event;\n      this._onRequestScrollLines = this._register(new v5());\n      this.onRequestScrollLines = this._onRequestScrollLines.event;\n      this._mouseMoveListener = (c2) => this._handleMouseMove(c2), this._mouseUpListener = (c2) => this._handleMouseUp(c2), this._coreService.onUserInput(() => {\n        this.hasSelection && this.clearSelection();\n      }), this._trimListener = this._bufferService.buffer.lines.onTrim((c2) => this._handleTrim(c2)), this._register(this._bufferService.buffers.onBufferActivate((c2) => this._handleBufferActivate(c2))), this.enable(), this._model = new tr(this._bufferService), this._activeSelectionMode = 0, this._register(y4(() => {\n        this._removeMouseDownListeners();\n      })), this._register(this._bufferService.onResize((c2) => {\n        c2.rowsChanged && this.clearSelection();\n      }));\n    }\n    reset() {\n      this.clearSelection();\n    }\n    disable() {\n      this.clearSelection(), this._enabled = false;\n    }\n    enable() {\n      this._enabled = true;\n    }\n    get selectionStart() {\n      return this._model.finalSelectionStart;\n    }\n    get selectionEnd() {\n      return this._model.finalSelectionEnd;\n    }\n    get hasSelection() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd;\n      return !e || !i5 ? false : e[0] !== i5[0] || e[1] !== i5[1];\n    }\n    get selectionText() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd;\n      if (!e || !i5) return "";\n      let r = this._bufferService.buffer, s4 = [];\n      if (this._activeSelectionMode === 3) {\n        if (e[0] === i5[0]) return "";\n        let a2 = e[0] < i5[0] ? e[0] : i5[0], l4 = e[0] < i5[0] ? i5[0] : e[0];\n        for (let h3 = e[1]; h3 <= i5[1]; h3++) {\n          let d3 = r.translateBufferLineToString(h3, true, a2, l4);\n          s4.push(d3);\n        }\n      } else {\n        let a2 = e[1] === i5[1] ? i5[0] : void 0;\n        s4.push(r.translateBufferLineToString(e[1], true, e[0], a2));\n        for (let l4 = e[1] + 1; l4 <= i5[1] - 1; l4++) {\n          let h3 = r.lines.get(l4), d3 = r.translateBufferLineToString(l4, true);\n          h3?.isWrapped ? s4[s4.length - 1] += d3 : s4.push(d3);\n        }\n        if (e[1] !== i5[1]) {\n          let l4 = r.lines.get(i5[1]), h3 = r.translateBufferLineToString(i5[1], true, 0, i5[0]);\n          l4 && l4.isWrapped ? s4[s4.length - 1] += h3 : s4.push(h3);\n        }\n      }\n      return s4.map((a2) => a2.replace(Ro, " ")).join(Ke3 ? `\\r\n` : `\n`);\n    }\n    clearSelection() {\n      this._model.clearSelection(), this._removeMouseDownListeners(), this.refresh(), this._onSelectionChange.fire();\n    }\n    refresh(e) {\n      this._refreshAnimationFrame || (this._refreshAnimationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._refresh())), $t2 && e && this.selectionText.length && this._onLinuxMouseSelection.fire(this.selectionText);\n    }\n    _refresh() {\n      this._refreshAnimationFrame = void 0, this._onRedrawRequest.fire({ start: this._model.finalSelectionStart, end: this._model.finalSelectionEnd, columnSelectMode: this._activeSelectionMode === 3 });\n    }\n    _isClickInSelection(e) {\n      let i5 = this._getMouseBufferCoords(e), r = this._model.finalSelectionStart, s4 = this._model.finalSelectionEnd;\n      return !r || !s4 || !i5 ? false : this._areCoordsInSelection(i5, r, s4);\n    }\n    isCellInSelection(e, i5) {\n      let r = this._model.finalSelectionStart, s4 = this._model.finalSelectionEnd;\n      return !r || !s4 ? false : this._areCoordsInSelection([e, i5], r, s4);\n    }\n    _areCoordsInSelection(e, i5, r) {\n      return e[1] > i5[1] && e[1] < r[1] || i5[1] === r[1] && e[1] === i5[1] && e[0] >= i5[0] && e[0] < r[0] || i5[1] < r[1] && e[1] === r[1] && e[0] < r[0] || i5[1] < r[1] && e[1] === i5[1] && e[0] >= i5[0];\n    }\n    _selectWordAtCursor(e, i5) {\n      let r = this._linkifier.currentLink?.link?.range;\n      if (r) return this._model.selectionStart = [r.start.x - 1, r.start.y - 1], this._model.selectionStartLength = ms(r, this._bufferService.cols), this._model.selectionEnd = void 0, true;\n      let s4 = this._getMouseBufferCoords(e);\n      return s4 ? (this._selectWordAt(s4, i5), this._model.selectionEnd = void 0, true) : false;\n    }\n    selectAll() {\n      this._model.isSelectAllActive = true, this.refresh(), this._onSelectionChange.fire();\n    }\n    selectLines(e, i5) {\n      this._model.clearSelection(), e = Math.max(e, 0), i5 = Math.min(i5, this._bufferService.buffer.lines.length - 1), this._model.selectionStart = [0, e], this._model.selectionEnd = [this._bufferService.cols, i5], this.refresh(), this._onSelectionChange.fire();\n    }\n    _handleTrim(e) {\n      this._model.handleTrim(e) && this.refresh();\n    }\n    _getMouseBufferCoords(e) {\n      let i5 = this._mouseCoordsService.getCoords(e, this._screenElement, this._bufferService.cols, this._bufferService.rows, true);\n      if (i5) return i5[0]--, i5[1]--, i5[1] += this._bufferService.buffer.ydisp, i5;\n    }\n    _getMouseEventScrollAmount(e) {\n      let i5 = jt(this._coreBrowserService.window, e, this._screenElement)[1], r = this._renderService.dimensions.css.canvas.height;\n      return i5 >= 0 && i5 <= r ? 0 : (i5 > r && (i5 -= r), i5 = Math.min(Math.max(i5, -bs), bs), i5 /= bs, i5 / Math.abs(i5) + Math.round(i5 * (xo - 1)));\n    }\n    shouldForceSelection(e) {\n      return ee3 ? e.altKey && this._optionsService.rawOptions.macOptionClickForcesSelection : e.shiftKey;\n    }\n    handleMouseDown(e) {\n      if (this._mouseDownTimeStamp = e.timeStamp, !(e.button === 2 && this.hasSelection) && e.button === 0) {\n        if (!this._enabled) {\n          if (!this.shouldForceSelection(e)) return;\n          e.stopPropagation();\n        }\n        e.preventDefault(), this._dragScrollAmount = 0, this._enabled && e.shiftKey ? this._handleIncrementalClick(e) : e.detail === 1 ? this._handleSingleClick(e) : e.detail === 2 ? this._handleDoubleClick(e) : e.detail === 3 && this._handleTripleClick(e), this._addMouseDownListeners(), this.refresh(true);\n      }\n    }\n    _addMouseDownListeners() {\n      this._screenElement.ownerDocument && (this._screenElement.ownerDocument.addEventListener("mousemove", this._mouseMoveListener), this._screenElement.ownerDocument.addEventListener("mouseup", this._mouseUpListener)), this._dragScrollIntervalTimer = this._coreBrowserService.window.setInterval(() => this._dragScroll(), wo);\n    }\n    _removeMouseDownListeners() {\n      this._screenElement.ownerDocument && (this._screenElement.ownerDocument.removeEventListener("mousemove", this._mouseMoveListener), this._screenElement.ownerDocument.removeEventListener("mouseup", this._mouseUpListener)), this._coreBrowserService.window.clearInterval(this._dragScrollIntervalTimer), this._dragScrollIntervalTimer = void 0;\n    }\n    _handleIncrementalClick(e) {\n      this._model.selectionStart && (this._model.selectionEnd = this._getMouseBufferCoords(e));\n    }\n    _handleSingleClick(e) {\n      let i5 = this.hasSelection;\n      if (this._model.selectionStartLength = 0, this._model.isSelectAllActive = false, this._activeSelectionMode = this.shouldColumnSelect(e) ? 3 : 0, this._model.selectionStart = this._getMouseBufferCoords(e), !this._model.selectionStart) return;\n      this._model.selectionEnd = void 0, i5 && this._fireOnSelectionChange(this._model.finalSelectionStart, this._model.finalSelectionEnd, false);\n      let r = this._bufferService.buffer.lines.get(this._model.selectionStart[1]);\n      r && r.length !== this._model.selectionStart[0] && r.hasWidth(this._model.selectionStart[0]) === 0 && this._model.selectionStart[0]++;\n    }\n    _handleDoubleClick(e) {\n      this._selectWordAtCursor(e, true) && (this._activeSelectionMode = 1);\n    }\n    _handleTripleClick(e) {\n      let i5 = this._getMouseBufferCoords(e);\n      i5 && (this._activeSelectionMode = 2, this._selectLineAt(i5[1]));\n    }\n    shouldColumnSelect(e) {\n      return e.altKey && !(ee3 && this._optionsService.rawOptions.macOptionClickForcesSelection);\n    }\n    _handleMouseMove(e) {\n      if (e.stopImmediatePropagation(), !this._model.selectionStart) return;\n      let i5 = this._model.selectionEnd ? [this._model.selectionEnd[0], this._model.selectionEnd[1]] : null;\n      if (this._model.selectionEnd = this._getMouseBufferCoords(e), !this._model.selectionEnd) {\n        this.refresh(true);\n        return;\n      }\n      this._activeSelectionMode === 2 ? this._model.selectionEnd[1] < this._model.selectionStart[1] ? this._model.selectionEnd[0] = 0 : this._model.selectionEnd[0] = this._bufferService.cols : this._activeSelectionMode === 1 && this._selectToWordAt(this._model.selectionEnd), this._dragScrollAmount = this._getMouseEventScrollAmount(e), this._activeSelectionMode !== 3 && (this._dragScrollAmount > 0 ? this._model.selectionEnd[0] = this._bufferService.cols : this._dragScrollAmount < 0 && (this._model.selectionEnd[0] = 0));\n      let r = this._bufferService.buffer;\n      if (this._model.selectionEnd[1] < r.lines.length) {\n        let s4 = r.lines.get(this._model.selectionEnd[1]);\n        s4 && s4.hasWidth(this._model.selectionEnd[0]) === 0 && this._model.selectionEnd[0] < this._bufferService.cols && this._model.selectionEnd[0]++;\n      }\n      (!i5 || i5[0] !== this._model.selectionEnd[0] || i5[1] !== this._model.selectionEnd[1]) && this.refresh(true);\n    }\n    _dragScroll() {\n      if (!(!this._model.selectionEnd || !this._model.selectionStart) && this._dragScrollAmount) {\n        this._onRequestScrollLines.fire({ amount: this._dragScrollAmount, suppressScrollEvent: false });\n        let e = this._bufferService.buffer;\n        this._dragScrollAmount > 0 ? (this._activeSelectionMode !== 3 && (this._model.selectionEnd[0] = this._bufferService.cols), this._model.selectionEnd[1] = Math.min(e.ydisp + this._bufferService.rows, e.lines.length - 1)) : (this._activeSelectionMode !== 3 && (this._model.selectionEnd[0] = 0), this._model.selectionEnd[1] = e.ydisp), this.refresh();\n      }\n    }\n    _handleMouseUp(e) {\n      let i5 = e.timeStamp - this._mouseDownTimeStamp;\n      if (this._removeMouseDownListeners(), this.selectionText.length <= 1 && i5 < To && e.altKey && this._optionsService.rawOptions.altClickMovesCursor) {\n        if (this._bufferService.buffer.ybase === this._bufferService.buffer.ydisp) {\n          let r = this._mouseCoordsService.getCoords(e, this._element, this._bufferService.cols, this._bufferService.rows, false);\n          if (r && r[0] !== void 0 && r[1] !== void 0) {\n            let s4 = un(r[0] - 1, r[1] - 1, this._bufferService, this._coreService.decPrivateModes.applicationCursorKeys);\n            this._coreService.triggerDataEvent(s4, true);\n          }\n        }\n      } else this._fireEventIfSelectionChanged();\n    }\n    _fireEventIfSelectionChanged() {\n      let e = this._model.finalSelectionStart, i5 = this._model.finalSelectionEnd, r = !!e && !!i5 && (e[0] !== i5[0] || e[1] !== i5[1]);\n      if (!r) {\n        this._oldHasSelection && this._fireOnSelectionChange(e, i5, r);\n        return;\n      }\n      !e || !i5 || (!this._oldSelectionStart || !this._oldSelectionEnd || e[0] !== this._oldSelectionStart[0] || e[1] !== this._oldSelectionStart[1] || i5[0] !== this._oldSelectionEnd[0] || i5[1] !== this._oldSelectionEnd[1]) && this._fireOnSelectionChange(e, i5, r);\n    }\n    _fireOnSelectionChange(e, i5, r) {\n      this._oldSelectionStart = e, this._oldSelectionEnd = i5, this._oldHasSelection = r, this._onSelectionChange.fire();\n    }\n    _handleBufferActivate(e) {\n      this.clearSelection(), this._trimListener.dispose(), this._trimListener = e.activeBuffer.lines.onTrim((i5) => this._handleTrim(i5));\n    }\n    _convertViewportColToCharacterIndex(e, i5) {\n      let r = i5;\n      for (let s4 = 0; i5 >= s4; s4++) {\n        let o2 = e.loadCell(s4, this._workCell).getChars().length;\n        this._workCell.getWidth() === 0 ? r-- : o2 > 1 && i5 !== s4 && (r += o2 - 1);\n      }\n      return r;\n    }\n    setSelection(e, i5, r) {\n      this._model.clearSelection(), this._removeMouseDownListeners(), this._model.selectionStart = [e, i5], this._model.selectionStartLength = r, this.refresh(), this._fireEventIfSelectionChanged();\n    }\n    rightClickSelect(e) {\n      this._isClickInSelection(e) || (this._selectWordAtCursor(e, false) && this.refresh(true), this._fireEventIfSelectionChanged());\n    }\n    _getWordAt(e, i5, r = true, s4 = true) {\n      if (e[0] >= this._bufferService.cols) return;\n      let o2 = this._bufferService.buffer, a2 = o2.lines.get(e[1]);\n      if (!a2) return;\n      let l4 = o2.translateBufferLineToString(e[1], false), h3 = this._convertViewportColToCharacterIndex(a2, e[0]), d3 = h3, c2 = e[0] - h3, u3 = 0, _5 = 0, p3 = 0, b4 = 0;\n      if (l4.charAt(h3) === " ") {\n        for (; h3 > 0 && l4.charAt(h3 - 1) === " "; ) h3--;\n        for (; d3 < l4.length && l4.charAt(d3 + 1) === " "; ) d3++;\n      } else {\n        let I4 = e[0], w6 = e[0];\n        a2.getWidth(I4) === 0 && (u3++, I4--), a2.getWidth(w6) === 2 && (_5++, w6++);\n        let x5 = a2.getString(w6).length;\n        for (x5 > 1 && (b4 += x5 - 1, d3 += x5 - 1); I4 > 0 && h3 > 0 && !this._isCharWordSeparator(a2.loadCell(I4 - 1, this._workCell)); ) {\n          a2.loadCell(I4 - 1, this._workCell);\n          let ie4 = this._workCell.getChars().length;\n          this._workCell.getWidth() === 0 ? (u3++, I4--) : ie4 > 1 && (p3 += ie4 - 1, h3 -= ie4 - 1), h3--, I4--;\n        }\n        for (; w6 < a2.length && d3 + 1 < l4.length && !this._isCharWordSeparator(a2.loadCell(w6 + 1, this._workCell)); ) {\n          a2.loadCell(w6 + 1, this._workCell);\n          let ie4 = this._workCell.getChars().length;\n          this._workCell.getWidth() === 2 ? (_5++, w6++) : ie4 > 1 && (b4 += ie4 - 1, d3 += ie4 - 1), d3++, w6++;\n        }\n      }\n      d3++;\n      let f5 = h3 + c2 - u3 + p3, S4 = Math.min(this._bufferService.cols, d3 - h3 + u3 + _5 - p3 - b4);\n      if (!(!i5 && l4.slice(h3, d3).trim() === "")) {\n        if (r && f5 === 0 && a2.getCodePoint(0) !== 32) {\n          let I4 = o2.lines.get(e[1] - 1);\n          if (I4 && a2.isWrapped && I4.getCodePoint(this._bufferService.cols - 1) !== 32) {\n            let w6 = this._getWordAt([this._bufferService.cols - 1, e[1] - 1], false, true, false);\n            if (w6) {\n              let x5 = this._bufferService.cols - w6.start;\n              f5 -= x5, S4 += x5;\n            }\n          }\n        }\n        if (s4 && f5 + S4 === this._bufferService.cols && a2.getCodePoint(this._bufferService.cols - 1) !== 32) {\n          let I4 = o2.lines.get(e[1] + 1);\n          if (I4?.isWrapped && I4.getCodePoint(0) !== 32) {\n            let w6 = this._getWordAt([0, e[1] + 1], false, false, true);\n            w6 && (S4 += w6.length);\n          }\n        }\n        return { start: f5, length: S4 };\n      }\n    }\n    _selectWordAt(e, i5) {\n      let r = this._getWordAt(e, i5);\n      if (r) {\n        for (; r.start < 0; ) r.start += this._bufferService.cols, e[1]--;\n        this._model.selectionStart = [r.start, e[1]], this._model.selectionStartLength = r.length;\n      }\n    }\n    _selectToWordAt(e) {\n      let i5 = this._getWordAt(e, true);\n      if (i5) {\n        let r = e[1];\n        for (; i5.start < 0; ) i5.start += this._bufferService.cols, r--;\n        if (!this._model.areSelectionValuesReversed()) for (; i5.start + i5.length > this._bufferService.cols; ) i5.length -= this._bufferService.cols, r++;\n        this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? i5.start : i5.start + i5.length, r];\n      }\n    }\n    _isCharWordSeparator(e) {\n      return e.getWidth() === 0 ? false : this._optionsService.rawOptions.wordSeparator.indexOf(e.getChars()) >= 0;\n    }\n    _selectLineAt(e) {\n      let i5 = this._bufferService.buffer.getWrappedRangeForLine(e), r = { start: { x: 0, y: i5.first }, end: { x: this._bufferService.cols - 1, y: i5.last } };\n      this._model.selectionStart = [0, i5.first], this._model.selectionEnd = void 0, this._model.selectionStartLength = ms(r, this._bufferService.cols);\n    }\n  };\n  xt3 = E4([m3(3, L5), m3(4, Y), m3(5, Be2), m3(6, R3), m3(7, G4), m3(8, z3)], xt3);\n  var Qt2 = class {\n    constructor() {\n      this._data = {};\n    }\n    set(t, e, i5) {\n      this._data[t] || (this._data[t] = {}), this._data[t][e] = i5;\n    }\n    get(t, e) {\n      return this._data[t] ? this._data[t][e] : void 0;\n    }\n    clear() {\n      this._data = {};\n    }\n  };\n  var ei = class {\n    constructor() {\n      this._color = new Qt2();\n      this._css = new Qt2();\n    }\n    setCss(t, e, i5) {\n      this._css.set(t, e, i5);\n    }\n    getCss(t, e) {\n      return this._css.get(t, e);\n    }\n    setColor(t, e, i5) {\n      this._color.set(t, e, i5);\n    }\n    getColor(t, e) {\n      return this._color.get(t, e);\n    }\n    clear() {\n      this._color.clear(), this._css.clear();\n    }\n  };\n  var $3 = Object.freeze((() => {\n    let n11 = [M3.toColor("#2e3436"), M3.toColor("#cc0000"), M3.toColor("#4e9a06"), M3.toColor("#c4a000"), M3.toColor("#3465a4"), M3.toColor("#75507b"), M3.toColor("#06989a"), M3.toColor("#d3d7cf"), M3.toColor("#555753"), M3.toColor("#ef2929"), M3.toColor("#8ae234"), M3.toColor("#fce94f"), M3.toColor("#729fcf"), M3.toColor("#ad7fa8"), M3.toColor("#34e2e2"), M3.toColor("#eeeeec")], t = [0, 95, 135, 175, 215, 255];\n    for (let e = 0; e < 216; e++) {\n      let i5 = t[e / 36 % 6 | 0], r = t[e / 6 % 6 | 0], s4 = t[e % 6];\n      n11.push({ css: B4.toCss(i5, r, s4), rgba: B4.toRgba(i5, r, s4) });\n    }\n    for (let e = 0; e < 24; e++) {\n      let i5 = 8 + e * 10;\n      n11.push({ css: B4.toCss(i5, i5, i5), rgba: B4.toRgba(i5, i5, i5) });\n    }\n    return n11;\n  })());\n  var Ye2 = M3.toColor("#ffffff");\n  var ii = M3.toColor("#000000");\n  var _n2 = M3.toColor("#ffffff");\n  var mn = ii;\n  var ti = { css: "rgba(255, 255, 255, 0.3)", rgba: 4294967117 };\n  var Lo = Ye2;\n  var wt = class extends g5 {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._contrastCache = new ei();\n      this._halfContrastCache = new ei();\n      this._onChangeColors = this._register(new v5());\n      this.onChangeColors = this._onChangeColors.event;\n      this._colors = { foreground: Ye2, background: ii, cursor: _n2, cursorAccent: mn, selectionForeground: void 0, selectionBackgroundTransparent: ti, selectionBackgroundOpaque: k4.blend(ii, ti), selectionInactiveBackgroundTransparent: ti, selectionInactiveBackgroundOpaque: k4.blend(ii, ti), scrollbarSliderBackground: k4.opacity(Ye2, 0.2), scrollbarSliderHoverBackground: k4.opacity(Ye2, 0.4), scrollbarSliderActiveBackground: k4.opacity(Ye2, 0.5), overviewRulerBorder: Ye2, ansi: $3.slice(), contrastCache: this._contrastCache, halfContrastCache: this._halfContrastCache }, this._updateRestoreColors(), this._setTheme(this._optionsService.rawOptions.theme), this._register(this._optionsService.onSpecificOptionChange("minimumContrastRatio", () => this._contrastCache.clear())), this._register(this._optionsService.onSpecificOptionChange("theme", () => this._setTheme(this._optionsService.rawOptions.theme)));\n    }\n    get colors() {\n      return this._colors;\n    }\n    _setTheme(e = {}) {\n      let i5 = this._colors;\n      if (i5.foreground = P4(e.foreground, Ye2), i5.background = P4(e.background, ii), i5.cursor = k4.blend(i5.background, P4(e.cursor, _n2)), i5.cursorAccent = k4.blend(i5.background, P4(e.cursorAccent, mn)), i5.selectionBackgroundTransparent = P4(e.selectionBackground, ti), i5.selectionBackgroundOpaque = k4.blend(i5.background, i5.selectionBackgroundTransparent), i5.selectionInactiveBackgroundTransparent = P4(e.selectionInactiveBackground, i5.selectionBackgroundTransparent), i5.selectionInactiveBackgroundOpaque = k4.blend(i5.background, i5.selectionInactiveBackgroundTransparent), i5.selectionForeground = e.selectionForeground ? P4(e.selectionForeground, ss) : void 0, i5.selectionForeground === ss && (i5.selectionForeground = void 0), k4.isOpaque(i5.selectionBackgroundTransparent) && (i5.selectionBackgroundTransparent = k4.opacity(i5.selectionBackgroundTransparent, 0.3)), k4.isOpaque(i5.selectionInactiveBackgroundTransparent) && (i5.selectionInactiveBackgroundTransparent = k4.opacity(i5.selectionInactiveBackgroundTransparent, 0.3)), i5.scrollbarSliderBackground = P4(e.scrollbarSliderBackground, k4.opacity(i5.foreground, 0.2)), i5.scrollbarSliderHoverBackground = P4(e.scrollbarSliderHoverBackground, k4.opacity(i5.foreground, 0.4)), i5.scrollbarSliderActiveBackground = P4(e.scrollbarSliderActiveBackground, k4.opacity(i5.foreground, 0.5)), i5.overviewRulerBorder = P4(e.overviewRulerBorder, Lo), i5.ansi = $3.slice(), i5.ansi[0] = P4(e.black, $3[0]), i5.ansi[1] = P4(e.red, $3[1]), i5.ansi[2] = P4(e.green, $3[2]), i5.ansi[3] = P4(e.yellow, $3[3]), i5.ansi[4] = P4(e.blue, $3[4]), i5.ansi[5] = P4(e.magenta, $3[5]), i5.ansi[6] = P4(e.cyan, $3[6]), i5.ansi[7] = P4(e.white, $3[7]), i5.ansi[8] = P4(e.brightBlack, $3[8]), i5.ansi[9] = P4(e.brightRed, $3[9]), i5.ansi[10] = P4(e.brightGreen, $3[10]), i5.ansi[11] = P4(e.brightYellow, $3[11]), i5.ansi[12] = P4(e.brightBlue, $3[12]), i5.ansi[13] = P4(e.brightMagenta, $3[13]), i5.ansi[14] = P4(e.brightCyan, $3[14]), i5.ansi[15] = P4(e.brightWhite, $3[15]), e.extendedAnsi) {\n        let r = Math.min(i5.ansi.length - 16, e.extendedAnsi.length);\n        for (let s4 = 0; s4 < r; s4++) i5.ansi[s4 + 16] = P4(e.extendedAnsi[s4], $3[s4 + 16]);\n      }\n      this._contrastCache.clear(), this._halfContrastCache.clear(), this._updateRestoreColors(), this._onChangeColors.fire(this.colors);\n    }\n    restoreColor(e) {\n      this._restoreColor(e), this._onChangeColors.fire(this.colors);\n    }\n    _restoreColor(e) {\n      if (e === void 0) {\n        for (let i5 = 0; i5 < this._restoreColors.ansi.length; ++i5) this._colors.ansi[i5] = this._restoreColors.ansi[i5];\n        return;\n      }\n      switch (e) {\n        case 256:\n          this._colors.foreground = this._restoreColors.foreground;\n          break;\n        case 257:\n          this._colors.background = this._restoreColors.background;\n          break;\n        case 258:\n          this._colors.cursor = this._restoreColors.cursor;\n          break;\n        default:\n          this._colors.ansi[e] = this._restoreColors.ansi[e];\n      }\n    }\n    modifyColors(e) {\n      e(this._colors), this._onChangeColors.fire(this.colors);\n    }\n    _updateRestoreColors() {\n      this._restoreColors = { foreground: this._colors.foreground, background: this._colors.background, cursor: this._colors.cursor, ansi: this._colors.ansi.slice() };\n    }\n  };\n  wt = E4([m3(0, R3)], wt);\n  function P4(n11, t) {\n    if (n11 !== void 0) try {\n      return M3.toColor(n11);\n    } catch {\n    }\n    return t;\n  }\n  var Ao = { 48: ["0", ")"], 49: ["1", "!"], 50: ["2", "@"], 51: ["3", "#"], 52: ["4", "$"], 53: ["5", "%"], 54: ["6", "^"], 55: ["7", "&"], 56: ["8", "*"], 57: ["9", "("], 186: [";", ":"], 187: ["=", "+"], 188: [",", "<"], 189: ["-", "_"], 190: [".", ">"], 191: ["/", "?"], 192: ["`", "~"], 219: ["[", "{"], 220: ["\\\\", "|"], 221: ["]", "}"], 222: ["\'", \'"\'] };\n  function vn(n11, t, e, i5) {\n    let r = { type: 0, cancel: false, key: void 0 }, s4 = (n11.shiftKey ? 1 : 0) | (n11.altKey ? 2 : 0) | (n11.ctrlKey ? 4 : 0) | (n11.metaKey ? 8 : 0);\n    switch (n11.keyCode) {\n      case 0:\n        n11.key === "UIKeyInputUpArrow" ? t ? r.key = "\\x1BOA" : r.key = "\\x1B[A" : n11.key === "UIKeyInputLeftArrow" ? t ? r.key = "\\x1BOD" : r.key = "\\x1B[D" : n11.key === "UIKeyInputRightArrow" ? t ? r.key = "\\x1BOC" : r.key = "\\x1B[C" : n11.key === "UIKeyInputDownArrow" && (t ? r.key = "\\x1BOB" : r.key = "\\x1B[B");\n        break;\n      case 8:\n        r.key = n11.ctrlKey ? "\\b" : "\\x7F", n11.altKey && (r.key = "\\x1B" + r.key);\n        break;\n      case 9:\n        if (n11.shiftKey) {\n          r.key = "\\x1B[Z";\n          break;\n        }\n        r.key = "\t", r.cancel = true;\n        break;\n      case 13:\n        n11.key === "c" && n11.ctrlKey ? r.key = "\u0003" : r.key = n11.altKey ? "\\x1B\\r" : "\\r", r.cancel = true;\n        break;\n      case 27:\n        r.key = "\\x1B", n11.altKey && (r.key = "\\x1B\\x1B"), r.cancel = true;\n        break;\n      case 37:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "D" : t ? r.key = "\\x1BOD" : r.key = "\\x1B[D";\n        break;\n      case 39:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "C" : t ? r.key = "\\x1BOC" : r.key = "\\x1B[C";\n        break;\n      case 38:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "A" : t ? r.key = "\\x1BOA" : r.key = "\\x1B[A";\n        break;\n      case 40:\n        if (n11.metaKey) break;\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "B" : t ? r.key = "\\x1BOB" : r.key = "\\x1B[B";\n        break;\n      case 45:\n        !n11.shiftKey && !n11.ctrlKey && (r.key = "\\x1B[2~");\n        break;\n      case 46:\n        s4 ? r.key = "\\x1B[3;" + (s4 + 1) + "~" : r.key = "\\x1B[3~";\n        break;\n      case 36:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "H" : t ? r.key = "\\x1BOH" : r.key = "\\x1B[H";\n        break;\n      case 35:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "F" : t ? r.key = "\\x1BOF" : r.key = "\\x1B[F";\n        break;\n      case 33:\n        n11.shiftKey ? r.type = 2 : n11.ctrlKey ? r.key = "\\x1B[5;" + (s4 + 1) + "~" : r.key = "\\x1B[5~";\n        break;\n      case 34:\n        n11.shiftKey ? r.type = 3 : n11.ctrlKey ? r.key = "\\x1B[6;" + (s4 + 1) + "~" : r.key = "\\x1B[6~";\n        break;\n      case 112:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "P" : r.key = "\\x1BOP";\n        break;\n      case 113:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "Q" : r.key = "\\x1BOQ";\n        break;\n      case 114:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "R" : r.key = "\\x1BOR";\n        break;\n      case 115:\n        s4 ? r.key = "\\x1B[1;" + (s4 + 1) + "S" : r.key = "\\x1BOS";\n        break;\n      case 116:\n        s4 ? r.key = "\\x1B[15;" + (s4 + 1) + "~" : r.key = "\\x1B[15~";\n        break;\n      case 117:\n        s4 ? r.key = "\\x1B[17;" + (s4 + 1) + "~" : r.key = "\\x1B[17~";\n        break;\n      case 118:\n        s4 ? r.key = "\\x1B[18;" + (s4 + 1) + "~" : r.key = "\\x1B[18~";\n        break;\n      case 119:\n        s4 ? r.key = "\\x1B[19;" + (s4 + 1) + "~" : r.key = "\\x1B[19~";\n        break;\n      case 120:\n        s4 ? r.key = "\\x1B[20;" + (s4 + 1) + "~" : r.key = "\\x1B[20~";\n        break;\n      case 121:\n        s4 ? r.key = "\\x1B[21;" + (s4 + 1) + "~" : r.key = "\\x1B[21~";\n        break;\n      case 122:\n        s4 ? r.key = "\\x1B[23;" + (s4 + 1) + "~" : r.key = "\\x1B[23~";\n        break;\n      case 123:\n        s4 ? r.key = "\\x1B[24;" + (s4 + 1) + "~" : r.key = "\\x1B[24~";\n        break;\n      default:\n        if (n11.ctrlKey && !n11.shiftKey && !n11.altKey && !n11.metaKey) n11.keyCode >= 65 && n11.keyCode <= 90 ? r.key = String.fromCharCode(n11.keyCode - 64) : n11.keyCode === 32 ? r.key = "\\0" : n11.keyCode >= 51 && n11.keyCode <= 55 ? r.key = String.fromCharCode(n11.keyCode - 51 + 27) : n11.keyCode === 56 ? r.key = "\\x7F" : n11.key === "/" ? r.key = "\u001f" : n11.keyCode === 219 ? r.key = "\\x1B" : n11.keyCode === 220 ? r.key = "\u001c" : n11.keyCode === 221 && (r.key = "\u001d");\n        else if ((!e || i5) && n11.altKey && !n11.metaKey) {\n          let a2 = Ao[n11.keyCode]?.[n11.shiftKey ? 1 : 0];\n          if (a2) r.key = "\\x1B" + a2;\n          else if (n11.keyCode >= 65 && n11.keyCode <= 90) {\n            let l4 = n11.ctrlKey ? n11.keyCode - 64 : n11.keyCode + 32, h3 = String.fromCharCode(l4);\n            n11.shiftKey && (h3 = h3.toUpperCase()), r.key = "\\x1B" + h3;\n          } else if (n11.keyCode === 32) r.key = "\\x1B" + (n11.ctrlKey ? "\\0" : " ");\n          else if (n11.key === "Dead" && n11.code.startsWith("Key")) {\n            let l4 = n11.code.slice(3, 4);\n            n11.shiftKey || (l4 = l4.toLowerCase()), r.key = "\\x1B" + l4, r.cancel = true;\n          }\n        } else if (e && !n11.altKey && !n11.ctrlKey && !n11.shiftKey && n11.metaKey) n11.keyCode === 65 && (r.type = 1);\n        else if (n11.key && !n11.ctrlKey && !n11.altKey && !n11.metaKey && n11.keyCode >= 48 && n11.key.length === 1) r.key = n11.key;\n        else if (n11.key && n11.ctrlKey && n11.shiftKey) switch (n11.code) {\n          case "Minus":\n            r.key = "\u001f";\n            break;\n          case "Digit2":\n            r.key = "\\0";\n            break;\n          case "Digit6":\n            r.key = "\u001e";\n            break;\n        }\n        break;\n    }\n    return r;\n  }\n  var ri = class {\n    constructor() {\n      this._functionalKeyCodes = { Escape: 27, Enter: 13, Tab: 9, Backspace: 127, CapsLock: 57358, ScrollLock: 57359, NumLock: 57360, PrintScreen: 57361, Pause: 57362, ContextMenu: 57363, F13: 57376, F14: 57377, F15: 57378, F16: 57379, F17: 57380, F18: 57381, F19: 57382, F20: 57383, F21: 57384, F22: 57385, F23: 57386, F24: 57387, F25: 57388, KP_0: 57399, KP_1: 57400, KP_2: 57401, KP_3: 57402, KP_4: 57403, KP_5: 57404, KP_6: 57405, KP_7: 57406, KP_8: 57407, KP_9: 57408, KP_Decimal: 57409, KP_Divide: 57410, KP_Multiply: 57411, KP_Subtract: 57412, KP_Add: 57413, KP_Enter: 57414, KP_Equal: 57415, ShiftLeft: 57441, ShiftRight: 57447, ControlLeft: 57442, ControlRight: 57448, AltLeft: 57443, AltRight: 57449, MetaLeft: 57444, MetaRight: 57450, MediaPlayPause: 57430, MediaStop: 57432, MediaTrackNext: 57435, MediaTrackPrevious: 57436, AudioVolumeDown: 57438, AudioVolumeUp: 57439, AudioVolumeMute: 57440 };\n      this._csiTildeKeys = { Insert: 2, Delete: 3, PageUp: 5, PageDown: 6, F5: 15, F6: 17, F7: 18, F8: 19, F9: 20, F10: 21, F11: 23, F12: 24 };\n      this._csiLetterKeys = { ArrowUp: "A", ArrowDown: "B", ArrowRight: "C", ArrowLeft: "D", Home: "H", End: "F" };\n      this._ss3FunctionKeys = { F1: "P", F2: "Q", F3: "R", F4: "S" };\n    }\n    _getNumpadKeyCode(t) {\n      if (t.code.startsWith("Numpad")) {\n        let e = t.code.slice(6);\n        if (e >= "0" && e <= "9") return 57399 + parseInt(e, 10);\n        switch (e) {\n          case "Decimal":\n            return 57409;\n          case "Divide":\n            return 57410;\n          case "Multiply":\n            return 57411;\n          case "Subtract":\n            return 57412;\n          case "Add":\n            return 57413;\n          case "Enter":\n            return 57414;\n          case "Equal":\n            return 57415;\n        }\n      }\n    }\n    _getModifierKeyCode(t) {\n      switch (t.code) {\n        case "ShiftLeft":\n          return 57441;\n        case "ShiftRight":\n          return 57447;\n        case "ControlLeft":\n          return 57442;\n        case "ControlRight":\n          return 57448;\n        case "AltLeft":\n          return 57443;\n        case "AltRight":\n          return 57449;\n        case "MetaLeft":\n          return 57444;\n        case "MetaRight":\n          return 57450;\n      }\n    }\n    _encodeModifiers(t) {\n      let e = 0;\n      return t.shiftKey && (e |= 1), t.altKey && (e |= 2), t.ctrlKey && (e |= 4), t.metaKey && (e |= 8), e > 0 ? e + 1 : 0;\n    }\n    _getKeyCode(t, e) {\n      let i5 = this._getNumpadKeyCode(t);\n      if (i5 !== void 0) return i5;\n      let r = this._getModifierKeyCode(t);\n      if (r !== void 0) return r;\n      let s4 = this._functionalKeyCodes[t.key];\n      if (s4 !== void 0) return s4;\n      if ((t.shiftKey || e && t.altKey) && t.code) {\n        if (t.code.startsWith("Digit") && t.code.length === 6) {\n          let o2 = t.code.charAt(5);\n          if (o2 >= "0" && o2 <= "9") return o2.charCodeAt(0);\n        }\n        if (t.code.startsWith("Key") && t.code.length === 4) return t.code.charAt(3).toLowerCase().charCodeAt(0);\n      }\n      if (t.key.length === 1) {\n        let o2 = t.key.codePointAt(0);\n        return o2 >= 65 && o2 <= 90 ? o2 + 32 : o2;\n      }\n    }\n    _isModifierKey(t) {\n      return t.key === "Shift" || t.key === "Control" || t.key === "Alt" || t.key === "Meta";\n    }\n    _isLockKey(t) {\n      return t.key === "CapsLock" || t.key === "NumLock" || t.key === "ScrollLock";\n    }\n    _buildCsiLetterSequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1;\n      if (e > 0 || s4) {\n        let o2 = "\\x1B[1;" + (e > 0 ? e : "1");\n        return s4 && (o2 += ":" + i5), o2 += t, o2;\n      }\n      return "\\x1B[" + t;\n    }\n    _buildSs3Sequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1;\n      if (e > 0 || s4) {\n        let o2 = "\\x1B[1;" + (e > 0 ? e : "1");\n        return s4 && (o2 += ":" + i5), o2 += t, o2;\n      }\n      return "\\x1BO" + t;\n    }\n    _buildCsiTildeSequence(t, e, i5, r) {\n      let s4 = r && i5 !== 1, o2 = "\\x1B[" + t;\n      return (e > 0 || s4) && (o2 += ";" + (e > 0 ? e : "1"), s4 && (o2 += ":" + i5)), o2 += "~", o2;\n    }\n    _buildCsiUSequence(t, e, i5, r, s4, o2, a2) {\n      let l4 = !!(s4 & 2), h3 = !!(s4 & 4), d3 = "\\x1B[" + e, c2;\n      h3 && t.shiftKey && t.key.length === 1 && !o2 && !a2 && (c2 = t.key.codePointAt(0), d3 += ":" + c2);\n      let _5 = !!(s4 & 16) && r !== 3 && t.key.length === 1 && !o2 && !a2 && !t.ctrlKey ? t.key.codePointAt(0) : void 0, p3 = l4 && r !== 1 && (r === 3 || _5 === void 0);\n      return (i5 > 0 || p3 || _5 !== void 0) && (d3 += ";", i5 > 0 ? d3 += i5 : p3 && (d3 += "1"), p3 && (d3 += ":" + r)), _5 !== void 0 && (d3 += ";" + _5), d3 += "u", d3;\n    }\n    evaluate(t, e, i5 = 1, r = false) {\n      let s4 = { type: 0, cancel: false, key: void 0 }, o2 = this._encodeModifiers(t), a2 = this._isModifierKey(t), l4 = !!(e & 2);\n      if (!l4 && i5 === 3 || a2 && !(e & 8) || this._isLockKey(t) && !(e & 8)) return s4;\n      let h3 = this._csiLetterKeys[t.key];\n      if (h3) return s4.key = this._buildCsiLetterSequence(h3, o2, i5, l4), s4.cancel = true, s4;\n      let d3 = this._ss3FunctionKeys[t.key];\n      if (d3) return s4.key = this._buildSs3Sequence(d3, o2, i5, l4), s4.cancel = true, s4;\n      let c2 = this._csiTildeKeys[t.key];\n      if (c2 !== void 0) return s4.key = this._buildCsiTildeSequence(c2, o2, i5, l4), s4.cancel = true, s4;\n      let u3 = this._getKeyCode(t, r);\n      if (u3 === void 0) return s4;\n      let _5 = this._functionalKeyCodes[t.key] !== void 0 || this._getNumpadKeyCode(t) !== void 0, p3 = false;\n      if (e & 8 || l4 ? p3 = true : e & 1 && (_5 && !(u3 === 13 || u3 === 9 || u3 === 127) ? p3 = true : o2 > 0 && (t.shiftKey && !t.ctrlKey && !t.altKey && !t.metaKey && t.key.length === 1 ? p3 = false : p3 = true)), p3) s4.key = this._buildCsiUSequence(t, u3, o2, i5, e, _5, a2), s4.cancel = true;\n      else {\n        let b4 = u3 === 13 ? "\\r" : u3 === 9 ? "\t" : u3 === 127 ? "\\x7F" : void 0;\n        b4 ? s4.key = b4 : t.key.length === 1 && !t.ctrlKey && !t.altKey && !t.metaKey && (s4.key = t.key);\n      }\n      return s4;\n    }\n    static shouldUseProtocol(t) {\n      return t > 0;\n    }\n  };\n  var ir2 = class {\n    constructor() {\n      this._codeToVk = { KeyA: 65, KeyB: 66, KeyC: 67, KeyD: 68, KeyE: 69, KeyF: 70, KeyG: 71, KeyH: 72, KeyI: 73, KeyJ: 74, KeyK: 75, KeyL: 76, KeyM: 77, KeyN: 78, KeyO: 79, KeyP: 80, KeyQ: 81, KeyR: 82, KeyS: 83, KeyT: 84, KeyU: 85, KeyV: 86, KeyW: 87, KeyX: 88, KeyY: 89, KeyZ: 90, Digit0: 48, Digit1: 49, Digit2: 50, Digit3: 51, Digit4: 52, Digit5: 53, Digit6: 54, Digit7: 55, Digit8: 56, Digit9: 57, F1: 112, F2: 113, F3: 114, F4: 115, F5: 116, F6: 117, F7: 118, F8: 119, F9: 120, F10: 121, F11: 122, F12: 123, F13: 124, F14: 125, F15: 126, F16: 127, F17: 128, F18: 129, F19: 130, F20: 131, F21: 132, F22: 133, F23: 134, F24: 135, Numpad0: 96, Numpad1: 97, Numpad2: 98, Numpad3: 99, Numpad4: 100, Numpad5: 101, Numpad6: 102, Numpad7: 103, Numpad8: 104, Numpad9: 105, NumpadMultiply: 106, NumpadAdd: 107, NumpadSeparator: 108, NumpadSubtract: 109, NumpadDecimal: 110, NumpadDivide: 111, NumpadEnter: 13, NumLock: 144, ArrowUp: 38, ArrowDown: 40, ArrowLeft: 37, ArrowRight: 39, Home: 36, End: 35, PageUp: 33, PageDown: 34, Insert: 45, Delete: 46, ShiftLeft: 16, ShiftRight: 16, ControlLeft: 17, ControlRight: 17, AltLeft: 18, AltRight: 18, MetaLeft: 91, MetaRight: 92, CapsLock: 20, ScrollLock: 145, Escape: 27, Enter: 13, Tab: 9, Space: 32, Backspace: 8, Pause: 19, ContextMenu: 93, PrintScreen: 44, Semicolon: 186, Equal: 187, Comma: 188, Minus: 189, Period: 190, Slash: 191, Backquote: 192, BracketLeft: 219, Backslash: 220, BracketRight: 221, Quote: 222, IntlBackslash: 226 };\n      this._codeToScancode = { KeyQ: 16, KeyW: 17, KeyE: 18, KeyR: 19, KeyT: 20, KeyY: 21, KeyU: 22, KeyI: 23, KeyO: 24, KeyP: 25, KeyA: 30, KeyS: 31, KeyD: 32, KeyF: 33, KeyG: 34, KeyH: 35, KeyJ: 36, KeyK: 37, KeyL: 38, KeyZ: 44, KeyX: 45, KeyC: 46, KeyV: 47, KeyB: 48, KeyN: 49, KeyM: 50, Digit1: 2, Digit2: 3, Digit3: 4, Digit4: 5, Digit5: 6, Digit6: 7, Digit7: 8, Digit8: 9, Digit9: 10, Digit0: 11, F1: 59, F2: 60, F3: 61, F4: 62, F5: 63, F6: 64, F7: 65, F8: 66, F9: 67, F10: 68, F11: 87, F12: 88, Numpad0: 82, Numpad1: 79, Numpad2: 80, Numpad3: 81, Numpad4: 75, Numpad5: 76, Numpad6: 77, Numpad7: 71, Numpad8: 72, Numpad9: 73, NumpadMultiply: 55, NumpadAdd: 78, NumpadSubtract: 74, NumpadDecimal: 83, NumpadDivide: 53, NumpadEnter: 28, NumLock: 69, ArrowUp: 72, ArrowDown: 80, ArrowLeft: 75, ArrowRight: 77, Home: 71, End: 79, PageUp: 73, PageDown: 81, Insert: 82, Delete: 83, ShiftLeft: 42, ShiftRight: 54, ControlLeft: 29, ControlRight: 29, AltLeft: 56, AltRight: 56, CapsLock: 58, ScrollLock: 70, Escape: 1, Enter: 28, Tab: 15, Space: 57, Backspace: 14, Pause: 69, Semicolon: 39, Equal: 13, Comma: 51, Minus: 12, Period: 52, Slash: 53, Backquote: 41, BracketLeft: 26, Backslash: 43, BracketRight: 27, Quote: 40 };\n      this._enhancedKeyCodes = /* @__PURE__ */ new Set(["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Home", "End", "PageUp", "PageDown", "Insert", "Delete", "NumpadEnter", "NumpadDivide", "ControlRight", "AltRight", "PrintScreen", "Pause", "ContextMenu", "MetaLeft", "MetaRight"]);\n      this._keyToControlChar = { Enter: 13, Backspace: 8, Tab: 9, Escape: 27 };\n    }\n    _getVirtualKeyCode(t) {\n      let e = this._codeToVk[t.code];\n      return e !== void 0 ? e : t.keyCode || 0;\n    }\n    _getScanCode(t) {\n      return this._codeToScancode[t.code] || 0;\n    }\n    _getUnicodeChar(t) {\n      if (t.ctrlKey && !t.altKey && !t.metaKey) {\n        if (t.key === "Enter") return 10;\n        if (t.key === "Backspace") return 127;\n      }\n      let e = this._keyToControlChar[t.key];\n      if (e !== void 0) return e;\n      if (t.key.length === 1) {\n        let i5 = t.key.codePointAt(0) || 0;\n        if (t.ctrlKey && !t.altKey && !t.metaKey) {\n          if (i5 >= 65 && i5 <= 90) return i5 - 64;\n          if (i5 >= 97 && i5 <= 122) return i5 - 96;\n        }\n        return i5;\n      }\n      return 0;\n    }\n    _getControlKeyState(t) {\n      let e = 0;\n      return t.shiftKey && (e |= 16), t.ctrlKey && (t.code === "ControlRight" ? e |= 4 : e |= 8), t.altKey && (t.code === "AltRight" ? e |= 1 : e |= 2), this._enhancedKeyCodes.has(t.code) && (e |= 256), e;\n    }\n    evaluateKeyboardEvent(t, e) {\n      let i5 = this._getVirtualKeyCode(t), r = this._getScanCode(t), s4 = this._getUnicodeChar(t), o2 = e ? 1 : 0, a2 = this._getControlKeyState(t);\n      return { type: 0, cancel: true, key: `\\x1B[${i5};${r};${s4};${o2};${a2};1_` };\n    }\n  };\n  var Tt3 = class {\n    constructor(t, e) {\n      this._coreService = t;\n      this._optionsService = e;\n    }\n    _getWin32InputMode() {\n      return this._win32InputMode ??= new ir2(), this._win32InputMode;\n    }\n    _getKittyKeyboard() {\n      return this._kittyKeyboard ??= new ri(), this._kittyKeyboard;\n    }\n    evaluateKeyDown(t) {\n      if (this.useWin32InputMode) return this._getWin32InputMode().evaluateKeyboardEvent(t, true);\n      let e = this._coreService.kittyKeyboard.flags;\n      return this.useKitty ? this._getKittyKeyboard().evaluate(t, e, t.repeat ? 2 : 1, ee3 && this._optionsService.rawOptions.macOptionIsMeta) : vn(t, this._coreService.decPrivateModes.applicationCursorKeys, ee3, this._optionsService.rawOptions.macOptionIsMeta);\n    }\n    evaluateKeyUp(t) {\n      if (this.useWin32InputMode) return this._getWin32InputMode().evaluateKeyboardEvent(t, false);\n      let e = this._coreService.kittyKeyboard.flags;\n      if (this.useKitty && e & 2) return this._getKittyKeyboard().evaluate(t, e, 3, ee3 && this._optionsService.rawOptions.macOptionIsMeta);\n    }\n    get useKitty() {\n      let t = this._coreService.kittyKeyboard.flags;\n      return !!(this._optionsService.rawOptions.vtExtensions?.kittyKeyboard && ri.shouldUseProtocol(t));\n    }\n    get useWin32InputMode() {\n      return !!(this._optionsService.rawOptions.vtExtensions?.win32InputMode && this._coreService.decPrivateModes.win32InputMode);\n    }\n  };\n  Tt3 = E4([m3(0, Y), m3(1, R3)], Tt3);\n  var Ss = class {\n    constructor(...t) {\n      this._entries = /* @__PURE__ */ new Map();\n      for (let [e, i5] of t) this.set(e, i5);\n    }\n    set(t, e) {\n      let i5 = this._entries.get(t);\n      return this._entries.set(t, e), i5;\n    }\n    forEach(t) {\n      for (let [e, i5] of this._entries.entries()) t(e, i5);\n    }\n    has(t) {\n      return this._entries.has(t);\n    }\n    get(t) {\n      return this._entries.get(t);\n    }\n  };\n  var rr = class {\n    constructor() {\n      this._services = new Ss();\n      this._services.set(tt3, this);\n    }\n    setService(t, e) {\n      this._services.set(t, e);\n    }\n    getService(t) {\n      return this._services.get(t);\n    }\n    createInstance(t, ...e) {\n      let i5 = Ys(t).sort((o2, a2) => o2.index - a2.index), r = [];\n      for (let o2 of i5) {\n        let a2 = this._services.get(o2.id);\n        if (!a2) throw new Error(`[createInstance] ${t.name} depends on UNKNOWN service ${o2.id._id}.`);\n        r.push(a2);\n      }\n      let s4 = i5.length > 0 ? i5[0].index : e.length;\n      if (e.length !== s4) throw new Error(`[createInstance] First service dependency of ${t.name} at position ${s4 + 1} conflicts with ${e.length} static arguments`);\n      return new t(...e, ...r);\n    }\n  };\n  var ko = { trace: 0, debug: 1, info: 2, warn: 3, error: 4, off: 5 };\n  var Po2 = "xterm.js: ";\n  var Dt2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._optionsService = e;\n      this._logLevel = 5;\n      this._updateLogLevel(), this._register(this._optionsService.onSpecificOptionChange("logLevel", () => this._updateLogLevel()));\n    }\n    get logLevel() {\n      return this._logLevel;\n    }\n    _updateLogLevel() {\n      this._logLevel = ko[this._optionsService.rawOptions.logLevel];\n    }\n    _evalLazyOptionalParams(e) {\n      for (let i5 = 0; i5 < e.length; i5++) typeof e[i5] == "function" && (e[i5] = e[i5]());\n    }\n    _log(e, i5, r) {\n      this._evalLazyOptionalParams(r), e.call(console, (this._optionsService.options.logger ? "" : Po2) + i5, ...r);\n    }\n    trace(e, ...i5) {\n      this._logLevel <= 0 && this._log(this._optionsService.options.logger?.trace.bind(this._optionsService.options.logger) ?? console.log, e, i5);\n    }\n    debug(e, ...i5) {\n      this._logLevel <= 1 && this._log(this._optionsService.options.logger?.debug.bind(this._optionsService.options.logger) ?? console.log, e, i5);\n    }\n    info(e, ...i5) {\n      this._logLevel <= 2 && this._log(this._optionsService.options.logger?.info.bind(this._optionsService.options.logger) ?? console.info, e, i5);\n    }\n    warn(e, ...i5) {\n      this._logLevel <= 3 && this._log(this._optionsService.options.logger?.warn.bind(this._optionsService.options.logger) ?? console.warn, e, i5);\n    }\n    error(e, ...i5) {\n      this._logLevel <= 4 && this._log(this._optionsService.options.logger?.error.bind(this._optionsService.options.logger) ?? console.error, e, i5);\n    }\n  };\n  Dt2 = E4([m3(0, R3)], Dt2);\n  var si = class extends g5 {\n    constructor(e) {\n      super();\n      this._maxLength = e;\n      this.onDeleteEmitter = this._register(new v5());\n      this.onDelete = this.onDeleteEmitter.event;\n      this.onInsertEmitter = this._register(new v5());\n      this.onInsert = this.onInsertEmitter.event;\n      this.onTrimEmitter = this._register(new v5());\n      this.onTrim = this.onTrimEmitter.event;\n      this._array = new Array(this._maxLength), this._startIndex = 0, this._length = 0;\n    }\n    get maxLength() {\n      return this._maxLength;\n    }\n    set maxLength(e) {\n      if (this._maxLength === e) return;\n      let i5 = new Array(e);\n      for (let r = 0; r < Math.min(e, this.length); r++) i5[r] = this._array[this._getCyclicIndex(r)];\n      this._array = i5, this._maxLength = e, this._startIndex = 0;\n    }\n    get length() {\n      return this._length;\n    }\n    set length(e) {\n      if (e > this._length) for (let i5 = this._length; i5 < e; i5++) this._array[i5] = void 0;\n      this._length = e;\n    }\n    get(e) {\n      return this._array[this._getCyclicIndex(e)];\n    }\n    set(e, i5) {\n      this._array[this._getCyclicIndex(e)] = i5;\n    }\n    push(e) {\n      this._array[this._getCyclicIndex(this._length)] = e, this._length === this._maxLength ? (this._startIndex = ++this._startIndex % this._maxLength, this.onTrimEmitter.fire(1)) : this._length++;\n    }\n    recycle() {\n      if (this._length !== this._maxLength) throw new Error("Can only recycle when the buffer is full");\n      return this._startIndex = ++this._startIndex % this._maxLength, this.onTrimEmitter.fire(1), this._array[this._getCyclicIndex(this._length - 1)];\n    }\n    get isFull() {\n      return this._length === this._maxLength;\n    }\n    pop() {\n      return this._array[this._getCyclicIndex(this._length-- - 1)];\n    }\n    splice(e, i5, ...r) {\n      if (i5) {\n        for (let s4 = e; s4 < this._length - i5; s4++) this._array[this._getCyclicIndex(s4)] = this._array[this._getCyclicIndex(s4 + i5)];\n        this._length -= i5, this.onDeleteEmitter.fire({ index: e, amount: i5 });\n      }\n      for (let s4 = this._length - 1; s4 >= e; s4--) this._array[this._getCyclicIndex(s4 + r.length)] = this._array[this._getCyclicIndex(s4)];\n      for (let s4 = 0; s4 < r.length; s4++) this._array[this._getCyclicIndex(e + s4)] = r[s4];\n      if (r.length && this.onInsertEmitter.fire({ index: e, amount: r.length }), this._length + r.length > this._maxLength) {\n        let s4 = this._length + r.length - this._maxLength;\n        this._startIndex += s4, this._length = this._maxLength, this.onTrimEmitter.fire(s4);\n      } else this._length += r.length;\n    }\n    trimStart(e) {\n      e > this._length && (e = this._length), this._startIndex += e, this._length -= e, this.onTrimEmitter.fire(e);\n    }\n    shiftElements(e, i5, r) {\n      if (!(i5 <= 0)) {\n        if (e < 0 || e >= this._length) throw new Error("start argument out of range");\n        if (e + r < 0) throw new Error("Cannot shift elements in list beyond index 0");\n        if (r > 0) {\n          for (let o2 = i5 - 1; o2 >= 0; o2--) this.set(e + o2 + r, this.get(e + o2));\n          let s4 = e + i5 + r - this._length;\n          if (s4 > 0) for (this._length += s4; this._length > this._maxLength; ) this._length--, this._startIndex++, this.onTrimEmitter.fire(1);\n        } else for (let s4 = 0; s4 < i5; s4++) this.set(e + s4 + r, this.get(e + s4));\n      }\n    }\n    _getCyclicIndex(e) {\n      return (this._startIndex + e) % this._maxLength;\n    }\n  };\n  var D6 = 3;\n  var U5 = Object.freeze(new fe2());\n  var sr2 = 0;\n  var gn = new N2();\n  var gs = 2;\n  var Re4 = class n8 {\n    constructor(t, e, i5 = false) {\n      this.isWrapped = i5;\n      this._combined = {};\n      this._extendedAttrs = {};\n      this._data = new Uint32Array(t * D6);\n      let r = e ?? N2.fromCharData([0, "", 1, 0]);\n      for (let s4 = 0; s4 < t; ++s4) this.setCell(s4, r);\n      this.length = t;\n    }\n    get(t) {\n      let e = this._data[t * D6 + 0], i5 = e & 2097151;\n      return [this._data[t * D6 + 1], e & 2097152 ? this._combined[t] : i5 ? ve2(i5) : "", e >> 22, e & 2097152 ? this._combined[t].charCodeAt(this._combined[t].length - 1) : i5];\n    }\n    set(t, e) {\n      this._data[t * D6 + 1] = e[0], e[1].length > 1 ? (this._combined[t] = e[1], this._data[t * D6 + 0] = t | 2097152 | e[2] << 22) : this._data[t * D6 + 0] = e[1].charCodeAt(0) | e[2] << 22;\n    }\n    getWidth(t) {\n      return this._data[t * D6 + 0] >> 22;\n    }\n    hasWidth(t) {\n      return this._data[t * D6 + 0] & 12582912;\n    }\n    getFg(t) {\n      return this._data[t * D6 + 1];\n    }\n    getBg(t) {\n      return this._data[t * D6 + 2];\n    }\n    hasContent(t) {\n      return this._data[t * D6 + 0] & 4194303;\n    }\n    getCodePoint(t) {\n      let e = this._data[t * D6 + 0];\n      return e & 2097152 ? this._combined[t].charCodeAt(this._combined[t].length - 1) : e & 2097151;\n    }\n    isCombined(t) {\n      return this._data[t * D6 + 0] & 2097152;\n    }\n    getString(t) {\n      let e = this._data[t * D6 + 0];\n      return e & 2097152 ? this._combined[t] : e & 2097151 ? ve2(e & 2097151) : "";\n    }\n    isProtected(t) {\n      return this._data[t * D6 + 2] & 536870912;\n    }\n    loadCell(t, e) {\n      return sr2 = t * D6, e.content = this._data[sr2 + 0], e.fg = this._data[sr2 + 1], e.bg = this._data[sr2 + 2], e.content & 2097152 && (e.combinedData = this._combined[t]), e.bg & 268435456 && (e.extended = this._extendedAttrs[t]), e;\n    }\n    setCell(t, e) {\n      e.content & 2097152 && (this._combined[t] = e.combinedData), e.bg & 268435456 && (this._extendedAttrs[t] = e.extended), this._data[t * D6 + 0] = e.content, this._data[t * D6 + 1] = e.fg, this._data[t * D6 + 2] = e.bg;\n    }\n    setCellFromCodepoint(t, e, i5, r) {\n      r.bg & 268435456 && (this._extendedAttrs[t] = r.extended), this._data[t * D6 + 0] = e | i5 << 22, this._data[t * D6 + 1] = r.fg, this._data[t * D6 + 2] = r.bg;\n    }\n    addCodepointToCell(t, e, i5) {\n      let r = this._data[t * D6 + 0];\n      r & 2097152 ? this._combined[t] += ve2(e) : r & 2097151 ? (this._combined[t] = ve2(r & 2097151) + ve2(e), r &= -2097152, r |= 2097152) : r = e | 1 << 22, i5 && (r &= -12582913, r |= i5 << 22), this._data[t * D6 + 0] = r;\n    }\n    insertCells(t, e, i5) {\n      if (t %= this.length, t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length - t) {\n        for (let r = this.length - t - e - 1; r >= 0; --r) this.setCell(t + e + r, this.loadCell(t + r, gn));\n        for (let r = 0; r < e; ++r) this.setCell(t + r, i5);\n      } else for (let r = t; r < this.length; ++r) this.setCell(r, i5);\n      this.getWidth(this.length - 1) === 2 && this.setCellFromCodepoint(this.length - 1, 0, 1, i5);\n    }\n    deleteCells(t, e, i5) {\n      if (t %= this.length, e < this.length - t) {\n        for (let r = 0; r < this.length - t - e; ++r) this.setCell(t + r, this.loadCell(t + e + r, gn));\n        for (let r = this.length - e; r < this.length; ++r) this.setCell(r, i5);\n      } else for (let r = t; r < this.length; ++r) this.setCell(r, i5);\n      t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), this.getWidth(t) === 0 && !this.hasContent(t) && this.setCellFromCodepoint(t, 0, 1, i5);\n    }\n    replaceCells(t, e, i5, r = false) {\n      if (r) {\n        for (t && this.getWidth(t - 1) === 2 && !this.isProtected(t - 1) && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length && this.getWidth(e - 1) === 2 && !this.isProtected(e) && this.setCellFromCodepoint(e, 0, 1, i5); t < e && t < this.length; ) this.isProtected(t) || this.setCell(t, i5), t++;\n        return;\n      }\n      for (t && this.getWidth(t - 1) === 2 && this.setCellFromCodepoint(t - 1, 0, 1, i5), e < this.length && this.getWidth(e - 1) === 2 && this.setCellFromCodepoint(e, 0, 1, i5); t < e && t < this.length; ) this.setCell(t++, i5);\n    }\n    resize(t, e) {\n      if (t === this.length) return this._data.length * 4 * gs < this._data.buffer.byteLength;\n      let i5 = t * D6;\n      if (t > this.length) {\n        if (this._data.buffer.byteLength >= i5 * 4) this._data = new Uint32Array(this._data.buffer, 0, i5);\n        else {\n          let r = new Uint32Array(i5);\n          r.set(this._data), this._data = r;\n        }\n        for (let r = this.length; r < t; ++r) this.setCell(r, e);\n      } else {\n        this._data = this._data.subarray(0, i5);\n        let r = Object.keys(this._combined);\n        for (let o2 = 0; o2 < r.length; o2++) {\n          let a2 = parseInt(r[o2], 10);\n          a2 >= t && delete this._combined[a2];\n        }\n        let s4 = Object.keys(this._extendedAttrs);\n        for (let o2 = 0; o2 < s4.length; o2++) {\n          let a2 = parseInt(s4[o2], 10);\n          a2 >= t && delete this._extendedAttrs[a2];\n        }\n      }\n      return this.length = t, i5 * 4 * gs < this._data.buffer.byteLength;\n    }\n    cleanupMemory() {\n      if (this._data.length * 4 * gs < this._data.buffer.byteLength) {\n        let t = new Uint32Array(this._data.length);\n        return t.set(this._data), this._data = t, 1;\n      }\n      return 0;\n    }\n    fill(t, e = false) {\n      if (e) {\n        for (let i5 = 0; i5 < this.length; ++i5) this.isProtected(i5) || this.setCell(i5, t);\n        return;\n      }\n      this._combined = {}, this._extendedAttrs = {};\n      for (let i5 = 0; i5 < this.length; ++i5) this.setCell(i5, t);\n    }\n    copyFrom(t) {\n      this.length !== t.length ? this._data = new Uint32Array(t._data) : this._data.set(t._data), this.length = t.length, this._combined = {};\n      for (let e in t._combined) this._combined[e] = t._combined[e];\n      this._extendedAttrs = {};\n      for (let e in t._extendedAttrs) this._extendedAttrs[e] = t._extendedAttrs[e];\n      this.isWrapped = t.isWrapped;\n    }\n    clone() {\n      let t = new n8(0);\n      t._data = new Uint32Array(this._data), t.length = this.length;\n      for (let e in this._combined) t._combined[e] = this._combined[e];\n      for (let e in this._extendedAttrs) t._extendedAttrs[e] = this._extendedAttrs[e];\n      return t.isWrapped = this.isWrapped, t;\n    }\n    getTrimmedLength() {\n      for (let t = this.length - 1; t >= 0; --t) if (this._data[t * D6 + 0] & 4194303) return t + (this._data[t * D6 + 0] >> 22);\n      return 0;\n    }\n    getNoBgTrimmedLength() {\n      for (let t = this.length - 1; t >= 0; --t) if (this._data[t * D6 + 0] & 4194303 || this._data[t * D6 + 2] & 50331648) return t + (this._data[t * D6 + 0] >> 22);\n      return 0;\n    }\n    copyCellsFrom(t, e, i5, r, s4) {\n      let o2 = t._data;\n      if (s4) for (let l4 = r - 1; l4 >= 0; l4--) {\n        for (let h3 = 0; h3 < D6; h3++) this._data[(i5 + l4) * D6 + h3] = o2[(e + l4) * D6 + h3];\n        o2[(e + l4) * D6 + 2] & 268435456 && (this._extendedAttrs[i5 + l4] = t._extendedAttrs[e + l4]);\n      }\n      else for (let l4 = 0; l4 < r; l4++) {\n        for (let h3 = 0; h3 < D6; h3++) this._data[(i5 + l4) * D6 + h3] = o2[(e + l4) * D6 + h3];\n        o2[(e + l4) * D6 + 2] & 268435456 && (this._extendedAttrs[i5 + l4] = t._extendedAttrs[e + l4]);\n      }\n      let a2 = Object.keys(t._combined);\n      for (let l4 = 0; l4 < a2.length; l4++) {\n        let h3 = parseInt(a2[l4], 10);\n        h3 >= e && (this._combined[h3 - e + i5] = t._combined[h3]);\n      }\n    }\n    translateToString(t, e, i5, r) {\n      e = e ?? 0, i5 = i5 ?? this.length, t && (i5 = Math.min(i5, this.getTrimmedLength())), r && (r.length = 0);\n      let s4 = "";\n      for (; e < i5; ) {\n        let o2 = this._data[e * D6 + 0], a2 = o2 & 2097151, l4 = o2 & 2097152 ? this._combined[e] : a2 ? ve2(a2) : " ";\n        if (s4 += l4, r) for (let h3 = 0; h3 < l4.length; ++h3) r.push(e);\n        e += o2 >> 22 || 1;\n      }\n      return r && r.push(e), s4;\n    }\n  };\n  function In(n11, t, e, i5, r, s4) {\n    let o2 = [];\n    for (let a2 = 0; a2 < n11.length - 1; a2++) {\n      let l4 = a2, h3 = n11.get(++l4);\n      if (!h3.isWrapped) continue;\n      let d3 = [n11.get(a2)];\n      for (; l4 < n11.length && h3.isWrapped; ) d3.push(h3), h3 = n11.get(++l4);\n      if (!s4 && i5 >= a2 && i5 < l4) {\n        a2 += d3.length - 1;\n        continue;\n      }\n      let c2 = 0, u3 = Rt2(d3, c2, t), _5 = 1, p3 = 0;\n      for (; _5 < d3.length; ) {\n        let f5 = Rt2(d3, _5, t), S4 = f5 - p3, I4 = e - u3, w6 = Math.min(S4, I4);\n        d3[c2].copyCellsFrom(d3[_5], p3, u3, w6, false), u3 += w6, u3 === e && (c2++, u3 = 0), p3 += w6, p3 === f5 && (_5++, p3 = 0), u3 === 0 && c2 !== 0 && d3[c2 - 1].getWidth(e - 1) === 2 && (d3[c2].copyCellsFrom(d3[c2 - 1], e - 1, u3++, 1, false), d3[c2 - 1].setCell(e - 1, r));\n      }\n      d3[c2].replaceCells(u3, e, r);\n      let b4 = 0;\n      for (let f5 = d3.length - 1; f5 > 0 && (f5 > c2 || d3[f5].getTrimmedLength() === 0); f5--) b4++;\n      b4 > 0 && (o2.push(a2 + d3.length - b4), o2.push(b4)), a2 += d3.length - 1;\n    }\n    return o2;\n  }\n  function Cn(n11, t) {\n    let e = [], i5 = 0, r = t[i5], s4 = 0;\n    for (let o2 = 0; o2 < n11.length; o2++) if (r === o2) {\n      let a2 = t[++i5];\n      n11.onDeleteEmitter.fire({ index: o2 - s4, amount: a2 }), o2 += a2 - 1, s4 += a2, r = t[++i5];\n    } else e.push(o2);\n    return { layout: e, countRemoved: s4 };\n  }\n  function En(n11, t) {\n    let e = [];\n    for (let i5 = 0; i5 < t.length; i5++) e.push(n11.get(t[i5]));\n    for (let i5 = 0; i5 < e.length; i5++) n11.set(i5, e[i5]);\n    n11.length = t.length;\n  }\n  function yn(n11, t, e) {\n    let i5 = [], r = n11.map((l4, h3) => Rt2(n11, h3, t)).reduce((l4, h3) => l4 + h3), s4 = 0, o2 = 0, a2 = 0;\n    for (; a2 < r; ) {\n      if (r - a2 < e) {\n        i5.push(r - a2);\n        break;\n      }\n      s4 += e;\n      let l4 = Rt2(n11, o2, t);\n      s4 > l4 && (s4 -= l4, o2++);\n      let h3 = n11[o2].getWidth(s4 - 1) === 2;\n      h3 && s4--;\n      let d3 = h3 ? e - 1 : e;\n      i5.push(d3), a2 += d3;\n    }\n    return i5;\n  }\n  function Rt2(n11, t, e) {\n    if (t === n11.length - 1) return n11[t].getTrimmedLength();\n    let i5 = !n11[t].hasContent(e - 1) && n11[t].getWidth(e - 1) === 1, r = n11[t + 1].getWidth(0) === 2;\n    return i5 && r ? e - 1 : e;\n  }\n  var or = class or2 {\n    constructor(t) {\n      this.line = t;\n      this.isDisposed = false;\n      this._disposables = [];\n      this._id = or2._nextId++;\n      this._onDispose = this.register(new v5());\n      this.onDispose = this._onDispose.event;\n    }\n    get id() {\n      return this._id;\n    }\n    dispose() {\n      this.isDisposed || (this.isDisposed = true, this.line = -1, this._onDispose.fire(), Oe2(this._disposables), this._disposables.length = 0);\n    }\n    register(t) {\n      return this._disposables.push(t), t;\n    }\n  };\n  or._nextId = 1;\n  var nr = or;\n  var V4 = {};\n  var Le2 = V4.B;\n  V4[0] = { "`": "\\u25C6", a: "\\u2592", b: "\\u2409", c: "\\u240C", d: "\\u240D", e: "\\u240A", f: "\\xB0", g: "\\xB1", h: "\\u2424", i: "\\u240B", j: "\\u2518", k: "\\u2510", l: "\\u250C", m: "\\u2514", n: "\\u253C", o: "\\u23BA", p: "\\u23BB", q: "\\u2500", r: "\\u23BC", s: "\\u23BD", t: "\\u251C", u: "\\u2524", v: "\\u2534", w: "\\u252C", x: "\\u2502", y: "\\u2264", z: "\\u2265", "{": "\\u03C0", "|": "\\u2260", "}": "\\xA3", "~": "\\xB7" };\n  V4.A = { "#": "\\xA3" };\n  V4.B = void 0;\n  V4[4] = { "#": "\\xA3", "@": "\\xBE", "[": "ij", "\\\\": "\\xBD", "]": "|", "{": "\\xA8", "|": "f", "}": "\\xBC", "~": "\\xB4" };\n  V4.C = V4[5] = { "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xC5", "^": "\\xDC", "`": "\\xE9", "{": "\\xE4", "|": "\\xF6", "}": "\\xE5", "~": "\\xFC" };\n  V4.R = { "#": "\\xA3", "@": "\\xE0", "[": "\\xB0", "\\\\": "\\xE7", "]": "\\xA7", "{": "\\xE9", "|": "\\xF9", "}": "\\xE8", "~": "\\xA8" };\n  V4.Q = { "@": "\\xE0", "[": "\\xE2", "\\\\": "\\xE7", "]": "\\xEA", "^": "\\xEE", "`": "\\xF4", "{": "\\xE9", "|": "\\xF9", "}": "\\xE8", "~": "\\xFB" };\n  V4.K = { "@": "\\xA7", "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xDC", "{": "\\xE4", "|": "\\xF6", "}": "\\xFC", "~": "\\xDF" };\n  V4.Y = { "#": "\\xA3", "@": "\\xA7", "[": "\\xB0", "\\\\": "\\xE7", "]": "\\xE9", "`": "\\xF9", "{": "\\xE0", "|": "\\xF2", "}": "\\xE8", "~": "\\xEC" };\n  V4.E = V4[6] = { "@": "\\xC4", "[": "\\xC6", "\\\\": "\\xD8", "]": "\\xC5", "^": "\\xDC", "`": "\\xE4", "{": "\\xE6", "|": "\\xF8", "}": "\\xE5", "~": "\\xFC" };\n  V4.Z = { "#": "\\xA3", "@": "\\xA7", "[": "\\xA1", "\\\\": "\\xD1", "]": "\\xBF", "{": "\\xB0", "|": "\\xF1", "}": "\\xE7" };\n  V4.H = V4[7] = { "@": "\\xC9", "[": "\\xC4", "\\\\": "\\xD6", "]": "\\xC5", "^": "\\xDC", "`": "\\xE9", "{": "\\xE4", "|": "\\xF6", "}": "\\xE5", "~": "\\xFC" };\n  V4["="] = { "#": "\\xF9", "@": "\\xE0", "[": "\\xE9", "\\\\": "\\xE7", "]": "\\xEA", "^": "\\xEE", _: "\\xE8", "`": "\\xF4", "{": "\\xE4", "|": "\\xF6", "}": "\\xFC", "~": "\\xFB" };\n  var xn = 4294967295;\n  var oi = class {\n    constructor(t, e, i5, r) {\n      this._hasScrollback = t;\n      this._optionsService = e;\n      this._bufferService = i5;\n      this._logService = r;\n      this.ydisp = 0;\n      this.ybase = 0;\n      this.y = 0;\n      this.x = 0;\n      this.tabs = {};\n      this.savedY = 0;\n      this.savedX = 0;\n      this.savedCurAttrData = U5.clone();\n      this.savedCharset = Le2;\n      this.savedCharsets = [];\n      this.savedGlevel = 0;\n      this.savedOriginMode = false;\n      this.savedWraparoundMode = true;\n      this.markers = [];\n      this._nullCell = N2.fromCharData([0, "", 1, 0]);\n      this._whitespaceCell = N2.fromCharData([0, " ", 1, 32]);\n      this._isClearing = false;\n      this._memoryCleanupPosition = 0;\n      this._cols = this._bufferService.cols, this._rows = this._bufferService.rows, this.lines = new si(this._getCorrectBufferLength(this._rows)), this.scrollTop = 0, this.scrollBottom = this._rows - 1, this.setupTabStops(), this._memoryCleanupQueue = new Et2(this._logService);\n    }\n    getNullCell(t) {\n      return t ? (this._nullCell.fg = t.fg, this._nullCell.bg = t.bg, this._nullCell.extended = t.extended) : (this._nullCell.fg = 0, this._nullCell.bg = 0, this._nullCell.extended = new Pe2()), this._nullCell;\n    }\n    getWhitespaceCell(t) {\n      return t ? (this._whitespaceCell.fg = t.fg, this._whitespaceCell.bg = t.bg, this._whitespaceCell.extended = t.extended) : (this._whitespaceCell.fg = 0, this._whitespaceCell.bg = 0, this._whitespaceCell.extended = new Pe2()), this._whitespaceCell;\n    }\n    getBlankLine(t, e) {\n      return new Re4(this._bufferService.cols, this.getNullCell(t), e);\n    }\n    get hasScrollback() {\n      return this._hasScrollback && this.lines.maxLength > this._rows;\n    }\n    get isCursorInViewport() {\n      let e = this.ybase + this.y - this.ydisp;\n      return e >= 0 && e < this._rows;\n    }\n    _getCorrectBufferLength(t) {\n      if (!this._hasScrollback) return t;\n      let e = t + this._optionsService.rawOptions.scrollback;\n      return e > xn ? xn : e;\n    }\n    fillViewportRows(t) {\n      if (this.lines.length === 0) {\n        t ??= U5;\n        let e = this._rows;\n        for (; e--; ) this.lines.push(this.getBlankLine(t));\n      }\n    }\n    clear() {\n      this.ydisp = 0, this.ybase = 0, this.y = 0, this.x = 0, this.lines = new si(this._getCorrectBufferLength(this._rows)), this.scrollTop = 0, this.scrollBottom = this._rows - 1, this.setupTabStops();\n    }\n    resize(t, e) {\n      let i5 = this.getNullCell(U5), r = 0, s4 = this._getCorrectBufferLength(e);\n      if (s4 > this.lines.maxLength && (this.lines.maxLength = s4), this.lines.length > 0) {\n        if (this._cols < t) for (let a2 = 0; a2 < this.lines.length; a2++) r += +this.lines.get(a2).resize(t, i5);\n        let o2 = 0;\n        if (this._rows < e) for (let a2 = this._rows; a2 < e; a2++) this.lines.length < e + this.ybase && (this._optionsService.rawOptions.windowsPty.backend !== void 0 || this._optionsService.rawOptions.windowsPty.buildNumber !== void 0 ? this.lines.push(new Re4(t, i5)) : this.ybase > 0 && this.lines.length <= this.ybase + this.y + o2 + 1 ? (this.ybase--, o2++, this.ydisp > 0 && this.ydisp--) : this.lines.push(new Re4(t, i5)));\n        else for (let a2 = this._rows; a2 > e; a2--) this.lines.length > e + this.ybase && (this.lines.length > this.ybase + this.y + 1 ? this.lines.pop() : (this.ybase++, this.ydisp++));\n        if (s4 < this.lines.maxLength) {\n          let a2 = this.lines.length - s4;\n          a2 > 0 && (this.lines.trimStart(a2), this.ybase = Math.max(this.ybase - a2, 0), this.ydisp = Math.max(this.ydisp - a2, 0), this.savedY = Math.max(this.savedY - a2, 0)), this.lines.maxLength = s4;\n        }\n        this.x = Math.min(this.x, t - 1), this.y = Math.min(this.y, e - 1), o2 && (this.y += o2), this.savedX = Math.min(this.savedX, t - 1), this.scrollTop = 0;\n      }\n      if (this.scrollBottom = e - 1, this._isReflowEnabled && (this._reflow(t, e), this._cols > t)) for (let o2 = 0; o2 < this.lines.length; o2++) r += +this.lines.get(o2).resize(t, i5);\n      if (this._cols = t, this._rows = e, this.lines.length > 0) {\n        let o2 = Math.max(0, this.lines.length - this.ybase - 1);\n        this.y = Math.min(this.y, o2);\n      }\n      this._memoryCleanupQueue.clear(), r > 0.1 * this.lines.length && (this._memoryCleanupPosition = 0, this._memoryCleanupQueue.enqueue(() => this._batchedMemoryCleanup()));\n    }\n    _batchedMemoryCleanup() {\n      let t = true;\n      this._memoryCleanupPosition >= this.lines.length && (this._memoryCleanupPosition = 0, t = false);\n      let e = 0;\n      for (; this._memoryCleanupPosition < this.lines.length; ) if (e += this.lines.get(this._memoryCleanupPosition++).cleanupMemory(), e > 100) return true;\n      return t;\n    }\n    get _isReflowEnabled() {\n      let t = this._optionsService.rawOptions.windowsPty;\n      return t && t.buildNumber ? this._hasScrollback && t.backend === "conpty" && t.buildNumber >= 21376 : this._hasScrollback;\n    }\n    _reflow(t, e) {\n      this._cols !== t && (t > this._cols ? this._reflowLarger(t, e) : this._reflowSmaller(t, e));\n    }\n    _reflowLarger(t, e) {\n      let i5 = this._optionsService.rawOptions.reflowCursorLine, r = In(this.lines, this._cols, t, this.ybase + this.y, this.getNullCell(U5), i5);\n      if (r.length > 0) {\n        let s4 = Cn(this.lines, r);\n        En(this.lines, s4.layout), this._reflowLargerAdjustViewport(t, e, s4.countRemoved);\n      }\n    }\n    _reflowLargerAdjustViewport(t, e, i5) {\n      let r = this.getNullCell(U5), s4 = i5;\n      for (; s4-- > 0; ) this.ybase === 0 ? (this.y > 0 && this.y--, this.lines.length < e && this.lines.push(new Re4(t, r))) : (this.ydisp === this.ybase && this.ydisp--, this.ybase--);\n      this.savedY = Math.max(this.savedY - i5, 0);\n    }\n    _reflowSmaller(t, e) {\n      let i5 = this._optionsService.rawOptions.reflowCursorLine, r = this.getNullCell(U5), s4 = [], o2 = 0;\n      for (let a2 = this.lines.length - 1; a2 >= 0; a2--) {\n        let l4 = this.lines.get(a2);\n        if (!l4 || !l4.isWrapped && l4.getTrimmedLength() <= t) continue;\n        let h3 = [l4];\n        for (; l4.isWrapped && a2 > 0; ) l4 = this.lines.get(--a2), h3.unshift(l4);\n        if (!i5) {\n          let x5 = this.ybase + this.y;\n          if (x5 >= a2 && x5 < a2 + h3.length) continue;\n        }\n        let d3 = h3[h3.length - 1].getTrimmedLength(), c2 = yn(h3, this._cols, t), u3 = c2.length - h3.length, _5;\n        this.ybase === 0 && this.y !== this.lines.length - 1 ? _5 = Math.max(0, this.y - this.lines.maxLength + u3) : _5 = Math.max(0, this.lines.length - this.lines.maxLength + u3);\n        let p3 = [];\n        for (let x5 = 0; x5 < u3; x5++) {\n          let ie4 = this.getBlankLine(U5, true);\n          p3.push(ie4);\n        }\n        p3.length > 0 && (s4.push({ start: a2 + h3.length + o2, newLines: p3 }), o2 += p3.length), h3.push(...p3);\n        let b4 = c2.length - 1, f5 = c2[b4];\n        f5 === 0 && (b4--, f5 = c2[b4]);\n        let S4 = h3.length - u3 - 1, I4 = d3;\n        for (; S4 >= 0; ) {\n          let x5 = Math.min(I4, f5);\n          if (h3[b4] === void 0) break;\n          if (h3[b4].copyCellsFrom(h3[S4], I4 - x5, f5 - x5, x5, true), f5 -= x5, f5 === 0 && (b4--, f5 = c2[b4]), I4 -= x5, I4 === 0) {\n            S4--;\n            let ie4 = Math.max(S4, 0);\n            I4 = Rt2(h3, ie4, this._cols);\n          }\n        }\n        for (let x5 = 0; x5 < h3.length; x5++) c2[x5] < t && h3[x5].setCell(c2[x5], r);\n        let w6 = u3 - _5;\n        for (; w6-- > 0; ) this.ybase === 0 ? this.y < e - 1 ? (this.y++, this.lines.pop()) : (this.ybase++, this.ydisp++) : this.ybase < Math.min(this.lines.maxLength, this.lines.length + o2) - e && (this.ybase === this.ydisp && this.ydisp++, this.ybase++);\n        this.savedY = Math.min(this.savedY + u3, this.ybase + e - 1);\n      }\n      if (s4.length > 0) {\n        let a2 = [], l4 = [];\n        for (let f5 = 0; f5 < this.lines.length; f5++) l4.push(this.lines.get(f5));\n        let h3 = this.lines.length, d3 = h3 - 1, c2 = 0, u3 = s4[c2];\n        this.lines.length = Math.min(this.lines.maxLength, this.lines.length + o2);\n        let _5 = 0;\n        for (let f5 = Math.min(this.lines.maxLength - 1, h3 + o2 - 1); f5 >= 0; f5--) if (u3 && u3.start > d3 + _5) {\n          for (let S4 = u3.newLines.length - 1; S4 >= 0; S4--) this.lines.set(f5--, u3.newLines[S4]);\n          f5++, a2.push({ index: d3 + 1, amount: u3.newLines.length }), _5 += u3.newLines.length, u3 = s4[++c2];\n        } else this.lines.set(f5, l4[d3--]);\n        let p3 = 0;\n        for (let f5 = a2.length - 1; f5 >= 0; f5--) a2[f5].index += p3, this.lines.onInsertEmitter.fire(a2[f5]), p3 += a2[f5].amount;\n        let b4 = Math.max(0, h3 + o2 - this.lines.maxLength);\n        b4 > 0 && this.lines.onTrimEmitter.fire(b4);\n      }\n    }\n    translateBufferLineToString(t, e, i5 = 0, r) {\n      let s4 = this.lines.get(t);\n      return s4 ? s4.translateToString(e, i5, r) : "";\n    }\n    getWrappedRangeForLine(t) {\n      let e = t, i5 = t;\n      for (; e > 0 && this.lines.get(e).isWrapped; ) e--;\n      for (; i5 + 1 < this.lines.length && this.lines.get(i5 + 1).isWrapped; ) i5++;\n      return { first: e, last: i5 };\n    }\n    setupTabStops(t) {\n      for (t != null ? this.tabs[t] || (t = this.prevStop(t)) : (this.tabs = {}, t = 0); t < this._cols; t += this._optionsService.rawOptions.tabStopWidth) this.tabs[t] = true;\n    }\n    prevStop(t) {\n      for (t ??= this.x; !this.tabs[--t] && t > 0; ) ;\n      return t >= this._cols ? this._cols - 1 : t < 0 ? 0 : t;\n    }\n    nextStop(t) {\n      for (t ??= this.x; !this.tabs[++t] && t < this._cols; ) ;\n      return t >= this._cols ? this._cols - 1 : t < 0 ? 0 : t;\n    }\n    clearMarkers(t) {\n      this._isClearing = true;\n      for (let e = 0; e < this.markers.length; e++) this.markers[e].line === t && (this.markers[e].dispose(), this.markers.splice(e--, 1));\n      this._isClearing = false;\n    }\n    clearAllMarkers() {\n      this._isClearing = true;\n      for (let t = 0; t < this.markers.length; t++) this.markers[t].dispose();\n      this.markers.length = 0, this._isClearing = false;\n    }\n    addMarker(t) {\n      let e = new nr(t);\n      return this.markers.push(e), e.register(this.lines.onTrim((i5) => {\n        e.line -= i5, e.line < 0 && e.dispose();\n      })), e.register(this.lines.onInsert((i5) => {\n        e.line >= i5.index && (e.line += i5.amount);\n      })), e.register(this.lines.onDelete((i5) => {\n        e.line >= i5.index && e.line < i5.index + i5.amount && e.dispose(), e.line > i5.index && (e.line -= i5.amount);\n      })), e.register(e.onDispose(() => this._removeMarker(e))), e;\n    }\n    _removeMarker(t) {\n      this._isClearing || this.markers.splice(this.markers.indexOf(t), 1);\n    }\n  };\n  var ar2 = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._optionsService = e;\n      this._bufferService = i5;\n      this._logService = r;\n      this._onBufferActivate = this._register(new v5());\n      this.onBufferActivate = this._onBufferActivate.event;\n      this.reset(), this._register(this._optionsService.onSpecificOptionChange("scrollback", () => this.resize(this._bufferService.cols, this._bufferService.rows))), this._register(this._optionsService.onSpecificOptionChange("tabStopWidth", () => this.setupTabStops()));\n    }\n    reset() {\n      this._normal = new oi(true, this._optionsService, this._bufferService, this._logService), this._normal.fillViewportRows(), this._alt = new oi(false, this._optionsService, this._bufferService, this._logService), this._activeBuffer = this._normal, this._onBufferActivate.fire({ activeBuffer: this._normal, inactiveBuffer: this._alt }), this.setupTabStops();\n    }\n    get alt() {\n      return this._alt;\n    }\n    get active() {\n      return this._activeBuffer;\n    }\n    get normal() {\n      return this._normal;\n    }\n    activateNormalBuffer() {\n      this._activeBuffer !== this._normal && (this._normal.x = this._alt.x, this._normal.y = this._alt.y, this._alt.clearAllMarkers(), this._alt.clear(), this._activeBuffer = this._normal, this._onBufferActivate.fire({ activeBuffer: this._normal, inactiveBuffer: this._alt }));\n    }\n    activateAltBuffer(e) {\n      this._activeBuffer !== this._alt && (this._alt.fillViewportRows(e), this._alt.x = this._normal.x, this._alt.y = this._normal.y, this._activeBuffer = this._alt, this._onBufferActivate.fire({ activeBuffer: this._alt, inactiveBuffer: this._normal }));\n    }\n    resize(e, i5) {\n      this._normal.resize(e, i5), this._alt.resize(e, i5), this.setupTabStops(e);\n    }\n    setupTabStops(e) {\n      this._normal.setupTabStops(e), this._alt.setupTabStops(e);\n    }\n  };\n  var Es = 2;\n  var ys = 1;\n  var Lt2 = class extends g5 {\n    constructor(e, i5) {\n      super();\n      this.isUserScrolling = false;\n      this._onResize = this._register(new v5());\n      this.onResize = this._onResize.event;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this.cols = Math.max(e.rawOptions.cols || 0, Es), this.rows = Math.max(e.rawOptions.rows || 0, ys), this.buffers = this._register(new ar2(e, this, i5)), this._register(this.buffers.onBufferActivate((r) => {\n        this._onScroll.fire(r.activeBuffer.ydisp);\n      }));\n    }\n    get buffer() {\n      return this.buffers.active;\n    }\n    resize(e, i5) {\n      let r = this.cols !== e, s4 = this.rows !== i5;\n      this.cols = e, this.rows = i5, this.buffers.resize(e, i5), this._onResize.fire({ cols: e, rows: i5, colsChanged: r, rowsChanged: s4 });\n    }\n    reset() {\n      this.buffers.reset(), this.isUserScrolling = false;\n    }\n    scroll(e, i5 = false) {\n      let r = this.buffer, s4;\n      s4 = this._cachedBlankLine, (!s4 || s4.length !== this.cols || s4.getFg(0) !== e.fg || s4.getBg(0) !== e.bg) && (s4 = r.getBlankLine(e, i5), this._cachedBlankLine = s4), s4.isWrapped = i5;\n      let o2 = r.ybase + r.scrollTop, a2 = r.ybase + r.scrollBottom;\n      if (r.scrollTop === 0) {\n        let l4 = r.lines.isFull;\n        a2 === r.lines.length - 1 ? l4 ? r.lines.recycle().copyFrom(s4) : r.lines.push(s4.clone()) : r.lines.splice(a2 + 1, 0, s4.clone()), l4 ? this.isUserScrolling && (r.ydisp = Math.max(r.ydisp - 1, 0)) : (r.ybase++, this.isUserScrolling || r.ydisp++);\n      } else {\n        let l4 = a2 - o2 + 1;\n        r.lines.shiftElements(o2 + 1, l4 - 1, -1), r.lines.set(a2, s4.clone());\n      }\n      this.isUserScrolling || (r.ydisp = r.ybase), this._onScroll.fire(r.ydisp);\n    }\n    scrollLines(e, i5) {\n      let r = this.buffer;\n      if (e < 0) {\n        if (r.ydisp === 0) return;\n        this.isUserScrolling = true;\n      } else e + r.ydisp >= r.ybase && (this.isUserScrolling = false);\n      let s4 = r.ydisp;\n      r.ydisp = Math.max(Math.min(r.ydisp + e, r.ybase), 0), s4 !== r.ydisp && (i5 || this._onScroll.fire(r.ydisp));\n    }\n  };\n  Lt2 = E4([m3(0, R3), m3(1, pe)], Lt2);\n  var At2 = { cols: 80, rows: 24, showCursorImmediately: false, cursorBlink: false, blinkIntervalDuration: 0, cursorStyle: "block", cursorWidth: 1, cursorInactiveStyle: "outline", drawBoldTextInBrightColors: true, documentOverride: null, fastScrollSensitivity: 5, fontFamily: "monospace", fontSize: 15, fontWeight: "normal", fontWeightBold: "bold", ignoreBracketedPasteMode: false, lineHeight: 1, letterSpacing: 0, linkHandler: null, logLevel: "info", logger: null, scrollback: 1e3, scrollbar: { showScrollbar: true }, scrollOnEraseInDisplay: false, scrollOnUserInput: true, scrollSensitivity: 1, screenReaderMode: false, smoothScrollDuration: 0, macOptionIsMeta: false, macOptionClickForcesSelection: false, minimumContrastRatio: 1, disableStdin: false, allowProposedApi: false, allowTransparency: false, tabStopWidth: 8, theme: {}, reflowCursorLine: false, rescaleOverlappingGlyphs: false, rightClickSelectsWord: ee3, windowOptions: {}, windowsPty: {}, wordSeparator: " ()[]{}\',\\"`", altClickMovesCursor: true, convertEol: false, termName: "xterm", quirks: {}, vtExtensions: {} };\n  var Bo = ["normal", "bold", "100", "200", "300", "400", "500", "600", "700", "800", "900"];\n  var lr2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._onOptionChange = this._register(new v5());\n      this.onOptionChange = this._onOptionChange.event;\n      let i5 = { ...At2 };\n      for (let r in e) if (r in i5) try {\n        let s4 = e[r];\n        i5[r] = this._sanitizeAndValidateOption(r, s4);\n      } catch (s4) {\n        console.error(s4);\n      }\n      this.rawOptions = i5, this.options = { ...i5 }, this._setupOptions(), this._register(y4(() => {\n        this.rawOptions.linkHandler = null, this.rawOptions.documentOverride = null;\n      }));\n    }\n    onSpecificOptionChange(e, i5) {\n      return this.onOptionChange((r) => {\n        r === e && i5(this.rawOptions[e]);\n      });\n    }\n    onMultipleOptionChange(e, i5) {\n      return this.onOptionChange((r) => {\n        e.indexOf(r) !== -1 && i5();\n      });\n    }\n    _setupOptions() {\n      let e = (r) => {\n        if (!(r in At2)) throw new Error(`No option with key "${r}"`);\n        return this.rawOptions[r];\n      }, i5 = (r, s4) => {\n        if (!(r in At2)) throw new Error(`No option with key "${r}"`);\n        s4 = this._sanitizeAndValidateOption(r, s4), this.rawOptions[r] !== s4 && (this.rawOptions[r] = s4, this._onOptionChange.fire(r));\n      };\n      for (let r in this.rawOptions) {\n        let s4 = { get: e.bind(this, r), set: i5.bind(this, r) };\n        Object.defineProperty(this.options, r, s4);\n      }\n    }\n    _sanitizeAndValidateOption(e, i5) {\n      switch (e) {\n        case "cursorStyle":\n          if (i5 || (i5 = At2[e]), !Oo(i5)) throw new Error(`"${i5}" is not a valid value for ${e}`);\n          break;\n        case "wordSeparator":\n          i5 || (i5 = At2[e]);\n          break;\n        case "fontWeight":\n        case "fontWeightBold":\n          if (typeof i5 == "number" && 1 <= i5 && i5 <= 1e3) break;\n          i5 = Bo.includes(i5) ? i5 : At2[e];\n          break;\n        case "blinkIntervalDuration":\n          if (i5 = Math.floor(i5), i5 < 0) throw new Error(`${e} cannot be less than 0, value: ${i5}`);\n          break;\n        case "cursorWidth":\n          i5 = Math.floor(i5);\n        case "lineHeight":\n        case "tabStopWidth":\n          if (i5 < 1) throw new Error(`${e} cannot be less than 1, value: ${i5}`);\n          break;\n        case "minimumContrastRatio":\n          i5 = Math.max(1, Math.min(21, Math.round(i5 * 10) / 10));\n          break;\n        case "scrollback":\n          if (i5 = Math.min(i5, 4294967295), i5 < 0) throw new Error(`${e} cannot be less than 0, value: ${i5}`);\n          break;\n        case "fastScrollSensitivity":\n        case "scrollSensitivity":\n          if (i5 <= 0) throw new Error(`${e} cannot be less than or equal to 0, value: ${i5}`);\n          break;\n        case "rows":\n        case "cols":\n          if (!i5 && i5 !== 0) throw new Error(`${e} must be numeric, value: ${i5}`);\n          break;\n        case "windowsPty":\n          i5 = i5 ?? {};\n          break;\n      }\n      return i5;\n    }\n  };\n  function Oo(n11) {\n    return n11 === "block" || n11 === "underline" || n11 === "bar";\n  }\n  function kt(n11, t = 5) {\n    if (typeof n11 != "object") return n11;\n    let e = Array.isArray(n11) ? [] : {};\n    for (let i5 in n11) e[i5] = t <= 1 ? n11[i5] : n11[i5] && kt(n11[i5], t - 1);\n    return e;\n  }\n  var wn = Object.freeze({ insertMode: false });\n  var Tn = Object.freeze({ applicationCursorKeys: false, applicationKeypad: false, bracketedPasteMode: false, colorSchemeUpdates: false, cursorBlink: void 0, cursorStyle: void 0, origin: false, reverseWraparound: false, sendFocus: false, synchronizedOutput: false, win32InputMode: false, wraparound: true });\n  var Dn = () => ({ flags: 0, mainFlags: 0, altFlags: 0, mainStack: [], altStack: [] });\n  var Pt = class extends g5 {\n    constructor(e, i5, r) {\n      super();\n      this._bufferService = e;\n      this._logService = i5;\n      this._optionsService = r;\n      this.isCursorHidden = false;\n      this._onData = this._register(new v5());\n      this.onData = this._onData.event;\n      this._onUserInput = this._register(new v5());\n      this.onUserInput = this._onUserInput.event;\n      this._onBinary = this._register(new v5());\n      this.onBinary = this._onBinary.event;\n      this._onRequestScrollToBottom = this._register(new v5());\n      this.onRequestScrollToBottom = this._onRequestScrollToBottom.event;\n      this.isCursorInitialized = r.rawOptions.showCursorImmediately ?? false, this.modes = kt(wn), this.decPrivateModes = kt(Tn), this.kittyKeyboard = Dn();\n    }\n    reset() {\n      this.modes = kt(wn), this.decPrivateModes = kt(Tn), this.kittyKeyboard = Dn();\n    }\n    triggerDataEvent(e, i5 = false) {\n      if (this._optionsService.rawOptions.disableStdin) return;\n      let r = this._bufferService.buffer;\n      i5 && this._optionsService.rawOptions.scrollOnUserInput && r.ybase !== r.ydisp && this._onRequestScrollToBottom.fire(), i5 && this._onUserInput.fire(), this._logService.debug(`sending data "${e}"`), this._logService.trace("sending data (codes)", () => e.split("").map((s4) => s4.charCodeAt(0))), this._onData.fire(e);\n    }\n    triggerBinaryEvent(e) {\n      this._optionsService.rawOptions.disableStdin || (this._logService.debug(`sending binary "${e}"`), this._logService.trace("sending binary (codes)", () => e.split("").map((i5) => i5.charCodeAt(0))), this._onBinary.fire(e));\n    }\n  };\n  Pt = E4([m3(0, L5), m3(1, pe), m3(2, R3)], Pt);\n  var Rn = { NONE: { events: 0, restrict: () => false }, X10: { events: 1, restrict: (n11) => n11.button === 4 || n11.action !== 1 ? false : (n11.ctrl = false, n11.alt = false, n11.shift = false, true) }, VT200: { events: 19, restrict: (n11) => n11.action !== 32 }, DRAG: { events: 23, restrict: (n11) => !(n11.action === 32 && n11.button === 3) }, ANY: { events: 31, restrict: (n11) => true } };\n  function xs(n11, t) {\n    let e = (n11.ctrl ? 16 : 0) | (n11.shift ? 4 : 0) | (n11.alt ? 8 : 0);\n    return n11.button === 4 ? (e |= 64, e |= n11.action) : (e |= n11.button & 3, n11.button & 4 && (e |= 64), n11.button & 8 && (e |= 128), n11.action === 32 ? e |= 32 : n11.action === 0 && !t && (e |= 3)), e;\n  }\n  var ws = String.fromCharCode;\n  var Ln = { DEFAULT: (n11) => {\n    let t = [xs(n11, false) + 32, n11.col + 32, n11.row + 32];\n    return t[0] > 255 || t[1] > 255 || t[2] > 255 ? "" : `\\x1B[M${ws(t[0])}${ws(t[1])}${ws(t[2])}`;\n  }, SGR: (n11) => {\n    let t = n11.action === 0 && n11.button !== 4 ? "m" : "M";\n    return `\\x1B[<${xs(n11, true)};${n11.col};${n11.row}${t}`;\n  }, SGR_PIXELS: (n11) => {\n    let t = n11.action === 0 && n11.button !== 4 ? "m" : "M";\n    return `\\x1B[<${xs(n11, true)};${n11.x};${n11.y}${t}`;\n  } };\n  var cr = class extends g5 {\n    constructor() {\n      super();\n      this._protocols = {};\n      this._encodings = {};\n      this._activeProtocol = "";\n      this._activeEncoding = "";\n      this._onProtocolChange = this._register(new v5());\n      this.onProtocolChange = this._onProtocolChange.event;\n      for (let e of Object.keys(Rn)) this.addProtocol(e, Rn[e]);\n      for (let e of Object.keys(Ln)) this.addEncoding(e, Ln[e]);\n      this.reset();\n    }\n    addProtocol(e, i5) {\n      this._protocols[e] = i5;\n    }\n    addEncoding(e, i5) {\n      this._encodings[e] = i5;\n    }\n    get activeProtocol() {\n      return this._activeProtocol;\n    }\n    get areMouseEventsActive() {\n      return this._protocols[this._activeProtocol].events !== 0;\n    }\n    set activeProtocol(e) {\n      if (!this._protocols[e]) throw new Error(`unknown protocol "${e}"`);\n      this._activeProtocol = e, this._onProtocolChange.fire(this._protocols[e].events);\n    }\n    get activeEncoding() {\n      return this._activeEncoding;\n    }\n    set activeEncoding(e) {\n      if (!this._encodings[e]) throw new Error(`unknown encoding "${e}"`);\n      this._activeEncoding = e;\n    }\n    reset() {\n      this.activeProtocol = "NONE", this.activeEncoding = "DEFAULT";\n    }\n    setCustomWheelEventHandler(e) {\n      this._customWheelEventHandler = e;\n    }\n    allowCustomWheelEvent(e) {\n      return this._customWheelEventHandler ? this._customWheelEventHandler(e) !== false : true;\n    }\n    restrictMouseEvent(e) {\n      return this._protocols[this._activeProtocol].restrict(e);\n    }\n    encodeMouseEvent(e) {\n      return this._encodings[this._activeEncoding](e);\n    }\n    get isDefaultEncoding() {\n      return this._activeEncoding === "DEFAULT";\n    }\n    get isPixelEncoding() {\n      return this._activeEncoding === "SGR_PIXELS";\n    }\n  };\n  var Ts = [[768, 879], [1155, 1158], [1160, 1161], [1425, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1536, 1539], [1552, 1557], [1611, 1630], [1648, 1648], [1750, 1764], [1767, 1768], [1770, 1773], [1807, 1807], [1809, 1809], [1840, 1866], [1958, 1968], [2027, 2035], [2305, 2306], [2364, 2364], [2369, 2376], [2381, 2381], [2385, 2388], [2402, 2403], [2433, 2433], [2492, 2492], [2497, 2500], [2509, 2509], [2530, 2531], [2561, 2562], [2620, 2620], [2625, 2626], [2631, 2632], [2635, 2637], [2672, 2673], [2689, 2690], [2748, 2748], [2753, 2757], [2759, 2760], [2765, 2765], [2786, 2787], [2817, 2817], [2876, 2876], [2879, 2879], [2881, 2883], [2893, 2893], [2902, 2902], [2946, 2946], [3008, 3008], [3021, 3021], [3134, 3136], [3142, 3144], [3146, 3149], [3157, 3158], [3260, 3260], [3263, 3263], [3270, 3270], [3276, 3277], [3298, 3299], [3393, 3395], [3405, 3405], [3530, 3530], [3538, 3540], [3542, 3542], [3633, 3633], [3636, 3642], [3655, 3662], [3761, 3761], [3764, 3769], [3771, 3772], [3784, 3789], [3864, 3865], [3893, 3893], [3895, 3895], [3897, 3897], [3953, 3966], [3968, 3972], [3974, 3975], [3984, 3991], [3993, 4028], [4038, 4038], [4141, 4144], [4146, 4146], [4150, 4151], [4153, 4153], [4184, 4185], [4448, 4607], [4959, 4959], [5906, 5908], [5938, 5940], [5970, 5971], [6002, 6003], [6068, 6069], [6071, 6077], [6086, 6086], [6089, 6099], [6109, 6109], [6155, 6157], [6313, 6313], [6432, 6434], [6439, 6440], [6450, 6450], [6457, 6459], [6679, 6680], [6912, 6915], [6964, 6964], [6966, 6970], [6972, 6972], [6978, 6978], [7019, 7027], [7616, 7626], [7678, 7679], [8203, 8207], [8234, 8238], [8288, 8291], [8298, 8303], [8400, 8431], [12330, 12335], [12441, 12442], [43014, 43014], [43019, 43019], [43045, 43046], [64286, 64286], [65024, 65039], [65056, 65059], [65279, 65279], [65529, 65531]];\n  var No2 = [[68097, 68099], [68101, 68102], [68108, 68111], [68152, 68154], [68159, 68159], [119143, 119145], [119155, 119170], [119173, 119179], [119210, 119213], [119362, 119364], [917505, 917505], [917536, 917631], [917760, 917999]];\n  var q2;\n  function Fo(n11, t) {\n    let e = 0, i5 = t.length - 1, r;\n    if (n11 < t[0][0] || n11 > t[i5][1]) return false;\n    for (; i5 >= e; ) if (r = e + i5 >> 1, n11 > t[r][1]) e = r + 1;\n    else if (n11 < t[r][0]) i5 = r - 1;\n    else return true;\n    return false;\n  }\n  var hr = class {\n    constructor() {\n      this.version = "6";\n      if (!q2) {\n        q2 = new Uint8Array(65536), q2.fill(1), q2[0] = 0, q2.fill(0, 1, 32), q2.fill(0, 127, 160), q2.fill(2, 4352, 4448), q2[9001] = 2, q2[9002] = 2, q2.fill(2, 11904, 42192), q2[12351] = 1, q2.fill(2, 44032, 55204), q2.fill(2, 63744, 64256), q2.fill(2, 65040, 65050), q2.fill(2, 65072, 65136), q2.fill(2, 65280, 65377), q2.fill(2, 65504, 65511);\n        for (let t = 0; t < Ts.length; ++t) q2.fill(0, Ts[t][0], Ts[t][1] + 1);\n      }\n    }\n    wcwidth(t) {\n      return t < 32 ? 0 : t < 127 ? 1 : t < 65536 ? q2[t] : Fo(t, No2) ? 0 : t >= 131072 && t <= 196605 || t >= 196608 && t <= 262141 ? 2 : 1;\n    }\n    charProperties(t, e) {\n      let i5 = this.wcwidth(t), r = i5 === 0 && e !== 0;\n      if (r) {\n        let s4 = be3.extractWidth(e);\n        s4 === 0 ? r = false : s4 > i5 && (i5 = s4);\n      }\n      return be3.createPropertyValue(0, i5, r);\n    }\n  };\n  var be3 = class n9 {\n    constructor() {\n      this._providers = /* @__PURE__ */ Object.create(null);\n      this._active = "";\n      this._onChange = new v5();\n      this.onChange = this._onChange.event;\n      let t = new hr();\n      this.register(t), this._active = t.version, this._activeProvider = t;\n    }\n    static extractShouldJoin(t) {\n      return (t & 1) !== 0;\n    }\n    static extractWidth(t) {\n      return t >> 1 & 3;\n    }\n    static extractCharKind(t) {\n      return t >> 3;\n    }\n    static createPropertyValue(t, e, i5 = false) {\n      return (t & 16777215) << 3 | (e & 3) << 1 | (i5 ? 1 : 0);\n    }\n    dispose() {\n      this._onChange.dispose();\n    }\n    get versions() {\n      return Object.keys(this._providers);\n    }\n    get activeVersion() {\n      return this._active;\n    }\n    set activeVersion(t) {\n      if (!this._providers[t]) throw new Error(`unknown Unicode version "${t}"`);\n      this._active = t, this._activeProvider = this._providers[t], this._onChange.fire(t);\n    }\n    register(t) {\n      this._providers[t.version] = t;\n    }\n    wcwidth(t) {\n      return this._activeProvider.wcwidth(t);\n    }\n    getStringCellWidth(t) {\n      let e = 0, i5 = 0, r = t.length;\n      for (let s4 = 0; s4 < r; ++s4) {\n        let o2 = t.charCodeAt(s4);\n        if (55296 <= o2 && o2 <= 56319) {\n          if (++s4 >= r) return e + this.wcwidth(o2);\n          let h3 = t.charCodeAt(s4);\n          56320 <= h3 && h3 <= 57343 ? o2 = (o2 - 55296) * 1024 + h3 - 56320 + 65536 : e += this.wcwidth(h3);\n        }\n        let a2 = this.charProperties(o2, i5), l4 = n9.extractWidth(a2);\n        n9.extractShouldJoin(a2) && (l4 -= n9.extractWidth(i5)), e += l4, i5 = a2;\n      }\n      return e;\n    }\n    charProperties(t, e) {\n      return this._activeProvider.charProperties(t, e);\n    }\n  };\n  var dr = class {\n    constructor() {\n      this.glevel = 0;\n      this._charsets = [];\n    }\n    get charsets() {\n      return this._charsets;\n    }\n    reset() {\n      this.charset = void 0, this._charsets = [], this.glevel = 0;\n    }\n    setgLevel(t) {\n      this.glevel = t, this.charset = this._charsets[t];\n    }\n    setgCharset(t, e) {\n      this._charsets[t] = e, this.glevel === t && (this.charset = e);\n    }\n  };\n  function Ds(n11) {\n    let e = n11.buffer.lines.get(n11.buffer.ybase + n11.buffer.y - 1)?.get(n11.cols - 1), i5 = n11.buffer.lines.get(n11.buffer.ybase + n11.buffer.y);\n    i5 && e && (i5.isWrapped = e[3] !== 0 && e[3] !== 32);\n  }\n  var ai = 2147483647;\n  var Ho2 = 256;\n  var Mt = class n10 {\n    constructor(t = 32, e = 32) {\n      this.maxLength = t;\n      this.maxSubParamsLength = e;\n      if (e > Ho2) throw new Error("maxSubParamsLength must not be greater than 256");\n      this.params = new Int32Array(t), this.length = 0, this._subParams = new Int32Array(e), this._subParamsLength = 0, this._subParamsIdx = new Uint16Array(t), this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false;\n    }\n    static fromArray(t) {\n      let e = new n10();\n      if (!t.length) return e;\n      for (let i5 = Array.isArray(t[0]) ? 1 : 0; i5 < t.length; ++i5) {\n        let r = t[i5];\n        if (Array.isArray(r)) for (let s4 = 0; s4 < r.length; ++s4) e.addSubParam(r[s4]);\n        else e.addParam(r);\n      }\n      return e;\n    }\n    clone() {\n      let t = new n10(this.maxLength, this.maxSubParamsLength);\n      return t.params.set(this.params), t.length = this.length, t._subParams.set(this._subParams), t._subParamsLength = this._subParamsLength, t._subParamsIdx.set(this._subParamsIdx), t._rejectDigits = this._rejectDigits, t._rejectSubDigits = this._rejectSubDigits, t._digitIsSub = this._digitIsSub, t;\n    }\n    toArray() {\n      let t = [];\n      for (let e = 0; e < this.length; ++e) {\n        t.push(this.params[e]);\n        let i5 = this._subParamsIdx[e] >> 8, r = this._subParamsIdx[e] & 255;\n        r - i5 > 0 && t.push(Array.prototype.slice.call(this._subParams, i5, r));\n      }\n      return t;\n    }\n    reset() {\n      this.length = 0, this._subParamsLength = 0, this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false;\n    }\n    resetZdm() {\n      this.length = 1, this._subParamsLength = 0, this._rejectDigits = false, this._rejectSubDigits = false, this._digitIsSub = false, this._subParamsIdx[0] = 0, this.params[0] = 0;\n    }\n    addParam(t) {\n      if (this._digitIsSub = false, this.length >= this.maxLength) {\n        this._rejectDigits = true;\n        return;\n      }\n      if (t < -1) throw new Error("values lesser than -1 are not allowed");\n      this._subParamsIdx[this.length] = this._subParamsLength << 8 | this._subParamsLength, this.params[this.length++] = t > ai ? ai : t;\n    }\n    addSubParam(t) {\n      if (this._digitIsSub = true, !!this.length) {\n        if (this._rejectDigits || this._subParamsLength >= this.maxSubParamsLength) {\n          this._rejectSubDigits = true;\n          return;\n        }\n        if (t < -1) throw new Error("values lesser than -1 are not allowed");\n        this._subParams[this._subParamsLength++] = t > ai ? ai : t, this._subParamsIdx[this.length - 1]++;\n      }\n    }\n    hasSubParams(t) {\n      return (this._subParamsIdx[t] & 255) - (this._subParamsIdx[t] >> 8) > 0;\n    }\n    getSubParams(t) {\n      let e = this._subParamsIdx[t] >> 8, i5 = this._subParamsIdx[t] & 255;\n      return i5 - e > 0 ? this._subParams.subarray(e, i5) : null;\n    }\n    getSubParamsAll() {\n      let t = {};\n      for (let e = 0; e < this.length; ++e) {\n        let i5 = this._subParamsIdx[e] >> 8, r = this._subParamsIdx[e] & 255;\n        r - i5 > 0 && (t[e] = this._subParams.slice(i5, r));\n      }\n      return t;\n    }\n    addDigit(t) {\n      let e;\n      if (this._rejectDigits || !(e = this._digitIsSub ? this._subParamsLength : this.length) || this._digitIsSub && this._rejectSubDigits) return;\n      let i5 = this._digitIsSub ? this._subParams : this.params, r = i5[e - 1];\n      i5[e - 1] = ~r ? Math.min(r * 10 + t, ai) : t;\n    }\n  };\n  var li = [];\n  var ur = class {\n    constructor() {\n      this._state = 0;\n      this._active = li;\n      this._id = -1;\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = li;\n    }\n    reset() {\n      if (this._state === 2) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].end(false);\n      this._stack.paused = false, this._active = li, this._id = -1, this._state = 0;\n    }\n    _start() {\n      if (this._active = this._handlers[this._id] || li, !this._active.length) this._handlerFb(this._id, "START");\n      else for (let t = this._active.length - 1; t >= 0; t--) this._active[t].start();\n    }\n    _put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._id, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    start() {\n      this.reset(), this._state = 1;\n    }\n    put(t, e, i5) {\n      if (this._state !== 3) {\n        if (this._state === 1) for (; e < i5; ) {\n          let r = t[e++];\n          if (r === 59) {\n            this._state = 2, this._start();\n            break;\n          }\n          if (r < 48 || 57 < r) {\n            this._state = 3;\n            return;\n          }\n          this._id === -1 && (this._id = 0), this._id = this._id * 10 + r - 48;\n        }\n        this._state === 2 && i5 - e > 0 && this._put(t, e, i5);\n      }\n    }\n    end(t, e = true) {\n      if (this._state !== 0) {\n        if (this._state !== 3) if (this._state === 1 && this._start(), !this._active.length) this._handlerFb(this._id, "END", t);\n        else {\n          let i5 = false, r = this._active.length - 1, s4 = false;\n          if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n            for (; r >= 0 && (i5 = this._active[r].end(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n            r--;\n          }\n          for (; r >= 0; r--) if (i5 = this._active[r].end(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n        }\n        this._active = li, this._id = -1, this._state = 0;\n      }\n    }\n  };\n  var fr = class fr2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._hitLimit = false;\n    }\n    start() {\n      this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > fr2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    end(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data), e instanceof Promise)) return e.then((i5) => (this._data = "", this._hitLimit = false, i5));\n      return this._data = "", this._hitLimit = false, e;\n    }\n  };\n  fr._payloadLimit = 1e7;\n  var re2 = fr;\n  var ci = [];\n  var pr = class {\n    constructor() {\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._active = ci;\n      this._ident = 0;\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = ci;\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    reset() {\n      if (this._active.length) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].unhook(false);\n      this._stack.paused = false, this._active = ci, this._ident = 0;\n    }\n    hook(t, e) {\n      if (this.reset(), this._ident = t, this._active = this._handlers[t] || ci, !this._active.length) this._handlerFb(this._ident, "HOOK", e);\n      else for (let i5 = this._active.length - 1; i5 >= 0; i5--) this._active[i5].hook(e);\n    }\n    put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._ident, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    unhook(t, e = true) {\n      if (!this._active.length) this._handlerFb(this._ident, "UNHOOK", t);\n      else {\n        let i5 = false, r = this._active.length - 1, s4 = false;\n        if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n          for (; r >= 0 && (i5 = this._active[r].unhook(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n          r--;\n        }\n        for (; r >= 0; r--) if (i5 = this._active[r].unhook(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n      }\n      this._active = ci, this._ident = 0;\n    }\n  };\n  var hi = new Mt();\n  hi.addParam(0);\n  var _r = class _r2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._params = hi;\n      this._hitLimit = false;\n    }\n    hook(t) {\n      this._params = t.length > 1 || t.params[0] ? t.clone() : hi, this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > _r2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    unhook(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data, this._params), e instanceof Promise)) return e.then((i5) => (this._params = hi, this._data = "", this._hitLimit = false, i5));\n      return this._params = hi, this._data = "", this._hitLimit = false, e;\n    }\n  };\n  _r._payloadLimit = 1e7;\n  var di = _r;\n  var ui = [];\n  var mr = class {\n    constructor() {\n      this._handlers = /* @__PURE__ */ Object.create(null);\n      this._active = ui;\n      this._ident = 0;\n      this._handlerFb = () => {\n      };\n      this._stack = { paused: false, loopPosition: 0, fallThrough: false };\n    }\n    registerHandler(t, e) {\n      this._handlers[t] ??= [];\n      let i5 = this._handlers[t];\n      return i5.push(e), { dispose: () => {\n        let r = i5.indexOf(e);\n        r !== -1 && i5.splice(r, 1);\n      } };\n    }\n    clearHandler(t) {\n      this._handlers[t] && delete this._handlers[t];\n    }\n    setHandlerFallback(t) {\n      this._handlerFb = t;\n    }\n    dispose() {\n      this._handlers = /* @__PURE__ */ Object.create(null), this._handlerFb = () => {\n      }, this._active = ui;\n    }\n    reset() {\n      if (this._active.length) for (let t = this._stack.paused ? this._stack.loopPosition - 1 : this._active.length - 1; t >= 0; --t) this._active[t].end(false);\n      this._stack.paused = false, this._active = ui, this._ident = 0;\n    }\n    start(t) {\n      if (this.reset(), this._ident = t, this._active = this._handlers[t] || ui, !this._active.length) this._handlerFb(this._ident, "START");\n      else for (let e = this._active.length - 1; e >= 0; e--) this._active[e].start();\n    }\n    put(t, e, i5) {\n      if (!this._active.length) this._handlerFb(this._ident, "PUT", ye2(t, e, i5));\n      else for (let r = this._active.length - 1; r >= 0; r--) this._active[r].put(t, e, i5);\n    }\n    end(t, e = true) {\n      if (!this._active.length) this._handlerFb(this._ident, "END", t);\n      else {\n        let i5 = false, r = this._active.length - 1, s4 = false;\n        if (this._stack.paused && (r = this._stack.loopPosition - 1, i5 = e, s4 = this._stack.fallThrough, this._stack.paused = false), !s4 && i5 === false) {\n          for (; r >= 0 && (i5 = this._active[r].end(t), i5 !== true); r--) if (i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = false, i5;\n          r--;\n        }\n        for (; r >= 0; r--) if (i5 = this._active[r].end(false), i5 instanceof Promise) return this._stack.paused = true, this._stack.loopPosition = r, this._stack.fallThrough = true, i5;\n      }\n      this._active = ui, this._ident = 0;\n    }\n  };\n  var vr = class vr2 {\n    constructor(t) {\n      this._handler = t;\n      this._data = "";\n      this._hitLimit = false;\n    }\n    start() {\n      this._data = "", this._hitLimit = false;\n    }\n    put(t, e, i5) {\n      this._hitLimit || (this._data += ye2(t, e, i5), this._data.length > vr2._payloadLimit && (this._data = "", this._hitLimit = true));\n    }\n    end(t) {\n      let e = false;\n      if (this._hitLimit) e = false;\n      else if (t && (e = this._handler(this._data), e instanceof Promise)) return e.then((i5) => (this._data = "", this._hitLimit = false, i5));\n      return this._data = "", this._hitLimit = false, e;\n    }\n  };\n  vr._payloadLimit = 1e7;\n  var br = vr;\n  var Rs = class {\n    constructor(t) {\n      this.table = new Uint16Array(t);\n    }\n    setDefault(t, e) {\n      this.table.fill(t << 8 | e);\n    }\n    add(t, e, i5, r) {\n      this.table[e << 8 | t] = i5 << 8 | r;\n    }\n    addMany(t, e, i5, r) {\n      for (let s4 = 0; s4 < t.length; s4++) this.table[e << 8 | t[s4]] = i5 << 8 | r;\n    }\n  };\n  var se2 = 160;\n  var Wo2 = (function() {\n    let n11 = new Rs(4257), e = Array.apply(null, Array(256)).map((a2, l4) => l4), i5 = (a2, l4) => e.slice(a2, l4), r = i5(32, 127), s4 = i5(0, 24);\n    s4.push(25), s4.push.apply(s4, i5(28, 32));\n    let o2 = i5(0, 17);\n    n11.setDefault(1, 0), n11.addMany(r, 0, 2, 0);\n    for (let a2 of o2) n11.addMany([24, 26, 153, 154], a2, 3, 0), n11.addMany(i5(128, 144), a2, 3, 0), n11.addMany(i5(144, 152), a2, 3, 0), n11.add(156, a2, 0, 0), n11.add(27, a2, 11, 1), n11.add(157, a2, 4, 8), n11.addMany([152, 158], a2, 0, 7), n11.add(159, a2, 11, 14), n11.add(155, a2, 11, 3), n11.add(144, a2, 11, 9);\n    return n11.addMany(s4, 0, 3, 0), n11.addMany(s4, 1, 3, 1), n11.add(127, 1, 0, 1), n11.addMany(s4, 8, 0, 8), n11.addMany(s4, 3, 3, 3), n11.add(127, 3, 0, 3), n11.addMany(s4, 4, 3, 4), n11.add(127, 4, 0, 4), n11.addMany(s4, 6, 3, 6), n11.addMany(s4, 5, 3, 5), n11.add(127, 5, 0, 5), n11.addMany(s4, 2, 3, 2), n11.add(127, 2, 0, 2), n11.add(93, 1, 4, 8), n11.addMany(r, 8, 5, 8), n11.add(127, 8, 5, 8), n11.addMany([156, 27, 24, 26, 7], 8, 6, 0), n11.addMany(i5(28, 32), 8, 0, 8), n11.addMany([88, 94], 1, 0, 7), n11.addMany(r, 7, 0, 7), n11.addMany(s4, 7, 0, 7), n11.add(156, 7, 0, 0), n11.add(127, 7, 0, 7), n11.add(95, 1, 11, 14), n11.addMany(s4, 14, 0, 14), n11.add(127, 14, 0, 14), n11.addMany(i5(32, 48), 14, 9, 15), n11.addMany(i5(48, 127), 14, 15, 16), n11.addMany(i5(48, 127), 15, 15, 16), n11.addMany(s4, 15, 0, 15), n11.addMany(i5(32, 48), 15, 9, 15), n11.add(127, 15, 0, 15), n11.addMany(r, 16, 16, 16), n11.addMany(s4, 16, 0, 16), n11.addMany(i5(8, 14), 16, 16, 16), n11.add(127, 16, 0, 16), n11.addMany([27, 156, 24, 26], 16, 17, 0), n11.add(91, 1, 11, 3), n11.addMany(i5(64, 127), 3, 7, 0), n11.addMany(i5(48, 60), 3, 8, 4), n11.addMany([60, 61, 62, 63], 3, 9, 4), n11.addMany(i5(48, 60), 4, 8, 4), n11.addMany(i5(64, 127), 4, 7, 0), n11.addMany([60, 61, 62, 63], 4, 0, 6), n11.addMany(i5(32, 64), 6, 0, 6), n11.add(127, 6, 0, 6), n11.addMany(i5(64, 127), 6, 0, 0), n11.addMany(i5(32, 48), 3, 9, 5), n11.addMany(i5(32, 48), 5, 9, 5), n11.addMany(i5(48, 64), 5, 0, 6), n11.addMany(i5(64, 127), 5, 7, 0), n11.addMany(i5(32, 48), 4, 9, 5), n11.addMany(i5(32, 48), 1, 9, 2), n11.addMany(i5(32, 48), 2, 9, 2), n11.addMany(i5(48, 127), 2, 10, 0), n11.addMany(i5(48, 80), 1, 10, 0), n11.addMany(i5(81, 88), 1, 10, 0), n11.addMany([89, 90, 92], 1, 10, 0), n11.addMany(i5(96, 127), 1, 10, 0), n11.add(80, 1, 11, 9), n11.addMany(s4, 9, 0, 9), n11.add(127, 9, 0, 9), n11.addMany(i5(32, 48), 9, 9, 12), n11.addMany(i5(48, 60), 9, 8, 10), n11.addMany([60, 61, 62, 63], 9, 9, 10), n11.addMany(s4, 11, 0, 11), n11.addMany(i5(32, 128), 11, 0, 11), n11.addMany(s4, 10, 0, 10), n11.add(127, 10, 0, 10), n11.addMany(i5(48, 60), 10, 8, 10), n11.addMany([60, 61, 62, 63], 10, 0, 11), n11.addMany(i5(32, 48), 10, 9, 12), n11.addMany(s4, 12, 0, 12), n11.add(127, 12, 0, 12), n11.addMany(i5(32, 48), 12, 9, 12), n11.addMany(i5(48, 64), 12, 0, 11), n11.addMany(i5(64, 127), 12, 12, 13), n11.addMany(i5(64, 127), 10, 12, 13), n11.addMany(i5(64, 127), 9, 12, 13), n11.addMany(s4, 13, 13, 13), n11.addMany(r, 13, 13, 13), n11.add(127, 13, 0, 13), n11.addMany([27, 156, 24, 26], 13, 14, 0), n11.add(se2, 0, 2, 0), n11.add(se2, 8, 5, 8), n11.add(se2, 6, 0, 6), n11.add(se2, 11, 0, 11), n11.add(se2, 13, 13, 13), n11.add(se2, 16, 16, 16), n11;\n  })();\n  var Sr = class extends g5 {\n    constructor(e = Wo2) {\n      super();\n      this._transitions = e;\n      this._parseStack = { state: 0, handlers: [], handlerPos: 0, transition: 0, chunkPos: 0 };\n      this.initialState = 0, this.currentState = this.initialState, this._params = new Mt(), this._params.addParam(0), this._collect = 0, this.precedingJoinState = 0, this._printHandlerFb = (i5, r, s4) => {\n      }, this._executeHandlerFb = (i5) => {\n      }, this._csiHandlerFb = (i5, r) => {\n      }, this._escHandlerFb = (i5) => {\n      }, this._errorHandlerFb = (i5) => i5, this._printHandler = this._printHandlerFb, this._executeHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlersArr = new Array(24).fill(void 0), this._csiHandlers = /* @__PURE__ */ Object.create(null), this._escHandlers = /* @__PURE__ */ Object.create(null), this._register(y4(() => {\n        this._csiHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlers = /* @__PURE__ */ Object.create(null), this._executeHandlersArr = new Array(24).fill(void 0), this._escHandlers = /* @__PURE__ */ Object.create(null);\n      })), this._oscParser = this._register(new ur()), this._dcsParser = this._register(new pr()), this._apcParser = this._register(new mr()), this._errorHandler = this._errorHandlerFb, this.registerEscHandler({ final: "\\\\" }, () => true);\n    }\n    _identifier(e, i5 = [64, 126]) {\n      let r = 0;\n      if (e.prefix) {\n        if (e.prefix.length > 1) throw new Error("only one byte as prefix supported");\n        if (r = e.prefix.charCodeAt(0), r && 60 > r || r > 63) throw new Error("prefix must be in range 0x3c .. 0x3f");\n      }\n      if (e.intermediates) {\n        if (e.intermediates.length > 2) throw new Error("only two bytes as intermediates are supported");\n        for (let o2 = 0; o2 < e.intermediates.length; ++o2) {\n          let a2 = e.intermediates.charCodeAt(o2);\n          if (32 > a2 || a2 > 47) throw new Error("intermediate must be in range 0x20 .. 0x2f");\n          r <<= 8, r |= a2;\n        }\n      }\n      if (e.final.length !== 1) throw new Error("final must be a single byte");\n      let s4 = e.final.charCodeAt(0);\n      if (i5[0] > s4 || s4 > i5[1]) throw new Error(`final must be in range ${i5[0]} .. ${i5[1]}`);\n      return r <<= 8, r |= s4, r;\n    }\n    identToString(e) {\n      let i5 = [];\n      for (; e; ) i5.push(String.fromCharCode(e & 255)), e >>= 8;\n      return i5.reverse().join("");\n    }\n    setPrintHandler(e) {\n      this._printHandler = e;\n    }\n    clearPrintHandler() {\n      this._printHandler = this._printHandlerFb;\n    }\n    registerEscHandler(e, i5) {\n      let r = this._identifier(e, [48, 126]);\n      this._escHandlers[r] ??= [];\n      let s4 = this._escHandlers[r];\n      return s4.push(i5), { dispose: () => {\n        let o2 = s4.indexOf(i5);\n        o2 !== -1 && s4.splice(o2, 1);\n      } };\n    }\n    clearEscHandler(e) {\n      this._escHandlers[this._identifier(e, [48, 126])] && delete this._escHandlers[this._identifier(e, [48, 126])];\n    }\n    setEscHandlerFallback(e) {\n      this._escHandlerFb = e;\n    }\n    setExecuteHandler(e, i5) {\n      let r = e.charCodeAt(0);\n      this._executeHandlers[r] = i5, r < 24 && (this._executeHandlersArr[r] = i5);\n    }\n    clearExecuteHandler(e) {\n      let i5 = e.charCodeAt(0);\n      this._executeHandlers[i5] && delete this._executeHandlers[i5], i5 < 24 && (this._executeHandlersArr[i5] = void 0);\n    }\n    setExecuteHandlerFallback(e) {\n      this._executeHandlerFb = e;\n    }\n    registerCsiHandler(e, i5) {\n      let r = this._identifier(e);\n      this._csiHandlers[r] ??= [];\n      let s4 = this._csiHandlers[r];\n      return s4.push(i5), { dispose: () => {\n        let o2 = s4.indexOf(i5);\n        o2 !== -1 && s4.splice(o2, 1);\n      } };\n    }\n    clearCsiHandler(e) {\n      this._csiHandlers[this._identifier(e)] && delete this._csiHandlers[this._identifier(e)];\n    }\n    setCsiHandlerFallback(e) {\n      this._csiHandlerFb = e;\n    }\n    registerDcsHandler(e, i5) {\n      return this._dcsParser.registerHandler(this._identifier(e), i5);\n    }\n    clearDcsHandler(e) {\n      this._dcsParser.clearHandler(this._identifier(e));\n    }\n    setDcsHandlerFallback(e) {\n      this._dcsParser.setHandlerFallback(e);\n    }\n    registerOscHandler(e, i5) {\n      return this._oscParser.registerHandler(e, i5);\n    }\n    clearOscHandler(e) {\n      this._oscParser.clearHandler(e);\n    }\n    setOscHandlerFallback(e) {\n      this._oscParser.setHandlerFallback(e);\n    }\n    registerApcHandler(e, i5) {\n      return e.prefix = void 0, this._apcParser.registerHandler(this._identifier(e, [48, 126]), i5);\n    }\n    clearApcHandler(e) {\n      e.prefix = void 0, this._apcParser.clearHandler(this._identifier(e, [48, 126]));\n    }\n    setApcHandlerFallback(e) {\n      this._apcParser.setHandlerFallback(e);\n    }\n    setErrorHandler(e) {\n      this._errorHandler = e;\n    }\n    clearErrorHandler() {\n      this._errorHandler = this._errorHandlerFb;\n    }\n    reset() {\n      this.currentState = this.initialState, this._oscParser.reset(), this._dcsParser.reset(), this._apcParser.reset(), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0, this._parseStack.state !== 0 && (this._parseStack.state = 2, this._parseStack.handlers = []);\n    }\n    _preserveStack(e, i5, r, s4, o2) {\n      this._parseStack.state = e, this._parseStack.handlers = i5, this._parseStack.handlerPos = r, this._parseStack.transition = s4, this._parseStack.chunkPos = o2;\n    }\n    parse(e, i5, r) {\n      let s4 = 0, o2 = 0, a2 = 0, l4;\n      if (this._parseStack.state) if (this._parseStack.state === 2) this._parseStack.state = 0, a2 = this._parseStack.chunkPos + 1;\n      else {\n        if (r === void 0 || this._parseStack.state === 1) throw this._parseStack.state = 1, new Error("improper continuation due to previous async handler, giving up parsing");\n        let h3 = this._parseStack.handlers, d3 = this._parseStack.handlerPos - 1;\n        switch (this._parseStack.state) {\n          case 3:\n            if (r === false && d3 > -1) {\n              for (; d3 >= 0 && (l4 = h3[d3](this._params), l4 !== true); d3--) if (l4 instanceof Promise) return this._parseStack.handlerPos = d3, l4;\n            }\n            this._parseStack.handlers = [];\n            break;\n          case 4:\n            if (r === false && d3 > -1) {\n              for (; d3 >= 0 && (l4 = h3[d3](), l4 !== true); d3--) if (l4 instanceof Promise) return this._parseStack.handlerPos = d3, l4;\n            }\n            this._parseStack.handlers = [];\n            break;\n          case 6:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._dcsParser.unhook(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n          case 5:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._oscParser.end(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n          case 7:\n            if (s4 = e[this._parseStack.chunkPos], l4 = this._apcParser.end(s4 !== 24 && s4 !== 26, r), l4) return l4;\n            s4 === 27 && (this._parseStack.transition |= 1), this._params.resetZdm(), this._collect = 0;\n            break;\n        }\n        this._parseStack.state = 0, a2 = this._parseStack.chunkPos + 1, this.precedingJoinState = 0, this.currentState = this._parseStack.transition & 255;\n      }\n      for (let h3 = a2; h3 < i5; ++h3) {\n        if (s4 = e[h3], s4 < 24 && this.currentState <= 6) {\n          (this._executeHandlersArr[s4] ?? this._executeHandlerFb)(s4), this.precedingJoinState = 0;\n          continue;\n        }\n        if (s4 === 27 && this.currentState < 8 && h3 + 2 < i5 && e[h3 + 1] === 91) {\n          this._params.resetZdm(), this._collect = 0;\n          let d3 = h3 + 2, c2 = e[d3];\n          c2 >= 60 && c2 <= 63 && (this._collect = c2, d3++);\n          let u3 = false;\n          for (; d3 < i5; d3++) if (c2 = e[d3], c2 >= 48 && c2 <= 57) this._params.addDigit(c2 - 48);\n          else if (c2 === 59) this._params.addParam(0);\n          else if (c2 === 58) this._params.addSubParam(-1);\n          else if (c2 >= 64 && c2 <= 126) {\n            let _5 = this._csiHandlers[this._collect << 8 | c2], p3 = _5 ? _5.length - 1 : -1;\n            for (; p3 >= 0 && (l4 = _5[p3](this._params), l4 !== true); p3--) if (l4 instanceof Promise) return o2 = 1792, this._preserveStack(3, _5, p3, o2, d3), l4;\n            p3 < 0 && this._csiHandlerFb(this._collect << 8 | c2, this._params), this.precedingJoinState = 0, h3 = d3, this.currentState = 0, u3 = true;\n            break;\n          } else break;\n          u3 || (h3 = d3 - 1, this.currentState = 4);\n          continue;\n        }\n        switch (o2 = this._transitions.table[this.currentState << 8 | (s4 < se2 ? s4 : se2)], o2 >> 8) {\n          case 2:\n            let d3 = h3, c2 = i5 - 4;\n            for (; d3 < c2 && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2) && e[++d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2); ) ;\n            if (d3 >= c2) for (; d3 < i5 && e[d3] >= 32 && (e[d3] <= 126 || e[d3] >= se2); ) d3++;\n            this._printHandler(e, h3, d3), h3 = d3 - 1;\n            break;\n          case 3:\n            this._executeHandlers[s4] ? this._executeHandlers[s4]() : this._executeHandlerFb(s4), this.precedingJoinState = 0;\n            break;\n          case 0:\n            break;\n          case 1:\n            if (this._errorHandler({ position: h3, code: s4, currentState: this.currentState, collect: this._collect, params: this._params, abort: false }).abort) return;\n            break;\n          case 7:\n            let _5 = this._csiHandlers[this._collect << 8 | s4], p3 = _5 ? _5.length - 1 : -1;\n            for (; p3 >= 0 && (l4 = _5[p3](this._params), l4 !== true); p3--) if (l4 instanceof Promise) return this._preserveStack(3, _5, p3, o2, h3), l4;\n            p3 < 0 && this._csiHandlerFb(this._collect << 8 | s4, this._params), this.precedingJoinState = 0;\n            break;\n          case 8:\n            do\n              switch (s4) {\n                case 59:\n                  this._params.addParam(0);\n                  break;\n                case 58:\n                  this._params.addSubParam(-1);\n                  break;\n                default:\n                  this._params.addDigit(s4 - 48);\n              }\n            while (++h3 < i5 && (s4 = e[h3]) > 47 && s4 < 60);\n            h3--;\n            break;\n          case 9:\n            this._collect <<= 8, this._collect |= s4;\n            break;\n          case 10:\n            let b4 = this._escHandlers[this._collect << 8 | s4], f5 = b4 ? b4.length - 1 : -1;\n            for (; f5 >= 0 && (l4 = b4[f5](), l4 !== true); f5--) if (l4 instanceof Promise) return this._preserveStack(4, b4, f5, o2, h3), l4;\n            f5 < 0 && this._escHandlerFb(this._collect << 8 | s4), this.precedingJoinState = 0;\n            break;\n          case 11:\n            this._params.resetZdm(), this._collect = 0;\n            break;\n          case 12:\n            this._dcsParser.hook(this._collect << 8 | s4, this._params);\n            break;\n          case 13:\n            for (let S4 = h3 + 1; ; ++S4) if (S4 >= i5 || (s4 = e[S4]) === 24 || s4 === 26 || s4 === 27 || s4 > 127 && s4 < se2) {\n              this._dcsParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 14:\n            if (l4 = this._dcsParser.unhook(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(6, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n          case 4:\n            this._oscParser.start();\n            break;\n          case 5:\n            for (let S4 = h3 + 1; ; S4++) if (S4 >= i5 || (s4 = e[S4]) < 32 || s4 > 127 && s4 < se2) {\n              this._oscParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 6:\n            if (l4 = this._oscParser.end(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(5, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n          case 15:\n            this._apcParser.start(this._collect << 8 | s4);\n            break;\n          case 16:\n            for (let S4 = h3 + 1; ; ++S4) if (!(S4 < i5 && (e[S4] >= 32 && e[S4] < 127 || e[S4] >= 8 && e[S4] < 14 || e[S4] >= se2))) {\n              this._apcParser.put(e, h3, S4), h3 = S4 - 1;\n              break;\n            }\n            break;\n          case 17:\n            if (l4 = this._apcParser.end(s4 !== 24 && s4 !== 26), l4) return this._preserveStack(7, [], 0, o2, h3), l4;\n            s4 === 27 && (o2 |= 1), this._params.resetZdm(), this._collect = 0, this.precedingJoinState = 0;\n            break;\n        }\n        this.currentState = o2 & 255;\n      }\n    }\n  };\n  var Uo = /^([\\da-f])\\/([\\da-f])\\/([\\da-f])$|^([\\da-f]{2})\\/([\\da-f]{2})\\/([\\da-f]{2})$|^([\\da-f]{3})\\/([\\da-f]{3})\\/([\\da-f]{3})$|^([\\da-f]{4})\\/([\\da-f]{4})\\/([\\da-f]{4})$/;\n  var Ko = /^[\\da-f]+$/;\n  function As(n11) {\n    if (!n11) return;\n    let t = n11.toLowerCase();\n    if (t.startsWith("rgb:")) {\n      t = t.slice(4);\n      let e = Uo.exec(t);\n      if (e) {\n        let i5 = e[1] ? 15 : e[4] ? 255 : e[7] ? 4095 : 65535;\n        return [Math.round(parseInt(e[1] || e[4] || e[7] || e[10], 16) / i5 * 255), Math.round(parseInt(e[2] || e[5] || e[8] || e[11], 16) / i5 * 255), Math.round(parseInt(e[3] || e[6] || e[9] || e[12], 16) / i5 * 255)];\n      }\n    } else if (t.startsWith("#") && (t = t.slice(1), Ko.exec(t) && [3, 6, 9, 12].includes(t.length))) {\n      let e = t.length / 3, i5 = [0, 0, 0];\n      for (let r = 0; r < 3; ++r) {\n        let s4 = parseInt(t.slice(e * r, e * r + e), 16);\n        i5[r] = e === 1 ? s4 << 4 : e === 2 ? s4 : e === 3 ? s4 >> 4 : s4 >> 8;\n      }\n      return i5;\n    }\n  }\n  function Ls(n11, t) {\n    let e = n11.toString(16), i5 = e.length < 2 ? "0" + e : e;\n    switch (t) {\n      case 4:\n        return e[0];\n      case 8:\n        return i5;\n      case 12:\n        return (i5 + i5).slice(0, 3);\n      default:\n        return i5 + i5;\n    }\n  }\n  function Pn(n11, t = 16) {\n    let [e, i5, r] = n11;\n    return `rgb:${Ls(e, t)}/${Ls(i5, t)}/${Ls(r, t)}`;\n  }\n  var Mn = "6.1.0-beta.213";\n  var Go2 = { "(": 0, ")": 1, "*": 2, "+": 3, "-": 1, ".": 2 };\n  var Ue3 = 131072;\n  var Bn = 10;\n  function On(n11, t) {\n    if (n11 > 24) return t.setWinLines || false;\n    switch (n11) {\n      case 1:\n        return !!t.restoreWin;\n      case 2:\n        return !!t.minimizeWin;\n      case 3:\n        return !!t.setWinPosition;\n      case 4:\n        return !!t.setWinSizePixels;\n      case 5:\n        return !!t.raiseWin;\n      case 6:\n        return !!t.lowerWin;\n      case 7:\n        return !!t.refreshWin;\n      case 8:\n        return !!t.setWinSizeChars;\n      case 9:\n        return !!t.maximizeWin;\n      case 10:\n        return !!t.fullscreenWin;\n      case 11:\n        return !!t.getWinState;\n      case 13:\n        return !!t.getWinPosition;\n      case 14:\n        return !!t.getWinSizePixels;\n      case 15:\n        return !!t.getScreenSizePixels;\n      case 16:\n        return !!t.getCellSizePixels;\n      case 18:\n        return !!t.getWinSizeChars;\n      case 19:\n        return !!t.getScreenSizeChars;\n      case 20:\n        return !!t.getIconTitle;\n      case 21:\n        return !!t.getWinTitle;\n      case 22:\n        return !!t.pushTitle;\n      case 23:\n        return !!t.popTitle;\n      case 24:\n        return !!t.setWinLines;\n    }\n    return false;\n  }\n  var Nn = 5e3;\n  var Fn = 0;\n  var gr = class extends g5 {\n    constructor(e, i5, r, s4, o2, a2, l4, h3, d3 = new Sr()) {\n      super();\n      this._bufferService = e;\n      this._charsetService = i5;\n      this._coreService = r;\n      this._logService = s4;\n      this._optionsService = o2;\n      this._oscLinkService = a2;\n      this._mouseStateService = l4;\n      this._unicodeService = h3;\n      this._parser = d3;\n      this._parseBuffer = new Uint32Array(4096);\n      this._stringDecoder = new Si();\n      this._utf8Decoder = new gi();\n      this._windowTitle = "";\n      this._iconName = "";\n      this._windowTitleStack = [];\n      this._iconNameStack = [];\n      this._curAttrData = U5.clone();\n      this._eraseAttrDataInternal = U5.clone();\n      this._onRequestBell = this._register(new v5());\n      this.onRequestBell = this._onRequestBell.event;\n      this._onRequestRefreshRows = this._register(new v5());\n      this.onRequestRefreshRows = this._onRequestRefreshRows.event;\n      this._onRequestReset = this._register(new v5());\n      this.onRequestReset = this._onRequestReset.event;\n      this._onRequestSendFocus = this._register(new v5());\n      this.onRequestSendFocus = this._onRequestSendFocus.event;\n      this._onRequestSyncScrollBar = this._register(new v5());\n      this.onRequestSyncScrollBar = this._onRequestSyncScrollBar.event;\n      this._onRequestWindowsOptionsReport = this._register(new v5());\n      this.onRequestWindowsOptionsReport = this._onRequestWindowsOptionsReport.event;\n      this._onA11yChar = this._register(new v5());\n      this.onA11yChar = this._onA11yChar.event;\n      this._onA11yTab = this._register(new v5());\n      this.onA11yTab = this._onA11yTab.event;\n      this._onCursorMove = this._register(new v5());\n      this.onCursorMove = this._onCursorMove.event;\n      this._onLineFeed = this._register(new v5());\n      this.onLineFeed = this._onLineFeed.event;\n      this._onScroll = this._register(new v5());\n      this.onScroll = this._onScroll.event;\n      this._onTitleChange = this._register(new v5());\n      this.onTitleChange = this._onTitleChange.event;\n      this._onColor = this._register(new v5());\n      this.onColor = this._onColor.event;\n      this._onRequestColorSchemeQuery = this._register(new v5());\n      this.onRequestColorSchemeQuery = this._onRequestColorSchemeQuery.event;\n      this._parseStack = { paused: false, cursorStartX: 0, cursorStartY: 0, decodedLength: 0, position: 0 };\n      this._specialColors = [256, 257, 258];\n      this._register(this._parser), this._dirtyRowTracker = new fi(this._bufferService), this._activeBuffer = this._bufferService.buffer, this._register(this._bufferService.buffers.onBufferActivate((c2) => this._activeBuffer = c2.activeBuffer)), this._parser.setCsiHandlerFallback((c2, u3) => {\n        this._logService.debug("Unknown CSI code: ", { identifier: this._parser.identToString(c2), params: u3.toArray() });\n      }), this._parser.setEscHandlerFallback((c2) => {\n        this._logService.debug("Unknown ESC code: ", { identifier: this._parser.identToString(c2) });\n      }), this._parser.setExecuteHandlerFallback((c2) => {\n        this._logService.debug("Unknown EXECUTE code: ", { code: c2 });\n      }), this._parser.setOscHandlerFallback((c2, u3, _5) => {\n        this._logService.debug("Unknown OSC code: ", { identifier: c2, action: u3, data: _5 });\n      }), this._parser.setDcsHandlerFallback((c2, u3, _5) => {\n        u3 === "HOOK" && (_5 = _5.toArray()), this._logService.debug("Unknown DCS code: ", { identifier: this._parser.identToString(c2), action: u3, payload: _5 });\n      }), this._parser.setApcHandlerFallback((c2, u3, _5) => {\n        this._logService.debug("Unknown APC code: ", { identifier: this._parser.identToString(c2), action: u3, payload: _5 });\n      }), this._parser.setPrintHandler((c2, u3, _5) => this.print(c2, u3, _5)), this._parser.registerCsiHandler({ final: "@" }, (c2) => this.insertChars(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "@" }, (c2) => this.scrollLeft(c2)), this._parser.registerCsiHandler({ final: "A" }, (c2) => this.cursorUp(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "A" }, (c2) => this.scrollRight(c2)), this._parser.registerCsiHandler({ final: "B" }, (c2) => this.cursorDown(c2)), this._parser.registerCsiHandler({ final: "C" }, (c2) => this.cursorForward(c2)), this._parser.registerCsiHandler({ final: "D" }, (c2) => this.cursorBackward(c2)), this._parser.registerCsiHandler({ final: "E" }, (c2) => this.cursorNextLine(c2)), this._parser.registerCsiHandler({ final: "F" }, (c2) => this.cursorPrecedingLine(c2)), this._parser.registerCsiHandler({ final: "G" }, (c2) => this.cursorCharAbsolute(c2)), this._parser.registerCsiHandler({ final: "H" }, (c2) => this.cursorPosition(c2)), this._parser.registerCsiHandler({ final: "I" }, (c2) => this.cursorForwardTab(c2)), this._parser.registerCsiHandler({ final: "J" }, (c2) => this.eraseInDisplay(c2, false)), this._parser.registerCsiHandler({ prefix: "?", final: "J" }, (c2) => this.eraseInDisplay(c2, true)), this._parser.registerCsiHandler({ final: "K" }, (c2) => this.eraseInLine(c2, false)), this._parser.registerCsiHandler({ prefix: "?", final: "K" }, (c2) => this.eraseInLine(c2, true)), this._parser.registerCsiHandler({ final: "L" }, (c2) => this.insertLines(c2)), this._parser.registerCsiHandler({ final: "M" }, (c2) => this.deleteLines(c2)), this._parser.registerCsiHandler({ final: "P" }, (c2) => this.deleteChars(c2)), this._parser.registerCsiHandler({ final: "S" }, (c2) => this.scrollUp(c2)), this._parser.registerCsiHandler({ final: "T" }, (c2) => this.scrollDown(c2)), this._parser.registerCsiHandler({ final: "X" }, (c2) => this.eraseChars(c2)), this._parser.registerCsiHandler({ final: "Z" }, (c2) => this.cursorBackwardTab(c2)), this._parser.registerCsiHandler({ final: "^" }, (c2) => this.scrollDown(c2)), this._parser.registerCsiHandler({ final: "`" }, (c2) => this.charPosAbsolute(c2)), this._parser.registerCsiHandler({ final: "a" }, (c2) => this.hPositionRelative(c2)), this._parser.registerCsiHandler({ final: "b" }, (c2) => this.repeatPrecedingCharacter(c2)), this._parser.registerCsiHandler({ final: "c" }, (c2) => this.sendDeviceAttributesPrimary(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "c" }, (c2) => this.sendDeviceAttributesSecondary(c2)), this._parser.registerCsiHandler({ final: "d" }, (c2) => this.linePosAbsolute(c2)), this._parser.registerCsiHandler({ final: "e" }, (c2) => this.vPositionRelative(c2)), this._parser.registerCsiHandler({ final: "f" }, (c2) => this.hVPosition(c2)), this._parser.registerCsiHandler({ final: "g" }, (c2) => this.tabClear(c2)), this._parser.registerCsiHandler({ final: "h" }, (c2) => this.setMode(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "h" }, (c2) => this.setModePrivate(c2)), this._parser.registerCsiHandler({ final: "l" }, (c2) => this.resetMode(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "l" }, (c2) => this.resetModePrivate(c2)), this._parser.registerCsiHandler({ final: "m" }, (c2) => this.charAttributes(c2)), this._parser.registerCsiHandler({ final: "n" }, (c2) => this.deviceStatus(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "n" }, (c2) => this.deviceStatusPrivate(c2)), this._parser.registerCsiHandler({ intermediates: "!", final: "p" }, (c2) => this.softReset(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "q" }, (c2) => this.sendXtVersion(c2)), this._parser.registerCsiHandler({ intermediates: " ", final: "q" }, (c2) => this.setCursorStyle(c2)), this._parser.registerCsiHandler({ final: "r" }, (c2) => this.setScrollRegion(c2)), this._parser.registerCsiHandler({ final: "s" }, (c2) => this.saveCursor(c2)), this._parser.registerCsiHandler({ final: "t" }, (c2) => this.windowOptions(c2)), this._parser.registerCsiHandler({ final: "u" }, (c2) => this.restoreCursor(c2)), this._parser.registerCsiHandler({ intermediates: "\'", final: "}" }, (c2) => this.insertColumns(c2)), this._parser.registerCsiHandler({ intermediates: "\'", final: "~" }, (c2) => this.deleteColumns(c2)), this._parser.registerCsiHandler({ intermediates: \'"\', final: "q" }, (c2) => this.selectProtected(c2)), this._parser.registerCsiHandler({ intermediates: "$", final: "p" }, (c2) => this.requestMode(c2, true)), this._parser.registerCsiHandler({ prefix: "?", intermediates: "$", final: "p" }, (c2) => this.requestMode(c2, false)), this._parser.registerCsiHandler({ prefix: "=", final: "u" }, (c2) => this.kittyKeyboardSet(c2)), this._parser.registerCsiHandler({ prefix: "?", final: "u" }, (c2) => this.kittyKeyboardQuery(c2)), this._parser.registerCsiHandler({ prefix: ">", final: "u" }, (c2) => this.kittyKeyboardPush(c2)), this._parser.registerCsiHandler({ prefix: "<", final: "u" }, (c2) => this.kittyKeyboardPop(c2)), this._parser.setExecuteHandler("\\x07", () => this.bell()), this._parser.setExecuteHandler(`\n`, () => this.lineFeed()), this._parser.setExecuteHandler("\\v", () => this.lineFeed()), this._parser.setExecuteHandler("\\f", () => this.lineFeed()), this._parser.setExecuteHandler("\\r", () => this.carriageReturn()), this._parser.setExecuteHandler("\\b", () => this.backspace()), this._parser.setExecuteHandler("\t", () => this.tab()), this._parser.setExecuteHandler("\u000e", () => this.shiftOut()), this._parser.setExecuteHandler("\u000f", () => this.shiftIn()), this._parser.setExecuteHandler("\\x84", () => this.index()), this._parser.setExecuteHandler("\\x85", () => this.nextLine()), this._parser.setExecuteHandler("\\x88", () => this.tabSet()), this._parser.registerOscHandler(0, new re2((c2) => (this.setTitle(c2), this.setIconName(c2), true))), this._parser.registerOscHandler(1, new re2((c2) => this.setIconName(c2))), this._parser.registerOscHandler(2, new re2((c2) => this.setTitle(c2))), this._parser.registerOscHandler(4, new re2((c2) => this.setOrReportIndexedColor(c2))), this._parser.registerOscHandler(8, new re2((c2) => this.setHyperlink(c2))), this._parser.registerOscHandler(10, new re2((c2) => this.setOrReportFgColor(c2))), this._parser.registerOscHandler(11, new re2((c2) => this.setOrReportBgColor(c2))), this._parser.registerOscHandler(12, new re2((c2) => this.setOrReportCursorColor(c2))), this._parser.registerOscHandler(104, new re2((c2) => this.restoreIndexedColor(c2))), this._parser.registerOscHandler(110, new re2((c2) => this.restoreFgColor(c2))), this._parser.registerOscHandler(111, new re2((c2) => this.restoreBgColor(c2))), this._parser.registerOscHandler(112, new re2((c2) => this.restoreCursorColor(c2))), this._parser.registerEscHandler({ final: "7" }, () => this.saveCursor()), this._parser.registerEscHandler({ final: "8" }, () => this.restoreCursor()), this._parser.registerEscHandler({ final: "D" }, () => this.index()), this._parser.registerEscHandler({ final: "E" }, () => this.nextLine()), this._parser.registerEscHandler({ final: "H" }, () => this.tabSet()), this._parser.registerEscHandler({ final: "M" }, () => this.reverseIndex()), this._parser.registerEscHandler({ final: "=" }, () => this.keypadApplicationMode()), this._parser.registerEscHandler({ final: ">" }, () => this.keypadNumericMode()), this._parser.registerEscHandler({ final: "c" }, () => this.fullReset()), this._parser.registerEscHandler({ final: "n" }, () => this.setgLevel(2)), this._parser.registerEscHandler({ final: "o" }, () => this.setgLevel(3)), this._parser.registerEscHandler({ final: "|" }, () => this.setgLevel(3)), this._parser.registerEscHandler({ final: "}" }, () => this.setgLevel(2)), this._parser.registerEscHandler({ final: "~" }, () => this.setgLevel(1)), this._parser.registerEscHandler({ intermediates: "%", final: "@" }, () => this.selectDefaultCharset()), this._parser.registerEscHandler({ intermediates: "%", final: "G" }, () => this.selectDefaultCharset());\n      for (let c2 in V4) this._parser.registerEscHandler({ intermediates: "(", final: c2 }, () => this.selectCharset("(" + c2)), this._parser.registerEscHandler({ intermediates: ")", final: c2 }, () => this.selectCharset(")" + c2)), this._parser.registerEscHandler({ intermediates: "*", final: c2 }, () => this.selectCharset("*" + c2)), this._parser.registerEscHandler({ intermediates: "+", final: c2 }, () => this.selectCharset("+" + c2)), this._parser.registerEscHandler({ intermediates: "-", final: c2 }, () => this.selectCharset("-" + c2)), this._parser.registerEscHandler({ intermediates: ".", final: c2 }, () => this.selectCharset("." + c2)), this._parser.registerEscHandler({ intermediates: "/", final: c2 }, () => this.selectCharset("/" + c2));\n      this._parser.registerEscHandler({ intermediates: "#", final: "8" }, () => this.screenAlignmentPattern()), this._parser.setErrorHandler((c2) => (this._logService.error("Parsing error: ", c2), c2)), this._parser.registerDcsHandler({ intermediates: "$", final: "q" }, new di((c2, u3) => this.requestStatusString(c2, u3)));\n    }\n    getAttrData() {\n      return this._curAttrData;\n    }\n    _preserveStack(e, i5, r, s4) {\n      this._parseStack.paused = true, this._parseStack.cursorStartX = e, this._parseStack.cursorStartY = i5, this._parseStack.decodedLength = r, this._parseStack.position = s4;\n    }\n    _logSlowResolvingAsync(e) {\n      if (this._logService.logLevel <= 3) {\n        let i5, r = new Promise((s4, o2) => {\n          i5 = setTimeout(() => o2("#SLOW_TIMEOUT"), Nn);\n        });\n        Promise.race([e, r]).then(() => {\n          i5 !== void 0 && clearTimeout(i5);\n        }, (s4) => {\n          if (i5 !== void 0 && clearTimeout(i5), s4 !== "#SLOW_TIMEOUT") throw s4;\n          console.warn(`async parser handler taking longer than ${Nn} ms`);\n        });\n      }\n    }\n    _getCurrentLinkId() {\n      return this._curAttrData.extended.urlId;\n    }\n    parse(e, i5) {\n      let r, s4 = this._activeBuffer.x, o2 = this._activeBuffer.y, a2 = 0, l4 = this._parseStack.paused;\n      if (l4) {\n        if (r = this._parser.parse(this._parseBuffer, this._parseStack.decodedLength, i5)) return this._logSlowResolvingAsync(r), r;\n        s4 = this._parseStack.cursorStartX, o2 = this._parseStack.cursorStartY, this._parseStack.paused = false, e.length > Ue3 && (a2 = this._parseStack.position + Ue3);\n      }\n      if (this._logService.logLevel <= 1 && this._logService.debug(`parsing data ${typeof e == "string" ? ` "${e}"` : ` "${Array.prototype.map.call(e, (c2) => String.fromCharCode(c2)).join("")}"`}`), this._logService.logLevel === 0 && this._logService.trace("parsing data (codes)", typeof e == "string" ? e.split("").map((c2) => c2.charCodeAt(0)) : e), this._parseBuffer.length < e.length && this._parseBuffer.length < Ue3 && (this._parseBuffer = new Uint32Array(Math.min(e.length, Ue3))), l4 || this._dirtyRowTracker.clearRange(), e.length > Ue3) for (let c2 = a2; c2 < e.length; c2 += Ue3) {\n        let u3 = c2 + Ue3 < e.length ? c2 + Ue3 : e.length, _5 = typeof e == "string" ? this._stringDecoder.decode(e.substring(c2, u3), this._parseBuffer) : this._utf8Decoder.decode(e.subarray(c2, u3), this._parseBuffer);\n        if (r = this._parser.parse(this._parseBuffer, _5)) return this._preserveStack(s4, o2, _5, c2), this._logSlowResolvingAsync(r), r;\n      }\n      else if (!l4) {\n        let c2 = typeof e == "string" ? this._stringDecoder.decode(e, this._parseBuffer) : this._utf8Decoder.decode(e, this._parseBuffer);\n        if (r = this._parser.parse(this._parseBuffer, c2)) return this._preserveStack(s4, o2, c2, 0), this._logSlowResolvingAsync(r), r;\n      }\n      (this._activeBuffer.x !== s4 || this._activeBuffer.y !== o2) && this._onCursorMove.fire();\n      let h3 = this._dirtyRowTracker.end + (this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp), d3 = this._dirtyRowTracker.start + (this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n      d3 < this._bufferService.rows && this._onRequestRefreshRows.fire({ start: Math.min(d3, this._bufferService.rows - 1), end: Math.min(h3, this._bufferService.rows - 1) });\n    }\n    print(e, i5, r) {\n      let s4, o2, a2 = this._charsetService.charset, l4 = this._optionsService.rawOptions.screenReaderMode, h3 = this._bufferService.cols, d3 = this._coreService.decPrivateModes.wraparound, c2 = this._coreService.modes.insertMode, u3 = this._curAttrData, _5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      if (!_5) return;\n      this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._activeBuffer.x && r - i5 > 0 && _5.getWidth(this._activeBuffer.x - 1) === 2 && _5.setCellFromCodepoint(this._activeBuffer.x - 1, 0, 1, u3);\n      let p3 = this._parser.precedingJoinState;\n      for (let b4 = i5; b4 < r; ++b4) {\n        if (s4 = e[b4], s4 === 173) continue;\n        if (s4 < 127 && a2) {\n          let w6 = a2[String.fromCharCode(s4)];\n          w6 && (s4 = w6.charCodeAt(0));\n        }\n        let f5 = this._unicodeService.charProperties(s4, p3);\n        o2 = be3.extractWidth(f5);\n        let S4 = be3.extractShouldJoin(f5), I4 = S4 ? be3.extractWidth(p3) : 0;\n        if (p3 = f5, l4 && this._onA11yChar.fire(ve2(s4)), this._getCurrentLinkId() && this._oscLinkService.addLineToLink(this._getCurrentLinkId(), this._activeBuffer.ybase + this._activeBuffer.y), this._activeBuffer.x + o2 - I4 > h3) {\n          if (d3) {\n            let w6 = _5, x5 = this._activeBuffer.x - I4;\n            if (this._activeBuffer.x = I4, this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData(), true)) : (this._activeBuffer.y >= this._bufferService.rows && (this._activeBuffer.y = this._bufferService.rows - 1), this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = true), _5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y), !_5) return;\n            for (I4 > 0 && _5 instanceof Re4 && _5.copyCellsFrom(w6, x5, 0, I4, false); x5 < h3; ) w6.setCellFromCodepoint(x5++, 0, 1, u3);\n          } else if (this._activeBuffer.x = h3 - 1, o2 === 2) continue;\n        }\n        if (S4 && this._activeBuffer.x) {\n          let w6 = _5.getWidth(this._activeBuffer.x - 1) ? 1 : 2;\n          _5.addCodepointToCell(this._activeBuffer.x - w6, s4, o2);\n          for (let x5 = o2 - I4; --x5 >= 0; ) _5.setCellFromCodepoint(this._activeBuffer.x++, 0, 0, u3);\n          continue;\n        }\n        if (c2 && (_5.insertCells(this._activeBuffer.x, o2 - I4, this._activeBuffer.getNullCell(u3)), _5.getWidth(h3 - 1) === 2 && _5.setCellFromCodepoint(h3 - 1, 0, 1, u3)), _5.setCellFromCodepoint(this._activeBuffer.x++, s4, o2, u3), o2 > 0) for (; --o2; ) _5.setCellFromCodepoint(this._activeBuffer.x++, 0, 0, u3);\n      }\n      this._parser.precedingJoinState = p3, this._activeBuffer.x < h3 && r - i5 > 0 && _5.getWidth(this._activeBuffer.x) === 0 && !_5.hasContent(this._activeBuffer.x) && _5.setCellFromCodepoint(this._activeBuffer.x, 0, 1, u3), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    registerCsiHandler(e, i5) {\n      return e.final === "t" && !e.prefix && !e.intermediates ? this._parser.registerCsiHandler(e, (r) => On(r.params[0], this._optionsService.rawOptions.windowOptions) ? i5(r) : true) : this._parser.registerCsiHandler(e, i5);\n    }\n    registerDcsHandler(e, i5) {\n      return this._parser.registerDcsHandler(e, new di(i5));\n    }\n    registerEscHandler(e, i5) {\n      return this._parser.registerEscHandler(e, i5);\n    }\n    registerOscHandler(e, i5) {\n      return this._parser.registerOscHandler(e, new re2(i5));\n    }\n    registerApcHandler(e, i5) {\n      return this._parser.registerApcHandler(e, new br(i5));\n    }\n    bell() {\n      return this._onRequestBell.fire(), true;\n    }\n    lineFeed() {\n      return this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._optionsService.rawOptions.convertEol && (this._activeBuffer.x = 0), this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData())) : this._activeBuffer.y >= this._bufferService.rows ? this._activeBuffer.y = this._bufferService.rows - 1 : this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = false, this._activeBuffer.x >= this._bufferService.cols && this._activeBuffer.x--, this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._onLineFeed.fire(), true;\n    }\n    carriageReturn() {\n      return this._activeBuffer.x = 0, true;\n    }\n    backspace() {\n      if (!this._coreService.decPrivateModes.reverseWraparound) return this._restrictCursor(), this._activeBuffer.x > 0 && this._activeBuffer.x--, true;\n      if (this._restrictCursor(this._bufferService.cols), this._activeBuffer.x > 0) this._activeBuffer.x--;\n      else if (this._activeBuffer.x === 0 && this._activeBuffer.y > this._activeBuffer.scrollTop && this._activeBuffer.y <= this._activeBuffer.scrollBottom && this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y)?.isWrapped) {\n        this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).isWrapped = false, this._activeBuffer.y--, this._activeBuffer.x = this._bufferService.cols - 1;\n        let e = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n        e.hasWidth(this._activeBuffer.x) && !e.hasContent(this._activeBuffer.x) && this._activeBuffer.x--;\n      }\n      return this._restrictCursor(), true;\n    }\n    tab() {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let e = this._activeBuffer.x;\n      return this._activeBuffer.x = this._activeBuffer.nextStop(), this._optionsService.rawOptions.screenReaderMode && this._onA11yTab.fire(this._activeBuffer.x - e), true;\n    }\n    shiftOut() {\n      return this._charsetService.setgLevel(1), true;\n    }\n    shiftIn() {\n      return this._charsetService.setgLevel(0), true;\n    }\n    _restrictCursor(e = this._bufferService.cols - 1) {\n      this._activeBuffer.x = Math.min(e, Math.max(0, this._activeBuffer.x)), this._activeBuffer.y = this._coreService.decPrivateModes.origin ? Math.min(this._activeBuffer.scrollBottom, Math.max(this._activeBuffer.scrollTop, this._activeBuffer.y)) : Math.min(this._bufferService.rows - 1, Math.max(0, this._activeBuffer.y)), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    _setCursor(e, i5) {\n      this._dirtyRowTracker.markDirty(this._activeBuffer.y), this._coreService.decPrivateModes.origin ? (this._activeBuffer.x = e, this._activeBuffer.y = this._activeBuffer.scrollTop + i5) : (this._activeBuffer.x = e, this._activeBuffer.y = i5), this._restrictCursor(), this._dirtyRowTracker.markDirty(this._activeBuffer.y);\n    }\n    _moveCursor(e, i5) {\n      this._restrictCursor(), this._setCursor(this._activeBuffer.x + e, this._activeBuffer.y + i5);\n    }\n    cursorUp(e) {\n      let i5 = this._activeBuffer.y - this._activeBuffer.scrollTop;\n      return i5 >= 0 ? this._moveCursor(0, -Math.min(i5, e.params[0] || 1)) : this._moveCursor(0, -(e.params[0] || 1)), true;\n    }\n    cursorDown(e) {\n      let i5 = this._activeBuffer.scrollBottom - this._activeBuffer.y;\n      return i5 >= 0 ? this._moveCursor(0, Math.min(i5, e.params[0] || 1)) : this._moveCursor(0, e.params[0] || 1), true;\n    }\n    cursorForward(e) {\n      return this._moveCursor(e.params[0] || 1, 0), true;\n    }\n    cursorBackward(e) {\n      return this._moveCursor(-(e.params[0] || 1), 0), true;\n    }\n    cursorNextLine(e) {\n      return this.cursorDown(e), this._activeBuffer.x = 0, true;\n    }\n    cursorPrecedingLine(e) {\n      return this.cursorUp(e), this._activeBuffer.x = 0, true;\n    }\n    cursorCharAbsolute(e) {\n      return this._setCursor((e.params[0] || 1) - 1, this._activeBuffer.y), true;\n    }\n    cursorPosition(e) {\n      return this._setCursor(e.length >= 2 ? (e.params[1] || 1) - 1 : 0, (e.params[0] || 1) - 1), true;\n    }\n    charPosAbsolute(e) {\n      return this._setCursor((e.params[0] || 1) - 1, this._activeBuffer.y), true;\n    }\n    hPositionRelative(e) {\n      return this._moveCursor(e.params[0] || 1, 0), true;\n    }\n    linePosAbsolute(e) {\n      return this._setCursor(this._activeBuffer.x, (e.params[0] || 1) - 1), true;\n    }\n    vPositionRelative(e) {\n      return this._moveCursor(0, e.params[0] || 1), true;\n    }\n    hVPosition(e) {\n      return this.cursorPosition(e), true;\n    }\n    tabClear(e) {\n      let i5 = e.params[0];\n      return i5 === 0 ? delete this._activeBuffer.tabs[this._activeBuffer.x] : i5 === 3 && (this._activeBuffer.tabs = {}), true;\n    }\n    cursorForwardTab(e) {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.x = this._activeBuffer.nextStop();\n      return true;\n    }\n    cursorBackwardTab(e) {\n      if (this._activeBuffer.x >= this._bufferService.cols) return true;\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.x = this._activeBuffer.prevStop();\n      return true;\n    }\n    selectProtected(e) {\n      let i5 = e.params[0];\n      return i5 === 1 && (this._curAttrData.bg |= 536870912), (i5 === 2 || i5 === 0) && (this._curAttrData.bg &= -536870913), true;\n    }\n    _eraseInBufferLine(e, i5, r, s4 = false, o2 = false) {\n      let a2 = this._activeBuffer.lines.get(this._activeBuffer.ybase + e);\n      a2 && (a2.replaceCells(i5, r, this._activeBuffer.getNullCell(this._eraseAttrData()), o2), s4 && (a2.isWrapped = false));\n    }\n    _resetBufferLine(e, i5 = false) {\n      let r = this._activeBuffer.lines.get(this._activeBuffer.ybase + e);\n      r && (r.fill(this._activeBuffer.getNullCell(this._eraseAttrData()), i5), this._bufferService.buffer.clearMarkers(this._activeBuffer.ybase + e), r.isWrapped = false);\n    }\n    eraseInDisplay(e, i5 = false) {\n      this._restrictCursor(this._bufferService.cols);\n      let r;\n      switch (e.params[0]) {\n        case 0:\n          for (r = this._activeBuffer.y, this._dirtyRowTracker.markDirty(r), this._eraseInBufferLine(r++, this._activeBuffer.x, this._bufferService.cols, this._activeBuffer.x === 0, i5); r < this._bufferService.rows; r++) this._resetBufferLine(r, i5);\n          this._dirtyRowTracker.markDirty(r);\n          break;\n        case 1:\n          if (r = this._activeBuffer.y, this._dirtyRowTracker.markDirty(r), this._eraseInBufferLine(r, 0, this._activeBuffer.x + 1, true, i5), this._activeBuffer.x + 1 >= this._bufferService.cols) {\n            let o2 = this._activeBuffer.lines.get(r + 1);\n            o2 && (o2.isWrapped = false);\n          }\n          for (; r--; ) this._resetBufferLine(r, i5);\n          this._dirtyRowTracker.markDirty(0);\n          break;\n        case 2:\n          if (this._optionsService.rawOptions.scrollOnEraseInDisplay) {\n            for (r = this._bufferService.rows, this._dirtyRowTracker.markRangeDirty(0, r - 1); r-- && !this._activeBuffer.lines.get(this._activeBuffer.ybase + r)?.getTrimmedLength(); ) ;\n            for (; r >= 0; r--) this._bufferService.scroll(this._eraseAttrData());\n          } else {\n            for (r = this._bufferService.rows, this._dirtyRowTracker.markDirty(r - 1); r--; ) this._resetBufferLine(r, i5);\n            this._dirtyRowTracker.markDirty(0);\n          }\n          break;\n        case 3:\n          let s4 = this._activeBuffer.lines.length - this._bufferService.rows;\n          s4 > 0 && (this._activeBuffer.lines.trimStart(s4), this._activeBuffer.ybase = Math.max(this._activeBuffer.ybase - s4, 0), this._activeBuffer.ydisp = Math.max(this._activeBuffer.ydisp - s4, 0), this._onScroll.fire(0));\n          break;\n      }\n      return true;\n    }\n    eraseInLine(e, i5 = false) {\n      switch (this._restrictCursor(this._bufferService.cols), e.params[0]) {\n        case 0:\n          this._eraseInBufferLine(this._activeBuffer.y, this._activeBuffer.x, this._bufferService.cols, this._activeBuffer.x === 0, i5);\n          break;\n        case 1:\n          this._eraseInBufferLine(this._activeBuffer.y, 0, this._activeBuffer.x + 1, false, i5);\n          break;\n        case 2:\n          this._eraseInBufferLine(this._activeBuffer.y, 0, this._bufferService.cols, true, i5);\n          break;\n      }\n      return this._dirtyRowTracker.markDirty(this._activeBuffer.y), true;\n    }\n    insertLines(e) {\n      this._restrictCursor();\n      let i5 = e.params[0] || 1;\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let r = this._activeBuffer.ybase + this._activeBuffer.y, s4 = this._bufferService.rows - 1 - this._activeBuffer.scrollBottom, o2 = this._bufferService.rows - 1 + this._activeBuffer.ybase - s4 + 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(o2 - 1, 1), this._activeBuffer.lines.splice(r, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y, this._activeBuffer.scrollBottom), this._activeBuffer.x = 0, true;\n    }\n    deleteLines(e) {\n      this._restrictCursor();\n      let i5 = e.params[0] || 1;\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let r = this._activeBuffer.ybase + this._activeBuffer.y, s4;\n      for (s4 = this._bufferService.rows - 1 - this._activeBuffer.scrollBottom, s4 = this._bufferService.rows - 1 + this._activeBuffer.ybase - s4; i5--; ) this._activeBuffer.lines.splice(r, 1), this._activeBuffer.lines.splice(s4, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y, this._activeBuffer.scrollBottom), this._activeBuffer.x = 0, true;\n    }\n    insertChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.insertCells(this._activeBuffer.x, e.params[0] || 1, this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    deleteChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.deleteCells(this._activeBuffer.x, e.params[0] || 1, this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    scrollUp(e) {\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollTop, 1), this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollBottom, 0, this._activeBuffer.getBlankLine(this._eraseAttrData()));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollDown(e) {\n      let i5 = e.params[0] || 1;\n      for (; i5--; ) this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollBottom, 1), this._activeBuffer.lines.splice(this._activeBuffer.ybase + this._activeBuffer.scrollTop, 0, this._activeBuffer.getBlankLine(U5));\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollLeft(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.deleteCells(0, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    scrollRight(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.insertCells(0, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    insertColumns(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.insertCells(this._activeBuffer.x, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    deleteColumns(e) {\n      if (this._activeBuffer.y > this._activeBuffer.scrollBottom || this._activeBuffer.y < this._activeBuffer.scrollTop) return true;\n      let i5 = e.params[0] || 1;\n      for (let r = this._activeBuffer.scrollTop; r <= this._activeBuffer.scrollBottom; ++r) {\n        let s4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + r);\n        s4.deleteCells(this._activeBuffer.x, i5, this._activeBuffer.getNullCell(this._eraseAttrData())), s4.isWrapped = false;\n      }\n      return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom), true;\n    }\n    eraseChars(e) {\n      this._restrictCursor();\n      let i5 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y);\n      return i5 && (i5.replaceCells(this._activeBuffer.x, this._activeBuffer.x + (e.params[0] || 1), this._activeBuffer.getNullCell(this._eraseAttrData())), this._dirtyRowTracker.markDirty(this._activeBuffer.y)), true;\n    }\n    repeatPrecedingCharacter(e) {\n      let i5 = this._parser.precedingJoinState;\n      if (!i5) return true;\n      let r = e.params[0] || 1, s4 = be3.extractWidth(i5), o2 = this._activeBuffer.x - s4, l4 = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y).getString(o2), h3 = new Uint32Array(l4.length * r), d3 = 0;\n      for (let u3 = 0; u3 < l4.length; ) {\n        let _5 = l4.codePointAt(u3) || 0;\n        h3[d3++] = _5, u3 += _5 > 65535 ? 2 : 1;\n      }\n      let c2 = d3;\n      for (let u3 = 1; u3 < r; ++u3) h3.copyWithin(c2, 0, d3), c2 += d3;\n      return this.print(h3, 0, c2), true;\n    }\n    sendDeviceAttributesPrimary(e) {\n      return e.params[0] > 0 || (this._is("xterm") || this._is("rxvt-unicode") || this._is("screen") ? this._coreService.triggerDataEvent("\\x1B[?1;2c") : this._is("linux") && this._coreService.triggerDataEvent("\\x1B[?6c")), true;\n    }\n    sendDeviceAttributesSecondary(e) {\n      return e.params[0] > 0 || (this._is("xterm") ? this._coreService.triggerDataEvent("\\x1B[>0;276;0c") : this._is("rxvt-unicode") ? this._coreService.triggerDataEvent("\\x1B[>85;95;0c") : this._is("linux") ? this._coreService.triggerDataEvent(e.params[0] + "c") : this._is("screen") && this._coreService.triggerDataEvent("\\x1B[>83;40003;0c")), true;\n    }\n    sendXtVersion(e) {\n      return e.params[0] > 0 || this._coreService.triggerDataEvent(`\\x1BP>|xterm.js(${Mn})\\x1B\\\\`), true;\n    }\n    _is(e) {\n      return (this._optionsService.rawOptions.termName + "").startsWith(e);\n    }\n    setMode(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 4:\n          this._coreService.modes.insertMode = true;\n          break;\n        case 20:\n          this._optionsService.options.convertEol = true;\n          break;\n      }\n      return true;\n    }\n    setModePrivate(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 1:\n          this._coreService.decPrivateModes.applicationCursorKeys = true;\n          break;\n        case 2:\n          this._charsetService.setgCharset(0, Le2), this._charsetService.setgCharset(1, Le2), this._charsetService.setgCharset(2, Le2), this._charsetService.setgCharset(3, Le2);\n          break;\n        case 3:\n          this._optionsService.rawOptions.windowOptions.setWinLines && (this._bufferService.resize(132, this._bufferService.rows), this._onRequestReset.fire());\n          break;\n        case 6:\n          this._coreService.decPrivateModes.origin = true, this._setCursor(0, 0);\n          break;\n        case 7:\n          this._coreService.decPrivateModes.wraparound = true;\n          break;\n        case 12:\n          this._optionsService.rawOptions.quirks?.allowSetCursorBlink && (this._optionsService.options.cursorBlink = true);\n          break;\n        case 45:\n          this._coreService.decPrivateModes.reverseWraparound = true;\n          break;\n        case 66:\n          this._logService.debug("Serial port requested application keypad."), this._coreService.decPrivateModes.applicationKeypad = true, this._onRequestSyncScrollBar.fire();\n          break;\n        case 9:\n          this._mouseStateService.activeProtocol = "X10";\n          break;\n        case 1e3:\n          this._mouseStateService.activeProtocol = "VT200";\n          break;\n        case 1002:\n          this._mouseStateService.activeProtocol = "DRAG";\n          break;\n        case 1003:\n          this._mouseStateService.activeProtocol = "ANY";\n          break;\n        case 1004:\n          this._coreService.decPrivateModes.sendFocus = true, this._onRequestSendFocus.fire();\n          break;\n        case 1005:\n          this._logService.debug("DECSET 1005 not supported (see #2507)");\n          break;\n        case 1006:\n          this._mouseStateService.activeEncoding = "SGR";\n          break;\n        case 1015:\n          this._logService.debug("DECSET 1015 not supported (see #2507)");\n          break;\n        case 1016:\n          this._mouseStateService.activeEncoding = "SGR_PIXELS";\n          break;\n        case 25:\n          this._coreService.isCursorHidden = false;\n          break;\n        case 1048:\n          this.saveCursor();\n          break;\n        case 1049:\n          this.saveCursor();\n        case 47:\n        case 1047:\n          if (this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) {\n            let r = this._coreService.kittyKeyboard;\n            r.mainFlags = r.flags, r.flags = r.altFlags;\n          }\n          this._bufferService.buffers.activateAltBuffer(this._eraseAttrData()), this._coreService.isCursorInitialized = true, this._onRequestRefreshRows.fire(void 0), this._onRequestSyncScrollBar.fire();\n          break;\n        case 2004:\n          this._coreService.decPrivateModes.bracketedPasteMode = true;\n          break;\n        case 2026:\n          this._coreService.decPrivateModes.synchronizedOutput = true;\n          break;\n        case 2031:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && (this._coreService.decPrivateModes.colorSchemeUpdates = true);\n          break;\n        case 9001:\n          this._optionsService.rawOptions.vtExtensions?.win32InputMode && (this._coreService.decPrivateModes.win32InputMode = true);\n          break;\n      }\n      return true;\n    }\n    resetMode(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 4:\n          this._coreService.modes.insertMode = false;\n          break;\n        case 20:\n          this._optionsService.options.convertEol = false;\n          break;\n      }\n      return true;\n    }\n    resetModePrivate(e) {\n      for (let i5 = 0; i5 < e.length; i5++) switch (e.params[i5]) {\n        case 1:\n          this._coreService.decPrivateModes.applicationCursorKeys = false;\n          break;\n        case 3:\n          this._optionsService.rawOptions.windowOptions.setWinLines && (this._bufferService.resize(80, this._bufferService.rows), this._onRequestReset.fire());\n          break;\n        case 6:\n          this._coreService.decPrivateModes.origin = false, this._setCursor(0, 0);\n          break;\n        case 7:\n          this._coreService.decPrivateModes.wraparound = false;\n          break;\n        case 12:\n          this._optionsService.rawOptions.quirks?.allowSetCursorBlink && (this._optionsService.options.cursorBlink = false);\n          break;\n        case 45:\n          this._coreService.decPrivateModes.reverseWraparound = false;\n          break;\n        case 66:\n          this._logService.debug("Switching back to normal keypad."), this._coreService.decPrivateModes.applicationKeypad = false, this._onRequestSyncScrollBar.fire();\n          break;\n        case 9:\n        case 1e3:\n        case 1002:\n        case 1003:\n          this._mouseStateService.activeProtocol = "NONE";\n          break;\n        case 1004:\n          this._coreService.decPrivateModes.sendFocus = false;\n          break;\n        case 1005:\n          this._logService.debug("DECRST 1005 not supported (see #2507)");\n          break;\n        case 1006:\n          this._mouseStateService.activeEncoding = "DEFAULT";\n          break;\n        case 1015:\n          this._logService.debug("DECRST 1015 not supported (see #2507)");\n          break;\n        case 1016:\n          this._mouseStateService.activeEncoding = "DEFAULT";\n          break;\n        case 25:\n          this._coreService.isCursorHidden = true;\n          break;\n        case 1048:\n          this.restoreCursor();\n          break;\n        case 1049:\n        case 47:\n        case 1047:\n          if (this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) {\n            let r = this._coreService.kittyKeyboard;\n            r.altFlags = r.flags, r.flags = r.mainFlags;\n          }\n          this._bufferService.buffers.activateNormalBuffer(), e.params[i5] === 1049 && this.restoreCursor(), this._coreService.isCursorInitialized = true, this._onRequestRefreshRows.fire(void 0), this._onRequestSyncScrollBar.fire();\n          break;\n        case 2004:\n          this._coreService.decPrivateModes.bracketedPasteMode = false;\n          break;\n        case 2026:\n          this._coreService.decPrivateModes.synchronizedOutput = false, this._onRequestRefreshRows.fire(void 0);\n          break;\n        case 2031:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && (this._coreService.decPrivateModes.colorSchemeUpdates = false);\n          break;\n        case 9001:\n          this._optionsService.rawOptions.vtExtensions?.win32InputMode && (this._coreService.decPrivateModes.win32InputMode = false);\n          break;\n      }\n      return true;\n    }\n    requestMode(e, i5) {\n      let r;\n      ((ce4) => (ce4[ce4.NOT_RECOGNIZED = 0] = "NOT_RECOGNIZED", ce4[ce4.SET = 1] = "SET", ce4[ce4.RESET = 2] = "RESET", ce4[ce4.PERMANENTLY_SET = 3] = "PERMANENTLY_SET", ce4[ce4.PERMANENTLY_RESET = 4] = "PERMANENTLY_RESET"))(r ||= {});\n      let s4 = this._coreService.decPrivateModes, { activeProtocol: o2, activeEncoding: a2 } = this._mouseStateService, l4 = this._coreService, { buffers: h3, cols: d3 } = this._bufferService, { active: c2, alt: u3 } = h3, _5 = this._optionsService.rawOptions, p3 = (S4, I4) => (l4.triggerDataEvent(`\\x1B[${i5 ? "" : "?"}${S4};${I4}$y`), true), b4 = (S4) => S4 ? 1 : 2, f5 = e.params[0];\n      return i5 ? f5 === 2 ? p3(f5, 4) : f5 === 4 ? p3(f5, b4(l4.modes.insertMode)) : f5 === 12 ? p3(f5, 3) : f5 === 20 ? p3(f5, b4(_5.convertEol)) : p3(f5, 0) : f5 === 1 ? p3(f5, b4(s4.applicationCursorKeys)) : f5 === 3 ? p3(f5, _5.windowOptions.setWinLines ? d3 === 80 ? 2 : d3 === 132 ? 1 : 0 : 0) : f5 === 6 ? p3(f5, b4(s4.origin)) : f5 === 7 ? p3(f5, b4(s4.wraparound)) : f5 === 8 ? p3(f5, 3) : f5 === 9 ? p3(f5, b4(o2 === "X10")) : f5 === 12 ? p3(f5, b4(_5.cursorBlink)) : f5 === 25 ? p3(f5, b4(!l4.isCursorHidden)) : f5 === 45 ? p3(f5, b4(s4.reverseWraparound)) : f5 === 66 ? p3(f5, b4(s4.applicationKeypad)) : f5 === 67 ? p3(f5, 4) : f5 === 1e3 ? p3(f5, b4(o2 === "VT200")) : f5 === 1002 ? p3(f5, b4(o2 === "DRAG")) : f5 === 1003 ? p3(f5, b4(o2 === "ANY")) : f5 === 1004 ? p3(f5, b4(s4.sendFocus)) : f5 === 1005 ? p3(f5, 4) : f5 === 1006 ? p3(f5, b4(a2 === "SGR")) : f5 === 1015 ? p3(f5, 4) : f5 === 1016 ? p3(f5, b4(a2 === "SGR_PIXELS")) : f5 === 1048 ? p3(f5, 1) : f5 === 47 || f5 === 1047 || f5 === 1049 ? p3(f5, b4(c2 === u3)) : f5 === 2004 ? p3(f5, b4(s4.bracketedPasteMode)) : f5 === 2026 ? p3(f5, b4(s4.synchronizedOutput)) : f5 === 9001 && this._optionsService.rawOptions.vtExtensions?.win32InputMode ? p3(f5, b4(s4.win32InputMode)) : p3(f5, 0);\n    }\n    _updateAttrColor(e, i5, r, s4, o2) {\n      return i5 === 2 ? (e |= 50331648, e &= -16777216, e |= fe2.fromColorRGB([r, s4, o2])) : i5 === 5 && (e &= -67108864, e |= 33554432 | r & 255), e;\n    }\n    _extractColor(e, i5, r) {\n      let s4 = [0, 0, -1, 0, 0, 0], o2 = 0, a2 = 0;\n      do {\n        if (s4[a2 + o2] = e.params[i5 + a2], e.hasSubParams(i5 + a2)) {\n          let l4 = e.getSubParams(i5 + a2), h3 = 0;\n          do\n            s4[1] === 5 && (o2 = 1), s4[a2 + h3 + 1 + o2] = l4[h3];\n          while (++h3 < l4.length && h3 + a2 + 1 + o2 < s4.length);\n          break;\n        }\n        if (s4[1] === 5 && a2 + o2 >= 2 || s4[1] === 2 && a2 + o2 >= 5) break;\n        s4[1] && (o2 = 1);\n      } while (++a2 + i5 < e.length && a2 + o2 < s4.length);\n      for (let l4 = 2; l4 < s4.length; ++l4) s4[l4] === -1 && (s4[l4] = 0);\n      switch (s4[0]) {\n        case 38:\n          r.fg = this._updateAttrColor(r.fg, s4[1], s4[3], s4[4], s4[5]);\n          break;\n        case 48:\n          r.bg = this._updateAttrColor(r.bg, s4[1], s4[3], s4[4], s4[5]);\n          break;\n        case 58:\n          r.extended = r.extended.clone(), r.extended.underlineColor = this._updateAttrColor(r.extended.underlineColor, s4[1], s4[3], s4[4], s4[5]);\n      }\n      return a2;\n    }\n    _processUnderline(e, i5) {\n      i5.extended = i5.extended.clone(), (!~e || e > 5) && (e = 1), i5.extended.underlineStyle = e, i5.fg |= 268435456, e === 0 && (i5.fg &= -268435457), i5.updateExtended();\n    }\n    _processSGR0(e) {\n      e.fg = U5.fg, e.bg = U5.bg, e.extended = e.extended.clone(), e.extended.underlineStyle = 0, e.extended.underlineColor &= -67108864, e.updateExtended();\n    }\n    charAttributes(e) {\n      if (e.length === 1 && e.params[0] === 0) return this._processSGR0(this._curAttrData), true;\n      let i5 = e.length, r, s4 = this._curAttrData;\n      for (let o2 = 0; o2 < i5; o2++) r = e.params[o2], r >= 30 && r <= 37 ? (s4.fg &= -67108864, s4.fg |= 16777216 | r - 30) : r >= 40 && r <= 47 ? (s4.bg &= -67108864, s4.bg |= 16777216 | r - 40) : r >= 90 && r <= 97 ? (s4.fg &= -67108864, s4.fg |= 16777216 | r - 90 | 8) : r >= 100 && r <= 107 ? (s4.bg &= -67108864, s4.bg |= 16777216 | r - 100 | 8) : r === 0 ? this._processSGR0(s4) : r === 1 ? s4.fg |= 134217728 : r === 3 ? s4.bg |= 67108864 : r === 4 ? (s4.fg |= 268435456, this._processUnderline(e.hasSubParams(o2) ? e.getSubParams(o2)[0] : 1, s4)) : r === 5 ? s4.fg |= 536870912 : r === 7 ? s4.fg |= 67108864 : r === 8 ? s4.fg |= 1073741824 : r === 9 ? s4.fg |= 2147483648 : r === 2 ? s4.bg |= 134217728 : r === 21 ? this._processUnderline(2, s4) : r === 22 ? (s4.fg &= -134217729, s4.bg &= -134217729) : r === 23 ? s4.bg &= -67108865 : r === 24 ? (s4.fg &= -268435457, this._processUnderline(0, s4)) : r === 25 ? s4.fg &= -536870913 : r === 27 ? s4.fg &= -67108865 : r === 28 ? s4.fg &= -1073741825 : r === 29 ? s4.fg &= 2147483647 : r === 39 ? (s4.fg &= -67108864, s4.fg |= U5.fg & 16777215) : r === 49 ? (s4.bg &= -67108864, s4.bg |= U5.bg & 16777215) : r === 38 || r === 48 || r === 58 ? o2 += this._extractColor(e, o2, s4) : r === 53 ? s4.bg |= 1073741824 : r === 55 ? s4.bg &= -1073741825 : r === 221 && (this._optionsService.rawOptions.vtExtensions?.kittySgrBoldFaintControl ?? true) ? s4.fg &= -134217729 : r === 222 && (this._optionsService.rawOptions.vtExtensions?.kittySgrBoldFaintControl ?? true) ? s4.bg &= -134217729 : r === 59 ? (s4.extended = s4.extended.clone(), s4.extended.underlineColor = -1, s4.updateExtended()) : this._logService.debug("Unknown SGR attribute: %d.", r);\n      return true;\n    }\n    deviceStatus(e) {\n      switch (e.params[0]) {\n        case 5:\n          this._coreService.triggerDataEvent("\\x1B[0n");\n          break;\n        case 6:\n          let i5 = this._activeBuffer.y + 1, r = this._activeBuffer.x + 1;\n          this._coreService.triggerDataEvent(`\\x1B[${i5};${r}R`);\n          break;\n      }\n      return true;\n    }\n    deviceStatusPrivate(e) {\n      switch (e.params[0]) {\n        case 6:\n          let i5 = this._activeBuffer.y + 1, r = this._activeBuffer.x + 1;\n          this._coreService.triggerDataEvent(`\\x1B[?${i5};${r}R`);\n          break;\n        case 15:\n          break;\n        case 25:\n          break;\n        case 26:\n          break;\n        case 53:\n          break;\n        case 996:\n          (this._optionsService.rawOptions.vtExtensions?.colorSchemeQuery ?? true) && this._onRequestColorSchemeQuery.fire();\n          break;\n      }\n      return true;\n    }\n    softReset(e) {\n      return this._coreService.isCursorHidden = false, this._onRequestSyncScrollBar.fire(), this._activeBuffer.scrollTop = 0, this._activeBuffer.scrollBottom = this._bufferService.rows - 1, this._curAttrData = U5.clone(), this._coreService.reset(), this._charsetService.reset(), this._activeBuffer.savedX = 0, this._activeBuffer.savedY = this._activeBuffer.ybase, this._activeBuffer.savedCurAttrData.fg = this._curAttrData.fg, this._activeBuffer.savedCurAttrData.bg = this._curAttrData.bg, this._activeBuffer.savedCharset = this._charsetService.charset, this._coreService.decPrivateModes.origin = false, true;\n    }\n    setCursorStyle(e) {\n      let i5 = e.length === 0 ? 1 : e.params[0];\n      if (i5 === 0) this._coreService.decPrivateModes.cursorStyle = void 0, this._coreService.decPrivateModes.cursorBlink = void 0;\n      else {\n        switch (i5) {\n          case 1:\n          case 2:\n            this._coreService.decPrivateModes.cursorStyle = "block";\n            break;\n          case 3:\n          case 4:\n            this._coreService.decPrivateModes.cursorStyle = "underline";\n            break;\n          case 5:\n          case 6:\n            this._coreService.decPrivateModes.cursorStyle = "bar";\n            break;\n        }\n        let r = i5 % 2 === 1;\n        this._coreService.decPrivateModes.cursorBlink = r;\n      }\n      return true;\n    }\n    setScrollRegion(e) {\n      let i5 = e.params[0] || 1, r;\n      return (e.length < 2 || (r = e.params[1]) > this._bufferService.rows || r === 0) && (r = this._bufferService.rows), r > i5 && (this._activeBuffer.scrollTop = i5 - 1, this._activeBuffer.scrollBottom = r - 1, this._setCursor(0, 0)), true;\n    }\n    windowOptions(e) {\n      if (!On(e.params[0], this._optionsService.rawOptions.windowOptions)) return true;\n      let i5 = e.length > 1 ? e.params[1] : 0;\n      switch (e.params[0]) {\n        case 14:\n          i5 !== 2 && this._onRequestWindowsOptionsReport.fire(0);\n          break;\n        case 16:\n          this._onRequestWindowsOptionsReport.fire(1);\n          break;\n        case 18:\n          this._bufferService && this._coreService.triggerDataEvent(`\\x1B[8;${this._bufferService.rows};${this._bufferService.cols}t`);\n          break;\n        case 22:\n          (i5 === 0 || i5 === 2) && (this._windowTitleStack.push(this._windowTitle), this._windowTitleStack.length > Bn && this._windowTitleStack.shift()), (i5 === 0 || i5 === 1) && (this._iconNameStack.push(this._iconName), this._iconNameStack.length > Bn && this._iconNameStack.shift());\n          break;\n        case 23:\n          (i5 === 0 || i5 === 2) && this._windowTitleStack.length && this.setTitle(this._windowTitleStack.pop()), (i5 === 0 || i5 === 1) && this._iconNameStack.length && this.setIconName(this._iconNameStack.pop());\n          break;\n      }\n      return true;\n    }\n    saveCursor(e) {\n      return this._activeBuffer.savedX = this._activeBuffer.x, this._activeBuffer.savedY = this._activeBuffer.ybase + this._activeBuffer.y, this._activeBuffer.savedCurAttrData.fg = this._curAttrData.fg, this._activeBuffer.savedCurAttrData.bg = this._curAttrData.bg, this._activeBuffer.savedCharset = this._charsetService.charset, this._activeBuffer.savedCharsets = this._charsetService.charsets.slice(), this._activeBuffer.savedGlevel = this._charsetService.glevel, this._activeBuffer.savedOriginMode = this._coreService.decPrivateModes.origin, this._activeBuffer.savedWraparoundMode = this._coreService.decPrivateModes.wraparound, true;\n    }\n    restoreCursor(e) {\n      this._activeBuffer.x = this._activeBuffer.savedX || 0, this._activeBuffer.y = Math.max(this._activeBuffer.savedY - this._activeBuffer.ybase, 0), this._curAttrData.fg = this._activeBuffer.savedCurAttrData.fg, this._curAttrData.bg = this._activeBuffer.savedCurAttrData.bg;\n      for (let i5 = 0; i5 < this._activeBuffer.savedCharsets.length; i5++) this._charsetService.setgCharset(i5, this._activeBuffer.savedCharsets[i5]);\n      return this._charsetService.setgLevel(this._activeBuffer.savedGlevel), this._coreService.decPrivateModes.origin = this._activeBuffer.savedOriginMode, this._coreService.decPrivateModes.wraparound = this._activeBuffer.savedWraparoundMode, this._restrictCursor(), true;\n    }\n    setTitle(e) {\n      return this._windowTitle = e, this._onTitleChange.fire(e), true;\n    }\n    setIconName(e) {\n      return this._iconName = e, true;\n    }\n    setOrReportIndexedColor(e) {\n      let i5 = [], r = e.split(";");\n      for (; r.length > 1; ) {\n        let s4 = r.shift(), o2 = r.shift();\n        if (/^\\d+$/.exec(s4)) {\n          let a2 = parseInt(s4);\n          if (Hn(a2)) if (o2 === "?") i5.push({ type: 0, index: a2 });\n          else {\n            let l4 = As(o2);\n            l4 && i5.push({ type: 1, index: a2, color: l4 });\n          }\n        }\n      }\n      return i5.length && this._onColor.fire(i5), true;\n    }\n    setHyperlink(e) {\n      let i5 = e.indexOf(";");\n      if (i5 === -1) return true;\n      let r = e.slice(0, i5).trim(), s4 = e.slice(i5 + 1);\n      return s4 ? this._createHyperlink(r, s4) : r.trim() ? false : this._finishHyperlink();\n    }\n    _createHyperlink(e, i5) {\n      this._getCurrentLinkId() && this._finishHyperlink();\n      let r = e.split(":"), s4, o2 = r.findIndex((a2) => a2.startsWith("id="));\n      return o2 !== -1 && (s4 = r[o2].slice(3) || void 0), this._curAttrData.extended = this._curAttrData.extended.clone(), this._curAttrData.extended.urlId = this._oscLinkService.registerLink({ id: s4, uri: i5 }), this._curAttrData.updateExtended(), true;\n    }\n    _finishHyperlink() {\n      return this._curAttrData.extended = this._curAttrData.extended.clone(), this._curAttrData.extended.urlId = 0, this._curAttrData.updateExtended(), true;\n    }\n    _setOrReportSpecialColor(e, i5) {\n      let r = e.split(";");\n      for (let s4 = 0; s4 < r.length && !(i5 >= this._specialColors.length); ++s4, ++i5) if (r[s4] === "?") this._onColor.fire([{ type: 0, index: this._specialColors[i5] }]);\n      else {\n        let o2 = As(r[s4]);\n        o2 && this._onColor.fire([{ type: 1, index: this._specialColors[i5], color: o2 }]);\n      }\n      return true;\n    }\n    setOrReportFgColor(e) {\n      return this._setOrReportSpecialColor(e, 0);\n    }\n    setOrReportBgColor(e) {\n      return this._setOrReportSpecialColor(e, 1);\n    }\n    setOrReportCursorColor(e) {\n      return this._setOrReportSpecialColor(e, 2);\n    }\n    restoreIndexedColor(e) {\n      if (!e) return this._onColor.fire([{ type: 2 }]), true;\n      let i5 = [], r = e.split(";");\n      for (let s4 = 0; s4 < r.length; ++s4) if (/^\\d+$/.exec(r[s4])) {\n        let o2 = parseInt(r[s4]);\n        Hn(o2) && i5.push({ type: 2, index: o2 });\n      }\n      return i5.length && this._onColor.fire(i5), true;\n    }\n    restoreFgColor(e) {\n      return this._onColor.fire([{ type: 2, index: 256 }]), true;\n    }\n    restoreBgColor(e) {\n      return this._onColor.fire([{ type: 2, index: 257 }]), true;\n    }\n    restoreCursorColor(e) {\n      return this._onColor.fire([{ type: 2, index: 258 }]), true;\n    }\n    nextLine() {\n      return this._activeBuffer.x = 0, this.index(), true;\n    }\n    keypadApplicationMode() {\n      return this._logService.debug("Serial port requested application keypad."), this._coreService.decPrivateModes.applicationKeypad = true, this._onRequestSyncScrollBar.fire(), true;\n    }\n    keypadNumericMode() {\n      return this._logService.debug("Switching back to normal keypad."), this._coreService.decPrivateModes.applicationKeypad = false, this._onRequestSyncScrollBar.fire(), true;\n    }\n    selectDefaultCharset() {\n      return this._charsetService.setgLevel(0), this._charsetService.setgCharset(0, Le2), true;\n    }\n    selectCharset(e) {\n      return e.length !== 2 ? (this.selectDefaultCharset(), true) : (e[0] === "/" || this._charsetService.setgCharset(Go2[e[0]], V4[e[1]] ?? Le2), true);\n    }\n    index() {\n      return this._restrictCursor(), this._activeBuffer.y++, this._activeBuffer.y === this._activeBuffer.scrollBottom + 1 ? (this._activeBuffer.y--, this._bufferService.scroll(this._eraseAttrData())) : this._activeBuffer.y >= this._bufferService.rows && (this._activeBuffer.y = this._bufferService.rows - 1), this._restrictCursor(), true;\n    }\n    tabSet() {\n      return this._activeBuffer.tabs[this._activeBuffer.x] = true, true;\n    }\n    reverseIndex() {\n      if (this._restrictCursor(), this._activeBuffer.y === this._activeBuffer.scrollTop) {\n        let e = this._activeBuffer.scrollBottom - this._activeBuffer.scrollTop;\n        this._activeBuffer.lines.shiftElements(this._activeBuffer.ybase + this._activeBuffer.y, e, 1), this._activeBuffer.lines.set(this._activeBuffer.ybase + this._activeBuffer.y, this._activeBuffer.getBlankLine(this._eraseAttrData())), this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);\n      } else this._activeBuffer.y--, this._restrictCursor();\n      return true;\n    }\n    fullReset() {\n      return this._parser.reset(), this._onRequestReset.fire(), true;\n    }\n    reset() {\n      this._curAttrData = U5.clone(), this._eraseAttrDataInternal = U5.clone();\n    }\n    _eraseAttrData() {\n      return this._eraseAttrDataInternal.bg &= -67108864, this._eraseAttrDataInternal.bg |= this._curAttrData.bg & 67108863, this._eraseAttrDataInternal;\n    }\n    setgLevel(e) {\n      return this._charsetService.setgLevel(e), true;\n    }\n    screenAlignmentPattern() {\n      let e = new N2();\n      e.content = 1 << 22 | 69, e.fg = this._curAttrData.fg, e.bg = this._curAttrData.bg, this._setCursor(0, 0);\n      for (let i5 = 0; i5 < this._bufferService.rows; ++i5) {\n        let r = this._activeBuffer.ybase + this._activeBuffer.y + i5, s4 = this._activeBuffer.lines.get(r);\n        s4 && (s4.fill(e), s4.isWrapped = false);\n      }\n      return this._dirtyRowTracker.markAllDirty(), this._setCursor(0, 0), true;\n    }\n    requestStatusString(e, i5) {\n      let r = (l4) => (this._coreService.triggerDataEvent(`\\x1B${l4}\\x1B\\\\`), true), s4 = this._bufferService.buffer, o2 = this._optionsService.rawOptions, a2 = { block: 2, underline: 4, bar: 6 };\n      return r(e === \'"q\' ? `P1$r${this._curAttrData.isProtected() ? 1 : 0}"q` : e === \'"p\' ? \'P1$r61;1"p\' : e === "r" ? `P1$r${s4.scrollTop + 1};${s4.scrollBottom + 1}r` : e === "m" ? "P1$r0m" : e === " q" ? `P1$r${a2[o2.cursorStyle] - (o2.cursorBlink ? 1 : 0)} q` : "P0$r");\n    }\n    markRangeDirty(e, i5) {\n      this._dirtyRowTracker.markRangeDirty(e, i5);\n    }\n    kittyKeyboardSet(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = e.params[0] || 0, r = e.length > 1 && e.params[1] || 1, s4 = this._coreService.kittyKeyboard;\n      switch (r) {\n        case 1:\n          s4.flags = i5;\n          break;\n        case 2:\n          s4.flags |= i5;\n          break;\n        case 3:\n          s4.flags &= ~i5;\n          break;\n      }\n      return true;\n    }\n    kittyKeyboardQuery(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = this._coreService.kittyKeyboard.flags;\n      return this._coreService.triggerDataEvent(`\\x1B[?${i5}u`), true;\n    }\n    kittyKeyboardPush(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = e.params[0] || 0, r = this._coreService.kittyKeyboard, o2 = this._bufferService.buffer === this._bufferService.buffers.alt ? r.altStack : r.mainStack;\n      return o2.length >= 16 && o2.shift(), o2.push(r.flags), r.flags = i5, true;\n    }\n    kittyKeyboardPop(e) {\n      if (!this._optionsService.rawOptions.vtExtensions?.kittyKeyboard) return true;\n      let i5 = Math.max(1, e.params[0] || 1), r = this._coreService.kittyKeyboard, o2 = this._bufferService.buffer === this._bufferService.buffers.alt ? r.altStack : r.mainStack;\n      for (let a2 = 0; a2 < i5 && o2.length > 0; a2++) r.flags = o2.pop();\n      return o2.length === 0 && i5 > 0 && (r.flags = 0), true;\n    }\n  };\n  var fi = class {\n    constructor(t) {\n      this._bufferService = t;\n      this.clearRange();\n    }\n    clearRange() {\n      this.start = this._bufferService.buffer.y, this.end = this._bufferService.buffer.y;\n    }\n    markDirty(t) {\n      t < this.start ? this.start = t : t > this.end && (this.end = t);\n    }\n    markRangeDirty(t, e) {\n      t > e && (Fn = t, t = e, e = Fn), t < this.start && (this.start = t), e > this.end && (this.end = e);\n    }\n    markAllDirty() {\n      this.markRangeDirty(0, this._bufferService.rows - 1);\n    }\n  };\n  fi = E4([m3(0, L5)], fi);\n  function Hn(n11) {\n    return 0 <= n11 && n11 < 256;\n  }\n  var $o2 = 5e7;\n  var Wn2 = 12;\n  var Vo2 = 50;\n  var Ir2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._action = e;\n      this._writeBuffer = [];\n      this._callbacks = [];\n      this._pendingData = 0;\n      this._bufferOffset = 0;\n      this._isSyncWriting = false;\n      this._syncCalls = 0;\n      this._didUserInput = false;\n      this._onWriteParsed = this._register(new v5());\n      this.onWriteParsed = this._onWriteParsed.event;\n    }\n    handleUserInput() {\n      this._didUserInput = true;\n    }\n    flushSync() {\n      if (this._isSyncWriting) return;\n      this._isSyncWriting = true;\n      let e;\n      for (; e = this._writeBuffer.shift(); ) {\n        this._action(e);\n        let i5 = this._callbacks.shift();\n        i5 && i5();\n      }\n      this._pendingData = 0, this._bufferOffset = 2147483647, this._writeBuffer.length = 0, this._callbacks.length = 0, this._isSyncWriting = false;\n    }\n    writeSync(e, i5) {\n      if (i5 !== void 0 && this._syncCalls > i5) {\n        this._syncCalls = 0;\n        return;\n      }\n      if (this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(void 0), this._syncCalls++, this._isSyncWriting) return;\n      this._isSyncWriting = true;\n      let r;\n      for (; r = this._writeBuffer.shift(); ) {\n        this._action(r);\n        let s4 = this._callbacks.shift();\n        s4 && s4();\n      }\n      this._pendingData = 0, this._bufferOffset = 2147483647, this._isSyncWriting = false, this._syncCalls = 0;\n    }\n    write(e, i5) {\n      if (this._pendingData > $o2) throw new Error("write data discarded, use flow control to avoid losing data");\n      if (!this._writeBuffer.length) {\n        if (this._bufferOffset = 0, this._didUserInput) {\n          this._didUserInput = false, this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(i5), this._innerWrite();\n          return;\n        }\n        setTimeout(() => this._innerWrite());\n      }\n      this._pendingData += e.length, this._writeBuffer.push(e), this._callbacks.push(i5);\n    }\n    _innerWrite(e = 0, i5 = true) {\n      let r = e || performance.now();\n      for (; this._writeBuffer.length > this._bufferOffset; ) {\n        let s4 = this._writeBuffer[this._bufferOffset], o2 = this._action(s4, i5);\n        if (o2) {\n          let l4 = (h3) => performance.now() - r >= Wn2 ? setTimeout(() => this._innerWrite(0, h3)) : this._innerWrite(r, h3);\n          o2.catch((h3) => (queueMicrotask(() => {\n            throw h3;\n          }), Promise.resolve(false))).then(l4);\n          return;\n        }\n        let a2 = this._callbacks[this._bufferOffset];\n        if (a2 && a2(), this._bufferOffset++, this._pendingData -= s4.length, performance.now() - r >= Wn2) break;\n      }\n      this._writeBuffer.length > this._bufferOffset ? (this._bufferOffset > Vo2 && (this._writeBuffer = this._writeBuffer.slice(this._bufferOffset), this._callbacks = this._callbacks.slice(this._bufferOffset), this._bufferOffset = 0), setTimeout(() => this._innerWrite())) : (this._writeBuffer.length = 0, this._callbacks.length = 0, this._pendingData = 0, this._bufferOffset = 0), this._onWriteParsed.fire();\n    }\n  };\n  var Bt = class {\n    constructor(t) {\n      this._bufferService = t;\n      this._nextId = 1;\n      this._entriesWithId = /* @__PURE__ */ new Map();\n      this._dataByLinkId = /* @__PURE__ */ new Map();\n    }\n    registerLink(t) {\n      let e = this._bufferService.buffer;\n      if (t.id === void 0) {\n        let l4 = e.addMarker(e.ybase + e.y), h3 = { data: t, id: this._nextId++, lines: [l4] };\n        return l4.onDispose(() => this._removeMarkerFromLink(h3, l4)), this._dataByLinkId.set(h3.id, h3), h3.id;\n      }\n      let i5 = t, r = this._getEntryIdKey(i5), s4 = this._entriesWithId.get(r);\n      if (s4) return this.addLineToLink(s4.id, e.ybase + e.y), s4.id;\n      let o2 = e.addMarker(e.ybase + e.y), a2 = { id: this._nextId++, key: this._getEntryIdKey(i5), data: i5, lines: [o2] };\n      return o2.onDispose(() => this._removeMarkerFromLink(a2, o2)), this._entriesWithId.set(a2.key, a2), this._dataByLinkId.set(a2.id, a2), a2.id;\n    }\n    addLineToLink(t, e) {\n      let i5 = this._dataByLinkId.get(t);\n      if (i5 && i5.lines.every((r) => r.line !== e)) {\n        let r = this._bufferService.buffer.addMarker(e);\n        i5.lines.push(r), r.onDispose(() => this._removeMarkerFromLink(i5, r));\n      }\n    }\n    getLinkData(t) {\n      return this._dataByLinkId.get(t)?.data;\n    }\n    _getEntryIdKey(t) {\n      return `${t.id};;${t.uri}`;\n    }\n    _removeMarkerFromLink(t, e) {\n      let i5 = t.lines.indexOf(e);\n      i5 !== -1 && (t.lines.splice(i5, 1), t.lines.length === 0 && (t.data.id !== void 0 && this._entriesWithId.delete(t.key), this._dataByLinkId.delete(t.id)));\n    }\n  };\n  Bt = E4([m3(0, L5)], Bt);\n  var Un = false;\n  var Cr2 = class extends g5 {\n    constructor(e) {\n      super();\n      this._windowsWrappingHeuristics = this._register(new me3());\n      this._onBinary = this._register(new v5());\n      this.onBinary = this._onBinary.event;\n      this._onData = this._register(new v5());\n      this.onData = this._onData.event;\n      this._onLineFeed = this._register(new v5());\n      this.onLineFeed = this._onLineFeed.event;\n      this._onRender = this._register(new v5());\n      this.onRender = this._onRender.event;\n      this._onResize = this._register(new v5());\n      this.onResize = this._onResize.event;\n      this._onWriteParsed = this._register(new v5());\n      this.onWriteParsed = this._onWriteParsed.event;\n      this._onScroll = this._register(new v5());\n      this._instantiationService = new rr(), this.optionsService = this._register(new lr2(e)), this._instantiationService.setService(R3, this.optionsService), this._logService = this._register(this._instantiationService.createInstance(Dt2)), this._instantiationService.setService(pe, this._logService), this._bufferService = this._register(this._instantiationService.createInstance(Lt2)), this._instantiationService.setService(L5, this._bufferService), this.coreService = this._register(this._instantiationService.createInstance(Pt)), this._instantiationService.setService(Y, this.coreService), this.mouseStateService = this._register(this._instantiationService.createInstance(cr)), this._instantiationService.setService(et2, this.mouseStateService), this.unicodeService = this._register(this._instantiationService.createInstance(be3)), this._instantiationService.setService(js, this.unicodeService), this._charsetService = this._instantiationService.createInstance(dr), this._instantiationService.setService(Xs, this._charsetService), this._oscLinkService = this._instantiationService.createInstance(Bt), this._instantiationService.setService(Ii, this._oscLinkService), this._inputHandler = this._register(new gr(this._bufferService, this._charsetService, this.coreService, this._logService, this.optionsService, this._oscLinkService, this.mouseStateService, this.unicodeService)), this._register(X2.forward(this._inputHandler.onLineFeed, this._onLineFeed)), this._register(X2.forward(this._bufferService.onResize, this._onResize)), this._register(X2.forward(this.coreService.onData, this._onData)), this._register(X2.forward(this.coreService.onBinary, this._onBinary)), this._register(this.coreService.onRequestScrollToBottom(() => this.scrollToBottom(true))), this._register(this.coreService.onUserInput(() => this._writeBuffer.handleUserInput())), this._register(this.optionsService.onMultipleOptionChange(["windowsPty"], () => this._handleWindowsPtyOptionChange())), this._register(this._bufferService.onScroll(() => {\n        this._onScroll.fire({ position: this._bufferService.buffer.ydisp }), this._inputHandler.markRangeDirty(this._bufferService.buffer.scrollTop, this._bufferService.buffer.scrollBottom);\n      })), this._writeBuffer = this._register(new Ir2((i5, r) => this._inputHandler.parse(i5, r))), this._register(X2.forward(this._writeBuffer.onWriteParsed, this._onWriteParsed));\n    }\n    get onScroll() {\n      return this._onScrollApi || (this._onScrollApi = this._register(new v5()), this._onScroll.event((e) => {\n        this._onScrollApi?.fire(e.position);\n      })), this._onScrollApi.event;\n    }\n    get cols() {\n      return this._bufferService.cols;\n    }\n    get rows() {\n      return this._bufferService.rows;\n    }\n    get buffers() {\n      return this._bufferService.buffers;\n    }\n    get options() {\n      return this.optionsService.options;\n    }\n    set options(e) {\n      for (let i5 in e) this.optionsService.options[i5] = e[i5];\n    }\n    write(e, i5) {\n      this._writeBuffer.write(e, i5);\n    }\n    writeSync(e, i5) {\n      this._logService.logLevel <= 3 && !Un && (this._logService.warn("writeSync is unreliable and will be removed soon."), Un = true), this._writeBuffer.writeSync(e, i5);\n    }\n    input(e, i5 = true) {\n      this.coreService.triggerDataEvent(e, i5);\n    }\n    resize(e, i5) {\n      isNaN(e) || isNaN(i5) || (e = Math.max(e, Es), i5 = Math.max(i5, ys), this._writeBuffer.flushSync(), this._bufferService.resize(e, i5));\n    }\n    scroll(e, i5 = false) {\n      this._bufferService.scroll(e, i5);\n    }\n    scrollLines(e, i5) {\n      this._bufferService.scrollLines(e, i5);\n    }\n    scrollPages(e) {\n      this.scrollLines(e * (this.rows - 1));\n    }\n    scrollToTop() {\n      this.scrollLines(-this._bufferService.buffer.ydisp);\n    }\n    scrollToBottom(e) {\n      this.scrollLines(this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n    }\n    scrollToLine(e) {\n      let i5 = e - this._bufferService.buffer.ydisp;\n      i5 !== 0 && this.scrollLines(i5);\n    }\n    registerEscHandler(e, i5) {\n      return this._inputHandler.registerEscHandler(e, i5);\n    }\n    registerDcsHandler(e, i5) {\n      return this._inputHandler.registerDcsHandler(e, i5);\n    }\n    registerCsiHandler(e, i5) {\n      return this._inputHandler.registerCsiHandler(e, i5);\n    }\n    registerOscHandler(e, i5) {\n      return this._inputHandler.registerOscHandler(e, i5);\n    }\n    registerApcHandler(e, i5) {\n      return this._inputHandler.registerApcHandler(e, i5);\n    }\n    _setup() {\n      this._handleWindowsPtyOptionChange();\n    }\n    reset() {\n      this._inputHandler.reset(), this._bufferService.reset(), this._charsetService.reset(), this.coreService.reset(), this.mouseStateService.reset();\n    }\n    _handleWindowsPtyOptionChange() {\n      let e = false, i5 = this.optionsService.rawOptions.windowsPty;\n      i5 && i5.buildNumber !== void 0 && i5.buildNumber !== void 0 && (e = i5.backend === "conpty" && i5.buildNumber < 21376), e ? this._enableWindowsWrappingHeuristics() : this._windowsWrappingHeuristics.clear();\n    }\n    _enableWindowsWrappingHeuristics() {\n      if (!this._windowsWrappingHeuristics.value) {\n        let e = [];\n        e.push(this.onLineFeed(Ds.bind(null, this._bufferService))), e.push(this.registerCsiHandler({ final: "H" }, () => (Ds(this._bufferService), false))), this._windowsWrappingHeuristics.value = y4(() => {\n          for (let i5 of e) i5.dispose();\n        });\n      }\n    }\n  };\n  var K3 = 0;\n  var Er = class {\n    constructor(t, e) {\n      this._getKey = t;\n      this._array = [];\n      this._insertedValues = [];\n      this._isFlushingInserted = false;\n      this._deletedIndices = [];\n      this._isFlushingDeleted = false;\n      this._flushInsertedTask = new Et2(e), this._flushDeletedTask = new Et2(e);\n    }\n    clear() {\n      this._array.length = 0, this._insertedValues.length = 0, this._flushInsertedTask.clear(), this._isFlushingInserted = false, this._deletedIndices.length = 0, this._flushDeletedTask.clear(), this._isFlushingDeleted = false;\n    }\n    insert(t) {\n      this._flushCleanupDeleted(), this._insertedValues.length === 0 && this._flushInsertedTask.enqueue(() => this._flushInserted()), this._insertedValues.push(t);\n    }\n    _flushInserted() {\n      let t = this._insertedValues.sort((s4, o2) => this._getKey(s4) - this._getKey(o2)), e = 0, i5 = 0, r = new Array(this._array.length + this._insertedValues.length);\n      for (let s4 = 0; s4 < r.length; s4++) i5 >= this._array.length || this._getKey(t[e]) <= this._getKey(this._array[i5]) ? (r[s4] = t[e], e++) : r[s4] = this._array[i5++];\n      this._array = r, this._insertedValues.length = 0;\n    }\n    _flushCleanupInserted() {\n      !this._isFlushingInserted && this._insertedValues.length > 0 && this._flushInsertedTask.flush();\n    }\n    delete(t) {\n      if (this._flushCleanupInserted(), this._array.length === 0) return false;\n      let e = this._getKey(t);\n      if (e === void 0 || (K3 = this._search(e), K3 === -1) || this._getKey(this._array[K3]) !== e) return false;\n      do\n        if (this._array[K3] === t) return this._deletedIndices.length === 0 && this._flushDeletedTask.enqueue(() => this._flushDeleted()), this._deletedIndices.push(K3), true;\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === e);\n      return false;\n    }\n    _flushDeleted() {\n      this._isFlushingDeleted = true;\n      let t = this._deletedIndices.sort((s4, o2) => s4 - o2), e = 0, i5 = new Array(this._array.length - t.length), r = 0;\n      for (let s4 = 0; s4 < this._array.length; s4++) t[e] === s4 ? e++ : i5[r++] = this._array[s4];\n      this._array = i5, this._deletedIndices.length = 0, this._isFlushingDeleted = false;\n    }\n    _flushCleanupDeleted() {\n      !this._isFlushingDeleted && this._deletedIndices.length > 0 && this._flushDeletedTask.flush();\n    }\n    *getKeyIterator(t) {\n      if (this._flushCleanupInserted(), this._flushCleanupDeleted(), this._array.length !== 0 && (K3 = this._search(t), !(K3 < 0 || K3 >= this._array.length) && this._getKey(this._array[K3]) === t)) do\n        yield this._array[K3];\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === t);\n    }\n    forEachByKey(t, e) {\n      if (this._flushCleanupInserted(), this._flushCleanupDeleted(), this._array.length !== 0 && (K3 = this._search(t), !(K3 < 0 || K3 >= this._array.length) && this._getKey(this._array[K3]) === t)) do\n        e(this._array[K3]);\n      while (++K3 < this._array.length && this._getKey(this._array[K3]) === t);\n    }\n    values() {\n      return this._flushCleanupInserted(), this._flushCleanupDeleted(), [...this._array].values();\n    }\n    _search(t) {\n      let e = 0, i5 = this._array.length - 1;\n      for (; i5 >= e; ) {\n        let r = e + i5 >> 1, s4 = this._getKey(this._array[r]);\n        if (s4 > t) i5 = r - 1;\n        else if (s4 < t) e = r + 1;\n        else {\n          for (; r > 0 && this._getKey(this._array[r - 1]) === t; ) r--;\n          return r;\n        }\n      }\n      return e;\n    }\n  };\n  var ks = 0;\n  var Kn = 0;\n  var Ps = 0;\n  var zn = 0;\n  var Ot = class extends g5 {\n    constructor(e) {\n      super();\n      this._logService = e;\n      this._onDecorationRegistered = this._register(new v5());\n      this.onDecorationRegistered = this._onDecorationRegistered.event;\n      this._onDecorationRemoved = this._register(new v5());\n      this.onDecorationRemoved = this._onDecorationRemoved.event;\n      this._decorations = new Er((i5) => i5?.marker.line, this._logService), this._register(y4(() => this.reset()));\n    }\n    get decorations() {\n      return this._decorations.values();\n    }\n    registerDecoration(e) {\n      if (e.marker.isDisposed) return;\n      let i5 = new Ms(e);\n      if (i5) {\n        let r = i5.marker.onDispose(() => i5.dispose()), s4 = i5.onDispose(() => {\n          s4.dispose(), i5 && (this._decorations.delete(i5) && this._onDecorationRemoved.fire(i5), r.dispose());\n        });\n        this._decorations.insert(i5), this._onDecorationRegistered.fire(i5);\n      }\n      return i5;\n    }\n    reset() {\n      for (let e of this._decorations.values()) e.dispose();\n      this._decorations.clear();\n    }\n    *getDecorationsAtCell(e, i5, r) {\n      let s4 = 0, o2 = 0, a2 = 0, l4 = 0;\n      for (let h3 of this._decorations.values()) a2 = h3.marker.line, l4 = a2 + (h3.options.height ?? 1), !(i5 < a2 || i5 >= l4) && (s4 = h3.options.x ?? 0, o2 = s4 + (h3.options.width ?? 1), e >= s4 && e < o2 && (!r || (h3.options.layer ?? "bottom") === r) && (yield h3));\n    }\n    forEachDecorationAtCell(e, i5, r, s4) {\n      for (let o2 of this._decorations.values()) Ps = o2.marker.line, zn = Ps + (o2.options.height ?? 1), !(i5 < Ps || i5 >= zn) && (ks = o2.options.x ?? 0, Kn = ks + (o2.options.width ?? 1), e >= ks && e < Kn && (!r || (o2.options.layer ?? "bottom") === r) && s4(o2));\n    }\n  };\n  Ot = E4([m3(0, pe)], Ot);\n  var Ms = class extends we2 {\n    constructor(e) {\n      super();\n      this.options = e;\n      this.onRenderEmitter = this.add(new v5());\n      this.onRender = this.onRenderEmitter.event;\n      this._onDispose = this.add(new v5());\n      this.onDispose = this._onDispose.event;\n      this._cachedBg = null;\n      this._cachedFg = null;\n      this.marker = e.marker, this.options.overviewRulerOptions && !this.options.overviewRulerOptions.position && (this.options.overviewRulerOptions.position = "full");\n    }\n    get backgroundColorRGB() {\n      return this._cachedBg === null && (this.options.backgroundColor ? this._cachedBg = M3.toColor(this.options.backgroundColor) : this._cachedBg = void 0), this._cachedBg;\n    }\n    get foregroundColorRGB() {\n      return this._cachedFg === null && (this.options.foregroundColor ? this._cachedFg = M3.toColor(this.options.foregroundColor) : this._cachedFg = void 0), this._cachedFg;\n    }\n    dispose() {\n      this._onDispose.fire(), super.dispose();\n    }\n  };\n  var qo2 = 1e3;\n  var yr = class {\n    constructor(t, e = qo2) {\n      this._renderCallback = t;\n      this._debounceThresholdMS = e;\n      this._lastRefreshMs = 0;\n      this._additionalRefreshRequested = false;\n    }\n    dispose() {\n      this._refreshTimeoutID && clearTimeout(this._refreshTimeoutID);\n    }\n    refresh(t, e, i5) {\n      this._rowCount = i5, t = t ?? 0, e = e ?? this._rowCount - 1, this._rowStart = this._rowStart !== void 0 ? Math.min(this._rowStart, t) : t, this._rowEnd = this._rowEnd !== void 0 ? Math.max(this._rowEnd, e) : e;\n      let r = performance.now();\n      if (r - this._lastRefreshMs >= this._debounceThresholdMS) this._lastRefreshMs = r, this._innerRefresh();\n      else if (!this._additionalRefreshRequested) {\n        let s4 = r - this._lastRefreshMs, o2 = this._debounceThresholdMS - s4;\n        this._additionalRefreshRequested = true, this._refreshTimeoutID = window.setTimeout(() => {\n          this._lastRefreshMs = performance.now(), this._innerRefresh(), this._additionalRefreshRequested = false, this._refreshTimeoutID = void 0;\n        }, o2);\n      }\n    }\n    _innerRefresh() {\n      if (this._rowStart === void 0 || this._rowEnd === void 0 || this._rowCount === void 0) return;\n      let t = Math.max(this._rowStart, 0), e = Math.min(this._rowEnd, this._rowCount - 1);\n      this._rowStart = void 0, this._rowEnd = void 0, this._renderCallback(t, e);\n    }\n  };\n  var Gn = 20;\n  var $n = false;\n  var je3 = class extends g5 {\n    constructor(e, i5, r, s4) {\n      super();\n      this._terminal = e;\n      this._coreBrowserService = r;\n      this._renderService = s4;\n      this._rowColumns = /* @__PURE__ */ new WeakMap();\n      this._liveRegionLineCount = 0;\n      this._charsToConsume = [];\n      this._charsToAnnounce = "";\n      let o2 = this._coreBrowserService.mainDocument;\n      this._accessibilityContainer = o2.createElement("div"), this._accessibilityContainer.classList.add("xterm-accessibility"), this._rowContainer = o2.createElement("div"), this._rowContainer.setAttribute("role", "list"), this._rowContainer.classList.add("xterm-accessibility-tree"), this._rowElements = [];\n      for (let a2 = 0; a2 < this._terminal.rows; a2++) this._rowElements[a2] = this._createAccessibilityTreeNode(), this._rowContainer.appendChild(this._rowElements[a2]);\n      if (this._topBoundaryFocusListener = (a2) => this._handleBoundaryFocus(a2, 0), this._bottomBoundaryFocusListener = (a2) => this._handleBoundaryFocus(a2, 1), this._rowElements[0].addEventListener("focus", this._topBoundaryFocusListener), this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._accessibilityContainer.appendChild(this._rowContainer), this._liveRegion = o2.createElement("div"), this._liveRegion.classList.add("live-region"), this._liveRegion.setAttribute("aria-live", "assertive"), this._accessibilityContainer.appendChild(this._liveRegion), this._liveRegionDebouncer = this._register(new yr(this._renderRows.bind(this))), !this._terminal.element) throw new Error("Cannot enable accessibility before Terminal.open");\n      $n ? (this._accessibilityContainer.classList.add("debug"), this._rowContainer.classList.add("debug"), this._debugRootContainer = o2.createElement("div"), this._debugRootContainer.classList.add("xterm"), this._debugRootContainer.appendChild(o2.createTextNode("------start a11y------")), this._debugRootContainer.appendChild(this._accessibilityContainer), this._debugRootContainer.appendChild(o2.createTextNode("------end a11y------")), this._terminal.element.insertAdjacentElement("afterend", this._debugRootContainer)) : this._terminal.element.insertAdjacentElement("afterbegin", this._accessibilityContainer), this._register(this._terminal.onResize((a2) => this._handleResize(a2.rows))), this._register(this._terminal.onRender((a2) => this._refreshRows(a2.start, a2.end))), this._register(this._terminal.onScroll(() => this._refreshRows())), this._register(this._terminal.onA11yChar((a2) => this._handleChar(a2))), this._register(this._terminal.onLineFeed(() => this._handleChar(`\n`))), this._register(this._terminal.onA11yTab((a2) => this._handleTab(a2))), this._register(this._terminal.onKey((a2) => this._handleKey(a2.key))), this._register(this._terminal.onBlur(() => this._clearLiveRegion())), this._register(this._renderService.onDimensionsChange(() => this._refreshRowsDimensions())), this._register(C3(o2, "selectionchange", () => this._handleSelectionChange())), this._register(this._coreBrowserService.onDprChange(() => this._refreshRowsDimensions())), this._refreshRowsDimensions(), this._refreshRows(), this._register(y4(() => {\n        $n ? this._debugRootContainer.remove() : this._accessibilityContainer.remove(), this._rowElements.length = 0;\n      }));\n    }\n    _handleTab(e) {\n      for (let i5 = 0; i5 < e; i5++) this._handleChar(" ");\n    }\n    _handleChar(e) {\n      this._liveRegionLineCount < Gn + 1 && (this._charsToConsume.length > 0 ? this._charsToConsume.shift() !== e && (this._charsToAnnounce += e) : this._charsToAnnounce += e, e === `\n` && (this._liveRegionLineCount++, this._liveRegionLineCount === Gn + 1 && (this._liveRegion.textContent = Je3.get())));\n    }\n    _clearLiveRegion() {\n      this._liveRegion.textContent = "", this._liveRegionLineCount = 0;\n    }\n    _handleKey(e) {\n      this._clearLiveRegion(), new RegExp("\\\\p{Control}", "u").test(e) || this._charsToConsume.push(e);\n    }\n    _refreshRows(e, i5) {\n      this._liveRegionDebouncer.refresh(e, i5, this._terminal.rows);\n    }\n    _renderRows(e, i5) {\n      let r = this._terminal.buffer, s4 = r.lines.length.toString();\n      for (let o2 = e; o2 <= i5; o2++) {\n        let a2 = r.lines.get(r.ydisp + o2), l4 = [], h3 = a2?.translateToString(true, void 0, void 0, l4) || "", d3 = (r.ydisp + o2 + 1).toString(), c2 = this._rowElements[o2];\n        c2 && (h3.length === 0 ? (c2.textContent = "\\xA0", this._rowColumns.set(c2, [0, 1])) : (c2.textContent = h3, this._rowColumns.set(c2, l4)), c2.setAttribute("aria-posinset", d3), c2.setAttribute("aria-setsize", s4), this._alignRowWidth(c2));\n      }\n      this._announceCharacters();\n    }\n    _announceCharacters() {\n      this._charsToAnnounce.length !== 0 && (this._liveRegion.textContent === Je3.get() && this._clearLiveRegion(), this._liveRegion.textContent += this._charsToAnnounce, this._charsToAnnounce = "");\n    }\n    _handleBoundaryFocus(e, i5) {\n      let r = e.target, s4 = this._rowElements[i5 === 0 ? 1 : this._rowElements.length - 2], o2 = r.getAttribute("aria-posinset"), a2 = i5 === 0 ? "1" : `${this._terminal.buffer.lines.length}`;\n      if (o2 === a2 || e.relatedTarget !== s4) return;\n      let l4, h3;\n      if (i5 === 0 ? (l4 = r, h3 = this._rowElements.pop(), this._rowContainer.removeChild(h3)) : (l4 = this._rowElements.shift(), h3 = r, this._rowContainer.removeChild(l4)), l4.removeEventListener("focus", this._topBoundaryFocusListener), h3.removeEventListener("focus", this._bottomBoundaryFocusListener), i5 === 0) {\n        let d3 = this._createAccessibilityTreeNode();\n        this._rowElements.unshift(d3), this._rowContainer.insertAdjacentElement("afterbegin", d3);\n      } else {\n        let d3 = this._createAccessibilityTreeNode();\n        this._rowElements.push(d3), this._rowContainer.appendChild(d3);\n      }\n      this._rowElements[0].addEventListener("focus", this._topBoundaryFocusListener), this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._terminal.scrollLines(i5 === 0 ? -1 : 1), this._rowElements[i5 === 0 ? 1 : this._rowElements.length - 2].focus(), e.preventDefault(), e.stopImmediatePropagation();\n    }\n    _handleSelectionChange() {\n      if (this._rowElements.length === 0) return;\n      let e = this._coreBrowserService.mainDocument.getSelection();\n      if (!e) return;\n      if (e.isCollapsed) {\n        this._rowContainer.contains(e.anchorNode) && this._terminal.clearSelection();\n        return;\n      }\n      if (!e.anchorNode || !e.focusNode) {\n        console.error("anchorNode and/or focusNode are null");\n        return;\n      }\n      let i5 = { node: e.anchorNode, offset: e.anchorOffset }, r = { node: e.focusNode, offset: e.focusOffset };\n      if ((i5.node.compareDocumentPosition(r.node) & Node.DOCUMENT_POSITION_PRECEDING || i5.node === r.node && i5.offset > r.offset) && ([i5, r] = [r, i5]), i5.node.compareDocumentPosition(this._rowElements[0]) & (Node.DOCUMENT_POSITION_CONTAINED_BY | Node.DOCUMENT_POSITION_FOLLOWING) && (i5 = { node: this._rowElements[0].childNodes[0], offset: 0 }), !this._rowContainer.contains(i5.node)) return;\n      let s4 = this._rowElements.slice(-1)[0];\n      if (r.node.compareDocumentPosition(s4) & (Node.DOCUMENT_POSITION_CONTAINED_BY | Node.DOCUMENT_POSITION_PRECEDING) && (r = { node: s4, offset: s4.textContent?.length ?? 0 }), !this._rowContainer.contains(r.node)) return;\n      let o2 = ({ node: h3, offset: d3 }) => {\n        let c2 = h3 instanceof Text ? h3.parentNode : h3, u3 = parseInt(c2?.getAttribute("aria-posinset"), 10) - 1;\n        if (isNaN(u3)) return console.warn("row is invalid. Race condition?"), null;\n        let _5 = this._rowColumns.get(c2);\n        if (!_5) return console.warn("columns is null. Race condition?"), null;\n        let p3 = d3 < _5.length ? _5[d3] : _5.slice(-1)[0] + 1;\n        return p3 >= this._terminal.cols && (++u3, p3 = 0), { row: u3, column: p3 };\n      }, a2 = o2(i5), l4 = o2(r);\n      if (!(!a2 || !l4)) {\n        if (a2.row > l4.row || a2.row === l4.row && a2.column >= l4.column) throw new Error("invalid range");\n        this._terminal.select(a2.column, a2.row, (l4.row - a2.row) * this._terminal.cols - a2.column + l4.column);\n      }\n    }\n    _handleResize(e) {\n      this._rowElements[this._rowElements.length - 1].removeEventListener("focus", this._bottomBoundaryFocusListener);\n      for (let i5 = this._rowContainer.children.length; i5 < this._terminal.rows; i5++) this._rowElements[i5] = this._createAccessibilityTreeNode(), this._rowContainer.appendChild(this._rowElements[i5]);\n      for (; this._rowElements.length > e; ) this._rowContainer.removeChild(this._rowElements.pop());\n      this._rowElements[this._rowElements.length - 1].addEventListener("focus", this._bottomBoundaryFocusListener), this._refreshRowsDimensions();\n    }\n    _createAccessibilityTreeNode() {\n      let e = this._coreBrowserService.mainDocument.createElement("div");\n      return e.setAttribute("role", "listitem"), e.tabIndex = -1, this._refreshRowDimensions(e), e;\n    }\n    _refreshRowsDimensions() {\n      if (this._renderService.dimensions.css.cell.height) {\n        Object.assign(this._accessibilityContainer.style, { width: `${this._renderService.dimensions.css.canvas.width}px`, fontSize: `${this._terminal.options.fontSize}px` }), this._rowElements.length !== this._terminal.rows && this._handleResize(this._terminal.rows);\n        for (let e = 0; e < this._terminal.rows; e++) this._refreshRowDimensions(this._rowElements[e]), this._alignRowWidth(this._rowElements[e]);\n      }\n    }\n    _refreshRowDimensions(e) {\n      e.style.height = `${this._renderService.dimensions.css.cell.height}px`;\n    }\n    _alignRowWidth(e) {\n      e.style.transform = "";\n      let i5 = e.getBoundingClientRect().width, r = this._rowColumns.get(e)?.slice(-1)?.[0];\n      if (!r) return;\n      let s4 = r * this._renderService.dimensions.css.cell.width;\n      e.style.transform = `scaleX(${s4 / i5})`;\n    }\n  };\n  je3 = E4([m3(1, tt3), m3(2, z3), m3(3, G4)], je3);\n  var Nt3 = class extends g5 {\n    constructor(e, i5, r, s4, o2) {\n      super();\n      this._element = e;\n      this._mouseCoordsService = i5;\n      this._renderService = r;\n      this._bufferService = s4;\n      this._linkProviderService = o2;\n      this._linkCacheDisposables = [];\n      this._isMouseOut = true;\n      this._wasResized = false;\n      this._activeLine = -1;\n      this._onShowLinkUnderline = this._register(new v5());\n      this.onShowLinkUnderline = this._onShowLinkUnderline.event;\n      this._onHideLinkUnderline = this._register(new v5());\n      this.onHideLinkUnderline = this._onHideLinkUnderline.event;\n      this._register(y4(() => {\n        Oe2(this._linkCacheDisposables), this._linkCacheDisposables.length = 0, this._lastMouseEvent = void 0, this._activeProviderReplies?.clear();\n      })), this._register(this._bufferService.onResize(() => {\n        this._clearCurrentLink(), this._wasResized = true;\n      })), this._register(C3(this._element, "mouseleave", () => {\n        this._isMouseOut = true, this._clearCurrentLink();\n      })), this._register(C3(this._element, "mousemove", this._handleMouseMove.bind(this))), this._register(C3(this._element, "mousedown", this._handleMouseDown.bind(this))), this._register(C3(this._element, "mouseup", this._handleMouseUp.bind(this)));\n    }\n    get currentLink() {\n      return this._currentLink;\n    }\n    _handleMouseMove(e) {\n      this._lastMouseEvent = e;\n      let i5 = this._positionFromMouseEvent(e, this._element);\n      if (!i5) return;\n      this._isMouseOut = false;\n      let r = e.composedPath();\n      for (let s4 = 0; s4 < r.length; s4++) {\n        let o2 = r[s4];\n        if (o2.classList.contains("xterm")) break;\n        if (o2.classList.contains("xterm-hover")) return;\n      }\n      (!this._lastBufferCell || i5.x !== this._lastBufferCell.x || i5.y !== this._lastBufferCell.y) && (this._handleHover(i5), this._lastBufferCell = i5);\n    }\n    _handleHover(e) {\n      if (this._activeLine !== e.y || this._wasResized) {\n        this._clearCurrentLink(), this._askForLink(e, false), this._wasResized = false;\n        return;\n      }\n      this._currentLink && this._linkAtPosition(this._currentLink.link, e) || (this._clearCurrentLink(), this._askForLink(e, true));\n    }\n    _askForLink(e, i5) {\n      (!this._activeProviderReplies || !i5) && (this._activeProviderReplies?.forEach((s4) => {\n        s4?.forEach((o2) => {\n          o2.link.dispose && o2.link.dispose();\n        });\n      }), this._activeProviderReplies = /* @__PURE__ */ new Map(), this._activeLine = e.y);\n      let r = false;\n      for (let [s4, o2] of this._linkProviderService.linkProviders.entries()) i5 ? this._activeProviderReplies?.get(s4) && (r = this._checkLinkProviderResult(s4, e, r)) : o2.provideLinks(e.y, (a2) => {\n        if (this._isMouseOut) return;\n        let l4 = a2?.map((h3) => ({ link: h3 }));\n        this._activeProviderReplies?.set(s4, l4), r = this._checkLinkProviderResult(s4, e, r), this._activeProviderReplies?.size === this._linkProviderService.linkProviders.length && this._removeIntersectingLinks(e.y, this._activeProviderReplies);\n      });\n    }\n    _removeIntersectingLinks(e, i5) {\n      let r = /* @__PURE__ */ new Set();\n      for (let s4 = 0; s4 < i5.size; s4++) {\n        let o2 = i5.get(s4);\n        if (o2) for (let a2 = 0; a2 < o2.length; a2++) {\n          let l4 = o2[a2], h3 = l4.link.range.start.y < e ? 0 : l4.link.range.start.x, d3 = l4.link.range.end.y > e ? this._bufferService.cols : l4.link.range.end.x;\n          for (let c2 = h3; c2 <= d3; c2++) {\n            if (r.has(c2)) {\n              o2.splice(a2--, 1);\n              break;\n            }\n            r.add(c2);\n          }\n        }\n      }\n    }\n    _checkLinkProviderResult(e, i5, r) {\n      if (!this._activeProviderReplies) return r;\n      let s4 = this._activeProviderReplies.get(e), o2 = false;\n      for (let a2 = 0; a2 < e; a2++) (!this._activeProviderReplies.has(a2) || this._activeProviderReplies.get(a2)) && (o2 = true);\n      if (!o2 && s4) {\n        let a2 = s4.find((l4) => this._linkAtPosition(l4.link, i5));\n        a2 && (r = true, this._handleNewLink(a2));\n      }\n      if (this._activeProviderReplies.size === this._linkProviderService.linkProviders.length && !r) for (let a2 = 0; a2 < this._activeProviderReplies.size; a2++) {\n        let l4 = this._activeProviderReplies.get(a2)?.find((h3) => this._linkAtPosition(h3.link, i5));\n        if (l4) {\n          r = true, this._handleNewLink(l4);\n          break;\n        }\n      }\n      return r;\n    }\n    _handleMouseDown() {\n      this._mouseDownLink = this._currentLink;\n    }\n    _handleMouseUp(e) {\n      if (!this._currentLink) return;\n      let i5 = this._positionFromMouseEvent(e, this._element);\n      i5 && this._mouseDownLink && Yo2(this._mouseDownLink.link, this._currentLink.link) && this._linkAtPosition(this._currentLink.link, i5) && this._currentLink.link.activate(e, this._currentLink.link.text);\n    }\n    _clearCurrentLink(e, i5) {\n      !this._currentLink || !this._lastMouseEvent || (!e || !i5 || this._currentLink.link.range.start.y >= e && this._currentLink.link.range.end.y <= i5) && (this._linkLeave(this._element, this._currentLink.link, this._lastMouseEvent), this._currentLink = void 0, Oe2(this._linkCacheDisposables), this._linkCacheDisposables.length = 0);\n    }\n    _handleNewLink(e) {\n      if (!this._lastMouseEvent) return;\n      let i5 = this._positionFromMouseEvent(this._lastMouseEvent, this._element);\n      i5 && this._linkAtPosition(e.link, i5) && (this._currentLink = e, this._currentLink.state = { decorations: { underline: e.link.decorations === void 0 ? true : e.link.decorations.underline, pointerCursor: e.link.decorations === void 0 ? true : e.link.decorations.pointerCursor }, isHovered: true }, this._linkHover(this._element, e.link, this._lastMouseEvent), e.link.decorations = {}, Object.defineProperties(e.link.decorations, { pointerCursor: { get: () => this._currentLink?.state?.decorations.pointerCursor, set: (r) => {\n        this._currentLink?.state && this._currentLink.state.decorations.pointerCursor !== r && (this._currentLink.state.decorations.pointerCursor = r, this._currentLink.state.isHovered && this._element.classList.toggle("xterm-cursor-pointer", r));\n      } }, underline: { get: () => this._currentLink?.state?.decorations.underline, set: (r) => {\n        this._currentLink?.state && this._currentLink?.state?.decorations.underline !== r && (this._currentLink.state.decorations.underline = r, this._currentLink.state.isHovered && this._fireUnderlineEvent(e.link, r));\n      } } }), this._linkCacheDisposables.push(this._renderService.onRenderedViewportChange((r) => {\n        if (!this._currentLink) return;\n        let s4 = r.start === 0 ? 0 : r.start + 1 + this._bufferService.buffer.ydisp, o2 = this._bufferService.buffer.ydisp + 1 + r.end;\n        if (this._currentLink.link.range.start.y >= s4 && this._currentLink.link.range.end.y <= o2 && (this._clearCurrentLink(s4, o2), this._lastMouseEvent)) {\n          let a2 = this._positionFromMouseEvent(this._lastMouseEvent, this._element);\n          a2 && this._askForLink(a2, false);\n        }\n      })));\n    }\n    _linkHover(e, i5, r) {\n      this._currentLink?.state && (this._currentLink.state.isHovered = true, this._currentLink.state.decorations.underline && this._fireUnderlineEvent(i5, true), this._currentLink.state.decorations.pointerCursor && e.classList.add("xterm-cursor-pointer")), i5.hover && i5.hover(r, i5.text);\n    }\n    _fireUnderlineEvent(e, i5) {\n      let r = e.range, s4 = this._bufferService.buffer.ydisp, o2 = this._createLinkUnderlineEvent(r.start.x - 1, r.start.y - s4 - 1, r.end.x, r.end.y - s4 - 1, void 0);\n      (i5 ? this._onShowLinkUnderline : this._onHideLinkUnderline).fire(o2);\n    }\n    _linkLeave(e, i5, r) {\n      this._currentLink?.state && (this._currentLink.state.isHovered = false, this._currentLink.state.decorations.underline && this._fireUnderlineEvent(i5, false), this._currentLink.state.decorations.pointerCursor && e.classList.remove("xterm-cursor-pointer")), i5.leave && i5.leave(r, i5.text);\n    }\n    _linkAtPosition(e, i5) {\n      let r = e.range.start.y * this._bufferService.cols + e.range.start.x, s4 = e.range.end.y * this._bufferService.cols + e.range.end.x, o2 = i5.y * this._bufferService.cols + i5.x;\n      return r <= o2 && o2 <= s4;\n    }\n    _positionFromMouseEvent(e, i5) {\n      let r = this._mouseCoordsService.getCoords(e, i5, this._bufferService.cols, this._bufferService.rows);\n      if (r) return { x: r[0], y: r[1] + this._bufferService.buffer.ydisp };\n    }\n    _createLinkUnderlineEvent(e, i5, r, s4, o2) {\n      return { x1: e, y1: i5, x2: r, y2: s4, cols: this._bufferService.cols, fg: o2 };\n    }\n  };\n  Nt3 = E4([m3(1, Be2), m3(2, G4), m3(3, L5), m3(4, yi)], Nt3);\n  function Yo2(n11, t) {\n    return n11.text === t.text && n11.range.start.x === t.range.start.x && n11.range.start.y === t.range.start.y && n11.range.end.x === t.range.end.x && n11.range.end.y === t.range.end.y;\n  }\n  var xr = class extends Cr2 {\n    constructor(e = {}) {\n      super(e);\n      this._linkifier = this._register(new me3());\n      this.browser = ze3;\n      this._keyDownHandled = false;\n      this._keyDownSeen = false;\n      this._keyPressHandled = false;\n      this._unprocessedDeadKey = false;\n      this._accessibilityManager = this._register(new me3());\n      this._onCursorMove = this._register(new v5());\n      this.onCursorMove = this._onCursorMove.event;\n      this._onKey = this._register(new v5());\n      this.onKey = this._onKey.event;\n      this._onSelectionChange = this._register(new v5());\n      this.onSelectionChange = this._onSelectionChange.event;\n      this._onTitleChange = this._register(new v5());\n      this.onTitleChange = this._onTitleChange.event;\n      this._onBell = this._register(new v5());\n      this.onBell = this._onBell.event;\n      this._onFocus = this._register(new v5());\n      this._onBlur = this._register(new v5());\n      this._onA11yCharEmitter = this._register(new v5());\n      this._onA11yTabEmitter = this._register(new v5());\n      this._onWillOpen = this._register(new v5());\n      this._onDimensionsChange = this._register(new v5());\n      this.onDimensionsChange = this._onDimensionsChange.event;\n      this._setup(), this._decorationService = this._instantiationService.createInstance(Ot), this._instantiationService.setService(Ie2, this._decorationService), this._keyboardService = this._instantiationService.createInstance(Tt3), this._instantiationService.setService(Js, this._keyboardService), this._linkProviderService = this._instantiationService.createInstance(Yi), this._instantiationService.setService(yi, this._linkProviderService), this._linkProviderService.registerLinkProvider(this._instantiationService.createInstance(it4)), this._register(this._inputHandler.onRequestBell(() => this._onBell.fire())), this._register(this._inputHandler.onRequestRefreshRows((i5) => this.refresh(i5?.start ?? 0, i5?.end ?? this.rows - 1))), this._register(this._inputHandler.onRequestSendFocus(() => this._reportFocus())), this._register(this._inputHandler.onRequestReset(() => this.reset())), this._register(this._inputHandler.onRequestWindowsOptionsReport((i5) => this._reportWindowsOptions(i5))), this._register(this._inputHandler.onColor((i5) => this._handleColorEvent(i5))), this._register(X2.forward(this._inputHandler.onCursorMove, this._onCursorMove)), this._register(X2.forward(this._inputHandler.onTitleChange, this._onTitleChange)), this._register(X2.forward(this._inputHandler.onA11yChar, this._onA11yCharEmitter)), this._register(X2.forward(this._inputHandler.onA11yTab, this._onA11yTabEmitter)), this._register(this._bufferService.onResize((i5) => this._afterResize(i5.cols, i5.rows))), this._register(y4(() => {\n        this._customKeyEventHandler = void 0, this.element?.parentNode?.removeChild(this.element);\n      }));\n    }\n    get linkifier() {\n      return this._linkifier.value;\n    }\n    get onFocus() {\n      return this._onFocus.event;\n    }\n    get onBlur() {\n      return this._onBlur.event;\n    }\n    get onA11yChar() {\n      return this._onA11yCharEmitter.event;\n    }\n    get onA11yTab() {\n      return this._onA11yTabEmitter.event;\n    }\n    get onWillOpen() {\n      return this._onWillOpen.event;\n    }\n    get dimensions() {\n      if (!this._renderService) return;\n      let e = this._renderService.dimensions;\n      return { css: { canvas: { ...e.css.canvas }, cell: { ...e.css.cell } }, device: { canvas: { ...e.device.canvas }, cell: { ...e.device.cell }, char: { ...e.device.char } } };\n    }\n    _handleColorEvent(e) {\n      if (this._themeService) for (let i5 of e) {\n        let r, s4 = "";\n        switch (i5.index) {\n          case 256:\n            r = "foreground", s4 = "10";\n            break;\n          case 257:\n            r = "background", s4 = "11";\n            break;\n          case 258:\n            r = "cursor", s4 = "12";\n            break;\n          default:\n            r = "ansi", s4 = "4;" + i5.index;\n        }\n        switch (i5.type) {\n          case 0:\n            let o2 = k4.toColorRGB(r === "ansi" ? this._themeService.colors.ansi[i5.index] : this._themeService.colors[r]);\n            this.coreService.triggerDataEvent(`\\x1B]${s4};${Pn(o2)}\\x1B\\\\`);\n            break;\n          case 1:\n            if (r === "ansi") this._themeService.modifyColors((a2) => a2.ansi[i5.index] = B4.toColor(...i5.color));\n            else {\n              let a2 = r;\n              this._themeService.modifyColors((l4) => l4[a2] = B4.toColor(...i5.color));\n            }\n            break;\n          case 2:\n            this._themeService.restoreColor(i5.index);\n            break;\n        }\n      }\n    }\n    _reportColorScheme() {\n      if (!this._themeService) return;\n      let e = j4.relativeLuminance(this._themeService.colors.background.rgba >> 8), i5 = j4.relativeLuminance(this._themeService.colors.foreground.rgba >> 8), r = e < i5 ? 1 : 2;\n      this.coreService.triggerDataEvent(`\\x1B[?997;${r}n`);\n    }\n    _setup() {\n      super._setup(), this._customKeyEventHandler = void 0;\n    }\n    get buffer() {\n      return this.buffers.active;\n    }\n    focus() {\n      this.textarea && this.textarea.focus({ preventScroll: true });\n    }\n    _handleScreenReaderModeOptionChange(e) {\n      e ? !this._accessibilityManager.value && this._renderService && (this._accessibilityManager.value = this._instantiationService.createInstance(je3, this)) : this._accessibilityManager.clear();\n    }\n    _handleTextAreaFocus(e) {\n      this.coreService.decPrivateModes.sendFocus && this.coreService.triggerDataEvent("\\x1B[I"), this.element.classList.add("focus"), this._showCursor(), this._onFocus.fire();\n    }\n    blur() {\n      return this.textarea?.blur();\n    }\n    _handleTextAreaBlur() {\n      this.textarea.value = "", this.refresh(this.buffer.y, this.buffer.y), this.coreService.decPrivateModes.sendFocus && this.coreService.triggerDataEvent("\\x1B[O"), this.element.classList.remove("focus"), this._onBlur.fire();\n    }\n    _syncTextArea() {\n      if (!this.textarea || !this.buffer.isCursorInViewport || this._compositionHelper.isComposing || !this._renderService) return;\n      let e = this.buffer.ybase + this.buffer.y, i5 = this.buffer.lines.get(e);\n      if (!i5) return;\n      let r = Math.min(this.buffer.x, this.cols - 1), s4 = this._renderService.dimensions.css.cell.height, o2 = i5.getWidth(r), a2 = this._renderService.dimensions.css.cell.width * o2, l4 = this.buffer.y * this._renderService.dimensions.css.cell.height, h3 = r * this._renderService.dimensions.css.cell.width;\n      this.textarea.style.left = h3 + "px", this.textarea.style.top = l4 + "px", this.textarea.style.width = a2 + "px", this.textarea.style.height = s4 + "px", this.textarea.style.lineHeight = s4 + "px", this.textarea.style.zIndex = "-5";\n    }\n    _initGlobal() {\n      this._bindKeys(), this._register(C3(this.element, "copy", (i5) => {\n        this.hasSelection() && Gs(i5, this._selectionService);\n      }));\n      let e = (i5) => $s(i5, this.textarea, this.coreService, this.optionsService);\n      this._register(C3(this.textarea, "paste", e)), this._register(C3(this.element, "paste", e)), at4 ? this._register(C3(this.element, "mousedown", (i5) => {\n        i5.button === 2 && Ur2(i5, this.textarea, this.screenElement, this._selectionService, this.options.rightClickSelectsWord);\n      })) : this._register(C3(this.element, "contextmenu", (i5) => {\n        Ur2(i5, this.textarea, this.screenElement, this._selectionService, this.options.rightClickSelectsWord);\n      })), $t2 && this._register(C3(this.element, "auxclick", (i5) => {\n        i5.button === 1 && Wr(i5, this.textarea, this.screenElement);\n      }));\n    }\n    _bindKeys() {\n      this._register(C3(this.textarea, "keyup", (e) => this._keyUp(e), true)), this._register(C3(this.textarea, "keydown", (e) => this._keyDown(e), true)), this._register(C3(this.textarea, "keypress", (e) => this._keyPress(e), true)), this._register(C3(this.textarea, "compositionstart", () => {\n        this._syncTextArea(), this._compositionHelper.compositionstart(), this._compositionHelper.updateCompositionElements();\n      })), this._register(C3(this.textarea, "compositionupdate", (e) => this._compositionHelper.compositionupdate(e))), this._register(C3(this.textarea, "compositionend", () => this._compositionHelper.compositionend())), this._register(C3(this.textarea, "input", (e) => this._inputEvent(e), true)), this._register(this.onRender(() => this._compositionHelper.updateCompositionElements()));\n    }\n    open(e) {\n      if (!e) throw new Error("Terminal requires a parent element.");\n      if (e.isConnected || this._logService.debug("Terminal.open was called on an element that was not attached to the DOM"), this.element?.ownerDocument.defaultView && this._coreBrowserService) {\n        this.element.ownerDocument.defaultView !== this._coreBrowserService.window && (this._coreBrowserService.window = this.element.ownerDocument.defaultView);\n        return;\n      }\n      this._document = e.ownerDocument, this.options.documentOverride && this.options.documentOverride instanceof Document && (this._document = this.optionsService.rawOptions.documentOverride), this.element = this._document.createElement("div"), this.element.dir = "ltr", this.element.classList.add("terminal"), this.element.classList.add("xterm"), this.element.classList.toggle("allow-transparency", this.options.allowTransparency), this._register(this.optionsService.onSpecificOptionChange("allowTransparency", (l4) => this.element.classList.toggle("allow-transparency", l4))), e.appendChild(this.element);\n      let i5 = this._document.createDocumentFragment();\n      this._viewportElement = this._document.createElement("div"), this._viewportElement.classList.add("xterm-viewport"), i5.appendChild(this._viewportElement), this.screenElement = this._document.createElement("div"), this.screenElement.classList.add("xterm-screen"), this._register(C3(this.screenElement, "mousemove", (l4) => this.updateCursorStyle(l4))), this._helperContainer = this._document.createElement("div"), this._helperContainer.classList.add("xterm-helpers"), this.screenElement.appendChild(this._helperContainer), i5.appendChild(this.screenElement);\n      let r = this.textarea = this._document.createElement("textarea");\n      this.textarea.classList.add("xterm-helper-textarea"), this.textarea.setAttribute("aria-label", zt2.get()), Jr || this.textarea.setAttribute("aria-multiline", "false"), this.textarea.setAttribute("autocorrect", "off"), this.textarea.setAttribute("autocapitalize", "off"), this.textarea.setAttribute("spellcheck", "false"), this.textarea.tabIndex = 0, this._register(this.optionsService.onSpecificOptionChange("disableStdin", () => r.readOnly = this.optionsService.rawOptions.disableStdin)), this.textarea.readOnly = this.optionsService.rawOptions.disableStdin, this._coreBrowserService = this._register(this._instantiationService.createInstance(qi, this.textarea, e.ownerDocument.defaultView ?? window, this._document ?? typeof window < "u" ? window.document : null)), this._instantiationService.setService(z3, this._coreBrowserService), this._register(C3(this.textarea, "focus", (l4) => this._handleTextAreaFocus(l4))), this._register(C3(this.textarea, "blur", () => this._handleTextAreaBlur())), this._helperContainer.appendChild(this.textarea), this._charSizeService = this._instantiationService.createInstance(St2, this._document, this._helperContainer), this._instantiationService.setService(Me2, this._charSizeService), this._themeService = this._instantiationService.createInstance(wt), this._instantiationService.setService(_e2, this._themeService), this._register(this._inputHandler.onRequestColorSchemeQuery(() => this._reportColorScheme())), this._register(this._themeService.onChangeColors(() => {\n        this.coreService.decPrivateModes.colorSchemeUpdates && this._reportColorScheme();\n      })), this._characterJoinerService = this._instantiationService.createInstance(We3), this._instantiationService.setService(Ei, this._characterJoinerService), this._renderService = this._register(this._instantiationService.createInstance(yt3, this.rows, this.screenElement)), this._instantiationService.setService(G4, this._renderService), this._register(this._renderService.onRenderedViewportChange((l4) => this._onRender.fire(l4))), this._register(this._renderService.onDimensionsChange((l4) => this._onDimensionsChange.fire({ css: { canvas: { ...l4.css.canvas }, cell: { ...l4.css.cell } }, device: { canvas: { ...l4.device.canvas }, cell: { ...l4.device.cell }, char: { ...l4.device.char } } }))), this.onResize((l4) => this._renderService.resize(l4.cols, l4.rows)), this._compositionView = this._document.createElement("div"), this._compositionView.classList.add("composition-view"), this._compositionHelper = this._instantiationService.createInstance(_t2, this.textarea, this._compositionView), this._helperContainer.appendChild(this._compositionView), this._mouseCoordsService = this._instantiationService.createInstance(gt2), this._instantiationService.setService(Be2, this._mouseCoordsService);\n      let s4 = this._linkifier.value = this._register(this._instantiationService.createInstance(Nt3, this.screenElement));\n      this.element.appendChild(i5);\n      try {\n        this._onWillOpen.fire(this.element);\n      } catch {\n      }\n      this._renderService.hasRenderer() || this._renderService.setRenderer(this._createRenderer()), this._register(this.onCursorMove(() => {\n        this._renderService.handleCursorMove(), this._syncTextArea();\n      })), this._register(this.onResize(() => {\n        this._renderService.handleResize(this.cols, this.rows), this._syncTextArea();\n      })), this._register(this.onBlur(() => this._renderService.handleBlur())), this._register(this.onFocus(() => this._renderService.handleFocus())), this._viewport = this._register(this._instantiationService.createInstance(ft3, this.element, this.screenElement)), this._register(this._viewport.onRequestScrollLines((l4) => {\n        super.scrollLines(l4, false), this.refresh(0, this.rows - 1);\n      })), this._selectionService = this._register(this._instantiationService.createInstance(xt3, this.element, this.screenElement, s4)), this._instantiationService.setService(Ci, this._selectionService), this._mouseService = this._instantiationService.createInstance(Ct2), this._instantiationService.setService(Zs, this._mouseService), this._register(this._selectionService.onRequestScrollLines((l4) => this.scrollLines(l4.amount, l4.suppressScrollEvent))), this._register(this._selectionService.onSelectionChange(() => this._onSelectionChange.fire())), this._register(this._selectionService.onRequestRedraw((l4) => this._renderService.handleSelectionChanged(l4.start, l4.end, l4.columnSelectMode))), this._register(this._selectionService.onLinuxMouseSelection((l4) => {\n        this.textarea.value = l4, this.textarea.focus(), this.textarea.select();\n      })), this._register(X2.any(this._onScroll.event, this._inputHandler.onScroll)(() => {\n        this._selectionService.refresh(), this._viewport?.queueSync();\n      })), this._register(this._instantiationService.createInstance(pt3, this.screenElement)), this._register(C3(this.element, "mousedown", (l4) => this._selectionService.handleMouseDown(l4))), this.mouseStateService.areMouseEventsActive ? (this._selectionService.disable(), this.element.classList.add("enable-mouse-events")) : this._selectionService.enable(), this.options.screenReaderMode && (this._accessibilityManager.value = this._instantiationService.createInstance(je3, this)), this._register(this.optionsService.onSpecificOptionChange("screenReaderMode", (l4) => this._handleScreenReaderModeOptionChange(l4)));\n      let o2 = this.options.scrollbar?.showScrollbar ?? true, a2 = this.options.scrollbar?.width;\n      o2 && a2 && (this._overviewRulerRenderer = this._register(this._instantiationService.createInstance(Ge4, this._viewportElement, this.screenElement))), this.optionsService.onSpecificOptionChange("scrollbar", (l4) => {\n        let h3 = (l4?.showScrollbar ?? true) && !!l4?.width;\n        !this._overviewRulerRenderer && h3 && this._viewportElement && this.screenElement && (this._overviewRulerRenderer = this._register(this._instantiationService.createInstance(Ge4, this._viewportElement, this.screenElement)));\n      }), this._charSizeService.measure(), this.refresh(0, this.rows - 1), this._initGlobal(), this._mouseService.bindMouse({ element: this.element, screenElement: this.screenElement, document: this._document, handleTouchScroll: (l4) => this._viewport?.handleTouchScroll(l4) }, (l4) => this._register(l4), () => this.focus());\n    }\n    _createRenderer() {\n      return this._instantiationService.createInstance(vt2, this, this._document, this.element, this.screenElement, this._viewportElement, this._helperContainer, this.linkifier);\n    }\n    refresh(e, i5, r = false) {\n      this._renderService?.refreshRows(e, i5, r);\n    }\n    updateCursorStyle(e) {\n      this._selectionService?.shouldColumnSelect(e) ? this.element.classList.add("column-select") : this.element.classList.remove("column-select");\n    }\n    _showCursor() {\n      this.coreService.isCursorInitialized || (this.coreService.isCursorInitialized = true, this.refresh(this.buffer.y, this.buffer.y));\n    }\n    scrollLines(e, i5) {\n      this._viewport ? this._viewport.scrollLines(e) : super.scrollLines(e, i5), this.refresh(0, this.rows - 1);\n    }\n    scrollPages(e) {\n      this.scrollLines(e * (this.rows - 1));\n    }\n    scrollToTop() {\n      this.scrollLines(-this._bufferService.buffer.ydisp);\n    }\n    scrollToBottom(e) {\n      e && this._viewport ? this._viewport.scrollToLine(this.buffer.ybase, true) : this.scrollLines(this._bufferService.buffer.ybase - this._bufferService.buffer.ydisp);\n    }\n    scrollToLine(e) {\n      let i5 = e - this._bufferService.buffer.ydisp;\n      i5 !== 0 && this.scrollLines(i5);\n    }\n    paste(e) {\n      Hr(e, this.textarea, this.coreService, this.optionsService);\n    }\n    attachCustomKeyEventHandler(e) {\n      this._customKeyEventHandler = e;\n    }\n    attachCustomWheelEventHandler(e) {\n      this.mouseStateService.setCustomWheelEventHandler(e);\n    }\n    registerLinkProvider(e) {\n      return this._linkProviderService.registerLinkProvider(e);\n    }\n    registerCharacterJoiner(e) {\n      if (!this._characterJoinerService) throw new Error("Terminal must be opened first");\n      let i5 = this._characterJoinerService.register(e);\n      return this.refresh(0, this.rows - 1), i5;\n    }\n    deregisterCharacterJoiner(e) {\n      if (!this._characterJoinerService) throw new Error("Terminal must be opened first");\n      this._characterJoinerService.deregister(e) && this.refresh(0, this.rows - 1);\n    }\n    get markers() {\n      return this.buffer.markers;\n    }\n    registerMarker(e) {\n      return this.buffer.addMarker(this.buffer.ybase + this.buffer.y + e);\n    }\n    registerDecoration(e) {\n      return this._decorationService.registerDecoration(e);\n    }\n    hasSelection() {\n      return this._selectionService ? this._selectionService.hasSelection : false;\n    }\n    select(e, i5, r) {\n      this._selectionService.setSelection(e, i5, r);\n    }\n    getSelection() {\n      return this._selectionService ? this._selectionService.selectionText : "";\n    }\n    getSelectionPosition() {\n      if (!(!this._selectionService || !this._selectionService.hasSelection)) return { start: { x: this._selectionService.selectionStart[0], y: this._selectionService.selectionStart[1] }, end: { x: this._selectionService.selectionEnd[0], y: this._selectionService.selectionEnd[1] } };\n    }\n    clearSelection() {\n      this._selectionService?.clearSelection();\n    }\n    selectAll() {\n      this._selectionService?.selectAll();\n    }\n    selectLines(e, i5) {\n      this._selectionService?.selectLines(e, i5);\n    }\n    _keyDown(e) {\n      if (this._keyDownHandled = false, this._keyDownSeen = true, this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return false;\n      let i5 = this.browser.isMac && this.options.macOptionIsMeta && e.altKey;\n      if (!i5 && !this._compositionHelper.keydown(e)) return this.options.scrollOnUserInput && this.buffer.ybase !== this.buffer.ydisp && this.scrollToBottom(true), false;\n      !i5 && (e.key === "Dead" || e.key === "AltGraph") && (this._unprocessedDeadKey = true);\n      let r = this._keyboardService.evaluateKeyDown(e);\n      if (this.updateCursorStyle(e), r.type === 3 || r.type === 2) {\n        let o2 = this.rows - 1;\n        return this.scrollLines(r.type === 2 ? -o2 : o2), e.preventDefault(), e.stopPropagation(), false;\n      }\n      if (r.type === 1 && this.selectAll(), this._isThirdLevelShift(this.browser, e) || (r.cancel && (e.preventDefault(), e.stopPropagation()), !r.key) || !this._keyboardService.useKitty && !this._keyboardService.useWin32InputMode && e.key && !e.ctrlKey && !e.altKey && !e.metaKey && e.key.length === 1 && e.key.charCodeAt(0) >= 65 && e.key.charCodeAt(0) <= 90) return true;\n      if (this._unprocessedDeadKey) return this._unprocessedDeadKey = false, true;\n      (r.key === "\u0003" || r.key === "\\r") && (this.textarea.value = "");\n      let s4 = this._keyboardService.useWin32InputMode && Bs(e);\n      if (this._onKey.fire({ key: r.key, domEvent: e }), this._showCursor(), this.coreService.triggerDataEvent(r.key, !s4), !this.optionsService.rawOptions.screenReaderMode || e.altKey || e.ctrlKey) return e.preventDefault(), e.stopPropagation(), false;\n      this._keyDownHandled = true;\n    }\n    _isThirdLevelShift(e, i5) {\n      let r = e.isMac && !this.options.macOptionIsMeta && i5.altKey && !i5.ctrlKey && !i5.metaKey || e.isWindows && i5.altKey && i5.ctrlKey && !i5.metaKey || e.isWindows && i5.getModifierState("AltGraph");\n      return i5.type === "keypress" ? r : r && (!i5.keyCode || i5.keyCode > 47);\n    }\n    _keyUp(e) {\n      if (this._keyDownSeen = false, this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return;\n      Bs(e) || this.focus();\n      let i5 = this._keyboardService.evaluateKeyUp(e);\n      if (i5?.key) {\n        let r = this._keyboardService.useWin32InputMode && Bs(e);\n        this.coreService.triggerDataEvent(i5.key, !r);\n      }\n      this.updateCursorStyle(e), this._keyPressHandled = false;\n    }\n    _keyPress(e) {\n      let i5;\n      if (this._keyPressHandled = false, this._keyDownHandled || this._customKeyEventHandler && this._customKeyEventHandler(e) === false) return false;\n      if (e.charCode) i5 = e.charCode;\n      else if (e.which === null || e.which === void 0) i5 = e.keyCode;\n      else if (e.which !== 0 && e.charCode !== 0) i5 = e.which;\n      else return false;\n      return !i5 || (e.altKey || e.ctrlKey || e.metaKey) && !this._isThirdLevelShift(this.browser, e) ? false : (i5 = String.fromCharCode(i5), this._onKey.fire({ key: i5, domEvent: e }), this._showCursor(), this.coreService.triggerDataEvent(i5, true), this._keyPressHandled = true, this._unprocessedDeadKey = false, true);\n    }\n    _inputEvent(e) {\n      if (e.data && e.inputType === "insertText" && (!e.composed || !this._keyDownSeen) && !this.optionsService.rawOptions.screenReaderMode) {\n        if (this._keyPressHandled) return false;\n        this._unprocessedDeadKey = false;\n        let i5 = e.data;\n        return this.coreService.triggerDataEvent(i5, true), true;\n      }\n      return false;\n    }\n    resize(e, i5) {\n      if (e === this.cols && i5 === this.rows) {\n        this._charSizeService && !this._charSizeService.hasValidSize && this._charSizeService.measure();\n        return;\n      }\n      super.resize(e, i5);\n    }\n    _afterResize(e, i5) {\n      this._charSizeService?.measure();\n    }\n    clear() {\n      if (!(this.buffer.ybase === 0 && this.buffer.y === 0)) {\n        this.buffer.clearAllMarkers(), this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y)), this.buffer.lines.length = 1, this.buffer.ydisp = 0, this.buffer.ybase = 0, this.buffer.y = 0;\n        for (let e = 1; e < this.rows; e++) this.buffer.lines.push(this.buffer.getBlankLine(U5));\n        this._onScroll.fire({ position: this.buffer.ydisp }), this.refresh(0, this.rows - 1);\n      }\n    }\n    reset() {\n      this.options.rows = this.rows, this.options.cols = this.cols;\n      let e = this._customKeyEventHandler;\n      this._setup(), super.reset(), this._mouseService?.reset(), this._selectionService?.reset(), this._decorationService.reset(), this._customKeyEventHandler = e, this.refresh(0, this.rows - 1, true);\n    }\n    clearTextureAtlas() {\n      this._renderService?.clearTextureAtlas();\n    }\n    _reportFocus() {\n      this.element?.classList.contains("focus") ? this.coreService.triggerDataEvent("\\x1B[I") : this.coreService.triggerDataEvent("\\x1B[O");\n    }\n    _reportWindowsOptions(e) {\n      if (this._renderService) switch (e) {\n        case 0:\n          let i5 = this._renderService.dimensions.css.canvas.width.toFixed(0), r = this._renderService.dimensions.css.canvas.height.toFixed(0);\n          this.coreService.triggerDataEvent(`\\x1B[4;${r};${i5}t`);\n          break;\n        case 1:\n          let s4 = this._renderService.dimensions.css.cell.width.toFixed(0), o2 = this._renderService.dimensions.css.cell.height.toFixed(0);\n          this.coreService.triggerDataEvent(`\\x1B[6;${o2};${s4}t`);\n          break;\n      }\n    }\n  };\n  function Bs(n11) {\n    return n11.keyCode === 16 || n11.keyCode === 17 || n11.keyCode === 18 || n11.keyCode === 91 || n11.keyCode === 92 || n11.keyCode === 93 || n11.keyCode === 224 || n11.key === "Meta";\n  }\n  var wr2 = class {\n    constructor() {\n      this._addons = [];\n    }\n    dispose() {\n      for (let t = this._addons.length - 1; t >= 0; t--) this._addons[t].instance.dispose();\n    }\n    loadAddon(t, e) {\n      let i5 = { instance: e, dispose: e.dispose, isDisposed: false };\n      this._addons.push(i5), e.dispose = () => this._wrappedAddonDispose(i5), e.activate(t);\n    }\n    _wrappedAddonDispose(t) {\n      if (t.isDisposed) return;\n      let e = -1;\n      for (let i5 = 0; i5 < this._addons.length; i5++) if (this._addons[i5] === t) {\n        e = i5;\n        break;\n      }\n      if (e === -1) throw new Error("Could not dispose an addon that has not been loaded");\n      t.isDisposed = true, t.dispose.apply(t.instance), this._addons.splice(e, 1);\n    }\n  };\n  var Tr = class {\n    constructor(t) {\n      this._line = t;\n    }\n    get isWrapped() {\n      return this._line.isWrapped;\n    }\n    get length() {\n      return this._line.length;\n    }\n    getCell(t, e) {\n      if (!(t < 0 || t >= this._line.length)) return e ? (this._line.loadCell(t, e), e) : this._line.loadCell(t, new N2());\n    }\n    translateToString(t, e, i5) {\n      return this._line.translateToString(t, e, i5);\n    }\n  };\n  var pi = class {\n    constructor(t, e) {\n      this._buffer = t;\n      this.type = e;\n    }\n    init(t) {\n      return this._buffer = t, this;\n    }\n    get cursorY() {\n      return this._buffer.y;\n    }\n    get cursorX() {\n      return this._buffer.x;\n    }\n    get viewportY() {\n      return this._buffer.ydisp;\n    }\n    get baseY() {\n      return this._buffer.ybase;\n    }\n    get length() {\n      return this._buffer.lines.length;\n    }\n    getLine(t) {\n      let e = this._buffer.lines.get(t);\n      if (e) return new Tr(e);\n    }\n    getNullCell() {\n      return new N2();\n    }\n  };\n  var Dr = class extends g5 {\n    constructor(e) {\n      super();\n      this._core = e;\n      this._onBufferChange = this._register(new v5());\n      this.onBufferChange = this._onBufferChange.event;\n      this._normal = new pi(this._core.buffers.normal, "normal"), this._alternate = new pi(this._core.buffers.alt, "alternate"), this._core.buffers.onBufferActivate(() => this._onBufferChange.fire(this.active));\n    }\n    get active() {\n      if (this._core.buffers.active === this._core.buffers.normal) return this.normal;\n      if (this._core.buffers.active === this._core.buffers.alt) return this.alternate;\n      throw new Error("Active buffer is neither normal nor alternate");\n    }\n    get normal() {\n      return this._normal.init(this._core.buffers.normal);\n    }\n    get alternate() {\n      return this._alternate.init(this._core.buffers.alt);\n    }\n  };\n  var Rr = class {\n    constructor(t) {\n      this._core = t;\n    }\n    registerCsiHandler(t, e) {\n      return this._core.registerCsiHandler(t, (i5) => e(i5.toArray()));\n    }\n    addCsiHandler(t, e) {\n      return this.registerCsiHandler(t, e);\n    }\n    registerDcsHandler(t, e) {\n      return this._core.registerDcsHandler(t, (i5, r) => e(i5, r.toArray()));\n    }\n    addDcsHandler(t, e) {\n      return this.registerDcsHandler(t, e);\n    }\n    registerEscHandler(t, e) {\n      return this._core.registerEscHandler(t, e);\n    }\n    addEscHandler(t, e) {\n      return this.registerEscHandler(t, e);\n    }\n    registerOscHandler(t, e) {\n      return this._core.registerOscHandler(t, e);\n    }\n    addOscHandler(t, e) {\n      return this.registerOscHandler(t, e);\n    }\n    registerApcHandler(t, e) {\n      return this._core.registerApcHandler(t, e);\n    }\n  };\n  var Lr = class {\n    constructor(t) {\n      this._core = t;\n    }\n    register(t) {\n      this._core.unicodeService.register(t);\n    }\n    get versions() {\n      return this._core.unicodeService.versions;\n    }\n    get activeVersion() {\n      return this._core.unicodeService.activeVersion;\n    }\n    set activeVersion(t) {\n      this._core.unicodeService.activeVersion = t;\n    }\n  };\n  var Xo2 = ["cols", "rows"];\n  var Ee = 0;\n  var Vn2 = class extends g5 {\n    constructor(t) {\n      super(), this._core = this._register(new xr(t)), this._addonManager = this._register(new wr2()), this._publicOptions = { ...this._core.options };\n      let e = (r) => this._core.options[r], i5 = (r, s4) => {\n        this._checkReadonlyOptions(r), this._core.options[r] = s4;\n      };\n      for (let r in this._core.options) {\n        let s4 = { get: e.bind(this, r), set: i5.bind(this, r) };\n        Object.defineProperty(this._publicOptions, r, s4);\n      }\n    }\n    _checkReadonlyOptions(t) {\n      if (Xo2.includes(t)) throw new Error(`Option "${t}" can only be set in the constructor`);\n    }\n    _checkProposedApi() {\n      if (!this._core.optionsService.rawOptions.allowProposedApi) throw new Error("You must set the allowProposedApi option to true to use proposed API");\n    }\n    get onBell() {\n      return this._core.onBell;\n    }\n    get onBinary() {\n      return this._core.onBinary;\n    }\n    get onCursorMove() {\n      return this._core.onCursorMove;\n    }\n    get onData() {\n      return this._core.onData;\n    }\n    get onKey() {\n      return this._core.onKey;\n    }\n    get onLineFeed() {\n      return this._core.onLineFeed;\n    }\n    get onRender() {\n      return this._core.onRender;\n    }\n    get onResize() {\n      return this._core.onResize;\n    }\n    get onScroll() {\n      return this._core.onScroll;\n    }\n    get onSelectionChange() {\n      return this._core.onSelectionChange;\n    }\n    get onTitleChange() {\n      return this._core.onTitleChange;\n    }\n    get onWriteParsed() {\n      return this._core.onWriteParsed;\n    }\n    get onDimensionsChange() {\n      return this._core.onDimensionsChange;\n    }\n    get element() {\n      return this._core.element;\n    }\n    get screenElement() {\n      return this._core.screenElement;\n    }\n    get parser() {\n      return this._parser ??= new Rr(this._core);\n    }\n    get unicode() {\n      return this._checkProposedApi(), new Lr(this._core);\n    }\n    get textarea() {\n      return this._core.textarea;\n    }\n    get rows() {\n      return this._core.rows;\n    }\n    get cols() {\n      return this._core.cols;\n    }\n    get buffer() {\n      return this._buffer ??= this._register(new Dr(this._core));\n    }\n    get markers() {\n      return this._core.markers;\n    }\n    get modes() {\n      let t = this._core.coreService.decPrivateModes, e = "none";\n      switch (this._core.mouseStateService.activeProtocol) {\n        case "X10":\n          e = "x10";\n          break;\n        case "VT200":\n          e = "vt200";\n          break;\n        case "DRAG":\n          e = "drag";\n          break;\n        case "ANY":\n          e = "any";\n          break;\n      }\n      return { applicationCursorKeysMode: t.applicationCursorKeys, applicationKeypadMode: t.applicationKeypad, bracketedPasteMode: t.bracketedPasteMode, insertMode: this._core.coreService.modes.insertMode, mouseTrackingMode: e, originMode: t.origin, reverseWraparoundMode: t.reverseWraparound, sendFocusMode: t.sendFocus, showCursor: !this._core.coreService.isCursorHidden, synchronizedOutputMode: t.synchronizedOutput, win32InputMode: t.win32InputMode, wraparoundMode: t.wraparound };\n    }\n    get dimensions() {\n      return this._core.dimensions;\n    }\n    get options() {\n      return this._publicOptions;\n    }\n    set options(t) {\n      for (let e in t) this._publicOptions[e] = t[e];\n    }\n    blur() {\n      this._core.blur();\n    }\n    focus() {\n      this._core.focus();\n    }\n    input(t, e = true) {\n      this._core.input(t, e);\n    }\n    resize(t, e) {\n      this._verifyIntegers(t, e), this._core.resize(t, e);\n    }\n    open(t) {\n      this._core.open(t);\n    }\n    attachCustomKeyEventHandler(t) {\n      this._core.attachCustomKeyEventHandler(t);\n    }\n    attachCustomWheelEventHandler(t) {\n      this._core.attachCustomWheelEventHandler(t);\n    }\n    registerLinkProvider(t) {\n      return this._core.registerLinkProvider(t);\n    }\n    registerCharacterJoiner(t) {\n      return this._core.registerCharacterJoiner(t);\n    }\n    deregisterCharacterJoiner(t) {\n      this._core.deregisterCharacterJoiner(t);\n    }\n    registerMarker(t = 0) {\n      return this._verifyIntegers(t), this._core.registerMarker(t);\n    }\n    registerDecoration(t) {\n      return this._verifyPositiveIntegers(t.x ?? 0, t.width ?? 0, t.height ?? 0), this._core.registerDecoration(t);\n    }\n    hasSelection() {\n      return this._core.hasSelection();\n    }\n    select(t, e, i5) {\n      this._verifyIntegers(t, e, i5), this._core.select(t, e, i5);\n    }\n    getSelection() {\n      return this._core.getSelection();\n    }\n    getSelectionPosition() {\n      return this._core.getSelectionPosition();\n    }\n    clearSelection() {\n      this._core.clearSelection();\n    }\n    selectAll() {\n      this._core.selectAll();\n    }\n    selectLines(t, e) {\n      this._verifyIntegers(t, e), this._core.selectLines(t, e);\n    }\n    dispose() {\n      super.dispose();\n    }\n    scrollLines(t) {\n      this._verifyIntegers(t), this._core.scrollLines(t);\n    }\n    scrollPages(t) {\n      this._verifyIntegers(t), this._core.scrollPages(t);\n    }\n    scrollToTop() {\n      this._core.scrollToTop();\n    }\n    scrollToBottom() {\n      this._core.scrollToBottom();\n    }\n    scrollToLine(t) {\n      this._verifyIntegers(t), this._core.scrollToLine(t);\n    }\n    clear() {\n      this._core.clear();\n    }\n    write(t, e) {\n      this._core.write(t, e);\n    }\n    writeln(t, e) {\n      this._core.write(t), this._core.write(`\\r\n`, e);\n    }\n    paste(t) {\n      this._core.paste(t);\n    }\n    refresh(t, e) {\n      this._verifyIntegers(t, e), this._core.refresh(t, e);\n    }\n    reset() {\n      this._core.reset();\n    }\n    clearTextureAtlas() {\n      this._core.clearTextureAtlas();\n    }\n    loadAddon(t) {\n      this._addonManager.loadAddon(this, t);\n    }\n    static get strings() {\n      return { get promptLabel() {\n        return zt2.get();\n      }, set promptLabel(t) {\n        zt2.set(t);\n      }, get tooMuchOutput() {\n        return Je3.get();\n      }, set tooMuchOutput(t) {\n        Je3.set(t);\n      } };\n    }\n    _verifyIntegers(...t) {\n      for (Ee of t) if (Ee === 1 / 0 || isNaN(Ee) || Ee % 1 !== 0) throw new Error("This API only accepts integers");\n    }\n    _verifyPositiveIntegers(...t) {\n      for (Ee of t) if (Ee && (Ee === 1 / 0 || isNaN(Ee) || Ee % 1 !== 0 || Ee < 0)) throw new Error("This API only accepts positive integers");\n    }\n  };\n\n  // ../protocol/dist/terminal-input-mode.js\n  var ESC = String.fromCharCode(27);\n  var APPLICATION_CURSOR_KEYS_MODE = 1;\n  var WIN32_INPUT_MODE = 9001;\n  var BRACKETED_PASTE_MODE = 2004;\n  var CSI_INPUT_MODE_SEQUENCE = new RegExp(`${ESC}\\\\[(?:([<>=?]?)([0-9;]*)u|\\\\?([0-9;]*)([hl]))`, "g");\n  var INCOMPLETE_CSI_INPUT_MODE_SEQUENCE = new RegExp(`${ESC}\\\\[[<>=?]?[0-9;]*$`);\n  function parseFirstParam(params) {\n    const first = params.split(";")[0];\n    if (!first || !/^\\d+$/.test(first)) {\n      return null;\n    }\n    return Number(first);\n  }\n  function parseSecondParam(params) {\n    const second = params.split(";")[1];\n    if (!second || !/^\\d+$/.test(second)) {\n      return null;\n    }\n    return Number(second);\n  }\n  function parsePrivateModeParams(params) {\n    const modes = /* @__PURE__ */ new Set();\n    for (const param of params.split(";")) {\n      if (/^\\d+$/.test(param)) {\n        modes.add(Number(param));\n      }\n    }\n    return modes;\n  }\n  function terminalInputModeSupportsModifiedEnter(state) {\n    return state.kittyKeyboardFlags > 0 || state.win32InputMode;\n  }\n  function terminalInputModeStatesEqual(left, right) {\n    return left.kittyKeyboardFlags === right.kittyKeyboardFlags && left.win32InputMode === right.win32InputMode && Boolean(left.applicationCursorKeys) === Boolean(right.applicationCursorKeys) && Boolean(left.bracketedPaste) === Boolean(right.bracketedPaste);\n  }\n  var TerminalInputModeTracker = class {\n    constructor() {\n      this.kittyKeyboardFlags = 0;\n      this.win32InputMode = false;\n      this.applicationCursorKeys = false;\n      this.bracketedPaste = false;\n      this.kittyKeyboardStack = [];\n      this.pending = "";\n    }\n    feed(data) {\n      if (data.length === 0) {\n        return { changed: false, responses: [] };\n      }\n      const text = `${this.pending}${data}`;\n      this.pending = "";\n      let changed = false;\n      const responses = [];\n      let consumedUntil = 0;\n      CSI_INPUT_MODE_SEQUENCE.lastIndex = 0;\n      for (; ; ) {\n        const match = CSI_INPUT_MODE_SEQUENCE.exec(text);\n        if (!match) {\n          break;\n        }\n        consumedUntil = CSI_INPUT_MODE_SEQUENCE.lastIndex;\n        if (match[4]) {\n          changed = this.applyPrivateModeSequence(match[3] ?? "", match[4]) || changed;\n          continue;\n        }\n        const result = this.applyKittyKeyboardSequence(match[1] ?? "", match[2] ?? "");\n        changed = changed || result.changed;\n        responses.push(...result.responses);\n      }\n      const tail = text.slice(consumedUntil);\n      const pendingStart = tail.lastIndexOf(`${ESC}[`);\n      if (pendingStart >= 0) {\n        const pending = tail.slice(pendingStart);\n        if (INCOMPLETE_CSI_INPUT_MODE_SEQUENCE.test(pending)) {\n          this.pending = pending;\n        }\n      }\n      return { changed, responses };\n    }\n    reset() {\n      this.kittyKeyboardFlags = 0;\n      this.win32InputMode = false;\n      this.applicationCursorKeys = false;\n      this.bracketedPaste = false;\n      this.kittyKeyboardStack.length = 0;\n      this.pending = "";\n    }\n    getState() {\n      return {\n        kittyKeyboardFlags: this.kittyKeyboardFlags,\n        win32InputMode: this.win32InputMode,\n        applicationCursorKeys: this.applicationCursorKeys,\n        bracketedPaste: this.bracketedPaste\n      };\n    }\n    getKittyKeyboardFlags() {\n      return this.kittyKeyboardFlags;\n    }\n    supportsModifiedEnter() {\n      return terminalInputModeSupportsModifiedEnter(this.getState());\n    }\n    getPreamble() {\n      const parts = [];\n      if (this.kittyKeyboardFlags > 0) {\n        parts.push(`\\x1B[=${this.kittyKeyboardFlags};1u`);\n      }\n      if (this.win32InputMode) {\n        parts.push("\\x1B[?9001h");\n      }\n      if (this.applicationCursorKeys) {\n        parts.push("\\x1B[?1h");\n      }\n      if (this.bracketedPaste) {\n        parts.push("\\x1B[?2004h");\n      }\n      return parts.join("");\n    }\n    applyKittyKeyboardSequence(prefix, params) {\n      const previousFlags = this.kittyKeyboardFlags;\n      switch (prefix) {\n        case ">": {\n          this.kittyKeyboardStack.push(this.kittyKeyboardFlags);\n          this.kittyKeyboardFlags = parseFirstParam(params) ?? 1;\n          break;\n        }\n        case "=": {\n          const mode = parseSecondParam(params) ?? 1;\n          this.kittyKeyboardFlags = mode === 0 ? 0 : parseFirstParam(params) ?? 0;\n          break;\n        }\n        case "<": {\n          const count = Math.max(1, parseFirstParam(params) ?? 1);\n          for (let index = 0; index < count; index += 1) {\n            this.kittyKeyboardFlags = this.kittyKeyboardStack.pop() ?? 0;\n          }\n          break;\n        }\n        case "?":\n          return {\n            changed: false,\n            responses: [`\\x1B[?${this.kittyKeyboardFlags}u`]\n          };\n        default:\n          return { changed: false, responses: [] };\n      }\n      return {\n        changed: this.kittyKeyboardFlags !== previousFlags,\n        responses: []\n      };\n    }\n    applyPrivateModeSequence(params, final) {\n      const modes = parsePrivateModeParams(params);\n      let changed = false;\n      if (modes.has(WIN32_INPUT_MODE)) {\n        const previous = this.win32InputMode;\n        this.win32InputMode = final === "h";\n        changed = this.win32InputMode !== previous || changed;\n      }\n      if (modes.has(APPLICATION_CURSOR_KEYS_MODE)) {\n        const previous = this.applicationCursorKeys;\n        this.applicationCursorKeys = final === "h";\n        changed = this.applicationCursorKeys !== previous || changed;\n      }\n      if (modes.has(BRACKETED_PASTE_MODE)) {\n        const previous = this.bracketedPaste;\n        this.bracketedPaste = final === "h";\n        changed = this.bracketedPaste !== previous || changed;\n      }\n      return changed;\n    }\n  };\n\n  // src/utils/terminal-keys.ts\n  var MODIFIER_DOM_KEYS = /* @__PURE__ */ new Set(["Control", "Shift", "Alt", "Meta", "AltGraph", "OS"]);\n  var DOM_KEY_ALIASES = {\n    Esc: "Escape",\n    Left: "ArrowLeft",\n    Right: "ArrowRight",\n    Up: "ArrowUp",\n    Down: "ArrowDown",\n    Del: "Delete",\n    Spacebar: " ",\n    Space: " "\n  };\n  var SUPPORTED_SPECIAL_KEYS = /* @__PURE__ */ new Set([\n    "Enter",\n    "Tab",\n    "Backspace",\n    "Escape",\n    "ArrowUp",\n    "ArrowDown",\n    "ArrowLeft",\n    "ArrowRight",\n    "Home",\n    "End",\n    "Insert",\n    "Delete",\n    "PageUp",\n    "PageDown",\n    "F1",\n    "F2",\n    "F3",\n    "F4",\n    "F5",\n    "F6",\n    "F7",\n    "F8",\n    "F9",\n    "F10",\n    "F11",\n    "F12"\n  ]);\n  function isTerminalModifierDomKey(rawKey) {\n    return MODIFIER_DOM_KEYS.has(rawKey);\n  }\n  function normalizeDomTerminalKey(rawKey) {\n    if (!rawKey) {\n      return null;\n    }\n    const key = DOM_KEY_ALIASES[rawKey] ?? rawKey;\n    if (key === "Unidentified" || key === "Dead" || key === "Compose" || key === "Process") {\n      return null;\n    }\n    if (key.length === 1) {\n      return key;\n    }\n    if (SUPPORTED_SPECIAL_KEYS.has(key)) {\n      return key;\n    }\n    return null;\n  }\n  function normalizeTerminalTransportKey(key) {\n    if (key.length === 1) {\n      return key.toLowerCase();\n    }\n    return key;\n  }\n  function hasPendingTerminalModifiers(modifiers) {\n    return modifiers.ctrl || modifiers.shift || modifiers.alt;\n  }\n  function isAppleHandheldPlatform(input) {\n    const userAgent = input.userAgent ?? "";\n    const platform = input.platform ?? "";\n    const touchPoints = input.maxTouchPoints ?? 0;\n    if (/iPad|iPhone|iPod/.test(userAgent)) {\n      return true;\n    }\n    if (/Mac/i.test(platform) && touchPoints > 1) {\n      return true;\n    }\n    return false;\n  }\n  function shouldInterceptDomTerminalKey(args) {\n    if (hasPendingTerminalModifiers(args.pendingModifiers)) {\n      return true;\n    }\n    if (args.key === "Enter" && (args.shiftKey || args.ctrlKey || args.altKey || args.metaKey)) {\n      return Boolean(args.enhancedInputActive);\n    }\n    if (args.isAppleHandheld && args.ctrlKey && !args.metaKey && !args.altKey && !args.shiftKey && (args.key === "c" || args.key === "C")) {\n      return true;\n    }\n    return false;\n  }\n  function resolveMacTerminalEditingShortcut(args) {\n    if (args.ctrlKey || args.shiftKey) {\n      return null;\n    }\n    if (args.metaKey && !args.altKey) {\n      switch (args.key) {\n        case "ArrowLeft":\n          return "\u0001";\n        case "ArrowRight":\n          return "\u0005";\n        case "Backspace":\n          return "\u0015";\n        default:\n          return null;\n      }\n    }\n    if (args.altKey && !args.metaKey) {\n      switch (args.key) {\n        case "ArrowLeft":\n          return "\\x1Bb";\n        case "ArrowRight":\n          return "\\x1Bf";\n        default:\n          return null;\n      }\n    }\n    return null;\n  }\n  function mergeTerminalModifiers(args) {\n    const { pendingModifiers, ctrlKey, shiftKey, altKey, metaKey } = args;\n    return {\n      ctrl: ctrlKey || pendingModifiers.ctrl,\n      shift: shiftKey || pendingModifiers.shift,\n      alt: altKey || pendingModifiers.alt,\n      meta: metaKey\n    };\n  }\n\n  // ../protocol/dist/terminal-snapshot.js\n  var DEFAULT_STYLE = {\n    fg: void 0,\n    bg: void 0,\n    fgMode: void 0,\n    bgMode: void 0,\n    bold: false,\n    italic: false,\n    underline: false,\n    dim: false,\n    inverse: false,\n    strikethrough: false\n  };\n  function renderTerminalSnapshotToAnsi(state) {\n    const rows = [...state.scrollback, ...state.grid];\n    const wrapFlags = [...state.scrollbackWrapped ?? [], ...state.gridWrapped ?? []];\n    const hasWrapInfo = wrapFlags.length === rows.length;\n    const lines = hasWrapInfo ? [] : ["\\x1B[?7l"];\n    for (let rowIndex = 0; rowIndex < rows.length; rowIndex += 1) {\n      const row = rows[rowIndex] ?? [];\n      const continuesToNextRow = hasWrapInfo && wrapFlags[rowIndex] === true;\n      lines.push(renderTerminalRow(row, continuesToNextRow ? state.cols : void 0));\n      if (rowIndex < rows.length - 1 && !continuesToNextRow) {\n        lines.push("\\r\\n");\n      }\n    }\n    lines.push("\\x1B[0m");\n    const cursorPresentationAnsi = renderCursorPresentationToAnsi(state.cursor);\n    if (cursorPresentationAnsi) {\n      lines.push(cursorPresentationAnsi);\n    }\n    lines.push(`\\x1B[${state.cursor.row + 1};${state.cursor.col + 1}H`);\n    lines.push(state.cursor.hidden ? "\\x1B[?25l" : "\\x1B[?25h");\n    if (!hasWrapInfo) {\n      lines.push("\\x1B[?7h");\n    }\n    return lines.join("");\n  }\n  function renderCursorPresentationToAnsi(cursor) {\n    if (!cursor.style) {\n      return null;\n    }\n    const cursorStyleCode = (() => {\n      if (cursor.style === "block") {\n        return cursor.blink === false ? 2 : 1;\n      }\n      if (cursor.style === "underline") {\n        return cursor.blink === false ? 4 : 3;\n      }\n      return cursor.blink === false ? 6 : 5;\n    })();\n    return `\\x1B[${cursorStyleCode} q`;\n  }\n  function renderTerminalRow(row, padToCols) {\n    const output = [];\n    const contentLength = getTerminalRowLength(row);\n    const length = padToCols !== void 0 ? Math.max(contentLength, padToCols) : contentLength;\n    let previousStyle = DEFAULT_STYLE;\n    for (let index = 0; index < length; index += 1) {\n      const cell = row[index] ?? { char: " " };\n      const nextStyle = getTerminalStyle(cell);\n      if (!terminalStylesEqual(previousStyle, nextStyle)) {\n        output.push(styleToAnsi(nextStyle));\n        previousStyle = nextStyle;\n      }\n      output.push(cell.char || " ");\n    }\n    if (!terminalStylesEqual(previousStyle, DEFAULT_STYLE)) {\n      output.push("\\x1B[0m");\n    }\n    return output.join("");\n  }\n  function getTerminalRowLength(row) {\n    for (let index = row.length - 1; index >= 0; index -= 1) {\n      const cell = row[index];\n      if (!cell) {\n        continue;\n      }\n      if (cell.char !== " ") {\n        return index + 1;\n      }\n      if (cell.fg !== void 0 || cell.bg !== void 0 || cell.fgMode !== void 0 || cell.bgMode !== void 0 || cell.bold || cell.italic || cell.underline || cell.dim || cell.inverse || cell.strikethrough) {\n        return index + 1;\n      }\n    }\n    return 0;\n  }\n  function getTerminalStyle(cell) {\n    return {\n      fg: cell.fg,\n      bg: cell.bg,\n      fgMode: cell.fgMode,\n      bgMode: cell.bgMode,\n      bold: Boolean(cell.bold),\n      italic: Boolean(cell.italic),\n      underline: Boolean(cell.underline),\n      dim: Boolean(cell.dim),\n      inverse: Boolean(cell.inverse),\n      strikethrough: Boolean(cell.strikethrough)\n    };\n  }\n  function terminalStylesEqual(left, right) {\n    return left.fg === right.fg && left.bg === right.bg && left.fgMode === right.fgMode && left.bgMode === right.bgMode && left.bold === right.bold && left.italic === right.italic && left.underline === right.underline && left.dim === right.dim && left.inverse === right.inverse && left.strikethrough === right.strikethrough;\n  }\n  function styleToAnsi(style) {\n    const codes = ["0"];\n    if (style.bold) {\n      codes.push("1");\n    }\n    if (style.dim) {\n      codes.push("2");\n    }\n    if (style.italic) {\n      codes.push("3");\n    }\n    if (style.underline) {\n      codes.push("4");\n    }\n    if (style.inverse) {\n      codes.push("7");\n    }\n    if (style.strikethrough) {\n      codes.push("9");\n    }\n    if (style.fg !== void 0 && style.fgMode !== void 0) {\n      codes.push(...colorToSgr(style.fgMode, style.fg, false));\n    }\n    if (style.bg !== void 0 && style.bgMode !== void 0) {\n      codes.push(...colorToSgr(style.bgMode, style.bg, true));\n    }\n    return `\\x1B[${codes.join(";")}m`;\n  }\n  function colorToSgr(mode, value, background) {\n    if (mode === 1) {\n      if (value >= 8) {\n        return [String((background ? 100 : 90) + (value - 8))];\n      }\n      return [String((background ? 40 : 30) + value)];\n    }\n    if (mode === 2) {\n      return [background ? "48" : "38", "5", String(value)];\n    }\n    if (mode === 3) {\n      return [\n        background ? "48" : "38",\n        "2",\n        String(value >> 16 & 255),\n        String(value >> 8 & 255),\n        String(value & 255)\n      ];\n    }\n    return [];\n  }\n\n  // src/terminal/local-links/terminal-local-link-parsing.ts\n  var linkSuffixRegexEol = generateLinkSuffixRegex(true);\n  var linkSuffixRegex = generateLinkSuffixRegex(false);\n  function generateLinkSuffixRegex(eolOnly) {\n    let rowIndex = 0;\n    let colIndex = 0;\n    let rowEndIndex = 0;\n    let colEndIndex = 0;\n    const row = () => `(?<row${rowIndex++}>\\\\d+)`;\n    const col = () => `(?<col${colIndex++}>\\\\d+)`;\n    const rowEnd = () => `(?<rowEnd${rowEndIndex++}>\\\\d+)`;\n    const colEnd = () => `(?<colEnd${colEndIndex++}>\\\\d+)`;\n    const eolSuffix = eolOnly ? "$" : "";\n    const clauses = [\n      `(?::|#| |[\'"],|, )${row()}([:.]${col()}(?:-(?:${rowEnd()}\\\\.)?${colEnd()})?)?${eolSuffix}`,\n      `[\'"]?(?:,? |: ?| on )lines? ${row()}(?:-${rowEnd()})?(?:,? (?:col(?:umn)?|characters?) ${col()}(?:-${colEnd()})?)?${eolSuffix}`,\n      `:? ?[\\\\[\\\\(]${row()}(?:(?:, ?|:)${col()})?[\\\\]\\\\)]${eolSuffix}`\n    ];\n    return new RegExp(`(${clauses.join("|").replace(/ /g, "[\\xA0 ]")})`, eolOnly ? void 0 : "g");\n  }\n  function detectLinkSuffixes(line) {\n    const results = [];\n    linkSuffixRegex.lastIndex = 0;\n    let match;\n    while ((match = linkSuffixRegex.exec(line)) !== null) {\n      const suffix = toLinkSuffix(match);\n      if (!suffix) {\n        break;\n      }\n      results.push(suffix);\n    }\n    return results;\n  }\n  function toLinkSuffix(match) {\n    const groups = match?.groups;\n    if (!groups || match.length < 1) {\n      return null;\n    }\n    return {\n      row: parseIntOptional(groups.row0 || groups.row1 || groups.row2),\n      col: parseIntOptional(groups.col0 || groups.col1 || groups.col2),\n      rowEnd: parseIntOptional(groups.rowEnd0 || groups.rowEnd1 || groups.rowEnd2),\n      colEnd: parseIntOptional(groups.colEnd0 || groups.colEnd1 || groups.colEnd2),\n      suffix: { index: match.index, text: match[0] }\n    };\n  }\n  function parseIntOptional(value) {\n    return value === void 0 ? void 0 : parseInt(value, 10);\n  }\n  var linkWithSuffixPathCharacters = /(?<path>(?:file:\\/\\/\\/)?[^\\s|<>[({][^\\s|<>]*)$/;\n  var unixLocalLinkClause = `(?:(?:${"(?:\\\\.\\\\.?|\\\\~|file:\\\\/\\\\/)" /* PathPrefix */}|(?:${"[^\\\\0<>\\\\?\\\\s!`&*()\\\\[\\\\]\'\\":;\\\\\\\\]" /* ExcludedStartPathCharactersClause */}${"[^\\\\0<>\\\\?\\\\s!`&*()\'\\":;\\\\\\\\]" /* ExcludedPathCharactersClause */}*))?(?:${"\\\\/" /* PathSeparatorClause */}(?:${"[^\\\\0<>\\\\?\\\\s!`&*()\'\\":;\\\\\\\\]" /* ExcludedPathCharactersClause */})+)+)`;\n  var winDrivePrefix = "(?:\\\\\\\\\\\\\\\\\\\\?\\\\\\\\|file:\\\\/\\\\/\\\\/)?[a-zA-Z]:";\n  var winLocalLinkClause = `(?:(?:(?:${winDrivePrefix}|${"\\\\.\\\\.?|\\\\~" /* WinOtherPathPrefix */})|(?:${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\\\\[\\\\]\'\\":;]" /* WinExcludedStartPathCharactersClause */}${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\'\\":;]" /* WinExcludedPathCharactersClause */}*))?(?:${"(?:\\\\\\\\|\\\\/)" /* WinPathSeparatorClause */}(?:${"[^\\\\0<>\\\\?\\\\|\\\\/\\\\s!`&*()\'\\":;]" /* WinExcludedPathCharactersClause */})+)+)`;\n  function detectTerminalLocalLinks(line) {\n    const results = detectLinksViaSuffix(line);\n    insertNonConflicting(results, detectPathsNoSuffix(line, unixLocalLinkClause));\n    insertNonConflicting(results, detectPathsNoSuffix(line, winLocalLinkClause));\n    return results;\n  }\n  function detectLinksViaSuffix(line) {\n    const results = [];\n    const suffixes = detectLinkSuffixes(line);\n    for (const suffix of suffixes) {\n      results.push(...detectLinksForSuffix(line, suffix));\n    }\n    return results;\n  }\n  function detectLinksForSuffix(line, suffix) {\n    const beforeSuffix = line.substring(0, suffix.suffix.index);\n    const possiblePathMatch = beforeSuffix.match(linkWithSuffixPathCharacters);\n    if (!possiblePathMatch?.groups?.path || possiblePathMatch.index === void 0) {\n      return [];\n    }\n    const pathWithPrefix = trimPathPrefix({\n      path: possiblePathMatch.groups.path,\n      startIndex: possiblePathMatch.index,\n      suffix\n    });\n    if (!pathWithPrefix) {\n      return [];\n    }\n    const pathIndex = pathWithPrefix.startIndex + (pathWithPrefix.prefix?.text.length ?? 0);\n    const links = [\n      {\n        path: {\n          index: pathIndex,\n          text: pathWithPrefix.path\n        },\n        prefix: pathWithPrefix.prefix,\n        suffix\n      }\n    ];\n    for (const match of pathWithPrefix.path.matchAll(/(?<bracket>[[(])/g)) {\n      const bracket = match.groups?.bracket;\n      if (!bracket) {\n        continue;\n      }\n      const nextCharacter = pathWithPrefix.path[match.index + bracket.length];\n      if (nextCharacter === "]" || nextCharacter === ")") {\n        continue;\n      }\n      links.push({\n        path: {\n          index: pathIndex + match.index + 1,\n          text: pathWithPrefix.path.substring(match.index + bracket.length)\n        },\n        prefix: pathWithPrefix.prefix,\n        suffix\n      });\n    }\n    return links;\n  }\n  function trimPathPrefix(input) {\n    const prefixMatch = input.path.match(/^(?<prefix>[\'"]+)/);\n    if (!prefixMatch?.groups?.prefix) {\n      return { path: input.path, startIndex: input.startIndex };\n    }\n    const prefix = {\n      index: input.startIndex,\n      text: prefixMatch.groups.prefix\n    };\n    const path = input.path.substring(prefix.text.length);\n    if (path.trim().length === 0) {\n      return null;\n    }\n    const trimPrefixAmount = getTrimPrefixAmount(prefix.text, input.suffix);\n    if (trimPrefixAmount === 0) {\n      return { path, startIndex: input.startIndex, prefix };\n    }\n    prefix.index += trimPrefixAmount;\n    prefix.text = prefix.text[prefix.text.length - 1] ?? prefix.text;\n    return { path, startIndex: input.startIndex + trimPrefixAmount, prefix };\n  }\n  function getTrimPrefixAmount(prefixText, suffix) {\n    const suffixQuote = suffix.suffix.text[0];\n    if (prefixText.length > 1 && suffixQuote?.match(/[\'"]/) && prefixText[prefixText.length - 1] === suffixQuote) {\n      return prefixText.length - 1;\n    }\n    return 0;\n  }\n  function detectPathsNoSuffix(line, clause) {\n    const results = [];\n    const regex = new RegExp(clause, "g");\n    let match;\n    while ((match = regex.exec(line)) !== null) {\n      let text = match[0];\n      let index = match.index;\n      if (!text) {\n        break;\n      }\n      if ((line.startsWith("--- a/") || line.startsWith("+++ b/")) && index === 4 || line.startsWith("diff --git") && (text.startsWith("a/") || text.startsWith("b/"))) {\n        text = text.substring(2);\n        index += 2;\n      }\n      results.push({\n        path: { index, text },\n        prefix: void 0,\n        suffix: void 0\n      });\n    }\n    return results;\n  }\n  function insertNonConflicting(list, newItems) {\n    for (const item of newItems) {\n      const start = item.path.index;\n      const end = item.path.index + item.path.text.length;\n      const hasConflict = list.some((existing) => {\n        const existingStart = existing.path.index;\n        const existingEnd = existing.suffix?.suffix.index !== void 0 ? existing.suffix.suffix.index + existing.suffix.suffix.text.length : existing.path.index + existing.path.text.length;\n        return start < existingEnd && end > existingStart;\n      });\n      if (!hasConflict) {\n        list.push(item);\n      }\n    }\n    list.sort((left, right) => left.path.index - right.path.index);\n  }\n\n  // src/terminal/local-links/terminal-local-link-provider.ts\n  var MAX_LINE_LENGTH = 2e3;\n  var MAX_LINK_LENGTH = 500;\n  var MAX_RESOLVED_LINKS_IN_LINE = 10;\n  function createTerminalLocalFileLinkProvider(terminal, options) {\n    return new TerminalLocalFileLinkProvider(terminal, options);\n  }\n  var TerminalLocalFileLinkProvider = class {\n    constructor(terminal, options) {\n      this.terminal = terminal;\n      this.options = options;\n    }\n    terminal;\n    options;\n    activeRequests = /* @__PURE__ */ new Map();\n    async provideLinks(bufferLineNumber, callback) {\n      let activeRequest = this.activeRequests.get(bufferLineNumber);\n      if (activeRequest) {\n        callback(await activeRequest);\n        return;\n      }\n      activeRequest = this.provideLinksForLine(bufferLineNumber);\n      this.activeRequests.set(bufferLineNumber, activeRequest);\n      const links = await activeRequest;\n      this.activeRequests.delete(bufferLineNumber);\n      callback(links.length > 0 ? links : void 0);\n    }\n    async provideLinksForLine(bufferLineNumber) {\n      const windowed = getWindowedLineContent(this.terminal, bufferLineNumber - 1);\n      if (!windowed || windowed.text.length === 0 || windowed.text.length > MAX_LINE_LENGTH) {\n        return [];\n      }\n      const parsedLinks = detectTerminalLocalLinks(windowed.text);\n      const links = [];\n      let resolvedLinkCount = 0;\n      for (const parsedLink of parsedLinks) {\n        if (parsedLink.path.text.length > MAX_LINK_LENGTH) {\n          continue;\n        }\n        const source = toLinkSource(windowed.text, parsedLink);\n        if (!source) {\n          continue;\n        }\n        const target = await this.options.resolveLink(source);\n        if (!target) {\n          continue;\n        }\n        const range = toBufferRange({\n          terminal: this.terminal,\n          startLine: windowed.startLine,\n          startIndex: parsedLink.prefix?.index ?? parsedLink.path.index,\n          endIndex: getParsedLinkEndIndex(parsedLink)\n        });\n        if (!range) {\n          continue;\n        }\n        links.push(createLocalFileLink({ range, source, target, options: this.options }));\n        resolvedLinkCount += 1;\n        if (resolvedLinkCount >= MAX_RESOLVED_LINKS_IN_LINE) {\n          break;\n        }\n      }\n      return links;\n    }\n  };\n  function createLocalFileLink(input) {\n    return {\n      range: input.range,\n      text: input.source.text,\n      decorations: {\n        pointerCursor: true,\n        underline: true\n      },\n      activate: (event) => {\n        event.preventDefault();\n        const disposition = event.metaKey || event.ctrlKey ? "side" : "main";\n        input.options.openLink(input.target, disposition, event);\n      }\n    };\n  }\n  function toLinkSource(lineText, parsedLink) {\n    const path = trimLikelyTrailingPunctuation(parsedLink.path.text);\n    if (!path || path.length !== parsedLink.path.text.length) {\n      return null;\n    }\n    const lineStart = parsedLink.suffix?.row;\n    const lineEnd = parsedLink.suffix?.rowEnd;\n    const text = formatLinkSourceText({ path, suffix: parsedLink.suffix });\n    if (!text) {\n      return null;\n    }\n    const rawLinkText = lineText.slice(\n      parsedLink.prefix?.index ?? parsedLink.path.index,\n      getParsedLinkEndIndex(parsedLink)\n    );\n    if (!rawLinkText.trim()) {\n      return null;\n    }\n    return {\n      text,\n      path,\n      ...lineStart ? { lineStart } : {},\n      ...lineEnd && lineStart && lineEnd >= lineStart ? { lineEnd } : {}\n    };\n  }\n  function formatLinkSourceText(input) {\n    const { path, suffix } = input;\n    if (!suffix?.row) {\n      return path;\n    }\n    let text = `${path}:${suffix.row}`;\n    if (suffix.col) {\n      text += `:${suffix.col}`;\n    }\n    if (suffix.rowEnd) {\n      text += `-${suffix.rowEnd}`;\n      if (suffix.colEnd) {\n        text += `:${suffix.colEnd}`;\n      }\n    }\n    return text;\n  }\n  function trimLikelyTrailingPunctuation(value) {\n    return value.replace(/[\\][["\'.]+$/, "");\n  }\n  function getParsedLinkEndIndex(parsedLink) {\n    if (parsedLink.suffix) {\n      return parsedLink.suffix.suffix.index + parsedLink.suffix.suffix.text.length;\n    }\n    return parsedLink.path.index + parsedLink.path.text.length;\n  }\n  function getWindowedLineContent(terminal, requestedLine) {\n    let startLine = requestedLine;\n    let endLine = requestedLine;\n    const line = terminal.buffer.active.getLine(requestedLine);\n    if (!line) {\n      return null;\n    }\n    const lineStrings = [];\n    let contextLength = 0;\n    while (startLine > 0 && terminal.buffer.active.getLine(startLine)?.isWrapped && contextLength < MAX_LINK_LENGTH) {\n      startLine -= 1;\n      const previous = terminal.buffer.active.getLine(startLine);\n      if (!previous) {\n        break;\n      }\n      contextLength += previous.translateToString(true).length;\n    }\n    for (let y5 = startLine; y5 <= endLine; y5 += 1) {\n      const current = terminal.buffer.active.getLine(y5);\n      if (current) {\n        lineStrings.push(current.translateToString(true));\n      }\n    }\n    contextLength = 0;\n    while (endLine + 1 < terminal.buffer.active.length && terminal.buffer.active.getLine(endLine + 1)?.isWrapped && contextLength < MAX_LINK_LENGTH) {\n      endLine += 1;\n      const next = terminal.buffer.active.getLine(endLine);\n      if (!next) {\n        break;\n      }\n      const nextText = next.translateToString(true);\n      contextLength += nextText.length;\n      lineStrings.push(nextText);\n    }\n    return {\n      text: lineStrings.join(""),\n      startLine\n    };\n  }\n  function toBufferRange(input) {\n    const start = mapStringOffsetToBuffer(input.terminal, input.startLine, input.startIndex);\n    if (!start) {\n      return null;\n    }\n    const end = mapStringOffsetToBuffer(input.terminal, input.startLine, input.endIndex);\n    if (!start || !end) {\n      return null;\n    }\n    return {\n      start: { x: start.x + 1, y: start.y + 1 },\n      end: { x: end.x, y: end.y + 1 }\n    };\n  }\n  function mapStringOffsetToBuffer(terminal, startLine, offset) {\n    const buffer = terminal.buffer.active;\n    const cell = buffer.getNullCell();\n    let y5 = startLine;\n    let charsRemaining = offset;\n    while (true) {\n      const line = buffer.getLine(y5);\n      if (!line) {\n        return null;\n      }\n      for (let column = 0; column < line.length; column += 1) {\n        if (charsRemaining <= 0) {\n          return { y: y5, x: column };\n        }\n        const currentCell = line.getCell(column, cell);\n        const chars = currentCell?.getChars() ?? "";\n        const width = currentCell?.getWidth() ?? 0;\n        if (width) {\n          charsRemaining -= chars.length || 1;\n          if (isWrappedWideCharacterContinuation({\n            buffer,\n            cell,\n            lineLength: line.length,\n            column,\n            y: y5,\n            chars\n          })) {\n            charsRemaining += 1;\n          }\n        }\n        if (charsRemaining <= 0) {\n          return { y: y5, x: column + width };\n        }\n      }\n      if (charsRemaining <= 0) {\n        return { y: y5, x: line.length };\n      }\n      y5 += 1;\n    }\n  }\n  function isWrappedWideCharacterContinuation(input) {\n    if (input.column !== input.lineLength - 1 || input.chars !== "") {\n      return false;\n    }\n    const nextLine = input.buffer.getLine(input.y + 1);\n    const nextCell = nextLine?.getCell(0, input.cell);\n    return Boolean(nextLine?.isWrapped && nextCell?.getWidth() === 2);\n  }\n\n  // src/pane-find/find-shortcut.ts\n  function isFindShortcut(event, platform) {\n    const primaryModifier = platform.isMac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey;\n    return primaryModifier && !event.shiftKey && !event.altKey && event.key.toLowerCase() === "f";\n  }\n\n  // src/utils/mac-user-agent.ts\n  function isMacUserAgent() {\n    if (typeof navigator === "undefined") return false;\n    const userAgent = navigator.userAgent ?? "";\n    const platform = navigator.platform ?? "";\n    return /Macintosh|Mac OS|iPhone|iPad|iPod/i.test(userAgent) || /Mac|iPhone|iPad|iPod/i.test(platform);\n  }\n\n  // src/terminal/runtime/terminal-font.ts\n  var DEFAULT_TERMINAL_FONT_SIZE = 13;\n  var DEFAULT_TERMINAL_FONT_FAMILY = [\n    // Prefer common developer fonts, with Nerd Font variants for prompt/TUI glyphs.\n    "JetBrains Mono",\n    "JetBrainsMono Nerd Font",\n    "JetBrainsMono NF",\n    "MesloLGM Nerd Font",\n    "MesloLGM NF",\n    "Hack Nerd Font",\n    "FiraCode Nerd Font",\n    // PUA-only fallback (many Nerd glyphs live here on some systems).\n    "Symbols Nerd Font",\n    // System fallbacks.\n    "SF Mono",\n    "Menlo",\n    "Monaco",\n    "Consolas",\n    "\'Liberation Mono\'",\n    "monospace"\n  ].join(", ");\n  function resolveTerminalFontFamily(fontFamily) {\n    const trimmed = fontFamily?.trim();\n    return trimmed && trimmed.length > 0 ? trimmed : DEFAULT_TERMINAL_FONT_FAMILY;\n  }\n  function resolveTerminalFontSize(fontSize) {\n    return typeof fontSize === "number" && Number.isFinite(fontSize) && fontSize > 0 ? fontSize : DEFAULT_TERMINAL_FONT_SIZE;\n  }\n\n  // src/terminal/runtime/terminal-emulator-runtime.ts\n  var FIND_HIGHLIGHT_LIMIT = 2e4;\n  function createTerminalResizeEvent(input) {\n    return {\n      rows: input.rows,\n      cols: input.cols,\n      shouldClaim: input.shouldClaim,\n      forceClaim: input.shouldClaim && input.forceClaim\n    };\n  }\n  var isAppleHandheld = typeof navigator !== "undefined" && isAppleHandheldPlatform({\n    userAgent: navigator.userAgent,\n    platform: navigator.platform,\n    maxTouchPoints: navigator.maxTouchPoints\n  });\n  var DEFAULT_TOUCH_SCROLL_LINE_HEIGHT_PX = 18;\n  var FIT_TIMEOUT_DELAYS_MS = [0, 16, 48, 120, 250, 500, 1e3, 2e3];\n  var OUTPUT_OPERATION_TIMEOUT_MS = 5e3;\n  var EMPTY_TERMINAL_OUTPUT = new Uint8Array(0);\n  var RESET_TERMINAL_OUTPUT = new Uint8Array([27, 99]);\n  var terminalOutputEncoder = new TextEncoder();\n  function encodeTerminalOutput(text) {\n    return terminalOutputEncoder.encode(text);\n  }\n  function prependTerminalOutput(prefix, data) {\n    const output = new Uint8Array(prefix.length + data.length);\n    output.set(prefix, 0);\n    output.set(data, prefix.length);\n    return output;\n  }\n  function withOverviewRulerBorderHidden(theme) {\n    return {\n      ...theme,\n      overviewRulerBorder: theme.background ?? "transparent"\n    };\n  }\n  var TerminalEmulatorRuntime = class {\n    constructor(options = { isMac: isMacUserAgent() }) {\n      this.options = options;\n    }\n    options;\n    callbacks = {};\n    pendingModifiers = {\n      ctrl: false,\n      shift: false,\n      alt: false\n    };\n    terminal = null;\n    fitAddon = null;\n    searchAddon = null;\n    findResult = { resultIndex: -1, resultCount: 0 };\n    findQuery = "";\n    findOutputAnchor;\n    findWidgetSize = { width: 0, height: 0 };\n    find = {\n      setWidgetSize: (size) => {\n        this.findWidgetSize = size;\n        this.emitFindResult();\n      },\n      search: (query, direction) => {\n        this.releaseFindOutputAnchor();\n        this.findQuery = query;\n        if (this.terminal && !this.searchAddon) this.loadSearchAddon(this.terminal);\n        const theme = this.terminal?.options.theme;\n        const options = {\n          regex: false,\n          caseSensitive: false,\n          incremental: direction === void 0,\n          decorations: {\n            matchBorder: theme?.yellow ?? "#b58900",\n            matchOverviewRuler: theme?.yellow ?? "#b58900",\n            activeMatchBorder: theme?.blue ?? "#268bd2",\n            activeMatchColorOverviewRuler: theme?.blue ?? "#268bd2"\n          }\n        };\n        if (direction === "next") this.searchAddon?.findNext(query, options);\n        else this.searchAddon?.findPrevious(query, options);\n      },\n      clear: () => {\n        this.releaseFindOutputAnchor();\n        this.findQuery = "";\n        this.searchAddon?.dispose();\n        this.searchAddon = null;\n        this.findResult = { resultIndex: -1, resultCount: 0 };\n        this.emitFindResult();\n      }\n    };\n    fitAndEmitResize = null;\n    lastSize = null;\n    cleanup = null;\n    outputOperations = [];\n    inFlightOutputOperation = null;\n    inFlightOutputOperationTimeout = null;\n    // Plain writes are submitted to xterm without waiting, so their onCommitted callbacks are\n    // pending until xterm commits the write. unmount() disposes xterm before those fire, so we\n    // track them here to flush remaining callbacks and avoid stalling upstream backpressure.\n    pendingWriteCommits = /* @__PURE__ */ new Set();\n    // True once a plain write has been submitted to xterm that no later barrier has gated\n    // yet. A barrier only needs the sentinel-write gate when this is set; at mount or right\n    // after another barrier it\'s false and the barrier applies immediately, saving a parse\n    // cycle of latency. Cleared when a barrier starts (it gates every write before it).\n    hasUngatedWrites = false;\n    inputModeDecoder = new TextDecoder();\n    suppressInput = false;\n    inputModeTracker = new TerminalInputModeTracker();\n    lastInputModeState = this.inputModeTracker.getState();\n    themeBackgroundElements = [];\n    handleVisibilityRestore = () => {\n      if (typeof document !== "undefined" && document.visibilityState !== "visible") {\n        return;\n      }\n      this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      if (typeof window.requestAnimationFrame === "function") {\n        window.requestAnimationFrame(() => {\n          this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n        });\n      }\n    };\n    setCallbacks(input) {\n      this.callbacks = input.callbacks;\n    }\n    setPendingModifiers(input) {\n      this.pendingModifiers = input.pendingModifiers;\n    }\n    loadSearchAddon(terminal) {\n      const searchAddon = new A2({ highlightLimit: FIND_HIGHLIGHT_LIMIT });\n      terminal.loadAddon(searchAddon);\n      this.searchAddon = searchAddon;\n      searchAddon.onDidChangeResults((result) => {\n        this.findResult = result;\n        this.emitFindResult();\n      });\n    }\n    releaseFindOutputAnchor() {\n      this.findOutputAnchor?.dispose();\n      this.findOutputAnchor = void 0;\n    }\n    preserveFindViewport(terminal) {\n      if (!this.findQuery || this.findResult.resultCount === 0 || this.findOutputAnchor) return;\n      const buffer = terminal.buffer.active;\n      this.findOutputAnchor = terminal.registerMarker(\n        buffer.viewportY - buffer.baseY - buffer.cursorY\n      );\n    }\n    attachKeyEventHandler(terminal) {\n      terminal.attachCustomKeyEventHandler((event) => {\n        if (event.type !== "keydown" || event.isComposing) {\n          return true;\n        }\n        if (this.handleFindShortcut(event)) return false;\n        if (!this.options.isMac && event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey) {\n          const key = event.key.toLowerCase();\n          if (key === "c" && terminal.hasSelection()) {\n            void navigator.clipboard.writeText(terminal.getSelection());\n            return false;\n          }\n          if (key === "v") {\n            event.preventDefault();\n            void navigator.clipboard.readText().then((text) => {\n              if (text) {\n                terminal.paste(text);\n              }\n              return;\n            });\n            return false;\n          }\n          return true;\n        }\n        if (this.maybeSendMacEditingShortcut(terminal, event)) {\n          return false;\n        }\n        const normalizedKey = normalizeDomTerminalKey(event.key);\n        if (!normalizedKey || isTerminalModifierDomKey(event.key)) {\n          return true;\n        }\n        if (!shouldInterceptDomTerminalKey({\n          key: normalizedKey,\n          ctrlKey: event.ctrlKey,\n          shiftKey: event.shiftKey,\n          altKey: event.altKey,\n          metaKey: event.metaKey,\n          pendingModifiers: this.pendingModifiers,\n          enhancedInputActive: this.inputModeTracker.supportsModifiedEnter(),\n          isAppleHandheld\n        })) {\n          return true;\n        }\n        const modifiers = mergeTerminalModifiers({\n          pendingModifiers: this.pendingModifiers,\n          ctrlKey: event.ctrlKey,\n          shiftKey: event.shiftKey,\n          altKey: event.altKey,\n          metaKey: event.metaKey\n        });\n        this.callbacks.onTerminalKey?.({\n          key: normalizeTerminalTransportKey(normalizedKey),\n          ...modifiers\n        });\n        if (hasPendingTerminalModifiers(this.pendingModifiers)) {\n          this.callbacks.onPendingModifiersConsumed?.();\n        }\n        event.preventDefault();\n        event.stopPropagation();\n        return false;\n      });\n    }\n    handleFindShortcut(event) {\n      if (!isFindShortcut(event, this.options) || !this.callbacks.onFindRequest) return false;\n      event.preventDefault();\n      event.stopPropagation();\n      this.callbacks.onFindRequest();\n      return true;\n    }\n    findWidgetCoversSelection() {\n      if (!this.findQuery) return false;\n      const terminal = this.terminal;\n      const element = terminal?.element;\n      const screen2 = element?.querySelector(".xterm-screen");\n      const selection = terminal?.getSelectionPosition();\n      if (!terminal || !element || !screen2 || !selection) return false;\n      const root2 = element.getBoundingClientRect();\n      const grid = screen2.getBoundingClientRect();\n      const cellWidth = grid.width / terminal.cols;\n      const cellHeight = grid.height / terminal.rows;\n      const firstRow = terminal.buffer.active.viewportY;\n      const top = grid.top + (selection.start.y - firstRow) * cellHeight;\n      const bottom = grid.top + (selection.end.y - firstRow + 1) * cellHeight;\n      const rightCol = selection.start.y === selection.end.y ? selection.end.x : terminal.cols;\n      const right = grid.left + rightCol * cellWidth;\n      return top < root2.top + this.findWidgetSize.height && bottom > root2.top && right > root2.right - this.findWidgetSize.width;\n    }\n    emitFindResult() {\n      const placement = this.findWidgetCoversSelection() ? "bottom" : "top";\n      this.callbacks.onFindResult?.({\n        ...this.findResult,\n        limited: this.findResult.resultCount >= FIND_HIGHLIGHT_LIMIT,\n        placement\n      });\n    }\n    getInputModeState() {\n      return this.inputModeTracker.getState();\n    }\n    maybeSendMacEditingShortcut(terminal, event) {\n      if (!this.options.isMac || hasPendingTerminalModifiers(this.pendingModifiers)) {\n        return false;\n      }\n      const editingShortcutData = resolveMacTerminalEditingShortcut(event);\n      if (editingShortcutData === null) {\n        return false;\n      }\n      terminal.input(editingShortcutData, true);\n      terminal.scrollToBottom();\n      event.preventDefault();\n      event.stopPropagation();\n      return true;\n    }\n    mount(input) {\n      this.unmount();\n      input.host.innerHTML = "";\n      this.lastSize = null;\n      this.inputModeTracker.reset();\n      this.emitInputModeChange();\n      const openExternalLink = (event, uri) => {\n        event.preventDefault();\n        void this.callbacks.onOpenExternalUrl?.(uri);\n      };\n      const terminal = new Vn2({\n        allowProposedApi: true,\n        convertEol: false,\n        cursorBlink: true,\n        cursorStyle: "bar",\n        fontFamily: resolveTerminalFontFamily(input.fontFamily),\n        fontSize: resolveTerminalFontSize(input.fontSize),\n        // OSC 8 hyperlinks; without a handler xterm prompts and calls window.open().\n        linkHandler: { activate: openExternalLink },\n        lineHeight: 1,\n        macOptionIsMeta: true,\n        minimumContrastRatio: 1,\n        rescaleOverlappingGlyphs: true,\n        scrollbar: {\n          width: 8\n        },\n        scrollback: input.scrollback,\n        theme: withOverviewRulerBorderHidden(input.theme)\n      });\n      const fitAddon = new l();\n      const unicode11Addon = new I3();\n      let webglAddon = null;\n      let imageAddon = null;\n      terminal.loadAddon(fitAddon);\n      terminal.loadAddon(unicode11Addon);\n      terminal.loadAddon(new L3(openExternalLink));\n      const localFileLinkProvider = terminal.registerLinkProvider(\n        createTerminalLocalFileLinkProvider(terminal, {\n          resolveLink: async (source) => {\n            const target = await this.callbacks.onResolveLocalFileLink?.(source);\n            return target ?? null;\n          },\n          openLink: (target, disposition) => {\n            void this.callbacks.onOpenLocalFileLink?.(target, disposition);\n          }\n        })\n      );\n      this.loadSearchAddon(terminal);\n      terminal.onWriteParsed(() => {\n        const anchor = this.findOutputAnchor;\n        if (anchor && !anchor.isDisposed) terminal.scrollToLine(anchor.line);\n        if (this.pendingWriteCommits.size === 0) this.releaseFindOutputAnchor();\n      });\n      terminal.onScroll(() => {\n        if (this.findQuery) this.emitFindResult();\n      });\n      terminal.loadAddon(new j());\n      try {\n        terminal.loadAddon(new sa());\n      } catch {\n      }\n      terminal.open(input.host);\n      this.themeBackgroundElements = this.collectThemeBackgroundElements(input);\n      this.applyThemeBackground(input.theme);\n      try {\n        terminal.unicode.activeVersion = "11";\n      } catch {\n      }\n      const disposeImageAddon = () => {\n        try {\n          imageAddon?.dispose();\n        } catch {\n        }\n        imageAddon = null;\n      };\n      const disposeWebglRenderer = () => {\n        if (!webglAddon) {\n          return;\n        }\n        try {\n          webglAddon.dispose();\n        } catch {\n        }\n        webglAddon = null;\n        disposeImageAddon();\n        this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      };\n      const registerProtocolQuerySuppression = () => {\n        terminal.parser.registerCsiHandler({ final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: ">", final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: "=", final: "c" }, () => true);\n        terminal.parser.registerCsiHandler({ final: "n" }, () => true);\n        terminal.parser.registerCsiHandler({ prefix: "?", final: "n" }, () => true);\n        terminal.parser.registerCsiHandler({ final: "R" }, () => true);\n        terminal.parser.registerCsiHandler({ intermediates: "$", final: "p" }, () => true);\n        terminal.parser.registerCsiHandler(\n          { prefix: "?", intermediates: "$", final: "p" },\n          () => true\n        );\n        for (const code of [10, 11, 12]) {\n          terminal.parser.registerOscHandler(code, (data) => data.trim() === "?");\n        }\n      };\n      registerProtocolQuerySuppression();\n      let webglAddonRaf = requestAnimationFrame(() => {\n        webglAddonRaf = null;\n        try {\n          disposeWebglRenderer();\n          webglAddon = new bt2();\n          webglAddon.onContextLoss(() => {\n            disposeWebglRenderer();\n          });\n          terminal.loadAddon(webglAddon);\n          imageAddon = new je();\n          terminal.loadAddon(imageAddon);\n          registerProtocolQuerySuppression();\n          this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n        } catch {\n          disposeWebglRenderer();\n        }\n      });\n      const restoreDocumentStyles = this.applyDocumentBoundsStyles({\n        root: input.root\n      });\n      const restoreViewportStyles = this.applyViewportTouchStyles({\n        host: input.host\n      });\n      this.terminal = terminal;\n      this.fitAddon = fitAddon;\n      window.__paseoTerminal = terminal;\n      const fitAndEmitResize = (resizeInput) => {\n        const forceRefresh = resizeInput?.forceRefresh ?? false;\n        const shouldClaim = resizeInput?.shouldClaim ?? true;\n        const forceClaim = resizeInput?.forceClaim ?? false;\n        const currentTerminal = this.terminal;\n        const currentFitAddon = this.fitAddon;\n        if (!currentTerminal || !currentFitAddon) {\n          return;\n        }\n        if (input.root.offsetWidth === 0 || input.root.offsetHeight === 0) {\n          return;\n        }\n        try {\n          currentFitAddon.fit();\n        } catch {\n          return;\n        }\n        const nextRows = currentTerminal.rows;\n        const nextCols = currentTerminal.cols;\n        const previous = this.lastSize;\n        if (!forceRefresh && !forceClaim && previous && previous.rows === nextRows && previous.cols === nextCols) {\n          return;\n        }\n        this.lastSize = { rows: nextRows, cols: nextCols };\n        this.refreshVisibleRows();\n        this.callbacks.onResize?.(\n          createTerminalResizeEvent({\n            rows: nextRows,\n            cols: nextCols,\n            shouldClaim,\n            forceClaim\n          })\n        );\n      };\n      this.fitAndEmitResize = fitAndEmitResize;\n      fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      const inputDisposable = terminal.onData((data) => {\n        if (this.suppressInput) {\n          return;\n        }\n        this.callbacks.onInput?.(data);\n      });\n      this.attachKeyEventHandler(terminal);\n      const removeTouchListeners = this.setupTouchScrollHandlers({\n        root: input.root,\n        host: input.host,\n        terminal\n      });\n      const resizeObserver = new ResizeObserver(() => {\n        fitAndEmitResize({ shouldClaim: false });\n      });\n      resizeObserver.observe(input.root);\n      resizeObserver.observe(input.host);\n      const windowResizeHandler = () => {\n        fitAndEmitResize({ shouldClaim: false });\n      };\n      window.addEventListener("resize", windowResizeHandler);\n      const windowFocusHandler = () => {\n        this.handleVisibilityRestore();\n      };\n      window.addEventListener("focus", windowFocusHandler);\n      const documentVisibilityChangeHandler = () => {\n        this.handleVisibilityRestore();\n      };\n      document.addEventListener("visibilitychange", documentVisibilityChangeHandler);\n      const visualViewport = window.visualViewport;\n      const visualViewportResizeHandler = () => {\n        fitAndEmitResize({ shouldClaim: false });\n      };\n      visualViewport?.addEventListener("resize", visualViewportResizeHandler);\n      const fitTimeouts = FIT_TIMEOUT_DELAYS_MS.map(\n        (delayMs) => window.setTimeout(() => {\n          fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n        }, delayMs)\n      );\n      const fontSet = document.fonts;\n      const fontReadyHandler = () => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      };\n      fontSet?.addEventListener?.("loadingdone", fontReadyHandler);\n      void fontSet?.ready.then(() => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n        return;\n      }).catch(() => {\n      });\n      window.setTimeout(() => {\n        fitAndEmitResize({ forceRefresh: true, shouldClaim: false });\n      }, 0);\n      if (input.initialSnapshot) {\n        this.renderSnapshot({ state: input.initialSnapshot });\n      }\n      this.processOutputQueue();\n      const disposables = {\n        disposeInput: () => {\n          inputDisposable.dispose();\n        },\n        disconnectResizeObserver: () => {\n          resizeObserver.disconnect();\n        },\n        removeWindowResize: () => {\n          window.removeEventListener("resize", windowResizeHandler);\n        },\n        removeWindowFocus: () => {\n          window.removeEventListener("focus", windowFocusHandler);\n        },\n        removeDocumentVisibilityChange: () => {\n          document.removeEventListener("visibilitychange", documentVisibilityChangeHandler);\n        },\n        removeVisualViewportResize: () => {\n          visualViewport?.removeEventListener("resize", visualViewportResizeHandler);\n        },\n        clearFitTimeouts: () => {\n          for (const handle of fitTimeouts) {\n            window.clearTimeout(handle);\n          }\n        },\n        removeFontListeners: () => {\n          fontSet?.removeEventListener?.("loadingdone", fontReadyHandler);\n        },\n        removeTouchListeners,\n        restoreDocumentStyles,\n        restoreViewportStyles,\n        disposeFitAddon: () => {\n          fitAddon.dispose();\n        },\n        disposeWebglAddon: () => {\n          if (webglAddonRaf !== null) {\n            cancelAnimationFrame(webglAddonRaf);\n            webglAddonRaf = null;\n          }\n          disposeWebglRenderer();\n          disposeImageAddon();\n        },\n        disposeTerminal: () => {\n          localFileLinkProvider.dispose();\n          terminal.dispose();\n        }\n      };\n      this.cleanup = () => {\n        disposables.disposeInput();\n        disposables.disconnectResizeObserver();\n        disposables.removeWindowResize();\n        disposables.removeWindowFocus();\n        disposables.removeDocumentVisibilityChange();\n        disposables.removeVisualViewportResize();\n        disposables.clearFitTimeouts();\n        disposables.removeFontListeners();\n        disposables.removeTouchListeners();\n        disposables.disposeFitAddon();\n        disposables.disposeWebglAddon();\n        disposables.disposeTerminal();\n        disposables.restoreDocumentStyles();\n        disposables.restoreViewportStyles();\n      };\n    }\n    write(input) {\n      if (input.data.length === 0) {\n        input.onCommitted?.();\n        return;\n      }\n      this.outputOperations.push({\n        type: "write",\n        data: input.data,\n        suppressInput: input.suppressInput ?? false,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    clear(input) {\n      this.outputOperations.push({\n        type: "clear",\n        data: EMPTY_TERMINAL_OUTPUT,\n        suppressInput: false,\n        ...input?.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    paste(text) {\n      this.terminal?.paste(text);\n    }\n    renderSnapshot(input) {\n      if (!input.state) {\n        this.clear(input);\n        return;\n      }\n      this.restoreOutput({\n        data: encodeTerminalOutput(renderTerminalSnapshotToAnsi(input.state)),\n        rows: input.state.rows,\n        cols: input.state.cols,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n    }\n    restoreOutput(input) {\n      this.outputOperations.push({\n        type: "snapshot",\n        data: prependTerminalOutput(RESET_TERMINAL_OUTPUT, input.data),\n        rows: input.rows,\n        cols: input.cols,\n        suppressInput: true,\n        ...input.onCommitted ? { onCommitted: input.onCommitted } : {}\n      });\n      this.processOutputQueue();\n    }\n    resize(input) {\n      this.fitAndEmitResize?.(input);\n    }\n    setTheme(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.theme = withOverviewRulerBorderHidden(input.theme);\n      } catch {\n        return;\n      }\n      this.applyThemeBackground(input.theme);\n      this.refreshVisibleRows();\n    }\n    setScrollback(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.scrollback = input.lines;\n      } catch {\n        return;\n      }\n      this.refreshVisibleRows();\n    }\n    setFont(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      try {\n        terminal.options.fontFamily = resolveTerminalFontFamily(input.fontFamily);\n        terminal.options.fontSize = resolveTerminalFontSize(input.fontSize);\n      } catch {\n        return;\n      }\n      this.fitAndEmitResize?.({ forceRefresh: true, shouldClaim: false });\n      this.refreshVisibleRows();\n    }\n    focus(input) {\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      if (input?.forceRefocus) {\n        terminal.blur();\n      }\n      terminal.focus();\n    }\n    blur() {\n      this.terminal?.blur();\n    }\n    refreshVisibleRows() {\n      const terminal = this.terminal;\n      if (!terminal || terminal.rows <= 0) {\n        return;\n      }\n      try {\n        terminal.refresh(0, terminal.rows - 1);\n      } catch {\n      }\n    }\n    collectThemeBackgroundElements(input) {\n      return [\n        input.root,\n        input.host,\n        ...Array.from(\n          input.host.querySelectorAll(".xterm, .xterm-screen, .xterm-viewport")\n        )\n      ];\n    }\n    applyThemeBackground(theme) {\n      const background = theme.background ?? "#0b0b0b";\n      for (const element of this.themeBackgroundElements) {\n        element.style.backgroundColor = background;\n      }\n    }\n    unmount() {\n      this.releaseFindOutputAnchor();\n      this.clearInFlightOutputTimeout();\n      const inFlightOperation = this.inFlightOutputOperation;\n      this.inFlightOutputOperation = null;\n      if (inFlightOperation?.onCommitted) {\n        inFlightOperation.onCommitted();\n      }\n      const pendingOperations = this.outputOperations.splice(0, this.outputOperations.length);\n      for (const operation of pendingOperations) {\n        operation.onCommitted?.();\n      }\n      for (const commit of Array.from(this.pendingWriteCommits)) {\n        commit();\n      }\n      this.hasUngatedWrites = false;\n      this.cleanup?.();\n      this.cleanup = null;\n      if (window.__paseoTerminal === this.terminal) {\n        window.__paseoTerminal = void 0;\n      }\n      this.terminal = null;\n      this.searchAddon = null;\n      this.findQuery = "";\n      this.findResult = { resultIndex: -1, resultCount: 0 };\n      this.fitAddon = null;\n      this.fitAndEmitResize = null;\n      this.lastSize = null;\n      this.themeBackgroundElements = [];\n      this.suppressInput = false;\n      this.inputModeDecoder.decode();\n      this.inputModeTracker.reset();\n      this.emitInputModeChange();\n    }\n    // A barrier op mutates terminal geometry or toggles suppressInput and must apply in\n    // isolation: clear/snapshot reset/resize the terminal, and any write carrying\n    // suppressInput flips input handling around the commit. Plain writes are fast-pathed.\n    isBarrierOperation(operation) {\n      return operation.type !== "write" || Boolean(operation.suppressInput);\n    }\n    processOutputQueue() {\n      if (this.inFlightOutputOperation) {\n        return;\n      }\n      const terminal = this.terminal;\n      if (!terminal) {\n        return;\n      }\n      while (this.outputOperations[0] && !this.isBarrierOperation(this.outputOperations[0])) {\n        const writeOperation = this.outputOperations.shift();\n        if (!writeOperation) {\n          break;\n        }\n        this.submitWrite(terminal, writeOperation);\n      }\n      const operation = this.outputOperations.shift();\n      if (!operation) {\n        return;\n      }\n      if (!this.hasUngatedWrites) {\n        this.startBarrierOperation(terminal, operation);\n        return;\n      }\n      let started = false;\n      const startBarrier = () => {\n        if (started || this.inFlightOutputOperation !== operation || this.terminal !== terminal) {\n          return;\n        }\n        started = true;\n        this.clearInFlightOutputTimeout();\n        this.startBarrierOperation(terminal, operation);\n      };\n      this.inFlightOutputOperation = operation;\n      this.inFlightOutputOperationTimeout = setTimeout(startBarrier, OUTPUT_OPERATION_TIMEOUT_MS);\n      try {\n        terminal.write(EMPTY_TERMINAL_OUTPUT, startBarrier);\n      } catch {\n        startBarrier();\n      }\n    }\n    submitWrite(terminal, operation) {\n      this.preserveFindViewport(terminal);\n      const text = this.inputModeDecoder.decode(operation.data, { stream: true });\n      const result = this.inputModeTracker.feed(text);\n      if (result.changed) {\n        this.emitInputModeChange();\n      }\n      this.hasUngatedWrites = true;\n      const onCommitted = operation.onCommitted;\n      const commit = () => {\n        if (!this.pendingWriteCommits.delete(commit)) {\n          return;\n        }\n        onCommitted?.();\n      };\n      this.pendingWriteCommits.add(commit);\n      try {\n        terminal.write(operation.data, commit);\n      } catch {\n        commit();\n      }\n    }\n    startBarrierOperation(terminal, operation) {\n      this.inFlightOutputOperation = operation;\n      this.hasUngatedWrites = false;\n      const previousSuppressInput = this.suppressInput;\n      if (operation.suppressInput) {\n        this.suppressInput = Boolean(operation.suppressInput);\n      }\n      const finalizeOperation = (expectedOperation) => {\n        if (this.inFlightOutputOperation !== expectedOperation) {\n          return;\n        }\n        this.inFlightOutputOperation = null;\n        this.clearInFlightOutputTimeout();\n        this.suppressInput = previousSuppressInput;\n        expectedOperation.onCommitted?.();\n        this.processOutputQueue();\n      };\n      if (operation.type === "clear") {\n        this.inputModeDecoder.decode();\n        this.inputModeTracker.reset();\n        this.emitInputModeChange();\n        terminal.reset();\n        finalizeOperation(operation);\n        return;\n      }\n      if (operation.type === "snapshot") {\n        this.inputModeDecoder.decode();\n        this.inputModeTracker.reset();\n        this.emitInputModeChange();\n        try {\n          if (typeof operation.cols === "number" && typeof operation.rows === "number" && (terminal.cols !== operation.cols || terminal.rows !== operation.rows)) {\n            terminal.resize(operation.cols, operation.rows);\n          }\n        } catch {\n          finalizeOperation(operation);\n          return;\n        }\n      }\n      const data = operation.data;\n      if (operation.type === "write") {\n        const text = this.inputModeDecoder.decode(data, { stream: true });\n        const result = this.inputModeTracker.feed(text);\n        if (result.changed) {\n          this.emitInputModeChange();\n        }\n      }\n      this.inFlightOutputOperationTimeout = setTimeout(() => {\n        finalizeOperation(operation);\n      }, OUTPUT_OPERATION_TIMEOUT_MS);\n      try {\n        terminal.write(data, () => {\n          finalizeOperation(operation);\n        });\n      } catch {\n        finalizeOperation(operation);\n      }\n    }\n    clearInFlightOutputTimeout() {\n      if (!this.inFlightOutputOperationTimeout) {\n        return;\n      }\n      clearTimeout(this.inFlightOutputOperationTimeout);\n      this.inFlightOutputOperationTimeout = null;\n    }\n    emitInputModeChange() {\n      const state = this.inputModeTracker.getState();\n      if (terminalInputModeStatesEqual(state, this.lastInputModeState)) {\n        return;\n      }\n      this.lastInputModeState = state;\n      this.callbacks.onInputModeChange?.(state);\n    }\n    applyDocumentBoundsStyles(input) {\n      const documentElement = document.documentElement;\n      const body = document.body;\n      const rootContainer = input.root.parentElement;\n      const previousDocumentElementOverflow = documentElement.style.overflow;\n      const previousDocumentElementWidth = documentElement.style.width;\n      const previousDocumentElementHeight = documentElement.style.height;\n      const previousDocumentElementTextSizeAdjust = documentElement.style.getPropertyValue("text-size-adjust");\n      const previousDocumentElementWebkitTextSizeAdjust = documentElement.style.getPropertyValue(\n        "-webkit-text-size-adjust"\n      );\n      const previousBodyOverflow = body.style.overflow;\n      const previousBodyWidth = body.style.width;\n      const previousBodyHeight = body.style.height;\n      const previousBodyMargin = body.style.margin;\n      const previousBodyPadding = body.style.padding;\n      const previousBodyTextSizeAdjust = body.style.getPropertyValue("text-size-adjust");\n      const previousBodyWebkitTextSizeAdjust = body.style.getPropertyValue(\n        "-webkit-text-size-adjust"\n      );\n      const previousRootOverflow = rootContainer?.style.overflow ?? "";\n      const previousRootWidth = rootContainer?.style.width ?? "";\n      const previousRootHeight = rootContainer?.style.height ?? "";\n      documentElement.style.overflow = "hidden";\n      documentElement.style.width = "100%";\n      documentElement.style.height = "100%";\n      documentElement.style.setProperty("text-size-adjust", "100%");\n      documentElement.style.setProperty("-webkit-text-size-adjust", "100%");\n      body.style.overflow = "hidden";\n      body.style.width = "100%";\n      body.style.height = "100%";\n      body.style.margin = "0";\n      body.style.padding = "0";\n      body.style.setProperty("text-size-adjust", "100%");\n      body.style.setProperty("-webkit-text-size-adjust", "100%");\n      if (rootContainer) {\n        rootContainer.style.overflow = "hidden";\n        rootContainer.style.width = "100%";\n        rootContainer.style.height = "100%";\n      }\n      return () => {\n        documentElement.style.overflow = previousDocumentElementOverflow;\n        documentElement.style.width = previousDocumentElementWidth;\n        documentElement.style.height = previousDocumentElementHeight;\n        documentElement.style.setProperty("text-size-adjust", previousDocumentElementTextSizeAdjust);\n        documentElement.style.setProperty(\n          "-webkit-text-size-adjust",\n          previousDocumentElementWebkitTextSizeAdjust\n        );\n        body.style.overflow = previousBodyOverflow;\n        body.style.width = previousBodyWidth;\n        body.style.height = previousBodyHeight;\n        body.style.margin = previousBodyMargin;\n        body.style.padding = previousBodyPadding;\n        body.style.setProperty("text-size-adjust", previousBodyTextSizeAdjust);\n        body.style.setProperty("-webkit-text-size-adjust", previousBodyWebkitTextSizeAdjust);\n        if (rootContainer) {\n          rootContainer.style.overflow = previousRootOverflow;\n          rootContainer.style.width = previousRootWidth;\n          rootContainer.style.height = previousRootHeight;\n        }\n      };\n    }\n    applyViewportTouchStyles(input) {\n      const viewportElement = input.host.querySelector(".xterm-viewport");\n      const previousViewportOverscroll = viewportElement?.style.overscrollBehavior ?? "";\n      const previousViewportTouchAction = viewportElement?.style.touchAction ?? "";\n      const previousViewportOverflowY = viewportElement?.style.overflowY ?? "";\n      const previousViewportOverflowX = viewportElement?.style.overflowX ?? "";\n      const previousViewportPointerEvents = viewportElement?.style.pointerEvents ?? "";\n      const previousViewportWebkitOverflowScrolling = viewportElement?.style.getPropertyValue("-webkit-overflow-scrolling") ?? "";\n      if (viewportElement) {\n        viewportElement.style.overscrollBehavior = "none";\n        viewportElement.style.touchAction = "pan-y";\n        viewportElement.style.overflowY = "auto";\n        viewportElement.style.overflowX = "hidden";\n        viewportElement.style.pointerEvents = "auto";\n        viewportElement.style.setProperty("-webkit-overflow-scrolling", "touch");\n      }\n      return () => {\n        if (viewportElement) {\n          viewportElement.style.overscrollBehavior = previousViewportOverscroll;\n          viewportElement.style.touchAction = previousViewportTouchAction;\n          viewportElement.style.overflowY = previousViewportOverflowY;\n          viewportElement.style.overflowX = previousViewportOverflowX;\n          viewportElement.style.pointerEvents = previousViewportPointerEvents;\n          viewportElement.style.setProperty(\n            "-webkit-overflow-scrolling",\n            previousViewportWebkitOverflowScrolling\n          );\n        }\n      };\n    }\n    setupTouchScrollHandlers(input) {\n      let touchScrollRemainderPx = 0;\n      const measuredLineHeight = input.host.querySelector(".xterm-rows > div")?.getBoundingClientRect().height ?? 0;\n      const touchScrollLineHeightPx = measuredLineHeight > 0 ? measuredLineHeight : DEFAULT_TOUCH_SCROLL_LINE_HEIGHT_PX;\n      const activeTouch = {\n        identifier: -1,\n        startX: 0,\n        startY: 0,\n        lastX: 0,\n        lastY: 0,\n        mode: null\n      };\n      const touchStartHandler = (event) => {\n        if (event.touches.length !== 1) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n          return;\n        }\n        const touch = event.touches[0];\n        if (!touch) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n          return;\n        }\n        activeTouch.identifier = touch.identifier;\n        activeTouch.startX = touch.clientX;\n        activeTouch.startY = touch.clientY;\n        activeTouch.lastX = touch.clientX;\n        activeTouch.lastY = touch.clientY;\n        activeTouch.mode = null;\n        touchScrollRemainderPx = 0;\n      };\n      const touchMoveHandler = (event) => {\n        if (event.touches.length !== 1) {\n          return;\n        }\n        const touch = Array.from(event.touches).find(\n          (candidate) => candidate.identifier === activeTouch.identifier\n        );\n        if (!touch) {\n          return;\n        }\n        const totalDeltaX = touch.clientX - activeTouch.startX;\n        const totalDeltaY = touch.clientY - activeTouch.startY;\n        if (activeTouch.mode === null) {\n          const absX = Math.abs(totalDeltaX);\n          const absY = Math.abs(totalDeltaY);\n          if (absX > 8 || absY > 8) {\n            activeTouch.mode = absY >= absX ? "vertical" : "horizontal";\n          }\n        }\n        const deltaY = touch.clientY - activeTouch.lastY;\n        activeTouch.lastX = touch.clientX;\n        activeTouch.lastY = touch.clientY;\n        if (activeTouch.mode !== "vertical") {\n          return;\n        }\n        touchScrollRemainderPx += deltaY;\n        const lineDelta = Math.trunc(touchScrollRemainderPx / touchScrollLineHeightPx);\n        if (lineDelta !== 0) {\n          input.terminal.scrollLines(-lineDelta);\n          touchScrollRemainderPx -= lineDelta * touchScrollLineHeightPx;\n        }\n        event.preventDefault();\n      };\n      const touchEndHandler = (event) => {\n        const activeTouchEnded = Array.from(event.changedTouches).some(\n          (touch) => touch.identifier === activeTouch.identifier\n        );\n        if (activeTouchEnded || event.touches.length === 0) {\n          touchScrollRemainderPx = 0;\n          activeTouch.identifier = -1;\n          activeTouch.mode = null;\n        }\n      };\n      const touchCancelHandler = () => {\n        touchScrollRemainderPx = 0;\n        activeTouch.identifier = -1;\n        activeTouch.mode = null;\n      };\n      input.root.addEventListener("touchstart", touchStartHandler, { passive: true });\n      input.root.addEventListener("touchmove", touchMoveHandler, { passive: false });\n      input.root.addEventListener("touchend", touchEndHandler, { passive: true });\n      input.root.addEventListener("touchcancel", touchCancelHandler, { passive: true });\n      return () => {\n        input.root.removeEventListener("touchstart", touchStartHandler);\n        input.root.removeEventListener("touchmove", touchMoveHandler);\n        input.root.removeEventListener("touchend", touchEndHandler);\n        input.root.removeEventListener("touchcancel", touchCancelHandler);\n      };\n    }\n  };\n\n  // src/terminal/webview/terminal-emulator-webview-entry.ts\n  var sendToNative = (message) => {\n    window.ReactNativeWebView?.postMessage?.(JSON.stringify(message));\n  };\n  var TERMINAL_BACKGROUND_CSS_VAR = "--paseo-terminal-background";\n  var DEFAULT_TERMINAL_BACKGROUND = "#0b0b0b";\n  var TERMINAL_TAP_MOVE_TOLERANCE_PX = 8;\n  function getTerminalBackground(theme) {\n    return theme.background ?? DEFAULT_TERMINAL_BACKGROUND;\n  }\n  var installStyles = () => {\n    const style = document.createElement("style");\n    style.textContent = `\n${xterm_default}\n:root {\n  ${TERMINAL_BACKGROUND_CSS_VAR}: transparent;\n}\nhtml,\nbody,\n#terminal-root {\n  width: 100%;\n  height: 100%;\n  margin: 0;\n  padding: 0;\n  overflow: hidden;\n  overscroll-behavior: none;\n  background: var(${TERMINAL_BACKGROUND_CSS_VAR});\n}\n#terminal-root {\n  display: flex;\n  min-width: 0;\n  min-height: 0;\n}\n#terminal-host {\n  flex: 1;\n  min-width: 0;\n  min-height: 0;\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  background: var(${TERMINAL_BACKGROUND_CSS_VAR});\n}\n#terminal-root .xterm,\n#terminal-root .xterm-screen,\n#terminal-root .xterm-viewport {\n  background-color: var(${TERMINAL_BACKGROUND_CSS_VAR}) !important;\n}\n[data-terminal-scrollbar-root="true"] .xterm-viewport {\n  scrollbar-width: none;\n  -ms-overflow-style: none;\n}\n[data-terminal-scrollbar-root="true"] .xterm-viewport::-webkit-scrollbar {\n  width: 0;\n  height: 0;\n}\n#terminal-root .xterm .xterm-helper-textarea {\n  opacity: 0.01;\n  width: 1px;\n  height: 1px;\n  min-width: 1px;\n  min-height: 1px;\n  color: transparent;\n  background: transparent;\n  caret-color: transparent;\n  z-index: 5 !important;\n}\n`;\n    document.head.appendChild(style);\n  };\n  var TerminalWebViewBridge = class {\n    constructor(root2, host2) {\n      this.root = root2;\n      this.host = host2;\n      this.root.addEventListener("pointerdown", this.handlePointerDown, { passive: true });\n      this.root.addEventListener("touchstart", this.handleTouchStart, { passive: true });\n      this.root.addEventListener("touchmove", this.handleTouchMove, { passive: true });\n      this.root.addEventListener("touchend", this.handleTouchEnd, { passive: true });\n      this.root.addEventListener("touchcancel", this.handleTouchCancel, { passive: true });\n      this.root.addEventListener("pointermove", this.handlePointerMove, { passive: false });\n      this.root.addEventListener("pointerup", this.handlePointerUp, { passive: true });\n      this.root.addEventListener("pointercancel", this.handlePointerUp, { passive: true });\n    }\n    root;\n    host;\n    runtime = null;\n    streamKey = null;\n    nextLocalFileLinkRequestId = 1;\n    pendingLocalFileLinkResolutions = /* @__PURE__ */ new Map();\n    swipeGesturesEnabled = false;\n    trackingSwipe = false;\n    activePointerId = null;\n    startX = 0;\n    startY = 0;\n    firedSwipe = false;\n    tapTouchIdentifier = null;\n    tapStartX = 0;\n    tapStartY = 0;\n    tapMoved = false;\n    receive = (message) => {\n      try {\n        this.receiveUnsafe(message);\n      } catch (error) {\n        sendToNative({\n          type: "debug",\n          message: "terminal webview receive failed",\n          details: error instanceof Error ? { message: error.message, stack: error.stack } : error\n        });\n      }\n    };\n    receiveUnsafe(message) {\n      if (message.type === "mount") {\n        this.mount(message);\n        return;\n      }\n      if (message.type === "unmount") {\n        this.unmount(message.streamKey);\n        return;\n      }\n      if (!this.matches(message.streamKey)) {\n        return;\n      }\n      if (message.type === "resolveLocalFileLinkResponse") {\n        this.resolveLocalFileLinkRequest(message.requestId, message.target);\n        return;\n      }\n      if (message.type === "findWidgetSize") {\n        this.runtime?.find.setWidgetSize(message.size);\n        return;\n      }\n      if (message.type === "find") {\n        this.runtime?.find.search(message.query, message.direction);\n        return;\n      }\n      if (message.type === "clearFind") {\n        this.runtime?.find.clear();\n        return;\n      }\n      this.receiveMounted(message);\n    }\n    receiveMounted(message) {\n      if (this.receiveConfigurationMessage(message)) return;\n      switch (message.type) {\n        case "writeOutput":\n          this.runtime?.write({ data: encodeTerminalOutput(message.text) });\n          break;\n        case "restoreOutput":\n          this.runtime?.restoreOutput({ data: encodeTerminalOutput(message.text) });\n          break;\n        case "renderSnapshot":\n          this.runtime?.renderSnapshot({ state: message.state });\n          break;\n        case "paste":\n          this.runtime?.paste(message.text);\n          break;\n        case "clear":\n          this.runtime?.clear();\n          break;\n        case "focus":\n          this.runtime?.focus({ forceRefocus: message.forceRefocus });\n          break;\n        case "resize":\n          this.runtime?.resize({\n            shouldClaim: message.shouldClaim ?? true,\n            forceClaim: message.forceClaim\n          });\n          break;\n      }\n    }\n    receiveConfigurationMessage(message) {\n      switch (message.type) {\n        case "setTheme":\n          this.applyThemeBackground(message.theme);\n          this.runtime?.setTheme({ theme: message.theme });\n          return true;\n        case "setScrollback":\n          this.runtime?.setScrollback({ lines: message.lines });\n          return true;\n        case "setFont":\n          this.runtime?.setFont({ fontFamily: message.fontFamily, fontSize: message.fontSize });\n          return true;\n        case "setPendingModifiers":\n          this.runtime?.setPendingModifiers({ pendingModifiers: message.pendingModifiers });\n          return true;\n        case "setSwipeGesturesEnabled":\n          this.swipeGesturesEnabled = message.enabled;\n          return true;\n        default:\n          return false;\n      }\n    }\n    mount(message) {\n      this.unmount(this.streamKey);\n      this.streamKey = message.streamKey;\n      this.swipeGesturesEnabled = message.swipeGesturesEnabled;\n      this.applyThemeBackground(message.theme);\n      const runtime = new TerminalEmulatorRuntime();\n      this.runtime = runtime;\n      runtime.setCallbacks({\n        callbacks: {\n          onFindRequest: () => sendToNative({ type: "findRequest", streamKey: message.streamKey }),\n          onFindResult: (result) => sendToNative({ type: "findResult", streamKey: message.streamKey, result }),\n          onInput: (data) => sendToNative({ type: "input", streamKey: message.streamKey, data }),\n          onResize: ({ rows, cols, shouldClaim, forceClaim }) => sendToNative({\n            type: "resize",\n            streamKey: message.streamKey,\n            rows,\n            cols,\n            shouldClaim,\n            forceClaim\n          }),\n          onTerminalKey: (input) => sendToNative({ type: "terminalKey", streamKey: message.streamKey, ...input }),\n          onPendingModifiersConsumed: () => sendToNative({ type: "pendingModifiersConsumed", streamKey: message.streamKey }),\n          onInputModeChange: (state) => sendToNative({ type: "inputModeChange", streamKey: message.streamKey, state }),\n          onOpenExternalUrl: (url) => sendToNative({ type: "openExternalUrl", streamKey: message.streamKey, url }),\n          onResolveLocalFileLink: (source) => this.requestLocalFileLinkResolution(source),\n          onOpenLocalFileLink: (target, disposition) => sendToNative({\n            type: "openLocalFileLink",\n            streamKey: message.streamKey,\n            target,\n            disposition\n          })\n        }\n      });\n      runtime.setPendingModifiers({ pendingModifiers: message.pendingModifiers });\n      runtime.mount({\n        root: this.root,\n        host: this.host,\n        initialSnapshot: message.initialSnapshot,\n        scrollback: message.scrollbackLines,\n        theme: message.theme,\n        fontFamily: message.fontFamily,\n        fontSize: message.fontSize\n      });\n      sendToNative({ type: "rendererReady", streamKey: message.streamKey, isReady: true });\n    }\n    applyThemeBackground(theme) {\n      const background = getTerminalBackground(theme);\n      document.documentElement.style.setProperty(TERMINAL_BACKGROUND_CSS_VAR, background);\n      document.body.style.backgroundColor = background;\n      this.root.style.backgroundColor = background;\n      this.host.style.backgroundColor = background;\n    }\n    blur = () => {\n      this.runtime?.blur();\n    };\n    unmount(streamKey) {\n      if (!this.runtime) {\n        return;\n      }\n      const previousStreamKey = this.streamKey;\n      this.runtime.unmount();\n      this.runtime = null;\n      this.streamKey = null;\n      this.resolveAllLocalFileLinkRequests(null);\n      if (previousStreamKey && (!streamKey || streamKey === previousStreamKey)) {\n        sendToNative({ type: "rendererReady", streamKey: previousStreamKey, isReady: false });\n      }\n    }\n    matches(streamKey) {\n      return this.streamKey === streamKey;\n    }\n    requestLocalFileLinkResolution(source) {\n      const streamKey = this.streamKey;\n      if (!streamKey) {\n        return Promise.resolve(null);\n      }\n      const requestId = this.nextLocalFileLinkRequestId++;\n      return new Promise((resolve) => {\n        this.pendingLocalFileLinkResolutions.set(requestId, resolve);\n        sendToNative({\n          type: "resolveLocalFileLink",\n          streamKey,\n          requestId,\n          source\n        });\n      });\n    }\n    resolveLocalFileLinkRequest(requestId, target) {\n      const resolve = this.pendingLocalFileLinkResolutions.get(requestId);\n      if (!resolve) {\n        return;\n      }\n      this.pendingLocalFileLinkResolutions.delete(requestId);\n      resolve(target);\n    }\n    resolveAllLocalFileLinkRequests(target) {\n      const requests = Array.from(this.pendingLocalFileLinkResolutions.values());\n      this.pendingLocalFileLinkResolutions.clear();\n      for (const resolve of requests) {\n        resolve(target);\n      }\n    }\n    handlePointerDown = (event) => {\n      if (!event.isPrimary) {\n        return;\n      }\n      if (!this.swipeGesturesEnabled) {\n        return;\n      }\n      this.trackingSwipe = true;\n      this.firedSwipe = false;\n      this.activePointerId = event.pointerId;\n      this.startX = event.clientX;\n      this.startY = event.clientY;\n    };\n    handleTouchStart = (event) => {\n      if (event.touches.length !== 1) {\n        this.resetTap();\n        return;\n      }\n      const touch = event.touches[0];\n      this.tapTouchIdentifier = touch.identifier;\n      this.tapStartX = touch.clientX;\n      this.tapStartY = touch.clientY;\n      this.tapMoved = false;\n    };\n    handleTouchMove = (event) => {\n      const touch = this.findTrackedTouch(event.touches);\n      if (!touch) {\n        return;\n      }\n      const dx = touch.clientX - this.tapStartX;\n      const dy = touch.clientY - this.tapStartY;\n      if (Math.abs(dx) > TERMINAL_TAP_MOVE_TOLERANCE_PX || Math.abs(dy) > TERMINAL_TAP_MOVE_TOLERANCE_PX) {\n        this.tapMoved = true;\n      }\n    };\n    handleTouchEnd = (event) => {\n      const completedTap = Boolean(this.findTrackedTouch(event.changedTouches) && !this.tapMoved);\n      this.resetTap();\n      if (completedTap) {\n        this.runtime?.focus({ forceRefocus: true });\n      }\n    };\n    handleTouchCancel = () => {\n      this.resetTap();\n    };\n    handlePointerMove = (event) => {\n      if (!this.trackingSwipe || this.firedSwipe || !this.streamKey) {\n        return;\n      }\n      if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {\n        return;\n      }\n      const dx = event.clientX - this.startX;\n      const dy = event.clientY - this.startY;\n      const absDx = Math.abs(dx);\n      const absDy = Math.abs(dy);\n      if (absDy >= 12 && absDy > absDx) {\n        this.resetSwipe();\n        return;\n      }\n      if (absDx < 22 || absDy !== 0 && absDx / absDy < 1.2) {\n        return;\n      }\n      this.firedSwipe = true;\n      sendToNative({ type: dx > 0 ? "swipeRight" : "swipeLeft", streamKey: this.streamKey });\n      if (event.cancelable) event.preventDefault();\n    };\n    handlePointerUp = (event) => {\n      if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {\n        return;\n      }\n      this.resetSwipe();\n    };\n    resetSwipe() {\n      this.trackingSwipe = false;\n      this.activePointerId = null;\n      this.startX = 0;\n      this.startY = 0;\n      this.firedSwipe = false;\n    }\n    findTrackedTouch(touches) {\n      if (this.tapTouchIdentifier === null) {\n        return null;\n      }\n      for (let index = 0; index < touches.length; index += 1) {\n        const touch = touches.item(index);\n        if (touch?.identifier === this.tapTouchIdentifier) {\n          return touch;\n        }\n      }\n      return null;\n    }\n    resetTap() {\n      this.tapTouchIdentifier = null;\n      this.tapStartX = 0;\n      this.tapStartY = 0;\n      this.tapMoved = false;\n    }\n  };\n  installStyles();\n  var root = document.createElement("div");\n  root.id = "terminal-root";\n  root.dataset.terminalScrollbarRoot = "true";\n  var host = document.createElement("div");\n  host.id = "terminal-host";\n  root.appendChild(host);\n  document.body.appendChild(root);\n  var bridge = new TerminalWebViewBridge(root, host);\n  window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__ = bridge.receive;\n  window.__PASEO_TERMINAL_WEBVIEW_BLUR__ = bridge.blur;\n  sendToNative({ type: "bridgeReady" });\n})();\n/*! Bundled license information:\n\n@xterm/addon-clipboard/lib/addon-clipboard.mjs:\n@xterm/addon-fit/lib/addon-fit.mjs:\n@xterm/addon-image/lib/addon-image.mjs:\n@xterm/addon-search/lib/addon-search.mjs:\n@xterm/addon-unicode11/lib/addon-unicode11.mjs:\n@xterm/addon-web-links/lib/addon-web-links.mjs:\n@xterm/addon-webgl/lib/addon-webgl.mjs:\n@xterm/addon-ligatures/lib/addon-ligatures.mjs:\n@xterm/xterm/lib/xterm.mjs:\n  (**\n   * Copyright (c) 2014-2024 The xterm.js authors. All rights reserved.\n   * @license MIT\n   *\n   * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n   * @license MIT\n   *\n   * Originally forked from (with the author\'s permission):\n   *   Fabrice Bellard\'s javascript vt100 for jslinux:\n   *   http://bellard.org/jslinux/\n   *   Copyright (c) 2011 Fabrice Bellard\n   *)\n*/\n</script>\n  </body>\n</html>';
diff --git a/packages/app/src/terminal/webview/terminal-find.browser.test.ts b/packages/app/src/terminal/webview/terminal-find.browser.test.ts
new file mode 100644
index 0000000000..37e83c6ba9
--- /dev/null
+++ b/packages/app/src/terminal/webview/terminal-find.browser.test.ts
@@ -0,0 +1,73 @@
+import type { Terminal } from "@xterm/xterm";
+import { afterEach, expect, test } from "vitest";
+import { terminalEmulatorWebViewHtml } from "./terminal-emulator-webview-html";
+
+interface Message {
+  type: string;
+  streamKey?: string;
+  result?: { resultCount: number; resultIndex: number };
+  data?: string;
+}
+interface TerminalFrameWindow extends Window {
+  __PASEO_TERMINAL_WEBVIEW_RECEIVE__(message: unknown): void;
+  __paseoTerminal?: Terminal;
+}
+let frame: HTMLIFrameElement;
+afterEach(() => frame?.remove());
+
+test("the generated WebView searches its mounted stream and keeps Find commands off the input bridge", async () => {
+  const messages: Message[] = [];
+  frame = document.createElement("iframe");
+  frame.style.width = "500px";
+  frame.style.height = "300px";
+  document.body.append(frame);
+  const win = frame.contentWindow as TerminalFrameWindow;
+  Object.assign(win, {
+    ReactNativeWebView: { postMessage: (raw: string) => messages.push(JSON.parse(raw)) },
+  });
+  win.document.open();
+  win.document.write(terminalEmulatorWebViewHtml);
+  win.document.close();
+  await expect.poll(() => messages.some((m) => m.type === "bridgeReady")).toBe(true);
+  const send = (message: object) =>
+    win.__PASEO_TERMINAL_WEBVIEW_RECEIVE__({ streamKey: "owned", ...message });
+  send({
+    type: "mount",
+    initialSnapshot: null,
+    scrollbackLines: 1000,
+    theme: { background: "#ffffff", foreground: "#111111" },
+    pendingModifiers: { ctrl: false, shift: false, alt: false },
+    swipeGesturesEnabled: false,
+  });
+  await expect
+    .poll(() => messages.some((m) => m.type === "rendererReady" && m.streamKey === "owned"))
+    .toBe(true);
+  send({ type: "writeOutput", text: "first a.b\r\n" + "padding\r\n".repeat(30) + "last A.B" });
+  await expect
+    .poll(() => {
+      const b = win.__paseoTerminal?.buffer.active;
+      return b
+        ? Array.from({ length: b.length }, (_, i) => b.getLine(i)?.translateToString(true)).join(
+            "\n",
+          )
+        : "";
+    })
+    .toContain("last A.B");
+  send({ type: "findWidgetSize", size: { width: 356, height: 58 } });
+  send({ type: "find", query: "a.b" });
+  await expect
+    .poll(() => messages.findLast((m) => m.type === "findResult")?.result)
+    .toMatchObject({ resultCount: 2, resultIndex: 1 });
+  send({ type: "find", query: "a.b", direction: "previous" });
+  await expect
+    .poll(() => messages.findLast((m) => m.type === "findResult")?.result)
+    .toMatchObject({ resultCount: 2, resultIndex: 0 });
+  send({ type: "find", streamKey: "stale", query: "absent" });
+  expect(win.__paseoTerminal!.getSelection()).toBe("a.b");
+  send({ type: "clearFind" });
+  await expect
+    .poll(() => messages.findLast((m) => m.type === "findResult")?.result)
+    .toMatchObject({ resultCount: 0 });
+  expect(messages.filter((m) => m.type === "input")).toEqual([]);
+  send({ type: "unmount" });
+});
diff --git a/packages/app/src/test/seed-session.ts b/packages/app/src/test/seed-session.ts
index 23848acd24..d483e01c5d 100644
--- a/packages/app/src/test/seed-session.ts
+++ b/packages/app/src/test/seed-session.ts
@@ -1,3 +1,5 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { defaultHostAppearance } from "@/hosts/appearance";
 import {
   useSessionStore,
   type ProjectDescriptor,
@@ -39,3 +41,32 @@ export function seedSessionWorkspaces(
   store.setProjects(serverId, byProjectId.values());
   store.setWorkspaces(serverId, workspaces);
 }
+
+export function seedSessionHosts(serverIds: readonly string[]): void {
+  getHostRuntimeStore().syncHosts(
+    serverIds.map((serverId) => ({
+      serverId,
+      label: serverId,
+      appearance: defaultHostAppearance(),
+      lifecycle: {},
+      connections: [],
+      preferredConnectionId: null,
+      createdAt: "2026-09-01T00:00:00.000Z",
+      updatedAt: "2026-09-01T00:00:00.000Z",
+    })),
+  );
+}
+
+export function seedRuntimeWorkspaces(
+  serverId: string,
+  workspaces: Map<string, WorkspaceDescriptor>,
+): void {
+  const runtime = getHostRuntimeStore();
+  for (const id of useSessionStore.getState().sessions[serverId]?.workspaces.keys() ?? []) {
+    if (!workspaces.has(id)) runtime.removeWorkspaceSnapshot(serverId, id);
+  }
+  for (const workspace of workspaces.values()) {
+    runtime.acceptProjectSnapshot(serverId, projectFromWorkspace(workspace));
+  }
+  runtime.acceptWorkspaceSnapshots(serverId, [...workspaces.values()]);
+}
diff --git a/packages/app/src/timeline/replica.test.ts b/packages/app/src/timeline/replica.test.ts
index daaadd8c08..fa7521e487 100644
--- a/packages/app/src/timeline/replica.test.ts
+++ b/packages/app/src/timeline/replica.test.ts
@@ -1,7 +1,15 @@
+import { DatabaseSync } from "node:sqlite";
+import { ReplicaCache } from "@/runtime/replica-cache";
+import {
+  createSqliteReplicaRowStore,
+  type ReplicaSqliteConnection,
+  type SqliteValue,
+} from "@/runtime/replica-cache/row-store-sqlite";
 import { afterEach, describe, expect, it } from "vitest";
 import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 import type { CachedTimeline } from "@/runtime/replica-cache";
 import { selectAgentTimelineState, useSessionStore } from "@/stores/session-store";
+import { useCreateFlowStore, type PendingCreateAttempt } from "@/stores/create-flow-store";
 import type { StreamItem } from "@/types/stream";
 import {
   createTimelineReplica,
@@ -44,8 +52,7 @@ function createOwner(storage: TimelineReplicaStorage): ViewedTimelineOwner {
     replaceDemandedAgentIds: () => undefined,
     drainQueuedAgentMessage: () => undefined,
     ports: {
-      initialDeliveryMode: "legacy",
-      setSubscription: async () => undefined,
+      observe: () => ({ ready: Promise.resolve(), release: async () => undefined }),
       readCursor: () => undefined,
       fetchPage: async () => ({ hasNewer: false, endCursor: null }),
       fetchLatestTail: async () => ({ hasNewer: false, endCursor: null }),
@@ -173,6 +180,59 @@ describe("viewed timeline persistence", () => {
     owner.dispose();
   });
 
+  it("reopens painted live mutations without persisting authoritative coverage", async () => {
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+    let durable: CachedTimeline | undefined = cachedTimeline();
+    let pending: CachedTimeline | undefined;
+    const storage: TimelineReplicaStorage = {
+      readTimeline: async () => durable,
+      commitTimeline: (_serverId, _agentId, timeline) => {
+        pending = timeline;
+      },
+    };
+    const first = createOwner(storage);
+    first.replaceVisibleAgentIds("test", [AGENT_ID]);
+    await expect
+      .poll(() =>
+        selectAgentTimelineState(useSessionStore.getState().sessions[SERVER_ID], AGENT_ID),
+      )
+      .toMatchObject({ status: "painted" });
+
+    first.enqueueStreamEvent(AGENT_ID, {
+      event: {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "assistant_message", text: "live", messageId: "live" },
+      } as AgentStreamEventPayload,
+      seq: 5,
+      epoch: "epoch-1",
+      timestamp: new Date("2026-08-26T10:00:01.000Z"),
+    });
+    first.flushStreamAgent(AGENT_ID);
+
+    expect(pending).toMatchObject({ range: null, hasOlder: false });
+    expect(pending?.items.map((entry) => entry.id)).toEqual(["cached", expect.any(String)]);
+    durable = pending;
+    first.dispose();
+    useSessionStore.getState().clearSession(SERVER_ID);
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+
+    const reopened = createOwner(storage);
+    reopened.replaceVisibleAgentIds("test", [AGENT_ID]);
+    await expect
+      .poll(() =>
+        selectAgentTimelineState(useSessionStore.getState().sessions[SERVER_ID], AGENT_ID),
+      )
+      .toMatchObject({
+        status: "painted",
+        items: [
+          expect.objectContaining({ id: "cached" }),
+          expect.objectContaining({ text: "live" }),
+        ],
+      });
+    reopened.dispose();
+  });
+
   it("does not let a late cache read overwrite newer network state", async () => {
     useSessionStore.getState().initializeSession(SERVER_ID, null);
     let release!: (value: CachedTimeline) => void;
@@ -383,3 +443,225 @@ describe("viewed timeline persistence", () => {
     owner.dispose();
   });
 });
+
+describe("create handoff lifetime", () => {
+  const DRAFT_ID = "draft-1";
+
+  afterEach(() => useCreateFlowStore.getState().clearAll());
+
+  function sentCreateHandoff(): void {
+    useCreateFlowStore.getState().setPending({
+      draftId: DRAFT_ID,
+      serverId: SERVER_ID,
+      agentId: AGENT_ID,
+      clientMessageId: "client-message-1",
+      text: "Create this chat.",
+      timestamp: 0,
+    });
+    useCreateFlowStore.getState().markLifecycle({ draftId: DRAFT_ID, lifecycle: "sent" });
+  }
+
+  function createHandoff(): PendingCreateAttempt | undefined {
+    return useCreateFlowStore.getState().pendingByDraftId[DRAFT_ID];
+  }
+
+  function syncedTailPage(): Parameters<ViewedTimelineOwner["applyTimelineResponse"]>[0] {
+    return {
+      requestId: "tail-1",
+      agentId: AGENT_ID,
+      agent: null,
+      direction: "tail",
+      projection: "projected",
+      reset: false,
+      epoch: "epoch-1",
+      window: { minSeq: 1, maxSeq: 0, nextSeq: 1 },
+      startCursor: null,
+      endCursor: null,
+      entries: [],
+      error: null,
+      hasNewer: false,
+      hasOlder: false,
+      staleCursor: false,
+      gap: false,
+    };
+  }
+
+  interface HeldCatchUpOwner {
+    owner: ViewedTimelineOwner;
+    release: () => void;
+  }
+
+  async function ownerWithHeldCatchUp(): Promise<HeldCatchUpOwner> {
+    let releaseTailFetch!: () => void;
+    let tailFetchStarted = false;
+    const tailFetched = new Promise<void>((resolve) => {
+      releaseTailFetch = resolve;
+    });
+    const replica = createTimelineReplica({
+      serverId: SERVER_ID,
+      storage: { readTimeline: async () => undefined, commitTimeline: () => undefined },
+      prepareAgent: async () => undefined,
+    });
+    const owner = createViewedTimelineOwner({
+      serverId: SERVER_ID,
+      replica,
+      replaceDemandedAgentIds: () => undefined,
+      drainQueuedAgentMessage: () => undefined,
+      ports: {
+        observe: () => ({ ready: Promise.resolve(), release: async () => undefined }),
+        readCursor: () => undefined,
+        fetchPage: async () => {
+          tailFetchStarted = true;
+          await tailFetched;
+          return { hasNewer: false, endCursor: null };
+        },
+        fetchLatestTail: async () => ({ hasNewer: false, endCursor: null }),
+        reportError: () => undefined,
+        schedule: () => () => undefined,
+      },
+    });
+
+    owner.setConnected(true);
+    owner.replaceVisibleAgentIds("test", [AGENT_ID]);
+    await expect.poll(() => tailFetchStarted).toBe(true);
+    return { owner, release: releaseTailFetch };
+  }
+
+  it("keeps the handoff through the first synchronized page and releases it when the chat is current", async () => {
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+    sentCreateHandoff();
+    const { owner, release } = await ownerWithHeldCatchUp();
+
+    owner.applyTimelineResponse(syncedTailPage());
+    expect(
+      selectAgentTimelineState(useSessionStore.getState().sessions[SERVER_ID], AGENT_ID),
+    ).toMatchObject({ status: "synced" });
+    expect(createHandoff()).toMatchObject({ agentId: AGENT_ID, lifecycle: "sent" });
+
+    release();
+    await expect.poll(() => createHandoff()).toBeUndefined();
+    owner.dispose();
+  });
+
+  it("releases the handoff when the chat's tab closes before catch-up completes", async () => {
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+    sentCreateHandoff();
+    const { owner, release } = await ownerWithHeldCatchUp();
+
+    owner.replaceVisibleAgentIds("test", []);
+    owner.replaceOpenTabAgentIds([]);
+
+    expect(createHandoff()).toBeUndefined();
+    release();
+    owner.dispose();
+  });
+});
+
+function createSqliteCache() {
+  const database = new DatabaseSync(":memory:");
+  let beforeRead = async () => {};
+  const connection: ReplicaSqliteConnection = {
+    async exec(sql) {
+      database.exec(sql);
+    },
+    async run(sql, params = []) {
+      database.prepare(sql).run(...params);
+    },
+    async all<Row>(sql: string, params: readonly SqliteValue[] = []) {
+      const rows = database.prepare(sql).all(...params) as Row[];
+      if (sql.includes("FROM rows") && sql.includes("WHERE")) await beforeRead();
+      return rows;
+    },
+    async transaction(operation) {
+      database.exec("BEGIN IMMEDIATE");
+      try {
+        await operation(connection);
+        database.exec("COMMIT");
+      } catch (error) {
+        database.exec("ROLLBACK");
+        throw error;
+      }
+    },
+  };
+  const storage = createSqliteReplicaRowStore({ open: async () => connection }, 1);
+  const cache = new ReplicaCache(storage, { clearLegacyCache: async () => {} });
+  return {
+    cache,
+    database,
+    holdRead: (operation: () => Promise<void>) => {
+      beforeRead = operation;
+    },
+  };
+}
+
+describe("SQLite baseline restoration", () => {
+  it.each([false, true])(
+    "keeps display-only cached history under a live event (synced=%s)",
+    async (synced) => {
+      useSessionStore.getState().initializeSession(SERVER_ID, null);
+      const { cache, database, holdRead } = createSqliteCache();
+      cache.setHosts([SERVER_ID]);
+      cache.commitTimeline(SERVER_ID, AGENT_ID, {
+        ...cachedTimeline(),
+        items: [item("earlier", "earlier", 1), ...cachedTimeline().items],
+        range: null,
+      });
+      await cache.flush();
+      holdRead(async () => {
+        if (synced) applySynced(AGENT_ID, 8);
+        else
+          useSessionStore.getState().setAgentStreamState(SERVER_ID, AGENT_ID, {
+            head: [item("cached", "cached", 4), item("live", "live", 5)],
+          });
+      });
+      const replica = createTimelineReplica({
+        serverId: SERVER_ID,
+        storage: cache,
+        prepareAgent: async () => {},
+      });
+      await replica.prepare(AGENT_ID);
+      const session = useSessionStore.getState().sessions[SERVER_ID];
+      const timeline = selectAgentTimelineState(session, AGENT_ID);
+      expect(timeline.status).toBe(synced ? "synced" : "painted");
+      expect([
+        ...(timeline.status === "cold" ? [] : timeline.items),
+        ...(session?.agentStreamHead.get(AGENT_ID) ?? []),
+      ]).toEqual(
+        synced
+          ? [item(`network-${AGENT_ID}`, "network", 8)]
+          : [item("earlier", "earlier", 1), item("cached", "cached", 4), item("live", "live", 5)],
+      );
+      expect(replica.readCursor(AGENT_ID)).toBeUndefined();
+      database.close();
+    },
+  );
+
+  it("starts the timeline disk read while agent preparation is pending", async () => {
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+    const { cache, database, holdRead } = createSqliteCache();
+    cache.setHosts([SERVER_ID]);
+    cache.commitTimeline(SERVER_ID, AGENT_ID, cachedTimeline());
+    await cache.flush();
+    let readStarted = false;
+    let release!: () => void;
+    const agentReady = new Promise<void>((resolve) => {
+      release = resolve;
+    });
+    holdRead(async () => {
+      readStarted = true;
+    });
+    const replica = createTimelineReplica({
+      serverId: SERVER_ID,
+      storage: cache,
+      prepareAgent: () => agentReady,
+    });
+    const preparation = replica.prepare(AGENT_ID);
+    try {
+      await expect.poll(() => readStarted, { timeout: 500 }).toBe(true);
+    } finally {
+      release();
+      await preparation;
+      database.close();
+    }
+  });
+});
diff --git a/packages/app/src/timeline/session-stream-reducers.test.ts b/packages/app/src/timeline/session-stream-reducers.test.ts
index ae2ba9bf53..9e57142846 100644
--- a/packages/app/src/timeline/session-stream-reducers.test.ts
+++ b/packages/app/src/timeline/session-stream-reducers.test.ts
@@ -49,6 +49,7 @@ function makeToolCallTimelineEntry(
   callId: string,
   status: "running" | "completed",
   detail: ToolCallDetail,
+  turnId?: string,
 ): TimelineResponseEntry {
   return {
     seqStart: seq,
@@ -62,6 +63,7 @@ function makeToolCallTimelineEntry(
       detail,
       error: null,
     },
+    ...(turnId ? { turnId } : {}),
     timestamp: new Date(1000 + seq).toISOString(),
   };
 }
@@ -1899,14 +1901,14 @@ describe("processTimelineResponse", () => {
     expect(assistants[0]).toMatchObject({ text: "Hello", messageId: "answer-1" });
   });
 
-  it("replaces every promoted assistant block when reconciling a projected message", () => {
+  it("replaces the whole live assistant message when reconciling projected history", () => {
     const live = processAgentStreamEvents({
       events: [makeStreamReducerEvent(makeAssistantTimelineEvent("First paragraph.\n\nSec"), 2)],
       currentTail: [],
       currentHead: [],
       currentCursor: { epoch: "epoch-1", startSeq: 1, endSeq: 1 },
     });
-    expect(getAssistantTexts(live.tail)).toHaveLength(1);
+    expect(getAssistantTexts(live.tail)).toHaveLength(0);
     expect(getAssistantTexts(live.head)).toHaveLength(1);
 
     const result = processTimelineResponse({
@@ -2171,7 +2173,7 @@ describe("processTimelineResponse", () => {
       [...result.tail, ...result.head]
         .filter((item) => item.kind === "assistant_message" || item.kind === "user_message")
         .map((item) => item.text),
-    ).toEqual(["New prompt", "First paragraph.", "Second paragraph", "Missed answer"]);
+    ).toEqual(["New prompt", "First paragraph.\n\nSecond paragraph", "Missed answer"]);
   });
 
   it("does not move a prompt or its live answer around catch-up tool history", () => {
@@ -2210,7 +2212,6 @@ describe("processTimelineResponse", () => {
     expect([...result.tail, ...result.head].map((item) => item.kind)).toEqual([
       "user_message",
       "assistant_message",
-      "assistant_message",
       "tool_call",
     ]);
   });
@@ -2775,7 +2776,7 @@ describe("processTimelineResponse", () => {
     expect(result.sideEffects).not.toContainEqual(expect.objectContaining({ type: "catch_up" }));
   });
 
-  it("keeps live assistant blocks ordered when merging a disjoint prompt-jump window", () => {
+  it("keeps whole live assistant messages ordered when merging a disjoint prompt-jump window", () => {
     const live = processAgentStreamEvents({
       events: [
         makeStreamReducerEvent(
@@ -2790,8 +2791,7 @@ describe("processTimelineResponse", () => {
       currentCursor: undefined,
     });
     expect(getAssistantTexts([...live.tail, ...live.head])).toEqual([
-      "First paragraph.",
-      "Second paragraph.",
+      "First paragraph.\n\nSecond paragraph.",
     ]);
 
     const result = processTimelineResponse({
@@ -2813,8 +2813,7 @@ describe("processTimelineResponse", () => {
     });
 
     expect(getAssistantTexts([...result.tail, ...result.head])).toEqual([
-      "First paragraph.",
-      "Second paragraph.",
+      "First paragraph.\n\nSecond paragraph.",
     ]);
   });
 
@@ -3197,12 +3196,14 @@ describe("processTimelineResponse", () => {
 
   it("coalesces tool call lifecycle rows across the older-page prepend boundary", () => {
     const callId = "toolu_boundary";
+    const turnId = "turn-boundary";
     const currentTail = hydrateStreamState(
       [
         {
           event: {
             type: "timeline",
             provider: "claude",
+            turnId,
             item: makeToolCallTimelineEntry(3, callId, "completed", {
               type: "read",
               filePath: "/tmp/example.ts",
@@ -3230,11 +3231,17 @@ describe("processTimelineResponse", () => {
         startCursor: { seq: 1 },
         endCursor: { seq: 2 },
         entries: [
-          makeToolCallTimelineEntry(1, callId, "running", {
-            type: "unknown",
-            input: { file_path: "/tmp/example.ts" },
-            output: null,
-          }),
+          makeToolCallTimelineEntry(
+            1,
+            callId,
+            "running",
+            {
+              type: "unknown",
+              input: { file_path: "/tmp/example.ts" },
+              output: null,
+            },
+            turnId,
+          ),
         ],
       },
     });
@@ -3249,7 +3256,7 @@ describe("processTimelineResponse", () => {
       })),
     ).toEqual([
       {
-        id: `agent_tool_${callId}`,
+        id: `agent_tool_turn:${turnId}/${callId}`,
         callId,
         status: "completed",
         detailType: "read",
@@ -3358,6 +3365,8 @@ describe("processTimelineResponse", () => {
 
   it("does not coalesce tool call lifecycle rows away from the prepend boundary", () => {
     const callId = "toolu_not_boundary";
+    const olderTurnId = "autonomous-turn-1";
+    const currentTurnId = "autonomous-turn-2";
     const currentTail = hydrateStreamState(
       [
         {
@@ -3368,6 +3377,7 @@ describe("processTimelineResponse", () => {
           event: {
             type: "timeline",
             provider: "claude",
+            turnId: currentTurnId,
             item: makeToolCallTimelineEntry(4, callId, "completed", {
               type: "read",
               filePath: "/tmp/example.ts",
@@ -3395,11 +3405,17 @@ describe("processTimelineResponse", () => {
         startCursor: { seq: 1 },
         endCursor: { seq: 2 },
         entries: [
-          makeToolCallTimelineEntry(1, callId, "running", {
-            type: "unknown",
-            input: { file_path: "/tmp/example.ts" },
-            output: null,
-          }),
+          makeToolCallTimelineEntry(
+            1,
+            callId,
+            "running",
+            {
+              type: "unknown",
+              input: { file_path: "/tmp/example.ts" },
+              output: null,
+            },
+            olderTurnId,
+          ),
           makeTimelineEntry(2, "older chunk "),
         ],
       },
@@ -3415,7 +3431,7 @@ describe("processTimelineResponse", () => {
     ).toEqual([
       {
         kind: "tool_call",
-        id: `agent_tool_${callId}`,
+        id: `agent_tool_turn:${olderTurnId}/${callId}`,
         status: "running",
         text: null,
       },
@@ -3427,7 +3443,7 @@ describe("processTimelineResponse", () => {
       },
       {
         kind: "tool_call",
-        id: `agent_tool_${callId}`,
+        id: `agent_tool_turn:${currentTurnId}/${callId}`,
         status: "completed",
         text: null,
       },
@@ -3961,7 +3977,7 @@ describe("processAgentStreamEvents", () => {
     expect(getAssistantTexts(result.head)).toEqual(["Identified"]);
   });
 
-  it("keeps a promoted live image block identity when the turn completes", () => {
+  it("keeps the whole live message identity when the turn completes", () => {
     const imageMarkdown = "![Architecture](docs/architecture.png)";
     const streaming = processAgentStreamEvents({
       events: [
@@ -3973,9 +3989,11 @@ describe("processAgentStreamEvents", () => {
       currentCursor: undefined,
     });
 
-    expect([streaming.changedTail, streaming.changedHead]).toEqual([true, true]);
-    expect(getAssistantTexts(streaming.tail)).toEqual(["Introductory paragraph"]);
-    expect(getAssistantTexts(streaming.head)).toEqual([imageMarkdown]);
+    expect([streaming.changedTail, streaming.changedHead]).toEqual([false, true]);
+    expect(getAssistantTexts(streaming.tail)).toEqual([]);
+    expect(getAssistantTexts(streaming.head)).toEqual([
+      `Introductory paragraph\n\n${imageMarkdown}`,
+    ]);
     const liveImageId = streaming.head[0]?.id;
 
     const completed = processAgentStreamEvent({
@@ -3990,13 +4008,12 @@ describe("processAgentStreamEvents", () => {
         item.kind === "assistant_message",
     );
     expect(assistantBlocks.map((item) => [item.id, item.text])).toEqual([
-      [streaming.tail[0]?.id, "Introductory paragraph"],
-      [liveImageId, imageMarkdown],
+      [liveImageId, `Introductory paragraph\n\n${imageMarkdown}`],
     ]);
     expect(assistantBlocks.filter((item) => item.id === liveImageId)).toHaveLength(1);
   });
 
-  it("preserves a live block trailing newline after promoting completed markdown blocks", () => {
+  it("preserves all newlines in the accumulated live message", () => {
     const result = processAgentStreamEvents({
       events: [
         makeStreamReducerEvent(
@@ -4013,21 +4030,17 @@ describe("processAgentStreamEvents", () => {
       currentCursor: undefined,
     });
 
-    expect(result.changedTail).toBe(true);
+    expect(result.changedTail).toBe(false);
     expect(result.changedHead).toBe(true);
-    expect(result.tail).toHaveLength(1);
-    expect(result.tail[0]).toMatchObject({
-      kind: "assistant_message",
-      text: "Done. I added `[TimelineMerge] ...` logging around the suspicious merge/reconcile paths.",
-    });
+    expect(result.tail).toHaveLength(0);
     expect(result.head).toHaveLength(1);
     expect(result.head[0]).toMatchObject({
       kind: "assistant_message",
-      text: "Changed:\n- [timeline-debug.ts]",
+      text: "Done. I added `[TimelineMerge] ...` logging around the suspicious merge/reconcile paths.\n\nChanged:\n- [timeline-debug.ts]",
     });
   });
 
-  it("does not promote a markdown block that is still inside an open code fence", () => {
+  it("preserves an open code fence in the whole source message", () => {
     const result = processAgentStreamEvents({
       events: [
         makeStreamReducerEvent(makeTimelineEvent("Before fence\n\n```ts\nconst a = 1;"), 1),
@@ -4038,16 +4051,12 @@ describe("processAgentStreamEvents", () => {
       currentCursor: undefined,
     });
 
-    expect(result.changedTail).toBe(true);
-    expect(result.tail).toHaveLength(1);
-    expect(result.tail[0]).toMatchObject({
-      kind: "assistant_message",
-      text: "Before fence",
-    });
+    expect(result.changedTail).toBe(false);
+    expect(result.tail).toHaveLength(0);
     expect(result.head).toHaveLength(1);
     expect(result.head[0]).toMatchObject({
       kind: "assistant_message",
-      text: "```ts\nconst a = 1;\n\nconst b = 2;",
+      text: "Before fence\n\n```ts\nconst a = 1;\n\nconst b = 2;",
     });
   });
 
@@ -4156,8 +4165,7 @@ describe("processAgentStreamEvents", () => {
     expect(getAssistantTexts([...result.tail, ...result.head])).toEqual([
       "ABC",
       imageMarkdown,
-      "D",
-      "E",
+      "D\n\nE",
     ]);
   });
 
diff --git a/packages/app/src/timeline/session-stream-reducers.ts b/packages/app/src/timeline/session-stream-reducers.ts
index b04ad00f02..dce9daa4da 100644
--- a/packages/app/src/timeline/session-stream-reducers.ts
+++ b/packages/app/src/timeline/session-stream-reducers.ts
@@ -422,13 +422,7 @@ function mergeTimelineWindow(args: {
     return cursor?.epoch !== payload.epoch || cursor.seq < startSeq || cursor.seq > endSeq;
   });
   const retainedHead = projected.head;
-  const reservedItemIds = new Set(
-    [...retainedTail, ...retainedHead].flatMap((item) =>
-      item.kind === "assistant_message" && item.blockGroupId
-        ? [item.id, item.blockGroupId]
-        : [item.id],
-    ),
-  );
+  const reservedItemIds = new Set([...retainedTail, ...retainedHead].map((item) => item.id));
   const hydrated = hydrateStreamState(
     toHydratedEvents(timelineUnits.filter((unit) => !projected.reconciledUnits.has(unit))),
     {
@@ -823,51 +817,31 @@ function reconcileOverlappingProjectedAssistant(params: {
     return { tail: params.tail, head: params.head, reconciled: false };
   }
 
-  const blockGroupId = match.current.blockGroupId;
   const messageId = projectedMessageId ?? match.current.messageId;
   const replacement: AssistantMessageItem = {
     kind: "assistant_message",
-    id: blockGroupId ?? match.current.id,
+    id: match.current.id,
     ...(messageId !== undefined ? { messageId } : {}),
     text: projectedText,
     timestamp: unit.timestamp,
     timelineCursor: { epoch: params.epoch, seq: unit.seqEnd },
   };
-  const belongsToBlockGroup = (item: StreamItem) =>
-    blockGroupId !== undefined &&
-    item.kind === "assistant_message" &&
-    item.blockGroupId === blockGroupId;
-  const removeBlockGroup = (items: StreamItem[]) =>
-    blockGroupId !== undefined ? items.filter((item) => !belongsToBlockGroup(item)) : items;
   const replaceMatch = (items: StreamItem[], index: number) => {
-    if (!blockGroupId) {
-      const next = [...items];
-      next[index] = replacement;
-      return next;
-    }
-    const next: StreamItem[] = [];
-    let inserted = false;
-    for (const item of items) {
-      if (!belongsToBlockGroup(item)) {
-        next.push(item);
-      } else if (!inserted) {
-        next.push(replacement);
-        inserted = true;
-      }
-    }
+    const next = [...items];
+    next[index] = replacement;
     return next;
   };
 
   if (headMatch) {
     return {
-      tail: removeBlockGroup(params.tail),
+      tail: params.tail,
       head: replaceMatch(params.head, headMatch.index),
       reconciled: true,
     };
   }
   return {
     tail: replaceMatch(params.tail, match.index),
-    head: removeBlockGroup(params.head),
+    head: params.head,
     reconciled: true,
   };
 }
@@ -1162,13 +1136,7 @@ function applyAcceptedTimelinePage(input: {
     })),
     {
       source: "canonical",
-      reservedItemIds: new Set(
-        currentTail.flatMap((item) =>
-          item.kind === "assistant_message" && item.blockGroupId
-            ? [item.id, item.blockGroupId]
-            : [item.id],
-        ),
-      ),
+      reservedItemIds: new Set(currentTail.map((item) => item.id)),
     },
   );
   return {
diff --git a/packages/app/src/timeline/sync-status.tsx b/packages/app/src/timeline/sync-status.tsx
new file mode 100644
index 0000000000..c4d74e400b
--- /dev/null
+++ b/packages/app/src/timeline/sync-status.tsx
@@ -0,0 +1,49 @@
+import type { Theme } from "@/styles/theme";
+import { useMemo } from "react";
+import type { AgentScreenReadySyncState } from "@/hooks/use-agent-screen-state-machine";
+import { useTranslation } from "react-i18next";
+import { withUnistyles } from "react-native-unistyles";
+import { ToastViewport, type ToastState } from "@/components/toast-host";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+
+const spinnerColor = (theme: Theme) => ({ color: theme.colors.foreground });
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const keepUntilSynchronized = () => {};
+
+export function TimelineSyncStatus({
+  sync,
+  toast,
+  onDismiss,
+}: {
+  sync: AgentScreenReadySyncState | null;
+  toast: ToastState | null;
+  onDismiss: () => void;
+}) {
+  const { t } = useTranslation();
+  let state: "reconnecting" | "updating" | null = null;
+  if (sync?.status === "reconnecting") state = "reconnecting";
+  else if (sync?.status === "catching_up" && sync.ui === "status") state = "updating";
+  const label = state ? t(`agentPanel.states.${state}`) : null;
+  const syncToast = useMemo<ToastState | null>(
+    () =>
+      state && label
+        ? {
+            id: state === "reconnecting" ? 1 : 2,
+            content: label,
+            nativeMessage: label,
+            icon: <ThemedLoadingSpinner size={18} uniProps={spinnerColor} />,
+            variant: "default",
+            durationMs: null,
+            testID: `agent-${state}-toast`,
+          }
+        : null,
+    [state, label],
+  );
+  return (
+    <ToastViewport
+      toast={toast ?? syncToast}
+      onDismiss={toast ? onDismiss : keepUntilSynchronized}
+      placement="panel"
+    />
+  );
+}
diff --git a/packages/app/src/timeline/viewed-timeline-sync.test.ts b/packages/app/src/timeline/viewed-timeline-sync.test.ts
index 8c7c156e6f..9bf6897bd9 100644
--- a/packages/app/src/timeline/viewed-timeline-sync.test.ts
+++ b/packages/app/src/timeline/viewed-timeline-sync.test.ts
@@ -1,9 +1,13 @@
 import { expect, test, vi } from "vitest";
+import { DaemonClient, type DaemonTransport } from "@getpaseo/client/internal/daemon-client";
+import type { SessionInboundMessage, SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import type { ProjectedTimelineForwardFetchPlan } from "./timeline-sync-plan";
 import {
   consumeForcedTimelineTailReplacement,
   createViewedTimelineSync,
   type TimelineResponsePayload,
+  type ViewedTimelineStatus,
+  type ViewedTimelineSyncPorts,
 } from "./viewed-timeline-sync";
 
 interface Deferred<T> {
@@ -28,6 +32,11 @@ interface MembershipRequest {
   fail(message: string): void;
 }
 
+interface TimelineCurrentReport {
+  agentId: string;
+  status: ViewedTimelineStatus;
+}
+
 interface TimelineFetch {
   agentId: string;
   request: ProjectedTimelineForwardFetchPlan;
@@ -35,21 +44,111 @@ interface TimelineFetch {
   fail(message: string): void;
 }
 
+test("split panes catch up together before hidden open chats start fetching", async () => {
+  const world = new TimelineWorld();
+  world.openedEarlier(["a-hidden"]);
+  world.sync.replaceVisibleAgentIds("panes", ["y-visible", "z-visible"]);
+  world.sync.setConnected(true);
+  (await world.nextMembership()).succeed();
+  const left = await world.nextFetch("y-visible");
+  const right = await world.nextFetch("z-visible");
+  world.expectNoPendingFetch();
+  left.respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("y-visible")).toBe("ready"));
+  world.expectNoPendingFetch();
+  right.respond({ hasNewer: false });
+  (await world.nextFetch("a-hidden")).respond({ hasNewer: false });
+  world.sync.dispose();
+});
+
+test("backgrounding releases hidden catch-ups waiting on a visible chat", async () => {
+  const world = new TimelineWorld();
+  world.openedEarlier(["a-hidden"]);
+  world.sync.replaceVisibleAgentIds("pane", ["z-visible"]);
+  world.sync.setConnected(true);
+  (await world.nextMembership()).succeed();
+  const visible = await world.nextFetch("z-visible");
+  world.expectNoPendingFetch();
+  world.sync.setActive(false);
+  (await world.nextFetch("a-hidden")).respond({ hasNewer: false });
+  visible.respond({ hasNewer: false });
+  world.sync.dispose();
+});
+
+test("visible catch-up settles before hidden open chats start fetching", async () => {
+  const world = new TimelineWorld();
+  world.openedEarlier(["a-hidden"]);
+  world.sync.replaceVisibleAgentIds("pane", ["z-visible"]);
+  world.sync.setConnected(true);
+  (await world.nextMembership()).succeed();
+  const visible = await world.nextFetch("z-visible");
+  world.expectNoPendingFetch();
+  visible.respond({ hasNewer: false });
+  const hidden = await world.nextFetch("a-hidden");
+  expect(world.sync.getAgentTimelineStatus("z-visible")).toBe("ready");
+  hidden.respond({ hasNewer: false });
+  world.sync.dispose();
+});
+
+test("a failed visible catch-up releases hidden chats without bypassing its retry delay", async () => {
+  const world = new TimelineWorld();
+  world.openedEarlier(["a-hidden"]);
+  world.sync.replaceVisibleAgentIds("pane", ["z-visible"]);
+  world.sync.setConnected(true);
+  (await world.nextMembership()).succeed();
+  const visible = await world.nextFetch("z-visible");
+  world.expectNoPendingFetch();
+  visible.fail("temporarily unavailable");
+  const hidden = await world.nextFetch("a-hidden");
+  hidden.respond({ hasNewer: false });
+  await world.nextError();
+  world.expectNoPendingFetch();
+  (await world.nextRetry())();
+  (await world.nextFetch("z-visible")).respond({ hasNewer: false });
+  world.sync.dispose();
+});
+
+test("switching chats promotes the newly visible catch-up while another visible request is pending", async () => {
+  const world = new TimelineWorld();
+  world.openedEarlier(["a-hidden", "b-hidden"]);
+  world.sync.replaceVisibleAgentIds("pane", ["z-visible"]);
+  world.sync.setConnected(true);
+  (await world.nextMembership()).succeed();
+  const previous = await world.nextFetch("z-visible");
+  world.expectNoPendingFetch();
+  world.sync.replaceVisibleAgentIds("pane", ["b-hidden"]);
+  const current = await world.nextFetch("b-hidden");
+  world.expectNoPendingFetch();
+  current.respond({ hasNewer: false });
+  (await world.nextFetch("a-hidden")).respond({ hasNewer: false });
+  previous.respond({ hasNewer: false });
+  world.sync.dispose();
+});
+
 class TimelineWorld {
+  constructor(private readonly observeMembership?: ViewedTimelineSyncPorts["observe"]) {}
   readonly errors: string[] = [];
+  readonly releasedMemberships: string[][] = [];
   readonly cursors = new Map<string, { epoch: string; endSeq: number }>();
   readonly cacheRequests: string[] = [];
   readonly forcedTimelineTailReplacements = new Set<string>();
+  readonly reportedCurrent: TimelineCurrentReport[] = [];
   cacheGate: Deferred<void> | null = null;
   readonly sync = createViewedTimelineSync({
     replaceDemandedAgentIds: () => undefined,
+    onCatchUpEnded: (agentId) => {
+      this.reportedCurrent.push({
+        agentId,
+        status: this.sync.getAgentTimelineStatus(agentId),
+      });
+    },
     prepare: async (agentId) => {
       this.cacheRequests.push(agentId);
       this.cacheRequestWaiters.shift()?.(agentId);
       await this.cacheGate?.promise;
     },
-    initialDeliveryMode: "selective",
-    setSubscription: async (agentIds) => {
+    observe: (agentIds) => {
+      if (this.observeMembership) return this.observeMembership(agentIds);
       const result = deferred<void>();
       this.memberships.push({
         agentIds,
@@ -57,7 +156,12 @@ class TimelineWorld {
         fail: (message) => result.reject(new Error(message)),
       });
       this.releaseMembershipWaiter();
-      return result.promise;
+      return {
+        ready: result.promise,
+        release: async () => {
+          this.releasedMemberships.push(agentIds);
+        },
+      };
     },
     readCursor: (agentId) => this.cursors.get(agentId),
     fetchPage: async (agentId, request) => {
@@ -111,6 +215,16 @@ class TimelineWorld {
     },
   });
 
+  show(sourceId: string, agentIds: string[]): void {
+    this.sync.replaceVisibleAgentIds(sourceId, agentIds);
+  }
+
+  /** Chats the user opened earlier in this session and has since navigated away from. */
+  openedEarlier(agentIds: string[]): void {
+    this.sync.replaceVisibleAgentIds("earlier", agentIds);
+    this.sync.replaceVisibleAgentIds("earlier", []);
+  }
+
   private readonly memberships: MembershipRequest[] = [];
   private readonly membershipWaiters: Array<(request: MembershipRequest) => void> = [];
   private readonly fetches: TimelineFetch[] = [];
@@ -335,6 +449,60 @@ test("a gap absorbed by a running tail is recovered after the tail completes", a
   await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
 });
 
+test("reports a chat current only once its parked follow-up page completes", async () => {
+  const world = new TimelineWorld();
+  world.sync.setConnected(true);
+  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  (await world.nextMembership()).succeed();
+  const tail = await world.nextFetch("agent-a");
+
+  world.sync.recoverGap("agent-a", { epoch: "epoch-agent-a", endSeq: 9 });
+  tail.respond({ hasNewer: false });
+
+  const recovery = await world.nextFetch("agent-a");
+  expect(world.reportedCurrent).toEqual([]);
+  expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("pending");
+
+  recovery.respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
+  expect(world.reportedCurrent).toEqual([{ agentId: "agent-a", status: "ready" }]);
+  world.sync.dispose();
+});
+
+test("reports a chat current once the latest-tail fallback replaces an overflowing catch-up", async () => {
+  const world = new TimelineWorld();
+  world.cursors.set("agent-a", { epoch: "epoch-agent-a", endSeq: 42 });
+  world.sync.setConnected(true);
+  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  (await world.nextMembership()).succeed();
+
+  const probe = await world.nextFetch("agent-a");
+  probe.respond({ hasNewer: true, seq: 82 });
+
+  const fallback = await world.nextFetch("agent-a");
+  expect(world.reportedCurrent).toEqual([]);
+
+  fallback.respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
+  expect(world.reportedCurrent).toEqual([{ agentId: "agent-a", status: "ready" }]);
+  world.sync.dispose();
+});
+
+test("stops owing a chat a catch-up when its tab closes mid-fetch", async () => {
+  const world = new TimelineWorld();
+  world.sync.setConnected(true);
+  world.sync.replaceVisibleAgentIds("pane", ["agent-a"]);
+  (await world.nextMembership()).succeed();
+  await world.nextFetch("agent-a");
+  expect(world.reportedCurrent).toEqual([]);
+
+  world.sync.replaceVisibleAgentIds("pane", []);
+  world.sync.replaceOpenTabAgentIds([]);
+
+  expect(world.reportedCurrent).toEqual([{ agentId: "agent-a", status: "pending" }]);
+  world.sync.dispose();
+});
+
 test("unchanged visible-set publication does not cancel paged catch-up", async () => {
   const world = new TimelineWorld();
   world.sync.setConnected(true);
@@ -370,43 +538,169 @@ test("all acknowledged agents begin catch-up independently", async () => {
   const membership = await world.nextMembership();
   membership.succeed();
 
-  const [agentA, agentB] = await Promise.all([
-    world.nextFetch("agent-a"),
-    world.nextFetch("agent-b"),
-  ]);
-  agentA.respond({ hasNewer: false });
+  const agentB = await world.nextFetch("agent-b");
   agentB.respond({ hasNewer: false });
+  const agentA = await world.nextFetch("agent-a");
+  agentA.respond({ hasNewer: false });
 
   expect(membership.agentIds).toEqual(["agent-a", "agent-b"]);
 });
 
-test("an eviction during acknowledgement never catches up the stale hot set", async () => {
-  const world = new TimelineWorld();
-  world.sync.setConnected(true);
-  world.sync.replaceVisibleAgentIds("workspace", [
-    "agent-a",
-    "agent-b",
-    "agent-c",
-    "agent-d",
-    "agent-e",
-  ]);
-  const staleMembership = await world.nextMembership();
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-f"]);
-  staleMembership.succeed();
-  const currentMembership = await world.nextMembership();
-  currentMembership.succeed();
-  const currentCatchUps = await Promise.all(
-    ["agent-a", "agent-b", "agent-c", "agent-d", "agent-f"].map((agentId) =>
-      world.nextFetch(agentId),
-    ),
-  );
-  for (const catchUp of currentCatchUps) catchUp.respond({ hasNewer: false });
-
-  expect({ stale: staleMembership.agentIds, current: currentMembership.agentIds }).toEqual({
-    stale: ["agent-a", "agent-b", "agent-c", "agent-d", "agent-e"],
-    current: ["agent-a", "agent-b", "agent-c", "agent-d", "agent-f"],
+test("an eviction starts and acknowledges B before A returns its late subscription ID", async () => {
+  const requests: SessionInboundMessage[] = [];
+  let receive!: (data: unknown, isBinary: boolean) => void;
+  let open!: () => void;
+  const reply = (message: SessionOutboundMessage) =>
+    receive(JSON.stringify({ type: "session", message }), false);
+  const transport: DaemonTransport = {
+    send(data) {
+      if (typeof data !== "string") throw new Error("No binary request expected");
+      const frame = JSON.parse(data);
+      if (frame.type === "ping") receive(JSON.stringify({ type: "pong" }), false);
+      if (frame.type !== "session") return;
+      requests.push(frame.message);
+      if (frame.message.type === "subscription.release.request")
+        reply({
+          type: "subscription.release.response",
+          payload: {
+            requestId: frame.message.requestId,
+            subscriptionId: frame.message.subscriptionId,
+          },
+        });
+    },
+    close() {},
+    onMessage(handler) {
+      receive = handler;
+      return () => {};
+    },
+    onOpen(handler) {
+      open = handler;
+      return () => {};
+    },
+    onClose() {
+      return () => {};
+    },
+    onError() {
+      return () => {};
+    },
+  };
+  const client = new DaemonClient({
+    url: "ws://timeline-fixture",
+    clientId: "timeline-replacement",
+    transportFactory: () => transport,
+    reconnect: { enabled: false },
   });
+  const world = new TimelineWorld((agentIds) => client.observeTimeline(agentIds));
+  const membershipRequests = () =>
+    requests.filter((request) => request.type === "agent.timeline.set_subscription.request");
+  try {
+    const connected = client.connect();
+    open();
+    reply({
+      type: "status",
+      payload: {
+        status: "server_info",
+        serverId: "timeline-fixture",
+        hostname: null,
+        version: null,
+        features: { ownedSubscriptions: true },
+      },
+    });
+    await connected;
+    world.sync.replaceVisibleAgentIds("workspace", [
+      "agent-a",
+      "agent-b",
+      "agent-c",
+      "agent-d",
+      "agent-e",
+    ]);
+    world.sync.setConnected(true);
+    await vi.waitFor(() => expect(membershipRequests()).toHaveLength(1));
+    const a = membershipRequests()[0]!;
+    // Closing the five tabs releases them; opening a sixth chat is what commits the swap.
+    world.sync.replaceOpenTabAgentIds(["agent-f"]);
+    world.sync.replaceVisibleAgentIds("workspace", ["agent-f"]);
+    await vi.waitFor(() => expect(membershipRequests()).toHaveLength(2));
+    const b = membershipRequests()[1]!;
+    reply({
+      type: "agent.timeline.set_subscription.response",
+      payload: { requestId: b.requestId, agentIds: b.agentIds, subscriptionId: "server-b" },
+    });
+    const catchUps = await Promise.all(b.agentIds.map((agentId) => world.nextFetch(agentId)));
+    for (const catchUp of catchUps) catchUp.respond({ hasNewer: false });
+    await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-f")).toBe("ready"));
+    reply({
+      type: "agent.timeline.set_subscription.response",
+      payload: { requestId: a.requestId, agentIds: a.agentIds, subscriptionId: "server-a-late" },
+    });
+    await vi.waitFor(() =>
+      expect(requests.filter((request) => request.type === "subscription.release.request")).toEqual(
+        [expect.objectContaining({ subscriptionId: "server-a-late" })],
+      ),
+    );
+    expect(a.agentIds).toEqual(["agent-a", "agent-b", "agent-c", "agent-d", "agent-e"]);
+    expect(b.agentIds).toEqual(["agent-f"]);
+    world.expectNoPendingFetch();
+    expect(world.errors).toEqual([]);
+    world.sync.dispose();
+    await vi.waitFor(() =>
+      expect(
+        requests
+          .filter((request) => request.type === "subscription.release.request")
+          .map((request) => request.subscriptionId),
+      ).toEqual(["server-a-late", "server-b"]),
+    );
+  } finally {
+    world.sync.dispose();
+    await client.close();
+  }
+});
+
+test("a restored workspace layout subscribes nothing until the user opens a chat", async () => {
+  const world = new TimelineWorld();
+  // Launch. Workspace layout rehydrates from disk carrying a tab for every chat the user
+  // has ever opened on this host; none of them is open in this session yet.
+  world.sync.replaceOpenTabAgentIds(["agent-a", "agent-b", "agent-c", "agent-d", "agent-e"]);
+  world.sync.setConnected(true);
+  world.expectNoPendingMembership();
   world.expectNoPendingFetch();
+
+  // The workspace the app restores into shows one chat. Only that chat is fetched, so only
+  // that agent is resumed on the daemon.
+  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  const membership = await world.nextMembership();
+  expect(membership.agentIds).toEqual(["agent-a"]);
+  membership.succeed();
+  (await world.nextFetch("agent-a")).respond({ hasNewer: false });
+  world.expectNoPendingFetch();
+  world.sync.dispose();
+});
+
+test("open chats remain subscribed beyond five views and without mounted workspace panes", async () => {
+  const world = new TimelineWorld();
+  const agents = ["agent-a", "agent-b", "agent-c", "agent-d", "agent-e", "agent-f"];
+  world.openedEarlier(agents);
+  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.sync.setConnected(true);
+  const membership = await world.nextMembership();
+  expect(membership.agentIds).toEqual(agents);
+  membership.succeed();
+  for (const agentId of agents) {
+    (await world.nextFetch(agentId)).respond({ hasNewer: false });
+  }
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
+
+  world.sync.replaceVisibleAgentIds("workspace", []);
+  world.expectNoPendingMembership();
+  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.expectNoPendingFetch();
+  expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready");
+
+  world.sync.replaceOpenTabAgentIds(agents.slice(0, 5));
+  const closed = await world.nextMembership();
+  expect(closed.agentIds).toEqual(agents.slice(0, 5));
+  closed.succeed();
+  world.sync.dispose();
 });
 
 test("disconnect cancels paging and reconnect restores membership before fresh catch-up", async () => {
@@ -432,25 +726,26 @@ test("disconnect cancels paging and reconnect restores membership before fresh c
   world.expectNoPendingFetch();
 });
 
-test("navigation while disconnected reconnects only the currently visible agent", async () => {
+test("navigation while disconnected keeps both opened chats for reconnect", async () => {
   const world = new TimelineWorld();
   world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
   world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
 
   world.sync.setConnected(true);
   const membership = await world.nextMembership();
+  expect(membership.agentIds).toEqual(["agent-a", "agent-b"]);
   membership.succeed();
-  const catchUp = await world.nextFetch("agent-b");
-  catchUp.respond({ hasNewer: false });
-
-  expect(membership.agentIds).toEqual(["agent-b"]);
+  // A dropped socket is not the user closing a chat, so reconnect owes both of them a
+  // catch-up. The visible one goes first.
+  (await world.nextFetch("agent-b")).respond({ hasNewer: false });
+  (await world.nextFetch("agent-a")).respond({ hasNewer: false });
   world.expectNoPendingFetch();
 });
 
-test("overlapping sources deduplicate membership and retain hidden hot agents", async () => {
+test("overlapping sources deduplicate membership and retain open hidden chats", async () => {
   const world = new TimelineWorld();
-  world.sync.replaceVisibleAgentIds("left-route", ["agent-a"]);
-  world.sync.replaceVisibleAgentIds("right-route", ["agent-a", "agent-b"]);
+  world.show("left-route", ["agent-a"]);
+  world.show("right-route", ["agent-a", "agent-b"]);
   world.sync.setConnected(true);
   const combined = await world.nextMembership();
   combined.succeed();
@@ -461,9 +756,9 @@ test("overlapping sources deduplicate membership and retain hidden hot agents",
   agentA.respond({ hasNewer: false });
   agentB.respond({ hasNewer: false });
 
-  world.sync.replaceVisibleAgentIds("left-route", []);
+  world.show("left-route", []);
   world.expectNoPendingMembership();
-  world.sync.replaceVisibleAgentIds("right-route", ["agent-b"]);
+  world.show("right-route", ["agent-b"]);
 
   expect(combined.agentIds).toEqual(["agent-a", "agent-b"]);
   world.expectNoPendingMembership();
@@ -699,16 +994,37 @@ test("redeclaring unchanged visibility does not bypass membership backoff", asyn
   expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("error");
 });
 
-test("backgrounding preserves the hot membership without catch-up on return", async () => {
+test("foreground recovery skips to the latest tail after one missed page", async () => {
   const world = new TimelineWorld();
   world.sync.setConnected(true);
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.show("workspace", ["agent-a"]);
+  (await world.nextMembership()).succeed();
+  (await world.nextFetch("agent-a")).respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
+  world.cursors.set("agent-a", { epoch: "epoch-agent-a", endSeq: 42 });
+
+  world.sync.setActive(false);
+  world.sync.setActive(true);
+  const probe = await world.nextFetch("agent-a");
+  expect(probe.request.direction).toBe("after");
+  probe.respond({ hasNewer: true, seq: 82 });
+  const latest = await world.nextFetch("agent-a");
+  expect(latest.request.direction).toBe("tail");
+  expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("pending");
+  latest.respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
+});
+
+test("backgrounding preserves subscriptions and returning verifies the visible chat", async () => {
+  const world = new TimelineWorld();
+  world.sync.setConnected(true);
+  world.show("workspace", ["agent-a"]);
   const agentAMembership = await world.nextMembership();
   agentAMembership.succeed();
   const agentACatchUp = await world.nextFetch("agent-a");
   agentACatchUp.respond({ hasNewer: false });
 
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
+  world.show("workspace", ["agent-b"]);
   const agentBMembership = await world.nextMembership();
   agentBMembership.succeed();
   const agentBCatchUp = await world.nextFetch("agent-b");
@@ -721,27 +1037,29 @@ test("backgrounding preserves the hot membership without catch-up on return", as
   world.sync.setActive(true);
 
   world.expectNoPendingMembership();
+  expect(world.sync.getAgentTimelineStatus("agent-b")).toBe("pending");
+  const resume = await world.nextFetch("agent-b");
+  resume.respond({ hasNewer: false });
+  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-b")).toBe("ready"));
   world.expectNoPendingFetch();
 });
 
 test("stale membership retry cannot overwrite a newer effective set", async () => {
   const world = new TimelineWorld();
   world.sync.setConnected(true);
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.show("workspace", ["agent-a"]);
   const failed = await world.nextMembership();
   failed.fail("subscription unavailable");
   const staleRetry = await world.nextRetry();
 
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
+  world.show("workspace", ["agent-b"]);
   const current = await world.nextMembership();
   staleRetry();
   current.succeed();
-  const [agentA, agentB] = await Promise.all([
-    world.nextFetch("agent-a"),
-    world.nextFetch("agent-b"),
-  ]);
-  agentA.respond({ hasNewer: false });
+  const agentB = await world.nextFetch("agent-b");
   agentB.respond({ hasNewer: false });
+  const agentA = await world.nextFetch("agent-a");
+  agentA.respond({ hasNewer: false });
 
   expect(current.agentIds).toEqual(["agent-a", "agent-b"]);
   world.expectNoPendingMembership();
@@ -767,16 +1085,16 @@ test("membership retry cannot run while disconnected", async () => {
   expect(restored.agentIds).toEqual(["agent-a"]);
 });
 
-test("returning to a hot hidden agent stays live after inactivity", async () => {
+test("returning to an open hidden agent stays live after inactivity", async () => {
   const world = new TimelineWorld();
   world.sync.setConnected(true);
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.show("workspace", ["agent-a"]);
   const initialMembership = await world.nextMembership();
   initialMembership.succeed();
   const agentACatchUp = await world.nextFetch("agent-a");
   agentACatchUp.respond({ hasNewer: false });
 
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
+  world.show("workspace", ["agent-b"]);
   const expandedMembership = await world.nextMembership();
   expandedMembership.succeed();
   const agentBCatchUp = await world.nextFetch("agent-b");
@@ -784,48 +1102,13 @@ test("returning to a hot hidden agent stays live after inactivity", async () =>
   await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-b")).toBe("ready"));
 
   world.elapse(60_000);
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
+  world.show("workspace", ["agent-a"]);
 
   world.expectNoPendingMembership();
   world.expectNoPendingFetch();
 });
 
-test("the hot set evicts the least-recent hidden agent and promotes revisited agents", async () => {
-  const world = new TimelineWorld();
-  world.sync.setConnected(true);
-  for (const agentId of ["agent-a", "agent-b", "agent-c", "agent-d", "agent-e"]) {
-    world.sync.replaceVisibleAgentIds("workspace", [agentId]);
-    const membership = await world.nextMembership();
-    membership.succeed();
-    const catchUp = await world.nextFetch(agentId);
-    catchUp.respond({ hasNewer: false });
-    await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus(agentId)).toBe("ready"));
-  }
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
-  world.expectNoPendingMembership();
-  world.expectNoPendingFetch();
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-f"]);
-  const eviction = await world.nextMembership();
-  eviction.succeed();
-  const agentFCatchUp = await world.nextFetch("agent-f");
-  agentFCatchUp.respond({ hasNewer: false });
-  expect(eviction.agentIds).toEqual(["agent-b", "agent-c", "agent-d", "agent-e", "agent-f"]);
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
-  world.expectNoPendingMembership();
-  world.expectNoPendingFetch();
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
-  const restoreEvicted = await world.nextMembership();
-  restoreEvicted.succeed();
-  const agentACatchUp = await world.nextFetch("agent-a");
-  agentACatchUp.respond({ hasNewer: false });
-  expect(restoreEvicted.agentIds).toEqual(["agent-a", "agent-b", "agent-d", "agent-e", "agent-f"]);
-});
-
-test("visible agents are never evicted when they exceed the hot-set limit", async () => {
+test("visible agents stay subscribed even before open-tab membership arrives", async () => {
   const world = new TimelineWorld();
   const visible = ["agent-a", "agent-b", "agent-c", "agent-d", "agent-e", "agent-f"];
   world.sync.setConnected(true);
@@ -837,26 +1120,31 @@ test("visible agents are never evicted when they exceed the hot-set limit", asyn
 
   expect(membership.agentIds).toEqual(visible);
 
+  // Hiding a pane is not closing its chat, so the sixth stays subscribed.
   world.sync.replaceVisibleAgentIds("workspace", visible.slice(0, 5));
-  const hiddenEviction = await world.nextMembership();
-  hiddenEviction.succeed();
-  expect(hiddenEviction.agentIds).toEqual(visible.slice(0, 5));
+  world.expectNoPendingMembership();
+
+  // Closing its tab is what releases it.
+  world.sync.replaceOpenTabAgentIds(visible.slice(0, 5));
+  const closed = await world.nextMembership();
+  closed.succeed();
+  expect(closed.agentIds).toEqual(visible.slice(0, 5));
 });
 
-test("disconnect clears hidden hot agents before reconnecting the visible set", async () => {
+test("reconnect restores open demand and reopening a closed chat fetches again", async () => {
   const world = new TimelineWorld();
   world.sync.setConnected(true);
   world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
   const agentAMembership = await world.nextMembership();
   agentAMembership.succeed();
-  const agentACatchUp = await world.nextFetch("agent-a");
-  agentACatchUp.respond({ hasNewer: false });
+  (await world.nextFetch("agent-a")).respond({ hasNewer: false });
 
+  // Close agent-a's tab, then open agent-b.
+  world.sync.replaceOpenTabAgentIds(["agent-b"]);
   world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
   const agentBMembership = await world.nextMembership();
   agentBMembership.succeed();
-  const agentBCatchUp = await world.nextFetch("agent-b");
-  agentBCatchUp.respond({ hasNewer: false });
+  (await world.nextFetch("agent-b")).respond({ hasNewer: false });
   await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-b")).toBe("ready"));
 
   world.sync.setConnected(false);
@@ -864,88 +1152,24 @@ test("disconnect clears hidden hot agents before reconnecting the visible set",
   world.sync.setConnected(true);
   const restored = await world.nextMembership();
   restored.succeed();
-  const restoredCatchUp = await world.nextFetch("agent-b");
-  restoredCatchUp.respond({ hasNewer: false });
-
+  (await world.nextFetch("agent-b")).respond({ hasNewer: false });
   expect(restored.agentIds).toEqual(["agent-b"]);
 
   world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
   const reopened = await world.nextMembership();
   reopened.succeed();
-  const reopenedCatchUp = await world.nextFetch("agent-a");
-  reopenedCatchUp.respond({ hasNewer: false });
+  (await world.nextFetch("agent-a")).respond({ hasNewer: false });
   expect(reopened.agentIds).toEqual(["agent-a", "agent-b"]);
 });
 
-test("legacy delivery skips subscription RPCs while retaining visibility catch-up and gap recovery", async () => {
+test("disposing a view releases its pending observation before bootstrap completes", async () => {
   const world = new TimelineWorld();
-  world.sync.setDeliveryMode("legacy");
   world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
   world.sync.setConnected(true);
-
-  world.expectNoPendingMembership();
-  const initial = await world.nextFetch("agent-a");
-  initial.respond({ hasNewer: false });
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
-
-  world.sync.recoverGap("agent-a", { epoch: "epoch-agent-a", endSeq: 10 });
-  const recovery = await world.nextFetch("agent-a");
-  recovery.respond({ hasNewer: false });
-
-  expect(recovery.request).toEqual({
-    direction: "after",
-    cursor: { epoch: "epoch-agent-a", seq: 10 },
-    limit: 40,
-    projection: "projected",
-  });
-});
-
-test("legacy delivery catches up after returning to a view or foreground", async () => {
-  const world = new TimelineWorld();
-  world.sync.setDeliveryMode("legacy");
-  world.sync.setConnected(true);
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
-  const firstAgentA = await world.nextFetch("agent-a");
-  firstAgentA.respond({ hasNewer: false });
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-b"]);
-  const agentB = await world.nextFetch("agent-b");
-  agentB.respond({ hasNewer: false });
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-b")).toBe("ready"));
-
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
-  const secondAgentA = await world.nextFetch("agent-a");
-  secondAgentA.respond({ hasNewer: false });
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
-
-  world.sync.setActive(false);
-  world.sync.setActive(true);
-  const foregroundAgentA = await world.nextFetch("agent-a");
-  foregroundAgentA.respond({ hasNewer: false });
-
-  world.expectNoPendingMembership();
-});
-
-test("switching from legacy to selective delivery publishes membership and catches up once", async () => {
-  const world = new TimelineWorld();
-  world.sync.setDeliveryMode("legacy");
-  world.sync.replaceVisibleAgentIds("workspace", ["agent-a"]);
-  world.sync.setConnected(true);
-  const legacyCatchUp = await world.nextFetch("agent-a");
-  legacyCatchUp.respond({ hasNewer: false });
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
-
-  world.sync.setDeliveryMode("selective");
-  expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("pending");
-  const membership = await world.nextMembership();
-  membership.succeed();
-  const catchUp = await world.nextFetch("agent-a");
-  catchUp.respond({ hasNewer: false });
-
-  await vi.waitFor(() => expect(world.sync.getAgentTimelineStatus("agent-a")).toBe("ready"));
-
-  expect(membership.agentIds).toEqual(["agent-a"]);
-  world.expectNoPendingMembership();
+  const request = await world.nextMembership();
+  world.sync.dispose();
+  expect(world.releasedMemberships).toEqual([["agent-a"]]);
+  request.succeed();
+  await Promise.resolve();
   world.expectNoPendingFetch();
 });
diff --git a/packages/app/src/timeline/viewed-timeline-sync.ts b/packages/app/src/timeline/viewed-timeline-sync.ts
index d6bd3b2a20..5939feabce 100644
--- a/packages/app/src/timeline/viewed-timeline-sync.ts
+++ b/packages/app/src/timeline/viewed-timeline-sync.ts
@@ -42,16 +42,16 @@ async function prepareCachedTimeline(input: {
   const before = useSessionStore.getState().sessions[input.serverId];
   const beforeTimeline = selectAgentTimelineState(before, input.agentId);
   if (beforeTimeline.status === "synced") return undefined;
-  const beforeHead = before?.agentStreamHead.get(input.agentId);
-  await input.prepareAgent(input.agentId);
-  const stored = await input.storage.readTimeline(input.serverId, input.agentId);
+  const [stored] = await Promise.all([
+    input.storage.readTimeline(input.serverId, input.agentId),
+    input.prepareAgent(input.agentId),
+  ]);
   if (!stored) return undefined;
   const session = useSessionStore.getState().sessions[input.serverId];
   const currentTimeline = selectAgentTimelineState(session, input.agentId);
   const currentHead = session?.agentStreamHead.get(input.agentId);
   if (currentTimeline.status === "synced") return undefined;
   if (!stored.range) {
-    if (currentHead !== beforeHead) return undefined;
     if (beforeTimeline.status === "painted") {
       return currentTimeline.status === "painted" && currentTimeline.items === beforeTimeline.items
         ? stored
@@ -63,18 +63,20 @@ async function prepareCachedTimeline(input: {
     currentTimeline.status === "painted"
       ? [...currentTimeline.items, ...(currentHead ?? [])]
       : (currentHead ?? []);
-  const replacement = stored.range
-    ? replaceWithCanonicalStream({
-        canonical: stored.items,
-        previousTail: [],
-        previousHead: liveItems,
-        sendingClientMessageIds: getSendingClientMessageIds(
-          session?.messageSubmissions.get(input.agentId),
-        ),
-        preserveContinuity: true,
-        canonicalCoverage: stored.range,
-      })
-    : { tail: stored.items, head: liveItems, acknowledgedClientMessageIds: [] };
+  const replacement = replaceWithCanonicalStream({
+    canonical: stored.items,
+    previousTail: [],
+    previousHead: liveItems,
+    sendingClientMessageIds: getSendingClientMessageIds(
+      session?.messageSubmissions.get(input.agentId),
+    ),
+    preserveContinuity: true,
+    // Display-only rows claim no coverage over the live head.
+    canonicalCoverage: stored.range ?? {
+      epoch: liveItems.find((item) => item.timelineCursor)?.timelineCursor?.epoch ?? "",
+      endSeq: null,
+    },
+  });
   useSessionStore.getState().applyAgentTimelineResponseState(input.serverId, input.agentId, {
     items: replacement.tail,
     head: replacement.head,
@@ -141,13 +143,13 @@ class TimelineReplicaOwner implements TimelineReplica {
   timelineUpdated(agentId: string): void {
     const session = useSessionStore.getState().sessions[this.serverId];
     const timeline = selectAgentTimelineState(session, agentId);
-    if (timeline.status !== "synced") return;
-    this.cachedRanges.delete(agentId);
+    if (timeline.status === "cold") return;
+    if (timeline.status === "synced") this.cachedRanges.delete(agentId);
     this.storage.commitTimeline(this.serverId, agentId, {
       agentId,
       items: [...timeline.items, ...(session?.agentStreamHead.get(agentId) ?? [])],
-      range: timeline.range,
-      hasOlder: timeline.older === "available",
+      range: timeline.status === "synced" ? timeline.range : null,
+      hasOlder: timeline.status === "synced" && timeline.older === "available",
     });
   }
 }
@@ -245,12 +247,9 @@ function finalizeProcessedTimeline(input: {
     clearAgentInitializingFlag(input.serverId, input.agentId);
   }
   if (input.synchronized) {
-    useCreateFlowStore
-      .getState()
-      .clearByAgent({ serverId: input.serverId, agentId: input.agentId });
     const session = useSessionStore.getState().sessions[input.serverId];
     const agent = session?.agents.get(input.agentId) ?? session?.agentDetails.get(input.agentId);
-    if (agent && agent.status !== "running") input.drainQueuedAgentMessage(input.agentId);
+    if (agent && agent.turn.phase === "idle") input.drainQueuedAgentMessage(input.agentId);
   }
   if (input.result.initResolution === "resolve") resolveInitDeferred(input.initKey);
 }
@@ -306,21 +305,24 @@ function applyAuthoritativeTimelineResponse(input: {
 }
 
 export interface ViewedTimelineSyncPorts {
-  initialDeliveryMode: TimelineDeliveryMode;
   prepare(agentId: string): Promise<void>;
   replaceDemandedAgentIds(agentIds: string[]): void;
-  setSubscription(agentIds: string[]): Promise<void>;
+  observe(agentIds: string[]): { ready: Promise<unknown>; release(): Promise<void> };
   readCursor(agentId: string): { epoch: string; endSeq: number } | undefined;
   fetchPage(
     agentId: string,
     request: ProjectedTimelineForwardFetchPlan,
   ): Promise<TimelinePageResult>;
   fetchLatestTail(agentId: string): Promise<TimelinePageResult>;
+  /**
+   * The sync no longer owes this chat a catch-up: it reached current, or it left the
+   * demanded set. Disconnect and backgrounding keep the obligation and do not report here.
+   */
+  onCatchUpEnded(agentId: string): void;
   reportError(error: unknown): void;
   schedule(task: () => void, delayMs: number): () => void;
 }
 
-export type TimelineDeliveryMode = "legacy" | "selective";
 export type ViewedTimelineStatus = "ready" | "pending" | "error" | "retrying";
 
 export interface ViewedTimelineUiBridge {
@@ -332,16 +334,21 @@ export interface ViewedTimelineUiBridge {
 }
 
 export interface ViewedTimelineSync extends ViewedTimelineUiBridge {
+  /**
+   * The agent tabs that currently exist in workspace layout. This only ever *releases*
+   * subscriptions: closing a tab drops its chat. It never adds one, because layout is
+   * restored from disk at launch and those tabs are chats the user opened days ago.
+   */
+  replaceOpenTabAgentIds(agentIds: string[]): void;
   setActive(active: boolean): void;
   setConnected(connected: boolean): void;
-  setDeliveryMode(mode: TimelineDeliveryMode): void;
   recoverGap(agentId: string, cursor: { epoch: string; endSeq: number }): void;
   dispose(): void;
 }
 
 export type ViewedTimelineOwnerPorts = Omit<
   ViewedTimelineSyncPorts,
-  "prepare" | "replaceDemandedAgentIds"
+  "prepare" | "replaceDemandedAgentIds" | "onCatchUpEnded"
 >;
 
 export interface ViewedTimelineOwner extends ViewedTimelineSync {
@@ -357,11 +364,22 @@ export function createViewedTimelineOwner(input: {
   drainQueuedAgentMessage: (agentId: string) => void;
   ports: ViewedTimelineOwnerPorts;
 }): ViewedTimelineOwner {
+  const forcedTailReplacements = new Set<string>();
   const sync = createViewedTimelineSync({
     ...input.ports,
+    fetchLatestTail: async (agentId) => {
+      forcedTailReplacements.add(agentId);
+      try {
+        return await input.ports.fetchLatestTail(agentId);
+      } finally {
+        forcedTailReplacements.delete(agentId);
+      }
+    },
     prepare: (agentId) => input.replica.prepare(agentId),
     readCursor: (agentId) => input.replica.readCursor(agentId) ?? input.ports.readCursor(agentId),
     replaceDemandedAgentIds: input.replaceDemandedAgentIds,
+    onCatchUpEnded: (agentId) =>
+      useCreateFlowStore.getState().clearByAgent({ serverId: input.serverId, agentId }),
   });
   const streamQueue = createSessionAgentStreamReducerQueue({
     serverId: input.serverId,
@@ -372,7 +390,8 @@ export function createViewedTimelineOwner(input: {
   });
   return {
     ...sync,
-    applyTimelineResponse(payload) {
+    applyTimelineResponse(receivedPayload) {
+      const payload = consumeForcedTimelineTailReplacement(receivedPayload, forcedTailReplacements);
       const accepted = applyAuthoritativeTimelineResponse({
         serverId: input.serverId,
         payload,
@@ -397,7 +416,6 @@ export function createViewedTimelineOwner(input: {
 
 const RETRY_DELAY_MS = 1_000;
 const MAX_RETRY_DELAY_MS = 30_000;
-const VIEWED_TIMELINE_HOT_AGENT_LIMIT = 5;
 
 type CatchUpStatus = "running" | "complete" | "error";
 
@@ -463,7 +481,7 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
   const catchUps = new Map<string, CatchUpState>();
   const catchUpGenerations = new Map<string, number>();
   // Authoritative fetch owed but not runnable yet: disconnected, unacknowledged, or parked.
-  // Acknowledgement and tail completion are the only drain points.
+  // Membership acknowledgement and catch-up completion drain parked requests.
   const pendingCatchUps = new Map<string, ProjectedTimelineForwardFetchPlan>();
   const visibilityCatchUpPending = new Set<string>();
   const visibilityCatchUpErrors = new Map<string, string>();
@@ -475,46 +493,38 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
   const listeners = new Set<() => void>();
   let active = true;
   let connected = false;
-  let deliveryMode = ports.initialDeliveryMode;
+  let observation: {
+    handle: ReturnType<ViewedTimelineSyncPorts["observe"]>;
+    agentIds: string[];
+  } | null = null;
   let disposed = false;
   let desired: string[] = [];
   let acknowledged: string[] = [];
   let membershipGeneration = 0;
-  let reconciling = false;
-  let reconcileRequested = false;
   let membershipNeedsRetry = false;
   let membershipRetryDelayMs: number | undefined;
   let cancelMembershipRetry: (() => void) | null = null;
-  let recentlyViewedAgentIds: string[] = [];
+  // Chats this session has opened. Visibility is the only way in, so an agent is never
+  // subscribed — and never resumed on the daemon — until the user actually opens it.
+  // Membership then survives hiding, workspace switches, backgrounding and reconnect;
+  // only closing the tab or ending the session takes it out.
+  let openedAgentIds: string[] = [];
 
   const visibleAgentIds = () => normalizeAgentIds([...sources.values()].flat());
 
-  const selectHotAgentIds = (visible: string[]) => {
-    const visibleSet = new Set(visible);
-    recentlyViewedAgentIds = [
-      ...visible,
-      ...recentlyViewedAgentIds.filter((agentId) => !visibleSet.has(agentId)),
-    ];
-    const hiddenBudget = Math.max(0, VIEWED_TIMELINE_HOT_AGENT_LIMIT - visible.length);
-    const desiredAgentIds = normalizeAgentIds([
-      ...visible,
-      ...recentlyViewedAgentIds
-        .filter((agentId) => !visibleSet.has(agentId))
-        .slice(0, hiddenBudget),
-    ]);
-    const desiredSet = new Set(desiredAgentIds);
-    recentlyViewedAgentIds = recentlyViewedAgentIds.filter((agentId) => desiredSet.has(agentId));
-    return desiredAgentIds;
+  const rememberOpenedAgentIds = (agentIds: string[]) => {
+    if (agentIds.length === 0) return;
+    const next = normalizeAgentIds([...openedAgentIds, ...agentIds]);
+    if (sameAgentIds(next, openedAgentIds)) return;
+    openedAgentIds = next;
   };
 
   const isAcknowledged = (agentId: string) => acknowledged.includes(agentId);
   const isDesired = (agentId: string) => desired.includes(agentId);
+  const canCatchUp = (agentId: string) =>
+    !disposed && connected && isDesired(agentId) && isAcknowledged(agentId);
   const ownsCatchUp = (agentId: string, generation: number) =>
-    !disposed &&
-    connected &&
-    isDesired(agentId) &&
-    isAcknowledged(agentId) &&
-    catchUps.get(agentId)?.generation === generation;
+    canCatchUp(agentId) && catchUps.get(agentId)?.generation === generation;
 
   const notifyListeners = () => {
     for (const listener of listeners) listener();
@@ -524,6 +534,7 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     const wasPending = visibilityCatchUpPending.delete(agentId);
     const hadError = visibilityCatchUpErrors.delete(agentId);
     const wasRetrying = manualRetries.delete(agentId);
+    ports.onCatchUpEnded(agentId);
     if (wasPending || hadError || wasRetrying) notifyListeners();
   };
 
@@ -562,6 +573,7 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
       if (page.hasNewer && page.endCursor) {
         if (fallbackToLatestTailOnOverflow) {
           await ports.fetchLatestTail(agentId);
+          if (!ownsCatchUp(agentId, generation)) return;
           catchUps.set(agentId, { generation, status: "complete" });
           setVisibilityCatchUpReady(agentId);
           return;
@@ -602,6 +614,8 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
         setVisibilityCatchUpError([agentId], error);
         ports.reportError(error);
       }
+    } finally {
+      startAcknowledgedCatchUps();
     }
   };
 
@@ -619,6 +633,19 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     cacheLoads.set(agentId, load);
   };
 
+  // Existing streams and retries continue; only initial hidden catch-ups wait.
+  const shouldWaitForVisibleCatchUp = (agentId: string) => {
+    if (!active || catchUps.has(agentId)) return false;
+    const visible = visibleAgentIds();
+    return (
+      !visible.includes(agentId) &&
+      visible.some((id) => {
+        const status = catchUps.get(id)?.status;
+        return isDesired(id) && (status === undefined || status === "running");
+      })
+    );
+  };
+
   const startCatchUp = (
     agentId: string,
     options: {
@@ -627,7 +654,11 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     } = {},
   ) => {
     const { request, supersede = false } = options;
-    if (!connected || !isDesired(agentId) || !isAcknowledged(agentId)) {
+    if (!canCatchUp(agentId)) {
+      if (request) pendingCatchUps.set(agentId, request);
+      return;
+    }
+    if (shouldWaitForVisibleCatchUp(agentId)) {
       if (request) pendingCatchUps.set(agentId, request);
       return;
     }
@@ -667,8 +698,17 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
   };
 
   const startAcknowledgedCatchUps = () => {
-    for (const agentId of acknowledged) {
+    const visible = visibleAgentIds();
+    const ordered = [
+      ...visible.filter(isAcknowledged),
+      ...acknowledged.filter((id) => !visible.includes(id)),
+    ];
+    for (const agentId of ordered) {
       const pendingCatchUp = pendingCatchUps.get(agentId);
+      const current = catchUps.get(agentId);
+      // Completion of a different chat must not bypass a failed chat's backoff or
+      // supersede an in-flight tail that owns its parked gap recovery.
+      if (current && !(current.status === "complete" && pendingCatchUp)) continue;
       startCatchUp(agentId, {
         request: pendingCatchUp,
         supersede: Boolean(pendingCatchUp),
@@ -676,78 +716,46 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     }
   };
 
-  const reconcileLatestMembership = async (): Promise<void> => {
-    if (disposed || !connected || deliveryMode !== "selective") return;
+  const reconcileMembership = async (): Promise<void> => {
+    if (disposed || !connected) return;
     const generation = membershipGeneration;
     const requested = desired;
-    if (!membershipNeedsRetry && sameAgentIds(requested, acknowledged)) return;
+    if (!membershipNeedsRetry && sameAgentIds(requested, observation?.agentIds ?? acknowledged))
+      return;
     membershipNeedsRetry = false;
     try {
-      await ports.setSubscription(requested);
+      const previous = observation;
+      const handle = ports.observe(requested);
+      observation = { handle, agentIds: requested };
+      void previous?.handle.release().catch(ports.reportError);
+      await handle.ready;
     } catch (error) {
+      if (disposed || !connected || generation !== membershipGeneration) return;
       membershipNeedsRetry = true;
       setVisibilityCatchUpError(requested, error);
       cancelMembershipRetry?.();
       const nextRetryDelayMs = getNextRetryDelayMs(membershipRetryDelayMs);
       cancelMembershipRetry = ports.schedule(() => {
         cancelMembershipRetry = null;
-        if (
-          disposed ||
-          !connected ||
-          membershipGeneration !== generation ||
-          !sameAgentIds(desired, requested)
-        ) {
-          return;
-        }
+        if (disposed || !connected || membershipGeneration !== generation) return;
         void reconcileMembership();
       }, nextRetryDelayMs);
       membershipRetryDelayMs = nextRetryDelayMs;
       ports.reportError(error);
       return;
     }
+    if (disposed || !connected || generation !== membershipGeneration) return;
     cancelMembershipRetry?.();
     cancelMembershipRetry = null;
     membershipRetryDelayMs = undefined;
-    if (disposed || !connected || deliveryMode !== "selective") return;
     acknowledged = requested;
-    if (generation !== membershipGeneration) {
-      await reconcileLatestMembership();
-      return;
-    }
     startAcknowledgedCatchUps();
-    if (!sameAgentIds(desired, acknowledged)) await reconcileLatestMembership();
-  };
-
-  const reconcileMembership = async () => {
-    if (reconciling) {
-      reconcileRequested = true;
-      return;
-    }
-    if (disposed || !connected) return;
-    reconciling = true;
-    try {
-      await reconcileLatestMembership();
-    } finally {
-      reconciling = false;
-      if (reconcileRequested && !disposed && connected && deliveryMode === "selective") {
-        reconcileRequested = false;
-        void reconcileMembership();
-      } else if (
-        !disposed &&
-        connected &&
-        deliveryMode === "selective" &&
-        !membershipNeedsRetry &&
-        !sameAgentIds(desired, acknowledged)
-      ) {
-        void reconcileMembership();
-      }
-    }
   };
 
   const retryVisibleAgentTimeline = (agentId: string) => {
     if (!isDesired(agentId) || manualRetries.has(agentId)) return;
     const catchUp = catchUps.get(agentId);
-    const membershipRetryable = deliveryMode === "selective" && membershipNeedsRetry && connected;
+    const membershipRetryable = membershipNeedsRetry && connected;
     if (catchUp?.status !== "error" && !membershipRetryable) return;
     manualRetries.add(agentId);
     notifyListeners();
@@ -759,7 +767,6 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     cancelMembershipRetry?.();
     cancelMembershipRetry = null;
     membershipRetryDelayMs = undefined;
-    membershipNeedsRetry = false;
     void reconcileMembership();
   };
 
@@ -783,12 +790,14 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
       return;
     }
 
+    const released: string[] = [];
     for (const agentId of desired) {
       if (!nextDesired.includes(agentId)) {
         cancelCatchUp(agentId);
         visibilityCatchUpPending.delete(agentId);
         visibilityCatchUpErrors.delete(agentId);
         manualRetries.delete(agentId);
+        released.push(agentId);
       }
     }
     for (const agentId of nextDesired) {
@@ -804,25 +813,13 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     desired = nextDesired;
     ports.replaceDemandedAgentIds(desired);
     membershipGeneration += 1;
+    for (const agentId of released) ports.onCatchUpEnded(agentId);
     notifyListeners();
-    if (deliveryMode === "legacy") {
-      acknowledged = connected ? desired : [];
-      if (connected) startAcknowledgedCatchUps();
-      return;
-    }
     void reconcileMembership();
   };
 
   const publishVisibleMembership = () => {
-    const visible = visibleAgentIds();
-    if (!connected || deliveryMode !== "selective") {
-      const activeVisible = active ? visible : [];
-      recentlyViewedAgentIds = activeVisible;
-      commitDesiredMembership(activeVisible);
-      return;
-    }
-    if (!active) return;
-    commitDesiredMembership(selectHotAgentIds(visible));
+    commitDesiredMembership(normalizeAgentIds([...openedAgentIds, ...visibleAgentIds()]));
   };
 
   return {
@@ -839,61 +836,53 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     getAgentTimelineError(agentId) {
       return visibilityCatchUpErrors.get(agentId) ?? null;
     },
+    replaceOpenTabAgentIds(agentIds) {
+      const openTabs = new Set(agentIds);
+      const next = openedAgentIds.filter((agentId) => openTabs.has(agentId));
+      if (sameAgentIds(next, openedAgentIds)) return;
+      openedAgentIds = next;
+      publishVisibleMembership();
+    },
     replaceVisibleAgentIds(sourceId, agentIds) {
       const normalized = normalizeAgentIds(agentIds);
       if (normalized.length === 0) sources.delete(sourceId);
       else sources.set(sourceId, normalized);
+      rememberOpenedAgentIds(normalized);
       publishVisibleMembership();
+      startAcknowledgedCatchUps();
     },
     setActive(nextActive) {
       if (active === nextActive) return;
       active = nextActive;
       publishVisibleMembership();
+      if (!active) {
+        startAcknowledgedCatchUps();
+        return;
+      }
+      for (const agentId of visibleAgentIds()) {
+        visibilityCatchUpPending.add(agentId);
+        visibilityCatchUpErrors.delete(agentId);
+        startCatchUp(agentId, { supersede: true });
+      }
+      notifyListeners();
     },
     setConnected(nextConnected) {
       if (connected === nextConnected) return;
       connected = nextConnected;
       if (!connected) {
-        const visible = active ? visibleAgentIds() : [];
-        recentlyViewedAgentIds = visible;
-        commitDesiredMembership(visible, { resetCatchUpStatus: true });
+        commitDesiredMembership(desired, { resetCatchUpStatus: true });
         cancelMembershipRetry?.();
         cancelMembershipRetry = null;
         membershipRetryDelayMs = undefined;
+        void observation?.handle.release().catch(ports.reportError);
+        observation = null;
         acknowledged = [];
         membershipGeneration += 1;
         for (const agentId of desired) cancelCatchUp(agentId);
         return;
       }
       membershipGeneration += 1;
-      if (deliveryMode === "legacy") {
-        acknowledged = desired;
-        startAcknowledgedCatchUps();
-      } else {
-        void reconcileMembership();
-      }
-    },
-    setDeliveryMode(nextMode) {
-      if (deliveryMode === nextMode) return;
-      deliveryMode = nextMode;
-      cancelMembershipRetry?.();
-      cancelMembershipRetry = null;
-      membershipRetryDelayMs = undefined;
-      membershipNeedsRetry = false;
-      membershipGeneration += 1;
-      for (const agentId of desired) cancelCatchUp(agentId);
-      const visible = active ? visibleAgentIds() : [];
-      recentlyViewedAgentIds = visible;
-      desired = visible;
-      ports.replaceDemandedAgentIds(desired);
-      visibilityCatchUpPending.clear();
-      visibilityCatchUpErrors.clear();
-      manualRetries.clear();
-      for (const agentId of desired) visibilityCatchUpPending.add(agentId);
-      acknowledged = deliveryMode === "legacy" && connected ? desired : [];
-      notifyListeners();
-      if (deliveryMode === "selective" && connected) void reconcileMembership();
-      else if (connected) startAcknowledgedCatchUps();
+      void reconcileMembership();
     },
     recoverGap(agentId, cursor) {
       if (!isDesired(agentId)) return;
@@ -904,6 +893,8 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
     },
     dispose() {
       disposed = true;
+      void observation?.handle.release().catch(ports.reportError);
+      observation = null;
       cancelMembershipRetry?.();
       cancelMembershipRetry = null;
       membershipNeedsRetry = false;
@@ -914,7 +905,7 @@ export function createViewedTimelineSync(ports: ViewedTimelineSyncPorts): Viewed
       desired = [];
       ports.replaceDemandedAgentIds([]);
       acknowledged = [];
-      recentlyViewedAgentIds = [];
+      openedAgentIds = [];
       loadedCache.clear();
       cacheLoads.clear();
       visibilityCatchUpPending.clear();
diff --git a/packages/app/src/tool-calls/detail-level/overview/sheet.tsx b/packages/app/src/tool-calls/detail-level/overview/sheet.tsx
index 77990b3341..b3b5bf39eb 100644
--- a/packages/app/src/tool-calls/detail-level/overview/sheet.tsx
+++ b/packages/app/src/tool-calls/detail-level/overview/sheet.tsx
@@ -1,10 +1,6 @@
 import { useCallback, useEffect, useRef, type ReactNode } from "react";
 import { Pressable, Text, View } from "react-native";
-import {
-  BottomSheetBackdrop,
-  BottomSheetScrollView,
-  type BottomSheetScrollViewMethods,
-} from "@gorhom/bottom-sheet";
+import { BottomSheetScrollView, type BottomSheetScrollViewMethods } from "@gorhom/bottom-sheet";
 import { Wrench, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
@@ -38,12 +34,7 @@ export function OverviewToolCallGroupSheet({
     visible,
     onClose,
   });
-  const renderBackdrop = useCallback(
-    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
-      <BottomSheetBackdrop {...props} disappearsOnIndex={-1} appearsOnIndex={0} opacity={0.5} />
-    ),
-    [],
-  );
+
   const scrollToLatest = useCallback(() => {
     scrollRef.current?.scrollToEnd({ animated: false });
   }, []);
@@ -64,7 +55,7 @@ export function OverviewToolCallGroupSheet({
       enableDynamicSizing={false}
       onChange={handleSheetChange}
       onDismiss={handleSheetDismiss}
-      backdropComponent={renderBackdrop}
+      backdropOpacity={0.5}
       enablePanDownToClose
     >
       <View style={styles.container} testID="tool-call-group-sheet">
diff --git a/packages/app/src/tool-calls/detail-level/projection.test.ts b/packages/app/src/tool-calls/detail-level/projection.test.ts
index c0e32c3124..dabf87b73d 100644
--- a/packages/app/src/tool-calls/detail-level/projection.test.ts
+++ b/packages/app/src/tool-calls/detail-level/projection.test.ts
@@ -63,6 +63,28 @@ function project(input: {
 }
 
 describe("tool call detail-level projection", () => {
+  it.each(["detailed", "overview"] as const)(
+    "keeps pending approval tools out of %s presentation without removing their canonical position",
+    (level) => {
+      const pending = toolCall(
+        "1",
+        { type: "plan", text: "Ship it" },
+        { name: "ExitPlanMode", status: "running" },
+      );
+      const followUp = {
+        kind: "user_message",
+        id: "question",
+        text: "What about tests?",
+        timestamp: new Date(2),
+      } satisfies StreamItem;
+      const tail = [pending, followUp];
+      expect(project({ level, tail }).tail).toEqual([followUp]);
+      expect(tail).toEqual([pending, followUp]);
+      const rejected = toolCall("1", { type: "plan", text: "Ship it" }, { name: "plan_approval" });
+      expect(project({ level, tail: [rejected, followUp] }).tail).toEqual([rejected, followUp]);
+    },
+  );
+
   it("passes detailed timelines through without grouping work", () => {
     const tail = [toolCall("1", { type: "shell", command: "one" })];
     const head = [toolCall("2", { type: "shell", command: "two" })];
diff --git a/packages/app/src/tool-calls/detail-level/projection.ts b/packages/app/src/tool-calls/detail-level/projection.ts
index 1740e8500b..5dc1067914 100644
--- a/packages/app/src/tool-calls/detail-level/projection.ts
+++ b/packages/app/src/tool-calls/detail-level/projection.ts
@@ -20,6 +20,24 @@ export interface ToolCallDetailProjection extends GroupedToolCalls<ToolCallDetai
 
 const EMPTY_TOOL_CALL_GROUPS = new Map<string, ToolCallDetailGroup>();
 
+// Approval UI owns pending plan presentation. Retain the canonical tool in the
+// stream model so resolving it can reveal a card at its original position.
+const visibleItemsCache = new WeakMap<StreamItem[], StreamItem[]>();
+function visibleToolCallItems(items: StreamItem[]): StreamItem[] {
+  const cached = visibleItemsCache.get(items);
+  if (cached) return cached;
+  const visible = items.filter((item) => {
+    if (item.kind !== "tool_call" || item.payload.source !== "agent") return true;
+    const data = item.payload.data;
+    return (
+      data.name !== "ExitPlanMode" && !(data.name === "plan_approval" && data.status === "running")
+    );
+  });
+  const result = visible.length === items.length ? items : visible;
+  visibleItemsCache.set(items, result);
+  return result;
+}
+
 export function prepareToolCallHistory(
   level: ToolCallDetailLevel,
   tail: StreamItem[],
@@ -29,7 +47,10 @@ export function prepareToolCallHistory(
   }
   return {
     mode: "overview",
-    grouped: prepareGroupedHistory({ tail, buildGroup: buildOverviewGroup }),
+    grouped: prepareGroupedHistory({
+      tail: visibleToolCallItems(tail),
+      buildGroup: buildOverviewGroup,
+    }),
   };
 }
 
@@ -42,8 +63,8 @@ export function projectToolCallDetailLevel(input: {
 }): ToolCallDetailProjection {
   if (input.level === "detailed") {
     return {
-      tail: input.tail,
-      head: input.head,
+      tail: visibleToolCallItems(input.tail),
+      head: visibleToolCallItems(input.head),
       groupsByHostId: EMPTY_TOOL_CALL_GROUPS,
       historyGroupUpdatesByHostId: EMPTY_TOOL_CALL_GROUPS,
     };
@@ -53,7 +74,7 @@ export function projectToolCallDetailLevel(input: {
   }
   return groupLiveToolCalls({
     history: input.preparedHistory.grouped,
-    head: input.head,
+    head: visibleToolCallItems(input.head),
     isTurnActive: input.isTurnActive,
     buildGroup: buildOverviewGroup,
   });
diff --git a/packages/app/src/tool-calls/presentation.test.ts b/packages/app/src/tool-calls/presentation.test.ts
index 3caf235ace..fde0ba020f 100644
--- a/packages/app/src/tool-calls/presentation.test.ts
+++ b/packages/app/src/tool-calls/presentation.test.ts
@@ -92,3 +92,42 @@ describe("tool-call presentation", () => {
     expect(presentation.icon).toBe(fakeIcons.brain);
   });
 });
+
+it.each([
+  ["message", "Message from QA messenger"],
+  ["finished", "QA messenger finished"],
+  ["errored", "QA messenger errored"],
+  ["permission-required", "QA messenger needs permission"],
+  ["closed", "QA messenger closed"],
+] as const)("presents %s from structured provenance without a second label", (event, heading) => {
+  const presentation = buildToolCallPresentation({
+    toolName: "internal_name_should_not_be_visible",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", label: "legacy summary", text: "legacy body" },
+    agentMessage: {
+      event,
+      sender: { id: "server::sender", title: "QA messenger" },
+      text: "The delivered message.",
+    },
+    resolveIcon: fakeResolveIcon,
+  });
+  expect(presentation.displayName).toBe(heading);
+  expect(presentation.summary).toBeUndefined();
+  expect(presentation.detail).toEqual({
+    type: "plain_text",
+    icon: "bot",
+    text: "From agent: server::sender\n\nThe delivered message.",
+  });
+});
+
+it("uses an opaque sender ID when no title is available", () => {
+  const presentation = buildToolCallPresentation({
+    toolName: "agent_message",
+    status: "completed",
+    error: null,
+    agentMessage: { event: "message", sender: { id: "remote::worker" }, text: "Hello" },
+    resolveIcon: fakeResolveIcon,
+  });
+  expect(presentation.displayName).toBe("Message from remote::worker");
+});
diff --git a/packages/app/src/tool-calls/presentation.ts b/packages/app/src/tool-calls/presentation.ts
index e43aacf771..f25d752624 100644
--- a/packages/app/src/tool-calls/presentation.ts
+++ b/packages/app/src/tool-calls/presentation.ts
@@ -1,3 +1,6 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
+import { buildAgentMessageDisplay } from "@getpaseo/protocol/agent-message-display";
+import type { PlanOutcome } from "@/components/plan-card";
 import type { ComponentType } from "react";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import type { ToolCallDisplayInput } from "@/utils/tool-call-display";
@@ -12,6 +15,7 @@ type ToolCallStatus = "executing" | "running" | "completed" | "failed" | "cancel
 export type ToolCallPresentationIcon = ComponentType<{ size?: number; color?: string }>;
 
 interface BuildToolCallPresentationInput {
+  agentMessage?: AgentMessage;
   toolName: string;
   status: ToolCallStatus;
   error: unknown;
@@ -22,6 +26,7 @@ interface BuildToolCallPresentationInput {
 }
 
 export interface ToolCallPresentation {
+  detail: ToolCallDetail | undefined;
   displayName: string;
   summary?: string;
   errorText?: string;
@@ -31,6 +36,7 @@ export interface ToolCallPresentation {
   canOpenDetails: boolean;
   openFilePath: string | null;
   isPlan: boolean;
+  planOutcome?: PlanOutcome;
 }
 
 export type ToolCallIconResolver = (
@@ -49,9 +55,13 @@ function displayDetail(detail: ToolCallDetail | undefined): ToolCallDetail {
 export function buildToolCallPresentation(
   input: BuildToolCallPresentationInput,
 ): ToolCallPresentation {
-  const detailForDisplay = displayDetail(input.detail);
+  const detail = input.agentMessage
+    ? buildAgentMessageDisplay(input.agentMessage).detail
+    : input.detail;
+  const detailForDisplay = displayDetail(detail);
   const displayModel = buildToolCallDisplayModel({
     name: input.toolName,
+    agentMessage: input.agentMessage,
     status: displayStatus(input.status),
     error: input.error ?? null,
     detail: detailForDisplay,
@@ -59,21 +69,31 @@ export function buildToolCallPresentation(
     cwd: input.cwd,
   });
   const isLoadingDetails = isPendingToolCallDetail({
-    detail: input.detail,
+    detail,
     status: input.status,
     error: input.error,
   });
-  const hasDetails = Boolean(input.error) || hasMeaningfulToolCallDetail(input.detail);
+  const hasDetails = Boolean(input.error) || hasMeaningfulToolCallDetail(detail);
 
   return {
+    detail,
     displayName: displayModel.displayName,
     summary: displayModel.summary,
     errorText: displayModel.errorText,
-    icon: input.resolveIcon(input.toolName, input.detail),
+    icon: input.resolveIcon(input.toolName, detail),
     isLoadingDetails,
     hasDetails,
     canOpenDetails: hasDetails || isLoadingDetails,
-    openFilePath: extractToolCallFilePath(input.detail),
+    openFilePath: extractToolCallFilePath(detail),
     isPlan: input.detail?.type === "plan",
+    planOutcome: input.detail?.type === "plan" ? resolvePlanOutcome(input) : undefined,
   };
 }
+
+function resolvePlanOutcome(input: BuildToolCallPresentationInput): PlanOutcome | undefined {
+  if (input.status === "canceled") return "canceled";
+  if (input.metadata?.approved === false) return "rejected";
+  if (input.metadata?.approved === true) return "approved";
+  if (input.status === "running" || input.status === "executing") return "pending";
+  return undefined;
+}
diff --git a/packages/app/src/types/agent-directory.ts b/packages/app/src/types/agent-directory.ts
index 19beea5ecb..8ac1870a6f 100644
--- a/packages/app/src/types/agent-directory.ts
+++ b/packages/app/src/types/agent-directory.ts
@@ -6,6 +6,7 @@ export type AgentDirectoryEntry = Pick<
   | "serverId"
   | "title"
   | "status"
+  | "turn"
   | "lastActivityAt"
   | "cwd"
   | "workspaceId"
diff --git a/packages/app/src/types/host-connection.test.ts b/packages/app/src/types/host-connection.test.ts
index b7324807b6..a476c32089 100644
--- a/packages/app/src/types/host-connection.test.ts
+++ b/packages/app/src/types/host-connection.test.ts
@@ -76,6 +76,15 @@ describe("normalizeStoredHostProfile", () => {
     expect(profile?.connections[0]).not.toHaveProperty("password");
   });
 
+  it("moves a stored direct TCP password to the host profile", () => {
+    const profile = normalizeStoredHostProfile({
+      serverId: "srv_legacy",
+      connections: [{ type: "directTcp", endpoint: "localhost:6767", password: "old-secret" }],
+    });
+    expect(profile?.password).toBe("old-secret");
+    expect(profile?.connections[0]).not.toHaveProperty("password");
+  });
+
   it("preserves legacy relay ids when TLS is absent", () => {
     const profile = normalizeStoredHostProfile({
       serverId: "srv_relay",
@@ -228,26 +237,28 @@ describe("upsertHostConnectionInProfiles", () => {
       type: "directTcp",
       endpoint: "example.test:6767",
       useTls: false,
-      password: "old-secret",
     };
     const existing: HostProfile = {
       ...makeHost("srv_known"),
+      password: "old-secret",
       connections: [existingConnection],
       preferredConnectionId: existingConnection.id,
     };
     const replacement: HostConnection = {
       ...existingConnection,
       useTls: true,
-      password: "new-secret",
     };
 
     const [profile] = upsertHostConnectionInProfiles({
       profiles: [existing],
       serverId: "srv_known",
       connection: replacement,
+      password: "new-secret",
     });
 
     expect(profile.connections).toEqual([replacement]);
+    expect("password" in profile.connections[0]!).toBe(false);
+    expect(profile.password).toBe("new-secret");
     expect(profile.preferredConnectionId).toBe(replacement.id);
   });
 });
diff --git a/packages/app/src/types/host-connection.ts b/packages/app/src/types/host-connection.ts
index 4b6cd6d5a9..0962c02c7c 100644
--- a/packages/app/src/types/host-connection.ts
+++ b/packages/app/src/types/host-connection.ts
@@ -1,10 +1,12 @@
+import type { ConnectionOffer } from "@getpaseo/protocol/connection-offer";
 import {
   normalizeHostPort,
   normalizeLoopbackToLocalhost,
+  shouldUseTlsForDefaultHostedRelay,
 } from "@getpaseo/protocol/daemon-endpoints";
 import {
   DirectTcpHostConnectionSchema,
-  type DirectTcpHostConnection,
+  type DirectTcpHostConnection as WireDirectTcpHostConnection,
 } from "@getpaseo/protocol/host-connection-schema";
 import {
   DEFAULT_SSH_DAEMON_PORT,
@@ -18,7 +20,8 @@ import {
 } from "@/hosts/appearance";
 import { z } from "zod";
 
-export { DirectTcpHostConnectionSchema, type DirectTcpHostConnection };
+export { DirectTcpHostConnectionSchema };
+export type DirectTcpHostConnection = Omit<WireDirectTcpHostConnection, "password">;
 
 export interface DirectSocketHostConnection {
   id: string;
@@ -59,6 +62,7 @@ export type HostLifecycle = Record<string, never>;
 
 export interface HostProfile {
   serverId: string;
+  password?: string;
   label: string;
   appearance: HostAppearance;
   lifecycle: HostLifecycle;
@@ -125,11 +129,7 @@ function hostConnectionEquals(left: HostConnection, right: HostConnection): bool
   }
 
   if (left.type === "directTcp" && right.type === "directTcp") {
-    return (
-      left.endpoint === right.endpoint &&
-      (left.useTls ?? false) === (right.useTls ?? false) &&
-      left.password === right.password
-    );
+    return left.endpoint === right.endpoint && (left.useTls ?? false) === (right.useTls ?? false);
   }
   if (left.type === "directSocket" && right.type === "directSocket") {
     return left.path === right.path;
@@ -186,11 +186,40 @@ function upsertHostConnectionById(
   return next;
 }
 
+function hasProfileChanged(input: {
+  matchingCount: number;
+  previous: HostProfile;
+  serverId: string;
+  password?: string;
+  createdAt: string;
+  label: string;
+  preferredConnectionId: string;
+  lifecycle: HostLifecycle;
+  connections: HostConnection[];
+}): boolean {
+  const { previous, connections } = input;
+  return (
+    input.matchingCount > 1 ||
+    previous.serverId !== input.serverId ||
+    (input.password !== undefined && input.password !== previous.password) ||
+    input.createdAt !== previous.createdAt ||
+    input.label !== previous.label ||
+    input.preferredConnectionId !== previous.preferredConnectionId ||
+    !hostLifecycleEquals(previous.lifecycle, input.lifecycle) ||
+    connections.length !== previous.connections.length ||
+    connections.some((candidate, index) => {
+      const old = previous.connections[index];
+      return !old || !hostConnectionEquals(candidate, old);
+    })
+  );
+}
+
 export function upsertHostConnectionInProfiles(input: {
   profiles: HostProfile[];
   serverId: string;
   label?: string;
   connection: HostConnection;
+  password?: string;
   now?: string;
 }): HostProfile[] {
   const serverId = input.serverId.trim();
@@ -199,13 +228,17 @@ export function upsertHostConnectionInProfiles(input: {
   }
 
   const now = input.now ?? new Date().toISOString();
+  const password = input.password;
+  const normalizedConnection = input.connection;
   const labelTrimmed = input.label?.trim() ?? "";
   const derivedLabel = labelTrimmed || serverId;
   const existing = input.profiles;
   const matchingIndexes = existing.reduce<number[]>((matches, daemon, index) => {
     if (
       daemon.serverId === serverId ||
-      daemon.connections.some((connection) => hostConnectionEquals(connection, input.connection))
+      daemon.connections.some((existingConnection) =>
+        hostConnectionEquals(existingConnection, normalizedConnection),
+      )
     ) {
       matches.push(index);
     }
@@ -215,11 +248,12 @@ export function upsertHostConnectionInProfiles(input: {
   if (matchingIndexes.length === 0) {
     const profile: HostProfile = {
       serverId,
+      ...(password ? { password } : {}),
       label: derivedLabel,
       appearance: defaultHostAppearance(),
       lifecycle: defaultLifecycle(),
-      connections: [input.connection],
-      preferredConnectionId: input.connection.id,
+      connections: [normalizedConnection],
+      preferredConnectionId: normalizedConnection.id,
       createdAt: now,
       updatedAt: now,
     };
@@ -230,7 +264,7 @@ export function upsertHostConnectionInProfiles(input: {
   const prev = matchedProfiles.find((daemon) => daemon.serverId === serverId) ?? matchedProfiles[0];
   const nextConnections = upsertHostConnectionById(
     matchedProfiles.flatMap((daemon) => daemon.connections),
-    input.connection,
+    normalizedConnection,
   );
   const nextLifecycle = prev.lifecycle;
   const nextLabel = prev.label === prev.serverId ? derivedLabel : prev.label;
@@ -238,23 +272,22 @@ export function upsertHostConnectionInProfiles(input: {
     prev.preferredConnectionId &&
     nextConnections.some((connection) => connection.id === prev.preferredConnectionId)
       ? prev.preferredConnectionId
-      : input.connection.id;
+      : normalizedConnection.id;
   const nextCreatedAt = matchedProfiles.reduce(
     (earliest, daemon) => (daemon.createdAt < earliest ? daemon.createdAt : earliest),
     prev.createdAt,
   );
-  const changed =
-    matchingIndexes.length > 1 ||
-    prev.serverId !== serverId ||
-    nextCreatedAt !== prev.createdAt ||
-    nextLabel !== prev.label ||
-    nextPreferredConnectionId !== prev.preferredConnectionId ||
-    !hostLifecycleEquals(prev.lifecycle, nextLifecycle) ||
-    nextConnections.length !== prev.connections.length ||
-    nextConnections.some((connection, index) => {
-      const previousConnection = prev.connections[index];
-      return !previousConnection || !hostConnectionEquals(connection, previousConnection);
-    });
+  const changed = hasProfileChanged({
+    matchingCount: matchingIndexes.length,
+    previous: prev,
+    serverId,
+    password,
+    createdAt: nextCreatedAt,
+    label: nextLabel,
+    preferredConnectionId: nextPreferredConnectionId,
+    lifecycle: nextLifecycle,
+    connections: nextConnections,
+  });
 
   if (!changed) {
     return existing;
@@ -262,6 +295,7 @@ export function upsertHostConnectionInProfiles(input: {
 
   const nextProfile: HostProfile = {
     ...prev,
+    ...(password ? { password } : {}),
     serverId,
     label: nextLabel,
     lifecycle: nextLifecycle,
@@ -322,6 +356,19 @@ export function connectionFromListen(listen: string): HostConnection | null {
   }
 }
 
+export function relayConnectionFromOffer(offer: ConnectionOffer): RelayHostConnection {
+  // COMPAT(oldRelayOfferTls): added in v0.1.73, remove after 2026-11-10.
+  const useTls = offer.relay.useTls ?? shouldUseTlsForDefaultHostedRelay(offer.relay.endpoint);
+  const relayEndpoint = normalizeHostPort(offer.relay.endpoint);
+  return {
+    id: useTls ? `relay:wss:${relayEndpoint}` : `relay:${relayEndpoint}`,
+    type: "relay",
+    relayEndpoint,
+    useTls,
+    daemonPublicKeyB64: offer.daemonPublicKeyB64.trim(),
+  };
+}
+
 export function createRemoteSshHostConnection(input: {
   host: string;
   sshPort?: number;
@@ -386,6 +433,7 @@ const StoredHostConnectionSchema = z.discriminatedUnion("type", [
 ]);
 const StoredHostProfileSchema = z.strictObject({
   serverId: z.string().trim().min(1),
+  password: z.string().optional(),
   label: z.string().optional(),
   appearance: HostAppearanceSchema.optional(),
   lifecycle: z.strictObject({}).optional(),
@@ -401,13 +449,13 @@ function normalizeStoredConnection(connection: StoredHostConnection): HostConnec
   if (connection.type === "directTcp") {
     try {
       const endpoint = normalizeLoopbackToLocalhost(normalizeHostPort(connection.endpoint));
-      return DirectTcpHostConnectionSchema.parse({
+      const parsed = DirectTcpHostConnectionSchema.parse({
         id: `direct:${endpoint}`,
         type: "directTcp",
         endpoint,
         useTls: connection.useTls,
-        ...(connection.password !== undefined ? { password: connection.password } : {}),
       });
+      return { id: parsed.id, type: parsed.type, endpoint: parsed.endpoint, useTls: parsed.useTls };
     } catch {
       return null;
     }
@@ -459,6 +507,12 @@ export function normalizeStoredHostProfile(entry: unknown): HostProfile | null {
   }
   const record = result.data;
   const serverId = record.serverId;
+  // COMPAT(connectionPassword): added in v0.9.1, remove after 2027-03-24 once stored direct passwords have migrated.
+  const legacyPassword = record.connections.find(
+    (connection) => connection.type === "directTcp" && connection.password,
+  );
+  const password =
+    record.password ?? (legacyPassword?.type === "directTcp" ? legacyPassword.password : undefined);
 
   const connections = record.connections
     .map((connection) => normalizeStoredConnection(connection))
@@ -478,6 +532,7 @@ export function normalizeStoredHostProfile(entry: unknown): HostProfile | null {
 
   return {
     serverId,
+    ...(password ? { password } : {}),
     label,
     appearance: record.appearance ?? defaultHostAppearance(),
     lifecycle: defaultLifecycle(),
diff --git a/packages/app/src/types/stream.test.ts b/packages/app/src/types/stream.test.ts
index e49713f7c1..62e26698db 100644
--- a/packages/app/src/types/stream.test.ts
+++ b/packages/app/src/types/stream.test.ts
@@ -23,6 +23,51 @@ import { timelineItemIdentity } from "@getpaseo/protocol/timeline-identity";
 
 type CanonicalToolStatus = "running" | "completed" | "failed" | "canceled";
 
+it("updates a resolved Claude plan at its proposal position across a follow-up", () => {
+  const proposal = {
+    type: "timeline",
+    provider: "claude",
+    turnId: "turn-1",
+    item: {
+      type: "tool_call",
+      callId: "plan-1",
+      name: "ExitPlanMode",
+      status: "running",
+      error: null,
+      detail: { type: "plan", text: "Ship it" },
+    },
+  } satisfies AgentStreamEventPayload;
+  const pending = reduceStreamUpdate([], proposal, new Date(1));
+  const steered = reduceStreamUpdate(
+    pending,
+    {
+      type: "timeline",
+      provider: "claude",
+      turnId: "turn-1",
+      item: { type: "user_message", text: "What about tests?", messageId: "question" },
+    },
+    new Date(2),
+  );
+  const resolved = reduceStreamUpdate(
+    steered,
+    {
+      ...proposal,
+      item: {
+        ...proposal.item,
+        name: "plan_approval",
+        status: "completed",
+        metadata: { approved: false },
+      },
+    },
+    new Date(3),
+  );
+  expect(resolved.map((item) => item.kind)).toEqual(["tool_call", "user_message"]);
+  expect(resolved[0]?.id).toBe(pending[0]?.id);
+  expect(resolved[0]).toMatchObject({
+    payload: { data: { name: "plan_approval", metadata: { approved: false } } },
+  });
+});
+
 describe("plugin timeline rows", () => {
   it("uses the protocol identity format for stream tool and plugin rows", () => {
     const tool = {
@@ -312,6 +357,7 @@ function reasoningTimeline(
 function canonicalToolTimeline(params: {
   provider: AgentProvider;
   callId: string;
+  turnId?: string;
   name: string;
   status: CanonicalToolStatus;
   input?: unknown;
@@ -350,6 +396,7 @@ function canonicalToolTimeline(params: {
   return {
     type: "timeline",
     provider: params.provider,
+    ...(params.turnId ? { turnId: params.turnId } : {}),
     item,
   };
 }
@@ -584,6 +631,106 @@ describe("stream reducer tool call idempotency", () => {
 });
 
 describe("stream reducer canonical tool calls", () => {
+  it("keeps repeated call ids in different turns as distinct timeline rows", () => {
+    const callId = "tool-reused-across-turns";
+    const state = hydrateStreamState([
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          turnId: "autonomous-turn-1",
+          name: "Task",
+          status: "running",
+        }),
+        timestamp: new Date("2025-01-01T09:00:00Z"),
+      },
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          turnId: "autonomous-turn-2",
+          name: "Task",
+          status: "completed",
+        }),
+        timestamp: new Date("2025-01-01T09:01:00Z"),
+      },
+    ]);
+
+    const tools = state.filter(isAgentToolCallItem);
+    expect(tools.map((tool) => tool.turnId)).toEqual(["autonomous-turn-1", "autonomous-turn-2"]);
+    expect(new Set(tools.map((tool) => tool.id)).size).toBe(2);
+  });
+
+  it("merges lifecycle updates for the same call occurrence", () => {
+    const callId = "tool-updated-within-turn";
+    const turnId = "autonomous-turn-1";
+    const state = hydrateStreamState([
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          turnId,
+          name: "Task",
+          status: "running",
+        }),
+        timestamp: new Date("2025-01-01T09:00:00Z"),
+      },
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          turnId,
+          name: "Task",
+          status: "completed",
+        }),
+        timestamp: new Date("2025-01-01T09:01:00Z"),
+      },
+    ]);
+
+    expect(state.filter(isAgentToolCallItem)).toEqual([
+      expect.objectContaining({
+        id: `agent_tool_turn:${turnId}/${callId}`,
+        turnId,
+        payload: expect.objectContaining({
+          data: expect.objectContaining({ callId, status: "completed" }),
+        }),
+      }),
+    ]);
+  });
+
+  it("preserves call-id lifecycle merging for events without turn identity", () => {
+    const callId = "legacy-unscoped-tool";
+    const state = hydrateStreamState([
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          name: "Task",
+          status: "running",
+        }),
+        timestamp: new Date("2025-01-01T09:00:00Z"),
+      },
+      {
+        event: canonicalToolTimeline({
+          provider: "claude",
+          callId,
+          name: "Task",
+          status: "completed",
+        }),
+        timestamp: new Date("2025-01-01T09:01:00Z"),
+      },
+    ]);
+
+    expect(state.filter(isAgentToolCallItem)).toEqual([
+      expect.objectContaining({
+        id: `agent_tool_${callId}`,
+        payload: expect.objectContaining({
+          data: expect.objectContaining({ callId, status: "completed" }),
+        }),
+      }),
+    ]);
+  });
+
   it("is deterministic for equivalent hydration sequences", () => {
     const updates = [
       {
@@ -736,7 +883,7 @@ describe("stream reducer canonical tool calls", () => {
     expect(new Set(messages.map((message) => message.id)).size).toBe(2);
   });
 
-  it("keeps every promoted block when an assistant message resumes after a tool", () => {
+  it("keeps whole messages when an assistant resumes after a tool", () => {
     const messageId = "msg-promoted-resume";
     let tail: StreamItem[] = [];
     let head: StreamItem[] = [];
@@ -779,15 +926,13 @@ describe("stream reducer canonical tool calls", () => {
         item.kind === "assistant_message",
     );
     expect(messages.map((message) => message.text)).toEqual([
-      "Before one.",
-      "Before two.",
-      "After one.",
-      "After two.",
+      "Before one.\n\nBefore two.",
+      "After one.\n\nAfter two.",
     ]);
     expect(new Set(messages.map((message) => message.id)).size).toBe(messages.length);
   });
 
-  it("keeps the timeline position on every promoted assistant block", () => {
+  it("keeps the timeline position on the whole assistant message", () => {
     const timelineCursor = { epoch: "epoch-1", seq: 42 };
     const result = applyStreamEvent({
       tail: [],
@@ -802,13 +947,9 @@ describe("stream reducer canonical tool calls", () => {
         item.kind === "assistant_message",
     );
     expect(messages.map((message) => message.text)).toEqual([
-      "First paragraph.",
-      "Second paragraph.",
-    ]);
-    expect(messages.map((message) => message.timelineCursor)).toEqual([
-      timelineCursor,
-      timelineCursor,
+      "First paragraph.\n\nSecond paragraph.",
     ]);
+    expect(messages.map((message) => message.timelineCursor)).toEqual([timelineCursor]);
   });
 
   it("preserves old assistant merge behavior when message ids are absent", () => {
@@ -2071,3 +2212,121 @@ describe("turn lifecycle events", () => {
     );
   });
 });
+
+describe("notification timeline items", () => {
+  it("maps notification items to activity log entries with the matching level", () => {
+    const timestamp = new Date("2026-07-26T10:00:00.000Z");
+    const state = hydrateStreamState(
+      [
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "info", message: "Search finished" },
+          },
+          timestamp,
+        },
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "warning", message: "Command blocked" },
+          },
+          timestamp,
+        },
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "error", message: "Turn failed" },
+          },
+          timestamp,
+        },
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "info", message: "Default info" },
+          },
+          timestamp,
+        },
+      ],
+      { source: "canonical" },
+    );
+
+    expect(
+      state.map((item) =>
+        item.kind === "notification"
+          ? { kind: item.kind, level: item.level, message: item.message }
+          : { kind: item.kind },
+      ),
+    ).toEqual([
+      { kind: "notification", level: "info", message: "Search finished" },
+      { kind: "notification", level: "warning", message: "Command blocked" },
+      { kind: "notification", level: "error", message: "Turn failed" },
+      { kind: "notification", level: "info", message: "Default info" },
+    ]);
+  });
+
+  it("keeps repeated notifications with the same text in the same millisecond", () => {
+    const timestamp = new Date("2026-07-26T10:00:00.000Z");
+    const state = hydrateStreamState(
+      [
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "warning", message: "Command blocked" },
+          },
+          timestamp,
+        },
+        {
+          event: {
+            type: "timeline",
+            provider: "pi",
+            item: { type: "notification", level: "error", message: "Command blocked" },
+          },
+          timestamp,
+        },
+      ],
+      { source: "canonical" },
+    );
+
+    expect(
+      state.map((item) =>
+        item.kind === "notification"
+          ? { kind: item.kind, level: item.level, message: item.message }
+          : { kind: item.kind },
+      ),
+    ).toEqual([
+      { kind: "notification", level: "warning", message: "Command blocked" },
+      { kind: "notification", level: "error", message: "Command blocked" },
+    ]);
+    expect(new Set(state.map((item) => item.id)).size).toBe(state.length);
+  });
+});
+
+it("retains agent-message provenance through live delivery and repeated history", () => {
+  const agentMessage = {
+    event: "finished" as const,
+    sender: { id: "remote::worker", title: "Reviewer" },
+    text: "Done",
+  };
+  const event = {
+    type: "timeline",
+    provider: "codex",
+    item: {
+      type: "tool_call",
+      callId: "delivery",
+      name: "agent_message",
+      status: "completed",
+      error: null,
+      detail: { type: "plain_text", text: "Done" },
+      agentMessage,
+    },
+  } satisfies AgentStreamEventPayload;
+  const live = reduceStreamUpdate([], event, new Date(1));
+  const replay = reduceStreamUpdate(live, event, new Date(2));
+  expect(replay).toHaveLength(1);
+  expect(replay[0]).toMatchObject({ payload: { data: { agentMessage } } });
+});
diff --git a/packages/app/src/types/stream.ts b/packages/app/src/types/stream.ts
index cdde4bdf1c..56cf14558b 100644
--- a/packages/app/src/types/stream.ts
+++ b/packages/app/src/types/stream.ts
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type {
   AgentProvider,
   AgentTimelineItem,
@@ -8,7 +9,6 @@ import { timelineItemIdentity } from "@getpaseo/protocol/timeline-identity";
 import type { AgentAttachment, AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { extractTaskEntriesFromToolCall } from "../utils/tool-call-parsers";
-import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
 
 /**
  * Simple hash function for deterministic ID generation
@@ -84,7 +84,7 @@ export type StreamItem =
   | ThoughtItem
   | ToolCallItem
   | TodoListItem
-  | ActivityLogItem
+  | NotificationItem
   | CompactionItem
   | PluginTimelineStreamItem;
 
@@ -449,7 +449,11 @@ function mergeRetainedLifecycleItem(tail: StreamItem[], retained: StreamItem): S
     return null;
   }
   if (isAgentToolCallItem(retained)) {
-    const tailIndex = findExistingTimelineIdentityIndex(tail, retained.payload.data.callId);
+    const identity = agentToolCallIdentity({
+      callId: retained.payload.data.callId,
+      turnId: retained.turnId,
+    });
+    const tailIndex = findExistingTimelineIdentityIndex(tail, identity);
     const existing = tail[tailIndex];
     if (tailIndex < 0 || !existing || !isAgentToolCallItem(existing)) {
       return null;
@@ -707,6 +711,7 @@ export interface AssistantMessageItem {
   timelineCursor?: TimelinePosition;
   text: string;
   timestamp: Date;
+  /** Display-only fields, assigned after source-item plugin transforms. */
   blockGroupId?: string;
   blockIndex?: number;
 }
@@ -741,6 +746,7 @@ interface OrchestratorToolCallData {
 }
 
 export interface AgentToolCallData {
+  agentMessage?: AgentMessage;
   provider: AgentProvider;
   callId: string;
   name: string;
@@ -771,17 +777,17 @@ export function isAgentToolCallItem(item: StreamItem): item is AgentToolCallItem
   return item.kind === "tool_call" && item.payload.source === "agent";
 }
 
-type ActivityLogType = "system" | "info" | "success" | "error";
+type NotificationLevel = "info" | "warning" | "error";
 
-export interface ActivityLogItem {
-  kind: "activity_log";
+export interface NotificationItem {
+  kind: "notification";
+  sourceType: "error" | "notification";
   id: string;
   timelineCursor?: TimelinePosition;
   turnId?: string;
   timestamp: Date;
-  activityType: ActivityLogType;
+  level: NotificationLevel;
   message: string;
-  metadata?: Record<string, unknown>;
 }
 
 export interface CompactionItem {
@@ -798,6 +804,8 @@ export interface CompactionItem {
 export interface PluginTimelineStreamItem {
   kind: "plugin";
   id: string;
+  /** The id of the stream item a timeline transformer replaced; set only by projection. */
+  sourceId?: string;
   timelineCursor?: TimelinePosition;
   turnId?: string;
   timestamp: Date;
@@ -1022,11 +1030,26 @@ function finalizeActiveThoughts(state: StreamItem[]): StreamItem[] {
 }
 
 export function streamTimelineItemIdentity(item: StreamItem): string | null {
-  if (isAgentToolCallItem(item)) return item.payload.data.callId;
+  if (isAgentToolCallItem(item)) {
+    return agentToolCallIdentity({
+      callId: item.payload.data.callId,
+      turnId: item.turnId,
+    });
+  }
   if (item.kind === "plugin") return `${item.pluginId}/${item.pluginItemId}`;
   return null;
 }
 
+interface AgentToolCallIdentityInput {
+  callId: string;
+  turnId?: string;
+}
+
+function agentToolCallIdentity(input: AgentToolCallIdentityInput): string {
+  if (!input.turnId) return input.callId;
+  return `turn:${encodeURIComponent(input.turnId)}/${encodeURIComponent(input.callId)}`;
+}
+
 function findExistingTimelineIdentityIndex(state: StreamItem[], identity: string): number {
   return state.findIndex((entry) => streamTimelineItemIdentity(entry) === identity);
 }
@@ -1165,13 +1188,18 @@ export function mergeAgentToolCallItem(
   };
 }
 
-function appendAgentToolCall(
-  state: StreamItem[],
-  data: AgentToolCallData,
-  timestamp: Date,
-  timelineCursor?: TimelinePosition,
-): StreamItem[] {
-  const existingIndex = findExistingTimelineIdentityIndex(state, data.callId);
+interface AppendAgentToolCallInput {
+  state: StreamItem[];
+  data: AgentToolCallData;
+  timestamp: Date;
+  turnId?: string;
+  timelineCursor?: TimelinePosition;
+}
+
+function appendAgentToolCall(input: AppendAgentToolCallInput): StreamItem[] {
+  const { state, data, timestamp, turnId, timelineCursor } = input;
+  const identity = agentToolCallIdentity({ callId: data.callId, turnId });
+  const existingIndex = findExistingTimelineIdentityIndex(state, identity);
 
   if (existingIndex >= 0) {
     const existing = state[existingIndex];
@@ -1200,8 +1228,9 @@ function appendAgentToolCall(
 
   const item: ToolCallItem = {
     kind: "tool_call",
-    id: `agent_tool_${data.callId}`,
+    id: `agent_tool_${identity}`,
     ...(timelineCursor ? { timelineCursor } : {}),
+    ...(turnId ? { turnId } : {}),
     timestamp,
     payload: {
       source: "agent",
@@ -1215,6 +1244,16 @@ function appendAgentToolCall(
   return [...state, item];
 }
 
+function appendNotification(state: StreamItem[], entry: NotificationItem): StreamItem[] {
+  const index = state.findIndex((existing) => existing.id === entry.id);
+  if (index >= 0) {
+    const next = [...state];
+    next[index] = entry;
+    return next;
+  }
+  return [...state, entry];
+}
+
 function appendPluginTimelineItem(
   state: StreamItem[],
   item: Extract<AgentTimelineItem, { type: "plugin" }>,
@@ -1243,16 +1282,6 @@ function appendPluginTimelineItem(
   return next;
 }
 
-function appendActivityLog(state: StreamItem[], entry: ActivityLogItem): StreamItem[] {
-  const index = state.findIndex((existing) => existing.id === entry.id);
-  if (index >= 0) {
-    const next = [...state];
-    next[index] = entry;
-    return next;
-  }
-  return [...state, entry];
-}
-
 function appendTodoList(
   state: StreamItem[],
   provider: AgentProvider,
@@ -1374,10 +1403,6 @@ function reduceTimelineToolCall(
     .trim()
     .replace(/[.\s-]+/g, "_")
     .toLowerCase();
-  if (event.provider === "claude" && normalizedToolName === "exitplanmode") {
-    return state;
-  }
-
   if (
     event.provider === "claude" &&
     (normalizedToolName === "todowrite" || normalizedToolName === "todo_write")
@@ -1415,9 +1440,9 @@ function reduceTimelineToolCall(
     );
   }
 
-  return appendAgentToolCall(
+  return appendAgentToolCall({
     state,
-    {
+    data: {
       provider: event.provider,
       callId: item.callId,
       name: item.name,
@@ -1425,10 +1450,12 @@ function reduceTimelineToolCall(
       error: item.error,
       detail: item.detail,
       metadata: item.metadata,
+      ...(item.agentMessage ? { agentMessage: item.agentMessage } : {}),
     },
     timestamp,
     timelineCursor,
-  );
+    turnId: event.turnId,
+  });
 }
 
 function reduceTimelineCompaction(
@@ -1459,7 +1486,7 @@ function reduceTimelineCompaction(
   }
   const compaction: CompactionItem = {
     kind: "compaction",
-    id: createTimelineId("compaction", item.status, timestamp),
+    id: createUniqueTimelineId(state, "compaction", item.status, timestamp),
     ...(timelineCursor ? { timelineCursor } : {}),
     timestamp,
     status: item.status,
@@ -1523,15 +1550,28 @@ function reduceTimelineEvent(
       );
     }
     case "error": {
-      const activity: ActivityLogItem = {
-        kind: "activity_log",
-        id: createTimelineId("error", item.message ?? "", timestamp),
+      const notification: NotificationItem = {
+        kind: "notification",
+        sourceType: "error",
+        id: createUniqueTimelineId(state, "error", item.message ?? "", timestamp),
         ...(timelineCursor ? { timelineCursor } : {}),
         timestamp,
-        activityType: "error",
+        level: "error",
         message: item.message ?? "Unknown error",
       };
-      return finalizeActiveThoughts(appendActivityLog(state, activity));
+      return finalizeActiveThoughts(appendNotification(state, notification));
+    }
+    case "notification": {
+      const notification: NotificationItem = {
+        kind: "notification",
+        sourceType: "notification",
+        id: createUniqueTimelineId(state, "notification", item.message, timestamp),
+        ...(timelineCursor ? { timelineCursor } : {}),
+        timestamp,
+        level: item.level,
+        message: item.message,
+      };
+      return finalizeActiveThoughts(appendNotification(state, notification));
     }
     case "compaction":
       return finalizeActiveThoughts(
@@ -1693,7 +1733,8 @@ function getEventItemKind(event: AgentStreamEventPayload): StreamItem["kind"] |
     case "todo":
       return "todo_list";
     case "error":
-      return "activity_log";
+    case "notification":
+      return "notification";
     case "plugin":
       return "plugin";
     default:
@@ -1721,14 +1762,6 @@ function finalizeHeadItems(head: StreamItem[]): StreamItem[] {
   });
 }
 
-function createAssistantBlockId(params: { groupId: string; blockIndex: number }): string {
-  return `${params.groupId}:block:${params.blockIndex}`;
-}
-
-function getTrailingNewlineSuffix(text: string): string {
-  return /\n+$/.exec(text)?.[0] ?? "";
-}
-
 function getActiveAssistantHeadIndex(head: StreamItem[]): number {
   for (let index = head.length - 1; index >= 0; index -= 1) {
     if (head[index]?.kind === "assistant_message") {
@@ -1757,73 +1790,6 @@ function getTailAssistantToResume(params: {
   return params.tailAssistant;
 }
 
-function promoteCompletedAssistantBlocks(params: { tail: StreamItem[]; head: StreamItem[] }): {
-  tail: StreamItem[];
-  head: StreamItem[];
-  changedTail: boolean;
-  changedHead: boolean;
-} {
-  const assistantIndex = getActiveAssistantHeadIndex(params.head);
-  const activeItem = params.head[assistantIndex];
-  if (assistantIndex < 0 || !activeItem || activeItem.kind !== "assistant_message") {
-    return {
-      tail: params.tail,
-      head: params.head,
-      changedTail: false,
-      changedHead: false,
-    };
-  }
-
-  const blocks = splitMarkdownBlocks(activeItem.text);
-  if (blocks.length < 2) {
-    return {
-      tail: params.tail,
-      head: params.head,
-      changedTail: false,
-      changedHead: false,
-    };
-  }
-
-  const blockGroupId = activeItem.blockGroupId ?? activeItem.id;
-  const firstBlockIndex = activeItem.blockIndex ?? 0;
-  const completedBlocks = blocks.slice(0, -1);
-  const liveBlock = `${blocks[blocks.length - 1] ?? ""}${getTrailingNewlineSuffix(activeItem.text)}`;
-  const promotedItems = completedBlocks.map<AssistantMessageItem>((block, offset) => ({
-    ...activeItem,
-    id: createAssistantBlockId({
-      groupId: blockGroupId,
-      blockIndex: firstBlockIndex + offset,
-    }),
-    blockGroupId,
-    blockIndex: firstBlockIndex + offset,
-    text: block,
-  }));
-
-  const nextTail = flushHeadToTail(params.tail, promotedItems);
-  const liveItem: AssistantMessageItem = {
-    ...activeItem,
-    id: createAssistantBlockId({
-      groupId: blockGroupId,
-      blockIndex: firstBlockIndex + completedBlocks.length,
-    }),
-    blockGroupId,
-    blockIndex: firstBlockIndex + completedBlocks.length,
-    text: liveBlock,
-  };
-  const nextHead = [
-    ...params.head.slice(0, assistantIndex),
-    liveItem,
-    ...params.head.slice(assistantIndex + 1),
-  ];
-
-  return {
-    tail: nextTail,
-    head: nextHead,
-    changedTail: nextTail !== params.tail,
-    changedHead: true,
-  };
-}
-
 /**
  * Flush head items to tail, avoiding duplicates.
  */
@@ -2067,13 +2033,7 @@ export function applyStreamEvent(params: {
   if (incomingKind !== null && isStreamableKind(incomingKind)) {
     const reservedItemIds =
       incomingKind === "assistant_message" && getActiveAssistantHeadIndex(nextHead) < 0
-        ? new Set(
-            nextTail.flatMap((item) =>
-              item.kind === "assistant_message" && item.blockGroupId
-                ? [item.id, item.blockGroupId]
-                : [item.id],
-            ),
-          )
+        ? new Set(nextTail.map((item) => item.id))
         : undefined;
     const reduced = reduceStreamUpdate(nextHead, event, timestamp, {
       source,
@@ -2084,16 +2044,6 @@ export function applyStreamEvent(params: {
       nextHead = reduced;
       changedHead = true;
     }
-    if (incomingKind === "assistant_message") {
-      const promoted = promoteCompletedAssistantBlocks({
-        tail: nextTail,
-        head: nextHead,
-      });
-      nextTail = promoted.tail;
-      nextHead = promoted.head;
-      changedTail = changedTail || promoted.changedTail;
-      changedHead = changedHead || promoted.changedHead;
-    }
     return { tail: nextTail, head: nextHead, changedTail, changedHead };
   }
 
diff --git a/packages/app/src/usage/agent-usage.tsx b/packages/app/src/usage/agent-usage.tsx
new file mode 100644
index 0000000000..0199c08ff2
--- /dev/null
+++ b/packages/app/src/usage/agent-usage.tsx
@@ -0,0 +1,74 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { UsageCard } from "./card";
+import { usageCopy } from "./copy";
+import { useUsageDisplay } from "./display";
+import { useAgentUsage } from "./queries";
+import type { UsageReportEntry } from "./types";
+
+/**
+ * The usage of the account an agent runs under, for its context window details: one card per
+ * report as it streams in, without pins. Nothing on hosts that cannot report usage, or for an
+ * agent with no account to report.
+ */
+export function AgentUsage({
+  serverId,
+  agentId,
+  refreshable,
+}: {
+  serverId: string;
+  agentId: string;
+  /** Whether each card has a Refresh button; a surface that cannot be pressed hides it. */
+  refreshable: boolean;
+}) {
+  const view = useAgentUsage(serverId, agentId);
+  if (view.kind === "none") return null;
+  return (
+    <>
+      <View style={styles.divider} />
+      {view.kind === "ready" ? (
+        <AgentUsageCards
+          serverId={serverId}
+          agentId={agentId}
+          reports={view.reports}
+          refreshable={refreshable}
+        />
+      ) : (
+        <Text style={styles.message}>
+          {view.kind === "loading" ? usageCopy.loading : view.message}
+        </Text>
+      )}
+    </>
+  );
+}
+
+function AgentUsageCards({
+  serverId,
+  agentId,
+  reports,
+  refreshable,
+}: {
+  serverId: string;
+  agentId: string;
+  reports: readonly UsageReportEntry[];
+  refreshable: boolean;
+}) {
+  const { display } = useUsageDisplay(reports);
+  return reports.map((entry) => (
+    <UsageCard
+      key={entry.id}
+      serverId={serverId}
+      agentId={agentId}
+      entry={entry}
+      display={display}
+      compact
+      pinnable={false}
+      refreshable={refreshable}
+    />
+  ));
+}
+
+const styles = StyleSheet.create((theme) => ({
+  divider: { height: 1, backgroundColor: theme.colors.borderAccent },
+  message: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm },
+}));
diff --git a/packages/app/src/provider-usage/balance-bar.tsx b/packages/app/src/usage/balance-bar.tsx
similarity index 77%
rename from packages/app/src/provider-usage/balance-bar.tsx
rename to packages/app/src/usage/balance-bar.tsx
index dbf18bea87..751193eec0 100644
--- a/packages/app/src/provider-usage/balance-bar.tsx
+++ b/packages/app/src/usage/balance-bar.tsx
@@ -1,32 +1,34 @@
 import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import { Text, View, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { clampPct, formatAmount, formatResetLabel } from "./format";
-import type { ProviderUsageBalance, ProviderUsageTone } from "./types";
+import type { UsageBalance, UsageTone } from "./types";
 
 interface ResolvedBalance {
   amountText: string;
   usedPct: number | null;
 }
 
-function resolveBalance(balance: ProviderUsageBalance): ResolvedBalance {
+function resolveBalance(balance: UsageBalance, locale: string): ResolvedBalance {
   const { used, remaining, limit, unit } = balance;
+  const format = (value: number) => formatAmount(value, unit, locale);
   if (limit != null && limit > 0) {
     const usedAmount = used ?? (remaining != null ? limit - remaining : null);
     const usedPct = usedAmount != null ? (usedAmount / limit) * 100 : null;
-    const usedText = usedAmount != null ? formatAmount(usedAmount, unit) : "—";
-    return { amountText: `${usedText} / ${formatAmount(limit, unit)}`, usedPct };
+    const usedText = usedAmount != null ? format(usedAmount) : "—";
+    return { amountText: `${usedText} / ${format(limit)}`, usedPct };
   }
   if (remaining != null) {
-    return { amountText: `${formatAmount(remaining, unit)} left`, usedPct: null };
+    return { amountText: `${format(remaining)} left`, usedPct: null };
   }
   if (used != null) {
-    return { amountText: formatAmount(used, unit), usedPct: null };
+    return { amountText: format(used), usedPct: null };
   }
   return { amountText: "—", usedPct: null };
 }
 
-function fillToneStyle(tone: ProviderUsageTone) {
+function fillToneStyle(tone: UsageTone) {
   switch (tone) {
     case "ok":
       return styles.fillOk;
@@ -39,8 +41,9 @@ function fillToneStyle(tone: ProviderUsageTone) {
   }
 }
 
-export function ProviderUsageBalanceBar({ balance }: { balance: ProviderUsageBalance }) {
-  const { amountText, usedPct } = resolveBalance(balance);
+export function UsageBalanceBar({ balance }: { balance: UsageBalance }) {
+  const { i18n } = useTranslation();
+  const { amountText, usedPct } = resolveBalance(balance, i18n.language);
   const tone = balance.tone ?? "default";
   const resetLabel = formatResetLabel(balance.resetsAt);
 
diff --git a/packages/app/src/usage/card.tsx b/packages/app/src/usage/card.tsx
new file mode 100644
index 0000000000..a1936e0f97
--- /dev/null
+++ b/packages/app/src/usage/card.tsx
@@ -0,0 +1,386 @@
+import { RotateCw } from "lucide-react-native";
+import { useCallback, useMemo } from "react";
+import { Text, View, type StyleProp, type TextStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import {
+  extraMutedIconColorMapping,
+  iconButtonChromeGlyphSize,
+  smallIconButtonChromeFrameSize,
+} from "@/components/ui/icon-button-chrome";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { ToolbarButton, paneContentToolbarIconSize } from "@/components/ui/pane-content-toolbar";
+import { StatusBadge } from "@/components/ui/status-badge";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { isNative } from "@/constants/platform";
+import { useCompactTimeAgo } from "@/hooks/use-time-ago";
+import { UsageBalanceBar } from "./balance-bar";
+import { usageCopy } from "./copy";
+import type { UsageDisplay } from "./display";
+import { formatUsageFreshness, type UsageRefresh } from "./model";
+import { useReportRefresh } from "./queries";
+import { UsageSourceIcon } from "./source-icon";
+import type { UsageReport, UsageReportEntry, UsageWindow } from "./types";
+import { UsageWindowBar } from "./window-bar";
+
+function statusText(report: UsageReport): string | null {
+  if (report.status === "available") return null;
+  return report.status === "error" ? "Error" : "Unavailable";
+}
+
+function reportContent(report: UsageReport) {
+  if (report.status === "available")
+    return {
+      windows: report.windows,
+      balances: report.balances ?? [],
+      details: report.details ?? [],
+      message: undefined,
+    };
+  const message =
+    report.status === "unavailable" ? usageCopy.problem(report.problem) : report.error;
+  return { windows: [], balances: [], details: [], message };
+}
+
+function reportMessages(entry: UsageReportEntry): string[] {
+  if (entry.report.status === "available") return [];
+  if (entry.loginErrors)
+    return entry.loginErrors.map(
+      (login) => `${login.harness}: ${reportContent(login.report).message}`,
+    );
+  // COMPAT(usageLoginErrors): added in v0.11.0, remove after 2027-04-05 once daemon floor >= v0.11.0.
+  return [
+    entry.report.status === "error" ? entry.report.error : usageCopy.problem(entry.report.problem),
+  ];
+}
+
+const ThemedRotateCw = withUnistyles(RotateCw);
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+
+export function UsageCard({
+  serverId,
+  agentId,
+  entry,
+  display,
+  pinnable,
+  refreshable,
+  compact = false,
+}: {
+  serverId: string;
+  agentId?: string;
+  entry: UsageReportEntry;
+  display: UsageDisplay;
+  /** Whether each window row pins the window to the sidebar. */
+  pinnable: boolean;
+  /** Whether the header has a Refresh button. Without one the freshness shows on the card. */
+  refreshable: boolean;
+  compact?: boolean;
+}) {
+  const isCompact = useIsCompactFormFactor();
+  const { refresh, refreshState } = useReportRefresh(serverId, entry.id, agentId);
+  // Where there is no hover the freshness is printed on the card; elsewhere the Refresh tooltip.
+  const showsFreshnessInline = isNative || isCompact || !refreshable;
+  const usage = entry.report;
+  const status = statusText(usage);
+  const footer = entry.account.label ?? null;
+  const { windows, balances, details } = reportContent(usage);
+  const messages = reportMessages(entry);
+
+  const containerStyle = useMemo(
+    () => [styles.container, compact ? styles.containerCompact : styles.containerPadded],
+    [compact],
+  );
+  const dotStyle = useMemo(
+    () => [
+      styles.statusDot,
+      usage.status === "available" && styles.statusDotAvailable,
+      usage.status === "error" && styles.statusDotError,
+    ],
+    [usage.status],
+  );
+
+  return (
+    <View style={containerStyle} testID={`usage-report-${entry.id}`}>
+      <View style={styles.header}>
+        <UsageSourceIcon svg={entry.icon ?? null} size={14} />
+        <Text style={styles.name} numberOfLines={1}>
+          {entry.sourceLabel}
+        </Text>
+        {usage.status === "available" && usage.planLabel ? (
+          <StatusBadge label={usage.planLabel} variant="muted" size="xs" />
+        ) : null}
+        <View style={styles.headerSpacer} />
+        {status ? (
+          <View style={styles.statusRow}>
+            <View style={dotStyle} />
+            <Text style={styles.statusLabel}>{status}</Text>
+          </View>
+        ) : null}
+        {refreshable ? (
+          <UsageRefreshButton
+            sourceLabel={entry.sourceLabel}
+            fetchedAt={entry.fetchedAt}
+            refreshState={refreshState}
+            onRefresh={refresh}
+            compact={isCompact}
+          />
+        ) : null}
+      </View>
+
+      {messages.length > 0 ? (
+        <Text style={styles.error} testID="usage-login-error">
+          {messages.join("\n")}
+        </Text>
+      ) : null}
+
+      {windows.length > 0 || balances.length > 0 ? (
+        <View style={styles.bars}>
+          {windows.map((window) => (
+            <CardWindowBar
+              key={window.id}
+              entry={entry}
+              window={window}
+              display={display}
+              pinnable={pinnable}
+            />
+          ))}
+          {balances.map((balance) => (
+            <UsageBalanceBar key={balance.id} balance={balance} />
+          ))}
+        </View>
+      ) : null}
+
+      {details.length > 0 ? (
+        <View style={styles.details}>
+          {details.map((detail) => (
+            <View key={detail.id} style={styles.detailRow}>
+              <Text style={styles.detailLabel} numberOfLines={1}>
+                {detail.label}
+              </Text>
+              <Text style={styles.detailValue} numberOfLines={1}>
+                {detail.value}
+              </Text>
+            </View>
+          ))}
+        </View>
+      ) : null}
+
+      {footer || showsFreshnessInline ? (
+        <View style={styles.footerRow}>
+          <Text style={styles.footer} numberOfLines={1}>
+            {footer}
+          </Text>
+          {showsFreshnessInline ? (
+            <UsageFreshness
+              fetchedAt={entry.fetchedAt}
+              style={styles.freshness}
+              testID="usage-freshness"
+            />
+          ) : null}
+        </View>
+      ) : null}
+
+      {refreshState === "failed" ? (
+        <Text style={styles.error} testID="usage-refresh-error">
+          {usageCopy.refreshFailed}
+        </Text>
+      ) : null}
+    </View>
+  );
+}
+
+function CardWindowBar({
+  entry,
+  window,
+  display,
+  pinnable,
+}: {
+  entry: UsageReportEntry;
+  window: UsageWindow;
+  display: UsageDisplay;
+  pinnable: boolean;
+}) {
+  const pin = useMemo(
+    () => ({ sourceId: entry.sourceId, windowId: window.id }),
+    [entry.sourceId, window.id],
+  );
+  const { togglePin } = display;
+  const toggle = useCallback(() => togglePin(pin), [pin, togglePin]);
+  return (
+    <UsageWindowBar
+      window={window}
+      displayAs={display.displayAs}
+      pinnable={pinnable}
+      pinned={display.isPinned(pin)}
+      onTogglePin={toggle}
+      pinLabel={`${usageCopy.pin} ${entry.sourceLabel} ${window.label}`}
+      pinTestID={`usage-pin-${entry.sourceId}-${window.id}`}
+    />
+  );
+}
+
+/** Refreshes this one report. Its tooltip says when the report on screen was fetched. */
+function UsageRefreshButton({
+  sourceLabel,
+  fetchedAt,
+  refreshState,
+  onRefresh,
+  compact,
+}: {
+  sourceLabel: string;
+  fetchedAt: string;
+  refreshState: UsageRefresh;
+  onRefresh: () => void;
+  compact: boolean;
+}) {
+  const isPending = refreshState === "pending";
+  const iconSize = paneContentToolbarIconSize(compact);
+  const freshness = useMemo(
+    () => (
+      <UsageFreshness
+        fetchedAt={fetchedAt}
+        style={styles.tooltipText}
+        testID="usage-freshness-tooltip"
+      />
+    ),
+    [fetchedAt],
+  );
+  return (
+    <ToolbarButton
+      label={`${usageCopy.refresh} ${sourceLabel}`}
+      tooltip={freshness}
+      tooltipSide="top"
+      compact={compact}
+      disabled={isPending}
+      onPress={onRefresh}
+      style={compact ? styles.refreshButtonCompact : styles.refreshButton}
+      testID="usage-refresh"
+    >
+      {isPending ? (
+        <ThemedLoadingSpinner size={iconSize} uniProps={extraMutedIconColorMapping} />
+      ) : (
+        <ThemedRotateCw size={iconSize} uniProps={extraMutedIconColorMapping} />
+      )}
+    </ToolbarButton>
+  );
+}
+
+/** Its own component so the relative-time clock re-renders one `<Text>`, not the card. */
+function UsageFreshness({
+  fetchedAt,
+  style,
+  testID,
+}: {
+  fetchedAt: string;
+  style: StyleProp<TextStyle>;
+  testID: string;
+}) {
+  const elapsed = useCompactTimeAgo(new Date(fetchedAt));
+  return (
+    <Text style={style} numberOfLines={1} testID={testID}>
+      {formatUsageFreshness(elapsed)}
+    </Text>
+  );
+}
+
+// The Refresh glyph lands on the card's right rail and the header keeps its text height;
+// the button's larger hitbox overhangs both instead of pushing them.
+function iconHitboxOverhang(compact: boolean) {
+  const overhang =
+    (smallIconButtonChromeFrameSize(compact) - iconButtonChromeGlyphSize("small", compact)) / 2;
+  return { marginRight: -overhang, marginVertical: -overhang };
+}
+
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    gap: theme.spacing[3],
+  },
+  // The gap is one step under the card padding: window rows add their own vertical padding.
+  containerPadded: {
+    gap: theme.spacing[3],
+    paddingVertical: theme.spacing[4],
+    paddingHorizontal: theme.spacing[4],
+  },
+  containerCompact: {
+    gap: theme.spacing[3],
+  },
+  header: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  name: {
+    flexShrink: 1,
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.base,
+  },
+  headerSpacer: {
+    flex: 1,
+  },
+  statusRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+  },
+  statusDot: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    backgroundColor: theme.colors.foregroundMuted,
+  },
+  statusDotAvailable: {
+    backgroundColor: theme.colors.statusSuccess,
+  },
+  statusDotError: {
+    backgroundColor: theme.colors.statusDanger,
+  },
+  statusLabel: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  // Window rows carry their own vertical padding, which already separates them.
+  bars: {
+    gap: theme.spacing[1],
+  },
+  details: {
+    gap: theme.spacing[1],
+  },
+  detailRow: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    gap: theme.spacing[2],
+  },
+  detailLabel: {
+    flexShrink: 1,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  detailValue: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+  },
+  error: {
+    color: theme.colors.palette.red[300],
+    fontSize: theme.fontSize.sm,
+    lineHeight: theme.fontSize.sm * 1.4,
+  },
+  footerRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  footer: {
+    flex: 1,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  freshness: {
+    flexShrink: 0,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  tooltipText: {
+    color: theme.colors.popoverForeground,
+    fontSize: theme.fontSize.sm,
+  },
+  refreshButton: iconHitboxOverhang(false),
+  refreshButtonCompact: iconHitboxOverhang(true),
+}));
diff --git a/packages/app/src/usage/controls.tsx b/packages/app/src/usage/controls.tsx
new file mode 100644
index 0000000000..20297c9df0
--- /dev/null
+++ b/packages/app/src/usage/controls.tsx
@@ -0,0 +1,92 @@
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { HostFilter } from "@/components/hosts/host-filter";
+import { useMemo, type ReactElement } from "react";
+import { UsageRefreshButton } from "./refresh-button";
+import { UsageOptions } from "./options";
+import type { UsageHost } from "./model";
+import { useHostUsage } from "./queries";
+import type { UsageView } from "./types";
+
+/** The hosts to choose between, and which one is shown. */
+export interface UsageHostSelection {
+  hosts: UsageHost[];
+  serverId: string;
+  onSelect: (serverId: string) => void;
+}
+
+/**
+ * The controls on the right of every usage title row: the host filter when there is more than one
+ * host, Refresh all, and the Settings cog. A host that cannot report usage keeps only the host filter.
+ */
+export function UsageControls({
+  view,
+  onRefresh,
+  hostSelection,
+}: {
+  view: UsageView;
+  onRefresh: () => void;
+  hostSelection?: UsageHostSelection;
+}) {
+  const busy = view.kind === "loading" || (view.kind === "ready" && view.isRefreshing);
+  return (
+    <View style={styles.controls}>
+      {hasHostChoice(hostSelection) ? (
+        <HostFilter
+          hosts={hostSelection.hosts}
+          selectedHost={hostSelection.serverId}
+          onSelectHost={hostSelection.onSelect}
+          includeAllHost={false}
+          triggerTestID="usage-host-filter-trigger"
+          hostOptionTestID={usageHostOptionTestID}
+        />
+      ) : null}
+      {view.kind === "unavailable" ? null : (
+        <>
+          <UsageRefreshButton busy={busy} onRefresh={onRefresh} />
+          <UsageOptions />
+        </>
+      )}
+    </View>
+  );
+}
+
+function hasHostChoice(
+  hostSelection: UsageHostSelection | undefined,
+): hostSelection is UsageHostSelection {
+  return hostSelection !== undefined && hostSelection.hosts.length > 1;
+}
+
+function usageHostOptionTestID(serverId: string): string {
+  return `usage-host-filter-item-${serverId}`;
+}
+
+const styles = StyleSheet.create((theme) => ({
+  controls: {
+    flexShrink: 1,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+}));
+
+/**
+ * One host’s usage and title-row controls for the Usage modal.
+ * Returns null when there is nothing to control, so headers leave no empty island.
+ */
+export function useHostUsageWithControls(hostSelection: UsageHostSelection): {
+  view: UsageView;
+  refresh: () => void;
+  controls: ReactElement | null;
+} {
+  const { view, refresh } = useHostUsage(hostSelection.serverId);
+  const hasControls = hasHostChoice(hostSelection) || view.kind !== "unavailable";
+  const controls = useMemo(
+    () =>
+      hasControls ? (
+        <UsageControls view={view} onRefresh={refresh} hostSelection={hostSelection} />
+      ) : null,
+    [hasControls, hostSelection, refresh, view],
+  );
+  return { view, refresh, controls };
+}
diff --git a/packages/app/src/usage/copy.test.ts b/packages/app/src/usage/copy.test.ts
new file mode 100644
index 0000000000..a5176eba93
--- /dev/null
+++ b/packages/app/src/usage/copy.test.ts
@@ -0,0 +1,18 @@
+import { expect, test } from "vitest";
+import { usageCopy } from "./copy";
+
+test.each([
+  [
+    { kind: "expired", expiresAt: "2026-10-01T09:00:00Z", refreshedBy: "claude" },
+    "Login expired 3h ago. Run claude to refresh it.",
+  ],
+  [{ kind: "expired", expiresAt: "2026-10-01T09:00:00Z" }, "Login expired 3h ago. Sign in again."],
+  [
+    { kind: "rejected", status: 403, refreshedBy: "codex" },
+    "Login rejected (HTTP 403). Run codex to refresh it.",
+  ],
+  [{ kind: "rejected", status: 401 }, "Login rejected (HTTP 401). Sign in again."],
+  [{ kind: "no_quota", detail: "No active coding plan" }, "No active coding plan"],
+] as const)("problem %j", (problem, sentence) => {
+  expect(usageCopy.problem(problem, new Date("2026-10-01T12:00:00Z"))).toBe(sentence);
+});
diff --git a/packages/app/src/usage/copy.ts b/packages/app/src/usage/copy.ts
new file mode 100644
index 0000000000..639272283b
--- /dev/null
+++ b/packages/app/src/usage/copy.ts
@@ -0,0 +1,40 @@
+import type { UsageProblem } from "@getpaseo/protocol/messages";
+import { formatCompactTimeAgo, formatCompactTimeAgoAsProse } from "@/utils/time";
+
+// User-facing copy for the usage surfaces, kept in one file so localization is a
+// single-file change.
+export const usageCopy = {
+  problem: (problem: UsageProblem, now: Date = new Date()): string => {
+    if (problem.kind === "no_quota") return problem.detail;
+    const remedy = problem.refreshedBy
+      ? `Run ${problem.refreshedBy} to refresh it.`
+      : "Sign in again.";
+    if (problem.kind === "rejected") return `Login rejected (HTTP ${problem.status}). ${remedy}`;
+    const ago = formatCompactTimeAgoAsProse(formatCompactTimeAgo(new Date(problem.expiresAt), now));
+    return `Login expired ${ago}. ${remedy}`;
+  },
+  title: "Usage",
+  planUsage: "Plan usage",
+  options: "Settings",
+  refresh: "Refresh",
+  refreshAll: "Refresh all",
+  refreshing: "Refreshing...",
+  refreshFailed: "Unable to refresh usage",
+  updated: "Updated",
+  loading: "Loading usage...",
+  empty: "No usage data",
+  noHosts: "No connected hosts",
+  errorTitle: "Unable to load usage",
+  agentError: (reason: string) => `Unable to load usage: ${reason}`,
+  hostUnavailable: (host: string) => `Connect to ${host} to see usage`,
+  hostUpgradeRequired: (host: string) => `Update ${host} to see usage`,
+  clientUnavailable: "Host connection is not ready",
+  retry: "Try again",
+  pin: "Pin",
+  unpin: "Unpin",
+  displayAs: "Percentages",
+  displayUsed: "Used",
+  displayRemaining: "Remaining",
+  showInSidebar: "Summary in sidebar",
+  showInSidebarHint: "Pinned windows show in the sidebar footer",
+} as const;
diff --git a/packages/app/src/usage/display.ts b/packages/app/src/usage/display.ts
new file mode 100644
index 0000000000..5b4e534693
--- /dev/null
+++ b/packages/app/src/usage/display.ts
@@ -0,0 +1,62 @@
+import { useCallback, useMemo } from "react";
+import { useAppSettings } from "@/hooks/use-settings";
+import { useUsageHostId } from "./hosts";
+import { useUsageHostReports } from "./queries";
+import {
+  isUsagePinned,
+  setUsageDisplayAs,
+  toggleUsagePin,
+  type UsageDisplayAs,
+  type UsagePin,
+  type UsagePreferences,
+} from "./preferences";
+import type { UsageReportEntry } from "./types";
+
+/** What usage views need from the preferences: how to read percents, and the pins. */
+export interface UsageDisplay {
+  displayAs: UsageDisplayAs;
+  setDisplayAs: (displayAs: UsageDisplayAs) => void;
+  isPinned: (pin: UsagePin) => boolean;
+  togglePin: (pin: UsagePin) => void;
+}
+
+interface UsagePreferencesState {
+  preferences: UsagePreferences;
+  display: UsageDisplay;
+}
+
+/** The device's usage preferences, with pins resolved against a host's reports. */
+export function useUsagePreferences(serverId?: string): UsagePreferencesState {
+  const defaultServerId = useUsageHostId();
+  return useUsageDisplay(useUsageHostReports(serverId ?? defaultServerId));
+}
+
+/** The device's usage preferences, with pins resolved against the given reports. */
+export function useUsageDisplay(reports: readonly UsageReportEntry[]): UsagePreferencesState {
+  const { settings, updateSettings } = useAppSettings();
+  const preferences = settings.usage;
+  const setDisplayAs = useCallback(
+    (displayAs: UsageDisplayAs) => {
+      void updateSettings((current) => ({ usage: setUsageDisplayAs(current.usage, displayAs) }));
+    },
+    [updateSettings],
+  );
+  const togglePin = useCallback(
+    (pin: UsagePin) => {
+      void updateSettings((current) => ({
+        usage: toggleUsagePin({ preferences: current.usage, pin, reports }),
+      }));
+    },
+    [updateSettings, reports],
+  );
+  const display = useMemo<UsageDisplay>(
+    () => ({
+      displayAs: preferences.displayAs,
+      setDisplayAs,
+      isPinned: (pin) => isUsagePinned(preferences, pin, reports),
+      togglePin,
+    }),
+    [preferences, reports, setDisplayAs, togglePin],
+  );
+  return { preferences, display };
+}
diff --git a/packages/app/src/usage/format.test.ts b/packages/app/src/usage/format.test.ts
new file mode 100644
index 0000000000..88fe227ae6
--- /dev/null
+++ b/packages/app/src/usage/format.test.ts
@@ -0,0 +1,15 @@
+import { describe, expect, it } from "vitest";
+import { formatAmount } from "./format";
+
+describe("formatAmount", () => {
+  it("groups thousands in the app's language", () => {
+    expect(formatAmount(12345, "credits", "en")).toBe("12,345");
+    expect(formatAmount(12345, "requests", "en")).toBe("12,345");
+    expect(formatAmount(12345, "credits", "fr").replace(/\s/g, " ")).toBe("12 345");
+  });
+
+  it("formats dollars as the language writes currency", () => {
+    expect(formatAmount(1234.5, "usd", "en")).toBe("$1,234.50");
+    expect(formatAmount(1234.5, "usd", "fr").replace(/\s/g, " ")).toBe("1 234,50 $US");
+  });
+});
diff --git a/packages/app/src/provider-usage/format.ts b/packages/app/src/usage/format.ts
similarity index 59%
rename from packages/app/src/provider-usage/format.ts
rename to packages/app/src/usage/format.ts
index d903818f48..5adef2154d 100644
--- a/packages/app/src/provider-usage/format.ts
+++ b/packages/app/src/usage/format.ts
@@ -1,5 +1,6 @@
 import { formatTokenCount } from "@/components/context-window-meter.utils";
-import type { ProviderUsageBalanceUnit } from "./types";
+import type { UsageDisplayAs } from "./preferences";
+import type { UsageBalanceUnit } from "./types";
 
 export function clampPct(value: number): number {
   return Math.max(0, Math.min(100, value));
@@ -9,6 +10,11 @@ export function formatPct(value: number): string {
   return `${Math.round(clampPct(value))}%`;
 }
 
+/** "31%" of the window used, or "69% left" of it. */
+export function formatDisplayPct(value: number, displayAs: UsageDisplayAs): string {
+  return displayAs === "used" ? formatPct(value) : `${formatPct(value)} left`;
+}
+
 function relativeDuration(iso: string): string | null {
   const diffMs = new Date(iso).getTime() - Date.now();
   if (!Number.isFinite(diffMs)) return null;
@@ -28,26 +34,14 @@ export function formatResetLabel(iso: string | null | undefined): string | null
   return rel === "now" ? "resetting now" : `resets ${rel}`;
 }
 
-export function formatAgo(iso: string | null | undefined): string | null {
-  if (!iso) return null;
-  const diffMs = Date.now() - new Date(iso).getTime();
-  if (!Number.isFinite(diffMs)) return null;
-  if (diffMs < 60_000) return "just now";
-  const diffMinutes = Math.floor(diffMs / 60_000);
-  const diffHours = Math.floor(diffMinutes / 60);
-  const diffDays = Math.floor(diffHours / 24);
-  if (diffDays > 0) return `${diffDays}d ago`;
-  if (diffHours > 0) return `${diffHours}h ago`;
-  return `${diffMinutes}m ago`;
-}
-
-export function formatAmount(value: number, unit: ProviderUsageBalanceUnit): string {
+/** A balance amount as the app's language writes it: "$1,234.50", "12,345". */
+export function formatAmount(value: number, unit: UsageBalanceUnit, locale: string): string {
   switch (unit) {
     case "usd":
-      return `$${value.toFixed(2)}`;
+      return new Intl.NumberFormat(locale, { style: "currency", currency: "USD" }).format(value);
     case "tokens":
       return formatTokenCount(value);
     default:
-      return value.toLocaleString();
+      return new Intl.NumberFormat(locale, { maximumFractionDigits: 2 }).format(value);
   }
 }
diff --git a/packages/app/src/usage/host-usage-section.tsx b/packages/app/src/usage/host-usage-section.tsx
new file mode 100644
index 0000000000..927d32e7d8
--- /dev/null
+++ b/packages/app/src/usage/host-usage-section.tsx
@@ -0,0 +1,20 @@
+import { usageCopy } from "./copy";
+import { useUsagePreferences } from "./display";
+import { useHostUsage } from "./queries";
+import { UsageSection } from "./usage-section";
+
+/** A host's usage reports, for its settings page. */
+export function HostUsageSection({ serverId }: { serverId: string }) {
+  const { view, refresh } = useHostUsage(serverId);
+  const { display } = useUsagePreferences(serverId);
+  return (
+    <UsageSection
+      serverId={serverId}
+      title={usageCopy.planUsage}
+      view={view}
+      display={display}
+      onRefresh={refresh}
+      testID="usage-card"
+    />
+  );
+}
diff --git a/packages/app/src/usage/hosts.ts b/packages/app/src/usage/hosts.ts
new file mode 100644
index 0000000000..dba21dc316
--- /dev/null
+++ b/packages/app/src/usage/hosts.ts
@@ -0,0 +1,59 @@
+import { useCallback, useMemo } from "react";
+import { useAppSettings } from "@/hooks/use-settings";
+import {
+  useActiveWorkspaceSelection,
+  useLastWorkspaceSelection,
+} from "@/stores/navigation-active-workspace-store";
+import {
+  resolveUsageHostId,
+  resolveUsageModalHostId,
+  type UsageHost,
+  type UsageHostChoice,
+} from "./model";
+import { setUsageHost } from "./preferences";
+import { useUsageHosts } from "./queries";
+
+/** The active workspace's host; off a workspace route, the last workspace visited. */
+function useActiveServerId(): string | null {
+  const active = useActiveWorkspaceSelection();
+  const last = useLastWorkspaceSelection();
+  return active?.serverId ?? last?.serverId ?? null;
+}
+
+function useUsageHostChoice(): UsageHostChoice {
+  const { settings } = useAppSettings();
+  return {
+    pickedServerId: settings.usage.serverId,
+    activeServerId: useActiveServerId(),
+    hosts: useUsageHosts(),
+  };
+}
+
+/** The host the sidebar Usage row reads, or null when none reports usage. */
+export function useUsageHostId(): string | null {
+  return resolveUsageHostId(useUsageHostChoice());
+}
+
+/**
+ * The host the Usage modal shows, and the hosts to pick from. A pick
+ * is saved on the device, so the sidebar Usage row and later visits show the same host.
+ */
+export function useUsageHostSelection(): {
+  serverId: string | null;
+  connectedHosts: UsageHost[];
+  select: (serverId: string) => void;
+} {
+  const { updateSettings } = useAppSettings();
+  const choice = useUsageHostChoice();
+  const connectedHosts = useMemo(
+    () => choice.hosts.filter((host) => host.isConnected),
+    [choice.hosts],
+  );
+  const select = useCallback(
+    (serverId: string) => {
+      void updateSettings((current) => ({ usage: setUsageHost(current.usage, serverId) }));
+    },
+    [updateSettings],
+  );
+  return { serverId: resolveUsageModalHostId(choice), connectedHosts, select };
+}
diff --git a/packages/app/src/usage/in-sidebar.ts b/packages/app/src/usage/in-sidebar.ts
new file mode 100644
index 0000000000..96883bb80f
--- /dev/null
+++ b/packages/app/src/usage/in-sidebar.ts
@@ -0,0 +1,19 @@
+import { useCallback } from "react";
+import { useSidebarNavItems } from "@/sidebar-nav/use-sidebar-nav-items";
+
+/**
+ * Whether the sidebar footer shows the Usage summary: the same switch as Settings > Sidebar.
+ * Window rows pin to the summary only while it is on.
+ */
+export function useUsageInSidebar(): {
+  inSidebar: boolean;
+  setInSidebar: (visible: boolean) => void;
+} {
+  const { items, setVisible } = useSidebarNavItems("footer");
+  const inSidebar = items.some((item) => item.key === "usage" && item.visible);
+  const setInSidebar = useCallback(
+    (visible: boolean) => setVisible("usage", visible),
+    [setVisible],
+  );
+  return { inSidebar, setInSidebar };
+}
diff --git a/packages/app/src/usage/index.ts b/packages/app/src/usage/index.ts
new file mode 100644
index 0000000000..45599aba2d
--- /dev/null
+++ b/packages/app/src/usage/index.ts
@@ -0,0 +1,9 @@
+export { AgentUsage } from "./agent-usage";
+export { HostUsageSection } from "./host-usage-section";
+export { useHostReportsUsage } from "./queries";
+export {
+  UsageSidebarItem,
+  UsageSidebarRoot,
+  useHasUsageSummary,
+  useOpenSidebarUsage,
+} from "./sidebar-item";
diff --git a/packages/app/src/usage/list.tsx b/packages/app/src/usage/list.tsx
new file mode 100644
index 0000000000..10e76ba57f
--- /dev/null
+++ b/packages/app/src/usage/list.tsx
@@ -0,0 +1,41 @@
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { settingsStyles } from "@/styles/settings";
+import { UsageCard } from "./card";
+import type { UsageDisplay } from "./display";
+import { useUsageInSidebar } from "./in-sidebar";
+import type { UsageReportEntry } from "./types";
+
+/** One card per report (source + account). Window rows pin while the sidebar summary is on. */
+export function UsageList({
+  serverId,
+  reports,
+  display,
+}: {
+  serverId: string;
+  reports: UsageReportEntry[];
+  display: UsageDisplay;
+}) {
+  const { inSidebar } = useUsageInSidebar();
+  return (
+    <View style={styles.list}>
+      {reports.map((entry) => (
+        <View key={entry.id} style={settingsStyles.card}>
+          <UsageCard
+            serverId={serverId}
+            entry={entry}
+            display={display}
+            pinnable={inSidebar}
+            refreshable
+          />
+        </View>
+      ))}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  list: {
+    gap: theme.spacing[3],
+  },
+}));
diff --git a/packages/app/src/usage/meter.tsx b/packages/app/src/usage/meter.tsx
new file mode 100644
index 0000000000..37842cafb5
--- /dev/null
+++ b/packages/app/src/usage/meter.tsx
@@ -0,0 +1,74 @@
+import { useMemo } from "react";
+import { View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { clampPct } from "./format";
+import type { UsageTone } from "./types";
+
+function fillToneStyle(tone: UsageTone) {
+  switch (tone) {
+    case "ok":
+      return styles.fillOk;
+    case "warning":
+      return styles.fillWarning;
+    case "danger":
+      return styles.fillDanger;
+    default:
+      return styles.fillDefault;
+  }
+}
+
+/**
+ * A window's share as a bar, coloured by its tone. `quiet` fills it with a surface colour instead,
+ * for summaries where a row of coloured bars would be noise. The caller sizes the track.
+ */
+export function UsageMeter({
+  percent,
+  tone,
+  quiet = false,
+  style,
+}: {
+  percent: number;
+  tone: UsageTone;
+  quiet?: boolean;
+  style?: StyleProp<ViewStyle>;
+}) {
+  const fillWidth = clampPct(percent);
+  const fillStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [styles.fill, quiet ? styles.fillQuiet : fillToneStyle(tone), { width: `${fillWidth}%` }],
+    [fillWidth, quiet, tone],
+  );
+  return (
+    <View style={[styles.track, style]}>
+      <View style={fillStyle} />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  track: {
+    height: 4,
+    borderRadius: 2,
+    backgroundColor: theme.colors.surface3,
+    overflow: "hidden",
+  },
+  // Follows the track, so a caller that sizes the track sizes the bar.
+  fill: {
+    height: "100%",
+    borderRadius: theme.borderRadius.full,
+  },
+  fillQuiet: {
+    backgroundColor: theme.colors.surface4,
+  },
+  fillDefault: {
+    backgroundColor: theme.colors.foregroundMuted,
+  },
+  fillOk: {
+    backgroundColor: theme.colors.statusSuccess,
+  },
+  fillWarning: {
+    backgroundColor: theme.colors.statusWarning,
+  },
+  fillDanger: {
+    backgroundColor: theme.colors.statusDanger,
+  },
+}));
diff --git a/packages/app/src/usage/model.test.ts b/packages/app/src/usage/model.test.ts
new file mode 100644
index 0000000000..ad293bb23e
--- /dev/null
+++ b/packages/app/src/usage/model.test.ts
@@ -0,0 +1,311 @@
+import { describe, expect, it } from "vitest";
+import {
+  displayPercent,
+  formatUsageFreshness,
+  resolveAgentUsageView,
+  replaceReport,
+  resolveUsageRefresh,
+  resolveUsageHostId,
+  resolveUsageModalHostId,
+  resolveUsageView,
+  settleReports,
+  upsertReport,
+  usageWindowRowLabel,
+  type UsageHost,
+  type UsageQueryState,
+} from "./model";
+import type { UsageReportEntry, UsageWindow } from "./types";
+
+function entry(input: {
+  windows?: UsageWindow[];
+  planLabel?: string;
+  icon?: string;
+  sourceId?: string;
+}): UsageReportEntry {
+  return {
+    id: `${input.sourceId ?? "fixture"}:account-1`,
+    account: {},
+    fetchedAt: "2026-01-01T00:00:00.000Z",
+    sourceId: input.sourceId ?? "fixture",
+    sourceLabel: "Fixture source",
+    ...(input.icon ? { icon: input.icon } : {}),
+    report: {
+      status: "available",
+      ...(input.planLabel ? { planLabel: input.planLabel } : {}),
+      windows: input.windows ?? [],
+    },
+  };
+}
+
+function ready(data: UsageReportEntry[]): UsageQueryState {
+  return { data, error: null, isFetching: false };
+}
+
+describe("resolveUsageView", () => {
+  it("asks for a host update when the host lacks usage sources", () => {
+    expect(
+      resolveUsageView({
+        hostLabel: "Laptop",
+        isConnected: true,
+        supportsUsage: false,
+        query: ready([entry({})]),
+      }),
+    ).toEqual({ kind: "unavailable", message: "Update Laptop to see usage" });
+  });
+
+  it("asks for a connection before anything else", () => {
+    expect(
+      resolveUsageView({
+        hostLabel: "Laptop",
+        isConnected: false,
+        supportsUsage: false,
+        query: undefined,
+      }),
+    ).toEqual({ kind: "unavailable", message: "Connect to Laptop to see usage" });
+  });
+
+  it("moves from loading to ready to error", () => {
+    const base = { hostLabel: "Laptop", isConnected: true, supportsUsage: true };
+    expect(resolveUsageView({ ...base, query: undefined })).toEqual({ kind: "loading" });
+    expect(
+      resolveUsageView({ ...base, query: { data: [], error: null, isFetching: true } }),
+    ).toEqual({ kind: "ready", reports: [], isRefreshing: true });
+    expect(
+      resolveUsageView({
+        ...base,
+        query: { data: undefined, error: new Error("boom"), isFetching: false },
+      }),
+    ).toEqual({ kind: "error", message: "boom" });
+  });
+});
+
+const hosts: UsageHost[] = [
+  { serverId: "offline", label: "Offline", isConnected: false, supportsUsage: true },
+  { serverId: "old", label: "Old", isConnected: true, supportsUsage: false },
+  { serverId: "a", label: "Alpha", isConnected: true, supportsUsage: true },
+  { serverId: "b", label: "Beta", isConnected: true, supportsUsage: true },
+];
+
+describe("resolveUsageHostId", () => {
+  const choose = (pickedServerId: string | null, activeServerId: string | null) =>
+    resolveUsageHostId({ pickedServerId, activeServerId, hosts });
+
+  it("reads the picked host over the active workspace's host", () => {
+    expect(choose("a", "b")).toBe("a");
+  });
+
+  it("reads the active workspace's host when nothing usable is picked", () => {
+    expect(choose(null, "b")).toBe("b");
+    expect(choose("offline", "b")).toBe("b");
+    expect(choose("old", "b")).toBe("b");
+  });
+
+  it("falls back to the first connected host that reports usage", () => {
+    expect(choose(null, null)).toBe("a");
+    expect(choose(null, "offline")).toBe("a");
+    expect(choose(null, "old")).toBe("a");
+  });
+
+  it("has no host when none reports usage", () => {
+    expect(
+      resolveUsageHostId({
+        pickedServerId: "old",
+        activeServerId: "old",
+        hosts: hosts.slice(0, 2),
+      }),
+    ).toBeNull();
+  });
+});
+
+describe("resolveUsageModalHostId", () => {
+  it("shows the picked host while it stays connected, even one that cannot report usage", () => {
+    expect(resolveUsageModalHostId({ pickedServerId: "old", activeServerId: "b", hosts })).toBe(
+      "old",
+    );
+    expect(resolveUsageModalHostId({ pickedServerId: "offline", activeServerId: "b", hosts })).toBe(
+      "b",
+    );
+  });
+
+  it("otherwise shows the host the sidebar row reads", () => {
+    for (const pickedServerId of [null, "a", "offline"]) {
+      for (const activeServerId of ["b", null, "old", "offline"]) {
+        const choice = { pickedServerId, activeServerId, hosts };
+        expect(resolveUsageModalHostId(choice)).toBe(resolveUsageHostId(choice));
+      }
+    }
+  });
+
+  it("shows the first connected host when none reports usage, so the modal says to update it", () => {
+    expect(
+      resolveUsageModalHostId({
+        pickedServerId: null,
+        activeServerId: null,
+        hosts: hosts.slice(0, 2),
+      }),
+    ).toBe("old");
+    expect(
+      resolveUsageModalHostId({ pickedServerId: null, activeServerId: null, hosts: [] }),
+    ).toBeNull();
+  });
+});
+
+describe("usageWindowRowLabel", () => {
+  it("names the window, its percent and its reset after what pinning it pins", () => {
+    expect(
+      usageWindowRowLabel({
+        pinLabel: "Pin Claude Session",
+        value: "31%",
+        trailing: "resets in 2h",
+      }),
+    ).toBe("Pin Claude Session, 31% · resets in 2h");
+    expect(usageWindowRowLabel({ pinLabel: "Pin Codex Weekly", value: "—", trailing: null })).toBe(
+      "Pin Codex Weekly, —",
+    );
+  });
+});
+
+describe("displayPercent", () => {
+  const window = (input: Partial<UsageWindow>): UsageWindow => ({
+    id: "weekly",
+    label: "Weekly",
+    ...input,
+  });
+
+  it("reads the share used or the share left", () => {
+    expect(displayPercent(window({ usedPct: 31 }), "used")).toBe(31);
+    expect(displayPercent(window({ usedPct: 31 }), "remaining")).toBe(69);
+    expect(displayPercent(window({ remainingPct: 40 }), "used")).toBe(60);
+    expect(displayPercent(window({ usedPct: 50, remainingPct: 45 }), "remaining")).toBe(45);
+  });
+
+  it("has no percent when the window reports none", () => {
+    expect(displayPercent(window({}), "remaining")).toBeNull();
+  });
+});
+
+describe("formatUsageFreshness", () => {
+  it("says when the report was fetched", () => {
+    expect(formatUsageFreshness("now")).toBe("Updated just now");
+    expect(formatUsageFreshness("3m")).toBe("Updated 3m ago");
+    expect(formatUsageFreshness("Jan 15")).toBe("Updated Jan 15");
+  });
+});
+
+describe("resolveUsageRefresh", () => {
+  it("is pending while a refresh runs, even after an earlier failure", () => {
+    expect(resolveUsageRefresh({ isPending: true, error: new Error("boom") })).toBe("pending");
+  });
+
+  it("is failed after a refresh errors", () => {
+    expect(resolveUsageRefresh({ isPending: false, error: new Error("boom") })).toBe("failed");
+  });
+
+  it("is idle before and after a successful refresh", () => {
+    expect(resolveUsageRefresh({ isPending: false, error: null })).toBe("idle");
+  });
+});
+
+describe("replaceReport", () => {
+  const alpha = entry({ sourceId: "alpha", planLabel: "Old" });
+  const beta = entry({ sourceId: "beta" });
+
+  it("swaps only the refreshed report, in place", () => {
+    const refreshed = entry({ sourceId: "alpha", planLabel: "New" });
+    expect(replaceReport([alpha, beta], alpha.id, refreshed)).toEqual([refreshed, beta]);
+  });
+
+  it("drops a report the daemon no longer knows", () => {
+    expect(replaceReport([alpha, beta], alpha.id, null)).toEqual([beta]);
+  });
+});
+
+describe("upsertReport", () => {
+  const alpha = entry({ sourceId: "alpha", planLabel: "Old" });
+  const beta = entry({ sourceId: "beta" });
+
+  it("starts a list from the first streamed report", () => {
+    expect(upsertReport(undefined, alpha)).toEqual([alpha]);
+  });
+
+  it("appends a report the list does not have yet", () => {
+    expect(upsertReport([alpha], beta)).toEqual([alpha, beta]);
+  });
+
+  it("replaces a report the list already has, in place", () => {
+    const streamed = entry({ sourceId: "alpha", planLabel: "New" });
+    expect(upsertReport([alpha, beta], streamed)).toEqual([streamed, beta]);
+  });
+
+  it("keeps a copy fetched after the streamed one, such as a Refresh that landed first", () => {
+    const refreshed = { ...alpha, planLabel: "Refreshed", fetchedAt: "2026-01-01T00:05:00.000Z" };
+    expect(upsertReport([refreshed, beta], alpha)).toEqual([refreshed, beta]);
+  });
+});
+
+describe("settleReports", () => {
+  const alpha = entry({ sourceId: "alpha", planLabel: "Old" });
+  const beta = entry({ sourceId: "beta" });
+
+  it("takes the finished list, dropping reports the host no longer has", () => {
+    const streamed = entry({ sourceId: "alpha", planLabel: "New" });
+    expect(settleReports([alpha, beta], [streamed])).toEqual([streamed]);
+  });
+
+  it("keeps a report refreshed while the list streamed over its older copy in the list", () => {
+    const refreshed = { ...alpha, planLabel: "Refreshed", fetchedAt: "2026-01-01T00:05:00.000Z" };
+    expect(settleReports([refreshed, beta], [alpha, beta])).toEqual([refreshed, beta]);
+  });
+
+  it("takes the finished list as is when nothing was shown yet", () => {
+    expect(settleReports(undefined, [alpha, beta])).toEqual([alpha, beta]);
+  });
+});
+
+describe("resolveAgentUsageView", () => {
+  const report = entry({ sourceId: "claude" });
+  const idle: UsageQueryState = { data: undefined, error: null, isFetching: false };
+
+  it("shows nothing on a host that cannot report usage", () => {
+    expect(resolveAgentUsageView({ canReport: false, query: idle })).toEqual({ kind: "none" });
+  });
+
+  it("loads until the first report streams in", () => {
+    expect(
+      resolveAgentUsageView({ canReport: true, query: { ...idle, isFetching: true } }),
+    ).toEqual({ kind: "loading" });
+  });
+
+  it("shows each report as it streams in, before the request finishes", () => {
+    expect(
+      resolveAgentUsageView({
+        canReport: true,
+        query: { data: [report], error: null, isFetching: true },
+      }),
+    ).toEqual({ kind: "ready", reports: [report] });
+  });
+
+  it("shows nothing for an agent with no account to report", () => {
+    expect(resolveAgentUsageView({ canReport: true, query: { ...idle, data: [] } })).toEqual({
+      kind: "none",
+    });
+  });
+
+  it("says why a failed request has nothing to show", () => {
+    expect(
+      resolveAgentUsageView({
+        canReport: true,
+        query: { ...idle, error: new Error("Unknown agent") },
+      }),
+    ).toEqual({ kind: "error", message: "Unable to load usage: Unknown agent" });
+  });
+
+  it("says the request failed instead of showing the reports from before it", () => {
+    expect(
+      resolveAgentUsageView({
+        canReport: true,
+        query: { data: [report], error: new Error("Unknown agent"), isFetching: false },
+      }),
+    ).toEqual({ kind: "error", message: "Unable to load usage: Unknown agent" });
+  });
+});
diff --git a/packages/app/src/usage/model.ts b/packages/app/src/usage/model.ts
new file mode 100644
index 0000000000..a32da7ea4d
--- /dev/null
+++ b/packages/app/src/usage/model.ts
@@ -0,0 +1,187 @@
+import { formatCompactTimeAgoAsProse } from "@/utils/time";
+import { usageCopy } from "./copy";
+import type { UsageDisplayAs } from "./preferences";
+import type { UsageReportEntry, UsageView, UsageWindow } from "./types";
+
+export function usedPercent(window: UsageWindow): number | null {
+  if (window.usedPct != null) return window.usedPct;
+  if (window.remainingPct != null) return 100 - window.remainingPct;
+  return null;
+}
+
+/** The percent a window shows under the user's used/remaining preference. */
+export function displayPercent(window: UsageWindow, displayAs: UsageDisplayAs): number | null {
+  if (displayAs === "used") return usedPercent(window);
+  if (window.remainingPct != null) return window.remainingPct;
+  const used = usedPercent(window);
+  return used == null ? null : 100 - used;
+}
+
+/**
+ * A window row's accessible label: what pinning it pins, then what the row shows. The row is a
+ * checkbox, so its checked state says whether it is pinned: "Pin Claude Session, 31% · resets in
+ * 2h", checked.
+ */
+export function usageWindowRowLabel(input: {
+  pinLabel: string;
+  value: string;
+  trailing: string | null | undefined;
+}): string {
+  const summary = input.trailing ? `${input.value} · ${input.trailing}` : input.value;
+  return `${input.pinLabel}, ${summary}`;
+}
+
+/** When a report was fetched, from its compact relative time: "Updated 3m ago". */
+export function formatUsageFreshness(compactTimeAgo: string): string {
+  return `${usageCopy.updated} ${formatCompactTimeAgoAsProse(compactTimeAgo)}`;
+}
+
+/** A user-requested refresh of one report. The previous report stays on screen throughout. */
+export type UsageRefresh = "idle" | "pending" | "failed";
+
+export function resolveUsageRefresh(mutation: {
+  isPending: boolean;
+  error: unknown;
+}): UsageRefresh {
+  if (mutation.isPending) return "pending";
+  if (mutation.error) return "failed";
+  return "idle";
+}
+
+/**
+ * A host's report list with one report swapped for its refreshed copy, in place.
+ * `null` means the daemon no longer knows the ID, so the report leaves the list.
+ */
+export function replaceReport(
+  reports: readonly UsageReportEntry[],
+  reportId: string,
+  refreshed: UsageReportEntry | null,
+): UsageReportEntry[] {
+  if (!refreshed) return reports.filter((report) => report.id !== reportId);
+  return reports.map((report) => (report.id === reportId ? refreshed : report));
+}
+
+/**
+ * The later-fetched of two copies of one report. A list request's copies were fetched when it
+ * started, so a Refresh that lands while it streams is newer than what the request still delivers.
+ */
+function laterFetched(shown: UsageReportEntry, arriving: UsageReportEntry): UsageReportEntry {
+  return Date.parse(shown.fetchedAt) > Date.parse(arriving.fetchedAt) ? shown : arriving;
+}
+
+/**
+ * A report list with one streamed report in place of its previous copy, or appended if new. A
+ * copy fetched after the streamed one stays.
+ */
+export function upsertReport(
+  reports: readonly UsageReportEntry[] | undefined,
+  report: UsageReportEntry,
+): UsageReportEntry[] {
+  if (!reports?.some((entry) => entry.id === report.id)) return [...(reports ?? []), report];
+  return reports.map((entry) => (entry.id === report.id ? laterFetched(entry, report) : entry));
+}
+
+/**
+ * The list a finished request leaves: its reports, dropping any the host no longer has, except
+ * that a copy on screen fetched after the request's copy stays.
+ */
+export function settleReports(
+  shown: readonly UsageReportEntry[] | undefined,
+  finished: readonly UsageReportEntry[],
+): UsageReportEntry[] {
+  return finished.map((report) => {
+    const copy = shown?.find((entry) => entry.id === report.id);
+    return copy ? laterFetched(copy, report) : report;
+  });
+}
+
+export interface UsageQueryState {
+  data: UsageReportEntry[] | undefined;
+  error: unknown;
+  isFetching: boolean;
+}
+
+export function resolveUsageView(input: {
+  hostLabel: string;
+  isConnected: boolean;
+  supportsUsage: boolean;
+  query: UsageQueryState | undefined;
+}): UsageView {
+  const { hostLabel, isConnected, supportsUsage, query } = input;
+  if (!isConnected) return { kind: "unavailable", message: usageCopy.hostUnavailable(hostLabel) };
+  if (!supportsUsage) {
+    return { kind: "unavailable", message: usageCopy.hostUpgradeRequired(hostLabel) };
+  }
+  if (query?.data) {
+    return { kind: "ready", reports: query.data, isRefreshing: query.isFetching };
+  }
+  if (query?.error) {
+    return {
+      kind: "error",
+      message: query.error instanceof Error ? query.error.message : String(query.error),
+    };
+  }
+  return { kind: "loading" };
+}
+
+/** What a meter popover shows of its agent's usage: nothing while the host cannot say. */
+export type AgentUsageView =
+  | { kind: "none" }
+  | { kind: "loading" }
+  | { kind: "error"; message: string }
+  | { kind: "ready"; reports: UsageReportEntry[] };
+
+export function resolveAgentUsageView(input: {
+  canReport: boolean;
+  query: UsageQueryState;
+}): AgentUsageView {
+  const { canReport, query } = input;
+  if (!canReport) return { kind: "none" };
+  // A failed request keeps the reports from before it, or those that streamed in before it failed;
+  // shown alone they would pass for the agent's complete, current usage.
+  if (query.error) {
+    const reason = query.error instanceof Error ? query.error.message : String(query.error);
+    return { kind: "error", message: usageCopy.agentError(reason) };
+  }
+  if (query.data) {
+    return query.data.length === 0 ? { kind: "none" } : { kind: "ready", reports: query.data };
+  }
+  return { kind: "loading" };
+}
+
+export interface UsageHost {
+  serverId: string;
+  label: string;
+  isConnected: boolean;
+  supportsUsage: boolean;
+}
+
+/** Where usage looks for its host: the user's saved pick, then the workspace they are in. */
+export interface UsageHostChoice {
+  pickedServerId: string | null;
+  activeServerId: string | null;
+  hosts: readonly UsageHost[];
+}
+
+/**
+ * The host the sidebar Usage row reads: the picked host, else the active workspace's host, else the
+ * first host. Each only while it is connected and reports usage.
+ */
+export function resolveUsageHostId(choice: UsageHostChoice): string | null {
+  const reporting = choice.hosts.filter((host) => host.isConnected && host.supportsUsage);
+  const find = (serverId: string | null) => reporting.find((host) => host.serverId === serverId);
+  return (
+    (find(choice.pickedServerId) ?? find(choice.activeServerId) ?? reporting[0])?.serverId ?? null
+  );
+}
+
+/**
+ * The host the Usage modal shows: the picked host while it is connected, even one that cannot
+ * report usage so the modal says to update it; else the sidebar row's host; else the first
+ * connected host.
+ */
+export function resolveUsageModalHostId(choice: UsageHostChoice): string | null {
+  const connected = choice.hosts.filter((host) => host.isConnected);
+  const picked = connected.find((host) => host.serverId === choice.pickedServerId);
+  return picked?.serverId ?? resolveUsageHostId(choice) ?? connected[0]?.serverId ?? null;
+}
diff --git a/packages/app/src/usage/options.tsx b/packages/app/src/usage/options.tsx
new file mode 100644
index 0000000000..886c21e190
--- /dev/null
+++ b/packages/app/src/usage/options.tsx
@@ -0,0 +1,70 @@
+import { View } from "react-native";
+import { Settings } from "lucide-react-native";
+import { withUnistyles } from "react-native-unistyles";
+import { DropdownMenu, DropdownMenuContent } from "@/components/ui/dropdown-menu";
+import { extraMutedIconColorMapping } from "@/components/ui/icon-button-chrome";
+import { ToolbarButton, paneContentToolbarIconSize } from "@/components/ui/pane-content-toolbar";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { SettingsRow, SettingsSwitch } from "@/components/settings";
+import { SegmentedControl, type SegmentedControlOption } from "@/components/ui/segmented-control";
+import { settingsStyles } from "@/styles/settings";
+import { usageCopy } from "./copy";
+import { useUsagePreferences } from "./display";
+import { useUsageInSidebar } from "./in-sidebar";
+import type { UsageDisplayAs } from "./preferences";
+
+const DISPLAY_AS_OPTIONS: SegmentedControlOption<UsageDisplayAs>[] = [
+  { value: "used", label: usageCopy.displayUsed, testID: "usage-display-used" },
+  { value: "remaining", label: usageCopy.displayRemaining, testID: "usage-display-remaining" },
+];
+
+const ThemedSettings = withUnistyles(Settings);
+
+/** The shared usage preferences, opened from a cog as a popover or compact sheet. */
+export function UsageOptions() {
+  const compact = useIsCompactFormFactor();
+  const { display } = useUsagePreferences();
+  const { inSidebar, setInSidebar } = useUsageInSidebar();
+  return (
+    <DropdownMenu compactMode="sheet">
+      <ToolbarButton
+        kind="menu"
+        label={usageCopy.options}
+        compact={compact}
+        testID="usage-options-menu"
+      >
+        <ThemedSettings
+          size={paneContentToolbarIconSize(compact)}
+          uniProps={extraMutedIconColorMapping}
+        />
+      </ToolbarButton>
+      <DropdownMenuContent
+        align="end"
+        width={340}
+        sheetTitle={usageCopy.options}
+        testID="usage-options-surface"
+      >
+        <View testID="usage-options-fields">
+          <SettingsSwitch
+            label={usageCopy.showInSidebar}
+            hint={usageCopy.showInSidebarHint}
+            value={inSidebar}
+            onValueChange={setInSidebar}
+            testID="usage-show-in-sidebar"
+          />
+          <View style={settingsStyles.rowBorder}>
+            <SettingsRow label={usageCopy.displayAs}>
+              <SegmentedControl
+                options={DISPLAY_AS_OPTIONS}
+                value={display.displayAs}
+                onValueChange={display.setDisplayAs}
+                size="sm"
+                testID="usage-display-as"
+              />
+            </SettingsRow>
+          </View>
+        </View>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/packages/app/src/usage/pinned.test.ts b/packages/app/src/usage/pinned.test.ts
new file mode 100644
index 0000000000..9965251595
--- /dev/null
+++ b/packages/app/src/usage/pinned.test.ts
@@ -0,0 +1,273 @@
+import { describe, expect, it } from "vitest";
+import type { UsagePreferences } from "./preferences";
+import {
+  choosePinnedUsageLayout,
+  resolvePinnedUsage,
+  type PinnedUsageSource,
+  type PinnedUsageWindow,
+} from "./pinned";
+import type { UsageReportEntry, UsageWindow } from "./types";
+
+function report(input: {
+  sourceId: string;
+  sourceLabel: string;
+  account?: string;
+  icon?: string;
+  windows: UsageWindow[];
+}): UsageReportEntry {
+  return {
+    id: `${input.sourceId}:${input.account ?? "default"}`,
+    account: input.account ? { label: input.account } : {},
+    fetchedAt: "2026-01-01T00:00:00.000Z",
+    sourceId: input.sourceId,
+    sourceLabel: input.sourceLabel,
+    ...(input.icon ? { icon: input.icon } : {}),
+    report: { status: "available", windows: input.windows },
+  };
+}
+
+const claude = report({
+  sourceId: "claude",
+  sourceLabel: "Claude",
+  icon: "<svg/>",
+  windows: [
+    { id: "five-hour", label: "Session", shortLabel: "5h", usedPct: 31 },
+    { id: "weekly", label: "Weekly", shortLabel: "wk", usedPct: 80 },
+  ],
+});
+const codex = report({
+  sourceId: "codex",
+  sourceLabel: "Codex",
+  windows: [{ id: "weekly", label: "Weekly", remainingPct: 88 }],
+});
+
+function windows(reports: UsageReportEntry[], prefs: UsagePreferences): PinnedUsageWindow[] {
+  return resolvePinnedUsage(reports, prefs).flatMap((source) => source.windows);
+}
+
+function preferences(
+  pinned: UsagePreferences["pins"],
+  displayAs: UsagePreferences["displayAs"] = "used",
+): UsagePreferences {
+  return { displayAs, pins: pinned, serverId: null };
+}
+
+describe("choosePinnedUsageLayout", () => {
+  const widths = { labelsWidth: 200, percentsWidth: 120, windowCount: 2 };
+
+  it("shows meters only when every window's meter fits beside the labels", () => {
+    expect(choosePinnedUsageLayout({ ...widths, available: 240 })).toBe("meters");
+    expect(choosePinnedUsageLayout({ ...widths, available: 239 })).toBe("labels");
+  });
+
+  it("drops the labels before it lets the line overflow", () => {
+    expect(choosePinnedUsageLayout({ ...widths, available: 199 })).toBe("percents");
+  });
+
+  it("shows labels until the widths are measured", () => {
+    expect(choosePinnedUsageLayout({ ...widths, available: null })).toBe("labels");
+    expect(choosePinnedUsageLayout({ ...widths, available: 999, labelsWidth: null })).toBe(
+      "labels",
+    );
+  });
+});
+
+describe("resolvePinnedUsage", () => {
+  it("defaults to source-wide pins collected from each account", () => {
+    const work = report({
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      account: "work",
+      windows: [
+        { id: "empty", label: "Empty" },
+        { id: "weekly", label: "Weekly", usedPct: 90 },
+      ],
+    });
+    const empty = report({
+      sourceId: "empty",
+      sourceLabel: "Empty",
+      windows: [{ id: "empty", label: "Empty" }],
+    });
+    expect(
+      windows([claude, codex, work, empty], preferences(null)).map((item) => [
+        item.key,
+        item.percentText,
+      ]),
+    ).toEqual([
+      ["claude:default/five-hour", "31%"],
+      ["claude:default/weekly", "80%"],
+      ["claude:work/weekly", "90%"],
+      ["codex:default/weekly", "12%"],
+    ]);
+  });
+
+  it("pins replace defaults, and removing all pins restores defaults", () => {
+    const reports = [claude, codex];
+    expect(
+      windows(reports, preferences([{ sourceId: "claude", windowId: "weekly" }])).map(
+        (item) => item.key,
+      ),
+    ).toEqual(["claude:default/weekly"]);
+    expect(windows(reports, preferences(null)).map((item) => item.key)).toEqual([
+      "claude:default/five-hour",
+      "codex:default/weekly",
+    ]);
+  });
+
+  it("groups pinned windows by source in report order, not pin order", () => {
+    const work = report({
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      account: "work",
+      windows: [{ id: "weekly", label: "Weekly", usedPct: 90 }],
+    });
+    const sources = resolvePinnedUsage(
+      [claude, codex, work],
+      preferences([
+        { sourceId: "claude", windowId: "weekly" },
+        { sourceId: "codex", windowId: "weekly" },
+        { sourceId: "claude", windowId: "five-hour" },
+      ]),
+    );
+
+    const windowKeys = (source: PinnedUsageSource) => source.windows.map((window) => window.key);
+    expect(sources.map((source) => [source.key, windowKeys(source)])).toEqual([
+      ["claude:default", ["claude:default/five-hour", "claude:default/weekly"]],
+      ["claude:work", ["claude:work/weekly"]],
+      ["codex:default", ["codex:default/weekly"]],
+    ]);
+    expect(sources[0]).toEqual({
+      key: "claude:default",
+      icon: "<svg/>",
+      windows: [
+        {
+          key: "claude:default/five-hour",
+          label: "Claude Session 31% used",
+          shortLabel: "5h",
+          percent: 31,
+          percentText: "31%",
+          tone: "default",
+        },
+        {
+          key: "claude:default/weekly",
+          label: "Claude Weekly 80% used",
+          shortLabel: "wk",
+          percent: 80,
+          percentText: "80%",
+          tone: "warning",
+        },
+      ],
+    });
+  });
+
+  it("names a window by its label when the source gives no short label", () => {
+    const items = windows([codex], preferences([{ sourceId: "codex", windowId: "weekly" }]));
+
+    expect(items.map((item) => item.shortLabel)).toEqual(["Weekly"]);
+  });
+
+  it("defaults to every window the source marks as summary, when it marks any", () => {
+    const marked = report({
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      windows: [
+        { id: "five-hour", label: "Session", shortLabel: "5h", usedPct: 31, summary: true },
+        { id: "weekly", label: "Weekly", shortLabel: "wk", usedPct: 80, summary: true },
+        { id: "weekly-fable", label: "Weekly · Fable", usedPct: 8 },
+      ],
+    });
+
+    expect(windows([marked, codex], preferences(null)).map((item) => item.key)).toEqual([
+      "claude:default/five-hour",
+      "claude:default/weekly",
+      "codex:default/weekly",
+    ]);
+  });
+
+  it("keeps an empty short label empty, for a percent that needs no name", () => {
+    const opencode = report({
+      sourceId: "opencode",
+      sourceLabel: "OpenCode Go",
+      windows: [{ id: "rolling", label: "Rolling", shortLabel: "", usedPct: 21 }],
+    });
+    const items = windows([opencode], preferences(null));
+
+    expect(items.map((item) => item.shortLabel)).toEqual([""]);
+  });
+
+  it("formats the share left when the user reads usage as remaining", () => {
+    const items = windows(
+      [claude, codex],
+      preferences(
+        [
+          { sourceId: "claude", windowId: "five-hour" },
+          { sourceId: "codex", windowId: "weekly" },
+        ],
+        "remaining",
+      ),
+    );
+
+    expect(items.map((item) => item.percentText)).toEqual(["69%", "88%"]);
+    expect(items.map((item) => item.label)).toEqual([
+      "Claude Session 69% left",
+      "Codex Weekly 88% left",
+    ]);
+  });
+
+  it("leaves out a pinned window that no report has, or that reports no percent", () => {
+    const noPercent = report({
+      sourceId: "opencode",
+      sourceLabel: "OpenCode",
+      windows: [{ id: "monthly", label: "Monthly" }],
+    });
+    const items = windows(
+      [claude, noPercent],
+      preferences([
+        { sourceId: "claude", windowId: "monthly" },
+        { sourceId: "codex", windowId: "weekly" },
+        { sourceId: "opencode", windowId: "monthly" },
+      ]),
+    );
+
+    expect(items).toEqual([]);
+  });
+
+  it("shows a pin once per account of the source", () => {
+    const personal = report({
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      account: "personal",
+      windows: [{ id: "five-hour", label: "5-hour", usedPct: 10 }],
+    });
+    const work = report({
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      account: "work",
+      windows: [{ id: "five-hour", label: "5-hour", usedPct: 90 }],
+    });
+    const items = windows(
+      [personal, codex, work],
+      preferences([{ sourceId: "claude", windowId: "five-hour" }]),
+    );
+
+    expect(items.map((item) => [item.label, item.percentText])).toEqual([
+      ["Claude (personal) 5-hour 10% used", "10%"],
+      ["Claude (work) 5-hour 90% used", "90%"],
+    ]);
+  });
+});
+
+it("keeps unavailable and error reports out of the sidebar summary", () => {
+  const expired: UsageReportEntry = {
+    ...claude,
+    report: {
+      status: "unavailable",
+      problem: { kind: "expired", expiresAt: "2026-10-01T00:00:00.000Z", refreshedBy: "claude" },
+    },
+  };
+  const failed: UsageReportEntry = {
+    ...codex,
+    report: { status: "error", error: "Store deleted" },
+  };
+  expect(resolvePinnedUsage([expired, failed], preferences(null))).toEqual([]);
+});
diff --git a/packages/app/src/usage/pinned.ts b/packages/app/src/usage/pinned.ts
new file mode 100644
index 0000000000..547b2c3e48
--- /dev/null
+++ b/packages/app/src/usage/pinned.ts
@@ -0,0 +1,97 @@
+import { formatPct } from "./format";
+import { displayPercent } from "./model";
+import { effectiveUsagePins, type UsagePreferences } from "./preferences";
+import { windowTone } from "./tone";
+import type { UsageReportEntry, UsageTone } from "./types";
+
+/** One summary window of one account, as the sidebar Usage item shows it. */
+export interface PinnedUsageWindow {
+  key: string;
+  /** Accessible description, including the source, account, window and percent meaning. */
+  label: string;
+  /** The window's short name ("5h"), empty for none, or its label when the source sends none. */
+  shortLabel: string;
+  /** The share shown, under the user's used/remaining preference. */
+  percent: number;
+  percentText: string;
+  tone: UsageTone;
+}
+
+/** One account's summary windows, under its source's icon. */
+export interface PinnedUsageSource {
+  key: string;
+  icon: string | null;
+  windows: PinnedUsageWindow[];
+}
+
+/** How much of each window the one-line summary has room for. */
+export type PinnedUsageLayout = "meters" | "labels" | "percents";
+
+// A meter narrower than this is a sliver that reads as noise rather than a share.
+export const MIN_METER_WIDTH = 16;
+/** The space between a meter and its text. */
+export const METER_GAP = 4;
+
+/**
+ * The richest layout that fits on one line: every window's meter, else its short label, else its
+ * percent alone. Meters are all or none; a line never mixes them. Until the widths are known it
+ * shows labels, which never flashes meters that turn out not to fit.
+ */
+export function choosePinnedUsageLayout(input: {
+  available: number | null;
+  labelsWidth: number | null;
+  percentsWidth: number | null;
+  windowCount: number;
+}): PinnedUsageLayout {
+  const { available, labelsWidth, percentsWidth, windowCount } = input;
+  if (available === null || labelsWidth === null || percentsWidth === null) return "labels";
+  if (labelsWidth + windowCount * (MIN_METER_WIDTH + METER_GAP) <= available) return "meters";
+  if (labelsWidth <= available) return "labels";
+  return percentsWidth < labelsWidth ? "percents" : "labels";
+}
+
+function describe(entry: UsageReportEntry, windowLabel: string): string {
+  const account = entry.account.label ? ` (${entry.account.label})` : "";
+  return `${entry.sourceLabel}${account} ${windowLabel}`;
+}
+
+/** Reports with every account of a source together, sources in the order they first appear. */
+function groupBySource(reports: readonly UsageReportEntry[]): UsageReportEntry[] {
+  const sourceIds = [...new Set(reports.map((entry) => entry.sourceId))];
+  return sourceIds.flatMap((sourceId) => reports.filter((entry) => entry.sourceId === sourceId));
+}
+
+/**
+ * The sidebar Usage item's summary: one group per account, grouped by source, each with its
+ * windows in its report's order. Accounts with nothing to show are left out.
+ */
+export function resolvePinnedUsage(
+  reports: readonly UsageReportEntry[],
+  preferences: UsagePreferences,
+): PinnedUsageSource[] {
+  const pins = effectiveUsagePins(preferences, reports);
+  const meaning = preferences.displayAs === "remaining" ? "left" : "used";
+  return groupBySource(reports).flatMap((entry) => {
+    if (entry.report.status !== "available") return [];
+    const windows = entry.report.windows
+      .filter(
+        (window) =>
+          displayPercent(window, preferences.displayAs) !== null &&
+          pins.some((pin) => pin.sourceId === entry.sourceId && pin.windowId === window.id),
+      )
+      .map((window) => {
+        const percent = displayPercent(window, preferences.displayAs) ?? 0;
+        const percentText = formatPct(percent);
+        return {
+          key: `${entry.id}/${window.id}`,
+          label: `${describe(entry, window.label)} ${percentText} ${meaning}`,
+          shortLabel: window.shortLabel ?? window.label,
+          percent,
+          percentText,
+          tone: windowTone(window),
+        };
+      });
+    if (windows.length === 0) return [];
+    return [{ key: entry.id, icon: entry.icon ?? null, windows }];
+  });
+}
diff --git a/packages/app/src/usage/preferences.test.ts b/packages/app/src/usage/preferences.test.ts
new file mode 100644
index 0000000000..43dccc466d
--- /dev/null
+++ b/packages/app/src/usage/preferences.test.ts
@@ -0,0 +1,130 @@
+import { describe, expect, it } from "vitest";
+import {
+  DEFAULT_USAGE_PREFERENCES,
+  isUsagePinned,
+  setUsageDisplayAs,
+  setUsageHost,
+  toggleUsagePin,
+  UsagePreferencesSchema,
+} from "./preferences";
+
+const claudeFiveHour = { sourceId: "claude", windowId: "five-hour" };
+const codexWeekly = { sourceId: "codex", windowId: "weekly" };
+
+describe("usage preferences", () => {
+  it("pins windows in the order the user pins them", () => {
+    const pinned = toggleUsagePin({
+      preferences: toggleUsagePin({
+        preferences: DEFAULT_USAGE_PREFERENCES,
+        pin: codexWeekly,
+        reports: [],
+      }),
+      pin: claudeFiveHour,
+      reports: [],
+    });
+
+    expect(pinned.pins).toEqual([codexWeekly, claudeFiveHour]);
+    expect(isUsagePinned(pinned, { sourceId: "codex", windowId: "weekly" }, [])).toBe(true);
+    expect(isUsagePinned(pinned, { sourceId: "codex", windowId: "five-hour" }, [])).toBe(false);
+  });
+
+  it("unpins a pinned window and keeps the others in order", () => {
+    const three = [codexWeekly, claudeFiveHour, { sourceId: "claude", windowId: "weekly" }];
+    const unpinned = toggleUsagePin({
+      preferences: { displayAs: "used", pins: three, serverId: null },
+      pin: claudeFiveHour,
+      reports: [],
+    });
+
+    expect(unpinned.pins).toEqual([codexWeekly, { sourceId: "claude", windowId: "weekly" }]);
+  });
+
+  it("switches between used and remaining without touching pins", () => {
+    const preferences = { displayAs: "used" as const, pins: [codexWeekly], serverId: null };
+
+    expect(setUsageDisplayAs(preferences, "remaining")).toEqual({
+      displayAs: "remaining",
+      pins: [codexWeekly],
+      serverId: null,
+    });
+  });
+
+  it("remembers the picked host without touching pins", () => {
+    expect(setUsageHost({ ...DEFAULT_USAGE_PREFERENCES, pins: [codexWeekly] }, "server")).toEqual({
+      displayAs: "used",
+      pins: [codexWeekly],
+      serverId: "server",
+    });
+  });
+
+  it("reads preferences saved before hosts could be picked as no pick", () => {
+    expect(UsagePreferencesSchema.parse({ displayAs: "remaining", pinned: [codexWeekly] })).toEqual(
+      { displayAs: "remaining", pins: [codexWeekly], serverId: null },
+    );
+  });
+});
+
+it("default sidebar windows are pinned on cards and the first toggle removes only that row", () => {
+  const reports = [
+    {
+      id: "claude:default",
+      sourceId: "claude",
+      sourceLabel: "Claude",
+      account: {},
+      fetchedAt: "2026-10-02T00:00:00Z",
+      report: {
+        status: "available" as const,
+        windows: [
+          { id: "five_hour", label: "5-hour", summary: true, usedPct: 31 },
+          { id: "weekly", label: "Weekly", summary: true, usedPct: 54 },
+        ],
+      },
+    },
+    {
+      id: "codex:default",
+      sourceId: "codex",
+      sourceLabel: "Codex",
+      account: {},
+      fetchedAt: "2026-10-02T00:00:00Z",
+      report: {
+        status: "available" as const,
+        windows: [{ id: "five_hour", label: "5-hour", summary: true, usedPct: 7 }],
+      },
+    },
+  ];
+  const pins = [
+    { sourceId: "claude", windowId: "five_hour" },
+    { sourceId: "claude", windowId: "weekly" },
+    { sourceId: "codex", windowId: "five_hour" },
+  ];
+  for (const pin of pins) expect(isUsagePinned(DEFAULT_USAGE_PREFERENCES, pin, reports)).toBe(true);
+  const changed = toggleUsagePin({
+    preferences: DEFAULT_USAGE_PREFERENCES,
+    pin: pins[1]!,
+    reports,
+  });
+  expect(isUsagePinned(changed, pins[1]!, reports)).toBe(false);
+  expect(isUsagePinned(changed, pins[0]!, reports)).toBe(true);
+  expect(isUsagePinned(changed, pins[2]!, reports)).toBe(true);
+  const empty = toggleUsagePin({
+    preferences: toggleUsagePin({ preferences: changed, pin: pins[0]!, reports }),
+    pin: pins[2]!,
+    reports,
+  });
+  const restored = UsagePreferencesSchema.parse(JSON.parse(JSON.stringify(empty)));
+  for (const pin of pins) expect(isUsagePinned(restored, pin, reports)).toBe(false);
+});
+
+it("reads old selections without losing display or host and preserves an explicit empty selection", () => {
+  for (const [input, pins] of [
+    [{ pinned: [] }, null],
+    [{ pinned: [codexWeekly] }, [codexWeekly]],
+    [{ pins: [], pinned: [codexWeekly] }, []],
+    [{ pins: null, pinned: [codexWeekly] }, null],
+    [{ pins: "bad", pinned: [codexWeekly] }, null],
+  ] as const) {
+    expect(
+      UsagePreferencesSchema.parse({ displayAs: "remaining", serverId: "host", ...input }),
+    ).toEqual({ displayAs: "remaining", serverId: "host", pins });
+  }
+});
diff --git a/packages/app/src/usage/preferences.ts b/packages/app/src/usage/preferences.ts
new file mode 100644
index 0000000000..e082870af6
--- /dev/null
+++ b/packages/app/src/usage/preferences.ts
@@ -0,0 +1,105 @@
+import { z } from "zod";
+import { displayPercent } from "./model";
+import type { UsageReportEntry } from "./types";
+
+/** Whether percentages read as the share used or the share left. */
+export type UsageDisplayAs = "used" | "remaining";
+
+/** A window the user pinned to the sidebar Usage item. It matches every account of the source. */
+export interface UsagePin {
+  sourceId: string;
+  windowId: string;
+}
+
+/** Device-local. `pins` is in selection order. */
+export interface UsagePreferences {
+  displayAs: UsageDisplayAs;
+  /** null follows source defaults; an array is the user's selection, including none. */
+  pins: UsagePin[] | null;
+  /** The host the user picked to show usage for; null until they pick one. */
+  serverId: string | null;
+}
+
+export const DEFAULT_USAGE_PREFERENCES: UsagePreferences = {
+  displayAs: "used",
+  pins: null,
+  serverId: null,
+};
+
+const pinsSchema = z.array(z.object({ sourceId: z.string(), windowId: z.string() }));
+
+export const UsagePreferencesSchema = z
+  .object({
+    displayAs: z.enum(["used", "remaining"]).catch("used"),
+    pins: pinsSchema.nullable().optional().catch(null),
+    // COMPAT(usagePinSelection): added in v0.11, remove after 2027-04-02.
+    // Old [] meant defaults. Read it only when the new selection is absent.
+    pinned: pinsSchema.optional().catch([]),
+    serverId: z.string().nullable().catch(null),
+  })
+  .transform(({ displayAs, pins, pinned, serverId }): UsagePreferences => {
+    const legacyPins = pinned && pinned.length > 0 ? pinned : null;
+    return { displayAs, pins: pins === undefined ? legacyPins : pins, serverId };
+  })
+  .catch(DEFAULT_USAGE_PREFERENCES);
+
+function samePin(a: UsagePin, b: UsagePin): boolean {
+  return a.sourceId === b.sourceId && a.windowId === b.windowId;
+}
+
+/** The only owner of default and customized pin selection, shared by every usage surface. */
+export function effectiveUsagePins(
+  preferences: UsagePreferences,
+  reports: readonly UsageReportEntry[],
+): UsagePin[] {
+  if (preferences.pins !== null) return preferences.pins;
+  const pins: UsagePin[] = [];
+  for (const entry of reports) {
+    if (entry.report.status !== "available") continue;
+    const withPercent = entry.report.windows.filter(
+      (window) => displayPercent(window, preferences.displayAs) !== null,
+    );
+    const marked = withPercent.filter((window) => window.summary);
+    for (const window of marked.length > 0 ? marked : withPercent.slice(0, 1)) {
+      const pin = { sourceId: entry.sourceId, windowId: window.id };
+      if (!pins.some((existing) => samePin(existing, pin))) pins.push(pin);
+    }
+  }
+  return pins;
+}
+
+export function isUsagePinned(
+  preferences: UsagePreferences,
+  pin: UsagePin,
+  reports: readonly UsageReportEntry[],
+): boolean {
+  return effectiveUsagePins(preferences, reports).some((pinned) => samePin(pinned, pin));
+}
+
+/** The first edit snapshots the displayed defaults before toggling one window. */
+export function toggleUsagePin({
+  preferences,
+  pin,
+  reports,
+}: {
+  preferences: UsagePreferences;
+  pin: UsagePin;
+  reports: readonly UsageReportEntry[];
+}): UsagePreferences {
+  const selected = effectiveUsagePins(preferences, reports);
+  const pins = selected.some((existing) => samePin(existing, pin))
+    ? selected.filter((existing) => !samePin(existing, pin))
+    : [...selected, { sourceId: pin.sourceId, windowId: pin.windowId }];
+  return { ...preferences, pins };
+}
+
+export function setUsageDisplayAs(
+  preferences: UsagePreferences,
+  displayAs: UsageDisplayAs,
+): UsagePreferences {
+  return { ...preferences, displayAs };
+}
+
+export function setUsageHost(preferences: UsagePreferences, serverId: string): UsagePreferences {
+  return { ...preferences, serverId };
+}
diff --git a/packages/app/src/usage/queries.ts b/packages/app/src/usage/queries.ts
new file mode 100644
index 0000000000..7b6f210543
--- /dev/null
+++ b/packages/app/src/usage/queries.ts
@@ -0,0 +1,253 @@
+import { supportsUsageReports } from "@getpaseo/client/internal/daemon-client";
+import { useCallback, useMemo } from "react";
+import {
+  skipToken,
+  useMutation,
+  useQueryClient,
+  type QueryClient,
+  type QueryKey,
+} from "@tanstack/react-query";
+import { useShallow } from "zustand/shallow";
+import { useFetchQuery } from "@/data/query";
+import {
+  getHostRuntimeStore,
+  useHostRuntimeConnectionStatuses,
+  useHostRuntimeIsConnected,
+  useHosts,
+} from "@/runtime/host-runtime";
+import { useSessionStore, type SessionState } from "@/stores/session-store";
+import { usageCopy } from "./copy";
+import {
+  replaceReport,
+  resolveAgentUsageView,
+  resolveUsageRefresh,
+  resolveUsageView,
+  settleReports,
+  type UsageHost,
+  type UsageQueryState,
+  type AgentUsageView,
+  type UsageRefresh,
+  upsertReport,
+} from "./model";
+import type { UsageReportEntry, UsageView } from "./types";
+
+// The daemon caches each report for five minutes, so re-reading it is cheap. Only
+// an explicit refresh passes `forceRefresh` and reaches the source's API.
+const REPORTS_STALE_TIME_MS = 60_000;
+
+/** Every report list of a host: its own and each agent's. */
+function hostUsageQueryKey(serverId: string) {
+  return ["usage", serverId] as const;
+}
+
+function usageReportsQueryKey(serverId: string) {
+  return [...hostUsageQueryKey(serverId), "reports"] as const;
+}
+
+function agentUsageQueryKey(serverId: string, agentId: string) {
+  return [...hostUsageQueryKey(serverId), "agent", agentId] as const;
+}
+
+function requireClient(serverId: string) {
+  const client = getHostRuntimeStore().getClient(serverId);
+  if (!client) throw new Error(usageCopy.clientUnavailable);
+  return client;
+}
+
+/**
+ * Lists a host's reports, or one agent's, writing each into `queryKey` as it streams in so a slow
+ * source never holds back the others. The finished list then replaces the streamed one, dropping
+ * any report the host no longer has, but never a report refreshed while the list streamed.
+ */
+async function streamReports(input: {
+  queryClient: QueryClient;
+  queryKey: QueryKey;
+  serverId: string;
+  agentId?: string;
+  forceRefresh?: boolean;
+  /** Once aborted, reports still on their way are dropped instead of written. */
+  signal?: AbortSignal;
+}): Promise<UsageReportEntry[]> {
+  const { queryClient, queryKey, serverId, agentId, forceRefresh = false, signal } = input;
+  const { reports } = await requireClient(serverId).listUsageReports(
+    { agentId, forceRefresh },
+    (report) => {
+      if (signal?.aborted) return;
+      queryClient.setQueryData<UsageReportEntry[]>(queryKey, (current) =>
+        upsertReport(current, report),
+      );
+    },
+  );
+  return settleReports(queryClient.getQueryData<UsageReportEntry[]>(queryKey), reports);
+}
+
+function listReports(
+  queryClient: QueryClient,
+  serverId: string,
+  forceRefresh = false,
+): Promise<UsageReportEntry[]> {
+  return streamReports({
+    queryClient,
+    queryKey: usageReportsQueryKey(serverId),
+    serverId,
+    forceRefresh,
+  });
+}
+
+async function getReport(
+  serverId: string,
+  reportId: string,
+  forceRefresh = false,
+  agentId?: string,
+): Promise<UsageReportEntry | null> {
+  return (
+    (
+      await requireClient(serverId).listUsageReports(
+        agentId === undefined ? { reportIds: [reportId], forceRefresh } : { agentId, forceRefresh },
+      )
+    ).reports.find((report) => report.id === reportId) ?? null
+  );
+}
+
+function supportsUsage(session: SessionState | undefined): boolean {
+  return supportsUsageReports(session?.serverInfo?.features);
+}
+
+async function refreshReports(queryClient: QueryClient, serverId: string): Promise<void> {
+  await queryClient.fetchQuery({
+    queryKey: usageReportsQueryKey(serverId),
+    queryFn: () => listReports(queryClient, serverId, true),
+    staleTime: 0,
+  });
+}
+
+function toQueryState(query: {
+  data: UsageReportEntry[] | undefined;
+  error: unknown;
+  isFetching: boolean;
+}): UsageQueryState {
+  return { data: query.data, error: query.error, isFetching: query.isFetching };
+}
+
+/** Usage reports for one host, as shown on its settings page. */
+export function useHostUsage(serverId: string): { view: UsageView; refresh: () => void } {
+  const queryClient = useQueryClient();
+  const isConnected = useHostRuntimeIsConnected(serverId);
+  const isSupported = useSessionStore((state) => supportsUsage(state.sessions[serverId]));
+  const query = useFetchQuery({
+    queryKey: usageReportsQueryKey(serverId),
+    queryFn: () => listReports(queryClient, serverId),
+    enabled: isConnected && isSupported,
+    dataShape: "list",
+    staleTimeMs: REPORTS_STALE_TIME_MS,
+  });
+  const refresh = useCallback(() => {
+    void refreshReports(queryClient, serverId).catch(() => undefined);
+  }, [queryClient, serverId]);
+  const hostLabel = useHosts().find((host) => host.serverId === serverId)?.label ?? serverId;
+  const view = resolveUsageView({
+    hostLabel,
+    isConnected,
+    supportsUsage: isSupported,
+    query: toQueryState(query),
+  });
+  return { view, refresh };
+}
+
+const NO_REPORTS: UsageReportEntry[] = [];
+
+/**
+ * The reports of the sidebar's usage host, which is connected and reports usage; none until they
+ * load, or without a host.
+ */
+export function useUsageHostReports(serverId: string | null): UsageReportEntry[] {
+  const queryClient = useQueryClient();
+  const query = useFetchQuery({
+    queryKey: usageReportsQueryKey(serverId ?? ""),
+    queryFn: serverId ? () => listReports(queryClient, serverId) : skipToken,
+    dataShape: "list",
+    staleTimeMs: REPORTS_STALE_TIME_MS,
+  });
+  return query.data ?? NO_REPORTS;
+}
+
+/**
+ * The reports of the account an agent runs under, as its meter's tooltip or sheet shows them.
+ * Fetched while either is mounted, so only while it is open.
+ */
+export function useAgentUsage(serverId: string, agentId: string): AgentUsageView {
+  const queryClient = useQueryClient();
+  const canReport = useHostReportsUsage(serverId);
+  const queryKey = agentUsageQueryKey(serverId, agentId);
+  const query = useFetchQuery({
+    queryKey,
+    // Consuming the signal cancels the request when the details close, so a reopen sends a new
+    // request instead of joining one scoped to the login the agent ran under before.
+    queryFn: ({ signal }) => streamReports({ queryClient, queryKey, serverId, agentId, signal }),
+    enabled: canReport,
+    // Another agent's reports never stand in while this one's load.
+    dataShape: "value",
+    // Dropped as soon as the details close: an agent resumed under another login keeps its ID, so
+    // reports kept from an earlier open could show the old login. The daemon's cache keeps each
+    // open's request cheap.
+    gcTime: 0,
+    // The daemon's errors (an unknown agent) do not heal on retry, and reopening the details
+    // fetches again; retrying would hold the loading sentence for seconds instead.
+    retry: false,
+    staleTimeMs: REPORTS_STALE_TIME_MS,
+  });
+  return resolveAgentUsageView({ canReport, query: toQueryState(query) });
+}
+
+/** Whether a host is connected and reports usage, read without fetching anything. */
+export function useHostReportsUsage(serverId: string): boolean {
+  const isConnected = useHostRuntimeIsConnected(serverId);
+  const isSupported = useSessionStore((state) => supportsUsage(state.sessions[serverId]));
+  return isConnected && isSupported;
+}
+
+/** Every host with whether it is connected and reports usage, in host order. */
+export function useUsageHosts(): UsageHost[] {
+  const hosts = useHosts();
+  const serverIds = useMemo(() => hosts.map((host) => host.serverId), [hosts]);
+  const connectionStatuses = useHostRuntimeConnectionStatuses(serverIds);
+  const supportedServerIds = useSessionStore(
+    useShallow((state) => serverIds.filter((serverId) => supportsUsage(state.sessions[serverId]))),
+  );
+  return useMemo(
+    () =>
+      hosts.map((host) => ({
+        serverId: host.serverId,
+        label: host.label,
+        isConnected: connectionStatuses.get(host.serverId) === "online",
+        supportsUsage: supportedServerIds.includes(host.serverId),
+      })),
+    [connectionStatuses, hosts, supportedServerIds],
+  );
+}
+
+/**
+ * Refreshes a host report, or the agent's session reports. The result replaces the card
+ * in the requesting view. Host and agent views can use different logins of the same account.
+ */
+export function useReportRefresh(
+  serverId: string,
+  reportId: string,
+  agentId?: string,
+): { refresh: () => void; refreshState: UsageRefresh } {
+  const queryClient = useQueryClient();
+  const mutation = useMutation({
+    mutationFn: () => getReport(serverId, reportId, true, agentId),
+    onSuccess: (report) => {
+      queryClient.setQueryData<UsageReportEntry[]>(
+        agentId === undefined
+          ? usageReportsQueryKey(serverId)
+          : agentUsageQueryKey(serverId, agentId),
+        (reports) => (reports ? replaceReport(reports, reportId, report) : reports),
+      );
+    },
+  });
+  const { mutate } = mutation;
+  const refresh = useCallback(() => mutate(), [mutate]);
+  return { refresh, refreshState: resolveUsageRefresh(mutation) };
+}
diff --git a/packages/app/src/usage/refresh-button.tsx b/packages/app/src/usage/refresh-button.tsx
new file mode 100644
index 0000000000..48754c4e19
--- /dev/null
+++ b/packages/app/src/usage/refresh-button.tsx
@@ -0,0 +1,34 @@
+import { RotateCw } from "lucide-react-native";
+import { withUnistyles } from "react-native-unistyles";
+import { extraMutedIconColorMapping } from "@/components/ui/icon-button-chrome";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { ToolbarButton, paneContentToolbarIconSize } from "@/components/ui/pane-content-toolbar";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { usageCopy } from "./copy";
+
+const ThemedRotateCw = withUnistyles(RotateCw);
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+
+/**
+ * Refreshes every report on the host; spins while a refresh is in flight. On compact it sits in the
+ * header's island, so its highlight is round.
+ */
+export function UsageRefreshButton({ busy, onRefresh }: { busy: boolean; onRefresh: () => void }) {
+  const compact = useIsCompactFormFactor();
+  const iconSize = paneContentToolbarIconSize(compact);
+  return (
+    <ToolbarButton
+      label={usageCopy.refreshAll}
+      compact={compact}
+      disabled={busy}
+      onPress={onRefresh}
+      testID="usage-refresh-all"
+    >
+      {busy ? (
+        <ThemedLoadingSpinner size={iconSize} uniProps={extraMutedIconColorMapping} />
+      ) : (
+        <ThemedRotateCw size={iconSize} uniProps={extraMutedIconColorMapping} />
+      )}
+    </ToolbarButton>
+  );
+}
diff --git a/packages/app/src/usage/sidebar-item.tsx b/packages/app/src/usage/sidebar-item.tsx
new file mode 100644
index 0000000000..d90013d8bf
--- /dev/null
+++ b/packages/app/src/usage/sidebar-item.tsx
@@ -0,0 +1,284 @@
+import {
+  createContext,
+  Fragment,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+  type ReactNode,
+} from "react";
+import { useTranslation } from "react-i18next";
+import {
+  Pressable,
+  Text,
+  View,
+  type LayoutChangeEvent,
+  type PressableStateCallbackType,
+} from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { builtinSidebarNavLabelKey } from "@/sidebar-nav/model";
+import { useUsagePreferences } from "./display";
+import { useUsageHostId } from "./hosts";
+import { useUsageHostReports } from "./queries";
+import { UsageSourceIcon } from "./source-icon";
+import { UsageMeter } from "./meter";
+import {
+  choosePinnedUsageLayout,
+  METER_GAP,
+  MIN_METER_WIDTH,
+  resolvePinnedUsage,
+  type PinnedUsageLayout,
+  type PinnedUsageSource,
+} from "./pinned";
+import { UsageModal } from "./usage-modal";
+
+/** Each summary window with data on the usage host, under its source; empty while none has. */
+function useUsageSummary(): readonly PinnedUsageSource[] {
+  const { preferences } = useUsagePreferences();
+  const reports = useUsageHostReports(useUsageHostId());
+  return useMemo(() => resolvePinnedUsage(reports, preferences), [preferences, reports]);
+}
+
+/** Whether the sidebar Usage item has anything to show. */
+export function useHasUsageSummary(): boolean {
+  return useUsageSummary().length > 0;
+}
+
+/**
+ * The sidebar footer's usage entry: each summary window's source icon and percent, and nothing
+ * while no summary window has data, since the footer's Usage icon already opens Usage.
+ * Pressing it opens the Usage modal.
+ */
+export function UsageSidebarItem() {
+  const { t } = useTranslation();
+  const label = t(builtinSidebarNavLabelKey("usage"));
+  const openUsage = useOpenSidebarUsage();
+  const sources = useUsageSummary();
+  if (sources.length === 0) return null;
+  return <PinnedUsageTrigger label={label} sources={sources} onPress={openUsage} />;
+}
+
+const OpenSidebarUsageContext = createContext<(() => void) | null>(null);
+
+/**
+ * One owner for the footer icon and summary: both open the Usage modal over the current screen.
+ * The modal mounts on first open and unmounts once it has finished closing, so its host's reports
+ * load only while it is shown.
+ */
+export function UsageSidebarRoot({ children }: { children: ReactNode }) {
+  const [open, setOpen] = useState(false);
+  const [mounted, setMounted] = useState(false);
+  const openUsage = useCallback(() => {
+    setMounted(true);
+    setOpen(true);
+  }, []);
+  const closeUsage = useCallback(() => setOpen(false), []);
+  const unmountUsage = useCallback(() => setMounted(false), []);
+
+  return (
+    <OpenSidebarUsageContext.Provider value={openUsage}>
+      {children}
+      {mounted ? <UsageModal visible={open} onClose={closeUsage} onDismiss={unmountUsage} /> : null}
+    </OpenSidebarUsageContext.Provider>
+  );
+}
+
+/** Both sidebar entry points send the same open command. */
+export function useOpenSidebarUsage(): () => void {
+  const openUsage = useContext(OpenSidebarUsageContext);
+  if (!openUsage) throw new Error("Sidebar Usage must be inside UsageSidebarRoot.");
+  return openUsage;
+}
+
+function pinnedUsageLabel(label: string, sources: readonly PinnedUsageSource[]): string {
+  const windows = sources.flatMap((source) => source.windows);
+  return `${label}: ${windows.map((window) => window.label).join(", ")}`;
+}
+
+function triggerStyle({ hovered }: PressableStateCallbackType & { hovered?: boolean }) {
+  return hovered ? [styles.trigger, styles.triggerHovered] : styles.trigger;
+}
+
+function layoutWidth(event: LayoutChangeEvent): number {
+  return event.nativeEvent.layout.width;
+}
+
+/**
+ * One line: each account's icon, then per window a meter and "31% 5h". Off-screen copies measure
+ * the line with labels and with percents alone; the richest layout that fits is shown, and what
+ * it leaves out takes no space at all.
+ */
+function PinnedUsageTrigger({
+  label,
+  sources,
+  onPress,
+}: {
+  label: string;
+  sources: readonly PinnedUsageSource[];
+  onPress: () => void;
+}) {
+  const [available, setAvailable] = useState<number | null>(null);
+  const [labelsWidth, setLabelsWidth] = useState<number | null>(null);
+  const [percentsWidth, setPercentsWidth] = useState<number | null>(null);
+  const handleAvailableLayout = useCallback((event: LayoutChangeEvent) => {
+    setAvailable(layoutWidth(event));
+  }, []);
+  const handleLabelsLayout = useCallback((event: LayoutChangeEvent) => {
+    setLabelsWidth(layoutWidth(event));
+  }, []);
+  const handlePercentsLayout = useCallback((event: LayoutChangeEvent) => {
+    setPercentsWidth(layoutWidth(event));
+  }, []);
+  const layout = choosePinnedUsageLayout({
+    available,
+    labelsWidth,
+    percentsWidth,
+    windowCount: sources.reduce((count, source) => count + source.windows.length, 0),
+  });
+  return (
+    <Pressable
+      onPress={onPress}
+      accessibilityRole="button"
+      accessibilityLabel={pinnedUsageLabel(label, sources)}
+      style={triggerStyle}
+      testID="sidebar-usage"
+    >
+      <View style={styles.line} onLayout={handleAvailableLayout}>
+        <PinnedUsageLine sources={sources} layout={layout} />
+      </View>
+      <View
+        style={styles.measure}
+        pointerEvents="none"
+        accessibilityElementsHidden
+        importantForAccessibility="no-hide-descendants"
+        aria-hidden
+      >
+        <View style={styles.measured} onLayout={handleLabelsLayout}>
+          <PinnedUsageLine sources={sources} layout="labels" measuring />
+        </View>
+        <View style={styles.measured} onLayout={handlePercentsLayout}>
+          <PinnedUsageLine sources={sources} layout="percents" measuring />
+        </View>
+      </View>
+    </Pressable>
+  );
+}
+
+/**
+ * The line's items as direct children of one row, so every meter shares the leftover width
+ * equally.
+ */
+function PinnedUsageLine({
+  sources,
+  layout,
+  measuring = false,
+}: {
+  sources: readonly PinnedUsageSource[];
+  layout: PinnedUsageLayout;
+  measuring?: boolean;
+}) {
+  return sources.map((source, sourceIndex) => (
+    <Fragment key={source.key}>
+      <View
+        style={sourceIndex === 0 ? null : styles.sourceGap}
+        testID={measuring ? undefined : "sidebar-usage-source"}
+      >
+        <UsageSourceIcon svg={source.icon} size={14} />
+      </View>
+      {source.windows.map((window, windowIndex) => {
+        const leadStyle = windowIndex === 0 ? styles.iconGap : styles.windowGap;
+        return (
+          <Fragment key={window.key}>
+            {layout === "meters" ? (
+              <View style={[styles.meterSlot, leadStyle]}>
+                <UsageMeter
+                  percent={window.percent}
+                  tone={window.tone}
+                  quiet
+                  style={styles.meter}
+                />
+              </View>
+            ) : null}
+            <Text
+              style={[styles.percent, layout === "meters" ? null : leadStyle]}
+              numberOfLines={1}
+              testID={measuring ? undefined : "sidebar-usage-pinned-window"}
+            >
+              {window.percentText}
+              {layout === "percents" || window.shortLabel === "" ? null : (
+                <Text style={styles.windowLabel}>{` ${window.shortLabel}`}</Text>
+              )}
+            </Text>
+          </Fragment>
+        );
+      })}
+    </Fragment>
+  ));
+}
+
+const styles = StyleSheet.create((theme) => ({
+  trigger: {
+    width: "100%",
+    flexDirection: "row",
+    alignItems: "center",
+    overflow: "hidden",
+    // Same row geometry and leading rail as Add project and the footer icons.
+    minHeight: 28,
+    paddingVertical: theme.spacing[1],
+    paddingHorizontal: theme.spacing[2],
+    borderRadius: theme.borderRadius.lg,
+  },
+  triggerHovered: {
+    backgroundColor: theme.colors.surfaceSidebarHover,
+  },
+  line: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: "row",
+    alignItems: "center",
+    overflow: "hidden",
+  },
+  // Wide enough that nothing inside wraps or shrinks; each child reports its natural width.
+  measure: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    width: 10_000,
+    opacity: 0,
+  },
+  measured: {
+    alignSelf: "flex-start",
+    flexDirection: "row",
+    alignItems: "center",
+  },
+  sourceGap: {
+    marginLeft: theme.spacing[3],
+  },
+  iconGap: {
+    marginLeft: theme.spacing[1.5],
+  },
+  windowGap: {
+    marginLeft: theme.spacing[2],
+  },
+  // Every slot takes an equal share of the leftover width, so the line fills the row.
+  meterSlot: {
+    flexGrow: 1,
+    flexShrink: 1,
+    flexBasis: 0,
+    minWidth: MIN_METER_WIDTH,
+    marginRight: METER_GAP,
+  },
+  meter: {
+    height: 6,
+    borderRadius: 3,
+  },
+  percent: {
+    flexShrink: 0,
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontVariant: ["tabular-nums"],
+  },
+  windowLabel: {
+    color: theme.colors.foregroundMuted,
+  },
+}));
diff --git a/packages/app/src/usage/source-icon.tsx b/packages/app/src/usage/source-icon.tsx
new file mode 100644
index 0000000000..779f42f841
--- /dev/null
+++ b/packages/app/src/usage/source-icon.tsx
@@ -0,0 +1,26 @@
+import { Gauge } from "lucide-react-native";
+import { withUnistyles } from "react-native-unistyles";
+import { SvgIcon } from "@/components/provider-icons";
+import type { Theme } from "@/styles/theme";
+
+function UsageSourceIconBase({
+  svg,
+  size,
+  color = "",
+}: {
+  svg: string | null;
+  size: number;
+  color?: string;
+}) {
+  if (!svg) return <Gauge size={size} color={color} />;
+  return <SvgIcon svg={svg} size={size} color={color} />;
+}
+
+const ThemedUsageSourceIcon = withUnistyles(UsageSourceIconBase);
+
+const mutedIconColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+/** The source's catalog SVG, or a generic gauge when the source ships none. */
+export function UsageSourceIcon({ svg, size }: { svg: string | null; size: number }) {
+  return <ThemedUsageSourceIcon svg={svg} size={size} uniProps={mutedIconColor} />;
+}
diff --git a/packages/app/src/usage/tone.ts b/packages/app/src/usage/tone.ts
new file mode 100644
index 0000000000..d35d836f8b
--- /dev/null
+++ b/packages/app/src/usage/tone.ts
@@ -0,0 +1,12 @@
+import { usedPercent } from "./model";
+import type { UsageTone, UsageWindow } from "./types";
+
+/** The source's tone for a window, or one derived from how much of it is used. */
+export function windowTone(window: UsageWindow): UsageTone {
+  if (window.tone) return window.tone;
+  const usedPct = usedPercent(window);
+  if (usedPct == null) return "default";
+  if (usedPct > 90) return "danger";
+  if (usedPct >= 70) return "warning";
+  return "default";
+}
diff --git a/packages/app/src/usage/types.ts b/packages/app/src/usage/types.ts
new file mode 100644
index 0000000000..58b8e31c98
--- /dev/null
+++ b/packages/app/src/usage/types.ts
@@ -0,0 +1,16 @@
+import type { ProviderUsageTone, UsageReportEntry } from "@getpaseo/protocol/messages";
+
+export type { UsageReportEntry };
+export type UsageReport = UsageReportEntry["report"];
+export type UsageTone = ProviderUsageTone;
+export type AvailableUsageReport = Extract<UsageReport, { status: "available" }>;
+export type UsageWindow = AvailableUsageReport["windows"][number];
+export type UsageBalance = NonNullable<AvailableUsageReport["balances"]>[number];
+export type UsageBalanceUnit = UsageBalance["unit"];
+
+/** What a host's usage surface shows. `unavailable` is a host state, not a failed request. */
+export type UsageView =
+  | { kind: "unavailable"; message: string }
+  | { kind: "loading" }
+  | { kind: "error"; message: string }
+  | { kind: "ready"; reports: UsageReportEntry[]; isRefreshing: boolean };
diff --git a/packages/app/src/usage/usage-modal.tsx b/packages/app/src/usage/usage-modal.tsx
new file mode 100644
index 0000000000..8305c3f878
--- /dev/null
+++ b/packages/app/src/usage/usage-modal.tsx
@@ -0,0 +1,93 @@
+import { useMemo, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { builtinSidebarNavLabelKey } from "@/sidebar-nav/model";
+import { useHostUsageWithControls } from "./controls";
+import { usageCopy } from "./copy";
+import { useUsagePreferences } from "./display";
+import { useUsageHostSelection } from "./hosts";
+import type { UsageHost } from "./model";
+import { UsageBody, UsageMessage } from "./usage-section";
+
+interface UsageModalProps {
+  visible: boolean;
+  onClose: () => void;
+  onDismiss: () => void;
+}
+
+/**
+ * Usage over the current screen: a dialog on wide layouts, a bottom sheet on compact ones. It
+ * shows the usage host's reports with pins, and the host filter, Refresh all, and Settings in its
+ * title row.
+ */
+export function UsageModal(props: UsageModalProps) {
+  const { serverId, connectedHosts, select } = useUsageHostSelection();
+  if (!serverId) {
+    return (
+      <UsageModalFrame {...props}>
+        <UsageMessage text={usageCopy.noHosts} />
+      </UsageModalFrame>
+    );
+  }
+  // Keyed by host so a refresh in flight on one host never shows on another's cards.
+  return (
+    <HostUsageModal
+      key={serverId}
+      {...props}
+      serverId={serverId}
+      hosts={connectedHosts}
+      onSelectHost={select}
+    />
+  );
+}
+
+function HostUsageModal({
+  serverId,
+  hosts,
+  onSelectHost,
+  ...props
+}: UsageModalProps & {
+  serverId: string;
+  hosts: UsageHost[];
+  onSelectHost: (serverId: string) => void;
+}) {
+  const { display } = useUsagePreferences();
+  const hostSelection = useMemo(
+    () => ({ hosts, serverId, onSelect: onSelectHost }),
+    [hosts, onSelectHost, serverId],
+  );
+  const { view, refresh, controls } = useHostUsageWithControls(hostSelection);
+  return (
+    <UsageModalFrame {...props} actions={controls}>
+      <View testID={`usage-host-${serverId}`}>
+        <UsageBody serverId={serverId} view={view} display={display} onRefresh={refresh} />
+      </View>
+    </UsageModalFrame>
+  );
+}
+
+function UsageModalFrame({
+  visible,
+  onClose,
+  onDismiss,
+  actions,
+  children,
+}: UsageModalProps & { actions?: ReactNode; children: ReactNode }) {
+  const { t } = useTranslation();
+  const title = t(builtinSidebarNavLabelKey("usage"));
+  const header = useMemo(() => ({ title, actions }), [actions, title]);
+  return (
+    <AdaptiveModalSheet
+      header={header}
+      visible={visible}
+      onClose={onClose}
+      onDismiss={onDismiss}
+      desktopMaxWidth={640}
+      contextBridge={null}
+      testID="usage-modal"
+    >
+      <View testID="usage-modal-body">{children}</View>
+    </AdaptiveModalSheet>
+  );
+}
diff --git a/packages/app/src/usage/usage-section.tsx b/packages/app/src/usage/usage-section.tsx
new file mode 100644
index 0000000000..ffb40e985d
--- /dev/null
+++ b/packages/app/src/usage/usage-section.tsx
@@ -0,0 +1,95 @@
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { Alert } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { settingsStyles } from "@/styles/settings";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
+import { usageCopy } from "./copy";
+import type { UsageDisplay } from "./display";
+import { UsageControls } from "./controls";
+import { UsageList } from "./list";
+import type { UsageView } from "./types";
+
+export function UsageSection({
+  serverId,
+  title,
+  view,
+  display,
+  onRefresh,
+  testID,
+}: {
+  serverId: string;
+  title: string;
+  view: UsageView;
+  display: UsageDisplay;
+  onRefresh: () => void;
+  testID?: string;
+}) {
+  const trailing = useMemo(
+    () => <UsageControls view={view} onRefresh={onRefresh} />,
+    [onRefresh, view],
+  );
+
+  return (
+    <SettingsSection title={title} testID={testID} trailing={trailing}>
+      <UsageBody serverId={serverId} view={view} display={display} onRefresh={onRefresh} />
+    </SettingsSection>
+  );
+}
+
+/** What a host's usage view shows: its reports, or why there are none. */
+export function UsageBody({
+  serverId,
+  view,
+  display,
+  onRefresh,
+}: {
+  serverId: string;
+  view: UsageView;
+  display: UsageDisplay;
+  onRefresh: () => void;
+}) {
+  if (view.kind === "unavailable") {
+    return <UsageMessage text={view.message} />;
+  }
+
+  if (view.kind === "loading") {
+    return <UsageMessage text={usageCopy.loading} />;
+  }
+
+  if (view.kind === "error") {
+    return (
+      <Alert size="sm" variant="error" title={usageCopy.errorTitle} description={view.message}>
+        <Button variant="outline" size="sm" onPress={onRefresh}>
+          {usageCopy.retry}
+        </Button>
+      </Alert>
+    );
+  }
+
+  if (view.reports.length === 0) {
+    return <UsageMessage text={usageCopy.empty} />;
+  }
+
+  return <UsageList serverId={serverId} reports={view.reports} display={display} />;
+}
+
+export function UsageMessage({ text }: { text: string }) {
+  return (
+    <View style={[settingsStyles.card, styles.emptyCard]}>
+      <Text style={styles.emptyText}>{text}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  emptyCard: {
+    padding: theme.spacing[4],
+    alignItems: "center",
+  },
+  emptyText: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+  },
+}));
diff --git a/packages/app/src/usage/window-bar.tsx b/packages/app/src/usage/window-bar.tsx
new file mode 100644
index 0000000000..5260a1c44b
--- /dev/null
+++ b/packages/app/src/usage/window-bar.tsx
@@ -0,0 +1,219 @@
+import { Pin } from "lucide-react-native";
+import { useMemo } from "react";
+import { Pressable, Text, View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { usageCopy } from "./copy";
+import { formatDisplayPct, formatResetLabel } from "./format";
+import { UsageMeter } from "./meter";
+import { displayPercent, usageWindowRowLabel } from "./model";
+import type { UsageDisplayAs } from "./preferences";
+import { windowTone } from "./tone";
+import type { UsageTone, UsageWindow } from "./types";
+
+// Pinned rows carry the pinned surface; hovering an unpinned row previews it at half strength,
+// so a hover never reads as the selection. Pinned rows do not react to hover.
+function highlightStyle(pinned: boolean, hovered: boolean) {
+  if (pinned) return styles.highlightPinned;
+  return hovered ? styles.highlightHovered : styles.highlightNone;
+}
+
+export function UsageWindowBar({
+  window,
+  displayAs,
+  pinnable,
+  pinned,
+  onTogglePin,
+  pinLabel,
+  pinTestID,
+}: {
+  window: UsageWindow;
+  displayAs: UsageDisplayAs;
+  /** Whether the row pins the window to the sidebar. When false the row is a plain bar. */
+  pinnable: boolean;
+  pinned: boolean;
+  onTogglePin: () => void;
+  /** What the row pins, naming the source and window: "Pin Claude Session". */
+  pinLabel: string;
+  pinTestID: string;
+}) {
+  const shownPct = displayPercent(window, displayAs);
+  const tone = windowTone(window);
+
+  const isAtRisk = window.runsOutAt != null && window.shortfallPct != null;
+  const trailing = isAtRisk
+    ? `runs out ${formatResetLabel(window.runsOutAt)?.replace("resets ", "") ?? ""}`.trim()
+    : formatResetLabel(window.resetsAt);
+
+  const value = shownPct != null ? formatDisplayPct(shownPct, displayAs) : "—";
+  const accessibilityState = useMemo(() => ({ checked: pinned }), [pinned]);
+  const content = {
+    label: window.label,
+    value,
+    trailing,
+    isAtRisk,
+    percent: shownPct ?? 0,
+    tone,
+    pinned,
+  };
+
+  // Same padding as the pinnable row, so bars line up in both modes.
+  if (!pinnable) {
+    return (
+      <View style={styles.row}>
+        <WindowRowContent {...content} highlight={styles.highlightNone} pinnable={false} />
+      </View>
+    );
+  }
+
+  // The whole row pins the window to the sidebar Usage item. Pinned or not, it keeps the same
+  // padding so toggling only changes the background.
+  return (
+    <Pressable
+      onPress={onTogglePin}
+      accessibilityRole="checkbox"
+      accessibilityLabel={usageWindowRowLabel({ pinLabel, value, trailing })}
+      accessibilityState={accessibilityState}
+      aria-checked={pinned}
+      style={styles.row}
+      testID={pinTestID}
+    >
+      {({ hovered }: { hovered?: boolean }) => (
+        <WindowRowContent
+          {...content}
+          highlight={highlightStyle(pinned, Boolean(hovered))}
+          pinnable
+        />
+      )}
+    </Pressable>
+  );
+}
+
+function WindowRowContent({
+  highlight,
+  label,
+  value,
+  trailing,
+  isAtRisk,
+  percent,
+  tone,
+  pinnable,
+  pinned,
+}: {
+  highlight: StyleProp<ViewStyle>;
+  label: string;
+  value: string;
+  trailing: string | null | undefined;
+  isAtRisk: boolean;
+  percent: number;
+  tone: UsageTone;
+  pinnable: boolean;
+  pinned: boolean;
+}) {
+  return (
+    <>
+      <View style={highlight} pointerEvents="none" />
+      <View style={styles.contentRow}>
+        <View style={styles.windowContent}>
+          <View style={styles.labelRow}>
+            <Text style={styles.label} numberOfLines={1}>
+              {label}
+            </Text>
+            <Text style={styles.value}>
+              {value}
+              {trailing ? (
+                <Text style={isAtRisk ? styles.atRisk : styles.reset}>{` · ${trailing}`}</Text>
+              ) : null}
+            </Text>
+          </View>
+          <UsageMeter percent={percent} tone={tone} />
+        </View>
+        {pinnable ? <UsagePinGlyph pinned={pinned} /> : null}
+      </View>
+    </>
+  );
+}
+
+const ThemedPin = withUnistyles(Pin);
+
+function UsagePinGlyph({ pinned }: { pinned: boolean }) {
+  const iconMapping = useMemo(
+    () => (theme: { colors: { foregroundMuted: string } }) => ({
+      color: theme.colors.foregroundMuted,
+      fill: pinned ? theme.colors.foregroundMuted : "none",
+    }),
+    [pinned],
+  );
+  return (
+    <Tooltip delayDuration={300} enabledOnDesktop enabledOnMobile={false}>
+      <TooltipTrigger asChild>
+        <View
+          style={styles.pin}
+          testID={pinned ? "usage-pin-glyph-pinned" : "usage-pin-glyph-unpinned"}
+        >
+          <ThemedPin size={12} uniProps={iconMapping} />
+        </View>
+      </TooltipTrigger>
+      <TooltipContent side="top">
+        <Text style={styles.tooltipText}>{pinned ? usageCopy.unpin : usageCopy.pin}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  contentRow: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
+  windowContent: { flex: 1, gap: 3 },
+  pin: { width: 12, alignItems: "center" },
+  tooltipText: { color: theme.colors.popoverForeground, fontSize: theme.fontSize.sm },
+  row: {
+    gap: 3,
+    // The highlight bleeds into the card padding so the label and bar stay on the card's rail.
+    marginHorizontal: -theme.spacing[2],
+    paddingHorizontal: theme.spacing[2],
+    paddingVertical: theme.spacing[1.5],
+    // Its own stacking context, so the highlight layer paints above the card and below the text.
+    zIndex: 0,
+  },
+  highlightNone: {
+    display: "none",
+  },
+  highlightPinned: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: -1,
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface2,
+  },
+  // The pinned surface at half strength: a separate layer, so the text keeps full opacity.
+  highlightHovered: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: -1,
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface2,
+    opacity: theme.opacity[50],
+  },
+  labelRow: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  label: {
+    flex: 1,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  value: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+  },
+  reset: {
+    color: theme.colors.foregroundMuted,
+    fontWeight: theme.fontWeight.normal,
+  },
+  atRisk: {
+    color: theme.colors.statusDanger,
+    fontWeight: theme.fontWeight.normal,
+  },
+}));
diff --git a/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts b/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
index 3de5188e3b..22eddf8152 100644
--- a/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
+++ b/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
@@ -75,6 +75,49 @@ describe("splitMarkdownBlocks", () => {
     ).toEqual(["Before", "3. Outer three\n\n   7. Inner seven\n   8. Inner eight", "After"]);
   });
 
+  it("keeps a link reference definition with the paragraph that uses it", () => {
+    expect(splitMarkdownBlocks("See the [docs][d].\n\n[d]: https://example.com")).toEqual([
+      "See the [docs][d].\n\n[d]: https://example.com",
+    ]);
+  });
+
+  it("folds a leading definition-only block into the block below it", () => {
+    expect(splitMarkdownBlocks('[d]: https://example.com "Docs"\n\nSee the [docs][d].')).toEqual([
+      '[d]: https://example.com "Docs"\n\nSee the [docs][d].',
+    ]);
+  });
+
+  it("folds several definition lines and several definition blocks into one block", () => {
+    expect(
+      splitMarkdownBlocks(
+        "See [one][a] and [two][b].\n\n[a]: https://example.com/a\n[b]: <https://example.com/b>\n\n[c]: https://example.com/c 'Third'\n\nAfter",
+      ),
+    ).toEqual([
+      "See [one][a] and [two][b].\n\n[a]: https://example.com/a\n[b]: <https://example.com/b>\n\n[c]: https://example.com/c 'Third'",
+      "After",
+    ]);
+  });
+
+  it("recognizes every destination the renderer accepts, including escaped spaces", () => {
+    expect(splitMarkdownBlocks("See [docs].\n\n[docs]: docs\\ folder/readme")).toEqual([
+      "See [docs].\n\n[docs]: docs\\ folder/readme",
+    ]);
+    expect(splitMarkdownBlocks("See [docs].\n\n[docs]: <docs folder/readme> 'Title'")).toEqual([
+      "See [docs].\n\n[docs]: <docs folder/readme> 'Title'",
+    ]);
+  });
+
+  it("leaves a definition-only message as its own block", () => {
+    expect(splitMarkdownBlocks("[d]: https://example.com")).toEqual(["[d]: https://example.com"]);
+  });
+
+  it("does not fold a paragraph that merely starts with a bracketed link", () => {
+    expect(splitMarkdownBlocks("Intro\n\n[Link](https://example.com) and more prose")).toEqual([
+      "Intro",
+      "[Link](https://example.com) and more prose",
+    ]);
+  });
+
   it("treats triple newlines as a split point and filters empty blocks", () => {
     expect(splitMarkdownBlocks("First paragraph\n\n\nSecond paragraph")).toEqual([
       "First paragraph",
diff --git a/packages/app/src/utils/agent-attention.test.ts b/packages/app/src/utils/agent-attention.test.ts
index b9a0d8e6be..ac5a6f84f3 100644
--- a/packages/app/src/utils/agent-attention.test.ts
+++ b/packages/app/src/utils/agent-attention.test.ts
@@ -34,7 +34,7 @@ function createAgent(input: Partial<Agent> & Pick<Agent, "id">): Agent {
     attentionReason: null,
     attentionTimestamp: null,
     ...rest,
-    activeTurn: rest.activeTurn ?? null,
+    turn: rest.turn ?? { phase: "idle", cancellationRequestId: null },
   };
 }
 
diff --git a/packages/app/src/utils/agent-directory-reconciliation.test.ts b/packages/app/src/utils/agent-directory-reconciliation.test.ts
index bf1e0a53ef..85e311345b 100644
--- a/packages/app/src/utils/agent-directory-reconciliation.test.ts
+++ b/packages/app/src/utils/agent-directory-reconciliation.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import type { Agent } from "@/stores/session-store";
 import { reconcileAgentDirectory } from "./agent-directory-reconciliation";
 
 function snapshot(id: string, status: AgentSnapshotPayload["status"]): AgentSnapshotPayload {
@@ -50,28 +49,9 @@ function entry(id: string, status: AgentSnapshotPayload["status"]): FetchAgentsE
   };
 }
 
-function replica(id: string, status: Agent["status"]): Agent {
-  return {
-    ...snapshot(id, status),
-    activeTurn: null,
-    serverId: "server",
-    createdAt: new Date("2026-07-12T10:00:00.000Z"),
-    updatedAt: new Date("2026-07-12T10:00:00.000Z"),
-    lastActivityAt: new Date("2026-07-12T10:00:00.000Z"),
-    lastUserMessageAt: null,
-    attentionTimestamp: null,
-    archivedAt: null,
-    parentAgentId: null,
-  };
-}
-
 describe("agent directory reconciliation", () => {
-  it("reports snapshot-only and buffered running transitions exactly once", () => {
+  it("preserves snapshot and buffered protocol status without interpreting liveness", () => {
     const result = reconcileAgentDirectory({
-      previous: new Map([
-        ["snapshot", replica("snapshot", "running")],
-        ["buffered", replica("buffered", "running")],
-      ]),
       snapshot: [entry("snapshot", "idle"), entry("buffered", "running")],
       deltas: [
         {
@@ -87,8 +67,7 @@ describe("agent directory reconciliation", () => {
       ],
     });
 
-    expect(result.stoppedRunningAgentIds).toEqual(["snapshot", "buffered"]);
-    expect(result.entries.map(({ agent }) => [agent.id, agent.status])).toEqual([
+    expect(result.map(({ agent }) => [agent.id, agent.status])).toEqual([
       ["snapshot", "idle"],
       ["buffered", "idle"],
     ]);
@@ -96,7 +75,6 @@ describe("agent directory reconciliation", () => {
 
   it("preserves ordered upserts and removals received after page one", () => {
     const result = reconcileAgentDirectory({
-      previous: new Map(),
       snapshot: [entry("updated", "idle"), entry("removed", "idle")],
       deltas: [
         {
@@ -108,9 +86,7 @@ describe("agent directory reconciliation", () => {
       ],
     });
 
-    expect(result.entries.map(({ agent }) => [agent.id, agent.title])).toEqual([
-      ["updated", "live"],
-    ]);
+    expect(result.map(({ agent }) => [agent.id, agent.title])).toEqual([["updated", "live"]]);
   });
 
   it("keeps newer page metadata when a stale buffered upsert arrives", () => {
@@ -120,7 +96,6 @@ describe("agent directory reconciliation", () => {
       projectName: "stale project",
     };
     const result = reconcileAgentDirectory({
-      previous: new Map([["agent", replica("agent", "running")]]),
       snapshot: [
         {
           ...entry("agent", "running"),
@@ -145,16 +120,14 @@ describe("agent directory reconciliation", () => {
     });
 
     expect({
-      title: result.entries[0]?.agent.title,
-      status: result.entries[0]?.agent.status,
-      projectName: result.entries[0]?.project.projectName,
-      stopped: result.stoppedRunningAgentIds,
-    }).toEqual({ title: "newer page", status: "running", projectName: "repo", stopped: [] });
+      title: result[0]?.agent.title,
+      status: result[0]?.agent.status,
+      projectName: result[0]?.project.projectName,
+    }).toEqual({ title: "newer page", status: "running", projectName: "repo" });
   });
 
   it("clears a snapshot stop when a newer buffered upsert is running", () => {
     const result = reconcileAgentDirectory({
-      previous: new Map([["agent", replica("agent", "running")]]),
       snapshot: [entry("agent", "idle")],
       deltas: [
         {
@@ -168,13 +141,11 @@ describe("agent directory reconciliation", () => {
       ],
     });
 
-    expect(result.entries[0]?.agent.status).toBe("running");
-    expect(result.stoppedRunningAgentIds).toEqual([]);
+    expect(result[0]?.agent.status).toBe("running");
   });
 
   it("accepts usage from a stale buffered upsert without regressing metadata", () => {
     const result = reconcileAgentDirectory({
-      previous: new Map(),
       snapshot: [
         {
           ...entry("agent", "idle"),
@@ -201,9 +172,9 @@ describe("agent directory reconciliation", () => {
     });
 
     expect({
-      title: result.entries[0]?.agent.title,
-      status: result.entries[0]?.agent.status,
-      usage: result.entries[0]?.agent.lastUsage,
+      title: result[0]?.agent.title,
+      status: result[0]?.agent.status,
+      usage: result[0]?.agent.lastUsage,
     }).toEqual({
       title: "newer page",
       status: "idle",
@@ -213,7 +184,6 @@ describe("agent directory reconciliation", () => {
 
   it("preserves usage when a stale buffered upsert omits it", () => {
     const result = reconcileAgentDirectory({
-      previous: new Map(),
       snapshot: [
         {
           ...entry("agent", "idle"),
@@ -236,6 +206,6 @@ describe("agent directory reconciliation", () => {
       ],
     });
 
-    expect(result.entries[0]?.agent.lastUsage).toEqual({ inputTokens: 10, outputTokens: 5 });
+    expect(result[0]?.agent.lastUsage).toEqual({ inputTokens: 10, outputTokens: 5 });
   });
 });
diff --git a/packages/app/src/utils/agent-directory-reconciliation.ts b/packages/app/src/utils/agent-directory-reconciliation.ts
index 86130f5d2a..fa34f911bd 100644
--- a/packages/app/src/utils/agent-directory-reconciliation.ts
+++ b/packages/app/src/utils/agent-directory-reconciliation.ts
@@ -1,39 +1,20 @@
 import type { FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
-import type { Agent } from "@/stores/session-store";
 import type { AgentDirectoryDelta } from "./agent-directory-sync";
 import { acceptAgentDirectoryUpdate } from "./agent-directory-update-policy";
 
 export function reconcileAgentDirectory(input: {
-  previous: ReadonlyMap<string, Agent>;
   snapshot: FetchAgentsEntry[];
   deltas: readonly AgentDirectoryDelta[];
-}): { entries: FetchAgentsEntry[]; stoppedRunningAgentIds: string[] } {
+}): FetchAgentsEntry[] {
   const entries = new Map(input.snapshot.map((entry) => [entry.agent.id, entry]));
-  const statuses = new Map(Array.from(input.previous, ([id, agent]) => [id, agent.status]));
-  const stoppedRunningAgentIds = new Set<string>();
-
-  for (const entry of input.snapshot) {
-    if (statuses.get(entry.agent.id) === "running" && entry.agent.status !== "running") {
-      stoppedRunningAgentIds.add(entry.agent.id);
-    }
-    statuses.set(entry.agent.id, entry.agent.status);
-  }
 
   for (const delta of input.deltas) {
     if (delta.kind === "remove") {
       entries.delete(delta.agentId);
-      statuses.delete(delta.agentId);
-      stoppedRunningAgentIds.delete(delta.agentId);
       continue;
     }
     const previousEntry = entries.get(delta.agent.id);
     const acceptedAgent = acceptAgentDirectoryUpdate(previousEntry?.agent, delta.agent);
-    if (acceptedAgent.status === "running") {
-      stoppedRunningAgentIds.delete(delta.agent.id);
-    } else if (statuses.get(delta.agent.id) === "running") {
-      stoppedRunningAgentIds.add(delta.agent.id);
-    }
-    statuses.set(delta.agent.id, acceptedAgent.status);
     const previousProject = previousEntry?.project;
     const acceptedProject =
       acceptedAgent === delta.agent ? (delta.project ?? previousProject) : previousProject;
@@ -55,8 +36,5 @@ export function reconcileAgentDirectory(input: {
     });
   }
 
-  return {
-    entries: Array.from(entries.values()),
-    stoppedRunningAgentIds: Array.from(stoppedRunningAgentIds),
-  };
+  return Array.from(entries.values());
 }
diff --git a/packages/app/src/utils/agent-directory-sync.test.ts b/packages/app/src/utils/agent-directory-sync.test.ts
index 71fb4cc350..0362aa56de 100644
--- a/packages/app/src/utils/agent-directory-sync.test.ts
+++ b/packages/app/src/utils/agent-directory-sync.test.ts
@@ -8,7 +8,7 @@ import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { isAgentArchiving, setAgentArchiving } from "@/hooks/use-archive-agent";
 import { queryClient } from "@/data/query-client";
 import { createUserMessage } from "@/types/stream";
-import { applyAgentDirectoryDelta, replaceFetchedAgentDirectory } from "./agent-directory-sync";
+import { AgentStoreProjection } from "@/runtime/directory-sync/internal/agent-store";
 
 function createAgentPayload(
   input: Partial<Omit<AgentSnapshotPayload, "labels">> & {
@@ -79,79 +79,18 @@ function beginPendingSubmission(serverId: string, agentId: string): string {
   return clientMessageId;
 }
 
-function applyAgentStatus(input: {
-  serverId: string;
-  agentId: string;
-  status: AgentSnapshotPayload["status"];
-  updatedAt: string;
-  lastUserMessageAt?: string;
-}): void {
-  const agent = createAgentPayload({
-    id: input.agentId,
-    status: input.status,
-    updatedAt: input.updatedAt,
-    lastUserMessageAt: input.lastUserMessageAt ?? null,
-  });
-  applyAgentDirectoryDelta({
-    serverId: input.serverId,
-    delta: { kind: "upsert", agent, project: createEntry(agent).project },
-  });
-}
-
-describe("turn liveness authority", () => {
-  it("normalizes old-daemon status into the shared activity replica", () => {
-    const serverId = "server-turn-liveness";
-    const agentId = "agent-1";
-    const startedAt = "2026-07-27T10:00:01.000Z";
-    const store = useSessionStore.getState();
-    store.initializeSession(serverId, null as unknown as DaemonClient);
-    applyAgentStatus({ serverId, agentId, status: "idle", updatedAt: startedAt });
-
-    applyAgentStatus({
-      serverId,
-      agentId,
-      status: "running",
-      updatedAt: "2026-07-27T10:00:02.000Z",
-      lastUserMessageAt: startedAt,
-    });
-    expect(store.getSession(serverId)?.agentTurnLiveness.get(agentId)).toEqual({
-      phase: "open",
-      turnId: null,
-      startedAt: new Date(startedAt),
-      cancellationRequestId: null,
-    });
-
-    applyAgentStatus({
-      serverId,
-      agentId,
-      status: "idle",
-      updatedAt: "2026-07-27T10:00:03.000Z",
-    });
-
-    expect(store.getSession(serverId)?.agentTurnLiveness.has(agentId)).toBe(false);
-    store.clearSession(serverId);
-  });
-});
-
 describe("message submission authority", () => {
   it("does not settle a submission from an unrelated running transition", () => {
     const serverId = "server-running-is-not-submission-ack";
     const agentId = "agent-1";
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
-    applyAgentStatus({
-      serverId,
-      agentId,
-      status: "idle",
-      updatedAt: "2026-07-27T10:00:00.000Z",
-    });
     const clientMessageId = beginPendingSubmission(serverId, agentId);
-
-    applyAgentStatus({
-      serverId,
-      agentId,
-      status: "running",
-      updatedAt: "2026-07-27T10:00:01.000Z",
+    const agent = createAgentPayload({ id: agentId, status: "running" });
+    new AgentStoreProjection(serverId).applyDelta({
+      kind: "upsert",
+      agent,
+      project: createEntry(agent).project,
     });
 
     expect(useSessionStore.getState().sessions[serverId]?.messageSubmissions.get(agentId)).toEqual([
@@ -169,12 +108,6 @@ describe("message submission authority", () => {
     const agentId = "agent-1";
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
-    applyAgentStatus({
-      serverId,
-      agentId,
-      status: "idle",
-      updatedAt: "2026-07-27T10:00:00.000Z",
-    });
     const clientMessageId = beginPendingSubmission(serverId, agentId);
     store.setAgentStreamState(serverId, agentId, {
       tail: [
@@ -213,10 +146,9 @@ describe("replaceFetchedAgentDirectory", () => {
     store.initializeSession(serverId, null as unknown as DaemonClient);
     store.setInitializingAgents(serverId, new Map([["agent", true]]));
 
-    replaceFetchedAgentDirectory({
-      serverId,
-      entries: [createEntry(createAgentPayload({ id: "agent" }))],
-    });
+    new AgentStoreProjection(serverId).replaceFetched([
+      createEntry(createAgentPayload({ id: "agent" })),
+    ]);
 
     expect(useSessionStore.getState().sessions[serverId]?.initializingAgents.get("agent")).toBe(
       true,
@@ -229,29 +161,24 @@ describe("replaceFetchedAgentDirectory", () => {
     const store = useSessionStore.getState();
     store.initializeSession(serverId, null as unknown as DaemonClient);
 
-    replaceFetchedAgentDirectory({
-      serverId,
-      entries: [
-        createEntry(
-          createAgentPayload({
-            id: "child-1",
-            labels: { [PARENT_AGENT_ID_LABEL]: "parent-a" },
-          }),
-        ),
-      ],
-    });
+    const projection = new AgentStoreProjection(serverId);
+    projection.replaceFetched([
+      createEntry(
+        createAgentPayload({
+          id: "child-1",
+          labels: { [PARENT_AGENT_ID_LABEL]: "parent-a" },
+        }),
+      ),
+    ]);
 
-    replaceFetchedAgentDirectory({
-      serverId,
-      entries: [
-        createEntry(
-          createAgentPayload({
-            id: "child-1",
-            labels: { [PARENT_AGENT_ID_LABEL]: "parent-b" },
-          }),
-        ),
-      ],
-    });
+    projection.replaceFetched([
+      createEntry(
+        createAgentPayload({
+          id: "child-1",
+          labels: { [PARENT_AGENT_ID_LABEL]: "parent-b" },
+        }),
+      ),
+    ]);
 
     expect(
       useSessionStore.getState().sessions[serverId]?.agents.get("child-1")?.parentAgentId,
@@ -260,55 +187,60 @@ describe("replaceFetchedAgentDirectory", () => {
     store.clearSession(serverId);
   });
 
-  it("removes every replica-owned artifact for a removed agent", () => {
-    const serverId = "server-removal";
-    const agentId = "removed-agent";
-    const store = useSessionStore.getState();
-    store.initializeSession(serverId, null as unknown as DaemonClient);
-    const agent = {
-      ...normalizeAgentSnapshot(createAgentPayload({ id: agentId }), serverId),
-      projectPlacement: null,
-    };
-    store.setAgents(serverId, new Map([[agentId, agent]]));
-    store.setAgentDetails(serverId, new Map([[agentId, agent]]));
-    store.setQueuedMessages(
-      serverId,
-      new Map([[agentId, [{ id: "queued", text: "next", attachments: [] }]]]),
-    );
-    store.setAgentTimelineCursor(
-      serverId,
-      new Map([[agentId, { epoch: "epoch", startSeq: 1, endSeq: 2 }]]),
-    );
-    store.setPendingPermissions(
-      serverId,
-      new Map([["permission", { key: "permission", agentId, request: null as never }]]),
-    );
-    store.setInitializingAgents(serverId, new Map([[agentId, true]]));
-    setAgentArchiving({ queryClient, serverId, agentId, isArchiving: true });
+  it.each(["directory", "entity"] as const)(
+    "cleans removed %s state without invalidating an independent transcript",
+    (kind) => {
+      const serverId = "server-removal";
+      const agentId = "removed-agent";
+      const store = useSessionStore.getState();
+      store.initializeSession(serverId, null as unknown as DaemonClient);
+      const agent = {
+        ...normalizeAgentSnapshot(createAgentPayload({ id: agentId }), serverId),
+        projectPlacement: null,
+      };
+      store.setAgents(serverId, new Map([[agentId, agent]]));
+      store.setAgentDetails(serverId, new Map([[agentId, agent]]));
+      store.setQueuedMessages(
+        serverId,
+        new Map([[agentId, [{ id: "queued", text: "next", attachments: [] }]]]),
+      );
+      store.setAgentTimelineCursor(
+        serverId,
+        new Map([[agentId, { epoch: "epoch", startSeq: 1, endSeq: 2 }]]),
+      );
+      store.setPendingPermissions(
+        serverId,
+        new Map([["permission", { key: "permission", agentId, request: null as never }]]),
+      );
+      store.setInitializingAgents(serverId, new Map([[agentId, true]]));
+      setAgentArchiving({ queryClient, serverId, agentId, isArchiving: true });
 
-    applyAgentDirectoryDelta({ serverId, delta: { kind: "remove", agentId } });
+      const projection = new AgentStoreProjection(serverId);
+      if (kind === "directory") projection.applyDelta({ kind: "remove", agentId });
+      else projection.remove(agentId);
 
-    const session = useSessionStore.getState().sessions[serverId];
-    expect({
-      agents: session?.agents.has(agentId),
-      details: session?.agentDetails.has(agentId),
-      queued: session?.queuedMessages.has(agentId),
-      cursor: session?.agentTimelineCursor.has(agentId),
-      permissions: session?.pendingPermissions.size,
-      initializing: session?.initializingAgents.has(agentId),
-      archivePending: isAgentArchiving({ queryClient, serverId, agentId }),
-    }).toEqual({
-      agents: false,
-      details: false,
-      queued: false,
-      cursor: false,
-      permissions: 0,
-      initializing: false,
-      archivePending: false,
-    });
+      const session = useSessionStore.getState().sessions[serverId];
+      expect({
+        agents: session?.agents.has(agentId),
+        details: session?.agentDetails.has(agentId),
+        queued: session?.queuedMessages.has(agentId),
+        cursor: session?.agentTimelineCursor.has(agentId),
+        permissions: session?.pendingPermissions.size,
+        initializing: session?.initializingAgents.has(agentId),
+        archivePending: isAgentArchiving({ queryClient, serverId, agentId }),
+      }).toEqual({
+        agents: false,
+        details: false,
+        queued: false,
+        cursor: kind === "directory",
+        permissions: 0,
+        initializing: false,
+        archivePending: false,
+      });
 
-    store.clearSession(serverId);
-  });
+      store.clearSession(serverId);
+    },
+  );
 
   it("keeps newer metadata while accepting usage-only updates and legacy workspace ownership", () => {
     const serverId = "server-usage";
@@ -346,28 +278,27 @@ describe("replaceFetchedAgentDirectory", () => {
       lastUsage: { inputTokens: 10, outputTokens: 5 },
       pendingPermissions: [permission("current-permission")],
     });
-    applyAgentDirectoryDelta({
-      serverId,
-      delta: { kind: "upsert", agent: current, project: createEntry(current).project },
+    const projection = new AgentStoreProjection(serverId);
+    projection.applyDelta({
+      kind: "upsert",
+      agent: current,
+      project: createEntry(current).project,
     });
     store.flushAgentLastActivity();
     setAgentArchiving({ queryClient, serverId, agentId, isArchiving: true });
 
-    const staleResult = applyAgentDirectoryDelta({
-      serverId,
-      delta: {
-        kind: "upsert",
-        agent: {
-          ...current,
-          title: "stale",
-          status: "idle",
-          updatedAt: "2026-07-12T10:00:00.000Z",
-          lastUsage: { inputTokens: 20, outputTokens: 8 },
-          pendingPermissions: [permission("stale-permission")],
-          archivedAt: "2026-07-12T10:00:00.000Z",
-        },
-        project: createEntry(current).project,
+    const staleResult = projection.applyDelta({
+      kind: "upsert",
+      agent: {
+        ...current,
+        title: "stale",
+        status: "idle",
+        updatedAt: "2026-07-12T10:00:00.000Z",
+        lastUsage: { inputTokens: 20, outputTokens: 8 },
+        pendingPermissions: [permission("stale-permission")],
+        archivedAt: "2026-07-12T10:00:00.000Z",
       },
+      project: createEntry(current).project,
     });
     store.flushAgentLastActivity();
 
diff --git a/packages/app/src/utils/agent-directory-sync.ts b/packages/app/src/utils/agent-directory-sync.ts
index 2d81158c81..d700a0f510 100644
--- a/packages/app/src/utils/agent-directory-sync.ts
+++ b/packages/app/src/utils/agent-directory-sync.ts
@@ -1,15 +1,8 @@
-import equal from "fast-deep-equal";
 import type { FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
-import { type Agent, useSessionStore } from "@/stores/session-store";
+import type { Agent } from "@/stores/session-store";
 import { derivePendingPermissionKey, normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { resolveProjectPlacement } from "@/utils/project-placement";
 import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
-import { clearArchiveAgentPending } from "@/hooks/use-archive-agent";
-import { queryClient } from "@/data/query-client";
-import { acceptAgentDirectoryUpdate } from "@/utils/agent-directory-update-policy";
-import { buildDraftStoreKey } from "@/stores/draft-keys";
-import { useDraftStore } from "@/stores/draft-store";
-import { getInitDeferred, getInitKey, rejectInitDeferred } from "@/utils/agent-initialization";
 
 type AgentDirectoryFetchEntry = FetchAgentsEntry;
 export type AgentDirectoryDelta = Extract<
@@ -17,128 +10,6 @@ export type AgentDirectoryDelta = Extract<
   { type: "agent_update" }
 >["payload"];
 
-export function applyAgentDirectoryDelta(input: { serverId: string; delta: AgentDirectoryDelta }): {
-  agentId: string;
-  stoppedRunning: boolean;
-} {
-  if (input.delta.kind === "remove") {
-    removeAgentDirectoryReplica(input.serverId, input.delta.agentId);
-    return { agentId: input.delta.agentId, stoppedRunning: false };
-  }
-  return upsertAgentDirectoryReplica(input.serverId, input.delta);
-}
-
-type AgentUpsertDelta = Extract<AgentDirectoryDelta, { kind: "upsert" }>;
-
-function upsertAgentDirectoryReplica(
-  serverId: string,
-  delta: AgentUpsertDelta,
-): { agentId: string; stoppedRunning: boolean } {
-  const normalized = normalizeAgentSnapshot(delta.agent, serverId);
-  const session = useSessionStore.getState().sessions[serverId];
-  const previousAgent =
-    session?.agents.get(normalized.id) ?? session?.agentDetails.get(normalized.id);
-  const legacyWorkspaceId =
-    previousAgent?.workspaceId ??
-    Array.from(session?.workspaces.values() ?? []).find(
-      (workspace) =>
-        session?.serverInfo?.features?.workspaceMultiplicity !== true &&
-        workspace.workspaceDirectory === normalized.cwd,
-    )?.id;
-  const agent: Agent = {
-    ...normalized,
-    workspaceId: normalized.workspaceId ?? legacyWorkspaceId,
-    projectPlacement:
-      resolveProjectPlacement({ projectPlacement: delta.project, cwd: normalized.cwd }) ??
-      previousAgent?.projectPlacement,
-  };
-  const acceptedAgent = upsertAgentReplica(serverId, agent);
-  if (acceptedAgent.archivedAt) {
-    clearArchiveAgentPending({ queryClient, serverId, agentId: acceptedAgent.id });
-  }
-  replaceAgentPendingPermissions(serverId, acceptedAgent);
-  useSessionStore.getState().setAgentLastActivity(acceptedAgent.id, acceptedAgent.lastActivityAt);
-  return {
-    agentId: acceptedAgent.id,
-    stoppedRunning: previousAgent?.status === "running" && acceptedAgent.status !== "running",
-  };
-}
-
-export function upsertAgentReplica(serverId: string, agent: Agent): Agent {
-  let acceptedAgent = agent;
-  useSessionStore.getState().setAgents(serverId, (current) => {
-    const currentAgent = current.get(agent.id);
-    acceptedAgent = acceptAgentDirectoryUpdate(currentAgent, agent);
-    if (acceptedAgent === currentAgent) return current;
-    const next = new Map(current);
-    next.set(agent.id, acceptedAgent);
-    return next;
-  });
-  applyAgentTurnSnapshot(serverId, acceptedAgent);
-  return acceptedAgent;
-}
-
-function applyAgentTurnSnapshot(serverId: string, agent: Agent): void {
-  useSessionStore.getState().applyAgentTurnLiveness(serverId, agent.id, {
-    type: "snapshot",
-    activeTurn: agent.activeTurn,
-  });
-}
-
-export function replaceAgentPendingPermissions(serverId: string, agent: Agent): void {
-  const pendingPermissions = new Map(
-    useSessionStore.getState().sessions[serverId]?.pendingPermissions,
-  );
-  for (const [key, pending] of pendingPermissions) {
-    if (pending.agentId === agent.id) pendingPermissions.delete(key);
-  }
-  for (const request of agent.pendingPermissions) {
-    const key = derivePendingPermissionKey(agent.id, request);
-    pendingPermissions.set(key, { key, agentId: agent.id, request });
-  }
-  useSessionStore.getState().setPendingPermissions(serverId, pendingPermissions);
-}
-
-export function removeAgentDirectoryReplica(serverId: string, agentId: string): void {
-  const store = useSessionStore.getState();
-  clearArchiveAgentPending({ queryClient, serverId, agentId });
-  const removeKey = <T>(current: Map<string, T>): Map<string, T> => {
-    if (!current.has(agentId)) return current;
-    const next = new Map(current);
-    next.delete(agentId);
-    return next;
-  };
-  store.setAgents(serverId, removeKey);
-  store.setAgentDetails(serverId, removeKey);
-  store.setQueuedMessages(serverId, removeKey);
-  store.setAgentTimelineCursor(serverId, removeKey);
-  store.setInitializingAgents(serverId, removeKey);
-  store.setPendingPermissions(serverId, (current) => {
-    const next = new Map(current);
-    for (const [key, pending] of next) {
-      if (pending.agentId === agentId) next.delete(key);
-    }
-    return next.size === current.size ? current : next;
-  });
-  store.setAgentAuthoritativeHistoryApplied(serverId, agentId, false);
-  store.setAgentStreamTail(serverId, removeKey);
-  store.clearAgentStreamHead(serverId, agentId);
-  store.applyAgentTurnLiveness(serverId, agentId, { type: "destructive_close" });
-  useSessionStore.setState((state) => {
-    if (!state.agentLastActivity.has(agentId)) return state;
-    const agentLastActivity = new Map(state.agentLastActivity);
-    agentLastActivity.delete(agentId);
-    return { ...state, agentLastActivity };
-  });
-  useDraftStore.getState().clearDraftInput({
-    draftKey: buildDraftStoreKey({ serverId, agentId }),
-  });
-  const initKey = getInitKey(serverId, agentId);
-  if (getInitDeferred(initKey)) {
-    rejectInitDeferred(initKey, new Error("Agent was removed during initialization"));
-  }
-}
-
 interface PendingPermissionEntry {
   key: string;
   agentId: string;
@@ -175,49 +46,3 @@ export function buildAgentDirectoryState(input: {
 
   return { agents, pendingPermissions };
 }
-
-export function replaceFetchedAgentDirectory(input: {
-  serverId: string;
-  entries: FetchAgentsEntry[];
-}): { agents: Map<string, Agent> } {
-  const { agents: fetchedAgents, pendingPermissions } = buildAgentDirectoryState(input);
-  const store = useSessionStore.getState();
-  for (const agent of fetchedAgents.values()) {
-    if (agent.archivedAt) {
-      clearArchiveAgentPending({ queryClient, serverId: input.serverId, agentId: agent.id });
-    }
-  }
-
-  const currentAgents = store.sessions[input.serverId]?.agents ?? new Map<string, Agent>();
-  const agents = new Map<string, Agent>();
-  for (const [agentId, fetchedAgent] of fetchedAgents) {
-    const current = currentAgents.get(agentId);
-    agents.set(agentId, current && equal(current, fetchedAgent) ? current : fetchedAgent);
-  }
-
-  store.setAgents(input.serverId, agents);
-  for (const agent of agents.values()) {
-    applyAgentTurnSnapshot(input.serverId, agent);
-  }
-  store.setAgentDetails(input.serverId, (prev) => {
-    let next: Map<string, Agent> | null = null;
-    for (const agentId of agents.keys()) {
-      if (!prev.has(agentId)) {
-        continue;
-      }
-      next ??= new Map(prev);
-      next.delete(agentId);
-    }
-    return next ?? prev;
-  });
-
-  const lastActivityByAgentId = new Map<string, Date>();
-  for (const agent of agents.values()) {
-    lastActivityByAgentId.set(agent.id, agent.lastActivityAt);
-  }
-  store.setAgentLastActivityBatch(lastActivityByAgentId);
-
-  store.setPendingPermissions(input.serverId, new Map(pendingPermissions));
-  store.setHasHydratedAgents(input.serverId, true);
-  return { agents };
-}
diff --git a/packages/app/src/utils/agent-grouping.test.ts b/packages/app/src/utils/agent-grouping.test.ts
index 7df88ada97..f380dc1118 100644
--- a/packages/app/src/utils/agent-grouping.test.ts
+++ b/packages/app/src/utils/agent-grouping.test.ts
@@ -10,6 +10,14 @@ function makeAgent(overrides: Partial<AggregatedAgent> = {}): AggregatedAgent {
     serverLabel: (overrides as { serverLabel?: string }).serverLabel ?? "server",
     title: overrides.title ?? null,
     status: overrides.status ?? ("running" as AggregatedAgent["status"]),
+    turn:
+      overrides.turn ??
+      ({
+        phase: "open",
+        turnId: null,
+        startedAt: null,
+        cancellationRequestId: null,
+      } as const),
     lastActivityAt: overrides.lastActivityAt ?? now,
     cwd: overrides.cwd ?? "/tmp/repo",
     provider: overrides.provider ?? ("openai" as AggregatedAgent["provider"]),
@@ -63,6 +71,28 @@ describe("deriveProjectDisplayName", () => {
 });
 
 describe("groupAgents", () => {
+  it("uses turn liveness instead of protocol status for active grouping", () => {
+    const old = new Date("2020-01-01T00:00:00.000Z");
+    const open = makeAgent({ id: "open", status: "idle", lastActivityAt: old });
+    const idle = makeAgent({
+      id: "idle",
+      status: "running",
+      lastActivityAt: old,
+      turn: { phase: "idle", cancellationRequestId: null },
+    });
+
+    const grouped = groupAgents([open, idle]);
+
+    const activeIds = grouped.activeGroups
+      .flatMap((group) => group.agents)
+      .map((agent) => agent.id);
+    const inactiveIds = grouped.inactiveGroups
+      .flatMap((group) => group.agents)
+      .map((agent) => agent.id);
+    expect(activeIds).toEqual(["open"]);
+    expect(inactiveIds).toEqual(["idle"]);
+  });
+
   it("groups active agents by remote URL when available", () => {
     const agents = [
       makeAgent({ id: "a1", cwd: "/Users/me/dev/paseo" }),
diff --git a/packages/app/src/utils/agent-grouping.ts b/packages/app/src/utils/agent-grouping.ts
index a741a81d39..eaca2d1511 100644
--- a/packages/app/src/utils/agent-grouping.ts
+++ b/packages/app/src/utils/agent-grouping.ts
@@ -264,7 +264,9 @@ const MAX_INACTIVE_PER_PROJECT = 5;
  */
 function isAgentTrulyActive(agent: AggregatedAgent): boolean {
   return (
-    agent.status === "running" || agent.requiresAttention || (agent.pendingPermissionCount ?? 0) > 0
+    agent.turn.phase === "open" ||
+    agent.requiresAttention ||
+    (agent.pendingPermissionCount ?? 0) > 0
   );
 }
 
diff --git a/packages/app/src/utils/agent-snapshots.test.ts b/packages/app/src/utils/agent-snapshots.test.ts
index 334e36d9f2..e1be8c5a0c 100644
--- a/packages/app/src/utils/agent-snapshots.test.ts
+++ b/packages/app/src/utils/agent-snapshots.test.ts
@@ -57,15 +57,25 @@ describe("normalizeAgentSnapshot", () => {
           activeTurn: { turnId: "turn-1", startedAt },
         }),
         "server-1",
-      ).activeTurn,
-    ).toEqual({ turnId: "turn-1", startedAt: new Date(startedAt) });
+      ).turn,
+    ).toEqual({
+      phase: "open",
+      turnId: "turn-1",
+      startedAt: new Date(startedAt),
+      cancellationRequestId: null,
+    });
 
     expect(
       normalizeAgentSnapshot(
         createSnapshot({ status: "running", lastUserMessageAt: startedAt }),
         "server-1",
-      ).activeTurn,
-    ).toEqual({ turnId: null, startedAt: new Date(startedAt) });
+      ).turn,
+    ).toEqual({
+      phase: "open",
+      turnId: null,
+      startedAt: new Date(startedAt),
+      cancellationRequestId: null,
+    });
   });
 
   it("derives parentAgentId from the parent label while preserving labels", () => {
diff --git a/packages/app/src/utils/agent-snapshots.ts b/packages/app/src/utils/agent-snapshots.ts
index a035a054a2..c1c70c640e 100644
--- a/packages/app/src/utils/agent-snapshots.ts
+++ b/packages/app/src/utils/agent-snapshots.ts
@@ -1,7 +1,11 @@
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
 import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
 import { getParentAgentIdFromLabels } from "@getpaseo/protocol/agent-labels";
-import type { ActiveTurnIdentity } from "@/timeline/turn-liveness";
+import {
+  TURN_LIVENESS_IDLE,
+  type ActiveTurnIdentity,
+  type TurnLiveness,
+} from "@/timeline/turn-liveness";
 import type { Agent } from "@/stores/session-store";
 
 function normalizeActiveTurn(
@@ -18,13 +22,23 @@ function normalizeActiveTurn(
   return snapshot.status === "running" ? { turnId: null, startedAt: lastUserMessageAt } : null;
 }
 
+function normalizeTurn(
+  snapshot: AgentSnapshotPayload,
+  lastUserMessageAt: Date | null,
+): TurnLiveness {
+  const activeTurn = normalizeActiveTurn(snapshot, lastUserMessageAt);
+  return activeTurn
+    ? { phase: "open", ...activeTurn, cancellationRequestId: null }
+    : TURN_LIVENESS_IDLE;
+}
+
 function projectActiveTurn(agent: Agent): Pick<AgentSnapshotPayload, "activeTurn"> {
-  if (agent.activeTurn === null) return { activeTurn: null };
-  if (agent.activeTurn.turnId === null) return {};
+  if (agent.turn.phase === "idle") return { activeTurn: null };
+  if (agent.turn.turnId === null) return {};
   return {
     activeTurn: {
-      turnId: agent.activeTurn.turnId,
-      startedAt: agent.activeTurn.startedAt?.toISOString() ?? null,
+      turnId: agent.turn.turnId,
+      startedAt: agent.turn.startedAt?.toISOString() ?? null,
     },
   };
 }
@@ -88,14 +102,14 @@ export function normalizeAgentSnapshot(snapshot: AgentSnapshotPayload, serverId:
   // COMPAT(agentTurnIdentity): added in v0.2.6, remove after 2027-01-31 once daemon floor >= v0.2.6.
   // Old daemons expose only status. Normalize that legacy signal once so the rest
   // of the app consumes one activity shape.
-  const activeTurn = normalizeActiveTurn(snapshot, lastUserMessageAt);
+  const turn = normalizeTurn(snapshot, lastUserMessageAt);
 
   return {
     serverId,
     id: snapshot.id,
     provider: snapshot.provider,
     status: snapshot.status,
-    activeTurn,
+    turn,
     createdAt,
     updatedAt,
     lastUserMessageAt,
diff --git a/packages/app/src/utils/assistant-image-metadata.test.ts b/packages/app/src/utils/assistant-image-metadata.test.ts
index d4b99655f2..3ebee656dd 100644
--- a/packages/app/src/utils/assistant-image-metadata.test.ts
+++ b/packages/app/src/utils/assistant-image-metadata.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it } from "vitest";
+import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import {
   clearAssistantImageMetadataCache,
   estimateAssistantMessageHeightFromCache,
@@ -20,25 +21,53 @@ describe("assistant image metadata", () => {
     ).toEqual(["/tmp/paseo.png", "https://example.com/test.png"]);
   });
 
-  it("reuses cached metadata across canonical and raw source keys", () => {
-    setAssistantImageMetadata(
-      {
-        source: "/tmp/paseo-codex-screenshot.png",
-        workspaceRoot: "/workspaces/paseo",
-        serverId: "server-1",
-      },
-      { width: 1200, height: 800 },
-    );
+  it("keeps local image metadata scoped to its server and workspace", () => {
+    const image = {
+      source: "screenshot.png",
+      workspaceRoot: "/workspace/one",
+      serverId: "server-1",
+    };
+    setAssistantImageMetadata(image, { width: 1200, height: 800 });
 
-    expect(
-      getAssistantImageMetadata({
-        source: "/tmp/paseo-codex-screenshot.png",
-      }),
-    ).toEqual({
+    expect(getAssistantImageMetadata({ ...image, workspaceRoot: "/workspace/two" })).toBeNull();
+    expect(getAssistantImageMetadata({ ...image, serverId: "server-2" })).toBeNull();
+    expect(getAssistantImageMetadata({ source: image.source })).toBeNull();
+    expect(getAssistantImageMetadata(image)).toEqual({
       width: 1200,
       height: 800,
       aspectRatio: 1.5,
     });
+
+    setAssistantImageMetadata(
+      { ...image, workspaceRoot: "/workspace/two" },
+      { width: 800, height: 1200 },
+    );
+    expect(getAssistantImageMetadata(image)?.aspectRatio).toBe(1.5);
+    expect(
+      getAssistantImageMetadata({ ...image, workspaceRoot: "/workspace/two" })?.aspectRatio,
+    ).toBe(2 / 3);
+  });
+
+  it("reuses direct image metadata without workspace context", () => {
+    const source = "https://example.com/shared.png";
+    setAssistantImageMetadata(
+      { source, workspaceRoot: "/workspace/one", serverId: "server-1" },
+      { width: 1200, height: 800 },
+    );
+    expect(getAssistantImageMetadata({ source })).toEqual({
+      width: 1200,
+      height: 800,
+      aspectRatio: 1.5,
+    });
+  });
+
+  it("reserves the default image aspect ratio before metadata arrives", () => {
+    expect(
+      estimateAssistantMessageHeightFromCache({
+        markdown: "![Pending](https://example.com/pending.png)",
+        contentMaxWidth: 608,
+      }),
+    ).toBe(464);
   });
 
   it("estimates assistant message height from cached image metadata", () => {
@@ -50,9 +79,10 @@ describe("assistant image metadata", () => {
     );
 
     expect(
-      estimateAssistantMessageHeightFromCache(
-        "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-      ),
+      estimateAssistantMessageHeightFromCache({
+        markdown: "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
     ).toBeGreaterThan(220);
   });
 
@@ -60,8 +90,14 @@ describe("assistant image metadata", () => {
     const source = `data:image/png;base64,${"a".repeat(512)}`;
     setAssistantImageMetadata({ source }, { width: 1200, height: 800 });
 
-    const imageOnlyHeight = estimateAssistantMessageHeightFromCache(`![Screenshot](${source})`);
-    const mixedHeight = estimateAssistantMessageHeightFromCache(`Text\n\n![Screenshot](${source})`);
+    const imageOnlyHeight = estimateAssistantMessageHeightFromCache({
+      markdown: `![Screenshot](${source})`,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+    });
+    const mixedHeight = estimateAssistantMessageHeightFromCache({
+      markdown: `Text\n\n![Screenshot](${source})`,
+      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+    });
 
     expect(imageOnlyHeight).toBeGreaterThan(220);
     expect(mixedHeight).toBeGreaterThan(imageOnlyHeight ?? 0);
diff --git a/packages/app/src/utils/assistant-image-metadata.ts b/packages/app/src/utils/assistant-image-metadata.ts
index 9f6e159b0d..ac7bd217b2 100644
--- a/packages/app/src/utils/assistant-image-metadata.ts
+++ b/packages/app/src/utils/assistant-image-metadata.ts
@@ -1,7 +1,11 @@
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
 import { createImageSourceCacheKey } from "@/attachments/utils";
 
+export interface AssistantImageContext {
+  serverId?: string;
+  workspaceRoot?: string;
+}
+
 export interface AssistantImageMetadata {
   width: number;
   height: number;
@@ -14,7 +18,8 @@ const ASSISTANT_IMAGE_METADATA_CACHE_LIMIT = 500;
 const ASSISTANT_IMAGE_PARSE_CACHE_LIMIT = 500;
 
 const MARKDOWN_IMAGE_PATTERN = /!\[[^\]]*]\((<[^>]+>|[^)\n]+)\)/g;
-const ASSISTANT_IMAGE_ESTIMATE_WIDTH = MAX_CONTENT_WIDTH - 8;
+export const ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO = 3 / 2;
+const ASSISTANT_IMAGE_INSET = 8;
 const ASSISTANT_IMAGE_MIN_HEIGHT = 160;
 const ASSISTANT_IMAGE_BLOCK_GAP = 24;
 const ASSISTANT_MESSAGE_BASE_HEIGHT = 96;
@@ -66,15 +71,9 @@ function parseAssistantImageMarkdown(markdown: string): {
   };
 }
 
-function createSourceAliasKey(source: string): string {
-  return `source:${createImageSourceCacheKey(source)}`;
-}
-
-function createResolutionKey(input: {
-  source: string;
-  workspaceRoot?: string;
-  serverId?: string;
-}): string | null {
+function getAssistantImageMetadataKey(
+  input: AssistantImageContext & { source: string },
+): string | null {
   const resolution = resolveAssistantImageSource({
     source: input.source,
     workspaceRoot: input.workspaceRoot,
@@ -85,53 +84,28 @@ function createResolutionKey(input: {
   if (resolution.kind === "direct") {
     return `direct:${createImageSourceCacheKey(resolution.uri)}`;
   }
-  return `file:${input.serverId ?? "unknown-server"}:${resolution.cwd}:${resolution.path}`;
+  // A file path identifies an image only within its daemon and workspace.
+  // Callers without that context must use the default aspect ratio.
+  if (!input.serverId) {
+    return null;
+  }
+  return JSON.stringify(["file", input.serverId, resolution.cwd, resolution.path]);
 }
 
-function getAssistantImageMetadataKeys(input: {
-  source: string;
-  workspaceRoot?: string;
-  serverId?: string;
-}): string[] {
-  const source = input.source.trim();
-  if (!source) {
-    return [];
+export function getAssistantImageMetadata(
+  input: AssistantImageContext & { source: string },
+): AssistantImageMetadata | null {
+  const key = getAssistantImageMetadataKey(input);
+  const metadata = key ? assistantImageMetadataCache.get(key) : undefined;
+  if (!key || !metadata) {
+    return null;
   }
-
-  const keys = [createSourceAliasKey(source)];
-  const resolutionKey = createResolutionKey(input);
-  if (resolutionKey) {
-    keys.unshift(resolutionKey);
-  }
-  return [...new Set(keys)];
-}
-
-export function getAssistantImageMetadata(input: {
-  source: string;
-  workspaceRoot?: string;
-  serverId?: string;
-}): AssistantImageMetadata | null {
-  for (const key of getAssistantImageMetadataKeys(input)) {
-    const metadata = assistantImageMetadataCache.get(key);
-    if (metadata) {
-      touchCacheEntry(
-        assistantImageMetadataCache,
-        key,
-        metadata,
-        ASSISTANT_IMAGE_METADATA_CACHE_LIMIT,
-      );
-      return metadata;
-    }
-  }
-  return null;
+  touchCacheEntry(assistantImageMetadataCache, key, metadata, ASSISTANT_IMAGE_METADATA_CACHE_LIMIT);
+  return metadata;
 }
 
 export function setAssistantImageMetadata(
-  input: {
-    source: string;
-    workspaceRoot?: string;
-    serverId?: string;
-  },
+  input: AssistantImageContext & { source: string },
   dimensions: { width: number; height: number },
 ): AssistantImageMetadata | null {
   const { width, height } = dimensions;
@@ -145,7 +119,8 @@ export function setAssistantImageMetadata(
     aspectRatio: width / height,
   };
 
-  for (const key of getAssistantImageMetadataKeys(input)) {
+  const key = getAssistantImageMetadataKey(input);
+  if (key) {
     touchCacheEntry(
       assistantImageMetadataCache,
       key,
@@ -177,25 +152,31 @@ export function extractAssistantImageSources(markdown: string): string[] {
   return parsed.sources;
 }
 
-export function estimateAssistantMessageHeightFromCache(markdown: string): number | null {
+export interface AssistantMessageHeightEstimateInput {
+  markdown: string;
+  contentMaxWidth: number;
+  imageContext?: AssistantImageContext;
+}
+
+export function estimateAssistantMessageHeightFromCache({
+  markdown,
+  contentMaxWidth,
+  imageContext,
+}: AssistantMessageHeightEstimateInput): number | null {
   const parsed = assistantImageParseCache.get(markdown) ?? parseAssistantImageMarkdown(markdown);
   if (parsed.sources.length === 0) {
     return null;
   }
 
-  const knownHeights = parsed.sources
-    .map((source) => getAssistantImageMetadata({ source }))
-    .filter((metadata): metadata is AssistantImageMetadata => metadata !== null)
-    .map((metadata) =>
-      Math.max(
-        ASSISTANT_IMAGE_MIN_HEIGHT,
-        Math.round(ASSISTANT_IMAGE_ESTIMATE_WIDTH / metadata.aspectRatio),
-      ),
+  const imageHeights = parsed.sources.map((source) => {
+    const aspectRatio =
+      getAssistantImageMetadata({ source, ...imageContext })?.aspectRatio ??
+      ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO;
+    return Math.max(
+      ASSISTANT_IMAGE_MIN_HEIGHT,
+      Math.round((contentMaxWidth - ASSISTANT_IMAGE_INSET) / aspectRatio),
     );
-
-  if (knownHeights.length === 0) {
-    return null;
-  }
+  });
 
   const baseHeight = parsed.hasNonImageText
     ? ASSISTANT_MESSAGE_BASE_HEIGHT
@@ -203,8 +184,8 @@ export function estimateAssistantMessageHeightFromCache(markdown: string): numbe
 
   const estimatedHeight =
     baseHeight +
-    knownHeights.reduce((sum, height) => sum + height, 0) +
-    ASSISTANT_IMAGE_BLOCK_GAP * knownHeights.length;
+    imageHeights.reduce((sum, height) => sum + height, 0) +
+    ASSISTANT_IMAGE_BLOCK_GAP * imageHeights.length;
 
   return Math.max(ASSISTANT_MESSAGE_MIN_HEIGHT, estimatedHeight);
 }
diff --git a/packages/app/src/utils/assistant-markdown-parser.test.ts b/packages/app/src/utils/assistant-markdown-parser.test.ts
index 70d806a1fb..05b1366e1c 100644
--- a/packages/app/src/utils/assistant-markdown-parser.test.ts
+++ b/packages/app/src/utils/assistant-markdown-parser.test.ts
@@ -2,6 +2,147 @@ import { describe, expect, it } from "vitest";
 import { createAssistantMarkdownParser } from "./assistant-markdown-parser";
 
 describe("createAssistantMarkdownParser", () => {
+  it("keeps bold text bold through every partial closing marker", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+
+    for (const source of ["**bold", "**bold*", "**bold**"]) {
+      expect(parser.renderInline(source)).toBe("<strong>bold</strong>");
+    }
+  });
+
+  it("shows the growing link label and only links a complete destination", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    const source = "[docs](https://example.com/path)";
+    for (let length = 1; length < source.length; length++) {
+      expect(parser.renderInline(source.slice(0, length))).toBe(
+        "docs".slice(0, Math.max(0, length - 1)),
+      );
+    }
+    expect(parser.renderInline(source)).toBe('<a href="https://example.com/path">docs</a>');
+  });
+
+  it.each([
+    ["**", "strong"],
+    ["__", "strong"],
+    ["*", "em"],
+    ["_", "em"],
+    ["~~", "s"],
+    ["`", "code"],
+    ["``", "code"],
+  ])("keeps %s formatting stable as text and closing markers arrive", (marker, tag) => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    for (let length = 1; length <= 4; length++) {
+      expect(parser.renderInline(marker + "text".slice(0, length))).toBe(
+        `<${tag}>${"text".slice(0, length)}</${tag}>`,
+      );
+    }
+    for (let length = 0; length <= marker.length; length++) {
+      expect(parser.renderInline(marker + "text" + marker.slice(0, length))).toBe(
+        `<${tag}>text</${tag}>`,
+      );
+    }
+  });
+
+  it("keeps combined and nested emphasis stable through closing markers", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    for (const closing of ["", "*", "**", "***"]) {
+      expect(parser.renderInline("***both" + closing)).toBe("<em><strong>both</strong></em>");
+    }
+    expect(parser.renderInline("**bold and *italic")).toBe(
+      "<strong>bold and <em>italic</em></strong>",
+    );
+    expect(parser.renderInline("*italic and **bold")).toBe(
+      "<em>italic and <strong>bold</strong></em>",
+    );
+  });
+
+  it.each(["*", "**", "***", "_", "__", "~~", "`", "``"])(
+    "hides an opening %s while waiting for its text",
+    (marker) => {
+      expect(
+        createAssistantMarkdownParser({ streaming: true }).renderInline("hello " + marker),
+      ).toBe("hello ");
+    },
+  );
+
+  it.each([
+    "[docs](https://example.com/a(b)c)",
+    '[docs](https://example.com "a title)")',
+    "[docs](<https://example.com/a(b)>)",
+    "[docs](file:///tmp/example.ts)",
+  ])("waits for the entire destination of %s", (source) => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    for (let length = 6; length < source.length; length++) {
+      expect(parser.renderInline(source.slice(0, length))).toBe("docs");
+    }
+    expect(parser.renderInline(source)).toBe(createAssistantMarkdownParser().renderInline(source));
+  });
+
+  it("preserves formatting in incomplete labels and around incomplete links", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    expect(parser.renderInline("[**bold")).toBe("<strong>bold</strong>");
+    expect(parser.renderInline("[**bold**](https://exam")).toBe("<strong>bold</strong>");
+    expect(parser.renderInline("**see [docs](https://exam")).toBe("<strong>see docs</strong>");
+  });
+
+  it("does not auto-link a URL label before the destination is complete", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    expect(parser.renderInline("Read [example.com](https://exam")).toBe("Read example.com");
+    expect(parser.renderInline("Read [example.com](https://example.org)")).toBe(
+      'Read <a href="https://example.org">example.com</a>',
+    );
+  });
+
+  it.each([
+    "\\*literal",
+    "\\[literal",
+    "some_identifier",
+    "some__identifier",
+    "`**literal [link](url`",
+    "``a ` b``",
+    "**already closed** after",
+    "[bad](javascript:alert(1))",
+    "<component",
+    "$$price",
+    "20~25",
+  ])("preserves literal and complete inline text: %s", (source) => {
+    expect(createAssistantMarkdownParser({ streaming: true }).renderInline(source)).toBe(
+      createAssistantMarkdownParser().renderInline(source),
+    );
+  });
+
+  it.each([
+    "```md\n**literal [link](url",
+    "~~~md\n**literal [link](url",
+    "    **literal [link](url",
+    "**earlier\n\nplain tail",
+    "- **earlier\n- plain tail",
+  ])("leaves literal code and earlier blocks alone: %s", (source) => {
+    expect(createAssistantMarkdownParser({ streaming: true }).render(source)).toBe(
+      createAssistantMarkdownParser().render(source),
+    );
+  });
+
+  it("completes inline formatting inside the final list item", () => {
+    expect(createAssistantMarkdownParser({ streaming: true }).render("- first\n- **bold")).toBe(
+      "<ul>\n<li>first</li>\n<li><strong>bold</strong></li>\n</ul>\n",
+    );
+  });
+
+  it("hides incomplete images until their source is complete", () => {
+    const parser = createAssistantMarkdownParser({ streaming: true });
+    expect(parser.renderInline("before ![alt](https://exam")).toBe("before ");
+    expect(parser.renderInline("before ![alt](https://example.com/image.png)")).toBe(
+      'before <img src="https://example.com/image.png" alt="alt">',
+    );
+  });
+
+  it("keeps ordinary parsing for completed messages", () => {
+    const parser = createAssistantMarkdownParser();
+    expect(parser.renderInline("**unfinished")).toBe("**unfinished");
+    expect(parser.renderInline("[unfinished")).toBe("[unfinished");
+  });
+
   it("renders agent text verbatim", () => {
     const parser = createAssistantMarkdownParser();
 
diff --git a/packages/app/src/utils/assistant-markdown-parser.ts b/packages/app/src/utils/assistant-markdown-parser.ts
index 5e64fb629f..e1e8f6f38a 100644
--- a/packages/app/src/utils/assistant-markdown-parser.ts
+++ b/packages/app/src/utils/assistant-markdown-parser.ts
@@ -1,7 +1,8 @@
 import type MarkdownIt from "markdown-it";
 import { createMarkdownParser } from "@/utils/markdown-parser";
+import { enableStreamingMarkdown } from "@/utils/streaming-markdown";
 
-export function createAssistantMarkdownParser(): MarkdownIt {
+export function createAssistantMarkdownParser({ streaming = false } = {}): MarkdownIt {
   const parser = createMarkdownParser({ linkify: true });
   const defaultValidateLink = parser.validateLink.bind(parser);
 
@@ -10,5 +11,9 @@ export function createAssistantMarkdownParser(): MarkdownIt {
   parser.validateLink = (url: string) =>
     url.trim().toLowerCase().startsWith("file://") || defaultValidateLink(url);
 
+  if (streaming) {
+    enableStreamingMarkdown(parser);
+  }
+
   return parser;
 }
diff --git a/packages/app/src/utils/assistant-message-height-estimate.test.ts b/packages/app/src/utils/assistant-message-height-estimate.test.ts
index 7c6822723c..d4e3a2ff94 100644
--- a/packages/app/src/utils/assistant-message-height-estimate.test.ts
+++ b/packages/app/src/utils/assistant-message-height-estimate.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it } from "vitest";
+import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import {
   clearAssistantMessageHeightEstimateCache,
   estimateAssistantMessageHeightFromCache,
@@ -27,7 +28,29 @@ describe("assistant message height estimate", () => {
       height: 41.1,
     });
 
-    expect(estimateAssistantMessageHeightFromCache("First paragraph\n\nSecond paragraph")).toBe(97);
+    expect(
+      estimateAssistantMessageHeightFromCache({
+        markdown: "First paragraph\n\nSecond paragraph",
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
+    ).toBe(97);
+  });
+
+  it("reads block heights measured at the configured content width", () => {
+    setAssistantMarkdownBlockHeight({ block: "Wide paragraph", width: 1584, height: 20 });
+
+    expect(
+      estimateAssistantMessageHeightFromCache({
+        markdown: "Wide paragraph",
+        contentMaxWidth: 1600,
+      }),
+    ).toBe(44);
+    expect(
+      estimateAssistantMessageHeightFromCache({
+        markdown: "Wide paragraph",
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
+    ).toBeNull();
   });
 
   it("falls back to image metadata when markdown blocks are not measured", () => {
@@ -39,9 +62,10 @@ describe("assistant message height estimate", () => {
     );
 
     expect(
-      estimateAssistantMessageHeightFromCache(
-        "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-      ),
+      estimateAssistantMessageHeightFromCache({
+        markdown: "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
+        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+      }),
     ).toBeGreaterThan(220);
   });
 });
diff --git a/packages/app/src/utils/assistant-message-height-estimate.ts b/packages/app/src/utils/assistant-message-height-estimate.ts
index 05d702fb41..02e153e0bb 100644
--- a/packages/app/src/utils/assistant-message-height-estimate.ts
+++ b/packages/app/src/utils/assistant-message-height-estimate.ts
@@ -1,9 +1,11 @@
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
-import { estimateAssistantMessageHeightFromCache as estimateAssistantImageMessageHeightFromCache } from "@/utils/assistant-image-metadata";
+import {
+  type AssistantMessageHeightEstimateInput,
+  estimateAssistantMessageHeightFromCache as estimateAssistantImageMessageHeightFromCache,
+} from "@/utils/assistant-image-metadata";
 import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
 
 const ASSISTANT_MARKDOWN_BLOCK_HEIGHT_CACHE_LIMIT = 1000;
-const ASSISTANT_MARKDOWN_BLOCK_ESTIMATE_WIDTH = MAX_CONTENT_WIDTH - 16;
+const ASSISTANT_MARKDOWN_BLOCK_INSET = 16;
 const ASSISTANT_MESSAGE_VERTICAL_PADDING = 24;
 const ASSISTANT_MARKDOWN_BLOCK_GAP = 12;
 
@@ -78,7 +80,10 @@ export function setAssistantMarkdownBlockHeight(input: {
   return height;
 }
 
-function estimateAssistantMarkdownBlockHeightFromCache(markdown: string): number | null {
+function estimateAssistantMarkdownBlockHeightFromCache(
+  markdown: string,
+  contentMaxWidth: number,
+): number | null {
   const blocks = splitMarkdownBlocks(markdown);
   if (blocks.length === 0) {
     return null;
@@ -88,7 +93,7 @@ function estimateAssistantMarkdownBlockHeightFromCache(markdown: string): number
   for (const block of blocks) {
     const key = createMarkdownBlockHeightKey({
       block,
-      width: ASSISTANT_MARKDOWN_BLOCK_ESTIMATE_WIDTH,
+      width: contentMaxWidth - ASSISTANT_MARKDOWN_BLOCK_INSET,
     });
     const cachedHeight = key ? assistantMarkdownBlockHeightCache.get(key) : undefined;
     if (cachedHeight === undefined) {
@@ -104,10 +109,14 @@ function estimateAssistantMarkdownBlockHeightFromCache(markdown: string): number
   );
 }
 
-export function estimateAssistantMessageHeightFromCache(markdown: string): number | null {
+export function estimateAssistantMessageHeightFromCache({
+  markdown,
+  contentMaxWidth,
+  imageContext,
+}: AssistantMessageHeightEstimateInput): number | null {
   return (
-    estimateAssistantMarkdownBlockHeightFromCache(markdown) ??
-    estimateAssistantImageMessageHeightFromCache(markdown)
+    estimateAssistantMarkdownBlockHeightFromCache(markdown, contentMaxWidth) ??
+    estimateAssistantImageMessageHeightFromCache({ markdown, contentMaxWidth, imageContext })
   );
 }
 
diff --git a/packages/app/src/utils/daemon-endpoints.ts b/packages/app/src/utils/daemon-endpoints.ts
index 599f7d5f43..f2b78b4e57 100644
--- a/packages/app/src/utils/daemon-endpoints.ts
+++ b/packages/app/src/utils/daemon-endpoints.ts
@@ -5,6 +5,8 @@ import {
   extractHostPortFromWebSocketUrl,
   normalizeHostPort,
   parseConnectionUri,
+  parseRelayConnectionUri,
+  serializeRelayConnectionUri,
   parseHostPort,
   serializeConnectionUri,
   serializeConnectionUriForStorage,
@@ -22,6 +24,8 @@ export {
   extractHostPortFromWebSocketUrl,
   normalizeHostPort,
   parseConnectionUri,
+  parseRelayConnectionUri,
+  serializeRelayConnectionUri,
   parseHostPort,
   serializeConnectionUri,
   serializeConnectionUriForStorage,
diff --git a/packages/app/src/utils/file-mention-autocomplete.test.ts b/packages/app/src/utils/file-mention-autocomplete.test.ts
index 4f818e25e2..c74c821522 100644
--- a/packages/app/src/utils/file-mention-autocomplete.test.ts
+++ b/packages/app/src/utils/file-mention-autocomplete.test.ts
@@ -48,6 +48,74 @@ describe("findActiveFileMention", () => {
     });
     expect(mention).toBeNull();
   });
+
+  it("returns null for the issue #1364 angle-bracket email example", () => {
+    const text = "user <12345+user@noreply.example.com>";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for email addresses (word char before @)", () => {
+    const text = "alice@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for email addresses (+ immediately before @)", () => {
+    // Local part ends with + so the character at index-1 is '+', not a word char.
+    const text = "noreply+@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for plus-tagged email local parts", () => {
+    const text = "noreply+tag@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null when query contains angle brackets", () => {
+    const text = "check @foo<bar> end";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.indexOf(" end"),
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null when query ends with a closing angle bracket", () => {
+    const text = "check @foo>";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("still detects a file mention after an email in the same input", () => {
+    const text = "user <12345+user@noreply.example.com> and also @file";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toEqual({
+      start: text.lastIndexOf("@"),
+      end: text.length,
+      query: "file",
+    });
+  });
 });
 
 describe("formatQuotedFileMentionPath", () => {
diff --git a/packages/app/src/utils/file-mention-autocomplete.ts b/packages/app/src/utils/file-mention-autocomplete.ts
index d19424cfe4..fe09b52f03 100644
--- a/packages/app/src/utils/file-mention-autocomplete.ts
+++ b/packages/app/src/utils/file-mention-autocomplete.ts
@@ -15,7 +15,7 @@ interface ApplyFileMentionReplacementInput {
   relativePath: string;
 }
 
-const INVALID_MENTION_QUERY_CHARS = /[\s\n\r\t"']/;
+const INVALID_MENTION_QUERY_CHARS = /[\s\n\r\t"'<>]/;
 
 export function findActiveFileMention(input: FindActiveFileMentionInput): FileMentionRange | null {
   const clampedCursor = Math.max(0, Math.min(input.cursorIndex, input.text.length));
@@ -26,6 +26,11 @@ export function findActiveFileMention(input: FindActiveFileMentionInput): FileMe
     atIndex >= 0;
     atIndex = atIndex === 0 ? -1 : beforeCursor.lastIndexOf("@", atIndex - 1)
   ) {
+    // Skip @ that looks like part of an email address (local-part char immediately before @).
+    if (atIndex > 0 && /[\w+]/.test(beforeCursor[atIndex - 1]!)) {
+      continue;
+    }
+
     const query = beforeCursor.slice(atIndex + 1);
     if (INVALID_MENTION_QUERY_CHARS.test(query)) {
       continue;
diff --git a/packages/app/src/utils/host-routes.ts b/packages/app/src/utils/host-routes.ts
index 5b8b6ad8d1..c13d6f25f9 100644
--- a/packages/app/src/utils/host-routes.ts
+++ b/packages/app/src/utils/host-routes.ts
@@ -492,7 +492,10 @@ export function resolveKnownHostRoute(input: {
 export const SETTINGS_SECTION_SLUGS = [
   "general",
   "appearance",
-  "layout",
+  "sidebar",
+  "chat",
+  "terminal",
+  "browser",
   "editor",
   "shortcuts",
   "integrations",
diff --git a/packages/app/src/utils/http-url.ts b/packages/app/src/utils/http-url.ts
new file mode 100644
index 0000000000..116c7eb8e4
--- /dev/null
+++ b/packages/app/src/utils/http-url.ts
@@ -0,0 +1,9 @@
+/** Shared allowlist for links passed to an OS opener or a workspace browser. */
+export function isHttpUrl(url: string): boolean {
+  try {
+    const protocol = new URL(url).protocol;
+    return protocol === "http:" || protocol === "https:";
+  } catch {
+    return false;
+  }
+}
diff --git a/packages/app/src/utils/mac-user-agent.ts b/packages/app/src/utils/mac-user-agent.ts
new file mode 100644
index 0000000000..45fb0b104c
--- /dev/null
+++ b/packages/app/src/utils/mac-user-agent.ts
@@ -0,0 +1,14 @@
+/**
+ * What the browser says about the platform. `getShortcutOs()` is the app's
+ * answer for keyboard policy and consults native and Electron first; this is the
+ * browser half of it, kept free of React Native imports so the terminal WebView
+ * bundle can use it too.
+ */
+export function isMacUserAgent(): boolean {
+  if (typeof navigator === "undefined") return false;
+  const userAgent = navigator.userAgent ?? "";
+  const platform = (navigator as Navigator & { platform?: string }).platform ?? "";
+  return (
+    /Macintosh|Mac OS|iPhone|iPad|iPod/i.test(userAgent) || /Mac|iPhone|iPad|iPod/i.test(platform)
+  );
+}
diff --git a/packages/app/src/utils/open-external-url.test.ts b/packages/app/src/utils/open-external-url.test.ts
new file mode 100644
index 0000000000..29566587df
--- /dev/null
+++ b/packages/app/src/utils/open-external-url.test.ts
@@ -0,0 +1,11 @@
+import { describe, expect, it } from "vitest";
+import { openExternalUrl } from "./open-external-url";
+
+describe("external URL refusal", () => {
+  it.each(["mailto:person@example.com", "javascript:alert(1)", "/relative", "invalid"])(
+    "safely ignores %s for fire-and-forget callers",
+    async (url) => {
+      await expect(openExternalUrl(url)).resolves.toBeUndefined();
+    },
+  );
+});
diff --git a/packages/app/src/utils/open-external-url.ts b/packages/app/src/utils/open-external-url.ts
index 0225383d7f..a676987649 100644
--- a/packages/app/src/utils/open-external-url.ts
+++ b/packages/app/src/utils/open-external-url.ts
@@ -2,17 +2,10 @@ import * as Linking from "expo-linking";
 import { getDesktopHost } from "@/desktop/host";
 import { isWeb } from "@/constants/platform";
 
-const ALLOWED_EXTERNAL_URL_PROTOCOLS = new Set(["http:", "https:"]);
-
-function isAllowedExternalUrl(url: string): boolean {
-  try {
-    return ALLOWED_EXTERNAL_URL_PROTOCOLS.has(new URL(url).protocol);
-  } catch {
-    return false;
-  }
-}
+import { isHttpUrl } from "./http-url";
 
 export async function openExternalUrl(url: string): Promise<void> {
+  if (!isHttpUrl(url)) return;
   if (isWeb) {
     const opener = getDesktopHost()?.opener?.openUrl;
     if (typeof opener === "function") {
@@ -20,20 +13,9 @@ export async function openExternalUrl(url: string): Promise<void> {
       return;
     }
 
-    // Mirror the Electron opener's scheme allowlist: forge-supplied URLs
-    // (check target_url, job links) reach this sink, so refuse anything that
-    // is not plain http(s) instead of handing it to window.open.
-    if (!isAllowedExternalUrl(url)) {
-      return;
-    }
-
     window.open(url, "_blank", "noopener,noreferrer");
     return;
   }
 
-  if (!isAllowedExternalUrl(url)) {
-    return;
-  }
-
   await Linking.openURL(url);
 }
diff --git a/packages/app/src/utils/shortcut-platform.ts b/packages/app/src/utils/shortcut-platform.ts
index 6c14983411..41d55796eb 100644
--- a/packages/app/src/utils/shortcut-platform.ts
+++ b/packages/app/src/utils/shortcut-platform.ts
@@ -2,16 +2,12 @@ import { Platform } from "react-native";
 import { getIsElectronRuntimeMac } from "@/constants/layout";
 import type { ShortcutOs } from "@/utils/format-shortcut";
 import { isNative } from "@/constants/platform";
+import { isMacUserAgent } from "@/utils/mac-user-agent";
 
 export function getShortcutOs(): ShortcutOs {
   if (isNative) {
     return Platform.OS === "ios" ? "mac" : "non-mac";
   }
   if (getIsElectronRuntimeMac()) return "mac";
-  if (typeof navigator === "undefined") return "non-mac";
-  const ua = navigator.userAgent ?? "";
-  const platform = (navigator as Navigator & { platform?: string }).platform ?? "";
-  const isApple =
-    /Macintosh|Mac OS|iPhone|iPad|iPod/i.test(ua) || /Mac|iPhone|iPad|iPod/i.test(platform);
-  return isApple ? "mac" : "non-mac";
+  return isMacUserAgent() ? "mac" : "non-mac";
 }
diff --git a/packages/app/src/utils/sidebar-shortcuts.test.ts b/packages/app/src/utils/sidebar-shortcuts.test.ts
index 6b008e3dc6..ac9663c6da 100644
--- a/packages/app/src/utils/sidebar-shortcuts.test.ts
+++ b/packages/app/src/utils/sidebar-shortcuts.test.ts
@@ -1,3 +1,4 @@
+import { i18n } from "@/i18n/i18next";
 import { describe, expect, it } from "vitest";
 import type {
   SidebarProjectEntry,
@@ -211,6 +212,7 @@ describe("buildStatusSidebarShortcutModel", () => {
           ["p1", "Project 1"],
           ["p2", "Project 2"],
         ]),
+        i18n.t,
       ),
     });
 
@@ -247,7 +249,7 @@ describe("buildStatusSidebarShortcutModel", () => {
     ];
 
     const model = buildStatusSidebarShortcutModel({
-      groups: buildStatusGroups(workspaces, new Map([["p1", "Project 1"]])),
+      groups: buildStatusGroups(workspaces, new Map([["p1", "Project 1"]]), i18n.t),
       collapsedStatusGroupKeys: new Set(["needs_input"]),
     });
 
diff --git a/packages/app/src/utils/split-markdown-blocks.ts b/packages/app/src/utils/split-markdown-blocks.ts
index 636642e12a..8282fc3ca9 100644
--- a/packages/app/src/utils/split-markdown-blocks.ts
+++ b/packages/app/src/utils/split-markdown-blocks.ts
@@ -1,6 +1,37 @@
 import MarkdownIt from "markdown-it";
 
+// Only block maps are needed here; inline parsing belongs to each rendered block.
 const markdownBlockParser = new MarkdownIt();
+markdownBlockParser.core.ruler.disable("inline");
+
+// The renderer decides what counts as a definition, so ask the same parser: a block
+// that produces no tokens but registers references is nothing but definitions.
+function isLinkReferenceDefinitionBlock(block: string): boolean {
+  const env: { references?: Record<string, unknown> } = {};
+  const tokens = markdownBlockParser.parse(block, env);
+  return tokens.length === 0 && Object.keys(env.references ?? {}).length > 0;
+}
+
+/**
+ * Definitions render nothing and resolve nothing on their own, so a block made only of
+ * them would paint an empty row and break every reference that pointed at it. Fold it
+ * into the block it belongs to: the one above, or the one below when it leads.
+ */
+function foldLinkReferenceDefinitions(blocks: string[]): string[] {
+  const folded: string[] = [];
+  let leading: string[] = [];
+  for (const block of blocks) {
+    if (isLinkReferenceDefinitionBlock(block)) {
+      if (folded.length > 0) folded[folded.length - 1] += `\n\n${block}`;
+      else leading.push(block);
+      continue;
+    }
+    folded.push([...leading, block].join("\n\n"));
+    leading = [];
+  }
+  if (leading.length > 0) folded.push(leading.join("\n\n"));
+  return folded;
+}
 
 export function splitMarkdownBlocks(text: string): string[] {
   if (text.length === 0) {
@@ -41,7 +72,7 @@ export function splitMarkdownBlocks(text: string): string[] {
     blocks.push(currentLines.join("\n"));
   }
 
-  return blocks.filter((block) => block.length > 0);
+  return foldLinkReferenceDefinitions(blocks.filter((block) => block.length > 0));
 }
 
 function getStructuralBlankLines(text: string, lines: string[]): Set<number> {
diff --git a/packages/app/src/utils/streaming-markdown/index.ts b/packages/app/src/utils/streaming-markdown/index.ts
new file mode 100644
index 0000000000..b70b464d76
--- /dev/null
+++ b/packages/app/src/utils/streaming-markdown/index.ts
@@ -0,0 +1,153 @@
+import type MarkdownIt from "markdown-it";
+import type StateInline from "markdown-it/lib/rules_inline/state_inline.mjs";
+
+const STREAMING_TAIL = Symbol("streaming markdown tail");
+
+/** Adds provisional inline formatting without changing the source or literal code blocks. */
+export function enableStreamingMarkdown(parser: MarkdownIt): void {
+  parser.core.ruler.at("inline", (state) => {
+    const tail = state.tokens.findLast((token) => token.nesting !== -1);
+    for (const token of state.tokens) {
+      if (token.type === "inline") {
+        const env = { ...state.env, [STREAMING_TAIL]: token === tail };
+        token.children = [];
+        state.md.inline.parse(token.content, state.md, env, token.children);
+      }
+    }
+  });
+  parser.inline.ruler.before("backticks", "streaming_code", completeCode);
+  parser.inline.ruler.before("strikethrough", "streaming_marker", hideOpeningMarker);
+  parser.inline.ruler.after("image", "streaming_link", completeLink);
+  parser.inline.ruler2.after("balance_pairs", "streaming_emphasis", completeEmphasis);
+  parser.core.ruler.after("linkify", "streaming_link_text", (state) => {
+    for (const block of state.tokens) {
+      for (const token of block.children ?? []) {
+        if (token.type === "streaming_link_text") token.type = "text";
+      }
+    }
+  });
+}
+
+function isStreamingTail(state: StateInline): boolean {
+  return state.env[STREAMING_TAIL] === true && state.posMax === state.src.length;
+}
+
+function hideOpeningMarker(state: StateInline, silent: boolean): boolean {
+  if (silent || !isStreamingTail(state)) return false;
+  if (!/^(?:\*{1,3}|_{1,3}|~{1,2})$/.test(state.src.slice(state.pos))) return false;
+  if (state.scanDelims(state.pos, state.src[state.pos] !== "_").can_close) return false;
+  state.pos = state.posMax;
+  return true;
+}
+
+function completeCode(state: StateInline, silent: boolean): boolean {
+  if (silent || !isStreamingTail(state) || state.src[state.pos] !== "`") return false;
+  const runs = /`+/g;
+  runs.lastIndex = state.pos;
+  const opening = runs.exec(state.src)!;
+  let closing: RegExpExecArray | null;
+  while ((closing = runs.exec(state.src))) {
+    if (closing[0].length === opening[0].length) return false;
+  }
+  let content = state.src.slice(state.pos + opening[0].length);
+  // A shorter trailing run may be the first characters of the closing marker.
+  const partialClosing = content.match(/`+$/);
+  if (partialClosing && partialClosing[0].length < opening[0].length) {
+    content = content.slice(0, -partialClosing[0].length);
+  }
+  if (content) {
+    const token = state.push("code_inline", "code", 0);
+    token.markup = opening[0];
+    token.content = content.replace(/\n/g, " ").replace(/^ (.+) $/, "$1");
+  }
+  state.pos = state.posMax;
+  return true;
+}
+
+function completeLink(state: StateInline, silent: boolean): boolean {
+  if (silent || !isStreamingTail(state)) return false;
+  const image = state.src[state.pos] === "!";
+  const start = state.pos + (image ? 1 : 0);
+  if (state.src[start] !== "[") return false;
+  const labelEnd = state.md.helpers.parseLinkLabel(state, start, false);
+  if (labelEnd !== -1 && labelEnd + 1 < state.posMax) {
+    if (state.src[labelEnd + 1] !== "(" || hasClosedDestination(state.src, labelEnd + 1)) {
+      return false;
+    }
+  }
+  const end = state.posMax;
+  if (!image) {
+    if (state.pending) state.pushPending();
+    const firstLabelToken = state.tokens.length;
+    state.pos = start + 1;
+    state.posMax = labelEnd === -1 ? end : labelEnd;
+    state.level++;
+    state.md.inline.tokenize(state);
+    state.level--;
+    // Keep URL-shaped labels out of the automatic linkifier until the real
+    // destination arrives. Restore ordinary text before tokens reach the view.
+    for (let index = firstLabelToken; index < state.tokens.length; index++) {
+      if (state.tokens[index].type === "text") state.tokens[index].type = "streaming_link_text";
+    }
+  }
+  state.pos = state.posMax = end;
+  return true;
+}
+
+function hasClosedDestination(source: string, start: number): boolean {
+  let depth = 0;
+  let quote = "";
+  for (let index = start; index < source.length; index++) {
+    const char = source[index];
+    if (char === "\\") {
+      index++;
+    } else if (quote) {
+      if (char === quote) quote = "";
+    } else if (char === "<") {
+      quote = ">";
+    } else if ((char === '"' || char === "'") && /\s/.test(source[index - 1])) {
+      quote = char;
+    } else if (char === "(") {
+      depth++;
+    } else if (char === ")" && --depth === 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function completeEmphasis(state: StateInline): boolean {
+  if (!isStreamingTail(state)) return false;
+  const open = [];
+  let closedThrough = -1;
+  // Reuse markdown-it's escape, word-boundary, nesting and delimiter matching
+  // decisions. Only unmatched openers outside already-closed spans reach EOF.
+  for (const [index, delimiter] of state.delimiters.entries()) {
+    if (delimiter.end !== -1) {
+      closedThrough = Math.max(closedThrough, delimiter.end);
+    } else if (index > closedThrough && delimiter.open) {
+      open.push(delimiter);
+    }
+  }
+  for (const delimiter of open.toReversed()) {
+    if (delimiter.marker === 126 && /(?<![\\~])~$/.test(state.src)) {
+      const last = state.tokens.at(-1);
+      if (last?.type === "text" && last.content.endsWith("~")) {
+        last.content = last.content.slice(0, -1);
+      }
+    }
+    const closing = state.push("text", "", 0);
+    closing.content = String.fromCharCode(delimiter.marker).repeat(
+      delimiter.marker === 126 ? 2 : 1,
+    );
+    delimiter.end = state.delimiters.length;
+    state.delimiters.push({
+      ...delimiter,
+      token: state.tokens.length - 1,
+      end: -1,
+      open: false,
+      close: true,
+    });
+  }
+  return true;
+}
diff --git a/packages/app/src/utils/terminal-keys.test.ts b/packages/app/src/utils/terminal-keys.test.ts
index 5d39d55cfb..de88638b06 100644
--- a/packages/app/src/utils/terminal-keys.test.ts
+++ b/packages/app/src/utils/terminal-keys.test.ts
@@ -7,6 +7,7 @@ import {
   mergeTerminalModifiers,
   normalizeDomTerminalKey,
   normalizeTerminalTransportKey,
+  resolveMacTerminalEditingShortcut,
   resolvePendingModifierDataInput,
   shouldInterceptDomTerminalKey,
 } from "./terminal-keys";
@@ -351,3 +352,45 @@ describe("terminal key helpers", () => {
     });
   });
 });
+
+describe("resolveMacTerminalEditingShortcut", () => {
+  function shortcut(
+    key: string,
+    modifiers: Partial<Record<"ctrl" | "shift" | "alt" | "meta", boolean>>,
+  ) {
+    return resolveMacTerminalEditingShortcut({
+      key,
+      ctrlKey: modifiers.ctrl ?? false,
+      shiftKey: modifiers.shift ?? false,
+      altKey: modifiers.alt ?? false,
+      metaKey: modifiers.meta ?? false,
+    });
+  }
+
+  it("maps cmd+arrow to line start/end", () => {
+    expect(shortcut("ArrowLeft", { meta: true })).toBe("\x01");
+    expect(shortcut("ArrowRight", { meta: true })).toBe("\x05");
+  });
+
+  it("maps option+arrow to word movement", () => {
+    expect(shortcut("ArrowLeft", { alt: true })).toBe("\x1bb");
+    expect(shortcut("ArrowRight", { alt: true })).toBe("\x1bf");
+  });
+
+  it("maps cmd+backspace to kill-line", () => {
+    expect(shortcut("Backspace", { meta: true })).toBe("\x15");
+  });
+
+  it("leaves other combinations to xterm", () => {
+    expect(shortcut("ArrowLeft", {})).toBeNull();
+    expect(shortcut("ArrowRight", { meta: true, shift: true })).toBeNull();
+    expect(shortcut("ArrowRight", { meta: true, ctrl: true })).toBeNull();
+    expect(shortcut("ArrowRight", { meta: true, alt: true })).toBeNull();
+    expect(shortcut("ArrowLeft", { alt: true, shift: true })).toBeNull();
+    expect(shortcut("ArrowUp", { meta: true })).toBeNull();
+    expect(shortcut("ArrowDown", { alt: true })).toBeNull();
+    // Option+Backspace already works natively in xterm (ESC DEL).
+    expect(shortcut("Backspace", { alt: true })).toBeNull();
+    expect(shortcut("k", { meta: true })).toBeNull();
+  });
+});
diff --git a/packages/app/src/utils/terminal-keys.ts b/packages/app/src/utils/terminal-keys.ts
index a25d4e08a7..09ba53c182 100644
--- a/packages/app/src/utils/terminal-keys.ts
+++ b/packages/app/src/utils/terminal-keys.ts
@@ -135,6 +135,51 @@ export function shouldInterceptDomTerminalKey(args: {
   return false;
 }
 
+interface MacTerminalEditingShortcutInput {
+  key: string;
+  ctrlKey: boolean;
+  shiftKey: boolean;
+  altKey: boolean;
+  metaKey: boolean;
+}
+
+// macOS terminals translate these editing chords instead of forwarding raw modified
+// keys: Terminal.app and iTerm2 ("Natural Text Editing") send ^A/^E for cmd+arrows,
+// ESC b / ESC f for option+arrows, and ^U for cmd+backspace. xterm ignores meta+arrow
+// entirely, and 6.x dropped the 5.x macOS conversion of option+arrow to ESC b/f, so
+// without this the shell receives nothing or an `ESC[1;3C`-style sequence it can't
+// parse (which zsh renders as a stray "C"/"D" plus a bell).
+export function resolveMacTerminalEditingShortcut(
+  args: MacTerminalEditingShortcutInput,
+): string | null {
+  if (args.ctrlKey || args.shiftKey) {
+    return null;
+  }
+  if (args.metaKey && !args.altKey) {
+    switch (args.key) {
+      case "ArrowLeft":
+        return "\x01";
+      case "ArrowRight":
+        return "\x05";
+      case "Backspace":
+        return "\x15";
+      default:
+        return null;
+    }
+  }
+  if (args.altKey && !args.metaKey) {
+    switch (args.key) {
+      case "ArrowLeft":
+        return "\x1bb";
+      case "ArrowRight":
+        return "\x1bf";
+      default:
+        return null;
+    }
+  }
+  return null;
+}
+
 export function mergeTerminalModifiers(args: {
   pendingModifiers: PendingTerminalModifiers;
   ctrlKey: boolean;
diff --git a/packages/app/src/utils/test-daemon-connection.test.ts b/packages/app/src/utils/test-daemon-connection.test.ts
index cf6fca82e6..4dc82dda29 100644
--- a/packages/app/src/utils/test-daemon-connection.test.ts
+++ b/packages/app/src/utils/test-daemon-connection.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { DaemonClientConfig } from "@getpaseo/client/internal/daemon-client";
+import { DaemonAuthenticationError } from "@getpaseo/client/internal/daemon-client";
 import type { DaemonConnectionDependencies, DaemonProbeClient } from "./test-daemon-connection";
 
 class FakeDaemonClient implements DaemonProbeClient {
@@ -169,16 +170,15 @@ describe("test-daemon-connection connectToDaemon", () => {
     });
   });
 
-  it("passes direct TCP connection passwords into the client config", async () => {
+  it("passes the host password into the client config", async () => {
     const { connectToDaemon } = await import("./test-daemon-connection");
     const result = await connectToDaemon(
       {
         id: "direct:lan:6767",
         type: "directTcp",
         endpoint: "lan:6767",
-        password: "shared-secret",
       },
-      undefined,
+      { password: "shared-secret" },
       probe.deps,
     );
     await result.client.close();
@@ -242,7 +242,7 @@ describe("test-daemon-connection connectToDaemon", () => {
   it("surfaces auth rejection as an incorrect password", async () => {
     const { connectToDaemon } = await import("./test-daemon-connection");
     probe.failNextConnection(
-      new Error("Transport closed (code 4001)"),
+      new DaemonAuthenticationError("incorrect_password"),
       "Transport closed (code 4001)",
     );
 
@@ -252,13 +252,13 @@ describe("test-daemon-connection connectToDaemon", () => {
           id: "direct:lan:6767",
           type: "directTcp",
           endpoint: "lan:6767",
-          password: "wrong-secret",
         },
-        undefined,
+        { password: "wrong-secret" },
         probe.deps,
       ),
     ).rejects.toMatchObject({
       message: "Incorrect password",
+      authFailureReason: "incorrect_password",
     });
   });
 
@@ -272,9 +272,8 @@ describe("test-daemon-connection connectToDaemon", () => {
           id: "direct:lan:6767",
           type: "directTcp",
           endpoint: "lan:6767",
-          password: "shared-secret",
         },
-        undefined,
+        { password: "shared-secret" },
         probe.deps,
       ),
     ).rejects.toMatchObject({
diff --git a/packages/app/src/utils/test-daemon-connection.ts b/packages/app/src/utils/test-daemon-connection.ts
index a631bc7739..b882b1f30a 100644
--- a/packages/app/src/utils/test-daemon-connection.ts
+++ b/packages/app/src/utils/test-daemon-connection.ts
@@ -1,4 +1,9 @@
-import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import {
+  DaemonAuthenticationError,
+  DaemonClient,
+  getDaemonAuthFailureReason,
+  type DaemonAuthFailureReason,
+} from "@getpaseo/client/internal/daemon-client";
 import type { DaemonClientConfig } from "@getpaseo/client/internal/daemon-client";
 import type { HostConnection } from "@/types/host-connection";
 import { getOrCreateClientId } from "./client-id";
@@ -16,6 +21,7 @@ import type { DesktopDaemonTransportTarget } from "@/desktop/daemon/desktop-daem
 
 export interface DaemonProbeClient {
   readonly lastError: string | null;
+  readonly authFailureReason?: DaemonAuthFailureReason | null;
   connect(): Promise<void>;
   close(): Promise<void>;
   getLastServerInfoMessage(): { serverId: string; hostname: string | null } | null;
@@ -84,41 +90,53 @@ function pickBestReason(reason: string | null, lastError: string | null): string
   return "Unable to connect";
 }
 
-function isIncorrectPasswordFailure(input: {
-  config: DaemonClientConfig;
-  reason: string | null;
-  lastError: string | null;
-}): boolean {
-  if (!input.config.password) {
-    return false;
-  }
-  const details = [input.reason, input.lastError].filter(Boolean).join("\n").toLowerCase();
-  return (
-    details.includes("401") ||
-    details.includes("4001") ||
-    details.includes("unauthorized") ||
-    details.includes("code 1006")
-  );
-}
-
 export class DaemonConnectionTestError extends Error {
   reason: string | null;
   lastError: string | null;
+  authFailureReason: DaemonAuthFailureReason | null;
 
-  constructor(message: string, details: { reason: string | null; lastError: string | null }) {
+  constructor(
+    message: string,
+    details: {
+      reason: string | null;
+      lastError: string | null;
+      authFailureReason?: DaemonAuthFailureReason | null;
+    },
+  ) {
     super(message);
     this.name = "DaemonConnectionTestError";
     this.reason = details.reason;
     this.lastError = details.lastError;
+    this.authFailureReason = details.authFailureReason ?? null;
   }
 }
 
+export function getConnectionAuthFailureReason(error: unknown): DaemonAuthFailureReason | null {
+  if (error instanceof DaemonConnectionTestError) return error.authFailureReason;
+  return getDaemonAuthFailureReason(error);
+}
+
+function resolveConnectionCredentials(
+  connection: HostConnection,
+  options:
+    | { password?: string; localCredential?: DaemonClientConfig["localCredential"] }
+    | undefined,
+): Pick<DaemonClientConfig, "password" | "localCredential"> {
+  const password = options?.password;
+  return {
+    ...(password ? { password } : {}),
+    ...(options?.localCredential ? { localCredential: options.localCredential } : {}),
+  };
+}
+
 export async function buildClientConfig(
   connection: HostConnection,
   serverId?: string,
   options?: {
     capabilities?: DaemonClientConfig["capabilities"];
     trace?: DaemonClientConfig["trace"];
+    password?: string;
+    localCredential?: DaemonClientConfig["localCredential"];
   },
   deps: Pick<
     DaemonConnectionDependencies<DaemonProbeClient>,
@@ -136,6 +154,7 @@ export async function buildClientConfig(
     appVersion: deps.resolveAppVersion() ?? undefined,
     suppressSendErrors: true,
     reconnect: { enabled: false },
+    ...resolveConnectionCredentials(connection, options),
     ...(options?.capabilities ? { capabilities: options.capabilities } : {}),
     ...(options?.trace ? { trace: options.trace } : {}),
     ...((connection.type === "directSocket" || connection.type === "directPipe") &&
@@ -167,7 +186,6 @@ export async function buildClientConfig(
     return {
       ...base,
       url: buildDaemonWebSocketUrl(connection.endpoint, { useTls: connection.useTls ?? false }),
-      ...(connection.password ? { password: connection.password } : {}),
     };
   }
 
@@ -245,11 +263,13 @@ export function connectAndProbe(
             error instanceof Error ? error.message : String(error),
           );
           const lastError = normalizeNonEmptyString(client.lastError);
-          const message = isIncorrectPasswordFailure({ config, reason, lastError })
-            ? "Incorrect password"
+          const authFailureReason =
+            getDaemonAuthFailureReason(error) ?? client.authFailureReason ?? null;
+          const message = authFailureReason
+            ? new DaemonAuthenticationError(authFailureReason).message
             : pickBestReason(reason, lastError);
           void client.close().catch(() => undefined);
-          reject(new DaemonConnectionTestError(message, { reason, lastError }));
+          reject(new DaemonConnectionTestError(message, { reason, lastError, authFailureReason }));
         });
     },
   );
@@ -258,6 +278,8 @@ export function connectAndProbe(
 interface ProbeOptions {
   serverId?: string;
   timeoutMs?: number;
+  password?: string;
+  localCredential?: DaemonClientConfig["localCredential"];
   capabilities?: DaemonClientConfig["capabilities"];
   trace?: DaemonClientConfig["trace"];
 }
diff --git a/packages/app/src/utils/time.test.ts b/packages/app/src/utils/time.test.ts
index f979797b55..335c663682 100644
--- a/packages/app/src/utils/time.test.ts
+++ b/packages/app/src/utils/time.test.ts
@@ -1,7 +1,9 @@
 import { describe, it, expect } from "vitest";
 import {
   describeCompactTimeAgo,
+  describeTimeAgo,
   formatCompactTimeAgo,
+  formatCompactTimeAgoAsProse,
   formatDuration,
   formatMessageTimestamp,
   formatTimeAgo,
@@ -12,7 +14,8 @@ describe("formatTimeAgo", () => {
 
   it.each([
     ["2026-07-16T11:59:55.000Z", "just now"],
-    ["2026-07-16T11:59:30.000Z", "30s ago"],
+    ["2026-07-16T11:59:30.000Z", "just now"],
+    ["2026-07-16T11:59:00.000Z", "1m ago"],
     ["2026-07-16T11:55:00.000Z", "5m ago"],
     ["2026-07-16T10:00:00.000Z", "2h ago"],
     ["2026-07-13T12:00:00.000Z", "3d ago"],
@@ -22,6 +25,20 @@ describe("formatTimeAgo", () => {
   });
 });
 
+describe("describeTimeAgo", () => {
+  const now = new Date("2026-07-16T12:00:00.000Z");
+
+  it.each([
+    ["2026-07-16T11:59:30.000Z", "just now", "minute"],
+    ["2026-07-16T11:55:00.000Z", "5m ago", "minute"],
+    ["2026-07-16T10:00:00.000Z", "2h ago", "hour"],
+    ["2026-07-13T12:00:00.000Z", "3d ago", "day"],
+    ["2026-01-15T12:00:00.000Z", "Jan 15", "static"],
+  ] as const)("formats %s as %s at %s resolution", (date, label, resolution) => {
+    expect(describeTimeAgo(new Date(date), now)).toEqual({ label, resolution });
+  });
+});
+
 describe("describeCompactTimeAgo", () => {
   const now = new Date("2026-07-16T12:00:00.000Z");
 
@@ -63,6 +80,15 @@ describe("describeCompactTimeAgo", () => {
   });
 });
 
+describe("formatCompactTimeAgoAsProse", () => {
+  it("puts elapsed labels back into prose and leaves dates alone", () => {
+    expect(formatCompactTimeAgoAsProse("now")).toBe("just now");
+    expect(formatCompactTimeAgoAsProse("3m")).toBe("3m ago");
+    expect(formatCompactTimeAgoAsProse("2h")).toBe("2h ago");
+    expect(formatCompactTimeAgoAsProse("Jan 15")).toBe("Jan 15");
+  });
+});
+
 describe("formatDuration", () => {
   it("renders sub-minute durations as whole seconds", () => {
     expect(formatDuration(0)).toBe("0s");
@@ -108,6 +134,17 @@ describe("formatMessageTimestamp", () => {
     expect(formatted).toMatch(/10:12 PM|22:12/);
   });
 
+  it("shows the full date for last week's same weekday, even under seven days ago", () => {
+    // 2026-09-18 is a Friday. The reply is 6 days 23h45m old and lands on today's weekday,
+    // so a weekday label would read as today.
+    const now = new Date(2026, 8, 25, 11, 47);
+    const date = new Date(2026, 8, 18, 12, 2);
+    const formatted = formatMessageTimestamp(date, now);
+    expect(formatted).toMatch(/Sep|September/);
+    expect(formatted).toMatch(/18/);
+    expect(formatted).not.toMatch(/Friday/);
+  });
+
   it("includes full date for older timestamps", () => {
     const now = new Date(2026, 4, 14, 17, 30);
     const date = new Date(2026, 3, 1, 9, 5);
diff --git a/packages/app/src/utils/time.ts b/packages/app/src/utils/time.ts
index f91487dfb5..948ee8eeb3 100644
--- a/packages/app/src/utils/time.ts
+++ b/packages/app/src/utils/time.ts
@@ -1,50 +1,10 @@
 /**
- * How long ago something was, before it's worded. The two formatters below share this so
- * their thresholds can't drift apart; they differ only in how much room they have to say it.
- *
- * `elapsed` takes an "ago" in prose, `now` and `date` read as absolutes and never do.
- */
-type Elapsed =
-  | { kind: "now" }
-  | { kind: "elapsed"; value: string }
-  | { kind: "date"; value: string };
-
-function describeElapsed(date: Date, now: Date): Elapsed {
-  const diffMs = now.getTime() - date.getTime();
-  const diffSec = Math.floor(diffMs / 1000);
-  const diffMin = Math.floor(diffSec / 60);
-  const diffHour = Math.floor(diffMin / 60);
-  const diffDay = Math.floor(diffHour / 24);
-
-  if (diffSec < 10) return { kind: "now" };
-  if (diffMin < 1) return { kind: "elapsed", value: `${diffSec}s` };
-  if (diffHour < 1) return { kind: "elapsed", value: `${diffMin}m` };
-  if (diffDay < 1) return { kind: "elapsed", value: `${diffHour}h` };
-  if (diffDay < 7) return { kind: "elapsed", value: `${diffDay}d` };
-
-  // For older dates, show abbreviated month and day
-  const month = date.toLocaleDateString("en-US", { month: "short" });
-  return { kind: "date", value: `${month} ${date.getDate()}` };
-}
-
-/**
- * Format a date as a human-friendly relative time string
- * Examples: "just now", "5m ago", "2h ago", "3d ago", "Jan 15"
- */
-export function formatTimeAgo(date: Date, now: Date = new Date()): string {
-  const elapsed = describeElapsed(date, now);
-  if (elapsed.kind === "now") return "just now";
-  if (elapsed.kind === "elapsed") return `${elapsed.value} ago`;
-  return elapsed.value;
-}
-
-/**
- * How often a compact label can change, which is all a caller needs to know to keep it honest.
+ * How often a relative label can change, which is all a caller needs to know to keep it honest.
  * `static` means it never will again.
  */
 export type RelativeTimeResolution = "minute" | "hour" | "day" | "static";
 
-export interface CompactTimeAgo {
+export interface RelativeTimeLabel {
   label: string;
   resolution: RelativeTimeResolution;
 }
@@ -56,47 +16,95 @@ const DAY_MS = 24 * HOUR_MS;
 const ABSOLUTE_AFTER_MS = 7 * DAY_MS;
 
 /**
- * The same instant with the prose removed, for somewhere with no room for it — a dense list
- * where the column is understood to be a timestamp and "ago" is the only word on the line.
- * Examples: "now", "5m", "2h", "3d", "Jan 15".
+ * How long ago something was, before it's worded. The prose and compact formatters share this so
+ * their thresholds can't drift apart; they differ only in how much room they have to say it.
+ *
+ * `elapsed` takes an "ago" in prose, `now` and `date` read as absolutes and never do.
  *
  * Deliberately never sub-minute. A seconds label is only correct for the second it was rendered,
  * so it either lies or forces a once-a-second re-render of a list that has nothing new to say.
  * Everything under a minute is "now", which is both true and stable.
  *
- * The resolution comes back with the label so a caller can wake at the rate the label actually
- * changes instead of guessing — see `useCompactTimeAgo`.
+ * The resolution comes back with the value so a caller can wake at the rate the label actually
+ * changes instead of guessing — see `useTimeAgo`.
  */
-export function describeCompactTimeAgo(date: Date, now: Date = new Date()): CompactTimeAgo {
+type Age =
+  | { kind: "now"; resolution: "minute" }
+  | { kind: "elapsed"; value: string; resolution: Exclude<RelativeTimeResolution, "static"> }
+  | { kind: "date"; value: string; resolution: "static" };
+
+function describeAge(date: Date, now: Date): Age {
   const elapsedMs = now.getTime() - date.getTime();
 
   if (elapsedMs < MINUTE_MS) {
-    return { label: "now", resolution: "minute" };
+    return { kind: "now", resolution: "minute" };
   }
   if (elapsedMs < HOUR_MS) {
-    return { label: `${Math.floor(elapsedMs / MINUTE_MS)}m`, resolution: "minute" };
+    return {
+      kind: "elapsed",
+      value: `${Math.floor(elapsedMs / MINUTE_MS)}m`,
+      resolution: "minute",
+    };
   }
   if (elapsedMs < DAY_MS) {
-    return { label: `${Math.floor(elapsedMs / HOUR_MS)}h`, resolution: "hour" };
+    return { kind: "elapsed", value: `${Math.floor(elapsedMs / HOUR_MS)}h`, resolution: "hour" };
   }
   if (elapsedMs < ABSOLUTE_AFTER_MS) {
-    return { label: `${Math.floor(elapsedMs / DAY_MS)}d`, resolution: "day" };
+    return { kind: "elapsed", value: `${Math.floor(elapsedMs / DAY_MS)}d`, resolution: "day" };
   }
 
   const month = date.toLocaleDateString("en-US", { month: "short" });
-  return { label: `${month} ${date.getDate()}`, resolution: "static" };
+  return { kind: "date", value: `${month} ${date.getDate()}`, resolution: "static" };
+}
+
+/**
+ * A human-friendly relative time, with the resolution it changes at.
+ * Examples: "just now", "5m ago", "2h ago", "3d ago", "Jan 15".
+ */
+export function describeTimeAgo(date: Date, now: Date = new Date()): RelativeTimeLabel {
+  const age = describeAge(date, now);
+  if (age.kind === "now") return { label: "just now", resolution: age.resolution };
+  if (age.kind === "elapsed") return { label: `${age.value} ago`, resolution: age.resolution };
+  return { label: age.value, resolution: age.resolution };
+}
+
+export function formatTimeAgo(date: Date, now: Date = new Date()): string {
+  return describeTimeAgo(date, now).label;
+}
+
+/**
+ * The same instant with the prose removed, for somewhere with no room for it — a dense list
+ * where the column is understood to be a timestamp and "ago" is the only word on the line.
+ * Examples: "now", "5m", "2h", "3d", "Jan 15".
+ */
+export function describeCompactTimeAgo(date: Date, now: Date = new Date()): RelativeTimeLabel {
+  const age = describeAge(date, now);
+  if (age.kind === "now") return { label: "now", resolution: age.resolution };
+  return { label: age.value, resolution: age.resolution };
 }
 
 export function formatCompactTimeAgo(date: Date, now: Date = new Date()): string {
   return describeCompactTimeAgo(date, now).label;
 }
 
-function isSameLocalDay(a: Date, b: Date): boolean {
-  return (
-    a.getFullYear() === b.getFullYear() &&
-    a.getMonth() === b.getMonth() &&
-    a.getDate() === b.getDate()
-  );
+/**
+ * A compact label put back into a sentence, for a tooltip or a line with room for prose:
+ * "now" → "just now", "5m" → "5m ago", "Jan 15" stays a date.
+ */
+export function formatCompactTimeAgoAsProse(label: string): string {
+  if (label === "now") return "just now";
+  if (/^\d/.test(label)) return `${label} ago`;
+  return label;
+}
+
+/**
+ * How many local midnights lie between two instants: 0 for the same day, 1 for yesterday.
+ * Counted on the calendar rather than in elapsed time, so six days and 23 hours ago on
+ * today's weekday is 7, and rounded so a DST day of 23 or 25 hours still counts as one.
+ */
+function localCalendarDaysBetween(earlier: Date, later: Date): number {
+  const startOfDay = (d: Date) => new Date(d.getFullYear(), d.getMonth(), d.getDate());
+  return Math.round((startOfDay(later).getTime() - startOfDay(earlier).getTime()) / DAY_MS);
 }
 
 // Cached Intl formatter. Explicitly carrying `hourCycle` from the resolved
@@ -120,19 +128,18 @@ function getTimeFormatter(): Intl.DateTimeFormat {
 /**
  * Format a chat-message timestamp for hover-revealed UI.
  * - Same day: "10:11 PM" or "22:11" depending on user preference
- * - Within ~6 days: "Wednesday 10:11 PM"
- * - Older: "14 May 2026, 10:11 PM"
+ * - The previous 6 calendar days: "Wednesday 10:11 PM"
+ * - Older, including today's weekday last week: "14 May 2026, 10:11 PM"
  */
 export function formatMessageTimestamp(date: Date, now: Date = new Date()): string {
   const time = getTimeFormatter().format(date);
+  const daysAgo = localCalendarDaysBetween(date, now);
 
-  if (isSameLocalDay(date, now)) {
+  if (daysAgo === 0) {
     return time;
   }
 
-  const diffMs = now.getTime() - date.getTime();
-  const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
-  if (diffDays >= 0 && diffDays < 7) {
+  if (daysAgo > 0 && daysAgo < 7) {
     const weekday = date.toLocaleDateString(undefined, { weekday: "long" });
     return `${weekday} ${time}`;
   }
diff --git a/packages/app/src/utils/workspace-agent-activity.test.ts b/packages/app/src/utils/workspace-agent-activity.test.ts
index 09ada95695..7ccca095f1 100644
--- a/packages/app/src/utils/workspace-agent-activity.test.ts
+++ b/packages/app/src/utils/workspace-agent-activity.test.ts
@@ -6,6 +6,7 @@ function agent(input: {
   id: string;
   workspaceId?: string;
   status?: Agent["status"];
+  turn?: Agent["turn"];
   updatedAt: string;
   attentionTimestamp?: string | null;
   requiresAttention?: boolean;
@@ -19,7 +20,16 @@ function agent(input: {
     id: input.id,
     provider: "codex",
     status: input.status ?? "idle",
-    activeTurn: input.status === "running" ? { turnId: "turn-1", startedAt: null } : null,
+    turn:
+      input.turn ??
+      (input.status === "running"
+        ? {
+            phase: "open",
+            turnId: "turn-1",
+            startedAt: null,
+            cancellationRequestId: null,
+          }
+        : { phase: "idle", cancellationRequestId: null }),
     createdAt: new Date("2026-01-01T00:00:00.000Z"),
     updatedAt: new Date(input.updatedAt),
     lastUserMessageAt: null,
@@ -56,6 +66,41 @@ function agent(input: {
 }
 
 describe("workspace agent activity index", () => {
+  it("uses turn liveness for running while preserving protocol lifecycle states", () => {
+    const result = buildWorkspaceAgentActivityIndex(
+      new Map([
+        [
+          "open",
+          agent({
+            id: "open",
+            workspaceId: "workspace-open",
+            status: "idle",
+            turn: {
+              phase: "open",
+              turnId: null,
+              startedAt: null,
+              cancellationRequestId: null,
+            },
+            updatedAt: "2026-01-01T00:00:00.000Z",
+          }),
+        ],
+        [
+          "idle-error",
+          agent({
+            id: "idle-error",
+            workspaceId: "workspace-error",
+            status: "error",
+            turn: { phase: "idle", cancellationRequestId: null },
+            updatedAt: "2026-01-01T00:00:00.000Z",
+          }),
+        ],
+      ]),
+    );
+
+    expect(result.get("workspace-open")?.status).toBe("running");
+    expect(result.get("workspace-error")?.status).toBe("failed");
+  });
+
   it("keeps the latest active root agent for each workspace", () => {
     const index = buildWorkspaceAgentActivityIndex(
       new Map([
diff --git a/packages/app/src/utils/workspace-agent-activity.ts b/packages/app/src/utils/workspace-agent-activity.ts
index 3e4355ee3a..69f3c23da4 100644
--- a/packages/app/src/utils/workspace-agent-activity.ts
+++ b/packages/app/src/utils/workspace-agent-activity.ts
@@ -8,6 +8,11 @@ export interface WorkspaceAgentActivity {
   enteredAt: Date | null;
 }
 
+function workspaceAgentStatus(agent: Agent): Agent["status"] {
+  if (agent.turn.phase === "open") return "running";
+  return agent.status === "running" ? "idle" : agent.status;
+}
+
 export function buildWorkspaceAgentActivityIndex(
   agents: ReadonlyMap<string, Agent>,
   previous?: ReadonlyMap<string, WorkspaceAgentActivity>,
@@ -29,7 +34,7 @@ export function buildWorkspaceAgentActivityIndex(
     latestActivityAtByWorkspaceId.set(agent.workspaceId, enteredAt);
 
     const status = deriveSidebarStateBucket({
-      status: agent.status,
+      status: workspaceAgentStatus(agent),
       pendingPermissionCount: agent.pendingPermissions.length,
       requiresAttention: agent.requiresAttention,
       attentionReason: agent.attentionReason,
diff --git a/packages/app/src/utils/workspace-directory.test.ts b/packages/app/src/utils/workspace-directory.test.ts
index b40bdd9705..b3973fb7b6 100644
--- a/packages/app/src/utils/workspace-directory.test.ts
+++ b/packages/app/src/utils/workspace-directory.test.ts
@@ -2,6 +2,10 @@ import { describe, expect, it } from "vitest";
 import { requireWorkspaceDirectory, resolveWorkspaceDirectory } from "./workspace-directory";
 
 describe("resolveWorkspaceDirectory", () => {
+  it("preserves significant whitespace in a workspace folder name", () => {
+    expect(resolveWorkspaceDirectory({ workspaceDirectory: "/repo " })).toBe("/repo ");
+    expect(requireWorkspaceDirectory({ workspaceDirectory: "/repo /" })).toBe("/repo ");
+  });
   it("canonicalizes a workspace directory and returns null when blank", () => {
     expect(resolveWorkspaceDirectory({ workspaceDirectory: "C:\\repo\\app\\" })).toBe(
       "C:/repo/app",
diff --git a/packages/app/src/utils/workspace-identity.ts b/packages/app/src/utils/workspace-identity.ts
index 8c778372d9..3cf3134939 100644
--- a/packages/app/src/utils/workspace-identity.ts
+++ b/packages/app/src/utils/workspace-identity.ts
@@ -13,11 +13,10 @@ export function normalizeWorkspaceOpaqueId(value: string | null | undefined): st
 }
 
 export function normalizeWorkspacePath(value: string | null | undefined): string | null {
-  const trimmed = trimNonEmpty(value);
-  if (!trimmed) {
+  if (typeof value !== "string" || value.trim().length === 0) {
     return null;
   }
-  const withUnixSeparators = trimmed.replace(/\\/g, "/");
+  const withUnixSeparators = value.replace(/\\/g, "/");
   if (withUnixSeparators === "/") {
     return withUnixSeparators;
   }
diff --git a/packages/app/src/voice/audio-engine.native.ts b/packages/app/src/voice/audio-engine.native.ts
deleted file mode 100644
index 465bab3c73..0000000000
--- a/packages/app/src/voice/audio-engine.native.ts
+++ /dev/null
@@ -1,350 +0,0 @@
-import type {
-  AudioEngine,
-  AudioEngineCallbacks,
-  AudioPlaybackSource,
-} from "@/voice/audio-engine-types";
-
-interface QueuedAudio {
-  audio: AudioPlaybackSource;
-  resolve: (duration: number) => void;
-  reject: (error: Error) => void;
-}
-
-interface AudioEngineTraceOptions {
-  traceLabel?: string;
-}
-
-function parsePcmSampleRate(mimeType: string): number | null {
-  const match = /rate=(\d+)/i.exec(mimeType);
-  if (!match) {
-    return null;
-  }
-  const rate = Number(match[1]);
-  return Number.isFinite(rate) && rate > 0 ? rate : null;
-}
-
-function resamplePcm16(pcm: Uint8Array, fromRate: number, toRate: number): Uint8Array {
-  if (fromRate === toRate) {
-    return pcm;
-  }
-
-  const inputSamples = Math.floor(pcm.length / 2);
-  const outputSamples = Math.floor((inputSamples * toRate) / fromRate);
-  const out = new Uint8Array(outputSamples * 2);
-  const ratio = fromRate / toRate;
-
-  const readInt16 = (sampleIndex: number): number => {
-    const i = sampleIndex * 2;
-    if (i + 1 >= pcm.length) {
-      return 0;
-    }
-    const lo = pcm[i];
-    const hi = pcm[i + 1];
-    let value = (hi << 8) | lo;
-    if (value & 0x8000) {
-      value = value - 0x10000;
-    }
-    return value;
-  };
-
-  const writeInt16 = (sampleIndex: number, value: number): void => {
-    const clamped = Math.max(-32768, Math.min(32767, Math.round(value)));
-    const i = sampleIndex * 2;
-    out[i] = clamped & 0xff;
-    out[i + 1] = (clamped >> 8) & 0xff;
-  };
-
-  for (let i = 0; i < outputSamples; i++) {
-    const srcPos = i * ratio;
-    const i0 = Math.floor(srcPos);
-    const frac = srcPos - i0;
-    const s0 = readInt16(i0);
-    const s1 = readInt16(Math.min(inputSamples - 1, i0 + 1));
-    writeInt16(i, s0 + (s1 - s0) * frac);
-  }
-
-  return out;
-}
-
-export function createAudioEngine(
-  callbacks: AudioEngineCallbacks,
-  _options?: AudioEngineTraceOptions,
-): AudioEngine {
-  const native = require("@getpaseo/expo-two-way-audio");
-
-  const refs: {
-    initialized: boolean;
-    captureActive: boolean;
-    muted: boolean;
-    queue: QueuedAudio[];
-    processingQueue: boolean;
-    playbackTimeout: ReturnType<typeof setTimeout> | null;
-    activePlayback: {
-      resolve: (duration: number) => void;
-      reject: (error: Error) => void;
-      settled: boolean;
-    } | null;
-    destroyed: boolean;
-  } = {
-    initialized: false,
-    captureActive: false,
-    muted: false,
-    queue: [],
-    processingQueue: false,
-    playbackTimeout: null,
-    activePlayback: null,
-    destroyed: false,
-  };
-
-  const microphoneSubscription = native.addExpoTwoWayAudioEventListener(
-    "onMicrophoneData",
-    (event: { data: Uint8Array }) => {
-      if (!refs.captureActive || refs.muted) {
-        return;
-      }
-      const pcm = event.data;
-      callbacks.onCaptureData(pcm);
-    },
-  );
-  const volumeSubscription = native.addExpoTwoWayAudioEventListener(
-    "onInputVolumeLevelData",
-    (event: { data: number }) => {
-      if (!refs.captureActive) {
-        return;
-      }
-      const level = refs.muted ? 0 : event.data;
-      callbacks.onVolumeLevel(level);
-    },
-  );
-  const interruptionSubscription = native.addExpoTwoWayAudioEventListener(
-    "onAudioInterruption",
-    (event: { data: string }) => {
-      if (event.data !== "blocked") {
-        return;
-      }
-      const wasCaptureActive = refs.captureActive;
-      refs.captureActive = false;
-      refs.muted = false;
-      callbacks.onVolumeLevel(0);
-      if (wasCaptureActive) {
-        callbacks.onInterruption?.();
-      }
-    },
-  );
-
-  async function ensureInitialized(): Promise<void> {
-    if (refs.initialized) {
-      return;
-    }
-    const success = await native.initialize();
-    if (!success) {
-      throw new Error("expo-two-way-audio: native initialize() returned false");
-    }
-    refs.initialized = true;
-  }
-
-  /**
-   * Release the OS audio session as soon as we are neither capturing nor playing.
-   * Holding it keeps the user's background music paused — on iOS the non-mixing
-   * `.playAndRecord` category survives backgrounding and is re-asserted on every
-   * foreground, so an unreleased session means their music never comes back.
-   */
-  function releaseSessionIfIdle(): void {
-    if (!refs.initialized || refs.destroyed) {
-      return;
-    }
-    if (refs.captureActive || refs.activePlayback || refs.queue.length > 0) {
-      return;
-    }
-    // The wrapper no-ops on binaries whose native module predates this function.
-    native.releaseAudioSession();
-  }
-
-  async function ensureMicrophonePermission(): Promise<void> {
-    let permission = await native.getMicrophonePermissionsAsync().catch(() => null);
-    if (!permission?.granted) {
-      permission = await native.requestMicrophonePermissionsAsync().catch(() => null);
-    }
-    if (!permission?.granted) {
-      throw new Error(
-        "Microphone permission is required to capture audio. Please enable microphone access in system settings.",
-      );
-    }
-  }
-
-  function clearPlaybackTimeout(): void {
-    if (refs.playbackTimeout) {
-      clearTimeout(refs.playbackTimeout);
-      refs.playbackTimeout = null;
-    }
-  }
-
-  async function playAudio(audio: AudioPlaybackSource): Promise<number> {
-    await ensureInitialized();
-
-    return await new Promise<number>((resolve, reject) => {
-      refs.activePlayback = { resolve, reject, settled: false };
-
-      audio
-        .arrayBuffer()
-        .then((arrayBuffer) => {
-          const pcm = new Uint8Array(arrayBuffer);
-          const inputRate = parsePcmSampleRate(audio.type || "") ?? 24000;
-
-          // Native AudioEngine expects 16kHz PCM16
-          const pcm16k = resamplePcm16(pcm, inputRate, 16000);
-          const durationSec = pcm16k.length / 2 / 16000;
-
-          native.resumePlayback();
-          native.playPCMData(pcm16k);
-
-          clearPlaybackTimeout();
-          refs.playbackTimeout = setTimeout(() => {
-            clearPlaybackTimeout();
-            const active = refs.activePlayback;
-            if (!active || active.settled) {
-              return;
-            }
-            active.settled = true;
-            refs.activePlayback = null;
-            resolve(durationSec);
-          }, durationSec * 1000);
-          return undefined;
-        })
-        .catch((error: unknown) => {
-          clearPlaybackTimeout();
-          const active = refs.activePlayback;
-          if (active && !active.settled) {
-            active.settled = true;
-            refs.activePlayback = null;
-            reject(error instanceof Error ? error : new Error(String(error)));
-          }
-        });
-    });
-  }
-
-  async function processQueue(): Promise<void> {
-    if (refs.processingQueue || refs.queue.length === 0) {
-      return;
-    }
-
-    refs.processingQueue = true;
-    while (refs.queue.length > 0) {
-      const item = refs.queue.shift()!;
-      try {
-        const duration = await playAudio(item.audio);
-        item.resolve(duration);
-      } catch (error) {
-        item.reject(error instanceof Error ? error : new Error(String(error)));
-      }
-    }
-    refs.processingQueue = false;
-    releaseSessionIfIdle();
-  }
-
-  return {
-    async initialize() {
-      await ensureInitialized();
-    },
-
-    async destroy() {
-      if (refs.destroyed) {
-        return;
-      }
-      refs.destroyed = true;
-      this.stop();
-      this.clearQueue();
-      if (refs.captureActive) {
-        native.toggleRecording(false);
-        refs.captureActive = false;
-      }
-      clearPlaybackTimeout();
-      refs.muted = false;
-      callbacks.onVolumeLevel(0);
-      if (refs.initialized) {
-        native.tearDown();
-        refs.initialized = false;
-      }
-      microphoneSubscription.remove();
-      volumeSubscription.remove();
-      interruptionSubscription.remove();
-    },
-
-    async startCapture() {
-      if (refs.captureActive) {
-        return;
-      }
-
-      try {
-        await ensureMicrophonePermission();
-        await ensureInitialized();
-        const isRecording = native.toggleRecording(true);
-        if (!isRecording) {
-          throw new Error(
-            "Microphone capture could not start because Android audio focus is unavailable.",
-          );
-        }
-        refs.captureActive = true;
-      } catch (error) {
-        const wrapped = error instanceof Error ? error : new Error(String(error));
-        callbacks.onError?.(wrapped);
-        throw wrapped;
-      }
-    },
-
-    async stopCapture() {
-      if (refs.captureActive) {
-        native.toggleRecording(false);
-      }
-      refs.captureActive = false;
-      refs.muted = false;
-      callbacks.onVolumeLevel(0);
-      releaseSessionIfIdle();
-    },
-
-    toggleMute() {
-      refs.muted = !refs.muted;
-      if (refs.muted) {
-        callbacks.onVolumeLevel(0);
-      }
-      return refs.muted;
-    },
-
-    isMuted() {
-      return refs.muted;
-    },
-
-    async play(audio: AudioPlaybackSource) {
-      return await new Promise<number>((resolve, reject) => {
-        refs.queue.push({ audio, resolve, reject });
-        if (!refs.processingQueue) {
-          void processQueue();
-        }
-      });
-    },
-
-    stop() {
-      native.stopPlayback();
-      clearPlaybackTimeout();
-      const active = refs.activePlayback;
-      refs.activePlayback = null;
-      if (active && !active.settled) {
-        active.settled = true;
-        active.reject(new Error("Playback stopped"));
-      }
-      releaseSessionIfIdle();
-    },
-
-    clearQueue() {
-      while (refs.queue.length > 0) {
-        refs.queue.shift()!.reject(new Error("Playback stopped"));
-      }
-      refs.processingQueue = false;
-      releaseSessionIfIdle();
-    },
-
-    isPlaying() {
-      return refs.activePlayback !== null;
-    },
-  };
-}
diff --git a/packages/app/src/voice/voice-runtime.test.ts b/packages/app/src/voice/voice-runtime.test.ts
index aa79d6b245..189140c7f6 100644
--- a/packages/app/src/voice/voice-runtime.test.ts
+++ b/packages/app/src/voice/voice-runtime.test.ts
@@ -1,9 +1,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { DaemonServerInfo } from "@/stores/session-store";
-import type { AudioEngine } from "@/voice/audio-engine-types";
+import type { AudioEngine } from "@/audio";
 import { createVoiceRuntime, type VoiceSessionAdapter } from "@/voice/voice-runtime";
 import { REALTIME_VOICE_VAD_CONFIG } from "@/voice/realtime-voice-config";
 
+const CUE_MIME_TYPE = "audio/pcm;rate=16000;bits=16";
+const THINKING_TONE_MIN_SILENCE_MS = 1500;
+const SEGMENT_MIME_TYPE = "audio/pcm;rate=24000;bits=16";
+
 function createAudioEngineMock(): AudioEngine {
   return {
     initialize: vi.fn().mockResolvedValue(undefined),
@@ -252,10 +256,11 @@ describe("voice runtime", () => {
     runtime.onAssistantAudioFinished("server-1");
 
     expect(runtime.getSnapshot().phase).toBe("waiting");
+    await vi.advanceTimersByTimeAsync(THINKING_TONE_MIN_SILENCE_MS);
     expect(engine.play).toHaveBeenCalled();
   });
 
-  it("starts the thinking tone when an agent turn begins before playback", async () => {
+  it("starts the thinking tone once the wait for a reply outlasts an inter-segment gap", async () => {
     const adapter = createSessionAdapter();
     const { runtime, engine } = createRuntime();
     runtime.registerSession(adapter);
@@ -264,6 +269,10 @@ describe("voice runtime", () => {
     runtime.onTurnEvent("server-1", "agent-1", "turn_started");
 
     expect(runtime.getSnapshot().phase).toBe("waiting");
+    await vi.advanceTimersByTimeAsync(THINKING_TONE_MIN_SILENCE_MS - 1);
+    expect(engine.play).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(1);
     expect(engine.play).toHaveBeenCalled();
   });
 
@@ -284,6 +293,7 @@ describe("voice runtime", () => {
     runtime.onTurnEvent("server-1", "agent-1", "turn_started");
 
     expect(runtime.getSnapshot().phase).toBe("waiting");
+    await vi.advanceTimersByTimeAsync(THINKING_TONE_MIN_SILENCE_MS);
     expect(engine.play).toHaveBeenCalledTimes(1);
     vi.mocked(engine.stop).mockClear();
     vi.mocked(engine.clearQueue).mockClear();
@@ -297,12 +307,60 @@ describe("voice runtime", () => {
 
     runtime.onServerSpeechStateChanged("server-1", true);
 
-    expect(engine.stop).toHaveBeenCalledTimes(1);
-    expect(engine.clearQueue).toHaveBeenCalledTimes(1);
+    expect(engine.stop).not.toHaveBeenCalled();
+    expect(engine.clearQueue).not.toHaveBeenCalled();
+    expect(vi.mocked(engine.play).mock.calls[0][1]?.aborted).toBe(true);
 
     resolvePlay(0.1);
   });
 
+  it("does not play the thinking tone in the gap between two segments of one reply", async () => {
+    const adapter = createSessionAdapter();
+    const engine = createAudioEngineMock();
+    const played: string[] = [];
+    vi.mocked(engine.play).mockImplementation(async (source: { type: string }) => {
+      played.push(source.type);
+      return 0.1;
+    });
+    const { runtime } = createRuntime({ engine });
+    runtime.registerSession(adapter);
+
+    await runtime.startVoice("server-1", "agent-1");
+    runtime.onTurnEvent("server-1", "agent-1", "turn_started");
+
+    runtime.handleAudioOutput(
+      "server-1",
+      createAudioPayload({
+        id: "seg-1-chunk-0",
+        groupId: "seg-1",
+        chunkIndex: 0,
+        isLastChunk: true,
+      }),
+    );
+    await vi.waitFor(() => {
+      expect(runtime.getSnapshot().phase).toBe("waiting");
+    });
+
+    await vi.advanceTimersByTimeAsync(400);
+
+    runtime.handleAudioOutput(
+      "server-1",
+      createAudioPayload({
+        id: "seg-2-chunk-0",
+        groupId: "seg-2",
+        chunkIndex: 0,
+        isLastChunk: true,
+      }),
+    );
+    await vi.waitFor(() => {
+      expect(played).toContain(SEGMENT_MIME_TYPE);
+    });
+
+    const replyStart = played.indexOf(SEGMENT_MIME_TYPE);
+    expect(replyStart).toBeGreaterThanOrEqual(0);
+    expect(played.slice(replyStart).filter((type) => type === CUE_MIME_TYPE)).toEqual([]);
+  });
+
   it("returns to listening after assistant playback once the turn is complete", async () => {
     const adapter = createSessionAdapter();
     const { runtime, engine } = createRuntime();
@@ -310,6 +368,7 @@ describe("voice runtime", () => {
 
     await runtime.startVoice("server-1", "agent-1");
     runtime.onTurnEvent("server-1", "agent-1", "turn_started");
+    await vi.advanceTimersByTimeAsync(THINKING_TONE_MIN_SILENCE_MS);
     runtime.onAssistantAudioStarted("server-1");
     runtime.onTurnEvent("server-1", "agent-1", "turn_completed");
     runtime.onAssistantAudioFinished("server-1");
diff --git a/packages/app/src/voice/voice-runtime.ts b/packages/app/src/voice/voice-runtime.ts
index 6bb42499e4..3b7843e2f7 100644
--- a/packages/app/src/voice/voice-runtime.ts
+++ b/packages/app/src/voice/voice-runtime.ts
@@ -2,7 +2,7 @@ import { Buffer } from "buffer";
 import type { AgentStreamEventPayload, SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { resolveVoiceUnavailableMessage } from "@/utils/server-info-capabilities";
 import type { DaemonServerInfo } from "@/stores/session-store";
-import type { AudioEngine } from "@/voice/audio-engine-types";
+import type { AudioEngine } from "@/audio";
 import {
   THINKING_TONE_NATIVE_PCM_BASE64,
   THINKING_TONE_NATIVE_PCM_DURATION_MS,
@@ -11,6 +11,13 @@ import {
 const PCM_MIME_TYPE = "audio/pcm;rate=16000;bits=16";
 const KEEP_AWAKE_TAG = "paseo:voice";
 const THINKING_TONE_REPEAT_GAP_MS = 350;
+/**
+ * A reply is spoken as one TTS segment per sentence, and the daemon starts the next segment
+ * only once the current one has finished playing, so a reply in progress is punctuated by short
+ * silences. The cue is for a wait the user cannot otherwise explain, so it starts only once the
+ * silence has outlasted those gaps.
+ */
+const THINKING_TONE_MIN_SILENCE_MS = 1500;
 const DISPLAY_VOLUME_PUBLISH_INTERVAL_MS = 120;
 const DISPLAY_VOLUME_CHANGE_EPSILON = 0.02;
 const DISPLAY_VOLUME_ATTACK = 0.35;
@@ -111,10 +118,8 @@ interface RuntimePlaybackState {
 }
 
 interface CueState {
-  active: boolean;
-  token: number;
+  controller: AbortController | null;
   timeout: ReturnType<typeof setTimeout> | null;
-  playing: boolean;
 }
 
 const INITIAL_SNAPSHOT: VoiceRuntimeSnapshot = {
@@ -203,10 +208,8 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
     generation: 0,
   };
   const cue: CueState = {
-    active: false,
-    token: 0,
+    controller: null,
     timeout: null,
-    playing: false,
   };
   const cuePcm16 = Uint8Array.from(Buffer.from(THINKING_TONE_NATIVE_PCM_BASE64, "base64"));
   const cueSource = {
@@ -435,18 +438,12 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
   }
 
   function stopCue(): void {
-    const hadActive = cue.active || cue.timeout !== null || cue.playing;
-    cue.active = false;
-    cue.token += 1;
+    cue.controller?.abort();
+    cue.controller = null;
     if (cue.timeout) {
       clearTimeout(cue.timeout);
       cue.timeout = null;
     }
-    cue.playing = false;
-    if (hadActive) {
-      deps.engine.stop();
-      deps.engine.clearQueue();
-    }
   }
 
   function resetCaptureTelemetry(): void {
@@ -460,29 +457,26 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
       stopCue();
       return;
     }
-    if (cue.active) {
+    if (cue.controller) {
       return;
     }
-    cue.active = true;
-    cue.token += 1;
-    const token = cue.token;
+    const controller = new AbortController();
+    cue.controller = controller;
 
     const playNext = () => {
-      if (!cue.active || cue.token !== token) {
+      if (controller.signal.aborted) {
         return;
       }
-      cue.playing = true;
       void deps.engine
-        .play(cueSource)
+        .play(cueSource, controller.signal)
         .catch((error) => {
-          if (cue.token !== token) {
+          if (controller.signal.aborted) {
             return;
           }
           console.warn(`[VoiceRuntime#${instanceId}] Cue playback failed:`, error);
         })
         .finally(() => {
-          cue.playing = false;
-          if (!cue.active || cue.token !== token) {
+          if (controller.signal.aborted) {
             return;
           }
           cue.timeout = setTimeout(
@@ -492,7 +486,7 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
         });
     };
 
-    playNext();
+    cue.timeout = setTimeout(playNext, THINKING_TONE_MIN_SILENCE_MS);
   }
 
   const uploader: ContinuousVoiceUploader = {
@@ -913,10 +907,9 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
       if (isSpeaking) {
         const shouldInterruptPlayback =
           state.snapshot.phase === "playing" || playback.groups.size > 0;
-        const hadCue = cue.active || cue.timeout !== null || cue.playing;
         resetPlaybackState();
         stopCue();
-        if (shouldInterruptPlayback && !hadCue) {
+        if (shouldInterruptPlayback) {
           deps.engine.stop();
           deps.engine.clearQueue();
         }
diff --git a/packages/app/src/workspace-labels/index.ts b/packages/app/src/workspace-labels/index.ts
index b2c46ab748..95fd5a3a26 100644
--- a/packages/app/src/workspace-labels/index.ts
+++ b/packages/app/src/workspace-labels/index.ts
@@ -147,6 +147,11 @@ class WorkspaceLabelsController {
     client: DaemonClient;
     supportsWorkspaceLabels: boolean;
   }): Promise<void> {
+    const existing = this.connections.get(input.serverId);
+    if (existing?.client === input.client && input.supportsWorkspaceLabels) {
+      await this.refresh(input.serverId);
+      return;
+    }
     this.disconnect(input.serverId);
     const replica = this.replicas.get(input.serverId) ?? new HostWorkspaceLabelReplica();
     this.replicas.set(input.serverId, replica);
@@ -155,18 +160,38 @@ class WorkspaceLabelsController {
       return;
     }
 
-    let connection: HostConnection | undefined;
-    const unsubscribe = input.client.on("workspace.label.update", (message) => {
-      if (this.connections.get(input.serverId) !== connection) return;
-      if (!replica.applyUpdate(message)) {
-        void this.refresh(input.serverId).catch(() => undefined);
-        return;
-      }
-      this.publish(input.serverId, replica, "online", null);
-    });
-    connection = { client: input.client, replica, unsubscribe };
+    const subscription = input.client.observeWorkspaceLabels();
+    const connection: HostConnection = {
+      client: input.client,
+      replica,
+      unsubscribe: () => {
+        void subscription.release().catch(() => undefined);
+      },
+    };
     this.connections.set(input.serverId, connection);
-    await this.refresh(input.serverId);
+    subscription.subscribe({
+      snapshot: (payload) => {
+        replica.applyList(payload);
+        this.publish(input.serverId, replica, "online", null);
+      },
+      update: (message) => {
+        if (message.type !== "workspace.label.update") return;
+        if (!replica.applyUpdate(message)) {
+          void this.refresh(input.serverId).catch(() => undefined);
+          return;
+        }
+        this.publish(input.serverId, replica, "online", null);
+      },
+      error: (error) => {
+        this.publish(
+          input.serverId,
+          replica,
+          "online",
+          error instanceof Error ? error.message : i18n.t("workspaceLabels.errors.load"),
+        );
+      },
+    });
+    await subscription.ready;
   }
 
   disconnect(serverId: string): void {
@@ -207,7 +232,6 @@ class WorkspaceLabelsController {
     if (!connection) return;
     try {
       const payload = await connection.client.listWorkspaceLabels({
-        subscriptionId: `workspace-labels:${serverId}`,
         sync: connection.replica.snapshot().cursor,
       });
       if (this.connections.get(serverId) !== connection) return;
diff --git a/packages/app/src/workspace-labels/manager-modal.tsx b/packages/app/src/workspace-labels/manager-modal.tsx
index 0dc8f1c53f..a23e7e0925 100644
--- a/packages/app/src/workspace-labels/manager-modal.tsx
+++ b/packages/app/src/workspace-labels/manager-modal.tsx
@@ -174,9 +174,6 @@ export function WorkspaceLabelManagerModal({
       onClose={onClose}
       header={header}
       footer={footer}
-      // Bound the compact scroller to the live snap height, so the edit view's footer stays on
-      // screen instead of being pushed past the bottom of the sheet.
-      sizeContentToCurrentSnapPoint
       testID="workspace-label-manager"
     >
       {draft && editing ? (
diff --git a/packages/app/src/workspace-labels/picker.tsx b/packages/app/src/workspace-labels/picker.tsx
index 7afdaeabe6..a0e2348308 100644
--- a/packages/app/src/workspace-labels/picker.tsx
+++ b/packages/app/src/workspace-labels/picker.tsx
@@ -131,6 +131,7 @@ function WorkspaceLabelPickerPage({
   }, [assignedLabels, host?.status, labels, model]);
   const snapshot = useSyncExternalStore(model.subscribe, model.snapshot, model.snapshot);
   const offline = !snapshot.online;
+  const error = snapshot.error ?? (host?.error ? t("workspaceLabels.errors.load") : null);
   const pending = useMemo(() => new Set(snapshot.pendingNames), [snapshot.pendingNames]);
   const toggle = useCallback(
     (label: WorkspaceLabelDefinition, assigned: boolean) => {
@@ -159,9 +160,7 @@ function WorkspaceLabelPickerPage({
       >
         {t("workspaceLabels.create")}
       </MenuSubTrigger>
-      {snapshot.error ? (
-        <MenuHint testID="workspace-label-picker-error">{snapshot.error}</MenuHint>
-      ) : null}
+      {error ? <MenuHint testID="workspace-label-picker-error">{error}</MenuHint> : null}
       {host?.status === "unsupported" ? (
         <MenuHint>{t("workspaceLabels.updateHostUse")}</MenuHint>
       ) : null}
diff --git a/packages/app/src/workspace-recovery/model.test.ts b/packages/app/src/workspace-recovery/model.test.ts
index 46f7aba864..c4a6de7a21 100644
--- a/packages/app/src/workspace-recovery/model.test.ts
+++ b/packages/app/src/workspace-recovery/model.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { recoverWorkspaceSelection, resolveWorkspaceRecoveryModel } from "./model";
+import { resolveWorkspaceRecoveryModel } from "./model";
 
 describe("resolveWorkspaceRecoveryModel", () => {
   it("keeps newer recovery actions visible but non-actionable", () => {
@@ -29,24 +29,3 @@ describe("resolveWorkspaceRecoveryModel", () => {
     });
   });
 });
-
-describe("recoverWorkspaceSelection", () => {
-  it("restores the workspace and selected archived agent as one recovery action", async () => {
-    const operations: string[] = [];
-
-    await recoverWorkspaceSelection({
-      workspaceId: "workspace-1",
-      agentId: "agent-1",
-      client: {
-        restoreWorkspace: async (workspaceId) => {
-          operations.push(`workspace:${workspaceId}`);
-        },
-        refreshAgent: async (agentId) => {
-          operations.push(`agent:${agentId}`);
-        },
-      },
-    });
-
-    expect(operations).toEqual(["workspace:workspace-1", "agent:agent-1"]);
-  });
-});
diff --git a/packages/app/src/workspace-recovery/model.ts b/packages/app/src/workspace-recovery/model.ts
index 2c85a06f4a..5d5ebf15e0 100644
--- a/packages/app/src/workspace-recovery/model.ts
+++ b/packages/app/src/workspace-recovery/model.ts
@@ -34,22 +34,6 @@ export interface WorkspaceRecoveryController {
   retryInspection: () => void;
 }
 
-export interface WorkspaceSelectionRecoveryClient {
-  restoreWorkspace: (workspaceId: string) => Promise<unknown>;
-  refreshAgent: (agentId: string) => Promise<unknown>;
-}
-
-export async function recoverWorkspaceSelection(input: {
-  client: WorkspaceSelectionRecoveryClient;
-  workspaceId: string;
-  agentId?: string | null;
-}): Promise<void> {
-  await input.client.restoreWorkspace(input.workspaceId);
-  if (input.agentId) {
-    await input.client.refreshAgent(input.agentId);
-  }
-}
-
 function resolveRecoveryPhase(input: {
   pending: boolean;
   error: string | null;
diff --git a/packages/app/src/workspace-recovery/use-workspace-recovery.ts b/packages/app/src/workspace-recovery/use-workspace-recovery.ts
index ab19957190..d91aa3ce6e 100644
--- a/packages/app/src/workspace-recovery/use-workspace-recovery.ts
+++ b/packages/app/src/workspace-recovery/use-workspace-recovery.ts
@@ -4,11 +4,7 @@ import { useFetchQuery } from "@/data/query";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useSessionStore } from "@/stores/session-store";
 import { toErrorMessage } from "@/utils/error-messages";
-import {
-  recoverWorkspaceSelection,
-  resolveWorkspaceRecoveryModel,
-  type WorkspaceRecoveryController,
-} from "./model";
+import { resolveWorkspaceRecoveryModel, type WorkspaceRecoveryController } from "./model";
 
 export type { WorkspaceRecoveryController, WorkspaceRecoveryModel } from "./model";
 
@@ -32,7 +28,6 @@ function waitForMinimumRecoveryLoadingTime(): Promise<void> {
 export function useWorkspaceRecovery(input: {
   serverId: string;
   workspaceId: string;
-  agentId?: string | null;
   enabled: boolean;
 }): WorkspaceRecoveryController {
   const client = useHostRuntimeClient(input.serverId);
@@ -61,11 +56,7 @@ export function useWorkspaceRecovery(input: {
       }
       await waitForRecoveryLoadingPresentation();
       await waitForMinimumRecoveryLoadingTime();
-      await recoverWorkspaceSelection({
-        client,
-        workspaceId: input.workspaceId,
-        agentId: input.agentId,
-      });
+      await client.restoreWorkspace(input.workspaceId);
     },
   });
 
diff --git a/packages/app/src/workspace-tabs/agent-visibility.test.ts b/packages/app/src/workspace-tabs/agent-visibility.test.ts
index 8488c8f515..3b16c6b8d5 100644
--- a/packages/app/src/workspace-tabs/agent-visibility.test.ts
+++ b/packages/app/src/workspace-tabs/agent-visibility.test.ts
@@ -23,7 +23,7 @@ function makeAgent(input: {
     id: input.id,
     provider: "codex",
     status: "idle",
-    activeTurn: null,
+    turn: { phase: "idle", cancellationRequestId: null },
     createdAt,
     updatedAt: createdAt,
     lastUserMessageAt: null,
@@ -61,7 +61,7 @@ function makeAgent(input: {
 const WORKSPACE_ID = "ws-1";
 
 describe("workspace agent visibility", () => {
-  it("keeps subagents active and known while excluding them from auto-open", () => {
+  it("keeps subagents active while excluding them from auto-open", () => {
     const parent = makeAgent({
       id: "parent-agent",
       cwd: "/repo/worktree",
@@ -84,10 +84,9 @@ describe("workspace agent visibility", () => {
 
     expect(result.activeAgentIds).toEqual(new Set(["parent-agent", "child-agent"]));
     expect(result.autoOpenAgentIds).toEqual(new Set(["parent-agent"]));
-    expect(result.knownAgentIds).toEqual(new Set(["parent-agent", "child-agent"]));
   });
 
-  it("keeps archived subagents known but excludes them from active and auto-open", () => {
+  it("excludes archived subagents from active and auto-open", () => {
     const archivedChild = makeAgent({
       id: "archived-child",
       cwd: "/repo/worktree",
@@ -103,7 +102,6 @@ describe("workspace agent visibility", () => {
 
     expect(result.activeAgentIds).toEqual(new Set<string>());
     expect(result.autoOpenAgentIds).toEqual(new Set<string>());
-    expect(result.knownAgentIds).toEqual(new Set(["archived-child"]));
   });
 
   it("excludes a child from auto-open even when its snapshot arrives before the parent", () => {
@@ -129,7 +127,6 @@ describe("workspace agent visibility", () => {
 
     expect(result.activeAgentIds).toEqual(new Set(["child-agent", "parent-agent"]));
     expect(result.autoOpenAgentIds).toEqual(new Set(["parent-agent"]));
-    expect(result.knownAgentIds).toEqual(new Set(["child-agent", "parent-agent"]));
   });
 
   it("auto-opens a subagent whose parent belongs to another workspace", () => {
@@ -155,10 +152,9 @@ describe("workspace agent visibility", () => {
 
     expect(result.activeAgentIds).toEqual(new Set(["child-agent"]));
     expect(result.autoOpenAgentIds).toEqual(new Set(["child-agent"]));
-    expect(result.knownAgentIds).toEqual(new Set(["child-agent"]));
   });
 
-  it("keeps archived agents out of activeAgentIds but present in knownAgentIds", () => {
+  it("excludes archived agents from the active directory", () => {
     const visible = makeAgent({
       id: "visible-agent",
       cwd: "/repo/worktree",
@@ -191,12 +187,9 @@ describe("workspace agent visibility", () => {
 
     expect(result.activeAgentIds).toEqual(new Set(["visible-agent"]));
     expect(result.autoOpenAgentIds).toEqual(new Set(["visible-agent"]));
-    expect(result.knownAgentIds.has("visible-agent")).toBe(true);
-    expect(result.knownAgentIds.has("archived-agent")).toBe(true);
-    expect(result.knownAgentIds.has("other-workspace-agent")).toBe(false);
   });
 
-  it("treats lazy historical details as known without making them active", () => {
+  it("does not make historical details active", () => {
     const active = makeAgent({
       id: "active-agent",
       cwd: "/repo/worktree",
@@ -216,7 +209,6 @@ describe("workspace agent visibility", () => {
     });
 
     expect(result.activeAgentIds).toEqual(new Set(["active-agent"]));
-    expect(result.knownAgentIds).toEqual(new Set(["active-agent", "historical-agent"]));
   });
 
   it("prunes archived agent tabs so archiving on one client closes tabs on all clients", () => {
@@ -281,7 +273,6 @@ describe("workspace agent visibility", () => {
     });
 
     expect(result.activeAgentIds).toEqual(new Set(["stamped-agent"]));
-    expect(result.knownAgentIds).toEqual(new Set(["stamped-agent"]));
   });
 
   it("excludes a stamped agent whose workspaceId belongs to another workspace sharing the cwd", () => {
@@ -302,7 +293,6 @@ describe("workspace agent visibility", () => {
     });
 
     expect(result.activeAgentIds).toEqual(new Set<string>());
-    expect(result.knownAgentIds).toEqual(new Set<string>());
   });
 
   it("excludes agents without a workspaceId", () => {
@@ -316,14 +306,12 @@ describe("workspace agent visibility", () => {
     });
 
     expect(result.activeAgentIds).toEqual(new Set<string>());
-    expect(result.knownAgentIds).toEqual(new Set<string>());
   });
 
   it("builds the tab reconciliation snapshot without callers unpacking agent visibility", () => {
     const agentVisibility = {
       activeAgentIds: new Set(["active-agent"]),
       autoOpenAgentIds: new Set(["root-agent"]),
-      knownAgentIds: new Set(["active-agent", "archived-agent"]),
     };
 
     expect(
@@ -341,7 +329,6 @@ describe("workspace agent visibility", () => {
       terminalsHydrated: true,
       activeAgentIds: agentVisibility.activeAgentIds,
       autoOpenAgentIds: agentVisibility.autoOpenAgentIds,
-      knownAgentIds: agentVisibility.knownAgentIds,
       knownTerminalIds: ["terminal-1", "script-terminal"],
       standaloneTerminalIds: ["terminal-1"],
       hasActivePendingTerminalCreate: false,
@@ -354,12 +341,10 @@ describe("workspace agent visibility", () => {
       const a = {
         activeAgentIds: new Set(["a", "b"]),
         autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a", "b", "c"]),
       };
       const b = {
         activeAgentIds: new Set(["a", "b"]),
         autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a", "b", "c"]),
       };
       expect(workspaceAgentVisibilityEqual(a, b)).toBe(true);
     });
@@ -368,12 +353,10 @@ describe("workspace agent visibility", () => {
       const a = {
         activeAgentIds: new Set(["a"]),
         autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a"]),
       };
       const b = {
         activeAgentIds: new Set(["b"]),
         autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a"]),
       };
       expect(workspaceAgentVisibilityEqual(a, b)).toBe(false);
     });
@@ -382,26 +365,10 @@ describe("workspace agent visibility", () => {
       const a = {
         activeAgentIds: new Set(["a", "b"]),
         autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a", "b"]),
       };
       const b = {
         activeAgentIds: new Set(["a", "b"]),
         autoOpenAgentIds: new Set(["b"]),
-        knownAgentIds: new Set(["a", "b"]),
-      };
-      expect(workspaceAgentVisibilityEqual(a, b)).toBe(false);
-    });
-
-    it("returns false when knownAgentIds differ", () => {
-      const a = {
-        activeAgentIds: new Set(["a"]),
-        autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a"]),
-      };
-      const b = {
-        activeAgentIds: new Set(["a"]),
-        autoOpenAgentIds: new Set(["a"]),
-        knownAgentIds: new Set(["a", "b"]),
       };
       expect(workspaceAgentVisibilityEqual(a, b)).toBe(false);
     });
@@ -410,12 +377,10 @@ describe("workspace agent visibility", () => {
       const a = {
         activeAgentIds: new Set<string>(),
         autoOpenAgentIds: new Set<string>(),
-        knownAgentIds: new Set<string>(),
       };
       const b = {
         activeAgentIds: new Set<string>(),
         autoOpenAgentIds: new Set<string>(),
-        knownAgentIds: new Set<string>(),
       };
       expect(workspaceAgentVisibilityEqual(a, b)).toBe(true);
     });
diff --git a/packages/app/src/workspace-tabs/agent-visibility.ts b/packages/app/src/workspace-tabs/agent-visibility.ts
index 1f8f5c5ed4..399b786ef6 100644
--- a/packages/app/src/workspace-tabs/agent-visibility.ts
+++ b/packages/app/src/workspace-tabs/agent-visibility.ts
@@ -6,7 +6,6 @@ import { normalizeWorkspaceOpaqueId } from "@/utils/workspace-identity";
 export interface WorkspaceAgentVisibility {
   activeAgentIds: Set<string>;
   autoOpenAgentIds: Set<string>;
-  knownAgentIds: Set<string>;
 }
 
 function agentBelongsToWorkspace(agent: Agent, workspaceId: string): boolean {
@@ -24,13 +23,11 @@ export function deriveWorkspaceAgentVisibility(input: {
     return {
       activeAgentIds: new Set<string>(),
       autoOpenAgentIds: new Set<string>(),
-      knownAgentIds: new Set<string>(),
     };
   }
 
   const activeAgentIds = new Set<string>();
   const autoOpenAgentIds = new Set<string>();
-  const knownAgentIds = new Set<string>();
   const agentsById = new Map<string, Agent>([
     ...(agentDetails?.entries() ?? []),
     ...(sessionAgents?.entries() ?? []),
@@ -39,7 +36,6 @@ export function deriveWorkspaceAgentVisibility(input: {
     if (!agentBelongsToWorkspace(agent, workspaceId)) {
       continue;
     }
-    knownAgentIds.add(agent.id);
     if (!agent.archivedAt) {
       activeAgentIds.add(agent.id);
       const parentAgent = agent.parentAgentId ? agentsById.get(agent.parentAgentId) : undefined;
@@ -48,14 +44,7 @@ export function deriveWorkspaceAgentVisibility(input: {
       }
     }
   }
-  for (const agent of agentDetails?.values() ?? []) {
-    if (!agentBelongsToWorkspace(agent, workspaceId)) {
-      continue;
-    }
-    knownAgentIds.add(agent.id);
-  }
-
-  return { activeAgentIds, autoOpenAgentIds, knownAgentIds };
+  return { activeAgentIds, autoOpenAgentIds };
 }
 
 export function buildWorkspaceTabSnapshot(input: {
@@ -72,7 +61,6 @@ export function buildWorkspaceTabSnapshot(input: {
     terminalsHydrated: input.terminalsHydrated,
     activeAgentIds: input.agentVisibility.activeAgentIds,
     autoOpenAgentIds: input.agentVisibility.autoOpenAgentIds,
-    knownAgentIds: input.agentVisibility.knownAgentIds,
     knownTerminalIds: input.knownTerminalIds,
     standaloneTerminalIds: input.standaloneTerminalIds,
     hasActivePendingTerminalCreate: input.hasActivePendingTerminalCreate,
@@ -86,8 +74,7 @@ export function workspaceAgentVisibilityEqual(
 ): boolean {
   return (
     setsEqual(a.activeAgentIds, b.activeAgentIds) &&
-    setsEqual(a.autoOpenAgentIds, b.autoOpenAgentIds) &&
-    setsEqual(a.knownAgentIds, b.knownAgentIds)
+    setsEqual(a.autoOpenAgentIds, b.autoOpenAgentIds)
   );
 }
 
diff --git a/packages/app/src/workspace-tabs/launcher/index.tsx b/packages/app/src/workspace-tabs/launcher/index.tsx
index ba4998fda9..ea983b4bd8 100644
--- a/packages/app/src/workspace-tabs/launcher/index.tsx
+++ b/packages/app/src/workspace-tabs/launcher/index.tsx
@@ -18,7 +18,7 @@ import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 import type { NewTabSelection } from "@/workspace-tabs/new-tab";
 import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
-import { panelSupportsHost, type PaneHost } from "@/panels/panel-manifest";
+import { panelCanLaunchInPane, panelSupportsHost, type PaneHost } from "@/panels/panel-manifest";
 import {
   getPanelRegistration,
   type PanelIconProps,
@@ -63,6 +63,8 @@ export interface WorkspaceTabLaunchGroup {
   accessory?: { id: string; label: string; run: () => void };
 }
 
+const EMPTY_PANE_PANEL_KINDS: readonly WorkspaceTabTarget["kind"][] = [];
+
 const NewTabLauncherContext = createContext<NewTabLauncher | null>(null);
 
 export function NewTabLauncherProvider({
@@ -75,7 +77,7 @@ export function NewTabLauncherProvider({
   return <NewTabLauncherContext.Provider value={value}>{children}</NewTabLauncherContext.Provider>;
 }
 
-const BUILT_IN_SELECTIONS: Record<BuiltInLaunchItemId, NewTabSelection> = {
+const BUILT_IN_SELECTIONS = {
   agent: { kind: "agent" },
   terminal: { kind: "terminal" },
   changes: { kind: "target", target: { kind: "changes_tree" } },
@@ -83,7 +85,7 @@ const BUILT_IN_SELECTIONS: Record<BuiltInLaunchItemId, NewTabSelection> = {
   files: { kind: "target", target: { kind: "files" } },
   browser: { kind: "browser" },
   pullRequest: { kind: "target", target: { kind: "pull_request" } },
-};
+} satisfies Record<BuiltInLaunchItemId, NewTabSelection>;
 
 function getLaunchPresentation(kind: WorkspaceTabTarget["kind"]): PanelPresentation {
   const registration = getPanelRegistration(kind);
@@ -95,8 +97,10 @@ export function useWorkspaceTabLaunchCatalog(input: {
   serverId: string;
   purpose: WorkspaceTabLaunchPurpose;
   host: PaneHost;
+  surface: "menu" | "panel";
+  panePanelKinds?: readonly WorkspaceTabTarget["kind"][];
 }): readonly WorkspaceTabLaunchGroup[] {
-  const { serverId, purpose, host } = input;
+  const { serverId, purpose, host, surface, panePanelKinds = EMPTY_PANE_PANEL_KINDS } = input;
   const { t } = useTranslation();
   const router = useRouter();
   const launcher = useContext(NewTabLauncherContext);
@@ -116,6 +120,7 @@ export function useWorkspaceTabLaunchCatalog(input: {
   }, [router, serverId]);
 
   return useMemo(() => {
+    const isExplorerMenu = host === "explorer" && surface === "menu";
     const changesPresentation = getLaunchPresentation("changes_tree");
     const diffPresentation = getLaunchPresentation("working_diff");
     const filesPresentation = getLaunchPresentation("files");
@@ -128,6 +133,7 @@ export function useWorkspaceTabLaunchCatalog(input: {
         shortcutActionId: "workspace-tab-target-agent",
         disabled: false,
         panelKind: "draft",
+        hidden: isExplorerMenu,
         launch: launchSelection(BUILT_IN_SELECTIONS.agent),
       },
       terminal: {
@@ -219,7 +225,7 @@ export function useWorkspaceTabLaunchCatalog(input: {
     if (pluginItems.length > 0) {
       groups.push({ id: "plugin-panels", label: null, items: pluginItems });
     }
-    if (profiles.length > 0) {
+    if (!isExplorerMenu && profiles.length > 0) {
       groups.push({
         id: "terminal-profiles",
         label: t("workspace.tabs.actions.terminalProfilesMenu"),
@@ -238,7 +244,13 @@ export function useWorkspaceTabLaunchCatalog(input: {
         },
       });
     }
-    return groups;
+    if (surface !== "menu") return groups;
+    return groups.flatMap((group) => {
+      const items = group.items.filter((item) =>
+        panelCanLaunchInPane(item.panelKind, panePanelKinds),
+      );
+      return items.length > 0 ? [{ ...group, items }] : [];
+    });
   }, [
     config?.terminalProfiles,
     editTerminalProfiles,
@@ -247,6 +259,8 @@ export function useWorkspaceTabLaunchCatalog(input: {
     plugins,
     purpose,
     host,
+    surface,
+    panePanelKinds,
     serverId,
     t,
   ]);
diff --git a/packages/app/src/workspace-tabs/launcher/internal/catalog.test.ts b/packages/app/src/workspace-tabs/launcher/internal/catalog.test.ts
index a2ede20ddf..864e0ec43f 100644
--- a/packages/app/src/workspace-tabs/launcher/internal/catalog.test.ts
+++ b/packages/app/src/workspace-tabs/launcher/internal/catalog.test.ts
@@ -17,9 +17,9 @@ describe("getBuiltInLaunchOrder", () => {
   it("leads with companion tools in a supporting pane", () => {
     expect(getBuiltInLaunchOrder("supporting")).toEqual([
       "changes",
+      "terminal",
       "diff",
       "files",
-      "terminal",
       "agent",
       "browser",
       "pullRequest",
diff --git a/packages/app/src/workspace-tabs/launcher/internal/catalog.ts b/packages/app/src/workspace-tabs/launcher/internal/catalog.ts
index dfed374170..5c2c77cdfe 100644
--- a/packages/app/src/workspace-tabs/launcher/internal/catalog.ts
+++ b/packages/app/src/workspace-tabs/launcher/internal/catalog.ts
@@ -10,9 +10,9 @@ export const PRIMARY_LAUNCH_ORDER = [
 
 export const SUPPORTING_LAUNCH_ORDER = [
   "changes",
+  "terminal",
   "diff",
   "files",
-  "terminal",
   "agent",
   "browser",
   "pullRequest",
diff --git a/packages/app/src/workspace-tabs/open-beside.ts b/packages/app/src/workspace-tabs/open-beside.ts
index 7acda716c1..b36d227c3b 100644
--- a/packages/app/src/workspace-tabs/open-beside.ts
+++ b/packages/app/src/workspace-tabs/open-beside.ts
@@ -4,6 +4,7 @@ import {
   collectAllPanes,
   DEFAULT_PANE_ID,
   findPaneById,
+  findPaneContainingTab,
   useWorkspaceLayoutStore,
   type WorkspaceTabPlacement,
 } from "@/stores/workspace-layout-store";
@@ -109,6 +110,10 @@ export function openWorkspaceTargetAtLocation(
   if (shouldOpenBeside && !targetAlreadyExists) {
     const paneId = store.ensureSidePane(input.workspaceKey);
     placement = paneId ? { mode: "prefer", paneId } : undefined;
+  } else if (!shouldOpenBeside && layout && input.parentTabId) {
+    // A target opened from a tab belongs in that tab's pane, whichever pane has focus.
+    const parentPane = findPaneContainingTab(layout.root, input.parentTabId);
+    placement = parentPane ? { mode: "prefer", paneId: parentPane.id } : undefined;
   }
   return store.openTab({
     workspaceKey: input.workspaceKey,
diff --git a/packages/app/src/workspace-tabs/open-supporting-view.test.ts b/packages/app/src/workspace-tabs/open-supporting-view.test.ts
index c0fa1c5927..b3e6f4c976 100644
--- a/packages/app/src/workspace-tabs/open-supporting-view.test.ts
+++ b/packages/app/src/workspace-tabs/open-supporting-view.test.ts
@@ -16,6 +16,7 @@ import {
   useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";
 import {
+  autoOpenWorkspacePullRequest,
   openComposerChanges,
   openWorkspaceChanges,
   openWorkspacePullRequest,
@@ -31,6 +32,7 @@ beforeEach(() => {
     explorerTabByCheckout: {},
   });
   useWorkspaceLayoutStore.setState({
+    pullRequestTabAutoOpenedByWorkspace: {},
     layoutByWorkspace: {},
     explorerSidebarPaneIdByWorkspace: {},
     sidePaneIdByWorkspace: {},
@@ -178,3 +180,152 @@ describe("openWorkspacePullRequest", () => {
     expect(sidePane?.tabIds).toContain(pullRequestTab?.tabId);
   });
 });
+
+describe("autoOpenWorkspacePullRequest", () => {
+  it("silently adds the PR after Changes once, and never restores it after closing", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+    });
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "terminal", terminalId: "terminal-1" },
+      intent: "background",
+      placement: { mode: "prefer", paneId: "explorer" },
+    });
+    const before = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+    const input = { workspaceKey: WORKSPACE_KEY, destination: "explorer" as const };
+    autoOpenWorkspacePullRequest(input);
+    const after = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+    const explorer = findPaneById(after.root, "explorer")!;
+    expect(explorer.tabIds).toEqual([
+      "files",
+      "changes_tree",
+      "pull_request",
+      "terminal_terminal-1",
+    ]);
+    expect(explorer.hidden).toBe(true);
+    expect(explorer.focusedTabId).toBe(findPaneById(before.root, "explorer")!.focusedTabId);
+    expect(after.focusedPaneId).toBe(before.focusedPaneId);
+    store.closeTab(WORKSPACE_KEY, "pull_request");
+    autoOpenWorkspacePullRequest(input);
+    expect(
+      collectAllTabs(useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY].root).map(
+        (tab) => tab.target.kind,
+      ),
+    ).not.toContain("pull_request");
+  });
+});
+
+describe("automatic PR placement", () => {
+  it.each(["main", "side"] as const)(
+    "silently appends to the configured %s pane",
+    (destination) => {
+      const store = useWorkspaceLayoutStore.getState();
+      store.openTab({
+        workspaceKey: WORKSPACE_KEY,
+        target: { kind: "agent", agentId: "agent-1" },
+        intent: "reveal",
+      });
+      const paneId = destination === "main" ? "main" : store.ensureSidePane(WORKSPACE_KEY)!;
+      store.openTab({
+        workspaceKey: WORKSPACE_KEY,
+        target: { kind: "terminal", terminalId: "terminal-1" },
+        intent: "background",
+        placement: { mode: "prefer", paneId },
+      });
+      const before = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+      autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination });
+      const after = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+      expect(findPaneById(after.root, paneId)!.tabIds).toEqual([
+        ...findPaneById(before.root, paneId)!.tabIds,
+        "pull_request",
+      ]);
+      expect(findPaneById(after.root, paneId)!.focusedTabId).toBe(
+        findPaneById(before.root, paneId)!.focusedTabId,
+      );
+      expect(after.focusedPaneId).toBe(before.focusedPaneId);
+      expect(findPaneById(after.root, "explorer")!.hidden).toBe(true);
+    },
+  );
+
+  it("creates a side pane without stealing workspace focus", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+    });
+    autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination: "side" });
+    const state = useWorkspaceLayoutStore.getState();
+    const layout = state.layoutByWorkspace[WORKSPACE_KEY];
+    expect(findPaneById(layout.root, state.sidePaneIdByWorkspace[WORKSPACE_KEY])!.tabIds).toEqual([
+      "pull_request",
+    ]);
+    expect(layout.focusedPaneId).toBe("main");
+  });
+
+  it.each(["main", "side", "explorer"] as const)(
+    "leaves a manually moved PR in main when detection prefers %s",
+    (destination) => {
+      const store = useWorkspaceLayoutStore.getState();
+      store.openTab({
+        workspaceKey: WORKSPACE_KEY,
+        target: { kind: "pull_request" },
+        intent: "background",
+        placement: { mode: "prefer", paneId: "explorer" },
+      });
+      store.moveTabToPane(WORKSPACE_KEY, "pull_request", "main");
+      const before = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+      autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination });
+      expect(useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY]).toEqual(before);
+      expect(
+        useWorkspaceLayoutStore.getState().sidePaneIdByWorkspace[WORKSPACE_KEY],
+      ).toBeUndefined();
+      store.closeTab(WORKSPACE_KEY, "pull_request");
+      autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination });
+      expect(
+        collectAllTabs(
+          useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY].root,
+        ).map((tab) => tab.target.kind),
+      ).not.toContain("pull_request");
+      expect(
+        useWorkspaceLayoutStore.getState().sidePaneIdByWorkspace[WORKSPACE_KEY],
+      ).toBeUndefined();
+    },
+  );
+
+  it("preserves reordering before and after detection", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "pull_request" },
+      intent: "background",
+      placement: { mode: "prefer", paneId: "explorer" },
+    });
+    store.reorderTabsInPane(WORKSPACE_KEY, "explorer", ["pull_request", "files", "changes_tree"]);
+    const before = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY];
+    autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination: "explorer" });
+    autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination: "side" });
+    expect(useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY]).toEqual(before);
+  });
+
+  it("appends in Explorer when Changes was closed", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+    });
+    store.closeTab(WORKSPACE_KEY, "changes_tree");
+    autoOpenWorkspacePullRequest({ workspaceKey: WORKSPACE_KEY, destination: "explorer" });
+    expect(
+      findPaneById(
+        useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY].root,
+        "explorer",
+      )!.tabIds,
+    ).toEqual(["files", "pull_request"]);
+  });
+});
diff --git a/packages/app/src/workspace-tabs/open-supporting-view.ts b/packages/app/src/workspace-tabs/open-supporting-view.ts
index 047cdd3f97..b91bf732c9 100644
--- a/packages/app/src/workspace-tabs/open-supporting-view.ts
+++ b/packages/app/src/workspace-tabs/open-supporting-view.ts
@@ -1,3 +1,12 @@
+import {
+  collectAllPanes,
+  collectAllTabs,
+  createWorkspaceLayoutWithExplorerSidebar,
+  DEFAULT_PANE_ID,
+  findPaneContainingTab,
+  resolveExplorerSidebarPaneId,
+  useWorkspaceLayoutStore,
+} from "@/stores/workspace-layout-store";
 import type { OpenInSidePanePreferences, PullRequestOpenLocation } from "@/hooks/use-settings";
 import type { ExplorerCheckoutContext } from "@/stores/explorer-checkout-context";
 import {
@@ -67,3 +76,47 @@ export function openWorkspacePullRequest(input: OpenWorkspacePullRequestInput):
     location: input.destination,
   });
 }
+
+/** Adds a detected desktop PR once without revealing or selecting its destination. */
+export function autoOpenWorkspacePullRequest(input: {
+  workspaceKey: string | null;
+  destination: PullRequestOpenLocation;
+}): string | null {
+  if (!input.workspaceKey) return null;
+  const workspaceKey = input.workspaceKey;
+  const store = useWorkspaceLayoutStore.getState();
+  return store.autoOpenPullRequestTab(workspaceKey, () => {
+    const layout =
+      store.layoutByWorkspace[workspaceKey] ?? createWorkspaceLayoutWithExplorerSidebar();
+    // A background open finds an existing PR tab wherever the user left it.
+    if (collectAllTabs(layout.root).some((tab) => tab.target.kind === "pull_request")) {
+      return {};
+    }
+    const explorerPaneId = resolveExplorerSidebarPaneId(
+      layout,
+      store.explorerSidebarPaneIdByWorkspace[workspaceKey],
+    );
+    let paneId = explorerPaneId;
+    if (input.destination === "side") {
+      paneId = store.ensureSidePane(workspaceKey, { focus: false });
+    } else if (input.destination === "main") {
+      const panes = collectAllPanes(layout.root);
+      const mainPane =
+        panes.find((pane) => pane.id === DEFAULT_PANE_ID) ??
+        panes.find((pane) => pane.id !== explorerPaneId && !pane.hidden);
+      paneId = mainPane?.id ?? null;
+    }
+    const changes =
+      input.destination === "explorer"
+        ? collectAllTabs(layout.root).find(
+            (tab) =>
+              tab.target.kind === "changes_tree" &&
+              findPaneContainingTab(layout.root, tab.tabId)?.id === paneId,
+          )
+        : undefined;
+    return {
+      placement: paneId ? { mode: "prefer", paneId } : undefined,
+      insertionPosition: changes ? { afterTabId: changes.tabId } : undefined,
+    };
+  });
+}
diff --git a/packages/app/src/workspace/file-open/index.test.ts b/packages/app/src/workspace/file-open/index.test.ts
index d7d2dd3976..3b8ed4ca83 100644
--- a/packages/app/src/workspace/file-open/index.test.ts
+++ b/packages/app/src/workspace/file-open/index.test.ts
@@ -136,6 +136,24 @@ describe("resolveWorkspaceFilePaths", () => {
     });
   });
 
+  it("resolves files under a drive-root workspace without doubling the separator", () => {
+    expect(resolveWorkspaceFilePaths({ path: "C:/src/app.ts", workspaceRoot: "C:\\" })).toEqual({
+      absolutePath: "C:/src/app.ts",
+      relativePath: "src/app.ts",
+    });
+    expect(resolveWorkspaceFilePaths({ path: "src/app.ts", workspaceRoot: "C:\\" })).toEqual({
+      absolutePath: "C:/src/app.ts",
+      relativePath: "src/app.ts",
+    });
+  });
+
+  it("resolves files under the POSIX root workspace", () => {
+    expect(resolveWorkspaceFilePaths({ path: "/src/app.ts", workspaceRoot: "/" })).toEqual({
+      absolutePath: "/src/app.ts",
+      relativePath: "src/app.ts",
+    });
+  });
+
   it("returns null for home-relative paths that cannot be anchored", () => {
     expect(
       resolveWorkspaceFilePaths({ path: "~/notes.md", workspaceRoot: "/Users/me/repo" }),
diff --git a/packages/app/src/workspace/file-open/index.ts b/packages/app/src/workspace/file-open/index.ts
index f09d5bd81f..7668de923c 100644
--- a/packages/app/src/workspace/file-open/index.ts
+++ b/packages/app/src/workspace/file-open/index.ts
@@ -129,6 +129,17 @@ function startsWithPath(value: string, prefix: string): boolean {
     : value.startsWith(prefix);
 }
 
+function pathWithinRoot(root: string, relativePath: string): string {
+  return root.endsWith("/") ? `${root}${relativePath}` : `${root}/${relativePath}`;
+}
+
+/** Whether an absolute path names the workspace directory itself. */
+export function isWorkspaceRootPath(input: { path: string; workspaceRoot: string }): boolean {
+  const path = normalizeAbsolutePath(input.path.trim().replace(/\\/g, "/"));
+  const root = normalizeAbsolutePath(input.workspaceRoot.trim().replace(/\\/g, "/"));
+  return path !== null && root !== null && pathsEqual(path, root);
+}
+
 export interface ResolvedWorkspaceFilePaths {
   /** Absolute path on the host, suitable for opening in an editor / file manager. */
   absolutePath: string;
@@ -159,7 +170,7 @@ export function resolveWorkspaceFilePaths(input: {
     if (pathsEqual(normalizedFile, workspaceRoot)) {
       return null;
     }
-    const prefix = `${workspaceRoot}/`;
+    const prefix = pathWithinRoot(workspaceRoot, "");
     const relativePath = startsWithPath(normalizedFile, prefix)
       ? normalizedFile.slice(prefix.length)
       : null;
@@ -174,5 +185,5 @@ export function resolveWorkspaceFilePaths(input: {
   if (!relativePath) {
     return null;
   }
-  return { absolutePath: `${workspaceRoot}/${relativePath}`, relativePath };
+  return { absolutePath: pathWithinRoot(workspaceRoot, relativePath), relativePath };
 }
diff --git a/packages/app/src/workspace/legacy-daemon-workspaces.test.ts b/packages/app/src/workspace/legacy-daemon-workspaces.test.ts
index 7f50c4b57a..263596badc 100644
--- a/packages/app/src/workspace/legacy-daemon-workspaces.test.ts
+++ b/packages/app/src/workspace/legacy-daemon-workspaces.test.ts
@@ -1,27 +1,12 @@
 import { afterEach, describe, expect, it } from "vitest";
 import type { DaemonClient, FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
-import { useSessionStore, type Agent, type WorkspaceDescriptor } from "@/stores/session-store";
+import { useSessionStore, type Agent } from "@/stores/session-store";
 import { deriveWorkspaceAgentVisibility } from "@/workspace-tabs/agent-visibility";
-import { buildWorkspaceStructureProjects } from "@/projects/workspace-structure";
-import {
-  applyLegacyDaemonWorkspaceOwnership,
-  backfillLegacyDaemonWorkspaceDirectoryIfEmpty,
-  buildLegacyDaemonWorkspaceSnapshot,
-} from "./legacy-daemon-workspaces";
+import { buildAgentDirectoryState } from "@/utils/agent-directory-sync";
+import { applyLegacyDaemonWorkspaceOwnership } from "./legacy-daemon-workspaces";
 
 const SERVER_ID = "srv_legacy";
 
-function legacyProjectFromWorkspace(workspace: WorkspaceDescriptor) {
-  return {
-    projectId: workspace.projectId,
-    projectKey: null,
-    projectDisplayName: workspace.projectDisplayName,
-    projectCustomName: workspace.projectCustomName ?? null,
-    projectRootPath: workspace.projectRootPath,
-    projectKind: workspace.projectKind,
-  };
-}
-
 function legacyAgent(input: {
   id: string;
   cwd: string;
@@ -83,87 +68,9 @@ afterEach(() => {
   useSessionStore.getState().clearSession(SERVER_ID);
 });
 
-describe("buildLegacyDaemonWorkspaceSnapshot", () => {
-  it("creates path-backed workspace rows and stamps legacy agents with their workspace id", () => {
-    const snapshot = buildLegacyDaemonWorkspaceSnapshot({
-      serverId: SERVER_ID,
-      entries: [
-        legacyAgent({ id: "agent-running", cwd: "/repo/app", status: "running" }),
-        legacyAgent({ id: "agent-idle", cwd: "/repo/app", status: "idle" }),
-      ],
-    });
-
-    expect(Array.from(snapshot.workspaces.values())).toEqual([
-      expect.objectContaining({
-        id: "/repo/app",
-        projectId: "/repo",
-        projectDisplayName: "repo",
-        projectRootPath: "/repo",
-        workspaceDirectory: "/repo/app",
-        projectKind: "git",
-        workspaceKind: "checkout",
-        name: "app",
-        status: "running",
-        scripts: [],
-      }),
-    ]);
-    expect(
-      Array.from(snapshot.agents.values()).map((agent) => ({
-        id: agent.id,
-        serverId: agent.serverId,
-        cwd: agent.cwd,
-        workspaceId: agent.workspaceId,
-      })),
-    ).toEqual([
-      {
-        id: "agent-running",
-        serverId: SERVER_ID,
-        cwd: "/repo/app",
-        workspaceId: "/repo/app",
-      },
-      {
-        id: "agent-idle",
-        serverId: SERVER_ID,
-        cwd: "/repo/app",
-        workspaceId: "/repo/app",
-      },
-    ]);
-  });
-
-  it("keeps matching legacy path projects separate across hosts", () => {
-    const first = buildLegacyDaemonWorkspaceSnapshot({
-      serverId: "host-a",
-      entries: [legacyAgent({ id: "agent-a", cwd: "/repo/app" })],
-    });
-    const second = buildLegacyDaemonWorkspaceSnapshot({
-      serverId: "host-b",
-      entries: [legacyAgent({ id: "agent-b", cwd: "/repo/app" })],
-    });
-
-    const projects = buildWorkspaceStructureProjects({
-      sessions: [
-        {
-          serverId: "host-a",
-          projects: Array.from(first.workspaces.values(), legacyProjectFromWorkspace),
-          workspaces: first.workspaces.values(),
-        },
-        {
-          serverId: "host-b",
-          projects: Array.from(second.workspaces.values(), legacyProjectFromWorkspace),
-          workspaces: second.workspaces.values(),
-        },
-      ],
-    });
-
-    expect(projects).toHaveLength(2);
-    expect(projects.map((project) => project.hosts[0]?.serverId).sort()).toEqual([
-      "host-a",
-      "host-b",
-    ]);
-  });
-
+describe("applyLegacyDaemonWorkspaceOwnership", () => {
   it("keeps old-daemon agent updates attached to the path-backed workspace", () => {
-    const snapshot = buildLegacyDaemonWorkspaceSnapshot({
+    const snapshot = buildAgentDirectoryState({
       serverId: SERVER_ID,
       entries: [legacyAgent({ id: "agent-running", cwd: "/repo/app", status: "running" })],
     });
@@ -174,7 +81,8 @@ describe("buildLegacyDaemonWorkspaceSnapshot", () => {
       hostname: null,
       version: "0.1.96",
     });
-    store.setWorkspaces(SERVER_ID, snapshot.workspaces);
+    const cachedAgent = getSnapshotAgent(snapshot, "agent-running");
+    snapshot.agents.set(cachedAgent.id, { ...cachedAgent, workspaceId: "/repo/app" });
     store.setAgents(SERVER_ID, snapshot.agents);
 
     const existingAgent = getSnapshotAgent(snapshot, "agent-running");
@@ -197,47 +105,4 @@ describe("buildLegacyDaemonWorkspaceSnapshot", () => {
     expect(stampedUpdate.workspaceId).toBe("/repo/app");
     expect(visibility.activeAgentIds).toEqual(new Set(["agent-running"]));
   });
-
-  it("does not backfill path-backed workspaces after hydration is cancelled", async () => {
-    const store = useSessionStore.getState();
-    store.initializeSession(SERVER_ID, null as unknown as DaemonClient);
-    store.updateSessionServerInfo(SERVER_ID, {
-      serverId: SERVER_ID,
-      hostname: null,
-      version: "0.1.96",
-    });
-    let cancelled = false;
-    let didFetchAgents = false;
-    const client: Pick<DaemonClient, "fetchAgents"> = {
-      fetchAgents: async () => {
-        didFetchAgents = true;
-        cancelled = true;
-        return {
-          requestId: "req_cancelled_backfill",
-          subscriptionId: null,
-          entries: [legacyAgent({ id: "agent-cancelled", cwd: "/repo/app" })],
-          pageInfo: {
-            nextCursor: null,
-            prevCursor: null,
-            hasMore: false,
-          },
-        };
-      },
-    };
-
-    const didBackfill = await backfillLegacyDaemonWorkspaceDirectoryIfEmpty({
-      client,
-      serverId: SERVER_ID,
-      workspaces: new Map(),
-      projects: new Map(),
-      isCancelled: () => cancelled,
-    });
-
-    const session = useSessionStore.getState().sessions[SERVER_ID];
-    expect(didFetchAgents).toBe(true);
-    expect(didBackfill).toBe(true);
-    expect(session?.agents.size).toBe(0);
-    expect(session?.workspaces.size).toBe(0);
-    expect(session?.hasHydratedWorkspaces).toBe(false);
-  });
 });
diff --git a/packages/app/src/workspace/legacy-daemon-workspaces.ts b/packages/app/src/workspace/legacy-daemon-workspaces.ts
index 6de82a3f3e..08c0ddf3ee 100644
--- a/packages/app/src/workspace/legacy-daemon-workspaces.ts
+++ b/packages/app/src/workspace/legacy-daemon-workspaces.ts
@@ -1,173 +1,19 @@
-import type {
-  DaemonClient,
-  FetchAgentsEntry,
-  FetchAgentsOptions,
-} from "@getpaseo/client/internal/daemon-client";
 import {
-  deriveAgentStateBucket,
-  getWorkspaceStateBucketPriority,
-} from "@getpaseo/protocol/agent-state-bucket";
-import type {
-  Agent,
-  DaemonServerInfo,
-  ProjectDescriptor,
-  WorkspaceDescriptor,
+  useSessionStore,
+  type Agent,
+  type DaemonServerInfo,
+  type WorkspaceDescriptor,
 } from "@/stores/session-store";
-import { useSessionStore } from "@/stores/session-store";
-import {
-  buildAgentDirectoryState,
-  replaceFetchedAgentDirectory,
-} from "@/utils/agent-directory-sync";
 import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 
-export interface LegacyDaemonWorkspaceSnapshot {
-  agents: Map<string, Agent>;
-  workspaces: Map<string, WorkspaceDescriptor>;
-}
-
-export interface LegacyDaemonWorkspaceFetchResult extends LegacyDaemonWorkspaceSnapshot {
-  subscriptionId: string | null;
-}
-
-interface LegacyDaemonWorkspaceDirectoryReadResult {
-  entries: FetchAgentsEntry[];
-  subscriptionId: string | null;
-}
-
-interface LegacyDaemonWorkspaceBackfillInput {
-  client: Pick<DaemonClient, "fetchAgents">;
-  serverId: string;
-  workspaces: ReadonlyMap<unknown, unknown>;
-  projects: ReadonlyMap<unknown, unknown>;
-  isCancelled?: () => boolean;
-}
-
-const LEGACY_AGENT_DIRECTORY_SORT: NonNullable<FetchAgentsOptions["sort"]> = [
-  { key: "updated_at", direction: "desc" },
-];
-
-// COMPAT(legacyWorkspaceDaemon): v0.1.97 app talking to <=v0.1.96 daemons.
-// Older daemons expose agents by cwd but may have no workspace registry rows.
-// Keep all cwd -> synthetic workspace behavior in this file so the shim is
-// deleted by removing this module and its call sites once the daemon floor is v0.1.97.
-export function buildLegacyDaemonWorkspaceSnapshot(input: {
-  serverId: string;
-  entries: FetchAgentsEntry[];
-}): LegacyDaemonWorkspaceSnapshot {
-  const entries = stampLegacyWorkspaceIds(input.entries);
-  const { agents } = buildAgentDirectoryState({
-    serverId: input.serverId,
-    entries,
-  });
-
-  return {
-    agents,
-    workspaces: buildLegacyWorkspaces(entries),
-  };
-}
-
-export function shouldUseLegacyDaemonWorkspaceDirectory(
-  serverInfo: DaemonServerInfo | null | undefined,
-): boolean {
-  return (
-    serverInfo !== null &&
-    serverInfo !== undefined &&
-    serverInfo.features?.workspaceMultiplicity !== true
-  );
-}
-
+// COMPAT(legacyWorkspaceDaemon): added in v0.1.97, remove after 2027-03-09.
+// Cached or partial agent records can predate workspace IDs; preserve their placement.
 function shouldBackfillLegacyDaemonWorkspaceDirectory(
   serverInfo: DaemonServerInfo | null | undefined,
 ): boolean {
   return serverInfo?.features?.workspaceMultiplicity !== true;
 }
 
-export async function fetchLegacyDaemonWorkspaceDirectory(input: {
-  client: Pick<DaemonClient, "fetchAgents">;
-  serverId: string;
-  subscribe?: FetchAgentsOptions["subscribe"];
-  page?: FetchAgentsOptions["page"];
-}): Promise<LegacyDaemonWorkspaceFetchResult> {
-  const directory = await readLegacyDaemonWorkspaceDirectory(input);
-  if (!directory) {
-    throw new Error("Legacy daemon workspace directory fetch was cancelled.");
-  }
-  const snapshot = replaceLegacyDaemonWorkspaceDirectory({
-    serverId: input.serverId,
-    entries: directory.entries,
-  });
-  return { ...snapshot, subscriptionId: directory.subscriptionId };
-}
-
-export async function backfillLegacyDaemonWorkspaceDirectoryIfEmpty(
-  input: LegacyDaemonWorkspaceBackfillInput,
-): Promise<boolean> {
-  if (input.workspaces.size > 0 || input.projects.size > 0) {
-    return false;
-  }
-  const serverInfo = useSessionStore.getState().sessions[input.serverId]?.serverInfo;
-  if (!shouldBackfillLegacyDaemonWorkspaceDirectory(serverInfo)) {
-    return false;
-  }
-  if (input.isCancelled?.()) {
-    return true;
-  }
-  const directory = await readLegacyDaemonWorkspaceDirectory({
-    client: input.client,
-    isCancelled: input.isCancelled,
-  });
-  if (!directory || input.isCancelled?.()) {
-    return true;
-  }
-  replaceLegacyDaemonWorkspaceDirectory({
-    serverId: input.serverId,
-    entries: directory.entries,
-  });
-  return true;
-}
-
-export async function readLegacyDaemonWorkspaceDirectory(input: {
-  client: Pick<DaemonClient, "fetchAgents">;
-  subscribe?: FetchAgentsOptions["subscribe"];
-  page?: FetchAgentsOptions["page"];
-  isCancelled?: () => boolean;
-}): Promise<LegacyDaemonWorkspaceDirectoryReadResult | null> {
-  const entries: FetchAgentsEntry[] = [];
-  let cursor = input.page?.cursor ?? null;
-  let includeSubscribe = true;
-  let subscriptionId: string | null = null;
-  const pageLimit = input.page?.limit ?? 200;
-
-  while (true) {
-    if (input.isCancelled?.()) {
-      return null;
-    }
-
-    const payload = await input.client.fetchAgents({
-      sort: LEGACY_AGENT_DIRECTORY_SORT,
-      ...(includeSubscribe && input.subscribe ? { subscribe: input.subscribe } : {}),
-      page: cursor ? { limit: pageLimit, cursor } : { limit: pageLimit },
-    });
-    if (input.isCancelled?.()) {
-      return null;
-    }
-
-    entries.push(...payload.entries);
-    subscriptionId = subscriptionId ?? payload.subscriptionId ?? null;
-    includeSubscribe = false;
-    if (!readFetchAgentsHasMore(payload.pageInfo)) {
-      break;
-    }
-    const nextCursor = readFetchAgentsNextCursor(payload.pageInfo);
-    if (!nextCursor) {
-      break;
-    }
-    cursor = nextCursor;
-  }
-
-  return { entries, subscriptionId };
-}
-
 export function applyLegacyDaemonWorkspaceOwnership(input: {
   serverId: string;
   agent: Agent;
@@ -182,10 +28,11 @@ export function applyLegacyDaemonWorkspaceOwnership(input: {
   }
 
   const existingAgent =
-    session?.agents.get(input.agent.id) ?? session?.agentDetails.get(input.agent.id) ?? null;
+    session?.agents.get(input.agent.id) ?? session?.agentDetails.get(input.agent.id);
+  const workspaces = session?.workspaces;
   const workspaceId =
     existingAgent?.workspaceId ??
-    resolveLegacyWorkspaceIdFromAgent(input.agent, session?.workspaces) ??
+    resolveLegacyWorkspaceIdFromAgent(input.agent, workspaces) ??
     null;
   if (!workspaceId) {
     return input.agent;
@@ -198,178 +45,9 @@ export function applyLegacyDaemonWorkspaceOwnership(input: {
   };
 }
 
-export function replaceLegacyDaemonWorkspaceDirectory(input: {
-  serverId: string;
-  entries: FetchAgentsEntry[];
-}): LegacyDaemonWorkspaceSnapshot {
-  const entries = stampLegacyWorkspaceIds(input.entries);
-  const { agents } = replaceFetchedAgentDirectory({
-    serverId: input.serverId,
-    entries,
-  });
-  const workspaces = buildLegacyWorkspaces(entries);
-  const store = useSessionStore.getState();
-  store.setWorkspaces(input.serverId, workspaces);
-  store.setProjects(
-    input.serverId,
-    Array.from(workspaces.values(), legacyProjectDescriptorFromWorkspace),
-  );
-  store.setHasHydratedWorkspaces(input.serverId, true);
-  return { agents, workspaces };
-}
-
-function legacyProjectDescriptorFromWorkspace(workspace: WorkspaceDescriptor): ProjectDescriptor {
-  return {
-    projectId: workspace.projectId,
-    projectKey: null,
-    projectDisplayName: workspace.projectDisplayName,
-    projectCustomName: workspace.projectCustomName ?? null,
-    projectRootPath: workspace.projectRootPath,
-    projectKind: workspace.projectKind,
-  };
-}
-
-function readFetchAgentsHasMore(
-  pageInfo: Awaited<ReturnType<DaemonClient["fetchAgents"]>>["pageInfo"],
-): boolean {
-  const page = pageInfo as {
-    hasMore?: boolean;
-    hasMoreAfter?: boolean;
-  };
-  if (typeof page.hasMore === "boolean") {
-    return page.hasMore;
-  }
-  if (typeof page.hasMoreAfter === "boolean") {
-    return page.hasMoreAfter;
-  }
-  return false;
-}
-
-function readFetchAgentsNextCursor(
-  pageInfo: Awaited<ReturnType<DaemonClient["fetchAgents"]>>["pageInfo"],
-): string | null {
-  const page = pageInfo as {
-    nextCursor?: string | null;
-    afterCursor?: string | null;
-  };
-  if (typeof page.nextCursor === "string") {
-    return page.nextCursor;
-  }
-  if (typeof page.afterCursor === "string") {
-    return page.afterCursor;
-  }
-  return null;
-}
-
-export function stampLegacyWorkspaceIds(entries: FetchAgentsEntry[]): FetchAgentsEntry[] {
-  return entries.map((entry) => {
-    const workspaceId = resolveLegacyWorkspaceId(entry);
-    return {
-      ...entry,
-      agent: {
-        ...entry.agent,
-        workspaceId,
-      },
-    };
-  });
-}
-
-export function buildLegacyWorkspaces(
-  entries: FetchAgentsEntry[],
-): Map<string, WorkspaceDescriptor> {
-  const workspaces = new Map<string, WorkspaceDescriptor>();
-  for (const entry of entries) {
-    const workspaceId = entry.agent.workspaceId ?? resolveLegacyWorkspaceId(entry);
-    const status = deriveAgentStateBucket({
-      status: entry.agent.status,
-      pendingPermissionCount: entry.agent.pendingPermissions.length,
-      requiresAttention: entry.agent.requiresAttention,
-      attentionReason: entry.agent.attentionReason,
-    });
-    const statusEnteredAt = parseLegacyAgentTimestamp(entry);
-    const existing = workspaces.get(workspaceId);
-    if (!existing) {
-      workspaces.set(workspaceId, createLegacyWorkspace(entry, status, statusEnteredAt));
-      continue;
-    }
-    if (
-      getWorkspaceStateBucketPriority(status) < getWorkspaceStateBucketPriority(existing.status)
-    ) {
-      workspaces.set(workspaceId, {
-        ...existing,
-        status,
-        statusEnteredAt,
-      });
-    }
-  }
-  return workspaces;
-}
-
-function createLegacyWorkspace(
-  entry: FetchAgentsEntry,
-  status: WorkspaceDescriptor["status"],
-  statusEnteredAt: Date | null,
-): WorkspaceDescriptor {
-  const workspaceDirectory = resolveLegacyWorkspaceId(entry);
-  const checkout = entry.project.checkout;
-  const projectRootPath =
-    normalizeWorkspacePath(checkout.mainRepoRoot ?? checkout.worktreeRoot ?? checkout.cwd) ??
-    workspaceDirectory;
-  return {
-    id: workspaceDirectory,
-    projectId: entry.project.projectKey,
-    projectDisplayName: entry.project.projectName,
-    projectCustomName: null,
-    projectRootPath,
-    workspaceDirectory,
-    projectKind: checkout.isGit ? "git" : "non_git",
-    workspaceKind: resolveLegacyWorkspaceKind(checkout),
-    name: resolveLegacyWorkspaceName(entry, workspaceDirectory),
-    title: null,
-    status,
-    statusEnteredAt,
-    archivingAt: null,
-    diffStat: null,
-    scripts: [],
-    gitRuntime: checkout.isGit
-      ? {
-          currentBranch: checkout.currentBranch,
-          remoteUrl: checkout.remoteUrl,
-          isPaseoOwnedWorktree: checkout.isPaseoOwnedWorktree,
-          isDirty: null,
-          aheadBehind: null,
-          aheadOfOrigin: null,
-          behindOfOrigin: null,
-        }
-      : null,
-    githubRuntime: null,
-    project: entry.project,
-  };
-}
-
-function resolveLegacyWorkspaceKind(
-  checkout: FetchAgentsEntry["project"]["checkout"],
-): WorkspaceDescriptor["workspaceKind"] {
-  if (!checkout.isGit) {
-    return "directory";
-  }
-  if (checkout.isPaseoOwnedWorktree) {
-    return "worktree";
-  }
-  return "checkout";
-}
-
-function resolveLegacyWorkspaceId(entry: FetchAgentsEntry): string {
-  return (
-    normalizeWorkspacePath(entry.project.checkout.cwd) ??
-    normalizeWorkspacePath(entry.agent.cwd) ??
-    entry.agent.cwd
-  );
-}
-
 function resolveLegacyWorkspaceIdFromAgent(
   agent: Agent,
-  workspaces: Map<string, WorkspaceDescriptor> | undefined,
+  workspaces: ReadonlyMap<string, WorkspaceDescriptor> | undefined,
 ): string | null {
   const cwd = normalizeWorkspacePath(agent.cwd);
   if (!cwd) {
@@ -384,30 +62,3 @@ function resolveLegacyWorkspaceIdFromAgent(
 
   return cwd;
 }
-
-function resolveLegacyWorkspaceName(entry: FetchAgentsEntry, workspaceDirectory: string): string {
-  const explicitName = entry.project.workspaceName?.trim();
-  if (explicitName) {
-    return explicitName;
-  }
-  const branchName = entry.project.checkout.currentBranch?.trim();
-  if (branchName && branchName !== "HEAD") {
-    return branchName;
-  }
-  return workspaceDirectoryName(workspaceDirectory);
-}
-
-function workspaceDirectoryName(directory: string): string {
-  const trimmed = directory.trim().replace(/[/]+$/g, "");
-  const separator = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\"));
-  return separator >= 0 ? trimmed.slice(separator + 1) : trimmed;
-}
-
-function parseLegacyAgentTimestamp(entry: FetchAgentsEntry): Date | null {
-  const value = entry.agent.attentionTimestamp ?? entry.agent.updatedAt;
-  if (!value) {
-    return null;
-  }
-  const date = new Date(value);
-  return Number.isNaN(date.getTime()) ? null : date;
-}
diff --git a/packages/app/src/workspace/mark-unread.ts b/packages/app/src/workspace/mark-unread.ts
new file mode 100644
index 0000000000..0cb3310e19
--- /dev/null
+++ b/packages/app/src/workspace/mark-unread.ts
@@ -0,0 +1,26 @@
+import { i18n } from "@/i18n/i18next";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+
+export async function markWorkspaceUnread(serverId: string, workspaceId: string): Promise<void> {
+  const client = getHostRuntimeStore().getClient(serverId);
+  if (!client) {
+    throw new Error(i18n.t("workspace.terminal.hostDisconnected"));
+  }
+
+  const workspaceKey = `${serverId}:${workspaceId}`;
+  const layout = useWorkspaceLayoutStore.getState();
+  // End viewing before restoring attention. The next pane focus reads it normally;
+  // leaving the workspace must not consume the mark the user just made.
+  const focusToken = layout.layoutByWorkspace[workspaceKey]?.focusedPaneId
+    ? layout.unfocusPane(workspaceKey)
+    : null;
+  try {
+    await client.markWorkspaceUnread(workspaceId);
+  } catch (error) {
+    if (focusToken) {
+      layout.restorePaneFocus(workspaceKey, focusToken);
+    }
+    throw error;
+  }
+}
diff --git a/packages/app/src/workspace/workspace-archive.test.ts b/packages/app/src/workspace/workspace-archive.test.ts
index b4db600e60..e7fe660f3b 100644
--- a/packages/app/src/workspace/workspace-archive.test.ts
+++ b/packages/app/src/workspace/workspace-archive.test.ts
@@ -1,3 +1,5 @@
+import { seedSessionHosts } from "@/test/seed-session";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
@@ -85,10 +87,12 @@ function storedWorkspace(id: string): WorkspaceDescriptor | undefined {
 }
 
 beforeEach(() => {
+  seedSessionHosts([SERVER_ID, SECOND_SERVER_ID]);
   useSessionStore.getState().initializeSession(SERVER_ID, {} as DaemonClient);
 });
 
 afterEach(() => {
+  seedSessionHosts([]);
   clearWorkspaceArchivePending({ serverId: SERVER_ID, workspaceId: "workspace-1" });
   clearWorkspaceArchivePending({ serverId: SERVER_ID, workspaceId: "workspace-2" });
   clearWorkspaceArchivePending({ serverId: SECOND_SERVER_ID, workspaceId: "workspace-1" });
@@ -99,7 +103,7 @@ afterEach(() => {
 describe("archiveWorkspaceOptimistically", () => {
   it("hides the workspace and marks the archive pending while the daemon call runs", async () => {
     const archived = workspace();
-    useSessionStore.getState().mergeWorkspaces(SERVER_ID, [archived]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(SERVER_ID, [archived]);
     const releaseArchive = deferred<ArchiveWorkspacePayload>();
     const client = createClient(vi.fn(async () => releaseArchive.promise));
 
@@ -124,7 +128,7 @@ describe("archiveWorkspaceOptimistically", () => {
 
   it("restores the workspace and clears pending state when the daemon rejects the archive", async () => {
     const archived = workspace();
-    useSessionStore.getState().mergeWorkspaces(SERVER_ID, [archived]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(SERVER_ID, [archived]);
     const client = createClient(
       vi.fn(async () => archivePayload({ workspaceId: archived.id, error: "nope" })),
     );
@@ -154,7 +158,7 @@ describe("archiveWorkspacesOptimistically", () => {
       workspaceDirectory: "/repo/project/workspace-2",
       name: "workspace-2",
     });
-    useSessionStore.getState().mergeWorkspaces(SERVER_ID, [first, second]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(SERVER_ID, [first, second]);
     const client = createClient(
       vi.fn(async (workspaceId) =>
         archivePayload({
@@ -183,8 +187,8 @@ describe("archiveWorkspacesOptimistically", () => {
       name: "workspace-2",
     });
     useSessionStore.getState().initializeSession(SECOND_SERVER_ID, {} as DaemonClient);
-    useSessionStore.getState().mergeWorkspaces(SERVER_ID, [first]);
-    useSessionStore.getState().mergeWorkspaces(SECOND_SERVER_ID, [second]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(SERVER_ID, [first]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(SECOND_SERVER_ID, [second]);
 
     const archivedByServer = new Map<string, string[]>();
     const clientFor = (serverId: string) =>
diff --git a/packages/app/src/workspace/workspace-archive.ts b/packages/app/src/workspace/workspace-archive.ts
index 0bb4bcf5f9..a4e5a00e80 100644
--- a/packages/app/src/workspace/workspace-archive.ts
+++ b/packages/app/src/workspace/workspace-archive.ts
@@ -1,3 +1,4 @@
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import {
   clearWorkspaceArchivePending,
   markWorkspaceArchivePending,
@@ -50,7 +51,7 @@ function hideWorkspaceOptimistically(
     serverId: workspace.serverId,
     workspaceId: workspace.workspaceId,
   });
-  useSessionStore.getState().removeWorkspace(workspace.serverId, workspace.workspaceId);
+  getHostRuntimeStore().removeWorkspaceSnapshot(workspace.serverId, workspace.workspaceId);
   return { workspace: snapshot };
 }
 
@@ -64,7 +65,7 @@ function restoreOptimisticallyHiddenWorkspace(input: {
     workspaceId: input.workspaceId,
   });
   if (input.snapshot.workspace) {
-    useSessionStore.getState().mergeWorkspaces(input.serverId, [input.snapshot.workspace]);
+    getHostRuntimeStore().acceptWorkspaceSnapshots(input.serverId, [input.snapshot.workspace]);
   }
 }
 
diff --git a/packages/app/test-stubs/async-storage.ts b/packages/app/test-stubs/async-storage.ts
new file mode 100644
index 0000000000..68cc5dd114
--- /dev/null
+++ b/packages/app/test-stubs/async-storage.ts
@@ -0,0 +1,45 @@
+/**
+ * AsyncStorage has no implementation under Node: its default export reaches for
+ * the native module and every call rejects, so any test that touches a
+ * persisted store emits unhandled rejections from the persist middleware.
+ *
+ * This is a real in-memory key-value store with the same contract, not a
+ * recording double, so a test can read back what a store wrote.
+ */
+const entries = new Map<string, string>();
+
+export function clearAsyncStorageStub(): void {
+  entries.clear();
+}
+
+const AsyncStorageStub = {
+  getItem: (key: string): Promise<string | null> => Promise.resolve(entries.get(key) ?? null),
+  setItem: (key: string, value: string): Promise<void> => {
+    entries.set(key, value);
+    return Promise.resolve();
+  },
+  removeItem: (key: string): Promise<void> => {
+    entries.delete(key);
+    return Promise.resolve();
+  },
+  getAllKeys: (): Promise<string[]> => Promise.resolve([...entries.keys()]),
+  // `provider-snapshot-cache` declares its own `ProviderSnapshotStorage` port and
+  // hands it the real AsyncStorage, so a stub that stops at the single-key calls
+  // fails any test that reaches the provider cache with `multiGet is not a function`.
+  multiGet: (keys: readonly string[]): Promise<Array<[string, string | null]>> =>
+    Promise.resolve(keys.map((key) => [key, entries.get(key) ?? null] as [string, string | null])),
+  multiSet: (pairs: ReadonlyArray<readonly [string, string]>): Promise<void> => {
+    for (const [key, value] of pairs) entries.set(key, value);
+    return Promise.resolve();
+  },
+  multiRemove: (keys: readonly string[]): Promise<void> => {
+    for (const key of keys) entries.delete(key);
+    return Promise.resolve();
+  },
+  clear: (): Promise<void> => {
+    entries.clear();
+    return Promise.resolve();
+  },
+};
+
+export default AsyncStorageStub;
diff --git a/packages/app/test-stubs/gorhom-bottom-sheet.ts b/packages/app/test-stubs/gorhom-bottom-sheet.ts
index 0ab1cd7215..784a7569ff 100644
--- a/packages/app/test-stubs/gorhom-bottom-sheet.ts
+++ b/packages/app/test-stubs/gorhom-bottom-sheet.ts
@@ -12,6 +12,10 @@ export const BottomSheetScrollView = PassThrough;
 export const BottomSheetView = PassThrough;
 export const BottomSheetTextInput = Stub;
 
+export function useBottomSheetModal(): never {
+  throw new Error("Modal stack interactions require the real Gorhom provider in browser E2E tests");
+}
+
 // The app imports the internal layout values to compute the visible sheet body. Browser unit tests
 // never render the native sheet, but Vite still validates this module's export surface.
 const sharedValue = (value: unknown) => ({ get: () => value });
diff --git a/packages/app/test-stubs/react-native-unistyles.ts b/packages/app/test-stubs/react-native-unistyles.ts
index 1484e7a7d9..654053543f 100644
--- a/packages/app/test-stubs/react-native-unistyles.ts
+++ b/packages/app/test-stubs/react-native-unistyles.ts
@@ -7,6 +7,10 @@ const testTheme = {
     statusDanger: "#b91c1c",
     statusWarning: "#d97706",
     statusMerged: "#7c3aed",
+    // Same rule as the real theme: the status color at 12%.
+    statusSuccessTint: "#15803d1f",
+    statusDangerTint: "#b91c1c1f",
+    statusWarningTint: "#d977061f",
     // The light band's values, so a test can name the colour it expects.
     statusDotSuccess: "#299f51",
     statusDotDanger: "#f12e2f",
diff --git a/packages/app/vitest-environment.test.ts b/packages/app/vitest-environment.test.ts
new file mode 100644
index 0000000000..95b9b9343b
--- /dev/null
+++ b/packages/app/vitest-environment.test.ts
@@ -0,0 +1,67 @@
+import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, it } from "vitest";
+
+const appDir = fileURLToPath(new URL(".", import.meta.url));
+const rootDir = path.resolve(appDir, "../..");
+const require = createRequire(import.meta.url);
+const vitestEntry = path.join(path.dirname(require.resolve("vitest/package.json")), "vitest.mjs");
+const tsgoEntry = path.join(
+  path.dirname(require.resolve("@typescript/native-preview/package.json")),
+  "bin/tsgo.js",
+);
+
+it("the test configuration typechecks with Expo's generated environment declaration", () => {
+  const fixtureDir = mkdtempSync(path.join(appDir, ".vitest-expo-env-"));
+  try {
+    writeFileSync(path.join(fixtureDir, "expo-env.d.ts"), '/// <reference types="expo/types" />\n');
+    writeFileSync(
+      path.join(fixtureDir, "tsconfig.json"),
+      JSON.stringify({
+        extends: "../tsconfig.json",
+        files: ["../vitest.config.ts", "expo-env.d.ts"],
+        include: [],
+      }),
+    );
+    const result = spawnSync(
+      process.execPath,
+      [tsgoEntry, "--noEmit", "--project", path.join(fixtureDir, "tsconfig.json")],
+      { cwd: appDir, encoding: "utf8", timeout: 30_000 },
+    );
+
+    expect(result.error).toBeUndefined();
+    expect(result.status, result.stdout + result.stderr).toBe(0);
+  } finally {
+    rmSync(fixtureDir, { recursive: true, force: true });
+  }
+}, 40_000);
+
+it.each([
+  {
+    name: "root",
+    cwd: rootDir,
+    args: ["packages/app/src/screens/workspace/use-mounted-tab-set.test.ts"],
+  },
+  {
+    name: "app",
+    cwd: appDir,
+    args: ["--project", "unit", "src/screens/workspace/use-mounted-tab-set.test.ts"],
+  },
+])(
+  "$name tests can render React when the shell exports NODE_ENV=production",
+  ({ cwd, args }) => {
+    const result = spawnSync(process.execPath, [vitestEntry, "run", ...args], {
+      cwd,
+      env: { ...process.env, NODE_ENV: "production" },
+      encoding: "utf8",
+      timeout: 30_000,
+    });
+
+    expect(result.error).toBeUndefined();
+    expect(result.status, result.stdout + result.stderr).toBe(0);
+  },
+  40_000,
+);
diff --git a/packages/app/vitest.config.ts b/packages/app/vitest.config.ts
index 3f96ad3bc0..e2d67aca70 100644
--- a/packages/app/vitest.config.ts
+++ b/packages/app/vitest.config.ts
@@ -3,6 +3,9 @@ import { playwright } from "@vitest/browser-playwright";
 import path from "path";
 import fs from "fs";
 
+// Set this before Vite resolves dependencies and Vitest starts its workers.
+Object.assign(process.env, { NODE_ENV: "test" });
+
 const appNodeModules = path.resolve(__dirname, "node_modules");
 const rootNodeModules = path.resolve(__dirname, "../../node_modules");
 const resolvePackageEntry = (packageName: string) => {
@@ -22,7 +25,12 @@ export default defineConfig({
         test: {
           name: "unit",
           environment: "node",
-          include: ["src/**/*.{test,spec}.{ts,tsx}", "native-release-version.test.ts"],
+          include: [
+            "src/**/*.{test,spec}.{ts,tsx}",
+            "native-release-version.test.ts",
+            "app.config.test.ts",
+            "vitest-environment.test.ts",
+          ],
           setupFiles: [path.resolve(__dirname, "vitest.setup.ts")],
           exclude: [...configDefaults.exclude, "e2e/**", "src/**/*.browser.{test,spec}.{ts,tsx}"],
         },
@@ -56,17 +64,32 @@ export default defineConfig({
     server: {
       deps: {
         fallbackCJS: true,
-        inline: ["zustand", "@tanstack/react-query", "react-native-web"],
+        inline: [
+          "zustand",
+          "@tanstack/react-query",
+          "react-native-web",
+          "react-native-gesture-handler",
+          "react-native-keyboard-controller",
+        ],
       },
     },
   },
-  // Reanimated ships one file per platform and picks between them by extension
-  // (`findHostInstance.web.js`). Vite's dependency optimizer does not apply `resolve.extensions`,
+  // Reanimated and gesture-handler pick platform files by extension
+  // (e.g. `GestureHandlerRootView.web.js`). Vite's optimizer does not apply `resolve.extensions`,
   // so it scans the native files and dies on imports react-native-web has no answer for.
   // Unbundled, the same imports go through the resolver below and land on the web files.
   optimizeDeps: {
-    include: ["react/jsx-runtime"],
-    exclude: ["react-native-reanimated"],
+    // Bundle the CJS dependencies of the excluded gesture-handler package for the browser.
+    include: [
+      "react/jsx-runtime",
+      "react-native-gesture-handler > hoist-non-react-statics",
+      "react-native-gesture-handler > invariant",
+    ],
+    exclude: [
+      "react-native-reanimated",
+      "react-native-gesture-handler",
+      "react-native-keyboard-controller",
+    ],
   },
   // The globals a React Native bundler defines, which esbuild is no longer there to supply for
   // the package excluded above.
@@ -101,6 +124,22 @@ export default defineConfig({
         replacement: path.resolve(__dirname, "../relay/src/index.ts"),
       },
       { find: "@", replacement: path.resolve(__dirname, "src") },
+      // Keep keyboard-controller's imports in Vite so native aliases and platform extensions apply.
+      {
+        find: /^react-native-keyboard-controller$/,
+        replacement: path.resolve(
+          resolvePackageEntry("react-native-keyboard-controller"),
+          "lib/module/index.js",
+        ),
+      },
+      // The CJS entry bypasses Vite's React Native alias and web-extension resolution.
+      {
+        find: /^react-native-gesture-handler$/,
+        replacement: path.resolve(
+          rootNodeModules,
+          "react-native-gesture-handler/lib/module/index.js",
+        ),
+      },
       // Must precede the `react-native` alias: a string `find` matches by prefix, so this subpath
       // would otherwise resolve inside a react-native-web *file* and break the dependency scan.
       // Reanimated only imports it on the native path, which no test takes.
@@ -154,6 +193,12 @@ export default defineConfig({
         find: /^expo-linking$/,
         replacement: path.resolve(__dirname, "test-stubs/expo-linking.ts"),
       },
+      // No Node implementation: every call on the real module rejects, so a test
+      // touching a persisted store drowns in unhandled rejections.
+      {
+        find: /^@react-native-async-storage\/async-storage$/,
+        replacement: path.resolve(__dirname, "test-stubs/async-storage.ts"),
+      },
       {
         find: /^lucide-react-native$/,
         replacement: path.resolve(__dirname, "test-stubs/lucide-react-native.ts"),
diff --git a/packages/app/vitest.setup.ts b/packages/app/vitest.setup.ts
index feb490d91e..8834ab649f 100644
--- a/packages/app/vitest.setup.ts
+++ b/packages/app/vitest.setup.ts
@@ -6,6 +6,23 @@ const globalWithTestShims = globalThis as typeof globalThis & Record<string, unk
 
 globalWithTestShims.__DEV__ = false;
 
+// JSDOM has no CSS media-query engine. Give native-web libraries the browser API
+// with no active preferences; responsive behavior is exercised in Chromium.
+if (typeof window !== "undefined" && typeof window.matchMedia !== "function") {
+  window.matchMedia = (media: string) =>
+    Object.assign(new window.EventTarget(), {
+      media,
+      matches: false,
+      onchange: null,
+      addListener(listener: EventListener) {
+        this.addEventListener("change", listener);
+      },
+      removeListener(listener: EventListener) {
+        this.removeEventListener("change", listener);
+      },
+    });
+}
+
 if (typeof globalThis.self === "undefined") {
   globalWithTestShims.self = globalThis;
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index b39aa4e3c0..4fdcfba018 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.7.2",
-    "@getpaseo/protocol": "0.7.2",
-    "@getpaseo/server": "0.7.2",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/server": "0.11.2",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/cli/src/cli-surface.test.ts b/packages/cli/src/cli-surface.test.ts
index 3243529c23..18f4348ff7 100644
--- a/packages/cli/src/cli-surface.test.ts
+++ b/packages/cli/src/cli-surface.test.ts
@@ -46,10 +46,25 @@ describe("canonical CLI surface", () => {
     expect(help).toContain("--forge <forge>");
   });
 
-  it("uses background for execution and reserves detach for ownership", () => {
+  it("uses --no-wait for execution, --internal for visibility, and reserves detach for ownership", () => {
     const run = createCli().commands.find((command) => command.name() === "run");
-    expect(run?.helpInformation()).toContain("--background");
-    expect(run?.helpInformation()).not.toContain("--detach");
+    const help = run?.helpInformation();
+    expect(help).toContain("--no-wait");
+    expect(help).not.toContain("--background");
+    expect(help).not.toContain("--background");
+    expect(help).not.toContain("--detach");
+  });
+
+  it("hides internal agents and workspaces from listings unless --internal is passed", () => {
+    const cli = createCli();
+    const ls = cli.commands.find((command) => command.name() === "ls");
+    const workspace = cli.commands.find((command) => command.name() === "workspace");
+    const workspaceLs = workspace?.commands.find((command) => command.name() === "ls");
+    const workspaceCreate = workspace?.commands.find((command) => command.name() === "create");
+
+    expect(ls?.helpInformation()).toContain("--background");
+    expect(workspaceLs?.helpInformation()).toContain("--background");
+    expect(workspaceCreate?.helpInformation()).toContain("--background");
   });
 
   it("offers thinking configuration when running, updating, and scheduling agents", () => {
@@ -79,9 +94,9 @@ describe("canonical CLI surface", () => {
     expect(plugin?.commands.map((command) => command.name())).toEqual([
       "init",
       "ls",
+      "status",
       "logs",
       "install",
-      "status",
       "update",
       "reload",
       "enable",
@@ -96,3 +111,15 @@ describe("canonical CLI surface", () => {
     ).toContain("--id <id>");
   });
 });
+
+it("preserves omitted and explicit false workspace background intent", () => {
+  const readOptions = (args: string[]) => {
+    const workspace = createCli().commands.find((command) => command.name() === "workspace")!;
+    const create = workspace.commands.find((command) => command.name() === "create")!;
+    create.parseOptions(args);
+    return create.opts();
+  };
+  expect(readOptions([]).background).toBeUndefined();
+  expect(readOptions(["--background"]).background).toBe(true);
+  expect(readOptions(["--no-background"]).background).toBe(false);
+});
diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
index 275d8f6170..dceb3f372d 100644
--- a/packages/cli/src/cli.ts
+++ b/packages/cli/src/cli.ts
@@ -1,7 +1,9 @@
+import { pairCommand } from "./commands/daemon/pair.js";
 import { Command, Option } from "commander";
 import { createAgentCommand } from "./commands/agent/index.js";
 import { createDaemonCommand } from "./commands/daemon/index.js";
 import { createPermitCommand } from "./commands/permit/index.js";
+import { createUsageCommand } from "./commands/usage/index.js";
 import { createProviderCommand } from "./commands/provider/index.js";
 import { createPluginCommand } from "./commands/plugin/index.js";
 import { createProjectCommand } from "./commands/project/index.js";
@@ -15,9 +17,9 @@ import { createHeartbeatCommand } from "./commands/heartbeat/index.js";
 import { createHubCommand } from "./commands/hub/index.js";
 import { createHooksCommand } from "./commands/hooks.js";
 import { startCommand as daemonStartCommand } from "./commands/daemon/start.js";
-import { runStatusCommand as runDaemonStatusCommand } from "./commands/daemon/status.js";
-import { runRestartCommand as runDaemonRestartCommand } from "./commands/daemon/restart.js";
-import { runDaemonReloadCommand } from "./commands/daemon/reload.js";
+import { daemonStatusCommand } from "./commands/daemon/status.js";
+import { daemonRestartCommand } from "./commands/daemon/restart.js";
+import { daemonReloadCommand } from "./commands/daemon/reload.js";
 import { addLsOptions, runLsCommand } from "./commands/agent/ls.js";
 import { addRunOptions, runRunCommand } from "./commands/agent/run.js";
 import { addLogsOptions, runLogsCommand } from "./commands/agent/logs.js";
@@ -35,19 +37,12 @@ import { onboardCommand } from "./commands/onboard.js";
 import {
   addDaemonHostOption,
   addJsonAndDaemonHostOptions,
-  addJsonOption,
   withGlobalOptions,
 } from "./utils/command-options.js";
 import { resolveCliVersion } from "./version.js";
 
 const VERSION = resolveCliVersion();
 
-function resolveHostnamesOption(hostnames: unknown, allowedHosts: unknown): string | undefined {
-  if (typeof hostnames === "string") return hostnames;
-  if (typeof allowedHosts === "string") return allowedHosts;
-  return undefined;
-}
-
 export function createCli(): Command {
   const program = new Command();
 
@@ -125,51 +120,10 @@ export function createCli(): Command {
   program.addCommand(daemonStartCommand());
   program.addCommand(createHooksCommand());
 
-  addJsonOption(
-    program
-      .command("status")
-      .description('Show local daemon status (alias for "paseo daemon status")'),
-  )
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .action(withOutput(runDaemonStatusCommand));
-
-  addJsonAndDaemonHostOptions(
-    program.command("reload").description('Reload daemon config (alias for "paseo daemon reload")'),
-  ).action(withOutput(runDaemonReloadCommand));
-
-  addJsonOption(
-    program
-      .command("restart")
-      .description('Restart local daemon (alias for "paseo daemon restart")'),
-  )
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .option("--timeout <seconds>", "Wait timeout before force step (default: 15)")
-    .option("--force", "Send SIGKILL if graceful stop times out")
-    .option(
-      "--listen <listen>",
-      "Listen target for restarted daemon (host:port, port, or unix socket)",
-    )
-    .option("--port <port>", "Port for restarted daemon listen target")
-    .option("--relay", "Enable relay on restarted daemon")
-    .option("--no-relay", "Disable relay on restarted daemon")
-    .option("--no-mcp", "Disable Agent MCP on restarted daemon")
-    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
-    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(
-      withOutput((...args) => {
-        const [options, command] = args.slice(-2) as [(typeof args)[number], Command];
-        return runDaemonRestartCommand(
-          {
-            ...options,
-            hostnames: resolveHostnamesOption(options.hostnames, options.allowedHosts),
-          },
-          command,
-        );
-      }),
-    );
+  program.addCommand(daemonStatusCommand());
+  program.addCommand(daemonRestartCommand());
+  program.addCommand(daemonReloadCommand());
+  program.addCommand(pairCommand());
 
   // Advanced agent commands (less common operations)
   program.addCommand(createAgentCommand());
@@ -195,6 +149,7 @@ export function createCli(): Command {
 
   // Provider commands
   program.addCommand(createProviderCommand());
+  program.addCommand(createUsageCommand());
   program.addCommand(createPluginCommand());
 
   // Speech model commands
@@ -207,5 +162,37 @@ export function createCli(): Command {
   // Added in v0.2.0; remove after 2027-01-17.
   program.addCommand(createWorktreeCommand(), { hidden: true });
 
+  // Stop root parsing at the command so `plugin update --version` belongs to update.
+  // Keep global options available after a command, as they were before positional parsing.
+  program.enablePositionalOptions();
+  for (const command of program.commands) {
+    for (const option of program.options) {
+      if (option.long === "--version") continue;
+      if (!command.options.some((local) => local.long === option.long)) command.addOption(option);
+      if (option.long === "--home" || option.long === "--host") continue;
+      command.on(`option:${option.name()}`, () => {
+        const key = option.attributeName();
+        program.setOptionValueWithSource(key, command.opts()[key], "cli");
+      });
+    }
+    if (command.name() !== "plugin")
+      command.version(VERSION, "-v, --version", "output the version number");
+  }
+
+  const enforceSelectorDuplicates = (command: Command) => {
+    for (const option of command.options) {
+      if (option.long !== "--home" && option.long !== "--host") continue;
+      option.argParser((value: string, previous: string | undefined) => {
+        if (previous !== undefined && previous !== value)
+          throw {
+            code: "TARGET_AMBIGUOUS",
+            message: `Conflicting duplicate ${option.long} selectors.`,
+          };
+        return value;
+      });
+    }
+    command.commands.forEach(enforceSelectorDuplicates);
+  };
+  enforceSelectorDuplicates(program);
   return program;
 }
diff --git a/packages/cli/src/commands/agent/archive.ts b/packages/cli/src/commands/agent/archive.ts
index ff9f80afa2..c7809ba565 100644
--- a/packages/cli/src/commands/agent/archive.ts
+++ b/packages/cli/src/commands/agent/archive.ts
@@ -1,6 +1,5 @@
 import { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost, resolveAgentId } from "../../utils/client.js";
+import { connectToDaemon, resolveAgentId } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -44,8 +43,6 @@ export async function runArchiveCommand(
   options: AgentArchiveOptions,
   _command: Command,
 ): Promise<AgentArchiveCommandResult> {
-  const host = getDaemonHost({ host: options.host });
-
   // Validate arguments
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     const error: CommandError = {
@@ -56,18 +53,7 @@ export async function runArchiveCommand(
     throw error;
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const agentsPayload = await client.fetchAgents({ filter: { includeArchived: true } });
diff --git a/packages/cli/src/commands/agent/attach.ts b/packages/cli/src/commands/agent/attach.ts
index fb58f71fa0..a881f2d7f8 100644
--- a/packages/cli/src/commands/agent/attach.ts
+++ b/packages/cli/src/commands/agent/attach.ts
@@ -5,17 +5,18 @@ export function addAttachOptions(cmd: Command): Command {
     .description("Attach to a running agent's output stream")
     .argument("<id>", "Agent ID (or prefix)");
 }
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
+import { waitForStop } from "../../utils/wait-for-stop.js";
 import {
   fetchProjectedTimelineItems,
   LIVE_HISTORY_FETCH_TIMEOUT_MS,
 } from "../../utils/timeline.js";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
-import type { AgentStreamEventPayload, AgentStreamMessage } from "@getpaseo/protocol/messages";
+import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 
 export interface AgentAttachOptions {
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   [key: string]: unknown;
 }
 
@@ -105,23 +106,13 @@ export async function runAttachCommand(
   options: AgentAttachOptions,
   _command: Command,
 ): Promise<void> {
-  const host = getDaemonHost({ host: options.host });
-
   if (!id) {
     console.error("Error: Agent ID required");
     console.error("Usage: paseo attach <id>");
     process.exit(1);
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    console.error(`Error: Cannot connect to daemon at ${host}: ${message}`);
-    console.error("Start the daemon with: paseo daemon start");
-    process.exit(1);
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const fetchResult = await client.fetchAgent({ agentId: id });
@@ -134,7 +125,7 @@ export async function runAttachCommand(
     const resolvedId = fetchResult.agent.id;
 
     // Print header
-    console.log(`Attaching to agent ${resolvedId.substring(0, 7)}...`);
+    console.log(`Fetching history for agent ${resolvedId.substring(0, 7)}...`);
     console.log(`(Press Ctrl+C to detach)\n`);
 
     // Print existing output from timeline fetch.
@@ -152,39 +143,25 @@ export async function runAttachCommand(
     }
 
     // Subscribe to new events
-    const unsubscribe = client.on("agent_stream", (msg: unknown) => {
-      const message = msg as AgentStreamMessage;
-      if (message.type !== "agent_stream") return;
-      if (message.payload.agentId !== resolvedId) return;
-
-      printStreamEvent(message.payload.event);
+    const unsubscribe = client.subscribeAgentTimeline(resolvedId, (message) => {
+      if (message.type === "agent.timeline.replacement") {
+        console.log("\n[Timeline replaced; earlier output is no longer current]");
+      } else if (message.type === "agent.timeline.subscription_restored") {
+        console.log("\n[Reconnected; live output resumed. Events may have been missed.]");
+      } else if (message.type === "agent.timeline.error") {
+        console.error(`Timeline observation stopped: ${message.payload.error}`);
+      } else {
+        printStreamEvent(message.payload.event);
+      }
     });
 
-    // Handle Ctrl+C to detach gracefully
-    let detached = false;
-    const detach = () => {
-      if (detached) return;
-      detached = true;
+    await unsubscribe.ready;
+    console.log(`Attached to agent ${resolvedId.substring(0, 7)}.`);
 
-      console.log("\n\nDetaching from agent...");
-      unsubscribe();
-      client
-        .close()
-        .then(() => {
-          process.exit(0);
-        })
-        .catch(() => {
-          process.exit(1);
-        });
-    };
-
-    process.on("SIGINT", detach);
-    process.on("SIGTERM", detach);
-
-    // Keep the process alive
-    await new Promise(() => {
-      // Wait indefinitely until interrupted
-    });
+    await waitForStop();
+    console.log("\n\nDetaching from agent...");
+    unsubscribe();
+    await client.close();
   } catch (err) {
     await client.close().catch(() => {});
     const message = err instanceof Error ? err.message : String(err);
diff --git a/packages/cli/src/commands/agent/delete.test.ts b/packages/cli/src/commands/agent/delete.test.ts
index 56aa83dc65..b9d00cd5ef 100644
--- a/packages/cli/src/commands/agent/delete.test.ts
+++ b/packages/cli/src/commands/agent/delete.test.ts
@@ -1,22 +1,51 @@
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
 
 import { runDeleteCommand } from "./delete.js";
 
 const agent = {
   id: "11111111-1111-4111-8111-111111111111",
   status: "running",
-  archivedAt: null,
+  archivedAt: null as string | null,
   cwd: "/tmp/project",
 };
+const archivedAgent = {
+  id: "22222222-2222-4222-8222-222222222222",
+  status: "closed",
+  archivedAt: "2026-10-01T00:00:00.000Z",
+  cwd: "/tmp/project/nested",
+};
+const archivedOutsideAgent = {
+  id: "33333333-3333-4333-8333-333333333333",
+  status: "closed",
+  archivedAt: "2026-10-01T00:00:00.000Z",
+  cwd: "/tmp/elsewhere",
+};
+let daemonAgents: (typeof agent)[] = [agent];
+const toEntry = (entry: typeof agent) => ({ agent: entry });
+// The fake daemon pages history two agents at a time.
+const historyPage = (cursor: string | undefined) => {
+  const start = Number(cursor ?? 0);
+  const end = start + 2;
+  return {
+    entries: daemonAgents.slice(start, end).map(toEntry),
+    pageInfo: { nextCursor: end < daemonAgents.length ? String(end) : null },
+  };
+};
 const cancelAgent = vi.fn(async () => {
   throw new Error("active run cancellation was not acknowledged");
 });
+const fetchAgentHistory = vi.fn(async (options: { page: { cursor?: string } }) =>
+  historyPage(options.page.cursor),
+);
 const deleteAgent = vi.fn(async () => undefined);
 const close = vi.fn(async () => undefined);
 
 vi.mock("../../utils/client.js", () => ({
   connectToDaemon: vi.fn(async () => ({
-    fetchAgents: vi.fn(async () => ({ entries: [{ agent }] })),
+    fetchAgents: vi.fn(async () => historyPage(undefined)),
+    fetchAgentHistory,
     fetchAgent: vi.fn(async () => ({ agent })),
     cancelAgent,
     deleteAgent,
@@ -26,9 +55,16 @@ vi.mock("../../utils/client.js", () => ({
 }));
 
 describe("runDeleteCommand", () => {
-  it("force-deletes a running agent when graceful cancellation is refused", async () => {
-    const result = await runDeleteCommand(agent.id, {}, {} as never);
+  beforeEach(() => {
+    daemonAgents = [agent];
+    deleteAgent.mockClear();
+    fetchAgentHistory.mockClear();
+  });
 
+  it("force-deletes a running agent when graceful cancellation is refused", async () => {
+    const result = await runDeleteCommand(agent.id, { daemonTarget }, {} as never);
+
+    expect(fetchAgentHistory).not.toHaveBeenCalled();
     expect(cancelAgent).toHaveBeenCalledWith(agent.id);
     expect(deleteAgent).toHaveBeenCalledWith(agent.id);
     expect(result.data).toEqual({
@@ -36,4 +72,30 @@ describe("runDeleteCommand", () => {
       agentIds: [agent.id],
     });
   });
+
+  it("deletes archived agents on every history page with --all", async () => {
+    daemonAgents = [agent, archivedAgent, archivedOutsideAgent];
+
+    const result = await runDeleteCommand(undefined, { daemonTarget, all: true }, {} as never);
+
+    expect(result.data).toEqual({
+      deletedCount: 3,
+      agentIds: [agent.id, archivedAgent.id, archivedOutsideAgent.id],
+    });
+  });
+
+  it("deletes archived agents inside the directory with --cwd", async () => {
+    daemonAgents = [agent, archivedAgent, archivedOutsideAgent];
+
+    const result = await runDeleteCommand(
+      undefined,
+      { daemonTarget, cwd: "/tmp/project" },
+      {} as never,
+    );
+
+    expect(result.data).toEqual({
+      deletedCount: 2,
+      agentIds: [agent.id, archivedAgent.id],
+    });
+  });
 });
diff --git a/packages/cli/src/commands/agent/delete.ts b/packages/cli/src/commands/agent/delete.ts
index c8502c9a19..5e48751bb8 100644
--- a/packages/cli/src/commands/agent/delete.ts
+++ b/packages/cli/src/commands/agent/delete.ts
@@ -1,7 +1,7 @@
 import type { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import { isSameOrDescendantPath } from "../../utils/paths.js";
+import type { DaemonClient, FetchAgentHistoryEntry } from "@getpaseo/client/internal/daemon-client";
 
 export function addDeleteOptions(cmd: Command): Command {
   return cmd
@@ -34,13 +34,25 @@ export interface AgentDeleteOptions extends CommandOptions {
 
 export type AgentDeleteResult = SingleResult<DeleteResult>;
 
+// History includes archived agents and agents whose provider is unavailable.
+async function fetchHistoryAgents(client: DaemonClient) {
+  const agents: FetchAgentHistoryEntry["agent"][] = [];
+  let cursor: string | undefined;
+  do {
+    const payload = await client.fetchAgentHistory({
+      page: { limit: 200, ...(cursor ? { cursor } : {}) },
+    });
+    agents.push(...payload.entries.map((entry) => entry.agent));
+    cursor = payload.pageInfo.nextCursor ?? undefined;
+  } while (cursor);
+  return agents;
+}
+
 export async function runDeleteCommand(
   id: string | undefined,
   options: AgentDeleteOptions,
   _command: Command,
 ): Promise<AgentDeleteResult> {
-  const host = getDaemonHost({ host: options.host });
-
   if (!id && !options.all && !options.cwd) {
     const error: CommandError = {
       code: "MISSING_ARGUMENT",
@@ -50,33 +62,19 @@ export async function runDeleteCommand(
     throw error;
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
-    const fetchPayload = await client.fetchAgents({ filter: { includeArchived: true } });
-    let agents = fetchPayload.entries.map((entry) => entry.agent);
     const deletedIds: string[] = [];
+    let agents: FetchAgentHistoryEntry["agent"][];
 
-    if (options.all) {
-      agents = agents.filter((a) => !a.archivedAt);
-    } else if (options.cwd) {
-      agents = agents.filter((a) => {
-        if (a.archivedAt) return false;
-        return isSameOrDescendantPath(options.cwd!, a.cwd);
-      });
-    } else if (id) {
-      const fetchResult = await client.fetchAgent({ agentId: id });
+    if (options.all || options.cwd) {
+      agents = await fetchHistoryAgents(client);
+      if (!options.all) {
+        agents = agents.filter((a) => isSameOrDescendantPath(options.cwd!, a.cwd));
+      }
+    } else {
+      const fetchResult = await client.fetchAgent({ agentId: id! });
       if (!fetchResult) {
         const error: CommandError = {
           code: "AGENT_NOT_FOUND",
@@ -97,6 +95,7 @@ export async function runDeleteCommand(
           await client.deleteAgent(agent.id);
           return { ok: true as const, id: agent.id };
         } catch (err) {
+          if (err && typeof err === "object" && "code" in err) throw err;
           const message = err instanceof Error ? err.message : String(err);
           return { ok: false as const, id: agent.id, message };
         }
diff --git a/packages/cli/src/commands/agent/detach.ts b/packages/cli/src/commands/agent/detach.ts
index 5de8ae8c9a..9de223dffb 100644
--- a/packages/cli/src/commands/agent/detach.ts
+++ b/packages/cli/src/commands/agent/detach.ts
@@ -1,6 +1,5 @@
 import type { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost, resolveAgentId } from "../../utils/client.js";
+import { connectToDaemon, resolveAgentId } from "../../utils/client.js";
 import type {
   CommandError,
   CommandOptions,
@@ -26,17 +25,7 @@ export async function runDetachCommand(
   options: CommandOptions,
   _command: Command,
 ): Promise<SingleResult<AgentDetachResult>> {
-  const host = getDaemonHost({ host: options.host });
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-    } satisfies CommandError;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const payload = await client.fetchAgents({ filter: { includeArchived: true } });
diff --git a/packages/cli/src/commands/agent/import.test.ts b/packages/cli/src/commands/agent/import.test.ts
index 48a678de4a..761b2a0f1e 100644
--- a/packages/cli/src/commands/agent/import.test.ts
+++ b/packages/cli/src/commands/agent/import.test.ts
@@ -43,6 +43,7 @@ describe("resolveImportCwd", () => {
     const result = await runImportCommand(
       "pi-session-1",
       {
+        daemonTarget: { kind: "endpoint", host: "example.test:12345" },
         provider: "pi",
         cwd: "/tmp/project",
       },
diff --git a/packages/cli/src/commands/agent/import.ts b/packages/cli/src/commands/agent/import.ts
index d3d27d627b..fa42b6860a 100644
--- a/packages/cli/src/commands/agent/import.ts
+++ b/packages/cli/src/commands/agent/import.ts
@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import { collectMultiple } from "../../utils/command-options.js";
 import type { CommandError, CommandOptions, SingleResult } from "../../output/index.js";
 import { agentRunSchema, type AgentRunResult } from "./run.js";
@@ -94,28 +94,11 @@ export function resolveImportCwd(explicitCwd: string | undefined, defaultCwd: st
   return cwd;
 }
 
-async function connectToDaemonOrThrow(
-  hostOption: string | undefined,
-  host: string,
-): Promise<Awaited<ReturnType<typeof connectToDaemon>>> {
-  try {
-    return await connectToDaemon({ host: hostOption });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    throw {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    } satisfies CommandError;
-  }
-}
-
 export async function runImportCommand(
   sessionIdArg: string,
   options: AgentImportOptions,
   _command: Command,
 ): Promise<AgentImportCommandResult> {
-  const host = getDaemonHost({ host: options.host });
   const sessionId = sessionIdArg.trim();
   if (!sessionId) {
     throw {
@@ -129,7 +112,7 @@ export async function runImportCommand(
   const cwd = resolveImportCwd(options.cwd, process.cwd());
 
   const labels = parseImportLabels(options.label);
-  const client = await connectToDaemonOrThrow(options.host, host);
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const agent = await client.importAgent({
diff --git a/packages/cli/src/commands/agent/inspect.ts b/packages/cli/src/commands/agent/inspect.ts
index 93f1da3d4d..bad8808526 100644
--- a/packages/cli/src/commands/agent/inspect.ts
+++ b/packages/cli/src/commands/agent/inspect.ts
@@ -1,7 +1,7 @@
 import type { Command } from "commander";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
 export function addInspectOptions(cmd: Command): Command {
@@ -217,8 +217,6 @@ export async function runInspectCommand(
   options: AgentInspectOptions,
   _command: Command,
 ): Promise<AgentInspectResult> {
-  const host = getDaemonHost({ host: options.host });
-
   // Validate arguments
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     const error: CommandError = {
@@ -229,18 +227,7 @@ export async function runInspectCommand(
     throw error;
   }
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const fetchResult = await client.fetchAgent({ agentId: agentIdArg });
diff --git a/packages/cli/src/commands/agent/logs.test.ts b/packages/cli/src/commands/agent/logs.test.ts
new file mode 100644
index 0000000000..e551aa3791
--- /dev/null
+++ b/packages/cli/src/commands/agent/logs.test.ts
@@ -0,0 +1,151 @@
+import { describe, expect, it } from "vitest";
+import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+import { createFollowTranscriptWriter, formatAgentActivityTranscript } from "./logs.js";
+
+function collect(items: readonly AgentTimelineItem[], turnId?: string): string {
+  let output = "";
+  const writer = createFollowTranscriptWriter((chunk) => {
+    output += chunk;
+  });
+  for (const item of items) {
+    writer.push(item, turnId);
+  }
+  writer.end();
+  return output;
+}
+
+describe("createFollowTranscriptWriter", () => {
+  it("matches one-shot logs when reasoning and assistant text alternate", () => {
+    const items: AgentTimelineItem[] = [
+      { type: "reasoning", text: "Check " },
+      { type: "reasoning", text: "the commands." },
+      { type: "assistant_message", text: "I will list the commands.", messageId: "msg_1" },
+      { type: "reasoning", text: "Then summarize." },
+      { type: "assistant_message", text: "Done.", messageId: "msg_2" },
+    ];
+
+    expect(collect(items).trimEnd()).toBe(formatAgentActivityTranscript(items));
+  });
+
+  it("keeps a word that arrives split across fragments intact", () => {
+    const output = collect([
+      { type: "assistant_message", text: "the paseo-pr", messageId: "msg_1" },
+      { type: "assistant_message", text: "-cycle label\n", messageId: "msg_1" },
+    ]);
+
+    expect(output).toBe("the paseo-pr-cycle label\n");
+  });
+
+  it("streams text as it arrives without inventing a line break", () => {
+    const chunks: string[] = [];
+    const writer = createFollowTranscriptWriter((chunk) => {
+      chunks.push(chunk);
+    });
+
+    writer.push({
+      type: "assistant_message",
+      text: "first line",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line");
+
+    writer.push({
+      type: "assistant_message",
+      text: "\nsecond",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line\nsecond");
+
+    writer.push({
+      type: "assistant_message",
+      text: " line\n",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line\nsecond line");
+
+    writer.end();
+    expect(chunks.join("")).toBe("first line\nsecond line\n");
+  });
+
+  it("emits the same transcript the one-shot command prints for the same items", () => {
+    const items: AgentTimelineItem[] = [
+      {
+        type: "assistant_message",
+        text: "Plan for paseo-pr",
+        messageId: "msg_1",
+      },
+      {
+        type: "assistant_message",
+        text: "-cycle:\n- build\n- test\n",
+        messageId: "msg_1",
+      },
+      { type: "error", message: "boom" },
+      { type: "assistant_message", text: "done", messageId: "msg_2" },
+    ];
+
+    expect(collect(items).trimEnd()).toBe(formatAgentActivityTranscript(items));
+  });
+
+  it("starts a new message when the messageId changes", () => {
+    const output = collect([
+      { type: "assistant_message", text: "first", messageId: "msg_1" },
+      { type: "assistant_message", text: "second", messageId: "msg_2" },
+    ]);
+
+    expect(output).toBe("first\nsecond\n");
+  });
+
+  it("does not merge fragments across turns", () => {
+    let output = "";
+    const writer = createFollowTranscriptWriter((chunk) => {
+      output += chunk;
+    });
+
+    writer.push({ type: "assistant_message", text: "first" }, "turn_1");
+    writer.push({ type: "assistant_message", text: "second" }, "turn_2");
+    writer.end();
+
+    expect(output).toBe("first\nsecond\n");
+  });
+
+  it("prints the thought prefix once for a merged reasoning stream", () => {
+    const output = collect([
+      { type: "reasoning", text: "checking the" },
+      { type: "reasoning", text: " lockfile\nthen the build\n" },
+    ]);
+
+    expect(output).toBe("[Thought] checking the lockfile\nthen the build\n");
+  });
+
+  it("keeps reasoning blocks separate across hidden timeline items", () => {
+    let output = "";
+    const writer = createFollowTranscriptWriter((chunk) => {
+      output += chunk;
+    }, "reasoning");
+    writer.push({ type: "reasoning", text: "checking files" });
+    writer.push({
+      type: "tool_call",
+      callId: "tool_1",
+      name: "Bash",
+      status: "completed",
+      error: null,
+      detail: { type: "unknown", input: "ls", output: "files" },
+    });
+    writer.push({ type: "reasoning", text: "running tests" });
+    writer.end();
+
+    expect(output).toBe("[Thought] checking files\n[Thought] running tests\n");
+  });
+
+  it("keeps interior blank lines and drops trailing whitespace", () => {
+    const output = collect([
+      {
+        type: "assistant_message",
+        text: "  # Title\n\nBody\n\n  ",
+        messageId: "msg_1",
+      },
+    ]);
+
+    expect(output).toBe("# Title\n\nBody\n");
+  });
+});
diff --git a/packages/cli/src/commands/agent/logs.ts b/packages/cli/src/commands/agent/logs.ts
index 14355aee81..ed77d4be62 100644
--- a/packages/cli/src/commands/agent/logs.ts
+++ b/packages/cli/src/commands/agent/logs.ts
@@ -1,14 +1,14 @@
 import { Command } from "commander";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
-import type { CommandOptions } from "../../output/index.js";
+import { connectToDaemon } from "../../utils/client.js";
+import { waitForStop } from "../../utils/wait-for-stop.js";
+import type { CommandError, CommandOptions } from "../../output/index.js";
 import {
   fetchProjectedTimelineItems,
   LIVE_HISTORY_FETCH_TIMEOUT_MS,
 } from "../../utils/timeline.js";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
-import type { AgentStreamMessage } from "@getpaseo/protocol/messages";
-import { curateAgentActivity } from "@getpaseo/server";
+import { curateAgentActivity } from "@getpaseo/server/agent-activity";
 
 export function addLogsOptions(cmd: Command): Command {
   return cmd
@@ -32,12 +32,29 @@ export type AgentLogsResult = void;
 
 export const NO_ACTIVITY_MESSAGE = "No activity to display.";
 
+interface FetchAgentTimelineItemsOptions {
+  timeoutMs?: number;
+  sinceTimestampMs?: number;
+}
+
+interface FollowModeInput {
+  client: DaemonClient;
+  agentId: string;
+  options: AgentLogsOptions;
+  sinceTimestampMs: number | undefined;
+}
+
 export async function fetchAgentTimelineItems(
   client: DaemonClient,
   agentId: string,
-  options?: { timeoutMs?: number },
+  options?: FetchAgentTimelineItemsOptions,
 ): Promise<AgentTimelineItem[]> {
-  return fetchProjectedTimelineItems({ client, agentId, timeoutMs: options?.timeoutMs });
+  return fetchProjectedTimelineItems({
+    client,
+    agentId,
+    timeoutMs: options?.timeoutMs,
+    sinceTimestampMs: options?.sinceTimestampMs,
+  });
 }
 
 export function formatAgentActivityTranscript(
@@ -53,6 +70,134 @@ export function formatAgentActivityTranscript(
   );
 }
 
+type StreamingTextType = "assistant_message" | "reasoning";
+
+const THOUGHT_PREFIX = "[Thought] ";
+
+interface PendingStreamingText {
+  type: StreamingTextType;
+  turnId: string | undefined;
+  messageId: string | undefined;
+  buffer: string;
+  emitted: boolean;
+}
+
+export interface FollowTranscriptWriter {
+  push(item: AgentTimelineItem, turnId?: string): void;
+  end(): void;
+}
+
+function lastNonWhitespaceIndex(text: string): number {
+  for (let index = text.length - 1; index >= 0; index -= 1) {
+    if (!/\s/.test(text[index])) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Follow mode receives one streaming fragment per event, while the one-shot
+ * transcript sees the whole timeline and merges consecutive assistant and
+ * reasoning fragments with exact concatenation (`projectTimelineRows`). Printing
+ * each fragment on its own line splits words at fragment boundaries and
+ * reprints the reasoning prefix, so a chain of fragments is written as one
+ * stream instead: text goes out as it arrives, and only the trailing whitespace
+ * is held back so the message ends trimmed the way the transcript does.
+ */
+export function createFollowTranscriptWriter(
+  write: (chunk: string) => void = (chunk) => void process.stdout.write(chunk),
+  filter?: string,
+): FollowTranscriptWriter {
+  let pending: PendingStreamingText | null = null;
+
+  const emit = (chain: PendingStreamingText, text: string): void => {
+    if (!chain.emitted) {
+      chain.emitted = true;
+      if (chain.type === "reasoning") {
+        write(THOUGHT_PREFIX);
+      }
+    }
+    write(text);
+  };
+
+  const flushContent = (chain: PendingStreamingText): void => {
+    if (!chain.emitted) {
+      chain.buffer = chain.buffer.replace(/^\s+/, "");
+    }
+    const lastContent = lastNonWhitespaceIndex(chain.buffer);
+    if (lastContent < 0) {
+      return;
+    }
+    emit(chain, chain.buffer.slice(0, lastContent + 1));
+    chain.buffer = chain.buffer.slice(lastContent + 1);
+  };
+
+  const closePending = (): void => {
+    const chain = pending;
+    pending = null;
+    if (!chain) {
+      return;
+    }
+    const tail = chain.emitted ? chain.buffer.trimEnd() : chain.buffer.trim();
+    if (tail) {
+      emit(chain, tail);
+    }
+    if (chain.emitted) {
+      write("\n");
+    }
+  };
+
+  const continuesChain = (item: AgentTimelineItem, turnId: string | undefined): boolean => {
+    if (!pending || pending.type !== item.type || pending.turnId !== turnId) {
+      return false;
+    }
+    if (item.type !== "assistant_message") {
+      return true;
+    }
+    return item.messageId === undefined || item.messageId === pending.messageId;
+  };
+
+  const startChain = (
+    item: Extract<AgentTimelineItem, { type: StreamingTextType }>,
+    turnId: string | undefined,
+  ): PendingStreamingText => {
+    closePending();
+    const chain: PendingStreamingText = {
+      type: item.type,
+      turnId,
+      messageId: item.type === "assistant_message" ? item.messageId : undefined,
+      buffer: "",
+      emitted: false,
+    };
+    pending = chain;
+    return chain;
+  };
+
+  return {
+    push(item, turnId) {
+      if (!matchesFilter(item, filter)) {
+        closePending();
+        return;
+      }
+      if (item.type === "assistant_message" || item.type === "reasoning") {
+        const chain = continuesChain(item, turnId) && pending ? pending : startChain(item, turnId);
+        chain.buffer += item.text;
+        flushContent(chain);
+        return;
+      }
+      closePending();
+      const transcript = formatAgentActivityTranscript([item]);
+      if (transcript && transcript !== NO_ACTIVITY_MESSAGE) {
+        write(`${transcript}\n`);
+      }
+    },
+    end() {
+      closePending();
+    },
+  };
+}
+
 function parseTailCount(raw: string | undefined): number | undefined {
   if (raw === undefined) return undefined;
   const parsed = Number.parseInt(raw, 10);
@@ -62,6 +207,19 @@ function parseTailCount(raw: string | undefined): number | undefined {
   return parsed;
 }
 
+function parseSinceTimestamp(raw: string | undefined): number | undefined {
+  if (raw === undefined) return undefined;
+  const timestampMs = Date.parse(raw);
+  if (Number.isNaN(timestampMs)) {
+    throw {
+      code: "INVALID_TIMESTAMP",
+      message: `Invalid --since value: ${raw}`,
+      details: "Use a timestamp such as 2026-01-01T00:00:00Z.",
+    } satisfies CommandError;
+  }
+  return timestampMs;
+}
+
 /**
  * Check if a timeline item matches the filter type
  */
@@ -92,23 +250,14 @@ export async function runLogsCommand(
   options: AgentLogsOptions,
   _command: Command,
 ): Promise<AgentLogsResult> {
-  const host = getDaemonHost({ host: options.host });
-
   if (!id) {
     console.error("Error: Agent ID required");
     console.error("Usage: paseo agent logs <id>");
     process.exit(1);
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    console.error(`Error: Cannot connect to daemon at ${host}: ${message}`);
-    console.error("Start the daemon with: paseo daemon start");
-    process.exit(1);
-  }
+  const sinceTimestampMs = parseSinceTimestamp(options.since);
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const fetchResult = await client.fetchAgent({ agentId: id });
@@ -128,12 +277,19 @@ export async function runLogsCommand(
         await client.close().catch(() => {});
         process.exit(1);
       }
-      await runFollowMode(client, resolvedId, options);
+      await runFollowMode({
+        client,
+        agentId: resolvedId,
+        options,
+        sinceTimestampMs,
+      });
       return;
     }
 
     // Fetch timeline directly via cursor RPC.
-    let timelineItems = await fetchAgentTimelineItems(client, resolvedId);
+    let timelineItems = await fetchAgentTimelineItems(client, resolvedId, {
+      sinceTimestampMs,
+    });
 
     // Apply filter
     if (options.filter) {
@@ -158,6 +314,7 @@ export async function runLogsCommand(
     const transcript = formatAgentActivityTranscript(timelineItems, tailCount);
     console.log(transcript);
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     console.error(`Error: Failed to get logs: ${message}`);
     await client.close().catch(() => {});
@@ -168,11 +325,12 @@ export async function runLogsCommand(
 /**
  * Follow mode: stream logs in real-time until interrupted
  */
-async function runFollowMode(
-  client: DaemonClient,
-  agentId: string,
-  options: AgentLogsOptions,
-): Promise<void> {
+async function runFollowMode({
+  client,
+  agentId,
+  options,
+  sinceTimestampMs,
+}: FollowModeInput): Promise<void> {
   const DEFAULT_FOLLOW_TAIL = 10;
   const tailCount = parseTailCount(options.tail) ?? DEFAULT_FOLLOW_TAIL;
 
@@ -181,6 +339,7 @@ async function runFollowMode(
   try {
     existingItems = await fetchAgentTimelineItems(client, agentId, {
       timeoutMs: LIVE_HISTORY_FETCH_TIMEOUT_MS,
+      sinceTimestampMs,
     });
   } catch (error) {
     console.warn("Warning: failed to fetch existing timeline", error);
@@ -202,37 +361,48 @@ async function runFollowMode(
   // Subscribe to new events
   const tailLabel =
     tailCount === 0 ? "no history" : `last ${tailCount} entr${tailCount === 1 ? "y" : "ies"}`;
-  console.log(`\n--- Following logs (${tailLabel}; Ctrl+C to stop) ---\n`);
 
-  const unsubscribe = client.on("agent_stream", (msg: unknown) => {
-    const message = msg as AgentStreamMessage;
-    if (message.type !== "agent_stream") return;
-    if (message.payload.agentId !== agentId) return;
+  const writer = createFollowTranscriptWriter(undefined, options.filter);
 
+  const unsubscribe = client.subscribeAgentTimeline(agentId, (message) => {
+    if (message.type === "agent.timeline.replacement") {
+      writer.end();
+      console.log("\n[Timeline replaced; earlier output is no longer current]");
+      return;
+    }
+
+    if (message.type === "agent.timeline.error") {
+      writer.end();
+      console.error(`Timeline observation stopped: ${message.payload.error}`);
+      return;
+    }
+    if (message.type === "agent.timeline.subscription_restored") {
+      writer.end();
+      console.log("\n[Reconnected; live output resumed. Events may have been missed.]");
+      return;
+    }
     if (message.payload.event.type === "timeline") {
-      const item = message.payload.event.item;
-      // Apply filter
-      if (options.filter && !matchesFilter(item, options.filter)) {
+      const matchesSince =
+        sinceTimestampMs === undefined || Date.parse(message.payload.timestamp) >= sinceTimestampMs;
+      if (!matchesSince) {
         return;
       }
-      // Print each timeline item as it arrives using the curator format
-      const transcript = formatAgentActivityTranscript([item]);
-      if (transcript !== NO_ACTIVITY_MESSAGE) {
-        console.log(transcript);
-      }
+      const item = message.payload.event.item;
+      writer.push(item, message.payload.event.turnId);
+    } else if (
+      message.payload.event.type === "turn_completed" ||
+      message.payload.event.type === "turn_failed" ||
+      message.payload.event.type === "turn_canceled"
+    ) {
+      writer.end();
     }
   });
 
-  // Wait for interrupt
-  await new Promise<void>((resolve) => {
-    const cleanup = () => {
-      unsubscribe();
-      resolve();
-    };
-
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
-  });
+  await unsubscribe.ready;
+  console.log(`\n--- Following logs (${tailLabel}; Ctrl+C to stop) ---\n`);
 
+  await waitForStop();
+  writer.end();
+  unsubscribe();
   await client.close();
 }
diff --git a/packages/cli/src/commands/agent/ls.test.ts b/packages/cli/src/commands/agent/ls.test.ts
index c66b34b94d..8aedf73fad 100644
--- a/packages/cli/src/commands/agent/ls.test.ts
+++ b/packages/cli/src/commands/agent/ls.test.ts
@@ -23,15 +23,21 @@ describe("buildAgentLsFetchOptions", () => {
     });
   });
 
+  it("asks the daemon for internal agents only with --internal", () => {
+    expect(buildAgentLsFetchOptions({ background: true, global: true })).toEqual({
+      filter: { includeBackground: true },
+    });
+  });
+
   it("fetches global non-archived agents for -g", () => {
     expect(buildAgentLsFetchOptions({ global: true })).toEqual({});
   });
 
-  it("keeps -a within the active scope", () => {
+  it("includes archived and background agents with -a", () => {
     expect(buildAgentLsFetchOptions({ all: true })).toEqual({
-      scope: "active",
       filter: {
         includeArchived: true,
+        includeBackground: true,
       },
     });
   });
@@ -40,6 +46,7 @@ describe("buildAgentLsFetchOptions", () => {
     expect(buildAgentLsFetchOptions({ all: true, global: true })).toEqual({
       filter: {
         includeArchived: true,
+        includeBackground: true,
       },
     });
   });
diff --git a/packages/cli/src/commands/agent/ls.ts b/packages/cli/src/commands/agent/ls.ts
index 37978d9011..0990446bc5 100644
--- a/packages/cli/src/commands/agent/ls.ts
+++ b/packages/cli/src/commands/agent/ls.ts
@@ -1,6 +1,6 @@
 import type { Command } from "commander";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 import { collectMultiple } from "../../utils/command-options.js";
 import { isSameOrDescendantPath } from "../../utils/paths.js";
@@ -12,8 +12,9 @@ type FetchAgentsOptions = NonNullable<
 export function addLsOptions(cmd: Command): Command {
   return cmd
     .description("List agents. By default excludes archived agents.")
-    .option("-a, --all", "Include archived agents")
+    .option("-a, --all", "Include archived and background agents")
     .option("-g, --global", "List agents across all directories")
+    .option("--background", "Include background workspace agents")
     .option(
       "--label <key=value>",
       "Filter by label (can be used multiple times)",
@@ -104,26 +105,13 @@ function toListItem(agent: AgentSnapshotPayload): AgentListItem {
 
 export type AgentLsResult = ListResult<AgentListItem>;
 
-function daemonConnectionFailure(host: string, cause: unknown): CommandError {
-  const reason = cause instanceof Error ? cause.message : String(cause);
-  const isSsh = host.trim().startsWith("ssh://");
-  return {
-    code: "DAEMON_NOT_RUNNING",
-    message: `Cannot reach the daemon at ${host}: ${reason}`,
-    details: isSsh
-      ? "Start the Paseo daemon on the SSH host; SSH transport does not install or start it."
-      : [
-          "Start a local daemon with: paseo daemon start",
-          "To use another daemon, pass --host <host:port> or set PASEO_HOST.",
-        ].join("\n"),
-  };
-}
-
 export interface AgentLsOptions extends CommandOptions {
   /** -a: Include archived agents */
   all?: boolean;
   /** -g: List agents across all directories */
   global?: boolean;
+  /** --background: Include background workspace agents */
+  background?: boolean;
   /** Filter by specific status */
   status?: string;
   /** Filter by specific cwd */
@@ -148,7 +136,7 @@ function parseLabelFilters(labels: string[] | undefined): Record<string, string>
 }
 
 export function buildAgentLsFetchOptions(
-  options: Pick<AgentLsOptions, "all" | "global" | "label" | "thinking">,
+  options: Pick<AgentLsOptions, "all" | "global" | "background" | "label" | "thinking">,
 ): FetchAgentsOptions {
   const labelFilters = parseLabelFilters(options.label);
   const normalizedThinkingOptionId = options.thinking?.trim();
@@ -157,6 +145,9 @@ export function buildAgentLsFetchOptions(
   if (options.all) {
     daemonFilter.includeArchived = true;
   }
+  if (options.background || options.all) {
+    daemonFilter.includeBackground = true;
+  }
   if (Object.keys(labelFilters).length > 0) {
     daemonFilter.labels = labelFilters;
   }
@@ -165,7 +156,7 @@ export function buildAgentLsFetchOptions(
   }
 
   const fetchOptions: FetchAgentsOptions = {};
-  if (!options.global) {
+  if (!options.global && !options.all) {
     fetchOptions.scope = "active";
   }
   if (Object.keys(daemonFilter).length > 0) {
@@ -178,21 +169,14 @@ export function buildAgentLsFetchOptions(
  * Agent ls command semantics:
  * - `paseo agent ls`    → active non-archived agents
  * - `paseo agent ls -g` → global non-archived agents
- * - `paseo agent ls -a` → active agents, including archived
+ * - `paseo agent ls -a` → all agents, including archived and background
  * - `paseo agent ls -ag` → global agents, including archived
  */
 export async function runLsCommand(
   options: AgentLsOptions,
   _command: Command,
 ): Promise<AgentLsResult> {
-  const host = getDaemonHost({ host: options.host });
-
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    throw daemonConnectionFailure(host, err);
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const normalizedThinkingOptionId = options.thinking?.trim();
diff --git a/packages/cli/src/commands/agent/mode.ts b/packages/cli/src/commands/agent/mode.ts
index 46229b580c..cbd7bfbd56 100644
--- a/packages/cli/src/commands/agent/mode.ts
+++ b/packages/cli/src/commands/agent/mode.ts
@@ -55,7 +55,7 @@ export async function runModeCommand(
   _command: Command,
 ): Promise<AgentModeResult> {
   const normalizedMode = mode?.trim();
-  const host = getDaemonHost({ host: options.host });
+  const host = getDaemonHost({ target: options.daemonTarget });
 
   // Validate arguments
   if (!options.list && !normalizedMode) {
@@ -64,7 +64,7 @@ export async function runModeCommand(
 
   let client: Awaited<ReturnType<typeof connectToDaemon>> | undefined;
   try {
-    client = await connectToDaemon({ host: options.host });
+    client = await connectToDaemon({ target: options.daemonTarget });
     const fetchResult = await client.fetchAgent({ agentId: id });
     if (!fetchResult) {
       const error: CommandError = {
diff --git a/packages/cli/src/commands/agent/open.ts b/packages/cli/src/commands/agent/open.ts
index 333ec61b4e..2c1eab36d2 100644
--- a/packages/cli/src/commands/agent/open.ts
+++ b/packages/cli/src/commands/agent/open.ts
@@ -1,5 +1,6 @@
 import type { Command } from "commander";
-import { buildDaemonConnectionCommandError, connectToDaemon } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
+import type { AgentDeepLinkTarget } from "@getpaseo/protocol/agent-deep-link";
 import { openDesktopWithAgent } from "../open.js";
 import type {
   CommandError,
@@ -30,18 +31,24 @@ export function addOpenOptions(command: Command): Command {
     .option("--server <server-id>", "Server ID (defaults to the local daemon)");
 }
 
-async function resolveServerId(options: CommandOptions): Promise<string> {
+function toOpenError(err: unknown): CommandError {
+  if (err && typeof err === "object" && "code" in err) {
+    return err as CommandError;
+  }
+  const message = err instanceof Error ? err.message : String(err);
+  return { code: "OPEN_FAILED", message: `Failed to open agent: ${message}` };
+}
+
+async function resolveAgentTarget(
+  agentId: string,
+  options: CommandOptions,
+): Promise<AgentDeepLinkTarget> {
   const explicitServerId = typeof options.server === "string" ? options.server.trim() : "";
   if (explicitServerId) {
-    return explicitServerId;
+    return { serverId: explicitServerId, agentId };
   }
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (error) {
-    throw buildDaemonConnectionCommandError({ host: options.host, error });
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
   try {
     const serverId = client.getLastServerInfoMessage()?.serverId.trim();
     if (!serverId) {
@@ -51,7 +58,19 @@ async function resolveServerId(options: CommandOptions): Promise<string> {
       };
       throw error;
     }
-    return serverId;
+
+    const fetchResult = await client.fetchAgent({ agentId });
+    if (!fetchResult) {
+      const error: CommandError = {
+        code: "AGENT_NOT_FOUND",
+        message: `Agent not found: ${agentId}`,
+        details: 'Use "paseo ls" to list available agents',
+      };
+      throw error;
+    }
+    return { serverId, agentId: fetchResult.agent.id };
+  } catch (err) {
+    throw toOpenError(err);
   } finally {
     await client.close().catch(() => {});
   }
@@ -71,12 +90,12 @@ export async function runOpenCommand(
     throw error;
   }
 
-  const serverId = await resolveServerId(options);
-  await openDesktopWithAgent({ serverId, agentId });
+  const target = await resolveAgentTarget(agentId, options);
+  await openDesktopWithAgent(target);
 
   return {
     type: "single",
-    data: { agentId, serverId, status: "opened" },
+    data: { ...target, status: "opened" },
     schema: openAgentSchema,
   };
 }
diff --git a/packages/cli/src/commands/agent/reload.ts b/packages/cli/src/commands/agent/reload.ts
index 607dfa278a..f6cda480e2 100644
--- a/packages/cli/src/commands/agent/reload.ts
+++ b/packages/cli/src/commands/agent/reload.ts
@@ -1,6 +1,5 @@
 import { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost, resolveAgentId } from "../../utils/client.js";
+import { connectToDaemon, resolveAgentId } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -40,8 +39,6 @@ export async function runReloadCommand(
   options: AgentReloadOptions,
   _command: Command,
 ): Promise<AgentReloadCommandResult> {
-  const host = getDaemonHost({ host: options.host });
-
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     const error: CommandError = {
       code: "MISSING_AGENT_ID",
@@ -51,18 +48,7 @@ export async function runReloadCommand(
     throw error;
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const agentsPayload = await client.fetchAgents({ filter: { includeArchived: true } });
diff --git a/packages/cli/src/commands/agent/run.test.ts b/packages/cli/src/commands/agent/run.test.ts
index 755638d4d3..5e64ccba81 100644
--- a/packages/cli/src/commands/agent/run.test.ts
+++ b/packages/cli/src/commands/agent/run.test.ts
@@ -1,18 +1,72 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+import { resolveCallerAgentId as resolveRunCallerAgentId } from "../../utils/caller-agent.js";
 import {
   resolveExistingRunWorkspace,
-  resolveRunCallerAgentId,
   runRunCommand,
+  waitsForFinish,
   type AgentRunOptions,
 } from "./run";
 
+const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
+
+// Answers fetchAgent the way a daemon does: an unknown id is an error.
+function daemonWithAgents(...agentIds: string[]) {
+  return {
+    async fetchAgent({ agentId }: { agentId: string }) {
+      if (!agentIds.includes(agentId)) {
+        throw new Error(`Agent not found: ${agentId}`);
+      }
+      return { agent: { id: agentId } };
+    },
+  };
+}
+
+describe("run wait policy", () => {
+  it("waits by default and stops waiting on --no-wait or a legacy alias", () => {
+    expect(waitsForFinish({})).toBe(true);
+    expect(waitsForFinish({ wait: false })).toBe(false);
+    expect(waitsForFinish({ background: true })).toBe(false);
+    expect(waitsForFinish({ detach: true })).toBe(false);
+  });
+});
+
 describe("managed agent caller context", () => {
-  it("propagates a trimmed PASEO_AGENT_ID", () => {
-    expect(resolveRunCallerAgentId({ PASEO_AGENT_ID: "  parent-agent  " })).toBe("parent-agent");
+  it("uses a trimmed PASEO_AGENT_ID when the target daemon runs that agent", async () => {
+    await expect(
+      resolveRunCallerAgentId(daemonWithAgents("parent-agent"), {
+        PASEO_AGENT_ID: "  parent-agent  ",
+      }),
+    ).resolves.toBe("parent-agent");
   });
 
-  it("omits blank caller ids", () => {
-    expect(resolveRunCallerAgentId({ PASEO_AGENT_ID: "   " })).toBeUndefined();
+  it("runs without a caller when PASEO_AGENT_ID belongs to another daemon", async () => {
+    await expect(
+      resolveRunCallerAgentId(daemonWithAgents("other-agent"), {
+        PASEO_AGENT_ID: "parent-agent",
+      }),
+    ).resolves.toBeUndefined();
+  });
+
+  it.each(["DAEMON_CONNECTION_LOST", "DAEMON_REQUEST_TIMEOUT"] as const)(
+    "preserves %s instead of dropping the caller",
+    async (code) => {
+      const disconnectedDaemon = {
+        async fetchAgent(): Promise<never> {
+          throw new DaemonConnectionError("Caller lookup transport failed", code);
+        },
+      };
+
+      await expect(
+        resolveRunCallerAgentId(disconnectedDaemon, { PASEO_AGENT_ID: "parent-agent" }),
+      ).rejects.toBeInstanceOf(DaemonConnectionError);
+    },
+  );
+
+  it("omits blank caller ids", async () => {
+    await expect(
+      resolveRunCallerAgentId(daemonWithAgents(), { PASEO_AGENT_ID: "   " }),
+    ).resolves.toBeUndefined();
   });
 });
 
@@ -65,8 +119,13 @@ describe("runRunCommand option validation", () => {
     }
   });
 
-  async function expectInvalidOptions(options: AgentRunOptions, messageMatch: RegExp) {
-    await expect(runRunCommand("do something", options, {} as never)).rejects.toMatchObject({
+  async function expectInvalidOptions(
+    options: Omit<AgentRunOptions, "daemonTarget">,
+    messageMatch: RegExp,
+  ) {
+    await expect(
+      runRunCommand("do something", { ...options, daemonTarget }, {} as never),
+    ).rejects.toMatchObject({
       code: "INVALID_OPTIONS",
       message: expect.stringMatching(messageMatch),
     });
@@ -84,7 +143,11 @@ describe("runRunCommand option validation", () => {
     // must clear validation. It still fails later (provider resolution), which
     // is enough to prove the new guard did not reject it.
     await expect(
-      runRunCommand("do something", { newWorkspace: "worktree", provider: undefined }, {} as never),
+      runRunCommand(
+        "do something",
+        { newWorkspace: "worktree", provider: undefined, daemonTarget },
+        {} as never,
+      ),
     ).rejects.not.toMatchObject({ code: "INVALID_OPTIONS" });
   });
 
diff --git a/packages/cli/src/commands/agent/run.ts b/packages/cli/src/commands/agent/run.ts
index a642909952..86cca5f75c 100644
--- a/packages/cli/src/commands/agent/run.ts
+++ b/packages/cli/src/commands/agent/run.ts
@@ -1,7 +1,11 @@
 import { Command, Option } from "commander";
-import { getStructuredAgentResponse, StructuredAgentResponseError } from "@getpaseo/server";
+import {
+  getStructuredAgentResponse,
+  StructuredAgentResponseError,
+} from "@getpaseo/server/agent-response";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { resolveCallerAgentId } from "../../utils/caller-agent.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -23,10 +27,13 @@ export function addRunOptions(cmd: Command): Command {
     cmd
       .description("Create and start an agent with a task")
       .argument("<prompt>", "The task/prompt for the agent")
-      .option("-d, --background", "Run in background")
+      .option("--no-wait", "Return immediately without waiting for completion")
+      // COMPAT(backgroundRunFlag): --background was the documented spelling of
+      // --no-wait. Added in v0.2.0; remove after 2027-04-01.
+      .addOption(new Option("-d, --background", "Legacy alias for --no-wait").hideHelp())
       // COMPAT(detachRunFlag): --detach used to mean background execution, not
       // ownership transfer. Added in v0.2.0; remove after 2027-01-17.
-      .addOption(new Option("--detach", "Legacy alias for --background").hideHelp())
+      .addOption(new Option("--detach", "Legacy alias for --no-wait").hideHelp())
       .option("--title <title>", "Assign a title to the agent")
       .addOption(new Option("--name <name>", "Hidden alias for --title").hideHelp())
       .option(
@@ -107,6 +114,7 @@ export const agentRunSchema: OutputSchema<AgentRunResult> = {
 };
 
 export interface AgentRunOptions extends CommandOptions {
+  wait?: boolean;
   background?: boolean;
   detach?: boolean;
   title?: string;
@@ -140,6 +148,7 @@ function resolveNewWorkspaceKind(options: AgentRunOptions): string | undefined {
 function buildRunWorkspaceSource(options: AgentRunOptions, cwd: string) {
   const newWorkspace = resolveNewWorkspaceKind(options) ?? "local";
   return buildWorkspaceSource({
+    daemonTarget: options.daemonTarget,
     isolation: newWorkspace,
     path: cwd,
     mode: options.worktreeMode,
@@ -181,6 +190,7 @@ function loadOutputSchema(value: string): Record<string, unknown> {
     try {
       source = readFileSync(resolve(trimmed), "utf8");
     } catch (err) {
+      if (err && typeof err === "object" && "code" in err) throw err;
       const message = err instanceof Error ? err.message : String(err);
       const error: CommandError = {
         code: "INVALID_OUTPUT_SCHEMA",
@@ -195,6 +205,7 @@ function loadOutputSchema(value: string): Record<string, unknown> {
   try {
     parsed = JSON.parse(source);
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     const error: CommandError = {
       code: "INVALID_OUTPUT_SCHEMA",
@@ -382,19 +393,25 @@ function validateRunOptions(prompt: string, options: AgentRunOptions, outputSche
     } satisfies CommandError;
   }
 
+  if (options.background) {
+    console.error("Warning: --background (-d) is deprecated. Use --no-wait instead.");
+  }
+
   validateRunWorkspaceOptions(options);
 
-  if (outputSchema && runsInBackground(options)) {
+  if (outputSchema && !waitsForFinish(options)) {
     throw {
       code: "INVALID_OPTIONS",
-      message: "--output-schema cannot be used with --background",
+      message: "--output-schema cannot be used with --no-wait",
       details: "Structured output requires waiting for the agent to finish",
     } satisfies CommandError;
   }
 }
 
-function runsInBackground(options: Pick<AgentRunOptions, "background" | "detach">): boolean {
-  return Boolean(options.background || options.detach);
+export function waitsForFinish(
+  options: Pick<AgentRunOptions, "wait" | "background" | "detach">,
+): boolean {
+  return options.wait !== false && !options.background && !options.detach;
 }
 
 function parseWaitTimeoutOption(waitTimeout: string | undefined): number {
@@ -406,6 +423,7 @@ function parseWaitTimeoutOption(waitTimeout: string | undefined): number {
     }
     return ms;
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     throw {
       code: "INVALID_TIMEOUT",
@@ -432,6 +450,7 @@ function loadRunImages(
         mimeType,
       };
     } catch (err) {
+      if (err && typeof err === "object" && "code" in err) throw err;
       const message = err instanceof Error ? err.message : String(err);
       throw new Error(`Failed to read image ${imagePath}: ${message}`, { cause: err });
     }
@@ -482,22 +501,6 @@ function parseKeyValueFlags(
   return labels;
 }
 
-async function connectToDaemonOrThrow(
-  hostOption: string | undefined,
-  host: string,
-): Promise<ConnectedDaemonClient> {
-  try {
-    return await connectToDaemon({ host: hostOption });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    throw {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    } satisfies CommandError;
-  }
-}
-
 // A workspace is the explicit home of a run: it owns the directory the agent
 // runs in. The CLI resolves one before creating any agent, so no run leans on
 // createAgent's legacy cwd->workspace fallback.
@@ -534,7 +537,7 @@ export async function resolveExistingRunWorkspace(
 
 // Workspace policy for `paseo run`. Precedence:
 //   1. --workspace <id>            -> run in that existing workspace
-//   2. $PASEO_AGENT_ID             -> daemon resolves the caller's workspace
+//   2. caller agent                -> daemon resolves the caller's workspace
 //   3. $PASEO_WORKSPACE_ID         -> exported by workspace terminals
 //   4. --new-workspace <kind>      -> mint a new workspace explicitly
 //   5. bare run                    -> mint a new local-backed workspace for cwd
@@ -542,6 +545,7 @@ async function resolveRunWorkspace(
   client: ConnectedDaemonClient,
   options: AgentRunOptions,
   cwd: string,
+  callerAgentId: string | undefined,
 ): Promise<RunWorkspace> {
   const newWorkspace = resolveNewWorkspaceKind(options);
   const explicit = newWorkspace ? undefined : options.workspace?.trim();
@@ -550,7 +554,7 @@ async function resolveRunWorkspace(
     return resolveExistingRunWorkspace(client, explicit);
   }
 
-  if (!newWorkspace && resolveRunCallerAgentId()) {
+  if (!newWorkspace && callerAgentId) {
     return { cwd };
   }
 
@@ -563,7 +567,10 @@ async function resolveRunWorkspace(
   // TODO: thread the run `prompt` as firstAgentContext so workspace-level
   // title/branch generation picks up the task description (U8/U6 deferred).
   const source = buildRunWorkspaceSource(options, cwd);
-  const result = await client.createWorkspace({ source });
+  const result = await client.createWorkspace({
+    source,
+    ...(callerAgentId ? { callerAgentId } : {}),
+  });
 
   if (!result.workspace) {
     throw {
@@ -587,7 +594,6 @@ export async function runRunCommand(
   options: AgentRunOptions,
   _command: Command,
 ): Promise<SingleResult<AgentRunResult>> {
-  const host = getDaemonHost({ host: options.host });
   const outputSchema = options.outputSchema ? loadOutputSchema(options.outputSchema) : undefined;
 
   validateRunOptions(prompt, options, outputSchema);
@@ -596,7 +602,7 @@ export async function runRunCommand(
   const resolvedProviderModel = resolveProviderAndModel(options);
   const resolvedTitle = options.title ?? options.name;
 
-  const client = await connectToDaemonOrThrow(options.host, host);
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     // Resolve working directory
@@ -618,9 +624,9 @@ export async function runRunCommand(
     const env = parseRunEnv(options.env);
     const requestEnv = Object.keys(env).length > 0 ? env : undefined;
 
-    const workspace = await resolveRunWorkspace(client, options, cwd);
+    const callerAgentId = await resolveCallerAgentId(client);
+    const workspace = await resolveRunWorkspace(client, options, cwd, callerAgentId);
     const workspaceId = workspace.id;
-    const callerAgentId = resolveRunCallerAgentId();
     const runCwd = workspace.cwd;
 
     if (outputSchema) {
@@ -714,8 +720,8 @@ export async function runRunCommand(
       labels: Object.keys(labels).length > 0 ? labels : undefined,
     });
 
-    // Default run behavior is foreground: wait for completion unless background execution is set.
-    if (!runsInBackground(options)) {
+    // Default run behavior is foreground: wait for completion unless --no-wait is set.
+    if (waitsForFinish(options)) {
       const state = await client.waitForFinish(agent.id, waitTimeoutMs);
       await client.close();
 
@@ -751,9 +757,3 @@ export async function runRunCommand(
     throw error;
   }
 }
-
-export function resolveRunCallerAgentId(
-  env: { PASEO_AGENT_ID?: string } = process.env,
-): string | undefined {
-  return env.PASEO_AGENT_ID?.trim() || undefined;
-}
diff --git a/packages/cli/src/commands/agent/send.ts b/packages/cli/src/commands/agent/send.ts
index 06249289b7..69e0c36d9d 100644
--- a/packages/cli/src/commands/agent/send.ts
+++ b/packages/cli/src/commands/agent/send.ts
@@ -1,6 +1,6 @@
 import { type Command } from "commander";
 import { collectMultiple } from "../../utils/command-options.js";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -78,6 +78,7 @@ async function readImageFiles(
 
         return { data: buffer.toString("base64"), mimeType };
       } catch (err) {
+        if (err && typeof err === "object" && "code" in err) throw err;
         const message = err instanceof Error ? err.message : String(err);
         throw {
           code: "IMAGE_READ_ERROR",
@@ -128,6 +129,7 @@ async function resolvePromptInput(options: {
   try {
     return await readFile(resolve(promptFilePath), "utf8");
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     const error: CommandError = {
       code: "PROMPT_FILE_READ_ERROR",
@@ -166,8 +168,6 @@ export async function runSendCommand(
   options: AgentSendOptions,
   _command: Command,
 ): Promise<SingleResult<AgentSendResult>> {
-  const host = getDaemonHost({ host: options.host });
-
   // Validate arguments
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     const error: CommandError = {
@@ -184,18 +184,7 @@ export async function runSendCommand(
     promptFile: options.promptFile,
   });
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     // Read image files if provided
@@ -203,7 +192,10 @@ export async function runSendCommand(
       options.image && options.image.length > 0 ? await readImageFiles(options.image) : undefined;
 
     // Send the message
-    await client.sendAgentMessage(agentIdArg, promptInput, { images });
+    await client.sendAgentMessage(agentIdArg, promptInput, {
+      images,
+      sourceAgentId: process.env.PASEO_AGENT_ID?.trim() || undefined,
+    });
 
     // If --no-wait, return immediately
     if (options.wait === false) {
diff --git a/packages/cli/src/commands/agent/stop.ts b/packages/cli/src/commands/agent/stop.ts
index 42d269fcf2..3207bca4f8 100644
--- a/packages/cli/src/commands/agent/stop.ts
+++ b/packages/cli/src/commands/agent/stop.ts
@@ -1,6 +1,5 @@
 import { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import { isSameOrDescendantPath } from "../../utils/paths.js";
 import type {
   CommandOptions,
@@ -42,8 +41,6 @@ export async function runStopCommand(
   options: AgentStopOptions,
   _command: Command,
 ): Promise<AgentStopResult> {
-  const host = getDaemonHost({ host: options.host });
-
   // Validate arguments - need either an id, --all, or --cwd
   if (!id && !options.all && !options.cwd) {
     const error: CommandError = {
@@ -54,18 +51,7 @@ export async function runStopCommand(
     throw error;
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const fetchPayload = await client.fetchAgents({ filter: { includeArchived: true } });
diff --git a/packages/cli/src/commands/agent/update.ts b/packages/cli/src/commands/agent/update.ts
index d23ad2d3ac..f41150b563 100644
--- a/packages/cli/src/commands/agent/update.ts
+++ b/packages/cli/src/commands/agent/update.ts
@@ -1,7 +1,7 @@
 import type { Command } from "commander";
 import type { AgentProviderNotice } from "@getpaseo/protocol/agent-types";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -203,8 +203,6 @@ export async function runUpdateCommand(
   options: AgentUpdateOptions,
   _command: Command,
 ): Promise<AgentUpdateCommandResult> {
-  const host = getDaemonHost({ host: options.host });
-
   // Validate arguments
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     const error: CommandError = {
@@ -217,18 +215,7 @@ export async function runUpdateCommand(
 
   const changes = parseAgentChanges(options);
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const fetchResult = await client.fetchAgent({ agentId: agentIdArg });
diff --git a/packages/cli/src/commands/agent/wait.ts b/packages/cli/src/commands/agent/wait.ts
index 6c800746cf..3e5e5b533a 100644
--- a/packages/cli/src/commands/agent/wait.ts
+++ b/packages/cli/src/commands/agent/wait.ts
@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -72,6 +72,7 @@ function parseWaitTimeout(timeout: string | undefined): {
       timeoutLabel: `${timeoutSeconds} second${timeoutSeconds === 1 ? "" : "s"}`,
     };
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     throw {
       code: "INVALID_TIMEOUT",
@@ -142,8 +143,6 @@ export async function runWaitCommand(
   options: AgentWaitOptions,
   _command: Command,
 ): Promise<SingleResult<AgentWaitResult>> {
-  const host = getDaemonHost({ host: options.host });
-
   if (!agentIdArg || agentIdArg.trim().length === 0) {
     throw {
       code: "MISSING_AGENT_ID",
@@ -154,18 +153,7 @@ export async function runWaitCommand(
 
   const { timeoutMs, timeoutLabel } = parseWaitTimeout(options.timeout);
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     try {
diff --git a/packages/cli/src/commands/clone.ts b/packages/cli/src/commands/clone.ts
index 6986934c30..cf3001b775 100644
--- a/packages/cli/src/commands/clone.ts
+++ b/packages/cli/src/commands/clone.ts
@@ -1,7 +1,6 @@
 import type { Command } from "commander";
 import { isCompleteGitRemote } from "@getpaseo/protocol/git-remote";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { buildDaemonConnectionCommandError, connectToDaemon } from "../utils/client.js";
+import { connectToDaemon } from "../utils/client.js";
 import type { CommandError, OutputSchema, SingleResult } from "../output/index.js";
 import type { CommandOptions } from "../output/with-output.js";
 
@@ -45,12 +44,7 @@ export async function runCloneCommand(
     throw cmdError("INVALID_ARGUMENT", "--protocol is required for owner/repo repository names");
   }
 
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    throw buildDaemonConnectionCommandError({ host: options.host, error: err });
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   if (client.getLastServerInfoMessage()?.features?.projectGithubClone !== true) {
     await client.close().catch(() => {});
diff --git a/packages/cli/src/commands/daemon/config.ts b/packages/cli/src/commands/daemon/config.ts
new file mode 100644
index 0000000000..c4f5cbf321
--- /dev/null
+++ b/packages/cli/src/commands/daemon/config.ts
@@ -0,0 +1,116 @@
+import { addLocalDaemonOptions } from "../../utils/command-options.js";
+import { Command } from "commander";
+import { readDaemonInstance } from "@getpaseo/server/daemon-control";
+import {
+  readPersistedConfig,
+  getPersistedConfigValue,
+  editPersistedConfig,
+} from "@getpaseo/server/configuration";
+import { connectToDaemon } from "../../utils/client.js";
+import { withOutput, type CommandOptions } from "../../output/index.js";
+
+function redact(value: unknown): unknown {
+  if (Array.isArray(value)) return value.map(redact);
+  if (!value || typeof value !== "object") return value;
+  return Object.fromEntries(
+    Object.entries(value).map(([key, item]) => [
+      key,
+      /password|(?:api|private|access)[_-]?key|token|secret|authorization/i.test(key)
+        ? "[redacted]"
+        : redact(item),
+    ]),
+  );
+}
+
+function result(data: Record<string, unknown>) {
+  return {
+    type: "single" as const,
+    data,
+    schema: {
+      idField: () => "configuration",
+      columns: [],
+      renderHuman: () => JSON.stringify(data, null, 2),
+    },
+  };
+}
+
+function homeOf(options: CommandOptions) {
+  if (options.daemonTarget.kind !== "instance")
+    throw new Error("Configuration edits require --home");
+  return options.daemonTarget.home;
+}
+
+async function applySaved(home: string, options: CommandOptions) {
+  const nextCommand = `paseo daemon start --home ${JSON.stringify(home)}`;
+  const instance = await readDaemonInstance(home);
+  if (!instance?.listen)
+    return result({
+      action: "saved",
+      applied: false,
+      message: "Saved; not applied to a running daemon",
+      nextCommand,
+    });
+  let client;
+  try {
+    client = await connectToDaemon({ target: options.daemonTarget, timeout: 1_500 });
+  } catch {
+    return result({
+      action: "saved",
+      applied: false,
+      message: "Saved; not applied to a running daemon",
+      nextCommand: `paseo daemon reload --home ${JSON.stringify(home)}`,
+    });
+  }
+  try {
+    const reload = await client.reloadDaemonConfig();
+    return result({ action: "saved", ...reload });
+  } catch (error) {
+    throw { code: "CONFIG_SAVED_RELOAD_FAILED", message: `Saved; reload failed: ${String(error)}` };
+  } finally {
+    await client.close();
+  }
+}
+
+export function daemonConfigCommand(): Command {
+  const config = new Command("config").description(
+    "Read or edit persistent local configuration (local operation)",
+  );
+  addLocalDaemonOptions(config.command("get [path]")).action(
+    withOutput(async (field: string | undefined, options: CommandOptions, _command: Command) => {
+      const persisted = readPersistedConfig(homeOf(options));
+      const value = field ? getPersistedConfigValue(persisted, field) : persisted;
+      return result({
+        source: "configured",
+        path: field ?? null,
+        set: value !== undefined,
+        value:
+          field && /password|(?:api|private|access)[_-]?key|token|secret|authorization/i.test(field)
+            ? "[redacted]"
+            : redact(value),
+      });
+    }),
+  );
+  addLocalDaemonOptions(config.command("set <path> <value>"))
+    .option("--string", "Interpret value literally as a string")
+    .action(
+      withOutput(async (field: string, raw: string, options: CommandOptions, _command: Command) => {
+        let value: unknown = raw;
+        if (!options.string) {
+          try {
+            value = JSON.parse(raw);
+          } catch {
+            /* Unquoted input is a string. */
+          }
+        }
+        editPersistedConfig(homeOf(options), field, { value });
+        return applySaved(homeOf(options), options);
+      }),
+    );
+  addLocalDaemonOptions(config.command("unset <path>")).action(
+    withOutput(async (field: string, options: CommandOptions, _command: Command) => {
+      editPersistedConfig(homeOf(options), field, { unset: true });
+      return applySaved(homeOf(options), options);
+    }),
+  );
+  return config;
+}
diff --git a/packages/cli/src/commands/daemon/index.ts b/packages/cli/src/commands/daemon/index.ts
index 869d87607c..5f9a8f842d 100644
--- a/packages/cli/src/commands/daemon/index.ts
+++ b/packages/cli/src/commands/daemon/index.ts
@@ -1,81 +1,32 @@
-import { Command, Option } from "commander";
-import { startCommand } from "./start.js";
-import { runStatusCommand } from "./status.js";
-import { runStopCommand } from "./stop.js";
-import { runRestartCommand } from "./restart.js";
+import { Command } from "commander";
+import { startCommand, daemonRunCommand } from "./start.js";
+import { daemonStatusCommand } from "./status.js";
+import { daemonStopCommand } from "./stop.js";
+import { daemonRestartCommand } from "./restart.js";
 import { runSetPasswordCommand } from "./set-password.js";
 import { pairCommand } from "./pair.js";
-import { runDaemonReloadCommand } from "./reload.js";
+import { daemonReloadCommand } from "./reload.js";
+import { daemonConfigCommand } from "./config.js";
 import { withOutput } from "../../output/index.js";
-import { addJsonAndDaemonHostOptions, addJsonOption } from "../../utils/command-options.js";
-
-function resolveHostnamesOption(hostnames: unknown, allowedHosts: unknown): string | undefined {
-  if (typeof hostnames === "string") return hostnames;
-  if (typeof allowedHosts === "string") return allowedHosts;
-  return undefined;
-}
+import { addJsonOption, addLocalDaemonOptions } from "../../utils/command-options.js";
 
 export function createDaemonCommand(): Command {
   const daemon = new Command("daemon").description("Manage the Paseo daemon");
-
-  daemon.addCommand(startCommand());
-  daemon.addCommand(pairCommand());
-
-  addJsonAndDaemonHostOptions(
-    daemon.command("reload").description("Reload config.json without restarting the daemon"),
-  ).action(withOutput(runDaemonReloadCommand));
-
-  addJsonOption(daemon.command("status").description("Show local daemon status"))
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .action(withOutput(runStatusCommand));
-
-  addJsonOption(daemon.command("stop").description("Stop the local daemon"))
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .option("--timeout <seconds>", "Wait timeout before failing (default: 15)")
-    .option("--force", "Send SIGKILL if graceful stop times out")
-    .option("--kill-timeout <seconds>", "Wait after SIGKILL before failing (default: 3)")
-    .action(withOutput(runStopCommand));
-
-  addJsonOption(daemon.command("restart").description("Restart the local daemon"))
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .option("--timeout <seconds>", "Wait timeout before force step (default: 15)")
-    .option("--force", "Send SIGKILL if graceful stop times out")
-    .option(
-      "--listen <listen>",
-      "Listen target for restarted daemon (host:port, port, or unix socket)",
-    )
-    .option("--port <port>", "Port for restarted daemon listen target")
-    .option("--relay", "Enable relay on restarted daemon")
-    .option("--no-relay", "Disable relay on restarted daemon")
-    .option("--no-mcp", "Disable Agent MCP on restarted daemon")
-    .option("--no-inject-mcp", "Disable auto-injecting the Paseo MCP into created agents")
-    .option("--web-ui", "Enable the bundled daemon web UI on restarted daemon")
-    .option("--no-web-ui", "Disable the bundled daemon web UI on restarted daemon")
-    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
-    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(
-      withOutput((...args) => {
-        const [options, command] = args.slice(-2) as [(typeof args)[number], Command];
-        return runRestartCommand(
-          {
-            ...options,
-            hostnames: resolveHostnamesOption(options.hostnames, options.allowedHosts),
-          },
-          command,
-        );
-      }),
-    );
-
+  for (const command of [
+    startCommand(),
+    daemonRunCommand(),
+    daemonStatusCommand(),
+    daemonStopCommand(),
+    daemonRestartCommand(),
+    daemonReloadCommand(),
+    pairCommand(),
+    daemonConfigCommand(),
+  ])
+    daemon.addCommand(command);
   addJsonOption(
-    daemon
-      .command("set-password")
-      .description("Prompt for and save a hashed daemon password to config.json"),
-  )
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .action(withOutput(runSetPasswordCommand));
-
+    addLocalDaemonOptions(
+      daemon.command("set-password").description("Save a hashed daemon password (local operation)"),
+    ),
+  ).action(withOutput(runSetPasswordCommand));
   return daemon;
 }
diff --git a/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts b/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts
new file mode 100644
index 0000000000..fd7e845ecd
--- /dev/null
+++ b/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts
@@ -0,0 +1,688 @@
+import { spawn } from "node:child_process";
+import { mkdtemp, mkdir, readFile, rm, writeFile, stat } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import net from "node:net";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { hashDaemonPassword } from "@getpaseo/server/auth";
+import { startDaemonInstance, readDaemonInstance } from "@getpaseo/server/daemon-control";
+import { expect, test } from "vitest";
+import { connectToDaemon } from "../../utils/client.js";
+
+const repo = fileURLToPath(new URL("../../../../..", import.meta.url));
+const cli = path.join(repo, "packages/cli/dist/index.js");
+
+async function port() {
+  const server = net.createServer();
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const value = (server.address() as net.AddressInfo).port;
+  await new Promise<void>((resolve) => server.close(() => resolve()));
+  if (value === 6767 || value === 6768) throw new Error("Unsafe test port");
+  return value;
+}
+
+async function fixture() {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo lifecycle "));
+  const env = {
+    ...Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_"))),
+    HOME: root,
+    USERPROFILE: root,
+  };
+  const homes = [path.join(root, "a"), path.join(root, "b")];
+  const owned = new Map<string, { pid: number; startedAt: string }>();
+  async function run(args: string[], overrides: NodeJS.ProcessEnv = {}) {
+    const child = spawn(process.execPath, [cli, ...args], {
+      cwd: root,
+      env: { ...env, ...overrides },
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    let stdout = "",
+      stderr = "";
+    child.stdout.on("data", (data) => {
+      stdout += data;
+    });
+    child.stderr.on("data", (data) => {
+      stderr += data;
+    });
+    const code = await new Promise<number | null>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        child.kill("SIGTERM");
+        reject(new Error(`CLI timed out: ${args.join(" ")}\n${stderr}`));
+      }, 45_000);
+      child.once("error", reject);
+      child.once("close", (exitCode) => {
+        clearTimeout(timer);
+        resolve(exitCode);
+      });
+    });
+    for (const home of homes) {
+      try {
+        const lock = JSON.parse(await readFile(path.join(home, "paseo.pid"), "utf8"));
+        owned.set(home, lock);
+      } catch {
+        /* No acquired launch. */
+      }
+    }
+    return { code, stdout, stderr, json: () => JSON.parse(stdout) };
+  }
+  async function ok(args: string[], overrides?: NodeJS.ProcessEnv) {
+    const result = await run(["--json", ...args], overrides);
+    expect(result.code, `${args.join(" ")}\n${result.stdout}\n${result.stderr}`).toBe(0);
+    return result.json();
+  }
+  async function liveStatus(home: string, overrides?: NodeJS.ProcessEnv) {
+    let status;
+    await expect
+      .poll(
+        async () => {
+          status = await ok(["status", "--home", home], overrides);
+          return status;
+        },
+        { timeout: 30_000 },
+      )
+      // A connected socket can outlive a status RPC timeout without reporting the worker.
+      .toMatchObject({ connectedDaemon: "reachable", workerPid: expect.any(Number) });
+    return status;
+  }
+  async function configure(home: string, listen: string) {
+    for (const [field, value] of [
+      ["daemon.listen", listen],
+      ["daemon.relay.enabled", "false"],
+      ["features.webUi.enabled", "false"],
+      ["features.dictation.enabled", "false"],
+      ["features.voiceMode.enabled", "false"],
+    ]) {
+      await ok(["daemon", "config", "set", field!, value!, "--home", home]);
+    }
+  }
+  async function close() {
+    for (const [home, captured] of owned) {
+      try {
+        const lock = JSON.parse(await readFile(path.join(home, "paseo.pid"), "utf8"));
+        if (lock.pid === captured.pid && lock.startedAt === captured.startedAt) {
+          await run(["daemon", "stop", "--home", home, "--force", "--timeout", "2"]);
+        }
+      } catch {
+        /* Already exited. */
+      }
+    }
+    await rm(root, { recursive: true, force: true });
+  }
+  return { root, homes, env, run, ok, liveStatus, configure, close };
+}
+
+test("managed two-home restart retains its supervisor and never routes ordinary commands or stop to the other home", async () => {
+  const f = await fixture();
+  const [a, b] = f.homes as [string, string];
+  const portA = await port(),
+    portB = await port(),
+    movedPort = await port();
+  try {
+    await f.configure(a, `127.0.0.1:${portA}`);
+    await f.configure(b, `127.0.0.1:${portB}`);
+    const launchA = await f.ok(["start", "--home", a, "--timeout", "30"]);
+    const poisoned = {
+      PASEO_HOME: a,
+      PASEO_HOST: `127.0.0.1:${portA}`,
+      PASEO_LISTEN: `127.0.0.1:${portA}`,
+      PORT: String(portA),
+      PASEO_WEB_UI_ENABLED: "true",
+      PASEO_RELAY_ENABLED: "true",
+    };
+    const launchB = await f.ok(["daemon", "start", "--home", b, "--timeout", "30"], poisoned);
+    expect(launchA.listen).toBe(`127.0.0.1:${portA}`);
+    expect(launchB.listen).toBe(`127.0.0.1:${portB}`);
+    const beforeA = await f.liveStatus(a);
+    const beforeB = await f.liveStatus(b, poisoned);
+    if (process.platform !== "win32") {
+      for (const home of [a, b]) expect((await stat(home)).mode & 0o777).toBe(0o700);
+      expect(existsSync(path.join(f.root, ".paseo"))).toBe(false);
+    }
+
+    const repoB = path.join(f.root, "project-b");
+    await mkdir(repoB);
+    await f.ok(["project", "create", repoB, "--home", b], poisoned);
+    expect(await f.ok(["project", "ls", "--home", a])).toEqual([]);
+    expect((await f.ok(["project", "ls", "--home", b], poisoned)).length).toBe(1);
+    const stream = await f.run(["logs", "missing-agent", "--follow", "--home", b], poisoned);
+    expect(stream.stderr).toContain("No agent found matching: missing-agent");
+    const restart = await f.ok(["restart", "--home", b, "--timeout", "30"], poisoned);
+    expect(restart.supervisorPid).toBe(launchB.pid);
+    expect(restart.workerPid).not.toBe(beforeB.workerPid);
+    const saved = await f.ok(
+      ["daemon", "config", "set", "daemon.listen", `127.0.0.1:${movedPort}`, "--home", b],
+      poisoned,
+    );
+    expect(saved.restartRequiredPaths).toContain("daemon.listen");
+    await f.ok(["daemon", "restart", "--home", b, "--timeout", "30"], poisoned);
+    const moved = await f.liveStatus(b);
+    expect(moved.listen).toBe(`127.0.0.1:${movedPort}`);
+    expect(moved.pid).toBe(launchB.pid);
+    await f.ok(["daemon", "stop", "--home", b], poisoned);
+    const stoppedQuery = await f.run(["--json", "project", "ls", "--home", b], poisoned);
+    expect(stoppedQuery.code).toBe(1);
+    expect(stoppedQuery.stderr).toContain("DAEMON_NOT_RUNNING");
+    const afterA = await f.liveStatus(a);
+    expect(afterA.workerPid).toBe(beforeA.workerPid);
+    expect(afterA.pid).toBe(beforeA.pid);
+    expect(await f.ok(["project", "ls", "--home", a])).toEqual([]);
+  } finally {
+    await f.close();
+  }
+}, 120_000);
+
+test("removed flags and ambiguous targets fail before side effects; observation does not create a home", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.ok(["status", "--home", home]);
+    await f.ok(["daemon", "config", "get", "--home", home]);
+    expect(existsSync(home)).toBe(false);
+    for (const args of [
+      ["start", "--port", "12345"],
+      ["start", "--foreground"],
+      ["daemon", "restart", "--no-relay"],
+    ]) {
+      const result = await f.run(["--json", ...args, "--home", home]);
+      expect(result.code).toBe(1);
+      expect(result.stderr).toContain("REMOVED_LAUNCH_OPTION");
+      expect(existsSync(home)).toBe(false);
+    }
+    const ambiguous = await f.run(["--home", home, "project", "ls", "--host", "unused:12345"]);
+    expect(ambiguous.stderr).toContain("Choose either --home or --host");
+    expect(existsSync(home)).toBe(false);
+  } finally {
+    await f.close();
+  }
+}, 30_000);
+
+test("local status uses the credential and reports the server id of a password-protected daemon", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    const configPath = path.join(home, "config.json");
+    const config = JSON.parse(await readFile(configPath, "utf8"));
+    config.daemon.auth = { password: await hashDaemonPassword("secret") };
+    await writeFile(configPath, JSON.stringify(config));
+    await f.ok(["start", "--home", home, "--timeout", "30"]);
+    const authenticated = await f.liveStatus(home, { PASEO_PASSWORD: "secret" });
+    expect(await f.ok(["daemon", "status", "--home", home])).toMatchObject({
+      connectedDaemon: "reachable",
+      serverId: authenticated.serverId,
+    });
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test("an occupied initial or replacement address fails without false readiness or killing its owner", async () => {
+  const f = await fixture();
+  const [a, b] = f.homes as [string, string];
+  const portA = await port(),
+    portB = await port();
+  try {
+    await f.configure(a, `127.0.0.1:${portA}`);
+    await f.configure(b, `127.0.0.1:${portA}`);
+    await f.ok(["start", "--home", a, "--timeout", "30"]);
+    const before = await f.liveStatus(a);
+    const failed = await f.run(["--json", "start", "--home", b, "--timeout", "30"]);
+    expect(failed.code).toBe(1);
+    expect(failed.stderr).toContain("DAEMON_START_FAILED");
+    await f.ok(["daemon", "config", "set", "daemon.listen", `127.0.0.1:${portB}`, "--home", b]);
+    await f.ok(["start", "--home", b, "--timeout", "30"]);
+    await f.ok(["daemon", "config", "set", "daemon.listen", `127.0.0.1:${portA}`, "--home", b]);
+    const restart = await f.run(["--json", "restart", "--home", b, "--timeout", "30"]);
+    expect(restart.code).toBe(1);
+    expect(restart.stderr).toContain("RESTART_NOT_CONFIRMED");
+    await f.ok(["daemon", "stop", "--home", b]);
+    expect((await f.liveStatus(a)).workerPid).toBe(before.workerPid);
+  } finally {
+    await f.close();
+  }
+}, 120_000);
+
+test("a slow worker outlives the caller's readiness deadline and remains stoppable", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    const preload = path.join(f.root, "slow-worker.mjs");
+    await writeFile(
+      preload,
+      'if (process.argv[1]?.endsWith("daemon-worker.js")) await new Promise(resolve => setTimeout(resolve, 5000));',
+    );
+    const launch = await f.run(["--json", "start", "--home", home, "--timeout", "1"], {
+      NODE_OPTIONS: `--import=${pathToFileURL(preload).href}`,
+    });
+    expect(launch.code).toBe(1);
+    expect(launch.stderr).toContain("DAEMON_NOT_READY");
+    expect(launch.stderr).toContain("remains running");
+    expect(launch.stderr).toContain("Logs:");
+    expect(launch.stderr).toContain("Status:");
+    expect(launch.stderr).toContain("Stop:");
+    const pending = await f.ok(["status", "--home", home]);
+    expect(pending.localDaemon).toBe("not_ready");
+    expect(pending.listen).toBeNull();
+    process.kill(pending.pid, 0);
+    const already = await f.ok(["start", "--home", home]);
+    expect(already.action).toBe("already_running");
+    expect(already.pid).toBe(pending.pid);
+    await f.ok(["project", "ls", "--home", home]);
+    expect((await f.ok(["status", "--home", home])).pid).toBe(pending.pid);
+    await f.ok(["daemon", "stop", "--home", home]);
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test("worker restart preserves an already-running legacy supervisor's launch flags", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  const filePort = await port(),
+    launchPort = await port();
+  try {
+    await f.configure(home, `127.0.0.1:${filePort}`);
+    const launch = await startDaemonInstance({
+      home,
+      command: process.execPath,
+      args: [
+        path.join(repo, "packages/server/dist/scripts/supervisor-entrypoint.js"),
+        "--no-relay",
+        "--no-web-ui",
+      ],
+      // The legacy CLI translated --port into PASEO_LISTEN before spawning.
+      env: { ...f.env, PASEO_LISTEN: `127.0.0.1:${launchPort}` },
+      mode: "deployment",
+      timeoutMs: 30_000,
+    });
+    const before = await f.liveStatus(home);
+    expect(before.listen).toBe(`127.0.0.1:${launchPort}`);
+    const restarted = await f.ok(["restart", "--home", home, "--timeout", "30"], {
+      PASEO_LISTEN: `127.0.0.1:${filePort}`,
+    });
+    expect(restarted.supervisorPid).toBe(launch.instance.pid);
+    expect(restarted.workerPid).not.toBe(before.workerPid);
+    expect((await f.ok(["status", "--home", home])).listen).toBe(before.listen);
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test.skipIf(process.platform === "win32")(
+  "POSIX stop ignores a wrong endpoint even with copied identities; supported live identity overrides still restart",
+  async () => {
+    const f = await fixture();
+    const [a, b] = f.homes as [string, string];
+    try {
+      await f.configure(a, `127.0.0.1:${await port()}`);
+      await f.configure(b, `127.0.0.1:${await port()}`);
+      await writeFile(path.join(b, "server-id"), "saved-b");
+      await f.ok(["start", "--home", a, "--timeout", "30"]);
+      await f.ok(["start", "--home", b, "--timeout", "30"], { PASEO_SERVER_ID: "live-b" });
+      const beforeA = await f.liveStatus(a);
+      expect((await f.liveStatus(b)).serverId).toBe("live-b");
+      await f.ok(["restart", "--home", b, "--timeout", "30"]);
+      const bLock = JSON.parse(await readFile(path.join(b, "paseo.pid"), "utf8"));
+      await writeFile(
+        path.join(b, "paseo.pid"),
+        JSON.stringify({ ...bLock, listen: beforeA.listen }),
+      );
+      await writeFile(path.join(b, "server-id"), beforeA.serverId);
+      await f.ok(["daemon", "stop", "--home", b]);
+      expect((await f.liveStatus(a)).workerPid).toBe(beforeA.workerPid);
+    } finally {
+      await f.close();
+    }
+  },
+  60_000,
+);
+
+test.skipIf(process.platform === "win32").each([["start"], ["daemon", "run"]])(
+  "explicit cancellation before readiness cleans up only this launch: %j",
+  async (...launchArgs) => {
+    const f = await fixture();
+    const home = f.homes[0]!;
+    let child: ReturnType<typeof spawn> | undefined;
+    try {
+      await f.configure(home, `127.0.0.1:${await port()}`);
+      const preload = path.join(f.root, "slow-worker.mjs");
+      await writeFile(
+        preload,
+        'if (process.argv[1]?.endsWith("daemon-worker.js")) await new Promise(resolve => setTimeout(resolve, 30000));',
+      );
+      child = spawn(process.execPath, [cli, ...launchArgs, "--home", home], {
+        cwd: repo,
+        env: { ...f.env, NODE_OPTIONS: `--import=${pathToFileURL(preload).href}` },
+        stdio: "ignore",
+      });
+      const exited = new Promise((resolve) => child!.once("exit", resolve));
+      // The lock file exists before its contents identify the supervisor.
+      let supervisorPid: number | undefined;
+      await expect
+        .poll(
+          async () => {
+            supervisorPid = (await readDaemonInstance(home))?.pid;
+            return supervisorPid;
+          },
+          { timeout: 10_000 },
+        )
+        .toBeTypeOf("number");
+      await f.ok(["status", "--home", home]);
+      child.kill("SIGINT");
+      await exited;
+      expect(() => process.kill(supervisorPid!, 0)).toThrow();
+      expect((await f.ok(["status", "--home", home])).localDaemon).toBe("stopped");
+    } finally {
+      child?.kill("SIGTERM");
+      await f.close();
+    }
+  },
+  60_000,
+);
+
+test.runIf(process.platform === "win32")(
+  "Windows unbound stop requires explicit force",
+  async () => {
+    const f = await fixture();
+    const home = f.homes[0]!;
+    try {
+      await f.configure(home, `127.0.0.1:${await port()}`);
+      const preload = path.join(f.root, "slow-worker.mjs");
+      await writeFile(
+        preload,
+        'if (process.argv[1]?.endsWith("daemon-worker.js")) await new Promise(resolve => setTimeout(resolve, 30000));',
+      );
+      const pending = await f.run(["--json", "start", "--home", home, "--timeout", "1"], {
+        NODE_OPTIONS: `--import=${pathToFileURL(preload).href}`,
+      });
+      expect(pending.stderr).toContain("DAEMON_NOT_READY");
+      const refused = await f.run(["--json", "daemon", "stop", "--home", home]);
+      expect(refused.code).toBe(1);
+      expect(refused.stderr).toContain("STOP_NO_GRACEFUL_CHANNEL");
+      const stopped = await f.ok(["daemon", "stop", "--home", home, "--force"]);
+      expect(stopped.forced).toBe(true);
+      expect(stopped.usedLifecycleRpc).toBe(false);
+    } finally {
+      await f.close();
+    }
+  },
+  60_000,
+);
+
+test("empty explicit selectors never select the ambient daemon or create local state", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    await f.ok(["start", "--home", home]);
+    const before = await f.liveStatus(home);
+    for (const args of [
+      ["daemon", "stop", "--home", ""],
+      ["daemon", "stop", "--host", ""],
+      ["start", "--home", ""],
+      ["daemon", "config", "set", "daemon.relay.enabled", "true", "--home", ""],
+    ]) {
+      const refused = await f.run(["--json", ...args], { PASEO_HOME: home });
+      expect(refused.code).toBe(1);
+      expect(refused.stderr).toContain("TARGET_INVALID");
+      expect((await f.liveStatus(home)).workerPid).toBe(before.workerPid);
+      expect(existsSync(path.join(f.root, "paseo.pid"))).toBe(false);
+      expect(existsSync(path.join(f.root, "config.json"))).toBe(false);
+    }
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test.skipIf(process.platform === "win32")(
+  "restart confirms the replacement worker when a provider probe is slow",
+  async () => {
+    const f = await fixture();
+    const home = f.homes[0]!;
+    try {
+      await f.configure(home, `127.0.0.1:${await port()}`);
+      const provider = path.join(f.root, "slow-provider");
+      await writeFile(
+        provider,
+        `#!${process.execPath}\nsetTimeout(() => console.log("provider 1.0.0"), 1800);\n`,
+        { mode: 0o700 },
+      );
+      const configPath = path.join(home, "config.json");
+      const config = JSON.parse(await readFile(configPath, "utf8"));
+      config.agents = {
+        ...config.agents,
+        providers: { claude: { command: { mode: "replace", argv: [provider] } } },
+      };
+      await writeFile(configPath, JSON.stringify(config));
+      const launch = await f.ok(["start", "--home", home, "--timeout", "30"]);
+      const restarted = await f.ok(["restart", "--home", home, "--timeout", "30"]);
+      expect(restarted.supervisorPid).toBe(launch.pid);
+      expect(restarted.workerPid).not.toBe(restarted.previousWorkerPid);
+    } finally {
+      await f.close();
+    }
+  },
+  60_000,
+);
+
+test("IPv6 publication supports home-selected query and worker restart", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  const endpoint = `[::1]:${await port()}`;
+  try {
+    await f.configure(home, endpoint);
+    const launch = await f.ok(["start", "--home", home, "--timeout", "30"]);
+    expect(launch.listen).toBe(endpoint);
+    expect(await f.ok(["project", "ls", "--home", home])).toEqual([]);
+    const restarted = await f.ok(["restart", "--home", home, "--timeout", "30"]);
+    expect(restarted.supervisorPid).toBe(launch.pid);
+    expect(restarted.workerPid).not.toBe(restarted.previousWorkerPid);
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test("raw log following subscribes to a stored agent that exists only in B", async () => {
+  const f = await fixture();
+  const [a, b] = f.homes as [string, string];
+  let follower: ReturnType<typeof spawn> | undefined;
+  try {
+    await f.configure(a, `127.0.0.1:${await port()}`);
+    await f.configure(b, `127.0.0.1:${await port()}`);
+    const agentId = "4de8b157-7614-4c38-b189-e50e57fb9498";
+    const now = new Date().toISOString();
+    await mkdir(path.join(b, "agents"));
+    await writeFile(
+      path.join(b, "agents", `${agentId}.json`),
+      JSON.stringify({
+        id: agentId,
+        provider: "codex",
+        cwd: f.root,
+        title: "B-only stored agent",
+        createdAt: now,
+        updatedAt: now,
+        lastStatus: "closed",
+        persistence: null,
+      }),
+    );
+    const launchA = await f.ok(["start", "--home", a]);
+    await f.ok(["start", "--home", b]);
+    const absent = await f.run(["logs", agentId, "--home", a]);
+    expect(absent.stderr).toContain(`No agent found matching: ${agentId}`);
+    follower = spawn(
+      process.execPath,
+      [cli, "logs", agentId, "--follow", "--tail", "0", "--home", b],
+      {
+        cwd: f.root,
+        env: { ...f.env, PASEO_HOME: a, PASEO_HOST: launchA.listen },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+    let output = "",
+      errors = "";
+    follower.stdout!.on("data", (data) => {
+      output += data;
+    });
+    follower.stderr!.on("data", (data) => {
+      errors += data;
+    });
+    await expect.poll(() => output, { timeout: 15_000 }).toContain("Following logs (no history;");
+    expect(errors).not.toContain("No agent found matching");
+  } finally {
+    if (follower && follower.exitCode === null) {
+      const exited = new Promise((resolve) => follower!.once("exit", resolve));
+      follower.kill("SIGINT");
+      await exited;
+    }
+    await f.close();
+  }
+}, 60_000);
+
+test("a connection pinned to an earlier supervisor refuses its replacement", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    await f.ok(["start", "--home", home]);
+    const captured = (await readDaemonInstance(home))!;
+    await f.ok(["daemon", "stop", "--home", home]);
+    await f.ok(["start", "--home", home]);
+    const before = await f.liveStatus(home);
+    await expect(
+      connectToDaemon({ target: { kind: "instance", home }, instance: captured, timeout: 1000 }),
+    ).rejects.toMatchObject({ code: "DAEMON_REPLACED" });
+    expect((await f.liveStatus(home)).workerPid).toBe(before.workerPid);
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test("foreground deployment retains environment until its owner ends the launch; endpoint stop reports acknowledgment", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  const fileEndpoint = `127.0.0.1:${await port()}`,
+    deploymentEndpoint = `127.0.0.1:${await port()}`,
+    changedEndpoint = `127.0.0.1:${await port()}`;
+  let deployment: ReturnType<typeof spawn> | undefined;
+  try {
+    await f.configure(home, fileEndpoint);
+    deployment = spawn(process.execPath, [cli, "daemon", "run", "--home", home], {
+      cwd: f.root,
+      env: { ...f.env, PASEO_LISTEN: deploymentEndpoint, PASEO_RELAY_ENABLED: "false" },
+      stdio: "ignore",
+    });
+    await expect
+      .poll(async () => (await readDaemonInstance(home))?.listen, { timeout: 30_000 })
+      .toBe(deploymentEndpoint);
+    const before = await f.liveStatus(home);
+    expect(before.configuredListen).toBe(fileEndpoint);
+    expect(await f.ok(["daemon", "run", "--home", home])).toMatchObject({
+      action: "already_running",
+      pid: before.pid,
+    });
+    expect((await f.liveStatus(home)).workerPid).toBe(before.workerPid);
+    const changed = await f.ok([
+      "daemon",
+      "config",
+      "set",
+      "daemon.listen",
+      changedEndpoint,
+      "--home",
+      home,
+    ]);
+    expect(changed.overrideControlledPaths).toContain("daemon.listen");
+    const restarted = await f.ok(["restart", "--home", home], { PASEO_LISTEN: fileEndpoint });
+    expect(restarted.supervisorPid).toBe(before.pid);
+    expect((await f.ok(["status", "--home", home])).listen).toBe(deploymentEndpoint);
+    const exited = new Promise((resolve) => deployment!.once("exit", resolve));
+    const remote = await f.ok(["daemon", "stop", "--host", deploymentEndpoint]);
+    expect(remote.action).toBe("shutdown_requested");
+    await exited;
+    const managed = await f.ok(["start", "--home", home]);
+    expect(managed.listen).toBe(changedEndpoint);
+    expect(managed.pid).not.toBe(before.pid);
+  } finally {
+    if (deployment?.exitCode === null) deployment.kill("SIGTERM");
+    await f.close();
+  }
+}, 90_000);
+
+test("malformed configuration cannot turn a readiness timeout into launch cancellation", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  let starter: ReturnType<typeof spawn> | undefined;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    const configPath = path.join(home, "config.json");
+    const saved = await readFile(configPath, "utf8");
+    const preload = path.join(f.root, "slow-worker.mjs");
+    await writeFile(
+      preload,
+      'if (process.argv[1]?.endsWith("daemon-worker.js")) await new Promise(resolve => setTimeout(resolve, 30000));',
+    );
+    starter = spawn(process.execPath, [cli, "--json", "start", "--home", home, "--timeout", "2"], {
+      cwd: f.root,
+      env: { ...f.env, NODE_OPTIONS: `--import=${pathToFileURL(preload).href}` },
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    let errors = "";
+    starter.stderr!.on("data", (data) => {
+      errors += data;
+    });
+    const exited = new Promise((resolve) => starter!.once("exit", resolve));
+    await expect
+      .poll(async () => (await readDaemonInstance(home))?.pid, { timeout: 10_000 })
+      .toBeTruthy();
+    const captured = (await readDaemonInstance(home))!;
+    await f.ok(["status", "--home", home]);
+    await writeFile(configPath, "{");
+    await exited;
+    expect(errors).toContain("DAEMON_NOT_READY");
+    expect(errors).toContain(path.join(home, "daemon.log"));
+    process.kill(captured.pid, 0);
+    await writeFile(configPath, saved);
+    await f.ok(["status", "--home", home]);
+  } finally {
+    if (starter?.exitCode === null) starter.kill("SIGTERM");
+    await f.close();
+  }
+}, 60_000);
+
+test("a background start that fails before the supervisor logs names the cause in a log that exists", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  const configPath = path.join(home, "config.json");
+  try {
+    await mkdir(home, { recursive: true });
+    await writeFile(configPath, '{"version":1,');
+    const failed = await f.run(["daemon", "start", "--home", home, "--timeout", "30"]);
+    expect(failed.code).toBe(1);
+    expect(failed.stderr).toContain(`Logs: ${path.join(home, "daemon.log")}`);
+    expect(failed.stderr).toContain(`Invalid JSON in ${configPath}`);
+    expect(await readFile(path.join(home, "daemon.log"), "utf8")).toContain(
+      `Invalid JSON in ${configPath}`,
+    );
+  } finally {
+    await f.close();
+  }
+}, 60_000);
+
+test("onboarding preserves an existing MCP choice unless explicitly supplied", async () => {
+  const f = await fixture();
+  const home = f.homes[0]!;
+  try {
+    await f.configure(home, `127.0.0.1:${await port()}`);
+    await f.ok(["daemon", "config", "set", "daemon.mcp.enabled", "false", "--home", home]);
+    for (const flags of [[], ["--no-mcp"]]) {
+      const onboard = await f.run(["onboard", "--home", home, "--voice", "disable", ...flags]);
+      expect(onboard.code, onboard.stderr).toBe(0);
+      expect(
+        (await f.ok(["daemon", "config", "get", "daemon.mcp.enabled", "--home", home])).value,
+      ).toBe(false);
+    }
+  } finally {
+    await f.close();
+  }
+}, 60_000);
diff --git a/packages/cli/src/commands/daemon/local-daemon.supervision.test.ts b/packages/cli/src/commands/daemon/local-daemon.supervision.test.ts
deleted file mode 100644
index 03449fa0cb..0000000000
--- a/packages/cli/src/commands/daemon/local-daemon.supervision.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { EventEmitter } from "node:events";
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-
-import {
-  type DaemonLaunchRuntime,
-  type DetachedDaemonProcess,
-  resolveLocalDaemonState,
-  startLocalDaemonDetached,
-  startLocalDaemonForeground,
-} from "./local-daemon.js";
-
-type RecordedDaemonLaunch =
-  | {
-      mode: "detached";
-      command: string;
-      args: string[];
-      options: Parameters<DaemonLaunchRuntime["spawnDetached"]>[2];
-    }
-  | {
-      mode: "foreground";
-      command: string;
-      args: string[];
-      options: Parameters<DaemonLaunchRuntime["spawnForeground"]>[2];
-    };
-
-class FakeDaemonProcess extends EventEmitter implements DetachedDaemonProcess {
-  pid = 4242;
-  wasUnreferenced = false;
-
-  unref(): void {
-    this.wasUnreferenced = true;
-  }
-}
-
-class FakeDaemonRuntime implements DaemonLaunchRuntime {
-  readonly recordedLaunches: RecordedDaemonLaunch[] = [];
-  readonly daemonProcess = new FakeDaemonProcess();
-  foregroundStatus = 0;
-  runnerEntry = "/repo/packages/server/scripts/supervisor-entrypoint.ts";
-
-  resolveRunnerEntry(): string {
-    return this.runnerEntry;
-  }
-
-  resolveHome(env: NodeJS.ProcessEnv): string {
-    return env.PASEO_HOME ?? "/tmp/paseo";
-  }
-
-  spawnDetached(
-    command: string,
-    args: string[],
-    options: Parameters<DaemonLaunchRuntime["spawnDetached"]>[2],
-  ): DetachedDaemonProcess {
-    this.recordedLaunches.push({ mode: "detached", command, args, options });
-    return this.daemonProcess;
-  }
-
-  spawnForeground(
-    command: string,
-    args: string[],
-    options: Parameters<DaemonLaunchRuntime["spawnForeground"]>[2],
-  ) {
-    this.recordedLaunches.push({ mode: "foreground", command, args, options });
-    return { status: this.foregroundStatus, error: undefined };
-  }
-}
-
-const tempRoots: string[] = [];
-
-async function createPaseoHome(config: unknown): Promise<string> {
-  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-local-daemon-"));
-  tempRoots.push(root);
-  const paseoHome = path.join(root, ".paseo");
-  await mkdir(paseoHome, { recursive: true });
-  await writeFile(path.join(paseoHome, "config.json"), JSON.stringify(config, null, 2));
-  return paseoHome;
-}
-
-function expectSupervisorLaunch(argv: string[]): void {
-  const joined = argv.join(" ");
-  expect(joined).toContain("supervisor-entrypoint");
-  expect(joined).not.toContain("src/server/index.ts");
-  expect(joined).not.toContain("dist/server/server/index.js");
-  expect(joined).not.toContain("src/server/daemon-worker.ts");
-  expect(joined).not.toContain("dist/server/server/daemon-worker.js");
-}
-
-describe("local daemon launch supervision", () => {
-  beforeEach(() => {
-    vi.useRealTimers();
-  });
-
-  afterEach(async () => {
-    await Promise.all(
-      tempRoots.splice(0).map((root) => rm(root, { recursive: true, force: true })),
-    );
-    vi.restoreAllMocks();
-  });
-
-  test("foreground start spawns supervisor-entrypoint instead of server/index", async () => {
-    const runtime = new FakeDaemonRuntime();
-
-    const status = startLocalDaemonForeground({ home: "/tmp/paseo-test", relay: false }, runtime);
-
-    expect(status).toBe(0);
-    expect(runtime.recordedLaunches.map((launch) => launch.mode)).toEqual(["foreground"]);
-    const launch = runtime.recordedLaunches[0];
-    expect(launch?.mode).toBe("foreground");
-    expect(launch?.command).toBe(process.execPath);
-    expectSupervisorLaunch(launch?.args ?? []);
-    expect(launch?.args).toContain("--no-relay");
-  });
-
-  test("detached start spawns supervisor-entrypoint instead of server/index", async () => {
-    vi.useFakeTimers();
-    const runtime = new FakeDaemonRuntime();
-
-    const resultPromise = startLocalDaemonDetached(
-      { home: "/tmp/paseo-test", mcp: false },
-      runtime,
-    );
-    await vi.advanceTimersByTimeAsync(1200);
-    const result = await resultPromise;
-
-    expect(result).toEqual({ pid: 4242, logPath: "/tmp/paseo-test/daemon.log" });
-    expect(runtime.daemonProcess.wasUnreferenced).toBe(true);
-    expect(runtime.recordedLaunches.map((launch) => launch.mode)).toEqual(["detached"]);
-    const launch = runtime.recordedLaunches[0];
-    expect(launch?.mode).toBe("detached");
-    expect(launch?.command).toBe(process.execPath);
-    expectSupervisorLaunch(launch?.args ?? []);
-    expect(launch?.args).toContain("--no-mcp");
-  });
-
-  test("relay TLS flag is passed to the supervised daemon", async () => {
-    const runtime = new FakeDaemonRuntime();
-
-    const status = startLocalDaemonForeground(
-      {
-        home: "/tmp/paseo-test",
-        relayUseTls: true,
-      },
-      runtime,
-    );
-
-    expect(status).toBe(0);
-    expect(runtime.recordedLaunches.map((launch) => launch.mode)).toEqual(["foreground"]);
-    const launch = runtime.recordedLaunches[0];
-    expect(launch?.mode).toBe("foreground");
-    expect(launch?.args).toContain("--relay-use-tls");
-    expect(launch?.options?.env?.PASEO_RELAY_USE_TLS).toBe("true");
-  });
-
-  test("web UI flag is passed to the supervised daemon", async () => {
-    const runtime = new FakeDaemonRuntime();
-
-    const status = startLocalDaemonForeground(
-      {
-        home: "/tmp/paseo-test",
-        webUi: true,
-      },
-      runtime,
-    );
-
-    expect(status).toBe(0);
-    expect(runtime.recordedLaunches.map((launch) => launch.mode)).toEqual(["foreground"]);
-    const launch = runtime.recordedLaunches[0];
-    expect(launch?.mode).toBe("foreground");
-    expect(launch?.args).toContain("--web-ui");
-    expect(launch?.options?.env?.PASEO_WEB_UI_ENABLED).toBe("true");
-  });
-
-  test("no-web UI flag is passed to the supervised daemon", async () => {
-    const runtime = new FakeDaemonRuntime();
-
-    const status = startLocalDaemonForeground(
-      {
-        home: "/tmp/paseo-test",
-        webUi: false,
-      },
-      runtime,
-    );
-
-    expect(status).toBe(0);
-    expect(runtime.recordedLaunches.map((launch) => launch.mode)).toEqual(["foreground"]);
-    const launch = runtime.recordedLaunches[0];
-    expect(launch?.mode).toBe("foreground");
-    expect(launch?.args).toContain("--no-web-ui");
-    expect(launch?.options?.env?.PASEO_WEB_UI_ENABLED).toBe("false");
-  });
-
-  test("local daemon state keeps public relay TLS separate from daemon relay TLS", async () => {
-    const home = await createPaseoHome({
-      version: 1,
-      daemon: {
-        relay: {
-          endpoint: "10.0.0.5:51185",
-          publicEndpoint: "paseo.example.com",
-          useTls: false,
-          publicUseTls: true,
-        },
-      },
-    });
-
-    const state = resolveLocalDaemonState({ home });
-
-    expect(state.relayEndpoint).toBe("paseo.example.com");
-    expect(state.relayUseTls).toBe(false);
-    expect(state.relayPublicUseTls).toBe(true);
-  });
-});
diff --git a/packages/cli/src/commands/daemon/local-daemon.ts b/packages/cli/src/commands/daemon/local-daemon.ts
index a7afb4e6b7..5391957ce1 100644
--- a/packages/cli/src/commands/daemon/local-daemon.ts
+++ b/packages/cli/src/commands/daemon/local-daemon.ts
@@ -1,184 +1,9 @@
-import { spawnSync, type ChildProcess } from "node:child_process";
-import { existsSync, readFileSync, unlinkSync } from "node:fs";
+import { Command, Option } from "commander";
+import { existsSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { loadConfig, resolvePaseoHome, spawnProcess } from "@getpaseo/server";
-import treeKill from "tree-kill";
-import { tryConnectToDaemon } from "../../utils/client.js";
-
-export interface DaemonStartOptions {
-  port?: string;
-  listen?: string;
-  home?: string;
-  foreground?: boolean;
-  relay?: boolean;
-  relayUseTls?: boolean;
-  mcp?: boolean;
-  injectMcp?: boolean;
-  webUi?: boolean;
-  hostnames?: string;
-}
-
-export interface LocalDaemonPidInfo {
-  pid: number;
-  startedAt?: string;
-  hostname?: string;
-  uid?: number;
-  listen?: string;
-  desktopManaged?: boolean;
-}
-
-export interface LocalDaemonState {
-  home: string;
-  listen: string;
-  relayEnabled: boolean;
-  relayEndpoint: string;
-  relayUseTls: boolean;
-  relayPublicUseTls: boolean;
-  logPath: string;
-  pidPath: string;
-  pidInfo: LocalDaemonPidInfo | null;
-  running: boolean;
-  stalePidFile: boolean;
-}
-
-export interface DetachedStartResult {
-  pid: number | null;
-  logPath: string;
-}
-
-export interface StopLocalDaemonOptions {
-  home?: string;
-  timeoutMs?: number;
-  killTimeoutMs?: number;
-  force?: boolean;
-}
-
-export interface StopLocalDaemonResult {
-  action: "stopped" | "not_running";
-  home: string;
-  pid: number | null;
-  forced: boolean;
-  usedLifecycleRpc: boolean;
-  reason: "not_running" | "lifecycle_shutdown_rpc" | "owner_pid_signal" | "owner_pid_sigkill";
-  message: string;
-}
-
-interface ProcessExitDetails {
-  code: number | null;
-  signal: NodeJS.Signals | null;
-  error?: Error;
-}
-
-type DetachedStartupResult = { exitedEarly: false } | ({ exitedEarly: true } & ProcessExitDetails);
-
-export interface DetachedDaemonProcess extends Pick<ChildProcess, "once" | "pid" | "unref"> {}
-
-export interface ForegroundDaemonProcessResult {
-  status: number | null;
-  error?: Error;
-}
-
-export interface DaemonLaunchRuntime {
-  resolveRunnerEntry(): string;
-  resolveHome(env: NodeJS.ProcessEnv): string;
-  spawnDetached(
-    command: string,
-    args: string[],
-    options: Parameters<typeof spawnProcess>[2],
-  ): DetachedDaemonProcess;
-  spawnForeground(
-    command: string,
-    args: string[],
-    options: Parameters<typeof spawnSync>[2],
-  ): ForegroundDaemonProcessResult;
-}
-
-const DETACHED_STARTUP_GRACE_MS = 1200;
-const PID_POLL_INTERVAL_MS = 100;
-const DAEMON_LOG_FILENAME = "daemon.log";
-const DAEMON_PID_FILENAME = "paseo.pid";
-
-export const DEFAULT_STOP_TIMEOUT_MS = 15_000;
-export const DEFAULT_KILL_TIMEOUT_MS = 3_000;
-
+import { startDaemonInstance, resolvePaseoHome } from "@getpaseo/server/daemon-control";
 const require = createRequire(import.meta.url);
-
-const defaultDaemonLaunchRuntime: DaemonLaunchRuntime = {
-  resolveRunnerEntry: resolveDaemonRunnerEntry,
-  resolveHome: resolvePaseoHome,
-  spawnDetached: spawnProcess,
-  spawnForeground: spawnSync,
-};
-
-const startupReady = (): DetachedStartupResult => ({ exitedEarly: false });
-
-const startupExited = (details: ProcessExitDetails): DetachedStartupResult => ({
-  exitedEarly: true,
-  ...details,
-});
-
-function envWithHome(home?: string): NodeJS.ProcessEnv {
-  if (!home) {
-    return process.env;
-  }
-
-  return { ...process.env, PASEO_HOME: home };
-}
-
-function buildRunnerArgs(options: DaemonStartOptions): string[] {
-  const args: string[] = [];
-  if (options.relay === true) {
-    args.push("--relay");
-  }
-  if (options.relay === false) {
-    args.push("--no-relay");
-  }
-  if (options.relayUseTls === true) {
-    args.push("--relay-use-tls");
-  }
-
-  if (options.mcp === false) {
-    args.push("--no-mcp");
-  }
-  if (options.injectMcp === false) {
-    args.push("--no-inject-mcp");
-  }
-  if (options.webUi === true) {
-    args.push("--web-ui");
-  }
-  if (options.webUi === false) {
-    args.push("--no-web-ui");
-  }
-
-  return args;
-}
-
-function buildChildEnv(options: DaemonStartOptions): NodeJS.ProcessEnv {
-  const childEnv: NodeJS.ProcessEnv = { ...process.env };
-  if (options.home) {
-    childEnv.PASEO_HOME = options.home;
-  }
-  if (options.listen) {
-    childEnv.PASEO_LISTEN = options.listen;
-  } else if (options.port) {
-    childEnv.PASEO_LISTEN = `127.0.0.1:${options.port}`;
-  }
-  if (options.hostnames) {
-    childEnv.PASEO_HOSTNAMES = options.hostnames;
-  }
-  if (options.relayUseTls === true) {
-    childEnv.PASEO_RELAY_USE_TLS = "true";
-  }
-  if (options.webUi === true) {
-    childEnv.PASEO_WEB_UI_ENABLED = "true";
-  }
-  if (options.webUi === false) {
-    childEnv.PASEO_WEB_UI_ENABLED = "false";
-  }
-  return childEnv;
-}
-
 function resolveServerRunnerFromDir(currentDir: string): string | null {
   const packageJsonPath = path.join(currentDir, "package.json");
   if (!existsSync(packageJsonPath)) return null;
@@ -215,550 +40,72 @@ function resolveDaemonRunnerEntry(): string {
   throw new Error("Unable to resolve @getpaseo/server package root for daemon runner");
 }
 
-function pidFilePath(paseoHome: string): string {
-  return path.join(paseoHome, DAEMON_PID_FILENAME);
-}
-
-function resolveListenField(listen: unknown, sockPath: unknown): string | undefined {
-  if (typeof listen === "string") return listen;
-  if (typeof sockPath === "string") return sockPath;
-  return undefined;
-}
-
-function resolveStopMessage(
-  forced: boolean,
-  lifecycleRequested: boolean,
-  fallbackMessage: string | null | undefined,
-): string {
-  if (forced) return "Daemon owner process was force-stopped";
-  if (lifecycleRequested) return "Daemon stopped gracefully";
-  return fallbackMessage ?? "Daemon stopped via owner PID signal";
-}
-
-function resolveStopReason(
-  forced: boolean,
-  lifecycleRequested: boolean,
-): StopLocalDaemonResult["reason"] {
-  if (forced) return "owner_pid_sigkill";
-  if (lifecycleRequested) return "lifecycle_shutdown_rpc";
-  return "owner_pid_signal";
-}
-
-function readPidFile(pidPath: string): LocalDaemonPidInfo | null {
+export async function launchLocalDaemon(options: {
+  home: string;
+  timeoutMs?: number;
+  foreground?: boolean;
+}) {
+  const abort = new AbortController();
+  const cancel = () => abort.abort();
+  process.once("SIGINT", cancel);
+  process.once("SIGTERM", cancel);
   try {
-    const parsed = JSON.parse(readFileSync(pidPath, "utf-8")) as Record<string, unknown>;
-    const pidValue = parsed.pid;
-    if (typeof pidValue !== "number" || !Number.isInteger(pidValue) || pidValue <= 0) {
-      return null;
-    }
-
-    return {
-      pid: pidValue,
-      startedAt: typeof parsed.startedAt === "string" ? parsed.startedAt : undefined,
-      hostname: typeof parsed.hostname === "string" ? parsed.hostname : undefined,
-      uid: typeof parsed.uid === "number" ? parsed.uid : undefined,
-      listen: resolveListenField(parsed.listen, parsed.sockPath),
-      desktopManaged: parsed.desktopManaged === true ? true : undefined,
-    };
-  } catch {
-    return null;
-  }
-}
-
-function tailFile(filePath: string, lines = 30): string | null {
-  try {
-    const content = readFileSync(filePath, "utf-8");
-    return content.split("\n").filter(Boolean).slice(-lines).join("\n");
-  } catch {
-    return null;
-  }
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
-
-function readNodeErrnoCode(error: unknown): string | undefined {
-  if (typeof error !== "object" || error === null || !("code" in error)) {
-    return undefined;
-  }
-
-  return typeof error.code === "string" ? error.code : undefined;
-}
-
-function isProcessRunning(pid: number): boolean {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    const code = readNodeErrnoCode(err);
-    if (code === "EPERM") {
-      return true;
-    }
-    return false;
-  }
-}
-
-function signalProcess(pid: number, signal: NodeJS.Signals): boolean {
-  try {
-    process.kill(pid, signal);
-    return true;
-  } catch (err) {
-    const code = readNodeErrnoCode(err);
-    if (code === "ESRCH") {
-      return false;
-    }
-    throw err;
-  }
-}
-
-function signalProcessSafely(pid: number, signal: NodeJS.Signals): boolean {
-  if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) {
-    return false;
-  }
-
-  try {
-    return signalProcess(pid, signal);
-  } catch (err) {
-    const code = readNodeErrnoCode(err);
-    if (code === "EPERM") {
-      return true;
-    }
-    throw err;
-  }
-}
-
-async function signalProcessTreeSafely(pid: number, signal: NodeJS.Signals): Promise<boolean> {
-  if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) {
-    return false;
-  }
-
-  return new Promise((resolve, reject) => {
-    treeKill(pid, signal, (err) => {
-      if (!err) {
-        resolve(true);
-        return;
-      }
-
-      const code = readNodeErrnoCode(err);
-      if (code === "ESRCH") {
-        resolve(false);
-        return;
-      }
-      if (code === "EPERM") {
-        resolve(true);
-        return;
-      }
-      reject(err);
+    const entry = resolveDaemonRunnerEntry();
+    return await startDaemonInstance({
+      home: resolvePaseoHome({ PASEO_HOME: options.home }),
+      command: process.execPath,
+      args: [...(entry.endsWith(".ts") ? ["--import", "tsx"] : []), entry],
+      env: process.env,
+      mode: options.foreground ? "deployment" : "managed",
+      foreground: options.foreground,
+      timeoutMs: options.timeoutMs,
+      signal: abort.signal,
+      onReady: options.foreground
+        ? (instance) =>
+            process.stdout.write(`Listening on ${instance.listen} (PID ${instance.pid})\n`)
+        : undefined,
     });
-  });
-}
-
-async function signalProcessTreeOrOwnerSafely(
-  pid: number,
-  signal: NodeJS.Signals,
-): Promise<boolean> {
-  try {
-    return await signalProcessTreeSafely(pid, signal);
-  } catch {
-    return signalProcessSafely(pid, signal);
-  }
-}
-
-async function waitForPidExit(pid: number, timeoutMs: number): Promise<boolean> {
-  const deadline = Date.now() + timeoutMs;
-  async function poll(): Promise<boolean> {
-    if (!isProcessRunning(pid)) return true;
-    if (Date.now() >= deadline) return !isProcessRunning(pid);
-    await sleep(PID_POLL_INTERVAL_MS);
-    return poll();
-  }
-  return poll();
-}
-
-async function waitForDaemonUnreachable(
-  state: LocalDaemonState,
-  timeoutMs: number,
-): Promise<boolean> {
-  const host = resolveTcpHostFromListen(state.listen);
-  if (!host) {
-    return true;
-  }
-
-  const reachableHost = host;
-  const deadline = Date.now() + timeoutMs;
-  async function poll(): Promise<boolean> {
-    const client = await tryConnectToDaemon({ host: reachableHost, timeout: 500 });
-    if (!client) {
-      return true;
-    }
-    await client.close().catch(() => undefined);
-    if (Date.now() >= deadline) {
-      const finalClient = await tryConnectToDaemon({
-        host: reachableHost,
-        timeout: PID_POLL_INTERVAL_MS,
-      });
-      if (!finalClient) {
-        return true;
-      }
-      await finalClient.close().catch(() => undefined);
-      return false;
-    }
-    await sleep(PID_POLL_INTERVAL_MS);
-    return poll();
-  }
-
-  return poll();
-}
-
-function removeStalePidFile(state: LocalDaemonState): void {
-  if (!state.stalePidFile) {
-    return;
-  }
-
-  try {
-    unlinkSync(state.pidPath);
-  } catch {
-    // Best-effort cleanup only. The successful lifecycle stop is authoritative.
-  }
-}
-
-function createNotRunningStopResult(
-  state: LocalDaemonState,
-  pid: number | null,
-  message: string,
-): StopLocalDaemonResult {
-  return {
-    action: "not_running",
-    home: state.home,
-    pid,
-    forced: false,
-    usedLifecycleRpc: false,
-    reason: "not_running",
-    message,
-  };
-}
-
-function createStopTimeoutError(
-  state: LocalDaemonState,
-  pid: number | null,
-  timeoutMs: number,
-): Error {
-  if (!state.running) {
-    const host = resolveTcpHostFromListen(state.listen);
-    return new Error(
-      `Timed out waiting for daemon${host ? ` at ${host}` : ""} to stop after ${Math.ceil(
-        timeoutMs / 1000,
-      )}s`,
-    );
-  }
-  return new Error(
-    `Timed out waiting for daemon PID ${pid} to stop after ${Math.ceil(timeoutMs / 1000)}s`,
-  );
-}
-
-async function signalDaemonOwnerForStop(
-  state: LocalDaemonState,
-  pid: number | null,
-): Promise<StopLocalDaemonResult | null> {
-  if (pid === null) {
-    return createNotRunningStopResult(state, null, "Daemon is not running");
-  }
-
-  const signaled = await signalProcessTreeOrOwnerSafely(pid, "SIGTERM");
-  if (signaled) {
-    return null;
-  }
-
-  return createNotRunningStopResult(state, pid, "Daemon process was already stopped");
-}
-
-async function waitForStopAfterRequest(args: {
-  state: LocalDaemonState;
-  pid: number | null;
-  timeoutMs: number;
-  killTimeoutMs: number;
-  force?: boolean;
-}): Promise<{ stopped: boolean; forced: boolean }> {
-  const { state, pid, timeoutMs, killTimeoutMs, force } = args;
-  let stopped =
-    state.running && pid !== null
-      ? await waitForPidExit(pid, timeoutMs)
-      : await waitForDaemonUnreachable(state, timeoutMs);
-
-  if (!stopped && force && state.running && pid !== null) {
-    await signalProcessTreeOrOwnerSafely(pid, "SIGKILL");
-    stopped = await waitForPidExit(pid, killTimeoutMs);
-    return { stopped, forced: true };
-  }
-
-  return { stopped, forced: false };
-}
-
-type LifecycleShutdownAttempt = { requested: true } | { requested: false; reason: string };
-
-function getErrorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
-export function resolveLocalPaseoHome(home?: string): string {
-  return resolvePaseoHome(envWithHome(home));
-}
-
-export function resolveTcpHostFromListen(listen: string): string | null {
-  const normalized = listen.trim();
-  if (!normalized) {
-    return null;
-  }
-
-  if (
-    normalized.startsWith("/") ||
-    normalized.startsWith("unix://") ||
-    normalized.startsWith("pipe://") ||
-    normalized.startsWith("\\\\.\\pipe\\") ||
-    /^[A-Za-z]:[/\\]/.test(normalized)
-  ) {
-    return null;
-  }
-
-  if (/^\d+$/.test(normalized)) {
-    return `127.0.0.1:${normalized}`;
-  }
-
-  if (normalized.includes(":")) {
-    return normalized;
-  }
-
-  return null;
-}
-
-export function resolveLocalDaemonState(options: { home?: string } = {}): LocalDaemonState {
-  const env: NodeJS.ProcessEnv = {
-    ...envWithHome(options.home),
-    // Status should reflect local persisted config + pid file, not inherited daemon env overrides.
-    // This is CLI-side defensive scrubbing; the daemon RPC is authoritative when available.
-    PASEO_LISTEN: undefined,
-    PASEO_HOSTNAMES: undefined,
-    PASEO_ALLOWED_HOSTS: undefined,
-    PASEO_RELAY_ENABLED: undefined,
-    PASEO_RELAY_ENDPOINT: undefined,
-    PASEO_RELAY_PUBLIC_ENDPOINT: undefined,
-    PASEO_RELAY_USE_TLS: undefined,
-    PASEO_RELAY_PUBLIC_USE_TLS: undefined,
-  };
-  const home = resolvePaseoHome(env);
-  const config = loadConfig(home, { env });
-  const pidPath = pidFilePath(home);
-  const logPath = path.join(home, DAEMON_LOG_FILENAME);
-  const pidInfo = existsSync(pidPath) ? readPidFile(pidPath) : null;
-  const running = pidInfo ? isProcessRunning(pidInfo.pid) : false;
-  const listen = pidInfo?.listen ?? config.listen;
-
-  return {
-    home,
-    listen,
-    relayEnabled: config.relayEnabled ?? true,
-    relayEndpoint: config.relayPublicEndpoint ?? config.relayEndpoint ?? "relay.paseo.sh:443",
-    relayUseTls: config.relayUseTls ?? false,
-    relayPublicUseTls: config.relayPublicUseTls ?? config.relayUseTls ?? false,
-    logPath,
-    pidPath,
-    pidInfo,
-    running,
-    stalePidFile: Boolean(pidInfo) && !running,
-  };
-}
-
-export function tailDaemonLog(home?: string, lines = 30): string | null {
-  const logPath = path.join(resolveLocalPaseoHome(home), DAEMON_LOG_FILENAME);
-  return tailFile(logPath, lines);
-}
-
-export async function startLocalDaemonDetached(
-  options: DaemonStartOptions,
-  runtime: DaemonLaunchRuntime = defaultDaemonLaunchRuntime,
-): Promise<DetachedStartResult> {
-  if (options.listen && options.port) {
-    throw new Error("Cannot use --listen and --port together");
-  }
-
-  const daemonRunnerEntry = runtime.resolveRunnerEntry();
-  const childEnv = buildChildEnv(options);
-
-  const paseoHome = runtime.resolveHome(childEnv);
-  const logPath = path.join(paseoHome, DAEMON_LOG_FILENAME);
-  const child = runtime.spawnDetached(
-    process.execPath,
-    [...process.execArgv, daemonRunnerEntry, ...buildRunnerArgs(options)],
-    {
-      detached: true,
-      envMode: "internal",
-      env: childEnv,
-      stdio: ["ignore", "ignore", "ignore"],
-    },
-  );
-
-  child.unref();
-
-  const startup = await new Promise<DetachedStartupResult>((resolve) => {
-    let settled = false;
-
-    const finish = (value: DetachedStartupResult) => {
-      if (settled) return;
-      settled = true;
-      resolve(value);
-    };
-
-    const timer = setTimeout(() => finish(startupReady()), DETACHED_STARTUP_GRACE_MS);
-
-    child.once("error", (error) => {
-      clearTimeout(timer);
-      finish(startupExited({ code: null, signal: null, error }));
-    });
-
-    child.once("exit", (code, signal) => {
-      clearTimeout(timer);
-      finish(startupExited({ code, signal }));
-    });
-  });
-
-  if (startup.exitedEarly) {
-    const reason = startup.error
-      ? startup.error.message
-      : `exit code ${startup.code ?? "unknown"}${startup.signal ? ` (${startup.signal})` : ""}`;
-    const recentLogs = tailFile(logPath);
-    throw new Error(
-      [
-        `Daemon failed to start in background (${reason}).`,
-        recentLogs ? `Recent daemon logs:\n${recentLogs}` : null,
-      ]
-        .filter(Boolean)
-        .join("\n\n"),
-    );
-  }
-
-  return {
-    pid: child.pid ?? null,
-    logPath,
-  };
-}
-
-export function startLocalDaemonForeground(
-  options: DaemonStartOptions,
-  runtime: DaemonLaunchRuntime = defaultDaemonLaunchRuntime,
-): number {
-  if (options.listen && options.port) {
-    throw new Error("Cannot use --listen and --port together");
-  }
-
-  const daemonRunnerEntry = runtime.resolveRunnerEntry();
-  const childEnv = buildChildEnv(options);
-  const result = runtime.spawnForeground(
-    process.execPath,
-    [...process.execArgv, daemonRunnerEntry, ...buildRunnerArgs(options)],
-    {
-      env: childEnv,
-      stdio: "inherit",
-    },
-  );
-
-  if (result.error) {
-    throw result.error;
-  }
-
-  return result.status ?? 1;
-}
-
-async function requestLifecycleShutdown(
-  state: LocalDaemonState,
-  timeoutMs: number,
-): Promise<LifecycleShutdownAttempt> {
-  const host = resolveTcpHostFromListen(state.listen);
-  if (!host) {
-    return {
-      requested: false,
-      reason: "daemon listen target is not TCP, falling back to owner PID signal",
-    };
-  }
-
-  const deadline = Date.now() + timeoutMs;
-  const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
-  const client = await tryConnectToDaemon({ host, timeout: Math.min(remainingTimeoutMs(), 5000) });
-  if (!client) {
-    return {
-      requested: false,
-      reason: `daemon websocket at ${host} is not reachable, falling back to owner PID signal`,
-    };
-  }
-
-  try {
-    await client.shutdownServer({ timeout: Math.min(remainingTimeoutMs(), 5000) });
-    return { requested: true };
-  } catch (error) {
-    return {
-      requested: false,
-      reason: `daemon lifecycle shutdown request failed (${getErrorMessage(
-        error,
-      )}), falling back to owner PID signal`,
-    };
   } finally {
-    await client.close().catch(() => undefined);
+    process.removeListener("SIGINT", cancel);
+    process.removeListener("SIGTERM", cancel);
   }
 }
 
-export async function stopLocalDaemon(
-  options: StopLocalDaemonOptions = {},
-): Promise<StopLocalDaemonResult> {
-  const timeoutMs = options.timeoutMs ?? DEFAULT_STOP_TIMEOUT_MS;
-  const killTimeoutMs = options.killTimeoutMs ?? DEFAULT_KILL_TIMEOUT_MS;
-  const state = resolveLocalDaemonState({ home: options.home });
-  const deadline = Date.now() + timeoutMs;
-  const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
+export function parseTimeoutMs(raw: unknown, fallback = 600_000): number {
+  if (raw === undefined) return fallback;
+  const seconds = Number(raw);
+  if (!Number.isFinite(seconds) || seconds <= 0)
+    throw { code: "INVALID_TIMEOUT", message: "Timeout must be a positive number of seconds." };
+  return Math.ceil(seconds * 1000);
+}
 
-  const shutdownAttempt = await requestLifecycleShutdown(state, remainingTimeoutMs());
-  const lifecycleRequested = shutdownAttempt.requested;
+const REMOVED_LAUNCH_FLAGS: Record<string, string> = {
+  "--port <port>": "daemon.listen",
+  "--listen <listen>": "daemon.listen",
+  "--relay": "daemon.relay.enabled",
+  "--no-relay": "daemon.relay.enabled",
+  "--relay-use-tls": "daemon.relay.useTls",
+  "--no-mcp": "daemon.mcp.enabled",
+  "--no-inject-mcp": "daemon.mcp.injectIntoAgents",
+  "--web-ui": "features.webUi.enabled",
+  "--no-web-ui": "features.webUi.enabled",
+  "--hostnames <hosts>": "daemon.hostnames",
+  "--allowed-hosts <hosts>": "daemon.hostnames",
+  "--foreground": "",
+};
 
-  if (!state.pidInfo || (!state.running && !lifecycleRequested)) {
-    const staleSuffix =
-      state.stalePidFile && state.pidInfo ? ` (stale PID file for ${state.pidInfo.pid})` : "";
-    return createNotRunningStopResult(
-      state,
-      state.pidInfo?.pid ?? null,
-      `Daemon is not running${staleSuffix}`,
-    );
-  }
-
-  const pid = state.pidInfo?.pid ?? null;
-  const fallbackMessage = shutdownAttempt.requested ? null : shutdownAttempt.reason;
-  if (!lifecycleRequested) {
-    const notRunningResult = await signalDaemonOwnerForStop(state, pid);
-    if (notRunningResult) return notRunningResult;
-  }
-
-  const { stopped, forced } = await waitForStopAfterRequest({
-    state,
-    pid,
-    timeoutMs: remainingTimeoutMs(),
-    killTimeoutMs,
-    force: options.force,
+export function rejectRemovedLaunchFlags(command: Command): Command {
+  for (const flag of Object.keys(REMOVED_LAUNCH_FLAGS))
+    command.addOption(new Option(flag).hideHelp());
+  command.hook("preAction", () => {
+    for (const [flag, configPath] of Object.entries(REMOVED_LAUNCH_FLAGS)) {
+      const name = new Option(flag).attributeName();
+      if (command.getOptionValueSource(name) !== "cli") continue;
+      throw {
+        code: "REMOVED_LAUNCH_OPTION",
+        message: `${flag.split(" ")[0]} was removed. ${configPath ? `Use paseo daemon config set ${configPath} <value> --home <path>, then start or restart.` : "Use paseo daemon run --home <path> for foreground deployment."} Deployment environment overrides belong to paseo daemon run.`,
+      };
+    }
   });
-  if (!stopped) {
-    throw createStopTimeoutError(state, pid, timeoutMs);
-  }
-
-  if (lifecycleRequested) {
-    removeStalePidFile(state);
-  }
-
-  return {
-    action: "stopped",
-    home: state.home,
-    pid,
-    forced,
-    usedLifecycleRpc: lifecycleRequested,
-    reason: resolveStopReason(forced, lifecycleRequested),
-    message: resolveStopMessage(forced, lifecycleRequested, fallbackMessage),
-  };
+  return command;
 }
diff --git a/packages/cli/src/commands/daemon/pair.test.ts b/packages/cli/src/commands/daemon/pair.test.ts
index 79117ee16a..42be1a972a 100644
--- a/packages/cli/src/commands/daemon/pair.test.ts
+++ b/packages/cli/src/commands/daemon/pair.test.ts
@@ -1,139 +1,28 @@
-import { describe, expect, test, vi } from "vitest";
+import { mkdtemp, rm, readFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { test, expect } from "vitest";
+import { resolveLocalPairingOffer } from "./pair.js";
 
-import { runPairCommand, type PairCommandOutput, type PairingOffer } from "./pair.js";
-
-const disabledOffer: PairingOffer = { relayEnabled: false, url: null, qr: null };
-const enabledOffer: PairingOffer = {
-  relayEnabled: true,
-  url: "https://app.paseo.sh/#offer=test",
-  qr: null,
-};
-
-interface RecordedPairCommandOutput extends PairCommandOutput {
-  stdout: string[];
-  stderr: string[];
-  successes: string[];
-  exitCode: number | undefined;
-}
-
-function createRecordedOutput(): RecordedPairCommandOutput {
-  return {
-    columns: 80,
-    stdout: [],
-    stderr: [],
-    successes: [],
-    exitCode: undefined,
-    writeStdout(message) {
-      this.stdout.push(message);
-    },
-    writeStderr(message) {
-      this.stderr.push(message);
-    },
-    setExitCode(code) {
-      this.exitCode = code;
-    },
-    success(message) {
-      this.successes.push(message);
-    },
-  };
-}
-
-describe("daemon pair workflow", () => {
-  test("interactive decline prints direct guidance and creates no pairing output", async () => {
-    const resolveOffer = vi.fn(async () => disabledOffer);
-    const confirmRelay = vi.fn(async () => false);
-    const printDirectGuidance = vi.fn();
-    const output = createRecordedOutput();
-
-    await runPairCommand(
-      {},
-      { resolveOffer, confirmRelay, printDirectGuidance, isInteractive: () => true, output },
-    );
-
-    expect(confirmRelay).toHaveBeenCalledOnce();
-    expect(printDirectGuidance).toHaveBeenCalledOnce();
-    expect(output.stderr.join("")).toContain("No pairing QR was created");
-    expect(output.exitCode).toBe(1);
-  });
-
-  test("interactive consent enables relay and prints the refreshed offer", async () => {
-    const resolveOffer = vi
-      .fn<(options: { paseoHome: string; enableRelay?: boolean }) => Promise<PairingOffer>>()
-      .mockResolvedValueOnce(disabledOffer)
-      .mockResolvedValueOnce(enabledOffer);
-    const output = createRecordedOutput();
-
-    await runPairCommand(
-      {},
-      {
-        resolveOffer,
-        confirmRelay: async () => true,
-        printDirectGuidance: vi.fn(),
-        isInteractive: () => true,
-        output,
-      },
-    );
-
-    expect(resolveOffer).toHaveBeenNthCalledWith(2, expect.objectContaining({ enableRelay: true }));
-    expect(output.stdout.join("")).toContain(enabledOffer.url ?? "");
-    expect(output.successes).toEqual(["Relay enabled"]);
-  });
-
-  test("JSON mode never prompts and returns a structured relay-disabled error", async () => {
-    const confirmRelay = vi.fn(async () => true);
-    const output = createRecordedOutput();
-
-    await runPairCommand(
-      { json: true },
-      {
-        resolveOffer: async () => disabledOffer,
-        confirmRelay,
-        printDirectGuidance: vi.fn(),
-        isInteractive: () => true,
-        output,
-      },
-    );
-
-    expect(confirmRelay).not.toHaveBeenCalled();
-    expect(output.stderr.join("")).toContain('"code":"RELAY_DISABLED"');
-    expect(output.exitCode).toBe(1);
-  });
-
-  test("explicit relay opts in without prompting", async () => {
-    const resolveOffer = vi.fn(async () => enabledOffer);
-    const confirmRelay = vi.fn(async () => false);
-    const output = createRecordedOutput();
-
-    await runPairCommand(
-      { relay: true, json: true },
-      {
-        resolveOffer,
-        confirmRelay,
-        printDirectGuidance: vi.fn(),
-        isInteractive: () => false,
-        output,
-      },
-    );
-
-    expect(resolveOffer).toHaveBeenCalledWith(expect.objectContaining({ enableRelay: true }));
-    expect(confirmRelay).not.toHaveBeenCalled();
-    expect(output.exitCode).toBeUndefined();
-  });
-
-  test("surfaces launch-override rejection", async () => {
-    await expect(
-      runPairCommand(
-        { relay: true },
-        {
-          resolveOffer: async () => {
-            throw new Error("Relay is controlled by a daemon launch override");
-          },
-          confirmRelay: vi.fn(),
-          printDirectGuidance: vi.fn(),
-          isInteractive: () => false,
-          output: createRecordedOutput(),
-        },
-      ),
-    ).rejects.toThrow("launch override");
-  });
+test("offline pairing requires relay consent and saves it in the selected home", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo-offline-pair-"));
+  const home = path.join(root, "home");
+  try {
+    expect(await resolveLocalPairingOffer({ paseoHome: home })).toMatchObject({
+      relayEnabled: false,
+      url: null,
+    });
+    expect(existsSync(home)).toBe(false);
+    const offer = await resolveLocalPairingOffer({ paseoHome: home, enableRelay: true });
+    expect(offer.relayEnabled).toBe(true);
+    expect(offer.url).toContain("offer=");
+    expect(
+      JSON.parse(await readFile(path.join(home, "config.json"), "utf8")).daemon.relay.enabled,
+    ).toBe(true);
+    expect(existsSync(path.join(home, "server-id"))).toBe(true);
+    expect(existsSync(path.join(home, "daemon-keypair.json"))).toBe(true);
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
 });
diff --git a/packages/cli/src/commands/daemon/pair.ts b/packages/cli/src/commands/daemon/pair.ts
index 366366b76c..ab208102aa 100644
--- a/packages/cli/src/commands/daemon/pair.ts
+++ b/packages/cli/src/commands/daemon/pair.ts
@@ -1,31 +1,27 @@
 import { confirm, isCancel, log } from "@clack/prompts";
 import { Command } from "commander";
 import chalk from "chalk";
+import { generateLocalPairingOffer } from "@getpaseo/server/pairing";
+import { readDaemonInstance } from "@getpaseo/server/daemon-control";
 import {
-  generateLocalPairingOffer,
-  getOrCreateServerId,
-  loadConfig,
-  resolvePaseoHome,
-} from "@getpaseo/server";
-import { tryConnectToDaemon } from "../../utils/client.js";
-import { resolveLocalDaemonState } from "./local-daemon.js";
-import { addJsonOption } from "../../utils/command-options.js";
+  readPersistedConfig,
+  editPersistedConfig,
+  resolveConfigFromPersisted,
+} from "@getpaseo/server/configuration";
+import { connectToDaemon } from "../../utils/client.js";
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+import { addJsonAndDaemonHostOptions, withGlobalOptions } from "../../utils/command-options.js";
 import { formatPairingInstructions } from "../../output/pairing.js";
+import { parseConnectionOfferFromUrl } from "@getpaseo/protocol/connection-offer";
+import { serializeRelayConnectionUri } from "@getpaseo/protocol/daemon-endpoints";
 
 interface PairOptions {
+  daemonTarget: DaemonTarget;
   home?: string;
   json?: boolean;
   relay?: boolean;
 }
 
-export interface PairCommandDependencies {
-  resolveOffer: typeof resolveLocalPairingOffer;
-  confirmRelay: typeof confirmRelayPairing;
-  printDirectGuidance: typeof printDirectConnectionGuidance;
-  isInteractive: () => boolean;
-  output: PairCommandOutput;
-}
-
 export interface PairCommandOutput {
   columns: number | undefined;
   writeStdout(message: string): void;
@@ -62,33 +58,32 @@ function createProcessOutput(): PairCommandOutput {
 }
 
 export function pairCommand(): Command {
-  return addJsonOption(new Command("pair").description("Print the daemon pairing QR code and link"))
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
+  return addJsonAndDaemonHostOptions(
+    new Command("pair").description("Print the daemon pairing QR code and link"),
+  )
     .option("--relay", "Enable relay without prompting")
-    .action(async (_options: PairOptions, command: Command) => {
-      await runPairCommand(command.optsWithGlobals());
-    });
+    .action(
+      withGlobalOptions((options: PairOptions, _command: Command) => runPairCommand(options)),
+    );
 }
 
 export async function resolveLocalPairingOffer(options: {
   paseoHome: string;
   enableRelay?: boolean;
 }): Promise<PairingOffer> {
-  const state = resolveLocalDaemonState({ home: options.paseoHome });
-  const serverId = getOrCreateServerId(state.home);
-  const daemonOffer = await resolveDaemonPairingOffer(state.listen, serverId, options.enableRelay);
-  if (daemonOffer) return daemonOffer;
-
-  if (state.running) {
-    throw new Error(
-      "The running daemon did not provide a pairing offer. Check daemon connectivity or update the daemon.",
+  const instance = await readDaemonInstance(options.paseoHome);
+  if (instance)
+    return resolveDaemonPairingOffer(
+      { kind: "instance", home: options.paseoHome },
+      options.enableRelay,
     );
-  }
-
-  const config = loadConfig(options.paseoHome);
-  if (options.enableRelay && !config.relayEnabled) {
-    throw new Error("Start the daemon before enabling relay for pairing.");
-  }
+  if (options.enableRelay)
+    editPersistedConfig(options.paseoHome, "daemon.relay.enabled", { value: true });
+  const config = resolveConfigFromPersisted(
+    options.paseoHome,
+    readPersistedConfig(options.paseoHome, { defaultsIfMissing: true }),
+    { env: {} },
+  );
 
   return generateLocalPairingOffer({
     paseoHome: options.paseoHome,
@@ -103,23 +98,16 @@ export async function resolveLocalPairingOffer(options: {
 }
 
 async function resolveDaemonPairingOffer(
-  listen: string,
-  expectedServerId: string,
+  target: DaemonTarget,
   enableRelay: boolean | undefined,
-): Promise<PairingOffer | null> {
-  const client = await tryConnectToDaemon({
-    host: listen,
+): Promise<PairingOffer> {
+  const client = await connectToDaemon({
+    target,
     timeout: PAIRING_DAEMON_RPC_TIMEOUT_MS,
   });
-  if (!client) return null;
 
   try {
     const serverInfo = client.getLastServerInfoMessage();
-    if (serverInfo?.serverId.trim() !== expectedServerId) {
-      throw new Error(
-        "The reachable daemon belongs to a different Paseo home. Check --home or the daemon listen configuration.",
-      );
-    }
     if (serverInfo?.features?.daemonStatusRpc !== true) {
       throw new Error("Update the Paseo daemon before pairing from this command.");
     }
@@ -132,9 +120,14 @@ async function resolveDaemonPairingOffer(
         throw new Error("Update the Paseo daemon before enabling relay from this command.");
       }
       await client.patchDaemonConfig({ relay: { enabled: true } });
-      offer = await client.getDaemonPairingOffer({
-        timeout: PAIRING_DAEMON_RPC_TIMEOUT_MS,
-      });
+      try {
+        offer = await client.getDaemonPairingOffer({ timeout: PAIRING_DAEMON_RPC_TIMEOUT_MS });
+      } catch (error) {
+        throw new Error(
+          `Relay configuration was saved, but fetching the pairing offer failed: ${String(error)}`,
+          { cause: error },
+        );
+      }
     }
     return {
       relayEnabled: offer.relayEnabled,
@@ -164,40 +157,22 @@ export function printDirectConnectionGuidance(): void {
   console.log(`Learn more: ${RELAY_DOCS_URL}#direct-connections`);
 }
 
-export async function runPairCommand(
-  options: PairOptions,
-  dependencyOverrides: Partial<PairCommandDependencies> = {},
-): Promise<void> {
-  if (options.home) process.env.PASEO_HOME = options.home;
-  const dependencies: PairCommandDependencies = {
-    resolveOffer: resolveLocalPairingOffer,
-    confirmRelay: confirmRelayPairing,
-    printDirectGuidance: printDirectConnectionGuidance,
-    isInteractive: () => Boolean(process.stdin.isTTY && process.stdout.isTTY),
-    output: createProcessOutput(),
-    ...dependencyOverrides,
-  };
+export async function runPairCommand(options: PairOptions): Promise<void> {
+  const output = createProcessOutput();
+  const target = options.daemonTarget;
+  const resolveOffer = (enableRelay: boolean) =>
+    target.kind === "instance"
+      ? resolveLocalPairingOffer({ paseoHome: target.home, enableRelay })
+      : resolveDaemonPairingOffer(target, enableRelay);
+  const offline = target.kind === "instance" && !(await readDaemonInstance(target.home));
+  const pairing = await resolveOffer(options.relay === true);
 
-  const paseoHome = resolvePaseoHome();
-  let pairing = await dependencies.resolveOffer({
-    paseoHome,
-    enableRelay: options.relay === true,
-  });
+  if (offline)
+    output.writeStderr(
+      `Offline pairing offer. Start with: paseo daemon start --home ${JSON.stringify(target.kind === "instance" ? target.home : "")}\n`,
+    );
 
-  const canPrompt = dependencies.isInteractive() && options.json !== true;
-  if (!pairing.relayEnabled && canPrompt) {
-    const shouldEnable = await dependencies.confirmRelay();
-    if (!shouldEnable) {
-      dependencies.printDirectGuidance();
-      dependencies.output.writeStderr(`${chalk.yellow("No pairing QR was created.")}\n`);
-      dependencies.output.setExitCode(1);
-      return;
-    }
-    pairing = await dependencies.resolveOffer({ paseoHome, enableRelay: true });
-    dependencies.output.success("Relay enabled");
-  }
-
-  outputPairingResult(pairing, options, dependencies.output);
+  outputPairingResult(pairing, options, output);
 }
 
 function outputPairingResult(
@@ -222,10 +197,13 @@ function outputPairingResult(
     return;
   }
 
+  const offer = parseConnectionOfferFromUrl(pairing.url);
+  const connectionUri = offer ? serializeRelayConnectionUri({ offer }) : null;
+
   if (options.json) {
     output.writeStdout(
       `${JSON.stringify(
-        { relayEnabled: pairing.relayEnabled, url: pairing.url, qr: pairing.qr },
+        { relayEnabled: pairing.relayEnabled, url: pairing.url, qr: pairing.qr, connectionUri },
         null,
         2,
       )}\n`,
@@ -237,6 +215,7 @@ function outputPairingResult(
     formatPairingInstructions({
       url: pairing.url,
       qr: pairing.qr,
+      connectionUri,
       columns: output.columns,
     }),
   );
diff --git a/packages/cli/src/commands/daemon/reload.test.ts b/packages/cli/src/commands/daemon/reload.test.ts
index 518d02c799..a97400406e 100644
--- a/packages/cli/src/commands/daemon/reload.test.ts
+++ b/packages/cli/src/commands/daemon/reload.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, test } from "vitest";
 import { render } from "../../output/render.js";
 import { daemonReloadSchema, type DaemonReloadResult } from "./reload.js";
 
+const restartCommand = 'paseo daemon restart --home "/selected home"';
+
 function result(data: DaemonReloadResult) {
   return { type: "single" as const, data, schema: daemonReloadSchema };
 }
@@ -11,6 +13,7 @@ describe("daemon reload output", () => {
     expect(
       render(
         result({
+          restartCommand,
           appliedPaths: ["daemon.browserTools.enabled"],
           restartRequiredPaths: ["daemon.listen"],
           overrideControlledPaths: ["app.baseUrl"],
@@ -23,7 +26,7 @@ describe("daemon reload output", () => {
         "Warning: These changes require a daemon restart:",
         "  daemon.listen",
         "",
-        "Run: paseo daemon restart",
+        `Run: ${restartCommand}`,
         "",
         "Warning: These settings are controlled by daemon launch overrides:",
         "  app.baseUrl",
@@ -34,6 +37,7 @@ describe("daemon reload output", () => {
   test("human output omits restart guidance for a live-only reload", () => {
     const output = render(
       result({
+        restartCommand,
         appliedPaths: ["daemon.browserTools.enabled"],
         restartRequiredPaths: [],
         overrideControlledPaths: [],
@@ -45,6 +49,7 @@ describe("daemon reload output", () => {
 
   test("structured output preserves the daemon result", () => {
     const data = {
+      restartCommand,
       appliedPaths: ["daemon.browserTools.enabled"],
       restartRequiredPaths: ["daemon.listen"],
       overrideControlledPaths: [],
diff --git a/packages/cli/src/commands/daemon/reload.ts b/packages/cli/src/commands/daemon/reload.ts
index 4f523be26a..807bd26789 100644
--- a/packages/cli/src/commands/daemon/reload.ts
+++ b/packages/cli/src/commands/daemon/reload.ts
@@ -1,8 +1,12 @@
-import type { Command } from "commander";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { withOutput } from "../../output/index.js";
+import { Command } from "commander";
+import { describeDaemonTarget } from "../../utils/daemon-target.js";
 import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, OutputSchema, SingleResult } from "../../output/index.js";
 
 export interface DaemonReloadResult {
+  restartCommand: string;
   appliedPaths: string[];
   restartRequiredPaths: string[];
   overrideControlledPaths: string[];
@@ -20,7 +24,7 @@ export const daemonReloadSchema: OutputSchema<DaemonReloadResult> = {
         "Warning: These changes require a daemon restart:",
         ...result.data.restartRequiredPaths.map((path) => `  ${path}`),
         "",
-        "Run: paseo daemon restart",
+        `Run: ${result.data.restartCommand}`,
       );
     }
     if (result.data.overrideControlledPaths.length > 0) {
@@ -38,12 +42,13 @@ export async function runDaemonReloadCommand(
   options: CommandOptions,
   _command: Command,
 ): Promise<SingleResult<DaemonReloadResult>> {
-  const client = await connectToDaemon({ host: options.host });
+  const client = await connectToDaemon({ target: options.daemonTarget });
   try {
     const payload = await client.reloadDaemonConfig();
     return {
       type: "single",
       data: {
+        restartCommand: `paseo daemon restart ${options.daemonTarget.kind === "instance" ? `--home ${JSON.stringify(options.daemonTarget.home)}` : `--host ${JSON.stringify(describeDaemonTarget(options.daemonTarget))}`}`,
         appliedPaths: payload.appliedPaths,
         restartRequiredPaths: payload.restartRequiredPaths,
         overrideControlledPaths: payload.overrideControlledPaths,
@@ -54,3 +59,9 @@ export async function runDaemonReloadCommand(
     await client.close();
   }
 }
+
+export function daemonReloadCommand(): Command {
+  return addJsonAndDaemonHostOptions(
+    new Command("reload").description("Reload config.json without restarting"),
+  ).action(withOutput(runDaemonReloadCommand));
+}
diff --git a/packages/cli/src/commands/daemon/restart.ts b/packages/cli/src/commands/daemon/restart.ts
index 94bf1e0989..ef88e39a23 100644
--- a/packages/cli/src/commands/daemon/restart.ts
+++ b/packages/cli/src/commands/daemon/restart.ts
@@ -1,131 +1,127 @@
-import type { Command } from "commander";
+import { Command } from "commander";
 import {
-  startLocalDaemonDetached,
-  stopLocalDaemon,
-  DEFAULT_STOP_TIMEOUT_MS,
-  type DaemonStartOptions,
-} from "./local-daemon.js";
-import type {
-  CommandOptions,
-  SingleResult,
-  OutputSchema,
-  CommandError,
-} from "../../output/index.js";
+  readDaemonInstance,
+  isSameDaemonInstance,
+  DaemonInstanceError,
+} from "@getpaseo/server/daemon-control";
+import { setTimeout as delay } from "node:timers/promises";
+import { connectToDaemon } from "../../utils/client.js";
+import { withOutput, type CommandOptions } from "../../output/index.js";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { describeDaemonTarget } from "../../utils/daemon-target.js";
+import { parseTimeoutMs, rejectRemovedLaunchFlags } from "./local-daemon.js";
 
-interface RestartResult {
-  action: "restarted";
-  home: string;
-  pid: string;
-  message: string;
+export function daemonRestartCommand(): Command {
+  return rejectRemovedLaunchFlags(
+    addJsonAndDaemonHostOptions(
+      new Command("restart").description(
+        "Restart the selected daemon worker, retaining its supervisor launch",
+      ),
+    ),
+  )
+    .option("--timeout <seconds>", "Replacement readiness deadline (default: 600)")
+    .action(withOutput(runRestartCommand));
 }
 
-const restartResultSchema: OutputSchema<RestartResult> = {
-  idField: "action",
-  columns: [
-    {
-      header: "STATUS",
-      field: "action",
-      color: () => "green",
-    },
-    { header: "HOME", field: "home" },
-    { header: "PID", field: "pid" },
-    { header: "MESSAGE", field: "message" },
-  ],
-};
-
-export type RestartCommandResult = SingleResult<RestartResult>;
-
-function parseTimeoutMs(raw: unknown): number {
-  if (typeof raw !== "string" || raw.trim().length === 0) {
-    return DEFAULT_STOP_TIMEOUT_MS;
+export async function runRestartCommand(options: CommandOptions, _command: Command) {
+  const target = options.daemonTarget;
+  const deadline = Date.now() + parseTimeoutMs(options.timeout);
+  const remaining = () => Math.max(1, deadline - Date.now());
+  const instance = target.kind === "instance" ? await readDaemonInstance(target.home) : null;
+  async function checkSupervisor() {
+    if (target.kind !== "instance") return;
+    const current = await readDaemonInstance(target.home);
+    if (!current || !instance || !isSameDaemonInstance(instance, current))
+      throw new DaemonInstanceError(
+        "DAEMON_REPLACED",
+        `Supervisor exited or was replaced for ${target.home}.`,
+      );
   }
-
-  const seconds = Number(raw);
-  if (!Number.isFinite(seconds) || seconds <= 0) {
-    const error: CommandError = {
-      code: "INVALID_TIMEOUT",
-      message: `Invalid timeout value: ${raw}`,
-      details: "Timeout must be a positive number of seconds",
-    };
-    throw error;
-  }
-
-  return Math.ceil(seconds * 1000);
-}
-
-function toStartOptions(options: CommandOptions): DaemonStartOptions {
-  const startOptions: DaemonStartOptions = {
-    home: typeof options.home === "string" ? options.home : undefined,
-    listen: typeof options.listen === "string" ? options.listen : undefined,
-    port: typeof options.port === "string" ? options.port : undefined,
-    relay: typeof options.relay === "boolean" ? options.relay : undefined,
-    mcp: typeof options.mcp === "boolean" ? options.mcp : undefined,
-    injectMcp: typeof options.injectMcp === "boolean" ? options.injectMcp : undefined,
-    webUi: typeof options.webUi === "boolean" ? options.webUi : undefined,
-    hostnames: typeof options.hostnames === "string" ? options.hostnames : undefined,
-  };
-
-  if (startOptions.listen && startOptions.port) {
-    const error: CommandError = {
-      code: "INVALID_OPTIONS",
-      message: "Cannot use --listen and --port together",
-    };
-    throw error;
-  }
-
-  return startOptions;
-}
-
-export async function runRestartCommand(
-  options: CommandOptions,
-  _command: Command,
-): Promise<RestartCommandResult> {
-  const timeoutMs = parseTimeoutMs(options.timeout);
-  const force = options.force === true;
-  const startOptions = toStartOptions(options);
-
+  if (target.kind === "instance" && !instance)
+    throw new DaemonInstanceError(
+      "DAEMON_NOT_RUNNING",
+      `Daemon is not running for ${target.home}.`,
+    );
+  const client = await connectToDaemon({
+    target,
+    instance: instance ?? undefined,
+    timeout: remaining(),
+  });
+  let workerPid: number;
+  const serverId = client.getLastServerInfoMessage()?.serverId;
+  let acknowledged = false;
   try {
-    let stopResult: Awaited<ReturnType<typeof stopLocalDaemon>>;
+    workerPid = (await client.getDaemonStatus({ timeout: remaining() })).pid;
+    await checkSupervisor();
     try {
-      stopResult = await stopLocalDaemon({
-        home: startOptions.home,
-        timeoutMs,
-        force,
-      });
-    } catch (err) {
-      const isTimeout =
-        err instanceof Error && err.message.includes("Timed out waiting for daemon PID");
-      if (!force && isTimeout) {
-        stopResult = await stopLocalDaemon({
-          home: startOptions.home,
-          timeoutMs,
-          force: true,
-        });
-      } else {
-        throw err;
-      }
+      await client.restartServer("cli_restart", undefined, { timeout: remaining() });
+      acknowledged = true;
+    } catch (error) {
+      if (!isReconnectFailure(error)) throw error;
     }
-
-    const startup = await startLocalDaemonDetached(startOptions);
-    const before = stopResult.pid === null ? "not running" : `PID ${stopResult.pid}`;
-    const after = startup.pid === null ? "unknown PID" : `PID ${startup.pid}`;
-
-    return {
-      type: "single",
-      data: {
-        action: "restarted",
-        home: stopResult.home,
-        pid: startup.pid === null ? "-" : String(startup.pid),
-        message: `Local daemon restarted (${before} -> ${after})`,
-      },
-      schema: restartResultSchema,
-    };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "RESTART_FAILED",
-      message: `Failed to restart local daemon: ${message}`,
-    };
-    throw error;
+  } finally {
+    await client.close();
   }
+  let lastError: unknown = "No replacement worker observed";
+  while (Date.now() < deadline) {
+    try {
+      const replacement = await connectToDaemon({
+        target,
+        instance: instance ?? undefined,
+        timeout: Math.min(1_000, remaining()),
+      });
+      try {
+        if (replacement.getLastServerInfoMessage()?.serverId !== serverId)
+          throw new Error("Connected peer identity changed");
+        // Status probes every provider, so it can take seconds on a healthy worker.
+        const status = await replacement.getDaemonStatus({ timeout: remaining() });
+        if (status.pid !== workerPid) {
+          await checkSupervisor();
+          return {
+            type: "single" as const,
+            data: {
+              action: "restarted",
+              target: describeDaemonTarget(target),
+              supervisorPid: instance?.pid ?? null,
+              previousWorkerPid: workerPid,
+              workerPid: status.pid,
+              acknowledged,
+            },
+            schema: {
+              idField: "action" as const,
+              columns: [],
+              renderHuman: () =>
+                `Restarted worker ${workerPid} → ${status.pid} at ${describeDaemonTarget(target)}. Supervisor launch retained.`,
+            },
+          };
+        }
+      } finally {
+        await replacement.close();
+      }
+    } catch (error) {
+      lastError = error;
+      const code = (error as { code?: string } | null)?.code;
+      if (code === "DAEMON_REPLACED" || code === "DAEMON_NOT_RUNNING") break;
+      if (!isReconnectFailure(error)) throw error;
+    }
+    await delay(Math.min(100, remaining()));
+  }
+  throw {
+    code: "RESTART_NOT_CONFIRMED",
+    message: `Replacement was not confirmed for ${describeDaemonTarget(target)}. Restart acknowledged: ${acknowledged}. Last observation: ${String(lastError)}`,
+  };
+}
+
+function isReconnectFailure(error: unknown): boolean {
+  return Boolean(
+    error &&
+    typeof error === "object" &&
+    "code" in error &&
+    [
+      "DAEMON_CONNECTION_LOST",
+      "DAEMON_REQUEST_TIMEOUT",
+      "DAEMON_UNREACHABLE",
+      "DAEMON_NOT_READY",
+    ].includes(String(error.code)),
+  );
 }
diff --git a/packages/cli/src/commands/daemon/runtime-toolchain.ts b/packages/cli/src/commands/daemon/runtime-toolchain.ts
index be17439651..23fbd3bff7 100644
--- a/packages/cli/src/commands/daemon/runtime-toolchain.ts
+++ b/packages/cli/src/commands/daemon/runtime-toolchain.ts
@@ -1,5 +1,5 @@
 import { platform } from "node:os";
-import { execCommand } from "@getpaseo/server";
+import { execCommand } from "@getpaseo/server/process";
 
 export interface NodePathFromPidResult {
   nodePath: string | null;
diff --git a/packages/cli/src/commands/daemon/set-password.ts b/packages/cli/src/commands/daemon/set-password.ts
index 3fd407f587..b5a79ae65d 100644
--- a/packages/cli/src/commands/daemon/set-password.ts
+++ b/packages/cli/src/commands/daemon/set-password.ts
@@ -1,12 +1,13 @@
 import path from "node:path";
 import type { Command } from "commander";
 import { isCancel, password as passwordPrompt } from "@clack/prompts";
+import { hashDaemonPassword } from "@getpaseo/server/auth";
 import {
-  hashDaemonPassword,
-  loadPersistedConfig,
+  readPersistedConfig,
   savePersistedConfig,
   type PersistedConfig,
-} from "@getpaseo/server";
+} from "@getpaseo/server/configuration";
+import { resolvePaseoHome } from "@getpaseo/server/daemon-control";
 import type {
   CommandError,
   CommandOptions,
@@ -14,7 +15,6 @@ import type {
   OutputSchema,
   SingleResult,
 } from "../../output/index.js";
-import { resolveLocalPaseoHome } from "./local-daemon.js";
 
 const CONFIG_FILENAME = "config.json";
 
@@ -57,6 +57,17 @@ function createCommandError(code: string, message: string, details?: string): Co
   return { code, message, ...(details ? { details } : {}) };
 }
 
+function terminalPasswordPrompt(): PromptPassword {
+  if (!process.stdin.isTTY) {
+    throw createCommandError(
+      "PASSWORD_TTY_REQUIRED",
+      "paseo daemon set-password needs a terminal to read the password",
+      "Run it in an interactive terminal, or set PASEO_PASSWORD in the daemon's environment instead.",
+    );
+  }
+  return (message) => passwordPrompt({ message });
+}
+
 async function promptForPassword(promptPassword: PromptPassword): Promise<string> {
   const first = await promptPassword("New daemon password");
   if (isCancel(first)) {
@@ -81,9 +92,9 @@ export async function setDaemonPasswordInConfig(
   newPassword: string,
   options: SetPasswordOptions = {},
 ): Promise<SetPasswordResult> {
-  const paseoHome = resolveLocalPaseoHome(options.home);
+  const paseoHome = resolvePaseoHome({ PASEO_HOME: options.home });
   const configPath = path.join(paseoHome, CONFIG_FILENAME);
-  const persisted = loadPersistedConfig(paseoHome);
+  const persisted = readPersistedConfig(paseoHome);
   const nextConfig: PersistedConfig = {
     ...persisted,
     daemon: {
@@ -100,8 +111,8 @@ export async function setDaemonPasswordInConfig(
   return {
     action: "password_set",
     configPath,
-    restartCommand: "paseo daemon restart",
-    message: `Password written to ${configPath}\nRestart the daemon for the change to take effect.\nRun: paseo daemon restart`,
+    restartCommand: `paseo daemon restart --home ${JSON.stringify(paseoHome)}`,
+    message: `Password written to ${configPath}\nRestart the daemon for the change to take effect.\nRun: paseo daemon restart --home ${JSON.stringify(paseoHome)}`,
   };
 }
 
@@ -112,10 +123,10 @@ export async function runSetPasswordCommand(
   const promptPassword =
     typeof options.promptPassword === "function"
       ? (options.promptPassword as PromptPassword)
-      : (message: string) => passwordPrompt({ message });
+      : terminalPasswordPrompt();
   const newPassword = await promptForPassword(promptPassword);
   const result = await setDaemonPasswordInConfig(newPassword, {
-    home: typeof options.home === "string" ? options.home : undefined,
+    home: options.daemonTarget.kind === "instance" ? options.daemonTarget.home : undefined,
   });
 
   return {
diff --git a/packages/cli/src/commands/daemon/start.ts b/packages/cli/src/commands/daemon/start.ts
index 3a4c3df44d..47871e4ad3 100644
--- a/packages/cli/src/commands/daemon/start.ts
+++ b/packages/cli/src/commands/daemon/start.ts
@@ -1,71 +1,55 @@
-import { Command, Option } from "commander";
-import chalk from "chalk";
-import {
-  startLocalDaemonForeground,
-  startLocalDaemonDetached,
-  type DaemonStartOptions as StartOptions,
-} from "./local-daemon.js";
-import { getErrorMessage } from "../../utils/errors.js";
-
-export type { DaemonStartOptions as StartOptions } from "./local-daemon.js";
-
-type RawStartCommandOptions = StartOptions & {
-  allowedHosts?: string;
-};
+import { addLocalDaemonOptions } from "../../utils/command-options.js";
+import { Command } from "commander";
+import { daemonLogPath } from "@getpaseo/server/daemon-control";
+import { launchLocalDaemon, parseTimeoutMs, rejectRemovedLaunchFlags } from "./local-daemon.js";
+import { withOutput, type CommandOptions } from "../../output/index.js";
 
 export function startCommand(): Command {
-  return new Command("start")
-    .description("Start the local Paseo daemon")
-    .option("--listen <listen>", "Listen target (host:port, port, or unix socket path)")
-    .option("--port <port>", "Port to listen on (default: 6767)")
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
-    .option("--foreground", "Run in foreground (don't daemonize)")
-    .option("--relay", "Enable relay connection")
-    .option("--no-relay", "Disable relay connection")
-    .option("--relay-use-tls", "Use wss:// for the relay connection and pairing offers")
-    .option("--no-mcp", "Disable the Agent MCP HTTP endpoint")
-    .option("--no-inject-mcp", "Disable auto-injecting the Paseo MCP into created agents")
-    .option("--web-ui", "Enable the bundled daemon web UI")
-    .option("--no-web-ui", "Disable the bundled daemon web UI")
-    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
-    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(async (options: RawStartCommandOptions) => {
-      await runStart({
-        ...options,
-        hostnames: options.hostnames ?? options.allowedHosts,
-      });
-    });
+  return rejectRemovedLaunchFlags(addLocalDaemonOptions(new Command("start")))
+    .description("Start the local daemon from persistent configuration (local operation)")
+    .option("--timeout <seconds>", "Readiness deadline (default: 600)")
+    .action(withOutput(runStart));
 }
 
-export async function runStart(options: StartOptions): Promise<void> {
-  if (options.listen && options.port) {
-    console.error(chalk.red("Cannot use --listen and --port together"));
-    process.exit(1);
-  }
-
-  if (!options.foreground) {
-    try {
-      const startup = await startLocalDaemonDetached(options);
-      console.log(chalk.green(`Daemon starting in background (PID ${startup.pid ?? "unknown"}).`));
-      console.log(chalk.dim(`Logs: ${startup.logPath}`));
-    } catch (err) {
-      exitWithError(getErrorMessage(err));
-    }
-    return;
-  }
-  try {
-    const status = startLocalDaemonForeground(options);
-    process.exit(status);
-  } catch (err) {
-    const message = getErrorMessage(err);
-    exitWithError(`Failed to start daemon: ${message}`);
-  }
+export async function runStart(options: CommandOptions, _command: Command) {
+  if (options.daemonTarget.kind !== "instance") throw new Error("Start requires a local home");
+  const home = options.daemonTarget.home;
+  const result = await launchLocalDaemon({ home, timeoutMs: parseTimeoutMs(options.timeout) });
+  const data = {
+    action: result.spawned ? "started" : "already_running",
+    home,
+    pid: result.instance.pid,
+    listen: result.instance.listen,
+    logPath: daemonLogPath(home),
+  };
+  return {
+    type: "single" as const,
+    data,
+    schema: {
+      idField: "pid" as const,
+      columns: [],
+      renderHuman: () =>
+        `${result.spawned ? "Started" : "Already running"}: PID ${data.pid}${data.listen ? `, listening on ${data.listen}` : ", not ready"}\nLogs: ${data.logPath}`,
+    },
+  };
 }
 
-function exitWithError(message: string): never {
-  console.error(chalk.red(message));
-  process.exit(1);
+export function daemonRunCommand(): Command {
+  return rejectRemovedLaunchFlags(addLocalDaemonOptions(new Command("run")))
+    .description("Run a local daemon in the foreground with deployment environment overrides")
+    .action(
+      withOutput(async (options: CommandOptions, _command: Command) => {
+        if (options.daemonTarget.kind !== "instance") throw new Error("Run requires a local home");
+        const result = await launchLocalDaemon({
+          home: options.daemonTarget.home,
+          foreground: true,
+        });
+        process.exitCode = result.exitCode ?? 0;
+        return {
+          type: "single" as const,
+          data: { pid: result.instance.pid, action: result.spawned ? "exited" : "already_running" },
+          schema: { idField: "pid" as const, columns: [] },
+        };
+      }),
+    );
 }
diff --git a/packages/cli/src/commands/daemon/status.test.ts b/packages/cli/src/commands/daemon/status.test.ts
deleted file mode 100644
index dd900f902f..0000000000
--- a/packages/cli/src/commands/daemon/status.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { selectRelayStatus } from "./status.js";
-
-describe("selectRelayStatus", () => {
-  const persisted = {
-    enabled: false,
-    endpoint: "persisted.internal:443",
-    publicEndpoint: "persisted.example.com:443",
-    useTls: true,
-    publicUseTls: true,
-  };
-
-  test("uses the running daemon relay state over persisted config", () => {
-    expect(
-      selectRelayStatus({
-        persisted,
-        live: {
-          enabled: true,
-          endpoint: "live.internal:443",
-          publicEndpoint: "live.example.com:443",
-          useTls: true,
-          publicUseTls: true,
-        },
-      }),
-    ).toBe("wss://live.example.com:443");
-  });
-
-  test("falls back to persisted config when the daemon cannot report live state", () => {
-    expect(selectRelayStatus({ persisted })).toBe("disabled");
-  });
-});
diff --git a/packages/cli/src/commands/daemon/status.ts b/packages/cli/src/commands/daemon/status.ts
index 87e34f0bcf..14c20534e6 100644
--- a/packages/cli/src/commands/daemon/status.ts
+++ b/packages/cli/src/commands/daemon/status.ts
@@ -1,464 +1,134 @@
-import type { Command } from "commander";
-import { createRequire } from "node:module";
-import { getOrCreateServerId, findExecutable, execCommand } from "@getpaseo/server";
-import { connectToDaemon } from "../../utils/client.js";
-import type { CommandOptions, ListResult, OutputSchema } from "../../output/index.js";
-import { resolveLocalDaemonState } from "./local-daemon.js";
-import { resolveNodePathFromPid } from "./runtime-toolchain.js";
+import { Command } from "commander";
+import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+import {
+  readDaemonInstance,
+  daemonLogPath,
+  isSameDaemonInstance,
+  DaemonInstanceError,
+} from "@getpaseo/server/daemon-control";
+import { readPersistedConfig, resolveConfigFromPersisted } from "@getpaseo/server/configuration";
+import { connectToDaemon, buildDaemonConnectionCommandError } from "../../utils/client.js";
+import { withOutput, toCommandError, type CommandOptions } from "../../output/index.js";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { describeDaemonTarget, type DaemonTarget } from "../../utils/daemon-target.js";
 
-const DAEMON_STATUS_PROBE_TIMEOUT_MS = 1500;
-
-interface ProviderBinaryStatus {
-  label: string;
-  path: string | null;
-  version: string | null;
-  source?: "daemon" | "local";
+export function daemonStatusCommand(): Command {
+  return addJsonAndDaemonHostOptions(
+    new Command("status").description("Observe the selected daemon and its published endpoint"),
+  ).action(withOutput(runStatusCommand));
 }
 
-interface DaemonStatus {
-  serverId: string | null;
-  localDaemon: "running" | "stopped" | "stale_pid" | "unresponsive";
-  connectedDaemon: "reachable" | "unreachable" | "auth_required" | "auth_failed" | "not_probed";
-  home: string;
-  listen: string;
-  relay: string;
-  hostname: string | null;
-  pid: number | null;
-  startedAt: string | null;
-  owner: string | null;
-  logPath: string;
-  daemonNode: string;
-  cliNode: string;
-  cliVersion: string;
-  daemonVersion: string | null;
-  desktopManaged: boolean;
-  providers: ProviderBinaryStatus[];
-  note?: string;
-}
-
-interface StatusRow {
-  key: string;
-  value: string;
-}
-
-interface CliPackageJson {
-  version?: unknown;
-}
-
-const require = createRequire(import.meta.url);
-
-function normalizeError(error: unknown): string {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  return String(error);
-}
-
-function shortenMessage(message: string, max = 120): string {
-  const normalized = message.replace(/\s+/g, " ").trim();
-  if (normalized.length <= max) {
-    return normalized;
-  }
-  return `${normalized.slice(0, max - 3)}...`;
-}
-
-function appendNote(current: string | undefined, next: string | undefined): string | undefined {
-  if (!next) return current;
-  if (!current) return next;
-  return `${current}; ${next}`;
-}
-
-function resolveCliVersion(): string {
-  try {
-    const packageJson = require("../../../package.json") as CliPackageJson;
-    if (typeof packageJson.version === "string" && packageJson.version.trim().length > 0) {
-      return packageJson.version.trim();
-    }
-  } catch {
-    // Fall through.
-  }
-  return "unknown";
-}
-
-function createStatusSchema(status: DaemonStatus): OutputSchema<StatusRow> {
+export async function runStatusCommand(options: CommandOptions, _command: Command) {
+  const target = options.daemonTarget;
+  const instance = target.kind === "instance" ? await readDaemonInstance(target.home) : null;
+  const local =
+    target.kind === "instance"
+      ? localStatus(target.home, instance)
+      : { host: describeDaemonTarget(target) };
+  const observed =
+    target.kind === "endpoint" || instance?.listen
+      ? await probeDaemonStatus(target, instance, local)
+      : { connectedDaemon: "not_probed" };
+  const data: Record<string, unknown> = { ...local, ...observed };
   return {
-    idField: "key",
-    columns: [
-      { header: "KEY", field: "key" },
-      {
-        header: "VALUE",
-        field: "value",
-        color: (_, item) => {
-          if (item.key === "Local Daemon") {
-            if (item.value === "running") return "green";
-            if (item.value === "unresponsive") return "yellow";
-            return "red";
-          }
-          if (item.key === "Connected Daemon") {
-            if (item.value === "reachable") return "green";
-            if (item.value === "not_probed" || item.value === "auth_required") return "yellow";
-            return "red";
-          }
-          if (item.key.startsWith("  ")) {
-            if (item.value === "not found" || item.value === "not found (daemon)") return "red";
-            if (item.value.endsWith("(--version failed)")) return "yellow";
-            return "green";
-          }
-          return undefined;
-        },
-      },
-    ],
-    serialize: () => status,
+    type: "single" as const,
+    data,
+    schema: {
+      idField: () => "daemon",
+      columns: [],
+      renderHuman: () =>
+        Object.entries(data)
+          .filter(([, value]) => value !== undefined)
+          .map(
+            ([key, value]) =>
+              `${key}: ${typeof value === "object" ? JSON.stringify(value) : value}`,
+          )
+          .join("\n"),
+    },
   };
 }
 
-function toStatusRows(status: DaemonStatus): StatusRow[] {
-  const rows: StatusRow[] = [
-    { key: "Server ID", value: status.serverId ?? "-" },
-    { key: "Local Daemon", value: status.localDaemon },
-    { key: "Connected Daemon", value: status.connectedDaemon },
-    { key: "Home", value: status.home },
-    { key: "Listen", value: status.listen },
-    { key: "Relay", value: status.relay },
-    { key: "Hostname", value: status.hostname ?? "-" },
-    { key: "PID", value: status.pid === null ? "-" : String(status.pid) },
-    { key: "Started", value: status.startedAt ?? "-" },
-    { key: "Owner", value: status.owner ?? "-" },
-    { key: "Logs", value: status.logPath },
-    { key: "Daemon Node", value: status.daemonNode },
-    { key: "CLI Node", value: status.cliNode },
-    { key: "CLI", value: status.cliVersion },
-    { key: "Daemon Version", value: status.daemonVersion ?? "-" },
-  ];
-
-  if (status.note) {
-    rows.push({ key: "Note", value: status.note });
-  }
-
-  rows.push({ key: "", value: "" });
-  rows.push({ key: "Providers", value: "" });
-  for (const provider of status.providers) {
-    if (provider.source === "daemon") {
-      if (!provider.path) {
-        rows.push({ key: `  ${provider.label}`, value: "not found (daemon)" });
-      } else {
-        rows.push({ key: `  ${provider.label}`, value: `${provider.path} (daemon)` });
-      }
-    } else if (!provider.path) {
-      rows.push({ key: `  ${provider.label}`, value: "not found" });
-    } else if (!provider.version) {
-      rows.push({ key: `  ${provider.label}`, value: `${provider.path} (--version failed)` });
-    } else {
-      rows.push({ key: `  ${provider.label}`, value: `${provider.path} (${provider.version})` });
-    }
-  }
-
-  return rows;
-}
-
-const PROVIDER_BINARIES: { label: string; binary: string }[] = [
-  { label: "Claude", binary: "claude" },
-  { label: "Codex", binary: "codex" },
-  { label: "OpenCode", binary: "opencode" },
-];
-
-async function checkProviderBinary(
-  binary: string,
-): Promise<{ path: string | null; version: string | null }> {
-  const binaryPath = await findExecutable(binary);
-  if (!binaryPath) {
-    return { path: null, version: null };
-  }
-  try {
-    const { stdout } = await execCommand(binaryPath, ["--version"], {
-      timeout: 5000,
-    });
-    return { path: binaryPath, version: stdout.trim() || null };
-  } catch {
-    return { path: binaryPath, version: null };
-  }
-}
-
-async function checkProviderBinaries(): Promise<ProviderBinaryStatus[]> {
-  const results = await Promise.all(
-    PROVIDER_BINARIES.map(async ({ label, binary }) => {
-      const result = await checkProviderBinary(binary);
-      return Object.assign({ label }, result);
-    }),
-  );
-  return results;
-}
-
-function resolveOwnerLabel(uid: number | undefined, hostname: string | undefined): string | null {
-  if (uid === undefined && !hostname) {
-    return null;
-  }
-  const uidPart = uid === undefined ? "?" : String(uid);
-  const hostPart = hostname ?? "unknown-host";
-  return `${uidPart}@${hostPart}`;
-}
-
-interface DaemonProbeResult {
-  connectedDaemon: DaemonStatus["connectedDaemon"];
-  localDaemonOverride?: DaemonStatus["localDaemon"];
-  daemonVersion?: string | null;
-  daemonNodeOverride?: string;
-  daemonProviders?: ProviderBinaryStatus[];
-  relayStatus?: string;
-  note?: string;
-}
-
-type DaemonAuthProbeFailure = "auth_required" | "auth_failed";
-
-function classifyDaemonAuthProbeFailure(error: unknown): DaemonAuthProbeFailure | null {
-  if (!(error instanceof Error)) return null;
-  if (error.message === "Password required") return "auth_required";
-  if (error.message === "Incorrect password") return "auth_failed";
-  return null;
-}
-
-function describeDaemonAuthProbeFailure(host: string, failure: DaemonAuthProbeFailure): string {
-  if (failure === "auth_required") {
-    return `Daemon is reachable at ${host} but requires a password. Set PASEO_PASSWORD and retry.`;
-  }
-  return `Daemon is reachable at ${host} but the supplied password was rejected. Check PASEO_PASSWORD and retry.`;
-}
-
-async function probeDaemonOverWebsocket(args: {
-  host: string;
-  state: ReturnType<typeof resolveLocalDaemonState>;
-}): Promise<DaemonProbeResult> {
-  const { host, state } = args;
-  let client: Awaited<ReturnType<typeof connectToDaemon>>;
-  try {
-    client = await connectToDaemon({ host, timeout: 1500 });
-  } catch (error) {
-    const authFailure = classifyDaemonAuthProbeFailure(error);
-    if (authFailure) {
-      return {
-        connectedDaemon: authFailure,
-        note: describeDaemonAuthProbeFailure(host, authFailure),
-      };
-    }
-
-    if (state.running) {
-      return {
-        connectedDaemon: "unreachable",
-        localDaemonOverride: "unresponsive",
-        note: `Local daemon PID is running but websocket at ${host} is not reachable`,
-      };
-    }
-    return { connectedDaemon: "unreachable" };
-  }
-
-  const daemonVersion = client.getLastServerInfoMessage()?.version ?? null;
-  try {
-    const statusPayload = await client.getDaemonStatus({
-      timeout: DAEMON_STATUS_PROBE_TIMEOUT_MS,
-    });
-    const labelMap = new Map(PROVIDER_BINARIES.map((p) => [p.binary, p.label]));
-    const daemonProviders = statusPayload.providers.map((p) => ({
-      label: labelMap.get(p.provider) ?? p.provider,
-      path: p.available ? "available" : null,
-      version: p.available ? null : (p.error ?? null),
-      source: "daemon" as const,
-    }));
-    const relayStatus =
-      statusPayload.relay == null
-        ? undefined
-        : selectRelayStatus({
-            persisted: relayConfigFromLocalState(state),
-            live: statusPayload.relay,
-          });
-
-    if (!state.running) {
-      return {
-        connectedDaemon: "reachable",
-        daemonVersion: statusPayload.version ?? daemonVersion,
-        daemonNodeOverride: statusPayload.nodePath,
-        daemonProviders,
-        relayStatus,
-        note: state.pidInfo
-          ? `Connected daemon is reachable at ${host} even though local daemon PID ${state.pidInfo.pid} is stale`
-          : `Connected daemon is reachable at ${host} but no local daemon PID file was found`,
-      };
-    }
-
-    return {
-      connectedDaemon: "reachable",
-      daemonVersion: statusPayload.version ?? daemonVersion,
-      daemonNodeOverride: statusPayload.nodePath,
-      daemonProviders,
-      relayStatus,
-    };
-  } catch {
-    return {
-      connectedDaemon: "reachable",
-      daemonVersion,
-      note: state.running
-        ? `Local daemon PID is running but daemon detail request to ${host} failed`
-        : `Connected daemon websocket is reachable at ${host} but daemon status request failed`,
-    };
-  } finally {
-    await client.close().catch(() => {});
-  }
-}
-
-interface ProbeMergeState {
-  probe: DaemonProbeResult;
-  connectedDaemon: DaemonStatus["connectedDaemon"];
-  localDaemon: DaemonStatus["localDaemon"];
-  daemonNode: string;
-  daemonVersion: string | null;
-  daemonProviders: ProviderBinaryStatus[] | undefined;
-  relayStatus: string;
-  note: string | undefined;
-}
-
-function applyProbeToStatus(input: ProbeMergeState): Omit<ProbeMergeState, "probe"> {
-  const { probe } = input;
-  return {
-    connectedDaemon: probe.connectedDaemon,
-    localDaemon: probe.localDaemonOverride ?? input.localDaemon,
-    daemonNode: probe.daemonNodeOverride ?? input.daemonNode,
-    daemonVersion: probe.daemonVersion !== undefined ? probe.daemonVersion : input.daemonVersion,
-    daemonProviders: probe.daemonProviders ?? input.daemonProviders,
-    relayStatus: probe.relayStatus ?? input.relayStatus,
-    note: probe.note ? appendNote(input.note, probe.note) : input.note,
-  };
-}
-
-function resolveServerIdSafely(home: string): { serverId: string | null; error: string | null } {
-  try {
-    return { serverId: getOrCreateServerId(home), error: null };
-  } catch (error) {
-    return {
-      serverId: null,
-      error: `serverId unavailable: ${shortenMessage(normalizeError(error))}`,
-    };
-  }
-}
-
-async function resolveDaemonNodeLabel(
-  state: ReturnType<typeof resolveLocalDaemonState>,
-): Promise<string> {
-  if (!state.running) return "-";
-  if (!state.pidInfo?.pid) return "unknown (no PID available)";
-  const fromPid = await resolveNodePathFromPid(state.pidInfo.pid);
-  return fromPid.nodePath ?? `unknown (${fromPid.error ?? "could not resolve from PID"})`;
-}
-
-interface RelayStatusConfig {
-  enabled: boolean;
-  endpoint: string;
-  publicEndpoint: string;
-  useTls: boolean;
-  publicUseTls: boolean;
-}
-
-function relayConfigFromLocalState(
-  state: ReturnType<typeof resolveLocalDaemonState>,
-): RelayStatusConfig {
-  return {
-    enabled: state.relayEnabled,
-    endpoint: state.relayEndpoint,
-    publicEndpoint: state.relayEndpoint,
-    useTls: state.relayUseTls,
-    publicUseTls: state.relayPublicUseTls,
-  };
-}
-
-export function selectRelayStatus(input: {
-  persisted: RelayStatusConfig;
-  live?: RelayStatusConfig;
-}): string {
-  const relay = input.live ?? input.persisted;
-  if (!relay.enabled) return "disabled";
-  const scheme = relay.publicUseTls ? "wss" : "ws";
-  return `${scheme}://${relay.publicEndpoint}`;
-}
-
-export type StatusResult = ListResult<StatusRow>;
-
-export async function runStatusCommand(
-  options: CommandOptions,
-  _command: Command,
-): Promise<StatusResult> {
-  const home = typeof options.home === "string" ? options.home : undefined;
-  const state = resolveLocalDaemonState({ home });
-  const daemonTarget = state.listen.trim();
-
-  const owner = resolveOwnerLabel(state.pidInfo?.uid, state.pidInfo?.hostname);
-  let daemonNode = await resolveDaemonNodeLabel(state);
-  const cliNode = process.execPath;
-  let localDaemon: DaemonStatus["localDaemon"] = state.running ? "running" : "stopped";
-  let connectedDaemon: DaemonStatus["connectedDaemon"] = "not_probed";
-  let daemonVersion: string | null = null;
-  let daemonProviders: ProviderBinaryStatus[] | undefined;
-  let relayStatus = selectRelayStatus({ persisted: relayConfigFromLocalState(state) });
+async function probeDaemonStatus(
+  target: DaemonTarget,
+  instance: Awaited<ReturnType<typeof readDaemonInstance>>,
+  local: Record<string, unknown>,
+) {
+  let connectedDaemon = "unreachable";
   let note: string | undefined;
-
-  if (!state.running && state.stalePidFile && state.pidInfo) {
-    localDaemon = "stale_pid";
-    note = `Stale PID file found for PID ${state.pidInfo.pid}`;
+  let live: Record<string, unknown> = {};
+  let client: Awaited<ReturnType<typeof connectToDaemon>> | undefined;
+  try {
+    client = await connectToDaemon({ target, instance: instance ?? undefined, timeout: 1_500 });
+  } catch (error) {
+    const failure = buildDaemonConnectionCommandError({ target, error });
+    if (target.kind === "endpoint") throw failure;
+    connectedDaemon = "unreachable";
+    if (failure.code === "AUTH_REQUIRED") connectedDaemon = "auth_required";
+    if (failure.code === "AUTH_FAILED") connectedDaemon = "auth_failed";
+    note = failure.message;
   }
-
-  if (daemonTarget) {
-    const probe = await probeDaemonOverWebsocket({ host: daemonTarget, state });
-    ({
-      connectedDaemon,
-      localDaemon,
-      daemonNode,
-      daemonVersion,
-      daemonProviders,
-      relayStatus,
-      note,
-    } = applyProbeToStatus({
-      probe,
-      connectedDaemon,
-      localDaemon,
-      daemonNode,
-      daemonVersion,
-      daemonProviders,
-      relayStatus,
-      note,
-    }));
+  if (!client) return { connectedDaemon, note };
+  try {
+    let requestError: unknown;
+    const status = await client.getDaemonStatus({ timeout: 1_500 }).catch((error: unknown) => {
+      requestError = error;
+      return null;
+    });
+    // Recheck even when the RPC times out before combining local and live observations.
+    const current = target.kind === "instance" ? await readDaemonInstance(target.home) : null;
+    if (instance && (!current || !isSameDaemonInstance(instance, current)))
+      throw new DaemonInstanceError(
+        "DAEMON_REPLACED",
+        "Supervisor exited or was replaced during status observation.",
+      );
+    const info = client.getLastServerInfoMessage();
+    live = { serverId: info?.serverId, daemonVersion: info?.version };
+    connectedDaemon = client.isConnected ? "reachable" : "unreachable";
+    if (!status) {
+      const failure = toCommandError(requestError);
+      note = `Status details unavailable (${failure.code}): ${failure.message}`;
+      if (
+        target.kind === "endpoint" ||
+        !client.isConnected ||
+        !(requestError instanceof DaemonConnectionError) ||
+        requestError.code !== "DAEMON_REQUEST_TIMEOUT"
+      ) {
+        throw { ...failure, message: note, details: { ...local, ...live, connectedDaemon } };
+      }
+    } else {
+      live = {
+        ...live,
+        daemonVersion: status.version,
+        workerPid: status.pid,
+        daemonNode: status.nodePath,
+        providers: status.providers,
+        relay: status.relay,
+      };
+    }
+  } finally {
+    await client.close();
   }
+  return { ...live, connectedDaemon, note };
+}
 
-  const cliVersion = resolveCliVersion();
-
-  const serverIdResult = resolveServerIdSafely(state.home);
-  const serverId = serverIdResult.serverId;
-  if (serverIdResult.error) {
-    note = appendNote(note, serverIdResult.error);
-  }
-
-  const providers = daemonProviders ?? (await checkProviderBinaries());
-
-  const daemonStatus: DaemonStatus = {
-    serverId,
-    localDaemon,
-    connectedDaemon,
-    home: state.home,
-    listen: state.listen,
-    relay: relayStatus,
-    hostname: state.pidInfo?.hostname ?? null,
-    pid: state.pidInfo?.pid ?? null,
-    startedAt: state.pidInfo?.startedAt ?? null,
-    owner,
-    logPath: state.logPath,
-    daemonNode,
-    cliNode,
-    cliVersion,
-    daemonVersion,
-    desktopManaged: state.pidInfo?.desktopManaged === true,
-    providers,
-    note,
-  };
-
+function localStatus(home: string, instance: Awaited<ReturnType<typeof readDaemonInstance>>) {
+  const config = resolveConfigFromPersisted(
+    home,
+    readPersistedConfig(home, { defaultsIfMissing: true }),
+    { env: {} },
+  );
+  let localDaemon = "stopped";
+  if (instance) localDaemon = instance.listen ? "running" : "not_ready";
   return {
-    type: "list",
-    data: toStatusRows(daemonStatus),
-    schema: createStatusSchema(daemonStatus),
+    home,
+    pid: instance?.pid ?? null,
+    startedAt: instance?.startedAt ?? null,
+    listen: instance?.listen ?? null,
+    serverId: instance?.serverId ?? undefined,
+    hostname: instance?.hostname ?? null,
+    configuredListen: config.listen,
+    localDaemon,
+    desktopManaged: instance?.desktopManaged === true,
+    logPath: daemonLogPath(home),
   };
 }
diff --git a/packages/cli/src/commands/daemon/stop.ts b/packages/cli/src/commands/daemon/stop.ts
index 76351bb07b..f2bf8b1255 100644
--- a/packages/cli/src/commands/daemon/stop.ts
+++ b/packages/cli/src/commands/daemon/stop.ts
@@ -1,94 +1,67 @@
-import type { Command } from "commander";
-import {
-  stopLocalDaemon,
-  DEFAULT_STOP_TIMEOUT_MS,
-  DEFAULT_KILL_TIMEOUT_MS,
-} from "./local-daemon.js";
-import type {
-  CommandOptions,
-  SingleResult,
-  OutputSchema,
-  CommandError,
-} from "../../output/index.js";
+import { Command } from "commander";
+import { stopDaemonInstance, type DaemonInstance } from "@getpaseo/server/daemon-control";
+import { connectToDaemon } from "../../utils/client.js";
+import { withOutput, type CommandOptions } from "../../output/index.js";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { describeDaemonTarget } from "../../utils/daemon-target.js";
+import { parseTimeoutMs } from "./local-daemon.js";
 
-interface StopResult {
-  action: "stopped" | "not_running";
-  home: string;
-  pid: string;
-  forced: boolean;
-  usedLifecycleRpc: boolean;
-  reason: "not_running" | "lifecycle_shutdown_rpc" | "owner_pid_signal" | "owner_pid_sigkill";
-  message: string;
+export function daemonStopCommand(): Command {
+  return addJsonAndDaemonHostOptions(new Command("stop").description("Stop the selected daemon"))
+    .option("--timeout <seconds>", "Graceful exit deadline (default: 15)")
+    .option("--force", "Permit forced local process cleanup")
+    .option("--kill-timeout <seconds>", "Forced exit deadline (default: 3)")
+    .action(withOutput(runStopCommand));
 }
 
-const stopResultSchema: OutputSchema<StopResult> = {
-  idField: "action",
-  columns: [
-    {
-      header: "STATUS",
-      field: "action",
-      color: (value) => (value === "stopped" ? "green" : "yellow"),
+export async function runStopCommand(options: CommandOptions, _command: Command) {
+  const target = options.daemonTarget;
+  const timeoutMs = parseTimeoutMs(options.timeout, 15_000);
+  const deadline = Date.now() + timeoutMs;
+  const remaining = () => Math.max(1, deadline - Date.now());
+  const requestShutdown = async (instance?: DaemonInstance) => {
+    const client = await connectToDaemon({ target, timeout: remaining(), instance });
+    try {
+      await client.shutdownServer({ timeout: remaining() });
+    } finally {
+      await client.close();
+    }
+  };
+  if (target.kind === "endpoint" && options.force)
+    throw {
+      code: "INVALID_OPTIONS",
+      message: "--force requires a local --home; an endpoint gives no remote process authority.",
+    };
+  const result: {
+    action: string;
+    home?: string;
+    host?: string;
+    pid?: number | null;
+    forced?: boolean;
+    usedLifecycleRpc?: boolean;
+  } =
+    target.kind === "instance"
+      ? {
+          ...(await stopDaemonInstance(target.home, {
+            force: options.force === true,
+            timeoutMs,
+            killTimeoutMs: parseTimeoutMs(options.killTimeout, 3_000),
+            requestShutdown,
+          })),
+          home: target.home,
+        }
+      : (await requestShutdown(),
+        { action: "shutdown_requested", host: describeDaemonTarget(target) });
+  return {
+    type: "single" as const,
+    data: result,
+    schema: {
+      idField: "action" as const,
+      columns: [],
+      renderHuman: () =>
+        target.kind === "endpoint"
+          ? "Shutdown requested; remote process exit was not verified."
+          : `${result.action.replaceAll("_", " ")}: ${target.home}`,
     },
-    { header: "HOME", field: "home" },
-    { header: "PID", field: "pid" },
-    { header: "MESSAGE", field: "message" },
-  ],
-};
-
-export type StopCommandResult = SingleResult<StopResult>;
-
-function parseSecondsOption(raw: unknown, fallbackMs: number, label: string): number {
-  if (typeof raw !== "string" || raw.trim().length === 0) {
-    return fallbackMs;
-  }
-
-  const seconds = Number(raw);
-  if (!Number.isFinite(seconds) || seconds <= 0) {
-    const error: CommandError = {
-      code: "INVALID_TIMEOUT",
-      message: `Invalid ${label} value: ${raw}`,
-      details: `${label} must be a positive number of seconds`,
-    };
-    throw error;
-  }
-
-  return Math.ceil(seconds * 1000);
-}
-
-export async function runStopCommand(
-  options: CommandOptions,
-  _command: Command,
-): Promise<StopCommandResult> {
-  const home = typeof options.home === "string" ? options.home : undefined;
-  const force = options.force === true;
-  const timeoutMs = parseSecondsOption(options.timeout, DEFAULT_STOP_TIMEOUT_MS, "timeout");
-  const killTimeoutMs = parseSecondsOption(
-    options.killTimeout,
-    DEFAULT_KILL_TIMEOUT_MS,
-    "kill-timeout",
-  );
-
-  try {
-    const result = await stopLocalDaemon({ home, force, timeoutMs, killTimeoutMs });
-    return {
-      type: "single",
-      data: {
-        action: result.action,
-        home: result.home,
-        pid: result.pid === null ? "-" : String(result.pid),
-        forced: result.forced,
-        usedLifecycleRpc: result.usedLifecycleRpc,
-        reason: result.reason,
-        message: result.message,
-      },
-      schema: stopResultSchema,
-    };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "STOP_FAILED",
-      message: `Failed to stop local daemon: ${message}`,
-    };
-    throw error;
-  }
+  };
 }
diff --git a/packages/cli/src/commands/heartbeat/index.ts b/packages/cli/src/commands/heartbeat/index.ts
index 7ded358e8f..812af3a847 100644
--- a/packages/cli/src/commands/heartbeat/index.ts
+++ b/packages/cli/src/commands/heartbeat/index.ts
@@ -64,7 +64,7 @@ async function runCreateHeartbeat(
   if (!cron) {
     throw new Error("--cron is required");
   }
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     const maxRuns = options.maxRuns ? Number.parseInt(options.maxRuns, 10) : undefined;
     if (maxRuns !== undefined && (!Number.isSafeInteger(maxRuns) || maxRuns <= 0)) {
@@ -105,7 +105,7 @@ async function runUpdateHeartbeat(
   if (!cron) {
     throw new Error("--cron is required");
   }
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireOwnedHeartbeat(client, id, agentId);
     const payload = await client.scheduleUpdate({
@@ -133,7 +133,7 @@ async function runDeleteHeartbeat(
   _command: Command,
 ): Promise<SingleResult<HeartbeatDeleteRow>> {
   const agentId = requireCallerAgentId();
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireOwnedHeartbeat(client, id, agentId);
     const payload = await client.scheduleDelete({ id });
diff --git a/packages/cli/src/commands/hooks.test.ts b/packages/cli/src/commands/hooks.test.ts
index 3f8c31d855..dd99816b06 100644
--- a/packages/cli/src/commands/hooks.test.ts
+++ b/packages/cli/src/commands/hooks.test.ts
@@ -17,6 +17,15 @@ function inputFrom(value: string) {
   };
 }
 
+function claudeNotification(notificationType: string) {
+  return JSON.stringify({
+    session_id: "session-1",
+    hook_event_name: "Notification",
+    message: "Claude is waiting for your input",
+    notification_type: notificationType,
+  });
+}
+
 function ttyInput() {
   return {
     isTTY: true,
@@ -123,7 +132,7 @@ describe("runHooksCommand", () => {
     const send = await runHook(
       claudeProvider.id,
       claudeProvider.events[4].event,
-      inputFrom('{"reason":"idle_prompt"}'),
+      inputFrom(claudeNotification("idle_prompt")),
     );
 
     expectPostedState(send, "needs-input");
@@ -131,11 +140,11 @@ describe("runHooksCommand", () => {
 
   it.each(["permission_prompt", "elicitation_prompt", "elicitation_response", "auth_success"])(
     "ignores Claude %s notifications",
-    async (reason) => {
+    async (notificationType) => {
       const send = await runHook(
         claudeProvider.id,
         claudeProvider.events[4].event,
-        inputFrom(JSON.stringify({ reason })),
+        inputFrom(claudeNotification(notificationType)),
       );
 
       expect(send.calls).toEqual([]);
diff --git a/packages/cli/src/commands/hub/client.test.ts b/packages/cli/src/commands/hub/client.test.ts
index c211b7d9af..edf86d3dc8 100644
--- a/packages/cli/src/commands/hub/client.test.ts
+++ b/packages/cli/src/commands/hub/client.test.ts
@@ -117,6 +117,40 @@ describe("Hub HTTP client", () => {
     assert.deepEqual(requests[0], { url: "/api/v1/triggers", body: "" });
   });
 
+  it("validates and installs self-contained organization triggers", async () => {
+    const requests: Array<{ url: string | undefined; body: string }> = [];
+    const triggerId = "a50e05af-4f20-4c8f-8dcc-58e5ea360663";
+    const revisionId = "2de5b143-1c88-42db-8a8d-71ca2af97830";
+    const origin = await startServer(
+      (url) =>
+        url === "/api/v1/triggers/validate"
+          ? { status: 200, body: { name: "slack-help", valid: true } }
+          : {
+              status: 201,
+              body: { triggerId, name: "slack-help", revisionId, version: 1, active: true },
+            },
+      requests,
+    );
+    const hub = new HubHttpClient();
+    const yaml = "name: slack-help\n";
+
+    assert.deepEqual(await hub.validateTrigger(origin, "secret", yaml), {
+      name: "slack-help",
+      valid: true,
+    });
+    assert.deepEqual(await hub.installTrigger(origin, "secret", yaml), {
+      triggerId,
+      name: "slack-help",
+      revisionId,
+      version: 1,
+      active: true,
+    });
+    assert.deepEqual(requests, [
+      { url: "/api/v1/triggers/validate", body: JSON.stringify({ yaml }) },
+      { url: "/api/v1/triggers/install", body: JSON.stringify({ yaml }) },
+    ]);
+  });
+
   it("reads configuration resources in the Hub's slug vocabulary", async () => {
     const requests: Array<{ url: string | undefined; body: string }> = [];
     const origin = await startServer(
@@ -134,6 +168,7 @@ describe("Hub HTTP client", () => {
           ],
           discord: [{ slug: "paseo", guildName: "Paseo" }],
           slack: [{ slug: "paseo", teamName: "Paseo" }],
+          linear: [{ slug: "paseo-linear", organizationName: "Paseo" }],
         },
       }),
       requests,
@@ -143,55 +178,10 @@ describe("Hub HTTP client", () => {
 
     assert.equal(resources.daemons[0]?.slug, "macbook");
     assert.equal(resources.discord[0]?.slug, "paseo");
+    assert.equal(resources.linear[0]?.slug, "paseo-linear");
     assert.equal(requests[0]?.url, "/api/v1/configuration-resources");
   });
 
-  it("reads strict provider-native setup resources", async () => {
-    const requests: Array<{ url: string | undefined; body: string }> = [];
-    const origin = await startServer(
-      () => ({
-        status: 200,
-        body: {
-          github: [
-            {
-              slug: "getpaseo",
-              accountLogin: "getpaseo",
-              accountType: "Organization",
-              repositories: ["getpaseo/paseo"],
-            },
-          ],
-          discord: [{ guildId: "guild-123", guildName: "Paseo" }],
-          slack: [{ teamId: "team-123", teamName: "Paseo" }],
-        },
-      }),
-      requests,
-    );
-
-    const resources = await new HubHttpClient().listSetupResources(origin, "secret");
-
-    assert.equal(resources.slack[0]?.teamId, "team-123");
-    assert.equal(resources.discord[0]?.guildId, "guild-123");
-    assert.deepEqual(requests[0], { url: "/api/v1/setup-resources", body: "" });
-  });
-
-  it.each([
-    { github: [], discord: [], slack: [{ teamId: "team-123", teamName: "Paseo", slug: "wrong" }] },
-    { github: [], discord: [], slack: [{ teamId: 123, teamName: "Paseo" }] },
-  ])("rejects malformed or unknown setup resource fields", async (body) => {
-    const requests: Array<{ url: string | undefined; body: string }> = [];
-    const origin = await startServer(
-      () => ({
-        status: 200,
-        body,
-      }),
-      requests,
-    );
-
-    await assert.rejects(new HubHttpClient().listSetupResources(origin, "secret"), {
-      code: "HUB_INVALID_RESPONSE",
-    });
-  });
-
   it("renders file-aware Hub validation issues without exposing credentials or response bodies", async () => {
     const requests: Array<{ url: string | undefined; body: string }> = [];
     const origin = await startServer(
diff --git a/packages/cli/src/commands/hub/connect.ts b/packages/cli/src/commands/hub/connect.ts
index 8f3fcf9bfc..90a4edca36 100644
--- a/packages/cli/src/commands/hub/connect.ts
+++ b/packages/cli/src/commands/hub/connect.ts
@@ -13,6 +13,7 @@ import { addHubResolutionHelp } from "./help.js";
 interface HubConnectOptions {
   apiKey?: string;
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   json?: boolean;
   permission?: readonly string[];
   permissions?: readonly string[];
@@ -41,7 +42,7 @@ export async function runHubConnect(
   const credential = resolveHubCredential({ ...resolution, origin });
   const token = await dependencies.hub.issueEnrollmentToken(origin, credential);
   const permissions = options.permissions ?? options.permission ?? [];
-  return withHubDaemon(dependencies.daemon, options.host, async (daemon) => {
+  return withHubDaemon(dependencies.daemon, options.daemonTarget, async (daemon) => {
     const response = await daemon.connectHub(origin, token, permissions);
     if (
       response.status.hubOrigin !== null &&
diff --git a/packages/cli/src/commands/hub/daemon-client.ts b/packages/cli/src/commands/hub/daemon-client.ts
index 3f53360ccd..21a2e7bde1 100644
--- a/packages/cli/src/commands/hub/daemon-client.ts
+++ b/packages/cli/src/commands/hub/daemon-client.ts
@@ -1,3 +1,4 @@
+import type { DaemonTarget } from "../../utils/daemon-target.js";
 import { connectToDaemon } from "../../utils/client.js";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 
@@ -33,19 +34,19 @@ export interface HubDaemonClient {
 }
 
 export interface HubDaemonConnection {
-  connect(host: string | undefined): Promise<HubDaemonClient>;
+  connect(target: DaemonTarget): Promise<HubDaemonClient>;
 }
 
 export const productionHubDaemonConnection: HubDaemonConnection = {
-  connect: (host) => connectToDaemon({ host }),
+  connect: (target) => connectToDaemon({ target }),
 };
 
 export async function withHubDaemon<T>(
   connection: HubDaemonConnection,
-  host: string | undefined,
+  target: DaemonTarget,
   action: (client: HubDaemonClient) => Promise<T>,
 ): Promise<T> {
-  const client = await connection.connect(host);
+  const client = await connection.connect(target);
   try {
     return await action(client);
   } finally {
diff --git a/packages/cli/src/commands/hub/deploy-contract.test.ts b/packages/cli/src/commands/hub/deploy-contract.test.ts
index c9c3103e7a..8729312707 100644
--- a/packages/cli/src/commands/hub/deploy-contract.test.ts
+++ b/packages/cli/src/commands/hub/deploy-contract.test.ts
@@ -17,7 +17,119 @@ afterEach(async () => {
   await Promise.all(servers.splice(0).map(closeServer));
 });
 
-describe("Hub canonical bundle deployment contract", () => {
+describe("Hub deployment contract", () => {
+  it("validates then installs discovered organization triggers when no project is selected", async () => {
+    const cwd = await triggerProject();
+    const triggerId = "a50e05af-4f20-4c8f-8dcc-58e5ea360663";
+    const revisionId = "2de5b143-1c88-42db-8a8d-71ca2af97830";
+    const hub = await captureHubRequests(2, (url) =>
+      url === "/api/v1/triggers/validate"
+        ? { status: 200, body: { name: "slack-help", valid: true } }
+        : {
+            status: 201,
+            body: { triggerId, name: "slack-help", revisionId, version: 3, active: true },
+          },
+    );
+
+    const result = await runHubDeploy(
+      { hub: hub.origin, apiKey: "operator-secret" },
+      { cwd, env: {} },
+    );
+
+    expect(await hub.received).toEqual([
+      {
+        url: "/api/v1/triggers/validate",
+        authorization: "Bearer operator-secret",
+        body: { yaml: trigger },
+      },
+      {
+        url: "/api/v1/triggers/install",
+        authorization: "Bearer operator-secret",
+        body: { yaml: trigger },
+      },
+    ]);
+    expect(result).toMatchObject({
+      type: "list",
+      data: [
+        {
+          triggerId,
+          name: "slack-help",
+          revisionId,
+          version: 3,
+          active: true,
+          path: ".paseo/triggers/slack-help.yml",
+          origin: hub.origin,
+        },
+      ],
+    });
+  });
+
+  it("dry-runs organization triggers without installing them", async () => {
+    const cwd = await triggerProject();
+    const hub = await captureHub(200, { name: "slack-help", valid: true });
+
+    const result = await runHubDeploy(
+      { hub: hub.origin, apiKey: "operator-secret", dryRun: true },
+      { cwd, env: {} },
+    );
+
+    expect(await hub.received).toEqual({
+      url: "/api/v1/triggers/validate",
+      authorization: "Bearer operator-secret",
+      body: { yaml: trigger },
+    });
+    expect(result).toMatchObject({
+      type: "list",
+      data: [
+        {
+          name: "slack-help",
+          valid: true,
+          path: ".paseo/triggers/slack-help.yml",
+          origin: hub.origin,
+        },
+      ],
+    });
+  });
+
+  it("reports triggers installed before a later deployment failure", async () => {
+    const cwd = await triggerProject();
+    const secondTrigger = trigger.replace("slack-help", "z-help");
+    await writeFile(path.join(cwd, ".paseo", "triggers", "z-help.yml"), secondTrigger);
+    const hub = await captureHubRequests(4, (url, requestNumber) => {
+      if (url === "/api/v1/triggers/validate") {
+        return { status: 200, body: { name: "valid", valid: true } };
+      }
+      if (requestNumber === 3) {
+        return {
+          status: 201,
+          body: {
+            triggerId: "a50e05af-4f20-4c8f-8dcc-58e5ea360663",
+            name: "slack-help",
+            revisionId: "2de5b143-1c88-42db-8a8d-71ca2af97830",
+            version: 1,
+            active: true,
+          },
+        };
+      }
+      return { status: 500, body: { error: "failed" } };
+    });
+
+    await expect(
+      runHubDeploy({ hub: hub.origin, apiKey: "operator-secret" }, { cwd, env: {} }),
+    ).rejects.toMatchObject({
+      code: "HUB_TRIGGER_DEPLOY_PARTIAL",
+      message: "Could not deploy .paseo/triggers/z-help.yml after 1 trigger had been installed.",
+      details:
+        "Hub trigger deployment failed with HTTP 500.\nInstalled before the failure:\n- .paseo/triggers/slack-help.yml",
+    });
+    expect((await hub.received).map(({ url }) => url)).toEqual([
+      "/api/v1/triggers/validate",
+      "/api/v1/triggers/validate",
+      "/api/v1/triggers/install",
+      "/api/v1/triggers/install",
+    ]);
+  });
+
   it("installs the exact discovered bundle with finite environment and named-agent routing", async () => {
     const cwd = await canonicalProject();
     const hub = await captureHub(201, {
@@ -83,6 +195,7 @@ describe("Hub canonical bundle deployment contract", () => {
 
     expect(help).not.toContain("[file]");
     expect(help).toContain("--project <slug>");
+    expect(help).toContain("legacy bundle");
     expect(help).toContain("--dry-run");
   });
 });
@@ -135,6 +248,23 @@ const workflow = [
 
 const partial = "Treat paseo.context as evidence, not hidden prompt text.\n";
 
+const trigger = [
+  "name: slack-help",
+  "enabled: true",
+  "on:",
+  "  slack.mention:",
+  "    connection: team",
+  "    filters:",
+  "      from_users: [U123]",
+  "run:",
+  "  target: { daemon: local, cwd: /workspace/studio }",
+  "  agent: { provider: codex, model: gpt-5, mode: full-access }",
+  "  max_runtime: 90m",
+  "  idle_timeout: 10m",
+  "  prompt: ${{ paseo.prompt }}",
+  "",
+].join("\n");
+
 function canonicalFiles() {
   return [
     { path: ".paseo/hub.yml", content: resource },
@@ -154,6 +284,15 @@ async function canonicalProject(): Promise<string> {
   return cwd;
 }
 
+async function triggerProject(): Promise<string> {
+  const cwd = await mkdtemp(path.join(tmpdir(), "paseo-hub-trigger-deploy-"));
+  temporaryDirectories.push(cwd);
+  const triggers = path.join(cwd, ".paseo", "triggers");
+  await mkdir(triggers, { recursive: true });
+  await writeFile(path.join(triggers, "slack-help.yml"), trigger);
+  return cwd;
+}
+
 async function captureHub(status: number, responseBody: unknown) {
   let resolveRequest!: (request: unknown) => void;
   const received = new Promise<unknown>((resolve) => {
@@ -181,6 +320,42 @@ async function captureHub(status: number, responseBody: unknown) {
   return { origin: `http://127.0.0.1:${address.port}`, received };
 }
 
+async function captureHubRequests(
+  count: number,
+  responseFor: (
+    url: string | undefined,
+    requestNumber: number,
+  ) => { status: number; body: unknown },
+) {
+  const requests: unknown[] = [];
+  let resolveRequests!: (requests: unknown[]) => void;
+  const received = new Promise<unknown[]>((resolve) => {
+    resolveRequests = resolve;
+  });
+  const server = createServer((request, response) => {
+    let body = "";
+    request.setEncoding("utf8");
+    request.on("data", (chunk: string) => {
+      body += chunk;
+    });
+    request.on("end", () => {
+      requests.push({
+        url: request.url,
+        authorization: request.headers.authorization,
+        body: JSON.parse(body),
+      });
+      if (requests.length === count) resolveRequests(requests);
+      const configured = responseFor(request.url, requests.length);
+      response.writeHead(configured.status, { "content-type": "application/json" });
+      response.end(JSON.stringify(configured.body));
+    });
+  });
+  servers.push(server);
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address() as AddressInfo;
+  return { origin: `http://127.0.0.1:${address.port}`, received };
+}
+
 function closeServer(server: ReturnType<typeof createServer>): Promise<void> {
   server.closeAllConnections();
   return new Promise<void>((resolve, reject) => {
diff --git a/packages/cli/src/commands/hub/deploy-triggers.test.ts b/packages/cli/src/commands/hub/deploy-triggers.test.ts
new file mode 100644
index 0000000000..934dae097f
--- /dev/null
+++ b/packages/cli/src/commands/hub/deploy-triggers.test.ts
@@ -0,0 +1,64 @@
+import { mkdir, mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import { discoverHubTriggers } from "./deploy-triggers.js";
+
+const temporaryDirectories: string[] = [];
+
+afterEach(async () => {
+  await Promise.all(
+    temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
+  );
+});
+
+describe("Hub trigger deployment discovery", () => {
+  it("discovers self-contained triggers in deterministic order", async () => {
+    const cwd = await temporaryDirectory();
+    await mkdir(path.join(cwd, ".paseo", "triggers"), { recursive: true });
+    await writeFile(path.join(cwd, ".paseo", "triggers", "z.yml"), "name: z\n");
+    await writeFile(path.join(cwd, ".paseo", "triggers", "a.yml"), "name: a\n");
+
+    await expect(discoverHubTriggers(cwd)).resolves.toEqual([
+      { path: ".paseo/triggers/a.yml", yaml: "name: a\n" },
+      { path: ".paseo/triggers/z.yml", yaml: "name: z\n" },
+    ]);
+  });
+
+  it("rejects unsupported and unsafe trigger paths", async () => {
+    const cwd = await temporaryDirectory();
+    const directory = path.join(cwd, ".paseo", "triggers");
+    await mkdir(directory, { recursive: true });
+    await writeFile(path.join(cwd, "outside.yml"), "name: outside\n");
+    await symlink(path.join(cwd, "outside.yml"), path.join(directory, "linked.yml"));
+
+    await expect(discoverHubTriggers(cwd)).rejects.toMatchObject({
+      code: "HUB_TRIGGER_UNSAFE_PATH",
+    });
+  });
+
+  it("requires at least one trigger", async () => {
+    const cwd = await temporaryDirectory();
+    await mkdir(path.join(cwd, ".paseo", "triggers"), { recursive: true });
+
+    await expect(discoverHubTriggers(cwd)).rejects.toMatchObject({ code: "HUB_TRIGGER_MISSING" });
+  });
+
+  it("directs legacy bundles to the explicit project deployment path", async () => {
+    const cwd = await temporaryDirectory();
+    await mkdir(path.join(cwd, ".paseo"));
+    await writeFile(path.join(cwd, ".paseo", "hub.yml"), "environments: {}\n");
+
+    await expect(discoverHubTriggers(cwd)).rejects.toMatchObject({
+      code: "HUB_PROJECT_REQUIRED",
+      message:
+        "This directory contains a legacy .paseo/hub.yml bundle. Pass --project <slug> to deploy it.",
+    });
+  });
+});
+
+async function temporaryDirectory(): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-hub-triggers-"));
+  temporaryDirectories.push(directory);
+  return directory;
+}
diff --git a/packages/cli/src/commands/hub/deploy-triggers.ts b/packages/cli/src/commands/hub/deploy-triggers.ts
new file mode 100644
index 0000000000..e55abb53f4
--- /dev/null
+++ b/packages/cli/src/commands/hub/deploy-triggers.ts
@@ -0,0 +1,140 @@
+import { lstat, readFile, readdir } from "node:fs/promises";
+import path from "node:path";
+import { HubCommandError } from "./error.js";
+
+const TRIGGER_DIRECTORY = ".paseo/triggers";
+
+export interface HubDeployTrigger {
+  path: string;
+  yaml: string;
+}
+
+export async function discoverHubTriggers(cwd: string): Promise<HubDeployTrigger[]> {
+  const root = path.resolve(cwd);
+  const directory = path.join(root, TRIGGER_DIRECTORY);
+  const paseoDirectory = await readStats(path.join(root, ".paseo"), {
+    code: "HUB_TRIGGER_DIRECTORY_MISSING",
+    message: `${TRIGGER_DIRECTORY} does not exist. Run this command from the project root.`,
+  });
+  if (paseoDirectory.isSymbolicLink()) throw unsafeTriggerPath(TRIGGER_DIRECTORY);
+  const directoryStats = await readTriggerDirectoryStats(root, directory);
+  if (directoryStats.isSymbolicLink()) throw unsafeTriggerPath(TRIGGER_DIRECTORY);
+  if (!directoryStats.isDirectory()) {
+    throw new HubCommandError(
+      "HUB_TRIGGER_DIRECTORY_INVALID",
+      `${TRIGGER_DIRECTORY} must be a directory.`,
+    );
+  }
+
+  let entries;
+  try {
+    entries = await readdir(directory, { withFileTypes: true });
+  } catch (error) {
+    if (!isExpectedReadError(error)) throw error;
+    throw unreadableTriggerPath(TRIGGER_DIRECTORY);
+  }
+  const triggers: HubDeployTrigger[] = [];
+  for (const entry of entries.toSorted((left, right) => left.name.localeCompare(right.name))) {
+    const triggerPath = `${TRIGGER_DIRECTORY}/${entry.name}`;
+    if (entry.isSymbolicLink()) throw unsafeTriggerPath(triggerPath);
+    if (!entry.isFile() || !entry.name.endsWith(".yml")) {
+      throw new HubCommandError(
+        "HUB_TRIGGER_PATH_UNSUPPORTED",
+        `${triggerPath} must be a direct-child .yml trigger.`,
+      );
+    }
+    try {
+      triggers.push({
+        path: triggerPath,
+        yaml: await readFile(path.join(root, triggerPath), "utf8"),
+      });
+    } catch (error) {
+      if (!isExpectedReadError(error)) throw error;
+      throw unreadableTriggerPath(triggerPath);
+    }
+  }
+  if (triggers.length === 0) {
+    throw new HubCommandError(
+      "HUB_TRIGGER_MISSING",
+      `${TRIGGER_DIRECTORY} must contain at least one direct-child .yml trigger.`,
+    );
+  }
+  return triggers;
+}
+
+async function readTriggerDirectoryStats(
+  root: string,
+  directory: string,
+): Promise<Awaited<ReturnType<typeof lstat>>> {
+  try {
+    return await lstat(directory);
+  } catch (error) {
+    if (errorCode(error) !== "ENOENT") {
+      if (!isExpectedReadError(error)) throw error;
+      throw unreadableTriggerPath(TRIGGER_DIRECTORY);
+    }
+    if (await legacyBundleExists(root)) {
+      throw new HubCommandError(
+        "HUB_PROJECT_REQUIRED",
+        "This directory contains a legacy .paseo/hub.yml bundle. Pass --project <slug> to deploy it.",
+      );
+    }
+    throw new HubCommandError(
+      "HUB_TRIGGER_DIRECTORY_MISSING",
+      `${TRIGGER_DIRECTORY} does not exist. Run this command from the project root.`,
+    );
+  }
+}
+
+async function legacyBundleExists(root: string): Promise<boolean> {
+  try {
+    await lstat(path.join(root, ".paseo/hub.yml"));
+    return true;
+  } catch (error) {
+    if (errorCode(error) === "ENOENT") return false;
+    if (!isExpectedReadError(error)) throw error;
+    throw unreadableTriggerPath(".paseo/hub.yml");
+  }
+}
+
+async function readStats(
+  target: string,
+  missing: { code: string; message: string },
+): Promise<Awaited<ReturnType<typeof lstat>>> {
+  try {
+    return await lstat(target);
+  } catch (error) {
+    if (errorCode(error) === "ENOENT") throw new HubCommandError(missing.code, missing.message);
+    if (!isExpectedReadError(error)) throw error;
+    throw unreadableTriggerPath(TRIGGER_DIRECTORY);
+  }
+}
+
+function unsafeTriggerPath(triggerPath: string): HubCommandError {
+  return new HubCommandError("HUB_TRIGGER_UNSAFE_PATH", `${triggerPath} must not use a symlink.`);
+}
+
+function unreadableTriggerPath(triggerPath: string): HubCommandError {
+  return new HubCommandError(
+    "HUB_TRIGGER_UNREADABLE",
+    `Could not read ${triggerPath}. Check the file and permissions.`,
+  );
+}
+
+function errorCode(error: unknown): string | undefined {
+  if (typeof error !== "object" || error === null) return undefined;
+  const code = Reflect.get(error, "code");
+  return typeof code === "string" ? code : undefined;
+}
+
+function isExpectedReadError(error: unknown): boolean {
+  const code = errorCode(error);
+  return (
+    code === "EACCES" ||
+    code === "EPERM" ||
+    code === "ENOENT" ||
+    code === "ENOTDIR" ||
+    code === "ELOOP" ||
+    code === "EISDIR"
+  );
+}
diff --git a/packages/cli/src/commands/hub/deploy.ts b/packages/cli/src/commands/hub/deploy.ts
index d64137879a..b9cde59ae6 100644
--- a/packages/cli/src/commands/hub/deploy.ts
+++ b/packages/cli/src/commands/hub/deploy.ts
@@ -1,14 +1,23 @@
 import type { Command } from "commander";
-import { withOutput, type OutputSchema, type SingleResult } from "../../output/index.js";
+import {
+  withOutput,
+  type ListResult,
+  type OutputSchema,
+  type SingleResult,
+} from "../../output/index.js";
 import { addJsonOption } from "../../utils/command-options.js";
 import { resolveHubCredential, resolveHubOrigin } from "./authority.js";
 import {
   HubHttpClient,
   type HubInstallResult,
+  type HubTriggerInstallationResult,
+  type HubTriggerValidationResult,
   type HubValidationResult,
 } from "./hub-client/index.js";
 import { PrivateHubCredentialStore, type HubCredentialStore } from "./credentials.js";
 import { discoverHubBundle, type HubDeployBundle } from "./deploy-bundle.js";
+import { discoverHubTriggers, type HubDeployTrigger } from "./deploy-triggers.js";
+import { HubCommandError } from "./error.js";
 import { processHubReporter, reportHubProgress, type HubReporter } from "./reporter.js";
 import { addHubResolutionHelp } from "./help.js";
 
@@ -24,14 +33,20 @@ export interface HubDeployEnvironment {
   cwd: string;
   env: Readonly<Record<string, string | undefined>>;
   credentials?: HubCredentialStore;
-  hub?: Pick<HubHttpClient, "installConfiguration" | "validateConfiguration">;
+  hub?: Pick<
+    HubHttpClient,
+    "installConfiguration" | "validateConfiguration" | "installTrigger" | "validateTrigger"
+  >;
   reporter?: HubReporter;
 }
 
 export interface HubDeployCommandDependencies {
   env: Readonly<Record<string, string | undefined>>;
   credentials: HubCredentialStore;
-  hub: Pick<HubHttpClient, "installConfiguration" | "validateConfiguration">;
+  hub: Pick<
+    HubHttpClient,
+    "installConfiguration" | "validateConfiguration" | "installTrigger" | "validateTrigger"
+  >;
   reporter: HubReporter;
   cwd(): string;
 }
@@ -46,6 +61,16 @@ interface HubDryRunResult extends HubValidationResult {
   workflows: number;
 }
 
+interface HubTriggerDeployResult extends HubTriggerInstallationResult {
+  origin: string;
+  path: string;
+}
+
+interface HubTriggerDryRunResult extends HubTriggerValidationResult {
+  origin: string;
+  path: string;
+}
+
 const resultSchema: OutputSchema<HubDeployResult> = {
   idField: "versionId",
   columns: [
@@ -68,6 +93,28 @@ const validationSchema: OutputSchema<HubDryRunResult> = {
   ],
 };
 
+const triggerResultSchema: OutputSchema<HubTriggerDeployResult> = {
+  idField: "triggerId",
+  columns: [
+    { header: "TRIGGER", field: "name" },
+    { header: "VERSION", field: "version" },
+    { header: "REVISION ID", field: "revisionId" },
+    { header: "ACTIVE", field: "active" },
+    { header: "PATH", field: "path" },
+    { header: "HUB", field: "origin" },
+  ],
+};
+
+const triggerValidationSchema: OutputSchema<HubTriggerDryRunResult> = {
+  idField: "name",
+  columns: [
+    { header: "TRIGGER", field: "name" },
+    { header: "VALID", field: "valid" },
+    { header: "PATH", field: "path" },
+    { header: "HUB", field: "origin" },
+  ],
+};
+
 export async function runHubDeploy(
   options: HubDeployOptions,
   environment: HubDeployEnvironment = {
@@ -76,14 +123,84 @@ export async function runHubDeploy(
     credentials: new PrivateHubCredentialStore(),
     hub: new HubHttpClient(),
   },
-): Promise<SingleResult<HubDeployResult> | SingleResult<HubDryRunResult>> {
+): Promise<
+  | SingleResult<HubDeployResult>
+  | SingleResult<HubDryRunResult>
+  | ListResult<HubTriggerDeployResult>
+  | ListResult<HubTriggerDryRunResult>
+> {
+  if (options.project === undefined) {
+    return runHubDeployTriggers(options, await discoverHubTriggers(environment.cwd), environment);
+  }
   const deployInput = await discoverHubBundle({
     cwd: environment.cwd,
-    ...(options.project === undefined ? {} : { project: options.project }),
+    project: options.project,
   });
   return runHubDeployBundle(options, deployInput, environment);
 }
 
+export async function runHubDeployTriggers(
+  options: HubDeployOptions,
+  triggers: readonly HubDeployTrigger[],
+  environment: HubDeployEnvironment,
+): Promise<ListResult<HubTriggerDeployResult> | ListResult<HubTriggerDryRunResult>> {
+  const credentials = environment.credentials ?? new PrivateHubCredentialStore(environment.env);
+  const resolution = {
+    options: { origin: options.hub, apiKey: options.apiKey },
+    env: environment.env,
+    credentials,
+  };
+  const origin = resolveHubOrigin(resolution);
+  const credential = resolveHubCredential({ ...resolution, origin });
+  const action = options.dryRun === true ? "Validating" : "Deploying";
+  reportHubProgress(
+    environment.reporter ?? processHubReporter,
+    options,
+    `${action} ${String(triggers.length)} trigger${triggers.length === 1 ? "" : "s"} ${
+      options.dryRun === true ? "against" : "to"
+    } ${origin}`,
+  );
+  const hub = environment.hub ?? new HubHttpClient();
+  if (options.dryRun === true) {
+    const data = await Promise.all(
+      triggers.map(async (trigger) => ({
+        ...(await hub.validateTrigger(origin, credential, trigger.yaml)),
+        origin,
+        path: trigger.path,
+      })),
+    );
+    return { type: "list", data, schema: triggerValidationSchema };
+  }
+  await Promise.all(
+    triggers.map((trigger) => hub.validateTrigger(origin, credential, trigger.yaml)),
+  );
+  const data: HubTriggerDeployResult[] = [];
+  for (const trigger of triggers) {
+    try {
+      data.push({
+        ...(await hub.installTrigger(origin, credential, trigger.yaml)),
+        origin,
+        path: trigger.path,
+      });
+    } catch (error) {
+      if (data.length === 0) throw error;
+      throw new HubCommandError(
+        "HUB_TRIGGER_DEPLOY_PARTIAL",
+        `Could not deploy ${trigger.path} after ${String(data.length)} trigger${data.length === 1 ? "" : "s"} had been installed.`,
+        `${errorMessage(error)}\nInstalled before the failure:\n${data.map(({ path: installedPath }) => `- ${installedPath}`).join("\n")}`,
+      );
+    }
+  }
+  return { type: "list", data, schema: triggerResultSchema };
+}
+
+function errorMessage(error: unknown): string {
+  if (error instanceof HubCommandError) {
+    return error.details === undefined ? error.message : `${error.message}\n${error.details}`;
+  }
+  return error instanceof Error ? error.message : String(error);
+}
+
 export async function runHubDeployBundle(
   options: HubDeployOptions,
   deployInput: HubDeployBundle,
@@ -133,14 +250,17 @@ export function addHubDeployCommand(
     addHubResolutionHelp(
       hub
         .command("deploy")
-        .description("Discover, validate, and activate the canonical .paseo Hub bundle")
-        .option("-p, --project <slug>", "Target project slug")
+        .description("Deploy .paseo organization triggers or a legacy project bundle")
+        .option("-p, --project <slug>", "Deploy a legacy bundle to this project slug")
         .option("--hub <origin>", "Paseo Hub origin")
         .option("--api-key <secret>", "Organization API key")
         .option("--dry-run", "Validate without installing or activating"),
     ),
   ).action(
-    withOutput<HubDeployResult | HubDryRunResult, unknown[]>(async (...args) => {
+    withOutput<
+      HubDeployResult | HubDryRunResult | HubTriggerDeployResult | HubTriggerDryRunResult,
+      unknown[]
+    >(async (...args) => {
       const options = args.at(-2) as HubDeployOptions;
       return runHubDeploy(options, {
         cwd: dependencies.cwd(),
diff --git a/packages/cli/src/commands/hub/disconnect.ts b/packages/cli/src/commands/hub/disconnect.ts
index 867201376f..a7052d4e50 100644
--- a/packages/cli/src/commands/hub/disconnect.ts
+++ b/packages/cli/src/commands/hub/disconnect.ts
@@ -9,6 +9,7 @@ import { hubStatusResult } from "./status-output.js";
 interface HubDisconnectOptions {
   force?: boolean;
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   json?: boolean;
 }
 
@@ -21,7 +22,7 @@ export function runHubDisconnect(
   options: HubDisconnectOptions,
   dependencies: HubDisconnectDependencies,
 ) {
-  return withHubDaemon(dependencies.daemon, options.host, async (client) => {
+  return withHubDaemon(dependencies.daemon, options.daemonTarget, async (client) => {
     const current = (await client.getHubStatus()).status;
     if (current.hubOrigin !== null) {
       reportHubProgress(
diff --git a/packages/cli/src/commands/hub/hub-client/index.ts b/packages/cli/src/commands/hub/hub-client/index.ts
index ab880705d6..857a145afb 100644
--- a/packages/cli/src/commands/hub/hub-client/index.ts
+++ b/packages/cli/src/commands/hub/hub-client/index.ts
@@ -8,15 +8,17 @@ import {
   installResponseSchema,
   projectsResponseSchema,
   triggersResponseSchema,
+  triggerInstallationResponseSchema,
+  triggerValidationResponseSchema,
   validationResponseSchema,
   type CliAuthorization,
   type CliAuthorizationPoll,
   type HubInstallResult,
   type HubConfigurationResources,
-  setupResourcesSchema,
-  type HubSetupResources,
   type HubProject,
   type HubTrigger,
+  type HubTriggerInstallationResult,
+  type HubTriggerValidationResult,
   type HubValidationResult,
 } from "./internal/contracts.js";
 import { requestHub } from "./internal/transport.js";
@@ -26,9 +28,10 @@ export type {
   CliAuthorizationPoll,
   HubInstallResult,
   HubConfigurationResources,
-  HubSetupResources,
   HubProject,
   HubTrigger,
+  HubTriggerInstallationResult,
+  HubTriggerValidationResult,
   HubValidationResult,
 } from "./internal/contracts.js";
 
@@ -102,6 +105,40 @@ export class HubHttpClient {
     return response.triggers;
   }
 
+  validateTrigger(
+    origin: string,
+    apiKey: string,
+    yaml: string,
+  ): Promise<HubTriggerValidationResult> {
+    return requestHub({
+      origin,
+      path: "/api/v1/triggers/validate",
+      method: "POST",
+      apiKey,
+      body: { yaml },
+      successStatus: 200,
+      schema: triggerValidationResponseSchema,
+      failureMessage: "Hub trigger validation failed",
+    });
+  }
+
+  installTrigger(
+    origin: string,
+    apiKey: string,
+    yaml: string,
+  ): Promise<HubTriggerInstallationResult> {
+    return requestHub({
+      origin,
+      path: "/api/v1/triggers/install",
+      method: "POST",
+      apiKey,
+      body: { yaml },
+      successStatus: 201,
+      schema: triggerInstallationResponseSchema,
+      failureMessage: "Hub trigger deployment failed",
+    });
+  }
+
   listConfigurationResources(origin: string, apiKey: string): Promise<HubConfigurationResources> {
     return requestHub({
       origin,
@@ -114,18 +151,6 @@ export class HubHttpClient {
     });
   }
 
-  listSetupResources(origin: string, apiKey: string): Promise<HubSetupResources> {
-    return requestHub({
-      origin,
-      path: "/api/v1/setup-resources",
-      method: "GET",
-      apiKey,
-      successStatus: 200,
-      schema: setupResourcesSchema,
-      failureMessage: "Hub guided setup resource listing failed",
-    });
-  }
-
   installConfiguration(input: HubConfigurationInput): Promise<HubInstallResult> {
     return requestHub({
       origin: input.origin,
diff --git a/packages/cli/src/commands/hub/hub-client/internal/contracts.ts b/packages/cli/src/commands/hub/hub-client/internal/contracts.ts
index 059f66cb14..c51127bc4c 100644
--- a/packages/cli/src/commands/hub/hub-client/internal/contracts.ts
+++ b/packages/cli/src/commands/hub/hub-client/internal/contracts.ts
@@ -48,6 +48,20 @@ const triggerSchema = z
 
 export const triggersResponseSchema = z.object({ triggers: z.array(triggerSchema) }).strict();
 
+export const triggerValidationResponseSchema = z
+  .object({ name: z.string().regex(/^[a-z][a-z0-9_-]*$/u), valid: z.literal(true) })
+  .strict();
+
+export const triggerInstallationResponseSchema = z
+  .object({
+    triggerId: z.string().uuid(),
+    name: z.string().regex(/^[a-z][a-z0-9_-]*$/u),
+    revisionId: z.string().uuid(),
+    version: z.number().int().positive(),
+    active: z.literal(true),
+  })
+  .strict();
+
 export const configurationResourcesSchema = z
   .object({
     daemons: z.array(z.object({ id: z.string().uuid(), slug: z.string().min(1) }).strict()),
@@ -63,25 +77,9 @@ export const configurationResourcesSchema = z
     ),
     discord: z.array(z.object({ slug: z.string().min(1), guildName: z.string().min(1) }).strict()),
     slack: z.array(z.object({ slug: z.string().min(1), teamName: z.string().min(1) }).strict()),
-  })
-  .strict();
-
-export const setupResourcesSchema = z
-  .object({
-    github: z.array(
-      z
-        .object({
-          slug: z.string().min(1),
-          accountLogin: z.string().min(1),
-          accountType: z.string().min(1),
-          repositories: z.array(z.string().min(1)),
-        })
-        .strict(),
+    linear: z.array(
+      z.object({ slug: z.string().min(1), organizationName: z.string().min(1) }).strict(),
     ),
-    discord: z.array(
-      z.object({ guildId: z.string().min(1), guildName: z.string().min(1) }).strict(),
-    ),
-    slack: z.array(z.object({ teamId: z.string().min(1), teamName: z.string().min(1) }).strict()),
   })
   .strict();
 
@@ -106,7 +104,8 @@ export type CliAuthorization = z.infer<typeof authorizationSchema>;
 export type CliAuthorizationPoll = z.infer<typeof authorizationPollSchema>;
 export type HubProject = z.infer<typeof projectSchema>;
 export type HubTrigger = z.infer<typeof triggerSchema>;
+export type HubTriggerValidationResult = z.infer<typeof triggerValidationResponseSchema>;
+export type HubTriggerInstallationResult = z.infer<typeof triggerInstallationResponseSchema>;
 export type HubConfigurationResources = z.infer<typeof configurationResourcesSchema>;
-export type HubSetupResources = z.infer<typeof setupResourcesSchema>;
 export type HubInstallResult = z.infer<typeof installResponseSchema>;
 export type HubValidationResult = z.infer<typeof validationResponseSchema>;
diff --git a/packages/cli/src/commands/hub/index.ts b/packages/cli/src/commands/hub/index.ts
index 6bddbd1e70..650c5a0d53 100644
--- a/packages/cli/src/commands/hub/index.ts
+++ b/packages/cli/src/commands/hub/index.ts
@@ -59,7 +59,8 @@ export function createHubCommand(overrides: Partial<HubCommandEnvironment> = {})
     flow: environment.login,
     reporter: environment.reporter,
     isInteractive: environment.isInteractive,
-    continueGuidedSetup: (origin) => continueHubGuidedSetup(origin, environment),
+    continueGuidedSetup: (origin, daemonTarget) =>
+      continueHubGuidedSetup(origin, { ...environment, daemonTarget }),
   });
   addHubInitCommand(hub, environment);
   addHubConnectCommand(hub, {
@@ -71,8 +72,11 @@ export function createHubCommand(overrides: Partial<HubCommandEnvironment> = {})
   });
   addJsonAndDaemonHostOptions(hub.command("status")).action(
     withOutput(async (...args) => {
-      const options = args.at(-2) as { host?: string };
-      return withHubDaemon(environment.daemon, options.host, async (client) =>
+      const options = args.at(-2) as {
+        host?: string;
+        daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
+      };
+      return withHubDaemon(environment.daemon, options.daemonTarget, async (client) =>
         hubStatusResult((await client.getHubStatus()).status),
       );
     }),
diff --git a/packages/cli/src/commands/hub/init-flow.test.ts b/packages/cli/src/commands/hub/init-flow.test.ts
index 934c47b0f6..74653a6ddb 100644
--- a/packages/cli/src/commands/hub/init-flow.test.ts
+++ b/packages/cli/src/commands/hub/init-flow.test.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from "node:assert";
-import { mkdtemp, mkdir, readFile, rm } from "node:fs/promises";
+import { mkdtemp, mkdir, readFile, rm, symlink, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, describe, it } from "vitest";
@@ -112,7 +112,13 @@ describe("Hub guided setup continuation", () => {
           continueHubGuidedSetup(
             origin,
             setupEnvironment(cwd, credentials, daemon, prompts, [], {
-              setupResources: { github: [], slack: [], discord: [] },
+              configurationResources: {
+                daemons: [],
+                github: [],
+                slack: [],
+                discord: [],
+                linear: [],
+              },
             }),
           ),
         reporter: { progress() {} },
@@ -125,18 +131,77 @@ describe("Hub guided setup continuation", () => {
     ]);
   });
 
-  it("keeps hub init's existing replacement confirmation", async () => {
+  it("preserves an existing legacy bundle while adding the organization trigger", async () => {
     const cwd = await temporaryDirectory();
     await mkdir(path.join(cwd, ".paseo"));
-    const prompts = new PromptAnswers([false], [], []);
+    await writeFile(path.join(cwd, ".paseo", "hub.yml"), "legacy: bundle\n");
+    const credentials = new MemoryCredentials();
+    credentials.save({ origin: "https://hub.test", credential: "secret" });
+    const prompts = new PromptAnswers([], ["codex", "gpt-5", "full-access"], ["U123"]);
+
+    await runHubGuidedSetup(setupEnvironment(cwd, credentials, new SetupDaemon(), prompts, []), {
+      origin: "https://hub.test",
+      daemonId: "daemon-1",
+      deploy: false,
+    });
+
+    assert.equal(await readFile(path.join(cwd, ".paseo", "hub.yml"), "utf8"), "legacy: bundle\n");
+    assert.match(
+      await readFile(path.join(cwd, ".paseo", "triggers", "slack-help.yml"), "utf8"),
+      /name: slack-help/u,
+    );
+    assert.deepEqual(prompts.confirmations, []);
+  });
+
+  it("asks before replacing only the selected trigger file", async () => {
+    const cwd = await temporaryDirectory();
+    const triggerPath = path.join(cwd, ".paseo", "triggers", "slack-help.yml");
+    await mkdir(path.dirname(triggerPath), { recursive: true });
+    await writeFile(triggerPath, "name: keep-me\n");
+    const credentials = new MemoryCredentials();
+    credentials.save({ origin: "https://hub.test", credential: "secret" });
+    const prompts = new PromptAnswers([false], ["codex", "gpt-5", "full-access"], ["U123"]);
+    const calls: Array<{ operation: string; origin: string; files?: readonly string[] }> = [];
 
     await assert.rejects(
-      runHubGuidedSetup(
-        setupEnvironment(cwd, new MemoryCredentials(), new SetupDaemon(), prompts, []),
-      ),
-      /Existing .paseo\/ bundle left unchanged/u,
+      runHubGuidedSetup(setupEnvironment(cwd, credentials, new SetupDaemon(), prompts, calls), {
+        origin: "https://hub.test",
+        daemonId: "daemon-1",
+        deploy: true,
+      }),
+      /.paseo\/triggers\/slack-help.yml left unchanged/u,
     );
-    assert.deepEqual(prompts.confirmations, ["Replace the existing .paseo/ Hub bundle?"]);
+
+    assert.equal(await readFile(triggerPath, "utf8"), "name: keep-me\n");
+    assert.deepEqual(prompts.confirmations, [
+      "Replace the existing .paseo/triggers/slack-help.yml?",
+    ]);
+    assert.deepEqual(
+      calls.map(({ operation }) => operation),
+      ["resources", "validate-trigger"],
+    );
+  });
+
+  it("rejects a symlinked trigger directory without writing outside the project", async () => {
+    const cwd = await temporaryDirectory();
+    const outside = await temporaryDirectory();
+    await mkdir(path.join(cwd, ".paseo"));
+    await symlink(outside, path.join(cwd, ".paseo", "triggers"));
+    const credentials = new MemoryCredentials();
+    credentials.save({ origin: "https://hub.test", credential: "secret" });
+    const prompts = new PromptAnswers([], ["codex", "gpt-5", "full-access"], ["U123"]);
+
+    await assert.rejects(
+      runHubGuidedSetup(setupEnvironment(cwd, credentials, new SetupDaemon(), prompts, []), {
+        origin: "https://hub.test",
+        daemonId: "daemon-1",
+        deploy: false,
+      }),
+      (error: unknown) =>
+        error instanceof Error && "code" in error && error.code === "HUB_TRIGGER_UNSAFE_PATH",
+    );
+
+    await assert.rejects(readFile(path.join(outside, "slack-help.yml")), { code: "ENOENT" });
   });
 
   it("writes the explicitly selected Claude mode when the daemon has no default", async () => {
@@ -167,14 +232,14 @@ describe("Hub guided setup continuation", () => {
       ["Sonnet (suggested)"],
       ["Auto"],
     ]);
-    assert.match(
-      await readFile(path.join(cwd, ".paseo", "hub.yml"), "utf8"),
-      /provider: claude\n    model: sonnet\n    mode: auto/u,
-    );
+    const trigger = await readFile(path.join(cwd, ".paseo", "triggers", "slack-help.yml"), "utf8");
+    assert.match(trigger, /provider: claude\n    model: sonnet\n    mode: auto/u);
     assert.deepEqual(
       calls.slice(-2).map(({ operation }) => operation),
-      ["validate", "install"],
+      ["validate-trigger", "install-trigger"],
     );
+    assert.deepEqual(calls.at(-2)?.files, [trigger]);
+    assert.deepEqual(calls.at(-1)?.files, [trigger]);
   });
 
   it("stops before runtime discovery and file writes when no Hub app connection is usable", async () => {
@@ -187,15 +252,50 @@ describe("Hub guided setup continuation", () => {
     await assert.rejects(
       runHubGuidedSetup(
         setupEnvironment(cwd, credentials, daemon, prompts, [], {
-          setupResources: { github: [], slack: [], discord: [] },
+          configurationResources: {
+            daemons: [{ id: "daemon-1", slug: "macbook" }],
+            github: [],
+            slack: [],
+            discord: [],
+            linear: [],
+          },
         }),
         { origin: "https://hub.test", daemonId: "daemon-1", deploy: true },
       ),
-      /No Hub app connection is ready for this workflow/u,
+      /No Hub app connection is ready for this trigger/u,
     );
 
     assert.equal(daemon.snapshotCwds.length, 0);
-    await assert.rejects(readFile(path.join(cwd, ".paseo", "hub.yml")), { code: "ENOENT" });
+    await assert.rejects(readFile(path.join(cwd, ".paseo", "triggers", "slack-help.yml")), {
+      code: "ENOENT",
+    });
+  });
+
+  it("does not offer an agent runtime that cannot author the required execution mode", async () => {
+    const cwd = await temporaryDirectory();
+    const credentials = new MemoryCredentials();
+    credentials.save({ origin: "https://hub.test", credential: "secret" });
+    const daemon = new SetupDaemon([
+      {
+        provider: "pi",
+        status: "ready",
+        enabled: true,
+        models: [{ provider: "pi", id: "default", label: "Default", isDefault: true }],
+        modes: [],
+      },
+    ]);
+    const prompts = new PromptAnswers([], [], ["U123"]);
+
+    await assert.rejects(
+      runHubGuidedSetup(setupEnvironment(cwd, credentials, daemon, prompts, []), {
+        origin: "https://hub.test",
+        daemonId: "daemon-1",
+        deploy: true,
+      }),
+      /No agent runtime with an execution mode is available/u,
+    );
+
+    assert.deepEqual(prompts.selections, []);
   });
 
   it("waits for fresh-daemon provider discovery before offering runtime choices", async () => {
@@ -231,7 +331,7 @@ function setupEnvironment(
   prompts: PromptAnswers,
   calls: Array<{ operation: string; origin: string; files?: readonly string[] }>,
   options: {
-    setupResources?: Awaited<ReturnType<HubHttpClient["listSetupResources"]>>;
+    configurationResources?: Awaited<ReturnType<HubHttpClient["listConfigurationResources"]>>;
   } = {},
 ): HubGuidedSetupEnvironment {
   const hub = {
@@ -239,42 +339,37 @@ function setupEnvironment(
       calls.push({ operation: "token", origin });
       return "one-time-enrollment-token-with-enough-length";
     },
-    async listProjects(origin: string) {
-      calls.push({ operation: "projects", origin });
-      return [{ id: "a50e05af-4f20-4c8f-8dcc-58e5ea360663", slug: "studio", name: "Studio" }];
-    },
-    async listSetupResources(origin: string) {
-      calls.push({ operation: "setup", origin });
+    async listConfigurationResources(origin: string) {
+      calls.push({ operation: "resources", origin });
       return (
-        options.setupResources ?? {
+        options.configurationResources ?? {
+          daemons: [{ id: "daemon-1", slug: "macbook" }],
           github: [],
           discord: [],
-          slack: [{ teamId: "T123", teamName: "Paseo" }],
+          slack: [{ slug: "paseo", teamName: "Paseo" }],
+          linear: [],
         }
       );
     },
-    async listConfigurationResources(origin: string) {
-      calls.push({ operation: "resources", origin });
-      return { daemons: [{ id: "daemon-1", slug: "macbook" }], github: [], discord: [], slack: [] };
-    },
-    async validateConfiguration(input: { origin: string; files: readonly { path: string }[] }) {
+    async validateTrigger(origin: string, _apiKey: string, yaml: string) {
       calls.push({
-        operation: "validate",
-        origin: input.origin,
-        files: input.files.map(({ path: filePath }) => filePath),
+        operation: "validate-trigger",
+        origin,
+        files: [yaml],
       });
-      return { projectSlug: "studio", valid: true };
+      return { name: "slack-help", valid: true };
     },
-    async installConfiguration(input: { origin: string; files: readonly { path: string }[] }) {
+    async installTrigger(origin: string, _apiKey: string, yaml: string) {
       calls.push({
-        operation: "install",
-        origin: input.origin,
-        files: input.files.map(({ path: filePath }) => filePath),
+        operation: "install-trigger",
+        origin,
+        files: [yaml],
       });
       return {
-        projectSlug: "studio",
+        triggerId: "a50e05af-4f20-4c8f-8dcc-58e5ea360663",
+        name: "slack-help",
         version: 1,
-        versionId: "a50e05af-4f20-4c8f-8dcc-58e5ea360663",
+        revisionId: "2de5b143-1c88-42db-8a8d-71ca2af97830",
         active: true,
       };
     },
diff --git a/packages/cli/src/commands/hub/init-plan.test.ts b/packages/cli/src/commands/hub/init-plan.test.ts
index 44538eb3b1..2ec2f85dff 100644
--- a/packages/cli/src/commands/hub/init-plan.test.ts
+++ b/packages/cli/src/commands/hub/init-plan.test.ts
@@ -1,31 +1,13 @@
-import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
 import YAML from "yaml";
-import { afterEach, describe, expect, it } from "vitest";
-import { discoverHubBundle } from "./deploy-bundle.js";
-import { runHubDeploy } from "./deploy.js";
+import { describe, expect, it } from "vitest";
 import {
   createHubInitScaffold,
   hubLoginResumeCommand,
-  planHubInitOpening,
   resolveHubInitConnection,
-  resolveHubInitProjects,
   type HubInitProvider,
 } from "./init-plan.js";
 import { githubRepositoryFromRemote } from "./init.js";
 
-const directories: string[] = [];
-const project = (slug: string) => ({
-  id: "7e950d84-eec0-4e18-b1f9-9c115bdb31e4",
-  slug,
-  name: slug.toUpperCase(),
-});
-
-afterEach(async () => {
-  await Promise.all(directories.splice(0).map((directory) => rm(directory, { recursive: true })));
-});
-
 describe("Hub init planning", () => {
   it("prints direct resumable commands for declined login continuations", () => {
     expect(hubLoginResumeCommand("connect", "https://hub.test")).toBe(
@@ -33,36 +15,6 @@ describe("Hub init planning", () => {
     );
     expect(hubLoginResumeCommand("init", "https://hub.test")).toBe("paseo hub init");
   });
-  it("includes login only when there is no active login", () => {
-    expect(planHubInitOpening({ loggedIn: false, paseoDirectoryExists: false })).toEqual({
-      replaceExisting: false,
-      steps: ["login", "connect", "project", "scaffold"],
-    });
-    expect(planHubInitOpening({ loggedIn: true, paseoDirectoryExists: false })).toEqual({
-      replaceExisting: false,
-      steps: ["connect", "project", "scaffold"],
-    });
-  });
-
-  it("plans a confirmed replacement for an existing .paseo directory", () => {
-    expect(planHubInitOpening({ loggedIn: true, paseoDirectoryExists: true })).toEqual({
-      replaceExisting: true,
-      steps: ["connect", "project", "scaffold"],
-    });
-  });
-
-  it("stops, defaults, or asks according to the project count", () => {
-    expect(resolveHubInitProjects([])).toEqual({ kind: "none" });
-    expect(resolveHubInitProjects([project("one")])).toEqual({
-      kind: "selected",
-      project: project("one"),
-    });
-    expect(resolveHubInitProjects([project("one"), project("two")])).toEqual({
-      kind: "choose",
-      projects: [project("one"), project("two")],
-    });
-  });
-
   it("reuses a connected daemon, waits for reconnect, and rejects a different Hub", () => {
     const status = {
       state: "connected",
@@ -93,31 +45,15 @@ describe("Hub init planning", () => {
 });
 
 describe("Hub init scaffold", () => {
-  it("omits mode for a provider that explicitly exposes none", () => {
-    const scaffold = createHubInitScaffold({
-      cwd: "/workspace",
-      daemonSlug: "build-studio",
-      agent: { provider: "pi", model: "default" },
-      provider: "slack",
-      providerFilters: { workspace: "T123456", user: "U123456" },
-    });
-
-    expect(YAML.parse(scaffold.hub)).toMatchObject({
-      agents: { starter: { provider: "pi", model: "default" } },
-    });
-    expect(YAML.parse(scaffold.hub).agents.starter.mode).toBeUndefined();
-  });
-
   it.each([
-    ["github", { repo: "getpaseo/paseo", user: "boudra" }],
-    ["slack", { workspace: "T123456", user: "U123456" }],
-    ["discord", { guild: "123456789", user: "987654321" }],
+    ["github", { connection: "github-getpaseo", repo: "getpaseo/paseo", user: "boudra" }],
+    ["slack", { connection: "slack-paseo", user: "U123456" }],
+    ["discord", { connection: "discord-paseo", user: "987654321" }],
   ] satisfies readonly [HubInitProvider, Record<string, string>][])(
-    "creates a closed %s trigger that the deploy discovery path accepts",
-    async (provider, providerFilters) => {
-      const cwd = await temporaryDirectory();
+    "creates a self-contained %s organization trigger",
+    (provider, providerFilters) => {
       const scaffold = createHubInitScaffold({
-        cwd,
+        cwd: "/workspace",
         daemonSlug: "build-studio",
         agent: {
           provider: "codex",
@@ -127,48 +63,48 @@ describe("Hub init scaffold", () => {
         provider,
         providerFilters,
       });
-      await mkdir(path.join(cwd, ".paseo", "workflows"), { recursive: true });
-      await writeFile(path.join(cwd, ".paseo", "hub.yml"), scaffold.hub);
-      await writeFile(path.join(cwd, scaffold.workflowPath), scaffold.workflow);
-
-      const bundle = await discoverHubBundle({ cwd, project: "paseo" });
-      expect(bundle.workflowCount).toBe(1);
-      expect(bundle.files.map((file) => file.path)).toEqual([
-        ".paseo/hub.yml",
-        scaffold.workflowPath,
-      ]);
-      const parsed = YAML.parse(scaffold.workflow) as {
-        filters: { from_users: string[]; channels?: string[] };
+      expect(scaffold.triggerPath).toBe(`.paseo/triggers/${provider}-help.yml`);
+      const parsed = YAML.parse(scaffold.trigger) as {
+        name: string;
+        enabled: boolean;
+        max_runtime: string;
+        on: Record<string, { connection?: string; filters: Record<string, unknown> }>;
+        run: {
+          target: { daemon: string; cwd: string };
+          agent: { provider: string; model?: string; mode?: string };
+          continuation: { mode: string };
+          max_runtime: string;
+          idle_timeout: string;
+          prompt: string;
+          outputs?: Record<string, { max: number; required: boolean }>;
+        };
       };
-      expect(parsed.filters.from_users).toEqual([providerFilters.user]);
-      if (provider === "slack") expect(parsed.filters.workspace).toBe("T123456");
-      if (provider === "discord") expect(parsed.filters.guild).toBe("123456789");
-      expect(parsed.filters.channels).toBeUndefined();
-      expect(YAML.parse(scaffold.hub)).toMatchObject({
-        agents: { starter: { provider: "codex", model: "gpt-5", mode: "full-access" } },
+      expect(parsed).toMatchObject({
+        name: `${provider}-help`,
+        enabled: true,
+        max_runtime: "2h",
       });
-
-      let validatedPaths: readonly string[] = [];
-      const result = await runHubDeploy(
-        { project: "paseo", hub: "https://hub.test", dryRun: true },
-        {
-          cwd,
-          env: { PASEO_HUB_API_KEY: "test-key" },
-          reporter: { progress() {} },
-          hub: {
-            async validateConfiguration(input) {
-              validatedPaths = input.files.map((file) => file.path);
-              for (const file of input.files) YAML.parse(file.content);
-              return { projectSlug: input.projectSlug, valid: true };
-            },
-            async installConfiguration() {
-              throw new Error("dry-run must not install");
-            },
-          },
-        },
+      expect(Object.keys(parsed.on)).toEqual([
+        provider === "github" ? "github.issue_comment" : `${provider}.mention`,
+      ]);
+      const event = Object.values(parsed.on)[0]!;
+      expect(event.filters.from_users).toEqual([providerFilters.user]);
+      if (provider === "github") expect(event.connection).toBe("github-getpaseo");
+      if (provider === "slack") expect(event.connection).toBe("slack-paseo");
+      if (provider === "discord") expect(event.connection).toBe("discord-paseo");
+      expect(event.filters.channels).toBeUndefined();
+      expect(parsed.run).toMatchObject({
+        target: { daemon: "build-studio", cwd: "/workspace" },
+        agent: { provider: "codex", model: "gpt-5", mode: "full-access" },
+        continuation: { mode: "conversation" },
+        max_runtime: "90m",
+        idle_timeout: "10m",
+      });
+      expect(parsed.run.prompt).toContain("hub.finish_execution");
+      expect(parsed.run.prompt).toContain("${{ paseo.prompt }}");
+      expect(parsed.run.outputs).toEqual(
+        provider === "github" ? undefined : { [`${provider}.reply`]: { max: 1, required: true } },
       );
-      expect(result.data).toMatchObject({ projectSlug: "paseo", valid: true, workflows: 1 });
-      expect(validatedPaths).toEqual([".paseo/hub.yml", scaffold.workflowPath]);
     },
   );
 });
@@ -183,9 +119,3 @@ describe("GitHub origin detection", () => {
     expect(githubRepositoryFromRemote(remote)).toBe(expected);
   });
 });
-
-async function temporaryDirectory(): Promise<string> {
-  const directory = await mkdtemp(path.join(tmpdir(), "paseo-hub-init-"));
-  directories.push(directory);
-  return directory;
-}
diff --git a/packages/cli/src/commands/hub/init-plan.ts b/packages/cli/src/commands/hub/init-plan.ts
index e2764ccbff..bd2077300d 100644
--- a/packages/cli/src/commands/hub/init-plan.ts
+++ b/packages/cli/src/commands/hub/init-plan.ts
@@ -1,40 +1,27 @@
 import path from "node:path";
 import YAML from "yaml";
-import type { HubDeployBundle } from "./deploy-bundle.js";
-import type { HubProject } from "./hub-client/index.js";
 import type { HubStatus } from "./daemon-client.js";
 import type { HubStarterAgentRuntime } from "./starter-agent-runtime.js";
 
 export type HubInitProvider = "github" | "slack" | "discord";
 
-export type HubInitProjectResolution =
-  | { kind: "none" }
-  | { kind: "selected"; project: HubProject }
-  | { kind: "choose"; projects: readonly HubProject[] };
-
 export type HubInitConnectionResolution =
   | { kind: "connected"; daemonId: string }
   | { kind: "pending"; state: "connecting" | "reconnecting" }
   | { kind: "connect" }
   | { kind: "conflict"; origin: string };
 
-export interface HubInitOpeningPlan {
-  replaceExisting: boolean;
-  steps: readonly ("login" | "connect" | "project" | "scaffold")[];
-}
-
 export interface HubInitScaffoldInput {
   cwd: string;
   daemonSlug: string;
-  agent: HubStarterAgentRuntime;
+  agent: HubStarterAgentRuntime & { mode: string };
   provider: HubInitProvider;
   providerFilters: Readonly<Record<string, string>>;
 }
 
 export interface HubInitScaffold {
-  hub: string;
-  workflowPath: string;
-  workflow: string;
+  triggerPath: string;
+  trigger: string;
   testAction: string;
 }
 
@@ -42,36 +29,6 @@ export function hubLoginResumeCommand(step: "connect" | "init", origin: string):
   return step === "connect" ? `paseo hub connect ${origin}` : "paseo hub init";
 }
 
-export function planHubInitOpening(input: {
-  loggedIn: boolean;
-  paseoDirectoryExists: boolean;
-}): HubInitOpeningPlan {
-  return {
-    replaceExisting: input.paseoDirectoryExists,
-    steps: [...(input.loggedIn ? [] : (["login"] as const)), "connect", "project", "scaffold"],
-  };
-}
-
-export function createHubInitBundle(
-  projectSlug: string,
-  scaffold: HubInitScaffold,
-): HubDeployBundle {
-  return {
-    projectSlug,
-    workflowCount: 1,
-    files: [
-      { path: ".paseo/hub.yml", content: scaffold.hub },
-      { path: scaffold.workflowPath, content: scaffold.workflow },
-    ],
-  };
-}
-
-export function resolveHubInitProjects(projects: readonly HubProject[]): HubInitProjectResolution {
-  if (projects.length === 0) return { kind: "none" };
-  if (projects.length === 1) return { kind: "selected", project: projects[0]! };
-  return { kind: "choose", projects };
-}
-
 export function resolveHubInitConnection(
   status: HubStatus,
   origin: string,
@@ -92,31 +49,21 @@ export function resolveHubInitConnection(
 }
 
 export function createHubInitScaffold(input: HubInitScaffoldInput): HubInitScaffold {
-  const environmentName = input.daemonSlug;
-  const hub = YAML.stringify(
-    {
-      environments: {
-        [environmentName]: {
-          kind: "daemon",
-          daemon: input.daemonSlug,
-          cwd: path.resolve(input.cwd),
-        },
-      },
-      agents: {
-        starter: {
+  const provider = providerScaffold(input.provider, input.providerFilters);
+  return {
+    triggerPath: `.paseo/triggers/${input.provider}-help.yml`,
+    trigger: YAML.stringify(
+      triggerDocument({
+        ...provider,
+        target: { daemon: input.daemonSlug, cwd: path.resolve(input.cwd) },
+        agent: {
           provider: input.agent.provider,
           model: input.agent.model,
-          ...(input.agent.mode === undefined ? {} : { mode: input.agent.mode }),
+          mode: input.agent.mode,
         },
-      },
-    },
-    { lineWidth: 0 },
-  );
-  const provider = providerScaffold(input.provider, input.providerFilters, environmentName);
-  return {
-    hub,
-    workflowPath: `.paseo/workflows/${input.provider}-help.yml`,
-    workflow: YAML.stringify(provider.workflow, { lineWidth: 0 }),
+      }),
+      { lineWidth: 0 },
+    ),
     testAction: provider.testAction,
   };
 }
@@ -124,80 +71,75 @@ export function createHubInitScaffold(input: HubInitScaffoldInput): HubInitScaff
 function providerScaffold(
   provider: HubInitProvider,
   filters: Readonly<Record<string, string>>,
-  environment: string,
-): { workflow: object; testAction: string } {
+): {
+  name: string;
+  event: string;
+  connection: string;
+  filters: object;
+  reply?: "slack.reply" | "discord.reply";
+  testAction: string;
+} {
+  const connection = requireFilter(filters, "connection");
   if (provider === "github") {
     const repo = requireFilter(filters, "repo");
     const user = requireFilter(filters, "user");
     return {
-      workflow: workflow({
-        name: "github-help",
-        on: "github.issue_comment",
-        filters: { repo, contains: "@paseo", from_users: [user] },
-        environment,
-      }),
+      name: "github-help",
+      event: "github.issue_comment",
+      connection,
+      filters: { repo, contains: "@paseo", from_users: [user] },
       testAction: `Comment \`@paseo have a look\` on ${repo}.`,
     };
   }
 
   const user = requireFilter(filters, "user");
   if (provider === "slack") {
-    const workspace = requireFilter(filters, "workspace");
     return {
-      workflow: workflow({
-        name: "slack-help",
-        on: "slack.mention",
-        filters: { workspace, from_users: [user] },
-        environment,
-        reply: "slack.reply",
-      }),
+      name: "slack-help",
+      event: "slack.mention",
+      connection,
+      filters: { from_users: [user] },
+      reply: "slack.reply",
       testAction: "Mention `@Paseo have a look` in Slack.",
     };
   }
 
-  const guild = requireFilter(filters, "guild");
   return {
-    workflow: workflow({
-      name: "discord-help",
-      on: "discord.mention",
-      filters: { guild, from_users: [user] },
-      environment,
-      reply: "discord.reply",
-    }),
+    name: "discord-help",
+    event: "discord.mention",
+    connection,
+    filters: { from_users: [user] },
+    reply: "discord.reply",
     testAction: "Mention `@Paseo have a look` in Discord.",
   };
 }
 
-function workflow(input: {
+function triggerDocument(input: {
   name: string;
-  on: string;
+  event: string;
+  connection: string;
   filters: object;
-  environment: string;
+  target: { daemon: string; cwd: string };
+  agent: { provider: string; model: string; mode?: string };
   reply?: "slack.reply" | "discord.reply";
 }): object {
   const replyInstruction = input.reply === undefined ? "" : "Answer with hub.reply, then ";
   return {
     name: input.name,
-    on: input.on,
+    enabled: true,
+    on: { [input.event]: { connection: input.connection, filters: input.filters } },
     max_runtime: "2h",
-    filters: input.filters,
-    steps: [
-      {
-        id: "work",
-        environment: input.environment,
-        max_runtime: "90m",
-        idle_timeout: "10m",
-        agent: "starter",
-        prompt: [
-          {
-            text: `${replyInstruction}complete this request and call hub.finish_execution when done.\n\n<user-prompt>\n\${{ paseo.prompt }}\n</user-prompt>\n`,
-          },
-        ],
-        ...(input.reply === undefined
-          ? {}
-          : { allow_outputs: [{ type: input.reply, max: 1, required: true }] }),
-      },
-    ],
+    run: {
+      target: input.target,
+      agent: input.agent,
+      continuation: { mode: "conversation" },
+      max_runtime: "90m",
+      idle_timeout: "10m",
+      prompt: `${replyInstruction}complete this request and call hub.finish_execution when done.\n\n<user-prompt>\n\${{ paseo.prompt }}\n</user-prompt>\n`,
+      ...(input.reply === undefined
+        ? {}
+        : { outputs: { [input.reply]: { max: 1, required: true } } }),
+    },
   };
 }
 
diff --git a/packages/cli/src/commands/hub/init.ts b/packages/cli/src/commands/hub/init.ts
index c83ce12b09..acd6ef054b 100644
--- a/packages/cli/src/commands/hub/init.ts
+++ b/packages/cli/src/commands/hub/init.ts
@@ -1,3 +1,6 @@
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+import { withGlobalOptions } from "../../utils/command-options.js";
+import type { CommandOptions } from "../../output/index.js";
 import {
   cancel,
   confirm,
@@ -12,7 +15,7 @@ import {
 } from "@clack/prompts";
 import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { lstat, mkdir, rename, rm, writeFile } from "node:fs/promises";
+import { link, lstat, mkdir, rename, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { promisify } from "node:util";
 import type { Command } from "commander";
@@ -21,24 +24,14 @@ import type { HubCredentialStore } from "./credentials.js";
 import type { HubDaemonConnection } from "./daemon-client.js";
 import { withHubDaemon } from "./daemon-client.js";
 import { HubCommandError } from "./error.js";
-import type {
-  HubConfigurationResources,
-  HubHttpClient,
-  HubProject,
-  HubSetupResources,
-} from "./hub-client/index.js";
+import type { HubConfigurationResources, HubHttpClient } from "./hub-client/index.js";
 import {
-  createHubInitBundle,
   createHubInitScaffold,
   hubLoginResumeCommand,
-  planHubInitOpening,
   resolveHubInitConnection,
-  resolveHubInitProjects,
 } from "./init-plan.js";
 import type { CliLoginFlow } from "./login-flow.js";
 import { runHubConnect } from "./connect.js";
-import { runHubDeployBundle } from "./deploy.js";
-import { runHubProjects } from "./projects.js";
 import type { HubReporter } from "./reporter.js";
 import { normalizeHubOrigin } from "./origin.js";
 import {
@@ -59,6 +52,7 @@ const DAEMON_READY_POLL_MS = 250;
 const PROVIDER_READY_TIMEOUT_MS = 60_000;
 
 export interface HubGuidedSetupEnvironment {
+  daemonTarget: DaemonTarget;
   env: Readonly<Record<string, string | undefined>>;
   credentials: HubCredentialStore;
   hub: HubHttpClient;
@@ -90,22 +84,27 @@ function initErrorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-export function addHubInitCommand(parent: Command, environment: HubGuidedSetupEnvironment): void {
+export function addHubInitCommand(
+  parent: Command,
+  environment: Omit<HubGuidedSetupEnvironment, "daemonTarget">,
+): void {
   parent
     .command("init")
-    .description("Create and optionally deploy a safe starter Hub bundle")
-    .action(async () => {
-      try {
-        await runHubInit(environment);
-      } catch (error) {
-        if (error instanceof HubInitCancelledError) {
-          cancel(error.message);
-          return;
+    .description("Create and optionally deploy a safe starter Hub trigger")
+    .action(
+      withGlobalOptions(async (options: CommandOptions) => {
+        try {
+          await runHubInit({ ...environment, daemonTarget: options.daemonTarget });
+        } catch (error) {
+          if (error instanceof HubInitCancelledError) {
+            cancel(error.message);
+            return;
+          }
+          cancel(initErrorMessage(error));
+          process.exitCode = 1;
         }
-        cancel(initErrorMessage(error));
-        process.exitCode = 1;
-      }
-    });
+      }),
+    );
 }
 
 export async function runHubInit(environment: HubGuidedSetupEnvironment): Promise<void> {
@@ -121,25 +120,19 @@ export async function runHubGuidedSetup(
 
   const cwd = environment.cwd();
   const activeLogin = environment.credentials.active();
-  const opening = planHubInitOpening({
-    loggedIn: activeLogin !== null,
-    paseoDirectoryExists: await pathExists(path.join(cwd, ".paseo")),
-  });
-  if (
-    opening.replaceExisting &&
-    !(await requiredConfirm(environment, "Replace the existing .paseo/ Hub bundle?", false))
-  ) {
-    throw new HubInitCancelledError("Existing .paseo/ bundle left unchanged.");
-  }
-
   const origin = state.origin ?? (await ensureLogin(activeLogin?.origin, environment));
   const daemonId = state.daemonId ?? (await ensureDaemonConnection(origin, environment));
-  const project = await chooseProject(origin, environment);
-  const resources = await loadSetupResources(origin, environment);
+  const resources = await loadConfigurationResources(origin, environment);
   const triggerConnections = await resolveStarterTriggerConnections(resources, cwd);
   reportStarterTriggerConnections(environment, triggerConnections);
   const trigger = await chooseStarterTriggerConnection(environment, triggerConnections);
-  const daemon = await loadDaemonResource(origin, daemonId, environment);
+  const daemon = resources.daemons.find(({ id }) => id === daemonId);
+  if (daemon === undefined) {
+    throw new HubCommandError(
+      "HUB_DAEMON_RESOURCE_MISSING",
+      "The connected daemon is not available in this Hub organization. Reconnect it and try again.",
+    );
+  }
   log.success(`Connected as ${daemon.slug}`);
   const agent = await chooseStarterAgentRuntime(environment, cwd);
   const providerFilters = await collectProviderIdentity(trigger, environment);
@@ -151,48 +144,50 @@ export async function runHubGuidedSetup(
     providerFilters,
   });
 
-  const bundle = createHubInitBundle(project.slug, scaffold);
+  const credential = resolveHubCredential({
+    options: { origin },
+    env: environment.env,
+    credentials: environment.credentials,
+    origin,
+  });
 
-  await withSpinner("Validating bundle", async () => {
-    await runHubDeployBundle({ project: project.slug, hub: origin, dryRun: true }, bundle, {
-      cwd,
-      env: environment.env,
-      credentials: environment.credentials,
-      hub: environment.hub,
-      reporter: { progress() {} },
-    });
+  await withSpinner("Validating trigger", async () => {
+    await environment.hub.validateTrigger(origin, credential, scaffold.trigger);
   });
   log.success("Dry run passed");
-  await writeScaffold(cwd, scaffold, opening.replaceExisting);
-  log.success(`Created .paseo/hub.yml and ${scaffold.workflowPath}`);
+  const triggerExists = await prepareScaffoldDestination(cwd, scaffold.triggerPath);
+  if (
+    triggerExists &&
+    !(await requiredConfirm(environment, `Replace the existing ${scaffold.triggerPath}?`, false))
+  ) {
+    throw new HubInitCancelledError(`${scaffold.triggerPath} left unchanged.`);
+  }
+  await writeScaffold(cwd, scaffold, triggerExists);
+  log.success(`Created ${scaffold.triggerPath}`);
 
   const deploy = state.deploy ?? (await requiredConfirm(environment, "Deploy now?", true));
   if (deploy) {
-    await withSpinner("Deploying bundle", async () => {
-      await runHubDeployBundle({ project: project.slug, hub: origin }, bundle, {
-        cwd,
-        env: environment.env,
-        credentials: environment.credentials,
-        hub: environment.hub,
-        reporter: { progress() {} },
-      });
+    await withSpinner("Deploying trigger", async () => {
+      await environment.hub.installTrigger(origin, credential, scaffold.trigger);
     });
     log.success("Deployed");
   } else {
-    reportMessage(environment, `Skipped deployment. Run: paseo hub deploy -p ${project.slug}`);
+    reportMessage(environment, "Skipped deployment. Run `paseo hub deploy` when ready.");
   }
 
-  const activityUrl = new URL(`/projects/${project.slug}/activity`, origin).toString();
-  note(`${scaffold.testAction}\nWatch it at ${activityUrl}`, "Test your workflow");
-  outro(deploy ? "Hub is ready" : "Hub bundle is ready");
+  const triggersUrl = new URL("/triggers", origin).toString();
+  note(`${scaffold.testAction}\nManage it at ${triggersUrl}`, "Test your trigger");
+  outro(deploy ? "Hub is ready" : "Hub trigger is ready");
 }
 
 export async function continueHubGuidedSetup(
   origin: string,
   environment: HubGuidedSetupEnvironment,
 ): Promise<void> {
-  const currentStatus = await withHubDaemon(environment.daemon, undefined, async (daemon) =>
-    daemon.getHubStatus().then((response) => response.status),
+  const currentStatus = await withHubDaemon(
+    environment.daemon,
+    environment.daemonTarget,
+    async (daemon) => daemon.getHubStatus().then((response) => response.status),
   );
   const current = resolveHubInitConnection(currentStatus, origin);
   if (current.kind === "connected") {
@@ -203,7 +198,7 @@ export async function continueHubGuidedSetup(
       }.`,
     );
   } else if (current.kind === "pending") {
-    await waitForDaemonReady(origin, environment.daemon);
+    await waitForDaemonReady(origin, environment);
   } else if (current.kind === "conflict") {
     reportMessage(
       environment,
@@ -289,7 +284,7 @@ async function ensureDaemonConnection(
   confirmed = false,
   permissions: readonly string[] = ["hub.execute"],
 ): Promise<string> {
-  const status = await withHubDaemon(environment.daemon, undefined, async (daemon) =>
+  const status = await withHubDaemon(environment.daemon, environment.daemonTarget, async (daemon) =>
     daemon.getHubStatus().then((response) => response.status),
   );
   const connection = resolveHubInitConnection(status, origin);
@@ -303,7 +298,7 @@ async function ensureDaemonConnection(
     return connection.daemonId;
   }
   if (connection.kind === "pending") {
-    return waitForDaemonReady(origin, environment.daemon);
+    return waitForDaemonReady(origin, environment);
   }
   if (connection.kind === "conflict") {
     throw new HubCommandError(
@@ -319,7 +314,7 @@ async function ensureDaemonConnection(
       true,
     ))
   ) {
-    throw new HubInitCancelledError("A connected daemon is required to create the bundle.");
+    throw new HubInitCancelledError("A connected daemon is required to create the trigger.");
   }
   return connectDaemon(origin, environment, permissions);
 }
@@ -331,7 +326,7 @@ async function connectDaemon(
 ): Promise<string> {
   await runHubConnect(
     origin,
-    { permissions },
+    { permissions, daemonTarget: environment.daemonTarget },
     {
       env: environment.env,
       credentials: environment.credentials,
@@ -340,15 +335,15 @@ async function connectDaemon(
       reporter: environment.reporter,
     },
   );
-  return waitForDaemonReady(origin, environment.daemon);
+  return waitForDaemonReady(origin, environment);
 }
 
 async function waitForDaemonReady(
   origin: string,
-  connection: HubDaemonConnection,
+  environment: HubGuidedSetupEnvironment,
 ): Promise<string> {
   return withSpinner("Waiting for the daemon to connect", async (reporter) =>
-    withHubDaemon(connection, undefined, async (daemon) => {
+    withHubDaemon(environment.daemon, environment.daemonTarget, async (daemon) => {
       const deadline = Date.now() + DAEMON_READY_TIMEOUT_MS;
       while (true) {
         const status = (await daemon.getHubStatus()).status;
@@ -379,48 +374,8 @@ async function waitForDaemonReady(
   );
 }
 
-async function chooseProject(
-  origin: string,
-  environment: HubGuidedSetupEnvironment,
-): Promise<HubProject> {
-  const result = await runHubProjects(
-    { hub: origin },
-    {
-      env: environment.env,
-      credentials: environment.credentials,
-      hub: environment.hub,
-      reporter: { progress() {} },
-    },
-  );
-  const resolution = resolveHubInitProjects(result.data.projects);
-  if (resolution.kind === "none") {
-    throw new HubInitCancelledError(
-      `No Hub projects exist yet. Create one at ${new URL("/projects/new", origin).toString()}, then run paseo hub init again.`,
-    );
-  }
-  if (resolution.kind === "selected") {
-    return resolution.project;
-  }
-  const slug = await requiredSelect(environment, {
-    message: "Project",
-    options: resolution.projects.map((project) => ({
-      value: project.slug,
-      label: project.name,
-      hint: project.slug,
-    })),
-  });
-  const project = resolution.projects.find((candidate) => candidate.slug === slug);
-  if (project === undefined) {
-    throw new HubCommandError(
-      "HUB_PROJECT_SELECTION_INVALID",
-      "The selected Hub project is unavailable.",
-    );
-  }
-  return project;
-}
-
 async function resolveStarterTriggerConnections(
-  resources: HubSetupResources,
+  resources: HubConfigurationResources,
   cwd: string,
 ): Promise<HubStarterTriggerConnection[]> {
   const remote = await readCommandValue("git", ["remote", "get-url", "origin"], cwd);
@@ -428,7 +383,7 @@ async function resolveStarterTriggerConnections(
   const connections = availableStarterTriggerConnections(resources, repository);
   if (connections.length === 0) {
     throw new HubInitCancelledError(
-      "No Hub app connection is ready for this workflow.\nConnect GitHub, Slack, or Discord in Hub → Apps, then run `paseo hub init` again.",
+      "No Hub app connection is ready for this trigger.\nConnect GitHub, Slack, or Discord in Hub → Apps, then run `paseo hub init` again.",
     );
   }
   return connections;
@@ -440,10 +395,10 @@ function reportStarterTriggerConnections(
 ): void {
   const details = `${connections.map(({ label }) => label).join("\n")}\n\nOnly configured connections are shown. To add another, open Hub → Apps, then run \`paseo hub init\` again.`;
   if (environment.prompts === undefined) {
-    note(details, "Hub app connections ready for this workflow");
+    note(details, "Hub app connections ready for this trigger");
     return;
   }
-  environment.prompts.message(`Hub app connections ready for this workflow:\n${details}`);
+  environment.prompts.message(`Hub app connections ready for this trigger:\n${details}`);
 }
 
 async function chooseStarterTriggerConnection(
@@ -472,19 +427,19 @@ async function chooseStarterTriggerConnection(
 async function chooseStarterAgentRuntime(
   environment: HubGuidedSetupEnvironment,
   cwd: string,
-): Promise<HubStarterAgentRuntime> {
+): Promise<HubStarterAgentRuntime & { mode: string }> {
   const providers = await waitForStarterAgentProviders(environment, cwd);
   const provider = await chooseStarterAgentProvider(environment, providers);
   const model = await chooseStarterAgentModel(environment, provider);
   const mode = await chooseStarterAgentMode(environment, provider);
   const runtime = selectedStarterAgentRuntime(provider, model, mode);
-  if (runtime === undefined) {
+  if (runtime?.mode === undefined) {
     throw new HubCommandError(
       "HUB_AGENT_RUNTIME_SELECTION_INVALID",
       "The selected starter agent runtime is no longer available. Run paseo hub init again.",
     );
   }
-  return runtime;
+  return { ...runtime, mode: runtime.mode };
 }
 
 async function waitForStarterAgentProviders(
@@ -492,12 +447,19 @@ async function waitForStarterAgentProviders(
   cwd: string,
 ): Promise<readonly HubStarterAgentProvider[]> {
   return withSpinner("Discovering agent runtimes", async (reporter) =>
-    withHubDaemon(environment.daemon, undefined, async (daemon) => {
+    withHubDaemon(environment.daemon, environment.daemonTarget, async (daemon) => {
       const deadline = Date.now() + PROVIDER_READY_TIMEOUT_MS;
       while (true) {
         const snapshot = await daemon.getProvidersSnapshot({ cwd });
         const state = starterAgentProviderSnapshotState(snapshot.entries);
-        if (state.kind === "ready") return state.providers;
+        if (state.kind === "ready") {
+          const providers = state.providers.filter(({ modes }) => modes.length > 0);
+          if (providers.length > 0) return providers;
+          throw new HubCommandError(
+            "HUB_AGENT_RUNTIME_REQUIRED",
+            "No agent runtime with an execution mode is available from this daemon. Configure one, then run paseo hub init again.",
+          );
+        }
         if (state.kind === "unavailable") {
           throw new HubCommandError(
             "HUB_AGENT_RUNTIME_REQUIRED",
@@ -607,13 +569,13 @@ async function collectProviderIdentity(
   };
 }
 
-async function loadSetupResources(
+async function loadConfigurationResources(
   origin: string,
   environment: HubGuidedSetupEnvironment,
-): Promise<HubSetupResources> {
+): Promise<HubConfigurationResources> {
   try {
     return await withSpinner("Loading Hub connections", () =>
-      environment.hub.listSetupResources(
+      environment.hub.listConfigurationResources(
         origin,
         resolveHubCredential({
           options: { origin },
@@ -624,77 +586,51 @@ async function loadSetupResources(
       ),
     );
   } catch (error) {
-    if (error instanceof HubCommandError && error.code === "HUB_NOT_FOUND") {
+    if (
+      error instanceof HubCommandError &&
+      (error.code === "HUB_NOT_FOUND" || error.code === "HUB_INVALID_RESPONSE")
+    ) {
       throw new HubCommandError(
         "HUB_UPDATE_REQUIRED",
-        "This Hub needs an update before guided setup can use provider IDs. Update Hub and try again.",
+        "This Hub needs an update before guided setup can use organization triggers. Update Hub and try again.",
       );
     }
     throw error;
   }
 }
 
-async function loadDaemonResource(
-  origin: string,
-  daemonId: string,
-  environment: HubGuidedSetupEnvironment,
-): Promise<HubConfigurationResources["daemons"][number]> {
-  const resources = await environment.hub.listConfigurationResources(
-    origin,
-    resolveHubCredential({
-      options: { origin },
-      env: environment.env,
-      credentials: environment.credentials,
-      origin,
-    }),
-  );
-  const daemon = resources.daemons.find(({ id }) => id === daemonId);
-  if (daemon === undefined) {
-    throw new HubCommandError(
-      "HUB_DAEMON_RESOURCE_MISSING",
-      "The connected daemon is not available in this Hub organization. Reconnect it and try again.",
-    );
-  }
-  return daemon;
-}
-
 async function writeScaffold(
   cwd: string,
   scaffold: ReturnType<typeof createHubInitScaffold>,
   replaceExisting: boolean,
 ): Promise<void> {
-  const root = path.join(cwd, ".paseo");
-  const staging = path.join(cwd, `.paseo-init-${randomUUID()}`);
-  const backup = path.join(cwd, `.paseo-backup-${randomUUID()}`);
-  let movedExisting = false;
+  const destination = path.join(cwd, scaffold.triggerPath);
+  const temporary = path.join(
+    path.dirname(destination),
+    `.${path.basename(destination)}.${process.pid}.${randomUUID()}.tmp`,
+  );
   try {
-    await mkdir(path.join(staging, "workflows"), { recursive: true });
-    await writeFile(path.join(staging, "hub.yml"), scaffold.hub, { flag: "wx" });
-    await writeFile(
-      path.join(staging, "workflows", path.basename(scaffold.workflowPath)),
-      scaffold.workflow,
-      {
-        flag: "wx",
-      },
-    );
+    await writeFile(temporary, scaffold.trigger, { flag: "wx" });
     if (replaceExisting) {
-      await rename(root, backup);
-      movedExisting = true;
+      await rename(temporary, destination);
+    } else {
+      await link(temporary, destination);
+      await rm(temporary);
     }
-    await rename(staging, root);
-    if (movedExisting) await rm(backup, { recursive: true, force: true });
   } catch (error) {
-    await rm(staging, { recursive: true, force: true });
-    if (movedExisting) {
-      await rename(backup, root).catch(() => undefined);
-    }
+    await rm(temporary, { force: true });
     throw error;
   }
 }
 
-async function pathExists(target: string): Promise<boolean> {
+async function prepareScaffoldDestination(cwd: string, triggerPath: string): Promise<boolean> {
+  const root = path.resolve(cwd);
+  await requireSafeScaffoldDirectory(path.join(root, ".paseo"), ".paseo");
+  await requireSafeScaffoldDirectory(path.join(root, ".paseo", "triggers"), ".paseo/triggers");
+  const destination = path.join(root, triggerPath);
   try {
-    await lstat(target);
+    const stats = await lstat(destination);
+    if (stats.isSymbolicLink()) throw unsafeScaffoldPath(triggerPath);
     return true;
   } catch (error) {
     if (errorCode(error) === "ENOENT") return false;
@@ -702,6 +638,26 @@ async function pathExists(target: string): Promise<boolean> {
   }
 }
 
+async function requireSafeScaffoldDirectory(target: string, displayPath: string): Promise<void> {
+  try {
+    const stats = await lstat(target);
+    if (stats.isSymbolicLink()) throw unsafeScaffoldPath(displayPath);
+    if (!stats.isDirectory()) {
+      throw new HubCommandError(
+        "HUB_TRIGGER_DIRECTORY_INVALID",
+        `${displayPath} must be a directory.`,
+      );
+    }
+  } catch (error) {
+    if (errorCode(error) !== "ENOENT") throw error;
+    await mkdir(target);
+  }
+}
+
+function unsafeScaffoldPath(triggerPath: string): HubCommandError {
+  return new HubCommandError("HUB_TRIGGER_UNSAFE_PATH", `${triggerPath} must not use a symlink.`);
+}
+
 function errorCode(error: unknown): string | undefined {
   return error instanceof Error && "code" in error && typeof error.code === "string"
     ? error.code
@@ -805,7 +761,9 @@ async function requiredSelect<T extends string>(
   return answer;
 }
 
-function requireInteractiveTerminal(environment: HubGuidedSetupEnvironment): void {
+function requireInteractiveTerminal(
+  environment: Omit<HubGuidedSetupEnvironment, "daemonTarget">,
+): void {
   if (!(environment.isInteractive?.() ?? (process.stdin.isTTY && process.stdout.isTTY))) {
     throw new HubCommandError("HUB_INIT_INTERACTIVE_REQUIRED", "paseo hub init requires a TTY.");
   }
diff --git a/packages/cli/src/commands/hub/login.ts b/packages/cli/src/commands/hub/login.ts
index e77329094c..056561deb8 100644
--- a/packages/cli/src/commands/hub/login.ts
+++ b/packages/cli/src/commands/hub/login.ts
@@ -1,3 +1,5 @@
+import type { CommandOptions } from "../../output/index.js";
+import type { DaemonTarget } from "../../utils/daemon-target.js";
 import type { Command } from "commander";
 import { withOutput, type OutputSchema, type SingleResult } from "../../output/index.js";
 import { addJsonOption } from "../../utils/command-options.js";
@@ -26,12 +28,12 @@ interface HubLoginDependencies {
   flow: Pick<CliLoginFlow, "authorize">;
   reporter: HubReporter;
   isInteractive?(): boolean;
-  continueGuidedSetup?(origin: string): Promise<void>;
+  continueGuidedSetup?(origin: string, daemonTarget: DaemonTarget): Promise<void>;
 }
 
 export async function runHubLogin(
   originInput: string | undefined,
-  options: { json?: boolean },
+  options: Pick<CommandOptions, "json" | "daemonTarget">,
   dependencies: HubLoginDependencies,
 ): Promise<SingleResult<HubLoginResult>> {
   const origin = resolveHubOrigin({
@@ -48,7 +50,7 @@ export async function runHubLogin(
     dependencies.isInteractive?.() &&
     dependencies.continueGuidedSetup !== undefined
   ) {
-    await dependencies.continueGuidedSetup(origin);
+    await dependencies.continueGuidedSetup(origin, options.daemonTarget);
   }
   return { type: "single", data: { origin, status: "logged_in" }, schema };
 }
@@ -64,7 +66,7 @@ export function addHubLoginCommand(parent: Command, dependencies: HubLoginDepend
   ).action(
     withOutput(async (...args) => {
       const origin = args[0] as string | undefined;
-      const options = args.at(-2) as { json?: boolean };
+      const options = args.at(-2) as CommandOptions;
       return runHubLogin(origin, options, dependencies);
     }),
   );
diff --git a/packages/cli/src/commands/hub/logout.ts b/packages/cli/src/commands/hub/logout.ts
index 28f0837021..8fd6f2bb7c 100644
--- a/packages/cli/src/commands/hub/logout.ts
+++ b/packages/cli/src/commands/hub/logout.ts
@@ -28,6 +28,7 @@ interface HubLogoutOptions {
   disconnectDaemon?: boolean;
   force?: boolean;
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   json?: boolean;
 }
 
@@ -53,7 +54,7 @@ export async function runHubLogout(
   let daemonStatus: HubStatus | null = null;
   const shouldInspectDaemon = options.disconnectDaemon === true || mayPrompt;
   if (shouldInspectDaemon) {
-    daemonStatus = await withHubDaemon(dependencies.daemon, options.host, async (daemon) =>
+    daemonStatus = await withHubDaemon(dependencies.daemon, options.daemonTarget, async (daemon) =>
       daemon.getHubStatus().then((response) => response.status),
     );
   }
@@ -72,9 +73,13 @@ export async function runHubLogout(
     options,
     `Disconnecting this daemon from ${active.origin}`,
   );
-  const disconnect = await withHubDaemon(dependencies.daemon, options.host, async (daemon) => {
-    return daemon.disconnectHub(options.force ?? false);
-  });
+  const disconnect = await withHubDaemon(
+    dependencies.daemon,
+    options.daemonTarget,
+    async (daemon) => {
+      return daemon.disconnectHub(options.force ?? false);
+    },
+  );
   dependencies.credentials.logoutActive();
   return logoutResult({
     origin: active.origin,
diff --git a/packages/cli/src/commands/hub/permissions.ts b/packages/cli/src/commands/hub/permissions.ts
index ca9214b3e3..86f0b4c307 100644
--- a/packages/cli/src/commands/hub/permissions.ts
+++ b/packages/cli/src/commands/hub/permissions.ts
@@ -8,6 +8,7 @@ import { hubStatusResult } from "./status-output.js";
 
 interface HubPermissionsOptions {
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   json?: boolean;
 }
 
@@ -33,7 +34,7 @@ export function runHubPermissionsList(
   options: HubPermissionsOptions,
   dependencies: HubPermissionsDependencies,
 ): Promise<ListResult<PermissionRow>> {
-  return withHubDaemon(dependencies.daemon, options.host, async (client) => {
+  return withHubDaemon(dependencies.daemon, options.daemonTarget, async (client) => {
     const status = (await client.getHubStatus()).status;
     requireConnectedHub(status);
     return {
@@ -53,7 +54,7 @@ export function runHubPermissionChange(
   options: HubPermissionsOptions,
   dependencies: HubPermissionsDependencies,
 ) {
-  return withHubDaemon(dependencies.daemon, options.host, async (client) => {
+  return withHubDaemon(dependencies.daemon, options.daemonTarget, async (client) => {
     const current = (await client.getHubStatus()).status;
     requireConnectedHub(current);
     const response = await client.updateHubPermissions(
diff --git a/packages/cli/src/commands/hub/starter-trigger.test.ts b/packages/cli/src/commands/hub/starter-trigger.test.ts
index 570ea0005d..f664bc37e2 100644
--- a/packages/cli/src/commands/hub/starter-trigger.test.ts
+++ b/packages/cli/src/commands/hub/starter-trigger.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import { availableStarterTriggerConnections } from "./starter-trigger.js";
 
 describe("starter trigger connections", () => {
-  it("returns only concrete connections that can back the generated workflow", () => {
+  it("returns only concrete connections that can back the generated trigger", () => {
     expect(
       availableStarterTriggerConnections(
         {
@@ -14,8 +14,10 @@ describe("starter trigger connections", () => {
               repositories: ["getpaseo/paseo"],
             },
           ],
-          slack: [{ teamId: "T123", teamName: "Paseo" }],
-          discord: [{ guildId: "456", guildName: "Paseo Discord" }],
+          slack: [{ slug: "paseo", teamName: "Paseo" }],
+          discord: [{ slug: "paseo-discord", guildName: "Paseo Discord" }],
+          daemons: [],
+          linear: [],
         },
         "getpaseo/paseo",
       ),
@@ -24,19 +26,19 @@ describe("starter trigger connections", () => {
         id: "github:getpaseo/paseo",
         label: "GitHub — getpaseo/paseo",
         provider: "github",
-        filters: { repo: "getpaseo/paseo" },
+        filters: { connection: "github-getpaseo", repo: "getpaseo/paseo" },
       },
       {
-        id: "slack:T123",
+        id: "slack:paseo",
         label: "Slack — Paseo",
         provider: "slack",
-        filters: { workspace: "T123" },
+        filters: { connection: "paseo" },
       },
       {
-        id: "discord:456",
+        id: "discord:paseo-discord",
         label: "Discord — Paseo Discord",
         provider: "discord",
-        filters: { guild: "456" },
+        filters: { connection: "paseo-discord" },
       },
     ]);
   });
@@ -55,6 +57,8 @@ describe("starter trigger connections", () => {
           ],
           slack: [],
           discord: [],
+          daemons: [],
+          linear: [],
         },
         "getpaseo/paseo",
       ),
diff --git a/packages/cli/src/commands/hub/starter-trigger.ts b/packages/cli/src/commands/hub/starter-trigger.ts
index c327beb32a..d5ce8b51ac 100644
--- a/packages/cli/src/commands/hub/starter-trigger.ts
+++ b/packages/cli/src/commands/hub/starter-trigger.ts
@@ -1,4 +1,4 @@
-import type { HubSetupResources } from "./hub-client/index.js";
+import type { HubConfigurationResources } from "./hub-client/index.js";
 import type { HubInitProvider } from "./init-plan.js";
 
 export interface HubStarterTriggerConnection {
@@ -9,32 +9,36 @@ export interface HubStarterTriggerConnection {
 }
 
 export function availableStarterTriggerConnections(
-  resources: HubSetupResources,
+  resources: HubConfigurationResources,
   githubRepository?: string,
 ): HubStarterTriggerConnection[] {
   return [
-    ...(githubRepository !== undefined &&
-    resources.github.some(({ repositories }) => repositories.includes(githubRepository))
-      ? [
-          {
-            id: `github:${githubRepository}`,
-            label: `GitHub — ${githubRepository}`,
-            provider: "github" as const,
-            filters: { repo: githubRepository },
-          },
-        ]
-      : []),
-    ...resources.slack.map(({ teamId, teamName }) => ({
-      id: `slack:${teamId}`,
+    ...resources.github.flatMap((connection) =>
+      githubRepository !== undefined && connection.repositories.includes(githubRepository)
+        ? [
+            {
+              id: `github:${githubRepository}`,
+              label: `GitHub — ${githubRepository}`,
+              provider: "github" as const,
+              filters: {
+                connection: connection.slug,
+                repo: githubRepository,
+              },
+            },
+          ]
+        : [],
+    ),
+    ...resources.slack.map(({ slug, teamName }) => ({
+      id: `slack:${slug}`,
       label: `Slack — ${teamName}`,
       provider: "slack" as const,
-      filters: { workspace: teamId },
+      filters: { connection: slug },
     })),
-    ...resources.discord.map(({ guildId, guildName }) => ({
-      id: `discord:${guildId}`,
+    ...resources.discord.map(({ slug, guildName }) => ({
+      id: `discord:${slug}`,
       label: `Discord — ${guildName}`,
       provider: "discord" as const,
-      filters: { guild: guildId },
+      filters: { connection: slug },
     })),
   ];
 }
diff --git a/packages/cli/src/commands/onboard.ts b/packages/cli/src/commands/onboard.ts
index 1ce0ac4283..75bcee7478 100644
--- a/packages/cli/src/commands/onboard.ts
+++ b/packages/cli/src/commands/onboard.ts
@@ -1,17 +1,17 @@
-import { cancel, confirm, intro, isCancel, log, note, outro, spinner } from "@clack/prompts";
+import { addLocalDaemonOptions } from "../utils/command-options.js";
+import { cancel, confirm, intro, isCancel, log, note, outro } from "@clack/prompts";
 import { Command, Option } from "commander";
-import { writeFileSync } from "node:fs";
 import path from "node:path";
-import { loadPersistedConfig, type PersistedConfig } from "@getpaseo/server";
 import {
-  resolveLocalPaseoHome,
-  resolveLocalDaemonState,
-  resolveTcpHostFromListen,
-  startLocalDaemonDetached,
-  tailDaemonLog,
-  type DaemonStartOptions,
-} from "./daemon/local-daemon.js";
-import { tryConnectToDaemon } from "../utils/client.js";
+  readPersistedConfig as loadPersistedConfig,
+  savePersistedConfig,
+  type PersistedConfig,
+} from "@getpaseo/server/configuration";
+import { readDaemonInstance, waitForDaemonReady } from "@getpaseo/server/daemon-control";
+import { withGlobalOptions } from "../utils/command-options.js";
+import type { CommandOptions } from "../output/index.js";
+import { launchLocalDaemon, parseTimeoutMs } from "./daemon/local-daemon.js";
+import { connectToDaemon } from "../utils/client.js";
 import { formatPairingInstructions } from "../output/pairing.js";
 import {
   confirmRelayPairing,
@@ -19,7 +19,12 @@ import {
   resolveLocalPairingOffer,
 } from "./daemon/pair.js";
 
-interface OnboardOptions extends DaemonStartOptions {
+interface OnboardOptions extends CommandOptions {
+  port?: string;
+  listen?: string;
+  relay?: boolean;
+  mcp?: boolean;
+  hostnames?: string;
   timeout?: string;
   voice?: "ask" | "enable" | "disable";
 }
@@ -39,41 +44,12 @@ type OnboardPersistedConfig = PersistedConfig & {
   };
 };
 
-const DEFAULT_READY_TIMEOUT_MS = 10 * 60 * 1000;
-const READY_PROBE_TIMEOUT_MS = 1200;
-
 class OnboardCancelledError extends Error {}
-
 const plainNoteFormat = (line: string): string => line;
-
 function renderNote(message: string, title: string): void {
   note(message, title, { format: plainNoteFormat });
 }
 
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
-
-function parseTimeoutMs(raw: string | undefined): number {
-  if (!raw || raw.trim().length === 0) {
-    return DEFAULT_READY_TIMEOUT_MS;
-  }
-
-  const seconds = Number(raw);
-  if (!Number.isFinite(seconds) || seconds <= 0) {
-    throw new Error(`Invalid timeout value: ${raw}`);
-  }
-
-  return Math.ceil(seconds * 1000);
-}
-
-function savePersistedConfig(paseoHome: string, config: OnboardPersistedConfig): void {
-  const configPath = path.join(paseoHome, "config.json");
-  writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`);
-}
-
 function applyVoiceSelection(
   config: OnboardPersistedConfig,
   enabled: boolean,
@@ -135,134 +111,6 @@ async function resolveVoiceSelection(mode: OnboardOptions["voice"]): Promise<boo
   return answer;
 }
 
-interface DownloadProgress {
-  modelId: string | null;
-  pct: number | null;
-}
-
-function parseDownloadProgress(logTail: string): DownloadProgress | null {
-  const lines = logTail.split("\n").filter(Boolean);
-
-  for (let index = lines.length - 1; index >= 0; index -= 1) {
-    const line = lines[index];
-    if (!line || !line.includes("Downloading model artifact")) {
-      continue;
-    }
-
-    const pctMatch = line.match(/"pct"\s*:\s*(\d{1,3})|\bpct[=:]\s*(\d{1,3})/);
-    const modelMatch = line.match(/"modelId"\s*:\s*"([^"]+)"|\bmodelId[=:]\s*"?([^\s",}]+)/);
-
-    return {
-      modelId: modelMatch?.[1] ?? modelMatch?.[2] ?? null,
-      pct: pctMatch ? Number(pctMatch[1] ?? pctMatch[2]) : null,
-    };
-  }
-
-  return null;
-}
-
-function renderProgressLine(progress: DownloadProgress): string {
-  const modelSuffix = progress.modelId ? ` (${progress.modelId})` : "";
-  if (progress.pct === null) {
-    return `Downloading speech model${modelSuffix}...`;
-  }
-  return `Downloading speech model${modelSuffix}: ${progress.pct}%`;
-}
-
-type ProbeResult = { kind: "ready"; listen: string; host: string | null } | { kind: "pending" };
-
-async function probeDaemonReady(home: string, timeoutMs: number): Promise<ProbeResult> {
-  const state = resolveLocalDaemonState({ home });
-  const host = resolveTcpHostFromListen(state.listen);
-  const deadline = Date.now() + timeoutMs;
-  const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
-
-  if (state.running && host) {
-    const client = await tryConnectToDaemon({
-      host,
-      timeout: Math.min(remainingTimeoutMs(), READY_PROBE_TIMEOUT_MS),
-    });
-    if (client) {
-      try {
-        await client.fetchAgents({
-          timeout: Math.min(remainingTimeoutMs(), READY_PROBE_TIMEOUT_MS),
-        });
-        return { kind: "ready", listen: state.listen, host };
-      } catch {
-        // Daemon process is alive but not API-ready yet.
-      } finally {
-        await client.close().catch(() => {});
-      }
-    }
-  } else if (state.running && !host) {
-    return { kind: "ready", listen: state.listen, host: null };
-  }
-
-  return { kind: "pending" };
-}
-
-interface ProgressState {
-  lastStatus: string;
-  lastPrintedAt: number;
-}
-
-function announceProgress(
-  home: string,
-  state: ProgressState,
-  onStatus: ((message: string) => void) | undefined,
-): ProgressState {
-  const progress = parseDownloadProgress(tailDaemonLog(home, 120) ?? "");
-  const progressLine = progress ? renderProgressLine(progress) : null;
-  const statusMessage = progressLine ?? "Waiting for daemon to become ready...";
-
-  if (statusMessage !== state.lastStatus) {
-    onStatus?.(statusMessage);
-    return { lastStatus: statusMessage, lastPrintedAt: Date.now() };
-  }
-  if (!onStatus && Date.now() - state.lastPrintedAt >= 3000) {
-    console.log(statusMessage);
-    return { lastStatus: state.lastStatus, lastPrintedAt: Date.now() };
-  }
-  return state;
-}
-
-async function waitForDaemonReady(args: {
-  home: string;
-  timeoutMs: number;
-  onStatus?: (message: string) => void;
-}): Promise<{ listen: string; host: string | null }> {
-  const deadline = Date.now() + args.timeoutMs;
-  const createTimeoutError = () => {
-    const recentLogs = tailDaemonLog(args.home, 60);
-    return new Error(
-      [
-        `Timed out after ${Math.ceil(args.timeoutMs / 1000)}s waiting for daemon readiness.`,
-        recentLogs ? `Recent daemon logs:\n${recentLogs}` : null,
-      ]
-        .filter(Boolean)
-        .join("\n\n"),
-    );
-  };
-
-  async function poll(state: ProgressState): Promise<{ listen: string; host: string | null }> {
-    if (Date.now() >= deadline) {
-      throw createTimeoutError();
-    }
-    const probe = await probeDaemonReady(args.home, Math.max(1, deadline - Date.now()));
-    if (probe.kind === "ready") {
-      return { listen: probe.listen, host: probe.host };
-    }
-    const nextState = announceProgress(args.home, state, args.onStatus);
-    if (Date.now() >= deadline) {
-      throw createTimeoutError();
-    }
-    await sleep(200);
-    return poll(nextState);
-  }
-
-  return poll({ lastStatus: "", lastPrintedAt: 0 });
-}
-
 function printNextSteps(pairingUrl: string | null, paseoHome: string, richUi: boolean): void {
   const daemonLogPath = path.join(paseoHome, "daemon.log");
   const nextStepsLines = [
@@ -272,13 +120,13 @@ function printNextSteps(pairingUrl: string | null, paseoHome: string, richUi: bo
     "2. Web app: https://app.paseo.sh",
     "3. Desktop app: https://github.com/getpaseo/paseo/releases/latest",
     "4. Docs: https://paseo.sh/docs",
-    '5. Example: paseo run --output-schema schema.json "extract fields"',
+    `5. Example: paseo run --home ${JSON.stringify(paseoHome)} --output-schema schema.json "extract fields"`,
   ];
   const quickReferenceLines = [
     "1. paseo --help",
-    "2. paseo ls",
-    '3. paseo run "your prompt"',
-    "4. paseo status",
+    `2. paseo ls --home ${JSON.stringify(paseoHome)}`,
+    `3. paseo run --home ${JSON.stringify(paseoHome)} "your prompt"`,
+    `4. paseo status --home ${JSON.stringify(paseoHome)}`,
     `5. Daemon logs: ${daemonLogPath}`,
   ];
 
@@ -301,11 +149,10 @@ function printNextSteps(pairingUrl: string | null, paseoHome: string, richUi: bo
 }
 
 export function onboardCommand(): Command {
-  return new Command("onboard")
+  return addLocalDaemonOptions(new Command("onboard"))
     .description("Run first-time setup, start daemon, and print pairing instructions")
     .option("--listen <listen>", "Listen target (host:port, port, or unix socket path)")
     .option("--port <port>", "Port to listen on (default: 6767)")
-    .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
     .option("--relay", "Enable relay connection without prompting")
     .option("--no-relay", "Disable relay connection")
     .option("--no-mcp", "Disable the Agent MCP HTTP endpoint")
@@ -316,12 +163,15 @@ export function onboardCommand(): Command {
     .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
     .option("--timeout <seconds>", "Max time to wait for daemon readiness (default: 600)")
     .option("--voice <mode>", "Voice setup mode: ask, enable, disable", "ask")
-    .action(async (options: RawOnboardOptions) => {
-      await runOnboard({
-        ...options,
-        hostnames: options.hostnames ?? options.allowedHosts,
-      });
-    });
+    .action(
+      withGlobalOptions(async (options: RawOnboardOptions, command: Command) => {
+        await runOnboard({
+          ...options,
+          mcp: command.getOptionValueSource("mcp") === "cli" ? options.mcp : undefined,
+          hostnames: options.hostnames ?? options.allowedHosts,
+        });
+      }),
+    );
 }
 
 async function resolveAndPersistVoice(
@@ -354,70 +204,30 @@ async function resolveAndPersistVoice(
   return voiceEnabled;
 }
 
-async function ensureDaemonStarted(options: OnboardOptions, richUi: boolean): Promise<void> {
-  const stateBeforeStart = resolveLocalDaemonState({ home: options.home });
-  if (stateBeforeStart.running) {
-    log.message(`Daemon already running (PID ${stateBeforeStart.pidInfo?.pid ?? "unknown"}).`);
-    return;
-  }
-
-  const startSpinner = richUi ? spinner() : null;
-  try {
-    if (startSpinner) {
-      startSpinner.start("Starting daemon...");
-    } else {
-      log.message("Starting daemon...");
-    }
-    const startup = await startLocalDaemonDetached(options);
-    if (startSpinner) {
-      startSpinner.stop(`Daemon started (PID ${startup.pid ?? "unknown"})`);
-    } else {
-      log.message(`Daemon started (PID ${startup.pid ?? "unknown"})`);
-    }
-    log.message(`Logs: ${startup.logPath}`);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (startSpinner) {
-      startSpinner.error(message);
-    } else {
-      log.error(message);
-    }
-    process.exit(1);
-  }
-}
-
-async function waitForDaemonReadyWithUi(args: {
-  home: string;
-  timeoutMs: number;
-  richUi: boolean;
-}): Promise<{ listen: string; host: string | null }> {
-  const readySpinner = args.richUi ? spinner() : null;
-  try {
-    if (readySpinner) {
-      readySpinner.start("Waiting for daemon to become ready...");
-    } else {
-      log.message("Waiting for daemon to become ready...");
-    }
-    const readyState = await waitForDaemonReady({
-      home: args.home,
-      timeoutMs: args.timeoutMs,
-      onStatus: readySpinner ? (message) => readySpinner.message(message) : undefined,
-    });
-    if (readySpinner) {
-      readySpinner.stop(`Daemon ready on ${readyState.listen}`);
-    } else {
-      log.message(`Daemon ready on ${readyState.listen}`);
-    }
-    return readyState;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (readySpinner) {
-      readySpinner.error(message);
-    } else {
-      log.error(message);
-    }
-    return process.exit(1);
+function persistSetupChoices(paseoHome: string, options: OnboardOptions): void {
+  const persisted = loadPersistedConfig(paseoHome, { defaultsIfMissing: true });
+  if (options.listen || options.port) {
+    persisted.daemon = {
+      ...persisted.daemon,
+      listen: options.listen ?? `127.0.0.1:${options.port}`,
+    };
   }
+  if (options.relay !== undefined)
+    persisted.daemon = {
+      ...persisted.daemon,
+      relay: { ...persisted.daemon?.relay, enabled: options.relay },
+    };
+  if (options.mcp !== undefined)
+    persisted.daemon = {
+      ...persisted.daemon,
+      mcp: { ...persisted.daemon?.mcp, enabled: options.mcp },
+    };
+  if (options.hostnames)
+    persisted.daemon = {
+      ...persisted.daemon,
+      hostnames: options.hostnames === "true" ? true : options.hostnames.split(","),
+    };
+  savePersistedConfig(paseoHome, persisted);
 }
 
 export async function runOnboard(options: OnboardOptions): Promise<void> {
@@ -431,16 +241,12 @@ export async function runOnboard(options: OnboardOptions): Promise<void> {
     process.exit(1);
   }
 
-  let timeoutMs = DEFAULT_READY_TIMEOUT_MS;
-  try {
-    timeoutMs = parseTimeoutMs(options.timeout);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    cancel(message);
-    process.exit(1);
-  }
+  const timeoutMs = parseTimeoutMs(options.timeout);
 
-  const paseoHome = resolveLocalPaseoHome(options.home);
+  if (options.daemonTarget.kind !== "instance") throw new Error("Onboarding requires a local home");
+  const paseoHome = options.daemonTarget.home;
+  const alreadyRunning = await readDaemonInstance(paseoHome);
+  persistSetupChoices(paseoHome, options);
   if (richUi) {
     renderNote(paseoHome, "Paseo home");
   }
@@ -452,12 +258,19 @@ export async function runOnboard(options: OnboardOptions): Promise<void> {
       : "Voice features disabled. Local speech models will not be downloaded.",
   );
 
-  await ensureDaemonStarted(options, richUi);
-  await waitForDaemonReadyWithUi({
-    home: options.home ?? paseoHome,
-    timeoutMs,
-    richUi,
-  });
+  if (alreadyRunning) {
+    log.message(`Daemon already running (PID ${alreadyRunning.pid}); retaining its supervisor.`);
+    const client = await connectToDaemon({ target: options.daemonTarget, timeout: timeoutMs });
+    try {
+      log.message(JSON.stringify(await client.reloadDaemonConfig()));
+    } finally {
+      await client.close();
+    }
+  } else {
+    await launchLocalDaemon({ home: paseoHome, timeoutMs });
+  }
+  const ready = await waitForDaemonReady(paseoHome, { timeoutMs });
+  log.message(`Daemon ready on ${ready.listen}`);
 
   if (options.relay === false) {
     log.message("Relay pairing skipped because --no-relay was provided.");
diff --git a/packages/cli/src/commands/open.ts b/packages/cli/src/commands/open.ts
index c815dd36f8..512a677811 100644
--- a/packages/cli/src/commands/open.ts
+++ b/packages/cli/src/commands/open.ts
@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
-import { spawnProcess } from "@getpaseo/server";
+import { spawnProcess } from "@getpaseo/server/process";
 import { buildAgentDeepLink, type AgentDeepLinkTarget } from "@getpaseo/protocol/agent-deep-link";
 
 function findDesktopApp(): string | null {
@@ -95,6 +95,7 @@ export async function openDesktopWithProject(projectPath: string): Promise<void>
   try {
     launchDesktop([projectPath]);
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     process.stderr.write(`${message}\n`);
     process.exitCode = 1;
diff --git a/packages/cli/src/commands/permit/allow.ts b/packages/cli/src/commands/permit/allow.ts
index 15234c0d01..71bee3f73c 100644
--- a/packages/cli/src/commands/permit/allow.ts
+++ b/packages/cli/src/commands/permit/allow.ts
@@ -1,6 +1,9 @@
 import type { Command } from "commander";
-import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+} from "@getpaseo/protocol/agent-types";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
 /** Permission response item for display */
@@ -16,7 +19,7 @@ export interface PermissionResponseItem {
 export const permitResponseSchema: OutputSchema<PermissionResponseItem> = {
   idField: "requestId",
   columns: [
-    { header: "REQUEST ID", field: "requestId", width: 12 },
+    { header: "REQUEST ID", field: (item) => item.requestId.slice(0, 8), width: 12 },
     { header: "AGENT", field: "agentShortId", width: 10 },
     { header: "TOOL", field: "name", width: 20 },
     {
@@ -32,6 +35,21 @@ export const permitResponseSchema: OutputSchema<PermissionResponseItem> = {
   ],
 };
 
+/** Transform a permission the agent answered to a response item */
+export function toPermissionResponseItem(
+  agentId: string,
+  permission: AgentPermissionRequest,
+  result: "allowed" | "denied",
+): PermissionResponseItem {
+  return {
+    requestId: permission.id,
+    agentId,
+    agentShortId: agentId.slice(0, 7),
+    name: permission.name,
+    result,
+  };
+}
+
 export type PermitAllowResult = ListResult<PermissionResponseItem>;
 
 export interface PermitAllowOptions extends CommandOptions {
@@ -40,125 +58,136 @@ export interface PermitAllowOptions extends CommandOptions {
   host?: string;
 }
 
-export async function runAllowCommand(
-  agentIdOrPrefix: string,
-  reqId: string | undefined,
-  options: PermitAllowOptions,
-  _command: Command,
-): Promise<PermitAllowResult> {
-  const host = getDaemonHost({ host: options.host });
+export interface PermitClient {
+  fetchAgent(options: { agentId: string }): Promise<{
+    agent: { id: string; pendingPermissions?: AgentPermissionRequest[] };
+  } | null>;
+  respondToPermissionAndWait(
+    agentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ): Promise<unknown>;
+  close(): Promise<void>;
+}
 
-  // No validation needed - if no reqId provided, allow all by default
+export type PermitClientConnector = (
+  options: Parameters<typeof connectToDaemon>[0],
+) => Promise<PermitClient>;
 
-  // Parse input JSON if provided
-  let updatedInput: Record<string, unknown> | undefined;
-  if (options.input) {
-    try {
-      updatedInput = JSON.parse(options.input);
-    } catch (err) {
-      const error: CommandError = {
-        code: "INVALID_JSON",
-        message: `Invalid JSON for --input: ${err instanceof Error ? err.message : String(err)}`,
-        details: 'Provide valid JSON, e.g., --input \'{"key": "value"}\'',
-      };
-      throw error;
-    }
-  }
+export function createAllowCommand(connect: PermitClientConnector = connectToDaemon) {
+  return async function runAllowCommand(
+    agentIdOrPrefix: string,
+    reqId: string | undefined,
+    options: PermitAllowOptions,
+    _command: Command,
+  ): Promise<PermitAllowResult> {
+    // No validation needed - if no reqId provided, allow all by default
 
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
-
-  try {
-    const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
-    if (!fetchResult) {
-      await client.close();
-      const error: CommandError = {
-        code: "AGENT_NOT_FOUND",
-        message: `Agent not found: ${agentIdOrPrefix}`,
-        details: 'Use "paseo ls" to list available agents',
-      };
-      throw error;
-    }
-    const agent = fetchResult.agent;
-    const resolvedAgentId = agent.id;
-
-    // Get pending permissions for this agent
-    const pendingPermissions = agent.pendingPermissions || [];
-    if (pendingPermissions.length === 0) {
-      await client.close();
-      const error: CommandError = {
-        code: "NO_PENDING_PERMISSIONS",
-        message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
-      };
-      throw error;
-    }
-
-    // Determine which permissions to allow
-    let permissionsToAllow: AgentPermissionRequest[];
-    if (!reqId || options.all) {
-      // Default: allow all pending permissions if no req_id specified
-      // --all flag is kept as an explicit alias for clarity
-      permissionsToAllow = pendingPermissions;
-    } else {
-      // Find permission by ID prefix
-      const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId));
-      if (!permission) {
-        await client.close();
+    // Parse input JSON if provided
+    let updatedInput: Record<string, unknown> | undefined;
+    if (options.input) {
+      try {
+        updatedInput = JSON.parse(options.input);
+      } catch (err) {
         const error: CommandError = {
-          code: "PERMISSION_NOT_FOUND",
-          message: `Permission request not found: ${reqId}`,
-          details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          code: "INVALID_JSON",
+          message: `Invalid JSON for --input: ${err instanceof Error ? err.message : String(err)}`,
+          details: 'Provide valid JSON, e.g., --input \'{"key": "value"}\'',
         };
         throw error;
       }
-      permissionsToAllow = [permission];
     }
 
-    // Allow permissions
-    const results: PermissionResponseItem[] = await Promise.all(
-      permissionsToAllow.map(async (permission) => {
-        await client.respondToPermission(resolvedAgentId, permission.id, {
-          behavior: "allow",
-          ...(updatedInput ? { updatedInput } : {}),
-        });
-        return {
-          requestId: permission.id.slice(0, 8),
-          agentId: resolvedAgentId,
-          agentShortId: resolvedAgentId.slice(0, 7),
-          name: permission.name,
-          result: "allowed",
+    const client = await connect({ target: options.daemonTarget });
+
+    try {
+      const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
+      if (!fetchResult) {
+        await client.close();
+        const error: CommandError = {
+          code: "AGENT_NOT_FOUND",
+          message: `Agent not found: ${agentIdOrPrefix}`,
+          details: 'Use "paseo ls" to list available agents',
         };
-      }),
-    );
+        throw error;
+      }
+      const agent = fetchResult.agent;
+      const resolvedAgentId = agent.id;
 
-    await client.close();
+      // Get pending permissions for this agent
+      const pendingPermissions = agent.pendingPermissions || [];
+      if (pendingPermissions.length === 0) {
+        await client.close();
+        const error: CommandError = {
+          code: "NO_PENDING_PERMISSIONS",
+          message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
+        };
+        throw error;
+      }
 
-    return {
-      type: "list",
-      data: results,
-      schema: permitResponseSchema,
-    };
-  } catch (err) {
-    await client.close().catch(() => {});
-    // Re-throw CommandErrors
-    if (err && typeof err === "object" && "code" in err) {
-      throw err;
+      // Determine which permissions to allow
+      let permissionsToAllow: AgentPermissionRequest[];
+      if (!reqId || options.all) {
+        // Default: allow all pending permissions if no req_id specified
+        // --all flag is kept as an explicit alias for clarity
+        permissionsToAllow = pendingPermissions;
+      } else {
+        // Find permission by ID prefix
+        const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId));
+        if (!permission) {
+          await client.close();
+          const error: CommandError = {
+            code: "PERMISSION_NOT_FOUND",
+            message: `Permission request not found: ${reqId}`,
+            details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          };
+          throw error;
+        }
+        permissionsToAllow = [permission];
+      }
+
+      // Allow permissions
+      const results: PermissionResponseItem[] = await Promise.all(
+        permissionsToAllow.map(async (permission) => {
+          try {
+            await client.respondToPermissionAndWait(resolvedAgentId, permission.id, {
+              behavior: "allow",
+              ...(updatedInput ? { updatedInput } : {}),
+            });
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            const error: CommandError = {
+              code: "PERMISSION_RESPONSE_UNCONFIRMED",
+              message: `Permission response unconfirmed for request ${permission.id}: ${message}`,
+              details: 'Use "paseo permit ls" to check whether the request is still pending',
+            };
+            throw error;
+          }
+          return toPermissionResponseItem(resolvedAgentId, permission, "allowed");
+        }),
+      );
+
+      await client.close();
+
+      return {
+        type: "list",
+        data: results,
+        schema: permitResponseSchema,
+      };
+    } catch (err) {
+      await client.close().catch(() => {});
+      // Re-throw CommandErrors
+      if (err && typeof err === "object" && "code" in err) {
+        throw err;
+      }
+      const message = err instanceof Error ? err.message : String(err);
+      const error: CommandError = {
+        code: "ALLOW_PERMISSION_FAILED",
+        message: `Failed to allow permission: ${message}`,
+      };
+      throw error;
     }
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "ALLOW_PERMISSION_FAILED",
-      message: `Failed to allow permission: ${message}`,
-    };
-    throw error;
-  }
+  };
 }
+
+export const runAllowCommand = createAllowCommand();
diff --git a/packages/cli/src/commands/permit/deny.ts b/packages/cli/src/commands/permit/deny.ts
index 94ffe9d571..69a4a35a4d 100644
--- a/packages/cli/src/commands/permit/deny.ts
+++ b/packages/cli/src/commands/permit/deny.ts
@@ -1,8 +1,13 @@
 import type { Command } from "commander";
 import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, CommandError } from "../../output/index.js";
-import { permitResponseSchema, type PermissionResponseItem } from "./allow.js";
+import {
+  permitResponseSchema,
+  toPermissionResponseItem,
+  type PermissionResponseItem,
+  type PermitClientConnector,
+} from "./allow.js";
 
 export type PermitDenyResult = ListResult<PermissionResponseItem>;
 
@@ -13,117 +18,114 @@ export interface PermitDenyOptions extends CommandOptions {
   host?: string;
 }
 
-export async function runDenyCommand(
-  agentIdOrPrefix: string,
-  reqId: string | undefined,
-  options: PermitDenyOptions,
-  _command: Command,
-): Promise<PermitDenyResult> {
-  const host = getDaemonHost({ host: options.host });
-
-  // Validate arguments
-  if (!options.all && !reqId) {
-    const error: CommandError = {
-      code: "MISSING_ARGUMENT",
-      message: "Request ID is required unless --all is specified",
-      details: "Usage: paseo permit deny <agent> <req_id> or paseo permit deny <agent> --all",
-    };
-    throw error;
-  }
-
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
-
-  try {
-    const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
-    if (!fetchResult) {
-      await client.close();
+export function createDenyCommand(connect: PermitClientConnector = connectToDaemon) {
+  return async function runDenyCommand(
+    agentIdOrPrefix: string,
+    reqId: string | undefined,
+    options: PermitDenyOptions,
+    _command: Command,
+  ): Promise<PermitDenyResult> {
+    // Validate arguments
+    if (!options.all && !reqId) {
       const error: CommandError = {
-        code: "AGENT_NOT_FOUND",
-        message: `Agent not found: ${agentIdOrPrefix}`,
-        details: 'Use "paseo ls" to list available agents',
-      };
-      throw error;
-    }
-    const agent = fetchResult.agent;
-    const resolvedAgentId = agent.id;
-
-    // Get pending permissions for this agent
-    const pendingPermissions = agent.pendingPermissions || [];
-    if (pendingPermissions.length === 0) {
-      await client.close();
-      const error: CommandError = {
-        code: "NO_PENDING_PERMISSIONS",
-        message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
+        code: "MISSING_ARGUMENT",
+        message: "Request ID is required unless --all is specified",
+        details: "Usage: paseo permit deny <agent> <req_id> or paseo permit deny <agent> --all",
       };
       throw error;
     }
 
-    // Determine which permissions to deny
-    let permissionsToDeny: AgentPermissionRequest[];
-    if (options.all) {
-      permissionsToDeny = pendingPermissions;
-    } else {
-      // Find permission by ID prefix
-      const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId!));
-      if (!permission) {
+    const client = await connect({ target: options.daemonTarget });
+
+    try {
+      const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
+      if (!fetchResult) {
         await client.close();
         const error: CommandError = {
-          code: "PERMISSION_NOT_FOUND",
-          message: `Permission request not found: ${reqId}`,
-          details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          code: "AGENT_NOT_FOUND",
+          message: `Agent not found: ${agentIdOrPrefix}`,
+          details: 'Use "paseo ls" to list available agents',
         };
         throw error;
       }
-      permissionsToDeny = [permission];
-    }
+      const agent = fetchResult.agent;
+      const resolvedAgentId = agent.id;
 
-    // Deny permissions
-    const results: PermissionResponseItem[] = await Promise.all(
-      permissionsToDeny.map(async (permission) => {
-        await client.respondToPermission(resolvedAgentId, permission.id, {
-          behavior: "deny",
-          ...(options.message ? { message: options.message } : {}),
-          ...(options.interrupt ? { interrupt: true } : {}),
-        });
-        return {
-          requestId: permission.id.slice(0, 8),
-          agentId: resolvedAgentId,
-          agentShortId: resolvedAgentId.slice(0, 7),
-          name: permission.name,
-          result: "denied",
+      // Get pending permissions for this agent
+      const pendingPermissions = agent.pendingPermissions || [];
+      if (pendingPermissions.length === 0) {
+        await client.close();
+        const error: CommandError = {
+          code: "NO_PENDING_PERMISSIONS",
+          message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
         };
-      }),
-    );
+        throw error;
+      }
 
-    await client.close();
+      // Determine which permissions to deny
+      let permissionsToDeny: AgentPermissionRequest[];
+      if (options.all) {
+        permissionsToDeny = pendingPermissions;
+      } else {
+        // Find permission by ID prefix
+        const permission = pendingPermissions.find(
+          (p) => p.id === reqId || p.id.startsWith(reqId!),
+        );
+        if (!permission) {
+          await client.close();
+          const error: CommandError = {
+            code: "PERMISSION_NOT_FOUND",
+            message: `Permission request not found: ${reqId}`,
+            details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          };
+          throw error;
+        }
+        permissionsToDeny = [permission];
+      }
 
-    return {
-      type: "list",
-      data: results,
-      schema: permitResponseSchema,
-    };
-  } catch (err) {
-    await client.close().catch(() => {});
-    // Re-throw CommandErrors
-    if (err && typeof err === "object" && "code" in err) {
-      throw err;
+      // Deny permissions
+      const results: PermissionResponseItem[] = await Promise.all(
+        permissionsToDeny.map(async (permission) => {
+          try {
+            await client.respondToPermissionAndWait(resolvedAgentId, permission.id, {
+              behavior: "deny",
+              ...(options.message ? { message: options.message } : {}),
+              ...(options.interrupt ? { interrupt: true } : {}),
+            });
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            const error: CommandError = {
+              code: "PERMISSION_RESPONSE_UNCONFIRMED",
+              message: `Permission response unconfirmed for request ${permission.id}: ${message}`,
+              details: 'Use "paseo permit ls" to check whether the request is still pending',
+            };
+            throw error;
+          }
+          return toPermissionResponseItem(resolvedAgentId, permission, "denied");
+        }),
+      );
+
+      await client.close();
+
+      return {
+        type: "list",
+        data: results,
+        schema: permitResponseSchema,
+      };
+    } catch (err) {
+      await client.close().catch(() => {});
+      // Re-throw CommandErrors
+      if (err && typeof err === "object" && "code" in err) {
+        throw err;
+      }
+      const message = err instanceof Error ? err.message : String(err);
+      const error: CommandError = {
+        code: "DENY_PERMISSION_FAILED",
+        message: `Failed to deny permission: ${message}`,
+      };
+      throw error;
     }
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DENY_PERMISSION_FAILED",
-      message: `Failed to deny permission: ${message}`,
-    };
-    throw error;
-  }
+  };
 }
+
+export const runDenyCommand = createDenyCommand();
diff --git a/packages/cli/src/commands/permit/ls.ts b/packages/cli/src/commands/permit/ls.ts
index adeaa70ff1..ca4543d6cf 100644
--- a/packages/cli/src/commands/permit/ls.ts
+++ b/packages/cli/src/commands/permit/ls.ts
@@ -1,7 +1,7 @@
 import type { Command } from "commander";
 import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
 /** Permission list item for display */
@@ -18,7 +18,7 @@ export const permitLsSchema: OutputSchema<PermissionListItem> = {
   idField: "id",
   columns: [
     { header: "AGENT", field: "agentShortId", width: 12 },
-    { header: "REQ_ID", field: "id", width: 12 },
+    { header: "REQ_ID", field: (item) => item.id.slice(0, 8), width: 12 },
     { header: "TOOL", field: "name", width: 20 },
     { header: "DESCRIPTION", field: "description", width: 50 },
   ],
@@ -30,7 +30,7 @@ function toListItem(
   permission: AgentPermissionRequest,
 ): PermissionListItem {
   return {
-    id: permission.id.slice(0, 8),
+    id: permission.id,
     agentId: agent.id,
     agentShortId: agent.id.slice(0, 7),
     name: permission.name,
@@ -40,6 +40,22 @@ function toListItem(
 
 export type PermitLsResult = ListResult<PermissionListItem>;
 
+/** Collect the pending permissions of every agent */
+export function listPendingPermissions(agents: AgentSnapshotPayload[]): PermitLsResult {
+  const items: PermissionListItem[] = [];
+  for (const agent of agents) {
+    for (const permission of agent.pendingPermissions ?? []) {
+      items.push(toListItem(agent, permission));
+    }
+  }
+
+  return {
+    type: "list",
+    data: items,
+    schema: permitLsSchema,
+  };
+}
+
 export interface PermitLsOptions extends CommandOptions {
   host?: string;
 }
@@ -48,41 +64,14 @@ export async function runLsCommand(
   options: PermitLsOptions,
   _command: Command,
 ): Promise<PermitLsResult> {
-  const host = getDaemonHost({ host: options.host });
-
-  let client;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const agentsPayload = await client.fetchAgents({ filter: { includeArchived: true } });
     const agents = agentsPayload.entries.map((entry) => entry.agent);
     await client.close();
 
-    // Collect all pending permissions from all agents
-    const items: PermissionListItem[] = [];
-    for (const agent of agents) {
-      if (agent.pendingPermissions && agent.pendingPermissions.length > 0) {
-        for (const permission of agent.pendingPermissions) {
-          items.push(toListItem(agent, permission));
-        }
-      }
-    }
-
-    return {
-      type: "list",
-      data: items,
-      schema: permitLsSchema,
-    };
+    return listPendingPermissions(agents);
   } catch (err) {
     await client.close().catch(() => {});
     const message = err instanceof Error ? err.message : String(err);
diff --git a/packages/cli/src/commands/permit/permit-output.test.ts b/packages/cli/src/commands/permit/permit-output.test.ts
new file mode 100644
index 0000000000..b77989f697
--- /dev/null
+++ b/packages/cli/src/commands/permit/permit-output.test.ts
@@ -0,0 +1,45 @@
+import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
+import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
+import { describe, expect, it } from "vitest";
+import { render } from "../../output/index.js";
+import { permitResponseSchema, toPermissionResponseItem } from "./allow.js";
+import { listPendingPermissions } from "./ls.js";
+
+const agentId = "2d85f428-fdaf-4d98-906f-c583de2b805f";
+
+function permissionRequest(id: string): AgentPermissionRequest {
+  return { id, provider: "claude", name: "Write", kind: "tool" };
+}
+
+const writeRequest = permissionRequest("permission-cc93510e-a45d-4c4e-a0bf-fc2821f82783");
+const editRequest = permissionRequest("permission-654ff862-b312-4f6e-8aac-427421ff65eb");
+
+const agent = {
+  id: agentId,
+  pendingPermissions: [writeRequest, editRequest],
+} as AgentSnapshotPayload;
+
+describe("permit ls output", () => {
+  it("emits full request ids that permit allow accepts", () => {
+    const result = listPendingPermissions([agent]);
+
+    const listed = JSON.parse(render(result, { format: "json" })) as Array<{ id: string }>;
+    expect(listed.map((item) => item.id)).toEqual([writeRequest.id, editRequest.id]);
+    expect(render(result, { quiet: true }).split("\n")).toEqual([writeRequest.id, editRequest.id]);
+  });
+});
+
+describe("permit allow and deny output", () => {
+  it("emits the full id of the request that was answered", () => {
+    const result = {
+      type: "list" as const,
+      data: [toPermissionResponseItem(agentId, writeRequest, "allowed")],
+      schema: permitResponseSchema,
+    };
+
+    const answered = JSON.parse(render(result, { format: "json" })) as Array<{
+      requestId: string;
+    }>;
+    expect(answered.map((item) => item.requestId)).toEqual([writeRequest.id]);
+  });
+});
diff --git a/packages/cli/src/commands/permit/permit-response.test.ts b/packages/cli/src/commands/permit/permit-response.test.ts
new file mode 100644
index 0000000000..5328b6ecb8
--- /dev/null
+++ b/packages/cli/src/commands/permit/permit-response.test.ts
@@ -0,0 +1,177 @@
+import { setImmediate as waitForCommandContinuations } from "node:timers/promises";
+import { Command } from "commander";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+} from "@getpaseo/protocol/agent-types";
+import { describe, expect, it } from "vitest";
+import { createAllowCommand, type PermitClient } from "./allow.js";
+import { createDenyCommand } from "./deny.js";
+
+const agentId = "2d85f428-fdaf-4d98-906f-c583de2b805f";
+const requests: AgentPermissionRequest[] = [
+  {
+    id: "permission-write",
+    provider: "codex",
+    name: "CodexBash",
+    kind: "tool",
+  },
+  { id: "permission-edit", provider: "codex", name: "CodexBash", kind: "tool" },
+];
+
+class PermissionClient implements PermitClient {
+  readonly pending = [...requests];
+  readonly responses = new Map<string, AgentPermissionResponse>();
+  closed = false;
+  private notifyReceived = () => {};
+  private readonly confirmations = new Map<
+    string,
+    {
+      resolve: () => void;
+      reject: (error: Error) => void;
+    }
+  >();
+
+  async fetchAgent() {
+    return { agent: { id: agentId, pendingPermissions: this.pending } };
+  }
+
+  async respondToPermission(
+    _agentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ) {
+    this.responses.set(requestId, response);
+    this.notifyReceived();
+  }
+
+  async respondToPermissionAndWait(
+    responseAgentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ): Promise<void> {
+    const confirmation = new Promise<void>((resolve, reject) => {
+      this.confirmations.set(requestId, { resolve, reject });
+    });
+    await this.respondToPermission(responseAgentId, requestId, response);
+    await confirmation;
+  }
+
+  async close() {
+    this.closed = true;
+  }
+
+  async waitForResponses(count: number) {
+    while (this.responses.size < count) {
+      await new Promise<void>((resolve) => {
+        this.notifyReceived = resolve;
+      });
+    }
+  }
+
+  confirm(requestId: string) {
+    const confirmation = this.confirmations.get(requestId);
+    if (!confirmation) throw new Error(`No confirmation waiter: ${requestId}`);
+    this.pending.splice(
+      this.pending.findIndex((request) => request.id === requestId),
+      1,
+    );
+    confirmation.resolve();
+  }
+
+  fail(requestId: string, error: Error) {
+    const confirmation = this.confirmations.get(requestId);
+    if (!confirmation) throw new Error(`No confirmation waiter: ${requestId}`);
+    confirmation.reject(error);
+  }
+}
+
+const options = {
+  daemonTarget: { kind: "endpoint" as const, host: "test.invalid" },
+};
+const actions = [
+  { name: "allow", create: createAllowCommand, result: "allowed" },
+  { name: "deny", create: createDenyCommand, result: "denied" },
+];
+for (const action of actions) {
+  describe(`permit ${action.name}`, () => {
+    it("returns success and closes only after confirmation", async () => {
+      const client = new PermissionClient();
+      let completed = false;
+      const command = action.create(async () => client)(
+        agentId,
+        requests[0].id,
+        options,
+        new Command(),
+      );
+      void command.then(
+        () => (completed = true),
+        () => false,
+      );
+      await client.waitForResponses(1);
+      await waitForCommandContinuations();
+      expect(completed).toBe(false);
+      expect(client.closed).toBe(false);
+      expect(client.pending).toEqual(requests);
+      client.confirm(requests[0].id);
+      const result = await command;
+      expect(result.data).toEqual([
+        {
+          requestId: requests[0].id,
+          agentId,
+          agentShortId: agentId.slice(0, 7),
+          name: "CodexBash",
+          result: action.result,
+        },
+      ]);
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual([requests[1]]);
+    });
+
+    it("waits for every confirmation with --all", async () => {
+      const client = new PermissionClient();
+      let completed = false;
+      const command = action.create(async () => client)(
+        agentId,
+        undefined,
+        { ...options, all: true },
+        new Command(),
+      );
+      void command.then(
+        () => (completed = true),
+        () => false,
+      );
+      await client.waitForResponses(2);
+      client.confirm(requests[0].id);
+      // Wait beyond the first reply's promise continuations while withholding the second.
+      await waitForCommandContinuations();
+      expect(completed).toBe(false);
+      expect(client.closed).toBe(false);
+      client.confirm(requests[1].id);
+      const result = await command;
+      expect(result.data.map((item) => item.result)).toEqual([action.result, action.result]);
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual([]);
+    });
+
+    it("rejects an unconfirmed response without returning success", async () => {
+      const client = new PermissionClient();
+      const command = action.create(async () => client)(
+        agentId,
+        requests[0].id,
+        options,
+        new Command(),
+      );
+      const failure = expect(command).rejects.toMatchObject({
+        code: "PERMISSION_RESPONSE_UNCONFIRMED",
+        message: expect.stringContaining(requests[0].id),
+        details: 'Use "paseo permit ls" to check whether the request is still pending',
+      });
+      await client.waitForResponses(1);
+      client.fail(requests[0].id, new Error("Timeout waiting for message (15000ms)"));
+      await failure;
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual(requests);
+    });
+  });
+}
diff --git a/packages/cli/src/commands/plugin/index.test.ts b/packages/cli/src/commands/plugin/index.test.ts
index 11e80480f4..8ea6de9dfb 100644
--- a/packages/cli/src/commands/plugin/index.test.ts
+++ b/packages/cli/src/commands/plugin/index.test.ts
@@ -1,6 +1,33 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-const listPlugins = vi.fn(async () => []);
+const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
+
+const listPlugins = vi.fn(async () => [
+  {
+    id: "git-plugin",
+    path: "/plugins/git-plugin",
+    enabled: true,
+    status: "running" as const,
+    source: "git" as const,
+    commit: "1557a34c91e2abcdef",
+    ref: "main",
+    installation: {
+      identity: {
+        kind: "git" as const,
+        remote: "https://example.test/plugin.git",
+        pluginPath: ".",
+      },
+      currentRevision: "1557a34c91e2abcdef",
+    },
+  },
+  {
+    id: "legacy-plugin",
+    path: "/plugins/legacy-plugin",
+    enabled: true,
+    status: "failed" as const,
+    error: "This plugin was made for an older version of Paseo",
+  },
+]);
 const getPluginLogs = vi.fn(async () => [
   {
     sequence: 1,
@@ -9,23 +36,26 @@ const getPluginLogs = vi.fn(async () => [
     message: "ready",
   },
 ]);
-const installDirectoryPlugin = vi.fn(async () => ({
-  id: "trusted-plugin",
-  path: "/plugins/trusted-plugin",
-  enabled: true,
-  status: "running" as const,
-}));
 const installPluginSource = vi.fn(async () => ({
   id: "trusted-plugin",
   path: "/plugins/trusted-plugin",
   enabled: true,
   status: "running" as const,
 }));
+const installDirectoryPlugin = vi.fn(async () => ({
+  id: "legacy-plugin",
+  path: "/plugins/legacy-plugin",
+  enabled: true,
+  status: "running" as const,
+}));
+const previewPluginUpdates = vi.fn(async () => []);
 const close = vi.fn(async () => undefined);
 const features: {
   pluginManagement?: boolean;
   pluginLogs?: boolean;
   pluginGitManagement?: boolean;
+  pluginSourceInstallation?: boolean;
+  pluginSourceUpdates?: boolean;
 } = {};
 
 vi.mock("../../utils/client.js", () => ({
@@ -35,23 +65,34 @@ vi.mock("../../utils/client.js", () => ({
     getPluginLogs,
     installDirectoryPlugin,
     installPluginSource,
+    previewPluginUpdates,
     close,
   })),
 }));
 
 import { render } from "../../output/index.js";
-import { createPluginCommand, runPluginListCommand, runPluginLogsCommand } from "./index.js";
+import {
+  createPluginCommand,
+  runPluginInstallCommand,
+  runPluginUpdateCommand,
+  runPluginListCommand,
+  runPluginLogsCommand,
+} from "./index.js";
 
 describe("plugin management commands", () => {
   beforeEach(() => {
     features.pluginManagement = false;
     features.pluginLogs = false;
     features.pluginGitManagement = false;
+    features.pluginSourceInstallation = false;
+    features.pluginSourceUpdates = false;
     vi.clearAllMocks();
   });
 
   it("requires host support before attempting a management RPC", async () => {
-    await expect(runPluginListCommand({}, {} as never)).rejects.toMatchObject({
+    await expect(
+      runPluginListCommand(undefined, { daemonTarget }, {} as never),
+    ).rejects.toMatchObject({
       code: "DAEMON_UPDATE_REQUIRED",
       message: "Update the host to use plugin management.",
     });
@@ -59,8 +100,41 @@ describe("plugin management commands", () => {
     expect(close).toHaveBeenCalledTimes(1);
   });
 
+  it("keeps status as a hidden alias for the network-free plugin list", async () => {
+    features.pluginManagement = true;
+    const command = createPluginCommand();
+
+    await command.parseAsync(["status"], { from: "user" });
+
+    expect(listPlugins).toHaveBeenCalledTimes(1);
+    expect(command.helpInformation()).not.toContain("status");
+  });
+
+  it("lists runtime state and the installed commit without an upstream commit", async () => {
+    features.pluginManagement = true;
+
+    const result = await runPluginListCommand(undefined, { daemonTarget }, {} as never);
+    const output = render(result, { noColor: true });
+
+    expect(output).toContain("SOURCE");
+    expect(output).toContain("REVISION");
+    expect(output).not.toContain("LATEST");
+    expect(output).toContain("1557a34c91e2");
+    expect(output).toContain("This plugin was made for an older version of Paseo");
+  });
+
+  it("filters the shared ls and status command by plugin ID", async () => {
+    features.pluginManagement = true;
+
+    const result = await runPluginListCommand("legacy-plugin", { daemonTarget }, {} as never);
+
+    expect(result.data.map((plugin) => plugin.id)).toEqual(["legacy-plugin"]);
+  });
+
   it("requires plugin log support before attempting the RPC", async () => {
-    await expect(runPluginLogsCommand("example", {}, {} as never)).rejects.toMatchObject({
+    await expect(
+      runPluginLogsCommand("example", { daemonTarget }, {} as never),
+    ).rejects.toMatchObject({
       code: "DAEMON_UPDATE_REQUIRED",
       message: "Update the host to view plugin logs.",
     });
@@ -69,7 +143,7 @@ describe("plugin management commands", () => {
 
   it("returns readable and JSON plugin log output", async () => {
     features.pluginLogs = true;
-    const result = await runPluginLogsCommand("example", {}, {} as never);
+    const result = await runPluginLogsCommand("example", { daemonTarget }, {} as never);
 
     expect(getPluginLogs).toHaveBeenCalledWith("example");
     expect(render(result, { noColor: true })).toContain("ready");
@@ -92,36 +166,107 @@ describe("plugin management commands", () => {
   });
 
   it("prints the trust acknowledgement before installing", async () => {
-    features.pluginManagement = true;
+    features.pluginSourceInstallation = true;
     const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
     const command = createPluginCommand();
 
     await command.parseAsync(["install", "/plugins/trusted-plugin"], { from: "user" });
 
     expect(stderr).toHaveBeenCalledWith(
-      expect.stringContaining("Git build commands run unsandboxed on the daemon host"),
+      expect.stringContaining("preparation commands run unsandboxed on the daemon host"),
     );
-    expect(installDirectoryPlugin).toHaveBeenCalledWith("/plugins/trusted-plugin", undefined);
+    expect(installPluginSource).toHaveBeenCalledWith({ source: "/plugins/trusted-plugin" });
     stderr.mockRestore();
   });
 
-  it("folds the legacy --path option into the plugin source reference", async () => {
+  it("requires source support for directory installs without using the legacy RPC", async () => {
+    features.pluginManagement = true;
     features.pluginGitManagement = true;
     const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
+
+    await expect(
+      runPluginInstallCommand("/plugins/trusted-plugin", { daemonTarget }, {} as never),
+    ).rejects.toMatchObject({
+      code: "DAEMON_UPDATE_REQUIRED",
+      message: "Update the host to install plugin sources.",
+    });
+    expect(installPluginSource).not.toHaveBeenCalled();
+    expect(installDirectoryPlugin).not.toHaveBeenCalled();
+    stderr.mockRestore();
+  });
+
+  it.each([undefined, false, true])(
+    "installs with source support and Git support=%s",
+    async (gitSupport) => {
+      features.pluginSourceInstallation = true;
+      features.pluginGitManagement = gitSupport;
+      await runPluginInstallCommand("npm:@acme/review@^1.0.0", { daemonTarget }, {} as never);
+      expect(installPluginSource).toHaveBeenCalledWith({ source: "npm:@acme/review@^1.0.0" });
+      expect(close).toHaveBeenCalledTimes(1);
+    },
+  );
+
+  it.each([undefined, false])(
+    "rejects installs before an RPC when source support=%s despite Git support",
+    async (sourceSupport) => {
+      features.pluginGitManagement = true;
+      features.pluginSourceInstallation = sourceSupport;
+      await expect(
+        runPluginInstallCommand("owner/review", { daemonTarget }, {} as never),
+      ).rejects.toMatchObject({
+        code: "DAEMON_UPDATE_REQUIRED",
+        message: "Update the host to install plugin sources.",
+      });
+      expect(installPluginSource).not.toHaveBeenCalled();
+      expect(close).toHaveBeenCalledTimes(1);
+    },
+  );
+
+  it.each([undefined, false, true])(
+    "reviews updates with source install support=%s",
+    async (sourceSupport) => {
+      features.pluginSourceUpdates = true;
+      features.pluginSourceInstallation = sourceSupport;
+      await runPluginUpdateCommand("review", { daemonTarget }, {} as never);
+      expect(previewPluginUpdates).toHaveBeenCalledWith({ pluginId: "review", target: undefined });
+      expect(close).toHaveBeenCalledTimes(1);
+    },
+  );
+
+  it.each([undefined, false])(
+    "rejects reviewed updates when support=%s despite legacy Git support",
+    async (gitSupport) => {
+      features.pluginSourceInstallation = true;
+      features.pluginGitManagement = true;
+      features.pluginSourceUpdates = gitSupport;
+      await expect(
+        runPluginUpdateCommand("review", { daemonTarget }, {} as never),
+      ).rejects.toMatchObject({
+        code: "DAEMON_UPDATE_REQUIRED",
+        message: "Update the host to review plugin updates.",
+      });
+      expect(previewPluginUpdates).not.toHaveBeenCalled();
+      expect(close).toHaveBeenCalledTimes(1);
+    },
+  );
+
+  it("folds the legacy --path option into the plugin source reference", async () => {
+    features.pluginSourceInstallation = true;
+    const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
     const command = createPluginCommand();
 
-    await command.parseAsync(["install", "owner/monorepo", "--path", "plugins/review"], {
+    await command.parseAsync(["install", "git:owner/monorepo", "--path", "plugins/review"], {
       from: "user",
     });
 
     expect(installPluginSource).toHaveBeenCalledWith({
-      source: "owner/monorepo:plugins/review",
+      source: "git:owner/monorepo:plugins/review",
     });
     stderr.mockRestore();
   });
 
   it("keeps an absolute monorepo path as one plugin source reference", async () => {
-    features.pluginGitManagement = true;
+    features.pluginSourceInstallation = true;
     const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
     const command = createPluginCommand();
 
@@ -130,7 +275,113 @@ describe("plugin management commands", () => {
     expect(installPluginSource).toHaveBeenCalledWith({
       source: "/plugins/monorepo:plugins/review",
     });
-    expect(installDirectoryPlugin).not.toHaveBeenCalled();
     stderr.mockRestore();
   });
 });
+
+import { reviewPluginUpdates, type UpdateInteraction } from "./update.js";
+import type {
+  PluginUpdatePreview,
+  PluginUpdateProposal,
+  PluginUpdateResult,
+} from "@getpaseo/protocol/messages";
+function reviewFixture(answer = true, outcome: "update" | "installed-newer" = "update") {
+  const proposal: PluginUpdateProposal = {
+    id: "review",
+    expected: {
+      identity: { kind: "npm", packageName: "review", pluginPath: "." },
+      installationRoot: "/owned/one",
+      revision: "1.0.0",
+    },
+    target: {
+      kind: "npm",
+      version: "1.1.0",
+      resolved: "https://registry.npmjs.org/review.tgz",
+      integrity: "sha512-test",
+    },
+  };
+  const preview: PluginUpdatePreview = {
+    id: "review",
+    outcome,
+    links: ["https://npmjs.com/package/review/v/1.1.0"],
+    current: { identity: proposal.expected.identity, currentRevision: "1.0.0" },
+    target: proposal.target,
+    ...(outcome === "update" ? { proposal } : {}),
+  };
+  const applied: PluginUpdateProposal[][] = [];
+  const questions: string[] = [];
+  const output: string[] = [];
+  const client = {
+    previewPluginUpdates: async () => [preview],
+    applyPluginUpdates: async (
+      proposals: PluginUpdateProposal[],
+    ): Promise<PluginUpdateResult[]> => {
+      applied.push(proposals);
+      return [{ id: "review", outcome: "updated" }];
+    },
+  };
+  const interaction: UpdateInteraction = {
+    interactive: true,
+    structured: false,
+    write: (text) => {
+      output.push(text);
+    },
+    confirm: async (question) => {
+      questions.push(question);
+      return answer;
+    },
+  };
+  return { client, interaction, proposal, applied, questions, output };
+}
+describe("reviewed plugin update workflow", () => {
+  it("prints target and links, then declines without applying", async () => {
+    const f = reviewFixture(false);
+    expect(await reviewPluginUpdates(f.client, { pluginId: "review" }, f.interaction)).toEqual([
+      { id: "review", outcome: "declined" },
+    ]);
+    expect(f.output.join("")).toContain("1.0.0 → 1.1.0");
+    expect(f.output.join("")).toContain("Review: https://");
+    expect(f.questions).toEqual(["Update review? [y/N] "]);
+    expect(f.applied).toEqual([]);
+  });
+  it("applies exactly the displayed proposal after approval", async () => {
+    const f = reviewFixture();
+    await reviewPluginUpdates(f.client, { pluginId: "review" }, f.interaction);
+    expect(f.applied).toEqual([[f.proposal]]);
+  });
+  it.each([{ yes: true }, { version: "stable" }, { ref: "v1" }])(
+    "skips questions for %j",
+    async (options) => {
+      const f = reviewFixture();
+      await reviewPluginUpdates(f.client, { pluginId: "review", ...options }, f.interaction);
+      expect(f.questions).toEqual([]);
+      expect(f.applied).toEqual([[f.proposal]]);
+    },
+  );
+  it("check takes precedence over yes and explicit targets", async () => {
+    const f = reviewFixture();
+    await reviewPluginUpdates(
+      f.client,
+      { pluginId: "review", check: true, yes: true, version: "1.1.0" },
+      f.interaction,
+    );
+    expect(f.applied).toEqual([]);
+    expect(f.questions).toEqual([]);
+  });
+  it("yes never applies an ordinary downgrade", async () => {
+    const f = reviewFixture(true, "installed-newer");
+    await reviewPluginUpdates(f.client, { all: true, yes: true }, f.interaction);
+    expect(f.applied).toEqual([]);
+    expect(f.questions).toEqual([]);
+  });
+  it.each([{ interactive: false }, { structured: true }])(
+    "requires explicit approval for %j",
+    async (flags) => {
+      const f = reviewFixture();
+      await expect(
+        reviewPluginUpdates(f.client, { pluginId: "review" }, { ...f.interaction, ...flags }),
+      ).rejects.toThrow("Confirmation required");
+      expect(f.applied).toEqual([]);
+    },
+  );
+});
diff --git a/packages/cli/src/commands/plugin/index.ts b/packages/cli/src/commands/plugin/index.ts
index 016938d947..86dc5889b8 100644
--- a/packages/cli/src/commands/plugin/index.ts
+++ b/packages/cli/src/commands/plugin/index.ts
@@ -1,14 +1,13 @@
-import { Command } from "commander";
 import path from "node:path";
-import type {
-  PluginListItem,
-  PluginLogEntry,
-  PluginSourceStatusItem,
-  PluginSourceUpdateItem,
-} from "@getpaseo/protocol/messages";
+import { expandUserPath } from "../../classify.js";
+import { createInterface } from "node:readline/promises";
+import { reviewPluginUpdates, type UpdateOutcome } from "./update.js";
+import { Command } from "commander";
+import type { PluginListItem, PluginLogEntry } from "@getpaseo/protocol/messages";
 import {
   formatPluginSourceReference,
   parsePluginSourceReference,
+  formatPluginIdentity,
 } from "@getpaseo/protocol/plugin-source-reference";
 import type { CommandOptions, ListResult, OutputSchema, SingleResult } from "../../output/index.js";
 import { withOutput } from "../../output/index.js";
@@ -16,6 +15,7 @@ import { addJsonAndDaemonHostOptions, addJsonOption } from "../../utils/command-
 import { scaffoldPluginDirectory, type PluginScaffold } from "./scaffold.js";
 import {
   withPluginLogsClient,
+  withPluginUpdateClient,
   withPluginManagementClient,
   withPluginSourceClient,
 } from "./shared.js";
@@ -26,6 +26,9 @@ interface PluginOptions extends CommandOptions {
   ref?: string;
   path?: string;
   all?: boolean;
+  version?: string;
+  check?: boolean;
+  yes?: boolean;
 }
 
 const pluginSchema: OutputSchema<PluginListItem> = {
@@ -34,6 +37,17 @@ const pluginSchema: OutputSchema<PluginListItem> = {
     { header: "PLUGIN", field: "id", width: 20 },
     { header: "STATUS", field: "status", width: 10 },
     { header: "ENABLED", field: (plugin) => (plugin.enabled ? "yes" : "no"), width: 8 },
+    {
+      header: "SOURCE",
+      field: (plugin) =>
+        plugin.installation ? formatPluginIdentity(plugin.installation.identity) : "-",
+      width: 40,
+    },
+    {
+      header: "REVISION",
+      field: (plugin) => plugin.installation?.currentRevision ?? "-",
+      width: 16,
+    },
     { header: "DIRECTORY", field: "path", width: 40 },
     { header: "ERROR", field: (plugin) => plugin.error ?? "", width: 40 },
   ],
@@ -56,30 +70,17 @@ const pluginLogsSchema: OutputSchema<PluginLogEntry> = {
   ],
 };
 
-function shortCommit(commit: string | undefined): string {
-  return commit?.slice(0, 12) ?? "-";
-}
-
-const pluginStatusSchema: OutputSchema<PluginSourceStatusItem> = {
+const pluginUpdateSchema: OutputSchema<UpdateOutcome> = {
   idField: "id",
   columns: [
-    { header: "PLUGIN", field: "id", width: 20 },
-    { header: "SOURCE", field: "source", width: 10 },
-    { header: "CURRENT", field: (plugin) => shortCommit(plugin.currentCommit), width: 14 },
-    { header: "LATEST", field: (plugin) => shortCommit(plugin.latestCommit), width: 14 },
-    { header: "COMMITS", field: (plugin) => String(plugin.commitsBehind ?? 0), width: 8 },
-    { header: "REF", field: (plugin) => plugin.ref ?? "-", width: 24 },
-  ],
-};
-
-const pluginUpdateSchema: OutputSchema<PluginSourceUpdateItem> = {
-  idField: "id",
-  columns: [
-    { header: "PLUGIN", field: "id", width: 20 },
-    { header: "PREVIOUS", field: (plugin) => shortCommit(plugin.previousCommit), width: 14 },
-    { header: "CURRENT", field: (plugin) => shortCommit(plugin.currentCommit), width: 14 },
-    { header: "COMMITS", field: (plugin) => String(plugin.commits), width: 8 },
-    { header: "UPDATED", field: (plugin) => (plugin.updated ? "yes" : "no"), width: 8 },
+    { header: "PLUGIN", field: "id", width: 24 },
+    { header: "RESULT", field: "outcome", width: 18 },
+    {
+      header: "DETAIL",
+      field: (item) =>
+        item.error ?? item.warning ?? item.plugin?.installation?.currentRevision ?? "",
+      width: 50,
+    },
   ],
 };
 
@@ -96,10 +97,15 @@ export async function runPluginInitCommand(
 }
 
 export async function runPluginListCommand(
+  pluginId: string | undefined,
   options: PluginOptions,
   _command: Command,
 ): Promise<ListResult<PluginListItem>> {
-  const data = await withPluginManagementClient(options.host, (client) => client.listPlugins());
+  const plugins = await withPluginManagementClient(options.daemonTarget, (client) =>
+    client.listPlugins(),
+  );
+  const data = pluginId ? plugins.filter((plugin) => plugin.id === pluginId) : plugins;
+  if (pluginId && data.length === 0) throw new Error(`Plugin is not configured: ${pluginId}`);
   return { type: "list", data, schema: pluginSchema };
 }
 
@@ -108,66 +114,71 @@ export async function runPluginLogsCommand(
   options: PluginOptions,
   _command: Command,
 ): Promise<ListResult<PluginLogEntry>> {
-  const data = await withPluginLogsClient(options.host, (client) => client.getPluginLogs(pluginId));
+  const data = await withPluginLogsClient(options.daemonTarget, (client) =>
+    client.getPluginLogs(pluginId),
+  );
   return { type: "list", data, schema: pluginLogsSchema };
 }
 
-async function install(
+export async function runPluginInstallCommand(
   source: string,
   options: PluginOptions,
   _command: Command,
 ): Promise<SingleResult<PluginListItem>> {
   process.stderr.write(
-    "Trusting plugin code: server code and Git build commands run unsandboxed on the daemon host; client code runs inside Paseo. Dependencies and future updates are part of the codebase you trust.\n",
+    "Trusting plugin code: server code and preparation commands run unsandboxed on the daemon host; client code runs inside Paseo. Dependencies and future updates are part of the codebase you trust.\n",
+  );
+  const reference = parsePluginSourceReference(source);
+  let resolvedSource = source;
+  if (reference.kind === "directory") {
+    const directory = expandUserPath(reference.source);
+    // An absolute path can target a daemon on a different operating system.
+    const absoluteDirectory =
+      path.posix.isAbsolute(directory) || path.win32.isAbsolute(directory)
+        ? directory
+        : path.resolve(directory);
+    resolvedSource = formatPluginSourceReference(absoluteDirectory, reference.pluginPath);
+  }
+  const sourceReference = formatPluginSourceReference(resolvedSource, options.path);
+  const data = await withPluginSourceClient(options.daemonTarget, (client) =>
+    client.installPluginSource({
+      source: sourceReference,
+      ...(options.id ? { id: options.id } : {}),
+      ...(options.ref ? { ref: options.ref } : {}),
+    }),
   );
-  const isExplicitPath =
-    path.isAbsolute(source) ||
-    source === "." ||
-    source === ".." ||
-    source.startsWith("./") ||
-    source.startsWith("../") ||
-    source.startsWith(".\\") ||
-    source.startsWith("..\\");
-  const hasPluginPathSuffix = parsePluginSourceReference(source).pluginPath !== undefined;
-  const canUseLegacyDirectoryInstall =
-    isExplicitPath && !hasPluginPathSuffix && !options.ref && !options.path;
-  const sourceReference = formatPluginSourceReference(source, options.path);
-  const data = canUseLegacyDirectoryInstall
-    ? await withPluginManagementClient(options.host, (client) =>
-        client.installDirectoryPlugin(source, options.id),
-      )
-    : await withPluginSourceClient(options.host, (client) =>
-        client.installPluginSource({
-          source: sourceReference,
-          ...(options.id ? { id: options.id } : {}),
-          ...(options.ref ? { ref: options.ref } : {}),
-        }),
-      );
   return { type: "single", data, schema: pluginSchema };
 }
 
-async function status(
+export async function runPluginUpdateCommand(
   pluginId: string | undefined,
   options: PluginOptions,
   _command: Command,
-): Promise<ListResult<PluginSourceStatusItem>> {
-  const data = await withPluginSourceClient(options.host, (client) =>
-    client.getPluginSourceStatus(pluginId),
-  );
-  return { type: "list", data, schema: pluginStatusSchema };
-}
-
-async function update(
-  pluginId: string | undefined,
-  options: PluginOptions,
-  _command: Command,
-): Promise<ListResult<PluginSourceUpdateItem>> {
-  if ((pluginId === undefined) === (options.all !== true)) {
-    throw new Error("Choose one plugin ID or pass --all");
-  }
-  const data = await withPluginSourceClient(options.host, (client) =>
-    client.updatePluginSources(pluginId),
+): Promise<ListResult<UpdateOutcome>> {
+  const data = await withPluginUpdateClient(options.daemonTarget, (client) =>
+    reviewPluginUpdates(
+      client,
+      { ...options, pluginId },
+      {
+        interactive: process.stdin.isTTY === true,
+        structured:
+          options.json === true ||
+          ["json", "yaml"].includes(options.format?.trim().toLowerCase() ?? ""),
+        write: (text) => process.stderr.write(text),
+        confirm: async (message) => {
+          const prompt = createInterface({ input: process.stdin, output: process.stderr });
+          try {
+            return /^(y|yes)$/i.test((await prompt.question(message)).trim());
+          } catch {
+            return false;
+          } finally {
+            prompt.close();
+          }
+        },
+      },
+    ),
   );
+  if (data.some((item) => item.outcome === "error")) process.exitCode = 1;
   return { type: "list", data, schema: pluginUpdateSchema };
 }
 
@@ -176,7 +187,7 @@ async function act(
   pluginId: string,
   options: PluginOptions,
 ): Promise<SingleResult<PluginListItem>> {
-  const data = await withPluginManagementClient(options.host, (client) =>
+  const data = await withPluginManagementClient(options.daemonTarget, (client) =>
     client[`${action}Plugin`](pluginId),
   );
   return { type: "single", data, schema: pluginSchema };
@@ -187,7 +198,7 @@ async function remove(
   options: PluginOptions,
   _command: Command,
 ): Promise<SingleResult<PluginListItem>> {
-  const data = await withPluginManagementClient(options.host, async (client) => {
+  const data = await withPluginManagementClient(options.daemonTarget, async (client) => {
     const current = (await client.listPlugins()).find((plugin) => plugin.id === pluginId);
     if (!current) throw new Error(`Plugin is not configured: ${pluginId}`);
     await client.removePlugin(pluginId);
@@ -205,7 +216,10 @@ export function createPluginCommand(): Command {
       .argument("<directory>")
       .option("--id <id>", "Manifest plugin ID (defaults to the directory name)"),
   ).action(withOutput(runPluginInitCommand));
-  addJsonAndDaemonHostOptions(plugin.command("ls").description("List configured plugins")).action(
+  addJsonAndDaemonHostOptions(
+    plugin.command("ls").description("List configured plugins").argument("[id]"),
+  ).action(withOutput(runPluginListCommand));
+  addJsonAndDaemonHostOptions(plugin.command("status", { hidden: true }).argument("[id]")).action(
     withOutput(runPluginListCommand),
   );
   addJsonAndDaemonHostOptions(
@@ -215,22 +229,28 @@ export function createPluginCommand(): Command {
     plugin
       .command("install")
       .alias("add")
-      .description("Trust and install a plugin from a directory or Git repository")
-      .argument("<source>", "Host directory, Git source, or Git source:plugin/path")
+      .description(
+        "Trust and install a plugin from a registry, directory, Git repository, or npm package",
+      )
+      .argument(
+        "<source>",
+        "Registry owner/slug or host/owner/slug, host directory, explicit git:owner/repo or Git URL, or npm: source",
+      )
       .option("--id <id>", "Runtime plugin ID (defaults to paseo-plugin.json id)")
       .option("--ref <ref>", "Git branch, tag, or commit")
       .option("--path <path>", "Legacy form of the :plugin/path source suffix"),
-  ).action(withOutput(install));
-  addJsonAndDaemonHostOptions(
-    plugin.command("status").description("Check plugin source updates").argument("[id]"),
-  ).action(withOutput(status));
+  ).action(withOutput(runPluginInstallCommand));
   addJsonAndDaemonHostOptions(
     plugin
       .command("update")
-      .description("Update a Git-managed plugin")
+      .description("Review and update installed plugins")
       .argument("[id]")
-      .option("--all", "Update every Git-managed plugin"),
-  ).action(withOutput(update));
+      .option("--all", "Review all configured plugins")
+      .option("--check", "Show available updates without installing")
+      .option("--yes", "Apply displayed updates without asking")
+      .option("--ref <ref>", "Apply a Git branch, tag, or commit without asking")
+      .option("--version <version>", "Apply an npm version, tag, or range without asking"),
+  ).action(withOutput(runPluginUpdateCommand));
   for (const action of ["reload", "enable", "disable"] as const) {
     addJsonAndDaemonHostOptions(
       plugin.command(action).description(`${action} a plugin`).argument("<id>"),
diff --git a/packages/cli/src/commands/plugin/scaffold.test.ts b/packages/cli/src/commands/plugin/scaffold.test.ts
index 79db0e2878..a3350ecb8c 100644
--- a/packages/cli/src/commands/plugin/scaffold.test.ts
+++ b/packages/cli/src/commands/plugin/scaffold.test.ts
@@ -1,4 +1,4 @@
-import { execFile } from "node:child_process";
+import { exec, execFile } from "node:child_process";
 import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -9,6 +9,7 @@ import { scaffoldPluginDirectory } from "./scaffold.js";
 
 const directories: string[] = [];
 const execFileAsync = promisify(execFile);
+const execAsync = promisify(exec);
 const tscPath = createRequire(import.meta.url).resolve("typescript/bin/tsc");
 
 async function typecheckPlugin(directory: string): Promise<void> {
@@ -28,6 +29,47 @@ afterEach(async () => {
 });
 
 describe("plugin scaffold", () => {
+  it("creates an author overview beside the manifest", async () => {
+    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
+    directories.push(parent);
+    const directory = path.join(parent, "hello-plugin");
+    await scaffoldPluginDirectory(directory);
+
+    const overview = await readFile(path.join(directory, "OVERVIEW.md"), "utf8");
+    const comments = overview.match(/<!--[\s\S]*?-->/g) ?? [];
+    expect(comments).toHaveLength(1);
+    expect(overview.replace(/<!--[\s\S]*?-->/g, "").trim()).toBe("");
+    expect(overview).toContain("required to list");
+    expect(overview).toContain("README");
+    expect(overview).toContain("choosing a plugin in Paseo");
+    expect(overview).toContain("Length follows complexity");
+    expect(overview).toContain("1. Describe what your plugin is and does");
+    expect(overview).toContain("2. Explain how it works only when it is not obvious");
+    expect(overview).toContain("3. Explain setup when needed");
+    expect(overview).toContain("4. Explain capabilities and settings");
+    expect(overview).toContain("permissions");
+    expect(overview).toContain("known limits");
+    expect(overview).not.toContain("This plugin entry was imported");
+    const packageJson = JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"));
+    expect(packageJson.files).toContain("OVERVIEW.md");
+    expect(await readdir(directory)).toContain("paseo-plugin.json");
+  });
+
+  it("includes the author overview in the packed npm artifact", async () => {
+    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
+    directories.push(parent);
+    const directory = path.join(parent, "packed-plugin");
+    await scaffoldPluginDirectory(directory);
+
+    const { stdout } = await execAsync("npm pack --dry-run --ignore-scripts --json", {
+      cwd: directory,
+    });
+    const [artifact] = JSON.parse(stdout) as { files: { path: string }[] }[];
+    expect(artifact.files.map((file) => file.path)).toEqual(
+      expect.arrayContaining(["OVERVIEW.md", "paseo-plugin.json"]),
+    );
+  });
+
   it(
     "creates a standalone split-runtime project that typechecks",
     { timeout: 15_000 },
@@ -45,18 +87,32 @@ describe("plugin scaffold", () => {
       expect(config.compilerOptions.lib).toEqual(["ES2023"]);
       expect(config.compilerOptions.types).toEqual(["react"]);
       await expect(typecheckPlugin(directory)).resolves.toBeUndefined();
-      expect(JSON.parse(await readFile(path.join(directory, "paseo-plugin.json"), "utf8"))).toEqual(
-        {
-          id: "hello-plugin",
-        },
-      );
       const cliPackageJson = JSON.parse(
         await readFile(new URL("../../../package.json", import.meta.url), "utf8"),
       ) as { version: string };
+      expect(JSON.parse(await readFile(path.join(directory, "paseo-plugin.json"), "utf8"))).toEqual(
+        {
+          id: "hello-plugin",
+          $comment: expect.stringContaining('"icon": "assets/icon.png"'),
+          media: [],
+          requirements: { paseo: `>=${cliPackageJson.version}` },
+        },
+      );
       expect(JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"))).toEqual({
         name: "hello-plugin",
         private: true,
         version: "0.0.0",
+        files: [
+          "paseo-plugin.json",
+          "OVERVIEW.md",
+          "index.client.ts",
+          "index.client.tsx",
+          "index.server.ts",
+          "index.server.tsx",
+          "client/",
+          "server/",
+          "shared/",
+        ],
         scripts: { typecheck: "tsc --noEmit" },
         devDependencies: {
           "@getpaseo/plugin": cliPackageJson.version,
@@ -140,16 +196,8 @@ export async function inspectConfig(
         path.join(directory, "client", "main.tsx"),
         `import React from "react";
 import { Text } from "react-native";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/react-native";
-import {
-  type PluginAgentPanelProps,
-  type PluginClientContext,
-  type PluginComposerPillProps,
-  type PluginSurfaceProps,
-  useAgent,
-  usePaseo,
-  useWorkspace,
-} from "@getpaseo/plugin";
+import { Icon, Modal, useToast } from "@getpaseo/plugin/client/react-native";
+import { type PluginAgentPanelProps, type PluginClientContext, type PluginSurfaceProps, useAgent, usePaseo, useWorkspace } from "@getpaseo/plugin/client";
 import { inspect } from "../shared/inspect";
 
 export function Surface({ navigation }: PluginSurfaceProps) {
@@ -160,6 +208,8 @@ export function Surface({ navigation }: PluginSurfaceProps) {
   });
   navigation?.openAgent({ agentId: "agent-1" });
   navigation?.openWorkspace({ workspaceId: "workspace-1" });
+  navigation?.openAgent({ serverId: "server-2", agentId: "agent-2" });
+  navigation?.openWorkspace({ serverId: "server-2", workspaceId: "workspace-2" });
   void createWorkspace;
   return <><Icon name="Settings" size={18} color="#123456" /><Text onPress={() => toast.show("Ready")}>Paseo API</Text><Modal title="Example" icon={<Icon name="Settings" />} open={false} onOpenChange={() => {}}><Modal.Content><Text>Modal</Text></Modal.Content></Modal></>;
 }
@@ -178,33 +228,52 @@ export function AgentPanel({ workspaceId, agentId }: PluginAgentPanelProps) {
   return <Text>{workspaceName}: {agentTitle}</Text>;
 }
 
-export function ComposerPill({ workspaceId, agentId }: PluginComposerPillProps) {
-  return <Text>{workspaceId}: {agentId}</Text>;
-}
-
 export function contributeClient(client: PluginClientContext) {
-  return client.addComposerPill({
-    id: "open-review",
-    title: "Open review",
+  const header = client.addHeaderButton({
+    id: "review-tools",
     workspaceId: "workspace-a",
-    agentId: "agent-a",
-    Component: ComposerPill,
-    async onPress() {
-      await client.rpc(inspect, {});
-      client.openPanel("review", { workspaceId: "workspace-a", agentId: "agent-a" });
+    button: {
+      title: "Review tools",
+      icon: "Scan",
+      label: "Review",
+      behavior: {
+        kind: "menu",
+        items: [{ kind: "item", id: "refresh", title: "Refresh review", behavior: {
+          kind: "action", async onPress() { await client.rpc(inspect, {}); },
+        } }],
+      },
     },
   });
+  const pill = client.addComposerPill({
+    id: "open-review",
+    workspaceId: "workspace-a",
+    agentId: "agent-a",
+    button: {
+      title: "Open review",
+      icon: "Scan",
+      behavior: {
+        kind: "action",
+        async onPress() {
+          await client.rpc(inspect, {});
+          client.openPanel("review", { workspaceId: "workspace-a", agentId: "agent-a" });
+        },
+      },
+    },
+  });
+  header.update({ visible: false });
+  pill.update({ disabled: true });
+  return () => { header.remove(); pill.remove(); };
 }
 `,
       ),
       writeFile(
         path.join(directory, "index.client.tsx"),
-        `import type { PluginClientContext } from "@getpaseo/plugin";
+        `import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { AgentPanel, contributeClient, Surface } from "./client/main";
 import { inspect } from "./shared/inspect";
 
 export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", Surface);
+  client.addScreen({ id: "main", title: "Review", Component: Surface });
   client.addWorkspacePanel({
     id: "review",
     title: "Review",
@@ -229,7 +298,7 @@ export default function contribute(client: PluginClientContext) {
       ),
       writeFile(
         path.join(directory, "index.server.ts"),
-        `import type { PluginServerContext } from "@getpaseo/plugin";
+        `import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { inspectConfig } from "./server/inspect";
 import { inspect } from "./shared/inspect";
 
@@ -244,6 +313,39 @@ export default function contribute(server: PluginServerContext) {
     await expect(typecheckPlugin(directory)).resolves.toBeUndefined();
   }, 20_000);
 
+  it("reports TypeScript errors for the old composer pill shape and cleanup", async () => {
+    const parent = await mkdtemp(path.join(process.cwd(), ".plugin-scaffold-"));
+    directories.push(parent);
+    const directory = path.join(parent, "old-composer-pill");
+    await scaffoldPluginDirectory(directory);
+    await writeFile(
+      path.join(directory, "index.client.tsx"),
+      `
+import type { PluginClientContext, PluginComposerPillProps } from "@getpaseo/plugin/client";
+
+export default function contribute(client: PluginClientContext) {
+  const oldPill = {
+    id: "review", workspaceId: "workspace-a", agentId: "agent-a",
+    title: "Review", Component: () => null, onPress() {},
+  };
+  client.addComposerPill(oldPill);
+  const pill = client.addComposerPill({
+    id: "review", workspaceId: "workspace-a", agentId: "agent-a",
+    button: { title: "Review", icon: "Scan", behavior: { kind: "action", onPress() {} } },
+  });
+  pill();
+  return () => pill.remove();
+}
+`,
+    );
+    const check = typecheckPlugin(directory);
+    await expect(check).rejects.toThrow(
+      /has no exported member (named )?'PluginComposerPillProps'/,
+    );
+    await expect(check).rejects.toThrow("Property 'button' is missing");
+    await expect(check).rejects.toThrow("has no call signatures");
+  }, 20_000);
+
   it("refuses to write into a non-empty directory", async () => {
     const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
     directories.push(directory);
diff --git a/packages/cli/src/commands/plugin/scaffold.ts b/packages/cli/src/commands/plugin/scaffold.ts
index e57e316215..b1eb53a6ef 100644
--- a/packages/cli/src/commands/plugin/scaffold.ts
+++ b/packages/cli/src/commands/plugin/scaffold.ts
@@ -3,6 +3,34 @@ import path from "node:path";
 import { PluginIdSchema } from "@getpaseo/protocol/messages";
 import { resolveCliVersion } from "../../version.js";
 
+const OVERVIEW = `<!--
+OVERVIEW.md is required to list your plugin in the registry. Keep it beside
+paseo-plugin.json in your repository at the pinned commit and in your npm package.
+Replace this comment with useful facts before publishing.
+
+This overview is for people choosing a plugin in Paseo, on the plugin page under
+its install command. README assumes a GitHub audience and includes technical
+details, installation instructions, and badges. Long, AI-generated READMEs leave
+people reading past that material to understand what the plugin does.
+
+Write these parts in order, including only what helps someone decide to install:
+
+1. Describe what your plugin is and does in plain terms first.
+2. Explain how it works only when it is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, tools, or
+   other plugins. Include applicable daemon version and operating system
+   requirements. Setup guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does,
+   what the plugin reads or sends and where, permissions, and known limits.
+
+Length follows complexity; a theme needs one paragraph. Choose headings only
+when they help. Use sentence case and plain factual language, with no em dashes.
+Omit installation commands, badges, changelog, contributing or license sections,
+marketing, and unsupported claims. Avoid implementation filler such as empty
+cleanup functions, theme-token field lists, or lists of absent features.
+-->
+`;
+
 const TSCONFIG = {
   compilerOptions: {
     target: "ES2020",
@@ -20,22 +48,28 @@ const TSCONFIG = {
   include: ["**/*.ts", "**/*.tsx"],
 };
 
-const CLIENT_ENTRY = `import type { PluginClientContext } from "@getpaseo/plugin";
-import { GreetingSurface } from "./client/greeting";
+const CLIENT_ENTRY = `import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { GreetingScreen } from "./client/greeting";
+
+function GreetingItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  return (
+    <SidebarRow
+      icon="MessageCircle"
+      active={currentScreen?.screenId === "greeting"}
+      onPress={() => openScreen({ screenId: "greeting" })}
+    />
+  );
+}
 
 export default function contribute(client: PluginClientContext) {
-  client.addSurface("greeting", GreetingSurface);
-  client.addSidebarItem({
-    id: "greeting",
-    title: "Greeting",
-    icon: "MessageCircle",
-    surface: "greeting",
-  });
+  client.addScreen({ id: "greeting", title: "Greeting", Component: GreetingScreen });
+  client.addSidebarHeaderItem({ id: "greeting", title: "Greeting", Component: GreetingItem });
   return () => {};
 }
 `;
 
-const SERVER_ENTRY = `import type { PluginServerContext } from "@getpaseo/plugin";
+const SERVER_ENTRY = `import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { createGreeting } from "./server/greeting";
 import { greetingRpc } from "./shared/greeting";
 
@@ -63,15 +97,15 @@ export function createGreeting({ name }: RpcInput<typeof greetingRpc>) {
 }
 `;
 
-const CLIENT_GREETING = `import type { PluginSurfaceProps } from "@getpaseo/plugin";
-import { useRpc } from "@getpaseo/plugin";
+const CLIENT_GREETING = `import type { PluginScreenProps } from "@getpaseo/plugin/client";
+import { useRpc } from "@getpaseo/plugin/client";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
 import { Pressable, Text, View } from "react-native";
 import { greetingRpc } from "../shared/greeting";
 import { openExternal } from "./web";
 
-export function GreetingSurface({ theme, layout }: PluginSurfaceProps) {
+export function GreetingScreen({ theme, layout }: PluginScreenProps) {
   const createGreeting = useRpc(greetingRpc);
   const greeting = useMutation({ mutationFn: createGreeting });
   const styles = useMemo(
@@ -142,13 +176,25 @@ export async function scaffoldPluginDirectory(
     throw new Error(`Plugin directory must be empty: ${directory}`);
   }
 
+  const version = resolveCliVersion();
   const packageJson = {
     name: id,
     private: true,
     version: "0.0.0",
+    files: [
+      "paseo-plugin.json",
+      "OVERVIEW.md",
+      "index.client.ts",
+      "index.client.tsx",
+      "index.server.ts",
+      "index.server.tsx",
+      "client/",
+      "server/",
+      "shared/",
+    ],
     scripts: { typecheck: "tsc --noEmit" },
     devDependencies: {
-      "@getpaseo/plugin": resolveCliVersion(),
+      "@getpaseo/plugin": version,
       "@tanstack/react-query": "^5.90.11",
       "@types/react": "~19.2.0",
       react: "19.1.0",
@@ -158,7 +204,21 @@ export async function scaffoldPluginDirectory(
     },
   };
   const files = new Map<string, string>([
-    ["paseo-plugin.json", `${JSON.stringify({ id }, null, 2)}\n`],
+    [
+      "paseo-plugin.json",
+      `${JSON.stringify(
+        {
+          id,
+          $comment:
+            'Add "name": "My plugin" to set a display name. Add "icon": "assets/icon.png" for a PNG inside the package. Add image or video paths (relative to this manifest) or HTTPS URLs to media. Include local assets in package.json files.',
+          media: [],
+          requirements: { paseo: `>=${version}` },
+        },
+        null,
+        2,
+      )}\n`,
+    ],
+    ["OVERVIEW.md", OVERVIEW],
     ["package.json", `${JSON.stringify(packageJson, null, 2)}\n`],
     ["tsconfig.json", `${JSON.stringify(TSCONFIG, null, 2)}\n`],
     ["index.client.tsx", CLIENT_ENTRY],
diff --git a/packages/cli/src/commands/plugin/shared.ts b/packages/cli/src/commands/plugin/shared.ts
index c85a8d7e32..af87bdb82b 100644
--- a/packages/cli/src/commands/plugin/shared.ts
+++ b/packages/cli/src/commands/plugin/shared.ts
@@ -1,16 +1,21 @@
+import type { DaemonTarget } from "../../utils/daemon-target.js";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { CommandError } from "../../output/index.js";
 import { connectToDaemon } from "../../utils/client.js";
 
-type PluginFeature = "pluginManagement" | "pluginLogs" | "pluginGitManagement";
+type PluginFeature =
+  | "pluginManagement"
+  | "pluginLogs"
+  | "pluginSourceUpdates"
+  | "pluginSourceInstallation";
 
 async function withPluginClient<T>(
-  host: string | undefined,
+  target: DaemonTarget,
   feature: PluginFeature,
   updateMessage: string,
   run: (client: DaemonClient) => Promise<T>,
 ): Promise<T> {
-  const client = await connectToDaemon({ host });
+  const client = await connectToDaemon({ target });
   if (client.getLastServerInfoMessage()?.features?.[feature] !== true) {
     await client.close().catch(() => undefined);
     throw {
@@ -26,12 +31,12 @@ async function withPluginClient<T>(
 }
 
 export async function withPluginManagementClient<T>(
-  host: string | undefined,
+  target: DaemonTarget,
   run: (client: DaemonClient) => Promise<T>,
 ): Promise<T> {
   // COMPAT(pluginManagement): added in v0.3.1, remove gate after 2027-08-14.
   return withPluginClient(
-    host,
+    target,
     "pluginManagement",
     "Update the host to use plugin management.",
     run,
@@ -39,22 +44,35 @@ export async function withPluginManagementClient<T>(
 }
 
 export async function withPluginLogsClient<T>(
-  host: string | undefined,
+  target: DaemonTarget,
   run: (client: DaemonClient) => Promise<T>,
 ): Promise<T> {
   // COMPAT(pluginLogs): added in v0.4.0, remove gate after 2027-08-16.
-  return withPluginClient(host, "pluginLogs", "Update the host to view plugin logs.", run);
+  return withPluginClient(target, "pluginLogs", "Update the host to view plugin logs.", run);
 }
 
 export async function withPluginSourceClient<T>(
-  host: string | undefined,
+  target: DaemonTarget,
   run: (client: DaemonClient) => Promise<T>,
 ): Promise<T> {
-  // COMPAT(pluginGitManagement): added in v0.7.0, remove gate after 2027-08-26.
+  // COMPAT(pluginSourceInstallation): added in v0.8.0; remove gate after 2027-03-16 once daemon floor supports source identifiers.
   return withPluginClient(
-    host,
-    "pluginGitManagement",
-    "Update the host to install and update Git plugins.",
+    target,
+    "pluginSourceInstallation",
+    "Update the host to install plugin sources.",
+    run,
+  );
+}
+
+export async function withPluginUpdateClient<T>(
+  target: DaemonTarget,
+  run: (client: DaemonClient) => Promise<T>,
+): Promise<T> {
+  // COMPAT(pluginSourceUpdates): added in v0.8.0; remove after 2027-03-16 once daemon floor supports reviewed updates.
+  return withPluginClient(
+    target,
+    "pluginSourceUpdates",
+    "Update the host to review plugin updates.",
     run,
   );
 }
diff --git a/packages/cli/src/commands/plugin/update.ts b/packages/cli/src/commands/plugin/update.ts
new file mode 100644
index 0000000000..d55edd0dbd
--- /dev/null
+++ b/packages/cli/src/commands/plugin/update.ts
@@ -0,0 +1,102 @@
+import type {
+  PluginUpdatePreview,
+  PluginUpdateResult,
+  PluginUpdateSelection,
+  PluginUpdateProposal,
+} from "@getpaseo/protocol/messages";
+
+interface UpdateClient {
+  previewPluginUpdates(input: {
+    pluginId?: string;
+    target?: PluginUpdateSelection;
+  }): Promise<PluginUpdatePreview[]>;
+  applyPluginUpdates(proposals: PluginUpdateProposal[]): Promise<PluginUpdateResult[]>;
+}
+export interface UpdateOptions {
+  pluginId?: string;
+  all?: boolean;
+  ref?: string;
+  version?: string;
+  check?: boolean;
+  yes?: boolean;
+}
+export interface UpdateInteraction {
+  interactive: boolean;
+  structured: boolean;
+  write(text: string): void;
+  confirm(message: string): Promise<boolean>;
+}
+export interface UpdateOutcome {
+  id: string;
+  outcome: PluginUpdatePreview["outcome"] | PluginUpdateResult["outcome"] | "declined";
+  current?: PluginUpdatePreview["current"];
+  target?: PluginUpdatePreview["target"];
+  links?: string[];
+  proposal?: PluginUpdateProposal;
+  plugin?: PluginUpdateResult["plugin"];
+  error?: string;
+  warning?: string;
+}
+
+export async function reviewPluginUpdates(
+  client: UpdateClient,
+  options: UpdateOptions,
+  interaction: UpdateInteraction,
+): Promise<UpdateOutcome[]> {
+  if ((options.pluginId === undefined) === (options.all !== true))
+    throw new Error("Choose one plugin ID or pass --all");
+  if (options.ref && options.version) throw new Error("Choose --ref or --version, not both");
+  let target: PluginUpdateSelection | undefined;
+  if (options.ref) target = { kind: "git", ref: options.ref };
+  if (options.version) target = { kind: "npm", version: options.version };
+  if (target && options.all)
+    throw new Error("An explicit target requires one plugin ID, without --all");
+  const preview = await client.previewPluginUpdates({ pluginId: options.pluginId, target });
+  if (!interaction.structured) interaction.write(formatUpdatePreview(preview));
+  if (options.check) return preview;
+  const proposals = preview.flatMap((item) => (item.proposal ? [item.proposal] : []));
+  if (!proposals.length) return preview;
+  if (!options.yes && !target) {
+    if (interaction.structured || !interaction.interactive)
+      throw new Error("Confirmation required; rerun with --yes.");
+    if (
+      !(await interaction.confirm(
+        options.all ? "Update these plugins? [y/N] " : `Update ${options.pluginId}? [y/N] `,
+      ))
+    ) {
+      return preview.map((item) => (item.proposal ? { id: item.id, outcome: "declined" } : item));
+    }
+  }
+  const applied = new Map(
+    (await client.applyPluginUpdates(proposals)).map((item) => [item.id, item]),
+  );
+  return preview.map((item) => applied.get(item.id) ?? item);
+}
+
+export function formatUpdatePreview(items: PluginUpdatePreview[]): string {
+  return items
+    .map((item) => {
+      const current = item.current?.currentRevision ?? "unknown";
+      const target = item.target?.kind === "git" ? item.target.commit : item.target?.version;
+      let text: string;
+      switch (item.outcome) {
+        case "update":
+          text = `${current} → ${target}`;
+          break;
+        case "current":
+          text = `up to date (${current})`;
+          break;
+        case "installed-newer":
+          text = `installed ${current} is newer than latest ${target}; keeping installed version`;
+          break;
+        case "local":
+          text = "local directory; use Reload after editing";
+          break;
+        case "error":
+          text = item.error ?? "Check failed";
+          break;
+      }
+      return `${item.id}: ${text}\n${item.links.map((link) => `Review: ${link}\n`).join("")}`;
+    })
+    .join("\n");
+}
diff --git a/packages/cli/src/commands/project/create.ts b/packages/cli/src/commands/project/create.ts
index 2210e6c214..b141ea7f18 100644
--- a/packages/cli/src/commands/project/create.ts
+++ b/packages/cli/src/commands/project/create.ts
@@ -31,10 +31,10 @@ export async function runCreateCommand(
   const projectPath = resolveProjectPath({
     pathArg,
     cwd: process.cwd(),
-    daemonTarget: options.host ?? process.env.PASEO_HOST,
+    daemonTarget: options.daemonTarget.kind === "endpoint" ? options.daemonTarget.host : undefined,
   });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
-    throw buildDaemonConnectionCommandError({ host: options.host, error });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
+    throw buildDaemonConnectionCommandError({ target: options.daemonTarget, error });
   });
 
   try {
@@ -44,6 +44,7 @@ export async function runCreateCommand(
     }
     return { type: "single", data: toProjectRow(payload.project), schema: projectSchema };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "PROJECT_CREATE_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/project/delete.ts b/packages/cli/src/commands/project/delete.ts
index 05dd657ef1..2c4a20ddc2 100644
--- a/packages/cli/src/commands/project/delete.ts
+++ b/packages/cli/src/commands/project/delete.ts
@@ -24,8 +24,8 @@ export async function runDeleteCommand(
   options: CommandOptions,
   _command: Command,
 ): Promise<SingleResult<ProjectDeleteResult>> {
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
-    throw buildDaemonConnectionCommandError({ host: options.host, error });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
+    throw buildDaemonConnectionCommandError({ target: options.daemonTarget, error });
   });
 
   try {
@@ -36,6 +36,7 @@ export async function runDeleteCommand(
       schema: projectDeleteSchema,
     };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "PROJECT_DELETE_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/project/ls.ts b/packages/cli/src/commands/project/ls.ts
index 750428881f..acd9a21935 100644
--- a/packages/cli/src/commands/project/ls.ts
+++ b/packages/cli/src/commands/project/ls.ts
@@ -7,8 +7,8 @@ export async function runLsCommand(
   options: CommandOptions,
   _command: Command,
 ): Promise<ListResult<ProjectRow>> {
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
-    throw buildDaemonConnectionCommandError({ host: options.host, error });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
+    throw buildDaemonConnectionCommandError({ target: options.daemonTarget, error });
   });
 
   try {
diff --git a/packages/cli/src/commands/project/project.test.ts b/packages/cli/src/commands/project/project.test.ts
index 47ea1cecf5..301c7a8a65 100644
--- a/packages/cli/src/commands/project/project.test.ts
+++ b/packages/cli/src/commands/project/project.test.ts
@@ -47,7 +47,11 @@ describe("project commands", () => {
   });
 
   it("creates a project from an absolute directory path", async () => {
-    const result = await runCreateCommand("relative/project", {}, {} as never);
+    const result = await runCreateCommand(
+      "relative/project",
+      { daemonTarget: { kind: "instance", home: "/tmp/project-test" } },
+      {} as never,
+    );
 
     expect(addProject).toHaveBeenCalledWith(path.resolve("relative/project"));
     expect(result.data).toEqual({
@@ -77,7 +81,10 @@ describe("project commands", () => {
   });
 
   it("lists projects", async () => {
-    const result = await runLsCommand({}, {} as never);
+    const result = await runLsCommand(
+      { daemonTarget: { kind: "instance", home: "/tmp/project-test" } },
+      {} as never,
+    );
 
     expect(listProjects).toHaveBeenCalled();
     expect(result.data).toHaveLength(1);
@@ -88,7 +95,12 @@ describe("project commands", () => {
     expect(resolveProjectName({ name: "  New name  " })).toBe("New name");
     expect(resolveProjectName({ reset: true })).toBeNull();
 
-    const result = await runRenameCommand("project-1", "  New name  ", {}, {} as never);
+    const result = await runRenameCommand(
+      "project-1",
+      "  New name  ",
+      { daemonTarget: { kind: "instance", home: "/tmp/project-test" } },
+      {} as never,
+    );
     expect(renameProject).toHaveBeenCalledWith("project-1", "New name");
     expect(result.data).toEqual({ projectId: "project-1", name: "New name" });
   });
@@ -98,7 +110,11 @@ describe("project commands", () => {
   });
 
   it("deletes a project", async () => {
-    const result = await runDeleteCommand("project-1", {}, {} as never);
+    const result = await runDeleteCommand(
+      "project-1",
+      { daemonTarget: { kind: "instance", home: "/tmp/project-test" } },
+      {} as never,
+    );
 
     expect(removeProject).toHaveBeenCalledWith("project-1");
     expect(result.data).toEqual({
diff --git a/packages/cli/src/commands/project/rename.ts b/packages/cli/src/commands/project/rename.ts
index b00fdb06be..42bf21bd90 100644
--- a/packages/cli/src/commands/project/rename.ts
+++ b/packages/cli/src/commands/project/rename.ts
@@ -44,8 +44,8 @@ export async function runRenameCommand(
   _command: Command,
 ): Promise<SingleResult<ProjectRenameResult>> {
   const name = resolveProjectName({ name: nameArg, reset: options.reset });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
-    throw buildDaemonConnectionCommandError({ host: options.host, error });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
+    throw buildDaemonConnectionCommandError({ target: options.daemonTarget, error });
   });
 
   try {
@@ -56,6 +56,7 @@ export async function runRenameCommand(
       schema: projectRenameSchema,
     };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "PROJECT_RENAME_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/provider/diagnostic.ts b/packages/cli/src/commands/provider/diagnostic.ts
index 0ff05556a1..cbc13bd670 100644
--- a/packages/cli/src/commands/provider/diagnostic.ts
+++ b/packages/cli/src/commands/provider/diagnostic.ts
@@ -28,7 +28,7 @@ export async function runDiagnosticCommand(
   options: ProviderDiagnosticOptions,
   _command: Command,
 ): Promise<SingleResult<ProviderDiagnosticResult>> {
-  const client = await connectToDaemon({ host: options.host });
+  const client = await connectToDaemon({ target: options.daemonTarget });
   try {
     const result = await client.getProviderDiagnostic(provider.trim().toLowerCase());
     return {
diff --git a/packages/cli/src/commands/provider/ls.ts b/packages/cli/src/commands/provider/ls.ts
index 6b902383db..1e56b60f73 100644
--- a/packages/cli/src/commands/provider/ls.ts
+++ b/packages/cli/src/commands/provider/ls.ts
@@ -1,8 +1,7 @@
 import type { Command } from "commander";
 import type { CommandOptions, ListResult, OutputSchema } from "../../output/index.js";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
-import { AGENT_PROVIDER_DEFINITIONS } from "@getpaseo/protocol/provider-manifest";
-import { tryConnectToDaemon } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 
 export interface ProviderListItem {
   provider: ProviderSnapshotEntry["provider"];
@@ -13,20 +12,6 @@ export interface ProviderListItem {
   modes: string;
 }
 
-/** Derive provider list from the manifest — single source of truth */
-const PROVIDERS: ProviderListItem[] = AGENT_PROVIDER_DEFINITIONS.map((def) => ({
-  provider: def.id,
-  label: def.label,
-  status: "available",
-  enabled: def.enabledByDefault === false ? "Disabled" : "Enabled",
-  defaultMode: def.defaultModeId ?? "-",
-  modes: def.modes.length > 0 ? def.modes.map((m) => m.label).join(", ") : "-",
-}));
-
-function getStaticProviders(): ProviderListItem[] {
-  return PROVIDERS;
-}
-
 /** Schema for provider ls output */
 export const providerLsSchema: OutputSchema<ProviderListItem> = {
   idField: "provider",
@@ -59,15 +44,7 @@ export async function runLsCommand(
   options: ProviderLsOptions,
   _command: Command,
 ): Promise<ProviderLsResult> {
-  const client = await tryConnectToDaemon({ host: options.host });
-
-  if (!client) {
-    return {
-      type: "list",
-      data: getStaticProviders(),
-      schema: providerLsSchema,
-    };
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const snapshot = await client.getProvidersSnapshot();
@@ -83,12 +60,6 @@ export async function runLsCommand(
       })),
       schema: providerLsSchema,
     };
-  } catch {
-    return {
-      type: "list",
-      data: getStaticProviders(),
-      schema: providerLsSchema,
-    };
   } finally {
     await client.close().catch(() => {});
   }
diff --git a/packages/cli/src/commands/provider/models.ts b/packages/cli/src/commands/provider/models.ts
index e5dde2d136..1d8fd3f7bb 100644
--- a/packages/cli/src/commands/provider/models.ts
+++ b/packages/cli/src/commands/provider/models.ts
@@ -62,7 +62,7 @@ export async function runModelsCommand(
 ): Promise<ProviderModelsResult> {
   const normalizedProvider = provider.toLowerCase();
 
-  const client = await connectToDaemon({ host: options.host });
+  const client = await connectToDaemon({ target: options.daemonTarget });
   try {
     const result = await client.listProviderModels(normalizedProvider);
 
diff --git a/packages/cli/src/commands/schedule/create.ts b/packages/cli/src/commands/schedule/create.ts
index 471765876d..8b77ea392f 100644
--- a/packages/cli/src/commands/schedule/create.ts
+++ b/packages/cli/src/commands/schedule/create.ts
@@ -43,12 +43,12 @@ export async function runCreateCommand(
     mode: options.mode,
     thinking: options.thinking,
     cwd: options.cwd,
-    host: options.host,
+    daemonTarget: options.daemonTarget,
     maxRuns: options.maxRuns,
     expiresIn: options.expiresIn,
     runNow,
   });
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     const payload = await client.scheduleCreate(input);
     if (payload.error || !payload.schedule) {
diff --git a/packages/cli/src/commands/schedule/delete.ts b/packages/cli/src/commands/schedule/delete.ts
index f1f4ba2cae..f46ecf5d1f 100644
--- a/packages/cli/src/commands/schedule/delete.ts
+++ b/packages/cli/src/commands/schedule/delete.ts
@@ -25,7 +25,7 @@ export async function runDeleteCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<SingleResult<ScheduleDeleteRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     const payload = await client.scheduleDelete({ id });
     if (payload.error) {
diff --git a/packages/cli/src/commands/schedule/inspect.ts b/packages/cli/src/commands/schedule/inspect.ts
index d020f24089..8a94a82e23 100644
--- a/packages/cli/src/commands/schedule/inspect.ts
+++ b/packages/cli/src/commands/schedule/inspect.ts
@@ -16,7 +16,7 @@ export async function runInspectCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<ListResult<ScheduleInspectRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     const payload = await client.scheduleInspect({ id });
     if (payload.error || !payload.schedule) {
diff --git a/packages/cli/src/commands/schedule/logs.ts b/packages/cli/src/commands/schedule/logs.ts
index c9565b5c0d..7609851766 100644
--- a/packages/cli/src/commands/schedule/logs.ts
+++ b/packages/cli/src/commands/schedule/logs.ts
@@ -13,7 +13,7 @@ export async function runLogsCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<ListResult<ScheduleLogRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireNewAgentSchedule(client, id);
     const payload = await client.scheduleLogs({ id });
diff --git a/packages/cli/src/commands/schedule/ls.ts b/packages/cli/src/commands/schedule/ls.ts
index 501c86653e..c3dfb6db28 100644
--- a/packages/cli/src/commands/schedule/ls.ts
+++ b/packages/cli/src/commands/schedule/ls.ts
@@ -13,7 +13,7 @@ export async function runLsCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<ListResult<ScheduleRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     const payload = await client.scheduleList();
     if (payload.error) {
diff --git a/packages/cli/src/commands/schedule/pause.ts b/packages/cli/src/commands/schedule/pause.ts
index ed8e12108d..07929516fc 100644
--- a/packages/cli/src/commands/schedule/pause.ts
+++ b/packages/cli/src/commands/schedule/pause.ts
@@ -15,7 +15,7 @@ export async function runPauseCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<SingleResult<ScheduleRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireNewAgentSchedule(client, id);
     const payload = await client.schedulePause({ id });
diff --git a/packages/cli/src/commands/schedule/resume.ts b/packages/cli/src/commands/schedule/resume.ts
index efac2d6340..8d2855b397 100644
--- a/packages/cli/src/commands/schedule/resume.ts
+++ b/packages/cli/src/commands/schedule/resume.ts
@@ -15,7 +15,7 @@ export async function runResumeCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<SingleResult<ScheduleRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireNewAgentSchedule(client, id);
     const payload = await client.scheduleResume({ id });
diff --git a/packages/cli/src/commands/schedule/run-once.ts b/packages/cli/src/commands/schedule/run-once.ts
index 2818afc5db..beb8f65b29 100644
--- a/packages/cli/src/commands/schedule/run-once.ts
+++ b/packages/cli/src/commands/schedule/run-once.ts
@@ -15,7 +15,7 @@ export async function runRunOnceCommand(
   options: ScheduleCommandOptions,
   _command: Command,
 ): Promise<SingleResult<ScheduleRow>> {
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireNewAgentSchedule(client, id);
     const payload = await client.scheduleRunOnce({ id });
diff --git a/packages/cli/src/commands/schedule/shared.test.ts b/packages/cli/src/commands/schedule/shared.test.ts
index 0777134b0e..bac537e4fe 100644
--- a/packages/cli/src/commands/schedule/shared.test.ts
+++ b/packages/cli/src/commands/schedule/shared.test.ts
@@ -1,4 +1,6 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
+
+import { selectDaemonTarget } from "../../utils/daemon-target.js";
 
 import {
   compileEveryPresetToCron,
@@ -7,32 +9,25 @@ import {
 } from "./shared.js";
 
 const baseOptions = {
+  daemonTarget: selectDaemonTarget({ home: process.cwd() }, {}),
   prompt: "do the thing",
   every: "5m",
   provider: "claude",
 };
 
 const baseCron = {
+  daemonTarget: selectDaemonTarget({ home: process.cwd() }, {}),
   prompt: "do the thing",
   cron: "0 9 * * *",
   provider: "claude",
 };
 
 describe("parseScheduleCreateInput cwd/host validation", () => {
-  beforeEach(() => {
-    vi.spyOn(process, "cwd").mockReturnValue("/local/project");
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-    vi.unstubAllEnvs();
-  });
-
   test("no host, no cwd → defaults to process.cwd()", () => {
     const input = parseScheduleCreateInput(baseOptions);
     expect(input.target).toEqual({
       type: "new-agent",
-      config: { provider: "claude", cwd: "/local/project" },
+      config: { provider: "claude", cwd: process.cwd() },
     });
   });
 
@@ -47,7 +42,7 @@ describe("parseScheduleCreateInput cwd/host validation", () => {
   test("host with cwd → uses provided cwd", () => {
     const input = parseScheduleCreateInput({
       ...baseOptions,
-      host: "dev:6767",
+      daemonTarget: selectDaemonTarget({ host: "dev:12345" }, {}),
       cwd: "/remote/project",
     });
     expect(input.target).toEqual({
@@ -57,7 +52,12 @@ describe("parseScheduleCreateInput cwd/host validation", () => {
   });
 
   test("host without cwd → throws MISSING_CWD", () => {
-    expect(() => parseScheduleCreateInput({ ...baseOptions, host: "dev:6767" })).toThrow(
+    expect(() =>
+      parseScheduleCreateInput({
+        ...baseOptions,
+        daemonTarget: selectDaemonTarget({ host: "dev:12345" }, {}),
+      }),
+    ).toThrow(
       expect.objectContaining({
         code: "MISSING_CWD",
         message: expect.stringContaining("--cwd is required when --host is specified"),
@@ -66,9 +66,9 @@ describe("parseScheduleCreateInput cwd/host validation", () => {
   });
 
   test("PASEO_HOST without cwd → throws MISSING_CWD", () => {
-    vi.stubEnv("PASEO_HOST", "dev:6767");
+    const daemonTarget = selectDaemonTarget({}, { PASEO_HOST: "dev:12345" });
 
-    expect(() => parseScheduleCreateInput(baseOptions)).toThrow(
+    expect(() => parseScheduleCreateInput({ ...baseOptions, daemonTarget })).toThrow(
       expect.objectContaining({
         code: "MISSING_CWD",
         message: expect.stringContaining("--cwd is required"),
@@ -76,9 +76,21 @@ describe("parseScheduleCreateInput cwd/host validation", () => {
     );
   });
 
+  test("explicit home beats PASEO_HOST and defaults cwd locally", () => {
+    const daemonTarget = selectDaemonTarget({ home: process.cwd() }, { PASEO_HOST: "dev:12345" });
+    expect(parseScheduleCreateInput({ ...baseOptions, daemonTarget }).target).toEqual({
+      type: "new-agent",
+      config: { provider: "claude", cwd: process.cwd() },
+    });
+  });
+
   test("host with whitespace-only cwd → throws MISSING_CWD", () => {
     expect(() =>
-      parseScheduleCreateInput({ ...baseOptions, host: "dev:6767", cwd: "   " }),
+      parseScheduleCreateInput({
+        ...baseOptions,
+        daemonTarget: selectDaemonTarget({ host: "dev:12345" }, {}),
+        cwd: "   ",
+      }),
     ).toThrow(expect.objectContaining({ code: "MISSING_CWD" }));
   });
 });
diff --git a/packages/cli/src/commands/schedule/shared.ts b/packages/cli/src/commands/schedule/shared.ts
index beae80acc0..7506596092 100644
--- a/packages/cli/src/commands/schedule/shared.ts
+++ b/packages/cli/src/commands/schedule/shared.ts
@@ -1,4 +1,5 @@
-import { connectToDaemon, getDaemonHost, getExplicitDaemonHost } from "../../utils/client.js";
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
 import type { CommandError, CommandOptions } from "../../output/index.js";
 import type {
   CreateScheduleInput,
@@ -19,15 +20,16 @@ export interface ScheduleCommandOptions extends CommandOptions {
 }
 
 export async function connectScheduleClient(
-  host: string | undefined,
+  target: DaemonTarget,
 ): Promise<{ client: ScheduleDaemonClient; host: string }> {
-  const resolvedHost = getDaemonHost({ host });
+  const resolvedHost = getDaemonHost({ target });
   try {
     const client = (await connectToDaemon({
-      host,
+      target,
     })) as unknown as ScheduleDaemonClient;
     return { client, host: resolvedHost };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw {
       code: "DAEMON_NOT_RUNNING",
@@ -147,6 +149,7 @@ export function parseScheduleCreateInput(options: {
   thinking?: string;
   cwd?: string;
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   maxRuns?: string;
   expiresIn?: string;
   runNow?: boolean;
@@ -168,7 +171,7 @@ export function parseScheduleCreateInput(options: {
   }
 
   const cwdInput = options.cwd?.trim();
-  if (getExplicitDaemonHost(options.host) !== undefined && !cwdInput) {
+  if (options.daemonTarget.kind === "endpoint" && !cwdInput) {
     throw {
       code: "MISSING_CWD",
       message:
diff --git a/packages/cli/src/commands/schedule/update.ts b/packages/cli/src/commands/schedule/update.ts
index 30873853c1..7d0079e269 100644
--- a/packages/cli/src/commands/schedule/update.ts
+++ b/packages/cli/src/commands/schedule/update.ts
@@ -23,10 +23,8 @@ export interface ScheduleUpdateOptions extends ScheduleCommandOptions {
   model?: string;
   mode?: string;
   cwd?: string;
-  maxRuns?: string;
-  noMaxRuns?: boolean;
-  expiresIn?: string;
-  noExpiresIn?: boolean;
+  maxRuns?: string | false;
+  expiresIn?: string | false;
 }
 
 export async function runUpdateCommand(
@@ -45,12 +43,12 @@ export async function runUpdateCommand(
     model: options.model,
     mode: options.mode,
     cwd: options.cwd,
-    maxRuns: options.maxRuns,
-    expiresIn: options.expiresIn,
-    clearMaxRuns: options.noMaxRuns,
-    clearExpires: options.noExpiresIn,
+    maxRuns: options.maxRuns === false ? undefined : options.maxRuns,
+    expiresIn: options.expiresIn === false ? undefined : options.expiresIn,
+    clearMaxRuns: options.maxRuns === false,
+    clearExpires: options.expiresIn === false,
   });
-  const { client } = await connectScheduleClient(options.host);
+  const { client } = await connectScheduleClient(options.daemonTarget);
   try {
     await requireNewAgentSchedule(client, id);
     const payload = await client.scheduleUpdate(input);
diff --git a/packages/cli/src/commands/script/ls.ts b/packages/cli/src/commands/script/ls.ts
index cd7d98e9f8..e8271d0bef 100644
--- a/packages/cli/src/commands/script/ls.ts
+++ b/packages/cli/src/commands/script/ls.ts
@@ -12,7 +12,7 @@ export async function runLsCommand(
   options: WorkspaceScriptCommandOptions,
   _command: Command,
 ): Promise<ListResult<WorkspaceScriptRow>> {
-  const client = await connectWorkspaceScriptClient(options.host);
+  const client = await connectWorkspaceScriptClient(options.daemonTarget);
   try {
     const workspaceId = await resolveWorkspaceScriptWorkspaceId(client, options);
     const payload = await client.listWorkspaceScripts(workspaceId);
diff --git a/packages/cli/src/commands/script/shared.ts b/packages/cli/src/commands/script/shared.ts
index 4e3308bdfb..b5b2326b6c 100644
--- a/packages/cli/src/commands/script/shared.ts
+++ b/packages/cli/src/commands/script/shared.ts
@@ -1,3 +1,4 @@
+import type { DaemonTarget } from "../../utils/daemon-target.js";
 import { resolve } from "node:path";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
@@ -9,10 +10,10 @@ export interface WorkspaceScriptCommandOptions extends CommandOptions {
   workspace?: string;
 }
 
-export async function connectWorkspaceScriptClient(host?: string): Promise<DaemonClient> {
-  const daemonHost = getDaemonHost({ host });
+export async function connectWorkspaceScriptClient(target: DaemonTarget): Promise<DaemonClient> {
+  const daemonHost = getDaemonHost({ target });
   try {
-    const client = await connectToDaemon({ host });
+    const client = await connectToDaemon({ target });
     // COMPAT(workspaceScriptManagement): added in v0.1.105, remove gate after 2027-01-10.
     if (!client.getLastServerInfoMessage()?.features?.workspaceScriptManagement) {
       await client.close().catch(() => {});
diff --git a/packages/cli/src/commands/script/start.ts b/packages/cli/src/commands/script/start.ts
index 1b377267fa..0883f52720 100644
--- a/packages/cli/src/commands/script/start.ts
+++ b/packages/cli/src/commands/script/start.ts
@@ -13,7 +13,7 @@ export async function runStartCommand(
   options: WorkspaceScriptCommandOptions,
   _command: Command,
 ): Promise<SingleResult<WorkspaceScriptRow>> {
-  const client = await connectWorkspaceScriptClient(options.host);
+  const client = await connectWorkspaceScriptClient(options.daemonTarget);
   try {
     const workspaceId = await resolveWorkspaceScriptWorkspaceId(client, options);
     const payload = await client.startWorkspaceScriptWithStatus(workspaceId, scriptName);
diff --git a/packages/cli/src/commands/script/stop.ts b/packages/cli/src/commands/script/stop.ts
index 6855656057..21dbf21371 100644
--- a/packages/cli/src/commands/script/stop.ts
+++ b/packages/cli/src/commands/script/stop.ts
@@ -13,7 +13,7 @@ export async function runStopCommand(
   options: WorkspaceScriptCommandOptions,
   _command: Command,
 ): Promise<SingleResult<WorkspaceScriptRow>> {
-  const client = await connectWorkspaceScriptClient(options.host);
+  const client = await connectWorkspaceScriptClient(options.daemonTarget);
   try {
     const workspaceId = await resolveWorkspaceScriptWorkspaceId(client, options);
     const payload = await client.stopWorkspaceScript(workspaceId, scriptName);
diff --git a/packages/cli/src/commands/terminal/capture.ts b/packages/cli/src/commands/terminal/capture.ts
index 2dc8f2180d..94ff1726ee 100644
--- a/packages/cli/src/commands/terminal/capture.ts
+++ b/packages/cli/src/commands/terminal/capture.ts
@@ -16,11 +16,9 @@ export interface TerminalCaptureOptions extends TerminalCommandOptions {
 
 export async function runCaptureCommand(
   terminalId: string,
-  _options: TerminalCaptureOptions,
-  command: Command,
+  options: TerminalCaptureOptions,
+  _command: Command,
 ): Promise<void> {
-  const options = command.optsWithGlobals() as TerminalCaptureOptions;
-
   try {
     const payload = await executeCaptureCommand(terminalId, options);
     if (options.json) {
@@ -55,7 +53,7 @@ async function executeCaptureCommand(
   terminalId: string,
   options: TerminalCaptureOptions,
 ): Promise<{ terminalId: string; lines: string[]; totalLines: number }> {
-  const { client } = await connectTerminalClient(options.host);
+  const { client, close } = await connectTerminalClient(options.daemonTarget);
 
   try {
     const resolvedId = await resolveTerminalId(client, terminalId);
@@ -70,7 +68,7 @@ async function executeCaptureCommand(
     const start = options.scrollback ? 0 : parseLineNumber("--start", options.start);
     const end = parseLineNumber("--end", options.end);
 
-    return await client.captureTerminal(resolvedId, {
+    return await client.terminals.ref(resolvedId).capture({
       ...(start === undefined ? {} : { start }),
       ...(end === undefined ? {} : { end }),
       stripAnsi: !options.ansi,
@@ -78,7 +76,7 @@ async function executeCaptureCommand(
   } catch (err) {
     throw toTerminalCommandError("TERMINAL_CAPTURE_FAILED", "capture terminal output", err);
   } finally {
-    await client.close().catch(() => {});
+    await close().catch(() => {});
   }
 }
 
diff --git a/packages/cli/src/commands/terminal/create.ts b/packages/cli/src/commands/terminal/create.ts
index b71833b871..be41d877e0 100644
--- a/packages/cli/src/commands/terminal/create.ts
+++ b/packages/cli/src/commands/terminal/create.ts
@@ -1,13 +1,14 @@
 import type { Command } from "commander";
-import type { SingleResult, CommandError } from "../../output/index.js";
+import type { SingleResult } from "../../output/index.js";
 import {
   connectTerminalClient,
   toTerminalCommandError,
   type TerminalCommandOptions,
 } from "./shared.js";
-import { terminalSchema, type TerminalRow, toTerminalRow } from "./schema.js";
+import { terminalSchema, type TerminalRow } from "./schema.js";
 
 export interface TerminalCreateOptions extends TerminalCommandOptions {
+  workspace?: string;
   cwd?: string;
   name?: string;
 }
@@ -16,37 +17,26 @@ export async function runCreateCommand(
   options: TerminalCreateOptions,
   _command: Command,
 ): Promise<SingleResult<TerminalRow>> {
-  const { client } = await connectTerminalClient(options.host);
-  const cwd = options.cwd ?? process.cwd();
-
+  const { client, close } = await connectTerminalClient(options.daemonTarget);
   try {
-    const opened = await client.openProject(cwd);
-    if (!opened.workspace) {
-      const error: CommandError = {
-        code: "WORKSPACE_OPEN_FAILED",
-        message: opened.error ?? "Failed to open workspace",
-      };
-      throw error;
-    }
-
-    const payload = await client.createTerminal(cwd, options.name, undefined, {
-      workspaceId: opened.workspace.id,
+    const cwd = options.cwd ?? (options.workspace ? undefined : process.cwd());
+    const workspaceId =
+      options.workspace ?? (await client.workspaces.open(options.cwd ?? process.cwd())).id;
+    const terminal = await client.terminals.create({
+      workspaceId,
+      cwd,
+      name: options.name,
     });
-    if (!payload.terminal) {
-      const error: CommandError = {
-        code: "TERMINAL_CREATE_FAILED",
-        message: payload.error ?? "Failed to create terminal",
-      };
-      throw error;
-    }
+    const snapshot = terminal.current();
+    if (!snapshot) throw new Error("The daemon did not create a terminal");
     return {
       type: "single",
-      data: toTerminalRow(payload.terminal),
+      data: snapshot,
       schema: terminalSchema,
     };
   } catch (err) {
     throw toTerminalCommandError("TERMINAL_CREATE_FAILED", "create terminal", err);
   } finally {
-    await client.close().catch(() => {});
+    await close().catch(() => {});
   }
 }
diff --git a/packages/cli/src/commands/terminal/index.ts b/packages/cli/src/commands/terminal/index.ts
index ce647f78e6..22ffc39d31 100644
--- a/packages/cli/src/commands/terminal/index.ts
+++ b/packages/cli/src/commands/terminal/index.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import { withOutput } from "../../output/index.js";
 import {
   addDaemonHostOption,
@@ -18,15 +18,19 @@ export function createTerminalCommand(): Command {
     terminal
       .command("ls")
       .description("List terminals")
-      .option("--all", "List terminals across all workspaces")
-      .option("--cwd <path>", "Workspace directory"),
+      .addOption(
+        new Option("--all", "List terminals across all workspaces").conflicts(["cwd", "workspace"]),
+      )
+      .option("--workspace <id>", "Workspace ID")
+      .option("--cwd <path>", "Working directory"),
   ).action(withOutput(runLsCommand));
 
   addJsonAndDaemonHostOptions(
     terminal
       .command("create")
       .description("Create a terminal")
-      .option("--cwd <path>", "Workspace directory")
+      .option("--workspace <id>", "Workspace ID")
+      .option("--cwd <path>", "Working directory")
       .option("--name <name>", "Terminal name"),
   ).action(withOutput(runCreateCommand));
 
diff --git a/packages/cli/src/commands/terminal/kill.ts b/packages/cli/src/commands/terminal/kill.ts
index 0a574e16d8..685c8ecaf3 100644
--- a/packages/cli/src/commands/terminal/kill.ts
+++ b/packages/cli/src/commands/terminal/kill.ts
@@ -13,23 +13,23 @@ export async function runKillCommand(
   options: TerminalCommandOptions,
   _command: Command,
 ): Promise<SingleResult<TerminalKillRow>> {
-  const { client } = await connectTerminalClient(options.host);
+  const { client, close } = await connectTerminalClient(options.daemonTarget);
 
   try {
     const resolvedId = await requireTerminalId(client, terminalId);
-    const payload = await client.killTerminal(resolvedId);
+    await client.terminals.ref(resolvedId).kill();
     return {
       type: "single",
       data: {
-        terminalId: payload.terminalId,
-        success: payload.success,
+        terminalId: resolvedId,
+        success: true,
       },
       schema: terminalKillSchema,
     };
   } catch (err) {
     throw toTerminalCommandError("TERMINAL_KILL_FAILED", "kill terminal", err);
   } finally {
-    await client.close().catch(() => {});
+    await close().catch(() => {});
   }
 }
 
diff --git a/packages/cli/src/commands/terminal/ls.ts b/packages/cli/src/commands/terminal/ls.ts
index bcb6d90d48..23b1a182a6 100644
--- a/packages/cli/src/commands/terminal/ls.ts
+++ b/packages/cli/src/commands/terminal/ls.ts
@@ -5,11 +5,10 @@ import {
   toTerminalCommandError,
   type TerminalCommandOptions,
 } from "./shared.js";
-import { terminalSchema, type TerminalRow, toTerminalRow } from "./schema.js";
-
-type TerminalListEntry = Parameters<typeof toTerminalRow>[0];
+import { terminalSchema, type TerminalRow } from "./schema.js";
 
 export interface TerminalLsOptions extends TerminalCommandOptions {
+  workspace?: string;
   all?: boolean;
   cwd?: string;
 }
@@ -18,22 +17,19 @@ export async function runLsCommand(
   options: TerminalLsOptions,
   _command: Command,
 ): Promise<ListResult<TerminalRow>> {
-  const { client } = await connectTerminalClient(options.host);
-  const cwd = options.all ? undefined : (options.cwd ?? process.cwd());
+  const { client, close } = await connectTerminalClient(options.daemonTarget);
+  const cwd = options.all || options.workspace ? undefined : (options.cwd ?? process.cwd());
 
   try {
-    const payload =
-      cwd === undefined ? await client.listTerminals() : await client.listTerminals(cwd);
+    const payload = await client.terminals.list({ cwd, workspaceId: options.workspace });
     return {
       type: "list",
-      data: payload.terminals.map((terminal: TerminalListEntry) =>
-        toTerminalRow(terminal, payload.cwd ?? cwd),
-      ),
+      data: payload.entries,
       schema: terminalSchema,
     };
   } catch (err) {
     throw toTerminalCommandError("TERMINAL_LIST_FAILED", "list terminals", err);
   } finally {
-    await client.close().catch(() => {});
+    await close().catch(() => {});
   }
 }
diff --git a/packages/cli/src/commands/terminal/schema.ts b/packages/cli/src/commands/terminal/schema.ts
index 9b777ad196..def9c3c455 100644
--- a/packages/cli/src/commands/terminal/schema.ts
+++ b/packages/cli/src/commands/terminal/schema.ts
@@ -1,10 +1,7 @@
+import type { PaseoTerminal } from "@getpaseo/client";
 import type { OutputSchema } from "../../output/index.js";
 
-export interface TerminalRow {
-  id: string;
-  name: string;
-  cwd: string;
-}
+export type TerminalRow = PaseoTerminal;
 
 export interface TerminalKillRow {
   terminalId: string;
@@ -17,6 +14,7 @@ export const terminalSchema: OutputSchema<TerminalRow> = {
     { header: "ID", field: (row) => row.id.slice(0, 8), width: 8 },
     { header: "NAME", field: "name", width: 24 },
     { header: "CWD", field: "cwd", width: 48 },
+    { header: "WORKSPACE", field: "workspaceId", width: 24 },
   ],
 };
 
@@ -27,18 +25,3 @@ export const terminalKillSchema: OutputSchema<TerminalKillRow> = {
     { header: "SUCCESS", field: "success", width: 8 },
   ],
 };
-
-export function toTerminalRow(
-  terminal: {
-    id: string;
-    name: string;
-    cwd?: string;
-  },
-  cwd?: string,
-): TerminalRow {
-  return {
-    id: terminal.id,
-    name: terminal.name,
-    cwd: terminal.cwd ?? cwd ?? "-",
-  };
-}
diff --git a/packages/cli/src/commands/terminal/send-keys.ts b/packages/cli/src/commands/terminal/send-keys.ts
index f109cece64..8b1a274204 100644
--- a/packages/cli/src/commands/terminal/send-keys.ts
+++ b/packages/cli/src/commands/terminal/send-keys.ts
@@ -14,11 +14,9 @@ export interface TerminalSendKeysOptions extends TerminalCommandOptions {
 export async function runSendKeysCommand(
   terminalId: string,
   keys: string[],
-  _options: TerminalSendKeysOptions,
-  command: Command,
+  options: TerminalSendKeysOptions,
+  _command: Command,
 ): Promise<void> {
-  const options = command.optsWithGlobals() as TerminalSendKeysOptions;
-
   try {
     const payload = await executeSendKeysCommand(terminalId, keys, options);
     if (options.json) {
@@ -39,7 +37,7 @@ async function executeSendKeysCommand(
   keys: string[],
   options: TerminalSendKeysOptions,
 ): Promise<{ terminalId: string; keysSent: number }> {
-  const { client } = await connectTerminalClient(options.host);
+  const { client, close } = await connectTerminalClient(options.daemonTarget);
 
   try {
     const resolvedId = await resolveTerminalId(client, terminalId);
@@ -51,49 +49,16 @@ async function executeSendKeysCommand(
       };
     }
 
-    const data = keys.map((key) => resolveKeyToken(key, options.literal === true)).join("");
-    client.sendTerminalInput(resolvedId, { type: "input", data });
+    const terminal = client.terminals.ref(resolvedId);
+    const keysSent = options.literal ? terminal.write(keys.join("")) : terminal.sendKeys(keys);
 
     return {
       terminalId: resolvedId,
-      keysSent: data.length,
+      keysSent,
     };
   } catch (err) {
     throw toTerminalCommandError("TERMINAL_SEND_KEYS_FAILED", "send terminal keys", err);
   } finally {
-    await client.close().catch(() => {});
-  }
-}
-
-function resolveKeyToken(key: string, literal: boolean): string {
-  if (literal) {
-    return key;
-  }
-
-  switch (key) {
-    case "Enter":
-      return "\r";
-    case "Tab":
-      return "\t";
-    case "Escape":
-      return "\u001b";
-    case "Space":
-      return " ";
-    case "BSpace":
-      return "\u007f";
-    case "C-c":
-      return "\u0003";
-    case "C-d":
-      return "\u0004";
-    case "C-z":
-      return "\u001a";
-    case "C-l":
-      return "\u000c";
-    case "C-a":
-      return "\u0001";
-    case "C-e":
-      return "\u0005";
-    default:
-      return key;
+    await close().catch(() => {});
   }
 }
diff --git a/packages/cli/src/commands/terminal/shared.ts b/packages/cli/src/commands/terminal/shared.ts
index 6e04936575..0fcb9ef64d 100644
--- a/packages/cli/src/commands/terminal/shared.ts
+++ b/packages/cli/src/commands/terminal/shared.ts
@@ -1,3 +1,5 @@
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+import { createPaseoApi } from "@getpaseo/client";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
 import type { CommandError, CommandOptions } from "../../output/index.js";
 
@@ -10,12 +12,13 @@ interface TerminalLike {
   name?: string | null;
 }
 
-export async function connectTerminalClient(host?: string) {
-  const daemonHost = getDaemonHost({ host });
+export async function connectTerminalClient(target: DaemonTarget) {
+  const daemonHost = getDaemonHost({ target });
   try {
-    const client = await connectToDaemon({ host });
-    return { client, daemonHost };
+    const client = await connectToDaemon({ target });
+    return { client: createPaseoApi(client), daemonHost, close: () => client.close() };
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     const error: CommandError = {
       code: "DAEMON_NOT_RUNNING",
@@ -44,11 +47,11 @@ export function toTerminalCommandError(code: string, action: string, err: unknow
 }
 
 export async function resolveTerminalId(
-  client: Awaited<ReturnType<typeof connectToDaemon>>,
+  client: Awaited<ReturnType<typeof connectTerminalClient>>["client"],
   idOrName: string,
 ): Promise<string | null> {
-  const payload = await client.listTerminals();
-  return resolveTerminalIdentifier(idOrName, payload.terminals);
+  const payload = await client.terminals.list();
+  return resolveTerminalIdentifier(idOrName, payload.entries);
 }
 
 function resolveTerminalIdentifier(idOrName: string, terminals: TerminalLike[]): string | null {
diff --git a/packages/cli/src/commands/usage/index.test.ts b/packages/cli/src/commands/usage/index.test.ts
new file mode 100644
index 0000000000..9c2e3e8bbf
--- /dev/null
+++ b/packages/cli/src/commands/usage/index.test.ts
@@ -0,0 +1,279 @@
+import { describe, expect, it } from "vitest";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { render } from "../../output/index.js";
+import { createCli } from "../../cli.js";
+import { runUsageCommand } from "./index.js";
+
+const options = { daemonTarget: { kind: "endpoint" as const, host: "example.test:1234" } };
+const reports: UsageReportEntry[] = [
+  {
+    id: "plugin.source:work.account",
+    sourceId: "plugin.source",
+    sourceLabel: "Plugin Source",
+    account: { label: "Work" },
+    fetchedAt: "2026-10-09T12:00:00Z",
+    icon: "<svg />",
+    report: {
+      status: "available",
+      planLabel: "Pro",
+      windows: [
+        {
+          id: "5h",
+          label: "Five hours",
+          usedPct: 12.5,
+          remainingPct: 87.5,
+          resetsAt: "2026-10-09T17:00:00Z",
+          runsOutAt: "2026-10-09T16:00:00Z",
+          shortfallPct: 4.25,
+        },
+        { id: "week", label: "Weekly", usedPct: null, remainingPct: 0 },
+        { id: "extra", label: "Extra", usedPct: 0 },
+      ],
+      balances: [
+        {
+          id: "credit",
+          label: "Credit",
+          used: 0,
+          remaining: 2.5,
+          limit: 10,
+          unit: "usd",
+          resetsAt: "2026-11-01T00:00:00Z",
+        },
+        { id: "requests", label: "Requests", remaining: null, unit: "requests" },
+      ],
+      details: [{ id: "tier", label: "Tier", value: "Enterprise" }],
+    },
+  },
+  {
+    id: "plugin.source:personal",
+    sourceId: "plugin.source",
+    sourceLabel: "Plugin Source",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: {
+      status: "unavailable",
+      problem: { kind: "rejected", status: 401, refreshedBy: "codex login" },
+    },
+    loginErrors: [
+      {
+        harness: "Claude Code",
+        report: {
+          status: "unavailable",
+          problem: { kind: "expired", expiresAt: "2026-10-08T00:00:00Z", refreshedBy: "claude" },
+        },
+      },
+      {
+        harness: "Codex",
+        report: {
+          status: "unavailable",
+          problem: { kind: "rejected", status: 401, refreshedBy: "codex login" },
+        },
+      },
+      { harness: "Other", report: { status: "error", error: "Login service failed" } },
+    ],
+  },
+  {
+    id: "other:broken",
+    sourceId: "other",
+    sourceLabel: "Other",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: { status: "error", error: "Source failed" },
+  },
+  {
+    id: "other:noquota",
+    sourceId: "other",
+    sourceLabel: "Other",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: {
+      status: "unavailable",
+      problem: { kind: "no_quota", detail: "No quota for this plan" },
+    },
+  },
+];
+
+function host(entries = reports, supported = true) {
+  const requests: Array<Parameters<NonNullable<Parameters<typeof runUsageCommand>[2]>>[0]> = [];
+  const queries: Array<
+    { agentId?: string; forceRefresh?: boolean; reportIds?: string[] } | undefined
+  > = [];
+  let closed = 0;
+  return {
+    requests,
+    queries,
+    get closed() {
+      return closed;
+    },
+    connect: async (input: (typeof requests)[number]) => {
+      requests.push(input);
+      return {
+        getLastServerInfoMessage: () => ({ features: { usageSources: supported } }),
+        listUsageReports: async (query?: (typeof queries)[number]) => {
+          queries.push(query);
+          const selected = query?.reportIds
+            ? entries.filter((entry) => query.reportIds!.includes(entry.id))
+            : entries;
+          return { requestId: "request", reports: selected };
+        },
+        close: async () => {
+          closed++;
+        },
+      };
+    },
+  };
+}
+
+it("preserves complete JSON entries, numeric values and quiet full IDs", async () => {
+  const daemon = host();
+  const result = await runUsageCommand(options, { kind: "list" }, daemon.connect);
+  expect(JSON.parse(render(result, { format: "json" }))).toEqual(reports);
+  expect(render(result, { quiet: true })).toBe(reports.map((entry) => entry.id).join("\n"));
+  expect(daemon.requests).toEqual([{ target: options.daemonTarget }]);
+  expect(daemon.closed).toBe(1);
+});
+
+it("lists all windows, balances, missing values, failures and remedies", async () => {
+  const result = await runUsageCommand(options, { kind: "list" }, host().connect);
+  const text = render(result, { noColor: true });
+  for (const expected of [
+    "REPORT ID",
+    "SOURCE",
+    "ACCOUNT",
+    "STATUS",
+    "USAGE",
+    "FETCHED",
+    "Five hours: 12.5% used, 87.5% remaining",
+    "Weekly: - used, 0% remaining",
+    "Extra: 0% used, - remaining",
+    "Credit: 0 used, 2.5 remaining, 10 limit (usd)",
+    "Requests: - used, - remaining, - limit (requests)",
+    "Login expired at 2026-10-08T00:00:00Z. Run claude",
+    "Login rejected (HTTP 401). Run codex login",
+    "Other: Login service failed",
+    "Source failed",
+    "No quota for this plan",
+  ])
+    expect(text).toContain(expected);
+  expect(render(result, { noHeaders: true })).not.toContain("REPORT ID");
+});
+
+it("inspects exact opaque IDs and includes resets, forecasts, details and login failures", async () => {
+  const daemon = host();
+  const result = await runUsageCommand(
+    options,
+    { kind: "inspect", id: reports[0]!.id },
+    daemon.connect,
+  );
+  expect(JSON.parse(render(result, { format: "json" }))).toEqual(reports[0]);
+  const text = render(result);
+  for (const expected of [
+    "Source ID: plugin.source",
+    "Plan: Pro",
+    "Resets: 2026-10-09T17:00:00Z",
+    "Runs out: 2026-10-09T16:00:00Z",
+    "Shortfall: 4.25%",
+    "Resets: -",
+    "Resets: 2026-11-01T00:00:00Z",
+    "Tier: Enterprise",
+  ])
+    expect(text).toContain(expected);
+  const failure = await runUsageCommand(
+    options,
+    { kind: "inspect", id: reports[1]!.id },
+    daemon.connect,
+  );
+  expect(render(failure)).toContain("Login failures:\n  Claude Code: Login expired at");
+  expect(render(failure)).toContain("  Other: Login service failed");
+});
+
+it("discovers before inspecting, then refreshes only the selected report", async () => {
+  const daemon = host();
+  await runUsageCommand(
+    { ...options, refresh: true },
+    { kind: "inspect", id: reports[0]!.id },
+    daemon.connect,
+  );
+  expect(daemon.queries).toEqual([undefined, { reportIds: [reports[0]!.id], forceRefresh: true }]);
+});
+
+it("rejects agent selection combined with inspect before connecting", async () => {
+  const daemon = host();
+  await expect(
+    runUsageCommand(
+      { ...options, agent: "agent-A" },
+      { kind: "inspect", id: reports[0]!.id },
+      daemon.connect,
+    ),
+  ).rejects.toMatchObject({ code: "INVALID_OPTIONS" });
+  expect(daemon.requests).toEqual([]);
+});
+
+it("passes agent account selection and refresh without converting it to token consumption", async () => {
+  const daemon = host();
+  await runUsageCommand(
+    { ...options, agent: "agent-123", refresh: true },
+    { kind: "list" },
+    daemon.connect,
+  );
+  expect(daemon.queries).toEqual([{ agentId: "agent-123", forceRefresh: true }]);
+});
+
+it("returns an empty array in JSON and explains empty discovery in human output", async () => {
+  const result = await runUsageCommand(options, { kind: "list" }, host([]).connect);
+  expect(render(result, { format: "json" })).toBe("[]");
+  expect(render(result)).toBe("No usage reports returned");
+  expect(render(result, { quiet: true })).toBe("");
+});
+
+it("rejects unknown IDs and prefixes and closes the client", async () => {
+  const daemon = host();
+  await expect(
+    runUsageCommand(options, { kind: "inspect", id: "plugin.source:work" }, daemon.connect),
+  ).rejects.toEqual({
+    code: "REPORT_NOT_FOUND",
+    message: "Unknown usage report: plugin.source:work",
+  });
+  expect(daemon.closed).toBe(1);
+});
+
+it("gates unsupported hosts before any request and closes the connection", async () => {
+  const daemon = host(reports, false);
+  await expect(runUsageCommand(options, { kind: "list" }, daemon.connect)).rejects.toMatchObject({
+    code: "UNSUPPORTED_HOST",
+  });
+  expect(daemon.queries).toEqual([]);
+  expect(daemon.closed).toBe(1);
+});
+
+it("propagates connection and request failures", async () => {
+  await expect(
+    runUsageCommand(options, { kind: "list" }, async () => {
+      throw new Error("Connection failed");
+    }),
+  ).rejects.toThrow("Connection failed");
+  let closed = false;
+  const connect = async () => ({
+    getLastServerInfoMessage: () => ({ features: { usageSources: true } }),
+    listUsageReports: async () => {
+      throw new Error("Request failed");
+    },
+    close: async () => {
+      closed = true;
+    },
+  });
+  await expect(runUsageCommand(options, { kind: "list" }, connect)).rejects.toThrow(
+    "Request failed",
+  );
+  expect(closed).toBe(true);
+});
+
+describe("usage CLI registration", () => {
+  it("registers default, ls and inspect with the accepted selectors", () => {
+    const usage = createCli().commands.find((command) => command.name() === "usage")!;
+    expect(usage.commands.map((command) => command.name())).toEqual(["ls", "inspect"]);
+    expect(usage.helpInformation()).toContain("--agent <id>");
+    expect(usage.commands[0]!.helpInformation()).toContain("--refresh");
+    expect(usage.commands[1]!.helpInformation()).toContain("<report-id>");
+  });
+});
diff --git a/packages/cli/src/commands/usage/index.ts b/packages/cli/src/commands/usage/index.ts
new file mode 100644
index 0000000000..ab96fc659c
--- /dev/null
+++ b/packages/cli/src/commands/usage/index.ts
@@ -0,0 +1,95 @@
+import { Command } from "commander";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { connectToDaemon, type ConnectOptions } from "../../utils/client.js";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { withOutput, type CommandOptions, type CommandResult } from "../../output/index.js";
+import { usageSchema } from "./presentation.js";
+
+interface UsageOptions extends CommandOptions {
+  agent?: string;
+  refresh?: boolean;
+}
+
+type UsageSelection = { kind: "list" } | { kind: "inspect"; id: string };
+interface UsageClient {
+  getLastServerInfoMessage(): { features?: { usageSources?: boolean } } | null;
+  listUsageReports: DaemonClient["listUsageReports"];
+  close: DaemonClient["close"];
+}
+type ConnectUsage = (options: ConnectOptions) => Promise<UsageClient>;
+
+export async function runUsageCommand(
+  options: UsageOptions,
+  selection: UsageSelection,
+  connect: ConnectUsage = connectToDaemon,
+): Promise<CommandResult<UsageReportEntry>> {
+  const conflictingSelectors = selection.kind === "inspect" && options.agent !== undefined;
+  if (conflictingSelectors) {
+    throw {
+      code: "INVALID_OPTIONS",
+      message:
+        "--agent cannot be combined with usage inspect. Use usage ls --agent <id> for agent account usage, or usage inspect <report-id> for an exact report.",
+    };
+  }
+  const client = await connect({ target: options.daemonTarget });
+  try {
+    if (client.getLastServerInfoMessage()?.features?.usageSources !== true) {
+      throw { code: "UNSUPPORTED_HOST", message: "Update the host to use usage reports." };
+    }
+    if (selection.kind === "list") {
+      const { reports } = await client.listUsageReports({
+        agentId: options.agent,
+        forceRefresh: options.refresh,
+      });
+      return { type: "list", data: reports, schema: usageSchema };
+    }
+    // Report-ID queries only select known accounts. Discover before selecting, including on cold hosts.
+    const { reports } = await client.listUsageReports();
+    let entry = reports.find((report) => report.id === selection.id);
+    if (entry && options.refresh) {
+      const refreshed = await client.listUsageReports({
+        reportIds: [selection.id],
+        forceRefresh: true,
+      });
+      entry = refreshed.reports.find((report) => report.id === selection.id);
+    }
+    if (!entry) {
+      throw { code: "REPORT_NOT_FOUND", message: `Unknown usage report: ${selection.id}` };
+    }
+    return { type: "single", data: entry, schema: usageSchema };
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
+
+function addListOptions(command: Command): Command {
+  return addJsonAndDaemonHostOptions(command)
+    .option(
+      "--agent <id>",
+      "Show account quota associated with this agent (not agent token consumption)",
+    )
+    .option("--refresh", "Refresh usage instead of using the host cache");
+}
+
+export function createUsageCommand(): Command {
+  const usage = addListOptions(new Command("usage").description("Show account usage reports"));
+  const list = (options: CommandOptions, _command: Command) =>
+    runUsageCommand(options, { kind: "list" });
+  usage.action(withOutput(list));
+  addListOptions(usage.command("ls").description("List account quotas and balances")).action(
+    withOutput(list),
+  );
+  addJsonAndDaemonHostOptions(
+    usage
+      .command("inspect")
+      .description("Show a complete account usage report")
+      .argument("<report-id>", "Exact opaque Report ID")
+      .option("--refresh", "Refresh the selected report instead of using the host cache"),
+  ).action(
+    withOutput((id: string, options: CommandOptions, _command: Command) =>
+      runUsageCommand(options, { kind: "inspect", id }),
+    ),
+  );
+  return usage;
+}
diff --git a/packages/cli/src/commands/usage/presentation.ts b/packages/cli/src/commands/usage/presentation.ts
new file mode 100644
index 0000000000..ecc4aba405
--- /dev/null
+++ b/packages/cli/src/commands/usage/presentation.ts
@@ -0,0 +1,137 @@
+import type {
+  UsageReportEntry,
+  UsageReport,
+  UsageProblem,
+  ProviderUsageWindow,
+  ProviderUsageBalance,
+} from "@getpaseo/protocol/messages";
+import { renderTable, type OutputSchema } from "../../output/index.js";
+
+function value(input: string | number | null | undefined): string {
+  return input == null ? "-" : String(input);
+}
+
+function percent(input: number | null | undefined): string {
+  return input == null ? "-" : `${input}%`;
+}
+
+function problemText(problem: UsageProblem): string {
+  if (problem.kind === "no_quota") return problem.detail;
+  const remedy = problem.refreshedBy
+    ? `Run ${problem.refreshedBy} to refresh login.`
+    : "Sign in again.";
+  if (problem.kind === "expired") return `Login expired at ${problem.expiresAt}. ${remedy}`;
+  return `Login rejected (HTTP ${problem.status}). ${remedy}`;
+}
+
+function failureText(report: UsageReport): string {
+  if (report.status === "error") return report.error;
+  if (report.status === "unavailable") return problemText(report.problem);
+  return "-";
+}
+
+function windowText(window: ProviderUsageWindow): string {
+  return `${window.label}: ${percent(window.usedPct)} used, ${percent(window.remainingPct)} remaining`;
+}
+
+function balanceText(balance: ProviderUsageBalance): string {
+  return `${balance.label}: ${value(balance.used)} used, ${value(balance.remaining)} remaining, ${value(balance.limit)} limit (${balance.unit})`;
+}
+
+function summary(entry: UsageReportEntry): string[] {
+  const { report } = entry;
+  if (report.status !== "available") {
+    const lines = [failureText(report)];
+    for (const login of entry.loginErrors ?? [])
+      lines.push(`${login.harness}: ${failureText(login.report)}`);
+    return lines;
+  }
+  const lines = report.windows.map(windowText);
+  lines.push(...(report.balances ?? []).map(balanceText));
+  return lines.length ? lines : ["-"];
+}
+
+interface SummaryRow {
+  id: string;
+  source: string;
+  account: string;
+  status: string;
+  usage: string;
+  fetched: string;
+}
+
+const summarySchema: OutputSchema<SummaryRow> = {
+  idField: "id",
+  columns: [
+    { header: "REPORT ID", field: "id" },
+    { header: "SOURCE", field: "source" },
+    { header: "ACCOUNT", field: "account" },
+    { header: "STATUS", field: "status" },
+    { header: "USAGE", field: "usage" },
+    { header: "FETCHED", field: "fetched" },
+  ],
+};
+
+function inspect(entry: UsageReportEntry): string {
+  const lines = [
+    `Report ID: ${entry.id}`,
+    `Source: ${entry.sourceLabel}`,
+    `Source ID: ${entry.sourceId}`,
+    `Account: ${value(entry.account.label)}`,
+    `Status: ${entry.report.status}`,
+    `Fetched: ${value(entry.fetchedAt)}`,
+  ];
+  const { report } = entry;
+  if (report.status === "available") {
+    lines.push(`Plan: ${value(report.planLabel)}`, "Windows:");
+    if (!report.windows.length) lines.push("  -");
+    for (const window of report.windows) {
+      lines.push(`  ${windowText(window)} [${window.id}]`, `    Resets: ${value(window.resetsAt)}`);
+      if (window.runsOutAt != null) lines.push(`    Runs out: ${window.runsOutAt}`);
+      if (window.shortfallPct != null) lines.push(`    Shortfall: ${percent(window.shortfallPct)}`);
+    }
+    lines.push("Balances:");
+    if (!report.balances?.length) lines.push("  -");
+    for (const balance of report.balances ?? []) {
+      lines.push(
+        `  ${balanceText(balance)} [${balance.id}]`,
+        `    Resets: ${value(balance.resetsAt)}`,
+      );
+    }
+    lines.push("Details:");
+    if (!report.details?.length) lines.push("  -");
+    for (const detail of report.details ?? []) lines.push(`  ${detail.label}: ${detail.value}`);
+  } else {
+    lines.push(`Reason: ${failureText(report)}`);
+  }
+  if (entry.loginErrors?.length) {
+    lines.push("Login failures:");
+    for (const login of entry.loginErrors)
+      lines.push(`  ${login.harness}: ${failureText(login.report)}`);
+  }
+  return lines.join("\n");
+}
+
+export const usageSchema: OutputSchema<UsageReportEntry> = {
+  idField: "id",
+  columns: [],
+  renderHuman(result, options) {
+    if (result.type === "single") return inspect(result.data);
+    if (!result.data.length) return "No usage reports returned";
+    const rows: SummaryRow[] = [];
+    for (const entry of result.data) {
+      for (const [index, usage] of summary(entry).entries()) {
+        const first = index === 0;
+        rows.push({
+          id: first ? entry.id : "",
+          source: first ? entry.sourceLabel : "",
+          account: first ? value(entry.account.label) : "",
+          status: first ? entry.report.status : "",
+          usage,
+          fetched: first ? value(entry.fetchedAt) : "",
+        });
+      }
+    }
+    return renderTable<SummaryRow>({ type: "list", data: rows, schema: summarySchema }, options);
+  },
+};
diff --git a/packages/cli/src/commands/workspace/archive.ts b/packages/cli/src/commands/workspace/archive.ts
index 958d0451d0..a9dad90e91 100644
--- a/packages/cli/src/commands/workspace/archive.ts
+++ b/packages/cli/src/commands/workspace/archive.ts
@@ -19,11 +19,11 @@ const workspaceArchiveSchema: OutputSchema<WorkspaceArchiveResult> = {
 
 export async function runArchiveCommand(
   workspaceId: string,
-  options: { host?: string },
+  options: { host?: string; daemonTarget: import("../../utils/daemon-target.js").DaemonTarget },
   _command: Command,
 ): Promise<SingleResult<WorkspaceArchiveResult>> {
-  const host = getDaemonHost({ host: options.host });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
     const message = error instanceof Error ? error.message : String(error);
     throw {
       code: "DAEMON_NOT_RUNNING",
@@ -44,6 +44,7 @@ export async function runArchiveCommand(
       schema: workspaceArchiveSchema,
     };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "WORKSPACE_ARCHIVE_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/workspace/create.ts b/packages/cli/src/commands/workspace/create.ts
index 078eefb06e..04d9e10ef0 100644
--- a/packages/cli/src/commands/workspace/create.ts
+++ b/packages/cli/src/commands/workspace/create.ts
@@ -1,5 +1,6 @@
 import type { Command } from "commander";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { resolveCallerAgentId } from "../../utils/caller-agent.js";
 import type { CommandError, CommandOptions, SingleResult } from "../../output/index.js";
 import { toWorkspaceRow, workspaceSchema, type WorkspaceRow } from "./shared.js";
 
@@ -15,6 +16,7 @@ export interface WorkspaceCreateOptions extends CommandOptions {
   branch?: string;
   prNumber?: string;
   forge?: string;
+  background?: boolean;
 }
 
 interface WorktreeSourceBase {
@@ -134,8 +136,8 @@ export async function runCreateCommand(
   options: WorkspaceCreateOptions,
   _command: Command,
 ): Promise<SingleResult<WorkspaceRow>> {
-  const host = getDaemonHost({ host: options.host });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
     const message = error instanceof Error ? error.message : String(error);
     throw {
       code: "DAEMON_NOT_RUNNING",
@@ -144,15 +146,19 @@ export async function runCreateCommand(
   });
 
   try {
+    const callerAgentId = await resolveCallerAgentId(client);
     const payload = await client.createWorkspace({
       source: buildWorkspaceSource(options),
       ...(options.title ? { title: options.title } : {}),
+      ...(options.background !== undefined ? { background: options.background } : {}),
+      ...(callerAgentId ? { callerAgentId } : {}),
     });
     if (!payload.workspace) {
       throw new Error(payload.error ?? "Workspace creation failed");
     }
     return { type: "single", data: toWorkspaceRow(payload.workspace), schema: workspaceSchema };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "WORKSPACE_CREATE_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/workspace/index.ts b/packages/cli/src/commands/workspace/index.ts
index 19d640d252..7d15ef26f3 100644
--- a/packages/cli/src/commands/workspace/index.ts
+++ b/packages/cli/src/commands/workspace/index.ts
@@ -34,12 +34,17 @@ export function createWorkspaceCommand(): Command {
       .option("--base <ref>", "Base ref (--mode branch-off)")
       .option("--branch <name>", "Existing branch (--mode checkout-branch)")
       .option("--pr-number <n>", "Pull request or change request number (--mode checkout-pr)")
-      .option("--forge <forge>", "Forge for --mode checkout-pr (default: source checkout)"),
+      .option("--forge <forge>", "Forge for --mode checkout-pr (default: source checkout)")
+      .option("--background", "Create a background workspace")
+      .option("--no-background", "Create a visible workspace instead of inheriting background"),
   ).action(withOutput(runCreateCommand));
 
-  addJsonAndDaemonHostOptions(workspace.command("ls").description("List active workspaces")).action(
-    withOutput(runLsCommand),
-  );
+  addJsonAndDaemonHostOptions(
+    workspace
+      .command("ls")
+      .description("List active workspaces")
+      .option("--background", "Include background workspaces"),
+  ).action(withOutput(runLsCommand));
 
   addJsonAndDaemonHostOptions(
     workspace
diff --git a/packages/cli/src/commands/workspace/ls.ts b/packages/cli/src/commands/workspace/ls.ts
index 7ea9e8f56d..680bb06e1c 100644
--- a/packages/cli/src/commands/workspace/ls.ts
+++ b/packages/cli/src/commands/workspace/ls.ts
@@ -1,14 +1,26 @@
 import type { Command } from "commander";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
 import type { CommandError, ListResult } from "../../output/index.js";
-import { toWorkspaceRow, workspaceSchema, type WorkspaceRow } from "./shared.js";
+import {
+  toWorkspaceRow,
+  workspaceSchema,
+  workspaceWithBackgroundSchema,
+  type WorkspaceRow,
+} from "./shared.js";
+
+export interface WorkspaceLsOptions {
+  host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
+  /** --background: Include background workspaces */
+  background?: boolean;
+}
 
 export async function runLsCommand(
-  options: { host?: string },
+  options: WorkspaceLsOptions,
   _command: Command,
 ): Promise<ListResult<WorkspaceRow>> {
-  const host = getDaemonHost({ host: options.host });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
     const message = error instanceof Error ? error.message : String(error);
     throw {
       code: "DAEMON_NOT_RUNNING",
@@ -20,12 +32,17 @@ export async function runLsCommand(
     let cursor: string | undefined;
     do {
       const payload = await client.fetchWorkspaces({
+        ...(options.background ? { filter: { includeBackground: true } } : {}),
         page: { limit: 200, ...(cursor ? { cursor } : {}) },
       });
       workspaces.push(...payload.entries.map(toWorkspaceRow));
       cursor = payload.pageInfo.nextCursor ?? undefined;
     } while (cursor);
-    return { type: "list", data: workspaces, schema: workspaceSchema };
+    return {
+      type: "list",
+      data: workspaces,
+      schema: options.background ? workspaceWithBackgroundSchema : workspaceSchema,
+    };
   } finally {
     await client.close().catch(() => undefined);
   }
diff --git a/packages/cli/src/commands/workspace/rename.ts b/packages/cli/src/commands/workspace/rename.ts
index fd5857682b..85fa5f5ff4 100644
--- a/packages/cli/src/commands/workspace/rename.ts
+++ b/packages/cli/src/commands/workspace/rename.ts
@@ -18,6 +18,7 @@ const workspaceRenameSchema: OutputSchema<WorkspaceRenameResult> = {
 
 export interface WorkspaceRenameOptions {
   host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
   reset?: boolean;
 }
 
@@ -55,8 +56,8 @@ export async function runRenameCommand(
 ): Promise<SingleResult<WorkspaceRenameResult>> {
   const title = resolveWorkspaceTitle({ title: titleArg, reset: options.reset });
 
-  const host = getDaemonHost({ host: options.host });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
     const message = error instanceof Error ? error.message : String(error);
     throw {
       code: "DAEMON_NOT_RUNNING",
@@ -72,6 +73,7 @@ export async function runRenameCommand(
       schema: workspaceRenameSchema,
     };
   } catch (error) {
+    if (error && typeof error === "object" && "code" in error) throw error;
     const message = error instanceof Error ? error.message : String(error);
     throw { code: "WORKSPACE_RENAME_FAILED", message } satisfies CommandError;
   } finally {
diff --git a/packages/cli/src/commands/workspace/setup.ts b/packages/cli/src/commands/workspace/setup.ts
index ce15d10f26..0d9e99821a 100644
--- a/packages/cli/src/commands/workspace/setup.ts
+++ b/packages/cli/src/commands/workspace/setup.ts
@@ -17,11 +17,11 @@ const workspaceSetupSchema: OutputSchema<WorkspaceSetupResult> = {
 
 export async function runSetupCommand(
   workspaceId: string,
-  options: { host?: string },
+  options: { host?: string; daemonTarget: import("../../utils/daemon-target.js").DaemonTarget },
   _command: Command,
 ): Promise<SingleResult<WorkspaceSetupResult>> {
-  const host = getDaemonHost({ host: options.host });
-  const client = await connectToDaemon({ host: options.host }).catch((error: unknown) => {
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget }).catch((error: unknown) => {
     throw {
       code: "DAEMON_NOT_RUNNING",
       message: `Cannot connect to daemon at ${host}: ${error instanceof Error ? error.message : String(error)}`,
diff --git a/packages/cli/src/commands/workspace/shared.ts b/packages/cli/src/commands/workspace/shared.ts
index cd800c9f10..db047e57b3 100644
--- a/packages/cli/src/commands/workspace/shared.ts
+++ b/packages/cli/src/commands/workspace/shared.ts
@@ -7,6 +7,7 @@ export interface WorkspaceRow {
   name: string;
   isolation: "local" | "worktree";
   cwd: string;
+  background: boolean;
 }
 
 export const workspaceSchema: OutputSchema<WorkspaceRow> = {
@@ -20,6 +21,15 @@ export const workspaceSchema: OutputSchema<WorkspaceRow> = {
   ],
 };
 
+/** `--background` listings add a column so hidden workspaces stand out. */
+export const workspaceWithBackgroundSchema: OutputSchema<WorkspaceRow> = {
+  ...workspaceSchema,
+  columns: [
+    ...workspaceSchema.columns,
+    { header: "BACKGROUND", field: (row) => (row.background ? "yes" : ""), width: 8 },
+  ],
+};
+
 export function toWorkspaceRow(workspace: WorkspaceDescriptorPayload): WorkspaceRow {
   return {
     workspaceId: workspace.id,
@@ -27,5 +37,6 @@ export function toWorkspaceRow(workspace: WorkspaceDescriptorPayload): Workspace
     name: workspace.name,
     isolation: workspace.workspaceKind === "worktree" ? "worktree" : "local",
     cwd: workspace.workspaceDirectory,
+    background: workspace.background === true,
   };
 }
diff --git a/packages/cli/src/commands/worktree/archive.test.ts b/packages/cli/src/commands/worktree/archive.test.ts
index 5314be144d..f591aaa6a7 100644
--- a/packages/cli/src/commands/worktree/archive.test.ts
+++ b/packages/cli/src/commands/worktree/archive.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { runArchiveCommandWithDeps } from "./archive.js";
 
+const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
+
 function createFakeDaemonClient(
   overrides: Partial<
     Pick<DaemonClient, "getPaseoWorktreeList" | "archivePaseoWorktree" | "close">
@@ -60,9 +62,12 @@ describe("runArchiveCommand", () => {
 
     const result = await runArchiveCommandWithDeps(
       "feature",
-      {},
+      { daemonTarget },
       {
-        connectToDaemon: async () => fakeClient,
+        connectToDaemon: async (options) => {
+          expect(options.target).toEqual(daemonTarget);
+          return fakeClient;
+        },
       },
     );
 
@@ -111,9 +116,12 @@ describe("runArchiveCommand", () => {
 
     await runArchiveCommandWithDeps(
       "feature-x",
-      {},
+      { daemonTarget },
       {
-        connectToDaemon: async () => fakeClient,
+        connectToDaemon: async (options) => {
+          expect(options.target).toEqual(daemonTarget);
+          return fakeClient;
+        },
       },
     );
 
@@ -134,9 +142,12 @@ describe("runArchiveCommand", () => {
     await expect(
       runArchiveCommandWithDeps(
         "missing",
-        {},
+        { daemonTarget },
         {
-          connectToDaemon: async () => fakeClient,
+          connectToDaemon: async (options) => {
+            expect(options.target).toEqual(daemonTarget);
+            return fakeClient;
+          },
         },
       ),
     ).rejects.toMatchObject({
diff --git a/packages/cli/src/commands/worktree/archive.ts b/packages/cli/src/commands/worktree/archive.ts
index 711711dced..5d2bc60f33 100644
--- a/packages/cli/src/commands/worktree/archive.ts
+++ b/packages/cli/src/commands/worktree/archive.ts
@@ -2,6 +2,7 @@ import path from "path";
 import type { Command } from "commander";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { resolveRepositoryDirectory } from "./repository-directory.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -31,6 +32,7 @@ export const archiveSchema: OutputSchema<WorktreeArchiveResult> = {
 
 export interface WorktreeArchiveOptions extends CommandOptions {
   host?: string;
+  cwd?: string;
 }
 
 export type WorktreeArchiveCommandResult = SingleResult<WorktreeArchiveResult>;
@@ -48,7 +50,8 @@ export async function runArchiveCommandWithDeps(
   options: WorktreeArchiveOptions,
   deps: { connectToDaemon: typeof connectToDaemon },
 ): Promise<WorktreeArchiveCommandResult> {
-  const host = getDaemonHost({ host: options.host });
+  const host = getDaemonHost({ target: options.daemonTarget });
+  const cwd = resolveRepositoryDirectory(options);
 
   // Validate arguments
   if (!nameArg || nameArg.trim().length === 0) {
@@ -62,8 +65,9 @@ export async function runArchiveCommandWithDeps(
 
   let client: DaemonClient;
   try {
-    client = await deps.connectToDaemon({ host: options.host });
+    client = await deps.connectToDaemon({ target: options.daemonTarget });
   } catch (err) {
+    if (err && typeof err === "object" && "code" in err) throw err;
     const message = err instanceof Error ? err.message : String(err);
     const error: CommandError = {
       code: "DAEMON_NOT_RUNNING",
@@ -75,7 +79,7 @@ export async function runArchiveCommandWithDeps(
 
   try {
     // Get the list of worktrees first to resolve the name
-    const listResponse = await client.getPaseoWorktreeList({});
+    const listResponse = await client.getPaseoWorktreeList({ cwd });
 
     if (listResponse.error) {
       const error: CommandError = {
diff --git a/packages/cli/src/commands/worktree/create.ts b/packages/cli/src/commands/worktree/create.ts
index 257fadc679..da7d873b5a 100644
--- a/packages/cli/src/commands/worktree/create.ts
+++ b/packages/cli/src/commands/worktree/create.ts
@@ -1,7 +1,6 @@
 import path from "node:path";
 import type { Command } from "commander";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { connectToDaemon } from "../../utils/client.js";
 import type { CommandError, OutputSchema, SingleResult } from "../../output/index.js";
 import { buildCreateWorktreeRequest, type WorktreeCreateOptions } from "./create-input.js";
 
@@ -31,18 +30,7 @@ export async function runCreateCommand(
   const cwd = options.cwd ?? process.cwd();
   const request = buildCreateWorktreeRequest(options, cwd);
 
-  const host = getDaemonHost({ host: options.host });
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    throw cmdError(
-      "DAEMON_NOT_RUNNING",
-      `Cannot connect to daemon at ${host}: ${message}`,
-      "Start the daemon with: paseo daemon start",
-    );
-  }
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const response = await client.createPaseoWorktree(request);
diff --git a/packages/cli/src/commands/worktree/index.ts b/packages/cli/src/commands/worktree/index.ts
index f35f001a38..37405e2630 100644
--- a/packages/cli/src/commands/worktree/index.ts
+++ b/packages/cli/src/commands/worktree/index.ts
@@ -9,7 +9,10 @@ export function createWorktreeCommand(): Command {
   const worktree = new Command("worktree").description("Manage Paseo-managed git worktrees");
 
   addJsonAndDaemonHostOptions(
-    worktree.command("ls").description("List Paseo-managed git worktrees"),
+    worktree
+      .command("ls")
+      .description("List Paseo-managed git worktrees")
+      .option("--cwd <path>", "Repository directory (default: current)"),
   ).action(withOutput(runLsCommand));
 
   addJsonAndDaemonHostOptions(
@@ -31,7 +34,8 @@ export function createWorktreeCommand(): Command {
     worktree
       .command("archive")
       .description("Archive a worktree (removes worktree and associated branch)")
-      .argument("<name>", "Worktree name or branch name"),
+      .argument("<name>", "Worktree name or branch name")
+      .option("--cwd <path>", "Repository directory (default: current)"),
   ).action(withOutput(runArchiveCommand));
 
   return worktree;
diff --git a/packages/cli/src/commands/worktree/ls.ts b/packages/cli/src/commands/worktree/ls.ts
index 10f1344e17..43940131ce 100644
--- a/packages/cli/src/commands/worktree/ls.ts
+++ b/packages/cli/src/commands/worktree/ls.ts
@@ -1,8 +1,7 @@
 import type { Command } from "commander";
-import { homedir } from "node:os";
-import { basename, join, sep } from "node:path";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { basename } from "node:path";
+import { connectToDaemon } from "../../utils/client.js";
+import { resolveRepositoryDirectory } from "./repository-directory.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
 /** Worktree list item for display */
@@ -27,19 +26,6 @@ function extractWorktreeName(path: string): string {
   return basename(path);
 }
 
-export function resolvePaseoHomePath(): string {
-  return process.env.PASEO_HOME ?? join(homedir(), ".paseo");
-}
-
-export function resolvePaseoWorktreesDir(): string {
-  return join(resolvePaseoHomePath(), "worktrees");
-}
-
-function isAgentInManagedWorktree(agentCwd: string): boolean {
-  const worktreesDir = resolvePaseoWorktreesDir();
-  return agentCwd === worktreesDir || agentCwd.startsWith(worktreesDir + sep);
-}
-
 /** Schema for worktree ls output */
 export const worktreeLsSchema: OutputSchema<WorktreeListItem> = {
   idField: "name",
@@ -55,33 +41,22 @@ export type WorktreeLsResult = ListResult<WorktreeListItem>;
 
 export interface WorktreeLsOptions extends CommandOptions {
   host?: string;
+  cwd?: string;
 }
 
 export async function runLsCommand(
   options: WorktreeLsOptions,
   _command: Command,
 ): Promise<WorktreeLsResult> {
-  const host = getDaemonHost({ host: options.host });
-
-  let client: DaemonClient;
-  try {
-    client = await connectToDaemon({ host: options.host });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DAEMON_NOT_RUNNING",
-      message: `Cannot connect to daemon at ${host}: ${message}`,
-      details: "Start the daemon with: paseo daemon start",
-    };
-    throw error;
-  }
+  const cwd = resolveRepositoryDirectory(options);
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const agentsPayload = await client.fetchAgents({ filter: { includeArchived: true } });
     const agents = agentsPayload.entries.map((entry) => entry.agent);
 
     // Get worktree list from daemon
-    const response = await client.getPaseoWorktreeList({});
+    const response = await client.getPaseoWorktreeList({ cwd });
 
     await client.close();
 
@@ -96,9 +71,7 @@ export async function runLsCommand(
     // Build a map of worktree paths to agent IDs
     const worktreeAgentMap = new Map<string, string>();
     for (const agent of agents) {
-      if (isAgentInManagedWorktree(agent.cwd)) {
-        worktreeAgentMap.set(agent.cwd, agent.id.slice(0, 7));
-      }
+      worktreeAgentMap.set(agent.cwd, agent.id.slice(0, 7));
     }
 
     const items: WorktreeListItem[] = response.worktrees.map((wt) => ({
diff --git a/packages/cli/src/commands/worktree/repository-directory.ts b/packages/cli/src/commands/worktree/repository-directory.ts
new file mode 100644
index 0000000000..3c241703c0
--- /dev/null
+++ b/packages/cli/src/commands/worktree/repository-directory.ts
@@ -0,0 +1,13 @@
+import { resolve } from "node:path";
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+
+export function resolveRepositoryDirectory(options: {
+  cwd?: string;
+  daemonTarget: DaemonTarget;
+}): string {
+  const cwd = options.cwd ?? process.cwd();
+  if (options.daemonTarget.kind === "instance") {
+    return resolve(cwd);
+  }
+  return cwd;
+}
diff --git a/packages/cli/src/output/pairing.test.ts b/packages/cli/src/output/pairing.test.ts
index 89fc31d85e..71cf630069 100644
--- a/packages/cli/src/output/pairing.test.ts
+++ b/packages/cli/src/output/pairing.test.ts
@@ -30,4 +30,17 @@ describe("formatPairingInstructions", () => {
     expect(output).toContain("terminal width could not be detected");
     expect(output.split("\n")).toContain(URL);
   });
+
+  it("redacts a password in a printed connection URI", () => {
+    const output = formatPairingInstructions({
+      qr: null,
+      url: URL,
+      connectionUri: "relay://relay.paseo.sh:443/srv_test?key=public&password=private-value",
+    });
+
+    expect(output).toContain(
+      "relay://relay.paseo.sh:443/srv_test?key=public&password=%5Bredacted%5D",
+    );
+    expect(output).not.toContain("private-value");
+  });
 });
diff --git a/packages/cli/src/output/pairing.ts b/packages/cli/src/output/pairing.ts
index 741c8fd056..a5bbe7659d 100644
--- a/packages/cli/src/output/pairing.ts
+++ b/packages/cli/src/output/pairing.ts
@@ -3,6 +3,7 @@ const ANSI_PATTERN = new RegExp(`${String.fromCharCode(0x1b)}\\[[0-9;]*m`, "g");
 interface PairingInstructions {
   url: string;
   qr: string | null;
+  connectionUri?: string | null;
   columns?: number;
 }
 
@@ -32,6 +33,23 @@ function formatQr(qr: string | null, columns: number | undefined): string {
   return qr;
 }
 
-export function formatPairingInstructions({ url, qr, columns }: PairingInstructions): string {
-  return `\nScan to pair:\n${formatQr(qr, columns)}\n\nPairing link:\n${url}\n\nTreat this pairing link like a password. Anyone with it can access this daemon.\n`;
+function redactConnectionUri(uri: string): string {
+  try {
+    const parsed = new URL(uri);
+    if (parsed.searchParams.has("password")) {
+      parsed.searchParams.set("password", "[redacted]");
+    }
+    return parsed.toString();
+  } catch {
+    return "Invalid connection URI";
+  }
+}
+
+export function formatPairingInstructions({
+  url,
+  qr,
+  columns,
+  connectionUri,
+}: PairingInstructions): string {
+  return `\nScan to pair:\n${formatQr(qr, columns)}\n\nPairing link:\n${url}${connectionUri ? `\n\nConnection URI:\n${redactConnectionUri(connectionUri)}` : ""}\n\nTreat this pairing link like a password. Anyone with it can access this daemon.\n`;
 }
diff --git a/packages/cli/src/output/render.test.ts b/packages/cli/src/output/render.test.ts
new file mode 100644
index 0000000000..bc7dced1ca
--- /dev/null
+++ b/packages/cli/src/output/render.test.ts
@@ -0,0 +1,16 @@
+import { expect, it } from "vitest";
+import { renderError, toCommandError } from "./index.js";
+
+it("preserves the message of an Error with an RPC code in JSON output", () => {
+  const error = Object.assign(new Error("Plugin requires Paseo >=0.8.0. Your daemon is 0.7.2."), {
+    code: "handler_error",
+    requestId: "request-1",
+  });
+  expect(JSON.parse(renderError(toCommandError(error), { format: "json" }))).toEqual({
+    error: {
+      code: "handler_error",
+      requestId: "request-1",
+      message: "Plugin requires Paseo >=0.8.0. Your daemon is 0.7.2.",
+    },
+  });
+});
diff --git a/packages/cli/src/output/render.ts b/packages/cli/src/output/render.ts
index f3eb9f8aec..d21e53344a 100644
--- a/packages/cli/src/output/render.ts
+++ b/packages/cli/src/output/render.ts
@@ -50,7 +50,8 @@ export function render<T>(
 /** Convert an unknown error to a CommandError */
 export function toCommandError(error: unknown): CommandError {
   if (isCommandError(error)) {
-    return error;
+    // Error.message and class getters are not enumerable; materialize the output contract.
+    return { ...error, code: error.code, message: error.message, details: error.details };
   }
 
   if (error instanceof Error) {
diff --git a/packages/cli/src/output/with-output.ts b/packages/cli/src/output/with-output.ts
index ad0f631988..723b6c15d5 100644
--- a/packages/cli/src/output/with-output.ts
+++ b/packages/cli/src/output/with-output.ts
@@ -11,6 +11,8 @@ import { withGlobalOptions } from "../utils/command-options.js";
 
 /** Options that include output settings from global options */
 export interface CommandOptions extends Partial<OutputOptions> {
+  daemonTarget: import("../utils/daemon-target.js").DaemonTarget;
+  home?: string;
   /** Daemon host target from --host option */
   host?: string;
   /** JSON output flag from --json option */
diff --git a/packages/cli/src/run.test.ts b/packages/cli/src/run.test.ts
index 8a0a685829..651719e806 100644
--- a/packages/cli/src/run.test.ts
+++ b/packages/cli/src/run.test.ts
@@ -1,10 +1,59 @@
+import { spawn } from "node:child_process";
 import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { describe, expect, it } from "vitest";
+import { createCli } from "./cli";
 import { createCliParseArgv } from "./run";
 
+const runModuleUrl = new URL("./run.ts", import.meta.url).href;
+
+// Runs the CLI in a child process whose stdout pipe has no reader, as when the
+// program that launched it has already closed its end.
+async function runCliWithClosedStdout(
+  argv: string[],
+): Promise<{ code: number | null; stderr: string }> {
+  const script = `
+    const { runCli } = await import(${JSON.stringify(runModuleUrl)});
+    process.exitCode = await runCli(${JSON.stringify(argv)});
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    process.stderr.write("still running\\n");
+  `;
+  const child = spawn(process.execPath, ["--import", "tsx", "--input-type=module", "-e", script], {
+    cwd: path.dirname(fileURLToPath(import.meta.url)),
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  child.stdout.destroy();
+  let stderr = "";
+  child.stderr.setEncoding("utf8");
+  child.stderr.on("data", (chunk: string) => {
+    stderr += chunk;
+  });
+  const code = await new Promise<number | null>((resolve) => child.on("close", resolve));
+  return { code, stderr };
+}
+
 describe("runCli", () => {
+  it("lets plugin update own --version while preserving global output options", async () => {
+    const cli = createCli()
+      .exitOverride()
+      .configureOutput({ writeOut: () => {} });
+    const update = cli.commands
+      .find((command) => command.name() === "plugin")!
+      .commands.find((command) => command.name() === "update")!;
+    let received: Record<string, unknown> | undefined;
+    update.action((_id, options) => {
+      received = options;
+    });
+    await cli.parseAsync(
+      ["plugin", "update", "example", "--version", "1.2.0", "--format", "json", "--no-color"],
+      { from: "user" },
+    );
+    expect(received).toMatchObject({ version: "1.2.0" });
+    expect(update.optsWithGlobals()).toMatchObject({ format: "json", color: false });
+  });
+
   it("defaults an empty CLI invocation to onboard", () => {
     expect(
       createCliParseArgv({
@@ -52,6 +101,19 @@ describe("runCli", () => {
     ).toEqual(["node", "paseo", "hooks", "claude", "UserPromptSubmit"]);
   });
 
+  it("finishes the command quietly when stdout is closed before it writes its output", async () => {
+    const home = mkdtempSync(path.join(tmpdir(), "paseo-cli-closed-stdout-"));
+
+    try {
+      const result = await runCliWithClosedStdout(["daemon", "status", "--json", "--home", home]);
+
+      expect(result.stderr).toBe("still running\n");
+      expect(result.code).toBe(0);
+    } finally {
+      rmSync(home, { recursive: true, force: true });
+    }
+  }, 30_000);
+
   it("classifies existing unknown directories as open-project invocations", () => {
     const root = mkdtempSync(path.join(tmpdir(), "paseo-cli-run-"));
     const project = path.join(root, "repository");
diff --git a/packages/cli/src/run.ts b/packages/cli/src/run.ts
index 4b679c5298..ac67e80745 100644
--- a/packages/cli/src/run.ts
+++ b/packages/cli/src/run.ts
@@ -1,3 +1,4 @@
+import { renderError, toCommandError, defaultOutputOptions } from "./output/render.js";
 import { createCli } from "./cli.js";
 import { classifyInvocation } from "./classify.js";
 import { openDesktopWithProject } from "./commands/open.js";
@@ -35,7 +36,21 @@ export function createCliParseArgv(input: {
   return [...nodeArgv, ...cliArgv];
 }
 
+// The program that started the CLI can close its end of stdout before the output
+// is written, as `paseo ls | head -1` or a launcher that discards output does.
+// Drop the output nobody reads and let the command finish, instead of surfacing
+// the failed write as an uncaught error.
+function ignoreClosedStdout(error: NodeJS.ErrnoException): void {
+  if (error.code !== "EPIPE") {
+    throw error;
+  }
+}
+
 export async function runCli(argv: string[], options: RunCliOptions = {}): Promise<number> {
+  if (!process.stdout.listeners("error").includes(ignoreClosedStdout)) {
+    process.stdout.on("error", ignoreClosedStdout);
+  }
+
   const parseArgv = createCliParseArgv({
     argv,
     cwd: options.cwd ?? process.cwd(),
@@ -48,6 +63,16 @@ export async function runCli(argv: string[], options: RunCliOptions = {}): Promi
   }
 
   const program = createCli();
-  await program.parseAsync(parseArgv, { from: "node" });
+  try {
+    await program.parseAsync(parseArgv, { from: "node" });
+  } catch (error) {
+    process.stderr.write(
+      renderError(toCommandError(error), {
+        ...defaultOutputOptions,
+        format: argv.includes("--json") ? "json" : "table",
+      }) + "\n",
+    );
+    return 1;
+  }
   return typeof process.exitCode === "number" ? process.exitCode : 0;
 }
diff --git a/packages/cli/src/utils/caller-agent.ts b/packages/cli/src/utils/caller-agent.ts
new file mode 100644
index 0000000000..3bc2ee6223
--- /dev/null
+++ b/packages/cli/src/utils/caller-agent.ts
@@ -0,0 +1,21 @@
+import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+
+interface CallerLookupClient {
+  fetchAgent(options: { agentId: string }): Promise<{ agent: { id: string } } | null>;
+}
+
+// PASEO_AGENT_ID belongs to the daemon that launched this shell. Commands
+// targeting another daemon (--host or --home) have no caller on that daemon.
+export async function resolveCallerAgentId(
+  client: CallerLookupClient,
+  env: { PASEO_AGENT_ID?: string } = process.env,
+): Promise<string | undefined> {
+  const agentId = env.PASEO_AGENT_ID?.trim();
+  if (!agentId) return undefined;
+  const caller = await client.fetchAgent({ agentId }).catch((error: unknown) => {
+    // A missing agent is a daemon answer; a lost or timed-out connection is not.
+    if (error instanceof DaemonConnectionError) throw error;
+    return null;
+  });
+  return caller?.agent.id === agentId ? agentId : undefined;
+}
diff --git a/packages/cli/src/utils/client-id.ts b/packages/cli/src/utils/client-id.ts
index 13863e0945..84a04b3951 100644
--- a/packages/cli/src/utils/client-id.ts
+++ b/packages/cli/src/utils/client-id.ts
@@ -1,14 +1,7 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { ensurePrivateDirectory } from "@getpaseo/server/daemon-control";
+import { readFile, writeFile } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
-import { dirname, join } from "node:path";
-import { homedir } from "node:os";
-
-const CLIENT_SESSION_KEY_FILE = join(
-  process.env.PASEO_HOME ?? join(homedir(), ".paseo"),
-  "cli-client-id",
-);
-
-let cachedClientId: string | null = null;
+import { join } from "node:path";
 
 function normalizeClientId(value: string): string | null {
   const trimmed = value.trim();
@@ -19,15 +12,12 @@ function generateClientId(): string {
   return `cid_${randomUUID().replace(/-/g, "")}`;
 }
 
-export async function getOrCreateCliClientId(): Promise<string> {
-  if (cachedClientId) {
-    return cachedClientId;
-  }
+export async function getOrCreateCliClientId(home: string): Promise<string> {
+  const clientSessionKeyFile = join(home, "cli-client-id");
 
   try {
-    const existing = normalizeClientId(await readFile(CLIENT_SESSION_KEY_FILE, "utf8"));
+    const existing = normalizeClientId(await readFile(clientSessionKeyFile, "utf8"));
     if (existing) {
-      cachedClientId = existing;
       return existing;
     }
   } catch (error) {
@@ -38,8 +28,7 @@ export async function getOrCreateCliClientId(): Promise<string> {
   }
 
   const nextValue = generateClientId();
-  await mkdir(dirname(CLIENT_SESSION_KEY_FILE), { recursive: true });
-  await writeFile(CLIENT_SESSION_KEY_FILE, nextValue, { mode: 0o600 });
-  cachedClientId = nextValue;
+  ensurePrivateDirectory(home);
+  await writeFile(clientSessionKeyFile, nextValue, { mode: 0o600 });
   return nextValue;
 }
diff --git a/packages/cli/src/utils/client.ssh.test.ts b/packages/cli/src/utils/client.ssh.test.ts
index 4311db71b5..19b720a893 100644
--- a/packages/cli/src/utils/client.ssh.test.ts
+++ b/packages/cli/src/utils/client.ssh.test.ts
@@ -47,7 +47,9 @@ describe("CLI SSH transport", () => {
   });
 
   it("routes an SSH host through a local tunnel", async () => {
-    await connectToDaemon({ host: "ssh://deploy@build-box:2222?daemonPort=7777" });
+    await connectToDaemon({
+      target: { kind: "endpoint", host: "ssh://deploy@build-box:2222?daemonPort=7777" },
+    });
 
     expect(mocks.createSshTunnel).toHaveBeenCalledWith({
       host: "deploy@build-box",
diff --git a/packages/cli/src/utils/client.ts b/packages/cli/src/utils/client.ts
index bd774ddaff..92d91ea944 100644
--- a/packages/cli/src/utils/client.ts
+++ b/packages/cli/src/utils/client.ts
@@ -1,5 +1,11 @@
-import { existsSync, readFileSync } from "node:fs";
-import { loadConfig, resolvePaseoHome } from "@getpaseo/server";
+import {
+  waitForDaemonReady,
+  resolvePaseoHome,
+  type DaemonInstance,
+  readLocalCredentialForTarget,
+} from "@getpaseo/server/daemon-control";
+import { describeDaemonTarget, type DaemonTarget } from "./daemon-target.js";
+export type { DaemonTarget } from "./daemon-target.js";
 import {
   buildDaemonWebSocketUrl,
   buildRelayWebSocketUrl,
@@ -13,60 +19,60 @@ import {
 } from "@getpaseo/protocol/connection-offer";
 import { parseSshTransportUri } from "@getpaseo/protocol/ssh-transport";
 import { DaemonClient, type WebSocketLike } from "@getpaseo/client/internal/daemon-client";
-import path from "node:path";
 import { WebSocket } from "ws";
 import { getOrCreateCliClientId } from "./client-id.js";
 import { resolveCliVersion } from "../version.js";
 import { createSshTunnel } from "../ssh/ssh-tunnel.js";
 
 export interface ConnectOptions {
-  host?: string;
+  target: DaemonTarget;
   timeout?: number;
+  instance?: DaemonInstance;
 }
-
-export interface DaemonConnectionCommandError {
-  code: "DAEMON_NOT_RUNNING";
-  message: string;
-  details: string;
+export function resolveClientPaseoHome(
+  target: DaemonTarget,
+  env: Readonly<Record<string, string | undefined>> = process.env,
+): string {
+  return target.kind === "instance" ? target.home : resolvePaseoHome(env);
 }
-
-const DEFAULT_HOST = "localhost:6767";
 const DEFAULT_TIMEOUT = 15000;
-const PID_FILENAME = "paseo.pid";
+type TransportTarget =
+  | { type: "tcp"; url: string }
+  | { type: "ipc"; url: string; socketPath: string };
 
-type DaemonTarget =
-  | {
-      type: "tcp";
-      url: string;
-    }
-  | {
-      type: "ipc";
-      url: string;
-      socketPath: string;
-    };
-
-/**
- * Get the daemon host from environment or options
- */
-export function getDaemonHost(options?: ConnectOptions): string {
-  return resolveDaemonHostCandidates(options)[0] ?? DEFAULT_HOST;
+export function getDaemonHost(options: ConnectOptions): string {
+  return describeDaemonTarget(options.target);
 }
 
-export function buildDaemonConnectionCommandError(options: {
-  host?: string;
-  error: unknown;
-}): DaemonConnectionCommandError {
-  const host = getDaemonHost({ host: options.host });
-  const message = options.error instanceof Error ? options.error.message : String(options.error);
+export function buildDaemonConnectionCommandError(options: ConnectOptions & { error: unknown }) {
+  const error = options.error;
+  let message = error instanceof Error ? error.message : String(error);
+  if (error && typeof error === "object" && "message" in error) message = String(error.message);
+  if (options.target.kind === "endpoint")
+    message = message.replaceAll(options.target.host, describeDaemonTarget(options.target));
+  if (message.startsWith("Cannot connect to daemon at "))
+    return error as { code: string; message: string; details: string };
+  let code = "DAEMON_UNREACHABLE";
+  if (typeof error === "object" && error !== null && "code" in error) code = String(error.code);
+  else if (message === "Password required") code = "AUTH_REQUIRED";
+  else if (message === "Incorrect password") code = "AUTH_FAILED";
   return {
-    code: "DAEMON_NOT_RUNNING",
-    message: `Cannot connect to daemon at ${host}: ${message}`,
-    details: host.trim().startsWith("ssh://")
-      ? "Start the Paseo daemon on the SSH host; SSH transport does not install or start it."
-      : "Start the daemon with: paseo daemon start",
+    code,
+    message: `Cannot connect to daemon at ${describeDaemonTarget(options.target)}: ${message}`,
+    details: describeConnectionRemedy(code, options.target),
   };
 }
 
+function describeConnectionRemedy(code: string, target: DaemonTarget): string {
+  if (code === "AUTH_REQUIRED")
+    return "The daemon requires a password. Set PASEO_PASSWORD and retry.";
+  if (code === "AUTH_FAILED")
+    return "The daemon rejected the password. Check PASEO_PASSWORD and retry.";
+  if (target.kind === "instance")
+    return `Start with: paseo daemon start --home ${JSON.stringify(target.home)}`;
+  return "Check the selected endpoint and credentials. SSH transport does not install or start the daemon.";
+}
+
 export function normalizeDaemonHost(raw: string): string | null {
   const trimmed = raw.trim();
   if (!trimmed) {
@@ -118,100 +124,13 @@ export function normalizeDaemonHost(raw: string): string | null {
   return trimmed.includes(":") ? trimmed : null;
 }
 
-export function resolveDefaultDaemonHost(env: NodeJS.ProcessEnv = process.env): string {
-  return resolveDefaultDaemonHosts(env)[0] ?? DEFAULT_HOST;
-}
-
-function isIpcDaemonHost(host: string | null): host is string {
-  return host !== null && (host.startsWith("unix://") || host.startsWith("pipe://"));
-}
-
-function isTcpDaemonHost(host: string | null): host is string {
-  return host !== null && !isIpcDaemonHost(host);
-}
-
-function readPidSocketTarget(paseoHome: string): string | null {
-  const pidPath = path.join(paseoHome, PID_FILENAME);
-  if (!existsSync(pidPath)) {
-    return null;
-  }
-
-  try {
-    const parsed = JSON.parse(readFileSync(pidPath, "utf-8")) as {
-      listen?: unknown;
-      sockPath?: unknown;
-    };
-    if (typeof parsed.listen === "string") return parsed.listen;
-    if (typeof parsed.sockPath === "string") return parsed.sockPath;
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-function resolveConfiguredIpcDaemonHost(env: NodeJS.ProcessEnv, paseoHome: string): string | null {
-  const directEnvHost = normalizeDaemonHost(env.PASEO_LISTEN ?? "");
-  if (isIpcDaemonHost(directEnvHost)) {
-    return directEnvHost;
-  }
-
-  const pidHost = normalizeDaemonHost(readPidSocketTarget(paseoHome) ?? "");
-  if (isIpcDaemonHost(pidHost)) {
-    return pidHost;
-  }
-
-  const config = loadConfig(paseoHome, { env });
-  const configuredHost = normalizeDaemonHost(config.listen);
-  return isIpcDaemonHost(configuredHost) ? configuredHost : null;
-}
-
-function resolveConfiguredTcpDaemonHost(env: NodeJS.ProcessEnv, paseoHome: string): string | null {
-  const configuredHost = normalizeDaemonHost(loadConfig(paseoHome, { env }).listen);
-  if (!isTcpDaemonHost(configuredHost)) {
-    return null;
-  }
-  return configuredHost === "127.0.0.1:6767" ? null : configuredHost;
-}
-
-export function resolveDefaultDaemonHosts(env: NodeJS.ProcessEnv = process.env): string[] {
-  const paseoHome = resolvePaseoHome(env);
-  const candidates: string[] = [];
-  const configuredIpcHost = resolveConfiguredIpcDaemonHost(env, paseoHome);
-  if (configuredIpcHost) {
-    candidates.push(configuredIpcHost);
-  }
-  const configuredTcpHost = resolveConfiguredTcpDaemonHost(env, paseoHome);
-  if (configuredTcpHost) {
-    candidates.push(configuredTcpHost);
-  }
-  candidates.push(DEFAULT_HOST);
-  return Array.from(new Set(candidates));
-}
-
-function resolveDaemonHostCandidates(options?: ConnectOptions): string[] {
-  const explicitHost = getExplicitDaemonHost(options?.host);
-  if (explicitHost) {
-    return [explicitHost];
-  }
-
-  return resolveDefaultDaemonHosts();
-}
-
-export function getExplicitDaemonHost(
-  host: string | undefined,
-  env: NodeJS.ProcessEnv = process.env,
-): string | undefined {
-  const explicitHost = host ?? env.PASEO_HOST;
-  return explicitHost?.trim() ? explicitHost : undefined;
-}
-
 function stripIpcPrefix(trimmed: string): string {
   if (trimmed.startsWith("unix://")) return trimmed.slice("unix://".length).trim();
   if (trimmed.startsWith("pipe://")) return trimmed.slice("pipe://".length).trim();
   return trimmed;
 }
 
-export function resolveDaemonTarget(host: string): DaemonTarget {
+export function resolveDaemonTarget(host: string): TransportTarget {
   const trimmed = normalizeDaemonHost(host);
   if (!trimmed) {
     throw new Error(`Invalid daemon target: ${host}`);
@@ -260,6 +179,16 @@ export function resolveDaemonPassword(host: string): string | undefined {
   return fromEnv && fromEnv.length > 0 ? fromEnv : undefined;
 }
 
+export function resolveDaemonCredential(
+  host: string,
+  home: string,
+): { kind: "password"; password: string } | { kind: "localCredential"; token: string } | null {
+  const password = resolveDaemonPassword(host);
+  if (password) return { kind: "password", password };
+  const token = readLocalCredentialForTarget(home, host);
+  return token ? { kind: "localCredential", token } : null;
+}
+
 /**
  * Create a WebSocket factory that works in Node.js
  */
@@ -281,7 +210,8 @@ function createNodeWebSocketFactory() {
  */
 async function tryConnectHost(
   host: string,
-  password: string | undefined,
+  credential: ReturnType<typeof resolveDaemonCredential>,
+  home: string,
   clientId: string,
   timeout: number,
   nodeWebSocketFactory: ReturnType<typeof createNodeWebSocketFactory>,
@@ -292,7 +222,10 @@ async function tryConnectHost(
     clientId,
     clientType: "cli",
     appVersion: resolveCliVersion(),
-    password,
+    ...(credential?.kind === "password" ? { password: credential.password } : {}),
+    ...(credential?.kind === "localCredential"
+      ? { localCredential: () => readLocalCredentialForTarget(home, host) ?? undefined }
+      : {}),
     connectTimeoutMs: timeout,
     webSocketFactory: (
       url: string,
@@ -363,24 +296,45 @@ function parseHostOfferOrNull(host: string | undefined): ConnectionOffer | null
   }
 }
 
-export async function connectToDaemon(options?: ConnectOptions): Promise<DaemonClient> {
-  const timeout = options?.timeout ?? DEFAULT_TIMEOUT;
-  const clientId = await getOrCreateCliClientId();
+async function connectSelectedDaemon(options: ConnectOptions): Promise<DaemonClient> {
+  const timeout = options.timeout ?? DEFAULT_TIMEOUT;
+  const deadline = Date.now() + timeout;
+  const explicitHost =
+    options.target.kind === "endpoint"
+      ? options.target.host
+      : (
+          await waitForDaemonReady(options.target.home, {
+            timeoutMs: timeout,
+            instance: options.instance,
+          })
+        ).listen;
+  const home = resolveClientPaseoHome(options.target);
+  const clientId = await getOrCreateCliClientId(home);
   const nodeWebSocketFactory = createNodeWebSocketFactory();
 
-  const explicitHost = getExplicitDaemonHost(options?.host);
   if (explicitHost?.trim().startsWith("ssh://")) {
     const target = parseSshTransportUri(explicitHost.trim());
     const tunnel = await createSshTunnel(target);
     const password = resolveDaemonPassword(explicitHost);
     const result = await tryConnectHost(
       tunnel.endpoint,
-      password,
+      password ? { kind: "password", password } : null,
+      home,
       clientId,
-      timeout,
+      Math.max(1, deadline - Date.now()),
       nodeWebSocketFactory,
     );
-    if ("client" in result) return result.client;
+    if ("client" in result) {
+      const close = result.client.close.bind(result.client);
+      result.client.close = async () => {
+        try {
+          await close();
+        } finally {
+          tunnel.close();
+        }
+      };
+      return result.client;
+    }
 
     const failure = tunnel.failureDetail();
     tunnel.close();
@@ -389,32 +343,38 @@ export async function connectToDaemon(options?: ConnectOptions): Promise<DaemonC
   }
   const offer = parseHostOfferOrNull(explicitHost);
   if (offer) {
-    return connectViaRelayOffer(offer, clientId, timeout, nodeWebSocketFactory);
+    return connectViaRelayOffer(
+      offer,
+      clientId,
+      Math.max(1, deadline - Date.now()),
+      nodeWebSocketFactory,
+    );
   }
 
-  const hosts = resolveDaemonHostCandidates(options);
+  const result = await tryConnectHost(
+    explicitHost,
+    resolveDaemonCredential(explicitHost, home),
+    home,
+    clientId,
+    Math.max(1, deadline - Date.now()),
+    nodeWebSocketFactory,
+  );
+  if ("client" in result) return result.client;
+  throw result.error;
+}
 
-  async function tryNext(index: number, lastError: unknown): Promise<DaemonClient> {
-    if (index >= hosts.length) {
-      if (lastError instanceof Error) throw lastError;
-      throw new Error(`Unable to connect to Paseo daemon via ${hosts.join(", ")}`);
-    }
-    const host = hosts[index];
-    const password = resolveDaemonPassword(host);
-    const result = await tryConnectHost(host, password, clientId, timeout, nodeWebSocketFactory);
-    if ("client" in result) {
-      return result.client;
-    }
-    return tryNext(index + 1, result.error);
+export async function connectToDaemon(options: ConnectOptions): Promise<DaemonClient> {
+  try {
+    return await connectSelectedDaemon(options);
+  } catch (error) {
+    throw buildDaemonConnectionCommandError({ ...options, error });
   }
-
-  return tryNext(0, null);
 }
 
 /**
  * Try to connect to the daemon, returns null if connection fails
  */
-export async function tryConnectToDaemon(options?: ConnectOptions): Promise<DaemonClient | null> {
+export async function tryConnectToDaemon(options: ConnectOptions): Promise<DaemonClient | null> {
   try {
     return await connectToDaemon(options);
   } catch {
diff --git a/packages/cli/src/utils/command-options.test.ts b/packages/cli/src/utils/command-options.test.ts
index 652fe9356b..3fdb9ede18 100644
--- a/packages/cli/src/utils/command-options.test.ts
+++ b/packages/cli/src/utils/command-options.test.ts
@@ -1,16 +1,19 @@
 import { Command } from "commander";
 import { describe, expect, it } from "vitest";
-import { addDaemonHostOption, withGlobalOptions } from "./command-options.js";
+import { createCli } from "../cli.js";
+import { withGlobalOptions } from "./command-options.js";
 
 async function parseHost(argv: string[]): Promise<string | undefined> {
-  const program = new Command().exitOverride().option("--host <host>");
+  const program = createCli().exitOverride();
   let receivedHost: string | undefined;
 
-  addDaemonHostOption(program.command("ls")).action(
-    withGlobalOptions((options: { host?: string }) => {
-      receivedHost = options.host;
-    }),
-  );
+  program.commands
+    .find((command) => command.name() === "ls")!
+    .action(
+      withGlobalOptions((options: { host?: string }) => {
+        receivedHost = options.host;
+      }),
+    );
 
   await program.parseAsync(argv, { from: "user" });
   return receivedHost;
@@ -25,10 +28,13 @@ describe("global command options", () => {
     await expect(parseHost(["ls", "--host", "local:6767"])).resolves.toBe("local:6767");
   });
 
-  it("uses the last explicit host", async () => {
-    await expect(parseHost(["--host", "first:6767", "ls", "--host", "last:6767"])).resolves.toBe(
-      "last:6767",
-    );
+  it("rejects conflicting parent and command selectors", async () => {
+    await expect(
+      parseHost(["--host", "first:6767", "ls", "--host", "last:6767"]),
+    ).rejects.toMatchObject({
+      code: "TARGET_AMBIGUOUS",
+      message: "Conflicting duplicate --host selectors.",
+    });
   });
 
   it("lets local-only commands ignore a global host", async () => {
diff --git a/packages/cli/src/utils/command-options.ts b/packages/cli/src/utils/command-options.ts
index b02b4abdb1..2274785cc4 100644
--- a/packages/cli/src/utils/command-options.ts
+++ b/packages/cli/src/utils/command-options.ts
@@ -1,8 +1,17 @@
 import type { Command } from "commander";
+import { selectDaemonTarget } from "./daemon-target.js";
 
 const JSON_OPTION_DESCRIPTION = "Output in JSON format";
 const DAEMON_HOST_OPTION_DESCRIPTION =
-  "Daemon host target: host:port, tcp://host:port, or ssh://user@host (default: local socket/pipe, then localhost:6767)";
+  "Explicit daemon endpoint: host:port, TCP, socket, SSH, or pairing URL (default: local home)";
+
+const localCommands = new WeakSet<Command>();
+
+export function addLocalDaemonOptions<T extends Command>(command: T): T {
+  localCommands.add(command);
+  command.option("--home <path>", "Local daemon home (default: ~/.paseo)");
+  return command;
+}
 
 export function collectMultiple(value: string, previous: string[]): string[] {
   return previous.concat([value]);
@@ -15,6 +24,8 @@ export function addJsonOption<T extends Command>(command: T): T {
 
 export function addDaemonHostOption<T extends Command>(command: T): T {
   command.option("--host <host>", DAEMON_HOST_OPTION_DESCRIPTION);
+  if (!command.options.some((option) => option.long === "--home"))
+    command.option("--home <path>", "Select a local daemon home (default: ~/.paseo)");
   return command;
 }
 
@@ -28,7 +39,21 @@ export function withGlobalOptions<Args extends unknown[], Result>(
   return (...args) => {
     const command = args.at(-1) as Command;
     const mergedArgs = [...args];
-    mergedArgs[mergedArgs.length - 2] = command.optsWithGlobals();
+    const options = command.optsWithGlobals();
+    const selectors = { home: new Set<string>(), host: new Set<string>() };
+    for (let current: Command | null = command; current; current = current.parent) {
+      for (const key of ["home", "host"] as const) {
+        const value = current.opts()[key];
+        if (typeof value === "string") selectors[key].add(value);
+      }
+    }
+    for (const key of ["home", "host"] as const) {
+      if (selectors[key].size > 1)
+        throw { code: "TARGET_AMBIGUOUS", message: `Conflicting duplicate --${key} selectors.` };
+    }
+    const localOnly = localCommands.has(command);
+    options.daemonTarget = selectDaemonTarget(options, process.env, localOnly);
+    mergedArgs[mergedArgs.length - 2] = options;
     return handler(...(mergedArgs as Args));
   };
 }
diff --git a/packages/cli/src/utils/daemon-target.test.ts b/packages/cli/src/utils/daemon-target.test.ts
new file mode 100644
index 0000000000..fc989ab476
--- /dev/null
+++ b/packages/cli/src/utils/daemon-target.test.ts
@@ -0,0 +1,69 @@
+import { test, expect } from "vitest";
+import { selectDaemonTarget, describeDaemonTarget } from "./daemon-target.js";
+import { resolveDaemonCredential, resolveClientPaseoHome } from "./client.js";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+
+test("explicit selectors win over both environment selectors", () => {
+  const env = { PASEO_HOME: "/tmp/a", PASEO_HOST: "unused:12345" };
+  expect(selectDaemonTarget({ home: "/tmp/b" }, env)).toEqual({ kind: "instance", home: "/tmp/b" });
+  expect(selectDaemonTarget({ host: "chosen:23456" }, env)).toEqual({
+    kind: "endpoint",
+    host: "chosen:23456",
+  });
+  expect(() => selectDaemonTarget({}, env)).toThrow();
+  expect(() => selectDaemonTarget({ home: "/tmp/b", host: "chosen:23456" }, {})).toThrow();
+});
+
+test("endpoint connections resolve local credentials from PASEO_HOME", () => {
+  expect(
+    resolveClientPaseoHome(
+      { kind: "endpoint", host: "localhost:6767" },
+      { PASEO_HOME: "/tmp/custom-home" },
+    ),
+  ).toBe("/tmp/custom-home");
+});
+
+test("local operations ignore routing environment but reject an explicit endpoint", () => {
+  expect(
+    selectDaemonTarget({}, { PASEO_HOME: "/tmp/b", PASEO_HOST: "unused:12345" }, true),
+  ).toEqual({ kind: "instance", home: "/tmp/b" });
+  expect(() => selectDaemonTarget({ host: "chosen:23456" }, {}, true)).toThrow();
+});
+
+test("endpoint descriptions redact pairing material and credentials", () => {
+  expect(
+    describeDaemonTarget({
+      kind: "endpoint",
+      host: "tcp://user:private@example.test:23456?password=secret",
+    }),
+  ).not.toMatch(/private|secret/);
+  expect(
+    describeDaemonTarget({ kind: "endpoint", host: "https://app.paseo.sh/#offer=private" }),
+  ).not.toContain("private");
+});
+
+test("CLI selects an explicit password before a matching local credential and never sends the latter remotely", async () => {
+  const home = await mkdtemp(join(tmpdir(), "paseo-cli-credential-"));
+  const previousPassword = process.env.PASEO_PASSWORD;
+  delete process.env.PASEO_PASSWORD;
+  try {
+    const token = "a".repeat(43);
+    await writeFile(join(home, "paseo.pid"), JSON.stringify({ listen: "127.0.0.1:6767" }));
+    await writeFile(join(home, "local-credential"), token);
+    expect(resolveDaemonCredential("tcp://localhost:6767", home)).toEqual({
+      kind: "localCredential",
+      token,
+    });
+    expect(resolveDaemonCredential("tcp://remote.example:6767", home)).toBeNull();
+    expect(resolveDaemonCredential("tcp://localhost:6767?password=explicit", home)).toEqual({
+      kind: "password",
+      password: "explicit",
+    });
+  } finally {
+    if (previousPassword === undefined) delete process.env.PASEO_PASSWORD;
+    else process.env.PASEO_PASSWORD = previousPassword;
+    await rm(home, { recursive: true, force: true });
+  }
+});
diff --git a/packages/cli/src/utils/daemon-target.ts b/packages/cli/src/utils/daemon-target.ts
new file mode 100644
index 0000000000..cfe8db8a15
--- /dev/null
+++ b/packages/cli/src/utils/daemon-target.ts
@@ -0,0 +1,51 @@
+import { resolvePaseoHome } from "@getpaseo/server/daemon-control";
+
+export type DaemonTarget = { kind: "instance"; home: string } | { kind: "endpoint"; host: string };
+
+export function selectDaemonTarget(
+  options: { home?: string; host?: string },
+  env: NodeJS.ProcessEnv = process.env,
+  localOnly = false,
+): DaemonTarget {
+  for (const key of ["home", "host"] as const) {
+    if (options[key] !== undefined && !options[key]!.trim())
+      throw { code: "TARGET_INVALID", message: `--${key} requires a non-empty value.` };
+  }
+  if (options.home !== undefined && options.host !== undefined)
+    throw { code: "TARGET_AMBIGUOUS", message: "Choose either --home or --host, not both." };
+  if (localOnly) {
+    if (options.host !== undefined)
+      throw {
+        code: "LOCAL_OPERATION",
+        message: "This is a local operation; use --home. --host is not supported.",
+      };
+    return {
+      kind: "instance",
+      home: resolvePaseoHome({ PASEO_HOME: options.home ?? env.PASEO_HOME }),
+    };
+  }
+  if (options.home !== undefined)
+    return { kind: "instance", home: resolvePaseoHome({ PASEO_HOME: options.home }) };
+  if (options.host !== undefined) return { kind: "endpoint", host: options.host };
+  if (env.PASEO_HOME && env.PASEO_HOST)
+    throw {
+      code: "TARGET_AMBIGUOUS",
+      message: "PASEO_HOME and PASEO_HOST are both set. Choose --home or --host explicitly.",
+    };
+  if (env.PASEO_HOST) return { kind: "endpoint", host: env.PASEO_HOST };
+  return { kind: "instance", home: resolvePaseoHome({ PASEO_HOME: env.PASEO_HOME }) };
+}
+
+export function describeDaemonTarget(target: DaemonTarget): string {
+  if (target.kind === "instance") return `home ${target.home}`;
+  try {
+    const url = new URL(target.host);
+    if (url.password) url.password = "REDACTED";
+    for (const key of url.searchParams.keys())
+      if (/password|token|secret/i.test(key)) url.searchParams.set(key, "REDACTED");
+    if (url.hash) url.hash = "REDACTED";
+    return url.toString();
+  } catch {
+    return target.host.replace(/([?&](?:password|token|secret)=)[^&]*/gi, "$1REDACTED");
+  }
+}
diff --git a/packages/cli/src/utils/timeline.ts b/packages/cli/src/utils/timeline.ts
index 7e84757da0..90b67c9f8e 100644
--- a/packages/cli/src/utils/timeline.ts
+++ b/packages/cli/src/utils/timeline.ts
@@ -7,6 +7,7 @@ interface FetchProjectedTimelineItemsInput {
   client: DaemonClient;
   agentId: string;
   timeoutMs?: number;
+  sinceTimestampMs?: number;
 }
 
 export async function fetchProjectedTimelineItems(
@@ -18,5 +19,10 @@ export async function fetchProjectedTimelineItems(
     projection: "projected",
     timeout: input.timeoutMs,
   });
-  return timeline.entries.map((entry) => entry.item);
+  let entries = timeline.entries;
+  const sinceTimestampMs = input.sinceTimestampMs;
+  if (sinceTimestampMs !== undefined) {
+    entries = entries.filter((entry) => Date.parse(entry.timestamp) >= sinceTimestampMs);
+  }
+  return entries.map((entry) => entry.item);
 }
diff --git a/packages/cli/src/utils/wait-for-stop.ts b/packages/cli/src/utils/wait-for-stop.ts
new file mode 100644
index 0000000000..8430c39726
--- /dev/null
+++ b/packages/cli/src/utils/wait-for-stop.ts
@@ -0,0 +1,24 @@
+// Commands that stream until stopped (`paseo agent logs --follow`, `paseo agent
+// attach`) stop on Ctrl+C, a termination signal, or when the program reading
+// their output closes its end, as `| head` does. A closed reader shows up as
+// EPIPE on the next write to stdout, so the command stops at its next line of
+// output.
+export function waitForStop(): Promise<void> {
+  return new Promise((resolve) => {
+    const stop = () => {
+      process.off("SIGINT", stop);
+      process.off("SIGTERM", stop);
+      process.stdout.off("error", stopOnClosedStdout);
+      resolve();
+    };
+    const stopOnClosedStdout = (error: NodeJS.ErrnoException) => {
+      if (error.code === "EPIPE") {
+        stop();
+      }
+    };
+
+    process.on("SIGINT", stop);
+    process.on("SIGTERM", stop);
+    process.stdout.on("error", stopOnClosedStdout);
+  });
+}
diff --git a/packages/cli/tests/03-daemon.test.ts b/packages/cli/tests/03-daemon.test.ts
index aa84c4caae..d395bdc6fe 100644
--- a/packages/cli/tests/03-daemon.test.ts
+++ b/packages/cli/tests/03-daemon.test.ts
@@ -11,7 +11,7 @@
  * - daemon status reports stopped when daemon not running
  * - daemon status --json outputs valid JSON
  * - daemon stop handles daemon not running gracefully
- * - daemon restart starts the daemon and can be cleaned up
+ * - daemon restart refuses to start a stopped daemon
  * - daemon status probes the live relay state over local IPC
  */
 
@@ -140,7 +140,7 @@ try {
     const result = await daemonCommand(["status"]);
     assert.strictEqual(result.exitCode, 0, "status should succeed when daemon is stopped");
     const output = result.stdout.toLowerCase();
-    assert(output.includes("local daemon"), "status table should include Local Daemon row");
+    assert(output.includes("localdaemon"), "status table should include Local Daemon row");
     assert(output.includes("stopped"), "status should report stopped");
     console.log("✓ daemon status reports stopped when not running\n");
   }
@@ -164,7 +164,7 @@ try {
     const result = await daemonCommand(["status", "--json"]);
     assert.strictEqual(result.exitCode, 0, "--json status should succeed");
     const status = JSON.parse(result.stdout);
-    assert.strictEqual(typeof status.serverId, "string", "json status should include serverId");
+    assert.strictEqual(status.serverId, undefined, "stopped observation must not invent identity");
     assert.strictEqual(status.localDaemon, "stopped", "json status should report stopped");
     assert.strictEqual(status.home, paseoHome, "json status should reflect the isolated home");
     assert.strictEqual(
@@ -175,20 +175,12 @@ try {
     console.log("✓ daemon status --json outputs valid JSON\n");
   }
 
-  // Global hosts do not change local daemon lifecycle commands.
   {
-    console.log("Test 5b: daemon status ignores a global --host");
-    const result = await runLocalPaseo(["--host", "localhost:1", "daemon", "status", "--json"], {
+    const result = await runLocalPaseo(["--host", "127.0.0.1:1", "daemon", "status", "--json"], {
       PASEO_HOME: paseoHome,
     });
-    assert.strictEqual(result.exitCode, 0, `daemon status should stay local: ${result.stderr}`);
-    const parsed = JSON.parse(result.stdout);
-    assert.strictEqual(
-      parsed.localDaemon,
-      "stopped",
-      "daemon should report the local stopped state",
-    );
-    console.log("✓ daemon status ignores a global --host\n");
+    assert.strictEqual(result.exitCode, 1, "an explicit endpoint must not report local status");
+    assert.match(result.stderr, /127.0.0.1:1/);
   }
 
   // Test 6: daemon stop handles daemon not running gracefully
@@ -205,16 +197,12 @@ try {
     console.log("✓ daemon stop succeeds gracefully when daemon not running\n");
   }
 
-  // Test 7: daemon restart starts daemon and can be stopped
   {
-    console.log("Test 7: daemon restart starts daemon and can be stopped");
-    const result = await daemonCommand(["restart", "--port", String(port)]);
-    assert.strictEqual(result.exitCode, 0, "restart should succeed even when previously stopped");
-    assert(result.stdout.toLowerCase().includes("restarted"), "output should report restart");
-
-    const cleanup = await daemonCommand(["stop", "--force"]);
-    assert.strictEqual(cleanup.exitCode, 0, "cleanup stop should succeed after restart");
-    console.log("✓ daemon restart starts and stop cleanup succeeds\n");
+    const result = await daemonCommand(["restart", "--json"]);
+    assert.strictEqual(result.exitCode, 1, "restart must not start a stopped daemon");
+    assert.match(result.stderr, /DAEMON_NOT_RUNNING/);
+    const configured = await daemonCommand(["config", "set", "daemon.listen", `127.0.0.1:${port}`]);
+    assert.strictEqual(configured.exitCode, 0, configured.stderr);
   }
 
   // Test 8: status uses the running daemon as relay authority over local IPC
@@ -256,10 +244,10 @@ try {
       const relayProbe = await retryWhileWorkerRuns(
         worker,
         async () => {
-          const statusResult = await daemonCommand(["status", "--json"]);
+          const statusResult = await daemonCommand(["status", "--host", listen, "--json"]);
           const statusPayload =
             statusResult.exitCode === 0 ? JSON.parse(statusResult.stdout) : null;
-          const pairingResult = await daemonCommand(["pair", "--json"]);
+          const pairingResult = await daemonCommand(["pair", "--host", listen, "--json"]);
           return { statusResult, statusPayload, pairingResult };
         },
         (result) =>
@@ -280,8 +268,8 @@ try {
       assert.strictEqual(payload.connectedDaemon, "reachable", "IPC daemon should be reachable");
       assert.strictEqual(
         payload.localDaemon,
-        "stopped",
-        "missing PID should report stopped locally",
+        undefined,
+        "endpoint status must not invent local PID state",
       );
       assert.notStrictEqual(payload.relay, "disabled", "status should use live relay state");
       assert.strictEqual(
@@ -303,6 +291,7 @@ try {
       const nestedReload = await daemonCommand(["reload", "--host", listen, "--json"]);
       assert.strictEqual(nestedReload.exitCode, 0, nestedReload.stderr);
       assert.deepStrictEqual(JSON.parse(nestedReload.stdout), {
+        restartCommand: `paseo daemon restart --host ${JSON.stringify(listen)}`,
         appliedPaths: ["daemon.browserTools.enabled"],
         restartRequiredPaths: [],
         overrideControlledPaths: ["daemon.listen"],
@@ -315,6 +304,7 @@ try {
       });
       assert.strictEqual(aliasReload.exitCode, 0, aliasReload.stderr);
       assert.deepStrictEqual(JSON.parse(aliasReload.stdout), {
+        restartCommand: `paseo daemon restart --host ${JSON.stringify(listen)}`,
         appliedPaths: ["daemon.browserTools.enabled"],
         restartRequiredPaths: [],
         overrideControlledPaths: [],
@@ -323,6 +313,7 @@ try {
       const yamlReload = await daemonCommand(["reload", "--host", listen, "--format", "yaml"]);
       assert.strictEqual(yamlReload.exitCode, 0, yamlReload.stderr);
       assert.deepStrictEqual(YAML.parse(yamlReload.stdout), {
+        restartCommand: `paseo daemon restart --host ${JSON.stringify(listen)}`,
         appliedPaths: [],
         restartRequiredPaths: [],
         overrideControlledPaths: [],
@@ -335,31 +326,16 @@ try {
       try {
         await writeFile(
           join(foreignHome, "config.json"),
-          `${JSON.stringify({ daemon: { listen } }, null, 2)}\n`,
+          `${JSON.stringify({ daemon: { listen, relay: { enabled: false } } }, null, 2)}\n`,
           "utf-8",
         );
-        const foreignPairing = await retryWhileWorkerRuns(
-          worker,
-          () =>
-            runLocalPaseo(["daemon", "pair", "--home", foreignHome, "--json"], {
-              PASEO_HOME: foreignHome,
-            }),
-          (result) => result.stderr.includes("different Paseo home"),
-          (result) => `Pairing did not report the daemon identity mismatch: ${result.stderr}`,
-        );
-        assert.notStrictEqual(
-          foreignPairing.exitCode,
-          0,
-          "pairing should reject a daemon owned by another home",
-        );
-        assert(
-          foreignPairing.stderr.includes("different Paseo home"),
-          "pairing should explain the daemon identity mismatch",
-        );
-        assert(
-          !foreignPairing.stdout.includes("#offer="),
-          "pairing should not expose another offer",
+        const foreignPairing = await runLocalPaseo(
+          ["daemon", "pair", "--home", foreignHome, "--json"],
+          { PASEO_HOME: foreignHome },
         );
+        assert.strictEqual(foreignPairing.exitCode, 1);
+        assert.match(foreignPairing.stderr, /RELAY_DISABLED/);
+        assert(!foreignPairing.stdout.includes("#offer="));
       } finally {
         await rm(foreignHome, { recursive: true, force: true });
       }
@@ -369,14 +345,14 @@ try {
     console.log("✓ daemon status probes live relay state over local IPC\n");
   }
 
-  // Test 9: --relay accepts an already-enabled persisted relay while stopped
+  // Test 9: explicit offline relay consent persists for subsequent pairing
   {
-    console.log("Test 9: daemon pair --relay accepts persisted relay while stopped");
+    console.log("Test 9: daemon pair --relay persists offline relay consent");
     const configPath = join(paseoHome, "config.json");
     const config = JSON.parse(await readFile(configPath, "utf-8"));
     config.daemon = {
       ...config.daemon,
-      relay: { ...config.daemon?.relay, enabled: true },
+      relay: { ...config.daemon?.relay, enabled: false },
     };
     await writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf-8");
 
@@ -390,7 +366,13 @@ try {
     const payload = JSON.parse(pairing.stdout);
     assert.strictEqual(payload.relayEnabled, true, "pairing should preserve persisted relay state");
     assert.match(payload.url, /#offer=/, "pairing should include the offline offer");
-    console.log("✓ daemon pair --relay accepts persisted relay while stopped\n");
+    const persistedRelay = await daemonCommand(["config", "get", "daemon.relay.enabled", "--json"]);
+    assert.strictEqual(persistedRelay.exitCode, 0, persistedRelay.stderr);
+    assert.strictEqual(JSON.parse(persistedRelay.stdout).value, true);
+    const subsequentPairing = await daemonCommand(["pair", "--json"]);
+    assert.strictEqual(subsequentPairing.exitCode, 0, subsequentPairing.stderr);
+    assert.match(JSON.parse(subsequentPairing.stdout).url, /#offer=/);
+    console.log("✓ daemon pair --relay persists offline consent for subsequent pairing\n");
   }
 } finally {
   // Best-effort daemon cleanup in case assertions fail before explicit stop.
diff --git a/packages/cli/tests/04-agent-ls.test.ts b/packages/cli/tests/04-agent-ls.test.ts
index 363eba5694..65b3bec0bc 100644
--- a/packages/cli/tests/04-agent-ls.test.ts
+++ b/packages/cli/tests/04-agent-ls.test.ts
@@ -23,12 +23,13 @@ import assert from "node:assert";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
+import { getAvailablePort } from "./helpers/network.ts";
 import { runLocalPaseo } from "./helpers/local-cli.ts";
 
 console.log("=== LS Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -62,7 +63,6 @@ try {
     console.log("Test 3: paseo ls handles daemon not running");
     const result = await runLocalPaseo(["ls"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
@@ -74,8 +74,8 @@ try {
     assert(hasError, "error message should mention connection issue");
     assert.match(
       output,
-      /--host <host:port>.*PASEO_HOST/s,
-      "the recovery message should explain both remote connection inputs",
+      /Check the selected endpoint and credentials/,
+      "the recovery message should explain how to check the selected endpoint",
     );
     console.log("✓ paseo ls handles daemon not running\n");
   }
@@ -85,7 +85,6 @@ try {
     console.log("Test 4: paseo ls --json handles errors");
     const result = await runLocalPaseo(["ls", "--json"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     // Should still fail (daemon not running)
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
@@ -109,7 +108,6 @@ try {
     console.log("Test 5: paseo ls -a flag is accepted");
     const result = await runLocalPaseo(["ls", "-a"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     // Will fail due to no daemon, but flag should be parsed without error
     // (no "unknown option" error)
@@ -124,7 +122,6 @@ try {
     console.log("Test 6: paseo ls -g flag is accepted");
     const result = await runLocalPaseo(["ls", "-g"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -g flag");
@@ -137,7 +134,6 @@ try {
     console.log("Test 7: paseo ls -ag combined flags are accepted");
     const result = await runLocalPaseo(["ls", "-ag"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -ag flags");
@@ -150,7 +146,6 @@ try {
     console.log("Test 8: -q (quiet) flag is accepted");
     const result = await runLocalPaseo(["-q", "ls"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
@@ -163,7 +158,6 @@ try {
     console.log("Test 9: paseo ls --ui is rejected");
     const result = await runLocalPaseo(["ls", "--ui"], {
       PASEO_HOST: `localhost:${port}`,
-      PASEO_HOME: paseoHome,
     });
     assert.notStrictEqual(result.exitCode, 0, "should fail for removed --ui flag");
     const output = result.stdout + result.stderr;
@@ -185,17 +179,23 @@ try {
     console.log("✓ global --host targets the requested daemon\n");
   }
 
-  // Test 11: the last explicit --host wins
+  // Test 11: conflicting explicit --host selectors are rejected
   {
-    console.log("Test 11: the last explicit --host wins");
+    console.log("Test 11: conflicting explicit --host selectors are rejected");
     const firstHost = `localhost:${port}`;
-    const lastHost = `localhost:${port + 1}`;
+    const lastHost = `localhost:${await getAvailablePort()}`;
     const result = await runLocalPaseo(["--host", firstHost, "ls", "--host", lastHost]);
     const output = result.stdout + result.stderr;
-    assert.notStrictEqual(result.exitCode, 0, "should fail when the selected daemon is absent");
-    assert(output.includes(lastHost), "connection error should name the last explicit host");
-    assert(!output.includes(firstHost), "the earlier host should be fully overridden");
-    console.log("✓ the last explicit --host wins\n");
+    assert.notStrictEqual(result.exitCode, 0, "should reject conflicting explicit selectors");
+    assert(
+      output.includes("Conflicting duplicate --host selectors."),
+      "should report the selector conflict",
+    );
+    assert(
+      !output.includes("Cannot connect"),
+      "must reject the selectors before attempting a connection",
+    );
+    console.log("✓ conflicting explicit --host selectors are rejected\n");
   }
 } finally {
   // Clean up temp directory
diff --git a/packages/cli/tests/05-agent-run.test.ts b/packages/cli/tests/05-agent-run.test.ts
index 0af2a6ec7c..6948e4c008 100644
--- a/packages/cli/tests/05-agent-run.test.ts
+++ b/packages/cli/tests/05-agent-run.test.ts
@@ -21,6 +21,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
@@ -30,8 +31,8 @@ $.verbose = false;
 
 console.log("=== Run Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 const schemaPath = join(paseoHome, "run-output-schema.json");
 await writeFile(
@@ -52,8 +53,12 @@ try {
     console.log("Test 1: run --help shows options");
     const result = await $`npx paseo run --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "run --help should exit 0");
-    assert(result.stdout.includes("-d"), "help should mention -d flag");
-    assert(result.stdout.includes("--background"), "help should mention --background flag");
+    assert(result.stdout.includes("--no-wait"), "help should mention --no-wait flag");
+    assert(
+      !result.stdout.includes("--internal"),
+      "help should not mention removed --internal flag",
+    );
+    assert(!result.stdout.includes("--background"), "help should hide legacy --background syntax");
     assert(!result.stdout.includes("--detach"), "help should hide legacy --detach syntax");
     assert(result.stdout.includes("--title"), "help should mention --title option");
     assert(result.stdout.includes("--provider"), "help should mention --provider option");
@@ -72,7 +77,7 @@ try {
   {
     console.log("Test 2: run requires prompt argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without prompt");
     const output = result.stdout + result.stderr;
     // Commander should complain about missing argument
@@ -88,7 +93,7 @@ try {
   {
     console.log("Test 3: run handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --provider claude "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --provider claude "test prompt"`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -104,7 +109,7 @@ try {
   {
     console.log("Test 4: run -d flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run -d "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run -d "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -d flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -115,7 +120,7 @@ try {
   {
     console.log("Test 5: run --name flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --name "test-agent" "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --name "test-agent" "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --name flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -126,7 +131,7 @@ try {
   {
     console.log("Test 6: run --provider flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --provider codex "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --provider codex "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --provider flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -137,7 +142,7 @@ try {
   {
     console.log("Test 6b: run --provider provider/model syntax is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --provider codex/gpt-5.4 "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --provider codex/gpt-5.4 "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept provider/model syntax");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -148,7 +153,7 @@ try {
   {
     console.log("Test 7: run --mode flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --mode bypass "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --mode bypass "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --mode flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -159,7 +164,7 @@ try {
   {
     console.log("Test 8: run --cwd flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --cwd /tmp "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --cwd /tmp "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --cwd flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -170,32 +175,32 @@ try {
   {
     console.log("Test 9: run --output-schema flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --output-schema ${schemaPath} "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --output-schema ${schemaPath} "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --output-schema flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
     console.log("✓ run --output-schema flag is accepted\n");
   }
 
-  // Test 10: run --output-schema cannot be used with --background
+  // Test 10: run --output-schema cannot be used with --no-wait
   {
-    console.log("Test 10: run --output-schema cannot be used with --background");
+    console.log("Test 10: run --output-schema cannot be used with --no-wait");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --background --output-schema ${schemaPath} "test prompt"`.nothrow();
-    assert.notStrictEqual(result.exitCode, 0, "should fail with --background and --output-schema");
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --no-wait --output-schema ${schemaPath} "test prompt"`.nothrow();
+    assert.notStrictEqual(result.exitCode, 0, "should fail with --no-wait and --output-schema");
     const output = result.stdout + result.stderr;
     assert(
-      output.includes("--output-schema cannot be used with --background"),
+      output.includes("--output-schema cannot be used with --no-wait"),
       "error should explain background incompatibility",
     );
-    console.log("✓ run --output-schema cannot be used with --background\n");
+    console.log("✓ run --output-schema cannot be used with --no-wait\n");
   }
 
   // Test 11: -q (quiet) flag is accepted with run
   {
     console.log("Test 11: -q (quiet) flag is accepted with run");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q run -d "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q run -d "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -206,7 +211,7 @@ try {
   {
     console.log("Test 12: Combined flags work together");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q run -d --name "test-fixer" --provider claude --mode bypass --cwd /tmp "Fix the tests"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q run -d --name "test-fixer" --provider claude --mode bypass --cwd /tmp "Fix the tests"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept all combined flags");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -217,7 +222,7 @@ try {
   {
     console.log("Test 12b: conflicting provider/model syntax is rejected");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --provider codex/gpt-5.4 --model gpt-5.5 "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --provider codex/gpt-5.4 --model gpt-5.5 "test prompt"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail for conflicting model inputs");
     const output = result.stdout + result.stderr;
     assert(
@@ -240,7 +245,7 @@ try {
   {
     console.log("Test 14: run --ui is rejected");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --ui "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --ui "test prompt"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail for removed --ui flag");
     const output = result.stdout + result.stderr;
     assert(output.includes("unknown option"), "should report unknown option for --ui");
@@ -251,7 +256,7 @@ try {
   {
     console.log("Test 15: run --new-workspace is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --new-workspace local "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --new-workspace local "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --new-workspace");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -262,7 +267,7 @@ try {
   {
     console.log("Test 16: run --isolation is rejected");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo run --isolation local "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --isolation local "test prompt"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail for removed --isolation flag");
     const output = result.stdout + result.stderr;
     assert(output.includes("unknown option"), "should report unknown option for --isolation");
diff --git a/packages/cli/tests/06-agent-send.test.ts b/packages/cli/tests/06-agent-send.test.ts
index 60fd9aac72..ca28e26f56 100644
--- a/packages/cli/tests/06-agent-send.test.ts
+++ b/packages/cli/tests/06-agent-send.test.ts
@@ -18,6 +18,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
@@ -27,8 +28,8 @@ $.verbose = false;
 
 console.log("=== Send Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 const promptFilePath = join(paseoHome, "send-prompt.txt");
 await writeFile(promptFilePath, "prompt from file");
@@ -58,7 +59,7 @@ try {
   {
     console.log("Test 2: send requires id argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     // Commander should complain about missing argument
@@ -74,7 +75,7 @@ try {
   {
     console.log("Test 3: send requires prompt argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send abc123`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without prompt");
     const output = result.stdout + result.stderr;
     // Commander should complain about missing argument
@@ -90,7 +91,7 @@ try {
   {
     console.log("Test 4: send handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send abc123 "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send abc123 "test prompt"`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -106,7 +107,7 @@ try {
   {
     console.log("Test 5: send --no-wait flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send --no-wait abc123 "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send --no-wait abc123 "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --no-wait flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -117,7 +118,7 @@ try {
   {
     console.log("Test 5b: send --prompt flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send --prompt "test prompt" abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send --prompt "test prompt" abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --prompt flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -128,7 +129,7 @@ try {
   {
     console.log("Test 5c: send --prompt-file flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send --prompt-file ${promptFilePath} abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send --prompt-file ${promptFilePath} abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --prompt-file flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -150,7 +151,7 @@ try {
   {
     console.log("Test 7: -q (quiet) flag is accepted with send");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q send --no-wait abc123 "test prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q send --no-wait abc123 "test prompt"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -161,7 +162,7 @@ try {
   {
     console.log("Test 8: Combined flags work together");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q send --no-wait abc123 "Run the linter"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q send --no-wait abc123 "Run the linter"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept all combined flags");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -172,7 +173,7 @@ try {
   {
     console.log("Test 8b: conflicting prompt sources are rejected");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo send abc123 "positional prompt" --prompt "flag prompt"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} send abc123 "positional prompt" --prompt "flag prompt"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail for conflicting prompt sources");
     const output = result.stdout + result.stderr;
     assert(
diff --git a/packages/cli/tests/07-agent-stop.test.ts b/packages/cli/tests/07-agent-stop.test.ts
index 0b20028ec0..9416884a7b 100644
--- a/packages/cli/tests/07-agent-stop.test.ts
+++ b/packages/cli/tests/07-agent-stop.test.ts
@@ -18,6 +18,8 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -27,8 +29,8 @@ $.verbose = false;
 
 console.log("=== Stop Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -48,7 +50,7 @@ try {
   {
     console.log("Test 2: stop requires ID, --all, or --cwd");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo stop`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} stop`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id, --all, or --cwd");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -64,7 +66,7 @@ try {
   {
     console.log("Test 3: stop handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo stop abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} stop abc123`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -80,7 +82,7 @@ try {
   {
     console.log("Test 4: stop --all flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo stop --all`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} stop --all`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --all flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -91,7 +93,7 @@ try {
   {
     console.log("Test 5: stop --cwd flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo stop --cwd /tmp`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} stop --cwd /tmp`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --cwd flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -102,7 +104,7 @@ try {
   {
     console.log("Test 6: stop with ID and --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo stop abc123 --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} stop abc123 --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -122,12 +124,34 @@ try {
   {
     console.log("Test 8: -q (quiet) flag is accepted with stop");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q stop abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q stop abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
     console.log("✓ -q (quiet) flag is accepted with stop\n");
   }
+
+  {
+    console.log("Test 9: stop reports AGENT_NOT_FOUND for an unknown ID");
+    const daemon = await startTestDaemon();
+    try {
+      const result = await runPaseoCli(daemon, [
+        "agent",
+        "stop",
+        "does-not-exist",
+        "--host",
+        `127.0.0.1:${daemon.port}`,
+        "--json",
+      ]);
+      assert.notStrictEqual(result.exitCode, 0, "stop should fail for an unknown ID");
+      const { error } = JSON.parse(result.stderr);
+      assert.strictEqual(error.code, "AGENT_NOT_FOUND", result.stderr);
+      assert.match(error.details, /paseo ls/);
+    } finally {
+      await daemon.stop();
+    }
+    console.log("✓ stop reports AGENT_NOT_FOUND for an unknown ID\n");
+  }
 } finally {
   // Clean up temp directory
   await rm(paseoHome, { recursive: true, force: true });
diff --git a/packages/cli/tests/08-agent-logs.test.ts b/packages/cli/tests/08-agent-logs.test.ts
index f857bffdff..672f4a2dd0 100644
--- a/packages/cli/tests/08-agent-logs.test.ts
+++ b/packages/cli/tests/08-agent-logs.test.ts
@@ -18,6 +18,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -27,8 +28,8 @@ $.verbose = false;
 
 console.log("=== Logs Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -51,7 +52,7 @@ try {
   {
     console.log("Test 2: logs requires ID argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -67,7 +68,7 @@ try {
   {
     console.log("Test 3: logs handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs abc123`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -84,7 +85,7 @@ try {
     console.log("Test 4: logs -f (follow) flag is accepted");
     // Use timeout to avoid hanging on follow mode
     const result =
-      await $`timeout 1 bash -c 'PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs -f abc123' || true`.nothrow();
+      await $`timeout 1 bash -c 'PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs -f abc123' || true`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -f flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -95,7 +96,7 @@ try {
   {
     console.log("Test 5: logs --follow flag is accepted");
     const result =
-      await $`timeout 1 bash -c 'PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs --follow abc123' || true`.nothrow();
+      await $`timeout 1 bash -c 'PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs --follow abc123' || true`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --follow flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -106,7 +107,7 @@ try {
   {
     console.log("Test 6: logs --tail flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs --tail 50 abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs --tail 50 abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --tail flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -117,7 +118,7 @@ try {
   {
     console.log("Test 7: logs with ID and --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo logs abc123 --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} logs abc123 --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -137,7 +138,7 @@ try {
   {
     console.log("Test 9: -q (quiet) flag is accepted with logs");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q logs abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q logs abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
diff --git a/packages/cli/tests/09-agent-inspect.test.ts b/packages/cli/tests/09-agent-inspect.test.ts
index 0ae33343d7..9c449971bd 100644
--- a/packages/cli/tests/09-agent-inspect.test.ts
+++ b/packages/cli/tests/09-agent-inspect.test.ts
@@ -18,6 +18,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -27,8 +28,8 @@ $.verbose = false;
 
 console.log("=== Inspect Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -48,7 +49,7 @@ try {
   {
     console.log("Test 2: inspect requires id argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo inspect`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} inspect`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     // Commander should complain about missing argument
@@ -64,7 +65,7 @@ try {
   {
     console.log("Test 3: inspect handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo inspect abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} inspect abc123`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -91,7 +92,7 @@ try {
   {
     console.log("Test 5: -q (quiet) flag is accepted with inspect");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q inspect abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q inspect abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -102,7 +103,7 @@ try {
   {
     console.log("Test 6: --json flag is accepted with inspect");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo inspect abc123 --json`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} inspect abc123 --json`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --json flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -113,7 +114,7 @@ try {
   {
     console.log("Test 7: --format yaml flag is accepted with inspect");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo --format yaml inspect abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} --format yaml inspect abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --format yaml flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
diff --git a/packages/cli/tests/10-agent-mode.test.ts b/packages/cli/tests/10-agent-mode.test.ts
index 0aa492ea4f..e44898c03e 100644
--- a/packages/cli/tests/10-agent-mode.test.ts
+++ b/packages/cli/tests/10-agent-mode.test.ts
@@ -17,6 +17,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -26,8 +27,8 @@ $.verbose = false;
 
 console.log("=== Agent Mode Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -47,7 +48,7 @@ try {
   {
     console.log("Test 2: agent mode requires id argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent mode`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent mode`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -63,7 +64,7 @@ try {
   {
     console.log("Test 3: agent mode handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent mode abc123 bypass`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent mode abc123 bypass`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -79,7 +80,7 @@ try {
   {
     console.log("Test 4: agent mode --list flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent mode --list abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent mode --list abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --list flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -90,7 +91,7 @@ try {
   {
     console.log("Test 5: agent mode with ID and --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent mode abc123 plan --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent mode abc123 plan --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -110,7 +111,7 @@ try {
   {
     console.log("Test 7: -q (quiet) flag is accepted with agent mode");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q agent mode abc123 bypass`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q agent mode abc123 bypass`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -121,7 +122,7 @@ try {
   {
     console.log("Test 8: agent mode requires mode argument when not using --list");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent mode abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent mode abc123`.nothrow();
     // Should fail because mode is required unless --list is specified
     assert.notStrictEqual(result.exitCode, 0, "should fail without mode argument");
     const output = result.stdout + result.stderr;
diff --git a/packages/cli/tests/11-agent-archive.test.ts b/packages/cli/tests/11-agent-archive.test.ts
index 7493395a2b..0685e2948b 100644
--- a/packages/cli/tests/11-agent-archive.test.ts
+++ b/packages/cli/tests/11-agent-archive.test.ts
@@ -17,6 +17,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -26,8 +27,8 @@ $.verbose = false;
 
 console.log("=== Agent Archive Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -46,7 +47,7 @@ try {
   {
     console.log("Test 2: agent archive requires ID argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent archive`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent archive`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -61,7 +62,7 @@ try {
   {
     console.log("Test 3: agent archive handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent archive abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent archive abc123`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -77,7 +78,7 @@ try {
   {
     console.log("Test 4: agent archive --force flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent archive abc123 --force`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent archive abc123 --force`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --force flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -88,7 +89,7 @@ try {
   {
     console.log("Test 5: agent archive with ID and --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent archive abc123 --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent archive abc123 --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -108,7 +109,7 @@ try {
   {
     console.log("Test 7: -q (quiet) flag is accepted with agent archive");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q agent archive abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q agent archive abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
diff --git a/packages/cli/tests/11-agent-wait.test.ts b/packages/cli/tests/11-agent-wait.test.ts
index 8984bc0c4e..198fa08910 100644
--- a/packages/cli/tests/11-agent-wait.test.ts
+++ b/packages/cli/tests/11-agent-wait.test.ts
@@ -19,6 +19,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -28,8 +29,8 @@ $.verbose = false;
 
 console.log("=== Wait Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -51,7 +52,7 @@ try {
   {
     console.log("Test 2: wait requires id argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo wait`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} wait`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     // Commander should complain about missing argument
@@ -67,7 +68,7 @@ try {
   {
     console.log("Test 3: wait handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo wait abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} wait abc123`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -105,7 +106,7 @@ try {
   {
     console.log("Test 6: -q (quiet) flag is accepted with wait");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q wait abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q wait abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -116,7 +117,7 @@ try {
   {
     console.log("Test 7: --json flag is accepted with wait");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo wait abc123 --json`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} wait abc123 --json`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --json flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -127,7 +128,7 @@ try {
   {
     console.log("Test 8: --format yaml flag is accepted with wait");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo --format yaml wait abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} --format yaml wait abc123`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --format yaml flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
diff --git a/packages/cli/tests/12-permit-ls.test.ts b/packages/cli/tests/12-permit-ls.test.ts
index c4549ae6a7..44b9a720af 100644
--- a/packages/cli/tests/12-permit-ls.test.ts
+++ b/packages/cli/tests/12-permit-ls.test.ts
@@ -17,6 +17,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -26,8 +27,8 @@ $.verbose = false;
 
 console.log("=== Permit LS Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -55,7 +56,7 @@ try {
   {
     console.log("Test 3: permit ls handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit ls`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit ls`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -71,7 +72,7 @@ try {
   {
     console.log("Test 4: permit ls --json handles errors");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit ls --json`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit ls --json`.nothrow();
     // Should still fail (daemon not running)
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     // But output should be valid JSON if present
@@ -93,7 +94,7 @@ try {
   {
     console.log("Test 5: -q (quiet) flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q permit ls`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q permit ls`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
diff --git a/packages/cli/tests/13-permit-allow-deny.test.ts b/packages/cli/tests/13-permit-allow-deny.test.ts
index 51773da185..a44113726f 100644
--- a/packages/cli/tests/13-permit-allow-deny.test.ts
+++ b/packages/cli/tests/13-permit-allow-deny.test.ts
@@ -22,6 +22,7 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -31,8 +32,8 @@ $.verbose = false;
 
 console.log("=== Permit Allow/Deny Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -65,7 +66,7 @@ try {
   {
     console.log("Test 3: permit allow handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit allow abc123 req456`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit allow abc123 req456`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -81,7 +82,7 @@ try {
   {
     console.log("Test 4: permit deny handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit deny abc123 req456`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit deny abc123 req456`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -97,7 +98,7 @@ try {
   {
     console.log("Test 5: permit allow --all flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit allow abc123 --all`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit allow abc123 --all`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --all flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -108,7 +109,7 @@ try {
   {
     console.log("Test 6: permit deny --all flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit deny abc123 --all`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit deny abc123 --all`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --all flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -119,7 +120,7 @@ try {
   {
     console.log("Test 7: permit deny --message flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit deny abc123 req456 --message "Not allowed"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit deny abc123 req456 --message "Not allowed"`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --message flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -130,7 +131,7 @@ try {
   {
     console.log("Test 8: permit deny --interrupt flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit deny abc123 req456 --interrupt`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit deny abc123 req456 --interrupt`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --interrupt flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -141,7 +142,7 @@ try {
   {
     console.log("Test 9: permit allow --input flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit allow abc123 req456 --input '{"key":"value"}'`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit allow abc123 req456 --input '{"key":"value"}'`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --input flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -152,7 +153,7 @@ try {
   {
     console.log("Test 10: permit allow requires req_id or --all");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit allow abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit allow abc123`.nothrow();
     // This might fail due to daemon not running first, or due to missing argument
     // The important thing is it doesn't crash with an unhandled error
     assert.notStrictEqual(result.exitCode, 0, "should fail without req_id or --all");
@@ -163,7 +164,7 @@ try {
   {
     console.log("Test 11: permit deny requires req_id or --all");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo permit deny abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} permit deny abc123`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without req_id or --all");
     console.log("✓ permit deny requires req_id or --all\n");
   }
diff --git a/packages/cli/tests/14-worktree.test.ts b/packages/cli/tests/14-worktree.test.ts
index d1b30a541d..027cfbaa2b 100644
--- a/packages/cli/tests/14-worktree.test.ts
+++ b/packages/cli/tests/14-worktree.test.ts
@@ -19,8 +19,12 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
-import { mkdtemp, rm } from "fs/promises";
+import { mkdtemp, rm, mkdir } from "fs/promises";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
 import { tmpdir } from "os";
 import { join } from "path";
 
@@ -28,8 +32,8 @@ $.verbose = false;
 
 console.log("=== Worktree Command Tests ===\n");
 
-// Get random port that's definitely not in use (never 6767)
-const port = 10000 + Math.floor(Math.random() * 50000);
+// Allocate an unused endpoint for connection-error and argument-validation checks.
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-test-home-"));
 
 try {
@@ -49,6 +53,7 @@ try {
     const result = await $`npx paseo worktree ls --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "worktree ls --help should exit 0");
     assert(result.stdout.includes("--host"), "help should mention --host option");
+    assert(result.stdout.includes("--cwd"), "help should mention --cwd option");
     console.log("✓ worktree ls --help shows options\n");
   }
 
@@ -56,7 +61,7 @@ try {
   {
     console.log("Test 3: worktree ls handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree ls`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree ls`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -72,7 +77,7 @@ try {
   {
     console.log("Test 4: worktree ls with --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree ls --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree ls --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -85,6 +90,7 @@ try {
     const result = await $`npx paseo worktree archive --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "worktree archive --help should exit 0");
     assert(result.stdout.includes("--host"), "help should mention --host option");
+    assert(result.stdout.includes("--cwd"), "help should mention --cwd option");
     assert(result.stdout.includes("<name>"), "help should mention required name argument");
     console.log("✓ worktree archive --help shows options\n");
   }
@@ -93,7 +99,7 @@ try {
   {
     console.log("Test 6: worktree archive requires name argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree archive`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree archive`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without name");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -108,7 +114,7 @@ try {
   {
     console.log("Test 7: worktree archive handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree archive test-worktree`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree archive test-worktree`.nothrow();
     // Should fail because daemon not running
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
@@ -124,7 +130,7 @@ try {
   {
     console.log("Test 8: worktree archive with name and --host flag is accepted");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree archive test-worktree --host localhost:${port}`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree archive test-worktree --host localhost:${port}`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --host flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -135,7 +141,7 @@ try {
   {
     console.log("Test 9: -q (quiet) flag is accepted with worktree ls");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo -q worktree ls`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} -q worktree ls`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -146,7 +152,7 @@ try {
   {
     console.log("Test 10: --json flag is accepted with worktree ls");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo worktree ls --json`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} worktree ls --json`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --json flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -166,4 +172,66 @@ try {
   await rm(paseoHome, { recursive: true, force: true });
 }
 
+// Exercise repository selection through the real CLI and daemon. An empty
+// request used to fail before Git could inspect even a valid repository.
+const daemon = await startTestDaemon();
+const git = promisify(execFile);
+try {
+  const repo = join(daemon.workDir, "repository");
+  await mkdir(repo);
+  await git("git", ["init", repo]);
+  await git("git", [
+    "-C",
+    repo,
+    "-c",
+    "user.name=Test",
+    "-c",
+    "user.email=test@example.com",
+    "commit",
+    "--allow-empty",
+    "-m",
+    "Initial commit",
+  ]);
+
+  for (const args of [
+    ["worktree", "ls", "--json"],
+    ["worktree", "ls", "--cwd", repo, "--json"],
+    ["worktree", "ls", "--cwd", "./repository", "--json"],
+    ["worktree", "ls", "--host", `127.0.0.1:${daemon.port}`, "--cwd", ".", "--json"],
+  ]) {
+    const explicit = args.includes("--cwd");
+    const result = await runPaseoCli(daemon, args, {
+      cwd: explicit ? daemon.workDir : repo,
+      env: { FORCE_COLOR: undefined },
+    });
+    assert.strictEqual(result.exitCode, 0, result.stderr);
+    assert.deepStrictEqual(JSON.parse(result.stdout), []);
+  }
+
+  for (const args of [
+    ["worktree", "archive", "missing", "--json"],
+    ["worktree", "archive", "missing", "--cwd", repo, "--json"],
+    ["worktree", "archive", "missing", "--cwd", "./repository", "--json"],
+    [
+      "worktree",
+      "archive",
+      "missing",
+      "--host",
+      `127.0.0.1:${daemon.port}`,
+      "--cwd",
+      ".",
+      "--json",
+    ],
+  ]) {
+    const result = await runPaseoCli(daemon, args, {
+      cwd: args.includes("--cwd") ? daemon.workDir : repo,
+      env: { FORCE_COLOR: undefined },
+    });
+    assert.notStrictEqual(result.exitCode, 0);
+    assert.strictEqual(JSON.parse(result.stderr).error.code, "WORKTREE_NOT_FOUND", result.stderr);
+  }
+} finally {
+  await daemon.stop();
+}
+
 console.log("=== All worktree tests passed ===");
diff --git a/packages/cli/tests/15-provider.test.ts b/packages/cli/tests/15-provider.test.ts
index a1d302e9c4..3a4f33031c 100644
--- a/packages/cli/tests/15-provider.test.ts
+++ b/packages/cli/tests/15-provider.test.ts
@@ -52,10 +52,15 @@ interface ProviderDiagnostic {
 }
 
 const EXPECTED_CLAUDE_MODELS = [
+  {
+    id: "claude-opus-5-5",
+    model: "Opus 5.5",
+    descriptionFragment: "Latest release",
+  },
   {
     id: "claude-opus-5",
     model: "Opus 5",
-    descriptionFragment: "Latest release",
+    descriptionFragment: "Previous release",
   },
   {
     id: "claude-fable-5-1",
@@ -77,10 +82,15 @@ const EXPECTED_CLAUDE_MODELS = [
     model: "Opus 4.8",
     descriptionFragment: "Previous release",
   },
+  {
+    id: "claude-sonnet-5-5",
+    model: "Sonnet 5.5",
+    descriptionFragment: "Best for everyday tasks",
+  },
   {
     id: "claude-sonnet-5",
     model: "Sonnet 5",
-    descriptionFragment: "Best for everyday tasks",
+    descriptionFragment: "Previous release",
   },
   {
     id: "claude-opus-4-7[1m]",
@@ -112,10 +122,15 @@ const EXPECTED_CLAUDE_MODELS = [
     model: "Opus 4.6",
     descriptionFragment: "Most capable",
   },
+  {
+    id: "claude-haiku-5-5",
+    model: "Haiku 5.5",
+    descriptionFragment: "Fastest",
+  },
   {
     id: "claude-haiku-4-5",
     model: "Haiku 4.5",
-    descriptionFragment: "Fastest",
+    descriptionFragment: "Previous release",
   },
 ] as const;
 
@@ -349,10 +364,6 @@ try {
       ids.every((id) => id.startsWith("gpt-")),
       "all codex model IDs should be from the gpt family",
     );
-    assert(
-      ids.some((id) => id.includes("codex")),
-      "codex model list should include at least one codex-optimized model",
-    );
     assert(
       data.every((m) => m.model && m.id && m.description),
       "every codex model should have model, id, and description fields",
@@ -425,8 +436,8 @@ try {
       "--quiet should print the same ordered model IDs returned by --json",
     );
     assert(
-      claudeModelsFromJson.some((m) => m.id === "claude-sonnet-5"),
-      "captured --json output should include the current Claude everyday model id",
+      claudeModelsFromJson.some((m) => m.id === "claude-haiku-5-5"),
+      "captured --json output should include the current Claude quick-answer model id",
     );
     console.log("✓ provider models --quiet outputs model IDs only\n");
   }
diff --git a/packages/cli/tests/16-agent-update.test.ts b/packages/cli/tests/16-agent-update.test.ts
index 8e84ebf7b8..8ae54323bc 100644
--- a/packages/cli/tests/16-agent-update.test.ts
+++ b/packages/cli/tests/16-agent-update.test.ts
@@ -11,11 +11,11 @@
  */
 
 import assert from "node:assert";
+import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
-import { getAvailablePort } from "./helpers/network.ts";
 
 $.verbose = false;
 
@@ -43,7 +43,7 @@ try {
   {
     console.log("Test 2: agent update requires ID argument");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update --name "New Name"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update --name "New Name"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without id");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -59,7 +59,7 @@ try {
   {
     console.log("Test 3: agent update requires update field");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update abc123`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update abc123`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail without --name/--label");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -74,7 +74,7 @@ try {
   {
     console.log("Test 4: agent update handles daemon not running");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update abc123 --name "Renamed Agent"`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update abc123 --name "Renamed Agent"`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should fail when daemon not running");
     const output = result.stdout + result.stderr;
     const hasError =
@@ -89,7 +89,7 @@ try {
   {
     console.log("Test 5: agent update accepts multi-label syntax");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update abc123 --label surface=workspace,area=frontend --label priority=high`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update abc123 --label surface=workspace,area=frontend --label priority=high`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept --label flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
@@ -109,7 +109,7 @@ try {
   {
     console.log("Test 7: agent update accepts thinking as an update field");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update abc123 --thinking high`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update abc123 --thinking high`.nothrow();
     const output = result.stdout + result.stderr;
     assert(!output.includes("Nothing to update"), "should treat --thinking as an update field");
     console.log("✓ agent update accepts thinking as an update field\n");
@@ -119,7 +119,7 @@ try {
   {
     console.log("Test 8: thinking cannot be combined with metadata updates");
     const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npx paseo agent update abc123 --name renamed --thinking high`.nothrow();
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} agent update abc123 --name renamed --thinking high`.nothrow();
     assert.notStrictEqual(result.exitCode, 0, "should reject a combined update");
     const output = result.stdout + result.stderr;
     assert(
diff --git a/packages/cli/tests/17-onboard.test.ts b/packages/cli/tests/17-onboard.test.ts
index 3d8e641a26..a8b25148a2 100644
--- a/packages/cli/tests/17-onboard.test.ts
+++ b/packages/cli/tests/17-onboard.test.ts
@@ -5,6 +5,7 @@ import { readFile, mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { $ } from "zx";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
 import { getAvailablePort } from "./helpers/network.ts";
 
 $.verbose = false;
@@ -15,9 +16,19 @@ const paseoHome = await mkdtemp(join(tmpdir(), "paseo-onboard-home-"));
 const port = await getAvailablePort();
 
 try {
+  const configured = await runLocalPaseo([
+    "daemon",
+    "config",
+    "set",
+    "daemon.listen",
+    `127.0.0.1:${port}`,
+    "--home",
+    paseoHome,
+  ]);
+  assert.strictEqual(configured.exitCode, 0, configured.stderr);
+
   console.log("Test 1: `paseo` runs blocking onboarding without implicit relay pairing");
-  const onboard =
-    await $`PASEO_HOME=${paseoHome} PASEO_LISTEN=127.0.0.1:${port} PASEO_PAIRING_QR=0 npx paseo`.nothrow();
+  const onboard = await $`PASEO_HOME=${paseoHome} PASEO_PAIRING_QR=0 npx paseo`.nothrow();
 
   assert.strictEqual(
     onboard.exitCode,
@@ -37,8 +48,8 @@ try {
   assert(onboard.stdout.includes("paseo --help"), "onboard output should include --help shortcut");
   assert(onboard.stdout.includes("paseo ls"), "onboard output should include ls shortcut");
   assert(
-    onboard.stdout.includes('paseo run "your prompt"'),
-    "onboard output should include run shortcut",
+    onboard.stdout.includes(`paseo run --home ${JSON.stringify(paseoHome)} "your prompt"`),
+    "onboard output should include a run shortcut for the selected home",
   );
   assert(onboard.stdout.includes("paseo status"), "onboard output should include status shortcut");
   assert(
@@ -58,8 +69,7 @@ try {
   assert.strictEqual(enableRelay.exitCode, 0, `relay enable should succeed: ${enableRelay.stderr}`);
   assert(enableRelay.stdout.includes("#offer="), "relay enable should produce a pairing offer");
 
-  const noRelayOnboard =
-    await $`PASEO_HOME=${paseoHome} PASEO_LISTEN=127.0.0.1:${port} npx paseo --no-relay`.nothrow();
+  const noRelayOnboard = await $`PASEO_HOME=${paseoHome} npx paseo --no-relay`.nothrow();
   assert.strictEqual(
     noRelayOnboard.exitCode,
     0,
diff --git a/packages/cli/tests/18-local-daemon-utils.test.ts b/packages/cli/tests/18-local-daemon-utils.test.ts
deleted file mode 100644
index 89780a6731..0000000000
--- a/packages/cli/tests/18-local-daemon-utils.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env npx tsx
-
-/**
- * Phase 18: Local daemon utility tests.
- *
- * Tests pure helpers that do not require a running daemon.
- */
-
-import assert from "node:assert";
-import { resolveTcpHostFromListen } from "../src/commands/daemon/local-daemon.js";
-
-console.log("=== Local Daemon Utility Helpers ===\n");
-
-{
-  console.log("Test 1: resolves numeric listen values to localhost host:port");
-  assert.strictEqual(resolveTcpHostFromListen("6767"), "127.0.0.1:6767");
-  assert.strictEqual(resolveTcpHostFromListen("  7777  "), "127.0.0.1:7777");
-  console.log("✓ resolves numeric listen values\n");
-}
-
-{
-  console.log("Test 2: preserves explicit host:port listen values");
-  assert.strictEqual(resolveTcpHostFromListen("localhost:6767"), "localhost:6767");
-  assert.strictEqual(resolveTcpHostFromListen("0.0.0.0:8080"), "0.0.0.0:8080");
-  console.log("✓ preserves explicit host:port values\n");
-}
-
-{
-  console.log("Test 3: rejects unix socket listen values");
-  assert.strictEqual(resolveTcpHostFromListen("/tmp/paseo.sock"), null);
-  assert.strictEqual(resolveTcpHostFromListen("unix:///tmp/paseo.sock"), null);
-  assert.strictEqual(resolveTcpHostFromListen("pipe://\\\\.\\pipe\\paseo-managed-test"), null);
-  assert.strictEqual(resolveTcpHostFromListen("\\\\.\\pipe\\paseo-managed-test"), null);
-  console.log("✓ rejects unix socket listen values\n");
-}
-
-{
-  console.log("Test 4: rejects empty and non-host listen values");
-  assert.strictEqual(resolveTcpHostFromListen(""), null);
-  assert.strictEqual(resolveTcpHostFromListen("   "), null);
-  assert.strictEqual(resolveTcpHostFromListen("localhost"), null);
-  console.log("✓ rejects empty and non-host listen values\n");
-}
-
-{
-  console.log("Test 5: rejects Windows absolute paths (not TCP endpoints)");
-  assert.strictEqual(resolveTcpHostFromListen("C:\\Users\\foo\\.paseo\\paseo.sock"), null);
-  assert.strictEqual(resolveTcpHostFromListen("D:\\project\\socket"), null);
-  assert.strictEqual(resolveTcpHostFromListen("C:\\paseo.sock"), null);
-  console.log("✓ rejects Windows absolute paths\n");
-}
-
-console.log("=== All local daemon utility tests passed ===");
diff --git a/packages/cli/tests/20-worktree-ls-paths.test.ts b/packages/cli/tests/20-worktree-ls-paths.test.ts
deleted file mode 100644
index d73cb5ca5e..0000000000
--- a/packages/cli/tests/20-worktree-ls-paths.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env npx tsx
-
-import assert from "node:assert";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { resolvePaseoHomePath, resolvePaseoWorktreesDir } from "../src/commands/worktree/ls.js";
-
-console.log("=== Worktree LS Path Helper Tests ===\n");
-
-const originalPaseoHome = process.env.PASEO_HOME;
-
-try {
-  {
-    console.log("Test 1: resolves explicit PASEO_HOME when set");
-    process.env.PASEO_HOME = "/tmp/paseo-explicit-home";
-
-    assert.strictEqual(resolvePaseoHomePath(), "/tmp/paseo-explicit-home");
-    assert.strictEqual(resolvePaseoWorktreesDir(), "/tmp/paseo-explicit-home/worktrees");
-    console.log("\u2713 explicit PASEO_HOME is respected\n");
-  }
-
-  {
-    console.log("Test 2: falls back to homedir/.paseo when PASEO_HOME is unset");
-    delete process.env.PASEO_HOME;
-
-    assert.strictEqual(resolvePaseoHomePath(), join(homedir(), ".paseo"));
-    assert.strictEqual(resolvePaseoWorktreesDir(), join(homedir(), ".paseo", "worktrees"));
-    console.log("\u2713 fallback home path is derived from os.homedir()\n");
-  }
-} finally {
-  if (originalPaseoHome === undefined) {
-    delete process.env.PASEO_HOME;
-  } else {
-    process.env.PASEO_HOME = originalPaseoHome;
-  }
-}
-
-console.log("=== All worktree ls path helper tests passed ===");
diff --git a/packages/cli/tests/22-daemon-stop-supervisor.test.ts b/packages/cli/tests/22-daemon-stop-supervisor.test.ts
index f6687703fa..979e866003 100644
--- a/packages/cli/tests/22-daemon-stop-supervisor.test.ts
+++ b/packages/cli/tests/22-daemon-stop-supervisor.test.ts
@@ -213,8 +213,9 @@ try {
   );
   const capturedSupervisorLogs = await readCapturedSupervisorLogs(paseoHome, recentSupervisorLogs);
   assert(
-    capturedSupervisorLogs.includes('"msg":"Worker requested shutdown"') &&
-      capturedSupervisorLogs.includes('"reason":"client_shutdown_rpc"'),
+    process.platform === "win32"
+      ? capturedSupervisorLogs.includes('"reason":"client_shutdown_rpc"')
+      : capturedSupervisorLogs.includes("supervisor_received_SIGTERM"),
     `stop should log lifecycle shutdown reason from daemon worker, logs:\n${capturedSupervisorLogs}`,
   );
   assert(
diff --git a/packages/cli/tests/25-daemon-restart-supervisor.test.ts b/packages/cli/tests/25-daemon-restart-supervisor.test.ts
index 040fba7f2d..d3ae10e19c 100644
--- a/packages/cli/tests/25-daemon-restart-supervisor.test.ts
+++ b/packages/cli/tests/25-daemon-restart-supervisor.test.ts
@@ -6,17 +6,22 @@
  */
 
 import assert from "node:assert";
-import { spawn, spawnSync, type ChildProcess } from "node:child_process";
-import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { spawn, type ChildProcess } from "node:child_process";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { $ } from "zx";
-import { tryConnectToDaemon } from "../src/utils/client.ts";
+import { WebSocket } from "ws";
+import {
+  DaemonClient,
+  DaemonConnectionError,
+  type WebSocketLike,
+} from "@getpaseo/client/internal/daemon-client";
+import { readDaemonInstance, isSameDaemonInstance } from "@getpaseo/server/daemon-control";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
 import { getAvailablePort } from "./helpers/network.ts";
 
-$.verbose = false;
-
 const pollIntervalMs = 100;
+const daemonReadyTimeoutMs = 120_000;
 const testEnv = {
   PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: process.env.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD ?? "0",
   PASEO_DICTATION_ENABLED: process.env.PASEO_DICTATION_ENABLED ?? "0",
@@ -40,60 +45,6 @@ function isProcessRunning(pid: number): boolean {
   }
 }
 
-function readWorkerPid(supervisorPid: number): number | null {
-  if (!Number.isInteger(supervisorPid) || supervisorPid <= 0) {
-    return null;
-  }
-
-  const result = spawnSync("ps", ["ax", "-o", "pid=,ppid="], { encoding: "utf8" });
-  if (result.status !== 0 || result.error) {
-    return null;
-  }
-
-  for (const line of result.stdout.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      continue;
-    }
-    const [pidToken, ppidToken] = trimmed.split(/\s+/);
-    const pid = Number.parseInt(pidToken ?? "", 10);
-    const ppid = Number.parseInt(ppidToken ?? "", 10);
-    if (!Number.isInteger(pid) || !Number.isInteger(ppid)) {
-      continue;
-    }
-    if (ppid === supervisorPid && pid > 0) {
-      return pid;
-    }
-  }
-
-  return null;
-}
-
-interface DaemonStatus {
-  localDaemon: string | null;
-  pid: number | null;
-}
-
-async function readDaemonStatus(paseoHome: string): Promise<DaemonStatus> {
-  const result =
-    await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon status --home ${paseoHome} --json`.nothrow();
-  if (result.exitCode !== 0) {
-    return { localDaemon: null, pid: null };
-  }
-
-  try {
-    const parsed = JSON.parse(result.stdout) as { localDaemon?: unknown; pid?: unknown };
-    const localDaemon = typeof parsed.localDaemon === "string" ? parsed.localDaemon : null;
-    const pid =
-      typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0
-        ? parsed.pid
-        : null;
-    return { localDaemon, pid };
-  } catch {
-    return { localDaemon: null, pid: null };
-  }
-}
-
 async function readCapturedSupervisorLogs(paseoHome: string, recentLogs: string): Promise<string> {
   const durableLogs = await readFile(join(paseoHome, "daemon.log"), "utf8").catch(() => "");
   return `${recentLogs}\n${durableLogs}`;
@@ -125,8 +76,30 @@ const host = `127.0.0.1:${port}`;
 
 let supervisorProcess: ChildProcess | null = null;
 let recentSupervisorLogs = "";
+let client: DaemonClient | undefined;
+const availabilityLog = join(paseoHome, "availability.log");
 
 try {
+  if (process.platform !== "win32") {
+    const provider = join(paseoHome, "slow-provider");
+    await writeFile(
+      provider,
+      `#!${process.execPath}
+import('node:fs').then(({appendFileSync}) => {
+  appendFileSync(${JSON.stringify(availabilityLog)}, JSON.stringify(process.argv.slice(2)) + "\\n");
+  setTimeout(() => console.log('provider 1.0.0'), 1800);
+});
+`,
+      { mode: 0o700 },
+    );
+    await writeFile(
+      join(paseoHome, "config.json"),
+      JSON.stringify({
+        version: 1,
+        agents: { providers: { claude: { command: { mode: "replace", argv: [provider] } } } },
+      }),
+    );
+  }
   console.log("Test 1: start supervisor-entrypoint in dev mode with isolated PASEO_HOME");
 
   supervisorProcess = spawn(
@@ -135,7 +108,11 @@ try {
     {
       cwd: cliRoot,
       env: {
-        ...process.env,
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+        ),
+        HOME: paseoHome,
+        USERPROFILE: paseoHome,
         ...testEnv,
         PASEO_HOME: paseoHome,
         PASEO_LISTEN: host,
@@ -153,80 +130,91 @@ try {
     recentSupervisorLogs = (recentSupervisorLogs + chunk.toString()).slice(-8000);
   });
 
+  let supervisor = await readDaemonInstance(paseoHome);
   await waitFor(
     async () => {
-      const status = await readDaemonStatus(paseoHome);
-      return (
-        status.localDaemon === "running" && status.pid !== null && isProcessRunning(status.pid)
-      );
+      supervisor = await readDaemonInstance(paseoHome);
+      return supervisor?.pid === supervisorProcess?.pid && Boolean(supervisor?.listen);
     },
-    120000,
-    "daemon did not become running in time",
+    daemonReadyTimeoutMs,
+    "daemon did not publish its bound endpoint in time",
   );
-
-  const statusBeforeRestart = await readDaemonStatus(paseoHome);
-  const supervisorPid = statusBeforeRestart.pid;
-  assert.strictEqual(
-    statusBeforeRestart.localDaemon,
-    "running",
-    "daemon should be running before restart",
-  );
-  assert(supervisorPid !== null, "supervisor pid should exist once daemon starts");
+  assert(supervisor?.listen, "owned supervisor should publish its bound endpoint");
+  const supervisorPid = supervisor.pid;
+  assert.strictEqual(supervisorPid, supervisorProcess.pid, "PID lock should identify this launch");
   assert(isProcessRunning(supervisorPid), "supervisor process should be running");
-  const workerPidBeforeRestart = readWorkerPid(supervisorPid);
-  assert(workerPidBeforeRestart !== null, "supervisor should have a worker process before restart");
+
+  client = new DaemonClient({
+    url: `ws://${supervisor.listen}/ws`,
+    clientId: "supervisor-restart-test",
+    connectTimeoutMs: 5000,
+    webSocketFactory: (url) => new WebSocket(url) as unknown as WebSocketLike,
+  });
+  await client.connect();
+  // The app reads worker identity through the full RPC, not the bounded CLI observation.
+  const statusBeforeRestart = await client.getDaemonStatus();
+  const workerPidBeforeRestart = statusBeforeRestart.pid;
   assert(
     isProcessRunning(workerPidBeforeRestart),
     "worker process should be running before restart",
   );
+  if (process.platform !== "win32") {
+    assert.match(
+      await readFile(availabilityLog, "utf8"),
+      /\["--version"\]/,
+      "the configured slow provider was actually probed",
+    );
+  }
   console.log(
     `✓ daemon running with supervisor ${supervisorPid} and worker ${workerPidBeforeRestart}\n`,
   );
 
   console.log("Test 2: app-style restart request should restart worker and keep daemon healthy");
-  const client = await tryConnectToDaemon({ host, timeout: 5000 });
-  assert(client, "daemon client should connect");
-  try {
-    const restartAck = await client.restartServer("settings_update");
-    assert.strictEqual(
-      restartAck.status,
-      "restart_requested",
-      "restart request should be acknowledged",
-    );
-  } finally {
-    await client?.close().catch(() => undefined);
-  }
-
-  await waitFor(
-    () => {
-      const workerPid = readWorkerPid(supervisorPid);
-      return (
-        workerPid !== null && workerPid !== workerPidBeforeRestart && isProcessRunning(workerPid)
-      );
-    },
-    20000,
-    "worker pid did not change after restart request",
+  const restartAck = await client.restartServer("settings_update");
+  assert.strictEqual(
+    restartAck.status,
+    "restart_requested",
+    "restart request should be acknowledged",
   );
 
-  const workerPidAfterRestart = readWorkerPid(supervisorPid);
-  assert(workerPidAfterRestart !== null, "worker process should exist after restart");
+  // A restart includes worker startup and client reconnection, as initial readiness does.
+  const deadline = Date.now() + daemonReadyTimeoutMs;
+  let statusAfterRestart = statusBeforeRestart;
+  await waitFor(
+    async () => {
+      try {
+        const observed = await client!.getDaemonStatus({
+          timeout: Math.max(1, deadline - Date.now()),
+        });
+        if (observed.pid === workerPidBeforeRestart || !isProcessRunning(observed.pid))
+          return false;
+        statusAfterRestart = observed;
+        return true;
+      } catch (error) {
+        if (error instanceof DaemonConnectionError) return false;
+        throw error;
+      }
+    },
+    daemonReadyTimeoutMs,
+    "worker pid did not change after restart request",
+  );
   assert.notStrictEqual(
-    workerPidAfterRestart,
+    statusAfterRestart.pid,
     workerPidBeforeRestart,
     "worker pid should change after restart",
   );
-
-  const statusAfterRestart = await readDaemonStatus(paseoHome);
+  assert(isProcessRunning(statusAfterRestart.pid), "replacement worker should remain running");
+  const current = await readDaemonInstance(paseoHome);
+  assert(current?.listen, "daemon should remain bound after restart");
   assert.strictEqual(
-    statusAfterRestart.localDaemon,
-    "running",
-    "daemon should stay running after restart",
-  );
-  assert.strictEqual(
-    statusAfterRestart.pid,
+    current.pid,
     supervisorPid,
     "supervisor pid should remain stable across restart",
   );
+  assert(
+    isSameDaemonInstance(supervisor, current),
+    "supervisor start time should remain stable across restart",
+  );
   const capturedSupervisorLogs = await readCapturedSupervisorLogs(paseoHome, recentSupervisorLogs);
   assert(
     capturedSupervisorLogs.includes('"msg":"Worker requested restart"') &&
@@ -243,6 +231,7 @@ try {
   );
   console.log("✓ app-style restart keeps daemon healthy and restarts worker\n");
 } finally {
+  await client?.close();
   if (supervisorProcess?.pid && isProcessRunning(supervisorProcess.pid)) {
     supervisorProcess.kill("SIGTERM");
     await waitFor(
@@ -254,7 +243,7 @@ try {
     });
   }
 
-  await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon stop --home ${paseoHome} --force`.nothrow();
+  await runLocalPaseo(["daemon", "stop", "--home", paseoHome, "--force"]);
   await rm(paseoHome, { recursive: true, force: true });
 }
 
diff --git a/packages/cli/tests/27-agent-delete.test.ts b/packages/cli/tests/27-agent-delete.test.ts
index 64ab4007bf..349125109b 100644
--- a/packages/cli/tests/27-agent-delete.test.ts
+++ b/packages/cli/tests/27-agent-delete.test.ts
@@ -11,27 +11,24 @@
  */
 
 import assert from "node:assert";
-import { $ } from "zx";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
+import { getAvailablePort } from "./helpers/network.ts";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-
-$.verbose = false;
+import { join } from "path";
 
 console.log("=== Delete Command Tests ===\n");
 
-const cliRoot = dirname(fileURLToPath(import.meta.url));
-const repoRoot = join(cliRoot, "..", "..", "..");
-const port = 10000 + Math.floor(Math.random() * 50000);
+const port = await getAvailablePort();
 const paseoHome = await mkdtemp(join(tmpdir(), "paseo-delete-test-home-"));
 
 async function runCli(args: string[]) {
-  return $`npm --prefix ${repoRoot} run cli -- ${args}`.nothrow();
+  return runLocalPaseo(["--host", `localhost:${port}`, ...args], { PASEO_HOME: paseoHome });
 }
 
 async function runDelete(args: string[]) {
-  return $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npm --prefix ${repoRoot} run cli -- delete ${args}`.nothrow();
+  return runCli(["delete", ...args]);
 }
 
 try {
@@ -110,13 +107,34 @@ try {
 
   {
     console.log("Test 8: -q (quiet) flag is accepted with delete");
-    const result =
-      await $`PASEO_HOST=localhost:${port} PASEO_HOME=${paseoHome} npm --prefix ${repoRoot} run cli -- -q delete abc123`.nothrow();
+    const result = await runCli(["-q", "delete", "abc123"]);
     const output = result.stdout + result.stderr;
     assert(!output.includes("unknown option"), "should accept -q flag");
     assert(!output.includes("error: option"), "should not have option parsing error");
     console.log("✓ -q (quiet) flag is accepted with delete\n");
   }
+
+  {
+    console.log("Test 9: delete reports AGENT_NOT_FOUND for an unknown ID");
+    const daemon = await startTestDaemon();
+    try {
+      const result = await runPaseoCli(daemon, [
+        "agent",
+        "delete",
+        "does-not-exist",
+        "--host",
+        `127.0.0.1:${daemon.port}`,
+        "--json",
+      ]);
+      assert.notStrictEqual(result.exitCode, 0, "delete should fail for an unknown ID");
+      const { error } = JSON.parse(result.stderr);
+      assert.strictEqual(error.code, "AGENT_NOT_FOUND", result.stderr);
+      assert.match(error.details, /paseo ls/);
+    } finally {
+      await daemon.stop();
+    }
+    console.log("✓ delete reports AGENT_NOT_FOUND for an unknown ID\n");
+  }
 } finally {
   await rm(paseoHome, { recursive: true, force: true });
 }
diff --git a/packages/cli/tests/28-client-ipc-targets.test.ts b/packages/cli/tests/28-client-ipc-targets.test.ts
index 24ceb9a632..3072927df0 100644
--- a/packages/cli/tests/28-client-ipc-targets.test.ts
+++ b/packages/cli/tests/28-client-ipc-targets.test.ts
@@ -1,16 +1,13 @@
 #!/usr/bin/env npx tsx
 
 import assert from "node:assert";
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import {
   getDaemonHost,
   normalizeDaemonHost,
   resolveDaemonPassword,
   resolveDaemonTarget,
-  resolveDefaultDaemonHosts,
 } from "../src/utils/client.js";
+import { selectDaemonTarget } from "../src/utils/daemon-target.js";
 import { resolveCliVersion } from "../src/version.js";
 
 console.log("=== CLI IPC Target Helpers ===\n");
@@ -81,48 +78,13 @@ console.log("=== CLI IPC Target Helpers ===\n");
 }
 
 {
-  console.log("Test 6: default host resolution tries local IPC first, then localhost fallback");
-  const paseoHome = mkdtempSync(path.join(os.tmpdir(), "paseo-client-targets-"));
-  try {
-    mkdirSync(paseoHome, { recursive: true });
-    writeFileSync(
-      path.join(paseoHome, "paseo.pid"),
-      JSON.stringify({ pid: process.pid, listen: "/tmp/paseo-from-pid.sock" }),
-    );
-    assert.deepStrictEqual(resolveDefaultDaemonHosts({ PASEO_HOME: paseoHome }), [
-      "unix:///tmp/paseo-from-pid.sock",
-      "localhost:6767",
-    ]);
-    const previousHome = process.env.PASEO_HOME;
-    const previousHost = process.env.PASEO_HOST;
-    process.env.PASEO_HOME = paseoHome;
-    delete process.env.PASEO_HOST;
-    assert.strictEqual(getDaemonHost(), "unix:///tmp/paseo-from-pid.sock");
-    if (previousHome === undefined) delete process.env.PASEO_HOME;
-    else process.env.PASEO_HOME = previousHome;
-    if (previousHost === undefined) delete process.env.PASEO_HOST;
-    else process.env.PASEO_HOST = previousHost;
-  } finally {
-    rmSync(paseoHome, { recursive: true, force: true });
-  }
-  console.log("✓ default host resolution tries local IPC first, then localhost fallback\n");
-}
-
-{
-  console.log("Test 7: configured TCP host is preserved before the localhost fallback");
-  const paseoHome = mkdtempSync(path.join(os.tmpdir(), "paseo-client-targets-tcp-"));
-  try {
-    assert.deepStrictEqual(
-      resolveDefaultDaemonHosts({
-        PASEO_HOME: paseoHome,
-        PASEO_LISTEN: "127.0.0.1:7777",
-      }),
-      ["127.0.0.1:7777", "localhost:6767"],
-    );
-  } finally {
-    rmSync(paseoHome, { recursive: true, force: true });
-  }
-  console.log("✓ configured TCP host is preserved before the localhost fallback\n");
+  const target = selectDaemonTarget(
+    { home: "/tmp/selected-home" },
+    { PASEO_HOST: "ignored:12345", PASEO_LISTEN: "ignored:23456" },
+  );
+  assert.deepStrictEqual(target, { kind: "instance", home: "/tmp/selected-home" });
+  assert.strictEqual(getDaemonHost({ target }), "home /tmp/selected-home");
+  assert.throws(() => selectDaemonTarget({}, { PASEO_HOME: "/tmp/a", PASEO_HOST: "unused:12345" }));
 }
 
 {
@@ -131,28 +93,6 @@ console.log("=== CLI IPC Target Helpers ===\n");
   console.log("✓ CLI app version resolves for daemon hello compatibility\n");
 }
 
-{
-  console.log("Test 9: local IPC still takes priority over configured TCP hosts");
-  const paseoHome = mkdtempSync(path.join(os.tmpdir(), "paseo-client-targets-order-"));
-  try {
-    mkdirSync(paseoHome, { recursive: true });
-    writeFileSync(
-      path.join(paseoHome, "paseo.pid"),
-      JSON.stringify({ pid: process.pid, listen: "/tmp/paseo-priority.sock" }),
-    );
-    assert.deepStrictEqual(
-      resolveDefaultDaemonHosts({
-        PASEO_HOME: paseoHome,
-        PASEO_LISTEN: "127.0.0.1:7777",
-      }),
-      ["unix:///tmp/paseo-priority.sock", "127.0.0.1:7777", "localhost:6767"],
-    );
-  } finally {
-    rmSync(paseoHome, { recursive: true, force: true });
-  }
-  console.log("✓ local IPC still takes priority over configured TCP hosts\n");
-}
-
 {
   console.log("Test 10: daemon password resolution prefers TCP URI query, falls back to env");
   const previousEnv = process.env.PASEO_PASSWORD;
diff --git a/packages/cli/tests/31-schedule.test.ts b/packages/cli/tests/31-schedule.test.ts
index 64cd6ca64b..8ecd098a07 100644
--- a/packages/cli/tests/31-schedule.test.ts
+++ b/packages/cli/tests/31-schedule.test.ts
@@ -130,7 +130,102 @@ try {
   }
 
   {
-    console.log("Test 1d: compatibility agent-target schedules remain deletable");
+    console.log("Test 1d: schedule update clears limits with negated flags");
+    const created = await ctx.paseo([
+      "schedule",
+      "create",
+      "Review scheduled work",
+      "--cron",
+      "0 0 1 1 *",
+      "--provider",
+      "claude",
+      "--cwd",
+      ctx.workDir,
+      "--max-runs",
+      "3",
+      "--expires-in",
+      "1h",
+      "--json",
+    ]);
+    assert.strictEqual(created.exitCode, 0, created.stderr);
+    const { id } = JSON.parse(created.stdout);
+
+    const inspect = async () => {
+      const result = await ctx.paseo(["schedule", "inspect", id, "--json"]);
+      assert.strictEqual(result.exitCode, 0, result.stderr);
+      return JSON.parse(result.stdout);
+    };
+    const initial = await inspect();
+    assert.strictEqual(initial.maxRuns, 3);
+    assert.strictEqual(typeof initial.expiresAt, "string");
+
+    const renamed = await ctx.paseo([
+      "schedule",
+      "update",
+      id,
+      "--name",
+      "renamed-review",
+      "--json",
+    ]);
+    assert.strictEqual(renamed.exitCode, 0, renamed.stderr);
+    const afterRename = await inspect();
+    assert.strictEqual(afterRename.name, "renamed-review");
+    assert.strictEqual(afterRename.maxRuns, initial.maxRuns);
+    assert.strictEqual(afterRename.expiresAt, initial.expiresAt);
+
+    const clearedMaxRuns = await ctx.paseo(["schedule", "update", id, "--no-max-runs", "--json"]);
+    assert.strictEqual(clearedMaxRuns.exitCode, 0, clearedMaxRuns.stderr);
+    const withoutMaxRuns = await inspect();
+    assert.strictEqual(withoutMaxRuns.maxRuns, null);
+    assert.strictEqual(withoutMaxRuns.expiresAt, initial.expiresAt);
+
+    const clearedExpiration = await ctx.paseo([
+      "schedule",
+      "update",
+      id,
+      "--no-expires-in",
+      "--json",
+    ]);
+    assert.strictEqual(clearedExpiration.exitCode, 0, clearedExpiration.stderr);
+    const withoutExpiration = await inspect();
+    assert.strictEqual(withoutExpiration.maxRuns, null);
+    assert.strictEqual(withoutExpiration.expiresAt, null);
+
+    const updatedLimits = await ctx.paseo([
+      "schedule",
+      "update",
+      id,
+      "--max-runs",
+      "5",
+      "--expires-in",
+      "2h",
+      "--json",
+    ]);
+    assert.strictEqual(updatedLimits.exitCode, 0, updatedLimits.stderr);
+    const withLimits = await inspect();
+    assert.strictEqual(withLimits.maxRuns, 5);
+    assert.strictEqual(typeof withLimits.expiresAt, "string");
+
+    const clearedBoth = await ctx.paseo([
+      "schedule",
+      "update",
+      id,
+      "--no-max-runs",
+      "--no-expires-in",
+      "--json",
+    ]);
+    assert.strictEqual(clearedBoth.exitCode, 0, clearedBoth.stderr);
+    const withoutLimits = await inspect();
+    assert.strictEqual(withoutLimits.maxRuns, null);
+    assert.strictEqual(withoutLimits.expiresAt, null);
+
+    const deleted = await ctx.paseo(["schedule", "delete", id, "--json"]);
+    assert.strictEqual(deleted.exitCode, 0, deleted.stderr);
+    console.log("schedule update clears limits\n");
+  }
+
+  {
+    console.log("Test 1e: compatibility agent-target schedules remain deletable");
     const created = await ctx.paseo(
       [
         "schedule",
diff --git a/packages/cli/tests/32-daemon-set-password.test.ts b/packages/cli/tests/32-daemon-set-password.test.ts
index 2dab1d9561..d40e79d5a0 100644
--- a/packages/cli/tests/32-daemon-set-password.test.ts
+++ b/packages/cli/tests/32-daemon-set-password.test.ts
@@ -5,7 +5,8 @@ import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { Command } from "commander";
-import { isBearerTokenValid } from "@getpaseo/server";
+import { isBearerTokenValidAsync } from "@getpaseo/server/auth";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
 import {
   runSetPasswordCommand,
   setDaemonPasswordInConfig,
@@ -51,13 +52,19 @@ try {
     const config = JSON.parse(await readFile(join(paseoHome, "config.json"), "utf-8"));
 
     assert.strictEqual(result.configPath, join(paseoHome, "config.json"));
-    assert.strictEqual(result.restartCommand, "paseo daemon restart");
+    assert.strictEqual(
+      result.restartCommand,
+      `paseo daemon restart --home ${JSON.stringify(paseoHome)}`,
+    );
     assert.strictEqual(config.daemon.listen, "127.0.0.1:9999");
     assert.strictEqual(config.daemon.relay.enabled, false);
     assert.notStrictEqual(config.daemon.auth.password, "shared-secret");
     assert.match(config.daemon.auth.password, /^\$2[aby]\$12\$/);
     assert.strictEqual(
-      isBearerTokenValid({ password: config.daemon.auth.password, token: "shared-secret" }),
+      await isBearerTokenValidAsync({
+        password: config.daemon.auth.password,
+        token: "shared-secret",
+      }),
       true,
     );
     console.log("✓ set-password writes bcrypt hash without clobbering config\n");
@@ -68,6 +75,7 @@ try {
     const result = await runSetPasswordCommand(
       {
         home: paseoHome,
+        daemonTarget: { kind: "instance", home: paseoHome },
         promptPassword: promptSequence(["new-secret", "new-secret"]),
       },
       {} as Command,
@@ -76,7 +84,7 @@ try {
 
     assert.strictEqual(result.data.action, "password_set");
     assert.strictEqual(
-      isBearerTokenValid({ password: config.daemon.auth.password, token: "new-secret" }),
+      await isBearerTokenValidAsync({ password: config.daemon.auth.password, token: "new-secret" }),
       true,
     );
     console.log("✓ command accepts matching confirmation\n");
@@ -88,6 +96,7 @@ try {
       runSetPasswordCommand(
         {
           home: paseoHome,
+          daemonTarget: { kind: "instance", home: paseoHome },
           promptPassword: promptSequence(["first-secret", "second-secret"]),
         },
         {} as Command,
@@ -100,6 +109,27 @@ try {
     );
     console.log("✓ command refuses password mismatch\n");
   }
+
+  {
+    console.log("Test 4: piped stdin fails with a message instead of exiting silently");
+    const pipedHome = join(root, "piped");
+    await mkdir(pipedHome, { recursive: true });
+    const run = runLocalPaseo(["daemon", "set-password", "--home", pipedHome, "--json"]);
+    run.stdin.end("x\nx\n");
+    const result = await run;
+
+    assert.strictEqual(result.exitCode, 1, result.stderr);
+    const error = JSON.parse(result.stderr).error as {
+      code: string;
+      message: string;
+      details: string;
+    };
+    assert.strictEqual(error.code, "PASSWORD_TTY_REQUIRED");
+    assert.match(error.message, /needs a terminal/);
+    assert.match(error.details, /PASEO_PASSWORD/);
+    await assert.rejects(readFile(join(pipedHome, "config.json"), "utf-8"));
+    console.log("✓ piped stdin reports that a terminal is required\n");
+  }
 } finally {
   await rm(root, { recursive: true, force: true });
 }
diff --git a/packages/cli/tests/33-daemon-stop-tree-kill.test.ts b/packages/cli/tests/33-daemon-stop-tree-kill.test.ts
index 5ee8af7b61..3a290d91b2 100644
--- a/packages/cli/tests/33-daemon-stop-tree-kill.test.ts
+++ b/packages/cli/tests/33-daemon-stop-tree-kill.test.ts
@@ -118,6 +118,8 @@ try {
     join(paseoHome, "paseo.pid"),
     JSON.stringify({
       pid: ownerProcess.pid,
+      hostname: "test",
+      uid: process.getuid?.() ?? -1,
       listen: "127.0.0.1:1",
       startedAt: new Date().toISOString(),
     }),
@@ -153,15 +155,11 @@ try {
       action: parsed.action,
       forced: parsed.forced,
       usedLifecycleRpc: parsed.usedLifecycleRpc,
-      reason: parsed.reason,
-      message: parsed.message,
     },
     {
       action: "stopped",
       forced: true,
       usedLifecycleRpc: false,
-      reason: "owner_pid_sigkill",
-      message: "Daemon owner process was force-stopped",
     },
     `stop should report forced tree cleanup: ${stopResult.stdout}`,
   );
diff --git a/packages/cli/tests/34-daemon-status-auth.test.ts b/packages/cli/tests/34-daemon-status-auth.test.ts
index bb683ed027..2c3bdca851 100644
--- a/packages/cli/tests/34-daemon-status-auth.test.ts
+++ b/packages/cli/tests/34-daemon-status-auth.test.ts
@@ -1,6 +1,9 @@
 #!/usr/bin/env npx tsx
 
 import assert from "node:assert";
+import { mkdtemp, mkdir, writeFile, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { runLocalPaseo } from "./helpers/local-cli.ts";
 import { startTestDaemon } from "./helpers/test-daemon.ts";
 
@@ -12,7 +15,7 @@ const daemon = await startTestDaemon({
 
 try {
   {
-    console.log("Test 1: status reports password requirement without marking daemon unreachable");
+    console.log("Test 1: local status uses the daemon's local credential");
     const result = await runLocalPaseo(["daemon", "status", "--json"], {
       PASEO_HOME: daemon.paseoHome,
       PASEO_HOST: "",
@@ -23,12 +26,11 @@ try {
     const status = JSON.parse(result.stdout);
 
     assert.strictEqual(status.localDaemon, "running");
-    assert.strictEqual(status.connectedDaemon, "auth_required");
+    assert.strictEqual(status.connectedDaemon, "reachable");
     assert(!("runningAgents" in status), "status should not fetch agent counts");
     assert(!("idleAgents" in status), "status should not fetch agent counts");
-    assert.match(status.note, /requires a password/i);
-    assert.doesNotMatch(status.note, /not reachable/i);
-    console.log("✓ missing password reports auth_required\n");
+    assert.doesNotMatch(status.note ?? "", /Password required|not reachable/i);
+    console.log("✓ missing password uses local credential\n");
   }
 
   {
@@ -44,7 +46,7 @@ try {
 
     assert.strictEqual(status.localDaemon, "running");
     assert.strictEqual(status.connectedDaemon, "auth_failed");
-    assert.match(status.note, /password was rejected/i);
+    assert.match(status.note, /Incorrect password/i);
     assert.doesNotMatch(status.note, /not reachable/i);
     console.log("✓ wrong password reports auth_failed\n");
   }
@@ -70,4 +72,78 @@ try {
   await daemon.stop();
 }
 
+// POSIX executable probing executes --version; Windows resolves executables differently.
+if (process.platform !== "win32") {
+  const root = await mkdtemp(join(tmpdir(), "paseo status slow provider "));
+  const home = join(root, "daemon");
+  const workDir = join(root, "work");
+  const provider = join(root, "slow-provider");
+  const marker = join(root, "availability.log");
+  let slowDaemon: Awaited<ReturnType<typeof startTestDaemon>> | undefined;
+  try {
+    await mkdir(home);
+    await mkdir(workDir);
+    await writeFile(
+      provider,
+      `#!${process.execPath}
+import('node:fs').then(({appendFileSync}) => {
+  appendFileSync(${JSON.stringify(marker)}, JSON.stringify(process.argv.slice(2)) + "\\n");
+  setTimeout(() => console.log('provider 1.0.0'), 1800);
+});
+`,
+      { mode: 0o700 },
+    );
+    await writeFile(
+      join(home, "config.json"),
+      JSON.stringify({
+        version: 1,
+        agents: { providers: { claude: { command: { mode: "replace", argv: [provider] } } } },
+      }),
+    );
+    slowDaemon = await startTestDaemon({
+      paseoHome: home,
+      workDir,
+      env: { PASEO_PASSWORD: "shared-secret" },
+    });
+    console.log("Test 4: local status separates authenticated reachability from slow details");
+    const local = await runLocalPaseo(["daemon", "status", "--home", home, "--json"], {
+      PASEO_PASSWORD: "shared-secret",
+    });
+    assert.strictEqual(local.exitCode, 0, local.stderr);
+    const status = JSON.parse(local.stdout);
+    assert.strictEqual(status.localDaemon, "running");
+    assert.strictEqual(status.connectedDaemon, "reachable", JSON.stringify(status));
+    assert.strictEqual(typeof status.serverId, "string");
+    assert.match(status.note, /DAEMON_REQUEST_TIMEOUT/);
+    assert.match(status.note, /Status details unavailable/);
+    assert(!("workerPid" in status), "must not invent worker facts");
+    assert(!("providers" in status), "must not invent provider facts");
+    assert.match(
+      await readFile(marker, "utf8"),
+      /\["--version"\]/,
+      "the public provider executable was actually probed",
+    );
+    console.log("✓ local authenticated connection remains reachable when details time out\n");
+
+    console.log("Test 5: explicit endpoint status remains an error when details time out");
+    const remote = await runLocalPaseo(
+      ["daemon", "status", "--host", `127.0.0.1:${slowDaemon.port}`, "--json"],
+      { PASEO_PASSWORD: "shared-secret" },
+    );
+    assert.notStrictEqual(remote.exitCode, 0);
+    const { error } = JSON.parse(remote.stderr);
+    assert.strictEqual(error.code, "DAEMON_REQUEST_TIMEOUT");
+    assert.match(error.message, /Status details unavailable/);
+    assert.strictEqual(error.details.connectedDaemon, "reachable");
+    assert.strictEqual(error.details.serverId, status.serverId);
+    assert(!("home" in error.details), "endpoint observation must not invent local ownership");
+    assert(!("workerPid" in error.details));
+    assert(!("providers" in error.details));
+    console.log("✓ failed remote query retains its error and authenticated connection fact\n");
+  } finally {
+    await slowDaemon?.stop();
+    await rm(root, { recursive: true, force: true });
+  }
+}
+
 console.log("=== Daemon Status Auth Tests Passed ===");
diff --git a/packages/cli/tests/34-daemon-stop-stale-reachable.test.ts b/packages/cli/tests/34-daemon-stop-stale-reachable.test.ts
index 91d789d1da..aaba355f67 100644
--- a/packages/cli/tests/34-daemon-stop-stale-reachable.test.ts
+++ b/packages/cli/tests/34-daemon-stop-stale-reachable.test.ts
@@ -1,8 +1,8 @@
 #!/usr/bin/env npx tsx
 
 /**
- * Regression: `paseo daemon stop` must stop a reachable daemon even when the
- * local pid file points at a dead supervisor owner.
+ * Regression: `paseo daemon stop` must leave a reachable daemon alone when the
+ * selected home points at a dead supervisor owner.
  */
 
 import assert from "node:assert";
@@ -12,6 +12,7 @@ import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { $ } from "zx";
+import { connectToDaemon } from "../src/utils/client.js";
 import { getAvailablePort } from "./helpers/network.ts";
 
 $.verbose = false;
@@ -146,21 +147,24 @@ try {
 
   await waitFor(
     async () => {
-      const status = await readDaemonStatus(paseoHome);
-      return status.localDaemon === "stale_pid" && status.connectedDaemon === "reachable";
+      try {
+        const client = await connectToDaemon({ target: { kind: "endpoint", host }, timeout: 500 });
+        await client.close();
+        return true;
+      } catch {
+        return false;
+      }
     },
     120000,
-    "daemon did not enter stale_pid + reachable state in time",
+    "unowned worker did not become reachable in time",
   );
 
   const statusBeforeStop = await readDaemonStatus(paseoHome);
-  assert.strictEqual(statusBeforeStop.pid, stalePid, "status should report the stale owner pid");
+  assert.strictEqual(statusBeforeStop.pid, null, "status should not claim a dead owner is running");
   assert(workerProcess.pid && isProcessRunning(workerProcess.pid), "worker should be running");
   console.log(`✓ fixture has stale pid ${stalePid} and live worker ${workerProcess.pid}\n`);
 
-  console.log(
-    "Test 2: `paseo daemon stop` should stop reachable worker instead of saying not_running",
-  );
+  console.log("Test 2: home-selected stop leaves the unowned reachable worker running");
   const stopResult =
     await $`PASEO_HOME=${paseoHome} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${testEnv.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${testEnv.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${testEnv.PASEO_VOICE_MODE_ENABLED} npx paseo daemon stop --home ${paseoHome} --json`.nothrow();
   assert.strictEqual(stopResult.exitCode, 0, `stop should succeed: ${stopResult.stderr}`);
@@ -169,22 +173,11 @@ try {
     pid?: unknown;
     message?: unknown;
   };
-  assert.strictEqual(stopJson.action, "stopped", "stop should report stopped action");
-  assert.strictEqual(
-    stopJson.pid,
-    String(stalePid),
-    "stop should report the stale pid it recovered from",
-  );
-  assert.strictEqual(
-    stopJson.message,
-    "Daemon stopped gracefully",
-    "stop should route through lifecycle shutdown",
-  );
-
-  await waitFor(
-    () => !isProcessRunning(workerProcess?.pid ?? -1),
-    15000,
-    "worker remained running after stop",
+  assert.strictEqual(stopJson.action, "not_running");
+  assert.strictEqual(stopJson.pid, stalePid);
+  assert(
+    workerProcess.pid && isProcessRunning(workerProcess.pid),
+    "stop must not contact the stale endpoint",
   );
   assert.strictEqual(existsSync(pidPath), false, "stale pid file should be removed after stop");
   console.log("✓ stop recovered stale supervisor pid state\n");
diff --git a/packages/cli/tests/36-daemon-status-windows-process-lookup.test.ts b/packages/cli/tests/36-daemon-status-windows-process-lookup.test.ts
index 313ec5c4c6..f7872b310b 100644
--- a/packages/cli/tests/36-daemon-status-windows-process-lookup.test.ts
+++ b/packages/cli/tests/36-daemon-status-windows-process-lookup.test.ts
@@ -1,43 +1,12 @@
 #!/usr/bin/env npx tsx
 
 import assert from "node:assert";
-import { spawn } from "node:child_process";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { getAvailablePort } from "./helpers/network.ts";
 
-const CLI_ENTRY = join(import.meta.dirname, "..", "dist", "index.js");
-
-interface CommandResult {
-  exitCode: number | null;
-  stdout: string;
-  stderr: string;
-}
-
-function runLocalPaseo(args: string[], env: NodeJS.ProcessEnv): Promise<CommandResult> {
-  return new Promise((resolve, reject) => {
-    const child = spawn(process.execPath, [CLI_ENTRY, ...args], {
-      env: { ...process.env, ...env },
-      stdio: ["ignore", "pipe", "pipe"],
-      windowsHide: true,
-    });
-
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (chunk: Buffer) => {
-      stdout += chunk.toString();
-    });
-    child.stderr.on("data", (chunk: Buffer) => {
-      stderr += chunk.toString();
-    });
-    child.on("error", reject);
-    child.on("close", (exitCode) => {
-      resolve({ exitCode, stdout, stderr });
-    });
-  });
-}
-
 if (process.platform !== "win32") {
   console.log("Skipping Windows daemon status process lookup regression on non-Windows.");
   process.exit(0);
@@ -55,7 +24,16 @@ const env = {
 };
 
 try {
-  const start = await runLocalPaseo(["daemon", "restart", "--port", String(port)], env);
+  for (const [field, value] of [
+    ["daemon.listen", `127.0.0.1:${port}`],
+    ["daemon.relay.enabled", "false"],
+    ["features.dictation.enabled", "false"],
+    ["features.voiceMode.enabled", "false"],
+  ]) {
+    const saved = await runLocalPaseo(["daemon", "config", "set", field!, value!], env);
+    assert.equal(saved.exitCode, 0, saved.stderr);
+  }
+  const start = await runLocalPaseo(["daemon", "start"], env);
   assert.strictEqual(
     start.exitCode,
     0,
diff --git a/packages/cli/tests/38-workspace-rename.test.ts b/packages/cli/tests/38-workspace-rename.test.ts
index 50d3b4ce82..9fed12aa4c 100644
--- a/packages/cli/tests/38-workspace-rename.test.ts
+++ b/packages/cli/tests/38-workspace-rename.test.ts
@@ -2,6 +2,7 @@
 
 import assert from "node:assert";
 import { basename } from "node:path";
+import { createPaseoClient } from "@getpaseo/client";
 import { createE2ETestContext } from "./helpers/test-daemon.ts";
 
 console.log("=== Workspace Rename Command ===\n");
@@ -51,8 +52,61 @@ try {
     )?.name,
     basename(ctx.workDir),
   );
+
+  await verifyWorkspaceCallerContext();
 } finally {
   await ctx.stop();
 }
 
 console.log("=== Workspace Rename Command Tests Passed ===");
+
+async function verifyWorkspaceCallerContext() {
+  const sdk = createPaseoClient({ url: `${ctx.wsUrl}/ws`, reconnect: { enabled: false } });
+  try {
+    await sdk.connect();
+    const parentWorkspace = await sdk.workspaces.create({
+      source: { kind: "directory", path: ctx.workDir },
+      background: true,
+    });
+    // Creation without a prompt stays idle; this visibility test runs no provider turn.
+    const parent = await parentWorkspace.agents.create({ config: { provider: "claude/haiku" } });
+    const cases = [
+      { caller: parent.id, background: undefined, expected: true },
+      { caller: parent.id, background: false, expected: false },
+      { caller: parent.id, background: true, expected: true },
+      { caller: "foreign-or-missing-agent", background: undefined, expected: false },
+      { caller: "foreign-or-missing-agent", background: true, expected: true },
+      { caller: "foreign-or-missing-agent", background: false, expected: false },
+      { caller: "", background: undefined, expected: false },
+      { caller: "", background: true, expected: true },
+    ];
+    for (const entry of cases) {
+      const result = await ctx.paseo(
+        [
+          "workspace",
+          "create",
+          "--host",
+          `127.0.0.1:${ctx.port}`,
+          "--isolation",
+          "local",
+          "--path",
+          ctx.workDir,
+          ...(entry.background === undefined
+            ? []
+            : [entry.background ? "--background" : "--no-background"]),
+          "--json",
+        ],
+        { env: { PASEO_AGENT_ID: entry.caller } },
+      );
+      assert.strictEqual(result.exitCode, 0, result.stderr);
+      assert.strictEqual(
+        JSON.parse(result.stdout).background,
+        entry.expected,
+        JSON.stringify(entry),
+      );
+    }
+    console.log("✓ workspace create caller inheritance, foreign/blank defaults, and overrides");
+  } finally {
+    await sdk.close();
+  }
+}
diff --git a/packages/cli/tests/39-terminal-workspace.test.ts b/packages/cli/tests/39-terminal-workspace.test.ts
new file mode 100644
index 0000000000..b1221962f3
--- /dev/null
+++ b/packages/cli/tests/39-terminal-workspace.test.ts
@@ -0,0 +1,80 @@
+import assert from "node:assert/strict";
+import { createPaseoClient } from "@getpaseo/client";
+import { createE2ETestContext } from "./helpers/test-daemon.ts";
+import { waitForTerminalOutput } from "./helpers/terminal.ts";
+
+const ctx = await createE2ETestContext({ timeout: 30_000 });
+const sdk = createPaseoClient({ url: `${ctx.wsUrl}/ws`, reconnect: { enabled: false } });
+
+async function cli(args: string[]) {
+  const result = await ctx.paseo([...args, "--json"]);
+  assert.equal(result.exitCode, 0, result.stderr);
+  return JSON.parse(result.stdout);
+}
+
+try {
+  await sdk.connect();
+  const first = await sdk.workspaces.create({
+    source: { kind: "directory", path: ctx.workDir },
+    title: "main",
+  });
+  const second = await sdk.workspaces.create({
+    source: { kind: "directory", path: ctx.workDir },
+    title: "feature-work",
+  });
+  const main = await cli(["terminal", "create", "--cwd", ctx.workDir, "--name", "Main"]);
+  assert.equal(main.workspaceId, first.id);
+  const feature = await cli(["terminal", "create", "--workspace", second.id, "--name", "Feature"]);
+  assert.deepEqual(feature, {
+    id: feature.id,
+    name: "Feature",
+    cwd: ctx.workDir,
+    workspaceId: second.id,
+  });
+  assert.deepEqual(await cli(["terminal", "ls", "--workspace", second.id]), [feature]);
+  assert.deepEqual(await cli(["terminal", "ls", "--cwd", ctx.workDir]), [main, feature]);
+  assert.deepEqual(await cli(["terminal", "ls", "--all"]), [main, feature]);
+  const invalid = await ctx.paseo([
+    "terminal",
+    "create",
+    "--workspace",
+    "wks_missing",
+    "--cwd",
+    ctx.workDir,
+    "--json",
+  ]);
+  assert.notEqual(invalid.exitCode, 0);
+  assert.match(invalid.stderr, /not active or does not exist/);
+  const conflict = await ctx.paseo(["terminal", "ls", "--all", "--workspace", second.id]);
+  assert.notEqual(conflict.exitCode, 0);
+
+  const terminal = await second.terminals.create({
+    command: process.execPath,
+    args: [
+      "-e",
+      "process.stdin.setRawMode(true); process.stdin.resume(); console.log('READY'); let hex = ''; process.stdin.on('data', data => { hex += data.toString('hex'); console.log('HEX:' + hex); });",
+    ],
+  });
+  await waitForTerminalOutput(ctx.paseo, terminal.id, "READY");
+  assert.deepEqual(await cli(["terminal", "send-keys", terminal.id, "-l", "Enter"]), {
+    terminalId: terminal.id,
+    keysSent: 5,
+  });
+  await waitForTerminalOutput(ctx.paseo, terminal.id, "HEX:456e746572");
+  assert.deepEqual(await cli(["terminal", "send-keys", terminal.id, "Enter"]), {
+    terminalId: terminal.id,
+    keysSent: 1,
+  });
+  await waitForTerminalOutput(ctx.paseo, terminal.id, "HEX:456e7465720d");
+  assert.deepEqual(await cli(["terminal", "kill", terminal.id]), {
+    terminalId: terminal.id,
+    success: true,
+  });
+  await cli(["terminal", "kill", feature.id]);
+  assert.deepEqual(await cli(["terminal", "ls", "--workspace", second.id]), []);
+  assert.deepEqual(await cli(["terminal", "ls", "--workspace", first.id]), [main]);
+  console.log("Terminal workspace CLI: ownership, lists, input, capture, kill, and errors passed");
+} finally {
+  await sdk.close();
+  await ctx.stop();
+}
diff --git a/packages/cli/tests/40-daemon-stale-boot-lock.test.ts b/packages/cli/tests/40-daemon-stale-boot-lock.test.ts
new file mode 100644
index 0000000000..ae8b2b990c
--- /dev/null
+++ b/packages/cli/tests/40-daemon-stale-boot-lock.test.ts
@@ -0,0 +1,96 @@
+#!/usr/bin/env npx tsx
+
+/**
+ * Regression: a reboot reassigns the supervisor's PID to an unrelated process. The lock
+ * left behind must not make the daemon look like it is running, and must never be treated
+ * as a handle on whatever now holds that PID.
+ */
+
+import assert from "node:assert";
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir, uptime } from "node:os";
+import { join } from "node:path";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
+
+console.log("=== Daemon lock left behind by a reboot ===\n");
+
+const paseoHome = await mkdtemp(join(tmpdir(), "paseo-stale-boot-lock-"));
+const env = {
+  PASEO_HOME: paseoHome,
+  PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0",
+  PASEO_DICTATION_ENABLED: "0",
+  PASEO_VOICE_MODE_ENABLED: "0",
+};
+
+// Stands in for the process that inherits the supervisor's PID after a reboot. It records a
+// signal rather than dying of it, so a late delivery cannot slip past the assertion.
+const signalMarker = join(paseoHome, "bystander-signalled");
+const bystander = spawn(
+  process.execPath,
+  [
+    "-e",
+    `process.on("SIGTERM", () => require("node:fs").writeFileSync(${JSON.stringify(signalMarker)}, "SIGTERM"));` +
+      `setTimeout(() => {}, 120_000);`,
+  ],
+  { stdio: "ignore" },
+);
+let bystanderExited = false;
+bystander.once("exit", () => {
+  bystanderExited = true;
+});
+assert(bystander.pid, "bystander process should have a pid");
+
+try {
+  const beforeThisBoot = new Date(Date.now() - uptime() * 1000 - 60 * 60_000);
+  await writeFile(
+    join(paseoHome, "paseo.pid"),
+    JSON.stringify({
+      pid: bystander.pid,
+      startedAt: beforeThisBoot.toISOString(),
+      hostname: "before-reboot",
+      uid: process.getuid?.() ?? 0,
+      listen: "127.0.0.1:6767",
+      desktopManaged: true,
+      heartbeat: true,
+    }),
+  );
+
+  const statusResult = await runLocalPaseo(
+    ["daemon", "status", "--home", paseoHome, "--json"],
+    env,
+  );
+  assert.strictEqual(
+    statusResult.exitCode,
+    0,
+    `daemon status should succeed:\nstdout:\n${statusResult.stdout}\nstderr:\n${statusResult.stderr}`,
+  );
+  const status = JSON.parse(statusResult.stdout) as { localDaemon?: string; pid?: number | null };
+  assert.strictEqual(
+    status.localDaemon,
+    "stopped",
+    `daemon left behind by a reboot should read as stopped, got: ${statusResult.stdout}`,
+  );
+  assert.strictEqual(status.pid, null, "status should not report the reused pid as the daemon");
+  console.log("✓ daemon status reports stopped\n");
+
+  const stopResult = await runLocalPaseo(["daemon", "stop", "--home", paseoHome], env);
+  assert.strictEqual(
+    stopResult.exitCode,
+    0,
+    `daemon stop should succeed:\nstdout:\n${stopResult.stdout}\nstderr:\n${stopResult.stderr}`,
+  );
+  assert.strictEqual(
+    existsSync(signalMarker),
+    false,
+    "daemon stop must not signal the process that inherited the pid",
+  );
+  assert.strictEqual(bystanderExited, false, "the process that inherited the pid should survive");
+  console.log("✓ daemon stop leaves the process holding that pid alone\n");
+} finally {
+  bystander.kill("SIGKILL");
+  await rm(paseoHome, { recursive: true, force: true });
+}
+
+console.log("=== Daemon lock left behind by a reboot passed ===");
diff --git a/packages/cli/tests/41-daemon-auth-command-errors.test.ts b/packages/cli/tests/41-daemon-auth-command-errors.test.ts
new file mode 100644
index 0000000000..37fb7e511f
--- /dev/null
+++ b/packages/cli/tests/41-daemon-auth-command-errors.test.ts
@@ -0,0 +1,51 @@
+#!/usr/bin/env npx tsx
+
+import assert from "node:assert";
+import { runLocalPaseo } from "./helpers/local-cli.ts";
+import { startTestDaemon } from "./helpers/test-daemon.ts";
+
+console.log("=== Daemon Auth Command Errors ===\n");
+
+const daemon = await startTestDaemon({
+  env: { PASEO_PASSWORD: "shared-secret" },
+});
+
+async function lsError(password: string, remoteClient = false) {
+  const result = await runLocalPaseo(["ls", "--json"], {
+    PASEO_HOME: remoteClient ? "" : daemon.paseoHome,
+    PASEO_HOST: remoteClient ? `127.0.0.1:${daemon.port}` : "",
+    PASEO_PASSWORD: password,
+  });
+  assert.notStrictEqual(result.exitCode, 0, "ls should fail without a valid password");
+  return JSON.parse(result.stderr).error as {
+    code: string;
+    message: string;
+    details: string;
+  };
+}
+
+try {
+  {
+    console.log("Test 1: a client outside the daemon home needs PASEO_PASSWORD");
+    const error = await lsError("", true);
+    assert.strictEqual(error.code, "AUTH_REQUIRED");
+    assert.match(error.message, /Password required/);
+    assert.match(error.details, /PASEO_PASSWORD/);
+    assert.doesNotMatch(error.details, /daemon start/);
+    console.log("✓ client without the local credential is asked for PASEO_PASSWORD\n");
+  }
+
+  {
+    console.log("Test 2: wrong password asks for PASEO_PASSWORD, not a daemon start");
+    const error = await lsError("wrong-secret");
+    assert.strictEqual(error.code, "AUTH_FAILED");
+    assert.match(error.message, /Incorrect password/);
+    assert.match(error.details, /PASEO_PASSWORD/);
+    assert.doesNotMatch(error.details, /daemon start/);
+    console.log("✓ wrong password points at PASEO_PASSWORD\n");
+  }
+} finally {
+  await daemon.stop();
+}
+
+console.log("=== Daemon Auth Command Errors Tests Passed ===");
diff --git a/packages/cli/tests/42-agent-open.test.ts b/packages/cli/tests/42-agent-open.test.ts
new file mode 100644
index 0000000000..d468dfe16d
--- /dev/null
+++ b/packages/cli/tests/42-agent-open.test.ts
@@ -0,0 +1,52 @@
+#!/usr/bin/env npx tsx
+
+import assert from "node:assert";
+import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
+
+console.log("=== Agent Open Command Tests ===\n");
+
+if (process.platform !== "linux") {
+  console.log("Skipped: the fake Desktop app is a Linux AppImage path.");
+  process.exit(0);
+}
+
+const daemon = await startTestDaemon();
+
+// runPaseoCli sets HOME to the daemon's home, where the CLI looks for
+// ~/Applications/Paseo.AppImage on Linux. The fake app records its launch.
+const launchRecord = join(daemon.paseoHome, "desktop-launches.txt");
+const fakeDesktop = join(daemon.paseoHome, "Applications", "Paseo.AppImage");
+await mkdir(join(daemon.paseoHome, "Applications"), { recursive: true });
+await writeFile(fakeDesktop, `#!/bin/sh\necho "$@" >> "${launchRecord}"\n`);
+await chmod(fakeDesktop, 0o755);
+
+try {
+  {
+    console.log("Test 1: an unknown agent ID fails without opening Desktop");
+    const result = await runPaseoCli(daemon, [
+      "agent",
+      "open",
+      "does-not-exist",
+      "--host",
+      `127.0.0.1:${daemon.port}`,
+      "--json",
+    ]);
+
+    assert.notStrictEqual(result.exitCode, 0, "open should fail for an unknown agent");
+    assert.match(JSON.parse(result.stderr).error.message, /Agent not found: does-not-exist/);
+    // Give a wrongly spawned detached app time to write its record.
+    await new Promise((resolve) => setTimeout(resolve, 500));
+    assert.ok(
+      !existsSync(launchRecord),
+      `Desktop should not open, but was launched with: ${existsSync(launchRecord) ? await readFile(launchRecord, "utf8") : ""}`,
+    );
+    console.log("✓ unknown agent ID fails without opening Desktop\n");
+  }
+} finally {
+  await daemon.stop();
+}
+
+console.log("=== All agent open tests passed ===");
diff --git a/packages/cli/tests/43-agent-follow-closed-stdout.test.ts b/packages/cli/tests/43-agent-follow-closed-stdout.test.ts
new file mode 100644
index 0000000000..0191867438
--- /dev/null
+++ b/packages/cli/tests/43-agent-follow-closed-stdout.test.ts
@@ -0,0 +1,49 @@
+#!/usr/bin/env npx tsx
+
+/**
+ * Follow commands stop when nobody reads their output
+ *
+ * `paseo agent logs --follow` and `paseo agent attach` stream until they are
+ * stopped. A program that closes its end of their stdout, as `| head` or a
+ * launcher that discards output does, stops them the same way Ctrl+C does.
+ */
+
+import assert from "node:assert";
+import { connectToDaemon } from "../src/utils/client.ts";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
+
+console.log("=== Follow Commands With Closed Stdout Tests ===\n");
+
+const daemon = await startTestDaemon();
+const host = `127.0.0.1:${daemon.port}`;
+
+try {
+  // An agent created without a prompt stays idle, so no provider is called.
+  const client = await connectToDaemon({ target: { kind: "endpoint", host } });
+  const agent = await client.createAgent({
+    provider: "claude",
+    cwd: daemon.workDir,
+    title: "closed stdout",
+  });
+  await client.close();
+
+  for (const args of [
+    ["agent", "logs", agent.id, "--follow"],
+    ["agent", "attach", agent.id],
+  ]) {
+    const label = `paseo ${args.slice(0, 2).join(" ")}`;
+    console.log(`Test: ${label} exits when its stdout reader is gone`);
+    const result = await runPaseoCli(daemon, [...args, "--host", host], {
+      closedStdout: true,
+      timeout: 20_000,
+    });
+
+    assert.strictEqual(result.stderr, "", `${label} should exit quietly`);
+    assert.strictEqual(result.exitCode, 0, `${label} should exit with code 0`);
+    console.log(`✓ ${label} exits when its stdout reader is gone\n`);
+  }
+} finally {
+  await daemon.stop();
+}
+
+console.log("=== All follow commands with closed stdout tests passed ===");
diff --git a/packages/cli/tests/44-usage.test.ts b/packages/cli/tests/44-usage.test.ts
new file mode 100644
index 0000000000..2db20e2824
--- /dev/null
+++ b/packages/cli/tests/44-usage.test.ts
@@ -0,0 +1,152 @@
+#!/usr/bin/env npx tsx
+import assert from "node:assert/strict";
+import { mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { createE2ETestContext } from "./helpers/test-daemon.ts";
+import { connectToDaemon } from "../src/utils/client.ts";
+import { resolveCliVersion } from "../src/version.ts";
+
+const context = await createE2ETestContext();
+try {
+  const directory = join(context.workDir, "usage-plugin");
+  await mkdir(directory);
+  await writeFile(
+    join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "cli-usage",
+      requirements: { paseo: `>=${resolveCliVersion()}` },
+    }),
+  );
+  await writeFile(
+    join(directory, "index.server.ts"),
+    `
+import { z } from 'zod';
+export default function contribute(server) {
+  const counts = new Map();
+  server.registerUsageSource({
+    id: 'cli-usage', label: 'CLI usage fixture', input: z.object({ key: z.string() }),
+    discover: async () => [
+      { key: 'work.account', label: 'Work', input: { key: 'work' } },
+      { key: 'personal', input: { key: 'personal' } },
+      { key: 'broken', harness: 'Harness A', input: { key: 'rejected' } },
+      { key: 'broken', harness: 'Harness B', input: { key: 'expired' } },
+      { key: 'error', input: { key: 'error' } },
+    ],
+    fetch: async ({key}) => {
+      counts.set(key, (counts.get(key) ?? 0) + 1);
+      if (key === 'rejected') return {status: 'unavailable', problem: {kind: 'rejected', status: 401, refreshedBy: 'codex login'}};
+      if (key === 'expired') return {status: 'unavailable', problem: {kind: 'expired', expiresAt: '2026-10-08T00:00:00Z', refreshedBy: 'claude'}};
+      if (key === 'error') throw new Error('Quota service failed');
+      return { status: 'available', planLabel: 'Pro', windows: [
+        { id: 'session', label: 'Session', usedPct: counts.get(key), remainingPct: 99, resetsAt: '2026-10-09T17:00:00Z', runsOutAt: '2026-10-09T16:00:00Z', shortfallPct: 4.25 },
+        { id: 'weekly', label: 'Weekly', usedPct: null, remainingPct: 0 },
+      ], balances: [
+        { id: 'credits', label: 'Credits', remaining: 2.5, unit: 'credits' },
+        { id: 'tokens', label: 'Tokens', used: 0, limit: 100, unit: 'tokens' },
+      ], details: [{ id: 'tier', label: 'Tier', value: 'Enterprise' }] };
+    },
+  });
+  return () => {};
+}`,
+  );
+  const client = await connectToDaemon({ target: { kind: "instance", home: context.paseoHome } });
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory, "cli-usage");
+  } finally {
+    await client.close();
+  }
+  async function ok(args: string[]) {
+    const result = await context.paseo(args);
+    assert.equal(result.exitCode, 0, result.stderr);
+    assert.equal(result.stderr, "");
+    return result.stdout;
+  }
+  // The first usage request is inspect: no earlier usage discovery has populated known IDs.
+  const cold = JSON.parse(await ok(["usage", "inspect", "cli-usage:work.account", "--json"]));
+  assert.equal(cold.id, "cli-usage:work.account");
+  assert.equal(cold.report.windows[0].usedPct, 1);
+  for (const args of [
+    ["usage", "--agent", "agent-A", "inspect", cold.id, "--json"],
+    ["usage", "inspect", cold.id, "--agent", "agent-A", "--json"],
+  ]) {
+    const conflicting = await context.paseo(args);
+    assert.equal(conflicting.exitCode, 1, `Expected selector rejection: ${args.join(" ")}`);
+    assert.equal(conflicting.stdout, "");
+    assert.deepEqual(JSON.parse(conflicting.stderr).error, {
+      code: "INVALID_OPTIONS",
+      message:
+        "--agent cannot be combined with usage inspect. Use usage ls --agent <id> for agent account usage, or usage inspect <report-id> for an exact report.",
+    });
+  }
+
+  const list = JSON.parse(await ok(["usage", "ls", "--json"]));
+  const defaultList = JSON.parse(await ok(["usage", "--json"]));
+  assert.deepEqual(defaultList, list);
+  assert.deepEqual(list.map((entry: { id: string }) => entry.id).sort(), [
+    "cli-usage:broken",
+    "cli-usage:error",
+    "cli-usage:personal",
+    "cli-usage:work.account",
+  ]);
+  const work = list.find((entry: { id: string }) => entry.id === cold.id);
+  assert.deepEqual(work, cold);
+  const table = await ok(["usage", "ls", "--no-color"]);
+  for (const text of [
+    "REPORT ID",
+    "Credits: - used, 2.5 remaining, - limit (credits)",
+    "Tokens: 0 used, - remaining, 100 limit (tokens)",
+    "Weekly: - used, 0% remaining",
+    "Harness A: Login rejected (HTTP 401). Run codex login",
+    "Harness B: Login expired at",
+    "Quota service failed",
+  ])
+    assert.ok(table.includes(text), text);
+  const quiet = await ok(["usage", "ls", "--quiet"]);
+  assert.deepEqual(
+    quiet.trim().split("\n").sort(),
+    list.map((entry: { id: string }) => entry.id).sort(),
+  );
+  assert.ok(!(await ok(["usage", "ls", "--no-headers"])).includes("REPORT ID"));
+  const detail = await ok(["usage", "inspect", cold.id]);
+  for (const text of [
+    "Plan: Pro",
+    "Resets: 2026-10-09T17:00:00Z",
+    "Runs out: 2026-10-09T16:00:00Z",
+    "Shortfall: 4.25%",
+    "Tier: Enterprise",
+  ])
+    assert.ok(detail.includes(text), text);
+  const refreshed = JSON.parse(await ok(["usage", "inspect", cold.id, "--refresh", "--json"]));
+  assert.equal(refreshed.report.windows[0].usedPct, 2);
+  const personal = JSON.parse(await ok(["usage", "inspect", "cli-usage:personal", "--json"]));
+  assert.equal(personal.report.windows[0].usedPct, 1);
+  const allRefreshed = JSON.parse(await ok(["usage", "ls", "--refresh", "--json"]));
+  assert.equal(
+    allRefreshed.find((entry: { id: string }) => entry.id === cold.id).report.windows[0].usedPct,
+    3,
+  );
+  for (const id of ["cli-usage:work", "missing"]) {
+    const unknown = await context.paseo(["usage", "inspect", id, "--json"]);
+    assert.equal(unknown.exitCode, 1);
+    assert.equal(unknown.stdout, "");
+    assert.equal(JSON.parse(unknown.stderr).error.code, "REPORT_NOT_FOUND");
+  }
+  const agentFailure = await context.paseo(["usage", "ls", "--agent", "missing-agent", "--json"]);
+  assert.equal(agentFailure.exitCode, 1);
+  assert.equal(agentFailure.stdout, "");
+  assert.match(JSON.parse(agentFailure.stderr).error.message, /Unknown agent/);
+  const remove = await context.paseo(["plugin", "remove", "cli-usage", "--json"]);
+  assert.equal(remove.exitCode, 0, remove.stderr);
+  assert.equal((await ok(["usage", "ls", "--json"])).trim(), "[]");
+  assert.equal((await ok(["usage"])).trim(), "No usage reports returned");
+  const connection = await context.paseo(["usage", "ls", "--host", "127.0.0.1:1", "--json"]);
+  assert.equal(connection.exitCode, 1);
+  assert.equal(connection.stdout, "");
+  assert.equal(JSON.parse(connection.stderr).error.code, "DAEMON_UNREACHABLE");
+  console.log(
+    "Usage CLI: cold inspect, default/ls, complete JSON, mixed statuses, all windows/balances, inspect details, refresh, IDs, errors and empty discovery passed.",
+  );
+} finally {
+  await context.stop();
+}
diff --git a/packages/cli/tests/e2e/plugin-lifecycle.test.ts b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
index afc28c551c..3e71b6b608 100644
--- a/packages/cli/tests/e2e/plugin-lifecycle.test.ts
+++ b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
@@ -1,12 +1,20 @@
 #!/usr/bin/env npx tsx
+import { resolveCliVersion } from "../../src/version.js";
+import { readPluginManifest } from "../../../server/src/server/plugins/manifest.js";
 
+import {
+  startNpmRegistry,
+  npmPluginPackages,
+} from "../../../../scripts/test-support/npm-registry.mjs";
 import assert from "node:assert/strict";
 import { execFile } from "node:child_process";
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
+import { once } from "node:events";
+import { WebSocket, WebSocketServer } from "ws";
 import { connectToDaemon } from "../../src/utils/client.ts";
 import { createE2ETestContext } from "../helpers/test-daemon.ts";
 
@@ -24,25 +32,130 @@ async function git(cwd: string, args: string[]): Promise<void> {
 async function main(): Promise<void> {
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-cli-e2e-"));
   const gitDirectory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-git-cli-e2e-"));
-  const context = await createE2ETestContext({ timeout: 45_000 });
+  const registry = await startNpmRegistry(npmPluginPackages());
+  const context = await createE2ETestContext({ timeout: 45_000, env: registry.env });
   try {
-    await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: "cli-e2e" }));
+    const scaffold = path.join(context.workDir, "authored-plugin");
+    const init = await context.paseo(["plugin", "init", scaffold, "--json"]);
+    assert.equal(init.exitCode, 0, init.stderr);
+    const manifestPath = path.join(scaffold, "paseo-plugin.json");
+    const manifest = await readPluginManifest(scaffold);
+    assert.deepEqual(manifest.requirements, { paseo: `>=${resolveCliVersion()}` });
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "cli-e2e", requirements: { paseo: `>=${resolveCliVersion()}` } }),
+    );
     await writeFile(path.join(directory, "index.server.ts"), pluginSource);
 
+    // Observe real CLI requests while forwarding them to the isolated daemon.
+    const proxy = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+    const sources: string[] = [];
+    proxy.on("connection", (socket, request) => {
+      const upstream = new WebSocket(`ws://127.0.0.1:${context.port}${request.url}`, {
+        headers: { authorization: request.headers.authorization ?? "" },
+      });
+      const ready = once(upstream, "open");
+      socket.on("message", async (data, isBinary) => {
+        const message = JSON.parse(data.toString());
+        if (
+          message.type === "session" &&
+          message.message.type === "plugin.source.install.request"
+        ) {
+          sources.push(message.message.source);
+        }
+        await ready;
+        upstream.send(data, { binary: isBinary });
+      });
+      upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
+      socket.on("close", () => upstream.close());
+      upstream.on("close", () => socket.close());
+    });
+    await once(proxy, "listening");
+    const address = proxy.address();
+    assert.ok(address && typeof address !== "string");
+    const sibling = path.join(context.workDir, "x");
+    const caller = path.join(context.workDir, "caller");
+    await mkdir(caller);
+    await mkdir(path.join(sibling, "sub"), { recursive: true });
+    for (const target of [caller, path.join(sibling, "sub"), context.paseoHome]) {
+      await writeFile(
+        path.join(target, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "relative-cli",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(path.join(target, "index.server.ts"), pluginSource);
+    }
+    assert.notEqual(caller, process.cwd()); // The daemon inherits the test runner's cwd.
+    try {
+      for (const [source, expectedSource, expectedDirectory, extraArgs] of [
+        [".", caller, caller, []],
+        ["../x:sub", `${sibling}:sub`, path.join(sibling, "sub"), []],
+        ["../x", `${sibling}:sub`, path.join(sibling, "sub"), ["--path", "sub"]],
+        ["~", context.paseoHome, context.paseoHome, []],
+        ["~/.:.", `${context.paseoHome}:.`, context.paseoHome, []],
+      ] as const) {
+        sources.length = 0;
+        const result = await context.paseo(
+          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${address.port}`, "--json"],
+          { cwd: caller },
+        );
+        assert.deepEqual(sources, [expectedSource]);
+        assert.equal(result.exitCode, 0, result.stderr);
+        assert.equal(JSON.parse(result.stdout).path, expectedDirectory);
+        const removed = await context.paseo(["plugin", "remove", "relative-cli", "--json"]);
+        assert.equal(removed.exitCode, 0, removed.stderr);
+      }
+      // An absolute path belongs to the daemon's platform, which can differ from the CLI's.
+      const windowsSource = `C:\\${path.basename(context.workDir)}\\missing:sub`;
+      sources.length = 0;
+      const missing = await context.paseo(
+        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${address.port}`, "--json"],
+        { cwd: caller },
+      );
+      assert.deepEqual(sources, [windowsSource]);
+      assert.equal(missing.exitCode, 1);
+      assert.match(missing.stderr, /Plugin directory does not exist/);
+    } finally {
+      for (const socket of proxy.clients) socket.close();
+      await promisify(proxy.close.bind(proxy))();
+    }
+
     const install = await context.paseo(["plugin", "install", directory, "--json"]);
     assert.equal(install.exitCode, 0, install.stderr);
     assert.equal(JSON.parse(install.stdout).id, "cli-e2e");
 
-    const client = await connectToDaemon({ host: `127.0.0.1:${context.port}` });
+    const client = await connectToDaemon({
+      target: { kind: "endpoint", host: `127.0.0.1:${context.port}` },
+    });
     await client.patchDaemonConfig({ pluginsEnabled: true });
     await client.close();
 
+    await writeFile(
+      manifestPath,
+      JSON.stringify({ ...manifest, requirements: { paseo: ">=999.0.0" } }),
+    );
+    const incompatibleInstall = await context.paseo(["plugin", "install", scaffold, "--json"]);
+    assert.equal(incompatibleInstall.exitCode, 1);
+    assert.match(incompatibleInstall.stderr, /requires Paseo >=999.0.0/);
+    const afterRejection = await context.paseo(["plugin", "ls", "--json"]);
+    assert.equal(afterRejection.exitCode, 0, afterRejection.stderr);
+    assert.deepEqual(
+      JSON.parse(afterRejection.stdout).map((plugin: { id: string }) => plugin.id),
+      ["cli-e2e"],
+    );
+    await writeFile(manifestPath, JSON.stringify(manifest));
+    const scaffoldInstall = await context.paseo(["plugin", "install", scaffold, "--json"]);
+    assert.equal(scaffoldInstall.exitCode, 0, scaffoldInstall.stderr);
+    assert.equal(JSON.parse(scaffoldInstall.stdout).status, "running");
+
     await git(gitDirectory, ["init", "-b", "main"]);
     await git(gitDirectory, ["config", "user.name", "Paseo Tests"]);
     await git(gitDirectory, ["config", "user.email", "paseo@example.test"]);
     await writeFile(
       path.join(gitDirectory, "paseo-plugin.json"),
-      JSON.stringify({ id: "git-cli-e2e" }),
+      JSON.stringify({ id: "git-cli-e2e", requirements: { paseo: `>=${resolveCliVersion()}` } }),
     );
     await writeFile(path.join(gitDirectory, "index.server.ts"), pluginSource);
     await git(gitDirectory, ["add", "-A"]);
@@ -51,7 +164,7 @@ async function main(): Promise<void> {
     const gitInstall = await context.paseo([
       "plugin",
       "add",
-      pathToFileURL(gitDirectory).href,
+      `git:${pathToFileURL(gitDirectory).href}`,
       "--json",
     ]);
     assert.equal(gitInstall.exitCode, 0, gitInstall.stderr);
@@ -65,11 +178,57 @@ async function main(): Promise<void> {
     await git(gitDirectory, ["commit", "-m", "update"]);
     const status = await context.paseo(["plugin", "status", "git-cli-e2e", "--json"]);
     assert.equal(status.exitCode, 0, status.stderr);
-    assert.equal(JSON.parse(status.stdout)[0].updateAvailable, true);
+    assert.equal(JSON.parse(status.stdout)[0].status, "running");
+    assert.equal(JSON.parse(status.stdout)[0].commit, JSON.parse(gitInstall.stdout).commit);
 
-    const update = await context.paseo(["plugin", "update", "git-cli-e2e", "--json"]);
+    const update = await context.paseo(["plugin", "update", "git-cli-e2e", "--yes", "--json"]);
     assert.equal(update.exitCode, 0, update.stderr);
-    assert.equal(JSON.parse(update.stdout)[0].updated, true);
+    assert.equal(JSON.parse(update.stdout)[0].outcome, "updated");
+
+    const installedCommit = JSON.parse(update.stdout)[0].plugin.installation.currentRevision;
+    const buildMarker = path.join(context.workDir, "incompatible-build-ran");
+    await writeFile(
+      path.join(gitDirectory, "paseo-plugin.json"),
+      JSON.stringify({
+        id: "git-cli-e2e",
+        requirements: { paseo: ">=999.0.0" },
+        build: [
+          [
+            process.execPath,
+            "-e",
+            'require("node:fs").writeFileSync(process.argv[1], "ran")',
+            buildMarker,
+          ],
+        ],
+      }),
+    );
+    await git(gitDirectory, ["add", "-A"]);
+    await git(gitDirectory, ["commit", "-m", "requires a future Paseo"]);
+    const incompatibleUpdate = await context.paseo([
+      "plugin",
+      "update",
+      "git-cli-e2e",
+      "--yes",
+      "--json",
+    ]);
+    assert.equal(incompatibleUpdate.exitCode, 1);
+    assert.match(JSON.parse(incompatibleUpdate.stdout)[0].error, /requires Paseo >=999.0.0/);
+    await assert.rejects(readFile(buildMarker), { code: "ENOENT" });
+    const retained = await context.paseo(["plugin", "ls", "git-cli-e2e", "--json"]);
+    assert.equal(retained.exitCode, 0, retained.stderr);
+    assert.equal(JSON.parse(retained.stdout)[0].commit, installedCommit);
+    assert.equal(JSON.parse(retained.stdout)[0].status, "running");
+    const incompatibleAdd = await context.paseo([
+      "plugin",
+      "add",
+      pathToFileURL(gitDirectory).href,
+      "--id",
+      "future-plugin",
+      "--json",
+    ]);
+    assert.equal(incompatibleAdd.exitCode, 1);
+    assert.match(incompatibleAdd.stderr, /requires Paseo >=999.0.0/);
+    await assert.rejects(readFile(buildMarker), { code: "ENOENT" });
 
     const reload = await context.paseo(["plugin", "reload", "cli-e2e", "--json"]);
     assert.equal(reload.exitCode, 0, reload.stderr);
@@ -87,11 +246,56 @@ async function main(): Promise<void> {
     assert.equal(remove.exitCode, 0, remove.stderr);
     const removeGit = await context.paseo(["plugin", "remove", "git-cli-e2e", "--json"]);
     assert.equal(removeGit.exitCode, 0, removeGit.stderr);
+    const removeScaffold = await context.paseo(["plugin", "remove", "authored-plugin", "--json"]);
+    assert.equal(removeScaffold.exitCode, 0, removeScaffold.stderr);
+    for (const source of ["npm:paseo-fixture-plugin@^1.0.0", "npm:@paseo-fixture/review@2.0.0"]) {
+      const npmInstall = await context.paseo([
+        "plugin",
+        "install",
+        source,
+        "--path",
+        ".",
+        "--json",
+      ]);
+      assert.equal(npmInstall.exitCode, 0, npmInstall.stderr);
+      assert.equal(JSON.parse(npmInstall.stdout).id, "npm-review");
+      assert.equal(JSON.parse(npmInstall.stdout).status, "running");
+      assert.equal(
+        JSON.parse(npmInstall.stdout).installation.currentRevision,
+        source.includes("@paseo-fixture") ? "2.0.0" : "1.1.0",
+      );
+      const npmDisabled = await context.paseo(["plugin", "disable", "npm-review", "--json"]);
+      assert.equal(npmDisabled.exitCode, 0, npmDisabled.stderr);
+      const restart = await context.paseo(["daemon", "restart", "--timeout", "45", "--json"], {
+        timeout: 60_000,
+      });
+      assert.equal(restart.exitCode, 0, restart.stderr);
+      assert.notEqual(
+        JSON.parse(restart.stdout).workerPid,
+        JSON.parse(restart.stdout).previousWorkerPid,
+      );
+      const persisted = await context.paseo(["plugin", "ls", "npm-review", "--json"]);
+      assert.equal(persisted.exitCode, 0, persisted.stderr);
+      assert.equal(JSON.parse(persisted.stdout)[0].status, "disabled");
+      assert.equal(JSON.parse(persisted.stdout)[0].path, JSON.parse(npmInstall.stdout).path);
+      assert.deepEqual(
+        JSON.parse(persisted.stdout)[0].installation,
+        JSON.parse(npmInstall.stdout).installation,
+      );
+      const npmEnabled = await context.paseo(["plugin", "enable", "npm-review", "--json"]);
+      assert.equal(npmEnabled.exitCode, 0, npmEnabled.stderr);
+      assert.equal(JSON.parse(npmEnabled.stdout).status, "running");
+      const npmReload = await context.paseo(["plugin", "reload", "npm-review", "--json"]);
+      assert.equal(npmReload.exitCode, 0, npmReload.stderr);
+      const npmRemove = await context.paseo(["plugin", "remove", "npm-review", "--json"]);
+      assert.equal(npmRemove.exitCode, 0, npmRemove.stderr);
+    }
     const list = await context.paseo(["plugin", "ls", "--json"]);
     assert.equal(list.exitCode, 0, list.stderr);
     assert.deepEqual(JSON.parse(list.stdout), []);
   } finally {
     await context.stop();
+    await registry.close();
     await rm(directory, { recursive: true, force: true });
     await rm(gitDirectory, { recursive: true, force: true });
   }
diff --git a/packages/cli/tests/e2e/relay-host.test.ts b/packages/cli/tests/e2e/relay-host.test.ts
index 1c5e4bd8b9..bfba930f7d 100644
--- a/packages/cli/tests/e2e/relay-host.test.ts
+++ b/packages/cli/tests/e2e/relay-host.test.ts
@@ -6,7 +6,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { buildRelayWebSocketUrl } from "@getpaseo/protocol/daemon-endpoints";
 import { parseConnectionOfferFromUrl } from "@getpaseo/protocol/connection-offer";
-import { generateLocalPairingOffer } from "@getpaseo/server";
+import { generateLocalPairingOffer } from "@getpaseo/server/pairing";
 import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { WebSocket } from "ws";
 import { getAvailablePort } from "../helpers/network.ts";
diff --git a/packages/cli/tests/helpers/local-cli.ts b/packages/cli/tests/helpers/local-cli.ts
index ad7f3a4524..e6d22bb0ff 100644
--- a/packages/cli/tests/helpers/local-cli.ts
+++ b/packages/cli/tests/helpers/local-cli.ts
@@ -1,5 +1,10 @@
 import { $, ProcessPromise } from "zx";
 import { join } from "node:path";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+
+const cliHome = mkdtempSync(join(tmpdir(), "paseo-test-cli-os-home-"));
+process.once("exit", () => rmSync(cliHome, { recursive: true, force: true }));
 
 const CLI_ENTRY = join(import.meta.dirname, "..", "..", "dist", "index.js");
 
@@ -11,6 +16,13 @@ export function runLocalPaseo(
   $.verbose = false;
   return $({
     cwd,
-    env: { ...process.env, ...env },
+    env: {
+      ...Object.fromEntries(
+        Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+      ),
+      ...env,
+      HOME: cliHome,
+      USERPROFILE: cliHome,
+    },
   })`${process.execPath} ${CLI_ENTRY} ${args}`.nothrow();
 }
diff --git a/packages/cli/tests/helpers/terminal.ts b/packages/cli/tests/helpers/terminal.ts
new file mode 100644
index 0000000000..75a0bf258d
--- /dev/null
+++ b/packages/cli/tests/helpers/terminal.ts
@@ -0,0 +1,19 @@
+import assert from "node:assert/strict";
+import type { createE2ETestContext } from "./test-daemon.ts";
+
+export async function waitForTerminalOutput(
+  paseo: Awaited<ReturnType<typeof createE2ETestContext>>["paseo"],
+  terminalId: string,
+  text: string,
+): Promise<void> {
+  const deadline = Date.now() + 10_000;
+  let lines: string[] = [];
+  while (Date.now() < deadline) {
+    const result = await paseo(["terminal", "capture", terminalId, "--json"]);
+    assert.equal(result.exitCode, 0, result.stderr);
+    lines = JSON.parse(result.stdout).lines;
+    if (lines.some((line) => line.includes(text))) return;
+    await new Promise((resolve) => setTimeout(resolve, 25));
+  }
+  throw new Error(`Missing terminal output: ${text}\nLast capture:\n${lines.join("\n")}`);
+}
diff --git a/packages/cli/tests/helpers/test-daemon.ts b/packages/cli/tests/helpers/test-daemon.ts
index 8607b1cfb5..5b5513d1a7 100644
--- a/packages/cli/tests/helpers/test-daemon.ts
+++ b/packages/cli/tests/helpers/test-daemon.ts
@@ -169,19 +169,23 @@ export async function createTempDirs(): Promise<{ paseoHome: string; workDir: st
  * Wait for daemon to be ready by running `paseo agent ls`
  * This connects via WebSocket and ensures the daemon is responsive
  */
-async function probeDaemonReady(port: number, env?: NodeJS.ProcessEnv): Promise<boolean> {
+async function probeDaemonReady(
+  port: number,
+  paseoHome: string,
+  env?: NodeJS.ProcessEnv,
+): Promise<boolean> {
   try {
     const { exitCode } = await runPaseoCli(
       {
         port,
         wsUrl: `ws://${TEST_DAEMON_HOST}:${port}`,
-        paseoHome: "",
+        paseoHome,
         workDir: "",
         process: null,
         isReady: false,
         stop: async () => {},
       },
-      ["agent", "ls"],
+      ["agent", "ls", "--host", `${TEST_DAEMON_HOST}:${port}`],
       { env },
     );
     return exitCode === 0;
@@ -192,13 +196,14 @@ async function probeDaemonReady(port: number, env?: NodeJS.ProcessEnv): Promise<
 
 async function waitForDaemonReady(
   port: number,
+  paseoHome: string,
   timeout = 30000,
   env?: NodeJS.ProcessEnv,
 ): Promise<void> {
   const deadline = Date.now() + timeout;
 
   async function poll(): Promise<void> {
-    if (await probeDaemonReady(port, env)) return;
+    if (await probeDaemonReady(port, paseoHome, env)) return;
     if (Date.now() >= deadline) {
       throw new Error(`Daemon failed to become ready on port ${port} within ${timeout}ms`);
     }
@@ -240,23 +245,23 @@ export async function startTestDaemon(options?: {
   const cliSrcPath = join(cliDir, "src", "index.ts");
 
   // Start daemon process using tsx to run TypeScript directly
-  const daemonProcess = spawn(
-    process.execPath,
-    [TSX_ENTRY, cliSrcPath, "daemon", "start", "--foreground"],
-    {
-      env: {
-        ...process.env,
-        ...TEST_DAEMON_ENV_DEFAULTS,
-        PASEO_HOME: paseoHome,
-        PASEO_LISTEN: `${TEST_DAEMON_HOST}:${port}`,
-        // Force no TTY to prevent QR code output
-        CI: "true",
-        ...options?.env,
-      },
-      stdio: ["ignore", "pipe", "pipe"],
-      detached: process.platform !== "win32",
+  const daemonProcess = spawn(process.execPath, [TSX_ENTRY, cliSrcPath, "daemon", "run"], {
+    env: {
+      ...Object.fromEntries(
+        Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+      ),
+      ...TEST_DAEMON_ENV_DEFAULTS,
+      PASEO_HOME: paseoHome,
+      PASEO_LISTEN: `${TEST_DAEMON_HOST}:${port}`,
+      // Force no TTY to prevent QR code output
+      CI: "true",
+      ...options?.env,
+      HOME: paseoHome,
+      USERPROFILE: paseoHome,
     },
-  );
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: process.platform !== "win32",
+  });
 
   const stdout = createOutputCapture();
   const stderr = createOutputCapture();
@@ -319,7 +324,7 @@ export async function startTestDaemon(options?: {
 
   // Wait for daemon to be ready
   try {
-    await waitForDaemonReady(port, timeout, options?.env);
+    await waitForDaemonReady(port, paseoHome, timeout, options?.env);
     ctx.isReady = true;
   } catch (err) {
     // Daemon failed to start - clean up and rethrow
@@ -347,6 +352,8 @@ export async function runPaseoCli(
     timeout?: number;
     cwd?: string;
     env?: NodeJS.ProcessEnv;
+    /** Close the reading end of the CLI's stdout, as a launcher that discards output does. */
+    closedStdout?: boolean;
   },
 ): Promise<{ exitCode: number; stdout: string; stderr: string }> {
   const timeout = options?.timeout ?? 60000;
@@ -358,11 +365,14 @@ export async function runPaseoCli(
   return new Promise((resolve, reject) => {
     const proc = spawn(process.execPath, [TSX_ENTRY, cliSrcPath, ...args], {
       env: {
-        ...process.env,
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+        ),
         ...TEST_DAEMON_ENV_DEFAULTS,
-        PASEO_HOST: `${TEST_DAEMON_HOST}:${ctx.port}`,
         PASEO_HOME: ctx.paseoHome,
         ...options?.env,
+        HOME: ctx.paseoHome,
+        USERPROFILE: ctx.paseoHome,
       },
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
@@ -372,6 +382,10 @@ export async function runPaseoCli(
     const stdout = createOutputCapture();
     const stderr = createOutputCapture();
 
+    if (options?.closedStdout) {
+      proc.stdout?.destroy();
+    }
+
     proc.stdout?.on("data", (data) => {
       appendOutputCapture(stdout, data);
     });
diff --git a/packages/cli/tests/run-all.ts b/packages/cli/tests/run-all.ts
index d3d4cc8b2e..7303f5408e 100644
--- a/packages/cli/tests/run-all.ts
+++ b/packages/cli/tests/run-all.ts
@@ -196,12 +196,17 @@ async function runSingleTest(testFile: string): Promise<TestOutcome> {
   const testName = testFile.replace(/\.test\.ts$/, "");
   const startedAt = Date.now();
   const npmCache = await mkdtemp(join(tmpdir(), "paseo-cli-test-npm-cache-"));
+  const osHome = await mkdtemp(join(tmpdir(), "paseo-cli-test-os-home-"));
 
   try {
     return await new Promise<TestOutcome>((resolve) => {
       const proc = spawn("npx", ["tsx", testPath], {
         env: {
-          ...process.env,
+          ...Object.fromEntries(
+            Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+          ),
+          HOME: osHome,
+          USERPROFILE: osHome,
           PATH: [rootNodeModulesBin, process.env.PATH].filter(Boolean).join(delimiter),
           npm_config_cache: npmCache,
           PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: testEnvDefaults.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD,
@@ -249,6 +254,7 @@ async function runSingleTest(testFile: string): Promise<TestOutcome> {
     });
   } finally {
     await rm(npmCache, { recursive: true, force: true });
+    await rm(osHome, { recursive: true, force: true });
   }
 }
 
diff --git a/packages/cli/tests/setup.ts b/packages/cli/tests/setup.ts
index 94f872300f..5b860cf6c2 100644
--- a/packages/cli/tests/setup.ts
+++ b/packages/cli/tests/setup.ts
@@ -20,6 +20,16 @@ const TEST_ENV_DEFAULTS = {
   PASEO_VOICE_MODE_ENABLED: process.env.PASEO_VOICE_MODE_ENABLED ?? "0",
 };
 
+function testEnvironment(paseoHome: string): NodeJS.ProcessEnv {
+  return {
+    ...Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_"))),
+    ...TEST_ENV_DEFAULTS,
+    PASEO_HOME: paseoHome,
+    HOME: paseoHome,
+    USERPROFILE: paseoHome,
+  };
+}
+
 function killPidTree(pid: number, signal: NodeJS.Signals): void {
   if (!Number.isInteger(pid) || pid <= 0) {
     return;
@@ -83,19 +93,25 @@ export async function createTempDirs(): Promise<{ paseoHome: string; workDir: st
  * Wait for daemon to be ready by testing WebSocket connection
  * Uses `paseo agent ls` which connects via WebSocket
  */
-async function probeDaemon(port: number): Promise<boolean> {
+async function probeDaemon(port: number, paseoHome: string): Promise<boolean> {
   try {
-    const result = await $`PASEO_HOST=localhost:${port} paseo agent ls`.nothrow();
+    const result = await $({
+      env: testEnvironment(paseoHome),
+    })`paseo agent ls --host localhost:${port}`.nothrow();
     return result.exitCode === 0;
   } catch {
     return false;
   }
 }
 
-export async function waitForDaemon(port: number, timeout = 30000): Promise<void> {
+export async function waitForDaemon(
+  port: number,
+  paseoHome: string,
+  timeout = 30000,
+): Promise<void> {
   const deadline = Date.now() + timeout;
   async function poll(): Promise<void> {
-    if (await probeDaemon(port)) return;
+    if (await probeDaemon(port, paseoHome)) return;
     if (Date.now() >= deadline) {
       throw new Error(`Daemon failed to start on port ${port} within ${timeout}ms`);
     }
@@ -110,8 +126,14 @@ export async function waitForDaemon(port: number, timeout = 30000): Promise<void
  */
 export async function startDaemon(port: number, paseoHome: string): Promise<ProcessPromise> {
   $.verbose = false;
-  const daemon =
-    $`PASEO_HOME=${paseoHome} PASEO_LISTEN=127.0.0.1:${port} PASEO_RELAY_ENABLED=false PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${TEST_ENV_DEFAULTS.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${TEST_ENV_DEFAULTS.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${TEST_ENV_DEFAULTS.PASEO_VOICE_MODE_ENABLED} CI=true paseo daemon start --foreground`.nothrow();
+  const daemon = $({
+    env: {
+      ...testEnvironment(paseoHome),
+      PASEO_LISTEN: `127.0.0.1:${port}`,
+      PASEO_RELAY_ENABLED: "false",
+      CI: "true",
+    },
+  })`paseo daemon run`.nothrow();
   return daemon;
 }
 
@@ -125,7 +147,7 @@ export async function createTestContext(): Promise<TestContext> {
   // Helper to run CLI commands against test daemon
   const paseo = (args: string[]): ProcessPromise => {
     $.verbose = false;
-    return $`PASEO_HOST=localhost:${port} PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD=${TEST_ENV_DEFAULTS.PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD} PASEO_DICTATION_ENABLED=${TEST_ENV_DEFAULTS.PASEO_DICTATION_ENABLED} PASEO_VOICE_MODE_ENABLED=${TEST_ENV_DEFAULTS.PASEO_VOICE_MODE_ENABLED} paseo ${args}`.nothrow();
+    return $({ env: testEnvironment(paseoHome) })`paseo --home ${paseoHome} ${args}`.nothrow();
   };
 
   // Cleanup function
@@ -162,7 +184,7 @@ export async function createTestContext(): Promise<TestContext> {
 export async function createTestContextWithDaemon(): Promise<TestContext> {
   const ctx = await createTestContext();
   ctx.daemon = await startDaemon(ctx.port, ctx.paseoHome);
-  await waitForDaemon(ctx.port);
+  await waitForDaemon(ctx.port, ctx.paseoHome);
   return ctx;
 }
 
diff --git a/packages/client/README.md b/packages/client/README.md
index 444f1ddc7d..29bed77a81 100644
--- a/packages/client/README.md
+++ b/packages/client/README.md
@@ -26,7 +26,7 @@ await client.close();
 
 The public API is the package root. Imports under `@getpaseo/client/internal/*` are unsupported implementation details used by Paseo's own packages.
 
-Read the [SDK documentation](https://paseo.sh/docs/sdk) for agents, workspaces, provider discovery, events, recipes, and the API reference. Runnable TypeScript patterns also live in [`examples/`](./examples/README.md).
+Read the [SDK documentation](https://paseo.sh/docs/sdk) for agents, workspaces, terminals, provider discovery, events, recipes, and the API reference. Runnable TypeScript patterns also live in [`examples/`](./examples/README.md).
 
 ## Runtime
 
@@ -34,6 +34,11 @@ The client needs a WebSocket implementation. Modern browsers and Node.js 22 prov
 
 Use a WebSocket URL ending in `/ws`, such as `ws://127.0.0.1:6767/ws`. Pass `password` when the daemon requires authentication.
 
+The client advertises its supported protocol capabilities by default. Optional `capabilities`
+overrides extend or override that declaration; browser hosting must be supplied by the caller.
+Connecting alone does not subscribe to agent timelines or catalog events. See the
+[event guide](https://paseo.sh/docs/sdk/events) for subscription lifetimes and timeline replacements.
+
 ## Stability
 
 The high-level API exported from `@getpaseo/client` is the supported SDK surface. The SDK and daemon remain protocol-compatible across versions, but newly added capabilities can require a newer daemon.
diff --git a/packages/client/examples/agents-and-providers.ts b/packages/client/examples/agents-and-providers.ts
index c27ca1871e..e1ebfe021c 100644
--- a/packages/client/examples/agents-and-providers.ts
+++ b/packages/client/examples/agents-and-providers.ts
@@ -58,10 +58,23 @@ export async function runFollowUp(url: string, agentId: string): Promise<string
 
   try {
     await client.connect();
-    const result = await client.agents.ref(agentId).run("Summarize your progress and next step.");
+    const result = await client.agents.ref(agentId).run("Summarize your progress and next step.", {
+      activeTurnBehavior: "interrupt",
+    });
     if (result.status !== "idle") throw new Error(result.error ?? result.status);
     return result.lastMessage;
   } finally {
     await client.close();
   }
 }
+
+export async function steerAgent(url: string, agentId: string, prompt: string): Promise<void> {
+  const client = createClient(url);
+
+  try {
+    await client.connect();
+    await client.agents.ref(agentId).send(prompt, { activeTurnBehavior: "steer" });
+  } finally {
+    await client.close();
+  }
+}
diff --git a/packages/client/examples/events-and-timeline.ts b/packages/client/examples/events-and-timeline.ts
index 84855426de..f0269f87b9 100644
--- a/packages/client/examples/events-and-timeline.ts
+++ b/packages/client/examples/events-and-timeline.ts
@@ -10,13 +10,12 @@ export async function subscribeToEvents(
   url: string,
   agentId: string,
   workspaceId: string,
-): Promise<() => void> {
+): Promise<() => Promise<void>> {
   const client = createClient(url);
   await client.connect();
 
-  await client.workspaces.list({
-    subscribe: { subscriptionId: `workspace-${workspaceId}` },
-  });
+  const agents = await client.agents.list({ subscribe: {} });
+  const workspaces = await client.workspaces.list({ subscribe: {} });
 
   const unsubscribeAgentUpdates = client.agents.subscribe((update) => {
     if (update.kind === "upsert" && update.agent.id === agentId) {
@@ -31,14 +30,24 @@ export async function subscribeToEvents(
   });
 
   const unsubscribeTimeline = client.agents.ref(agentId).timeline.subscribe((event) => {
-    void event.event;
+    if (event.event.type === "subscription_restored") {
+      console.log("Live subscription restored; request any missed history explicitly.");
+    } else if (event.event.type === "error") {
+      console.error(event.event.error);
+    }
   });
 
-  return () => {
+  await unsubscribeTimeline.ready;
+
+  return async () => {
     unsubscribeTimeline();
     unsubscribeWorkspaceUpdates();
     unsubscribeAgentUpdates();
-    void client.close();
+    try {
+      await Promise.all([agents.subscription.release(), workspaces.subscription.release()]);
+    } finally {
+      await client.close();
+    }
   };
 }
 
diff --git a/packages/client/package.json b/packages/client/package.json
index d23d727fcb..937190e0d0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "clean": "node ../../scripts/clean-package-dist.mjs",
-    "build": "npm run build --workspace=@getpaseo/protocol && tsc -p tsconfig.json --incremental false",
+    "build": "npm run build --workspace=@getpaseo/protocol && npm run build --workspace=@getpaseo/relay && tsc -p tsconfig.json --incremental false",
     "build:clean": "npm run clean && npm run build",
     "prepack": "npm run build:clean",
     "typecheck": "tsgo --noEmit",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.7.2",
-    "@getpaseo/relay": "0.7.2",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/relay": "0.11.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/client/src/compat/normalize-provider-models.ts b/packages/client/src/compat/normalize-provider-models.ts
index 65d4addcbb..b2662c0d21 100644
--- a/packages/client/src/compat/normalize-provider-models.ts
+++ b/packages/client/src/compat/normalize-provider-models.ts
@@ -59,19 +59,28 @@ export function normalizeListProviderModelsPayload(
 
 export function normalizeProvidersSnapshotPayload<
   T extends GetProvidersSnapshotPayload | ProvidersSnapshotUpdatePayload,
->(payload: T): T {
-  const entries = payload.compactSnapshot
+>(payload: T, expand = true): T {
+  if (payload.compactSnapshot && !expand) return payload;
+  const decoded = payload.compactSnapshot
     ? expandProviderSnapshot(payload.compactSnapshot)
     : normalizeProviderSnapshotEntries(payload.entries);
+  const freshness = payload.fetchedAt;
+  const entries =
+    freshness && expand
+      ? decoded.map((entry) =>
+          freshness[entry.provider] ? { ...entry, fetchedAt: freshness[entry.provider] } : entry,
+        )
+      : decoded;
   return entries === payload.entries ? payload : { ...payload, entries };
 }
 
 export function normalizeProviderSnapshotUpdateMessage(
   msg: SessionOutboundMessage,
+  expand = true,
 ): SessionOutboundMessage {
   if (msg.type !== "providers_snapshot_update") {
     return msg;
   }
 
-  return { ...msg, payload: normalizeProvidersSnapshotPayload(msg.payload) };
+  return { ...msg, payload: normalizeProvidersSnapshotPayload(msg.payload, expand) };
 }
diff --git a/packages/client/src/connection.test.ts b/packages/client/src/connection.test.ts
new file mode 100644
index 0000000000..a3d12e48f6
--- /dev/null
+++ b/packages/client/src/connection.test.ts
@@ -0,0 +1,1029 @@
+import { expect, test } from "vitest";
+import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
+import { DaemonClient, type DaemonTransport } from "./daemon-client";
+
+function connection(
+  options: {
+    acknowledgeSubscriptions?: boolean;
+    ownedSubscriptions?: boolean;
+    ownedCapability?: boolean;
+    workspaceMultiplicity?: boolean;
+    broadcasts?: boolean;
+    browserHost?: { hostKind: string; supportedCommands: string[] };
+    acknowledgeTimelineReads?: boolean;
+  } = {},
+) {
+  const sent: Array<{
+    type: string;
+    capabilities?: Record<string, unknown>;
+    message?: {
+      type: string;
+      requestId?: string;
+      agentIds?: string[];
+      events?: string[];
+      subscriptionId?: string;
+    };
+  }> = [];
+  let receive = (_data: unknown) => {};
+  let open = () => {};
+  let closed = (_event?: unknown) => {};
+  const transport: DaemonTransport = {
+    send(data) {
+      const frame = JSON.parse(String(data));
+      sent.push(frame);
+      if (frame.type === "hello") {
+        receive(
+          JSON.stringify({
+            type: "session",
+            message: {
+              type: "status",
+              payload: {
+                status: "server_info",
+                serverId: "test",
+                hostname: null,
+                version: null,
+                features: {
+                  ...(options.ownedSubscriptions === false ? {} : { ownedSubscriptions: true }),
+                  workspaceMultiplicity: options.workspaceMultiplicity ?? true,
+                  selectiveAgentTimeline: !options.broadcasts,
+                  explicitEventSubscriptions: !options.broadcasts,
+                },
+              },
+            },
+          }),
+        );
+      } else if (
+        options.acknowledgeSubscriptions !== false &&
+        frame.type === "session" &&
+        frame.message.type.endsWith("set_subscription.request")
+      ) {
+        receive(
+          JSON.stringify({
+            type: "session",
+            message: {
+              type: frame.message.type.replace(".request", ".response"),
+              payload: {
+                requestId: frame.message.requestId,
+                agentIds: frame.message.agentIds,
+                subscriptionId: `server-${sent.length}`,
+              },
+            },
+          }),
+        );
+      }
+      if (
+        frame.message?.type === "fetch_agent_timeline_request" &&
+        options.acknowledgeTimelineReads !== false
+      ) {
+        receive(
+          JSON.stringify({
+            type: "session",
+            message: timelinePage(frame.message.requestId, "epoch", 0),
+          }),
+        );
+      }
+      if (frame.message?.type === "subscription.release.request") {
+        receive(
+          JSON.stringify({
+            type: "session",
+            message: {
+              type: "subscription.release.response",
+              payload: {
+                requestId: frame.message.requestId,
+                subscriptionId: frame.message.subscriptionId,
+              },
+            },
+          }),
+        );
+      }
+    },
+    close() {},
+    onMessage(handler) {
+      receive = (data) => handler(data, typeof data !== "string");
+      return () => {};
+    },
+    onOpen(handler) {
+      open = handler;
+      return () => {};
+    },
+    onClose(handler) {
+      closed = handler;
+      return () => {};
+    },
+    onError() {
+      return () => {};
+    },
+  };
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "test",
+    capabilities: {
+      [CLIENT_CAPS.browserHost]: options.browserHost,
+      ...(options.ownedCapability === undefined
+        ? {}
+        : { [CLIENT_CAPS.ownedSubscriptions]: options.ownedCapability }),
+    },
+    transportFactory: () => transport,
+    reconnect: { enabled: false },
+  });
+  return {
+    client,
+    sent,
+    open: () => open(),
+    disconnect: () => closed(),
+    receive: (message: unknown) => receive(JSON.stringify({ type: "session", message })),
+  };
+}
+
+test("a plain client advertises every protocol capability and no browser host", async () => {
+  const h = connection();
+  try {
+    const ready = h.client.connect();
+    h.open();
+    await ready;
+    const { browserHost: _browser, ...protocolCapabilities } = CLIENT_CAPS;
+    // Every new capability needs a deliberate default or a host-owned exception.
+    expect(h.sent).toHaveLength(1);
+    expect(h.sent[0].capabilities).toEqual(
+      Object.fromEntries(Object.values(protocolCapabilities).map((key) => [key, true])),
+    );
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("SDK timelines have independent lifetimes and fresh IDs on reconnect", async () => {
+  const { createPaseoApi } = await import("./index");
+  const h = connection();
+  const api = createPaseoApi(h.client);
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const a = api.agents.ref("a").timeline.subscribe(() => {});
+    const same = api.agents.ref("a").timeline.subscribe(() => {});
+    const b = api.agents.ref("b").timeline.subscribe(() => {});
+    await Promise.all([a.ready, same.ready, b.ready]);
+    expect(new Set([a.subscriptionId, same.subscriptionId, b.subscriptionId]).size).toBe(3);
+    const memberships = () =>
+      h.sent
+        .filter((frame) => frame.message?.type === "agent.timeline.set_subscription.request")
+        .map((frame) => frame.message?.agentIds);
+    expect(memberships()).toEqual([["a"], ["a"], ["b"]]);
+    await a.release();
+    await same.release();
+    const previousId = b.subscriptionId;
+    h.disconnect();
+    const reconnecting = h.client.connect();
+    h.open();
+    await reconnecting;
+    await expect.poll(() => b.subscriptionId).not.toBe(previousId);
+    expect(memberships()).toEqual([["a"], ["a"], ["b"], ["b"]]);
+    await b.release();
+  } finally {
+    await api.dispose();
+    await h.client.close();
+  }
+});
+
+test("SDK subscribers receive timeline replacement instead of silently losing history", async () => {
+  const { createPaseoApi } = await import("./index");
+  const h = connection();
+  const received: unknown[] = [];
+  try {
+    const ready = h.client.connect();
+    h.open();
+    await ready;
+    const off = createPaseoApi(h.client)
+      .agents.ref("agent")
+      .timeline.subscribe((event) => received.push(event));
+    await off.ready;
+    h.receive({
+      type: "agent.timeline.replacement",
+      payload: { agentId: "agent", epoch: "next", subscriptionId: off.subscriptionId },
+    });
+    expect(received).toEqual([{ agentId: "agent", event: { type: "replacement", epoch: "next" } }]);
+    off();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("local listeners create no demand before or after reconnect", async () => {
+  const h = connection();
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const off = h.client.on("project.update", () => {});
+    h.disconnect();
+    const reconnecting = h.client.connect();
+    h.open();
+    await reconnecting;
+    expect(h.sent.filter((frame) => frame.type === "session")).toEqual([]);
+    off();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("provider reference hydration preserves independent owners and drops released work", async () => {
+  const h = connection();
+  const updates: string[] = [];
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const a = h.client.observeEvents(["providers_snapshot_update"]);
+    const b = h.client.observeEvents(["providers_snapshot_update"]);
+    await Promise.all([a.ready, b.ready]);
+    for (const owner of [a, b])
+      owner.subscribe({
+        snapshot: () => {},
+        update: (message) => {
+          if (message.type === "providers_snapshot_update")
+            updates.push(message.payload.subscriptionId!);
+        },
+      });
+    const payload = {
+      entries: [],
+      snapshotHash: "catalog",
+      generatedAt: "2026-09-08T00:00:00.000Z",
+    };
+    for (const owner of [a, b])
+      h.receive({
+        type: "providers_snapshot_update",
+        payload: { ...payload, subscriptionId: owner.subscriptionId },
+      });
+    const requests = h.sent.filter(
+      (frame) => frame.message?.type === "get_providers_snapshot_request",
+    );
+    expect(requests).toHaveLength(2);
+    await a.release();
+    for (const request of requests)
+      h.receive({
+        type: "get_providers_snapshot_response",
+        payload: {
+          ...payload,
+          requestId: request.message!.requestId,
+          compactSnapshot: { entries: [], thinkingSets: [] },
+        },
+      });
+    await expect.poll(() => updates).toEqual([b.subscriptionId]);
+    await b.release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("timeline readiness and updates belong to the acknowledged handle", async () => {
+  const h = connection({ acknowledgeSubscriptions: false });
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const a = h.client.subscribeAgentTimeline("agent", () => {});
+    const b = h.client.subscribeAgentTimeline("agent", () => {});
+    const requests = h.sent.filter(
+      (frame) => frame.message?.type === "agent.timeline.set_subscription.request",
+    );
+    let bReady = false;
+    void b.ready.then(() => {
+      bReady = true;
+      return undefined;
+    });
+    h.receive({
+      type: "agent.timeline.set_subscription.response",
+      payload: {
+        requestId: requests[0].message!.requestId,
+        agentIds: ["agent"],
+        subscriptionId: "a",
+      },
+    });
+    await a.ready;
+    expect(bReady).toBe(false);
+    h.receive({
+      type: "agent.timeline.set_subscription.response",
+      payload: {
+        requestId: requests[1].message!.requestId,
+        agentIds: ["agent"],
+        subscriptionId: "b",
+      },
+    });
+    await b.ready;
+    await a.release();
+    await b.release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("timeline readiness remains pending before connect and rejects when released", async () => {
+  const h = connection();
+  try {
+    const release = h.client.subscribeAgentTimeline("agent", () => {});
+    const canceled = h.client.subscribeAgentTimeline("canceled", () => {});
+    canceled();
+    await expect(canceled.ready).rejects.toThrow("released");
+    let established = false;
+    void release.ready.then(() => {
+      return (established = true);
+    });
+    await Promise.resolve();
+    expect(established).toBe(false);
+    expect(h.sent).toEqual([]);
+    const connect = h.client.connect();
+    h.open();
+    await connect;
+    await release.ready;
+    expect(established).toBe(true);
+    release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("passive provider listeners never hydrate unowned references", async () => {
+  const h = connection();
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const off = h.client.on("providers_snapshot_update", () => {});
+    h.receive({
+      type: "providers_snapshot_update",
+      payload: { entries: [], snapshotHash: "updated", generatedAt: "2026-09-08T00:00:00.000Z" },
+    });
+    h.disconnect();
+    off();
+    const reconnecting = h.client.connect();
+    h.open();
+    await reconnecting;
+    expect(h.sent.filter((frame) => frame.type === "session")).toEqual([]);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("failed terminal bootstrap reports the domain error without reconnecting or retaining a route", async () => {
+  const h = connection();
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const terminal = h.client.observeTerminal("missing-terminal", () => {});
+    const request = h.sent.at(-1)!.message!;
+    h.receive({
+      type: "subscribe_terminal_response",
+      payload: {
+        requestId: request.requestId,
+        terminalId: "missing-terminal",
+        error: "Terminal not found",
+      },
+    });
+    await expect(terminal.ready).rejects.toThrow("Terminal not found");
+    await terminal.release();
+    expect(terminal.subscriptionId).toBeNull();
+    expect(h.client.isConnected).toBe(true);
+    expect(
+      h.sent.filter((frame) => frame.message?.type === "subscription.release.request"),
+    ).toEqual([]);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("older hosts share event demand on one connection and release only their own listeners", async () => {
+  const h = connection({ ownedSubscriptions: false });
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const first = h.client.observeEvents(["project.update"]);
+    const second = h.client.observeEvents(["project.update"]);
+    await Promise.all([first.ready, second.ready]);
+    const received: string[] = [];
+    first.subscribe({ snapshot: () => {}, update: () => received.push("first") });
+    second.subscribe({ snapshot: () => {}, update: () => received.push("second") });
+    h.receive({ type: "project.update", payload: { kind: "remove", projectId: "project" } });
+    expect(received).toEqual(["first", "second"]);
+    await first.release();
+    h.receive({ type: "project.update", payload: { kind: "remove", projectId: "project" } });
+    expect(received).toEqual(["first", "second", "second"]);
+    expect(h.sent.at(-1)?.message?.events).toEqual(["project.update"]);
+    await second.release();
+    expect(h.sent.at(-1)?.message?.events).toEqual([]);
+    expect(h.sent.filter((frame) => frame.type === "hello")).toHaveLength(1);
+    expect(
+      h.sent.filter((frame) => frame.message?.type === "subscription.release.request"),
+    ).toEqual([]);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("invalid observation input rejects without reconnecting the transport", async () => {
+  const h = connection();
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const invalid = h.client.observeAgents({ page: { limit: -1 } });
+    await expect(invalid.ready).rejects.toThrow();
+    await invalid.release();
+    expect(h.client.isConnected).toBe(true);
+    expect(h.sent.filter((frame) => frame.message?.type === "fetch_agents_request")).toHaveLength(
+      0,
+    );
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("a timed-out subscription rejects and cannot replay on reconnect", async () => {
+  const h = connection();
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const observation = h.client.observeAgents({ timeout: 10 });
+    await expect(observation.ready).rejects.toThrow(/timed out|timeout/i);
+    await observation.release();
+    const reconnecting = h.client.connect();
+    h.open();
+    await reconnecting;
+    expect(h.sent.filter((frame) => frame.message?.type === "fetch_agents_request")).toHaveLength(
+      1,
+    );
+  } finally {
+    await h.client.close();
+  }
+});
+
+function timelinePage(requestId: string | undefined, epoch: string, seq: number) {
+  return {
+    type: "fetch_agent_timeline_response",
+    payload: {
+      requestId,
+      agentId: "agent",
+      agent: null,
+      direction: "before",
+      projection: "projected",
+      epoch,
+      reset: false,
+      staleCursor: false,
+      gap: false,
+      window: { minSeq: 1, maxSeq: seq, nextSeq: seq + 1 },
+      startCursor: { epoch, seq },
+      endCursor: { epoch, seq },
+      hasOlder: seq > 1,
+      hasNewer: false,
+      error: null,
+      entries: seq
+        ? [
+            {
+              provider: "codex",
+              item: { type: "user_message", text: `persisted-${epoch}-${seq}` },
+              timestamp: new Date(0).toISOString(),
+              seqStart: seq,
+              seqEnd: seq,
+              sourceSeqRanges: [{ startSeq: seq, endSeq: seq }],
+              collapsed: [],
+            },
+          ]
+        : [],
+    },
+  };
+}
+
+test.each([
+  { name: "modern", ownedSubscriptions: true, broadcasts: false },
+  { name: "legacy selective", ownedSubscriptions: false, broadcasts: false },
+  { name: "legacy broadcast", ownedSubscriptions: false, broadcasts: true },
+])("$name timelines restore live delivery without requesting history", async (mode) => {
+  const { createPaseoApi } = await import("./index");
+  const h = connection(mode);
+  const api = createPaseoApi(h.client);
+  const received: import("./index").PaseoAgentTimelineEvent[][] = [[], [], []];
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const owners = received.map((events) =>
+      api.agents.ref("agent").timeline.subscribe((event) => events.push(event)),
+    );
+    await Promise.all(owners.map((owner) => owner.ready));
+    expect(received).toEqual([[], [], []]);
+    for (let cycle = 0; cycle < 2; cycle++) {
+      const oldIds = owners.map((owner) => owner.subscriptionId);
+      h.disconnect();
+      await owners[2].release();
+      const reconnected = h.client.connect();
+      h.open();
+      await reconnected;
+      await expect.poll(() => owners[0].subscriptionId).not.toBe(oldIds[0]);
+      expect(
+        h.sent.filter((frame) => frame.message?.type === "fetch_agent_timeline_request"),
+      ).toEqual([]);
+      for (const index of [0, 1]) {
+        expect(owners[index].subscriptionId).not.toBeNull();
+        expect(received[index].at(-1)).toEqual({
+          agentId: "agent",
+          subscriptionId: owners[index].subscriptionId,
+          event: { type: "subscription_restored" },
+        });
+      }
+      const live = {
+        agentId: "agent",
+        timestamp: new Date(0).toISOString(),
+        event: { type: "turn_completed", provider: "codex" },
+      };
+      if (mode.ownedSubscriptions) {
+        for (const owner of owners.slice(0, 2))
+          h.receive({
+            type: "agent_stream",
+            payload: { ...live, subscriptionId: owner.subscriptionId },
+          });
+      } else h.receive({ type: "agent_stream", payload: live });
+      for (const events of received.slice(0, 2))
+        expect(events.map((update) => update.event.type)).toEqual(
+          Array.from({ length: cycle + 1 }, () => [
+            "subscription_restored",
+            "turn_completed",
+          ]).flat(),
+        );
+      expect(received[2]).toEqual([]);
+    }
+  } finally {
+    await api.dispose();
+    await h.client.close();
+  }
+});
+
+test("a consumer chooses its recovery cursor and a failed read leaves live delivery active", async () => {
+  const { createPaseoApi } = await import("./index");
+  const h = connection({ acknowledgeTimelineReads: false });
+  const api = createPaseoApi(h.client);
+  const received: import("./index").PaseoAgentTimelineEvent[] = [];
+  let read: Promise<unknown> | undefined;
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const timeline = api.agents.ref("agent").timeline;
+    const owner = timeline.subscribe((message) => {
+      received.push(message);
+      if (message.event.type === "subscription_restored") {
+        read = timeline.refetch({
+          direction: "after",
+          cursor: { epoch: "cached", seq: 42 },
+          limit: 7,
+        });
+        void read.catch(() => {});
+      }
+    });
+    await owner.ready;
+    h.disconnect();
+    const reconnected = h.client.connect();
+    h.open();
+    await reconnected;
+    await expect.poll(() => read !== undefined).toBe(true);
+    const requests = h.sent.filter(
+      (frame) => frame.message?.type === "fetch_agent_timeline_request",
+    );
+    expect(requests).toHaveLength(1);
+    expect(requests[0].message).toMatchObject({
+      direction: "after",
+      cursor: { epoch: "cached", seq: 42 },
+      limit: 7,
+    });
+    // A slow consumer-owned history read must not buffer or filter live events.
+    for (let seq = 43; seq < 173; seq++)
+      h.receive({
+        type: "agent_stream",
+        payload: {
+          agentId: "agent",
+          subscriptionId: owner.subscriptionId,
+          seq,
+          epoch: "cached",
+          timestamp: new Date(0).toISOString(),
+          event: { type: "turn_completed", provider: "codex" },
+        },
+      });
+    expect(received).toHaveLength(131);
+    h.receive({
+      type: "agent.timeline.replacement",
+      payload: { agentId: "agent", subscriptionId: owner.subscriptionId, epoch: "new" },
+    });
+    expect(received.at(-1)?.event).toEqual({ type: "replacement", epoch: "new" });
+    const page = timelinePage(requests[0].message?.requestId, "cached", 42);
+    h.receive({ ...page, payload: { ...page.payload, error: "History unavailable" } });
+    await expect(read).rejects.toThrow("History unavailable");
+    expect(owner.subscriptionId).not.toBeNull();
+    expect(received.some((message) => message.event.type === "error")).toBe(false);
+    expect(
+      h.sent.filter((frame) => frame.message?.type === "fetch_agent_timeline_request"),
+    ).toHaveLength(1);
+    await owner.release();
+  } finally {
+    await api.dispose();
+    await h.client.close();
+  }
+});
+
+test("subscription-restored notification waits for the new membership acknowledgement", async () => {
+  const h = connection({ acknowledgeSubscriptions: false });
+  const received: unknown[] = [];
+  const acknowledge = (id: string) =>
+    h.receive({
+      type: "agent.timeline.set_subscription.response",
+      payload: {
+        agentIds: ["agent"],
+        requestId: h.sent.at(-1)?.message?.requestId,
+        subscriptionId: id,
+      },
+    });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const owner = h.client.subscribeAgentTimeline("agent", (message) => received.push(message));
+    acknowledge("first");
+    await owner.ready;
+    h.disconnect();
+    const reconnected = h.client.connect();
+    h.open();
+    await reconnected;
+    expect(received).toEqual([]);
+    acknowledge("second");
+    expect(received).toEqual([
+      {
+        type: "agent.timeline.subscription_restored",
+        payload: { agentId: "agent", subscriptionId: "second" },
+      },
+    ]);
+    await owner.release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+function legacyAgent(input: {
+  id: string;
+  cwd: string;
+  status?: "idle" | "running";
+  updatedAt?: string;
+  projectRoot?: string;
+}) {
+  const updatedAt = input.updatedAt ?? "2026-06-18T10:00:00.000Z";
+  return {
+    agent: {
+      id: input.id,
+      provider: "mock",
+      cwd: input.cwd,
+      model: null,
+      createdAt: updatedAt,
+      updatedAt,
+      lastUserMessageAt: null,
+      status: input.status ?? "idle",
+      capabilities: {
+        supportsStreaming: true,
+        supportsSessionPersistence: true,
+        supportsDynamicModes: true,
+        supportsMcpServers: true,
+        supportsReasoningStream: true,
+        supportsToolInvocations: true,
+      },
+      currentModeId: null,
+      availableModes: [],
+      pendingPermissions: [],
+      persistence: null,
+      title: null,
+      labels: {},
+    },
+    project: {
+      projectKey: "/repo",
+      projectName: "repo",
+      workspaceName: "app",
+      checkout: {
+        cwd: input.cwd,
+        isGit: true,
+        currentBranch: "main",
+        remoteUrl: "git@example.com:repo/app.git",
+        worktreeRoot: input.cwd,
+        isPaseoOwnedWorktree: false,
+        mainRepoRoot: input.projectRoot ?? "/repo",
+      },
+    },
+  };
+}
+
+test.each([
+  { cwd: "/repo/app", id: "/repo/app", root: "/repo" },
+  { cwd: "C:\\repo\\app", id: "C:/repo/app", root: "C:\\repo" },
+  { cwd: "C:\\", id: "C:", root: "C:\\" },
+  { cwd: "C:/", id: "C:", root: "C:/" },
+  { cwd: "\\\\server\\share\\", id: "//server/share", root: "\\\\server\\share\\" },
+  { cwd: "\\\\?\\C:\\repo\\app", id: "//?/C:/repo/app", root: "\\\\?\\C:\\repo" },
+  { cwd: "/repo/trailing space ", id: "/repo/trailing space", root: "/repo/ " },
+  { cwd: "/repo/back\\slash", id: "/repo/back/slash", root: "/repo" },
+])(
+  "old workspaces preserve daemon filesystem paths ($cwd) and stable IDs",
+  async ({ cwd, id, root }) => {
+    const h = connection({ ownedSubscriptions: false, workspaceMultiplicity: false });
+    try {
+      const connecting = h.client.connect();
+      h.open();
+      await connecting;
+      const workspaces = h.client.observeWorkspaces();
+      const request = h.sent.at(-1)!.message!;
+      expect(request.type).toBe("fetch_agents_request");
+      h.receive({
+        type: "fetch_agents_response",
+        payload: {
+          requestId: request.requestId,
+          entries: [legacyAgent({ id: "agent", cwd, projectRoot: root, status: "idle" })],
+          pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
+        },
+      });
+      expect((await workspaces.ready).entries).toEqual([
+        expect.objectContaining({
+          id,
+          workspaceDirectory: cwd,
+          projectRootPath: root,
+          projectId: "/repo",
+          status: "done",
+        }),
+      ]);
+      const updates: unknown[] = [];
+      workspaces.subscribe({ snapshot: () => {}, update: (message) => updates.push(message) });
+      const changed = legacyAgent({ id: "agent", cwd, projectRoot: root, status: "running" });
+      h.receive({ type: "agent_update", payload: { kind: "upsert", ...changed } });
+      expect(updates).toEqual([
+        expect.objectContaining({
+          type: "workspace_update",
+          payload: expect.objectContaining({
+            kind: "upsert",
+            workspace: expect.objectContaining({
+              id,
+              workspaceDirectory: cwd,
+              projectRootPath: root,
+              status: "running",
+            }),
+          }),
+        }),
+      ]);
+      const fetching = h.client.fetchAgent("agent");
+      const detail = h.sent.at(-1)!.message!;
+      h.receive({
+        type: "fetch_agent_response",
+        payload: { requestId: detail.requestId, ...changed, error: null },
+      });
+      expect((await fetching).agent?.workspaceId).toBe(id);
+      expect(h.sent.filter((frame) => frame.type === "hello")).toHaveLength(1);
+      await workspaces.release();
+    } finally {
+      await h.client.close();
+    }
+  },
+);
+
+test("legacy workspace pages contain only that page's groups and retain earlier live state", async () => {
+  const h = connection({ ownedSubscriptions: false, workspaceMultiplicity: false });
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const workspaces = h.client.observeWorkspaces();
+    h.receive({
+      type: "fetch_agents_response",
+      payload: {
+        requestId: h.sent.at(-1)!.message!.requestId,
+        entries: [legacyAgent({ id: "first", cwd: "/first", status: "running" })],
+        pageInfo: { hasMore: true, nextCursor: "next-page", prevCursor: null },
+      },
+    });
+    const first = await workspaces.ready;
+    const next = h.client.fetchWorkspaces({
+      page: { cursor: first.pageInfo.nextCursor!, limit: 1 },
+    });
+    h.receive({
+      type: "fetch_agents_response",
+      payload: {
+        requestId: h.sent.at(-1)!.message!.requestId,
+        entries: [legacyAgent({ id: "second", cwd: "/second" })],
+        pageInfo: { hasMore: false, nextCursor: null, prevCursor: "previous-page" },
+      },
+    });
+    const second = await next;
+    expect([...first.entries, ...second.entries].map((workspace) => workspace.id)).toEqual([
+      "/first",
+      "/second",
+    ]);
+    const updates: unknown[] = [];
+    workspaces.subscribe({ snapshot: () => {}, update: (message) => updates.push(message) });
+    // Earlier pages must remain in the aggregate: this idle sibling cannot
+    // replace the running status of the first workspace.
+    h.receive({
+      type: "agent_update",
+      payload: { kind: "upsert", ...legacyAgent({ id: "sibling", cwd: "/first" }) },
+    });
+    expect(updates).toEqual([]);
+    h.receive({ type: "agent_update", payload: { kind: "remove", agentId: "first" } });
+    expect(updates).toEqual([
+      expect.objectContaining({
+        type: "workspace_update",
+        payload: expect.objectContaining({
+          kind: "upsert",
+          workspace: expect.objectContaining({ id: "/first", status: "done" }),
+        }),
+      }),
+    ]);
+    await workspaces.release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("old attention stream events reach the current notification interface", async () => {
+  const h = connection({ ownedSubscriptions: false });
+  try {
+    const connecting = h.client.connect();
+    h.open();
+    await connecting;
+    const observation = h.client.observeEvents(["agent_attention_required"]);
+    await observation.ready;
+    const received: unknown[] = [];
+    observation.subscribe({ snapshot: () => {}, update: (message) => received.push(message) });
+    h.receive({
+      type: "agent_stream",
+      payload: {
+        agentId: "agent",
+        timestamp: "2026-09-11T00:00:00Z",
+        event: {
+          type: "attention_required",
+          provider: "mock",
+          reason: "finished",
+          timestamp: "2026-09-11T00:00:00Z",
+          shouldNotify: true,
+        },
+      },
+    });
+    expect(received).toEqual([
+      {
+        type: "agent_attention_required",
+        payload: {
+          agentId: "agent",
+          reason: "finished",
+          timestamp: "2026-09-11T00:00:00Z",
+          shouldNotify: true,
+          subscriptionId: observation.subscriptionId,
+        },
+      },
+    ]);
+    await observation.release();
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("broadcast-only hosts expose local timeline readiness without sending an unsupported RPC", async () => {
+  const h = connection({ ownedSubscriptions: false, broadcasts: true });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const observation = h.client.observeTimeline(["agent"]);
+    expect(await observation.ready).toEqual({
+      agentIds: ["agent"],
+      requestId: expect.any(String),
+      subscriptionId: observation.subscriptionId,
+    });
+    expect(h.sent).toHaveLength(1);
+    await observation.release();
+    expect(h.sent).toHaveLength(1);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("old browser hosting requires the registration sent in hello", async () => {
+  const h = connection({ ownedSubscriptions: false });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const observation = h.client.registerBrowserHost({
+      hostKind: "test",
+      supportedCommands: ["list_tabs"],
+    });
+    await expect(observation.ready).rejects.toThrow("browser_host");
+    expect(h.sent).toHaveLength(1);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("old timeline observers retain shared membership and restore surviving interests", async () => {
+  const h = connection({ ownedSubscriptions: false });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const app = h.client.observeTimeline(["app"]);
+    const plugin = h.client.observeTimeline(["plugin"]);
+    await Promise.all([app.ready, plugin.ready]);
+    expect(h.sent.at(-1)?.message?.agentIds).toEqual(["app", "plugin"]);
+    await plugin.release();
+    expect(h.sent.at(-1)?.message?.agentIds).toEqual(["app"]);
+    h.disconnect();
+    const reconnecting = h.client.connect();
+    h.open();
+    await reconnecting;
+    await expect.poll(() => h.sent.at(-1)?.message?.agentIds).toEqual(["app"]);
+    await app.release();
+    expect(h.sent.at(-1)?.message?.agentIds).toEqual([]);
+    expect(h.sent.some((frame) => frame.message?.type === "subscription.release.request")).toBe(
+      false,
+    );
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("old browser hosts attach to their hello registration without another connection", async () => {
+  const registration = {
+    hostKind: "desktop app",
+    supportedCommands: ["list_tabs"] as ["list_tabs"],
+  };
+  const h = connection({ ownedSubscriptions: false, browserHost: registration });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const observation = h.client.registerBrowserHost(registration);
+    expect(await observation.ready).toEqual({
+      requestId: expect.any(String),
+      subscriptionId: observation.subscriptionId,
+    });
+    await observation.release();
+    expect(h.sent).toHaveLength(1);
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("delivery follows the negotiated client capability as well as the server feature", async () => {
+  const h = connection({ ownedCapability: false });
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const observation = h.client.observeEvents(["project.update"]);
+    expect((await observation.ready).subscriptionId).toMatch(/^legacy:/);
+    await observation.release();
+    expect(h.sent.at(-1)?.message).toMatchObject({
+      type: "session.events.set_subscription.request",
+      events: [],
+    });
+  } finally {
+    await h.client.close();
+  }
+});
+
+test("subscribeFile returns its initial version without calling the change callback", async () => {
+  const h = connection();
+  try {
+    const connected = h.client.connect();
+    h.open();
+    await connected;
+    const changes: unknown[] = [];
+    const initial = { status: "missing" as const, cwd: "/repo", path: "file.txt" };
+    const subscribing = h.client.subscribeFile({ cwd: "/repo", path: "file.txt" }, (value) =>
+      changes.push(value),
+    );
+    h.receive({
+      type: "fs.file.subscribe.response",
+      payload: {
+        requestId: h.sent.at(-1)!.message!.requestId,
+        subscriptionId: "file-owner",
+        initial,
+      },
+    });
+    const file = await subscribing;
+    expect(file.initial).toEqual(initial);
+    expect(changes).toEqual([]);
+    const version = {
+      status: "ready",
+      cwd: "/repo",
+      path: "file.txt",
+      size: 1,
+      modifiedAt: "2026-09-11T00:00:00Z",
+    };
+    h.receive({ type: "fs.file.update", payload: { subscriptionId: "file-owner", version } });
+    expect(changes).toEqual([version]);
+    await file.unsubscribe();
+  } finally {
+    await h.client.close();
+  }
+});
diff --git a/packages/client/src/connection/index.ts b/packages/client/src/connection/index.ts
new file mode 100644
index 0000000000..d939b3c72b
--- /dev/null
+++ b/packages/client/src/connection/index.ts
@@ -0,0 +1,152 @@
+export { OwnedSubscriptions, type OwnedSubscription, type SubscriptionObserver } from "./owned.js";
+import {
+  OwnedSubscriptions,
+  type OwnedSubscription,
+  type OwnedSubscriptionsHost,
+} from "./owned.js";
+import { LegacySubscriptions, type ObservationRequest } from "./legacy.js";
+import {
+  type SessionInboundMessage,
+  type SessionOutboundMessage,
+  type ServerInfoStatusPayload,
+} from "@getpaseo/protocol/messages";
+import { CLIENT_CAPS, type ClientCapability } from "@getpaseo/protocol/client-capabilities";
+
+export class ConnectionSubscriptions extends OwnedSubscriptions {
+  private legacy: LegacySubscriptions | null = null;
+
+  constructor(
+    private readonly connection: OwnedSubscriptionsHost & {
+      send(message: ObservationRequest): Promise<void>;
+    },
+  ) {
+    super({
+      ...connection,
+      release: async (id) => {
+        if (!this.legacy) return connection.release(id);
+        const message = this.legacy.release(id);
+        if (message) await connection.send(message);
+      },
+    });
+  }
+
+  override restore(
+    info?: ServerInfoStatusPayload,
+    capabilities?: Partial<Record<ClientCapability, unknown>>,
+  ): void {
+    if (info) {
+      const clientCapabilities = capabilities ?? DEFAULT_CLIENT_CAPABILITIES;
+      const owned =
+        info.features?.ownedSubscriptions === true &&
+        clientCapabilities[CLIENT_CAPS.ownedSubscriptions] === true;
+      this.legacy = null;
+      if (!owned) {
+        this.legacy = new LegacySubscriptions(
+          info,
+          this.connection.send,
+          capabilities?.[CLIENT_CAPS.browserHost],
+        );
+      }
+    }
+    super.restore();
+  }
+
+  override disconnected(): void {
+    super.disconnected();
+    this.legacy = null;
+  }
+
+  observeRequest<T>(
+    query: ObservationRequest,
+    request: (query: ObservationRequest, accept: (snapshot: T) => void) => Promise<T>,
+    signal?: AbortSignal,
+    failed?: () => void,
+  ): OwnedSubscription<T> {
+    return super.observe(
+      async (accept) => {
+        const legacy = this.legacy;
+        if (!legacy) return request(query, accept);
+        const interest = legacy.start(query);
+        const snapshot = (payload: T): T & { subscriptionId: string } => ({
+          ...payload,
+          subscriptionId: interest.id,
+        });
+        try {
+          const message = legacy.request(interest);
+          if (!message) {
+            // Broadcast-era hosts have no acknowledgement. Readiness means the
+            // local listener is attached; no server membership is being claimed.
+            const value = snapshot({
+              requestId: interest.id,
+              ...(query.type === "agent.timeline.set_subscription.request"
+                ? { agentIds: query.agentIds }
+                : {}),
+            } as T);
+            accept(value);
+            return value;
+          }
+          return snapshot(await request(message, (payload) => accept(snapshot(payload))));
+        } catch (error) {
+          const release = legacy.release(interest.id);
+          if (release && this.legacy === legacy)
+            await this.connection.send(release).catch(this.connection.failed);
+          throw error;
+        }
+      },
+      signal,
+      failed,
+    );
+  }
+
+  override owns(message: SessionOutboundMessage): boolean {
+    return this.legacy ? this.legacy.owns(message) : super.owns(message);
+  }
+
+  override receive(message: SessionOutboundMessage): void {
+    if (this.legacy) this.legacy.receive(message, (update) => super.receive(update));
+    else super.receive(message);
+  }
+
+  normalize(message: SessionOutboundMessage): SessionOutboundMessage {
+    return this.legacy?.normalize(message) ?? message;
+  }
+
+  prepareRequest(message: SessionInboundMessage) {
+    return (
+      this.legacy?.prepareRequest(message) ?? {
+        message,
+        receive: (value: SessionOutboundMessage) => value,
+        finish: async () => {},
+      }
+    );
+  }
+}
+
+// Protocol support belongs to the installed client. Only browser hosting needs
+// a resource supplied by the caller. Keep this exhaustive as the protocol evolves.
+export const DEFAULT_CLIENT_CAPABILITIES = {
+  [CLIENT_CAPS.helloRejection]: true,
+  [CLIENT_CAPS.ownedSubscriptions]: true,
+  [CLIENT_CAPS.allProviders]: true,
+  [CLIENT_CAPS.selectiveAgentTimeline]: true,
+  [CLIENT_CAPS.reasoningMergeEnum]: true,
+  [CLIENT_CAPS.customModeIcons]: true,
+  [CLIENT_CAPS.terminalReflowableSnapshot]: true,
+  [CLIENT_CAPS.providerSubagents]: true,
+  [CLIENT_CAPS.projectedSubagentTimeline]: true,
+  [CLIENT_CAPS.projectUpdates]: true,
+  [CLIENT_CAPS.compactProviderSnapshots]: true,
+  [CLIENT_CAPS.providerSnapshotReferences]: true,
+  [CLIENT_CAPS.timelineReplacementInvalidation]: true,
+  [CLIENT_CAPS.timelineNotifications]: true,
+  [CLIENT_CAPS.pluginTimelineItems]: true,
+  [CLIENT_CAPS.workspaceSetupBlocked]: true,
+  [CLIENT_CAPS.explicitEventSubscriptions]: true,
+} satisfies Record<Exclude<ClientCapability, typeof CLIENT_CAPS.browserHost>, true>;
+
+/** Calling releases demand; ready waits for membership, or local attachment on broadcast hosts. */
+export type TimelineSubscription = (() => void) & {
+  readonly ready: Promise<void>;
+  readonly subscriptionId: string | null;
+  release(): Promise<void>;
+};
diff --git a/packages/client/src/connection/legacy-workspaces.ts b/packages/client/src/connection/legacy-workspaces.ts
new file mode 100644
index 0000000000..2cf90423b5
--- /dev/null
+++ b/packages/client/src/connection/legacy-workspaces.ts
@@ -0,0 +1,176 @@
+import { AgentSnapshotPayloadSchema } from "@getpaseo/protocol/messages";
+import type { AgentSnapshotPayload, SessionOutboundMessage } from "@getpaseo/protocol/messages";
+import {
+  deriveAgentStateBucket,
+  getWorkspaceStateBucketPriority,
+} from "@getpaseo/protocol/agent-state-bucket";
+
+type AgentEntry = Extract<
+  SessionOutboundMessage,
+  { type: "fetch_agents_response" }
+>["payload"]["entries"][number];
+type Workspace = Extract<
+  SessionOutboundMessage,
+  { type: "fetch_workspaces_response" }
+>["payload"]["entries"][number];
+type WorkspaceUpdate = Extract<SessionOutboundMessage, { type: "workspace_update" }>;
+
+// Preserve the pre-registry app's identity format. This is an opaque ID, never
+// a filesystem path: converting C:\ to C: changes a drive root into a relative path.
+function legacyWorkspaceId(value: string): string {
+  return value.trim().replace(/\\/g, "/").replace(/\/+$/, "") || "/";
+}
+
+// COMPAT(legacyWorkspaceDaemon): restored in v0.8.0; remove after 2027-03-11 once daemon floor >= v0.1.97.
+// The pre-registry app grouped agents by checkout path. Keep that representation
+// at the client edge, including live updates, so app workflows need no version branch.
+export class LegacyWorkspaces {
+  private readonly agents = new Map<string, AgentEntry>();
+
+  normalize(message: SessionOutboundMessage): SessionOutboundMessage {
+    const stamp = (agent: AgentSnapshotPayload): AgentSnapshotPayload => ({
+      ...agent,
+      workspaceId: agent.workspaceId ?? legacyWorkspaceId(agent.cwd),
+    });
+    if (message.type === "fetch_agents_response")
+      return {
+        ...message,
+        payload: {
+          ...message.payload,
+          entries: message.payload.entries.map((entry) => ({
+            ...entry,
+            agent: stamp(entry.agent),
+          })),
+        },
+      };
+    if (message.type === "agent_update" && message.payload.kind === "upsert")
+      return { ...message, payload: { ...message.payload, agent: stamp(message.payload.agent) } };
+    if (
+      (message.type === "fetch_agent_response" ||
+        message.type === "fetch_agent_timeline_response" ||
+        message.type === "cancel_agent_response") &&
+      message.payload.agent
+    ) {
+      return {
+        ...message,
+        payload: { ...message.payload, agent: stamp(message.payload.agent) },
+      } as SessionOutboundMessage;
+    }
+    if (
+      message.type === "status" &&
+      (message.payload.status === "agent_created" || message.payload.status === "agent_resumed")
+    ) {
+      return {
+        ...message,
+        payload: {
+          ...message.payload,
+          agent: stamp(AgentSnapshotPayloadSchema.parse(message.payload.agent)),
+        },
+      };
+    }
+    return message;
+  }
+
+  read(entries: AgentEntry[], reset: boolean): Workspace[] {
+    if (reset) this.agents.clear();
+    for (const entry of entries) this.agents.set(entry.agent.id, entry);
+    const pageIds = new Set(entries.map(workspaceId));
+    return [...this.workspaces().values()].filter((workspace) => pageIds.has(workspace.id));
+  }
+
+  update(message: SessionOutboundMessage): WorkspaceUpdate[] {
+    if (message.type !== "agent_update") return [];
+    const before = this.workspaces();
+    const update = message.payload;
+    if (update.kind === "remove") this.agents.delete(update.agentId);
+    else {
+      const project = update.project ?? this.agents.get(update.agent.id)?.project;
+      if (update.agent.archivedAt) this.agents.delete(update.agent.id);
+      else if (project) this.agents.set(update.agent.id, { agent: update.agent, project });
+    }
+    const after = this.workspaces();
+    const changes: WorkspaceUpdate[] = [];
+    for (const [id, workspace] of after) {
+      if (JSON.stringify(before.get(id)) !== JSON.stringify(workspace))
+        changes.push({ type: "workspace_update", payload: { kind: "upsert", workspace } });
+    }
+    for (const id of before.keys())
+      if (!after.has(id))
+        changes.push({ type: "workspace_update", payload: { kind: "remove", id } });
+    return changes;
+  }
+
+  private workspaces(): Map<string, Workspace> {
+    const workspaces = new Map<string, Workspace>();
+    for (const entry of this.agents.values()) {
+      const { agent, project } = entry;
+      const { checkout } = project;
+      const id = workspaceId(entry);
+      const status = deriveAgentStateBucket({
+        status: agent.status,
+        pendingPermissionCount: agent.pendingPermissions.length,
+        requiresAttention: agent.requiresAttention,
+        attentionReason: agent.attentionReason,
+      });
+      const existing = workspaces.get(id);
+      if (
+        existing &&
+        getWorkspaceStateBucketPriority(existing.status) <= getWorkspaceStateBucketPriority(status)
+      )
+        continue;
+      workspaces.set(id, {
+        id,
+        projectId: project.projectKey,
+        projectDisplayName: project.projectName,
+        projectCustomName: null,
+        projectRootPath: checkout.mainRepoRoot ?? checkout.worktreeRoot ?? checkout.cwd,
+        workspaceDirectory: checkout.cwd,
+        projectKind: checkout.isGit ? "git" : "non_git",
+        workspaceKind: workspaceKind(checkout),
+        name: workspaceName(entry, id),
+        title: null,
+        status,
+        statusEnteredAt: agent.attentionTimestamp ?? agent.updatedAt,
+        activityAt: agent.updatedAt,
+        archivingAt: null,
+        diffStat: null,
+        scripts: [],
+        gitRuntime: gitRuntime(checkout),
+        githubRuntime: null,
+        project,
+      });
+    }
+    return workspaces;
+  }
+}
+
+function workspaceId(entry: AgentEntry): string {
+  return entry.agent.workspaceId ?? legacyWorkspaceId(entry.project.checkout.cwd);
+}
+
+function workspaceKind(checkout: AgentEntry["project"]["checkout"]): Workspace["workspaceKind"] {
+  if (!checkout.isGit) return "directory";
+  if (checkout.isPaseoOwnedWorktree) return "worktree";
+  return "checkout";
+}
+
+function workspaceName(entry: AgentEntry, id: string): string {
+  const name = entry.project.workspaceName?.trim();
+  if (name) return name;
+  const branch = entry.project.checkout.currentBranch?.trim();
+  if (branch && branch !== "HEAD") return branch;
+  return id.slice(id.lastIndexOf("/") + 1);
+}
+
+function gitRuntime(checkout: AgentEntry["project"]["checkout"]): Workspace["gitRuntime"] {
+  if (!checkout.isGit) return null;
+  return {
+    currentBranch: checkout.currentBranch,
+    remoteUrl: checkout.remoteUrl,
+    isPaseoOwnedWorktree: checkout.isPaseoOwnedWorktree,
+    isDirty: null,
+    aheadBehind: null,
+    aheadOfOrigin: null,
+    behindOfOrigin: null,
+  };
+}
diff --git a/packages/client/src/connection/legacy.ts b/packages/client/src/connection/legacy.ts
new file mode 100644
index 0000000000..5dec96e428
--- /dev/null
+++ b/packages/client/src/connection/legacy.ts
@@ -0,0 +1,282 @@
+import { SessionInboundMessageSchema } from "@getpaseo/protocol/messages";
+import { LegacyWorkspaces } from "./legacy-workspaces.js";
+import { BrowserAutomationHostCapabilitySchema } from "@getpaseo/protocol/browser-automation/capabilities";
+import type {
+  ServerInfoStatusPayload,
+  SessionInboundMessage,
+  SessionOutboundMessage,
+} from "@getpaseo/protocol/messages";
+
+export type ObservationRequest = { type: SessionInboundMessage["type"] } & Record<string, unknown>;
+interface Interest {
+  id: string;
+  query: ObservationRequest;
+}
+
+// COMPAT(ownedSubscriptions): added in v0.8.0; remove after 2027-03-11 once daemon floor >= v0.8.0.
+// Legacy directories retain their connection-wide, last-query-wins semantics.
+// IDs below identify local listeners, not independent server subscriptions.
+export class LegacySubscriptions {
+  private readonly interests = new Map<string, Interest>();
+
+  private readonly workspaces: LegacyWorkspaces | null;
+  constructor(
+    private readonly info: ServerInfoStatusPayload,
+    private readonly send: (message: ObservationRequest) => Promise<void>,
+    private readonly browserHost: unknown,
+  ) {
+    this.workspaces = info.features?.workspaceMultiplicity === true ? null : new LegacyWorkspaces();
+  }
+
+  normalize(message: SessionOutboundMessage): SessionOutboundMessage {
+    return this.workspaces?.normalize(message) ?? message;
+  }
+
+  prepareRequest(message: SessionInboundMessage): {
+    message: SessionInboundMessage;
+    receive(message: SessionOutboundMessage): SessionOutboundMessage;
+    finish(): Promise<void>;
+  } {
+    const identity = {
+      message,
+      receive: (value: SessionOutboundMessage) => value,
+      finish: async () => {},
+    };
+    const workspaces = this.workspaces;
+    if (workspaces && message.type === "fetch_workspaces_request") {
+      return {
+        ...identity,
+        message: SessionInboundMessageSchema.parse({
+          type: "fetch_agents_request",
+          requestId: message.requestId,
+          scope: "active",
+          sort: [{ key: "updated_at", direction: "desc" }],
+          page: message.page,
+          subscribe: message.subscribe,
+        }),
+        receive: (value) => {
+          if (value.type !== "fetch_agents_response") return value;
+          if (value.payload.requestId !== message.requestId) return value;
+          return {
+            type: "fetch_workspaces_response",
+            payload: {
+              ...value.payload,
+              entries: workspaces.read(value.payload.entries, !message.page?.cursor),
+              emptyProjects: [],
+            },
+          };
+        },
+      };
+    }
+    if (message.type === "subscribe_terminals_request") {
+      return {
+        ...identity,
+        receive: (value) => {
+          if (value.type !== "terminals_changed" || value.payload.cwd !== message.cwd) return value;
+          return { ...value, payload: { ...value.payload, requestId: message.requestId } };
+        },
+      };
+    }
+    if (message.type === "workspace.label.list.request" && !message.subscribe) {
+      return {
+        ...identity,
+        message: { ...message, subscribe: { subscriptionId: `legacy:${crypto.randomUUID()}` } },
+      };
+    }
+    if (message.type === "checkout.diff.get.request") {
+      const subscriptionId = `legacy:${crypto.randomUUID()}`;
+      return {
+        message: SessionInboundMessageSchema.parse({
+          ...message,
+          type: "subscribe_checkout_diff_request",
+          subscriptionId,
+        }),
+        receive: (value) => {
+          if (value.type !== "subscribe_checkout_diff_response") return value;
+          if (value.payload.requestId !== message.requestId) return value;
+          return { ...value, type: "checkout.diff.get.response" };
+        },
+        finish: () => this.send({ type: "unsubscribe_checkout_diff_request", subscriptionId }),
+      };
+    }
+    return identity;
+  }
+
+  start(query: ObservationRequest): Interest {
+    const interest = { id: `legacy:${crypto.randomUUID()}`, query };
+    this.interests.set(interest.id, interest);
+    return interest;
+  }
+
+  request({ id, query }: Interest): ObservationRequest | null {
+    switch (query.type) {
+      case "fetch_agents_request":
+      case "fetch_workspaces_request":
+      case "workspace.label.list.request":
+        return { ...query, subscribe: { subscriptionId: id } };
+      case "fs.file.subscribe.request":
+      case "subscribe_checkout_diff_request":
+        return { ...query, subscriptionId: id };
+      case "agent.timeline.set_subscription.request":
+        if (!this.info.features?.selectiveAgentTimeline) return null;
+        return { ...query, agentIds: this.members(query.type, "agentIds") };
+      case "session.events.set_subscription.request":
+        if (!this.info.features?.explicitEventSubscriptions) return null;
+        return {
+          ...query,
+          events: this.members(query.type, "events").filter(isLegacyEvent),
+        };
+      case "browser.host.register.request":
+        if (!matchesBrowserRegistration(this.browserHost, query)) {
+          throw new Error(
+            "This daemon requires browser_host registration in the client's hello capabilities",
+          );
+        }
+        return null; // Older hosts register in hello.
+      default:
+        return query;
+    }
+  }
+
+  private members(type: ObservationRequest["type"], field: string): string[] {
+    const members = new Set<string>();
+    for (const interest of this.interests.values()) {
+      if (interest.query.type !== type) continue;
+      for (const value of interest.query[field] as string[]) members.add(value);
+    }
+    return [...members].sort();
+  }
+
+  release(id: string): ObservationRequest | null {
+    const interest = this.interests.get(id);
+    if (!interest) return null;
+    this.interests.delete(id);
+    const { query } = interest;
+    switch (query.type) {
+      case "agent.timeline.set_subscription.request":
+      case "session.events.set_subscription.request":
+        return this.request(interest);
+      case "fs.file.subscribe.request":
+        return { type: "fs.file.unsubscribe.request", subscriptionId: id };
+      case "subscribe_checkout_diff_request":
+        return { type: "unsubscribe_checkout_diff_request", subscriptionId: id };
+      case "subscribe_terminal_request":
+        if (
+          [...this.interests.values()].some(
+            (item) => item.query.type === query.type && item.query.terminalId === query.terminalId,
+          )
+        )
+          return null;
+        return { type: "unsubscribe_terminal_request", terminalId: query.terminalId };
+      case "subscribe_terminals_request":
+        if (
+          [...this.interests.values()].some(
+            (item) =>
+              item.query.type === query.type &&
+              item.query.cwd === query.cwd &&
+              item.query.workspaceId === query.workspaceId,
+          )
+        )
+          return null;
+        return {
+          type: "unsubscribe_terminals_request",
+          cwd: query.cwd,
+          workspaceId: query.workspaceId,
+        };
+      default:
+        // Directory slots have no release RPC. Detach the local listener.
+        return null;
+    }
+  }
+
+  owns(message: SessionOutboundMessage): boolean {
+    return [...this.interests.values()].some((interest) => this.matches(interest, message));
+  }
+
+  receive(
+    message: SessionOutboundMessage,
+    deliver: (message: SessionOutboundMessage) => void,
+  ): void {
+    const updates: SessionOutboundMessage[] = [
+      message,
+      ...(this.workspaces?.update(message) ?? []),
+    ];
+    if (message.type === "agent_stream" && message.payload.event.type === "attention_required") {
+      const { agentId, event } = message.payload;
+      updates.push({
+        type: "agent_attention_required",
+        payload: {
+          agentId,
+          reason: event.reason,
+          timestamp: event.timestamp,
+          shouldNotify: event.shouldNotify,
+          ...(event.notification ? { notification: event.notification } : {}),
+        },
+      });
+    }
+    for (const update of updates)
+      for (const interest of this.interests.values()) {
+        if (!this.matches(interest, update)) continue;
+        // Normalize at the connection edge; all consumers receive the same handle shape.
+        deliver(
+          ("payload" in update
+            ? { ...update, payload: { ...update.payload, subscriptionId: interest.id } }
+            : { ...update, subscriptionId: interest.id }) as SessionOutboundMessage,
+        );
+      }
+  }
+
+  private matches({ id, query }: Interest, message: SessionOutboundMessage): boolean {
+    switch (query.type) {
+      case "fetch_agents_request":
+        return message.type === "agent_update";
+      case "fetch_workspaces_request":
+        return message.type === "workspace_update";
+      case "workspace.label.list.request":
+        return message.type === "workspace.label.update";
+      case "fs.file.subscribe.request":
+        return message.type === "fs.file.update" && message.payload.subscriptionId === id;
+      case "subscribe_checkout_diff_request":
+        return message.type === "checkout_diff_update" && message.payload.subscriptionId === id;
+      case "subscribe_terminals_request":
+        return message.type === "terminals_changed" && message.payload.cwd === query.cwd;
+      case "subscribe_terminal_request":
+        return (
+          message.type === "terminal_stream_exit" && message.payload.terminalId === query.terminalId
+        );
+      case "agent.timeline.set_subscription.request":
+        return (
+          (message.type === "agent_stream" || message.type === "agent.timeline.replacement") &&
+          (query.agentIds as string[]).includes(message.payload.agentId)
+        );
+      case "session.events.set_subscription.request":
+        return (query.events as string[]).includes(
+          message.type === "status" ? `status.${message.payload.status}` : message.type,
+        );
+      case "browser.host.register.request":
+        return message.type === "browser.automation.execute.request";
+      default:
+        return false;
+    }
+  }
+}
+
+function isLegacyEvent(event: string): boolean {
+  return [
+    "project.update",
+    "providers_snapshot_update",
+    "agent_attention_required",
+    "agent_permission_request",
+    "agent_permission_resolved",
+  ].includes(event);
+}
+
+function matchesBrowserRegistration(advertised: unknown, request: ObservationRequest): boolean {
+  const host = BrowserAutomationHostCapabilitySchema.safeParse(advertised);
+  if (!host.success) return false;
+  if (host.data.hostKind !== request.hostKind) return false;
+  for (const command of request.supportedCommands as string[]) {
+    if (!host.data.supportedCommands.some((supported) => supported === command)) return false;
+  }
+  return true;
+}
diff --git a/packages/client/src/connection/owned.test.ts b/packages/client/src/connection/owned.test.ts
new file mode 100644
index 0000000000..eca52f1749
--- /dev/null
+++ b/packages/client/src/connection/owned.test.ts
@@ -0,0 +1,129 @@
+import { expect, test } from "vitest";
+import { OwnedSubscriptions } from "./owned.js";
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
+
+interface Snapshot {
+  subscriptionId: string;
+  requestId: string;
+}
+
+function connection() {
+  const released: string[] = [];
+  const failures: unknown[] = [];
+  const requests: Array<(id: string) => void> = [];
+  const subscriptions = new OwnedSubscriptions({
+    release: async (id) => {
+      released.push(id);
+    },
+    failed: (error) => {
+      failures.push(error);
+    },
+  });
+  subscriptions.restore();
+  return {
+    subscriptions,
+    released,
+    failures,
+    requests,
+    observe: (signal?: AbortSignal) =>
+      subscriptions.observe<Snapshot>(
+        (accept) =>
+          new Promise((resolve) => {
+            requests.push((subscriptionId) => {
+              const snapshot = { subscriptionId, requestId: `request-${requests.length}` };
+              accept(snapshot);
+              resolve(snapshot);
+            });
+          }),
+        signal,
+      ),
+  };
+}
+
+function update(subscriptionId: string, seq: number): SessionOutboundMessage {
+  return {
+    type: "agent_update",
+    payload: { kind: "remove", agentId: `agent-${seq}`, subscriptionId, seq },
+  };
+}
+
+test("a caller consuming the snapshot later receives its buffered updates in order", async () => {
+  const c = connection();
+  const a = c.observe();
+  const b = c.observe();
+  c.requests[0]!("a");
+  c.requests[1]!("b");
+  c.subscriptions.receive(update("a", 1));
+  c.subscriptions.receive(update("b", 2));
+  await a.ready;
+  const seen: string[] = [];
+  a.subscribe({
+    snapshot: (s) => seen.push(s.subscriptionId),
+    update: (m) => seen.push(JSON.stringify(m)),
+  });
+  expect(seen).toEqual(["a", JSON.stringify(update("a", 1))]);
+  await a.release();
+  c.subscriptions.receive(update("a", 3));
+  expect(seen).toHaveLength(2);
+  expect(c.released).toEqual(["a"]);
+  expect(b.subscriptionId).toBe("b");
+  await b.release();
+});
+
+test("cancellation before the ID waits for bootstrap and releases exactly that ID", async () => {
+  const c = connection();
+  const abort = new AbortController();
+  const handle = c.observe(abort.signal);
+  abort.abort();
+  const released = handle.release();
+  expect(c.released).toEqual([]);
+  c.requests[0]!("cancelled");
+  await released;
+  await expect(handle.ready).rejects.toThrow("released");
+  expect(c.released).toEqual(["cancelled"]);
+});
+
+test("surviving handles use new remote IDs after reconnect and released handles stay gone", async () => {
+  const c = connection();
+  const a = c.observe();
+  const b = c.observe();
+  c.requests[0]!("old-a");
+  c.requests[1]!("old-b");
+  await Promise.all([a.ready, b.ready]);
+  await b.release();
+  const seen: string[] = [];
+  a.subscribe({ snapshot: (s) => seen.push(s.subscriptionId), update: () => seen.push("update") });
+  c.subscriptions.disconnected();
+  c.subscriptions.restore();
+  expect(c.requests).toHaveLength(3);
+  c.requests[2]!("new-a");
+  c.subscriptions.receive(update("old-a", 1));
+  c.subscriptions.receive(update("new-a", 2));
+  expect(seen).toEqual(["old-a", "new-a", "update"]);
+  expect(a.subscriptionId).toBe("new-a");
+  await a.release();
+});
+
+test("a late listener after bounded replay overflow gets a fresh snapshot", async () => {
+  const c = connection();
+  const handle = c.observe();
+  c.requests[0]!("old");
+  await handle.ready;
+  const first: string[] = [];
+  handle.subscribe({ snapshot: (s) => first.push(s.subscriptionId), update: () => {} });
+  for (let seq = 0; seq < 129; seq++) c.subscriptions.receive(update("old", seq));
+  const late: string[] = [];
+  handle.subscribe({
+    snapshot: (s) => late.push(s.subscriptionId),
+    update: () => late.push("update"),
+  });
+  await expect.poll(() => c.requests.length).toBe(2);
+  expect(c.released).toEqual(["old"]);
+  expect(late).toEqual([]);
+  c.requests[1]!("fresh");
+  c.subscriptions.receive(update("old", 130));
+  c.subscriptions.receive(update("fresh", 131));
+  expect(first).toEqual(["old", "fresh"]);
+  expect(late).toEqual(["fresh", "update"]);
+  await handle.release();
+});
diff --git a/packages/client/src/connection/owned.ts b/packages/client/src/connection/owned.ts
new file mode 100644
index 0000000000..56bf6b98f0
--- /dev/null
+++ b/packages/client/src/connection/owned.ts
@@ -0,0 +1,235 @@
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
+
+export type SubscriptionSnapshot<T> = T & { subscriptionId: string };
+
+export interface SubscriptionObserver<T> {
+  snapshot(snapshot: T): void;
+  update(message: SessionOutboundMessage): void;
+  error?(error: unknown): void;
+}
+
+/** A stable local lifetime. IDs change on reconnect; legacy IDs identify local listeners only. */
+export interface OwnedSubscription<T> {
+  readonly subscriptionId: string | null;
+  readonly ready: Promise<SubscriptionSnapshot<T>>;
+  subscribe(observer: SubscriptionObserver<SubscriptionSnapshot<T>>): () => void;
+  release(): Promise<void>;
+}
+
+interface Registration {
+  start(): void;
+  disconnected(): void;
+  receive(message: SessionOutboundMessage): void;
+  release(): Promise<void>;
+}
+
+export interface OwnedSubscriptionsHost {
+  release(subscriptionId: string): Promise<void>;
+  failed(error: unknown): void;
+}
+
+const MAX_BOOTSTRAP_UPDATES = 128;
+
+/** Transport routing and lifetime only; query semantics remain with each domain. */
+export class OwnedSubscriptions {
+  private readonly registrations = new Set<Registration>();
+  private readonly routes = new Map<string, Registration>();
+  private generation = 0;
+  private connected = false;
+
+  constructor(private readonly host: OwnedSubscriptionsHost) {}
+
+  observe<T>(
+    request: (accept: (snapshot: T) => void) => Promise<T>,
+    signal?: AbortSignal,
+    requestFailed?: () => void,
+  ): OwnedSubscription<T> {
+    let id: string | null = null;
+    let snapshot: SubscriptionSnapshot<T> | undefined;
+    let pending: Promise<void> | null = null;
+    let teardown: Promise<void> | null = null;
+    let disposed = false;
+    let overflow = false;
+    const buffered: SessionOutboundMessage[] = [];
+    const observers = new Set<SubscriptionObserver<SubscriptionSnapshot<T>>>();
+    let resolve!: (snapshot: SubscriptionSnapshot<T>) => void;
+    let reject!: (error: unknown) => void;
+    const ready = new Promise<SubscriptionSnapshot<T>>((accept, fail) => {
+      resolve = accept;
+      reject = fail;
+    });
+    void ready.catch(() => {});
+
+    const deliver = (
+      observer: SubscriptionObserver<SubscriptionSnapshot<T>>,
+      message?: SessionOutboundMessage,
+    ) => {
+      try {
+        if (message) observer.update(message);
+        else if (snapshot) observer.snapshot(snapshot);
+      } catch (error) {
+        this.host.failed(error);
+      }
+    };
+    const releaseId = async () => {
+      const released = id;
+      id = null;
+      if (!released) return;
+      this.routes.delete(released);
+      await this.host.release(released);
+    };
+    const registration: Registration = {
+      start: () => {
+        if (disposed || pending || id || !this.connected) return;
+        const generation = this.generation;
+        pending = request((value) => {
+          if (generation !== this.generation) return;
+          assertSubscriptionSnapshot(value);
+          id = value.subscriptionId;
+          snapshot = value;
+          buffered.length = 0;
+          overflow = false;
+          if (disposed) return;
+          this.routes.set(id, registration);
+          for (const observer of observers) deliver(observer);
+        })
+          .then(() => {
+            if (generation === this.generation && !disposed) {
+              if (!snapshot) throw new Error("The host omitted its subscription snapshot");
+              resolve(snapshot);
+            }
+            return undefined;
+          })
+          .catch((error) => {
+            if (generation !== this.generation) return;
+            reject(error);
+            for (const observer of observers) {
+              try {
+                observer.error?.(error);
+              } catch (failure) {
+                this.host.failed(failure);
+              }
+            }
+            void handle.release().catch(this.host.failed);
+            this.host.failed(error);
+            requestFailed?.();
+            return undefined;
+          })
+          .finally(() => {
+            pending = null;
+            if (generation !== this.generation && !disposed) registration.start();
+          });
+      },
+      disconnected: () => {
+        id = null;
+        snapshot = undefined;
+        buffered.length = 0;
+        overflow = false;
+      },
+      receive: (message) => {
+        if (disposed || ("payload" in message && Object.is(message.payload, snapshot))) return;
+        if (buffered.length < MAX_BOOTSTRAP_UPDATES && !overflow) buffered.push(message);
+        else {
+          buffered.length = 0;
+          overflow = true;
+        }
+        for (const observer of observers) deliver(observer, message);
+      },
+      release: () => {
+        if (teardown) return teardown;
+        disposed = true;
+        signal?.removeEventListener("abort", abort);
+        observers.clear();
+        buffered.length = 0;
+        if (id) this.routes.delete(id);
+        reject(new Error("Subscription released"));
+        teardown = (async () => {
+          await pending;
+          await releaseId();
+          this.registrations.delete(registration);
+        })();
+        return teardown;
+      },
+    };
+    const abort = () => {
+      void handle.release().catch(this.host.failed);
+    };
+    const handle: OwnedSubscription<T> = {
+      get subscriptionId() {
+        return id;
+      },
+      ready,
+      release: registration.release,
+      subscribe: (observer) => {
+        if (disposed) throw new Error("Subscription released");
+        observers.add(observer);
+        if (overflow) {
+          overflow = false;
+          snapshot = undefined;
+          void releaseId()
+            .then(() => {
+              registration.start();
+              return undefined;
+            })
+            .catch(this.host.failed);
+        } else {
+          deliver(observer);
+          for (const message of buffered) deliver(observer, message);
+        }
+        return () => {
+          observers.delete(observer);
+        };
+      },
+    };
+    this.registrations.add(registration);
+    if (signal?.aborted) abort();
+    else {
+      signal?.addEventListener("abort", abort, { once: true });
+      registration.start();
+    }
+    return handle;
+  }
+
+  owns(message: SessionOutboundMessage): boolean {
+    const payload = "payload" in message ? message.payload : message;
+    return (
+      "subscriptionId" in payload &&
+      typeof payload.subscriptionId === "string" &&
+      this.routes.has(payload.subscriptionId)
+    );
+  }
+
+  receive(message: SessionOutboundMessage): void {
+    const payload = "payload" in message ? message.payload : message;
+    if ("subscriptionId" in payload && typeof payload.subscriptionId === "string")
+      this.routes.get(payload.subscriptionId)?.receive(message);
+  }
+
+  restore(): void {
+    this.connected = true;
+    for (const registration of this.registrations) registration.start();
+  }
+
+  disconnected(): void {
+    this.connected = false;
+    this.generation++;
+    this.routes.clear();
+    for (const registration of this.registrations) registration.disconnected();
+  }
+
+  async close(): Promise<void> {
+    await Promise.all([...this.registrations].map((registration) => registration.release()));
+  }
+}
+
+function assertSubscriptionSnapshot(value: unknown): asserts value is { subscriptionId: string } {
+  if (
+    value &&
+    typeof value === "object" &&
+    "subscriptionId" in value &&
+    typeof value.subscriptionId === "string" &&
+    value.subscriptionId
+  )
+    return;
+  throw new Error("The host omitted its subscription ID");
+}
diff --git a/packages/client/src/creation/index.test.ts b/packages/client/src/creation/index.test.ts
new file mode 100644
index 0000000000..1ce46107e4
--- /dev/null
+++ b/packages/client/src/creation/index.test.ts
@@ -0,0 +1,224 @@
+import { expect, test } from "vitest";
+import type {
+  AgentSnapshotPayload,
+  CreationSnapshot,
+  WorkspaceDescriptorPayload,
+} from "@getpaseo/protocol/messages";
+import { CreationClient, type CreationResult } from "./index.js";
+
+const workspace: WorkspaceDescriptorPayload = {
+  id: "wks_0123456789abcdef",
+  projectId: "project",
+  projectDisplayName: "Project",
+  projectRootPath: "/project",
+  workspaceDirectory: "/project/worktree",
+  projectKind: "git",
+  workspaceKind: "worktree",
+  name: "Worktree",
+  status: "running",
+  statusEnteredAt: null,
+  activityAt: null,
+  archivingAt: null,
+  scripts: [],
+};
+const agent: AgentSnapshotPayload = {
+  id: "00000000-0000-4000-8000-000000000001",
+  workspaceId: workspace.id,
+  provider: "codex",
+  cwd: "/project/worktree",
+  model: null,
+  createdAt: "2026-09-11T00:00:00Z",
+  updatedAt: "2026-09-11T00:00:00Z",
+  lastUserMessageAt: null,
+  status: "idle",
+  capabilities: {
+    supportsStreaming: true,
+    supportsSessionPersistence: true,
+    supportsDynamicModes: false,
+    supportsMcpServers: false,
+    supportsReasoningStream: false,
+    supportsToolInvocations: true,
+    supportsRewindConversation: false,
+    supportsRewindFiles: false,
+    supportsRewindBoth: false,
+  },
+  currentModeId: null,
+  availableModes: [],
+  pendingPermissions: [],
+  persistence: null,
+  title: "Start once",
+  labels: {},
+};
+
+function fixture(modern: boolean) {
+  const requests: Array<{ kind: string; input: Record<string, unknown> }> = [];
+  const legacy: Array<{ kind: string; input: unknown }> = [];
+  let resolve!: (result: CreationResult) => void;
+  const result = new Promise<CreationResult>((done) => {
+    resolve = done;
+  });
+  const client = new CreationClient({
+    supports: (feature) => (feature === "creationLifecycle" ? modern : true),
+    requestId: () => "generated-key",
+    request: async (kind, input) => {
+      requests.push({ kind, input });
+      return result;
+    },
+    observe: () => () => {},
+    legacyWorkspace: async (input) => {
+      legacy.push({ kind: "workspace", input });
+      return { requestId: "legacy-workspace", workspace, error: null, setupTerminalId: null };
+    },
+    legacyAgent: async (input) => {
+      legacy.push({ kind: "agent", input });
+      return agent;
+    },
+  });
+  const input = {
+    idempotencyKey: "intent-one",
+    source: { kind: "directory" as const, path: "/project" },
+    agent: {
+      config: { provider: "codex", cwd: "/project" },
+      initialPrompt: "Start once",
+      clientMessageId: "message-one",
+    },
+  };
+  return { client, requests, legacy, resolve, input };
+}
+
+test("duplicate client submissions join one complete intent and cumulative updates never regress", async () => {
+  const f = fixture(true);
+  const phases: string[] = [];
+  const first = f.client.createWorkspace({
+    ...f.input,
+    onEvent: (snapshot) => phases.push(snapshot.phase),
+  });
+  const duplicate = f.client.createWorkspace(f.input);
+  expect(duplicate).toBe(first);
+  expect(f.requests).toEqual([{ kind: "workspace", input: { ...f.input, subscribe: true } }]);
+  await expect(
+    f.client.createWorkspace({
+      ...f.input,
+      agent: { ...f.input.agent, initialPrompt: "Different intent" },
+    }),
+  ).rejects.toThrow("workspace_request_key_conflict");
+  const snapshot: CreationSnapshot = {
+    kind: "workspace",
+    idempotencyKey: "intent-one",
+    revision: 2,
+    phase: "workspace_ready",
+    workspaceId: workspace.id,
+    agentId: agent.id,
+    workspace,
+    error: null,
+  };
+  f.client.receive(snapshot);
+  f.client.receive({ ...snapshot, revision: 1, phase: "accepted" });
+  expect(phases).toEqual(["workspace_ready"]);
+  const late: string[] = [];
+  f.client.createWorkspace({ ...f.input, onEvent: (update) => late.push(update.phase) });
+  expect(late).toEqual(["workspace_ready"]);
+  f.resolve({
+    workspace,
+    agent,
+    error: null,
+    setupSkippedReason: "Untrusted source",
+    requestId: "response-one",
+  });
+  expect(await first).toMatchObject({
+    workspace,
+    agent,
+    setupSkippedReason: "Untrusted source",
+    requestId: "response-one",
+  });
+  expect(await duplicate).toEqual(await first);
+  expect(f.legacy).toEqual([]);
+  f.client.close();
+});
+
+test("legacy adaptation keeps workspace, agent and initial prompt sequencing inside the client", async () => {
+  const f = fixture(false);
+  const phases: string[] = [];
+  const result = await f.client.createWorkspace({
+    ...f.input,
+    onEvent: (snapshot) => phases.push(snapshot.phase),
+  });
+  expect(result).toMatchObject({ workspace, agent, error: null });
+  expect(phases).toEqual(["workspace_ready"]);
+  expect(f.legacy).toEqual([
+    { kind: "workspace", input: { idempotencyKey: "intent-one", source: f.input.source } },
+    {
+      kind: "agent",
+      input: {
+        config: { provider: "codex", cwd: workspace.workspaceDirectory },
+        workspaceId: workspace.id,
+        initialPrompt: "Start once",
+        clientMessageId: "message-one",
+      },
+    },
+  ]);
+  expect(f.requests).toEqual([]);
+  f.client.close();
+});
+
+test("legacy daemons cannot silently replace caller-selected IDs", async () => {
+  const f = fixture(false);
+  await expect(f.client.createWorkspace({ ...f.input, workspaceId: workspace.id })).rejects.toThrow(
+    "caller-selected",
+  );
+  await expect(
+    f.client.createAgent({ agentId: agent.id, config: f.input.agent.config }),
+  ).rejects.toThrow("caller-selected");
+  expect(f.legacy).toEqual([]);
+  f.client.close();
+});
+
+test("keyed creation with an empty prompt works on legacy daemons without sending an empty message", async () => {
+  const f = fixture(false);
+  await f.client.createAgent({
+    idempotencyKey: "empty-agent",
+    config: f.input.agent.config,
+    initialPrompt: "",
+  });
+  expect(f.legacy).toEqual([
+    {
+      kind: "agent",
+      input: { idempotencyKey: "empty-agent", config: f.input.agent.config, initialPrompt: "" },
+    },
+  ]);
+  f.client.close();
+});
+
+test.each([
+  ["/repo/project", "/repo/project/../outside"],
+  ["C:\\repo\\project", "C:\\repo\\project\\..\\outside"],
+])("legacy creation rejects escaping %s before creating a workspace", async (source, cwd) => {
+  const f = fixture(false);
+  await expect(
+    f.client.createWorkspace({
+      ...f.input,
+      source: { kind: "directory", path: source },
+      agent: { ...f.input.agent, config: { provider: "codex", cwd } },
+    }),
+  ).rejects.toThrow("inside the workspace source");
+  expect(f.legacy).toEqual([]);
+  f.client.close();
+});
+
+test.each([
+  { source: { kind: "directory" as const, path: "/project" }, cwd: "/project/src" },
+  { source: { kind: "directory" as const, path: "C:\\project" }, cwd: "C:\\project\\src" },
+  { source: { kind: "worktree" as const, projectId: "project" }, cwd: "/project/src" },
+])("legacy creation preserves the agent subdirectory for $source", async ({ source, cwd }) => {
+  const f = fixture(false);
+  await f.client.createWorkspace({
+    ...f.input,
+    source,
+    agent: { config: { provider: "codex", cwd } },
+  });
+  expect(f.legacy[1]).toMatchObject({
+    kind: "agent",
+    input: { workspaceId: workspace.id, config: { cwd: "/project/worktree/src" } },
+  });
+  f.client.close();
+});
diff --git a/packages/client/src/creation/index.ts b/packages/client/src/creation/index.ts
new file mode 100644
index 0000000000..fd9db1d9df
--- /dev/null
+++ b/packages/client/src/creation/index.ts
@@ -0,0 +1,259 @@
+import type {
+  AgentSnapshotPayload,
+  CreationSnapshot,
+  WorkspaceCreateResponse,
+} from "@getpaseo/protocol/messages";
+import type { CreateAgentRequestOptions, CreateWorkspaceRequestOptions } from "../daemon-client.js";
+
+type Kind = CreationSnapshot["kind"];
+type Observer = (snapshot: CreationSnapshot) => void;
+export interface CreationResult {
+  agent?: AgentSnapshotPayload | null;
+  workspace?: WorkspaceCreateResponse["payload"]["workspace"];
+  creation?: CreationSnapshot;
+  error: string | null;
+  errorCode?: string;
+  setupTerminalId?: string | null;
+  setupSkippedReason?: string;
+  requestId?: string;
+}
+interface Dependencies {
+  supports: (feature: "creationLifecycle" | "agentRequestReceipts") => boolean;
+  requestId: () => string;
+  request: (kind: Kind, input: Record<string, unknown>) => Promise<CreationResult>;
+  observe: (
+    kind: Kind,
+    key: string,
+    next: (snapshot: CreationSnapshot | null) => void,
+    error: (error: unknown) => void,
+  ) => () => void;
+  legacyAgent: (input: CreateAgentRequestOptions) => Promise<AgentSnapshotPayload>;
+  legacyWorkspace: (
+    input: CreateWorkspaceRequestOptions,
+  ) => Promise<WorkspaceCreateResponse["payload"]>;
+}
+interface Operation {
+  kind: Kind;
+  key: string;
+  fingerprint: string;
+  input: Record<string, unknown>;
+  observers: Set<Observer>;
+  snapshot?: CreationSnapshot;
+  result: Promise<CreationResult>;
+  resolve: (result: CreationResult) => void;
+  reject: (error: Error) => void;
+  settled: boolean;
+  modern: boolean;
+  recovering: boolean;
+  stopObserving?: () => void;
+}
+
+/** Client-owned observation and compatibility. UI callbacks never advance creation. */
+export class CreationClient {
+  private readonly operations = new Map<string, Operation>();
+  constructor(private readonly deps: Dependencies) {}
+
+  createAgent(input: CreateAgentRequestOptions): Promise<CreationResult> {
+    const { onEvent, ...request } = input;
+    return this.start("agent", request, onEvent, () => this.legacyAgent(request));
+  }
+  createWorkspace(input: CreateWorkspaceRequestOptions): Promise<CreationResult> {
+    const { onEvent, ...request } = input;
+    return this.start("workspace", request, onEvent, async (operation) => {
+      if (request.workspaceId || request.agent?.agentId)
+        throw new Error("Update the host to use caller-selected creation IDs.");
+      const { agent, ...workspaceInput } = request;
+      const sourceCwd =
+        request.source.kind === "directory" ? request.source.path : request.source.cwd;
+      const relativeCwd =
+        agent && sourceCwd ? relativeDirectory(agent.config!.cwd, sourceCwd) : undefined;
+      const workspace = await this.deps.legacyWorkspace(workspaceInput);
+      if (workspace.error || !workspace.workspace) return workspace;
+      this.receive({
+        kind: "workspace",
+        idempotencyKey: operation.key,
+        revision: 1,
+        phase: "workspace_ready",
+        workspaceId: workspace.workspace.id,
+        agentId: null,
+        workspace: workspace.workspace,
+        setupSkippedReason: workspace.setupSkippedReason,
+        error: null,
+      });
+      if (!agent) return workspace;
+      const cwd = `${workspace.workspace.workspaceDirectory!.replace(/[\\/]+$/, "")}${
+        relativeCwd ?? relativeDirectory(agent.config!.cwd, workspace.workspace.projectRootPath)
+      }`;
+      const created = await this.legacyAgent({
+        ...agent,
+        config: { ...agent.config!, cwd },
+        workspaceId: workspace.workspace.id,
+        idempotencyKey: `${operation.key}:agent`,
+      });
+      return { ...workspace, agent: created.agent };
+    });
+  }
+
+  private async legacyAgent(input: CreateAgentRequestOptions): Promise<CreationResult> {
+    if (input.agentId) throw new Error("Update the host to use caller-selected creation IDs.");
+    const { idempotencyKey: _key, ...unkeyed } = input;
+    const hasPrompt = Boolean(
+      input.initialPrompt || input.images?.length || input.attachments?.length,
+    );
+    // COMPAT(creationLifecycle): added in v0.8.0, remove after 2027-03-11 once the daemon floor supports creationLifecycle.
+    // Preserve the original create-and-prompt RPC: old hosts use its prompt for
+    // titles, creation context and startup. Their keyed create cannot accept it.
+    const request = !hasPrompt && this.deps.supports("agentRequestReceipts") ? input : unkeyed;
+    return { agent: await this.deps.legacyAgent(request), error: null };
+  }
+
+  private start(
+    kind: Kind,
+    input: Record<string, unknown>,
+    observer: Observer | undefined,
+    legacy: (operation: Operation) => Promise<CreationResult>,
+  ): Promise<CreationResult> {
+    const key =
+      typeof input.idempotencyKey === "string" ? input.idempotencyKey : this.deps.requestId();
+    const identity = JSON.stringify([kind, key]);
+    const { requestId: _requestId, ...intent } = input;
+    const fingerprint = JSON.stringify(intent, (_key, value: unknown) =>
+      value && typeof value === "object" && !Array.isArray(value)
+        ? Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)))
+        : value,
+    );
+    const previous = this.operations.get(identity);
+    if (previous) {
+      if (previous.fingerprint !== fingerprint)
+        return Promise.reject(new Error(`${kind}_request_key_conflict`));
+      if (observer) {
+        previous.observers.add(observer);
+        if (previous.snapshot) this.notify(observer, previous.snapshot);
+      }
+      return previous.result;
+    }
+    let resolve!: Operation["resolve"];
+    let reject!: Operation["reject"];
+    const result = new Promise<CreationResult>((done, fail) => {
+      resolve = done;
+      reject = fail;
+    });
+    const operation: Operation = {
+      kind,
+      key,
+      input: { ...input, idempotencyKey: key },
+      fingerprint,
+      observers: new Set(observer ? [observer] : []),
+      result,
+      resolve,
+      reject,
+      settled: false,
+      modern: this.deps.supports("creationLifecycle"),
+      recovering: false,
+    };
+    this.operations.set(identity, operation);
+    if (operation.modern) void this.submit(operation);
+    else
+      void legacy(operation).then(
+        (value) => this.finish(operation, value),
+        (error) => this.fail(operation, error),
+      );
+    return result;
+  }
+
+  private async submit(operation: Operation): Promise<void> {
+    try {
+      const result = await this.deps.request(operation.kind, {
+        ...operation.input,
+        subscribe: true,
+      });
+      if (result.creation) this.receive(result.creation);
+      this.finish(operation, result);
+    } catch (error) {
+      if (
+        operation.settled ||
+        (error instanceof Error && "code" in error && error.code === "DAEMON_CONNECTION_LOST")
+      )
+        return;
+      this.fail(operation, error);
+    }
+  }
+  receive(snapshot: CreationSnapshot): void {
+    const operation = this.operations.get(JSON.stringify([snapshot.kind, snapshot.idempotencyKey]));
+    if (!operation || (operation.snapshot && operation.snapshot.revision > snapshot.revision))
+      return;
+    if (operation.snapshot?.revision !== snapshot.revision) {
+      operation.snapshot = snapshot;
+      for (const observer of operation.observers) this.notify(observer, snapshot);
+    }
+    if (operation.recovering && (snapshot.phase === "completed" || snapshot.phase === "failed")) {
+      this.finish(operation, {
+        agent: snapshot.agent,
+        workspace: snapshot.workspace,
+        creation: snapshot,
+        setupSkippedReason: snapshot.setupSkippedReason,
+        error: snapshot.error,
+        errorCode: snapshot.errorCode,
+      });
+    }
+  }
+  reconnect(): void {
+    for (const operation of this.operations.values()) {
+      if (operation.settled || !operation.modern || operation.recovering) continue;
+      operation.recovering = true;
+      operation.stopObserving = this.deps.observe(
+        operation.kind,
+        operation.key,
+        (snapshot) => {
+          if (!snapshot) void this.submit(operation);
+          else {
+            // Re-subscription is authoritative even if its revision matches the last live event.
+            this.receive(snapshot);
+          }
+        },
+        (error) => this.fail(operation, error),
+      );
+    }
+  }
+  close(): void {
+    for (const operation of this.operations.values())
+      if (!operation.settled) this.fail(operation, new Error("Daemon client closed"));
+    this.operations.clear();
+  }
+  private finish(operation: Operation, result: CreationResult): void {
+    if (operation.settled) return;
+    operation.settled = true;
+    operation.stopObserving?.();
+    operation.resolve(result);
+    operation.observers.clear();
+    this.operations.delete(JSON.stringify([operation.kind, operation.key]));
+  }
+  private fail(operation: Operation, error: unknown): void {
+    if (operation.settled) return;
+    operation.settled = true;
+    operation.stopObserving?.();
+    operation.reject(error instanceof Error ? error : new Error(String(error)));
+    operation.observers.clear();
+    this.operations.delete(JSON.stringify([operation.kind, operation.key]));
+  }
+  private notify(observer: Observer, snapshot: CreationSnapshot): void {
+    try {
+      observer(snapshot);
+    } catch {
+      /* Observation does not control execution. */
+    }
+  }
+}
+
+function relativeDirectory(cwd: string, source: string): string {
+  const normalize = (value: string) => value.replace(/\\/g, "/").replace(/\/+$/, "");
+  const normalized = normalize(cwd),
+    root = normalize(source);
+  // Parent traversal must never survive mapping into the newly created checkout.
+  if ([normalized, root].some((path) => path.split("/").includes("..")))
+    throw new Error("Agent directory must be inside the workspace source");
+  if (normalized === root) return "";
+  if (!normalized.startsWith(`${root}/`))
+    throw new Error("Agent directory must be inside the workspace source");
+  return normalized.slice(root.length);
+}
diff --git a/packages/client/src/daemon-client-relay-e2ee-transport.ts b/packages/client/src/daemon-client-relay-e2ee-transport.ts
index 88f359f3ca..1bc175bf1b 100644
--- a/packages/client/src/daemon-client-relay-e2ee-transport.ts
+++ b/packages/client/src/daemon-client-relay-e2ee-transport.ts
@@ -20,12 +20,19 @@ export function createRelayE2eeTransportFactory(args: {
   daemonPublicKeyB64: string;
   logger: TransportLogger;
 }): DaemonTransportFactory {
-  return ({ url, headers }) => {
-    const base = args.baseFactory({ url, headers });
+  return ({ url }) => {
+    const base = args.baseFactory({ url });
     return createEncryptedTransport(base, args.daemonPublicKeyB64, args.logger);
   };
 }
 
+export function createRelayTransportFactory(
+  baseFactory: DaemonTransportFactory,
+): DaemonTransportFactory {
+  // The relay upgrade precedes E2EE. Only the encrypted hello may carry daemon credentials.
+  return ({ url }) => baseFactory({ url });
+}
+
 export function createEncryptedTransport(
   base: DaemonTransport,
   daemonPublicKeyB64: string,
diff --git a/packages/client/src/daemon-client-transport.test.ts b/packages/client/src/daemon-client-transport.test.ts
index 378275c673..6f80717dd1 100644
--- a/packages/client/src/daemon-client-transport.test.ts
+++ b/packages/client/src/daemon-client-transport.test.ts
@@ -21,7 +21,7 @@ describe("daemon-client transport helpers", () => {
     createClientChannelMock.mockReset();
     createClientChannelMock.mockRejectedValueOnce(new Error("handshake failed"));
 
-    let openHandler: (() => void) | null = null;
+    const connection: { open: (() => void) | null } = { open: null };
     const close = vi.fn();
 
     createEncryptedTransport(
@@ -29,10 +29,10 @@ describe("daemon-client transport helpers", () => {
         send: vi.fn(),
         close,
         onOpen: (handler) => {
-          openHandler = handler;
+          connection.open = handler;
           return () => {
-            if (openHandler === handler) {
-              openHandler = null;
+            if (connection.open === handler) {
+              connection.open = null;
             }
           };
         },
@@ -44,8 +44,8 @@ describe("daemon-client transport helpers", () => {
       { warn: vi.fn() },
     );
 
-    expect(openHandler).not.toBeNull();
-    openHandler?.();
+    expect(connection.open).not.toBeNull();
+    connection.open?.();
 
     await vi.waitFor(() => {
       expect(close).toHaveBeenCalledWith(4001, "E2EE handshake failed");
diff --git a/packages/client/src/daemon-client-transport.ts b/packages/client/src/daemon-client-transport.ts
index 05bd08bbc6..01933fd1ec 100644
--- a/packages/client/src/daemon-client-transport.ts
+++ b/packages/client/src/daemon-client-transport.ts
@@ -17,6 +17,7 @@ export {
 export {
   createEncryptedTransport,
   createRelayE2eeTransportFactory,
+  createRelayTransportFactory,
 } from "./daemon-client-relay-e2ee-transport.js";
 export {
   bindWsHandler,
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index 149e6b0040..95921a96a0 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -1,8 +1,11 @@
+import { readFileSync } from "node:fs";
 import { afterEach, expect, expectTypeOf, test, vi } from "vitest";
 import { z } from "zod";
 import {
   DaemonClient,
+  supportsUsageReports,
   type DaemonClientTrace,
+  type CreateAgentRequestOptions,
   type DaemonTransport,
   type Logger,
 } from "./daemon-client";
@@ -14,9 +17,6 @@ import {
   FileTransferOpcode,
 } from "@getpaseo/protocol/binary-frames/index";
 import {
-  asUint8Array,
-  decodeTerminalResizePayload,
-  decodeTerminalStreamFrame,
   encodeTerminalSnapshotPayload,
   encodeTerminalStreamFrame,
   TerminalStreamOpcode,
@@ -79,7 +79,7 @@ function createMockTransport() {
     },
     close: () => {},
     onMessage: (handler) => {
-      onMessage = handler;
+      onMessage = (data) => handler(data, typeof data !== "string");
       return () => {};
     },
     onOpen: (handler) => {
@@ -115,7 +115,7 @@ function createMockTransport() {
               serverId: `srv_test_${serverInfoOrdinal++}`,
               hostname: null,
               version: null,
-              ...(options?.features ? { features: options.features } : {}),
+              features: options?.features ?? { ownedSubscriptions: true },
             },
           },
         }),
@@ -255,11 +255,11 @@ test("does not infer browser automation capabilities from Electron runtime", asy
   const hello = z
     .object({
       type: z.literal("hello"),
-      capabilities: z.record(z.unknown()),
+      capabilities: z.record(z.string(), z.unknown()),
     })
     .parse(JSON.parse(assertStr(mock.sent[0])));
   expect(hello.capabilities[CLIENT_CAPS.browserHost]).toBeUndefined();
-  expect(hello.capabilities[CLIENT_CAPS.selectiveAgentTimeline]).toBeUndefined();
+  expect(hello.capabilities[CLIENT_CAPS.selectiveAgentTimeline]).toBe(true);
 });
 
 test("advertises consumer-provided browser automation capabilities", async () => {
@@ -285,7 +285,7 @@ test("advertises consumer-provided browser automation capabilities", async () =>
   const hello = z
     .object({
       type: z.literal("hello"),
-      capabilities: z.record(z.unknown()),
+      capabilities: z.record(z.string(), z.unknown()),
     })
     .parse(JSON.parse(assertStr(mock.sent[0])));
   expect(hello.capabilities[CLIENT_CAPS.browserHost]).toEqual({
@@ -294,6 +294,166 @@ test("advertises consumer-provided browser automation capabilities", async () =>
   });
 });
 
+test.each([
+  { receipts: false, structured: false },
+  { receipts: true, structured: false },
+  { receipts: false, structured: true },
+  { receipts: true, structured: true },
+])(
+  "legacy creation preserves the original payload with receipts=$receipts, structured=$structured",
+  async ({ receipts, structured }) => {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "receipt-gate",
+      transportFactory: () => transport.transport,
+      reconnect: { enabled: false },
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({ features: { agentRequestReceipts: receipts } });
+    await connecting;
+    const input: CreateAgentRequestOptions = {
+      config: {
+        provider: "codex",
+        cwd: "/project",
+        title: "Explicit title",
+        model: "gpt-5",
+        modeId: "full-access",
+      },
+      workspaceId: "workspace",
+      callerAgentId: "parent",
+      env: { CREATION_CONTEXT: "preserved" },
+      labels: { source: "test" },
+      idempotencyKey: "creation",
+      clientMessageId: "first-message",
+      initialPrompt: "Start this agent",
+      images: [{ data: "aGVsbG8=", mimeType: "image/png" }],
+      attachments: [
+        {
+          type: "github_pr",
+          mimeType: "application/github-pr",
+          number: 123,
+          title: "Review this PR",
+          url: "https://github.com/getpaseo/paseo/pull/123",
+        },
+      ],
+      ...(structured ? { outputSchema: { type: "object" } } : {}),
+    };
+    const created = client.createAgent(input);
+    void created.catch(() => {});
+    const duplicate = client.createAgent(input);
+    void duplicate.catch(() => {});
+    expect(transport.sent).toHaveLength(1);
+    const request = parseSentFrame(transport.sent[0]);
+    expect(request).toMatchObject({
+      type: "create_agent_request",
+      config: input.config,
+      workspaceId: input.workspaceId,
+      callerAgentId: input.callerAgentId,
+      env: input.env,
+      labels: input.labels,
+      clientMessageId: input.clientMessageId,
+      initialPrompt: input.initialPrompt,
+      images: input.images,
+      attachments: input.attachments,
+      ...(structured ? { outputSchema: input.outputSchema } : {}),
+    });
+    expect(request).not.toHaveProperty("idempotencyKey");
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "status",
+        payload: {
+          status: "agent_create_failed",
+          requestId: request.requestId,
+          error: "Provider failed",
+        },
+      }),
+    );
+    await expect(created).rejects.toThrow("Provider failed");
+    await expect(duplicate).rejects.toThrow("Provider failed");
+  },
+);
+
+test.each([false, true])(
+  "legacy workspace creation preserves availability with receipt support=%s",
+  async (receipts) => {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "legacy-workspace",
+      transportFactory: () => transport.transport,
+      reconnect: { enabled: false },
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({ features: { workspaceRequestReceipts: receipts } });
+    await connecting;
+    const input = {
+      source: { kind: "directory" as const, path: "/project" },
+      idempotencyKey: "workspace",
+    };
+    const created = client.createWorkspace(input);
+    void created.catch(() => {});
+    const duplicate = client.createWorkspace(input);
+    void duplicate.catch(() => {});
+    expect(transport.sent).toHaveLength(1);
+    const request = parseSentFrame(transport.sent[0]);
+    expect(request).toMatchObject({ type: "workspace.create.request", source: input.source });
+    expect(request.idempotencyKey).toBe(receipts ? input.idempotencyKey : undefined);
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "workspace.create.response",
+        payload: {
+          requestId: request.requestId,
+          workspace: null,
+          error: "Directory unavailable",
+          setupTerminalId: null,
+        },
+      }),
+    );
+    await expect(created).resolves.toMatchObject({ error: "Directory unavailable" });
+    await expect(duplicate).resolves.toMatchObject({ error: "Directory unavailable" });
+  },
+);
+
+test.each(["agent", "workspace"] as const)(
+  "a lost legacy %s response is not automatically replayed on reconnect",
+  async (kind) => {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "legacy-disconnect",
+      transportFactory: () => transport.transport,
+      reconnect: { enabled: false },
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({ features: {} });
+    await connecting;
+    const creation =
+      kind === "agent"
+        ? client.createAgent({
+            provider: "codex",
+            cwd: "/project",
+            initialPrompt: "Start once",
+            idempotencyKey: "intent",
+          })
+        : client.createWorkspace({
+            source: { kind: "directory", path: "/project" },
+            idempotencyKey: "intent",
+          });
+    void creation.catch(() => {});
+    expect(transport.sent).toHaveLength(1);
+    transport.triggerClose({ code: 1006, reason: "Connection lost after dispatch" });
+    await expect(creation).rejects.toThrow();
+    const reconnecting = client.connect();
+    transport.triggerOpen({ features: {} });
+    await reconnecting;
+    expect(transport.sent).toEqual([]);
+  },
+);
+
 test("Hub management requires daemon support before dispatching requests", async () => {
   const mock = createMockTransport();
   const client = new DaemonClient({
@@ -313,57 +473,35 @@ test("Hub management requires daemon support before dispatching requests", async
   expect(mock.sent).toEqual([]);
 });
 
-test("sets the complete viewed timeline subscription only when the daemon supports it", async () => {
-  const supportedTransport = createMockTransport();
-  const supportedClient = new DaemonClient({
-    url: "ws://test",
-    clientId: "timeline_supported",
-    transportFactory: () => supportedTransport.transport,
-    reconnect: { enabled: false },
-  });
-  const legacyTransport = createMockTransport();
-  const legacyClient = new DaemonClient({
+test("timeline observation consumes broadcasts from a host without selective delivery", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
     url: "ws://test",
     clientId: "timeline_legacy",
-    transportFactory: () => legacyTransport.transport,
+    transportFactory: () => mock.transport,
     reconnect: { enabled: false },
   });
-  clients.push(supportedClient, legacyClient);
-
-  const supportedConnect = supportedClient.connect();
-  supportedTransport.triggerOpen({ features: { selectiveAgentTimeline: true } });
-  await supportedConnect;
-  const legacyConnect = legacyClient.connect();
-  legacyTransport.triggerOpen();
-  await legacyConnect;
-
-  expect(supportedClient.getLastServerInfoMessage()?.features).toEqual({
-    selectiveAgentTimeline: true,
-  });
-
-  const setPromise = supportedClient.setAgentTimelineSubscription(["agent-b", "agent-a"]);
-  await Promise.resolve();
-  const request = parseSentFrame(supportedTransport.sent[0]);
-  supportedTransport.triggerMessage(
+  clients.push(client);
+  const connecting = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connecting;
+  const observation = client.observeTimeline(["agent"]);
+  await expect(observation.ready).resolves.toMatchObject({ agentIds: ["agent"] });
+  const updates: unknown[] = [];
+  observation.subscribe({ snapshot: () => {}, update: (message) => updates.push(message) });
+  mock.triggerMessage(
     wrapSessionMessage({
-      type: "agent.timeline.set_subscription.response",
+      type: "agent_stream",
       payload: {
-        requestId: request.requestId,
-        agentIds: ["agent-a", "agent-b"],
+        agentId: "agent",
+        timestamp: "2026-09-11T00:00:00Z",
+        event: { type: "turn_completed", provider: "codex" },
       },
     }),
   );
-  await setPromise;
-  await legacyClient.setAgentTimelineSubscription(["agent-a"]);
-
-  expect({ request, legacyFrames: legacyTransport.sent }).toEqual({
-    request: {
-      type: "agent.timeline.set_subscription.request",
-      requestId: expect.any(String),
-      agentIds: ["agent-a", "agent-b"],
-    },
-    legacyFrames: [],
-  });
+  expect(updates).toEqual([expect.objectContaining({ type: "agent_stream" })]);
+  await observation.release();
+  expect(mock.sent).toEqual([]);
 });
 
 test("normalizes legacy and dedicated agent attention notifications", async () => {
@@ -426,8 +564,13 @@ class FakeDaemon {
       if (typeof data !== "string") {
         return;
       }
-      const frame = JSON.parse(data) as { type?: string };
-      if (frame.type !== "ping") {
+      const frame = JSON.parse(data) as {
+        type?: string;
+        message?: { type?: string; requestId: string; clientSentAt: number };
+      };
+      const sessionPing =
+        frame.type === "session" && frame.message?.type === "ping" ? frame.message : null;
+      if (frame.type !== "ping" && !sessionPing) {
         return;
       }
       this.pingsSentAt.push(performance.now());
@@ -438,19 +581,25 @@ class FakeDaemon {
       if (this.pongMode.kind === "silent") {
         return;
       }
+      const pong = sessionPing
+        ? wrapSessionMessage({
+            type: "pong",
+            payload: { ...sessionPing, serverReceivedAt: Date.now(), serverSentAt: Date.now() },
+          })
+        : JSON.stringify({ type: "pong" });
       if (this.pongMode.delayMs === 0) {
-        this.onMessage(JSON.stringify({ type: "pong" }));
+        this.onMessage(pong);
         return;
       }
       setTimeout(() => {
-        this.onMessage(JSON.stringify({ type: "pong" }));
+        this.onMessage(pong);
       }, this.pongMode.delayMs);
     },
     close: (code?: number, reason?: string) => {
       this.closeEvents.push({ code, reason });
     },
     onMessage: (handler) => {
-      this.onMessage = handler;
+      this.onMessage = (data) => handler(data, typeof data !== "string");
       return () => {};
     },
     onOpen: (handler) => {
@@ -707,6 +856,142 @@ test("passes password as HTTP bearer header and WebSocket subprotocol", async ()
   });
 });
 
+test("keeps relay upgrade credentials out of the socket request", async () => {
+  const mock = createMockTransport();
+  const requests: Array<{ url: string; headers?: Record<string, string>; protocols?: string[] }> =
+    [];
+  const client = new DaemonClient({
+    url: "ws://relay.test/ws?role=client&serverId=srv_test&v=2",
+    clientId: "clsk_relay_auth_test",
+    password: "shared-secret",
+    authHeader: "Bearer shared-secret",
+    e2ee: { enabled: true, daemonPublicKeyB64: "daemon-public-key" },
+    reconnect: { enabled: false },
+    transportFactory: (request) => {
+      requests.push(request);
+      return mock.transport;
+    },
+  });
+  clients.push(client);
+  void client.connect();
+  await vi.waitFor(() => expect(requests).toHaveLength(1));
+  expect(requests[0]).toEqual({ url: "ws://relay.test/ws?role=client&serverId=srv_test&v=2" });
+});
+
+test("refuses relay password auth without an encrypted hello", async () => {
+  const requests: unknown[] = [];
+  const client = new DaemonClient({
+    url: "ws://relay.test/ws?role=client&serverId=srv_test&v=2",
+    clientId: "clsk_unencrypted_relay_test",
+    password: "shared-secret",
+    connectTimeoutMs: 50,
+    reconnect: { enabled: false },
+    transportFactory: (request) => {
+      requests.push(request);
+      return createMockTransport().transport;
+    },
+  });
+  clients.push(client);
+  await expect(client.connect()).rejects.toThrow("Relay credentials require E2EE");
+  expect(requests).toEqual([]);
+});
+
+test("stops reconnecting after a password rejection on an established connection", async () => {
+  const socket = createMockTransport();
+  let attempts = 0;
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_reconnect_auth_test",
+    password: "old-secret",
+    reconnect: { enabled: true, baseDelayMs: 1, maxDelayMs: 1 },
+    transportFactory: () => {
+      attempts += 1;
+      return socket.transport;
+    },
+  });
+  clients.push(client);
+  const connected = client.connect();
+  socket.triggerOpen();
+  await connected;
+  socket.triggerMessage(JSON.stringify({ type: "hello.rejected", reason: "incorrect_password" }));
+  socket.triggerClose({ code: 4003, reason: "Incorrect password" });
+  await new Promise((resolve) => setTimeout(resolve, 30));
+  expect(client.authFailureReason).toBe("incorrect_password");
+  expect(attempts).toBe(1);
+});
+
+test("sends a password containing spaces in hello without an invalid WebSocket subprotocol", async () => {
+  const mock = createMockTransport();
+  const transportFactory = vi.fn(() => mock.transport);
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    password: "two words",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  mock.triggerOpen({ preserveSent: true });
+  await connected;
+  expect(transportFactory).toHaveBeenCalledWith({
+    url: "ws://test",
+    headers: {},
+  });
+  expect(JSON.parse(assertStr(mock.sent[0]))).toMatchObject({
+    type: "hello",
+    auth: { kind: "password", password: "two words" },
+  });
+});
+
+test("uses a local credential over a saved password when the desktop bridge provides one", async () => {
+  const mock = createMockTransport();
+  const transportFactory = vi.fn(() => mock.transport);
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "desktop-managed",
+    password: "stale-password",
+    localCredential: async () => "current-local-token",
+    reconnect: { enabled: false },
+    transportFactory,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  await vi.waitFor(() => expect(transportFactory).toHaveBeenCalled());
+  mock.triggerOpen({ preserveSent: true });
+  await connected;
+  expect(transportFactory).toHaveBeenCalledWith({ url: "ws://test", headers: {} });
+  expect(JSON.parse(assertStr(mock.sent[0]))).toMatchObject({
+    type: "hello",
+    auth: { kind: "localCredential", token: "current-local-token" },
+  });
+});
+
+test("uses the saved host password when the desktop bridge has no credential for the target", async () => {
+  const mock = createMockTransport();
+  const transportFactory = vi.fn(() => mock.transport);
+  const localCredential = vi.fn(async () => undefined);
+  const client = new DaemonClient({
+    url: "ws://remote-host",
+    clientId: "remote-saved-host",
+    password: "saved-password",
+    localCredential,
+    reconnect: { enabled: false },
+    transportFactory,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  await vi.waitFor(() => expect(transportFactory).toHaveBeenCalled());
+  mock.triggerOpen({ preserveSent: true });
+  await connected;
+  expect(localCredential).toHaveBeenCalledOnce();
+  expect(JSON.parse(assertStr(mock.sent[0]))).toMatchObject({
+    type: "hello",
+    auth: { kind: "password", password: "saved-password" },
+  });
+});
+
 test("advertises client capabilities in hello", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
@@ -737,12 +1022,23 @@ test("advertises client capabilities in hello", async () => {
     clientType: "cli",
     protocolVersion: 1,
     capabilities: {
+      all_providers: true,
+      selective_agent_timeline: true,
+      timeline_replacement_invalidation: true,
+      provider_snapshot_references: true,
+      explicit_event_subscriptions: true,
+      owned_subscriptions: true,
       compact_provider_snapshots: true,
       custom_mode_icons: true,
       project_updates: true,
       provider_subagents: true,
+      projected_subagent_timeline: true,
       reasoning_merge_enum: true,
       terminal_reflowable_snapshot: true,
+      timeline_notifications: true,
+      plugin_timeline_items: true,
+      workspace_setup_blocked: true,
+      hello_rejection: true,
       browser_host: {
         supportedCommands: ["list_tabs"],
         hostKind: "desktop app",
@@ -771,7 +1067,7 @@ test("allows callers to disable default client capabilities", async () => {
   const hello = z
     .object({
       type: z.literal("hello"),
-      capabilities: z.record(z.unknown()),
+      capabilities: z.record(z.string(), z.unknown()),
     })
     .parse(JSON.parse(assertStr(mock.sent[0])));
   expect(hello.capabilities[CLIENT_CAPS.projectUpdates]).toBe(false);
@@ -944,6 +1240,130 @@ test("does not reconnect after close when ensureConnected is called", async () =
   expect(client.getConnectionState().status).toBe("disposed");
 });
 
+test("ensureConnected reconnects immediately without leaving the scheduled retry armed", async () => {
+  useHeartbeatClock();
+  try {
+    const first = createMockTransport();
+    const second = createMockTransport();
+    const third = createMockTransport();
+    const transports = [first, second, third];
+    let transportIndex = 0;
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_immediate_reconnect",
+      reconnect: { enabled: true, baseDelayMs: 1_500, maxDelayMs: 1_500 },
+      transportFactory: () => {
+        const transport = transports[transportIndex];
+        if (!transport) throw new Error("unexpected extra reconnect");
+        transportIndex += 1;
+        return transport.transport;
+      },
+    });
+    clients.push(client);
+
+    const initialConnect = client.connect();
+    first.triggerOpen();
+    await initialConnect;
+    first.triggerClose({ code: 1001, reason: "app resumed" });
+    expect(client.getConnectionState().status).toBe("disconnected");
+
+    client.ensureConnected();
+    expect(client.getConnectionState().status).toBe("connecting");
+    expect(transportIndex).toBe(2);
+
+    second.triggerOpen();
+    expect(client.getConnectionState().status).toBe("connected");
+    await vi.advanceTimersByTimeAsync(1_500);
+
+    expect(client.getConnectionState().status).toBe("connected");
+    expect(transportIndex).toBe(2);
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("connect during a scheduled retry reconnects immediately without leaving the retry armed", async () => {
+  useHeartbeatClock();
+  try {
+    const first = createMockTransport();
+    const second = createMockTransport();
+    const third = createMockTransport();
+    const transports = [first, second, third];
+    let transportIndex = 0;
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_explicit_reconnect",
+      reconnect: { enabled: true, baseDelayMs: 1_500, maxDelayMs: 1_500 },
+      transportFactory: () => {
+        const transport = transports[transportIndex];
+        if (!transport) throw new Error("unexpected extra reconnect");
+        transportIndex += 1;
+        return transport.transport;
+      },
+    });
+    clients.push(client);
+
+    const initialConnect = client.connect();
+    first.triggerOpen();
+    await initialConnect;
+    first.triggerClose({ code: 1001, reason: "daemon restarted" });
+    expect(client.getConnectionState().status).toBe("disconnected");
+
+    const reconnect = client.connect();
+    expect(client.getConnectionState().status).toBe("connecting");
+    expect(transportIndex).toBe(2);
+
+    second.triggerOpen();
+    await reconnect;
+    expect(client.getConnectionState().status).toBe("connected");
+    await vi.advanceTimersByTimeAsync(1_500);
+
+    expect(client.getConnectionState().status).toBe("connected");
+    expect(transportIndex).toBe(2);
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("disabling reconnect cancels a pending retry until explicitly resumed", async () => {
+  useHeartbeatClock();
+  try {
+    const first = createMockTransport();
+    const second = createMockTransport();
+    const transports = [first, second];
+    let transportIndex = 0;
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_paused_reconnect",
+      reconnect: { enabled: true, baseDelayMs: 1_500, maxDelayMs: 1_500 },
+      transportFactory: () => {
+        const transport = transports[transportIndex];
+        if (!transport) throw new Error("unexpected extra reconnect");
+        transportIndex += 1;
+        return transport.transport;
+      },
+    });
+    clients.push(client);
+
+    const initialConnect = client.connect();
+    first.triggerOpen();
+    await initialConnect;
+    first.triggerClose({ code: 1001, reason: "app backgrounded" });
+
+    client.setReconnectEnabled(false);
+    await vi.advanceTimersByTimeAsync(1_500);
+    expect(client.getConnectionState().status).toBe("disconnected");
+    expect(transportIndex).toBe(1);
+
+    client.setReconnectEnabled(true);
+    client.ensureConnected();
+    expect(client.getConnectionState().status).toBe("connecting");
+    expect(transportIndex).toBe(2);
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
 test("keeps the transport connected when a session RPC ping times out", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
@@ -1362,7 +1782,7 @@ test("honors explicit getDaemonStatus timeout below the session RPC default", as
   clients.push(client);
 
   const connectPromise = client.connect();
-  mock.triggerOpen();
+  mock.triggerOpen({ features: { daemonStatusRpc: true } });
   await connectPromise;
 
   const responsePromise = client.getDaemonStatus({
@@ -1633,6 +2053,78 @@ test("keeps default connect timeout shorter than session RPC waiters", async ()
   }
 });
 
+test("foreground verification replaces a silently broken socket without waiting for heartbeats", async () => {
+  useHeartbeatClock();
+  const first = new FakeDaemon();
+  const second = new FakeDaemon();
+  first.daemonGoesSilent();
+  let attempts = 0;
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "foreground-recovery",
+    logger: noopLogger,
+    transportFactory: () => (++attempts === 1 ? first : second).transport,
+  });
+  clients.push(client);
+  const connection = client.connect();
+  first.openConnection();
+  await connection;
+
+  client.ensureConnected({ verify: true });
+  await vi.advanceTimersByTimeAsync(3_000);
+  expect(attempts).toBe(2);
+  second.openConnection();
+  expect(client.getConnectionState()).toEqual({ status: "connected" });
+});
+
+test("foreground verification preserves a healthy socket and deduplicates simultaneous checks", async () => {
+  useHeartbeatClock();
+  const daemon = new FakeDaemon();
+  daemon.daemonAnswersPingsAfter("0.1s");
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "healthy-resume",
+    logger: noopLogger,
+    transportFactory: () => daemon.transport,
+  });
+  clients.push(client);
+  const connection = client.connect();
+  daemon.openConnection();
+  await connection;
+  client.ensureConnected({ verify: true });
+  client.ensureConnected({ verify: true });
+  await vi.advanceTimersByTimeAsync(3_000);
+  expect(client.getConnectionState()).toEqual({ status: "connected" });
+  expect(daemon.pingTimestamps()).toEqual(["0s"]);
+  expect(daemon.closesFromClient()).toEqual([]);
+});
+
+test("an obsolete foreground probe cannot close a replacement connection", async () => {
+  useHeartbeatClock();
+  const first = new FakeDaemon();
+  const second = new FakeDaemon();
+  first.daemonGoesSilent();
+  let attempts = 0;
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "resume-race",
+    logger: noopLogger,
+    transportFactory: () => (++attempts === 1 ? first : second).transport,
+  });
+  clients.push(client);
+  const connection = client.connect();
+  first.openConnection();
+  await connection;
+  client.ensureConnected({ verify: true });
+  first.daemonClosesWith("network changed");
+  client.ensureConnected();
+  second.openConnection();
+  await vi.advanceTimersByTimeAsync(3_000);
+  expect(attempts).toBe(2);
+  expect(client.getConnectionState()).toEqual({ status: "connected" });
+  expect(second.closesFromClient()).toEqual([]);
+});
+
 test("stays online through ten minutes of pongs that arrive five seconds late", async () => {
   useHeartbeatClock();
   const session = new DaemonClientSession();
@@ -1988,7 +2480,7 @@ test("file context action RPCs correlate success and error responses", async ()
   });
 });
 
-test("serializes plugin source suffixes through the legacy path field", async () => {
+test("sends plugin source identifiers unchanged for daemon-host resolution", async () => {
   const mock = createMockTransport();
   const client = new DaemonClient({
     url: "ws://test",
@@ -2000,7 +2492,7 @@ test("serializes plugin source suffixes through the legacy path field", async ()
   clients.push(client);
 
   const connectPromise = client.connect();
-  mock.triggerOpen();
+  mock.triggerOpen({ features: { pluginSourceInstallation: true } });
   await connectPromise;
 
   const installPromise = client.installPluginSource({
@@ -2010,8 +2502,7 @@ test("serializes plugin source suffixes through the legacy path field", async ()
   expect(request).toEqual({
     type: "plugin.source.install.request",
     requestId: expect.any(String),
-    source: "owner/repository",
-    pluginPath: "plugins/review",
+    source: "owner/repository:plugins/review",
   });
   mock.triggerMessage(
     wrapSessionMessage({
@@ -2336,6 +2827,17 @@ test("uploadFile sends metadata request and file bytes as binary chunks", async
     chunkSize: 5,
   });
 
+  // Other tasks must run before a multi-chunk upload has queued all its bytes.
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  const framesDuringUpload = mock.sent.slice(1).map(assertUint8Array).map(decodeFileTransferFrame);
+  expect(framesDuringUpload.some((frame) => frame.opcode === FileTransferOpcode.FileEnd)).toBe(
+    false,
+  );
+  await vi.waitFor(() => {
+    const frames = mock.sent.slice(1).map(assertUint8Array).map(decodeFileTransferFrame);
+    expect(frames.at(-1)?.opcode).toBe(FileTransferOpcode.FileEnd);
+  });
+
   expect(JSON.parse(assertStr(mock.sent[0]))).toEqual({
     type: "session",
     message: {
@@ -2504,10 +3006,11 @@ test("sends create_agent_request with workspace and caller identity", async () =
   clients.push(client);
 
   const connectPromise = client.connect();
-  mock.triggerOpen();
+  mock.triggerOpen({ features: { agentRequestReceipts: true } });
   await connectPromise;
 
   const createPromise = client.createAgent({
+    idempotencyKey: "one-creation",
     provider: "codex",
     cwd: "/tmp/project/.paseo/worktrees/feature-a",
     workspaceId: "ws-feature-a",
@@ -2521,6 +3024,7 @@ test("sends create_agent_request with workspace and caller identity", async () =
   expect(request).toEqual(
     expect.objectContaining({
       type: "create_agent_request",
+      idempotencyKey: "one-creation",
       workspaceId: "ws-feature-a",
       callerAgentId: "parent-agent",
     }),
@@ -2596,6 +3100,162 @@ test("sends worktree target and autoArchive in create_agent_request", async () =
   await expect(createPromise).rejects.toThrow("worktree auto archive sentinel");
 });
 
+test("sends internal in create_agent_request when the host advertises internal agents", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: { backgroundWorkspaces: true } });
+  await connectPromise;
+
+  const createPromise = client.createAgent({
+    provider: "codex",
+    cwd: "/tmp/project",
+    background: true,
+  });
+
+  expect(mock.sent).toHaveLength(1);
+  const request = parseSentFrame(mock.sent[0]);
+  expect(request).toEqual(
+    expect.objectContaining({
+      type: "create_agent_request",
+      config: { provider: "codex", cwd: "/tmp/project" },
+      background: true,
+    }),
+  );
+
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "status",
+      payload: {
+        status: "agent_create_failed",
+        requestId: request.requestId,
+        error: "internal agent sentinel",
+      },
+    }),
+  );
+
+  await expect(createPromise).rejects.toThrow("internal agent sentinel");
+});
+
+test("rejects an internal create before sending when the host predates internal agents", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connectPromise;
+
+  await expect(
+    client.createAgent({ provider: "codex", cwd: "/tmp/project", background: true }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  expect(mock.sent).toHaveLength(0);
+});
+
+test("sends internal workspace creation and internal listings only to hosts that support them", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  // workspaceMultiplicity keeps the fetch on the real workspace directory RPC.
+  mock.triggerOpen({
+    features: { workspaceMultiplicity: true, backgroundWorkspaces: true },
+  });
+  await connectPromise;
+
+  void client
+    .createWorkspace({ source: { kind: "directory", path: "/tmp/project" }, background: true })
+    .catch(() => undefined);
+  void client.fetchWorkspaces({ filter: { includeBackground: true } }).catch(() => undefined);
+  void client.fetchAgents({ filter: { includeBackground: true } }).catch(() => undefined);
+
+  expect(mock.sent.map((frame) => parseSentFrame(frame))).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({ type: "workspace.create.request", background: true }),
+      expect.objectContaining({
+        type: "fetch_workspaces_request",
+        filter: { includeBackground: true },
+      }),
+      expect.objectContaining({
+        type: "fetch_agents_request",
+        filter: { includeBackground: true },
+      }),
+    ]),
+  );
+});
+
+test("rejects internal workspace creation and internal listings before sending on older hosts", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connectPromise;
+
+  await expect(
+    client.createWorkspace({
+      source: { kind: "directory", path: "/tmp/project" },
+      background: true,
+    }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  await expect(client.fetchWorkspaces({ filter: { includeBackground: true } })).rejects.toThrow(
+    "Update the host to use background workspaces.",
+  );
+  expect(mock.sent).toHaveLength(0);
+
+  // Agent listings gate on the older internalAgents feature.
+  const olderMock = createMockTransport();
+  const olderClient = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => olderMock.transport,
+  });
+  clients.push(olderClient);
+  const olderConnect = olderClient.connect();
+  olderMock.triggerOpen({ features: {} });
+  await olderConnect;
+  await expect(olderClient.fetchAgents({ filter: { includeBackground: true } })).rejects.toThrow(
+    "Update the host to use background workspaces.",
+  );
+  expect(olderMock.sent).toHaveLength(0);
+});
+
 test("sends structured attachments with create_agent_request", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
@@ -2896,6 +3556,45 @@ test("sends project.add.request without creating a workspace", async () => {
   });
 });
 
+test("marks a workspace unread through the dotted RPC", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen();
+  await connectPromise;
+
+  const markPromise = client.markWorkspaceUnread("workspace-1", "req-mark-unread");
+  expect(parseSentFrame(mock.sent[0])).toEqual({
+    type: "workspace.mark_unread.request",
+    workspaceId: "workspace-1",
+    requestId: "req-mark-unread",
+  });
+
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "workspace.mark_unread.response",
+      payload: {
+        requestId: "req-mark-unread",
+        workspaceId: "workspace-1",
+        markedAgentId: "agent-1",
+        success: true,
+        error: null,
+      },
+    }),
+  );
+
+  await expect(markPromise).resolves.toBeUndefined();
+});
+
 test("searches GitHub repositories through the dotted RPC", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
@@ -3494,16 +4193,14 @@ test("subscribes to checkout diff updates via RPC handshake", async () => {
   mock.triggerOpen();
   await connectPromise;
 
-  const promise = client.subscribeCheckoutDiff(
-    "/tmp/project",
-    { mode: "uncommitted" },
-    { subscriptionId: "checkout-sub-1" },
-  );
+  const subscription = client.observeCheckoutDiff("/tmp/project", { mode: "uncommitted" });
+  const promise = subscription.ready;
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(1));
 
   expect(mock.sent).toHaveLength(1);
   const request = parseSentFrame(mock.sent[0]);
   expect(request.type).toBe("subscribe_checkout_diff_request");
-  expect(request.subscriptionId).toBe("checkout-sub-1");
+  expect(request.subscriptionId).toBeUndefined();
   expect(request.cwd).toBe("/tmp/project");
   expect(request.compare).toEqual({ mode: "uncommitted" });
 
@@ -3532,7 +4229,7 @@ test("subscribes to checkout diff updates via RPC handshake", async () => {
   });
 });
 
-test("getCheckoutDiff uses one-shot subscription protocol", async () => {
+test("getCheckoutDiff reads a snapshot without creating a subscription", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
 
@@ -3553,7 +4250,7 @@ test("getCheckoutDiff uses one-shot subscription protocol", async () => {
 
   expect(mock.sent).toHaveLength(1);
   const subscribeRequest = parseSentFrame(mock.sent[0]);
-  expect(subscribeRequest.type).toBe("subscribe_checkout_diff_request");
+  expect(subscribeRequest.type).toBe("checkout.diff.get.request");
   expect(subscribeRequest.cwd).toBe("/tmp/project");
   expect(subscribeRequest.compare).toEqual({
     mode: "base",
@@ -3564,9 +4261,8 @@ test("getCheckoutDiff uses one-shot subscription protocol", async () => {
     JSON.stringify({
       type: "session",
       message: {
-        type: "subscribe_checkout_diff_response",
+        type: "checkout.diff.get.response",
         payload: {
-          subscriptionId: subscribeRequest.subscriptionId,
           cwd: "/tmp/project",
           files: [],
           error: null,
@@ -3583,10 +4279,7 @@ test("getCheckoutDiff uses one-shot subscription protocol", async () => {
     requestId: subscribeRequest.requestId,
   });
 
-  expect(mock.sent).toHaveLength(2);
-  const unsubscribeRequest = parseSentFrame(mock.sent[1]);
-  expect(unsubscribeRequest.type).toBe("unsubscribe_checkout_diff_request");
-  expect(unsubscribeRequest.subscriptionId).toBe(subscribeRequest.subscriptionId);
+  expect(mock.sent).toHaveLength(1);
 });
 
 test("requests branch suggestions via RPC", async () => {
@@ -4131,7 +4824,7 @@ test("renames a branch via RPC", async () => {
   });
 
   expect(mock.sent).toHaveLength(1);
-  const request = JSON.parse(mock.sent[0]) as {
+  const request = JSON.parse(assertStr(mock.sent[0])) as {
     type: "session";
     message: {
       type: "checkout.rename_branch.request";
@@ -4233,29 +4926,52 @@ test("resubscribes checkout diff streams after reconnect", async () => {
   });
   clients.push(client);
 
-  const internal = client as unknown as {
-    checkoutDiffSubscriptions: Map<
-      string,
-      { cwd: string; compare: { mode: "uncommitted" | "base"; baseRef?: string } }
-    >;
-  };
-  internal.checkoutDiffSubscriptions.set("checkout-sub-1", {
-    cwd: "/tmp/project",
-    compare: { mode: "base", baseRef: "main" },
-  });
-
   const connectPromise = client.connect();
   mock.triggerOpen();
   await connectPromise;
 
-  expect(mock.sent).toHaveLength(1);
+  const observation = client.observeCheckoutDiff("/tmp/project", { mode: "base", baseRef: "main" });
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(1));
+  const first = parseSentFrame(mock.sent[0]);
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "subscribe_checkout_diff_response",
+      payload: {
+        requestId: first.requestId,
+        subscriptionId: "server-first",
+        cwd: "/tmp/project",
+        files: [],
+        error: null,
+      },
+    }),
+  );
+  await observation.ready;
+  mock.triggerClose();
+  const reconnect = client.connect();
+  mock.triggerOpen();
+  await reconnect;
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(1));
   const request = parseSentFrame(mock.sent[0]);
-  expect(request.type).toBe("subscribe_checkout_diff_request");
-  expect(request.subscriptionId).toBe("checkout-sub-1");
-  expect(request.cwd).toBe("/tmp/project");
-  expect(request.compare).toEqual({ mode: "base", baseRef: "main" });
-  expect(typeof request.requestId).toBe("string");
-  expect(z.string().parse(request.requestId).length).toBeGreaterThan(0);
+  expect(request).toMatchObject({
+    type: "subscribe_checkout_diff_request",
+    cwd: "/tmp/project",
+    compare: { mode: "base", baseRef: "main" },
+  });
+  expect(request.subscriptionId).toBeUndefined();
+  expect(request.requestId).not.toBe(first.requestId);
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "subscribe_checkout_diff_response",
+      payload: {
+        requestId: request.requestId,
+        subscriptionId: "server-second",
+        cwd: "/tmp/project",
+        files: [],
+        error: null,
+      },
+    }),
+  );
+  await vi.waitFor(() => expect(observation.subscriptionId).toBe("server-second"));
 });
 
 test("fetches agents via RPC with filters, sort, and pagination", async () => {
@@ -4282,10 +4998,10 @@ test("fetches agents via RPC with filters, sort, and pagination", async () => {
       { key: "created_at", direction: "desc" },
     ],
     page: { limit: 25, cursor: "cursor-1" },
-    subscribe: { subscriptionId: "sub-1" },
+    subscribe: {},
   });
 
-  expect(mock.sent).toHaveLength(1);
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(1));
   const request = parseSentFrame(mock.sent[0]);
   expect(request.type).toBe("fetch_agents_request");
   expect(request.sort).toEqual([
@@ -4293,7 +5009,7 @@ test("fetches agents via RPC with filters, sort, and pagination", async () => {
     { key: "created_at", direction: "desc" },
   ]);
   expect(request.page).toEqual({ limit: 25, cursor: "cursor-1" });
-  expect(request.subscribe).toEqual({ subscriptionId: "sub-1" });
+  expect(request.subscribe).toEqual({});
 
   mock.triggerMessage(
     JSON.stringify({
@@ -4317,6 +5033,10 @@ test("fetches agents via RPC with filters, sort, and pagination", async () => {
   await expect(promise).resolves.toEqual({
     requestId: request.requestId,
     subscriptionId: "sub-1",
+    subscription: expect.objectContaining({
+      subscriptionId: "sub-1",
+      release: expect.any(Function),
+    }),
     entries: [],
     pageInfo: {
       nextCursor: null,
@@ -5162,11 +5882,15 @@ test("emits output events for the active terminal stream", async () => {
     seen.push(new TextDecoder().decode(event.data));
   });
 
-  const subscribePromise = client.subscribeTerminal("term-1", "sub-1");
+  const subscribePromise = client.subscribeTerminal("term-1", { requestId: "sub-1" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-1",
         slot: 11,
         error: null,
@@ -5214,11 +5938,15 @@ test("emits snapshot events for the subscribed terminal stream", async () => {
     snapshots.push(event.state);
   });
 
-  const subscribePromise = client.subscribeTerminal("term-1", "sub-2");
+  const subscribePromise = client.subscribeTerminal("term-1", { requestId: "sub-2" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-1",
         slot: 12,
         error: null,
@@ -5246,7 +5974,7 @@ test("emits snapshot events for the subscribed terminal stream", async () => {
   expect(snapshots).toEqual([state]);
 });
 
-test("sends input and resize frames for the subscribed terminal slot", async () => {
+test("sends explicit terminal input and resize commands", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
 
@@ -5263,11 +5991,15 @@ test("sends input and resize frames for the subscribed terminal slot", async ()
   mock.triggerOpen();
   await connectPromise;
 
-  const subscribePromise = client.subscribeTerminal("term-1", "sub-3");
+  const subscribePromise = client.subscribeTerminal("term-1", { requestId: "sub-3" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-1",
         slot: 13,
         error: null,
@@ -5289,19 +6021,18 @@ test("sends input and resize frames for the subscribed terminal slot", async ()
     intent: "update",
   });
 
-  const inputFrame = decodeTerminalStreamFrame(asUint8Array(mock.sent[0])!);
-  const resizeFrame = decodeTerminalStreamFrame(asUint8Array(mock.sent[1])!);
-
-  expect(inputFrame?.opcode).toBe(TerminalStreamOpcode.Input);
-  expect(inputFrame?.slot).toBe(13);
-  expect(new TextDecoder().decode(inputFrame?.payload ?? new Uint8Array())).toBe("echo hello\r");
-  expect(resizeFrame?.opcode).toBe(TerminalStreamOpcode.Resize);
-  expect(resizeFrame?.slot).toBe(13);
-  expect(decodeTerminalResizePayload(resizeFrame?.payload ?? new Uint8Array())).toEqual({
-    rows: 24,
-    cols: 80,
-    intent: "update",
-  });
+  expect(mock.sent.map(parseSentFrame)).toEqual([
+    {
+      type: "terminal_input",
+      terminalId: "term-1",
+      message: { type: "input", data: "echo hello\r" },
+    },
+    {
+      type: "terminal_input",
+      terminalId: "term-1",
+      message: { type: "resize", rows: 24, cols: 80, intent: "update" },
+    },
+  ]);
 });
 
 test("routes concurrent terminal stream frames by slot", async () => {
@@ -5329,11 +6060,15 @@ test("routes concurrent terminal stream frames by slot", async () => {
     seen.push(`${event.terminalId}:${new TextDecoder().decode(event.data)}`);
   });
 
-  const subscribeFirstPromise = client.subscribeTerminal("term-1", "sub-multi-1");
+  const subscribeFirstPromise = client.subscribeTerminal("term-1", { requestId: "sub-multi-1" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-1",
         slot: 21,
         error: null,
@@ -5343,11 +6078,15 @@ test("routes concurrent terminal stream frames by slot", async () => {
   );
   await subscribeFirstPromise;
 
-  const subscribeSecondPromise = client.subscribeTerminal("term-2", "sub-multi-2");
+  const subscribeSecondPromise = client.subscribeTerminal("term-2", { requestId: "sub-multi-2" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-2",
         slot: 22,
         error: null,
@@ -5383,14 +6122,19 @@ test("routes concurrent terminal stream frames by slot", async () => {
     cols: 20,
   });
 
-  const inputFrame = decodeTerminalStreamFrame(asUint8Array(mock.sent[0])!);
-  const resizeFrame = decodeTerminalStreamFrame(asUint8Array(mock.sent[1])!);
-
   expect(seen).toEqual(["term-2:beta", "term-1:alpha"]);
-  expect(inputFrame?.opcode).toBe(TerminalStreamOpcode.Input);
-  expect(inputFrame?.slot).toBe(22);
-  expect(resizeFrame?.opcode).toBe(TerminalStreamOpcode.Resize);
-  expect(resizeFrame?.slot).toBe(21);
+  expect(mock.sent.map(parseSentFrame)).toEqual([
+    {
+      type: "terminal_input",
+      terminalId: "term-2",
+      message: { type: "input", data: "echo beta\r" },
+    },
+    {
+      type: "terminal_input",
+      terminalId: "term-1",
+      message: { type: "resize", rows: 10, cols: 20 },
+    },
+  ]);
 });
 
 test("ignores terminal stream frames after terminal_stream_exit", async () => {
@@ -5418,11 +6162,15 @@ test("ignores terminal stream frames after terminal_stream_exit", async () => {
     seen.push(new TextDecoder().decode(event.data));
   });
 
-  const subscribePromise = client.subscribeTerminal("term-1", "sub-4");
+  const subscribePromise = client.subscribeTerminal("term-1", { requestId: "sub-4" });
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscribe_terminal_request"),
+  );
   mock.triggerMessage(
     wrapSessionMessage({
       type: "subscribe_terminal_response",
       payload: {
+        subscriptionId: "server-" + String(parseSentFrame(mock.sent.at(-1)).requestId),
         terminalId: "term-1",
         slot: 14,
         error: null,
@@ -5445,6 +6193,7 @@ test("ignores terminal stream frames after terminal_stream_exit", async () => {
     wrapSessionMessage({
       type: "terminal_stream_exit",
       payload: {
+        subscriptionId: "server-sub-4",
         terminalId: "term-1",
       },
     }),
@@ -5459,6 +6208,21 @@ test("ignores terminal stream frames after terminal_stream_exit", async () => {
   );
 
   expect(seen).toEqual(["before-exit"]);
+  await vi.waitFor(() =>
+    expect(parseSentFrame(mock.sent.at(-1)).type).toBe("subscription.release.request"),
+  );
+  const release = parseSentFrame(mock.sent.at(-1));
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "subscription.release.response",
+      payload: {
+        requestId: release.requestId,
+        subscriptionId: "server-sub-4",
+        released: true,
+      },
+    }),
+  );
+  await Promise.resolve();
   unsubscribe();
 });
 
@@ -5804,24 +6568,41 @@ test("sends subscribe/unsubscribe terminals messages", async () => {
   mock.triggerOpen();
   await connectPromise;
 
-  client.subscribeTerminals({ cwd: "/tmp/project" });
-  client.unsubscribeTerminals({ cwd: "/tmp/project" });
-
-  expect(mock.sent).toHaveLength(2);
-  expect(JSON.parse(assertStr(mock.sent[0]))).toEqual({
-    type: "session",
-    message: {
-      type: "subscribe_terminals_request",
-      cwd: "/tmp/project",
-    },
-  });
-  expect(JSON.parse(assertStr(mock.sent[1]))).toEqual({
-    type: "session",
-    message: {
-      type: "unsubscribe_terminals_request",
-      cwd: "/tmp/project",
-    },
+  const observation = client.observeTerminals({ cwd: "/tmp/project" });
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(1));
+  const request = parseSentFrame(mock.sent[0]);
+  expect(request).toMatchObject({ type: "subscribe_terminals_request", cwd: "/tmp/project" });
+  expect(request.subscriptionId).toBeUndefined();
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "terminals_changed",
+      payload: {
+        requestId: request.requestId,
+        subscriptionId: "server-terminals",
+        cwd: "/tmp/project",
+        terminals: [],
+      },
+    }),
+  );
+  await observation.ready;
+  const release = observation.release();
+  await vi.waitFor(() => expect(mock.sent).toHaveLength(2));
+  const requestRelease = parseSentFrame(mock.sent[1]);
+  expect(requestRelease).toMatchObject({
+    type: "subscription.release.request",
+    subscriptionId: "server-terminals",
   });
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "subscription.release.response",
+      payload: {
+        requestId: requestRelease.requestId,
+        subscriptionId: "server-terminals",
+        released: true,
+      },
+    }),
+  );
+  await release;
 });
 
 test("dispatches terminals_changed events to typed listeners", async () => {
@@ -5949,6 +6730,85 @@ test("sends provider.usage.list.request and resolves provider.usage.list.respons
   });
 });
 
+test.each([
+  {
+    status: "available",
+    report: {
+      status: "available",
+      windows: [],
+      balances: undefined,
+      details: undefined,
+      planLabel: undefined,
+    },
+  },
+  { status: "error", report: { status: "error", error: "" } },
+  {
+    status: "unavailable",
+    report: { status: "unavailable", problem: { kind: "no_quota", detail: "" } },
+  },
+] as const)(
+  "maps released-host $status usage and filters report IDs",
+  async ({ status, report }) => {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+    const connected = client.connect();
+    mock.triggerOpen({ features: { providerUsageList: true } });
+    await connected;
+    const result = client.listUsageReports({
+      requestId: "legacy-usage",
+      reportIds: ["claude"],
+      forceRefresh: true,
+    });
+    expect(parseSentFrame(mock.sent[0])).toEqual({
+      type: "provider.usage.list.request",
+      requestId: "legacy-usage",
+    });
+    const provider = {
+      providerId: "claude",
+      displayName: "Claude",
+      status,
+      windows: [],
+      planLabel: null,
+      fetchedAt: null,
+      error: null,
+    };
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "provider.usage.list.response",
+        payload: {
+          requestId: "legacy-usage",
+          fetchedAt: "2026-09-30T00:00:00.000Z",
+          providers: [provider, { ...provider, providerId: "codex" }],
+        },
+      }),
+    );
+    expect(await result).toStrictEqual({
+      requestId: "legacy-usage",
+      reports: [
+        {
+          id: "claude",
+          sourceId: "claude",
+          sourceLabel: "Claude",
+          icon: readFileSync(
+            new URL("../../../plugins/claude-usage-source/icon.svg", import.meta.url),
+            "utf8",
+          ),
+          account: {},
+          fetchedAt: "2026-09-30T00:00:00.000Z",
+          report,
+        },
+      ],
+    });
+  },
+);
+
 test("sends close_items_request and resolves close_items_response", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
@@ -6067,3 +6927,603 @@ test("waitForFinish with timeout=0 omits timeoutMs and has no client deadline",
     vi.useRealTimers();
   }
 });
+
+test("wire snapshot callers own expansion and receive hash references unchanged", async () => {
+  const transport = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "wire-catalog",
+    providerSnapshots: "wire",
+    reconnect: { enabled: false },
+    transportFactory: () => transport.transport,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  transport.triggerOpen({ preserveSent: true });
+  await connected;
+  expect(JSON.parse(assertStr(transport.sent[0])).capabilities.provider_snapshot_references).toBe(
+    true,
+  );
+  const received: unknown[] = [];
+  client.on("providers_snapshot_update", (message) => received.push(message.payload));
+  const payload = {
+    entries: [],
+    snapshotHash: "content",
+    fetchedAt: { codex: "2026-09-06T12:00:00.000Z" },
+    generatedAt: "2026-09-06T12:00:00.000Z",
+  };
+  transport.triggerMessage(wrapSessionMessage({ type: "providers_snapshot_update", payload }));
+  expect(received).toEqual([payload]);
+  const request = client.getProvidersSnapshot();
+  const sent = parseSentFrame(transport.sent.at(-1)!);
+  const body = {
+    ...payload,
+    compactSnapshot: {
+      entries: [
+        {
+          provider: "codex",
+          enabled: true,
+          status: "ready",
+          models: [{ id: "astra", label: "Astra" }],
+        },
+      ],
+      thinkingSets: [],
+    },
+    requestId: sent.requestId,
+  };
+  transport.triggerMessage(
+    wrapSessionMessage({ type: "get_providers_snapshot_response", payload: body }),
+  );
+  expect(await request).toEqual(body);
+});
+
+test("creation lifecycle sends the keyed agent and initial prompt as one intent", async () => {
+  const transport = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "creation-contract",
+    transportFactory: () => transport.transport,
+    reconnect: { enabled: false },
+  });
+  clients.push(client);
+  const connected = client.connect();
+  transport.triggerOpen({ features: { creationLifecycle: true, agentRequestReceipts: true } });
+  await connected;
+  const creation = client.createAgent({
+    idempotencyKey: "draft-one",
+    provider: "codex",
+    cwd: "/project",
+    workspaceId: "wks_0123456789abcdef",
+    initialPrompt: "Start once",
+    clientMessageId: "first-message",
+  });
+  void creation.catch(() => undefined);
+  const request = parseSentFrame(transport.sent[0]);
+  expect(request).toMatchObject({
+    type: "agent.create.request",
+    idempotencyKey: "draft-one",
+    initialPrompt: "Start once",
+    clientMessageId: "first-message",
+  });
+  transport.triggerMessage(
+    wrapSessionMessage({
+      type: "agent.create.response",
+      payload: { requestId: request.requestId, agent: null, error: "provider unavailable" },
+    }),
+  );
+  await expect(creation).rejects.toThrow("provider unavailable");
+  expect(transport.sent).toHaveLength(1);
+});
+
+test("creation lifecycle acknowledgement reaches the observer before the final response", async () => {
+  const transport = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "creation-progress",
+    transportFactory: () => transport.transport,
+    reconnect: { enabled: false },
+  });
+  clients.push(client);
+  const connected = client.connect();
+  transport.triggerOpen({ features: { creationLifecycle: true } });
+  await connected;
+  const phases: string[] = [];
+  const creation = client.createAgent({
+    provider: "codex",
+    cwd: "/project",
+    idempotencyKey: "observe-one",
+    onEvent: (snapshot) => phases.push(snapshot.phase),
+  });
+  void creation.catch(() => undefined);
+  const request = parseSentFrame(transport.sent[0]);
+  transport.triggerMessage(
+    wrapSessionMessage({
+      type: "agent.create.update",
+      payload: {
+        kind: "agent",
+        idempotencyKey: "observe-one",
+        revision: 0,
+        phase: "accepted",
+        workspaceId: null,
+        agentId: "00000000-0000-4000-8000-000000000001",
+        error: null,
+      },
+    }),
+  );
+  expect(phases).toEqual(["accepted"]);
+  transport.triggerMessage(
+    wrapSessionMessage({
+      type: "agent.create.response",
+      payload: { requestId: request.requestId, agent: null, error: "provider unavailable" },
+    }),
+  );
+  await expect(creation).rejects.toThrow("provider unavailable");
+});
+
+test("creation reconnect observation uses connection-owned subscriptions and releases on completion", async () => {
+  const transport = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "creation-reconnect",
+    transportFactory: () => transport.transport,
+    reconnect: { enabled: false },
+  });
+  clients.push(client);
+  const features = { creationLifecycle: true, ownedSubscriptions: true };
+  const connect = client.connect();
+  transport.triggerOpen({ features });
+  await connect;
+  const phases: string[] = [];
+  const creation = client.createWorkspace({
+    idempotencyKey: "reconnect-one",
+    source: { kind: "directory", path: "/project" },
+    onEvent: (snapshot) => phases.push(snapshot.phase),
+  });
+  void creation.catch(() => undefined);
+  const snapshot = {
+    kind: "workspace",
+    idempotencyKey: "reconnect-one",
+    phase: "accepted",
+    revision: 0,
+    workspaceId: "wks_0123456789abcdef",
+    agentId: null,
+    error: null,
+  };
+  for (const subscriptionId of ["first-connection", "second-connection"]) {
+    transport.triggerClose();
+    const reconnected = client.connect();
+    transport.triggerOpen({ features });
+    await reconnected;
+    await expect.poll(() => transport.sent.length).toBe(1);
+    const request = parseSentFrame(transport.sent[0]);
+    expect(request).toMatchObject({
+      type: "creation.subscribe.request",
+      idempotencyKey: "reconnect-one",
+    });
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "creation.subscribe.response",
+        payload: {
+          requestId: request.requestId,
+          subscriptionId,
+          snapshot,
+          error: null,
+        },
+      }),
+    );
+  }
+  transport.triggerMessage(
+    wrapSessionMessage({
+      type: "workspace.create.update",
+      payload: {
+        ...snapshot,
+        subscriptionId: "second-connection",
+        revision: 1,
+        phase: "failed",
+        error: "Provisioning failed",
+      },
+    }),
+  );
+  expect(await creation).toMatchObject({ error: "Provisioning failed" });
+  await expect.poll(() => transport.sent.length).toBe(2);
+  const release = parseSentFrame(transport.sent.at(-1));
+  expect(release).toMatchObject({
+    type: "subscription.release.request",
+    subscriptionId: "second-connection",
+  });
+  transport.triggerMessage(
+    wrapSessionMessage({
+      type: "subscription.release.response",
+      payload: {
+        requestId: release.requestId,
+        subscriptionId: "second-connection",
+      },
+    }),
+  );
+  expect(phases).toEqual(["accepted", "failed"]);
+});
+
+test("uploadFile started while connecting waits for the connection and uploads", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "upload-while-connecting",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    suppressSendErrors: true,
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+  const connection = client.connect();
+  expect(client.getConnectionState().status).toBe("connecting");
+
+  const upload = client.uploadFile({
+    fileName: "notes.txt",
+    mimeType: "text/plain",
+    bytes: new TextEncoder().encode("hello world"),
+    modifiedAt: "2026-05-02T00:00:00.000Z",
+    requestId: "req-upload-connecting",
+    chunkSize: 5,
+  });
+  void upload.catch(() => undefined);
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  mock.triggerOpen();
+  await connection;
+
+  await vi.waitFor(() => {
+    const frames = mock.sent
+      .filter((frame) => typeof frame !== "string")
+      .map(assertUint8Array)
+      .map(decodeFileTransferFrame);
+    expect(frames.map((frame) => frame.opcode)).toEqual([
+      FileTransferOpcode.FileBegin,
+      FileTransferOpcode.FileChunk,
+      FileTransferOpcode.FileChunk,
+      FileTransferOpcode.FileChunk,
+      FileTransferOpcode.FileEnd,
+    ]);
+  });
+  const requestIndex = mock.sent.findIndex(
+    (frame) =>
+      typeof frame === "string" && parseSentFrame(frame).requestId === "req-upload-connecting",
+  );
+  expect(parseSentFrame(mock.sent[requestIndex])).toMatchObject({ type: "file.upload.request" });
+  expect(requestIndex).toBeLessThan(mock.sent.findIndex((frame) => typeof frame !== "string"));
+
+  const file = {
+    type: "uploaded_file" as const,
+    id: "upload_req-upload-connecting",
+    fileName: "notes.txt",
+    mimeType: "text/plain",
+    size: 11,
+    path: "/tmp/paseo-uploads/upload_req-upload-connecting/notes.txt",
+  };
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "file.upload.response",
+      payload: { requestId: "req-upload-connecting", file, error: null },
+    }),
+  );
+  await expect(upload).resolves.toEqual({ requestId: "req-upload-connecting", file, error: null });
+});
+
+test("uploadFile stops sending chunks when the connection closes between sends", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "upload-interrupted",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+  const connection = client.connect();
+  mock.triggerOpen();
+  await connection;
+  const upload = client.uploadFile({
+    fileName: "test.bin",
+    mimeType: "application/octet-stream",
+    bytes: new Uint8Array(1024 * 1024),
+  });
+  const rejection = expect(upload).rejects.toThrow();
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  const beforeClose = mock.sent.length;
+  mock.triggerClose();
+  await rejection;
+  await new Promise((resolve) => setTimeout(resolve, 10));
+  expect(mock.sent).toHaveLength(beforeClose);
+  expect(
+    mock.sent
+      .filter((frame) => typeof frame !== "string")
+      .map(assertUint8Array)
+      .map(decodeFileTransferFrame)
+      .some((frame) => frame.opcode === FileTransferOpcode.FileEnd),
+  ).toBe(false);
+});
+
+test("rejects source installation on an older host before sending a request", async () => {
+  const transport = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "source-gate",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => transport.transport,
+  });
+  clients.push(client);
+  const connecting = client.connect();
+  transport.triggerOpen({ features: { pluginGitManagement: true } });
+  await connecting;
+  const sentBefore = transport.sent.length;
+  await expect(client.installPluginSource({ source: "npm:review" })).rejects.toThrow(
+    "Update the host",
+  );
+  expect(transport.sent.length).toBe(sentBefore);
+});
+
+test("reviewed plugin updates gate before requests and preserve exact proposal data", async () => {
+  for (const supported of [false, true]) {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "reviewed-updates",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => transport.transport,
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({
+      features: {
+        pluginGitManagement: true,
+        pluginSourceInstallation: true,
+        pluginSourceUpdates: supported,
+      },
+    });
+    await connecting;
+    const proposal = {
+      id: "review",
+      expected: {
+        identity: { kind: "npm" as const, packageName: "review", pluginPath: "." },
+        installationRoot: "/plugins/review/version-root",
+        revision: "1.0.0",
+      },
+      target: {
+        kind: "npm" as const,
+        version: "1.1.0",
+        resolved: "https://registry.npmjs.org/review/-/review-1.1.0.tgz",
+        integrity: "sha512-test",
+      },
+    };
+    if (!supported) {
+      const sent = transport.sent.length;
+      await expect(client.previewPluginUpdates()).rejects.toThrow("Update the host");
+      await expect(client.applyPluginUpdates([proposal])).rejects.toThrow("Update the host");
+      expect(transport.sent.length).toBe(sent);
+      continue;
+    }
+    const checking = client.previewPluginUpdates({ pluginId: "review" });
+    const check = parseSentFrame(transport.sent.at(-1));
+    expect(check).toMatchObject({
+      type: "plugin.source.update.preview.request",
+      pluginId: "review",
+    });
+    const preview = { id: "review", outcome: "update", links: [], proposal };
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.source.update.preview.response",
+        payload: { requestId: check.requestId, plugins: [preview] },
+      }),
+    );
+    await expect(checking).resolves.toEqual([preview]);
+    const applying = client.applyPluginUpdates([proposal]);
+    const apply = parseSentFrame(transport.sent.at(-1));
+    expect(apply).toEqual({
+      type: "plugin.source.update.apply.request",
+      requestId: expect.any(String),
+      proposals: [proposal],
+    });
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.source.update.apply.response",
+        payload: {
+          requestId: apply.requestId,
+          plugins: [{ id: "review", outcome: "error", error: "changed since review" }],
+        },
+      }),
+    );
+    await expect(applying).resolves.toEqual([
+      { id: "review", outcome: "error", error: "changed since review" },
+    ]);
+  }
+});
+
+test.each([
+  [undefined, false],
+  [{}, false],
+  [{ usageSources: false, providerUsageList: false }, false],
+  [{ usageSources: true }, true],
+  [{ providerUsageList: true }, true],
+  [{ usageSources: true, providerUsageList: true }, true],
+] as const)("usage support for features %j is %s", (features, expected) => {
+  expect(supportsUsageReports(features)).toBe(expected);
+});
+
+test("uses modern usage RPC when both capabilities are advertised", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  mock.triggerOpen({ features: { usageSources: true, providerUsageList: true } });
+  await connected;
+  const updates: unknown[] = [];
+  const result = client.listUsageReports(
+    {
+      requestId: "modern-usage",
+      reportIds: ["claude:work"],
+      forceRefresh: true,
+    },
+    (report) => updates.push(report),
+  );
+  expect(parseSentFrame(mock.sent[0])).toEqual({
+    type: "usage.list_reports.request",
+    requestId: "modern-usage",
+    reportIds: ["claude:work"],
+    forceRefresh: true,
+  });
+  const payload = {
+    requestId: "modern-usage",
+    reports: [
+      {
+        id: "claude:work",
+        sourceId: "claude",
+        sourceLabel: "Claude",
+        account: { label: "Work" },
+        fetchedAt: "2026-09-30T00:00:00.000Z",
+        report: { status: "available", windows: [] },
+      },
+    ],
+  };
+  const report = payload.reports[0];
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "usage.list_reports.update",
+      payload: { requestId: "foreign", report },
+    }),
+  );
+  expect(updates).toEqual([]);
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "usage.list_reports.update",
+      payload: { requestId: payload.requestId, report },
+    }),
+  );
+  expect(updates).toEqual([report]);
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "usage.list_reports.response",
+      payload: { requestId: payload.requestId, error: null },
+    }),
+  );
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "usage.list_reports.update",
+      payload: { requestId: payload.requestId, report },
+    }),
+  );
+  expect(await result).toStrictEqual(payload);
+  expect(updates).toEqual([report]);
+});
+
+test("rejects usage requests when the host has neither capability", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+  const connected = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connected;
+  await expect(client.listUsageReports()).rejects.toThrow("Update the host to see usage.");
+  expect(mock.sent).toEqual([]);
+});
+
+test("usage request timeout detaches its update listener", async () => {
+  vi.useFakeTimers();
+  try {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+    const connected = client.connect();
+    mock.triggerOpen({ features: { usageSources: true } });
+    await connected;
+    const updates: unknown[] = [];
+    const result = client.listUsageReports({ requestId: "timeout-usage" }, (report) =>
+      updates.push(report),
+    );
+    const rejected = expect(result).rejects.toThrow("Timeout waiting for message (60000ms)");
+    await vi.advanceTimersByTimeAsync(60_001);
+    await rejected;
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "usage.list_reports.update",
+        payload: {
+          requestId: "timeout-usage",
+          report: {
+            id: "source:late",
+            account: {},
+            sourceId: "source",
+            sourceLabel: "Source",
+            fetchedAt: "2026-01-01T00:00:00.000Z",
+            report: { status: "available", windows: [] },
+          },
+        },
+      }),
+    );
+    expect(updates).toEqual([]);
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test.each([false, true])(
+  "agent provenance requires host support=%s while human sends remain compatible",
+  async (supported) => {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "provenance",
+      transportFactory: () => transport.transport,
+      reconnect: { enabled: false },
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({ features: { agentMessageProvenance: supported } });
+    await connecting;
+    if (!supported) {
+      await expect(
+        client.sendAgentMessage("recipient", "review", { sourceAgentId: "server::sender" }),
+      ).rejects.toThrow("Update the Paseo host");
+      expect(transport.sent).toHaveLength(0);
+    }
+    const send = client.sendAgentMessage("recipient", "review", {
+      messageId: "delivery",
+      ...(supported ? { sourceAgentId: "server::sender" } : {}),
+    });
+    const request = parseSentFrame(transport.sent[0]);
+    expect(request).toMatchObject({
+      type: "send_agent_message_request",
+      text: "review",
+      messageId: "delivery",
+    });
+    expect(request.sourceAgentId).toBe(supported ? "server::sender" : undefined);
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "send_agent_message_response",
+        payload: {
+          requestId: request.requestId,
+          agentId: "recipient",
+          accepted: true,
+          error: null,
+        },
+      }),
+    );
+    await send;
+  },
+);
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index 62bf674b5f..f900fe41e5 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -1,7 +1,18 @@
+import { legacyUsageIcon } from "./legacy-usage-icons.js";
+import { subscribeTimeline, type TimelineMessage } from "./timeline-subscription/index.js";
+import { ProviderSnapshotUpdates } from "./provider-snapshots/index.js";
+import {
+  ConnectionSubscriptions,
+  type OwnedSubscription,
+  DEFAULT_CLIENT_CAPABILITIES,
+  type TimelineSubscription,
+} from "./connection/index.js";
+import { CreationClient } from "./creation/index.js";
+import type { CreationSnapshot } from "@getpaseo/protocol/messages";
 import type { z } from "zod";
-import { CLIENT_CAPS, type ClientCapability } from "@getpaseo/protocol/client-capabilities";
+import type { SessionEventSubscription } from "@getpaseo/protocol/messages";
+import type { ClientCapability } from "@getpaseo/protocol/client-capabilities";
 import type { AgentAttentionNotificationPayload } from "@getpaseo/protocol/agent-attention-notification";
-import { parsePluginSourceReference } from "@getpaseo/protocol/plugin-source-reference";
 import {
   AgentCreateFailedStatusPayloadSchema,
   AgentCreatedStatusPayloadSchema,
@@ -84,6 +95,7 @@ import type {
   RefreshProvidersSnapshotResponseMessage,
   ProviderDiagnosticResponseMessage,
   ProviderUsageListResponseMessage,
+  UsageReportEntry,
   DaemonGetStatusResponse,
   DaemonGetPairingOfferResponse,
   DaemonConfigReloadResponse,
@@ -108,6 +120,10 @@ import type {
   PluginLogEntry,
   PluginSourceStatusItem,
   PluginSourceUpdateItem,
+  PluginUpdateSelection,
+  PluginUpdateProposal,
+  PluginUpdatePreview,
+  PluginUpdateResult,
   AgentSkillSelection,
   AgentSkillsStatus,
   AgentSkillsSaveResult,
@@ -126,7 +142,6 @@ import type {
   MutableDaemonConfigPatch,
 } from "@getpaseo/protocol/messages";
 import { isRelayClientWebSocketUrl } from "@getpaseo/protocol/daemon-endpoints";
-import { terminalSubscriptionKey } from "@getpaseo/protocol/terminal-subscription-key";
 import {
   asUint8Array,
   decodeFileTransferFrame,
@@ -138,6 +153,7 @@ import {
 } from "@getpaseo/protocol/binary-frames/index";
 import {
   createRelayE2eeTransportFactory,
+  createRelayTransportFactory,
   createWebSocketTransportFactory,
   decodeMessageData,
   defaultWebSocketFactory,
@@ -203,6 +219,68 @@ function normalizePassword(value: string | undefined): string | null {
   return value.length > 0 ? value : null;
 }
 
+function compatibleBearerPassword(password: string | null): string | null {
+  return password && /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/.test(password) ? password : null;
+}
+
+type HelloAuth =
+  | { kind: "password"; password: string }
+  | { kind: "localCredential"; token: string }
+  | undefined;
+
+export type DaemonAuthFailureReason = "password_required" | "incorrect_password";
+
+export class DaemonAuthenticationError extends Error {
+  readonly reason: DaemonAuthFailureReason;
+
+  constructor(reason: DaemonAuthFailureReason) {
+    super(reason === "password_required" ? "Password required" : "Incorrect password");
+    this.name = "DaemonAuthenticationError";
+    this.reason = reason;
+  }
+}
+
+export function getDaemonAuthFailureReason(error: unknown): DaemonAuthFailureReason | null {
+  return error instanceof DaemonAuthenticationError ? error.reason : null;
+}
+
+function authFailureFromLegacyClose(event: unknown): DaemonAuthFailureReason | null {
+  if (!event || typeof event !== "object" || !("reason" in event)) return null;
+  if (event.reason === "Password required") return "password_required";
+  if (event.reason === "Incorrect password") return "incorrect_password";
+  return null;
+}
+
+function chooseConnectionAuth(
+  config: DaemonClientConfig,
+  localCredential: string | undefined,
+): { helloAuth: HelloAuth; headers: Record<string, string>; protocols?: string[] } {
+  const password = normalizePassword(config.password);
+  let helloAuth: HelloAuth;
+  if (localCredential) helloAuth = { kind: "localCredential", token: localCredential };
+  else if (password) helloAuth = { kind: "password", password };
+  const headers: Record<string, string> = {};
+  const compatibleBearer = localCredential ? null : compatibleBearerPassword(password);
+  // COMPAT(headerAuth): added in v0.9.1, remove after 2027-03-24.
+  if (compatibleBearer) headers.Authorization = `Bearer ${compatibleBearer}`;
+  else if (!localCredential && config.authHeader) headers.Authorization = config.authHeader;
+  return {
+    helloAuth,
+    headers,
+    ...(compatibleBearer ? { protocols: [`paseo.bearer.${compatibleBearer}`] } : {}),
+  };
+}
+
+function resolveConnectionAuth(
+  config: DaemonClientConfig,
+): ReturnType<typeof chooseConnectionAuth> | Promise<ReturnType<typeof chooseConnectionAuth>> {
+  const resolution = config.localCredential?.();
+  if (resolution instanceof Promise) {
+    return resolution.then((credential) => chooseConnectionAuth(config, credential));
+  }
+  return chooseConnectionAuth(config, resolution);
+}
+
 function extractCorrelatedResponseIdentity(input: unknown): CorrelatedResponseIdentity | null {
   if (!input || typeof input !== "object") {
     return null;
@@ -308,12 +386,16 @@ export type BrowserAutomationExecuteRequestMessage = BrowserAutomationExecuteReq
 export type BrowserAutomationExecuteResponseMessage = BrowserAutomationExecuteResponse;
 
 export interface DaemonClientConfig {
+  /** Deliver compact bodies/hash references to a caller-owned snapshot cache.
+   * The default keeps public SDK snapshot entries expanded. */
+  providerSnapshots?: "wire";
   url: string;
   clientId: string;
   clientType?: "mobile" | "browser" | "cli" | "mcp" | "hub";
   appVersion?: string;
   runtimeGeneration?: number | null;
   password?: string;
+  localCredential?: () => string | undefined | Promise<string | undefined>;
   authHeader?: string;
   suppressSendErrors?: boolean;
   transportFactory?: DaemonTransportFactory;
@@ -342,7 +424,9 @@ export interface DaemonClientTrace {
 }
 
 export interface SendMessageOptions {
+  sourceAgentId?: string;
   messageId?: string;
+  /** What happens when the agent is mid-turn. The daemon interrupts the turn when omitted. */
   activeTurnBehavior?: ActiveTurnBehavior;
   images?: Array<{ data: string; mimeType: string }>;
   attachments?: SendAgentMessageRequest["attachments"];
@@ -359,6 +443,8 @@ export interface AgentAttentionRequiredNotification {
 type AgentConfigOverrides = Partial<Omit<AgentSessionConfig, "provider" | "cwd">>;
 
 export interface CreateAgentRequestOptions extends AgentConfigOverrides {
+  agentId?: string;
+  onEvent?: (snapshot: CreationSnapshot) => void;
   config?: AgentSessionConfig;
   provider?: AgentProvider;
   cwd?: string;
@@ -366,6 +452,7 @@ export interface CreateAgentRequestOptions extends AgentConfigOverrides {
   workspaceId?: string;
   callerAgentId?: string;
   initialPrompt?: string;
+  idempotencyKey?: string;
   clientMessageId?: string;
   outputSchema?: Record<string, unknown>;
   images?: CreateAgentRequestMessage["images"];
@@ -373,6 +460,7 @@ export interface CreateAgentRequestOptions extends AgentConfigOverrides {
   git?: GitSetupOptions;
   worktree?: CreateAgentRequestMessage["worktree"];
   autoArchive?: CreateAgentRequestMessage["autoArchive"];
+  background?: CreateAgentRequestMessage["background"];
   // COMPAT(createAgentWorktree): low-level old callers may still send the
   // create-agent worktree field. Added in v0.2.0; remove after 2027-01-17.
   worktreeName?: string;
@@ -380,6 +468,23 @@ export interface CreateAgentRequestOptions extends AgentConfigOverrides {
   labels?: Record<string, string>;
 }
 
+export interface CreateWorkspaceRequestOptions {
+  source: WorkspaceCreateRequest["source"];
+  title?: string;
+  /** Workspace discovery visibility; contents retain normal durability. */
+  background?: boolean;
+  callerAgentId?: string;
+  idempotencyKey?: string;
+  workspaceId?: string;
+  agent?: Omit<
+    CreateAgentRequestOptions,
+    "workspaceId" | "onEvent" | "worktree" | "git" | "worktreeName" | "idempotencyKey" | "requestId"
+  >;
+  onEvent?: (snapshot: CreationSnapshot) => void;
+  firstAgentContext?: WorkspaceCreateRequest["firstAgentContext"];
+  requestId?: string;
+}
+
 export interface CreatePaseoWorktreeInput extends Pick<
   CreatePaseoWorktreeRequest,
   | "cwd"
@@ -462,6 +567,10 @@ type GetProvidersSnapshotPayload = GetProvidersSnapshotResponseMessage["payload"
 type RefreshProvidersSnapshotPayload = RefreshProvidersSnapshotResponseMessage["payload"];
 type ProviderDiagnosticPayload = ProviderDiagnosticResponseMessage["payload"];
 type ProviderUsageListPayload = ProviderUsageListResponseMessage["payload"];
+interface UsageListReportsPayload {
+  requestId: string;
+  reports: UsageReportEntry[];
+}
 type DaemonStatusPayload = DaemonGetStatusResponse["payload"];
 type DaemonPairingOfferPayload = DaemonGetPairingOfferResponse["payload"];
 type DiagnosticsPayload = DiagnosticsResponse["payload"];
@@ -565,6 +674,17 @@ export interface FetchAgentTimelineOptions {
   timeout?: number;
 }
 
+export interface AgentTimelineSearchOptions {
+  agentId: string;
+  query: string;
+  cursor?: number;
+}
+
+export type AgentTimelineSearchPayload = Extract<
+  SessionOutboundMessage,
+  { type: "agent.timeline.search.response" }
+>["payload"];
+
 export type AgentTimelinePromptIndexPayload = Extract<
   SessionOutboundMessage,
   { type: "agent.timeline.list_prompts.response" }
@@ -641,6 +761,7 @@ type FetchAgentsPayload = Extract<
 >["payload"];
 type FetchAgentsRequest = Extract<SessionInboundMessage, { type: "fetch_agents_request" }>;
 export type FetchAgentsOptions = Omit<FetchAgentsRequest, "type" | "requestId"> & {
+  signal?: AbortSignal;
   requestId?: string;
   timeout?: number;
 };
@@ -680,6 +801,7 @@ type FetchWorkspacesPayload = Extract<
 >["payload"];
 type FetchWorkspacesRequest = Extract<SessionInboundMessage, { type: "fetch_workspaces_request" }>;
 export type FetchWorkspacesOptions = Omit<FetchWorkspacesRequest, "type" | "requestId"> & {
+  signal?: AbortSignal;
   requestId?: string;
 };
 export type FetchWorkspacesEntry = FetchWorkspacesPayload["entries"][number];
@@ -860,13 +982,25 @@ type SetDaemonConfigResponse = Extract<
 >;
 type CorrelatedResponseMessage =
   | Extract<SessionOutboundMessage, { payload: { requestId: string } }>
+  | Extract<SessionOutboundMessage, { type: "terminals_changed" }>
   | GetDaemonConfigResponse
   | SetDaemonConfigResponse;
 type CorrelatedResponseType = CorrelatedResponseMessage["type"];
-type CorrelatedResponsePayload<TType extends CorrelatedResponseType> = Extract<
-  CorrelatedResponseMessage,
-  { type: TType }
->["payload"];
+type CorrelatedResponsePayloads = {
+  [Message in CorrelatedResponseMessage as Message["type"]]: Message["payload"];
+};
+type CorrelatedResponsePayload<TType extends CorrelatedResponseType> =
+  CorrelatedResponsePayloads[TType];
+
+export class DaemonConnectionError extends Error {
+  constructor(
+    message: string,
+    readonly code: "DAEMON_CONNECTION_LOST" | "DAEMON_REQUEST_TIMEOUT" = "DAEMON_CONNECTION_LOST",
+  ) {
+    super(message);
+    this.name = "DaemonConnectionError";
+  }
+}
 
 class DaemonRpcError extends Error {
   readonly requestId: string;
@@ -1043,7 +1177,7 @@ function toReasonCode(reason: string | null | undefined): string | null {
 }
 
 interface PendingSend {
-  message: SessionInboundMessage;
+  send: () => void;
   resolve: () => void;
   reject: (error: Error) => void;
   timeoutHandle: ReturnType<typeof setTimeout>;
@@ -1061,8 +1195,59 @@ interface PingProbe {
   drivesLivenessFailure: boolean;
 }
 
+// COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+export function supportsUsageReports(features: ServerInfoStatusPayload["features"]): boolean {
+  return features?.usageSources === true || features?.providerUsageList === true;
+}
+
+function buildFetchAgentsRequest(
+  options: FetchAgentsOptions | undefined,
+  requestId: string,
+): SessionInboundMessage {
+  return SessionInboundMessageSchema.parse({
+    type: "fetch_agents_request",
+    requestId,
+    ...(options?.scope ? { scope: options.scope } : {}),
+    ...(options?.filter ? { filter: options.filter } : {}),
+    ...(options?.sort ? { sort: options.sort } : {}),
+    ...(options?.page ? { page: options.page } : {}),
+    ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
+    ...(options?.sync ? { sync: options.sync } : {}),
+    ...(options?.includeBackground !== undefined
+      ? { includeBackground: options.includeBackground }
+      : {}),
+  });
+}
+
 export class DaemonClient {
+  private readonly providerSnapshotUpdates = new ProviderSnapshotUpdates({
+    active: (message) => this.owned.owns(message),
+    fetch: (cwd) => this.requestProvidersSnapshot({ cwd }),
+    emit: (message) => this.deliverSessionMessage(message),
+    failed: (error) => this.logger.error({ err: error }, "Failed to resolve provider snapshot"),
+  });
+  private readonly owned = new ConnectionSubscriptions({
+    send: (message) =>
+      this.sendSessionMessageOrThrow(
+        SessionInboundMessageSchema.parse({ ...message, requestId: this.createRequestId() }),
+      ),
+    release: async (subscriptionId) => {
+      if (!this.isConnected) return;
+      try {
+        await this.sendCorrelatedSessionRequest({
+          message: { type: "subscription.release.request", subscriptionId },
+          responseType: "subscription.release.response",
+        });
+      } catch (error) {
+        this.disposeTransport(1001, "Subscription release failed");
+        this.scheduleReconnect({ reason: "Subscription release failed" });
+        throw error;
+      }
+    },
+    failed: (error) => this.logger.error({ err: error }, "Subscription failed"),
+  });
   private transport: DaemonTransport | null = null;
+  private helloAuth: HelloAuth;
   private transportCleanup: Array<() => void> = [];
   private rawMessageListeners: Set<(message: SessionOutboundMessage) => void> = new Set();
   private messageHandlers: Map<
@@ -1082,19 +1267,8 @@ export class DaemonClient {
   private connectResolve: (() => void) | null = null;
   private connectReject: ((error: Error) => void) | null = null;
   private lastErrorValue: string | null = null;
+  private authFailureReasonValue: DaemonAuthFailureReason | null = null;
   private connectionState: ConnectionState = { status: "idle" };
-  private checkoutDiffSubscriptions = new Map<
-    string,
-    {
-      cwd: string;
-      compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
-    }
-  >();
-  private terminalDirectorySubscriptions = new Map<string, { cwd: string; workspaceId?: string }>();
-  private fileSubscriptions = new Map<
-    string,
-    { cwd: string; path: string; onUpdate: (version: FileVersion) => void }
-  >();
   private readonly terminalStreams = new TerminalStreamRouter();
   private pendingBinaryFileReads = new Map<string, PendingBinaryFileRead>();
   private activeBinaryFileTransfers = new Map<string, BinaryFileTransferState>();
@@ -1109,6 +1283,7 @@ export class DaemonClient {
   private runtimeMetricsInterval: ReturnType<typeof setInterval> | null = null;
   private runtimeMetrics: DaemonClientRuntimeMetrics | null = null;
   private pingProbe: PingProbe | null = null;
+  private connectionVerification: DaemonTransport | null = null;
   private livenessHeartbeatTimer: ReturnType<typeof setTimeout> | null = null;
   private lastLivenessRttMs: number | null = null;
   private consecutiveLivenessFailures = 0;
@@ -1184,7 +1359,7 @@ export class DaemonClient {
     return this.connectPromise;
   }
 
-  private attemptConnect(): void {
+  private async attemptConnect(): Promise<void> {
     if (this.connectionState.status === "disposed") {
       this.rejectConnect(new Error("Daemon client is disposed"));
       return;
@@ -1197,34 +1372,38 @@ export class DaemonClient {
     if (this.connectionState.status === "connecting") {
       return;
     }
-
-    const headers: Record<string, string> = {};
-    const password = normalizePassword(this.config.password);
-    if (password) {
-      headers.Authorization = `Bearer ${password}`;
-    } else if (this.config.authHeader) {
-      headers.Authorization = this.config.authHeader;
+    // This attempt supersedes any retry the last disconnect scheduled. Left
+    // armed, that retry would tear down the connection this attempt opens.
+    if (this.reconnectTimeout) {
+      clearTimeout(this.reconnectTimeout);
+      this.reconnectTimeout = null;
     }
-    const protocols = password ? [`paseo.bearer.${password}`] : undefined;
 
     try {
+      const resolution = resolveConnectionAuth(this.config);
+      const selected = resolution instanceof Promise ? await resolution : resolution;
+      if (!this.shouldReconnect) return;
+      this.helloAuth = selected.helloAuth;
       // Reconnect can overlap with browser close/error delivery ordering.
       // Always dispose previous transport before constructing the next one.
       this.disposeTransport();
       const baseTransportFactory =
         this.config.transportFactory ??
         createWebSocketTransportFactory(this.config.webSocketFactory ?? defaultWebSocketFactory);
-      const shouldUseRelayE2ee =
-        this.config.e2ee?.enabled === true && isRelayClientWebSocketUrl(this.config.url);
+      const isRelayTransport = isRelayClientWebSocketUrl(this.config.url);
+      const shouldUseRelayE2ee = this.config.e2ee?.enabled === true && isRelayTransport;
+      this.assertEncryptedRelayAuth(selected.helloAuth, isRelayTransport);
 
-      let transportFactory = baseTransportFactory;
+      let transportFactory = isRelayTransport
+        ? createRelayTransportFactory(baseTransportFactory)
+        : baseTransportFactory;
       if (shouldUseRelayE2ee) {
         const daemonPublicKeyB64 = this.config.e2ee?.daemonPublicKeyB64;
         if (!daemonPublicKeyB64) {
           throw new Error("daemonPublicKeyB64 is required for relay E2EE");
         }
         transportFactory = createRelayE2eeTransportFactory({
-          baseFactory: baseTransportFactory,
+          baseFactory: transportFactory,
           daemonPublicKeyB64,
           logger: this.logger,
         });
@@ -1232,11 +1411,12 @@ export class DaemonClient {
       const transportUrl = this.resolveTransportUrlForAttempt();
       const transport = transportFactory({
         url: transportUrl,
-        headers,
-        ...(protocols ? { protocols } : {}),
+        headers: selected.headers,
+        ...(selected.protocols ? { protocols: selected.protocols } : {}),
       });
       this.transport = transport;
       this.lastServerInfoMessage = null;
+      this.authFailureReasonValue = null;
 
       this.updateConnectionState(
         {
@@ -1267,7 +1447,7 @@ export class DaemonClient {
             this.pendingGenericTransportErrorTimeout = null;
           }
           this.lastErrorValue = null;
-          this.sendHelloMessage();
+          void this.sendHelloMessage();
         }),
         transport.onClose((event) => {
           this.resetConnectTimeout();
@@ -1275,7 +1455,10 @@ export class DaemonClient {
             clearTimeout(this.pendingGenericTransportErrorTimeout);
             this.pendingGenericTransportErrorTimeout = null;
           }
-          const reason = describeTransportClose(event);
+          this.authFailureReasonValue ??= authFailureFromLegacyClose(event);
+          const reason = this.authFailureReasonValue
+            ? new DaemonAuthenticationError(this.authFailureReasonValue).message
+            : describeTransportClose(event);
           if (reason) {
             this.lastErrorValue = reason;
           }
@@ -1324,7 +1507,9 @@ export class DaemonClient {
             reasonCode: "transport_error",
           });
         }),
-        transport.onMessage((data) => this.handleTransportMessage(data)),
+        transport.onMessage((data) => {
+          if (this.transport === transport) this.handleTransportMessage(data);
+        }),
       ];
     } catch (error) {
       this.resetConnectTimeout();
@@ -1339,6 +1524,12 @@ export class DaemonClient {
     }
   }
 
+  private assertEncryptedRelayAuth(helloAuth: HelloAuth, isRelayTransport: boolean): void {
+    if (!isRelayTransport || !helloAuth || this.config.e2ee?.enabled === true) return;
+    this.setReconnectEnabled(false);
+    throw new Error("Relay credentials require E2EE");
+  }
+
   private resolveConnect(): void {
     if (this.connectResolve) {
       this.connectResolve();
@@ -1371,11 +1562,13 @@ export class DaemonClient {
     }
     this.resetConnectTimeout();
     this.disposeTransport(1000, "Client closed");
+    this.providerSnapshotUpdates.clear();
     this.clearWaiters(new Error("Daemon client closed"));
+    await this.owned.close();
+    this.creations.close();
     this.rejectPendingSendQueue(new Error("Daemon client closed"));
     this.rejectPingProbe(new Error("Daemon client closed"));
     this.terminalStreams.clearSlots();
-    this.fileSubscriptions.clear();
     this.lastServerInfoMessage = null;
     if (this.runtimeMetricsInterval) {
       clearInterval(this.runtimeMetricsInterval);
@@ -1389,22 +1582,47 @@ export class DaemonClient {
     );
   }
 
-  ensureConnected(): void {
+  ensureConnected(options?: { verify?: boolean }): void {
     if (this.connectionState.status === "disposed") {
       return;
     }
     if (!this.shouldReconnect) {
       this.shouldReconnect = true;
     }
-    if (
-      this.connectionState.status === "connected" ||
-      this.connectionState.status === "connecting"
-    ) {
+    if (this.connectionState.status === "connected") {
+      if (options?.verify) this.verifyConnection();
+      return;
+    }
+    if (this.connectionState.status === "connecting") return;
+    if (this.connectPromise) {
+      this.attemptConnect();
       return;
     }
     void this.connect();
   }
 
+  private verifyConnection(): void {
+    const transport = this.transport;
+    if (!transport || this.connectionVerification === transport) return;
+    this.connectionVerification = transport;
+    // A session probe has its own deadline, independent of a heartbeat that the OS
+    // may have suspended. A successful response also proves the session can serve RPCs.
+    void this.ping({ timeoutMs: 3_000 })
+      .catch((error: unknown) => {
+        if (this.transport !== transport || this.connectionState.status !== "connected") return;
+        this.disposeTransport(1001, "Connection verification failed");
+        this.scheduleReconnect({
+          reason: error instanceof Error ? error.message : String(error),
+          event: "CONNECTION_VERIFICATION_FAILED",
+          reasonCode: "liveness_timeout",
+        });
+        this.ensureConnected();
+      })
+      .finally(() => {
+        if (this.connectionVerification === transport) this.connectionVerification = null;
+      });
+  }
+
   getConnectionState(): ConnectionState {
     return this.connectionState;
   }
@@ -1429,6 +1647,10 @@ export class DaemonClient {
     return this.lastErrorValue;
   }
 
+  get authFailureReason(): DaemonAuthFailureReason | null {
+    return this.authFailureReasonValue;
+  }
+
   getLastLivenessRttMs(): number | null {
     return this.lastLivenessRttMs;
   }
@@ -1439,7 +1661,9 @@ export class DaemonClient {
 
   subscribe(handler: DaemonEventHandler): () => void {
     this.eventListeners.add(handler);
-    return () => this.eventListeners.delete(handler);
+    return () => {
+      this.eventListeners.delete(handler);
+    };
   }
 
   subscribeRawMessages(handler: (message: SessionOutboundMessage) => void): () => void {
@@ -1541,7 +1765,7 @@ export class DaemonClient {
 
   private sendTransportFrame(frame: string | Uint8Array | ArrayBuffer): void {
     if (!this.transport) {
-      throw new Error("Transport not connected");
+      throw new DaemonConnectionError("Transport not connected");
     }
     const isOpen = this.beginTraceSection("paseo.ws.frame.outbound", {
       kind: typeof frame === "string" ? "text" : "binary",
@@ -1605,12 +1829,23 @@ export class DaemonClient {
    * This prevents waiters from hanging forever when called during connection.
    */
   private sendSessionMessageOrThrow(message: SessionInboundMessage): Promise<void> {
+    return this.sendWhenConnected(() => {
+      const payload = SessionInboundMessageSchema.parse(message);
+      this.sendJsonMessage("session", payload.type, { type: "session", message: payload });
+    });
+  }
+
+  /** Resolves once connected, waiting out a connection that is still being established. */
+  private whenConnected(): Promise<void> {
+    return this.sendWhenConnected(() => undefined);
+  }
+
+  private sendWhenConnected(send: () => void): Promise<void> {
     const status = this.connectionState.status;
 
     // If connected, send immediately
     if (this.transport && status === "connected") {
-      const payload = SessionInboundMessageSchema.parse(message);
-      this.sendJsonMessage("session", payload.type, { type: "session", message: payload });
+      send();
       return Promise.resolve();
     }
 
@@ -1623,15 +1858,20 @@ export class DaemonClient {
           if (idx !== -1) {
             this.pendingSendQueue.splice(idx, 1);
           }
-          reject(new Error(`Timed out waiting for connection to send message`));
+          reject(
+            new DaemonConnectionError(
+              "Timed out waiting for connection to send message",
+              "DAEMON_REQUEST_TIMEOUT",
+            ),
+          );
         }, DEFAULT_SEND_QUEUE_TIMEOUT_MS);
 
-        this.pendingSendQueue.push({ message, resolve, reject, timeoutHandle });
+        this.pendingSendQueue.push({ send, resolve, reject, timeoutHandle });
       });
     }
 
     // Not connected and not connecting - fail immediately
-    return Promise.reject(new Error(`Transport not connected (status: ${status})`));
+    return Promise.reject(new DaemonConnectionError(`Transport not connected (status: ${status})`));
   }
 
   /**
@@ -1645,11 +1885,10 @@ export class DaemonClient {
       clearTimeout(pending.timeoutHandle);
       try {
         if (this.transport && this.connectionState.status === "connected") {
-          const payload = SessionInboundMessageSchema.parse(pending.message);
-          this.sendJsonMessage("session", payload.type, { type: "session", message: payload });
+          pending.send();
           pending.resolve();
         } else {
-          pending.reject(new Error("Connection lost before message could be sent"));
+          pending.reject(new DaemonConnectionError("Connection lost before message could be sent"));
         }
       } catch (error) {
         pending.reject(error instanceof Error ? error : new Error(String(error)));
@@ -1677,6 +1916,7 @@ export class DaemonClient {
     select: (msg: SessionOutboundMessage) => T | null;
     options?: { skipQueue?: boolean };
   }): Promise<T> {
+    const wire = this.owned.prepareRequest(params.message);
     const timeout = params.timeout ?? DEFAULT_SESSION_RPC_TIMEOUT_MS;
     const { promise, cancel } = this.waitForWithCancel<RpcWaitResult<T>>(
       (msg) => {
@@ -1691,7 +1931,7 @@ export class DaemonClient {
             }),
           };
         }
-        const value = params.select(msg);
+        const value = params.select(wire.receive(msg));
         if (value === null) {
           return null;
         }
@@ -1702,7 +1942,7 @@ export class DaemonClient {
     );
 
     try {
-      await this.sendSessionMessageOrThrow(params.message);
+      await this.sendSessionMessageOrThrow(wire.message);
     } catch (error) {
       const err = error instanceof Error ? error : new Error(String(error));
       cancel(err);
@@ -1710,11 +1950,13 @@ export class DaemonClient {
       throw err;
     }
 
-    const result = await promise;
-    if (result.kind === "error") {
-      throw result.error;
+    try {
+      const result = await promise;
+      if (result.kind === "error") throw result.error;
+      return result.value;
+    } finally {
+      await wire.finish();
     }
-    return result.value;
   }
 
   private async sendCorrelatedRequest<
@@ -1796,7 +2038,7 @@ export class DaemonClient {
 
   private sendSessionMessageStrict(message: SessionInboundMessage): void {
     if (!this.transport || this.connectionState.status !== "connected") {
-      throw new Error("Transport not connected");
+      throw new DaemonConnectionError("Transport not connected");
     }
     const payload = SessionInboundMessageSchema.parse(message);
     try {
@@ -1855,6 +2097,20 @@ export class DaemonClient {
     }
   }
 
+  async markWorkspaceUnread(workspaceId: string, requestId?: string): Promise<void> {
+    const response =
+      await this.sendNamespacedCorrelatedSessionRequest<"workspace.mark_unread.response">({
+        requestId,
+        message: {
+          type: "workspace.mark_unread.request",
+          workspaceId,
+        },
+      });
+    if (!response.success) {
+      throw new Error(response.error ?? "Failed to mark workspace unread");
+    }
+  }
+
   sendHeartbeat(params: {
     deviceType: "web" | "mobile";
     focusedAgentId: string | null;
@@ -2030,18 +2286,125 @@ export class DaemonClient {
   // Agent RPCs (requestId-correlated)
   // ============================================================================
 
-  async fetchAgents(options?: FetchAgentsOptions): Promise<FetchAgentsPayload> {
+  private observe<T extends CorrelatedResponseType>(
+    responseType: T,
+    message: { type: SessionInboundMessage["type"] } & Record<string, unknown>,
+    options?: { requestId?: string; timeout?: number; signal?: AbortSignal },
+  ): OwnedSubscription<CorrelatedResponsePayload<T>> {
+    let resetSource = false;
+    return this.owned.observeRequest<CorrelatedResponsePayload<T>>(
+      message,
+      async (query, accept) => {
+        resetSource = false;
+        const requestId = this.createRequestId(options?.requestId);
+        const request = SessionInboundMessageSchema.parse({ ...query, requestId });
+        try {
+          return await this.sendCorrelatedRequest<T, CorrelatedResponsePayload<T>>({
+            message: request,
+            responseType,
+            requestId,
+            timeout: options?.timeout,
+            options: { skipQueue: true },
+            selectPayload: (payload): CorrelatedResponsePayload<T> | null => {
+              if ("error" in payload && typeof payload.error === "string")
+                throw new DaemonRpcError({
+                  requestId: payload.requestId,
+                  requestType: message.type,
+                  error: payload.error,
+                });
+              accept(payload);
+              return payload;
+            },
+          });
+        } catch (error) {
+          resetSource = !(error instanceof DaemonRpcError) && this.isConnected;
+          throw error;
+        }
+      },
+      options?.signal,
+      () => {
+        // Reject and release this handle before closing a source with an unknown bootstrap outcome.
+        // Closing first would classify the failure as a reconnect and replay the failed request.
+        if (resetSource) {
+          this.disposeTransport(1001, "Subscription request failed");
+          this.scheduleReconnect({ reason: "Subscription request failed" });
+        }
+      },
+    );
+  }
+
+  registerBrowserHost(
+    registration: Omit<
+      Extract<SessionInboundMessage, { type: "browser.host.register.request" }>,
+      "type" | "requestId"
+    >,
+    options?: { signal?: AbortSignal },
+  ): OwnedSubscription<CorrelatedResponsePayload<"browser.host.register.response">> {
+    return this.observe(
+      "browser.host.register.response",
+      { type: "browser.host.register.request", ...registration },
+      options,
+    );
+  }
+
+  observeEvents(
+    events: SessionEventSubscription[],
+    options?: { signal?: AbortSignal; notifications?: boolean },
+  ): OwnedSubscription<CorrelatedResponsePayload<"session.events.set_subscription.response">> {
+    return this.observe(
+      "session.events.set_subscription.response",
+      {
+        type: "session.events.set_subscription.request",
+        events,
+        notifications: options?.notifications,
+      },
+      options,
+    );
+  }
+
+  observeAgents(
+    options: Omit<FetchAgentsOptions, "subscribe"> = {},
+  ): OwnedSubscription<FetchAgentsPayload> {
+    if (options.includeBackground || options.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
+    const { signal, requestId, timeout, ...query } = options;
+    return this.observe(
+      "fetch_agents_response",
+      { ...query, type: "fetch_agents_request", subscribe: {} },
+      { signal, requestId, timeout },
+    );
+  }
+
+  observeWorkspaces(
+    options: Omit<FetchWorkspacesOptions, "subscribe"> = {},
+  ): OwnedSubscription<FetchWorkspacesPayload> {
+    if (options.includeBackground || options.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
+    const { signal, requestId, ...query } = options;
+    return this.observe(
+      "fetch_workspaces_response",
+      { ...query, type: "fetch_workspaces_request", subscribe: {} },
+      { signal, requestId },
+    );
+  }
+
+  fetchAgents(
+    options: FetchAgentsOptions & { subscribe: {} },
+  ): Promise<FetchAgentsPayload & { subscription: OwnedSubscription<FetchAgentsPayload> }>;
+  fetchAgents(options?: FetchAgentsOptions): Promise<FetchAgentsPayload>;
+  async fetchAgents(
+    options?: FetchAgentsOptions,
+  ): Promise<FetchAgentsPayload & { subscription?: OwnedSubscription<FetchAgentsPayload> }> {
+    if (options?.includeBackground || options?.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
+    if (options?.subscribe) {
+      if (options.subscribe.subscriptionId !== undefined)
+        throw new Error("Subscription IDs are assigned by the host");
+      const subscription = this.observeAgents(options);
+      return { ...(await subscription.ready), subscription };
+    }
     const resolvedRequestId = this.createRequestId(options?.requestId);
-    const message = SessionInboundMessageSchema.parse({
-      type: "fetch_agents_request",
-      requestId: resolvedRequestId,
-      ...(options?.scope ? { scope: options.scope } : {}),
-      ...(options?.filter ? { filter: options.filter } : {}),
-      ...(options?.sort ? { sort: options.sort } : {}),
-      ...(options?.page ? { page: options.page } : {}),
-      ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
-      ...(options?.sync ? { sync: options.sync } : {}),
-    });
+    const message = buildFetchAgentsRequest(options, resolvedRequestId);
     return this.sendRequest({
       requestId: resolvedRequestId,
       message,
@@ -2060,6 +2423,7 @@ export class DaemonClient {
   }
 
   async fetchAgentHistory(options?: FetchAgentHistoryOptions): Promise<FetchAgentHistoryPayload> {
+    if (options?.filter?.includeBackground) this.requireBackgroundWorkspaces();
     const resolvedRequestId = this.createRequestId(options?.requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "fetch_agent_history_request",
@@ -2114,16 +2478,28 @@ export class DaemonClient {
     });
   }
 
-  async fetchWorkspaces(options?: FetchWorkspacesOptions): Promise<FetchWorkspacesPayload> {
+  fetchWorkspaces(
+    options: FetchWorkspacesOptions & { subscribe: {} },
+  ): Promise<FetchWorkspacesPayload & { subscription: OwnedSubscription<FetchWorkspacesPayload> }>;
+  fetchWorkspaces(options?: FetchWorkspacesOptions): Promise<FetchWorkspacesPayload>;
+  async fetchWorkspaces(
+    options?: FetchWorkspacesOptions,
+  ): Promise<
+    FetchWorkspacesPayload & { subscription?: OwnedSubscription<FetchWorkspacesPayload> }
+  > {
+    if (options?.includeBackground || options?.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
+    if (options?.subscribe) {
+      if (options.subscribe.subscriptionId !== undefined)
+        throw new Error("Subscription IDs are assigned by the host");
+      const subscription = this.observeWorkspaces(options);
+      return { ...(await subscription.ready), subscription };
+    }
     const resolvedRequestId = this.createRequestId(options?.requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "fetch_workspaces_request",
+      ...options,
       requestId: resolvedRequestId,
-      ...(options?.filter ? { filter: options.filter } : {}),
-      ...(options?.sort ? { sort: options.sort } : {}),
-      ...(options?.page ? { page: options.page } : {}),
-      ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
-      ...(options?.sync ? { sync: options.sync } : {}),
     });
     return this.sendRequest({
       requestId: resolvedRequestId,
@@ -2141,21 +2517,31 @@ export class DaemonClient {
     });
   }
 
-  listWorkspaceLabels(options: {
-    subscriptionId: string;
-    sync?: { generation: string; afterSeq: number };
-    requestId?: string;
-  }): Promise<WorkspaceLabelListPayload> {
+  listWorkspaceLabels(
+    options: {
+      sync?: { generation: string; afterSeq: number };
+      requestId?: string;
+    } = {},
+  ): Promise<WorkspaceLabelListPayload> {
     return this.sendNamespacedCorrelatedSessionRequest({
       requestId: options.requestId,
       message: {
         type: "workspace.label.list.request",
-        subscribe: { subscriptionId: options.subscriptionId },
         ...(options.sync ? { sync: options.sync } : {}),
       },
     });
   }
 
+  observeWorkspaceLabels(options?: {
+    signal?: AbortSignal;
+  }): OwnedSubscription<WorkspaceLabelListPayload> {
+    return this.observe(
+      "workspace.label.list.response",
+      { type: "workspace.label.list.request", subscribe: {} },
+      options,
+    );
+  }
+
   setWorkspaceLabel(options: {
     workspaceId: string;
     label: Extract<
@@ -2443,58 +2829,73 @@ export class DaemonClient {
     return { agent: payload.agent, project: payload.project ?? null };
   }
 
-  private resubscribeCheckoutDiffSubscriptions(): void {
-    if (this.checkoutDiffSubscriptions.size === 0) {
-      return;
-    }
-    for (const [subscriptionId, subscription] of this.checkoutDiffSubscriptions) {
-      const message = SessionInboundMessageSchema.parse({
-        type: "subscribe_checkout_diff_request",
-        subscriptionId,
-        cwd: subscription.cwd,
-        compare: subscription.compare,
-        requestId: this.createRequestId(),
-      });
-      this.sendSessionMessage(message);
-    }
-  }
-
-  private resubscribeTerminalDirectorySubscriptions(): void {
-    if (this.terminalDirectorySubscriptions.size === 0) {
-      return;
-    }
-    for (const subscription of this.terminalDirectorySubscriptions.values()) {
-      this.sendSessionMessage({
-        type: "subscribe_terminals_request",
-        cwd: subscription.cwd,
-        ...(subscription.workspaceId !== undefined
-          ? { workspaceId: subscription.workspaceId }
-          : {}),
-      });
-    }
-  }
-
-  private resubscribeFileSubscriptions(): void {
-    for (const [subscriptionId, subscription] of this.fileSubscriptions) {
-      void this.sendCorrelatedSessionRequest({
-        message: {
-          type: "fs.file.subscribe.request",
-          cwd: subscription.cwd,
-          path: subscription.path,
-          subscriptionId,
-        },
-        responseType: "fs.file.subscribe.response",
-      })
-        .then((payload) => subscription.onUpdate(payload.initial))
-        .catch(() => undefined);
-    }
-  }
-
   // ============================================================================
   // Agent Lifecycle
   // ============================================================================
 
+  private readonly creations = new CreationClient({
+    supports: (feature) => this.lastServerInfoMessage?.features?.[feature] === true,
+    requestId: () => this.createRequestId(),
+    request: (kind, input) =>
+      kind === "workspace"
+        ? this.sendCorrelatedSessionRequest({
+            requestId: input.requestId as string | undefined,
+            message: { ...input, type: "workspace.create.request" },
+            responseType: "workspace.create.response",
+            timeout: 0,
+          })
+        : this.sendCorrelatedSessionRequest({
+            requestId: input.requestId as string | undefined,
+            message: { ...input, type: "agent.create.request" },
+            responseType: "agent.create.response",
+            timeout: 0,
+          }),
+    observe: (kind, idempotencyKey, next, error) => {
+      const observation = this.observe("creation.subscribe.response", {
+        type: "creation.subscribe.request",
+        kind,
+        idempotencyKey,
+      });
+      observation.subscribe({
+        snapshot: (result) => next(result.snapshot),
+        update: (message) => {
+          if (message.type === "workspace.create.update" || message.type === "agent.create.update")
+            next(message.payload);
+        },
+        error,
+      });
+      return () => {
+        void observation.release().catch(error);
+      };
+    },
+    legacyAgent: (input) => this.createLegacyAgent(input),
+    legacyWorkspace: (input) => this.createLegacyWorkspace(input, input.requestId),
+  });
+
+  // Background workspaces are gated once at the transport boundary.
+  private requireBackgroundWorkspaces(): void {
+    if (this.lastServerInfoMessage?.features?.backgroundWorkspaces !== true) {
+      throw new Error("Update the host to use background workspaces.");
+    }
+  }
+
+  supportsBackgroundWorkspaces(): boolean {
+    return this.lastServerInfoMessage?.features?.backgroundWorkspaces === true;
+  }
+
   async createAgent(options: CreateAgentRequestOptions): Promise<AgentSnapshotPayload> {
+    if (options.background !== undefined) this.requireBackgroundWorkspaces();
+    const result = await this.creations.createAgent({
+      ...options,
+      config: resolveAgentConfig(options),
+    });
+    if (result.error || !result.agent) throw new Error(result.error ?? "Agent creation failed");
+    return result.agent;
+  }
+
+  private async createLegacyAgent(
+    options: CreateAgentRequestOptions,
+  ): Promise<AgentSnapshotPayload> {
     const requestId = this.createRequestId(options.requestId);
     const config = resolveAgentConfig(options);
 
@@ -2506,6 +2907,7 @@ export class DaemonClient {
       ...(options.workspaceId !== undefined ? { workspaceId: options.workspaceId } : {}),
       ...(options.callerAgentId !== undefined ? { callerAgentId: options.callerAgentId } : {}),
       ...(options.initialPrompt ? { initialPrompt: options.initialPrompt } : {}),
+      idempotencyKey: options.idempotencyKey,
       ...(options.clientMessageId ? { clientMessageId: options.clientMessageId } : {}),
       ...(options.outputSchema ? { outputSchema: options.outputSchema } : {}),
       ...(options.images && options.images.length > 0 ? { images: options.images } : {}),
@@ -2515,6 +2917,7 @@ export class DaemonClient {
       ...(options.git ? { git: options.git } : {}),
       ...(options.worktree ? { worktree: options.worktree } : {}),
       ...(options.autoArchive !== undefined ? { autoArchive: options.autoArchive } : {}),
+      ...(options.background !== undefined ? { background: options.background } : {}),
       ...(options.worktreeName ? { worktreeName: options.worktreeName } : {}),
       ...(options.labels && Object.keys(options.labels).length > 0
         ? { labels: options.labels }
@@ -2907,6 +3310,21 @@ export class DaemonClient {
     return { seq: payload.seq, epoch: payload.epoch };
   }
 
+  async searchAgentTimeline({
+    agentId,
+    query,
+    cursor,
+  }: AgentTimelineSearchOptions): Promise<AgentTimelineSearchPayload> {
+    const requestId = this.createRequestId();
+    const payload = await this.sendCorrelatedSessionRequest({
+      requestId,
+      message: { type: "agent.timeline.search.request", requestId, agentId, query, cursor },
+      responseType: "agent.timeline.search.response",
+    });
+    if (payload.error) throw new Error(payload.error);
+    return payload;
+  }
+
   async listAgentTimelinePrompts(
     agentId: string,
     options: { requestId?: string; timeout?: number } = {},
@@ -2966,6 +3384,10 @@ export class DaemonClient {
     subagentId: string,
     options: FetchProviderSubagentTimelineOptions = {},
   ): Promise<ProviderSubagentTimelinePayload> {
+    // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove after 2027-03-14.
+    if (this.lastServerInfoMessage?.features?.projectedSubagentTimeline !== true) {
+      throw new Error("Update the host to view subagent conversations.");
+    }
     const requestId = this.createRequestId(options.requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "agent.provider_subagents.timeline.get.request",
@@ -2993,33 +3415,24 @@ export class DaemonClient {
     return payload;
   }
 
-  async setAgentTimelineSubscription(agentIds: string[]): Promise<void> {
-    // COMPAT(selectiveAgentTimeline): added in v0.1.106. Old daemons keep their
-    // legacy global stream and do not understand this RPC. Remove after
-    // 2027-01-12 once the supported daemon floor is >= v0.1.106.
-    if (!this.lastServerInfoMessage?.features?.selectiveAgentTimeline) {
-      return;
-    }
+  observeTimeline(
+    agentIds: string[],
+    options?: { signal?: AbortSignal },
+  ): OwnedSubscription<CorrelatedResponsePayload<"agent.timeline.set_subscription.response">> {
+    return this.observe(
+      "agent.timeline.set_subscription.response",
+      { type: "agent.timeline.set_subscription.request", agentIds },
+      options,
+    );
+  }
 
-    const requestId = this.createRequestId();
-    const normalizedAgentIds = [...new Set(agentIds)].sort();
-    const message = SessionInboundMessageSchema.parse({
-      type: "agent.timeline.set_subscription.request",
-      agentIds: normalizedAgentIds,
-      requestId,
-    });
-
-    await this.sendRequest({
-      requestId,
-      message,
-      options: { skipQueue: true },
-      select: (response) => {
-        if (response.type !== "agent.timeline.set_subscription.response") {
-          return null;
-        }
-        return response.payload.requestId === requestId ? response.payload : null;
-      },
-    });
+  subscribeAgentTimeline(
+    agentId: string,
+    handler: (message: TimelineMessage) => void,
+  ): TimelineSubscription {
+    return subscribeTimeline(agentId, this.observeTimeline([agentId]), handler, (error) =>
+      this.logger.error({ err: error }, "Timeline observation failed"),
+    );
   }
 
   async buildAgentForkContext(
@@ -3067,6 +3480,12 @@ export class DaemonClient {
     text: string,
     options?: SendMessageOptions,
   ): Promise<void> {
+    if (
+      options?.sourceAgentId &&
+      this.lastServerInfoMessage?.features?.agentMessageProvenance !== true
+    ) {
+      throw new Error("Update the Paseo host to send messages with agent provenance.");
+    }
     const requestId = this.createRequestId();
     const messageId = options?.messageId ?? crypto.randomUUID();
     const message = SessionInboundMessageSchema.parse({
@@ -3074,6 +3493,7 @@ export class DaemonClient {
       requestId,
       agentId,
       text,
+      sourceAgentId: options?.sourceAgentId,
       ...(messageId ? { messageId } : {}),
       ...(options?.activeTurnBehavior ? { activeTurnBehavior: options.activeTurnBehavior } : {}),
       ...(options?.images ? { images: options.images } : {}),
@@ -3313,7 +3733,11 @@ export class DaemonClient {
     return payload.notice ?? null;
   }
 
-  async restartServer(reason?: string, requestId?: string): Promise<RestartRequestedStatusPayload> {
+  async restartServer(
+    reason?: string,
+    requestId?: string,
+    options?: { timeout?: number },
+  ): Promise<RestartRequestedStatusPayload> {
     const resolvedRequestId = this.createRequestId(requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "restart_server_request",
@@ -3323,6 +3747,7 @@ export class DaemonClient {
     return this.sendRequest({
       requestId: resolvedRequestId,
       message,
+      timeout: options?.timeout,
       options: { skipQueue: true },
       select: (msg) => {
         if (msg.type !== "status") {
@@ -3726,79 +4151,31 @@ export class DaemonClient {
     compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
     requestId?: string,
   ): Promise<CheckoutDiffPayload> {
-    const oneShotSubscriptionId = `oneshot-checkout-diff:${crypto.randomUUID()}`;
-    try {
-      const payload = await this.subscribeCheckoutDiff(cwd, compare, {
-        subscriptionId: oneShotSubscriptionId,
-        requestId,
-      });
-      return {
-        cwd: payload.cwd,
-        files: payload.files,
-        error: payload.error,
-        diffTooLarge: payload.diffTooLarge,
-        requestId: payload.requestId,
-      };
-    } finally {
-      try {
-        this.unsubscribeCheckoutDiff(oneShotSubscriptionId);
-      } catch {
-        // Ignore disconnect races during one-shot cleanup.
-      }
-    }
+    return this.sendCorrelatedSessionRequest({
+      message: {
+        type: "checkout.diff.get.request",
+        cwd,
+        compare: this.normalizeCheckoutDiffCompare(compare),
+      },
+      responseType: "checkout.diff.get.response",
+      requestId,
+    });
   }
 
-  async subscribeCheckoutDiff(
+  observeCheckoutDiff(
     cwd: string,
     compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
-    options?: { subscriptionId?: string; requestId?: string },
-  ): Promise<SubscribeCheckoutDiffPayload> {
-    const subscriptionId = options?.subscriptionId ?? crypto.randomUUID();
-    const normalizedCompare = this.normalizeCheckoutDiffCompare(compare);
-    const previousSubscription = this.checkoutDiffSubscriptions.get(subscriptionId) ?? null;
-    this.checkoutDiffSubscriptions.set(subscriptionId, {
-      cwd,
-      compare: normalizedCompare,
-    });
-
-    const resolvedRequestId = this.createRequestId(options?.requestId);
-    const message = SessionInboundMessageSchema.parse({
-      type: "subscribe_checkout_diff_request",
-      subscriptionId,
-      cwd,
-      compare: normalizedCompare,
-      requestId: resolvedRequestId,
-    });
-
-    try {
-      return await this.sendCorrelatedRequest({
-        requestId: resolvedRequestId,
-        message,
-        responseType: "subscribe_checkout_diff_response",
-        options: { skipQueue: true },
-        selectPayload: (payload) => {
-          if (payload.subscriptionId !== subscriptionId) {
-            return null;
-          }
-          return payload;
-        },
-      });
-    } catch (error) {
-      if (previousSubscription) {
-        this.checkoutDiffSubscriptions.set(subscriptionId, previousSubscription);
-      } else {
-        this.checkoutDiffSubscriptions.delete(subscriptionId);
-      }
-      throw error;
-    }
-  }
-
-  unsubscribeCheckoutDiff(subscriptionId: string): void {
-    this.checkoutDiffSubscriptions.delete(subscriptionId);
-    this.sendSessionMessage({
-      type: "unsubscribe_checkout_diff_request",
-      subscriptionId,
-    });
+    options?: { requestId?: string; signal?: AbortSignal },
+  ): OwnedSubscription<SubscribeCheckoutDiffPayload> {
+    return this.observe(
+      "subscribe_checkout_diff_response",
+      {
+        type: "subscribe_checkout_diff_request",
+        cwd,
+        compare: this.normalizeCheckoutDiffCompare(compare),
+      },
+      options,
+    );
   }
 
   async checkoutCommit(
@@ -4211,11 +4588,31 @@ export class DaemonClient {
   }
 
   async createWorkspace(
-    input: {
-      source: WorkspaceCreateRequest["source"];
-      title?: string;
-      firstAgentContext?: WorkspaceCreateRequest["firstAgentContext"];
-    },
+    input: CreateWorkspaceRequestOptions,
+    requestId?: string,
+  ): Promise<WorkspaceCreatePayload> {
+    const resolvedRequestId = this.createRequestId(requestId ?? input.requestId);
+    if (input.background !== undefined || input.callerAgentId) this.requireBackgroundWorkspaces();
+    if (input.agent?.background !== undefined)
+      throw new Error("Configure background on the workspace, not its initial agent.");
+    const result = await this.creations.createWorkspace({
+      ...input,
+      requestId: resolvedRequestId,
+      ...(input.agent
+        ? { agent: { ...input.agent, config: resolveAgentConfig(input.agent) } }
+        : {}),
+    });
+    return {
+      ...result,
+      workspace: result.workspace ?? null,
+      agent: result.agent ?? undefined,
+      setupTerminalId: result.setupTerminalId ?? null,
+      requestId: result.requestId ?? resolvedRequestId,
+    };
+  }
+
+  private async createLegacyWorkspace(
+    input: CreateWorkspaceRequestOptions,
     requestId?: string,
   ): Promise<WorkspaceCreatePayload> {
     return this.sendCorrelatedSessionRequest({
@@ -4223,7 +4620,14 @@ export class DaemonClient {
       message: {
         type: "workspace.create.request",
         source: input.source,
+        // COMPAT(workspaceRequestReceipts): added in v0.8.0; remove after 2027-03-15 once the daemon floor supports workspace receipts.
+        ...(this.lastServerInfoMessage?.features?.workspaceRequestReceipts &&
+        input.idempotencyKey !== undefined
+          ? { idempotencyKey: input.idempotencyKey }
+          : {}),
         ...(input.title !== undefined ? { title: input.title } : {}),
+        ...(input.background !== undefined ? { background: input.background } : {}),
+        ...(input.callerAgentId ? { callerAgentId: input.callerAgentId } : {}),
         ...(input.firstAgentContext !== undefined
           ? { firstAgentContext: input.firstAgentContext }
           : {}),
@@ -4402,36 +4806,40 @@ export class DaemonClient {
     }
   }
 
+  observeFile(input: {
+    cwd: string;
+    path: string;
+    signal?: AbortSignal;
+  }): OwnedSubscription<CorrelatedResponsePayload<"fs.file.subscribe.response">> {
+    return this.observe(
+      "fs.file.subscribe.response",
+      { type: "fs.file.subscribe.request", cwd: input.cwd, path: input.path },
+      { signal: input.signal },
+    );
+  }
+
   async subscribeFile(
-    input: { cwd: string; path: string },
+    input: { cwd: string; path: string; signal?: AbortSignal },
     onUpdate: (version: FileVersion) => void,
-  ): Promise<{ initial: FileVersion; unsubscribe: () => void }> {
-    const subscriptionId = this.createRequestId();
-    this.fileSubscriptions.set(subscriptionId, { ...input, onUpdate });
-    try {
-      const payload = await this.sendCorrelatedSessionRequest({
-        message: {
-          type: "fs.file.subscribe.request",
-          cwd: input.cwd,
-          path: input.path,
-          subscriptionId,
-        },
-        responseType: "fs.file.subscribe.response",
-      });
-      return {
-        initial: payload.initial,
-        unsubscribe: () => {
-          if (!this.fileSubscriptions.delete(subscriptionId)) return;
-          void this.sendCorrelatedSessionRequest({
-            message: { type: "fs.file.unsubscribe.request", subscriptionId },
-            responseType: "fs.file.unsubscribe.response",
-          }).catch(() => undefined);
-        },
-      };
-    } catch (error) {
-      this.fileSubscriptions.delete(subscriptionId);
-      throw error;
-    }
+  ): Promise<{
+    initial: FileVersion;
+    subscription: OwnedSubscription<CorrelatedResponsePayload<"fs.file.subscribe.response">>;
+    unsubscribe: () => Promise<void>;
+  }> {
+    const subscription = this.observeFile(input);
+    let initial = true;
+    subscription.subscribe({
+      snapshot: (snapshot) => {
+        // The initial version is returned below. Subsequent snapshots repair reconnects.
+        if (!initial) onUpdate(snapshot.initial);
+        initial = false;
+      },
+      update: (message) => {
+        if (message.type === "fs.file.update") onUpdate(message.payload.version);
+      },
+    });
+    const snapshot = await subscription.ready;
+    return { initial: snapshot.initial, subscription, unsubscribe: subscription.release };
   }
 
   async writeFile(input: {
@@ -4501,6 +4909,9 @@ export class DaemonClient {
     if (!bytes) {
       throw new Error("File bytes are required.");
     }
+    // The file frames bypass the send queue, so start only on an open connection.
+    await this.whenConnected();
+    const uploadTransport = this.transport;
     const resolvedRequestId = this.createRequestId(input.requestId);
     const modifiedAt = input.modifiedAt ?? new Date().toISOString();
     const responsePromise = this.sendCorrelatedRequest({
@@ -4517,37 +4928,63 @@ export class DaemonClient {
       options: { skipQueue: true },
     });
 
-    this.sendBinaryFrame(
-      encodeFileTransferFrame({
-        opcode: FileTransferOpcode.FileBegin,
-        requestId: resolvedRequestId,
-        metadata: {
-          mime: input.mimeType,
-          size: bytes.byteLength,
-          encoding: "binary",
-          modifiedAt,
-          fileName: input.fileName,
-        },
-      }),
+    let settled = false;
+    void responsePromise.then(
+      () => {
+        settled = true;
+        return undefined;
+      },
+      () => {
+        settled = true;
+        return undefined;
+      },
     );
-
-    const chunkSize = input.chunkSize ?? 1024 * 1024;
-    for (let offset = 0; offset < bytes.byteLength; offset += chunkSize) {
+    try {
       this.sendBinaryFrame(
         encodeFileTransferFrame({
-          opcode: FileTransferOpcode.FileChunk,
+          opcode: FileTransferOpcode.FileBegin,
           requestId: resolvedRequestId,
-          payload: bytes.subarray(offset, Math.min(offset + chunkSize, bytes.byteLength)),
+          metadata: {
+            mime: input.mimeType,
+            size: bytes.byteLength,
+            encoding: "binary",
+            modifiedAt,
+            fileName: input.fileName,
+          },
         }),
       );
-    }
 
-    this.sendBinaryFrame(
-      encodeFileTransferFrame({
-        opcode: FileTransferOpcode.FileEnd,
-        requestId: resolvedRequestId,
-      }),
-    );
+      const chunkSize = input.chunkSize ?? 128 * 1024;
+      for (let offset = 0; offset < bytes.byteLength; offset += chunkSize) {
+        // Native WebSocket.send encodes binary synchronously. Let rendering and
+        // incoming messages run between bounded pieces on every platform.
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+        if (settled) return await responsePromise;
+        if (this.transport !== uploadTransport || this.connectionState.status !== "connected") {
+          throw new DaemonConnectionError("Connection changed during file upload");
+        }
+        this.sendBinaryFrame(
+          encodeFileTransferFrame({
+            opcode: FileTransferOpcode.FileChunk,
+            requestId: resolvedRequestId,
+            payload: bytes.subarray(offset, Math.min(offset + chunkSize, bytes.byteLength)),
+          }),
+        );
+      }
+
+      this.sendBinaryFrame(
+        encodeFileTransferFrame({
+          opcode: FileTransferOpcode.FileEnd,
+          requestId: resolvedRequestId,
+        }),
+      );
+    } catch (error) {
+      this.rejectWaitersForRequestId(
+        resolvedRequestId,
+        error instanceof Error ? error : new Error(String(error)),
+      );
+      throw error;
+    }
 
     return responsePromise;
   }
@@ -4662,7 +5099,16 @@ export class DaemonClient {
     ifNoneMatch?: string;
     requestId?: string;
   }): Promise<GetProvidersSnapshotPayload> {
-    const payload = await this.sendCorrelatedSessionRequest({
+    const payload = await this.requestProvidersSnapshot(options);
+    return normalizeProvidersSnapshotPayload(payload, this.config.providerSnapshots !== "wire");
+  }
+
+  private requestProvidersSnapshot(options?: {
+    cwd?: string;
+    ifNoneMatch?: string;
+    requestId?: string;
+  }): Promise<GetProvidersSnapshotPayload> {
+    return this.sendCorrelatedSessionRequest({
       requestId: options?.requestId,
       message: {
         type: "get_providers_snapshot_request",
@@ -4671,7 +5117,6 @@ export class DaemonClient {
       },
       responseType: "get_providers_snapshot_response",
     });
-    return normalizeProvidersSnapshotPayload(payload);
   }
 
   async getDaemonConfig(
@@ -4687,6 +5132,10 @@ export class DaemonClient {
   }
 
   async getDaemonStatus(options?: DaemonStatusOptions): Promise<DaemonStatusPayload> {
+    if (!this.lastServerInfoMessage) throw new DaemonConnectionError("Transport not connected");
+    if (this.lastServerInfoMessage?.features?.daemonStatusRpc !== true) {
+      throw new Error("Update the host to read daemon status.");
+    }
     return this.sendCorrelatedSessionRequest({
       requestId: options?.requestId,
       message: {
@@ -4858,6 +5307,107 @@ export class DaemonClient {
     });
   }
 
+  async listUsageReports(
+    options?: {
+      agentId?: string;
+      requestId?: string;
+      forceRefresh?: boolean;
+      reportIds?: string[];
+    },
+    onReport?: (report: UsageReportEntry) => void,
+  ): Promise<UsageListReportsPayload> {
+    const features = this.getLastServerInfoMessage()?.features;
+    if (!supportsUsageReports(features)) {
+      throw new Error("Update the host to see usage.");
+    }
+    if (options?.agentId !== undefined && options.reportIds !== undefined)
+      throw new Error("agentId and reportIds cannot be combined");
+    // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+    if (features?.usageSources !== true) {
+      if (options?.agentId !== undefined)
+        return { requestId: this.createRequestId(options.requestId), reports: [] };
+      // Released hosts serve a five-minute cache and have no forceRefresh option.
+      const payload = await this.listProviderUsage({ requestId: options?.requestId });
+      return {
+        requestId: payload.requestId,
+        reports: payload.providers
+          .filter(
+            (provider) => !options?.reportIds || options.reportIds.includes(provider.providerId),
+          )
+          .map((provider) => {
+            // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+            // 0.10 reports have no typed problems; preserve their unavailable badge and error text.
+            let report: UsageListReportsPayload["reports"][number]["report"];
+            if (provider.status === "available") {
+              report = {
+                status: "available",
+                windows: provider.windows,
+                balances: provider.balances ?? undefined,
+                details: provider.details ?? undefined,
+                planLabel: provider.planLabel ?? undefined,
+              };
+            } else if (provider.status === "error") {
+              report = { status: "error", error: provider.error ?? "" };
+            } else {
+              report = {
+                status: "unavailable",
+                problem: { kind: "no_quota", detail: provider.error ?? "" },
+              };
+            }
+            return {
+              id: provider.providerId,
+              sourceId: provider.providerId,
+              sourceLabel: provider.displayName,
+              icon: legacyUsageIcon(provider.providerId),
+              account: {},
+              fetchedAt: provider.fetchedAt ?? payload.fetchedAt,
+              report,
+            };
+          }),
+      };
+    }
+    const requestId = this.createRequestId(options?.requestId);
+    const reports: UsageReportEntry[] = [];
+    let active = true;
+    const unsubscribe = this.subscribeRawMessages((message) => {
+      if (
+        !active ||
+        !("payload" in message) ||
+        !("requestId" in message.payload) ||
+        message.payload.requestId !== requestId
+      )
+        return;
+      if (message.type === "usage.list_reports.response" || message.type === "rpc_error") {
+        active = false;
+        return;
+      }
+      if (message.type !== "usage.list_reports.update") return;
+      reports.push(message.payload.report);
+      onReport?.(message.payload.report);
+    });
+    try {
+      const response = await this.sendRequest({
+        requestId,
+        message: {
+          type: "usage.list_reports.request",
+          requestId,
+          forceRefresh: options?.forceRefresh,
+          reportIds: options?.reportIds,
+          agentId: options?.agentId,
+        },
+        select: (message) =>
+          message.type === "usage.list_reports.response" && message.payload.requestId === requestId
+            ? message.payload
+            : null,
+      });
+      if (response.error !== null) throw new Error(response.error);
+      return { requestId, reports };
+    } finally {
+      active = false;
+      unsubscribe();
+    }
+  }
+
   async listCommands(options: ListCommandsOptions): Promise<ListCommandsPayload>;
   async listCommands(agentId: string, requestId?: string): Promise<ListCommandsPayload>;
   async listCommands(
@@ -4897,7 +5447,7 @@ export class DaemonClient {
     });
   }
 
-  async getPluginCatalog(): Promise<Array<{ id: string; clientBundle: string }>> {
+  async getPluginCatalog() {
     const requestId = this.createRequestId();
     const payload = await this.sendCorrelatedSessionRequest({
       requestId,
@@ -4998,18 +5548,21 @@ export class DaemonClient {
     ref?: string;
   }): Promise<PluginListItem> {
     const requestId = this.createRequestId();
-    const reference = parsePluginSourceReference(input.source);
+    // COMPAT(pluginSourceInstallation): added in v0.8.0; remove after 2027-03-16 once daemon floor supports source identifiers.
+    if (this.getLastServerInfoMessage()?.features?.pluginSourceInstallation !== true) {
+      throw new Error("Update the host to install plugin sources.");
+    }
     const payload = await this.sendCorrelatedSessionRequest({
       requestId,
       message: {
         type: "plugin.source.install.request",
         requestId,
-        source: reference.source,
-        ...(reference.pluginPath ? { pluginPath: reference.pluginPath } : {}),
+        source: input.source,
         ...(input.id ? { id: input.id } : {}),
         ...(input.ref ? { ref: input.ref } : {}),
       },
       responseType: "plugin.source.install.response",
+      timeout: 5 * 60 * 1000,
     });
     return payload.plugin;
   }
@@ -5028,6 +5581,38 @@ export class DaemonClient {
     return payload.plugins;
   }
 
+  private requirePluginUpdates(): void {
+    // COMPAT(pluginSourceUpdates): added in v0.8.0; remove after 2027-03-16 once daemon floor supports reviewed updates.
+    if (this.getLastServerInfoMessage()?.features?.pluginSourceUpdates !== true)
+      throw new Error("Update the host to review plugin updates.");
+  }
+
+  async previewPluginUpdates(
+    input: { pluginId?: string; target?: PluginUpdateSelection } = {},
+  ): Promise<PluginUpdatePreview[]> {
+    this.requirePluginUpdates();
+    const requestId = this.createRequestId();
+    const payload = await this.sendCorrelatedSessionRequest({
+      requestId,
+      message: { type: "plugin.source.update.preview.request", requestId, ...input },
+      responseType: "plugin.source.update.preview.response",
+      timeout: 300_000,
+    });
+    return payload.plugins;
+  }
+
+  async applyPluginUpdates(proposals: PluginUpdateProposal[]): Promise<PluginUpdateResult[]> {
+    this.requirePluginUpdates();
+    const requestId = this.createRequestId();
+    const payload = await this.sendCorrelatedSessionRequest({
+      requestId,
+      message: { type: "plugin.source.update.apply.request", requestId, proposals },
+      responseType: "plugin.source.update.apply.response",
+      timeout: 300_000,
+    });
+    return payload.plugins;
+  }
+
   async updatePluginSources(pluginId?: string): Promise<PluginSourceUpdateItem[]> {
     const requestId = this.createRequestId();
     const payload = await this.sendCorrelatedSessionRequest({
@@ -5270,33 +5855,17 @@ export class DaemonClient {
   // Terminals
   // ============================================================================
 
-  subscribeTerminals(input: { cwd: string; workspaceId?: string }): void {
-    this.terminalDirectorySubscriptions.set(terminalSubscriptionKey(input.cwd, input.workspaceId), {
-      cwd: input.cwd,
-      workspaceId: input.workspaceId,
-    });
-    if (!this.transport || this.connectionState.status !== "connected") {
-      return;
-    }
-    this.sendSessionMessage({
-      type: "subscribe_terminals_request",
-      cwd: input.cwd,
-      ...(input.workspaceId !== undefined ? { workspaceId: input.workspaceId } : {}),
-    });
-  }
-
-  unsubscribeTerminals(input: { cwd: string; workspaceId?: string }): void {
-    this.terminalDirectorySubscriptions.delete(
-      terminalSubscriptionKey(input.cwd, input.workspaceId),
+  observeTerminals(input: {
+    cwd: string;
+    workspaceId?: string;
+    signal?: AbortSignal;
+  }): OwnedSubscription<CorrelatedResponsePayload<"terminals_changed">> {
+    const { signal, ...query } = input;
+    return this.observe(
+      "terminals_changed",
+      { type: "subscribe_terminals_request", ...query },
+      { signal },
     );
-    if (!this.transport || this.connectionState.status !== "connected") {
-      return;
-    }
-    this.sendSessionMessage({
-      type: "unsubscribe_terminals_request",
-      cwd: input.cwd,
-      ...(input.workspaceId !== undefined ? { workspaceId: input.workspaceId } : {}),
-    });
   }
 
   async listTerminals(
@@ -5363,53 +5932,92 @@ export class DaemonClient {
     });
   }
 
-  async subscribeTerminal(
+  /**
+   * Snapshot/restore and output arrive in receive. Subscribe to the returned handle
+   * for terminal_stream_exit: payload.error means observation failure, not PTY exit.
+   * Either outcome detaches this slot and releases the handle automatically.
+   */
+  observeTerminal(
     terminalId: string,
-    optionsOrRequestId?:
-      | { restore?: SubscribeTerminalRequest["restore"]; requestId?: string }
-      | string,
-  ): Promise<SubscribeTerminalPayload> {
-    const restore = typeof optionsOrRequestId === "object" ? optionsOrRequestId.restore : undefined;
-    const requestId =
-      typeof optionsOrRequestId === "object" ? optionsOrRequestId.requestId : optionsOrRequestId;
-    const resolvedRequestId = this.createRequestId(requestId);
-    const message = SessionInboundMessageSchema.parse({
-      type: "subscribe_terminal_request",
-      terminalId,
-      requestId: resolvedRequestId,
-      ...(restore ? { restore } : {}),
+    receive: (event: TerminalStreamEvent) => void,
+    options?: {
+      restore?: SubscribeTerminalRequest["restore"];
+      signal?: AbortSignal;
+      requestId?: string;
+    },
+  ): OwnedSubscription<SubscribeTerminalPayload> {
+    options?.signal?.throwIfAborted();
+    const observation = this.observe(
+      "subscribe_terminal_response",
+      {
+        type: "subscribe_terminal_request",
+        terminalId,
+        ...(options?.restore ? { restore: options.restore } : {}),
+      },
+      options,
+    );
+    let detach = () => {};
+    let released = false;
+    const release = () => {
+      released = true;
+      detach();
+      options?.signal?.removeEventListener("abort", abort);
+      return observation.release();
+    };
+    const abort = () => {
+      void release().catch((error) => this.logger.error({ err: error }, "Terminal release failed"));
+    };
+    options?.signal?.addEventListener("abort", abort, { once: true });
+    observation.subscribe({
+      snapshot: (payload) => {
+        detach();
+        if (released || options?.signal?.aborted || payload.error !== null) return;
+        const subscriptionId = payload.subscriptionId;
+        detach = this.terminalStreams.attach(subscriptionId, terminalId, payload.slot, (event) => {
+          if (released || observation.subscriptionId !== subscriptionId) return;
+          try {
+            receive(event);
+          } catch (error) {
+            this.logger.error({ err: error }, "Terminal observer failed");
+          }
+        });
+      },
+      update: (message) => {
+        if (message.type === "terminal_stream_exit") {
+          detach();
+          queueMicrotask(abort);
+        }
+      },
+      error: () => {
+        detach();
+      },
     });
-    const payload = await this.sendCorrelatedRequest({
-      requestId: resolvedRequestId,
-      message,
-      responseType: "subscribe_terminal_response",
-      options: { skipQueue: true },
-    });
-    if (payload.error === null) {
-      this.terminalStreams.setSlot(terminalId, payload.slot);
-    }
-    return payload;
+    return {
+      get subscriptionId() {
+        return observation.subscriptionId;
+      },
+      ready: observation.ready,
+      subscribe: observation.subscribe,
+      release,
+    };
   }
 
-  unsubscribeTerminal(terminalId: string): void {
-    this.terminalStreams.removeTerminal(terminalId);
-    this.sendSessionMessage({
-      type: "unsubscribe_terminal_request",
-      terminalId,
-    });
+  async subscribeTerminal(
+    terminalId: string,
+    options?: {
+      restore?: SubscribeTerminalRequest["restore"];
+      signal?: AbortSignal;
+      requestId?: string;
+    },
+  ): Promise<
+    SubscribeTerminalPayload & { subscription: OwnedSubscription<SubscribeTerminalPayload> }
+  > {
+    const subscription = this.observeTerminal(terminalId, () => {}, options);
+    return { ...(await subscription.ready), subscription };
   }
 
   sendTerminalInput(terminalId: string, message: TerminalInput["message"]): void {
-    const frame = this.terminalStreams.encodeInput(terminalId, message);
-    if (frame) {
-      this.sendBinaryFrame(frame);
-      return;
-    }
-    this.sendSessionMessage({
-      type: "terminal_input",
-      terminalId,
-      message,
-    });
+    this.sendSessionMessage({ type: "terminal_input", terminalId, message });
   }
 
   async killTerminal(terminalId: string, requestId?: string): Promise<KillTerminalPayload> {
@@ -5633,8 +6241,9 @@ export class DaemonClient {
     return this.config.url;
   }
 
-  private sendHelloMessage(): void {
-    if (!this.transport) {
+  private async sendHelloMessage(): Promise<void> {
+    const transport = this.transport;
+    if (!transport) {
       this.scheduleReconnect({
         reason: "Transport unavailable before hello",
         event: "HELLO_TRANSPORT_MISSING",
@@ -5644,18 +6253,16 @@ export class DaemonClient {
     }
 
     try {
+      if (this.transport !== transport) return;
+      const auth = this.helloAuth;
       this.sendJsonMessage("hello", "hello", {
         type: "hello",
         clientId: this.config.clientId,
         clientType: this.config.clientType ?? "cli",
         protocolVersion: 1,
+        ...(auth ? { auth } : {}),
         capabilities: {
-          [CLIENT_CAPS.customModeIcons]: true,
-          [CLIENT_CAPS.reasoningMergeEnum]: true,
-          [CLIENT_CAPS.terminalReflowableSnapshot]: true,
-          [CLIENT_CAPS.providerSubagents]: true,
-          [CLIENT_CAPS.projectUpdates]: true,
-          [CLIENT_CAPS.compactProviderSnapshots]: true,
+          ...DEFAULT_CLIENT_CAPABILITIES,
           ...this.config.capabilities,
         },
         ...(this.config.appVersion ? { appVersion: this.config.appVersion } : {}),
@@ -5672,6 +6279,8 @@ export class DaemonClient {
   }
 
   private disposeTransport(code = 1001, reason = "Reconnecting"): void {
+    this.owned.disconnected();
+    this.providerSnapshotUpdates.clear();
     this.stopLivenessHeartbeat();
     this.cleanupTransport();
     if (this.transport) {
@@ -5717,10 +6326,11 @@ export class DaemonClient {
       rawData instanceof Blob &&
       typeof rawData.arrayBuffer === "function"
     ) {
+      const transport = this.transport;
       void rawData
         .arrayBuffer()
         .then((buffer) => {
-          this.handleTransportMessage(buffer);
+          if (this.transport === transport) this.handleTransportMessage(buffer);
           return;
         })
         .catch(() => {
@@ -5796,6 +6406,18 @@ export class DaemonClient {
       return;
     }
 
+    if (parsed.data.type === "hello.rejected") {
+      const reasonMessage = {
+        password_required: "Password required",
+        incorrect_password: "Incorrect password",
+        incompatible_protocol: "Incompatible protocol version",
+      };
+      this.lastErrorValue = reasonMessage[parsed.data.reason];
+      this.authFailureReasonValue =
+        parsed.data.reason === "incompatible_protocol" ? null : parsed.data.reason;
+      return;
+    }
+
     this.traceInstant("paseo.ws.message.inbound", {
       envelopeType: "session",
       messageType: parsed.data.message.type,
@@ -5961,6 +6583,10 @@ export class DaemonClient {
 
   setReconnectEnabled(enabled: boolean): void {
     this.config = { ...this.config, reconnect: { ...this.config.reconnect, enabled } };
+    if (!enabled && this.reconnectTimeout) {
+      clearTimeout(this.reconnectTimeout);
+      this.reconnectTimeout = null;
+    }
   }
 
   private scheduleReconnect(input?: {
@@ -5979,21 +6605,30 @@ export class DaemonClient {
       this.lastErrorValue = reason.trim();
     }
 
+    this.owned.disconnected();
+    this.providerSnapshotUpdates.clear();
+
     // Clear all pending waiters and queued sends since the connection was lost
     // and responses from the previous connection will never arrive.
-    this.clearWaiters(new Error(reason ?? "Connection lost"));
-    this.rejectPendingSendQueue(new Error(reason ?? "Connection lost"));
-    this.rejectPingProbe(new Error(reason ?? "Connection lost"));
+    this.clearWaiters(new DaemonConnectionError(reason ?? "Connection lost"));
+    this.rejectPendingSendQueue(new DaemonConnectionError(reason ?? "Connection lost"));
+    this.rejectPingProbe(new DaemonConnectionError(reason ?? "Connection lost"));
     this.terminalStreams.clearSlots();
     this.lastServerInfoMessage = null;
 
+    if (this.authFailureReasonValue) this.setReconnectEnabled(false);
+
     if (wasDisposed) {
       this.rejectConnect(new Error(reason ?? "Daemon client is disposed"));
       return;
     }
     this.emitDisconnectedStateForReconnect(reason, input);
     if (!this.shouldReconnect || this.config.reconnect?.enabled === false) {
-      this.rejectConnect(new Error(reason ?? "Transport disconnected before connect"));
+      this.rejectConnect(
+        this.authFailureReasonValue
+          ? new DaemonAuthenticationError(this.authFailureReasonValue)
+          : new Error(reason ?? "Transport disconnected before connect"),
+      );
       return;
     }
 
@@ -6077,7 +6712,24 @@ export class DaemonClient {
   }
 
   private handleSessionMessage(msg: SessionOutboundMessage): void {
-    const consumerMessage = normalizeProviderSnapshotUpdateMessage(msg);
+    msg = this.owned.normalize(msg);
+    if (
+      msg.type === "providers_snapshot_update" &&
+      this.config.providerSnapshots !== "wire" &&
+      msg.payload.snapshotHash &&
+      !msg.payload.compactSnapshot
+    ) {
+      if (this.owned.owns(msg)) this.providerSnapshotUpdates.receive(msg);
+      return;
+    }
+    this.deliverSessionMessage(msg);
+  }
+
+  private deliverSessionMessage(msg: SessionOutboundMessage): void {
+    const consumerMessage = normalizeProviderSnapshotUpdateMessage(
+      msg,
+      this.config.providerSnapshots !== "wire",
+    );
 
     if (consumerMessage.type === "status") {
       const serverInfo = parseServerInfoStatusPayload(consumerMessage.payload);
@@ -6088,25 +6740,17 @@ export class DaemonClient {
           this.reconnectAttempt = 0;
           this.updateConnectionState({ status: "connected" }, { event: "HELLO_SERVER_INFO" });
           this.startLivenessHeartbeat();
-          this.resubscribeCheckoutDiffSubscriptions();
-          this.resubscribeTerminalDirectorySubscriptions();
-          this.resubscribeFileSubscriptions();
+          this.owned.restore(serverInfo, {
+            ...DEFAULT_CLIENT_CAPABILITIES,
+            ...this.config.capabilities,
+          });
+          this.creations.reconnect();
           this.flushPendingSendQueue();
           this.resolveConnect();
         }
       }
     }
 
-    if (consumerMessage.type === "terminal_stream_exit") {
-      this.terminalStreams.removeTerminal(consumerMessage.payload.terminalId);
-    }
-
-    if (consumerMessage.type === "fs.file.update") {
-      this.fileSubscriptions
-        .get(consumerMessage.payload.subscriptionId)
-        ?.onUpdate(consumerMessage.payload.version);
-    }
-
     if (this.rawMessageListeners.size > 0) {
       for (const handler of this.rawMessageListeners) {
         try {
@@ -6135,18 +6779,28 @@ export class DaemonClient {
       }
     }
 
+    if (
+      consumerMessage.type === "workspace.create.update" ||
+      consumerMessage.type === "agent.create.update"
+    ) {
+      if (!consumerMessage.payload.subscriptionId) this.creations.receive(consumerMessage.payload);
+    }
     this.resolveWaiters(consumerMessage);
+    this.owned.receive(consumerMessage);
   }
 
   private resolveWaiters(msg: SessionOutboundMessage): void {
     for (const waiter of Array.from(this.waiters)) {
-      const result = waiter.predicate(msg);
-      if (result !== null) {
+      try {
+        const result = waiter.predicate(msg);
+        if (result === null) continue;
         this.waiters.delete(waiter);
-        if (waiter.timeoutHandle) {
-          clearTimeout(waiter.timeoutHandle);
-        }
+        if (waiter.timeoutHandle) clearTimeout(waiter.timeoutHandle);
         waiter.resolve(result);
+      } catch (error) {
+        this.waiters.delete(waiter);
+        if (waiter.timeoutHandle) clearTimeout(waiter.timeoutHandle);
+        waiter.reject(error instanceof Error ? error : new Error(String(error)));
       }
     }
   }
@@ -6238,7 +6892,10 @@ export class DaemonClient {
     options?: WaitOptions,
   ): WaitHandle<T> {
     // Capture stack trace at call site, not inside setTimeout
-    const timeoutError = new Error(`Timeout waiting for message (${timeout}ms)`);
+    const timeoutError = new DaemonConnectionError(
+      `Timeout waiting for message (${timeout}ms)`,
+      "DAEMON_REQUEST_TIMEOUT",
+    );
 
     let waiter: Waiter<T> | null = null;
     let settled = false;
@@ -6311,6 +6968,16 @@ function resolveAgentConfig(options: CreateAgentRequestOptions): AgentSessionCon
     config,
     provider,
     cwd,
+    agentId: _agentId,
+    onEvent: _onEvent,
+    idempotencyKey: _idempotencyKey,
+    clientMessageId: _clientMessageId,
+    callerAgentId: _callerAgentId,
+    outputSchema: _outputSchema,
+    attachments: _attachments,
+    worktree: _worktree,
+    autoArchive: _autoArchive,
+    background: _background,
     env: _env,
     workspaceId: _workspaceId,
     initialPrompt: _initialPrompt,
diff --git a/packages/client/src/index.test.ts b/packages/client/src/index.test.ts
index 0dde83cb4d..ce6d4a5156 100644
--- a/packages/client/src/index.test.ts
+++ b/packages/client/src/index.test.ts
@@ -1,3 +1,5 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 import { afterEach, expect, test, vi } from "vitest";
 import { createPaseoApi, createPaseoClient } from "./index.js";
 import { DaemonClient } from "./daemon-client.js";
@@ -24,6 +26,17 @@ class FakeWebSocket {
 
   send(data: string | ArrayBuffer | Uint8Array): void {
     this.sent.push(data);
+    const frame = JSON.parse(String(data));
+    if (frame.message?.type === "subscription.release.request")
+      this.message(
+        sessionMessage({
+          type: "subscription.release.response",
+          payload: {
+            requestId: frame.message.requestId,
+            subscriptionId: frame.message.subscriptionId,
+          },
+        }),
+      );
   }
 
   close(): void {
@@ -83,11 +96,15 @@ function parseSentFrame(
 }
 
 async function connectClient(
-  features: Record<string, boolean> = { providersSnapshotCwd: true },
+  features: Record<string, boolean> = {
+    providerUsageList: true,
+    providersSnapshotCwd: true,
+    ownedSubscriptions: true,
+  },
 ): Promise<{ client: PaseoClient; ws: FakeWebSocket }> {
-  vi.stubGlobal("WebSocket", FakeWebSocket);
   const client = createPaseoClient({
     url: "ws://daemon.test",
+    webSocketFactory: (url) => new FakeWebSocket(url),
     reconnect: { enabled: false },
   });
 
@@ -118,6 +135,27 @@ async function connectClient(
   return { client, ws };
 }
 
+function acknowledgeObservation(ws: FakeWebSocket, subscriptionId: string): void {
+  const request = parseSentSessionMessage(ws.sent.at(-1));
+  ws.message(
+    sessionMessage({
+      type: request.type.replace(/([._])request$/, "$1response"),
+      payload: {
+        requestId: request.requestId,
+        subscriptionId,
+        entries: [],
+        pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
+      },
+    }),
+  );
+}
+
+async function observeAgents(client: PaseoClient, ws: FakeWebSocket): Promise<string> {
+  const ready = client.agents.list({ subscribe: {} });
+  acknowledgeObservation(ws, "agents-sdk");
+  return (await ready).subscriptionId!;
+}
+
 function createWorkspace(input: Partial<PaseoWorkspace> = {}): PaseoWorkspace {
   return {
     id: "workspace_sdk",
@@ -228,8 +266,11 @@ test("createPaseoApi borrows daemon capabilities without exposing connection own
   expect(Object.keys(paseo).sort()).toEqual([
     "agents",
     "config",
+    "dispose",
+    "observeEvents",
     "projects",
     "providers",
+    "terminals",
     "workspaces",
   ]);
   expect("connect" in paseo).toBe(false);
@@ -237,6 +278,37 @@ test("createPaseoApi borrows daemon capabilities without exposing connection own
   expect("skills" in paseo.agents).toBe(false);
 });
 
+test("agent handles send permission responses for their agent", async () => {
+  const { client, ws } = await connectClient();
+
+  await client.agents.ref("agent_sdk").respondToPermission({
+    requestId: "permission-request",
+    response: {
+      behavior: "deny",
+      selectedActionId: "deny-once",
+      message: "Not approved",
+      interrupt: true,
+    },
+  });
+
+  expect(parseSentFrame(ws.sent.at(-1))).toEqual({
+    type: "session",
+    message: {
+      type: "agent_permission_response",
+      agentId: "agent_sdk",
+      requestId: "permission-request",
+      response: {
+        behavior: "deny",
+        selectedActionId: "deny-once",
+        message: "Not approved",
+        interrupt: true,
+      },
+    },
+  });
+
+  await client.close();
+});
+
 test("project actions list registered projects through the existing RPC", async () => {
   const { client, ws } = await connectClient();
 
@@ -303,6 +375,71 @@ test("project actions list registered projects through the existing RPC", async
   await client.close();
 });
 
+test("project actions subscribe to existing project updates", async () => {
+  const { client, ws } = await connectClient();
+  const updates: string[] = [];
+  const unsubscribe = client.projects.subscribe((update) => {
+    updates.push(update.kind === "upsert" ? update.project.projectDisplayName : update.projectId);
+  });
+  expect(parseSentSessionMessage(ws.sent.at(-1))).toMatchObject({
+    type: "session.events.set_subscription.request",
+    events: ["project.update"],
+  });
+  acknowledgeObservation(ws, "projects-sdk");
+
+  ws.message(
+    sessionMessage({
+      type: "project.update",
+      payload: {
+        subscriptionId: "projects-sdk",
+        kind: "upsert",
+        project: {
+          projectId: "project_sdk",
+          projectKey: "sdk",
+          projectDisplayName: "Renamed SDK",
+          projectCustomName: "Renamed SDK",
+          projectCustomIconRevision: null,
+          projectIconRevision: "icon-revision",
+          projectRootPath: "/repo/sdk",
+          projectKind: "git",
+          syncSeq: 9,
+        },
+        generation: "daemon-generation",
+        seq: 9,
+      },
+    }),
+  );
+  ws.message(
+    sessionMessage({
+      type: "project.update",
+      payload: {
+        subscriptionId: "projects-sdk",
+        kind: "remove",
+        projectId: "project_removed",
+        generation: "daemon-generation",
+        seq: 10,
+      },
+    }),
+  );
+
+  expect(updates).toEqual(["Renamed SDK", "project_removed"]);
+
+  unsubscribe();
+  ws.message(
+    sessionMessage({
+      type: "project.update",
+      payload: {
+        subscriptionId: "projects-sdk",
+        kind: "remove",
+        projectId: "project_after_unsubscribe",
+      },
+    }),
+  );
+  expect(updates).toEqual(["Renamed SDK", "project_removed"]);
+
+  await client.close();
+});
+
 test("agent actions list the daemon directory without exposing the low-level client", async () => {
   const { client, ws } = await connectClient();
   const listedAgent = createAgent({ title: "Planner" });
@@ -430,6 +567,9 @@ test("workspace handles keep identity and refresh snapshots through existing dri
   await expect(refetchPromise).resolves.toEqual(refreshedWorkspace);
   expect(workspace.current()).toEqual(refreshedWorkspace);
 
+  const directoryReady = client.workspaces.list({ subscribe: {} });
+  acknowledgeObservation(ws, "workspaces-sdk");
+  await directoryReady;
   const updates: string[] = [];
   const unsubscribe = workspace.subscribe((update) => {
     if (update.kind === "upsert") {
@@ -440,10 +580,7 @@ test("workspace handles keep identity and refresh snapshots through existing dri
   ws.message(
     sessionMessage({
       type: "workspace_update",
-      payload: {
-        kind: "upsert",
-        workspace: pushedWorkspace,
-      },
+      payload: { subscriptionId: "workspaces-sdk", kind: "upsert", workspace: pushedWorkspace },
     }),
   );
   expect(updates).toEqual(["sdk pushed"]);
@@ -475,6 +612,7 @@ test("workspace handles keep identity and refresh snapshots through existing dri
     sessionMessage({
       type: "workspace_update",
       payload: {
+        subscriptionId: "workspaces-sdk",
         kind: "upsert",
         workspace: createWorkspace({ name: "sdk after unsubscribe" }),
       },
@@ -553,6 +691,61 @@ test("plugin-shaped PR workspace create and agent create use the existing daemon
   await client.close();
 });
 
+test("agents.create forwards internal on the request, outside the agent config", async () => {
+  const { client, ws } = await connectClient({
+    providerUsageList: true,
+    providersSnapshotCwd: true,
+    ownedSubscriptions: true,
+    backgroundWorkspaces: true,
+  });
+
+  const createPromise = client.agents.create({
+    config: { provider: "codex/gpt-5.4" },
+    cwd: "/repo/sdk",
+    title: "Summary helper",
+    background: true,
+    autoArchive: true,
+  });
+  const request = parseSentSessionMessage(ws.sent.at(-1));
+  expect(request).toMatchObject({
+    type: "create_agent_request",
+    config: { provider: "codex", model: "gpt-5.4", cwd: "/repo/sdk", title: "Summary helper" },
+    background: true,
+    autoArchive: true,
+  });
+  expect(request.config).not.toHaveProperty("internal");
+  ws.message(
+    sessionMessage({
+      type: "status",
+      payload: {
+        status: "agent_created",
+        requestId: request.requestId,
+        agentId: "agent_helper",
+        agent: createAgent({ id: "agent_helper" }),
+      },
+    }),
+  );
+
+  const agent = await createPromise;
+  expect(agent.id).toBe("agent_helper");
+  await client.close();
+});
+
+test("agents.create with internal fails before sending on a host without internal agents", async () => {
+  const { client, ws } = await connectClient();
+  const sentBefore = ws.sent.length;
+
+  await expect(
+    client.agents.create({
+      config: { provider: "codex/gpt-5.4" },
+      cwd: "/repo/sdk",
+      background: true,
+    }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  expect(ws.sent).toHaveLength(sentBefore);
+  await client.close();
+});
+
 test("agent handles delegate create, send, timeline refetch, archive, and local updates", async () => {
   const { client, ws } = await connectClient();
   const createdAgent = createAgent();
@@ -589,6 +782,7 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
   expect(agent.id).toBe("agent_sdk");
   expect(agent.current()).toEqual(createdAgent);
 
+  await observeAgents(client, ws);
   const updatedAgents: string[] = [];
   const unsubscribe = agent.subscribe((update) => {
     if (update.kind === "upsert") {
@@ -599,23 +793,23 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
   ws.message(
     sessionMessage({
       type: "agent_update",
-      payload: {
-        kind: "upsert",
-        agent: updatedAgent,
-        project: null,
-      },
+      payload: { subscriptionId: "agents-sdk", kind: "upsert", agent: updatedAgent, project: null },
     }),
   );
   expect(updatedAgents).toEqual(["Updated"]);
   expect(agent.current()).toEqual(updatedAgent);
 
-  const sendPromise = agent.send("hello", { messageId: "message-sdk" });
+  const sendPromise = agent.send("hello", {
+    messageId: "message-sdk",
+    activeTurnBehavior: "steer",
+  });
   const sendRequest = parseSentSessionMessage(ws.sent.at(-1));
   expect(sendRequest).toMatchObject({
     type: "send_agent_message_request",
     agentId: "agent_sdk",
     text: "hello",
     messageId: "message-sdk",
+    activeTurnBehavior: "steer",
   });
 
   ws.message(
@@ -633,6 +827,7 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
 
   const runPromise = agent.run("finish the task", {
     messageId: "run-message-sdk",
+    activeTurnBehavior: "interrupt",
     timeoutMs: 30_000,
   });
   const runSendRequest = parseSentSessionMessage(ws.sent.at(-1));
@@ -641,6 +836,7 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
     agentId: "agent_sdk",
     text: "finish the task",
     messageId: "run-message-sdk",
+    activeTurnBehavior: "interrupt",
   });
   ws.message(
     sessionMessage({
@@ -867,11 +1063,13 @@ test("agent handles expose the observed snapshot through readonly properties", a
     runtimeInfo: { provider: "codex", sessionId: "session-sdk", model: "gpt-5.4" },
     archivedAt: "2026-05-16T02:00:00.000Z",
   });
+  await observeAgents(client, ws);
   const unsubscribe = agent.subscribe(() => {});
   ws.message(
     sessionMessage({
       type: "agent_update",
       payload: {
+        subscriptionId: "agents-sdk",
         kind: "upsert",
         agent: observedAgent,
         project: null,
@@ -1046,6 +1244,8 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
   });
 
   const readyPromise = client.providers.waitForReady({ cwd: "/repo/sdk", timeoutMs: 5_000 });
+  acknowledgeObservation(ws, "provider-wait");
+  await new Promise((resolve) => setTimeout(resolve, 0));
   const readyRequest = parseSentSessionMessage(ws.sent.at(-1));
   expect(readyRequest).toMatchObject({
     type: "get_providers_snapshot_request",
@@ -1066,6 +1266,7 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
     sessionMessage({
       type: "providers_snapshot_update",
       payload: {
+        subscriptionId: "provider-wait",
         cwd: "/repo/other",
         entries: [{ provider: "codex", status: "ready", enabled: true }],
         generatedAt: "2026-05-16T00:00:30.000Z",
@@ -1076,6 +1277,7 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
     sessionMessage({
       type: "providers_snapshot_update",
       payload: {
+        subscriptionId: "provider-wait",
         cwd: "/repo/sdk",
         entries: [{ provider: "codex", status: "ready", enabled: true }],
         generatedAt: "2026-05-16T00:00:01.000Z",
@@ -1092,11 +1294,14 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
     cwd: "/repo/./sdk",
     timeoutMs: 5_000,
   });
+  acknowledgeObservation(ws, "provider-canonical-wait");
+  await new Promise((resolve) => setTimeout(resolve, 0));
   const canonicalReadyRequest = parseSentSessionMessage(ws.sent.at(-1));
   ws.message(
     sessionMessage({
       type: "providers_snapshot_update",
       payload: {
+        subscriptionId: "provider-canonical-wait",
         cwd: "/repo/sdk",
         entries: [{ provider: "codex", status: "ready", enabled: true }],
         generatedAt: "2026-05-16T00:00:02.000Z",
@@ -1168,6 +1373,62 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
     provider: "codex",
     diagnostic: "Codex is ready.",
   });
+  const usagePromise = client.providers.listUsage({
+    requestId: "provider-usage-request",
+  });
+  expect(parseSentSessionMessage(ws.sent.at(-1))).toMatchObject({
+    type: "provider.usage.list.request",
+    requestId: "provider-usage-request",
+  });
+  ws.message(
+    sessionMessage({
+      type: "provider.usage.list.response",
+      payload: {
+        requestId: "provider-usage-request",
+        fetchedAt: "2026-05-16T00:10:00.000Z",
+        providers: [
+          {
+            providerId: "codex",
+            displayName: "Codex",
+            status: "available",
+            planLabel: "pro",
+            windows: [
+              {
+                id: "weekly",
+                label: "Weekly limit",
+                usedPct: 25,
+                remainingPct: 75,
+                resetsAt: "2026-05-20T00:00:00.000Z",
+                tone: "ok",
+              },
+            ],
+          },
+        ],
+      },
+    }),
+  );
+  await expect(usagePromise).resolves.toEqual({
+    requestId: "provider-usage-request",
+    fetchedAt: "2026-05-16T00:10:00.000Z",
+    providers: [
+      {
+        providerId: "codex",
+        displayName: "Codex",
+        status: "available",
+        planLabel: "pro",
+        windows: [
+          {
+            id: "weekly",
+            label: "Weekly limit",
+            usedPct: 25,
+            remainingPct: 75,
+            resetsAt: "2026-05-20T00:00:00.000Z",
+            tone: "ok",
+          },
+        ],
+      },
+    ],
+  });
 
   const snapshotUpdates: string[] = [];
   const snapshotModelDefaults: Array<string | undefined> = [];
@@ -1175,10 +1436,16 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
     snapshotUpdates.push(update.generatedAt);
     snapshotModelDefaults.push(update.entries[0]?.models?.[0]?.defaultThinkingOptionId);
   });
+  expect(parseSentSessionMessage(ws.sent.at(-1))).toMatchObject({
+    type: "session.events.set_subscription.request",
+    events: ["providers_snapshot_update"],
+  });
+  acknowledgeObservation(ws, "provider-updates");
   ws.message(
     sessionMessage({
       type: "providers_snapshot_update",
       payload: {
+        subscriptionId: "provider-updates",
         cwd: "/repo/sdk",
         entries: [
           {
@@ -1206,14 +1473,36 @@ test("provider actions delegate to existing provider RPCs and local snapshot upd
   await client.close();
 });
 
-test("waitForReady requires canonical provider snapshot identity from the host", async () => {
+test("waitForReady reads an older host on the existing connection", async () => {
   const { client, ws } = await connectClient({});
-  const sentBeforeWait = ws.sent.length;
-
-  await expect(client.providers.waitForReady({ cwd: "/repo/./sdk" })).rejects.toThrow(
-    "Update the host to wait for provider discovery.",
+  const waiting = client.providers.waitForReady({ cwd: "/repo/./sdk" });
+  await expect
+    .poll(() => parseSentSessionMessage(ws.sent.at(-1)).type)
+    .toBe("get_providers_snapshot_request");
+  const request = parseSentSessionMessage(ws.sent.at(-1));
+  ws.message(
+    sessionMessage({
+      type: "get_providers_snapshot_response",
+      payload: {
+        requestId: request.requestId,
+        entries: [],
+        generatedAt: "2026-09-11T00:00:00.000Z",
+      },
+    }),
   );
-  expect(ws.sent).toHaveLength(sentBeforeWait);
+  await expect(waiting).resolves.toMatchObject({ entries: [] });
+  expect(FakeWebSocket.instances).toHaveLength(1);
+  await client.close();
+});
+
+test("provider usage requires the advertised host capability", async () => {
+  const { client, ws } = await connectClient({});
+  const sentBeforeUsage = ws.sent.length;
+
+  await expect(client.providers.listUsage()).rejects.toThrow(
+    "Update the host to list provider usage.",
+  );
+  expect(ws.sent).toHaveLength(sentBeforeUsage);
 
   await client.close();
 });
@@ -1386,3 +1675,62 @@ test("agent config requires provider/model syntax", async () => {
 
   await client.close();
 });
+
+test("canceled timeline handles and captured state are collectible while their API stays alive", async () => {
+  const source = `
+    import assert from "node:assert/strict";
+    import { createPaseoApi } from ${JSON.stringify(new URL("./index.ts", import.meta.url).href)};
+    import { DaemonClient } from ${JSON.stringify(new URL("./daemon-client.ts", import.meta.url).href)};
+    const drivers = [], apis = [];
+    let errors = 0;
+    async function batch(mode) {
+      const driver = new DaemonClient({ url: "ws://127.0.0.1:1/ws", clientId: mode, reconnect: { enabled: false } });
+      const scope = new AbortController();
+      const api = createPaseoApi(driver, { signal: scope.signal });
+      drivers.push(driver); apis.push(api);
+      const refs = [], ready = [];
+      for (let i = 0; i < 100; i++) {
+        const state = { bytes: new Uint8Array(64 * 1024) };
+        const handle = api.agents.ref("unconnected-agent").timeline.subscribe(update => {
+          if (update.event.type === "error") errors++;
+          return state.bytes[0];
+        });
+        refs.push({ handle: new WeakRef(handle), state: new WeakRef(state) });
+        ready.push(handle.ready.catch(() => {}));
+        if (mode === "callable") handle();
+        if (mode === "release") await handle.release();
+      }
+      if (mode === "scope-abort") scope.abort();
+      if (mode === "client-close") await driver.close();
+      if (mode !== "active") await Promise.all(ready);
+      return refs;
+    }
+    const groups = {};
+    for (const mode of ["callable", "release", "scope-abort", "client-close", "active"]) groups[mode] = await batch(mode);
+    async function collect() {
+      for (let i = 0; i < 12; i++) { await new Promise(r => setImmediate(r)); global.gc(); }
+    }
+    const count = refs => ({ handles: refs.filter(r => r.handle.deref()).length, states: refs.filter(r => r.state.deref()).length });
+    await collect();
+    const live = Object.fromEntries(Object.entries(groups).map(([mode, refs]) => [mode, count(refs)]));
+    console.log(JSON.stringify({ phase: "API alive", live, errors }));
+    for (const api of apis) await api.dispose();
+    await collect();
+    const disposed = Object.fromEntries(Object.entries(groups).map(([mode, refs]) => [mode, count(refs)]));
+    console.log(JSON.stringify({ phase: "API disposed", disposed }));
+    for (const driver of drivers) await driver.close();
+    for (const mode of ["callable", "release", "scope-abort", "client-close"]) assert.deepEqual(live[mode], { handles: 0, states: 0 }, mode);
+    assert.deepEqual(live.active, { handles: 100, states: 100 }, "active ownership is retained");
+    assert.equal(errors, 100, "client shutdown reports failure; explicit cancellation does not");
+    for (const result of Object.values(disposed)) assert.deepEqual(result, { handles: 0, states: 0 });
+  `;
+  const env = Object.fromEntries(
+    Object.entries(process.env).filter(([key]) => !/^(PASEO_|EXPO_|E2E_|AGENT_BROWSER_)/.test(key)),
+  );
+  const result = await promisify(execFile)(
+    process.execPath,
+    ["--expose-gc", "--import", "tsx", "--input-type=module", "-e", source],
+    { env, timeout: 15000 },
+  );
+  expect(result.stdout).toContain('"phase":"API alive"');
+}, 20000);
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 0cd94e5b62..5bccc94009 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,5 +1,10 @@
+import type { OwnedSubscription } from "./connection/index.js";
+export type { OwnedSubscription, SubscriptionObserver } from "./connection/index.js";
+import type { DaemonClientConfig } from "./daemon-client.js";
+import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
 import type {
   AgentSnapshotPayload,
+  CreationSnapshot,
   CreateAgentRequestMessage,
   FetchWorkspacesRequestMessage,
   FetchWorkspacesResponseMessage,
@@ -15,15 +20,31 @@ import type {
   MutableDaemonConfig,
   MutableDaemonConfigPatch,
   ProviderDiagnosticResponseMessage,
+  ProviderUsageListResponseMessage,
   ProjectPlacementPayload,
   WorkspaceProjectDescriptorPayload,
   RefreshProvidersSnapshotResponseMessage,
-  SendAgentMessageRequest,
   SessionOutboundMessage,
   WorkspaceDescriptorPayload,
   WorkspaceCreateRequest,
 } from "@getpaseo/protocol/messages";
-import { DaemonClient } from "./daemon-client.js";
+import { DaemonClient, type CreateAgentRequestOptions } from "./daemon-client.js";
+import {
+  createTerminalActions,
+  type PaseoTerminalActions,
+  type PaseoWorkspaceTerminalActions,
+} from "./terminals/index.js";
+export type {
+  PaseoTerminal,
+  PaseoTerminalActions,
+  PaseoTerminalHandle,
+  PaseoTerminalCreateOptions,
+  PaseoTerminalListOptions,
+  PaseoTerminalListResult,
+  PaseoTerminalCaptureOptions,
+  PaseoTerminalCaptureResult,
+  PaseoWorkspaceTerminalActions,
+} from "./terminals/index.js";
 import type { PluginTimelineItem } from "@getpaseo/protocol/agent-types";
 import type {
   FetchAgentsEntry,
@@ -33,6 +54,7 @@ import type {
   FetchAgentTimelineDirection,
   FetchAgentTimelinePayload,
   FetchAgentTimelineProjection,
+  SendMessageOptions,
   WaitForFinishResult,
 } from "./daemon-client.js";
 
@@ -57,6 +79,7 @@ export interface PaseoLogger {
 }
 
 export interface PaseoClientConfig {
+  capabilities?: DaemonClientConfig["capabilities"];
   url: string;
   clientId?: string;
   appVersion?: string;
@@ -87,8 +110,14 @@ export type PaseoProjectListOptions = Omit<ProjectListRequestMessage, "type" | "
   requestId?: string;
 };
 export type PaseoProjectListResult = ProjectListResponseMessage["payload"];
+export type PaseoProjectUpdate = Extract<
+  SessionOutboundMessage,
+  { type: "project.update" }
+>["payload"];
+export type PaseoProjectUpdateHandler = (update: PaseoProjectUpdate) => void;
 
 export interface PaseoAgentListResult {
+  subscription?: OwnedSubscription<PaseoAgentListResult>;
   requestId: string;
   subscriptionId?: string | null;
   entries: FetchAgentsEntry[];
@@ -102,6 +131,7 @@ export type PaseoWorkspaceListOptions = Omit<
 };
 
 export interface PaseoWorkspaceListResult {
+  subscription?: OwnedSubscription<PaseoWorkspaceListResult>;
   requestId: string;
   subscriptionId?: string | null;
   entries: PaseoWorkspace[];
@@ -113,8 +143,16 @@ export interface PaseoWorkspaceOpenOptions {
   requestId?: string;
 }
 
-export type PaseoWorkspaceCreateOptions = Omit<WorkspaceCreateRequest, "type" | "requestId"> & {
+export type PaseoWorkspaceCreateOptions = Omit<
+  WorkspaceCreateRequest,
+  "type" | "requestId" | "agent" | "subscribe"
+> & {
   requestId?: string;
+  agent?: Omit<
+    PaseoAgentCreateOptions,
+    "worktree" | "git" | "onEvent" | "idempotencyKey" | "requestId"
+  >;
+  onEvent?: (snapshot: CreationSnapshot) => void;
 };
 
 export interface PaseoWorkspaceArchiveResult {
@@ -140,6 +178,7 @@ export interface PaseoWorkspaceHandle {
   readonly agents: {
     create(options: PaseoWorkspaceAgentCreateOptions): Promise<PaseoAgentHandle>;
   };
+  readonly terminals: PaseoWorkspaceTerminalActions;
   current(): PaseoWorkspace | null;
   refresh(options?: { requestId?: string }): Promise<PaseoWorkspace | null>;
   setTitle(title: string | null, requestId?: string): Promise<{ title: string | null }>;
@@ -155,9 +194,16 @@ export interface PaseoWorkspaceHandle {
 
 export interface PaseoProjectActions {
   list(options?: PaseoProjectListOptions): Promise<PaseoProjectListResult>;
+  subscribe(handler: PaseoProjectUpdateHandler): () => void;
 }
 
 export interface PaseoWorkspaceActions {
+  list(options: PaseoWorkspaceListOptions & { subscribe: {} }): Promise<
+    PaseoWorkspaceListResult & {
+      subscriptionId: string;
+      subscription: OwnedSubscription<PaseoWorkspaceListResult>;
+    }
+  >;
   list(options?: PaseoWorkspaceListOptions): Promise<PaseoWorkspaceListResult>;
   ref(workspace: string | PaseoWorkspace): PaseoWorkspaceHandle;
   open(
@@ -195,6 +241,9 @@ export interface PaseoAgentConfig {
 }
 
 export interface PaseoAgentCreateOptions {
+  idempotencyKey?: string;
+  agentId?: string;
+  onEvent?: (snapshot: CreationSnapshot) => void;
   config: PaseoAgentConfig;
   cwd: string;
   parent?: string | PaseoAgentHandle;
@@ -208,6 +257,8 @@ export interface PaseoAgentCreateOptions {
   git?: CreateAgentRequestMessage["git"];
   worktree?: CreateAgentRequestMessage["worktree"];
   autoArchive?: CreateAgentRequestMessage["autoArchive"];
+  /** Visibility intent for a NEW workspace. Existing targets reject this option. */
+  background?: CreateAgentRequestMessage["background"];
   requestId?: string;
   labels?: Record<string, string>;
 }
@@ -227,17 +278,19 @@ export interface PaseoAgentTimelineRefetchOptions {
   requestId?: string;
 }
 
-export interface PaseoAgentSendOptions {
-  messageId?: string;
-  images?: Array<{ data: string; mimeType: string }>;
-  attachments?: SendAgentMessageRequest["attachments"];
-}
+export type PaseoAgentSendOptions = SendMessageOptions;
 
 export interface PaseoAgentRunOptions extends PaseoAgentSendOptions {
   timeoutMs?: number;
 }
 
 export type PaseoAgentRunResult = WaitForFinishResult;
+export type PaseoAgentPermissionResponse = AgentPermissionResponse;
+
+export interface PaseoAgentRespondToPermissionOptions {
+  requestId: string;
+  response: PaseoAgentPermissionResponse;
+}
 
 export interface PaseoAgentCommandsOptions {
   requestId?: string;
@@ -251,6 +304,21 @@ export type PaseoAgentStream = Extract<SessionOutboundMessage, { type: "agent_st
 
 export type PaseoAgentUpdateHandler = (update: PaseoAgentUpdate) => void;
 
+export type PaseoAgentTimelineEvent =
+  | PaseoAgentStream
+  | {
+      agentId: string;
+      event: { type: "replacement"; epoch: string };
+    }
+  | {
+      agentId: string;
+      subscriptionId: string;
+      event: { type: "subscription_restored" };
+    }
+  | { agentId: string; event: { type: "error"; error: string } };
+
+export type PaseoAgentTimelineSubscription = ReturnType<DaemonClient["subscribeAgentTimeline"]>;
+
 export interface PaseoAgentTimelineHandle {
   append(item: Omit<PluginTimelineItem, "pluginId">): Promise<{ seq: number; epoch: string }>;
   /**
@@ -260,10 +328,14 @@ export interface PaseoAgentTimelineHandle {
    */
   refetch(options?: PaseoAgentTimelineRefetchOptions): Promise<FetchAgentTimelinePayload>;
   /**
-   * Local listener for agent_stream events matching this handle id. It does not
-   * retain timeline entries or own application cache state.
+   * Delivers live events only. After reconnect, subscription_restored precedes
+   * subsequent updates. History may have been missed; use refetch() to request
+   * the range you need. No history is fetched automatically. A replacement event
+   * invalidates the previous epoch. Subscription errors release this observation.
+   * Await the returned unsubscribe function's `ready` promise before starting
+   * work that must be observed. It rejects if establishment fails.
    */
-  subscribe(handler: (event: PaseoAgentStream) => void): () => void;
+  subscribe(handler: (event: PaseoAgentTimelineEvent) => void): PaseoAgentTimelineSubscription;
 }
 
 export interface PaseoAgentHandle {
@@ -291,6 +363,7 @@ export interface PaseoAgentHandle {
   current(): PaseoAgent | null;
   refresh(requestId?: string): Promise<PaseoAgentRefetchResult | null>;
   send(text: string, options?: PaseoAgentSendOptions): Promise<void>;
+  respondToPermission(options: PaseoAgentRespondToPermissionOptions): Promise<void>;
   /** Sends a prompt and resolves when that turn finishes or needs attention. */
   run(text: string, options?: PaseoAgentRunOptions): Promise<PaseoAgentRunResult>;
   /** Waits for the current turn, including one started with `prompt`. */
@@ -309,6 +382,12 @@ export interface PaseoAgentHandle {
 }
 
 export interface PaseoAgentActions {
+  list(options: PaseoAgentListOptions & { subscribe: {} }): Promise<
+    PaseoAgentListResult & {
+      subscriptionId: string;
+      subscription: OwnedSubscription<PaseoAgentListResult>;
+    }
+  >;
   list(options?: PaseoAgentListOptions): Promise<PaseoAgentListResult>;
   ref(agent: string | PaseoAgent): PaseoAgentHandle;
   create(options: PaseoAgentCreateOptions): Promise<PaseoAgentHandle>;
@@ -338,6 +417,10 @@ export type PaseoProviderSnapshotUpdate = Extract<
 >["payload"];
 export type PaseoProviderRefreshResult = RefreshProvidersSnapshotResponseMessage["payload"];
 export type PaseoProviderDiagnosticResult = ProviderDiagnosticResponseMessage["payload"];
+export type PaseoProviderUsageResult = ProviderUsageListResponseMessage["payload"];
+export interface PaseoProviderUsageOptions {
+  requestId?: string;
+}
 
 export interface PaseoProviderListOptions {
   cwd?: string;
@@ -376,6 +459,7 @@ export interface PaseoProviderActions {
     provider: PaseoAgentProvider,
     options?: { requestId?: string },
   ): Promise<PaseoProviderDiagnosticResult>;
+  listUsage(options?: PaseoProviderUsageOptions): Promise<PaseoProviderUsageResult>;
   subscribe(handler: (update: PaseoProviderSnapshotUpdate) => void): () => void;
 }
 
@@ -400,6 +484,9 @@ export interface PaseoConfigActions {
 }
 
 export interface PaseoApi {
+  dispose(): Promise<void>;
+  observeEvents: DaemonClient["observeEvents"];
+  readonly terminals: PaseoTerminalActions;
   readonly workspaces: PaseoWorkspaceActions;
   readonly projects: PaseoProjectActions;
   readonly agents: PaseoAgentActions;
@@ -420,54 +507,214 @@ export function createPaseoClient(config: PaseoClientConfig): PaseoClient {
     clientId: config.clientId ?? createGeneratedClientId(),
     clientType: "cli",
   });
+  const api = createPaseoApi(daemonClient);
   return {
-    ...createPaseoApi(daemonClient),
+    ...api,
     connect: () => daemonClient.connect(),
-    close: () => daemonClient.close(),
+    close: async () => {
+      try {
+        await api.dispose();
+      } finally {
+        await daemonClient.close();
+      }
+    },
     ensureConnected: () => daemonClient.ensureConnected(),
     getConnectionState: () => daemonClient.getConnectionState(),
   };
 }
 
-export function createPaseoApi(daemonClient: DaemonClient): PaseoApi {
-  const createAgentHandle = createAgentHandleFactory(daemonClient);
+function toDaemonAgentCreateOptions(
+  options: PaseoAgentCreateOptions,
+  placement?: { workspaceId: string; cwd: string },
+): CreateAgentRequestOptions {
+  const { config: agentConfig, cwd, parent, title, prompt, ...requestOptions } = options;
+  const { provider: providerModel, options: providerOptions, ...runtimeConfig } = agentConfig;
+  const { provider, model } = parseProviderModel(providerModel);
+  return {
+    ...requestOptions,
+    config: {
+      ...runtimeConfig,
+      provider,
+      model,
+      cwd: placement?.cwd ?? cwd,
+      ...(title !== undefined ? { title } : {}),
+      ...(providerOptions !== undefined ? { providerOptions } : {}),
+    },
+    ...(placement ? { workspaceId: placement.workspaceId } : {}),
+    ...(parent ? { callerAgentId: resolveAgentId(parent) } : {}),
+    ...(prompt !== undefined ? { initialPrompt: prompt } : {}),
+  };
+}
+
+export function createPaseoApi(
+  daemonClient: DaemonClient,
+  scopeOptions?: { signal?: AbortSignal },
+): PaseoApi {
+  const handles = new Set<{ release(): Promise<void> }>();
+  const agentListeners = new Set<PaseoAgentUpdateHandler>();
+  const workspaceListeners = new Set<PaseoWorkspaceUpdateHandler>();
+  const lifetime = new AbortController();
+  const own = <T extends { release(): Promise<void> }>(create: () => T): T => {
+    if (lifetime.signal.aborted) throw new Error("Paseo API is disposed");
+    const handle = create();
+    handles.add(handle);
+    const release = handle.release.bind(handle);
+    handle.release = async () => {
+      await release();
+      handles.delete(handle);
+    };
+    return handle;
+  };
+  const listenAgents = (handler: PaseoAgentUpdateHandler) => {
+    if (lifetime.signal.aborted) throw new Error("Paseo API is disposed");
+    agentListeners.add(handler);
+    return () => {
+      agentListeners.delete(handler);
+    };
+  };
+  const listenWorkspaces = (handler: PaseoWorkspaceUpdateHandler) => {
+    if (lifetime.signal.aborted) throw new Error("Paseo API is disposed");
+    workspaceListeners.add(handler);
+    return () => {
+      workspaceListeners.delete(handler);
+    };
+  };
+  const createAgentHandle = createAgentHandleFactory(
+    daemonClient,
+    listenAgents,
+    (agentId, handler) => own(() => daemonClient.subscribeAgentTimeline(agentId, handler)),
+  );
   const createAgent = async (
     options: PaseoAgentCreateOptions,
     placement?: { workspaceId: string; cwd: string },
   ) => {
-    const { config: agentConfig, cwd, parent, title, prompt, ...requestOptions } = options;
-    const { provider: providerModel, options: providerOptions, ...runtimeConfig } = agentConfig;
-    const { provider, model } = parseProviderModel(providerModel);
-    const effectiveCwd = placement?.cwd ?? cwd;
-    const agent = await daemonClient.createAgent({
-      ...requestOptions,
-      config: {
-        ...runtimeConfig,
-        provider,
-        model,
-        cwd: effectiveCwd,
-        ...(title !== undefined ? { title } : {}),
-        ...(providerOptions !== undefined ? { providerOptions } : {}),
-      },
-      ...(placement ? { workspaceId: placement.workspaceId } : {}),
-      ...(parent ? { callerAgentId: resolveAgentId(parent) } : {}),
-      ...(prompt !== undefined ? { initialPrompt: prompt } : {}),
-    });
+    const agent = await daemonClient.createAgent(toDaemonAgentCreateOptions(options, placement));
     return createAgentHandle(agent);
   };
-  const createWorkspaceHandle = createWorkspaceHandleFactory(daemonClient, createAgent);
+  const terminals = createTerminalActions(daemonClient, async (workspaceId) => {
+    const workspace = await createWorkspaceHandle(workspaceId).refresh();
+    if (!workspace?.workspaceDirectory) {
+      throw new Error(`Workspace ${workspaceId} is not active or has no available directory`);
+    }
+    return workspace.workspaceDirectory;
+  });
+  const createWorkspaceHandle = createWorkspaceHandleFactory(
+    daemonClient,
+    createAgent,
+    terminals,
+    listenWorkspaces,
+  );
+
+  let disposal: Promise<void> | null = null;
+  const dispose = (): Promise<void> => {
+    if (disposal) return disposal;
+    lifetime.abort();
+    scopeOptions?.signal?.removeEventListener("abort", abort);
+    agentListeners.clear();
+    workspaceListeners.clear();
+    disposal = Promise.allSettled([...handles].map((handle) => handle.release())).then(
+      (results) => {
+        handles.clear();
+        const failures = results.flatMap((result) =>
+          result.status === "rejected" ? [result.reason] : [],
+        );
+        if (failures.length)
+          throw new AggregateError(failures, "Failed to release API subscriptions");
+        return undefined;
+      },
+    );
+    return disposal;
+  };
+  const abort = () => {
+    void dispose().catch((error) => console.error("API subscription cleanup failed", error));
+  };
+  if (scopeOptions?.signal?.aborted) abort();
+  else scopeOptions?.signal?.addEventListener("abort", abort, { once: true });
+
+  const observeEvents: DaemonClient["observeEvents"] = (events, options) =>
+    own(() => daemonClient.observeEvents(events, options));
+
+  const subscribeEvent = (
+    event: "project.update" | "providers_snapshot_update",
+    update: (message: SessionOutboundMessage) => void,
+  ): (() => void) => {
+    const observation = observeEvents([event]);
+    observation.subscribe({ snapshot: () => {}, update });
+    return () => {
+      void observation
+        .release()
+        .catch((error) => console.error("Event subscription cleanup failed", error));
+    };
+  };
+
+  function listWorkspaces(options: PaseoWorkspaceListOptions & { subscribe: {} }): Promise<
+    PaseoWorkspaceListResult & {
+      subscriptionId: string;
+      subscription: OwnedSubscription<PaseoWorkspaceListResult>;
+    }
+  >;
+  function listWorkspaces(options?: PaseoWorkspaceListOptions): Promise<PaseoWorkspaceListResult>;
+  async function listWorkspaces(
+    options?: PaseoWorkspaceListOptions,
+  ): Promise<PaseoWorkspaceListResult> {
+    if (!options?.subscribe) return daemonClient.fetchWorkspaces(options);
+    if (options.subscribe.subscriptionId !== undefined)
+      throw new Error("Subscription IDs are assigned by the host");
+    const subscription = own(() => daemonClient.observeWorkspaces(options));
+    subscription.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "workspace_update")
+          for (const listener of workspaceListeners) listener(message.payload);
+      },
+    });
+    return { ...(await subscription.ready), subscription };
+  }
+
+  function listAgents(options: PaseoAgentListOptions & { subscribe: {} }): Promise<
+    PaseoAgentListResult & {
+      subscriptionId: string;
+      subscription: OwnedSubscription<PaseoAgentListResult>;
+    }
+  >;
+  function listAgents(options?: PaseoAgentListOptions): Promise<PaseoAgentListResult>;
+  async function listAgents(options?: PaseoAgentListOptions): Promise<PaseoAgentListResult> {
+    if (!options?.subscribe) return daemonClient.fetchAgents(options);
+    if (options.subscribe.subscriptionId !== undefined)
+      throw new Error("Subscription IDs are assigned by the host");
+    const subscription = own(() => daemonClient.observeAgents(options));
+    subscription.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "agent_update")
+          for (const listener of agentListeners) listener(message.payload);
+      },
+    });
+    return { ...(await subscription.ready), subscription };
+  }
 
   return {
+    dispose,
+    observeEvents,
+    terminals,
     projects: {
       list: (options) => daemonClient.listProjects(options),
+      subscribe: (handler) => {
+        return subscribeEvent("project.update", (message) => {
+          if (message.type === "project.update") handler(message.payload);
+        });
+      },
     },
     workspaces: {
-      list: (options) => daemonClient.fetchWorkspaces(options),
+      list: listWorkspaces,
       ref: (workspace) => createWorkspaceHandle(workspace),
       open: (input, requestId) =>
         openWorkspace(daemonClient, createWorkspaceHandle, input, requestId),
-      create: async ({ requestId, ...options }) => {
-        const result = await daemonClient.createWorkspace(options, requestId);
+      create: async ({ requestId, agent, ...options }) => {
+        const result = await daemonClient.createWorkspace(
+          { ...options, ...(agent ? { agent: toDaemonAgentCreateOptions(agent) } : {}) },
+          requestId,
+        );
         if (result.error || !result.workspace) {
           throw new Error(result.error ?? "The daemon did not create a workspace");
         }
@@ -475,19 +722,13 @@ export function createPaseoApi(daemonClient: DaemonClient): PaseoApi {
       },
       archive: (workspace, requestId) =>
         daemonClient.archiveWorkspace(resolveWorkspaceId(workspace), requestId),
-      subscribe: (handler) =>
-        daemonClient.on("workspace_update", (message) => {
-          handler(message.payload);
-        }),
+      subscribe: listenWorkspaces,
     },
     agents: {
-      list: (options) => daemonClient.fetchAgents(options),
+      list: listAgents,
       ref: (agent) => createAgentHandle(agent),
       create: (options) => createAgent(options),
-      subscribe: (handler) =>
-        daemonClient.on("agent_update", (message) => {
-          handler(message.payload);
-        }),
+      subscribe: listenAgents,
     },
     providers: {
       listModels: (provider, options) => daemonClient.listProviderModels(provider, options),
@@ -498,13 +739,21 @@ export function createPaseoApi(daemonClient: DaemonClient): PaseoApi {
       },
       listAvailable: (options) => daemonClient.listAvailableProviders(options),
       snapshot: (options) => daemonClient.getProvidersSnapshot(options),
-      waitForReady: (options) => waitForProvidersReady(daemonClient, options),
+      waitForReady: (options) =>
+        waitForProvidersReady(
+          daemonClient,
+          observeEvents(["providers_snapshot_update"]),
+          lifetime.signal,
+          options,
+        ),
       refresh: (options) => daemonClient.refreshProvidersSnapshot(options),
       diagnostic: (provider, options) => daemonClient.getProviderDiagnostic(provider, options),
-      subscribe: (handler) =>
-        daemonClient.on("providers_snapshot_update", (message) => {
-          handler(message.payload);
-        }),
+      listUsage: (options) => listProviderUsage(daemonClient, options),
+      subscribe: (handler) => {
+        return subscribeEvent("providers_snapshot_update", (message) => {
+          if (message.type === "providers_snapshot_update") handler(message.payload);
+        });
+      },
     },
     config: {
       get: (requestId) => daemonClient.getDaemonConfig(requestId),
@@ -523,6 +772,8 @@ type CreateAgent = (
 function createWorkspaceHandleFactory(
   daemonClient: DaemonClient,
   createAgent: CreateAgent,
+  terminals: PaseoTerminalActions,
+  listen: (handler: PaseoWorkspaceUpdateHandler) => () => void,
 ): WorkspaceHandleFactory {
   return (workspace) => {
     const id = typeof workspace === "string" ? workspace : workspace.id;
@@ -531,9 +782,12 @@ function createWorkspaceHandleFactory(
     const refresh = async (options?: { requestId?: string }) => {
       let cursor: string | undefined;
       let requestId = options?.requestId;
+      // A ref addresses one workspace by id, so a background one resolves too.
+      const filter = daemonClient.supportsBackgroundWorkspaces() ? { includeBackground: true } : {};
       do {
         const result = await daemonClient.fetchWorkspaces({
           requestId,
+          filter,
           page: { limit: 200, ...(cursor ? { cursor } : {}) },
         });
         const match = result.entries.find((entry) => entry.id === id);
@@ -574,6 +828,10 @@ function createWorkspaceHandleFactory(
           );
         },
       },
+      terminals: {
+        create: (options) => terminals.create({ ...options, workspaceId: id }),
+        list: (options) => terminals.list({ ...options, workspaceId: id }),
+      },
       current: () => current,
       refresh,
       setTitle: (title, requestId) => daemonClient.setWorkspaceTitle(id, title, requestId),
@@ -585,14 +843,12 @@ function createWorkspaceHandleFactory(
         return result;
       },
       subscribe: (handler) =>
-        daemonClient.on("workspace_update", (message) => {
-          const update = message.payload;
+        listen((update) => {
           if (update.kind === "upsert" && update.workspace.id === id) {
             current = update.workspace;
             handler(update);
           }
           if (update.kind === "remove" && update.id === id) {
-            current = null;
             handler(update);
           }
         }),
@@ -600,7 +856,11 @@ function createWorkspaceHandleFactory(
   };
 }
 
-function createAgentHandleFactory(daemonClient: DaemonClient): AgentHandleFactory {
+function createAgentHandleFactory(
+  daemonClient: DaemonClient,
+  listen: (handler: PaseoAgentUpdateHandler) => () => void,
+  subscribeTimeline: DaemonClient["subscribeAgentTimeline"],
+): AgentHandleFactory {
   return (agent) => {
     const id = typeof agent === "string" ? agent : agent.id;
     let current = typeof agent === "string" ? null : agent;
@@ -617,9 +877,26 @@ function createAgentHandleFactory(daemonClient: DaemonClient): AgentHandleFactor
           return result;
         },
         subscribe: (handler) =>
-          daemonClient.on("agent_stream", (message) => {
-            if (message.payload.agentId === id) {
-              handler(message.payload);
+          subscribeTimeline(id, (message) => {
+            switch (message.type) {
+              case "agent_stream":
+                return handler(message.payload);
+              case "agent.timeline.subscription_restored":
+                return handler({
+                  agentId: id,
+                  subscriptionId: message.payload.subscriptionId,
+                  event: { type: "subscription_restored" },
+                });
+              case "agent.timeline.error":
+                return handler({
+                  agentId: id,
+                  event: { type: "error", error: message.payload.error },
+                });
+              case "agent.timeline.replacement":
+                return handler({
+                  agentId: id,
+                  event: { type: "replacement", epoch: message.payload.epoch },
+                });
             }
           }),
       },
@@ -668,6 +945,9 @@ function createAgentHandleFactory(daemonClient: DaemonClient): AgentHandleFactor
       send: async (text, options) => {
         await daemonClient.sendAgentMessage(id, text, options);
       },
+      respondToPermission: async ({ requestId, response }) => {
+        await daemonClient.respondToPermission(id, requestId, response);
+      },
       run: async (text, options) => {
         const { timeoutMs, ...sendOptions } = options ?? {};
         await daemonClient.sendAgentMessage(id, text, sendOptions);
@@ -702,14 +982,12 @@ function createAgentHandleFactory(daemonClient: DaemonClient): AgentHandleFactor
         await daemonClient.detachAgent(id);
       },
       subscribe: (handler) =>
-        daemonClient.on("agent_update", (message) => {
-          const update = message.payload;
+        listen((update) => {
           if (update.kind === "upsert" && update.agent.id === id) {
             current = update.agent;
             handler(update);
           }
           if (update.kind === "remove" && update.agentId === id) {
-            current = null;
             handler(update);
           }
         }),
@@ -752,86 +1030,107 @@ function parseProviderModel(selection: string): { provider: string; model: strin
   };
 }
 
-function waitForProvidersReady(
+function listProviderUsage(
   daemonClient: DaemonClient,
+  options?: PaseoProviderUsageOptions,
+): Promise<PaseoProviderUsageResult> {
+  // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-02-28 once daemon floor >= v0.1.98.
+  if (daemonClient.getLastServerInfoMessage()?.features?.providerUsageList !== true) {
+    return Promise.reject(new Error("Update the host to list provider usage."));
+  }
+  return daemonClient.listProviderUsage(options);
+}
+
+async function waitForProvidersReady(
+  daemonClient: DaemonClient,
+  observation: ReturnType<DaemonClient["observeEvents"]>,
+  signal: AbortSignal,
   options: PaseoProviderWaitOptions = {},
 ): Promise<PaseoProviderSnapshotResult> {
-  // COMPAT(providersSnapshotCwd): added in v0.3.2, remove gate after 2027-02-10.
-  if (daemonClient.getLastServerInfoMessage()?.features?.providersSnapshotCwd !== true) {
-    return Promise.reject(new Error("Update the host to wait for provider discovery."));
-  }
-
   const { timeoutMs = 60_000, ...snapshotOptions } = options;
 
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    let requestId: string | null = null;
-    let snapshotCwd: string | undefined;
-    const pendingUpdates = new Map<string | undefined, PaseoProviderSnapshotUpdate>();
-    let latestEntries: PaseoProviderSnapshotResult["entries"] = [];
+  try {
+    await observation.ready;
+    signal.throwIfAborted();
+    return await new Promise<PaseoProviderSnapshotResult>((resolve, reject) => {
+      let settled = false;
+      let requestId: string | null = null;
+      let snapshotCwd: string | undefined;
+      const pendingUpdates = new Map<string | undefined, PaseoProviderSnapshotUpdate>();
+      let latestEntries: PaseoProviderSnapshotResult["entries"] = [];
 
-    const cleanup = () => {
-      clearTimeout(timeout);
-      unsubscribe();
-    };
-    const finish = (snapshot: PaseoProviderSnapshotResult) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      resolve(snapshot);
-    };
-    const fail = (error: unknown) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      reject(error instanceof Error ? error : new Error(String(error)));
-    };
-    const updateMatches = (update: PaseoProviderSnapshotUpdate) => update.cwd === snapshotCwd;
+      const cleanup = () => {
+        clearTimeout(timeout);
+        unsubscribe();
+        signal.removeEventListener("abort", abort);
+      };
+      const finish = (snapshot: PaseoProviderSnapshotResult) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        resolve(snapshot);
+      };
+      const fail = (error: unknown) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        reject(error instanceof Error ? error : new Error(String(error)));
+      };
+      const updateMatches = (update: PaseoProviderSnapshotUpdate) => update.cwd === snapshotCwd;
 
-    const unsubscribe = daemonClient.on("providers_snapshot_update", (message) => {
-      const update = message.payload;
-      if (!requestId) {
-        pendingUpdates.set(update.cwd, update);
-        return;
-      }
-      if (!updateMatches(update)) return;
-      latestEntries = update.entries;
-      if (update.entries.some((entry) => entry.status === "loading")) return;
-      finish({ ...update, requestId });
+      const unsubscribe = observation.subscribe({
+        snapshot: () => {},
+        update: (message) => {
+          if (message.type !== "providers_snapshot_update") return;
+          const update = message.payload;
+          if (!requestId) {
+            pendingUpdates.set(update.cwd, update);
+            return;
+          }
+          if (!updateMatches(update)) return;
+          latestEntries = update.entries;
+          if (update.entries.some((entry) => entry.status === "loading")) return;
+          finish({ ...update, requestId });
+        },
+      });
+      const abort = () => fail(new Error("Paseo API is disposed"));
+      signal.addEventListener("abort", abort, { once: true });
+
+      const timeout = setTimeout(() => {
+        const loading = latestEntries
+          .filter((entry) => entry.status === "loading")
+          .map((entry) => entry.provider)
+          .join(", ");
+        fail(
+          new Error(
+            loading
+              ? `Timed out waiting for providers: ${loading}`
+              : "Timed out waiting for provider discovery",
+          ),
+        );
+      }, timeoutMs);
+
+      void daemonClient
+        .getProvidersSnapshot(snapshotOptions)
+        .then((snapshot) => {
+          requestId = snapshot.requestId;
+          snapshotCwd = snapshot.cwd;
+          latestEntries = snapshot.entries;
+          if (!snapshot.entries.some((entry) => entry.status === "loading")) {
+            finish(snapshot);
+            return;
+          }
+          const pendingUpdate = pendingUpdates.get(snapshotCwd);
+          if (pendingUpdate && !pendingUpdate.entries.some((entry) => entry.status === "loading")) {
+            finish({ ...pendingUpdate, requestId });
+          }
+          return undefined;
+        })
+        .catch(fail);
     });
-
-    const timeout = setTimeout(() => {
-      const loading = latestEntries
-        .filter((entry) => entry.status === "loading")
-        .map((entry) => entry.provider)
-        .join(", ");
-      fail(
-        new Error(
-          loading
-            ? `Timed out waiting for providers: ${loading}`
-            : "Timed out waiting for provider discovery",
-        ),
-      );
-    }, timeoutMs);
-
-    void daemonClient
-      .getProvidersSnapshot(snapshotOptions)
-      .then((snapshot) => {
-        requestId = snapshot.requestId;
-        snapshotCwd = snapshot.cwd;
-        latestEntries = snapshot.entries;
-        if (!snapshot.entries.some((entry) => entry.status === "loading")) {
-          finish(snapshot);
-          return;
-        }
-        const pendingUpdate = pendingUpdates.get(snapshotCwd);
-        if (pendingUpdate && !pendingUpdate.entries.some((entry) => entry.status === "loading")) {
-          finish({ ...pendingUpdate, requestId });
-        }
-        return undefined;
-      })
-      .catch(fail);
-  });
+  } finally {
+    await observation.release();
+  }
 }
 
 function createGeneratedClientId(): string {
diff --git a/packages/client/src/legacy-usage-icons.ts b/packages/client/src/legacy-usage-icons.ts
new file mode 100644
index 0000000000..227bde8134
--- /dev/null
+++ b/packages/client/src/legacy-usage-icons.ts
@@ -0,0 +1,21 @@
+// COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+// Released hosts omit source icons. Delete these copies with the list conversion.
+const ICONS: Readonly<Record<string, string>> = {
+  claude:
+    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4.709 15.955l4.72-2.647.08-.23-.08-.128H9.2l-.79-.048-2.698-.073-2.339-.097-2.266-.122-.571-.121L0 11.784l.055-.352.48-.321.686.06 1.52.103 2.278.158 1.652.097 2.449.255h.389l.055-.157-.134-.098-.103-.097-2.358-1.596-2.552-1.688-1.336-.972-.724-.491-.364-.462-.158-1.008.656-.722.881.06.225.061.893.686 1.908 1.476 2.491 1.833.365.304.145-.103.019-.073-.164-.274-1.355-2.446-1.446-2.49-.644-1.032-.17-.619a2.97 2.97 0 01-.104-.729L6.283.134 6.696 0l.996.134.42.364.62 1.414 1.002 2.229 1.555 3.03.456.898.243.832.091.255h.158V9.01l.128-1.706.237-2.095.23-2.695.08-.76.376-.91.747-.492.584.28.48.685-.067.444-.286 1.851-.559 2.903-.364 1.942h.212l.243-.242.985-1.306 1.652-2.064.73-.82.85-.904.547-.431h1.033l.76 1.129-.34 1.166-1.064 1.347-.881 1.142-1.264 1.7-.79 1.36.073.11.188-.02 2.856-.606 1.543-.28 1.841-.315.833.388.091.395-.328.807-1.969.486-2.309.462-3.439.813-.042.03.049.061 1.549.146.662.036h1.622l3.02.225.79.522.474.638-.079.485-1.215.62-1.64-.389-3.829-.91-1.312-.329h-.182v.11l1.093 1.068 2.006 1.81 2.509 2.33.127.578-.322.455-.34-.049-2.205-1.657-.851-.747-1.926-1.62h-.128v.17l.444.649 2.345 3.521.122 1.08-.17.353-.608.213-.668-.122-1.374-1.925-1.415-2.167-1.143-1.943-.14.08-.674 7.254-.316.37-.729.28-.607-.461-.322-.747.322-1.476.389-1.924.315-1.53.286-1.9.17-.632-.012-.042-.14.018-1.434 1.967-2.18 2.945-1.726 1.845-.414.164-.717-.37.067-.662.401-.589 2.388-3.036 1.44-1.882.93-1.086-.006-.158h-.055L4.132 18.56l-1.13.146-.487-.456.061-.746.231-.243 1.908-1.312-.006.006z"/></svg>\n',
+  codex:
+    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" fill-rule="evenodd"><path d="M21.55 10.004a5.416 5.416 0 00-.478-4.501c-1.217-2.09-3.662-3.166-6.05-2.66A5.59 5.59 0 0010.831 1C8.39.995 6.224 2.546 5.473 4.838A5.553 5.553 0 001.76 7.496a5.487 5.487 0 00.691 6.5 5.416 5.416 0 00.477 4.502c1.217 2.09 3.662 3.165 6.05 2.66A5.586 5.586 0 0013.168 23c2.443.006 4.61-1.546 5.361-3.84a5.553 5.553 0 003.715-2.66 5.488 5.488 0 00-.693-6.497v.001zm-8.381 11.558a4.199 4.199 0 01-2.675-.954c.034-.018.093-.05.132-.074l4.44-2.53a.71.71 0 00.364-.623v-6.176l1.877 1.069c.02.01.033.029.036.05v5.115c-.003 2.274-1.87 4.118-4.174 4.123zM4.192 17.78a4.059 4.059 0 01-.498-2.763c.032.02.09.055.131.078l4.44 2.53c.225.13.504.13.73 0l5.42-3.088v2.138a.068.068 0 01-.027.057L9.9 19.288c-1.999 1.136-4.552.46-5.707-1.51h-.001zM3.023 8.216A4.15 4.15 0 015.198 6.41l-.002.151v5.06a.711.711 0 00.364.624l5.42 3.087-1.876 1.07a.067.067 0 01-.063.005l-4.489-2.559c-1.995-1.14-2.679-3.658-1.53-5.63h.001zm15.417 3.54l-5.42-3.088L14.896 7.6a.067.067 0 01.063-.006l4.489 2.557c1.998 1.14 2.683 3.662 1.529 5.633a4.163 4.163 0 01-2.174 1.807V12.38a.71.71 0 00-.363-.623zm1.867-2.773a6.04 6.04 0 00-.132-.078l-4.44-2.53a.731.731 0 00-.729 0l-5.42 3.088V7.325a.068.068 0 01.027-.057L14.1 4.713c2-1.137 4.555-.46 5.707 1.513.487.833.664 1.809.499 2.757h.001zm-11.741 3.81l-1.877-1.068a.065.065 0 01-.036-.051V6.559c.001-2.277 1.873-4.122 4.181-4.12.976 0 1.92.338 2.671.954-.034.018-.092.05-.131.073l-4.44 2.53a.71.71 0 00-.365.623l-.003 6.173v.002zm1.02-2.168L12 9.25l2.414 1.375v2.75L12 14.75l-2.415-1.375v-2.75z"/></svg>\n',
+  copilot:
+    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416" fill="currentColor"><path d="M181.33 266.143c0-11.497 9.32-20.818 20.818-20.818 11.498 0 20.819 9.321 20.819 20.818v38.373c0 11.497-9.321 20.818-20.819 20.818-11.497 0-20.818-9.32-20.818-20.818v-38.373zM308.807 245.325c-11.477 0-20.798 9.321-20.798 20.818v38.373c0 11.497 9.32 20.818 20.798 20.818 11.497 0 20.818-9.32 20.818-20.818v-38.373c0-11.497-9.32-20.818-20.818-20.818z"\n        fill-rule="nonzero"/><path d="M512.002 246.393v57.384c-.02 7.411-3.696 14.638-9.67 19.011C431.767 374.444 344.695 416 256 416c-98.138 0-196.379-56.542-246.33-93.21-5.975-4.374-9.65-11.6-9.671-19.012v-57.384a35.347 35.347 0 016.857-20.922l15.583-21.085c8.336-11.312 20.757-14.31 33.98-14.31 4.988-56.953 16.794-97.604 45.024-127.354C155.194 5.77 226.56 0 256 0c29.441 0 100.807 5.77 154.557 62.722 28.19 29.75 40.036 70.401 45.025 127.354 13.263 0 25.602 2.936 33.958 14.31l15.583 21.127c4.476 6.077 6.878 13.345 6.878 20.88zm-97.666-26.075c-.677-13.058-11.292-18.19-22.338-21.824-11.64 7.309-25.848 10.183-39.46 10.183-14.454 0-41.432-3.47-63.872-25.869-5.667-5.625-9.527-14.454-12.155-24.247a212.902 212.902 0 00-20.469-1.088c-6.098 0-13.099.349-20.551 1.088-2.628 9.793-6.509 18.622-12.155 24.247-22.4 22.4-49.418 25.87-63.872 25.87-13.612 0-27.86-2.855-39.501-10.184-11.005 3.613-21.558 8.828-22.277 21.824-1.17 24.555-1.272 49.11-1.375 73.645-.041 12.318-.082 24.658-.288 36.976.062 7.166 4.374 13.818 10.882 16.774 52.97 24.124 103.045 36.278 149.137 36.278 46.01 0 96.085-12.154 149.014-36.278 6.508-2.956 10.84-9.608 10.881-16.774.637-36.832.124-73.809-1.642-110.62h.041zM107.521 168.97c8.643 8.623 24.966 14.392 42.56 14.392 13.448 0 39.03-2.874 60.156-24.329 9.28-8.951 15.05-31.35 14.413-54.079-.657-18.231-5.769-33.28-13.448-39.665-8.315-7.371-27.203-10.574-48.33-8.644-22.399 2.238-41.267 9.588-50.875 19.833-20.798 22.728-16.323 80.317-4.476 92.492zm130.556-56.008c.637 3.51.965 7.35 1.273 11.517 0 2.875 0 5.77-.308 8.952 6.406-.636 11.847-.636 16.959-.636s10.553 0 16.959.636c-.329-3.182-.329-6.077-.329-8.952.329-4.167.657-8.007 1.294-11.517-6.735-.637-12.812-.965-17.924-.965s-11.21.328-17.924.965zm49.275-8.008c-.637 22.728 5.133 45.128 14.413 54.08 21.105 21.454 46.708 24.328 60.155 24.328 17.596 0 33.918-5.769 42.561-14.392 11.847-12.175 16.322-69.764-4.476-92.492-9.608-10.245-28.476-17.595-50.875-19.833-21.127-1.93-40.015 1.273-48.33 8.644-7.679 6.385-12.791 21.434-13.448 39.665z"/></svg>\n',
+  cursor:
+    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 466.73 532.09">\n  <path fill="currentColor" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>\n</svg>\n',
+  zai: '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" fill-rule="evenodd"><title>Z.ai</title><path d="M8.07 1.333L6.618 3.302H.435L1.887 1.333h6.184zM15.503 12.699L14.052 14.667h-6.161l1.449-1.968h6.163zM16 1.333L6.176 14.667H0L9.824 1.333H16z"/></svg>\n',
+  grok: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 8V4H8"/><rect width="16" height="12" x="4" y="8" rx="2"/><path d="M2 14h2M20 14h2M9 13v2M15 13v2"/></svg>\n',
+  kimi: '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">\n  <path fill="currentColor" d="M19.514 7.342C19.711 7.862 19.814 8.413 19.816 8.969C19.816 12.494 15.998 14.697 12.946 12.934C11.529 12.116 10.657 10.605 10.657 8.969C10.657 5.646 14.085 3.431 17.115 4.793C15.26 3.373 12.99 2.607 10.655 2.612C4.772 2.614 0.005 7.381 0 13.265C0.002 19.148 4.772 23.918 10.655 23.92C16.538 23.916 21.306 19.147 21.31 13.265C21.312 11.155 20.687 9.095 19.514 7.342ZM14.841 4.666C14.841 8.191 18.657 10.395 21.709 8.632C23.127 7.814 24 6.302 24 4.666C24 1.14 20.184-1.061 17.13 0.699C15.714 1.519 14.841 3.03 14.841 4.666"/>\n</svg>\n',
+  minimax:
+    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z"/></svg>\n',
+};
+
+export function legacyUsageIcon(sourceId: string): string | undefined {
+  return Object.hasOwn(ICONS, sourceId) ? ICONS[sourceId] : undefined;
+}
diff --git a/packages/client/src/provider-snapshots/index.ts b/packages/client/src/provider-snapshots/index.ts
new file mode 100644
index 0000000000..b73a88e944
--- /dev/null
+++ b/packages/client/src/provider-snapshots/index.ts
@@ -0,0 +1,70 @@
+import type {
+  GetProvidersSnapshotResponseMessage,
+  SessionOutboundMessage,
+} from "@getpaseo/protocol/messages";
+
+type Update = Extract<SessionOutboundMessage, { type: "providers_snapshot_update" }>;
+type Snapshot = GetProvidersSnapshotResponseMessage["payload"];
+
+interface PendingSnapshot {
+  latest: Update;
+  running: boolean;
+}
+
+/** Resolve announcements only while observed, coalescing changes during a fetch. */
+export class ProviderSnapshotUpdates {
+  private pending = new Map<string, PendingSnapshot>();
+
+  constructor(
+    private readonly host: {
+      active(update: Update): boolean;
+      fetch(cwd: string | undefined): Promise<Snapshot>;
+      emit(update: Update): void;
+      failed(error: unknown): void;
+    },
+  ) {}
+
+  clear(): void {
+    this.pending.clear();
+  }
+
+  receive(update: Update): void {
+    if (!this.host.active(update)) return;
+    const key = JSON.stringify([update.payload.subscriptionId, update.payload.cwd]);
+    const pending = this.pending.get(key) ?? { latest: update, running: false };
+    pending.latest = update;
+    this.pending.set(key, pending);
+    if (pending.running) return;
+    pending.running = true;
+    void this.resolve(key, pending);
+  }
+
+  private async resolve(key: string, pending: PendingSnapshot): Promise<void> {
+    try {
+      while (this.pending.get(key) === pending) {
+        const announced = pending.latest;
+        if (!this.host.active(announced)) return;
+        const snapshot = await this.host.fetch(announced.payload.cwd);
+        if (!this.host.active(announced)) return;
+        if (this.pending.get(key) !== pending) return;
+        // A change arriving while the body was in flight needs the current body.
+        // If that response already covers it, no second fetch is necessary.
+        if (
+          pending.latest !== announced &&
+          pending.latest.payload.snapshotHash !== snapshot.snapshotHash
+        )
+          continue;
+        this.pending.delete(key);
+        this.host.emit({
+          type: "providers_snapshot_update",
+          payload: { ...snapshot, subscriptionId: announced.payload.subscriptionId },
+        });
+        return;
+      }
+    } catch (error) {
+      if (this.pending.get(key) === pending) this.host.failed(error);
+    } finally {
+      if (this.pending.get(key) === pending) this.pending.delete(key);
+    }
+  }
+}
diff --git a/packages/client/src/terminal-stream-router.test.ts b/packages/client/src/terminal-stream-router.test.ts
index f4a6c294c7..7b9e598410 100644
--- a/packages/client/src/terminal-stream-router.test.ts
+++ b/packages/client/src/terminal-stream-router.test.ts
@@ -9,8 +9,7 @@ describe("terminal-stream-router", () => {
     const events: TerminalStreamEvent[] = [];
     const payload = new TextEncoder().encode("restored screen");
 
-    router.setSlot("term-1", 7);
-    router.onEvent((event) => events.push(event));
+    router.attach("subscription-1", "term-1", 7, (event) => events.push(event));
     router.handleFrame({
       opcode: TerminalStreamOpcode.Restore,
       slot: 7,
@@ -20,9 +19,45 @@ describe("terminal-stream-router", () => {
     expect(events).toEqual([
       {
         terminalId: "term-1",
+        subscriptionId: "subscription-1",
         type: "restore",
         data: payload,
       },
     ]);
   });
 });
+
+test("two registrations for one terminal retain independent slots and release", () => {
+  const router = new TerminalStreamRouter();
+  const a: TerminalStreamEvent[] = [];
+  const b: TerminalStreamEvent[] = [];
+  const releaseA = router.attach("subscription-a", "same-terminal", 1, (event) => a.push(event));
+  router.attach("subscription-b", "same-terminal", 2, (event) => b.push(event));
+  const payload = new TextEncoder().encode("output");
+  router.handleFrame({ opcode: TerminalStreamOpcode.Output, slot: 1, payload });
+  router.handleFrame({ opcode: TerminalStreamOpcode.Output, slot: 2, payload });
+  expect(a).toEqual([expect.objectContaining({ subscriptionId: "subscription-a" })]);
+  expect(b).toEqual([expect.objectContaining({ subscriptionId: "subscription-b" })]);
+  releaseA();
+  router.handleFrame({ opcode: TerminalStreamOpcode.Output, slot: 1, payload });
+  router.handleFrame({ opcode: TerminalStreamOpcode.Output, slot: 2, payload });
+  expect(a).toHaveLength(1);
+  expect(b).toHaveLength(2);
+});
+
+test("legacy listeners share a terminal slot without releasing each other", () => {
+  const router = new TerminalStreamRouter();
+  const received: string[] = [];
+  const release = router.attach("first", "terminal", 1, () => received.push("first"));
+  router.attach("second", "terminal", 1, () => received.push("second"));
+  const frame = {
+    opcode: TerminalStreamOpcode.Output,
+    slot: 1,
+    payload: new TextEncoder().encode("bytes"),
+  };
+  router.handleFrame(frame);
+  expect(received).toEqual(["first", "second"]);
+  release();
+  router.handleFrame(frame);
+  expect(received).toEqual(["first", "second", "second"]);
+});
diff --git a/packages/client/src/terminal-stream-router.ts b/packages/client/src/terminal-stream-router.ts
index 5760af28eb..a2c9575450 100644
--- a/packages/client/src/terminal-stream-router.ts
+++ b/packages/client/src/terminal-stream-router.ts
@@ -1,22 +1,28 @@
 import {
   decodeTerminalSnapshotPayload,
-  encodeTerminalResizePayload,
-  encodeTerminalStreamFrame,
   TerminalStreamOpcode,
   type TerminalStreamFrame,
 } from "@getpaseo/protocol/binary-frames/index";
-import type { TerminalInput, TerminalState } from "@getpaseo/protocol/messages";
+import type { TerminalState } from "@getpaseo/protocol/messages";
 
-export type TerminalStreamEvent =
-  | { terminalId: string; type: "output"; data: Uint8Array }
-  | { terminalId: string; type: "snapshot"; state: TerminalState }
-  | { terminalId: string; type: "restore"; data: Uint8Array };
+export type TerminalStreamEvent = { terminalId: string; subscriptionId: string } & (
+  | { type: "output"; data: Uint8Array }
+  | { type: "snapshot"; state: TerminalState }
+  | { type: "restore"; data: Uint8Array }
+);
 
 export class TerminalStreamRouter {
-  private readonly terminalSlots = new Map<string, number>();
-  private readonly slotTerminals = new Map<number, string>();
+  private readonly slots = new Map<
+    number,
+    Set<{
+      subscriptionId: string;
+      terminalId: string;
+      receive: (event: TerminalStreamEvent) => void;
+    }>
+  >();
   private readonly listeners = new Set<(event: TerminalStreamEvent) => void>();
 
+  /** Passive wire diagnostics. App state consumes the registration's callback. */
   onEvent(handler: (event: TerminalStreamEvent) => void): () => void {
     this.listeners.add(handler);
     return () => {
@@ -24,109 +30,51 @@ export class TerminalStreamRouter {
     };
   }
 
-  setSlot(terminalId: string, slot: number): void {
-    const existingTerminalId = this.slotTerminals.get(slot);
-    if (existingTerminalId && existingTerminalId !== terminalId) {
-      this.terminalSlots.delete(existingTerminalId);
-    }
-
-    const existingSlot = this.terminalSlots.get(terminalId);
-    if (typeof existingSlot === "number" && existingSlot !== slot) {
-      this.slotTerminals.delete(existingSlot);
-    }
-
-    this.terminalSlots.set(terminalId, slot);
-    this.slotTerminals.set(slot, terminalId);
-  }
-
-  removeTerminal(terminalId: string): void {
-    const slot = this.terminalSlots.get(terminalId);
-    if (typeof slot !== "number") {
-      return;
-    }
-    this.terminalSlots.delete(terminalId);
-    if (this.slotTerminals.get(slot) === terminalId) {
-      this.slotTerminals.delete(slot);
-    }
+  attach(
+    subscriptionId: string,
+    terminalId: string,
+    slot: number,
+    receive: (event: TerminalStreamEvent) => void,
+  ): () => void {
+    const registration = { subscriptionId, terminalId, receive };
+    const registrations = this.slots.get(slot) ?? new Set();
+    registrations.add(registration);
+    this.slots.set(slot, registrations);
+    return () => {
+      registrations.delete(registration);
+      if (registrations.size === 0) this.slots.delete(slot);
+    };
   }
 
   clearSlots(): void {
-    this.terminalSlots.clear();
-    this.slotTerminals.clear();
-  }
-
-  encodeInput(terminalId: string, message: TerminalInput["message"]): Uint8Array | null {
-    const slot = this.terminalSlots.get(terminalId);
-    if (typeof slot !== "number") {
-      return null;
-    }
-
-    if (message.type === "input") {
-      return encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Input,
-        slot,
-        payload: message.data,
-      });
-    }
-
-    if (message.type === "resize") {
-      return encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Resize,
-        slot,
-        payload: encodeTerminalResizePayload({
-          rows: message.rows,
-          cols: message.cols,
-          ...(message.intent ? { intent: message.intent } : {}),
-        }),
-      });
-    }
-
-    return null;
+    this.slots.clear();
   }
 
   handleFrame(frame: TerminalStreamFrame): void {
-    const terminalId = this.slotTerminals.get(frame.slot);
-    if (!terminalId) {
-      return;
-    }
-
-    if (frame.opcode === TerminalStreamOpcode.Output) {
-      this.emit({
-        terminalId,
-        type: "output",
-        data: frame.payload,
-      });
-      return;
-    }
-
-    if (frame.opcode === TerminalStreamOpcode.Restore) {
-      this.emit({
-        terminalId,
-        type: "restore",
-        data: frame.payload,
-      });
-      return;
-    }
-
-    if (frame.opcode === TerminalStreamOpcode.Snapshot) {
-      const state = decodeTerminalSnapshotPayload(frame.payload);
-      if (!state) {
-        return;
-      }
-      this.emit({
-        terminalId,
-        type: "snapshot",
-        state,
-      });
-    }
-  }
-
-  private emit(event: TerminalStreamEvent): void {
-    for (const listener of this.listeners) {
-      try {
-        listener(event);
-      } catch {
-        // no-op
+    const registrations = this.slots.get(frame.slot);
+    if (!registrations) return;
+    for (const registration of registrations) {
+      const identity = {
+        subscriptionId: registration.subscriptionId,
+        terminalId: registration.terminalId,
+      };
+      let event: TerminalStreamEvent;
+      if (frame.opcode === TerminalStreamOpcode.Output)
+        event = { ...identity, type: "output", data: frame.payload };
+      else if (frame.opcode === TerminalStreamOpcode.Restore)
+        event = { ...identity, type: "restore", data: frame.payload };
+      else if (frame.opcode === TerminalStreamOpcode.Snapshot) {
+        const state = decodeTerminalSnapshotPayload(frame.payload);
+        if (!state) return;
+        event = { ...identity, type: "snapshot", state };
+      } else return;
+      registration.receive(event);
+      for (const listener of this.listeners) {
+        try {
+          listener(event);
+        } catch {
+          /* Passive diagnostics cannot interrupt delivery. */
+        }
       }
     }
   }
diff --git a/packages/client/src/terminals/index.test.ts b/packages/client/src/terminals/index.test.ts
new file mode 100644
index 0000000000..2e9a51a93f
--- /dev/null
+++ b/packages/client/src/terminals/index.test.ts
@@ -0,0 +1,37 @@
+import { expect, test } from "vitest";
+import { createTerminalActions } from "./index.js";
+
+test("an older host rejects terminal operations before sending requests", async () => {
+  const unexpectedRequest = () => {
+    throw new Error("Unexpected daemon request");
+  };
+  const terminals = createTerminalActions(
+    {
+      ensureConnected: () => {},
+      getLastServerInfoMessage: () => ({
+        status: "server_info",
+        serverId: "older-host",
+        hostname: null,
+        version: null,
+        features: {},
+      }),
+      createTerminal: unexpectedRequest,
+      listTerminals: unexpectedRequest,
+      sendTerminalInput: unexpectedRequest,
+      captureTerminal: unexpectedRequest,
+      killTerminal: unexpectedRequest,
+    },
+    unexpectedRequest,
+  );
+
+  await expect(terminals.create({ workspaceId: "wks_existing" })).rejects.toThrow(
+    "Update the host",
+  );
+  await expect(terminals.list({ workspaceId: "wks_existing" })).rejects.toThrow("Update the host");
+  const terminal = terminals.ref("terminal-existing");
+  expect(terminal.current()).toBeNull();
+  expect(() => terminal.write("text")).toThrow("Update the host");
+  expect(() => terminal.sendKeys(["Enter"])).toThrow("Update the host");
+  expect(() => terminal.capture()).toThrow("Update the host");
+  await expect(terminal.kill()).rejects.toThrow("Update the host");
+});
diff --git a/packages/client/src/terminals/index.ts b/packages/client/src/terminals/index.ts
new file mode 100644
index 0000000000..e1fd874a63
--- /dev/null
+++ b/packages/client/src/terminals/index.ts
@@ -0,0 +1,179 @@
+import { z } from "zod";
+import type { DaemonClient } from "../daemon-client.js";
+
+const TerminalSchema = z.object({
+  id: z.string(),
+  workspaceId: z.string(),
+  cwd: z.string(),
+  name: z.string(),
+});
+
+export type PaseoTerminal = z.infer<typeof TerminalSchema>;
+
+export interface PaseoTerminalCreateOptions {
+  workspaceId: string;
+  /** Process working directory; defaults to the workspace directory. */
+  cwd?: string;
+  name?: string;
+  command?: string;
+  args?: string[];
+  size?: { rows: number; cols: number };
+  requestId?: string;
+}
+
+export interface PaseoTerminalListOptions {
+  /** Ownership filter. When supplied, cwd does not restrict the results. */
+  workspaceId?: string;
+  /** Workspace root directory filter for unscoped listings. */
+  cwd?: string;
+  requestId?: string;
+}
+
+export interface PaseoTerminalListResult {
+  entries: PaseoTerminal[];
+  requestId: string;
+}
+
+export interface PaseoTerminalCaptureOptions {
+  start?: number;
+  end?: number;
+  stripAnsi?: boolean;
+  requestId?: string;
+}
+
+export type PaseoTerminalCaptureResult = Awaited<ReturnType<DaemonClient["captureTerminal"]>>;
+
+export interface PaseoTerminalHandle {
+  readonly id: string;
+  current(): PaseoTerminal | null;
+  refresh(options?: { requestId?: string }): Promise<PaseoTerminal | null>;
+  /** Sends literal input and returns its UTF-16 length. Does not await command execution. */
+  write(data: string): number;
+  /** Expands CLI key tokens; other strings are literal. Returns the input's UTF-16 length. */
+  sendKeys(keys: readonly string[]): number;
+  capture(options?: PaseoTerminalCaptureOptions): Promise<PaseoTerminalCaptureResult>;
+  kill(requestId?: string): Promise<void>;
+}
+
+export interface PaseoTerminalActions {
+  create(options: PaseoTerminalCreateOptions): Promise<PaseoTerminalHandle>;
+  list(options?: PaseoTerminalListOptions): Promise<PaseoTerminalListResult>;
+  ref(terminal: string | PaseoTerminal): PaseoTerminalHandle;
+}
+
+export interface PaseoWorkspaceTerminalActions {
+  create(options?: Omit<PaseoTerminalCreateOptions, "workspaceId">): Promise<PaseoTerminalHandle>;
+  list(options?: { requestId?: string }): Promise<PaseoTerminalListResult>;
+}
+
+type TerminalClient = Pick<
+  DaemonClient,
+  | "ensureConnected"
+  | "getLastServerInfoMessage"
+  | "createTerminal"
+  | "listTerminals"
+  | "sendTerminalInput"
+  | "captureTerminal"
+  | "killTerminal"
+>;
+
+/** @package */
+export function createTerminalActions(
+  daemonClient: TerminalClient,
+  resolveWorkspaceDirectory: (workspaceId: string) => Promise<string>,
+): PaseoTerminalActions {
+  function client(): TerminalClient {
+    daemonClient.ensureConnected();
+    // COMPAT(workspaceTerminals): added in v0.7.3, remove gate after 2027-09-05.
+    if (daemonClient.getLastServerInfoMessage()?.features?.workspaceTerminals !== true) {
+      throw new Error("Update the host to use workspace terminals through the SDK.");
+    }
+    return daemonClient;
+  }
+
+  const list = async (options: PaseoTerminalListOptions = {}): Promise<PaseoTerminalListResult> => {
+    const result = await client().listTerminals(options.cwd, options.requestId, {
+      workspaceId: options.workspaceId,
+    });
+    return {
+      entries: result.terminals.map((terminal) => TerminalSchema.parse(terminal)),
+      requestId: result.requestId,
+    };
+  };
+
+  const ref = (terminal: string | PaseoTerminal): PaseoTerminalHandle => {
+    const id = typeof terminal === "string" ? terminal : terminal.id;
+    let current = typeof terminal === "string" ? null : terminal;
+    const write = (data: string): number => {
+      client().sendTerminalInput(id, { type: "input", data });
+      return data.length;
+    };
+    return {
+      id,
+      current: () => current,
+      refresh: async (options) => {
+        const result = await list(options);
+        current = result.entries.find((entry) => entry.id === id) ?? null;
+        return current;
+      },
+      write,
+      sendKeys: (keys) => write(keys.map(resolveKeyToken).join("")),
+      capture: (options = {}) => {
+        const { requestId, ...captureOptions } = options;
+        return client().captureTerminal(id, captureOptions, requestId);
+      },
+      kill: async (requestId) => {
+        const result = await client().killTerminal(id, requestId);
+        if (!result.success) throw new Error(`Failed to kill terminal ${id}`);
+        current = null;
+      },
+    };
+  };
+
+  return {
+    create: async ({ workspaceId, cwd, name, requestId, ...options }) => {
+      const driver = client();
+      if (!workspaceId) throw new Error("workspaceId is required");
+      const directory = cwd ?? (await resolveWorkspaceDirectory(workspaceId));
+      const result = await driver.createTerminal(directory, name, requestId, {
+        ...options,
+        workspaceId,
+      });
+      if (result.error || !result.terminal) {
+        throw new Error(result.error ?? "The daemon did not create a terminal");
+      }
+      return ref(TerminalSchema.parse(result.terminal));
+    },
+    list,
+    ref,
+  };
+}
+
+function resolveKeyToken(key: string): string {
+  switch (key) {
+    case "Enter":
+      return "\r";
+    case "Tab":
+      return "\t";
+    case "Escape":
+      return "\u001b";
+    case "Space":
+      return " ";
+    case "BSpace":
+      return "\u007f";
+    case "C-c":
+      return "\u0003";
+    case "C-d":
+      return "\u0004";
+    case "C-z":
+      return "\u001a";
+    case "C-l":
+      return "\u000c";
+    case "C-a":
+      return "\u0001";
+    case "C-e":
+      return "\u0005";
+    default:
+      return key;
+  }
+}
diff --git a/packages/client/src/timeline-subscription/index.ts b/packages/client/src/timeline-subscription/index.ts
new file mode 100644
index 0000000000..9293a0a739
--- /dev/null
+++ b/packages/client/src/timeline-subscription/index.ts
@@ -0,0 +1,75 @@
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
+import type { OwnedSubscription, TimelineSubscription } from "../connection/index.js";
+
+type TimelineUpdate = Extract<
+  SessionOutboundMessage,
+  { type: "agent_stream" | "agent.timeline.replacement" }
+>;
+
+/** Local SDK lifecycle messages; these are not additional wire RPCs. */
+export type TimelineMessage =
+  | TimelineUpdate
+  | {
+      type: "agent.timeline.subscription_restored";
+      payload: { agentId: string; subscriptionId: string };
+    }
+  | { type: "agent.timeline.error"; payload: { agentId: string; error: string } };
+
+/** Restores live delivery; the consumer owns history reads and gap recovery. */
+export function subscribeTimeline(
+  agentId: string,
+  observation: OwnedSubscription<{ agentIds: string[] }>,
+  handler: (message: TimelineMessage) => void,
+  reportError: (error: unknown) => void,
+): TimelineSubscription {
+  let established = false;
+  let released = false;
+  const notify = (message: TimelineMessage) => {
+    if (released) return;
+    try {
+      handler(message);
+    } catch (error) {
+      reportError(error);
+    }
+  };
+  const release = () => {
+    released = true;
+    return observation.release();
+  };
+  const stop = () => {
+    // Use the public release entry point so the owning API also forgets this handle.
+    void subscription.release().catch(reportError);
+  };
+  const fail = (error: unknown) => {
+    notify({
+      type: "agent.timeline.error",
+      payload: { agentId, error: error instanceof Error ? error.message : String(error) },
+    });
+    stop();
+  };
+  observation.subscribe({
+    snapshot: ({ subscriptionId }) => {
+      if (!established) {
+        established = true;
+        return;
+      }
+      notify({
+        type: "agent.timeline.subscription_restored",
+        payload: { agentId, subscriptionId },
+      });
+    },
+    update: (message) => {
+      if (message.type === "agent_stream" || message.type === "agent.timeline.replacement")
+        notify(message);
+    },
+    error: fail,
+  });
+  const subscription: TimelineSubscription = Object.assign(stop, {
+    ready: observation.ready.then(() => undefined),
+    release,
+    subscriptionId: null,
+  });
+  Object.defineProperty(subscription, "subscriptionId", { get: () => observation.subscriptionId });
+  void subscription.ready.catch(fail);
+  return subscription;
+}
diff --git a/packages/desktop/bin/paseo b/packages/desktop/bin/paseo
index 05797ae6d1..957280d684 100755
--- a/packages/desktop/bin/paseo
+++ b/packages/desktop/bin/paseo
@@ -44,6 +44,4 @@ fi
 RUNNER_PATH="${RESOURCES_DIR}/app.asar.unpacked/dist/daemon/node-entrypoint-runner.js"
 CLI_ENTRYPOINT="${RESOURCES_DIR}/app.asar/node_modules/@getpaseo/cli/dist/index.js"
 
-# PASEO_DESKTOP_MANAGED marks daemons started through this bundled CLI as
-# desktop-managed, so the desktop app restarts them when it upgrades.
-exec env ELECTRON_RUN_AS_NODE=1 PASEO_NODE_ENV=production PASEO_DESKTOP_MANAGED=1 PASEO_CLI="${SCRIPT_PATH}" "${APP_EXECUTABLE}" --disable-warning=DEP0040 "${RUNNER_PATH}" node-script "${CLI_ENTRYPOINT}" "$@"
+exec env ELECTRON_RUN_AS_NODE=1 PASEO_NODE_ENV=production PASEO_CLI="${SCRIPT_PATH}" "${APP_EXECUTABLE}" --disable-warning=DEP0040 "${RUNNER_PATH}" node-script "${CLI_ENTRYPOINT}" "$@"
diff --git a/packages/desktop/capture-harness/main.js b/packages/desktop/capture-harness/main.js
index b51735275b..5501ff8ba4 100644
--- a/packages/desktop/capture-harness/main.js
+++ b/packages/desktop/capture-harness/main.js
@@ -4,6 +4,7 @@ const http = require("node:http");
 const path = require("node:path");
 const { isDeepStrictEqual } = require("node:util");
 const { app, BrowserWindow, ipcMain, Menu, nativeImage, screen, session } = require("electron");
+const { adaptWebContents } = require("../dist/features/browser-automation/ipc.js");
 
 const ROOT = __dirname;
 const OUT_DIR = process.env.PASEO_CAPTURE_HARNESS_OUT_DIR || path.join(ROOT, "out");
@@ -48,7 +49,7 @@ const PERMANENT_STATE_FILTER = new Set(
     .filter(Boolean),
 );
 const PERMANENT_VARIANT_FILTER = new Set(
-  (process.env.PASEO_CAPTURE_HARNESS_VARIANTS || "attach-off")
+  (process.env.PASEO_CAPTURE_HARNESS_VARIANTS || "default")
     .split(",")
     .map((variant) => variant.trim())
     .filter(Boolean),
@@ -56,9 +57,9 @@ const PERMANENT_VARIANT_FILTER = new Set(
 const PERMANENT_CAPTURE_MODES = ["viewport", "full-page"];
 const PERMANENT_THROTTLING_VARIANTS = [
   {
-    id: "capture-only-throttling",
-    code: "capture-only",
-    label: "backgroundThrottling disabled only during each capture",
+    id: "default-throttling",
+    code: "default",
+    label: "Chromium background throttling enabled",
     disableGuestBackgroundThrottlingAtAttach: false,
   },
   {
@@ -442,8 +443,10 @@ async function readGuestMetrics(contents) {
 }
 
 async function capturePageSequence(contents) {
-  contents.invalidate();
-  return await withTimeout(contents.capturePage(undefined, { stayHidden: false }), "capturePage");
+  return adaptWebContents(contents).withFrameProduction(async () => {
+    contents.invalidate();
+    return await withTimeout(contents.capturePage(undefined, { stayHidden: false }), "capturePage");
+  });
 }
 
 async function captureFullPage(contents) {
@@ -485,8 +488,10 @@ async function captureFullPage(contents) {
 }
 
 async function captureFullPageSequence(contents) {
-  contents.invalidate();
-  return await captureFullPage(contents);
+  return adaptWebContents(contents).withFrameProduction(async () => {
+    contents.invalidate();
+    return await captureFullPage(contents);
+  });
 }
 
 function installHarnessWebviewGuards(win, options = {}) {
@@ -1569,9 +1574,8 @@ async function automationDrag(guest, sourceRef, targetRef) {
 }
 
 async function automationType(guest, refEntry, text) {
-  const send = await attachAutomationDebugger(guest);
   await automationClick(guest, refEntry);
-  await send("Input.insertText", { text });
+  await guest.insertText(text);
 }
 
 function sendContainedEnter(guest) {
@@ -2115,7 +2119,7 @@ async function runAutomationGroup() {
   installHarnessWebviewGuards(win, {
     preloadPath: PRODUCTION_BROWSER_GUEST_PRELOAD_PATH,
   });
-  const tracker = trackAttachedGuests(win, { disableGuestBackgroundThrottlingAtAttach: true });
+  const tracker = trackAttachedGuests(win);
   try {
     await withTimeout(
       win.loadFile(path.join(ROOT, "index.html"), {
@@ -2636,13 +2640,25 @@ async function runBrowserProfileGroup() {
 async function main() {
   ensureDirSync(OUT_DIR);
   if (
-    !["all", "existing", "permanent-parking", "automation", "browser-profile"].includes(
-      HARNESS_GROUP,
-    )
+    ![
+      "all",
+      "existing",
+      "permanent-parking",
+      "automation",
+      "browser-profile",
+      "titlebar-drag",
+    ].includes(HARNESS_GROUP)
   ) {
     fail(`unknown harness group ${HARNESS_GROUP}`);
   }
 
+  if (HARNESS_GROUP === "titlebar-drag") {
+    const { runTitlebarDragGroup } = require("./titlebar-drag.js");
+    await runTitlebarDragGroup(OUT_DIR);
+    pass(`capture harness titlebar-drag complete output=${OUT_DIR}`);
+    return;
+  }
+
   if (HARNESS_GROUP === "browser-profile") {
     const browserProfileResults = await runBrowserProfileGroup();
     await fsp.writeFile(
diff --git a/packages/desktop/capture-harness/titlebar-drag-mouse.m b/packages/desktop/capture-harness/titlebar-drag-mouse.m
new file mode 100644
index 0000000000..ac8894bc52
--- /dev/null
+++ b/packages/desktop/capture-harness/titlebar-drag-mouse.m
@@ -0,0 +1,52 @@
+// titlebar-drag-mouse.m — native mouse helper for the titlebar-drag harness.
+// Posts real CGEvents (kCGHIDEventTap) so a drag moves the actual window; pure
+// CDP input would never exercise Electron's draggable-region pipeline.
+// Usage: titlebar-drag-mouse drag x1 y1 x2 y2 | click x y
+// Every event carries flags 0 so a user-held Cmd/Opt cannot leak into the drag.
+// Exit 2 when this process lacks Accessibility trust: the harness fails loudly
+// instead of posting nothing and reading as a pass.
+#import <ApplicationServices/ApplicationServices.h>
+#import <stdio.h>
+#import <stdlib.h>
+#import <string.h>
+#import <unistd.h>
+
+static void post(CGEventType type, CGPoint p, useconds_t delay) {
+  CGEventRef event = CGEventCreateMouseEvent(NULL, type, p, kCGMouseButtonLeft);
+  if (!event) {
+    fprintf(stderr, "mouse: CGEventCreateMouseEvent failed\n");
+    exit(3);
+  }
+  CGEventSetFlags(event, (CGEventFlags)0);
+  CGEventPost(kCGHIDEventTap, event);
+  CFRelease(event);
+  usleep(delay);
+}
+
+int main(int argc, char **argv) {
+  if (!AXIsProcessTrusted()) {
+    fprintf(stderr, "mouse: not accessibility-trusted\n");
+    return 2;
+  }
+  if (argc == 6 && strcmp(argv[1], "drag") == 0) {
+    CGPoint a = {atof(argv[2]), atof(argv[3])};
+    CGPoint b = {atof(argv[4]), atof(argv[5])};
+    post(kCGEventMouseMoved, a, 150000);
+    post(kCGEventLeftMouseDown, a, 150000);
+    for (int i = 1; i <= 20; i++) {
+      CGPoint step = {a.x + (b.x - a.x) * i / 20, a.y + (b.y - a.y) * i / 20};
+      post(kCGEventLeftMouseDragged, step, 25000);
+    }
+    post(kCGEventLeftMouseUp, b, 25000);
+    return 0;
+  }
+  if (argc == 4 && strcmp(argv[1], "click") == 0) {
+    CGPoint p = {atof(argv[2]), atof(argv[3])};
+    post(kCGEventMouseMoved, p, 150000);
+    post(kCGEventLeftMouseDown, p, 150000);
+    post(kCGEventLeftMouseUp, p, 25000);
+    return 0;
+  }
+  fprintf(stderr, "usage: %s drag x1 y1 x2 y2 | click x y\n", argv[0]);
+  return 1;
+}
diff --git a/packages/desktop/capture-harness/titlebar-drag.js b/packages/desktop/capture-harness/titlebar-drag.js
new file mode 100644
index 0000000000..fe4a35d06c
--- /dev/null
+++ b/packages/desktop/capture-harness/titlebar-drag.js
@@ -0,0 +1,272 @@
+// Native mouse input is required: CDP mouse events do not move Electron windows.
+// Load production CSS so restoring the global no-drag rule reproduces the failure.
+const fs = require("node:fs");
+const fsp = require("node:fs/promises");
+const path = require("node:path");
+const { execFile } = require("node:child_process");
+const { promisify } = require("node:util");
+const { BrowserWindow } = require("electron");
+
+const execFileAsync = promisify(execFile);
+const PACKAGE_ROOT = path.join(__dirname, "..", "..");
+const INDEX_HTML = path.join(PACKAGE_ROOT, "app", "public", "index.html");
+const MOUSE_SOURCE = path.join(__dirname, "titlebar-drag-mouse.m");
+const BASE = { x: 100, y: 150 };
+const DRAG_DELTA = { x: 80, y: 50 };
+const DRAG_POINTS = [
+  { check: "header-overlay-blank", x: 625, y: 18 },
+  { check: "tab-row-overlay-blank", x: 625, y: 50 },
+  { check: "sidebar-overlay-blank", x: 125, y: 18 },
+  { check: "direct-rail-blank", x: 125, y: 50 },
+];
+const CLICK_POINTS = [
+  { check: "header-button-click", id: "header-btn", x: 955, y: 18 },
+  { check: "window-owned-toggle-click", id: "window-toggle", x: 40, y: 18 },
+  { check: "window-owned-focusable-click", id: "focusable", x: 320, y: 18 },
+  { check: "window-owned-negative-tabindex-button-click", id: "negative-button", x: 400, y: 18 },
+  { check: "sidebar-tab-click", id: "sidebar-btn", x: 205, y: 18 },
+  { check: "rail-tab-click", id: "rail-btn", x: 205, y: 50 },
+  { check: "portal-button-click", id: "portal-btn", x: 490, y: 18 },
+  { check: "floating-panel-button-click", id: "floating-btn", x: 785, y: 18 },
+];
+
+/** Static overlays and a sibling window control mirror the app shell ownership. */
+function buildFixtureHtml(appStyles) {
+  const dragOverlay =
+    'style="position:absolute;top:0;left:0;display:block;width:100%;height:100%;-webkit-app-region:drag"';
+  const button = (id, style) =>
+    `<button id="${id}" style="${style}" onclick="count('${id}')">${id}</button>`;
+  return `<!doctype html><html><head><meta charset="utf-8"><style>${appStyles}</style>
+<style>html,body{margin:0;width:100%;height:100%;background:#161616;color:#ddd;font:12px -apple-system,sans-serif;user-select:none}
+.pane{position:absolute}</style></head><body>
+<div class="pane" id="sidebar" style="left:0;top:0;width:250px;height:600px;background:#1d1d1d">
+  <div class="pane" style="left:0;top:0;width:250px;height:36px">
+    <div ${dragOverlay}></div>
+    ${button("sidebar-btn", "position:absolute;right:8px;top:6px;width:60px;height:24px")}
+  </div>
+  <div class="pane"
+       style="left:0;top:36px;width:250px;height:28px;-webkit-app-region:drag">
+    ${button("rail-btn", "position:absolute;right:8px;top:2px;width:60px;height:24px")}
+  </div>
+</div>
+<div class="pane" id="header" style="left:250px;top:0;width:750px;height:36px">
+  <div ${dragOverlay}></div>
+  ${button("header-btn", "position:absolute;right:8px;top:6px;width:60px;height:24px")}
+</div>
+<div class="pane" style="left:250px;top:36px;width:750px;height:28px">
+  <div ${dragOverlay}></div>
+</div>
+<!-- The sidebar toggle belongs to the window, outside every drag surface subtree. -->
+${button("window-toggle", "position:absolute;left:10px;top:6px;width:60px;height:24px;z-index:2")}
+<div id="focusable" tabindex="0" onclick="count('focusable')"
+     style="position:absolute;left:290px;top:6px;width:60px;height:24px;z-index:2">Focusable</div>
+<div id="negative-button" role="button" tabindex="-1" onclick="count('negative-button')"
+     style="position:absolute;left:370px;top:6px;width:60px;height:24px;z-index:2">Button</div>
+<div class="pane" id="chat-root" style="left:250px;top:64px;width:750px;height:536px;overflow:clip">
+  <div id="scroller" tabindex="-1" data-window-content
+       style="width:100%;height:100%;overflow-y:auto;overflow-x:clip;outline:none">
+    <div id="chat-inner" style="height:2000px;position:relative">
+      <a id="chat-link" href="#" onclick="event.preventDefault();count('chat-link')" style="position:absolute;left:250px;top:160px;width:180px;height:24px">Chat link</a>
+      ${button("chat-code", "position:absolute;left:250px;top:320px;width:180px;height:24px")}
+      <div id="chat-file" role="link" tabindex="0" onclick="count('chat-file')" style="position:absolute;left:250px;top:480px;width:180px;height:24px">file.ts</div>
+    </div>
+  </div>
+</div>
+<div id="overlay-root" style="position:fixed;inset:0;pointer-events:none;z-index:9999">
+  ${button("portal-btn", "position:fixed;left:460px;top:6px;width:60px;height:24px;pointer-events:auto")}
+</div>
+<div style="position:fixed;inset:0;pointer-events:none;z-index:9999">
+  ${button("floating-btn", "position:fixed;left:755px;top:6px;width:60px;height:24px;pointer-events:auto")}
+</div>
+<script>
+  window.__clicks = {};
+  window.count = (id) => { window.__clicks[id] = (window.__clicks[id] || 0) + 1; };
+  window.__fixture = {
+    setScroll(value) { document.getElementById("scroller").scrollTop = value; return this.snapshot(); },
+    placeControl(id, y) {
+      const control = document.getElementById(id);
+      const rect = control.getBoundingClientRect();
+      document.getElementById("scroller").scrollTop += rect.top + rect.height / 2 - y;
+      const placed = control.getBoundingClientRect();
+      return { x: placed.left + placed.width / 2, y: placed.top + placed.height / 2 };
+    },
+    snapshot() {
+      const inner = document.getElementById("chat-inner").getBoundingClientRect();
+      const clicks = { ...window.__clicks };
+      window.__clicks = {};
+      return { innerTop: inner.top, innerBottom: inner.bottom, clicks };
+    },
+  };
+</script></body></html>`;
+}
+
+function readRealAppStyles() {
+  const html = fs.readFileSync(INDEX_HTML, "utf8");
+  const styles = [...html.matchAll(/<style[^>]*>([\s\S]*?)<\/style>/g)].map((m) => m[1]).join("\n");
+  if (!styles.trim()) throw new Error(`no <style> blocks found in ${INDEX_HTML}`);
+  return styles;
+}
+
+async function compileMouseHelper(outDir) {
+  const binary = path.join(outDir, "titlebar-drag-mouse");
+  await execFileAsync("clang", [
+    "-O2",
+    "-o",
+    binary,
+    MOUSE_SOURCE,
+    "-framework",
+    "ApplicationServices",
+  ]);
+  return binary;
+}
+
+function samePosition(before, after) {
+  return before.x === after.x && before.y === after.y;
+}
+
+async function runTitlebarDragGroup(outDir) {
+  const results = [];
+  const record = (check, pass, detail) => {
+    results.push({ group: "titlebar-drag", check, pass, ...detail });
+    process.stdout.write(`${pass ? "PASS" : "FAIL"} titlebar-drag/${check}\n`);
+  };
+  let win = null;
+  let hardError = null;
+  try {
+    if (process.platform !== "darwin") {
+      throw new Error("titlebar-drag: macOS only — native window drag needs CGEventPost");
+    }
+    const mouse = await compileMouseHelper(outDir);
+    const fixturePath = path.join(outDir, "titlebar-drag-fixture.html");
+    await fsp.writeFile(fixturePath, buildFixtureHtml(readRealAppStyles()));
+
+    win = new BrowserWindow({
+      ...BASE,
+      width: 1000,
+      height: 600,
+      frame: false,
+      show: false,
+      backgroundColor: "#161616",
+    });
+    const evalPage = (code) => win.webContents.executeJavaScript(code);
+    const bounds = () => {
+      const current = win.getBounds();
+      return { x: current.x, y: current.y };
+    };
+    const resetPosition = async () => {
+      win.setPosition(BASE.x, BASE.y);
+      await new Promise((resolve) => setTimeout(resolve, 120));
+    };
+    const runMouse = async (args) => {
+      await execFileAsync(mouse, args.map(String));
+      await new Promise((resolve) => setTimeout(resolve, 220));
+    };
+    const mouseAt = (point) => ({ x: BASE.x + point.x, y: BASE.y + point.y });
+
+    await win.loadFile(fixturePath);
+    win.showInactive();
+    await new Promise((resolve) => setTimeout(resolve, 300));
+
+    for (const scrollTop of [0, 1000]) {
+      const snapshot = await evalPage(`window.__fixture.setScroll(${scrollTop})`);
+      const crossesHeader = snapshot.innerTop < 36 && snapshot.innerBottom > 0;
+      record(`scroll-${scrollTop}-content-crosses-header`, crossesHeader === (scrollTop === 1000), {
+        innerTop: snapshot.innerTop,
+        innerBottom: snapshot.innerBottom,
+      });
+      for (const point of DRAG_POINTS) {
+        await resetPosition();
+        const before = bounds();
+        const from = mouseAt(point);
+        await runMouse(["drag", from.x, from.y, from.x + DRAG_DELTA.x, from.y + DRAG_DELTA.y]);
+        const after = bounds();
+        const moved = after.x - before.x === DRAG_DELTA.x && after.y - before.y === DRAG_DELTA.y;
+        record(`scroll-${scrollTop}-${point.check}`, moved, { before, after });
+      }
+      const chatPoint = { x: 625, y: 300 };
+      await resetPosition();
+      const before = bounds();
+      const from = mouseAt(chatPoint);
+      await runMouse(["drag", from.x, from.y, from.x + DRAG_DELTA.x, from.y + DRAG_DELTA.y]);
+      const after = bounds();
+      record(`scroll-${scrollTop}-chat-area-does-not-drag`, samePosition(before, after), {
+        before,
+        after,
+      });
+    }
+
+    for (const point of CLICK_POINTS) {
+      await resetPosition();
+      const before = bounds();
+      const from = mouseAt(point);
+      await runMouse(["click", from.x, from.y]);
+      const { clicks } = await evalPage("window.__fixture.snapshot()");
+      const after = bounds();
+      const clicked = clicks[point.id] === 1;
+      const stillStationary = samePosition(before, after);
+      record(point.check, clicked && stillStationary, { clicks, before, after });
+      await runMouse(["drag", from.x, from.y, from.x + DRAG_DELTA.x, from.y + DRAG_DELTA.y]);
+      const afterDrag = bounds();
+      record(`${point.check}-does-not-drag`, samePosition(before, afterDrag), {
+        before,
+        after: afterDrag,
+      });
+    }
+
+    for (const id of ["chat-link", "chat-code", "chat-file"]) {
+      for (const y of [18, 50]) {
+        await resetPosition();
+        const point = await evalPage(`window.__fixture.placeControl(${JSON.stringify(id)}, ${y})`);
+        const before = bounds();
+        const from = mouseAt(point);
+        await runMouse(["drag", from.x, from.y, from.x + DRAG_DELTA.x, from.y + DRAG_DELTA.y]);
+        const after = bounds();
+        record(
+          `${id}-behind-header-${y}`,
+          after.x - before.x === DRAG_DELTA.x && after.y - before.y === DRAG_DELTA.y,
+          { before, after, point },
+        );
+      }
+      await resetPosition();
+      const point = await evalPage(`window.__fixture.placeControl(${JSON.stringify(id)}, 180)`);
+      const before = bounds();
+      const from = mouseAt(point);
+      await evalPage("window.__fixture.snapshot()");
+      await runMouse(["click", from.x, from.y]);
+      const { clicks } = await evalPage("window.__fixture.snapshot()");
+      const after = bounds();
+      record(`${id}-visible-click`, clicks[id] === 1 && samePosition(before, after), {
+        clicks,
+        before,
+        after,
+        point,
+      });
+      await runMouse(["drag", from.x, from.y, from.x + DRAG_DELTA.x, from.y + DRAG_DELTA.y]);
+      const afterDrag = bounds();
+      record(`${id}-visible-does-not-drag`, samePosition(before, afterDrag), {
+        before,
+        after: afterDrag,
+      });
+    }
+
+    const image = await win.webContents.capturePage();
+    await fsp.writeFile(path.join(outDir, "titlebar-drag.png"), image.toPNG());
+  } catch (error) {
+    hardError = error;
+    record("group-error", false, { reason: String(error?.message ?? error) });
+  } finally {
+    win?.destroy();
+  }
+
+  await fsp.writeFile(
+    path.join(outDir, "titlebar-drag-results.json"),
+    `${JSON.stringify({ generatedAt: new Date().toISOString(), results }, null, 2)}\n`,
+  );
+  const failed = results.filter((entry) => !entry.pass).map((entry) => entry.check);
+  if (hardError || failed.length > 0) {
+    throw new Error(`titlebar-drag group failed: ${failed.join(", ")}`, { cause: hardError });
+  }
+  return results;
+}
+
+module.exports = { runTitlebarDragGroup };
diff --git a/packages/desktop/e2e/browser-tabs.e2e.mjs b/packages/desktop/e2e/browser-tabs.e2e.mjs
index 734b286ed3..fb0958aad1 100644
--- a/packages/desktop/e2e/browser-tabs.e2e.mjs
+++ b/packages/desktop/e2e/browser-tabs.e2e.mjs
@@ -15,6 +15,8 @@ import { chromium } from "playwright";
 import { runAppearanceFontSizeRegression } from "./appearance-font-size.electron.mjs";
 import { runSettingsMemoryRegression } from "./settings-memory.electron.mjs";
 
+import { seedPluginLinks, runPluginLinksRegression } from "./plugin-links.electron.mjs";
+
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const desktopDir = path.resolve(scriptDir, "..");
 const rootDir = path.resolve(desktopDir, "../..");
@@ -120,7 +122,7 @@ function seedPaseoHome(paseoHome, listen, workspaceRoot) {
     daemon: {
       listen,
       relay: { enabled: false },
-      mcp: { enabled: true, injectIntoAgents: false },
+      mcp: { enabled: true, injectIntoAgents: true },
       browserTools: { enabled: true },
       cors: { allowedOrigins: ["*"] },
     },
@@ -198,7 +200,14 @@ async function startTargetPage() {
     response.writeHead(200, { "content-type": "text/html; charset=utf-8" });
     response.end(`<!doctype html>
       <html>
-        <head><title>Desktop browser target</title></head>
+        <head><title>Desktop browser target</title>
+          <style>body { min-height: 100vh; background: rgb(255, 0, 0); }</style>
+          <script>
+            window.frameCount = 0;
+            function tick() { window.frameCount++; requestAnimationFrame(tick); }
+            requestAnimationFrame(tick);
+          </script>
+        </head>
         <body>
           <button id="bridge-target" onclick="this.textContent = 'Clicked'">Bridge target</button>
           <label for="typing-target">Typing target</label>
@@ -233,20 +242,6 @@ async function callBrowserTool(client, name, args = {}) {
   return mcpPayload(await client.callTool({ name, args }), name);
 }
 
-async function callBrowserToolUntilReady(client, name, args = {}) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    const result = await client.callTool({ name, args });
-    const payload = result.structuredContent;
-    if (payload?.ok === true) return payload.result;
-    if (payload?.ok !== false || payload.error?.retryable !== true) {
-      return mcpPayload(result, name);
-    }
-    await delay(100);
-  }
-  throw new Error(`${name} remained unavailable for ${timeoutMs}ms`);
-}
-
 async function waitForGuestSelector(client, browserId) {
   const deadline = Date.now() + 5_000;
   while (Date.now() < deadline) {
@@ -262,7 +257,22 @@ async function waitForGuestSelector(client, browserId) {
   return false;
 }
 
-async function createCallerAgent(daemonPort) {
+async function waitForGuestActiveElement(client, browserId, elementId) {
+  const deadline = Date.now() + 5_000;
+  while (Date.now() < deadline) {
+    const evaluated = await callBrowserTool(client, "browser_evaluate", {
+      browserId,
+      function: "() => document.activeElement?.id ?? null",
+    });
+    if (JSON.parse(evaluated.resultJson) === elementId) {
+      return true;
+    }
+    await delay(50);
+  }
+  return false;
+}
+
+async function createCallerAgent(daemonPort, workspaceId = workspaceIds[0]) {
   const transport = new StreamableHTTPClientTransport(
     new URL(`http://127.0.0.1:${daemonPort}/mcp/agents`),
   );
@@ -272,12 +282,11 @@ async function createCallerAgent(daemonPort) {
       name: "create_agent",
       args: {
         relationship: { kind: "detached" },
-        workspace: { kind: "existing", workspaceId: workspaceIds[0] },
+        workspace: { kind: "existing", workspaceId },
         title: "Browser desktop browser E2E caller",
         provider: "mock/ten-second-stream",
         settings: { modeId: "load-test" },
         initialPrompt: "Remain available while the browser bridge regression runs.",
-        background: true,
       },
     });
     const result = response.structuredContent;
@@ -287,7 +296,7 @@ async function createCallerAgent(daemonPort) {
     );
     assert(typeof result.agentId === "string", "create_agent returned no caller agent id");
     assert(
-      result.workspaceId === workspaceIds[0],
+      result.workspaceId === workspaceId,
       `MCP caller attached to unexpected workspace ${result.workspaceId}`,
     );
     return result.agentId;
@@ -351,7 +360,8 @@ async function readPresentation(page, browserId) {
 async function readViewport(client, browserId) {
   const evaluated = await callBrowserTool(client, "browser_evaluate", {
     browserId,
-    function: "() => ({ width: window.innerWidth, height: window.innerHeight })",
+    function:
+      "() => ({ width: window.innerWidth, height: window.innerHeight, scale: window.devicePixelRatio })",
   });
   return JSON.parse(evaluated.resultJson);
 }
@@ -368,17 +378,12 @@ async function clickGuestElement(page, client, browserId, selector) {
   });
   const elementRect = JSON.parse(evaluated.resultJson);
   assert(elementRect, `Guest element ${selector} was unavailable`);
-  const webviewRect = await page.evaluate((id) => {
-    const webview = document.querySelector(`[data-paseo-browser-id="${id}"]`);
-    if (!(webview instanceof HTMLElement)) return null;
-    const rect = webview.getBoundingClientRect();
-    return { x: rect.x, y: rect.y };
-  }, browserId);
-  assert(webviewRect, `Browser webview ${browserId} was unavailable`);
-  await page.mouse.click(
-    webviewRect.x + elementRect.x + elementRect.width / 2,
-    webviewRect.y + elementRect.y + elementRect.height / 2,
-  );
+  await page.locator(`[data-paseo-browser-id="${browserId}"]`).click({
+    position: {
+      x: elementRect.x + elementRect.width / 2,
+      y: elementRect.y + elementRect.height / 2,
+    },
+  });
 }
 
 async function selectDeviceSize(page, label) {
@@ -449,7 +454,176 @@ function recordViewportMismatch(failures, label, actual, expected) {
   );
 }
 
-async function runRegression({ page, client, serverId, targetUrl, callerAgentId, artifactDir }) {
+async function setWindowHidden(inspectorPort, hidden) {
+  const [target] = await (await fetch(`http://127.0.0.1:${inspectorPort}/json/list`)).json();
+  const socket = new WebSocket(target.webSocketDebuggerUrl);
+  try {
+    await new Promise((resolve, reject) => {
+      socket.addEventListener("error", reject, { once: true });
+      socket.addEventListener("message", ({ data }) => {
+        const response = JSON.parse(data);
+        if (response.id !== 1) return;
+        if (response.error || response.result?.exceptionDetails) reject(new Error(data));
+        else resolve();
+      });
+      socket.addEventListener(
+        "open",
+        () =>
+          socket.send(
+            JSON.stringify({
+              id: 1,
+              method: "Runtime.evaluate",
+              params: {
+                expression: `(() => { const win = process.mainModule.require('electron').BrowserWindow.getAllWindows().find(win => win.webContents.getURL().includes('localhost:')); win.${hidden ? "hide" : "show"}(); if (win.isVisible() !== ${!hidden}) throw new Error('Window visibility did not change'); })()`,
+              },
+            }),
+          ),
+        { once: true },
+      );
+    });
+  } finally {
+    socket.close();
+  }
+}
+
+async function verifyHiddenBrowserScreenshots({
+  page,
+  client,
+  browserId,
+  artifactDir,
+  inspectorPort,
+}) {
+  const readFrames = async () => {
+    const result = await callBrowserTool(client, "browser_evaluate", {
+      browserId,
+      function: "() => window.frameCount",
+    });
+    return JSON.parse(result.resultJson);
+  };
+  const expectAnimation = async () => {
+    const start = await readFrames();
+    assert(typeof start === "number", "Animation fixture was not loaded");
+    const deadline = Date.now() + 5_000;
+    while (Date.now() < deadline) {
+      if ((await readFrames()) > start + 2) return;
+      await delay(50);
+    }
+    throw new Error("Browser did not animate in the restored window");
+  };
+  const measurements = [];
+  const expectIdle = async (label) => {
+    await delay(500); // Let Chromium consume the visibility change before sampling.
+    const start = await readFrames();
+    await delay(1_000); // A fixed sampling interval is the behavior under test.
+    const frames = (await readFrames()) - start;
+    measurements.push({ label, frames });
+    writeJson(path.join(artifactDir, "hidden-browser-frames.json"), measurements);
+    assert(frames === 0, `${label}: hidden browser produced ${frames} animation frames`);
+  };
+  try {
+    await expectAnimation();
+    await setWindowHidden(inspectorPort, true);
+    await expectIdle("before-capture");
+    await callBrowserTool(client, "browser_evaluate", {
+      browserId,
+      function: "() => { document.body.style.background = 'rgb(0,255,0)'; }",
+    });
+    const response = await client.callTool({ name: "browser_screenshot", args: { browserId } });
+    mcpPayload(response, "browser_screenshot");
+    const screenshot = response.content.find((item) => item.type === "image");
+    assert(screenshot, "browser_screenshot returned no image");
+    fs.writeFileSync(
+      path.join(artifactDir, "hidden-browser-viewport.png"),
+      Buffer.from(screenshot.data, "base64"),
+    );
+    const pixel = await page.evaluate(async (base64) => {
+      const image = new Image();
+      image.src = `data:image/png;base64,${base64}`;
+      await image.decode();
+      const canvas = document.createElement("canvas");
+      canvas.width = image.width;
+      canvas.height = image.height;
+      const context = canvas.getContext("2d");
+      context.drawImage(image, 0, 0);
+      return [
+        ...context.getImageData(Math.floor(image.width / 2), Math.floor(image.height / 2), 1, 1)
+          .data,
+      ];
+    }, screenshot.data);
+    assert(
+      JSON.stringify(pixel) === "[0,255,0,255]",
+      `Hidden screenshot returned stale pixels: ${pixel}`,
+    );
+    await expectIdle("after-capture");
+  } finally {
+    await setWindowHidden(inspectorPort, false);
+  }
+  await expectAnimation();
+}
+
+async function verifyBackgroundTypingStaysInGuest({ page, client, serverId, browserId, agent }) {
+  await page
+    .getByTestId(`workspace-deck-entry-${serverId}:${agent.workspaceId}`)
+    .getByTestId(`workspace-tab-agent_${agent.agentId}`)
+    .click({ timeout: timeoutMs });
+  const composer = page
+    .getByRole("textbox", { name: "Message agent..." })
+    .filter({ visible: true })
+    .first();
+  const draft = "draft the user is typing";
+  await composer.click();
+  await composer.pressSequentially(draft);
+  assert(
+    await composer.evaluate((element) => element === document.activeElement),
+    "Composer did not keep focus while the user typed",
+  );
+
+  const snapshot = await callBrowserTool(client, "browser_snapshot", { browserId });
+  const ref = snapshot.snapshot.match(/textbox "Typing target" \[ref=(@e\d+)\]/)?.[1];
+  assert(ref, `browser_snapshot did not expose the typing target: ${snapshot.snapshot}`);
+  await callBrowserTool(client, "browser_type", { browserId, ref, text: "agent text" });
+  await callBrowserTool(client, "browser_keypress", { browserId, ref, key: "!" });
+
+  // The user keeps typing in the composer while the agent types into the tab's focused field.
+  await composer.click();
+  await composer.press("End");
+  assert(
+    await composer.evaluate((element) => element === document.activeElement),
+    "Composer did not take focus back from the browser tab",
+  );
+  await callBrowserTool(client, "browser_type", { browserId, text: " more" });
+  await callBrowserTool(client, "browser_keypress", { browserId, key: "?" });
+
+  const guestValue = JSON.parse(
+    (
+      await callBrowserTool(client, "browser_evaluate", {
+        browserId,
+        function: "() => document.getElementById('typing-target').value",
+      })
+    ).resultJson,
+  );
+  const composerValue = await composer.inputValue();
+  assert(
+    composerValue === draft,
+    `browser_type and browser_keypress in a background tab changed the focused composer: ${JSON.stringify(composerValue)}`,
+  );
+  assert(
+    guestValue === "agent text! more?",
+    `browser_type and browser_keypress did not reach the browser tab: ${JSON.stringify(guestValue)}`,
+  );
+  await composer.fill("");
+}
+
+async function runRegression({
+  page,
+  client,
+  serverId,
+  targetUrl,
+  callerAgentId,
+  typingAgent,
+  artifactDir,
+  inspectorPort,
+}) {
   const failures = [];
   const originalWorkspaceId = workspaceIds[0];
   const originalWorkspaceRow = page.getByTestId(
@@ -477,7 +651,10 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
   await page.waitForFunction(
     (id) => {
       const webview = document.querySelector(`[data-paseo-browser-id="${id}"]`);
-      return webview && webview.parentElement?.id !== "paseo-browser-resident-webviews";
+      const surface = webview?.parentElement;
+      return (
+        surface?.getAttribute("aria-hidden") === "false" && surface.style.pointerEvents === "auto"
+      );
     },
     browserId,
     { timeout: timeoutMs },
@@ -492,12 +669,8 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
   );
 
   await clickGuestElement(page, client, browserId, "#typing-target");
-  const activeGuestElement = await callBrowserTool(client, "browser_evaluate", {
-    browserId,
-    function: "() => document.activeElement?.id ?? null",
-  });
   assert(
-    JSON.parse(activeGuestElement.resultJson) === "typing-target",
+    await waitForGuestActiveElement(client, browserId, "typing-target"),
     "Physical browser click did not focus the guest input",
   );
   const focusedGuest = await page.evaluate(
@@ -508,10 +681,11 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
 
   const deviceSizeMenuPainted = await selectDeviceSize(page, "iPhone SE · 375×667");
   assert(deviceSizeMenuPainted, "Device size menu did not paint above the browser surface");
+  const deviceViewport = await readViewport(client, browserId);
   recordViewportMismatch(
     failures,
     "device size menu paints and receives input above the browser surface",
-    await readViewport(client, browserId),
+    deviceViewport,
     { width: 375, height: 667 },
   );
 
@@ -520,6 +694,12 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
     text: "Bridge target",
     timeoutMs: 5_000,
   });
+  const resizedScreenshot = await callBrowserTool(client, "browser_screenshot", { browserId });
+  assert(
+    resizedScreenshot.width === Math.round(375 * deviceViewport.scale) &&
+      resizedScreenshot.height === Math.round(667 * deviceViewport.scale),
+    `Screenshot after resize returned ${resizedScreenshot.width}×${resizedScreenshot.height}`,
+  );
   const requestedViewport = { width: 640, height: 480 };
   await callBrowserTool(client, "browser_resize", { browserId, ...requestedViewport });
   recordViewportMismatch(
@@ -595,7 +775,7 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
     { timeout: timeoutMs },
   );
   try {
-    await callBrowserToolUntilReady(client, "browser_screenshot", { browserId });
+    await callBrowserTool(client, "browser_screenshot", { browserId });
   } catch (error) {
     failures.push(`inactive browser remains captureable: ${String(error)}`);
   }
@@ -708,6 +888,8 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
   const parkedGuest = await readGuest(page, browserId);
   assert(parkedGuest, "Browser guest was not parked after workspace eviction");
 
+  await verifyHiddenBrowserScreenshots({ page, client, browserId, artifactDir, inspectorPort });
+
   const listed = await callBrowserTool(client, "browser_list_tabs");
   assert(
     listed.tabs.some((tab) => tab.browserId === browserId),
@@ -728,6 +910,13 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
     text: "Clicked",
     timeoutMs: 5_000,
   });
+  await verifyBackgroundTypingStaysInGuest({
+    page,
+    client,
+    serverId,
+    browserId,
+    agent: typingAgent,
+  });
 
   await originalWorkspaceRow.click();
   await originalDeck.getByTestId(`workspace-tab-browser_${browserId}`).click();
@@ -875,6 +1064,7 @@ async function runRegression({ page, client, serverId, targetUrl, callerAgentId,
     guestFocus: "passed",
     overlayPlane: "passed",
     inactiveCapture: "passed",
+    hiddenWindowCapture: "passed",
     list: "passed",
     snapshot: "passed",
     click: "passed",
@@ -893,7 +1083,9 @@ async function main() {
   const workspaceRoot = path.join(runtimeDir, "workspaces");
   fs.mkdirSync(paseoHome, { recursive: true });
 
-  const [daemonPort, expoPort, cdpPort] = await Promise.all([
+  const [daemonPort, expoPort, cdpPort, inspectorPort, remotePort] = await Promise.all([
+    reservePort(),
+    reservePort(),
     reservePort(),
     reservePort(),
     reservePort(),
@@ -901,13 +1093,28 @@ async function main() {
   const listen = `127.0.0.1:${daemonPort}`;
   seedPaseoHome(paseoHome, listen, workspaceRoot);
   const target = await startTargetPage();
+  seedPluginLinks(paseoHome, workspaceIds[0], target.url, workspaceIds[1]);
+  const remoteHome = path.join(runtimeDir, "remote-home");
+  seedPaseoHome(remoteHome, `127.0.0.1:${remotePort}`, path.join(runtimeDir, "remote-workspaces"));
   const children = [];
   let browser = null;
   let client = null;
 
   try {
+    // Observe the real Electron shell handoff without launching a user's browser.
+    const openerDirectory = path.join(runtimeDir, "url-handler");
+    const externalOpenLog = path.join(artifactDir, "external-opens.txt");
+    fs.mkdirSync(openerDirectory, { recursive: true });
+    fs.writeFileSync(externalOpenLog, "");
+    fs.writeFileSync(
+      path.join(openerDirectory, "xdg-open"),
+      '#!/bin/sh\nprintf "%s\\n" "$1" >> "$PASEO_TEST_EXTERNAL_OPEN_LOG"\n',
+      { mode: 0o755 },
+    );
     const commonEnv = {
       ...process.env,
+      PATH: `${openerDirectory}${path.delimiter}${process.env.PATH}`,
+      PASEO_TEST_EXTERNAL_OPEN_LOG: externalOpenLog,
       PASEO_HOME: paseoHome,
       PASEO_LISTEN: listen,
       PASEO_DAEMON_ENDPOINT: `localhost:${daemonPort}`,
@@ -928,9 +1135,29 @@ async function main() {
     children.push(daemon.child);
     await waitForPort(daemonPort, "daemon", daemon);
 
+    const remoteDaemon = spawnLogged(
+      "remote-daemon",
+      process.execPath,
+      ["--import", "tsx", path.join(rootDir, "packages/server/scripts/dev-runner.ts")],
+      {
+        cwd: rootDir,
+        env: {
+          ...commonEnv,
+          PASEO_HOME: remoteHome,
+          PASEO_LISTEN: `127.0.0.1:${remotePort}`,
+          PASEO_SERVER_ID: "plugin-links-remote",
+          PASEO_NODE_ENV: "development",
+        },
+      },
+      artifactDir,
+    );
+    children.push(remoteDaemon.child);
+    await waitForPort(remotePort, "remote daemon", remoteDaemon);
+
     const desktopArgs = [
       process.execPath,
       devRunner,
+      `--inspect=127.0.0.1:${inspectorPort}`,
       ...(process.platform === "linux" ? ["--no-sandbox"] : []),
     ];
     const desktopCommand = process.platform === "linux" ? "xvfb-run" : desktopArgs.shift();
@@ -962,6 +1189,22 @@ async function main() {
     const page = await waitForAppPage(browser, expoPort);
     const status = await waitForDesktopStatus(page);
 
+    const checkPluginLinks = () =>
+      runPluginLinksRegression({
+        page,
+        remotePort,
+        workspaceId: workspaceIds[0],
+        remoteWorkspaceId: workspaceIds[1],
+        url: target.url,
+        artifactDir,
+        externalOpenLog: process.platform === "linux" ? externalOpenLog : null,
+      });
+    if (process.env.PASEO_DESKTOP_PLUGIN_LINKS_ONLY === "1") {
+      const pluginLinks = await checkPluginLinks();
+      writeJson(path.join(artifactDir, "result.json"), { pluginLinks });
+      console.log("Plugin external links and workspace browser passed.");
+      return;
+    }
     const settingsMemory = await runSettingsMemoryRegression(page);
     if (process.env.PASEO_DESKTOP_SETTINGS_MEMORY_ONLY === "1") {
       writeJson(path.join(artifactDir, "result.json"), { settingsMemory });
@@ -974,6 +1217,10 @@ async function main() {
     await runAppearanceFontSizeRegression(page);
 
     const callerAgentId = await createCallerAgent(daemonPort);
+    const typingAgent = {
+      workspaceId: workspaceIds.at(-1),
+      agentId: await createCallerAgent(daemonPort, workspaceIds.at(-1)),
+    };
     const transport = new StreamableHTTPClientTransport(
       new URL(
         `http://127.0.0.1:${daemonPort}/mcp/agents?callerAgentId=${encodeURIComponent(callerAgentId)}`,
@@ -985,10 +1232,13 @@ async function main() {
       client,
       serverId: status.serverId,
       targetUrl: target.url,
+      inspectorPort,
       callerAgentId,
+      typingAgent,
       artifactDir,
     });
-    writeJson(path.join(artifactDir, "result.json"), { ...report, settingsMemory });
+    const pluginLinks = await checkPluginLinks();
+    writeJson(path.join(artifactDir, "result.json"), { ...report, settingsMemory, pluginLinks });
     console.log(
       `Browser desktop browser E2E passed: WebContents ${report.originalWebContentsId} remained ${report.finalWebContentsId}; viewport, inactive capture, focus continuity, list, snapshot, click, local-page selectors passed.`,
     );
diff --git a/packages/desktop/e2e/daemon-lifecycle-renderer.electron.mjs b/packages/desktop/e2e/daemon-lifecycle-renderer.electron.mjs
new file mode 100644
index 0000000000..d32b7d65b8
--- /dev/null
+++ b/packages/desktop/e2e/daemon-lifecycle-renderer.electron.mjs
@@ -0,0 +1,170 @@
+import { openSync, closeSync } from "node:fs";
+import { warmMetro } from "../../app/e2e/support/metro-warmup.mjs";
+import { spawn, execFileSync } from "node:child_process";
+import { once } from "node:events";
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import net from "node:net";
+import { _electron as electron, expect } from "playwright/test";
+import { readDaemonInstance } from "@getpaseo/server/daemon-control";
+
+// Run under the test's private Xvfb display; native dialog input never targets
+// a user's desktop. All daemon operations still cross the real preload/IPC.
+export async function verifyAttachedDaemonControls({ repo, root, env, home, port, instance }) {
+  if (!process.env.DISPLAY)
+    throw new Error("Renderer lifecycle QA requires a private Xvfb display");
+  const listener = net.createServer();
+  await new Promise((resolve) => listener.listen(0, "127.0.0.1", resolve));
+  const metroPort = listener.address().port;
+  await new Promise((resolve) => listener.close(resolve));
+  const metroLog = openSync(path.join(root, "metro.log"), "w");
+  const metro = spawn(
+    process.execPath,
+    [
+      path.join(repo, "node_modules/expo/bin/cli"),
+      "start",
+      "--web",
+      "--port",
+      String(metroPort),
+      "--offline",
+    ],
+    {
+      cwd: path.join(repo, "packages/app"),
+      detached: true,
+      stdio: ["ignore", metroLog, metroLog],
+      env: {
+        ...env,
+        EXPO_NO_DOTENV: "1",
+        CI: "1",
+        PASEO_WEB_PLATFORM: "electron",
+        EXPO_PUBLIC_LOCAL_DAEMON: `127.0.0.1:${port}`,
+      },
+    },
+  );
+  closeSync(metroLog);
+  let desktop;
+  let page;
+  try {
+    await expect
+      .poll(
+        async () => {
+          try {
+            return (await fetch(`http://127.0.0.1:${metroPort}/status`)).ok;
+          } catch {
+            return false;
+          }
+        },
+        { timeout: 60_000 },
+      )
+      .toBe(true);
+    // /status means Metro is listening; the app bundle may still need a cold compile.
+    await warmMetro(metroPort);
+    desktop = await electron.launch({
+      args: [path.join(repo, "packages/desktop/dist/main.js"), "--no-sandbox"],
+      env: {
+        ...env,
+        EXPO_DEV_URL: `http://127.0.0.1:${metroPort}`,
+        PASEO_DISABLE_SINGLE_INSTANCE_LOCK: "1",
+        PASEO_ELECTRON_USER_DATA_DIR: path.join(root, "renderer-user-data"),
+      },
+    });
+    page = await desktop.firstWindow();
+    page.on("pageerror", (error) => console.log("Renderer error:", error.message));
+    await page.route(/:(6767|6768)\b/, (route) => route.abort());
+    await page.getByRole("button", { name: "Settings", exact: true }).click({ timeout: 90_000 });
+    await page.getByRole("button", { name: "Enable built-in daemon", exact: true }).click();
+    await expect(page.getByText("Attached to an existing daemon", { exact: true })).toBeVisible();
+    await expect(
+      page.getByText("Removes localhost from this device and stops the built-in daemon", {
+        exact: true,
+      }),
+    ).toBeHidden();
+    await page
+      .getByText("Attached to an existing daemon", { exact: true })
+      .scrollIntoViewIfNeeded();
+    await page.screenshot({ path: path.join(root, "attached-daemon.png") });
+
+    async function respondToNativeDialog(title, artifact, key) {
+      let windowId;
+      await expect
+        .poll(
+          () => {
+            try {
+              windowId = execFileSync("xdotool", ["search", "--onlyvisible", "--name", title], {
+                encoding: "utf8",
+              })
+                .trim()
+                .split("\n")
+                .at(-1);
+              return Boolean(windowId);
+            } catch {
+              return false;
+            }
+          },
+          { timeout: 10_000 },
+        )
+        .toBe(true);
+      const screenshot = await desktop.evaluate(async ({ desktopCapturer }) => {
+        const sources = await desktopCapturer.getSources({
+          types: ["screen"],
+          thumbnailSize: { width: 1280, height: 800 },
+        });
+        return sources[0].thumbnail.toPNG().toString("base64");
+      });
+      await writeFile(path.join(root, artifact), Buffer.from(screenshot, "base64"));
+      // Escape destroys the dialog on key-down. Send through the private display
+      // focus so key-up does not target an already-destroyed X11 window.
+      execFileSync("xdotool", ["windowfocus", "--sync", windowId, "key", key]);
+    }
+
+    const management = page.getByRole("switch", { name: "Manage built-in daemon" });
+    await management.click();
+    await respondToNativeDialog(
+      "Pause built-in daemon",
+      "pause-attached-confirmation.png",
+      "Return",
+    );
+    await expect(management).not.toBeChecked();
+    expect((await readDaemonInstance(home)).pid).toBe(instance.pid);
+
+    await page.getByRole("button", { name: "Stop daemon", exact: true }).click();
+    await respondToNativeDialog("Stop local daemon", "stop-attached-cancelled.png", "Escape");
+    await expect(page.getByRole("button", { name: "Stop daemon", exact: true })).toBeEnabled();
+    expect(await readDaemonInstance(home)).toMatchObject({
+      pid: instance.pid,
+      startedAt: instance.startedAt,
+    });
+
+    await page.getByRole("button", { name: "Stop daemon", exact: true }).click();
+    await respondToNativeDialog("Stop local daemon", "stop-attached-confirmation.png", "Return");
+    await expect.poll(() => readDaemonInstance(home), { timeout: 20_000 }).toBeNull();
+    await expect(page.getByRole("button", { name: "Stop daemon", exact: true })).toBeHidden();
+    await page.screenshot({ path: path.join(root, "attached-daemon-stopped.png") });
+    console.log(
+      "PASS: real Desktop renderer pauses management without stopping an attached daemon, then confirms and stops that instance.",
+    );
+  } catch (error) {
+    if (page) {
+      console.log(
+        "Renderer state:",
+        await page
+          .locator("body")
+          .innerText()
+          .catch(() => "closed"),
+      );
+      await page.screenshot({ path: path.join(root, "renderer-failure.png") }).catch(() => {});
+    }
+    throw error;
+  } finally {
+    if (desktop) {
+      const exited = once(desktop.process(), "exit");
+      await desktop.evaluate(({ app }) => app.exit(0)).catch(() => {});
+      await exited;
+    }
+    if (metro.exitCode === null) {
+      const exited = once(metro, "exit");
+      process.kill(-metro.pid, "SIGTERM");
+      await exited;
+    }
+  }
+}
diff --git a/packages/desktop/e2e/daemon-lifecycle.e2e.mjs b/packages/desktop/e2e/daemon-lifecycle.e2e.mjs
new file mode 100644
index 0000000000..870e0f7db5
--- /dev/null
+++ b/packages/desktop/e2e/daemon-lifecycle.e2e.mjs
@@ -0,0 +1,213 @@
+import { verifyAttachedDaemonControls } from "./daemon-lifecycle-renderer.electron.mjs";
+import { once } from "node:events";
+import assert from "node:assert/strict";
+import { mkdtemp, mkdir, writeFile, readFile, rm, readdir, copyFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import net from "node:net";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { _electron as electron, expect } from "playwright/test";
+import { savePersistedConfig } from "@getpaseo/server/configuration";
+import {
+  startDaemonInstance,
+  stopDaemonInstance,
+  readDaemonInstance,
+} from "@getpaseo/server/daemon-control";
+
+const repo = fileURLToPath(new URL("../../..", import.meta.url));
+const root = await mkdtemp(path.join(tmpdir(), "paseo desktop lifecycle "));
+const home = path.join(root, "daemon");
+const env = Object.fromEntries(
+  Object.entries(process.env).filter(
+    ([key]) => !key.startsWith("PASEO_") && key !== "ELECTRON_RUN_AS_NODE",
+  ),
+);
+env.HOME = root;
+env.USERPROFILE = root;
+env.PASEO_HOME = home;
+const server = net.createServer();
+await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+const port = server.address().port;
+await new Promise((resolve) => server.close(resolve));
+assert.ok(port !== 6767 && port !== 6768);
+await mkdir(path.join(root, "web"));
+await writeFile(path.join(root, "web/index.html"), "<html><body>Lifecycle web UI</body></html>");
+savePersistedConfig(home, {
+  daemon: { listen: `127.0.0.1:${port}`, relay: { enabled: false } },
+  features: {
+    dictation: { enabled: false },
+    voiceMode: { enabled: false },
+    webUi: { enabled: true, distDir: path.join(root, "web") },
+  },
+});
+const main = path.join(root, "main.cjs");
+const managerPath = path.join(repo, "packages/desktop/dist/daemon/daemon-manager.js");
+await writeFile(
+  main,
+  `const { app } = require("electron"); app.setPath("userData", ${JSON.stringify(path.join(root, "user-data"))}); app.whenReady().then(() => { global.lifecycle = require(${JSON.stringify(managerPath)}); });`,
+);
+let desktop;
+let captured;
+async function openDesktop() {
+  desktop = await electron.launch({
+    args: ["--no-sandbox", "--ozone-platform=headless", main],
+    env: {
+      ...env,
+      PASEO_LISTEN: "127.0.0.1:1",
+      PASEO_WEB_UI_ENABLED: "false",
+      PASEO_HOST: "unused:1",
+    },
+  });
+  await expect
+    .poll(() => desktop.evaluate(() => Boolean(global.lifecycle)), { timeout: 10_000 })
+    .toBe(true);
+}
+async function closeDesktop() {
+  if (!desktop) return;
+  const child = desktop.process();
+  const exited = once(child, "exit");
+  await desktop.evaluate(({ app }) => app.exit(0)).catch(() => {});
+  await exited;
+  desktop = null;
+}
+async function command(name, args) {
+  console.log(`Desktop command: ${name}${args?.reason ? ` (${args.reason})` : ""}`);
+  return desktop.evaluate(
+    async (_, input) => global.lifecycle.createDaemonCommandHandlers()[input.name](input.args),
+    { name, args },
+  );
+}
+try {
+  // Simulate a legacy independent launch that carries the old Desktop flag.
+  const launch = await startDaemonInstance({
+    home,
+    command: process.execPath,
+    args: [path.join(repo, "packages/server/dist/scripts/supervisor-entrypoint.js")],
+    env,
+    mode: "deployment",
+    desktopManaged: true,
+    timeoutMs: 30_000,
+  });
+  captured = launch.instance;
+  await openDesktop();
+  const attached = await command("start_desktop_daemon");
+  assert.equal(attached.pid, captured.pid);
+  assert.equal(attached.desktopManaged, true);
+  assert.equal(attached.ownedByDesktop, false);
+  for (const reason of ["quit", "settings", "app_update", "host_remove", "version_mismatch"]) {
+    const status = await command("stop_desktop_daemon", { reason });
+    assert.equal(status.pid, captured.pid, `${reason} stopped an attached daemon`);
+    process.kill(captured.pid, 0);
+  }
+  const restarted = await command("restart_desktop_daemon");
+  assert.equal(restarted.pid, captured.pid);
+  await assert.rejects(
+    command("stop_desktop_daemon", {
+      reason: "manual_ipc",
+      pid: captured.pid,
+      startedAt: "outdated-confirmation",
+    }),
+    /changed since confirmation/,
+  );
+  const stopped = await command("stop_desktop_daemon", {
+    reason: "manual_ipc",
+    pid: captured.pid,
+    startedAt: captured.startedAt,
+  });
+  assert.equal(stopped.status, "stopped");
+  captured = null;
+
+  const owned = await command("start_desktop_daemon");
+  captured = await readDaemonInstance(home);
+  assert.equal(owned.pid, captured.pid);
+  assert.equal(owned.ownedByDesktop, true);
+  assert.equal(owned.listen, `127.0.0.1:${port}`);
+  assert.equal(
+    JSON.parse(await readFile(path.join(home, "config.json"), "utf8")).features.webUi.enabled,
+    true,
+  );
+  const liveWebUi = await fetch(`http://127.0.0.1:${port}/`);
+  assert.equal(liveWebUi.status, 200);
+  assert.match(await liveWebUi.text(), /Lifecycle web UI/);
+  await command("patch_desktop_settings", { daemon: { keepRunningAfterQuit: true } });
+  await closeDesktop();
+  desktop = null;
+  process.kill(captured.pid, 0);
+  await openDesktop();
+  assert.equal((await command("start_desktop_daemon")).ownedByDesktop, false);
+  await command("stop_desktop_daemon", { reason: "quit" });
+  process.kill(captured.pid, 0);
+  await command("stop_desktop_daemon", {
+    reason: "manual_ipc",
+    pid: captured.pid,
+    startedAt: captured.startedAt,
+  });
+  captured = null;
+  const next = await command("start_desktop_daemon");
+  captured = await readDaemonInstance(home);
+  assert.equal(next.ownedByDesktop, true);
+  await command("stop_desktop_daemon", { reason: "quit" });
+  assert.equal(await readDaemonInstance(home), null);
+  captured = null;
+  await closeDesktop();
+  if (process.platform === "linux") {
+    const rendererLaunch = await startDaemonInstance({
+      home,
+      command: process.execPath,
+      args: [path.join(repo, "packages/server/dist/scripts/supervisor-entrypoint.js")],
+      env,
+      mode: "deployment",
+      desktopManaged: true,
+      timeoutMs: 30_000,
+    });
+    captured = rendererLaunch.instance;
+    await verifyAttachedDaemonControls({ repo, root, env, home, port, instance: captured });
+    captured = null;
+  }
+  if (process.platform !== "win32") {
+    const preload = path.join(root, "slow-worker.mjs");
+    await writeFile(
+      preload,
+      'if (process.argv[1]?.endsWith("daemon-worker.js")) await new Promise(resolve => setTimeout(resolve, 45000));',
+    );
+    await openDesktop();
+    // Playwright removes NODE_OPTIONS from electron.launch's environment.
+    // Restore this runtime input inside the isolated fixture before it launches the daemon.
+    await desktop.evaluate(
+      (_, value) => {
+        process.env.NODE_OPTIONS = value;
+      },
+      `--import=${pathToFileURL(preload).href}`,
+    );
+    const began = Date.now();
+    const starting = await command("start_desktop_daemon");
+    captured = await readDaemonInstance(home);
+    assert.equal(starting.status, "starting");
+    assert.equal(starting.ownedByDesktop, true);
+    assert.equal(starting.pid, captured.pid);
+    assert.ok(Date.now() - began < 40_000, "Desktop did not return its bounded starting state");
+    process.kill(captured.pid, 0);
+    await command("stop_desktop_daemon", { reason: "quit" });
+    captured = null;
+    await closeDesktop();
+    console.log(
+      "PASS: Desktop readiness deadline returns starting and preserves its owned slow launch.",
+    );
+  }
+  console.log(
+    "PASS: attached legacy daemon survives automatic actions; explicit captured stop, owned launch, managed settings, worker restart, and next-session attachment.",
+  );
+} finally {
+  await closeDesktop();
+  if (captured)
+    await stopDaemonInstance(home, { instance: captured, force: true, timeoutMs: 2_000 });
+  const artifacts =
+    process.env.PASEO_DESKTOP_LIFECYCLE_ARTIFACT_DIR ??
+    (await mkdtemp(path.join(tmpdir(), "paseo-desktop-lifecycle-artifacts-")));
+  await mkdir(artifacts, { recursive: true });
+  for (const name of await readdir(root))
+    if (name.endsWith(".png") || name === "metro.log")
+      await copyFile(path.join(root, name), path.join(artifacts, name));
+  await rm(root, { recursive: true, force: true });
+  console.log(`Lifecycle artifacts: ${artifacts}`);
+}
diff --git a/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts b/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
index 7685140229..1d0b829f67 100644
--- a/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
+++ b/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
@@ -14,10 +14,13 @@ const SHORTCUTS_ROW = "show-shortcuts";
  * daemon is left unmanaged so the app talks to the E2E daemon instead of trying
  * to start one of its own.
  */
-async function installDesktopBridge(page: Page): Promise<void> {
-  await page.addInitScript(() => {
+async function installDesktopBridge(
+  page: Page,
+  platform: "darwin" | "win32" = "darwin",
+): Promise<void> {
+  await page.addInitScript((desktopPlatform) => {
     window.paseoDesktop = {
-      platform: "darwin",
+      platform: desktopPlatform,
       events: { on: () => () => {} },
       invoke: async (command: string) => {
         if (command === "get_desktop_settings") {
@@ -29,11 +32,11 @@ async function installDesktopBridge(page: Page): Promise<void> {
         return null;
       },
     };
-  });
+  }, platform);
 }
 
-async function openShortcutsSettings(page: Page) {
-  await installDesktopBridge(page);
+async function openShortcutsSettings(page: Page, platform: "darwin" | "win32" = "darwin") {
+  await installDesktopBridge(page, platform);
   await gotoAppShell(page);
   await openSettings(page);
   await openSettingsSection(page, "shortcuts");
@@ -67,6 +70,38 @@ async function closeRowMenu(page: Page) {
   await expect(page.getByTestId(`shortcut-bind-${SHORTCUTS_ROW}`)).toHaveCount(0);
 }
 
+async function clearShortcut(page: Page, label: string, action: string) {
+  await page.getByRole("button", { name: `Actions for ${label}` }).click();
+  await page.getByTestId(`shortcut-clear-${action}`).click();
+}
+
+async function captureShortcut(page: Page, label: string, action: string, keys: string) {
+  await page.getByRole("button", { name: `Actions for ${label}` }).click();
+  await page.getByTestId(`shortcut-bind-${action}`).click();
+  await page.keyboard.press(keys);
+}
+
+async function expectInterruptShortcut(page: Page, chord: string) {
+  const row = page.getByText("Interrupt agent", { exact: true }).locator("..");
+  await expect(row.getByText(chord, { exact: true })).toBeVisible();
+}
+
+async function finishInterruptCapture(page: Page, action: "Done" | "Cancel") {
+  const row = page.getByText("Interrupt agent", { exact: true }).locator("..");
+  await row.getByRole("button", { name: action }).click();
+}
+
+async function eraseLastCapturedCombo(page: Page, firstCombo: string, secondCombo: string) {
+  await captureShortcut(page, "Interrupt agent", "agent-interrupt", "Alt+K");
+  await page.keyboard.press("Alt+J");
+  await expectInterruptShortcut(page, firstCombo);
+  await expectInterruptShortcut(page, secondCombo);
+  await page.keyboard.press("Backspace");
+  await expectInterruptShortcut(page, firstCombo);
+  const row = page.getByText("Interrupt agent", { exact: true }).locator("..");
+  await expect(row.getByText(secondCombo, { exact: true })).toHaveCount(0);
+}
+
 test("unassigning a shortcut leaves it inert until it is reset", async ({ page }) => {
   await openShortcutsSettings(page);
 
@@ -110,6 +145,29 @@ test("unassigning a shortcut leaves it inert until it is reset", async ({ page }
   await page.keyboard.press("Shift+?");
   await expect(dialog).not.toBeVisible({ timeout: 5_000 });
 
+  await test.step("show the cleared shortcut in help, then bind new keys", async () => {
+    const help = await openCheatSheet(page);
+    const row = help.getByTestId(`shortcut-help-row-${SHORTCUTS_ROW}`);
+    await expect(row.getByText("Not set", { exact: true })).toBeVisible();
+    await expect(help.getByText("?", { exact: true })).toHaveCount(0);
+    await page.keyboard.press("Escape");
+    await openSettings(page);
+    await openSettingsSection(page, "shortcuts");
+
+    await openRowMenu(page);
+    await bind.click();
+    await page.keyboard.press("Alt+Shift+K");
+    await page.getByText("Done", { exact: true }).click();
+    await expect(page.getByText("⌥⇧K", { exact: true })).toBeVisible();
+    const reboundHelp = await openCheatSheet(page);
+    const reboundRow = reboundHelp.getByTestId(`shortcut-help-row-${SHORTCUTS_ROW}`);
+    await expect(reboundRow.getByText("⌥⇧K", { exact: true })).toBeVisible();
+    await expect(reboundRow.getByText("?", { exact: true })).toHaveCount(0);
+    await page.keyboard.press("Escape");
+    await openSettings(page);
+    await openSettingsSection(page, "shortcuts");
+  });
+
   await openRowMenu(page);
   await page.getByTestId(`shortcut-reset-${SHORTCUTS_ROW}`).click();
   await expect(notSet).toHaveCount(0);
@@ -124,45 +182,34 @@ test("unassigning a shortcut leaves it inert until it is reset", async ({ page }
   await expect(dialog).not.toBeVisible({ timeout: 10_000 });
 });
 
-test("an unassigned shortcut lists no keys in the shortcuts cheat sheet", async ({ page }) => {
-  await openShortcutsSettings(page);
+for (const { platform, keys, label, firstCombo, secondCombo } of [
+  {
+    platform: "darwin",
+    keys: "Meta+Shift+Backspace",
+    label: "⇧⌘⌫",
+    firstCombo: "⌥K",
+    secondCombo: "⌥J",
+  },
+  {
+    platform: "win32",
+    keys: "Control+Shift+Backspace",
+    label: "Ctrl+Shift+⌫",
+    firstCombo: "Alt+K",
+    secondCombo: "Alt+J",
+  },
+] as const) {
+  test(`binds modified Backspace and erases a combo with bare Backspace on ${platform}`, async ({
+    page,
+  }) => {
+    await openShortcutsSettings(page, platform);
+    await clearShortcut(page, "Archive workspace", "archive-workspace");
+    await captureShortcut(page, "Interrupt agent", "agent-interrupt", keys);
+    await expectInterruptShortcut(page, label);
+    await finishInterruptCapture(page, "Done");
+    await expectInterruptShortcut(page, label);
 
-  await openRowMenu(page);
-  await page.getByTestId(`shortcut-clear-${SHORTCUTS_ROW}`).click();
-  await expect(page.getByText("Not set", { exact: true })).toBeVisible();
-
-  const dialog = await openCheatSheet(page);
-
-  // Addressed by testID rather than by filtering on its own text: an anchored
-  // `hasText` matches only the innermost node holding exactly that label, so a
-  // row-scoped assertion about anything *else* in the row finds nothing.
-  const row = dialog.getByTestId(`shortcut-help-row-${SHORTCUTS_ROW}`);
-  await expect(row).toBeVisible();
-  // No badge pill, blank or otherwise, for a shortcut with no keys.
-  await expect(dialog.getByText("?", { exact: true })).toHaveCount(0);
-  // It says so, rather than leaving a silent gap where the keys were. Same words
-  // the settings row uses for the same state.
-  await expect(row.getByText("Not set", { exact: true })).toBeVisible();
-});
-
-test("a rebound shortcut lists its new keys in the shortcuts cheat sheet", async ({ page }) => {
-  await openShortcutsSettings(page);
-
-  const defaultKeys = page.getByText("?", { exact: true });
-  await expect(defaultKeys).toBeVisible();
-
-  await page.getByTestId(`shortcut-actions-${SHORTCUTS_ROW}`).click();
-  await page.getByTestId(`shortcut-bind-${SHORTCUTS_ROW}`).click();
-  await page.keyboard.press("Alt+Shift+K");
-  await page.getByText("Done", { exact: true }).click();
-
-  const reboundKeys = page.getByText("⌥⇧K", { exact: true });
-  await expect(reboundKeys).toBeVisible();
-  await expect(defaultKeys).toHaveCount(0);
-
-  const dialog = await openCheatSheet(page);
-  const row = dialog.getByTestId(`shortcut-help-row-${SHORTCUTS_ROW}`);
-  await expect(row.getByText("⌥⇧K", { exact: true })).toBeVisible();
-  // The whole point: the cheat sheet stops advertising the shipped default.
-  await expect(row.getByText("?", { exact: true })).toHaveCount(0);
-});
+    await eraseLastCapturedCombo(page, firstCombo, secondCombo);
+    await finishInterruptCapture(page, "Cancel");
+    await expectInterruptShortcut(page, label);
+  });
+}
diff --git a/packages/desktop/e2e/linux-artifact-smoke.js b/packages/desktop/e2e/linux-artifact-smoke.js
new file mode 100644
index 0000000000..5a81bf07de
--- /dev/null
+++ b/packages/desktop/e2e/linux-artifact-smoke.js
@@ -0,0 +1,61 @@
+// Observe published Linux artifacts without repairing their sandbox permissions.
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const { execFileSync } = require("node:child_process");
+const { smokePackagedDesktopApp } = require("./packaged-app-smoke.js");
+
+async function main() {
+  if (process.getuid() === 0) throw new Error("Launch the smoke as an unprivileged user");
+  const release = path.resolve(process.argv[2]);
+  const portableSandbox = process.argv[3] === "enabled";
+  const artifactRoot = process.env.PASEO_DESKTOP_SMOKE_ARTIFACT_DIR;
+  const installedOnly = process.argv.includes("--installed-only");
+  const extracted = fs.mkdtempSync(path.join(os.tmpdir(), "paseo-linux-artifacts-"));
+  const findArtifact = (suffix) => {
+    const matches = fs.readdirSync(release).filter((file) => file.endsWith(suffix));
+    if (matches.length !== 1) throw new Error(`Expected one ${suffix} in ${release}: ${matches}`);
+    return path.join(release, matches[0]);
+  };
+  try {
+    process.env.PASEO_DESKTOP_SMOKE_ARTIFACT_DIR = path.join(artifactRoot, "installed");
+    const helper = fs.statSync("/opt/Paseo/chrome-sandbox");
+    if (helper.uid !== 0 || (helper.mode & 0o7777) !== 0o4755) {
+      throw new Error("Installed native package did not provide a root-owned 4755 helper");
+    }
+    await smokePackagedDesktopApp({ appPath: "/opt/Paseo", expectedSandbox: true });
+    if (installedOnly) return;
+
+    const appImage = findArtifact(".AppImage");
+    fs.chmodSync(appImage, 0o755);
+    execFileSync(appImage, ["--appimage-extract"], { cwd: extracted, stdio: "ignore" });
+    const appDir = path.join(extracted, "squashfs-root");
+    const desktopEntry = fs.readFileSync(path.join(appDir, "Paseo.desktop"), "utf8");
+    if (/^Exec=.*--no-sandbox/m.test(desktopEntry)) {
+      throw new Error("AppImage desktop entry bypasses runtime sandbox policy");
+    }
+    process.env.PASEO_DESKTOP_SMOKE_ARTIFACT_DIR = path.join(artifactRoot, "appimage");
+    await smokePackagedDesktopApp({
+      appPath: appDir,
+      executablePath: appImage,
+      launchArgs: ["--appimage-extract-and-run"],
+      expectedSandbox: portableSandbox,
+    });
+
+    const tarDir = path.join(extracted, "tar");
+    fs.mkdirSync(tarDir);
+    execFileSync("tar", ["-xzf", findArtifact(".tar.gz"), "-C", tarDir]);
+    const appPath = fs.existsSync(path.join(tarDir, "Paseo"))
+      ? tarDir
+      : path.join(tarDir, fs.readdirSync(tarDir)[0]);
+    process.env.PASEO_DESKTOP_SMOKE_ARTIFACT_DIR = path.join(artifactRoot, "tar");
+    await smokePackagedDesktopApp({ appPath, expectedSandbox: portableSandbox });
+  } finally {
+    fs.rmSync(extracted, { recursive: true, force: true });
+  }
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/packages/desktop/e2e/packaged-app-smoke.js b/packages/desktop/e2e/packaged-app-smoke.js
index 0c5e2b798b..f1310e287f 100644
--- a/packages/desktop/e2e/packaged-app-smoke.js
+++ b/packages/desktop/e2e/packaged-app-smoke.js
@@ -5,6 +5,9 @@ const os = require("node:os");
 const path = require("node:path");
 const { setTimeout: delay } = require("node:timers/promises");
 const { chromium } = require("playwright");
+const { extractFile } = require("@electron/asar");
+const { WebSocket } = require("ws");
+const assert = require("node:assert/strict");
 
 const EXECUTABLE_NAME = "Paseo";
 const SMOKE_TIMEOUT_MS = 60_000;
@@ -30,6 +33,29 @@ function createTempDir(prefix) {
   return fs.mkdtempSync(path.join(os.tmpdir(), prefix));
 }
 
+async function assertBuiltinPluginsStarted(listen) {
+  const { DaemonClient } = await import("@getpaseo/client/internal/daemon-client");
+  const { builtinPlugins } =
+    await import("../../server/dist/server/server/plugins/builtin/index.js");
+  const client = new DaemonClient({
+    url: `ws://${listen}/ws`,
+    clientId: "packaged-builtin-smoke",
+    webSocketFactory: (url, options) =>
+      new WebSocket(url, options?.protocols, { headers: options?.headers }),
+  });
+  try {
+    await client.connect();
+    const catalog = await client.getPluginCatalog();
+    assert.deepEqual(
+      catalog.map(({ id }) => id).sort(),
+      [...builtinPlugins].sort(),
+      "Every built-in plugin must start in the packaged desktop daemon",
+    );
+  } finally {
+    await client.close();
+  }
+}
+
 function assertExecutable(filePath, label) {
   if (!fs.existsSync(filePath)) {
     throw new Error(`${label} does not exist: ${filePath}`);
@@ -67,52 +93,17 @@ function getMacMainExecutablePath(appPath) {
   return path.join(appPath, "Contents", "MacOS", EXECUTABLE_NAME);
 }
 
-function ensureLinuxSandboxPermissions(appPath) {
-  if (process.platform !== "linux") {
-    return;
-  }
-
-  const sandboxPath = path.join(appPath, "chrome-sandbox");
-  if (!fs.existsSync(sandboxPath)) {
-    throw new Error(`Chromium sandbox helper does not exist: ${sandboxPath}`);
-  }
-
-  const hasRequiredPermissions = () => {
-    const stat = fs.statSync(sandboxPath);
-    return stat.uid === 0 && (stat.mode & 0o7777) === 0o4755;
-  };
-  if (hasRequiredPermissions()) {
-    return;
-  }
-
-  const chown = spawnSync("sudo", ["-n", "chown", "root:root", sandboxPath], {
-    encoding: "utf8",
-  });
-  const chmod =
-    chown.status === 0
-      ? spawnSync("sudo", ["-n", "chmod", "4755", sandboxPath], { encoding: "utf8" })
-      : null;
-  if (chown.error || chown.status !== 0 || chmod?.error || chmod?.status !== 0) {
-    throw new Error(
-      `Failed to configure Chromium sandbox helper ${sandboxPath}. Run: sudo chown root:root ${sandboxPath} && sudo chmod 4755 ${sandboxPath}.\n${chown.stderr?.trim() || chmod?.stderr?.trim() || chown.error || chmod?.error || "Permissions remained incorrect."}`,
-    );
-  }
-  if (!hasRequiredPermissions()) {
-    throw new Error(`Chromium sandbox helper permissions remained incorrect: ${sandboxPath}`);
-  }
-}
-
-function getLaunchCommand(executablePath) {
+function getLaunchCommand(executablePath, args) {
   if (process.platform !== "linux") {
     return {
       command: executablePath,
-      args: [],
+      args,
     };
   }
 
   return {
     command: "xvfb-run",
-    args: ["-a", "--server-args=-screen 0 1280x800x24", executablePath],
+    args: ["-a", "--server-args=-screen 0 1280x800x24", executablePath, ...args],
   };
 }
 
@@ -157,19 +148,15 @@ function getShellCommand(script) {
 }
 
 function createDefaultDaemonEnv(extraEnv) {
-  const env = {
-    ...process.env,
+  return {
+    ...Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_"))),
     ...extraEnv,
   };
-
-  delete env.PASEO_HOME;
-  delete env.PASEO_LISTEN;
-  return env;
 }
 
 function createIsolatedDesktopEnv({ home, listen, userData, cdpPort }) {
   return {
-    ...process.env,
+    ...createDefaultDaemonEnv({ HOME: home, USERPROFILE: home }),
     PASEO_HOME: home,
     PASEO_LISTEN: listen,
     PASEO_ELECTRON_USER_DATA_DIR: userData,
@@ -222,7 +209,10 @@ async function waitForFile(filePath, label) {
   const deadline = Date.now() + SMOKE_TIMEOUT_MS;
   while (Date.now() < deadline) {
     if (fs.existsSync(filePath)) {
-      return fs.readFileSync(filePath, "utf8");
+      const contents = fs.readFileSync(filePath, "utf8");
+      if (contents.trim().length > 0) {
+        return contents;
+      }
     }
     await delay(250);
   }
@@ -312,7 +302,7 @@ function formatLogs({ stdout, stderr, userData, daemonHome }) {
   ].join("\n\n");
 }
 
-async function writeFailureArtifacts({ page, stdout, stderr, userData, daemonHome, error }) {
+async function writeSmokeArtifacts({ page, stdout, stderr, userData, daemonHome, error }) {
   const artifactDir = process.env.PASEO_DESKTOP_SMOKE_ARTIFACT_DIR?.trim();
   if (!artifactDir) {
     return;
@@ -320,13 +310,15 @@ async function writeFailureArtifacts({ page, stdout, stderr, userData, daemonHom
 
   fs.mkdirSync(artifactDir, { recursive: true });
   fs.writeFileSync(
-    path.join(artifactDir, "failure.txt"),
-    `${error instanceof Error ? (error.stack ?? error.message) : String(error)}\n\n${formatLogs({
-      stdout,
-      stderr,
-      userData,
-      daemonHome,
-    })}\n`,
+    path.join(artifactDir, error ? "failure.txt" : "success.txt"),
+    `${error instanceof Error ? (error.stack ?? error.message) : String(error ?? "Packaged desktop smoke passed")}\n\n${formatLogs(
+      {
+        stdout,
+        stderr,
+        userData,
+        daemonHome,
+      },
+    )}\n`,
   );
 
   const desktopLog = readIfExists(path.join(userData, "logs", "main.log"));
@@ -653,24 +645,15 @@ async function smokeColdCliDaemonStart({ appPath }) {
   const pidPath = path.join(home, "paseo.pid");
   const port = await reserveLocalTcpPort();
   const listen = `127.0.0.1:${port}`;
-  const env = createDefaultDaemonEnv();
+  const env = createDefaultDaemonEnv({ HOME: home, USERPROFILE: home });
+  configureIsolatedDaemonHome(home, listen);
 
   try {
     console.log("Packaged desktop smoke: cold-starting daemon through bundled CLI shim");
     await runCliShimCommand({
       appPath,
       env,
-      args: [
-        "daemon",
-        "start",
-        "--home",
-        home,
-        "--listen",
-        listen,
-        "--no-relay",
-        "--no-mcp",
-        "--no-inject-mcp",
-      ],
+      args: ["daemon", "start", "--home", home],
       label: "Bundled CLI shim cold daemon start",
     });
 
@@ -802,10 +785,93 @@ async function stopCliDaemon({ appPath, env }) {
   });
 }
 
-async function smokePackagedDesktopApp({ appPath }) {
-  const executablePath = getExecutablePath(appPath);
+async function openSmokeWorkspace({ appPath, env, page, daemonHome }) {
+  const projectPath = path.join(daemonHome, "sandbox-smoke-project");
+  fs.mkdirSync(projectPath);
+  fs.writeFileSync(path.join(projectPath, "README.md"), "Packaged Linux sandbox smoke\n");
+  const workspace = await runCliShimJsonCommand({
+    appPath,
+    env,
+    args: [
+      "workspace",
+      "create",
+      "--isolation",
+      "local",
+      "--path",
+      projectPath,
+      "--title",
+      "Sandbox smoke workspace",
+    ],
+    label: "Create packaged smoke workspace",
+  });
+  await page.getByRole("button", { name: "Sandbox smoke workspace", exact: true }).click();
+  await page.waitForURL((url) => url.pathname.endsWith(`/workspace/${workspace.workspaceId}`));
+  await page.getByRole("button", { name: "Agent", exact: true }).click();
+  await page.getByRole("textbox", { name: "Message agent..." }).click();
+  console.log(`Packaged desktop smoke: renderer opened workspace ${workspace.workspaceId}`);
+}
+
+async function assertSandboxState({ browser, page, expectedSandbox, stdout, stderr }) {
+  const diagnostics = await page.evaluate(() =>
+    window.paseoDesktop.invoke("desktop_sandbox_diagnostics"),
+  );
+  if (diagnostics.enabled !== expectedSandbox) {
+    throw new Error(
+      `Unexpected sandbox decision: ${JSON.stringify(diagnostics)}; expected enabled=${expectedSandbox}`,
+    );
+  }
+  if (!stdout.join("").includes("[desktop] app startup")) {
+    throw new Error("Missing production app startup log");
+  }
+  const session = await browser.newBrowserCDPSession();
+  const { processInfo } = await session.send("SystemInfo.getProcessInfo");
+  await session.detach();
+  const renderers = processInfo.filter((info) => info.type === "renderer");
+  if (renderers.length === 0) throw new Error("No renderer process found");
+  for (const renderer of renderers) {
+    const status = fs.readFileSync(`/proc/${renderer.id}/status`, "utf8");
+    const security = status
+      .split("\n")
+      .filter((line) => /^(NoNewPrivs|Seccomp|Uid|Gid):/.test(line))
+      .join("; ");
+    const report = `Sandbox evidence: enabled=${expectedSandbox}; ${diagnostics.reason}; renderer ${renderer.id}: ${security}`;
+    console.log(report);
+    stdout.push(`${report}\n`);
+    if (
+      expectedSandbox &&
+      (!/^NoNewPrivs:\s+1$/m.test(status) || !/^Seccomp:\s+2$/m.test(status))
+    ) {
+      throw new Error(`Renderer lacks OS sandbox: ${report}\n${stderr.join("")}`);
+    }
+  }
+}
+
+function assertLinuxDesktopIdentity(appPath) {
+  if (process.platform === "linux") {
+    assert.deepEqual(
+      fs.readFileSync(path.join(appPath, "resources", "icon.png")),
+      fs.readFileSync(path.join(__dirname, "..", "assets", "icon.png")),
+      "Packaged Linux windows must have the Paseo icon at their runtime lookup path",
+    );
+    const metadata = JSON.parse(
+      extractFile(path.join(appPath, "resources", "app.asar"), "package.json").toString(),
+    );
+    if (metadata.desktopName !== `${EXECUTABLE_NAME}.desktop`) {
+      throw new Error(
+        `Packaged Linux desktop identity ${JSON.stringify(metadata.desktopName)} does not match ${EXECUTABLE_NAME}.desktop`,
+      );
+    }
+  }
+}
+
+async function smokePackagedDesktopApp({
+  appPath,
+  executablePath = getExecutablePath(appPath),
+  launchArgs = [],
+  expectedSandbox,
+}) {
   assertExecutable(executablePath, "Packaged app executable");
-  ensureLinuxSandboxPermissions(appPath);
+  assertLinuxDesktopIdentity(appPath);
   await smokeColdCliDaemonStart({ appPath });
 
   const userData = createTempDir("paseo-smoke-user-data-");
@@ -829,7 +895,7 @@ async function smokePackagedDesktopApp({ appPath }) {
 
   const stdout = [];
   const stderr = [];
-  const launch = getLaunchCommand(executablePath);
+  const launch = getLaunchCommand(executablePath, launchArgs);
   console.log(`Packaged desktop smoke: launching ${launch.command} ${launch.args.join(" ")}`);
   const child = spawn(launch.command, launch.args, {
     detached: process.platform !== "win32",
@@ -879,14 +945,21 @@ async function smokePackagedDesktopApp({ appPath }) {
       deadline,
     });
     console.log("Packaged desktop smoke: renderer-started desktop daemon reported running");
+    await assertBuiltinPluginsStarted(listen);
+    console.log("Packaged desktop smoke: every built-in plugin started");
     await smokeCliShim({ appPath, env });
     await smokeCliTerminal({ appPath, env });
+    if (expectedSandbox !== undefined) {
+      await assertSandboxState({ browser, page, expectedSandbox, stdout, stderr });
+      await openSmokeWorkspace({ appPath, env, page, daemonHome });
+    }
+    await writeSmokeArtifacts({ page, stdout, stderr, userData, daemonHome });
     await stopDaemonForCleanup();
     console.log(
       `Packaged desktop smoke passed: real renderer and preload loaded; renderer-started desktop daemon pid ${status.pid}, listen ${status.listen}; CLI shim daemon status and terminal smoke succeeded`,
     );
   } catch (error) {
-    await writeFailureArtifacts({ page, stdout, stderr, userData, daemonHome, error }).catch(
+    await writeSmokeArtifacts({ page, stdout, stderr, userData, daemonHome, error }).catch(
       (artifactError) => {
         console.warn(`Packaged desktop smoke: failed to write failure artifacts: ${artifactError}`);
       },
diff --git a/packages/desktop/e2e/plugin-links.electron.mjs b/packages/desktop/e2e/plugin-links.electron.mjs
new file mode 100644
index 0000000000..4e1654c8b1
--- /dev/null
+++ b/packages/desktop/e2e/plugin-links.electron.mjs
@@ -0,0 +1,122 @@
+import fs from "node:fs";
+import path from "node:path";
+import { expect } from "@playwright/test";
+
+export function seedPluginLinks(paseoHome, workspaceId, url, remoteWorkspaceId) {
+  const directory = path.join(paseoHome, "link-plugin");
+  fs.mkdirSync(directory, { recursive: true });
+  fs.writeFileSync(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: "link-check", requirements: { paseo: ">=0.8.0" } }),
+  );
+  fs.writeFileSync(
+    path.join(directory, "index.client.tsx"),
+    `
+import { useState } from "react";
+import { View, Text, Pressable } from "react-native";
+import { openExternalUrl } from "@getpaseo/plugin/client";
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
+function Links({ navigation }) {
+  const [result, setResult] = useState("Ready");
+  return <View>
+    <Text>{result}</Text>
+    <Pressable accessibilityRole="button" onPress={() => { window.open(${JSON.stringify(url)}, "_blank", "noopener,noreferrer"); }}><Text>Old documentation workaround</Text></Pressable>
+    <Pressable accessibilityRole="button" onPress={async () => { try { await openExternalUrl(${JSON.stringify(url)}); setResult("Opened externally"); } catch (error) { setResult(String(error)); } }}><Text>Open externally</Text></Pressable>
+    {ExternalLink ? <ExternalLink href={${JSON.stringify(url)}}>Documentation link</ExternalLink> : null}
+    <Pressable accessibilityRole="button" onPress={() => navigation.openBrowser({ url: ${JSON.stringify(url)}, workspaceId: ${JSON.stringify(remoteWorkspaceId)}, serverId: "plugin-links-remote" })}><Text>Open remote workspace browser</Text></Pressable>
+    <Text>{navigation.openBrowser ? "Browser available" : "Browser unavailable"}</Text>
+    <Pressable accessibilityRole="button" onPress={() => navigation.openBrowser({ url: ${JSON.stringify(url)}, workspaceId: ${JSON.stringify(workspaceId)} })}><Text>Open workspace browser</Text></Pressable>
+  </View>;
+}
+export default function(client) { client.addSurface("main", Links); client.addSidebarItem({ id: "links", title: "Plugin links QA", icon: "Link", surface: "main" }); return () => {}; }
+`,
+  );
+  const configPath = path.join(paseoHome, "config.json");
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  config.pluginsEnabled = true;
+  config.plugins = { "link-check": { source: "directory", path: directory, enabled: true } };
+  fs.writeFileSync(configPath, JSON.stringify(config));
+}
+
+export async function runPluginLinksRegression({
+  page,
+  remotePort,
+  workspaceId,
+  remoteWorkspaceId,
+  url,
+  artifactDir,
+  externalOpenLog,
+}) {
+  const pluginEntry = page.getByRole("button", { name: "Plugin links QA", exact: true });
+  await expect(pluginEntry).toBeVisible({ timeout: 90_000 });
+  await page.evaluate((port) => {
+    const key = "@paseo:daemon-registry";
+    const registry = JSON.parse(localStorage.getItem(key));
+    const endpoint = `127.0.0.1:${port}`;
+    const connection = { id: `direct:${endpoint}`, type: "directTcp", endpoint };
+    const now = new Date().toISOString();
+    registry.push({
+      serverId: "plugin-links-remote",
+      label: "Remote browser host",
+      connections: [connection],
+      preferredConnectionId: connection.id,
+      createdAt: now,
+      updatedAt: now,
+    });
+    localStorage.setItem(key, JSON.stringify(registry));
+  }, remotePort);
+  await page.reload();
+  await pluginEntry.click();
+  await expect(
+    page.getByRole("button", { name: "Old documentation workaround", exact: true }),
+  ).toBeVisible({ timeout: 60_000 });
+  const oldPopup = page.waitForEvent("popup");
+  await page.getByRole("button", { name: "Old documentation workaround", exact: true }).click();
+  const popup = await oldPopup;
+  await popup.waitForLoadState();
+  await popup.screenshot({ path: path.join(artifactDir, "plugin-old-popup.png") });
+  await popup.close();
+
+  const popups = [];
+  page.on("popup", (openedPopup) => popups.push(openedPopup));
+  await page.getByRole("button", { name: "Open externally", exact: true }).click();
+  await expect(page.getByText("Opened externally", { exact: true })).toBeVisible();
+  await page.getByRole("link", { name: "Documentation link", exact: true }).click();
+  if (externalOpenLog) {
+    await expect
+      .poll(() => fs.readFileSync(externalOpenLog, "utf8").trim().split("\n"))
+      .toEqual([url, url]);
+  }
+  await expect(page.getByText("Browser available", { exact: true })).toBeVisible();
+  await page.getByRole("button", { name: "Open workspace browser", exact: true }).click();
+  await expect(page).toHaveURL(new RegExp(`/workspace/${workspaceId}`));
+  await expectPresentedBrowser(page, url);
+  expect(popups).toHaveLength(0);
+  await page.screenshot({ path: path.join(artifactDir, "plugin-workspace-browser.png") });
+  await pluginEntry.click();
+  await page.getByRole("button", { name: "Open remote workspace browser", exact: true }).click();
+  await expect(page).toHaveURL(new RegExp(`/h/plugin-links-remote/workspace/${remoteWorkspaceId}`));
+  await expectPresentedBrowser(page, url);
+  await page.screenshot({ path: path.join(artifactDir, "plugin-remote-workspace-browser.png") });
+  return {
+    remoteWorkspaceId,
+    oldWorkaroundOpenedPopup: true,
+    newExternalPopups: popups.length,
+    workspaceId,
+    url,
+  };
+}
+
+async function expectPresentedBrowser(page, url) {
+  await expect
+    .poll(() =>
+      page
+        .locator("webview")
+        .evaluateAll((views) =>
+          views
+            .filter((view) => view.parentElement?.getAttribute("aria-hidden") === "false")
+            .map((view) => view.getURL()),
+        ),
+    )
+    .toEqual([url]);
+}
diff --git a/packages/desktop/e2e/settings-memory.electron.mjs b/packages/desktop/e2e/settings-memory.electron.mjs
index 688f4ff8d9..95ab39b6ce 100644
--- a/packages/desktop/e2e/settings-memory.electron.mjs
+++ b/packages/desktop/e2e/settings-memory.electron.mjs
@@ -9,7 +9,10 @@ const MAX_TRANSIENT_DETACHED_PANES = 2;
 const SETTINGS_DESTINATIONS = [
   "General",
   "Appearance",
-  "Layout",
+  "Sidebar",
+  "Chat",
+  "Terminal",
+  "Browser",
   "Editor",
   "Shortcuts",
   "Integrations",
diff --git a/packages/desktop/e2e/support/runtime.ts b/packages/desktop/e2e/support/runtime.ts
index 14b770b2fd..9032e5c56e 100644
--- a/packages/desktop/e2e/support/runtime.ts
+++ b/packages/desktop/e2e/support/runtime.ts
@@ -62,6 +62,9 @@ export interface DesktopRuntimeConfig {
   slowInstall?: boolean;
   /** Initial PID reported by desktop_daemon_status. Defaults to null. */
   daemonPid?: number | null;
+  daemonHome?: string;
+  /** Current-session ownership, independent of the legacy management flag. */
+  ownedByDesktop?: boolean;
   daemonVersion?: string | null;
   daemonLogPath?: string;
   /** Initial manageBuiltInDaemon setting. Defaults to false. */
@@ -139,7 +142,7 @@ export async function installDesktopRuntime(
     let manageDaemon = cfg.manageBuiltInDaemon ?? false;
     let daemonRunning = true;
     let currentPid: number | null = cfg.daemonPid ?? null;
-    let startCount = 0;
+    let ownedByDesktop = cfg.ownedByDesktop ?? false;
     let manualUpdateAdmitted = false;
     window.__desktopDaemonStartRequested = false;
 
@@ -150,7 +153,9 @@ export async function installDesktopRuntime(
         listen: cfg.daemonListen ?? "127.0.0.1:6767",
         hostname: null,
         pid: currentPid,
-        home: "",
+        home: cfg.daemonHome ?? "",
+        startedAt: currentPid === null ? null : "2026-09-01T00:00:00.000Z",
+        ownedByDesktop,
         version: cfg.daemonVersion ?? null,
         desktopManaged: manageDaemon,
         error: null,
@@ -162,11 +167,11 @@ export async function installDesktopRuntime(
       if (cfg.hangDaemonStart) {
         return new Promise(() => undefined);
       }
-      startCount += 1;
+      if (!daemonRunning) {
+        currentPid = (cfg.daemonPid ?? 10000) + 1000;
+        ownedByDesktop = true;
+      }
       daemonRunning = true;
-      // First start (bootstrap) returns the configured PID; subsequent starts
-      // (after a stop) get a fresh PID so tests can observe the change.
-      currentPid = (cfg.daemonPid ?? 10000) + (startCount - 1) * 1000;
       return buildDaemonStatus();
     }
 
@@ -268,6 +273,7 @@ export async function installDesktopRuntime(
         }
 
         if (command === "stop_desktop_daemon") {
+          ownedByDesktop = false;
           daemonRunning = false;
           currentPid = null;
           return buildDaemonStatus();
@@ -396,6 +402,12 @@ export async function interceptDaemonManagementConfirmDialog(
   return page.evaluate(() => window.__capturedDialogCall!);
 }
 
+export async function interceptDaemonStopConfirmDialog(page: Page): Promise<ConfirmDialogCall> {
+  await page.getByRole("button", { name: "Stop daemon", exact: true }).click();
+  await page.waitForFunction(() => !!window.__capturedDialogCall);
+  return page.evaluate(() => window.__capturedDialogCall!);
+}
+
 export async function toggleDaemonManagement(
   page: Page,
   _action: "enable" | "disable",
@@ -405,7 +417,9 @@ export async function toggleDaemonManagement(
 
 export function expectDaemonManagementConfirmDialog(args: ConfirmDialogCall): void {
   expect(args.title).toBe("Pause built-in daemon");
-  expect(args.message).toContain("stop the built-in daemon immediately");
+  expect(args.message).toBe(
+    "This will stop the built-in daemon immediately. Running agents and terminals connected to the built-in daemon will be stopped.",
+  );
 }
 
 export async function expectDaemonManagementEnabled(page: Page): Promise<void> {
diff --git a/packages/desktop/e2e/updates.spec.ts b/packages/desktop/e2e/updates.spec.ts
index 9a2153163e..9919acddb4 100644
--- a/packages/desktop/e2e/updates.spec.ts
+++ b/packages/desktop/e2e/updates.spec.ts
@@ -18,6 +18,7 @@ import {
   clickInstallUpdate,
   expectInstallInProgress,
   interceptDaemonManagementConfirmDialog,
+  interceptDaemonStopConfirmDialog,
   toggleDaemonManagement,
   expectDaemonManagementConfirmDialog,
   expectDaemonManagementEnabled,
@@ -27,8 +28,8 @@ import {
   expectDaemonStatusVersion,
 } from "./support/runtime";
 
-// No Playwright Electron runner exists; we simulate the desktop bridge via
-// addInitScript so Electron-gated UI activates without a real Electron process.
+// These renderer cases use the Desktop bridge fixture. Actual Electron ownership
+// and native confirmation journeys live in daemon-lifecycle.e2e.mjs.
 test.describe("Desktop updates", () => {
   test("a desktop-managed daemon explains why its update action is disabled", async ({
     page,
@@ -48,17 +49,6 @@ test.describe("Desktop updates", () => {
     await expect(page.getByTestId("host-page-update-button")).toBeDisabled();
   });
 
-  test("update banner appears in the sidebar when an app update is available", async ({ page }) => {
-    await installDesktopRuntime(page, {
-      serverId: getServerId(),
-      updateAvailable: true,
-      latestVersion: "1.2.3",
-    });
-    await gotoAppShell(page);
-
-    await expectUpdateBanner(page, "1.2.3");
-  });
-
   test("clicking install shows the installing state on the callout", async ({ page }) => {
     await installDesktopRuntime(page, {
       serverId: getServerId(),
@@ -104,13 +94,12 @@ test.describe("Desktop updates", () => {
 });
 
 test.describe("Desktop daemon management", () => {
-  test("disabling built-in daemon management shows confirm dialog with correct copy", async ({
-    page,
-  }) => {
+  test("cancelling the management confirmation preserves the enabled daemon", async ({ page }) => {
     const serverId = getServerId();
     await installDesktopRuntime(page, {
       serverId,
       manageBuiltInDaemon: true,
+      ownedByDesktop: true,
       confirmShouldAccept: false,
     });
     await gotoAppShell(page);
@@ -122,26 +111,12 @@ test.describe("Desktop daemon management", () => {
     await expectDaemonManagementEnabled(page);
   });
 
-  test("cancelling the confirm dialog leaves the daemon management toggle on", async ({ page }) => {
-    const serverId = getServerId();
-    await installDesktopRuntime(page, {
-      serverId,
-      manageBuiltInDaemon: true,
-      confirmShouldAccept: false,
-    });
-    await gotoAppShell(page);
-    await openDesktopSettings(page, serverId);
-
-    await expectDaemonManagementEnabled(page);
-    await toggleDaemonManagement(page, "disable");
-    await expectDaemonManagementEnabled(page);
-  });
-
   test("confirming the dialog disables built-in daemon management", async ({ page }) => {
     const serverId = getServerId();
     await installDesktopRuntime(page, {
       serverId,
       manageBuiltInDaemon: true,
+      ownedByDesktop: true,
       confirmShouldAccept: true,
     });
     await gotoAppShell(page);
@@ -172,29 +147,34 @@ test.describe("Desktop daemon management", () => {
     await expectDaemonStatusLogPath(page, realState.logPath);
   });
 
-  test("stopping and restarting the daemon updates the PID", async ({ page }) => {
-    const serverId = getServerId();
-    const realState = await loadRealDaemonState();
-    await installDesktopRuntime(page, {
-      serverId,
-      manageBuiltInDaemon: true,
-      daemonPid: realState.pid,
-      daemonVersion: realState.version,
-      daemonLogPath: realState.logPath,
-      confirmShouldAccept: true,
+  for (const confirmShouldAccept of [false, true]) {
+    test(`${confirmShouldAccept ? "confirming" : "cancelling"} Stop identifies the owned daemon`, async ({
+      page,
+    }) => {
+      const serverId = getServerId();
+      const realState = await loadRealDaemonState();
+      const daemonHome = process.env.E2E_PASEO_HOME!;
+      await installDesktopRuntime(page, {
+        serverId,
+        daemonPid: realState.pid,
+        daemonHome,
+        ownedByDesktop: true,
+        confirmShouldAccept,
+      });
+      await gotoAppShell(page);
+      await openDesktopSettings(page, serverId);
+
+      const dialog = await interceptDaemonStopConfirmDialog(page);
+      expect(dialog).toEqual({
+        title: "Stop local daemon?",
+        message: [
+          "This daemon was launched by this Desktop session.",
+          `Home: ${daemonHome}`,
+          `Supervisor PID: ${realState.pid}`,
+          "Running agent work will be interrupted.",
+        ].join("\n"),
+      });
+      await expectDaemonStatusPid(page, confirmShouldAccept ? null : realState.pid);
     });
-    await gotoAppShell(page);
-    await openDesktopSettings(page, serverId);
-
-    await expectDaemonStatusPid(page, realState.pid);
-
-    await toggleDaemonManagement(page, "disable");
-    await expectDaemonManagementDisabled(page);
-    await expectDaemonStatusPid(page, null);
-
-    await toggleDaemonManagement(page, "enable");
-    await expectDaemonManagementEnabled(page);
-    const newPid = realState.pid !== null ? realState.pid + 1000 : 11000;
-    await expectDaemonStatusPid(page, newPid);
-  });
+  }
 });
diff --git a/packages/desktop/e2e/window-startup.e2e.mjs b/packages/desktop/e2e/window-startup.e2e.mjs
new file mode 100644
index 0000000000..e6654c09c2
--- /dev/null
+++ b/packages/desktop/e2e/window-startup.e2e.mjs
@@ -0,0 +1,48 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { _electron as electron, expect } from "playwright/test";
+
+const root = await mkdtemp(path.join(tmpdir(), "paseo-window-startup-"));
+const modulePath = fileURLToPath(new URL("../dist/window/show-when-ready.js", import.meta.url));
+
+async function launchWindowWithoutHiddenFrames() {
+  const main = path.join(root, "main.cjs");
+  await writeFile(
+    main,
+    `const { app, BrowserWindow } = require("electron");
+     const { showWindowWhenReady } = require(${JSON.stringify(modulePath)});
+     app.setPath("userData", ${JSON.stringify(path.join(root, "user-data"))});
+     app.whenReady().then(async () => {
+       const win = global.mainWindow = new BrowserWindow({ show: false, paintWhenInitiallyHidden: false });
+       showWindowWhenReady(win, { showOnLoad: true });
+       await win.loadURL("data:text/html,<h1>Desktop ready</h1>");
+       global.visibleAfterLoad = win.isVisible();
+     });`,
+  );
+  const env = Object.fromEntries(
+    Object.entries(process.env).filter(([key]) => key !== "ELECTRON_RUN_AS_NODE"),
+  );
+  const displayArgs = process.platform === "linux" ? ["--ozone-platform=x11", "--disable-gpu"] : [];
+  return electron.launch({
+    args: ["--no-sandbox", ...displayArgs, main],
+    env,
+  });
+}
+
+async function expectLoadedDesktopIsShown(desktop) {
+  await expect.poll(() => desktop.evaluate(() => global.visibleAfterLoad)).toBe(true);
+  const page = await desktop.firstWindow();
+  await expect(page.getByRole("heading", { name: "Desktop ready" })).toBeVisible();
+}
+
+let desktop;
+try {
+  desktop = await launchWindowWithoutHiddenFrames();
+  await expectLoadedDesktopIsShown(desktop);
+  console.log("Loaded desktop is visible without hidden compositor frames");
+} finally {
+  await desktop?.close();
+  await rm(root, { recursive: true, force: true });
+}
diff --git a/packages/desktop/e2e/workspace-restart.spec.ts b/packages/desktop/e2e/workspace-restart.spec.ts
index 36259bee4f..4ee1655242 100644
--- a/packages/desktop/e2e/workspace-restart.spec.ts
+++ b/packages/desktop/e2e/workspace-restart.spec.ts
@@ -6,6 +6,8 @@ import { getE2EDaemonPort } from "../../app/e2e/support/helpers/daemon-port";
 import { installDaemonWebSocketGate } from "../../app/e2e/support/helpers/daemon-websocket-gate";
 import { expectAppRoute } from "../../app/e2e/support/helpers/route-assertions";
 import { seedWorkspace } from "../../app/e2e/support/helpers/seed-client";
+import { openAgentRoute, seedMockAgentWorkspace } from "../../app/e2e/support/helpers/mock-agent";
+import { scrollAgentChatToBottom } from "../../app/e2e/support/helpers/agent-bottom-anchor";
 import { getServerId } from "../../app/e2e/support/helpers/server-id";
 import { waitForWorkspaceTabsVisible } from "../../app/e2e/support/helpers/workspace-tabs";
 import {
@@ -118,3 +120,131 @@ test("refresh keeps one continuous splash before restoring the desktop workspace
     await workspace.cleanup();
   }
 });
+
+function inspectChatDragExclusions(scroll: Element) {
+  const header = document.querySelector('[data-testid="composer-dock-header"]');
+  if (!header) throw new Error("Expected the workspace header");
+  const headerRect = header.getBoundingClientRect();
+  const headerY = headerRect.top + headerRect.height / 2;
+  const content = scroll.firstElementChild;
+  const focusScope = scroll.closest("[tabindex]");
+  if (!content || !focusScope) throw new Error("Expected chat content and its focus scope");
+  const contentRect = content.getBoundingClientRect();
+  const chatX = (contentRect.left + contentRect.right) / 2;
+  const tabRow = [...document.querySelectorAll('[data-testid="workspace-tabs-row"]')].find(
+    (row) => {
+      const rect = row.getBoundingClientRect();
+      return rect.left < chatX && rect.right > chatX && rect.height > 0;
+    },
+  );
+  if (!tabRow) throw new Error("Expected the chat pane's tab row");
+  const tabRect = tabRow.getBoundingClientRect();
+  const tabY = tabRect.top + tabRect.height / 2;
+  const exclusions = [...scroll.querySelectorAll("*")].filter((element) => {
+    const rect = element.getBoundingClientRect();
+    const style = getComputedStyle(element);
+    return (
+      style.visibility === "visible" &&
+      style.getPropertyValue("-webkit-app-region") === "no-drag" &&
+      ((rect.top < headerY && rect.bottom > headerY) || (rect.top < tabY && rect.bottom > tabY)) &&
+      rect.right > headerRect.left &&
+      rect.left < headerRect.right
+    );
+  });
+  return {
+    contentCrossesHeader: contentRect.top < headerY && contentRect.bottom > headerY,
+    contentCrossesTabRow: contentRect.top < tabY && contentRect.bottom > tabY,
+    focusScopeRegion: getComputedStyle(focusScope).getPropertyValue("-webkit-app-region"),
+    exclusions: exclusions.length,
+  };
+}
+
+test("scrolled chat does not exclude the workspace titlebar from dragging", async ({
+  page,
+}, testInfo) => {
+  const response = Array.from(
+    { length: 80 },
+    (_, index) =>
+      `Paragraph ${index}: a long conversation keeps the chat scrolled below its first message.\n\n[Drag reference](https://example.com) and [file.ts](./file.ts)\n\n\`\`\`ts\nconst item = ${index};\n\`\`\``,
+  ).join("\n\n");
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "desktop-scrolled-chat-",
+    title: "Scrollable conversation",
+    initialPrompt: "Show a long response",
+    featureValues: { mockAssistantResponse: response },
+  });
+
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await installDesktopRuntime(page, {
+      serverId: getServerId(),
+      daemonListen: `127.0.0.1:${getE2EDaemonPort()}`,
+    });
+    await openAgentRoute(page, agent);
+    const chat = page.getByTestId("agent-chat-scroll");
+    await expect(chat).toBeVisible();
+
+    for (const colorScheme of ["light", "dark"] as const) {
+      await page.emulateMedia({ colorScheme });
+      await scrollAgentChatToBottom(page);
+      // Electron can subtract no-drag rectangles outside a scroll viewport's clip.
+      // Check the offending geometry, rather than DOM hit testing or a specific row style.
+      await expect
+        .poll(() => chat.evaluate(inspectChatDragExclusions))
+        .toEqual({
+          contentCrossesHeader: true,
+          contentCrossesTabRow: true,
+          focusScopeRegion: "no-drag",
+          exclusions: 0,
+        });
+    }
+
+    // Window-owned controls are siblings of workspace chrome, not descendants of it.
+    const closeMenu = page.getByRole("button", { name: "Close menu", exact: true });
+    await expect(closeMenu).toHaveCSS("-webkit-app-region", "no-drag");
+    await closeMenu.click();
+    const openMenu = page.getByRole("button", { name: "Open menu", exact: true });
+    await expect(openMenu).toHaveCSS("-webkit-app-region", "no-drag");
+    await openMenu.click();
+    await expect(closeMenu).toBeVisible();
+
+    const menuTrigger = page.getByTestId("workspace-header-menu-trigger");
+    await expect(menuTrigger).toHaveCSS("-webkit-app-region", "no-drag");
+    await menuTrigger.click();
+    const menu = page.getByTestId("workspace-header-menu");
+    await expect(menu).toBeVisible();
+    await expect(menu.getByRole("menuitem").first()).toHaveCSS("-webkit-app-region", "no-drag");
+    await page.keyboard.press("Escape");
+    await expect(menu).toBeHidden();
+    await page.getByRole("textbox", { name: "Message agent...", exact: true }).click();
+    // installDesktopRuntime supplies a macOS bridge, including shortcut identity.
+    await page.keyboard.press("Meta+f");
+    const find = page.getByRole("textbox", { name: "Find in pane", exact: true });
+    await expect(find).toBeFocused();
+    await expect(find).toHaveCSS("-webkit-app-region", "no-drag");
+    await find.fill("Paragraph 40:");
+    await expect(page.getByRole("status", { name: "Find matches" })).toHaveText("1 of 1");
+    for (const name of ["Next match", "Previous match", "Close Find"]) {
+      await expect(page.getByRole("button", { name, exact: true })).toHaveCSS(
+        "-webkit-app-region",
+        "no-drag",
+      );
+    }
+    await page.getByRole("button", { name: "Close Find", exact: true }).click();
+    await expect(find).toBeHidden();
+    await expect
+      .poll(() =>
+        chat.evaluate((scroll) => ({
+          focusReturned: document.activeElement?.contains(scroll),
+          tabindex: document.activeElement?.getAttribute("tabindex"),
+          appRegion: getComputedStyle(document.activeElement!).getPropertyValue(
+            "-webkit-app-region",
+          ),
+        })),
+      )
+      .toEqual({ focusReturned: true, tabindex: "-1", appRegion: "no-drag" });
+    await page.screenshot({ path: testInfo.outputPath("scrolled-chat-titlebar.png") });
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/desktop/electron-builder.yml b/packages/desktop/electron-builder.yml
index 7e1cf10b5a..8634d1f058 100644
--- a/packages/desktop/electron-builder.yml
+++ b/packages/desktop/electron-builder.yml
@@ -17,6 +17,7 @@ files:
   - "!node_modules/@getpaseo/**/*.test.*"
   - "!node_modules/@getpaseo/**/*.spec.*"
   - "!node_modules/@getpaseo/server/dist/server/web-ui/**"
+  - "!node_modules/@getpaseo/server/dist/server/builtin-plugins/**"
   # Workspace packages are symlinked, so anything a dev generates inside them
   # lands in the asar. CI never has these; a local .debug run adds gigabytes.
   - "!node_modules/@getpaseo/*/.debug/**"
@@ -27,6 +28,9 @@ asarUnpack:
   - dist/daemon/node-entrypoint-runner.js
   - node_modules/@getpaseo/server/dist/server/terminal/shell-integration/**/*
 extraResources:
+  # Preserve physical compiler inputs, including .d.ts files omitted from packaged node_modules.
+  - from: ../server/dist/server/builtin-plugins
+    to: builtin-plugins
   - from: ../app/dist
     to: app-dist
   - from: assets/editor-targets
@@ -37,6 +41,7 @@ publish:
   repo: paseo
 mac:
   artifactName: "Paseo-${version}-${arch}.${ext}"
+  minimumSystemVersion: "13.0.0"
   category: public.app-category.developer-tools
   icon: assets/icon.icns
   hardenedRuntime: true
@@ -60,12 +65,20 @@ linux:
   extraResources:
     - from: bin/paseo
       to: bin/paseo
+    - from: assets/icon.png
+      to: icon.png
   target:
     - AppImage
     - deb
     - rpm
     - tar.gz
+deb:
+  afterInstall: scripts/linux-sandbox/after-install.tpl
+rpm:
+  afterInstall: scripts/linux-sandbox/after-install.tpl
 appImage:
+  # A nonempty argument list replaces builder's hardcoded --no-sandbox default.
+  executableArgs: ["--class=Paseo"]
   # Keep the AppImage filename stable across versions (no ${version}) so
   # electron-updater overwrites the file in place instead of renaming it to a new
   # versioned path. A rename orphans the old binary, breaks desktop shortcuts, and
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 1a81cb001e..e6e2dbd567 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
@@ -17,14 +17,16 @@
   "scripts": {
     "build": "npm --prefix ../.. run build:server:clean && npm run build:main && electron-builder --config electron-builder.yml",
     "build:main": "tsc -p tsconfig.json",
-    "capture-harness": "./capture-harness/run.sh",
+    "capture-harness": "npm run build:main && ./capture-harness/run.sh",
     "dev": "./scripts/dev.sh",
     "dev:win": "powershell ./scripts/dev.ps1",
     "test:e2e:renderer": "cross-env E2E_DESKTOP_RUNTIME=1 playwright test --config=playwright.config.ts --project=desktop",
     "test:e2e:browser-tabs": "npm run build:main && node ./e2e/browser-tabs.e2e.mjs",
     "verify:electron-cdp": "node ./scripts/verify-electron-cdp.mjs",
-    "test": "vitest run --exclude \"e2e/**\"",
-    "typecheck": "tsgo --noEmit -p tsconfig.json"
+    "test": "install-electron && vitest run --exclude \"e2e/**\"",
+    "typecheck": "tsgo --noEmit -p tsconfig.json",
+    "test:e2e:lifecycle": "npm run build:main && node ./e2e/daemon-lifecycle.e2e.mjs",
+    "test:e2e:window-startup": "npm run build:main && node ./e2e/window-startup.e2e.mjs"
   },
   "dependencies": {
     "@getpaseo/cli": "*",
@@ -35,13 +37,15 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
+    "@electron/asar": "3.4.1",
     "@types/node": "24.6.0",
     "@types/ws": "^8.5.14",
-    "electron": "41.2.0",
+    "electron": "44.2.0",
     "electron-builder": "26.8.1",
     "typescript": "5.9.3",
     "unzip-crx-3": "^0.2.0",
     "vitest": "^4.1.6",
     "wait-on": "8.0.5"
-  }
+  },
+  "desktopName": "Paseo.desktop"
 }
diff --git a/packages/desktop/scripts/after-pack.js b/packages/desktop/scripts/after-pack.js
index e5222d68fe..9826a6a1e9 100644
--- a/packages/desktop/scripts/after-pack.js
+++ b/packages/desktop/scripts/after-pack.js
@@ -3,6 +3,8 @@ const path = require("path");
 
 const { smokePackagedDesktopApp } = require("../e2e/packaged-app-smoke.js");
 
+const { installLinuxLauncher } = require("./linux-sandbox");
+
 const EXECUTABLE_NAME = "Paseo";
 
 // electron-builder arch enum → Node.js arch string
@@ -115,6 +117,10 @@ exports.default = async function afterPack(context) {
 
   pruneNativeModules(context.appOutDir, platform, arch);
 
+  if (platform === "linux") {
+    installLinuxLauncher(context.appOutDir);
+  }
+
   if (platform === "linux" || platform === "win32") {
     if (arch !== process.arch) {
       console.log(
diff --git a/packages/desktop/scripts/dev-runner-readiness.mjs b/packages/desktop/scripts/dev-runner-readiness.mjs
new file mode 100644
index 0000000000..b3fc07eb6e
--- /dev/null
+++ b/packages/desktop/scripts/dev-runner-readiness.mjs
@@ -0,0 +1,17 @@
+export async function waitForMetro(url, timeoutMs = 60_000) {
+  const statusUrl = new URL("/status", url);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(statusUrl, { signal: AbortSignal.timeout(1_000) });
+      const body = (await response.text()).trim();
+      if (response.status === 200 && body === "packager-status:running") {
+        return;
+      }
+    } catch {
+      // Expo temporarily binds the port while checking availability, before Metro starts.
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+  throw new Error(`Timed out waiting for Metro at ${url}`);
+}
diff --git a/packages/desktop/scripts/dev-runner-readiness.test.mjs b/packages/desktop/scripts/dev-runner-readiness.test.mjs
new file mode 100644
index 0000000000..c3e2cc9fcb
--- /dev/null
+++ b/packages/desktop/scripts/dev-runner-readiness.test.mjs
@@ -0,0 +1,41 @@
+import http from "node:http";
+import { expect, test } from "vitest";
+import { waitForMetro } from "./dev-runner-readiness.mjs";
+
+async function startMetroStatusServer(responses) {
+  let lastResponse = null;
+  let nextResponse = 0;
+  const server = http.createServer((request, response) => {
+    const reply = responses[Math.min(nextResponse++, responses.length - 1)];
+    lastResponse = { path: request.url, ...reply };
+    response.writeHead(reply.status);
+    response.end(reply.body);
+  });
+  await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+  return {
+    url: `http://127.0.0.1:${server.address().port}`,
+    lastResponse: () => lastResponse,
+    async close() {
+      server.closeAllConnections();
+      await new Promise((resolve) => server.close(resolve));
+    },
+  };
+}
+
+test("Metro readiness rejects an unrelated listener before accepting the packager status", async () => {
+  const metro = await startMetroStatusServer([
+    { status: 503, body: "packager-status:running" },
+    { status: 200, body: "unrelated HTTP server" },
+    { status: 200, body: "packager-status:running" },
+  ]);
+  try {
+    await waitForMetro(metro.url, 2_000);
+    expect(metro.lastResponse()).toEqual({
+      path: "/status",
+      status: 200,
+      body: "packager-status:running",
+    });
+  } finally {
+    await metro.close();
+  }
+});
diff --git a/packages/desktop/scripts/dev-runner.mjs b/packages/desktop/scripts/dev-runner.mjs
index 852bf7d85c..008b77d15f 100644
--- a/packages/desktop/scripts/dev-runner.mjs
+++ b/packages/desktop/scripts/dev-runner.mjs
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import net from "node:net";
 import path from "node:path";
 import { execFileSync, spawn } from "node:child_process";
 import { createRequire } from "node:module";
@@ -10,6 +9,7 @@ import {
   resolveChildKillTarget,
 } from "./dev-runner-config.mjs";
 
+import { waitForMetro } from "./dev-runner-readiness.mjs";
 import { resolveDevElectronArgs } from "./dev-runner-args.mjs";
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
@@ -134,35 +134,6 @@ function stopAll(signal) {
   }, 50);
 }
 
-async function waitForPort(port, host = "127.0.0.1", timeoutMs = 60_000) {
-  const deadline = Date.now() + timeoutMs;
-
-  while (Date.now() < deadline) {
-    if (await canConnect(port, host)) {
-      return;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  }
-
-  throw new Error(`Timed out waiting for ${host}:${port}`);
-}
-
-function canConnect(port, host) {
-  return new Promise((resolve) => {
-    const socket = net.createConnection({ port, host });
-    socket.setTimeout(1000);
-    socket.once("connect", () => {
-      socket.destroy();
-      resolve(true);
-    });
-    socket.once("timeout", () => {
-      socket.destroy();
-      resolve(false);
-    });
-    socket.once("error", () => resolve(false));
-  });
-}
-
 registerDevRunnerShutdownSignals({ signalSource: process, stop: stopAll });
 
 spawnChild("metro", "npx", ["expo", "start", "--port", String(expoPort)], {
@@ -179,7 +150,7 @@ spawnChild("metro", "npx", ["expo", "start", "--port", String(expoPort)], {
 });
 
 try {
-  await waitForPort(expoPort);
+  await waitForMetro(expoDevUrl);
 } catch (error) {
   console.error(`[dev] ${error.message}`);
   exitCode = 1;
diff --git a/packages/desktop/scripts/linux-sandbox/after-install.tpl b/packages/desktop/scripts/linux-sandbox/after-install.tpl
new file mode 100644
index 0000000000..5723ea065b
--- /dev/null
+++ b/packages/desktop/scripts/linux-sandbox/after-install.tpl
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+if type update-alternatives >/dev/null 2>&1; then
+    # Remove previous link if it doesn't use update-alternatives
+    if [ -L '/usr/bin/${executable}' -a -e '/usr/bin/${executable}' -a "`readlink '/usr/bin/${executable}'`" != '/etc/alternatives/${executable}' ]; then
+        rm -f '/usr/bin/${executable}'
+    fi
+    update-alternatives --install '/usr/bin/${executable}' '${executable}' '/opt/${sanitizedProductName}/${executable}' 100 || ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
+else
+    ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
+fi
+
+# Package installation runs as root, whose namespace access says nothing about
+# the desktop user under AppArmor. Always provide Chromium's SUID alternative.
+chown root:root '/opt/${sanitizedProductName}/chrome-sandbox' || exit 1
+chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || exit 1
+
+if hash update-mime-database 2>/dev/null; then
+    update-mime-database /usr/share/mime || true
+fi
+
+if hash update-desktop-database 2>/dev/null; then
+    update-desktop-database /usr/share/applications || true
+fi
+
+# Install apparmor profile. (Ubuntu 24+)
+# First check if the version of AppArmor running on the device supports our profile.
+# This is in order to keep backwards compatibility with Ubuntu 22.04 which does not support abi/4.0.
+# In that case, we just skip installing the profile since the app runs fine without it on 22.04.
+#
+# Those apparmor_parser flags are akin to performing a dry run of loading a profile.
+# https://wiki.debian.org/AppArmor/HowToUse#Dumping_profiles
+#
+# Unfortunately, at the moment AppArmor doesn't have a good story for backwards compatibility.
+# https://askubuntu.com/questions/1517272/writing-a-backwards-compatible-apparmor-profile
+if apparmor_status --enabled > /dev/null 2>&1; then
+  APPARMOR_PROFILE_SOURCE='/opt/${sanitizedProductName}/resources/apparmor-profile'
+  APPARMOR_PROFILE_TARGET='/etc/apparmor.d/${executable}'
+  if apparmor_parser --skip-kernel-load --debug "$APPARMOR_PROFILE_SOURCE" > /dev/null 2>&1; then
+    cp -f "$APPARMOR_PROFILE_SOURCE" "$APPARMOR_PROFILE_TARGET"
+
+    # Updating the current AppArmor profile is not possible and probably not meaningful in a chroot'ed environment.
+    # Use cases are for example environments where images for clients are maintained.
+    # There, AppArmor might correctly be installed, but live updating makes no sense.
+    if ! { [ -x '/usr/bin/ischroot' ] && /usr/bin/ischroot; } && hash apparmor_parser 2>/dev/null; then
+      # Extra flags taken from dh_apparmor:
+      # > By using '-W -T' we ensure that any abstraction updates are also pulled in.
+      # https://wiki.debian.org/AppArmor/Contribute/FirstTimeProfileImport
+      apparmor_parser --replace --write-cache --skip-read-cache "$APPARMOR_PROFILE_TARGET"
+    fi
+  else
+    echo "Skipping the installation of the AppArmor profile as this version of AppArmor does not seem to support the bundled profile"
+  fi
+fi
diff --git a/packages/desktop/scripts/linux-sandbox/index.js b/packages/desktop/scripts/linux-sandbox/index.js
new file mode 100644
index 0000000000..f641e721c2
--- /dev/null
+++ b/packages/desktop/scripts/linux-sandbox/index.js
@@ -0,0 +1,12 @@
+const fs = require("node:fs");
+const path = require("node:path");
+
+// Keep one pre-Chromium entrypoint for AppRun, desktop entries, updates, and tarballs.
+exports.installLinuxLauncher = function installLinuxLauncher(appOutDir) {
+  const launcher = path.join(appOutDir, "Paseo");
+  if (!fs.existsSync(`${launcher}.bin`)) {
+    fs.renameSync(launcher, `${launcher}.bin`);
+  }
+  fs.copyFileSync(path.join(__dirname, "launcher.sh"), launcher);
+  fs.chmodSync(launcher, 0o755);
+};
diff --git a/packages/desktop/scripts/linux-sandbox/launcher.sh b/packages/desktop/scripts/linux-sandbox/launcher.sh
new file mode 100644
index 0000000000..8f0b6a609f
--- /dev/null
+++ b/packages/desktop/scripts/linux-sandbox/launcher.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+set -eu
+
+# Resolve /usr/bin alternatives and user-created symlinks before finding Electron.
+launcher=$(readlink -f -- "$0")
+executable="${launcher}.bin"
+
+# Node entrypoints are not Chromium processes. Never inject browser flags here.
+if [ "${ELECTRON_RUN_AS_NODE:-}" = 1 ]; then
+  exec "$executable" "$@"
+fi
+
+for arg in "$@"; do
+  if [ "$arg" = '--no-sandbox' ]; then
+    export PASEO_DESKTOP_SANDBOX_REASON='requested by --no-sandbox'
+    printf '[linux-sandbox] disabled: %s\n' "$PASEO_DESKTOP_SANDBOX_REASON" >&2 || true
+    exec "$executable" "$@"
+  fi
+done
+
+# Match main's whitespace-separated debugging flags without evaluating shell code.
+set -f
+for flag in ${PASEO_ELECTRON_FLAGS:-}; do
+  if [ "$flag" = '--no-sandbox' ]; then
+    export PASEO_DESKTOP_SANDBOX_REASON='requested by PASEO_ELECTRON_FLAGS'
+    printf '[linux-sandbox] disabled: %s\n' "$PASEO_DESKTOP_SANDBOX_REASON" >&2 || true
+    exec "$executable" --no-sandbox "$@"
+  fi
+done
+
+# Map the real UID and create a network namespace as Chromium does. A bare
+# unshare --user can succeed under AppArmor while namespace capabilities fail.
+if namespace_error=$(unshare --user --map-root-user --net true 2>&1); then
+  export PASEO_DESKTOP_SANDBOX_REASON='user namespaces available'
+  printf '[linux-sandbox] enabled: %s\n' "$PASEO_DESKTOP_SANDBOX_REASON" >&2 || true
+  exec "$executable" "$@"
+fi
+
+helper="$(dirname -- "$launcher")/chrome-sandbox"
+if [ -x "$helper" ] && [ "$(stat -Lc '%u:%a' -- "$helper")" = '0:4755' ] &&
+   grep -q '^NoNewPrivs:[[:space:]]*0$' /proc/self/status; then
+  mount_options=$(findmnt -n -o VFS-OPTIONS --target "$helper" 2>/dev/null || true)
+  case ",$mount_options," in
+    *,nosuid,*|,,) ;;
+    *)
+      export PASEO_DESKTOP_SANDBOX_REASON='root-owned SUID helper available'
+      printf '[linux-sandbox] enabled: %s\n' "$PASEO_DESKTOP_SANDBOX_REASON" >&2 || true
+      exec "$executable" "$@"
+      ;;
+  esac
+fi
+
+export PASEO_DESKTOP_SANDBOX_REASON="user namespaces unavailable${namespace_error:+ ($namespace_error)}; no usable SUID helper"
+printf '[linux-sandbox] disabled: %s\n' "$PASEO_DESKTOP_SANDBOX_REASON" >&2 || true
+exec "$executable" --no-sandbox "$@"
diff --git a/packages/desktop/src/daemon/cli/external.test.ts b/packages/desktop/src/daemon/cli/external.test.ts
index 3a17c62916..5649c9f5c5 100644
--- a/packages/desktop/src/daemon/cli/external.test.ts
+++ b/packages/desktop/src/daemon/cli/external.test.ts
@@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => ({
   spawnProcess: vi.fn(),
 }));
 
-vi.mock("@getpaseo/server", () => ({
+vi.mock("@getpaseo/server/process", () => ({
   spawnProcess: mocks.spawnProcess,
 }));
 
diff --git a/packages/desktop/src/daemon/cli/external.ts b/packages/desktop/src/daemon/cli/external.ts
index 424ef1d163..6c9deeccb1 100644
--- a/packages/desktop/src/daemon/cli/external.ts
+++ b/packages/desktop/src/daemon/cli/external.ts
@@ -1,4 +1,4 @@
-import { spawnProcess } from "@getpaseo/server";
+import { spawnProcess } from "@getpaseo/server/process";
 import log from "electron-log/main";
 import type { NodeEntrypointInvocation } from "../node-entrypoint-launcher.js";
 import { createNodeEntrypointInvocation } from "../runtime-paths.js";
diff --git a/packages/desktop/src/daemon/daemon-manager.test.ts b/packages/desktop/src/daemon/daemon-manager.test.ts
index 70a6bc251c..d18a8cd48c 100644
--- a/packages/desktop/src/daemon/daemon-manager.test.ts
+++ b/packages/desktop/src/daemon/daemon-manager.test.ts
@@ -1,13 +1,13 @@
-import { EventEmitter } from "node:events";
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { hostname, tmpdir } from "node:os";
+import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { DEFAULT_DESKTOP_SETTINGS } from "../settings/desktop-settings";
-import { getBundledCliShimPath } from "../integrations/cli-install";
 import { createDaemonCommandHandlers } from "./daemon-manager";
 
 const mocks = vi.hoisted(() => ({
-  paseoHome: "/tmp/paseo-desktop-daemon-manager-test-home",
+  paseoHome: "",
   settings: {
     releaseChannel: "stable",
     daemon: {
@@ -25,13 +25,13 @@ const mocks = vi.hoisted(() => ({
   spawnProcess: vi.fn(),
   logInfo: vi.fn(),
   logError: vi.fn(),
-  appLogPath: "/tmp/paseo-desktop-daemon-manager-test-main.log",
+  appLogPath: "",
   getElectronLogFile: vi.fn(),
 }));
 
 vi.mock("electron", () => ({
   app: {
-    getPath: vi.fn(() => "/tmp/paseo-user-data"),
+    getPath: vi.fn(() => mocks.paseoHome),
     getVersion: vi.fn(() => "1.2.3"),
     isPackaged: true,
   },
@@ -51,8 +51,9 @@ vi.mock("electron-log/main", () => ({
   },
 }));
 
-vi.mock("@getpaseo/server", () => ({
-  resolvePaseoHome: vi.fn(() => mocks.paseoHome),
+vi.mock("@getpaseo/server/daemon-control", async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  resolvePaseoHome: () => mocks.paseoHome,
   spawnProcess: mocks.spawnProcess,
 }));
 
@@ -67,7 +68,7 @@ vi.mock("../settings/desktop-settings-electron.js", () => ({
 vi.mock("./runtime-paths.js", () => ({
   createNodeEntrypointInvocation: mocks.createNodeEntrypointInvocation,
   resolveDaemonRunnerEntrypoint: vi.fn(() => ({
-    entryPath: "/tmp/daemon.js",
+    entryPath: path.join(mocks.paseoHome, "daemon.js"),
     execArgv: [],
   })),
 }));
@@ -77,40 +78,13 @@ vi.mock("./cli/external.js", () => ({
   runExternalCliTextCommand: mocks.runExternalCliTextCommand,
 }));
 
-function desktopSettingsWithManagement(enabled: boolean) {
-  return {
-    ...DEFAULT_DESKTOP_SETTINGS,
-    daemon: {
-      ...DEFAULT_DESKTOP_SETTINGS.daemon,
-      manageBuiltInDaemon: enabled,
-    },
-  };
-}
-
-type MockChildProcess = EventEmitter & {
-  pid: number;
-  spawnfile: string;
-  spawnargs: string[];
-  unref: ReturnType<typeof vi.fn>;
-};
-
-function createMockChildProcess(): MockChildProcess {
-  const child = new EventEmitter() as MockChildProcess;
-  child.pid = 1234;
-  child.spawnfile = "node";
-  child.spawnargs = ["node", "daemon.js"];
-  child.unref = vi.fn();
-  return child;
-}
-
-function scheduleFailedStartup(child: MockChildProcess): void {
-  setImmediate(() => {
-    child.emit("exit", 1, null);
-  });
-}
-
 describe("daemon-manager commands", () => {
+  let fixtureRoot: string;
+
   beforeEach(() => {
+    fixtureRoot = mkdtempSync(path.join(tmpdir(), "paseo daemon manager "));
+    mocks.paseoHome = path.join(fixtureRoot, "home");
+    mocks.appLogPath = path.join(fixtureRoot, "main.log");
     mocks.settings = DEFAULT_DESKTOP_SETTINGS;
     mocks.runExternalCliJsonCommand.mockReset();
     mocks.runExternalCliTextCommand.mockReset();
@@ -121,384 +95,10 @@ describe("daemon-manager commands", () => {
     mocks.logError.mockReset();
     mocks.getElectronLogFile.mockReset();
     mocks.getElectronLogFile.mockReturnValue({ path: mocks.appLogPath });
-    rmSync(mocks.paseoHome, { recursive: true, force: true });
-    rmSync(mocks.appLogPath, { force: true });
   });
 
   afterEach(() => {
-    rmSync(mocks.paseoHome, { recursive: true, force: true });
-    rmSync(mocks.appLogPath, { force: true });
-  });
-
-  it("refuses start and restart while built-in daemon management is disabled", async () => {
-    mocks.settings = desktopSettingsWithManagement(false);
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.start_desktop_daemon()).rejects.toThrow(
-      "Built-in daemon management is disabled.",
-    );
-    await expect(handlers.restart_desktop_daemon()).rejects.toThrow(
-      "Built-in daemon management is disabled.",
-    );
-
-    expect(mocks.runExternalCliJsonCommand).not.toHaveBeenCalled();
-    expect(mocks.spawnProcess).not.toHaveBeenCalled();
-  });
-
-  it("keeps stop callable while built-in daemon management is disabled", async () => {
-    mocks.settings = desktopSettingsWithManagement(false);
-    mocks.runExternalCliJsonCommand.mockResolvedValue({
-      localDaemon: "stopped",
-      serverId: "",
-    });
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.stop_desktop_daemon()).resolves.toEqual({
-      serverId: "",
-      status: "stopped",
-      listen: null,
-      hostname: null,
-      pid: null,
-      home: mocks.paseoHome,
-      version: null,
-      desktopManaged: false,
-      error: null,
-    });
-
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenCalledWith(["daemon", "status", "--json"]);
-  });
-
-  it("routes running desktop daemon stops through external CLI daemon stop", async () => {
-    mocks.runExternalCliJsonCommand
-      .mockResolvedValueOnce({
-        localDaemon: "running",
-        serverId: "server-1",
-        pid: 4242,
-        listen: "127.0.0.1:6767",
-        desktopManaged: true,
-      })
-      .mockResolvedValueOnce({ action: "stopped" })
-      .mockResolvedValueOnce({
-        localDaemon: "stopped",
-        serverId: "",
-      });
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.stop_desktop_daemon()).resolves.toEqual({
-      serverId: "",
-      status: "stopped",
-      listen: null,
-      hostname: null,
-      pid: null,
-      home: mocks.paseoHome,
-      version: null,
-      desktopManaged: false,
-      error: null,
-    });
-
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenNthCalledWith(1, [
-      "daemon",
-      "status",
-      "--json",
-    ]);
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenNthCalledWith(2, [
-      "daemon",
-      "stop",
-      "--json",
-      "--timeout",
-      "5",
-      "--force",
-      "--kill-timeout",
-      "5",
-    ]);
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenNthCalledWith(3, [
-      "daemon",
-      "status",
-      "--json",
-    ]);
-    expect(mocks.logInfo).toHaveBeenCalledWith(
-      "[desktop daemon]",
-      "desktop daemon stop requested",
-      expect.objectContaining({
-        reason: "manual_ipc",
-        statusBefore: expect.objectContaining({
-          status: "running",
-          pid: 4242,
-          serverId: "server-1",
-          desktopManaged: true,
-        }),
-      }),
-    );
-    expect(mocks.logInfo).toHaveBeenCalledWith(
-      "[desktop daemon]",
-      "desktop daemon stop completed",
-      expect.objectContaining({
-        reason: "manual_ipc",
-        cliResult: { action: "stopped" },
-        statusAfter: expect.objectContaining({
-          status: "stopped",
-          serverId: null,
-        }),
-      }),
-    );
-  });
-
-  it("routes stale reachable desktop daemon stops through external CLI daemon stop", async () => {
-    mocks.runExternalCliJsonCommand
-      .mockResolvedValueOnce({
-        localDaemon: "stale_pid",
-        connectedDaemon: "reachable",
-        serverId: "server-1",
-        pid: 7675,
-        listen: "127.0.0.1:6767",
-        daemonVersion: "1.2.2",
-        desktopManaged: true,
-      })
-      .mockResolvedValueOnce({ action: "stopped" })
-      .mockResolvedValueOnce({
-        localDaemon: "stopped",
-        connectedDaemon: "unreachable",
-        serverId: "",
-      });
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.stop_desktop_daemon()).resolves.toEqual({
-      serverId: "",
-      status: "stopped",
-      listen: null,
-      hostname: null,
-      pid: null,
-      home: mocks.paseoHome,
-      version: null,
-      desktopManaged: false,
-      error: null,
-    });
-
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenNthCalledWith(2, [
-      "daemon",
-      "stop",
-      "--json",
-      "--timeout",
-      "5",
-      "--force",
-      "--kill-timeout",
-      "5",
-    ]);
-  });
-
-  it("records the renderer stop reason when stopping the desktop daemon", async () => {
-    mocks.runExternalCliJsonCommand
-      .mockResolvedValueOnce({
-        localDaemon: "running",
-        serverId: "server-1",
-        pid: 4242,
-        listen: "127.0.0.1:6767",
-        desktopManaged: true,
-      })
-      .mockResolvedValueOnce({ action: "stopped", reason: "lifecycle_shutdown_rpc" })
-      .mockResolvedValueOnce({
-        localDaemon: "stopped",
-        serverId: "",
-      });
-    const handlers = createDaemonCommandHandlers();
-
-    await handlers.stop_desktop_daemon({ reason: "host_remove" });
-
-    expect(mocks.logInfo).toHaveBeenCalledWith(
-      "[desktop daemon]",
-      "desktop daemon stop requested",
-      expect.objectContaining({ reason: "host_remove" }),
-    );
-    expect(mocks.logInfo).toHaveBeenCalledWith(
-      "[desktop daemon]",
-      "desktop daemon stop completed",
-      expect.objectContaining({
-        reason: "host_remove",
-        cliResult: { action: "stopped", reason: "lifecycle_shutdown_rpc" },
-      }),
-    );
-  });
-
-  it("uses a stale reachable desktop daemon when the version matches", async () => {
-    mocks.runExternalCliJsonCommand.mockResolvedValue({
-      localDaemon: "stale_pid",
-      connectedDaemon: "reachable",
-      serverId: "server-1",
-      pid: 7675,
-      listen: "127.0.0.1:6767",
-      hostname: "dev-host",
-      daemonVersion: "1.2.3",
-      desktopManaged: true,
-    });
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.start_desktop_daemon()).resolves.toEqual({
-      serverId: "server-1",
-      status: "running",
-      listen: "127.0.0.1:6767",
-      hostname: "dev-host",
-      pid: null,
-      home: mocks.paseoHome,
-      version: "1.2.3",
-      desktopManaged: true,
-      error: null,
-    });
-
-    expect(mocks.spawnProcess).not.toHaveBeenCalled();
-  });
-
-  it("restarts a stale reachable desktop daemon when the version differs", async () => {
-    mocks.runExternalCliJsonCommand
-      .mockResolvedValueOnce({
-        localDaemon: "stale_pid",
-        connectedDaemon: "reachable",
-        serverId: "server-1",
-        pid: 7675,
-        listen: "127.0.0.1:6767",
-        hostname: "dev-host",
-        daemonVersion: "1.2.2",
-        desktopManaged: true,
-      })
-      .mockResolvedValueOnce({
-        localDaemon: "stale_pid",
-        connectedDaemon: "reachable",
-        serverId: "server-1",
-        pid: 7675,
-        listen: "127.0.0.1:6767",
-        daemonVersion: "1.2.2",
-        desktopManaged: true,
-      })
-      .mockResolvedValueOnce({ action: "stopped" })
-      .mockResolvedValueOnce({
-        localDaemon: "stopped",
-        connectedDaemon: "unreachable",
-        serverId: "",
-      })
-      .mockResolvedValueOnce({
-        localDaemon: "running",
-        connectedDaemon: "reachable",
-        serverId: "server-2",
-        pid: 8888,
-        listen: "127.0.0.1:6767",
-        hostname: "dev-host",
-        daemonVersion: "1.2.3",
-        desktopManaged: true,
-      });
-    mocks.spawnProcess.mockReturnValue(createMockChildProcess());
-    const handlers = createDaemonCommandHandlers();
-
-    await expect(handlers.start_desktop_daemon()).resolves.toEqual({
-      serverId: "server-2",
-      status: "running",
-      listen: "127.0.0.1:6767",
-      hostname: "dev-host",
-      pid: 8888,
-      home: mocks.paseoHome,
-      version: "1.2.3",
-      desktopManaged: true,
-      error: null,
-    });
-
-    expect(mocks.runExternalCliJsonCommand).toHaveBeenNthCalledWith(3, [
-      "daemon",
-      "stop",
-      "--json",
-      "--timeout",
-      "5",
-      "--force",
-      "--kill-timeout",
-      "5",
-    ]);
-    expect(mocks.spawnProcess).toHaveBeenCalled();
-  });
-
-  it("starts the managed daemon detached from desktop stdio and reports daemon log failures", async () => {
-    mkdirSync(mocks.paseoHome, { recursive: true });
-    writeFileSync(
-      `${mocks.paseoHome}/daemon.log`,
-      ["old log line", "recent daemon failure"].join("\n"),
-    );
-    mocks.runExternalCliJsonCommand.mockResolvedValue({
-      localDaemon: "stopped",
-      connectedDaemon: "unreachable",
-      serverId: "",
-    });
-    mocks.spawnProcess.mockImplementation(() => {
-      const child = createMockChildProcess();
-      scheduleFailedStartup(child);
-      return child;
-    });
-    const handlers = createDaemonCommandHandlers();
-
-    let thrown: Error | null = null;
-    try {
-      await handlers.start_desktop_daemon();
-    } catch (error) {
-      thrown = error instanceof Error ? error : new Error(String(error));
-    }
-
-    expect(thrown).toBeInstanceOf(Error);
-    const message = thrown?.message ?? "";
-    const recentLogsLabel = message.match(/Recent logs \(([^)]*)\):/)?.[1];
-    expect(message).toContain("Daemon failed to start: exit code 1");
-    expect(recentLogsLabel?.split(/[\\/]/).at(-1)).toBe("daemon.log");
-    expect(message).toContain("recent daemon failure");
-    expect(mocks.createNodeEntrypointInvocation).toHaveBeenCalledWith(
-      expect.objectContaining({ args: [] }),
-    );
-    expect(mocks.spawnProcess).toHaveBeenCalledWith(
-      "node",
-      [],
-      expect.objectContaining({
-        detached: true,
-        stdio: ["ignore", "ignore", "ignore"],
-        envOverlay: expect.objectContaining({
-          PASEO_CLI: getBundledCliShimPath(),
-          PASEO_WEB_UI_ENABLED: "false",
-        }),
-      }),
-    );
-  });
-
-  it("passes stale lock reclaim only after a live desktop daemon is confirmed unresponsive", async () => {
-    mocks.runExternalCliJsonCommand.mockResolvedValue({
-      localDaemon: "unresponsive",
-      connectedDaemon: "unreachable",
-      serverId: "",
-      pid: 7675,
-      listen: "127.0.0.1:6767",
-      desktopManaged: true,
-    });
-    mocks.spawnProcess.mockImplementation(() => {
-      const child = createMockChildProcess();
-      scheduleFailedStartup(child);
-      return child;
-    });
-
-    await expect(createDaemonCommandHandlers().start_desktop_daemon()).rejects.toThrow(
-      "Daemon failed to start: exit code 1",
-    );
-
-    expect(mocks.createNodeEntrypointInvocation).toHaveBeenCalledWith(
-      expect.objectContaining({ args: ["--reclaim-stale-pid-lock"] }),
-    );
-  });
-
-  it("does not pass stale lock reclaim when the status command fails", async () => {
-    mocks.runExternalCliJsonCommand.mockRejectedValue(new Error("status command failed"));
-    mocks.spawnProcess.mockImplementation(() => {
-      const child = createMockChildProcess();
-      scheduleFailedStartup(child);
-      return child;
-    });
-
-    await expect(createDaemonCommandHandlers().start_desktop_daemon()).rejects.toThrow(
-      "Daemon failed to start: exit code 1",
-    );
-
-    expect(mocks.createNodeEntrypointInvocation).toHaveBeenCalledWith(
-      expect.objectContaining({ args: [] }),
-    );
+    rmSync(fixtureRoot, { recursive: true, force: true });
   });
 
   it("returns the Electron main-process log tail from electron-log", () => {
@@ -515,4 +115,64 @@ describe("daemon-manager commands", () => {
       ),
     });
   });
+
+  it("exposes updater diagnostics through the desktop command boundary", () => {
+    const diagnostics = createDaemonCommandHandlers().desktop_update_diagnostics();
+
+    expect(diagnostics).toMatchObject({
+      platform: process.platform,
+      currentVersion: "1.2.3",
+    });
+  });
+
+  it("reports a stopped daemon without launching the CLI when no local daemon runs", async () => {
+    mkdirSync(mocks.paseoHome);
+    writeFileSync(path.join(mocks.paseoHome, "server-id"), "srv_existing\n");
+    mocks.runExternalCliJsonCommand.mockResolvedValue({
+      home: mocks.paseoHome,
+      pid: null,
+      startedAt: null,
+      listen: null,
+      hostname: null,
+      localDaemon: "stopped",
+      desktopManaged: false,
+      connectedDaemon: "not_probed",
+    });
+
+    const status = await createDaemonCommandHandlers().desktop_daemon_status();
+
+    expect(status).toMatchObject({ serverId: "", status: "stopped", pid: null });
+    expect(mocks.runExternalCliJsonCommand).not.toHaveBeenCalled();
+  });
+
+  it("reports an errored daemon when the local daemon state cannot be read", async () => {
+    mkdirSync(mocks.paseoHome);
+    writeFileSync(path.join(mocks.paseoHome, "paseo.pid"), "garbage");
+
+    const status = await createDaemonCommandHandlers().desktop_daemon_status();
+
+    expect(status).toMatchObject({ serverId: "", status: "errored", pid: null });
+    expect(status.error).toBeTruthy();
+  });
+
+  it("returns a local credential only for its live managed daemon listen", async () => {
+    mkdirSync(mocks.paseoHome);
+    const token = "a".repeat(43);
+    writeFileSync(path.join(mocks.paseoHome, "local-credential"), `${token}\n`, { mode: 0o600 });
+    const lock = {
+      pid: process.pid,
+      startedAt: new Date().toISOString(),
+      hostname: hostname(),
+      uid: process.getuid?.() ?? 0,
+      listen: "127.0.0.1:6799",
+      desktopManaged: true,
+    };
+    const lockPath = path.join(mocks.paseoHome, "paseo.pid");
+    writeFileSync(lockPath, JSON.stringify(lock));
+    const handler = createDaemonCommandHandlers().desktop_local_credential;
+    expect(await handler({ listen: "localhost:6799" })).toBe(token);
+    expect(await handler({ listen: "remote:6799" })).toBeNull();
+    writeFileSync(lockPath, JSON.stringify({ ...lock, desktopManaged: false }));
+    expect(await handler({ listen: "localhost:6799" })).toBeNull();
+  });
 });
diff --git a/packages/desktop/src/daemon/daemon-manager.ts b/packages/desktop/src/daemon/daemon-manager.ts
index c565b226f3..5f3f5394c6 100644
--- a/packages/desktop/src/daemon/daemon-manager.ts
+++ b/packages/desktop/src/daemon/daemon-manager.ts
@@ -1,9 +1,17 @@
-import { type ChildProcess } from "node:child_process";
 import { readFileSync } from "node:fs";
 import path from "node:path";
 import { app, ipcMain, powerMonitor } from "electron";
 import log from "electron-log/main";
-import { resolvePaseoHome, spawnProcess } from "@getpaseo/server";
+import {
+  resolvePaseoHome,
+  startDaemonInstance,
+  DaemonInstanceError,
+  stopDaemonInstance,
+  readDaemonInstance,
+  isSameDaemonInstance,
+  readLocalCredentialForTarget,
+  type DaemonInstance,
+} from "@getpaseo/server/daemon-control";
 import {
   copyAttachmentFileToManagedStorage,
   deleteManagedAttachmentFile,
@@ -37,7 +45,9 @@ import {
 import type { DesktopSettings } from "../settings/desktop-settings.js";
 import { getDesktopSettingsStore } from "../settings/desktop-settings-electron.js";
 import { isRunningUnderARM64Translation } from "../system/arm64-translation.js";
+import { describeSandbox } from "../diagnostics/sandbox.js";
 import { getDesktopAppLogs } from "../diagnostics/app-logs.js";
+import { getDesktopUpdaterDiagnostics } from "../diagnostics/updater.js";
 import {
   deleteLegacySkillSelection,
   readLegacySkillSelection,
@@ -45,9 +55,7 @@ import {
 import { tailFile } from "../diagnostics/tail-file.js";
 
 const DAEMON_LOG_FILENAME = "daemon.log";
-const STARTUP_POLL_INTERVAL_MS = 200;
-const STARTUP_POLL_MAX_ATTEMPTS = 150;
-const DETACHED_STARTUP_GRACE_MS = 1200;
+let ownedLaunch: { home: string; instance: DaemonInstance } | null = null;
 
 type DesktopDaemonState = "starting" | "running" | "stopped" | "errored";
 const DESKTOP_DAEMON_STOP_REASON_VALUES = [
@@ -73,6 +81,8 @@ export interface DesktopDaemonStatus {
   home: string;
   version: string | null;
   desktopManaged: boolean;
+  ownedByDesktop: boolean;
+  startedAt: string | null;
   error: string | null;
 }
 
@@ -122,73 +132,19 @@ function logFilePath(): string {
 }
 
 export function isDesktopManagedDaemonRunningSync(): boolean {
+  if (!ownedLaunch) return false;
   try {
-    const raw = readFileSync(path.join(getPaseoHome(), "paseo.pid"), "utf-8");
-    const lock = JSON.parse(raw) as { pid?: unknown; desktopManaged?: unknown };
-    if (lock.desktopManaged !== true) return false;
-    if (typeof lock.pid !== "number" || !Number.isInteger(lock.pid)) return false;
-    return isProcessRunning(lock.pid);
+    const lock = JSON.parse(readFileSync(path.join(ownedLaunch.home, "paseo.pid"), "utf8"));
+    return isSameDaemonInstance(lock, ownedLaunch.instance) && isProcessRunning(lock.pid);
   } catch {
     return false;
   }
 }
 
-function summarizeDesktopDaemonStatus(status: DesktopDaemonStatus): Record<string, unknown> {
-  return {
-    status: status.status,
-    pid: status.pid,
-    listen: status.listen,
-    serverId: status.serverId || null,
-    version: status.version,
-    desktopManaged: status.desktopManaged,
-    error: status.error,
-  };
-}
-
-const DESKTOP_DAEMON_STOP_CLI_ARGS = [
-  "daemon",
-  "stop",
-  "--json",
-  "--timeout",
-  "5",
-  "--force",
-  "--kill-timeout",
-  "5",
-];
-
-async function runDesktopDaemonStopViaCli({
-  reason,
-  statusBefore,
-  resolveStatusAfter = false,
-}: {
-  reason: DesktopDaemonStopReason;
-  statusBefore?: DesktopDaemonStatus | null;
-  resolveStatusAfter?: boolean;
-}): Promise<{
-  cliResult: unknown;
-  statusAfter: DesktopDaemonStatus | null;
-}> {
-  logDesktopDaemonLifecycle("desktop daemon stop requested", {
-    reason,
-    statusBefore: statusBefore ? summarizeDesktopDaemonStatus(statusBefore) : null,
-  });
-
-  const cliResult = await runExternalCliJsonCommand(DESKTOP_DAEMON_STOP_CLI_ARGS);
-  const statusAfter = resolveStatusAfter ? await resolveDesktopDaemonStatus() : null;
-
-  logDesktopDaemonLifecycle("desktop daemon stop completed", {
-    reason,
-    cliResult,
-    statusAfter: statusAfter ? summarizeDesktopDaemonStatus(statusAfter) : null,
-  });
-
-  return { cliResult, statusAfter };
-}
-
 export async function stopDesktopDaemonViaCli(
   reason: DesktopDaemonStopReason = DEFAULT_DESKTOP_DAEMON_STOP_REASON,
 ): Promise<void> {
-  await runDesktopDaemonStopViaCli({ reason });
+  await stopDesktopDaemon(reason);
 }
 
 function isProcessRunning(pid: number): boolean {
@@ -203,12 +159,6 @@ function isProcessRunning(pid: number): boolean {
   }
 }
 
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
-
 function logDesktopDaemonLifecycle(message: string, details?: Record<string, unknown>): void {
   log.info("[desktop daemon]", message, {
     pid: process.pid,
@@ -221,25 +171,27 @@ function statusFromDaemonProbe(
   home: string,
 ): DesktopDaemonStatus {
   const local = typeof payload.localDaemon === "string" ? payload.localDaemon : "stopped";
-  const reachable = payload.connectedDaemon === "reachable";
-  const processAlive = local === "running";
-  const stalledProcess = local === "unresponsive";
+  const processAlive = local === "running" || local === "not_ready";
   let status: DesktopDaemonState = "stopped";
-  if (reachable || processAlive) {
-    status = "running";
-  } else if (stalledProcess) {
-    status = "errored";
-  }
+  if (local === "not_ready") status = "starting";
+  if (local === "running") status = "running";
   return {
     serverId: typeof payload.serverId === "string" ? payload.serverId : "",
     status,
     listen: typeof payload.listen === "string" ? payload.listen : null,
     hostname:
       status === "running" && typeof payload.hostname === "string" ? payload.hostname : null,
-    pid: (processAlive || stalledProcess) && typeof payload.pid === "number" ? payload.pid : null,
+    pid: processAlive && typeof payload.pid === "number" ? payload.pid : null,
     home,
     version: typeof payload.daemonVersion === "string" ? payload.daemonVersion : null,
     desktopManaged: payload.desktopManaged === true,
+    startedAt: typeof payload.startedAt === "string" ? payload.startedAt : null,
+    ownedByDesktop: Boolean(
+      ownedLaunch &&
+      ownedLaunch.home === home &&
+      payload.pid === ownedLaunch.instance.pid &&
+      payload.startedAt === ownedLaunch.instance.startedAt,
+    ),
     error: null,
   };
 }
@@ -272,23 +224,34 @@ export async function resolveDesktopDaemonStatus(): Promise<DesktopDaemonStatus>
   const home = getPaseoHome();
 
   try {
-    const payload = (await runExternalCliJsonCommand(["daemon", "status", "--json"])) as Record<
-      string,
-      unknown
-    >;
+    // The app polls this while no local daemon runs. Answer that case in-process,
+    // since launching the CLI once per poll keeps spawning processes while idle.
+    if (!(await readDaemonInstance(home))) {
+      return statusFromDaemonProbe({ localDaemon: "stopped" }, home);
+    }
+
+    const payload = (await runExternalCliJsonCommand([
+      "daemon",
+      "status",
+      "--home",
+      home,
+      "--json",
+    ])) as Record<string, unknown>;
     return statusFromDaemonProbe(payload, home);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    logDesktopDaemonLifecycle("resolveStatus CLI command failed", { error: errorMessage });
+    logDesktopDaemonLifecycle("resolveStatus failed", { error: errorMessage });
     return {
       serverId: "",
-      status: "stopped",
+      status: "errored",
       listen: null,
       hostname: null,
       pid: null,
       home,
       version: null,
       desktopManaged: false,
+      ownedByDesktop: false,
+      startedAt: null,
       error: errorMessage,
     };
   }
@@ -301,7 +264,7 @@ function normalizeVersion(version: string | null): string | null {
 }
 
 function shouldRestartForVersion(current: DesktopDaemonStatus): boolean {
-  if (!current.desktopManaged) return false;
+  if (!current.ownedByDesktop) return false;
   const appVersion = normalizeVersion(resolveDesktopAppVersion());
   const daemonVersion = normalizeVersion(current.version);
   return Boolean(appVersion && daemonVersion && appVersion !== daemonVersion);
@@ -313,40 +276,6 @@ function assertBuiltInDaemonManagementEnabled(settings: DesktopSettings): void {
   }
 }
 
-function buildStartupFailureError(result: {
-  code: number | null;
-  signal: string | null;
-  error?: Error;
-}): Error {
-  const reason = result.error
-    ? result.error.message
-    : `exit code ${result.code ?? "unknown"}${result.signal ? ` (${result.signal})` : ""}`;
-  const parts = [`Daemon failed to start: ${reason}`];
-  const logs = tailFile(logFilePath(), 15);
-  if (logs) parts.push(`Recent logs (${logFilePath()}):\n${logs}`);
-  return new Error(parts.join("\n\n"));
-}
-
-async function pollForRunningDaemon(): Promise<DesktopDaemonStatus> {
-  async function poll(attempt: number): Promise<DesktopDaemonStatus> {
-    if (attempt >= STARTUP_POLL_MAX_ATTEMPTS) return resolveDesktopDaemonStatus();
-    const status = await resolveDesktopDaemonStatus();
-    if (attempt === 0 || attempt === STARTUP_POLL_MAX_ATTEMPTS - 1 || attempt % 10 === 9) {
-      logDesktopDaemonLifecycle("polling daemon status after detached start", {
-        attempt: attempt + 1,
-        status: status.status,
-        pid: status.pid,
-        listen: status.listen,
-        serverId: status.serverId || null,
-      });
-    }
-    if (status.status === "running" && status.serverId && status.listen) return status;
-    await sleep(STARTUP_POLL_INTERVAL_MS);
-    return poll(attempt + 1);
-  }
-  return poll(0);
-}
-
 async function startDaemon(): Promise<DesktopDaemonStatus> {
   assertBuiltInDaemonManagementEnabled(await getDesktopSettingsStore().get());
 
@@ -359,7 +288,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
     error: current.error,
     desktopManaged: current.desktopManaged,
   });
-  if (current.status === "running") {
+  if (current.status === "running" || current.status === "starting") {
     if (shouldRestartForVersion(current)) {
       logDesktopDaemonLifecycle("daemon version mismatch, restarting", {
         appVersion: normalizeVersion(resolveDesktopAppVersion()),
@@ -371,118 +300,69 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
     }
   }
 
-  const daemonRunner = resolveDaemonRunnerEntrypoint();
-  const reclaimStalePidLock =
-    current.status === "errored" && current.desktopManaged && current.error === null;
+  const home = getPaseoHome();
   const invocation = createNodeEntrypointInvocation({
-    entrypoint: daemonRunner,
+    entrypoint: resolveDaemonRunnerEntrypoint(),
     argvMode: "node-script",
-    args: reclaimStalePidLock ? ["--reclaim-stale-pid-lock"] : [],
+    args: [],
     baseEnv: process.env,
   });
-
-  logDesktopDaemonLifecycle("starting detached daemon", {
-    appIsPackaged: app.isPackaged,
-    daemonRunnerEntry: daemonRunner.entryPath,
-    daemonRunnerExecArgv: daemonRunner.execArgv,
-    command: invocation.command,
-    args: invocation.args,
-    electronRunAsNode: invocation.env.ELECTRON_RUN_AS_NODE ?? null,
-    parentExecPath: process.execPath,
-    parentElectronRunAsNode: process.env.ELECTRON_RUN_AS_NODE ?? null,
-    electronVersion: process.versions.electron ?? null,
-    nodeVersion: process.versions.node,
-    platform: process.platform,
-    arch: process.arch,
-  });
-
-  const child: ChildProcess = spawnProcess(invocation.command, invocation.args, {
-    detached: true,
-    envMode: "internal",
-    env: invocation.env,
-    envOverlay: {
-      PASEO_DESKTOP_MANAGED: "1",
-      PASEO_CLI: getBundledCliShimPath(),
-      PASEO_WEB_UI_ENABLED: "false",
-    },
-    stdio: ["ignore", "ignore", "ignore"],
-  });
-
-  logDesktopDaemonLifecycle("detached spawn returned", {
-    childPid: child.pid ?? null,
-    spawnfile: child.spawnfile,
-    spawnargs: child.spawnargs,
-  });
-
-  child.unref();
-
-  type GraceResult =
-    | { exitedEarly: false }
-    | { exitedEarly: true; code: number | null; signal: string | null; error?: Error };
-
-  const result = await new Promise<GraceResult>((resolve) => {
-    let settled = false;
-    const finish = (value: GraceResult) => {
-      if (settled) return;
-      settled = true;
-      resolve(value);
-    };
-
-    const timer = setTimeout(() => finish({ exitedEarly: false }), DETACHED_STARTUP_GRACE_MS);
-
-    child.once("error", (error) => {
-      clearTimeout(timer);
-      finish({ exitedEarly: true, code: null, signal: null, error });
+  try {
+    await startDaemonInstance({
+      home,
+      timeoutMs: 30_000,
+      ...invocation,
+      env: { ...invocation.env, PASEO_CLI: getBundledCliShimPath() },
+      mode: "managed",
+      desktopManaged: true,
+      onAcquired: (instance) => {
+        ownedLaunch = { home, instance };
+      },
     });
-    child.once("exit", (code, signal) => {
-      clearTimeout(timer);
-      finish({ exitedEarly: true, code, signal });
-    });
-  });
-
-  logDesktopDaemonLifecycle("detached startup grace period completed", {
-    childPid: child.pid ?? null,
-    exitedEarly: result.exitedEarly,
-    ...(result.exitedEarly
-      ? {
-          exitCode: result.code,
-          signal: result.signal,
-          error: result.error?.message ?? null,
-        }
-      : {}),
-  });
-
-  if (result.exitedEarly) {
-    throw buildStartupFailureError(result);
+  } catch (error) {
+    if (!(error instanceof DaemonInstanceError && error.code === "DAEMON_NOT_READY")) throw error;
   }
-
-  return pollForRunningDaemon();
+  return resolveDesktopDaemonStatus();
 }
 
 export async function stopDesktopDaemon(
   reason: DesktopDaemonStopReason = DEFAULT_DESKTOP_DAEMON_STOP_REASON,
+  confirmedInstance?: { pid: number; startedAt: string },
 ): Promise<DesktopDaemonStatus> {
-  const status = await resolveDesktopDaemonStatus();
-  if (status.status !== "running") {
-    logDesktopDaemonLifecycle("desktop daemon stop skipped", {
-      reason,
-      statusBefore: summarizeDesktopDaemonStatus(status),
-    });
-    return status;
-  }
-
-  const { statusAfter } = await runDesktopDaemonStopViaCli({
-    reason,
-    statusBefore: status,
-    resolveStatusAfter: true,
+  const home = getPaseoHome();
+  const instance = await readDaemonInstance(home);
+  const owned = Boolean(
+    instance &&
+    ownedLaunch &&
+    ownedLaunch.home === home &&
+    isSameDaemonInstance(instance, ownedLaunch.instance),
+  );
+  const explicit =
+    reason === "manual_ipc" &&
+    confirmedInstance &&
+    instance &&
+    instance.pid === confirmedInstance.pid &&
+    instance.startedAt === confirmedInstance.startedAt;
+  if (confirmedInstance && !explicit)
+    throw new Error(
+      "Daemon changed since confirmation; inspect its current home and PID before stopping it.",
+    );
+  if (!instance || (!owned && !explicit)) return resolveDesktopDaemonStatus();
+  logDesktopDaemonLifecycle("stopping captured supervisor", { reason, pid: instance.pid, owned });
+  await stopDaemonInstance(home, {
+    instance,
+    timeoutMs: 15_000,
+    requestShutdown: async (ready) => {
+      await runExternalCliJsonCommand(["daemon", "stop", "--host", ready.listen, "--json"]);
+    },
   });
-  return statusAfter ?? (await resolveDesktopDaemonStatus());
+  if (owned) ownedLaunch = null;
+  return resolveDesktopDaemonStatus();
 }
 
 async function restartDaemon(): Promise<DesktopDaemonStatus> {
-  assertBuiltInDaemonManagementEnabled(await getDesktopSettingsStore().get());
-  await stopDesktopDaemon("restart");
-  return startDaemon();
+  await runExternalCliJsonCommand(["daemon", "restart", "--home", getPaseoHome(), "--json"]);
+  return resolveDesktopDaemonStatus();
 }
 
 function getDaemonLogs(): DesktopDaemonLogs {
@@ -494,7 +374,7 @@ function getDaemonLogs(): DesktopDaemonLogs {
 }
 
 async function getCliDaemonStatus(): Promise<string> {
-  return await runExternalCliTextCommand(["daemon", "status"]);
+  return await runExternalCliTextCommand(["daemon", "status", "--home", getPaseoHome()]);
 }
 
 async function getLocalDaemonVersion(): Promise<{ version: string | null; error: string | null }> {
@@ -526,11 +406,28 @@ export function createDaemonCommandHandlers(): Record<string, DesktopCommandHand
       runningUnderARM64Translation: isRunningUnderARM64Translation(),
     }),
     desktop_daemon_status: () => resolveDesktopDaemonStatus(),
+    desktop_local_credential: async (args) => {
+      const instance = await readDaemonInstance(getPaseoHome());
+      if (!instance?.desktopManaged || typeof args?.listen !== "string") return null;
+      return readLocalCredentialForTarget(getPaseoHome(), args.listen);
+    },
     start_desktop_daemon: () => startDaemon(),
-    stop_desktop_daemon: (args) => stopDesktopDaemon(parseDesktopDaemonStopReason(args)),
+    stop_desktop_daemon: (args) =>
+      stopDesktopDaemon(
+        parseDesktopDaemonStopReason(args),
+        typeof args?.pid === "number" && typeof args.startedAt === "string"
+          ? { pid: args.pid, startedAt: args.startedAt }
+          : undefined,
+      ),
     restart_desktop_daemon: () => restartDaemon(),
     desktop_daemon_logs: () => getDaemonLogs(),
+    desktop_sandbox_diagnostics: () =>
+      describeSandbox({
+        disabled: app.commandLine.hasSwitch("no-sandbox"),
+        launcherReason: process.env.PASEO_DESKTOP_SANDBOX_REASON,
+      }),
     desktop_app_logs: () => getDesktopAppLogs(),
+    desktop_update_diagnostics: () => getDesktopUpdaterDiagnostics(),
     desktop_get_system_idle_time: () => powerMonitor.getSystemIdleTime() * 1000,
     cli_daemon_status: () => getCliDaemonStatus(),
     write_attachment_base64: (args) => writeAttachmentBase64(args ?? {}),
diff --git a/packages/desktop/src/daemon/desktop-packaging.test.ts b/packages/desktop/src/daemon/desktop-packaging.test.ts
index cbea764dcb..f38e679d3e 100644
--- a/packages/desktop/src/daemon/desktop-packaging.test.ts
+++ b/packages/desktop/src/daemon/desktop-packaging.test.ts
@@ -63,6 +63,22 @@ function createFakeMacBundle(options: { includeHelper: boolean }): {
 }
 
 describe("desktop packaging", () => {
+  it("uses an Electron runtime whose Squirrel handoff explicitly wakes ShipIt", () => {
+    const pkg = JSON.parse(readFileSync(join(packageRoot, "package.json"), "utf8")) as {
+      devDependencies?: Record<string, string>;
+    };
+    const electronVersion = pkg.devDependencies?.electron ?? "0.0.0";
+    const electronMajor = Number(electronVersion.split(".")[0]);
+
+    expect(electronMajor).toBeGreaterThanOrEqual(44);
+  });
+
+  it("requires macOS 13 or newer in the packaged application", () => {
+    const config = readFileSync(join(packageRoot, "electron-builder.yml"), "utf8");
+
+    expect(config).toContain('minimumSystemVersion: "13.0.0"');
+  });
+
   it("unpacks server zsh shell integration files for external shells", () => {
     const config = readFileSync(join(packageRoot, "electron-builder.yml"), "utf8");
 
@@ -161,3 +177,16 @@ describe("desktop packaging", () => {
     }
   });
 });
+
+it("installs the Linux helper as root-owned 4755 regardless of root's namespace access", () => {
+  const config = readFileSync(join(packageRoot, "electron-builder.yml"), "utf8");
+  expect(config).toContain("afterInstall: scripts/linux-sandbox/after-install.tpl");
+  const installer = readFileSync(
+    join(packageRoot, "scripts/linux-sandbox/after-install.tpl"),
+    "utf8",
+  );
+  expect(installer).not.toContain("unshare");
+  expect(installer).toContain("chown root:root '/opt/${sanitizedProductName}/chrome-sandbox'");
+  expect(installer).toContain("chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox'");
+  expect(installer).not.toContain("chmod 0755");
+});
diff --git a/packages/desktop/src/daemon/linux-launcher.posix.test.ts b/packages/desktop/src/daemon/linux-launcher.posix.test.ts
new file mode 100644
index 0000000000..ba7a8ec02b
--- /dev/null
+++ b/packages/desktop/src/daemon/linux-launcher.posix.test.ts
@@ -0,0 +1,123 @@
+import { spawnSync } from "node:child_process";
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+
+// The launcher reads Linux /proc state as well as POSIX command interfaces.
+const it = test.runIf(process.platform === "linux");
+
+const require = createRequire(import.meta.url);
+const afterPack = require("../../scripts/after-pack.js").default;
+
+async function launch(
+  options: {
+    namespaces?: boolean;
+    helper?: string;
+    mount?: string;
+    env?: NodeJS.ProcessEnv;
+    args?: string[];
+    symlink?: boolean;
+    rerun?: boolean;
+  } = {},
+) {
+  const root = mkdtempSync(join(tmpdir(), "paseo-launcher-"));
+  try {
+    const app = join(root, "app with spaces");
+    const commands = join(root, "commands");
+    mkdirSync(app);
+    mkdirSync(commands);
+    writeFileSync(
+      join(app, "Paseo"),
+      `#!${process.execPath}\nconsole.log(JSON.stringify(process.argv.slice(2)));\n`,
+    );
+    chmodSync(join(app, "Paseo"), 0o755);
+    // The command interface represents the host's userns policy, independent of CI's host.
+    writeFileSync(join(commands, "unshare"), `#!/bin/sh\nexit ${options.namespaces ? 0 : 1}\n`);
+    chmodSync(join(commands, "unshare"), 0o755);
+    for (const [name, output] of Object.entries({
+      stat: options.helper ?? "1000:755",
+      findmnt: options.mount ?? "rw",
+    })) {
+      writeFileSync(join(commands, name), `#!/bin/sh\nprintf '%s\\n' '${output}'\n`);
+      chmodSync(join(commands, name), 0o755);
+    }
+    writeFileSync(join(app, "chrome-sandbox"), "helper");
+    chmodSync(join(app, "chrome-sandbox"), 0o755);
+    await afterPack({ appOutDir: app, electronPlatformName: "linux", arch: 1 });
+    if (options.rerun) await afterPack({ appOutDir: app, electronPlatformName: "linux", arch: 1 });
+    const executablePath = options.symlink ? join(root, "paseo") : join(app, "Paseo");
+    if (options.symlink) symlinkSync(join(app, "Paseo"), executablePath);
+    const args = options.args ?? ["path with spaces", "$(touch never)", "semi;colon", "*.txt"];
+    const result = spawnSync(executablePath, args, {
+      encoding: "utf8",
+      env: {
+        ...process.env,
+        FORCE_COLOR: undefined,
+        PATH: `${commands}:${process.env.PATH}`,
+        APPIMAGE: "/tmp/Paseo.AppImage",
+        PASEO_DESKTOP_SMOKE: "0",
+        ...options.env,
+      },
+    });
+    expect(result.status, result.stderr).toBe(0);
+    return { args: JSON.parse(result.stdout), stderr: result.stderr, input: args };
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+}
+
+it("launches a portable app with the fallback on argv when user namespaces are denied", async () => {
+  const result = await launch();
+  expect(result.args).toEqual(["--no-sandbox", ...result.input]);
+  expect(result.stderr).toContain("[linux-sandbox] disabled");
+});
+
+it("keeps sandboxing for AppImage when the real user can create namespaces", async () => {
+  const result = await launch({ namespaces: true });
+  expect(result.args).toEqual(result.input);
+  expect(result.stderr).toContain("[linux-sandbox] enabled: user namespaces available");
+});
+
+it("keeps sandboxing via the installed root-owned helper when userns is denied", async () => {
+  const result = await launch({ helper: "0:4755", env: { APPIMAGE: "" } });
+  expect(result.args).toEqual(result.input);
+  expect(result.stderr).toContain("[linux-sandbox] enabled: root-owned SUID helper available");
+});
+
+it("does not trust 4755 on a nosuid mount", async () => {
+  const result = await launch({ helper: "0:4755", mount: "rw,nosuid,nodev" });
+  expect(result.args).toEqual(["--no-sandbox", ...result.input]);
+});
+
+it("preserves sandbox flags and all Node entrypoint arguments without probing", async () => {
+  const result = await launch({ env: { ELECTRON_RUN_AS_NODE: "1" }, args: ["--version"] });
+  expect(result.args).toEqual(["--version"]);
+  expect(result.stderr).toBe("");
+});
+
+it("reports an explicit user override without injecting a duplicate", async () => {
+  const result = await launch({ namespaces: true, args: ["--no-sandbox", "--version"] });
+  expect(result.args).toEqual(result.input);
+  expect(result.stderr).toContain("[linux-sandbox] disabled: requested by --no-sandbox");
+});
+
+it("resolves symlink launches and keeps the real executable intact on repeated packaging", async () => {
+  const result = await launch({ symlink: true, rerun: true });
+  expect(result.args).toEqual(["--no-sandbox", ...result.input]);
+});
+
+it("does not depend on APPIMAGE being present for an extracted portable app", async () => {
+  const result = await launch({ env: { APPIMAGE: "" } });
+  expect(result.args).toEqual(["--no-sandbox", ...result.input]);
+});
+
+it("applies a debugging environment sandbox override before Chromium starts", async () => {
+  const result = await launch({
+    namespaces: true,
+    env: { PASEO_ELECTRON_FLAGS: "--disable-gpu\t--no-sandbox" },
+  });
+  expect(result.args).toEqual(["--no-sandbox", ...result.input]);
+  expect(result.stderr).toContain("requested by PASEO_ELECTRON_FLAGS");
+});
diff --git a/packages/desktop/src/daemon/runtime-paths.test.ts b/packages/desktop/src/daemon/runtime-paths.test.ts
index dbb456df87..7ed6e901ee 100644
--- a/packages/desktop/src/daemon/runtime-paths.test.ts
+++ b/packages/desktop/src/daemon/runtime-paths.test.ts
@@ -21,10 +21,6 @@ vi.mock("electron-log/main", () => ({
   default: { warn: vi.fn() },
 }));
 
-vi.mock("@getpaseo/server", () => ({
-  spawnProcess: vi.fn(),
-}));
-
 const originalPlatform = process.platform;
 const originalExecPath = process.execPath;
 const originalResourcesPath = process.resourcesPath;
diff --git a/packages/desktop/src/diagnostics/sandbox.test.ts b/packages/desktop/src/diagnostics/sandbox.test.ts
new file mode 100644
index 0000000000..e9e80040ca
--- /dev/null
+++ b/packages/desktop/src/diagnostics/sandbox.test.ts
@@ -0,0 +1,25 @@
+import { expect, it } from "vitest";
+import { describeSandbox } from "./sandbox";
+
+it("reports a portable fallback independently of the renderer's Node isolation setting", () => {
+  expect(
+    describeSandbox({
+      disabled: true,
+      launcherReason: "user namespaces unavailable; no usable SUID helper",
+    }),
+  ).toEqual({
+    enabled: false,
+    reason: "user namespaces unavailable; no usable SUID helper",
+  });
+});
+
+it("reports enabled defaults and explicit overrides without a packaged launcher", () => {
+  expect(describeSandbox({ disabled: false })).toEqual({
+    enabled: true,
+    reason: "Chromium default",
+  });
+  expect(describeSandbox({ disabled: true })).toEqual({
+    enabled: false,
+    reason: "requested by --no-sandbox",
+  });
+});
diff --git a/packages/desktop/src/diagnostics/sandbox.ts b/packages/desktop/src/diagnostics/sandbox.ts
new file mode 100644
index 0000000000..af10c25397
--- /dev/null
+++ b/packages/desktop/src/diagnostics/sandbox.ts
@@ -0,0 +1,10 @@
+export function describeSandbox(input: { disabled: boolean; launcherReason?: string }): {
+  enabled: boolean;
+  reason: string;
+} {
+  return {
+    enabled: !input.disabled,
+    reason:
+      input.launcherReason ?? (input.disabled ? "requested by --no-sandbox" : "Chromium default"),
+  };
+}
diff --git a/packages/desktop/src/diagnostics/updater.test.ts b/packages/desktop/src/diagnostics/updater.test.ts
new file mode 100644
index 0000000000..bfe43aceab
--- /dev/null
+++ b/packages/desktop/src/diagnostics/updater.test.ts
@@ -0,0 +1,141 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { afterEach, describe, expect, it } from "vitest";
+import { collectDesktopUpdaterDiagnostics } from "./updater";
+
+let testDirectory = "";
+
+afterEach(() => {
+  if (testDirectory) {
+    rmSync(testDirectory, { recursive: true, force: true });
+    testDirectory = "";
+  }
+});
+
+describe("desktop updater diagnostics", () => {
+  it("collects the staged version and existing ShipIt evidence", () => {
+    testDirectory = mkdtempSync(path.join(tmpdir(), "paseo-updater-diagnostics-"));
+    const shipItDirectory = path.join(testDirectory, "sh.paseo.desktop.ShipIt");
+    const updateBundlePath = path.join(shipItDirectory, "update.test", "Paseo.app");
+    mkdirSync(shipItDirectory, { recursive: true });
+    writeFileSync(
+      path.join(shipItDirectory, "ShipItState.plist"),
+      JSON.stringify({
+        launchAfterInstallation: true,
+        updateBundleURL: pathToFileURL(updateBundlePath).href,
+      }),
+    );
+    writeFileSync(path.join(shipItDirectory, "ShipIt_stdout.log"), "stdout evidence\n");
+    writeFileSync(path.join(shipItDirectory, "ShipIt_stderr.log"), "stderr evidence\n");
+
+    const diagnostics = collectDesktopUpdaterDiagnostics({
+      platform: "darwin",
+      currentVersion: "0.7.0",
+      cachePath: testDirectory,
+      readBundleVersion: (bundlePath) => (bundlePath === updateBundlePath ? "0.7.2" : null),
+    });
+
+    expect(diagnostics.currentVersion).toBe("0.7.0");
+    expect(diagnostics.targetVersion).toBe("0.7.2");
+    expect(diagnostics.targetVersionError).toBeNull();
+    expect(diagnostics.shipItDirectory).toBe(shipItDirectory);
+    expect(diagnostics.state).toMatchObject({ exists: true });
+    expect(diagnostics.stdout).toMatchObject({
+      exists: true,
+      contents: "stdout evidence",
+    });
+    expect(diagnostics.stderr).toMatchObject({
+      exists: true,
+      contents: "stderr evidence",
+    });
+    expect(diagnostics.state?.modifiedAt).not.toBeNull();
+  });
+
+  it("reports malformed ShipIt state without hiding other evidence", () => {
+    testDirectory = mkdtempSync(path.join(tmpdir(), "paseo-updater-diagnostics-"));
+    const shipItDirectory = path.join(testDirectory, "sh.paseo.desktop.ShipIt");
+    mkdirSync(shipItDirectory, { recursive: true });
+    writeFileSync(path.join(shipItDirectory, "ShipItState.plist"), "not JSON");
+    writeFileSync(path.join(shipItDirectory, "ShipIt_stderr.log"), "installer evidence\n");
+
+    const diagnostics = collectDesktopUpdaterDiagnostics({
+      platform: "darwin",
+      currentVersion: "0.7.0",
+      cachePath: testDirectory,
+      readBundleVersion: () => "unused",
+    });
+
+    expect(diagnostics.targetVersion).toBeNull();
+    expect(diagnostics.targetVersionError).toMatch(/JSON|Unexpected token/);
+    expect(diagnostics.stderr?.contents).toBe("installer evidence");
+  });
+
+  it("reports bundle version lookup failures", () => {
+    testDirectory = mkdtempSync(path.join(tmpdir(), "paseo-updater-diagnostics-"));
+    const shipItDirectory = path.join(testDirectory, "sh.paseo.desktop.ShipIt");
+    mkdirSync(shipItDirectory, { recursive: true });
+    writeFileSync(
+      path.join(shipItDirectory, "ShipItState.plist"),
+      JSON.stringify({ updateBundleURL: pathToFileURL(path.join(shipItDirectory, "Paseo.app")) }),
+    );
+
+    const diagnostics = collectDesktopUpdaterDiagnostics({
+      platform: "darwin",
+      currentVersion: "0.7.0",
+      cachePath: testDirectory,
+      readBundleVersion: () => {
+        throw new Error("plutil failed");
+      },
+    });
+
+    expect(diagnostics.targetVersion).toBeNull();
+    expect(diagnostics.targetVersionError).toBe("plutil failed");
+  });
+
+  it("keeps readable ShipIt evidence when another file cannot be read", () => {
+    testDirectory = mkdtempSync(path.join(tmpdir(), "paseo-updater-diagnostics-"));
+    const shipItDirectory = path.join(testDirectory, "sh.paseo.desktop.ShipIt");
+    mkdirSync(path.join(shipItDirectory, "ShipIt_stdout.log"), { recursive: true });
+    writeFileSync(path.join(shipItDirectory, "ShipIt_stderr.log"), "installer evidence\n");
+
+    const diagnostics = collectDesktopUpdaterDiagnostics({
+      platform: "darwin",
+      currentVersion: "0.7.0",
+      cachePath: testDirectory,
+      readBundleVersion: () => null,
+    });
+
+    expect(diagnostics.stdout).toMatchObject({
+      exists: true,
+      contents: "",
+      error: expect.any(String),
+    });
+    expect(diagnostics.stderr).toMatchObject({
+      exists: true,
+      contents: "installer evidence",
+      error: null,
+    });
+  });
+
+  it("does not look for ShipIt files outside macOS", () => {
+    const diagnostics = collectDesktopUpdaterDiagnostics({
+      platform: "linux",
+      currentVersion: "0.7.2",
+      cachePath: "/unused",
+      readBundleVersion: () => null,
+    });
+
+    expect(diagnostics).toEqual({
+      platform: "linux",
+      currentVersion: "0.7.2",
+      targetVersion: null,
+      targetVersionError: null,
+      shipItDirectory: null,
+      state: null,
+      stdout: null,
+      stderr: null,
+    });
+  });
+});
diff --git a/packages/desktop/src/diagnostics/updater.ts b/packages/desktop/src/diagnostics/updater.ts
new file mode 100644
index 0000000000..465c5d0390
--- /dev/null
+++ b/packages/desktop/src/diagnostics/updater.ts
@@ -0,0 +1,148 @@
+import { execFileSync } from "node:child_process";
+import { readFileSync, statSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { app } from "electron";
+import { tailFile } from "./tail-file.js";
+
+const SHIPIT_DIRECTORY_NAME = "sh.paseo.desktop.ShipIt";
+const SHIPIT_LOG_TAIL_LINES = 100;
+
+export interface DesktopUpdaterDiagnosticFile {
+  path: string;
+  exists: boolean;
+  modifiedAt: string | null;
+  contents: string;
+  error: string | null;
+}
+
+export interface DesktopUpdaterDiagnostics {
+  platform: NodeJS.Platform;
+  currentVersion: string;
+  targetVersion: string | null;
+  targetVersionError: string | null;
+  shipItDirectory: string | null;
+  state: DesktopUpdaterDiagnosticFile | null;
+  stdout: DesktopUpdaterDiagnosticFile | null;
+  stderr: DesktopUpdaterDiagnosticFile | null;
+}
+
+interface DesktopUpdaterDiagnosticEnvironment {
+  platform: NodeJS.Platform;
+  currentVersion: string;
+  cachePath: string;
+  readBundleVersion(bundlePath: string): string | null;
+}
+
+export function collectDesktopUpdaterDiagnostics(
+  environment: DesktopUpdaterDiagnosticEnvironment,
+): DesktopUpdaterDiagnostics {
+  const { platform, currentVersion, cachePath, readBundleVersion } = environment;
+  if (platform !== "darwin") {
+    return {
+      platform,
+      currentVersion,
+      targetVersion: null,
+      targetVersionError: null,
+      shipItDirectory: null,
+      state: null,
+      stdout: null,
+      stderr: null,
+    };
+  }
+
+  const shipItDirectory = path.join(cachePath, SHIPIT_DIRECTORY_NAME);
+  const state = readDiagnosticFile(path.join(shipItDirectory, "ShipItState.plist"));
+  const targetVersion = diagnoseTargetVersion(state.contents, readBundleVersion);
+  return {
+    platform,
+    currentVersion,
+    ...targetVersion,
+    shipItDirectory,
+    state,
+    stdout: readDiagnosticFile(path.join(shipItDirectory, "ShipIt_stdout.log"), true),
+    stderr: readDiagnosticFile(path.join(shipItDirectory, "ShipIt_stderr.log"), true),
+  };
+}
+
+export function getDesktopUpdaterDiagnostics(): DesktopUpdaterDiagnostics {
+  return collectDesktopUpdaterDiagnostics({
+    platform: process.platform,
+    currentVersion: app.getVersion(),
+    cachePath: path.join(app.getPath("home"), "Library", "Caches"),
+    readBundleVersion: readMacBundleVersion,
+  });
+}
+
+function readDiagnosticFile(filePath: string, tail = false): DesktopUpdaterDiagnosticFile {
+  let exists = false;
+  let modifiedAt: string | null = null;
+  try {
+    modifiedAt = statSync(filePath).mtime.toISOString();
+    exists = true;
+    const contents = tail
+      ? tailFile(filePath, SHIPIT_LOG_TAIL_LINES, { throwOnReadError: true })
+      : readFileSync(filePath, "utf8");
+    return { path: filePath, exists, modifiedAt, contents, error: null };
+  } catch (error) {
+    if (isMissingFileError(error)) {
+      return { path: filePath, exists: false, modifiedAt: null, contents: "", error: null };
+    }
+    return {
+      path: filePath,
+      exists,
+      modifiedAt,
+      contents: "",
+      error: error instanceof Error ? error.message : String(error),
+    };
+  }
+}
+
+function diagnoseTargetVersion(
+  stateContents: string,
+  readBundleVersion: (bundlePath: string) => string | null,
+): Pick<DesktopUpdaterDiagnostics, "targetVersion" | "targetVersionError"> {
+  try {
+    return {
+      targetVersion: readTargetVersion(stateContents, readBundleVersion),
+      targetVersionError: null,
+    };
+  } catch (error) {
+    return {
+      targetVersion: null,
+      targetVersionError: error instanceof Error ? error.message : String(error),
+    };
+  }
+}
+
+function readTargetVersion(
+  stateContents: string,
+  readBundleVersion: (bundlePath: string) => string | null,
+): string | null {
+  if (!stateContents) return null;
+
+  const state = JSON.parse(stateContents) as unknown;
+  if (!isRecord(state) || typeof state.updateBundleURL !== "string") return null;
+  return readBundleVersion(fileURLToPath(state.updateBundleURL));
+}
+
+function readMacBundleVersion(bundlePath: string): string | null {
+  return execFileSync(
+    "/usr/bin/plutil",
+    [
+      "-extract",
+      "CFBundleShortVersionString",
+      "raw",
+      path.join(bundlePath, "Contents", "Info.plist"),
+    ],
+    { encoding: "utf8" },
+  ).trim();
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isMissingFileError(error: unknown): boolean {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
diff --git a/packages/desktop/src/features/app-update-service.test.ts b/packages/desktop/src/features/app-update-service.test.ts
index e3be85bca0..5f55ff6099 100644
--- a/packages/desktop/src/features/app-update-service.test.ts
+++ b/packages/desktop/src/features/app-update-service.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
   createAppUpdateService,
+  type AppUpdateInstallRequest,
   type AppUpdateRuntime,
   type AppUpdateRuntimeConfiguration,
   type RuntimeUpdateInfo,
@@ -27,9 +28,10 @@ class FakeAppUpdateRuntime implements AppUpdateRuntime {
   } | null = null;
   checkCount = 0;
   downloadCallCount = 0;
+  requestedDownloadVersions: string[] = [];
   downloadedVersions: string[] = [];
   installedVersions: string[] = [];
-  installModes: Array<{ isSilent: boolean; isForceRunAfter: boolean }> = [];
+  installModes: Array<{ targetVersion: string; isSilent: boolean; isForceRunAfter: boolean }> = [];
 
   configure(input: AppUpdateRuntimeConfiguration): void {
     this.configuration = input;
@@ -130,8 +132,9 @@ class FakeAppUpdateRuntime implements AppUpdateRuntime {
     return { ...result, isUpdateAvailable };
   }
 
-  async downloadUpdate(): Promise<void> {
+  async downloadUpdate(targetVersion: string): Promise<void> {
     this.downloadCallCount += 1;
+    this.requestedDownloadVersions.push(targetVersion);
     if (this.activeDownload) {
       return this.activeDownload.promise;
     }
@@ -140,10 +143,10 @@ class FakeAppUpdateRuntime implements AppUpdateRuntime {
     }
   }
 
-  quitAndInstall(isSilent: boolean, isForceRunAfter: boolean): void {
+  quitAndInstall({ targetVersion, isSilent, isForceRunAfter }: AppUpdateInstallRequest): void {
     if (this.downloadedUpdate) {
       this.installedVersions.push(this.downloadedUpdate.version);
-      this.installModes.push({ isSilent, isForceRunAfter });
+      this.installModes.push({ targetVersion, isSilent, isForceRunAfter });
     }
   }
 }
@@ -387,7 +390,9 @@ describe("app update service", () => {
 
     expect(installed).toBe(true);
     expect(runtime.installedVersions).toEqual(["1.2.5"]);
-    expect(runtime.installModes).toEqual([{ isSilent: true, isForceRunAfter: false }]);
+    expect(runtime.installModes).toEqual([
+      { targetVersion: "1.2.5", isSilent: true, isForceRunAfter: false },
+    ]);
   });
 
   it("does not install an older download while its replacement is still rolling out", async () => {
@@ -491,7 +496,9 @@ describe("app update service", () => {
 
     expect(result.installed).toBe(true);
     expect(runtime.installedVersions).toEqual(["1.2.5"]);
-    expect(runtime.installModes).toEqual([{ isSilent: false, isForceRunAfter: true }]);
+    expect(runtime.installModes).toEqual([
+      { targetVersion: "1.2.5", isSilent: false, isForceRunAfter: true },
+    ]);
   });
 
   it("waits for a stale active download before downloading and installing the rechecked version", async () => {
@@ -518,6 +525,7 @@ describe("app update service", () => {
 
     expect(result.installed).toBe(true);
     expect(runtime.downloadedVersions).toEqual(["1.2.4", "1.2.5"]);
+    expect(runtime.requestedDownloadVersions).toEqual(["1.2.5"]);
     expect(runtime.installedVersions).toEqual(["1.2.5"]);
   });
 
diff --git a/packages/desktop/src/features/app-update-service.ts b/packages/desktop/src/features/app-update-service.ts
index 876a5a5553..21789950bf 100644
--- a/packages/desktop/src/features/app-update-service.ts
+++ b/packages/desktop/src/features/app-update-service.ts
@@ -41,11 +41,17 @@ export interface AppUpdateRuntimeConfiguration {
   onError(error: unknown): void;
 }
 
+export interface AppUpdateInstallRequest {
+  targetVersion: string;
+  isSilent: boolean;
+  isForceRunAfter: boolean;
+}
+
 export interface AppUpdateRuntime {
   configure(input: AppUpdateRuntimeConfiguration): void;
   checkForUpdates(): Promise<RuntimeUpdateCheckResult | null>;
-  downloadUpdate(): Promise<unknown>;
-  quitAndInstall(isSilent: boolean, isForceRunAfter: boolean): void;
+  downloadUpdate(targetVersion: string): Promise<unknown>;
+  quitAndInstall(input: AppUpdateInstallRequest): void;
 }
 
 export interface AppUpdateService {
@@ -101,15 +107,21 @@ function buildCheckResult(input: {
 async function performQuitAndInstall(
   runtime: AppUpdateRuntime,
   {
+    targetVersion,
     onBeforeQuit,
     restart,
   }: {
+    targetVersion: string;
     onBeforeQuit?: () => Promise<void>;
     restart: boolean;
   },
 ): Promise<void> {
   if (onBeforeQuit) await onBeforeQuit();
-  runtime.quitAndInstall(/* isSilent */ !restart, /* isForceRunAfter */ restart);
+  runtime.quitAndInstall({
+    targetVersion,
+    isSilent: !restart,
+    isForceRunAfter: restart,
+  });
 }
 
 function getErrorMessage(error: unknown): string {
@@ -356,7 +368,7 @@ export function createAppUpdateService(deps: AppUpdateServiceDeps): AppUpdateSer
       const attemptedVersion: string = preparingUpdateVersion ?? readyVersion;
       preparingUpdateVersion ??= readyVersion;
       try {
-        await deps.runtime.downloadUpdate();
+        await deps.runtime.downloadUpdate(attemptedVersion);
       } catch (error) {
         if (
           attemptedVersion !== readyVersion &&
@@ -406,7 +418,11 @@ export function createAppUpdateService(deps: AppUpdateServiceDeps): AppUpdateSer
     }
 
     if (isReadyToInstallVersion(readyVersion)) {
-      await performQuitAndInstall(deps.runtime, { onBeforeQuit, restart });
+      await performQuitAndInstall(deps.runtime, {
+        targetVersion: readyVersion,
+        onBeforeQuit,
+        restart,
+      });
       return {
         installed: true,
         version: readyVersion,
@@ -426,7 +442,11 @@ export function createAppUpdateService(deps: AppUpdateServiceDeps): AppUpdateSer
           message: "A newer update was found and will be installed later.",
         };
       }
-      await performQuitAndInstall(deps.runtime, { onBeforeQuit, restart });
+      await performQuitAndInstall(deps.runtime, {
+        targetVersion: readyVersion,
+        onBeforeQuit,
+        restart,
+      });
 
       return {
         installed: true,
diff --git a/packages/desktop/src/features/attachments.ts b/packages/desktop/src/features/attachments.ts
index 96e9aea6c9..82554a5d5a 100644
--- a/packages/desktop/src/features/attachments.ts
+++ b/packages/desktop/src/features/attachments.ts
@@ -1,6 +1,6 @@
 import { copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { resolvePaseoHome } from "@getpaseo/server";
+import { resolvePaseoHome } from "@getpaseo/server/daemon-control";
 
 const ATTACHMENTS_DIRNAME = "desktop-attachments";
 const ATTACHMENT_ID_PATTERN = /^[A-Za-z0-9_-]+$/;
diff --git a/packages/desktop/src/features/auto-updater.test.ts b/packages/desktop/src/features/auto-updater.test.ts
index d4c42c0322..6cd6da2c7e 100644
--- a/packages/desktop/src/features/auto-updater.test.ts
+++ b/packages/desktop/src/features/auto-updater.test.ts
@@ -39,6 +39,7 @@ vi.mock("electron-updater", () => ({
 import {
   bucketFromStagingUserId,
   checkForAppUpdate,
+  createAppUpdateLifecycleLogger,
   resolveStagingUserId,
   rolloutManifestSchema,
   shouldAdmitToRollout,
@@ -95,6 +96,50 @@ describe("checkForAppUpdate", () => {
     expect(consoleError).toHaveBeenCalled();
     consoleError.mockRestore();
   });
+
+  it("logs the update handoff with current and selected target versions", () => {
+    const info = vi.fn();
+    const lifecycleLog = createAppUpdateLifecycleLogger({ info });
+
+    lifecycleLog.checkStarted({
+      currentVersion: "1.2.3",
+      releaseChannel: "stable",
+      intent: "manual",
+    });
+    lifecycleLog.checkCompleted({
+      currentVersion: "1.2.3",
+      targetVersion: "1.2.5",
+      releaseChannel: "stable",
+      intent: "manual",
+      hasUpdate: true,
+      readyToInstall: true,
+      errorMessage: null,
+    });
+    lifecycleLog.updateDownloaded("1.2.4");
+    lifecycleLog.downloadRequested("1.2.5");
+    lifecycleLog.quitAndInstallRequested({
+      targetVersion: "1.2.5",
+      isSilent: false,
+      isForceRunAfter: true,
+    });
+
+    expect(info).toHaveBeenCalledWith("[auto-updater] check started", {
+      currentVersion: "1.2.3",
+      releaseChannel: "stable",
+      intent: "manual",
+    });
+    expect(info).toHaveBeenCalledWith("[auto-updater] update downloaded", {
+      targetVersion: "1.2.4",
+    });
+    expect(info).toHaveBeenCalledWith("[auto-updater] download requested", {
+      targetVersion: "1.2.5",
+    });
+    expect(info).toHaveBeenCalledWith("[auto-updater] quitAndInstall requested", {
+      targetVersion: "1.2.5",
+      isSilent: false,
+      isForceRunAfter: true,
+    });
+  });
 });
 
 describe("shouldInstallAppUpdateOnQuit", () => {
diff --git a/packages/desktop/src/features/auto-updater.ts b/packages/desktop/src/features/auto-updater.ts
index 46656a3917..ef71dc25b4 100644
--- a/packages/desktop/src/features/auto-updater.ts
+++ b/packages/desktop/src/features/auto-updater.ts
@@ -3,10 +3,12 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { app } from "electron";
 import { UUID } from "builder-util-runtime";
+import log from "electron-log/main";
 import { autoUpdater } from "electron-updater";
 import {
   createAppUpdateService,
   type AppUpdateCheckResult,
+  type AppUpdateInstallRequest,
   type AppUpdateInstallResult,
   type AppUpdateRuntime,
   type AppUpdateRuntimeConfiguration,
@@ -35,6 +37,48 @@ let cachedStagingUserIdPromise: Promise<string> | null = null;
 
 const UPDATE_CHANNEL_NOT_PUBLISHED_CODE = "ERR_UPDATER_CHANNEL_FILE_NOT_FOUND";
 
+interface AppUpdateLogSink {
+  info(message: string, details: object): void;
+}
+
+interface AppUpdateCheckLogDetails {
+  currentVersion: string;
+  releaseChannel: AppReleaseChannel;
+  intent: AppUpdateCheckIntent;
+}
+
+interface AppUpdateCheckCompletedLogDetails extends AppUpdateCheckLogDetails {
+  targetVersion: string;
+  hasUpdate: boolean;
+  readyToInstall: boolean;
+  errorMessage: string | null;
+}
+
+export function createAppUpdateLifecycleLogger(logger: AppUpdateLogSink) {
+  return {
+    checkStarted(details: AppUpdateCheckLogDetails): void {
+      logger.info("[auto-updater] check started", details);
+    },
+    checkCompleted(details: AppUpdateCheckCompletedLogDetails): void {
+      logger.info("[auto-updater] check completed", details);
+    },
+    updateAvailable(targetVersion: string): void {
+      logger.info("[auto-updater] update available", { targetVersion });
+    },
+    updateDownloaded(targetVersion: string): void {
+      logger.info("[auto-updater] update downloaded", { targetVersion });
+    },
+    downloadRequested(targetVersion: string): void {
+      logger.info("[auto-updater] download requested", { targetVersion });
+    },
+    quitAndInstallRequested(details: AppUpdateInstallRequest): void {
+      logger.info("[auto-updater] quitAndInstall requested", details);
+    },
+  };
+}
+
+const updateLifecycleLog = createAppUpdateLifecycleLogger(log);
+
 function isUpdateChannelNotPublished(error: unknown): boolean {
   return (
     typeof error === "object" &&
@@ -133,10 +177,14 @@ class ElectronAppUpdateRuntime implements AppUpdateRuntime {
     };
 
     autoUpdater.on("update-available", (info) => {
-      input.onUpdateAvailable(info as RuntimeUpdateInfo);
+      const updateInfo = info as RuntimeUpdateInfo;
+      updateLifecycleLog.updateAvailable(updateInfo.version);
+      input.onUpdateAvailable(updateInfo);
     });
     autoUpdater.on("update-downloaded", (info) => {
-      input.onUpdateDownloaded(info as RuntimeUpdateInfo);
+      const updateInfo = info as RuntimeUpdateInfo;
+      updateLifecycleLog.updateDownloaded(updateInfo.version);
+      input.onUpdateDownloaded(updateInfo);
     });
     autoUpdater.on("error", (error) => {
       if (isUpdateChannelNotPublished(error)) return;
@@ -158,12 +206,18 @@ class ElectronAppUpdateRuntime implements AppUpdateRuntime {
     }
   }
 
-  downloadUpdate(): Promise<unknown> {
+  downloadUpdate(targetVersion: string): Promise<unknown> {
+    updateLifecycleLog.downloadRequested(targetVersion);
     return autoUpdater.downloadUpdate();
   }
 
-  quitAndInstall(isSilent: boolean, isForceRunAfter: boolean): void {
+  quitAndInstall({ targetVersion, isSilent, isForceRunAfter }: AppUpdateInstallRequest): void {
     autoUpdater.autoRunAppAfterInstall = isForceRunAfter;
+    updateLifecycleLog.quitAndInstallRequested({
+      targetVersion,
+      isSilent,
+      isForceRunAfter,
+    });
     autoUpdater.quitAndInstall(isSilent, isForceRunAfter);
   }
 }
@@ -197,7 +251,22 @@ export async function checkForAppUpdate({
   releaseChannel: AppReleaseChannel;
   intent: AppUpdateCheckIntent;
 }): Promise<AppUpdateCheckResult> {
-  return appUpdateService.checkForAppUpdate({ currentVersion, releaseChannel, intent });
+  updateLifecycleLog.checkStarted({ currentVersion, releaseChannel, intent });
+  const result = await appUpdateService.checkForAppUpdate({
+    currentVersion,
+    releaseChannel,
+    intent,
+  });
+  updateLifecycleLog.checkCompleted({
+    currentVersion,
+    targetVersion: result.latestVersion,
+    releaseChannel,
+    intent,
+    hasUpdate: result.hasUpdate,
+    readyToInstall: result.readyToInstall,
+    errorMessage: result.errorMessage,
+  });
+  return result;
 }
 
 export async function downloadAndInstallUpdate(
diff --git a/packages/desktop/src/features/browser-automation/ipc.test.ts b/packages/desktop/src/features/browser-automation/ipc.test.ts
index dba7581964..427e86e1b1 100644
--- a/packages/desktop/src/features/browser-automation/ipc.test.ts
+++ b/packages/desktop/src/features/browser-automation/ipc.test.ts
@@ -1,6 +1,5 @@
-import type { Rectangle } from "electron";
 import { describe, expect, test, vi } from "vitest";
-import type { TabImage } from "./service.js";
+import { executeAutomationCommand, type BrowserRegistry, type TabImage } from "./service.js";
 import { adaptWebContents, HostSnapshotEngineRegistry } from "./ipc.js";
 import type { IsolatedKeyboardInputEvent } from "./trusted-input.js";
 
@@ -108,16 +107,22 @@ type ConsoleMessageListener = (
 ) => void;
 
 class FakeWebContents {
+  public backgroundThrottling = true;
+  public getBackgroundThrottling(): boolean {
+    return this.backgroundThrottling;
+  }
+  public setBackgroundThrottling(allowed: boolean): void {
+    if (this.destroyed) throw new Error("Object has been destroyed");
+    this.backgroundThrottling = allowed;
+  }
   public readonly debugger = new FakeDebugger();
   public readonly inputEvents: IsolatedKeyboardInputEvent[] = [];
   public readonly loadedUrls: string[] = [];
-  public readonly captures: Array<{
-    rect: Rectangle | undefined;
-    options: { stayHidden?: boolean } | undefined;
-  }> = [];
+  public frameListener: ((image: TabImage) => void) | null = null;
+  public endedFrameSubscriptions = 0;
   public readonly invalidations: string[] = [];
   private consoleMessageListener: ConsoleMessageListener | null = null;
-  private destroyedListener: (() => void) | null = null;
+  public readonly destroyedListeners = new Set<() => void>();
   public destroyed = false;
 
   public constructor(private readonly webContentsId: number) {}
@@ -167,12 +172,14 @@ class FakeWebContents {
 
   public reload(): void {}
 
-  public async capturePage(
-    rect?: Rectangle,
-    options?: { stayHidden?: boolean },
-  ): Promise<TabImage> {
-    this.captures.push({ rect, options });
-    return new FakeImage();
+  public beginFrameSubscription(onlyDirty: boolean, callback: (image: TabImage) => void): void {
+    expect(onlyDirty).toBe(false);
+    this.frameListener = callback;
+  }
+
+  public endFrameSubscription(): void {
+    this.frameListener = null;
+    this.endedFrameSubscriptions += 1;
   }
 
   public invalidate(): void {
@@ -183,6 +190,8 @@ class FakeWebContents {
     this.inputEvents.push(event);
   }
 
+  public async insertText(_text: string): Promise<void> {}
+
   public on(event: "console-message", listener: ConsoleMessageListener): void {
     expect(event).toBe("console-message");
     this.consoleMessageListener = listener;
@@ -190,7 +199,12 @@ class FakeWebContents {
 
   public once(event: "destroyed", listener: () => void): void {
     expect(event).toBe("destroyed");
-    this.destroyedListener = listener;
+    this.destroyedListeners.add(listener);
+  }
+
+  public removeListener(event: "destroyed", listener: () => void): void {
+    expect(event).toBe("destroyed");
+    this.destroyedListeners.delete(listener);
   }
 
   public emitConsoleMessage(input: {
@@ -208,7 +222,11 @@ class FakeWebContents {
   public destroy(): void {
     this.destroyed = true;
     this.debugger.emitDetach();
-    this.destroyedListener?.();
+    this.frameListener = null;
+    for (const listener of this.destroyedListeners) {
+      this.destroyedListeners.delete(listener);
+      listener();
+    }
   }
 }
 
@@ -237,16 +255,86 @@ describe("browser automation IPC adapter", () => {
     ]);
   });
 
-  test("delegates viewport capture to the guest without a renderer prep bridge", async () => {
+  test("captures one rendered frame and releases the subscription", async () => {
     const contents = new FakeWebContents(20);
     const tab = adaptWebContents(contents);
+    const controller = new AbortController();
+    const capture = tab.captureFrame(controller.signal);
+    contents.frameListener?.(new FakeImage());
 
-    const image = await tab.capturePage({ stayHidden: false });
-    tab.invalidate();
+    expect((await capture).getSize()).toEqual({ width: 640, height: 480 });
+    expect(contents.frameListener).toBeNull();
+    controller.abort();
+    expect(contents.endedFrameSubscriptions).toBe(1);
+  });
 
-    expect(image.getSize()).toEqual({ width: 640, height: 480 });
-    expect(contents.captures).toEqual([{ rect: undefined, options: { stayHidden: false } }]);
-    expect(contents.invalidations).toEqual(["invalidate"]);
+  test("cancels a pending frame subscription when the capture budget expires", async () => {
+    const contents = new FakeWebContents(2001);
+    const tab = adaptWebContents(contents);
+    const controller = new AbortController();
+    const capture = tab.captureFrame(controller.signal);
+    const failure = expect(capture).rejects.toThrow("capture deadline");
+    controller.abort(new Error("capture deadline"));
+
+    await failure;
+    expect(contents.frameListener).toBeNull();
+    expect(contents.endedFrameSubscriptions).toBe(1);
+  });
+
+  test("closing a guest settles its screenshot and releases the next queued capture", async () => {
+    vi.useFakeTimers();
+    try {
+      const closing = new FakeWebContents(2002);
+      const next = new FakeWebContents(2003);
+      const tabs = new Map([
+        ["closing", adaptWebContents(closing)],
+        ["next", adaptWebContents(next)],
+      ]);
+      const registry: BrowserRegistry = {
+        listRegisteredBrowserIds: () => [...tabs.keys()],
+        listRegisteredBrowserIdsForWorkspace: () => [...tabs.keys()],
+        getTabContents: (id) => tabs.get(id) ?? null,
+        getBrowserWorkspaceId: () => null,
+        getWorkspaceActiveBrowserId: () => null,
+      };
+      const capture = (browserId: string) =>
+        executeAutomationCommand(
+          {
+            type: "browser.automation.execute.request",
+            requestId: browserId,
+            command: { command: "screenshot", args: { browserId, fullPage: false } },
+          },
+          registry,
+        );
+      let closedResult: unknown;
+      const closedCapture = Promise.resolve(capture("closing")).then((result) => {
+        closedResult = result;
+        return result;
+      });
+      const nextCapture = capture("next");
+      await vi.advanceTimersByTimeAsync(0);
+      expect(closing.frameListener).not.toBeNull();
+      closing.destroy();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(closedResult).toEqual({
+        requestId: "closing",
+        ok: false,
+        error: {
+          code: "browser_tab_closed",
+          message: "Browser tab closing has been closed",
+          retryable: false,
+        },
+      });
+      expect(closing.destroyedListeners.size).toBe(0);
+      expect(next.frameListener).not.toBeNull();
+      next.frameListener?.(new FakeImage());
+      await expect(nextCapture).resolves.toMatchObject({ ok: true });
+      await closedCapture;
+      expect(next.destroyedListeners.size).toBe(1);
+    } finally {
+      await vi.runAllTimersAsync();
+      vi.useRealTimers();
+    }
   });
 
   test("collects console messages until the guest is destroyed", () => {
@@ -672,3 +760,38 @@ function deferred<T>() {
   });
   return { promise, resolve };
 }
+
+describe("pixel capture frame production", () => {
+  test.each([true, false])(
+    "restores the prior throttling policy (%s) after capture or failure",
+    async (previous) => {
+      const contents = new FakeWebContents(8001);
+      contents.backgroundThrottling = previous;
+      const tab = adaptWebContents(contents);
+      expect(
+        await tab.withFrameProduction(async () => {
+          expect(contents.backgroundThrottling).toBe(false);
+          return "pixels";
+        }),
+      ).toBe("pixels");
+      expect(contents.backgroundThrottling).toBe(previous);
+      await expect(
+        tab.withFrameProduction(async () => {
+          throw new Error("capture failed");
+        }),
+      ).rejects.toThrow("capture failed");
+      expect(contents.backgroundThrottling).toBe(previous);
+    },
+  );
+
+  test("does not touch a guest destroyed during capture", async () => {
+    const contents = new FakeWebContents(8002);
+    const tab = adaptWebContents(contents);
+    await expect(
+      tab.withFrameProduction(async () => {
+        contents.destroyed = true;
+        throw new Error("capture closed");
+      }),
+    ).rejects.toThrow("capture closed");
+  });
+});
diff --git a/packages/desktop/src/features/browser-automation/ipc.ts b/packages/desktop/src/features/browser-automation/ipc.ts
index ea1941c318..18e5b84544 100644
--- a/packages/desktop/src/features/browser-automation/ipc.ts
+++ b/packages/desktop/src/features/browser-automation/ipc.ts
@@ -1,4 +1,3 @@
-import type { Rectangle } from "electron";
 import { ipcMain } from "electron";
 import { BrowserAutomationExecuteRequestSchema } from "@getpaseo/protocol/browser-automation/rpc-schemas";
 import type {
@@ -16,7 +15,7 @@ import {
   promptShimInstallScript,
   promptShimRestoreScript,
 } from "./dialog-handling.js";
-import { executeAutomationCommand } from "./service.js";
+import { BrowserTabClosedError, executeAutomationCommand } from "./service.js";
 import { BrowserSnapshotEngine } from "./snapshot-engine.js";
 import {
   listRegisteredPaseoBrowserIds,
@@ -92,6 +91,7 @@ interface ConsoleMessageEmitter {
 }
 
 interface BrowserAutomationWebContents extends ConsoleMessageEmitter {
+  removeListener(event: "destroyed", listener: () => void): void;
   readonly id: number;
   readonly debugger: WebContentsDebugger;
   getURL(): string;
@@ -105,9 +105,13 @@ interface BrowserAutomationWebContents extends ConsoleMessageEmitter {
   goBack(): void;
   goForward(): void;
   reload(): void;
-  capturePage(rect?: Rectangle, options?: { stayHidden?: boolean }): Promise<TabImage>;
+  beginFrameSubscription(onlyDirty: boolean, callback: (image: TabImage) => void): void;
+  endFrameSubscription(): void;
   invalidate(): void;
+  getBackgroundThrottling(): boolean;
+  setBackgroundThrottling(allowed: boolean): void;
   sendInputEvent(event: IsolatedKeyboardInputEvent): void;
+  insertText(text: string): Promise<void>;
 }
 
 export function adaptWebContents(contents: BrowserAutomationWebContents): TabContents {
@@ -128,9 +132,19 @@ export function adaptWebContents(contents: BrowserAutomationWebContents): TabCon
     goBack: () => contents.goBack(),
     goForward: () => contents.goForward(),
     reload: () => contents.reload(),
-    capturePage: (captureOptions) => contents.capturePage(undefined, captureOptions),
+    captureFrame: (signal) => captureViewportFrame(contents, signal),
     invalidate: () => contents.invalidate(),
+    withFrameProduction: async (capture) => {
+      const previous = contents.getBackgroundThrottling();
+      contents.setBackgroundThrottling(false);
+      try {
+        return await capture();
+      } finally {
+        if (!contents.isDestroyed()) contents.setBackgroundThrottling(previous);
+      }
+    },
     sendInputEvent: (event) => contents.sendInputEvent(event),
+    insertText: (text) => contents.insertText(text),
     getConsoleMessages: () => consoleMessagesByContentsId.get(contentsId) ?? [],
     captureDialogs: (task) => dialogMonitor.capture(task),
     sendDebugCommand: (command: string, params?: Record<string, unknown>) =>
@@ -143,6 +157,41 @@ export function adaptWebContents(contents: BrowserAutomationWebContents): TabCon
   };
 }
 
+function captureViewportFrame(
+  contents: BrowserAutomationWebContents,
+  signal: AbortSignal,
+): Promise<TabImage> {
+  signal.throwIfAborted();
+  return new Promise((resolve, reject) => {
+    const stop = () => {
+      signal.removeEventListener("abort", abort);
+      contents.removeListener("destroyed", destroyed);
+      if (!contents.isDestroyed()) contents.endFrameSubscription();
+    };
+    const abort = () => {
+      stop();
+      reject(signal.reason);
+    };
+    const destroyed = () => {
+      stop();
+      reject(new BrowserTabClosedError());
+    };
+    signal.addEventListener("abort", abort, { once: true });
+    contents.once("destroyed", destroyed);
+    try {
+      // A resized resident guest can paint while capturePage's surface-copy
+      // request remains pending. Subscribe to its rendered frames instead.
+      contents.beginFrameSubscription(false, (image) => {
+        stop();
+        resolve(image);
+      });
+    } catch (error) {
+      stop();
+      reject(error);
+    }
+  });
+}
+
 function getCdpQueue(contentsId: number): CdpSessionQueue {
   const existing = cdpQueuesByContentsId.get(contentsId);
   if (existing) {
diff --git a/packages/desktop/src/features/browser-automation/service.test.ts b/packages/desktop/src/features/browser-automation/service.test.ts
index c9246324b2..6bc054c6a5 100644
--- a/packages/desktop/src/features/browser-automation/service.test.ts
+++ b/packages/desktop/src/features/browser-automation/service.test.ts
@@ -33,11 +33,15 @@ class FakeImage implements TabImage {
 }
 
 class FakeTab implements TabContents {
+  public withFrameProduction<T>(capture: () => Promise<T>): Promise<T> {
+    return capture();
+  }
   public readonly loadedUrls: string[] = [];
   public readonly scripts: string[] = [];
   public readonly actions: string[] = [];
-  public readonly capturedViewports: Array<{ stayHidden?: boolean }> = [];
+  public readonly capturedViewports: AbortSignal[] = [];
   public readonly debugCommands: Array<{ command: string; params?: Record<string, unknown> }> = [];
+  public readonly insertedText: string[] = [];
   public readonly inputEvents: IsolatedKeyboardInputEvent[] = [];
   private readonly captureStartWaiters: Array<() => void> = [];
   private readonly deferredCaptures: Array<(image: TabImage) => void> = [];
@@ -64,10 +68,10 @@ class FakeTab implements TabContents {
   public networkEntries: unknown[] = [];
   public consoleMessages: BrowserAutomationConsoleLogEntry[] = [];
   public dialogsToCapture: BrowserAutomationDialogEvent[] = [];
+  public paintDelayMs = 0;
   public captureNeverPaints = false;
   public captureThrows = false;
   public captureErrorMessage = "capture failed";
-  public viewportCaptureFailuresBeforeSuccess = 0;
   public deferCaptures = false;
   public fullPageScreenshotThrows = false;
   public fullPageScreenshotErrorMessage = "UnknownVizError";
@@ -115,6 +119,9 @@ class FakeTab implements TabContents {
 
   public async executeJavaScript(code: string): Promise<unknown> {
     this.scripts.push(code);
+    if (code.includes("requestAnimationFrame") && this.paintDelayMs > 0) {
+      await new Promise((resolve) => setTimeout(resolve, this.paintDelayMs));
+    }
     if (code.includes("document.body.innerText")) {
       return this.bodyText;
     }
@@ -161,14 +168,10 @@ class FakeTab implements TabContents {
     this.actions.push("reload");
   }
 
-  public async capturePage(options?: { stayHidden?: boolean }): Promise<TabImage> {
-    this.capturedViewports.push(options ?? {});
+  public async captureFrame(signal: AbortSignal): Promise<TabImage> {
+    this.capturedViewports.push(signal);
     this.actions.push("capture");
     this.resolveCaptureStartWaiters();
-    if (this.viewportCaptureFailuresBeforeSuccess > 0) {
-      this.viewportCaptureFailuresBeforeSuccess -= 1;
-      throw new Error(this.captureErrorMessage);
-    }
     if (this.captureThrows) {
       throw new Error(this.captureErrorMessage);
     }
@@ -229,6 +232,10 @@ class FakeTab implements TabContents {
     this.inputEvents.push(event);
   }
 
+  public async insertText(text: string): Promise<void> {
+    this.insertedText.push(text);
+  }
+
   public waitForCaptureStart(count: number): Promise<void> {
     if (this.capturedViewports.length >= count) {
       return Promise.resolve();
@@ -1102,17 +1109,31 @@ describe("executeAutomationCommand", () => {
       ok: true,
       result: { command: "type", browserId: BROWSER_A, ref: "@e1", x: 40, y: 30 },
     });
-    expect(browser.tab.debugCommands.at(-1)).toEqual({
-      command: "Input.insertText",
-      params: { text: "Ada" },
-    });
-    expect(browser.tab.debugCommands.slice(0, 3).map((entry) => entry.command)).toEqual([
+    expect(browser.tab.insertedText).toEqual(["Ada"]);
+    expect(browser.tab.debugCommands.map((entry) => entry.command)).toEqual([
       "Input.dispatchMouseEvent",
       "Input.dispatchMouseEvent",
       "Input.dispatchMouseEvent",
     ]);
   });
 
+  test("type inserts text through the tab, not the window-wide debugger input", async () => {
+    const browser = new BrowserAutomationHarness();
+
+    const action = await browser.execute({
+      command: "type",
+      args: { browserId: BROWSER_A, text: "Ada" },
+    });
+
+    expect(action).toEqual({
+      requestId: "req-type",
+      ok: true,
+      result: { command: "type", browserId: BROWSER_A },
+    });
+    expect(browser.tab.insertedText).toEqual(["Ada"]);
+    expect(browser.tab.debugCommands).toEqual([]);
+  });
+
   test("keypress dispatches a trusted key to the focused element when ref is omitted", async () => {
     const browser = new BrowserAutomationHarness();
 
@@ -1557,7 +1578,8 @@ describe("executeAutomationCommand", () => {
         height: 480,
       },
     });
-    expect(browser.tab.capturedViewports).toEqual([{ stayHidden: false }]);
+    expect(browser.tab.capturedViewports).toHaveLength(1);
+    expect(browser.tab.capturedViewports[0].aborted).toBe(true);
     expect(browser.tab.actions).toEqual(["invalidate", "capture"]);
   });
 
@@ -1583,6 +1605,32 @@ describe("executeAutomationCommand", () => {
         },
       });
       expect(browser.tab.actions).toEqual(["invalidate", "capture"]);
+      expect(browser.tab.capturedViewports[0].aborted).toBe(true);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  test("paint and pixel capture share the five-second screenshot budget", async () => {
+    vi.useFakeTimers();
+    try {
+      const browser = new BrowserAutomationHarness();
+      browser.tab.paintDelayMs = 4_000;
+      browser.tab.captureNeverPaints = true;
+      let result: unknown;
+      void browser
+        .execute({
+          command: "screenshot",
+          args: { browserId: BROWSER_A },
+        })
+        .then((value) => {
+          result = value;
+          return value;
+        });
+      await vi.advanceTimersByTimeAsync(4_999);
+      expect(result).toBeUndefined();
+      await vi.advanceTimersByTimeAsync(1);
+      expect(result).toMatchObject({ ok: false, error: { code: "screenshot_no_frame" } });
     } finally {
       vi.useRealTimers();
     }
@@ -1602,76 +1650,6 @@ describe("executeAutomationCommand", () => {
     expect(browser.tab.actions).toEqual(["invalidate", "capture"]);
   });
 
-  test("screenshot retries UnknownVizError until the first viewport frame appears", async () => {
-    vi.useFakeTimers();
-    try {
-      const browser = new BrowserAutomationHarness();
-      browser.tab.captureErrorMessage = "UnknownVizError";
-      browser.tab.viewportCaptureFailuresBeforeSuccess = 2;
-
-      const resultPromise = browser.execute({
-        command: "screenshot",
-        args: { browserId: BROWSER_A },
-      });
-      await vi.advanceTimersByTimeAsync(400);
-
-      await expect(resultPromise).resolves.toEqual({
-        requestId: "req-screenshot",
-        ok: true,
-        result: {
-          command: "screenshot",
-          browserId: BROWSER_A,
-          mimeType: "image/png",
-          dataBase64: "iVBORwECAw==",
-          width: 640,
-          height: 480,
-        },
-      });
-      expect(browser.tab.capturedViewports).toHaveLength(3);
-      expect(browser.tab.actions).toEqual([
-        "invalidate",
-        "capture",
-        "invalidate",
-        "capture",
-        "invalidate",
-        "capture",
-      ]);
-    } finally {
-      vi.useRealTimers();
-    }
-  });
-
-  test("screenshot returns no-frame after UnknownVizError spends the retry budget", async () => {
-    vi.useFakeTimers();
-    try {
-      const browser = new BrowserAutomationHarness();
-      browser.tab.captureThrows = true;
-      browser.tab.captureErrorMessage = "UnknownVizError";
-
-      const resultPromise = browser.execute({
-        command: "screenshot",
-        args: { browserId: BROWSER_A },
-      });
-      await vi.advanceTimersByTimeAsync(5_000);
-
-      await expect(resultPromise).resolves.toEqual({
-        requestId: "req-screenshot",
-        ok: false,
-        error: {
-          code: "screenshot_no_frame",
-          message: "The tab has not painted yet. Retry the screenshot.",
-          retryable: true,
-        },
-      });
-      expect(browser.tab.capturedViewports.length).toBeGreaterThan(1);
-      expect(browser.tab.actions.filter((action) => action === "invalidate")).toHaveLength(
-        browser.tab.capturedViewports.length,
-      );
-    } finally {
-      vi.useRealTimers();
-    }
-  });
-
   test("overlapping screenshots serialize through the shared capture queue", async () => {
     const browser = new BrowserAutomationHarness();
     browser.tab.deferCaptures = true;
diff --git a/packages/desktop/src/features/browser-automation/service.ts b/packages/desktop/src/features/browser-automation/service.ts
index 7ab9099db2..fe07adecd3 100644
--- a/packages/desktop/src/features/browser-automation/service.ts
+++ b/packages/desktop/src/features/browser-automation/service.ts
@@ -17,7 +17,6 @@ import {
   dispatchTrustedHover,
   dispatchTrustedKey,
   dispatchTrustedScroll,
-  dispatchTrustedText,
   type ClickInputOptions,
   type IsolatedKeyboardInputEvent,
 } from "./trusted-input.js";
@@ -35,9 +34,13 @@ export interface TabContents {
   goBack(): void;
   goForward(): void;
   reload(): void;
-  capturePage(options?: TabCapturePageOptions): Promise<TabImage>;
+  captureFrame(signal: AbortSignal): Promise<TabImage>;
   invalidate(): void;
+  withFrameProduction<T>(capture: () => Promise<T>): Promise<T>;
   sendInputEvent(event: IsolatedKeyboardInputEvent): void;
+  // Commits text into this tab's focused element. CDP Input.insertText would
+  // commit into whichever element has focus in the Paseo window instead.
+  insertText(text: string): Promise<void>;
   getConsoleMessages?(): BrowserAutomationConsoleLogEntry[];
   captureDialogs?<T>(
     task: () => Promise<T>,
@@ -50,10 +53,6 @@ export interface TabImage {
   getSize(): { width: number; height: number };
 }
 
-export interface TabCapturePageOptions {
-  stayHidden?: boolean;
-}
-
 export interface BrowserRegistry {
   listRegisteredBrowserIds(): string[];
   listRegisteredBrowserIdsForWorkspace(workspaceId: string): string[];
@@ -97,6 +96,13 @@ async function withDialogCapture(
   return dialogs.length > 0 ? { ...result, dialogs } : result;
 }
 
+export class BrowserTabClosedError extends Error {
+  public constructor() {
+    super("Browser tab has been closed");
+    this.name = "BrowserTabClosedError";
+  }
+}
+
 class ScreenshotNoFrameError extends Error {
   public constructor(message = SCREENSHOT_NO_FRAME_MESSAGE) {
     super(message);
@@ -161,8 +167,8 @@ async function runSerializedPixelCapture<T>(capture: () => Promise<T>): Promise<
 async function capturePixelFrameWithRetry<T>(
   contents: TabContents,
   capture: () => Promise<T>,
+  deadline: number,
 ): Promise<T> {
-  const deadline = Date.now() + PIXEL_CAPTURE_TIMEOUT_MS;
   while (Date.now() < deadline) {
     try {
       contents.invalidate();
@@ -189,15 +195,47 @@ function isKnownNoFrameCaptureError(error: unknown): boolean {
   );
 }
 
+async function waitForPaint(contents: TabContents, deadline: number): Promise<void> {
+  // A hidden page may have unpainted DOM updates. The first animation callback
+  // precedes paint; the next frame ensures capture cannot reuse the old surface.
+  await withPixelCaptureTimeout(
+    contents.executeJavaScript(
+      "new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(() => resolve())))",
+    ),
+    deadline - Date.now(),
+  );
+}
+
 async function runPaintedPixelCapture<T>(
   contents: TabContents,
   capture: () => Promise<T>,
 ): Promise<T> {
-  return runSerializedPixelCapture(() => capturePixelFrameWithRetry(contents, capture));
+  return runSerializedPixelCapture(() =>
+    contents.withFrameProduction(async () => {
+      const deadline = Date.now() + PIXEL_CAPTURE_TIMEOUT_MS;
+      await waitForPaint(contents, deadline);
+      return capturePixelFrameWithRetry(contents, capture, deadline);
+    }),
+  );
 }
 
 async function capturePaintedViewport(contents: TabContents): Promise<TabImage> {
-  return runPaintedPixelCapture(contents, () => contents.capturePage({ stayHidden: false }));
+  return runSerializedPixelCapture(() =>
+    contents.withFrameProduction(async () => {
+      const deadline = Date.now() + PIXEL_CAPTURE_TIMEOUT_MS;
+      const controller = new AbortController();
+      try {
+        await waitForPaint(contents, deadline);
+        contents.invalidate();
+        return await withPixelCaptureTimeout(
+          contents.captureFrame(controller.signal),
+          deadline - Date.now(),
+        );
+      } finally {
+        controller.abort();
+      }
+    }),
+  );
 }
 
 function tabInfoFromContents(
@@ -1040,7 +1078,7 @@ async function executeType(
       }
       await dispatchTrustedClick(cdpSender(target.contents), actionable.target.point);
     }
-    await dispatchTrustedText(cdpSender(target.contents), text);
+    await target.contents.insertText(text);
     return {
       requestId,
       ok: true,
@@ -1199,6 +1237,9 @@ async function executeScreenshot(
     try {
       image = await capturePaintedViewport(target.contents);
     } catch (error) {
+      if (error instanceof BrowserTabClosedError) {
+        return fail(requestId, "browser_tab_closed", `Browser tab ${browserId} has been closed`);
+      }
       if (isScreenshotNoFrameError(error)) {
         return screenshotNoFrameFailure(requestId, error);
       }
diff --git a/packages/desktop/src/features/browser-automation/trusted-input.ts b/packages/desktop/src/features/browser-automation/trusted-input.ts
index 671c5dbda1..8473263a1c 100644
--- a/packages/desktop/src/features/browser-automation/trusted-input.ts
+++ b/packages/desktop/src/features/browser-automation/trusted-input.ts
@@ -154,13 +154,6 @@ export async function dispatchTrustedScroll(
   });
 }
 
-export async function dispatchTrustedText(send: CdpCommandSender, text: string): Promise<void> {
-  if (text.length === 0) {
-    return;
-  }
-  await send("Input.insertText", { text });
-}
-
 export function dispatchTrustedKey(send: KeyboardInputSender, key: string): void {
   const keyCode = ELECTRON_KEY_CODE_ALIASES[key] ?? key;
   let character: string | null = null;
diff --git a/packages/desktop/src/features/browser-capture.test.ts b/packages/desktop/src/features/browser-capture.test.ts
index d14c7734ee..ea377f51c5 100644
--- a/packages/desktop/src/features/browser-capture.test.ts
+++ b/packages/desktop/src/features/browser-capture.test.ts
@@ -10,7 +10,7 @@ function image(dataUrl = "data:image/png;base64,capture"): BrowserCaptureImage {
 }
 
 function harness(guest: BrowserCaptureGuest | null = null) {
-  const clipboard = { write: vi.fn(), writeImage: vi.fn(), writeText: vi.fn() };
+  const clipboard = { write: vi.fn(async () => undefined) };
   const decodeImage = vi.fn(() => image("data:image/png;base64,clipboard"));
   const warn = vi.fn();
   return {
@@ -29,7 +29,7 @@ function harness(guest: BrowserCaptureGuest | null = null) {
 describe("browser capture service", () => {
   it("validates and rounds guest-relative bounds before capture", async () => {
     const capturePage = vi.fn(async () => image());
-    const { service } = harness({ isDestroyed: () => false, capturePage });
+    const { service } = harness({ isDestroyed: () => false, getZoomFactor: () => 1, capturePage });
 
     await expect(
       service.capture({
@@ -41,9 +41,25 @@ describe("browser capture service", () => {
     expect(capturePage).toHaveBeenCalledWith({ x: 0, y: 9, width: 20, height: 11 });
   });
 
+  it("captures the selected element when the page is zoomed", async () => {
+    const capturePage = vi.fn(async () => image());
+    const { service } = harness({
+      isDestroyed: () => false,
+      getZoomFactor: () => 1.2,
+      capturePage,
+    });
+
+    await service.capture({
+      browserId: "browser-1",
+      hostWebContentsId: 42,
+      rect: { x: 300, y: 200, width: 120, height: 60 },
+    });
+    expect(capturePage).toHaveBeenCalledWith({ x: 360, y: 240, width: 144, height: 72 });
+  });
+
   it("rejects invalid or unavailable captures without touching the guest", async () => {
     const capturePage = vi.fn(async () => image());
-    const { service } = harness({ isDestroyed: () => false, capturePage });
+    const { service } = harness({ isDestroyed: () => false, getZoomFactor: () => 1, capturePage });
 
     await expect(
       service.capture({ browserId: "browser-1", hostWebContentsId: 42, rect: { width: 0 } }),
@@ -51,16 +67,21 @@ describe("browser capture service", () => {
     expect(capturePage).not.toHaveBeenCalled();
   });
 
-  it("writes text and a decoded image to the clipboard atomically", () => {
+  it("writes text and a decoded image to the clipboard atomically", async () => {
     const { service, clipboard } = harness();
-    expect(service.copy({ text: "button", imageDataUrl: "data:image/png;base64,value" })).toBe(
-      true,
-    );
+    await expect(
+      service.copy({ text: "button", imageDataUrl: "data:image/png;base64,value" }),
+    ).resolves.toBe(true);
     expect(clipboard.write).toHaveBeenCalledWith({
       text: "button",
       image: expect.any(Object),
     });
-    expect(clipboard.writeText).not.toHaveBeenCalled();
-    expect(clipboard.writeImage).not.toHaveBeenCalled();
+  });
+
+  it("keeps text-only clipboard writes", async () => {
+    const { service, clipboard } = harness();
+
+    await expect(service.copy({ text: "button" })).resolves.toBe(true);
+    expect(clipboard.write).toHaveBeenCalledWith({ text: "button", image: null });
   });
 });
diff --git a/packages/desktop/src/features/browser-capture.ts b/packages/desktop/src/features/browser-capture.ts
index 792567d424..199fde27e7 100644
--- a/packages/desktop/src/features/browser-capture.ts
+++ b/packages/desktop/src/features/browser-capture.ts
@@ -5,6 +5,7 @@ export interface BrowserCaptureImage {
 
 export interface BrowserCaptureGuest<TImage extends BrowserCaptureImage = BrowserCaptureImage> {
   isDestroyed(): boolean;
+  getZoomFactor(): number;
   capturePage(rect: BrowserCaptureRect): Promise<TImage>;
 }
 
@@ -15,10 +16,13 @@ export interface BrowserCaptureRect {
   height: number;
 }
 
+interface BrowserCaptureClipboardPayload<TImage extends BrowserCaptureImage> {
+  text: string | null;
+  image: TImage | null;
+}
+
 interface BrowserCaptureClipboard<TImage extends BrowserCaptureImage> {
-  write(input: { text: string; image: TImage }): void;
-  writeImage(image: TImage): void;
-  writeText(text: string): void;
+  write(input: BrowserCaptureClipboardPayload<TImage>): Promise<void>;
 }
 
 interface BrowserCaptureDependencies<TImage extends BrowserCaptureImage> {
@@ -34,10 +38,12 @@ export interface BrowserCaptureService {
     hostWebContentsId: number;
     rect: unknown;
   }): Promise<string | null>;
-  copy(payload: unknown): boolean;
+  copy(payload: unknown): Promise<boolean>;
 }
 
-function captureRect(value: unknown): BrowserCaptureRect | null {
+// The renderer measures the element in page CSS pixels, while capturePage
+// takes device-independent pixels, so the page zoom scales the region.
+function captureRect(value: unknown, zoomFactor: number): BrowserCaptureRect | null {
   if (!value || typeof value !== "object") return null;
   const record = value as Record<string, unknown>;
   const coordinates = [record.x, record.y, record.width, record.height];
@@ -48,7 +54,9 @@ function captureRect(value: unknown): BrowserCaptureRect | null {
   ) {
     return null;
   }
-  const [x, y, width, height] = coordinates as number[];
+  const [x, y, width, height] = (coordinates as number[]).map(
+    (coordinate) => coordinate * zoomFactor,
+  );
   if (width <= 0 || height <= 0) return null;
   return {
     x: Math.max(0, Math.round(x)),
@@ -77,8 +85,9 @@ export function createBrowserCaptureService<TImage extends BrowserCaptureImage>(
     async capture({ browserId, hostWebContentsId, rect }) {
       if (typeof browserId !== "string" || browserId.trim().length === 0) return null;
       const guest = dependencies.findGuest(browserId, hostWebContentsId);
-      const bounds = captureRect(rect);
-      if (!guest || guest.isDestroyed() || !bounds) return null;
+      if (!guest || guest.isDestroyed()) return null;
+      const bounds = captureRect(rect, guest.getZoomFactor());
+      if (!bounds) return null;
       try {
         const image = await guest.capturePage(bounds);
         return image.isEmpty() ? null : image.toDataURL();
@@ -88,7 +97,7 @@ export function createBrowserCaptureService<TImage extends BrowserCaptureImage>(
       }
     },
 
-    copy(payload) {
+    async copy(payload) {
       const { text, imageDataUrl } = copyPayload(payload);
       let image: TImage | null = null;
       if (imageDataUrl) {
@@ -99,10 +108,8 @@ export function createBrowserCaptureService<TImage extends BrowserCaptureImage>(
           dependencies.warn("image-decode-failed", { error });
         }
       }
-      if (text && image) dependencies.clipboard.write({ text, image });
-      else if (image) dependencies.clipboard.writeImage(image);
-      else if (text) dependencies.clipboard.writeText(text);
-      else return false;
+      if (!text && !image) return false;
+      await dependencies.clipboard.write({ text, image });
       return true;
     },
   };
diff --git a/packages/desktop/src/features/browser-profile.test.ts b/packages/desktop/src/features/browser-profile.test.ts
index 029a5ae940..09d7c40b43 100644
--- a/packages/desktop/src/features/browser-profile.test.ts
+++ b/packages/desktop/src/features/browser-profile.test.ts
@@ -159,7 +159,7 @@ describe("clearPaseoBrowserProfile", () => {
           "localstorage",
           "serviceworkers",
           "cachestorage",
-          "websql",
+          "shadercache",
         ],
       },
     ]);
diff --git a/packages/desktop/src/features/browser-profile.ts b/packages/desktop/src/features/browser-profile.ts
index 307567e512..f8f1d19328 100644
--- a/packages/desktop/src/features/browser-profile.ts
+++ b/packages/desktop/src/features/browser-profile.ts
@@ -10,7 +10,7 @@ const PASEO_BROWSER_STORAGE_TYPES = [
   "localstorage",
   "serviceworkers",
   "cachestorage",
-  "websql",
+  "shadercache",
 ] as const;
 
 interface BrowserProfileSession {
diff --git a/packages/desktop/src/features/browser-webviews/index.test.ts b/packages/desktop/src/features/browser-webviews/index.test.ts
index bbeffbe8c3..cac803134a 100644
--- a/packages/desktop/src/features/browser-webviews/index.test.ts
+++ b/packages/desktop/src/features/browser-webviews/index.test.ts
@@ -19,7 +19,6 @@ class FakeRenderer {
 }
 
 class FakeBrowserGuest {
-  public readonly backgroundThrottlingCalls: boolean[] = [];
   private destroyedListener: (() => void) | null = null;
   private destroyed = false;
 
@@ -33,10 +32,6 @@ class FakeBrowserGuest {
     return this.destroyed;
   }
 
-  public setBackgroundThrottling(allowed: boolean): void {
-    this.backgroundThrottlingCalls.push(allowed);
-  }
-
   public once(event: "destroyed", listener: () => void): void {
     expect(event).toBe("destroyed");
     this.destroyedListener = listener;
@@ -187,7 +182,7 @@ describe("browser webview attachment", () => {
     unregisterPaseoBrowser("browser-shared-hosts");
   });
 
-  test("prepares throttling once and removes registration when the guest is destroyed", () => {
+  test("removes registration when the guest is destroyed", () => {
     const profileSession = {};
     const renderer = new FakeRenderer(31);
     const guest = new FakeBrowserGuest(601, renderer, profileSession);
@@ -201,12 +196,10 @@ describe("browser webview attachment", () => {
       findWebContents: () => guest,
     });
 
-    expect(guest.backgroundThrottlingCalls).toEqual([false]);
     expect(getPaseoBrowserIdForWebContents(guest)).toBe("browser-cleanup");
 
     guest.destroy();
 
     expect(getPaseoBrowserIdForWebContents(guest)).toBeNull();
-    expect(guest.backgroundThrottlingCalls).toEqual([false]);
   });
 });
diff --git a/packages/desktop/src/features/browser-webviews/index.ts b/packages/desktop/src/features/browser-webviews/index.ts
index b415f43397..319d4922cb 100644
--- a/packages/desktop/src/features/browser-webviews/index.ts
+++ b/packages/desktop/src/features/browser-webviews/index.ts
@@ -24,7 +24,6 @@ interface BrowserWebContentsIdentity {
 interface RegisteredBrowserWebContents extends BrowserWebContentsIdentity {
   readonly hostWebContents: BrowserWebContentsIdentity | null;
   readonly session: object;
-  setBackgroundThrottling(allowed: boolean): void;
   once(event: "destroyed", listener: () => void): void;
 }
 
@@ -56,7 +55,8 @@ export function getPaseoBrowserWebviewRegistry(): PaseoBrowserWebviewRegistry {
 
 export function preparePaseoBrowserWebContents(contents: RegisteredBrowserWebContents): void {
   const webContentsId = contents.id;
-  contents.setBackgroundThrottling(false);
+  // Preserve Chromium throttling when the host window is hidden. Browser
+  // residency and screenshot capture do not require a lifetime override.
   contents.once("destroyed", () => {
     browserRegistry.unregisterWebContents(webContentsId);
   });
diff --git a/packages/desktop/src/integrations/cli-install/path.test.ts b/packages/desktop/src/integrations/cli-install/path.test.ts
index 472f066e00..77d340b409 100644
--- a/packages/desktop/src/integrations/cli-install/path.test.ts
+++ b/packages/desktop/src/integrations/cli-install/path.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
-import { resolveCliInstallSourcePath } from "./path";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { resolveCliInstallSourcePath, resolveCliShimPath } from "./path";
 
 describe("cli-install-path", () => {
   it("uses the bundled shim for packaged macOS installs", () => {
@@ -56,3 +58,38 @@ describe("cli-install-path", () => {
     ).toBe("/opt/Paseo/resources/bin/paseo");
   });
 });
+
+describe("CLI executable selection", () => {
+  const resolveWorkspaceCli = () =>
+    createRequire(import.meta.url).resolve("@getpaseo/cli/bin/paseo");
+
+  it("uses the workspace CLI for an unpackaged Electron launcher", () => {
+    expect(
+      resolveCliShimPath({
+        platform: "linux",
+        isPackaged: false,
+        executablePath: "/nix/store/electron/bin/electron",
+        resolveWorkspaceCli,
+      }),
+    ).toBe(resolveWorkspaceCli());
+  });
+
+  it("uses the application shim for a packaged launcher", () => {
+    expect(
+      resolveCliShimPath({
+        platform: "linux",
+        isPackaged: true,
+        executablePath: "/opt/Paseo/paseo",
+        resolveWorkspaceCli,
+      }),
+    ).toBe(path.join("/opt/Paseo", "resources", "bin", "paseo"));
+    expect(
+      resolveCliShimPath({
+        platform: "darwin",
+        isPackaged: true,
+        executablePath: "/Applications/Paseo.app/Contents/MacOS/Paseo",
+        resolveWorkspaceCli,
+      }),
+    ).toBe(path.join("/Applications/Paseo.app", "Contents", "Resources", "bin", "paseo"));
+  });
+});
diff --git a/packages/desktop/src/integrations/cli-install/path.ts b/packages/desktop/src/integrations/cli-install/path.ts
index c9114c2301..0cad7fc757 100644
--- a/packages/desktop/src/integrations/cli-install/path.ts
+++ b/packages/desktop/src/integrations/cli-install/path.ts
@@ -1,3 +1,5 @@
+import path from "node:path";
+
 export function resolveCliInstallSourcePath(input: {
   platform: NodeJS.Platform;
   isPackaged: boolean;
@@ -27,3 +29,19 @@ export function resolveCliInstallSourcePath(input: {
 
   return input.executablePath;
 }
+
+export function resolveCliShimPath(input: {
+  platform: NodeJS.Platform;
+  isPackaged: boolean;
+  executablePath: string;
+  resolveWorkspaceCli: () => string;
+}): string {
+  if (!input.isPackaged) return input.resolveWorkspaceCli();
+
+  const filename = input.platform === "win32" ? "paseo.cmd" : "paseo";
+  if (input.platform === "darwin") {
+    const bundle = input.executablePath.replace(/\/Contents\/MacOS\/.+$/, "");
+    return path.join(bundle, "Contents", "Resources", "bin", filename);
+  }
+  return path.join(path.dirname(input.executablePath), "resources", "bin", filename);
+}
diff --git a/packages/desktop/src/integrations/cli-install/paths.ts b/packages/desktop/src/integrations/cli-install/paths.ts
index 312a587892..1f7bf98f48 100644
--- a/packages/desktop/src/integrations/cli-install/paths.ts
+++ b/packages/desktop/src/integrations/cli-install/paths.ts
@@ -1,4 +1,6 @@
 import path from "node:path";
+import { createRequire } from "node:module";
+import { resolveCliShimPath } from "./path.js";
 import os from "node:os";
 import { app } from "electron";
 
@@ -12,20 +14,10 @@ export function getCliTargetPath(): string {
 }
 
 export function getBundledCliShimPath(): string {
-  const cliShimFilename = process.platform === "win32" ? "paseo.cmd" : "paseo";
-
-  if (process.platform === "darwin") {
-    const electronExePath = app.getPath("exe");
-    const appBundle = electronExePath.replace(/\/Contents\/MacOS\/.+$/, "");
-    return path.join(appBundle, "Contents", "Resources", "bin", cliShimFilename);
-  }
-
-  if (process.platform === "win32") {
-    const electronExePath = app.getPath("exe");
-    return path.join(path.dirname(electronExePath), "resources", "bin", cliShimFilename);
-  }
-
-  // Linux
-  const electronExePath = app.getPath("exe");
-  return path.join(path.dirname(electronExePath), "resources", "bin", cliShimFilename);
+  return resolveCliShimPath({
+    platform: process.platform,
+    isPackaged: app.isPackaged,
+    executablePath: app.getPath("exe"),
+    resolveWorkspaceCli: () => createRequire(__filename).resolve("@getpaseo/cli/bin/paseo"),
+  });
 }
diff --git a/packages/desktop/src/main.ts b/packages/desktop/src/main.ts
index b0610565ca..9acf329216 100644
--- a/packages/desktop/src/main.ts
+++ b/packages/desktop/src/main.ts
@@ -14,6 +14,7 @@ import {
   app,
   autoUpdater as electronAutoUpdater,
   BrowserWindow,
+  ClipboardItem,
   clipboard,
   Menu,
   ipcMain,
@@ -42,6 +43,7 @@ import {
   buildStandardContextMenuItems,
 } from "./window/window-manager.js";
 import { setupDarwinCompositorWatchdog } from "./window/compositor-watchdog/index.js";
+import { showWindowWhenReady } from "./window/show-when-ready.js";
 import { resolveDesktopWindowChromeMode, windowChromeModeArgument } from "./window/chrome.js";
 import { registerDialogHandlers } from "./features/dialogs.js";
 import {
@@ -130,6 +132,12 @@ const bootstrapComplete = new Promise<void>((resolve) => {
 let bootstrapIsComplete = false;
 
 app.setName(APP_NAME);
+log.info("[desktop] app startup", {
+  version: app.getVersion(),
+  platform: process.platform,
+  arch: process.arch,
+  isPackaged: app.isPackaged,
+});
 
 interface AttachedBrowserInput {
   browserId: string;
@@ -323,13 +331,6 @@ if (forcedUserDataDir) {
   }
 }
 
-// AppImage runtimes mount the app from /tmp under the user's UID, so the SUID
-// chrome-sandbox helper we ship in .deb/.rpm cannot work there. Disable the
-// sandbox only in that case; .deb/.rpm keep the sandbox on, matching VS Code.
-if (process.platform === "linux" && process.env.APPIMAGE) {
-  app.commandLine.appendSwitch("no-sandbox");
-}
-
 // Allow users to pass Chromium flags via PASEO_ELECTRON_FLAGS for debugging
 // rendering issues (e.g. "--disable-gpu --ozone-platform=x11").
 // Must run before app.whenReady().
@@ -342,6 +343,16 @@ if (electronFlags) {
   log.info("[electron-flags]", electronFlags);
 }
 
+if (process.platform === "linux") {
+  // Keep the desktop/dock identity independent of the wrapped Electron filename.
+  app.setDesktopName("Paseo.desktop");
+  if (!app.commandLine.hasSwitch("class")) app.commandLine.appendSwitch("class", "Paseo");
+  log.info("[linux-sandbox]", {
+    enabled: !app.commandLine.hasSwitch("no-sandbox"),
+    reason: process.env.PASEO_DESKTOP_SANDBOX_REASON ?? "Chromium default",
+  });
+}
+
 let pendingOpenProjectPath = parseOpenProjectPathFromArgv({
   argv: process.argv,
   isDefaultApp: process.defaultApp,
@@ -519,7 +530,19 @@ ipcMain.handle("paseo:browser:clear-profile", async (_event, rawLegacyBrowserIds
 const browserCapture = createBrowserCaptureService<Electron.NativeImage>({
   findGuest: getPaseoBrowserWebContentsForHostWindow,
   decodeImage: (dataUrl) => nativeImage.createFromDataURL(dataUrl),
-  clipboard,
+  clipboard: {
+    write: async ({ text, image }) => {
+      const items: Record<string, string | Blob> = {};
+      if (text) items["text/plain"] = text;
+      if (image) {
+        const png = image.toPNG();
+        const bytes = new Uint8Array(png.byteLength);
+        bytes.set(png);
+        items["image/png"] = new Blob([bytes], { type: "image/png" });
+      }
+      await clipboard.write([new ClipboardItem(items)]);
+    },
+  },
   warn: (event, details) => log.warn(`[browser-capture] ${event}`, details),
 });
 
@@ -615,7 +638,8 @@ async function getEffectiveAppIconPath(): Promise<string | null> {
 }
 
 async function applyAppIcon(): Promise<void> {
-  if (process.platform !== "darwin") {
+  // Packaged apps keep the bundle icon and its macOS system appearance.
+  if (app.isPackaged || process.platform !== "darwin") {
     return;
   }
 
@@ -750,8 +774,8 @@ async function createWindow(
     registerBrowserWebviewNavigationGuards(contents);
   });
 
-  mainWindow.once("ready-to-show", () => {
-    mainWindow.show();
+  showWindowWhenReady(mainWindow, {
+    showOnLoad: process.platform === "linux",
   });
 
   if (!app.isPackaged) {
@@ -1031,7 +1055,10 @@ const quitLifecycle = createQuitLifecycle({
 });
 
 // electron-updater forwards this event through Electron's built-in autoUpdater.
-electronAutoUpdater.on("before-quit-for-update", quitLifecycle.handleBeforeQuitForUpdate);
+electronAutoUpdater.on("before-quit-for-update", () => {
+  log.info("[auto-updater] before-quit-for-update", { currentVersion: app.getVersion() });
+  quitLifecycle.handleBeforeQuitForUpdate();
+});
 app.on("before-quit", quitLifecycle.handleBeforeQuit);
 registerExternalQuitSignals({ signals: process, quit: () => app.quit() });
 
diff --git a/packages/desktop/src/window/show-when-ready.test.ts b/packages/desktop/src/window/show-when-ready.test.ts
new file mode 100644
index 0000000000..756ad24cc2
--- /dev/null
+++ b/packages/desktop/src/window/show-when-ready.test.ts
@@ -0,0 +1,57 @@
+import { EventEmitter } from "node:events";
+import { describe, expect, it } from "vitest";
+import { showWindowWhenReady } from "./show-when-ready.js";
+
+class Window extends EventEmitter {
+  webContents = new EventEmitter();
+  shows = 0;
+  destroyed = false;
+  show() {
+    this.shows += 1;
+  }
+  isDestroyed() {
+    return this.destroyed;
+  }
+  close() {
+    this.destroyed = true;
+    this.emit("closed");
+  }
+}
+
+describe("showWindowWhenReady", () => {
+  it("shows a loaded Linux window even when no initial frame was painted", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    expect(win.shows).toBe(0);
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(1);
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(1);
+  });
+
+  it("shows on the first frame without showing again after load", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    win.emit("ready-to-show");
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(1);
+  });
+
+  it("preserves waiting for the initial frame when show on load is disabled", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: false });
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(0);
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(1);
+  });
+
+  it("keeps a closed window closed when readiness arrives later", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    win.close();
+    win.webContents.emit("did-finish-load");
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(0);
+  });
+});
diff --git a/packages/desktop/src/window/show-when-ready.ts b/packages/desktop/src/window/show-when-ready.ts
new file mode 100644
index 0000000000..e49c8518af
--- /dev/null
+++ b/packages/desktop/src/window/show-when-ready.ts
@@ -0,0 +1,25 @@
+interface ReadyToShowWindow {
+  once(event: "ready-to-show", listener: () => void): unknown;
+  webContents: {
+    once(event: "did-finish-load", listener: () => void): unknown;
+  };
+  show(): void;
+  isDestroyed(): boolean;
+}
+
+export function showWindowWhenReady(
+  win: ReadyToShowWindow,
+  options: { showOnLoad: boolean },
+): void {
+  let shown = false;
+  const show = () => {
+    if (shown || win.isDestroyed()) return;
+    shown = true;
+    win.show();
+  };
+
+  win.once("ready-to-show", show);
+  // On Linux a hidden window can wait for compositor frames until it is shown.
+  // Loading the document is sufficient to reveal it without depending on a frame.
+  if (options.showOnLoad) win.webContents.once("did-finish-load", show);
+}
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index f67d3b68a0..1e6bd41230 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index fc017fd3f6..02e9e28daa 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/highlight/src/__tests__/highlighter.test.ts b/packages/highlight/src/__tests__/highlighter.test.ts
index 2349854d85..c245d42da1 100644
--- a/packages/highlight/src/__tests__/highlighter.test.ts
+++ b/packages/highlight/src/__tests__/highlighter.test.ts
@@ -144,6 +144,97 @@ const title = "Hello";
     );
   });
 
+  it("keeps an Astro expression open through nested template strings", () => {
+    const code = "<p>{`a ${`}`} b`}</p>";
+
+    const tokens = highlightCode(code, "Nested.astro").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "`}`", style: "string" },
+        { text: " b`", style: "string" },
+      ]),
+    );
+  });
+
+  it("highlights Vue SFCs across script, template, and style", () => {
+    const code = [
+      '<script lang="ts">',
+      "  let count: number = 1;",
+      "</script>",
+      "",
+      "<template>",
+      '  <p v-if="count > 0" :class="badge">{{ { count: 1 } }}</p>',
+      "  <span>{{ 'a}}b' }} {{ { inner: 2 }}}</span>",
+      "</template>",
+      "",
+      "<style>",
+      "  .badge {",
+      "    color: red;",
+      "  }",
+      "</style>",
+    ].join("\n");
+
+    const tokens = highlightCode(code, "Counter.vue").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "let", style: "keyword" },
+        { text: "number", style: "type" },
+        { text: "template", style: "tag" },
+        { text: "v-if", style: "attribute" },
+        { text: "count", style: "definition" },
+        { text: "1", style: "number" },
+        { text: "'a}}b'", style: "string" },
+        { text: "inner", style: "definition" },
+        { text: "2", style: "number" },
+        { text: "badge", style: "class" },
+        { text: "color", style: "property" },
+      ]),
+    );
+  });
+
+  it("highlights a Vue SFC that contains an empty interpolation", () => {
+    const code = ["<template>", "  <p>{{}} {{ count }}</p>", "</template>"].join("\n");
+
+    const tokens = highlightCode(code, "Empty.vue").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "template", style: "tag" },
+        { text: "count", style: "variable" },
+      ]),
+    );
+  });
+
+  it("highlights quoted Vue directive values as code", () => {
+    const code = "<template><p v-if=\"count > 0\" :class='badge'>x</p></template>";
+
+    const tokens = highlightCode(code, "Directive.vue").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "count", style: "variable" },
+        { text: "0", style: "number" },
+        { text: "badge", style: "variable" },
+      ]),
+    );
+    expect(tokens).not.toContainEqual({ text: '"count > 0"', style: "string" });
+  });
+
+  it("keeps a Vue interpolation open through nested template strings", () => {
+    const code = "<template><p>{{ `a ${`}}`} b` }}</p></template>";
+
+    const tokens = highlightCode(code, "Nested.vue").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "`}}`", style: "string" },
+        { text: " b`", style: "string" },
+      ]),
+    );
+  });
+
   it("highlights TSX code with correct dialect", () => {
     const code = 'const el = <div className="test">hello</div>;';
     const result = highlightCode(code, "test.tsx");
diff --git a/packages/highlight/src/__tests__/parsers.test.ts b/packages/highlight/src/__tests__/parsers.test.ts
index 1d0d0ebcdd..b24872eb94 100644
--- a/packages/highlight/src/__tests__/parsers.test.ts
+++ b/packages/highlight/src/__tests__/parsers.test.ts
@@ -25,6 +25,7 @@ describe("isLanguageSupported", () => {
     expect(isLanguageSupported("test.ex")).toBe(true);
     expect(isLanguageSupported("Counter.svelte")).toBe(true);
     expect(isLanguageSupported("Page.astro")).toBe(true);
+    expect(isLanguageSupported("App.vue")).toBe(true);
   });
 
   it("returns false for unsupported file extensions", () => {
@@ -67,6 +68,7 @@ describe("getSupportedExtensions", () => {
     expect(extensions).toContain("json");
     expect(extensions).toContain("svelte");
     expect(extensions).toContain("astro");
+    expect(extensions).toContain("vue");
   });
 });
 
diff --git a/packages/highlight/src/astro/parser.ts b/packages/highlight/src/astro/parser.ts
index 444235488f..202c921252 100644
--- a/packages/highlight/src/astro/parser.ts
+++ b/packages/highlight/src/astro/parser.ts
@@ -14,6 +14,7 @@ import {
 import { parser as cssParser } from "@lezer/css";
 import { parser as htmlParser } from "@lezer/html";
 import { parser as jsParser } from "@lezer/javascript";
+import { findClosingBrace } from "../js-scanner.js";
 
 interface Range {
   from: number;
@@ -23,88 +24,11 @@ interface Range {
 const jsxParser = jsParser.configure({ dialect: "ts jsx" });
 const typescriptParser = jsParser.configure({ dialect: "ts" });
 
-function isSpace(code: number): boolean {
-  return code === 32 || code === 9 || code === 10 || code === 13;
-}
-
-function isRegexStart(text: string, position: number): boolean {
-  let previous = position - 1;
-  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
-  if (previous < 0) return true;
-
-  const character = text[previous];
-  if (/[)\]}<"'`\d]/.test(character)) return false;
-  const code = text.charCodeAt(previous);
-  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
-  if (!/[A-Za-z_$]/.test(character)) return true;
-
-  let start = previous;
-  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
-  const keyword = text.slice(start + 1, previous + 1);
-  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
-    keyword,
-  );
-}
-
-function skipQuotedText(text: string, opening: number): number {
-  const quote = text.charCodeAt(opening);
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 92) position++;
-    else if (code === quote) return position;
-  }
-  return text.length - 1;
-}
-
-function skipLineComment(text: string, opening: number): number {
-  const newline = text.indexOf("\n", opening + 2);
-  return newline >= 0 ? newline : text.length - 1;
-}
-
-function skipBlockComment(text: string, opening: number): number {
-  const closing = text.indexOf("*/", opening + 2);
-  return closing >= 0 ? closing + 1 : text.length - 1;
-}
-
-function skipRegex(text: string, opening: number): number {
-  let isInCharacterClass = false;
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 10 || code === 13) return position;
-    if (code === 92) position++;
-    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
-    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
-    else if (!isInCharacterClass && code === 47) return position;
-  }
-  return text.length - 1;
-}
-
-function findClosingBrace(text: string, opening: number): number {
-  let depth = 0;
-  for (let position = opening; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 47 && text.charCodeAt(position + 1) === 47) {
-      position = skipLineComment(text, position);
-    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
-      position = skipBlockComment(text, position);
-    } else if (code === 47 && isRegexStart(text, position)) {
-      position = skipRegex(text, position);
-    } else if (code === 34 || code === 39 || code === 96) {
-      position = skipQuotedText(text, position);
-    } else if (code === 123) {
-      depth++;
-    } else if (code === 125 && --depth === 0) {
-      return position;
-    }
-  }
-  return -1;
-}
-
 function findExpressions(text: string): Range[] {
   const ranges: Range[] = [];
   for (let position = 0; position < text.length; position++) {
     if (text.charCodeAt(position) !== 123) continue;
-    const closing = findClosingBrace(text, position);
+    const closing = findClosingBrace(text, position + 1);
     if (closing < 0) break;
     ranges.push({ from: position, to: closing });
     position = closing;
diff --git a/packages/highlight/src/js-scanner.ts b/packages/highlight/src/js-scanner.ts
new file mode 100644
index 0000000000..fb7f70ed77
--- /dev/null
+++ b/packages/highlight/src/js-scanner.ts
@@ -0,0 +1,100 @@
+// Scans JavaScript embedded in a template (Astro `{ }` expressions, Vue `{{ }}`
+// interpolations) for the brace that closes it, without parsing the code.
+
+function isSpace(code: number): boolean {
+  return code === 32 || code === 9 || code === 10 || code === 13;
+}
+
+function isRegexStart(text: string, position: number): boolean {
+  let previous = position - 1;
+  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
+  if (previous < 0) return true;
+
+  const character = text[previous];
+  if (/[)\]}<"'`\d]/.test(character)) return false;
+  const code = text.charCodeAt(previous);
+  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
+  if (!/[A-Za-z_$]/.test(character)) return true;
+
+  let start = previous;
+  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
+  const keyword = text.slice(start + 1, previous + 1);
+  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
+    keyword,
+  );
+}
+
+// Template strings nested deeper than this are treated as running to the end.
+const MAX_TEMPLATE_NESTING = 32;
+
+function skipQuotedText(text: string, opening: number, nesting = 0): number {
+  const quote = text.charCodeAt(opening);
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 92) position++;
+    else if (code === quote) return position;
+    else if (quote === 96 && code === 36 && text.charCodeAt(position + 1) === 123) {
+      position = skipTemplateSubstitution(text, position + 2, nesting);
+    }
+  }
+  return text.length - 1;
+}
+
+function skipTemplateSubstitution(text: string, start: number, nesting: number): number {
+  if (nesting >= MAX_TEMPLATE_NESTING) return text.length - 1;
+  const closing = findClosingBrace(text, start, () => true, nesting + 1);
+  return closing >= 0 ? closing : text.length - 1;
+}
+
+function skipLineComment(text: string, opening: number): number {
+  const newline = text.indexOf("\n", opening + 2);
+  return newline >= 0 ? newline : text.length - 1;
+}
+
+function skipBlockComment(text: string, opening: number): number {
+  const closing = text.indexOf("*/", opening + 2);
+  return closing >= 0 ? closing + 1 : text.length - 1;
+}
+
+function skipRegex(text: string, opening: number): number {
+  let isInCharacterClass = false;
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 10 || code === 13) return position;
+    if (code === 92) position++;
+    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
+    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
+    else if (!isInCharacterClass && code === 47) return position;
+  }
+  return text.length - 1;
+}
+
+// Finds the first `}` outside nested braces, strings, comments, and regexes
+// for which `isEnd` holds.
+export function findClosingBrace(
+  text: string,
+  start: number,
+  isEnd: (position: number) => boolean = () => true,
+  nesting = 0,
+): number {
+  let depth = 0;
+  for (let position = start; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 47 && text.charCodeAt(position + 1) === 47) {
+      position = skipLineComment(text, position);
+    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
+      position = skipBlockComment(text, position);
+    } else if (code === 47 && isRegexStart(text, position)) {
+      position = skipRegex(text, position);
+    } else if (code === 34 || code === 39 || code === 96) {
+      position = skipQuotedText(text, position, nesting);
+    } else if (code === 123) {
+      depth++;
+    } else if (code === 125 && depth === 0) {
+      if (isEnd(position)) return position;
+    } else if (code === 125) {
+      depth--;
+    }
+  }
+  return -1;
+}
diff --git a/packages/highlight/src/parsers.ts b/packages/highlight/src/parsers.ts
index 9ccb3129be..06c3129733 100644
--- a/packages/highlight/src/parsers.ts
+++ b/packages/highlight/src/parsers.ts
@@ -18,6 +18,7 @@ import { parser as elixirParser } from "lezer-elixir";
 import type { Parser } from "@lezer/common";
 import { csharpLanguage } from "./csharp/language.js";
 import { astroParser } from "./astro/parser.js";
+import { vueParser } from "./vue/parser.js";
 import { nixLanguage } from "./nix/language.js";
 import { parser as svelteBaseParser } from "./svelte/parser.js";
 import { configureNesting, defaultNesting } from "./svelte/nesting.js";
@@ -56,6 +57,8 @@ const languagesByExtension: Record<string, Language> = {
   svelte: language(svelteBaseParser.configure({ wrap: configureNesting(defaultNesting) })),
   // Astro
   astro: language(astroParser),
+  // Vue
+  vue: language(vueParser),
   // XML
   xml: language(xmlParser),
   // Java
diff --git a/packages/highlight/src/vue/parser.ts b/packages/highlight/src/vue/parser.ts
new file mode 100644
index 0000000000..5c54825b61
--- /dev/null
+++ b/packages/highlight/src/vue/parser.ts
@@ -0,0 +1,136 @@
+import {
+  type Input,
+  type NestedParse,
+  type SyntaxNode,
+  type SyntaxNodeRef,
+  parseMixed,
+} from "@lezer/common";
+import { parser as cssParser } from "@lezer/css";
+import { parser as htmlParser } from "@lezer/html";
+import { parser as jsParser } from "@lezer/javascript";
+import { findClosingBrace } from "../js-scanner.js";
+
+interface Range {
+  from: number;
+  to: number;
+}
+
+const typescriptParser = jsParser.configure({ dialect: "ts" });
+const expressionParser = jsParser.configure({ top: "SingleExpression" });
+
+function findInterpolationEnd(text: string, start: number): number {
+  return findClosingBrace(text, start, (position) => text.charCodeAt(position + 1) === 125);
+}
+
+function findExpressions(text: string): Range[] {
+  const ranges: Range[] = [];
+  for (let position = 0; position < text.length; position++) {
+    if (text.charCodeAt(position) !== 123) continue;
+    if (text.charCodeAt(position + 1) !== 123) continue;
+    const closing = findInterpolationEnd(text, position + 2);
+    if (closing < 0) break;
+    // Lezer rejects empty inner ranges, so `{{}}` gets no nested parse.
+    if (closing > position + 2) ranges.push({ from: position + 2, to: closing });
+    position = closing + 1;
+  }
+  return ranges;
+}
+
+function findDirectiveExpression(value: string): Range | null {
+  const quote = value[0];
+  const isQuoted = (quote === '"' || quote === "'") && value.length >= 2 && value.endsWith(quote);
+  const inner = isQuoted ? value.slice(1, -1) : value;
+  const trimmed = inner.trim();
+  if (!trimmed) return null;
+  const from = (isQuoted ? 1 : 0) + inner.indexOf(trimmed);
+  return { from, to: from + trimmed.length };
+}
+
+function getOpenTagAttributes(node: SyntaxNode, input: Input): Record<string, string> {
+  const attributes: Record<string, string> = Object.create(null);
+  const openTag = node.getChild("OpenTag");
+  if (!openTag) return attributes;
+
+  for (const attribute of openTag.getChildren("Attribute")) {
+    const name = attribute.getChild("AttributeName");
+    if (!name) continue;
+    const value =
+      attribute.getChild("AttributeValue") || attribute.getChild("UnquotedAttributeValue");
+    const key = input.read(name.from, name.to).toLowerCase();
+    attributes[key] = value ? input.read(value.from, value.to).replace(/^["']|["']$/g, "") : "";
+  }
+  return attributes;
+}
+
+function isDirectiveAttribute(attribute: string): boolean {
+  return (
+    attribute.startsWith("v-") ||
+    attribute.startsWith(":") ||
+    attribute.startsWith("@") ||
+    attribute.startsWith(".")
+  );
+}
+
+function directiveOverlay(
+  node: SyntaxNodeRef,
+  parent: SyntaxNode,
+  input: Input,
+): NestedParse | null {
+  const attributeName = parent.getChild("AttributeName");
+  if (!attributeName) return null;
+  if (!isDirectiveAttribute(input.read(attributeName.from, attributeName.to).toLowerCase())) {
+    return null;
+  }
+
+  const range = findDirectiveExpression(input.read(node.from, node.to));
+  if (!range) return null;
+  return {
+    parser: expressionParser,
+    overlay: [{ from: node.from + range.from, to: node.from + range.to }],
+  };
+}
+
+function textOverlay(node: SyntaxNodeRef, input: Input): NestedParse | null {
+  const overlays = findExpressions(input.read(node.from, node.to)).map(({ from, to }) => ({
+    from: node.from + from,
+    to: node.from + to,
+  }));
+  return overlays.length > 0 ? { parser: expressionParser, overlay: overlays } : null;
+}
+
+function templateOverlay(node: SyntaxNodeRef, input: Input): NestedParse | null {
+  const parent = node.node.parent;
+  if (parent?.name === "Attribute") return directiveOverlay(node, parent, input);
+  if (node.name !== "Text") return null;
+  return textOverlay(node, input);
+}
+
+function scriptLanguage(attributes: Record<string, string>): NestedParse | null {
+  if (attributes.src) return null;
+
+  const language = (attributes.lang || attributes.type || "").toLowerCase();
+  if (language.includes("tsx")) return { parser: jsParser.configure({ dialect: "ts jsx" }) };
+  if (language.includes("typescript") || language === "ts") return { parser: typescriptParser };
+  if (language.includes("jsx")) return { parser: jsParser.configure({ dialect: "jsx" }) };
+  return { parser: jsParser };
+}
+
+function scriptOverlay(node: SyntaxNodeRef, input: Input): NestedParse | null {
+  const parent = node.node.parent;
+  if (!parent) return null;
+  return scriptLanguage(getOpenTagAttributes(parent, input));
+}
+
+function nestedLanguage(node: SyntaxNodeRef, input: Input): NestedParse | null {
+  const name = node.name;
+  if (name === "Text" || name === "UnquotedAttributeValue" || name === "AttributeValue") {
+    return templateOverlay(node, input);
+  }
+  if (name === "StyleText") return { parser: cssParser };
+  if (name === "ScriptText") return scriptOverlay(node, input);
+  return null;
+}
+
+export const vueParser = htmlParser.configure({
+  wrap: parseMixed(nestedLanguage),
+});
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 11b88c513d..2797c32211 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -14,19 +14,44 @@
       "default": "./dist/index.js"
     },
     "./server": {
-      "types": "./dist/server.d.ts",
-      "source": "./src/server.ts",
-      "default": "./dist/server.js"
+      "types": "./dist/server/index.d.ts",
+      "source": "./src/server/index.ts",
+      "default": "./dist/server/index.js"
     },
-    "./react-native": {
-      "types": "./dist/react-native.d.ts",
-      "source": "./src/react-native.ts",
-      "default": "./dist/react-native.js"
+    "./server/provider": {
+      "types": "./dist/server/provider.d.ts",
+      "source": "./src/server/provider.ts",
+      "default": "./dist/server/provider.js"
     },
-    "./host": {
-      "types": "./dist/host.d.ts",
-      "source": "./src/host.ts",
-      "default": "./dist/host.js"
+    "./server/usage": {
+      "types": "./dist/server/usage.d.ts",
+      "source": "./src/server/usage.ts",
+      "default": "./dist/server/usage.js"
+    },
+    "./server/acp": {
+      "types": "./dist/server/acp.d.ts",
+      "source": "./src/server/acp.ts",
+      "default": "./dist/server/acp.js"
+    },
+    "./client/react-native": {
+      "types": "./dist/client/react-native.d.ts",
+      "source": "./src/client/react-native.ts",
+      "default": "./dist/client/react-native.js"
+    },
+    "./client/host": {
+      "types": "./dist/client/host.d.ts",
+      "source": "./src/client/host.ts",
+      "default": "./dist/client/host.js"
+    },
+    "./client/ui": {
+      "types": "./dist/client/ui.d.ts",
+      "source": "./src/client/ui.ts",
+      "default": "./dist/client/ui.js"
+    },
+    "./client": {
+      "types": "./dist/client/index.d.ts",
+      "source": "./src/client/index.ts",
+      "default": "./dist/client/index.js"
     }
   },
   "publishConfig": {
@@ -41,22 +66,30 @@
     "test": "vitest run"
   },
   "dependencies": {
+    "@agentclientprotocol/sdk": "^1.4.0",
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.7.2",
-    "@getpaseo/protocol": "0.7.2",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
+    "react-native": "0.81.5",
     "typescript": "^5.9.3",
     "vitest": "^4.1.6",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.7.2",
-    "@getpaseo/protocol": "0.7.2",
-    "react": "19.1.0",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
+    "react": "~19.1.0",
+    "react-native": ">=0.81.5",
     "zod": "^4.4.3"
+  },
+  "peerDependenciesMeta": {
+    "react-native": {
+      "optional": true
+    }
   }
 }
diff --git a/packages/plugin/src/attachments.ts b/packages/plugin/src/attachments.ts
index ee7c2b0888..27ca706dd7 100644
--- a/packages/plugin/src/attachments.ts
+++ b/packages/plugin/src/attachments.ts
@@ -1,4 +1,11 @@
 import { z } from "zod";
+import type { PluginAttachmentSourceContribution } from "./contracts.js";
+
+export function defineAttachmentSource<Definition extends PluginAttachmentSourceContribution>(
+  definition: Definition,
+): Definition {
+  return definition;
+}
 
 export const PluginAttachmentItemSchema = z.object({
   id: z.string(),
diff --git a/packages/plugin/src/boundaries.test.ts b/packages/plugin/src/boundaries.test.ts
new file mode 100644
index 0000000000..5b1ce4f3dc
--- /dev/null
+++ b/packages/plugin/src/boundaries.test.ts
@@ -0,0 +1,129 @@
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import path from "node:path";
+import { isBuiltin } from "node:module";
+import { fileURLToPath } from "node:url";
+import ts from "typescript";
+import { describe, expect, it } from "vitest";
+import * as server from "./server/index.js";
+
+const sourceDirectory = path.dirname(fileURLToPath(import.meta.url));
+const entries = {
+  ".": "shared",
+  "./server": "server",
+  "./server/provider": "server",
+  "./server/usage": "server",
+  "./server/acp": "server",
+  "./client": "client",
+  "./client/host": "client",
+  "./client/react-native": "client",
+  "./client/ui": "client",
+} as const;
+const uiDependency = /^(react(?:-dom|-native)?|use-sync-external-store)(\/|$)/;
+const serverModule = /^server\//;
+const clientModule = /^client\//;
+
+function resolveLocal(importer: string, specifier: string): string {
+  const base = path.resolve(path.dirname(importer), specifier.replace(/\.js$/, ""));
+  const result = [base + ".ts", base + ".tsx"].find(existsSync);
+  if (!result) throw new Error(`Cannot resolve ${specifier} from ${importer}`);
+  return result;
+}
+
+function boundaryViolations(entry: string, runtime: "shared" | "server" | "client"): string[] {
+  const pending = [entry];
+  const visited = new Set<string>();
+  const violations: string[] = [];
+  while (pending.length) {
+    const file = pending.pop()!;
+    if (visited.has(file)) continue;
+    visited.add(file);
+    // Includes type imports, re-exports, import types, and literal dynamic imports.
+    const imports = ts.preProcessFile(readFileSync(file, "utf8"), true, true).importedFiles;
+    for (const { fileName: specifier } of imports) {
+      const label = `${path.relative(sourceDirectory, file)} -> ${specifier}`;
+      if (specifier.startsWith(".")) {
+        const local = resolveLocal(file, specifier);
+        const module = path
+          .relative(sourceDirectory, local)
+          .replace(/\\/g, "/")
+          .replace(/\.tsx?$/, ".js");
+        if (runtime !== "client" && clientModule.test(module)) violations.push(label);
+        if (runtime !== "server" && serverModule.test(module)) violations.push(label);
+        pending.push(local);
+      } else if (runtime === "shared") {
+        if (specifier !== "zod" && specifier !== "@getpaseo/protocol/agent-types")
+          violations.push(label);
+      } else if (runtime === "server") {
+        if (uiDependency.test(specifier) || /^@getpaseo\/plugin\/client(\/|$)/.test(specifier))
+          violations.push(label);
+      } else if (isBuiltin(specifier) || /^@getpaseo\/plugin\/server(\/|$)/.test(specifier)) {
+        violations.push(label);
+      }
+    }
+  }
+  return violations;
+}
+
+describe("plugin SDK import boundaries", () => {
+  it("publishes process capabilities without their Windows implementation helpers", () => {
+    expect(Object.keys(server).sort()).toEqual(["execCommand", "spawnProcess", "terminateProcess"]);
+  });
+
+  it("classifies every published entry", () => {
+    const manifest = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+    expect(Object.keys(manifest.exports).sort()).toEqual(Object.keys(entries).sort());
+  });
+
+  it.each(Object.entries(entries))(
+    "%s respects its %s boundary, including type dependencies",
+    (specifier, runtime) => {
+      const name =
+        specifier === "."
+          ? "index"
+          : specifier.slice(2) +
+            (specifier === "./client" || specifier === "./server" ? "/index" : "");
+      expect(boundaryViolations(path.join(sourceDirectory, `${name}.ts`), runtime)).toEqual([]);
+    },
+  );
+});
+
+describe("plugin example import boundaries", () => {
+  const examples = path.resolve(sourceDirectory, "../../../plugin-examples");
+  const files = readdirSync(examples, { recursive: true }).filter((file) =>
+    /(?<!\.test)\.tsx?$/.test(file),
+  );
+  const owner = (file: string) => {
+    const [, directory] = path.relative(examples, file).split(path.sep);
+    if (directory?.startsWith("index.client.")) return "client";
+    if (directory?.startsWith("index.server.")) return "server";
+    return directory;
+  };
+
+  it.each(files)("%s respects runtime ownership, including type imports", (relative) => {
+    const file = path.join(examples, relative);
+    const runtime = owner(file);
+    expect(["shared", "client", "server"]).toContain(runtime);
+    const violations: string[] = [];
+    for (const { fileName: specifier } of ts.preProcessFile(readFileSync(file, "utf8"), true, true)
+      .importedFiles) {
+      if (specifier.startsWith(".")) {
+        const imported = owner(resolveLocal(file, specifier));
+        if (imported !== "shared" && imported !== runtime) violations.push(specifier);
+      } else if (specifier.startsWith("@getpaseo/plugin")) {
+        const entry = specifier.replace("@getpaseo/plugin", ".") as keyof typeof entries;
+        if (
+          entry === "./client/host" ||
+          !(entry in entries) ||
+          (entries[entry] !== "shared" && entries[entry] !== runtime)
+        )
+          violations.push(specifier);
+      } else if (
+        (runtime !== "client" && uiDependency.test(specifier)) ||
+        (runtime !== "server" && isBuiltin(specifier))
+      ) {
+        violations.push(specifier);
+      }
+    }
+    expect(violations).toEqual([]);
+  });
+});
diff --git a/packages/plugin/src/client/buttons.ts b/packages/plugin/src/client/buttons.ts
new file mode 100644
index 0000000000..f5272e7ae4
--- /dev/null
+++ b/packages/plugin/src/client/buttons.ts
@@ -0,0 +1,57 @@
+import type { ComponentType } from "react";
+import type { PluginHostProps } from "./contracts.js";
+
+export type PluginButtonContext =
+  | { context: "workspace"; workspaceId: string }
+  | { context: "agent"; workspaceId: string; agentId: string };
+
+export type PluginButtonIconProps = PluginHostProps &
+  PluginButtonContext & { size: number; color: string };
+
+export type PluginButtonContentProps = PluginHostProps & PluginButtonContext & { close(): void };
+
+export type PluginButtonIcon = string | ComponentType<PluginButtonIconProps>;
+
+export type PluginButtonBehavior =
+  | { kind: "action"; onPress(): void | Promise<void> }
+  | { kind: "menu"; items: readonly PluginButtonMenuEntry[] }
+  | { kind: "popover"; Content: ComponentType<PluginButtonContentProps> };
+
+export type PluginButtonMenuEntry =
+  | { kind: "separator"; id: string }
+  | {
+      kind: "item";
+      id: string;
+      title: string;
+      icon?: PluginButtonIcon;
+      visible?: boolean;
+      disabled?: boolean;
+      behavior: PluginButtonBehavior;
+    };
+
+export interface PluginButton {
+  title: string;
+  icon: PluginButtonIcon;
+  /** Omit for an icon-only header button. Composer pills use title when omitted. */
+  label?: string;
+  visible?: boolean;
+  disabled?: boolean;
+  behavior: PluginButtonBehavior;
+}
+
+export interface PluginButtonRegistration {
+  /** Updates presentation in place. Supply a complete behavior to replace it. */
+  update(patch: Partial<PluginButton>): void;
+  /** Idempotent. Updates after removal do nothing. */
+  remove(): void;
+}
+
+export interface PluginHeaderButtonContribution {
+  id: string;
+  workspaceId: string;
+  button: PluginButton;
+}
+
+export interface PluginComposerPillContribution extends PluginHeaderButtonContribution {
+  agentId: string;
+}
diff --git a/packages/plugin/src/client-state.tsx b/packages/plugin/src/client/client-state.tsx
similarity index 98%
rename from packages/plugin/src/client-state.tsx
rename to packages/plugin/src/client/client-state.tsx
index 9797e8d965..b1c853ecec 100644
--- a/packages/plugin/src/client-state.tsx
+++ b/packages/plugin/src/client/client-state.tsx
@@ -1,6 +1,6 @@
 import { createContext, useContext, type ReactNode } from "react";
 import { useSyncExternalStoreWithSelector } from "use-sync-external-store/shim/with-selector";
-import type { PluginAgentSnapshot, PluginWorkspaceSnapshot } from "./contracts.js";
+import type { PluginAgentSnapshot, PluginWorkspaceSnapshot } from "../contracts.js";
 import { shallowEqual } from "./shallow.js";
 
 export interface PluginClientStateSource {
diff --git a/packages/plugin/src/client/contracts.ts b/packages/plugin/src/client/contracts.ts
new file mode 100644
index 0000000000..5bc82d8a58
--- /dev/null
+++ b/packages/plugin/src/client/contracts.ts
@@ -0,0 +1,308 @@
+import type { ComponentType } from "react";
+import type { PaseoApi } from "@getpaseo/client";
+import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+import type { ZodType, input as ZodInput, output as ZodOutput } from "zod";
+import type { PluginRpcContract } from "../rpc.js";
+import type {
+  PluginButtonRegistration,
+  PluginHeaderButtonContribution,
+  PluginComposerPillContribution,
+} from "./buttons.js";
+import type {
+  PluginTheme,
+  PluginWorkspaceSnapshot,
+  PluginAgentSnapshot,
+  PluginThemeContribution,
+  PluginAttachmentSourceContribution,
+  PluginTimelineTransformResult,
+  PluginCleanup,
+} from "../contracts.js";
+
+export interface PluginHostProps {
+  theme: PluginTheme;
+  host: {
+    id: string;
+    label: string;
+  };
+  layout: {
+    compact: boolean;
+    platform: "ios" | "android" | "web";
+  };
+}
+
+interface PluginNavigableHostProps extends PluginHostProps {
+  /** Client-owned navigation. Undefined on older hosts; hide dependent affordances when absent. */
+  readonly navigation?: {
+    /** Present only on Electron. The browser runs locally; serverId selects workspace ownership. */
+    readonly openBrowser?: (input: {
+      readonly url: string;
+      readonly workspaceId: string;
+      readonly serverId?: string;
+    }) => void;
+    readonly openAgent: (input: { readonly agentId: string; readonly serverId?: string }) => void;
+    readonly openWorkspace: (input: {
+      readonly workspaceId: string;
+      readonly serverId?: string;
+    }) => void;
+  };
+}
+
+/** String keys and values: params travel in the screen's URL. */
+export type PluginScreenParams = Record<string, string>;
+
+export interface PluginOpenScreenInput {
+  screenId: string;
+  params?: PluginScreenParams;
+}
+
+export interface PluginScreenLocation {
+  screenId: string;
+  params: PluginScreenParams;
+}
+
+export interface PluginSurfaceProps extends PluginNavigableHostProps {}
+
+export interface PluginScreenProps extends PluginSurfaceProps {
+  /** The params the screen was opened with; `{}` when none. */
+  params: PluginScreenParams;
+}
+
+export interface PluginPopoverProps extends PluginHostProps {
+  close(): void;
+  openScreen(input: PluginOpenScreenInput): void;
+}
+
+export interface PluginSidebarItemProps extends PluginHostProps {
+  /** This plugin's screen open on this item's host, with its params, else null. */
+  currentScreen: PluginScreenLocation | null;
+  openScreen(input: PluginOpenScreenInput): void;
+  /** Anchored to the item on wide layouts; a bottom sheet on compact layouts. */
+  openPopover(Content: ComponentType<PluginPopoverProps>): void;
+}
+
+export interface PluginSidebarItemContribution {
+  id: string;
+  /** Settings row label, accessibility label, and default label for SidebarRow. */
+  title: string;
+  Component: ComponentType<PluginSidebarItemProps>;
+}
+
+export interface PluginIconProps {
+  name: string;
+  size?: number;
+  color?: string;
+}
+
+export type PluginPanelLocation = "workspace" | "explorer";
+
+export interface PluginOpenPanelOptions {
+  location?: PluginPanelLocation;
+}
+
+interface PluginWorkspacePanelBase {
+  id: string;
+  title: string;
+  icon: string;
+  locations?: readonly PluginPanelLocation[];
+}
+
+export interface PluginWorkspacePanelProps extends PluginNavigableHostProps {
+  context: "workspace";
+  workspaceId: string;
+}
+
+export interface PluginAgentPanelProps extends PluginNavigableHostProps {
+  context: "agent";
+  workspaceId: string;
+  agentId: string;
+}
+
+export interface PluginClientOpenPanelOptions extends PluginOpenPanelOptions {
+  workspaceId: string;
+  agentId?: string;
+}
+
+// COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
+interface PluginClientContextAliases {
+  /** @deprecated Use `addScreen`. */
+  addSurface(id: string, Component: ComponentType<PluginSurfaceProps>): PluginCleanup;
+  /** @deprecated Use `addSidebarHeaderItem`. */
+  addSidebarItem(contribution: PluginSidebarContribution): PluginCleanup;
+}
+
+export interface PluginClientContext extends PluginCommandCapabilities, PluginClientContextAliases {
+  /** Play a base64-encoded audio file on this client; resolves when playback ends. */
+  playAudio(source: { base64: string; mimeType: string }): Promise<void>;
+  addSettingsScreen(contribution: PluginSettingsScreenContribution): PluginCleanup;
+  addScreen(contribution: PluginScreenContribution): PluginCleanup;
+  addSidebarHeaderItem(contribution: PluginSidebarItemContribution): PluginCleanup;
+  addSidebarFooterItem(contribution: PluginSidebarItemContribution): PluginCleanup;
+  addWorkspacePanel(contribution: PluginWorkspacePanelContribution): PluginCleanup;
+  addCommandCenterItem(contribution: PluginCommandCenterItemContribution): PluginCleanup;
+  addSlashCommand(contribution: PluginClientSlashCommandContribution): PluginCleanup;
+  addHeaderButton(contribution: PluginHeaderButtonContribution): PluginButtonRegistration;
+  addComposerPill(contribution: PluginComposerPillContribution): PluginButtonRegistration;
+  addAttachmentSource(contribution: PluginAttachmentSourceContribution): PluginCleanup;
+  addTheme(contribution: PluginThemeContribution): PluginCleanup;
+  addTimelineTransformer<ItemType extends AgentTimelineItem["type"]>(
+    contribution: PluginTimelineTransformerContribution<ItemType>,
+  ): PluginCleanup;
+  addTimelineRenderer<Schema extends ZodType>(
+    contribution: PluginTimelineRendererContribution<Schema>,
+  ): PluginCleanup;
+  openPanel(id: string, options: PluginClientOpenPanelOptions): void;
+}
+
+export type PluginClientContribution = (client: PluginClientContext) => PluginCleanup;
+
+export type PluginWorkspacePanelContribution =
+  | (PluginWorkspacePanelBase & {
+      context: "workspace";
+      Component: ComponentType<PluginWorkspacePanelProps>;
+    })
+  | (PluginWorkspacePanelBase & {
+      context: "agent";
+      Component: ComponentType<PluginAgentPanelProps>;
+    });
+
+export interface PluginSettingsScreenContribution {
+  id: string;
+  title: string;
+  icon: string;
+  Component: ComponentType<PluginSurfaceProps>;
+}
+
+/** The screen header's title: fixed, or derived from the params the screen was opened with. */
+export type PluginScreenTitle = string | ((params: PluginScreenParams) => string);
+
+export interface PluginScreenContribution {
+  id: string;
+  title: PluginScreenTitle;
+  Component: ComponentType<PluginScreenProps>;
+}
+
+export interface PluginSurfaceContribution {
+  id: string;
+  Component: ComponentType<PluginSurfaceProps>;
+}
+
+/** @deprecated Use `PluginSidebarItemContribution` with `addSidebarHeaderItem`. */
+export interface PluginSidebarContribution {
+  id: string;
+  title: string;
+  icon: string;
+  surface: string;
+}
+
+export type PluginTimelineTransformerContribution<
+  ItemType extends AgentTimelineItem["type"] = AgentTimelineItem["type"],
+> = ItemType extends AgentTimelineItem["type"]
+  ? {
+      id: string;
+      query: {
+        itemType: ItemType;
+      };
+      transform(input: {
+        item: Extract<AgentTimelineItem, { type: ItemType }>;
+        phase: "streaming" | "complete";
+      }): PluginTimelineTransformResult | undefined;
+    }
+  : never;
+
+export interface PluginTimelineItemProps<Data = unknown> extends PluginHostProps {
+  agentId: string;
+  item: {
+    type: "plugin";
+    kind: string;
+    version: number;
+    data: Data;
+  };
+  timestamp: Date;
+}
+
+export interface PluginTimelineRendererContribution<Schema extends ZodType = ZodType> {
+  kind: string;
+  version: number;
+  schema: Schema;
+  Component: ComponentType<PluginTimelineItemProps<ZodOutput<Schema>>>;
+}
+
+export interface PluginCommandCapabilities {
+  paseo: PaseoApi;
+  rpc<InputSchema extends ZodType, OutputSchema extends ZodType>(
+    contract: PluginRpcContract<InputSchema, OutputSchema>,
+    input: ZodInput<InputSchema>,
+  ): Promise<ZodOutput<OutputSchema>>;
+  openScreen(input: PluginOpenScreenInput): void;
+  /** @deprecated Use `openScreen`. */
+  openSurface(id: string): void;
+  openSettings(id: string): void;
+}
+
+export interface PluginGlobalCommandContext extends PluginCommandCapabilities {
+  context: "global";
+}
+
+export interface PluginWorkspaceCommandContext extends PluginCommandCapabilities {
+  context: "workspace";
+  workspace: PluginWorkspaceSnapshot;
+  openPanel(id: string, options?: PluginOpenPanelOptions): void;
+}
+
+export interface PluginAgentCommandContext extends PluginCommandCapabilities {
+  context: "agent";
+  workspace: PluginWorkspaceSnapshot;
+  agent: PluginAgentSnapshot;
+  openPanel(id: string, options?: PluginOpenPanelOptions): void;
+}
+
+interface PluginCommandCenterItemBase {
+  id: string;
+  title: string;
+  icon: string;
+  keywords?: readonly string[];
+}
+
+export type PluginCommandCenterItemContribution =
+  | (PluginCommandCenterItemBase & {
+      context: "global";
+      onSelect(context: PluginGlobalCommandContext): void | Promise<void>;
+    })
+  | (PluginCommandCenterItemBase & {
+      context: "workspace";
+      onSelect(context: PluginWorkspaceCommandContext): void | Promise<void>;
+    })
+  | (PluginCommandCenterItemBase & {
+      context: "agent";
+      onSelect(context: PluginAgentCommandContext): void | Promise<void>;
+    });
+
+interface PluginClientSlashCommandBase {
+  name: string;
+  description: string;
+  argumentHint: string;
+}
+
+export type PluginClientSlashCommandContribution =
+  | (PluginClientSlashCommandBase & {
+      context: "workspace";
+      onSubmit(context: PluginWorkspaceCommandContext & { args: string }): void | Promise<void>;
+    })
+  | (PluginClientSlashCommandBase & {
+      context: "agent";
+      onSubmit(context: PluginAgentCommandContext & { args: string }): void | Promise<void>;
+    });
+
+export type SettingsState<Schema extends ZodType> = (
+  | { status: "loading" }
+  | { status: "error"; error: string }
+  | { status: "invalid"; error: string; revision: string }
+  | { status: "ready"; values: ZodOutput<Schema>; revision: string }
+) & {
+  saving: boolean;
+  saveError: string | null;
+  /** Save an entire document against the revision currently displayed. Never throws. */
+  save(values: ZodOutput<Schema>, revision: string): Promise<boolean>;
+  reset(): Promise<boolean>;
+  reload(): Promise<void>;
+};
diff --git a/packages/plugin/src/host.test.ts b/packages/plugin/src/client/host.test.ts
similarity index 99%
rename from packages/plugin/src/host.test.ts
rename to packages/plugin/src/client/host.test.ts
index 58aab65603..894fe832a5 100644
--- a/packages/plugin/src/host.test.ts
+++ b/packages/plugin/src/client/host.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, expectTypeOf, it } from "vitest";
 import { z } from "zod";
-import { defineAttachmentSource, defineRpc, type RpcInput, type RpcOutput } from "./index.js";
+import { defineAttachmentSource, defineRpc, type RpcInput, type RpcOutput } from "../index.js";
 import { callPluginRpc, searchPluginAttachments } from "./host.js";
 
 const contract = defineRpc({
diff --git a/packages/plugin/src/host.ts b/packages/plugin/src/client/host.ts
similarity index 78%
rename from packages/plugin/src/host.ts
rename to packages/plugin/src/client/host.ts
index 6fd4d7aaac..6cd42863e5 100644
--- a/packages/plugin/src/host.ts
+++ b/packages/plugin/src/client/host.ts
@@ -1,13 +1,13 @@
-import { PluginAttachmentSearchPayloadSchema } from "./attachments.js";
+import { PluginAttachmentSearchPayloadSchema } from "../attachments.js";
 export { PluginClientStateProvider, type PluginClientStateSource } from "./client-state.js";
 export {
   usePluginRuntimeContextBridge,
   type PluginRuntimeContextBridge,
 } from "./runtime-context-bridge.js";
-import type { PluginAttachmentSourceContribution } from "./contracts.js";
+import type { PluginAttachmentSourceContribution } from "../contracts.js";
 import { PluginRpcProvider } from "./rpc-context.js";
 import { PaseoApiProvider } from "./paseo-context.js";
-import { callPluginRpc } from "./rpc.js";
+import { callPluginRpc } from "../rpc.js";
 
 export async function searchPluginAttachments(
   source: PluginAttachmentSourceContribution,
diff --git a/packages/plugin/src/client/index.ts b/packages/plugin/src/client/index.ts
new file mode 100644
index 0000000000..810462354f
--- /dev/null
+++ b/packages/plugin/src/client/index.ts
@@ -0,0 +1,69 @@
+export type {
+  PluginHostProps,
+  PluginSurfaceProps,
+  PluginScreenProps,
+  PluginPopoverProps,
+  PluginScreenParams,
+  PluginOpenScreenInput,
+  PluginScreenLocation,
+  PluginSidebarItemProps,
+  PluginSidebarItemContribution,
+  PluginIconProps,
+  PluginPanelLocation,
+  PluginOpenPanelOptions,
+  PluginWorkspacePanelProps,
+  PluginAgentPanelProps,
+  PluginClientOpenPanelOptions,
+  PluginClientContext,
+  PluginClientContribution,
+  PluginWorkspacePanelContribution,
+  PluginSettingsScreenContribution,
+  PluginSurfaceContribution,
+  PluginScreenContribution,
+  PluginScreenTitle,
+  PluginSidebarContribution,
+  PluginTimelineTransformerContribution,
+  PluginTimelineItemProps,
+  PluginTimelineRendererContribution,
+  PluginCommandCapabilities,
+  PluginGlobalCommandContext,
+  PluginWorkspaceCommandContext,
+  PluginAgentCommandContext,
+  PluginCommandCenterItemContribution,
+  PluginClientSlashCommandContribution,
+  SettingsState,
+} from "./contracts.js";
+export type {
+  PluginButton,
+  PluginButtonBehavior,
+  PluginButtonContentProps,
+  PluginButtonContext,
+  PluginButtonIcon,
+  PluginButtonIconProps,
+  PluginButtonMenuEntry,
+  PluginButtonRegistration,
+  PluginComposerPillContribution,
+  PluginHeaderButtonContribution,
+} from "./buttons.js";
+export { usePaseo } from "./paseo-context.js";
+export { useAgent, useWorkspace } from "./client-state.js";
+export { useRpc } from "./rpc-context.js";
+import type { SettingsDefinition } from "../settings.js";
+import type { SettingsState } from "./contracts.js";
+import type { ZodType } from "zod";
+export declare function useSettings<Schema extends ZodType>(
+  definition: SettingsDefinition<Schema>,
+): SettingsState<Schema>;
+
+/** Configured app host, including hosts that are currently disconnected. */
+export interface PluginHostSummary {
+  readonly serverId: string;
+  readonly label: string;
+  readonly status: "idle" | "connecting" | "online" | "offline" | "error";
+}
+/** Live configured hosts. Supplied by the app's client bundle loader. */
+export declare function useHosts(): readonly PluginHostSummary[];
+/** Borrow an online host's API under this installation's lifetime. */
+export declare function getPaseoClient(serverId: string): import("@getpaseo/client").PaseoApi;
+/** Open an absolute HTTP(S) URL using the client platform’s external opener. */
+export declare function openExternalUrl(url: string): Promise<void>;
diff --git a/packages/plugin/src/paseo-context.tsx b/packages/plugin/src/client/paseo-context.tsx
similarity index 100%
rename from packages/plugin/src/paseo-context.tsx
rename to packages/plugin/src/client/paseo-context.tsx
diff --git a/packages/plugin/src/client/react-native.ts b/packages/plugin/src/client/react-native.ts
new file mode 100644
index 0000000000..ea196c433f
--- /dev/null
+++ b/packages/plugin/src/client/react-native.ts
@@ -0,0 +1,76 @@
+import type {
+  ComponentType,
+  FunctionComponent,
+  ReactNode,
+  ForwardRefExoticComponent,
+  RefAttributes,
+  ReactElement,
+  Ref,
+} from "react";
+import type {
+  StyleProp,
+  ViewStyle,
+  ScrollView as NativeScrollView,
+  ScrollViewProps,
+  FlatList as NativeFlatList,
+  FlatListProps,
+  TextInput as NativeTextInput,
+  TextInputProps,
+} from "react-native";
+import type { PluginIconProps } from "./contracts.js";
+
+export interface ModalProps {
+  title: string;
+  icon?: ReactNode;
+  open: boolean;
+  onOpenChange(open: boolean): void;
+  children: ReactNode;
+}
+
+export interface ModalContentProps {
+  children: ReactNode;
+  /** Paint the full body below the header. */
+  style?: StyleProp<ViewStyle>;
+  /** Overrides the default 24px padding and 16px gap. Safe-area clearance stays host-owned. */
+  contentContainerStyle?: StyleProp<ViewStyle>;
+  /** Default true. Set false for a bounded body with your own ScrollView or FlatList. */
+  scrollable?: boolean;
+}
+
+export interface ModalComponent extends FunctionComponent<ModalProps> {
+  Content: ComponentType<ModalContentProps>;
+}
+
+export type ToastVariant = "default" | "info" | "success" | "warning" | "error";
+
+export interface ToastOptions {
+  variant?: ToastVariant;
+  durationMs?: number;
+}
+
+export interface ToastApi {
+  show(message: string, options?: ToastOptions): void;
+  error(message: string): void;
+}
+
+export declare const Icon: ComponentType<PluginIconProps>;
+export declare const Modal: ModalComponent;
+export declare function useToast(): ToastApi;
+export declare function useRevealedText(text: string, phase: "streaming" | "complete"): string;
+
+export type { PluginIconProps } from "./contracts.js";
+
+/** React Native scrolling with the host's sheet gestures when rendered inside a sheet. */
+export declare const ScrollView: ForwardRefExoticComponent<
+  ScrollViewProps & RefAttributes<NativeScrollView>
+>;
+export declare function FlatList<Item>(
+  props: FlatListProps<Item> & { ref?: Ref<NativeFlatList<Item>> },
+): ReactElement;
+/** Copies text to this client's clipboard. Rejects when copying is unavailable or denied. */
+export declare function copyText(text: string): Promise<void>;
+
+/** Native input focus integrated with modal keyboard positioning. */
+export declare const TextInput: ForwardRefExoticComponent<
+  TextInputProps & RefAttributes<NativeTextInput>
+>;
diff --git a/packages/plugin/src/rpc-context.tsx b/packages/plugin/src/client/rpc-context.tsx
similarity index 94%
rename from packages/plugin/src/rpc-context.tsx
rename to packages/plugin/src/client/rpc-context.tsx
index 8f7ba514f5..7cd9bb176a 100644
--- a/packages/plugin/src/rpc-context.tsx
+++ b/packages/plugin/src/client/rpc-context.tsx
@@ -1,6 +1,6 @@
 import { createContext, useCallback, useContext, useMemo, type ReactNode } from "react";
 import type { ZodType, input as ZodInput, output as ZodOutput } from "zod";
-import { callPluginRpc, type PluginRpcContract } from "./rpc.js";
+import { callPluginRpc, type PluginRpcContract } from "../rpc.js";
 
 export interface PluginRpcContextValue {
   invoke(method: string, input: unknown): Promise<unknown>;
diff --git a/packages/plugin/src/runtime-context-bridge.tsx b/packages/plugin/src/client/runtime-context-bridge.tsx
similarity index 100%
rename from packages/plugin/src/runtime-context-bridge.tsx
rename to packages/plugin/src/client/runtime-context-bridge.tsx
diff --git a/packages/plugin/src/shallow.test.ts b/packages/plugin/src/client/shallow.test.ts
similarity index 100%
rename from packages/plugin/src/shallow.test.ts
rename to packages/plugin/src/client/shallow.test.ts
diff --git a/packages/plugin/src/shallow.ts b/packages/plugin/src/client/shallow.ts
similarity index 100%
rename from packages/plugin/src/shallow.ts
rename to packages/plugin/src/client/shallow.ts
diff --git a/packages/plugin/src/client/ui.ts b/packages/plugin/src/client/ui.ts
new file mode 100644
index 0000000000..6686d8292b
--- /dev/null
+++ b/packages/plugin/src/client/ui.ts
@@ -0,0 +1,86 @@
+import type { ComponentType, ReactNode, Ref } from "react";
+
+export interface SettingsSectionProps {
+  title: string;
+  info?: ReactNode;
+  trailing?: ReactNode;
+  children: ReactNode;
+  testID?: string;
+}
+export interface SettingsRowProps {
+  label: string;
+  hint?: string;
+  error?: string | null;
+  children?: ReactNode;
+  testID?: string;
+}
+export interface SettingsSwitchProps extends SettingsRowProps {
+  value: boolean;
+  onValueChange(value: boolean): void;
+  disabled?: boolean;
+}
+export interface SettingsSelectProps<Value extends string = string> extends SettingsRowProps {
+  value: Value;
+  options: readonly { label: string; value: Value }[];
+  onValueChange(value: Value): void;
+  disabled?: boolean;
+}
+export interface SettingsInputHandle {
+  focus(): void;
+  blur(): void;
+  getText(): string;
+  replaceText(text: string): void;
+}
+export interface SettingsInputProps extends SettingsRowProps {
+  initialValue?: string;
+  onChangeText(text: string): void;
+  placeholder?: string;
+  disabled?: boolean;
+  secureTextEntry?: boolean;
+  ref?: Ref<SettingsInputHandle>;
+}
+export interface SettingsActionProps extends SettingsRowProps {
+  actionLabel: string;
+  onPress(): void;
+  disabled?: boolean;
+}
+export declare const SettingsGroup: ComponentType<SettingsSectionProps>;
+export declare const SettingsSection: ComponentType<SettingsSectionProps>;
+export declare const SettingsCard: ComponentType<{ children: ReactNode; testID?: string }>;
+export declare const SettingsRow: ComponentType<SettingsRowProps>;
+export declare const SettingsSwitch: ComponentType<SettingsSwitchProps>;
+export declare function SettingsSelect<Value extends string>(
+  props: SettingsSelectProps<Value>,
+): ReactNode;
+export declare const SettingsInput: ComponentType<SettingsInputProps>;
+export declare const SettingsAction: ComponentType<SettingsActionProps>;
+
+export interface ExternalLinkProps {
+  href: string;
+  children: ReactNode;
+  accessibilityLabel?: string;
+  testID?: string;
+  onError?: (error: unknown) => void;
+}
+export declare const ExternalLink: ComponentType<ExternalLinkProps>;
+
+export type SidebarIcon = string | ComponentType<{ size: number; color: string }>;
+export interface SidebarRowProps {
+  /**
+   * Tells rows of one item apart when the item renders several: "bot-2". Unique within the item.
+   * Omit it when the item renders one row.
+   */
+  id?: string;
+  /** A Lucide icon name or a component. */
+  icon?: SidebarIcon;
+  /** Defaults to the item's registered title. */
+  label?: string;
+  onPress(): void;
+  active?: boolean;
+  /** Right slot. Renders beside the row's pressable, so a button here presses on its own. */
+  trailing?: ReactNode;
+}
+/** A sidebar navigation row. Render it from a sidebar item's `Component`. */
+export declare const SidebarRow: ComponentType<SidebarRowProps>;
+/** A line between groups of rows. Render it from a sidebar item's `Component`. */
+export declare const SidebarSeparator: ComponentType;
diff --git a/packages/plugin/src/use-sync-external-store.d.ts b/packages/plugin/src/client/use-sync-external-store.d.ts
similarity index 100%
rename from packages/plugin/src/use-sync-external-store.d.ts
rename to packages/plugin/src/client/use-sync-external-store.d.ts
diff --git a/packages/plugin/src/contracts.ts b/packages/plugin/src/contracts.ts
index dbe5116161..98df0758a6 100644
--- a/packages/plugin/src/contracts.ts
+++ b/packages/plugin/src/contracts.ts
@@ -1,7 +1,4 @@
-import type { ComponentType } from "react";
-import type { PaseoApi } from "@getpaseo/client";
-import type { AgentTimelineItem, JsonValue } from "@getpaseo/protocol/agent-types";
-import type { ZodType, input as ZodInput, output as ZodOutput } from "zod";
+import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import type { PluginRpcContract } from "./rpc.js";
 
 export interface PluginTheme {
@@ -20,34 +17,6 @@ export interface PluginTheme {
   };
 }
 
-export interface PluginHostProps {
-  theme: PluginTheme;
-  host: {
-    id: string;
-    label: string;
-  };
-  layout: {
-    compact: boolean;
-    platform: "ios" | "android" | "web";
-  };
-}
-
-interface PluginNavigableHostProps extends PluginHostProps {
-  /** Client-owned navigation. Undefined on older hosts; hide dependent affordances when absent. */
-  readonly navigation?: {
-    readonly openAgent: (input: { readonly agentId: string }) => void;
-    readonly openWorkspace: (input: { readonly workspaceId: string }) => void;
-  };
-}
-
-export interface PluginSurfaceProps extends PluginNavigableHostProps {}
-
-export interface PluginIconProps {
-  name: string;
-  size?: number;
-  color?: string;
-}
-
 export interface PluginWorkspaceSnapshot {
   readonly id: string;
   readonly projectId: string;
@@ -83,91 +52,6 @@ export interface PluginAgentSnapshot {
   readonly labels: Readonly<Record<string, string>>;
 }
 
-export type PluginPanelLocation = "workspace" | "explorer";
-
-export interface PluginOpenPanelOptions {
-  location?: PluginPanelLocation;
-}
-
-interface PluginWorkspacePanelBase {
-  id: string;
-  title: string;
-  icon: string;
-  locations?: readonly PluginPanelLocation[];
-}
-
-export interface PluginWorkspacePanelProps extends PluginNavigableHostProps {
-  context: "workspace";
-  workspaceId: string;
-}
-
-export interface PluginAgentPanelProps extends PluginNavigableHostProps {
-  context: "agent";
-  workspaceId: string;
-  agentId: string;
-}
-
-export interface PluginComposerPillProps extends PluginHostProps {
-  workspaceId: string;
-  agentId: string;
-}
-
-export interface PluginComposerPillContribution {
-  id: string;
-  title: string;
-  workspaceId: string;
-  agentId: string;
-  Component: ComponentType<PluginComposerPillProps>;
-  onPress(): void | Promise<void>;
-}
-
-export interface PluginClientOpenPanelOptions extends PluginOpenPanelOptions {
-  workspaceId: string;
-  agentId?: string;
-}
-
-export interface PluginClientContext extends PluginCommandCapabilities {
-  addSurface(id: string, Component: ComponentType<PluginSurfaceProps>): PluginCleanup;
-  addSidebarItem(contribution: PluginSidebarContribution): PluginCleanup;
-  addWorkspacePanel(contribution: PluginWorkspacePanelContribution): PluginCleanup;
-  addCommandCenterItem(contribution: PluginCommandCenterItemContribution): PluginCleanup;
-  addSlashCommand(contribution: PluginClientSlashCommandContribution): PluginCleanup;
-  addComposerPill(contribution: PluginComposerPillContribution): PluginCleanup;
-  addAttachmentSource(contribution: PluginAttachmentSourceContribution): PluginCleanup;
-  addTheme(contribution: PluginThemeContribution): PluginCleanup;
-  addTimelineTransformer<ItemType extends AgentTimelineItem["type"]>(
-    contribution: PluginTimelineTransformerContribution<ItemType>,
-  ): PluginCleanup;
-  addTimelineRenderer<Schema extends ZodType>(
-    contribution: PluginTimelineRendererContribution<Schema>,
-  ): PluginCleanup;
-  openPanel(id: string, options: PluginClientOpenPanelOptions): void;
-}
-
-export type PluginClientContribution = (client: PluginClientContext) => PluginCleanup;
-
-export type PluginWorkspacePanelContribution =
-  | (PluginWorkspacePanelBase & {
-      context: "workspace";
-      Component: ComponentType<PluginWorkspacePanelProps>;
-    })
-  | (PluginWorkspacePanelBase & {
-      context: "agent";
-      Component: ComponentType<PluginAgentPanelProps>;
-    });
-
-export interface PluginSurfaceContribution {
-  id: string;
-  Component: ComponentType<PluginSurfaceProps>;
-}
-
-export interface PluginSidebarContribution {
-  id: string;
-  title: string;
-  icon: string;
-  surface: string;
-}
-
 export interface PluginThemeColors {
   background: string;
   foreground: string;
@@ -209,116 +93,4 @@ export interface PluginTimelineTransformResult {
   items: PluginTimelineItem[];
 }
 
-export type PluginTimelineTransformerContribution<
-  ItemType extends AgentTimelineItem["type"] = AgentTimelineItem["type"],
-> = ItemType extends AgentTimelineItem["type"]
-  ? {
-      id: string;
-      query: {
-        itemType: ItemType;
-      };
-      transform(input: {
-        item: Extract<AgentTimelineItem, { type: ItemType }>;
-        phase: "streaming" | "complete";
-      }): PluginTimelineTransformResult | undefined;
-    }
-  : never;
-
-export interface PluginTimelineItemProps<Data = unknown> extends PluginHostProps {
-  agentId: string;
-  item: {
-    type: "plugin";
-    kind: string;
-    version: number;
-    data: Data;
-  };
-  timestamp: Date;
-}
-
-export interface PluginTimelineRendererContribution<Schema extends ZodType = ZodType> {
-  kind: string;
-  version: number;
-  schema: Schema;
-  Component: ComponentType<PluginTimelineItemProps<ZodOutput<Schema>>>;
-}
-
-export interface PluginCommandCapabilities {
-  paseo: PaseoApi;
-  rpc<InputSchema extends ZodType, OutputSchema extends ZodType>(
-    contract: PluginRpcContract<InputSchema, OutputSchema>,
-    input: ZodInput<InputSchema>,
-  ): Promise<ZodOutput<OutputSchema>>;
-  openSurface(id: string): void;
-}
-
-export interface PluginGlobalCommandContext extends PluginCommandCapabilities {
-  context: "global";
-}
-
-export interface PluginWorkspaceCommandContext extends PluginCommandCapabilities {
-  context: "workspace";
-  workspace: PluginWorkspaceSnapshot;
-  openPanel(id: string, options?: PluginOpenPanelOptions): void;
-}
-
-export interface PluginAgentCommandContext extends PluginCommandCapabilities {
-  context: "agent";
-  workspace: PluginWorkspaceSnapshot;
-  agent: PluginAgentSnapshot;
-  openPanel(id: string, options?: PluginOpenPanelOptions): void;
-}
-
-interface PluginCommandCenterItemBase {
-  id: string;
-  title: string;
-  icon: string;
-  keywords?: readonly string[];
-}
-
-export type PluginCommandCenterItemContribution =
-  | (PluginCommandCenterItemBase & {
-      context: "global";
-      onSelect(context: PluginGlobalCommandContext): void | Promise<void>;
-    })
-  | (PluginCommandCenterItemBase & {
-      context: "workspace";
-      onSelect(context: PluginWorkspaceCommandContext): void | Promise<void>;
-    })
-  | (PluginCommandCenterItemBase & {
-      context: "agent";
-      onSelect(context: PluginAgentCommandContext): void | Promise<void>;
-    });
-
-interface PluginClientSlashCommandBase {
-  name: string;
-  description: string;
-  argumentHint: string;
-}
-
-export type PluginClientSlashCommandContribution =
-  | (PluginClientSlashCommandBase & {
-      context: "workspace";
-      onSubmit(context: PluginWorkspaceCommandContext & { args: string }): void | Promise<void>;
-    })
-  | (PluginClientSlashCommandBase & {
-      context: "agent";
-      onSubmit(context: PluginAgentCommandContext & { args: string }): void | Promise<void>;
-    });
-
-export interface PluginHandlerContext {
-  paseo: PaseoApi;
-}
-
-export interface PluginServerContext {
-  handle<InputSchema extends ZodType, OutputSchema extends ZodType>(
-    contract: PluginRpcContract<InputSchema, OutputSchema>,
-    handler: (
-      input: ZodOutput<InputSchema>,
-      context: PluginHandlerContext,
-    ) => ZodInput<OutputSchema> | Promise<ZodInput<OutputSchema>>,
-  ): void;
-}
-
 export type PluginCleanup = () => void | Promise<void>;
-
-export type PluginServerContribution = (server: PluginServerContext) => PluginCleanup;
diff --git a/packages/plugin/src/index.ts b/packages/plugin/src/index.ts
index e54e24e85b..48deede303 100644
--- a/packages/plugin/src/index.ts
+++ b/packages/plugin/src/index.ts
@@ -1,60 +1,22 @@
-import type { ComponentType } from "react";
-import type { PluginAttachmentSourceContribution, PluginIconProps } from "./contracts.js";
-
+// Shared SDK entry. Keep runtime-specific imports and re-exports on /client or /server.
+export type {
+  PluginTheme,
+  PluginWorkspaceSnapshot,
+  PluginAgentSnapshot,
+  PluginThemeColors,
+  PluginThemeContribution,
+  PluginAttachmentSourceContribution,
+  PluginTimelineData,
+  PluginTimelineItem,
+  PluginTimelineTransformResult,
+  PluginCleanup,
+} from "./contracts.js";
+export { defineSettings, settingsRpc, type SettingsDefinition } from "./settings.js";
 export {
+  defineAttachmentSource,
   PluginAttachmentItemSchema,
   PluginAttachmentSearchPayloadSchema,
   type PluginAttachmentItem,
   type PluginAttachmentSearchPayload,
 } from "./attachments.js";
 export { defineRpc, type PluginRpcContract, type RpcInput, type RpcOutput } from "./rpc.js";
-
-export function defineAttachmentSource<Definition extends PluginAttachmentSourceContribution>(
-  definition: Definition,
-): Definition {
-  return definition;
-}
-
-export declare const Icon: ComponentType<PluginIconProps>;
-export type {
-  PluginAttachmentSourceContribution,
-  PluginAgentCommandContext,
-  PluginAgentPanelProps,
-  PluginAgentSnapshot,
-  PluginCleanup,
-  PluginCommandCapabilities,
-  PluginCommandCenterItemContribution,
-  PluginClientContext,
-  PluginClientContribution,
-  PluginClientSlashCommandContribution,
-  PluginClientOpenPanelOptions,
-  PluginComposerPillContribution,
-  PluginComposerPillProps,
-  PluginServerContribution,
-  PluginServerContext,
-  PluginGlobalCommandContext,
-  PluginHandlerContext,
-  PluginHostProps,
-  PluginOpenPanelOptions,
-  PluginIconProps,
-  PluginPanelLocation,
-  PluginTheme,
-  PluginSidebarContribution,
-  PluginSurfaceContribution,
-  PluginSurfaceProps,
-  PluginThemeColors,
-  PluginThemeContribution,
-  PluginTimelineData,
-  PluginTimelineItem,
-  PluginTimelineItemProps,
-  PluginTimelineRendererContribution,
-  PluginTimelineTransformerContribution,
-  PluginTimelineTransformResult,
-  PluginWorkspaceCommandContext,
-  PluginWorkspacePanelContribution,
-  PluginWorkspacePanelProps,
-  PluginWorkspaceSnapshot,
-} from "./contracts.js";
-export { usePaseo } from "./paseo-context.js";
-export { useAgent, useWorkspace } from "./client-state.js";
-export { useRpc } from "./rpc-context.js";
diff --git a/packages/plugin/src/migration-doc.test.ts b/packages/plugin/src/migration-doc.test.ts
index 3673bf6616..d6b96f2eb4 100644
--- a/packages/plugin/src/migration-doc.test.ts
+++ b/packages/plugin/src/migration-doc.test.ts
@@ -4,12 +4,12 @@ import { describe, expect, it } from "vitest";
 
 describe("plugin runtime-entry migration guide", () => {
   it("maps every client registration method", async () => {
-    const contracts = await readFile(new URL("./contracts.ts", import.meta.url), "utf8");
+    const contracts = await readFile(new URL("./client/contracts.ts", import.meta.url), "utf8");
     const context = /export interface PluginClientContext[^{]*{([\s\S]*?)\n}/.exec(contracts)?.[1];
     if (!context) throw new Error("PluginClientContext was not found");
     const methods = [...context.matchAll(/^\s+(add[A-Z]\w*)\(/gm)].map((match) => match[1]);
     const migration = await readFile(
-      fileURLToPath(new URL("../../../public-docs/plugins/v0.8/migration.md", import.meta.url)),
+      fileURLToPath(new URL("../../../public-docs/plugins/migration.md", import.meta.url)),
       "utf8",
     );
     const table = migration.slice(
diff --git a/packages/plugin/src/react-native.ts b/packages/plugin/src/react-native.ts
deleted file mode 100644
index d582cb724a..0000000000
--- a/packages/plugin/src/react-native.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ComponentType, FunctionComponent, ReactNode } from "react";
-import type { PluginIconProps } from "./contracts.js";
-
-export interface ModalProps {
-  title: string;
-  icon?: ReactNode;
-  open: boolean;
-  onOpenChange(open: boolean): void;
-  children: ReactNode;
-}
-
-export interface ModalContentProps {
-  children: ReactNode;
-}
-
-export interface ModalComponent extends FunctionComponent<ModalProps> {
-  Content: ComponentType<ModalContentProps>;
-}
-
-export type ToastVariant = "default" | "info" | "success" | "warning" | "error";
-
-export interface ToastOptions {
-  variant?: ToastVariant;
-  durationMs?: number;
-}
-
-export interface ToastApi {
-  show(message: string, options?: ToastOptions): void;
-  error(message: string): void;
-}
-
-export declare const Icon: ComponentType<PluginIconProps>;
-export declare const Modal: ModalComponent;
-export declare function useToast(): ToastApi;
-export declare function useRevealedText(text: string, phase: "streaming" | "complete"): string;
-
-export type { PluginIconProps } from "./contracts.js";
diff --git a/packages/plugin/src/server.test.ts b/packages/plugin/src/server.test.ts
deleted file mode 100644
index 5117249ae8..0000000000
--- a/packages/plugin/src/server.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { describe, expect, it } from "vitest";
-
-const srcDir = path.dirname(fileURLToPath(import.meta.url));
-const forbiddenSpecifiers = new Set([
-  "react",
-  "react/jsx-runtime",
-  "react-native",
-  "use-sync-external-store",
-  "use-sync-external-store/shim/with-selector",
-]);
-
-function localFile(fromFile: string, specifier: string): string {
-  const withoutJs = specifier.replace(/\.js$/, "");
-  for (const candidate of [`${withoutJs}.ts`, `${withoutJs}.tsx`, withoutJs]) {
-    const resolved = path.resolve(path.dirname(fromFile), candidate);
-    if (existsSync(resolved)) return resolved;
-  }
-  throw new Error(`Could not resolve ${specifier} from ${fromFile}`);
-}
-
-function valueImportSpecifiers(source: string): string[] {
-  const specifiers: string[] = [];
-  const pattern = /(?:^|\n)(?:export|import)\s+(?!type\b)(?:[\s\S]*?)from\s+["']([^"']+)["']/g;
-  for (const match of source.matchAll(pattern)) {
-    if (match[1]) specifiers.push(match[1]);
-  }
-  return specifiers;
-}
-
-function collectBareSpecifiers(entry: string): string[] {
-  const seen = new Set<string>();
-  const bare: string[] = [];
-  const queue = [entry];
-  while (queue.length > 0) {
-    const file = queue.pop();
-    if (!file || seen.has(file)) continue;
-    seen.add(file);
-    for (const specifier of valueImportSpecifiers(readFileSync(file, "utf8"))) {
-      if (specifier.startsWith(".")) {
-        queue.push(localFile(file, specifier));
-        continue;
-      }
-      bare.push(specifier);
-    }
-  }
-  return bare;
-}
-
-describe("@getpaseo/plugin/server", () => {
-  it("does not load react or the client hook graph", () => {
-    const specifiers = collectBareSpecifiers(path.join(srcDir, "server.ts"));
-    expect(specifiers.filter((specifier) => forbiddenSpecifiers.has(specifier))).toEqual([]);
-  });
-});
diff --git a/packages/plugin/src/server.ts b/packages/plugin/src/server.ts
deleted file mode 100644
index 8aa3325a83..0000000000
--- a/packages/plugin/src/server.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { PluginHandlerContext } from "./contracts.js";
diff --git a/packages/plugin/src/server/acp-internal/connection.ts b/packages/plugin/src/server/acp-internal/connection.ts
new file mode 100644
index 0000000000..fc78d2a8c4
--- /dev/null
+++ b/packages/plugin/src/server/acp-internal/connection.ts
@@ -0,0 +1,1455 @@
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
+import { spawnProcess, terminateProcess } from "../process.js";
+import { Readable, Writable } from "node:stream";
+import {
+  ClientSideConnection,
+  CLIENT_METHODS,
+  PROTOCOL_VERSION,
+  ndJsonStream,
+  type Client,
+  type AgentCapabilities,
+  type ContentBlock,
+  type NewSessionResponse,
+  type RequestPermissionRequest,
+  type RequestPermissionResponse,
+  type SessionConfigOption,
+  type SessionNotification,
+  type SessionUpdate,
+  type ToolCall,
+  type ToolCallUpdate,
+  type Stream,
+} from "@agentclientprotocol/sdk";
+import { z } from "zod";
+import type {
+  AcpConfigAccess,
+  AcpConfigChange,
+  AcpToolCallSnapshot,
+  AcpTransformer,
+  AcpVendorUpdate,
+  RunAcpProviderOptions,
+} from "../acp.js";
+import {
+  PROVIDER_PROTOCOL_VERSION,
+  ProviderEventSchema,
+  ProviderInputSchema,
+  negotiateProviderCapabilities,
+  requireProviderCapabilities,
+  type ProviderCatalog,
+  type ProviderCapability,
+  type ProviderConfigState,
+  type ProviderConnectRequest,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderLaunch,
+  type ProviderPermissionResponse,
+  type ProviderPersistence,
+  type ProviderSessionConfig,
+  type ProviderSetting,
+  type ProviderTimelineItem,
+} from "../provider.js";
+
+const ADAPTER_CAPABILITIES = [
+  "prompt.message",
+  "prompt.command",
+  "session.configure",
+  "permission",
+] as const;
+
+interface AcpBoundarySession {
+  runtime: AcpRuntime;
+  capabilities: readonly ProviderCapability[];
+  mutationLane: Promise<void>;
+}
+
+export async function createAcpProviderConnection(
+  options: RunAcpProviderOptions,
+  request: ProviderConnectRequest,
+): Promise<ProviderConnection> {
+  if (!request.versions.includes(PROVIDER_PROTOCOL_VERSION)) {
+    throw new Error(`ACP adapter requires provider protocol ${PROVIDER_PROTOCOL_VERSION}`);
+  }
+  const probe = await AcpRuntime.start({
+    options,
+    launch: request.launch,
+    boundarySessionId: "capability-probe",
+    env: {},
+    emit: () => undefined,
+  });
+  const supportedCapabilities: ProviderCapability[] = [...ADAPTER_CAPABILITIES];
+  if (probe.agentCapabilities.promptCapabilities?.image) {
+    supportedCapabilities.push("prompt.image");
+  }
+  if (probe.agentCapabilities.sessionCapabilities?.list) {
+    supportedCapabilities.push("session.list");
+  }
+  if (probe.agentCapabilities.loadSession) {
+    supportedCapabilities.push("session.persistence");
+  }
+  await probe.close();
+  const capabilities = negotiateProviderCapabilities(request.capabilities, supportedCapabilities);
+  const listeners = new Set<(event: ProviderEvent) => void>();
+  const sessions = new Map<string, AcpBoundarySession>();
+  const inFlight = new Set<Promise<void>>();
+  let closed = false;
+  let closePromise: Promise<void> | null = null;
+  const emit = (event: ProviderEvent) => {
+    if (closed) return;
+    const parsed = ProviderEventSchema.parse(event);
+    for (const listener of listeners) listener(parsed);
+  };
+  const state: AcpConnectionState = {
+    options,
+    launch: request.launch,
+    capabilities,
+    sessions,
+    emit,
+    isClosed: () => closed,
+  };
+
+  return {
+    version: PROVIDER_PROTOCOL_VERSION,
+    capabilities,
+    async send(input) {
+      if (closed) throw new Error("ACP provider connection is closed");
+      input = ProviderInputSchema.parse(input);
+      validateAdmission(input, { capabilities, sessions });
+      const operation = Promise.resolve().then(async () => {
+        if (closed) return undefined;
+        await dispatch(input, state);
+        return undefined;
+      });
+      const settled = operation.catch((error) => {
+        emitOperationFailure(input, emit, error);
+      });
+      inFlight.add(settled);
+      void settled.finally(() => inFlight.delete(settled));
+    },
+    onEvent(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    async close() {
+      if (closePromise) return closePromise;
+      closed = true;
+      closePromise = (async () => {
+        await Promise.all(inFlight);
+        const active = [...sessions.values()];
+        sessions.clear();
+        await Promise.all(active.map(({ runtime }) => runtime.closeSession()));
+        listeners.clear();
+      })();
+      return closePromise;
+    },
+  };
+}
+
+interface AcpConnectionState {
+  launch?: ProviderLaunch;
+  options: RunAcpProviderOptions;
+  capabilities: readonly ProviderCapability[];
+  sessions: Map<string, AcpBoundarySession>;
+  emit(event: ProviderEvent): void;
+  isClosed(): boolean;
+}
+
+function validateAdmission(
+  input: ProviderInput,
+  state: Pick<AcpConnectionState, "capabilities" | "sessions">,
+): void {
+  if (input.type === "session.open") {
+    if (state.sessions.has(input.sessionId))
+      throw new Error(`Session already exists: ${input.sessionId}`);
+    requireProviderCapabilities(state.capabilities, input);
+    return;
+  }
+  if (!("sessionId" in input)) {
+    requireProviderCapabilities(state.capabilities, input);
+    return;
+  }
+  const session = requireSession(state as AcpConnectionState, input.sessionId);
+  requireProviderCapabilities(session.capabilities, input);
+}
+
+function emitOperationFailure(
+  input: ProviderInput,
+  emit: (event: ProviderEvent) => void,
+  error: unknown,
+): void {
+  const failure = { message: describeError(error) };
+  if (input.type === "session.prompt") {
+    emit({
+      type: "session.prompt_result",
+      sessionId: input.sessionId,
+      clientMessageId: input.prompt.clientMessageId,
+      result: { type: "failed", error: failure },
+    });
+    return;
+  }
+  if ("requestId" in input) {
+    emit({ type: "request.failed", requestId: input.requestId, error: failure });
+    return;
+  }
+  if ("sessionId" in input) {
+    emit({ type: "session.runtime_failed", sessionId: input.sessionId, error: failure });
+  }
+}
+
+async function dispatch(input: ProviderInput, state: AcpConnectionState): Promise<void> {
+  switch (input.type) {
+    case "catalog":
+      await discover(input, state);
+      return;
+    case "sessions":
+      await listSessions(input, state);
+      return;
+    case "session.open":
+      await openSession(input, state);
+      return;
+    case "session.prompt":
+      await requireSession(state, input.sessionId).runtime.prompt(input);
+      return;
+    case "session.interrupt":
+      await requireSession(state, input.sessionId).runtime.interrupt();
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    case "session.permission":
+      requireSession(state, input.sessionId).runtime.respondToPermission(
+        input.permissionId,
+        input.response,
+      );
+      return;
+    case "session.configure": {
+      const session = requireSession(state, input.sessionId);
+      await mutateSession(session, () => session.runtime.configure(input.changes));
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    }
+    case "session.close": {
+      const session = requireSession(state, input.sessionId);
+      state.sessions.delete(input.sessionId);
+      await session.runtime.closeSession();
+      state.emit({ type: "session.closed", sessionId: input.sessionId });
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    }
+    case "session.archive":
+    case "session.unarchive":
+    case "session.revert":
+      state.emit({
+        type: "request.failed",
+        requestId: input.requestId,
+        error: { message: `${input.type} is not supported by this ACP provider` },
+      });
+  }
+}
+
+async function discover(
+  input: Extract<ProviderInput, { type: "catalog" }>,
+  state: AcpConnectionState,
+): Promise<void> {
+  const runtime = await AcpRuntime.start({
+    options: state.options,
+    launch: state.launch,
+    boundarySessionId: "catalog",
+    env: {},
+    emit: state.emit,
+  });
+  try {
+    let catalog = await runtime.discover(input.cwd);
+    const config = runtime.configAccess();
+    for (const transformer of state.options.transformers ?? []) {
+      if (transformer.discover) {
+        catalog = await transformer.discover(catalog, { sessionId: "catalog", config });
+      }
+    }
+    state.emit({ type: "catalog", requestId: input.requestId, catalog });
+  } finally {
+    await runtime.closeSession();
+  }
+}
+
+async function listSessions(
+  input: Extract<ProviderInput, { type: "sessions" }>,
+  state: AcpConnectionState,
+): Promise<void> {
+  const runtime = await AcpRuntime.start({
+    options: state.options,
+    launch: state.launch,
+    boundarySessionId: "sessions",
+    env: {},
+    emit: state.emit,
+  });
+  try {
+    const response = await runtime.listSessions(input.cwd);
+    const selected = input.limit ? response.sessions.slice(0, input.limit) : response.sessions;
+    state.emit({
+      type: "sessions",
+      requestId: input.requestId,
+      sessions: selected.map((session) => ({
+        persistence: nativePersistence(session.sessionId),
+        cwd: session.cwd,
+        title: session.title ?? undefined,
+        updatedAt: session.updatedAt ?? undefined,
+      })),
+    });
+  } finally {
+    await runtime.close();
+  }
+}
+
+async function openSession(
+  input: Extract<ProviderInput, { type: "session.open" }>,
+  state: AcpConnectionState,
+): Promise<void> {
+  if (state.sessions.has(input.sessionId))
+    throw new Error(`Session already exists: ${input.sessionId}`);
+  const runtime = await AcpRuntime.start({
+    options: state.options,
+    launch: state.launch,
+    boundarySessionId: input.sessionId,
+    env: input.config.env,
+    emit: state.emit,
+  });
+  try {
+    const capabilities = await runtime.open(input, state.capabilities);
+    if (state.isClosed()) {
+      await runtime.closeSession();
+      return;
+    }
+    state.sessions.set(input.sessionId, {
+      runtime,
+      capabilities,
+      mutationLane: Promise.resolve(),
+    });
+  } catch (error) {
+    await runtime.close();
+    throw error;
+  }
+}
+
+async function mutateSession(
+  session: AcpBoundarySession,
+  operation: () => Promise<void>,
+): Promise<void> {
+  const result = session.mutationLane.then(operation);
+  session.mutationLane = result.catch(() => undefined);
+  return result;
+}
+
+function requireSession(state: AcpConnectionState, sessionId: string): AcpBoundarySession {
+  const session = state.sessions.get(sessionId);
+  if (!session) throw new Error(`Unknown session: ${sessionId}`);
+  return session;
+}
+
+interface StartRuntimeOptions {
+  launch?: ProviderLaunch;
+  options: RunAcpProviderOptions;
+  boundarySessionId: string;
+  env: Readonly<Record<string, string>>;
+  emit(event: ProviderEvent): void;
+}
+
+class AcpRuntime {
+  readonly connection: ClientSideConnection;
+  agentCapabilities: AgentCapabilities = {};
+  nativeSessionId = "";
+  private readonly child: ChildProcessWithoutNullStreams | null;
+  private emit: (event: ProviderEvent) => void;
+  private readonly messages = new Map<string, string>();
+  private readonly toolCalls = new Map<string, AcpToolCallSnapshot>();
+  private readonly pendingCompactions = new Set<string>();
+  private readonly permissions = new Map<
+    string,
+    { request: RequestPermissionRequest; resolve(response: RequestPermissionResponse): void }
+  >();
+  private readonly transformers: readonly AcpTransformer[];
+  private configOptions: SessionConfigOption[] = [];
+  private modes: NewSessionResponse["modes"] = null;
+  private commandWaiter: (() => void) | null = null;
+  private messageSequence = 0;
+  /**
+   * Fallback ids for streamed chunks that carry no `messageId`, one per
+   * chunk kind. Consecutive chunks of a kind continue the same timeline
+   * item; a chunk of the other kind, a tool call, a plan, a user message,
+   * or a turn boundary ends it (#4699).
+   */
+  private readonly fallbackChunkIds = new Map<
+    "agent_message_chunk" | "agent_thought_chunk",
+    string
+  >();
+  private closing = false;
+  private processFailed = false;
+  private configTransaction = false;
+  private stagedTransformerConfig: ProviderConfigState | null = null;
+  private readonly closeConnector: () => Promise<void>;
+  private notificationLane: Promise<void> = Promise.resolve();
+  private promptLane: Promise<void> = Promise.resolve();
+  private activePrompt: { turnId: string; settled: Promise<void> } | null = null;
+
+  static async start(options: StartRuntimeOptions): Promise<AcpRuntime> {
+    let child: ChildProcessWithoutNullStreams | null = null;
+    let spawnFailure: Promise<never> | null = null;
+    let stream: Stream;
+    let closeConnector = async () => {};
+    if (options.options.command) {
+      // COMPAT(pluginProviderLaunch): added in v0.10.0, remove after 2027-03-29 once plugin host floor >= v0.10.0.
+      // Standalone callers and older hosts do not send a daemon-resolved launch.
+      const launch = options.launch ?? {
+        command: options.options.command[0],
+        args: options.options.command.slice(1),
+        env: process.env,
+      };
+      child = spawnProcess(launch.command, launch.args, {
+        env: { ...launch.env, ...options.env },
+        stdio: "pipe",
+      });
+      spawnFailure = new Promise<never>((_resolve, reject) => child!.once("error", reject));
+      child.stderr.on("data", () => undefined);
+      const output = Writable.toWeb(child.stdin) as unknown as Parameters<typeof ndJsonStream>[0];
+      const input = Readable.toWeb(child.stdout) as unknown as Parameters<typeof ndJsonStream>[1];
+      stream = ndJsonStream(output, input);
+    } else {
+      const owned = ownConnectorStream(await options.options.connector());
+      stream = owned.stream;
+      closeConnector = owned.close;
+    }
+    const runtime = new AcpRuntime(stream, child, closeConnector, options);
+    try {
+      const initialize = withTimeout(
+        runtime.call(
+          runtime.connection.initialize({
+            protocolVersion: PROTOCOL_VERSION,
+            clientCapabilities: {},
+            clientInfo: { name: "paseo", version: "1" },
+          }),
+        ),
+        options.options.acpOptions?.startupTimeoutMs ?? 10_000,
+        `ACP provider ${options.options.id} did not initialize`,
+      );
+      const initialized = spawnFailure
+        ? await Promise.race([initialize, spawnFailure])
+        : await initialize;
+      runtime.agentCapabilities = initialized.agentCapabilities ?? {};
+      return runtime;
+    } catch (error) {
+      await runtime.close();
+      throw error;
+    }
+  }
+
+  private constructor(
+    stream: Stream,
+    child: ChildProcessWithoutNullStreams | null,
+    closeConnector: () => Promise<void>,
+    private readonly options: StartRuntimeOptions,
+  ) {
+    this.child = child;
+    this.closeConnector = closeConnector;
+    this.emit = options.emit;
+    this.transformers = options.options.transformers ?? [];
+    const client: Client = {
+      requestPermission: (request) => this.requestPermission(request),
+      sessionUpdate: (notification) =>
+        this.enqueueNotification(() => this.sessionUpdate(notification)),
+    };
+    this.connection = new ClientSideConnection(
+      () => client,
+      routeVendorNotifications(stream, (method, params) => this.vendorNotification(method, params)),
+    );
+    if (!child) void this.connection.closed.then(() => this.handleUnexpectedTransportClose());
+    child?.on("error", (error) => {
+      this.processFailed = true;
+      this.settlePendingWork();
+      if (this.closing || !this.nativeSessionId) return;
+      this.emit({
+        type: "session.runtime_failed",
+        sessionId: this.options.boundarySessionId,
+        error: { message: describeError(error) },
+      });
+    });
+    child?.once("close", (code, signal) => {
+      if (this.closing || this.processFailed || !this.nativeSessionId) return;
+      this.processFailed = true;
+      this.settlePendingWork();
+      this.emit({
+        type: "session.runtime_failed",
+        sessionId: this.options.boundarySessionId,
+        error: { message: `ACP process exited (${signal ?? code ?? "unknown"})` },
+      });
+    });
+  }
+
+  async open(
+    input: Extract<ProviderInput, { type: "session.open" }>,
+    connectionCapabilities: readonly ProviderCapability[],
+  ): Promise<readonly ProviderCapability[]> {
+    const mcpServers = toAcpMcpServers(input.config);
+    const nativeSessionId = readNativeSessionId(input.persistence);
+    const metadata = {
+      _paseo: {
+        systemPrompt: input.config.systemPrompt,
+        providerOptions: input.config.providerOptions,
+        toolPolicy: input.config.toolPolicy,
+        persist: input.config.persist,
+      },
+    };
+    let response: Pick<NewSessionResponse, "modes" | "configOptions">;
+    if (nativeSessionId) {
+      response = await this.call(
+        this.connection.loadSession({
+          sessionId: nativeSessionId,
+          cwd: input.config.cwd,
+          mcpServers,
+          _meta: metadata,
+        }),
+      );
+      this.nativeSessionId = nativeSessionId;
+    } else {
+      const newSession = await this.call(
+        this.connection.newSession({
+          cwd: input.config.cwd,
+          mcpServers,
+          _meta: metadata,
+        }),
+      );
+      response = newSession;
+      this.nativeSessionId = newSession.sessionId;
+    }
+    this.modes = response.modes;
+    this.configOptions = response.configOptions ?? [];
+    await this.applyInitialConfig(input.config);
+    const sessionCapabilities = connectionCapabilities.filter(
+      (capability) =>
+        capability !== "session.configure" ||
+        this.modes !== null ||
+        this.configOptions.length > 0 ||
+        this.transformers.some((transformer) => transformer.configure !== undefined),
+    );
+    this.emit({
+      type: "session.opened",
+      requestId: input.requestId,
+      sessionId: input.sessionId,
+      capabilities: sessionCapabilities,
+      restoration: "core",
+      persistence: nativePersistence(this.nativeSessionId),
+      title: input.config.title,
+      cwd: input.config.cwd,
+    });
+    this.emitConfig();
+    if (this.options.options.acpOptions?.waitForInitialCommands) {
+      await this.waitForInitialCommands();
+    }
+    this.emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+    return sessionCapabilities;
+  }
+
+  async discover(cwd = process.cwd()): Promise<ProviderCatalog> {
+    const response = await this.call(this.connection.newSession({ cwd, mcpServers: [] }));
+    this.nativeSessionId = response.sessionId;
+    this.modes = response.modes;
+    this.configOptions = response.configOptions ?? [];
+    return toProviderCatalog(response.modes, response.configOptions ?? []);
+  }
+
+  prompt(input: Extract<ProviderInput, { type: "session.prompt" }>): Promise<void> {
+    const admission = this.promptLane.then(() => this.admitPrompt(input));
+    this.promptLane = admission.catch(() => undefined);
+    return admission;
+  }
+
+  private async admitPrompt(
+    input: Extract<ProviderInput, { type: "session.prompt" }>,
+  ): Promise<void> {
+    const active = this.activePrompt;
+    if (active) {
+      await this.interrupt();
+      await active.settled;
+    }
+    const prompt = toAcpPrompt(input.prompt);
+    const turnId = `acp:${input.prompt.clientMessageId}`;
+    this.fallbackChunkIds.clear();
+    this.emit({
+      type: "timeline.item",
+      sessionId: this.options.boundarySessionId,
+      item: {
+        type: "user_message",
+        id: input.prompt.clientMessageId,
+        text: prompt
+          .filter((part) => part.type === "text")
+          .map((part) => part.text)
+          .join("\n"),
+        clientMessageId: input.prompt.clientMessageId,
+      },
+    });
+    this.emit({
+      type: "session.prompt_result",
+      sessionId: this.options.boundarySessionId,
+      clientMessageId: input.prompt.clientMessageId,
+      result: { type: "turn", turnId },
+    });
+    this.emit({
+      type: "session.turn",
+      sessionId: this.options.boundarySessionId,
+      turnId,
+      state: "started",
+    });
+    const settled = this.call(
+      this.connection.prompt({ sessionId: this.nativeSessionId, prompt }),
+    ).then(
+      (response): void => {
+        const state = response.stopReason === "cancelled" ? "canceled" : "completed";
+        this.fallbackChunkIds.clear();
+        this.terminalizeTransientItems(state);
+        this.emit({
+          type: "session.turn",
+          sessionId: this.options.boundarySessionId,
+          turnId,
+          state,
+        });
+        return undefined;
+      },
+      (error): void => {
+        this.fallbackChunkIds.clear();
+        this.terminalizeTransientItems("failed");
+        this.emit({
+          type: "session.turn",
+          sessionId: this.options.boundarySessionId,
+          turnId,
+          state: "failed",
+          error: { message: describeError(error) },
+        });
+        return undefined;
+      },
+    );
+    this.activePrompt = { turnId, settled };
+    void settled.finally(() => {
+      if (this.activePrompt?.turnId === turnId) this.activePrompt = null;
+    });
+  }
+
+  interrupt(): Promise<void> {
+    return this.call(this.connection.cancel({ sessionId: this.nativeSessionId }));
+  }
+
+  listSessions(cwd?: string) {
+    return this.call(this.connection.listSessions({ cwd }));
+  }
+
+  async drainNotifications(): Promise<void> {
+    await new Promise<void>((resolve) => setTimeout(resolve, 0));
+    await this.notificationLane;
+  }
+
+  respondToPermission(
+    permissionId: string,
+    response: Extract<ProviderInput, { type: "session.permission" }>["response"],
+  ): void {
+    const pending = this.permissions.get(permissionId);
+    if (!pending) throw new Error(`Unknown ACP permission: ${permissionId}`);
+    const selected = selectPermissionOption(pending.request.options, response);
+    if (response.selectedActionId !== undefined && !selected) {
+      throw new Error(
+        `ACP permission action '${response.selectedActionId}' does not exist or does not match '${response.behavior}' behavior`,
+      );
+    }
+    this.permissions.delete(permissionId);
+    pending.resolve({
+      outcome: selected
+        ? { outcome: "selected", optionId: selected.optionId }
+        : { outcome: "cancelled" },
+    });
+    this.emit({
+      type: "session.permission_resolved",
+      sessionId: this.options.boundarySessionId,
+      permissionId,
+    });
+  }
+
+  async configure(
+    changes: Extract<ProviderInput, { type: "session.configure" }>["changes"],
+  ): Promise<void> {
+    const ordered: AcpConfigChange[] = [];
+    if (changes.model !== undefined) ordered.push({ target: "model", value: changes.model });
+    if (changes.mode !== undefined) ordered.push({ target: "mode", value: changes.mode });
+    if (changes.thinkingOption !== undefined) {
+      ordered.push({ target: "thinking", value: changes.thinkingOption });
+    }
+    for (const [id, value] of Object.entries(changes.settings ?? {})) {
+      ordered.push({ target: "setting", id, value });
+    }
+    const previousModes = this.modes ? structuredClone(this.modes) : null;
+    const previousOptions = structuredClone(this.configOptions);
+    this.configTransaction = true;
+    this.stagedTransformerConfig = null;
+    let committedConfig: ProviderConfigState | null = null;
+    try {
+      for (const change of ordered) await this.applyConfigChange(change);
+      committedConfig =
+        this.stagedTransformerConfig ?? toProviderConfigState(this.modes, this.configOptions);
+    } catch (error) {
+      try {
+        await this.restoreConfig(previousModes, previousOptions);
+      } catch (rollbackError) {
+        const failure = new AggregateError(
+          [error, rollbackError],
+          `ACP configuration failed and rollback could not restore the previous state`,
+        );
+        this.emit({
+          type: "session.runtime_failed",
+          sessionId: this.options.boundarySessionId,
+          error: { message: describeError(failure) },
+        });
+        await this.close();
+        throw failure;
+      }
+      this.modes = previousModes;
+      this.configOptions = previousOptions;
+      this.stagedTransformerConfig = null;
+      throw error;
+    } finally {
+      this.configTransaction = false;
+    }
+    this.stagedTransformerConfig = null;
+    this.emitConfigSnapshot(committedConfig);
+  }
+
+  async closeSession(): Promise<void> {
+    if (this.nativeSessionId) {
+      await withTimeout(
+        this.call(this.connection.closeSession({ sessionId: this.nativeSessionId })),
+        1_000,
+        `ACP session ${this.nativeSessionId} did not close`,
+      ).catch(() => undefined);
+    }
+    await this.close();
+  }
+
+  async close(): Promise<void> {
+    if (this.closing) return;
+    this.closing = true;
+    this.settlePendingWork();
+    await this.closeConnector();
+    const child = this.child;
+    if (!child || this.processFailed) return;
+    if (child.exitCode !== null || child.signalCode !== null) return;
+    const closed = new Promise<void>((resolve) => child.once("close", () => resolve()));
+    await terminateProcess(child, "SIGTERM");
+    if (await settlesWithin(closed, 1_000)) return;
+    await terminateProcess(child);
+    if (!(await settlesWithin(closed, 1_000))) {
+      throw new Error(`ACP provider ${this.options.options.id} did not terminate after SIGKILL`);
+    }
+  }
+
+  private async applyInitialConfig(config: ProviderSessionConfig): Promise<void> {
+    if (config.model) await this.applyConfigChange({ target: "model", value: config.model });
+    if (config.mode) await this.applyConfigChange({ target: "mode", value: config.mode });
+    if (config.thinkingOption) {
+      await this.applyConfigChange({ target: "thinking", value: config.thinkingOption });
+    }
+    for (const [id, value] of Object.entries(config.settings)) {
+      await this.applyConfigChange({ target: "setting", id, value });
+    }
+  }
+
+  private async applyConfigChange(change: AcpConfigChange): Promise<void> {
+    const access = this.configAccess();
+    for (const transformer of this.transformers) {
+      if (
+        (await transformer.configure?.(change, {
+          sessionId: this.options.boundarySessionId,
+          config: access,
+        })) === "handled"
+      ) {
+        return;
+      }
+    }
+    if (change.target === "mode") {
+      if (!change.value || !this.modes) {
+        throw new Error("ACP session does not expose mode configuration");
+      }
+      await this.call(
+        this.connection.setSessionMode({
+          sessionId: this.nativeSessionId,
+          modeId: change.value,
+        }),
+      );
+      this.modes = { ...this.modes, currentModeId: change.value };
+      return;
+    }
+    let category: "model" | "thought_level" | null = null;
+    if (change.target === "model") category = "model";
+    if (change.target === "thinking") category = "thought_level";
+    const configId =
+      change.target === "setting"
+        ? change.id
+        : this.configOptions.find((option) => option.category === category)?.id;
+    if (!configId) {
+      throw new Error(`ACP session does not expose ${change.target} configuration`);
+    }
+    if (change.value === null) {
+      throw new Error(`ACP configuration ${configId} cannot be cleared`);
+    }
+    const response = await this.call(
+      this.connection.setSessionConfigOption({
+        sessionId: this.nativeSessionId,
+        configId,
+        ...(typeof change.value === "boolean"
+          ? { type: "boolean" as const, value: change.value }
+          : { value: String(change.value) }),
+      }),
+    );
+    this.configOptions = response.configOptions;
+  }
+
+  configAccess(): AcpConfigAccess {
+    return {
+      read: async () => configValues(this.configOptions),
+      set: async (id, value) => {
+        if (typeof value !== "string" && typeof value !== "boolean") {
+          throw new Error(`ACP configuration ${id} accepts only string or boolean values`);
+        }
+        const response = await this.call(
+          this.connection.setSessionConfigOption({
+            sessionId: this.nativeSessionId,
+            configId: id,
+            ...(typeof value === "boolean" ? { type: "boolean" as const, value } : { value }),
+          }),
+        );
+        this.configOptions = response.configOptions;
+      },
+    };
+  }
+
+  private emitConfig(): void {
+    if (this.configTransaction) return;
+    this.emitConfigSnapshot(toProviderConfigState(this.modes, this.configOptions));
+  }
+
+  private emitConfigSnapshot(config: ProviderConfigState): void {
+    this.emit({
+      type: "session.config",
+      sessionId: this.options.boundarySessionId,
+      config,
+    });
+  }
+
+  private async restoreConfig(
+    modes: NewSessionResponse["modes"],
+    options: readonly SessionConfigOption[],
+  ): Promise<void> {
+    if (modes?.currentModeId && this.modes?.currentModeId !== modes.currentModeId) {
+      await this.call(
+        this.connection.setSessionMode({
+          sessionId: this.nativeSessionId,
+          modeId: modes.currentModeId,
+        }),
+      );
+    }
+    const currentValues = configValues(this.configOptions);
+    for (const option of options) {
+      const value = option.currentValue;
+      if (currentValues[option.id] === value) continue;
+      await this.call(
+        this.connection.setSessionConfigOption({
+          sessionId: this.nativeSessionId,
+          configId: option.id,
+          ...(typeof value === "boolean" ? { type: "boolean" as const, value } : { value }),
+        }),
+      );
+    }
+  }
+
+  private requestPermission(request: RequestPermissionRequest): Promise<RequestPermissionResponse> {
+    const permissionId = `permission:${request.toolCall.toolCallId}`;
+    return new Promise((resolve) => {
+      this.permissions.set(permissionId, { request, resolve });
+      this.emit({
+        type: "session.permission",
+        sessionId: this.options.boundarySessionId,
+        request: {
+          id: permissionId,
+          name: request.toolCall.name ?? request.toolCall.title ?? "Tool",
+          kind: "tool",
+          title: request.toolCall.title ?? undefined,
+          input: jsonRecord(request.toolCall.rawInput),
+          actions: request.options.map((option) => ({
+            id: option.optionId,
+            label: option.name,
+            behavior: option.kind.startsWith("allow") ? "allow" : "deny",
+          })),
+        },
+      });
+    });
+  }
+
+  private sessionUpdate(notification: SessionNotification): void {
+    if (notification.sessionId !== this.nativeSessionId) return;
+    this.reduceUpdate(notification.update);
+  }
+
+  private reduceUpdate(update: SessionUpdate): void {
+    if (
+      update.sessionUpdate === "agent_message_chunk" ||
+      update.sessionUpdate === "agent_thought_chunk" ||
+      update.sessionUpdate === "user_message_chunk"
+    ) {
+      if (update.sessionUpdate === "user_message_chunk") {
+        this.fallbackChunkIds.clear();
+        return;
+      }
+      // A chunk of one kind ends the other kind's item, whatever its content
+      // or id: reasoning, then text, then reasoning again are three items.
+      this.fallbackChunkIds.delete(
+        update.sessionUpdate === "agent_message_chunk"
+          ? "agent_thought_chunk"
+          : "agent_message_chunk",
+      );
+      if (update.content.type !== "text") return;
+      const id = this.resolveChunkId(update.sessionUpdate, update.messageId);
+      const text = `${this.messages.get(id) ?? ""}${update.content.text}`;
+      this.messages.set(id, text);
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: {
+          type: update.sessionUpdate === "agent_message_chunk" ? "assistant_message" : "reasoning",
+          id,
+          text,
+          ...(update.sessionUpdate === "agent_message_chunk"
+            ? { messageId: update.messageId ?? undefined }
+            : {}),
+        },
+      });
+      return;
+    }
+    if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
+      if (update.sessionUpdate === "tool_call") this.fallbackChunkIds.clear();
+      this.reduceToolCall(update);
+      return;
+    }
+    if (update.sessionUpdate === "plan") this.fallbackChunkIds.clear();
+    this.reduceStateUpdate(update);
+  }
+
+  private resolveChunkId(
+    kind: "agent_message_chunk" | "agent_thought_chunk",
+    messageId: string | null | undefined,
+  ): string {
+    if (messageId) {
+      this.fallbackChunkIds.delete(kind);
+      return messageId;
+    }
+    let id = this.fallbackChunkIds.get(kind);
+    if (!id) {
+      id = `${kind}:${++this.messageSequence}`;
+      this.fallbackChunkIds.set(kind, id);
+    }
+    return id;
+  }
+
+  private reduceStateUpdate(update: SessionUpdate): void {
+    if (update.sessionUpdate === "plan") {
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: {
+          type: "todo",
+          id: "acp-plan",
+          items: update.entries.map((entry, index) => ({
+            id: String(index),
+            text: entry.content,
+            completed: entry.status === "completed",
+            status: entry.status,
+          })),
+        },
+      });
+      return;
+    }
+    if (update.sessionUpdate === "available_commands_update") {
+      const commands = update.availableCommands.map((command) => ({
+        name: command.name,
+        description: command.description,
+        argumentHint: command.input?.hint,
+      }));
+      this.emit({ type: "session.commands", sessionId: this.options.boundarySessionId, commands });
+      this.commandWaiter?.();
+      this.commandWaiter = null;
+      return;
+    }
+    if (update.sessionUpdate === "current_mode_update") {
+      if (this.modes) this.modes = { ...this.modes, currentModeId: update.currentModeId };
+      this.emitConfig();
+      return;
+    }
+    if (update.sessionUpdate === "config_option_update") {
+      this.configOptions = update.configOptions;
+      this.emitConfig();
+      return;
+    }
+    if (update.sessionUpdate === "usage_update") {
+      this.emit({
+        type: "session.usage",
+        sessionId: this.options.boundarySessionId,
+        usage: {
+          contextWindowUsedTokens: update.used,
+          contextWindowMaxTokens: update.size,
+          totalCostUsd: update.cost?.currency === "USD" ? update.cost.amount : undefined,
+        },
+      });
+      return;
+    }
+    if (update.sessionUpdate === "compaction_update") {
+      if (update.status === "completed") this.pendingCompactions.delete(update.compactionId);
+      else this.pendingCompactions.add(update.compactionId);
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: {
+          type: "compaction",
+          id: update.compactionId,
+          status: update.status === "completed" ? "completed" : "loading",
+        },
+      });
+    }
+  }
+
+  private terminalizeTransientItems(state: "completed" | "failed" | "canceled"): void {
+    for (const [id, snapshot] of this.toolCalls) {
+      if (snapshot.status !== "pending" && snapshot.status !== "in_progress") continue;
+      const completed: AcpToolCallSnapshot = {
+        ...snapshot,
+        status: state === "completed" ? "completed" : "failed",
+      };
+      this.toolCalls.set(id, completed);
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: toolTimelineItem(completed),
+      });
+    }
+    for (const id of this.pendingCompactions) {
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: { type: "compaction", id, status: "completed" },
+      });
+    }
+    this.pendingCompactions.clear();
+  }
+
+  private reduceToolCall(update: ToolCall | ToolCallUpdate): void {
+    const current = this.toolCalls.get(update.toolCallId);
+    let snapshot = mergeToolCallSnapshot(update, current);
+    const context = { sessionId: this.options.boundarySessionId };
+    for (const transformer of this.transformers)
+      snapshot = transformer.toolCall?.(snapshot, context) ?? snapshot;
+    this.toolCalls.set(snapshot.id, snapshot);
+    this.emit({
+      type: "timeline.item",
+      sessionId: this.options.boundarySessionId,
+      item: toolTimelineItem(snapshot),
+    });
+  }
+
+  private vendorNotification(method: string, params: unknown): void {
+    const notification = { method, params: jsonValue(params) };
+    const context = { sessionId: this.options.boundarySessionId };
+    for (const transformer of this.transformers) {
+      const transformed = transformer.notification?.(notification, context);
+      if (!transformed) continue;
+      const updates = Array.isArray(transformed) ? transformed : [transformed];
+      for (const update of updates) this.emitVendorUpdate(update);
+    }
+  }
+
+  private emitVendorUpdate(update: AcpVendorUpdate): void {
+    if (update.type === "commands") {
+      this.emit({
+        type: "session.commands",
+        sessionId: this.options.boundarySessionId,
+        commands: [...update.commands],
+      });
+    } else if (update.type === "config") {
+      if (this.configTransaction) this.stagedTransformerConfig = update.config;
+      else this.emitConfigSnapshot(update.config);
+    } else if (update.type === "timeline") {
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: update.item,
+      });
+    } else {
+      this.emit({
+        type: "session.notice",
+        sessionId: this.options.boundarySessionId,
+        notice: update.notice,
+      });
+    }
+  }
+
+  private call<Value>(operation: Promise<Value>): Promise<Value> {
+    if (this.connection.signal.aborted) {
+      return Promise.reject(new Error("ACP transport is closed"));
+    }
+    return Promise.race([
+      operation,
+      this.connection.closed.then(() => {
+        throw new Error("ACP transport closed unexpectedly");
+      }),
+    ]);
+  }
+
+  private enqueueNotification(operation: () => void): Promise<void> {
+    const result = this.notificationLane.then(operation);
+    this.notificationLane = result.catch(() => undefined);
+    return result;
+  }
+
+  private handleUnexpectedTransportClose(): void {
+    if (this.closing || this.processFailed) return;
+    this.processFailed = true;
+    this.settlePendingWork();
+    if (!this.nativeSessionId) return;
+    this.emit({
+      type: "session.runtime_failed",
+      sessionId: this.options.boundarySessionId,
+      error: { message: "ACP transport closed unexpectedly" },
+    });
+  }
+
+  private settlePendingWork(): void {
+    for (const permission of this.permissions.values()) {
+      permission.resolve({ outcome: { outcome: "cancelled" } });
+    }
+    this.permissions.clear();
+    this.commandWaiter?.();
+    this.commandWaiter = null;
+  }
+
+  private waitForInitialCommands(): Promise<void> {
+    const timeoutMs = this.options.options.acpOptions?.initialCommandsTimeoutMs ?? 1_000;
+    const commands = new Promise<void>((resolve) => {
+      this.commandWaiter = resolve;
+    });
+    const timeout = new Promise<void>((resolve) => {
+      setTimeout(resolve, timeoutMs);
+    });
+    return Promise.race([commands, timeout]).finally(() => {
+      this.commandWaiter = null;
+    });
+  }
+}
+
+function routeVendorNotifications(
+  stream: Stream,
+  receive: (method: string, params: unknown) => void,
+): Stream {
+  const clientMethods = new Set<string>(Object.values(CLIENT_METHODS));
+  return {
+    writable: stream.writable,
+    readable: stream.readable.pipeThrough(
+      new TransformStream({
+        transform(message, controller) {
+          if ("method" in message && !("id" in message) && !clientMethods.has(message.method)) {
+            // The SDK dispatches extensions asynchronously and can resolve a later response first.
+            // Run synchronous vendor transforms in wire order, inside the configuration transaction.
+            try {
+              receive(message.method, message.params);
+            } catch (error) {
+              console.error("Error handling ACP vendor notification", error);
+            }
+          } else controller.enqueue(message);
+        },
+      }),
+    ),
+  };
+}
+
+function selectPermissionOption(
+  options: RequestPermissionRequest["options"],
+  response: ProviderPermissionResponse,
+): RequestPermissionRequest["options"][number] | null {
+  if (response.selectedActionId !== undefined) {
+    return (
+      options.find(
+        (option) =>
+          option.optionId === response.selectedActionId &&
+          permissionOptionBehavior(option) === response.behavior,
+      ) ?? null
+    );
+  }
+  return options.find((option) => permissionOptionBehavior(option) === response.behavior) ?? null;
+}
+
+function permissionOptionBehavior(
+  option: RequestPermissionRequest["options"][number],
+): ProviderPermissionResponse["behavior"] {
+  return option.kind.startsWith("allow") ? "allow" : "deny";
+}
+
+function ownConnectorStream(source: Stream): {
+  stream: Stream;
+  close(): Promise<void>;
+} {
+  const reader = source.readable.getReader();
+  const writer = source.writable.getWriter();
+  let closed = false;
+  const stream: Stream = {
+    readable: new ReadableStream({
+      async pull(controller) {
+        try {
+          const next = await reader.read();
+          if (next.done) controller.close();
+          else controller.enqueue(next.value);
+        } catch (error) {
+          controller.error(error);
+        }
+      },
+      cancel: (reason) => reader.cancel(reason),
+    }),
+    writable: new WritableStream({
+      write: (message) => writer.write(message),
+      close: () => writer.close(),
+      abort: (reason) => writer.abort(reason),
+    }),
+  };
+  return {
+    stream,
+    async close() {
+      if (closed) return;
+      closed = true;
+      await Promise.allSettled([
+        reader.cancel(new Error("Paseo closed the ACP connector")),
+        writer.close(),
+      ]);
+    },
+  };
+}
+
+function mergeToolCallSnapshot(
+  update: ToolCall | ToolCallUpdate,
+  current: AcpToolCallSnapshot | undefined,
+): AcpToolCallSnapshot {
+  return {
+    id: update.toolCallId,
+    name: firstText(update.name, current?.name),
+    title: firstText(update.title, current?.title, update.name) ?? "Tool call",
+    kind: firstText(update.kind, current?.kind),
+    status: firstDefined(update.status, current?.status, "pending") ?? "pending",
+    input: jsonValue(firstDefined(update.rawInput, current?.input, null)),
+    output: jsonValue(firstDefined(update.rawOutput, current?.output, null)),
+    locations: update.locations?.map((location) => location.path) ?? current?.locations ?? [],
+  };
+}
+
+function firstDefined<Value>(...values: Array<Value | undefined>): Value | undefined {
+  return values.find((value) => value !== undefined);
+}
+
+function firstText(...values: Array<string | null | undefined>): string | undefined {
+  return values.find((value): value is string => typeof value === "string");
+}
+
+function toAcpMcpServers(config: ProviderSessionConfig) {
+  return Object.entries(config.mcpServers).map(([name, server]) => {
+    if (server.type === "stdio") {
+      return {
+        name,
+        command: server.command,
+        args: server.args ?? [],
+        env: Object.entries(server.env ?? {}).map(([key, value]) => ({ name: key, value })),
+      };
+    }
+    return {
+      type: server.type,
+      name,
+      url: server.url,
+      headers: Object.entries(server.headers ?? {}).map(([key, value]) => ({ name: key, value })),
+    };
+  });
+}
+
+function toAcpPrompt(
+  prompt: Extract<ProviderInput, { type: "session.prompt" }>["prompt"],
+): ContentBlock[] {
+  if (prompt.input.type === "command") {
+    const suffix = prompt.input.arguments ? ` ${prompt.input.arguments}` : "";
+    return [{ type: "text", text: `/${prompt.input.name}${suffix}` }];
+  }
+  return prompt.input.content.map((content) => {
+    if (content.type === "text" || content.type === "image") return content;
+    return { type: "text", text: JSON.stringify(content) };
+  });
+}
+
+function nativePersistence(sessionId: string): ProviderPersistence {
+  return { version: 1, data: { sessionId } };
+}
+
+function readNativeSessionId(persistence: ProviderPersistence | undefined): string | null {
+  if (
+    !persistence ||
+    typeof persistence.data !== "object" ||
+    persistence.data === null ||
+    Array.isArray(persistence.data)
+  )
+    return null;
+  return typeof persistence.data.sessionId === "string" ? persistence.data.sessionId : null;
+}
+
+function toProviderConfigState(
+  modes: NewSessionResponse["modes"],
+  options: readonly SessionConfigOption[],
+): ProviderConfigState {
+  const model = options.find((option) => option.category === "model");
+  const thinking = options.find((option) => option.category === "thought_level");
+  return {
+    model: selectedValue(model),
+    mode: modes?.currentModeId,
+    thinkingOption: selectedValue(thinking),
+    models: selectOptions(model).map((option) => ({ id: option.value, label: option.label })),
+    modes:
+      modes?.availableModes.map((mode) => ({
+        id: mode.id,
+        label: mode.name,
+        description: mode.description ?? undefined,
+      })) ?? [],
+    thinkingOptions: selectOptions(thinking).map((option) => ({
+      id: option.value,
+      label: option.label,
+    })),
+    settings: options
+      .filter((option) => option.category !== "model" && option.category !== "thought_level")
+      .map(toProviderSetting),
+  };
+}
+
+function toProviderCatalog(
+  modes: NewSessionResponse["modes"],
+  options: readonly SessionConfigOption[],
+): ProviderCatalog {
+  const state = toProviderConfigState(modes, options);
+  return {
+    models: state.models,
+    modes: state.modes,
+    thinkingOptions: state.thinkingOptions,
+    defaultModel: state.model,
+    defaultMode: state.mode,
+    defaultThinkingOption: state.thinkingOption,
+  };
+}
+
+function toProviderSetting(option: SessionConfigOption): ProviderSetting {
+  if (option.type === "boolean") {
+    return {
+      type: "toggle",
+      id: option.id,
+      label: option.name,
+      description: option.description ?? undefined,
+      value: option.currentValue,
+    };
+  }
+  return {
+    type: "select",
+    id: option.id,
+    label: option.name,
+    description: option.description ?? undefined,
+    value: option.currentValue,
+    options: selectOptions(option),
+  };
+}
+
+function selectOptions(
+  option: SessionConfigOption | undefined,
+): Array<{ label: string; value: string }> {
+  if (!option || option.type === "boolean") return [];
+  return option.options.flatMap((candidate) =>
+    "group" in candidate
+      ? candidate.options.map((nested) => ({ label: nested.name, value: nested.value }))
+      : [{ label: candidate.name, value: candidate.value }],
+  );
+}
+
+function selectedValue(option: SessionConfigOption | undefined): string | undefined {
+  return option && option.type !== "boolean" ? option.currentValue : undefined;
+}
+
+function configValues(
+  options: readonly SessionConfigOption[],
+): Readonly<Record<string, ReturnType<typeof jsonValue>>> {
+  return Object.fromEntries(options.map((option) => [option.id, option.currentValue]));
+}
+
+function toolTimelineItem(snapshot: AcpToolCallSnapshot): ProviderTimelineItem {
+  const input = jsonRecord(snapshot.input);
+  const isEdit = snapshot.kind === "edit" || snapshot.name?.toLowerCase().includes("edit") === true;
+  const detail = isEdit
+    ? {
+        type: "edit" as const,
+        filePath:
+          typeof input.filePath === "string" ? input.filePath : (snapshot.locations[0] ?? ""),
+        oldString: typeof input.oldString === "string" ? input.oldString : undefined,
+        newString: typeof input.newString === "string" ? input.newString : undefined,
+        unifiedDiff: typeof input.unifiedDiff === "string" ? input.unifiedDiff : undefined,
+      }
+    : { type: "unknown" as const, input: snapshot.input, output: snapshot.output };
+  const status =
+    snapshot.status === "in_progress" || snapshot.status === "pending"
+      ? "running"
+      : snapshot.status;
+  const base = {
+    type: "tool_call" as const,
+    id: snapshot.id,
+    callId: snapshot.id,
+    name: snapshot.name ?? snapshot.title,
+    detail,
+  };
+  if (status === "failed") return { ...base, status, error: snapshot.output };
+  return { ...base, status, error: null };
+}
+
+function jsonValue(value: unknown) {
+  return z.json().parse(value);
+}
+
+function jsonRecord(value: unknown): Record<string, ReturnType<typeof jsonValue>> {
+  const parsed = jsonValue(value);
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
+  return parsed;
+}
+
+function describeError(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function withTimeout<Value>(
+  promise: Promise<Value>,
+  timeoutMs: number,
+  message: string,
+): Promise<Value> {
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => reject(new Error(message)), timeoutMs);
+    promise.then(
+      (value) => {
+        clearTimeout(timeout);
+        resolve(value);
+        return undefined;
+      },
+      (error) => {
+        clearTimeout(timeout);
+        reject(error);
+        return undefined;
+      },
+    );
+  });
+}
+
+async function settlesWithin(promise: Promise<void>, timeoutMs: number): Promise<boolean> {
+  return Promise.race([
+    promise.then(() => true),
+    new Promise<false>((resolve) => setTimeout(() => resolve(false), timeoutMs)),
+  ]);
+}
diff --git a/packages/plugin/src/server/acp.test.ts b/packages/plugin/src/server/acp.test.ts
new file mode 100644
index 0000000000..a62b2f2c48
--- /dev/null
+++ b/packages/plugin/src/server/acp.test.ts
@@ -0,0 +1,1329 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import {
+  AgentSideConnection,
+  PROTOCOL_VERSION,
+  type Agent,
+  type SessionUpdate,
+} from "@agentclientprotocol/sdk";
+import type { ProviderConnection, ProviderEvent, ProviderInput } from "./provider.js";
+import { afterEach, describe, expect, it } from "vitest";
+import { runAcpProvider, type AcpStreamMessage } from "./acp.js";
+
+const temporaryDirectories: string[] = [];
+
+afterEach(async () => {
+  await Promise.all(
+    temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
+  );
+});
+
+async function fakeAcp(source: string): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-acp-test-"));
+  temporaryDirectories.push(directory);
+  const executable = path.join(directory, "agent.cjs");
+  await writeFile(executable, source, "utf8");
+  return executable;
+}
+
+async function connect(
+  executable: string,
+  capabilities: string[],
+  transformers?: Parameters<typeof runAcpProvider>[0]["transformers"],
+): Promise<{ connection: ProviderConnection; events: ProviderEvent[] }> {
+  const registration = runAcpProvider({
+    id: "test-acp",
+    label: "Test ACP",
+    command: [process.execPath, executable],
+    transformers,
+  });
+  const connection = await registration.connect({ versions: [1], capabilities });
+  const events: ProviderEvent[] = [];
+  connection.onEvent((event) => events.push(event));
+  return { connection, events };
+}
+
+function openInput(
+  settings: Record<string, string> = {},
+): Extract<ProviderInput, { type: "session.open" }> {
+  return {
+    type: "session.open",
+    requestId: "open-1",
+    sessionId: "session-1",
+    config: { cwd: "/repo", env: {}, mcpServers: {}, settings, persist: true },
+    history: "skip",
+  };
+}
+
+async function waitForEvent(
+  events: ProviderEvent[],
+  predicate: (event: ProviderEvent) => boolean,
+): Promise<ProviderEvent> {
+  await expect.poll(() => events.find(predicate), { timeout: 3_000 }).toBeTruthy();
+  return events.find(predicate)!;
+}
+
+type AcpRequestMessage = Extract<AcpStreamMessage, { id: string | number | null; method: string }>;
+
+interface ConnectorInstance {
+  readonly requests: AcpRequestMessage[];
+  readsCanceled: boolean;
+  writesClosed: boolean;
+  closeFromAgent(): void;
+  request(method: string, params: unknown): Promise<unknown>;
+  respond(request: AcpRequestMessage, result: unknown): void;
+  reject(request: AcpRequestMessage, message: string): void;
+  notify(method: string, params: unknown): void;
+}
+
+interface ConnectorResponse {
+  resolve(value: unknown): void;
+  reject(error: Error): void;
+}
+
+interface ConnectorHarnessOptions {
+  capabilities?: Record<string, unknown>;
+  configOptions?: unknown[];
+  /** Session updates the agent streams for a prompt (keyed by its text) before ending the turn. */
+  promptUpdates?(promptText: string): unknown[];
+  handleMessage?(instance: ConnectorInstance, message: AcpStreamMessage): boolean;
+  handleRequest?(instance: ConnectorInstance, request: AcpRequestMessage): boolean;
+}
+
+function countRequests(instance: ConnectorInstance, method: string): number {
+  return instance.requests.filter((request) => request.method === method).length;
+}
+
+function receiveConnectorMessage(
+  instance: ConnectorInstance,
+  message: AcpStreamMessage,
+  options?: ConnectorHarnessOptions,
+): void {
+  if (!("method" in message)) return;
+  if ("id" in message) instance.requests.push(message as AcpRequestMessage);
+  if (options?.handleMessage?.(instance, message)) return;
+  if (!("id" in message)) return;
+  const request = message as AcpRequestMessage;
+  if (options?.handleRequest?.(instance, request)) return;
+  respondToConnectorRequest(instance, request, options);
+}
+
+function respondToConnectorRequest(
+  instance: ConnectorInstance,
+  request: AcpRequestMessage,
+  options?: ConnectorHarnessOptions,
+): void {
+  if (request.method === "initialize") {
+    instance.respond(request, {
+      protocolVersion: request.params
+        ? (request.params as { protocolVersion: number }).protocolVersion
+        : PROTOCOL_VERSION,
+      agentCapabilities: options?.capabilities ?? {},
+    });
+  } else if (request.method === "session/new" || request.method === "session/load") {
+    instance.respond(request, {
+      sessionId: "connector-session",
+      modes: null,
+      configOptions: options?.configOptions ?? [],
+    });
+  } else if (request.method === "session/prompt") {
+    const { prompt } = request.params as { prompt: Array<{ type: string; text?: string }> };
+    const promptText = prompt.find((part) => part.type === "text")?.text ?? "";
+    for (const update of options?.promptUpdates?.(promptText) ?? []) {
+      instance.notify("session/update", { sessionId: "connector-session", update });
+    }
+    instance.respond(request, { stopReason: "end_turn" });
+  } else if (request.method === "session/close") {
+    instance.respond(request, {});
+  } else if (request.method === "session/set_config_option") {
+    const params = request.params as { configId: string; value: string | boolean };
+    instance.respond(request, {
+      configOptions: (options?.configOptions ?? []).map((option) =>
+        (option as { id?: string }).id === params.configId
+          ? Object.assign({}, option, { currentValue: params.value })
+          : option,
+      ),
+    });
+  }
+}
+
+function connectorHarness(options?: ConnectorHarnessOptions) {
+  const instances: ConnectorInstance[] = [];
+  const connector = () => {
+    let controller!: ReadableStreamDefaultController<AcpStreamMessage>;
+    let requestSequence = 0;
+    const responses = new Map<number, ConnectorResponse>();
+    const instance: ConnectorInstance = {
+      requests: [],
+      readsCanceled: false,
+      writesClosed: false,
+      closeFromAgent: () => controller.close(),
+      request: (method, params) => {
+        const response = new Promise<unknown>((resolve, reject) => {
+          requestSequence += 1;
+          responses.set(requestSequence, { resolve, reject });
+          controller.enqueue({ jsonrpc: "2.0", id: requestSequence, method, params });
+        });
+        void response.catch(() => undefined);
+        return response;
+      },
+      respond: (request, result) => controller.enqueue({ jsonrpc: "2.0", id: request.id, result }),
+      reject: (request, message) =>
+        controller.enqueue({ jsonrpc: "2.0", id: request.id, error: { code: -32603, message } }),
+      notify: (method, params) => controller.enqueue({ jsonrpc: "2.0", method, params }),
+    };
+    instances.push(instance);
+    const readable = new ReadableStream<AcpStreamMessage>({
+      start(value) {
+        controller = value;
+      },
+      cancel() {
+        instance.readsCanceled = true;
+      },
+    });
+    const writable = new WritableStream<AcpStreamMessage>({
+      write(message) {
+        if (!("method" in message)) {
+          if (typeof message.id !== "number") return;
+          const response = responses.get(message.id);
+          if (!response) return;
+          responses.delete(message.id);
+          if ("error" in message) {
+            response.reject(
+              new Error(
+                message.error.data === undefined
+                  ? message.error.message
+                  : `${message.error.message}: ${JSON.stringify(message.error.data)}`,
+              ),
+            );
+          } else response.resolve(message.result);
+          return;
+        }
+        receiveConnectorMessage(instance, message, options);
+      },
+      close() {
+        instance.writesClosed = true;
+      },
+      abort() {
+        instance.writesClosed = true;
+      },
+    });
+    return { readable, writable };
+  };
+  return { connector, instances };
+}
+
+const basicAgent = `const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") setTimeout(() => send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: [] } }), 150);
+  else if (message.method === "session/prompt") send({ jsonrpc: "2.0", id: message.id, result: { stopReason: "end_turn" } });
+});`;
+
+describe("runAcpProvider", () => {
+  it("spawns the daemon-resolved launch for probes, catalogues, listing, and sessions", async () => {
+    const executable = await fakeAcp(`
+if (process.env.LAUNCH_TOKEN !== "resolved" || process.env.CLAUDECODE || process.env.PASEO_NODE_ENV) process.exit(1);
+const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  let result;
+  if (message.method === "initialize") result = { protocolVersion: message.params.protocolVersion, agentCapabilities: { sessionCapabilities: { list: {} } } };
+  else if (message.method === "session/new") result = { sessionId: "native", configOptions: [{ id: "model", name: "Model", category: "model", type: "select", currentValue: "resolved", options: [{ value: "resolved", name: process.env.SESSION_TOKEN || "probe" }] }] };
+  else if (message.method === "session/list") result = { sessions: [] };
+  else return;
+  send({ jsonrpc: "2.0", id: message.id, result });
+});`);
+    const registration = runAcpProvider({
+      id: "launch-acp",
+      label: "Launch ACP",
+      command: ["missing-default-command"],
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message", "session.list"],
+      launch: { command: process.execPath, args: [executable], env: { LAUNCH_TOKEN: "resolved" } },
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    try {
+      await connection.send({ type: "catalog", requestId: "catalog" });
+      expect(await waitForEvent(events, (event) => event.type === "catalog")).toMatchObject({
+        catalog: { models: [{ id: "resolved", label: "probe" }] },
+      });
+      await connection.send({ type: "sessions", requestId: "list" });
+      expect(await waitForEvent(events, (event) => event.type === "sessions")).toMatchObject({
+        sessions: [],
+      });
+      const input = openInput();
+      input.config.env = { SESSION_TOKEN: "session" };
+      await connection.send(input);
+      expect(await waitForEvent(events, (event) => event.type === "session.config")).toMatchObject({
+        config: { models: [{ id: "resolved", label: "session" }] },
+      });
+    } finally {
+      await connection.close();
+    }
+  });
+
+  it("rejects connection cleanly when the ACP executable does not exist", async () => {
+    const registration = runAcpProvider({
+      id: "missing-acp",
+      label: "Missing ACP",
+      command: [path.join(tmpdir(), `missing-acp-${process.pid}`)],
+      acpOptions: { startupTimeoutMs: 250 },
+    });
+
+    await expect(
+      registration.connect({ versions: [1], capabilities: ["prompt.message"] }),
+    ).rejects.toThrow(/ENOENT|spawn/u);
+  });
+
+  it("accepts an official ACP SDK stream connector instead of a command", async () => {
+    const connector = () => {
+      const clientToAgent = new TransformStream();
+      const agentToClient = new TransformStream();
+      const agent: Agent = {
+        initialize: async () => ({ protocolVersion: PROTOCOL_VERSION, agentCapabilities: {} }),
+        newSession: async () => ({ sessionId: "sdk-session", modes: null, configOptions: [] }),
+        prompt: async () => ({ stopReason: "end_turn" }),
+        cancel: async () => undefined,
+      };
+      const agentConnection = new AgentSideConnection(() => agent, {
+        writable: agentToClient.writable,
+        readable: clientToAgent.readable,
+      });
+      void agentConnection;
+      return {
+        writable: clientToAgent.writable,
+        readable: agentToClient.readable,
+      };
+    };
+    const registration = runAcpProvider({
+      id: "sdk-acp",
+      label: "SDK ACP",
+      connector,
+    });
+
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    expect(connection.capabilities).toEqual(["prompt.message"]);
+    await connection.close();
+  });
+
+  it("maps permission behavior to the first matching ACP option", async () => {
+    const harness = connectorHarness();
+    const registration = runAcpProvider({
+      id: "sdk-acp",
+      label: "SDK ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message", "permission"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    const allow = harness.instances[1]!.request("session/request_permission", {
+      sessionId: "connector-session",
+      toolCall: {
+        toolCallId: "tool-allow",
+        title: "Allow tool",
+        kind: "execute",
+        status: "pending",
+        content: [],
+        rawInput: {},
+      },
+      options: [
+        { optionId: "allow-always", name: "Always allow", kind: "allow_always" },
+        { optionId: "allow-once", name: "Allow once", kind: "allow_once" },
+        { optionId: "reject-once", name: "Reject", kind: "reject_once" },
+      ],
+    });
+    await waitForEvent(
+      events,
+      (event) =>
+        event.type === "session.permission" && event.request.id === "permission:tool-allow",
+    );
+    await connection.send({
+      type: "session.permission",
+      sessionId: "session-1",
+      permissionId: "permission:tool-allow",
+      response: { behavior: "allow" },
+    });
+    await expect(allow).resolves.toEqual({
+      outcome: { outcome: "selected", optionId: "allow-always" },
+    });
+
+    const deny = harness.instances[1]!.request("session/request_permission", {
+      sessionId: "connector-session",
+      toolCall: {
+        toolCallId: "tool-deny",
+        title: "Deny tool",
+        kind: "execute",
+        status: "pending",
+        content: [],
+        rawInput: {},
+      },
+      options: [
+        { optionId: "allow-once", name: "Allow", kind: "allow_once" },
+        { optionId: "reject-always", name: "Always reject", kind: "reject_always" },
+        { optionId: "reject-once", name: "Reject once", kind: "reject_once" },
+      ],
+    });
+    await waitForEvent(
+      events,
+      (event) => event.type === "session.permission" && event.request.id === "permission:tool-deny",
+    );
+    await connection.send({
+      type: "session.permission",
+      sessionId: "session-1",
+      permissionId: "permission:tool-deny",
+      response: { behavior: "deny" },
+    });
+    await expect(deny).resolves.toEqual({
+      outcome: { outcome: "selected", optionId: "reject-always" },
+    });
+    await connection.close();
+  });
+
+  it("rejects an explicit ACP permission option with the wrong behavior", async () => {
+    const harness = connectorHarness();
+    const registration = runAcpProvider({
+      id: "sdk-acp",
+      label: "SDK ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message", "permission"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    const permission = harness.instances[1]!.request("session/request_permission", {
+      sessionId: "connector-session",
+      toolCall: {
+        toolCallId: "tool-explicit",
+        title: "Explicit tool",
+        kind: "execute",
+        status: "pending",
+        content: [],
+        rawInput: {},
+      },
+      options: [
+        { optionId: "allow-once", name: "Allow", kind: "allow_once" },
+        { optionId: "reject-once", name: "Reject", kind: "reject_once" },
+      ],
+    });
+    await waitForEvent(
+      events,
+      (event) =>
+        event.type === "session.permission" && event.request.id === "permission:tool-explicit",
+    );
+    await connection.send({
+      type: "session.permission",
+      sessionId: "session-1",
+      permissionId: "permission:tool-explicit",
+      response: { behavior: "allow", selectedActionId: "missing" },
+    });
+    await expect(
+      waitForEvent(
+        events,
+        (event) =>
+          event.type === "session.runtime_failed" && event.error.message.includes("'missing'"),
+      ),
+    ).resolves.toBeDefined();
+
+    await connection.send({
+      type: "session.permission",
+      sessionId: "session-1",
+      permissionId: "permission:tool-explicit",
+      response: { behavior: "allow", selectedActionId: "reject-once" },
+    });
+    await expect(
+      waitForEvent(
+        events,
+        (event) =>
+          event.type === "session.runtime_failed" &&
+          event.error.message.includes("'reject-once'") &&
+          event.error.message.includes("does not match 'allow' behavior"),
+      ),
+    ).resolves.toBeDefined();
+
+    await connection.send({
+      type: "session.permission",
+      sessionId: "session-1",
+      permissionId: "permission:tool-explicit",
+      response: { behavior: "allow", selectedActionId: "allow-once" },
+    });
+    await expect(permission).resolves.toEqual({
+      outcome: { outcome: "selected", optionId: "allow-once" },
+    });
+    await connection.close();
+  });
+
+  it("closes both connector directions for the probe and live session", async () => {
+    const harness = connectorHarness();
+    const registration = runAcpProvider({
+      id: "owned-acp",
+      label: "Owned ACP",
+      connector: harness.connector,
+    });
+
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    expect(harness.instances).toHaveLength(1);
+    expect(harness.instances[0]).toMatchObject({ readsCanceled: true, writesClosed: true });
+
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    await connection.close();
+
+    expect(harness.instances).toHaveLength(2);
+    expect(harness.instances[1]).toMatchObject({ readsCanceled: true, writesClosed: true });
+  });
+
+  it("publishes runtime failure on unexpected connector EOF", async () => {
+    const harness = connectorHarness();
+    const registration = runAcpProvider({
+      id: "eof-acp",
+      label: "EOF ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    harness.instances[1]!.closeFromAgent();
+
+    await expect(
+      waitForEvent(events, (event) => event.type === "session.runtime_failed"),
+    ).resolves.toMatchObject({
+      sessionId: "session-1",
+      error: { message: expect.stringContaining("closed") },
+    });
+    await connection.close();
+  });
+
+  it("settles an active auto prompt before admitting its auto replacement", async () => {
+    const order: string[] = [];
+    let firstPrompt: AcpRequestMessage | null = null;
+    let activePrompts = 0;
+    let maximumActivePrompts = 0;
+    const harness = connectorHarness({
+      handleMessage(instance, message) {
+        if (!("method" in message)) return false;
+        const request = "id" in message ? (message as AcpRequestMessage) : null;
+        if (message.method === "session/prompt" && request) {
+          const promptNumber = firstPrompt ? "second" : "first";
+          order.push(`prompt:${promptNumber}`);
+          activePrompts += 1;
+          maximumActivePrompts = Math.max(maximumActivePrompts, activePrompts);
+          if (!firstPrompt) {
+            firstPrompt = request;
+          } else {
+            activePrompts -= 1;
+            instance.respond(request, { stopReason: "end_turn" });
+          }
+          return true;
+        }
+        if (message.method === "session/cancel") {
+          order.push("cancel");
+          activePrompts -= 1;
+          instance.respond(firstPrompt!, { stopReason: "cancelled" });
+          return true;
+        }
+        return false;
+      },
+    });
+    const registration = runAcpProvider({
+      id: "overlap-acp",
+      label: "Overlap ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-1",
+      prompt: {
+        clientMessageId: "first",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "first" }] },
+      },
+    });
+    await expect.poll(() => countRequests(harness.instances[1]!, "session/prompt")).toBe(1);
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-1",
+      prompt: {
+        clientMessageId: "second",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "second" }] },
+      },
+    });
+
+    await waitForEvent(
+      events,
+      (event) =>
+        event.type === "session.turn" &&
+        event.turnId === "acp:second" &&
+        event.state === "completed",
+    );
+    expect(order).toEqual(["prompt:first", "cancel", "prompt:second"]);
+    expect(maximumActivePrompts).toBe(1);
+    const firstTerminal = events.findIndex(
+      (event) =>
+        event.type === "session.turn" && event.turnId === "acp:first" && event.state === "canceled",
+    );
+    const secondAdmission = events.findIndex(
+      (event) => event.type === "session.prompt_result" && event.clientMessageId === "second",
+    );
+    expect(firstTerminal).toBeGreaterThan(-1);
+    expect(firstTerminal).toBeLessThan(secondAdmission);
+    await connection.close();
+  });
+
+  it("serializes configuration mutations", async () => {
+    let releaseMutation: (() => void) | null = null;
+    const configOptions = [
+      {
+        id: "model",
+        name: "Model",
+        category: "model",
+        type: "select",
+        currentValue: "a",
+        options: [
+          { name: "A", value: "a" },
+          { name: "B", value: "b" },
+        ],
+      },
+    ];
+    const harness = connectorHarness({
+      capabilities: { loadSession: true },
+      configOptions,
+      handleRequest(instance, request) {
+        if (request.method !== "session/set_config_option") return false;
+        const value = (request.params as { value: string }).value;
+        if (value !== "first") return false;
+        releaseMutation = () =>
+          instance.respond(request, {
+            configOptions: configOptions.map((option) =>
+              Object.assign({}, option, { currentValue: value }),
+            ),
+          });
+        return true;
+      },
+    });
+    const registration = runAcpProvider({
+      id: "lane-acp",
+      label: "Lane ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message", "session.configure"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    await connection.send({
+      type: "session.configure",
+      requestId: "configure-first",
+      sessionId: "session-1",
+      changes: { model: "first" },
+    });
+    await connection.send({
+      type: "session.configure",
+      requestId: "configure-second",
+      sessionId: "session-1",
+      changes: { model: "second" },
+    });
+    await expect
+      .poll(() => countRequests(harness.instances[1]!, "session/set_config_option"))
+      .toBe(1);
+    releaseMutation!();
+    await waitForEvent(
+      events,
+      (event) => event.type === "request.completed" && event.requestId === "configure-second",
+    );
+    expect(
+      events
+        .filter(
+          (event) => event.type === "request.completed" && event.requestId.startsWith("configure-"),
+        )
+        .map((event) => (event as Extract<ProviderEvent, { type: "request.completed" }>).requestId),
+    ).toEqual(["configure-first", "configure-second"]);
+
+    await connection.close();
+  });
+
+  it("does not claim exact permission policy, listing, image, or configuration support", async () => {
+    const executable = await fakeAcp(basicAgent);
+    const { connection, events } = await connect(executable, [
+      "prompt.message",
+      "prompt.image",
+      "session.configure",
+      "session.list",
+      "permission.tool_policy",
+    ]);
+
+    expect(connection.capabilities).toEqual(["prompt.message", "session.configure"]);
+    await connection.send(openInput());
+    const opened = await waitForEvent(events, (event) => event.type === "session.opened");
+    expect(opened).toMatchObject({ capabilities: ["prompt.message"] });
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    await expect(
+      connection.send({
+        type: "session.configure",
+        requestId: "configure-unsupported",
+        sessionId: "session-1",
+        changes: { model: "not-advertised" },
+      }),
+    ).rejects.toThrow("session.configure");
+    await connection.close();
+  });
+
+  it("derives optional connection capabilities from ACP initialization", async () => {
+    const executable = await fakeAcp(`const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: {
+    protocolVersion: message.params.protocolVersion,
+    agentCapabilities: {
+      loadSession: true,
+      promptCapabilities: { image: true },
+      sessionCapabilities: { list: {} },
+    },
+  } });
+});`);
+    const { connection } = await connect(executable, [
+      "prompt.message",
+      "prompt.image",
+      "session.list",
+      "session.persistence",
+    ]);
+
+    expect(connection.capabilities).toEqual([
+      "prompt.message",
+      "prompt.image",
+      "session.list",
+      "session.persistence",
+    ]);
+    await connection.close();
+  });
+
+  it("acknowledges admission before session creation completes", async () => {
+    const executable = await fakeAcp(basicAgent);
+    const { connection, events } = await connect(executable, ["prompt.message"]);
+    let ready = false;
+    const admission = connection.send(openInput()).then(() => {
+      ready = true;
+      return undefined;
+    });
+
+    await admission;
+    expect(ready).toBe(true);
+    expect(events).toEqual([]);
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    await connection.close();
+  });
+
+  it("rejects provider inputs after the ACP connection closes", async () => {
+    const harness = connectorHarness();
+    const registration = runAcpProvider({
+      id: "closed-acp",
+      label: "Closed ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({ versions: [1], capabilities: [] });
+
+    await connection.close();
+    await expect(connection.send({ type: "catalog", requestId: "too-late" })).rejects.toThrow(
+      "ACP provider connection is closed",
+    );
+    expect(harness.instances).toHaveLength(1);
+  });
+
+  it("waits for delayed session creation and closes its connector after connection close", async () => {
+    let delayedNew: AcpRequestMessage | null = null;
+    const harness = connectorHarness({
+      handleRequest(_instance, request) {
+        if (request.method !== "session/new") return false;
+        delayedNew = request;
+        return true;
+      },
+    });
+    const registration = runAcpProvider({
+      id: "delayed-open-acp",
+      label: "Delayed open ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await expect.poll(() => delayedNew).not.toBeNull();
+
+    let closeSettled = false;
+    const closing = connection.close().then(() => {
+      closeSettled = true;
+      return undefined;
+    });
+    await Promise.resolve();
+    expect(closeSettled).toBe(false);
+    harness.instances[1]!.respond(delayedNew!, {
+      sessionId: "late-session",
+      modes: null,
+      configOptions: [],
+    });
+    await closing;
+
+    expect(harness.instances[1]).toMatchObject({ readsCanceled: true, writesClosed: true });
+    expect(events).toEqual([]);
+  });
+
+  it("refuses unsupported steering before sending an ACP prompt", async () => {
+    const executable = await fakeAcp(basicAgent);
+    const { connection, events } = await connect(executable, ["prompt.message"]);
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    await expect(
+      connection.send({
+        type: "session.prompt",
+        sessionId: "session-1",
+        prompt: {
+          clientMessageId: "steer-1",
+          delivery: "steer",
+          input: { type: "message", content: [{ type: "text", text: "change course" }] },
+        },
+      }),
+    ).rejects.toThrow("prompt.steer");
+    expect(events.some((event) => event.type === "session.prompt_result")).toBe(false);
+    await connection.close();
+  });
+
+  it("keeps configuration observable state atomic when a later field fails", async () => {
+    const executable = await fakeAcp(`const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+let model = "a";
+const options = () => [
+  { id: "model", name: "Model", category: "model", type: "select", currentValue: model, options: [{ name: "A", value: "a" }, { name: "B", value: "b" }] },
+  { id: "verbosity", name: "Verbosity", type: "select", currentValue: "quiet", options: [{ name: "Quiet", value: "quiet" }, { name: "Loud", value: "loud" }] },
+];
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: options() } });
+  else if (message.method === "session/set_config_option" && message.params.configId === "verbosity") send({ jsonrpc: "2.0", id: message.id, error: { code: -32602, message: "verbosity rejected" } });
+  else if (message.method === "session/set_config_option") { model = message.params.value; send({ jsonrpc: "2.0", id: message.id, result: { configOptions: options() } }); }
+});`);
+    const { connection, events } = await connect(executable, [
+      "prompt.message",
+      "session.configure",
+    ]);
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    await connection.send({
+      type: "session.configure",
+      requestId: "configure-1",
+      sessionId: "session-1",
+      changes: { model: "b", settings: { verbosity: "loud" } },
+    });
+    await waitForEvent(
+      events,
+      (event) => event.type === "request.failed" && event.requestId === "configure-1",
+    );
+    const configs = events.filter((event) => event.type === "session.config");
+    expect(configs).toHaveLength(1);
+    expect(configs[0]).toMatchObject({ config: { model: "a" } });
+    await connection.close();
+  });
+
+  it.each([1, 64])(
+    "commits transformer config notifications once and discards them on rollback (%i per response)",
+    async (notificationCount) => {
+      const executable = await fakeAcp(`const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (...messages) => process.stdout.write(messages.map((message) => JSON.stringify(message) + "\\n").join(""));
+let model = "a";
+const options = () => [
+  { id: "model", name: "Model", category: "model", type: "select", currentValue: model, options: [{ name: "A", value: "a" }, { name: "B", value: "b" }] },
+  { id: "late", name: "Late", type: "select", currentValue: "ok", options: [{ name: "Ok", value: "ok" }, { name: "Fail", value: "fail" }] },
+];
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: options() } });
+  else if (message.method === "session/set_config_option" && message.params.configId === "late") send({ jsonrpc: "2.0", id: message.id, error: { code: -32602, message: "late rejected" } });
+  else if (message.method === "session/set_config_option") {
+    model = message.params.value;
+    send(
+      ...Array.from({ length: ${notificationCount} }, () => ({ jsonrpc: "2.0", method: "vendor/config", params: { model } })),
+      { jsonrpc: "2.0", id: message.id, result: { configOptions: options() } },
+    );
+  }
+});`);
+      const transformer = {
+        notification(notification: { method: string; params: unknown }) {
+          if (notification.method !== "vendor/config") return null;
+          const params = notification.params as { model: string };
+          return {
+            type: "config" as const,
+            config: {
+              model: params.model,
+              models: [{ id: params.model, label: `Transformer ${params.model}` }],
+              modes: [],
+              thinkingOptions: [],
+              settings: [],
+            },
+          };
+        },
+      };
+      const { connection, events } = await connect(
+        executable,
+        ["prompt.message", "session.configure"],
+        [transformer],
+      );
+      await connection.send(openInput());
+      await waitForEvent(events, (event) => event.type === "session.ready");
+      const initialConfigCount = events.filter((event) => event.type === "session.config").length;
+
+      await connection.send({
+        type: "session.configure",
+        requestId: "transformer-initial-failure",
+        sessionId: "session-1",
+        changes: { model: "b", settings: { late: "fail" } },
+      });
+      await waitForEvent(
+        events,
+        (event) =>
+          event.type === "request.failed" && event.requestId === "transformer-initial-failure",
+      );
+      expect(events.filter((event) => event.type === "session.config")).toHaveLength(
+        initialConfigCount,
+      );
+
+      await connection.send({
+        type: "session.configure",
+        requestId: "transformer-success",
+        sessionId: "session-1",
+        changes: { model: "b" },
+      });
+      await waitForEvent(
+        events,
+        (event) => event.type === "request.completed" && event.requestId === "transformer-success",
+      );
+      let configs = events.filter((event) => event.type === "session.config");
+      expect(configs).toHaveLength(initialConfigCount + 1);
+      expect(configs.at(-1)).toMatchObject({
+        config: { model: "b", models: [{ label: "Transformer b" }] },
+      });
+
+      await connection.send({
+        type: "session.configure",
+        requestId: "transformer-failure",
+        sessionId: "session-1",
+        changes: { model: "a", settings: { late: "fail" } },
+      });
+      await waitForEvent(
+        events,
+        (event) => event.type === "request.failed" && event.requestId === "transformer-failure",
+      );
+      configs = events.filter((event) => event.type === "session.config");
+      expect(configs).toHaveLength(initialConfigCount + 1);
+      expect(configs.at(-1)).toMatchObject({ config: { model: "b" } });
+      await connection.close();
+    },
+  );
+
+  it("gives discovery transformers the discovered session configuration facade", async () => {
+    const executable = await fakeAcp(`const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "catalog-native", modes: null, configOptions: [{ id: "flavor", name: "Flavor", type: "select", currentValue: "mint", options: [{ name: "Mint", value: "mint" }] }] } });
+});`);
+    let discovered: Readonly<Record<string, unknown>> | null = null;
+    const { connection, events } = await connect(
+      executable,
+      [],
+      [
+        {
+          async discover(catalog, context) {
+            discovered = await context.config.read();
+            return catalog;
+          },
+        },
+      ],
+    );
+
+    await connection.send({ type: "catalog", requestId: "catalog-1" });
+    await waitForEvent(events, (event) => event.type === "catalog");
+    expect(discovered).toEqual({ flavor: "mint" });
+    await connection.close();
+  });
+
+  it("drains heavy ACP stderr while initializing", async () => {
+    const executable = await fakeAcp(
+      `process.stderr.write("x".repeat(2 * 1024 * 1024));\n${basicAgent}`,
+    );
+    const { connection, events } = await connect(executable, ["prompt.message"]);
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    await connection.close();
+  });
+
+  it("publishes runtime failure when the ACP process dies", async () => {
+    const executable = await fakeAcp(`const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") {
+    send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: [] } });
+    setTimeout(() => process.exit(17), 20);
+  }
+});`);
+    const { connection, events } = await connect(executable, ["prompt.message"]);
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    const failure = await waitForEvent(events, (event) => event.type === "session.runtime_failed");
+    expect(failure).toMatchObject({
+      sessionId: "session-1",
+      error: { message: expect.stringContaining("17") },
+    });
+    await connection.close();
+  });
+
+  it("escalates shutdown when an ACP process ignores SIGTERM", async () => {
+    const executable = await fakeAcp(`const readline = require("node:readline");
+process.on("SIGTERM", () => {});
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  else if (message.method === "session/new") send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: [] } });
+});`);
+    const { connection, events } = await connect(executable, ["prompt.message"]);
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    const startedAt = Date.now();
+    await connection.close();
+    expect(Date.now() - startedAt).toBeGreaterThanOrEqual(900);
+    expect(Date.now() - startedAt).toBeLessThan(2_500);
+  });
+});
+
+describe("runAcpProvider streamed chunks without messageId (#4699)", () => {
+  interface Chunk {
+    kind: "agent_message_chunk" | "agent_thought_chunk";
+    text: string;
+    messageId?: string;
+  }
+
+  it("continues one timeline item per turn instead of one per chunk", async () => {
+    const chunksByPrompt: Record<string, Chunk[]> = {
+      first: [
+        { kind: "agent_message_chunk", text: "- **Current tem" },
+        { kind: "agent_message_chunk", text: "perature**: 25°C" },
+      ],
+      second: [{ kind: "agent_message_chunk", text: "next turn" }],
+      // An explicit-id text chunk between two id-less thoughts separates them.
+      third: [
+        { kind: "agent_thought_chunk", text: "think A" },
+        { kind: "agent_message_chunk", text: "say", messageId: "m-explicit" },
+        { kind: "agent_thought_chunk", text: "think B" },
+      ],
+    };
+    const harness = connectorHarness({
+      promptUpdates: (promptText) =>
+        (chunksByPrompt[promptText] ?? []).map((chunk) => {
+          const update: Record<string, unknown> = {
+            sessionUpdate: chunk.kind,
+            content: { type: "text", text: chunk.text },
+          };
+          if (chunk.messageId) update.messageId = chunk.messageId;
+          return update;
+        }),
+    });
+    const registration = runAcpProvider({
+      id: "chunk-acp",
+      label: "Chunk ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    for (const clientMessageId of ["first", "second", "third"]) {
+      await connection.send({
+        type: "session.prompt",
+        sessionId: "session-1",
+        prompt: {
+          clientMessageId,
+          delivery: "auto",
+          input: { type: "message", content: [{ type: "text", text: clientMessageId }] },
+        },
+      });
+      await waitForEvent(
+        events,
+        (event) =>
+          event.type === "session.turn" &&
+          event.turnId === `acp:${clientMessageId}` &&
+          event.state === "completed",
+      );
+    }
+
+    const items = events.flatMap((event) =>
+      event.type === "timeline.item" &&
+      (event.item.type === "assistant_message" || event.item.type === "reasoning")
+        ? [{ id: event.item.id, text: event.item.text }]
+        : [],
+    );
+    expect(items).toEqual([
+      { id: "agent_message_chunk:1", text: "- **Current tem" },
+      { id: "agent_message_chunk:1", text: "- **Current temperature**: 25°C" },
+      { id: "agent_message_chunk:2", text: "next turn" },
+      { id: "agent_thought_chunk:3", text: "think A" },
+      { id: "m-explicit", text: "say" },
+      { id: "agent_thought_chunk:4", text: "think B" },
+    ]);
+    await connection.close();
+  });
+});
+
+function textChunk(
+  text: string,
+  kind: "agent_message_chunk" | "agent_thought_chunk" = "agent_message_chunk",
+  messageId?: string,
+): SessionUpdate {
+  return {
+    sessionUpdate: kind,
+    content: { type: "text", text },
+    ...(messageId === undefined ? {} : { messageId }),
+  };
+}
+
+async function streamChunkTurns(
+  updates: SessionUpdate[],
+  ending: "completed" | "canceled" | "failed" = "completed",
+) {
+  let promptCount = 0;
+  const harness = connectorHarness({
+    handleRequest(instance, request) {
+      if (request.method !== "session/prompt") return false;
+      promptCount++;
+      for (const update of promptCount === 1 ? updates : [textChunk("Next turn")]) {
+        instance.notify("session/update", { sessionId: "connector-session", update });
+      }
+      if (promptCount === 1 && ending === "failed") instance.reject(request, "Prompt failed");
+      else
+        instance.respond(request, {
+          stopReason: promptCount === 1 && ending === "canceled" ? "cancelled" : "end_turn",
+        });
+      return true;
+    },
+  });
+  const registration = runAcpProvider({
+    id: "chunk-boundaries",
+    label: "Chunk boundaries",
+    connector: harness.connector,
+  });
+  const connection = await registration.connect({
+    versions: [1],
+    capabilities: ["prompt.message"],
+  });
+  const events: ProviderEvent[] = [];
+  connection.onEvent((event) => events.push(event));
+  try {
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+    for (const clientMessageId of ["first", "second"]) {
+      await connection.send({
+        type: "session.prompt",
+        sessionId: "session-1",
+        prompt: {
+          clientMessageId,
+          delivery: "auto",
+          input: { type: "message", content: [{ type: "text", text: clientMessageId }] },
+        },
+      });
+      await waitForEvent(
+        events,
+        (event) =>
+          event.type === "session.turn" &&
+          event.turnId === `acp:${clientMessageId}` &&
+          event.state === (clientMessageId === "first" ? ending : "completed"),
+      );
+    }
+    const messages = new Map<string, { type: string; text: string }>();
+    for (const event of events) {
+      if (
+        event.type === "timeline.item" &&
+        (event.item.type === "assistant_message" || event.item.type === "reasoning")
+      ) {
+        messages.set(event.item.id, { type: event.item.type, text: event.item.text });
+      }
+    }
+    return [...messages.values()];
+  } finally {
+    await connection.close();
+  }
+}
+
+describe("ACP streamed message boundaries", () => {
+  it.each([
+    {
+      name: "tool call",
+      update: {
+        sessionUpdate: "tool_call",
+        toolCallId: "tool",
+        title: "Read",
+        kind: "read",
+        status: "in_progress",
+      },
+    },
+    { name: "plan", update: { sessionUpdate: "plan", entries: [] } },
+    {
+      name: "user message",
+      update: { sessionUpdate: "user_message_chunk", content: { type: "text", text: "User" } },
+    },
+  ] satisfies Array<{ name: string; update: SessionUpdate }>)(
+    "starts a new message after a $name",
+    async ({ update }) => {
+      expect(
+        await streamChunkTurns([
+          textChunk("Before"),
+          update,
+          textChunk("After "),
+          textChunk("boundary"),
+        ]),
+      ).toEqual([
+        { type: "assistant_message", text: "Before" },
+        { type: "assistant_message", text: "After boundary" },
+        { type: "assistant_message", text: "Next turn" },
+      ]);
+    },
+  );
+
+  it("continues text while an existing tool receives a status update", async () => {
+    expect(
+      await streamChunkTurns([
+        {
+          sessionUpdate: "tool_call",
+          toolCallId: "tool",
+          title: "Read",
+          kind: "read",
+          status: "in_progress",
+        },
+        textChunk("Still "),
+        { sessionUpdate: "tool_call_update", toolCallId: "tool", status: "completed" },
+        textChunk("speaking"),
+      ]),
+    ).toEqual([
+      { type: "assistant_message", text: "Still speaking" },
+      { type: "assistant_message", text: "Next turn" },
+    ]);
+  });
+
+  it("keeps explicit messages separate from neighboring anonymous chunks", async () => {
+    expect(
+      await streamChunkTurns([
+        textChunk("Before"),
+        textChunk("Explicit ", "agent_message_chunk", "message"),
+        textChunk("message", "agent_message_chunk", "message"),
+        textChunk("After"),
+      ]),
+    ).toEqual([
+      { type: "assistant_message", text: "Before" },
+      { type: "assistant_message", text: "Explicit message" },
+      { type: "assistant_message", text: "After" },
+      { type: "assistant_message", text: "Next turn" },
+    ]);
+  });
+
+  it("continues reasoning but starts a new segment after nontext assistant content", async () => {
+    expect(
+      await streamChunkTurns([
+        textChunk("Think ", "agent_thought_chunk"),
+        textChunk("first", "agent_thought_chunk"),
+        {
+          sessionUpdate: "agent_message_chunk",
+          content: { type: "image", data: "", mimeType: "image/png" },
+        },
+        textChunk("Then think", "agent_thought_chunk"),
+      ]),
+    ).toEqual([
+      { type: "reasoning", text: "Think first" },
+      { type: "reasoning", text: "Then think" },
+      { type: "assistant_message", text: "Next turn" },
+    ]);
+  });
+
+  it.each(["completed", "canceled", "failed"] as const)(
+    "keeps the next turn separate after a %s prompt",
+    async (ending) => {
+      expect(await streamChunkTurns([textChunk("First "), textChunk("turn")], ending)).toEqual([
+        { type: "assistant_message", text: "First turn" },
+        { type: "assistant_message", text: "Next turn" },
+      ]);
+    },
+  );
+});
diff --git a/packages/plugin/src/server/acp.ts b/packages/plugin/src/server/acp.ts
new file mode 100644
index 0000000000..533453f15e
--- /dev/null
+++ b/packages/plugin/src/server/acp.ts
@@ -0,0 +1,123 @@
+import type { JsonValue } from "@getpaseo/protocol/agent-types";
+import type {
+  ProviderCatalog,
+  ProviderCommand,
+  ProviderConfigState,
+  ProviderNotice,
+  ProviderRegistration,
+  ProviderTimelineItem,
+} from "./provider.js";
+import { createAcpProviderConnection } from "./acp-internal/connection.js";
+
+interface RunAcpProviderBaseOptions {
+  id: string;
+  label: string;
+  description?: string;
+  icon?: string;
+  acpOptions?: AcpOptions;
+  transformers?: readonly AcpTransformer[];
+}
+
+export type RunAcpProviderOptions = RunAcpProviderBaseOptions &
+  (
+    | { command: readonly [string, ...string[]]; connector?: never }
+    | { connector: AcpConnector; command?: never }
+  );
+
+export type AcpStreamMessage =
+  | { jsonrpc: "2.0"; id: string | number | null; method: string; params?: unknown }
+  | { jsonrpc: "2.0"; method: string; params?: unknown }
+  | { jsonrpc: "2.0"; id: string | number | null; result: unknown }
+  | {
+      jsonrpc: "2.0";
+      id: string | number | null;
+      error: { code: number; message: string; data?: unknown };
+    };
+
+export interface AcpStream {
+  writable: WritableStream<AcpStreamMessage>;
+  readable: ReadableStream<AcpStreamMessage>;
+}
+
+export type AcpConnector = () => AcpStream | Promise<AcpStream>;
+
+export interface AcpOptions {
+  protocol?: "auto" | "v1";
+  startupTimeoutMs?: number;
+  waitForInitialCommands?: boolean;
+  initialCommandsTimeoutMs?: number;
+}
+
+export interface AcpContext {
+  sessionId: string;
+}
+
+export interface AcpConfigAccess {
+  read(): Promise<Readonly<Record<string, JsonValue>>>;
+  set(id: string, value: JsonValue): Promise<void>;
+}
+
+export interface AcpDiscoveryContext extends AcpContext {
+  config: AcpConfigAccess;
+}
+
+export interface AcpConfigureContext extends AcpContext {
+  config: AcpConfigAccess;
+}
+
+export type AcpConfigChange =
+  | { target: "model"; value: string | null }
+  | { target: "mode"; value: string | null }
+  | { target: "thinking"; value: string | null }
+  | { target: "setting"; id: string; value: JsonValue };
+
+export interface AcpToolCallSnapshot {
+  id: string;
+  name?: string;
+  title: string;
+  kind?: string;
+  status: "pending" | "in_progress" | "completed" | "failed";
+  input: JsonValue;
+  output: JsonValue;
+  locations: readonly string[];
+}
+
+export type AcpVendorUpdate =
+  | { type: "commands"; commands: readonly ProviderCommand[] }
+  | { type: "config"; config: ProviderConfigState }
+  | { type: "timeline"; item: ProviderTimelineItem }
+  | { type: "notice"; notice: ProviderNotice };
+
+export interface AcpTransformer {
+  discover?(
+    catalog: ProviderCatalog,
+    context: AcpDiscoveryContext,
+  ): Promise<ProviderCatalog> | ProviderCatalog;
+  configure?(change: AcpConfigChange, context: AcpConfigureContext): Promise<"handled" | "pass">;
+  notification?(
+    notification: { method: string; params: JsonValue },
+    context: AcpContext,
+  ): AcpVendorUpdate | readonly AcpVendorUpdate[] | null;
+  toolCall?(toolCall: AcpToolCallSnapshot, context: AcpContext): AcpToolCallSnapshot;
+}
+
+export function runAcpProvider(options: RunAcpProviderOptions): ProviderRegistration {
+  const hasCommand = options.command !== undefined;
+  const hasConnector = options.connector !== undefined;
+  if (hasCommand === hasConnector) {
+    throw new Error("ACP provider requires exactly one command or SDK connector");
+  }
+  if (options.command && (options.command.length === 0 || options.command[0].trim().length === 0)) {
+    throw new Error("ACP provider command must contain an executable");
+  }
+  return {
+    id: options.id,
+    label: options.label,
+    description: options.description,
+    icon: options.icon,
+    command: options.command,
+    connect(request) {
+      return createAcpProviderConnection(options, request);
+    },
+  };
+}
diff --git a/packages/plugin/src/server/contracts.ts b/packages/plugin/src/server/contracts.ts
new file mode 100644
index 0000000000..984b9c117b
--- /dev/null
+++ b/packages/plugin/src/server/contracts.ts
@@ -0,0 +1,45 @@
+import type { PaseoApi } from "@getpaseo/client";
+import type { ZodType, input as ZodInput, output as ZodOutput } from "zod";
+import type { PluginRpcContract } from "../rpc.js";
+import type { PluginCleanup } from "../contracts.js";
+import type { ProviderRegistration } from "./provider.js";
+import type { UsageSourceRegistration } from "./usage.js";
+import type { PluginLifecycleRegistration } from "./lifecycle.js";
+
+export interface PluginHandlerContext {
+  paseo: PaseoApi;
+}
+
+export type PluginSettingsState<Schema extends ZodType> =
+  | {
+      status: "ready";
+      revision: string;
+      values: ZodOutput<Schema>;
+    }
+  | {
+      status: "invalid";
+      revision: string;
+      error: string;
+    };
+
+export interface PluginSettings<Schema extends ZodType> {
+  read(): Promise<PluginSettingsState<Schema>>;
+  subscribe(listener: (state: PluginSettingsState<Schema>) => void | Promise<void>): PluginCleanup;
+}
+
+export interface PluginServerContext extends PluginLifecycleRegistration {
+  registerSettings<Schema extends ZodType>(
+    definition: import("../settings.js").SettingsDefinition<Schema>,
+  ): PluginSettings<Schema>;
+  handle<InputSchema extends ZodType, OutputSchema extends ZodType>(
+    contract: PluginRpcContract<InputSchema, OutputSchema>,
+    handler: (
+      input: ZodOutput<InputSchema>,
+      context: PluginHandlerContext,
+    ) => ZodInput<OutputSchema> | Promise<ZodInput<OutputSchema>>,
+  ): void;
+  registerProvider(provider: ProviderRegistration): void;
+  registerUsageSource(source: UsageSourceRegistration): void;
+}
+
+export type PluginServerContribution = (server: PluginServerContext) => PluginCleanup;
diff --git a/packages/plugin/src/server/index.ts b/packages/plugin/src/server/index.ts
new file mode 100644
index 0000000000..9180023d19
--- /dev/null
+++ b/packages/plugin/src/server/index.ts
@@ -0,0 +1,26 @@
+export type {
+  UsageSourceRegistration,
+  UsageReport,
+  UsageWindow,
+  UsageBalance,
+  UsageDetail,
+} from "./usage.js";
+export type {
+  PluginHandlerContext,
+  PluginServerContext,
+  PluginServerContribution,
+  PluginSettings,
+  PluginSettingsState,
+} from "./contracts.js";
+export type {
+  PluginHookContext,
+  PluginHookWorkspace,
+  PluginHookAgent,
+  PluginSessionOpenRequest,
+  PluginTurnOutcome,
+  PluginLifecycleEvents,
+  PluginBeforeRequests,
+  PluginLifecycleRegistration,
+} from "./lifecycle.js";
+
+export { spawnProcess, execCommand, terminateProcess } from "./process.js";
diff --git a/packages/plugin/src/server/lifecycle.ts b/packages/plugin/src/server/lifecycle.ts
new file mode 100644
index 0000000000..acebde32f1
--- /dev/null
+++ b/packages/plugin/src/server/lifecycle.ts
@@ -0,0 +1,89 @@
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  AgentTimelineItem,
+  AgentSessionConfig,
+} from "@getpaseo/protocol/agent-types";
+import type { PaseoApi } from "@getpaseo/client";
+import type { WorkspaceCreateRequest } from "@getpaseo/protocol/messages";
+
+export interface PluginHookContext {
+  paseo: PaseoApi;
+  signal: AbortSignal;
+}
+
+export interface PluginHookWorkspace {
+  id: string;
+  projectId: string;
+  cwd: string;
+  name: string | null;
+  archivedAt: string | null;
+}
+
+export interface PluginHookAgent {
+  id: string;
+  workspaceId: string | null;
+  parentAgentId: string | null;
+  provider: string;
+  cwd: string;
+  title: string | null;
+}
+
+export interface PluginSessionOpenRequest {
+  agentId: string;
+  workspaceId: string | null;
+  provider: string;
+  cwd: string;
+  reason: "create" | "resume" | "refresh" | "import";
+  purpose: "interactive" | "history";
+  env: Record<string, string>;
+}
+
+export type PluginTurnOutcome =
+  | { kind: "completed" }
+  | { kind: "failed"; error: { message: string; code?: string } }
+  | { kind: "canceled"; reason: string };
+
+export interface PluginLifecycleEvents {
+  "agent.turn_started": { agent: PluginHookAgent; turnId: string | null };
+  "agent.turn_ended": {
+    agent: PluginHookAgent;
+    turnId: string | null;
+    outcome: PluginTurnOutcome;
+    timeline: readonly AgentTimelineItem[];
+  };
+  "agent.permission_requested": { agent: PluginHookAgent; request: AgentPermissionRequest };
+  "agent.permission_resolved": {
+    agent: PluginHookAgent;
+    requestId: string;
+    resolution: AgentPermissionResponse;
+  };
+  "agent.archived": { agent: PluginHookAgent; archivedAt: string };
+  "agent.created": { agent: PluginHookAgent };
+  "agent.closed": { agent: PluginHookAgent };
+  "workspace.created": { workspace: PluginHookWorkspace };
+  "workspace.archived": { workspace: PluginHookWorkspace };
+}
+
+export interface PluginBeforeRequests {
+  "agent.create": { config: AgentSessionConfig; env?: Record<string, string> };
+  "agent.session_open": PluginSessionOpenRequest;
+  "workspace.create": Omit<WorkspaceCreateRequest, "type" | "requestId">;
+}
+
+export interface PluginLifecycleRegistration {
+  on<Name extends keyof PluginLifecycleEvents>(
+    name: Name,
+    handler: (
+      event: PluginLifecycleEvents[Name],
+      context: PluginHookContext,
+    ) => void | Promise<void>,
+  ): () => void;
+  before<Name extends keyof PluginBeforeRequests>(
+    name: Name,
+    handler: (
+      input: { request: PluginBeforeRequests[Name] },
+      context: PluginHookContext,
+    ) => PluginBeforeRequests[Name] | void | Promise<PluginBeforeRequests[Name] | void>,
+  ): () => void;
+}
diff --git a/packages/plugin/src/server/process-internal/windows-command.test.ts b/packages/plugin/src/server/process-internal/windows-command.test.ts
new file mode 100644
index 0000000000..3eb5e2e63b
--- /dev/null
+++ b/packages/plugin/src/server/process-internal/windows-command.test.ts
@@ -0,0 +1,117 @@
+import { afterEach, describe, expect, test } from "vitest";
+import { quoteWindowsArgument, quoteWindowsCommand } from "./windows-command.js";
+
+describe("quoteWindowsCommand", () => {
+  const originalPlatform = process.platform;
+
+  function setPlatform(value: string) {
+    Object.defineProperty(process, "platform", { value, writable: true });
+  }
+
+  afterEach(() => {
+    setPlatform(originalPlatform);
+  });
+
+  test("quotes a Windows path with spaces", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("C:\\Program Files\\Anthropic\\claude.exe")).toBe(
+      '"C:\\Program Files\\Anthropic\\claude.exe"',
+    );
+  });
+
+  test("does not double-quote an already-quoted path", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand('"C:\\Program Files\\Anthropic\\claude.exe"')).toBe(
+      '"C:\\Program Files\\Anthropic\\claude.exe"',
+    );
+  });
+
+  test("returns the command unchanged when there are no spaces", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("C:\\nvm4w\\nodejs\\codex")).toBe("C:\\nvm4w\\nodejs\\codex");
+  });
+
+  test("escapes ampersands", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("feature&bugfix")).toBe("feature^&bugfix");
+  });
+
+  test("escapes pipes", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("feature|bugfix")).toBe("feature^|bugfix");
+  });
+
+  test("does not double percent signs", () => {
+    setPlatform("win32");
+    // cmd.exe only collapses %% → % inside batch files; on the command line
+    // it stays literal, which corrupts git --format atoms etc.
+    expect(quoteWindowsCommand("100%")).toBe("100%");
+  });
+
+  test("preserves git --format atoms verbatim", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("--format=%(refname)%09%(committerdate:unix)")).toBe(
+      "--format=%^(refname^)%09%^(committerdate:unix^)",
+    );
+  });
+
+  test("escapes carets", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("feature^bugfix")).toBe("feature^^bugfix");
+  });
+
+  test("escapes multiple metacharacters", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("build&(test|deploy)!<output>")).toBe(
+      "build^&^(test^|deploy^)^!^<output^>",
+    );
+  });
+
+  test("quotes commands with spaces after escaping metacharacters", () => {
+    setPlatform("win32");
+    expect(quoteWindowsCommand("C:\\Program Files\\My Tool&Stuff\\run 100%.cmd")).toBe(
+      '"C:\\Program Files\\My Tool^&Stuff\\run 100%.cmd"',
+    );
+  });
+
+  test("returns the command unchanged on non-Windows platforms", () => {
+    setPlatform("darwin");
+    expect(quoteWindowsCommand("/usr/local/bin/claude code")).toBe("/usr/local/bin/claude code");
+  });
+});
+
+describe("quoteWindowsArgument", () => {
+  const originalPlatform = process.platform;
+
+  function setPlatform(value: string) {
+    Object.defineProperty(process, "platform", { value, writable: true });
+  }
+
+  afterEach(() => {
+    setPlatform(originalPlatform);
+  });
+
+  test("quotes a Windows argument with spaces", () => {
+    setPlatform("win32");
+    expect(quoteWindowsArgument("C:\\Program Files\\Anthropic\\cli.js")).toBe(
+      '"C:\\Program Files\\Anthropic\\cli.js"',
+    );
+  });
+
+  test("does not double-quote an already-quoted argument", () => {
+    setPlatform("win32");
+    expect(quoteWindowsArgument('"C:\\Program Files\\Anthropic\\cli.js"')).toBe(
+      '"C:\\Program Files\\Anthropic\\cli.js"',
+    );
+  });
+
+  test("returns the argument unchanged when there are no spaces", () => {
+    setPlatform("win32");
+    expect(quoteWindowsArgument("--version")).toBe("--version");
+  });
+
+  test("returns the argument unchanged on non-Windows platforms", () => {
+    setPlatform("darwin");
+    expect(quoteWindowsArgument("/usr/local/bin/claude code")).toBe("/usr/local/bin/claude code");
+  });
+});
diff --git a/packages/server/src/utils/windows-command.ts b/packages/plugin/src/server/process-internal/windows-command.ts
similarity index 100%
rename from packages/server/src/utils/windows-command.ts
rename to packages/plugin/src/server/process-internal/windows-command.ts
diff --git a/packages/plugin/src/server/process.test.ts b/packages/plugin/src/server/process.test.ts
new file mode 100644
index 0000000000..e9b3000da5
--- /dev/null
+++ b/packages/plugin/src/server/process.test.ts
@@ -0,0 +1,53 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, expect, test } from "vitest";
+import { execCommand, spawnProcess } from "./index.js";
+
+const roots: string[] = [];
+afterEach(async () => {
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+
+async function writeArgumentReader(): Promise<string> {
+  const root = await mkdtemp(path.join(os.tmpdir(), "plugin process arguments "));
+  roots.push(root);
+  const script = path.join(root, "read arguments.mjs");
+  await writeFile(script, "process.stdout.write(JSON.stringify(process.argv.slice(2)));\n");
+  return script;
+}
+
+const argumentsToPreserve = [
+  "argument with spaces",
+  "--format=%(refname)%09%(committerdate:unix)",
+  "100%",
+  "feature&bugfix",
+  "feature|bugfix",
+  "feature^bugfix",
+];
+
+// A bare extensionless command selects the Windows shell; an absolute node.exe path would
+// skip that path. The real child checks quoting through the public process capabilities.
+test("execCommand delivers shell arguments to the real child unchanged", async () => {
+  const script = await writeArgumentReader();
+  const { stdout } = await execCommand("node", [script, ...argumentsToPreserve]);
+  expect(JSON.parse(stdout)).toEqual(argumentsToPreserve);
+});
+
+test("spawnProcess delivers shell arguments to the real child unchanged", async () => {
+  const script = await writeArgumentReader();
+  const child = spawnProcess("node", [script, ...argumentsToPreserve], { stdio: "pipe" });
+  let stdout = "";
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (chunk: string) => {
+    stdout += chunk;
+  });
+  await new Promise<void>((resolve, reject) => {
+    child.once("error", reject);
+    child.once("close", (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`Argument reader exited with ${code}`));
+    });
+  });
+  expect(JSON.parse(stdout)).toEqual(argumentsToPreserve);
+});
diff --git a/packages/plugin/src/server/process.ts b/packages/plugin/src/server/process.ts
new file mode 100644
index 0000000000..b2ba70ac12
--- /dev/null
+++ b/packages/plugin/src/server/process.ts
@@ -0,0 +1,119 @@
+import {
+  execFile,
+  spawn,
+  type ChildProcess,
+  type ChildProcessWithoutNullStreams,
+  type SpawnOptions,
+} from "node:child_process";
+import { extname } from "node:path";
+import { promisify } from "node:util";
+import {
+  isWindowsCommandScript,
+  quoteWindowsArgument,
+  quoteWindowsCommand,
+} from "./process-internal/windows-command.js";
+const execFileAsync = promisify(execFile);
+export interface ExecCommandOptions {
+  env?: NodeJS.ProcessEnv;
+  cwd?: string;
+  encoding?: BufferEncoding;
+  killSignal?: NodeJS.Signals;
+  timeout?: number;
+  maxBuffer?: number;
+  shell?: boolean | string;
+  signal?: AbortSignal;
+}
+interface ExecCommandResult {
+  stdout: string;
+  stderr: string;
+}
+function hasPathSeparator(value: string): boolean {
+  return value.includes("/") || value.includes("\\");
+}
+
+function shouldUseWindowsShell(
+  command: string,
+  requestedShell?: boolean | string,
+): boolean | string {
+  if (isWindowsCommandScript(command)) {
+    return true;
+  }
+  if (requestedShell !== undefined) {
+    return requestedShell;
+  }
+  return process.platform === "win32" && !hasPathSeparator(command) && !extname(command);
+}
+
+/** Launch a CLI with Windows command-script handling and argv quoting. The caller owns env. */
+export function spawnProcess(
+  command: string,
+  args: string[],
+  options: SpawnOptions & { stdio: "pipe" },
+): ChildProcessWithoutNullStreams;
+export function spawnProcess(command: string, args: string[], options?: SpawnOptions): ChildProcess;
+export function spawnProcess(
+  command: string,
+  args: string[],
+  options?: SpawnOptions,
+): ChildProcess {
+  const spawnOptions = options ?? {};
+  const isWindows = process.platform === "win32";
+  const shell = shouldUseWindowsShell(command, spawnOptions.shell);
+
+  const shouldQuoteForShell = isWindows && shell !== false;
+  const resolvedCommand = shouldQuoteForShell ? quoteWindowsCommand(command) : command;
+  const resolvedArgs = shouldQuoteForShell ? args.map(quoteWindowsArgument) : args;
+
+  return spawn(resolvedCommand, resolvedArgs, {
+    ...spawnOptions,
+    env: options?.env,
+    shell,
+    signal: options?.signal,
+    windowsHide: true,
+  });
+}
+
+export async function execCommand(
+  command: string,
+  args: string[],
+  options?: ExecCommandOptions,
+): Promise<ExecCommandResult> {
+  const isWindows = process.platform === "win32";
+  const shell = shouldUseWindowsShell(command, options?.shell);
+  const shouldQuoteForShell = isWindows && shell !== false;
+  const resolvedCommand = shouldQuoteForShell ? quoteWindowsCommand(command) : command;
+  const resolvedArgs = shouldQuoteForShell ? args.map(quoteWindowsArgument) : args;
+
+  return execFileAsync(resolvedCommand, resolvedArgs, {
+    cwd: options?.cwd,
+    env: options?.env,
+    encoding: options?.encoding ?? "utf8",
+    signal: options?.signal,
+    killSignal: options?.killSignal,
+    timeout: options?.timeout,
+    maxBuffer: options?.maxBuffer,
+    shell,
+    windowsHide: true,
+  }) as Promise<ExecCommandResult>;
+}
+
+/** Force-stop a CLI, including descendants behind Windows command-script launchers. */
+export async function terminateProcess(
+  child: ChildProcess,
+  signal: NodeJS.Signals = "SIGKILL",
+): Promise<void> {
+  if (process.platform !== "win32") {
+    child.kill(signal);
+    return;
+  }
+  if (child.pid === undefined) return;
+  try {
+    await execCommand("taskkill.exe", ["/PID", String(child.pid), "/T", "/F"], {
+      shell: false,
+      timeout: 5000,
+    });
+  } catch (error) {
+    // The process can finish between its close check and taskkill.
+    if (!(error instanceof Error && "code" in error && error.code === 128)) throw error;
+  }
+}
diff --git a/packages/plugin/src/server/provider.ts b/packages/plugin/src/server/provider.ts
new file mode 100644
index 0000000000..33b49ab447
--- /dev/null
+++ b/packages/plugin/src/server/provider.ts
@@ -0,0 +1,1413 @@
+import type { JsonValue } from "@getpaseo/protocol/agent-types";
+import { z } from "zod";
+
+export const PROVIDER_PROTOCOL_VERSION = 1 as const;
+
+export const PROVIDER_CAPABILITIES = [
+  "prompt.message",
+  "prompt.command",
+  "prompt.image",
+  "prompt.output_schema",
+  "prompt.steer",
+  "session.archive",
+  "session.configure",
+  "session.list",
+  "session.persistence",
+  "session.revert.both",
+  "session.revert.conversation",
+  "session.revert.files",
+  "session.subsession",
+  "session.unarchive",
+  "permission",
+  "permission.tool_policy",
+  "timeline.plugin",
+] as const;
+
+export type ProviderCapability = (typeof PROVIDER_CAPABILITIES)[number];
+
+export interface ProviderRegistration {
+  /** Equal keys share discovery within this provider. Include effective configuration and execution environment. */
+  getCatalogCacheKey?(options: ProviderCatalogOptions): Promise<string | undefined>;
+  /** Default executable and arguments; the daemon resolves overrides before status/connect. */
+  command?: readonly [string, ...string[]];
+  status?(request: ProviderStatusRequest): Promise<ProviderStatus>;
+  id: string;
+  label: string;
+  description?: string;
+  /** Plugin-directory-relative path to a self-contained SVG file. */
+  icon?: string;
+  connect(request: ProviderConnectRequest): Promise<ProviderConnection>;
+}
+
+export type ProviderCatalogOptions =
+  | { scope: "global"; force?: boolean; launch?: ProviderLaunch }
+  | { scope: "workspace"; cwd: string; force?: boolean; launch?: ProviderLaunch };
+
+export const ProviderLaunchSchema = z
+  .object({
+    /** Resolved executable path. */
+    command: z.string().min(1),
+    args: z.array(z.string()),
+    /** Complete daemon-owned environment, including overrides and parent-session stripping. */
+    env: z.record(z.string(), z.string()),
+  })
+  .strip();
+
+export type ProviderLaunch = z.infer<typeof ProviderLaunchSchema>;
+
+export interface ProviderStatusRequest {
+  launch?: ProviderLaunch;
+}
+
+export const ProviderStatusSchema = z.discriminatedUnion("available", [
+  z.object({ available: z.literal(true), diagnostic: z.string().optional() }).strip(),
+  z.object({ available: z.literal(false), diagnostic: z.string().min(1) }).strip(),
+]);
+
+export type ProviderStatus = z.infer<typeof ProviderStatusSchema>;
+
+export interface ProviderConnectRequest {
+  launch?: ProviderLaunch;
+  versions: readonly number[];
+  capabilities: readonly string[];
+}
+
+export interface ProviderConnection {
+  readonly version: number;
+  readonly capabilities: readonly string[];
+  send(input: ProviderInput): Promise<void>;
+  onEvent(listener: (event: ProviderEvent) => void): () => void;
+  close(): Promise<void>;
+}
+
+export interface ProviderPersistence {
+  version: number;
+  data: JsonValue;
+}
+
+export type ProviderMcpServerConfig =
+  | {
+      type: "stdio";
+      command: string;
+      args?: string[];
+      env?: Record<string, string>;
+      alwaysLoad?: boolean;
+    }
+  | {
+      type: "http" | "sse";
+      url: string;
+      headers?: Record<string, string>;
+      alwaysLoad?: boolean;
+    };
+
+export interface ProviderToolPolicy {
+  preapproved: Array<{ kind: "mcp"; server: string; tool: string }>;
+}
+
+export interface ProviderSessionConfig {
+  cwd: string;
+  env: Readonly<Record<string, string>>;
+  systemPrompt?: string;
+  mcpServers: Readonly<Record<string, ProviderMcpServerConfig>>;
+  toolPolicy?: ProviderToolPolicy;
+  model?: string;
+  mode?: string;
+  thinkingOption?: string;
+  settings: Readonly<Record<string, JsonValue>>;
+  providerOptions?: Readonly<Record<string, unknown>>;
+  title?: string;
+  persist: boolean;
+}
+
+export interface ProviderConfigChanges {
+  model?: string | null;
+  mode?: string | null;
+  thinkingOption?: string | null;
+  settings?: Readonly<Record<string, JsonValue>>;
+}
+
+export interface ProviderPrompt {
+  clientMessageId: string;
+  delivery: "auto" | "steer";
+  input:
+    | { type: "message"; content: ProviderContent[] }
+    | { type: "command"; name: string; arguments: string };
+  outputSchema?: JsonValue;
+  clearPendingPermissions?: boolean;
+}
+
+interface ProviderForgeChangeRequestAttachment {
+  type: "forge_change_request";
+  mimeType: "application/paseo-forge-change-request";
+  forge?: string;
+  number: number;
+  title: string;
+  url: string;
+  body?: string | null;
+  projectPath?: string;
+  baseRefName?: string | null;
+  headRefName?: string | null;
+}
+
+interface ProviderForgeIssueAttachment {
+  type: "forge_issue";
+  mimeType: "application/paseo-forge-issue";
+  forge?: string;
+  number: number;
+  title: string;
+  url: string;
+  body?: string | null;
+  projectPath?: string;
+}
+
+interface ProviderGitHubPrAttachment {
+  type: "github_pr";
+  mimeType: "application/github-pr";
+  number: number;
+  title: string;
+  url: string;
+  body?: string | null;
+  baseRefName?: string | null;
+  headRefName?: string | null;
+}
+
+interface ProviderGitHubIssueAttachment {
+  type: "github_issue";
+  mimeType: "application/github-issue";
+  number: number;
+  title: string;
+  url: string;
+  body?: string | null;
+}
+
+interface ProviderTextAttachment {
+  type: "text";
+  mimeType: "text/plain";
+  contextKind?: string;
+  title?: string | null;
+  text: string;
+  externalResource?: {
+    provider: string;
+    providerLabel: string;
+    resourceType: string;
+    id: string;
+    identifier: string;
+    title: string;
+    url: string;
+  };
+}
+
+interface ProviderReviewAttachment {
+  type: "review";
+  mimeType: "application/paseo-review";
+  cwd: string;
+  mode: "uncommitted" | "base";
+  baseRef?: string | null;
+  comments: Array<{
+    filePath: string;
+    side: "old" | "new";
+    lineNumber: number;
+    body: string;
+    context: {
+      hunkHeader: string;
+      targetLine: ProviderReviewContextLine;
+      lines: ProviderReviewContextLine[];
+    };
+  }>;
+}
+
+interface ProviderReviewContextLine {
+  oldLineNumber: number | null;
+  newLineNumber: number | null;
+  type: "add" | "remove" | "context";
+  content: string;
+}
+
+export type ProviderContent =
+  | { type: "text"; text: string }
+  | { type: "image"; data: string; mimeType: string }
+  | ProviderForgeChangeRequestAttachment
+  | ProviderForgeIssueAttachment
+  | ProviderGitHubPrAttachment
+  | ProviderGitHubIssueAttachment
+  | ProviderTextAttachment
+  | ProviderReviewAttachment
+  | {
+      type: "uploaded_file";
+      id: string;
+      fileName: string;
+      mimeType: string;
+      size: number;
+      path: string;
+    };
+
+export type ProviderInput =
+  | { type: "catalog"; requestId: string; cwd?: string }
+  | { type: "sessions"; requestId: string; query?: string; cwd?: string; limit?: number }
+  | {
+      type: "session.open";
+      requestId: string;
+      sessionId: string;
+      config: ProviderSessionConfig;
+      persistence?: ProviderPersistence;
+      history: "replay" | "skip";
+    }
+  | { type: "session.prompt"; sessionId: string; prompt: ProviderPrompt }
+  | { type: "session.interrupt"; requestId: string; sessionId: string }
+  | {
+      type: "session.permission";
+      sessionId: string;
+      permissionId: string;
+      response: ProviderPermissionResponse;
+    }
+  | {
+      type: "session.configure";
+      requestId: string;
+      sessionId: string;
+      changes: ProviderConfigChanges;
+    }
+  | {
+      type: "session.revert";
+      requestId: string;
+      sessionId: string;
+      token: JsonValue;
+      scope: "conversation" | "files" | "both";
+    }
+  | { type: "session.archive"; requestId: string; persistence: ProviderPersistence }
+  | { type: "session.unarchive"; requestId: string; persistence: ProviderPersistence }
+  | { type: "session.close"; requestId: string; sessionId: string };
+
+export interface ProviderThinkingOption {
+  id: string;
+  label: string;
+  description?: string;
+  isDefault?: boolean;
+  metadata?: Readonly<Record<string, JsonValue>>;
+}
+
+export interface ProviderModel {
+  id: string;
+  aliases?: string[];
+  isSelectable?: boolean;
+  label: string;
+  description?: string;
+  isDefault?: boolean;
+  metadata?: Readonly<Record<string, JsonValue>>;
+  contextWindowMaxTokens?: number;
+  thinkingOptions?: ProviderThinkingOption[];
+  defaultThinkingOptionId?: string;
+}
+
+export interface ProviderMode {
+  id: string;
+  label: string;
+  description?: string;
+  icon?: string;
+  colorTier?: string;
+  isUnattended?: boolean;
+}
+
+export type ProviderSetting =
+  | {
+      type: "toggle";
+      id: string;
+      label: string;
+      description?: string;
+      value: boolean;
+    }
+  | {
+      type: "select";
+      id: string;
+      label: string;
+      description?: string;
+      value: string | null;
+      options: ReadonlyArray<{ label: string; value: string }>;
+    };
+
+export interface ProviderConfigState {
+  model?: string;
+  mode?: string;
+  thinkingOption?: string;
+  models: readonly ProviderModel[];
+  modes: readonly ProviderMode[];
+  thinkingOptions: readonly ProviderThinkingOption[];
+  settings: readonly ProviderSetting[];
+}
+
+export interface ProviderCatalog {
+  models: readonly ProviderModel[];
+  modes: readonly ProviderMode[];
+  thinkingOptions?: readonly ProviderThinkingOption[];
+  defaultModel?: string;
+  defaultMode?: string;
+  defaultThinkingOption?: string;
+}
+
+export interface ProviderSessionSummary {
+  persistence: ProviderPersistence;
+  cwd: string;
+  title?: string;
+  description?: string;
+  updatedAt?: string;
+}
+
+export interface ProviderCommand {
+  name: string;
+  description: string;
+  argumentHint?: string;
+}
+
+export interface ProviderError {
+  message: string;
+  code?: string;
+  diagnostic?: string;
+}
+
+export interface ProviderNotice {
+  id: string;
+  severity: "info" | "warning" | "error";
+  title: string;
+  description?: string;
+  dismissed?: boolean;
+}
+
+export interface ProviderPermissionAction {
+  id: string;
+  label: string;
+  behavior: "allow" | "deny";
+  variant?: "primary" | "secondary" | "danger";
+  intent?: "implement" | "implement_resume" | "dismiss";
+}
+
+export interface ProviderPermissionRequest {
+  id: string;
+  name: string;
+  kind: "tool" | "plan" | "question" | "mode" | "other";
+  title?: string;
+  description?: string;
+  input?: Readonly<Record<string, JsonValue>>;
+  detail?: ProviderToolCallDetail;
+  suggestions?: Array<Record<string, JsonValue>>;
+  actions?: ProviderPermissionAction[];
+  metadata?: Readonly<Record<string, JsonValue>>;
+}
+
+export type ProviderPermissionResponse =
+  | {
+      behavior: "allow";
+      selectedActionId?: string;
+      updatedInput?: Record<string, JsonValue>;
+      updatedPermissions?: Array<Record<string, JsonValue>>;
+    }
+  | {
+      behavior: "deny";
+      selectedActionId?: string;
+      message?: string;
+      interrupt?: boolean;
+    };
+
+export interface ProviderUsage {
+  inputTokens?: number;
+  cachedInputTokens?: number;
+  outputTokens?: number;
+  totalCostUsd?: number;
+  contextWindowMaxTokens?: number;
+  contextWindowUsedTokens?: number;
+}
+
+interface ProviderTimelineIdentity {
+  id: string;
+  revertToken?: JsonValue;
+}
+
+export type ProviderToolCallDetail =
+  | { type: "shell"; command: string; cwd?: string; output?: string; exitCode?: number | null }
+  | { type: "read"; filePath: string; content?: string; offset?: number; limit?: number }
+  | {
+      type: "edit";
+      filePath: string;
+      oldString?: string;
+      newString?: string;
+      unifiedDiff?: string;
+    }
+  | { type: "write"; filePath: string; content?: string }
+  | {
+      type: "search";
+      query: string;
+      toolName?: "search" | "grep" | "glob" | "web_search";
+      content?: string;
+      filePaths?: string[];
+      webResults?: Array<{ title: string; url: string }>;
+      annotations?: string[];
+      numFiles?: number;
+      numMatches?: number;
+      durationMs?: number;
+      durationSeconds?: number;
+      truncated?: boolean;
+      mode?: "content" | "files_with_matches" | "count";
+    }
+  | {
+      type: "fetch";
+      url: string;
+      prompt?: string;
+      result?: string;
+      code?: number;
+      codeText?: string;
+      bytes?: number;
+      durationMs?: number;
+    }
+  | {
+      type: "worktree_setup";
+      worktreePath: string;
+      branchName: string;
+      log: string;
+      commands: Array<{
+        index: number;
+        command: string;
+        cwd: string;
+        log: string;
+        status: "running" | "completed" | "failed";
+        exitCode: number | null;
+        durationMs?: number;
+      }>;
+      truncated?: boolean;
+    }
+  | {
+      type: "sub_agent";
+      subAgentType?: string;
+      description?: string;
+      childSessionId?: string;
+      log: string;
+      actions?: Array<{ index: number; toolName: string; summary?: string }>;
+    }
+  | {
+      type: "plain_text";
+      label?: string;
+      text?: string;
+      icon?:
+        | "wrench"
+        | "square_terminal"
+        | "eye"
+        | "pencil"
+        | "search"
+        | "bot"
+        | "sparkles"
+        | "brain"
+        | "mic_vocal";
+    }
+  | { type: "plan"; text: string }
+  | { type: "unknown"; input: JsonValue; output: JsonValue };
+
+type ProviderToolCallItem = ProviderTimelineIdentity & {
+  type: "tool_call";
+  callId: string;
+  name: string;
+  detail: ProviderToolCallDetail;
+  metadata?: Readonly<Record<string, JsonValue>>;
+} & (
+    | { status: "running" | "completed" | "canceled"; error: null }
+    | { status: "failed"; error: JsonValue }
+  );
+
+export type ProviderTimelineItem =
+  | (ProviderTimelineIdentity & {
+      type: "user_message";
+      text: string;
+      messageId?: string;
+      clientMessageId?: string;
+    })
+  | (ProviderTimelineIdentity & { type: "assistant_message"; text: string; messageId?: string })
+  | (ProviderTimelineIdentity & { type: "reasoning"; text: string })
+  | ProviderToolCallItem
+  | (ProviderTimelineIdentity & {
+      type: "todo";
+      items: Array<{
+        text: string;
+        completed: boolean;
+        id?: string;
+        status?: "pending" | "in_progress" | "completed";
+        activeForm?: string;
+      }>;
+    })
+  | (ProviderTimelineIdentity & { type: "error"; message: string })
+  | (ProviderTimelineIdentity & {
+      type: "notification";
+      level: "info" | "warning" | "error";
+      message: string;
+    })
+  | (ProviderTimelineIdentity & {
+      type: "compaction";
+      status: "loading" | "completed";
+      trigger?: "auto" | "manual";
+      preTokens?: number;
+    })
+  | (ProviderTimelineIdentity & {
+      type: "plugin";
+      pluginId: string;
+      kind: string;
+      version: number;
+      data: JsonValue;
+    });
+
+export type ProviderEvent =
+  | { type: "catalog"; requestId: string; catalog: ProviderCatalog }
+  | { type: "sessions"; requestId: string; sessions: ProviderSessionSummary[] }
+  | { type: "request.completed"; requestId: string }
+  | { type: "request.failed"; requestId: string; error: ProviderError }
+  | {
+      type: "session.opened";
+      requestId?: string;
+      sessionId: string;
+      /** Direct parent in the provider session ID namespace. */
+      parentSessionId?: string;
+      /** ID of the spawning tool call in the direct parent's timeline. */
+      toolCallId?: string;
+      capabilities: readonly string[];
+      restoration: "core" | "parent";
+      persistence?: ProviderPersistence;
+      title?: string;
+      description?: string;
+      cwd: string;
+    }
+  | { type: "session.ready"; requestId?: string; sessionId: string }
+  | { type: "session.closed"; sessionId: string; error?: ProviderError }
+  | { type: "session.runtime_failed"; sessionId: string; error: ProviderError }
+  | { type: "session.persistence"; sessionId: string; persistence: ProviderPersistence }
+  | {
+      type: "session.prompt_result";
+      sessionId: string;
+      clientMessageId: string;
+      result:
+        | { type: "turn"; turnId: string }
+        | { type: "steer"; turnId: string }
+        | { type: "completed" }
+        | { type: "failed"; error: ProviderError };
+    }
+  | {
+      type: "session.turn";
+      sessionId: string;
+      turnId: string;
+      state: "started" | "completed" | "failed" | "canceled";
+      error?: ProviderError;
+    }
+  | { type: "session.usage"; sessionId: string; turnId?: string; usage: ProviderUsage }
+  | { type: "session.config"; sessionId: string; config: ProviderConfigState }
+  | { type: "session.commands"; sessionId: string; commands: ProviderCommand[] }
+  | { type: "session.permission"; sessionId: string; request: ProviderPermissionRequest }
+  | { type: "session.permission_resolved"; sessionId: string; permissionId: string }
+  | { type: "session.notice"; sessionId: string; notice: ProviderNotice }
+  | { type: "timeline.item"; sessionId: string; item: ProviderTimelineItem; timestamp?: string };
+
+export function negotiateProviderCapabilities(
+  offered: readonly string[],
+  supported: readonly string[],
+): readonly ProviderCapability[] {
+  const known = new Set<string>(PROVIDER_CAPABILITIES);
+  const supportedCapabilities = new Set(supported.filter((capability) => known.has(capability)));
+  return offered.filter(
+    (capability, index): capability is ProviderCapability =>
+      isProviderCapability(capability) &&
+      supportedCapabilities.has(capability) &&
+      offered.indexOf(capability) === index,
+  );
+}
+
+export function isProviderCapability(capability: string): capability is ProviderCapability {
+  return new Set<string>(PROVIDER_CAPABILITIES).has(capability);
+}
+
+function requiredPromptCapabilities(prompt: ProviderPrompt): readonly ProviderCapability[] {
+  const capabilities: ProviderCapability[] = [];
+  if (prompt.delivery === "steer") capabilities.push("prompt.steer");
+  if (prompt.input.type === "command") capabilities.push("prompt.command");
+  else {
+    capabilities.push("prompt.message");
+    if (prompt.input.content.some((part) => part.type === "image")) {
+      capabilities.push("prompt.image");
+    }
+  }
+  if (prompt.outputSchema !== undefined) capabilities.push("prompt.output_schema");
+  return capabilities;
+}
+
+export function requiredProviderCapabilities(input: ProviderInput): readonly ProviderCapability[] {
+  switch (input.type) {
+    case "catalog":
+    case "session.interrupt":
+    case "session.close":
+      return [];
+    case "sessions":
+      return ["session.list"];
+    case "session.open": {
+      const capabilities: ProviderCapability[] = [];
+      if (input.persistence) capabilities.push("session.persistence");
+      if (input.config.toolPolicy) capabilities.push("permission.tool_policy");
+      return capabilities;
+    }
+    case "session.prompt":
+      return requiredPromptCapabilities(input.prompt);
+    case "session.permission":
+      return ["permission"];
+    case "session.configure":
+      return ["session.configure"];
+    case "session.revert":
+      return [`session.revert.${input.scope}`];
+    case "session.archive":
+      return ["session.archive"];
+    case "session.unarchive":
+      return ["session.unarchive"];
+  }
+}
+
+export function requireProviderCapabilities(
+  capabilities: readonly string[],
+  input: ProviderInput,
+): void {
+  for (const capability of requiredProviderCapabilities(input)) {
+    if (!capabilities.includes(capability)) {
+      throw new Error(`Provider does not support ${capability}`);
+    }
+  }
+}
+
+const idSchema = z.string().min(1);
+const jsonObjectSchema = z.record(z.string(), z.json());
+const providerErrorSchema = z
+  .object({ message: z.string(), code: z.string().optional(), diagnostic: z.string().optional() })
+  .strip();
+const persistenceSchema = z
+  .object({ version: z.number().int().nonnegative(), data: z.json() })
+  .strip();
+const mcpServerSchema = z.discriminatedUnion("type", [
+  z
+    .object({
+      type: z.literal("stdio"),
+      command: z.string(),
+      args: z.array(z.string()).optional(),
+      env: z.record(z.string(), z.string()).optional(),
+      alwaysLoad: z.boolean().optional(),
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("http"),
+      url: z.string(),
+      headers: z.record(z.string(), z.string()).optional(),
+      alwaysLoad: z.boolean().optional(),
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("sse"),
+      url: z.string(),
+      headers: z.record(z.string(), z.string()).optional(),
+      alwaysLoad: z.boolean().optional(),
+    })
+    .strict(),
+]);
+const toolPolicySchema = z
+  .object({
+    preapproved: z.array(
+      z.object({ kind: z.literal("mcp"), server: idSchema, tool: idSchema }).strict(),
+    ),
+  })
+  .strict();
+const providerPermissionResponseSchema: z.ZodType<ProviderPermissionResponse> =
+  z.discriminatedUnion("behavior", [
+    z
+      .object({
+        behavior: z.literal("allow"),
+        selectedActionId: z.string().optional(),
+        updatedInput: jsonObjectSchema.optional(),
+        updatedPermissions: z.array(jsonObjectSchema).optional(),
+      })
+      .strip(),
+    z
+      .object({
+        behavior: z.literal("deny"),
+        selectedActionId: z.string().optional(),
+        message: z.string().optional(),
+        interrupt: z.boolean().optional(),
+      })
+      .strip(),
+  ]);
+const sessionConfigSchema = z
+  .object({
+    cwd: z.string(),
+    env: z.record(z.string(), z.string()),
+    systemPrompt: z.string().optional(),
+    mcpServers: z.record(z.string(), mcpServerSchema),
+    toolPolicy: toolPolicySchema.optional(),
+    model: z.string().optional(),
+    mode: z.string().optional(),
+    thinkingOption: z.string().optional(),
+    settings: jsonObjectSchema,
+    providerOptions: z.record(z.string(), z.unknown()).optional(),
+    title: z.string().optional(),
+    persist: z.boolean(),
+  })
+  .strict();
+const externalResourceSchema = z
+  .object({
+    provider: z.string(),
+    providerLabel: z.string(),
+    resourceType: z.string(),
+    id: z.string(),
+    identifier: z.string(),
+    title: z.string(),
+    url: z.string(),
+  })
+  .strip();
+const reviewContextLineSchema = z
+  .object({
+    oldLineNumber: z.number().int().positive().nullable(),
+    newLineNumber: z.number().int().positive().nullable(),
+    type: z.enum(["add", "remove", "context"]),
+    content: z.string(),
+  })
+  .strip();
+const providerContentSchema: z.ZodType<ProviderContent> = z.union([
+  z.object({ type: z.literal("text"), text: z.string() }).strict(),
+  z.object({ type: z.literal("image"), data: z.string(), mimeType: z.string() }).strict(),
+  z
+    .object({
+      type: z.literal("forge_change_request"),
+      mimeType: z.literal("application/paseo-forge-change-request"),
+      forge: z.string().optional(),
+      number: z.number().int().positive(),
+      title: z.string(),
+      url: z.string(),
+      body: z.string().nullable().optional(),
+      projectPath: z.string().optional(),
+      baseRefName: z.string().nullable().optional(),
+      headRefName: z.string().nullable().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("forge_issue"),
+      mimeType: z.literal("application/paseo-forge-issue"),
+      forge: z.string().optional(),
+      number: z.number().int().positive(),
+      title: z.string(),
+      url: z.string(),
+      body: z.string().nullable().optional(),
+      projectPath: z.string().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("github_pr"),
+      mimeType: z.literal("application/github-pr"),
+      number: z.number().int().positive(),
+      title: z.string(),
+      url: z.string(),
+      body: z.string().nullable().optional(),
+      baseRefName: z.string().nullable().optional(),
+      headRefName: z.string().nullable().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("github_issue"),
+      mimeType: z.literal("application/github-issue"),
+      number: z.number().int().positive(),
+      title: z.string(),
+      url: z.string(),
+      body: z.string().nullable().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("text"),
+      mimeType: z.literal("text/plain"),
+      contextKind: z.string().optional(),
+      title: z.string().nullable().optional(),
+      text: z.string(),
+      externalResource: externalResourceSchema.optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("review"),
+      mimeType: z.literal("application/paseo-review"),
+      cwd: z.string(),
+      mode: z.enum(["uncommitted", "base"]),
+      baseRef: z.string().nullable().optional(),
+      comments: z.array(
+        z
+          .object({
+            filePath: z.string(),
+            side: z.enum(["old", "new"]),
+            lineNumber: z.number().int().positive(),
+            body: z.string(),
+            context: z
+              .object({
+                hunkHeader: z.string(),
+                targetLine: reviewContextLineSchema,
+                lines: z.array(reviewContextLineSchema),
+              })
+              .strip(),
+          })
+          .strip(),
+      ),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("uploaded_file"),
+      id: z.string(),
+      fileName: z.string(),
+      mimeType: z.string(),
+      size: z.number().int().nonnegative(),
+      path: z.string(),
+    })
+    .strip(),
+]);
+const promptSchema = z
+  .object({
+    clientMessageId: idSchema,
+    delivery: z.enum(["auto", "steer"]),
+    input: z.union([
+      z.object({ type: z.literal("message"), content: z.array(providerContentSchema) }).strict(),
+      z.object({ type: z.literal("command"), name: idSchema, arguments: z.string() }).strict(),
+    ]),
+    outputSchema: z.json().optional(),
+    clearPendingPermissions: z.boolean().optional(),
+  })
+  .strict();
+const configChangesSchema = z
+  .object({
+    model: z.string().nullable().optional(),
+    mode: z.string().nullable().optional(),
+    thinkingOption: z.string().nullable().optional(),
+    settings: jsonObjectSchema.optional(),
+  })
+  .strict();
+
+export const ProviderInputSchema: z.ZodType<ProviderInput> = z.discriminatedUnion("type", [
+  z
+    .object({ type: z.literal("catalog"), requestId: idSchema, cwd: z.string().optional() })
+    .strict(),
+  z
+    .object({
+      type: z.literal("sessions"),
+      requestId: idSchema,
+      query: z.string().optional(),
+      cwd: z.string().optional(),
+      limit: z.number().int().positive().optional(),
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.open"),
+      requestId: idSchema,
+      sessionId: idSchema,
+      config: sessionConfigSchema,
+      persistence: persistenceSchema.optional(),
+      history: z.enum(["replay", "skip"]),
+    })
+    .strict(),
+  z
+    .object({ type: z.literal("session.prompt"), sessionId: idSchema, prompt: promptSchema })
+    .strict(),
+  z
+    .object({ type: z.literal("session.interrupt"), requestId: idSchema, sessionId: idSchema })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.permission"),
+      sessionId: idSchema,
+      permissionId: idSchema,
+      response: providerPermissionResponseSchema,
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.configure"),
+      requestId: idSchema,
+      sessionId: idSchema,
+      changes: configChangesSchema,
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.revert"),
+      requestId: idSchema,
+      sessionId: idSchema,
+      token: z.json(),
+      scope: z.enum(["conversation", "files", "both"]),
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.archive"),
+      requestId: idSchema,
+      persistence: persistenceSchema,
+    })
+    .strict(),
+  z
+    .object({
+      type: z.literal("session.unarchive"),
+      requestId: idSchema,
+      persistence: persistenceSchema,
+    })
+    .strict(),
+  z.object({ type: z.literal("session.close"), requestId: idSchema, sessionId: idSchema }).strict(),
+]);
+
+const modeSchema = z
+  .object({
+    id: idSchema,
+    label: z.string(),
+    description: z.string().optional(),
+    icon: z.string().optional(),
+    colorTier: z.string().optional(),
+    isUnattended: z.boolean().optional(),
+  })
+  .strip();
+const selectOptionSchema = z
+  .object({
+    id: idSchema,
+    label: z.string(),
+    description: z.string().optional(),
+    isDefault: z.boolean().optional(),
+    metadata: jsonObjectSchema.optional(),
+  })
+  .strip();
+const modelSchema = z
+  .object({
+    id: idSchema,
+    aliases: z.array(z.string()).optional(),
+    isSelectable: z.boolean().optional(),
+    label: z.string(),
+    description: z.string().optional(),
+    isDefault: z.boolean().optional(),
+    metadata: jsonObjectSchema.optional(),
+    contextWindowMaxTokens: z.number().optional(),
+    thinkingOptions: z.array(selectOptionSchema).optional(),
+    defaultThinkingOptionId: z.string().optional(),
+  })
+  .strip();
+const settingSchema = z.discriminatedUnion("type", [
+  z
+    .object({
+      type: z.literal("toggle"),
+      id: idSchema,
+      label: z.string(),
+      description: z.string().optional(),
+      value: z.boolean(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("select"),
+      id: idSchema,
+      label: z.string(),
+      description: z.string().optional(),
+      value: z.string().nullable(),
+      options: z.array(z.object({ label: z.string(), value: z.string() }).strip()),
+    })
+    .strip(),
+]);
+const configStateSchema = z
+  .object({
+    model: z.string().optional(),
+    mode: z.string().optional(),
+    thinkingOption: z.string().optional(),
+    models: z.array(modelSchema),
+    modes: z.array(modeSchema),
+    thinkingOptions: z.array(selectOptionSchema),
+    settings: z.array(settingSchema),
+  })
+  .strip();
+const catalogSchema = z
+  .object({
+    models: z.array(modelSchema),
+    modes: z.array(modeSchema),
+    thinkingOptions: z.array(selectOptionSchema).optional(),
+    defaultModel: z.string().optional(),
+    defaultMode: z.string().optional(),
+    defaultThinkingOption: z.string().optional(),
+  })
+  .strip();
+const noticeSchema = z
+  .object({
+    id: idSchema,
+    severity: z.enum(["info", "warning", "error"]),
+    title: z.string(),
+    description: z.string().optional(),
+    dismissed: z.boolean().optional(),
+  })
+  .strip();
+const commandSchema = z
+  .object({ name: idSchema, description: z.string(), argumentHint: z.string().optional() })
+  .strip();
+const usageSchema = z
+  .object({
+    inputTokens: z.number().optional(),
+    cachedInputTokens: z.number().optional(),
+    outputTokens: z.number().optional(),
+    totalCostUsd: z.number().optional(),
+    contextWindowMaxTokens: z.number().optional(),
+    contextWindowUsedTokens: z.number().optional(),
+  })
+  .strip();
+const worktreeCommandSchema = z
+  .object({
+    index: z.number().int().positive(),
+    command: z.string(),
+    cwd: z.string(),
+    log: z.string(),
+    status: z.enum(["running", "completed", "failed"]),
+    exitCode: z.number().nullable(),
+    durationMs: z.number().nonnegative().optional(),
+  })
+  .strip();
+const toolCallDetailSchema: z.ZodType<ProviderToolCallDetail> = z.discriminatedUnion("type", [
+  z
+    .object({
+      type: z.literal("shell"),
+      command: z.string(),
+      cwd: z.string().optional(),
+      output: z.string().optional(),
+      exitCode: z.number().nullable().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("read"),
+      filePath: z.string(),
+      content: z.string().optional(),
+      offset: z.number().optional(),
+      limit: z.number().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("edit"),
+      filePath: z.string(),
+      oldString: z.string().optional(),
+      newString: z.string().optional(),
+      unifiedDiff: z.string().optional(),
+    })
+    .strip(),
+  z
+    .object({ type: z.literal("write"), filePath: z.string(), content: z.string().optional() })
+    .strip(),
+  z
+    .object({
+      type: z.literal("search"),
+      query: z.string(),
+      toolName: z.enum(["search", "grep", "glob", "web_search"]).optional(),
+      content: z.string().optional(),
+      filePaths: z.array(z.string()).optional(),
+      webResults: z.array(z.object({ title: z.string(), url: z.string() }).strip()).optional(),
+      annotations: z.array(z.string()).optional(),
+      numFiles: z.number().optional(),
+      numMatches: z.number().optional(),
+      durationMs: z.number().optional(),
+      durationSeconds: z.number().optional(),
+      truncated: z.boolean().optional(),
+      mode: z.enum(["content", "files_with_matches", "count"]).optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("fetch"),
+      url: z.string(),
+      prompt: z.string().optional(),
+      result: z.string().optional(),
+      code: z.number().optional(),
+      codeText: z.string().optional(),
+      bytes: z.number().optional(),
+      durationMs: z.number().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("worktree_setup"),
+      worktreePath: z.string(),
+      branchName: z.string(),
+      log: z.string(),
+      commands: z.array(worktreeCommandSchema),
+      truncated: z.boolean().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("sub_agent"),
+      subAgentType: z.string().optional(),
+      description: z.string().optional(),
+      childSessionId: z.string().optional(),
+      log: z.string(),
+      actions: z
+        .array(
+          z
+            .object({
+              index: z.number().int().positive(),
+              toolName: z.string(),
+              summary: z.string().optional(),
+            })
+            .strip(),
+        )
+        .optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("plain_text"),
+      label: z.string().optional(),
+      text: z.string().optional(),
+      icon: z
+        .enum([
+          "wrench",
+          "square_terminal",
+          "eye",
+          "pencil",
+          "search",
+          "bot",
+          "sparkles",
+          "brain",
+          "mic_vocal",
+        ])
+        .optional(),
+    })
+    .strip(),
+  z.object({ type: z.literal("plan"), text: z.string() }).strip(),
+  z.object({ type: z.literal("unknown"), input: z.json(), output: z.json() }).strip(),
+]);
+const timelineIdentityShape = { id: idSchema, revertToken: z.json().optional() };
+const toolCallBaseShape = {
+  ...timelineIdentityShape,
+  type: z.literal("tool_call"),
+  callId: idSchema,
+  name: z.string(),
+  detail: toolCallDetailSchema,
+  metadata: jsonObjectSchema.optional(),
+};
+const timelineItemSchema: z.ZodType<ProviderTimelineItem> = z.union([
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("user_message"),
+      text: z.string(),
+      messageId: z.string().optional(),
+      clientMessageId: z.string().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("assistant_message"),
+      text: z.string(),
+      messageId: z.string().optional(),
+    })
+    .strip(),
+  z.object({ ...timelineIdentityShape, type: z.literal("reasoning"), text: z.string() }).strip(),
+  z.object({ ...toolCallBaseShape, status: z.literal("running"), error: z.null() }).strip(),
+  z.object({ ...toolCallBaseShape, status: z.literal("completed"), error: z.null() }).strip(),
+  z.object({ ...toolCallBaseShape, status: z.literal("failed"), error: z.json() }).strip(),
+  z.object({ ...toolCallBaseShape, status: z.literal("canceled"), error: z.null() }).strip(),
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("todo"),
+      items: z.array(
+        z
+          .object({
+            text: z.string(),
+            completed: z.boolean(),
+            id: z.string().optional(),
+            status: z.enum(["pending", "in_progress", "completed"]).optional(),
+            activeForm: z.string().optional(),
+          })
+          .strip(),
+      ),
+    })
+    .strip(),
+  z.object({ ...timelineIdentityShape, type: z.literal("error"), message: z.string() }).strip(),
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("notification"),
+      level: z.enum(["info", "warning", "error"]),
+      message: z.string(),
+    })
+    .strip(),
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("compaction"),
+      status: z.enum(["loading", "completed"]),
+      trigger: z.enum(["auto", "manual"]).optional(),
+      preTokens: z.number().optional(),
+    })
+    .strip(),
+  z
+    .object({
+      ...timelineIdentityShape,
+      type: z.literal("plugin"),
+      pluginId: idSchema,
+      kind: z.string(),
+      version: z.number(),
+      data: z.json(),
+    })
+    .strip(),
+]);
+const permissionActionSchema = z
+  .object({
+    id: idSchema,
+    label: z.string(),
+    behavior: z.enum(["allow", "deny"]),
+    variant: z.enum(["primary", "secondary", "danger"]).optional(),
+    intent: z.enum(["implement", "implement_resume", "dismiss"]).optional(),
+  })
+  .strip();
+const providerPermissionRequestSchema: z.ZodType<ProviderPermissionRequest> = z
+  .object({
+    id: idSchema,
+    name: z.string(),
+    kind: z.enum(["tool", "plan", "question", "mode", "other"]),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    input: jsonObjectSchema.optional(),
+    detail: toolCallDetailSchema.optional(),
+    suggestions: z.array(jsonObjectSchema).optional(),
+    actions: z.array(permissionActionSchema).optional(),
+    metadata: jsonObjectSchema.optional(),
+  })
+  .strip();
+
+export const ProviderEventSchema: z.ZodType<ProviderEvent> = z.discriminatedUnion("type", [
+  z.object({ type: z.literal("catalog"), requestId: idSchema, catalog: catalogSchema }).strip(),
+  z
+    .object({
+      type: z.literal("sessions"),
+      requestId: idSchema,
+      sessions: z.array(
+        z
+          .object({
+            persistence: persistenceSchema,
+            cwd: z.string(),
+            title: z.string().optional(),
+            description: z.string().optional(),
+            updatedAt: z.string().optional(),
+          })
+          .strip(),
+      ),
+    })
+    .strip(),
+  z.object({ type: z.literal("request.completed"), requestId: idSchema }).strip(),
+  z
+    .object({ type: z.literal("request.failed"), requestId: idSchema, error: providerErrorSchema })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.opened"),
+      requestId: idSchema.optional(),
+      sessionId: idSchema,
+      parentSessionId: idSchema.optional(),
+      toolCallId: idSchema.optional(),
+      capabilities: z.array(z.string()),
+      restoration: z.enum(["core", "parent"]),
+      persistence: persistenceSchema.optional(),
+      title: z.string().optional(),
+      description: z.string().optional(),
+      cwd: z.string(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.ready"),
+      requestId: idSchema.optional(),
+      sessionId: idSchema,
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.closed"),
+      sessionId: idSchema,
+      error: providerErrorSchema.optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.runtime_failed"),
+      sessionId: idSchema,
+      error: providerErrorSchema,
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.persistence"),
+      sessionId: idSchema,
+      persistence: persistenceSchema,
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.prompt_result"),
+      sessionId: idSchema,
+      clientMessageId: idSchema,
+      result: z.union([
+        z.object({ type: z.literal("turn"), turnId: idSchema }).strip(),
+        z.object({ type: z.literal("steer"), turnId: idSchema }).strip(),
+        z.object({ type: z.literal("completed") }).strip(),
+        z.object({ type: z.literal("failed"), error: providerErrorSchema }).strip(),
+      ]),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.turn"),
+      sessionId: idSchema,
+      turnId: idSchema,
+      state: z.enum(["started", "completed", "failed", "canceled"]),
+      error: providerErrorSchema.optional(),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.usage"),
+      sessionId: idSchema,
+      turnId: idSchema.optional(),
+      usage: usageSchema,
+    })
+    .strip(),
+  z
+    .object({ type: z.literal("session.config"), sessionId: idSchema, config: configStateSchema })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.commands"),
+      sessionId: idSchema,
+      commands: z.array(commandSchema),
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.permission"),
+      sessionId: idSchema,
+      request: providerPermissionRequestSchema,
+    })
+    .strip(),
+  z
+    .object({
+      type: z.literal("session.permission_resolved"),
+      sessionId: idSchema,
+      permissionId: idSchema,
+    })
+    .strip(),
+  z
+    .object({ type: z.literal("session.notice"), sessionId: idSchema, notice: noticeSchema })
+    .strip(),
+  z
+    .object({
+      type: z.literal("timeline.item"),
+      sessionId: idSchema,
+      item: timelineItemSchema,
+      timestamp: z.string().optional(),
+    })
+    .strip(),
+]);
diff --git a/packages/plugin/src/server/usage.test.ts b/packages/plugin/src/server/usage.test.ts
new file mode 100644
index 0000000000..b70e8d6d01
--- /dev/null
+++ b/packages/plugin/src/server/usage.test.ts
@@ -0,0 +1,107 @@
+import { describe, expect, it, test } from "vitest";
+import {
+  balanceToneFromRemaining,
+  toneFromUsedPct,
+  usedPctOf,
+  windowFromUsedPct,
+  windowFromReportedDuration,
+} from "./usage.js";
+
+test("shared usage tones preserve the app threshold contract", () => {
+  expect([null, 69.9, 70, 90, 90.1].map(toneFromUsedPct)).toEqual([
+    "default",
+    "ok",
+    "warning",
+    "warning",
+    "danger",
+  ]);
+  expect([null, 0, 0.01].map(balanceToneFromRemaining)).toEqual(["default", "danger", "ok"]);
+});
+
+test("shared windows retain percentage and reset time", () => {
+  expect(windowFromUsedPct({ id: "a", label: "A", utilizationPct: 30 })).toEqual({
+    id: "a",
+    label: "A",
+    usedPct: 30,
+    remainingPct: 70,
+    resetsAt: null,
+  });
+  expect(windowFromUsedPct({ id: "b", label: "B", utilizationPct: null })).toEqual({
+    id: "b",
+    label: "B",
+    usedPct: null,
+    remainingPct: null,
+    resetsAt: null,
+  });
+  expect(usedPctOf(25, 100)).toBe(25);
+  expect(usedPctOf(25, 0)).toBeNull();
+});
+
+describe("toneFromUsedPct", () => {
+  // Thresholds must match deriveTone in the app's provider-usage/tone.ts, which is what
+  // the client applies when a window arrives without a tone.
+  it.each([
+    [0, "ok"],
+    [69.9, "ok"],
+    [70, "warning"],
+    [90, "warning"],
+    [90.1, "danger"],
+    [100, "danger"],
+    [150, "danger"],
+  ])("%s%% used is %s", (usedPct, expected) => {
+    expect(toneFromUsedPct(usedPct)).toBe(expected);
+  });
+
+  it("is neutral when the percentage is unknown", () => {
+    expect(toneFromUsedPct(null)).toBe("default");
+    expect(toneFromUsedPct(undefined)).toBe("default");
+  });
+});
+
+describe("usedPctOf", () => {
+  it("computes a percentage of the limit", () => {
+    expect(usedPctOf(15.79, 42.5)).toBeCloseTo(37.15, 2);
+  });
+
+  it("is unknown when either side is missing", () => {
+    expect(usedPctOf(null, 100)).toBeNull();
+    expect(usedPctOf(50, null)).toBeNull();
+  });
+
+  // A zero limit would divide to Infinity and render as a full red bar.
+  it("is unknown when the limit is zero or negative", () => {
+    expect(usedPctOf(50, 0)).toBeNull();
+    expect(usedPctOf(50, -1)).toBeNull();
+  });
+});
+
+describe("balanceToneFromRemaining", () => {
+  // Kept for balances with no limit, where no percentage can be computed. It only
+  // escalates at exhaustion, which is why anything with a limit should use
+  // toneFromUsedPct instead.
+  it("stays ok until nothing is left", () => {
+    expect(balanceToneFromRemaining(0.01)).toBe("ok");
+    expect(balanceToneFromRemaining(0)).toBe("danger");
+    expect(balanceToneFromRemaining(null)).toBe("default");
+  });
+});
+
+test.each([
+  [18000, "five_hour", "5-hour", "5h"],
+  [604800, "weekly", "Weekly", "wk"],
+  [7200, "7200s", "2-hour", "2h"],
+  [86400, "86400s", "1-day", "1d"],
+  [90, "90s", "90-second", "90s"],
+  [null, "primary", "Primary limit", ""],
+])(
+  "duration %s owns the window's identity and both names",
+  (durationSeconds, id, label, shortLabel) => {
+    expect(
+      windowFromReportedDuration({
+        durationSeconds: durationSeconds as number | null,
+        unknown: { id: "primary", label: "Primary limit", shortLabel: "" },
+        utilizationPct: 11,
+      }),
+    ).toMatchObject({ id, label, shortLabel, usedPct: 11 });
+  },
+);
diff --git a/packages/plugin/src/server/usage.ts b/packages/plugin/src/server/usage.ts
new file mode 100644
index 0000000000..fa23ca9c91
--- /dev/null
+++ b/packages/plugin/src/server/usage.ts
@@ -0,0 +1,204 @@
+import { createHash } from "node:crypto";
+import { z, type ZodType } from "zod";
+import type { JsonValue } from "@getpaseo/protocol/agent-types";
+
+export interface UsageWindow {
+  id: string;
+  label: string;
+  /**
+   * A few characters naming the window where space is tight, e.g. "5h" or "wk". An empty string
+   * shows the percent alone; leaving it out shows `label`.
+   */
+  shortLabel?: string;
+  /** Shown in the usage summary until the user pins windows of their own. */
+  summary?: boolean;
+  usedPct?: number | null;
+  remainingPct?: number | null;
+  resetsAt?: string | null;
+  runsOutAt?: string | null;
+  shortfallPct?: number | null;
+  tone?: "default" | "ok" | "warning" | "danger";
+}
+
+export interface UsageBalance {
+  id: string;
+  label: string;
+  used?: number | null;
+  remaining?: number | null;
+  limit?: number | null;
+  unit: "usd" | "credits" | "requests" | "tokens";
+  resetsAt?: string | null;
+  tone?: UsageWindow["tone"];
+}
+
+export interface UsageDetail {
+  id: string;
+  label: string;
+  value: string;
+  tone?: UsageWindow["tone"];
+}
+
+export type UsageProblem =
+  | { kind: "expired"; expiresAt: string; refreshedBy?: string }
+  | { kind: "rejected"; status: number; refreshedBy?: string }
+  | { kind: "no_quota"; detail: string };
+
+export type UsageReport =
+  | {
+      status: "available";
+      planLabel?: string;
+      windows: UsageWindow[];
+      balances?: UsageBalance[];
+      details?: UsageDetail[];
+    }
+  | { status: "unavailable"; problem: UsageProblem }
+  | { status: "error"; error: string };
+
+export interface UsageAccount {
+  /** Stable across token rotation; [A-Za-z0-9._-]{1,128}. Never a credential or raw email. */
+  key: string;
+  label?: string;
+  /** Harness owning this login, e.g. Codex, OpenCode, Pi or OMP. */
+  harness?: string;
+  /** Store locator, opaque to the daemon. */
+  input: JsonValue;
+}
+
+export const UsageScopeSchema = z.discriminatedUnion("kind", [
+  z.object({ kind: z.literal("global") }),
+  z.object({
+    kind: z.literal("session"),
+    provider: z.string(),
+    model: z.string().optional(),
+    env: z.record(z.string(), z.string()),
+  }),
+]);
+export type UsageScope = z.infer<typeof UsageScopeSchema>;
+
+export interface UsageSourceRegistration {
+  id: string;
+  label: string;
+  icon?: string;
+  input: ZodType;
+  /** Accounts for this scope only. The same key in any scope identifies the same account. */
+  discover(scope: UsageScope): Promise<UsageAccount[]>;
+  /** Re-reads the login store; never writes it. */
+  fetch(input: unknown): Promise<UsageReport>;
+}
+
+export function windowFromUsedPct(input: {
+  id: string;
+  label: string;
+  shortLabel?: string;
+  summary?: boolean;
+  utilizationPct: number | null | undefined;
+  resetsAt?: string | null;
+  tone?: UsageWindow["tone"];
+}): UsageWindow {
+  const usedPct = typeof input.utilizationPct === "number" ? input.utilizationPct : null;
+  const window: UsageWindow = {
+    id: input.id,
+    label: input.label,
+    usedPct,
+    remainingPct: usedPct === null ? null : Math.max(0, 100 - usedPct),
+    resetsAt: input.resetsAt ?? null,
+  };
+  if (input.shortLabel !== undefined) window.shortLabel = input.shortLabel;
+  if (input.summary) window.summary = true;
+  if (input.tone) window.tone = input.tone;
+  return window;
+}
+
+/**
+ * Numeric provider windows have one identity and vocabulary, independent of response slots.
+ * Pass null when the provider omits the duration; reset countdowns are not window lengths.
+ * Named API fields (weekly, monthly, etc.) use windowFromUsedPct instead.
+ */
+export function windowFromReportedDuration(input: {
+  durationSeconds: number | null;
+  /** Stable quota identity and provider name for a model- or feature-scoped limit. */
+  scope?: { id: string; label: string };
+  /** Neutral identity and names when the provider does not report a positive duration. */
+  unknown: { id: string; label: string; shortLabel: string };
+  utilizationPct: number | null | undefined;
+  resetsAt?: string | null;
+  summary?: boolean;
+  tone?: UsageWindow["tone"];
+}): UsageWindow {
+  const duration = input.durationSeconds;
+  const name =
+    duration !== null && Number.isFinite(duration) && duration > 0
+      ? durationWindowName(duration)
+      : input.unknown;
+  const scope = input.scope;
+  return windowFromUsedPct({
+    id: scope ? `${scope.id}:${name.id}` : name.id,
+    label: scope ? `${scope.label} · ${name.label}` : name.label,
+    shortLabel: scope
+      ? `${scope.label}${name.shortLabel ? ` ${name.shortLabel}` : ""}`
+      : name.shortLabel,
+    utilizationPct: input.utilizationPct,
+    resetsAt: input.resetsAt,
+    summary: input.summary,
+    tone: input.tone,
+  });
+}
+
+function durationWindowName(seconds: number): { id: string; label: string; shortLabel: string } {
+  if (seconds === 604800) return { id: "weekly", label: "Weekly", shortLabel: "wk" };
+  const id = seconds === 18000 ? "five_hour" : `${seconds}s`;
+  const units = [
+    [86400, "day", "d"],
+    [3600, "hour", "h"],
+    [60, "minute", "m"],
+    [1, "second", "s"],
+  ] as const;
+  const unit = units.find(([size]) => seconds % size === 0) ?? units[units.length - 1]!;
+  const amount = seconds / unit[0];
+  return { id, label: `${amount}-${unit[1]}`, shortLabel: `${amount}${unit[2]}` };
+}
+
+/**
+ * The tone scale for anything measured against a known limit, windows and balances alike.
+ *
+ * Thresholds match `deriveTone` in the app's provider-usage/tone.ts, which is what the
+ * client falls back to when a window arrives without a tone. Healthy is "ok" rather than
+ * "default" because that is what every provider setting a tone has always sent, and it is
+ * what the bars render today below their thresholds.
+ */
+export function toneFromUsedPct(usedPct: number | null | undefined): UsageWindow["tone"] {
+  if (typeof usedPct !== "number") return "default";
+  if (usedPct > 90) return "danger";
+  if (usedPct >= 70) return "warning";
+  return "ok";
+}
+
+/**
+ * Tone for a balance with no known limit, where a percentage cannot be computed and the
+ * only signal is whether anything is left. Prefer `toneFromUsedPct` when a limit exists:
+ * this one stays "ok" until the balance is completely spent.
+ */
+export function balanceToneFromRemaining(
+  remaining: number | null | undefined,
+): UsageBalance["tone"] {
+  if (typeof remaining !== "number") return "default";
+  if (remaining <= 0) return "danger";
+  return "ok";
+}
+
+/** Percentage of a limit consumed, or null when either side is unknown. */
+export function usedPctOf(
+  used: number | null | undefined,
+  limit: number | null | undefined,
+): number | null {
+  if (typeof used !== "number" || typeof limit !== "number" || limit <= 0) return null;
+  return (used / limit) * 100;
+}
+
+export function hashAccountKey(value: string): string {
+  return createHash("sha256").update(value).digest("hex");
+}
+
+export function unavailable(problem: UsageProblem): UsageReport {
+  return { status: "unavailable", problem };
+}
diff --git a/packages/plugin/src/settings.ts b/packages/plugin/src/settings.ts
new file mode 100644
index 0000000000..30e890b3ef
--- /dev/null
+++ b/packages/plugin/src/settings.ts
@@ -0,0 +1,51 @@
+import { z } from "zod";
+import type { ZodType } from "zod";
+import { defineRpc } from "./rpc.js";
+
+export interface SettingsDefinition<Schema extends ZodType = ZodType> {
+  id: string;
+  scope: "host";
+  version: number;
+  schema: Schema;
+  /** Convert a previous stored version to the current schema. Runs on the host. */
+  migrate?: (values: unknown, fromVersion: number) => unknown | Promise<unknown>;
+}
+
+export function defineSettings<Schema extends ZodType>(
+  definition: SettingsDefinition<Schema>,
+): SettingsDefinition<Schema> {
+  if (!/^[a-z][a-z0-9_-]*$/.test(definition.id)) throw new Error("Invalid settings ID");
+  if (definition.scope !== "host") throw new Error("Only host-scoped settings are supported");
+  if (!Number.isSafeInteger(definition.version) || definition.version < 1)
+    throw new Error("Invalid settings version");
+  return definition;
+}
+
+export const SettingsReadResultSchema = z.discriminatedUnion("status", [
+  z.object({ status: z.literal("ready"), revision: z.string(), values: z.json() }),
+  z.object({ status: z.literal("invalid"), revision: z.string(), error: z.string() }),
+]);
+export const SettingsWriteResultSchema = z.discriminatedUnion("status", [
+  z.object({ status: z.literal("saved"), revision: z.string(), values: z.json() }),
+  z.object({ status: z.literal("conflict"), error: z.string() }),
+  z.object({ status: z.literal("invalid"), error: z.string() }),
+]);
+export function settingsRpc(id: string) {
+  return {
+    read: defineRpc({
+      name: `settings.${id}.read`,
+      input: z.object({}),
+      output: SettingsReadResultSchema,
+    }),
+    write: defineRpc({
+      name: `settings.${id}.write`,
+      input: z.object({ revision: z.string(), values: z.json() }),
+      output: SettingsWriteResultSchema,
+    }),
+    reset: defineRpc({
+      name: `settings.${id}.reset`,
+      input: z.object({ revision: z.string() }),
+      output: SettingsWriteResultSchema,
+    }),
+  };
+}
diff --git a/packages/plugin/src/skill-examples.test.ts b/packages/plugin/src/skill-examples.test.ts
new file mode 100644
index 0000000000..3a21f58c33
--- /dev/null
+++ b/packages/plugin/src/skill-examples.test.ts
@@ -0,0 +1,40 @@
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import ts from "typescript";
+import { describe, expect, it } from "vitest";
+
+const repository = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../..");
+const skill = readFileSync(path.join(repository, "skills/paseo-plugin/SKILL.md"), "utf8");
+
+function sectionCode(heading: string): string {
+  const section = skill.slice(skill.indexOf(`\n## ${heading}\n`));
+  const code = /```tsx\n([\s\S]*?)\n```/.exec(section)?.[1];
+  if (!code) throw new Error(`No tsx example under "${heading}"`);
+  return code;
+}
+
+// Checks the example as a plugin client file, with the same options as the plugin examples.
+function typeErrors(code: string): string[] {
+  const configPath = path.join(repository, "packages/plugin/tsconfig.examples.json");
+  const { config } = ts.readConfigFile(configPath, ts.sys.readFile);
+  const { options } = ts.parseJsonConfigFileContent(config, ts.sys, path.dirname(configPath));
+  const file = path.join(repository, "plugin-examples/skill-example/client/example.tsx");
+  const host = ts.createCompilerHost(options);
+  const getSourceFile = host.getSourceFile;
+  host.getSourceFile = (name, language, ...rest) =>
+    path.resolve(name) === file
+      ? ts.createSourceFile(name, code, language)
+      : getSourceFile.call(host, name, language, ...rest);
+  host.fileExists = (name) => path.resolve(name) === file || ts.sys.fileExists(name);
+  const program = ts.createProgram([file], options, host);
+  return ts
+    .getPreEmitDiagnostics(program)
+    .map((diagnostic) => ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
+}
+
+describe("paseo-plugin skill examples", () => {
+  it("composer pill example typechecks against the plugin SDK", () => {
+    expect(typeErrors(sectionCode("Add a composer pill"))).toEqual([]);
+  });
+});
diff --git a/packages/plugin/tsconfig.json b/packages/plugin/tsconfig.json
index b6c46d8b3d..536cb17750 100644
--- a/packages/plugin/tsconfig.json
+++ b/packages/plugin/tsconfig.json
@@ -4,6 +4,7 @@
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "lib": ["ES2023", "DOM"],
+    "types": ["node"],
     "jsx": "react-jsx",
     "strict": true,
     "skipLibCheck": true,
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 676e5c5039..8ce97a1025 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
@@ -31,10 +31,12 @@
     "pretest": "npm run generate:validators"
   },
   "dependencies": {
+    "semver": "^7.8.5",
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
+    "@types/semver": "^7.8.0",
     "typescript": "^5.2.2",
     "vitest": "^4.1.6",
     "zod-aot": "0.20.4"
diff --git a/packages/protocol/src/agent-feature-schemas.test.ts b/packages/protocol/src/agent-feature-schemas.test.ts
index a14ef5f746..ae76dd507e 100644
--- a/packages/protocol/src/agent-feature-schemas.test.ts
+++ b/packages/protocol/src/agent-feature-schemas.test.ts
@@ -49,6 +49,22 @@ describe("agent feature schemas", () => {
     expect(parsed.value).toBe("flex");
   });
 
+  it.each(["icon", "label"])(
+    "preserves the %s desktop trigger for any select feature",
+    (desktopTrigger) => {
+      const feature = {
+        type: "select",
+        id: "custom-feature",
+        label: "Custom setting",
+        icon: "gauge",
+        value: "first",
+        options: [{ id: "first", label: "First" }],
+        desktopTrigger,
+      };
+      expect(AgentFeatureSchema.parse(feature)).toEqual(feature);
+    },
+  );
+
   it("rejects invalid features", () => {
     const invalidDiscriminator = AgentFeatureSchema.safeParse({
       type: "slider",
diff --git a/packages/protocol/src/agent-message-display.ts b/packages/protocol/src/agent-message-display.ts
new file mode 100644
index 0000000000..c95f9e8206
--- /dev/null
+++ b/packages/protocol/src/agent-message-display.ts
@@ -0,0 +1,25 @@
+import type { AgentMessage } from "./agent-message.js";
+import type { ToolCallDetail } from "./agent-types.js";
+
+/** Presentation shared by clients; never used to encode provider prompts. */
+export function buildAgentMessageDisplay(message: AgentMessage): {
+  displayName: string;
+  detail: ToolCallDetail;
+} {
+  const sender = message.sender.title ?? message.sender.id;
+  const headings: Record<AgentMessage["event"], string> = {
+    message: `Message from ${sender}`,
+    finished: `${sender} finished`,
+    errored: `${sender} errored`,
+    "permission-required": `${sender} needs permission`,
+    closed: `${sender} closed`,
+  };
+  return {
+    displayName: headings[message.event],
+    detail: {
+      type: "plain_text",
+      icon: "bot",
+      text: `From agent: ${message.sender.id}\n\n${message.text}`,
+    },
+  };
+}
diff --git a/packages/protocol/src/agent-message.ts b/packages/protocol/src/agent-message.ts
new file mode 100644
index 0000000000..5caf63656d
--- /dev/null
+++ b/packages/protocol/src/agent-message.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+/** Semantic provenance, independent of provider envelopes and timeline presentation. */
+export const AgentMessageSchema = z.object({
+  event: z.enum(["message", "finished", "errored", "permission-required", "closed"]),
+  sender: z.object({
+    id: z.string().min(1),
+    title: z.string().min(1).optional(),
+  }),
+  text: z.string(),
+});
+
+export type AgentMessage = z.infer<typeof AgentMessageSchema>;
diff --git a/packages/protocol/src/agent-profile.ts b/packages/protocol/src/agent-profile.ts
new file mode 100644
index 0000000000..2534984240
--- /dev/null
+++ b/packages/protocol/src/agent-profile.ts
@@ -0,0 +1,36 @@
+import { z } from "zod";
+
+/**
+ * A named launch bundle: a provider plus the agent-config values a client would
+ * otherwise set one control at a time. Field names mirror `AgentSessionConfig`
+ * so applying a profile is a copy rather than a translation table.
+ *
+ * There is deliberately no system prompt here. `AgentSessionConfig.systemPrompt`
+ * is creation-only, so a profile carrying one would apply when starting a new
+ * agent and silently do nothing when applied to a running one.
+ */
+export const AgentProfileSchema = z
+  .object({
+    id: z.string(),
+    name: z.string(),
+    /** A key into the client's icon registry, not a glyph. Unknown keys draw the default. */
+    icon: z.string().optional(),
+    /** An identity colour name shared with host badges. Unknown values draw unthemed. */
+    color: z.string().optional(),
+    provider: z.string(),
+    model: z.string().optional(),
+    modeId: z.string().optional(),
+    thinkingOptionId: z.string().optional(),
+    featureValues: z.record(z.string(), z.unknown()).optional(),
+    /** Free text, surfaced to orchestrating agents by the `list_profiles` MCP tool. */
+    notes: z.string().optional(),
+  })
+  .passthrough();
+
+export type AgentProfile = z.infer<typeof AgentProfileSchema>;
+
+export const AgentSkillSelectionSchema = z.discriminatedUnion("mode", [
+  z.object({ mode: z.literal("all") }).strict(),
+  z.object({ mode: z.literal("custom"), skills: z.array(z.string()) }).strict(),
+]);
+export type AgentSkillSelection = z.infer<typeof AgentSkillSelectionSchema>;
diff --git a/packages/protocol/src/agent-types.ts b/packages/protocol/src/agent-types.ts
index bce5fa7fcd..c7fffe8ce9 100644
--- a/packages/protocol/src/agent-types.ts
+++ b/packages/protocol/src/agent-types.ts
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "./agent-message.js";
 import type { AgentAttachment } from "./messages.js";
 
 export type AgentProvider = string;
@@ -102,6 +103,17 @@ export function normalizeAgentModelDefinition(model: AgentModelDefinition): Agen
   return { ...model, defaultThinkingOptionId };
 }
 
+/** A provider addresses models by ID; repeated rows retain the first definition. */
+export function normalizeAgentModelCatalog(models: AgentModelDefinition[]): AgentModelDefinition[] {
+  const ids = new Set<string>();
+  const unique = models.filter((model) => {
+    if (ids.has(model.id)) return false;
+    ids.add(model.id);
+    return true;
+  });
+  return unique.length === models.length ? models : unique;
+}
+
 export interface ProviderSnapshotEntry {
   provider: AgentProvider;
   status: ProviderStatus;
@@ -113,6 +125,7 @@ export interface ProviderSnapshotEntry {
   fetchedAt?: string;
   label?: string;
   description?: string;
+  iconSvg?: string;
   defaultModeId?: string | null;
 }
 
@@ -133,6 +146,8 @@ export interface AgentFeatureSelect {
   description?: string;
   tooltip?: string;
   icon?: string;
+  /** Desktop toolbar presentation; omitted means labeled. Mobile selectors stay labeled. */
+  desktopTrigger?: "icon" | "label";
   value: string | null;
   options: AgentSelectOption[];
 }
@@ -297,6 +312,7 @@ export type ToolCallDetail =
     };
 
 interface ToolCallBase {
+  agentMessage?: AgentMessage;
   [key: string]: unknown;
   type: "tool_call";
   callId: string;
@@ -363,6 +379,11 @@ export type AgentTimelineItem =
   | ToolCallTimelineItem
   | { type: "todo"; items: AgentTaskItem[] }
   | { type: "error"; message: string }
+  | {
+      type: "notification";
+      level: "info" | "warning" | "error";
+      message: string;
+    }
   | CompactionTimelineItem
   | PluginTimelineItem;
 
@@ -479,7 +500,7 @@ export type JsonValue =
   | JsonValue[]
   | { [key: string]: JsonValue };
 
-export type ProviderOptions = Record<string, JsonValue>;
+export type ProviderOptions = Record<string, unknown>;
 
 export interface McpToolRef {
   kind: "mcp";
diff --git a/packages/protocol/src/browser-automation/rpc-schemas.ts b/packages/protocol/src/browser-automation/rpc-schemas.ts
index 55785dd69d..d2c5870e71 100644
--- a/packages/protocol/src/browser-automation/rpc-schemas.ts
+++ b/packages/protocol/src/browser-automation/rpc-schemas.ts
@@ -498,6 +498,7 @@ export const BrowserAutomationDialogEventSchema = z.object({
 export const BrowserAutomationExecuteRequestSchema = z
   .object({
     type: z.literal("browser.automation.execute.request"),
+    subscriptionId: z.string().optional(),
     requestId: z.string().min(1),
     agentId: z.string().min(1).optional(),
     cwd: z.string().min(1).optional(),
diff --git a/packages/protocol/src/client-capabilities.ts b/packages/protocol/src/client-capabilities.ts
index b9c405b4f1..0947b81027 100644
--- a/packages/protocol/src/client-capabilities.ts
+++ b/packages/protocol/src/client-capabilities.ts
@@ -1,4 +1,11 @@
 export const CLIENT_CAPS = {
+  helloRejection: "hello_rejection",
+  // COMPAT(ownedSubscriptions): added in v0.8.0, remove legacy ownership after 2027-03-09.
+  ownedSubscriptions: "owned_subscriptions",
+  // Clients outside the Paseo app version series can explicitly accept provider IDs.
+  // COMPAT(explicitEventSubscriptions): added in v0.8.0, remove legacy broadcasts after 2027-03-08.
+  explicitEventSubscriptions: "explicit_event_subscriptions",
+  allProviders: "all_providers",
   // COMPAT(selectiveAgentTimeline): added in v0.1.106. Capable clients receive
   // agent streams only for their explicit viewed set. Remove after 2027-01-12
   // once the supported client floor is >= v0.1.106.
@@ -18,15 +25,26 @@ export const CLIENT_CAPS = {
   // COMPAT(providerSubagents): added in v0.1.107. The daemon emits provider-owned
   // child descriptors and timelines only to clients that understand the new messages.
   providerSubagents: "provider_subagents",
+  // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove gates after 2027-03-14; retain wire capability.
+  projectedSubagentTimeline: "projected_subagent_timeline",
   // COMPAT(projectUpdates): added in v0.1.109, remove gate after 2027-01-15.
   projectUpdates: "project_updates",
   // COMPAT(compactProviderSnapshots): added in v0.2.X. Capable clients receive
   // provider catalogs with shared thinking sets and may revalidate by content hash.
   // Remove the legacy snapshot encoding after 2027-02-04.
   compactProviderSnapshots: "compact_provider_snapshots",
+  providerSnapshotReferences: "provider_snapshot_references",
   // COMPAT(timelineReplacementInvalidation): added in v0.5.0, remove legacy
   // reconstructed timeline replay after 2027-02-21 once the client floor supports invalidation.
   timelineReplacementInvalidation: "timeline_replacement_invalidation",
+  // COMPAT(timelineNotifications): added in v0.7.2. The daemon omits notification
+  // timeline items for older clients whose strict timeline union rejects them.
+  // Remove after 2027-03-03 once the supported client floor is >= v0.7.2.
+  timelineNotifications: "timeline_notifications",
+  // COMPAT(pluginTimelineItems): added in v0.8.0, remove after 2027-03-07 once client floor >= v0.8.0.
+  pluginTimelineItems: "plugin_timeline_items",
+  // COMPAT(workspaceSetupBlocked): added in v0.8.0, remove after 2027-03-07 once client floor >= v0.8.0.
+  workspaceSetupBlocked: "workspace_setup_blocked",
   browserHost: "browser_host",
 } as const;
 
diff --git a/packages/protocol/src/daemon-endpoints.test.ts b/packages/protocol/src/daemon-endpoints.test.ts
index 7f131eec08..3ac1c111ac 100644
--- a/packages/protocol/src/daemon-endpoints.test.ts
+++ b/packages/protocol/src/daemon-endpoints.test.ts
@@ -7,6 +7,8 @@ import {
   extractHostPortFromWebSocketUrl,
   normalizeRelayProtocolVersion,
   parseConnectionUri,
+  parseRelayConnectionUri,
+  serializeRelayConnectionUri,
   serializeConnectionUri,
   serializeConnectionUriForStorage,
   shouldUseTlsForDefaultHostedRelay,
@@ -211,3 +213,22 @@ describe("shouldUseTlsForDefaultHostedRelay", () => {
     expect(shouldUseTlsForDefaultHostedRelay("not-an-endpoint")).toBe(false);
   });
 });
+
+describe("relay connection URI", () => {
+  test("round-trips the offer and password through a direct URI and connect wrapper", () => {
+    const parts = {
+      offer: {
+        v: 2 as const,
+        serverId: "srv_test",
+        daemonPublicKeyB64: "abc+/=",
+        relay: { endpoint: "relay.paseo.sh:443", useTls: true },
+      },
+      password: "two words",
+    };
+    const uri = serializeRelayConnectionUri(parts);
+    expect(parseRelayConnectionUri(uri)).toEqual(parts);
+    expect(
+      parseRelayConnectionUri(`https://app.paseo.sh/#connect=${encodeURIComponent(uri)}`),
+    ).toEqual(parts);
+  });
+});
diff --git a/packages/protocol/src/daemon-endpoints.ts b/packages/protocol/src/daemon-endpoints.ts
index 299abcab36..a4b72c9416 100644
--- a/packages/protocol/src/daemon-endpoints.ts
+++ b/packages/protocol/src/daemon-endpoints.ts
@@ -1,3 +1,5 @@
+import type { ConnectionOfferV2 } from "./connection-offer.js";
+
 export interface HostPortParts {
   host: string;
   port: number;
@@ -12,6 +14,55 @@ export interface ParsedConnectionUri extends ConnectionUriParts {
   password?: string;
 }
 
+export interface ParsedRelayConnectionUri {
+  offer: ConnectionOfferV2;
+  password?: string;
+}
+
+export function parseRelayConnectionUri(input: string): ParsedRelayConnectionUri {
+  const trimmed = input.trim();
+  const connectIndex = trimmed.indexOf("#connect=");
+  const uri =
+    connectIndex >= 0
+      ? decodeURIComponent(trimmed.slice(connectIndex + "#connect=".length))
+      : trimmed;
+  let url: URL;
+  try {
+    url = new URL(uri);
+  } catch {
+    throw new Error("Invalid relay connection URI");
+  }
+  if (url.protocol !== "relay:" || !url.hostname || !url.port || url.username || url.password) {
+    throw new Error("Invalid relay connection URI");
+  }
+  const serverId = decodeURIComponent(url.pathname.slice(1));
+  const key = url.searchParams.get("key");
+  if (!serverId || !key || serverId.includes("/")) {
+    throw new Error("Relay connection URI requires a server id and key");
+  }
+  const endpoint = normalizeHostPort(url.host);
+  const password = url.searchParams.get("password") || undefined;
+  return {
+    offer: {
+      v: 2,
+      serverId,
+      daemonPublicKeyB64: key,
+      relay: { endpoint, useTls: url.searchParams.get("ssl") === "true" },
+    },
+    ...(password ? { password } : {}),
+  };
+}
+
+export function serializeRelayConnectionUri(parts: ParsedRelayConnectionUri): string {
+  const url = new URL(
+    `relay://${parts.offer.relay.endpoint}/${encodeURIComponent(parts.offer.serverId)}`,
+  );
+  url.searchParams.set("key", parts.offer.daemonPublicKeyB64);
+  if (parts.offer.relay.useTls) url.searchParams.set("ssl", "true");
+  if (parts.password) url.searchParams.set("password", parts.password);
+  return url.toString();
+}
+
 export type RelayRole = "server" | "client";
 export type RelayProtocolVersion = "1" | "2";
 
diff --git a/packages/protocol/src/messages.create-agent-internal.test.ts b/packages/protocol/src/messages.create-agent-internal.test.ts
new file mode 100644
index 0000000000..5d4e75649f
--- /dev/null
+++ b/packages/protocol/src/messages.create-agent-internal.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, test } from "vitest";
+
+import { SessionInboundMessageSchema } from "./messages.js";
+
+describe("create request internal field", () => {
+  test("accepts internal on create_agent_request", () => {
+    const parsed = SessionInboundMessageSchema.parse({
+      type: "create_agent_request",
+      requestId: "create-agent-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+    });
+
+    expect(parsed).toEqual({
+      type: "create_agent_request",
+      requestId: "create-agent-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+      labels: {},
+    });
+  });
+
+  test("accepts internal on agent.create.request", () => {
+    const parsed = SessionInboundMessageSchema.parse({
+      type: "agent.create.request",
+      requestId: "agent-create-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+    });
+
+    expect(parsed).toEqual({
+      type: "agent.create.request",
+      requestId: "agent-create-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+      labels: {},
+    });
+  });
+});
diff --git a/packages/protocol/src/messages.plugins.test.ts b/packages/protocol/src/messages.plugins.test.ts
index e5726b5081..f266b65988 100644
--- a/packages/protocol/src/messages.plugins.test.ts
+++ b/packages/protocol/src/messages.plugins.test.ts
@@ -1,3 +1,4 @@
+import { z } from "zod";
 import { describe, expect, it } from "vitest";
 import {
   MutableDaemonConfigSchema,
@@ -7,6 +8,42 @@ import {
 } from "./messages.js";
 
 describe("plugin protocol compatibility", () => {
+  it.each([undefined, { paseo: ">=0.8.0" }])(
+    "parses plugin catalogs with requirements %j",
+    (requirements) => {
+      const message = {
+        type: "plugin.catalog.get.response",
+        payload: {
+          requestId: "catalog",
+          plugins: [
+            { id: "example", clientBundle: "bundle", ...(requirements ? { requirements } : {}) },
+          ],
+        },
+      };
+      expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
+    },
+  );
+  it("preserves manifest metadata in plugin list responses", () => {
+    const message = {
+      type: "plugin.list.response",
+      payload: {
+        requestId: "metadata",
+        plugins: [
+          {
+            id: "review",
+            name: "Review tools",
+            icon: "assets/icon.png",
+            media: ["screenshot.png", "https://example.com/demo.mp4"],
+            path: "/plugins/review",
+            enabled: false,
+            status: "disabled",
+          },
+        ],
+      },
+    };
+    expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
+  });
+
   it("parses plugin timeline append messages and advertises the capability", () => {
     expect(
       SessionInboundMessageSchema.parse({
@@ -81,6 +118,22 @@ describe("plugin protocol compatibility", () => {
         type: "plugin.directory.install.response",
         payload: {
           requestId: "request-1",
+          plugin: {
+            id: "example-work",
+            description: "Reviews changes before merge",
+            path: "/plugins/example",
+            enabled: true,
+            status: "running",
+          },
+        },
+      }).type,
+    ).toBe("plugin.directory.install.response");
+
+    expect(
+      SessionOutboundMessageSchema.parse({
+        type: "plugin.directory.install.response",
+        payload: {
+          requestId: "request-old-shape",
           plugin: {
             id: "example-work",
             path: "/plugins/example",
@@ -262,3 +315,37 @@ describe("plugin protocol compatibility", () => {
     ).toThrow();
   });
 });
+
+it("npm metadata leaves legacy plugin rows parseable without extending their closed source enum", () => {
+  const legacyPlugin = z.object({
+    id: z.string(),
+    path: z.string(),
+    enabled: z.boolean(),
+    status: z.enum(["running", "disabled", "failed"]),
+    source: z.enum(["directory", "git"]).optional(),
+  });
+  const plugin = {
+    id: "review",
+    path: "/plugins/review",
+    enabled: true,
+    status: "running",
+    installation: {
+      identity: { kind: "npm", packageName: "@acme/review", pluginPath: "." },
+      currentRevision: "1.2.0",
+    },
+  };
+  const message = SessionOutboundMessageSchema.parse({
+    type: "plugin.list.response",
+    payload: { requestId: "npm", plugins: [plugin] },
+  });
+  expect(legacyPlugin.parse(plugin)).toEqual({
+    id: "review",
+    path: "/plugins/review",
+    enabled: true,
+    status: "running",
+  });
+  expect(message).toEqual({
+    type: "plugin.list.response",
+    payload: { requestId: "npm", plugins: [plugin] },
+  });
+});
diff --git a/packages/protocol/src/messages.providers-snapshot.test.ts b/packages/protocol/src/messages.providers-snapshot.test.ts
index fc87b13b3c..91b08a3cdc 100644
--- a/packages/protocol/src/messages.providers-snapshot.test.ts
+++ b/packages/protocol/src/messages.providers-snapshot.test.ts
@@ -94,3 +94,20 @@ describe("provider snapshot message schemas", () => {
     expect(parsed.payload.entries[0]?.enabled).toBe(true);
   });
 });
+
+test("accepts a bodyless announcement with separate discovery freshness", async () => {
+  const { validateWSOutboundMessage } = await import("./validation/ws-outbound.js");
+  const message = {
+    type: "providers_snapshot_update",
+    payload: {
+      cwd: "/project",
+      entries: [],
+      snapshotHash: "content-hash",
+      fetchedAt: { codex: "2026-09-06T12:00:00.000Z" },
+      generatedAt: "2026-09-06T13:00:00.000Z",
+    },
+  };
+  expect(ProvidersSnapshotUpdateMessageSchema.parse(message)).toEqual(message);
+  const result = validateWSOutboundMessage({ type: "session", message });
+  expect(result.success).toBe(true);
+});
diff --git a/packages/protocol/src/messages.test.ts b/packages/protocol/src/messages.test.ts
index 3394c8e15f..ca3ab86135 100644
--- a/packages/protocol/src/messages.test.ts
+++ b/packages/protocol/src/messages.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, test } from "vitest";
 import {
+  AgentTimelineItemPayloadSchema,
   FileExplorerRequestSchema,
   PaseoWorktreeArchiveRequestSchema,
   parseServerInfoStatusPayload,
@@ -520,3 +521,30 @@ describe("viewed timeline subscription messages", () => {
     });
   });
 });
+
+test("agent messages are an optional semantic payload on existing tool rows", () => {
+  const legacy = {
+    type: "tool_call",
+    callId: "delivery",
+    name: "agent_message",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", text: "Done" },
+  };
+  const agentMessage = {
+    event: "finished",
+    sender: { id: "server::worker", title: "Reviewer" },
+    text: "Done",
+  };
+  expect(AgentTimelineItemPayloadSchema.parse(legacy)).toEqual(legacy);
+  expect(AgentTimelineItemPayloadSchema.parse({ ...legacy, agentMessage })).toEqual({
+    ...legacy,
+    agentMessage,
+  });
+  expect(
+    AgentTimelineItemPayloadSchema.safeParse({
+      ...legacy,
+      agentMessage: { ...agentMessage, sender: { id: 42 } },
+    }).success,
+  ).toBe(false);
+});
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index 954b8acad7..fefc104279 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -1,9 +1,30 @@
+import { AgentMessageSchema } from "./agent-message.js";
+import { PluginRegistryIdentitySchema } from "./plugin-registry.js";
+import { AgentProfileSchema, AgentSkillSelectionSchema } from "./agent-profile.js";
+export {
+  AgentProfileSchema,
+  AgentSkillSelectionSchema,
+  type AgentProfile,
+  type AgentSkillSelection,
+} from "./agent-profile.js";
+import { PluginIdSchema, PluginRequirementsSchema, PluginSourceSchema } from "./plugin-config.js";
+export {
+  PluginIdSchema,
+  PluginRequirementsSchema,
+  DirectoryPluginSourceSchema,
+  PluginSourceSchema,
+  type PluginRequirements,
+  type PluginSource,
+} from "./plugin-config.js";
+import { TerminalProfileSchema } from "./terminal-profile.js";
+export { TerminalProfileSchema, type TerminalProfile } from "./terminal-profile.js";
 import { z } from "zod";
 import { TerminalActivitySchema } from "./terminal-activity.js";
 import { CLIENT_CAPS } from "./client-capabilities.js";
 import { AGENT_LIFECYCLE_STATUSES } from "./agent-lifecycle.js";
 import { MAX_EXPLICIT_AGENT_TITLE_CHARS } from "./agent-title-limits.js";
 import { AgentProviderSchema } from "./provider-manifest.js";
+import { ProviderPaseoToolsPolicySchema } from "./provider-config.js";
 import { TOOL_CALL_ICON_NAMES } from "./agent-types.js";
 import { WORKSPACE_LABEL_COLORS } from "./workspace-labels.js";
 import {
@@ -55,6 +76,7 @@ import {
   LoopStopResponseSchema,
 } from "./loop/rpc-schemas.js";
 import {
+  BROWSER_AUTOMATION_COMMAND_NAMES,
   BrowserAutomationExecuteRequestSchema,
   BrowserAutomationExecuteResponseSchema,
 } from "./browser-automation/rpc-schemas.js";
@@ -118,6 +140,7 @@ const MutableDaemonProviderModelSchema = z
 
 const MutableDaemonProviderConfigSchema = z
   .object({
+    paseoTools: ProviderPaseoToolsPolicySchema.optional(),
     enabled: z.boolean().optional(),
     additionalModels: z.array(MutableDaemonProviderModelSchema).optional(),
   })
@@ -137,47 +160,6 @@ const MutableMetadataGenerationConfigSchema = z
   })
   .passthrough();
 
-export const TerminalProfileSchema = z
-  .object({
-    id: z.string(),
-    name: z.string(),
-    command: z.string(),
-    args: z.array(z.string()).optional(),
-    icon: z.string().optional(),
-  })
-  .passthrough();
-
-export type TerminalProfile = z.infer<typeof TerminalProfileSchema>;
-
-/**
- * A named launch bundle: a provider plus the agent-config values a client would
- * otherwise set one control at a time. Field names mirror `AgentSessionConfig`
- * so applying a profile is a copy rather than a translation table.
- *
- * There is deliberately no system prompt here. `AgentSessionConfig.systemPrompt`
- * is creation-only, so a profile carrying one would apply when starting a new
- * agent and silently do nothing when applied to a running one.
- */
-export const AgentProfileSchema = z
-  .object({
-    id: z.string(),
-    name: z.string(),
-    /** A key into the client's icon registry, not a glyph. Unknown keys draw the default. */
-    icon: z.string().optional(),
-    /** An identity colour name shared with host badges. Unknown values draw unthemed. */
-    color: z.string().optional(),
-    provider: z.string(),
-    model: z.string().optional(),
-    modeId: z.string().optional(),
-    thinkingOptionId: z.string().optional(),
-    featureValues: z.record(z.string(), z.unknown()).optional(),
-    /** Free text, surfaced to orchestrating agents by the `list_profiles` MCP tool. */
-    notes: z.string().optional(),
-  })
-  .passthrough();
-
-export type AgentProfile = z.infer<typeof AgentProfileSchema>;
-
 const MutableBrowserToolsConfigSchema = z
   .object({
     enabled: z.boolean().default(false),
@@ -189,26 +171,6 @@ const MutableRelayConfigSchema = z
   })
   .passthrough();
 
-export const PluginIdSchema = z.string().regex(/^[a-z][a-z0-9-]*$/);
-
-export const DirectoryPluginSourceSchema = z
-  .object({
-    source: z.literal("directory"),
-    path: z.string().min(1),
-    enabled: z.boolean().optional(),
-  })
-  .strict();
-
-export const PluginSourceSchema = z.discriminatedUnion("source", [DirectoryPluginSourceSchema]);
-
-export type PluginSource = z.infer<typeof PluginSourceSchema>;
-
-export const AgentSkillSelectionSchema = z.discriminatedUnion("mode", [
-  z.object({ mode: z.literal("all") }).strict(),
-  z.object({ mode: z.literal("custom"), skills: z.array(z.string()) }).strict(),
-]);
-export type AgentSkillSelection = z.infer<typeof AgentSkillSelectionSchema>;
-
 export const MutableDaemonConfigSchema = z
   .object({
     // COMPAT(relayConfig): added in v0.2.6, remove after 2027-01-31 when old daemons are unsupported.
@@ -341,6 +303,7 @@ export const AgentFeatureSelectSchema = z.object({
   description: z.string().optional(),
   tooltip: z.string().optional(),
   icon: z.string().optional(),
+  desktopTrigger: z.enum(["icon", "label"]).optional(),
   value: z.string().nullable(),
   options: z.array(AgentSelectOptionSchema),
 });
@@ -375,6 +338,7 @@ export const ProviderSnapshotEntrySchema = z.object({
   fetchedAt: z.string().optional(),
   label: z.string().optional(),
   description: z.string().optional(),
+  iconSvg: z.string().optional(),
   defaultModeId: z.string().nullable().optional(),
 });
 
@@ -456,7 +420,7 @@ const McpServerConfigSchema = z.discriminatedUnion("type", [
   McpSseServerConfigSchema,
 ]);
 
-const ProviderOptionsSchema = z.record(z.string(), z.json());
+const ProviderOptionsSchema = z.record(z.string(), z.unknown());
 
 const McpToolRefSchema = z
   .object({
@@ -662,6 +626,7 @@ const ToolCallDetailPayloadSchema: z.ZodType<ToolCallDetail, unknown> = z.discri
 );
 
 const ToolCallBasePayloadSchema = z.object({
+  agentMessage: AgentMessageSchema.optional(),
   type: z.literal("tool_call"),
   callId: z.string(),
   name: z.string(),
@@ -732,6 +697,11 @@ export const AgentTimelineItemPayloadSchema: z.ZodType<AgentTimelineItem, unknow
     type: z.literal("error"),
     message: z.string(),
   }),
+  z.object({
+    type: z.literal("notification"),
+    level: z.enum(["info", "warning", "error"]),
+    message: z.string(),
+  }),
   z.object({
     type: z.literal("compaction"),
     status: z.enum(["loading", "completed"]),
@@ -869,6 +839,8 @@ export const AgentSnapshotPayloadSchema = z.object({
   attentionTimestamp: z.string().nullable().optional(),
   archivedAt: z.string().nullable().optional(),
   providerUnavailable: z.boolean().optional(),
+  // Private helper marker, retained for exact-ID snapshots and older wire messages.
+  internal: z.boolean().optional(),
 });
 
 export type AgentSnapshotPayload = z.infer<typeof AgentSnapshotPayloadSchema>;
@@ -940,6 +912,9 @@ const AgentDirectoryFilterSchema = z.object({
   includeArchived: z.boolean().optional(),
   requiresAttention: z.boolean().optional(),
   thinkingOptionId: z.string().nullable().optional(),
+  // Retained for wire parsing; private helpers are excluded from public discovery.
+  includeInternal: z.boolean().optional(),
+  includeBackground: z.boolean().optional(),
 });
 
 export const DeleteAgentRequestMessageSchema = z.object({
@@ -1025,7 +1000,7 @@ const WorkspaceLabelSyncCursorSchema = z.object({
 export const WorkspaceLabelListRequestSchema = z.object({
   type: z.literal("workspace.label.list.request"),
   requestId: z.string(),
-  subscribe: z.object({ subscriptionId: z.string() }),
+  subscribe: z.object({ subscriptionId: z.string().optional() }).optional(),
   sync: WorkspaceLabelSyncCursorSchema.optional(),
 });
 export const WorkspaceLabelAssignmentSetRequestSchema = z.object({
@@ -1267,6 +1242,7 @@ export const FetchAgentsRequestMessageSchema = z.object({
   type: z.literal("fetch_agents_request"),
   requestId: z.string(),
   scope: z.enum(["active"]).optional(),
+  includeBackground: z.boolean().optional(),
   filter: AgentDirectoryFilterSchema.optional(),
   sort: z
     .array(
@@ -1300,6 +1276,7 @@ const WorkspaceStateBucketSchema = z.enum([
 ]);
 
 export const FetchWorkspacesRequestMessageSchema = z.object({
+  includeBackground: z.boolean().optional(),
   type: z.literal("fetch_workspaces_request"),
   requestId: z.string(),
   filter: z
@@ -1308,6 +1285,9 @@ export const FetchWorkspacesRequestMessageSchema = z.object({
       projectId: z.string().optional(),
       // Unused: accepted so older clients still parse, but the server does not filter on it.
       idPrefix: z.string().optional(),
+      // Retained for wire parsing of older requests.
+      includeInternal: z.boolean().optional(),
+      includeBackground: z.boolean().optional(),
     })
     .optional(),
   sort: z
@@ -1344,9 +1324,8 @@ export const FetchAgentHistoryRequestMessageSchema = z.object({
   type: z.literal("fetch_agent_history_request"),
   requestId: z.string(),
   filter: AgentDirectoryFilterSchema.optional(),
-  // A ranked free-text query over agent title, workspace name, branch, and
-  // project name. Present only on history: agent subscriptions filter on
-  // structure, not on relevance. Ranking replaces `sort` when it is set.
+  // A free-text filter over agent title, workspace name, branch, and project name.
+  // Matching rows follow the requested sort and cursor pagination.
   search: z.string().optional(),
   sort: z
     .array(
@@ -1387,6 +1366,8 @@ export const SendAgentMessageRequestSchema = z.object({
   /** Accepts full ID, unique prefix, or exact full title (server resolves). */
   agentId: z.string(),
   text: z.string(),
+  /** Opaque sender identity for agent-originated prompts. */
+  sourceAgentId: z.string().min(1).optional(),
   messageId: z.string().optional(), // Client-provided ID for deduplication
   activeTurnBehavior: ActiveTurnBehaviorSchema.optional(),
   images: z.array(ImageAttachmentSchema).optional(),
@@ -1483,6 +1464,63 @@ export const PluginSourceInstallRequestSchema = z.object({
   pluginPath: z.string().min(1).optional(),
 });
 
+export const PluginSourceIdentitySchema = z.discriminatedUnion("kind", [
+  z.object({ kind: z.literal("directory"), path: z.string() }),
+  z.object({
+    kind: z.literal("git"),
+    remote: z.string(),
+    pluginPath: z.string(),
+    registry: PluginRegistryIdentitySchema.optional(),
+  }),
+  z.object({
+    kind: z.literal("npm"),
+    packageName: z.string(),
+    pluginPath: z.string(),
+    registry: PluginRegistryIdentitySchema.optional(),
+  }),
+]);
+export const PluginInstallationSchema = z.object({
+  identity: PluginSourceIdentitySchema,
+  currentRevision: z.string().optional(),
+});
+export type PluginInstallation = z.infer<typeof PluginInstallationSchema>;
+export const PluginUpdateTargetSchema = z.discriminatedUnion("kind", [
+  z.object({ kind: z.literal("git"), commit: z.string().regex(/^[0-9a-f]{40,64}$/) }),
+  z.object({
+    kind: z.literal("npm"),
+    version: z.string().min(1),
+    resolved: z.string().url(),
+    integrity: z.string().min(1),
+  }),
+]);
+export type PluginUpdateTarget = z.infer<typeof PluginUpdateTargetSchema>;
+export const PluginUpdateProposalSchema = z.object({
+  id: PluginIdSchema,
+  expected: z.object({
+    identity: PluginSourceIdentitySchema,
+    installationRoot: z.string(),
+    revision: z.string(),
+  }),
+  target: PluginUpdateTargetSchema,
+});
+export type PluginUpdateProposal = z.infer<typeof PluginUpdateProposalSchema>;
+export const PluginUpdateSelectionSchema = z.discriminatedUnion("kind", [
+  z.object({ kind: z.literal("git"), ref: z.string().min(1) }),
+  z.object({ kind: z.literal("npm"), version: z.string().min(1) }),
+]);
+export type PluginUpdateSelection = z.infer<typeof PluginUpdateSelectionSchema>;
+export const PluginUpdatePreviewRequestSchema = z.object({
+  type: z.literal("plugin.source.update.preview.request"),
+  requestId: z.string(),
+  pluginId: PluginIdSchema.optional(),
+  target: PluginUpdateSelectionSchema.optional(),
+});
+export const PluginUpdateApplyRequestSchema = z.object({
+  type: z.literal("plugin.source.update.apply.request"),
+  requestId: z.string(),
+  proposals: z.array(PluginUpdateProposalSchema).min(1),
+});
+
 export const PluginSourceStatusRequestSchema = z.object({
   type: z.literal("plugin.source.status.request"),
   requestId: z.string(),
@@ -1669,6 +1707,8 @@ export type CreateAgentWorktreeTarget = z.infer<typeof CreateAgentWorktreeTarget
 
 export const CreateAgentRequestMessageSchema = z.object({
   type: z.literal("create_agent_request"),
+  // Legacy create_agent_request uses a separate initial-message receipt when keyed.
+  idempotencyKey: z.string().min(1).max(512).optional(),
   config: AgentSessionConfigSchema,
   env: z.record(z.string(), z.string()).optional(),
   workspaceId: z.string().optional(),
@@ -1684,10 +1724,44 @@ export const CreateAgentRequestMessageSchema = z.object({
   git: GitSetupOptionsSchema.optional(),
   worktree: CreateAgentWorktreeTargetSchema.optional(),
   autoArchive: z.boolean().optional(),
+  // An ephemeral helper: the daemon never persists, lists, flags or announces
+  // it, and plugin lifecycle hooks skip it. Lives on the request rather than
+  // in the config schema, which is reused for updates. Retained for wire parsing;
+  // public internal creation is no longer supported.
+  internal: z.boolean().optional(),
+  // Workspace creation intent, rejected when selecting an existing workspace.
+  background: z.boolean().optional(),
   labels: z.record(z.string(), z.string()).default({}),
   requestId: z.string(),
 });
 
+/** Resource IDs are optional on creation; supplied IDs retain their identity on replay. */
+export const AgentCreateRequestSchema = CreateAgentRequestMessageSchema.extend({
+  type: z.literal("agent.create.request"),
+  agentId: z.uuid().optional(),
+  attachments: z.array(AgentAttachmentSchema).optional(),
+  subscribe: z.boolean().optional(),
+});
+
+export const WorkspaceInitialAgentSchema = AgentCreateRequestSchema.omit({
+  type: true,
+  requestId: true,
+  idempotencyKey: true,
+  subscribe: true,
+  workspaceId: true,
+  worktree: true,
+  worktreeName: true,
+  git: true,
+});
+
+export const CreationSubscribeRequestSchema = z.object({
+  type: z.literal("creation.subscribe.request"),
+  requestId: z.string(),
+  kind: z.enum(["workspace", "agent"]),
+  idempotencyKey: z.string().min(1).max(512),
+  subscribe: z.boolean().optional(),
+});
+
 export const ListProviderModelsRequestMessageSchema = z.object({
   type: z.literal("list_provider_models_request"),
   provider: AgentProviderSchema,
@@ -1733,6 +1807,14 @@ export const ProviderUsageListRequestMessageSchema = z.object({
   requestId: z.string(),
 });
 
+export const UsageListReportsRequestMessageSchema = z.object({
+  type: z.literal("usage.list_reports.request"),
+  agentId: z.string().optional(),
+  requestId: z.string(),
+  reportIds: z.array(z.string()).optional(),
+  forceRefresh: z.boolean().optional(),
+});
+
 export const ResumeAgentRequestMessageSchema = z.object({
   type: z.literal("resume_agent_request"),
   handle: AgentPersistenceHandleSchema,
@@ -1799,6 +1881,14 @@ export const FetchAgentTimelineRequestMessageSchema = z.object({
   mergeWindow: z.boolean().optional(),
 });
 
+export const AgentTimelineSearchRequestMessageSchema = z.object({
+  type: z.literal("agent.timeline.search.request"),
+  agentId: z.string(),
+  requestId: z.string(),
+  query: z.string(),
+  cursor: z.number().int().nonnegative().optional(),
+});
+
 export const AgentTimelineListPromptsRequestMessageSchema = z.object({
   type: z.literal("agent.timeline.list_prompts.request"),
   agentId: z.string(),
@@ -2103,7 +2193,14 @@ export const CheckoutStatusRequestSchema = z.object({
 
 export const SubscribeCheckoutDiffRequestSchema = z.object({
   type: z.literal("subscribe_checkout_diff_request"),
-  subscriptionId: z.string(),
+  subscriptionId: z.string().optional(),
+  cwd: z.string(),
+  compare: CheckoutDiffCompareSchema,
+  requestId: z.string(),
+});
+
+export const CheckoutDiffGetRequestSchema = z.object({
+  type: z.literal("checkout.diff.get.request"),
   cwd: z.string(),
   compare: CheckoutDiffCompareSchema,
   requestId: z.string(),
@@ -2541,11 +2638,22 @@ export const ArchiveWorkspaceRequestSchema = z.object({
 // between an existing local directory and a newly created paseo worktree.
 export const WorkspaceCreateRequestSchema = z.object({
   type: z.literal("workspace.create.request"),
+  workspaceId: z
+    .string()
+    .regex(/^wks_[a-f0-9]{16}$/)
+    .optional(),
+  agent: WorkspaceInitialAgentSchema.optional(),
+  subscribe: z.boolean().optional(),
   requestId: z.string(),
+  idempotencyKey: z.string().min(1).max(512).optional(),
   // Optional user-set title applied to the created workspace.
   title: z.string().optional(),
   // Optional prompt context for workspace-level name/branch generation.
   firstAgentContext: FirstAgentContextSchema.optional(),
+  // Retained for wire parsing; public internal creation is no longer supported.
+  internal: z.boolean().optional(),
+  background: z.boolean().optional(),
+  callerAgentId: z.string().optional(),
   source: z.discriminatedUnion("kind", [
     z.object({
       kind: z.literal("directory"),
@@ -2580,6 +2688,12 @@ export const WorkspaceClearAttentionRequestSchema = z.object({
   requestId: z.string(),
 });
 
+export const WorkspaceMarkUnreadRequestSchema = z.object({
+  type: z.literal("workspace.mark_unread.request"),
+  workspaceId: z.string(),
+  requestId: z.string(),
+});
+
 // Highlighted diff token schema
 // Note: style can be a compound class name (e.g., "heading meta") from the syntax highlighter
 const HighlightTokenSchema = z.object({
@@ -2673,7 +2787,7 @@ export const FileSubscribeRequestSchema = z.object({
   type: z.literal("fs.file.subscribe.request"),
   cwd: z.string(),
   path: z.string(),
-  subscriptionId: z.string(),
+  subscriptionId: z.string().optional(),
   requestId: z.string(),
 });
 
@@ -2828,6 +2942,7 @@ export const ListTerminalsRequestSchema = z.object({
 
 export const SubscribeTerminalsRequestSchema = z.object({
   type: z.literal("subscribe_terminals_request"),
+  requestId: z.string().optional(),
   cwd: z.string(),
   workspaceId: z.string().optional(),
 });
@@ -3027,7 +3142,63 @@ export const HubExecutionControlRequestSchema = z.object({
 
 export type HubExecutionControlRequest = z.infer<typeof HubExecutionControlRequestSchema>;
 
+// These connection event streams have no directory bootstrap or timeline membership.
+export const SessionEventSubscriptionSchema = z.enum([
+  "project.update",
+  "providers_snapshot_update",
+  "agent_attention_required",
+  "agent_permission_request",
+  "agent_permission_resolved",
+  "checkout_status_update",
+  "script_status_update",
+  "workspace_setup_progress",
+  "agent.provider_subagents.update",
+  "terminal_attention_required",
+  "status.server_info",
+  "status.daemon_config_changed",
+  "status.plugin_catalog_changed",
+  "status.plugin_settings_changed",
+  "activity_log",
+  "hub.execution.agent.update",
+  "hub.execution.agent.stream",
+]);
+export type SessionEventSubscription = z.infer<typeof SessionEventSubscriptionSchema>;
+export const SessionEventsSetSubscriptionRequestSchema = z.object({
+  type: z.literal("session.events.set_subscription.request"),
+  requestId: z.string(),
+  events: z.array(SessionEventSubscriptionSchema),
+  notifications: z.boolean().optional(),
+});
+export const SessionEventsSetSubscriptionResponseSchema = z.object({
+  type: z.literal("session.events.set_subscription.response"),
+  payload: z.object({ requestId: z.string(), subscriptionId: z.string().optional() }),
+});
+
+export const BrowserHostRegisterRequestSchema = z.object({
+  type: z.literal("browser.host.register.request"),
+  requestId: z.string(),
+  hostKind: z.string().min(1),
+  supportedCommands: z.array(z.enum(BROWSER_AUTOMATION_COMMAND_NAMES)).min(1),
+});
+export const BrowserHostRegisterResponseSchema = z.object({
+  type: z.literal("browser.host.register.response"),
+  payload: z.object({ requestId: z.string(), subscriptionId: z.string() }),
+});
+
+export const SubscriptionReleaseRequestSchema = z.object({
+  type: z.literal("subscription.release.request"),
+  requestId: z.string(),
+  subscriptionId: z.string(),
+});
+export const SubscriptionReleaseResponseSchema = z.object({
+  type: z.literal("subscription.release.response"),
+  payload: z.object({ requestId: z.string(), subscriptionId: z.string() }),
+});
+
 export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
+  BrowserHostRegisterRequestSchema,
+  SubscriptionReleaseRequestSchema,
+  SessionEventsSetSubscriptionRequestSchema,
   HubExecutionAgentCreateRequestSchema,
   HubExecutionAgentValidateRequestSchema,
   HubExecutionControlRequestSchema,
@@ -3076,6 +3247,8 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
   PluginSourceInstallRequestSchema,
   PluginSourceStatusRequestSchema,
   PluginSourceUpdateRequestSchema,
+  PluginUpdatePreviewRequestSchema,
+  PluginUpdateApplyRequestSchema,
   PluginReloadRequestSchema,
   PluginEnableRequestSchema,
   PluginDisableRequestSchema,
@@ -3104,6 +3277,7 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
   RefreshProvidersSnapshotRequestMessageSchema,
   ProviderDiagnosticRequestMessageSchema,
   ProviderUsageListRequestMessageSchema,
+  UsageListReportsRequestMessageSchema,
   ResumeAgentRequestMessageSchema,
   ImportAgentRequestMessageSchema,
   RefreshAgentRequestMessageSchema,
@@ -3112,6 +3286,7 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
   RestartServerRequestMessageSchema,
   DaemonUpdateRequestMessageSchema,
   FetchAgentTimelineRequestMessageSchema,
+  AgentTimelineSearchRequestMessageSchema,
   AgentTimelineListPromptsRequestMessageSchema,
   ProviderSubagentListRequestMessageSchema,
   ProviderSubagentTimelineRequestMessageSchema,
@@ -3126,6 +3301,7 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
   AgentRewindRequestMessageSchema,
   AgentPermissionResponseMessageSchema,
   CheckoutStatusRequestSchema,
+  CheckoutDiffGetRequestSchema,
   SubscribeCheckoutDiffRequestSchema,
   UnsubscribeCheckoutDiffRequestSchema,
   CheckoutCommitRequestSchema,
@@ -3169,7 +3345,10 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
   ProjectGithubCloneRequestSchema,
   ArchiveWorkspaceRequestSchema,
   WorkspaceCreateRequestSchema,
+  AgentCreateRequestSchema,
+  CreationSubscribeRequestSchema,
   WorkspaceClearAttentionRequestSchema,
+  WorkspaceMarkUnreadRequestSchema,
   FileExplorerRequestSchema,
   FileSubscribeRequestSchema,
   FileUnsubscribeRequestSchema,
@@ -3232,6 +3411,7 @@ export type SessionInboundMessage = z.infer<typeof SessionInboundMessageSchema>;
 // ============================================================================
 
 export const ActivityLogPayloadSchema = z.object({
+  subscriptionId: z.string().optional(),
   id: z.string(),
   timestamp: z.coerce.date(),
   type: z.enum(["transcript", "assistant", "tool_call", "tool_result", "error", "system"]),
@@ -3380,6 +3560,7 @@ const ServerCapabilitiesFromUnknownSchema = z
 export const ServerInfoStatusPayloadSchema = z
   .object({
     status: z.literal("server_info"),
+    protocolVersion: z.number().int().optional(),
     serverId: z.string().trim().min(1),
     hostname: ServerInfoHostnameSchema.optional(),
     version: ServerInfoVersionSchema.optional(),
@@ -3391,15 +3572,30 @@ export const ServerInfoStatusPayloadSchema = z
     // COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
     features: z
       .object({
+        // COMPAT(agentRequestReceipts): added in v0.8.0; remove gate after 2027-03-05.
+        agentRequestReceipts: z.boolean().optional(),
+        // COMPAT(workspaceRequestReceipts): added in v0.8.0; remove gate after 2027-03-07.
+        workspaceRequestReceipts: z.boolean().optional(),
+        creationLifecycle: z.boolean().optional(),
+        // COMPAT(hubAgentRpc): added in v0.8.0; remove gate after 2027-03-05.
+        hubAgentRpc: z.boolean().optional(),
+        // COMPAT(internalAgents): added in v0.9.0; remove gate after 2027-03-17.
+        internalAgents: z.boolean().optional(),
+        // COMPAT(internalWorkspaces): added in v0.9.0; remove gate after 2027-03-17.
+        internalWorkspaces: z.boolean().optional(),
+        backgroundWorkspaces: z.boolean().optional(),
         providersSnapshot: z.boolean().optional(),
+        usageSources: z.boolean().optional(),
         // COMPAT(providersSnapshotCwd): added in v0.3.2, remove gate after 2027-02-10.
         providersSnapshotCwd: z.boolean().optional(),
         // COMPAT(directorySync): added in v0.3.x, remove gate after 2027-02-12.
         directorySync: z.boolean().optional(),
         // COMPAT(workspaceLabels): added in v0.5.0, remove after 2027-08-14.
         workspaceLabels: z.boolean().optional(),
-        // COMPAT(workspaceSetupRun): added in v0.7.3, remove gate after 2027-09-02.
+        // COMPAT(workspaceSetupRun): added in v0.8.0, remove gate after 2027-09-02.
         workspaceSetupRun: z.boolean().optional(),
+        // COMPAT(workspaceTerminals): added in v0.8.0, remove gate after 2027-09-05.
+        workspaceTerminals: z.boolean().optional(),
         // COMPAT(checkoutForgeSetAutoMerge): added in v0.2.0-beta.1. Remove the
         // feature gate and checkoutGithubSetAutoMerge fallback after 2027-01-17
         // once the supported daemon floor is >= v0.2.0.
@@ -3436,10 +3632,15 @@ export const ServerInfoStatusPayloadSchema = z
         pluginLogs: z.boolean().optional(),
         // COMPAT(pluginGitManagement): added in v0.7.0, remove gate after 2027-08-26.
         pluginGitManagement: z.boolean().optional(),
+        // COMPAT(pluginSourceInstallation): added in v0.8.0; remove gate after 2027-03-16 once daemon floor supports source identifiers.
+        pluginSourceInstallation: z.boolean().optional(),
+        // COMPAT(pluginSourceUpdates): added in v0.8.0; remove gate after 2027-03-16 once daemon floor supports reviewed updates.
+        pluginSourceUpdates: z.boolean().optional(),
         // COMPAT(pluginThemes): added in v0.5.0, remove gate after 2027-08-20.
         // A daemon that predates this flag keeps `addTheme` in the server bundle it compiles,
         // so a theme plugin cannot start there at all.
         pluginThemes: z.boolean().optional(),
+        pluginSettings: z.boolean().optional(),
         pluginTimelineItems: z.boolean().optional(),
         // COMPAT(skillManagement): added in v0.4.0, remove gate after 2027-08-16.
         skillManagement: z.boolean().optional(),
@@ -3485,8 +3686,14 @@ export const ServerInfoStatusPayloadSchema = z
         agentForkContextCursor: z.boolean().optional(),
         // COMPAT(providerSubagents): added in v0.1.107, remove gate after 2027-01-12.
         providerSubagents: z.boolean().optional(),
+        // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove gates after 2027-03-14; retain wire field.
+        projectedSubagentTimeline: z.boolean().optional(),
+        // COMPAT(providerSubagentNesting): added in v0.7, remove gate after 2027-03-04.
+        providerSubagentNesting: z.boolean().optional(),
         // COMPAT(workspacePinning): added in v0.1.107, remove gate after 2027-01-12.
         workspacePinning: z.boolean().optional(),
+        // COMPAT(workspaceMarkUnread): added in v0.5.0, remove after 2027-08-20.
+        workspaceMarkUnread: z.boolean().optional(),
         // COMPAT(hubRelationship): added in v0.1.X, drop the gate when floor >= v0.1.X.
         hubRelationship: z.boolean().optional(),
         // COMPAT(projectGithubClone): added in v0.1.108, remove gate after 2027-01-15.
@@ -3505,7 +3712,7 @@ export const ServerInfoStatusPayloadSchema = z
         providerRemoval: z.boolean().optional(),
         // COMPAT(importSessionWorkspaceTarget): added in v0.1.110, remove gate after 2027-01-16.
         importSessionWorkspaceTarget: z.boolean().optional(),
-        // COMPAT(importSessionSearch): added in v0.7.3, remove gate after 2027-03-02.
+        // COMPAT(importSessionSearch): added in v0.8.0, remove gate after 2027-03-02.
         importSessionSearch: z.boolean().optional(),
         // COMPAT(forgeProviders): added in v0.2.0-beta.1. Drop the gate after
         // 2027-01-17 once the supported daemon floor is >= v0.2.0.
@@ -3514,8 +3721,11 @@ export const ServerInfoStatusPayloadSchema = z
         forgeProviders: z.boolean().optional(),
         // COMPAT(selectiveAgentTimeline): added in v0.1.106, remove after 2027-01-12.
         selectiveAgentTimeline: z.boolean().optional(),
+        explicitEventSubscriptions: z.boolean().optional(),
+        ownedSubscriptions: z.boolean().optional(),
         // COMPAT(canonicalSubmittedPrompts): added in v0.2.6, remove gate after 2027-01-30.
         canonicalSubmittedPrompts: z.boolean().optional(),
+        agentMessageProvenance: z.boolean().optional(),
         // COMPAT(agentTurnIdentity): accept peers that observed pre-release v0.2.6 through 2027-01-31.
         agentTurnIdentity: z.boolean().optional(),
         // COMPAT(stableProjectIdentity): added in v0.1.109, remove gate after 2027-01-15.
@@ -3637,6 +3847,12 @@ export const PluginCatalogChangedStatusPayloadSchema = z.object({
   pluginId: PluginIdSchema,
 });
 
+export const PluginSettingsChangedStatusPayloadSchema = z.object({
+  status: z.literal("plugin_settings_changed"),
+  pluginId: PluginIdSchema,
+  settingsId: z.string(),
+});
+
 export const KnownStatusPayloadSchema = z.discriminatedUnion("status", [
   AgentCreatedStatusPayloadSchema,
   AgentCreateFailedStatusPayloadSchema,
@@ -3646,6 +3862,7 @@ export const KnownStatusPayloadSchema = z.discriminatedUnion("status", [
   RestartRequestedStatusPayloadSchema,
   DaemonConfigChangedStatusPayloadSchema,
   PluginCatalogChangedStatusPayloadSchema,
+  PluginSettingsChangedStatusPayloadSchema,
 ]);
 
 export type KnownStatusPayload = z.infer<typeof KnownStatusPayloadSchema>;
@@ -3833,6 +4050,9 @@ export const WorkspaceDescriptorPayloadSchema = z
     pinnedAt: z.string().nullable().optional(),
     // COMPAT(workspaceLabels): added in v0.5.0, remove optional after 2027-08-14.
     labels: z.array(z.string()).optional(),
+    // Retained for wire parsing of older daemon descriptors.
+    internal: z.boolean().optional(),
+    background: z.boolean().optional(),
     archivingAt: z.string().nullable().optional().default(null),
     status: WorkspaceStateBucketSchema,
     // Best-effort workspace status entry timestamp. Old daemons omit the
@@ -3875,6 +4095,7 @@ export const AgentUpdateMessageSchema = z.object({
   type: z.literal("agent_update"),
   payload: z.discriminatedUnion("kind", [
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("upsert"),
       agent: AgentSnapshotPayloadSchema,
       project: ProjectPlacementPayloadSchema.nullable().optional(),
@@ -3882,6 +4103,7 @@ export const AgentUpdateMessageSchema = z.object({
       seq: z.number().int().positive().optional(),
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("remove"),
       agentId: z.string(),
       generation: z.string().optional(),
@@ -3893,6 +4115,7 @@ export const AgentUpdateMessageSchema = z.object({
 export const AgentStreamMessageSchema = z.object({
   type: z.literal("agent_stream"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentId: z.string(),
     event: AgentStreamEventPayloadSchema,
     timestamp: z.string(),
@@ -3935,13 +4158,10 @@ export type AgentSearchMatch = z.infer<typeof AgentSearchMatchSchema>;
 const AgentDirectoryResponseEntrySchema = z.object({
   agent: AgentSnapshotPayloadSchema,
   project: ProjectPlacementPayloadSchema,
-  // Relevance of this entry to the request's `search`, lower being better.
-  // Set only when the request carried a query; a client merging results from
-  // several hosts needs it to interleave their separately ranked pages.
+  // Legacy relevance metadata remains accepted from older daemons.
+  // Current history responses use the requested chronological sort.
   searchScore: z.number().optional(),
-  // Where the query matched, so the row can mark it. The ranker computes this
-  // anyway; sending it keeps the client from re-deriving a second opinion that
-  // could disagree with the ranking it is explaining.
+  // Legacy server-generated highlights. Current clients highlight displayed text locally.
   searchMatches: z.array(AgentSearchMatchSchema).optional(),
   // COMPAT(directorySync): sequence of this latest directory projection.
   syncSeq: z.number().int().positive().optional(),
@@ -3970,9 +4190,7 @@ export const FetchAgentHistoryResponseMessageSchema = z.object({
     requestId: z.string(),
     entries: z.array(AgentDirectoryResponseEntrySchema),
     pageInfo: AgentDirectoryPageInfoSchema,
-    // More sessions matched the request's `search` than the page could hold.
-    // Distinct from `pageInfo.hasMore`, which promises a fetchable next page —
-    // a ranked result set has none, and the way on is a narrower query.
+    // Older daemons truncate relevance-ranked searches instead of returning a cursor.
     searchTruncated: z.boolean().optional(),
   }),
 });
@@ -4039,12 +4257,14 @@ export const WorkspaceUpdateMessageSchema = z.object({
   type: z.literal("workspace_update"),
   payload: z.discriminatedUnion("kind", [
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("upsert"),
       workspace: WorkspaceDescriptorPayloadSchema,
       generation: z.string().optional(),
       seq: z.number().int().positive().optional(),
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("remove"),
       id: z.string(),
       // COMPAT(workspaceProjects): added in v0.1.97, drop the optional gate when floor >= v0.1.97.
@@ -4073,6 +4293,7 @@ export const WorkspaceLabelListResponseSchema = z.object({
   type: z.literal("workspace.label.list.response"),
   payload: z.object({
     requestId: z.string(),
+    subscriptionId: z.string().optional(),
     labels: z.array(WorkspaceLabelDefinitionSchema),
     sync: WorkspaceLabelSyncMetadataSchema,
   }),
@@ -4081,6 +4302,7 @@ export const WorkspaceLabelUpdateSchema = z.object({
   type: z.literal("workspace.label.update"),
   payload: z.discriminatedUnion("kind", [
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("upsert"),
       label: WorkspaceLabelDefinitionSchema,
       previousName: z.string().optional(),
@@ -4088,6 +4310,7 @@ export const WorkspaceLabelUpdateSchema = z.object({
       seq: z.number().int().positive(),
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("remove"),
       name: z.string(),
       generation: z.string(),
@@ -4130,12 +4353,14 @@ export const ProjectUpdateMessageSchema = z.object({
   type: z.literal("project.update"),
   payload: z.discriminatedUnion("kind", [
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("upsert"),
       project: WorkspaceProjectDescriptorPayloadSchema,
       generation: z.string().optional(),
       seq: z.number().int().positive().optional(),
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("remove"),
       projectId: z.string(),
       generation: z.string().optional(),
@@ -4156,6 +4381,7 @@ export const ProjectListResponseMessageSchema = z.object({
 export const ScriptStatusUpdateMessageSchema = z.object({
   type: z.literal("script_status_update"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     workspaceId: z.string(),
     scripts: z.array(WorkspaceScriptPayloadSchema),
   }),
@@ -4164,6 +4390,7 @@ export const ScriptStatusUpdateMessageSchema = z.object({
 export const WorkspaceSetupProgressMessageSchema = z.object({
   type: z.literal("workspace_setup_progress"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     workspaceId: z.string(),
     status: z.enum(["running", "completed", "failed", "blocked"]),
     detail: WorktreeSetupDetailPayloadSchema,
@@ -4425,11 +4652,32 @@ export const FetchAgentTimelineResponseMessageSchema = z.object({
 export const AgentTimelineReplacementMessageSchema = z.object({
   type: z.literal("agent.timeline.replacement"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentId: z.string(),
     epoch: z.string(),
   }),
 });
 
+export const AgentTimelineSearchResponseMessageSchema = z.object({
+  type: z.literal("agent.timeline.search.response"),
+  payload: z.object({
+    requestId: z.string(),
+    agentId: z.string(),
+    epoch: z.string(),
+    locations: z.array(
+      z.object({
+        seq: z.number().int().nonnegative(),
+        role: z.enum(["user", "assistant"]),
+        // Estimated occurrences in the message; the client verifies against rendered text.
+        // COMPAT(timelineSearchCount): added in v0.9.0, remove optional after 2027-09-22.
+        count: z.number().int().positive().optional(),
+      }),
+    ),
+    nextCursor: z.number().int().nonnegative().nullable(),
+    error: z.string().nullable(),
+  }),
+});
+
 export const AgentTimelineListPromptsResponseMessageSchema = z.object({
   type: z.literal("agent.timeline.list_prompts.response"),
   payload: z.object({
@@ -4450,6 +4698,8 @@ export const AgentTimelineListPromptsResponseMessageSchema = z.object({
 export const ProviderSubagentDescriptorPayloadSchema = z.object({
   id: z.string(),
   parentAgentId: z.string(),
+  // COMPAT(providerSubagentNesting): added in v0.7, remove optional after 2027-03-04.
+  parentSubagentId: z.string().nullable().optional(),
   provider: AgentProviderSchema,
   title: z.string().nullable(),
   description: z.string().nullable(),
@@ -4486,6 +4736,9 @@ export const ProviderSubagentTimelineResponseMessageSchema = z.object({
     provider: AgentProviderSchema.nullable(),
     direction: z.enum(["tail", "before", "after"]),
     epoch: z.string(),
+    projection: z.literal("projected").optional(),
+    startCursor: AgentTimelineCursorSchema.nullable().optional(),
+    endCursor: AgentTimelineCursorSchema.nullable().optional(),
     reset: z.boolean(),
     staleCursor: z.boolean(),
     gap: z.boolean(),
@@ -4501,6 +4754,16 @@ export const ProviderSubagentTimelineResponseMessageSchema = z.object({
         item: AgentTimelineItemPayloadSchema,
         timestamp: z.string(),
         seq: z.number().int().nonnegative(),
+        seqStart: z.number().int().nonnegative().optional(),
+        seqEnd: z.number().int().nonnegative().optional(),
+        sourceSeqRanges: z
+          .array(
+            z.object({
+              startSeq: z.number().int().nonnegative(),
+              endSeq: z.number().int().nonnegative(),
+            }),
+          )
+          .optional(),
       }),
     ),
     error: z.string().nullable(),
@@ -4511,10 +4774,12 @@ export const ProviderSubagentUpdateMessageSchema = z.object({
   type: z.literal("agent.provider_subagents.update"),
   payload: z.discriminatedUnion("kind", [
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("upsert"),
       subagent: ProviderSubagentDescriptorPayloadSchema,
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("timeline"),
       parentAgentId: z.string(),
       subagentId: z.string(),
@@ -4525,6 +4790,7 @@ export const ProviderSubagentUpdateMessageSchema = z.object({
       epoch: z.string(),
     }),
     z.object({
+      subscriptionId: z.string().optional(),
       kind: z.literal("remove"),
       parentAgentId: z.string(),
       subagentId: z.string(),
@@ -4535,6 +4801,7 @@ export const ProviderSubagentUpdateMessageSchema = z.object({
 export const SetAgentTimelineSubscriptionResponseMessageSchema = z.object({
   type: z.literal("agent.timeline.set_subscription.response"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentIds: z.array(z.string()),
     requestId: z.string(),
   }),
@@ -4543,6 +4810,7 @@ export const SetAgentTimelineSubscriptionResponseMessageSchema = z.object({
 export const AgentAttentionRequiredMessageSchema = z.object({
   type: z.literal("agent_attention_required"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentId: z.string(),
     reason: z.enum(["finished", "error", "permission"]),
     timestamp: z.string(),
@@ -4594,9 +4862,63 @@ export const ClearAgentAttentionResponseMessageSchema = z.object({
   }),
 });
 
+export const CreationSnapshotSchema = z.object({
+  kind: z.enum(["workspace", "agent"]),
+  idempotencyKey: z.string(),
+  revision: z.number().int().nonnegative(),
+  phase: z.enum([
+    "accepted",
+    "workspace_ready",
+    "agent_ready",
+    "prompt_started",
+    "completed",
+    "failed",
+  ]),
+  workspaceId: z.string().nullable(),
+  agentId: z.string().nullable(),
+  workspace: WorkspaceDescriptorPayloadSchema.optional(),
+  agent: AgentSnapshotPayloadSchema.optional(),
+  error: z.string().nullable(),
+  setupSkippedReason: z.string().optional(),
+  errorCode: z.string().optional(),
+  failedStage: z.enum(["workspace", "agent", "prompt"]).optional(),
+  outcomeUnknown: z.boolean().optional(),
+});
+export type CreationSnapshot = z.infer<typeof CreationSnapshotSchema>;
+export type AgentCreateRequest = z.infer<typeof AgentCreateRequestSchema>;
+export type WorkspaceInitialAgent = z.infer<typeof WorkspaceInitialAgentSchema>;
+
+export const WorkspaceCreationUpdateSchema = z.object({
+  type: z.literal("workspace.create.update"),
+  payload: CreationSnapshotSchema.extend({ subscriptionId: z.string().optional() }),
+});
+export const AgentCreationUpdateSchema = WorkspaceCreationUpdateSchema.extend({
+  type: z.literal("agent.create.update"),
+});
+export const CreationSubscribeResponseSchema = z.object({
+  type: z.literal("creation.subscribe.response"),
+  payload: z.object({
+    requestId: z.string(),
+    subscriptionId: z.string().optional(),
+    snapshot: CreationSnapshotSchema.nullable(),
+    error: z.string().nullable(),
+  }),
+});
+export const AgentCreateResponseSchema = z.object({
+  type: z.literal("agent.create.response"),
+  payload: z.object({
+    requestId: z.string(),
+    agent: AgentSnapshotPayloadSchema.nullable(),
+    error: z.string().nullable(),
+    creation: CreationSnapshotSchema.optional(),
+  }),
+});
+
 export const WorkspaceCreateResponseSchema = z.object({
   type: z.literal("workspace.create.response"),
   payload: z.object({
+    agent: AgentSnapshotPayloadSchema.optional(),
+    creation: CreationSnapshotSchema.optional(),
     workspace: WorkspaceDescriptorPayloadSchema.nullable(),
     setupTerminalId: z.string().nullable(),
     setupSkippedReason: z.string().optional(),
@@ -4625,6 +4947,17 @@ export const WorkspaceClearAttentionResponseSchema = z.object({
   }),
 });
 
+export const WorkspaceMarkUnreadResponseSchema = z.object({
+  type: z.literal("workspace.mark_unread.response"),
+  payload: z.object({
+    requestId: z.string(),
+    workspaceId: z.string(),
+    markedAgentId: z.string().nullable(),
+    success: z.boolean(),
+    error: z.string().nullable(),
+  }),
+});
+
 export const SendAgentMessageResponseMessageSchema = z.object({
   type: z.literal("send_agent_message_response"),
   payload: z.object({
@@ -4815,6 +5148,7 @@ export const WriteProjectConfigResponseMessageSchema = z.object({
 export const AgentPermissionRequestMessageSchema = z.object({
   type: z.literal("agent_permission_request"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentId: z.string(),
     request: AgentPermissionRequestPayloadSchema,
   }),
@@ -4823,6 +5157,7 @@ export const AgentPermissionRequestMessageSchema = z.object({
 export const AgentPermissionResolvedMessageSchema = z.object({
   type: z.literal("agent_permission_resolved"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     agentId: z.string(),
     requestId: z.string(),
     resolution: AgentPermissionResponseSchema,
@@ -5063,6 +5398,7 @@ const CheckoutPrStatusPayloadSchema = z.object({
 });
 
 const CheckoutStatusUpdateMetadataSchema = z.object({
+  subscriptionId: z.string().optional(),
   prStatus: CheckoutPrStatusPayloadSchema.optional(),
 });
 
@@ -5093,6 +5429,13 @@ export const SubscribeCheckoutDiffResponseSchema = z.object({
   }),
 });
 
+export const CheckoutDiffGetResponseSchema = z.object({
+  type: z.literal("checkout.diff.get.response"),
+  payload: CheckoutDiffSubscriptionPayloadSchema.omit({ subscriptionId: true }).extend({
+    requestId: z.string(),
+  }),
+});
+
 export const CheckoutDiffUpdateSchema = z.object({
   type: z.literal("checkout_diff_update"),
   payload: CheckoutDiffSubscriptionPayloadSchema,
@@ -5846,6 +6189,7 @@ export const GetProvidersSnapshotResponseMessageSchema = z.object({
     entries: z.array(ProviderSnapshotEntrySchema),
     compactSnapshot: CompactProviderSnapshotSchema.optional(),
     snapshotHash: z.string().optional(),
+    fetchedAt: z.record(z.string(), z.string()).optional(),
     notModified: z.boolean().optional(),
     generatedAt: z.string(),
     requestId: z.string(),
@@ -5856,10 +6200,12 @@ export const GetProvidersSnapshotResponseMessageSchema = z.object({
 export const ProvidersSnapshotUpdateMessageSchema = z.object({
   type: z.literal("providers_snapshot_update"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     cwd: z.string().optional(),
     entries: z.array(ProviderSnapshotEntrySchema),
     compactSnapshot: CompactProviderSnapshotSchema.optional(),
     snapshotHash: z.string().optional(),
+    fetchedAt: z.record(z.string(), z.string()).optional(),
     generatedAt: z.string(),
   }),
 });
@@ -5889,6 +6235,13 @@ export const ProviderUsageStatusSchema = z.enum(["available", "unavailable", "er
 export const ProviderUsageWindowSchema = z.object({
   id: z.string(),
   label: z.string(),
+  /**
+   * A few characters naming the window where space is tight, e.g. "5h" or "wk". An empty string
+   * shows the percent alone; leaving it out shows `label`.
+   */
+  shortLabel: z.string().optional(),
+  /** Shown in the usage summary until the user pins windows of their own. */
+  summary: z.boolean().optional(),
   usedPct: z.number().nullable().optional(),
   remainingPct: z.number().nullable().optional(),
   resetsAt: z.string().nullable().optional(),
@@ -5938,6 +6291,59 @@ export const ProviderUsageListResponseMessageSchema = z.object({
   }),
 });
 
+export const UsageProblemSchema = z.discriminatedUnion("kind", [
+  z.object({
+    kind: z.literal("expired"),
+    expiresAt: z.iso.datetime(),
+    refreshedBy: z.string().optional(),
+  }),
+  z.object({
+    kind: z.literal("rejected"),
+    status: z.number().int(),
+    refreshedBy: z.string().optional(),
+  }),
+  z.object({ kind: z.literal("no_quota"), detail: z.string() }),
+]);
+export const UsageReportSchema = z.discriminatedUnion("status", [
+  z.object({
+    status: z.literal("available"),
+    planLabel: z.string().optional(),
+    windows: z.array(ProviderUsageWindowSchema),
+    balances: z.array(ProviderUsageBalanceSchema).optional(),
+    details: z.array(ProviderUsageDetailSchema).optional(),
+  }),
+  z.object({ status: z.literal("unavailable"), problem: UsageProblemSchema }),
+  z.object({ status: z.literal("error"), error: z.string() }),
+]);
+export const UsageReportEntrySchema = z.object({
+  id: z.string(),
+  account: z.object({ label: z.string().optional() }),
+  fetchedAt: z.string(),
+  sourceId: z.string(),
+  sourceLabel: z.string(),
+  icon: z.string().optional(),
+  report: UsageReportSchema,
+  loginErrors: z
+    .array(
+      z.object({
+        harness: z.string(),
+        report: z.discriminatedUnion("status", [
+          z.object({ status: z.literal("unavailable"), problem: UsageProblemSchema }),
+          z.object({ status: z.literal("error"), error: z.string() }),
+        ]),
+      }),
+    )
+    .optional(),
+});
+export const UsageListReportsUpdateMessageSchema = z.object({
+  type: z.literal("usage.list_reports.update"),
+  payload: z.object({ requestId: z.string(), report: UsageReportEntrySchema }),
+});
+export const UsageListReportsResponseMessageSchema = z.object({
+  type: z.literal("usage.list_reports.response"),
+  payload: z.object({ requestId: z.string(), error: z.string().nullable() }),
+});
+
 const AgentSlashCommandSchema = z.object({
   name: z.string(),
   description: z.string(),
@@ -6012,7 +6418,7 @@ export const ListTerminalsResponseSchema = z.object({
   type: z.literal("list_terminals_response"),
   payload: z.object({
     cwd: z.string().optional(),
-    terminals: z.array(TerminalInfoSchema.omit({ cwd: true })),
+    terminals: z.array(TerminalInfoSchema.partial({ cwd: true })),
     requestId: z.string(),
   }),
 });
@@ -6020,6 +6426,9 @@ export const ListTerminalsResponseSchema = z.object({
 export const TerminalsChangedSchema = z.object({
   type: z.literal("terminals_changed"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
+    requestId: z.string().optional(),
+    workspaceId: z.string().optional(),
     cwd: z.string(),
     terminals: z.array(TerminalInfoSchema.omit({ cwd: true })),
   }),
@@ -6049,6 +6458,7 @@ export const SubscribeTerminalResponseSchema = z.object({
     z.object({
       terminalId: z.string(),
       slot: z.number().int().min(0).max(255),
+      subscriptionId: z.string().optional(),
       error: z.null(),
       requestId: z.string(),
     }),
@@ -6082,13 +6492,17 @@ export const CaptureTerminalResponseSchema = z.object({
 export const TerminalStreamExitSchema = z.object({
   type: z.literal("terminal_stream_exit"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     terminalId: z.string(),
+    // Observation failure; the underlying terminal process may still be running.
+    error: z.string().optional(),
   }),
 });
 
 export const TerminalAttentionRequiredSchema = z.object({
   type: z.literal("terminal_attention_required"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     serverId: z.string().optional(),
     terminalId: z.string(),
     cwd: z.string(),
@@ -6167,6 +6581,7 @@ export const HubExecutionControlResponseSchema = z.object({
 export const HubExecutionAgentUpdateSchema = z.object({
   type: z.literal("hub.execution.agent.update"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     executionId: z.string(),
     agentId: z.string(),
     agent: AgentSnapshotPayloadSchema,
@@ -6176,6 +6591,7 @@ export const HubExecutionAgentUpdateSchema = z.object({
 export const HubExecutionAgentStreamSchema = z.object({
   type: z.literal("hub.execution.agent.stream"),
   payload: z.object({
+    subscriptionId: z.string().optional(),
     executionId: z.string(),
     agentId: z.string(),
     event: AgentStreamEventPayloadSchema,
@@ -6232,6 +6648,7 @@ export const PluginCatalogGetResponseSchema = z.object({
       z.object({
         id: PluginIdSchema,
         clientBundle: z.string(),
+        requirements: PluginRequirementsSchema.optional(),
       }),
     ),
   }),
@@ -6240,12 +6657,25 @@ export const PluginCatalogGetResponseSchema = z.object({
 export const PluginStatusSchema = z.enum(["running", "disabled", "failed"]);
 export type PluginStatus = z.infer<typeof PluginStatusSchema>;
 
+export const PluginNpmInstallationSchema = z.object({
+  packageName: z.string(),
+  requestedSpec: z.string(),
+  version: z.string(),
+  integrity: z.string(),
+});
+
 export const PluginListItemSchema = z.object({
   id: PluginIdSchema,
+  name: z.string().optional(),
+  icon: z.string().optional(),
+  media: z.array(z.string()).optional(),
+  description: z.string().optional(),
   path: z.string(),
   enabled: z.boolean(),
   status: PluginStatusSchema,
   source: z.enum(["directory", "git"]).optional(),
+  npm: PluginNpmInstallationSchema.optional(),
+  installation: PluginInstallationSchema.optional(),
   remote: z.string().optional(),
   ref: z.string().optional(),
   commit: z.string().optional(),
@@ -6293,6 +6723,8 @@ export const PluginSourceInstallResponseSchema = z.object({
 export const PluginSourceStatusItemSchema = z.object({
   id: PluginIdSchema,
   source: z.enum(["directory", "git"]),
+  npm: PluginNpmInstallationSchema.optional(),
+  installation: PluginInstallationSchema.optional(),
   path: z.string(),
   remote: z.string().optional(),
   ref: z.string().optional(),
@@ -6322,6 +6754,33 @@ export const PluginSourceUpdateResponseSchema = z.object({
   payload: z.object({ requestId: z.string(), plugins: z.array(PluginSourceUpdateItemSchema) }),
 });
 
+export const PluginUpdatePreviewSchema = z.object({
+  id: PluginIdSchema,
+  outcome: z.enum(["update", "current", "installed-newer", "local", "error"]),
+  current: PluginInstallationSchema.optional(),
+  target: PluginUpdateTargetSchema.optional(),
+  links: z.array(z.string()),
+  proposal: PluginUpdateProposalSchema.optional(),
+  error: z.string().optional(),
+});
+export type PluginUpdatePreview = z.infer<typeof PluginUpdatePreviewSchema>;
+export const PluginUpdateResultSchema = z.object({
+  id: PluginIdSchema,
+  outcome: z.enum(["updated", "error"]),
+  plugin: PluginListItemSchema.optional(),
+  error: z.string().optional(),
+  warning: z.string().optional(),
+});
+export type PluginUpdateResult = z.infer<typeof PluginUpdateResultSchema>;
+export const PluginUpdatePreviewResponseSchema = z.object({
+  type: z.literal("plugin.source.update.preview.response"),
+  payload: z.object({ requestId: z.string(), plugins: z.array(PluginUpdatePreviewSchema) }),
+});
+export const PluginUpdateApplyResponseSchema = z.object({
+  type: z.literal("plugin.source.update.apply.response"),
+  payload: z.object({ requestId: z.string(), plugins: z.array(PluginUpdateResultSchema) }),
+});
+
 function pluginActionResponse<const Type extends string>(type: Type) {
   return z.object({
     type: z.literal(type),
@@ -6384,6 +6843,9 @@ export const AgentSkillsImportLegacySelectionResponseSchema = z.object({
 });
 
 export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
+  BrowserHostRegisterResponseSchema,
+  SubscriptionReleaseResponseSchema,
+  SessionEventsSetSubscriptionResponseSchema,
   HubExecutionAgentCreateResponseSchema,
   HubExecutionAgentValidateResponseSchema,
   HubExecutionControlResponseSchema,
@@ -6398,6 +6860,8 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
   PluginSourceInstallResponseSchema,
   PluginSourceStatusResponseSchema,
   PluginSourceUpdateResponseSchema,
+  PluginUpdatePreviewResponseSchema,
+  PluginUpdateApplyResponseSchema,
   PluginReloadResponseSchema,
   PluginEnableResponseSchema,
   PluginDisableResponseSchema,
@@ -6459,6 +6923,7 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
   FetchAgentResponseMessageSchema,
   FetchAgentTimelineResponseMessageSchema,
   AgentTimelineReplacementMessageSchema,
+  AgentTimelineSearchResponseMessageSchema,
   AgentTimelineListPromptsResponseMessageSchema,
   ProviderSubagentListResponseMessageSchema,
   ProviderSubagentTimelineResponseMessageSchema,
@@ -6469,7 +6934,12 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
   CancelAgentResponseMessageSchema,
   ClearAgentAttentionResponseMessageSchema,
   WorkspaceCreateResponseSchema,
+  AgentCreateResponseSchema,
+  WorkspaceCreationUpdateSchema,
+  AgentCreationUpdateSchema,
+  CreationSubscribeResponseSchema,
   WorkspaceClearAttentionResponseSchema,
+  WorkspaceMarkUnreadResponseSchema,
   SendAgentMessageResponseMessageSchema,
   SetVoiceModeResponseMessageSchema,
   DaemonGetStatusResponseSchema,
@@ -6507,6 +6977,7 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
   CloseItemsResponseSchema,
   CheckoutStatusResponseSchema,
   CheckoutStatusUpdateSchema,
+  CheckoutDiffGetResponseSchema,
   SubscribeCheckoutDiffResponseSchema,
   CheckoutDiffUpdateSchema,
   CheckoutCommitResponseSchema,
@@ -6561,6 +7032,8 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
   RefreshProvidersSnapshotResponseMessageSchema,
   ProviderDiagnosticResponseMessageSchema,
   ProviderUsageListResponseMessageSchema,
+  UsageListReportsUpdateMessageSchema,
+  UsageListReportsResponseMessageSchema,
   ListCommandsResponseSchema,
   ListTerminalsResponseSchema,
   TerminalsChangedSchema,
@@ -6739,6 +7212,10 @@ export type ProviderDiagnosticResponseMessage = z.infer<
   typeof ProviderDiagnosticResponseMessageSchema
 >;
 export type ProviderUsageTone = z.infer<typeof ProviderUsageToneSchema>;
+export type UsageProblem = z.infer<typeof UsageProblemSchema>;
+export type UsageReport = z.infer<typeof UsageReportSchema>;
+export type UsageReportEntry = z.infer<typeof UsageReportEntrySchema>;
+export type UsageListReportsResponseMessage = z.infer<typeof UsageListReportsResponseMessageSchema>;
 export type ProviderUsageStatus = z.infer<typeof ProviderUsageStatusSchema>;
 export type ProviderUsage = z.infer<typeof ProviderUsageSchema>;
 export type ProviderUsageWindow = z.infer<typeof ProviderUsageWindowSchema>;
@@ -6970,6 +7447,7 @@ export type ProjectGithubCloneRequest = z.infer<typeof ProjectGithubCloneRequest
 export type ProjectGithubCloneProtocol = z.infer<typeof ProjectGithubCloneProtocolSchema>;
 export type ArchiveWorkspaceRequest = z.infer<typeof ArchiveWorkspaceRequestSchema>;
 export type WorkspaceClearAttentionRequest = z.infer<typeof WorkspaceClearAttentionRequestSchema>;
+export type WorkspaceMarkUnreadRequest = z.infer<typeof WorkspaceMarkUnreadRequestSchema>;
 export type FileExplorerRequest = z.infer<typeof FileExplorerRequestSchema>;
 export type FileExplorerResponse = z.infer<typeof FileExplorerResponseSchema>;
 export type FileVersion = z.infer<typeof FileVersionSchema>;
@@ -7059,11 +7537,20 @@ export const WSHelloMessageSchema = z.object({
   clientId: z.string().min(1),
   clientType: z.enum(["mobile", "browser", "cli", "mcp", "hub"]),
   protocolVersion: z.number().int(),
+  auth: z
+    .discriminatedUnion("kind", [
+      z.object({ kind: z.literal("password"), password: z.string() }),
+      z.object({ kind: z.literal("localCredential"), token: z.string() }),
+    ])
+    .optional(),
   appVersion: z.string().optional(),
   capabilities: z
     .object({
       voice: z.boolean().optional(),
+      [CLIENT_CAPS.helloRejection]: z.boolean().optional(),
       pushNotifications: z.boolean().optional(),
+      [CLIENT_CAPS.explicitEventSubscriptions]: z.boolean().optional(),
+      [CLIENT_CAPS.allProviders]: z.boolean().optional(),
       [CLIENT_CAPS.reasoningMergeEnum]: z.boolean().optional(),
       [CLIENT_CAPS.selectiveAgentTimeline]: z.boolean().optional(),
       [CLIENT_CAPS.customModeIcons]: z.boolean().optional(),
@@ -7071,7 +7558,9 @@ export const WSHelloMessageSchema = z.object({
       [CLIENT_CAPS.providerSubagents]: z.boolean().optional(),
       [CLIENT_CAPS.projectUpdates]: z.boolean().optional(),
       [CLIENT_CAPS.compactProviderSnapshots]: z.boolean().optional(),
+      [CLIENT_CAPS.providerSnapshotReferences]: z.boolean().optional(),
       [CLIENT_CAPS.timelineReplacementInvalidation]: z.boolean().optional(),
+      [CLIENT_CAPS.timelineNotifications]: z.boolean().optional(),
       [CLIENT_CAPS.browserHost]: BrowserAutomationHostCapabilitySchema.optional(),
     })
     .passthrough()
@@ -7094,6 +7583,12 @@ export const WSSessionOutboundSchema = z.object({
   message: SessionOutboundMessageSchema,
 });
 
+export const WSHelloRejectedMessageSchema = z.object({
+  type: z.literal("hello.rejected"),
+  reason: z.enum(["password_required", "incorrect_password", "incompatible_protocol"]),
+  accepts: z.array(z.literal("password")),
+});
+
 // Complete WebSocket message schemas
 export const WSInboundMessageSchema = z.discriminatedUnion("type", [
   WSPingMessageSchema,
@@ -7105,6 +7600,7 @@ export const WSInboundMessageSchema = z.discriminatedUnion("type", [
 export const WSOutboundMessageSchema = z.discriminatedUnion("type", [
   WSPongMessageSchema,
   WSSessionOutboundSchema,
+  WSHelloRejectedMessageSchema,
 ]);
 
 export type WSInboundMessage = z.infer<typeof WSInboundMessageSchema>;
diff --git a/packages/protocol/src/messages.wire-compat.test.ts b/packages/protocol/src/messages.wire-compat.test.ts
index 6bd948e28d..2298d680a4 100644
--- a/packages/protocol/src/messages.wire-compat.test.ts
+++ b/packages/protocol/src/messages.wire-compat.test.ts
@@ -6,8 +6,31 @@ import {
   ServerInfoStatusPayloadSchema,
   SessionOutboundMessageSchema,
   WSHelloMessageSchema,
+  WorkspaceSetupSnapshotSchema,
+  WorkspaceSetupProgressMessageSchema,
+  AgentTimelineEntryPayloadSchema,
 } from "./messages.js";
 
+test("terminal listings accept older rows and retain new per-terminal directories", () => {
+  const response = {
+    type: "list_terminals_response",
+    payload: {
+      requestId: "terminal-list",
+      cwd: "/workspace",
+      terminals: [{ id: "terminal", name: "Shell", workspaceId: "workspace" }],
+    },
+  };
+  expect(SessionOutboundMessageSchema.parse(response)).toEqual(response);
+  const withDirectory = {
+    ...response,
+    payload: {
+      ...response.payload,
+      terminals: [{ ...response.payload.terminals[0], cwd: "/workspace/subdirectory" }],
+    },
+  };
+  expect(SessionOutboundMessageSchema.parse(withDirectory)).toEqual(withDirectory);
+});
+
 const LegacySubAgentToolCallSchema = z.object({
   type: z.literal("tool_call"),
   callId: z.string(),
@@ -267,4 +290,149 @@ describe("wire schema compatibility", () => {
     expect(parsed.capabilities.supportsRewindFiles).toBe(false);
     expect(parsed.capabilities.supportsRewindBoth).toBe(false);
   });
+
+  test("notification timeline items parse their level and message", () => {
+    expect(
+      AgentTimelineItemPayloadSchema.parse({
+        type: "notification",
+        level: "warning",
+        message: "Command blocked by user",
+      }),
+    ).toEqual({
+      type: "notification",
+      level: "warning",
+      message: "Command blocked by user",
+    });
+  });
+});
+
+test("0.8 timeline and setup capabilities remain optional in the hello", () => {
+  const hello = { type: "hello", clientId: "compat", clientType: "mobile", protocolVersion: 1 };
+  expect(WSHelloMessageSchema.safeParse(hello).success).toBe(true);
+  expect(
+    WSHelloMessageSchema.parse({
+      ...hello,
+      capabilities: { plugin_timeline_items: true, workspace_setup_blocked: true },
+    }).capabilities,
+  ).toEqual({ plugin_timeline_items: true, workspace_setup_blocked: true });
+});
+
+test("plugin rows and identity merges require a capable receiver", () => {
+  const item = {
+    type: "plugin",
+    id: "task",
+    pluginId: "tasks",
+    kind: "tasks",
+    version: 1,
+    data: { text: "Working" },
+  };
+  expect(AgentTimelineItemPayloadSchema.parse(item)).toEqual(item);
+  const legacyItems = z.object({
+    type: z.enum([
+      "user_message",
+      "assistant_message",
+      "reasoning",
+      "tool_call",
+      "todo",
+      "error",
+      "notification",
+      "compaction",
+    ]),
+  });
+  expect(legacyItems.safeParse(item).success).toBe(false);
+  const entry = {
+    provider: "codex",
+    item,
+    timestamp: "2026-09-07T00:00:00.000Z",
+    seqStart: 1,
+    seqEnd: 2,
+    sourceSeqRanges: [{ startSeq: 1, endSeq: 2 }],
+    collapsed: ["identity"],
+  };
+  expect(AgentTimelineEntryPayloadSchema.parse(entry)).toEqual(entry);
+  const legacyCollapsed = z.array(z.enum(["assistant_merge", "reasoning_merge", "tool_lifecycle"]));
+  expect(legacyCollapsed.safeParse(entry.collapsed).success).toBe(false);
+});
+
+test("blocked setup preserves the legacy failed shape and optional provenance", () => {
+  const snapshot = {
+    status: "blocked",
+    error: null,
+    detail: {
+      type: "worktree_setup",
+      worktreePath: "/workspace",
+      branchName: "fork",
+      log: "",
+      commands: [],
+    },
+    blockedSource: {
+      kind: "change_request",
+      forge: "github",
+      number: 42,
+      headRepository: "contributor/project",
+    },
+  };
+  expect(WorkspaceSetupSnapshotSchema.parse(snapshot)).toEqual(snapshot);
+  const legacyStatus = z.enum(["running", "completed", "failed"]);
+  const legacySnapshot = WorkspaceSetupSnapshotSchema.omit({ blockedSource: true }).extend({
+    status: legacyStatus,
+  });
+  expect(legacySnapshot.safeParse(snapshot).success).toBe(false);
+  const failed = { ...snapshot, status: "failed", error: "Update Paseo to review and run setup." };
+  expect(legacySnapshot.safeParse(failed).success).toBe(true);
+  const progress = {
+    type: "workspace_setup_progress",
+    payload: { ...failed, workspaceId: "workspace" },
+  };
+  expect(WorkspaceSetupProgressMessageSchema.parse(progress)).toEqual(progress);
+  expect(WorkspaceSetupSnapshotSchema.parse(legacySnapshot.parse(failed))).toEqual(
+    legacySnapshot.parse(failed),
+  );
+});
+
+test("usage login errors are additive and older reports still parse", () => {
+  const entry = {
+    id: "codex:account",
+    account: {},
+    fetchedAt: "2026-10-05T00:00:00.000Z",
+    sourceId: "codex",
+    sourceLabel: "Codex",
+    report: { status: "error", error: "Usage API returned 500" },
+  };
+  const legacy = z.object({
+    type: z.literal("usage.list_reports.update"),
+    payload: z.object({
+      requestId: z.string(),
+      report: z.object({
+        id: z.string(),
+        account: z.object({ label: z.string().optional() }),
+        fetchedAt: z.string(),
+        sourceId: z.string(),
+        sourceLabel: z.string(),
+        icon: z.string().optional(),
+        report: z.discriminatedUnion("status", [
+          z.object({ status: z.literal("available"), windows: z.array(z.unknown()) }),
+          z.object({ status: z.literal("unavailable"), problem: z.unknown() }),
+          z.object({ status: z.literal("error"), error: z.string() }),
+        ]),
+      }),
+    }),
+  });
+  const oldMessage = {
+    type: "usage.list_reports.update",
+    payload: { requestId: "usage", report: entry },
+  };
+  const newMessage = {
+    ...oldMessage,
+    payload: {
+      ...oldMessage.payload,
+      report: {
+        ...entry,
+        loginErrors: [{ harness: "Codex", report: entry.report }],
+      },
+    },
+  };
+  expect(SessionOutboundMessageSchema.parse(oldMessage)).toEqual(oldMessage);
+  expect(SessionOutboundMessageSchema.parse(newMessage)).toEqual(newMessage);
+  expect(legacy.parse(newMessage)).toEqual(oldMessage);
 });
diff --git a/packages/protocol/src/messages.workspaces.test.ts b/packages/protocol/src/messages.workspaces.test.ts
index a9e8f87c9a..3cb9b0d5bd 100644
--- a/packages/protocol/src/messages.workspaces.test.ts
+++ b/packages/protocol/src/messages.workspaces.test.ts
@@ -10,6 +10,42 @@ import {
 } from "./messages.js";
 
 describe("workspace message schemas", () => {
+  test("parses mark-unread request and response", () => {
+    expect(
+      SessionInboundMessageSchema.parse({
+        type: "workspace.mark_unread.request",
+        workspaceId: "workspace-1",
+        requestId: "req-mark-unread",
+      }),
+    ).toEqual({
+      type: "workspace.mark_unread.request",
+      workspaceId: "workspace-1",
+      requestId: "req-mark-unread",
+    });
+
+    expect(
+      SessionOutboundMessageSchema.parse({
+        type: "workspace.mark_unread.response",
+        payload: {
+          requestId: "req-mark-unread",
+          workspaceId: "workspace-1",
+          markedAgentId: "agent-1",
+          success: true,
+          error: null,
+        },
+      }),
+    ).toEqual({
+      type: "workspace.mark_unread.response",
+      payload: {
+        requestId: "req-mark-unread",
+        workspaceId: "workspace-1",
+        markedAgentId: "agent-1",
+        success: true,
+        error: null,
+      },
+    });
+  });
+
   test("parses blocked setup status and the explicit setup run RPC", () => {
     expect(
       SessionInboundMessageSchema.parse({
diff --git a/packages/protocol/src/paseo-tool-call-detail.ts b/packages/protocol/src/paseo-tool-call-detail.ts
index a922a78442..4b06d49923 100644
--- a/packages/protocol/src/paseo-tool-call-detail.ts
+++ b/packages/protocol/src/paseo-tool-call-detail.ts
@@ -47,6 +47,7 @@ const AGENT_FIELDS = [
   "modeId",
   "background",
   "notifyOnFinish",
+  "internal",
   "settings",
   "labels",
 ] as const;
@@ -196,6 +197,7 @@ const FIELD_LABELS: Readonly<Record<string, string>> = {
   newMode: "New mode",
   nextRunAt: "Next run",
   notifyOnFinish: "Notify on finish",
+  internal: "Internal",
   prNumber: "Change request",
   projectId: "Project",
   removedDirectory: "Removed directory",
diff --git a/packages/protocol/src/paseo-tool-policy-config.test.ts b/packages/protocol/src/paseo-tool-policy-config.test.ts
new file mode 100644
index 0000000000..d4a8966207
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-policy-config.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, test } from "vitest";
+
+import { MutableDaemonConfigPatchSchema, MutableDaemonConfigSchema } from "./messages.js";
+import { ProviderOverrideSchema, ProviderPaseoToolsPolicySchema } from "./provider-config.js";
+
+describe("provider Paseo-tool policy", () => {
+  test("accepts arbitrary tool IDs and leaves an empty policy enabled by default", () => {
+    expect(
+      ProviderPaseoToolsPolicySchema.parse({
+        disabledTools: ["future_tool", "browser_future_tool"],
+      }),
+    ).toEqual({
+      disabledTools: ["future_tool", "browser_future_tool"],
+    });
+    expect(ProviderPaseoToolsPolicySchema.parse({})).toEqual({});
+    expect(ProviderOverrideSchema.parse({}).paseoTools).toBeUndefined();
+  });
+
+  test("accepts paseoTools on persisted provider overrides", () => {
+    expect(
+      ProviderOverrideSchema.parse({
+        extends: "claude",
+        paseoTools: {
+          enabled: false,
+          disabledTools: ["create_workspace"],
+        },
+      }).paseoTools,
+    ).toEqual({
+      enabled: false,
+      disabledTools: ["create_workspace"],
+    });
+  });
+
+  test("accepts paseoTools when reading and patching mutable daemon providers", () => {
+    expect(
+      MutableDaemonConfigSchema.parse({
+        mcp: { injectIntoAgents: true },
+        providers: {
+          codex: {
+            paseoTools: { enabled: false, disabledTools: ["future_tool"] },
+          },
+        },
+      }).providers.codex?.paseoTools,
+    ).toEqual({
+      enabled: false,
+      disabledTools: ["future_tool"],
+    });
+
+    expect(
+      MutableDaemonConfigPatchSchema.parse({
+        providers: {
+          codex: {
+            paseoTools: { disabledTools: ["browser_future_tool"] },
+          },
+        },
+      }).providers?.codex?.paseoTools,
+    ).toEqual({ disabledTools: ["browser_future_tool"] });
+  });
+});
diff --git a/packages/protocol/src/plugin-config.ts b/packages/protocol/src/plugin-config.ts
new file mode 100644
index 0000000000..69816e539e
--- /dev/null
+++ b/packages/protocol/src/plugin-config.ts
@@ -0,0 +1,18 @@
+import { z } from "zod";
+
+export const PluginIdSchema = z.string().regex(/^[a-z][a-z0-9-]*$/);
+// Semver validation belongs at the manifest/runtime boundary, not on the wire.
+export const PluginRequirementsSchema = z.object({ paseo: z.string().optional() });
+export type PluginRequirements = z.infer<typeof PluginRequirementsSchema>;
+
+export const DirectoryPluginSourceSchema = z
+  .object({
+    source: z.literal("directory"),
+    path: z.string().min(1),
+    enabled: z.boolean().optional(),
+  })
+  .strict();
+
+export const PluginSourceSchema = z.discriminatedUnion("source", [DirectoryPluginSourceSchema]);
+
+export type PluginSource = z.infer<typeof PluginSourceSchema>;
diff --git a/packages/protocol/src/plugin-overview.test.ts b/packages/protocol/src/plugin-overview.test.ts
new file mode 100644
index 0000000000..c4023965da
--- /dev/null
+++ b/packages/protocol/src/plugin-overview.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+import { pluginOverviewUrl } from "./plugin-overview.js";
+
+describe("plugin overview destinations", () => {
+  it.each([
+    undefined,
+    "",
+    "./docs",
+    "../docs",
+    "/login",
+    "//example.com",
+    "#section",
+    "?login",
+    "http://example.com",
+    "mailto:hello@example.com",
+    "ftp://example.com",
+    "javascript:alert(1)",
+    "data:image/png;base64,AAAA",
+    "vbscript:msgbox(1)",
+    "javascript&#58;alert(1)",
+    "javascript%3Aalert(1)",
+    "javascript%253Aalert(1)",
+    "java\tscript:alert(1)",
+    " https://example.com",
+    "https://example.com\n",
+    "https:example.com",
+    "https:///example.com",
+    "https://paseo.sh@evil.example",
+    "https://example.com\\@evil.example",
+    "https://",
+  ])("leaves %s as text", (url) => {
+    expect(pluginOverviewUrl(url)).toBeUndefined();
+  });
+
+  it.each([
+    "https://example.com/path?q=a&b=c#section",
+    "HTTPS://example.com/path",
+    "https://example.com/%3Cscript%3E",
+  ])("allows %s without decoding it again", (url) => {
+    expect(pluginOverviewUrl(url)).toBe(url);
+  });
+});
diff --git a/packages/protocol/src/plugin-overview.ts b/packages/protocol/src/plugin-overview.ts
new file mode 100644
index 0000000000..2507b511b0
--- /dev/null
+++ b/packages/protocol/src/plugin-overview.ts
@@ -0,0 +1,49 @@
+/** Presentation contract for author-controlled registry content, independent of the UI runtime. */
+export const pluginOverviewPolicy = {
+  rawHtml: false,
+  elements: [
+    "p",
+    "br",
+    "hr",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "blockquote",
+    "ul",
+    "ol",
+    "li",
+    "strong",
+    "em",
+    "del",
+    "pre",
+    "code",
+    "a",
+    "img",
+    "table",
+    "thead",
+    "tbody",
+    "tr",
+    "th",
+    "td",
+  ],
+  link: { rel: "noopener noreferrer nofollow", target: "_blank" },
+} as const;
+
+/** Validate decoded Markdown destinations; never resolve against the reader's page or repository. */
+export function pluginOverviewUrl(value: string | undefined): string | undefined {
+  // URL parsers discard controls and normalize backslashes; reject those ambiguous spellings.
+  // eslint-disable-next-line no-control-regex
+  if (!value || !/^https:\/\/[^/?#]/i.test(value) || /[\u0000-\u0020\u007f\\]/.test(value))
+    return undefined;
+  try {
+    const url = new URL(value);
+    if (url.protocol !== "https:" || !url.hostname || url.username || url.password)
+      return undefined;
+    return value;
+  } catch {
+    return undefined;
+  }
+}
diff --git a/packages/protocol/src/plugin-registry.test.ts b/packages/protocol/src/plugin-registry.test.ts
new file mode 100644
index 0000000000..5692c4c56e
--- /dev/null
+++ b/packages/protocol/src/plugin-registry.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { pluginMediaKind } from "./plugin-registry.js";
+
+describe("plugin media kind", () => {
+  it.each([
+    ["https://cdn.example.com/a/preview.png", "image"],
+    ["https://cdn.example.com/a/preview.JPG", "image"],
+    ["https://cdn.example.com/a/preview.jpeg", "image"],
+    ["https://cdn.example.com/a/preview.webp", "image"],
+    ["https://cdn.example.com/a/preview.gif", "image"],
+    ["https://cdn.example.com/a/demo.mp4", "video"],
+    ["https://cdn.example.com/a/demo.WebM", "video"],
+    ["https://cdn.example.com/a/demo.mp4?raw=true#t=2", "video"],
+    ["https://cdn.example.com/mp4/preview.png?format=mp4", "image"],
+  ] as const)("reads %s as %s from its path extension", (url, kind) => {
+    expect(pluginMediaKind(url)).toBe(kind);
+  });
+});
diff --git a/packages/protocol/src/plugin-registry.ts b/packages/protocol/src/plugin-registry.ts
new file mode 100644
index 0000000000..90854962ba
--- /dev/null
+++ b/packages/protocol/src/plugin-registry.ts
@@ -0,0 +1,85 @@
+import { z } from "zod";
+
+export const PluginRegistryIdSchema = z
+  .string()
+  .regex(/^[a-z0-9]+(?:-[a-z0-9]+)*\/[a-z0-9]+(?:-[a-z0-9]+)*$/);
+export const PluginRegistryIdentitySchema = z.object({
+  url: z.string().url(),
+  id: PluginRegistryIdSchema,
+});
+export const PluginRegistriesSchema = z.record(
+  z.string(),
+  z.object({ authorization: z.string().min(1) }),
+);
+export const PluginRegistryArtifactSchema = z.discriminatedUnion("kind", [
+  z.object({
+    kind: z.literal("npm"),
+    package: z.string().regex(/^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/),
+    version: z.string().regex(/^\d+\.\d+\.\d+(?:-[\w.-]+)?(?:\+[\w.-]+)?$/),
+    resolved: z.string().url(),
+    integrity: z.string().regex(/^sha512-[A-Za-z0-9+/]+=*$/),
+  }),
+  z.object({
+    kind: z.literal("git"),
+    remote: z.string().min(1),
+    commit: z.string().regex(/^[0-9a-f]{40,64}$/),
+    pluginPath: z
+      .string()
+      .regex(/^[^\\:]+$/)
+      .optional(),
+  }),
+]);
+export const PublishedPluginSchema = z.object({
+  id: PluginRegistryIdSchema,
+  name: z.string(),
+  description: z.string(),
+  license: z.string().optional(),
+  categories: z.array(z.string()),
+  author: z.object({ github: z.string(), name: z.string().optional(), npm: z.string().optional() }),
+  repository: z.object({ url: z.string().url(), commit: z.string().optional() }),
+  artifact: PluginRegistryArtifactSchema,
+  icon: z.string().url().optional(),
+  /** Images and videos in display order; see `pluginMediaKind`. */
+  media: z.array(z.string().url()),
+  submittedAt: z.string(),
+  reviewedAt: z.string(),
+  updatedAt: z.string(),
+  publishedAt: z.string(),
+  installs: z.number().int().nonnegative().optional(),
+});
+const VIDEO_EXTENSIONS = new Set(["mp4", "webm"]);
+
+/** Whether a registry media entry is a video or an image, from its path extension. */
+export function pluginMediaKind(url: string): "image" | "video" {
+  const extension = new URL(url).pathname.split(".").pop()?.toLowerCase() ?? "";
+  return VIDEO_EXTENSIONS.has(extension) ? "video" : "image";
+}
+export const PublishedPluginDetailSchema = PublishedPluginSchema.extend({ readme: z.string() });
+export const PluginRegistryIndexSchema = z.object({
+  schemaVersion: z.literal(1),
+  registry: z.object({ name: z.string(), url: z.string().url() }),
+  categories: z.array(
+    z.object({ slug: z.string(), label: z.string(), description: z.string().optional() }),
+  ),
+  plugins: z.array(PublishedPluginSchema),
+  /** Plugin IDs the maintainer features, in display order. An ID may name a plugin that is not listed. */
+  featured: z.array(z.string()),
+  generatedAt: z.string(),
+});
+export type PluginRegistryIdentity = z.infer<typeof PluginRegistryIdentitySchema>;
+export type PluginRegistries = z.infer<typeof PluginRegistriesSchema>;
+
+export function parsePluginRegistryReference(
+  source: string,
+  defaultUrl = "https://plugins.paseo.sh",
+): PluginRegistryIdentity | null {
+  const segments = source.split("/");
+  if (segments.length === 2 && PluginRegistryIdSchema.safeParse(source).success)
+    return { url: defaultUrl.replace(/\/+$/, ""), id: source };
+  const [host, ...rest] = segments;
+  if (segments.length !== 3 || !host || !/[.:]/.test(host) || /[@?#\\]/.test(host)) return null;
+  const id = rest.join("/");
+  if (!PluginRegistryIdSchema.safeParse(id).success) return null;
+  const url = new URL(`https://${host}`);
+  return { url: url.origin, id };
+}
diff --git a/packages/protocol/src/plugin-requirements.test.ts b/packages/protocol/src/plugin-requirements.test.ts
new file mode 100644
index 0000000000..e679c8f5d5
--- /dev/null
+++ b/packages/protocol/src/plugin-requirements.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from "vitest";
+import { assertPluginCompatibility, validatePluginRequirements } from "./plugin-requirements.js";
+
+describe.each(["daemon", "app"] as const)("plugin requirements on %s", (runtime) => {
+  it("rejects legacy manifests on the first breaking release with migration instructions", () => {
+    expect(() => assertPluginCompatibility({ id: "legacy", version: "0.8.0", runtime })).toThrow(
+      /legacy.*<0\.8\.0.*0\.8\.0.*https:\/\/paseo.sh\/docs\/plugins\/migration/,
+    );
+  });
+
+  it.each([
+    [undefined, "0.7.2"],
+    [">=0.8.0", "0.8.0"],
+    [">=0.8.0", "0.8.0-beta.1"],
+    [">=0.8.0", "1.0.0"],
+    ["^0.8.0", "0.8.4"],
+    [">=0.8.0-beta.1", "0.8.0-beta.2"],
+    [">=0.8.0-beta.1", "0.8.0-beta.1"],
+    [">=0.8.0-beta.1", "0.8.0"],
+    ["^0.8.0 || ^0.9.0", "0.9.2+build.42"],
+  ])("accepts %s on %s", (paseo, version) => {
+    expect(() =>
+      assertPluginCompatibility({ id: "test", requirements: { paseo }, version, runtime }),
+    ).not.toThrow();
+  });
+
+  it.each([
+    [undefined, "0.8.0-beta.1"],
+    [undefined, "0.9.0"],
+    [">=0.8.0", "0.7.2"],
+    ["^0.8.0", "0.9.0"],
+    ["<0.8.0", "0.8.0-beta.1"],
+  ])("rejects %s on %s", (paseo, version) => {
+    expect(() =>
+      assertPluginCompatibility({ id: "test", requirements: { paseo }, version, runtime }),
+    ).toThrow(`Your ${runtime} is ${version}`);
+  });
+
+  it.each(["", "   ", "latest", ">=potato", "0.8.0 nonsense"])(
+    "rejects malformed range %s",
+    (paseo) => {
+      expect(() => validatePluginRequirements({ paseo })).toThrow("Invalid requirements.paseo");
+    },
+  );
+
+  it.each([null, "unknown"])("fails closed when the runtime version is %s", (version) => {
+    expect(() =>
+      assertPluginCompatibility({
+        id: "test",
+        requirements: { paseo: "*" },
+        version,
+        runtime,
+      }),
+    ).toThrow(`Paseo ${runtime} version is unknown`);
+  });
+});
diff --git a/packages/protocol/src/plugin-requirements.ts b/packages/protocol/src/plugin-requirements.ts
new file mode 100644
index 0000000000..0cdd1f37bd
--- /dev/null
+++ b/packages/protocol/src/plugin-requirements.ts
@@ -0,0 +1,41 @@
+import type { PluginRequirements } from "./messages.js";
+import parse from "semver/functions/parse.js";
+import validRange from "semver/ranges/valid.js";
+import satisfies from "semver/functions/satisfies.js";
+
+export function validatePluginRequirements(requirements: PluginRequirements | undefined): void {
+  const range = requirements?.paseo;
+  if (range !== undefined && (!range.trim() || validRange(range) === null)) {
+    throw new Error(
+      `Invalid requirements.paseo: ${JSON.stringify(range)}. Use an npm semver range such as ">=0.8.0".`,
+    );
+  }
+}
+
+interface PluginCompatibilityInput {
+  id: string;
+  requirements?: PluginRequirements;
+  version: string | null;
+  runtime: "daemon" | "app";
+}
+
+export function assertPluginCompatibility(input: PluginCompatibilityInput): void {
+  validatePluginRequirements(input.requirements);
+  // COMPAT(plugin-requirements): added in v0.8.0-beta.1; remove after 2027-03-07 once pre-0.8 plugins and catalogs are unsupported. The legacy range excludes 0.8 prereleases and their stable core.
+  const range = input.requirements?.paseo ?? "<0.8.0";
+  const version = input.version ? parse(input.version) : null;
+  if (!version) {
+    throw new Error(
+      `Cannot check plugin "${input.id}" requirements: Paseo ${input.runtime} version is unknown. Update the ${input.runtime}.`,
+    );
+  }
+  const stableCore = `${version.major}.${version.minor}.${version.patch}`;
+  if (satisfies(version, range) || satisfies(stableCore, range)) return;
+  const action =
+    input.requirements?.paseo === undefined
+      ? "This plugin has no requirements.paseo and targets Paseo before 0.8. Ask its author to migrate it: https://paseo.sh/docs/plugins/migration"
+      : `Use a compatible plugin version or update the ${input.runtime}.`;
+  throw new Error(
+    `Plugin "${input.id}" requires Paseo ${range}. Your ${input.runtime} is ${input.version}. ${action}`,
+  );
+}
diff --git a/packages/protocol/src/plugin-source-reference.test.ts b/packages/protocol/src/plugin-source-reference.test.ts
index 78c455f83d..83f41ce3df 100644
--- a/packages/protocol/src/plugin-source-reference.test.ts
+++ b/packages/protocol/src/plugin-source-reference.test.ts
@@ -1,9 +1,51 @@
+import { parsePluginRegistryReference } from "./plugin-registry.js";
 import { describe, expect, it } from "vitest";
 import { parsePluginSourceReference } from "./plugin-source-reference.js";
 
 describe("plugin source references", () => {
   it.each([
+    ".",
+    "..",
+    "./owner/slug",
+    "../owner/slug",
+    "/owner/slug",
+    "~/owner/slug",
+    "~",
+    "C:\\",
+    "C:/",
+    "D:\\plugins\\repository",
+    "D:/plugins/repository",
+    "\\\\server\\share",
+    "\\\\server\\share\\plugins\\review",
+    ".\\plugins\\review",
+    "..\\plugins\\review",
+  ])("recognizes the explicit directory %s by shape", (source) => {
+    expect(parsePluginSourceReference(source)).toEqual({
+      kind: "directory",
+      source,
+      pluginPath: undefined,
+    });
+    expect(parsePluginSourceReference(`${source}:plugins/review`)).toEqual({
+      kind: "directory",
+      source,
+      pluginPath: "plugins/review",
+    });
+  });
+
+  it.each([
+    ["npm:review@1.2.0:nested", "npm:review@1.2.0", "nested"],
+    ["npm:review@^1.2.0", "npm:review@^1.2.0", undefined],
+    ["npm:@team/review@next:plugins/main", "npm:@team/review@next", "plugins/main"],
+    ["github:owner/repository", "github:owner/repository", undefined],
+    [
+      "git:git@example.test:owner/repository.git",
+      "git:git@example.test:owner/repository.git",
+      undefined,
+    ],
+    ["git:file:///repo:plugins/main", "git:file:///repo", "plugins/main"],
+    ["plugins.example.com:8443/owner/slug", "plugins.example.com:8443/owner/slug", undefined],
     ["owner/repository", "owner/repository", undefined],
+    ["plugins/foo", "plugins/foo", undefined],
     ["owner/repository:plugins/review", "owner/repository", "plugins/review"],
     [
       "https://example.test:8443/owner/repository.git",
@@ -27,9 +69,23 @@ describe("plugin source references", () => {
       "file:///D:/plugins/repository",
       "plugins/review",
     ],
-    ["D:\\plugins\\repository", "D:\\plugins\\repository", undefined],
-    ["D:\\plugins\\repository:plugins/review", "D:\\plugins\\repository", "plugins/review"],
   ])("parses %s", (reference, source, pluginPath) => {
-    expect(parsePluginSourceReference(reference)).toEqual({ source, pluginPath });
+    expect(parsePluginSourceReference(reference)).toEqual({ kind: "managed", source, pluginPath });
   });
 });
+
+it("addresses default and private registries without treating explicit sources as registry IDs", () => {
+  expect(parsePluginRegistryReference("omercnet/dracula")).toEqual({
+    url: "https://plugins.paseo.sh",
+    id: "omercnet/dracula",
+  });
+  expect(parsePluginRegistryReference("acme/plugin", "https://internal.example/registry/")).toEqual(
+    { url: "https://internal.example/registry", id: "acme/plugin" },
+  );
+  expect(parsePluginRegistryReference("internal.example:8443/acme/plugin")).toEqual({
+    url: "https://internal.example:8443",
+    id: "acme/plugin",
+  });
+  expect(parsePluginRegistryReference("github:acme/plugin")).toBeNull();
+  expect(parsePluginRegistryReference("npm:@acme/plugin")).toBeNull();
+});
diff --git a/packages/protocol/src/plugin-source-reference.ts b/packages/protocol/src/plugin-source-reference.ts
index d50abb7d69..15171531f0 100644
--- a/packages/protocol/src/plugin-source-reference.ts
+++ b/packages/protocol/src/plugin-source-reference.ts
@@ -1,9 +1,27 @@
+import { parsePluginRegistryReference } from "./plugin-registry.js";
+import type { PluginInstallation } from "./messages.js";
 export interface PluginSourceReference {
+  kind: "directory" | "managed";
   source: string;
   pluginPath: string | undefined;
 }
 
 export function parsePluginSourceReference(reference: string): PluginSourceReference {
+  const prefix = /^(npm:|github:|git:(?!\/\/))/.exec(reference)?.[0];
+  const source = prefix ? reference.slice(prefix.length) : reference;
+  const parsed = splitPluginPath(source, { scp: prefix !== "npm:" });
+  if (!prefix && /^(\.\.?(?:[/\\]|$)|\/|~|[A-Za-z]:[/\\]|\\\\)/.test(parsed.source)) {
+    return { kind: "directory", ...parsed };
+  }
+  if (parsePluginRegistryReference(reference))
+    return { kind: "managed", source: reference, pluginPath: undefined };
+  return { kind: "managed", ...parsed, source: `${prefix ?? ""}${parsed.source}` };
+}
+
+function splitPluginPath(
+  reference: string,
+  options: { scp: boolean },
+): Pick<PluginSourceReference, "source" | "pluginPath"> {
   const separator = reference.lastIndexOf(":");
   if (separator === -1) return { source: reference, pluginPath: undefined };
 
@@ -18,7 +36,7 @@ export function parsePluginSourceReference(reference: string): PluginSourceRefer
     if (pathStart === -1 || separator < pathStart) {
       return { source: reference, pluginPath: undefined };
     }
-  } else {
+  } else if (options.scp) {
     const scpSeparator = reference.match(/^[^/@\s]+@[^:\s]+:/)?.[0].length;
     if (scpSeparator !== undefined && separator === scpSeparator - 1) {
       return { source: reference, pluginPath: undefined };
@@ -45,3 +63,18 @@ function isPortableRelativePluginPath(pluginPath: string): boolean {
   if (/^[A-Za-z]:/.test(pluginPath) || pluginPath.includes(":")) return false;
   return pluginPath.split(/[\\/]/).every((part) => part !== "" && part !== "." && part !== "..");
 }
+
+export function formatPluginIdentity(identity: PluginInstallation["identity"]): string {
+  if (identity.kind === "directory") return identity.path;
+  if (identity.registry) return `${new URL(identity.registry.url).host}/${identity.registry.id}`;
+  const source = identity.kind === "npm" ? `npm:${identity.packageName}` : `git:${identity.remote}`;
+  return identity.pluginPath === "." ? source : `${source}:${identity.pluginPath}`;
+}
+export function formatPluginInstallation(installation: PluginInstallation): string {
+  const identity = formatPluginIdentity(installation.identity);
+  const revision =
+    installation.identity.kind === "git"
+      ? installation.currentRevision?.slice(0, 12)
+      : installation.currentRevision;
+  return revision ? `${identity} · ${revision}` : identity;
+}
diff --git a/packages/protocol/src/provider-config.ts b/packages/protocol/src/provider-config.ts
index 2ab879c31f..c94f8ca965 100644
--- a/packages/protocol/src/provider-config.ts
+++ b/packages/protocol/src/provider-config.ts
@@ -28,6 +28,11 @@ export const ProviderRuntimeSettingsSchema = z.object({
   disallowedTools: z.array(z.string()).optional(),
 });
 
+export const ProviderPaseoToolsPolicySchema = z.object({
+  enabled: z.boolean().optional(),
+  disabledTools: z.array(z.string()).optional(),
+});
+
 const ProviderProfileThinkingOptionSchema = z.object({
   id: z.string(),
   label: z.string(),
@@ -49,10 +54,13 @@ export const ProviderOverrideSchema = z.object({
   description: z.string().optional(),
   command: z.array(z.string().min(1)).min(1).optional(),
   env: z.record(z.string(), z.string()).optional(),
+  options: z.record(z.string(), z.unknown()).optional(),
+  // COMPAT(providerParams): added in v0.10.0, remove after 2027-03-30 once configs use options.
   params: z.record(z.string(), z.unknown()).optional(),
   models: z.array(ProviderProfileModelSchema).optional(),
   additionalModels: z.array(ProviderProfileModelSchema).optional(),
   disallowedTools: z.array(z.string()).optional(),
+  paseoTools: ProviderPaseoToolsPolicySchema.optional(),
   enabled: z.boolean().optional(),
   order: z.number().optional(),
 });
@@ -76,15 +84,10 @@ export const ProviderOverridesSchema = z
       }
 
       const isBuiltinProvider = builtinProviderIdSet.has(providerId);
-      if (!isBuiltinProvider && !provider.extends) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          path: [providerId, "extends"],
-          message: `Custom provider "${providerId}" must declare extends.`,
-        });
-      }
-
-      if (!isBuiltinProvider && !provider.label) {
+      // Config loads before plugin registration. An entry without extends is an override;
+      // registry construction decides whether its provider exists. Configurable plugin IDs
+      // use this existing config alphabet; dots/underscores remain registration-only.
+      if (!isBuiltinProvider && provider.extends && !provider.label) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           path: [providerId, "label"],
@@ -127,6 +130,7 @@ export const AgentProviderRuntimeSettingsMapSchema = z
 
 export type ProviderCommand = z.infer<typeof ProviderCommandSchema>;
 export type ProviderRuntimeSettings = z.infer<typeof ProviderRuntimeSettingsSchema>;
+export type ProviderPaseoToolsPolicy = z.infer<typeof ProviderPaseoToolsPolicySchema>;
 export type ProviderProfileModel = z.infer<typeof ProviderProfileModelSchema>;
 export type ProviderOverride = z.infer<typeof ProviderOverrideSchema>;
 export type ProviderOverrides = z.infer<typeof ProviderOverridesSchema>;
diff --git a/packages/protocol/src/provider-snapshot-codec.test.ts b/packages/protocol/src/provider-snapshot-codec.test.ts
index 2921260851..f1f245c9b7 100644
--- a/packages/protocol/src/provider-snapshot-codec.test.ts
+++ b/packages/protocol/src/provider-snapshot-codec.test.ts
@@ -18,6 +18,7 @@ function providerEntry(): ProviderSnapshotEntry {
     provider: "pi",
     status: "ready",
     enabled: true,
+    iconSvg: '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>',
     models: [
       {
         provider: "pi",
diff --git a/packages/protocol/src/schedule/types.ts b/packages/protocol/src/schedule/types.ts
index 62c02bd38d..718c7e05ca 100644
--- a/packages/protocol/src/schedule/types.ts
+++ b/packages/protocol/src/schedule/types.ts
@@ -33,7 +33,7 @@ export const ScheduleTargetSchema = z.discriminatedUnion("type", [
       archiveOnFinish: z.boolean().optional(),
       isolation: z.enum(["local", "worktree"]).optional(),
       title: z.string().trim().min(1).nullable().optional(),
-      providerOptions: z.record(z.string(), z.json()).optional(),
+      providerOptions: z.record(z.string(), z.unknown()).optional(),
       featureValues: z.record(z.string(), z.unknown()).optional(),
       systemPrompt: z.string().optional(),
       mcpServers: z.record(z.string(), z.unknown()).optional(),
diff --git a/packages/protocol/src/search/text-match.test.ts b/packages/protocol/src/search/text-match.test.ts
index 05037fdee7..8adff41f62 100644
--- a/packages/protocol/src/search/text-match.test.ts
+++ b/packages/protocol/src/search/text-match.test.ts
@@ -54,6 +54,24 @@ describe("scoreMatch", () => {
     expect(scoreMatch("art", "party")).toEqual({ tier: 4, offset: 1 });
   });
 
+  it("does not assemble one query word across whitespace-separated words", () => {
+    for (const separator of [" ", "\t", "\n", "\u00a0"]) {
+      expect(scoreMatch("terminal", `term${separator}inal`)).toBeNull();
+    }
+    expect(
+      scoreMatch("terminal", "Let me diagnose this problem in a diagnose this problem and", {
+        fuzzy: fuzzyPolicyForToken("terminal"),
+      }),
+    ).toBeNull();
+  });
+
+  it("keeps subsequences within a word, including names and later words", () => {
+    expect(scoreMatch("trmnl", "Fix terminal resizing")).toEqual({ tier: 5, offset: 4, spread: 8 });
+    expect(scoreMatch("abc", "AgentBrowserConfig")?.tier).toBe(5);
+    expect(scoreMatch("pasbab", "paseo-babysit")?.tier).toBe(5);
+    expect(scoreMatch("confg", "check configuration")?.offset).toBe(6);
+  });
+
   it("returns null when query is not found", () => {
     expect(scoreMatch("xyz", "feat/pi-direct-sdk")).toBeNull();
   });
@@ -225,7 +243,8 @@ describe("scoreTextFields", () => {
     // Splitting on whitespace is what the opt-out keeps; only the run-together form goes.
     expect(scoreTextFields("lab des", fields, { subsequence: false })).not.toBeNull();
     expect(scoreTextFields("labdes", fields, { subsequence: false })).toBeNull();
-    expect(scoreTextFields("labdes", fields)).not.toBeNull();
+    expect(scoreTextFields("labdes", fields)).toBeNull();
+    expect(scoreTextFields("lbl dsgn", fields)).not.toBeNull();
   });
 });
 
@@ -258,6 +277,10 @@ describe("matchRanges", () => {
     expect(markUp("confg", "configuration")).toBe("[conf]i[g]uration");
   });
 
+  it("highlights only the word selected after an earlier partial subsequence", () => {
+    expect(markUp("confg", "check configuration")).toBe("check [conf]i[g]uration");
+  });
+
   it("marks the whole word a typo resolved to", () => {
     // The characters the user got wrong are not in the text to point at, so
     // the word is the smallest honest thing to mark.
diff --git a/packages/protocol/src/search/text-match.ts b/packages/protocol/src/search/text-match.ts
index db73acb305..14bce34a41 100644
--- a/packages/protocol/src/search/text-match.ts
+++ b/packages/protocol/src/search/text-match.ts
@@ -18,11 +18,8 @@ export interface MatchOptions {
   /** Omit or pass null to match exactly. `fuzzyPolicyForToken` picks a policy. */
   fuzzy?: FuzzyPolicy | null;
   /**
-   * Match characters that appear in order but not adjacently, so `pasbab` finds
-   * `paseo-babysit`. Defaults to on. Turn it off where a near miss has to read as
-   * no match at all: it widens far enough that most typos hit something, and a
-   * list that preselects its first row would then act on that row when the user
-   * presses Enter expecting nothing to happen.
+   * Match characters in order within one whitespace-delimited word, so `pasbab`
+   * finds `paseo-babysit`, but `labdes` cannot join "Label as Design". Defaults to on.
    */
   subsequence?: boolean;
 }
@@ -74,6 +71,12 @@ function scoreSubsequenceMatch(query: string, text: string): MatchScore | null {
   let firstIndex = -1;
   let lastIndex = -1;
   for (let textIndex = 0; textIndex < text.length && queryIndex < query.length; textIndex += 1) {
+    if (/\s/u.test(text[textIndex])) {
+      queryIndex = 0;
+      firstIndex = -1;
+      lastIndex = -1;
+      continue;
+    }
     if (text[textIndex] !== query[queryIndex]) continue;
     if (firstIndex === -1) firstIndex = textIndex;
     lastIndex = textIndex;
@@ -286,7 +289,11 @@ export function matchRanges(query: string, text: string, score: MatchScore): Mat
   if (score.tier === TIER_SUBSEQUENCE) {
     const indices: number[] = [];
     let queryIndex = 0;
-    for (let textIndex = 0; textIndex < t.length && queryIndex < q.length; textIndex += 1) {
+    for (
+      let textIndex = score.offset;
+      textIndex < t.length && queryIndex < q.length;
+      textIndex += 1
+    ) {
       if (t[textIndex] !== q[queryIndex]) continue;
       indices.push(textIndex);
       queryIndex += 1;
diff --git a/packages/protocol/src/terminal-profile.ts b/packages/protocol/src/terminal-profile.ts
new file mode 100644
index 0000000000..282084c0c5
--- /dev/null
+++ b/packages/protocol/src/terminal-profile.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+export const TerminalProfileSchema = z
+  .object({
+    id: z.string(),
+    name: z.string(),
+    command: z.string(),
+    args: z.array(z.string()).optional(),
+    icon: z.string().optional(),
+  })
+  .passthrough();
+
+export type TerminalProfile = z.infer<typeof TerminalProfileSchema>;
diff --git a/packages/protocol/src/terminal-profiles.test.ts b/packages/protocol/src/terminal-profiles.test.ts
index e45f68b293..dece3821ed 100644
--- a/packages/protocol/src/terminal-profiles.test.ts
+++ b/packages/protocol/src/terminal-profiles.test.ts
@@ -196,11 +196,13 @@ describe("guessTerminalProfileIcon", () => {
     ["/usr/local/bin/gemini", "gemini"],
     ["agy", "agy"],
     ["/usr/local/bin/agy", "agy"],
+    ["cursor-agent", "cursor"],
+    ["/usr/local/bin/cursor-agent", "cursor"],
   ])("guesses %s -> %s", (command, expected) => {
     expect(guessTerminalProfileIcon(command)).toBe(expected);
   });
 
-  it.each([["zsh"], ["bash"], ["fish"], [""], ["/usr/bin/foo"], ["cursor-agent"]])(
+  it.each([["zsh"], ["bash"], ["fish"], [""], ["/usr/bin/foo"], ["cursor-tool"]])(
     "returns undefined for unknown command %s",
     (command) => {
       expect(guessTerminalProfileIcon(command)).toBeUndefined();
@@ -219,6 +221,26 @@ describe("getTerminalProfileIcon", () => {
     expect(getTerminalProfileIcon(profile)).toBe("claude");
   });
 
+  it("shows the Cursor icon for a profile created in settings with the Cursor CLI", () => {
+    const profile = {
+      id: "profile_1",
+      name: "Cursor",
+      command: "cursor-agent",
+      args: [PROMPT_SENTINEL],
+    };
+    expect(getTerminalProfileIcon(profile)).toBe("cursor");
+  });
+
+  it("keeps an explicit icon over the Cursor CLI guess", () => {
+    const profile = {
+      id: "profile_1",
+      name: "Cursor",
+      command: "cursor-agent",
+      icon: "claude",
+    };
+    expect(getTerminalProfileIcon(profile)).toBe("claude");
+  });
+
   it("returns undefined when no icon is set and command is unknown", () => {
     const profile = { id: "1", name: "Foo", command: "zsh" };
     expect(getTerminalProfileIcon(profile)).toBeUndefined();
diff --git a/packages/protocol/src/terminal-profiles.ts b/packages/protocol/src/terminal-profiles.ts
index 4a811437a2..33d10fe4ed 100644
--- a/packages/protocol/src/terminal-profiles.ts
+++ b/packages/protocol/src/terminal-profiles.ts
@@ -105,7 +105,14 @@ export function resolveTerminalProfileLaunch(
   return { name: profile.name, ...substitutePrompt(profile, prompt) };
 }
 
-const WELL_KNOWN_COMMAND_ICONS = new Map(KNOWN_PROVIDER_ICON_NAMES.map((name) => [name, name]));
+// CLIs whose binary is not named after their icon. Matching stays exact, so a
+// command only gets an icon when its whole base name is listed.
+const COMMAND_ICON_ALIASES: ReadonlyArray<[string, string]> = [["cursor-agent", "cursor"]];
+
+const WELL_KNOWN_COMMAND_ICONS = new Map([
+  ...KNOWN_PROVIDER_ICON_NAMES.map((name): [string, string] => [name, name]),
+  ...COMMAND_ICON_ALIASES,
+]);
 
 function getCommandBaseName(command: string): string {
   const lastSlash = command.lastIndexOf("/");
diff --git a/packages/protocol/src/terminal-snapshot.test.ts b/packages/protocol/src/terminal-snapshot.test.ts
index 0262f0e45f..96d82a9205 100644
--- a/packages/protocol/src/terminal-snapshot.test.ts
+++ b/packages/protocol/src/terminal-snapshot.test.ts
@@ -47,3 +47,33 @@ describe("renderTerminalSnapshotToAnsi", () => {
     expect(ansi).toContain("ABCDEFGHIJ\r\nKLMNOP");
   });
 });
+
+describe("renderTerminalSnapshotToAnsi wide chars", () => {
+  it("skips wide-char continuation cells so the glyph keeps its two columns", () => {
+    // The daemon captures "통" as the glyph followed by an empty continuation
+    // cell. Emitting anything for that cell pushes the rest of the row right.
+    const state: TerminalState = {
+      rows: 1,
+      cols: 10,
+      scrollback: [],
+      grid: [[{ char: "통" }, { char: "" }, { char: "합" }, { char: "" }, { char: "!" }]],
+      cursor: { row: 0, col: 5 },
+    };
+
+    expect(renderTerminalSnapshotToAnsi(state)).toContain("통합!");
+  });
+
+  it("replays snapshots from an old daemon verbatim, including its continuation spaces", () => {
+    // Old daemons already collapsed the continuation to " ". The serializer
+    // cannot tell that apart from a real space, so it must not guess.
+    const state: TerminalState = {
+      rows: 1,
+      cols: 10,
+      scrollback: [],
+      grid: [cells("통 합 !")],
+      cursor: { row: 0, col: 6 },
+    };
+
+    expect(renderTerminalSnapshotToAnsi(state)).toContain("통 합 !");
+  });
+});
diff --git a/packages/protocol/src/terminal-snapshot.ts b/packages/protocol/src/terminal-snapshot.ts
index f978cd884b..1860067573 100644
--- a/packages/protocol/src/terminal-snapshot.ts
+++ b/packages/protocol/src/terminal-snapshot.ts
@@ -87,6 +87,12 @@ function renderTerminalRow(row: TerminalCell[], padToCols?: number): string {
 
   for (let index = 0; index < length; index += 1) {
     const cell = row[index] ?? { char: " " };
+    // An empty char marks a wide-char continuation cell. The glyph in the
+    // previous cell already advances the cursor two columns, so emitting
+    // anything here would shift the rest of the row one column right.
+    if (cell.char === "") {
+      continue;
+    }
     const nextStyle = getTerminalStyle(cell);
     if (!terminalStylesEqual(previousStyle, nextStyle)) {
       output.push(styleToAnsi(nextStyle));
diff --git a/packages/protocol/src/tool-call-display.ts b/packages/protocol/src/tool-call-display.ts
index 6930fe187a..ab597b5acd 100644
--- a/packages/protocol/src/tool-call-display.ts
+++ b/packages/protocol/src/tool-call-display.ts
@@ -1,10 +1,11 @@
+import { buildAgentMessageDisplay } from "./agent-message-display.js";
 import type { ToolCallTimelineItem } from "./agent-types.js";
 import { getPaseoToolLeafName, isPaseoToolName } from "./tool-name-normalization.js";
 import { stripCwdPrefix } from "./path-utils.js";
 
 export type ToolCallDisplayInput = Pick<
   ToolCallTimelineItem,
-  "name" | "status" | "error" | "metadata" | "detail"
+  "name" | "status" | "error" | "metadata" | "detail" | "agentMessage"
 > & {
   cwd?: string;
 };
@@ -151,6 +152,9 @@ function buildUnknownDetailOverride(input: ToolCallDisplayInput): DetailDisplay
 }
 
 export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCallDisplayModel {
+  if (input.agentMessage) {
+    return { displayName: buildAgentMessageDisplay(input.agentMessage).displayName };
+  }
   const canonicalDisplay = buildCanonicalDetailDisplay(input);
   const unknownDetailOverride = buildUnknownDetailOverride(input);
   const displayName =
diff --git a/packages/protocol/tests/fixtures/plugin-overview.json b/packages/protocol/tests/fixtures/plugin-overview.json
new file mode 100644
index 0000000000..bbe8575ac8
--- /dev/null
+++ b/packages/protocol/tests/fixtures/plugin-overview.json
@@ -0,0 +1,1202 @@
+[
+  {
+    "name": "script",
+    "markdown": "<script>alert(1)</script>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "image event",
+    "markdown": "<img src=\"https://example.com/x\" onerror=\"alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "svg event",
+    "markdown": "<svg onload=\"alert(1)\"></svg>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "iframe",
+    "markdown": "<iframe src=\"https://example.com\"></iframe>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML javascript link",
+    "markdown": "<a href=\"javascript:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML block",
+    "markdown": "<div>\n<img src=x onerror=alert(1)>\n</div>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "comment",
+    "markdown": "<!-- <img src=x onerror=alert(1)> -->",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "meta refresh",
+    "markdown": "<meta http-equiv=\"refresh\" content=\"0;url=https://example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "base",
+    "markdown": "<base href=\"https://example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "form",
+    "markdown": "<form action=\"https://example.com\"><input name=\"password\"></form>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "style expression",
+    "markdown": "<p style=\"width:expression(alert(1));position:fixed\">click</p>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "style block",
+    "markdown": "<style>body{display:none}</style>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "closing script",
+    "markdown": "</script><script>alert(1)</script>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML entities",
+    "markdown": "&lt;img src=x onerror=alert(1)&gt;",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested HTML entities",
+    "markdown": "&amp;lt;script&amp;gt;alert(1)&amp;lt;/script&amp;gt;",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript link",
+    "markdown": "[click](javascript:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript image",
+    "markdown": "![picture](javascript:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript HTML link",
+    "markdown": "<a href=\"javascript:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript HTML image",
+    "markdown": "<img src=\"javascript:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript link",
+    "markdown": "[click](JaVaScRiPt:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript image",
+    "markdown": "![picture](JaVaScRiPt:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: JaVaScRiPt:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: JaVaScRiPt:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript HTML link",
+    "markdown": "<a href=\"JaVaScRiPt:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript HTML image",
+    "markdown": "<img src=\"JaVaScRiPt:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML link",
+    "markdown": "[click](data:text/html;base64,PHNjcmlwdD4=)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML image",
+    "markdown": "![picture](data:text/html;base64,PHNjcmlwdD4=)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML reference link",
+    "markdown": "[click][ref]\n\n[ref]: data:text/html;base64,PHNjcmlwdD4=",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML reference image",
+    "markdown": "![picture][ref]\n\n[ref]: data:text/html;base64,PHNjcmlwdD4=",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML HTML link",
+    "markdown": "<a href=\"data:text/html;base64,PHNjcmlwdD4=\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML HTML image",
+    "markdown": "<img src=\"data:text/html;base64,PHNjcmlwdD4=\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image link",
+    "markdown": "[click](data:image/png;base64,AAAA)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image image",
+    "markdown": "![picture](data:image/png;base64,AAAA)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image reference link",
+    "markdown": "[click][ref]\n\n[ref]: data:image/png;base64,AAAA",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image reference image",
+    "markdown": "![picture][ref]\n\n[ref]: data:image/png;base64,AAAA",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image HTML link",
+    "markdown": "<a href=\"data:image/png;base64,AAAA\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image HTML image",
+    "markdown": "<img src=\"data:image/png;base64,AAAA\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript link",
+    "markdown": "[click](vbscript:msgbox(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript image",
+    "markdown": "![picture](vbscript:msgbox(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript reference link",
+    "markdown": "[click][ref]\n\n[ref]: vbscript:msgbox(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: vbscript:msgbox(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript HTML link",
+    "markdown": "<a href=\"vbscript:msgbox(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript HTML image",
+    "markdown": "<img src=\"vbscript:msgbox(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http link",
+    "markdown": "[click](http://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http image",
+    "markdown": "![picture](http://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http reference link",
+    "markdown": "[click][ref]\n\n[ref]: http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http reference image",
+    "markdown": "![picture][ref]\n\n[ref]: http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http HTML link",
+    "markdown": "<a href=\"http://example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http HTML image",
+    "markdown": "<img src=\"http://example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp link",
+    "markdown": "[click](ftp://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp image",
+    "markdown": "![picture](ftp://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp reference link",
+    "markdown": "[click][ref]\n\n[ref]: ftp://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ftp://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp HTML link",
+    "markdown": "<a href=\"ftp://example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp HTML image",
+    "markdown": "<img src=\"ftp://example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto link",
+    "markdown": "[click](mailto:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto image",
+    "markdown": "![picture](mailto:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto reference link",
+    "markdown": "[click][ref]\n\n[ref]: mailto:attacker@example.com",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto reference image",
+    "markdown": "![picture][ref]\n\n[ref]: mailto:attacker@example.com",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto HTML link",
+    "markdown": "<a href=\"mailto:attacker@example.com\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto HTML image",
+    "markdown": "<img src=\"mailto:attacker@example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative link",
+    "markdown": "[click](//example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative image",
+    "markdown": "![picture](//example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: //example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: //example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative HTML link",
+    "markdown": "<a href=\"//example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative HTML image",
+    "markdown": "<img src=\"//example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative link",
+    "markdown": "[click](./image.png)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative image",
+    "markdown": "![picture](./image.png)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: ./image.png",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ./image.png",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative HTML link",
+    "markdown": "<a href=\"./image.png\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative HTML image",
+    "markdown": "<img src=\"./image.png\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative link",
+    "markdown": "[click](../login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative image",
+    "markdown": "![picture](../login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: ../login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ../login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative HTML link",
+    "markdown": "<a href=\"../login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative HTML image",
+    "markdown": "<img src=\"../login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative link",
+    "markdown": "[click](/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative image",
+    "markdown": "![picture](/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: /login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: /login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative HTML link",
+    "markdown": "<a href=\"/login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative HTML image",
+    "markdown": "<img src=\"/login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment link",
+    "markdown": "[click](#login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment image",
+    "markdown": "![picture](#login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment reference link",
+    "markdown": "[click][ref]\n\n[ref]: #login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment reference image",
+    "markdown": "![picture][ref]\n\n[ref]: #login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment HTML link",
+    "markdown": "<a href=\"#login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment HTML image",
+    "markdown": "<img src=\"#login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query link",
+    "markdown": "[click](?login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query image",
+    "markdown": "![picture](?login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query reference link",
+    "markdown": "[click][ref]\n\n[ref]: ?login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ?login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query HTML link",
+    "markdown": "<a href=\"?login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query HTML image",
+    "markdown": "<img src=\"?login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript link",
+    "markdown": "[click](javascript&#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript image",
+    "markdown": "![picture](javascript&#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript&#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript&#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript HTML link",
+    "markdown": "<a href=\"javascript&#58;alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript HTML image",
+    "markdown": "<img src=\"javascript&#58;alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter link",
+    "markdown": "[click](jav&#x61;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter image",
+    "markdown": "![picture](jav&#x61;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter reference link",
+    "markdown": "[click][ref]\n\n[ref]: jav&#x61;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter reference image",
+    "markdown": "![picture][ref]\n\n[ref]: jav&#x61;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter HTML link",
+    "markdown": "<a href=\"jav&#x61;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter HTML image",
+    "markdown": "<img src=\"jav&#x61;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity link",
+    "markdown": "[click](javascript&amp;#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity image",
+    "markdown": "![picture](javascript&amp;#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript&amp;#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript&amp;#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity HTML link",
+    "markdown": "<a href=\"javascript&amp;#58;alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity HTML image",
+    "markdown": "<img src=\"javascript&amp;#58;alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded link",
+    "markdown": "[click](javascript%3Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded image",
+    "markdown": "![picture](javascript%3Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript%3Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript%3Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded HTML link",
+    "markdown": "<a href=\"javascript%3Aalert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded HTML image",
+    "markdown": "<img src=\"javascript%3Aalert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded link",
+    "markdown": "[click](javascript%253Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded image",
+    "markdown": "![picture](javascript%253Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript%253Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript%253Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded HTML link",
+    "markdown": "<a href=\"javascript%253Aalert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded HTML image",
+    "markdown": "<img src=\"javascript%253Aalert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme link",
+    "markdown": "[click](java&#9;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme image",
+    "markdown": "![picture](java&#9;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme reference link",
+    "markdown": "[click][ref]\n\n[ref]: java&#9;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme reference image",
+    "markdown": "![picture][ref]\n\n[ref]: java&#9;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme HTML link",
+    "markdown": "<a href=\"java&#9;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme HTML image",
+    "markdown": "<img src=\"java&#9;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme link",
+    "markdown": "[click](java&#10;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme image",
+    "markdown": "![picture](java&#10;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme reference link",
+    "markdown": "[click][ref]\n\n[ref]: java&#10;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme reference image",
+    "markdown": "![picture][ref]\n\n[ref]: java&#10;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme HTML link",
+    "markdown": "<a href=\"java&#10;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme HTML image",
+    "markdown": "<img src=\"java&#10;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials link",
+    "markdown": "[click](https://paseo.sh@evil.example/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials image",
+    "markdown": "![picture](https://paseo.sh@evil.example/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials reference link",
+    "markdown": "[click][ref]\n\n[ref]: https://paseo.sh@evil.example/login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https://paseo.sh@evil.example/login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials HTML link",
+    "markdown": "<a href=\"https://paseo.sh@evil.example/login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials HTML image",
+    "markdown": "<img src=\"https://paseo.sh@evil.example/login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash link",
+    "markdown": "[click](https:\\evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash image",
+    "markdown": "![picture](https:\\evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash reference link",
+    "markdown": "[click][ref]\n\n[ref]: https:\\evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https:\\evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash HTML link",
+    "markdown": "<a href=\"https:\\evil.example/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash HTML image",
+    "markdown": "<img src=\"https:\\evil.example/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority link",
+    "markdown": "[click](https:evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority image",
+    "markdown": "![picture](https:evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority reference link",
+    "markdown": "[click][ref]\n\n[ref]: https:evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https:evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority HTML link",
+    "markdown": "<a href=\"https:evil.example/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority HTML image",
+    "markdown": "<img src=\"https:evil.example/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript autolink",
+    "markdown": "<javascript:alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript autolink",
+    "markdown": "<JaVaScRiPt:alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML autolink",
+    "markdown": "<data:text/html;base64,PHNjcmlwdD4=>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image autolink",
+    "markdown": "<data:image/png;base64,AAAA>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript autolink",
+    "markdown": "<vbscript:msgbox(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http autolink",
+    "markdown": "<http://example.com/path>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp autolink",
+    "markdown": "<ftp://example.com/path>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto autolink",
+    "markdown": "<mailto:attacker@example.com>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS link",
+    "markdown": "[click](https://example.com/path)",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "HTTPS image",
+    "markdown": "![picture](https://example.com/image.png)",
+    "links": [],
+    "images": ["https://example.com/image.png"]
+  },
+  {
+    "name": "HTTPS autolink",
+    "markdown": "<https://example.com/path>",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "bare HTTPS",
+    "markdown": "https://example.com/path",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "bare HTTP",
+    "markdown": "http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "deceptive RTL text",
+    "markdown": "[paseo.sh‮evil](https://example.com/path)",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "title injection",
+    "markdown": "[click](https://example.com/path \"\\\" onmouseover=alert(1)\")",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "table alignment",
+    "markdown": "| A |\n| :-: |\n| safe |",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "heading",
+    "markdown": "## Heading",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC link",
+    "markdown": "[click](irc://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC image",
+    "markdown": "![picture](irc://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC autolink",
+    "markdown": "<irc://example.com/channel>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS link",
+    "markdown": "[click](ircs://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS image",
+    "markdown": "![picture](ircs://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS autolink",
+    "markdown": "<ircs://example.com/channel>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP link",
+    "markdown": "[click](xmpp:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP image",
+    "markdown": "![picture](xmpp:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP autolink",
+    "markdown": "<xmpp:attacker@example.com>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel link",
+    "markdown": "[click](tel:12345)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel image",
+    "markdown": "![picture](tel:12345)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel autolink",
+    "markdown": "<tel:12345>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file link",
+    "markdown": "[click](file:///etc/passwd)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file image",
+    "markdown": "![picture](file:///etc/passwd)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file autolink",
+    "markdown": "<file:///etc/passwd>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob link",
+    "markdown": "[click](blob:https://example.com/id)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob image",
+    "markdown": "![picture](blob:https://example.com/id)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob autolink",
+    "markdown": "<blob:https://example.com/id>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity link",
+    "markdown": "[click](javascript&colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity image",
+    "markdown": "![picture](javascript&colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity autolink",
+    "markdown": "<javascript&colon;alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity link",
+    "markdown": "[click](javascript&amp;colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity image",
+    "markdown": "![picture](javascript&amp;colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity autolink",
+    "markdown": "<javascript&amp;colon;alert(1)>",
+    "links": [],
+    "images": []
+  }
+]
diff --git a/packages/relay/package.json b/packages/relay/package.json
index 62eff50fe3..d53a1a870e 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
@@ -11,21 +11,15 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "node": "./dist/index.js",
-      "import": "./src/index.ts",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./e2ee": {
       "types": "./dist/e2ee.d.ts",
-      "node": "./dist/e2ee.js",
-      "import": "./src/e2ee.ts",
-      "default": "./src/e2ee.ts"
+      "default": "./dist/e2ee.js"
     },
     "./cloudflare": {
       "types": "./dist/cloudflare-adapter.d.ts",
-      "node": "./dist/cloudflare-adapter.js",
-      "import": "./src/cloudflare-adapter.ts",
-      "default": "./src/cloudflare-adapter.ts"
+      "default": "./dist/cloudflare-adapter.js"
     }
   },
   "publishConfig": {
diff --git a/packages/relay/src/package-exports.test.ts b/packages/relay/src/package-exports.test.ts
new file mode 100644
index 0000000000..2e8dda9395
--- /dev/null
+++ b/packages/relay/src/package-exports.test.ts
@@ -0,0 +1,49 @@
+import { existsSync, readFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+
+const THIS_DIR = path.dirname(fileURLToPath(import.meta.url));
+const RELAY_PACKAGE_ROOT = path.resolve(THIS_DIR, "..");
+
+interface PackageManifest {
+  exports: Record<string, Record<string, string>>;
+}
+
+function readManifest(): PackageManifest {
+  return JSON.parse(readFileSync(path.join(RELAY_PACKAGE_ROOT, "package.json"), "utf8"));
+}
+
+function listPublishedFiles(): Set<string> {
+  if (!existsSync(path.join(RELAY_PACKAGE_ROOT, "dist/index.js"))) {
+    execFileSync("npm", ["run", "build"], { cwd: RELAY_PACKAGE_ROOT, stdio: "inherit" });
+  }
+  const output = execFileSync("npm", ["pack", "--dry-run", "--json", "--ignore-scripts"], {
+    cwd: RELAY_PACKAGE_ROOT,
+    encoding: "utf8",
+  });
+  const [pack] = JSON.parse(output) as Array<{ files: Array<{ path: string }> }>;
+  return new Set(pack.files.map((file) => file.path));
+}
+
+function listExportTargets(manifest: PackageManifest): Array<{ label: string; file: string }> {
+  const targets: Array<{ label: string; file: string }> = [];
+  for (const [subpath, conditions] of Object.entries(manifest.exports)) {
+    for (const [condition, target] of Object.entries(conditions)) {
+      targets.push({ label: `${subpath} [${condition}] -> ${target}`, file: target.slice(2) });
+    }
+  }
+  return targets;
+}
+
+describe("published relay package", () => {
+  it("ships every file its exports map resolves to, for every condition", () => {
+    const published = listPublishedFiles();
+    const missing = listExportTargets(readManifest())
+      .filter((target) => !published.has(target.file))
+      .map((target) => target.label);
+
+    expect(missing).toEqual([]);
+  });
+});
diff --git a/packages/server/CLAUDE.md b/packages/server/CLAUDE.md
index 1324b3842c..34f99a3943 100644
--- a/packages/server/CLAUDE.md
+++ b/packages/server/CLAUDE.md
@@ -84,7 +84,7 @@ npm run cli -- daemon status                 # Check daemon status
 
 ### Imports
 
-- Use path alias `@server/*` in server package (maps to `./src/`)
+- Use relative `.js` paths for imports within shipped server code, including type imports. TypeScript preserves `@server/*` aliases in JavaScript and declarations, and production Node has no alias resolver. Vitest tests support the alias.
 - No barrel `index.ts` re-exports — they create unnecessary indirection
 
 ### Naming
diff --git a/packages/server/package.json b/packages/server/package.json
index cd00102b58..b80941d56f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -27,6 +27,41 @@
       "types": "./dist/server/terminal/agent-hooks/provider-registry.d.ts",
       "source": "./src/terminal/agent-hooks/provider-registry.ts",
       "default": "./dist/server/terminal/agent-hooks/provider-registry.js"
+    },
+    "./daemon-control": {
+      "types": "./dist/server/server/daemon-instance.d.ts",
+      "source": "./src/server/daemon-instance.ts",
+      "default": "./dist/server/server/daemon-instance.js"
+    },
+    "./configuration": {
+      "types": "./dist/server/server/config.d.ts",
+      "source": "./src/server/config.ts",
+      "default": "./dist/server/server/config.js"
+    },
+    "./process": {
+      "types": "./dist/server/utils/spawn.d.ts",
+      "source": "./src/utils/spawn.ts",
+      "default": "./dist/server/utils/spawn.js"
+    },
+    "./auth": {
+      "types": "./dist/server/server/auth.d.ts",
+      "source": "./src/server/auth.ts",
+      "default": "./dist/server/server/auth.js"
+    },
+    "./pairing": {
+      "types": "./dist/server/server/pairing-offer.d.ts",
+      "source": "./src/server/pairing-offer.ts",
+      "default": "./dist/server/server/pairing-offer.js"
+    },
+    "./agent-activity": {
+      "types": "./dist/server/server/agent/activity-curator.d.ts",
+      "source": "./src/server/agent/activity-curator.ts",
+      "default": "./dist/server/server/agent/activity-curator.js"
+    },
+    "./agent-response": {
+      "types": "./dist/server/server/agent/agent-response-loop.d.ts",
+      "source": "./src/server/agent/agent-response-loop.ts",
+      "default": "./dist/server/server/agent/agent-response-loop.js"
     }
   },
   "publishConfig": {
@@ -38,7 +73,7 @@
     "clean": "node ../../scripts/clean-package-dist.mjs",
     "build": "npm run build:lib && npm run build:scripts",
     "build:clean": "npm run clean && npm run build",
-    "build:lib": "tsc -p tsconfig.server.json --incremental false && node scripts/build-opencode-bridge-plugin.mjs && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/server/server/speech/providers/local/sherpa/assets',{recursive:true}); fs.copyFileSync('src/server/speech/providers/local/sherpa/assets/silero_vad.onnx','dist/server/server/speech/providers/local/sherpa/assets/silero_vad.onnx'); fs.cpSync('src/terminal/shell-integration','dist/server/terminal/shell-integration',{recursive:true}); fs.cpSync('src/terminal/shell-integration','dist/src/terminal/shell-integration',{recursive:true}); fs.copyFileSync('src/terminal/terminal-ts-loader.mjs','dist/server/terminal/terminal-ts-loader.mjs'); fs.rmSync('dist/server/skills',{recursive:true,force:true}); fs.cpSync('../../skills','dist/server/skills',{recursive:true});\"",
+    "build:lib": "tsc -p tsconfig.server.json --incremental false && node scripts/build-opencode-bridge-plugin.mjs && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/server/server/speech/providers/local/sherpa/assets',{recursive:true}); fs.copyFileSync('src/server/speech/providers/local/sherpa/assets/silero_vad.onnx','dist/server/server/speech/providers/local/sherpa/assets/silero_vad.onnx'); fs.cpSync('src/terminal/shell-integration','dist/server/terminal/shell-integration',{recursive:true}); fs.cpSync('src/terminal/shell-integration','dist/src/terminal/shell-integration',{recursive:true}); fs.copyFileSync('src/terminal/terminal-ts-loader.mjs','dist/server/terminal/terminal-ts-loader.mjs'); fs.rmSync('dist/server/skills',{recursive:true,force:true}); fs.cpSync('../../skills','dist/server/skills',{recursive:true}); fs.rmSync('dist/server/builtin-plugins',{recursive:true,force:true}); fs.cpSync('../../plugins','dist/server/builtin-plugins',{recursive:true,filter:(source)=>!source.split(require('node:path').sep).some((segment)=>segment==='node_modules'||segment==='test')&&!/\\.(test|spec)\\.[cm]?[jt]sx?$/.test(source)&&!source.endsWith('.tsbuildinfo')});\"",
     "build:scripts": "tsc -p tsconfig.scripts.json --incremental false && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/scripts',{recursive:true}); fs.copyFileSync('scripts/mcp-stdio-socket-bridge-cli.mjs','dist/scripts/mcp-stdio-socket-bridge-cli.mjs');\"",
     "prepack": "npm run build:clean && npm --prefix ../.. run build:daemon-web-ui",
     "start": "node dist/scripts/supervisor-entrypoint.js",
@@ -47,13 +82,14 @@
     "measure:agent-tools": "tsx scripts/measure-agent-tools-context.ts",
     "measure:git-observation": "tsx scripts/measure-git-observation.ts",
     "measure:file-observer": "tsx scripts/measure-file-observer.ts",
+    "analyze:observer-metrics": "tsx scripts/analyze-observer-metrics.ts",
     "repro:file-observer-teardown": "tsx scripts/reproduce-file-observer-teardown.ts",
     "speech:models": "tsx scripts/list-speech-models.ts",
     "speech:download": "tsx scripts/download-speech-models.ts",
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
@@ -71,14 +107,15 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.7.2",
-    "@getpaseo/highlight": "0.7.2",
-    "@getpaseo/plugin": "0.7.2",
-    "@getpaseo/protocol": "0.7.2",
-    "@getpaseo/relay": "0.7.2",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/highlight": "0.11.2",
+    "@getpaseo/plugin": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/relay": "0.11.2",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
+    "@opencode/client": "2.0.10",
     "@xterm/headless": "^6.0.0",
     "ai": "5.0.78",
     "ajv": "^8.20.0",
@@ -88,6 +125,7 @@
     "express": "^4.18.2",
     "fast-deep-equal": "^3.1.3",
     "lru-cache": "^11.5.1",
+    "markdown-it": "^10.0.0",
     "mnemonic-id": "^3.2.7",
     "node-pty": "1.2.0-beta.15",
     "openai": "^6.44.0",
@@ -98,17 +136,21 @@
     "pino-pretty": "^13.1.3",
     "qrcode": "^1.5.4",
     "rotating-file-stream": "^3.2.9",
+    "semver": "^7.8.5",
     "sherpa-onnx-node": "1.12.28",
     "strip-ansi": "^7.1.2",
     "tree-kill": "^1.2.2",
+    "typescript": "^5.9.3",
     "uuid": "^9.0.1",
     "which": "^5.0.0",
     "ws": "^8.14.2",
+    "yaml": "2.9.1",
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@playwright/test": "^1.56.1",
     "@types/express": "^4.17.20",
+    "@types/markdown-it": "^14.2.0",
     "@types/node": "^20.9.0",
     "@types/qrcode": "^1.5.6",
     "@types/uuid": "^9.0.7",
@@ -116,7 +158,6 @@
     "@vitest/ui": "^4.1.6",
     "cross-env": "^10.1.0",
     "tsx": "^4.6.0",
-    "typescript": "^5.2.2",
     "vitest": "^4.1.6"
   },
   "overrides": {
diff --git a/packages/server/scripts/analyze-observer-metrics.ts b/packages/server/scripts/analyze-observer-metrics.ts
new file mode 100644
index 0000000000..fe014f0e7e
--- /dev/null
+++ b/packages/server/scripts/analyze-observer-metrics.ts
@@ -0,0 +1,137 @@
+import { createReadStream } from "node:fs";
+import { createInterface } from "node:readline";
+
+interface Sample {
+  uptimeSeconds: number;
+  trackedFiles: number;
+  renames: number;
+  classifications: number;
+  pendingClassifications: number;
+  pendingWork: number;
+  maxReconciliationMs: number;
+  eventLoopMaxMs: number;
+  rssBytes: number;
+  failures: number;
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  return typeof value === "object" && value !== null
+    ? (value as Record<string, unknown>)
+    : undefined;
+}
+
+function asNumber(value: unknown): number | undefined {
+  return typeof value === "number" ? value : undefined;
+}
+
+// Pino lines are prefixed with a plain-text timestamp; the JSON payload starts
+// at the first `{`. Lines that aren't JSON (or aren't ws_runtime_metrics) are skipped.
+function parseLogLine(line: string): Record<string, unknown> | undefined {
+  const start = line.indexOf("{");
+  if (start < 0) return undefined;
+  try {
+    return asRecord(JSON.parse(line.slice(start)));
+  } catch {
+    return undefined;
+  }
+}
+
+function extractObserverRecord(root: Record<string, unknown>): Record<string, unknown> | undefined {
+  const workspaceService = asRecord(asRecord(root.git)?.workspaceService);
+  return asRecord(workspaceService?.fileObserver);
+}
+
+function buildSample(root: Record<string, unknown>, observer: Record<string, unknown>): Sample {
+  const eventLoopDelay = asRecord(root.eventLoopDelay);
+  const memory = asRecord(root.memory);
+  return {
+    uptimeSeconds: asNumber(root.uptimeSeconds) ?? 0,
+    trackedFiles: asNumber(observer.nativeTrackedFileCount) ?? 0,
+    renames: asNumber(observer.nativeRenameEventCount) ?? 0,
+    classifications: asNumber(observer.nativeClassificationCount) ?? 0,
+    pendingClassifications: asNumber(observer.pendingClassificationCount) ?? 0,
+    pendingWork: asNumber(observer.pendingReconciliationWorkCount) ?? 0,
+    maxReconciliationMs: asNumber(observer.maxReconciliationDurationMs) ?? 0,
+    eventLoopMaxMs: asNumber(eventLoopDelay?.maxMs) ?? 0,
+    rssBytes: asNumber(memory?.rss) ?? 0,
+    failures:
+      (asNumber(observer.observerFailureCount) ?? 0) +
+      (asNumber(observer.reconciliationFailureCount) ?? 0) +
+      (asNumber(observer.directoryLimitFailureCount) ?? 0),
+  };
+}
+
+async function readSamples(path: string): Promise<Sample[]> {
+  const samples: Sample[] = [];
+  const lines = createInterface({ input: createReadStream(path), crlfDelay: Infinity });
+  for await (const line of lines) {
+    const root = parseLogLine(line);
+    if (!root) continue;
+    const observer = extractObserverRecord(root);
+    if (!observer) continue;
+    samples.push(buildSample(root, observer));
+  }
+  return samples;
+}
+
+// A daemon restart resets uptime, so a decrease starts a new run.
+function splitRuns(samples: Sample[]): Sample[][] {
+  const runs: Sample[][] = [];
+  let current: Sample[] = [];
+  let previous = Number.NEGATIVE_INFINITY;
+  for (const sample of samples) {
+    if (sample.uptimeSeconds < previous && current.length > 0) {
+      runs.push(current);
+      current = [];
+    }
+    current.push(sample);
+    previous = sample.uptimeSeconds;
+  }
+  if (current.length > 0) runs.push(current);
+  return runs;
+}
+
+function peak(run: Sample[], select: (sample: Sample) => number): number {
+  return run.reduce((highest, sample) => Math.max(highest, select(sample)), 0);
+}
+
+const logPath = process.argv[2];
+if (!logPath) {
+  console.error("usage: analyze-observer-metrics <path-to-daemon.log>");
+  process.exit(1);
+}
+
+const runs = splitRuns(await readSamples(logPath));
+const header = [
+  "run".padStart(3),
+  "samples".padStart(7),
+  "hours".padStart(6),
+  "peakTracked".padStart(11),
+  "renames".padStart(10),
+  "classify".padStart(10),
+  "peakPendClass".padStart(13),
+  "peakPendWork".padStart(12),
+  "maxReconS".padStart(9),
+  "peakLoopS".padStart(9),
+  "peakRssMB".padStart(9),
+  "fails".padStart(5),
+].join(" ");
+console.log(header);
+runs.forEach((run, index) => {
+  console.log(
+    [
+      String(index + 1).padStart(3),
+      String(run.length).padStart(7),
+      (run[run.length - 1].uptimeSeconds / 3600).toFixed(1).padStart(6),
+      String(peak(run, (s) => s.trackedFiles)).padStart(11),
+      String(peak(run, (s) => s.renames)).padStart(10),
+      String(peak(run, (s) => s.classifications)).padStart(10),
+      String(peak(run, (s) => s.pendingClassifications)).padStart(13),
+      String(peak(run, (s) => s.pendingWork)).padStart(12),
+      (peak(run, (s) => s.maxReconciliationMs) / 1000).toFixed(1).padStart(9),
+      (peak(run, (s) => s.eventLoopMaxMs) / 1000).toFixed(1).padStart(9),
+      (peak(run, (s) => s.rssBytes) / 1048576).toFixed(0).padStart(9),
+      String(peak(run, (s) => s.failures)).padStart(5),
+    ].join(" "),
+  );
+});
diff --git a/packages/server/scripts/benchmark-startup-git-real-home.ts b/packages/server/scripts/benchmark-startup-git-real-home.ts
index ba1d1129e4..4dde4e190d 100644
--- a/packages/server/scripts/benchmark-startup-git-real-home.ts
+++ b/packages/server/scripts/benchmark-startup-git-real-home.ts
@@ -140,14 +140,15 @@ async function main(): Promise<void> {
     await client.connect();
     const seen = new Set<string>();
     client.on("checkout_status_update", (message) => seen.add(message.payload.cwd));
+    await client.observeEvents(["checkout_status_update"]).ready;
     const workspaces = await client.fetchWorkspaces({
-      subscribe: { subscriptionId: `startup-git-${scenario}` },
+      subscribe: {},
       sort: [{ key: "activity_at", direction: "desc" }],
       page: { limit: 200 },
     });
     await client.fetchAgents({
       scope: "active",
-      subscribe: { subscriptionId: `startup-agents-${scenario}` },
+      subscribe: {},
       page: { limit: 200 },
     });
 
diff --git a/packages/server/scripts/build-opencode-bridge-plugin.mjs b/packages/server/scripts/build-opencode-bridge-plugin.mjs
index 596f429e51..69f1e774f0 100644
--- a/packages/server/scripts/build-opencode-bridge-plugin.mjs
+++ b/packages/server/scripts/build-opencode-bridge-plugin.mjs
@@ -4,22 +4,27 @@ import { fileURLToPath } from "node:url";
 
 import { build } from "esbuild";
 
-const sourcePath = fileURLToPath(
-  new URL("../src/server/agent/providers/opencode/bridge-plugin.mjs", import.meta.url),
-);
-const outputPath = fileURLToPath(
-  new URL(
-    "../dist/server/server/agent/providers/opencode/bridge-plugin.bundle.mjs",
-    import.meta.url,
-  ),
-);
-
-await mkdir(path.dirname(outputPath), { recursive: true });
-await build({
-  entryPoints: [sourcePath],
-  bundle: true,
-  format: "esm",
-  platform: "neutral",
-  target: "es2022",
-  outfile: outputPath,
-});
+for (const directory of ["", "v2/"]) {
+  const sourcePath = fileURLToPath(
+    new URL(
+      `../src/server/agent/providers/opencode/${directory}bridge-plugin.mjs`,
+      import.meta.url,
+    ),
+  );
+  const outputPath = fileURLToPath(
+    new URL(
+      `../dist/server/server/agent/providers/opencode/${directory}bridge-plugin.bundle.mjs`,
+      import.meta.url,
+    ),
+  );
+  await mkdir(path.dirname(outputPath), { recursive: true });
+  await build({
+    entryPoints: [sourcePath],
+    bundle: true,
+    format: "esm",
+    platform: "neutral",
+    mainFields: ["module", "main"],
+    target: "es2022",
+    outfile: outputPath,
+  });
+}
diff --git a/packages/server/scripts/measure-file-observer.ts b/packages/server/scripts/measure-file-observer.ts
index 2b9774ec43..49a54faf4d 100644
--- a/packages/server/scripts/measure-file-observer.ts
+++ b/packages/server/scripts/measure-file-observer.ts
@@ -1,10 +1,14 @@
 import { execFile } from "node:child_process";
-import { mkdir, mkdtemp, readdir, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { monitorEventLoopDelay, performance } from "node:perf_hooks";
 import { promisify } from "node:util";
-import { createFileObserver, type FileChange } from "../src/server/file-observer/index.js";
+import {
+  createFileObserver,
+  type FileChange,
+  type FileObserverSubscription,
+} from "../src/server/file-observer/index.js";
 
 const DIRECTORY_COUNT = readPositiveInteger("PASEO_WATCH_BENCH_DIRS", 500);
 const ROOT_COUNT = readPositiveInteger("PASEO_WATCH_BENCH_ROOTS", 1);
@@ -17,8 +21,58 @@ const SUSTAINED_EDIT_INTERVAL_MS = readPositiveInteger(
   500,
 );
 const REPETITIONS = readPositiveInteger("PASEO_WATCH_BENCH_REPETITIONS", 1);
+const MODE = resolveMode();
+const LATE_IGNORED_DIRS = readPositiveInteger("PASEO_WATCH_BENCH_LATE_IGNORED_DIRS", 2_000);
+const LATE_IGNORED_FILES = readPositiveInteger("PASEO_WATCH_BENCH_LATE_IGNORED_FILES", 20_000);
+// directory-churn mode exercises removeSubtree/reconcileSubtree/paths.collapse
+// in packages/server/src/server/file-observer/internal/native-recursive.ts,
+// which the healthy and late-ignored fixtures never touch: they only
+// mkdir/writeFile, and every delete happens after unsubscribe.
+const CHURN_DIRECTORY_COUNT = readPositiveInteger("PASEO_WATCH_BENCH_CHURN_DIRECTORIES", 20_000);
+const CHURN_FILES_PER_DIRECTORY = readPositiveInteger(
+  "PASEO_WATCH_BENCH_CHURN_FILES_PER_DIRECTORY",
+  3,
+);
+const CHURN_ROUNDS = readPositiveInteger("PASEO_WATCH_BENCH_CHURN_ROUNDS", 3);
+const CHURN_DIRECTORIES_PER_ROUND = readPositiveInteger(
+  "PASEO_WATCH_BENCH_CHURN_DIRECTORIES_PER_ROUND",
+  500,
+);
+// Sustained rename churn (the production symptom this mode approximates) can
+// leave a single reconciliation running for minutes once the tracked set is
+// large; give it room to finish instead of calling that a timeout failure.
+const CHURN_SETTLE_TIMEOUT_MS = readPositiveInteger(
+  "PASEO_WATCH_BENCH_CHURN_SETTLE_TIMEOUT_MS",
+  300_000,
+);
+// Sequential `await`-per-entry construction lets the observer's pending
+// fs.stat() classifications drain between filesystem calls, so the storm this
+// mode exists to reproduce never piles up: the sequential version could never
+// push pendingClassificationCount past 32, nowhere near the 2,080 bound
+// (32 concurrent + 2,048 queued) a later fix is measured against. Firing
+// batches of concurrent mkdir/writeFile calls overwhelms the libuv threadpool
+// that both the harness's own fs calls and the observer's classify() stat()
+// calls share, which is what produces a real backlog. The batch size is
+// derived from this process's actual open-file limit (see
+// resolveLateIgnoredBatchSize below) rather than hardcoded, so a replay on a
+// machine with a much lower `ulimit -n` (common on Linux/CI, historically on
+// macOS too) degrades to a smaller burst instead of throwing EMFILE mid-run.
+const LATE_IGNORED_BATCH_SIZE = resolveLateIgnoredBatchSize();
+// Reuses the same descriptor-aware sizing as LATE_IGNORED_BATCH_SIZE above:
+// directory-churn mode needs concurrent, not sequential, filesystem calls to
+// outrun the audit's 500ms quiet window and force scopes to pile up.
+const CHURN_BATCH_SIZE = resolveLateIgnoredBatchSize();
 const execFileAsync = promisify(execFile);
 
+type BenchMode = "healthy" | "late-ignored" | "directory-churn";
+
+function resolveMode(): BenchMode {
+  const raw = process.env.PASEO_WATCH_BENCH_MODE;
+  if (raw === "late-ignored") return "late-ignored";
+  if (raw === "directory-churn") return "directory-churn";
+  return "healthy";
+}
+
 interface Measurement {
   backend: string;
   run: number;
@@ -40,6 +94,8 @@ interface Measurement {
   sustainedNativeClassificationCount: number | null;
   sustainedNativeShallowScanCount: number | null;
   sustainedMissedPaths: number;
+  lateIgnoredTrackedFileCount: number | null;
+  peakPendingClassificationCount: number;
   teardownMs: number;
   startupEvents: number;
   deliveredEvents: number;
@@ -53,6 +109,16 @@ interface Measurement {
   kernelWatchCount: number | null;
   scopedReconciliationCount: number | null;
   fullReconciliationCount: number | null;
+  // Absolute values (not deltas) read straight off diagnostics: the observer
+  // instance is fresh per run, so "max"/"last" already scope to this run.
+  maxReconciliationDurationMs: number;
+  lastReconciliationDurationMs: number;
+  // directory-churn mode only; null for healthy/late-ignored.
+  nativeRenameEventCount: number | null;
+  churnDirectoryCount: number | null;
+  churnFileCount: number | null;
+  churnRounds: number | null;
+  churnDirectoriesChurned: number | null;
 }
 
 interface FixtureRoot {
@@ -65,7 +131,7 @@ async function main(): Promise<void> {
   const isChild = process.argv.includes("--child");
 
   if (isChild) {
-    process.stdout.write(`${JSON.stringify(await measure(1))}\n`);
+    process.stdout.write(`${JSON.stringify(await runMeasurement(1))}\n`);
     return;
   }
 
@@ -80,6 +146,10 @@ async function main(): Promise<void> {
   if (!evaluation.passed) process.exitCode = 1;
 }
 
+function runMeasurement(run: number): Promise<Measurement> {
+  return MODE === "directory-churn" ? measureDirectoryChurn(run) : measure(run);
+}
+
 async function measureInChild(run: number): Promise<Measurement> {
   const { stdout } = await execFileAsync(
     process.execPath,
@@ -98,7 +168,7 @@ async function measure(run: number): Promise<Measurement> {
     const ignoredRoot = join(root, "ignored");
     const trackedRoot = join(root, "tracked");
     await Promise.all([
-      mkdir(ignoredRoot, { recursive: true }),
+      MODE === "healthy" ? mkdir(ignoredRoot, { recursive: true }) : Promise.resolve(),
       mkdir(trackedRoot, { recursive: true }),
     ]);
     for (let index = 0; index < DIRECTORY_COUNT; index += 1) {
@@ -135,7 +205,7 @@ async function measure(run: number): Promise<Measurement> {
               firstObservedAt.set(event.path, performance.now());
           }
         },
-        { ignore: [ignoredRoot] },
+        { ignore: MODE === "healthy" ? [ignoredRoot] : [] },
       ),
     ),
   );
@@ -144,7 +214,40 @@ async function measure(run: number): Promise<Measurement> {
   const startupEvents = delivered.length;
   const kernelWatchCount = await readKernelWatchCount();
 
+  let peakPendingClassificationCount = 0;
+  let lateIgnoredTrackedFileCount: number | null = null;
+  let samplePending: ReturnType<typeof setInterval> | undefined;
+
   try {
+    samplePending = setInterval(() => {
+      peakPendingClassificationCount = Math.max(
+        peakPendingClassificationCount,
+        observer.getDiagnostics().pendingClassificationCount,
+      );
+    }, 50);
+    samplePending.unref();
+
+    if (MODE === "late-ignored") {
+      // The whole point: the ignored tree appears only after the observation
+      // exists. Construction runs in concurrent batches (not one
+      // mkdir/writeFile at a time) so filesystem events arrive faster than
+      // the observer can classify them — otherwise nothing ever piles up.
+      for (const target of roots) {
+        await mkdir(target.ignoredRoot, { recursive: true });
+        await runInBatches(LATE_IGNORED_DIRS, LATE_IGNORED_BATCH_SIZE, (index) =>
+          mkdir(join(target.ignoredRoot, `package-${index}`), { recursive: true }),
+        );
+        await runInBatches(LATE_IGNORED_FILES, LATE_IGNORED_BATCH_SIZE, (index) =>
+          writeFile(
+            join(target.ignoredRoot, `package-${index % LATE_IGNORED_DIRS}`, `module-${index}.js`),
+            `${index}\n`,
+          ),
+        );
+      }
+      await new Promise((resolve) => setTimeout(resolve, 2_000));
+      lateIgnoredTrackedFileCount = observer.getDiagnostics().nativeTrackedFileCount;
+    }
+
     for (let index = 0; index < IGNORED_FILE_COUNT; index += 1) {
       const target = roots[index % roots.length];
       await writeFile(join(target.ignoredRoot, `artifact-${index}.txt`), `${index}\n`);
@@ -263,6 +366,8 @@ async function measure(run: number): Promise<Measurement> {
       sustainedMissedPaths: sustainedPaths.filter(
         (path) => !delivered.some((event) => event.path === path),
       ).length,
+      lateIgnoredTrackedFileCount,
+      peakPendingClassificationCount,
       teardownMs,
       startupEvents,
       deliveredEvents: delivered.length,
@@ -282,14 +387,307 @@ async function measure(run: number): Promise<Measurement> {
         diagnosticsAfter.scopedReconciliationCount - diagnosticsBefore.scopedReconciliationCount,
       fullReconciliationCount:
         diagnosticsAfter.fullReconciliationCount - diagnosticsBefore.fullReconciliationCount,
+      maxReconciliationDurationMs: diagnosticsAfter.maxReconciliationDurationMs,
+      lastReconciliationDurationMs: diagnosticsAfter.lastReconciliationDurationMs,
+      nativeRenameEventCount: null,
+      churnDirectoryCount: null,
+      churnFileCount: null,
+      churnRounds: null,
+      churnDirectoriesChurned: null,
     };
   } finally {
+    if (samplePending) clearInterval(samplePending);
     await Promise.all(subscriptions.map((subscription) => subscription.unsubscribe()));
     await observer.close();
     await rm(base, { recursive: true, force: true });
   }
 }
 
+// directory-churn mode. Unlike healthy/late-ignored, this builds one large
+// tracked tree and then repeatedly makes whole known directories disappear —
+// the only way to invoke removeSubtree, reconcileSubtree, and paths.collapse
+// in native-recursive.ts.
+async function measureDirectoryChurn(run: number): Promise<Measurement> {
+  const totalChurnTargets = CHURN_ROUNDS * CHURN_DIRECTORIES_PER_ROUND;
+  if (totalChurnTargets > CHURN_DIRECTORY_COUNT) {
+    throw new Error(
+      `PASEO_WATCH_BENCH_CHURN_ROUNDS (${CHURN_ROUNDS}) * ` +
+        `PASEO_WATCH_BENCH_CHURN_DIRECTORIES_PER_ROUND (${CHURN_DIRECTORIES_PER_ROUND}) = ` +
+        `${totalChurnTargets} must not exceed PASEO_WATCH_BENCH_CHURN_DIRECTORIES ` +
+        `(${CHURN_DIRECTORY_COUNT})`,
+    );
+  }
+
+  const base = await mkdtemp(join(tmpdir(), "paseo-watch-churn-"));
+  const root = join(base, "root");
+  await mkdir(root, { recursive: true });
+  const observer = createFileObserver();
+  let subscription: FileObserverSubscription | null = null;
+
+  try {
+    // 1. Build a large, entirely-tracked tree before subscribing. Nothing
+    // here is ignored: removeSubtree and reconcileSubtree scale with the size
+    // of `this.files` / `this.directories`, so the fixture needs a big
+    // tracked set for their cost to show up at all.
+    await runInBatches(CHURN_DIRECTORY_COUNT, CHURN_BATCH_SIZE, (index) =>
+      mkdir(join(root, `dir-${index}`)),
+    );
+    await runInBatches(
+      CHURN_DIRECTORY_COUNT * CHURN_FILES_PER_DIRECTORY,
+      CHURN_BATCH_SIZE,
+      (flatIndex) => {
+        const directoryIndex = Math.floor(flatIndex / CHURN_FILES_PER_DIRECTORY);
+        const fileIndex = flatIndex % CHURN_FILES_PER_DIRECTORY;
+        return writeFile(
+          join(root, `dir-${directoryIndex}`, `file-${fileIndex}.txt`),
+          `${flatIndex}\n`,
+        );
+      },
+    );
+
+    const rssBefore = process.memoryUsage().rss;
+    const cpuBefore = process.cpuUsage();
+    const diagnosticsBefore = observer.getDiagnostics();
+    const eventLoopDelay = monitorEventLoopDelay({ resolution: 10 });
+    eventLoopDelay.enable();
+    const delivered: FileChange[] = [];
+    let error: Error | null = null;
+
+    const setupStarted = performance.now();
+    subscription = await observer.subscribe(root, (nextError, events) => {
+      error ??= nextError;
+      delivered.push(...events);
+    });
+    const setupMs = performance.now() - setupStarted;
+
+    // 2. Let the initial inventory settle before churning anything.
+    const initialSettled = await waitFor(() => {
+      const diagnostics = observer.getDiagnostics();
+      return (
+        diagnostics.pendingEventCount === 0 &&
+        diagnostics.pendingReconciliationWorkCount === 0 &&
+        diagnostics.reconciliationInFlightCount === 0
+      );
+    }, 120_000);
+    if (!initialSettled) {
+      throw new Error("Timed out waiting for directory-churn initial inventory to settle");
+    }
+    if (error) throw error;
+    const startupEvents = delivered.length;
+    const kernelWatchCount = await readKernelWatchCount();
+
+    // 3. Drive directory churn. Each round deletes half of a batch of known
+    // directories outright (their parent's next shallow scan finds them gone
+    // and calls removeSubtree) and replaces the other half atomically in
+    // place: rm the old directory, then rename a freshly built sibling onto
+    // the same path. The backend's classify() stat() resolves after the
+    // rename completes, sees a directory at a path it already knew as a
+    // directory, and treats it as the directory itself changing —
+    // populating recursiveScopes and driving reconcileSubtree. Firing every
+    // round's operations concurrently, faster than the audit's 500ms quiet
+    // window, is what forces the resulting scopes onto one large
+    // reconciliation instead of many small ones, which is what the
+    // production incident this mode approximates looked like.
+    const diagnosticsBeforeChurn = observer.getDiagnostics();
+    const churnCpuBefore = process.cpuUsage();
+    const churnStarted = performance.now();
+    let nextDirectoryIndex = 0;
+    for (let round = 0; round < CHURN_ROUNDS; round += 1) {
+      const batch: number[] = [];
+      for (let i = 0; i < CHURN_DIRECTORIES_PER_ROUND; i += 1) {
+        batch.push(nextDirectoryIndex);
+        nextDirectoryIndex += 1;
+      }
+      const deleteCount = Math.floor(batch.length / 2);
+      const deleteTargets = batch.slice(0, deleteCount);
+      const replaceTargets = batch.slice(deleteCount);
+      await runInBatches(deleteTargets.length, CHURN_BATCH_SIZE, (offset) =>
+        rm(join(root, `dir-${deleteTargets[offset]}`), { recursive: true, force: true }),
+      );
+      await runInBatches(replaceTargets.length, CHURN_BATCH_SIZE, (offset) =>
+        replaceDirectoryAtomically(
+          join(root, `dir-${replaceTargets[offset]}`),
+          CHURN_FILES_PER_DIRECTORY,
+        ),
+      );
+    }
+    const churnSettled = await waitFor(() => {
+      const diagnostics = observer.getDiagnostics();
+      return (
+        diagnostics.pendingEventCount === 0 &&
+        diagnostics.pendingReconciliationWorkCount === 0 &&
+        diagnostics.reconciliationInFlightCount === 0
+      );
+    }, CHURN_SETTLE_TIMEOUT_MS);
+    if (!churnSettled) {
+      throw new Error(
+        `Timed out waiting for directory-churn reconciliation to settle within ` +
+          `${CHURN_SETTLE_TIMEOUT_MS}ms`,
+      );
+    }
+    const churnDurationMs = performance.now() - churnStarted;
+    const churnCpu = process.cpuUsage(churnCpuBefore);
+    const churnCpuMs = (churnCpu.user + churnCpu.system) / 1_000;
+    if (error) throw error;
+    const diagnosticsAfterChurn = observer.getDiagnostics();
+
+    const teardownStarted = performance.now();
+    await subscription.unsubscribe();
+    const teardownMs = performance.now() - teardownStarted;
+    const diagnosticsAfter = observer.getDiagnostics();
+    const cpu = process.cpuUsage(cpuBefore);
+    eventLoopDelay.disable();
+
+    return {
+      backend: "production",
+      run,
+      setupMs,
+      editLatencyMs: 0,
+      editLatencyP50Ms: 0,
+      editLatencyP95Ms: 0,
+      editLatencyP99Ms: 0,
+      burstDurationMs: churnDurationMs,
+      burstCpuMs: churnCpuMs,
+      sustainedDurationMs: 0,
+      sustainedCpuMs: 0,
+      sustainedScopedReconciliationCount: null,
+      sustainedFullReconciliationCount: null,
+      sustainedNativeEventCount: null,
+      sustainedNativeChangeEventCount: null,
+      sustainedNativeRenameEventCount: null,
+      sustainedNativePathlessEventCount: null,
+      sustainedNativeClassificationCount: null,
+      sustainedNativeShallowScanCount: null,
+      sustainedMissedPaths: 0,
+      lateIgnoredTrackedFileCount: null,
+      peakPendingClassificationCount: 0,
+      teardownMs,
+      startupEvents,
+      deliveredEvents: delivered.length,
+      // Nothing is ignored in this mode's fixture; see the comment at the
+      // CHURN_DIRECTORY_COUNT declaration above.
+      ignoredEvents: 0,
+      missedTrackedPaths: 0,
+      cpuUserMs: cpu.user / 1_000,
+      cpuSystemMs: cpu.system / 1_000,
+      rssDeltaMiB: (process.memoryUsage().rss - rssBefore) / 1024 / 1024,
+      eventLoopDelayP99Ms: eventLoopDelay.percentile(99) / 1_000_000,
+      eventLoopDelayMaxMs: eventLoopDelay.max / 1_000_000,
+      kernelWatchCount,
+      scopedReconciliationCount:
+        diagnosticsAfter.scopedReconciliationCount - diagnosticsBefore.scopedReconciliationCount,
+      fullReconciliationCount:
+        diagnosticsAfter.fullReconciliationCount - diagnosticsBefore.fullReconciliationCount,
+      maxReconciliationDurationMs: diagnosticsAfter.maxReconciliationDurationMs,
+      lastReconciliationDurationMs: diagnosticsAfter.lastReconciliationDurationMs,
+      nativeRenameEventCount:
+        diagnosticsAfterChurn.nativeRenameEventCount -
+        diagnosticsBeforeChurn.nativeRenameEventCount,
+      churnDirectoryCount: CHURN_DIRECTORY_COUNT,
+      churnFileCount: CHURN_DIRECTORY_COUNT * CHURN_FILES_PER_DIRECTORY,
+      churnRounds: CHURN_ROUNDS,
+      churnDirectoriesChurned: totalChurnTargets,
+    };
+  } finally {
+    if (subscription) await subscription.unsubscribe();
+    await observer.close();
+    await rm(base, { recursive: true, force: true });
+  }
+}
+
+// Builds a fresh sibling directory, then rm+rename it onto `directory`. This
+// is the atomic-replace pattern dev-server builds use to swap output
+// directories in place, and the specific shape that drives reconcileSubtree:
+// see the comment inside measureDirectoryChurn's churn loop above.
+async function replaceDirectoryAtomically(directory: string, fileCount: number): Promise<void> {
+  const staging = `${directory}.replacement`;
+  await mkdir(staging);
+  for (let fileIndex = 0; fileIndex < fileCount; fileIndex += 1) {
+    await writeFile(join(staging, `file-${fileIndex}.txt`), `${fileIndex}\n`);
+  }
+  await rm(directory, { recursive: true, force: true });
+  await rename(staging, directory);
+}
+
+function resolveLateIgnoredBatchSize(): number {
+  // A batch this small still produces a genuine burst instead of degenerating
+  // back toward the sequential, one-at-a-time construction this code
+  // replaces — see the comment on LATE_IGNORED_BATCH_SIZE above for why a
+  // burst is required at all.
+  const floor = 64;
+  // Never exceed this regardless of how generous the descriptor limit is.
+  // 2,000 already produces peak pending classifications in the ~2,700-3,200
+  // range on a high-limit machine, comfortably clearing the 2,080 bound the
+  // later fix imposes, so there is no reason to risk more file descriptors
+  // for a larger, noisier number.
+  const ceiling = 2_000;
+  // Used when this runtime cannot report its own descriptor limit at all.
+  // Small enough to be safe under a default Linux/CI soft limit of roughly
+  // 1,024-4,096, still large enough to produce a real burst.
+  const fallback = 512;
+  const softLimit = readOpenFileSoftLimit();
+  if (softLimit === null) return fallback;
+  // Leave headroom for everything else the process holds open at the same
+  // time: stdio, the fixture's own already-created directories/files, the
+  // observer's native watch handle, and Node's own bookkeeping fds.
+  const quarter = Math.floor(softLimit / 4);
+  return Math.min(ceiling, Math.max(floor, quarter));
+}
+
+function readOpenFileSoftLimit(): number | null {
+  // Node's diagnostic report is the only cross-platform way to read this
+  // process's own open-file (RLIMIT_NOFILE) soft limit without shelling out
+  // to `ulimit -n`, which is a shell builtin with no direct Node API.
+  // `header.fileDescriptorSoftLimit` is checked first for forward/backward
+  // compatibility, but it does not exist on this script's tested runtime
+  // (verified empirically: `undefined` on Node v24.15.0/darwin). The field
+  // that does exist there, and is expected to exist on Linux too since it
+  // comes from the same libuv getrlimit() call, is
+  // `userLimits.open_files.soft`.
+  let report: unknown;
+  try {
+    report = process.report?.getReport();
+  } catch {
+    return null;
+  }
+  if (typeof report !== "object" || report === null) return null;
+  const asRecord = report as Record<string, unknown>;
+  return (
+    parseDescriptorLimit(readNestedField(asRecord, ["header", "fileDescriptorSoftLimit"])) ??
+    parseDescriptorLimit(readNestedField(asRecord, ["userLimits", "open_files", "soft"]))
+  );
+}
+
+function readNestedField(source: Record<string, unknown>, path: string[]): unknown {
+  let current: unknown = source;
+  for (const key of path) {
+    if (typeof current !== "object" || current === null) return undefined;
+    current = (current as Record<string, unknown>)[key];
+  }
+  return current;
+}
+
+function parseDescriptorLimit(value: unknown): number | null {
+  if (typeof value === "number" && Number.isFinite(value) && value > 0) return value;
+  if (typeof value === "string" && value.trim().toLowerCase() === "unlimited") {
+    return Number.POSITIVE_INFINITY;
+  }
+  return null;
+}
+
+async function runInBatches(
+  count: number,
+  batchSize: number,
+  createEntry: (index: number) => Promise<unknown>,
+): Promise<void> {
+  for (let start = 0; start < count; start += batchSize) {
+    const end = Math.min(start + batchSize, count);
+    const batch: Promise<unknown>[] = [];
+    for (let index = start; index < end; index += 1) batch.push(createEntry(index));
+    await Promise.all(batch);
+  }
+}
+
 async function readKernelWatchCount(): Promise<number | null> {
   if (process.platform !== "linux") return null;
   let count = 0;
@@ -311,6 +709,11 @@ function fixtureDescription() {
     sustainedEdits: SUSTAINED_EDIT_COUNT,
     sustainedEditIntervalMs: SUSTAINED_EDIT_INTERVAL_MS,
     repetitions: REPETITIONS,
+    mode: MODE,
+    churnDirectories: CHURN_DIRECTORY_COUNT,
+    churnFilesPerDirectory: CHURN_FILES_PER_DIRECTORY,
+    churnRounds: CHURN_ROUNDS,
+    churnDirectoriesPerRound: CHURN_DIRECTORIES_PER_ROUND,
     platform: process.platform,
     arch: process.arch,
     node: process.version,
@@ -321,6 +724,12 @@ function evaluate(results: Measurement[]): {
   passed: boolean;
   failures: string[];
 } {
+  if (MODE === "directory-churn") {
+    // This phase exists to characterize a known-bad code path (removeSubtree
+    // and reconcileSubtree scanning the whole tracked set per disappeared
+    // directory), not to gate CI on a threshold yet.
+    return { passed: true, failures: [] };
+  }
   const failures: string[] = [];
   for (const result of results) {
     evaluateStandaloneResult(result, failures);
@@ -332,7 +741,10 @@ function evaluateStandaloneResult(result: Measurement, failures: string[]): void
   if (result.missedTrackedPaths !== 0) {
     failures.push(`observer missed ${result.missedTrackedPaths} tracked paths`);
   }
-  if (result.ignoredEvents !== 0) {
+  // In late-ignored mode, nonzero ignoredEvents is the bug reproducing, not a
+  // regression: the observer is deliberately given the ignored tree only
+  // after it subscribes, so it has no way to exclude it yet.
+  if (MODE !== "late-ignored" && result.ignoredEvents !== 0) {
     failures.push(`observer emitted ${result.ignoredEvents} excluded events`);
   }
   if (result.sustainedMissedPaths !== 0) {
diff --git a/packages/server/scripts/supervisor-entrypoint.env.test.ts b/packages/server/scripts/supervisor-entrypoint.env.test.ts
new file mode 100644
index 0000000000..d87bc678e8
--- /dev/null
+++ b/packages/server/scripts/supervisor-entrypoint.env.test.ts
@@ -0,0 +1,85 @@
+import { spawn } from "node:child_process";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { expect, test } from "vitest";
+import {
+  resolveSherpaLoaderEnv,
+  sherpaLoaderEnvKey,
+} from "../src/server/speech/providers/local/sherpa/sherpa-runtime-env.js";
+
+const loaderKey = sherpaLoaderEnvKey();
+const loaderEnv = resolveSherpaLoaderEnv();
+
+// Agents and terminals inherit the daemon worker's environment, so the local speech
+// runtime's library directory must stay scoped to the speech worker.
+test.runIf(loaderKey && loaderEnv)(
+  "daemon worker environment does not carry the local speech library directory",
+  async () => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-supervisor-env-"));
+    const reportPath = path.join(root, "worker-env.json");
+    const preloadPath = path.join(root, "report-worker-env.mjs");
+    await writeFile(
+      preloadPath,
+      `
+      import { writeFileSync } from "node:fs";
+      if (/daemon-worker\\.(ts|js)$/.test(process.argv[1] ?? "")) {
+        writeFileSync(${JSON.stringify(reportPath)}, JSON.stringify({ value: process.env[${JSON.stringify(loaderKey)}] ?? "" }));
+        process.exit(0);
+      }
+    `,
+    );
+    const env = Object.fromEntries(
+      Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+    );
+    // Start from a parent environment that does not already list the speech library directory.
+    const envLoaderKey =
+      Object.keys(env).find((key) => key.toLowerCase() === loaderKey!.toLowerCase()) ?? loaderKey!;
+    const parentValue = (env[envLoaderKey] ?? "")
+      .split(path.delimiter)
+      .filter((entry) => entry && entry !== loaderEnv!.libDir)
+      .join(path.delimiter);
+    env[envLoaderKey] = parentValue;
+    const child = spawn(
+      process.execPath,
+      ["--import", "tsx", fileURLToPath(new URL("./supervisor-entrypoint.ts", import.meta.url))],
+      {
+        cwd: fileURLToPath(new URL("../../../", import.meta.url)),
+        env: {
+          ...env,
+          HOME: root,
+          USERPROFILE: root,
+          PASEO_HOME: path.join(root, "home"),
+          NODE_OPTIONS: `--import=${pathToFileURL(preloadPath).href}`,
+        },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+    let output = "";
+    child.stdout.on("data", (chunk) => {
+      output += chunk;
+    });
+    child.stderr.on("data", (chunk) => {
+      output += chunk;
+    });
+    try {
+      await expect
+        .poll(async () => readFile(reportPath, "utf8").catch(() => null), {
+          timeout: 20_000,
+          message: output,
+        })
+        .not.toBeNull();
+      const report = JSON.parse(await readFile(reportPath, "utf8")) as { value: string };
+      expect(report.value).toBe(parentValue);
+    } finally {
+      if (child.exitCode === null) {
+        const closed = new Promise((resolve) => child.once("close", resolve));
+        child.kill("SIGKILL");
+        await closed;
+      }
+      await rm(root, { recursive: true, force: true });
+    }
+  },
+  30_000,
+);
diff --git a/packages/server/scripts/supervisor-entrypoint.ts b/packages/server/scripts/supervisor-entrypoint.ts
index b379e6179f..ee3746accf 100644
--- a/packages/server/scripts/supervisor-entrypoint.ts
+++ b/packages/server/scripts/supervisor-entrypoint.ts
@@ -1,5 +1,5 @@
 import { fileURLToPath } from "url";
-import { existsSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 import {
   acquirePidLock,
@@ -9,22 +9,21 @@ import {
   updatePidLock,
 } from "../src/server/pid-lock.js";
 import { resolvePaseoHome } from "../src/server/paseo-home.js";
+import { daemonLogPath } from "../src/server/daemon-instance.js";
+import { PRIVATE_FILE_MODE } from "../src/server/private-files.js";
 import { loadPersistedConfig } from "../src/server/persisted-config.js";
 import { runSupervisor } from "./supervisor.js";
 import { resolveSupervisorLogFile } from "./supervisor-log-config.js";
-import { applySherpaLoaderEnv } from "../src/server/speech/providers/local/sherpa/sherpa-runtime-env.js";
 
 process.title = "Paseo Supervisor";
 
 interface DaemonRunnerConfig {
   devMode: boolean;
-  reclaimStalePidLock: boolean;
   workerArgs: string[];
 }
 
 function parseConfig(argv: string[]): DaemonRunnerConfig {
   let devMode = false;
-  let reclaimStalePidLock = false;
   const workerArgs: string[] = [];
 
   for (const arg of argv) {
@@ -33,13 +32,14 @@ function parseConfig(argv: string[]): DaemonRunnerConfig {
       continue;
     }
     if (arg === "--reclaim-stale-pid-lock") {
-      reclaimStalePidLock = true;
-      continue;
+      throw new Error(
+        "--reclaim-stale-pid-lock was removed: stop the existing supervisor before starting another.",
+      );
     }
     workerArgs.push(arg);
   }
 
-  return { devMode, reclaimStalePidLock, workerArgs };
+  return { devMode, workerArgs };
 }
 
 function resolveWorkerEntry(): string {
@@ -107,8 +107,6 @@ async function main(): Promise<void> {
       ? resolvePackagedNodeEntrypointRunnerPath(fileURLToPath(import.meta.url))
       : null;
 
-  applySherpaLoaderEnv(workerEnv);
-
   const paseoHome = resolvePaseoHome(workerEnv);
   const persistedConfig = loadPersistedConfig(paseoHome);
   const supervisorLogFile = resolveSupervisorLogFile(paseoHome, persistedConfig, workerEnv);
@@ -116,13 +114,10 @@ async function main(): Promise<void> {
   try {
     await acquirePidLock(paseoHome, null, {
       ownerPid: process.pid,
-      reclaimStaleDesktopLock: config.reclaimStalePidLock,
     });
   } catch (error) {
     if (error instanceof PidLockError) {
-      process.stderr.write(`${error.message}\n`);
-      process.exit(1);
-      return;
+      failStartup(error.message, error.message);
     }
     throw error;
   }
@@ -174,16 +169,41 @@ async function main(): Promise<void> {
       : undefined,
     restartOnCrash: true,
     logFile: supervisorLogFile,
-    onWorkerReady: async ({ listen }) => {
-      await updatePidLock(paseoHome, { listen }, { ownerPid: process.pid });
+    onWorkerReady: async ({ listen, serverId }) => {
+      await updatePidLock(paseoHome, { listen, serverId }, { ownerPid: process.pid });
     },
+    onWorkerExit: () =>
+      updatePidLock(paseoHome, { listen: null, serverId: null }, { ownerPid: process.pid }),
     onSupervisorExit: releaseLock,
   });
   requestSupervisorShutdown = supervisor.requestShutdown;
 }
 
-void main().catch((error) => {
-  const message = error instanceof Error ? (error.stack ?? error.message) : String(error);
-  process.stderr.write(`${message}\n`);
+// The supervisor opens its log only after config and the PID lock succeed. A background
+// launch discards stderr, so earlier failures also go to the log the launcher points at.
+function failStartup(detail: string, summary: string): never {
+  process.stderr.write(`${detail}\n`);
+  try {
+    const logPath = daemonLogPath(resolvePaseoHome(process.env));
+    mkdirSync(path.dirname(logPath), { recursive: true });
+    appendFileSync(
+      logPath,
+      `${JSON.stringify({
+        level: "fatal",
+        time: new Date().toISOString(),
+        pid: process.pid,
+        name: "DaemonRunner",
+        msg: summary,
+      })}\n`,
+      { mode: PRIVATE_FILE_MODE },
+    );
+  } catch {
+    // stderr already carries the failure.
+  }
   process.exit(1);
+}
+
+void main().catch((error) => {
+  if (error instanceof Error) failStartup(error.stack ?? error.message, error.message);
+  failStartup(String(error), String(error));
 });
diff --git a/packages/server/scripts/supervisor.logging.test.ts b/packages/server/scripts/supervisor.logging.test.ts
index 9b4c622860..6f9754994a 100644
--- a/packages/server/scripts/supervisor.logging.test.ts
+++ b/packages/server/scripts/supervisor.logging.test.ts
@@ -1,4 +1,4 @@
-import { mkdtemp, readFile, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -23,6 +23,13 @@ async function runSupervisorFixture(options: {
   workerSource: string;
   restartOnCrash?: boolean;
   timeoutMs?: number;
+  /** POSIX RLIMIT_FSIZE for the supervisor, in 512-byte blocks: writes past it fail like a full disk. */
+  fileSizeLimitBlocks?: number;
+  /** Occupy the log path with a directory so the supervisor cannot open daemon.log. */
+  blockLogPath?: boolean;
+  /** Close the reading end of the supervisor's stdout and stderr as soon as it starts. */
+  closeOutput?: boolean;
+  env?: NodeJS.ProcessEnv;
 }): Promise<{
   code: number | null;
   signal: NodeJS.Signals | null;
@@ -36,7 +43,13 @@ async function runSupervisorFixture(options: {
   const workerPath = path.join(tempDir, "worker.mjs");
   const runnerPath = path.join(tempDir, "runner.mjs");
 
-  await writeFile(workerPath, options.workerSource);
+  if (options.blockLogPath) {
+    await mkdir(logPath);
+  }
+  await writeFile(
+    workerPath,
+    `process.send?.({ type: "paseo:ready", listen: "fixture", serverId: "srv_fixture" });\n${options.workerSource}`,
+  );
   await writeFile(
     runnerPath,
     `
@@ -59,12 +72,30 @@ async function runSupervisorFixture(options: {
   );
 
   const startedAt = Date.now();
-  const child = spawn(process.execPath, ["--import", "tsx", runnerPath], {
+  const runnerArgs = [process.execPath, "--import", "tsx", runnerPath];
+  const [command, ...args] =
+    options.fileSizeLimitBlocks === undefined
+      ? runnerArgs
+      : [
+          "/bin/sh",
+          "-c",
+          `ulimit -f ${options.fileSizeLimitBlocks} && exec "$@"`,
+          "sh",
+          ...runnerArgs,
+        ];
+  const child = spawn(command, args, {
     cwd: repoRoot,
-    env: { ...process.env },
+    // A Node color-conflict warning can hit closed stderr before runSupervisor installs
+    // its pipe-error handlers. This fixture exercises the supervisor's own output.
+    env: { ...process.env, ...options.env, NO_COLOR: undefined, FORCE_COLOR: undefined },
     stdio: ["ignore", "pipe", "pipe"],
   });
 
+  if (options.closeOutput) {
+    child.stdout.destroy();
+    child.stderr.destroy();
+  }
+
   let stdout = "";
   let stderr = "";
   child.stdout.setEncoding("utf8");
@@ -95,10 +126,19 @@ async function runSupervisorFixture(options: {
     });
   });
 
-  const log = await readFile(logPath, "utf8");
+  const log = await readLogIfWritten(logPath);
   return { code, signal, elapsedMs: Date.now() - startedAt, log, stdout, stderr };
 }
 
+async function readLogIfWritten(logPath: string): Promise<string> {
+  try {
+    return await readFile(logPath, "utf8");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return "";
+    throw error;
+  }
+}
+
 describe("supervisor durable logging", () => {
   test("resolves rotation defaults", () => {
     const paseoHome = path.join(path.sep, "tmp", "paseo-home");
@@ -168,6 +208,37 @@ describe("supervisor durable logging", () => {
     expect(result.stderr).toContain('"worker-json-stderr"');
   });
 
+  test.each([
+    { colors: "inherited", env: {} },
+    { colors: "conflicting", env: { NO_COLOR: "1", FORCE_COLOR: "1" } },
+  ])(
+    "keeps supervising the worker when nobody reads its stdout or stderr with $colors colors",
+    async ({ env }) => {
+      const result = await runSupervisorFixture({
+        closeOutput: true,
+        env,
+        workerSource: `
+        process.on("message", (message) => {
+          if (message?.type === "paseo:graceful-shutdown") process.exit(0);
+        });
+        process.stdout.write("first stdout line\\n");
+        process.stderr.write("first stderr line\\n");
+        setTimeout(() => {
+          process.stdout.write("later stdout line\\n");
+          process.send?.({ type: "paseo:shutdown", reason: "closed_output_probe" });
+        }, 500);
+        setInterval(() => {}, 1000);
+      `,
+      });
+
+      expect(result.code).toBe(0);
+      expect(result.signal).toBeNull();
+      expect(result.log).toContain("first stderr line\n");
+      expect(result.log).toContain("later stdout line\n");
+      expect(result.log).toContain('"reason":"closed_output_probe"');
+    },
+  );
+
   test("preserves raw non-JSON stdout and stderr lines", async () => {
     const result = await runSupervisorFixture({
       workerSource: `
@@ -345,4 +416,55 @@ describe("supervisor durable logging", () => {
       expect(result.log).toContain("Supervisor exiting");
     },
   );
+
+  // POSIX-only: RLIMIT_FSIZE is how the test makes daemon.log writes fail.
+  test.skipIf(isPlatform("win32"))(
+    "keeps supervising the worker when daemon.log can no longer be written",
+    async () => {
+      const result = await runSupervisorFixture({
+        fileSizeLimitBlocks: 128,
+        workerSource: `
+          process.on("message", (message) => {
+            if (message?.type === "paseo:graceful-shutdown") process.exit(0);
+          });
+          const line = '{"level":30,"msg":"' + "x".repeat(1000) + '"}\\n';
+          for (let i = 0; i < 200; i += 1) process.stdout.write(line);
+          setTimeout(() => {
+            process.send?.({ type: "paseo:shutdown", reason: "log_write_failure_probe" });
+          }, 1000);
+          setInterval(() => {}, 1000);
+        `,
+      });
+
+      expect(result.stderr).not.toContain("Unhandled 'error' event");
+      expect(result.code).toBe(0);
+      expect(result.signal).toBeNull();
+    },
+  );
+
+  test("resumes writing daemon.log once the log path is writable again", async () => {
+    const result = await runSupervisorFixture({
+      blockLogPath: true,
+      workerSource: `
+        import { rmdirSync } from "node:fs";
+
+        process.on("message", (message) => {
+          if (message?.type === "paseo:graceful-shutdown") process.exit(0);
+        });
+        process.stdout.write("line while daemon.log is blocked\\n");
+        setTimeout(() => {
+          rmdirSync(process.argv[1].replace(/worker\\.mjs$/, "daemon.log"));
+          process.stdout.write("line after daemon.log is writable\\n");
+          setTimeout(() => {
+            process.send?.({ type: "paseo:shutdown", reason: "log_recovery_probe" });
+          }, 200);
+        }, 500);
+        setInterval(() => {}, 1000);
+      `,
+    });
+
+    expect(result.code).toBe(0);
+    expect(result.log).toContain("line after daemon.log is writable\n");
+    expect(result.log).toContain('"reason":"log_recovery_probe"');
+  });
 });
diff --git a/packages/server/scripts/supervisor.readiness.test.ts b/packages/server/scripts/supervisor.readiness.test.ts
new file mode 100644
index 0000000000..bfd02b1402
--- /dev/null
+++ b/packages/server/scripts/supervisor.readiness.test.ts
@@ -0,0 +1,122 @@
+import { spawn } from "node:child_process";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+
+async function runWorker(worker: string, publicationDelay = 0) {
+  const home = await mkdtemp(path.join(tmpdir(), "paseo-readiness-"));
+  const workerPath = path.join(home, "worker.mjs");
+  const runnerPath = path.join(home, "runner.mjs");
+  const eventsPath = path.join(home, "events.jsonl");
+  const supervisor = new URL("./supervisor.ts", import.meta.url).href;
+  await writeFile(workerPath, worker);
+  await writeFile(
+    runnerPath,
+    `
+    import { appendFile } from "node:fs/promises";
+    import { runSupervisor } from ${JSON.stringify(supervisor)};
+    const record = (event) => appendFile(${JSON.stringify(eventsPath)}, JSON.stringify(event) + "\\n");
+    runSupervisor({
+      name: "ReadinessTest", startupMessage: "starting", restartOnCrash: true,
+      resolveWorkerEntry: () => ${JSON.stringify(workerPath)}, workerArgs: [], workerExecArgv: [],
+      onWorkerReady: async ({ listen }) => {
+        await new Promise(resolve => setTimeout(resolve, ${publicationDelay}));
+        await record(listen);
+      },
+      onWorkerExit: () => record(null),
+    });
+  `,
+  );
+  const env = Object.fromEntries(
+    Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+  );
+  const child = spawn(process.execPath, ["--import", "tsx", runnerPath], {
+    cwd: fileURLToPath(new URL("../../../", import.meta.url)),
+    env: { ...env, HOME: home, PASEO_HOME: home },
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  let output = "";
+  child.stdout.on("data", (chunk) => {
+    output += chunk;
+  });
+  child.stderr.on("data", (chunk) => {
+    output += chunk;
+  });
+  try {
+    const code = await new Promise<number | null>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        child.kill("SIGKILL");
+        reject(new Error(output));
+      }, 5_000);
+      child.once("error", reject);
+      child.once("close", (exitCode) => {
+        clearTimeout(timer);
+        resolve(exitCode);
+      });
+    });
+    const events = await readFile(eventsPath, "utf8").catch(() => "");
+    return {
+      code,
+      output,
+      events: events
+        .trim()
+        .split("\n")
+        .filter(Boolean)
+        .map((line) => JSON.parse(line)),
+    };
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+}
+
+test("a worker that exits before ready fails the supervisor without respawning", async () => {
+  const result = await runWorker(`
+    import { existsSync, writeFileSync } from "node:fs";
+    const marker = process.argv[1] + ".started";
+    if (existsSync(marker)) process.exit(0);
+    writeFileSync(marker, "started");
+    process.exit(1);
+  `);
+  expect(result.code).toBe(1);
+  expect(result.output).not.toContain("Restarting worker");
+});
+
+test("a replacement worker must independently reach ready", async () => {
+  const result = await runWorker(`
+    import { existsSync, writeFileSync } from "node:fs";
+    const marker = process.argv[1] + ".started";
+    if (existsSync(marker)) process.exit(0);
+    writeFileSync(marker, "started");
+    process.on("message", message => {
+      if (message.type === "paseo:graceful-shutdown") process.exit(0);
+    });
+    process.send({ type: "paseo:ready", listen: "test-endpoint", serverId: "srv_test" });
+    process.send({ type: "paseo:restart" });
+  `);
+  expect(result.code).toBe(1);
+  expect(result.events, result.output).toEqual(["test-endpoint", null, null]);
+});
+
+test("exit clears publication after an in-flight ready write", async () => {
+  const result = await runWorker(
+    `
+    process.send({ type: "paseo:ready", listen: "test-endpoint", serverId: "srv_test" }, () => process.exit(0));
+  `,
+    100,
+  );
+  expect(result.code).toBe(0);
+  expect(result.events.at(-1)).toBeNull();
+});
+
+test("requested shutdown before first readiness exits successfully", async () => {
+  const result = await runWorker(`
+    process.on("message", message => {
+      if (message.type === "paseo:graceful-shutdown") process.exit(0);
+    });
+    process.send({ type: "paseo:shutdown", reason: "cancelled_start" });
+  `);
+  expect(result.code).toBe(0);
+  expect(result.events).toEqual([null]);
+});
diff --git a/packages/server/scripts/supervisor.ts b/packages/server/scripts/supervisor.ts
index f2d9fc7665..ec56822619 100644
--- a/packages/server/scripts/supervisor.ts
+++ b/packages/server/scripts/supervisor.ts
@@ -1,7 +1,9 @@
 import { fork, spawn, type ChildProcess } from "child_process";
-import { mkdirSync } from "node:fs";
 import path from "node:path";
-import { createStream as createRotatingFileStream } from "rotating-file-stream";
+import {
+  createStream as createRotatingFileStream,
+  type RotatingFileStream,
+} from "rotating-file-stream";
 import { signalProcessTree } from "../src/utils/tree-kill.js";
 
 const WORKER_HEARTBEAT_INTERVAL_MS = 1_000;
@@ -23,6 +25,7 @@ type WorkerLifecycleMessage =
   | {
       type: "paseo:ready";
       listen: string;
+      serverId: string;
     }
   | {
       type: "paseo:restart";
@@ -50,7 +53,8 @@ interface SupervisorOptions {
     args: string[];
     env?: NodeJS.ProcessEnv;
   } | null;
-  onWorkerReady?: (message: { listen: string }) => Promise<void> | void;
+  onWorkerReady?: (message: { listen: string; serverId: string }) => Promise<void> | void;
+  onWorkerExit?: () => Promise<void> | void;
   restartOnCrash?: boolean;
   onSupervisorExit?: () => Promise<void> | void;
   logFile?: SupervisorLogFileOptions;
@@ -77,11 +81,14 @@ function parseLifecycleMessage(msg: unknown): WorkerLifecycleMessage | null {
     };
   }
   if (type === "paseo:ready") {
-    const listen = (msg as { listen?: unknown }).listen;
+    const { listen, serverId } = msg as { listen?: unknown; serverId?: unknown };
     if (typeof listen !== "string" || listen.trim().length === 0) {
       return null;
     }
-    return { type: "paseo:ready", listen };
+    if (typeof serverId !== "string" || serverId.trim().length === 0) {
+      return null;
+    }
+    return { type: "paseo:ready", listen, serverId };
   }
   if (type === "paseo:restart") {
     const reason = (msg as { reason?: unknown }).reason;
@@ -105,17 +112,67 @@ function toRotatingFileStreamSize(size: string): string {
   return `${value}${unit}`;
 }
 
-function createSupervisorLogStream(options: SupervisorLogFileOptions | undefined) {
-  if (!options) {
-    return null;
-  }
+// daemon.log is best effort: a full disk or a replaced log path must not take the
+// supervisor, and with it the worker, down. A failed stream is dropped and a new one
+// is opened on the next write, so logging resumes once the file is writable again.
+function createDurableLog(
+  options: SupervisorLogFileOptions | undefined,
+  reportFailure: (message: string) => void,
+) {
+  let stream: RotatingFileStream | null = null;
+  let failing = false;
 
-  mkdirSync(path.dirname(options.path), { recursive: true });
-  return createRotatingFileStream(path.basename(options.path), {
-    path: path.dirname(options.path),
-    size: toRotatingFileStreamSize(options.rotate.maxSize),
-    maxFiles: options.rotate.maxFiles,
-  });
+  const open = (logFile: SupervisorLogFileOptions): RotatingFileStream => {
+    const next = createRotatingFileStream(path.basename(logFile.path), {
+      path: path.dirname(logFile.path),
+      size: toRotatingFileStreamSize(logFile.rotate.maxSize),
+      maxFiles: logFile.rotate.maxFiles,
+    });
+    next.on("error", (error) => {
+      if (stream === next) {
+        stream = null;
+      }
+      if (!failing) {
+        failing = true;
+        reportFailure(
+          `Cannot write ${logFile.path}, will retry on the next log line: ${error.message}`,
+        );
+      }
+    });
+    return next;
+  };
+
+  return {
+    write(chunk: string | Buffer): void {
+      if (!options) {
+        return;
+      }
+      stream ??= open(options);
+      stream.write(chunk, (error) => {
+        if (!error) {
+          failing = false;
+        }
+      });
+    },
+    close(): Promise<void> {
+      return new Promise((resolve) => {
+        if (!stream) {
+          resolve();
+          return;
+        }
+        stream.end(() => resolve());
+      });
+    },
+  };
+}
+
+// The program that started the daemon can close its end of stdout or stderr, as
+// `paseo daemon run | head -1` does. Drop the output nobody reads and keep supervising
+// the worker; daemon.log still records it.
+function ignoreClosedOutput(error: NodeJS.ErrnoException): void {
+  if (error.code !== "EPIPE") {
+    throw error;
+  }
 }
 
 export function runSupervisor(options: SupervisorOptions): SupervisorController {
@@ -129,11 +186,15 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
   let restarting = false;
   let shuttingDown = false;
   let exiting = false;
+  let lifecycleFailed = false;
+  let publication = Promise.resolve();
   let forceKillTimer: NodeJS.Timeout | null = null;
-  const logStream = createSupervisorLogStream(options.logFile);
+  const durableLog = createDurableLog(options.logFile, (message) => {
+    process.stderr.write(`[${options.name}] ${message}\n`);
+  });
 
   const writeDurableChunk = (chunk: string | Buffer): void => {
-    logStream?.write(chunk);
+    durableLog.write(chunk);
   };
 
   const writeLifecycleLog = (message: string, fields: Record<string, unknown> = {}): void => {
@@ -154,14 +215,7 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
     writeLifecycleLog(message);
   };
 
-  const closeLogStream = (): Promise<void> =>
-    new Promise((resolve) => {
-      if (!logStream) {
-        resolve();
-        return;
-      }
-      logStream.end(resolve);
-    });
+  const closeLogStream = (): Promise<void> => durableLog.close();
 
   const exitSupervisor = (code: number): void => {
     if (exiting) {
@@ -244,6 +298,8 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
     }
 
     const currentChild = child;
+    let reachedReady = false;
+    // Serialize endpoint writes with exit/clear before allowing another worker to spawn.
     const heartbeat = setInterval(() => {
       const message: SupervisorHeartbeatMessage = { type: "paseo:supervisor-heartbeat" };
       if (currentChild.connected) {
@@ -276,18 +332,26 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
 
     child.on("message", (msg: unknown) => {
       const lifecycleMessage = parseLifecycleMessage(msg);
-      if (!lifecycleMessage) {
+      if (!lifecycleMessage || child !== currentChild) {
         return;
       }
 
       if (lifecycleMessage.type === "paseo:ready") {
+        reachedReady = true;
         writeLifecycleLog("Worker ready", { listen: lifecycleMessage.listen });
-        Promise.resolve(options.onWorkerReady?.({ listen: lifecycleMessage.listen })).catch(
-          (error) => {
+        publication = publication
+          .then(() =>
+            options.onWorkerReady?.({
+              listen: lifecycleMessage.listen,
+              serverId: lifecycleMessage.serverId,
+            }),
+          )
+          .catch((error) => {
+            lifecycleFailed = true;
             const message = error instanceof Error ? error.message : String(error);
             log(`Worker ready callback failed: ${message}`);
-          },
-        );
+            requestShutdown("endpoint_publication_failed");
+          });
         return;
       }
 
@@ -303,35 +367,57 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
       requestRestart(reason);
     });
 
+    child.on("error", (error) => {
+      lifecycleFailed = true;
+      log(`Worker spawn failed: ${error.message}`);
+      exitSupervisor(1);
+    });
+
     child.on("exit", (code, signal) => {
       clearInterval(heartbeat);
       clearForceKillTimer();
-      const exitDescriptor = describeExit(code, signal);
-      writeLifecycleLog("Worker exited", { code, signal, exit: exitDescriptor });
+      child = null;
+      publication = publication
+        .then(() => options.onWorkerExit?.())
+        .catch((error) => {
+          lifecycleFailed = true;
+          log(`Worker exit callback failed: ${String(error)}`);
+        });
+      void publication.then(() => {
+        const exitDescriptor = describeExit(code, signal);
+        writeLifecycleLog("Worker exited", { code, signal, exit: exitDescriptor });
 
-      if (shuttingDown) {
-        log(`Worker exited (${exitDescriptor}). Supervisor shutting down.`);
-        exitSupervisor(0);
+        if (lifecycleFailed || (!reachedReady && !shuttingDown)) {
+          log(`Worker exited before successful readiness (${exitDescriptor}). Supervisor exiting.`);
+          exitSupervisor(1);
+          return;
+        }
+
+        if (shuttingDown) {
+          log(`Worker exited (${exitDescriptor}). Supervisor shutting down.`);
+          exitSupervisor(0);
+          return;
+        }
+
+        const crashed =
+          restartOnCrash &&
+          ((code !== 0 && code !== null) || (signal !== null && signal !== "SIGTERM"));
+
+        if (restarting || crashed) {
+          restarting = false;
+          log(
+            crashed
+              ? `Worker crashed (${exitDescriptor}). Restarting worker...`
+              : `Worker exited (${exitDescriptor}). Restarting worker...`,
+          );
+          spawnWorker();
+          return;
+        }
+
+        log(`Worker exited (${exitDescriptor}). Supervisor exiting.`);
+        exitSupervisor(typeof code === "number" ? code : 1);
         return;
-      }
-
-      const crashed =
-        restartOnCrash &&
-        ((code !== 0 && code !== null) || (signal !== null && signal !== "SIGTERM"));
-
-      if (restarting || crashed) {
-        restarting = false;
-        log(
-          crashed
-            ? `Worker crashed (${exitDescriptor}). Restarting worker...`
-            : `Worker exited (${exitDescriptor}). Restarting worker...`,
-        );
-        spawnWorker();
-        return;
-      }
-
-      log(`Worker exited (${exitDescriptor}). Supervisor exiting.`);
-      exitSupervisor(typeof code === "number" ? code : 1);
+      });
     });
   };
 
@@ -389,7 +475,10 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
     writeLifecycleLog("Supervisor shutdown requested", { reason });
     log(`${reason}. Stopping worker...`);
     if (!child) {
-      exitSupervisor(0);
+      void publication.then(() => {
+        exitSupervisor(lifecycleFailed ? 1 : 0);
+        return;
+      });
       return;
     }
     requestWorkerShutdown(reason);
@@ -402,6 +491,8 @@ export function runSupervisor(options: SupervisorOptions): SupervisorController
 
   process.on("SIGINT", () => forwardSignal("SIGINT"));
   process.on("SIGTERM", () => forwardSignal("SIGTERM"));
+  process.stdout.on("error", ignoreClosedOutput);
+  process.stderr.on("error", ignoreClosedOutput);
 
   process.stdout.write(`[${options.name}] ${options.startupMessage}\n`);
   writeLifecycleLog(options.startupMessage);
diff --git a/packages/server/scripts/test-mcp-inject.ts b/packages/server/scripts/test-mcp-inject.ts
index be5d5f6db4..e9ec1deaa7 100644
--- a/packages/server/scripts/test-mcp-inject.ts
+++ b/packages/server/scripts/test-mcp-inject.ts
@@ -151,7 +151,7 @@ async function main(): Promise<void> {
 
     await client.connect();
     await client.fetchAgents({
-      subscribe: { subscriptionId: "mcp-inject-real-claude" },
+      subscribe: {},
     });
 
     const results: ProviderRunResult[] = [];
diff --git a/packages/server/scripts/voice-main-daemon-e2e.ts b/packages/server/scripts/voice-main-daemon-e2e.ts
index 27ca9d247a..1e59d052e3 100644
--- a/packages/server/scripts/voice-main-daemon-e2e.ts
+++ b/packages/server/scripts/voice-main-daemon-e2e.ts
@@ -47,7 +47,7 @@ async function runVoiceRoundTrip(params: {
   const client = new DaemonClient({ url: `${params.daemonUrl}/ws` });
   await client.connect();
   await client.fetchAgents({
-    subscribe: { subscriptionId: `voice-e2e-${randomUUID()}` },
+    subscribe: {},
   });
 
   const mode = await client.setVoiceMode(true, params.voiceAgentId);
@@ -77,7 +77,7 @@ async function runVoiceRoundTrip(params: {
     });
   });
 
-  const offStream = client.on("agent_stream", (msg) => {
+  const offStream = client.subscribeAgentTimeline(activeVoiceAgentId, (msg) => {
     if (msg.type !== "agent_stream") return;
     if (msg.payload.agentId !== activeVoiceAgentId) return;
     if (msg.payload.event.type !== "timeline") return;
@@ -88,6 +88,8 @@ async function runVoiceRoundTrip(params: {
     }
   });
 
+  await offStream.ready;
+
   const chunkBytes = 4800;
   for (let offset = 0; offset < pcm.length; offset += chunkBytes) {
     const chunk = pcm.subarray(offset, Math.min(pcm.length, offset + chunkBytes));
diff --git a/packages/server/scripts/voice-roundtrip-debug.ts b/packages/server/scripts/voice-roundtrip-debug.ts
index 108b3cb035..17ca7b6b19 100644
--- a/packages/server/scripts/voice-roundtrip-debug.ts
+++ b/packages/server/scripts/voice-roundtrip-debug.ts
@@ -49,7 +49,7 @@ async function main(): Promise<void> {
 
   try {
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "voice-debug" } });
+    await client.fetchAgents({ subscribe: {} });
 
     const voiceCwd = mkdtempSync(path.join(tmpdir(), "voice-roundtrip-debug-"));
     const voiceAgent = await client.createAgent({
@@ -88,7 +88,7 @@ async function main(): Promise<void> {
       }
     });
 
-    const offStream = client.on("agent_stream", (msg) => {
+    const offStream = client.subscribeAgentTimeline(voiceAgentId, (msg) => {
       if (msg.type !== "agent_stream") return;
       if (msg.payload.event.type !== "timeline") return;
       const item = msg.payload.event.item;
@@ -100,6 +100,8 @@ async function main(): Promise<void> {
       });
     });
 
+    await offStream.ready;
+
     let audioChunkCount = 0;
     const firstAudio = new Promise<void>((resolve) => {
       const offAudio = client.on("audio_output", (msg) => {
diff --git a/packages/server/src/executable-resolution/executable-resolution.test.ts b/packages/server/src/executable-resolution/executable-resolution.test.ts
index c202b4d15d..2ee0bd90df 100644
--- a/packages/server/src/executable-resolution/executable-resolution.test.ts
+++ b/packages/server/src/executable-resolution/executable-resolution.test.ts
@@ -3,12 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, test, vi } from "vitest";
 
-import {
-  executableExists,
-  findExecutable,
-  quoteWindowsArgument,
-  quoteWindowsCommand,
-} from "./executable-resolution.js";
+import { executableExists, findExecutable } from "./executable-resolution.js";
 import { windowsExecutableResolution } from "./windows.js";
 import { isPlatform } from "../test-utils/platform.js";
 
@@ -58,6 +53,15 @@ afterEach(() => {
 });
 
 describe("findExecutable", () => {
+  test.runIf(isPlatform("linux"))(
+    "propagates a failed lookup process instead of reporting a missing executable",
+    async () => {
+      await expect(findExecutable("x".repeat(1024 * 1024))).rejects.toMatchObject({
+        code: "E2BIG",
+      });
+    },
+  );
+
   describe.skipIf(isPlatform("win32"))("POSIX", () => {
     test("finds an extensionless executable and skips an earlier non-executable candidate", async () => {
       const executableDir = makeTempDir();
@@ -208,118 +212,3 @@ describe("executableExists", () => {
     expect(executableExists("/missing/codex", () => false)).toBeNull();
   });
 });
-
-describe("quoteWindowsCommand", () => {
-  const originalPlatform = process.platform;
-
-  function setPlatform(value: string) {
-    Object.defineProperty(process, "platform", { value, writable: true });
-  }
-
-  afterEach(() => {
-    setPlatform(originalPlatform);
-  });
-
-  test("quotes a Windows path with spaces", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("C:\\Program Files\\Anthropic\\claude.exe")).toBe(
-      '"C:\\Program Files\\Anthropic\\claude.exe"',
-    );
-  });
-
-  test("does not double-quote an already-quoted path", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand('"C:\\Program Files\\Anthropic\\claude.exe"')).toBe(
-      '"C:\\Program Files\\Anthropic\\claude.exe"',
-    );
-  });
-
-  test("returns the command unchanged when there are no spaces", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("C:\\nvm4w\\nodejs\\codex")).toBe("C:\\nvm4w\\nodejs\\codex");
-  });
-
-  test("escapes ampersands", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("feature&bugfix")).toBe("feature^&bugfix");
-  });
-
-  test("escapes pipes", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("feature|bugfix")).toBe("feature^|bugfix");
-  });
-
-  test("does not double percent signs", () => {
-    setPlatform("win32");
-    // cmd.exe only collapses %% → % inside batch files; on the command line
-    // it stays literal, which corrupts git --format atoms etc.
-    expect(quoteWindowsCommand("100%")).toBe("100%");
-  });
-
-  test("preserves git --format atoms verbatim", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("--format=%(refname)%09%(committerdate:unix)")).toBe(
-      "--format=%^(refname^)%09%^(committerdate:unix^)",
-    );
-  });
-
-  test("escapes carets", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("feature^bugfix")).toBe("feature^^bugfix");
-  });
-
-  test("escapes multiple metacharacters", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("build&(test|deploy)!<output>")).toBe(
-      "build^&^(test^|deploy^)^!^<output^>",
-    );
-  });
-
-  test("quotes commands with spaces after escaping metacharacters", () => {
-    setPlatform("win32");
-    expect(quoteWindowsCommand("C:\\Program Files\\My Tool&Stuff\\run 100%.cmd")).toBe(
-      '"C:\\Program Files\\My Tool^&Stuff\\run 100%.cmd"',
-    );
-  });
-
-  test("returns the command unchanged on non-Windows platforms", () => {
-    setPlatform("darwin");
-    expect(quoteWindowsCommand("/usr/local/bin/claude code")).toBe("/usr/local/bin/claude code");
-  });
-});
-
-describe("quoteWindowsArgument", () => {
-  const originalPlatform = process.platform;
-
-  function setPlatform(value: string) {
-    Object.defineProperty(process, "platform", { value, writable: true });
-  }
-
-  afterEach(() => {
-    setPlatform(originalPlatform);
-  });
-
-  test("quotes a Windows argument with spaces", () => {
-    setPlatform("win32");
-    expect(quoteWindowsArgument("C:\\Program Files\\Anthropic\\cli.js")).toBe(
-      '"C:\\Program Files\\Anthropic\\cli.js"',
-    );
-  });
-
-  test("does not double-quote an already-quoted argument", () => {
-    setPlatform("win32");
-    expect(quoteWindowsArgument('"C:\\Program Files\\Anthropic\\cli.js"')).toBe(
-      '"C:\\Program Files\\Anthropic\\cli.js"',
-    );
-  });
-
-  test("returns the argument unchanged when there are no spaces", () => {
-    setPlatform("win32");
-    expect(quoteWindowsArgument("--version")).toBe("--version");
-  });
-
-  test("returns the argument unchanged on non-Windows platforms", () => {
-    setPlatform("darwin");
-    expect(quoteWindowsArgument("/usr/local/bin/claude code")).toBe("/usr/local/bin/claude code");
-  });
-});
diff --git a/packages/server/src/executable-resolution/executable-resolution.ts b/packages/server/src/executable-resolution/executable-resolution.ts
index a6edcc6e7b..59c218511b 100644
--- a/packages/server/src/executable-resolution/executable-resolution.ts
+++ b/packages/server/src/executable-resolution/executable-resolution.ts
@@ -1,12 +1,13 @@
 import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
+import type { ProcessEnvRecord } from "../server/paseo-env.js";
 import { execCommand } from "../utils/spawn.js";
-import { isWindowsCommandScript } from "../utils/windows-command.js";
 import { windowsExecutableResolution } from "./windows.js";
 
-export { quoteWindowsArgument, quoteWindowsCommand } from "../utils/windows-command.js";
-
-type Which = (command: string, options: { all: true }) => Promise<string[]>;
+type Which = (
+  command: string,
+  options: { all: true; path?: string; pathExt?: string },
+) => Promise<string[]>;
 
 const require = createRequire(import.meta.url);
 const which = require("which") as Which;
@@ -16,29 +17,38 @@ function hasPathSeparator(value: string): boolean {
   return value.includes("/") || value.includes("\\");
 }
 
-async function enumerateCandidates(name: string): Promise<string[]> {
+async function enumerateCandidates(name: string, env?: ProcessEnvRecord): Promise<string[]> {
   if (process.platform !== "win32" && existsSync("/usr/bin/which")) {
-    return enumerateCandidatesViaSystemWhich(name);
+    return enumerateCandidatesViaSystemWhich(name, env);
   }
-  return enumerateCandidatesViaLibrary(name);
+  return enumerateCandidatesViaLibrary(name, env);
 }
 
-async function enumerateCandidatesViaSystemWhich(name: string): Promise<string[]> {
+async function enumerateCandidatesViaSystemWhich(
+  name: string,
+  env?: ProcessEnvRecord,
+): Promise<string[]> {
   try {
     const { stdout } = await execCommand("/usr/bin/which", ["-a", name], {
+      baseEnv: env,
       timeout: 3000,
       killSignal: "SIGKILL",
     });
     return Array.from(new Set(stdout.trim().split("\n").filter(Boolean)));
-  } catch {
-    return [];
+  } catch (error) {
+    // which exits 1 for a missing command. A failed lookup is not evidence of absence.
+    if (error instanceof Error && "code" in error && error.code === 1) return [];
+    throw error;
   }
 }
 
-async function enumerateCandidatesViaLibrary(name: string): Promise<string[]> {
+async function enumerateCandidatesViaLibrary(
+  name: string,
+  env?: ProcessEnvRecord,
+): Promise<string[]> {
   let candidates: string[];
   try {
-    candidates = await which(name, { all: true });
+    candidates = await which(name, { all: true, path: env?.PATH, pathExt: env?.PATHEXT });
   } catch (error) {
     // `which` throws ENOENT when the command is absent from PATH.
     if ((error as NodeJS.ErrnoException).code === "ENOENT") {
@@ -59,14 +69,16 @@ async function enumerateCandidatesViaLibrary(name: string): Promise<string[]> {
 
 export async function probeExecutable(
   executablePath: string,
-  timeoutMs = PROBE_TIMEOUT_MS,
+  options: number | ExecutableResolutionOptions = PROBE_TIMEOUT_MS,
 ): Promise<boolean> {
+  const { probeTimeoutMs: timeoutMs = PROBE_TIMEOUT_MS, env } =
+    typeof options === "number" ? { probeTimeoutMs: options } : options;
   try {
     await execCommand(executablePath, ["--version"], {
+      baseEnv: env,
       timeout: timeoutMs,
       killSignal: "SIGKILL",
       maxBuffer: 64 * 1024,
-      shell: isWindowsCommandScript(executablePath),
     });
     return true;
   } catch (error) {
@@ -108,10 +120,17 @@ export function executableExists(
   return exists(executablePath) ? executablePath : null;
 }
 
+export interface ExecutableResolutionOptions {
+  probeTimeoutMs?: number;
+  env?: ProcessEnvRecord;
+}
+
 export async function findExecutable(
   name: string,
-  probeTimeoutMs = PROBE_TIMEOUT_MS,
+  options: number | ExecutableResolutionOptions = PROBE_TIMEOUT_MS,
 ): Promise<string | null> {
+  const { probeTimeoutMs = PROBE_TIMEOUT_MS, env } =
+    typeof options === "number" ? { probeTimeoutMs: options } : options;
   const trimmed = name.trim();
   if (!trimmed) {
     return null;
@@ -119,20 +138,21 @@ export async function findExecutable(
 
   if (process.platform === "win32") {
     return windowsExecutableResolution.find(trimmed, {
-      enumeratePathCandidates: enumerateCandidates,
-      probeExecutable,
+      enumeratePathCandidates: (command) => enumerateCandidates(command, env),
+      probeExecutable: (command, timeout) =>
+        probeExecutable(command, { probeTimeoutMs: timeout, env }),
       exists: existsSync,
       probeTimeoutMs,
     });
   }
 
   if (hasPathSeparator(trimmed)) {
-    return (await probeExecutable(trimmed, probeTimeoutMs)) ? trimmed : null;
+    return (await probeExecutable(trimmed, { probeTimeoutMs, env })) ? trimmed : null;
   }
 
-  const candidates = await enumerateCandidates(trimmed);
+  const candidates = await enumerateCandidates(trimmed, env);
   for (const candidate of candidates) {
-    if (await probeExecutable(candidate, probeTimeoutMs)) {
+    if (await probeExecutable(candidate, { probeTimeoutMs, env })) {
       return candidate;
     }
   }
diff --git a/packages/server/src/server/agent-history-search.test.ts b/packages/server/src/server/agent-history-search.test.ts
index 036efa7abb..35108fff58 100644
--- a/packages/server/src/server/agent-history-search.test.ts
+++ b/packages/server/src/server/agent-history-search.test.ts
@@ -1,9 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   type AgentHistorySearchCandidate,
-  describeAgentHistoryMatches,
-  rankAgentHistoryCandidates,
-  scoreAgentHistoryCandidate,
+  matchesAgentHistoryQuery,
 } from "./agent-history-search.js";
 
 function candidate(input: {
@@ -39,157 +37,63 @@ function candidate(input: {
   } as unknown as AgentHistorySearchCandidate & { agent: { id: string; updatedAt: string } };
 }
 
-const byUpdatedAtDesc = (
-  left: { agent: { updatedAt: string } },
-  right: { agent: { updatedAt: string } },
-) => right.agent.updatedAt.localeCompare(left.agent.updatedAt);
+describe("matchesAgentHistoryQuery", () => {
+  it("rejects scattered letters across words while keeping within-word subsequences", () => {
+    expect(
+      matchesAgentHistoryQuery(
+        "terminal",
+        candidate({
+          title: "Let me diagnose this problem in a diagnose this problem and",
+        }),
+      ),
+    ).toBe(false);
+    expect(matchesAgentHistoryQuery("trmnl", candidate({ title: "Fix terminal resizing" }))).toBe(
+      true,
+    );
+  });
 
-describe("scoreAgentHistoryCandidate", () => {
   it("matches the workspace name", () => {
     expect(
-      scoreAgentHistoryCandidate("stripe", candidate({ workspaceName: "Add Stripe billing" })),
-    ).not.toBeNull();
+      matchesAgentHistoryQuery("stripe", candidate({ workspaceName: "Add Stripe billing" })),
+    ).toBe(true);
   });
 
   it("matches the agent title", () => {
     expect(
-      scoreAgentHistoryCandidate("entitlements", candidate({ title: "Reshape entitlements" })),
-    ).not.toBeNull();
+      matchesAgentHistoryQuery("entitlements", candidate({ title: "Reshape entitlements" })),
+    ).toBe(true);
   });
 
   it("matches the branch name", () => {
-    expect(
-      scoreAgentHistoryCandidate("billing", candidate({ branch: "add-stripe-billing" })),
-    ).not.toBeNull();
+    expect(matchesAgentHistoryQuery("billing", candidate({ branch: "add-stripe-billing" }))).toBe(
+      true,
+    );
   });
 
   it("matches the project name", () => {
-    expect(
-      scoreAgentHistoryCandidate("paseo", candidate({ projectName: "getpaseo/paseo" })),
-    ).not.toBeNull();
+    expect(matchesAgentHistoryQuery("paseo", candidate({ projectName: "getpaseo/paseo" }))).toBe(
+      true,
+    );
   });
 
   it("requires every token to match somewhere", () => {
     const entry = candidate({ workspaceName: "Add Stripe billing", branch: "main" });
-    expect(scoreAgentHistoryCandidate("stripe main", entry)).not.toBeNull();
-    expect(scoreAgentHistoryCandidate("stripe rosetta", entry)).toBeNull();
+    expect(matchesAgentHistoryQuery("stripe main", entry)).toBe(true);
+    expect(matchesAgentHistoryQuery("stripe rosetta", entry)).toBe(false);
   });
 
   it("tolerates a typo", () => {
     expect(
-      scoreAgentHistoryCandidate("bulling", candidate({ workspaceName: "Add Stripe billing" })),
-    ).not.toBeNull();
+      matchesAgentHistoryQuery("bulling", candidate({ workspaceName: "Add Stripe billing" })),
+    ).toBe(true);
   });
 
   it("tolerates a transposed branch name", () => {
-    expect(scoreAgentHistoryCandidate("mian", candidate({ branch: "main" }))).not.toBeNull();
-    expect(scoreAgentHistoryCandidate("rain", candidate({ branch: "main" }))).toBeNull();
+    expect(matchesAgentHistoryQuery("mian", candidate({ branch: "main" }))).toBe(true);
+    expect(matchesAgentHistoryQuery("rain", candidate({ branch: "main" }))).toBe(false);
   });
 
-  it("returns null for a blank query so an empty box never filters", () => {
-    expect(scoreAgentHistoryCandidate("   ", candidate({ title: "anything" }))).toBeNull();
-  });
-});
-
-describe("rankAgentHistoryCandidates", () => {
-  it("drops candidates that do not match", () => {
-    const ranked = rankAgentHistoryCandidates(
-      "stripe",
-      [candidate({ title: "Add Stripe billing" }), candidate({ title: "Fix terminal resize" })],
-      byUpdatedAtDesc,
-    );
-    expect(ranked.map((result) => result.candidate.agent.title)).toEqual(["Add Stripe billing"]);
-  });
-
-  it("ranks a whole-word hit above a hit buried inside a word", () => {
-    const ranked = rankAgentHistoryCandidates(
-      "bill",
-      [candidate({ title: "unbilled usage report" }), candidate({ title: "bill the customer" })],
-      byUpdatedAtDesc,
-    );
-    expect(ranked.map((result) => result.candidate.agent.title)).toEqual([
-      "bill the customer",
-      "unbilled usage report",
-    ]);
-  });
-
-  it("ranks the workspace name above the project name that every session shares", () => {
-    const ranked = rankAgentHistoryCandidates(
-      "paseo",
-      [
-        candidate({ title: "unrelated work", projectName: "getpaseo/paseo" }),
-        candidate({ workspaceName: "paseo", projectName: "getpaseo/paseo" }),
-      ],
-      byUpdatedAtDesc,
-    );
-    expect(ranked[0].candidate.project.workspaceName).toBe("paseo");
-  });
-
-  it("ranks every exact hit above a typo hit", () => {
-    const ranked = rankAgentHistoryCandidates(
-      "billing",
-      [
-        candidate({ title: "bulling the customer" }),
-        candidate({ title: "prorated billing edge cases" }),
-      ],
-      byUpdatedAtDesc,
-    );
-    expect(ranked.map((result) => result.candidate.agent.title)).toEqual([
-      "prorated billing edge cases",
-      "bulling the customer",
-    ]);
-  });
-
-  it("breaks ties with the caller's ordering", () => {
-    const ranked = rankAgentHistoryCandidates(
-      "stripe",
-      [
-        candidate({ title: "stripe one", updatedAt: "2026-08-01T00:00:00.000Z" }),
-        candidate({ title: "stripe two", updatedAt: "2026-08-06T00:00:00.000Z" }),
-      ],
-      byUpdatedAtDesc,
-    );
-    expect(ranked.map((result) => result.candidate.agent.title)).toEqual([
-      "stripe two",
-      "stripe one",
-    ]);
-  });
-});
-
-describe("describeAgentHistoryMatches", () => {
-  it("says which field matched and where", () => {
-    expect(
-      describeAgentHistoryMatches("stripe", candidate({ workspaceName: "Add Stripe billing" })),
-    ).toEqual([{ field: "workspace", ranges: [{ start: 4, length: 6 }] }]);
-  });
-
-  it("describes each field a multi-token query landed on", () => {
-    expect(
-      describeAgentHistoryMatches(
-        "stripe main",
-        candidate({ workspaceName: "Add Stripe billing", branch: "main" }),
-      ),
-    ).toEqual([
-      { field: "workspace", ranges: [{ start: 4, length: 6 }] },
-      { field: "branch", ranges: [{ start: 0, length: 4 }] },
-    ]);
-  });
-
-  it("merges overlapping spans two tokens found in one field", () => {
-    expect(
-      describeAgentHistoryMatches("bill billing", candidate({ title: "prorated billing" })),
-    ).toEqual([{ field: "title", ranges: [{ start: 9, length: 7 }] }]);
-  });
-
-  it("marks the whole word behind a typo", () => {
-    expect(
-      describeAgentHistoryMatches("bulling", candidate({ title: "customer billing" })),
-    ).toEqual([{ field: "title", ranges: [{ start: 9, length: 7 }] }]);
-  });
-
-  it("returns nothing when the candidate does not match", () => {
-    expect(
-      describeAgentHistoryMatches("rosetta", candidate({ title: "customer billing" })),
-    ).toEqual([]);
+  it("keeps candidates for a blank query", () => {
+    expect(matchesAgentHistoryQuery("   ", candidate({ title: "anything" }))).toBe(true);
   });
 });
diff --git a/packages/server/src/server/agent-history-search.ts b/packages/server/src/server/agent-history-search.ts
index 9960fb3d1e..ff49284e1a 100644
--- a/packages/server/src/server/agent-history-search.ts
+++ b/packages/server/src/server/agent-history-search.ts
@@ -1,188 +1,26 @@
-import type {
-  AgentSearchMatch,
-  AgentSnapshotPayload,
-  ProjectPlacementPayload,
-} from "@getpaseo/protocol/messages";
-import {
-  compareMatchScores,
-  fuzzyPolicyForToken,
-  type MatchRange,
-  type MatchScore,
-  matchRanges,
-  scoreMatch,
-  tokenizeQuery,
-} from "@getpaseo/protocol/search/text-match";
-
-/**
- * History search ranks what the daemon already knows about a session: the four
- * names attached to it. Transcripts are deliberately out — they are unbounded,
- * and a partial-transcript index would answer "not found" for sessions that do
- * contain the phrase, which is worse than never claiming to search them.
- *
- * Field order is the tie-break order. Workspace and agent titles are what
- * people actually recall; a project name matches every session in the repo, so
- * it ranks last and only decides ties.
- */
+import type { AgentSnapshotPayload, ProjectPlacementPayload } from "@getpaseo/protocol/messages";
+import { scoreTextFields } from "@getpaseo/protocol/search/text-match";
 
 export interface AgentHistorySearchCandidate {
   agent: AgentSnapshotPayload;
   project: ProjectPlacementPayload;
 }
 
-/** In tie-break order; the index into this list is a field's rank. */
-const SEARCH_FIELDS = ["workspace", "title", "branch", "project"] as const;
-
-type SearchField = (typeof SEARCH_FIELDS)[number];
-
-function searchableFields(candidate: AgentHistorySearchCandidate): string[] {
-  const { agent, project } = candidate;
-  return [
-    project.workspaceName ?? "",
-    agent.title ?? "",
-    project.checkout.currentBranch ?? "",
-    project.projectName,
-  ];
-}
-
-interface FieldMatch {
-  score: MatchScore;
-  fieldRank: number;
-  token: string;
-}
-
-function bestFieldMatch(token: string, fields: string[]): FieldMatch | null {
-  const fuzzy = fuzzyPolicyForToken(token);
-  let best: FieldMatch | null = null;
-  for (let fieldRank = 0; fieldRank < fields.length; fieldRank += 1) {
-    const field = fields[fieldRank];
-    if (!field) continue;
-    const score = scoreMatch(token, field, { fuzzy });
-    if (!score) continue;
-    if (!best || compareMatchScores(score, best.score) < 0) {
-      best = { score, fieldRank, token };
-    }
-  }
-  return best;
-}
-
-/** Overlapping spans from different tokens would double-mark the same glyphs. */
-function mergeRanges(ranges: MatchRange[]): MatchRange[] {
-  const sorted = [...ranges].sort((left, right) => left.start - right.start);
-  const merged: MatchRange[] = [];
-  for (const range of sorted) {
-    const last = merged.at(-1);
-    if (last && range.start <= last.start + last.length) {
-      last.length = Math.max(last.length, range.start + range.length - last.start);
-      continue;
-    }
-    merged.push({ ...range });
-  }
-  return merged;
-}
-
-/**
- * One number so the wire can carry relevance and several hosts' pages can be
- * merged by it. Tier dominates, then which field matched, then how deep into
- * that field the match sat.
- */
-function toSearchScore(matches: readonly FieldMatch[]): number {
-  let total = 0;
-  for (const match of matches) {
-    total += match.score.tier * 1_000 + match.fieldRank * 100 + Math.min(match.score.offset, 99);
-  }
-  return total;
-}
-
-/**
- * Every token has to match something, so adding a word always narrows. Tokens
- * may land on different fields — "stripe main" finds the Stripe workspace on
- * the main branch.
- */
-export function scoreAgentHistoryCandidate(
+/** Search the names people recall, never an incomplete subset of transcripts. */
+export function matchesAgentHistoryQuery(
   query: string,
-  candidate: AgentHistorySearchCandidate,
-): number | null {
-  const matches = matchAgentHistoryCandidate(query, candidate);
-  return matches ? toSearchScore(matches) : null;
-}
-
-function matchAgentHistoryCandidate(
-  query: string,
-  candidate: AgentHistorySearchCandidate,
-): FieldMatch[] | null {
-  const tokens = tokenizeQuery(query);
-  if (tokens.length === 0) return null;
-
-  const fields = searchableFields(candidate);
-  const matches: FieldMatch[] = [];
-  for (const token of tokens) {
-    const match = bestFieldMatch(token, fields);
-    if (!match) return null;
-    matches.push(match);
-  }
-  return matches;
-}
-
-/**
- * Where the query landed in each field, for the rows that will actually be
- * rendered. The ranker already knows this; sending it means the client never
- * has to re-derive a second opinion that could disagree with the ranking it is
- * explaining.
- */
-export function describeAgentHistoryMatches(
-  query: string,
-  candidate: AgentHistorySearchCandidate,
-): AgentSearchMatch[] {
-  const matches = matchAgentHistoryCandidate(query, candidate);
-  if (!matches) return [];
-
-  const fields = searchableFields(candidate);
-  const rangesByField = new Map<SearchField, MatchRange[]>();
-  for (const match of matches) {
-    const field = SEARCH_FIELDS[match.fieldRank];
-    const ranges = matchRanges(match.token, fields[match.fieldRank], match.score);
-    rangesByField.set(field, [...(rangesByField.get(field) ?? []), ...ranges]);
-  }
-
-  return [...rangesByField.entries()].map(([field, ranges]) => ({
-    field,
-    ranges: mergeRanges(ranges),
-  }));
-}
-
-export interface RankedAgentHistoryCandidate<T extends AgentHistorySearchCandidate> {
-  candidate: T;
-  searchScore: number;
-}
-
-/**
- * Ranks the whole candidate set rather than a page of it. The daemon holds
- * every persisted agent in memory already, so search is complete by
- * construction and the client never has to warn that it only looked at what it
- * had loaded.
- *
- * A searched response is one page: the best `limit` matches, and a flag saying
- * more matched. There is no search cursor. Offsets into a ranking that is
- * recomputed per request duplicate and skip rows as history mutates underneath
- * them, and a keyset cursor would buy the ability to walk past result 200 of a
- * relevance order — which is browsing, not searching. Narrowing the query is
- * the answer, and the global top K is exactly recoverable from each host's own
- * top K, which is what lets several hosts merge without a federated pager.
- */
-export function rankAgentHistoryCandidates<T extends AgentHistorySearchCandidate>(
-  query: string,
-  candidates: readonly T[],
-  compareTies: (left: T, right: T) => number,
-): RankedAgentHistoryCandidate<T>[] {
-  const ranked: RankedAgentHistoryCandidate<T>[] = [];
-  for (const candidate of candidates) {
-    const searchScore = scoreAgentHistoryCandidate(query, candidate);
-    if (searchScore === null) continue;
-    ranked.push({ candidate, searchScore });
-  }
-  ranked.sort((left, right) => {
-    if (left.searchScore !== right.searchScore) return left.searchScore - right.searchScore;
-    return compareTies(left.candidate, right.candidate);
-  });
-  return ranked;
+  { agent, project }: AgentHistorySearchCandidate,
+): boolean {
+  return (
+    scoreTextFields(
+      query,
+      [
+        project.workspaceName ?? "",
+        agent.title ?? "",
+        project.checkout.currentBranch ?? "",
+        project.projectName,
+      ],
+      { typoTolerant: true },
+    ) !== null
+  );
 }
diff --git a/packages/server/src/server/agent/activity-curator.test.ts b/packages/server/src/server/agent/activity-curator.test.ts
index 7256a0669d..58a8a8b4f1 100644
--- a/packages/server/src/server/agent/activity-curator.test.ts
+++ b/packages/server/src/server/agent/activity-curator.test.ts
@@ -39,6 +39,45 @@ function row(seq: number, item: AgentTimelineItem): AgentTimelineRow {
 }
 
 describe("curateAgentActivity", () => {
+  it("keeps reasoning before the assistant text that followed it", () => {
+    const timeline: AgentTimelineItem[] = [
+      { type: "reasoning", text: "Check the commands first." },
+      { type: "assistant_message", text: "I will list the commands." },
+      toolCallItem({
+        callId: "shell-order",
+        name: "Bash",
+        detail: {
+          type: "shell",
+          command: "ls packages/cli/src/commands/agent/",
+          output: "",
+          exitCode: 0,
+        },
+      }),
+    ];
+
+    expect(curateAgentActivity(timeline)).toBe(
+      "[Thought] Check the commands first.\nI will list the commands.\n[Shell] ls packages/cli/src/commands/agent/",
+    );
+  });
+
+  it("preserves alternating text kinds, labels, and fragment concatenation", () => {
+    const timeline: AgentTimelineItem[] = [
+      { type: "assistant_message", text: "First message." },
+      { type: "reasoning", text: "First " },
+      { type: "reasoning", text: "thought." },
+      { type: "assistant_message", text: "Second " },
+      { type: "assistant_message", text: "message." },
+      { type: "reasoning", text: "Second thought." },
+    ];
+
+    expect(curateAgentActivity(timeline, { labelAssistantMessages: true })).toBe(
+      "[Assistant] First message.\n[Thought] First thought.\n[Assistant] Second message.\n[Thought] Second thought.",
+    );
+    expect(curateAgentActivity(timeline, { maxItems: 2 })).toBe(
+      "Second message.\n[Thought] Second thought.",
+    );
+  });
+
   it("renders user/assistant/reasoning entries", () => {
     const timeline: AgentTimelineItem[] = [
       { type: "user_message", text: "Hello" },
@@ -354,46 +393,44 @@ second line'`,
     expect(result.attachment.text).toContain("[Assistant] Done.");
   });
 
-  it("selects the fork boundary before collapsing later tool updates", () => {
-    const result = buildAgentForkContextAttachment({
-      boundaryMessageId: "assistant-1",
-      rows: [
-        row(1, { type: "user_message", text: "Run it", messageId: "user-1" }),
-        row(
-          2,
-          toolCallItem({
-            callId: "terminal-1",
-            name: "terminal",
-            status: "running",
-            detail: {
-              type: "plain_text",
-              label: "before boundary",
-            },
+  it("rejects a checkpoint whose projected tool state changed later", () => {
+    expect(() =>
+      buildAgentForkContextAttachment({
+        boundaryMessageId: "assistant-1",
+        rows: [
+          row(1, { type: "user_message", text: "Run it", messageId: "user-1" }),
+          row(
+            2,
+            toolCallItem({
+              callId: "terminal-1",
+              name: "terminal",
+              status: "running",
+              detail: {
+                type: "plain_text",
+                label: "before boundary",
+              },
+            }),
+          ),
+          row(3, {
+            type: "assistant_message",
+            text: "Partial result.",
+            messageId: "assistant-1",
           }),
-        ),
-        row(3, {
-          type: "assistant_message",
-          text: "Partial result.",
-          messageId: "assistant-1",
-        }),
-        row(
-          4,
-          toolCallItem({
-            callId: "terminal-1",
-            name: "terminal",
-            status: "completed",
-            detail: {
-              type: "plain_text",
-              label: "after boundary",
-            },
-          }),
-        ),
-      ],
-    });
-
-    expect(result.attachment.text).toContain("[Terminal] before boundary");
-    expect(result.attachment.text).toContain("[Assistant] Partial result.");
-    expect(result.attachment.text).not.toContain("after boundary");
+          row(
+            4,
+            toolCallItem({
+              callId: "terminal-1",
+              name: "terminal",
+              status: "completed",
+              detail: {
+                type: "plain_text",
+                label: "after boundary",
+              },
+            }),
+          ),
+        ],
+      }),
+    ).toThrow("Fork from a later completed response");
   });
 
   it("selects a synthetic assistant error by its timeline cursor", () => {
@@ -440,3 +477,49 @@ second line'`,
     ).toThrow("Selected assistant message is no longer available.");
   });
 });
+
+it("bounds fork history to 100,000 characters while preserving the newest messages", () => {
+  const result = buildAgentForkContextAttachment({
+    rows: [
+      row(1, { type: "user_message", text: "old-message " + "x".repeat(1_100_000) }),
+      row(2, { type: "assistant_message", messageId: "checkpoint", text: "Latest answer." }),
+      row(3, { type: "user_message", text: "Beyond the selected checkpoint." }),
+    ],
+    boundaryMessageId: "checkpoint",
+  });
+  expect(result.attachment.text.length).toBeLessThanOrEqual(100_000);
+  expect(result.attachment.text).toContain("[Earlier chat history omitted]");
+  expect(result.attachment.text).toContain("[Assistant] Latest answer.");
+  expect(result.attachment.text).not.toContain("old-message");
+  expect(result.attachment.text).not.toContain("Beyond the selected checkpoint.");
+  expect(result.attachment.text).toMatch(/^<chat-history-summary>\n/);
+  expect(result.attachment.text).toMatch(/\n<\/chat-history-summary>$/);
+});
+
+it("bounds one oversized fork message and metadata without losing its beginning and end", () => {
+  const result = buildAgentForkContextAttachment({
+    rows: [
+      row(1, {
+        type: "assistant_message",
+        text: "Beginning. " + "x".repeat(1_100_000) + " The end.",
+      }),
+    ],
+    agentTitle: "T".repeat(200_000),
+    cwd: "/" + "p".repeat(200_000),
+  });
+  expect(result.attachment.text.length).toBe(100_000);
+  expect(result.attachment.text).toContain("[Assistant] Beginning.");
+  expect(result.attachment.text).toContain("[Message truncated]");
+  expect(result.attachment.text).toContain("The end.");
+  expect(result.attachment.text).toMatch(/\n<\/chat-history-summary>$/);
+});
+
+it("preserves every message in fork history below the character budget", () => {
+  const text = "Complete conversation " + "x".repeat(90_000);
+  const result = buildAgentForkContextAttachment({
+    rows: [row(1, { type: "user_message", text })],
+  });
+  expect(result.attachment.text).toBe(
+    `<chat-history-summary>\nChat history from a previous Paseo agent.\n\n[User] ${text}\n</chat-history-summary>`,
+  );
+});
diff --git a/packages/server/src/server/agent/activity-curator.ts b/packages/server/src/server/agent/activity-curator.ts
index da3318c1a3..efd0a8e48d 100644
--- a/packages/server/src/server/agent/activity-curator.ts
+++ b/packages/server/src/server/agent/activity-curator.ts
@@ -8,6 +8,9 @@ import { projectTimelineRows } from "./timeline-projection.js";
 const DEFAULT_MAX_ITEMS = 0;
 const MAX_TOOL_INPUT_CHARS = 400;
 const MAX_TOOL_SUMMARY_CHARS = 200;
+const MAX_FORK_CONTEXT_CHARS = 100_000;
+const MAX_FORK_METADATA_CHARS = 1_000;
+const FORK_HISTORY_OMITTED = "[Earlier chat history omitted]\n";
 
 interface ActivityCuratorOptions {
   maxItems?: number;
@@ -22,36 +25,20 @@ interface ActivityEntry {
 
 type TextAgentAttachment = Extract<AgentAttachment, { type: "text" }>;
 
-function appendText(buffer: string, text: string): string {
-  const normalized = text.trim();
-  if (!normalized) {
-    return buffer;
-  }
-  if (!buffer) {
-    return normalized;
-  }
-  return `${buffer}\n${normalized}`;
-}
-
 function activityEntry(text: string): ActivityEntry {
   return { text };
 }
 
-function flushBuffers(
+function appendTextEntry(
   entries: ActivityEntry[],
-  buffers: { message: string; thought: string },
+  item: Extract<AgentTimelineItem, { type: "assistant_message" | "reasoning" }>,
   options?: ActivityCuratorOptions,
 ) {
-  if (buffers.message.trim()) {
-    const text = buffers.message.trim();
-    entries.push(activityEntry(options?.labelAssistantMessages ? `[Assistant] ${text}` : text));
-  }
-  if (buffers.thought.trim()) {
-    const text = buffers.thought.trim();
-    entries.push(activityEntry(`[Thought] ${text}`));
-  }
-  buffers.message = "";
-  buffers.thought = "";
+  const text = item.text.trim();
+  if (!text) return;
+  let prefix = options?.labelAssistantMessages ? "[Assistant] " : "";
+  if (item.type === "reasoning") prefix = "[Thought] ";
+  entries.push(activityEntry(`${prefix}${text}`));
 }
 
 function formatToolInputJson(input: unknown): string | null {
@@ -144,7 +131,6 @@ function curateProjectedActivityEntries(
   const recentItems = maxItems > 0 && items.length > maxItems ? items.slice(-maxItems) : items;
 
   const entries: ActivityEntry[] = [];
-  const buffers = { message: "", thought: "" };
 
   for (const item of recentItems) {
     if (!shouldIncludeItem(item, options)) {
@@ -153,17 +139,13 @@ function curateProjectedActivityEntries(
 
     switch (item.type) {
       case "user_message":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry(`[User] ${item.text.trim()}`));
         break;
       case "assistant_message":
-        buffers.message = appendText(buffers.message, item.text);
-        break;
       case "reasoning":
-        buffers.thought = appendText(buffers.thought, item.text);
+        appendTextEntry(entries, item, options);
         break;
       case "tool_call": {
-        flushBuffers(entries, buffers, options);
         entries.push(formatToolCallEntry(item, options));
         if (item.detail.type === "sub_agent" && item.detail.log.trim()) {
           entries.push(activityEntry(item.detail.log.trim()));
@@ -171,7 +153,6 @@ function curateProjectedActivityEntries(
         break;
       }
       case "todo":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry("[Tasks]"));
         for (const entry of item.items) {
           const checkbox = entry.completed ? "[x]" : "[ ]";
@@ -180,18 +161,14 @@ function curateProjectedActivityEntries(
         }
         break;
       case "error":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry(`[Error] ${item.message}`));
         break;
       case "compaction":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry("[Compacted]"));
         break;
     }
   }
 
-  flushBuffers(entries, buffers, options);
-
   return entries;
 }
 
@@ -230,12 +207,12 @@ function selectForkContextRows(input: {
   boundaryCursor: { epoch: string; seq: number } | null;
   boundaryMessageId: string | null;
 } {
+  const projectedRows = projectTimelineRows({ rows: input.rows, mode: "projected" });
   const boundaryCursor = input.cursorBoundary?.cursor ?? null;
   const boundaryMessageId = input.boundaryMessageId?.trim() || null;
   if (!boundaryCursor && !boundaryMessageId) {
-    const projected = projectTimelineRows({ rows: input.rows, mode: "projected" });
     return {
-      items: projected.map((entry) => entry.item),
+      items: projectedRows.map((entry) => entry.item),
       boundaryCursor: null,
       boundaryMessageId: null,
     };
@@ -248,8 +225,8 @@ function selectForkContextRows(input: {
     throw new Error("Selected timeline position is no longer available.");
   }
   const boundaryIndex = boundaryCursor
-    ? input.rows.findIndex((row) => row.seq === boundaryCursor.seq)
-    : input.rows.findLastIndex(
+    ? projectedRows.findIndex((row) => row.seqEnd === boundaryCursor.seq)
+    : projectedRows.findLastIndex(
         (row) => row.item.type === "assistant_message" && row.item.messageId === boundaryMessageId,
       );
   if (boundaryIndex < 0) {
@@ -259,8 +236,13 @@ function selectForkContextRows(input: {
         : "Selected assistant message is no longer available.",
     );
   }
-  const selectedRows = input.rows.slice(0, boundaryIndex + 1);
-  const projected = projectTimelineRows({ rows: selectedRows, mode: "projected" });
+  const boundarySeq = projectedRows[boundaryIndex].seqEnd;
+  if (projectedRows.some((row) => row.seqStart <= boundarySeq && row.seqEnd > boundarySeq)) {
+    throw new Error(
+      "This checkpoint changed after it was created. Fork from a later completed response instead.",
+    );
+  }
+  const projected = projectedRows.filter((row) => row.seqEnd <= boundarySeq);
 
   return {
     items: projected.map((entry) => entry.item),
@@ -271,7 +253,7 @@ function selectForkContextRows(input: {
 
 function trimContextMetadata(value: string | null | undefined): string | null {
   const trimmed = value?.trim();
-  return trimmed ? trimmed : null;
+  return trimmed ? trimmed.slice(0, MAX_FORK_METADATA_CHARS) : null;
 }
 
 function buildForkContextText(input: {
@@ -291,6 +273,30 @@ function buildForkContextText(input: {
   return `<chat-history-summary>\n${header.join("\n")}\n\n${input.body}\n</chat-history-summary>`;
 }
 
+function fitForkContextEntries(entries: ActivityEntry[], budget: number): string {
+  const length = entries.reduce((total, entry) => total + entry.text.length + 1, -1);
+  if (length <= budget) return entries.map((entry) => entry.text).join("\n");
+
+  const selected: string[] = [];
+  let remaining = budget - FORK_HISTORY_OMITTED.length;
+  for (let index = entries.length - 1; index >= 0; index--) {
+    const text = entries[index]!.text;
+    const size = text.length + (selected.length > 0 ? 1 : 0);
+    if (size > remaining) {
+      if (selected.length === 0) {
+        const marker = "\n[Message truncated]\n";
+        const available = remaining - marker.length;
+        const head = Math.ceil(available / 2);
+        selected.push(text.slice(0, head) + marker + text.slice(-(available - head)));
+      }
+      break;
+    }
+    selected.push(text);
+    remaining -= size;
+  }
+  return FORK_HISTORY_OMITTED + selected.toReversed().join("\n");
+}
+
 export function buildAgentForkContextAttachment(input: {
   rows: readonly AgentTimelineRow[];
   cursorBoundary?: ForkCursorBoundary | null;
@@ -314,10 +320,10 @@ export function buildAgentForkContextAttachment(input: {
     includeKinds: ["user_message", "assistant_message", "tool_call"],
     includeExternalToolInput: false,
   });
+  const metadata = { agentTitle: input.agentTitle, cwd: input.cwd };
+  const budget = MAX_FORK_CONTEXT_CHARS - buildForkContextText({ body: "", ...metadata }).length;
   const body =
-    entries.length > 0
-      ? entries.map((entry) => entry.text).join("\n")
-      : "No chat history to display.";
+    entries.length > 0 ? fitForkContextEntries(entries, budget) : "No chat history to display.";
   return {
     attachment: {
       type: "text",
diff --git a/packages/server/src/server/agent/agent-configuration-validator.ts b/packages/server/src/server/agent/agent-configuration-validator.ts
index 1135d25e0b..0893f3a692 100644
--- a/packages/server/src/server/agent/agent-configuration-validator.ts
+++ b/packages/server/src/server/agent/agent-configuration-validator.ts
@@ -3,7 +3,6 @@ import type { HubExecutionAgentValidationIssue } from "@getpaseo/protocol/messag
 
 import type { ProviderSnapshotEntry } from "./agent-sdk-types.js";
 import { filterSelectableAgentModels } from "./agent-sdk-types.js";
-import { ProviderOptionsValidationError } from "./provider-options.js";
 
 export interface AgentConfigurationValidationInput {
   provider: string;
@@ -16,13 +15,11 @@ export interface AgentConfigurationValidationInput {
 interface AgentConfigurationValidationContext {
   input: AgentConfigurationValidationInput;
   provider: ProviderSnapshotEntry;
-  validateOptions(options: ProviderOptions | undefined): ProviderOptions | undefined;
 }
 
 export function validateAgentConfigurationAgainstProvider({
   input,
   provider,
-  validateOptions,
 }: AgentConfigurationValidationContext): HubExecutionAgentValidationIssue[] {
   const issues: HubExecutionAgentValidationIssue[] = [];
   const models = filterSelectableAgentModels(provider.models);
@@ -53,17 +50,5 @@ export function validateAgentConfigurationAgainstProvider({
     });
   }
 
-  try {
-    validateOptions(input.providerOptions);
-  } catch (error) {
-    if (!(error instanceof ProviderOptionsValidationError)) throw error;
-    issues.push(
-      ...error.issues.map((issue) => ({
-        path: ["providerOptions", ...issue.path],
-        message: issue.message,
-      })),
-    );
-  }
-
   return issues;
 }
diff --git a/packages/server/src/server/agent/agent-loading.test.ts b/packages/server/src/server/agent/agent-loading.test.ts
index e4943a079d..d75fa8739a 100644
--- a/packages/server/src/server/agent/agent-loading.test.ts
+++ b/packages/server/src/server/agent/agent-loading.test.ts
@@ -1,4 +1,4 @@
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdir, mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { expect, test } from "vitest";
@@ -6,6 +6,7 @@ import { expect, test } from "vitest";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { AgentManager } from "./agent-manager.js";
 import { ensureAgentLoaded } from "./agent-loading.js";
+import { startAgentRun } from "./agent-prompt.js";
 import { AgentStorage } from "./agent-storage.js";
 import type {
   AgentClient,
@@ -69,7 +70,7 @@ test("loads archived records for history and active records with the interactive
     await ensureAgentLoaded(archived.id, { agentManager: manager, agentStorage: storage, logger });
     await ensureAgentLoaded(active.id, { agentManager: manager, agentStorage: storage, logger });
 
-    expect(resumeOptions).toEqual([{ purpose: "history" }, undefined]);
+    expect(resumeOptions).toEqual([{ purpose: "history" }, { purpose: "interactive" }]);
   } finally {
     await Promise.all([
       manager.closeAgent(archivedId).catch(() => undefined),
@@ -80,3 +81,121 @@ test("loads archived records for history and active records with the interactive
     await rm(root, { recursive: true, force: true });
   }
 });
+
+test("resuming a stored agent keeps its unread flag and its last-activity time", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "agent-loading-resume-"));
+  const logger = createTestLogger();
+  const storage = new AgentStorage(path.join(root, "agents"), logger);
+  const manager = new AgentManager({
+    clients: createTestAgentClients(),
+    registry: storage,
+    logger,
+  });
+
+  const agentId = "00000000-0000-4000-8000-000000000401";
+  const lastActive = "2026-01-02T03:04:05.000Z";
+  const markedUnread = "2026-01-09T03:04:05.000Z";
+
+  try {
+    const agent = await manager.createAgent({ provider: "codex", cwd: root }, agentId, {
+      workspaceId: "workspace-a",
+    });
+    await manager.closeAgent(agent.id);
+    await manager.flush();
+    await storage.flush();
+
+    const stored = await storage.get(agentId);
+    if (!stored) {
+      throw new Error("expected a stored agent");
+    }
+    // The agent finished days ago, and was marked unread later without being opened, which
+    // moves `updatedAt` on its own. Clients already hold that newer time, and
+    // `acceptAgentDirectoryUpdate` drops anything older, so the resumed agent must not come
+    // back carrying only `lastActivityAt`.
+    await storage.upsert({
+      ...stored,
+      updatedAt: markedUnread,
+      lastActivityAt: lastActive,
+      requiresAttention: true,
+      attentionReason: "finished",
+      attentionTimestamp: lastActive,
+    });
+
+    await ensureAgentLoaded(agentId, { agentManager: manager, agentStorage: storage, logger });
+    await manager.flush();
+    await storage.flush();
+
+    // Loading the runtime is neither the agent working nor the user reading the chat.
+    // Forging either rewrites the workspace's "last used" and drops it out of Ready to review.
+    const resumed = await storage.get(agentId);
+    expect(resumed?.requiresAttention).toBe(true);
+    expect(resumed?.attentionReason).toBe("finished");
+    expect(resumed?.updatedAt).toBe(markedUnread);
+    expect(resumed?.lastActivityAt).toBe(markedUnread);
+    expect(manager.getAgent(agentId)?.attention.requiresAttention).toBe(true);
+    expect(manager.getAgent(agentId)?.updatedAt.toISOString()).toBe(markedUnread);
+  } finally {
+    await manager.closeAgent(agentId).catch(() => undefined);
+    await manager.flush().catch(() => undefined);
+    await storage.flush().catch(() => undefined);
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test("loads an archived agent's history after its working directory is removed", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "agent-loading-missing-cwd-"));
+  const worktree = path.join(root, "managed-worktree");
+  await mkdir(worktree, { recursive: true });
+  const logger = createTestLogger();
+  const storage = new AgentStorage(path.join(root, "agents"), logger);
+  const manager = new AgentManager({
+    clients: createTestAgentClients(),
+    registry: storage,
+    logger,
+  });
+
+  const agentId = "00000000-0000-4000-8000-000000000501";
+
+  try {
+    const agent = await manager.createAgent({ provider: "codex", cwd: worktree }, agentId, {
+      workspaceId: "workspace-worktree",
+    });
+    await startAgentRun(manager, agent.id, "what did you change", logger, {});
+    // Dispatching a run does not finish it: the provider appends the reply to its
+    // history afterwards, and the turn is finalized only once that append lands.
+    // Archive after the turn is finalized so the transcript this test reads back is
+    // already on disk when the worktree goes away.
+    const finished = await manager.waitForAgentEvent(agent.id);
+    expect(finished.status).toBe("idle");
+    await manager.archiveAgent(agent.id);
+    await manager.closeAgent(agent.id);
+    await manager.flush();
+    await storage.flush();
+
+    // Archiving the workspace removes the worktree it owned. The agent's history is
+    // persisted and reading it must not depend on that directory still being there.
+    await rm(worktree, { recursive: true, force: true });
+
+    const loaded = await ensureAgentLoaded(agentId, {
+      agentManager: manager,
+      agentStorage: storage,
+      logger,
+    });
+
+    expect(loaded.id).toBe(agentId);
+    // The transcript is replayed from the provider's persisted history, so the reply the
+    // agent gave before the worktree went away is still readable.
+    const replies = manager
+      .getTimeline(agentId)
+      .filter((item) => item.type === "assistant_message");
+    expect(replies.length).toBeGreaterThan(0);
+    expect(replies.every((item) => item.type === "assistant_message" && item.text.length > 0)).toBe(
+      true,
+    );
+  } finally {
+    await manager.closeAgent(agentId).catch(() => undefined);
+    await manager.flush().catch(() => undefined);
+    await storage.flush().catch(() => undefined);
+    await rm(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/agent/agent-loading.ts b/packages/server/src/server/agent/agent-loading.ts
index f87f38911c..248e8d2b1b 100644
--- a/packages/server/src/server/agent/agent-loading.ts
+++ b/packages/server/src/server/agent/agent-loading.ts
@@ -6,6 +6,7 @@ import type { AgentStorage } from "./agent-storage.js";
 import {
   buildConfigOverrides,
   buildSessionConfig,
+  extractAttention,
   extractTimestamps,
   isStoredAgentProviderAvailable,
   toAgentPersistenceHandle,
@@ -109,11 +110,14 @@ export async function ensureAgentLoaded(
         handle,
         buildConfigOverrides(record),
         agentId,
-        extractTimestamps(record),
+        { ...extractTimestamps(record), attention: extractAttention(record) },
         record.archivedAt ? { purpose: "history" } : undefined,
       );
       deps.logger.info({ agentId, provider: record.provider }, "Agent resumed from persistence");
     } else {
+      // No provider handle to resume: this starts the agent's first session rather than
+      // bringing one back, so it stamps activity and carries no stored attention. Records
+      // without a handle never got far enough to accumulate either.
       const config = buildSessionConfig(record, {
         validProviders,
       });
diff --git a/packages/server/src/server/agent/agent-manager-stream-coalescing.test.ts b/packages/server/src/server/agent/agent-manager-stream-coalescing.test.ts
index d3fb7c4b58..9dc194fa11 100644
--- a/packages/server/src/server/agent/agent-manager-stream-coalescing.test.ts
+++ b/packages/server/src/server/agent/agent-manager-stream-coalescing.test.ts
@@ -366,7 +366,16 @@ function getProjectedTimelineItems(rows: AgentTimelineRow[]): AgentTimelineItem[
 }
 
 function expectContiguousRowSeqs(rows: AgentTimelineRow[], expected: number[]): void {
-  expect(rows.map((row) => row.seq)).toEqual(expected);
+  const projected = projectTimelineRows({ rows, mode: "projected" });
+  const covered = projected.flatMap((row) =>
+    row.sourceSeqRanges.flatMap((range) =>
+      Array.from(
+        { length: range.endSeq - range.startSeq + 1 },
+        (_, index) => range.startSeq + index,
+      ),
+    ),
+  );
+  expect([...new Set(covered)].sort((a, b) => a - b)).toEqual(expected);
 }
 
 function expectContiguousLiveSeqs(events: AgentManagerEvent[], expected: number[]): void {
@@ -524,11 +533,10 @@ describe("target coalesced behavior", () => {
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
 
-      expect(rows).toHaveLength(2);
+      expect(rows).toHaveLength(1);
       expect(events).toHaveLength(2);
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "x" },
-        { type: "assistant_message", text: "x".repeat(999) },
+        { type: "assistant_message", text: "x".repeat(1000) },
       ]);
       expect(events.map((event) => (event.type === "agent_stream" ? event.event : null))).toEqual([
         {
@@ -567,10 +575,7 @@ describe("target coalesced behavior", () => {
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
 
-      expect(getTimelineItems(rows)).toEqual([
-        { type: "reasoning", text: "r" },
-        { type: "reasoning", text: "r".repeat(99) },
-      ]);
+      expect(getTimelineItems(rows)).toEqual([{ type: "reasoning", text: "r".repeat(100) }]);
       expect(events).toHaveLength(2);
       expectContiguousRowSeqs(rows, [1, 2]);
       expectContiguousLiveSeqs(events, [1, 2]);
@@ -604,8 +609,7 @@ describe("target coalesced behavior", () => {
 
       await vi.advanceTimersByTimeAsync(COALESCE_WINDOW_MS);
       expect(getTimelineItems(await harness.manager.getTimelineRows(agentId))).toEqual([
-        { type: "assistant_message", text: "a" },
-        { type: "assistant_message", text: "a".repeat(499) },
+        { type: "assistant_message", text: "a".repeat(500) },
         runningToolCall,
       ]);
       expectContiguousLiveSeqs(getTimelineStreamEvents(harness.events, agentId), [1, 2, 3]);
@@ -617,15 +621,14 @@ describe("target coalesced behavior", () => {
       // The "b" burst arrives inside the window that just flushed, so it gets no
       // leading flush of its own and coalesces whole.
       await vi.advanceTimersByTimeAsync(BEFORE_COALESCE_WINDOW_MS);
-      expect(await harness.manager.getTimelineRows(agentId)).toHaveLength(3);
+      expect(await harness.manager.getTimelineRows(agentId)).toHaveLength(2);
 
       await vi.advanceTimersByTimeAsync(1);
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
 
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "a" },
-        { type: "assistant_message", text: "a".repeat(499) },
+        { type: "assistant_message", text: "a".repeat(500) },
         runningToolCall,
         { type: "assistant_message", text: "b".repeat(500) },
       ]);
@@ -665,10 +668,7 @@ describe("target coalesced behavior", () => {
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
 
-      expect(getTimelineItems(rows)).toEqual([
-        toolCall({ output: "chunk-0" }),
-        toolCall({ output: "chunk-199" }),
-      ]);
+      expect(getTimelineItems(rows)).toEqual([toolCall({ output: "chunk-199" })]);
       expect(events).toHaveLength(2);
       expectContiguousRowSeqs(rows, [1, 2]);
       expectContiguousLiveSeqs(events, [1, 2]);
@@ -695,9 +695,8 @@ describe("target coalesced behavior", () => {
       const events = getTimelineStreamEvents(harness.events, agentId);
 
       expect(getTimelineItems(rows)).toEqual([
-        toolCall({ callId: "tool-1", output: "one-a" }),
-        toolCall({ callId: "tool-2", output: "two-b" }),
         toolCall({ callId: "tool-1", output: "one-b" }),
+        toolCall({ callId: "tool-2", output: "two-b" }),
       ]);
       expect(events).toHaveLength(3);
       expectContiguousRowSeqs(rows, [1, 2, 3]);
@@ -876,14 +875,8 @@ describe("target coalesced behavior", () => {
       const firstEvents = getTimelineStreamEvents(harness.events, first.agentId);
       const secondEvents = getTimelineStreamEvents(harness.events, second.agentId);
 
-      expect(getTimelineItems(firstRows)).toEqual([
-        { type: "assistant_message", text: "a" },
-        { type: "assistant_message", text: "a" },
-      ]);
-      expect(getTimelineItems(secondRows)).toEqual([
-        { type: "assistant_message", text: "b" },
-        { type: "assistant_message", text: "b" },
-      ]);
+      expect(getTimelineItems(firstRows)).toEqual([{ type: "assistant_message", text: "aa" }]);
+      expect(getTimelineItems(secondRows)).toEqual([{ type: "assistant_message", text: "bb" }]);
       expect(firstEvents).toHaveLength(2);
       expect(secondEvents).toHaveLength(2);
       expectContiguousRowSeqs(firstRows, [1, 2]);
@@ -916,10 +909,7 @@ describe("target coalesced behavior", () => {
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
 
-      expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "codex" },
-        { type: "assistant_message", text: "claude" },
-      ]);
+      expect(getTimelineItems(rows)).toEqual([{ type: "assistant_message", text: "codexclaude" }]);
       expect(events.map((event) => (event.type === "agent_stream" ? event.event : null))).toEqual([
         { type: "timeline", provider: "codex", item: { type: "assistant_message", text: "codex" } },
         {
@@ -991,10 +981,7 @@ describe("target coalesced behavior", () => {
       const events = getTimelineStreamEvents(harness.events, agentId);
 
       // The empty chunk is dropped before the coalescer, so " " leads the burst.
-      expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: " " },
-        { type: "assistant_message", text: "\n\tdone" },
-      ]);
+      expect(getTimelineItems(rows)).toEqual([{ type: "assistant_message", text: " \n\tdone" }]);
       expect(events).toHaveLength(2);
       expectContiguousRowSeqs(rows, [1, 2]);
       expectContiguousLiveSeqs(events, [1, 2]);
@@ -1189,9 +1176,7 @@ describe("target coalesced behavior", () => {
       const timelineEvents = getTimelineStreamEvents(idempotencyHarness.events, agentId);
 
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "a" },
-        { type: "assistant_message", text: "bc" },
-        TOOL_CALL,
+        { type: "assistant_message", text: "abc" },
         TOOL_CALL,
       ]);
       expect(timelineEvents).toHaveLength(4);
@@ -1243,8 +1228,7 @@ describe("target coalesced behavior", () => {
       const rowsAfterSecondFlush = await reentryHarness.manager.getTimelineRows(agentId);
       const timelineEvents = getTimelineStreamEvents(reentryHarness.events, agentId);
       expect(getTimelineItems(rowsAfterSecondFlush)).toEqual([
-        { type: "assistant_message", text: "A" },
-        { type: "assistant_message", text: "B" },
+        { type: "assistant_message", text: "AB" },
       ]);
       expect(timelineEvents).toHaveLength(2);
       expectContiguousRowSeqs(rowsAfterSecondFlush, [1, 2]);
@@ -1274,20 +1258,19 @@ describe("target coalesced behavior", () => {
       const rows = await harness.manager.getTimelineRows(agentId);
       const events = getTimelineStreamEvents(harness.events, agentId);
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "flush" },
-        { type: "assistant_message", text: "-pending" },
+        { type: "assistant_message", text: "flush-pending" },
       ]);
       expect(events).toHaveLength(2);
 
       await vi.advanceTimersByTimeAsync(100);
-      expect(await harness.manager.getTimelineRows(agentId)).toHaveLength(2);
+      expect(await harness.manager.getTimelineRows(agentId)).toHaveLength(1);
       expect(getTimelineStreamEvents(harness.events, agentId)).toHaveLength(2);
     } finally {
       harness.cleanup();
     }
   });
 
-  test("history hydration is uncoalesced and immediate", async () => {
+  test("history hydration projects immediately without waiting for a streaming window", async () => {
     vi.useFakeTimers();
     const harness = createHarness();
     try {
@@ -1298,20 +1281,16 @@ describe("target coalesced behavior", () => {
 
       const rows = await harness.manager.getTimelineRows(agentId);
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "a1" },
-        { type: "assistant_message", text: "a2" },
-        { type: "reasoning", text: "r1" },
-        { type: "reasoning", text: "r2" },
+        { type: "assistant_message", text: "a1a2" },
+        { type: "reasoning", text: "r1r2" },
       ]);
       expectContiguousRowSeqs(rows, [1, 2, 3, 4]);
       expect(getTimelineStreamEvents(harness.events, agentId)).toHaveLength(0);
 
       await vi.advanceTimersByTimeAsync(100);
       expect(getTimelineItems(await harness.manager.getTimelineRows(agentId))).toEqual([
-        { type: "assistant_message", text: "a1" },
-        { type: "assistant_message", text: "a2" },
-        { type: "reasoning", text: "r1" },
-        { type: "reasoning", text: "r2" },
+        { type: "assistant_message", text: "a1a2" },
+        { type: "reasoning", text: "r1r2" },
       ]);
     } finally {
       harness.cleanup();
@@ -1362,10 +1341,7 @@ describe("target coalesced behavior", () => {
 
       const rows = await harness.manager.getTimelineRows(agentId);
       const streamEvents = getStreamEvents(harness.events, agentId);
-      expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "hello " },
-        { type: "assistant_message", text: "world" },
-      ]);
+      expect(getTimelineItems(rows)).toEqual([{ type: "assistant_message", text: "hello world" }]);
       expect(getProjectedTimelineItems(rows)).toEqual([
         { type: "assistant_message", text: "hello world" },
       ]);
@@ -1417,8 +1393,7 @@ describe("target coalesced behavior", () => {
 
       const rows = await harness.manager.getTimelineRows(agentId);
       expect(getTimelineItems(rows)).toEqual([
-        { type: "assistant_message", text: "a1" },
-        { type: "assistant_message", text: "a2" },
+        { type: "assistant_message", text: "a1a2" },
         { type: "reasoning", text: "r1r2" },
         { type: "assistant_message", text: "b1b2" },
       ]);
@@ -1434,8 +1409,7 @@ describe("target coalesced behavior", () => {
 
       await vi.advanceTimersByTimeAsync(100);
       expect(getTimelineItems(await harness.manager.getTimelineRows(agentId))).toEqual([
-        { type: "assistant_message", text: "a1" },
-        { type: "assistant_message", text: "a2" },
+        { type: "assistant_message", text: "a1a2" },
         { type: "reasoning", text: "r1r2" },
         { type: "assistant_message", text: "b1b2" },
       ]);
diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index 5416a8d2ce..da1cfc8196 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -1,3 +1,8 @@
+import {
+  prepareAgentMessage,
+  formatAgentMessage,
+  formatSystemNotificationPrompt,
+} from "./agent-messages/index.js";
 import { expect, test, vi } from "vitest";
 import { spawn } from "node:child_process";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
@@ -18,7 +23,8 @@ import { InMemoryAgentTimelineStore } from "./agent-timeline-store.js";
 import { toAgentPayload } from "./agent-projections.js";
 import { projectTimelineRows } from "./timeline-projection.js";
 import { getOpenAgentTabLabel, PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
-import { formatSystemNotificationPrompt, startAgentRun } from "./agent-prompt.js";
+import { startAgentRun } from "./agent-prompt.js";
+import { StaleProviderSessionError } from "./stale-provider-session-error.js";
 import { ensureAgentLoaded, ensureUnarchivedAgentLoaded } from "./agent-loading.js";
 import type { StoredAgentRecord } from "./agent-storage.js";
 import type {
@@ -36,6 +42,7 @@ import type {
   AgentProvider,
   AgentPersistenceHandle,
   AgentRunOptions,
+  AgentResumeSessionOptions,
   AgentRunResult,
   AgentSession,
   AgentSessionConfig,
@@ -68,6 +75,12 @@ function deferred<T>(): Deferred<T> {
   return { promise, resolve, reject };
 }
 
+async function drainAsyncGenerator<T>(generator: AsyncGenerator<T>): Promise<void> {
+  for await (const _ of generator) {
+    // Drain provider events while AgentManager subscribers observe them.
+  }
+}
+
 function waitForAgentLifecycle(
   manager: AgentManager,
   agentId: string,
@@ -519,6 +532,32 @@ class TestAgentSession implements AgentSession {
   async close(): Promise<void> {}
 }
 
+class ResumeTrackingTestAgentClient extends TestAgentClient {
+  private readonly retryStarted = deferred<void>();
+
+  override async resumeSession(
+    _handle: AgentPersistenceHandle,
+    config?: Partial<AgentSessionConfig>,
+  ): Promise<AgentSession> {
+    this.resumeOverrides.push(config);
+    const signalRetryStarted = () => this.retryStarted.resolve();
+    return new (class extends TestAgentSession {
+      override async startTurn(): Promise<{ turnId: string }> {
+        signalRetryStarted();
+        return await super.startTurn();
+      }
+    })({
+      provider: this.provider,
+      cwd: config?.cwd ?? process.cwd(),
+      daemonAppendSystemPrompt: config?.daemonAppendSystemPrompt,
+    });
+  }
+
+  waitForRetryStart(): Promise<void> {
+    return this.retryStarted.promise;
+  }
+}
+
 class McpCapableTestAgentSession extends TestAgentSession {
   override readonly capabilities = {
     ...TEST_CAPABILITIES,
@@ -658,6 +697,137 @@ test("uses an injected timeline store without making it a production requirement
   }
 });
 
+test("refreshing an agent replaces the injected timeline store instead of appending a second copy", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-timeline-rehydrate-"));
+  const store = new RecordingTimelineStore();
+  class HistorySession extends TestAgentSession {
+    override async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "user_message", text: "continue" },
+      };
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "assistant_message", text: "done" },
+      };
+    }
+  }
+  class HistoryClient extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      return new HistorySession(config);
+    }
+
+    override async resumeSession(
+      _handle: AgentPersistenceHandle,
+      config?: Partial<AgentSessionConfig>,
+    ): Promise<AgentSession> {
+      return new HistorySession({ provider: "codex", cwd: config?.cwd ?? workdir });
+    }
+  }
+  const manager = new AgentManager({
+    clients: { codex: new HistoryClient() },
+    durableTimelineStore: store,
+    logger,
+  });
+  let agentId: string | null = null;
+  try {
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    agentId = agent.id;
+
+    // What session.handleRefreshAgentRequest does for a loaded agent, twice over.
+    for (let refresh = 0; refresh < 2; refresh += 1) {
+      await manager.reloadAgentSession(agent.id, undefined, { rehydrateFromDisk: true });
+      await manager.hydrateTimelineFromProvider(agent.id, { broadcast: true });
+      await manager.flush();
+    }
+
+    const rows = await manager.getTimelineRows(agent.id);
+    expect(rows.map((row) => row.item)).toEqual([
+      { type: "user_message", text: "continue" },
+      { type: "assistant_message", text: "done" },
+    ]);
+  } finally {
+    if (agentId) await manager.closeAgent(agentId).catch(() => undefined);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("a failed history replay leaves the committed timeline intact", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-timeline-replay-fail-"));
+  const store = new RecordingTimelineStore();
+  let failReplay = false;
+  class FlakyHistorySession extends TestAgentSession {
+    override async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "user_message", text: "continue" },
+      };
+      if (failReplay) {
+        throw new Error("history stream closed");
+      }
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "assistant_message", text: "done" },
+      };
+    }
+  }
+  class FlakyHistoryClient extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      return new FlakyHistorySession(config);
+    }
+
+    override async resumeSession(
+      _handle: AgentPersistenceHandle,
+      config?: Partial<AgentSessionConfig>,
+    ): Promise<AgentSession> {
+      return new FlakyHistorySession({ provider: "codex", cwd: config?.cwd ?? workdir });
+    }
+  }
+  const manager = new AgentManager({
+    clients: { codex: new FlakyHistoryClient() },
+    durableTimelineStore: store,
+    logger,
+  });
+  let agentId: string | null = null;
+  try {
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    agentId = agent.id;
+    await manager.reloadAgentSession(agent.id, undefined, { rehydrateFromDisk: true });
+    await manager.hydrateTimelineFromProvider(agent.id, { broadcast: true });
+    await manager.flush();
+    const committed = await manager.getTimelineRows(agent.id);
+
+    failReplay = true;
+    await manager.reloadAgentSession(agent.id, undefined, { rehydrateFromDisk: true });
+    await expect(
+      manager.hydrateTimelineFromProvider(agent.id, { broadcast: true }),
+    ).rejects.toThrow("history stream closed");
+    await manager.flush();
+
+    expect(await manager.getTimelineRows(agent.id)).toEqual(committed);
+
+    // A retry once the provider recovers replaces that history rather than stacking on it.
+    failReplay = false;
+    await manager.hydrateTimelineFromProvider(agent.id, { broadcast: true });
+    await manager.flush();
+    expect((await manager.getTimelineRows(agent.id)).map((row) => row.item)).toEqual([
+      { type: "user_message", text: "continue" },
+      { type: "assistant_message", text: "done" },
+    ]);
+  } finally {
+    if (agentId) await manager.closeAgent(agentId).catch(() => undefined);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
 test("retries provider history hydration after a stream failure", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-history-retry-"));
   let attempts = 0;
@@ -1623,7 +1793,7 @@ test("reload leaves a closed durable snapshot when shutdown starts during the sw
     }).toMatchObject({
       agents: [],
       record: { lastStatus: "closed" },
-      replacementSessionClosed: true,
+      replacementSessionClosed: false,
     });
   } finally {
     client.finishClosing();
@@ -1633,7 +1803,7 @@ test("reload leaves a closed durable snapshot when shutdown starts during the sw
   }
 });
 
-test("reload closes both sessions when the closed snapshot cannot be persisted", async () => {
+test("reload does not create a replacement when the closed snapshot cannot be persisted", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-persist-failure-test-"));
   const storagePath = join(workdir, "agents");
   const storage = new AgentStorage(storagePath, logger);
@@ -1672,7 +1842,7 @@ test("reload closes both sessions when the closed snapshot cannot be persisted",
     }).toEqual({
       agents: [],
       originalSessionClosed: true,
-      replacementSessionClosed: true,
+      replacementSessionClosed: false,
     });
   } finally {
     client.finishClosing();
@@ -2244,74 +2414,256 @@ test("setAgentMode persists the selected mode across session reload", async () =
   expect(reloaded.currentModeId).toBe("full-access");
 });
 
-test("reloadAgentSession completes when the previous session close hangs", async () => {
-  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-close-timeout-"));
-  const storagePath = join(workdir, "agents");
-  const storage = new AgentStorage(storagePath, logger);
-
-  class HangingCloseSession extends TestAgentSession {
-    closeCalled = false;
-
-    override async close(): Promise<void> {
-      this.closeCalled = true;
-      await new Promise(() => {});
+test("reload releases the original writer before resuming the same session", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-writer-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  class ExclusiveWriterClient extends TestAgentClient {
+    current: CloseRecordingTestAgentSession | undefined;
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      this.current = new CloseRecordingTestAgentSession(config);
+      return this.current;
     }
-  }
-
-  class HangingCloseClient extends TestAgentClient {
-    readonly firstSession = new HangingCloseSession({
-      provider: "codex",
-      cwd: workdir,
-    });
-    resumeSessionCalls = 0;
-
-    override async createSession(): Promise<AgentSession> {
-      return this.firstSession;
-    }
-
     override async resumeSession(
-      _handle: AgentPersistenceHandle,
+      handle: AgentPersistenceHandle,
       config?: Partial<AgentSessionConfig>,
     ): Promise<AgentSession> {
-      this.resumeSessionCalls += 1;
-      return new TestAgentSession({
+      if (this.current && !this.current.closed) {
+        throw new Error("thread already has an active writer");
+      }
+      this.current = new CloseRecordingTestAgentSession({
         provider: "codex",
         cwd: config?.cwd ?? workdir,
       });
+      this.current.describePersistence = () => ({ provider: "codex", sessionId: handle.sessionId });
+      return this.current;
     }
   }
-
-  const client = new HangingCloseClient();
-  const manager = new AgentManager({
-    clients: {
-      codex: client,
-    },
-    registry: storage,
-    logger,
-    rescueTimeouts: { reloadSessionCloseMs: 10 },
-    idFactory: () => "00000000-0000-4000-8000-000000000302",
-  });
-
+  const client = new ExclusiveWriterClient();
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
   try {
-    const snapshot = await manager.createAgent(
-      {
-        provider: "codex",
-        cwd: workdir,
-      },
-      undefined,
-      { workspaceId: undefined },
-    );
-
-    const reloaded = await manager.reloadAgentSession(snapshot.id);
-
-    expect(reloaded.id).toBe(snapshot.id);
-    expect(client.firstSession.closeCalled).toBe(true);
-    expect(client.resumeSessionCalls).toBe(1);
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    for (let i = 0; i < 3; i++) {
+      const reloaded = await manager.reloadAgentSession(created.id, undefined, {
+        rehydrateFromDisk: true,
+      });
+      expect(reloaded.id).toBe(created.id);
+      expect(reloaded.persistence?.sessionId).toBe(created.persistence?.sessionId);
+    }
+    await manager.closeAgent(created.id);
   } finally {
+    await client.current?.close();
+    await storage.flush();
     rmSync(workdir, { recursive: true, force: true });
   }
 });
 
+test("opening during reload waits for the replacement", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-open-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const client = new HeldReloadCloseClient();
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+  try {
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    const reloading = manager.reloadAgentSession(created.id);
+    await client.waitForCloseToStart();
+    let opened = false;
+    const opening = ensureAgentLoaded(created.id, {
+      agentManager: manager,
+      agentStorage: storage,
+      logger,
+    }).then((agent) => {
+      opened = true;
+      return agent;
+    });
+    await new Promise<void>((resolve) => setImmediate(resolve));
+    expect(opened).toBe(false);
+    client.finishClosing();
+    const replacement = await reloading;
+    expect((await opening).session).toBe(replacement.session);
+    await manager.closeAgent(created.id);
+  } finally {
+    client.finishClosing();
+    await storage.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("closing during reload leaves the replacement closed", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-close-race-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const client = new HeldReloadCloseClient();
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+  try {
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    const reloading = manager.reloadAgentSession(created.id);
+    await client.waitForCloseToStart();
+    const closing = manager.closeAgent(created.id);
+    client.finishClosing();
+    await Promise.all([reloading, closing]);
+    expect(manager.getAgent(created.id)).toBeNull();
+    expect(client.replacementSessionClosed).toBe(true);
+    expect(await storage.get(created.id)).toMatchObject({ lastStatus: "closed" });
+  } finally {
+    client.finishClosing();
+    await storage.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("retrying a timed-out reload waits for the original close to finish", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-late-close-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const client = new HeldReloadCloseClient();
+  const manager = new AgentManager({
+    clients: { codex: client },
+    registry: storage,
+    logger,
+    rescueTimeouts: { reloadSessionCloseMs: 10 },
+  });
+  try {
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    await expect(manager.reloadAgentSession(created.id)).rejects.toThrow("Timed out closing");
+    expect(manager.getAgent(created.id)?.lifecycle).toBe("error");
+    const retry = manager.reloadAgentSession(created.id);
+    client.finishClosing();
+    expect((await retry).id).toBe(created.id);
+    expect(client.originalSessionClosed).toBe(true);
+    await manager.closeAgent(created.id);
+  } finally {
+    client.finishClosing();
+    await storage.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("failed reload retains the closed agent for a later resume", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-recovery-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  class FailingResumeClient extends TestAgentClient {
+    fail = true;
+    override async resumeSession(
+      handle: AgentPersistenceHandle,
+      config?: Partial<AgentSessionConfig>,
+    ): Promise<AgentSession> {
+      if (this.fail) throw new Error("resume unavailable");
+      return super.resumeSession(handle, config);
+    }
+  }
+  const client = new FailingResumeClient();
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+  try {
+    const created = await manager.createAgent(
+      { provider: "codex", cwd: workdir, title: "Keep me" },
+      undefined,
+      { workspaceId: undefined },
+    );
+    await expect(manager.reloadAgentSession(created.id)).rejects.toThrow("resume unavailable");
+    expect(manager.getAgent(created.id)).toBeNull();
+    expect(await storage.get(created.id)).toMatchObject({
+      lastStatus: "closed",
+      title: "Keep me",
+      persistence: created.persistence,
+    });
+    client.fail = false;
+    const recovered = await ensureAgentLoaded(created.id, {
+      agentManager: manager,
+      agentStorage: storage,
+      logger,
+    });
+    expect(recovered.id).toBe(created.id);
+    expect((await storage.get(created.id))?.title).toBe("Keep me");
+    await manager.closeAgent(created.id);
+  } finally {
+    await storage.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test.each(["hang", "reject"])(
+  "reload does not resume when the previous session close fails: %s",
+  async (failure) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-close-timeout-"));
+    const storagePath = join(workdir, "agents");
+    const storage = new AgentStorage(storagePath, logger);
+
+    class HangingCloseSession extends TestAgentSession {
+      closeCalled = false;
+
+      override async close(): Promise<void> {
+        this.closeCalled = true;
+        if (failure === "reject") throw new Error("close rejected");
+        await new Promise(() => {});
+      }
+    }
+
+    class HangingCloseClient extends TestAgentClient {
+      readonly firstSession = new HangingCloseSession({
+        provider: "codex",
+        cwd: workdir,
+      });
+      resumeSessionCalls = 0;
+
+      override async createSession(): Promise<AgentSession> {
+        return this.firstSession;
+      }
+
+      override async resumeSession(
+        _handle: AgentPersistenceHandle,
+        config?: Partial<AgentSessionConfig>,
+      ): Promise<AgentSession> {
+        this.resumeSessionCalls += 1;
+        return new TestAgentSession({
+          provider: "codex",
+          cwd: config?.cwd ?? workdir,
+        });
+      }
+    }
+
+    const client = new HangingCloseClient();
+    const manager = new AgentManager({
+      clients: {
+        codex: client,
+      },
+      registry: storage,
+      logger,
+      rescueTimeouts: { reloadSessionCloseMs: 10 },
+      idFactory: () => "00000000-0000-4000-8000-000000000302",
+    });
+
+    try {
+      const snapshot = await manager.createAgent(
+        {
+          provider: "codex",
+          cwd: workdir,
+        },
+        undefined,
+        { workspaceId: undefined },
+      );
+
+      for (let i = 0; i < 2; i++) {
+        await expect(manager.reloadAgentSession(snapshot.id)).rejects.toThrow(
+          failure === "hang" ? "Timed out closing previous session" : "close rejected",
+        );
+      }
+      expect(client.firstSession.closeCalled).toBe(true);
+      expect(client.resumeSessionCalls).toBe(0);
+      expect(manager.getAgent(snapshot.id)?.session).toBe(client.firstSession);
+    } finally {
+      await manager.flush();
+      await storage.flush();
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  },
+);
+
 test("cancelAgentRun preserves running state when the provider interrupt hangs", async () => {
   const fixture = await createControlledInterruptFixture({
     name: "interrupt-timeout",
@@ -2785,10 +3137,12 @@ test("reloadAgentSession preserves the live session when its replacement cannot
     }
   }
 
+  let paseoToolPolicy = { disabledTools: ["list_agents"] };
   const manager = new AgentManager({
     clients: { codex: new UnsupportedReloadClient() },
     registry: new AgentStorage(join(workdir, "agents"), logger),
     logger,
+    resolvePaseoToolPolicy: () => paseoToolPolicy,
   });
 
   try {
@@ -2797,6 +3151,7 @@ test("reloadAgentSession preserves the live session when its replacement cannot
       "00000000-0000-4000-8000-000000000109",
       { workspaceId: undefined },
     );
+    paseoToolPolicy = { disabledTools: ["create_agent"] };
 
     await expect(
       manager.reloadAgentSession(created.id, {
@@ -2806,10 +3161,13 @@ test("reloadAgentSession preserves the live session when its replacement cannot
       }),
     ).rejects.toThrow("Provider 'codex' does not support MCP servers");
 
-    expect(replacement.closed).toBe(true);
+    expect(replacement.closed).toBe(false);
     expect(original.closed).toBe(false);
     expect(manager.getAgent(created.id)?.session).toBe(original);
     expect(manager.getAgent(created.id)?.lifecycle).toBe("idle");
+    expect(manager.getPaseoToolPolicy(created.id)).toEqual({
+      disabledTools: ["list_agents"],
+    });
   } finally {
     rmSync(workdir, { recursive: true, force: true });
   }
@@ -2942,6 +3300,168 @@ test("createAgent allows best-effort internal MCP when the provider session repo
   rmSync(workdir, { recursive: true, force: true });
 });
 
+test("uses each provider's current policy for new sessions and snapshots it by agent", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const policies = new Map<AgentProvider, { enabled?: boolean; disabledTools?: string[] }>([
+    ["codex", { disabledTools: ["list_agents"] }],
+    ["claude", { enabled: false }],
+  ]);
+
+  class CaptureClient extends TestAgentClient {
+    override readonly capabilities = {
+      ...TEST_CAPABILITIES,
+      supportsMcpServers: true,
+      supportsNativePaseoTools: true,
+    };
+    readonly launchContexts: AgentLaunchContext[] = [];
+    readonly configs: AgentSessionConfig[] = [];
+
+    override async createSession(
+      config: AgentSessionConfig,
+      launchContext?: AgentLaunchContext,
+    ): Promise<AgentSession> {
+      this.configs.push(config);
+      if (launchContext) this.launchContexts.push(launchContext);
+      return new TestAgentSession(config);
+    }
+  }
+
+  const codex = new CaptureClient("codex");
+  const claude = new CaptureClient("claude");
+  const policyInputs: Array<{ callerAgentId?: string; paseoToolPolicy?: unknown }> = [];
+  const paseoTools: PaseoToolCatalog = {
+    tools: new Map(),
+    getTool: () => undefined,
+    executeTool: async () => {
+      throw new Error("No tools registered in test catalog");
+    },
+  };
+  const manager = new AgentManager({
+    clients: { codex, claude },
+    registry: storage,
+    logger,
+    mcpBaseUrl: "http://127.0.0.1:6767/mcp/agents",
+    resolvePaseoToolPolicy: (provider) => policies.get(provider),
+    paseoToolCatalogFactory: async (context) => {
+      policyInputs.push(context);
+      return paseoTools;
+    },
+  });
+
+  const codexAgent = await manager.createAgent(
+    { provider: "codex", cwd: workdir },
+    "00000000-0000-4000-8000-000000000107",
+    { workspaceId: undefined },
+  );
+  const claudeAgent = await manager.createAgent(
+    { provider: "claude", cwd: workdir },
+    "00000000-0000-4000-8000-000000000108",
+    { workspaceId: undefined },
+  );
+
+  expect(policyInputs).toEqual([
+    { callerAgentId: codexAgent.id, paseoToolPolicy: { disabledTools: ["list_agents"] } },
+  ]);
+  expect(codex.launchContexts[0]?.paseoTools).toBe(paseoTools);
+  expect(claude.launchContexts[0]?.paseoTools).toBeUndefined();
+  expect(codex.configs[0]?.mcpServers?.paseo).toBeUndefined();
+  expect(claude.configs[0]?.mcpServers).toBeUndefined();
+  expect(manager.getPaseoToolPolicy(codexAgent.id)).toEqual({
+    disabledTools: ["list_agents"],
+  });
+  expect(manager.getPaseoToolPolicy(claudeAgent.id)).toEqual({ enabled: false });
+
+  policies.set("codex", { disabledTools: ["create_agent"] });
+  const nextCodexAgent = await manager.createAgent(
+    { provider: "codex", cwd: workdir },
+    "00000000-0000-4000-8000-000000000111",
+    { workspaceId: undefined },
+  );
+
+  expect(manager.getPaseoToolPolicy(codexAgent.id)).toEqual({
+    disabledTools: ["list_agents"],
+  });
+  expect(manager.getPaseoToolPolicy(nextCodexAgent.id)).toEqual({
+    disabledTools: ["create_agent"],
+  });
+  expect(policyInputs).toEqual([
+    { callerAgentId: codexAgent.id, paseoToolPolicy: { disabledTools: ["list_agents"] } },
+    {
+      callerAgentId: nextCodexAgent.id,
+      paseoToolPolicy: { disabledTools: ["create_agent"] },
+    },
+  ]);
+
+  await manager.archiveAgent(claudeAgent.id);
+  expect(manager.getPaseoToolPolicy(claudeAgent.id)).toBeUndefined();
+
+  rmSync(workdir, { recursive: true, force: true });
+});
+
+test("keeps the global Paseo-tools gate outside provider policy and MCP injection", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+
+  class McpClient extends TestAgentClient {
+    override readonly capabilities = {
+      ...TEST_CAPABILITIES,
+      supportsMcpServers: true,
+    };
+    lastConfig: AgentSessionConfig | null = null;
+
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      this.lastConfig = config;
+      return new TestAgentSession(config);
+    }
+  }
+
+  const enabledClient = new McpClient();
+  const enabledManager = new AgentManager({
+    clients: { codex: enabledClient },
+    registry: storage,
+    logger,
+    mcpBaseUrl: "http://127.0.0.1:6767/mcp/agents",
+    resolvePaseoToolPolicy: () => ({ disabledTools: ["list_agents"] }),
+  });
+  const enabledAgent = await enabledManager.createAgent(
+    { provider: "codex", cwd: workdir },
+    "00000000-0000-4000-8000-000000000109",
+    { workspaceId: undefined },
+  );
+
+  expect(enabledClient.lastConfig?.mcpServers?.paseo).toEqual({
+    type: "http",
+    url: `http://127.0.0.1:6767/mcp/agents?callerAgentId=${enabledAgent.id}`,
+  });
+
+  const disabledClient = new McpClient();
+  let catalogFactoryCalls = 0;
+  const disabledManager = new AgentManager({
+    clients: { codex: disabledClient },
+    registry: storage,
+    logger,
+    mcpBaseUrl: "http://127.0.0.1:6767/mcp/agents",
+    paseoToolsEnabled: false,
+    resolvePaseoToolPolicy: () => ({ enabled: true }),
+    paseoToolCatalogFactory: () => {
+      catalogFactoryCalls += 1;
+      return paseoTools;
+    },
+  });
+  const disabledAgent = await disabledManager.createAgent(
+    { provider: "codex", cwd: workdir },
+    "00000000-0000-4000-8000-000000000110",
+    { workspaceId: undefined },
+  );
+
+  expect(disabledClient.lastConfig?.mcpServers).toBeUndefined();
+  expect(catalogFactoryCalls).toBe(0);
+  expect(disabledManager.getPaseoToolPolicy(disabledAgent.id)).toEqual({ enabled: false });
+
+  rmSync(workdir, { recursive: true, force: true });
+});
+
 test("resumeAgentFromPersistence replaces stored internal paseo MCP with current runtime URL", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
   const storagePath = join(workdir, "agents");
@@ -3327,6 +3847,212 @@ test("updateProviderRegistry removes providers omitted from the next registry",
   expect(removedClient.createSessionCalls).toBe(0);
 });
 
+test("retires loaded agents when their plugin provider is replaced", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-plugin-provider-reload-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const provider = "plugin-provider";
+
+  class OriginalPluginClient extends TestAgentClient {
+    session: CloseRecordingTestAgentSession | null = null;
+
+    constructor() {
+      super(provider);
+    }
+
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      const session = new CloseRecordingTestAgentSession(config);
+      session.describePersistence = () => ({
+        provider,
+        sessionId: "plugin-session",
+      });
+      this.session = session;
+      return session;
+    }
+  }
+
+  const original = new OriginalPluginClient();
+  const replacement = new TestAgentClient(provider);
+  const manager = new AgentManager({
+    clients: { [provider]: original },
+    providerDefinitions: { [provider]: { enabled: true } },
+    registry: storage,
+    logger,
+  });
+  const created = await manager.createAgent({ provider, cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+
+  try {
+    manager.updateProviderRegistry({
+      providerDefinitions: { [provider]: { enabled: true } },
+      clients: { [provider]: replacement },
+      retiredProviders: [provider],
+    });
+
+    await manager.waitForAgentClose(created.id);
+    expect(original.session?.closed).toBe(true);
+    expect(manager.getAgent(created.id)).toBeNull();
+
+    const resumed = await ensureAgentLoaded(created.id, {
+      agentManager: manager,
+      agentStorage: storage,
+      logger,
+    });
+    expect(resumed.id).toBe(created.id);
+    expect(replacement.resumeOverrides).toEqual([
+      expect.objectContaining({ cwd: workdir, provider }),
+    ]);
+  } finally {
+    await manager.closeAgent(created.id).catch(() => undefined);
+    await manager.flush().catch(() => undefined);
+    await storage.flush().catch(() => undefined);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("a prompt after provider replacement reopens the stale session", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-stale-prompt-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const provider = "plugin-provider";
+
+  class StalePluginSession extends CloseRecordingTestAgentSession {
+    override async startTurn(): Promise<{ turnId: string }> {
+      throw new StaleProviderSessionError("stale-bridge");
+    }
+  }
+
+  class StalePluginClient extends TestAgentClient {
+    constructor() {
+      super(provider);
+    }
+
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      const session = new StalePluginSession(config);
+      session.describePersistence = () => ({
+        provider,
+        sessionId: "plugin-session",
+      });
+      return session;
+    }
+  }
+
+  const staleClient = new StalePluginClient();
+  const replacement = new ResumeTrackingTestAgentClient(provider);
+  const manager = new AgentManager({
+    clients: { [provider]: staleClient },
+    providerDefinitions: { [provider]: { enabled: true } },
+    registry: storage,
+    logger,
+  });
+  const created = await manager.createAgent({ provider, cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+
+  try {
+    manager.updateProviderRegistry({
+      providerDefinitions: { [provider]: { enabled: true } },
+      clients: { [provider]: replacement },
+    });
+
+    const dispatch = await startAgentRun(manager, created.id, "continue after reload", logger, {
+      runOptions: { clientMessageId: "stale-session-retry" },
+    });
+    expect(dispatch.disposition).toBe("turn_started");
+    await replacement.waitForRetryStart();
+    const result = await manager.waitForAgentEvent(created.id);
+    expect(result.status).toBe("idle");
+    expect(replacement.resumeOverrides).toHaveLength(1);
+    const timeline = manager.getTimeline(created.id);
+    expect(timeline.filter((item) => item.type === "user_message")).toMatchObject([
+      { text: "continue after reload", clientMessageId: "stale-session-retry" },
+    ]);
+    expect(
+      timeline.some(
+        (item) => item.type === "assistant_message" && item.text.includes("[System Error]"),
+      ),
+    ).toBe(false);
+  } finally {
+    await manager.closeAgent(created.id).catch(() => undefined);
+    await manager.flush().catch(() => undefined);
+    await storage.flush().catch(() => undefined);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("a replacement prompt recovers when the retired session fails to start", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-stale-replacement-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const provider = "plugin-provider";
+
+  class StaleReplacementSession extends TestAgentSession {
+    private starts = 0;
+
+    override async startTurn(): Promise<{ turnId: string }> {
+      this.starts += 1;
+      if (this.starts > 1) throw new StaleProviderSessionError("stale-bridge");
+      return { turnId: "initial-turn" };
+    }
+
+    override async interrupt(): Promise<void> {
+      if (this.starts > 1) throw new StaleProviderSessionError("stale-bridge");
+      this.pushEvent({
+        type: "turn_canceled",
+        provider: this.provider,
+        turnId: "initial-turn",
+      });
+    }
+  }
+
+  class StaleReplacementClient extends TestAgentClient {
+    constructor() {
+      super(provider);
+    }
+
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      const session = new StaleReplacementSession(config);
+      session.describePersistence = () => ({ provider, sessionId: "plugin-session" });
+      return session;
+    }
+  }
+
+  const replacement = new ResumeTrackingTestAgentClient(provider);
+  const manager = new AgentManager({
+    clients: { [provider]: new StaleReplacementClient() },
+    providerDefinitions: { [provider]: { enabled: true } },
+    registry: storage,
+    logger,
+    rescueTimeouts: { interruptSessionMs: 20 },
+  });
+  const created = await manager.createAgent({ provider, cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+
+  try {
+    const initial = manager.streamAgent(created.id, "initial");
+    void drainAsyncGenerator(initial);
+    await manager.waitForAgentRunStart(created.id);
+
+    manager.updateProviderRegistry({
+      providerDefinitions: { [provider]: { enabled: true } },
+      clients: { [provider]: replacement },
+    });
+
+    const dispatch = await startAgentRun(manager, created.id, "replacement", logger, {
+      replaceRunning: true,
+    });
+    expect(dispatch.disposition).toBe("turn_started");
+    await replacement.waitForRetryStart();
+    const result = await manager.waitForAgentEvent(created.id);
+    expect(result.status).toBe("idle");
+    expect(replacement.resumeOverrides).toHaveLength(1);
+  } finally {
+    await manager.closeAgent(created.id).catch(() => undefined);
+    await manager.flush().catch(() => undefined);
+    await storage.flush().catch(() => undefined);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
 test("createAgent passes explicit model strings through to the provider", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
   const storagePath = join(workdir, "agents");
@@ -4141,6 +4867,53 @@ test("persists live mode, model, and thinking changes without an external snapsh
   expect(persisted?.runtimeInfo?.model).toBe("gpt-5.4");
 });
 
+test("model changes persist the resolved thinking and fresh provider handle before another turn", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-model-selection-"));
+  class ModelSession extends TestAgentSession {
+    selection = { model: "source", thinkingOptionId: "medium" as string | undefined };
+    async setModel(model: string | null) {
+      this.selection = { model: model ?? "default", thinkingOptionId: undefined };
+      this.pushEvent({
+        type: "thinking_option_changed",
+        provider: "codex",
+        thinkingOptionId: null,
+      });
+    }
+    describePersistence() {
+      return { provider: "codex" as const, sessionId: this.id, metadata: { ...this.selection } };
+    }
+  }
+  class ModelClient extends TestAgentClient {
+    async createSession(config: AgentSessionConfig) {
+      return new ModelSession(config);
+    }
+  }
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new ModelClient() },
+    registry: storage,
+    logger,
+  });
+  try {
+    const agent = await manager.createAgent(
+      { provider: "codex", cwd: workdir, model: "source", thinkingOptionId: "medium" },
+      undefined,
+      { workspaceId: undefined },
+    );
+    await manager.setAgentModel(agent.id, "target");
+    await manager.flush();
+    const stored = await storage.get(agent.id);
+    expect(stored?.config?.model).toBe("target");
+    expect(stored?.config?.thinkingOptionId).toBeUndefined();
+    expect(stored?.persistence?.metadata?.model).toBe("target");
+    expect(stored?.persistence?.metadata?.thinkingOptionId).toBeUndefined();
+  } finally {
+    for (const agent of manager.listAgents()) await manager.closeAgent(agent.id);
+    await manager.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
 test("later explicit config mutations win over events emitted by earlier mutations", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-config-mutation-order-"));
   class ConfigMutationSession extends TestAgentSession {
@@ -4188,8 +4961,96 @@ test("later explicit config mutations win over events emitted by earlier mutatio
   expect(manager.getAgent(snapshot.id)?.config.thinkingOptionId).toBe("high");
 });
 
+test("setAgentThinkingOption adopts the session's effective clamped level", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-thinking-clamp-"));
+  class ClampingSession extends TestAgentSession {
+    async setThinkingOption(): Promise<void> {}
+
+    override async getRuntimeInfo() {
+      return {
+        ...(await super.getRuntimeInfo()),
+        thinkingOptionId: "high",
+      };
+    }
+  }
+  class ClampingClient extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      return new ClampingSession(config);
+    }
+  }
+
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new ClampingClient() },
+    registry: storage,
+    logger,
+    idFactory: () => "00000000-0000-4000-8000-000000000135",
+  });
+  const snapshot = await manager.createAgent(
+    {
+      provider: "codex",
+      cwd: workdir,
+      thinkingOptionId: "low",
+    },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  await manager.setAgentThinkingOption(snapshot.id, "medium");
+  await manager.flush();
+
+  const agent = manager.getAgent(snapshot.id);
+  expect(agent?.config.thinkingOptionId).toBe("high");
+  expect(agent?.runtimeInfo?.thinkingOptionId).toBe("high");
+  const persisted = await storage.get(snapshot.id);
+  expect(persisted?.config?.thinkingOptionId).toBe("high");
+});
+
+test("setAgentThinkingOption surfaces a failed state read and keeps the previous level", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-thinking-read-failure-"));
+  class UnreadableStateSession extends TestAgentSession {
+    async setThinkingOption(): Promise<void> {}
+
+    override async getRuntimeInfo(): Promise<never> {
+      throw new Error("state unavailable");
+    }
+  }
+  class UnreadableStateClient extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      return new UnreadableStateSession(config);
+    }
+  }
+
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new UnreadableStateClient() },
+    registry: storage,
+    logger,
+    idFactory: () => "00000000-0000-4000-8000-000000000136",
+  });
+  const snapshot = await manager.createAgent(
+    {
+      provider: "codex",
+      cwd: workdir,
+      thinkingOptionId: "low",
+    },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  await expect(manager.setAgentThinkingOption(snapshot.id, "medium")).rejects.toThrow(
+    "state unavailable",
+  );
+  await manager.flush();
+
+  expect(manager.getAgent(snapshot.id)?.config.thinkingOptionId).toBe("low");
+  const persisted = await storage.get(snapshot.id);
+  expect(persisted?.config?.thinkingOptionId).toBe("low");
+});
+
 test("session config drift events update state through the stream channel", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-session-config-events-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
   let capturedSession: TestAgentSession | null = null;
   class ConfigEventClient extends TestAgentClient {
     override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
@@ -4202,6 +5063,7 @@ test("session config drift events update state through the stream channel", asyn
     clients: {
       codex: new ConfigEventClient(),
     },
+    registry: storage,
     logger,
     idFactory: () => "00000000-0000-4000-8000-000000000133",
   });
@@ -4256,6 +5118,7 @@ test("session config drift events update state through the stream channel", asyn
 
   const agent = manager.getAgent(snapshot.id);
   expect(agent?.currentModeId).toBe("build");
+  expect(agent?.config.modeId).toBe("build");
   expect(agent?.config.thinkingOptionId).toBe("high");
   expect(agent?.availableModes).toEqual([
     { id: "plan", label: "Plan" },
@@ -4267,6 +5130,10 @@ test("session config drift events update state through the stream channel", asyn
     thinkingOptionId: "high",
   });
   expect(streams.map((event) => event.type)).toEqual([]);
+
+  const persisted = await storage.get(snapshot.id);
+  expect(persisted?.lastModeId).toBe("build");
+  expect(persisted?.config?.modeId).toBe("build");
 });
 
 test("setLabels merges and persists labels", async () => {
@@ -4517,14 +5384,14 @@ test("archiveSnapshot clears persisted attention and normalizes running status",
   const archivedRecord = await manager.archiveSnapshot(snapshot.id, archivedAt);
 
   expect(archivedRecord.archivedAt).toBe(archivedAt);
-  expect(archivedRecord.lastStatus).toBe("idle");
+  expect(archivedRecord.lastStatus).toBe("closed");
   expect(archivedRecord.requiresAttention).toBe(false);
   expect(archivedRecord.attentionReason).toBeNull();
   expect(archivedRecord.attentionTimestamp).toBeNull();
 
   const persisted = await storage.get(snapshot.id);
   expect(persisted?.archivedAt).toBe(archivedAt);
-  expect(persisted?.lastStatus).toBe("idle");
+  expect(persisted?.lastStatus).toBe("closed");
   expect(persisted?.requiresAttention).toBe(false);
   expect(persisted?.attentionReason).toBeNull();
   expect(persisted?.attentionTimestamp).toBeNull();
@@ -4569,6 +5436,56 @@ test("archiveSnapshot dispatches archived state for stored-only agents", async (
   expect(last.lifecycle).toBe("closed");
 });
 
+test("markAgentUnread dispatches stored attention to every subscriber", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-mark-unread-dispatch-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new TestAgentClient() },
+    registry: storage,
+    logger,
+  });
+  const created = await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Stored unread dispatch" },
+    undefined,
+    { workspaceId: "workspace-1" },
+  );
+  await manager.closeAgent(created.id);
+
+  const firstClientEvents: ManagedAgent[] = [];
+  const secondClientEvents: ManagedAgent[] = [];
+  for (const events of [firstClientEvents, secondClientEvents]) {
+    manager.subscribe(
+      (event) => {
+        if (event.type === "agent_state" && event.agent.id === created.id) {
+          events.push(event.agent);
+        }
+      },
+      { replayState: false },
+    );
+  }
+
+  await manager.markAgentUnread(created.id);
+
+  for (const events of [firstClientEvents, secondClientEvents]) {
+    expect(events).toHaveLength(1);
+    expect(events[0]).toMatchObject({
+      id: created.id,
+      lifecycle: "closed",
+      workspaceId: "workspace-1",
+      attention: {
+        requiresAttention: true,
+        attentionReason: "finished",
+        attentionTimestamp: expect.any(Date),
+      },
+    });
+  }
+  expect(await storage.get(created.id)).toMatchObject({
+    requiresAttention: true,
+    attentionReason: "finished",
+    attentionTimestamp: expect.any(String),
+  });
+});
+
 test("reloadAgentSession cancels active run and resumes existing session once thread_started is observed", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-reload-active-"));
   const storagePath = join(workdir, "agents");
@@ -4757,14 +5674,17 @@ test("fetchTimeline returns a bounded reset window when cursor epoch is stale",
 
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "one",
     text: "one",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "two",
     text: "two",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "three",
     text: "three",
   });
 
@@ -4838,21 +5758,14 @@ test("getTimelineRows falls back to the in-memory timeline when no durable store
   });
 
   await expect(manager.getTimelineRows(snapshot.id)).resolves.toEqual([
-    {
-      seq: 1,
-      timestamp: expect.any(String),
-      item: {
-        type: "assistant_message",
-        text: "row one",
-      },
-    },
     {
       seq: 2,
+      seqStart: 1,
+      seqEnd: 2,
+      sourceSeqRanges: [{ startSeq: 1, endSeq: 2 }],
+      collapsed: ["assistant_merge"],
       timestamp: expect.any(String),
-      item: {
-        type: "assistant_message",
-        text: "row two",
-      },
+      item: { type: "assistant_message", text: "row onerow two" },
     },
   ]);
 });
@@ -4914,7 +5827,7 @@ test("getAgent does not expose committed history internals once manager owns the
   expect(fetched.rows.map((row) => row.seq)).toEqual([1, 2]);
 });
 
-test("coalesces assistant chunks and persists the canonical row", async () => {
+test("streams coalesced assistant chunks and retains the projected message", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-provisional-timeline-"));
   const storagePath = join(workdir, "agents");
   const storage = new AgentStorage(storagePath, logger);
@@ -4971,8 +5884,8 @@ test("coalesces assistant chunks and persists the canonical row", async () => {
   }
 
   // The coalescer flushes the first chunk on the leading edge, so "final " ships
-  // as its own row and "reply" follows on the trailing window. Clients read the
-  // projected timeline, which merges the two back into one assistant message.
+  // as its own event and "reply" follows on the trailing window. History retains
+  // their complete projected assistant message.
   const assistantTimelineEvents = streamEvents.filter(
     (event) => event.itemType === "assistant_message",
   );
@@ -4995,18 +5908,15 @@ test("coalesces assistant chunks and persists the canonical row", async () => {
   expect(manager.getTimeline(snapshot.id)).toEqual([
     {
       type: "assistant_message",
-      text: "final ",
-    },
-    {
-      type: "assistant_message",
-      text: "reply",
+      text: "final reply",
     },
   ]);
   const fetched = await manager.fetchTimeline(snapshot.id, {
     direction: "tail",
     limit: 0,
   });
-  expect(fetched.rows).toHaveLength(2);
+  expect(fetched.rows).toHaveLength(1);
+  expect(fetched.rows[0]).toMatchObject({ seqStart: 1, seqEnd: 2 });
   expect(assistantTimelineEvents[0]?.epoch).toBe(fetched.epoch);
   expect(projectTimelineRows({ rows: fetched.rows, mode: "projected" }).map((e) => e.item)).toEqual(
     [
@@ -5042,28 +5952,34 @@ test("fetchTimeline supports older-history pagination with before seq", async ()
 
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "first",
     text: "first",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "second",
     text: "second",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "third",
     text: "third",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "fourth",
     text: "fourth",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "fifth",
     text: "fifth",
   });
 
   const result = await manager.fetchTimeline(snapshot.id, {
     direction: "before",
     cursor: {
+      epoch: manager.fetchTimeline(snapshot.id).epoch,
       seq: 5,
     },
     limit: 2,
@@ -5100,14 +6016,17 @@ test("does not trim committed history", async () => {
 
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "first",
     text: "first",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "second",
     text: "second",
   });
   await manager.appendTimelineItem(snapshot.id, {
     type: "assistant_message",
+    messageId: "third",
     text: "third",
   });
 
@@ -5205,8 +6124,7 @@ test("hydrateTimeline preserves assistant chunk, reasoning, and tool timeline hi
   await manager.hydrateTimelineFromProvider(snapshot.id, { force: true });
 
   expect(manager.getTimeline(snapshot.id)).toEqual([
-    { type: "assistant_message", text: "chunk one " },
-    { type: "assistant_message", text: "chunk two" },
+    { type: "assistant_message", text: "chunk one chunk two" },
     { type: "reasoning", text: "internal" },
     {
       type: "tool_call",
@@ -6809,6 +7727,81 @@ test("listAgents excludes internal agents", async () => {
   const agents = manager.listAgents();
   expect(agents).toHaveLength(1);
   expect(agents[0]?.config.title).toBe("Normal Agent");
+
+  // Opting in lists both, and the internal one is marked.
+  const everyAgent = manager.listAgents({ includeInternal: true });
+  expect(everyAgent.map((agent) => [agent.config.title, agent.internal])).toEqual([
+    ["Normal Agent", false],
+    ["Internal Agent", true],
+  ]);
+});
+
+test("workspace ownership does not turn an ordinary agent into a disposable helper", async () => {
+  const agentId = "00000000-0000-4000-8000-000000000115";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const beforeHookCalls: string[] = [];
+  const manager = new AgentManager({
+    clients: { codex: new TestAgentClient() },
+    registry: storage,
+    logger,
+    idFactory: () => agentId,
+    pluginLifecycle: {
+      emit: () => {},
+      before: async (name, request) => {
+        beforeHookCalls.push(name);
+        return request;
+      },
+    },
+  });
+
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Helper" }, undefined, {
+    workspaceId: "wks_internal",
+  });
+
+  expect(manager.getAgent(agentId)?.internal).toBe(false);
+  expect(manager.listAgents().map((agent) => agent.id)).toEqual([agentId]);
+  expect(await storage.get(agentId)).not.toBeNull();
+  // Workspace ownership preserves ordinary agent lifecycle hooks.
+  expect(beforeHookCalls).toContain("agent.create");
+});
+
+test("global subscribers receive internal agent events only when they opt in", async () => {
+  const internalAgentId = "00000000-0000-4000-8000-000000000116";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new TestAgentClient() },
+    registry: storage,
+    logger,
+    idFactory: () => internalAgentId,
+  });
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Agent", internal: true },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  const hidden: string[] = [];
+  const optedIn: string[] = [];
+  const unsubscribeHidden = manager.subscribe((event) => {
+    if (event.type === "agent_state") hidden.push(event.agent.id);
+  });
+  const unsubscribeOptedIn = manager.subscribe(
+    (event) => {
+      if (event.type === "agent_state") optedIn.push(event.agent.id);
+    },
+    { includeInternal: true },
+  );
+
+  expect(hidden).toEqual([]);
+  expect(optedIn).toEqual([internalAgentId]);
+
+  await manager.archiveAgent(internalAgentId);
+  expect(hidden).toEqual([]);
+  expect(optedIn.length).toBeGreaterThan(1);
+  unsubscribeHidden();
+  unsubscribeOptedIn();
 });
 
 test("getAgent returns internal agents by ID", async () => {
@@ -6841,6 +7834,124 @@ test("getAgent returns internal agents by ID", async () => {
   expect(agent?.internal).toBe(true);
 });
 
+test("archiveAgent closes an internal agent without writing a record", async () => {
+  const internalAgentId = "00000000-0000-4000-8000-000000000108";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => internalAgentId,
+  });
+
+  await manager.createAgent(
+    {
+      provider: "codex",
+      cwd: workdir,
+      title: "Internal Agent",
+      internal: true,
+    },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  const { archivedAt } = await manager.archiveAgent(internalAgentId);
+
+  expect(Number.isNaN(Date.parse(archivedAt))).toBe(false);
+  expect(manager.getAgent(internalAgentId)).toBeNull();
+  expect(await storage.get(internalAgentId)).toBeNull();
+  expect(await storage.list()).toEqual([]);
+  expect(manager.getRetiredInternalAgent(internalAgentId)).toEqual({
+    record: expect.objectContaining({
+      id: internalAgentId,
+      title: "Internal Agent",
+      internal: true,
+      archivedAt,
+      lastStatus: "idle",
+    }),
+    lastMessage: null,
+  });
+  expect(manager.getRetiredInternalAgent("00000000-0000-4000-8000-000000000999")).toBeNull();
+});
+
+test("archiveAgent on an internal parent still archives its attached children", async () => {
+  const parentAgentId = "00000000-0000-4000-8000-000000000109";
+  const childAgentId = "00000000-0000-4000-8000-000000000110";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const ids = [parentAgentId, childAgentId];
+  let agentCounter = 0;
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => ids[agentCounter++] ?? randomUUID(),
+  });
+
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Parent", internal: true },
+    undefined,
+    { workspaceId: undefined },
+  );
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Child" }, undefined, {
+    workspaceId: undefined,
+    labels: { "paseo.parent-agent-id": parentAgentId },
+  });
+
+  await manager.archiveAgent(parentAgentId);
+
+  expect(manager.getAgent(parentAgentId)).toBeNull();
+  expect(manager.getAgent(childAgentId)).toBeNull();
+  const child = await storage.get(childAgentId);
+  expect(child?.archivedAt).toEqual(expect.any(String));
+  expect(await storage.get(parentAgentId)).toBeNull();
+});
+
+test("archiveAgent on a parent archives its live internal children", async () => {
+  const parentAgentId = "00000000-0000-4000-8000-000000000111";
+  const childAgentId = "00000000-0000-4000-8000-000000000112";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const ids = [parentAgentId, childAgentId];
+  let agentCounter = 0;
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => ids[agentCounter++] ?? randomUUID(),
+  });
+
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Parent" }, undefined, {
+    workspaceId: undefined,
+  });
+  // An internal child is never in storage, so only the live scan can reach it.
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Child", internal: true },
+    undefined,
+    { workspaceId: undefined, labels: { "paseo.parent-agent-id": parentAgentId } },
+  );
+  expect(manager.getAgent(childAgentId)).not.toBeNull();
+
+  await manager.archiveAgent(parentAgentId);
+
+  expect(manager.getAgent(parentAgentId)).toBeNull();
+  expect(manager.getAgent(childAgentId)).toBeNull();
+  expect(manager.getRetiredInternalAgent(childAgentId)?.record.archivedAt).toEqual(
+    expect.any(String),
+  );
+  expect(await storage.get(childAgentId)).toBeNull();
+});
+
 test("subscribe does not emit state events for internal agents to global subscribers", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
   const storagePath = join(workdir, "agents");
@@ -7251,9 +8362,20 @@ test("streamAgent clears pending run when startTurn fails before a turn id exist
     { workspaceId: undefined },
   );
 
-  await expect(manager.runAgent(agent.id, "fail before turn id")).rejects.toThrow(
-    "Invalid request: missing field `text`",
-  );
+  await expect(
+    manager.runAgent(agent.id, "fail before turn id", {
+      clientMessageId: "rejected-prompt",
+    }),
+  ).rejects.toThrow("Invalid request: missing field `text`");
+  expect(manager.getTimeline(agent.id)).toEqual([
+    {
+      type: "user_message",
+      text: "fail before turn id",
+      clientMessageId: "rejected-prompt",
+      messageId: "rejected-prompt",
+    },
+    { type: "assistant_message", text: "[System Error] Invalid request: missing field `text`" },
+  ]);
 
   await expect(manager.runAgent(agent.id, "second turn")).resolves.toEqual(
     expect.objectContaining({
@@ -7432,6 +8554,53 @@ test("fires onAgentArchived for stored-only snapshot archives", async () => {
   expect(archivedIds).toEqual([storedOnly.id]);
 });
 
+test("native archive and restore release the loaded session writer", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-native-archive-writer-"));
+  class WriterClient extends NativeArchiveRecordingClient {
+    session: CloseRecordingTestAgentSession | undefined;
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      this.session = new CloseRecordingTestAgentSession(config);
+      return this.session;
+    }
+    override async resumeSession(
+      _handle: AgentPersistenceHandle,
+      config?: Partial<AgentSessionConfig>,
+    ): Promise<AgentSession> {
+      return this.createSession({ provider: "codex", cwd: workdir, ...config });
+    }
+    override async archiveNativeSession(handle: AgentPersistenceHandle): Promise<void> {
+      if (!this.session?.closed) throw new Error("native thread has an active writer");
+      await super.archiveNativeSession(handle);
+    }
+    override async unarchiveNativeSession(handle: AgentPersistenceHandle): Promise<void> {
+      if (!this.session?.closed) throw new Error("native thread has an active writer");
+      await super.unarchiveNativeSession(handle);
+    }
+  }
+  const client = new WriterClient();
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+  try {
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    await manager.archiveAgent(agent.id);
+    expect(client.archivedHandles).toHaveLength(1);
+    // Opening archived history can retain a writer, including records archived by older daemons.
+    await ensureAgentLoaded(agent.id, { agentManager: manager, agentStorage: storage, logger });
+    expect(client.session?.closed).toBe(false);
+    await manager.unarchiveSnapshot(agent.id);
+    expect(client.unarchivedHandles).toHaveLength(1);
+    expect((await storage.get(agent.id))?.archivedAt).toBeNull();
+    expect(client.session?.closed).toBe(true);
+    await ensureAgentLoaded(agent.id, { agentManager: manager, agentStorage: storage, logger });
+    expect(client.session?.closed).toBe(false);
+  } finally {
+    for (const agent of manager.listAgents()) await manager.closeAgent(agent.id);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
 test("unarchiveSnapshot skips native provider unarchive for active records", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-unarchive-active-"));
   const storagePath = join(workdir, "agents");
@@ -8356,6 +9525,7 @@ test("respondToPermission updates currentModeId after plan approval", async () =
   class PlanModeTestClient implements AgentClient {
     readonly provider = "codex" as const;
     readonly capabilities = TEST_CAPABILITIES;
+    resumedModeId: string | null | undefined;
 
     async isAvailable(): Promise<boolean> {
       return true;
@@ -8365,14 +9535,19 @@ test("respondToPermission updates currentModeId after plan approval", async () =
       return new PlanModeTestSession();
     }
 
-    async resumeSession(): Promise<AgentSession> {
+    async resumeSession(
+      _handle: AgentPersistenceHandle,
+      overrides?: Partial<AgentSessionConfig>,
+    ): Promise<AgentSession> {
+      this.resumedModeId = overrides?.modeId;
       return new PlanModeTestSession();
     }
   }
 
+  const client = new PlanModeTestClient();
   const manager = new AgentManager({
     clients: {
-      codex: new PlanModeTestClient(),
+      codex: client,
     },
     registry: storage,
     logger,
@@ -8416,6 +9591,13 @@ test("respondToPermission updates currentModeId after plan approval", async () =
   await manager.flush();
   const persisted = await storage.get(snapshot.id);
   expect(persisted?.lastModeId).toBe("acceptEdits");
+
+  // The provider-managed switch must also reach config.modeId — otherwise a
+  // reload resumes the session with the stale creation-time mode ("plan").
+  expect(persisted?.config?.modeId).toBe("acceptEdits");
+  const reloaded = await manager.reloadAgentSession(snapshot.id);
+  expect(reloaded.config.modeId).toBe("acceptEdits");
+  expect(client.resumedModeId).toBe("acceptEdits");
 });
 
 test("respondToPermission refreshes features and runtime info after provider-managed plan approval", async () => {
@@ -8952,7 +10134,7 @@ test("ensureUnarchivedAgentLoaded does not resume an archived agent", async () =
   }
 });
 
-test("ensureUnarchivedAgentLoaded closes a runtime archived while it resumes", async () => {
+test("a stored-only archive waits for an in-flight resume and then closes it", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-archived-resume-race-"));
   const storage = new AgentStorage(join(workdir, "agents"), logger);
   const resumeStarted = deferred<void>();
@@ -8976,16 +10158,17 @@ test("ensureUnarchivedAgentLoaded closes a runtime archived while it resumes", a
     });
     await manager.closeAgent(agent.id);
 
-    const load = ensureUnarchivedAgentLoaded(agent.id, {
+    const load = ensureAgentLoaded(agent.id, {
       agentManager: manager,
       agentStorage: storage,
       logger,
     });
     await resumeStarted.promise;
-    await manager.archiveSnapshot(agent.id, new Date().toISOString());
+    const archive = manager.archiveSnapshot(agent.id, new Date().toISOString());
     resumeAllowed.resolve();
+    await archive;
 
-    await expect(load).rejects.toThrow(`Agent is archived: ${agent.id}`);
+    await expect(load).resolves.toMatchObject({ id: agent.id });
     expect(manager.getAgent(agent.id)).toBeNull();
     expect((await storage.get(agent.id))?.archivedAt).toEqual(expect.any(String));
   } finally {
@@ -8995,7 +10178,7 @@ test("ensureUnarchivedAgentLoaded closes a runtime archived while it resumes", a
   }
 });
 
-test("ensureUnarchivedAgentLoaded fences an archived agent after joining a shared resume", async () => {
+test("a stored-only archive closes a shared resume before a later protected load returns", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-archived-shared-resume-"));
   const storage = new AgentStorage(join(workdir, "agents"), logger);
   const resumeStarted = deferred<void>();
@@ -9030,8 +10213,9 @@ test("ensureUnarchivedAgentLoaded fences an archived agent after joining a share
       agentStorage: storage,
       logger,
     });
-    await manager.archiveSnapshot(agent.id, new Date().toISOString());
+    const archive = manager.archiveSnapshot(agent.id, new Date().toISOString());
     resumeAllowed.resolve();
+    await archive;
 
     await sharedLoad;
     await expect(protectedLoad).rejects.toThrow(`Agent is archived: ${agent.id}`);
@@ -9269,7 +10453,7 @@ test("concurrent explicit closes tear down the runtime once", async () => {
   }
 });
 
-test("provider close failure still persists and emits a resumable closed agent", async () => {
+test("provider close failure retains the runtime for cleanup instead of allowing another writer", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-close-failure-"));
   const storage = new AgentStorage(join(workdir, "agents"), logger);
   const client = new (class extends TestAgentClient {
@@ -9289,12 +10473,10 @@ test("provider close failure still persists and emits a resumable closed agent",
       "00000000-0000-4000-8000-000000000217",
       { workspaceId: undefined },
     );
-    const closed = waitForAgentLifecycle(manager, created.id, "closed");
-
     await expect(manager.closeAgent(created.id)).rejects.toThrow("provider cleanup failed");
-    await closed;
+    expect(manager.getAgent(created.id)?.session).toBe(created.session);
     const stored = await storage.get(created.id);
-    expect(stored).toMatchObject({ lastStatus: "closed" });
+    expect(stored).toMatchObject({ lastStatus: "idle" });
     expect(stored?.archivedAt).toBeFalsy();
 
     await expect(
@@ -9640,7 +10822,7 @@ test("canonical submitted prompt keeps wire identity while rewind resolves provi
     ]);
 
     const timeline = manager.fetchTimeline(snapshot.id, { direction: "tail", limit: 20 }).rows;
-    expect(timeline).toEqual([
+    expect(timeline).toMatchObject([
       {
         seq: 1,
         timestamp: expect.any(String),
@@ -10000,7 +11182,7 @@ test("listImportableSessions returns healthy rows alongside thrown and timed-out
     });
 
     const resultPromise = manager.listImportableSessions();
-    await vi.advanceTimersByTimeAsync(8_000);
+    await vi.advanceTimersByTimeAsync(90_000);
 
     await expect(resultPromise).resolves.toEqual({
       sessions: [
@@ -10018,7 +11200,7 @@ test("listImportableSessions returns healthy rows alongside thrown and timed-out
         { provider: "codex", message: "codex listing failed" },
         {
           provider: "pi",
-          message: "Timed out listing importable sessions for provider 'pi' after 8000ms",
+          message: "Timed out listing importable sessions for provider 'pi' after 90000ms",
         },
       ],
     });
@@ -10309,3 +11491,380 @@ test("onWorkspaceStateMayHaveChanged is not called for running shell tool calls"
 
   expect(onWorkspaceStateMayHaveChanged).not.toHaveBeenCalled();
 });
+
+test("concurrent native restores run once before resuming the same agent", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-unarchive-ownership-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const restoreStarted = deferred<void>();
+  const restoreAllowed = deferred<void>();
+  const operations: string[] = [];
+  const client = new (class extends TestAgentClient {
+    async unarchiveNativeSession(): Promise<void> {
+      operations.push("restore");
+      restoreStarted.resolve();
+      await restoreAllowed.promise;
+    }
+    override async resumeSession(
+      handle: AgentPersistenceHandle,
+      config?: Partial<AgentSessionConfig>,
+      _launchContext?: AgentLaunchContext,
+      options?: AgentResumeSessionOptions,
+    ): Promise<AgentSession> {
+      operations.push(`resume:${options?.purpose}`);
+      return super.resumeSession(handle, config);
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+  let agentId: string | undefined;
+  try {
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    agentId = created.id;
+    await manager.archiveAgent(agentId);
+    const first = manager.unarchiveSnapshot(agentId);
+    await restoreStarted.promise;
+    const second = manager.unarchiveSnapshot(agentId);
+    const load = ensureAgentLoaded(agentId, {
+      agentManager: manager,
+      agentStorage: storage,
+      logger,
+    });
+    restoreAllowed.resolve();
+    await Promise.all([first, second, load]);
+    expect(operations).toEqual(["restore", "resume:interactive"]);
+    expect((await storage.get(agentId))?.archivedAt).toBeNull();
+    expect(manager.getAgent(agentId)?.persistence?.sessionId).toBe(created.persistence?.sessionId);
+  } finally {
+    restoreAllowed.resolve();
+    if (agentId) await manager.closeAgent(agentId);
+    await storage.flush();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("commits startup notices once on create and after restored history", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-startup-notice-"));
+  const notice: AgentTimelineItem = { type: "notification", level: "info", message: "Runtime v2" };
+  const history: AgentTimelineItem = { type: "assistant_message", text: "Existing conversation" };
+  const toolOutput: AgentTimelineItem = {
+    type: "tool_call",
+    callId: "startup-output",
+    name: "shell",
+    status: "completed",
+    error: null,
+    detail: {
+      type: "shell",
+      command: "print output",
+      output: "x".repeat(1024 * 1024),
+      exitCode: 0,
+    },
+  };
+  const limitedToolOutput: AgentTimelineItem = {
+    ...toolOutput,
+    detail: { type: "shell", command: "print output", output: "x".repeat(64 * 1024), exitCode: 0 },
+  };
+  class NotifyingSession extends TestAgentSession {
+    readonly initialTimeline = [{ item: notice, timestamp: "2026-09-22T00:00:00.000Z" }];
+    override async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: history,
+        timestamp: "2026-09-21T00:00:00.000Z",
+      };
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: toolOutput,
+        timestamp: "2026-09-21T01:00:00.000Z",
+      };
+      yield { type: "timeline", provider: "codex", ...this.initialTimeline[0] };
+    }
+  }
+  const client = new (class extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig) {
+      return new NotifyingSession(config);
+    }
+    override async resumeSession() {
+      return new NotifyingSession({ provider: "codex", cwd: workdir });
+    }
+  })();
+  const store = new RecordingTimelineStore();
+  const manager = new AgentManager({
+    clients: { codex: client },
+    durableTimelineStore: store,
+    logger,
+  });
+  const ids: string[] = [];
+  try {
+    const created = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {});
+    ids.push(created.id);
+    expect((await manager.getTimelineRows(created.id)).map((row) => row.item)).toEqual([notice]);
+    const resumed = await manager.resumeAgentFromPersistence({
+      provider: "codex",
+      sessionId: "existing",
+      metadata: { cwd: workdir },
+    });
+    ids.push(resumed.id);
+    await manager.hydrateTimelineFromProvider(resumed.id);
+    expect((await manager.getTimelineRows(resumed.id)).map((row) => row.item)).toEqual([
+      history,
+      limitedToolOutput,
+      notice,
+    ]);
+    await manager.hydrateTimelineFromProvider(resumed.id, { force: true });
+    expect((await manager.getTimelineRows(resumed.id)).map((row) => row.item)).toEqual([
+      history,
+      limitedToolOutput,
+      notice,
+    ]);
+    await manager.flush();
+    expect(store.writes.flat()).toContainEqual(expect.objectContaining({ item: notice }));
+  } finally {
+    for (const id of ids) await manager.closeAgent(id);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test("failed startup history closes the session without registering an agent", async () => {
+  let closed = false;
+  class FailingHistorySession extends TestAgentSession {
+    readonly initialTimeline = [
+      {
+        item: { type: "notification", level: "info", message: "Runtime v2" } as const,
+        timestamp: "2026-09-22T00:00:00.000Z",
+      },
+    ];
+    override async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+      yield {
+        type: "timeline",
+        provider: "codex",
+        item: { type: "assistant_message", text: "Partial history" },
+      };
+      throw new Error("History unavailable");
+    }
+    override async close() {
+      closed = true;
+      await super.close();
+    }
+  }
+  const client = new (class extends TestAgentClient {
+    override async resumeSession() {
+      return new FailingHistorySession({ provider: "codex", cwd: tmpdir() });
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, logger });
+  try {
+    await expect(
+      manager.resumeAgentFromPersistence({
+        provider: "codex",
+        sessionId: "failed-history",
+        metadata: { cwd: tmpdir() },
+      }),
+    ).rejects.toThrow("History unavailable");
+    expect({ agents: manager.listAgents(), closed }).toEqual({ agents: [], closed: true });
+  } finally {
+    for (const agent of manager.listAgents()) await manager.closeAgent(agent.id);
+  }
+});
+
+test("usage session is a pure read of the live adapter and disappears on close", async () => {
+  const descriptor = {
+    provider: "claude",
+    model: "opus",
+    env: { HOME: "/fixture", CLAUDE_CONFIG_DIR: "/fixture/work" },
+    sessionKey: "launch-1",
+  };
+  const client = new (class extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+      return new (class extends TestAgentSession {
+        usageSession() {
+          return descriptor;
+        }
+      })(config);
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, logger });
+  expect(manager.usageSession("missing")).toBeNull();
+  const agent = await manager.createAgent({ provider: "codex", cwd: tmpdir() }, undefined, {
+    workspaceId: undefined,
+  });
+  try {
+    expect(manager.usageSession(agent.id)).toBe(descriptor);
+    expect(manager.usageSession(agent.id)).toBe(descriptor);
+  } finally {
+    await manager.closeAgent(agent.id);
+  }
+  expect(manager.usageSession(agent.id)).toBeNull();
+});
+
+test.each(["live", "history"])(
+  "agent messages become notification tools during %s ingestion",
+  async (path) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-message-provenance-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const item: AgentTimelineItem = {
+      type: "user_message",
+      text: '<paseo-system version="1" kind="agent-message" source-agent-id="remote::sender" message-id="delivery-1">\nReview &lt;changes&gt; &amp; report back.\n</paseo-system>',
+      messageId: "provider-message",
+    };
+    const codex = fakeCodexEmitting(
+      path === "live" ? { turnItems: [item] } : { historyItems: [item] },
+    );
+    const manager = new AgentManager({ clients: { codex }, registry: storage, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    if (path === "live") await manager.runAgent(agent.id, { text: "start" });
+    else await manager.hydrateTimelineFromProvider(agent.id, { force: true });
+    expect(manager.getTimeline(agent.id)).toContainEqual(
+      expect.objectContaining({
+        type: "tool_call",
+        callId: "paseo-agent-message:delivery-1",
+        agentMessage: {
+          event: "message",
+          sender: { id: "remote::sender" },
+          text: "Review <changes> & report back.",
+        },
+        name: "agent_message",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          icon: "bot",
+          text: "Review <changes> & report back.",
+        },
+      }),
+    );
+    expect(manager.getTimeline(agent.id).filter((entry) => entry.type === "user_message")).toEqual(
+      [],
+    );
+    expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+  },
+);
+
+test.each([false, true])(
+  "accepted agent prompt appears once with provider echo=%s",
+  async (echo) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-message-acceptance-"));
+    const delivery = prepareAgentMessage(
+      "Please review",
+      { kind: "agent-message", agentId: "remote::sender" },
+      "accepted-delivery",
+    );
+    const codex = fakeCodexEmitting({
+      turnItems: echo
+        ? [
+            {
+              type: "user_message",
+              text: String(delivery.prompt),
+              clientMessageId: delivery.messageId,
+              messageId: "native-echo",
+            },
+          ]
+        : [],
+    });
+    const manager = new AgentManager({ clients: { codex }, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    try {
+      for await (const _event of manager.streamAgent(agent.id, delivery.prompt, {
+        clientMessageId: delivery.messageId,
+      })) {
+      }
+      expect(manager.getTimeline(agent.id).filter((item) => item.type === "tool_call")).toEqual([
+        expect.objectContaining({
+          callId: "paseo-agent-message:accepted-delivery",
+          status: "completed",
+        }),
+      ]);
+      expect(manager.getTimeline(agent.id).filter((item) => item.type === "user_message")).toEqual(
+        [],
+      );
+      expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+    } finally {
+      await manager.closeAgent(agent.id);
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  },
+);
+
+test("a rejected agent prompt never becomes a delivered notification", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-message-rejected-"));
+  const delivery = prepareAgentMessage(
+    "Please review",
+    { kind: "agent-message", agentId: "sender" },
+    "rejected",
+  );
+  class RejectingSession extends TestAgentSession {
+    override async startTurn(): Promise<{ turnId: string }> {
+      throw new Error("provider rejected delivery");
+    }
+  }
+  const client = new (class extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig) {
+      return new RejectingSession(config);
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, logger });
+  const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+  try {
+    const run = manager.streamAgent(agent.id, delivery.prompt, {
+      clientMessageId: delivery.messageId,
+    });
+    await expect(run.next()).rejects.toThrow("provider rejected delivery");
+    expect(manager.getTimeline(agent.id).filter((item) => item.type === "tool_call")).toEqual([]);
+    expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+  } finally {
+    await manager.closeAgent(agent.id);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test.each([false, true])(
+  "human envelope examples remain human after echo with correlation=%s",
+  async (correlated) => {
+    const workdir = mkdtempSync(join(tmpdir(), "human-envelope-example-"));
+    const example = formatAgentMessage({
+      id: "example",
+      source: { kind: "agent-message", agentId: "sender" },
+      text: "hello",
+    });
+    const delivery = prepareAgentMessage(example, undefined, "human-submission");
+    const codex = fakeCodexEmitting({
+      turnItems: [
+        {
+          type: "user_message",
+          text: String(delivery.prompt),
+          messageId: "provider-echo",
+          ...(correlated ? { clientMessageId: "human-submission" } : {}),
+        },
+      ],
+    });
+    const manager = new AgentManager({ clients: { codex }, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    try {
+      for await (const _event of manager.streamAgent(agent.id, delivery.prompt, {
+        clientMessageId: delivery.messageId,
+      })) {
+      }
+      expect(manager.getTimeline(agent.id)).toEqual([
+        {
+          type: "user_message",
+          text: example,
+          clientMessageId: "human-submission",
+          messageId: "human-submission",
+        },
+      ]);
+      expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeInstanceOf(Date);
+    } finally {
+      await manager.closeAgent(agent.id);
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  },
+);
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index f227c286fe..f0a2208186 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -1,3 +1,7 @@
+import { projectTimelineRows } from "./timeline-projection.js";
+import type { PluginLifecycle } from "../plugins/lifecycle/index.js";
+import { describeHookAgent, publishAgentStream } from "../plugins/lifecycle/index.js";
+import type { PluginSessionOpenRequest } from "@getpaseo/plugin/server";
 import { randomUUID } from "node:crypto";
 import { basename, resolve } from "node:path";
 import { stat } from "node:fs/promises";
@@ -13,7 +17,8 @@ import {
   PARENT_AGENT_ID_LABEL,
 } from "@getpaseo/protocol/agent-labels";
 import type { Logger } from "pino";
-import type { ProviderOptions, ToolPolicy } from "@getpaseo/protocol/agent-types";
+import type { ToolPolicy } from "@getpaseo/protocol/agent-types";
+import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
 import { z } from "zod";
 import type { TerminalManager } from "../../terminal/terminal-manager.js";
 
@@ -22,6 +27,7 @@ import {
   type AgentCapabilityFlags,
   type AgentClient,
   type AgentCreateSessionOptions,
+  type AgentResumePurpose,
   type AgentResumeSessionOptions,
   type AgentFeature,
   type AgentLaunchContext,
@@ -49,6 +55,7 @@ import {
   type ListImportableSessionsOptions,
 } from "./agent-sdk-types.js";
 import { buildArchivedAgentRecord, type ArchivedStoredAgentRecord } from "./agent-archive.js";
+import { toStoredAgentRecord } from "./agent-projections.js";
 import type { StoredAgentRecord, AgentStorage } from "./agent-storage.js";
 import type { AgentOwner } from "./agent-owner.js";
 import {
@@ -72,20 +79,23 @@ import {
   type PendingForegroundRun,
 } from "./agent-run-state.js";
 import { invokeRewindCapability, type RewindMode } from "./rewind/rewind.js";
-import { isSystemInjectedEnvelope } from "./agent-prompt.js";
+import { projectAgentMessage } from "./agent-messages/index.js";
+import { isStaleProviderSessionError } from "./stale-provider-session-error.js";
 import { stripInternalPaseoMcpServer, withRuntimePaseoMcpServer } from "./runtime-mcp-config.js";
 import { resolveCreateAgentTitles } from "./create-agent-title.js";
 import type { PaseoToolCatalogFactory } from "./tools/types.js";
+import { isPaseoToolPolicyEnabled } from "./paseo-tool-policy.js";
 import {
   ProviderSubagentStore,
   type ProviderSubagentDescriptor,
   type ProviderSubagentStoreEvent,
 } from "./provider-subagents/store.js";
 import { withTimeout } from "../../utils/promise-timeout.js";
+import { extractAttention } from "../persistence-hooks.js";
 
 const RELOAD_SESSION_CLOSE_TIMEOUT_MS = 3_000;
 const INTERRUPT_SESSION_TIMEOUT_MS = 2_000;
-const IMPORTABLE_SESSION_LIST_TIMEOUT_MS = 8_000;
+const IMPORTABLE_SESSION_LIST_TIMEOUT_MS = 90_000;
 const STORED_AGENT_CAPABILITIES: AgentCapabilityFlags = {
   supportsStreaming: false,
   supportsSessionPersistence: true,
@@ -131,14 +141,39 @@ export type AgentRunCancellationResult =
   | { status: "settled" }
   | { status: "refused" };
 
+/** A session that will run in a directory needs that directory to be there. */
+async function assertUsableWorkingDirectory(cwd: string): Promise<void> {
+  try {
+    const stats = await stat(cwd);
+    if (!stats.isDirectory()) {
+      throw new Error(`Working directory is not a directory: ${cwd}`);
+    }
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      "code" in error &&
+      (error as NodeJS.ErrnoException).code === "ENOENT"
+    ) {
+      throw new Error(`Working directory does not exist: ${cwd}`, { cause: error });
+    }
+    if (error instanceof Error) {
+      throw error;
+    }
+    throw new Error(`Failed to access working directory: ${cwd}`, { cause: error });
+  }
+}
+
 interface PreparedSessionConfig {
   storedConfig: AgentSessionConfig;
   launchConfig: AgentSessionConfig;
+  paseoToolPolicy: ProviderPaseoToolsPolicy | undefined;
 }
 
 interface NormalizeConfigOptions {
   resolveDefaultModel?: boolean;
   env?: Record<string, string>;
+  /** Defaults to interactive. A history load reads persisted state and runs nothing. */
+  purpose?: AgentResumePurpose;
 }
 
 interface TimeoutOptions {
@@ -156,10 +191,13 @@ function buildStoredAgentConfig(record: StoredAgentRecord): AgentSessionConfig {
     provider: record.provider,
     cwd: record.cwd,
   };
+  // lastModeId is the last live mode — it also covers provider-side switches
+  // that never reach record.config.modeId.
+  const modeId = record.lastModeId ?? record.config?.modeId;
+  if (modeId != null) config.modeId = modeId;
   if (!record.config) {
     return config;
   }
-  if (record.config.modeId != null) config.modeId = record.config.modeId;
   if (record.config.model != null) config.model = record.config.model;
   if (record.config.thinkingOptionId != null) {
     config.thinkingOptionId = record.config.thinkingOptionId;
@@ -206,6 +244,8 @@ export type AgentSubscriber = (event: AgentManagerEvent) => void;
 export interface SubscribeOptions {
   agentId?: string;
   replayState?: boolean;
+  /** Receive events for internal agents too. Off by default for global subscribers. */
+  includeInternal?: boolean;
 }
 
 interface HydrateTimelineOptions {
@@ -258,11 +298,6 @@ interface AgentManagerRescueTimeouts {
 interface ProviderEnabledFlag {
   enabled: boolean;
   derivedFromProviderId?: string | null;
-  validateOptions?: (options: ProviderOptions | undefined) => ProviderOptions | undefined;
-  applyOptions?: (
-    config: AgentSessionConfig,
-    options: ProviderOptions | undefined,
-  ) => AgentSessionConfig;
   applyToolPolicy?: (
     config: AgentSessionConfig,
     toolPolicy: ToolPolicy | undefined,
@@ -283,6 +318,8 @@ export interface CreateAgentOptions {
 }
 
 export interface AgentManagerOptions {
+  pluginLifecycle?: PluginLifecycle;
+  /** An internal workspace makes every agent created inside it internal. */
   clients?: ProviderClientMap;
   providerDefinitions?: ProviderEnabledMap;
   idFactory?: () => string;
@@ -295,6 +332,7 @@ export interface AgentManagerOptions {
   mcpAuthToken?: string;
   paseoToolsEnabled?: boolean;
   paseoToolCatalogFactory?: PaseoToolCatalogFactory;
+  resolvePaseoToolPolicy?: (provider: AgentProvider) => ProviderPaseoToolsPolicy | undefined;
   appendSystemPrompt?: string;
   agentStreamCoalesceWindowMs?: number;
   rescueTimeouts?: AgentManagerRescueTimeouts;
@@ -330,7 +368,7 @@ export interface WaitForAgentStartOptions {
   signal?: AbortSignal;
 }
 
-type AttentionState =
+export type AttentionState =
   | { requiresAttention: false }
   | {
       requiresAttention: true;
@@ -532,6 +570,7 @@ function attachPersistenceCwd(
 interface SubscriptionRecord {
   callback: AgentSubscriber;
   agentId: string | null;
+  includeInternal: boolean;
 }
 
 interface SteerEventBarrier {
@@ -616,13 +655,12 @@ function buildExplicitTimelineSeedForRegister(
 function buildImportedTimelineRows(entries: readonly ImportedTimelineEntry[]): AgentTimelineRow[] {
   const rows: AgentTimelineRow[] = [];
   for (const entry of entries) {
-    if (entry.item.type === "user_message" && isSystemInjectedEnvelope(entry.item.text)) {
-      continue;
-    }
+    const item = projectAgentMessage(entry.item);
+    if (!item) continue;
     rows.push({
       seq: rows.length + 1,
       timestamp: entry.timestamp ?? new Date().toISOString(),
-      item: limitAgentTimelineItemContent(entry.item),
+      item: limitAgentTimelineItemContent(item),
     });
   }
   return rows;
@@ -658,7 +696,7 @@ function getFirstUserMessageTextFromRows(rows: readonly AgentTimelineRow[]): str
 }
 
 function shouldDetachFromArchivedParent(
-  parent: StoredAgentRecord,
+  parent: Pick<StoredAgentRecord, "workspaceId">,
   child: StoredAgentRecord,
 ): boolean {
   const isCrossWorkspace =
@@ -678,7 +716,25 @@ function detachedAgentLabelPatch(labels: Record<string, string>): AgentLabelPatc
   return patch;
 }
 
+/**
+ * How long an archived internal agent stays readable by id. Storage plays this
+ * role for public agents; internal agents never reach it, and a one-shot helper
+ * can finish and auto-archive before its creator's `waitForFinish` arrives.
+ */
+const RETIRED_INTERNAL_AGENT_TTL_MS = 10 * 60 * 1000;
+const RETIRED_INTERNAL_AGENT_LIMIT = 500;
+
+export interface RetiredInternalAgent {
+  record: ArchivedStoredAgentRecord;
+  lastMessage: string | null;
+}
+
 export class AgentManager {
+  private readonly pluginLifecycle: PluginLifecycle | undefined;
+  private readonly retiredInternalAgents = new Map<
+    string,
+    RetiredInternalAgent & { expiresAt: number }
+  >();
   private readonly clients = new Map<AgentProvider, AgentClient>();
   private readonly providerEnabled = new Map<AgentProvider, boolean>();
   private readonly providerDefinitions = new Map<AgentProvider, ProviderEnabledFlag>();
@@ -698,12 +754,17 @@ export class AgentManager {
   private readonly backgroundTasks = new Set<Promise<void>>();
   private readonly agentRegistrationTasks = new Set<Promise<void>>();
   private readonly inFlightAgentCloses = new Map<string, Promise<void>>();
+  private readonly reloadedSessionCloses = new WeakMap<AgentSession, Promise<void>>();
   private readonly lifecycleMutationTails = new Map<string, Promise<void>>();
   private readonly agentStreamCoalescer: AgentStreamCoalescer;
   private mcpBaseUrl: string | null;
   private readonly mcpAuthToken: string | null;
   private paseoToolsEnabled = true;
   private paseoToolCatalogFactory: PaseoToolCatalogFactory | null = null;
+  private readonly paseoToolPolicies = new Map<string, ProviderPaseoToolsPolicy | undefined>();
+  private readonly resolvePaseoToolPolicy: (
+    provider: AgentProvider,
+  ) => ProviderPaseoToolsPolicy | undefined;
   private appendSystemPrompt: string;
   private onAgentAttention?: AgentAttentionCallback;
   private onAgentArchived?: AgentArchivedCallback;
@@ -714,6 +775,7 @@ export class AgentManager {
   private acceptingAgentRegistrations = true;
 
   constructor(options: AgentManagerOptions) {
+    this.pluginLifecycle = options.pluginLifecycle;
     this.idFactory = options?.idFactory ?? (() => randomUUID());
     this.registry = options?.registry;
     this.durableTimelineStore = options?.durableTimelineStore;
@@ -722,6 +784,7 @@ export class AgentManager {
     this.mcpBaseUrl = options?.mcpBaseUrl ?? null;
     this.mcpAuthToken = options?.mcpAuthToken ?? null;
     this.configurePaseoTools(options);
+    this.resolvePaseoToolPolicy = options.resolvePaseoToolPolicy ?? (() => undefined);
     this.appendSystemPrompt = options.appendSystemPrompt ?? "";
     this.logger = options.logger.child({ module: "agent", component: "agent-manager" });
     this.rescueTimeouts = {
@@ -757,6 +820,7 @@ export class AgentManager {
   updateProviderRegistry(input: {
     providerDefinitions: ProviderEnabledMap;
     clients: ProviderClientMap;
+    retiredProviders?: readonly AgentProvider[];
   }): void {
     this.providerEnabled.clear();
     this.providerDefinitions.clear();
@@ -773,6 +837,18 @@ export class AgentManager {
         this.clients.set(provider, client);
       }
     }
+
+    for (const provider of input.retiredProviders ?? []) {
+      for (const agent of this.agents.values()) {
+        if (agent.provider !== provider) continue;
+        void this.closeAgent(agent.id).catch((error) => {
+          this.logger.warn(
+            { err: error, agentId: agent.id, provider },
+            "Failed to close agent after provider retirement",
+          );
+        });
+      }
+    }
   }
 
   getRegisteredProviderIds(): AgentProvider[] {
@@ -803,6 +879,10 @@ export class AgentManager {
     this.paseoToolCatalogFactory = factory;
   }
 
+  getPaseoToolPolicy(agentId: string): ProviderPaseoToolsPolicy | undefined {
+    return this.paseoToolPolicies.get(agentId);
+  }
+
   /**
    * Capability token the daemon's own MCP clients must present to the Agent MCP
    * endpoint when a daemon password is configured. Read by the per-client
@@ -888,6 +968,7 @@ export class AgentManager {
     const record: SubscriptionRecord = {
       callback,
       agentId: targetAgentId,
+      includeInternal: options?.includeInternal === true,
     };
     this.subscribers.add(record);
 
@@ -901,9 +982,9 @@ export class AgentManager {
           });
         }
       } else {
-        // For global subscribers, skip internal agents during replay
+        // Global subscribers skip internal agents unless they opted in.
         for (const agent of this.agents.values()) {
-          if (agent.internal) {
+          if (agent.internal && !record.includeInternal) {
             continue;
           }
           callback({
@@ -923,12 +1004,26 @@ export class AgentManager {
     return this.subscribers.size;
   }
 
-  listAgents(): ManagedAgent[] {
+  listAgents(options?: { includeInternal?: boolean }): ManagedAgent[] {
     return Array.from(this.agents.values())
-      .filter((agent) => !agent.internal)
+      .filter((agent) => options?.includeInternal === true || !agent.internal)
       .map((agent) => Object.assign({}, agent));
   }
 
+  /** Archived internal agents still readable by id; see getRetiredInternalAgent. */
+  listRetiredInternalAgents(): RetiredInternalAgent[] {
+    const now = Date.now();
+    const retired: RetiredInternalAgent[] = [];
+    for (const [agentId, entry] of this.retiredInternalAgents) {
+      if (entry.expiresAt <= now) {
+        this.retiredInternalAgents.delete(agentId);
+        continue;
+      }
+      retired.push({ record: entry.record, lastMessage: entry.lastMessage });
+    }
+    return retired;
+  }
+
   async listImportableSessions(
     options?: ImportablePersistedAgentQueryOptions,
   ): Promise<ManagedImportableSessionsResult> {
@@ -1099,12 +1194,19 @@ export class AgentManager {
     }
   }
 
+  usageSession(id: string) {
+    const agent = this.agents.get(id);
+    return agent?.session?.usageSession?.() ?? null;
+  }
+
   getAgent(id: string): ManagedAgent | null {
     const agent = this.agents.get(id);
     return agent ? { ...agent } : null;
   }
 
   async waitForAgentClose(agentId: string): Promise<void> {
+    // Loading during reload must wait for the replacement, not resume another writer.
+    await this.lifecycleMutationTails.get(agentId);
     await this.inFlightAgentCloses?.get(agentId)?.catch(() => undefined);
   }
 
@@ -1116,7 +1218,10 @@ export class AgentManager {
   async getTimelineRows(id: string): Promise<AgentTimelineRow[]> {
     this.requireAgent(id);
     if (this.durableTimelineStore) {
-      return await this.durableTimelineStore.getCommittedRows(id);
+      return projectTimelineRows({
+        rows: await this.durableTimelineStore.getCommittedRows(id),
+        mode: "projected",
+      }).map((entry) => Object.assign({ seq: entry.seqEnd }, entry));
     }
     return this.timelineStore.getRows(id);
   }
@@ -1174,33 +1279,50 @@ export class AgentManager {
   ): Promise<ManagedAgent> {
     this.assertAcceptingAgentRegistrations();
     const resolvedAgentId = validateAgentId(agentId ?? this.idFactory(), "createAgent");
+    if (this.pluginLifecycle && !config.internal) {
+      const request = await this.pluginLifecycle.before("agent.create", {
+        config,
+        env: options.env,
+      });
+      config = { ...request.config, internal: config.internal };
+      options = { ...options, env: request.env };
+    }
     await this.deleteAgentState(resolvedAgentId);
-    const { storedConfig, launchConfig } = await this.prepareSessionConfig(
+    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
       config,
       resolvedAgentId,
-      options?.env,
+      { env: options?.env },
     );
     this.requireEnabledProvider(storedConfig.provider);
     const client = await this.requireAvailableClient({
       provider: storedConfig.provider,
     });
+    this.paseoToolPolicies.set(resolvedAgentId, paseoToolPolicy);
     const launchContext = await this.buildLaunchContext(
       resolvedAgentId,
       client,
       storedConfig.cwd,
+      paseoToolPolicy,
       options?.env,
+      { reason: "create", purpose: "interactive", workspaceId: options.workspaceId ?? null },
     );
     const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
     const createOptions = this.buildCreateSessionOptions(options);
     const session = await client.createSession(providerLaunchConfig, launchContext, createOptions);
     await this.requireExternalMcpSupport(session, storedConfig);
-    return this.registerSession(session, storedConfig, resolvedAgentId, {
+    const agent = await this.registerSession(session, storedConfig, resolvedAgentId, {
       labels: options.labels,
       initialTitle: options.initialTitle,
       workspaceId: options.workspaceId,
       owner: options.owner,
       historyPrimed: true,
     });
+    if (!agent.internal) {
+      this.pluginLifecycle?.emit("agent.created", {
+        agent: describeHookAgent({ ...agent, title: agent.config.title }),
+      });
+    }
+    return agent;
   }
 
   private buildCreateSessionOptions(options?: {
@@ -1224,11 +1346,24 @@ export class AgentManager {
       labels?: Record<string, string>;
       workspaceId?: string;
       owner?: AgentOwner;
+      attention?: AttentionState;
     },
     resumeOptions?: AgentResumeSessionOptions,
   ): Promise<ManagedAgent> {
+    const resolvedAgentId = validateAgentId(
+      agentId ?? this.idFactory(),
+      "resumeAgentFromPersistence",
+    );
     return this.trackAgentRegistrationOperation(
-      this.resumeAgentFromPersistenceInternal(handle, overrides, agentId, options, resumeOptions),
+      this.runLifecycleMutation(resolvedAgentId, () =>
+        this.resumeAgentFromPersistenceInternal(
+          handle,
+          overrides,
+          resolvedAgentId,
+          options,
+          resumeOptions,
+        ),
+      ),
     );
   }
 
@@ -1243,6 +1378,7 @@ export class AgentManager {
       labels?: Record<string, string>;
       workspaceId?: string;
       owner?: AgentOwner;
+      attention?: AttentionState;
     },
     resumeOptions?: AgentResumeSessionOptions,
   ): Promise<ManagedAgent> {
@@ -1257,11 +1393,21 @@ export class AgentManager {
       ...overrides,
       provider: handle.provider,
     } as AgentSessionConfig;
-    const { storedConfig, launchConfig } = await this.prepareSessionConfig(
+    // Decide residency from durable state inside the lifecycle lane. A loader may
+    // have read the record before a queued archive or restore completed. Residency is
+    // settled before the config is prepared, because a history load reads an archived
+    // agent whose working directory may be gone.
+    const record = this.registry ? await this.registry.get(resolvedAgentId) : null;
+    const currentResumeOptions = record
+      ? { purpose: record.archivedAt ? ("history" as const) : ("interactive" as const) }
+      : resumeOptions;
+    const purpose = currentResumeOptions?.purpose ?? "interactive";
+
+    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
       mergedConfig,
       resolvedAgentId,
+      { purpose },
     );
-
     const client = this.requireClient(handle.provider);
     const available = await client.isAvailable();
     if (!available) {
@@ -1269,18 +1415,31 @@ export class AgentManager {
         `Provider '${handle.provider}' is not available. Please ensure the CLI is installed.`,
       );
     }
-    const launchContext = await this.buildLaunchContext(resolvedAgentId, client, storedConfig.cwd);
+    this.paseoToolPolicies.set(resolvedAgentId, paseoToolPolicy);
+    const launchContext = await this.buildLaunchContext(
+      resolvedAgentId,
+      client,
+      storedConfig.cwd,
+      paseoToolPolicy,
+      undefined,
+      {
+        reason: "resume",
+        purpose,
+        workspaceId: options?.workspaceId ?? null,
+      },
+    );
     const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
     const session = await client.resumeSession(
       handle,
       providerLaunchConfig,
       launchContext,
-      resumeOptions,
+      currentResumeOptions,
     );
     await this.requireExternalMcpSupport(session, storedConfig);
     return this.registerSession(session, storedConfig, resolvedAgentId, {
       ...options,
       persistence: handle,
+      restoring: true,
     });
   }
 
@@ -1310,14 +1469,22 @@ export class AgentManager {
       throw new Error(`Provider '${input.provider}' does not support importing sessions`);
     }
 
-    const { storedConfig, launchConfig } = await this.prepareSessionConfig(
+    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
       {
         provider: input.provider,
         cwd: input.cwd,
       },
       resolvedAgentId,
     );
-    const launchContext = await this.buildLaunchContext(resolvedAgentId, client, storedConfig.cwd);
+    this.paseoToolPolicies.set(resolvedAgentId, paseoToolPolicy);
+    const launchContext = await this.buildLaunchContext(
+      resolvedAgentId,
+      client,
+      storedConfig.cwd,
+      paseoToolPolicy,
+      undefined,
+      { reason: "import", purpose: "interactive", workspaceId: input.workspaceId },
+    );
     const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
     const imported = await client.importSession(
       {
@@ -1369,7 +1536,9 @@ export class AgentManager {
     options?: { rehydrateFromDisk?: boolean },
   ): Promise<ManagedAgent> {
     return this.trackAgentRegistrationOperation(
-      this.reloadAgentSessionInternal(agentId, overrides, options),
+      this.runLifecycleMutation(agentId, () =>
+        this.reloadAgentSessionInternal(agentId, overrides, options),
+      ),
     );
   }
 
@@ -1397,26 +1566,46 @@ export class AgentManager {
       ...overrides,
       provider,
     } as AgentSessionConfig;
-    const { storedConfig, launchConfig } = await this.prepareSessionConfig(refreshConfig, agentId);
-    const launchContext = await this.buildLaunchContext(agentId, client, storedConfig.cwd);
+    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
+      refreshConfig,
+      agentId,
+    );
+    const hadPreviousPaseoToolPolicy = this.paseoToolPolicies.has(agentId);
+    const previousPaseoToolPolicy = this.paseoToolPolicies.get(agentId);
+    const launchContext = await this.buildLaunchContext(
+      agentId,
+      client,
+      storedConfig.cwd,
+      paseoToolPolicy,
+      undefined,
+      { reason: "refresh", purpose: "interactive", workspaceId: existing.workspaceId },
+    );
     const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
+    if (
+      Object.keys(storedConfig.mcpServers ?? {}).length > 0 &&
+      existing.session.capabilities.supportsMcpServers !== true
+    ) {
+      throw new Error(`Provider '${provider}' does not support MCP servers`);
+    }
 
-    const session = handle
-      ? await client.resumeSession(handle, providerLaunchConfig, launchContext)
-      : await client.createSession(providerLaunchConfig, launchContext);
-    await this.requireExternalMcpSupport(session, storedConfig);
-
+    let session: AgentSession | undefined;
+    let closedExisting: ManagedAgentClosed | undefined;
     let handedToRegistration = false;
     try {
+      // A persisted thread can have only one writer, even when its turn is idle.
+      await this.closeReloadedSession(existing.session, agentId);
+      await this.drainSessionEvents(agentId);
+      this.cancelRunningProviderSubagents(agentId);
+      closedExisting = this.prepareAgentForClosure(existing, "agent reloaded");
+      await this.persistSnapshot(closedExisting);
       this.assertAcceptingAgentRegistrations();
 
-      this.cancelRunningProviderSubagents(agentId);
-      const closedExisting = this.prepareAgentForClosure(existing, "agent reloaded");
-      try {
-        await this.persistSnapshot(closedExisting);
-      } finally {
-        await this.closeReloadedSession(existing.session, agentId);
-      }
+      this.paseoToolPolicies.set(agentId, paseoToolPolicy);
+      session = handle
+        ? await client.resumeSession(handle, providerLaunchConfig, launchContext)
+        : await client.createSession(providerLaunchConfig, launchContext);
+      await this.requireExternalMcpSupport(session, storedConfig);
+      this.assertAcceptingAgentRegistrations();
 
       if (rehydrateFromDisk) {
         // Wipe the in-memory timeline so registerSession mints a new epoch and
@@ -1440,35 +1629,51 @@ export class AgentManager {
         lastUsage: preservedLastUsage,
         lastError: preservedLastError,
         attention: preservedAttention,
+        restoring: true,
       });
+    } catch (error) {
+      if (closedExisting) {
+        this.emitClosedAgent(closedExisting, { persist: false });
+      } else if (this.agents.get(agentId) === existing) {
+        existing.lifecycle = "error";
+        existing.lastError = error instanceof Error ? error.message : String(error);
+        this.emitState(existing);
+      }
+      throw error;
     } finally {
       if (!handedToRegistration) {
-        await this.closeUnregisteredSession(session);
+        if (hadPreviousPaseoToolPolicy) {
+          this.paseoToolPolicies.set(agentId, previousPaseoToolPolicy);
+        } else {
+          this.paseoToolPolicies.delete(agentId);
+        }
+        if (session) {
+          await this.closeUnregisteredSession(session);
+        }
       }
     }
   }
 
   private async closeReloadedSession(session: AgentSession, agentId: string): Promise<void> {
-    try {
-      const result = await this.waitWithTimeout({
-        operation: session.close(),
-        timeoutMs: this.rescueTimeouts.reloadSessionCloseMs,
-        onLateError: (error) => {
-          this.logger.warn(
-            { err: error, agentId },
-            "Previous session close failed after refresh timeout",
-          );
-        },
-      });
-
-      if (result === "timed_out") {
+    let operation = this.reloadedSessionCloses.get(session);
+    if (!operation) {
+      operation = session.close();
+      this.reloadedSessionCloses.set(session, operation);
+      // Keep pending closes across request timeouts; a retry must await the same release.
+      void operation.catch(() => this.reloadedSessionCloses.delete(session));
+    }
+    const result = await this.waitWithTimeout({
+      operation,
+      timeoutMs: this.rescueTimeouts.reloadSessionCloseMs,
+      onLateError: (error) => {
         this.logger.warn(
-          { agentId, timeoutMs: this.rescueTimeouts.reloadSessionCloseMs },
-          "Timed out closing previous session during refresh",
+          { err: error, agentId },
+          "Previous session close failed after refresh timeout",
         );
-      }
-    } catch (error) {
-      this.logger.warn({ err: error, agentId }, "Failed to close previous session during refresh");
+      },
+    });
+    if (result === "timed_out") {
+      throw new Error("Timed out closing previous session during refresh");
     }
   }
 
@@ -1502,13 +1707,52 @@ export class AgentManager {
     }
   }
 
+  /**
+   * The archived snapshot of an internal agent, for a while after archive.
+   * Null once it has expired or was never an internal agent.
+   */
+  getRetiredInternalAgent(agentId: string): RetiredInternalAgent | null {
+    const entry = this.retiredInternalAgents.get(agentId);
+    if (!entry) {
+      return null;
+    }
+    if (entry.expiresAt <= Date.now()) {
+      this.retiredInternalAgents.delete(agentId);
+      return null;
+    }
+    return { record: entry.record, lastMessage: entry.lastMessage };
+  }
+
+  private retireInternalAgent(entry: RetiredInternalAgent): void {
+    const now = Date.now();
+    for (const [agentId, retired] of this.retiredInternalAgents) {
+      if (retired.expiresAt <= now) {
+        this.retiredInternalAgents.delete(agentId);
+      }
+    }
+    while (this.retiredInternalAgents.size >= RETIRED_INTERNAL_AGENT_LIMIT) {
+      const oldest = this.retiredInternalAgents.keys().next().value;
+      if (oldest === undefined) {
+        break;
+      }
+      this.retiredInternalAgents.delete(oldest);
+    }
+    this.retiredInternalAgents.set(entry.record.id, {
+      ...entry,
+      expiresAt: now + RETIRED_INTERNAL_AGENT_TTL_MS,
+    });
+  }
+
   closeAgent(agentId: string): Promise<void> {
     const existing = this.inFlightAgentCloses.get(agentId);
     if (existing) {
       return existing;
     }
 
-    const close = this.closeAgentRuntime(agentId);
+    const close = this.runLifecycleMutation(agentId, async () => {
+      // A preceding reload or archive may already have closed the durable agent.
+      if (this.agents.has(agentId)) await this.closeAgentRuntime(agentId);
+    });
     this.inFlightAgentCloses.set(agentId, close);
     const clearClose = () => {
       if (this.inFlightAgentCloses.get(agentId) === close) {
@@ -1534,14 +1778,11 @@ export class AgentManager {
       "agent.manager.close.start",
     );
     await this.drainSessionEvents(agentId);
+    // Retain ownership until shutdown succeeds. A failed close may still own a
+    // native writer, so publishing a resumable closed snapshot would orphan it.
+    await agent.session.close();
     this.cancelRunningProviderSubagents(agentId);
     const closedAgent = this.prepareAgentForClosure(agent, "agent closed");
-    let closeError: unknown;
-    try {
-      await agent.session.close();
-    } catch (error) {
-      closeError = error;
-    }
 
     let persistError: unknown;
     try {
@@ -1559,9 +1800,6 @@ export class AgentManager {
       "agent.manager.close.complete",
     );
 
-    if (closeError !== undefined) {
-      throw closeError;
-    }
     if (persistError !== undefined) {
       throw persistError;
     }
@@ -1585,8 +1823,28 @@ export class AgentManager {
     return this.runLifecycleMutation(agentId, () => this.archiveAgentUnlocked(agentId));
   }
 
-  private async archiveAgentUnlocked(agentId: string): Promise<{ archivedAt: string }> {
+  private async archiveAgentUnlocked(
+    agentId: string,
+    requestedArchivedAt?: string,
+  ): Promise<{ archivedAt: string }> {
     const agent = this.requireAgent(agentId);
+    if (agent.internal) {
+      // Nothing about an internal agent is on disk, and archiving must not put
+      // it there. Its final snapshot is kept in memory for a while (see
+      // getRetiredInternalAgent); the runtime is closed and the committed
+      // timeline dropped, so `getAgent` returns null from here on.
+      const archivedAt = requestedArchivedAt ?? new Date().toISOString();
+      const lastMessage = await this.getLastAssistantMessage(agentId);
+      const record = buildArchivedAgentRecord(
+        toStoredAgentRecord(agent, { title: agent.config.title ?? null, internal: true }),
+        { archivedAt, updatedAt: archivedAt },
+      );
+      await this.closeAgentRuntime(agentId);
+      await this.deleteAgentState(agentId);
+      this.retireInternalAgent({ record, lastMessage });
+      await this.cascadeArchiveChildren(record);
+      return { archivedAt };
+    }
     if (!this.registry) {
       throw new Error("Agent storage is not configured");
     }
@@ -1599,12 +1857,13 @@ export class AgentManager {
       throw new Error(`Agent ${agentId} not found in storage after snapshot`);
     }
 
-    const { archivedAt } = await this.markRecordArchived(stored);
+    const { archivedAt } = await this.markRecordArchived(stored, requestedArchivedAt);
     agent.updatedAt = new Date(archivedAt);
-    await this.closeAgent(agentId);
+    await this.closeAgentRuntime(agentId);
+    await this.syncNativeArchiveState(stored.provider, stored.persistence, "archive");
     this.discardRetainedAgentState(agentId);
 
-    await this.cascadeArchiveChildren(agentId);
+    await this.cascadeArchiveChildren(stored);
 
     return { archivedAt };
   }
@@ -1613,16 +1872,15 @@ export class AgentManager {
   // label pointing back at the caller. Archiving the parent cascades to those
   // children so subagent fleets don't outlive their orchestrator. Detached
   // handoff agents omit this label, so they stand outside the cascade.
-  private async cascadeArchiveChildren(parentAgentId: string): Promise<void> {
+  private async cascadeArchiveChildren(
+    parent: Pick<StoredAgentRecord, "id" | "workspaceId">,
+  ): Promise<void> {
     const registry = this.registry;
     if (!registry) {
       return;
     }
+    const parentAgentId = parent.id;
     const records = await registry.list();
-    const parent = records.find((record) => record.id === parentAgentId);
-    if (!parent) {
-      throw new Error(`Archived parent ${parentAgentId} not found in storage`);
-    }
     for (const record of records) {
       if (record.archivedAt) {
         continue;
@@ -1648,25 +1906,40 @@ export class AgentManager {
         } else if (this.agents.has(currentChild.id)) {
           await this.archiveAgentUnlocked(currentChild.id);
         } else {
-          await this.archiveSnapshot(currentChild.id, new Date().toISOString());
+          await this.archiveSnapshotUnlocked(currentChild.id, new Date().toISOString());
         }
       });
     }
+    // Internal children never reach storage, so the scan above cannot see them.
+    // They have no tab to keep open and no listing to detach into, so they
+    // always archive with the parent.
+    for (const child of Array.from(this.agents.values())) {
+      if (!child.internal || getParentAgentIdFromLabels(child.labels) !== parentAgentId) {
+        continue;
+      }
+      await this.runLifecycleMutation(child.id, async () => {
+        const current = this.agents.get(child.id);
+        if (!current || getParentAgentIdFromLabels(current.labels) !== parentAgentId) {
+          return;
+        }
+        await this.archiveAgentUnlocked(current.id);
+      });
+    }
   }
 
-  private async markRecordArchived(record: StoredAgentRecord): Promise<ArchivedStoredAgentRecord> {
-    const registry = this.requireRegistry();
-    const archivedAt = new Date().toISOString();
-    const archivedRecord = buildArchivedAgentRecord(record, { archivedAt, updatedAt: archivedAt });
-
-    await registry.upsert(archivedRecord);
-
-    await this.syncNativeArchiveState(record.provider, record.persistence, "archive");
+  private async markRecordArchived(
+    record: StoredAgentRecord,
+    archivedAt = new Date().toISOString(),
+  ): Promise<ArchivedStoredAgentRecord> {
+    const archivedRecord = await this.persistArchivedRecord(record, {
+      archivedAt,
+      updatedAt: archivedAt,
+    });
 
     if (this.agents.has(record.id)) {
       this.notifyAgentState(record.id);
     } else if (!archivedRecord.internal) {
-      this.dispatchArchivedStoredAgent(archivedRecord);
+      this.dispatchStoredAgentState(archivedRecord);
     }
 
     await this.fireAgentArchived(record.id);
@@ -1674,6 +1947,21 @@ export class AgentManager {
     return archivedRecord;
   }
 
+  private async persistArchivedRecord(
+    record: StoredAgentRecord,
+    options: { archivedAt: string; updatedAt?: string },
+  ): Promise<ArchivedStoredAgentRecord> {
+    const archivedRecord = buildArchivedAgentRecord(record, options);
+    await this.requireRegistry().upsert(archivedRecord);
+    if (!record.archivedAt && !record.internal) {
+      this.pluginLifecycle?.emit("agent.archived", {
+        agent: describeHookAgent(archivedRecord),
+        archivedAt: archivedRecord.archivedAt,
+      });
+    }
+    return archivedRecord;
+  }
+
   private async fireAgentArchived(agentId: string): Promise<void> {
     const callback = this.onAgentArchived;
     if (!callback) {
@@ -1686,8 +1974,9 @@ export class AgentManager {
     }
   }
 
-  private dispatchArchivedStoredAgent(record: StoredAgentRecord): void {
+  private dispatchStoredAgentState(record: StoredAgentRecord): void {
     const updatedAt = new Date(record.updatedAt);
+    const attention = extractAttention(record);
     this.dispatch({
       type: "agent_state",
       agent: {
@@ -1721,7 +2010,7 @@ export class AgentManager {
         lastUserMessageAt: record.lastUserMessageAt ? new Date(record.lastUserMessageAt) : null,
         lastUsage: undefined,
         lastError: record.lastError ?? undefined,
-        attention: { requiresAttention: false },
+        attention,
         internal: record.internal,
         labels: record.labels,
       },
@@ -1758,6 +2047,7 @@ export class AgentManager {
     if (agent.runtimeInfo) {
       agent.runtimeInfo = { ...agent.runtimeInfo, model: normalizedModelId };
     }
+    this.refreshSessionPersistence(agent);
     this.touchUpdatedAt(agent);
     this.emitState(agent);
   }
@@ -1778,11 +2068,17 @@ export class AgentManager {
     }
     await this.drainSessionEvents(agentId);
 
-    agent.config.thinkingOptionId = normalizedThinkingOptionId ?? undefined;
+    let effectiveThinkingOptionId = normalizedThinkingOptionId;
+    const runtimeInfo = await agent.session.getRuntimeInfo();
+    if (runtimeInfo.thinkingOptionId !== undefined) {
+      effectiveThinkingOptionId = runtimeInfo.thinkingOptionId;
+    }
+
+    agent.config.thinkingOptionId = effectiveThinkingOptionId ?? undefined;
     if (agent.runtimeInfo) {
       agent.runtimeInfo = {
         ...agent.runtimeInfo,
-        thinkingOptionId: normalizedThinkingOptionId,
+        thinkingOptionId: effectiveThinkingOptionId,
       };
     }
     this.touchUpdatedAt(agent);
@@ -1931,13 +2227,64 @@ export class AgentManager {
     }
   }
 
-  async archiveSnapshot(agentId: string, archivedAt: string): Promise<StoredAgentRecord> {
-    const registry = this.requireRegistry();
-    const liveAgent = this.getAgent(agentId);
+  async markAgentUnread(agentId: string): Promise<void> {
+    const liveAgent = this.agents.get(agentId);
     if (liveAgent) {
-      await this.persistSnapshot(liveAgent, {
-        internal: liveAgent.internal,
-      });
+      const isFinished = liveAgent.lifecycle === "idle";
+      const hasPendingPermissions = liveAgent.pendingPermissions.size > 0;
+      const canMarkUnread =
+        isFinished && !liveAgent.attention.requiresAttention && !hasPendingPermissions;
+      if (!canMarkUnread) {
+        throw new Error(`Agent is no longer finished and read: ${agentId}`);
+      }
+      liveAgent.attention = {
+        requiresAttention: true,
+        attentionReason: "finished",
+        attentionTimestamp: new Date(),
+      };
+      await this.persistSnapshot(liveAgent);
+      this.emitState(liveAgent, { persist: false });
+      return;
+    }
+
+    const registry = this.requireRegistry();
+    const record = await registry.get(agentId);
+    const hasFinishedStatus = record?.lastStatus === "idle" || record?.lastStatus === "closed";
+    const canMarkUnread =
+      record && !record.internal && !record.archivedAt && !record.requiresAttention;
+    if (!canMarkUnread || !hasFinishedStatus) {
+      throw new Error(`Agent is no longer finished and read: ${agentId}`);
+    }
+    const updatedAt = this.nextStoredUpdatedAt(record);
+    const nextRecord: StoredAgentRecord = {
+      ...record,
+      updatedAt,
+      requiresAttention: true,
+      attentionReason: "finished",
+      attentionTimestamp: updatedAt,
+    };
+    await registry.upsert(nextRecord);
+    this.dispatchStoredAgentState(nextRecord);
+  }
+
+  async archiveSnapshot(agentId: string, archivedAt: string): Promise<StoredAgentRecord> {
+    return this.runLifecycleMutation(agentId, () =>
+      this.archiveSnapshotUnlocked(agentId, archivedAt),
+    );
+  }
+
+  private async archiveSnapshotUnlocked(
+    agentId: string,
+    archivedAt: string,
+  ): Promise<StoredAgentRecord> {
+    const registry = this.requireRegistry();
+    // A stored-only archive can have waited behind a persisted resume. Reuse the
+    // live archive transition so its newly acquired runtime is closed as well.
+    if (this.agents.has(agentId)) {
+      await this.archiveAgentUnlocked(agentId, archivedAt);
+      const archivedRecord = await registry.get(agentId);
+      if (!archivedRecord) throw new Error(`Agent not found: ${agentId}`);
+      return archivedRecord;
     }
 
     const record = await registry.get(agentId);
@@ -1945,22 +2292,15 @@ export class AgentManager {
       throw new Error(`Agent not found: ${agentId}`);
     }
 
-    const nextRecord = buildArchivedAgentRecord(record, { archivedAt });
-    await registry.upsert(nextRecord);
+    const nextRecord = await this.persistArchivedRecord(record, { archivedAt });
 
     await this.syncNativeArchiveState(record.provider, record.persistence, "archive");
 
-    if (this.agents.has(agentId)) {
-      this.notifyAgentState(agentId);
-    } else {
-      this.discardRetainedAgentState(agentId);
-      if (!nextRecord.internal) {
-        this.dispatchArchivedStoredAgent(nextRecord);
-      }
-    }
+    this.discardRetainedAgentState(agentId);
+    if (!nextRecord.internal) this.dispatchStoredAgentState(nextRecord);
 
     await this.fireAgentArchived(agentId);
-    await this.cascadeArchiveChildren(agentId);
+    await this.cascadeArchiveChildren(record);
 
     return nextRecord;
   }
@@ -1968,6 +2308,15 @@ export class AgentManager {
   async unarchiveSnapshot(
     agentId: string,
     updates?: { workspaceId?: string; labels?: AgentLabelPatch },
+  ): Promise<boolean> {
+    return this.runLifecycleMutation(agentId, () =>
+      this.unarchiveSnapshotUnlocked(agentId, updates),
+    );
+  }
+
+  private async unarchiveSnapshotUnlocked(
+    agentId: string,
+    updates?: { workspaceId?: string; labels?: AgentLabelPatch },
   ): Promise<boolean> {
     const registry = this.requireRegistry();
     const record = await registry.get(agentId);
@@ -1975,6 +2324,9 @@ export class AgentManager {
       return false;
     }
 
+    // Close and native restore share the lifecycle lane with persisted resume.
+    // No new history or interactive runtime can acquire the writer between them.
+    if (this.agents.has(agentId)) await this.closeAgentRuntime(agentId);
     await this.syncNativeArchiveState(record.provider, record.persistence, "restore");
 
     await registry.upsert({
@@ -2110,7 +2462,7 @@ export class AgentManager {
       return false;
     }
     if (options?.clientMessageId) {
-      this.recordSubmittedPrompt(agent, prompt, options.clientMessageId);
+      this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "accepted");
       this.emitState(agent);
     }
     const dispatch = (event: AgentStreamEvent): void => {
@@ -2196,9 +2548,22 @@ export class AgentManager {
       if (pendingRun.settled) {
         throw error;
       }
+      if (isStaleProviderSessionError(error)) {
+        pendingRun.start = { status: "failed", error: error.message };
+        agent.pendingReplacement = false;
+        if (!agent.activeForegroundTurnId) agent.lifecycle = "idle";
+        this.runs.settleForegroundRun(agentId, pendingRun.token);
+        throw error;
+      }
       agent.pendingReplacement = false;
       const errorMsg = error instanceof Error ? error.message : "Failed to start turn";
       pendingRun.start = { status: "failed", error: errorMsg };
+      // A terminal rejection belongs after the submitted prompt even though no provider turn exists.
+      if (options?.clientMessageId) {
+        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "rejected", {
+          messageId: options.clientMessageId,
+        });
+      }
       await this.handleStreamEvent(agent, {
         type: "turn_failed",
         provider: agent.provider,
@@ -2288,7 +2653,7 @@ export class AgentManager {
           )
         : undefined;
       if (options?.clientMessageId) {
-        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, {
+        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "accepted", {
           messageId: options.clientMessageId,
           turnId,
           providerMessageId:
@@ -2594,7 +2959,7 @@ export class AgentManager {
     if (!clientMessageId) {
       return;
     }
-    this.recordSubmittedPrompt(agent, prompt, clientMessageId, {
+    this.recordSubmittedPrompt(agent, prompt, clientMessageId, "accepted", {
       messageId: clientMessageId,
       turnId: expectedTurnId,
     });
@@ -2721,6 +3086,9 @@ export class AgentManager {
     response: AgentPermissionResponse,
   ): Promise<AgentPermissionResult | void> {
     const agent = this.requireAgent(agentId);
+    if (agent.inFlightPermissionResponses.has(requestId)) {
+      throw new Error("A response to this permission request is already being submitted");
+    }
     agent.inFlightPermissionResponses.add(requestId);
 
     try {
@@ -2915,8 +3283,11 @@ export class AgentManager {
           epoch: this.timelineStore.getEpoch(agentId),
         });
       }
-      await this.refreshRuntimeInfo(agent);
+      // Rewind stages provider events under the run lock; publish its final state directly.
+      this.refreshSessionPersistence(agent);
+      await this.refreshSessionState(agent, { emit: false });
       await this.persistSnapshot(agent);
+      this.emitState(agent, { persist: false });
       this.logger.info(
         { agentId, provider: agent.provider, messageId, mode },
         "agent.rewind.complete",
@@ -3187,6 +3558,12 @@ export class AgentManager {
       lastUsage?: AgentUsage;
       lastError?: string;
       attention?: AttentionState;
+      /**
+       * Bringing a known agent back, rather than starting a new one. Its timestamps and
+       * attention come from what was already recorded, and installing the session is not
+       * activity in it.
+       */
+      restoring?: boolean;
       initialTitle?: string | null;
       publishWhenReady?: boolean;
       workspaceId?: string;
@@ -3222,11 +3599,31 @@ export class AgentManager {
         options,
       });
 
+      // Read history before publishing the agent: a provider failure must leave the
+      // session unregistered so the registration catch closes it.
+      const startupHistory: AgentStreamEvent[] = [];
+      if (session.initialTimeline?.length && !managed.historyPrimed) {
+        for await (const event of session.streamHistory()) {
+          startupHistory.push(limitAgentStreamEventContent(event));
+        }
+      }
+
       this.assertAcceptingAgentRegistrations();
       this.agents.set(resolvedAgentId, managed);
       registered = true;
       // Initialize previousStatus to track transitions
       this.previousStatuses.set(resolvedAgentId, managed.lifecycle);
+      if (session.initialTimeline?.length) {
+        if (!managed.historyPrimed) {
+          // Legacy/imported chats need their existing history before startup rows.
+          await this.primeTimelineFromLegacyProviderHistory(managed, false, startupHistory);
+        } else {
+          for (const entry of buildImportedTimelineRows(session.initialTimeline)) {
+            this.recordTimeline(managed.id, entry.item, { timestamp: entry.timestamp });
+          }
+        }
+        this.refreshSessionPersistence(managed);
+      }
       await this.refreshRuntimeInfo(managed, { emit: false });
       this.assertAgentRegistrationActive(managed);
       await this.persistSnapshot(managed, {
@@ -3240,7 +3637,12 @@ export class AgentManager {
       await this.refreshSessionState(managed, { emit: false });
       this.assertAgentRegistrationActive(managed);
       managed.lifecycle = "idle";
-      this.touchUpdatedAt(managed);
+      // Stamping now over a restored timestamp rewrote the workspace's "last used" in the
+      // sidebar every time a chat was reopened, because workspace `statusEnteredAt` is
+      // re-derived from persisted agent `updatedAt` on every daemon start.
+      if (!options?.restoring) {
+        this.touchUpdatedAt(managed);
+      }
       await this.persistSnapshot(managed);
       this.assertAgentRegistrationActive(managed);
       this.emitState(managed, { persist: false });
@@ -3435,6 +3837,7 @@ export class AgentManager {
 
   private discardRetainedAgentState(agentId: string): void {
     this.timelineStore.delete(agentId);
+    this.paseoToolPolicies.delete(agentId);
     for (const event of this.providerSubagents.deleteParent(agentId)) {
       this.dispatch({ type: "provider_subagent", event });
     }
@@ -3442,6 +3845,11 @@ export class AgentManager {
 
   private emitClosedAgent(agent: ManagedAgentClosed, options?: { persist?: boolean }): void {
     this.emitState(agent, options);
+    if (!agent.internal) {
+      this.pluginLifecycle?.emit("agent.closed", {
+        agent: describeHookAgent({ ...agent, title: agent.config.title }),
+      });
+    }
   }
   private subscribeToSession(agent: ActiveManagedAgent): void {
     if (agent.unsubscribeSession) {
@@ -3616,6 +4024,19 @@ export class AgentManager {
     return this.registry;
   }
 
+  /**
+   * Provider-side mode switches (ACP current_mode_update, in-session
+   * commands, permission-driven transitions) must land in config.modeId too —
+   * reloadAgentSession and the persisted record derive the resumed session's
+   * mode from it, so leaving it stale silently downgrades the mode on resume.
+   */
+  private applyObservedMode(agent: ActiveManagedAgent, modeId: string | null): void {
+    agent.currentModeId = modeId;
+    if (modeId != null) {
+      agent.config.modeId = modeId;
+    }
+  }
+
   private async refreshSessionState(
     agent: ActiveManagedAgent,
     options?: { emit?: boolean },
@@ -3628,7 +4049,7 @@ export class AgentManager {
     }
 
     try {
-      agent.currentModeId = await agent.session.getCurrentMode();
+      this.applyObservedMode(agent, await agent.session.getCurrentMode());
     } catch {
       agent.currentModeId = null;
     }
@@ -3704,10 +4125,9 @@ export class AgentManager {
     for await (const rawEvent of agent.session.streamHistory()) {
       const event = limitAgentStreamEventContent(rawEvent);
       if (event.type === "timeline") {
-        if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
-          continue;
-        }
-        historyEvents.push(event);
+        const item = projectAgentMessage(event.item);
+        if (!item) continue;
+        historyEvents.push({ ...event, item });
       } else if (event.type === "provider_subagent") {
         providerSubagentEvents.push(event);
       }
@@ -3751,52 +4171,70 @@ export class AgentManager {
   private async primeTimelineFromLegacyProviderHistory(
     agent: ActiveManagedAgent,
     broadcast: boolean | (() => boolean),
+    history:
+      | AsyncIterable<AgentStreamEvent>
+      | Iterable<AgentStreamEvent> = agent.session.streamHistory(),
   ): Promise<void> {
     const deferredBroadcast = typeof broadcast === "function";
-    const timelineEvents: Array<{
-      event: Extract<AgentStreamEvent, { type: "timeline" }>;
-      row: AgentTimelineRow;
-    }> = [];
-    const providerSubagentEvents: AgentManagerEvent[] = [];
+    const historyEvents: Extract<AgentStreamEvent, { type: "timeline" }>[] = [];
+    const historySubagentEvents: Extract<AgentStreamEvent, { type: "provider_subagent" }>[] = [];
     agent.historyPrimed = false;
     try {
-      for await (const rawEvent of agent.session.streamHistory()) {
+      // Collect the whole replay before touching either store. A stream that fails
+      // halfway then leaves the committed timeline as it was, instead of a partial
+      // copy the next attempt would append to.
+      for await (const rawEvent of history) {
         const event = limitAgentStreamEventContent(rawEvent);
         if (event.type === "provider_subagent") {
-          const update = this.providerSubagents.apply(agent.id, event.provider, event.event);
-          const managerEvent: AgentManagerEvent = { type: "provider_subagent", event: update };
-          if (deferredBroadcast) {
-            providerSubagentEvents.push(managerEvent);
-          } else if (broadcast) {
-            this.dispatch(managerEvent);
-          }
+          historySubagentEvents.push(event);
           continue;
         }
         if (event.type !== "timeline") {
           continue;
         }
-        if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
-          continue;
-        }
-        const row = this.recordTimeline(
-          agent.id,
-          event.item,
-          event.timestamp ? { timestamp: event.timestamp } : undefined,
-        );
-        if (deferredBroadcast) {
-          timelineEvents.push({ event, row });
-        } else if (broadcast) {
-          this.dispatchStream(agent.id, event, {
-            seq: row.seq,
-            epoch: this.timelineStore.getEpoch(agent.id),
-            timestamp: row.timestamp,
-          });
-        }
+        const item = projectAgentMessage(event.item);
+        if (!item) continue;
+        historyEvents.push({ ...event, item });
       }
     } catch (error) {
       this.logger.warn({ err: error, agentId: agent.id }, "Failed to hydrate provider history");
       throw error;
     }
+
+    // The replay is the timeline, so drop the rows a previous hydration committed.
+    // Keeping them would leave getTimelineRows reading one copy per hydration.
+    await this.deleteCommittedTimeline(agent.id);
+
+    const timelineEvents: Array<{
+      event: Extract<AgentStreamEvent, { type: "timeline" }>;
+      row: AgentTimelineRow;
+    }> = [];
+    const providerSubagentEvents: AgentManagerEvent[] = [];
+    for (const event of historySubagentEvents) {
+      const update = this.providerSubagents.apply(agent.id, event.provider, event.event);
+      const managerEvent: AgentManagerEvent = { type: "provider_subagent", event: update };
+      if (deferredBroadcast) {
+        providerSubagentEvents.push(managerEvent);
+      } else if (broadcast) {
+        this.dispatch(managerEvent);
+      }
+    }
+    for (const event of historyEvents) {
+      const row = this.recordTimeline(
+        agent.id,
+        event.item,
+        event.timestamp ? { timestamp: event.timestamp } : undefined,
+      );
+      if (deferredBroadcast) {
+        timelineEvents.push({ event, row });
+      } else if (broadcast) {
+        this.dispatchStream(agent.id, event, {
+          seq: row.seq,
+          epoch: this.timelineStore.getEpoch(agent.id),
+          timestamp: row.timestamp,
+        });
+      }
+    }
     agent.historyPrimed = true;
 
     if (typeof broadcast !== "function" || !broadcast()) {
@@ -3989,7 +4427,7 @@ export class AgentManager {
         this.emitState(agent);
         return undefined;
       case "mode_changed":
-        agent.currentModeId = event.currentModeId;
+        this.applyObservedMode(agent, event.currentModeId);
         agent.availableModes = event.availableModes;
         if (agent.runtimeInfo) {
           agent.runtimeInfo = { ...agent.runtimeInfo, modeId: event.currentModeId };
@@ -4005,7 +4443,7 @@ export class AgentManager {
             agent.cwd,
           );
         }
-        agent.currentModeId = event.runtimeInfo.modeId ?? agent.currentModeId;
+        this.applyObservedMode(agent, event.runtimeInfo.modeId ?? agent.currentModeId);
         flags.shouldDispatchEvent = false;
         this.emitState(agent);
         return undefined;
@@ -4066,14 +4504,18 @@ export class AgentManager {
 
   private onStreamThreadStarted(agent: ActiveManagedAgent): void {
     const previousSessionId = agent.persistence?.sessionId ?? null;
+    this.refreshSessionPersistence(agent);
+    if (agent.persistence?.sessionId !== previousSessionId) {
+      this.emitState(agent);
+    }
+    void this.refreshRuntimeInfo(agent);
+  }
+
+  private refreshSessionPersistence(agent: ActiveManagedAgent): void {
     const handle = agent.session.describePersistence();
     if (handle) {
       agent.persistence = attachPersistenceCwd(handle, agent.cwd);
-      if (agent.persistence?.sessionId !== previousSessionId) {
-        this.emitState(agent);
-      }
     }
-    void this.refreshRuntimeInfo(agent);
   }
 
   private async onStreamTimelineEvent(params: {
@@ -4084,12 +4526,14 @@ export class AgentManager {
   }): Promise<void> {
     const { agent, event, options, flags } = params;
 
-    if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
+    const item = projectAgentMessage(event.item);
+    if (!item) {
       flags.shouldDispatchEvent = false;
       flags.shouldNotifyWaiters = false;
       return;
     }
 
+    event.item = item;
     if (
       event.item.type === "user_message" &&
       event.item.clientMessageId &&
@@ -4278,6 +4722,7 @@ export class AgentManager {
   ): void {
     const hadPendingPermissions = agent.pendingPermissions.size > 0;
     agent.pendingPermissions.set(event.request.id, event.request);
+    this.refreshSessionPersistence(agent);
     if (!hadPendingPermissions && !agent.internal) {
       this.broadcastAgentAttention(agent, "permission");
     }
@@ -4292,6 +4737,7 @@ export class AgentManager {
   }): void {
     const { agent, event, options, flags } = params;
     agent.pendingPermissions.delete(event.requestId);
+    this.refreshSessionPersistence(agent);
     if (!options?.fromHistory && agent.inFlightPermissionResponses.has(event.requestId)) {
       agent.bufferedPermissionResolutions.set(event.requestId, event);
       flags.shouldDispatchEvent = false;
@@ -4358,19 +4804,34 @@ export class AgentManager {
     agent: ActiveManagedAgent,
     prompt: AgentPromptInput,
     clientMessageId: string,
+    outcome: "accepted" | "rejected",
     options?: { messageId?: string; providerMessageId?: string; turnId?: string },
   ): void {
-    if (this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId)) {
-      return;
-    }
-    this.touchUpdatedAt(agent);
-    agent.lastUserMessageAt = new Date();
-    const item: AgentTimelineItem = {
+    const item = projectAgentMessage({
       type: "user_message",
       text: submittedPromptText(prompt),
       clientMessageId,
       ...(options?.messageId ? { messageId: options.messageId } : {}),
-    };
+    });
+    if (!item) return;
+    // Human attempts stay in history on rejection; delivery notifications require acceptance.
+    if (outcome === "rejected" && item.type !== "user_message") return;
+    this.recordSubmittedPromptItem(agent, item, options);
+  }
+
+  private recordSubmittedPromptItem(
+    agent: ActiveManagedAgent,
+    item: AgentTimelineItem,
+    options?: { providerMessageId?: string; turnId?: string },
+  ): void {
+    if (
+      item.type === "user_message" &&
+      item.clientMessageId &&
+      this.timelineStore.getSubmittedUserMessage(agent.id, item.clientMessageId)
+    )
+      return;
+    this.touchUpdatedAt(agent);
+    if (item.type === "user_message") agent.lastUserMessageAt = new Date();
     this.recordAndDispatchTimelineItem(agent.id, item, agent.provider, options?.turnId, options);
   }
 
@@ -4383,11 +4844,14 @@ export class AgentManager {
     if (!clientMessageId) return null;
     let existing = this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId);
     if (!existing) {
-      this.recordSubmittedPrompt(agent, item.text, clientMessageId, {
-        messageId: clientMessageId,
-        ...(messageId ? { providerMessageId: messageId } : {}),
-        ...(turnId ? { turnId } : {}),
-      });
+      this.recordSubmittedPromptItem(
+        agent,
+        { ...item, messageId: clientMessageId },
+        {
+          ...(messageId ? { providerMessageId: messageId } : {}),
+          ...(turnId ? { turnId } : {}),
+        },
+      );
       existing = this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId);
     }
     if (!existing || existing.item.type !== "user_message") return null;
@@ -4685,6 +5149,14 @@ export class AgentManager {
       "agent.manager.dispatch_stream",
     );
     this.dispatch({ type: "agent_stream", agentId, event, ...metadata });
+    if (this.pluginLifecycle && agent && !agent.internal && event.type !== "timeline") {
+      publishAgentStream(
+        this.pluginLifecycle,
+        describeHookAgent({ ...agent, title: agent.config.title }),
+        event,
+        this.timelineStore.getItems(agentId),
+      );
+    }
   }
 
   private dispatch(event: AgentManagerEvent): void {
@@ -4713,8 +5185,12 @@ export class AgentManager {
       ) {
         continue;
       }
-      // Skip internal agents for global subscribers (those without a specific agentId)
-      if (!subscriber.agentId && this.eventBelongsToInternalAgent(event)) {
+      // Global subscribers (no agentId) skip internal agents unless they opted in.
+      if (
+        !subscriber.agentId &&
+        !subscriber.includeInternal &&
+        this.eventBelongsToInternalAgent(event)
+      ) {
         continue;
       }
       subscriber.callback(event);
@@ -4741,23 +5217,11 @@ export class AgentManager {
     // Always resolve cwd to absolute path for consistent history file lookup
     if (normalized.cwd) {
       normalized.cwd = resolve(normalized.cwd);
-      try {
-        const cwdStats = await stat(normalized.cwd);
-        if (!cwdStats.isDirectory()) {
-          throw new Error(`Working directory is not a directory: ${normalized.cwd}`);
-        }
-      } catch (error) {
-        if (
-          error instanceof Error &&
-          "code" in error &&
-          (error as NodeJS.ErrnoException).code === "ENOENT"
-        ) {
-          throw new Error(`Working directory does not exist: ${normalized.cwd}`, { cause: error });
-        }
-        if (error instanceof Error) {
-          throw error;
-        }
-        throw new Error(`Failed to access working directory: ${normalized.cwd}`, { cause: error });
+      // Only a session that will run in the directory needs it to still be there. Reading
+      // an archived agent's history runs nothing, and must survive the worktree it ran in
+      // being removed when its workspace was archived.
+      if (options.purpose !== "history") {
+        await assertUsableWorkingDirectory(normalized.cwd);
       }
     }
 
@@ -4779,22 +5243,15 @@ export class AgentManager {
 
   private applyProviderConfiguration(config: AgentSessionConfig): AgentSessionConfig {
     const definition = this.providerDefinitions.get(config.provider);
-    if (config.providerOptions !== undefined && !definition?.validateOptions) {
-      throw new Error(`Provider '${config.provider}' does not accept providerOptions`);
-    }
-    const validatedOptions = definition?.validateOptions?.(config.providerOptions);
-    const withOptions = definition?.applyOptions
-      ? definition.applyOptions(config, validatedOptions)
-      : config;
-    this.validateToolPolicyServers(withOptions);
-    if (withOptions.toolPolicy && !definition?.applyToolPolicy) {
+    this.validateToolPolicyServers(config);
+    if (config.toolPolicy && !definition?.applyToolPolicy) {
       throw new Error(
         `Provider '${config.provider}' cannot preapprove exact MCP tools for unattended execution`,
       );
     }
     return definition?.applyToolPolicy
-      ? definition.applyToolPolicy(withOptions, withOptions.toolPolicy)
-      : withOptions;
+      ? definition.applyToolPolicy(config, config.toolPolicy)
+      : config;
   }
 
   private validateToolPolicyServers(config: AgentSessionConfig): void {
@@ -4830,18 +5287,27 @@ export class AgentManager {
   private async prepareSessionConfig(
     config: AgentSessionConfig,
     agentId: string,
-    env?: Record<string, string>,
+    options: { env?: Record<string, string>; purpose?: AgentResumePurpose } = {},
   ): Promise<PreparedSessionConfig> {
-    const storedConfig = await this.normalizeConfig(stripInternalPaseoMcpServer(config), { env });
+    const storedConfig = await this.normalizeConfig(stripInternalPaseoMcpServer(config), {
+      env: options.env,
+      purpose: options.purpose,
+    });
+    const paseoToolPolicy = this.paseoToolsEnabled
+      ? this.resolvePaseoToolPolicy(storedConfig.provider)
+      : { enabled: false };
     const launchConfig = this.applyDaemonAppendSystemPrompt(
       withRuntimePaseoMcpServer({
         config: storedConfig,
         agentId,
-        mcpBaseUrl: this.mcpBaseUrl,
+        mcpBaseUrl:
+          this.paseoToolsEnabled && isPaseoToolPolicyEnabled(paseoToolPolicy)
+            ? this.mcpBaseUrl
+            : null,
         mcpAuthToken: this.mcpAuthToken,
       }),
     );
-    return { storedConfig, launchConfig };
+    return { storedConfig, launchConfig, paseoToolPolicy };
   }
 
   private applyDaemonAppendSystemPrompt(config: AgentSessionConfig): AgentSessionConfig {
@@ -4861,8 +5327,27 @@ export class AgentManager {
     agentId: string,
     client: AgentClient,
     cwd: string,
+    paseoToolPolicy: ProviderPaseoToolsPolicy | undefined,
     env?: Record<string, string>,
+    opening?: {
+      reason: PluginSessionOpenRequest["reason"];
+      purpose: PluginSessionOpenRequest["purpose"];
+      workspaceId?: string | null;
+    },
   ): Promise<AgentLaunchContext> {
+    if (this.pluginLifecycle) {
+      const request: PluginSessionOpenRequest = {
+        agentId,
+        provider: client.provider,
+        cwd,
+        workspaceId: opening?.workspaceId ?? null,
+        reason: opening?.reason ?? "resume",
+        purpose: opening?.purpose ?? "interactive",
+        env: { ...env },
+      };
+      const transformed = await this.pluginLifecycle.before("agent.session_open", request);
+      env = transformed.env;
+    }
     const context: AgentLaunchContext = {
       agentId,
       env: {
@@ -4873,10 +5358,14 @@ export class AgentManager {
     };
     if (
       this.paseoToolsEnabled &&
+      isPaseoToolPolicyEnabled(paseoToolPolicy) &&
       client.capabilities.supportsNativePaseoTools &&
       this.paseoToolCatalogFactory
     ) {
-      context.paseoTools = await this.paseoToolCatalogFactory({ callerAgentId: agentId });
+      context.paseoTools = await this.paseoToolCatalogFactory({
+        callerAgentId: agentId,
+        paseoToolPolicy,
+      });
     }
     return context;
   }
diff --git a/packages/server/src/server/agent/agent-mcp.e2e.test.ts b/packages/server/src/server/agent/agent-mcp.e2e.test.ts
index 0374c4eafc..cf9711a9df 100644
--- a/packages/server/src/server/agent/agent-mcp.e2e.test.ts
+++ b/packages/server/src/server/agent/agent-mcp.e2e.test.ts
@@ -89,6 +89,75 @@ async function createMcpClient(url: string, authToken?: string): Promise<McpClie
   return { callTool: boundCallTool, close: () => rawClient.close() };
 }
 
+interface OfflineMcpDaemon {
+  client: McpClient;
+  stop: () => Promise<void>;
+}
+
+async function startOfflineMcpDaemon(): Promise<OfflineMcpDaemon> {
+  const paseoHome = await mkdtemp(path.join(os.tmpdir(), "paseo-home-"));
+  const staticDir = await mkdtemp(path.join(os.tmpdir(), "paseo-static-"));
+  const removeDirectories = async () => {
+    await rm(paseoHome, { recursive: true, force: true });
+    await rm(staticDir, { recursive: true, force: true });
+  };
+  const port = await getAvailablePort();
+  const daemon = await createPaseoDaemon(
+    {
+      listen: `127.0.0.1:${port}`,
+      paseoHome,
+      corsAllowedOrigins: [],
+      hostnames: true,
+      mcpEnabled: true,
+      staticDir,
+      mcpDebug: false,
+      agentClients: createTestAgentClients(),
+      agentStoragePath: path.join(paseoHome, "agents"),
+    },
+    pino({ level: "silent" }),
+  ).catch(async (error: unknown) => {
+    await removeDirectories();
+    throw error;
+  });
+  try {
+    await daemon.start();
+    const client = await createMcpClient(`http://127.0.0.1:${port}/mcp/agents`);
+    return {
+      client,
+      stop: async () => {
+        await client.close();
+        await daemon.stop();
+        await removeDirectories();
+      },
+    };
+  } catch (error) {
+    await daemon.stop();
+    await removeDirectories();
+    throw error;
+  }
+}
+
+type WorkspaceCreation = { workspaceId: unknown } | { error: unknown };
+
+async function createLocalWorkspace(client: McpClient, cwd: string): Promise<WorkspaceCreation> {
+  const result = await client.callTool({
+    name: "create_workspace",
+    args: { isolation: "local", path: cwd },
+  });
+  if (result.isError) {
+    const content = result.content?.[0];
+    return { error: content && "text" in content ? content.text : undefined };
+  }
+  return { workspaceId: getStructuredContent(result)?.workspaceId };
+}
+
+async function listWorkspaces(client: McpClient): Promise<WorkspaceCreation[]> {
+  const result = await client.callTool({ name: "list_workspaces", args: {} });
+  const workspaces = getStructuredContent(result)?.workspaces;
+  if (!Array.isArray(workspaces)) return [];
+  return workspaces.map((workspace: StructuredContent) => ({ workspaceId: workspace.workspaceId }));
+}
+
 interface LaunchRecorder {
   recordedLaunches: AgentSessionConfig[];
 }
@@ -146,22 +215,19 @@ function createMcpRecordingAgentClients(recorder: LaunchRecorder) {
   };
 }
 
-async function assertAgentNotRunning(options: {
-  client: McpClient;
-  agentId: string;
-}): Promise<void> {
-  const statusResult = await options.client.callTool({
-    name: "get_agent_status",
-    args: { agentId: options.agentId },
-  });
-  const payload = getStructuredContent(statusResult);
-  if (!payload) {
-    throw new Error("get_agent_status returned no structured payload");
-  }
-  const status = payload.status;
-  if (status === "running" || status === "initializing") {
-    throw new Error(`Agent still running after blocking create_agent (status=${status})`);
-  }
+async function waitForAgentFinish(options: { client: McpClient; agentId: string }): Promise<void> {
+  await expect
+    .poll(
+      async () => {
+        const result = await options.client.callTool({
+          name: "get_agent_status",
+          args: { agentId: options.agentId },
+        });
+        return getStructuredContent(result)?.status;
+      },
+      { timeout: 10000 },
+    )
+    .toBe("idle");
 }
 
 describe("agent MCP end-to-end (offline)", () => {
@@ -207,7 +273,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt,
-          background: false,
         },
       });
 
@@ -215,7 +280,7 @@ describe("agent MCP end-to-end (offline)", () => {
       agentId = typeof payload?.agentId === "string" ? payload.agentId : null;
       expect(agentId).toBeTruthy();
 
-      await assertAgentNotRunning({ client, agentId: agentId! });
+      await waitForAgentFinish({ client, agentId: agentId! });
 
       if (existsSync(filePath)) {
         const contents = await readFile(filePath, "utf8");
@@ -235,6 +300,27 @@ describe("agent MCP end-to-end (offline)", () => {
     }
   }, 30_000);
 
+  test("create_workspace with local isolation adopts only an existing directory", async () => {
+    const daemon = await startOfflineMcpDaemon();
+    const root = await mkdtemp(path.join(os.tmpdir(), "paseo-local-workspace-"));
+    const missingPath = path.join(root, "does-not-exist");
+    const filePath = path.join(root, "regular-file");
+    await writeFile(filePath, "not a directory\n", "utf8");
+    try {
+      expect(await createLocalWorkspace(daemon.client, missingPath)).toEqual({
+        error: expect.stringContaining(`Directory not found: ${missingPath}`),
+      });
+      expect(await createLocalWorkspace(daemon.client, filePath)).toEqual({
+        error: expect.stringContaining(`Directory not found: ${filePath}`),
+      });
+      const created = await createLocalWorkspace(daemon.client, root);
+      expect(await listWorkspaces(daemon.client)).toEqual([created]);
+    } finally {
+      await daemon.stop();
+      await rm(root, { recursive: true, force: true });
+    }
+  }, 30_000);
+
   test("password-protected daemon authorizes the agent MCP via the capability token", async () => {
     const paseoHome = await mkdtemp(path.join(os.tmpdir(), "paseo-home-"));
     const staticDir = await mkdtemp(path.join(os.tmpdir(), "paseo-static-"));
@@ -287,7 +373,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -362,7 +447,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -386,7 +470,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const disabledPayload = getStructuredContent(disabledResult);
@@ -451,7 +534,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -511,7 +593,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "codex/gpt-5.4-mini",
           mode: "full-access",
           initialPrompt: "Run exactly: sleep 30",
-          background: true,
         },
       });
 
@@ -682,7 +763,6 @@ describe("agent MCP end-to-end (offline)", () => {
 
     const client = await createMcpClient(`http://127.0.0.1:${port}/mcp/agents`);
 
-    let agentId: string | null = null;
     try {
       const result = await client.callTool({
         name: "create_agent",
@@ -692,29 +772,13 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "codex/gpt-5.4-mini",
           mode: "full-access",
           initialPrompt: "Run exactly: sleep 30",
-          background: true,
         },
       });
 
-      const payload = getStructuredContent(result);
-      agentId = typeof payload?.agentId === "string" ? payload.agentId : null;
-      expect(agentId).toBeTruthy();
-
-      await assertAgentNotRunning({ client, agentId: agentId! });
-      const statusResult = await client.callTool({
-        name: "get_agent_status",
-        args: { agentId },
-      });
-      const statusPayload = getStructuredContent(statusResult);
-      expect(statusPayload?.status).toBe("error");
-      const snapshot = statusPayload?.snapshot;
-      const lastError =
-        snapshot && typeof snapshot === "object" ? Reflect.get(snapshot, "lastError") : undefined;
-      expect(lastError).toContain("Initial turn failed to start");
+      expect(result.isError).toBe(true);
+      expect(JSON.stringify(result)).toContain("Initial turn failed to start");
+      expect(getStructuredContent(result)?.agentId).toBeUndefined();
     } finally {
-      if (agentId) {
-        await client.callTool({ name: "kill_agent", args: { agentId } });
-      }
       await client.close();
       await daemon.stop();
       await rm(paseoHome, { recursive: true, force: true });
@@ -790,7 +854,6 @@ describe("agent MCP end-to-end (offline)", () => {
             initialPrompt: "say done and stop",
             worktreeName: "mcp-worktree-setup-test",
             baseBranch: "main",
-            background: true,
           },
         }),
         timeoutMs: 2500,
diff --git a/packages/server/src/server/agent/agent-messages/index.ts b/packages/server/src/server/agent/agent-messages/index.ts
new file mode 100644
index 0000000000..1543bf33b4
--- /dev/null
+++ b/packages/server/src/server/agent/agent-messages/index.ts
@@ -0,0 +1,191 @@
+import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
+import { randomUUID } from "node:crypto";
+import { z } from "zod";
+import type {
+  AgentPromptContentBlock,
+  AgentPromptInput,
+  AgentTimelineItem,
+} from "../agent-sdk-types.js";
+
+const agentIdSchema = z.string().min(1);
+const sourceSchema = z.discriminatedUnion("kind", [
+  z.object({
+    kind: z.literal("agent-message"),
+    agentId: agentIdSchema,
+    title: z.string().min(1).optional(),
+  }),
+  z.object({
+    kind: z.literal("agent-notification"),
+    agentId: agentIdSchema,
+    title: z.string().min(1).optional(),
+    event: z.enum(["finished", "errored", "permission-required", "closed"]),
+  }),
+]);
+export type AgentPromptSource = z.infer<typeof sourceSchema>;
+
+interface AgentMessage {
+  id: string;
+  source: AgentPromptSource | null;
+  text: string;
+}
+
+function escapeXml(value: string): string {
+  return value.replace(/[&<>"']/g, (character) => {
+    switch (character) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      case '"':
+        return "&quot;";
+      default:
+        return "&apos;";
+    }
+  });
+}
+
+function unescapeXml(value: string): string | null {
+  if (/[<>]|&(?!amp;|lt;|gt;|quot;|apos;)/.test(value)) return null;
+  return value.replace(/&(amp|lt|gt|quot|apos);/g, (_, entity: string) => {
+    switch (entity) {
+      case "amp":
+        return "&";
+      case "lt":
+        return "<";
+      case "gt":
+        return ">";
+      case "quot":
+        return '"';
+      default:
+        return "'";
+    }
+  });
+}
+
+export function formatAgentMessage(message: AgentMessage): string {
+  const { source } = message;
+  const attributes = source
+    ? `kind="${source.kind}" source-agent-id="${escapeXml(source.agentId)}"`
+    : 'kind="user-message"';
+  const title = source?.title ? ` source-agent-title="${escapeXml(source.title)}"` : "";
+  const event = source?.kind === "agent-notification" ? ` event="${source.event}"` : "";
+  return `<paseo-system version="1" ${attributes} message-id="${escapeXml(message.id)}"${title}${event}>\n${escapeXml(message.text)}\n</paseo-system>`;
+}
+
+export function parseAgentMessage(text: string): AgentMessage | null {
+  const envelope = /^<paseo-system((?:\s+[a-z-]+="[^"<>]*")+)>\n([\s\S]*)\n<\/paseo-system>$/.exec(
+    text,
+  );
+  if (!envelope) return null;
+  const attributes = new Map<string, string>();
+  for (const match of envelope[1].matchAll(/\s+([a-z-]+)="([^"<>]*)"/g)) {
+    const value = unescapeXml(match[2]);
+    if (value === null || attributes.has(match[1])) return null;
+    attributes.set(match[1], value);
+  }
+  if (attributes.get("version") !== "1") return null;
+  const id = attributes.get("message-id");
+  const body = unescapeXml(envelope[2]);
+  if (!id || body === null) return null;
+  if (attributes.get("kind") === "user-message") {
+    if (attributes.has("source-agent-id") || attributes.has("event")) return null;
+    return { id, source: null, text: body };
+  }
+  const source = sourceSchema.safeParse({
+    kind: attributes.get("kind"),
+    agentId: attributes.get("source-agent-id"),
+    event: attributes.get("event"),
+    title: attributes.get("source-agent-title"),
+  });
+  if (!source.success) return null;
+  return { id, source: source.data, text: body };
+}
+
+function renderMessageText(block: AgentPromptContentBlock): string[] {
+  if (block.type === "image") return [];
+  if (block.type === "text") return [block.text];
+  return [renderPromptAttachmentAsText(block)];
+}
+
+export function prepareAgentMessage(
+  prompt: AgentPromptInput,
+  source?: AgentPromptSource,
+  id?: string,
+): { prompt: AgentPromptInput; messageId?: string } {
+  if (!source) {
+    const submittedText =
+      typeof prompt === "string"
+        ? prompt
+        : prompt
+            .flatMap((block) =>
+              block.type === "text" && !("mimeType" in block) ? [block.text] : [],
+            )
+            .join("\n")
+            .trim();
+    // Quote reserved envelopes only when they arrived through the human send path.
+    // This provenance must survive provider history, not only the accepted local row.
+    if (!parseAgentMessage(submittedText) && !isSystemInjectedEnvelope(submittedText)) {
+      return { prompt, messageId: id };
+    }
+  }
+  const messageId = id ?? randomUUID();
+  const text = typeof prompt === "string" ? prompt : prompt.flatMap(renderMessageText).join("\n\n");
+  // Render textual attachments before wrapping, so provider replay still contains one
+  // complete envelope instead of an envelope followed by provider-rendered context.
+  const envelope = formatAgentMessage({ id: messageId, source: source ?? null, text });
+  return {
+    messageId,
+    prompt:
+      typeof prompt === "string"
+        ? envelope
+        : [{ type: "text", text: envelope }, ...prompt.filter((block) => block.type === "image")],
+  };
+}
+
+/** The same projection owns provider echoes, acceptance, import, and replay. */
+export function projectAgentMessage(item: AgentTimelineItem): AgentTimelineItem | null {
+  if (item.type !== "user_message") return item;
+  const message = parseAgentMessage(item.text);
+  if (!message) {
+    // COMPAT(legacySystemEnvelope): added in v0.11.1; remove after 2027-04-08 once
+    // legacy notification history is retired. Schedules still use this envelope.
+    return isSystemInjectedEnvelope(item.text) ? null : item;
+  }
+  const { source } = message;
+  if (!source) {
+    return { ...item, text: message.text, clientMessageId: message.id };
+  }
+  return {
+    type: "tool_call",
+    callId: `paseo-agent-message:${message.id}`,
+    agentMessage: {
+      event: source.kind === "agent-message" ? "message" : source.event,
+      sender: { id: source.agentId, ...(source.title ? { title: source.title } : {}) },
+      text: message.text,
+    },
+    // COMPAT(agentMessageToolEnvelope): added in v0.11.1; remove after 2027-04-08
+    // once clients can accept a dedicated timeline variant. Older clients still
+    // parse this existing shape and can expand the delivered body.
+    name: "agent_message",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", text: message.text, icon: "bot" },
+  };
+}
+
+/**
+ * Wrap a body in <paseo-system>…</paseo-system> so the receiving agent
+ * recognizes the prompt as system-injected context — not a user turn.
+ * Used by schedule fires; agent messages use the versioned envelope.
+ */
+export function formatSystemNotificationPrompt(reason: string): string {
+  return `<paseo-system>\n${reason}\n</paseo-system>`;
+}
+
+const SYSTEM_ENVELOPE_PATTERN = /^<paseo-system>\n[\s\S]*\n<\/paseo-system>$/;
+
+export function isSystemInjectedEnvelope(text: string): boolean {
+  return SYSTEM_ENVELOPE_PATTERN.test(text);
+}
diff --git a/packages/server/src/server/agent/agent-projections.test.ts b/packages/server/src/server/agent/agent-projections.test.ts
index f72bd84db1..ec4186b022 100644
--- a/packages/server/src/server/agent/agent-projections.test.ts
+++ b/packages/server/src/server/agent/agent-projections.test.ts
@@ -407,6 +407,17 @@ describe("toAgentPayload", () => {
     });
   });
 
+  it("carries a stored lastError onto the payload", () => {
+    const record = toStoredAgentRecord(
+      createManagedAgent({ provider: "codex", config: { provider: "codex" }, lastError: "boom" }),
+    );
+
+    expect(buildStoredAgentPayload(record, ["codex"]).lastError).toBe("boom");
+    expect(buildStoredAgentPayload({ ...record, lastError: null }, ["codex"])).not.toHaveProperty(
+      "lastError",
+    );
+  });
+
   it("omits lastUsage when not available", () => {
     const agent = createManagedAgent({ lastUsage: undefined });
     const payload = toAgentPayload(agent);
diff --git a/packages/server/src/server/agent/agent-projections.ts b/packages/server/src/server/agent/agent-projections.ts
index bd4042796a..3f2a9b7775 100644
--- a/packages/server/src/server/agent/agent-projections.ts
+++ b/packages/server/src/server/agent/agent-projections.ts
@@ -19,7 +19,11 @@ import type {
 } from "./agent-sdk-types.js";
 import type { ManagedAgent } from "./agent-manager.js";
 import type { JsonValue } from "../json-utils.js";
-import { isStoredAgentProviderAvailable, toAgentPersistenceHandle } from "../persistence-hooks.js";
+import {
+  isStoredAgentProviderAvailable,
+  resolveStoredAgentUpdatedAt,
+  toAgentPersistenceHandle,
+} from "../persistence-hooks.js";
 export type { ManagedAgent };
 
 interface ProjectionOptions {
@@ -135,6 +139,7 @@ export function toAgentPayload(
     persistence: projectPersistenceHandleForWire(agent.persistence),
     title: options?.title ?? null,
     labels: agent.labels,
+    ...(agent.internal ? { internal: true } : {}),
   };
 
   const usage = sanitizeUsage(agent.lastUsage);
@@ -208,7 +213,7 @@ export function buildStoredAgentPayload(
   } as const;
 
   const createdAt = new Date(record.createdAt);
-  const updatedAt = new Date(resolveStoredAgentPayloadUpdatedAt(record));
+  const updatedAt = new Date(resolveStoredAgentUpdatedAt(record));
   const lastUserMessageAt = record.lastUserMessageAt ? new Date(record.lastUserMessageAt) : null;
 
   const runtimeInfo = buildStoredRuntimeInfo(record);
@@ -243,7 +248,9 @@ export function buildStoredAgentPayload(
     attentionReason: record.attentionReason ?? null,
     attentionTimestamp: record.attentionTimestamp ?? null,
     archivedAt: record.archivedAt ?? null,
+    ...(record.internal ? { internal: true } : {}),
     labels: normalizeLabels(record.labels),
+    ...(typeof record.lastError === "string" ? { lastError: record.lastError } : {}),
     ...(providerAvailable ? {} : { providerUnavailable: true }),
   };
 }
@@ -287,23 +294,6 @@ export function toRecentProviderSessionDescriptorPayload(
   };
 }
 
-export function resolveStoredAgentPayloadUpdatedAt(record: StoredAgentRecord): string {
-  const timestamps = [record.updatedAt, record.lastActivityAt]
-    .filter((value): value is string => typeof value === "string" && value.length > 0)
-    .map((value) => ({
-      raw: value,
-      parsed: Date.parse(value),
-    }))
-    .filter((value) => !Number.isNaN(value.parsed));
-
-  if (timestamps.length === 0) {
-    return record.updatedAt;
-  }
-
-  timestamps.sort((a, b) => b.parsed - a.parsed);
-  return timestamps[0].raw;
-}
-
 function buildSerializableConfig(config: AgentSessionConfig): SerializableAgentConfig | null {
   const serializable: SerializableAgentConfig = {};
   if (config.modeId) {
diff --git a/packages/server/src/server/agent/agent-prompt.test.ts b/packages/server/src/server/agent/agent-prompt.test.ts
index 864813a140..dcdfdb1cbf 100644
--- a/packages/server/src/server/agent/agent-prompt.test.ts
+++ b/packages/server/src/server/agent/agent-prompt.test.ts
@@ -1,3 +1,11 @@
+import {
+  formatSystemNotificationPrompt,
+  isSystemInjectedEnvelope,
+  parseAgentMessage,
+  formatAgentMessage,
+  prepareAgentMessage,
+  projectAgentMessage,
+} from "./agent-messages/index.js";
 import { expect, it, test, vi } from "vitest";
 import pino, { type Logger } from "pino";
 import { randomUUID } from "node:crypto";
@@ -8,12 +16,7 @@ import { join } from "node:path";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { AgentManager } from "./agent-manager.js";
 import { AgentStorage } from "./agent-storage.js";
-import {
-  formatSystemNotificationPrompt,
-  isSystemInjectedEnvelope,
-  setupFinishNotification,
-  waitForAgentRunStartWithTimeout,
-} from "./agent-prompt.js";
+import { setupFinishNotification, waitForAgentRunStartWithTimeout } from "./agent-prompt.js";
 import type { AgentManagerEvent, ManagedAgent } from "./agent-manager.js";
 import type {
   AgentClient,
@@ -88,7 +91,7 @@ function createFinishNotificationScenario(
   Reflect.set(callerAgent, "lifecycle", "idle");
   Reflect.set(callerAgent, "config", { title: "Caller Agent" });
 
-  const agentManager: AgentManager = Object.create(AgentManager.prototype);
+  const agentManager = new AgentManager({ clients: {}, logger: createTestLogger() });
   Reflect.set(agentManager, "getAgent", (agentId: string) => {
     if (agentId === "child-agent") {
       return childAgent;
@@ -219,6 +222,11 @@ function createFinishNotificationScenario(
         type: "agent_state",
         agent: childAgent,
       });
+      subscriber?.({
+        type: "agent_stream",
+        agentId: "child-agent",
+        event: { type: "turn_completed", provider: "codex" },
+      });
     },
     async finishChildAndReadParentPrompt() {
       const parentPrompt = new Promise<string>((resolve) => {
@@ -272,11 +280,16 @@ test("finish notifications tell the parent the child's last assistant message",
   scenario.startWatchingChild();
   const parentPrompt = await scenario.finishChildAndReadParentPrompt();
 
-  expect(parentPrompt).toEqual(
-    formatSystemNotificationPrompt(
-      "Agent child-agent (Child Agent) finished.\n\n<agent-response>\nImplemented the cleanup and all checks pass.\n</agent-response>",
-    ),
-  );
+  expect(parseAgentMessage(parentPrompt)).toEqual({
+    id: expect.any(String),
+    source: {
+      kind: "agent-notification",
+      agentId: "child-agent",
+      title: "Child Agent",
+      event: "finished",
+    },
+    text: "Agent child-agent (Child Agent) finished.\n\n<agent-response>\nImplemented the cleanup and all checks pass.\n</agent-response>",
+  });
   expect(scenario.steerAttemptCount()).toBe(1);
 });
 
@@ -303,9 +316,16 @@ test("closing a watched child notifies the caller", async () => {
   scenario.startWatchingChild();
   const parentPrompt = await scenario.closeChildAndReadParentPrompt();
 
-  expect(parentPrompt).toEqual(
-    formatSystemNotificationPrompt("Agent child-agent (Child Agent) was closed."),
-  );
+  expect(parseAgentMessage(parentPrompt)).toEqual({
+    id: expect.any(String),
+    source: {
+      kind: "agent-notification",
+      agentId: "child-agent",
+      title: "Child Agent",
+      event: "closed",
+    },
+    text: "Agent child-agent (Child Agent) was closed.",
+  });
 });
 
 test("finish notifications survive permission responses", async () => {
@@ -318,9 +338,9 @@ test("finish notifications survive permission responses", async () => {
     expect(scenario.parentPrompts()).toHaveLength(1);
   });
   expect(scenario.parentPrompts()[0]).toContain("needs permission.");
-  const permissionPayload = scenario
-    .parentPrompts()[0]
-    .match(/<permission-request>\n([\s\S]+?)\n<\/permission-request>/)?.[1];
+  const permissionPayload = parseAgentMessage(scenario.parentPrompts()[0])!.text.match(
+    /<permission-request>\n([\s\S]+?)\n<\/permission-request>/,
+  )?.[1];
   expect(permissionPayload).toBeDefined();
   expect(JSON.parse(permissionPayload!)).toEqual({
     agentId: "child-agent",
@@ -377,7 +397,9 @@ test("finish notifications report every concurrently pending permission", async
   await vi.waitFor(() => expect(scenario.parentPrompts()).toHaveLength(2));
   expect(
     scenario.parentPrompts().map((prompt) => {
-      const payload = prompt.match(/<permission-request>\n([\s\S]+?)\n<\/permission-request>/)?.[1];
+      const payload = parseAgentMessage(prompt)!.text.match(
+        /<permission-request>\n([\s\S]+?)\n<\/permission-request>/,
+      )?.[1];
       return JSON.parse(payload!).requestId;
     }),
   ).toEqual(["permission-1", "permission-2"]);
@@ -468,7 +490,7 @@ it("does not notify archived callers", async () => {
   const streamAgentSpy = vi.fn(() => (async function* noop() {})());
   const replaceAgentRunSpy = vi.fn(() => (async function* noop() {})());
 
-  const agentManager: AgentManager = Object.create(AgentManager.prototype);
+  const agentManager = new AgentManager({ clients: {}, logger: createTestLogger() });
   Reflect.set(
     agentManager,
     "getAgent",
@@ -523,6 +545,11 @@ it("does not notify archived callers", async () => {
     type: "agent_state",
     agent: childAgent,
   });
+  subscriber?.({
+    type: "agent_stream",
+    agentId: "child-agent",
+    event: { type: "turn_completed", provider: "codex" },
+  });
 
   await vi.waitFor(() => {
     expect(agentStorageGetSpy).toHaveBeenCalledWith("caller-agent");
@@ -762,3 +789,75 @@ test("waiting for a run start still gives up at the run start budget", async ()
     await scenario.cleanup();
   }
 });
+
+test("agent envelopes round-trip opaque sender IDs and XML-sensitive messages", () => {
+  const message = {
+    id: "delivery-1",
+    source: {
+      kind: "agent-message" as const,
+      agentId: 'host::agent<&"',
+      title: 'QA <messenger> & "reviewer"',
+    },
+    text: 'Review <changes> & "quotes"\n</paseo-system>\n<paseo-system>nested</paseo-system>',
+  };
+  const encoded = formatAgentMessage(message);
+  expect(parseAgentMessage(encoded)).toEqual(message);
+  expect(parseAgentMessage(`Example: ${encoded}`)).toBeNull();
+  expect(parseAgentMessage(encoded.replace('version="1"', 'version="2"'))).toBeNull();
+  expect(parseAgentMessage(encoded.replace("&lt;", "<"))).toBeNull();
+  expect(parseAgentMessage(encoded.replace('version="1"', 'version="1" version="1"'))).toBeNull();
+});
+
+test("agent envelope includes rendered attachment context and preserves images", () => {
+  const image = { type: "image" as const, data: "aW1hZ2U=", mimeType: "image/png" };
+  const attachment = {
+    type: "github_issue" as const,
+    mimeType: "application/github-issue" as const,
+    number: 42,
+    title: "Review context",
+    url: "https://example.com/issues/42",
+    body: "Attached context",
+  };
+  const source = { kind: "agent-message" as const, agentId: "remote:sender" };
+  expect(
+    prepareAgentMessage(
+      [{ type: "text", text: "First" }, image, attachment, { type: "text", text: "Second" }],
+      source,
+      "message",
+    ),
+  ).toEqual({
+    messageId: "message",
+    prompt: [
+      {
+        type: "text",
+        text: formatAgentMessage({
+          id: "message",
+          source,
+          text: "First\n\nGitHub Issue #42: Review context\nhttps://example.com/issues/42\n\nAttached context\n\nSecond",
+        }),
+      },
+      image,
+    ],
+  });
+});
+
+test("a human pasting an agent envelope stays a human message through provider replay", () => {
+  const pasted = formatAgentMessage({
+    id: "example",
+    source: { kind: "agent-message", agentId: "sender" },
+    text: "hello",
+  });
+  const delivery = prepareAgentMessage(pasted, undefined, "human-submission");
+  expect(
+    projectAgentMessage({
+      type: "user_message",
+      text: String(delivery.prompt),
+      messageId: "provider-echo",
+    }),
+  ).toEqual({
+    type: "user_message",
+    text: pasted,
+    messageId: "provider-echo",
+    clientMessageId: "human-submission",
+  });
+});
diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index 96f5ce5ee3..4044fd84bc 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -1,3 +1,4 @@
+import { prepareAgentMessage, type AgentPromptSource } from "./agent-messages/index.js";
 import type { Logger } from "pino";
 
 import type {
@@ -8,6 +9,7 @@ import type {
 import type { AgentManager, ManagedAgent } from "./agent-manager.js";
 import type { AgentStorage } from "./agent-storage.js";
 import { ensureAgentLoaded } from "./agent-loading.js";
+import { isStaleProviderSessionError } from "./stale-provider-session-error.js";
 import { getParentAgentIdFromLabels } from "@getpaseo/protocol/agent-labels";
 import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
 
@@ -21,9 +23,13 @@ export type AgentRunController = Pick<
   | "replaceAgentRun"
   | "steerOrReplaceActiveTurn"
   | "streamAgent"
->;
+> & {
+  reloadAgentSession(agentId: string): Promise<unknown>;
+};
 
 export interface StartAgentRunOptions {
+  /** Called after selecting the run, before consuming its events. */
+  onDispatch?: (disposition: PromptDispatchDisposition) => void;
   replaceRunning?: boolean;
   activeTurnBehavior?: ActiveTurnBehavior;
   runOptions?: AgentRunOptions;
@@ -78,6 +84,14 @@ async function startOrReplaceRun(
   return { iterator, replaced };
 }
 
+async function drainAgentRunIterator(
+  iterator: AsyncGenerator<import("./agent-sdk-types.js").AgentStreamEvent>,
+): Promise<void> {
+  for await (const _ of iterator) {
+    // Events are broadcast via AgentManager subscribers.
+  }
+}
+
 export async function startAgentRun(
   agentManager: AgentRunController,
   agentId: string,
@@ -102,10 +116,32 @@ export async function startAgentRun(
   // in-flight turn — replaceAgentRun would interrupt the running turn. The
   // intercept lives at this layer so it covers every prompt entrypoint.
   if (agentManager.tryRunOutOfBand(agentId, prompt, options?.runOptions)) {
+    options?.onDispatch?.("out_of_band");
     return { disposition: "out_of_band" };
   }
+  try {
+    return await startAgentRunInner(agentManager, agentId, prompt, logger, options);
+  } catch (error) {
+    if (!isStaleProviderSessionError(error)) throw error;
+    logger.info({ agentId, err: error }, "Provider session went stale; reopening from persistence");
+    // The live session belongs to a retired plugin runtime. Reload swaps in a
+    // fresh session on the current runtime while preserving history and labels.
+    await agentManager.reloadAgentSession(agentId);
+    return await startAgentRunInner(agentManager, agentId, prompt, logger, options);
+  }
+}
+
+async function startAgentRunInner(
+  agentManager: AgentRunController,
+  agentId: string,
+  prompt: AgentPromptInput,
+  logger: Logger,
+  options?: StartAgentRunOptions,
+): Promise<{ disposition: PromptDispatchDisposition }> {
+  const snapshot = agentManager.getAgent(agentId);
   const steered = await steerOrReplaceActiveRun(agentManager, agentId, prompt, options);
   if (steered?.disposition === "steered") {
+    options?.onDispatch?.("steered");
     return steered;
   }
   const { iterator, replaced } = steered
@@ -120,10 +156,20 @@ export async function startAgentRun(
     },
     "agent.session.start_stream.iterator_returned",
   );
+  options?.onDispatch?.("turn_started");
   void (async () => {
     try {
-      for await (const _ of iterator) {
-        // Events are broadcast via AgentManager subscribers.
+      try {
+        await drainAgentRunIterator(iterator);
+      } catch (error) {
+        if (!isStaleProviderSessionError(error)) throw error;
+        logger.info(
+          { agentId, err: error },
+          "Provider session went stale; reopening from persistence",
+        );
+        await agentManager.reloadAgentSession(agentId);
+        const retry = await startOrReplaceRun(agentManager, agentId, prompt, options);
+        await drainAgentRunIterator(retry.iterator);
       }
       logger.trace(
         {
@@ -166,27 +212,14 @@ export async function unarchiveAgentState(
   return true;
 }
 
-/**
- * Wrap a body in <paseo-system>…</paseo-system> so the receiving agent
- * recognizes the prompt as system-injected context — not a user turn.
- * Used by chat mentions, schedule fires, and notify-on-finish.
- */
-export function formatSystemNotificationPrompt(reason: string): string {
-  return `<paseo-system>\n${reason}\n</paseo-system>`;
-}
-
-const SYSTEM_ENVELOPE_PATTERN = /^<paseo-system>\n[\s\S]*\n<\/paseo-system>$/;
-
-export function isSystemInjectedEnvelope(text: string): boolean {
-  return SYSTEM_ENVELOPE_PATTERN.test(text);
-}
-
 export interface SendPromptToAgentParams {
+  onDispatch?: StartAgentRunOptions["onDispatch"];
   agentManager: AgentManager;
   agentStorage: AgentStorage;
   agentId: string;
   /** Prompt to dispatch to the provider (may include image blocks or wrapped text). */
   prompt: AgentPromptInput;
+  source?: AgentPromptSource;
   messageId?: string;
   activeTurnBehavior?: ActiveTurnBehavior;
   runOptions?: AgentRunOptions;
@@ -204,10 +237,12 @@ export interface SendPromptToAgentParams {
 }
 
 export interface StartCreatedAgentInitialPromptParams {
+  agentStorage: AgentStorage;
   agentManager: AgentManager;
   agentId: string;
   snapshot?: ManagedAgent;
   prompt: AgentPromptInput | null;
+  source?: AgentPromptSource;
   runOptions?: AgentRunOptions;
   logger: Logger;
 }
@@ -229,6 +264,7 @@ const AGENT_RUN_START_TIMEOUT_MS = 60_000;
 export async function waitForAgentRunStartWithTimeout(
   agentManager: AgentManager,
   agentId: string,
+  signal?: AbortSignal,
 ): Promise<void> {
   const provider = agentManager.getAgent(agentId)?.provider ?? "provider";
   const startAbort = new AbortController();
@@ -243,12 +279,26 @@ export async function waitForAgentRunStartWithTimeout(
   );
 
   try {
-    await agentManager.waitForAgentRunStart(agentId, { signal: startAbort.signal });
+    await agentManager.waitForAgentRunStart(agentId, {
+      signal: signal ? AbortSignal.any([startAbort.signal, signal]) : startAbort.signal,
+    });
   } finally {
     clearTimeout(startTimeout);
   }
 }
 
+async function resolvePromptSource(
+  source: AgentPromptSource | undefined,
+  manager: Pick<AgentManager, "getAgent">,
+  storage: AgentStorage,
+): Promise<AgentPromptSource | undefined> {
+  if (!source) return undefined;
+  const title = (
+    manager.getAgent(source.agentId)?.config.title ?? (await storage.get(source.agentId))?.title
+  )?.trim();
+  return title ? { ...source, title } : source;
+}
+
 /**
  * Full send-prompt orchestration: (optional unarchive) → load → (optional
  * mode change) → start run.
@@ -266,29 +316,44 @@ export async function sendPromptToAgent(
   const unarchive = params.unarchive ?? true;
 
   const record = await params.agentStorage.get(params.agentId);
+  let archivedAtToRestore: string | null = null;
   if (record?.archivedAt) {
     if (!unarchive) {
       return { disposition: "turn_started" };
     }
-    await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId);
+    if (await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId)) {
+      archivedAtToRestore = record.archivedAt;
+    }
   }
 
-  await ensureAgentLoaded(params.agentId, {
-    agentManager: params.agentManager,
-    agentStorage: params.agentStorage,
-    logger: params.logger,
-  });
+  try {
+    await ensureAgentLoaded(params.agentId, {
+      agentManager: params.agentManager,
+      agentStorage: params.agentStorage,
+      logger: params.logger,
+    });
+  } catch (error) {
+    // A send that could not load the agent leaves it where it was: still archived.
+    // Concurrent sends share this load, so none of them holds a live session.
+    if (archivedAtToRestore) {
+      await params.agentManager.archiveSnapshot(params.agentId, archivedAtToRestore);
+    }
+    throw error;
+  }
 
   if (params.sessionMode) {
     await params.agentManager.setAgentMode(params.agentId, params.sessionMode);
   }
 
-  const runOptions = params.messageId
-    ? { ...params.runOptions, clientMessageId: params.messageId }
+  const source = await resolvePromptSource(params.source, params.agentManager, params.agentStorage);
+  const delivery = prepareAgentMessage(params.prompt, source, params.messageId);
+  const runOptions = delivery.messageId
+    ? { ...params.runOptions, clientMessageId: delivery.messageId }
     : params.runOptions;
 
-  return await startAgentRun(params.agentManager, params.agentId, params.prompt, params.logger, {
+  return await startAgentRun(params.agentManager, params.agentId, delivery.prompt, params.logger, {
     replaceRunning: true,
+    onDispatch: params.onDispatch,
     activeTurnBehavior: params.activeTurnBehavior,
     clearPendingPermissions: params.clearPendingPermissions,
     runOptions,
@@ -307,14 +372,17 @@ export async function startCreatedAgentInitialPrompt(
     return currentSnapshot;
   }
 
+  const delivery = prepareAgentMessage(
+    params.prompt,
+    await resolvePromptSource(params.source, params.agentManager, params.agentStorage),
+    params.runOptions?.clientMessageId,
+  );
   const dispatchResult = await startAgentRun(
     params.agentManager,
     params.agentId,
-    params.prompt,
+    delivery.prompt,
     params.logger,
-    {
-      runOptions: params.runOptions,
-    },
+    { runOptions: { ...params.runOptions, clientMessageId: delivery.messageId } },
   );
 
   if (dispatchResult.disposition === "turn_started") {
@@ -334,10 +402,26 @@ export interface SetupFinishNotificationParams {
   childAgentId: string;
   callerAgentId: string;
   requireParentOwnership?: boolean;
+  /** A replacement must observe its new start, not the displaced running snapshot. */
+  waitForTurnStart?: boolean;
   logger: Logger;
 }
 
-type FinishNotificationReason = "finished" | "errored" | "needs permission" | "was closed";
+type FinishNotificationReason =
+  | "finished"
+  | "errored"
+  | "needs permission"
+  | "was closed"
+  | "was canceled";
+
+const finishNotificationEvents = {
+  finished: "finished",
+  errored: "errored",
+  "needs permission": "permission-required",
+  "was closed": "closed",
+  // Use the existing failure event so older clients still parse agent-message metadata.
+  "was canceled": "errored",
+} as const;
 
 const FINISH_NOTIFICATION_MESSAGE_LIMIT = 4000;
 
@@ -382,25 +466,41 @@ interface NotifySafelyOptions {
   permissionRequest?: AgentPermissionRequest;
 }
 
-export function setupFinishNotification(params: SetupFinishNotificationParams): void {
+// A caller waits on a child through one armed notification. Arming again, such as a
+// follow-up prompt while the child still runs, replaces the earlier one so the child's
+// next finish reaches the caller once.
+const armedFinishNotifications = new WeakMap<AgentManager, Map<string, () => void>>();
+
+export function setupFinishNotification(params: SetupFinishNotificationParams): () => void {
   const {
     agentManager,
     agentStorage,
     childAgentId,
     callerAgentId,
     requireParentOwnership = false,
+    waitForTurnStart = false,
     logger,
   } = params;
   let hasSeenRunning = false;
+  let hasSeenTurn = false;
   let stopped = false;
   const notifiedPermissionRequestIds = new Set<string>();
   let unsubscribe: (() => void) | null = null;
   let notificationQueue = Promise.resolve();
 
+  const armedByManager = armedFinishNotifications.get(agentManager) ?? new Map();
+  armedFinishNotifications.set(agentManager, armedByManager);
+  const armedKey = JSON.stringify([childAgentId, callerAgentId]);
+  armedByManager.get(armedKey)?.();
+  armedByManager.set(armedKey, stop);
+
   function stop(): void {
     if (stopped) return;
     stopped = true;
     unsubscribe?.();
+    if (armedByManager.get(armedKey) === stop) {
+      armedByManager.delete(armedKey);
+    }
   }
 
   async function notify(
@@ -430,7 +530,12 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       agentManager,
       agentStorage,
       agentId: callerAgentId,
-      prompt: formatSystemNotificationPrompt(body),
+      prompt: body,
+      source: {
+        kind: "agent-notification",
+        agentId: childAgentId,
+        event: finishNotificationEvents[reason],
+      },
       activeTurnBehavior: "steer",
       unarchive: false,
       logger,
@@ -450,6 +555,35 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       });
   }
 
+  function observeState(agent: ManagedAgent): void {
+    for (const requestId of notifiedPermissionRequestIds) {
+      if (!agent.pendingPermissions.has(requestId)) {
+        notifiedPermissionRequestIds.delete(requestId);
+      }
+    }
+    if (agent.lifecycle === "running") {
+      if (waitForTurnStart && !hasSeenTurn) return;
+      hasSeenTurn = true;
+      if (agent.pendingPermissions.size === 0) {
+        hasSeenRunning = true;
+      }
+      return;
+    }
+    // Prior terminal state is not this task's outcome. A failure before turn start
+    // is reported by the dispatch acknowledgement instead of a finish callback.
+    if (agent.lifecycle === "error" && hasSeenTurn) {
+      notifySafely("errored");
+      return;
+    }
+    // Idle is published before the terminal stream event for both completion
+    // and cancellation. Let that event identify the outcome instead.
+    if (agent.lifecycle === "closed") {
+      notifySafely("was closed");
+      return;
+    }
+    return;
+  }
+
   unsubscribe = agentManager.subscribe(
     (event) => {
       if (stopped) {
@@ -457,29 +591,7 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       }
 
       if (event.type === "agent_state") {
-        for (const requestId of notifiedPermissionRequestIds) {
-          if (!event.agent.pendingPermissions.has(requestId)) {
-            notifiedPermissionRequestIds.delete(requestId);
-          }
-        }
-        if (event.agent.lifecycle === "running") {
-          if (event.agent.pendingPermissions.size === 0) {
-            hasSeenRunning = true;
-          }
-          return;
-        }
-        if (event.agent.lifecycle === "error") {
-          notifySafely("errored");
-          return;
-        }
-        if (event.agent.lifecycle === "idle" && hasSeenRunning) {
-          notifySafely("finished");
-          return;
-        }
-        if (event.agent.lifecycle === "closed") {
-          notifySafely("was closed");
-          return;
-        }
+        observeState(event.agent);
         return;
       }
 
@@ -487,6 +599,24 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
         return;
       }
 
+      if (event.event.type === "turn_started") {
+        hasSeenTurn = true;
+        hasSeenRunning = true;
+        return;
+      }
+
+      if (event.event.type === "turn_completed" || event.event.type === "turn_canceled") {
+        // Replacing a turn keeps the child running through the displaced turn's
+        // cancellation. The task settles only when the child becomes idle.
+        if (agentManager.getAgent(childAgentId)?.lifecycle !== "idle") return;
+        if (event.event.type === "turn_completed" && hasSeenRunning) {
+          notifySafely("finished");
+        } else if (event.event.type === "turn_canceled" && hasSeenTurn) {
+          notifySafely("was canceled");
+        }
+        return;
+      }
+
       if (event.event.type === "permission_requested") {
         // A permission pause is an intermediate checkpoint. Forget the run
         // observed before it so an idle state during follow-up startup cannot
@@ -521,11 +651,11 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
   const childSnapshot = agentManager.getAgent(childAgentId);
   if (!childSnapshot || childSnapshot.lifecycle === "closed") {
     stop();
-    return;
+    return stop;
   }
-  if (childSnapshot.lifecycle === "running") {
+  if (childSnapshot.lifecycle === "running" && !waitForTurnStart) {
+    hasSeenTurn = true;
     hasSeenRunning = true;
-  } else if (childSnapshot.lifecycle === "error") {
-    notifySafely("errored");
   }
+  return stop;
 }
diff --git a/packages/server/src/server/agent/agent-response-loop.real.e2e.test.ts b/packages/server/src/server/agent/agent-response-loop.real.e2e.test.ts
index ec9dbfdb10..a92e547edc 100644
--- a/packages/server/src/server/agent/agent-response-loop.real.e2e.test.ts
+++ b/packages/server/src/server/agent/agent-response-loop.real.e2e.test.ts
@@ -1,6 +1,6 @@
 import { describe, test, expect, beforeEach, afterEach, beforeAll, afterAll } from "vitest";
 import { createServer } from "http";
-import { mkdtempSync, rmSync } from "fs";
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { randomUUID } from "crypto";
@@ -250,4 +250,39 @@ describe("getStructuredAgentResponse (e2e)", () => {
 
     expect(result.message.trim().toLowerCase()).toBe("hello");
   }, 180000);
+
+  test("does not run the project's Claude hooks for an internal Claude agent", async (context) => {
+    if (!canRunClaude) {
+      context.skip();
+    }
+    const hookMarker = path.join(cwd, "stop-hook-ran");
+    mkdirSync(path.join(cwd, ".claude"));
+    writeFileSync(
+      path.join(cwd, ".claude", "settings.json"),
+      JSON.stringify({
+        hooks: {
+          Stop: [{ hooks: [{ type: "command", command: `touch '${hookMarker}'` }] }],
+        },
+      }),
+    );
+
+    const result = await generateStructuredAgentResponse({
+      manager,
+      agentConfig: {
+        provider: "claude",
+        model: CLAUDE_TEST_MODEL,
+        cwd,
+        title: "Branch name generator",
+        internal: true,
+      },
+      prompt:
+        'Respond with exactly this JSON (no markdown, no extra keys, no extra text): {"message":"hello"}',
+      schema: z.object({ message: z.string() }),
+      maxRetries: 2,
+      persistSession: false,
+    });
+
+    expect(result.message.trim().toLowerCase()).toBe("hello");
+    expect(existsSync(hookMarker)).toBe(false);
+  }, 180000);
 });
diff --git a/packages/server/src/server/agent/agent-sdk-types.ts b/packages/server/src/server/agent/agent-sdk-types.ts
index c916228020..34d36c9e16 100644
--- a/packages/server/src/server/agent/agent-sdk-types.ts
+++ b/packages/server/src/server/agent/agent-sdk-types.ts
@@ -1,4 +1,7 @@
 import type {
+  AgentFeature,
+  AgentFeatureSelect,
+  AgentFeatureToggle,
   AgentProviderNotice,
   AgentTaskItem,
   JsonValue,
@@ -8,7 +11,13 @@ import type {
 import type { AgentAttachment } from "@getpaseo/protocol/messages";
 import type { PaseoToolCatalog } from "./tools/types.js";
 
-export type { AgentProviderNotice, AgentTaskItem };
+export type {
+  AgentFeature,
+  AgentFeatureSelect,
+  AgentFeatureToggle,
+  AgentProviderNotice,
+  AgentTaskItem,
+};
 
 export type AgentProvider = string;
 
@@ -125,6 +134,7 @@ export interface ProviderSnapshotEntry {
   fetchedAt?: string;
   label?: string;
   description?: string;
+  iconSvg?: string;
   defaultModeId?: string | null;
 }
 
@@ -155,29 +165,6 @@ export interface AgentCreateConfigUnattendedInput {
   availableModes: AgentMode[];
 }
 
-export interface AgentFeatureToggle {
-  type: "toggle";
-  id: string;
-  label: string;
-  description?: string;
-  tooltip?: string;
-  icon?: string;
-  value: boolean;
-}
-
-export interface AgentFeatureSelect {
-  type: "select";
-  id: string;
-  label: string;
-  description?: string;
-  tooltip?: string;
-  icon?: string;
-  value: string | null;
-  options: AgentSelectOption[];
-}
-
-export type AgentFeature = AgentFeatureToggle | AgentFeatureSelect;
-
 export interface AgentCapabilityFlags {
   [capability: string]: boolean | undefined;
   supportsStreaming: boolean;
@@ -407,6 +394,11 @@ export type AgentTimelineItem =
   | ToolCallTimelineItem
   | { type: "todo"; items: AgentTaskItem[] }
   | { type: "error"; message: string }
+  | {
+      type: "notification";
+      level: "info" | "warning" | "error";
+      message: string;
+    }
   | CompactionTimelineItem
   | PluginTimelineItem;
 
@@ -543,6 +535,7 @@ export interface AgentSlashCommand {
 }
 
 export interface ListImportableSessionsOptions {
+  providerOptions?: ProviderOptions;
   limit?: number;
   /** Optional case-insensitive descriptor search text. */
   query?: string;
@@ -635,12 +628,22 @@ export interface AgentCreateSessionOptions {
    * Defaults to true. Providers that cannot honor false should no-op.
    */
   persistSession?: boolean;
+  /**
+   * Model ids added by provider configuration (`models` / `additionalModels`).
+   * Providers that validate against runtime-advertised models must accept these.
+   */
+  configuredModelIds?: readonly string[];
 }
 
+/** What a resumed session is for: driving the agent, or reading what it already did. */
+export type AgentResumePurpose = "interactive" | "history";
+
 /** Runtime-only intent for a persisted-session resume. Never persist this option. */
 export interface AgentResumeSessionOptions {
   /** Defaults to interactive. History loading may be read-only for archived native sessions. */
-  purpose?: "interactive" | "history";
+  purpose?: AgentResumePurpose;
+  /** See AgentCreateSessionOptions.configuredModelIds. */
+  configuredModelIds?: readonly string[];
 }
 
 /**
@@ -651,11 +654,22 @@ export interface AgentPermissionResult {
   followUpPrompt?: AgentPromptInput;
 }
 
+export interface AgentUsageSession {
+  provider: string;
+  model?: string;
+  env: Record<string, string>;
+  sessionKey: string;
+}
+
 export interface AgentSession {
+  usageSession?(): AgentUsageSession | null;
   readonly provider: AgentProvider;
   readonly id: string | null;
   readonly capabilities: AgentCapabilityFlags;
   readonly features?: AgentFeature[];
+  /** New provider-owned rows to commit on registration. streamHistory must also
+   * replay them at their original timestamps; restored sessions omit old rows. */
+  readonly initialTimeline?: ImportedTimelineEntry[];
   run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult>;
   startTurn(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<{ turnId: string }>;
   steerActiveTurn?(prompt: AgentPromptInput, options: SteerActiveTurnOptions): Promise<SteerResult>;
@@ -699,7 +713,7 @@ export interface AgentSession {
   } | null;
 }
 
-export type FetchCatalogOptions =
+export type FetchCatalogOptions = { providerOptions?: ProviderOptions } & (
   | {
       scope: "global";
       force: boolean;
@@ -708,7 +722,8 @@ export type FetchCatalogOptions =
       scope: "workspace";
       cwd: string;
       force: boolean;
-    };
+    }
+);
 
 export interface ProviderRefreshContext {
   readonly signal: AbortSignal;
@@ -742,6 +757,10 @@ export interface AgentClient {
     launchContext?: AgentLaunchContext,
     options?: AgentResumeSessionOptions,
   ): Promise<AgentSession>;
+  /** Equal keys share availability and catalogue discovery within this configured client.
+   * Include the execution environment and effective configuration; omit to use target identity.
+   * force must not affect identity. Resolve before every cache lookup. */
+  getCatalogCacheKey?(options: FetchCatalogOptions): Promise<string | undefined>;
   /**
    * Discover models and modes together. Implementations may use one upstream
    * process, separate upstream calls, static modes, or private helpers; callers
@@ -769,10 +788,10 @@ export interface AgentClient {
     context: ImportProviderSessionContext,
   ): Promise<ImportedProviderSession>;
   /**
-   * Check if this provider is available (CLI binary is installed).
+   * Check availability in the catalogue target when supplied (CLI binary is installed).
    * Returns true if available, false otherwise.
    */
-  isAvailable(signal?: AbortSignal): Promise<boolean>;
+  isAvailable(signal?: AbortSignal, options?: FetchCatalogOptions): Promise<boolean>;
   getDiagnostic?(): Promise<{ diagnostic: string }>;
   /**
    * Archive a durable native session (best-effort). Runtime release belongs to AgentSession.close().
diff --git a/packages/server/src/server/agent/agent-storage.ts b/packages/server/src/server/agent/agent-storage.ts
index b41bc75cfc..be94a31d49 100644
--- a/packages/server/src/server/agent/agent-storage.ts
+++ b/packages/server/src/server/agent/agent-storage.ts
@@ -16,7 +16,7 @@ const SERIALIZABLE_CONFIG_SCHEMA = z
     model: z.string().nullable().optional(),
     thinkingOptionId: z.string().nullable().optional(),
     featureValues: z.record(z.string(), z.unknown()).nullable().optional(),
-    providerOptions: z.record(z.string(), z.json()).nullable().optional(),
+    providerOptions: z.record(z.string(), z.unknown()).nullable().optional(),
     toolPolicy: z
       .object({
         preapproved: z.array(
diff --git a/packages/server/src/server/agent/agent-stream-coalescer.test.ts b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
index c48a5ec8e4..1cdf4bf375 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.test.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
@@ -723,6 +723,57 @@ describe("AgentStreamCoalescer", () => {
     ]);
   });
 
+  test("keeps a known tool call detail when a later update in the window has none", () => {
+    const { coalescer, flushes } = createHarness();
+    primeLeadingEdge(coalescer, flushes);
+
+    coalescer.handle(
+      "agent-1",
+      timeline({
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Task",
+        status: "running",
+        error: null,
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
+          description: "List files",
+          log: "",
+          actions: [],
+        },
+      }),
+    );
+    coalescer.handle(
+      "agent-1",
+      timeline({
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Agent",
+        status: "completed",
+        error: null,
+        detail: { type: "unknown", input: { description: "List files" }, output: null },
+      }),
+    );
+
+    expect(flushes.map((flush) => flush.item)).toEqual([
+      {
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Agent",
+        status: "completed",
+        error: null,
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
+          description: "List files",
+          log: "",
+          actions: [],
+        },
+      },
+    ]);
+  });
+
   test("preserves mixed text and tool call arrival order within a flush", async () => {
     const { coalescer, flushes } = createHarness();
     primeLeadingEdge(coalescer, flushes);
diff --git a/packages/server/src/server/agent/agent-stream-coalescer.ts b/packages/server/src/server/agent/agent-stream-coalescer.ts
index ca52a5479e..c11d968228 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.ts
@@ -1,4 +1,5 @@
 import type { AgentProvider, AgentStreamEvent, AgentTimelineItem } from "./agent-sdk-types.js";
+import { mergeToolCallItems } from "./timeline-projection.js";
 
 export const AGENT_STREAM_COALESCE_DEFAULT_WINDOW_MS = 60;
 
@@ -183,9 +184,16 @@ export class AgentStreamCoalescer {
     }
 
     const existingIndex = buffer.toolCallEntryIndexes.get(event.item.callId);
+    const existing = existingIndex !== undefined ? buffer.entries[existingIndex] : undefined;
+    // Merge rather than replace, so an update that carries less (an unknown detail after a
+    // labeled one) cannot erase what the timeline would have kept had both been flushed.
+    let item = event.item;
+    if (existing?.kind === "tool_call") {
+      item = mergeToolCallItems(existing.item, event.item);
+    }
     const entry: PendingToolCallEntry = {
       kind: "tool_call",
-      item: event.item,
+      item,
       provider: event.provider,
       ...(event.turnId !== undefined ? { turnId: event.turnId } : {}),
     };
diff --git a/packages/server/src/server/agent/agent-timeline-content.test.ts b/packages/server/src/server/agent/agent-timeline-content.test.ts
index f3b94e248e..c40b712fad 100644
--- a/packages/server/src/server/agent/agent-timeline-content.test.ts
+++ b/packages/server/src/server/agent/agent-timeline-content.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest";
 import { limitAgentTimelineItemContent } from "./agent-timeline-content.js";
 
 describe("agent timeline content", () => {
-  test("limits terminal input to the tool-call content budget", () => {
+  test("marks truncated plain-text tool content within the content budget", () => {
     const oversizedInput = "x".repeat(64 * 1024 + 1);
 
     const item = limitAgentTimelineItemContent({
@@ -19,6 +19,7 @@ describe("agent timeline content", () => {
       },
     });
 
+    expect(limitAgentTimelineItemContent(item)).toEqual(item);
     expect(item).toEqual({
       type: "tool_call",
       callId: "terminal-session-4242",
@@ -27,7 +28,7 @@ describe("agent timeline content", () => {
       error: null,
       detail: {
         type: "plain_text",
-        text: "x".repeat(64 * 1024),
+        text: "x".repeat(64 * 1024 - "\n\n[Content truncated]".length) + "\n\n[Content truncated]",
         icon: "square_terminal",
       },
     });
diff --git a/packages/server/src/server/agent/agent-timeline-content.ts b/packages/server/src/server/agent/agent-timeline-content.ts
index 8cf92381fa..d9bb08c0bc 100644
--- a/packages/server/src/server/agent/agent-timeline-content.ts
+++ b/packages/server/src/server/agent/agent-timeline-content.ts
@@ -42,11 +42,12 @@ function limitPlainText(item: AgentTimelineItem): AgentTimelineItem {
   ) {
     return item;
   }
+  const notice = "\n\n[Content truncated]";
   return {
     ...item,
     detail: {
       ...item.detail,
-      text: item.detail.text.slice(0, TOOL_CALL_CONTENT_MAX_LENGTH),
+      text: item.detail.text.slice(0, TOOL_CALL_CONTENT_MAX_LENGTH - notice.length) + notice,
     },
   };
 }
diff --git a/packages/server/src/server/agent/agent-timeline-store-types.ts b/packages/server/src/server/agent/agent-timeline-store-types.ts
index d73f52299c..639b24a904 100644
--- a/packages/server/src/server/agent/agent-timeline-store-types.ts
+++ b/packages/server/src/server/agent/agent-timeline-store-types.ts
@@ -1,3 +1,4 @@
+import type { ProjectedTimelineRow } from "./timeline-projection.js";
 import type { AgentTimelineItem } from "./agent-sdk-types.js";
 
 export interface AgentTimelineRow {
@@ -19,7 +20,7 @@ export interface AgentTimelineFetchOptions {
   direction?: AgentTimelineFetchDirection;
   cursor?: AgentTimelineCursor;
   /**
-   * Number of canonical rows to return.
+   * Number of projected items to return.
    * - undefined: store default
    * - 0: all rows in the selected window
    */
@@ -41,7 +42,9 @@ export interface AgentTimelineFetchResult {
   window: AgentTimelineWindow;
   hasOlder: boolean;
   hasNewer: boolean;
-  rows: AgentTimelineRow[];
+  startSeq: number | null;
+  endSeq: number | null;
+  rows: ProjectedTimelineRow[];
 }
 
 export interface AgentTimelineStore {
diff --git a/packages/server/src/server/agent/agent-timeline-store.test.ts b/packages/server/src/server/agent/agent-timeline-store.test.ts
index 2f801e0271..895aec2684 100644
--- a/packages/server/src/server/agent/agent-timeline-store.test.ts
+++ b/packages/server/src/server/agent/agent-timeline-store.test.ts
@@ -11,17 +11,17 @@ describe("InMemoryAgentTimelineStore", () => {
         {
           seq: 5,
           timestamp: "2026-01-01T00:00:00.000Z",
-          item: { type: "assistant_message", text: "five" },
+          item: { type: "assistant_message", text: "five", messageId: "five" },
         },
         {
           seq: 6,
           timestamp: "2026-01-01T00:00:01.000Z",
-          item: { type: "assistant_message", text: "six" },
+          item: { type: "assistant_message", text: "six", messageId: "six" },
         },
         {
           seq: 7,
           timestamp: "2026-01-01T00:00:02.000Z",
-          item: { type: "assistant_message", text: "seven" },
+          item: { type: "assistant_message", text: "seven", messageId: "seven" },
         },
       ],
     });
@@ -32,7 +32,7 @@ describe("InMemoryAgentTimelineStore", () => {
       limit: 2,
     });
 
-    expect(result).toEqual({
+    expect(result).toMatchObject({
       epoch: "epoch-1",
       direction: "before",
       reset: false,
@@ -45,12 +45,12 @@ describe("InMemoryAgentTimelineStore", () => {
         {
           seq: 6,
           timestamp: "2026-01-01T00:00:01.000Z",
-          item: { type: "assistant_message", text: "six" },
+          item: { type: "assistant_message", text: "six", messageId: "six" },
         },
         {
           seq: 7,
           timestamp: "2026-01-01T00:00:02.000Z",
-          item: { type: "assistant_message", text: "seven" },
+          item: { type: "assistant_message", text: "seven", messageId: "seven" },
         },
       ],
     });
@@ -65,17 +65,17 @@ describe("InMemoryAgentTimelineStore", () => {
         {
           seq: 5,
           timestamp: "2026-01-01T00:00:00.000Z",
-          item: { type: "assistant_message", text: "five" },
+          item: { type: "assistant_message", text: "five", messageId: "five" },
         },
         {
           seq: 6,
           timestamp: "2026-01-01T00:00:01.000Z",
-          item: { type: "assistant_message", text: "six" },
+          item: { type: "assistant_message", text: "six", messageId: "six" },
         },
         {
           seq: 7,
           timestamp: "2026-01-01T00:00:02.000Z",
-          item: { type: "assistant_message", text: "seven" },
+          item: { type: "assistant_message", text: "seven", messageId: "seven" },
         },
       ],
     });
@@ -86,7 +86,7 @@ describe("InMemoryAgentTimelineStore", () => {
       limit: 1,
     });
 
-    expect(result).toEqual({
+    expect(result).toMatchObject({
       epoch: "epoch-1",
       direction: "after",
       reset: true,
@@ -99,9 +99,115 @@ describe("InMemoryAgentTimelineStore", () => {
         {
           seq: 7,
           timestamp: "2026-01-01T00:00:02.000Z",
-          item: { type: "assistant_message", text: "seven" },
+          item: { type: "assistant_message", text: "seven", messageId: "seven" },
         },
       ],
     });
   });
 });
+
+describe("projected timeline retention", () => {
+  it("retains one full tool state while streaming every source update", () => {
+    const store = new InMemoryAgentTimelineStore();
+    store.initialize("agent");
+    for (let seq = 1; seq <= 2000; seq++) {
+      const item = {
+        type: "tool_call" as const,
+        callId: "child",
+        name: "task",
+        status: "running" as const,
+        error: null,
+        detail: { type: "plain_text" as const, label: "Child", text: "x".repeat(seq * 128) },
+      };
+      expect(store.append("agent", item)).toMatchObject({ seq, item });
+    }
+    const result = store.fetch("agent", { limit: 0 });
+    expect(result.rows).toHaveLength(1);
+    expect(JSON.stringify(result.rows).length).toBeLessThan(260_000);
+    expect(result.window.maxSeq).toBe(2000);
+  });
+
+  it("catches up a mid-message cursor with the complete projected message", () => {
+    const store = new InMemoryAgentTimelineStore();
+    store.initialize("agent", { epoch: "e" });
+    store.append("agent", { type: "assistant_message", messageId: "m", text: "A" });
+    store.append("agent", { type: "assistant_message", messageId: "m", text: "B" });
+    expect(
+      store.fetch("agent", { direction: "after", cursor: { epoch: "e", seq: 1 } }).rows,
+    ).toMatchObject([
+      {
+        item: { text: "AB" },
+        seqStart: 1,
+        seqEnd: 2,
+        sourceSeqRanges: [{ startSeq: 1, endSeq: 2 }],
+      },
+    ]);
+  });
+});
+
+describe("projected sequence ownership", () => {
+  it("preserves fetched coverage when another source chunk arrives", () => {
+    const store = new InMemoryAgentTimelineStore();
+    store.initialize("a");
+    store.append("a", { type: "assistant_message", text: "A" });
+    const before = store.fetch("a");
+    store.append("a", { type: "assistant_message", text: "B" });
+    expect(before.rows[0]).toMatchObject({
+      item: { text: "A" },
+      seqEnd: 1,
+      sourceSeqRanges: [{ startSeq: 1, endSeq: 1 }],
+    });
+    expect(store.fetch("a").rows[0]).toMatchObject({
+      item: { text: "AB" },
+      seqEnd: 2,
+      sourceSeqRanges: [{ startSeq: 1, endSeq: 2 }],
+    });
+  });
+  it("preserves source positions when seeding a projected history whose last update is an earlier tool", () => {
+    const store = new InMemoryAgentTimelineStore();
+    store.initialize("a");
+    const tool = {
+      type: "tool_call" as const,
+      callId: "t",
+      name: "shell",
+      error: null,
+      detail: { type: "plain_text" as const, label: "work" },
+    };
+    store.append("a", { ...tool, status: "running" });
+    store.append("a", { type: "assistant_message", text: "Answer" });
+    store.append("a", { ...tool, status: "completed" });
+    store.initialize("b", { rows: store.getRows("a") });
+    expect(store.append("b", { type: "user_message", text: "next" }).seq).toBe(4);
+    expect(store.fetch("b").rows.map((row) => row.seqStart)).toEqual([1, 2, 4]);
+  });
+  it("returns the last projected assistant message without joining different messages", () => {
+    const store = new InMemoryAgentTimelineStore();
+    store.initialize("a");
+    store.append("a", { type: "assistant_message", messageId: "first", text: "First" });
+    store.append("a", { type: "assistant_message", messageId: "second", text: "Sec" });
+    store.append("a", { type: "assistant_message", messageId: "second", text: "ond" });
+    expect(store.getLastAssistantMessage("a")).toBe("Second");
+  });
+});
+
+it("includes transitive tool updates in a contiguous projected tail", () => {
+  const store = new InMemoryAgentTimelineStore();
+  store.initialize("a");
+  const tool = (callId: string, status: "running" | "completed") => ({
+    type: "tool_call" as const,
+    callId,
+    name: "shell",
+    status,
+    error: null,
+    detail: { type: "plain_text" as const, label: "work" },
+  });
+  store.append("a", tool("first", "running"));
+  store.append("a", tool("second", "running"));
+  store.append("a", { type: "user_message", text: "Continue" });
+  store.append("a", tool("first", "completed"));
+  store.append("a", { type: "assistant_message", text: "Answer" });
+  store.append("a", tool("second", "completed"));
+  const tail = store.fetch("a", { limit: 1 });
+  expect(tail.rows.map((row) => row.seqStart)).toEqual([1, 2, 3, 5]);
+  expect(tail).toMatchObject({ startSeq: 1, endSeq: 6, hasOlder: false });
+});
diff --git a/packages/server/src/server/agent/agent-timeline-store.ts b/packages/server/src/server/agent/agent-timeline-store.ts
index e57080711a..6a37e11ef0 100644
--- a/packages/server/src/server/agent/agent-timeline-store.ts
+++ b/packages/server/src/server/agent/agent-timeline-store.ts
@@ -1,4 +1,9 @@
 import { randomUUID } from "node:crypto";
+import {
+  TimelineProjection,
+  selectProjectedTimelinePage,
+  type ProjectedTimelineRow,
+} from "./timeline-projection.js";
 import type { AgentTimelineItem } from "./agent-sdk-types.js";
 import type {
   AgentTimelineFetchOptions,
@@ -16,125 +21,15 @@ export interface SeedAgentTimelineOptions {
 
 interface AgentTimelineState {
   epoch: string;
-  rows: AgentTimelineRow[];
+  projection: TimelineProjection;
+  minSeq: number;
   nextSeq: number;
 }
-
 const DEFAULT_TIMELINE_FETCH_LIMIT = 200;
-
-function cloneRow(row: AgentTimelineRow): AgentTimelineRow {
+function cloneRow<T extends AgentTimelineRow>(row: T): T {
   return { ...row };
 }
 
-interface FetchContext {
-  state: AgentTimelineState;
-  direction: NonNullable<AgentTimelineFetchOptions["direction"]>;
-  limit: number;
-  selectAll: boolean;
-  cursor: AgentTimelineFetchOptions["cursor"];
-  minSeq: number;
-  maxSeq: number;
-  window: { minSeq: number; maxSeq: number; nextSeq: number };
-}
-
-function fetchTail(ctx: FetchContext): AgentTimelineFetchResult {
-  const { state, direction, limit, selectAll, minSeq, window } = ctx;
-  const selected =
-    selectAll || limit >= state.rows.length
-      ? state.rows
-      : state.rows.slice(state.rows.length - limit);
-  return {
-    epoch: state.epoch,
-    direction,
-    reset: false,
-    staleCursor: false,
-    gap: false,
-    window,
-    hasOlder: selected.length > 0 && selected[0].seq > minSeq,
-    hasNewer: false,
-    rows: selected.map(cloneRow),
-  };
-}
-
-function fetchAfter(ctx: FetchContext): AgentTimelineFetchResult {
-  const { state, direction, limit, selectAll, cursor, minSeq, maxSeq, window } = ctx;
-  const baseSeq = cursor?.seq ?? 0;
-  const startIdx = state.rows.findIndex((row) => row.seq > baseSeq);
-  if (startIdx < 0) {
-    return {
-      epoch: state.epoch,
-      direction,
-      reset: false,
-      staleCursor: false,
-      gap: false,
-      window,
-      hasOlder: baseSeq >= minSeq,
-      hasNewer: false,
-      rows: [],
-    };
-  }
-
-  const selected = selectAll
-    ? state.rows.slice(startIdx)
-    : state.rows.slice(startIdx, startIdx + limit);
-  const lastSelected = selected[selected.length - 1];
-  return {
-    epoch: state.epoch,
-    direction,
-    reset: false,
-    staleCursor: false,
-    gap: false,
-    window,
-    hasOlder: selected[0].seq > minSeq,
-    hasNewer: lastSelected !== null && lastSelected !== undefined && lastSelected.seq < maxSeq,
-    rows: selected.map(cloneRow),
-  };
-}
-
-function fetchBefore(ctx: FetchContext): AgentTimelineFetchResult {
-  const { state, direction, limit, selectAll, cursor, minSeq, window } = ctx;
-  const beforeSeq = cursor?.seq ?? state.nextSeq;
-  const endExclusive = state.rows.findIndex((row) => row.seq >= beforeSeq);
-  const boundedRows = endExclusive < 0 ? state.rows : state.rows.slice(0, endExclusive);
-  const selected =
-    selectAll || limit >= boundedRows.length
-      ? boundedRows
-      : boundedRows.slice(boundedRows.length - limit);
-  return {
-    epoch: state.epoch,
-    direction,
-    reset: false,
-    staleCursor: false,
-    gap: false,
-    window,
-    hasOlder: selected.length > 0 && selected[0].seq > minSeq,
-    hasNewer: endExclusive >= 0,
-    rows: selected.map(cloneRow),
-  };
-}
-
-function fetchReset(
-  ctx: FetchContext,
-  flags: { staleCursor: boolean; gap: boolean },
-): AgentTimelineFetchResult {
-  const { state, direction, limit, selectAll, minSeq, window } = ctx;
-  const rows =
-    selectAll || limit >= state.rows.length
-      ? state.rows.map(cloneRow)
-      : state.rows.slice(state.rows.length - limit).map(cloneRow);
-  return {
-    epoch: state.epoch,
-    direction,
-    reset: true,
-    staleCursor: flags.staleCursor,
-    gap: flags.gap,
-    window,
-    hasOlder: rows.length > 0 && rows[0].seq > minSeq,
-    hasNewer: false,
-    rows,
-  };
-}
-
 export class InMemoryAgentTimelineStore {
   private readonly states = new Map<string, AgentTimelineState>();
 
@@ -147,10 +42,13 @@ export class InMemoryAgentTimelineStore {
     const rows = options?.rows?.length
       ? options.rows.map(cloneRow)
       : this.buildRowsFromItems(options?.items ?? [], options?.nextSeq ?? 1, timestamp);
-    const nextSeq = options?.nextSeq ?? (rows.length ? rows[rows.length - 1].seq + 1 : 1);
+    const nextSeq = rows.reduce((next, row) => Math.max(next, row.seq + 1), options?.nextSeq ?? 1);
+    const projection = new TimelineProjection();
+    for (const row of rows) projection.append(row);
     this.states.set(agentId, {
       epoch: options?.epoch ?? randomUUID(),
-      rows,
+      projection,
+      minSeq: projection.getRows()[0]?.seqStart ?? 0,
       nextSeq,
     });
   }
@@ -160,19 +58,23 @@ export class InMemoryAgentTimelineStore {
   }
 
   getItems(agentId: string): AgentTimelineItem[] {
-    return this.requireState(agentId).rows.map((row) => row.item);
+    return this.requireState(agentId)
+      .projection.getRows()
+      .map((row) => row.item);
   }
 
-  getRows(agentId: string): AgentTimelineRow[] {
-    return this.requireState(agentId).rows.map(cloneRow);
+  getRows(agentId: string): ProjectedTimelineRow[] {
+    return this.requireState(agentId).projection.getRows().map(cloneRow);
   }
 
   getSubmittedUserMessage(agentId: string, clientMessageId: string): AgentTimelineRow | null {
-    const row = this.requireState(agentId).rows.find(
-      (candidate) =>
-        candidate.item.type === "user_message" &&
-        candidate.item.clientMessageId === clientMessageId,
-    );
+    const row = this.requireState(agentId)
+      .projection.getRows()
+      .find(
+        (candidate) =>
+          candidate.item.type === "user_message" &&
+          candidate.item.clientMessageId === clientMessageId,
+      );
     return row ? cloneRow(row) : null;
   }
 
@@ -181,19 +83,10 @@ export class InMemoryAgentTimelineStore {
     clientMessageId: string,
     providerMessageId: string,
   ): AgentTimelineRow | null {
-    const state = this.requireState(agentId);
-    const index = state.rows.findIndex(
-      (candidate) =>
-        candidate.item.type === "user_message" &&
-        candidate.item.clientMessageId === clientMessageId,
+    return this.requireState(agentId).projection.enrichSubmittedUserMessage(
+      clientMessageId,
+      providerMessageId,
     );
-    const row = state.rows[index];
-    if (!row || row.item.type !== "user_message") {
-      return null;
-    }
-    const enriched: AgentTimelineRow = { ...row, providerMessageId };
-    state.rows[index] = enriched;
-    return cloneRow(enriched);
   }
 
   getEpoch(agentId: string): string {
@@ -203,62 +96,37 @@ export class InMemoryAgentTimelineStore {
   fetch(agentId: string, options?: AgentTimelineFetchOptions): AgentTimelineFetchResult {
     const state = this.requireState(agentId);
     const direction = options?.direction ?? "tail";
-    const requestedLimit = options?.limit;
-    const limit =
-      requestedLimit === undefined
-        ? DEFAULT_TIMELINE_FETCH_LIMIT
-        : Math.max(0, Math.floor(requestedLimit));
     const cursor = options?.cursor;
-    const minSeq = state.rows.length ? state.rows[0].seq : 0;
-    const maxSeq = state.rows.length ? state.rows[state.rows.length - 1].seq : 0;
-    const selectAll = limit === 0;
-
-    const window = {
-      minSeq,
-      maxSeq,
-      nextSeq: state.nextSeq,
-    };
-
-    const ctx: FetchContext = {
-      state,
+    const rows = state.projection.getRows();
+    const window = { minSeq: state.minSeq, maxSeq: state.nextSeq - 1, nextSeq: state.nextSeq };
+    const staleCursor = cursor !== undefined && cursor.epoch !== state.epoch;
+    const gap =
+      !staleCursor &&
+      direction === "after" &&
+      cursor !== undefined &&
+      rows.length > 0 &&
+      cursor.seq < state.minSeq - 1;
+    const reset = staleCursor || gap;
+    const page = selectProjectedTimelinePage({
+      rows,
+      bounds: window,
+      direction: reset ? "tail" : direction,
+      cursorSeq: cursor?.seq,
+      limit: options?.limit ?? DEFAULT_TIMELINE_FETCH_LIMIT,
+    });
+    return {
+      epoch: state.epoch,
       direction,
-      limit,
-      selectAll,
-      cursor,
-      minSeq,
-      maxSeq,
+      reset,
+      staleCursor,
+      gap,
       window,
+      hasOlder: page.hasOlder,
+      hasNewer: page.hasNewer,
+      startSeq: page.startSeq,
+      endSeq: page.endSeq,
+      rows: page.entries.map((entry) => Object.assign({ seq: entry.seqEnd }, entry)),
     };
-
-    if (cursor && typeof cursor.epoch === "string" && cursor.epoch !== state.epoch) {
-      return fetchReset(ctx, { staleCursor: true, gap: false });
-    }
-
-    if (direction === "after" && cursor && state.rows.length > 0 && cursor.seq < minSeq - 1) {
-      return fetchReset(ctx, { staleCursor: false, gap: true });
-    }
-
-    if (state.rows.length === 0) {
-      return {
-        epoch: state.epoch,
-        direction,
-        reset: false,
-        staleCursor: false,
-        gap: false,
-        window,
-        hasOlder: false,
-        hasNewer: false,
-        rows: [],
-      };
-    }
-
-    if (direction === "tail") {
-      return fetchTail(ctx);
-    }
-    if (direction === "after") {
-      return fetchAfter(ctx);
-    }
-    return fetchBefore(ctx);
   }
 
   append(
@@ -275,34 +143,21 @@ export class InMemoryAgentTimelineStore {
       ...(options?.providerMessageId ? { providerMessageId: options.providerMessageId } : {}),
     };
     state.nextSeq += 1;
-    state.rows.push(row);
+    if (state.minSeq === 0) state.minSeq = row.seq;
+    state.projection.append(row);
     return cloneRow(row);
   }
 
   getLastItem(agentId: string): AgentTimelineItem | null {
     const state = this.requireState(agentId);
-    return state.rows[state.rows.length - 1]?.item ?? null;
+    return state.projection.getRows().find((row) => row.seqEnd === state.nextSeq - 1)?.item ?? null;
   }
 
   getLastAssistantMessage(agentId: string): string | null {
-    const rows = this.requireState(agentId).rows;
-    const chunks: string[] = [];
-    for (let i = rows.length - 1; i >= 0; i -= 1) {
-      const item = rows[i].item;
-      if (item.type !== "assistant_message") {
-        if (chunks.length > 0) {
-          break;
-        }
-        continue;
-      }
-      chunks.push(item.text);
-    }
-
-    if (chunks.length === 0) {
-      return null;
-    }
-
-    return chunks.toReversed().join("");
+    const row = this.requireState(agentId)
+      .projection.getRows()
+      .findLast((candidate) => candidate.item.type === "assistant_message");
+    return row?.item.type === "assistant_message" ? row.item.text : null;
   }
 
   private requireState(agentId: string): AgentTimelineState {
diff --git a/packages/server/src/server/agent/chat-search/index.test.ts b/packages/server/src/server/agent/chat-search/index.test.ts
new file mode 100644
index 0000000000..41054d167c
--- /dev/null
+++ b/packages/server/src/server/agent/chat-search/index.test.ts
@@ -0,0 +1,88 @@
+import { expect, it } from "vitest";
+import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+import { searchTimeline } from "./index.js";
+
+function rows(items: AgentTimelineItem[]) {
+  return items.map((item, index) => ({ item, seq: index + 1, timestamp: "2026-09-12T00:00:00Z" }));
+}
+
+it("returns source locations for formatted assistant text and literal user text", async () => {
+  const result = await searchTimeline({
+    rows: rows([
+      { type: "user_message", text: "hello **world**" },
+      { type: "assistant_message", text: "İ😀hello **world** and hello *world*" },
+      {
+        type: "assistant_message",
+        text: "[hello &amp; world](https://example.com)",
+        messageId: "separate",
+      },
+    ]),
+    query: "hello world",
+  });
+  expect(result).toEqual({
+    locations: [{ seq: 2, role: "assistant", count: 2 }],
+    nextCursor: null,
+  });
+});
+
+it("finds code and literal punctuation without searching tools, reasoning, or task state", async () => {
+  const result = await searchTimeline({
+    rows: rows([
+      { type: "assistant_message", text: "```ts\nconst value = 'a.b';\n```" },
+      { type: "reasoning", text: "a.b" },
+      { type: "todo", items: [{ text: "a.b", completed: false }] },
+      { type: "user_message", text: "axb" },
+      { type: "user_message", text: "a.b" },
+    ]),
+    query: "a.b",
+  });
+  expect(result.locations).toEqual([
+    { seq: 1, role: "assistant", count: 1 },
+    { seq: 5, role: "user", count: 1 },
+  ]);
+});
+
+it("bounds results and resumes without losing locations", async () => {
+  const source = rows(
+    Array.from({ length: 202 }, () => ({ type: "user_message", text: "target" })),
+  );
+  const first = await searchTimeline({ rows: source, query: "target" });
+  expect(first.locations).toHaveLength(200);
+  expect(first.nextCursor).toBe(200);
+  const second = await searchTimeline({ rows: source, query: "target", cursor: first.nextCursor! });
+  expect(second).toEqual({
+    locations: [
+      { seq: 201, role: "user", count: 1 },
+      { seq: 202, role: "user", count: 1 },
+    ],
+    nextCursor: null,
+  });
+});
+
+it("finds ordinary Markdown entities and line breaks without requiring identical parsers", async () => {
+  const source = rows([{ type: "assistant_message", text: "hello &amp; **world**\nnext line" }]);
+  expect((await searchTimeline({ rows: source, query: "hello & world" })).locations).toEqual([
+    { seq: 1, role: "assistant", count: 1 },
+  ]);
+  expect((await searchTimeline({ rows: source, query: "world next" })).locations).toEqual([
+    { seq: 1, role: "assistant", count: 1 },
+  ]);
+});
+
+it("counts occurrences per rendered block rather than across block boundaries", async () => {
+  const source = rows([
+    { type: "assistant_message", text: "target one\n\ntarget two\n\n- target three\n- end target" },
+    { type: "user_message", text: "TARGET target" },
+  ]);
+  expect((await searchTimeline({ rows: source, query: "target" })).locations).toEqual([
+    { seq: 1, role: "assistant", count: 4 },
+    { seq: 2, role: "user", count: 2 },
+  ]);
+  expect((await searchTimeline({ rows: source, query: "end target" })).locations).toEqual([
+    { seq: 1, role: "assistant", count: 1 },
+  ]);
+  expect((await searchTimeline({ rows: source, query: "two target" })).locations).toEqual([]);
+  // Rendered text never runs from the end of one block into the start of the next, so
+  // neither does a match, however contiguous the Markdown source looks.
+  expect((await searchTimeline({ rows: source, query: "one target" })).locations).toEqual([]);
+});
diff --git a/packages/server/src/server/agent/chat-search/index.ts b/packages/server/src/server/agent/chat-search/index.ts
new file mode 100644
index 0000000000..70ada71b57
--- /dev/null
+++ b/packages/server/src/server/agent/chat-search/index.ts
@@ -0,0 +1,87 @@
+import MarkdownIt from "markdown-it";
+import { setImmediate } from "node:timers/promises";
+import type { AgentTimelineRow } from "../agent-timeline-store-types.js";
+import { projectTimelineRows } from "../timeline-projection.js";
+
+const markdown = new MarkdownIt({ html: false });
+const PAGE_SIZE = 200;
+interface SearchLocation {
+  seq: number;
+  role: "user" | "assistant";
+  count: number;
+}
+interface SearchInput {
+  rows: readonly AgentTimelineRow[];
+  query: string;
+  cursor?: number;
+}
+
+// Discovery is deliberately approximate. Only the client can verify displayed text, so
+// `count` estimates rendered occurrences and the client replaces it with the rendered
+// count once the message is on screen. Blocks are counted separately, and the Markdown
+// source is never searched whole, because a match the client cannot highlight — across
+// a block boundary, or on syntax the reader never sees — still inflates the total until
+// navigation reaches that message and drops it.
+function searchableBlocks(text: string): string[] {
+  return markdown
+    .parse(text, {})
+    .map((token) => {
+      if (token.type === "inline") {
+        return (token.children ?? [])
+          .map((child) => {
+            if (child.type === "text" || child.type === "code_inline") return child.content;
+            if (child.type === "softbreak" || child.type === "hardbreak") return "\n";
+            return "";
+          })
+          .join("");
+      }
+      if (token.type === "fence" || token.type === "code_block") return token.content;
+      return "";
+    })
+    .filter(Boolean);
+}
+
+function searchPattern(query: string): RegExp {
+  const source = query
+    .trim()
+    .split(/\s+/)
+    .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+    .join("\\s+");
+  return new RegExp(source, "giu");
+}
+
+function countMatches(text: string, pattern: RegExp): number {
+  let count = 0;
+  for (const _ of text.matchAll(pattern)) count += 1;
+  return count;
+}
+
+export async function searchTimeline({ rows, query, cursor = 0 }: SearchInput) {
+  const locations: SearchLocation[] = [];
+  if (!query.trim()) return { locations, nextCursor: null };
+  const pattern = searchPattern(query);
+  let lastYield = performance.now();
+  for (const entry of projectTimelineRows({ rows, mode: "projected" })) {
+    if (entry.seqEnd <= cursor) continue;
+    const item = entry.item;
+    if (item.type !== "user_message" && item.type !== "assistant_message") continue;
+    const raw = item.text.replace(/\r/g, "");
+    const blocks = item.type === "assistant_message" ? searchableBlocks(raw) : [raw];
+    const count = blocks.reduce((sum, block) => sum + countMatches(block, pattern), 0);
+    if (count) {
+      if (locations.length === PAGE_SIZE) {
+        return { locations, nextCursor: locations[PAGE_SIZE - 1]!.seq };
+      }
+      locations.push({
+        seq: entry.seqEnd,
+        role: item.type === "user_message" ? "user" : "assistant",
+        count,
+      });
+    }
+    if (performance.now() - lastYield >= 8) {
+      await setImmediate();
+      lastYield = performance.now();
+    }
+  }
+  return { locations, nextCursor: null };
+}
diff --git a/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts b/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
index 53a2177272..554bb9869e 100644
--- a/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
+++ b/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
@@ -7,13 +7,11 @@ import { archiveByScope, type ActiveWorkspaceRef } from "../workspace-archive-se
 import type {
   CreatePaseoWorktreeWorkflowFn,
   CreatePaseoWorktreeWorkflowResult,
+  CreatePaseoWorktreeSetupContinuationInput,
+  NormalizedGitOptions,
 } from "../worktree-session.js";
 import type { WorkspaceGitService } from "../workspace-git-service.js";
-import type {
-  CreateAgentWorktreeTarget,
-  FirstAgentContext,
-  SessionOutboundMessage,
-} from "../messages.js";
+import type { FirstAgentContext, SessionOutboundMessage } from "../messages.js";
 import type { AgentManager, AgentSubscriber, SubscribeOptions } from "./agent-manager.js";
 import type { AgentStorage } from "./agent-storage.js";
 
@@ -59,18 +57,34 @@ export class CreateAgentLifecycleDispatch {
 
   async createWorktreeForRequest(input: {
     cwd: string;
-    target: CreateAgentWorktreeTarget | undefined;
+    target: NormalizedGitOptions | null;
     firstAgentContext: FirstAgentContext;
-    hasLegacyGitOptions: boolean;
+    setupContinuation?: CreatePaseoWorktreeSetupContinuationInput;
+    background?: boolean;
+    callerWorkspaceId?: string;
   }): Promise<CreatePaseoWorktreeWorkflowResult | null> {
-    if (input.target && input.hasLegacyGitOptions) {
-      throw new Error("create_agent_request worktree cannot be combined with git options");
-    }
-    if (!input.target) {
-      return null;
-    }
-
-    return this.createWorktreeForTarget(input.cwd, input.target, input.firstAgentContext);
+    const target = input.target;
+    if (!target?.createWorktree) return null;
+    return this.dependencies.createPaseoWorktreeWorkflow(
+      {
+        cwd: input.cwd,
+        background: input.background,
+        callerWorkspaceId: input.callerWorkspaceId,
+        firstAgentContext: input.firstAgentContext,
+        worktreeSlug: target.worktreeSlug,
+        refName: target.refName,
+        action: target.action,
+        checkoutSource: target.checkoutSource,
+        githubPrNumber: target.githubPrNumber,
+        runSetup: false,
+        paseoHome: this.dependencies.paseoHome,
+        worktreesRoot: this.dependencies.worktreesRoot,
+      },
+      {
+        ...(target.baseBranch ? { resolveDefaultBranch: async () => target.baseBranch! } : {}),
+        setupContinuation: input.setupContinuation,
+      },
+    );
   }
 
   registerAutoArchiveIfRequested(input: {
@@ -111,47 +125,6 @@ export class CreateAgentLifecycleDispatch {
     });
   }
 
-  private async createWorktreeForTarget(
-    cwd: string,
-    target: CreateAgentWorktreeTarget,
-    firstAgentContext: FirstAgentContext,
-  ): Promise<CreatePaseoWorktreeWorkflowResult> {
-    const baseInput = {
-      cwd,
-      firstAgentContext,
-      runSetup: false,
-      paseoHome: this.dependencies.paseoHome,
-      worktreesRoot: this.dependencies.worktreesRoot,
-    } as const;
-
-    switch (target.mode) {
-      case "branch-off":
-        return this.dependencies.createPaseoWorktreeWorkflow(
-          {
-            ...baseInput,
-            worktreeSlug: target.newBranch,
-            action: "branch-off",
-            ...(target.base ? { refName: target.base } : {}),
-          },
-          target.base ? { resolveDefaultBranch: async () => target.base! } : undefined,
-        );
-      case "checkout-branch":
-        return this.dependencies.createPaseoWorktreeWorkflow({
-          ...baseInput,
-          action: "checkout",
-          refName: target.branch,
-        });
-      case "checkout-pr":
-        return this.dependencies.createPaseoWorktreeWorkflow({
-          ...baseInput,
-          action: "checkout",
-          githubPrNumber: target.prNumber,
-        });
-      default:
-        throw new Error("Unsupported create_agent_request worktree target");
-    }
-  }
-
   private registerAutoArchiveOnTerminalState(
     agentId: string,
     target: AutoArchiveTarget,
diff --git a/packages/server/src/server/agent/create-agent/create.test.ts b/packages/server/src/server/agent/create-agent/create.test.ts
index e8547d27ed..f12309da2a 100644
--- a/packages/server/src/server/agent/create-agent/create.test.ts
+++ b/packages/server/src/server/agent/create-agent/create.test.ts
@@ -11,6 +11,7 @@ import { AgentStorage } from "../agent-storage.js";
 import type { CreatePaseoWorktreeWorkflowResult } from "../../worktree-session.js";
 import { createAgentCommand } from "./create.js";
 import type { ManagedAgent } from "../agent-manager.js";
+import type { AgentSessionConfig } from "../agent-sdk-types.js";
 
 const logger = createTestLogger();
 
@@ -211,7 +212,6 @@ test("mcp create accepts provider-only internal input and leaves model undefined
     workspaceId: "ws-create-test",
     title: "provider default",
     initialPrompt: "hello",
-    background: true,
     notifyOnFinish: false,
   });
 
@@ -329,7 +329,6 @@ test("mcp create stamps the new worktree's workspaceId, not the parent's", async
         provider: "codex/gpt-5.4",
         title: "child",
         initialPrompt: "do the thing",
-        background: true,
         notifyOnFinish: false,
         callerAgentId: parent.id,
         worktree: { worktreeName: "feature", baseBranch: "main" },
@@ -378,7 +377,6 @@ test("mcp create exposes the created worktree before dispatching the initial pro
         cwd: workdir,
         title: "worktree callback",
         initialPrompt: "Say done.",
-        background: true,
         notifyOnFinish: false,
         worktree: { worktreeName: "feature", baseBranch: "main" },
         onCreated: ({ agentId, createdWorktree: callbackWorktree }) => {
@@ -471,3 +469,47 @@ test("session create keeps an explicit title after the initial prompt settles",
     await removeRealAgentManagerWorkdir({ agentManager, storage, workdir });
   }
 });
+
+test("session create with an internal config skips provider session persistence", async () => {
+  const snapshot = {
+    id: "agent-1",
+    provider: "codex",
+    cwd: "/tmp/paseo-create-test",
+    runtimeInfo: null,
+  } as ManagedAgent;
+  const createAgent = vi.fn(async () => snapshot);
+  const dependencies: Parameters<typeof createAgentCommand>[0] = {
+    agentManager: {
+      createAgent,
+    } as unknown as Parameters<typeof createAgentCommand>[0]["agentManager"],
+    agentStorage: {} as Parameters<typeof createAgentCommand>[0]["agentStorage"],
+    logger: createTestLogger(),
+    providerSnapshotManager: createProviderSnapshotManagerStub().manager,
+  };
+  const input = {
+    kind: "session" as const,
+    workspaceId: "ws-create-test",
+    labels: {},
+    provisionalTitle: null,
+    firstAgentContext: { attachments: [] },
+    buildSessionConfig: async (config: AgentSessionConfig) => ({ sessionConfig: config }),
+  };
+
+  await createAgentCommand(dependencies, {
+    ...input,
+    config: { provider: "codex", cwd: "/tmp/paseo-create-test", internal: true },
+  });
+  await createAgentCommand(dependencies, {
+    ...input,
+    config: { provider: "codex", cwd: "/tmp/paseo-create-test" },
+  });
+
+  expect(createAgent).toHaveBeenNthCalledWith(
+    1,
+    expect.objectContaining({ provider: "codex", internal: true }),
+    undefined,
+    expect.objectContaining({ persistSession: false }),
+  );
+  expect(createAgent.mock.calls[1]?.[0]).not.toHaveProperty("internal");
+  expect(createAgent.mock.calls[1]?.[2]).not.toHaveProperty("persistSession");
+});
diff --git a/packages/server/src/server/agent/create-agent/create.ts b/packages/server/src/server/agent/create-agent/create.ts
index b31a858f34..05f98285e1 100644
--- a/packages/server/src/server/agent/create-agent/create.ts
+++ b/packages/server/src/server/agent/create-agent/create.ts
@@ -1,3 +1,4 @@
+import type { AgentPromptSource } from "../agent-messages/index.js";
 import type { Logger } from "pino";
 
 import type { TerminalManager } from "../../../terminal/terminal-manager.js";
@@ -51,14 +52,18 @@ export interface CreateAgentCommandDependencies {
 export type EnsureWorkspaceForCreate = (
   cwd: string,
   firstAgentContext?: FirstAgentContext,
+  context?: { callerWorkspaceId?: string },
 ) => Promise<string>;
 
 export interface CreateAgentFromSessionInput {
   kind: "session";
+  onAgentReady?: (agent: ManagedAgent) => Promise<void>;
+  agentId?: string;
   config: AgentSessionConfig;
   workspaceId: string;
   worktreeName?: string;
   initialPrompt?: string;
+  source?: AgentPromptSource;
   clientMessageId?: string;
   outputSchema?: Record<string, unknown>;
   images?: Array<{ data: string; mimeType: string }>;
@@ -90,7 +95,6 @@ export interface CreateAgentFromMcpInput {
   mode?: string;
   unattended?: boolean;
   promptFailure?: CreateAgentPromptFailureMode;
-  background: boolean;
   notifyOnFinish: boolean;
   internal?: boolean;
   detached?: boolean;
@@ -123,7 +127,6 @@ export type CreateAgentPromptFailureMode = "throw" | "log" | "return-error";
 export interface CreateAgentCommandResult {
   snapshot: ManagedAgent;
   liveSnapshot: ManagedAgent;
-  background: boolean;
   initialPromptStarted: boolean;
   initialPromptError: unknown | null;
   createdWorktree?: CreatePaseoWorktreeWorkflowResult;
@@ -162,9 +165,9 @@ interface ResolvedCreateAgent {
   config: AgentSessionConfig;
   createOptions: CreateAgentOptions;
   prompt?: AgentPromptInput;
+  source?: AgentPromptSource;
   runOptions?: AgentRunOptions;
   setupContinuation?: AgentWorktreeSetupContinuation;
-  background: boolean;
   promptFailure: CreateAgentPromptFailureMode;
   promptLogger?: Logger;
   createdWorktree?: CreatePaseoWorktreeWorkflowResult;
@@ -181,13 +184,11 @@ export async function createAgentCommand(
 
   const snapshot = await dependencies.agentManager.createAgent(
     resolved.config,
-    undefined,
+    input.kind === "session" ? input.agentId : undefined,
     resolved.createOptions,
   );
 
-  resolved.setupContinuation?.startAfterAgentCreate({
-    agentId: snapshot.id,
-  });
+  if (input.kind === "session") await input.onAgentReady?.(snapshot);
 
   let liveSnapshot = snapshot;
   let initialPromptStarted = false;
@@ -195,28 +196,37 @@ export async function createAgentCommand(
   if (input.kind === "mcp") {
     input.onCreated?.({ agentId: snapshot.id, createdWorktree: resolved.createdWorktree ?? null });
   }
+  const stopNotification =
+    input.kind === "mcp" &&
+    input.notifyOnFinish &&
+    input.callerAgentId &&
+    (resolved.prompt !== undefined || resolved.setupContinuation !== undefined)
+      ? setupFinishNotification({
+          agentManager: dependencies.agentManager,
+          agentStorage: dependencies.agentStorage,
+          childAgentId: snapshot.id,
+          callerAgentId: input.callerAgentId,
+          requireParentOwnership: true,
+          logger: dependencies.logger,
+        })
+      : undefined;
+
+  resolved.setupContinuation?.startAfterAgentCreate({
+    agentId: snapshot.id,
+  });
   if (resolved.prompt !== undefined) {
-    const sendResult = await sendInitialPrompt(dependencies, resolved, snapshot);
+    const sendResult = await sendInitialPrompt(dependencies, resolved, snapshot).catch((error) => {
+      stopNotification?.();
+      throw error;
+    });
     initialPromptStarted = sendResult.started;
     liveSnapshot = sendResult.liveSnapshot;
     initialPromptError = sendResult.error ?? null;
   }
 
-  if (input.kind === "mcp" && input.notifyOnFinish && input.callerAgentId && initialPromptStarted) {
-    setupFinishNotification({
-      agentManager: dependencies.agentManager,
-      agentStorage: dependencies.agentStorage,
-      childAgentId: snapshot.id,
-      callerAgentId: input.callerAgentId,
-      requireParentOwnership: true,
-      logger: dependencies.logger,
-    });
-  }
-
   return {
     snapshot,
     liveSnapshot,
-    background: resolved.background,
     initialPromptStarted,
     initialPromptError,
     ...(resolved.createdWorktree ? { createdWorktree: resolved.createdWorktree } : {}),
@@ -283,16 +293,20 @@ async function resolveSessionCreateAgent(
       initialPrompt: trimmedPrompt,
       env: input.env,
       initialTitle: input.provisionalTitle,
+      // Paseo never persists an internal agent, so nothing could resume its
+      // provider session either. Same as the daemon's own ephemeral helpers.
+      ...(sessionConfig.internal ? { persistSession: false } : {}),
       // A legacy git/worktreeName worktree creates a fresh workspace, so the
       // agent belongs to that workspace, not the source one. createdWorkspaceId
       // is the freshly created worktree's workspace.
       workspaceId: requireResolvedWorkspaceId(workspaceId),
     },
     prompt: hasPromptContent ? prompt : undefined,
+    source: input.source,
     runOptions,
     setupContinuation,
-    background: true,
-    promptFailure: "throw",
+    // Registration commits creation. First-turn failures belong to the created agent.
+    promptFailure: "return-error",
     promptLogger: dependencies.logger.child({
       clientMessageId: resolveClientMessageId(input.clientMessageId),
     }),
@@ -315,6 +329,7 @@ async function resolveMcpCreateAgent(
       cwd,
       worktree: input.worktree,
       initialPrompt: input.initialPrompt ?? "",
+      callerWorkspaceId: parentAgent?.workspaceId,
     });
   if (createdWorktree) input.onWorktreeCreated?.(createdWorktree);
 
@@ -329,7 +344,12 @@ async function resolveMcpCreateAgent(
     resolveWorkspace: async (workspaceId) => ({ workspaceId, cwd: resolvedCwd }),
     createWorkspace: async () => ({
       workspaceId: requireResolvedWorkspaceId(
-        await ensureWorkspaceForMcpCreate(dependencies, resolvedCwd, input.initialPrompt ?? ""),
+        await ensureWorkspaceForMcpCreate(
+          dependencies,
+          resolvedCwd,
+          input.initialPrompt ?? "",
+          parentAgent?.workspaceId,
+        ),
       ),
       cwd: resolvedCwd,
     }),
@@ -360,9 +380,11 @@ async function resolveMcpCreateAgent(
       env: input.env,
     },
     prompt: trimmedPrompt ? trimmedPrompt : undefined,
+    source: input.callerAgentId
+      ? { kind: "agent-message", agentId: input.callerAgentId }
+      : undefined,
     setupContinuation,
     createdWorktree,
-    background: input.background,
     promptFailure: input.promptFailure ?? "log",
   };
 }
@@ -437,11 +459,16 @@ async function ensureWorkspaceForMcpCreate(
   dependencies: CreateAgentCommandDependencies,
   cwd: string,
   initialPrompt: string,
+  callerWorkspaceId?: string,
 ): Promise<string | undefined> {
   if (!dependencies.ensureWorkspaceForCreate) {
     return undefined;
   }
-  return dependencies.ensureWorkspaceForCreate(cwd, { prompt: initialPrompt });
+  return dependencies.ensureWorkspaceForCreate(
+    cwd,
+    { prompt: initialPrompt },
+    { callerWorkspaceId },
+  );
 }
 
 async function sendInitialPrompt(
@@ -455,10 +482,12 @@ async function sendInitialPrompt(
       return { started: false, liveSnapshot: snapshot };
     }
     const liveSnapshot = await startCreatedAgentInitialPrompt({
+      agentStorage: dependencies.agentStorage,
       agentManager: dependencies.agentManager,
       agentId: snapshot.id,
       snapshot,
       prompt,
+      source: resolved.source,
       runOptions: resolved.runOptions,
       logger: resolved.promptLogger ?? dependencies.logger,
     });
@@ -468,7 +497,11 @@ async function sendInitialPrompt(
       throw error;
     }
     if (resolved.promptFailure === "return-error") {
-      return { started: false, liveSnapshot: snapshot, error };
+      return {
+        started: false,
+        liveSnapshot: dependencies.agentManager.getAgent(snapshot.id) ?? snapshot,
+        error,
+      };
     }
     dependencies.logger.error({ err: error, agentId: snapshot.id }, "Failed to run initial prompt");
     return { started: false, liveSnapshot: snapshot };
@@ -506,6 +539,7 @@ async function resolveMcpCwd(params: {
   dependencies: CreateAgentCommandDependencies;
   cwd: string;
   initialPrompt: string;
+  callerWorkspaceId?: string;
   worktree: CreateAgentFromMcpInput["worktree"];
 }): Promise<{
   resolvedCwd: string;
@@ -536,6 +570,7 @@ async function resolveMcpCwd(params: {
   const createdWorktree = await createMcpWorktree({
     input: {
       cwd: params.cwd,
+      callerWorkspaceId: params.callerWorkspaceId,
       worktreeSlug: worktree.worktreeName,
       branchName: worktree.branchName,
       refName: worktree.refName,
diff --git a/packages/server/src/server/agent/directory.ts b/packages/server/src/server/agent/directory.ts
new file mode 100644
index 0000000000..2f51d4a4c1
--- /dev/null
+++ b/packages/server/src/server/agent/directory.ts
@@ -0,0 +1,65 @@
+import type { AgentSnapshotPayload } from "../messages.js";
+import type { WorkspaceRegistry } from "../workspace-registry.js";
+import type { AgentManager, ManagedAgent } from "./agent-manager.js";
+import type { AgentStorage, StoredAgentRecord } from "./agent-storage.js";
+
+/** Public agent discovery owns workspace visibility for live and durable records. */
+export class AgentDirectory {
+  constructor(
+    private readonly deps: {
+      manager: AgentManager;
+      storage: AgentStorage;
+      workspaces: Pick<WorkspaceRegistry, "get" | "list">;
+      projectLive(agent: ManagedAgent): Promise<AgentSnapshotPayload>;
+      projectStored(record: StoredAgentRecord): AgentSnapshotPayload;
+      isProviderVisible(provider: string): boolean;
+      isStoredProviderAvailable(record: StoredAgentRecord): boolean;
+    },
+  ) {}
+
+  async includes(
+    agent: Pick<AgentSnapshotPayload, "workspaceId" | "internal">,
+    includeBackground = false,
+  ): Promise<boolean> {
+    if (agent.internal) return false;
+    if (includeBackground || !agent.workspaceId) return true;
+    return !(await this.deps.workspaces.get(agent.workspaceId))?.background;
+  }
+
+  async list(filter?: {
+    labels?: Record<string, string>;
+    includeArchived?: boolean;
+    includeBackground?: boolean;
+    includeUnavailablePersisted?: boolean;
+  }): Promise<AgentSnapshotPayload[]> {
+    const live = this.deps.manager.listAgents();
+    const liveIds = new Set(live.map((agent) => agent.id));
+    const labels = Object.entries(filter?.labels ?? {});
+    const backgroundIds = new Set(
+      filter?.includeBackground
+        ? []
+        : (await this.deps.workspaces.list())
+            .filter((workspace) => workspace.background)
+            .map((workspace) => workspace.workspaceId),
+    );
+    const matches = (agent: {
+      archivedAt?: string | null;
+      workspaceId?: string;
+      labels?: Record<string, string>;
+    }) =>
+      (filter?.includeArchived || !agent.archivedAt) &&
+      (filter?.includeBackground || !agent.workspaceId || !backgroundIds.has(agent.workspaceId)) &&
+      labels.every(([key, value]) => agent.labels?.[key] === value);
+    const stored = (await this.deps.storage.list())
+      .filter((record) => !record.internal && !liveIds.has(record.id) && matches(record))
+      .filter(
+        (record) =>
+          filter?.includeUnavailablePersisted || this.deps.isStoredProviderAvailable(record),
+      )
+      .map((record) => this.deps.projectStored(record));
+    const active = await Promise.all(
+      live.filter(matches).map((agent) => this.deps.projectLive(agent)),
+    );
+    return [...active, ...stored].filter((agent) => this.deps.isProviderVisible(agent.provider));
+  }
+}
diff --git a/packages/server/src/server/agent/lifecycle-command.test.ts b/packages/server/src/server/agent/lifecycle-command.test.ts
index 6e5714d489..763e676f43 100644
--- a/packages/server/src/server/agent/lifecycle-command.test.ts
+++ b/packages/server/src/server/agent/lifecycle-command.test.ts
@@ -219,6 +219,25 @@ describe("agent lifecycle commands", () => {
     expect(manager.archivedAgentIds).toEqual(["agent-1"]);
   });
 
+  test("archives a live internal agent without touching storage", async () => {
+    const storage = new FakeLifecycleAgentStorage();
+    const manager = new FakeLifecycleAgentManager(storage);
+    manager.liveAgents.set("agent-1", { ...managedAgent("agent-1", "idle"), internal: true });
+
+    const result = await archiveAgentCommand(
+      { agentManager: manager, agentStorage: storage, logger },
+      "agent-1",
+    );
+
+    expect(result).toEqual({
+      agentId: "agent-1",
+      archivedAt: "2026-05-10T10:00:00.000Z",
+      record: null,
+    });
+    expect(manager.archivedAgentIds).toEqual(["agent-1"]);
+    expect(storage.upserts).toEqual([]);
+  });
+
   test("archives a live agent when its graceful cancellation is rejected", async () => {
     const storage = new FakeLifecycleAgentStorage();
     const manager = new FakeLifecycleAgentManager(storage);
diff --git a/packages/server/src/server/agent/lifecycle-command.ts b/packages/server/src/server/agent/lifecycle-command.ts
index cb172ce620..431cff0fe6 100644
--- a/packages/server/src/server/agent/lifecycle-command.ts
+++ b/packages/server/src/server/agent/lifecycle-command.ts
@@ -8,7 +8,7 @@ import {
 import type { StoredAgentRecord } from "./agent-storage.js";
 import type { AgentProviderNotice } from "./agent-sdk-types.js";
 
-export type LifecycleAgentSnapshot = Pick<ManagedAgent, "id" | "cwd" | "lifecycle">;
+export type LifecycleAgentSnapshot = Pick<ManagedAgent, "id" | "cwd" | "lifecycle" | "internal">;
 
 export interface LifecycleAgentManager {
   getAgent(agentId: string): LifecycleAgentSnapshot | null;
@@ -112,7 +112,8 @@ export async function cancelAgentRunCommand(
 export interface ArchiveAgentResult {
   agentId: string;
   archivedAt: string;
-  record: StoredAgentRecord;
+  /** Null for an internal agent, which is closed and leaves no record behind. */
+  record: StoredAgentRecord | null;
 }
 
 export async function archiveAgentCommand(
@@ -124,7 +125,10 @@ export async function archiveAgentCommand(
   if (liveAgent) {
     await requestAgentRunCancellation(dependencies, agentId);
     await dependencies.agentManager.clearAgentAttention(agentId).catch(() => undefined);
-    await dependencies.agentManager.archiveAgent(agentId);
+    const archived = await dependencies.agentManager.archiveAgent(agentId);
+    if (liveAgent.internal) {
+      return { agentId, archivedAt: archived.archivedAt, record: null };
+    }
     record = await dependencies.agentStorage.get(agentId);
   } else {
     record = await archiveStoredAgent(dependencies, agentId);
diff --git a/packages/server/src/server/agent/mcp-parity.e2e.test.ts b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
index 50867f10d9..bfb6be7964 100644
--- a/packages/server/src/server/agent/mcp-parity.e2e.test.ts
+++ b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
@@ -12,6 +12,8 @@ import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
 import type { AgentClient, AgentProvider, AgentSessionConfig } from "./agent-sdk-types.js";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { parseAgentMessage } from "./agent-messages/index.js";
 
 interface StructuredContent {
   [key: string]: unknown;
@@ -215,7 +217,6 @@ async function createTopLevelAgent(args?: Partial<StructuredContent>): Promise<s
     provider: "claude/claude-test-model",
     initialPrompt: "say done and stop",
     settings: { modeId: "bypassPermissions" },
-    background: true,
     ...rest,
   });
   return str(payload.agentId);
@@ -267,28 +268,6 @@ async function killTerminalIfPresent(terminalId: string | null | undefined): Pro
   }
 }
 
-async function archiveWorktreeIfPresent(params: {
-  cwd: string;
-  worktreePath?: string | null;
-  worktreeSlug?: string | null;
-}): Promise<void> {
-  if (!params.worktreePath && !params.worktreeSlug) {
-    return;
-  }
-  try {
-    await topLevelClient.callTool({
-      name: "archive_worktree",
-      args: {
-        cwd: params.cwd,
-        ...(params.worktreePath ? { worktreePath: params.worktreePath } : {}),
-        ...(params.worktreeSlug ? { worktreeSlug: params.worktreeSlug } : {}),
-      },
-    });
-  } catch {
-    // ignore cleanup errors
-  }
-}
-
 beforeAll(async () => {
   tempRoot = await mkdtemp(path.join(os.tmpdir(), "mcp-parity-e2e-"));
   parentAgentCwd = await makeCwd("parent-agent-cwd");
@@ -307,7 +286,6 @@ beforeAll(async () => {
     provider: "claude/claude-test-model",
     initialPrompt: "say done and stop",
     settings: { modeId: "bypassPermissions" },
-    background: true,
   });
   parentAgentId = str(parentPayload.agentId);
 
@@ -335,6 +313,167 @@ afterAll(async () => {
 });
 
 describe("Suite A: Core Fixes", () => {
+  test.each([
+    ["Stop", "cancelAgent"],
+    ["Reload", "refreshAgent"],
+  ] as const)(
+    "%s tells the parent that a watched child was canceled",
+    async (_action, method) => {
+      let releaseChild!: () => void;
+      let childReachedGate!: () => void;
+      const heldTurn = new Promise<void>((resolve) => {
+        releaseChild = resolve;
+      });
+      const childAtGate = new Promise<void>((resolve) => {
+        childReachedGate = resolve;
+      });
+      const parentPrompts: string[] = [];
+      const daemon = await createTestPaseoDaemon({
+        agentClients: createTestAgentClients({
+          onStartTurn(prompt, config) {
+            if (config.title === "Watching parent" && typeof prompt === "string")
+              parentPrompts.push(prompt);
+          },
+          async beforeTurnComplete(prompt) {
+            if (
+              typeof prompt === "string" &&
+              parseAgentMessage(prompt).text === "Hold this child turn"
+            ) {
+              childReachedGate();
+              await heldTurn;
+            }
+          },
+        }),
+      });
+      const client = new DaemonClient({
+        url: `ws://127.0.0.1:${daemon.port}/ws`,
+        appVersion: "0.11.2",
+      });
+      let mcp: McpClient | undefined;
+      let unsubscribe: (() => void) | undefined;
+      try {
+        await client.connect();
+        await client.fetchAgents({ subscribe: {} });
+        const parent = await client.createAgent({
+          provider: "claude",
+          cwd: daemon.paseoHome,
+          title: "Watching parent",
+          modeId: "bypassPermissions",
+        });
+        mcp = await createMcpClient(
+          buildExpectedAgentMcpUrl({ host: "127.0.0.1", port: daemon.port, agentId: parent.id }),
+        );
+        const created = await callToolStructured(mcp, "create_agent", {
+          relationship: { kind: "subagent" },
+          workspace: { kind: "current" },
+          title: "Watched child",
+          provider: "codex/gpt-5.4",
+          initialPrompt: "Hold this child turn",
+          notifyOnFinish: true,
+          settings: { modeId: "full-access" },
+        });
+        const childId = str(created.agentId);
+        await childAtGate;
+        expect(daemon.daemon.agentManager.getAgent(childId)?.lifecycle).toBe("running");
+        const terminalEvents: string[] = [];
+        unsubscribe = daemon.daemon.agentManager.subscribe(
+          (event) => {
+            if (
+              event.type === "agent_stream" &&
+              event.agentId === childId &&
+              (event.event.type === "turn_completed" || event.event.type === "turn_canceled")
+            )
+              terminalEvents.push(event.event.type);
+          },
+          { agentId: childId, replayState: false },
+        );
+
+        await client[method](childId);
+        await waitFor({
+          timeoutMs: 10000,
+          label: "parent cancellation notification",
+          check: () => (parentPrompts.length === 1 ? true : null),
+        });
+        const notification = parseAgentMessage(parentPrompts[0]);
+        expect(terminalEvents).toEqual(["turn_canceled"]);
+        expect(notification.source).toEqual({
+          kind: "agent-notification",
+          agentId: childId,
+          title: "Watched child",
+          event: "errored",
+        });
+        expect(notification.text).toContain(`Agent ${childId} (Watched child) was canceled.`);
+        expect(notification.text).not.toContain("finished.");
+        await waitFor({
+          timeoutMs: 10000,
+          label: "parent notification turn drained",
+          check: () =>
+            daemon.daemon.agentManager.getAgent(parent.id)?.lifecycle === "idle" ? true : null,
+        });
+        expect(parentPrompts).toHaveLength(1);
+      } finally {
+        releaseChild();
+        unsubscribe?.();
+        await mcp?.close();
+        await client.close();
+        await daemon.close();
+      }
+    },
+    30000,
+  );
+
+  test.each([
+    { outcome: "finished", prompt: "say done and stop", status: "idle" },
+    { outcome: "errored", prompt: "Emit a turn failure", status: "error" },
+  ])(
+    "a watched child still reports $outcome after send_agent_prompt",
+    async ({ outcome, prompt, status }) => {
+      const childId = await createChildAgent({
+        title: "Follow-up child",
+        settings: { modeId: "bypassPermissions" },
+      });
+      try {
+        await waitFor({
+          timeoutMs: 10000,
+          label: "initial child turn completed",
+          check: () =>
+            daemonHandle.daemon.agentManager.getAgent(childId)?.lifecycle === "idle" ? true : null,
+        });
+        await callToolStructured(agentScopedClient, "send_agent_prompt", {
+          agentId: childId,
+          prompt,
+          notifyOnFinish: true,
+        });
+        const notifications = await waitFor({
+          timeoutMs: 10000,
+          label: `${outcome} notification`,
+          check: () => {
+            const items = daemonHandle.daemon.agentManager
+              .getTimeline(parentAgentId)
+              .filter(
+                (item) => item.type === "tool_call" && item.agentMessage?.sender.id === childId,
+              );
+            return items.length > 0 ? items : null;
+          },
+        });
+        expect(notifications).toEqual([
+          expect.objectContaining({
+            type: "tool_call",
+            agentMessage: {
+              event: outcome,
+              sender: { id: childId, title: "Follow-up child" },
+              text: expect.stringContaining(`(Follow-up child) ${outcome}.`),
+            },
+          }),
+        ]);
+        expect(daemonHandle.daemon.agentManager.getAgent(childId)?.lifecycle).toBe(status);
+      } finally {
+        await archiveAgentIfPresent(childId);
+      }
+    },
+    30000,
+  );
+
   test("AGENT_WAIT_TIMEOUT_MS is 30000", () => {
     expect(AGENT_WAIT_TIMEOUT_MS).toBe(30_000);
   });
@@ -845,117 +984,107 @@ describe("Suite D: Provider Tools", () => {
   });
 });
 
-describe("Suite E: Worktree Tools", () => {
-  test("list_worktrees on empty repo", async () => {
-    const payload = await callToolStructured(topLevelClient, "list_worktrees", {
-      cwd: worktreeRepoCwd,
+describe("Suite E: Workspace Tools", () => {
+  test("background worktree creation, discovery and archive use ordinary workspace ownership", async () => {
+    const created = await callToolStructured(topLevelClient, "create_workspace", {
+      isolation: "worktree",
+      path: worktreeRepoCwd,
+      baseBranch: "main",
+      branchName: `parity-background-${Date.now()}`,
+      background: true,
     });
-    expect(payload.worktrees).toEqual([]);
-  });
-
-  test("create_worktree and list_worktrees", async () => {
-    let worktreePath: string | null = null;
-    const branchName = `parity-create-${Date.now()}`;
+    const workspaceId = str(created.workspaceId);
     try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
+      expect(created.background).toBe(true);
+      const ordinary = await callToolStructured(topLevelClient, "list_workspaces", {});
+      expect(
+        recordArr(ordinary.workspaces).map((workspace) => workspace.workspaceId),
+      ).not.toContain(workspaceId);
+      const inclusive = await callToolStructured(topLevelClient, "list_workspaces", {
+        includeBackground: true,
       });
-      worktreePath = str(created.worktreePath);
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
-      });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            path: worktreePath,
-            branchName,
-          }),
-        ]),
+      expect(recordArr(inclusive.workspaces)).toContainEqual(
+        expect.objectContaining({ workspaceId, background: true }),
       );
+      const child = await callToolStructured(topLevelClient, "create_agent", {
+        workspaceId,
+        title: "Background worker",
+        provider: "claude/claude-test-model",
+        initialPrompt: "Say done.",
+      });
+      const agentId = str(child.agentId);
+      const workerClient = await createMcpClient(
+        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${agentId}`,
+      );
+      let terminalId: string;
+      try {
+        const terminal = await callToolStructured(workerClient, "create_terminal", {
+          name: "Background terminal",
+        });
+        terminalId = str(terminal.id);
+        expect(terminal.cwd).toBe(created.cwd);
+      } finally {
+        await workerClient.close();
+      }
+      const status = await callToolStructured(topLevelClient, "get_agent_status", { agentId });
+      expect((status.snapshot as StructuredContent).workspaceId).toBe(workspaceId);
+      const archived = await callToolStructured(topLevelClient, "archive_workspace", {
+        workspaceId,
+      });
+      expect(archived.archivedAgentIds).toContain(agentId);
+      const terminals = await callToolStructured(topLevelClient, "list_terminals", { all: true });
+      expect(recordArr(terminals.terminals).map((terminal) => terminal.id)).not.toContain(
+        terminalId,
+      );
+      const remaining = await callToolStructured(topLevelClient, "list_workspaces", {
+        includeBackground: true,
+      });
+      expect(
+        recordArr(remaining.workspaces).map((workspace) => workspace.workspaceId),
+      ).not.toContain(workspaceId);
     } finally {
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
+      await topLevelClient
+        .callTool({ name: "archive_workspace", args: { workspaceId } })
+        .catch(() => undefined);
     }
   });
 
-  test("archive_worktree removes worktree", async () => {
-    let worktreePath: string | null = null;
-    const branchName = `parity-archive-${Date.now()}`;
+  test("agent-scoped workspace creation inherits visibility and permits an explicit false override", async () => {
+    const parentWorkspace = await callToolStructured(topLevelClient, "create_workspace", {
+      isolation: "local",
+      path: worktreeRepoCwd,
+      background: true,
+    });
+    const parentWorkspaceId = str(parentWorkspace.workspaceId);
+    let scoped: McpClient | null = null;
+    const ownedWorkspaces: string[] = [parentWorkspaceId];
     try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
+      const parent = await callToolStructured(topLevelClient, "create_agent", {
+        workspaceId: parentWorkspaceId,
+        title: "Background parent",
+        provider: "claude/claude-test-model",
+        initialPrompt: "Say done.",
       });
-      worktreePath = str(created.worktreePath);
-
-      await callToolStructured(topLevelClient, "archive_worktree", {
-        cwd: worktreeRepoCwd,
-        worktreePath,
-      });
-      worktreePath = null;
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
-      });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees.some((worktree) => worktree.path === created.worktreePath)).toBe(false);
-    } finally {
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
-    }
-  });
-
-  test("archive_worktree succeeds when caller cwd is inside the archived worktree", async () => {
-    let worktreePath: string | null = null;
-    let worktreeAgentId: string | null = null;
-    let worktreeScopedClient: McpClient | null = null;
-    const branchName = `parity-archive-self-cwd-${Date.now()}`;
-
-    try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
-      });
-      worktreePath = str(created.worktreePath);
-      worktreeAgentId = await createTopLevelAgent({
-        cwd: worktreePath,
-        title: "Worktree scoped parity agent",
-      });
-      worktreeScopedClient = await createMcpClient(
-        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${encodeURIComponent(
-          worktreeAgentId,
-        )}`,
+      scoped = await createMcpClient(
+        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${str(parent.agentId)}`,
       );
-
-      const archived = await callToolStructured(worktreeScopedClient, "archive_worktree", {
-        worktreePath,
+      const inherited = await callToolStructured(scoped, "create_workspace", {
+        isolation: "local",
       });
-      expect(archived).toEqual({ success: true });
-      worktreePath = null;
-      worktreeAgentId = null;
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
+      ownedWorkspaces.push(str(inherited.workspaceId));
+      expect(inherited.background).toBe(true);
+      const visible = await callToolStructured(scoped, "create_workspace", {
+        isolation: "local",
+        background: false,
       });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees.map((worktree) => worktree.path)).not.toContain(created.worktreePath);
+      ownedWorkspaces.push(str(visible.workspaceId));
+      expect(visible.background).toBe(false);
     } finally {
-      await worktreeScopedClient?.close();
-      await archiveAgentIfPresent(worktreeAgentId);
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
+      await scoped?.close();
+      for (const workspaceId of ownedWorkspaces.toReversed())
+        await topLevelClient
+          .callTool({ name: "archive_workspace", args: { workspaceId } })
+          .catch(() => undefined);
     }
   });
 });
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 349eb15c53..f1311d31e2 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -1,19 +1,30 @@
+import { parseAgentMessage } from "./agent-messages/index.js";
 import { execFileSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { describe, expect, it, vi } from "vitest";
-import { realpathSync, rmSync } from "node:fs";
+import { realpathSync } from "node:fs";
 import { access, mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
 import { join, resolve as resolvePath } from "node:path";
 import { tmpdir } from "node:os";
 import { z } from "zod";
 
 import { createTestLogger } from "../../test-utils/test-logger.js";
-import { createAgentMcpServer } from "./mcp-server.js";
+import { createAgentMcpServer as createAgentMcpServerWithDependencies } from "./mcp-server.js";
 import { AgentManager, type ManagedAgent } from "./agent-manager.js";
 import { AgentStorage, type StoredAgentRecord } from "./agent-storage.js";
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
-import type { AgentMode, AgentProvider, ProviderSnapshotEntry } from "./agent-sdk-types.js";
+import type {
+  AgentClient,
+  AgentMode,
+  AgentPromptInput,
+  AgentProvider,
+  AgentRunResult,
+  AgentSession,
+  AgentStreamEvent,
+  ProviderSnapshotEntry,
+} from "./agent-sdk-types.js";
 import type { ProviderSnapshotManager } from "./provider-snapshot-manager.js";
 import { createProviderSnapshotManagerStub } from "../test-utils/session-stubs.js";
 import {
@@ -182,6 +193,16 @@ async function removeTempDir(path: string): Promise<void> {
   await rm(path, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
 }
 
+async function removeAgentStateDir(
+  agentManager: AgentManager,
+  storage: AgentStorage,
+  path: string,
+): Promise<void> {
+  await agentManager.flush();
+  await storage.flush();
+  await removeTempDir(path);
+}
+
 type AgentManagerSpies = ReturnType<typeof buildAgentManagerSpies>;
 type AgentStorageSpies = ReturnType<typeof buildAgentStorageSpies>;
 
@@ -737,6 +758,7 @@ function createPaseoWorktreeForMcpTest(options: {
     projectRegistry,
     workspaceRegistry,
     workspaceGitService,
+    isDirectory: async () => true,
     logger: createTestLogger(),
   });
   const workspaceAutoName = new WorkspaceAutoName({
@@ -785,7 +807,6 @@ function createPaseoWorktreeForMcpTest(options: {
         emit: () => {},
         sessionLogger: createTestLogger(),
         terminalManager: null,
-        archiveWorkspaceRecord: async () => {},
         serviceProxy: null,
         scriptRuntimeStore: null,
         getDaemonTcpPort: null,
@@ -812,6 +833,14 @@ function createPaseoWorktreeForMcpTest(options: {
   };
 }
 
+// Typed in-memory workspace port for catalogue tests without workspace setup.
+function createAgentMcpServer(options: Parameters<typeof createAgentMcpServerWithDependencies>[0]) {
+  return createAgentMcpServerWithDependencies({
+    workspaceRegistry: { get: async () => null, list: async () => [], upsert: async () => {} },
+    ...options,
+  });
+}
+
 describe("browser MCP tools", () => {
   const logger = createTestLogger();
 
@@ -971,8 +1000,85 @@ describe("browser MCP tools", () => {
       logger,
     });
 
+    const client = await connectInMemoryMcpClient(server);
+    try {
+      const listedTools = await client.listTools();
+      const toolNames = listedTools.tools.map((tool) => tool.name);
+
+      expect(toolNames).not.toContain("browser_list_tabs");
+      expect(toolNames).not.toContain("browser_snapshot");
+      expect(toolNames).toEqual(expect.arrayContaining(["create_agent", "list_agents"]));
+    } finally {
+      await client.close();
+      await server.close();
+    }
+  });
+
+  it("applies provider policy after the browser-tools host gate", async () => {
+    const agentManager = new BoundaryAgentManagerFake();
+    const agentStorage = new BoundaryAgentStorageFake();
+    const broker = new FakeBrowserToolsBroker({
+      requestId: "req-browser-policy",
+      ok: true,
+      result: { command: "list_tabs", tabs: [] },
+    });
+    const server = await createAgentMcpServer({
+      agentManager: agentManager as AgentManager,
+      agentStorage: agentStorage as AgentStorage,
+      providerSnapshotManager:
+        new BoundaryProviderSnapshotManagerFake() as unknown as ProviderSnapshotManager,
+      browserToolsEnabled: true,
+      browserToolsBroker: broker as BrowserToolsBroker,
+      callerAgentId: "agent-1",
+      paseoToolPolicy: { disabledTools: ["browser_list_tabs"] },
+      logger,
+    });
+
     expect(lookupTool(server, "browser_list_tabs")).toBeUndefined();
-    expect(lookupTool(server, "browser_snapshot")).toBeUndefined();
+    expect(lookupTool(server, "browser_snapshot")).toBeDefined();
+  });
+
+  it("filters policy-disabled tools from MCP listing and calls", async () => {
+    const agentManager = new BoundaryAgentManagerFake();
+    const agentStorage = new BoundaryAgentStorageFake();
+    const broker = new FakeBrowserToolsBroker({
+      requestId: "req-browser-policy-call",
+      ok: true,
+      result: { command: "list_tabs", tabs: [] },
+    });
+    const server = await createAgentMcpServer({
+      agentManager: agentManager as AgentManager,
+      agentStorage: agentStorage as AgentStorage,
+      providerSnapshotManager:
+        new BoundaryProviderSnapshotManagerFake() as unknown as ProviderSnapshotManager,
+      browserToolsEnabled: true,
+      browserToolsBroker: broker as BrowserToolsBroker,
+      callerAgentId: "agent-1",
+      paseoToolPolicy: { disabledTools: ["list_agents", "browser_list_tabs"] },
+      logger,
+    });
+    const client = await connectInMemoryMcpClient(server);
+
+    try {
+      const listedTools = await client.listTools();
+      const toolNames = listedTools.tools.map((tool) => tool.name);
+
+      expect(toolNames).not.toContain("list_agents");
+      expect(toolNames).not.toContain("browser_list_tabs");
+      expect(toolNames).toEqual(expect.arrayContaining(["create_agent", "browser_snapshot"]));
+      await expect(client.callTool({ name: "list_agents", arguments: {} })).resolves.toEqual({
+        content: [{ type: "text", text: "MCP error -32602: Tool list_agents not found" }],
+        isError: true,
+      });
+      await expect(client.callTool({ name: "browser_list_tabs", arguments: {} })).resolves.toEqual({
+        content: [{ type: "text", text: "MCP error -32602: Tool browser_list_tabs not found" }],
+        isError: true,
+      });
+      expect(broker.calls).toEqual([]);
+    } finally {
+      await client.close();
+      await server.close();
+    }
   });
 
   it("wires browser tools through the browser tools broker", async () => {
@@ -1229,10 +1335,13 @@ describe("create_agent MCP tool", () => {
       title: "Top-level agent",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
-    expect(ensureWorkspace).toHaveBeenCalledWith(existingCwd, { prompt: "Do work" });
+    expect(ensureWorkspace).toHaveBeenCalledWith(
+      existingCwd,
+      { prompt: "Do work" },
+      { callerWorkspaceId: undefined },
+    );
     expect(spies.agentManager.createAgent).toHaveBeenCalledWith(
       expect.objectContaining({ cwd: existingCwd }),
       undefined,
@@ -1240,6 +1349,32 @@ describe("create_agent MCP tool", () => {
     );
   });
 
+  it("rejects public internal helpers and the old top-level execution background option", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-public-helper-removal-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const agentManager = new AgentManager({
+      clients: createTestAgentClients(),
+      registry: storage,
+      logger,
+    });
+    try {
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+      const tool = registeredTool(server, "create_agent");
+      const input = { title: "Helper", provider: "codex/gpt-5.4", initialPrompt: "Summarize" };
+      await expect(tool.handler({ ...input, internal: true })).rejects.toThrow(/Unrecognized key/);
+      await expect(tool.handler({ ...input, background: true })).rejects.toThrow(
+        /Unrecognized key/,
+      );
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+
   it("rejects partial explicit workspace shape", async () => {
     const { agentManager, agentStorage } = createTestDeps();
     const server = await createAgentMcpServer({
@@ -1297,6 +1432,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       provider: "codex",
       currentModeId: "full-access",
@@ -1347,7 +1483,6 @@ describe("create_agent MCP tool", () => {
       title: "Existing workspace",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
     expect(response.structuredContent.workspaceId).toBe("wks_existing");
@@ -1384,7 +1519,7 @@ describe("create_agent MCP tool", () => {
       title: "Feature test",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
+
       settings: { features: { fast_mode: true } },
     };
 
@@ -1437,7 +1572,6 @@ describe("create_agent MCP tool", () => {
       title: "Mode test",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
     expect(response.structuredContent).toEqual(
@@ -1763,7 +1897,6 @@ describe("create_agent MCP tool", () => {
         title: "Worktree agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Do work",
-        background: true,
       });
 
       expect(broadcasts).toHaveLength(1);
@@ -1851,7 +1984,6 @@ describe("create_agent MCP tool", () => {
         title: "Worktree agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Fix workspace creation naming",
-        background: true,
       });
 
       const agentCwd = z.string().parse(spies.agentManager.createAgent.mock.calls[0]?.[0].cwd);
@@ -1932,7 +2064,6 @@ describe("create_agent MCP tool", () => {
         title: "Agent title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Build a workspace auto title flow",
-        background: true,
       });
       const workspaceId = z.string().parse(createdWorkspaceIds[0]);
       await waitForWorkspaceTitle(workspaceRecords, workspaceId, "Workspace Auto Title Flow");
@@ -2034,7 +2165,6 @@ describe("create_agent MCP tool", () => {
         title: "Agent title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Keep the manually renamed workspace title",
-        background: true,
       });
       const renameWorkspaceTool = registeredTool(server, "rename_workspace");
       await renameWorkspaceTool.handler({
@@ -2124,7 +2254,6 @@ describe("create_agent MCP tool", () => {
         title: "Explicit Agent Title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Generate the workspace title anyway",
-        background: true,
       });
       const workspaceId = z.string().parse(createdWorkspaceIds[0]);
       await waitForWorkspaceTitle(workspaceRecords, workspaceId, "Generated Workspace Title");
@@ -2231,7 +2360,6 @@ describe("create_agent MCP tool", () => {
         title: "Directory agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Name a directory workspace from the prompt",
-        background: true,
       });
       await waitForWorkspaceTitle(
         workspaceRecords,
@@ -2338,7 +2466,6 @@ describe("create_agent MCP tool", () => {
         title: "Checkout agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Rename this checkout from the prompt",
-        background: true,
       });
 
       const agentCwd = z.string().parse(spies.agentManager.createAgent.mock.calls[0]?.[0].cwd);
@@ -2359,7 +2486,7 @@ describe("create_agent MCP tool", () => {
       });
       expect(readPaseoWorktreeMetadata(agentCwd)).toMatchObject({
         version: 1,
-        baseRefName: "existing-feature",
+        baseRefName: "main",
       });
       expect(generateCalls).toBe(1);
       expect(workspaceGitService.getSnapshot).not.toHaveBeenCalled();
@@ -2445,7 +2572,6 @@ describe("create_agent MCP tool", () => {
       title: "PR agent",
       provider: "codex/gpt-5.4",
       initialPrompt: "Rename this PR branch from prompt",
-      background: true,
     });
 
     expect(createPaseoWorktree).toHaveBeenCalledWith(
@@ -2957,6 +3083,47 @@ describe("create_agent MCP tool", () => {
     ]);
   });
 
+  it("creates an background local workspace and leaves it out of list_workspaces", async () => {
+    const { agentManager, agentStorage } = createTestDeps();
+    const createCalls: Array<{ cwd: string; context: { background?: boolean } | undefined }> = [];
+    const backgroundWorkspace = createPersistedWorkspaceRecord({
+      workspaceId: "ws-background",
+      projectId: "project-1",
+      cwd: process.cwd(),
+      kind: "directory",
+      displayName: "helper",
+      createdAt: "2026-07-17T00:00:00.000Z",
+      updatedAt: "2026-07-17T00:00:00.000Z",
+      background: true,
+    });
+    const server = await createAgentMcpServer({
+      agentManager,
+      agentStorage,
+      providerSnapshotManager: createOpenCodeManager().manager,
+      workspaceRegistry: {
+        get: vi.fn(async () => backgroundWorkspace),
+        list: vi.fn(async () => [backgroundWorkspace]),
+        upsert: vi.fn(async () => undefined),
+      },
+      createDirectoryWorkspace: async (cwd, _title, _projectId, context) => {
+        createCalls.push({ cwd, context });
+        return backgroundWorkspace;
+      },
+      logger,
+    });
+
+    const created = await invokeToolWithParsedInput(registeredTool(server, "create_workspace"), {
+      isolation: "local",
+      path: process.cwd(),
+      background: true,
+    });
+    expect(created.structuredContent.workspaceId).toBe("ws-background");
+    expect(createCalls).toEqual([{ cwd: process.cwd(), context: { background: true } }]);
+
+    const listed = await registeredTool(server, "list_workspaces").handler({});
+    expect(listed.structuredContent.workspaces).toEqual([]);
+  });
+
   it("accepts custom provider IDs in create_agent input validation", async () => {
     const { agentManager, agentStorage } = createTestDeps();
     const server = await createAgentMcpServer({
@@ -2985,6 +3152,7 @@ describe("create_agent MCP tool", () => {
     await mkdir(subdir, { recursive: true });
     spies.agentManager.getAgent.mockReturnValue({
       id: "voice-agent",
+      config: { title: "Voice" },
       cwd: baseDir,
       workspaceId: "wks_voice",
       provider: "codex",
@@ -3039,6 +3207,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3085,6 +3254,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3130,6 +3300,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3182,6 +3353,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3332,7 +3504,7 @@ describe("create_agent MCP tool", () => {
       expect(storedChild?.workspaceId).toBe("wks_parent");
       expect(storedChild?.labels[PARENT_AGENT_ID_LABEL]).toBe(parent.id);
     } finally {
-      rmSync(workdir, { recursive: true, force: true });
+      await removeAgentStateDir(agentManager, storage, workdir);
     }
   });
 
@@ -3496,6 +3668,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3548,6 +3721,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3586,6 +3760,193 @@ describe("create_agent MCP tool", () => {
   });
 });
 
+const HELD_TURN_CAPABILITIES = {
+  supportsStreaming: false,
+  supportsSessionPersistence: false,
+  supportsSessionListing: false,
+  supportsDynamicModes: false,
+  supportsMcpServers: false,
+  supportsReasoningStream: false,
+  supportsToolInvocations: false,
+} as const;
+
+/**
+ * Provider session that records every prompt it receives. With `holdTurns`, a started
+ * turn stays running until `finishTurn()` so a caller's bounded wait can run out first.
+ */
+class HeldTurnAgentSession implements AgentSession {
+  readonly capabilities = HELD_TURN_CAPABILITIES;
+  readonly id = randomUUID();
+  readonly prompts: string[] = [];
+  private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
+  private activeTurnId: string | null = null;
+  private turnStartGate: Promise<void> | null = null;
+  private nextStartError: Error | null = null;
+
+  constructor(
+    readonly provider: AgentProvider,
+    private readonly holdTurns: boolean,
+  ) {}
+
+  /** Hold the next turn's acknowledgment, as a provider awaiting its turn-start request does. */
+  holdTurnStart(): () => void {
+    let release!: () => void;
+    this.turnStartGate = new Promise((resolve) => {
+      release = resolve;
+    });
+    return release;
+  }
+
+  async run(): Promise<AgentRunResult> {
+    return { sessionId: this.id, finalText: "", timeline: [] };
+  }
+
+  rejectNextTurnStart(error: Error): void {
+    this.nextStartError = error;
+  }
+
+  tryHandleOutOfBand(prompt: AgentPromptInput) {
+    const text = typeof prompt === "string" ? (parseAgentMessage(prompt)?.text ?? prompt) : null;
+    return text === "/side-command" ? { run: async () => {} } : null;
+  }
+
+  async startTurn(prompt: AgentPromptInput): Promise<{ turnId: string }> {
+    this.prompts.push(typeof prompt === "string" ? prompt : JSON.stringify(prompt));
+    await this.turnStartGate;
+    if (this.nextStartError) {
+      const error = this.nextStartError;
+      this.nextStartError = null;
+      throw error;
+    }
+    const turnId = randomUUID();
+    this.activeTurnId = turnId;
+    this.pushEvent({
+      type: "timeline",
+      provider: this.provider,
+      turnId,
+      item: {
+        type: "user_message",
+        text: typeof prompt === "string" ? prompt : JSON.stringify(prompt),
+        messageId: randomUUID(),
+      },
+    });
+    setTimeout(() => {
+      if (this.activeTurnId !== turnId) return;
+      this.pushEvent({ type: "turn_started", provider: this.provider, turnId });
+      if (!this.holdTurns && this.activeTurnId === turnId) {
+        this.finishTurn();
+      }
+    }, 0);
+    return { turnId };
+  }
+
+  finishTurn(finalText?: string): void {
+    const turnId = this.activeTurnId;
+    if (!turnId) {
+      throw new Error("No held turn to finish");
+    }
+    this.activeTurnId = null;
+    if (finalText)
+      this.pushEvent({
+        type: "timeline",
+        provider: this.provider,
+        turnId,
+        item: { type: "assistant_message", text: finalText },
+      });
+    this.pushEvent({ type: "turn_completed", provider: this.provider, turnId });
+  }
+
+  failTurn(error: string): void {
+    const turnId = this.activeTurnId;
+    if (!turnId) throw new Error("No held turn to fail");
+    this.activeTurnId = null;
+    this.pushEvent({ type: "turn_failed", provider: this.provider, error, turnId });
+  }
+
+  subscribe(callback: (event: AgentStreamEvent) => void): () => void {
+    this.subscribers.add(callback);
+    return () => {
+      this.subscribers.delete(callback);
+    };
+  }
+
+  private pushEvent(event: AgentStreamEvent): void {
+    for (const callback of this.subscribers) {
+      callback(event);
+    }
+  }
+
+  async *streamHistory(): AsyncGenerator<AgentStreamEvent> {}
+
+  async getRuntimeInfo() {
+    return { provider: this.provider, sessionId: this.id, model: null, modeId: null };
+  }
+
+  async getAvailableModes() {
+    return [];
+  }
+
+  async getCurrentMode() {
+    return null;
+  }
+
+  async setMode(): Promise<void> {}
+
+  getPendingPermissions() {
+    return [];
+  }
+
+  async respondToPermission(): Promise<void> {}
+
+  describePersistence() {
+    return { provider: this.provider, sessionId: this.id };
+  }
+
+  async interrupt(): Promise<void> {
+    const turnId = this.activeTurnId;
+    if (!turnId) {
+      return;
+    }
+    this.activeTurnId = null;
+    this.pushEvent({
+      type: "turn_canceled",
+      provider: this.provider,
+      reason: "interrupted",
+      turnId,
+    });
+  }
+
+  async close(): Promise<void> {}
+}
+
+class HeldTurnAgentClient implements AgentClient {
+  readonly capabilities = HELD_TURN_CAPABILITIES;
+  readonly sessions: HeldTurnAgentSession[] = [];
+
+  constructor(
+    readonly provider: AgentProvider,
+    private readonly holdTurns: boolean,
+  ) {}
+
+  async isAvailable(): Promise<boolean> {
+    return true;
+  }
+
+  async createSession(): Promise<AgentSession> {
+    const session = new HeldTurnAgentSession(this.provider, this.holdTurns);
+    this.sessions.push(session);
+    return session;
+  }
+
+  async fetchCatalog() {
+    return { models: [], modes: [] };
+  }
+
+  async resumeSession(): Promise<AgentSession> {
+    return await this.createSession();
+  }
+}
+
 describe("send_agent_prompt MCP tool", () => {
   const logger = createTestLogger();
   const existingCwd = process.cwd();
@@ -3594,6 +3955,7 @@ describe("send_agent_prompt MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3631,7 +3993,6 @@ describe("send_agent_prompt MCP tool", () => {
       throw new Error("Expected caller send_agent_prompt input to parse");
     }
     expect(parsed.data).toMatchObject({
-      background: true,
       notifyOnFinish: true,
     });
 
@@ -3644,7 +4005,7 @@ describe("send_agent_prompt MCP tool", () => {
     );
   });
 
-  it("keeps top-level prompts blocking by default", async () => {
+  it("acknowledges top-level prompts without a completion wait", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "child-agent",
@@ -3672,23 +4033,20 @@ describe("send_agent_prompt MCP tool", () => {
       throw new Error("Expected top-level send_agent_prompt input to parse");
     }
     expect(parsed.data).toMatchObject({
-      background: false,
       notifyOnFinish: false,
     });
 
     await tool.handler(parsed.data as Record<string, unknown>);
 
     expect(spies.agentManager.subscribe).not.toHaveBeenCalled();
-    expect(spies.agentManager.waitForAgentEvent).toHaveBeenCalledWith(
-      "child-agent",
-      expect.objectContaining({ waitForActive: true }),
-    );
+    expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
   });
 
-  it("does not arm a finish notification for blocking agent-scoped prompts", async () => {
+  it("allows agent-scoped callers to opt out of finish notifications", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3720,14 +4078,424 @@ describe("send_agent_prompt MCP tool", () => {
     await invokeToolWithParsedInput(tool, {
       agentId: "child-agent",
       prompt: "Follow up",
-      background: false,
+      notifyOnFinish: false,
     });
 
     expect(spies.agentManager.subscribe).not.toHaveBeenCalled();
-    expect(spies.agentManager.waitForAgentEvent).toHaveBeenCalledWith(
-      "child-agent",
-      expect.objectContaining({ waitForActive: true }),
-    );
+    expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    { immediateFinish: false, failure: false },
+    { immediateFinish: true, failure: false },
+    { immediateFinish: false, failure: true },
+  ])(
+    "notifies the retry outcome rather than the prior failed turn (immediate: $immediateFinish, failure: $failure)",
+    async ({ immediateFinish, failure }) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-retry-notification-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const parentClient = new HeldTurnAgentClient("claude", false);
+      const childClient = new HeldTurnAgentClient("codex", true);
+      const agentManager = new AgentManager({
+        clients: { claude: parentClient, codex: childClient },
+        registry: storage,
+        logger,
+      });
+      try {
+        const parent = await agentManager.createAgent(
+          { provider: "claude", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await agentManager.createAgent(
+          { provider: "codex", cwd: existingCwd, title: "Retry child" },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        const tool = registeredTool(server, "send_agent_prompt");
+        await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Old task",
+          notifyOnFinish: false,
+        });
+        childClient.sessions[0]!.failTurn("Old task failed");
+        await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("error"));
+        const unsubscribe = agentManager.subscribe(
+          (event) => {
+            if (
+              immediateFinish &&
+              event.type === "agent_state" &&
+              event.agent.lifecycle === "running"
+            ) {
+              childClient.sessions[0]!.finishTurn("Retry done");
+            }
+          },
+          { agentId: child.id, replayState: false },
+        );
+        const response = await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Retry now",
+        });
+        unsubscribe();
+        expect(response.structuredContent).toMatchObject({
+          success: true,
+          disposition: "turn_started",
+        });
+        if (!immediateFinish) {
+          expect(response.structuredContent.status).toBe("running");
+          if (failure) childClient.sessions[0]!.failTurn("Retry failed");
+          else childClient.sessions[0]!.finishTurn("Retry done");
+        }
+        await vi.waitFor(() => {
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+          expect(parentClient.sessions[0]!.prompts[0]).toContain(
+            `Agent ${child.id} (Retry child) ${failure ? "errored" : "finished"}.`,
+          );
+          expect(parentClient.sessions[0]!.prompts[0]).not.toContain("Old task failed");
+        });
+        await vi.waitFor(() => expect(agentManager.getAgent(parent.id)?.lifecycle).toBe("idle"));
+        expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it.each(["out_of_band", "startup_failure"] as const)(
+    "preserves %s dispatch notification semantics",
+    async (scenario) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-dispatch-notification-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const parentClient = new HeldTurnAgentClient("claude", false);
+      const childClient = new HeldTurnAgentClient("codex", true);
+      const agentManager = new AgentManager({
+        clients: { claude: parentClient, codex: childClient },
+        registry: storage,
+        logger,
+      });
+      try {
+        const parent = await agentManager.createAgent(
+          { provider: "claude", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await agentManager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        const tool = registeredTool(server, "send_agent_prompt");
+        await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Ongoing task",
+          notifyOnFinish: false,
+        });
+        if (scenario === "out_of_band") {
+          const response = await invokeToolWithParsedInput(tool, {
+            agentId: child.id,
+            prompt: "/side-command",
+          });
+          expect(response.structuredContent).toMatchObject({
+            success: true,
+            disposition: "out_of_band",
+            status: "running",
+          });
+          expect(childClient.sessions[0]!.prompts).toHaveLength(1);
+          expect(parseAgentMessage(childClient.sessions[0]!.prompts[0])).toMatchObject({
+            source: { kind: "agent-message", agentId: parent.id },
+            text: "Ongoing task",
+          });
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
+          childClient.sessions[0]!.finishTurn("Ongoing task done");
+          await vi.waitFor(() => {
+            expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+            expect(parentClient.sessions[0]!.prompts[0]).toContain("finished.");
+          });
+        } else {
+          childClient.sessions[0]!.rejectNextTurnStart(new Error("Requested turn could not start"));
+          await expect(
+            invokeToolWithParsedInput(tool, { agentId: child.id, prompt: "Replacement task" }),
+          ).rejects.toThrow("Requested turn could not start");
+          // A later real turn must not inherit a subscription from the rejected dispatch.
+          await invokeToolWithParsedInput(tool, {
+            agentId: child.id,
+            prompt: "Recovery",
+            notifyOnFinish: false,
+          });
+          childClient.sessions[0]!.finishTurn("Recovered");
+          await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("idle"));
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
+        }
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it("acknowledges a pending agent-scoped turn and notifies its completion", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-blocking-send-timeout-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const childClient = new HeldTurnAgentClient("codex", true);
+    const agentManager = new AgentManager({
+      clients: { claude: parentClient, codex: childClient },
+      registry: storage,
+      logger,
+    });
+
+    try {
+      const parent = await agentManager.createAgent(
+        { provider: "claude", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const child = await agentManager.createAgent(
+        { provider: "codex", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        callerAgentId: parent.id,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+      const tool = registeredTool(server, "send_agent_prompt");
+
+      const pending = invokeToolWithParsedInput(tool, {
+        agentId: child.id,
+        prompt: "Follow up",
+      });
+      const response = await pending;
+      expect(response.structuredContent).toMatchObject({
+        status: "running",
+        guidance:
+          "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.",
+      });
+      expect(response.structuredContent).not.toHaveProperty("lastMessage");
+
+      childClient.sessions[0]!.finishTurn();
+
+      await vi.waitFor(() => {
+        const parentPrompts = parentClient.sessions[0]!.prompts;
+        expect(parentPrompts).toHaveLength(1);
+        expect(parentPrompts[0]).toContain(child.id);
+        expect(parentPrompts[0]).toContain("finished");
+      });
+    } finally {
+      vi.useRealTimers();
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+  it("notifies the caller once when it prompts a created child that is still running", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-send-running-child-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const childClient = new HeldTurnAgentClient("codex", true);
+    const agentManager = new AgentManager({
+      clients: { claude: parentClient, codex: childClient },
+      registry: storage,
+      logger,
+    });
+
+    try {
+      const parent = await agentManager.createAgent(
+        { provider: "claude", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        callerAgentId: parent.id,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+
+      const created = await invokeToolWithParsedInput(registeredTool(server, "create_agent"), {
+        relationship: { kind: "subagent" },
+        workspace: { kind: "current" },
+        title: "Busy Child",
+        provider: "codex/gpt-5.4",
+        initialPrompt: "Run a long command",
+      });
+      const childId = z.object({ agentId: z.string() }).parse(created.structuredContent).agentId;
+      await vi.waitFor(() => expect(agentManager.getAgent(childId)?.lifecycle).toBe("running"));
+
+      const sent = await invokeToolWithParsedInput(registeredTool(server, "send_agent_prompt"), {
+        agentId: childId,
+        prompt: "Stop and reply instead",
+      });
+      expect(sent.structuredContent).toMatchObject({
+        success: true,
+        status: "running",
+      });
+      const childSession = childClient.sessions[0]!;
+      await vi.waitFor(() => expect(childSession.prompts).toHaveLength(2));
+
+      expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
+      childSession.finishTurn();
+
+      function finishNotifications() {
+        return (parentClient.sessions[0]?.prompts ?? []).filter((prompt) =>
+          prompt.includes(`Agent ${childId} (Busy Child) finished.`),
+        );
+      }
+      await vi.waitFor(() => expect(finishNotifications()).not.toHaveLength(0));
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      expect(finishNotifications()).toHaveLength(1);
+      expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+      expect(parseAgentMessage(parentClient.sessions[0]!.prompts[0])).toMatchObject({
+        source: { kind: "agent-notification", agentId: childId, event: "finished" },
+      });
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+
+  it("reports a background prompt's accepted turn as running", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-background-send-status-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const childClient = new HeldTurnAgentClient("codex", true);
+    const agentManager = new AgentManager({
+      clients: { claude: parentClient, codex: childClient },
+      registry: storage,
+      logger,
+    });
+
+    try {
+      const parent = await agentManager.createAgent(
+        { provider: "claude", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const child = await agentManager.createAgent(
+        { provider: "codex", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        callerAgentId: parent.id,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+      const tool = registeredTool(server, "send_agent_prompt");
+      const childSession = childClient.sessions[0]!;
+      const acknowledgeTurnStart = childSession.holdTurnStart();
+
+      const pending = invokeToolWithParsedInput(tool, {
+        agentId: child.id,
+        prompt: "Follow up",
+      });
+      await vi.waitFor(() => expect(childSession.prompts).toHaveLength(1));
+      expect(parseAgentMessage(childSession.prompts[0])).toEqual({
+        id: expect.any(String),
+        source: { kind: "agent-message", agentId: parent.id },
+        text: "Follow up",
+      });
+      acknowledgeTurnStart();
+      const response = await pending;
+
+      expect(response.structuredContent).toMatchObject({ success: true, status: "running" });
+      expect(agentManager.getAgent(child.id)?.lifecycle).toBe("running");
+
+      childSession.finishTurn();
+      await vi.waitFor(() => {
+        const parentPrompts = parentClient.sessions[0]!.prompts;
+        expect(parentPrompts).toHaveLength(1);
+        expect(parentPrompts[0]).toContain(child.id);
+        expect(parentPrompts[0]).toContain("finished");
+      });
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+
+  it("accepts a background turn completed as the manager publishes its start", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-fast-background-send-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const childClient = new HeldTurnAgentClient("codex", true);
+    const agentManager = new AgentManager({
+      clients: { claude: parentClient, codex: childClient },
+      registry: storage,
+      logger,
+    });
+
+    try {
+      const parent = await agentManager.createAgent(
+        { provider: "claude", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const child = await agentManager.createAgent(
+        { provider: "codex", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        callerAgentId: parent.id,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+      let finished = false;
+      const unsubscribe = agentManager.subscribe(
+        (event) => {
+          if (
+            !finished &&
+            event.type === "agent_state" &&
+            event.agent.id === child.id &&
+            event.agent.lifecycle === "running"
+          ) {
+            finished = true;
+            childClient.sessions[0]!.finishTurn();
+          }
+        },
+        { agentId: child.id, replayState: false },
+      );
+
+      const response = await invokeToolWithParsedInput(
+        registeredTool(server, "send_agent_prompt"),
+        {
+          agentId: child.id,
+          prompt: "Fast reply",
+        },
+      );
+      unsubscribe();
+      expect(response.structuredContent).toMatchObject({
+        success: true,
+        disposition: "turn_started",
+      });
+      await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("idle"));
+      await vi.waitFor(() => {
+        const parentPrompts = parentClient.sessions[0]!.prompts;
+        expect(parentPrompts).toHaveLength(1);
+        expect(parentPrompts[0]).toContain(child.id);
+        expect(parentPrompts[0]).toContain("finished");
+      });
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
   });
 });
 
diff --git a/packages/server/src/server/agent/mcp-shared.ts b/packages/server/src/server/agent/mcp-shared.ts
index 60a1273859..4622d7bba4 100644
--- a/packages/server/src/server/agent/mcp-shared.ts
+++ b/packages/server/src/server/agent/mcp-shared.ts
@@ -86,6 +86,11 @@ export function resolveRequiredProviderModel(
   };
 }
 
+export interface AgentWaitWithTimeoutResult extends WaitForAgentResult {
+  /** The wait gave up while the agent was still working. */
+  timedOut: boolean;
+}
+
 /**
  * Wraps agentManager.waitForAgentEvent with a self-imposed timeout.
  * Returns a friendly message when timeout occurs, rather than letting
@@ -98,7 +103,7 @@ export async function waitForAgentWithTimeout(
     signal?: AbortSignal;
     waitForActive?: boolean;
   },
-): Promise<WaitForAgentResult> {
+): Promise<AgentWaitWithTimeoutResult> {
   const timeoutController = new AbortController();
   const combinedController = new AbortController();
 
@@ -133,7 +138,7 @@ export async function waitForAgentWithTimeout(
       signal: combinedController.signal,
       waitForActive: options?.waitForActive,
     });
-    return result;
+    return { ...result, timedOut: false };
   } catch (error) {
     if (error instanceof Error && error.message === "wait timeout") {
       const snapshot = agentManager.getAgent(agentId);
@@ -150,6 +155,7 @@ export async function waitForAgentWithTimeout(
         status: snapshot?.lifecycle ?? "idle",
         permission: null,
         lastMessage: message,
+        timedOut: true,
       };
     }
     throw error;
diff --git a/packages/server/src/server/agent/mutable-provider-config-owner.test.ts b/packages/server/src/server/agent/mutable-provider-config-owner.test.ts
index 4a8c30b1bb..53270c1a78 100644
--- a/packages/server/src/server/agent/mutable-provider-config-owner.test.ts
+++ b/packages/server/src/server/agent/mutable-provider-config-owner.test.ts
@@ -12,10 +12,12 @@ import type {
   AgentMode,
   AgentModelDefinition,
   FetchCatalogOptions,
-  ProviderSnapshotEntry,
 } from "./agent-sdk-types.js";
 import { attachMutableProviderConfigOwner } from "./mutable-provider-config-owner.js";
-import { ProviderSnapshotManager } from "./provider-snapshot-manager.js";
+import {
+  type ProviderSnapshotTransition,
+  ProviderSnapshotManager,
+} from "./provider-snapshot-manager.js";
 
 const tempDirs: string[] = [];
 const CONTROLLED_PROVIDERS = {
@@ -61,15 +63,15 @@ function catalog(modelId: string): Catalog {
   };
 }
 
-function recordCodexEvent(events: string[]): (entries: ProviderSnapshotEntry[]) => void {
-  return (entries) => {
-    const codex = entries.find((entry) => entry.provider === "codex");
+function recordCodexEvent(events: string[]): (transition: ProviderSnapshotTransition) => void {
+  return ({ current }) => {
+    const codex = current.records.find(({ entry }) => entry.provider === "codex")?.entry;
     events.push(`${codex?.status}:${codex?.models?.[0]?.id ?? "none"}`);
   };
 }
 
 function getCodexSnapshot(manager: ProviderSnapshotManager, cwd: string) {
-  return manager.getSnapshot(cwd).find((entry) => entry.provider === "codex");
+  return manager.getSnapshot(cwd).records.find(({ entry }) => entry.provider === "codex")?.entry;
 }
 
 function mutableConfig(persisted: PersistedConfig): MutableDaemonConfig {
@@ -77,7 +79,7 @@ function mutableConfig(persisted: PersistedConfig): MutableDaemonConfig {
     relay: { enabled: false },
     mcp: { enabled: true, injectIntoAgents: false },
     browserTools: { enabled: false },
-    providers: persisted.agents?.providers ?? CONTROLLED_PROVIDERS,
+    providers: CONTROLLED_PROVIDERS,
     metadataGeneration: { providers: [] },
     autoArchiveAfterMerge: false,
     enableTerminalAgentHooks: false,
@@ -108,7 +110,7 @@ describe("mutable provider config owner", () => {
     const cwd = path.resolve("/tmp/provider-config-owner");
     manager.getSnapshot(cwd);
     const events: string[] = [];
-    manager.on("change", (_entries, changedCwd) => events.push(changedCwd));
+    manager.on("change", ({ current }) => events.push(current.cwd));
     let agentManagerState = manager.getAgentManagerProviderState();
     const unsubscribe = attachMutableProviderConfigOwner({
       store,
@@ -158,7 +160,6 @@ describe("mutable provider config owner", () => {
         git: { maxProcessesPerSecond: 64, maxProcessConcurrency: 8 },
       },
       app: { baseUrl: "https://before.example.test" },
-      agents: { providers: { codex: { enabled: true } } },
     };
     const configPath = path.join(paseoHome, "config.json");
     writeFileSync(configPath, `${JSON.stringify(initial, null, 2)}\n`, "utf-8");
@@ -177,7 +178,7 @@ describe("mutable provider config owner", () => {
     });
     manager.getSnapshot("/tmp/provider-config-owner");
     const events: string[] = [];
-    manager.on("change", (_entries, cwd) => events.push(cwd));
+    manager.on("change", ({ current }) => events.push(current.cwd));
     let registryUpdates = 0;
     const unsubscribe = attachMutableProviderConfigOwner({
       store,
@@ -242,6 +243,7 @@ describe("mutable provider config owner", () => {
     try {
       const originalRead = manager.getProvider({ cwd, provider: "codex", wait: true });
       await vi.waitFor(() => expect(catalogResolvers).toHaveLength(1));
+      expect(events).toEqual([]);
 
       store.patch({ providers: { codex: { enabled: true, label: "Reloaded Codex" } } });
       expect(events).toEqual(["loading:none"]);
@@ -282,23 +284,42 @@ describe("mutable provider config owner", () => {
     const cwd = path.resolve("/tmp/provider-config-rollback");
     const events: string[] = [];
     manager.on("change", recordCodexEvent(events));
+    const previousState = manager.getAgentManagerProviderState();
+    let agentManagerState = previousState;
     const unsubscribe = attachMutableProviderConfigOwner({
       store,
       providerSnapshotManager: manager,
-      updateProviderRegistry: () => undefined,
+      updateProviderRegistry: (state) => {
+        agentManagerState = state;
+      },
     });
+    const observedDuringApply: Array<{
+      label: string;
+      snapshot: ReturnType<ProviderSnapshotManager["getSnapshot"]>;
+    }> = [];
     const unsubscribeFailure = store.onApply(() => {
+      observedDuringApply.push({
+        label: manager.getProviderLabel("codex"),
+        snapshot: manager.getSnapshot(cwd),
+      });
       throw new Error("later owner failed");
     });
 
     try {
       const originalRead = manager.getProvider({ cwd, provider: "codex", wait: true });
       await vi.waitFor(() => expect(catalogResolvers).toHaveLength(1));
+      expect(events).toEqual([]);
 
+      const before = manager.getSnapshot(cwd);
       expect(() =>
         store.patch({ providers: { codex: { enabled: true, label: "Rejected Codex" } } }),
       ).toThrow("later owner failed");
       expect(events).toEqual([]);
+      expect(observedDuringApply).toEqual([{ label: "Codex", snapshot: before }]);
+      expect(observedDuringApply[0]!.snapshot).toBe(before);
+      expect(manager.getSnapshot(cwd)).toBe(before);
+      expect(agentManagerState).toEqual(previousState);
+      expect(agentManagerState.clients.codex).toBe(previousState.clients.codex);
 
       catalogResolvers[0]?.(catalog("original-model"));
       await expect(originalRead).resolves.toMatchObject({
@@ -309,8 +330,7 @@ describe("mutable provider config owner", () => {
         status: "ready",
         models: [{ id: "original-model" }],
       });
-      expect(events.length).toBeGreaterThan(0);
-      expect(new Set(events)).toEqual(new Set(["ready:original-model"]));
+      expect(events).toEqual(["ready:original-model"]);
       expect(catalogResolvers).toHaveLength(1);
     } finally {
       unsubscribeFailure();
diff --git a/packages/server/src/server/agent/mutable-provider-config-owner.ts b/packages/server/src/server/agent/mutable-provider-config-owner.ts
index 950a70e3c7..8ae589591c 100644
--- a/packages/server/src/server/agent/mutable-provider-config-owner.ts
+++ b/packages/server/src/server/agent/mutable-provider-config-owner.ts
@@ -11,35 +11,37 @@ export function attachMutableProviderConfigOwner(options: {
   providerSnapshotManager: ProviderSnapshotManager;
   updateProviderRegistry: (state: AgentManagerProviderState) => void;
 }): () => void {
-  let publishPendingProviderChange: (() => void) | null = null;
+  let commitPendingProviderChange: (() => void) | null = null;
 
   const unsubscribeApply = options.store.onApply((config, previous, details) => {
     if (equal(config.providers, previous.providers)) return () => undefined;
 
     const previousAgentManagerState =
       options.providerSnapshotManager.getAgentManagerProviderState();
-    const staged = options.providerSnapshotManager.stageMutableProviderConfig(config.providers, {
-      removeProviders: details.removedProviders,
-      replace: true,
-    });
+    const prepared = options.providerSnapshotManager.prepareMutableProviderConfig(
+      config.providers,
+      {
+        removeProviders: details.removedProviders,
+        replace: true,
+      },
+    );
     try {
-      options.updateProviderRegistry(staged.agentManagerState);
+      options.updateProviderRegistry(prepared.agentManagerState);
     } catch (error) {
-      staged.rollback();
+      options.updateProviderRegistry(previousAgentManagerState);
       throw error;
     }
-    publishPendingProviderChange = staged.publish;
+    commitPendingProviderChange = prepared.commit;
 
     return () => {
-      publishPendingProviderChange = null;
-      staged.rollback();
+      commitPendingProviderChange = null;
       options.updateProviderRegistry(previousAgentManagerState);
     };
   });
   const unsubscribeChange = options.store.onChange(() => {
-    const publish = publishPendingProviderChange;
-    publishPendingProviderChange = null;
-    publish?.();
+    const commit = commitPendingProviderChange;
+    commitPendingProviderChange = null;
+    commit?.();
   });
 
   return () => {
diff --git a/packages/server/src/server/agent/paseo-tool-policy.test.ts b/packages/server/src/server/agent/paseo-tool-policy.test.ts
new file mode 100644
index 0000000000..d5bc6c648b
--- /dev/null
+++ b/packages/server/src/server/agent/paseo-tool-policy.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, test } from "vitest";
+import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
+
+import { isPaseoToolEnabled, resolvePaseoToolPolicy } from "./paseo-tool-policy.js";
+
+describe("Paseo tool policy", () => {
+  test("defaults to all Paseo tools and resolves only the exact provider ID", () => {
+    const customPolicy = {
+      enabled: true,
+      disabledTools: ["list_agents"],
+    } satisfies ProviderPaseoToolsPolicy;
+
+    expect(
+      resolvePaseoToolPolicy("custom-claude", {
+        claude: { paseoTools: { enabled: false } },
+        "custom-claude": { paseoTools: customPolicy },
+      }),
+    ).toBe(customPolicy);
+    expect(resolvePaseoToolPolicy("other-custom", { claude: { paseoTools: customPolicy } })).toBe(
+      undefined,
+    );
+    expect(isPaseoToolEnabled(undefined, "list_agents")).toBe(true);
+  });
+
+  test("applies the provider gate and sparse disabled tools without filtering speak", () => {
+    expect(isPaseoToolEnabled({ enabled: false }, "list_agents")).toBe(false);
+    expect(isPaseoToolEnabled({ enabled: false }, "speak")).toBe(true);
+    expect(
+      isPaseoToolEnabled({ enabled: true, disabledTools: ["list_agents"] }, "list_agents"),
+    ).toBe(false);
+    expect(
+      isPaseoToolEnabled({ enabled: true, disabledTools: ["list_agents"] }, "create_agent"),
+    ).toBe(true);
+  });
+});
diff --git a/packages/server/src/server/agent/paseo-tool-policy.ts b/packages/server/src/server/agent/paseo-tool-policy.ts
new file mode 100644
index 0000000000..1089fb76e8
--- /dev/null
+++ b/packages/server/src/server/agent/paseo-tool-policy.ts
@@ -0,0 +1,29 @@
+import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
+
+interface ProviderPaseoToolSettings {
+  paseoTools?: ProviderPaseoToolsPolicy;
+}
+
+export function resolvePaseoToolPolicy(
+  providerId: string,
+  providerSettings: Readonly<Record<string, ProviderPaseoToolSettings>> | undefined,
+): ProviderPaseoToolsPolicy | undefined {
+  return providerSettings?.[providerId]?.paseoTools;
+}
+
+export function isPaseoToolEnabled(
+  policy: ProviderPaseoToolsPolicy | undefined,
+  toolName: string,
+): boolean {
+  if (toolName === "speak") {
+    return true;
+  }
+  if (!isPaseoToolPolicyEnabled(policy)) {
+    return false;
+  }
+  return !policy?.disabledTools?.includes(toolName);
+}
+
+export function isPaseoToolPolicyEnabled(policy: ProviderPaseoToolsPolicy | undefined): boolean {
+  return policy?.enabled !== false;
+}
diff --git a/packages/server/src/server/agent/plugin-provider.test.ts b/packages/server/src/server/agent/plugin-provider.test.ts
new file mode 100644
index 0000000000..8b894a7765
--- /dev/null
+++ b/packages/server/src/server/agent/plugin-provider.test.ts
@@ -0,0 +1,1123 @@
+import { relative } from "node:path";
+import type {
+  ProviderConnection,
+  ProviderLaunch,
+  ProviderEvent,
+  ProviderInput,
+  ProviderRegistration,
+} from "@getpaseo/plugin/server/provider";
+import { setImmediate as nextTurn } from "node:timers/promises";
+import { describe, expect, test } from "vitest";
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import type { AgentClient, AgentStreamEvent } from "./agent-sdk-types.js";
+import { toStoredAgentRecord } from "./agent-projections.js";
+import { AgentManager } from "./agent-manager.js";
+import { buildProviderRegistry } from "./provider-registry.js";
+import { ProviderOverrideSchema } from "@getpaseo/protocol/provider-config";
+import { PluginAgentClientRegistry } from "./plugin-provider.js";
+import {
+  isStaleProviderSessionError,
+  StaleProviderSessionError,
+} from "./stale-provider-session-error.js";
+
+const CAPABILITIES = [
+  "prompt.message",
+  "session.configure",
+  "session.persistence",
+  "session.subsession",
+  "permission",
+] as const;
+
+interface ProviderHarnessOptions {
+  capabilities?: ProviderConnection["capabilities"];
+  completeTurn?: boolean;
+  openChildren?: (rootSessionId: string, emit: (event: ProviderEvent) => void) => void;
+  handleInput?: (input: ProviderInput, emit: (event: ProviderEvent) => void) => Promise<boolean>;
+}
+
+function createProviderHarness(options: ProviderHarnessOptions = {}) {
+  let listener: ((event: ProviderEvent) => void) | null = null;
+  let closeCount = 0;
+  let resolveClosed!: () => void;
+  const closed = new Promise<void>((resolve) => {
+    resolveClosed = resolve;
+  });
+  const inputs: ProviderInput[] = [];
+  const emit = (event: ProviderEvent) => listener?.(event);
+  const capabilities = options.capabilities ?? CAPABILITIES;
+
+  const connection: ProviderConnection = {
+    version: 1,
+    capabilities,
+    async send(input) {
+      inputs.push(input);
+      if (await options.handleInput?.(input, emit)) return;
+      if (input.type === "catalog") {
+        emit({
+          type: "catalog",
+          requestId: input.requestId,
+          catalog: {
+            models: [{ id: "plugin-model", label: "Plugin model" }],
+            modes: [{ id: "build", label: "Build" }],
+            thinkingOptions: [{ id: "deep", label: "Deep" }],
+            defaultModel: "plugin-model",
+            defaultMode: "build",
+            defaultThinkingOption: "deep",
+          },
+        });
+        return;
+      }
+      if (input.type === "session.open") {
+        emit({
+          type: "session.opened",
+          requestId: input.requestId,
+          sessionId: input.sessionId,
+          capabilities,
+          restoration: "core",
+          persistence: { version: 1, data: { token: "root" } },
+          cwd: input.config.cwd,
+        });
+        emit({
+          type: "session.config",
+          sessionId: input.sessionId,
+          config: {
+            model: "plugin-model",
+            mode: "build",
+            models: [{ id: "plugin-model", label: "Plugin model" }],
+            modes: [{ id: "build", label: "Build" }],
+            thinkingOptions: [],
+            settings: [
+              {
+                type: "select",
+                id: "voice",
+                label: "Voice",
+                value: "direct",
+                options: [{ label: "Direct", value: "direct" }],
+              },
+            ],
+          },
+        });
+        emit({
+          type: "session.opened",
+          sessionId: "child-1",
+          parentSessionId: input.sessionId,
+          capabilities: [],
+          restoration: "parent",
+          title: "Plugin child",
+          cwd: input.config.cwd,
+        });
+        emit({
+          type: "timeline.item",
+          sessionId: "child-1",
+          item: { type: "assistant_message", id: "child-message", text: "Child result" },
+        });
+        emit({
+          type: "session.turn",
+          sessionId: "child-1",
+          turnId: "child-turn",
+          state: "completed",
+        });
+        emit({ type: "session.ready", sessionId: "child-1" });
+        options.openChildren?.(input.sessionId, emit);
+        emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+        return;
+      }
+      if (input.type === "session.prompt") {
+        emit({
+          type: "session.prompt_result",
+          sessionId: input.sessionId,
+          clientMessageId: input.prompt.clientMessageId,
+          result: { type: "turn", turnId: "turn-1" },
+        });
+        emit({
+          type: "session.turn",
+          sessionId: input.sessionId,
+          turnId: "turn-1",
+          state: "started",
+        });
+        emit({
+          type: "timeline.item",
+          sessionId: input.sessionId,
+          item: { type: "assistant_message", id: "answer", text: "Hel" },
+        });
+        emit({
+          type: "timeline.item",
+          sessionId: input.sessionId,
+          item: { type: "assistant_message", id: "answer", text: "Hello" },
+        });
+        emit({
+          type: "session.permission",
+          sessionId: input.sessionId,
+          request: { id: "permission-1", name: "write", kind: "tool" },
+        });
+        if (options.completeTurn !== false) {
+          emit({
+            type: "session.turn",
+            sessionId: input.sessionId,
+            turnId: "turn-1",
+            state: "completed",
+          });
+        }
+        return;
+      }
+      if (input.type === "session.permission") {
+        emit({
+          type: "session.permission_resolved",
+          sessionId: input.sessionId,
+          permissionId: input.permissionId,
+        });
+        return;
+      }
+      if (input.type === "session.configure") {
+        emit({
+          type: "session.config",
+          sessionId: input.sessionId,
+          config: {
+            model: input.changes.model ?? "plugin-model",
+            mode: "build",
+            models: [{ id: "plugin-model", label: "Plugin model" }],
+            modes: [{ id: "build", label: "Build" }],
+            thinkingOptions: [],
+            settings: [],
+          },
+        });
+        emit({ type: "request.completed", requestId: input.requestId });
+        return;
+      }
+      if (input.type === "session.close") {
+        emit({ type: "session.closed", sessionId: input.sessionId });
+      }
+      if ("requestId" in input) {
+        emit({ type: "request.completed", requestId: input.requestId });
+      }
+    },
+    onEvent(nextListener) {
+      listener = nextListener;
+      return () => {
+        if (listener === nextListener) listener = null;
+      };
+    },
+    async close() {
+      closeCount += 1;
+      resolveClosed();
+    },
+  };
+
+  const registration: ProviderRegistration = {
+    id: "plugin-direct",
+    label: "Plugin direct",
+    async connect() {
+      return connection;
+    },
+  };
+
+  return {
+    registration,
+    emit,
+    inputs,
+    closeCount: () => closeCount,
+    waitForClose: () => closed,
+  };
+}
+
+function eventsOfType(events: AgentStreamEvent[], type: AgentStreamEvent["type"]) {
+  return events.filter((event) => event.type === type);
+}
+
+function openNestedChildren(rootSessionId: string, emit: (event: ProviderEvent) => void) {
+  for (const [sessionId, parentSessionId] of [
+    ["a", rootSessionId],
+    ["a.b", "a"],
+    ["a.b.c", "a.b"],
+    ["sibling", rootSessionId],
+  ]) {
+    emit({
+      type: "session.opened",
+      sessionId,
+      parentSessionId,
+      toolCallId: `${sessionId}-task`,
+      capabilities: [],
+      restoration: "parent",
+      cwd: "/workspace",
+    });
+    emit({
+      type: "timeline.item",
+      sessionId,
+      item: { type: "assistant_message", id: `${sessionId}-message`, text: sessionId },
+    });
+    emit({
+      type: "session.turn",
+      sessionId,
+      turnId: `${sessionId}-turn`,
+      state: "completed",
+    });
+  }
+}
+
+function expectNestedChildren(events: AgentStreamEvent[]) {
+  for (const [id, parentSubagentId] of [
+    ["a", null],
+    ["a.b", "a"],
+    ["a.b.c", "a.b"],
+    ["sibling", null],
+  ]) {
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({
+          type: "upsert",
+          id,
+          parentSubagentId,
+          toolCallId: `${id}-task`,
+          status: "running",
+        }),
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({
+          type: "timeline",
+          id,
+          item: expect.objectContaining({ text: id }),
+        }),
+      }),
+    );
+  }
+}
+
+describe("PluginAgentClientRegistry", () => {
+  test("stores only agent options while the plugin receives merged defaults", async () => {
+    const logger = createTestLogger();
+    const harness = createProviderHarness();
+    const plugins = new PluginAgentClientRegistry(logger);
+    plugins.replace([harness.registration]);
+    const registry = buildProviderRegistry(logger, {
+      pluginProviders: plugins.definitions(),
+      providerOverrides: {
+        "plugin-direct": { options: { nested: { base: true, replace: "config" } } },
+      },
+    });
+    const manager = new AgentManager({
+      logger,
+      clients: { "plugin-direct": registry["plugin-direct"].createClient(logger) },
+      providerDefinitions: { "plugin-direct": registry["plugin-direct"] },
+    });
+    const own = { nested: { replace: "agent" } };
+    const agent = await manager.createAgent(
+      { provider: "plugin-direct", cwd: "/tmp", providerOptions: own },
+      undefined,
+      { workspaceId: undefined },
+    );
+    expect(toStoredAgentRecord(agent).config?.providerOptions).toEqual(own);
+    expect(harness.inputs.find((input) => input.type === "session.open")).toMatchObject({
+      config: { providerOptions: { nested: { base: true, replace: "agent" } } },
+    });
+    await agent.session?.close();
+  });
+
+  test.each([
+    { options: { nested: { base: true, replace: "config" }, list: [1, 2], scalar: "config" } },
+    { params: { nested: { base: true, replace: "config" }, list: [1, 2], scalar: "config" } },
+    {
+      params: { ignored: true },
+      options: { nested: { base: true, replace: "config" }, list: [1, 2], scalar: "config" },
+    },
+  ])(
+    "merges configured options into plugin session.open, preserving caller input: %j",
+    async (override) => {
+      const logger = createTestLogger();
+      const harness = createProviderHarness();
+      const plugins = new PluginAgentClientRegistry(logger);
+      plugins.replace([harness.registration]);
+      const registry = buildProviderRegistry(logger, {
+        pluginProviders: plugins.definitions(),
+        providerOverrides: { "plugin-direct": ProviderOverrideSchema.parse(override) },
+      });
+      const client = registry["plugin-direct"].createClient(logger);
+      const defaultsSession = await client.createSession({
+        provider: "plugin-direct",
+        cwd: "/tmp",
+      });
+      const defaultsOpen = harness.inputs.findLast((input) => input.type === "session.open")!;
+      expect(defaultsOpen.config.providerOptions).toEqual({
+        nested: { base: true, replace: "config" },
+        list: [1, 2],
+        scalar: "config",
+      });
+      await defaultsSession.close();
+      const config = {
+        provider: "plugin-direct",
+        cwd: "/tmp",
+        providerOptions: { nested: { replace: "agent" }, list: [3], scalar: null },
+      };
+      const session = await client.createSession(config);
+      const open = harness.inputs.findLast((input) => input.type === "session.open")!;
+      expect(open.config.providerOptions).toEqual({
+        nested: { base: true, replace: "agent" },
+        list: [3],
+        scalar: null,
+      });
+      expect(config.providerOptions).toEqual({
+        nested: { replace: "agent" },
+        list: [3],
+        scalar: null,
+      });
+      const handle = session.describePersistence()!;
+      await session.close();
+      const updatedRegistry = buildProviderRegistry(logger, {
+        pluginProviders: plugins.definitions(),
+        providerOverrides: {
+          "plugin-direct": {
+            options: {
+              nested: { base: false, replace: "new-config" },
+              list: [4],
+              scalar: "new-config",
+            },
+          },
+        },
+      });
+      const resumed = await updatedRegistry["plugin-direct"]
+        .createClient(logger)
+        .resumeSession(handle, config);
+      const resumedOpen = harness.inputs.findLast((input) => input.type === "session.open")!;
+      expect(resumedOpen.config.providerOptions).toEqual({
+        nested: { base: false, replace: "agent" },
+        list: [3],
+        scalar: null,
+      });
+      await resumed.close();
+    },
+  );
+
+  test.each([false, true])(
+    "contains a failed session open while send is pending: %s",
+    async (pendingSend) => {
+      let listener: ((event: ProviderEvent) => void) | undefined;
+      const unhandled: unknown[] = [];
+      const observeUnhandled = (reason: unknown) => unhandled.push(reason);
+      const registry = new PluginAgentClientRegistry(createTestLogger());
+      registry.replace([
+        {
+          id: "failing-provider",
+          label: "Failing provider",
+          async connect() {
+            return {
+              version: 1,
+              capabilities: ["session.persistence"],
+              async send(input) {
+                if (input.type !== "session.open") return;
+                listener?.({
+                  type: "request.failed",
+                  requestId: input.requestId,
+                  error: { message: "OMP persistent session registration is in progress" },
+                });
+                // Keep acceptance pending across a Node event-loop turn, as IPC can do.
+                if (pendingSend) await nextTurn();
+              },
+              onEvent(nextListener) {
+                listener = nextListener;
+                return () => {
+                  listener = undefined;
+                };
+              },
+              async close() {},
+            };
+          },
+        },
+      ]);
+      process.on("unhandledRejection", observeUnhandled);
+      try {
+        await expect(
+          registry.clients()["failing-provider"]!.createSession({
+            provider: "failing-provider",
+            cwd: "/workspace",
+          }),
+        ).rejects.toThrow("OMP persistent session registration is in progress");
+        await nextTurn();
+        expect(unhandled).toEqual([]);
+      } finally {
+        await registry.shutdown();
+        process.off("unhandledRejection", observeUnhandled);
+      }
+    },
+  );
+
+  test("preserves nested provider child ownership during opening", async () => {
+    const harness = createProviderHarness({ openChildren: openNestedChildren });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const session = await registry.clients()[harness.registration.id]!.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    try {
+      const events: AgentStreamEvent[] = [];
+      for await (const event of session.streamHistory()) events.push(event);
+      expectNestedChildren(events);
+    } finally {
+      await session.close();
+      registry.replace([]);
+    }
+  });
+
+  test("preserves nested provider child ownership during live events", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const session = await registry.clients()[harness.registration.id]!.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    try {
+      const events: AgentStreamEvent[] = [];
+      session.subscribe((event) => events.push(event));
+      const open = harness.inputs.find((input) => input.type === "session.open")!;
+      openNestedChildren(open.sessionId, harness.emit);
+      expectNestedChildren(events);
+    } finally {
+      await session.close();
+      registry.replace([]);
+    }
+  });
+
+  test("gates persistence operations on negotiated provider capabilities", async () => {
+    const harness = createProviderHarness({ capabilities: ["session.persistence"] });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id]!;
+
+    await expect(client.isAvailable()).resolves.toBe(true);
+    expect(client.capabilities).toMatchObject({
+      supportsSessionPersistence: true,
+      supportsSessionListing: false,
+    });
+    await expect(client.listImportableSessions?.()).resolves.toEqual([]);
+
+    const persistence = {
+      provider: harness.registration.id,
+      sessionId: 'plugin:{"version":1,"data":{"token":"root"}}',
+      metadata: { pluginProviderPersistence: { version: 1, data: { token: "root" } } },
+    };
+    await expect(client.archiveNativeSession?.(persistence)).resolves.toBeUndefined();
+    await expect(client.unarchiveNativeSession?.(persistence)).resolves.toBeUndefined();
+    expect(harness.inputs).toEqual([]);
+    await registry.shutdown();
+  });
+
+  test("terminalizes an active turn exactly once when its plugin provider is removed", async () => {
+    const harness = createProviderHarness({ completeTurn: false });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id]!;
+    const session = await client.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    const run = session.run("hello", { clientMessageId: "active-message" });
+    void run.catch(() => undefined);
+    await expect.poll(() => eventsOfType(events, "turn_started")).toHaveLength(1);
+
+    registry.replace([]);
+
+    await expect
+      .poll(() => eventsOfType(events, "turn_failed"))
+      .toEqual([
+        expect.objectContaining({
+          type: "turn_failed",
+          provider: harness.registration.id,
+          turnId: "turn-1",
+          error: "Provider connection closed",
+        }),
+      ]);
+    await expect(run).rejects.toThrow("Provider connection closed");
+    await expect.poll(harness.closeCount).toBe(1);
+
+    registry.replace([]);
+    expect(eventsOfType(events, "turn_failed")).toHaveLength(1);
+  });
+
+  test("leaves a completed session without a failure when its plugin provider is removed", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const session = await registry.clients()[harness.registration.id]!.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    await session.run("hello", { clientMessageId: "completed-message" });
+    expect(eventsOfType(events, "turn_completed")).toHaveLength(1);
+
+    registry.replace([]);
+    await harness.waitForClose();
+
+    expect(eventsOfType(events, "turn_failed")).toEqual([]);
+    await expect(
+      session.startTurn("after reload", { clientMessageId: "after-reload" }),
+    ).rejects.toBeInstanceOf(StaleProviderSessionError);
+  });
+
+  test("fails an accepted turn that has not started when its plugin provider is removed", async () => {
+    const harness = createProviderHarness({
+      handleInput: async (input, emit) => {
+        if (input.type !== "session.prompt") return false;
+        emit({
+          type: "session.prompt_result",
+          sessionId: input.sessionId,
+          clientMessageId: input.prompt.clientMessageId,
+          result: { type: "turn", turnId: "accepted-turn" },
+        });
+        return true;
+      },
+    });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const session = await registry.clients()[harness.registration.id]!.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    await expect(
+      session.startTurn("hello", { clientMessageId: "accepted-message" }),
+    ).resolves.toEqual({ turnId: "accepted-turn" });
+
+    registry.replace([]);
+    await harness.waitForClose();
+
+    expect(eventsOfType(events, "turn_failed")).toEqual([
+      expect.objectContaining({ error: "Provider connection closed" }),
+    ]);
+  });
+
+  test("closes a stale session after its plugin provider is replaced", async () => {
+    const old = createProviderHarness();
+    const next = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+
+    try {
+      registry.replace([old.registration]);
+
+      const stale = await registry.clients()[old.registration.id]!.createSession({
+        provider: old.registration.id,
+        cwd: "/workspace",
+      });
+      const persistence = stale.describePersistence();
+      expect(persistence).not.toBeNull();
+
+      registry.replace([next.registration]);
+      await old.waitForClose();
+      expect(old.closeCount()).toBe(1);
+
+      await expect(stale.close()).resolves.toBeUndefined();
+
+      const replacement = registry.clients()[next.registration.id];
+      expect(replacement).toBeDefined();
+      const resumed = await replacement!.resumeSession(persistence!, {
+        cwd: "/workspace",
+      });
+
+      await expect(
+        resumed.startTurn("after reload", { clientMessageId: "after-reload" }),
+      ).resolves.toEqual({ turnId: "turn-1" });
+
+      expect(next.inputs).toContainEqual(
+        expect.objectContaining({
+          type: "session.open",
+          history: "replay",
+          persistence: {
+            version: 1,
+            data: { token: "root" },
+          },
+        }),
+      );
+
+      await resumed.close();
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test("prompting a stale session raises StaleProviderSessionError", async () => {
+    const old = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+
+    try {
+      registry.replace([old.registration]);
+      const stale = await registry.clients()[old.registration.id]!.createSession({
+        provider: old.registration.id,
+        cwd: "/workspace",
+      });
+
+      registry.replace([]);
+      await old.waitForClose();
+      expect(old.closeCount()).toBe(1);
+
+      const failure = await stale
+        .startTurn("after reload", { clientMessageId: "after-reload" })
+        .then(
+          () => null,
+          (error: unknown) => error,
+        );
+      expect(failure).toBeInstanceOf(StaleProviderSessionError);
+      expect(isStaleProviderSessionError(failure)).toBe(true);
+      expect(isStaleProviderSessionError(new Error("Provider connection is closed"))).toBe(false);
+      expect(isStaleProviderSessionError(new Error("boom"))).toBe(false);
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test("adapts callback providers into the existing AgentClient and AgentSession path", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id];
+    expect(client).toBeDefined();
+
+    await expect(client!.fetchCatalog({ scope: "global", force: false })).resolves.toMatchObject({
+      models: [
+        {
+          provider: "plugin-direct",
+          id: "plugin-model",
+          isDefault: true,
+          thinkingOptions: [{ id: "deep", label: "Deep" }],
+          defaultThinkingOptionId: "deep",
+        },
+      ],
+      modes: [{ id: "build" }],
+      defaultModeId: "build",
+    });
+
+    const session = await client!.createSession({ provider: "plugin-direct", cwd: "/workspace" });
+    expect(session.features).toEqual([
+      expect.objectContaining({
+        type: "select",
+        id: "voice",
+        options: [{ id: "direct", label: "Direct", value: "direct" }],
+      }),
+    ]);
+    expect(session.describePersistence()).toMatchObject({
+      provider: "plugin-direct",
+      metadata: { pluginProviderPersistence: { version: 1, data: { token: "root" } } },
+    });
+
+    const history: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) history.push(event);
+    expect(history).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({ type: "timeline", id: "child-1" }),
+      }),
+    );
+    expect(history).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({ type: "upsert", id: "child-1", status: "completed" }),
+      }),
+    );
+
+    const events: AgentStreamEvent[] = [];
+    const unsubscribe = session.subscribe((event) => events.push(event));
+    await expect(
+      session.startTurn("hello", { clientMessageId: "client-message" }),
+    ).resolves.toEqual({ turnId: "turn-1" });
+    expect(
+      events
+        .filter((event) => event.type === "timeline")
+        .map((event) => (event.type === "timeline" ? event.item : null)),
+    ).toEqual([
+      { type: "assistant_message", text: "Hel", messageId: "answer" },
+      { type: "assistant_message", text: "lo", messageId: "answer" },
+    ]);
+    expect(session.getPendingPermissions()).toEqual([
+      expect.objectContaining({ id: "permission-1", provider: "plugin-direct" }),
+    ]);
+
+    await session.respondToPermission("permission-1", { behavior: "allow" });
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "permission_resolved",
+        requestId: "permission-1",
+        resolution: { behavior: "allow" },
+      }),
+    );
+    await session.setModel?.("plugin-model");
+    expect(await session.getRuntimeInfo()).toMatchObject({
+      model: "plugin-model",
+      modeId: "build",
+    });
+
+    unsubscribe();
+    await session.close();
+    registry.replace([]);
+    await expect.poll(harness.closeCount).toBe(1);
+    expect(harness.inputs.map((input) => input.type)).toContain("session.close");
+  });
+});
+
+type RequestKind = "session.open" | "catalog" | "session.configure" | "session.prompt";
+
+async function requestFromClient(client: AgentClient, kind: RequestKind): Promise<unknown> {
+  if (kind === "catalog") return client.fetchCatalog({ scope: "global" });
+  const session = await client.createSession({ provider: client.provider, cwd: "/workspace" });
+  if (kind === "session.open") return session;
+  if (kind === "session.configure") return session.setMode("build");
+  return session.startTurn("hello", { clientMessageId: "pending-message" });
+}
+
+async function withObservedProvider(
+  options: ProviderHarnessOptions,
+  run: (client: AgentClient, registry: PluginAgentClientRegistry) => Promise<void>,
+): Promise<void> {
+  const harness = createProviderHarness(options);
+  const registry = new PluginAgentClientRegistry(createTestLogger());
+  const unhandled: unknown[] = [];
+  const observe = (reason: unknown) => unhandled.push(reason);
+  process.on("unhandledRejection", observe);
+  registry.replace([harness.registration]);
+  try {
+    await run(registry.clients()[harness.registration.id]!, registry);
+    await registry.shutdown();
+    await nextTurn();
+    expect(unhandled).toEqual([]);
+  } finally {
+    await registry.shutdown();
+    process.off("unhandledRejection", observe);
+  }
+}
+
+test("commits notices emitted during session open as the initial timeline with stable history timestamps", async () => {
+  await withObservedProvider(
+    {
+      openChildren(sessionId, emit) {
+        emit({
+          type: "session.notice",
+          sessionId,
+          notice: {
+            id: "startup",
+            severity: "warning",
+            title: "Full access",
+            description: "Tools run without asking.",
+          },
+        });
+        emit({
+          type: "session.notice",
+          sessionId,
+          notice: { id: "dismissed", severity: "info", title: "Hidden", dismissed: true },
+        });
+      },
+    },
+    async (client) => {
+      const session = await client.createSession({ provider: client.provider, cwd: "/workspace" });
+      try {
+        expect(session.initialTimeline).toEqual([
+          {
+            timestamp: expect.any(String),
+            item: {
+              type: "notification",
+              level: "warning",
+              message: "Full access\nTools run without asking.",
+            },
+          },
+        ]);
+        const history: AgentStreamEvent[] = [];
+        for await (const event of session.streamHistory()) history.push(event);
+        expect(
+          history.filter(
+            (event) => event.type === "timeline" && event.item.type === "notification",
+          ),
+        ).toEqual([
+          { type: "timeline", provider: client.provider, ...session.initialTimeline![0] },
+        ]);
+      } finally {
+        await session.close();
+      }
+    },
+  );
+});
+
+describe("pending provider responses", () => {
+  test.each<RequestKind>(["session.open", "catalog", "session.configure", "session.prompt"])(
+    "preserves the send error for %s",
+    async (kind) => {
+      const failure = new Error("Provider send failed");
+      await withObservedProvider(
+        {
+          async handleInput(input) {
+            if (input.type === kind) throw failure;
+            return false;
+          },
+        },
+        async (client) => {
+          await expect(requestFromClient(client, kind)).rejects.toBe(failure);
+        },
+      );
+    },
+  );
+
+  test.each([
+    [
+      "catalog",
+      expect.objectContaining({
+        models: [expect.objectContaining({ id: "plugin-model", isDefault: true })],
+        defaultModeId: "build",
+      }),
+    ],
+    ["session.configure", undefined],
+  ] as const)(
+    "contains an early request.failed for %s and permits a successful retry",
+    async (kind, result) => {
+      let failed = false;
+      await withObservedProvider(
+        {
+          async handleInput(input, emit) {
+            if (input.type !== kind || !("requestId" in input) || failed) return false;
+            failed = true;
+            emit({
+              type: "request.failed",
+              requestId: input.requestId,
+              error: { message: "Provider request failed", code: "busy", diagnostic: "retry" },
+            });
+            await nextTurn();
+            return true;
+          },
+        },
+        async (client) => {
+          await expect(requestFromClient(client, kind)).rejects.toMatchObject({
+            message: "Provider request failed",
+            code: "busy",
+            diagnostic: "retry",
+          });
+          await expect(requestFromClient(client, kind)).resolves.toEqual(result);
+        },
+      );
+    },
+  );
+
+  test.each([
+    ["session.open", "Provider session closed"],
+    ["session.configure", "Provider session closed"],
+    ["session.prompt", StaleProviderSessionError],
+  ] as const)("contains session closure while accepting %s", async (kind, error) => {
+    await withObservedProvider(
+      {
+        async handleInput(input, emit) {
+          if (input.type !== kind || !("sessionId" in input)) return false;
+          emit({
+            type: "session.closed",
+            sessionId: input.sessionId,
+            error: { message: "Provider session closed" },
+          });
+          await nextTurn();
+          return true;
+        },
+      },
+      async (client) => {
+        await expect(requestFromClient(client, kind)).rejects.toThrow(error);
+      },
+    );
+  });
+
+  test.each([
+    ["session.open", "Provider connection closed"],
+    ["catalog", "Provider closed"],
+    ["session.configure", "Provider closed"],
+    ["session.prompt", StaleProviderSessionError],
+  ] as const)("contains connection shutdown while accepting %s", async (kind, error) => {
+    let disconnect!: () => Promise<void>;
+    await withObservedProvider(
+      {
+        async handleInput(input) {
+          if (input.type !== kind) return false;
+          await disconnect();
+          await nextTurn();
+          return true;
+        },
+      },
+      async (client, registry) => {
+        disconnect = () => registry.shutdown();
+        await expect(requestFromClient(client, kind)).rejects.toThrow(error);
+      },
+    );
+  });
+
+  test.each([true, false])(
+    "preserves cancellation with acceptance pending: %s",
+    async (pending) => {
+      const controller = new AbortController();
+      const reason = new Error("Catalog refresh cancelled");
+      await withObservedProvider(
+        {
+          async handleInput(input) {
+            if (input.type !== "catalog") return false;
+            if (pending) {
+              controller.abort(reason);
+              await nextTurn();
+            } else {
+              setImmediate(() => controller.abort(reason));
+            }
+            return true;
+          },
+        },
+        async (client) => {
+          await expect(
+            client.fetchCatalog({ scope: "global" }, { signal: controller.signal }),
+          ).rejects.toBe(reason);
+        },
+      );
+    },
+  );
+});
+
+describe("plugin provider launch and status", () => {
+  test("resolves the executable against the provider's PATH override", async () => {
+    const harness = createProviderHarness();
+    const registration: ProviderRegistration = { ...harness.registration, command: ["node"] };
+    const logger = createTestLogger();
+    const registry = new PluginAgentClientRegistry(logger);
+    registry.replace([registration]);
+    try {
+      const definition = registry.definitions()[registration.id]!;
+      const client = definition.createClient(logger, { env: { PATH: "/paseo-nonexistent-bin" } });
+      expect(await client.isAvailable()).toBe(false);
+      expect(await client.getDiagnostic!()).toEqual({ diagnostic: "node not found on PATH" });
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test("strips parent-session and daemon-control variables from session env overlays", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    try {
+      const client = registry.clients()[harness.registration.id]!;
+      await client.createSession(
+        { provider: harness.registration.id, cwd: "/workspace" },
+        {
+          env: {
+            SESSION_TOKEN: "session",
+            PASEO_AGENT_ID: "agent",
+            CLAUDECODE: "parent",
+            PASEO_NODE_ENV: "development",
+          },
+        },
+      );
+      const input = harness.inputs.find((value) => value.type === "session.open");
+      expect(input).toMatchObject({
+        config: { env: { SESSION_TOKEN: "session", PASEO_AGENT_ID: "agent" } },
+      });
+      if (input?.type !== "session.open") throw new Error("Expected session.open");
+      expect(input.config.env).not.toHaveProperty("CLAUDECODE");
+      expect(input.config.env).not.toHaveProperty("PASEO_NODE_ENV");
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test("resolves relative executable paths before sending launch data", async () => {
+    const harness = createProviderHarness();
+    const launches: Array<ProviderLaunch | undefined> = [];
+    const registration: ProviderRegistration = {
+      ...harness.registration,
+      command: [relative(process.cwd(), process.execPath)],
+      async connect(request) {
+        launches.push(request.launch);
+        return harness.registration.connect(request);
+      },
+    };
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([registration]);
+    try {
+      await registry.clients()[registration.id]!.fetchCatalog({ scope: "global" });
+      expect(launches).toMatchObject([{ command: process.execPath }]);
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test("a missing executable is unavailable with a diagnostic without connecting", async () => {
+    const harness = createProviderHarness();
+    const registration: ProviderRegistration = {
+      ...harness.registration,
+      command: ["paseo-nonexistent-provider-executable"],
+    };
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([registration]);
+    try {
+      const client = registry.clients()[registration.id]!;
+      expect(await client.isAvailable()).toBe(false);
+      expect(await client.getDiagnostic!()).toEqual({
+        diagnostic: "paseo-nonexistent-provider-executable not found on PATH",
+      });
+      expect(harness.inputs).toEqual([]);
+    } finally {
+      await registry.shutdown();
+    }
+  });
+
+  test.each([
+    { mode: "default" as const },
+    { mode: "append" as const, args: ["extra"] },
+    { mode: "replace" as const, argv: [process.execPath, "replacement"] },
+  ])(
+    "resolves $mode launch and supplies identical data to status, catalogue identity, and connect",
+    async (command) => {
+      const harness = createProviderHarness();
+      const launches: Array<ProviderLaunch | undefined> = [];
+      const registration: ProviderRegistration = {
+        ...harness.registration,
+        command: [process.execPath, "default"],
+        async status(request) {
+          launches.push(request.launch);
+          return { available: true };
+        },
+        async getCatalogCacheKey(options) {
+          launches.push(options.launch);
+          return "shared";
+        },
+        async connect(request) {
+          launches.push(request.launch);
+          return harness.registration.connect(request);
+        },
+      };
+      const logger = createTestLogger();
+      const registry = new PluginAgentClientRegistry(logger);
+      registry.replace([registration]);
+      try {
+        const client = registry.definitions()[registration.id]!.createClient(logger, {
+          command,
+          env: { PLUGIN_SETTING: "custom", CLAUDECODE: "parent" },
+        });
+        expect(await client.isAvailable()).toBe(true);
+        expect(await client.getCatalogCacheKey!({ scope: "global" })).toBe("shared");
+        await client.fetchCatalog({ scope: "global" });
+        let expectedArgs = ["default"];
+        if (command.mode === "replace") expectedArgs = ["replacement"];
+        if (command.mode === "append") expectedArgs = ["default", "extra"];
+        expect(launches).toHaveLength(3);
+        for (const launch of launches) {
+          expect(launch).toMatchObject({
+            command: process.execPath,
+            args: expectedArgs,
+            env: { PLUGIN_SETTING: "custom" },
+          });
+          expect(launch!.env).not.toHaveProperty("CLAUDECODE");
+          expect(launch!.env).not.toHaveProperty("PASEO_NODE_ENV");
+        }
+        expect(launches[0]).toEqual(launches[1]);
+        expect(launches[1]).toEqual(launches[2]);
+      } finally {
+        await registry.shutdown();
+      }
+    },
+  );
+});
diff --git a/packages/server/src/server/agent/plugin-provider.ts b/packages/server/src/server/agent/plugin-provider.ts
new file mode 100644
index 0000000000..58bddd07b6
--- /dev/null
+++ b/packages/server/src/server/agent/plugin-provider.ts
@@ -0,0 +1,1767 @@
+import { randomUUID } from "node:crypto";
+import { resolve as resolvePath } from "node:path";
+import type { Logger } from "pino";
+import type { JsonValue } from "@getpaseo/protocol/agent-types";
+import { z } from "zod";
+import {
+  PROVIDER_CAPABILITIES,
+  PROVIDER_PROTOCOL_VERSION,
+  ProviderEventSchema,
+  ProviderInputSchema,
+  ProviderStatusSchema,
+  type ProviderStatus,
+  type ProviderLaunch,
+  requireProviderCapabilities,
+  type ProviderCapability,
+  type ProviderConfigChanges,
+  type ProviderConfigState,
+  type ProviderConnection,
+  type ProviderError,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderPersistence,
+  type ProviderPrompt,
+  type ProviderRegistration,
+  type ProviderSessionConfig,
+  type ProviderContent,
+  type ProviderTimelineItem,
+} from "@getpaseo/plugin/server/provider";
+import type {
+  AgentCapabilityFlags,
+  AgentClient,
+  AgentCreateSessionOptions,
+  AgentFeature,
+  AgentLaunchContext,
+  AgentMode,
+  AgentModelDefinition,
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  AgentPersistenceHandle,
+  AgentPromptInput,
+  AgentRunOptions,
+  AgentRunResult,
+  AgentSession,
+  AgentSessionConfig,
+  AgentSlashCommand,
+  AgentStreamEvent,
+  AgentTimelineItem,
+  FetchCatalogOptions,
+  ImportableProviderSession,
+  ImportedProviderSession,
+  ImportProviderSessionContext,
+  ImportProviderSessionInput,
+  ListImportableSessionsOptions,
+  ProviderCatalog,
+  ProviderRefreshContext,
+  SteerActiveTurnOptions,
+  SteerResult,
+} from "./agent-sdk-types.js";
+import {
+  resolveProviderLaunch,
+  checkProviderLaunchAvailable,
+  createProviderEnv,
+  type ProviderRuntimeSettings,
+} from "./provider-launch-config.js";
+import type { RegisteredProviderDefinition } from "./provider-registry.js";
+import { runProviderTurn } from "./providers/provider-runner.js";
+import { StaleProviderSessionError } from "./stale-provider-session-error.js";
+
+interface Deferred<Value> {
+  promise: Promise<Value>;
+  resolve(value: Value): void;
+  reject(error: Error): void;
+}
+
+interface PendingRequest {
+  kind: ProviderInput["type"];
+  sessionId?: string;
+  resolve(event: ProviderEvent): void;
+  reject(error: Error): void;
+}
+
+interface PendingOpenDescendantState {
+  readonly providerSessionIds: Set<string>;
+  readonly events: ProviderEvent[];
+}
+
+interface OpenProviderSessionInput {
+  sessionId: string;
+  config: ProviderSessionConfig;
+  persistence?: ProviderPersistence;
+  history: "replay" | "skip";
+}
+
+function deferred<Value>(): Deferred<Value> {
+  let resolve!: (value: Value) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<Value>((onResolve, onReject) => {
+    resolve = onResolve;
+    reject = onReject;
+  });
+  // Provider events can reject before send() settles and the caller awaits this promise.
+  // Observe that interval without replacing the rejecting promise returned to the caller.
+  void promise.catch(() => undefined);
+  return { promise, resolve, reject };
+}
+
+function providerError(error: ProviderError): Error {
+  return Object.assign(new Error(error.message), {
+    code: error.code,
+    diagnostic: error.diagnostic,
+  });
+}
+
+function isProviderRequestReply(
+  event: ProviderEvent,
+): event is Extract<ProviderEvent, { type: "request.completed" | "catalog" | "sessions" }> {
+  return (
+    event.type === "request.completed" || event.type === "catalog" || event.type === "sessions"
+  );
+}
+
+class ProviderRuntime {
+  private connection: ProviderConnection | null = null;
+  private connecting: Promise<ProviderConnection> | null = null;
+  private closed = false;
+  private generation = 0;
+  private closePromise: Promise<void> | null = null;
+  private unsubscribe: (() => void) | null = null;
+  private readonly sessions = new Map<string, ProviderRuntimeSession>();
+  private readonly providerSessions = new Map<string, ProviderRuntimeSession>();
+  private readonly sessionListeners = new Set<
+    (
+      session: ProviderRuntimeSession,
+      event: Extract<ProviderEvent, { type: "session.opened" }>,
+    ) => void
+  >();
+  private readonly requests = new Map<string, PendingRequest>();
+  private readonly sessionRequests = new Map<string, string>();
+  private readonly pendingOpenDescendants = new Map<string, PendingOpenDescendantState>();
+  private readonly pendingOpenDescendantsByRoot = new Map<
+    ProviderRuntimeSession,
+    PendingOpenDescendantState
+  >();
+
+  constructor(
+    private readonly registration: ProviderRegistration,
+    private readonly runtimeSettings?: ProviderRuntimeSettings,
+  ) {}
+
+  private async resolveLaunch(): Promise<ProviderLaunch | undefined> {
+    const command = this.registration.command;
+    if (!command) return undefined;
+    const launch = await resolveProviderLaunch({
+      commandConfig: this.runtimeSettings?.command,
+      defaultBinary: command[0],
+    });
+    if (launch.source !== "override") launch.args.unshift(...command.slice(1));
+    const env = createProviderEnv({ runtimeSettings: this.runtimeSettings });
+    launch.env = env;
+    const availability = await checkProviderLaunchAvailable(launch);
+    if (!availability.resolvedPath) throw new Error(`${launch.command} not found on PATH`);
+    return { command: resolvePath(availability.resolvedPath), args: launch.args, env };
+  }
+
+  async status(): Promise<ProviderStatus> {
+    try {
+      const launch = await this.resolveLaunch();
+      if (this.registration.status)
+        return ProviderStatusSchema.parse(await this.registration.status({ launch }));
+      if (!this.registration.command) await this.getConnection();
+      return { available: true };
+    } catch (error) {
+      return {
+        available: false,
+        diagnostic: error instanceof Error ? error.message : String(error),
+      };
+    }
+  }
+
+  async catalogCacheKey(options: FetchCatalogOptions): Promise<string | undefined> {
+    const callback = this.registration.getCatalogCacheKey;
+    if (!callback) return undefined;
+    return callback({ ...options, launch: await this.resolveLaunch() });
+  }
+
+  get negotiatedCapabilities(): readonly string[] {
+    return this.connection?.capabilities ?? [];
+  }
+
+  get isClosed(): boolean {
+    return this.closed;
+  }
+
+  async isAvailable(): Promise<boolean> {
+    return (await this.status()).available;
+  }
+
+  async catalog(
+    cwd?: string,
+    signal?: AbortSignal,
+  ): Promise<Extract<ProviderEvent, { type: "catalog" }>["catalog"]> {
+    const event = await this.complete({ type: "catalog", requestId: randomUUID(), cwd }, signal);
+    if (event.type !== "catalog") throw new Error("Provider returned an invalid catalog response");
+    return event.catalog;
+  }
+
+  async listSessions(
+    input: {
+      query?: string;
+      cwd?: string;
+      limit?: number;
+    } = {},
+  ): Promise<Extract<ProviderEvent, { type: "sessions" }>["sessions"]> {
+    const connection = await this.getConnection();
+    if (!connection.capabilities.includes("session.list")) return [];
+    const event = await this.complete({ type: "sessions", requestId: randomUUID(), ...input });
+    if (event.type !== "sessions")
+      throw new Error("Provider returned an invalid sessions response");
+    return event.sessions;
+  }
+
+  onSessionOpened(
+    listener: (
+      session: ProviderRuntimeSession,
+      event: Extract<ProviderEvent, { type: "session.opened" }>,
+    ) => void,
+  ): () => void {
+    this.sessionListeners.add(listener);
+    return () => this.sessionListeners.delete(listener);
+  }
+
+  async openSession(input: OpenProviderSessionInput): Promise<ProviderRuntimeSession> {
+    if (this.sessions.has(input.sessionId)) {
+      throw new Error(`Provider session already exists: ${input.sessionId}`);
+    }
+    const connection = await this.getConnection();
+    requireProviderCapabilities(connection.capabilities, {
+      type: "session.open",
+      requestId: "capability-check",
+      ...input,
+    });
+    const session = new ProviderRuntimeSession(
+      this,
+      connection,
+      input.sessionId,
+      input.sessionId,
+      "core",
+    );
+    this.sessions.set(input.sessionId, session);
+    this.providerSessions.set(input.sessionId, session);
+    const requestId = randomUUID();
+    const ready = session.beginOpen(requestId);
+    this.sessionRequests.set(requestId, input.sessionId);
+    try {
+      await connection.send({
+        type: "session.open",
+        requestId,
+        sessionId: input.sessionId,
+        config: input.config,
+        persistence: input.persistence,
+        history: input.history,
+      });
+      await ready;
+      return session;
+    } catch (error) {
+      this.sessionRequests.delete(requestId);
+      this.discardPendingOpenDescendants(session);
+      this.sessions.delete(input.sessionId);
+      this.providerSessions.delete(input.sessionId);
+      throw error;
+    }
+  }
+
+  async archive(persistence: ProviderPersistence): Promise<void> {
+    const connection = await this.getConnection();
+    if (!connection.capabilities.includes("session.archive")) return;
+    await this.complete({ type: "session.archive", requestId: randomUUID(), persistence });
+  }
+
+  async unarchive(persistence: ProviderPersistence): Promise<void> {
+    const connection = await this.getConnection();
+    if (!connection.capabilities.includes("session.unarchive")) return;
+    await this.complete({ type: "session.unarchive", requestId: randomUUID(), persistence });
+  }
+
+  close(): Promise<void> {
+    if (this.closePromise) return this.closePromise;
+    this.closed = true;
+    this.generation += 1;
+    const connection = this.connection;
+    const connecting = connection ? null : this.connecting;
+    this.connection = null;
+    this.unsubscribe?.();
+    this.unsubscribe = null;
+    for (const session of this.sessions.values()) session.connectionClosed();
+    this.sessions.clear();
+    this.providerSessions.clear();
+    this.pendingOpenDescendants.clear();
+    this.pendingOpenDescendantsByRoot.clear();
+    this.sessionListeners.clear();
+    for (const request of this.requests.values()) request.reject(new Error("Provider closed"));
+    this.requests.clear();
+    this.closePromise = Promise.all([
+      connection?.close(),
+      connecting?.then(
+        () => undefined,
+        () => undefined,
+      ),
+    ]).then(() => undefined);
+    return this.closePromise;
+  }
+
+  async complete(
+    input: ProviderInput & { requestId: string },
+    signal?: AbortSignal,
+  ): Promise<ProviderEvent> {
+    signal?.throwIfAborted();
+    const connection = await this.getConnection();
+    signal?.throwIfAborted();
+    const pending = deferred<ProviderEvent>();
+    this.requests.set(input.requestId, {
+      kind: input.type,
+      sessionId:
+        "sessionId" in input
+          ? (this.providerSessions.get(input.sessionId)?.id ?? input.sessionId)
+          : undefined,
+      resolve: pending.resolve,
+      reject: pending.reject,
+    });
+    const abort = () => {
+      if (!this.requests.delete(input.requestId)) return;
+      pending.reject(
+        signal?.reason instanceof Error ? signal.reason : new Error("Provider request aborted"),
+      );
+    };
+    signal?.addEventListener("abort", abort, { once: true });
+    try {
+      await connection.send(input);
+      return await pending.promise;
+    } catch (error) {
+      this.requests.delete(input.requestId);
+      throw error;
+    } finally {
+      signal?.removeEventListener("abort", abort);
+    }
+  }
+
+  removeSession(sessionId: string, providerSessionId: string): void {
+    this.sessions.delete(sessionId);
+    this.providerSessions.delete(providerSessionId);
+  }
+
+  private getConnection(): Promise<ProviderConnection> {
+    if (this.closed) return Promise.reject(new Error("Provider runtime is closed"));
+    if (this.connection) return Promise.resolve(this.connection);
+    if (this.connecting) return this.connecting;
+    const generation = this.generation;
+    const connecting = this.establishConnection(generation);
+    this.connecting = connecting;
+    connecting.then(
+      () => {
+        if (this.connecting === connecting) this.connecting = null;
+        return undefined;
+      },
+      () => {
+        if (this.connecting === connecting) this.connecting = null;
+        return undefined;
+      },
+    );
+    return connecting;
+  }
+
+  private async establishConnection(generation: number): Promise<ProviderConnection> {
+    const rawConnection = await this.registration.connect({
+      launch: await this.resolveLaunch(),
+      versions: [PROVIDER_PROTOCOL_VERSION],
+      capabilities: PROVIDER_CAPABILITIES,
+    });
+    if (this.closed || generation !== this.generation) {
+      await rawConnection.close().catch(() => undefined);
+      throw new Error("Provider runtime is closed");
+    }
+    try {
+      this.validateConnection(rawConnection);
+    } catch (error) {
+      await rawConnection.close().catch(() => undefined);
+      throw error;
+    }
+    const connection = normalizeConnection(rawConnection);
+    const unsubscribe = connection.onEvent((event) => this.accept(event));
+    if (this.closed || generation !== this.generation) {
+      unsubscribe();
+      await connection.close().catch(() => undefined);
+      throw new Error("Provider runtime is closed");
+    }
+    this.unsubscribe = unsubscribe;
+    this.connection = connection;
+    return connection;
+  }
+
+  private validateConnection(connection: ProviderConnection): void {
+    if (connection.version !== PROVIDER_PROTOCOL_VERSION) {
+      throw new Error(`Provider selected unsupported version ${connection.version}`);
+    }
+  }
+
+  private accept(event: ProviderEvent): void {
+    if (event.type === "request.failed") {
+      this.failRequest(event);
+      return;
+    }
+    if (isProviderRequestReply(event)) {
+      this.finishRequest(event);
+      return;
+    }
+    this.finishSessionReadyRequest(event);
+    if (this.holdPendingOpenDescendant(event)) return;
+    if (this.acceptProviderChild(event)) return;
+    if ("sessionId" in event) {
+      const session = this.providerSessions.get(event.sessionId);
+      if (!session) return;
+      event = {
+        ...event,
+        sessionId: session.id,
+        ...(event.type === "session.opened" && event.parentSessionId
+          ? { parentSessionId: this.providerSessions.get(event.parentSessionId)?.id }
+          : {}),
+      } as ProviderEvent;
+    }
+    if (event.type === "session.runtime_failed") {
+      this.failSessionRequests(event.sessionId, providerError(event.error));
+    } else if (event.type === "session.closed") {
+      this.settleClosedSessionRequests(
+        event.sessionId,
+        new Error(event.error?.message ?? `Provider session ${event.sessionId} closed`),
+        event,
+      );
+    }
+    if ("sessionId" in event) {
+      const session = this.sessions.get(event.sessionId);
+      session?.accept(event);
+      if (event.type === "session.closed" && session) {
+        this.removeSession(session.id, session.providerId);
+      }
+    }
+  }
+
+  private finishSessionReadyRequest(event: ProviderEvent): void {
+    if (event.type !== "session.ready" || !event.requestId) return;
+    this.sessionRequests.delete(event.requestId);
+    const request = this.requests.get(event.requestId);
+    if (!request) return;
+    this.requests.delete(event.requestId);
+    request.resolve(event);
+  }
+
+  private acceptProviderChild(event: ProviderEvent): boolean {
+    if (event.type !== "session.opened" || this.providerSessions.has(event.sessionId)) return false;
+    const parent = event.parentSessionId
+      ? this.providerSessions.get(event.parentSessionId)
+      : undefined;
+    if (!parent) return true;
+    const sessionId = randomUUID();
+    const session = new ProviderRuntimeSession(
+      this,
+      this.connection!,
+      sessionId,
+      event.sessionId,
+      event.restoration,
+    );
+    this.sessions.set(sessionId, session);
+    this.providerSessions.set(event.sessionId, session);
+    const mappedEvent = { ...event, sessionId, parentSessionId: parent.id };
+    session.accept(mappedEvent);
+    for (const listener of this.sessionListeners) listener(session, mappedEvent);
+    return true;
+  }
+
+  private holdPendingOpenDescendant(event: ProviderEvent): boolean {
+    if (!("sessionId" in event)) return false;
+    let state = this.pendingOpenDescendants.get(event.sessionId);
+    if (event.type === "session.opened" && event.parentSessionId) {
+      const parent = this.providerSessions.get(event.parentSessionId);
+      state =
+        this.pendingOpenDescendants.get(event.parentSessionId) ??
+        (parent?.hasPendingOpen() ? this.pendingOpenDescendantStateFor(parent) : undefined);
+      if (state) {
+        state.providerSessionIds.add(event.sessionId);
+        this.pendingOpenDescendants.set(event.sessionId, state);
+      }
+    }
+    if (!state) return false;
+    state.events.push(event);
+    return true;
+  }
+
+  private pendingOpenDescendantStateFor(root: ProviderRuntimeSession): PendingOpenDescendantState {
+    const existing = this.pendingOpenDescendantsByRoot.get(root);
+    if (existing) return existing;
+    const state: PendingOpenDescendantState = { providerSessionIds: new Set(), events: [] };
+    this.pendingOpenDescendantsByRoot.set(root, state);
+    return state;
+  }
+
+  releasePendingOpenDescendants(root: ProviderRuntimeSession): void {
+    const state = this.takePendingOpenDescendants(root);
+    if (!state) return;
+    for (const event of state.events) this.accept(event);
+  }
+
+  discardPendingOpenDescendants(root: ProviderRuntimeSession): void {
+    this.takePendingOpenDescendants(root);
+  }
+
+  private takePendingOpenDescendants(
+    root: ProviderRuntimeSession,
+  ): PendingOpenDescendantState | undefined {
+    const state = this.pendingOpenDescendantsByRoot.get(root);
+    if (!state) return undefined;
+    this.pendingOpenDescendantsByRoot.delete(root);
+    for (const providerSessionId of state.providerSessionIds) {
+      if (this.pendingOpenDescendants.get(providerSessionId) === state) {
+        this.pendingOpenDescendants.delete(providerSessionId);
+      }
+    }
+    return state;
+  }
+
+  private failSessionRequests(sessionId: string, error: Error): void {
+    for (const [requestId, request] of this.requests) {
+      if (request.sessionId !== sessionId) continue;
+      this.requests.delete(requestId);
+      request.reject(error);
+    }
+    for (const [requestId, pendingSessionId] of this.sessionRequests) {
+      if (pendingSessionId === sessionId) this.sessionRequests.delete(requestId);
+    }
+  }
+
+  private settleClosedSessionRequests(
+    sessionId: string,
+    error: Error,
+    event: Extract<ProviderEvent, { type: "session.closed" }>,
+  ): void {
+    for (const [requestId, request] of this.requests) {
+      if (request.sessionId !== sessionId) continue;
+      this.requests.delete(requestId);
+      if (request.kind === "session.close") request.resolve(event);
+      else request.reject(error);
+    }
+  }
+
+  private failRequest(event: Extract<ProviderEvent, { type: "request.failed" }>): void {
+    const request = this.requests.get(event.requestId);
+    if (request) {
+      this.requests.delete(event.requestId);
+      request.reject(providerError(event.error));
+    }
+    if (request?.sessionId) this.sessions.get(request.sessionId)?.requestFailed(event);
+    const sessionId = this.sessionRequests.get(event.requestId);
+    if (!sessionId) return;
+    this.sessionRequests.delete(event.requestId);
+    this.sessions.get(sessionId)?.requestFailed(event);
+  }
+
+  private finishRequest(
+    event: Extract<ProviderEvent, { type: "request.completed" | "catalog" | "sessions" }>,
+  ): void {
+    const request = this.requests.get(event.requestId);
+    if (!request) return;
+    this.requests.delete(event.requestId);
+    request.resolve(event);
+  }
+}
+
+class ProviderRuntimeSession {
+  readonly history: ProviderEvent[] = [];
+  private readonly listeners = new Set<(event: ProviderEvent) => void>();
+  private capabilities: readonly string[] = [];
+  private openRequest: { requestId: string; deferred: Deferred<void> } | null = null;
+  private readonly prompts = new Map<
+    string,
+    Deferred<Extract<ProviderEvent, { type: "session.prompt_result" }>>
+  >();
+  private readonly activeTurnIds = new Set<string>();
+  private terminal = false;
+  config: ProviderConfigState = { models: [], modes: [], thinkingOptions: [], settings: [] };
+  commands: Array<{ name: string; description: string; argumentHint?: string }> = [];
+  persistence: ProviderPersistence | null = null;
+
+  constructor(
+    private readonly runtime: ProviderRuntime,
+    private readonly connection: ProviderConnection,
+    readonly id: string,
+    private readonly providerSessionId: string,
+    readonly restoration: "core" | "parent",
+  ) {}
+
+  get providerId(): string {
+    return this.providerSessionId;
+  }
+
+  get negotiatedCapabilities(): readonly string[] {
+    return this.capabilities;
+  }
+
+  onEvent(listener: (event: ProviderEvent) => void): () => void {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  }
+
+  async prompt(
+    prompt: ProviderPrompt,
+  ): Promise<Extract<ProviderEvent, { type: "session.prompt_result" }>["result"]> {
+    requireProviderCapabilities(this.capabilities, {
+      type: "session.prompt",
+      sessionId: this.providerSessionId,
+      prompt,
+    });
+    if (this.terminal) throw new StaleProviderSessionError(this.id);
+    const pending = deferred<Extract<ProviderEvent, { type: "session.prompt_result" }>>();
+    this.prompts.set(prompt.clientMessageId, pending);
+    try {
+      await this.connection.send({
+        type: "session.prompt",
+        sessionId: this.providerSessionId,
+        prompt,
+      });
+      return (await pending.promise).result;
+    } catch (error) {
+      if (this.terminal || this.runtime.isClosed) throw new StaleProviderSessionError(this.id);
+      throw error;
+    } finally {
+      this.prompts.delete(prompt.clientMessageId);
+    }
+  }
+
+  async configure(changes: ProviderConfigChanges): Promise<void> {
+    const input: Extract<ProviderInput, { type: "session.configure" }> = {
+      type: "session.configure",
+      requestId: randomUUID(),
+      sessionId: this.providerSessionId,
+      changes,
+    };
+    requireProviderCapabilities(this.capabilities, input);
+    await this.runtime.complete(input);
+  }
+
+  async respondToPermission(
+    permissionId: string,
+    response: Extract<ProviderInput, { type: "session.permission" }>["response"],
+  ): Promise<void> {
+    const input: Extract<ProviderInput, { type: "session.permission" }> = {
+      type: "session.permission",
+      sessionId: this.providerSessionId,
+      permissionId,
+      response,
+    };
+    requireProviderCapabilities(this.capabilities, input);
+    await this.connection.send(input);
+  }
+
+  async revert(token: ProviderInput & { type: "session.revert" }): Promise<void> {
+    const input = { ...token, sessionId: this.providerSessionId };
+    requireProviderCapabilities(this.capabilities, input);
+    await this.runtime.complete(input);
+  }
+
+  async interrupt(): Promise<void> {
+    await this.runtime.complete({
+      type: "session.interrupt",
+      requestId: randomUUID(),
+      sessionId: this.providerSessionId,
+    });
+  }
+
+  async close(): Promise<void> {
+    if (this.restoration === "parent") {
+      this.runtime.removeSession(this.id, this.providerSessionId);
+      return;
+    }
+    try {
+      await this.runtime.complete({
+        type: "session.close",
+        requestId: randomUUID(),
+        sessionId: this.providerSessionId,
+      });
+    } catch (error) {
+      if (!this.runtime.isClosed) throw error;
+    } finally {
+      this.runtime.removeSession(this.id, this.providerSessionId);
+    }
+  }
+
+  beginOpen(requestId: string): Promise<void> {
+    const pending = deferred<void>();
+    this.openRequest = { requestId, deferred: pending };
+    return pending.promise;
+  }
+
+  requestFailed(event: Extract<ProviderEvent, { type: "request.failed" }>): void {
+    if (this.openRequest?.requestId === event.requestId) {
+      this.openRequest.deferred.reject(providerError(event.error));
+      this.openRequest = null;
+      this.runtime.discardPendingOpenDescendants(this);
+    }
+  }
+
+  accept(event: ProviderEvent): void {
+    if (event.type === "session.opened") {
+      event = { ...event, capabilities: this.normalizeSessionCapabilities(event.capabilities) };
+    }
+    if (event.type === "session.opened") {
+      this.capabilities = [...event.capabilities];
+      this.persistence = this.restoration === "core" ? (event.persistence ?? null) : null;
+      return;
+    }
+    const openRequest = this.openRequest;
+    if (
+      event.type === "session.ready" &&
+      openRequest &&
+      openRequest.requestId === event.requestId
+    ) {
+      this.openRequest = null;
+      this.runtime.releasePendingOpenDescendants(this);
+      openRequest.deferred.resolve();
+      return;
+    }
+    if (event.type === "session.prompt_result") {
+      if (event.result.type === "turn") this.activeTurnIds.add(event.result.turnId);
+      this.prompts.get(event.clientMessageId)?.resolve(event);
+      return;
+    }
+    if (event.type === "session.runtime_failed" || event.type === "session.closed") {
+      if (this.terminal) return;
+      this.terminal = true;
+      this.publish(event);
+      this.rejectPending(new Error(event.error?.message ?? `Provider session ${this.id} closed`));
+      return;
+    }
+    this.publish(event);
+  }
+
+  hasPendingOpen(): boolean {
+    return this.openRequest !== null;
+  }
+
+  connectionClosed(error = new Error("Provider connection closed")): void {
+    // Closing fails only an interrupted turn. An idle session goes stale, and its next prompt
+    // reopens it from persistence.
+    if (!this.terminal && this.activeTurnIds.size > 0) {
+      this.publish({
+        type: "session.runtime_failed",
+        sessionId: this.id,
+        error: { message: error.message },
+      });
+    }
+    this.terminal = true;
+    this.rejectPending(error);
+  }
+
+  private rejectPending(error: Error): void {
+    const openRequest = this.openRequest;
+    this.openRequest = null;
+    openRequest?.deferred.reject(error);
+    this.runtime.discardPendingOpenDescendants(this);
+    for (const prompt of this.prompts.values()) prompt.reject(error);
+    this.prompts.clear();
+  }
+
+  private normalizeSessionCapabilities(capabilities: readonly string[]): ProviderCapability[] {
+    const known = PROVIDER_CAPABILITIES.filter((capability) => capabilities.includes(capability));
+    for (const capability of known) {
+      if (!this.connection.capabilities.includes(capability)) {
+        throw new Error(`Provider session selected unoffered capability ${capability}`);
+      }
+    }
+    return known;
+  }
+
+  private publish(event: ProviderEvent): void {
+    if (event.type === "session.turn") {
+      if (event.state === "started") this.activeTurnIds.add(event.turnId);
+      else this.activeTurnIds.delete(event.turnId);
+    }
+    if (event.type === "session.config") this.config = event.config;
+    if (event.type === "session.commands") this.commands = [...event.commands];
+    if (event.type === "session.persistence" && this.restoration === "core") {
+      this.persistence = event.persistence;
+    }
+    this.history.push(event);
+    for (const listener of this.listeners) listener(event);
+  }
+}
+
+function normalizeConnection(connection: ProviderConnection): ProviderConnection {
+  const capabilities = PROVIDER_CAPABILITIES.filter((capability) =>
+    connection.capabilities.includes(capability),
+  );
+  return {
+    version: connection.version,
+    capabilities,
+    send: (input) => connection.send(ProviderInputSchema.parse(input)),
+    onEvent: (listener) =>
+      connection.onEvent((event) => listener(ProviderEventSchema.parse(event))),
+    close: () => connection.close(),
+  };
+}
+
+interface AdaptedPluginProvider {
+  registration: ProviderRegistration;
+  client: PluginAgentClient;
+  definition: RegisteredProviderDefinition;
+  clients: Set<PluginAgentClient>;
+}
+
+/** Owns the complete plugin-provider adaptation behind the existing core provider boundary. */
+export class PluginAgentClientRegistry {
+  private readonly providers = new Map<string, AdaptedPluginProvider>();
+
+  constructor(private readonly logger: Logger) {}
+
+  replace(registrations: readonly ProviderRegistration[]): void {
+    const incoming = new Map<string, ProviderRegistration>();
+    for (const registration of registrations) {
+      if (incoming.has(registration.id)) {
+        throw new Error(`Duplicate plugin provider ID: ${registration.id}`);
+      }
+      incoming.set(registration.id, registration);
+    }
+
+    for (const [id, adapted] of this.providers) {
+      if (incoming.get(id) === adapted.registration) continue;
+      this.providers.delete(id);
+      void Promise.all([...adapted.clients].map((client) => client.shutdown())).catch((error) => {
+        this.logger.warn({ err: error, provider: id }, "Failed to stop plugin provider");
+      });
+    }
+
+    for (const [id, registration] of incoming) {
+      if (this.providers.has(id)) continue;
+      const client = new PluginAgentClient(registration);
+      const clients = new Set([client]);
+      const definition = createPluginProviderDefinition(
+        registration,
+        (_logger, runtimeSettings) => {
+          const configuredClient = new PluginAgentClient(registration, runtimeSettings);
+          clients.add(configuredClient);
+          return configuredClient;
+        },
+      );
+      this.providers.set(id, { registration, client, definition, clients });
+    }
+  }
+
+  definitions(): Record<string, RegisteredProviderDefinition> {
+    return Object.fromEntries(
+      [...this.providers].map(([id, provider]) => [id, provider.definition]),
+    );
+  }
+
+  clients(): Record<string, AgentClient> {
+    return Object.fromEntries([...this.providers].map(([id, provider]) => [id, provider.client]));
+  }
+
+  has(provider: string): boolean {
+    return this.providers.has(provider);
+  }
+
+  async shutdown(): Promise<void> {
+    const providers = [...this.providers.values()];
+    this.providers.clear();
+    await Promise.all(
+      providers.flatMap(({ clients }) => [...clients].map((client) => client.shutdown())),
+    );
+  }
+}
+
+function createPluginProviderDefinition(
+  registration: ProviderRegistration,
+  createClient: RegisteredProviderDefinition["createClient"],
+): RegisteredProviderDefinition {
+  return {
+    id: registration.id,
+    label: registration.label,
+    description: registration.description ?? `Plugin provider ${registration.label}`,
+    iconSvg: registration.icon,
+    defaultModeId: null,
+    modes: [],
+    supportsExactMcpPreapproval: true,
+    createClient,
+  };
+}
+
+interface PendingChild {
+  session: ProviderRuntimeSession;
+  opened: Extract<ProviderEvent, { type: "session.opened" }>;
+}
+
+class PluginAgentClient implements AgentClient {
+  readonly provider: string;
+  private readonly runtime: ProviderRuntime;
+  private readonly rootsBySession = new Map<string, PluginAgentSession>();
+  private readonly pendingChildren: PendingChild[] = [];
+
+  readonly getCatalogCacheKey?: AgentClient["getCatalogCacheKey"];
+
+  constructor(registration: ProviderRegistration, runtimeSettings?: ProviderRuntimeSettings) {
+    this.provider = registration.id;
+    this.runtime = new ProviderRuntime(registration, runtimeSettings);
+    if (registration.getCatalogCacheKey)
+      this.getCatalogCacheKey = (options) => this.runtime.catalogCacheKey(options);
+    this.runtime.onSessionOpened((session, opened) => this.acceptChild(session, opened));
+  }
+
+  get capabilities(): AgentCapabilityFlags {
+    return agentCapabilities(this.runtime.negotiatedCapabilities);
+  }
+
+  async createSession(
+    config: AgentSessionConfig,
+    launchContext?: AgentLaunchContext,
+    options?: AgentCreateSessionOptions,
+  ): Promise<AgentSession> {
+    return await this.openSession({
+      config,
+      launchContext,
+      history: "skip",
+      persist: options?.persistSession !== false,
+    });
+  }
+
+  async resumeSession(
+    handle: AgentPersistenceHandle,
+    overrides?: Partial<AgentSessionConfig>,
+    launchContext?: AgentLaunchContext,
+  ): Promise<AgentSession> {
+    if (!overrides?.cwd) {
+      throw new Error(`Plugin provider '${this.provider}' requires cwd to resume a session`);
+    }
+    return await this.openSession({
+      config: { ...overrides, provider: this.provider, cwd: overrides.cwd },
+      launchContext,
+      persistence: decodePersistence(handle),
+      history: "replay",
+      persist: true,
+    });
+  }
+
+  async fetchCatalog(
+    options: FetchCatalogOptions,
+    context?: ProviderRefreshContext,
+  ): Promise<ProviderCatalog> {
+    const catalog = await this.runtime.catalog(
+      options.scope === "workspace" ? options.cwd : undefined,
+      context?.signal,
+    );
+    return {
+      models: catalog.models.map((model) =>
+        mapModel(
+          this.provider,
+          model,
+          catalog.defaultModel,
+          catalog.thinkingOptions,
+          catalog.defaultThinkingOption,
+        ),
+      ),
+      modes: catalog.modes.map((mode) => ({ ...mode })),
+      defaultModeId: catalog.defaultMode,
+    };
+  }
+
+  async isAvailable(signal?: AbortSignal): Promise<boolean> {
+    signal?.throwIfAborted();
+    return await this.runtime.isAvailable();
+  }
+
+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    const status = await this.runtime.status();
+    return { diagnostic: status.diagnostic ?? "Provider is available" };
+  }
+
+  async listImportableSessions(
+    options: ListImportableSessionsOptions = {},
+  ): Promise<ImportableProviderSession[]> {
+    const sessions = await this.runtime.listSessions({
+      query: options.query,
+      cwd: options.cwd,
+      limit: options.limit,
+    });
+    return sessions.map((session) => ({
+      providerHandleId: encodePersistence(session.persistence),
+      cwd: session.cwd,
+      title: session.title ?? null,
+      firstPromptPreview: null,
+      lastPromptPreview: session.description ?? null,
+      lastActivityAt: parseProviderDate(session.updatedAt),
+    }));
+  }
+
+  async importSession(
+    input: ImportProviderSessionInput,
+    context: ImportProviderSessionContext,
+  ): Promise<ImportedProviderSession> {
+    const session = await this.openSession({
+      config: { ...context.config, provider: this.provider, cwd: input.cwd },
+      launchContext: context.launchContext,
+      persistence: decodePersistenceId(input.providerHandleId),
+      history: "replay",
+      persist: true,
+    });
+    const persistence = session.describePersistence();
+    if (!persistence) throw new Error(`Plugin provider '${this.provider}' did not persist import`);
+    return {
+      session,
+      config: { ...context.config, provider: this.provider, cwd: input.cwd },
+      persistence,
+      timeline: session.timelineHistory(),
+      providerSubagentEvents: session.subagentHistory(),
+    };
+  }
+
+  async archiveNativeSession(handle: AgentPersistenceHandle): Promise<void> {
+    await this.runtime.archive(decodePersistence(handle));
+  }
+
+  async unarchiveNativeSession(handle: AgentPersistenceHandle): Promise<void> {
+    await this.runtime.unarchive(decodePersistence(handle));
+  }
+
+  async shutdown(): Promise<void> {
+    await this.runtime.close();
+  }
+
+  private async openSession(input: {
+    config: AgentSessionConfig;
+    launchContext?: AgentLaunchContext;
+    persistence?: ProviderPersistence;
+    history: "replay" | "skip";
+    persist: boolean;
+  }): Promise<PluginAgentSession> {
+    const sessionId = randomUUID();
+    const bridge = await this.runtime.openSession({
+      sessionId,
+      config: mapSessionConfig(input.config, input.launchContext, input.persist),
+      persistence: input.persistence,
+      history: input.history,
+    });
+    const session = new PluginAgentSession(this.provider, bridge, () => {
+      this.rootsBySession.delete(bridge.id);
+    });
+    this.rootsBySession.set(bridge.id, session);
+    this.attachPendingChildren();
+    return session;
+  }
+
+  private acceptChild(
+    session: ProviderRuntimeSession,
+    opened: Extract<ProviderEvent, { type: "session.opened" }>,
+  ): void {
+    const root = opened.parentSessionId
+      ? this.rootsBySession.get(opened.parentSessionId)
+      : undefined;
+    if (!root) {
+      this.pendingChildren.push({ session, opened });
+      return;
+    }
+    root.attachChild(session, opened);
+    this.rootsBySession.set(session.id, root);
+    this.attachPendingChildren();
+  }
+
+  private attachPendingChildren(): void {
+    let attached = true;
+    while (attached) {
+      attached = false;
+      for (let index = this.pendingChildren.length - 1; index >= 0; index -= 1) {
+        const pending = this.pendingChildren[index];
+        const root = pending.opened.parentSessionId
+          ? this.rootsBySession.get(pending.opened.parentSessionId)
+          : undefined;
+        if (!root) continue;
+        this.pendingChildren.splice(index, 1);
+        root.attachChild(pending.session, pending.opened);
+        this.rootsBySession.set(pending.session.id, root);
+        attached = true;
+      }
+    }
+  }
+}
+
+class PluginAgentSession implements AgentSession {
+  readonly initialTimeline: ImportedProviderSession["timeline"];
+  private readonly listeners = new Set<(event: AgentStreamEvent) => void>();
+  private readonly history: AgentStreamEvent[] = [];
+  private readonly pendingPermissions = new Map<string, AgentPermissionRequest>();
+  private readonly permissionResponses = new Map<string, AgentPermissionResponse>();
+  private readonly revertTokens = new Map<string, ProviderTimelineItem["revertToken"]>();
+  private readonly timelineSnapshots = new Map<string, ProviderTimelineItem>();
+  private readonly subagentIdsBySession = new Map<string, string | null>();
+  private readonly childUnsubscribes = new Map<string, () => void>();
+  private readonly childSnapshots = new Map<string, Map<string, ProviderTimelineItem>>();
+  private unsubscribe: (() => void) | null = null;
+  private currentTurnId: string | null = null;
+  private closed = false;
+
+  constructor(
+    readonly provider: string,
+    private readonly bridge: ProviderRuntimeSession,
+    private readonly onClose: () => void,
+  ) {
+    this.subagentIdsBySession.set(bridge.id, null);
+    for (const event of bridge.history) this.accept(event, false);
+    // Opening notices arrive before the manager subscribes to the session.
+    // Commit them on registration and replay the same timestamps from history.
+    this.initialTimeline = this.timelineHistory().filter(
+      (entry) => entry.item.type === "notification",
+    );
+    this.unsubscribe = bridge.onEvent((event) => this.accept(event, true));
+  }
+
+  get id(): string {
+    return this.describePersistence()?.sessionId ?? this.bridge.id;
+  }
+
+  get capabilities(): AgentCapabilityFlags {
+    return agentCapabilities(this.bridge.negotiatedCapabilities);
+  }
+
+  get features(): AgentFeature[] {
+    return this.bridge.config.settings.map((setting) =>
+      setting.type === "toggle"
+        ? { ...setting }
+        : {
+            ...setting,
+            options: setting.options.map((option) => ({ ...option, id: option.value })),
+          },
+    );
+  }
+
+  async run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult> {
+    return await runProviderTurn({
+      prompt,
+      runOptions: options,
+      startTurn: (nextPrompt, nextOptions) => this.startTurn(nextPrompt, nextOptions),
+      subscribe: (callback) => this.subscribe(callback),
+      getSessionId: () => this.id,
+    });
+  }
+
+  async startTurn(
+    prompt: AgentPromptInput,
+    options: AgentRunOptions = {},
+  ): Promise<{ turnId: string }> {
+    const clientMessageId = options.clientMessageId ?? randomUUID();
+    const result = await this.bridge.prompt({
+      clientMessageId,
+      delivery: "auto",
+      input: mapPromptInput(prompt, this.bridge.commands),
+      ...(options.outputSchema === undefined
+        ? {}
+        : { outputSchema: toJsonValue(options.outputSchema, "output schema") }),
+    });
+    if (result.type === "failed") throw providerError(result.error);
+    if (result.type === "turn" || result.type === "steer") return { turnId: result.turnId };
+
+    const turnId = `command-${clientMessageId}`;
+    this.publish({ type: "turn_started", provider: this.provider, turnId });
+    this.publish({ type: "turn_completed", provider: this.provider, turnId });
+    return { turnId };
+  }
+
+  async steerActiveTurn(
+    prompt: AgentPromptInput,
+    options: SteerActiveTurnOptions,
+  ): Promise<SteerResult> {
+    const result = await this.bridge.prompt({
+      clientMessageId: options.clientMessageId ?? randomUUID(),
+      delivery: "steer",
+      input: { type: "message", content: mapPromptContent(prompt) },
+      ...(options.outputSchema === undefined
+        ? {}
+        : { outputSchema: toJsonValue(options.outputSchema, "output schema") }),
+      clearPendingPermissions: options.clearPendingPermissions,
+    });
+    return result.type === "steer" && result.turnId === options.expectedTurnId
+      ? { status: "accepted" }
+      : { status: "unavailable" };
+  }
+
+  subscribe(callback: (event: AgentStreamEvent) => void): () => void {
+    this.listeners.add(callback);
+    return () => this.listeners.delete(callback);
+  }
+
+  async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    for (const event of this.history) yield event;
+  }
+
+  async getRuntimeInfo() {
+    return {
+      provider: this.provider,
+      sessionId: this.id,
+      model: this.bridge.config.model ?? null,
+      modeId: this.bridge.config.mode ?? null,
+      thinkingOptionId: this.bridge.config.thinkingOption ?? null,
+    };
+  }
+
+  async getAvailableModes(): Promise<AgentMode[]> {
+    return this.bridge.config.modes.map((mode) => ({ ...mode }));
+  }
+
+  async getCurrentMode(): Promise<string | null> {
+    return this.bridge.config.mode ?? null;
+  }
+
+  async setMode(modeId: string): Promise<void> {
+    await this.bridge.configure({ mode: modeId });
+  }
+
+  getPendingPermissions(): AgentPermissionRequest[] {
+    return [...this.pendingPermissions.values()];
+  }
+
+  async respondToPermission(requestId: string, response: AgentPermissionResponse): Promise<void> {
+    this.permissionResponses.set(requestId, response);
+    try {
+      await this.bridge.respondToPermission(
+        requestId,
+        toJsonValue(response, "permission response") as Extract<
+          ProviderInput,
+          { type: "session.permission" }
+        >["response"],
+      );
+    } catch (error) {
+      this.permissionResponses.delete(requestId);
+      throw error;
+    }
+  }
+
+  describePersistence(): AgentPersistenceHandle | null {
+    return this.bridge.persistence
+      ? persistenceHandle(this.provider, this.bridge.persistence)
+      : null;
+  }
+
+  async interrupt(): Promise<void> {
+    await this.bridge.interrupt();
+  }
+
+  async close(): Promise<void> {
+    if (this.closed) return;
+    this.closed = true;
+    this.unsubscribe?.();
+    this.unsubscribe = null;
+    for (const unsubscribe of this.childUnsubscribes.values()) unsubscribe();
+    this.childUnsubscribes.clear();
+    this.subagentIdsBySession.clear();
+    this.listeners.clear();
+    this.onClose();
+    await this.bridge.close();
+  }
+
+  async listCommands(): Promise<AgentSlashCommand[]> {
+    return this.bridge.commands.map((command) => ({
+      ...command,
+      argumentHint: command.argumentHint ?? "",
+      kind: "command",
+    }));
+  }
+
+  async setModel(modelId: string | null): Promise<void> {
+    await this.bridge.configure({ model: modelId });
+  }
+
+  async setThinkingOption(thinkingOptionId: string | null): Promise<void> {
+    await this.bridge.configure({ thinkingOption: thinkingOptionId });
+  }
+
+  async setFeature(featureId: string, value: unknown): Promise<void> {
+    await this.bridge.configure({
+      settings: { [featureId]: toJsonValue(value, `setting '${featureId}'`) },
+    });
+  }
+
+  async revertConversation(input: { messageId: string }): Promise<void> {
+    await this.revert(input.messageId, "conversation");
+  }
+
+  async revertFiles(input: { messageId: string }): Promise<void> {
+    await this.revert(input.messageId, "files");
+  }
+
+  async revertBoth(input: { messageId: string }): Promise<void> {
+    await this.revert(input.messageId, "both");
+  }
+
+  timelineHistory(): ImportedProviderSession["timeline"] {
+    return this.history.flatMap((event) =>
+      event.type === "timeline" ? [{ item: event.item, timestamp: event.timestamp }] : [],
+    );
+  }
+
+  subagentHistory(): NonNullable<ImportedProviderSession["providerSubagentEvents"]> {
+    return this.history.filter(
+      (event): event is Extract<AgentStreamEvent, { type: "provider_subagent" }> =>
+        event.type === "provider_subagent",
+    );
+  }
+
+  attachChild(
+    child: ProviderRuntimeSession,
+    opened: Extract<ProviderEvent, { type: "session.opened" }>,
+  ): void {
+    const parentSubagentId = opened.parentSessionId
+      ? this.subagentIdsBySession.get(opened.parentSessionId)
+      : undefined;
+    if (parentSubagentId === undefined) {
+      throw new Error(`Missing plugin child parent ${opened.parentSessionId}`);
+    }
+    const childId = child.providerId;
+    this.subagentIdsBySession.set(child.id, childId);
+    this.publish({
+      type: "provider_subagent",
+      provider: this.provider,
+      event: {
+        type: "upsert",
+        id: childId,
+        parentSubagentId,
+        toolCallId: opened.toolCallId ?? null,
+        title: opened.title ?? null,
+        description: opened.description ?? null,
+        status: "running",
+        cwd: opened.cwd,
+      },
+    });
+    const snapshots = new Map<string, ProviderTimelineItem>();
+    this.childSnapshots.set(childId, snapshots);
+    for (const event of child.history) this.acceptChildEvent(childId, event, snapshots);
+    this.childUnsubscribes.set(
+      child.id,
+      child.onEvent((event) => this.acceptChildEvent(childId, event, snapshots)),
+    );
+  }
+
+  private accept(event: ProviderEvent, live: boolean): void {
+    const translated = this.translate(event);
+    for (const next of translated) {
+      this.history.push(next);
+      if (live) this.emit(next);
+    }
+  }
+
+  private translate(event: ProviderEvent): AgentStreamEvent[] {
+    switch (event.type) {
+      case "session.turn":
+        return [this.translateTurn(event)];
+      case "session.usage":
+        return [
+          {
+            type: "usage_updated",
+            provider: this.provider,
+            usage: { ...event.usage },
+            turnId: event.turnId,
+          },
+        ];
+      case "timeline.item":
+        return this.translateTimeline(event);
+      case "session.permission":
+        return [this.translatePermission(event)];
+      case "session.permission_resolved":
+        return [this.translatePermissionResolution(event)];
+      case "session.config":
+        return this.translateConfig(event);
+      case "session.notice":
+        return this.translateNotice(event);
+      case "session.runtime_failed":
+        return [this.translateFailure(event.error)];
+      case "session.closed":
+        return event.error ? [this.translateFailure(event.error)] : [];
+      default:
+        return [];
+    }
+  }
+
+  private translateTurn(event: Extract<ProviderEvent, { type: "session.turn" }>): AgentStreamEvent {
+    if (event.state === "started") {
+      this.currentTurnId = event.turnId;
+      return { type: "turn_started", provider: this.provider, turnId: event.turnId };
+    }
+    if (this.currentTurnId === event.turnId) this.currentTurnId = null;
+    if (event.state === "completed") {
+      return { type: "turn_completed", provider: this.provider, turnId: event.turnId };
+    }
+    if (event.state === "canceled") {
+      return {
+        type: "turn_canceled",
+        provider: this.provider,
+        turnId: event.turnId,
+        reason: event.error?.message ?? "Canceled by provider",
+      };
+    }
+    return {
+      type: "turn_failed",
+      provider: this.provider,
+      turnId: event.turnId,
+      error: event.error?.message ?? "Provider turn failed",
+      code: event.error?.code,
+      diagnostic: event.error?.diagnostic,
+    };
+  }
+
+  private translateTimeline(
+    event: Extract<ProviderEvent, { type: "timeline.item" }>,
+  ): AgentStreamEvent[] {
+    const item = mapTimelineItem(event.item, this.timelineSnapshots, this.revertTokens);
+    return item
+      ? [
+          {
+            type: "timeline",
+            provider: this.provider,
+            item,
+            turnId: this.currentTurnId ?? undefined,
+            timestamp: event.timestamp,
+          },
+        ]
+      : [];
+  }
+
+  private translatePermission(
+    event: Extract<ProviderEvent, { type: "session.permission" }>,
+  ): AgentStreamEvent {
+    const request: AgentPermissionRequest = { ...event.request, provider: this.provider };
+    this.pendingPermissions.set(request.id, request);
+    return {
+      type: "permission_requested",
+      provider: this.provider,
+      request,
+      turnId: this.currentTurnId ?? undefined,
+    };
+  }
+
+  private translatePermissionResolution(
+    event: Extract<ProviderEvent, { type: "session.permission_resolved" }>,
+  ): AgentStreamEvent {
+    this.pendingPermissions.delete(event.permissionId);
+    const resolution = this.permissionResponses.get(event.permissionId) ?? {
+      behavior: "deny" as const,
+      message: "Resolved by provider",
+    };
+    this.permissionResponses.delete(event.permissionId);
+    return {
+      type: "permission_resolved",
+      provider: this.provider,
+      requestId: event.permissionId,
+      resolution,
+      turnId: this.currentTurnId ?? undefined,
+    };
+  }
+
+  private translateConfig(
+    event: Extract<ProviderEvent, { type: "session.config" }>,
+  ): AgentStreamEvent[] {
+    return [
+      {
+        type: "mode_changed",
+        provider: this.provider,
+        currentModeId: event.config.mode ?? null,
+        availableModes: event.config.modes.map((mode) => ({ ...mode })),
+      },
+      {
+        type: "model_changed",
+        provider: this.provider,
+        runtimeInfo: {
+          provider: this.provider,
+          sessionId: this.id,
+          model: event.config.model ?? null,
+          modeId: event.config.mode ?? null,
+          thinkingOptionId: event.config.thinkingOption ?? null,
+        },
+      },
+      {
+        type: "thinking_option_changed",
+        provider: this.provider,
+        thinkingOptionId: event.config.thinkingOption ?? null,
+      },
+    ];
+  }
+
+  private translateNotice(
+    event: Extract<ProviderEvent, { type: "session.notice" }>,
+  ): AgentStreamEvent[] {
+    if (event.notice.dismissed) return [];
+    return [
+      {
+        type: "timeline",
+        provider: this.provider,
+        timestamp: new Date().toISOString(),
+        item: {
+          type: "notification",
+          level: event.notice.severity,
+          message: [event.notice.title, event.notice.description].filter(Boolean).join("\n"),
+        },
+        turnId: this.currentTurnId ?? undefined,
+      },
+    ];
+  }
+
+  private translateFailure(error: ProviderError): AgentStreamEvent {
+    return {
+      type: "turn_failed",
+      provider: this.provider,
+      turnId: this.currentTurnId ?? undefined,
+      error: error.message,
+      code: error.code,
+      diagnostic: error.diagnostic,
+    };
+  }
+
+  private acceptChildEvent(
+    childId: string,
+    event: ProviderEvent,
+    snapshots: Map<string, ProviderTimelineItem>,
+  ): void {
+    if (event.type === "timeline.item") {
+      const item = mapTimelineItem(event.item, snapshots);
+      if (item) {
+        this.publish({
+          type: "provider_subagent",
+          provider: this.provider,
+          event: { type: "timeline", id: childId, item, timestamp: event.timestamp },
+        });
+      }
+      return;
+    }
+    if (event.type === "session.turn" && event.state !== "started") {
+      this.publish({
+        type: "provider_subagent",
+        provider: this.provider,
+        event: { type: "upsert", id: childId, status: event.state },
+      });
+      return;
+    }
+    if (event.type === "session.runtime_failed" || event.type === "session.closed") {
+      this.publish({
+        type: "provider_subagent",
+        provider: this.provider,
+        event: {
+          type: "upsert",
+          id: childId,
+          status: event.type === "session.runtime_failed" || event.error ? "failed" : "completed",
+        },
+      });
+    }
+  }
+
+  private async revert(messageId: string, scope: "conversation" | "files" | "both") {
+    const token = this.revertTokens.get(messageId);
+    if (token === undefined) throw new Error(`No provider revert token for message ${messageId}`);
+    await this.bridge.revert({
+      type: "session.revert",
+      requestId: randomUUID(),
+      sessionId: this.bridge.providerId,
+      token,
+      scope,
+    });
+  }
+
+  private publish(event: AgentStreamEvent): void {
+    this.history.push(event);
+    this.emit(event);
+  }
+
+  private emit(event: AgentStreamEvent): void {
+    for (const listener of this.listeners) listener(event);
+  }
+}
+
+function agentCapabilities(capabilities: readonly string[]): AgentCapabilityFlags {
+  const supports = (capability: ProviderCapability) => capabilities.includes(capability);
+  return {
+    supportsStreaming: true,
+    supportsSessionPersistence: supports("session.persistence"),
+    supportsSessionListing: supports("session.list"),
+    supportsDynamicModes: supports("session.configure"),
+    supportsMcpServers: true,
+    supportsNativePaseoTools: false,
+    supportsReasoningStream: true,
+    supportsToolInvocations: true,
+    supportsRewindConversation: supports("session.revert.conversation"),
+    supportsRewindFiles: supports("session.revert.files"),
+    supportsRewindBoth: supports("session.revert.both"),
+  };
+}
+
+function mapModel(
+  provider: string,
+  model: Extract<ProviderEvent, { type: "catalog" }>["catalog"]["models"][number],
+  defaultModel: string | undefined,
+  catalogThinkingOptions: Extract<ProviderEvent, { type: "catalog" }>["catalog"]["thinkingOptions"],
+  catalogDefaultThinkingOption: string | undefined,
+): AgentModelDefinition {
+  const thinkingOptions = model.thinkingOptions ?? catalogThinkingOptions;
+  return {
+    ...model,
+    provider,
+    isDefault: model.isDefault ?? model.id === defaultModel,
+    metadata: model.metadata ? { ...model.metadata } : undefined,
+    thinkingOptions: thinkingOptions?.map((option) => Object.assign({}, option)),
+    defaultThinkingOptionId: model.defaultThinkingOptionId ?? catalogDefaultThinkingOption,
+  };
+}
+
+function mapSessionConfig(
+  config: AgentSessionConfig,
+  launchContext: AgentLaunchContext | undefined,
+  persist: boolean,
+): ProviderSessionConfig {
+  return {
+    cwd: config.cwd,
+    env: createProviderEnv({ baseEnv: {}, overlays: [launchContext?.env] }),
+    systemPrompt: combineSystemPrompts(config.systemPrompt, config.daemonAppendSystemPrompt),
+    mcpServers: { ...config.mcpServers },
+    toolPolicy: config.toolPolicy
+      ? { preapproved: config.toolPolicy.preapproved.map((grant) => ({ ...grant })) }
+      : undefined,
+    model: config.model,
+    mode: config.modeId,
+    thinkingOption: config.thinkingOptionId,
+    settings: toJsonObject(config.featureValues ?? {}, "provider settings"),
+    providerOptions: config.providerOptions,
+    title: config.title ?? undefined,
+    persist,
+  };
+}
+
+function combineSystemPrompts(
+  systemPrompt: string | undefined,
+  daemonPrompt: string | undefined,
+): string | undefined {
+  const parts = [systemPrompt, daemonPrompt].filter(
+    (value): value is string => typeof value === "string" && value.trim().length > 0,
+  );
+  return parts.length > 0 ? parts.join("\n\n") : undefined;
+}
+
+function mapPromptInput(
+  prompt: AgentPromptInput,
+  commands: readonly { name: string }[],
+): ProviderPrompt["input"] {
+  if (typeof prompt === "string" && prompt.startsWith("/")) {
+    const separator = prompt.indexOf(" ");
+    const name = prompt.slice(1, separator === -1 ? undefined : separator);
+    if (commands.some((command) => command.name === name)) {
+      return {
+        type: "command",
+        name,
+        arguments: separator === -1 ? "" : prompt.slice(separator + 1),
+      };
+    }
+  }
+  return { type: "message", content: mapPromptContent(prompt) };
+}
+
+function mapPromptContent(prompt: AgentPromptInput): ProviderContent[] {
+  const content = typeof prompt === "string" ? [{ type: "text" as const, text: prompt }] : prompt;
+  return toJsonValue(content, "prompt content") as ProviderContent[];
+}
+
+function mapTimelineItem(
+  item: ProviderTimelineItem,
+  snapshots: Map<string, ProviderTimelineItem>,
+  revertTokens?: Map<string, ProviderTimelineItem["revertToken"]>,
+): AgentTimelineItem | null {
+  const previous = snapshots.get(item.id);
+  snapshots.set(item.id, item);
+  const { id, revertToken, ...withoutIdentity } = item;
+  if (revertToken !== undefined && revertTokens) {
+    revertTokens.set(id, revertToken);
+    if (item.type === "user_message" || item.type === "assistant_message") {
+      revertTokens.set(item.messageId ?? id, revertToken);
+    }
+  }
+
+  if (item.type === "assistant_message" || item.type === "reasoning") {
+    const previousText = previous?.type === item.type ? previous.text : "";
+    const text = item.text.startsWith(previousText)
+      ? item.text.slice(previousText.length)
+      : item.text;
+    if (text.length === 0) return null;
+    return item.type === "assistant_message"
+      ? { type: "assistant_message", text, messageId: item.messageId ?? id }
+      : { type: "reasoning", text };
+  }
+  if (item.type === "user_message") {
+    if (previous?.type === "user_message" && previous.text === item.text) return null;
+    return {
+      type: "user_message",
+      text: item.text,
+      messageId: item.messageId ?? id,
+      clientMessageId: item.clientMessageId,
+    };
+  }
+  if (item.type === "plugin") {
+    return {
+      type: "plugin",
+      id,
+      pluginId: item.pluginId,
+      kind: item.kind,
+      version: item.version,
+      data: item.data,
+    };
+  }
+  return withoutIdentity as AgentTimelineItem;
+}
+
+function persistenceHandle(
+  provider: string,
+  persistence: ProviderPersistence,
+): AgentPersistenceHandle {
+  return {
+    provider,
+    sessionId: encodePersistence(persistence),
+    metadata: { pluginProviderPersistence: persistence },
+  };
+}
+
+function encodePersistence(persistence: ProviderPersistence): string {
+  return `plugin:${JSON.stringify(persistence)}`;
+}
+
+function decodePersistence(handle: AgentPersistenceHandle): ProviderPersistence {
+  const fromMetadata = handle.metadata?.pluginProviderPersistence;
+  if (fromMetadata !== undefined) {
+    return ProviderPersistenceSchema.parse(fromMetadata);
+  }
+  return decodePersistenceId(handle.sessionId);
+}
+
+const ProviderPersistenceSchema: z.ZodType<ProviderPersistence> = z
+  .object({ version: z.number().int().nonnegative(), data: z.json() })
+  .strict();
+
+function decodePersistenceId(id: string): ProviderPersistence {
+  if (!id.startsWith("plugin:")) throw new Error("Invalid plugin provider persistence handle");
+  return ProviderPersistenceSchema.parse(JSON.parse(id.slice("plugin:".length)));
+}
+
+function parseProviderDate(value: string | undefined): Date {
+  const timestamp = value ? Date.parse(value) : Number.NaN;
+  return new Date(Number.isFinite(timestamp) ? timestamp : 0);
+}
+
+function toJsonObject(value: unknown, label: string): Record<string, JsonValue> {
+  const encoded = toJsonValue(value, label);
+  if (typeof encoded !== "object" || encoded === null || Array.isArray(encoded)) {
+    throw new Error(`${label} must be a JSON object`);
+  }
+  return encoded as Record<string, JsonValue>;
+}
+
+function toJsonValue(value: unknown, label: string): JsonValue {
+  const encoded = JSON.stringify(value);
+  if (encoded === undefined) throw new Error(`${label} must be JSON-serializable`);
+  return JSON.parse(encoded) as JsonValue;
+}
diff --git a/packages/server/src/server/agent/projected-timeline-contract.test.ts b/packages/server/src/server/agent/projected-timeline-contract.test.ts
new file mode 100644
index 0000000000..ee76fe50a7
--- /dev/null
+++ b/packages/server/src/server/agent/projected-timeline-contract.test.ts
@@ -0,0 +1,201 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+import pino from "pino";
+import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
+import { createDaemonTestContext } from "../test-utils/daemon-test-context.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createMessageCollector } from "../test-utils/message-collector.js";
+import { CodexAppServerAgentSession } from "./providers/codex-app-server-agent.js";
+import { createFakeCodexAppServer } from "./providers/codex/test-utils/fake-app-server.js";
+import type { AgentClient } from "./agent-sdk-types.js";
+
+test("projects Codex child history and confines old-client degradation to the child transcript", async () => {
+  const cwd = await mkdtemp(join(tmpdir(), "paseo-projected-contract-"));
+  const app = createFakeCodexAppServer();
+  const session = new CodexAppServerAgentSession(
+    { provider: "codex", cwd },
+    null,
+    pino({ level: "silent" }),
+    async () => app.child,
+  );
+  await session.connect();
+  const provider: AgentClient = {
+    provider: "codex",
+    capabilities: session.capabilities,
+    isAvailable: async () => true,
+    createSession: async () => session,
+    resumeSession: async () => session,
+    fetchCatalog: async () => ({ models: [], modes: [] }),
+  };
+  const ctx = await createDaemonTestContext({
+    pluginsEnabled: false,
+    relayEnabled: false,
+    agentClients: { codex: provider },
+  });
+  const legacy = new DaemonClient({
+    url: `ws://127.0.0.1:${ctx.daemon.port}/ws`,
+    capabilities: { [CLIENT_CAPS.projectedSubagentTimeline]: false },
+  });
+  await legacy.connect();
+  const messages = createMessageCollector(legacy);
+  const observation = legacy.observeEvents(["agent.provider_subagents.update"]);
+  const unsubscribe = observation.subscribe({ snapshot() {}, update() {} });
+  await observation.ready;
+  try {
+    const agent = await ctx.client.createAgent({
+      provider: "codex",
+      cwd,
+      title: "Projected contract",
+    });
+    app.startsTurn({ threadId: "thread-1" });
+    app.startsSubAgent({ callId: "spawn-child", threadId: "child-thread", agentPath: "child" });
+    for (const delta of ["A", "B", "C"]) {
+      app.child.stdout.write(
+        JSON.stringify({
+          method: "item/agentMessage/delta",
+          params: { threadId: "child-thread", itemId: "message-1", delta },
+        }) + "\n",
+      );
+    }
+    await expect
+      .poll(() => ctx.daemon.daemon.agentManager.listProviderSubagents(agent.id).length)
+      .toBe(1);
+    await expect
+      .poll(
+        () =>
+          ctx.daemon.daemon.agentManager.fetchProviderSubagentTimeline(agent.id, "child-thread")
+            .window.maxSeq,
+      )
+      .toBe(3);
+    const child = await ctx.client.fetchProviderSubagentTimeline(agent.id, "child-thread", {
+      limit: 1,
+    });
+    expect(child.projection).toBe("projected");
+    expect(child.rows).toMatchObject([{ seqStart: 1, seqEnd: 3, item: { text: "ABC" } }]);
+    const catchUp = await ctx.client.fetchProviderSubagentTimeline(agent.id, "child-thread", {
+      direction: "after",
+      cursor: { epoch: child.epoch, seq: 1 },
+    });
+    expect(catchUp.rows).toMatchObject([{ item: { text: "ABC" } }]);
+    const oldChild = await legacy.fetchProviderSubagentTimeline(agent.id, "child-thread");
+    expect(oldChild.rows).toMatchObject([
+      { item: { type: "assistant_message", text: expect.stringContaining("upgrade") } },
+    ]);
+    expect((await legacy.listProviderSubagents(agent.id)).subagents).toHaveLength(1);
+    expect(
+      messages.messages.some(
+        (message) =>
+          message.type === "agent.provider_subagents.update" && message.payload.kind === "upsert",
+      ),
+    ).toBe(true);
+    expect(
+      messages.messages.some(
+        (message) =>
+          message.type === "agent.provider_subagents.update" && message.payload.kind === "timeline",
+      ),
+    ).toBe(false);
+    const root = await legacy.fetchAgentTimeline(agent.id, { projection: "canonical", limit: 0 });
+    expect(root.error).toBeNull();
+    expect(root.projection).toBe("projected");
+    expect(root.entries).toHaveLength(1);
+    expect((await legacy.buildAgentForkContext(agent.id)).attachment.text).toContain(
+      "[Child] child",
+    );
+    app.assertNoErrors();
+  } finally {
+    unsubscribe();
+    messages.unsubscribe();
+    await legacy.close();
+    await ctx.cleanup();
+    await rm(cwd, { recursive: true, force: true });
+  }
+}, 30_000);
+
+test("resuming Codex restores child descriptors and complete messages without historical deltas", async () => {
+  const app = createFakeCodexAppServer({
+    "thread/read": (params) => {
+      const { threadId } = params as { threadId: string };
+      return {
+        thread: {
+          id: threadId,
+          turns: [
+            {
+              id: "turn",
+              items:
+                threadId === "root"
+                  ? [
+                      {
+                        type: "subAgentActivity",
+                        id: "spawn",
+                        kind: "started",
+                        agentThreadId: "child",
+                        agentPath: "explore",
+                      },
+                    ]
+                  : [{ type: "agentMessage", id: "message", text: "Complete child answer" }],
+            },
+          ],
+        },
+      };
+    },
+  });
+  const session = new CodexAppServerAgentSession(
+    { provider: "codex", cwd: tmpdir() },
+    { sessionId: "root" },
+    pino({ level: "silent" }),
+    async () => app.child,
+  );
+  try {
+    await session.connect();
+    const children = [];
+    for await (const event of session.streamHistory()) {
+      if (event.type === "provider_subagent") children.push(event.event);
+    }
+    expect(children).toMatchObject([
+      { type: "upsert", id: "child", status: "completed" },
+      {
+        type: "timeline",
+        id: "child",
+        item: { type: "assistant_message", text: "Complete child answer" },
+      },
+    ]);
+    app.assertNoErrors();
+  } finally {
+    await session.close();
+  }
+});
+
+test("retains only the latest cumulative Pi tool progress payload", async () => {
+  const { parseToolArgs, parseToolResult, mapToolDetail } =
+    await import("./providers/pi/tool-call-mapper.js");
+  const { InMemoryAgentTimelineStore } = await import("./agent-timeline-store.js");
+  const store = new InMemoryAgentTimelineStore();
+  store.initialize("agent");
+  const tool = parseToolArgs("custom_progress", {});
+  const messages: string[] = [];
+  for (let index = 0; index < 20; index++) {
+    messages.push(`Update ${index}: ${"x".repeat(2048)}`);
+    const result = parseToolResult({
+      content: [{ type: "text", text: "running" }],
+      details: { results: [{ messages: [...messages] }] },
+    });
+    store.append("agent", {
+      type: "tool_call",
+      callId: "same-call",
+      name: "custom_progress",
+      status: "running",
+      error: null,
+      detail: mapToolDetail(tool, result),
+    });
+  }
+  const history = store.fetch("agent", { limit: 0 });
+  expect(history.rows).toHaveLength(1);
+  expect(history.rows[0]).toMatchObject({
+    seqStart: 1,
+    seqEnd: 20,
+    item: { detail: { output: { details: { results: [{ messages }] } } } },
+  });
+  expect(JSON.stringify(history.rows).length).toBeLessThan(50_000);
+});
diff --git a/packages/server/src/server/agent/provider-launch-config.ts b/packages/server/src/server/agent/provider-launch-config.ts
index b75a361fad..29554fd2b2 100644
--- a/packages/server/src/server/agent/provider-launch-config.ts
+++ b/packages/server/src/server/agent/provider-launch-config.ts
@@ -3,7 +3,11 @@ import {
   executableExists,
   findExecutable,
 } from "../../executable-resolution/executable-resolution.js";
-import { createExternalProcessEnv, type ProcessEnvRecord } from "../paseo-env.js";
+import {
+  createExternalProcessEnv,
+  type ProcessEnvRecord,
+  type ExternalProcessEnv,
+} from "../paseo-env.js";
 export {
   AgentProviderRuntimeSettingsMapSchema,
   ProviderCommandSchema,
@@ -39,6 +43,7 @@ export interface ResolvedProviderLaunch {
   command: string;
   args: string[];
   source: ProviderLaunchSource;
+  env?: ProcessEnvRecord;
 }
 
 export interface ProviderLaunchAvailability {
@@ -60,8 +65,8 @@ function normalizeLaunchDefault(
   return defaultBinary;
 }
 
-async function resolveLaunchPath(command: string): Promise<string | null> {
-  const found = await findExecutable(command);
+async function resolveLaunchPath(command: string, env?: ProcessEnvRecord): Promise<string | null> {
+  const found = await findExecutable(command, { env });
   if (found) {
     return found;
   }
@@ -116,7 +121,7 @@ export async function checkProviderLaunchAvailable(
   const resolvedPath =
     defaultBinary && launch.source !== "override"
       ? await resolveDefaultLaunchPath(defaultBinary)
-      : await resolveLaunchPath(launch.command);
+      : await resolveLaunchPath(launch.command, launch.env);
   return {
     available: resolvedPath !== null,
     resolvedPath,
@@ -242,7 +247,7 @@ export function createProviderEnvSpec(options: ProviderEnvOptions = {}): Provide
   };
 }
 
-export function createProviderEnv(options: ProviderEnvOptions = {}): NodeJS.ProcessEnv {
+export function createProviderEnv(options: ProviderEnvOptions = {}): ExternalProcessEnv {
   const spec = createProviderEnvSpec(options);
   return createExternalProcessEnv(spec.baseEnv ?? process.env, spec.envOverlay);
 }
diff --git a/packages/server/src/server/agent/provider-options.test.ts b/packages/server/src/server/agent/provider-options.test.ts
index 911c6dcddd..f5b97d064a 100644
--- a/packages/server/src/server/agent/provider-options.test.ts
+++ b/packages/server/src/server/agent/provider-options.test.ts
@@ -1,7 +1,11 @@
+import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { describe, expect, test } from "vitest";
 import { z } from "zod";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 
+import { AgentManager } from "./agent-manager.js";
 import { validateProviderOptions } from "./provider-options.js";
 import { applyClaudeToolPolicy, ClaudeProviderOptionsSchema } from "./providers/claude/options.js";
 import { applyCodexToolPolicy, CodexProviderOptionsSchema } from "./providers/codex/options.js";
@@ -51,6 +55,7 @@ describe("provider-owned option schemas", () => {
       ClaudeProviderOptionsSchema.parse({
         allowedTools: ["Read"],
         disallowedTools: ["Bash(rm *)"],
+        extraArgs: { chrome: null, model: "x" },
         sandbox: {
           enabled: true,
           failIfUnavailable: true,
@@ -63,7 +68,26 @@ describe("provider-owned option schemas", () => {
         },
         settings: { permissions: { ask: ["Bash(*)"], deny: ["Edit(.env)"] } },
       }),
-    ).toMatchObject({ sandbox: { enabled: true, failIfUnavailable: true } });
+    ).toMatchObject({
+      extraArgs: { chrome: null, model: "x" },
+      sandbox: { enabled: true, failIfUnavailable: true },
+    });
+  });
+
+  test.each([true, 42, ["x"]])("rejects invalid Claude extra argument values: %j", (value) => {
+    expect(() =>
+      validateProviderOptions("claude", ClaudeProviderOptionsSchema, {
+        extraArgs: { chrome: value },
+      }),
+    ).toThrow("providerOptions.extraArgs.chrome");
+  });
+
+  test("rejects a raw argument list for the SDK argument map", () => {
+    expect(() =>
+      validateProviderOptions("claude", ClaudeProviderOptionsSchema, {
+        extraArgs: ["--chrome"],
+      }),
+    ).toThrow("providerOptions.extraArgs");
   });
 
   test("reports the exact invalid Claude option path", () => {
@@ -179,3 +203,66 @@ describe("exact MCP preapproval mappings", () => {
     ]);
   });
 });
+
+describe("configured provider options", () => {
+  test.each(["options", "params"] as const)(
+    "Pi imports read sessionDir from config %s",
+    async (key) => {
+      const dir = mkdtempSync(join(tmpdir(), "provider-options-import-"));
+      try {
+        const file = join(dir, "native.jsonl");
+        writeFileSync(
+          file,
+          JSON.stringify({
+            type: "session",
+            version: 3,
+            id: "native",
+            cwd: "/tmp/options-project",
+          }) + "\n",
+        );
+        const logger = createTestLogger();
+        const registry = buildProviderRegistry(logger, {
+          providerOverrides: { pi: { [key]: { sessionDir: dir } } },
+        });
+        const sessions = await registry.pi.createClient(logger).listImportableSessions!({
+          cwd: "/tmp/options-project",
+        });
+        expect(sessions.map((session) => session.providerHandleId)).toEqual([file]);
+      } finally {
+        rmSync(dir, { recursive: true, force: true });
+      }
+    },
+  );
+
+  test("a provider without option handling ignores the record", async () => {
+    const logger = createTestLogger();
+    const registry = buildProviderRegistry(logger, {
+      isDev: true,
+      providerOverrides: { mock: { options: { arbitrary: { base: true } } } },
+    });
+    const session = await registry.mock
+      .createClient(logger)
+      .createSession({ provider: "mock", cwd: "/tmp", providerOptions: { more: [1] } });
+    expect(session.provider).toBe("mock");
+    await session.close();
+  });
+
+  test("config options reach Claude and provider validation reaches the create caller", async () => {
+    const logger = createTestLogger();
+    const registry = buildProviderRegistry(logger, {
+      providerOverrides: {
+        claude: { options: { sandbox: { network: { allowLocalBinding: "yes" } } } },
+      },
+    });
+    const manager = new AgentManager({
+      logger,
+      clients: { claude: registry.claude.createClient(logger) },
+      providerDefinitions: { claude: registry.claude },
+    });
+    await expect(
+      manager.createAgent({ provider: "claude", cwd: "/tmp", model: "sonnet" }, undefined, {
+        workspaceId: undefined,
+      }),
+    ).rejects.toThrow("providerOptions.sandbox.network.allowLocalBinding");
+  });
+});
diff --git a/packages/server/src/server/agent/provider-options.ts b/packages/server/src/server/agent/provider-options.ts
index bf02410e22..8a7d0b16af 100644
--- a/packages/server/src/server/agent/provider-options.ts
+++ b/packages/server/src/server/agent/provider-options.ts
@@ -36,11 +36,11 @@ export class ToolPolicyUnsupportedError extends Error {
   }
 }
 
-export function validateProviderOptions(
+export function validateProviderOptions<T extends ProviderOptions>(
   provider: string,
-  schema: z.ZodType<ProviderOptions>,
+  schema: z.ZodType<T>,
   options: ProviderOptions | undefined,
-): ProviderOptions | undefined {
+): T | undefined {
   if (options === undefined) return undefined;
   const parsed = schema.safeParse(options);
   if (parsed.success) return parsed.data;
@@ -75,3 +75,31 @@ function formatProviderOptionPath(path: Array<string | number>): string {
       : `${formatted}[${JSON.stringify(segment)}]`;
   }, "providerOptions");
 }
+
+/** Plain objects merge recursively; all other values replace the base value. */
+export function mergeProviderOptions(
+  base: ProviderOptions | undefined,
+  override: ProviderOptions | undefined,
+): ProviderOptions | undefined {
+  if (base === undefined && override === undefined) return undefined;
+  const merged: ProviderOptions = { ...base };
+  for (const [key, value] of Object.entries(override ?? {})) {
+    const previous = merged[key];
+    Object.defineProperty(merged, key, {
+      value:
+        isPlainObject(previous) && isPlainObject(value)
+          ? mergeProviderOptions(previous, value)
+          : value,
+      enumerable: true,
+      configurable: true,
+      writable: true,
+    });
+  }
+  return merged;
+}
+
+function isPlainObject(value: unknown): value is ProviderOptions {
+  if (value === null || typeof value !== "object") return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
diff --git a/packages/server/src/server/agent/provider-registry-wrap.test.ts b/packages/server/src/server/agent/provider-registry-wrap.test.ts
index ae1254efa7..04d123ead1 100644
--- a/packages/server/src/server/agent/provider-registry-wrap.test.ts
+++ b/packages/server/src/server/agent/provider-registry-wrap.test.ts
@@ -6,6 +6,9 @@ import type {
   AgentSession,
   AgentStreamEvent,
   AgentRuntimeInfo,
+  SteerActiveTurnOptions,
+  SteerResult,
+  ImportedTimelineEntry,
 } from "./agent-sdk-types.js";
 import { wrapSessionProvider } from "./provider-registry.js";
 
@@ -18,6 +21,7 @@ type OptionalAgentSessionMethodName = {
 }[keyof AgentSession];
 
 const OPTIONAL_AGENT_SESSION_METHOD_NAMES = [
+  "steerActiveTurn",
   "listCommands",
   "setModel",
   "setThinkingOption",
@@ -56,8 +60,12 @@ const RUNTIME_INFO: AgentRuntimeInfo = {
 
 class FakeSession implements AgentSession {
   readonly provider = "claude";
-  readonly id = "session-1";
-  readonly capabilities = CAPABILITIES;
+  id = "session-1";
+  capabilities = CAPABILITIES;
+  initialTimeline: ImportedTimelineEntry[] = [
+    { item: { type: "assistant_message", id: "initial", text: "Provider setup" } },
+  ];
+  readonly steers: Array<{ prompt: AgentPromptInput; options: SteerActiveTurnOptions }> = [];
   readonly features = [];
   readonly recordedCalls: string[] = [];
 
@@ -71,6 +79,15 @@ class FakeSession implements AgentSession {
     return { turnId: "turn-1" };
   }
 
+  async steerActiveTurn(
+    prompt: AgentPromptInput,
+    options: SteerActiveTurnOptions,
+  ): Promise<SteerResult> {
+    this.recordedCalls.push("steerActiveTurn");
+    this.steers.push({ prompt, options });
+    return { status: "accepted" };
+  }
+
   subscribe(_callback: (event: AgentStreamEvent) => void) {
     this.recordedCalls.push("subscribe");
     return () => {};
@@ -172,6 +189,7 @@ describe("wrapSessionProvider", () => {
     const session = new FakeSession();
     const wrapped = wrapSessionProvider("custom-claude", session);
 
+    await wrapped.steerActiveTurn?.("follow-up", { expectedTurnId: "turn-1" });
     await wrapped.listCommands?.();
     await wrapped.setModel?.("sonnet");
     await wrapped.setThinkingOption?.("high");
@@ -182,7 +200,11 @@ describe("wrapSessionProvider", () => {
     const handler = wrapped.tryHandleOutOfBand?.("/compact");
     await handler?.run({ emit: () => {} });
 
+    expect(session.steers).toEqual([
+      { prompt: "follow-up", options: { expectedTurnId: "turn-1" } },
+    ]);
     expect(session.recordedCalls).toEqual([
+      "steerActiveTurn",
       "listCommands",
       "setModel",
       "setThinkingOption",
@@ -194,4 +216,34 @@ describe("wrapSessionProvider", () => {
       "tryHandleOutOfBand.run",
     ]);
   });
+  test("keeps provider-owned session values live", () => {
+    const session = new FakeSession();
+    const wrapped = wrapSessionProvider("custom-claude", session);
+    session.id = "session-2";
+    session.capabilities = { ...CAPABILITIES, supportsMcpServers: false };
+    expect(wrapped.id).toBe("session-2");
+    expect(wrapped.capabilities).toEqual(session.capabilities);
+    expect(wrapped.initialTimeline).toEqual(session.initialTimeline);
+  });
+
+  test("propagates steering failure without interrupting or replacing the turn", async () => {
+    const error = new Error("Provider steer transport failed");
+    class RejectingSession extends FakeSession {
+      override async steerActiveTurn(): Promise<SteerResult> {
+        throw error;
+      }
+    }
+    const session = new RejectingSession();
+    const wrapped = wrapSessionProvider("custom-claude", session);
+    await expect(wrapped.steerActiveTurn!("follow-up", { expectedTurnId: "turn-1" })).rejects.toBe(
+      error,
+    );
+    expect(session.recordedCalls).toEqual([]);
+  });
+
+  test("leaves steering unavailable when the provider has no implementation", () => {
+    const session: AgentSession = new FakeSession();
+    session.steerActiveTurn = undefined;
+    expect(wrapSessionProvider("custom-claude", session).steerActiveTurn).toBeUndefined();
+  });
 });
diff --git a/packages/server/src/server/agent/provider-registry.test.ts b/packages/server/src/server/agent/provider-registry.test.ts
index 656349e10b..9a2cb768f0 100644
--- a/packages/server/src/server/agent/provider-registry.test.ts
+++ b/packages/server/src/server/agent/provider-registry.test.ts
@@ -24,7 +24,7 @@ const CLAUDE_CUSTOM_THINKING_FIELDS = {
 const mockState = vi.hoisted(() => {
   interface ConstructorEntry {
     runtimeSettings?: unknown;
-    providerParams?: unknown;
+
     commandsRpcType?: unknown;
   }
 
@@ -36,17 +36,14 @@ const mockState = vi.hoisted(() => {
       cursor: [] as Array<{
         command: string[];
         env?: Record<string, string>;
-        providerParams?: unknown;
       }>,
       trae: [] as Array<{
         command: string[];
         env?: Record<string, string>;
-        providerParams?: unknown;
       }>,
       kimi: [] as Array<{
         command: string[];
         env?: Record<string, string>;
-        providerParams?: unknown;
       }>,
       pi: [] as ConstructorEntry[],
       genericAcp: [] as Array<{
@@ -54,12 +51,12 @@ const mockState = vi.hoisted(() => {
         env?: Record<string, string>;
         providerId?: string;
         label?: string;
-        providerParams?: unknown;
       }>,
     },
     isCommandAvailable: vi.fn(async (_command: string) => false),
     runtimeModels: new Map<string, AgentModelDefinition[]>(),
     cursorListFeaturesConfigs: [] as AgentSessionConfig[],
+    codexNativeArchiveCalls: [] as Array<{ state: "archive" | "restore"; handle: unknown }>,
     reset() {
       this.constructorArgs.claude = [];
       this.constructorArgs.codex = [];
@@ -73,6 +70,7 @@ const mockState = vi.hoisted(() => {
       this.isCommandAvailable.mockImplementation(async (_command: string) => false);
       this.runtimeModels.clear();
       this.cursorListFeaturesConfigs = [];
+      this.codexNativeArchiveCalls = [];
     },
   };
 });
@@ -171,6 +169,14 @@ vi.mock("./providers/codex-app-server-agent.js", () => ({
       };
     }
 
+    async archiveNativeSession(handle: unknown): Promise<void> {
+      mockState.codexNativeArchiveCalls.push({ state: "archive", handle });
+    }
+
+    async unarchiveNativeSession(handle: unknown): Promise<void> {
+      mockState.codexNativeArchiveCalls.push({ state: "restore", handle });
+    }
+
     async isAvailable(): Promise<boolean> {
       const command: { mode?: string; argv?: string[] } | undefined =
         typeof this.runtimeSettings === "object" && this.runtimeSettings !== null
@@ -251,13 +257,12 @@ vi.mock("./providers/pi/agent.js", () => ({
 
     constructor(options: {
       runtimeSettings?: unknown;
-      providerParams?: unknown;
+
       commandsRpcType?: unknown;
     }) {
       this.runtimeSettings = options.runtimeSettings;
       const entry: ConstructorEntry = {
         runtimeSettings: options.runtimeSettings,
-        providerParams: options.providerParams,
       };
       if (options.commandsRpcType !== undefined) {
         entry.commandsRpcType = options.commandsRpcType;
@@ -304,21 +309,7 @@ vi.mock("./providers/generic-acp-agent.js", () => ({
       env?: Record<string, string>;
       providerId?: string;
       label?: string;
-      providerParams?: unknown;
     }) {
-      const providerParams =
-        options.providerParams &&
-        typeof options.providerParams === "object" &&
-        !Array.isArray(options.providerParams)
-          ? (options.providerParams as Record<string, unknown>)
-          : {};
-      this.capabilities = {
-        ...this.capabilities,
-        supportsMcpServers:
-          typeof providerParams.supportsMcpServers === "boolean"
-            ? providerParams.supportsMcpServers
-            : this.capabilities.supportsMcpServers,
-      };
       this.runtimeSettings = {
         command: {
           mode: "replace",
@@ -331,7 +322,6 @@ vi.mock("./providers/generic-acp-agent.js", () => ({
         env: options.env,
         providerId: options.providerId,
         label: options.label,
-        providerParams: options.providerParams,
       });
     }
 
@@ -369,11 +359,7 @@ vi.mock("./providers/cursor-acp-agent.js", () => ({
     readonly provider = "acp";
     readonly runtimeSettings?: unknown;
 
-    constructor(options: {
-      command: string[];
-      env?: Record<string, string>;
-      providerParams?: unknown;
-    }) {
+    constructor(options: { command: string[]; env?: Record<string, string> }) {
       this.runtimeSettings = {
         command: {
           mode: "replace",
@@ -384,7 +370,6 @@ vi.mock("./providers/cursor-acp-agent.js", () => ({
       mockState.constructorArgs.cursor.push({
         command: options.command,
         env: options.env,
-        providerParams: options.providerParams,
       });
     }
 
@@ -435,11 +420,7 @@ vi.mock("./providers/trae-acp-agent.js", () => ({
     readonly provider = "acp";
     readonly runtimeSettings?: unknown;
 
-    constructor(options: {
-      command: string[];
-      env?: Record<string, string>;
-      providerParams?: unknown;
-    }) {
+    constructor(options: { command: string[]; env?: Record<string, string> }) {
       this.runtimeSettings = {
         command: {
           mode: "replace",
@@ -450,7 +431,6 @@ vi.mock("./providers/trae-acp-agent.js", () => ({
       mockState.constructorArgs.trae.push({
         command: options.command,
         env: options.env,
-        providerParams: options.providerParams,
       });
     }
 
@@ -488,11 +468,7 @@ vi.mock("./providers/kimi-acp-agent.js", () => ({
     readonly provider = "acp";
     readonly runtimeSettings?: unknown;
 
-    constructor(options: {
-      command: string[];
-      env?: Record<string, string>;
-      providerParams?: unknown;
-    }) {
+    constructor(options: { command: string[]; env?: Record<string, string> }) {
       this.runtimeSettings = {
         command: {
           mode: "replace",
@@ -503,7 +479,6 @@ vi.mock("./providers/kimi-acp-agent.js", () => ({
       mockState.constructorArgs.kimi.push({
         command: options.command,
         env: options.env,
-        providerParams: options.providerParams,
       });
     }
 
@@ -651,6 +626,22 @@ test("new provider extending claude appears in registry", () => {
   expect(registry.zai.createClient(logger).provider).toBe("zai");
 });
 
+test("new provider extending codex archives and unarchives its native sessions", async () => {
+  const registry = buildProviderRegistry(logger, {
+    providerOverrides: { "my-codex": { extends: "codex", label: "My Codex" } },
+  });
+  const client = registry["my-codex"].createClient(logger);
+  const handle = { provider: "my-codex", sessionId: "thread-1", nativeHandle: "thread-1" };
+
+  await client.archiveNativeSession?.(handle);
+  await client.unarchiveNativeSession?.(handle);
+
+  expect(mockState.codexNativeArchiveCalls).toEqual([
+    { state: "archive", handle: { ...handle, provider: "codex" } },
+    { state: "restore", handle: { ...handle, provider: "codex" } },
+  ]);
+});
+
 test("built-in OMP override keeps the real OMP adapter enabled and launchable", async () => {
   const omp = new FakeOmp(["custom-omp"]);
   const registry = buildProviderRegistry(logger, {
@@ -702,7 +693,6 @@ test("new provider extending acp uses GenericACPAgentClient", () => {
       },
       providerId: "my-agent",
       label: "My Agent",
-      providerParams: undefined,
     },
     {
       command: ["my-agent", "--acp"],
@@ -711,7 +701,6 @@ test("new provider extending acp uses GenericACPAgentClient", () => {
       },
       providerId: "my-agent",
       label: "My Agent",
-      providerParams: undefined,
     },
   ]);
 });
@@ -786,43 +775,20 @@ test("ordinary custom ACP providers remain fail-closed for exact MCP grants", ()
   ).toThrow(/cannot preapprove exact MCP tools for unattended execution/u);
 });
 
-test("ACP provider params can disable MCP support", () => {
+test("ACP provider configuration retains opaque options", () => {
   const registry = buildProviderRegistry(logger, {
     providerOverrides: {
       "no-mcp-acp": {
         extends: "acp",
         label: "No MCP ACP",
         command: ["no-mcp-acp", "serve"],
-        params: {
-          supportsMcpServers: false,
-        },
+        options: { supportsMcpServers: false },
       },
     },
   });
-
-  const client = registry["no-mcp-acp"].createClient(logger);
-
-  expect(client.capabilities.supportsMcpServers).toBe(false);
-  expect(mockState.constructorArgs.genericAcp).toEqual([
-    {
-      command: ["no-mcp-acp", "serve"],
-      env: undefined,
-      providerId: "no-mcp-acp",
-      label: "No MCP ACP",
-      providerParams: {
-        supportsMcpServers: false,
-      },
-    },
-    {
-      command: ["no-mcp-acp", "serve"],
-      env: undefined,
-      providerId: "no-mcp-acp",
-      label: "No MCP ACP",
-      providerParams: {
-        supportsMcpServers: false,
-      },
-    },
-  ]);
+  expect(registry["no-mcp-acp"].configuration?.providerOptions).toEqual({
+    supportsMcpServers: false,
+  });
 });
 
 test("cursor provider extending acp uses CursorACPAgentClient", () => {
@@ -846,14 +812,12 @@ test("cursor provider extending acp uses CursorACPAgentClient", () => {
       env: {
         CURSOR_AGENT_LOG: "debug",
       },
-      providerParams: undefined,
     },
     {
       command: ["cursor-agent", "acp"],
       env: {
         CURSOR_AGENT_LOG: "debug",
       },
-      providerParams: undefined,
     },
   ]);
   expect(mockState.constructorArgs.genericAcp).toEqual([]);
@@ -910,12 +874,10 @@ test("traecli provider extending acp uses TraeACPAgentClient", () => {
     {
       command: ["traecli", "acp", "serve"],
       env: undefined,
-      providerParams: undefined,
     },
     {
       command: ["traecli", "acp", "serve"],
       env: undefined,
-      providerParams: undefined,
     },
   ]);
   expect(mockState.constructorArgs.genericAcp).toEqual([]);
@@ -937,12 +899,10 @@ test("kimi provider extending acp uses KimiACPAgentClient", () => {
     {
       command: ["kimi", "acp"],
       env: undefined,
-      providerParams: undefined,
     },
     {
       command: ["kimi", "acp"],
       env: undefined,
-      providerParams: undefined,
     },
   ]);
   expect(mockState.constructorArgs.genericAcp).toEqual([]);
diff --git a/packages/server/src/server/agent/provider-registry.ts b/packages/server/src/server/agent/provider-registry.ts
index c65db34b2d..2698a3b2ac 100644
--- a/packages/server/src/server/agent/provider-registry.ts
+++ b/packages/server/src/server/agent/provider-registry.ts
@@ -1,6 +1,5 @@
 import type { Logger } from "pino";
 import type { ProviderOptions, ToolPolicy } from "@getpaseo/protocol/agent-types";
-import { z } from "zod";
 
 import type {
   AgentClient,
@@ -41,7 +40,7 @@ import { CursorACPAgentClient } from "./providers/cursor-acp-agent.js";
 import { GenericACPAgentClient } from "./providers/generic-acp-agent.js";
 import { KimiACPAgentClient } from "./providers/kimi-acp-agent.js";
 import { KiroACPAgentClient } from "./providers/kiro-acp-agent.js";
-import { OpenCodeAgentClient } from "./providers/opencode-agent.js";
+import { OpenCodeRuntimeClient } from "./providers/opencode/runtime-client.js";
 import type { OpenCodeBridge } from "./providers/opencode/bridge.js";
 import { OmpAgentClient } from "./providers/omp/agent.js";
 import type { OmpRuntime } from "./providers/omp/runtime.js";
@@ -49,10 +48,7 @@ import { PiRpcAgentClient } from "./providers/pi/agent.js";
 import { TraeACPAgentClient } from "./providers/trae-acp-agent.js";
 import { MockLoadTestAgentClient } from "./providers/mock-load-test-agent.js";
 import { MockSlowProviderClient } from "./providers/mock-slow-provider.js";
-import { ClaudeProviderOptionsSchema } from "./providers/claude/options.js";
-import { CodexProviderOptionsSchema } from "./providers/codex/options.js";
-import { OpenCodeProviderOptionsSchema } from "./providers/opencode/options.js";
-import { ToolPolicyUnsupportedError, validateProviderOptions } from "./provider-options.js";
+import { ToolPolicyUnsupportedError, mergeProviderOptions } from "./provider-options.js";
 import {
   AGENT_PROVIDER_DEFINITIONS,
   BUILTIN_PROVIDER_IDS,
@@ -70,6 +66,9 @@ export type { AgentProviderDefinition };
 export { AGENT_PROVIDER_DEFINITIONS, getAgentProviderDefinition };
 
 export interface ProviderDefinition extends AgentProviderDefinition {
+  /** Effective inputs after overrides and inheritance; plugin registrations are owned separately. */
+  configuration: Omit<ResolvedProvider, "createBaseClient" | "contract"> | null;
+  iconSvg?: string;
   enabled: boolean;
   /**
    * The id of another *registered* provider this one extends (e.g. a Z.AI
@@ -77,13 +76,7 @@ export interface ProviderDefinition extends AgentProviderDefinition {
    * generic ACP providers (which only extend the literal "acp" sentinel).
    */
   derivedFromProviderId: string | null;
-  optionsSchema: z.ZodType<ProviderOptions>;
   supportsExactMcpPreapproval: boolean;
-  validateOptions: (options: ProviderOptions | undefined) => ProviderOptions | undefined;
-  applyOptions: (
-    config: AgentSessionConfig,
-    options: ProviderOptions | undefined,
-  ) => AgentSessionConfig;
   applyToolPolicy: (
     config: AgentSessionConfig,
     toolPolicy: ToolPolicy | undefined,
@@ -102,7 +95,15 @@ export interface ProviderDefinition extends AgentProviderDefinition {
   ) => Promise<ProviderCatalog>;
 }
 
+/** Provider metadata and an unconfigured factory; the registry owns override application. */
+export interface RegisteredProviderDefinition extends AgentProviderDefinition {
+  iconSvg?: string;
+  supportsExactMcpPreapproval: boolean;
+  createClient: (logger: Logger, runtimeSettings?: ProviderRuntimeSettings) => AgentClient;
+}
+
 export interface BuildProviderRegistryOptions {
+  pluginProviders?: Record<string, RegisteredProviderDefinition>;
   runtimeSettings?: AgentProviderRuntimeSettingsMap;
   providerOverrides?: Record<string, ProviderOverride>;
   workspaceGitService?: Pick<WorkspaceGitService, "resolveRepoRoot">;
@@ -117,7 +118,6 @@ interface ProviderClientFactoryOptions extends Pick<
   "workspaceGitService" | "managedProcesses" | "ompRuntime"
 > {
   openCodeBridge?: OpenCodeBridge;
-  providerParams?: unknown;
   customProvider?: {
     id: string;
     label: string;
@@ -139,27 +139,23 @@ interface ResolvedProvider {
   profileModelsAreAdditive: boolean;
   enabled: boolean;
   derivedFromProviderId: string | null;
-  providerParams?: unknown;
+  providerOptions?: ProviderOptions;
   createBaseClient: (logger: Logger) => AgentClient;
   contract: ProviderContract;
 }
 
 interface ProviderContract {
-  optionsSchema: z.ZodType<ProviderOptions>;
   supportsExactMcpPreapproval: boolean;
   applyToolPolicy?: (provider: string, toolPolicy: ToolPolicy) => ToolPolicy;
 }
 
-const EmptyProviderOptionsSchema: z.ZodType<ProviderOptions> = z.object({}).strict();
-
 const PROVIDER_CONTRACTS: Record<string, ProviderContract> = {
-  claude: { optionsSchema: ClaudeProviderOptionsSchema, supportsExactMcpPreapproval: true },
-  codex: { optionsSchema: CodexProviderOptionsSchema, supportsExactMcpPreapproval: true },
-  opencode: { optionsSchema: OpenCodeProviderOptionsSchema, supportsExactMcpPreapproval: true },
+  claude: { supportsExactMcpPreapproval: true },
+  codex: { supportsExactMcpPreapproval: true },
+  opencode: { supportsExactMcpPreapproval: true },
 };
 
 const UNSUPPORTED_PROVIDER_CONTRACT: ProviderContract = {
-  optionsSchema: EmptyProviderOptionsSchema,
   supportsExactMcpPreapproval: false,
 };
 
@@ -169,7 +165,6 @@ const HUB_E2E_TOOL_NAME = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/u;
 // The cross-repository Hub harness owns this synthetic provider ID. It exercises the production
 // registry path without extending exact-preapproval support to user-defined ACP providers.
 const HUB_E2E_PROVIDER_CONTRACT: ProviderContract = {
-  optionsSchema: EmptyProviderOptionsSchema,
   supportsExactMcpPreapproval: true,
   applyToolPolicy: (provider, toolPolicy) => {
     for (const grant of toolPolicy.preapproved) {
@@ -213,21 +208,19 @@ const PROVIDER_CLIENT_FACTORIES: Record<string, ProviderClientFactory> = {
       env: runtimeSettings?.env,
     }),
   opencode: (logger, runtimeSettings, options) =>
-    new OpenCodeAgentClient(logger, runtimeSettings, {
+    new OpenCodeRuntimeClient(logger, runtimeSettings, {
       managedProcesses: options?.managedProcesses,
       bridge: options?.openCodeBridge,
     }),
-  pi: (logger, runtimeSettings, options) =>
+  pi: (logger, runtimeSettings) =>
     new PiRpcAgentClient({
       logger,
       runtimeSettings,
-      providerParams: options?.providerParams,
     }),
   omp: (logger, runtimeSettings, options) =>
     new OmpAgentClient({
       logger,
       runtimeSettings,
-      providerParams: options?.providerParams,
       runtime: options?.ompRuntime,
     }),
   mock: (logger) => new MockLoadTestAgentClient(logger),
@@ -438,16 +431,28 @@ function mergeModelAdditions(
   );
 }
 
+// Every session member must cross this boundary, including optional capabilities.
+type ForwardedAgentSession = { [K in keyof Required<AgentSession>]: AgentSession[K] };
+
 export function wrapSessionProvider(provider: AgentProvider, inner: AgentSession): AgentSession {
   return {
     provider,
-    id: inner.id,
-    capabilities: inner.capabilities,
+    get id() {
+      return inner.id;
+    },
+    get capabilities() {
+      return inner.capabilities;
+    },
+    get initialTimeline() {
+      return inner.initialTimeline;
+    },
     get features() {
       return inner.features;
     },
+    usageSession: inner.usageSession?.bind(inner),
     run: (prompt, options) => inner.run(prompt, options),
     startTurn: (prompt, options) => inner.startTurn(prompt, options),
+    steerActiveTurn: inner.steerActiveTurn?.bind(inner),
     subscribe: (callback) => inner.subscribe((event) => callback(mapStreamEvent(provider, event))),
     async *streamHistory() {
       for await (const event of inner.streamHistory()) {
@@ -471,7 +476,7 @@ export function wrapSessionProvider(provider: AgentProvider, inner: AgentSession
     revertFiles: inner.revertFiles?.bind(inner),
     revertBoth: inner.revertBoth?.bind(inner),
     tryHandleOutOfBand: inner.tryHandleOutOfBand?.bind(inner),
-  };
+  } satisfies ForwardedAgentSession;
 }
 
 function wrapClientProvider(
@@ -480,23 +485,32 @@ function wrapClientProvider(
   profileModels: ProviderProfileModel[],
   additionalModels: ProviderProfileModel[],
   profileModelsAreAdditive: boolean,
+  providerOptions: ProviderOptions | undefined,
 ): AgentClient {
   const listImportableSessions = inner.listImportableSessions?.bind(inner);
   const importSession = inner.importSession?.bind(inner);
   const listFeatures = inner.listFeatures?.bind(inner);
+  const archiveNativeSession = inner.archiveNativeSession?.bind(inner);
+  const unarchiveNativeSession = inner.unarchiveNativeSession?.bind(inner);
+  const configuredModelIds = [...profileModels, ...additionalModels].map((model) => model.id);
 
   return {
     provider,
-    capabilities: inner.capabilities,
-    createSession: async (config, launchContext) =>
+    get capabilities() {
+      return inner.capabilities;
+    },
+    shutdown: inner.shutdown?.bind(inner),
+    createSession: async (config, launchContext, options) =>
       wrapSessionProvider(
         provider,
         await inner.createSession(
           {
             ...config,
             provider: inner.provider,
+            providerOptions: mergeProviderOptions(providerOptions, config.providerOptions),
           },
           launchContext,
+          { ...options, configuredModelIds },
         ),
       ),
     resumeSession: async (handle, overrides, launchContext, options) =>
@@ -507,18 +521,17 @@ function wrapClientProvider(
             ...handle,
             provider: inner.provider,
           },
-          overrides
-            ? {
-                ...overrides,
-                provider: inner.provider,
-              }
-            : undefined,
+          {
+            ...overrides,
+            provider: inner.provider,
+            providerOptions: mergeProviderOptions(providerOptions, overrides?.providerOptions),
+          },
           launchContext,
-          options,
+          { ...options, configuredModelIds },
         ),
       ),
     fetchCatalog: async (options, context) => {
-      const catalog = await inner.fetchCatalog(options, context);
+      const catalog = await inner.fetchCatalog({ ...options, providerOptions }, context);
       return {
         ...catalog,
         models: mergeModels(provider, profileModels, additionalModels, catalog.models, {
@@ -530,7 +543,11 @@ function wrapClientProvider(
     resolveDefaultModeId: inner.resolveDefaultModeId
       ? async ({ config, env, signal }: ResolveAgentDefaultModeInput) =>
           await inner.resolveDefaultModeId?.({
-            config: { ...config, provider: inner.provider },
+            config: {
+              ...config,
+              provider: inner.provider,
+              providerOptions: mergeProviderOptions(providerOptions, config.providerOptions),
+            },
             env,
             signal,
           })
@@ -539,10 +556,15 @@ function wrapClientProvider(
     resolveConfiguredModel: inner.resolveConfiguredModel?.bind(inner),
     isCreateConfigUnattended: inner.isCreateConfigUnattended?.bind(inner),
     listFeatures: listFeatures
-      ? async (config) => await listFeatures({ ...config, provider: inner.provider })
+      ? async (config) =>
+          await listFeatures({
+            ...config,
+            provider: inner.provider,
+            providerOptions: mergeProviderOptions(providerOptions, config.providerOptions),
+          })
       : undefined,
     listImportableSessions: listImportableSessions
-      ? async (options) => await listImportableSessions(options)
+      ? async (options) => await listImportableSessions({ ...options, providerOptions })
       : undefined,
     importSession: importSession
       ? async (input, context) => {
@@ -551,6 +573,10 @@ function wrapClientProvider(
             config: {
               ...context.config,
               provider: inner.provider,
+              providerOptions: mergeProviderOptions(
+                providerOptions,
+                context.config.providerOptions,
+              ),
             },
             storedConfig: {
               ...context.storedConfig,
@@ -567,12 +593,20 @@ function wrapClientProvider(
             config: {
               ...imported.config,
               provider,
+              providerOptions: context.storedConfig.providerOptions,
             },
             persistence,
           };
         }
       : undefined,
-    isAvailable: (signal) => inner.isAvailable(signal),
+    archiveNativeSession: archiveNativeSession
+      ? async (handle) => await archiveNativeSession({ ...handle, provider: inner.provider })
+      : undefined,
+    unarchiveNativeSession: unarchiveNativeSession
+      ? async (handle) => await unarchiveNativeSession({ ...handle, provider: inner.provider })
+      : undefined,
+    getCatalogCacheKey: inner.getCatalogCacheKey?.bind(inner),
+    isAvailable: (signal, options) => inner.isAvailable(signal, options),
     getDiagnostic: inner.getDiagnostic?.bind(inner),
   };
 }
@@ -582,7 +616,7 @@ function createRegistryEntry(
   provider: AgentProvider,
   resolved: ResolvedProvider,
 ): ProviderDefinition {
-  const modelClient = resolved.createBaseClient(logger);
+  const modelClient = createResolvedProviderClient(logger, provider, resolved);
   const profileModels = resolveConfiguredModels(provider, modelClient, resolved.profileModels);
   const additionalModels = resolveConfiguredModels(
     provider,
@@ -607,15 +641,13 @@ function createRegistryEntry(
 
   const hasStaticModes = resolved.definition.modes.length > 0;
 
+  const { createBaseClient: _createBaseClient, contract: _contract, ...configuration } = resolved;
   return {
     ...resolved.definition,
+    configuration,
     enabled: resolved.enabled,
     derivedFromProviderId: resolved.derivedFromProviderId,
-    optionsSchema: resolved.contract.optionsSchema,
     supportsExactMcpPreapproval: resolved.contract.supportsExactMcpPreapproval,
-    validateOptions: (options) =>
-      validateProviderOptions(provider, resolved.contract.optionsSchema, options),
-    applyOptions: (config, options) => ({ ...config, providerOptions: options }),
     applyToolPolicy: (config, toolPolicy) => {
       if (toolPolicy && !resolved.contract.supportsExactMcpPreapproval) {
         throw new ToolPolicyUnsupportedError(provider);
@@ -686,19 +718,41 @@ function createResolvedProviderClient(
   const inner = resolved.createBaseClient(logger);
   const profileModels = resolveConfiguredModels(provider, inner, resolved.profileModels);
   const additionalModels = resolveConfiguredModels(provider, inner, resolved.additionalModels);
-  const hasModelOverrides = profileModels.length > 0 || additionalModels.length > 0;
-  if (inner.provider === provider && !hasModelOverrides) {
-    return inner;
-  }
   return wrapClientProvider(
     provider,
     inner,
     profileModels,
     additionalModels,
     resolved.profileModelsAreAdditive,
+    resolved.providerOptions,
   );
 }
 
+interface RegisteredProvider {
+  definition: AgentProviderDefinition;
+  createClient: ProviderClientFactory;
+  contract: ProviderContract;
+  runtimeSettings?: ProviderRuntimeSettings;
+  override?: ProviderOverride;
+}
+
+function resolveRegisteredProvider(input: RegisteredProvider): ResolvedProvider {
+  const { definition, override, contract } = input;
+  const runtimeSettings = mergeRuntimeSettings(input.runtimeSettings, toRuntimeSettings(override));
+  return {
+    definition: applyOverrideToDefinition(definition, override),
+    runtimeSettings,
+    profileModels: override?.models ?? [],
+    additionalModels: override?.additionalModels ?? [],
+    profileModelsAreAdditive: false,
+    enabled: override?.enabled ?? definition.enabledByDefault ?? true,
+    derivedFromProviderId: null,
+    providerOptions: configuredProviderOptions(override),
+    createBaseClient: (logger) => input.createClient(logger, runtimeSettings),
+    contract,
+  };
+}
+
 function buildResolvedBuiltinProviders(
   providerOverrides: Record<string, ProviderOverride>,
   runtimeSettings: AgentProviderRuntimeSettingsMap | undefined,
@@ -717,30 +771,22 @@ function buildResolvedBuiltinProviders(
   for (const definition of definitions) {
     const override = providerOverrides[definition.id];
     const factory = getProviderClientFactory(definition.id);
-    const mergedRuntimeSettings = mergeRuntimeSettings(
-      runtimeSettings?.[definition.id],
-      toRuntimeSettings(override),
+    resolvedProviders.set(
+      definition.id,
+      resolveRegisteredProvider({
+        definition,
+        override,
+        runtimeSettings: runtimeSettings?.[definition.id],
+        createClient: (logger, settings) =>
+          factory(logger, settings, {
+            workspaceGitService: options.workspaceGitService,
+            managedProcesses: options.managedProcesses,
+            ompRuntime: options.ompRuntime,
+            openCodeBridge: options.openCodeBridge,
+          }),
+        contract: PROVIDER_CONTRACTS[definition.id] ?? UNSUPPORTED_PROVIDER_CONTRACT,
+      }),
     );
-
-    resolvedProviders.set(definition.id, {
-      definition: applyOverrideToDefinition(definition, override),
-      runtimeSettings: mergedRuntimeSettings,
-      profileModels: override?.models ?? [],
-      additionalModels: override?.additionalModels ?? [],
-      profileModelsAreAdditive: false,
-      enabled: override?.enabled ?? definition.enabledByDefault ?? true,
-      derivedFromProviderId: null,
-      providerParams: override?.params,
-      createBaseClient: (logger) =>
-        factory(logger, mergedRuntimeSettings, {
-          workspaceGitService: options.workspaceGitService,
-          managedProcesses: options.managedProcesses,
-          ompRuntime: options.ompRuntime,
-          openCodeBridge: options.openCodeBridge,
-          providerParams: override?.params,
-        }),
-      contract: PROVIDER_CONTRACTS[definition.id] ?? UNSUPPORTED_PROVIDER_CONTRACT,
-    });
   }
 
   return resolvedProviders;
@@ -757,7 +803,8 @@ function addDerivedProviders(
     }
 
     if (!override.extends) {
-      throw new Error(`Custom provider '${providerId}' requires an extends value`);
+      // Plugin overrides can precede registration (including disabled or removed plugins).
+      continue;
     }
 
     if (override.extends === "acp") {
@@ -785,7 +832,7 @@ function addDerivedProviders(
         profileModelsAreAdditive: false,
         enabled: override.enabled !== false,
         derivedFromProviderId: null,
-        providerParams: override.params,
+        providerOptions: configuredProviderOptions(override),
         createBaseClient: (logger) => {
           const acpOptions = {
             logger,
@@ -793,7 +840,6 @@ function addDerivedProviders(
             env: override.env,
             providerId,
             label: override.label ?? providerId,
-            providerParams: override.params,
           };
           if (providerId === "cursor") {
             return new CursorACPAgentClient(acpOptions);
@@ -831,7 +877,7 @@ function addDerivedProviders(
     );
     const baseDefinition = baseProvider.definition;
     const baseFactory = getProviderClientFactory(baseProviderId);
-    const providerParams = override.params ?? baseProvider.providerParams;
+    const providerOptions = configuredProviderOptions(override) ?? baseProvider.providerOptions;
 
     resolvedProviders.set(providerId, {
       definition: createDerivedDefinition(providerId, baseDefinition, override),
@@ -841,12 +887,11 @@ function addDerivedProviders(
       profileModelsAreAdditive: false,
       enabled: override.enabled !== false,
       derivedFromProviderId: baseProviderId,
-      providerParams,
+      providerOptions,
       createBaseClient: (logger) =>
         baseFactory(logger, mergedRuntimeSettings, {
           managedProcesses: options.managedProcesses,
           openCodeBridge: options.openCodeBridge,
-          providerParams,
           customProvider: {
             id: providerId,
             label: override.label ?? providerId,
@@ -875,6 +920,28 @@ export function buildProviderRegistry(
     },
     options?.isDev === true,
   );
+  for (const [provider, definition] of Object.entries(options?.pluginProviders ?? {})) {
+    if (resolvedProviders.has(provider)) {
+      throw new Error(`Plugin provider '${provider}' conflicts with a built-in provider`);
+    }
+    const override = providerOverrides[provider];
+    if (override?.extends) {
+      logger.warn({ provider }, "Plugin provider shadowed by configured provider");
+      continue;
+    }
+    resolvedProviders.set(
+      provider,
+      resolveRegisteredProvider({
+        definition,
+        override,
+        runtimeSettings: runtimeSettings?.[provider],
+        createClient: definition.createClient,
+        contract: {
+          supportsExactMcpPreapproval: definition.supportsExactMcpPreapproval,
+        },
+      }),
+    );
+  }
   addDerivedProviders(resolvedProviders, providerOverrides, {
     managedProcesses: options?.managedProcesses,
     openCodeBridge: options?.openCodeBridge,
@@ -940,3 +1007,11 @@ export async function shutdownAgentClients(
     }),
   );
 }
+
+function configuredProviderOptions(
+  override: ProviderOverride | undefined,
+): ProviderOptions | undefined {
+  // COMPAT(providerParams): added in v0.10.0, remove after 2027-03-30 once configs use options.
+  // options wins as a whole record when both spellings are supplied.
+  return override?.options ?? override?.params;
+}
diff --git a/packages/server/src/server/agent/provider-snapshot-manager.test.ts b/packages/server/src/server/agent/provider-snapshot-manager.test.ts
index 620d1c4960..66d86f8931 100644
--- a/packages/server/src/server/agent/provider-snapshot-manager.test.ts
+++ b/packages/server/src/server/agent/provider-snapshot-manager.test.ts
@@ -1,6 +1,12 @@
+import pino from "pino";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
 import { describe, expect, test, vi } from "vitest";
+import type {
+  ProviderEvent,
+  ProviderRegistration,
+  ProviderLaunch,
+} from "@getpaseo/plugin/server/provider";
 
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import type {
@@ -16,6 +22,7 @@ import type { ManagedAgent } from "./agent-manager.js";
 import {
   GLOBAL_PROVIDER_SNAPSHOT_KEY,
   ProviderSnapshotManager,
+  type ProviderSnapshot,
   resolveSnapshotCwd,
 } from "./provider-snapshot-manager.js";
 import { OpenCodeAgentClient } from "./providers/opencode-agent.js";
@@ -28,6 +35,34 @@ const TEST_CAPABILITIES = {
   supportsReasoningStream: false,
   supportsToolInvocations: false,
 } as const;
+const CLOSED_PARENT: ManagedAgent = {
+  id: "parent-agent",
+  provider: "codex",
+  cwd: "/tmp/project",
+  capabilities: TEST_CAPABILITIES,
+  config: { provider: "codex", cwd: "/tmp/project" },
+  createdAt: new Date(0),
+  updatedAt: new Date(0),
+  availableModes: [],
+  currentModeId: null,
+  pendingPermissions: new Map(),
+  bufferedPermissionResolutions: new Map(),
+  inFlightPermissionResponses: new Set(),
+  pendingReplacement: false,
+  persistence: null,
+  historyPrimed: false,
+  lastUserMessageAt: null,
+  activeTurnId: null,
+  activeTurnStartedAt: null,
+  attention: { requiresAttention: false },
+  foregroundTurnWaiters: new Set(),
+  finalizedForegroundTurnIds: new Set(),
+  unsubscribeSession: null,
+  labels: {},
+  lifecycle: "closed",
+  session: null,
+  activeForegroundTurnId: null,
+};
 const TEST_REFRESH_TIMEOUT_MS = 120_000;
 
 // Builds an AgentClient that can be injected via the public extraClients option.
@@ -39,6 +74,8 @@ function createExtraClient(
   return {
     provider,
     capabilities: TEST_CAPABILITIES,
+    getCatalogCacheKey:
+      provider === "codex" || provider === "claude" ? async () => "host" : undefined,
     async createSession() {
       throw new Error("not implemented");
     },
@@ -105,7 +142,103 @@ async function runTestCatalogActivities(
 }
 
 describe("ProviderSnapshotManager public surface", () => {
-  test("validates complete Hub agent configurations through the current provider contract", async () => {
+  test("publishes one model per provider identity and retains the first definition", async () => {
+    const first = { provider: "codex", id: "shared", label: "First", isDefault: true };
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      extraClients: {
+        codex: createExtraClient("codex", {
+          isAvailable: async () => true,
+          fetchCatalog: async () => ({
+            models: [first, { ...first, label: "Duplicate" }],
+            modes: [],
+          }),
+        }),
+        claude: createExtraClient("claude", {
+          isAvailable: async () => true,
+          fetchCatalog: async () => ({ models: [{ ...first, provider: "claude" }], modes: [] }),
+        }),
+      },
+    });
+    try {
+      const codex = await manager.getProvider({ provider: "codex", wait: true });
+      const claude = await manager.getProvider({ provider: "claude", wait: true });
+      expect(codex.models).toEqual([first]);
+      expect(claude.models).toEqual([{ ...first, provider: "claude" }]);
+    } finally {
+      manager.destroy();
+    }
+  });
+
+  test("normalizes plugin model catalogs at the same publication boundary", async () => {
+    const manager = new ProviderSnapshotManager({ logger: createTestLogger() });
+    manager.replacePluginProviders([
+      {
+        id: "catalog-plugin",
+        label: "Catalog plugin",
+        async connect() {
+          let listener: ((event: ProviderEvent) => void) | undefined;
+          return {
+            version: 1,
+            capabilities: [],
+            async send(input) {
+              if (input.type === "catalog")
+                listener?.({
+                  type: "catalog",
+                  requestId: input.requestId,
+                  catalog: {
+                    models: [
+                      { id: "same", label: "First" },
+                      { id: "same", label: "Second" },
+                    ],
+                    modes: [],
+                  },
+                });
+            },
+            onEvent(next) {
+              listener = next;
+              return () => {
+                listener = undefined;
+              };
+            },
+            async close() {},
+          };
+        },
+      },
+    ]);
+    try {
+      const entry = await manager.getProvider({ provider: "catalog-plugin", wait: true });
+      expect(entry.models).toHaveLength(1);
+      expect(entry.models?.[0]).toMatchObject({ id: "same", label: "First" });
+    } finally {
+      manager.destroy();
+    }
+  });
+
+  test("carries a plugin provider icon in snapshot metadata", () => {
+    const iconSvg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+    const registration: ProviderRegistration = {
+      id: "icon-provider",
+      label: "Icon Provider",
+      icon: iconSvg,
+      async connect() {
+        throw new Error("not opened by this test");
+      },
+    };
+    const manager = new ProviderSnapshotManager({ logger: createTestLogger() });
+
+    try {
+      manager.replacePluginProviders([registration]);
+
+      expect(manager.getSnapshot("/tmp/project").records.map(({ entry }) => entry)).toContainEqual(
+        expect.objectContaining({ provider: "icon-provider", iconSvg }),
+      );
+    } finally {
+      manager.destroy();
+    }
+  });
+
+  test("validates catalog choices while leaving provider options opaque", async () => {
     const manager = new ProviderSnapshotManager({
       logger: createTestLogger(),
       extraClients: {
@@ -160,11 +293,19 @@ describe("ProviderSnapshotManager public surface", () => {
           path: ["thinkingOptionId"],
           message: "Thinking option 'missing' is not available for provider 'codex'",
         },
-        {
-          path: ["providerOptions", "sandbox_workspace_write", "network_access"],
-          message: "Invalid input: expected boolean, received string",
-        },
       ]);
+      await expect(
+        manager.validateAgentConfiguration({
+          provider: "codex",
+          model: "gpt-latest",
+          modeId: "auto-review",
+          thinkingOptionId: "xhigh",
+          providerOptions: {
+            sandbox_workspace_write: { network_access: "sometimes" },
+            arbitrary: true,
+          },
+        }),
+      ).resolves.toEqual([]);
     } finally {
       manager.destroy();
     }
@@ -229,7 +370,7 @@ describe("ProviderSnapshotManager public surface", () => {
   test("getSnapshot returns loading entries for built-in providers before warmup", () => {
     const manager = new ProviderSnapshotManager({ logger: createTestLogger() });
     try {
-      const snapshot = manager.getSnapshot("/tmp/project");
+      const snapshot = manager.getSnapshot("/tmp/project").records.map(({ entry }) => entry);
       const claude = snapshot.find((entry) => entry.provider === "claude");
       const codex = snapshot.find((entry) => entry.provider === "codex");
       expect(claude?.status).toBe("loading");
@@ -472,6 +613,7 @@ describe("ProviderSnapshotManager public surface", () => {
 
   test("defaults provider refreshes to a two-minute deadline", async () => {
     vi.useFakeTimers();
+    let recovered = false;
     const manager = new ProviderSnapshotManager({
       logger: createTestLogger(),
       providerOverrides: {
@@ -481,7 +623,9 @@ describe("ProviderSnapshotManager public surface", () => {
         pi: { enabled: false },
       },
       extraClients: {
-        codex: createExtraClient("codex", { isAvailable: waitUntilAborted }),
+        codex: createExtraClient("codex", {
+          isAvailable: (signal) => (recovered ? Promise.resolve(true) : waitUntilAborted(signal)),
+        }),
       },
     });
 
@@ -498,6 +642,14 @@ describe("ProviderSnapshotManager public surface", () => {
         status: "error",
         error: "Timed out refreshing Codex after 120000ms; pending: availability",
       });
+      recovered = true;
+      await manager.refreshSnapshotForCwd({ cwd: "/tmp/project", providers: ["codex"] });
+      const ready = manager.getSnapshot("/tmp/project");
+      const transitions: unknown[] = [];
+      manager.on("change", (transition) => transitions.push(transition));
+      await manager.refreshSnapshotForCwd({ cwd: "/tmp/project", providers: ["codex"] });
+      expect(manager.getSnapshot("/tmp/project")).toBe(ready);
+      expect(transitions).toEqual([]);
     } finally {
       manager.destroy();
       vi.useRealTimers();
@@ -587,7 +739,8 @@ describe("ProviderSnapshotManager public surface", () => {
       await manager.refreshSnapshotForCwd({ cwd: "/tmp/project", providers: ["codex"] });
       expect(fetchCatalog).toHaveBeenCalledTimes(2);
       expect(
-        manager.getSnapshot("/tmp/project").find((entry) => entry.provider === "codex"),
+        manager.getSnapshot("/tmp/project").records.find(({ entry }) => entry.provider === "codex")
+          ?.entry,
       ).toMatchObject({ provider: "codex", status: "ready" });
     } finally {
       manager.destroy();
@@ -865,7 +1018,7 @@ describe("ProviderSnapshotManager public surface", () => {
       { provider: "codex", id: "gpt-5.4-mini", label: "GPT 5.4 Mini" },
     ];
     const catalogModes: AgentMode[] = [{ id: "agent", label: "Agent" }];
-    const fetchCatalog = vi.fn(async () => ({
+    const fetchCatalog = vi.fn(async (_options: FetchCatalogOptions) => ({
       models: catalogModels,
       modes: catalogModes,
     }));
@@ -1150,7 +1303,7 @@ describe("ProviderSnapshotManager public surface", () => {
           async fetchCatalog() {
             return { models: [] as AgentModelDefinition[], modes: childModes };
           },
-          async resolveCreateConfig(input) {
+          resolveCreateConfig(input) {
             resolverInputs.push(input);
             return {
               modeId: input.parent?.isUnattended ? "child-unattended" : undefined,
@@ -1172,13 +1325,14 @@ describe("ProviderSnapshotManager public surface", () => {
       },
     });
     try {
-      const parent = {
+      const parent: ManagedAgent = {
+        ...CLOSED_PARENT,
         id: "parent-agent",
         provider: "claude",
         currentModeId: "parent-unattended",
         availableModes: parentModes,
         config: { provider: "claude", cwd: "/tmp/project" },
-      } as ManagedAgent;
+      };
 
       const resolved = await manager.resolveCreateConfig({
         cwd: "/tmp/project",
@@ -1228,7 +1382,7 @@ describe("ProviderSnapshotManager public surface", () => {
           async fetchCatalog() {
             return { models: [] as AgentModelDefinition[], modes };
           },
-          async resolveCreateConfig(input) {
+          resolveCreateConfig(input) {
             resolverInputs.push(input);
             return {
               modeId: input.unattended ? "worker" : undefined,
@@ -1293,7 +1447,8 @@ describe("ProviderSnapshotManager public surface", () => {
       },
     });
     try {
-      const parent = {
+      const parent: ManagedAgent = {
+        ...CLOSED_PARENT,
         id: "parent-agent",
         provider: "opencode",
         currentModeId: "orchestrator",
@@ -1303,7 +1458,7 @@ describe("ProviderSnapshotManager public surface", () => {
           cwd: "/tmp/project",
           featureValues: { auto_accept: true },
         },
-      } as ManagedAgent;
+      };
 
       const resolved = await manager.resolveCreateConfig({
         cwd: "/tmp/project",
@@ -1343,9 +1498,12 @@ describe("ProviderSnapshotManager applyMutableProviderConfig", () => {
       expect(manager.hasProvider("zai-claude")).toBe(true);
       expect(state.providerDefinitions["zai-claude"]).toMatchObject({ enabled: true });
       expect(manager.listRegisteredProviderIds()).toContain("zai-claude");
-      expect(manager.getSnapshot().find((entry) => entry.provider === "zai-claude")?.source).toBe(
-        "custom",
-      );
+      expect(
+        manager
+          .getSnapshot()
+          .records.map(({ entry }) => entry)
+          .find((entry) => entry.provider === "zai-claude")?.source,
+      ).toBe("custom");
     } finally {
       manager.destroy();
     }
@@ -1365,7 +1523,12 @@ describe("ProviderSnapshotManager applyMutableProviderConfig", () => {
 
       expect(manager.hasProvider("zai-claude")).toBe(false);
       expect(state.providerDefinitions["zai-claude"]).toBeUndefined();
-      expect(manager.getSnapshot().some((entry) => entry.provider === "zai-claude")).toBe(false);
+      expect(
+        manager
+          .getSnapshot()
+          .records.map(({ entry }) => entry)
+          .some((entry) => entry.provider === "zai-claude"),
+      ).toBe(false);
 
       manager.applyMutableProviderConfig({ codex: { enabled: false } });
       expect(manager.hasProvider("zai-claude")).toBe(false);
@@ -1427,79 +1590,268 @@ describe("ProviderSnapshotManager applyMutableProviderConfig", () => {
         "zai-claude": { extends: "claude", label: "ZAI", enabled: true },
       });
 
-      const cwds = listener.mock.calls.map((call) => call[1]).sort();
+      const cwds = [...new Set(listener.mock.calls.map((call) => call[0].current.cwd))].sort();
       expect(cwds).toEqual([cwdA, cwdB].sort());
     } finally {
       manager.destroy();
     }
   });
 
-  test("stages provider state without events, then publishes or rolls back", () => {
+  test("changing one provider preserves other catalogs and clients across directories", async () => {
+    const calls = { claude: 0, codex: 0 };
+    const clients = Object.fromEntries(
+      (["claude", "codex"] as const).map((provider) => [
+        provider,
+        createExtraClient(provider, {
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog() {
+            calls[provider]++;
+            return { models: [], modes: [] };
+          },
+        }),
+      ]),
+    );
+    const config = {
+      claude: { enabled: true },
+      codex: { enabled: true, command: ["codex"], env: { TEST_SETTING: "same" } },
+      copilot: { enabled: false },
+      opencode: { enabled: false },
+      pi: { enabled: false },
+      omp: { enabled: false },
+    };
     const manager = new ProviderSnapshotManager({
       logger: createTestLogger(),
-      providerOverrides: {
-        claude: { enabled: false },
-        codex: { enabled: true },
-        copilot: { enabled: false },
-        opencode: { enabled: false },
-        pi: { enabled: false },
+      providerOverrides: config,
+      runtimeSettings: {
+        codex: { command: { mode: "replace", argv: ["codex"] }, env: { TEST_SETTING: "same" } },
       },
+      extraClients: clients,
     });
+    const cwds = [resolve("/tmp/catalog-a"), resolve("/tmp/catalog-b")];
     try {
-      const cwd = resolve("/tmp/project");
-      manager.getSnapshot(cwd);
-      const events: string[] = [];
-      manager.on("change", (_entries, changedCwd) => events.push(changedCwd));
-
-      const rolledBack = manager.stageMutableProviderConfig(
-        { codex: { enabled: false } },
+      for (const cwd of cwds) await manager.warmUpSnapshotForCwd({ cwd });
+      const getCodexEntry = (cwd: string) =>
+        manager.getSnapshot(cwd).records.find(({ entry }) => entry.provider === "codex")?.entry;
+      const before = cwds.map(getCodexEntry);
+      const definition = manager.getAgentManagerProviderState().providerDefinitions.codex;
+      manager.applyMutableProviderConfig(
+        { ...config, claude: { enabled: true, label: "Renamed" } },
         { replace: true },
       );
-      expect(events).toEqual([]);
-      expect(manager.getAgentManagerProviderState().providerDefinitions.codex).toMatchObject({
-        enabled: false,
-      });
-      rolledBack.rollback();
-      expect(events).toEqual([]);
-      expect(manager.getAgentManagerProviderState().providerDefinitions.codex).toMatchObject({
-        enabled: true,
-      });
-
-      const committed = manager.stageMutableProviderConfig(
-        { codex: { enabled: false } },
+      expect(cwds.map(getCodexEntry)).toEqual(before);
+      expect(manager.getAgentManagerProviderState().providerDefinitions.codex).toEqual(definition);
+      for (const cwd of cwds) await manager.warmUpSnapshotForCwd({ cwd });
+      expect(calls).toEqual({ claude: 2, codex: 1 });
+      const listener = vi.fn();
+      manager.on("change", listener);
+      manager.applyMutableProviderConfig(
+        { ...config, claude: { label: "Renamed", enabled: true } },
         { replace: true },
       );
-      expect(events).toEqual([]);
-      committed.publish();
-      expect(events).toEqual([cwd]);
+      for (const cwd of cwds) await manager.warmUpSnapshotForCwd({ cwd });
+      expect(calls).toEqual({ claude: 2, codex: 1 });
+      expect(listener).not.toHaveBeenCalled();
     } finally {
       manager.destroy();
     }
   });
 
-  test("restores provider state when applying a live config fails", () => {
+  test("reload preserves an unchanged lookup in flight through commit and discarded preparation", async () => {
+    let finish!: () => void;
+    const gate = new Promise<void>((complete) => {
+      finish = complete;
+    });
+    let calls = 0;
+    const config = {
+      claude: { enabled: false },
+      codex: { enabled: true },
+      copilot: { enabled: false },
+      opencode: { enabled: false },
+      pi: { enabled: false },
+      omp: { enabled: false },
+    };
     const manager = new ProviderSnapshotManager({
       logger: createTestLogger(),
-      providerOverrides: {
-        claude: { enabled: false },
-        codex: { enabled: true },
-        copilot: { enabled: false },
-        opencode: { enabled: false },
-        pi: { enabled: false },
+      providerOverrides: config,
+      extraClients: {
+        codex: createExtraClient("codex", {
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog() {
+            calls++;
+            await gate;
+            return { models: [], modes: [] };
+          },
+        }),
       },
     });
-    manager.getSnapshot("/tmp/project");
-    manager.on("change", () => {
-      throw new Error("snapshot consumer failed");
-    });
-
+    const cwd = resolve("/tmp/catalog-pending");
     try {
+      const pending = manager.warmUpSnapshotForCwd({ cwd });
+      await vi.waitFor(() => expect(calls).toBe(1));
+      manager.applyMutableProviderConfig(
+        { ...config, claude: { enabled: false, label: "Changed" } },
+        { replace: true },
+      );
+      const staged = manager.prepareMutableProviderConfig(
+        { ...config, claude: { enabled: false, label: "Rollback" } },
+        { replace: true },
+      );
+      expect(staged.agentManagerState.providerDefinitions.claude?.enabled).toBe(false);
+      finish();
+      await pending;
+      expect(
+        manager
+          .getSnapshot(cwd)
+          .records.map(({ entry }) => entry)
+          .find((e) => e.provider === "codex")?.status,
+      ).toBe("ready");
+      expect(calls).toBe(1);
+    } finally {
+      finish();
+      manager.destroy();
+    }
+  });
+
+  test("reload replaces derived clients only when their provider configuration changes", async () => {
+    const config = {
+      claude: { enabled: true },
+      codex: { enabled: true },
+      "codex-2": { extends: "codex", label: "Codex 2", enabled: true },
+      copilot: { enabled: false },
+      opencode: { enabled: false },
+      pi: { enabled: false },
+      omp: { enabled: false },
+    };
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: config,
+    });
+    try {
+      const before = manager.getAgentManagerProviderState().clients;
+      for (const provider of ["codex", "claude", "codex-2"]) {
+        expect(
+          await before[provider]!.getCatalogCacheKey?.({ scope: "global", force: false }),
+        ).toBe("host");
+        expect(
+          await before[provider]!.getCatalogCacheKey?.({
+            scope: "workspace",
+            cwd: resolveSnapshotCwd("/project"),
+            force: true,
+          }),
+        ).toBe("host");
+      }
+      const unchanged = manager.applyMutableProviderConfig(config, { replace: true }).clients;
+      expect(unchanged.codex).toBe(before.codex);
+      expect(unchanged["codex-2"]).toBe(before["codex-2"]);
+      const changed = manager.applyMutableProviderConfig(
+        { ...config, codex: { enabled: true, env: { CODEX_HOME: "/tmp/other-codex-home" } } },
+        { replace: true },
+      ).clients;
+      expect(changed.claude).toBe(before.claude);
+      expect(changed.codex).not.toBe(before.codex);
+      expect(changed["codex-2"]).not.toBe(before["codex-2"]);
+      const { "codex-2": _removedProvider, ...withoutDerived } = config;
+      const removed = manager.applyMutableProviderConfig(withoutDerived, { replace: true }).clients;
+      expect(removed["codex-2"]).toBeUndefined();
+      expect(removed.claude).toBe(before.claude);
+    } finally {
+      manager.destroy();
+    }
+  });
+
+  test("preparation leaves installed reads untouched and commit installs all target memberships before notification", () => {
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: PUBLICATION_PROVIDERS,
+      extraClients: { codex: createExtraClient("codex") },
+    });
+    try {
+      const cwds = ["/tmp/install-a", "/tmp/install-b"];
+      const previous = cwds.map((cwd) => manager.getSnapshot(cwd));
+      const observations: Array<{ current: ProviderSnapshot; reads: ProviderSnapshot[] }> = [];
+      manager.on("change", ({ current }) =>
+        observations.push({
+          current,
+          reads: [manager.getSnapshot(cwds[0]), manager.getSnapshot(cwds[1])],
+        }),
+      );
+      const config = {
+        ...PUBLICATION_PROVIDERS,
+        codex: { enabled: false },
+        claude: { enabled: false, label: "Changed" },
+        custom: { extends: "codex", label: "Custom", enabled: false },
+      };
+      const prepared = manager.prepareMutableProviderConfig(config, { replace: true });
+      expect(prepared.agentManagerState.providerDefinitions.custom?.enabled).toBe(false);
+      expect(manager.hasProvider("custom")).toBe(false);
+      expect(manager.listRegisteredProviderIds()).not.toContain("custom");
+      expect(manager.getAgentManagerProviderState().providerDefinitions.codex?.enabled).toBe(true);
+      expect(cwds.map((cwd) => manager.getSnapshot(cwd))).toEqual(previous);
+      expect(manager.getSnapshot(cwds[0])).toBe(previous[0]);
+      expect(observations).toEqual([]);
       expect(() =>
-        manager.applyMutableProviderConfig({ codex: { enabled: false } }, { replace: true }),
-      ).toThrow("snapshot consumer failed");
-      expect(manager.getAgentManagerProviderState().providerDefinitions.codex).toMatchObject({
-        enabled: true,
-      });
+        manager.prepareMutableProviderConfig(
+          { custom: { extends: "missing-provider" } },
+          { replace: true },
+        ),
+      ).toThrow();
+      expect(manager.getSnapshot(cwds[0])).toBe(previous[0]);
+      prepared.commit();
+      const committed = cwds.map((cwd) => manager.getSnapshot(cwd));
+      expect(observations).toHaveLength(2);
+      for (const [index, observation] of observations.entries()) {
+        expect(observation.current).toBe(committed[index]);
+        expect(observation.reads[0]).toBe(committed[0]);
+        expect(observation.reads[1]).toBe(committed[1]);
+      }
+      expect(manager.hasProvider("custom")).toBe(true);
+      expect(
+        committed[0]!.records.map(({ entry }) => [entry.provider, entry.status, entry.label]),
+      ).toContainEqual(["codex", "unavailable", "Codex"]);
+      expect(manager.getProviderLabel("claude")).toBe("Changed");
+    } finally {
+      manager.destroy();
+    }
+  });
+
+  test("subscriber failures cannot change discovery results, roll back commits or starve another listener", async () => {
+    const logs: string[] = [];
+    const logger = pino({ level: "warn" }, { write: (line) => logs.push(line) });
+    const manager = new ProviderSnapshotManager({
+      logger,
+      providerOverrides: PUBLICATION_PROVIDERS,
+      extraClients: { codex: createExtraClient("codex", { isAvailable: async () => true }) },
+    });
+    const transitions: ProviderSnapshot[] = [];
+    manager.on("change", () => {
+      throw new Error("subscriber failed");
+    });
+    manager.on("change", ({ current }) => transitions.push(current));
+    try {
+      await manager.warmUpSnapshotForCwd({ cwd: "/tmp/subscribers" });
+      expect(
+        manager
+          .getSnapshot("/tmp/subscribers")
+          .records.find(({ entry }) => entry.provider === "codex")!.entry.status,
+      ).toBe("ready");
+      manager.applyMutableProviderConfig(
+        { ...PUBLICATION_PROVIDERS, codex: { enabled: false } },
+        { replace: true },
+      );
+      expect(manager.getAgentManagerProviderState().providerDefinitions.codex?.enabled).toBe(false);
+      const statuses = [];
+      for (const { records } of transitions) {
+        statuses.push(records.find(({ entry }) => entry.provider === "codex")!.entry.status);
+      }
+      expect(statuses).toEqual(["ready", "unavailable"]);
+      expect(logs.map((line) => JSON.parse(line))).toMatchObject([
+        { msg: "Provider snapshot subscriber failed", err: { message: "subscriber failed" } },
+        { msg: "Provider snapshot subscriber failed", err: { message: "subscriber failed" } },
+      ]);
     } finally {
       manager.destroy();
     }
@@ -1530,23 +1882,24 @@ describe("ProviderSnapshotManager lifecycle", () => {
     };
 
     const initialClient = trackShutdown(manager.getAgentManagerProviderState().clients.codex);
-    const published = manager.stageMutableProviderConfig(providerConfig("Published"), {
+    const published = manager.prepareMutableProviderConfig(providerConfig("Published"), {
       replace: true,
     });
     const publishedClient = trackShutdown(published.agentManagerState.clients.codex);
-    published.publish();
+    published.commit();
 
-    const rolledBack = manager.stageMutableProviderConfig(providerConfig("Rolled back"), {
+    const rolledBack = manager.prepareMutableProviderConfig(providerConfig("Rolled back"), {
       replace: true,
     });
     trackShutdown(rolledBack.agentManagerState.clients.codex);
-    rolledBack.rollback();
 
     expect(manager.getAgentManagerProviderState().clients.codex).toBe(publishedClient);
 
-    const newest = manager.stageMutableProviderConfig(providerConfig("Newest"), { replace: true });
+    const newest = manager.prepareMutableProviderConfig(providerConfig("Newest"), {
+      replace: true,
+    });
     const newestClient = trackShutdown(newest.agentManagerState.clients.codex);
-    newest.publish();
+    newest.commit();
 
     expect(initialClient).not.toBe(publishedClient);
     expect(manager.getAgentManagerProviderState().clients.codex).toBe(newestClient);
@@ -1573,12 +1926,12 @@ describe("ProviderSnapshotManager lifecycle", () => {
       const listener = vi.fn();
       manager.on("change", listener);
       manager.getSnapshot("/tmp/project");
-      manager.applyMutableProviderConfig({});
+      manager.applyMutableProviderConfig({ claude: { enabled: false, label: "Changed" } });
       const firstCallCount = listener.mock.calls.length;
-      expect(firstCallCount).toBeGreaterThan(0);
+      expect(firstCallCount).toBe(1);
 
       manager.off("change", listener);
-      manager.applyMutableProviderConfig({});
+      manager.applyMutableProviderConfig({ claude: { enabled: false, label: "Changed again" } });
       expect(listener.mock.calls.length).toBe(firstCallCount);
     } finally {
       manager.destroy();
@@ -1608,8 +1961,130 @@ describe("ProviderSnapshotManager lifecycle", () => {
 });
 
 describe("ProviderSnapshotManager cwd routing", () => {
+  test("deduplicates cold global catalogue discovery across concurrent workspace reads", async () => {
+    let release!: () => void;
+    let started!: () => void;
+    const pending = new Promise<void>((resolvePending) => {
+      release = resolvePending;
+    });
+    const discoveryStarted = new Promise<void>((resolveStarted) => {
+      started = resolveStarted;
+    });
+    const requests: FetchCatalogOptions[] = [];
+    let availabilityProbes = 0;
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      extraClients: {
+        codex: createExtraClient("codex", {
+          async getCatalogCacheKey() {
+            return "host";
+          },
+          async isAvailable() {
+            availabilityProbes++;
+            return true;
+          },
+          async fetchCatalog(options) {
+            requests.push(options);
+            started();
+            await pending;
+            return {
+              models: [{ provider: "codex", id: "gpt-6-astra", label: "GPT-6 Astra" }],
+              modes: [],
+            };
+          },
+        }),
+      },
+    });
+    try {
+      const reads = Promise.all(
+        [
+          undefined,
+          resolveSnapshotCwd("/tmp/concurrent-a"),
+          resolveSnapshotCwd("/tmp/concurrent-b"),
+        ].map((cwd) => manager.getProvider({ provider: "codex", cwd, wait: true })),
+      );
+      await discoveryStarted;
+      expect(requests).toEqual([{ scope: "global", force: false }]);
+      release();
+      const entries = await reads;
+      expect(entries.map((entry) => entry.models?.[0]?.id)).toEqual([
+        "gpt-6-astra",
+        "gpt-6-astra",
+        "gpt-6-astra",
+      ]);
+      expect(requests).toHaveLength(1);
+      expect(availabilityProbes).toBe(1);
+    } finally {
+      release();
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test.each(["codex", "custom-codex"])(
+    "shares %s discovery and refresh recovery across snapshot directories",
+    async (provider) => {
+      const requests: FetchCatalogOptions[] = [];
+      let available = false;
+      const manager = new ProviderSnapshotManager({
+        logger: createTestLogger(),
+        providerOverrides: {
+          "custom-codex": { extends: "codex", label: "Custom Codex", enabled: true },
+        },
+        extraClients: {
+          [provider]: createExtraClient(provider, {
+            async getCatalogCacheKey() {
+              return "host";
+            },
+            async isAvailable() {
+              return available;
+            },
+            async fetchCatalog(options) {
+              requests.push(options);
+              return {
+                models: [{ provider, id: "gpt-6-astra", label: "GPT-6 Astra" }],
+                modes: [],
+              };
+            },
+          }),
+        },
+      });
+      try {
+        expect(await manager.getProvider({ provider, wait: true })).toMatchObject({
+          status: "unavailable",
+        });
+        available = true;
+        await manager.refreshSnapshotForCwd({
+          cwd: resolveSnapshotCwd("/tmp/model-memory-a"),
+          providers: [provider],
+        });
+        expect(await manager.getProvider({ provider, wait: true })).toMatchObject({
+          status: "ready",
+        });
+        await Promise.all([
+          manager.getProvider({
+            provider,
+            cwd: resolveSnapshotCwd("/tmp/model-memory-a"),
+            wait: true,
+          }),
+          manager.getProvider({
+            provider,
+            cwd: resolveSnapshotCwd("/tmp/model-memory-b"),
+            wait: true,
+          }),
+        ]);
+        expect(requests).toEqual([
+          { scope: "workspace", cwd: resolveSnapshotCwd("/tmp/model-memory-a"), force: true },
+        ]);
+      } finally {
+        await manager.shutdown();
+        manager.destroy();
+      }
+    },
+  );
+
   test("settings refresh passes the semantic global scope to providers", async () => {
-    const fetchCatalog = vi.fn(async () => ({
+    const fetchCatalog = vi.fn(async (_options: FetchCatalogOptions) => ({
       models: [] as AgentModelDefinition[],
       modes: [] as AgentMode[],
     }));
@@ -1632,22 +2107,22 @@ describe("ProviderSnapshotManager cwd routing", () => {
   });
 
   test("global snapshot does not satisfy an explicit home workspace read", async () => {
-    const fetchCatalog = vi.fn(async () => ({
+    const fetchCatalog = vi.fn(async (_options: FetchCatalogOptions) => ({
       models: [] as AgentModelDefinition[],
       modes: [] as AgentMode[],
     }));
     const manager = new ProviderSnapshotManager({
       logger: createTestLogger(),
       extraClients: {
-        codex: createExtraClient("codex", {
+        pi: createExtraClient("pi", {
           isAvailable: vi.fn(async () => true),
           fetchCatalog,
         }),
       },
     });
     try {
-      await manager.refreshSettingsSnapshot({ providers: ["codex"] });
-      await manager.listProviders({ cwd: homedir(), providers: ["codex"], wait: true });
+      await manager.refreshSettingsSnapshot({ providers: ["pi"] });
+      await manager.listProviders({ cwd: homedir(), providers: ["pi"], wait: true });
 
       expect(fetchCatalog.mock.calls.map((call) => call[0])).toEqual([
         expect.objectContaining({ scope: "global", force: true }),
@@ -1674,8 +2149,12 @@ describe("ProviderSnapshotManager cwd routing", () => {
       },
     });
     try {
-      const a = manager.getSnapshot("/tmp/project-a");
-      const b = manager.getSnapshot("/tmp/project-b");
+      const a = manager
+        .getSnapshot(resolveSnapshotCwd("/tmp/project-a"))
+        .records.map(({ entry }) => entry);
+      const b = manager
+        .getSnapshot(resolveSnapshotCwd("/tmp/project-b"))
+        .records.map(({ entry }) => entry);
       expect(a).not.toBe(b);
       expect(a.map((entry) => entry.provider).sort()).toEqual(
         b.map((entry) => entry.provider).sort(),
@@ -1700,14 +2179,200 @@ describe("ProviderSnapshotManager cwd routing", () => {
       const listener = vi.fn();
       manager.on("change", listener);
       manager.getSnapshot();
-      manager.applyMutableProviderConfig({});
-      const cwds = listener.mock.calls.map((call) => call[1]);
+      manager.applyMutableProviderConfig({ claude: { enabled: false, label: "Changed" } });
+      const cwds = listener.mock.calls.map((call) => call[0].current.cwd);
       expect(cwds).toContain(GLOBAL_PROVIDER_SNAPSHOT_KEY);
     } finally {
       manager.destroy();
     }
   });
 
+  test.each([
+    { sharing: "shared", expectedCwds: [resolveSnapshotCwd("/tmp/plugin-a")] },
+    {
+      sharing: "distinct",
+      expectedCwds: [
+        undefined,
+        resolveSnapshotCwd("/tmp/plugin-a"),
+        resolveSnapshotCwd("/tmp/plugin-b"),
+      ],
+    },
+    {
+      sharing: "absent",
+      expectedCwds: [
+        undefined,
+        resolveSnapshotCwd("/tmp/plugin-a"),
+        resolveSnapshotCwd("/tmp/plugin-b"),
+      ],
+    },
+  ])(
+    "uses the plugin's provider-owned catalogue key: $sharing",
+    async ({ sharing, expectedCwds }) => {
+      let listener: ((event: ProviderEvent) => void) | null = null;
+      const cwds: Array<string | undefined> = [];
+      const registration: ProviderRegistration = {
+        id: "scoped-plugin",
+        label: "Scoped plugin",
+        getCatalogCacheKey:
+          sharing === "absent"
+            ? undefined
+            : async (options) =>
+                sharing === "shared"
+                  ? "host"
+                  : JSON.stringify(options.scope === "workspace" ? options.cwd : null),
+        async connect() {
+          return {
+            version: 1,
+            capabilities: [],
+            async send(input) {
+              if (input.type !== "catalog") return;
+              cwds.push(input.cwd);
+              listener?.({
+                type: "catalog",
+                requestId: input.requestId,
+                catalog: {
+                  models: [{ id: input.cwd ?? "global-model", label: "Model" }],
+                  modes: [],
+                },
+              });
+            },
+            onEvent(next) {
+              listener = next;
+              return () => {
+                listener = null;
+              };
+            },
+            async close() {},
+          };
+        },
+      };
+      const manager = new ProviderSnapshotManager({
+        logger: createTestLogger(),
+        providerOverrides: {
+          codex: { enabled: false },
+          claude: { enabled: false },
+          copilot: { enabled: false },
+          opencode: { enabled: false },
+          pi: { enabled: false },
+        },
+      });
+      try {
+        // Register after workspace views exist, as happens when reloading a plugin.
+        for (const cwd of [
+          resolveSnapshotCwd("/tmp/plugin-a"),
+          resolveSnapshotCwd("/tmp/plugin-b"),
+          undefined,
+        ]) {
+          await manager.listProviders({ cwd, wait: true });
+        }
+        const published: ProviderSnapshot[] = [];
+        manager.on("change", ({ current }) => published.push(current));
+        manager.replacePluginProviders([registration]);
+        for (const cwd of [
+          undefined,
+          resolveSnapshotCwd("/tmp/plugin-a"),
+          resolveSnapshotCwd("/tmp/plugin-b"),
+        ]) {
+          const entry = await manager.getProvider({ provider: registration.id, cwd, wait: true });
+          expect(entry.status).toBe("ready");
+          expect(entry.models?.[0]?.id).toBe(
+            sharing === "shared" ? resolveSnapshotCwd("/tmp/plugin-a") : (cwd ?? "global-model"),
+          );
+        }
+        expect(cwds).toEqual(expect.arrayContaining(expectedCwds));
+        expect(cwds).toHaveLength(expectedCwds.length);
+        for (const snapshot of published) {
+          expect(snapshot.records).toEqual(
+            expect.arrayContaining([
+              expect.objectContaining({
+                entry: expect.objectContaining({ provider: registration.id }),
+              }),
+            ]),
+          );
+        }
+        expect(new Set(published.map((snapshot) => snapshot.cwd))).toEqual(
+          new Set([
+            GLOBAL_PROVIDER_SNAPSHOT_KEY,
+            resolveSnapshotCwd("/tmp/plugin-a"),
+            resolveSnapshotCwd("/tmp/plugin-b"),
+          ]),
+        );
+        const lastFetchedAt = manager
+          .getSnapshot(resolveSnapshotCwd("/tmp/plugin-a"))
+          .records.find(({ entry }) => entry.provider === registration.id)!.entry.fetchedAt!;
+        await vi.waitFor(() => expect(Date.now()).toBeGreaterThan(Date.parse(lastFetchedAt)));
+        published.length = 0;
+        await manager.refreshSnapshotForCwd({
+          cwd: resolveSnapshotCwd("/tmp/plugin-a"),
+          providers: [registration.id],
+        });
+        const affectedCwds =
+          sharing === "shared"
+            ? [
+                GLOBAL_PROVIDER_SNAPSHOT_KEY,
+                resolveSnapshotCwd("/tmp/plugin-a"),
+                resolveSnapshotCwd("/tmp/plugin-b"),
+              ]
+            : [resolveSnapshotCwd("/tmp/plugin-a")];
+        expect(new Set(published.map((snapshot) => snapshot.cwd))).toEqual(new Set(affectedCwds));
+        expect(published).toHaveLength(affectedCwds.length);
+      } finally {
+        await manager.shutdown();
+        manager.destroy();
+      }
+    },
+  );
+
+  test("registers and unregisters plugin providers without rebuilding built-in clients", async () => {
+    let listener: ((event: ProviderEvent) => void) | null = null;
+    const registration: ProviderRegistration = {
+      id: "plugin-provider",
+      label: "Plugin provider",
+      async connect() {
+        return {
+          version: 1,
+          capabilities: [],
+          async send(input) {
+            if (input.type !== "catalog") return;
+            listener?.({
+              type: "catalog",
+              requestId: input.requestId,
+              catalog: { models: [{ id: "plugin-model", label: "Plugin model" }], modes: [] },
+            });
+          },
+          onEvent(nextListener) {
+            listener = nextListener;
+            return () => {
+              if (listener === nextListener) listener = null;
+            };
+          },
+          async close() {},
+        };
+      },
+    };
+    const manager = new ProviderSnapshotManager({ logger: createTestLogger() });
+    try {
+      const state = manager.replacePluginProviders([registration]);
+      expect(state.clients[registration.id]?.provider).toBe(registration.id);
+      await expect(
+        manager.getProvider({ provider: registration.id, wait: true }),
+      ).resolves.toMatchObject({
+        provider: registration.id,
+        source: "custom",
+        status: "ready",
+        models: [{ provider: registration.id, id: "plugin-model" }],
+      });
+
+      const withoutPlugin = manager.replacePluginProviders([]);
+      expect(manager.hasProvider(registration.id)).toBe(false);
+      expect(withoutPlugin.clients[registration.id]).toBeUndefined();
+      expect(withoutPlugin.retiredProviders).toEqual([registration.id]);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
   test("resolveSnapshotCwd normalizes pure drive letters to append backslash on Windows", () => {
     const resolved = resolveSnapshotCwd("C:");
     if (process.platform === "win32") {
@@ -1717,3 +2382,1394 @@ describe("ProviderSnapshotManager cwd routing", () => {
     }
   });
 });
+
+describe("provider-owned catalogue identity", () => {
+  const disabledProviders = {
+    codex: { enabled: false },
+    claude: { enabled: false },
+    copilot: { enabled: false },
+    opencode: { enabled: false },
+    pi: { enabled: false },
+  };
+
+  test("shares effective runtime/configuration keys, preserves targets, and isolates provider identities", async () => {
+    const identities = new Map([
+      [resolveSnapshotCwd("/a"), "runtime-1/config-1"],
+      [resolveSnapshotCwd("/b"), "runtime-1/config-1"],
+      [resolveSnapshotCwd("/c"), "runtime-2/config-1"],
+    ]);
+    const probes: Array<{ provider: string; options: FetchCatalogOptions | undefined }> = [];
+    const discoveries: Array<{ provider: string; options: FetchCatalogOptions }> = [];
+    const client = (provider: string) =>
+      createExtraClient(provider, {
+        async getCatalogCacheKey(options) {
+          return options.scope === "workspace" ? identities.get(options.cwd) : undefined;
+        },
+        async isAvailable(_signal, options) {
+          probes.push({ provider, options });
+          return true;
+        },
+        async fetchCatalog(options) {
+          discoveries.push({ provider, options });
+          return {
+            models: [{ provider, id: `${provider}-${discoveries.length}`, label: "Model" }],
+            modes: [],
+          };
+        },
+      });
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: {
+        ...disabledProviders,
+        first: { extends: "codex", label: "First", enabled: true },
+        second: { extends: "codex", label: "Second", enabled: true },
+      },
+      extraClients: { first: client("first"), second: client("second") },
+    });
+    try {
+      const read = (cwd: string, provider = "first") =>
+        manager.getProvider({ provider, cwd, wait: true });
+      const [a, b, c] = await Promise.all([
+        read(resolveSnapshotCwd("/a")),
+        read(resolveSnapshotCwd("/b")),
+        read(resolveSnapshotCwd("/c")),
+      ]);
+      expect(a.models).toEqual(b.models);
+      expect(c.models).not.toEqual(a.models);
+      expect(discoveries).toHaveLength(2);
+      expect(probes).toEqual(discoveries);
+      expect(discoveries.map(({ options }) => options)).toEqual([
+        { scope: "workspace", cwd: resolveSnapshotCwd("/a"), force: false },
+        { scope: "workspace", cwd: resolveSnapshotCwd("/c"), force: false },
+      ]);
+      await read(resolveSnapshotCwd("/a"), "second");
+      expect(discoveries).toHaveLength(3);
+      identities.set(resolveSnapshotCwd("/b"), "runtime-2/config-1");
+      expect((await read(resolveSnapshotCwd("/b"))).models).toEqual(c.models);
+      expect(discoveries).toHaveLength(3);
+      identities.set(resolveSnapshotCwd("/a"), "runtime-1/config-2");
+      expect((await read(resolveSnapshotCwd("/a"))).models).not.toEqual(a.models);
+      expect(discoveries).toHaveLength(4);
+      await manager.refreshSnapshotForCwd({ cwd: resolveSnapshotCwd("/b"), providers: ["first"] });
+      expect(discoveries).toHaveLength(5);
+      expect(discoveries[4]?.options).toEqual({
+        scope: "workspace",
+        cwd: resolveSnapshotCwd("/b"),
+        force: true,
+      });
+      expect((await read(resolveSnapshotCwd("/c"))).models).toEqual(
+        (await read(resolveSnapshotCwd("/b"))).models,
+      );
+      expect(discoveries).toHaveLength(5);
+      expect(probes).toEqual(discoveries);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("a refresh supersedes an older in-flight result for the same provider key", async () => {
+    let release!: () => void;
+    let started!: () => void;
+    const pending = new Promise<void>((finish) => {
+      release = finish;
+    });
+    const began = new Promise<void>((finish) => {
+      started = finish;
+    });
+    let calls = 0;
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: { ...disabledProviders, codex: { enabled: true } },
+      extraClients: {
+        codex: createExtraClient("codex", {
+          async getCatalogCacheKey() {
+            return "runtime/config";
+          },
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog() {
+            const call = ++calls;
+            if (call === 1) {
+              started();
+              await pending;
+            }
+            return {
+              models: [{ provider: "codex", id: `model-${call}`, label: "Model" }],
+              modes: [],
+            };
+          },
+        }),
+      },
+    });
+    try {
+      const first = manager.getProvider({
+        provider: "codex",
+        cwd: resolveSnapshotCwd("/a"),
+        wait: true,
+      });
+      await began;
+      await manager.refreshSnapshotForCwd({ cwd: resolveSnapshotCwd("/b"), providers: ["codex"] });
+      release();
+      await first;
+      for (const cwd of [resolveSnapshotCwd("/a"), resolveSnapshotCwd("/b")]) {
+        expect(
+          (await manager.getProvider({ provider: "codex", cwd, wait: true })).models?.[0]?.id,
+        ).toBe("model-2");
+      }
+      expect(calls).toBe(2);
+    } finally {
+      release();
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("key lookup failure detaches a view from its previous shared catalogue", async () => {
+    let broken = false;
+    let calls = 0;
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: { ...disabledProviders, codex: { enabled: true } },
+      extraClients: {
+        codex: createExtraClient("codex", {
+          async getCatalogCacheKey(options) {
+            if (broken && options.scope === "workspace" && options.cwd === resolveSnapshotCwd("/a"))
+              throw new Error("configuration unreadable");
+            return "runtime/config";
+          },
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog() {
+            calls++;
+            return {
+              models: [{ provider: "codex", id: `model-${calls}`, label: "Model" }],
+              modes: [],
+            };
+          },
+        }),
+      },
+    });
+    try {
+      for (const cwd of [resolveSnapshotCwd("/a"), resolveSnapshotCwd("/b")])
+        await manager.getProvider({ provider: "codex", cwd, wait: true });
+      broken = true;
+      expect(
+        await manager.getProvider({ provider: "codex", cwd: resolveSnapshotCwd("/a"), wait: true }),
+      ).toMatchObject({ status: "error", error: "configuration unreadable" });
+      const published: string[] = [];
+      manager.on("change", ({ current }) => published.push(current.cwd));
+      await manager.refreshSnapshotForCwd({ cwd: resolveSnapshotCwd("/b"), providers: ["codex"] });
+      expect(published).toEqual([resolveSnapshotCwd("/b")]);
+      expect(calls).toBe(2);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+});
+
+test("late key resolution cannot restore an old identity and concurrent readers wait for discovery", async () => {
+  let releaseKey!: () => void;
+  let releaseCatalog!: () => void;
+  let catalogStarted!: () => void;
+  const keyPending = new Promise<void>((finish) => {
+    releaseKey = finish;
+  });
+  const catalogPending = new Promise<void>((finish) => {
+    releaseCatalog = finish;
+  });
+  const began = new Promise<void>((finish) => {
+    catalogStarted = finish;
+  });
+  let keyCalls = 0;
+  let probes = 0;
+  const targets: FetchCatalogOptions[] = [];
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        async getCatalogCacheKey() {
+          if (++keyCalls === 1) {
+            await keyPending;
+            return "old-runtime";
+          }
+          return "current-runtime";
+        },
+        async isAvailable() {
+          probes++;
+          return true;
+        },
+        async fetchCatalog(options) {
+          targets.push(options);
+          catalogStarted();
+          await catalogPending;
+          return { models: [{ provider: "codex", id: "current", label: "Current" }], modes: [] };
+        },
+      }),
+    },
+  });
+  try {
+    const first = manager.getProvider({
+      provider: "codex",
+      cwd: resolveSnapshotCwd("/project"),
+      wait: true,
+    });
+    const second = manager.getProvider({
+      provider: "codex",
+      cwd: resolveSnapshotCwd("/project"),
+      wait: true,
+    });
+    await began;
+    const third = manager.getProvider({
+      provider: "codex",
+      cwd: resolveSnapshotCwd("/project"),
+      wait: true,
+    });
+    releaseKey();
+    releaseCatalog();
+    const results = await Promise.all([first, second, third]);
+    expect(results.map((result) => result.models?.[0]?.id)).toEqual([
+      "current",
+      "current",
+      "current",
+    ]);
+    expect(targets).toEqual([
+      { scope: "workspace", cwd: resolveSnapshotCwd("/project"), force: false },
+    ]);
+    expect(probes).toBe(1);
+  } finally {
+    releaseKey();
+    releaseCatalog();
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("settings refresh starts independent workspace discoveries together and shares equivalent catalogues", async () => {
+  let release!: () => void;
+  const pending = new Promise<void>((finish) => {
+    release = finish;
+  });
+  let refreshing = false;
+  const started: string[] = [];
+  let sharedFetches = 0;
+  const cwds = [resolveSnapshotCwd("/refresh-a"), resolveSnapshotCwd("/refresh-b")];
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      pi: createExtraClient("pi", {
+        async isAvailable() {
+          return true;
+        },
+        async fetchCatalog(options) {
+          if (refreshing && options.scope === "workspace") {
+            started.push(options.cwd);
+            await pending;
+          }
+          return { models: [], modes: [] };
+        },
+      }),
+      codex: createExtraClient("codex", {
+        async isAvailable() {
+          return true;
+        },
+        async fetchCatalog() {
+          sharedFetches++;
+          return { models: [], modes: [] };
+        },
+      }),
+    },
+  });
+  let refresh: Promise<void> | undefined;
+  try {
+    await Promise.all(
+      cwds.map((cwd) => manager.warmUpSnapshotForCwd({ cwd, providers: ["pi", "codex"] })),
+    );
+    expect(sharedFetches).toBe(1);
+    refreshing = true;
+    refresh = manager.refreshSettingsSnapshot({ providers: ["pi", "codex"] });
+    await expect.poll(() => [...started].sort()).toEqual([...cwds].sort());
+    expect(sharedFetches).toBe(2);
+    release();
+    await refresh;
+  } finally {
+    release();
+    await refresh;
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("bounds each provider across workspaces without blocking another provider", async () => {
+  let release!: () => void;
+  const pending = new Promise<void>((finish) => {
+    release = finish;
+  });
+  let refreshing = false;
+  let peerFetches = 0;
+  let active = 0;
+  let peak = 0;
+  const started = new Set<string>();
+  const updated = new Set<string>();
+  const cwds = Array.from({ length: 16 }, (_, index) => resolveSnapshotCwd(`/bounded-${index}`));
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        async isAvailable() {
+          return true;
+        },
+        async fetchCatalog() {
+          peerFetches++;
+          return { models: [], modes: [] };
+        },
+      }),
+      pi: createExtraClient("pi", {
+        async isAvailable(_signal, options) {
+          if (refreshing && options?.scope === "workspace") {
+            started.add(options.cwd);
+            peak = Math.max(peak, ++active);
+            await pending;
+            active--;
+          }
+          return true;
+        },
+        async fetchCatalog() {
+          return {
+            models: [{ provider: "pi", id: refreshing ? "new" : "old", label: "Model" }],
+            modes: [],
+          };
+        },
+      }),
+    },
+  });
+  const requests: Promise<void>[] = [];
+  try {
+    await Promise.all(cwds.map((cwd) => manager.warmUpSnapshotForCwd({ cwd, providers: ["pi"] })));
+    manager.on("change", ({ current }) => {
+      if (
+        current.records.find((record) => record.entry.provider === "pi")?.entry.models?.[0]?.id ===
+        "new"
+      ) {
+        updated.add(current.cwd);
+      }
+    });
+    refreshing = true;
+    requests.push(manager.refreshSettingsSnapshot({ providers: ["pi"] }));
+    await expect.poll(() => started.size).toBeGreaterThanOrEqual(4);
+    requests.push(manager.warmUpSnapshotForCwd({ cwd: "/concurrent-read", providers: ["pi"] }));
+    expect(peak).toBe(4);
+    requests.push(
+      manager.warmUpSnapshotForCwd({ cwd: "/independent-provider", providers: ["codex"] }),
+    );
+    await expect.poll(() => peerFetches).toBe(1);
+    release();
+    await Promise.all(requests);
+    expect(started.size).toBe(cwds.length + 1);
+    expect(peak).toBe(4);
+    // Other sessions receive refreshed views without initiating a scoped read.
+    expect(cwds.every((cwd) => updated.has(cwd))).toBe(true);
+  } finally {
+    release();
+    await Promise.all(requests);
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test.each(["configuration", "shutdown", "destroy"])(
+  "discards queued discovery after %s",
+  async (action) => {
+    let release!: () => void;
+    const pending = new Promise<void>((finish) => {
+      release = finish;
+    });
+    const calls: string[] = [];
+    let keys = 0;
+    const cwds = Array.from({ length: 5 }, (_, index) => resolveSnapshotCwd(`/queued-${index}`));
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: { ...PUBLICATION_PROVIDERS, pi: { enabled: true, label: "Initial" } },
+      extraClients: {
+        pi: createExtraClient("pi", {
+          async getCatalogCacheKey() {
+            keys++;
+            return undefined;
+          },
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog(options) {
+            if (options.scope === "workspace") calls.push(options.cwd);
+            await pending;
+            return { models: [], modes: [] };
+          },
+        }),
+      },
+    });
+    const requests = cwds.map((cwd) => manager.warmUpSnapshotForCwd({ cwd, providers: ["pi"] }));
+    let transitions = 0;
+    manager.on("change", () => {
+      transitions++;
+    });
+    try {
+      await expect.poll(() => keys).toBe(5);
+      await expect.poll(() => calls.length).toBeGreaterThanOrEqual(4);
+      expect(calls).toEqual(cwds.slice(0, 4));
+      let queuedSettled = false;
+      void requests[4]!.then(() => {
+        queuedSettled = true;
+        return undefined;
+      });
+      if (action === "configuration") {
+        manager.applyMutableProviderConfig({
+          ...PUBLICATION_PROVIDERS,
+          pi: { enabled: true, label: "Updated" },
+        });
+        await expect.poll(() => queuedSettled).toBe(true);
+        // Replacing configuration must not reset the budget for still-active probes.
+        expect(calls).toEqual(cwds.slice(0, 4));
+        release();
+        await manager.warmUpSnapshotForCwd({ cwd: cwds[4], providers: ["pi"] });
+        await Promise.all(requests);
+        expect(calls.filter((cwd) => cwd === cwds[4])).toHaveLength(1);
+      } else {
+        const beforeStop = transitions;
+        if (action === "shutdown") await manager.shutdown();
+        else manager.destroy();
+        await expect.poll(() => queuedSettled).toBe(true);
+        release();
+        await Promise.all(requests);
+        expect(calls).toEqual(cwds.slice(0, 4));
+        expect(transitions).toBe(beforeStop);
+      }
+    } finally {
+      release();
+      await Promise.all(requests);
+      await manager.shutdown();
+      manager.destroy();
+    }
+  },
+);
+
+test("settings invalidation discards pending discovery even when the provider returns the same key", async () => {
+  let release!: () => void;
+  let started!: () => void;
+  const pending = new Promise<void>((finish) => {
+    release = finish;
+  });
+  const began = new Promise<void>((finish) => {
+    started = finish;
+  });
+  let calls = 0;
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        async getCatalogCacheKey() {
+          return "host";
+        },
+        async isAvailable() {
+          return true;
+        },
+        async fetchCatalog() {
+          const call = ++calls;
+          if (call === 1) {
+            started();
+            await pending;
+          }
+          return {
+            models: [{ provider: "codex", id: `model-${call}`, label: "Model" }],
+            modes: [],
+          };
+        },
+      }),
+    },
+  });
+  try {
+    const old = manager.getProvider({
+      provider: "codex",
+      cwd: resolveSnapshotCwd("/project"),
+      wait: true,
+    });
+    await began;
+    await manager.refreshSettingsSnapshot({ providers: ["codex"] });
+    release();
+    await old;
+    expect(
+      (
+        await manager.getProvider({
+          provider: "codex",
+          cwd: resolveSnapshotCwd("/project"),
+          wait: true,
+        })
+      ).models?.[0]?.id,
+    ).toBe("model-2");
+    expect(calls).toBe(2);
+  } finally {
+    release();
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("an unchanged provider publishes a pending key failure after an unrelated config reload", async () => {
+  let release!: () => void;
+  let started!: () => void;
+  const pending = new Promise<void>((finish) => {
+    release = finish;
+  });
+  const began = new Promise<void>((finish) => {
+    started = finish;
+  });
+  const config = {
+    codex: { enabled: true },
+    claude: { enabled: false },
+    copilot: { enabled: false },
+    opencode: { enabled: false },
+    pi: { enabled: false },
+    omp: { enabled: false },
+  };
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: config,
+    extraClients: {
+      codex: createExtraClient("codex", {
+        async getCatalogCacheKey() {
+          started();
+          await pending;
+          throw new Error("unreadable config");
+        },
+      }),
+    },
+  });
+  try {
+    const read = manager.getProvider({
+      provider: "codex",
+      cwd: resolveSnapshotCwd("/project"),
+      wait: true,
+    });
+    await began;
+    manager.applyMutableProviderConfig(
+      { ...config, claude: { enabled: false, label: "Changed" } },
+      { replace: true },
+    );
+    release();
+    expect(await read).toMatchObject({ status: "error", error: "unreadable config" });
+  } finally {
+    release();
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("a concurrent cached read cannot swallow a force refresh while its key is resolving", async () => {
+  let release!: () => void;
+  let started!: () => void;
+  const pending = new Promise<void>((finish) => {
+    release = finish;
+  });
+  const began = new Promise<void>((finish) => {
+    started = finish;
+  });
+  let keyCalls = 0;
+  let calls = 0;
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        async getCatalogCacheKey() {
+          if (++keyCalls === 2) {
+            started();
+            await pending;
+          }
+          return "host";
+        },
+        async isAvailable() {
+          return true;
+        },
+        async fetchCatalog() {
+          return {
+            models: [{ provider: "codex", id: `model-${++calls}`, label: "Model" }],
+            modes: [],
+          };
+        },
+      }),
+    },
+  });
+  const cwd = resolveSnapshotCwd("/project");
+  try {
+    await manager.getProvider({ provider: "codex", cwd, wait: true });
+    const refresh = manager.refreshSnapshotForCwd({ providers: ["codex"], cwd });
+    await began;
+    const read = manager.getProvider({ provider: "codex", cwd, wait: true });
+    release();
+    await refresh;
+    expect((await read).models?.[0]?.id).toBe("model-2");
+    expect(calls).toBe(2);
+  } finally {
+    release();
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test.each(["workspace", "settings"])(
+  "%s refresh retains the settled catalogue and publishes only the next result",
+  async (scope) => {
+    let release!: () => void;
+    let started!: () => void;
+    const pending = new Promise<void>((finish) => {
+      release = finish;
+    });
+    const began = new Promise<void>((finish) => {
+      started = finish;
+    });
+    let calls = 0;
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: PUBLICATION_PROVIDERS,
+      extraClients: {
+        codex: createExtraClient("codex", {
+          getCatalogCacheKey: async () => "shared",
+          async isAvailable() {
+            return true;
+          },
+          async fetchCatalog() {
+            if (++calls === 2) {
+              started();
+              await pending;
+            }
+            return {
+              models: [{ provider: "codex", id: "astra", label: `Astra ${calls}` }],
+              modes: [],
+            };
+          },
+        }),
+      },
+    });
+    try {
+      await manager.getProvider({ provider: "codex", cwd: "/project", wait: true });
+      const before = manager.getSnapshot("/project");
+      await manager.warmUpSnapshotForCwd({ cwd: "/project", providers: ["codex"] });
+      const statuses: string[] = [];
+      manager.on("change", ({ current }) => {
+        if (current.cwd !== resolveSnapshotCwd("/project")) return;
+        statuses.push(
+          current.records.find(({ entry }) => entry.provider === "codex")!.entry.status,
+        );
+      });
+      const refresh =
+        scope === "workspace"
+          ? manager.refreshSnapshotForCwd({ cwd: "/project", providers: ["codex"] })
+          : manager.refreshSettingsSnapshot({ providers: ["codex"] });
+      await began;
+      expect(statuses).toEqual([]);
+      expect(manager.getSnapshot("/project")).toBe(before);
+      expect(
+        await manager.getProvider({ provider: "codex", cwd: "/project", wait: false }),
+      ).toMatchObject({ status: "ready", models: [{ id: "astra", label: "Astra 1" }] });
+      release();
+      await refresh;
+      expect(statuses).toEqual(["ready"]);
+      expect(
+        await manager.getProvider({ provider: "codex", cwd: "/project", wait: true }),
+      ).toMatchObject({ status: "ready", models: [{ id: "astra", label: "Astra 2" }] });
+      expect(calls).toBe(2);
+    } finally {
+      release();
+      manager.destroy();
+    }
+  },
+);
+
+test("publication detaches provider-retained arrays, thinking options and nested metadata", async () => {
+  const models: AgentModelDefinition[] = [
+    {
+      provider: "codex",
+      id: "astra",
+      label: "Astra",
+      thinkingOptions: [{ id: "high", label: "High" }],
+      metadata: { nested: { label: "original" } },
+    },
+  ];
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        isAvailable: async () => true,
+        fetchCatalog: async () => ({ models, modes: [] }),
+      }),
+    },
+  });
+  try {
+    const published = await manager.getProvider({ provider: "codex", wait: true });
+    const record = manager.getSnapshot().records.find(({ entry }) => entry.provider === "codex")!;
+    const originalRecord = structuredClone(record);
+    const original = structuredClone(published);
+    models.push({ provider: "codex", id: "late", label: "Late" });
+    models[0]!.thinkingOptions![0]!.label = "mutated";
+    (models[0]!.metadata!.nested as { label: string }).label = "mutated";
+    expect(record).toEqual(originalRecord);
+    expect(published).toBe(record.entry);
+    expect(published).toEqual(original);
+    expect(await manager.getProvider({ provider: "codex" })).toEqual(original);
+  } finally {
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("snapshot records share provider results across targets while retaining target-specific catalogues", async () => {
+  const calls = { codex: 0, opencode: 0 };
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: Object.fromEntries(
+      (["codex", "opencode"] as const).map((provider) => [
+        provider,
+        createExtraClient(provider, {
+          isAvailable: async () => true,
+          fetchCatalog: async (options) => {
+            calls[provider]++;
+            const target = options.scope === "workspace" ? options.cwd : "global";
+            const id = provider === "codex" ? "shared" : target;
+            return { models: [{ provider, id, label: id }], modes: [] };
+          },
+        }),
+      ]),
+    ),
+  });
+  try {
+    const targets = [undefined, "/tmp/identity-a", "/tmp/identity-b"];
+    await Promise.all(
+      targets.map((cwd) =>
+        manager.listProviders({ cwd, providers: ["codex", "opencode"], wait: true }),
+      ),
+    );
+    const snapshots = targets.map((cwd) => manager.getSnapshot(cwd));
+    const shared = snapshots.map(
+      ({ records }) => records.find(({ entry }) => entry.provider === "codex")!,
+    );
+    expect(shared[0]).toBe(shared[1]);
+    expect(shared[1]).toBe(shared[2]);
+    expect(
+      new Set(
+        snapshots.map(
+          ({ records }) => records.find(({ entry }) => entry.provider === "opencode")!.contentHash,
+        ),
+      ).size,
+    ).toBe(3);
+    expect(calls).toEqual({ codex: 1, opencode: 3 });
+    expect(await manager.getProvider({ provider: "codex", cwd: targets[1] })).toBe(
+      shared[0]!.entry,
+    );
+  } finally {
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("result identity covers content, metadata and status while unchanged refresh advances only freshness", async () => {
+  const model: AgentModelDefinition = {
+    provider: "codex",
+    id: "astra",
+    label: "Astra",
+    metadata: { revision: 1 },
+  };
+  let available = true;
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    extraClients: {
+      codex: createExtraClient("codex", {
+        isAvailable: async () => available,
+        fetchCatalog: async () => ({ models: [model], modes: [] }),
+      }),
+    },
+  });
+  const read = () => manager.getSnapshot().records.find(({ entry }) => entry.provider === "codex")!;
+  const refresh = () => manager.refreshSettingsSnapshot({ providers: ["codex"] });
+  try {
+    await manager.getProvider({ provider: "codex", wait: true });
+    const first = read();
+    await vi.waitFor(() => expect(Date.now()).toBeGreaterThan(Date.parse(first.entry.fetchedAt!)));
+    await refresh();
+    const fresh = read();
+    expect(fresh).not.toBe(first);
+    expect(fresh.contentHash).toBe(first.contentHash);
+    expect(Date.parse(fresh.entry.fetchedAt!)).toBeGreaterThan(Date.parse(first.entry.fetchedAt!));
+    model.label = "Astra updated";
+    await refresh();
+    const content = read();
+    expect(content.contentHash).not.toBe(fresh.contentHash);
+    model.metadata!.revision = 2;
+    await refresh();
+    const metadata = read();
+    expect(metadata.contentHash).not.toBe(content.contentHash);
+    available = false;
+    await refresh();
+    const unavailable = read();
+    expect(unavailable.entry.status).toBe("unavailable");
+    expect(unavailable.contentHash).not.toBe(metadata.contentHash);
+  } finally {
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+const PUBLICATION_PROVIDERS = Object.fromEntries(
+  ["claude", "codex", "copilot", "opencode", "pi", "omp"].map((provider) => [
+    provider,
+    { enabled: provider === "codex" },
+  ]),
+);
+
+test("reads retain the target snapshot and cold binding publishes only the resolved transition", async () => {
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: PUBLICATION_PROVIDERS,
+    extraClients: { codex: createExtraClient("codex", { isAvailable: async () => true }) },
+  });
+  const changes: unknown[] = [];
+  manager.on("change", (change) => changes.push(change));
+  try {
+    const initial = manager.getSnapshot("/tmp/published");
+    expect(manager.getSnapshot("/tmp/published")).toBe(initial);
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/published" });
+    const ready = manager.getSnapshot("/tmp/published");
+    expect(ready).not.toBe(initial);
+    expect(manager.getSnapshot("/tmp/published")).toBe(ready);
+    expect(changes).toEqual([{ previous: initial, current: ready }]);
+  } finally {
+    manager.destroy();
+  }
+});
+
+test("identical key failures and unavailable results complete without duplicate transitions", async () => {
+  let keyFails = true;
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: PUBLICATION_PROVIDERS,
+    extraClients: {
+      codex: createExtraClient("codex", {
+        getCatalogCacheKey: async () => {
+          if (keyFails) throw new Error("same key failure");
+          return "host";
+        },
+      }),
+    },
+  });
+  const changes: unknown[] = [];
+  manager.on("change", (change) => changes.push(change));
+  try {
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/failure" });
+    const failed = manager.getSnapshot("/tmp/failure");
+    changes.length = 0;
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/failure" });
+    expect(changes).toEqual([]);
+    expect(manager.getSnapshot("/tmp/failure")).toBe(failed);
+    keyFails = false;
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/failure" });
+    const unavailable = manager.getSnapshot("/tmp/failure");
+    changes.length = 0;
+    await manager.refreshSnapshotForCwd({ cwd: "/tmp/failure", providers: ["codex"] });
+    expect(changes).toEqual([]);
+    expect(manager.getSnapshot("/tmp/failure")).toBe(unavailable);
+  } finally {
+    manager.destroy();
+  }
+});
+
+test("shared result publication installs every target before notifying the first subscriber", async () => {
+  let label = "before";
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: PUBLICATION_PROVIDERS,
+    extraClients: {
+      codex: createExtraClient("codex", {
+        isAvailable: async () => true,
+        fetchCatalog: async () => ({
+          models: [{ provider: "codex", id: "astra", label }],
+          modes: [],
+        }),
+      }),
+    },
+  });
+  const targets = ["/tmp/atomic-a", "/tmp/atomic-b"];
+  try {
+    await Promise.all(targets.map((cwd) => manager.warmUpSnapshotForCwd({ cwd })));
+    const observed: ProviderSnapshot[][] = [];
+    manager.on("change", () => observed.push(targets.map((cwd) => manager.getSnapshot(cwd))));
+    label = "after";
+    await manager.refreshSnapshotForCwd({ cwd: targets[0]!, providers: ["codex"] });
+    expect(observed).toHaveLength(2);
+    for (const snapshots of observed) {
+      expect(snapshots).toHaveLength(2);
+      for (const snapshot of snapshots) {
+        expect(
+          snapshot.records.find(({ entry }) => entry.provider === "codex")!.entry.models![0]!.label,
+        ).toBe("after");
+      }
+    }
+  } finally {
+    manager.destroy();
+  }
+});
+
+test("plugin runtime replacement invalidates only changed registrations and commits all targets together", async () => {
+  const calls: string[] = [];
+  const closed: string[] = [];
+  function registration(id: string, model: string): ProviderRegistration {
+    return {
+      id,
+      label: id,
+      getCatalogCacheKey: async () => "host",
+      async connect() {
+        let listener: ((event: ProviderEvent) => void) | undefined;
+        return {
+          version: 1,
+          capabilities: [],
+          async send(input) {
+            if (input.type !== "catalog") return;
+            calls.push(model);
+            listener?.({
+              type: "catalog",
+              requestId: input.requestId,
+              catalog: { models: [{ id: model, label: model }], modes: [] },
+            });
+          },
+          onEvent(next) {
+            listener = next;
+            return () => {
+              listener = undefined;
+            };
+          },
+          async close() {
+            closed.push(model);
+          },
+        };
+      },
+    };
+  }
+  const first = registration("first-plugin", "first");
+  const second = registration("second-plugin", "second");
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: PUBLICATION_PROVIDERS,
+    extraClients: {
+      codex: createExtraClient("codex", {
+        isAvailable: async () => true,
+        fetchCatalog: async () => {
+          calls.push("codex");
+          return { models: [], modes: [] };
+        },
+      }),
+    },
+  });
+  const cwds = ["/tmp/plugin-install-a", "/tmp/plugin-install-b"];
+  const warm = () => Promise.all(cwds.map((cwd) => manager.warmUpSnapshotForCwd({ cwd })));
+  try {
+    manager.replacePluginProviders([first, second]);
+    await warm();
+    const clients = manager.getAgentManagerProviderState().clients;
+    const snapshots = cwds.map((cwd) => manager.getSnapshot(cwd));
+    const observed: ProviderSnapshot[][] = [];
+    manager.on("change", () => observed.push(cwds.map((cwd) => manager.getSnapshot(cwd))));
+    manager.replacePluginProviders([first, second]);
+    await warm();
+    expect(calls.toSorted()).toEqual(["codex", "first", "second"]);
+    expect(manager.getSnapshot(cwds[0])).toBe(snapshots[0]);
+    expect(observed).toEqual([]);
+    manager.replacePluginProviders([registration("first-plugin", "restarted"), second]);
+    const loading = cwds.map((cwd) => manager.getSnapshot(cwd));
+    expect(observed).toHaveLength(2);
+    for (const reads of observed) {
+      expect(reads[0]).toBe(loading[0]);
+      expect(reads[1]).toBe(loading[1]);
+    }
+    const nextClients = manager.getAgentManagerProviderState().clients;
+    expect(nextClients.codex).toBe(clients.codex);
+    expect(nextClients["second-plugin"]).toBe(clients["second-plugin"]);
+    expect(nextClients["first-plugin"]).not.toBe(clients["first-plugin"]);
+    expect(loading[0]!.records.find(({ entry }) => entry.provider === "codex")).toBe(
+      snapshots[0]!.records.find(({ entry }) => entry.provider === "codex"),
+    );
+    expect(loading[0]!.records.find(({ entry }) => entry.provider === "second-plugin")).toBe(
+      snapshots[0]!.records.find(({ entry }) => entry.provider === "second-plugin"),
+    );
+    expect(
+      loading[0]!.records.find(({ entry }) => entry.provider === "first-plugin")!.entry.status,
+    ).toBe("loading");
+    await warm();
+    expect(calls.toSorted()).toEqual(["codex", "first", "restarted", "second"]);
+    expect(
+      manager.getSnapshot(cwds[0]).records.find(({ entry }) => entry.provider === "first-plugin")!
+        .entry.models![0]!.id,
+    ).toBe("restarted");
+    manager.replacePluginProviders([second]);
+    await warm();
+    expect(manager.hasProvider("first-plugin")).toBe(false);
+    expect(closed.toSorted()).toEqual(["first", "restarted"]);
+    await manager.shutdown();
+    expect(closed.toSorted()).toEqual(["first", "restarted", "second"]);
+    expect(calls.toSorted()).toEqual(["codex", "first", "restarted", "second"]);
+  } finally {
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
+
+test("binding a settled catalogue publishes once and rebinding an equal settled result publishes nothing", async () => {
+  let key = "first";
+  let probes = 0;
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: PUBLICATION_PROVIDERS,
+    extraClients: {
+      codex: createExtraClient("codex", {
+        getCatalogCacheKey: async () => key,
+        isAvailable: async () => {
+          probes++;
+          return false;
+        },
+      }),
+    },
+  });
+  const transitions: unknown[] = [];
+  manager.on("change", (transition) => transitions.push(transition));
+  try {
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/bind-a" });
+    transitions.length = 0;
+    const initial = manager.getSnapshot("/tmp/bind-b");
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/bind-b" });
+    expect(transitions).toEqual([
+      { previous: initial, current: manager.getSnapshot("/tmp/bind-b") },
+    ]);
+    expect(probes).toBe(1);
+    key = "second";
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/bind-b" });
+    const retained = manager.getSnapshot("/tmp/bind-a");
+    transitions.length = 0;
+    await manager.warmUpSnapshotForCwd({ cwd: "/tmp/bind-a" });
+    expect(transitions).toEqual([]);
+    expect(manager.getSnapshot("/tmp/bind-a")).toBe(retained);
+    expect(probes).toBe(2);
+  } finally {
+    manager.destroy();
+  }
+});
+
+describe("plugin provider overrides and launch", () => {
+  function provider() {
+    const launches: Array<ProviderLaunch | undefined> = [];
+    const registration: ProviderRegistration = {
+      id: "launch-plugin",
+      label: "Launch plugin",
+      command: [process.execPath, "default.js"],
+      async status({ launch }) {
+        if (launch?.env.PLUGIN_LOGIN !== "yes") {
+          return { available: false, diagnostic: "Sign in to the provider" };
+        }
+        return { available: true };
+      },
+      async connect(request) {
+        launches.push(request.launch);
+        let listener: ((event: ProviderEvent) => void) | undefined;
+        return {
+          version: 1,
+          capabilities: ["session.persistence"],
+          async send(input) {
+            if (input.type !== "catalog") return;
+            listener?.({
+              type: "catalog",
+              requestId: input.requestId,
+              catalog: { models: [{ id: "runtime", label: "Runtime" }], modes: [] },
+            });
+          },
+          onEvent(next) {
+            listener = next;
+            return () => {
+              listener = undefined;
+            };
+          },
+          async close() {},
+        };
+      },
+    };
+    return { registration, launches };
+  }
+
+  test("reports plugin status diagnostics without connecting", async () => {
+    const { registration, launches } = provider();
+    const manager = new ProviderSnapshotManager({ logger: createTestLogger() });
+    try {
+      manager.replacePluginProviders([registration]);
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        status: "unavailable",
+      });
+      expect((await manager.getProviderDiagnostic(registration.id)).diagnostic).toContain(
+        "Sign in to the provider",
+      );
+      expect(launches).toEqual([]);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("applies plugin overrides and refreshes the resolved launch on config edits", async () => {
+    const { registration, launches } = provider();
+    const manager = new ProviderSnapshotManager({
+      logger: createTestLogger(),
+      providerOverrides: {
+        [registration.id]: {
+          enabled: false,
+          label: "Configured plugin",
+          models: [{ id: "configured", label: "Configured" }],
+          additionalModels: [{ id: "extra", label: "Extra" }],
+          command: [process.execPath, "override.js"],
+          env: { PLUGIN_LOGIN: "yes", CLAUDECODE: "parent" },
+        },
+      },
+    });
+    try {
+      manager.replacePluginProviders([registration]);
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        enabled: false,
+        status: "unavailable",
+        label: "Configured plugin",
+      });
+      expect(launches).toEqual([]);
+      manager.applyMutableProviderConfig({ [registration.id]: { enabled: true } });
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        status: "ready",
+      });
+      expect(
+        (await manager.getProvider({ provider: registration.id })).models?.map((model) => model.id),
+      ).toEqual(["configured", "extra"]);
+      expect(launches[0]).toMatchObject({
+        command: process.execPath,
+        args: ["override.js"],
+        env: { PLUGIN_LOGIN: "yes" },
+      });
+      expect(launches[0]!.env).not.toHaveProperty("CLAUDECODE");
+      const previous = manager.getAgentManagerProviderState().clients[registration.id];
+      manager.applyMutableProviderConfig({
+        [registration.id]: {
+          enabled: true,
+          command: [process.execPath, "edited.js"],
+          env: { PLUGIN_LOGIN: "no" },
+        },
+      });
+      expect(manager.getAgentManagerProviderState().clients[registration.id]).not.toBe(previous);
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        status: "unavailable",
+      });
+      manager.applyMutableProviderConfig({
+        [registration.id]: {
+          enabled: true,
+          command: [process.execPath, "edited.js"],
+          env: { PLUGIN_LOGIN: "yes" },
+        },
+      });
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        status: "ready",
+      });
+      expect(launches.at(-1)).toMatchObject({ args: ["edited.js"] });
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("does not warn for a plugin override during startup before provider registration settles", async () => {
+    const { registration } = provider();
+    const warnings: string[] = [];
+    const logger = pino(
+      { level: "warn" },
+      {
+        write(line: string) {
+          warnings.push(line);
+        },
+      },
+    );
+    const manager = new ProviderSnapshotManager({
+      logger,
+      providerOverrides: {
+        [registration.id]: { command: [process.execPath], env: { PLUGIN_LOGIN: "yes" } },
+      },
+    });
+    try {
+      expect(warnings).toEqual([]);
+      manager.replacePluginProviders([]);
+      expect(warnings).toEqual([]);
+      manager.replacePluginProviders([registration]);
+      manager.settlePluginProviders();
+      expect(warnings).toEqual([]);
+      expect(await manager.getProvider({ provider: registration.id, wait: true })).toMatchObject({
+        status: "ready",
+      });
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("warns for unknown overrides when plugin startup settles without registered plugins", async () => {
+    const warnings: string[] = [];
+    const logger = pino(
+      { level: "warn" },
+      {
+        write(line: string) {
+          warnings.push(line);
+        },
+      },
+    );
+    const manager = new ProviderSnapshotManager({
+      logger,
+      providerOverrides: { "typo-provider": { enabled: false } },
+    });
+    try {
+      expect(warnings).toEqual([]);
+      manager.settlePluginProviders();
+      manager.settlePluginProviders();
+      expect(warnings).toHaveLength(1);
+      expect(JSON.parse(warnings[0]!)).toMatchObject({
+        provider: "typo-provider",
+        msg: "Provider override matches no registered provider",
+      });
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("warns once for unknown overrides after plugin startup settles without warning for known providers", async () => {
+    const { registration } = provider();
+    const warnings: string[] = [];
+    const logger = pino(
+      { level: "warn" },
+      {
+        write(line: string) {
+          warnings.push(line);
+        },
+      },
+    );
+    const manager = new ProviderSnapshotManager({
+      logger,
+      providerOverrides: {
+        "typo-provider": { enabled: false },
+        [registration.id]: { enabled: false },
+        codex: { enabled: false },
+      },
+    });
+    try {
+      expect(warnings).toEqual([]);
+      manager.replacePluginProviders([registration]);
+      expect(warnings).toEqual([]);
+      manager.settlePluginProviders();
+      manager.settlePluginProviders();
+      const unknown = warnings.map((line) => JSON.parse(line) as { provider: string; msg: string });
+      expect(unknown).toEqual([
+        expect.objectContaining({
+          provider: "typo-provider",
+          msg: "Provider override matches no registered provider",
+        }),
+      ]);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+
+  test("a same-ID extends entry shadows the plugin without throwing", async () => {
+    const { registration, launches } = provider();
+    const warnings: string[] = [];
+    const logger = pino(
+      { level: "warn" },
+      {
+        write(line: string) {
+          warnings.push(line);
+        },
+      },
+    );
+    const manager = new ProviderSnapshotManager({
+      logger,
+      providerOverrides: {
+        [registration.id]: {
+          extends: "acp",
+          label: "Own provider",
+          command: [process.execPath],
+          enabled: true,
+        },
+      },
+    });
+    try {
+      const previous = manager.getAgentManagerProviderState().clients[registration.id];
+      manager.replacePluginProviders([registration]);
+      expect(manager.getAgentManagerProviderState().clients[registration.id]).toBe(previous);
+      expect(manager.getProviderLabel(registration.id)).toBe("Own provider");
+      expect(
+        manager.getAgentManagerProviderState().providerDefinitions[registration.id],
+      ).toMatchObject({ enabled: true });
+      expect(warnings.join("\n")).toContain("shadowed");
+      expect(launches).toEqual([]);
+      manager.replacePluginProviders([]);
+      expect(manager.hasProvider(registration.id)).toBe(true);
+    } finally {
+      await manager.shutdown();
+      manager.destroy();
+    }
+  });
+});
+
+test("model overrides preserve negotiated plugin capabilities and connection shutdown", async () => {
+  let closed = 0;
+  const registration: ProviderRegistration = {
+    id: "model-plugin",
+    label: "Model plugin",
+    async connect() {
+      let listener: ((event: ProviderEvent) => void) | undefined;
+      return {
+        version: 1,
+        capabilities: ["session.persistence"],
+        async send(input) {
+          if (input.type === "catalog")
+            listener?.({
+              type: "catalog",
+              requestId: input.requestId,
+              catalog: { models: [], modes: [] },
+            });
+        },
+        onEvent(next) {
+          listener = next;
+          return () => {
+            listener = undefined;
+          };
+        },
+        async close() {
+          closed += 1;
+        },
+      };
+    },
+  };
+  const manager = new ProviderSnapshotManager({
+    logger: createTestLogger(),
+    providerOverrides: {
+      [registration.id]: { models: [{ id: "configured", label: "Configured" }] },
+    },
+  });
+  try {
+    manager.replacePluginProviders([registration]);
+    await manager.getProvider({ provider: registration.id, wait: true });
+    const client = manager.getAgentManagerProviderState().clients[registration.id]!;
+    expect(client.capabilities.supportsSessionPersistence).toBe(true);
+    await manager.shutdown();
+    expect(closed).toBe(1);
+  } finally {
+    await manager.shutdown();
+    manager.destroy();
+  }
+});
diff --git a/packages/server/src/server/agent/provider-snapshot-manager.ts b/packages/server/src/server/agent/provider-snapshot-manager.ts
index de7a69be39..82acd13e1f 100644
--- a/packages/server/src/server/agent/provider-snapshot-manager.ts
+++ b/packages/server/src/server/agent/provider-snapshot-manager.ts
@@ -1,8 +1,12 @@
+import { normalizeAgentModelCatalog } from "@getpaseo/protocol/agent-types";
+import { createHash } from "node:crypto";
 import { EventEmitter } from "node:events";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 
 import type { Logger } from "pino";
+import pLimit, { type LimitFunction } from "p-limit";
 
 import { expandTilde } from "../../utils/path.js";
 import { withTimeout } from "../../utils/promise-timeout.js";
@@ -45,6 +49,8 @@ import {
   type AgentConfigurationValidationInput,
   validateAgentConfigurationAgainstProvider,
 } from "./agent-configuration-validator.js";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
+import { PluginAgentClientRegistry } from "./plugin-provider.js";
 
 const DEFAULT_REFRESH_TIMEOUT_MS = 120_000;
 const MAX_REFRESH_TIMEOUT_MS = 2_147_483_647;
@@ -87,7 +93,23 @@ function omitProviderOverrides(
   return Object.keys(nextOverrides).length > 0 ? nextOverrides : undefined;
 }
 
-type ProviderSnapshotChangeListener = (entries: ProviderSnapshotEntry[], cwd: string) => void;
+/** Published values are shared read-only; provider-owned data is detached at publication. */
+export interface ProviderSnapshotRecord {
+  readonly entry: ProviderSnapshotEntry;
+  readonly contentHash: string;
+}
+
+export interface ProviderSnapshot {
+  readonly cwd: string;
+  readonly records: readonly ProviderSnapshotRecord[];
+}
+
+export interface ProviderSnapshotTransition {
+  readonly previous: ProviderSnapshot;
+  readonly current: ProviderSnapshot;
+}
+
+type ProviderSnapshotChangeListener = (transition: ProviderSnapshotTransition) => void;
 
 export interface ProviderSnapshotManagerOptions {
   logger: Logger;
@@ -123,10 +145,9 @@ interface ApplyMutableProviderConfigOptions {
   replace?: boolean;
 }
 
-export interface StagedMutableProviderConfig {
+export interface PreparedMutableProviderConfig {
   agentManagerState: AgentManagerProviderState;
-  publish(): void;
-  rollback(): void;
+  commit(): void;
 }
 
 interface ProviderSnapshotProviderOptions {
@@ -164,13 +185,11 @@ export interface AgentManagerProviderState {
   providerDefinitions: Partial<
     Record<
       AgentProvider,
-      Pick<
-        ProviderDefinition,
-        "enabled" | "derivedFromProviderId" | "validateOptions" | "applyOptions" | "applyToolPolicy"
-      >
+      Pick<ProviderDefinition, "enabled" | "derivedFromProviderId" | "applyToolPolicy">
     >
   >;
   clients: Partial<Record<AgentProvider, AgentClient>>;
+  retiredProviders?: readonly AgentProvider[];
 }
 
 interface ProviderLoadOptions {
@@ -179,18 +198,32 @@ interface ProviderLoadOptions {
   catalogScope: ProviderCatalogScope;
   force: boolean;
 }
-interface ProviderLoad {
+interface CatalogBinding {
+  key?: string;
+  failure?: ProviderSnapshotRecord;
+  /** Refresh intent survives reads that supersede an unfinished key lookup. */
+  force: boolean;
   promise: Promise<void>;
 }
 
-interface MutableProviderState {
-  baseProviderOverrides: Record<string, ProviderOverride> | undefined;
-  runtimeSettings: AgentProviderRuntimeSettingsMap | undefined;
-  providerOverrides: Record<string, ProviderOverride> | undefined;
-  providerRegistry: Record<AgentProvider, ProviderDefinition>;
-  providerClients: Record<AgentProvider, AgentClient>;
-  snapshots: Map<string, Map<AgentProvider, ProviderSnapshotEntry>>;
-  providerLoads: Map<string, Map<AgentProvider, ProviderLoad>>;
+interface ProviderCatalog {
+  result?: ProviderSnapshotRecord;
+  stale?: boolean;
+  load?: Promise<void>;
+}
+
+interface RegistryGeneration {
+  definitions: Record<AgentProvider, ProviderDefinition>;
+  order: readonly AgentProvider[];
+  providerStates: ReadonlyMap<
+    AgentProvider,
+    { initial: ProviderSnapshotRecord; discoveryLimit: LimitFunction }
+  >;
+}
+
+interface Target {
+  bindings: Map<AgentProvider, CatalogBinding>;
+  snapshot: ProviderSnapshot;
 }
 
 type ProviderCatalogScope = { scope: "global" } | { scope: "workspace"; cwd: string };
@@ -201,8 +234,8 @@ interface ProviderSnapshotTarget {
 }
 
 export class ProviderSnapshotManager {
-  private readonly snapshots = new Map<string, Map<AgentProvider, ProviderSnapshotEntry>>();
-  private readonly providerLoads = new Map<string, Map<AgentProvider, ProviderLoad>>();
+  private readonly catalogs = new Map<string, Map<AgentProvider, ProviderCatalog>>();
+  private readonly targets = new Map<string, Target>();
   private readonly events = new EventEmitter();
   private destroyed = false;
   private refreshTimeoutMs: number;
@@ -216,12 +249,17 @@ export class ProviderSnapshotManager {
   private runtimeSettings: AgentProviderRuntimeSettingsMap | undefined;
   private providerOverrides: Record<string, ProviderOverride> | undefined;
   private baseProviderOverrides: Record<string, ProviderOverride> | undefined;
-  private providerRegistry: Record<AgentProvider, ProviderDefinition>;
+  private generation: RegistryGeneration;
   private providerClients: Record<AgentProvider, AgentClient>;
   private readonly ownedClients = new Set<AgentClient>();
+  private readonly pluginProviders: PluginAgentClientRegistry;
+  private pluginProvidersSettled = false;
 
   constructor(options: ProviderSnapshotManagerOptions) {
     this.logger = options.logger;
+    this.pluginProviders = new PluginAgentClientRegistry(
+      options.logger.child({ module: "plugin-providers" }),
+    );
     this.workspaceGitService = options.workspaceGitService;
     this.managedProcesses = options.managedProcesses;
     this.openCodeBridge = options.openCodeBridge;
@@ -235,12 +273,17 @@ export class ProviderSnapshotManager {
       options.diagnosticTimeoutMs,
       this.refreshTimeoutMs,
     );
-    this.providerRegistry = this.buildRegistry();
-    this.providerClients = { ...this.extraClients } as Record<AgentProvider, AgentClient>;
+    this.generation = this.createGeneration(
+      this.buildRegistry(this.runtimeSettings, this.providerOverrides),
+      this.providerOverrides,
+    );
+    this.providerClients = {
+      ...this.extraClients,
+    } as Record<AgentProvider, AgentClient>;
     for (const client of Object.values(this.providerClients)) this.ownedClients.add(client);
   }
 
-  getSnapshot(cwd?: string): ProviderSnapshotEntry[] {
+  getSnapshot(cwd?: string): ProviderSnapshot {
     const target = resolveProviderSnapshotTarget(cwd);
     return this.getSnapshotForTarget(target);
   }
@@ -249,9 +292,8 @@ export class ProviderSnapshotManager {
     const snapshotCwd = resolveSnapshotCwd(options.cwd);
     const target = createWorkspaceSnapshotTarget(snapshotCwd);
     const providers = this.resolveRefreshProviders(options.providers);
-    this.resetSnapshotToLoading(snapshotCwd, providers, { preserveExisting: false });
-    this.emitChange(snapshotCwd);
-    await this.refreshProviders(target, providers ?? this.getProviderIds());
+    const providersToRefresh = providers ?? this.getProviderIds();
+    await this.refreshProviders(target, providersToRefresh);
   }
 
   async refreshSettingsSnapshot(
@@ -262,10 +304,21 @@ export class ProviderSnapshotManager {
     const providers = this.resolveRefreshProviders(options.providers);
     const providersToRefresh = providers ?? this.getProviderIds();
 
-    this.clearCachedProviders(providers);
-    this.resetSnapshotToLoading(homeCwd, providers, { preserveExisting: false });
-    this.emitChange(homeCwd);
+    this.getOrCreateTarget(homeCwd);
+    for (const catalogs of this.catalogs.values()) {
+      for (const provider of providersToRefresh) {
+        const catalog = catalogs.get(provider);
+        if (catalog) catalogs.set(provider, { result: catalog.result, stale: true });
+      }
+    }
+    // Refresh each known target: provider keys coalesce reads, while target-scoped
+    // providers must discover again in their own execution context.
     await this.refreshProviders(target, providersToRefresh);
+    await Promise.all(
+      [...this.targets.keys()]
+        .filter((cwd) => cwd !== homeCwd)
+        .map((cwd) => this.warmUp(createWorkspaceSnapshotTarget(cwd), providersToRefresh)),
+    );
   }
 
   async warmUpSnapshotForCwd(options: ProviderSnapshotWarmUpOptions): Promise<void> {
@@ -292,26 +345,31 @@ export class ProviderSnapshotManager {
   }
 
   hasProvider(provider: AgentProvider): boolean {
-    return Object.prototype.hasOwnProperty.call(this.providerRegistry, provider);
+    return Object.prototype.hasOwnProperty.call(this.generation.definitions, provider);
   }
 
   getProviderLabel(provider: AgentProvider): string {
-    return this.providerRegistry[provider]?.label ?? provider;
+    return this.generation.definitions[provider]?.label ?? provider;
   }
 
   getAgentManagerProviderState(): AgentManagerProviderState {
+    return this.createAgentManagerState(this.generation.definitions, this.providerClients);
+  }
+
+  private createAgentManagerState(
+    definitions: Record<AgentProvider, ProviderDefinition>,
+    providerClients: Record<AgentProvider, AgentClient>,
+  ): AgentManagerProviderState {
     const providerDefinitions: AgentManagerProviderState["providerDefinitions"] = {};
     const clients: AgentManagerProviderState["clients"] = {};
-    for (const [provider, definition] of Object.entries(this.providerRegistry)) {
+    for (const [provider, definition] of Object.entries(definitions)) {
       providerDefinitions[provider] = {
         enabled: definition.enabled,
         derivedFromProviderId: definition.derivedFromProviderId,
-        validateOptions: definition.validateOptions,
-        applyOptions: definition.applyOptions,
         applyToolPolicy: definition.applyToolPolicy,
       };
       if (definition.enabled) {
-        clients[provider] = this.ensureClient(provider, definition);
+        clients[provider] = this.ensureClient(provider, definition, providerClients);
       }
     }
     for (const [provider, client] of Object.entries(this.extraClients)) {
@@ -322,13 +380,79 @@ export class ProviderSnapshotManager {
     return { providerDefinitions, clients };
   }
 
-  private ensureClient(provider: AgentProvider, definition: ProviderDefinition): AgentClient {
-    const existing = this.providerClients[provider];
+  /** Called after built-in and configured plugin startup has completed, including disabled plugins. */
+  settlePluginProviders(): void {
+    if (this.pluginProvidersSettled) return;
+    this.pluginProvidersSettled = true;
+    this.warnUnknownProviderOverrides();
+  }
+
+  private warnUnknownProviderOverrides(): void {
+    if (!this.pluginProvidersSettled) return;
+    for (const [provider, override] of Object.entries(this.providerOverrides ?? {})) {
+      if (!override.extends && !this.generation.definitions[provider]) {
+        this.logger.warn({ provider }, "Provider override matches no registered provider");
+      }
+    }
+  }
+
+  replacePluginProviders(
+    registrations: readonly ProviderRegistration[],
+  ): AgentManagerProviderState {
+    for (const registration of registrations) {
+      if (BUILTIN_PROVIDER_IDS.includes(registration.id) || this.extraClients[registration.id]) {
+        throw new Error(`Plugin provider '${registration.id}' conflicts with a built-in provider`);
+      }
+    }
+    const previousPlugins = this.pluginProviders.definitions();
+    const clients = { ...this.providerClients };
+    // Materialize fallible installed clients before retiring any plugin runtime.
+    this.createAgentManagerState(this.generation.definitions, clients);
+    this.pluginProviders.replace(registrations);
+    const plugins = this.pluginProviders.definitions();
+    const retiredProviders = Object.keys(previousPlugins).filter(
+      (provider) =>
+        previousPlugins[provider] !== plugins[provider] &&
+        !this.providerOverrides?.[provider]?.extends,
+    );
+    const definitions = this.buildRegistry(this.runtimeSettings, this.providerOverrides);
+    const changed = new Set<AgentProvider>();
+    for (const provider of new Set([...this.generation.order, ...Object.keys(definitions)])) {
+      const before = this.generation.definitions[provider];
+      const after = definitions[provider];
+      const registrationChanged =
+        previousPlugins[provider] !== plugins[provider] &&
+        !this.providerOverrides?.[provider]?.extends;
+      if (
+        registrationChanged ||
+        !before ||
+        !after ||
+        !isDeepStrictEqual(before.configuration, after.configuration)
+      ) {
+        changed.add(provider);
+        delete clients[provider];
+      } else {
+        definitions[provider] = before;
+      }
+    }
+    for (const client of Object.values(clients)) this.ownedClients.add(client);
+    const generation = this.createGeneration(definitions, this.providerOverrides);
+    const state = this.createAgentManagerState(definitions, clients);
+    this.installGeneration(generation, clients, changed);
+    return { ...state, retiredProviders };
+  }
+
+  private ensureClient(
+    provider: AgentProvider,
+    definition: ProviderDefinition,
+    clients = this.providerClients,
+  ): AgentClient {
+    const existing = clients[provider];
     if (existing) {
       return existing;
     }
     const client = definition.createClient(this.logger);
-    this.providerClients[provider] = client;
+    clients[provider] = client;
     this.ownedClients.add(client);
     return client;
   }
@@ -339,7 +463,10 @@ export class ProviderSnapshotManager {
       await this.warmUpSnapshotForCwd({ cwd: input.cwd, providers: input.providers });
     }
     const providerFilter = input.providers ? new Set(input.providers) : null;
-    const entries = this.getSnapshotForTarget(target);
+    const snapshot = input.wait
+      ? this.getOrCreateTarget(target.snapshotCwd).snapshot
+      : this.getSnapshotForTarget(target, input.providers);
+    const entries = snapshot.records.map(({ entry }) => entry);
     return providerFilter ? entries.filter((entry) => providerFilter.has(entry.provider)) : entries;
   }
 
@@ -384,11 +511,9 @@ export class ProviderSnapshotManager {
       ];
     }
 
-    const definition = this.requireProvider(input.provider);
     return validateAgentConfigurationAgainstProvider({
       input,
       provider,
-      validateOptions: definition.validateOptions,
     });
   }
 
@@ -442,7 +567,7 @@ export class ProviderSnapshotManager {
   }
 
   async getProviderDiagnostic(provider: AgentProvider): Promise<ProviderDiagnosticResult> {
-    const definition = this.providerRegistry[provider];
+    const definition = this.generation.definitions[provider];
     if (!definition) {
       return {
         provider,
@@ -453,7 +578,7 @@ export class ProviderSnapshotManager {
     }
 
     const baseDiagnosticPromise = this.getBaseProviderDiagnostic(provider, definition);
-    const snapshotEntryPromise = this.refreshDiagnosticSnapshotEntry(provider, definition);
+    const snapshotEntryPromise = this.refreshDiagnosticSnapshotEntry(provider);
     const [baseDiagnostic, entry] = await Promise.all([
       baseDiagnosticPromise,
       snapshotEntryPromise,
@@ -469,92 +594,77 @@ export class ProviderSnapshotManager {
     mutableProviders: MutableDaemonConfig["providers"] | undefined,
     options: ApplyMutableProviderConfigOptions = {},
   ): AgentManagerProviderState {
-    const staged = this.stageMutableProviderConfig(mutableProviders, options);
-    try {
-      staged.publish();
-      return staged.agentManagerState;
-    } catch (error) {
-      staged.rollback();
-      throw error;
-    }
+    const prepared = this.prepareMutableProviderConfig(mutableProviders, options);
+    prepared.commit();
+    return prepared.agentManagerState;
   }
 
-  stageMutableProviderConfig(
+  prepareMutableProviderConfig(
     mutableProviders: MutableDaemonConfig["providers"] | undefined,
     options: ApplyMutableProviderConfigOptions = {},
-  ): StagedMutableProviderConfig {
-    const previous = this.captureMutableProviderState();
-    const snapshotCwds = Array.from(this.snapshots.keys());
-    try {
-      if (options.replace) {
-        this.baseProviderOverrides = undefined;
-        this.runtimeSettings = undefined;
+  ): PreparedMutableProviderConfig {
+    const baseProviderOverrides = options.replace
+      ? undefined
+      : omitProviderOverrides(this.baseProviderOverrides, options.removeProviders ?? []);
+    const runtimeSettings = options.replace ? undefined : this.runtimeSettings;
+    const providerOverrides = applyMutableProviderConfigToOverrides(
+      baseProviderOverrides,
+      mutableProviders,
+    );
+    const definitions = this.buildRegistry(runtimeSettings, providerOverrides);
+    const changed = new Set<AgentProvider>();
+    const clients = { ...this.providerClients };
+    for (const provider of new Set([...this.generation.order, ...Object.keys(definitions)])) {
+      const before = this.generation.definitions[provider];
+      const after = definitions[provider];
+      if (!before || !after || !isDeepStrictEqual(before.configuration, after.configuration)) {
+        changed.add(provider);
+        delete clients[provider];
       } else {
-        this.baseProviderOverrides = omitProviderOverrides(
-          this.baseProviderOverrides,
-          options.removeProviders ?? [],
-        );
+        definitions[provider] = before;
       }
-      this.providerOverrides = applyMutableProviderConfigToOverrides(
-        this.baseProviderOverrides,
-        mutableProviders,
-      );
-      // The mutable config is the complete provider source after startup. Keeping
-      // startup-derived runtime settings here would retain removed command/env fields.
-      if (options.replace) this.runtimeSettings = undefined;
-      this.providerRegistry = this.buildRegistry();
-      this.providerClients = { ...this.extraClients } as Record<AgentProvider, AgentClient>;
-
-      for (const cwd of this.snapshots.keys()) {
-        this.providerLoads.delete(cwd);
-        this.snapshots.set(cwd, this.reconcileSnapshotForRegistry(cwd));
-      }
-
-      return {
-        agentManagerState: this.getAgentManagerProviderState(),
-        publish: () => {
-          for (const cwd of snapshotCwds) {
-            this.emitChange(cwd);
-            const target =
-              cwd === GLOBAL_PROVIDER_SNAPSHOT_KEY
-                ? createGlobalSnapshotTarget()
-                : createWorkspaceSnapshotTarget(cwd);
-            const providers = this.resolveProvidersToWarm(cwd);
-            if (providers.length > 0) void this.warmUp(target, providers);
-          }
-        },
-        rollback: () => this.restoreMutableProviderState(previous),
-      };
-    } catch (error) {
-      this.restoreMutableProviderState(previous);
-      throw error;
     }
-  }
-
-  private captureMutableProviderState(): MutableProviderState {
+    Object.assign(clients, this.extraClients);
+    const generation = this.createGeneration(definitions, providerOverrides);
+    const agentManagerState = this.createAgentManagerState(definitions, clients);
     return {
-      baseProviderOverrides: this.baseProviderOverrides,
-      runtimeSettings: this.runtimeSettings,
-      providerOverrides: this.providerOverrides,
-      providerRegistry: this.providerRegistry,
-      providerClients: this.providerClients,
-      // Preserve the inner map identities: in-flight refreshes close over them.
-      // Staging replaces active maps instead of mutating these originals.
-      snapshots: new Map(this.snapshots),
-      providerLoads: new Map(this.providerLoads),
+      agentManagerState,
+      commit: () => {
+        this.baseProviderOverrides = baseProviderOverrides;
+        this.runtimeSettings = runtimeSettings;
+        this.providerOverrides = providerOverrides;
+        this.installGeneration(generation, clients, changed);
+      },
     };
   }
 
-  private restoreMutableProviderState(previous: MutableProviderState): void {
-    this.baseProviderOverrides = previous.baseProviderOverrides;
-    this.runtimeSettings = previous.runtimeSettings;
-    this.providerOverrides = previous.providerOverrides;
-    this.providerRegistry = previous.providerRegistry;
-    this.providerClients = previous.providerClients;
-    this.snapshots.clear();
-    for (const [cwd, entries] of previous.snapshots) this.snapshots.set(cwd, entries);
-    this.providerLoads.clear();
-    for (const [cwd, loads] of previous.providerLoads) this.providerLoads.set(cwd, loads);
+  private installGeneration(
+    generation: RegistryGeneration,
+    clients: Record<AgentProvider, AgentClient>,
+    changed: ReadonlySet<AgentProvider>,
+  ): void {
+    for (const provider of changed) {
+      this.generation.providerStates.get(provider)?.discoveryLimit.clearQueue();
+    }
+    this.generation = generation;
+    this.providerClients = clients;
+    this.warnUnknownProviderOverrides();
+    for (const [key, catalogs] of this.catalogs) {
+      for (const provider of changed) catalogs.delete(provider);
+      if (catalogs.size === 0) this.catalogs.delete(key);
+    }
+    for (const target of this.targets.values()) {
+      for (const provider of changed) target.bindings.delete(provider);
+    }
+    this.publishTargets(this.targets.keys());
+    const providers = [...changed].filter((provider) => generation.definitions[provider]);
+    if (providers.length === 0) return;
+    for (const cwd of this.targets.keys()) {
+      void this.warmUp(
+        resolveProviderSnapshotTarget(cwd === GLOBAL_PROVIDER_SNAPSHOT_KEY ? undefined : cwd),
+        providers,
+      );
+    }
   }
 
   setRefreshTimeoutMs(refreshTimeoutMs: number | undefined): void {
@@ -573,6 +683,8 @@ export class ProviderSnapshotManager {
   }
 
   async shutdown(): Promise<void> {
+    this.destroyed = true;
+    for (const state of this.generation.providerStates.values()) state.discoveryLimit.clearQueue();
     // Materialize a client per enabled provider so provider-owned resources
     // (background processes, sockets, etc.) get a chance to release even when
     // a given provider hasn't been touched yet during this daemon's lifetime.
@@ -582,15 +694,20 @@ export class ProviderSnapshotManager {
 
   destroy(): void {
     this.destroyed = true;
+    for (const state of this.generation.providerStates.values()) state.discoveryLimit.clearQueue();
+    this.catalogs.clear();
+    this.targets.clear();
     this.events.removeAllListeners();
-    this.snapshots.clear();
-    this.providerLoads.clear();
   }
 
-  private buildRegistry(): Record<AgentProvider, ProviderDefinition> {
+  private buildRegistry(
+    runtimeSettings: AgentProviderRuntimeSettingsMap | undefined,
+    providerOverrides: Record<string, ProviderOverride> | undefined,
+  ): Record<AgentProvider, ProviderDefinition> {
     const registry = buildProviderRegistry(this.logger, {
-      runtimeSettings: this.runtimeSettings,
-      providerOverrides: this.providerOverrides,
+      runtimeSettings,
+      providerOverrides,
+      pluginProviders: this.pluginProviders.definitions(),
       workspaceGitService: this.workspaceGitService,
       managedProcesses: this.managedProcesses,
       openCodeBridge: this.openCodeBridge,
@@ -630,12 +747,15 @@ export class ProviderSnapshotManager {
     };
   }
 
-  private getSnapshotForTarget(target: ProviderSnapshotTarget): ProviderSnapshotEntry[] {
-    const providersToWarm = this.resolveProvidersToWarm(target.snapshotCwd);
+  private getSnapshotForTarget(
+    target: ProviderSnapshotTarget,
+    providers?: AgentProvider[],
+  ): ProviderSnapshot {
+    const providersToWarm = this.resolveProvidersToWarm(target.snapshotCwd, providers);
     if (providersToWarm.length > 0) {
       void this.warmUp(target, providersToWarm);
     }
-    return entriesToArray(this.getOrCreateSnapshot(target.snapshotCwd));
+    return this.getOrCreateTarget(target.snapshotCwd).snapshot;
   }
 
   private async getReadyProvider(
@@ -655,7 +775,7 @@ export class ProviderSnapshotManager {
   }
 
   private requireProvider(provider: AgentProvider): ProviderDefinition {
-    const definition = this.providerRegistry[provider];
+    const definition = this.generation.definitions[provider];
     if (!definition) {
       throw new Error(`Provider ${provider} is not configured`);
     }
@@ -664,23 +784,15 @@ export class ProviderSnapshotManager {
 
   private async refreshDiagnosticSnapshotEntry(
     provider: AgentProvider,
-    definition: ProviderDefinition,
   ): Promise<ProviderSnapshotEntry> {
     try {
       const target = createGlobalSnapshotTarget();
-      this.resetSnapshotToLoading(target.snapshotCwd, [provider], { preserveExisting: false });
-      this.emitChange(target.snapshotCwd);
       await this.refreshProviders(target, [provider]);
       return await this.getProvider({ provider, wait: false });
     } catch (error) {
       return {
-        provider,
+        ...this.generation.providerStates.get(provider)!.initial.entry,
         status: "error",
-        enabled: definition.enabled,
-        source: this.getProviderSource(provider),
-        label: definition.label,
-        description: definition.description,
-        defaultModeId: definition.defaultModeId,
         error: toErrorMessage(error),
       };
     }
@@ -711,64 +823,40 @@ export class ProviderSnapshotManager {
     }
   }
 
-  private getProviderSource(provider: AgentProvider): ProviderSnapshotEntry["source"] {
-    const isBuiltin = BUILTIN_PROVIDER_IDS.includes(provider);
-    return !isBuiltin && this.providerOverrides?.[provider]?.extends ? "custom" : "builtin";
-  }
-
-  private createLoadingEntries(): Map<AgentProvider, ProviderSnapshotEntry> {
-    const entries = new Map<AgentProvider, ProviderSnapshotEntry>();
-    for (const provider of this.getProviderIds()) {
-      const definition = this.providerRegistry[provider];
-      entries.set(provider, {
-        provider,
-        status: "loading",
-        enabled: definition?.enabled ?? true,
-        source: this.getProviderSource(provider),
-        label: definition?.label,
-        description: definition?.description,
-        defaultModeId: definition?.defaultModeId ?? null,
-      });
-    }
-    return entries;
-  }
-
-  private reconcileSnapshotForRegistry(cwd: string): Map<AgentProvider, ProviderSnapshotEntry> {
-    const existing = this.snapshots.get(cwd);
-    const entries = new Map<AgentProvider, ProviderSnapshotEntry>();
-
-    for (const provider of this.getProviderIds()) {
-      const definition = this.providerRegistry[provider];
-      const current = existing?.get(provider);
-      const metadata = {
-        provider,
-        enabled: definition?.enabled ?? true,
-        source: this.getProviderSource(provider),
-        label: definition?.label,
-        description: definition?.description,
-        defaultModeId: definition?.defaultModeId ?? null,
-      };
-
-      if (!definition?.enabled) {
-        entries.set(provider, {
-          ...metadata,
-          status: "unavailable",
-          enabled: false,
-        });
+  private createGeneration(
+    definitions: Record<AgentProvider, ProviderDefinition>,
+    overrides: Record<string, ProviderOverride> | undefined,
+  ): RegistryGeneration {
+    const order = Object.keys(definitions);
+    const providerStates = new Map<
+      AgentProvider,
+      { initial: ProviderSnapshotRecord; discoveryLimit: LimitFunction }
+    >();
+    for (const provider of order) {
+      const definition = definitions[provider]!;
+      const previous = this.generation?.providerStates.get(provider);
+      if (this.generation?.definitions[provider] === definition) {
+        providerStates.set(provider, previous!);
         continue;
       }
-
-      entries.set(provider, {
-        ...metadata,
-        status: "loading",
-        enabled: true,
-        models: current?.models,
-        modes: current?.modes,
-        fetchedAt: current?.fetchedAt,
+      const custom =
+        this.pluginProviders.has(provider) ||
+        (!BUILTIN_PROVIDER_IDS.includes(provider) && !!overrides?.[provider]?.extends);
+      providerStates.set(provider, {
+        discoveryLimit: previous?.discoveryLimit ?? pLimit({ concurrency: 4, rejectOnClear: true }),
+        initial: identifyEntry({
+          provider,
+          status: definition.enabled ? "loading" : "unavailable",
+          enabled: definition.enabled,
+          source: custom ? "custom" : "builtin",
+          label: definition.label,
+          description: definition.description,
+          iconSvg: definition.iconSvg,
+          defaultModeId: definition.defaultModeId ?? null,
+        }),
       });
     }
-
-    return entries;
+    return { definitions, order, providerStates };
   }
 
   private async warmUp(target: ProviderSnapshotTarget, providers?: AgentProvider[]): Promise<void> {
@@ -795,60 +883,9 @@ export class ProviderSnapshotManager {
   }
 
   private resolveProvidersToWarm(cwd: string, providers?: AgentProvider[]): AgentProvider[] {
-    const providersToInspect = providers ?? this.getProviderIds();
-    const snapshot = this.snapshots.get(cwd);
-    if (!snapshot) {
-      this.resetSnapshotToLoading(cwd, providers);
-      return providersToInspect;
-    }
-
-    const missingProviders = providersToInspect.filter((provider) => !snapshot.has(provider));
-    if (missingProviders.length > 0) {
-      this.resetSnapshotToLoading(cwd, missingProviders);
-    }
-
-    return providersToInspect.filter((provider) => snapshot.get(provider)?.status === "loading");
-  }
-
-  private clearCachedProviders(providers?: AgentProvider[]): void {
-    const providerSet = providers ? new Set(providers) : null;
-    const loadingEntries = this.createLoadingEntries();
-
-    for (const [cwd, providerLoads] of Array.from(this.providerLoads.entries())) {
-      if (!providerSet) {
-        this.providerLoads.delete(cwd);
-        continue;
-      }
-
-      for (const provider of providerSet) {
-        providerLoads.delete(provider);
-      }
-      if (providerLoads.size === 0) {
-        this.providerLoads.delete(cwd);
-      }
-    }
-
-    for (const [cwd, snapshot] of this.snapshots.entries()) {
-      if (!providerSet) {
-        snapshot.clear();
-        for (const [provider, entry] of loadingEntries) {
-          snapshot.set(provider, entry);
-        }
-        this.emitChange(cwd);
-        continue;
-      }
-
-      let changed = false;
-      for (const provider of providerSet) {
-        const loadingEntry = loadingEntries.get(provider);
-        if (!loadingEntry) continue;
-        snapshot.set(provider, loadingEntry);
-        changed = true;
-      }
-      if (changed) {
-        this.emitChange(cwd);
-      }
-    }
+    this.getOrCreateTarget(cwd);
+    // Identity is provider-owned and may change without a daemon config reload.
+    return providers ?? this.getProviderIds();
   }
 
   private async loadProviders(options: ProviderLoadOptions): Promise<void> {
@@ -858,92 +895,137 @@ export class ProviderSnapshotManager {
   }
 
   private loadProvider(options: ProviderLoadOptions & { provider: AgentProvider }): Promise<void> {
-    const definition = this.providerRegistry[options.provider];
-    if (!definition) {
-      return Promise.resolve();
-    }
-
-    const existingLoad = this.getProviderLoad(options.snapshotCwd, options.provider);
-    if (existingLoad && !options.force) {
-      return existingLoad.promise;
-    }
-    const existingEntry = this.snapshots.get(options.snapshotCwd)?.get(options.provider);
-    if (existingEntry && existingEntry.status !== "loading" && !options.force) {
-      return Promise.resolve();
-    }
-
-    const load: ProviderLoad = {
+    if (this.destroyed || !this.generation.definitions[options.provider]) return Promise.resolve();
+    const { bindings } = this.getOrCreateTarget(options.snapshotCwd);
+    const binding: CatalogBinding = {
+      key: bindings.get(options.provider)?.key,
+      failure: bindings.get(options.provider)?.failure,
+      force: options.force || bindings.get(options.provider)?.force === true,
       promise: Promise.resolve(),
     };
-    this.setProviderLoad(options.snapshotCwd, options.provider, load);
-    load.promise = Promise.resolve()
-      .then(() =>
-        this.refreshProvider({
-          snapshotCwd: options.snapshotCwd,
-          catalogScope: options.catalogScope,
-          provider: options.provider,
-          definition,
-          load,
-          force: options.force,
-        }),
-      )
-      .finally(() => {
-        const providerLoads = this.providerLoads.get(options.snapshotCwd);
-        if (providerLoads?.get(options.provider) === load) {
-          providerLoads.delete(options.provider);
-        }
-        if (providerLoads?.size === 0) {
-          this.providerLoads.delete(options.snapshotCwd);
-        }
+    bindings.set(options.provider, binding);
+    binding.promise = this.resolveCatalog({ ...options, force: binding.force }, binding);
+    return binding.promise;
+  }
+
+  private async resolveCatalog(
+    options: ProviderLoadOptions & { provider: AgentProvider },
+    binding: CatalogBinding,
+  ): Promise<void> {
+    const { provider, snapshotCwd, force } = options;
+    const definition = this.generation.definitions[provider]!;
+    const initial = this.generation.providerStates.get(provider)!.initial.entry;
+    this.getOrCreateTarget(snapshotCwd);
+    if (!definition.enabled) return;
+    const currentBinding = () => this.targets.get(snapshotCwd)?.bindings.get(provider);
+    const client = this.ensureClient(provider, definition);
+    const catalogOptions = createFetchCatalogOptions(options.catalogScope, force);
+    let key: string;
+    try {
+      const sharedKey = client.getCatalogCacheKey
+        ? await withTimeout(
+            client.getCatalogCacheKey(catalogOptions),
+            this.refreshTimeoutMs,
+            `Timed out resolving ${provider} catalogue key`,
+          )
+        : await Promise.resolve(undefined);
+      key = JSON.stringify(
+        sharedKey === undefined ? ["target", snapshotCwd] : ["provider", sharedKey],
+      );
+    } catch (error) {
+      if (currentBinding() !== binding) return currentBinding()?.promise;
+      binding.force = false;
+      binding.key = undefined;
+      binding.failure = identifyEntry({
+        ...this.generation.providerStates.get(provider)!.initial.entry,
+        status: "error",
+        error: toErrorMessage(error),
       });
-    return load.promise;
+      this.publishTargets([snapshotCwd]);
+      return;
+    }
+    // Only the latest key resolution for this target may bind it to a catalogue.
+    if (currentBinding() !== binding) return currentBinding()?.promise;
+    binding.force = false;
+    binding.key = key;
+    binding.failure = undefined;
+    let catalogs = this.catalogs.get(key);
+    if (!catalogs) {
+      catalogs = new Map();
+      this.catalogs.set(key, catalogs);
+    }
+    let catalog = catalogs.get(provider);
+    if (!catalog) {
+      catalog = {};
+      catalogs.set(provider, catalog);
+    }
+    this.publishTargets([snapshotCwd]);
+    if (!force && (catalog.load || (catalog.result && !catalog.stale))) return catalog.load;
+    catalog.stale = false;
+
+    const current = catalog;
+    const isCurrent = (): boolean =>
+      !this.destroyed && this.catalogs.get(key)?.get(provider) === current && current.load === load;
+    const load = this.generation.providerStates
+      .get(provider)!
+      .discoveryLimit(() => {
+        if (!isCurrent()) return;
+        return this.refreshProvider({
+          catalogOptions,
+          provider,
+          definition,
+          initial,
+          client,
+          publish: (entry) => {
+            if (!isCurrent()) return false;
+            current.result = identifyEntry(structuredClone(entry));
+            const boundTargets = [...this.targets].flatMap(([cwd, target]) =>
+              target.bindings.get(provider)?.key === key ? [cwd] : [],
+            );
+            this.publishTargets(boundTargets);
+            return true;
+          },
+        });
+      })
+      .finally(() => {
+        if (current.load === load) current.load = undefined;
+      });
+    current.load = load;
+    return load;
   }
 
   private async refreshProvider(options: {
-    snapshotCwd: string;
-    catalogScope: ProviderCatalogScope;
+    catalogOptions: FetchCatalogOptions;
     provider: AgentProvider;
     definition: ProviderDefinition;
-    load: ProviderLoad;
-    force: boolean;
+    initial: ProviderSnapshotEntry;
+    client: AgentClient;
+    publish: (entry: ProviderSnapshotEntry) => boolean;
   }): Promise<void> {
-    const { snapshotCwd, catalogScope, provider, definition, load, force } = options;
-    const snapshot = this.getOrCreateSnapshot(snapshotCwd);
-    const base = {
+    const {
+      catalogOptions,
       provider,
-      source: this.getProviderSource(provider),
-      label: definition.label,
-      description: definition.description,
-      defaultModeId: definition.defaultModeId,
-    };
-    const setEntry = (entry: ProviderSnapshotEntry) => {
-      if (!this.isCurrentProviderLoad(snapshotCwd, provider, load)) {
-        return false;
-      }
-      snapshot.set(provider, entry);
-      this.emitChange(snapshotCwd);
-      return true;
-    };
+      definition,
+      initial: base,
+      client,
+      publish: setEntry,
+    } = options;
 
     try {
-      if (!definition.enabled) {
-        setEntry({ ...base, status: "unavailable", enabled: false });
-        return;
-      }
-
-      const client = this.ensureClient(provider, definition);
       const catalog = await runProviderRefreshWithDeadline({
         label: definition.label,
         timeoutMs: this.refreshTimeoutMs,
         operation: async (context) => {
           const available = await context.runActivity("availability", () =>
-            raceProviderRefreshAbort(context.signal, client.isAvailable(context.signal)),
+            raceProviderRefreshAbort(
+              context.signal,
+              client.isAvailable(context.signal, catalogOptions),
+            ),
           );
           if (!available) {
             return null;
           }
 
-          const catalogOptions = createFetchCatalogOptions(catalogScope, force);
           return await definition.fetchCatalog(catalogOptions, client, context);
         },
       });
@@ -952,13 +1034,20 @@ export class ProviderSnapshotManager {
         return;
       }
 
+      const models = normalizeAgentModelCatalog(catalog.models);
+      if (models.length !== catalog.models.length) {
+        this.logger.warn(
+          { provider, discardedRows: catalog.models.length - models.length },
+          "Provider catalog contains repeated model IDs; retaining the first definition",
+        );
+      }
       setEntry({
         ...base,
         defaultModeId:
-          catalog.defaultModeId === undefined ? definition.defaultModeId : catalog.defaultModeId,
+          catalog.defaultModeId === undefined ? base.defaultModeId : catalog.defaultModeId,
         status: "ready",
         enabled: true,
-        models: catalog.models,
+        models,
         modes: catalog.modes,
         fetchedAt: new Date().toISOString(),
       });
@@ -971,93 +1060,64 @@ export class ProviderSnapshotManager {
       });
       if (emitted) {
         this.logger.warn(
-          { err: error, provider, cwd: snapshotCwd },
+          { err: error, provider, target: catalogOptions },
           "Failed to refresh provider snapshot",
         );
       }
     }
   }
 
-  private getProviderLoad(cwdKey: string, provider: AgentProvider): ProviderLoad | undefined {
-    return this.providerLoads.get(cwdKey)?.get(provider);
-  }
-
-  private setProviderLoad(cwdKey: string, provider: AgentProvider, load: ProviderLoad): void {
-    let providerLoads = this.providerLoads.get(cwdKey);
-    if (!providerLoads) {
-      providerLoads = new Map<AgentProvider, ProviderLoad>();
-      this.providerLoads.set(cwdKey, providerLoads);
-    }
-    providerLoads.set(provider, load);
-  }
-
-  private isCurrentProviderLoad(
-    cwdKey: string,
-    provider: AgentProvider,
-    load: ProviderLoad,
-  ): boolean {
-    return this.providerLoads.get(cwdKey)?.get(provider) === load;
-  }
-
-  private emitChange(cwdKey: string): void {
-    if (this.destroyed) {
-      return;
-    }
-    const snapshot = this.snapshots.get(cwdKey);
-    if (!snapshot) {
-      return;
-    }
-    this.events.emit("change", entriesToArray(snapshot), cwdKey);
-  }
-
-  private getOrCreateSnapshot(cwdKey: string): Map<AgentProvider, ProviderSnapshotEntry> {
-    const existing = this.snapshots.get(cwdKey);
-    if (existing) {
-      return existing;
-    }
-
-    const created = this.createLoadingEntries();
-    this.snapshots.set(cwdKey, created);
-    return created;
-  }
-
-  private resetSnapshotToLoading(
-    cwdKey: string,
-    providers?: AgentProvider[],
-    options: { preserveExisting?: boolean } = {},
-  ): Map<AgentProvider, ProviderSnapshotEntry> {
-    const snapshot = this.getOrCreateSnapshot(cwdKey);
-    const loadingEntries = this.createLoadingEntries();
-    const preserveExisting = options.preserveExisting ?? true;
-
-    if (!providers) {
-      snapshot.clear();
-      for (const [provider, entry] of loadingEntries) {
-        snapshot.set(provider, entry);
-      }
-      return snapshot;
-    }
-
-    for (const provider of providers) {
-      const loadingEntry = loadingEntries.get(provider);
-      if (!loadingEntry) continue;
-      const existing = snapshot.get(provider);
-      snapshot.set(provider, {
-        ...loadingEntry,
-        ...(preserveExisting
-          ? {
-              models: existing?.models,
-              modes: existing?.modes,
-              fetchedAt: existing?.fetchedAt,
-            }
-          : {}),
+  private publishTargets(cwds: Iterable<string>): void {
+    if (this.destroyed) return;
+    const transitions: ProviderSnapshotTransition[] = [];
+    for (const cwd of cwds) {
+      const target = this.targets.get(cwd)!;
+      const records = this.generation.order.map((provider) => {
+        const binding = target.bindings.get(provider);
+        const result = binding?.key
+          ? this.catalogs.get(binding.key)?.get(provider)?.result
+          : undefined;
+        return binding?.failure ?? result ?? this.generation.providerStates.get(provider)!.initial;
       });
+      const previous = target.snapshot;
+      if (sameSnapshotRecords(previous.records, records)) continue;
+      const current = { cwd, records };
+      target.snapshot = current;
+      transitions.push({ previous, current });
     }
-    return snapshot;
+    for (const transition of transitions) {
+      for (const listener of this.events.listeners("change")) {
+        try {
+          listener(transition);
+        } catch (error) {
+          this.logger.error(
+            { err: error, cwd: transition.current.cwd },
+            "Provider snapshot subscriber failed",
+          );
+        }
+      }
+    }
+  }
+
+  private getOrCreateTarget(cwd: string): Target {
+    let target = this.targets.get(cwd);
+    if (!target) {
+      target = {
+        bindings: new Map(),
+        snapshot: {
+          cwd,
+          records: this.generation.order.map(
+            (provider) => this.generation.providerStates.get(provider)!.initial,
+          ),
+        },
+      };
+      this.targets.set(cwd, target);
+    }
+    return target;
   }
 
   private getProviderIds(): AgentProvider[] {
-    return Object.keys(this.providerRegistry);
+    return [...this.generation.order];
   }
 
   private resolveRefreshProviders(providers?: AgentProvider[]): AgentProvider[] | undefined {
@@ -1123,18 +1183,12 @@ export function isGlobalProviderSnapshotKey(cwd: string): boolean {
   return cwd === GLOBAL_PROVIDER_SNAPSHOT_KEY;
 }
 
-function entriesToArray(
-  entries: Map<AgentProvider, ProviderSnapshotEntry>,
-): ProviderSnapshotEntry[] {
-  return Array.from(entries.values(), cloneEntry);
-}
-
-function cloneEntry(entry: ProviderSnapshotEntry): ProviderSnapshotEntry {
-  return {
-    ...entry,
-    models: entry.models?.map((model) => ({ ...model })),
-    modes: entry.modes?.map((mode) => ({ ...mode })),
-  };
+function identifyEntry(entry: ProviderSnapshotEntry): ProviderSnapshotRecord {
+  const { fetchedAt: _fetchedAt, ...content } = entry;
+  const contentHash = createHash("sha256")
+    .update(JSON.stringify(["paseo.provider-result/1", content]))
+    .digest("base64url");
+  return { entry, contentHash };
 }
 
 function toErrorMessage(error: unknown): string {
@@ -1153,3 +1207,21 @@ function formatProviderStatus(entry: ProviderSnapshotEntry): string {
   if (entry.status === "unavailable") return "Unavailable";
   return "Loading";
 }
+
+export function sameSnapshotRecords(
+  previous: readonly ProviderSnapshotRecord[],
+  current: readonly ProviderSnapshotRecord[],
+): boolean {
+  return (
+    previous.length === current.length &&
+    previous.every((before, index) => {
+      const after = current[index]!;
+      return (
+        before === after ||
+        (before.entry.provider === after.entry.provider &&
+          before.contentHash === after.contentHash &&
+          before.entry.fetchedAt === after.entry.fetchedAt)
+      );
+    })
+  );
+}
diff --git a/packages/server/src/server/agent/provider-subagents/store.test.ts b/packages/server/src/server/agent/provider-subagents/store.test.ts
index ba1f3b5270..dc71c0f5c6 100644
--- a/packages/server/src/server/agent/provider-subagents/store.test.ts
+++ b/packages/server/src/server/agent/provider-subagents/store.test.ts
@@ -45,7 +45,7 @@ describe("ProviderSubagentStore", () => {
         updatedAt: "2026-07-12T10:00:02.000Z",
       }),
     ]);
-    expect(subagents.fetchTimeline("parent-a", "child-1").rows).toEqual([
+    expect(subagents.fetchTimeline("parent-a", "child-1").rows).toMatchObject([
       {
         seq: 1,
         timestamp: "2026-07-12T10:00:01.000Z",
@@ -98,8 +98,11 @@ describe("ProviderSubagentStore", () => {
       direction: "tail",
       limit: 1,
     });
-    expect(page.rows).toHaveLength(101);
-    expect(page.rows[0]?.seq).toBe(1);
+    expect(page.rows).toHaveLength(1);
+    expect(page.rows[0]?.seqStart).toBe(1);
+    expect(page.rows[0]?.item).toMatchObject({
+      text: Array.from({ length: 101 }, (_, i) => String(i)).join(""),
+    });
     expect(page.rows.at(-1)?.seq).toBe(101);
     expect(page.hasOlder).toBe(false);
   });
diff --git a/packages/server/src/server/agent/provider-subagents/store.ts b/packages/server/src/server/agent/provider-subagents/store.ts
index 8f2ccc60a5..b04246054a 100644
--- a/packages/server/src/server/agent/provider-subagents/store.ts
+++ b/packages/server/src/server/agent/provider-subagents/store.ts
@@ -6,13 +6,14 @@ import type {
   AgentTimelineFetchResult,
   AgentTimelineRow,
 } from "../agent-timeline-store-types.js";
-import { selectTimelineWindowByProjectedLimit } from "../timeline-projection.js";
 
 export type ProviderSubagentStatus = "running" | "completed" | "failed" | "canceled";
 
 export interface ProviderSubagentDescriptor {
   id: string;
   parentAgentId: string;
+  /** Direct provider-subagent parent. Null identifies a child of the managed agent. */
+  parentSubagentId: string | null;
   provider: AgentProvider;
   title: string | null;
   description: string | null;
@@ -38,6 +39,7 @@ export type ProviderSubagentInputEvent =
       toolCallId?: string | null;
       cwd?: string | null;
       subtitle?: string | null;
+      parentSubagentId?: string | null;
       timestamp?: string;
     }
   | {
@@ -123,6 +125,7 @@ export class ProviderSubagentStore {
       toolCallId: stickyField(event.toolCallId, previous?.toolCallId),
       cwd: stickyField(event.cwd, previous?.cwd),
       subtitle: stickyField(event.subtitle, previous?.subtitle),
+      parentSubagentId: stickyField(event.parentSubagentId, previous?.parentSubagentId),
     };
     this.descriptors.set(key, subagent);
     return { type: "upsert", subagent };
@@ -147,30 +150,7 @@ export class ProviderSubagentStore {
     subagentId: string,
     options?: AgentTimelineFetchOptions,
   ): AgentTimelineFetchResult {
-    const direction = options?.direction ?? "tail";
-    const limit = options?.limit === undefined ? 200 : Math.max(0, Math.floor(options.limit));
-    const timeline = this.timelines.fetch(storeKey(parentAgentId, subagentId), {
-      ...options,
-      limit: 0,
-    });
-    if (limit === 0 || timeline.rows.length === 0) {
-      return timeline;
-    }
-    const selected = selectTimelineWindowByProjectedLimit({
-      rows: timeline.rows,
-      direction: timeline.reset ? "tail" : direction,
-      limit,
-    });
-    const firstRow = selected.selectedRows[0];
-    const lastRow = selected.selectedRows[selected.selectedRows.length - 1];
-    return {
-      ...timeline,
-      rows: selected.selectedRows,
-      hasOlder:
-        timeline.hasOlder || (firstRow !== undefined && firstRow.seq > timeline.window.minSeq),
-      hasNewer:
-        timeline.hasNewer || (lastRow !== undefined && lastRow.seq < timeline.window.maxSeq),
-    };
+    return this.timelines.fetch(storeKey(parentAgentId, subagentId), options);
   }
 
   deleteParent(parentAgentId: string): ProviderSubagentStoreEvent[] {
diff --git a/packages/server/src/server/agent/providers/acp-agent.test.ts b/packages/server/src/server/agent/providers/acp-agent.test.ts
index ac4b407cf4..33c9696900 100644
--- a/packages/server/src/server/agent/providers/acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.test.ts
@@ -1,6 +1,11 @@
 import { type ChildProcess, type ChildProcessWithoutNullStreams } from "node:child_process";
 import { EventEmitter } from "node:events";
-import { afterEach, describe, expect, test, vi } from "vitest";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import {
   AgentSideConnection,
   ClientSideConnection,
@@ -8,6 +13,7 @@ import {
   RequestError,
   ndJsonStream,
   type Agent,
+  type CreateTerminalRequest,
   PermissionOption,
   PromptResponse,
   RequestPermissionRequest,
@@ -45,7 +51,13 @@ import { GenericACPAgentClient } from "./generic-acp-agent.js";
 import { parseKiroExtensionCommands } from "./kiro-acp-agent.js";
 import { transformPiModels } from "./pi/agent.js";
 import type { AgentStreamEvent } from "../agent-sdk-types.js";
-import type { AgentCapabilityFlags, AgentPersistenceHandle } from "../agent-sdk-types.js";
+import type {
+  AgentCapabilityFlags,
+  AgentPersistenceHandle,
+  AgentSession,
+  ProviderRefreshContext,
+} from "../agent-sdk-types.js";
+import { buildProviderRegistry } from "../provider-registry.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { buildStringCommandShellInvocation } from "../../../utils/string-command-shell.js";
 import { asInternals } from "../../test-utils/class-mocks.js";
@@ -124,7 +136,13 @@ interface ACPConfiguredOverrideInternals {
   applyConfiguredOverrides(): Promise<void>;
 }
 
-function createSession(terminateProcess?: ProcessTerminator): ACPAgentSession {
+function createSession(
+  options: {
+    terminateProcess?: ProcessTerminator;
+    launchEnv?: Record<string, string>;
+  } = {},
+): ACPAgentSession {
+  const { terminateProcess, launchEnv } = options;
   return new ACPAgentSession(
     {
       provider: "claude-acp",
@@ -144,6 +162,7 @@ function createSession(terminateProcess?: ProcessTerminator): ACPAgentSession {
         supportsToolInvocations: true,
       },
       ...(terminateProcess ? { terminateProcess } : {}),
+      ...(launchEnv ? { launchEnv } : {}),
     },
   );
 }
@@ -656,6 +675,114 @@ describe("ACPAgentSession terminal tools", () => {
     );
   });
 
+  // Terminals the daemon opens for an agent are siblings of the agent process, so
+  // they inherit nothing from it. They carry the agent's identity only if the
+  // session puts its launch environment on them, the way its transport spawn does.
+  describe("agent launch environment", () => {
+    afterEach(() => {
+      vi.unstubAllEnvs();
+    });
+
+    const readLaunchIdentityArgs = [
+      "-e",
+      "process.stdout.write(JSON.stringify({ id: process.env.PASEO_AGENT_ID ?? null, cwd: process.env.PASEO_AGENT_CWD ?? null, extra: process.env.PASEO_TEST_EXTRA ?? null }))",
+    ];
+
+    async function readLaunchIdentity(
+      session: ACPAgentSession,
+      params: Partial<CreateTerminalRequest> = {},
+    ): Promise<{ id: string | null; cwd: string | null; extra: string | null }> {
+      const terminal = await session.createTerminal({
+        sessionId: "session-1",
+        command: process.execPath,
+        args: readLaunchIdentityArgs,
+        cwd: process.cwd(),
+        ...params,
+      });
+      await session.waitForTerminalExit({
+        sessionId: "session-1",
+        terminalId: terminal.terminalId,
+      });
+      const { output } = await session.terminalOutput({
+        sessionId: "session-1",
+        terminalId: terminal.terminalId,
+      });
+      return JSON.parse(output.trim());
+    }
+
+    test("gives the terminal the agent's identity", async () => {
+      // The daemon itself does not run inside a Paseo agent.
+      vi.stubEnv("PASEO_AGENT_ID", undefined);
+      vi.stubEnv("PASEO_AGENT_CWD", undefined);
+      const session = createSession({
+        launchEnv: {
+          PASEO_AGENT_ID: "agent-1",
+          PASEO_AGENT_CWD: "/repo",
+        },
+      });
+
+      await expect(readLaunchIdentity(session)).resolves.toMatchObject({
+        id: "agent-1",
+        cwd: "/repo",
+      });
+    });
+
+    test("prefers the agent's identity over the daemon's own environment", async () => {
+      // A daemon started from inside another Paseo agent carries that agent's id.
+      vi.stubEnv("PASEO_AGENT_ID", "daemon-host-agent");
+      vi.stubEnv("PASEO_AGENT_CWD", "/elsewhere");
+      const session = createSession({
+        launchEnv: {
+          PASEO_AGENT_ID: "agent-1",
+          PASEO_AGENT_CWD: "/repo",
+        },
+      });
+
+      await expect(readLaunchIdentity(session)).resolves.toMatchObject({
+        id: "agent-1",
+        cwd: "/repo",
+      });
+    });
+
+    test("lets the requested terminal environment win over the launch environment", async () => {
+      const session = createSession({
+        launchEnv: {
+          PASEO_AGENT_ID: "agent-1",
+          PASEO_TEST_EXTRA: "from-launch",
+        },
+      });
+
+      await expect(
+        readLaunchIdentity(session, {
+          env: [{ name: "PASEO_TEST_EXTRA", value: "from-request" }],
+        }),
+      ).resolves.toMatchObject({ id: "agent-1", extra: "from-request" });
+    });
+
+    test("carries the agent's identity into single-string shell commands", async () => {
+      const child = createTerminalChildStub();
+      const spawn = vi.spyOn(spawnUtils, "spawnProcess").mockReturnValue(child);
+      const session = createSession({ launchEnv: { PASEO_AGENT_ID: "agent-1" } });
+
+      await session.createTerminal({
+        sessionId: "session-1",
+        command: "paseo heartbeat create --every 5m",
+        cwd: "/repo",
+      });
+
+      expect(spawn).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.any(Array),
+        expect.objectContaining({
+          envOverlay: expect.objectContaining({
+            PASEO_AGENT_ID: "agent-1",
+            BASH_ENV: undefined,
+          }),
+        }),
+      );
+    });
+  });
+
   test("surfaces spawn errors through terminal output and waitForTerminalExit", async () => {
     const child = createTerminalChildStub();
     vi.spyOn(spawnUtils, "spawnProcess").mockReturnValue(child);
@@ -702,6 +829,46 @@ describe("mapACPUsage", () => {
   });
 });
 
+describe("ACP context-window usage", () => {
+  async function emitUsageUpdate(update: {
+    used: number;
+    size: number;
+  }): Promise<{ events: unknown[] }> {
+    const session = createSessionWithConfig({ provider: "dsh" });
+    asInternals<ACPSessionInternals>(session).sessionId = "session-1";
+    const events: unknown[] = [];
+    session.subscribe((event) => {
+      if (event.type === "usage_updated") events.push(event);
+    });
+    await session.sessionUpdate({
+      sessionId: "session-1",
+      update: { sessionUpdate: "usage_update", used: update.used, size: update.size },
+    });
+    return { events };
+  }
+
+  test("forwards usage_update as context-window usage state", async () => {
+    const { events } = await emitUsageUpdate({ used: 13_759, size: 1_000_000 });
+
+    expect(events).toEqual([
+      {
+        type: "usage_updated",
+        provider: "dsh",
+        usage: { contextWindowMaxTokens: 1_000_000, contextWindowUsedTokens: 13_759 },
+      },
+    ]);
+  });
+
+  test("emits nothing when size and used cannot both drive a meter", async () => {
+    await expect(
+      emitUsageUpdate({ used: -1, size: 0 }).then((result) => result.events),
+    ).resolves.toEqual([]);
+    await expect(
+      emitUsageUpdate({ used: 13_759, size: 0 }).then((result) => result.events),
+    ).resolves.toEqual([]);
+  });
+});
+
 describe("deriveModesFromACP", () => {
   test("prefers explicit ACP mode state", () => {
     const result = deriveModesFromACP(
@@ -1790,10 +1957,9 @@ describe("ACPAgentClient modelTransformer", () => {
 
 describe("ACPAgentClient catalog discovery without a model resolver", () => {
   test("never switches models during catalog discovery even with multiple models and a thinking picker", async () => {
-    // The per-model probing that switches models lives on KimiACPAgentClient
-    // (see kimi-acp-agent.test.ts). The base client ships no catalog model resolver, so a
-    // slow or nonconforming ACP can't stall its catalog probe on extra setSessionConfigOption
-    // round trips.
+    // Model discovery extensions live on providers that opt in. The base
+    // client ships no catalog model resolver, so a slow or nonconforming ACP can't
+    // stall its catalog probe on extra setSessionConfigOption round trips.
     const setSessionConfigOption = vi.fn();
 
     class TestACPAgentClient extends ACPAgentClient {
@@ -3274,6 +3440,8 @@ interface ACPCloseInternals {
   child: ChildProcess | null;
   connection: unknown;
   sessionId: string | null;
+  activeForegroundTurnId: string | null;
+  agentCapabilities: { sessionCapabilities?: { close?: unknown } } | null;
 }
 
 async function startTerminal(
@@ -3324,7 +3492,7 @@ describe("ACPAgentSession close() tree-kill", () => {
 
   test("close() terminates the main child process via the process tree", async () => {
     const terminator = new FakeTerminator();
-    const session = createSession(terminator.terminate);
+    const session = createSession({ terminateProcess: terminator.terminate });
     const internals = asInternals<ACPCloseInternals>(session);
 
     const child = createTerminalChildStub();
@@ -3340,9 +3508,41 @@ describe("ACPAgentSession close() tree-kill", () => {
     expect(child.kill).not.toHaveBeenCalled();
   });
 
+  test("close() terminates the provider when cancel and closeSession never settle", async () => {
+    vi.useFakeTimers();
+    try {
+      const terminator = new FakeTerminator();
+      const session = createSession({ terminateProcess: terminator.terminate });
+      const child = createTerminalChildStub();
+      const cancel = vi.fn(() => new Promise<void>(() => undefined));
+      const unstableCloseSession = vi.fn(() => new Promise<void>(() => undefined));
+      const internals = asInternals<ACPCloseInternals>(session);
+      internals.child = child;
+      internals.sessionId = "session-1";
+      internals.activeForegroundTurnId = "turn-1";
+      internals.agentCapabilities = { sessionCapabilities: { close: {} } };
+      internals.connection = { cancel, unstable_closeSession: unstableCloseSession };
+
+      let settled = false;
+      const closing = (async () => {
+        await session.close();
+        settled = true;
+      })();
+      await vi.advanceTimersByTimeAsync(5_000);
+
+      expect(settled).toBe(true);
+      expect(cancel).toHaveBeenCalledWith({ sessionId: "session-1" });
+      expect(unstableCloseSession).toHaveBeenCalledWith({ sessionId: "session-1" });
+      expect(terminator.terminated).toContain(child);
+      await closing;
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   test("close() terminates running terminal child processes", async () => {
     const terminator = new FakeTerminator();
-    const session = createSession(terminator.terminate);
+    const session = createSession({ terminateProcess: terminator.terminate });
 
     const terminalChild = createTerminalChildStub();
     await startTerminal(session, terminalChild);
@@ -3355,7 +3555,7 @@ describe("ACPAgentSession close() tree-kill", () => {
 
   test("close() terminates terminal child processes in parallel", async () => {
     const terminator = new FakeTerminator("deferred");
-    const session = createSession(terminator.terminate);
+    const session = createSession({ terminateProcess: terminator.terminate });
 
     const firstChild = createTerminalChildStub();
     const secondChild = createTerminalChildStub();
@@ -3373,7 +3573,7 @@ describe("ACPAgentSession close() tree-kill", () => {
 
   test("killTerminal terminates the terminal process tree without a direct SIGTERM", async () => {
     const terminator = new FakeTerminator();
-    const session = createSession(terminator.terminate);
+    const session = createSession({ terminateProcess: terminator.terminate });
 
     const child = createTerminalChildStub();
     const terminalId = await startTerminal(session, child);
@@ -3386,7 +3586,7 @@ describe("ACPAgentSession close() tree-kill", () => {
 
   test("releaseTerminal terminates and removes a running terminal", async () => {
     const terminator = new FakeTerminator();
-    const session = createSession(terminator.terminate);
+    const session = createSession({ terminateProcess: terminator.terminate });
 
     const child = createTerminalChildStub();
     const terminalId = await startTerminal(session, child);
@@ -3402,6 +3602,34 @@ describe("ACPAgentSession close() tree-kill", () => {
 });
 
 describe("ACPAgentSession initialization cleanup", () => {
+  test("rejects a resume whose working directory was deleted instead of crashing", async () => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-acp-deleted-cwd-"));
+    const deletedCwd = path.join(root, "worktree");
+    const terminator = new FakeTerminator();
+    const session = new ACPAgentSession(
+      { provider: "test-acp", cwd: deletedCwd },
+      {
+        provider: "test-acp",
+        logger: createTestLogger(),
+        defaultCommand: [process.execPath, "-e", "process.stdin.resume()"],
+        defaultModes: [],
+        capabilities: {
+          supportsStreaming: true,
+          supportsSessionPersistence: true,
+        },
+        handle: { provider: "test-acp", sessionId: "archived-session" },
+        terminateProcess: terminator.terminate,
+      },
+    );
+
+    try {
+      await expect(session.initializeResumedSession()).rejects.toThrow("ENOENT");
+      expect(terminator.terminated).toHaveLength(1);
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
   test("terminates the ACP process when session/new fails", async () => {
     const terminator = new FakeTerminator();
     const child = createProbeChildStub();
@@ -3516,6 +3744,246 @@ describe("ACPAgentClient probe cleanup", () => {
     expect(child.stdout.destroyed).toBe(true);
     expect(child.stderr.destroyed).toBe(true);
   });
+
+  test("closes the native catalog probe session before terminating its process", async () => {
+    const terminator = new FakeTerminator();
+    const child = createProbeChildStub();
+    const closeSession = vi.fn().mockImplementation(async () => {
+      expect(terminator.terminated).toEqual([]);
+      return {};
+    });
+
+    class TestACPAgentClient extends ACPAgentClient {
+      protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+        return {
+          child,
+          connection: {
+            newSession: vi.fn().mockResolvedValue({
+              sessionId: "catalog-probe-session",
+              modes: null,
+              models: null,
+              configOptions: [],
+            }),
+            unstable_closeSession: closeSession,
+          },
+          initialize: { agentCapabilities: { sessionCapabilities: { close: {} } } },
+        } as unknown as SpawnedACPProcess;
+      }
+    }
+
+    const client = new TestACPAgentClient({
+      provider: "claude-acp",
+      logger: createTestLogger(),
+      defaultCommand: ["claude", "--acp"],
+      defaultModes: [],
+      terminateProcess: terminator.terminate,
+    });
+
+    await client.fetchCatalog({ scope: "workspace", cwd: "/tmp/acp-models", force: false });
+
+    expect(closeSession).toHaveBeenCalledWith({ sessionId: "catalog-probe-session" });
+    expect(terminator.terminated).toContain(child);
+  });
+
+  test("closes a catalog probe session that finishes being created after refresh aborts", async () => {
+    const terminator = new FakeTerminator();
+    const child = createProbeChildStub();
+    const abort = new AbortController();
+    let resolveNewSession!: (value: {
+      sessionId: string;
+      modes: null;
+      models: null;
+      configOptions: [];
+    }) => void;
+    const newSession = vi.fn(
+      () =>
+        new Promise<{
+          sessionId: string;
+          modes: null;
+          models: null;
+          configOptions: [];
+        }>((resolve) => {
+          resolveNewSession = resolve;
+        }),
+    );
+    const closeSession = vi.fn().mockResolvedValue({});
+
+    class TestACPAgentClient extends ACPAgentClient {
+      protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+        return {
+          child,
+          connection: { newSession, unstable_closeSession: closeSession },
+          initialize: { agentCapabilities: { sessionCapabilities: { close: {} } } },
+        } as unknown as SpawnedACPProcess;
+      }
+    }
+
+    const client = new TestACPAgentClient({
+      provider: "claude-acp",
+      logger: createTestLogger(),
+      defaultCommand: ["claude", "--acp"],
+      defaultModes: [],
+      terminateProcess: terminator.terminate,
+    });
+    const context: ProviderRefreshContext = {
+      signal: abort.signal,
+      runActivity: async (_name, operation) => await operation(),
+    };
+    const catalog = client.fetchCatalog(
+      { scope: "workspace", cwd: "/tmp/acp-models", force: false },
+      context,
+    );
+    await vi.waitFor(() => expect(newSession).toHaveBeenCalledOnce());
+
+    abort.abort(new Error("refresh cancelled"));
+    resolveNewSession({
+      sessionId: "late-catalog-probe-session",
+      modes: null,
+      models: null,
+      configOptions: [],
+    });
+
+    await expect(catalog).rejects.toThrow("refresh cancelled");
+    expect(closeSession).toHaveBeenCalledWith({ sessionId: "late-catalog-probe-session" });
+    expect(terminator.terminated).toContain(child);
+  });
+
+  test("closes the native feature probe session before terminating its process", async () => {
+    const terminator = new FakeTerminator();
+    const child = createProbeChildStub();
+    const closeSession = vi.fn().mockResolvedValue({});
+
+    class TestACPAgentClient extends ACPAgentClient {
+      protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+        return {
+          child,
+          connection: {
+            newSession: vi.fn().mockResolvedValue({
+              sessionId: "feature-probe-session",
+              modes: null,
+              models: null,
+              configOptions: [copilotAgentConfigOption("Probe Agent")],
+            }),
+            unstable_closeSession: closeSession,
+          },
+          initialize: { agentCapabilities: { sessionCapabilities: { close: {} } } },
+        } as unknown as SpawnedACPProcess;
+      }
+    }
+
+    const client = new TestACPAgentClient({
+      provider: "copilot",
+      logger: createTestLogger(),
+      defaultCommand: ["copilot", "--acp"],
+      defaultModes: [],
+      configFeatureOptions: [COPILOT_AGENT_FEATURE_OPTION],
+      terminateProcess: terminator.terminate,
+    });
+
+    await client.listFeatures({ provider: "copilot", cwd: "/tmp/acp-features" });
+
+    expect(closeSession).toHaveBeenCalledWith({ sessionId: "feature-probe-session" });
+    expect(terminator.terminated).toContain(child);
+  });
+
+  test("still terminates the probe when native session close fails", async () => {
+    const terminator = new FakeTerminator();
+    const child = createProbeChildStub();
+
+    class TestACPAgentClient extends ACPAgentClient {
+      protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+        return {
+          child,
+          connection: {
+            newSession: vi.fn().mockResolvedValue({
+              sessionId: "catalog-probe-session",
+              modes: null,
+              models: null,
+              configOptions: [],
+            }),
+            unstable_closeSession: vi.fn().mockRejectedValue(new Error("close failed")),
+          },
+          initialize: { agentCapabilities: { sessionCapabilities: { close: {} } } },
+        } as unknown as SpawnedACPProcess;
+      }
+    }
+
+    const client = new TestACPAgentClient({
+      provider: "claude-acp",
+      logger: createTestLogger(),
+      defaultCommand: ["claude", "--acp"],
+      defaultModes: [],
+      terminateProcess: terminator.terminate,
+    });
+
+    await client.fetchCatalog({ scope: "workspace", cwd: "/tmp/acp-models", force: false });
+
+    expect(terminator.terminated).toContain(child);
+  });
+
+  test("keeps a session visible and cleans up after its history load times out", async () => {
+    vi.useFakeTimers();
+    try {
+      const terminator = new FakeTerminator();
+      const child = createProbeChildStub();
+      const loadSession = vi.fn(async () => await new Promise(() => undefined));
+
+      class TestACPAgentClient extends ACPAgentClient {
+        protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+          return {
+            child,
+            connection: {
+              listSessions: vi.fn().mockResolvedValue({
+                sessions: [
+                  {
+                    sessionId: "slow-session",
+                    cwd: "/tmp/acp-import",
+                    title: "Slow but real",
+                    updatedAt: "2026-09-04T20:00:00.000Z",
+                  },
+                ],
+                nextCursor: null,
+              }),
+              loadSession,
+              unstable_closeSession: vi.fn().mockResolvedValue({}),
+            },
+            initialize: {
+              agentCapabilities: {
+                loadSession: true,
+                sessionCapabilities: { list: {}, close: {} },
+              },
+            },
+          } as unknown as SpawnedACPProcess;
+        }
+      }
+
+      const client = new TestACPAgentClient({
+        provider: "claude-acp",
+        logger: createTestLogger(),
+        defaultCommand: ["claude", "--acp"],
+        defaultModes: [],
+        terminateProcess: terminator.terminate,
+      });
+      const listing = client.listImportableSessions({ limit: 1 });
+      await vi.waitFor(() => expect(loadSession).toHaveBeenCalledOnce());
+
+      await vi.advanceTimersByTimeAsync(30_000);
+
+      await expect(listing).resolves.toEqual([
+        {
+          providerHandleId: "slow-session",
+          cwd: "/tmp/acp-import",
+          title: "Slow but real",
+          firstPromptPreview: null,
+          lastPromptPreview: null,
+          lastActivityAt: new Date("2026-09-04T20:00:00.000Z"),
+        },
+      ]);
+      expect(terminator.terminated).toContain(child);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });
 
 describe("ACP session/load invariant — cwd and mcpServers always passed", () => {
@@ -3790,3 +4258,265 @@ describe("ACP session/load invariant — cwd and mcpServers always passed", () =
     });
   });
 });
+
+const SILENT_CLOSE_ACP_AGENT = `
+import { readFileSync, writeFileSync } from "node:fs";
+import { Readable, Writable } from "node:stream";
+const { AgentSideConnection, PROTOCOL_VERSION, ndJsonStream } = await import(process.env.ACP_SDK_URL);
+writeFileSync(process.env.ACP_PID_FILE, String(process.pid));
+new AgentSideConnection(
+  () => ({
+    async initialize() {
+      return {
+        protocolVersion: PROTOCOL_VERSION,
+        agentCapabilities: { sessionCapabilities: { close: {} } },
+      };
+    },
+    async newSession() {
+      return { sessionId: "silent-close-session" };
+    },
+    async authenticate() {},
+    async cancel() {},
+    unstable_closeSession() {
+      return new Promise(() => {});
+    },
+  }),
+  ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin)),
+);
+`;
+
+function isProcessAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function settlesWithin(promise: Promise<unknown>, timeoutMs: number): Promise<boolean> {
+  let timer: NodeJS.Timeout | undefined;
+  const timedOut = new Promise<false>((resolve) => {
+    timer = setTimeout(() => resolve(false), timeoutMs);
+  });
+  try {
+    return await Promise.race([promise.then(() => true), timedOut]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+interface SilentCloseProvider {
+  session: ACPAgentSession;
+  readPid(): Promise<number>;
+  dispose(): Promise<void>;
+}
+
+async function startSilentCloseProvider(): Promise<SilentCloseProvider> {
+  const dir = await mkdtemp(path.join(tmpdir(), "paseo-acp-silent-close-"));
+  const agentScript = path.join(dir, "agent.mjs");
+  const pidFile = path.join(dir, "agent.pid");
+  await writeFile(agentScript, SILENT_CLOSE_ACP_AGENT);
+  const session = new ACPAgentSession(
+    { provider: "silent-close-acp", cwd: dir },
+    {
+      provider: "silent-close-acp",
+      logger: createTestLogger(),
+      defaultCommand: [process.execPath, agentScript],
+      defaultModes: [],
+      capabilities: {
+        supportsStreaming: true,
+        supportsSessionPersistence: true,
+        supportsDynamicModes: true,
+        supportsMcpServers: true,
+        supportsReasoningStream: true,
+        supportsToolInvocations: true,
+      },
+      launchEnv: {
+        ACP_SDK_URL: pathToFileURL(
+          createRequire(import.meta.url).resolve("@agentclientprotocol/sdk"),
+        ).href,
+        ACP_PID_FILE: pidFile,
+      },
+    },
+  );
+  const readPid = async () => Number(await readFile(pidFile, "utf8"));
+  return {
+    session,
+    readPid,
+    async dispose() {
+      const pid = await readPid().catch(() => null);
+      if (pid !== null && isProcessAlive(pid)) {
+        process.kill(pid, "SIGKILL");
+      }
+      await rm(dir, { recursive: true, force: true });
+    },
+  };
+}
+
+describe("ACPAgentSession close() with an unresponsive provider", () => {
+  let provider: SilentCloseProvider | null = null;
+
+  afterEach(async () => {
+    await provider?.dispose();
+    provider = null;
+  });
+
+  test("terminates a provider that never answers session/close", async () => {
+    provider = await startSilentCloseProvider();
+    await provider.session.initializeNewSession();
+    const pid = await provider.readPid();
+    expect(isProcessAlive(pid)).toBe(true);
+
+    expect(await settlesWithin(provider.session.close(), 8_000)).toBe(true);
+    expect(isProcessAlive(pid)).toBe(false);
+  }, 15_000);
+});
+
+// An ACP agent that advertises two models (or none, with ACP_ADVERTISE_MODELS=none) but,
+// like Cline, runs any model id it is given.
+const PERMISSIVE_MODEL_ACP_AGENT = `
+import { Readable, Writable } from "node:stream";
+const { AgentSideConnection, PROTOCOL_VERSION, ndJsonStream } = await import(process.env.ACP_SDK_URL);
+let currentModelId = "advertised-default";
+const modelState = () =>
+  process.env.ACP_ADVERTISE_MODELS === "none"
+    ? undefined
+    : {
+        currentModelId,
+        availableModels: [
+          { modelId: "advertised-default", name: "Advertised default" },
+          { modelId: "advertised-other", name: "Advertised other" },
+        ],
+      };
+new AgentSideConnection(
+  () => ({
+    async initialize() {
+      return { protocolVersion: PROTOCOL_VERSION, agentCapabilities: { loadSession: true } };
+    },
+    async newSession() {
+      return { sessionId: "permissive-session", models: modelState() };
+    },
+    async loadSession() {
+      return { models: modelState() };
+    },
+    async unstable_setSessionModel({ modelId }) {
+      currentModelId = modelId;
+      return {};
+    },
+    async authenticate() {},
+    async cancel() {},
+    async prompt() {
+      return { stopReason: "end_turn" };
+    },
+  }),
+  ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin)),
+);
+`;
+
+describe("custom ACP provider with configured models", () => {
+  let dir: string;
+  let agentScript: string;
+  let session: AgentSession | null = null;
+
+  beforeEach(async () => {
+    dir = await mkdtemp(path.join(tmpdir(), "paseo-acp-configured-models-"));
+    agentScript = path.join(dir, "agent.mjs");
+    await writeFile(agentScript, PERMISSIVE_MODEL_ACP_AGENT);
+  });
+
+  afterEach(async () => {
+    await session?.close();
+    session = null;
+    await rm(dir, { recursive: true, force: true });
+  });
+
+  function buildRegistry(
+    override: {
+      models?: Array<{ id: string; label: string }>;
+      additionalModels?: Array<{ id: string; label: string }>;
+    },
+    agentEnv: Record<string, string> = {},
+  ) {
+    return buildProviderRegistry(createTestLogger(), {
+      providerOverrides: {
+        permissive: {
+          extends: "acp",
+          label: "Permissive",
+          command: [process.execPath, agentScript],
+          env: {
+            ACP_SDK_URL: pathToFileURL(
+              createRequire(import.meta.url).resolve("@agentclientprotocol/sdk"),
+            ).href,
+            ...agentEnv,
+          },
+          ...override,
+        },
+      },
+    });
+  }
+
+  async function createSessionOnModel(
+    registry: ReturnType<typeof buildRegistry>,
+    model: string,
+  ): Promise<AgentSession> {
+    const client = registry.permissive.createClient(createTestLogger());
+    session = await client.createSession({ provider: "permissive", cwd: dir, model });
+    return session;
+  }
+
+  test("runs on a model added through additionalModels that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("runs on a model from a replacement models list that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      models: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("runs on a model from additionalModels when the agent advertises no models", async () => {
+    const registry = buildRegistry(
+      { additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }] },
+      { ACP_ADVERTISE_MODELS: "none" },
+    );
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("resumes on a model added through additionalModels that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+    const client = registry.permissive.createClient(createTestLogger());
+
+    session = await client.resumeSession(
+      { provider: "permissive", sessionId: "permissive-session", metadata: { cwd: dir } },
+      { model: "stealth/pixel-canary" },
+    );
+
+    expect((await session.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("keeps the agent's model when the requested model is neither advertised nor configured", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stale/removed-model");
+
+    expect((await created.getRuntimeInfo()).model).toBe("advertised-default");
+  });
+});
diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index fab367e90a..6bded49feb 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -1,3 +1,4 @@
+import { ACPProviderOptionsSchema } from "./acp-options.js";
 import { type ChildProcess, type ChildProcessWithoutNullStreams } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs/promises";
@@ -75,6 +76,9 @@ import {
   type AgentPersistenceHandle,
   type AgentPromptContentBlock,
   type AgentPromptInput,
+  type AgentResumePurpose,
+  type AgentCreateSessionOptions,
+  type AgentResumeSessionOptions,
   type AgentRunOptions,
   type AgentRunResult,
   type AgentRuntimeInfo,
@@ -136,6 +140,29 @@ function assertChildWithPipes(
   }
 }
 
+// Node reports a failed spawn (missing binary or missing cwd) as a child
+// `error` event; without a listener it becomes an uncaught exception.
+function rejectOnSpawnError(child: ChildProcess, stderrChunks: string[]): Promise<never> {
+  return new Promise<never>((_, reject) => {
+    child.once("error", (error) => {
+      const stderr = stderrChunks.join("").trim();
+      reject(new Error(stderr ? `${String(error)}\n${stderr}` : String(error)));
+    });
+  });
+}
+
+async function isDirectory(target: string): Promise<boolean> {
+  try {
+    return (await fs.stat(target)).isDirectory();
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return false;
+    }
+    throw error;
+  }
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return value != null && typeof value === "object" && !Array.isArray(value);
 }
@@ -144,6 +171,10 @@ function isACPError(value: unknown): value is ACPError {
   return isRecord(value) && typeof value.message === "string" && typeof value.code === "number";
 }
 
+function isACPInvalidParams(error: unknown): boolean {
+  return isACPError(error) && error.code === -32602;
+}
+
 function extractACPErrorDataMessage(data: unknown): string | null {
   if (!isRecord(data)) {
     return null;
@@ -185,15 +216,22 @@ export function summarizeACPRequestError(error: unknown): {
   return { message: String(error) };
 }
 
+// Keeps the JSON-RPC code so callers can still tell invalid params from other failures.
+class ACPRequestError extends Error {
+  readonly code: number;
+
+  constructor(error: ACPError) {
+    super(summarizeACPRequestError(error).message, { cause: error });
+    this.name = "ACPRequestError";
+    this.code = error.code;
+  }
+}
+
 function toACPRequestError(error: unknown): Error {
   if (!isACPError(error)) {
     return error instanceof Error ? error : new Error(String(error));
   }
-
-  const summary = summarizeACPRequestError(error);
-  const next = new Error(summary.message);
-  next.name = "ACPRequestError";
-  return next;
+  return new ACPRequestError(error);
 }
 
 function resolveTerminalCommand(
@@ -277,6 +315,13 @@ export function buildACPClientCapabilities(
 // NO_BROWSER is honored by Gemini CLI; other ACP agents ignore it.
 const PROBE_ENV: Record<string, string> = { NO_BROWSER: "true" };
 const ACP_DIAGNOSTIC_PHASE_TIMEOUT_MS = 20_000;
+const ACP_PROBE_CLOSE_TIMEOUT_MS = 2_000;
+// Archive and delete await close(). The ACP SDK does not reject a pending
+// request when the provider never answers, so these calls must be bounded
+// or the provider process is never terminated.
+const ACP_CLOSE_REQUEST_TIMEOUT_MS = 2_000;
+const ACP_IMPORT_HISTORY_LOAD_TIMEOUT_MS = 30_000;
+const ACP_IMPORT_HISTORY_BUDGET_MS = 60_000;
 
 function summarizeMalformedACPStdoutError(error: unknown): { type: string; message: string } {
   return {
@@ -390,7 +435,7 @@ export type ACPExtensionCommandsParser = (
  * the catalog plumbing.
  */
 export interface ACPCatalogModelResolverContext {
-  connection: ClientSideConnection;
+  connection: Pick<ClientSideConnection, "setSessionConfigOption" | "extMethod">;
   sessionId: string;
   models: AgentModelDefinition[];
   configOptions: SessionConfigOption[] | null | undefined;
@@ -401,10 +446,9 @@ export interface ACPCatalogModelResolverContext {
 }
 
 /**
- * Optional hook that refines the catalog's model list using the live probe session.
- * The base client ships no resolver — catalog discovery derives models from the initial
- * session response and never mutates the probe. Providers that need per-model data (Kimi)
- * inject a resolver so the extra round trips stay off every other ACP.
+ * Providers own model discovery through this hook, including extension RPCs. Without a
+ * resolver, the base client derives models from the initial session response. The client
+ * owns the probe lifetime and refresh deadline; resolvers return the complete model list.
  */
 export type ACPCatalogModelResolver = (
   context: ACPCatalogModelResolverContext,
@@ -439,6 +483,7 @@ interface ACPAgentClientOptions {
   waitForInitialCommands?: boolean;
   initialCommandsWaitTimeoutMs?: number;
   terminateProcess?: ProcessTerminator;
+  now?: () => number;
 }
 
 interface ACPAgentSessionOptions {
@@ -467,6 +512,8 @@ interface ACPAgentSessionOptions {
   capabilities: AgentCapabilityFlags;
   extensionCommandsParser?: ACPExtensionCommandsParser;
   handle?: AgentPersistenceHandle;
+  resumePurpose?: AgentResumePurpose;
+  configuredModelIds?: readonly string[];
   agentId?: string;
   launchEnv?: Record<string, string>;
   waitForInitialCommands?: boolean;
@@ -493,6 +540,78 @@ interface ACPProcessTransport {
   spawnError: Promise<never>;
 }
 
+interface ACPImportPromptPreviews {
+  firstPromptPreview: string | null;
+  lastPromptPreview: string | null;
+  hasConversation: boolean;
+}
+
+interface ACPImportPromptCacheEntry extends ACPImportPromptPreviews {
+  updatedAt: string | null;
+}
+
+class ACPImportHistoryCollector {
+  private readonly prompts = new Map<
+    string,
+    {
+      completed: string[];
+      current: { messageId: string | null; text: string } | null;
+      hasConversation: boolean;
+    }
+  >();
+
+  begin(sessionId: string): void {
+    this.prompts.set(sessionId, { completed: [], current: null, hasConversation: false });
+  }
+
+  accept(params: SessionNotification): void {
+    const state = this.prompts.get(params.sessionId);
+    if (!state) return;
+    const update = params.update;
+    if (isACPConversationUpdate(update)) state.hasConversation = true;
+    if (update.sessionUpdate !== "user_message_chunk") {
+      this.flushCurrent(state);
+      return;
+    }
+
+    const text = contentBlockToText(update.content);
+    if (!text) return;
+    const messageId = update.messageId ?? null;
+    if (state.current?.messageId && messageId !== state.current.messageId) {
+      this.flushCurrent(state);
+    }
+    state.current ??= { messageId, text: "" };
+    state.current.text += text;
+  }
+
+  finish(sessionId: string): ACPImportPromptPreviews {
+    const state = this.prompts.get(sessionId);
+    if (!state) {
+      return { firstPromptPreview: null, lastPromptPreview: null, hasConversation: false };
+    }
+    this.flushCurrent(state);
+    this.prompts.delete(sessionId);
+    return {
+      firstPromptPreview: normalizeACPImportPromptPreview(state.completed[0] ?? null),
+      lastPromptPreview: normalizeACPImportPromptPreview(state.completed.at(-1) ?? null),
+      hasConversation: state.hasConversation,
+    };
+  }
+
+  discard(sessionId: string): void {
+    this.prompts.delete(sessionId);
+  }
+
+  private flushCurrent(state: {
+    completed: string[];
+    current: { messageId: string | null; text: string } | null;
+    hasConversation: boolean;
+  }): void {
+    if (state.current?.text.trim()) state.completed.push(state.current.text);
+    state.current = null;
+  }
+}
+
 export interface ACPToolSnapshot {
   toolCallId: string;
   title: string;
@@ -826,6 +945,8 @@ export class ACPAgentClient implements AgentClient {
   private readonly waitForInitialCommands: boolean;
   private readonly initialCommandsWaitTimeoutMs: number;
   private readonly extensionCommandsParser?: ACPExtensionCommandsParser;
+  private readonly importPromptCache = new Map<string, ACPImportPromptCacheEntry>();
+  private readonly now: () => number;
   protected readonly terminateProcess: ProcessTerminator;
 
   constructor(options: ACPAgentClientOptions) {
@@ -854,13 +975,16 @@ export class ACPAgentClient implements AgentClient {
     this.waitForInitialCommands = options.waitForInitialCommands ?? false;
     this.initialCommandsWaitTimeoutMs = options.initialCommandsWaitTimeoutMs ?? 1500;
     this.extensionCommandsParser = options.extensionCommandsParser;
+    this.now = options.now ?? Date.now;
   }
 
   async createSession(
     config: AgentSessionConfig,
     launchContext?: AgentLaunchContext,
+    options?: AgentCreateSessionOptions,
   ): Promise<AgentSession> {
     this.assertProvider(config);
+    const providerOptions = ACPProviderOptionsSchema.parse(config.providerOptions ?? {});
     const session = new ACPAgentSession(
       { ...config, provider: this.provider },
       {
@@ -873,14 +997,19 @@ export class ACPAgentClient implements AgentClient {
         sessionResponseTransformer: this.sessionResponseTransformer,
         configOptionsTransformer: this.configOptionsTransformer,
         configFeatureOptions: this.configFeatureOptions,
-        clientCapabilities: this.clientCapabilities,
+        clientCapabilities: providerOptions.clientCapabilities ?? this.clientCapabilities,
         clientCapabilityMeta: this.clientCapabilityMeta,
         modeIdTransformer: this.modeIdTransformer,
         toolSnapshotTransformer: this.toolSnapshotTransformer,
         providerModeWriter: this.providerModeWriter,
         beforeModeWriter: this.beforeModeWriter,
         thinkingOptionWriter: this.thinkingOptionWriter,
-        capabilities: this.capabilities,
+        capabilities: {
+          ...this.capabilities,
+          supportsMcpServers:
+            providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
+        },
+        configuredModelIds: options?.configuredModelIds,
         agentId: launchContext?.agentId,
         launchEnv: launchContext?.env,
         extensionCommandsParser: this.extensionCommandsParser,
@@ -896,6 +1025,7 @@ export class ACPAgentClient implements AgentClient {
     handle: AgentPersistenceHandle,
     overrides?: Partial<AgentSessionConfig>,
     launchContext?: AgentLaunchContext,
+    options?: AgentResumeSessionOptions,
   ): Promise<AgentSession> {
     if (handle.provider !== this.provider) {
       throw new Error(`Cannot resume ${handle.provider} handle with ${this.provider} provider`);
@@ -913,6 +1043,7 @@ export class ACPAgentClient implements AgentClient {
       provider: this.provider,
       cwd,
     };
+    const providerOptions = ACPProviderOptionsSchema.parse(mergedConfig.providerOptions ?? {});
     const session = new ACPAgentSession(mergedConfig, {
       provider: this.provider,
       logger: this.logger,
@@ -923,15 +1054,21 @@ export class ACPAgentClient implements AgentClient {
       sessionResponseTransformer: this.sessionResponseTransformer,
       configOptionsTransformer: this.configOptionsTransformer,
       configFeatureOptions: this.configFeatureOptions,
-      clientCapabilities: this.clientCapabilities,
+      clientCapabilities: providerOptions.clientCapabilities ?? this.clientCapabilities,
       clientCapabilityMeta: this.clientCapabilityMeta,
       modeIdTransformer: this.modeIdTransformer,
       toolSnapshotTransformer: this.toolSnapshotTransformer,
       providerModeWriter: this.providerModeWriter,
       beforeModeWriter: this.beforeModeWriter,
       thinkingOptionWriter: this.thinkingOptionWriter,
-      capabilities: this.capabilities,
+      capabilities: {
+        ...this.capabilities,
+        supportsMcpServers:
+          providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
+      },
       handle,
+      resumePurpose: options?.purpose,
+      configuredModelIds: options?.configuredModelIds,
       agentId: launchContext?.agentId,
       launchEnv: launchContext?.env,
       extensionCommandsParser: this.extensionCommandsParser,
@@ -948,10 +1085,30 @@ export class ACPAgentClient implements AgentClient {
   ): Promise<ProviderCatalog> {
     const cwd = options.scope === "global" ? homedir() : options.cwd;
     let probe: UninitializedACPProcess | null = null;
+    let probeSessionId: string | null = null;
+    let probeSessionPromise: Promise<NewSessionResponse> | null = null;
     let closePromise: Promise<void> | null = null;
     const closeProbe = (): Promise<void> => {
       if (!probe) return Promise.resolve();
-      closePromise ??= this.closeProbe(probe);
+      closePromise ??= (async () => {
+        if (!probeSessionId && probeSessionPromise) {
+          try {
+            probeSessionId = (
+              await withTimeout(
+                probeSessionPromise,
+                ACP_PROBE_CLOSE_TIMEOUT_MS,
+                `ACP probe session/new cleanup timed out after ${ACP_PROBE_CLOSE_TIMEOUT_MS}ms`,
+              )
+            ).sessionId;
+          } catch (error) {
+            this.logger.debug(
+              { err: error },
+              "ACP probe session/new did not finish during cleanup",
+            );
+          }
+        }
+        await this.closeProbe(probe, probeSessionId);
+      })();
       return closePromise;
     };
     const handleAbort = () => void closeProbe().catch(() => undefined);
@@ -962,6 +1119,7 @@ export class ACPAgentClient implements AgentClient {
         raceProviderRefreshAbort(
           context?.signal,
           this.spawnProcess(PROBE_ENV, {
+            providerOptions: options.providerOptions,
             onSpawned: (spawned) => {
               probe = spawned;
               if (context?.signal.aborted) void closeProbe().catch(() => undefined);
@@ -970,17 +1128,16 @@ export class ACPAgentClient implements AgentClient {
         ),
       );
       probe = initializedProbe;
-      const response = await runProviderRefreshActivity(context, "session/new", () =>
-        raceProviderRefreshAbort(
-          context?.signal,
-          this.runACPRequest(() =>
-            initializedProbe.connection.newSession({
-              cwd,
-              mcpServers: [],
-            }),
-          ),
-        ),
+      probeSessionPromise = this.runACPRequest(() =>
+        initializedProbe.connection.newSession({
+          cwd,
+          mcpServers: [],
+        }),
       );
+      const response = await runProviderRefreshActivity(context, "session/new", () =>
+        raceProviderRefreshAbort(context?.signal, probeSessionPromise!),
+      );
+      probeSessionId = response.sessionId;
       const transformed = this.transformSessionResponse(response);
       const derivedModels = deriveModelDefinitionsFromACP(
         this.provider,
@@ -1030,6 +1187,7 @@ export class ACPAgentClient implements AgentClient {
 
     this.assertProvider(config);
     const probe = await this.spawnProcess(PROBE_ENV);
+    let probeSessionId: string | null = null;
     try {
       const response = await this.runACPRequest(() =>
         probe.connection.newSession({
@@ -1037,53 +1195,154 @@ export class ACPAgentClient implements AgentClient {
           mcpServers: [],
         }),
       );
+      probeSessionId = response.sessionId;
       const transformed = this.transformSessionResponse(response);
       return [
         autoAcceptFeature,
         ...deriveFeaturesFromACP(transformed.configOptions, this.configFeatureOptions),
       ];
     } finally {
-      await this.closeProbe(probe);
+      await this.closeProbe(probe, probeSessionId);
     }
   }
 
   async listImportableSessions(
     options?: ListImportableSessionsOptions,
   ): Promise<ImportableProviderSession[]> {
-    const probe = await this.spawnProcess(PROBE_ENV);
+    const history = new ACPImportHistoryCollector();
+    const probe = await this.spawnProcess(PROBE_ENV, {
+      client: this.buildProbeClient((params) => history.accept(params)),
+    });
     try {
       if (!probe.initialize.agentCapabilities?.sessionCapabilities?.list) {
         return [];
       }
 
       const sessions: ImportableProviderSession[] = [];
-      const scanLimit = Math.min(options?.scanLimit ?? options?.limit ?? 500, 500);
+      const resultLimit = options?.limit ?? Number.POSITIVE_INFINITY;
+      const scanLimit = Math.min(options?.scanLimit ?? 500, 500);
+      const canLoadHistory = probe.initialize.agentCapabilities.loadSession === true;
+      const historyDeadline = this.now() + ACP_IMPORT_HISTORY_BUDGET_MS;
+      let scanned = 0;
       let cursor: string | null | undefined;
       for (;;) {
         const page: ListSessionsResponse = await this.runACPRequest(() =>
           probe.connection.listSessions(acpSessionListRequest(cursor, options?.cwd)),
         );
         for (const session of page.sessions) {
-          sessions.push({
-            providerHandleId: session.sessionId,
-            cwd: session.cwd,
-            title: session.title ?? null,
-            firstPromptPreview: null,
-            lastPromptPreview: null,
-            lastActivityAt: session.updatedAt ? new Date(session.updatedAt) : new Date(0),
-          });
+          if (scanned >= scanLimit || sessions.length >= resultLimit) break;
+          scanned += 1;
+          const descriptor = await this.describeImportableSession(
+            probe,
+            history,
+            session,
+            canLoadHistory,
+            historyDeadline,
+          );
+          if (descriptor) sessions.push(descriptor);
         }
         cursor = page.nextCursor ?? null;
         if (!cursor) break;
-        if (sessions.length >= scanLimit) break;
+        if (scanned >= scanLimit || sessions.length >= resultLimit) break;
       }
 
-      return typeof options?.limit === "number" ? sessions.slice(0, options.limit) : sessions;
+      return sessions;
     } finally {
       await this.closeProbe(probe);
     }
   }
 
+  private async describeImportableSession(
+    probe: SpawnedACPProcess,
+    history: ACPImportHistoryCollector,
+    session: ListSessionsResponse["sessions"][number],
+    canLoadHistory: boolean,
+    historyDeadline: number,
+  ): Promise<ImportableProviderSession | null> {
+    const loadedPreviews = canLoadHistory
+      ? await this.loadImportPromptPreviews(probe, history, session, historyDeadline)
+      : null;
+    if (loadedPreviews?.hasConversation === false) return null;
+    return {
+      providerHandleId: session.sessionId,
+      cwd: session.cwd,
+      title: session.title ?? null,
+      firstPromptPreview: loadedPreviews?.firstPromptPreview ?? null,
+      lastPromptPreview: loadedPreviews?.lastPromptPreview ?? null,
+      lastActivityAt: session.updatedAt ? new Date(session.updatedAt) : new Date(0),
+    };
+  }
+
+  private async loadImportPromptPreviews(
+    probe: SpawnedACPProcess,
+    history: ACPImportHistoryCollector,
+    session: ListSessionsResponse["sessions"][number],
+    historyDeadline: number,
+  ): Promise<ACPImportPromptPreviews | null> {
+    const updatedAt = session.updatedAt ?? null;
+    const cached = this.importPromptCache.get(session.sessionId);
+    if (updatedAt !== null && cached?.updatedAt === updatedAt) {
+      return {
+        firstPromptPreview: cached.firstPromptPreview,
+        lastPromptPreview: cached.lastPromptPreview,
+        hasConversation: cached.hasConversation,
+      };
+    }
+
+    const remainingMs = historyDeadline - this.now();
+    if (remainingMs <= 0) return null;
+    const loadTimeoutMs = Math.min(ACP_IMPORT_HISTORY_LOAD_TIMEOUT_MS, remainingMs);
+
+    history.begin(session.sessionId);
+    try {
+      await withTimeout(
+        this.runACPRequest(() =>
+          probe.connection.loadSession({
+            sessionId: session.sessionId,
+            cwd: session.cwd,
+            mcpServers: [],
+          }),
+        ),
+        loadTimeoutMs,
+        `ACP import history load timed out after ${loadTimeoutMs}ms`,
+      );
+      const previews = history.finish(session.sessionId);
+      if (updatedAt !== null) {
+        this.importPromptCache.set(session.sessionId, { updatedAt, ...previews });
+      }
+      return previews;
+    } catch (error) {
+      history.discard(session.sessionId);
+      this.logger.debug(
+        { err: error, sessionId: session.sessionId },
+        "ACP import history load failed; keeping the session visible",
+      );
+      return null;
+    } finally {
+      await this.closeLoadedSession(probe, session.sessionId, historyDeadline);
+    }
+  }
+
+  private async closeLoadedSession(
+    probe: SpawnedACPProcess,
+    sessionId: string,
+    historyDeadline: number,
+  ): Promise<void> {
+    if (!probe.initialize.agentCapabilities?.sessionCapabilities?.close) return;
+    const remainingMs = historyDeadline - this.now();
+    if (remainingMs <= 0) return;
+    const closeTimeoutMs = Math.min(ACP_PROBE_CLOSE_TIMEOUT_MS, remainingMs);
+    try {
+      await withTimeout(
+        probe.connection.unstable_closeSession({ sessionId }),
+        closeTimeoutMs,
+        `ACP loaded session/close timed out after ${closeTimeoutMs}ms`,
+      );
+    } catch (error) {
+      this.logger.debug({ err: error, sessionId }, "ACP loaded session close failed");
+    }
+  }
+
   async importSession(input: ImportProviderSessionInput, context: ImportProviderSessionContext) {
     return importSessionFromPersistence({
       provider: this.provider,
@@ -1106,10 +1365,12 @@ export class ACPAgentClient implements AgentClient {
     launchEnv?: Record<string, string>,
     options?: {
       initializeTimeoutMs?: number;
+      providerOptions?: Record<string, unknown>;
       onSpawned?: (probe: UninitializedACPProcess) => void;
+      client?: ACPClient;
     },
   ): Promise<SpawnedACPProcess> {
-    const transport = await this.spawnTransport(launchEnv);
+    const transport = await this.spawnTransport(launchEnv, options?.client);
     const probe: UninitializedACPProcess = {
       child: transport.child,
       connection: transport.connection,
@@ -1117,7 +1378,11 @@ export class ACPAgentClient implements AgentClient {
     };
     options?.onSpawned?.(probe);
     try {
-      const initialize = await this.initializeTransport(transport, options?.initializeTimeoutMs);
+      const initialize = await this.initializeTransport(
+        transport,
+        options?.initializeTimeoutMs,
+        options?.providerOptions,
+      );
       const initializedProbe: SpawnedACPProcess = {
         ...probe,
         initialize,
@@ -1130,7 +1395,10 @@ export class ACPAgentClient implements AgentClient {
     }
   }
 
-  protected async spawnTransport(launchEnv?: Record<string, string>): Promise<ACPProcessTransport> {
+  protected async spawnTransport(
+    launchEnv?: Record<string, string>,
+    client: ACPClient = this.buildProbeClient(),
+  ): Promise<ACPProcessTransport> {
     const { command, args } = await this.resolveLaunchCommand();
     const child = spawnProcess(command, args, {
       cwd: process.cwd(),
@@ -1147,12 +1415,7 @@ export class ACPAgentClient implements AgentClient {
       stderrChunks.push(chunk.toString());
     });
 
-    const spawnErrorPromise = new Promise<never>((_, reject) => {
-      child.once("error", (error) => {
-        const stderr = stderrChunks.join("").trim();
-        reject(new Error(stderr ? `${String(error)}\n${stderr}` : String(error)));
-      });
-    });
+    const spawnErrorPromise = rejectOnSpawnError(child, stderrChunks);
     const spawnReadyPromise = new Promise<void>((resolve) => {
       child.once("spawn", () => {
         resolve();
@@ -1164,7 +1427,7 @@ export class ACPAgentClient implements AgentClient {
       Readable.toWeb(child.stdout),
       { logger: this.logger, provider: this.provider },
     );
-    const connection = new ClientSideConnection(() => this.buildProbeClient(), stream);
+    const connection = new ClientSideConnection(() => client, stream);
 
     return {
       child,
@@ -1178,7 +1441,9 @@ export class ACPAgentClient implements AgentClient {
   protected async initializeTransport(
     transport: ACPProcessTransport,
     initializeTimeoutMs?: number,
+    providerOptions?: Record<string, unknown>,
   ): Promise<InitializeResponse> {
+    const configuredOptions = ACPProviderOptionsSchema.parse(providerOptions ?? {});
     let timeout: ReturnType<typeof setTimeout> | null = null;
     const initializeTimeoutPromise = initializeTimeoutMs
       ? new Promise<never>((_, reject) => {
@@ -1195,7 +1460,7 @@ export class ACPAgentClient implements AgentClient {
             protocolVersion: PROTOCOL_VERSION,
             clientCapabilities: buildACPClientCapabilities(
               this.clientCapabilityMeta,
-              this.clientCapabilities,
+              configuredOptions.clientCapabilities ?? this.clientCapabilities,
             ),
             clientInfo: { name: "Paseo", version: "dev" },
           }),
@@ -1210,12 +1475,16 @@ export class ACPAgentClient implements AgentClient {
     }
   }
 
-  protected buildProbeClient(): ACPClient {
+  protected buildProbeClient(
+    onSessionUpdate?: (params: SessionNotification) => void | Promise<void>,
+  ): ACPClient {
     return {
       async requestPermission(): Promise<RequestPermissionResponse> {
         return { outcome: { outcome: "cancelled" } };
       },
-      async sessionUpdate(): Promise<void> {},
+      async sessionUpdate(params): Promise<void> {
+        await onSessionUpdate?.(params);
+      },
       async readTextFile(params: ReadTextFileRequest) {
         const content = await fs.readFile(params.path, "utf8");
         return { content };
@@ -1231,11 +1500,20 @@ export class ACPAgentClient implements AgentClient {
     };
   }
 
-  protected async closeProbe(probe: UninitializedACPProcess): Promise<void> {
+  protected async closeProbe(
+    probe: UninitializedACPProcess,
+    sessionId: string | null = null,
+  ): Promise<void> {
     try {
-      if (probe.initialize?.agentCapabilities?.sessionCapabilities?.close) {
-        // No active session to close here; ignore capability.
+      if (sessionId && probe.initialize?.agentCapabilities?.sessionCapabilities?.close) {
+        await withTimeout(
+          probe.connection.unstable_closeSession({ sessionId }),
+          ACP_PROBE_CLOSE_TIMEOUT_MS,
+          `ACP probe session/close timed out after ${ACP_PROBE_CLOSE_TIMEOUT_MS}ms`,
+        );
       }
+    } catch (error) {
+      this.logger.debug({ err: error, sessionId }, "ACP probe closeSession failed during cleanup");
     } finally {
       await terminateChildProcess(probe.child, 2_000, this.terminateProcess);
     }
@@ -1259,6 +1537,8 @@ export class ACPAgentClient implements AgentClient {
     const phaseTimeoutMs = options.phaseTimeoutMs ?? ACP_DIAGNOSTIC_PHASE_TIMEOUT_MS;
     const cwd = options.cwd ?? homedir();
     let transport: ACPProcessTransport | null = null;
+    let initialize: InitializeResponse | null = null;
+    let probeSessionId: string | null = null;
 
     try {
       const spawnStartedAt = Date.now();
@@ -1284,7 +1564,7 @@ export class ACPAgentClient implements AgentClient {
 
       const initializeStartedAt = Date.now();
       try {
-        await this.initializeTransport(activeTransport, phaseTimeoutMs);
+        initialize = await this.initializeTransport(activeTransport, phaseTimeoutMs);
         rows.push({
           label: "ACP initialize",
           value: `ok (${formatDurationMs(initializeStartedAt)})`,
@@ -1310,6 +1590,7 @@ export class ACPAgentClient implements AgentClient {
           phaseTimeoutMs,
           `ACP session/new timed out after ${phaseTimeoutMs}ms`,
         );
+        probeSessionId = response.sessionId;
         const transformed = this.transformSessionResponse(response);
         const models = deriveModelDefinitionsFromACP(
           this.provider,
@@ -1342,7 +1623,15 @@ export class ACPAgentClient implements AgentClient {
       if (transport) {
         const cleanupStartedAt = Date.now();
         try {
-          await terminateChildProcess(transport.child, 2_000, this.terminateProcess);
+          await this.closeProbe(
+            {
+              child: transport.child,
+              connection: transport.connection,
+              stderrChunks: transport.stderrChunks,
+              ...(initialize ? { initialize } : {}),
+            },
+            probeSessionId,
+          );
           rows.push({
             label: "ACP cleanup",
             value: `ok (${formatDurationMs(cleanupStartedAt)})`,
@@ -1408,6 +1697,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     configOptions: SessionConfigOption[],
   ) => SessionConfigOption[];
   private readonly configFeatureOptions: ACPConfigFeatureOption[];
+  private readonly configuredModelIds: ReadonlySet<string>;
   private readonly clientCapabilities?: ACPClientCapabilities;
   private readonly clientCapabilityMeta?: ACPClientCapabilityMeta;
   private readonly modeIdTransformer?: (modeId: string) => string | null;
@@ -1433,12 +1723,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
   private readonly terminalEntries = new Map<string, TerminalEntry>();
   private readonly persistedHistory: AgentTimelineItem[] = [];
   private readonly initialHandle?: AgentPersistenceHandle;
+  private readonly resumePurpose: AgentResumePurpose;
 
   private readonly config: AgentSessionConfig;
   private child: ChildProcessWithoutNullStreams | null = null;
   private connection: ClientSideConnection | null = null;
   private agentCapabilities: ACPAgentCapabilities | null = null;
   private sessionId: string | null = null;
+  private readonly earlySessionUpdates: SessionNotification[] = [];
   private currentMode: string | null = null;
   private availableModes: AgentMode[];
   private currentModel: string | null = null;
@@ -1474,6 +1766,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.sessionResponseTransformer = options.sessionResponseTransformer;
     this.configOptionsTransformer = options.configOptionsTransformer;
     this.configFeatureOptions = options.configFeatureOptions ?? [];
+    this.configuredModelIds = new Set(options.configuredModelIds);
     this.clientCapabilities = options.clientCapabilities;
     this.clientCapabilityMeta = options.clientCapabilityMeta;
     this.modeIdTransformer = options.modeIdTransformer;
@@ -1485,6 +1778,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.agentId = options.agentId;
     this.launchEnv = options.launchEnv;
     this.initialHandle = options.handle;
+    this.resumePurpose = options.resumePurpose ?? "interactive";
     this.config = { ...config, provider: options.provider };
     this.currentMode = config.modeId ?? null;
     this.currentModel = config.model ?? null;
@@ -1515,6 +1809,9 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       this.sessionId = response.sessionId;
       this.bootstrapThreadEventPending = true;
       this.applySessionState(response);
+      for (const update of this.earlySessionUpdates.splice(0)) {
+        await this.sessionUpdate(update);
+      }
       await this.applyConfiguredOverrides();
     } catch (error) {
       await this.closeAfterInitializationFailure(error);
@@ -1780,8 +2077,9 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     }
 
     const context = this.createProviderModeWriterContext(modeId, selection);
-    const providerResult = this.providerModeWriter
-      ? await this.providerModeWriter(context)
+    const providerModeWriter = this.providerModeWriter;
+    const providerResult = providerModeWriter
+      ? await this.runACPRequest(() => providerModeWriter(context))
       : { handled: false };
     if (providerResult.handled) {
       this.currentMode = providerResult.currentModeId ?? modeId;
@@ -1826,15 +2124,17 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       }
     }
 
-    if (this.beforeModeWriter) {
-      const beforeResult = await this.beforeModeWriter(context);
+    const beforeModeWriter = this.beforeModeWriter;
+    if (beforeModeWriter) {
+      const beforeResult = await this.runACPRequest(() => beforeModeWriter(context));
       if (beforeResult?.configOptions) {
         this.configOptions = this.transformConfigOptions(beforeResult.configOptions);
       }
     }
 
     if (selection.hasAvailableModes) {
-      await this.connection.setSessionMode({ sessionId: this.sessionId, modeId });
+      const { connection, sessionId } = this;
+      await this.runACPRequest(() => connection.setSessionMode({ sessionId, modeId }));
       this.currentMode = modeId;
       this.pushEvent({
         type: "mode_changed",
@@ -1850,11 +2150,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       throw new Error(`${this.provider} does not expose ACP mode switching`);
     }
 
-    const response = await this.connection.setSessionConfigOption({
-      sessionId: this.sessionId,
-      configId: modeOption.id,
-      value: modeId,
-    });
+    const { connection, sessionId } = this;
+    const response = await this.runACPRequest(() =>
+      connection.setSessionConfigOption({
+        sessionId,
+        configId: modeOption.id,
+        value: modeId,
+      }),
+    );
     this.currentMode = this.applyConfigOptionResponse({
       response,
       configId: modeOption.id,
@@ -1898,12 +2201,20 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       return;
     }
 
+    await this.setModelWithSelection({ modelId, selection: this.resolveModelSelection(modelId) });
+  }
+
+  private resolveModelSelection(modelId: string): ACPModelSelection {
     const selection = resolveACPModelSelection({
       modelId,
       availableModels: this.availableModels,
       configOptions: this.configOptions,
     });
-    await this.setModelWithSelection({ modelId, selection });
+    if (selection.availableModel || !this.configuredModelIds.has(modelId)) {
+      return selection;
+    }
+    // A model the user added in provider config is applied even when the agent does not advertise it.
+    return { ...selection, availableModel: { modelId, name: modelId } };
   }
 
   private async setModelWithSelection({
@@ -1917,21 +2228,20 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       throw new Error("ACP session not initialized");
     }
 
-    if (selection.hasAvailableModels) {
-      if (!selection.availableModel) {
-        this.warnInvalidSelection(
-          modelId,
-          `is not a valid ${this.provider} model. Available options: ${this.availableModels
-            ?.map((model) => model.modelId)
-            .join(", ")}`,
-        );
-        return;
-      }
-
-      if (typeof this.connection.unstable_setSessionModel !== "function") {
-        throw new Error(this.modelSelectionUnavailableMessage());
-      }
+    if (selection.hasAvailableModels && !selection.availableModel) {
+      this.warnInvalidSelection(
+        modelId,
+        `is not a valid ${this.provider} model. Available options: ${this.availableModels
+          ?.map((model) => model.modelId)
+          .join(", ")}`,
+      );
+      return;
+    }
 
+    if (
+      selection.availableModel &&
+      typeof this.connection.unstable_setSessionModel === "function"
+    ) {
       try {
         await this.connection.unstable_setSessionModel({
           sessionId: this.sessionId,
@@ -1965,11 +2275,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       return;
     }
 
-    const response = await this.connection.setSessionConfigOption({
-      sessionId: this.sessionId,
-      configId: modelOption.id,
-      value: modelId,
-    });
+    const { connection, sessionId } = this;
+    const response = await this.runACPRequest(() =>
+      connection.setSessionConfigOption({
+        sessionId,
+        configId: modelOption.id,
+        value: modelId,
+      }),
+    );
     this.currentModel = this.applyConfigOptionResponse({
       response,
       configId: modelOption.id,
@@ -1993,8 +2306,10 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       return;
     }
 
-    if (this.thinkingOptionWriter) {
-      await this.thinkingOptionWriter(this.connection, this.sessionId, thinkingOptionId);
+    const thinkingOptionWriter = this.thinkingOptionWriter;
+    if (thinkingOptionWriter) {
+      const { connection, sessionId } = this;
+      await this.runACPRequest(() => thinkingOptionWriter(connection, sessionId, thinkingOptionId));
       this.thinkingOptionId = thinkingOptionId;
       this.pushEvent({
         type: "thinking_option_changed",
@@ -2011,11 +2326,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     if (!option) {
       throw new Error(`${this.provider} does not expose ACP thought-level selection`);
     }
-    const response = await this.connection.setSessionConfigOption({
-      sessionId: this.sessionId,
-      configId: option.id,
-      value: thinkingOptionId,
-    });
+    const { connection, sessionId } = this;
+    const response = await this.runACPRequest(() =>
+      connection.setSessionConfigOption({
+        sessionId,
+        configId: option.id,
+        value: thinkingOptionId,
+      }),
+    );
     this.thinkingOptionId = this.applyConfigOptionResponse({
       response,
       configId: option.id,
@@ -2050,7 +2368,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
 
     const option = findSelectConfigFeatureOption(this.configOptions, featureOption);
     if (!option) {
-      throw new Error(`${this.provider} does not expose ACP feature '${featureId}'`);
+      throw new Error(this.featureUnavailableMessage(featureId));
     }
 
     const requestedValue = normalizeConfigFeatureValue(value);
@@ -2061,11 +2379,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       );
     }
 
-    const response = await this.connection.setSessionConfigOption({
-      sessionId: this.sessionId,
-      configId: option.id,
-      value: requestedValue,
-    });
+    const { connection, sessionId } = this;
+    const response = await this.runACPRequest(() =>
+      connection.setSessionConfigOption({
+        sessionId,
+        configId: option.id,
+        value: requestedValue,
+      }),
+    );
     const currentValue = this.applyConfigOptionResponse({
       response,
       configId: option.id,
@@ -2154,12 +2475,13 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     if (!this.sessionId) {
       return null;
     }
+    const { providerOptions: _providerOptions, ...persistedConfig } = this.config;
     return {
       provider: this.provider,
       sessionId: this.sessionId,
       nativeHandle: this.sessionId,
       metadata: {
-        ...this.config,
+        ...persistedConfig,
         title: this.currentTitle,
       },
     };
@@ -2170,10 +2492,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       return;
     }
 
-    for (const pending of this.pendingPermissions.values()) {
-      pending.resolve({ outcome: { outcome: "cancelled" } });
-    }
-    this.pendingPermissions.clear();
+    this.cancelPendingPermissions();
 
     if (this.activeForegroundTurnId) {
       await this.connection.cancel({ sessionId: this.sessionId });
@@ -2189,21 +2508,26 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.deliverTranslatedEvents(this.flushPendingUserMessage());
     this.settleCommandsReady();
 
-    for (const pending of this.pendingPermissions.values()) {
-      pending.resolve({ outcome: { outcome: "cancelled" } });
-    }
-    this.pendingPermissions.clear();
+    this.cancelPendingPermissions();
 
     if (this.connection && this.sessionId) {
       try {
         if (this.activeForegroundTurnId) {
-          await this.connection.cancel({ sessionId: this.sessionId });
+          await withTimeout(
+            this.connection.cancel({ sessionId: this.sessionId }),
+            ACP_CLOSE_REQUEST_TIMEOUT_MS,
+            `ACP cancel timed out after ${ACP_CLOSE_REQUEST_TIMEOUT_MS}ms`,
+          );
         }
       } catch {}
 
       try {
         if (this.agentCapabilities?.sessionCapabilities?.close) {
-          await this.connection.unstable_closeSession({ sessionId: this.sessionId });
+          await withTimeout(
+            this.connection.unstable_closeSession({ sessionId: this.sessionId }),
+            ACP_CLOSE_REQUEST_TIMEOUT_MS,
+            `ACP closeSession timed out after ${ACP_CLOSE_REQUEST_TIMEOUT_MS}ms`,
+          );
         }
       } catch (error) {
         this.logger.debug({ err: error }, "ACP closeSession failed during shutdown");
@@ -2284,6 +2608,10 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       },
       "provider.acp.raw_event",
     );
+    if (!this.sessionId) {
+      this.earlySessionUpdates.push(params);
+      return;
+    }
     if (params.sessionId !== this.sessionId) {
       return;
     }
@@ -2387,8 +2715,13 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       (params.env ?? []).map((entry: EnvVariable) => [entry.name, entry.value]),
     );
     const terminalCommand = resolveTerminalCommand(params.command, params.args);
+    // The terminal is a sibling of the agent process, not a child, so it inherits
+    // nothing from it. Carry the agent's launch environment the way spawnProcess
+    // does, keeping the requested terminal environment on top.
     const commandEnvOverlays =
-      terminalCommand.shell === false ? [env, createStringCommandShellEnvOverlay()] : [env];
+      terminalCommand.shell === false
+        ? [this.launchEnv, env, createStringCommandShellEnvOverlay()]
+        : [this.launchEnv, env];
     const child = spawnProcess(terminalCommand.command, terminalCommand.args, {
       cwd: params.cwd ?? this.config.cwd,
       ...createProviderEnvSpec({
@@ -2470,6 +2803,16 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     return {};
   }
 
+  // Loading an archived agent's history runs nothing in its working directory, which
+  // may have been removed with its worktree. session/load still names the original
+  // directory; only the process starts from the home directory.
+  private async resolveProcessCwd(): Promise<string> {
+    if (this.resumePurpose !== "history" || (await isDirectory(this.config.cwd))) {
+      return this.config.cwd;
+    }
+    return homedir();
+  }
+
   private async spawnProcess(): Promise<SpawnedACPProcess> {
     const prefix = await resolveProviderLaunch({
       commandConfig: this.runtimeSettings?.command,
@@ -2483,7 +2826,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     const command = prefix.command;
     const args = [...prefix.args, ...this.defaultCommand.slice(1)];
     const child = spawnProcess(command, args, {
-      cwd: this.config.cwd,
+      cwd: await this.resolveProcessCwd(),
       ...createProviderEnvSpec({
         runtimeSettings: this.runtimeSettings,
         overlays: [this.launchEnv],
@@ -2496,6 +2839,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     child.stderr.on("data", (chunk: Buffer | string) => {
       stderrChunks.push(chunk.toString());
     });
+    const spawnError = rejectOnSpawnError(child, stderrChunks);
     child.once("exit", (code, signal) => {
       if (this.closed) {
         return;
@@ -2523,14 +2867,17 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.child = child;
     this.connection = connection;
     const initialize = await this.runACPRequest(() =>
-      connection.initialize({
-        protocolVersion: PROTOCOL_VERSION,
-        clientCapabilities: buildACPClientCapabilities(
-          this.clientCapabilityMeta,
-          this.clientCapabilities,
-        ),
-        clientInfo: { name: "Paseo", version: "dev" },
-      }),
+      Promise.race([
+        connection.initialize({
+          protocolVersion: PROTOCOL_VERSION,
+          clientCapabilities: buildACPClientCapabilities(
+            this.clientCapabilityMeta,
+            this.clientCapabilities,
+          ),
+          clientInfo: { name: "Paseo", version: "dev" },
+        }),
+        spawnError,
+      ]),
     );
 
     return { child, connection, initialize };
@@ -2587,14 +2934,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       await this.setModeWithSelection({ modeId: configuredModeId, selection });
     }
     const configuredModelId = this.config.model;
+    let switchedModel = false;
     if (configuredModelId && configuredModelId !== this.currentModel) {
-      const selection = resolveACPModelSelection({
-        modelId: configuredModelId,
-        availableModels: this.availableModels,
-        configOptions: this.configOptions,
-      });
       try {
-        await this.setModelWithSelection({ modelId: configuredModelId, selection });
+        await this.setModelWithSelection({
+          modelId: configuredModelId,
+          selection: this.resolveModelSelection(configuredModelId),
+        });
+        switchedModel = true;
       } catch (error) {
         if (!this.isModelSelectionUnavailableError(error)) {
           throw error;
@@ -2613,10 +2960,39 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       if (!Object.prototype.hasOwnProperty.call(configuredFeatureValues, featureOption.id)) {
         continue;
       }
-      await this.setFeature(featureOption.id, configuredFeatureValues[featureOption.id]);
+      try {
+        await this.setFeature(featureOption.id, configuredFeatureValues[featureOption.id]);
+      } catch (error) {
+        if (!this.isStaleFeatureValueError(error, featureOption.id, switchedModel)) {
+          throw error;
+        }
+        this.logger.warn(
+          { err: error, featureId: featureOption.id, model: this.currentModel },
+          `${this.provider} cannot apply ACP feature '${featureOption.id}' to the current model; using the provider default`,
+        );
+      }
     }
   }
 
+  /**
+   * A stored feature value is a preference carried over from whichever model the user
+   * last configured, so the session it lands on may have no such option. Paseo's own
+   * guard says so when the session's options are accurate. A model switch answers with
+   * an empty response, leaving Paseo holding the previous model's options, and then the
+   * provider is the one that rejects the write as invalid params. Outside those two
+   * cases the write failed for a reason the user needs to see.
+   */
+  private isStaleFeatureValueError(
+    error: unknown,
+    featureId: string,
+    switchedModel: boolean,
+  ): boolean {
+    if (this.isFeatureUnavailableError(error, featureId)) {
+      return true;
+    }
+    return switchedModel && isACPInvalidParams(error);
+  }
+
   private warnInvalidSelection(value: string, message: string): void {
     this.logger.warn({ value }, message);
   }
@@ -2629,6 +3005,14 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     return error instanceof Error && error.message === this.modelSelectionUnavailableMessage();
   }
 
+  private featureUnavailableMessage(featureId: string): string {
+    return `${this.provider} does not expose ACP feature '${featureId}'`;
+  }
+
+  private isFeatureUnavailableError(error: unknown, featureId: string): boolean {
+    return error instanceof Error && error.message === this.featureUnavailableMessage(featureId);
+  }
+
   private translateSessionUpdate(update: SessionUpdate): AgentStreamEvent[] {
     if (update.sessionUpdate === "user_message_chunk") {
       return this.handleUserMessageChunk(update);
@@ -2841,8 +3225,29 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     }
   }
 
+  // ACP reports context occupancy out of band from the prompt response, so the
+  // composer's context meter cannot read it from `turn_completed`. Forward it as
+  // the same `usage_updated` snapshot the native adapters emit, preserving the
+  // turn usage this session already recorded. The guards match the meter's own
+  // validity rules, so a provider cannot push a window the meter would reject.
   private handleUsageUpdate(update: UsageUpdate): void {
-    void update;
+    const contextWindowMaxTokens =
+      Number.isFinite(update.size) && update.size > 0 ? update.size : undefined;
+    const contextWindowUsedTokens =
+      Number.isFinite(update.used) && update.used >= 0 ? update.used : undefined;
+    if (contextWindowMaxTokens === undefined || contextWindowUsedTokens === undefined) {
+      return;
+    }
+    this.pushEvent({
+      type: "usage_updated",
+      provider: this.provider,
+      usage: {
+        ...this.currentTurnUsage,
+        contextWindowMaxTokens,
+        contextWindowUsedTokens,
+      },
+      turnId: this.activeForegroundTurnId ?? undefined,
+    });
   }
 
   private handlePromptResponse(response: PromptResponse, turnId: string): void {
@@ -2940,6 +3345,11 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     event: Extract<AgentStreamEvent, { type: "turn_completed" | "turn_failed" | "turn_canceled" }>,
   ): void {
     this.deliverTranslatedEvents(this.flushPendingUserMessage());
+    // A turn that ends without completing leaves no way to answer its open
+    // permission requests, so tell the agent they were cancelled.
+    if (event.type !== "turn_completed") {
+      this.cancelPendingPermissions();
+    }
     this.activeForegroundTurnId = null;
     this.fallbackAssistantMessageId = null;
     if (this.submittedUserMessageTurnId === event.turnId) {
@@ -2948,6 +3358,13 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.pushEvent(event);
   }
 
+  private cancelPendingPermissions(): void {
+    for (const pending of this.pendingPermissions.values()) {
+      pending.resolve({ outcome: { outcome: "cancelled" } });
+    }
+    this.pendingPermissions.clear();
+  }
+
   private emitBootstrapThreadEvent(): void {
     if (!this.bootstrapThreadEventPending || !this.sessionId) {
       return;
@@ -3225,6 +3642,23 @@ function contentBlockToText(content: ContentBlock): string {
   }
 }
 
+function normalizeACPImportPromptPreview(text: string | null): string | null {
+  const normalized = text?.trim().replace(/\s+/g, " ") ?? "";
+  if (!normalized) return null;
+  return normalized.length > 160 ? normalized.slice(0, 160) : normalized;
+}
+
+function isACPConversationUpdate(update: SessionUpdate): boolean {
+  return (
+    update.sessionUpdate === "user_message_chunk" ||
+    update.sessionUpdate === "agent_message_chunk" ||
+    update.sessionUpdate === "agent_thought_chunk" ||
+    update.sessionUpdate === "tool_call" ||
+    update.sessionUpdate === "tool_call_update" ||
+    update.sessionUpdate === "plan"
+  );
+}
+
 function coalesceDefined<T>(next: T | undefined, previous: T | undefined, fallback: T): T {
   if (next !== undefined) {
     return next;
diff --git a/packages/server/src/server/agent/providers/acp-options.ts b/packages/server/src/server/agent/providers/acp-options.ts
new file mode 100644
index 0000000000..4f75456e38
--- /dev/null
+++ b/packages/server/src/server/agent/providers/acp-options.ts
@@ -0,0 +1,18 @@
+import { z } from "zod";
+
+export const ACPProviderOptionsSchema = z
+  .object({
+    supportsMcpServers: z.boolean().optional(),
+    clientCapabilities: z
+      .object({
+        fs: z
+          .object({
+            readTextFile: z.boolean().optional(),
+            writeTextFile: z.boolean().optional(),
+          })
+          .optional(),
+        terminal: z.boolean().optional(),
+      })
+      .optional(),
+  })
+  .passthrough();
diff --git a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
index 694c804e38..630bdbf0a6 100644
--- a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
@@ -313,4 +313,222 @@ describe("background Claude subagents", () => {
       },
     });
   });
+
+  test("keeps the Task card labeled when the child's frames arrive after its launch result", async () => {
+    // Claude Code answers a background Agent call at once ("Agent launched") and only then streams
+    // the child's frames, so they arrive after the parent's tool call has its result.
+    queryFactory.mockImplementation(() =>
+      buildQueryMock([
+        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+        {
+          type: "assistant",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_background",
+                name: "Agent",
+                input: {
+                  subagent_type: "general-purpose",
+                  description: "Count files here",
+                  prompt: "Run ls and reply with the number of entries.",
+                },
+              },
+            ],
+          },
+        },
+        {
+          type: "system",
+          subtype: "task_started",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          task_type: "local_agent",
+          subagent_type: "general-purpose",
+          description: "Count files here",
+          prompt: "Run ls and reply with the number of entries.",
+        },
+        {
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_background",
+                content: "Async agent launched successfully.",
+              },
+            ],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_ls",
+                name: "Bash",
+                input: { command: "ls -1", description: "List files" },
+              },
+            ],
+          },
+        },
+        {
+          type: "user",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            role: "user",
+            content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
+        },
+        {
+          type: "system",
+          subtype: "task_updated",
+          task_id: "bg-task",
+          patch: { status: "completed" },
+        },
+        {
+          type: "system",
+          subtype: "task_notification",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          status: "completed",
+        },
+        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+      ]),
+    );
+    const session = await new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+    const events = await collectUntilTerminal(streamSession(session, "delegate work"));
+    await session.close();
+
+    const rows: AgentTimelineRow[] = events
+      .filter((event) => event.type === "timeline")
+      .map((event, index) => ({
+        seq: index + 1,
+        timestamp: new Date(Date.UTC(2026, 9, 4, 0, 0, index)).toISOString(),
+        item: event.item,
+      }));
+    const cards = projectTimelineRows({ rows, mode: "projected" })
+      .map((entry) => entry.item)
+      .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
+
+    expect(cards).toHaveLength(1);
+    expect(cards[0]).toMatchObject({
+      status: "completed",
+      detail: {
+        type: "sub_agent",
+        subAgentType: "general-purpose",
+        description: "Count files here",
+      },
+    });
+  });
+
+  test.each([
+    {
+      source: "system task protocol",
+      notification: {
+        type: "system",
+        subtype: "task_notification",
+        task_id: "bash-task",
+        tool_use_id: "toolu_bash",
+        status: "completed",
+        summary: "sleep 2; printf NESTED_BACKGROUND_SENTINEL",
+      },
+    },
+    {
+      source: "queued user envelope",
+      notification: {
+        type: "user",
+        uuid: "bash-notification",
+        message: {
+          role: "user",
+          content:
+            "<task-notification>\n<task-id>bash-task</task-id>\n<tool-use-id>toolu_bash</tool-use-id>\n<status>completed</status>\n<summary>sleep 2; printf NESTED_BACKGROUND_SENTINEL</summary>\n</task-notification>",
+        },
+      },
+    },
+  ])(
+    "routes a child-owned background notification from $source to that child's timeline",
+    async ({ notification }) => {
+      queryFactory.mockImplementation(() =>
+        buildQueryMock([
+          { type: "system", subtype: "init", session_id: "nested-session" },
+          {
+            type: "system",
+            subtype: "task_started",
+            task_id: "direct-task",
+            tool_use_id: "toolu_direct",
+            task_type: "local_agent",
+            subagent_type: "general-purpose",
+            description: "Run a background command",
+            spawn_depth: 1,
+          },
+          {
+            type: "assistant",
+            parent_tool_use_id: "toolu_direct",
+            message: {
+              model: "claude-sonnet-5",
+              content: [
+                {
+                  type: "tool_use",
+                  id: "toolu_bash",
+                  name: "Bash",
+                  input: { command: "sleep 2; printf NESTED_BACKGROUND_SENTINEL" },
+                },
+              ],
+            },
+          },
+          {
+            type: "system",
+            subtype: "task_started",
+            task_id: "bash-task",
+            tool_use_id: "toolu_bash",
+            task_type: "local_bash",
+            owned_by_subagent: true,
+            is_backgrounded: true,
+          },
+          notification,
+          { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+        ]),
+      );
+      const session = await new ClaudeAgentClient({
+        logger: createTestLogger(),
+        queryFactory,
+        resolveBinary: async () => "/test/claude/bin",
+      }).createSession({ provider: "claude", cwd: process.cwd() });
+      const events = await collectUntilTerminal(streamSession(session, "delegate work"));
+      await session.close();
+
+      expect(
+        events.filter(
+          (event) =>
+            event.type === "timeline" &&
+            event.item.type === "tool_call" &&
+            event.item.name === "task_notification",
+        ),
+      ).toEqual([]);
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "provider_subagent",
+          event: expect.objectContaining({
+            type: "timeline",
+            id: "toolu_direct",
+            item: expect.objectContaining({ type: "tool_call", name: "task_notification" }),
+          }),
+        }),
+      );
+    },
+  );
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
new file mode 100644
index 0000000000..3008f3d4d5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
@@ -0,0 +1,133 @@
+import { createServer } from "node:http";
+import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+
+// Exercise the real Claude Code process against a local Messages API fixture.
+// The input counter's location is the only difference between the two backends.
+test.each([
+  { placement: "start", cacheTokens: 0 },
+  { placement: "delta", cacheTokens: 0 },
+  { placement: "start", cacheTokens: 1_000 },
+  { placement: "delta", cacheTokens: 1_000 },
+])(
+  "counts $placement input and $cacheTokens cached tokens through Claude Code",
+  async ({ placement, cacheTokens }) => {
+    const cwd = await mkdtemp(path.resolve(".claude-context-usage-"));
+    const configDir = path.join(cwd, "config");
+    await mkdir(configDir);
+    let requestCount = 0;
+    const server = createServer(async (request, response) => {
+      for await (const chunk of request) {
+        void chunk;
+      }
+      if (!request.url?.startsWith("/v1/messages")) {
+        response.writeHead(200, { "content-type": "application/json" });
+        response.end("{}");
+        return;
+      }
+      if (request.url.includes("count_tokens")) {
+        response.writeHead(200, { "content-type": "application/json" });
+        response.end(JSON.stringify({ input_tokens: 20_236 }));
+        return;
+      }
+      const inputTokens = 20_236 + requestCount++;
+      response.writeHead(200, { "content-type": "text/event-stream" });
+      const emit = (data: { type: string; [key: string]: unknown }) => {
+        response.write(`event: ${data.type}\ndata: ${JSON.stringify(data)}\n\n`);
+      };
+      emit({
+        type: "message_start",
+        message: {
+          id: `msg_context_usage_${requestCount}`,
+          type: "message",
+          role: "assistant",
+          model: "claude-sonnet-4-6",
+          content: [],
+          stop_reason: null,
+          stop_sequence: null,
+          usage: {
+            input_tokens: placement === "start" ? inputTokens : 0,
+            output_tokens: 0,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: cacheTokens,
+          },
+        },
+      });
+      emit({ type: "content_block_start", index: 0, content_block: { type: "text", text: "" } });
+      emit({ type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "hello" } });
+      emit({ type: "content_block_stop", index: 0 });
+      emit({
+        type: "message_delta",
+        delta: { stop_reason: "end_turn", stop_sequence: null },
+        usage: {
+          output_tokens: 64,
+          ...(placement === "delta" ? { input_tokens: inputTokens } : {}),
+        },
+      });
+      emit({ type: "message_stop" });
+      response.end();
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Fixture has no TCP address");
+    const client = new ClaudeAgentClient({
+      logger: pino({ level: "silent" }),
+      runtimeSettings: {
+        env: {
+          ANTHROPIC_BASE_URL: `http://127.0.0.1:${address.port}`,
+          ANTHROPIC_AUTH_TOKEN: "fixture-token",
+          ANTHROPIC_API_KEY: "",
+          CLAUDE_CONFIG_DIR: configDir,
+          CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+        },
+      },
+    });
+    const session = await client.createSession(
+      { provider: "claude", cwd, model: "claude-sonnet-4-6" },
+      undefined,
+      { persistSession: false },
+    );
+    try {
+      for (let turn = 0; turn < 2; turn++) {
+        const events = await collectSessionTurnEvents(session, "say hello", {
+          signal: AbortSignal.timeout(20_000),
+        });
+        const expectedTokens = 20_236 + turn + cacheTokens + 64;
+        expect(events).toContainEqual(
+          expect.objectContaining({
+            type: "turn_completed",
+            usage: expect.objectContaining({
+              inputTokens: 20_236 + turn,
+              outputTokens: 64,
+              cachedInputTokens: cacheTokens,
+              contextWindowUsedTokens: expectedTokens,
+            }),
+          }),
+        );
+        expect(events).toContainEqual(
+          expect.objectContaining({
+            type: "usage_updated",
+            usage: expect.objectContaining({ contextWindowUsedTokens: expectedTokens }),
+          }),
+        );
+      }
+      expect(requestCount).toBe(2);
+    } finally {
+      try {
+        await session.close();
+      } finally {
+        try {
+          server.closeAllConnections();
+          await new Promise<void>((resolve) => server.close(() => resolve()));
+        } finally {
+          await rm(cwd, { recursive: true, force: true });
+        }
+      }
+    }
+  },
+  60_000,
+);
diff --git a/packages/server/src/server/agent/providers/claude/agent.env.test.ts b/packages/server/src/server/agent/providers/claude/agent.env.test.ts
index 642e562f61..0d2748fd62 100644
--- a/packages/server/src/server/agent/providers/claude/agent.env.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.env.test.ts
@@ -31,6 +31,7 @@ function createQueryMock(events: unknown[]): Query {
 describe("Claude SDK env", () => {
   test("forwards launch-context env through Claude process env", async () => {
     let capturedEnv: Record<string, string | undefined> | undefined;
+    let capturedPerTaskStopAffordance: boolean | undefined;
     const launchContext: AgentLaunchContext = {
       env: {
         PASEO_AGENT_ID: "00000000-0000-4000-8000-000000000201",
@@ -39,6 +40,7 @@ describe("Claude SDK env", () => {
     };
     const queryFactory = vi.fn(({ options }: ClaudeQueryInput) => {
       capturedEnv = options.env;
+      capturedPerTaskStopAffordance = options.perTaskStopAffordance;
       return createQueryMock([
         {
           type: "system",
@@ -90,8 +92,14 @@ describe("Claude SDK env", () => {
       expect(capturedEnv?.PASEO_TEST_FLAG).toBe(launchContext.env?.PASEO_TEST_FLAG);
       expect(capturedEnv?.MCP_TIMEOUT).toBe("claude-startup-timeout");
       expect(capturedEnv?.MCP_TOOL_TIMEOUT).toBe("claude-tool-timeout");
+      expect(session.usageSession?.()?.env).toBe(capturedEnv);
+      // Paseo reads session_state_changed to know when an autonomous turn is over.
+      expect(capturedEnv?.CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS).toBe("1");
+      // Without it, Stop and replace kill every background subagent along with the turn.
+      expect(capturedPerTaskStopAffordance).toBe(true);
     } finally {
       await session.close();
+      expect(session.usageSession?.()).toBeNull();
     }
   });
 
@@ -150,12 +158,19 @@ describe("Claude SDK env", () => {
     );
 
     try {
+      const descriptor = session.usageSession?.();
+      expect(descriptor?.env.PASEO_TEST_FLAG).toBe("resume-launch-value");
+      expect(descriptor?.sessionKey).toEqual(expect.any(String));
+      expect(queryFactory).not.toHaveBeenCalled();
       const result = await session.run("resume env check");
+      expect(session.usageSession?.()?.sessionKey).toBe(descriptor?.sessionKey);
+      expect(capturedEnv).toBe(descriptor?.env);
       expect(result.sessionId).toBe("persisted-session");
       expect(capturedEnv?.PASEO_AGENT_ID).toBe(launchContext.env?.PASEO_AGENT_ID);
       expect(capturedEnv?.PASEO_TEST_FLAG).toBe(launchContext.env?.PASEO_TEST_FLAG);
     } finally {
       await session.close();
+      expect(session.usageSession?.()).toBeNull();
     }
   });
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts b/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts
new file mode 100644
index 0000000000..50d9c56ab5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts
@@ -0,0 +1,118 @@
+import { chmodSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import pino from "pino";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+
+import { ClaudeAgentClient } from "./agent.js";
+import { claudeProjectDirSync } from "./project-dir.js";
+
+/**
+ * A resumed Claude agent whose transcript is missing or unreadable opens with an empty timeline.
+ * The daemon log at its default level has to say which, and where it looked.
+ */
+
+const SESSION_ID = "history-load-session";
+
+interface LogRecord {
+  level: number;
+  msg: string;
+  sessionId?: string;
+  historyPath?: string;
+  err?: { message?: string };
+}
+
+describe("ClaudeAgentSession persisted history load", () => {
+  let tempRoot: string;
+  let cwd: string;
+  let configDir: string;
+  let records: LogRecord[];
+
+  async function resume(): Promise<void> {
+    const client = new ClaudeAgentClient({
+      logger: pino({ level: "info" }, { write: (line: string) => records.push(JSON.parse(line)) }),
+      queryFactory: vi.fn(() => {
+        throw new Error("history load must not start a query");
+      }),
+      resolveVersion: async () => "2.1.220",
+    });
+    const session = await client.resumeSession(
+      { provider: "claude", sessionId: SESSION_ID },
+      { cwd },
+    );
+    await session.close();
+  }
+
+  function transcriptPath(): string {
+    return path.join(claudeProjectDirSync(cwd, { configDir }), `${SESSION_ID}.jsonl`);
+  }
+
+  beforeEach(() => {
+    tempRoot = mkdtempSync(path.join(os.tmpdir(), "claude-history-load-"));
+    cwd = path.join(tempRoot, "repo");
+    configDir = path.join(tempRoot, "claude-config");
+    mkdirSync(cwd, { recursive: true });
+    vi.stubEnv("CLAUDE_CONFIG_DIR", configDir);
+    records = [];
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs();
+    rmSync(tempRoot, { recursive: true, force: true });
+  });
+
+  test("logs the resolved transcript path when the transcript does not exist", async () => {
+    await resume();
+
+    expect(records).toContainEqual(
+      expect.objectContaining({
+        level: pino.levels.values.info,
+        msg: "No Claude transcript to load history from",
+        sessionId: SESSION_ID,
+        historyPath: transcriptPath(),
+      }),
+    );
+  });
+
+  test("logs a warning with the error when the transcript cannot be read", async () => {
+    // A directory at the transcript path exists but cannot be read as a file.
+    mkdirSync(transcriptPath(), { recursive: true });
+
+    await resume();
+
+    expect(records).toContainEqual(
+      expect.objectContaining({
+        level: pino.levels.values.warn,
+        msg: "Failed to load Claude history from transcript",
+        sessionId: SESSION_ID,
+        historyPath: transcriptPath(),
+        err: expect.objectContaining({ message: expect.stringContaining("EISDIR") }),
+      }),
+    );
+  });
+
+  // chmod does not remove read access on Windows, or for root.
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "logs a warning with the error when Claude's project folders cannot be listed",
+    async () => {
+      // The transcript is not under cwd's folder, so the lookup lists the other project folders.
+      mkdirSync(path.join(configDir, "projects"), { recursive: true });
+      chmodSync(path.join(configDir, "projects"), 0o000);
+
+      try {
+        await resume();
+      } finally {
+        chmodSync(path.join(configDir, "projects"), 0o755);
+      }
+
+      expect(records).toContainEqual(
+        expect.objectContaining({
+          level: pino.levels.values.warn,
+          msg: "Failed to load Claude history from transcript",
+          sessionId: SESSION_ID,
+          err: expect.objectContaining({ message: expect.stringContaining("EACCES") }),
+        }),
+      );
+    },
+  );
+});
diff --git a/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts b/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
index dada35945c..02a09ba44b 100644
--- a/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
@@ -91,6 +91,17 @@ function buildUsage() {
   };
 }
 
+/** Claude opening a turn of its own. Every main-session turn starts with one. */
+function buildTurnInit(sessionId: string) {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: sessionId,
+    permissionMode: "default",
+    model: "opus",
+  };
+}
+
 function buildSuccessResult(sessionId: string) {
   return {
     type: "result",
@@ -153,13 +164,7 @@ function createScriptedQuery(params: {
     },
   } satisfies ScriptedQuery;
 
-  scriptedQuery.emit({
-    type: "system",
-    subtype: "init",
-    session_id: params.sessionId,
-    permissionMode: "default",
-    model: "opus",
-  });
+  scriptedQuery.emit(buildTurnInit(params.sessionId));
 
   void (async () => {
     for await (const prompt of params.prompt) {
@@ -252,6 +257,21 @@ async function waitFor(
   }
 }
 
+/**
+ * Paseo interrupts Claude only while a main-session turn is in flight, which it learns from the
+ * init. The pump asks for its next frame only after routing the last one, so a second next() call
+ * proves the init was read.
+ */
+async function waitForInitRouted(
+  query: () => { next: ReturnType<typeof vi.fn> } | null | undefined,
+) {
+  await waitFor(() => (query()?.next.mock.calls.length ?? 0) >= 2);
+}
+
+function buildCommandLifecycle(commandUuid: string | null | undefined, state: string) {
+  return { type: "command_lifecycle", command_uuid: commandUuid, state };
+}
+
 afterEach(() => {
   queryFactory.mockReset();
 });
@@ -282,6 +302,7 @@ test("interrupt only calls query.interrupt and leaves the query open", async ()
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
   await waitFor(() => queries[0]?.prompts.length === 1);
+  await waitForInitRouted(() => queries[0]);
 
   await session.interrupt();
   await waitFor(() => queries[0]?.interrupt.mock.calls.length === 1);
@@ -322,6 +343,7 @@ async function startSteeredTurn(sessionId: string): Promise<{
     throw new Error("Expected the original Claude turn to start");
   }
   await waitFor(() => query?.prompts.length === 1);
+  await waitForInitRouted(() => query);
 
   const steered = await session.steerActiveTurn!("queued steer", {
     expectedTurnId: start.value.turnId,
@@ -371,11 +393,8 @@ test("interrupt still stops the turn when Claude has already dequeued the steer"
 test("a steer Claude has already read is no longer discardable on interrupt", async () => {
   const { session, query, turn } = await startSteeredTurn("queued-steer-completed-session");
 
-  query()?.emit({
-    type: "command_lifecycle",
-    command_uuid: query()?.prompts[1]?.uuid,
-    state: "completed",
-  });
+  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
+  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "completed"));
   // Frames are translated in order, so the marker landing proves the lifecycle frame was read.
   query()?.emit({ type: "assistant", message: { content: "STEER_READ" } });
   await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_READ"));
@@ -388,6 +407,23 @@ test("a steer Claude has already read is no longer discardable on interrupt", as
   await session.close();
 });
 
+test("a steer Claude cancelled is no longer withdrawn on interrupt", async () => {
+  const { session, query, turn } = await startSteeredTurn("queued-steer-cancelled-session");
+
+  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
+  // "cancelled" is terminal: API errors, interrupts and "now" pre-emption all end a message.
+  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "cancelled"));
+  query()?.emit({ type: "assistant", message: { content: "STEER_CANCELLED" } });
+  await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_CANCELLED"));
+
+  await session.interrupt();
+  await waitFor(() => query()?.interrupt.mock.calls.length === 1);
+
+  expect(query()?.cancelAsyncMessage).not.toHaveBeenCalled();
+  await collectUntilTerminal(turn);
+  await session.close();
+});
+
 function buildStoppedTaskNotification(sessionId: string) {
   return {
     type: "system",
@@ -473,6 +509,7 @@ async function startInterruptedToolTurn(sessionId: string): Promise<{
   const turn = streamSession(session, "run the slow tool");
   await turn.next();
   await waitFor(() => query?.prompts.length === 1);
+  await waitForInitRouted(() => query);
 
   await session.interrupt();
   await collectUntilTerminal(turn);
@@ -523,6 +560,7 @@ test("Claude can still wake into an autonomous turn once the interrupted request
 
   query()?.emit(buildStoppedTaskNotification(sessionId));
   query()?.emit(buildAbortedResult(sessionId));
+  query()?.emit(buildTurnInit(sessionId));
   query()?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -579,6 +617,7 @@ test("reuses the existing query after interrupt before starting the next prompt"
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
   await waitFor(() => queries[0]?.prompts.length === 1);
+  await waitForInitRouted(() => queries[0]);
 
   await session.interrupt();
   await collectUntilTerminal(firstTurn);
@@ -652,6 +691,7 @@ test("recovers when the query pump sees a single interrupt abort before the next
   const output = createAsyncQueue<Record<string, unknown>>();
   const prompts: PromptRecord[] = [];
   let throwAbortOnNext = false;
+  let queryRef: Pick<ScriptedQuery, "next"> | null = null;
 
   queryFactory.mockImplementation(({ prompt }: { prompt: AsyncIterable<unknown> }) => {
     const scriptedQuery = {
@@ -685,13 +725,8 @@ test("recovers when the query pump sees a single interrupt abort before the next
       },
     } satisfies ScriptedQuery;
 
-    scriptedQuery.emit({
-      type: "system",
-      subtype: "init",
-      session_id: "interrupt-abort-recovery-session",
-      permissionMode: "default",
-      model: "opus",
-    });
+    queryRef = scriptedQuery;
+    scriptedQuery.emit(buildTurnInit("interrupt-abort-recovery-session"));
 
     void (async () => {
       for await (const promptMessage of prompt) {
@@ -730,6 +765,7 @@ test("recovers when the query pump sees a single interrupt abort before the next
 
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
+  await waitForInitRouted(() => queryRef);
   await session.interrupt();
   await collectUntilTerminal(firstTurn);
 
@@ -768,6 +804,7 @@ test("stale abort result after replacement start does not poison the new foregro
   const firstTurn = streamSession(session, "first prompt");
   const firstStarted = await firstTurn.next();
   await waitFor(() => queryRef?.prompts.length === 1);
+  await waitForInitRouted(() => queryRef);
 
   await session.interrupt();
   const firstTurnEvents = [firstStarted.value!, ...(await collectUntilTerminal(firstTurn))];
@@ -812,7 +849,7 @@ test("stale abort result after replacement start does not poison the new foregro
   await session.close();
 });
 
-test("creates an autonomous live turn when assistant output arrives without a foreground run", async () => {
+test("creates an autonomous live turn when Claude starts a turn without a foreground run", async () => {
   const logger = createTestLogger();
   let queryRef: ScriptedQuery | null = null;
 
@@ -848,6 +885,7 @@ test("creates an autonomous live turn when assistant output arrives without a fo
   await collectUntilTerminal(streamSession(session, "seed prompt"));
 
   const subscribedEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-live-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -916,6 +954,7 @@ test("steers an autonomous turn through its existing query without restarting it
 
   await collectUntilTerminal(streamSession(session, "seed prompt"));
   const autonomousEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-steer-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_RESPONSE" },
@@ -999,6 +1038,7 @@ test("auto-completes an open autonomous turn when a foreground prompt starts", a
   await collectUntilTerminal(streamSession(session, "seed prompt"));
 
   const subscribedEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-handoff-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "BACKGROUND_ONLY_RESPONSE" },
diff --git a/packages/server/src/server/agent/providers/claude/agent.nested-subagent-ownership.real.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.nested-subagent-ownership.real.e2e.test.ts
new file mode 100644
index 0000000000..af66ba9ac8
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.nested-subagent-ownership.real.e2e.test.ts
@@ -0,0 +1,149 @@
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import pino from "pino";
+import { expect, test } from "vitest";
+
+import type { AgentStreamEvent } from "../../agent-sdk-types.js";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+
+const ROOT_PROMPT = `You are ROOT_OWNER. Use Claude Code's native Agent tool exactly once, never Paseo tools.
+Name the agent direct_owner and give it this complete task:
+
+You are DIRECT_OWNER. Use Claude Code's native Agent tool exactly once. Name that agent nested_owner and give it this complete task:
+You are NESTED_OWNER. Use Bash exactly once to run \`sleep 2; printf 'NESTED_BACKGROUND_SENTINEL\\n'\` with run_in_background true. Use TaskOutput with block true to wait for the Bash task, verify its exit code is 0 and output is NESTED_BACKGROUND_SENTINEL, and wait for its completion notification before replying exactly NESTED_DONE. Do not finish while the command is running.
+Wait for nested_owner to finish, then reply exactly DIRECT_DONE.
+
+Wait for direct_owner to finish, then reply exactly ROOT_DONE.`;
+
+test("attributes a nested Claude child and its background notification to their direct owners", async () => {
+  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-claude-nested-ownership-"));
+  const client = new ClaudeAgentClient({ logger: pino({ level: "trace" }) });
+  const session = await client.createSession({
+    provider: "claude",
+    cwd,
+    model: "claude-sonnet-5",
+    modeId: "bypassPermissions",
+  });
+  try {
+    const events = await collectSessionTurnEvents(session, ROOT_PROMPT);
+
+    expect(events).toContainEqual(expect.objectContaining({ type: "turn_completed" }));
+    expect(
+      events
+        .flatMap((event) =>
+          event.type === "timeline" && event.item.type === "assistant_message"
+            ? [event.item.text]
+            : [],
+        )
+        .join("")
+        .trim(),
+    ).toBe("ROOT_DONE");
+    const descriptors = events
+      .filter((event) => event.type === "provider_subagent" && event.event.type === "upsert")
+      .map((event) => event.event)
+      .filter((event) => event.type === "upsert" && event.description);
+    const direct = descriptors.find((event) => event.description === "direct_owner");
+    const nested = descriptors.find((event) => event.description === "nested_owner");
+
+    expect(direct).toMatchObject({ description: "direct_owner" });
+    expect(nested).toMatchObject({ description: "nested_owner" });
+    expect(nested?.parentSubagentId).toBe(direct?.id);
+    expect(
+      events.filter(
+        (event) =>
+          event.type === "timeline" &&
+          event.item.type === "tool_call" &&
+          event.item.callId === nested?.id,
+      ),
+    ).toEqual([]);
+    expect(
+      events.filter(
+        (event) =>
+          event.type === "timeline" &&
+          event.item.type === "tool_call" &&
+          event.item.name === "task_notification",
+      ),
+    ).toEqual([]);
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({
+          type: "timeline",
+          id: nested?.id,
+          item: expect.objectContaining({
+            type: "tool_call",
+            name: "task_notification",
+          }),
+        }),
+      }),
+    );
+    const notification = events
+      .flatMap((event) =>
+        event.type === "provider_subagent" &&
+        event.event.type === "timeline" &&
+        event.event.id === nested?.id &&
+        event.event.item.type === "tool_call" &&
+        event.event.item.name === "task_notification"
+          ? [event.event.item]
+          : [],
+      )
+      .at(-1);
+    expect(notification?.metadata?.status).toBe("completed");
+    const outputFile = notification?.metadata?.outputFile;
+    expect(typeof outputFile).toBe("string");
+    expect(readFileSync(outputFile as string, "utf8").trim()).toMatch(
+      /^NESTED_BACKGROUND_SENTINEL\s+\[exited with code 0\]$/,
+    );
+
+    const persistence = session.describePersistence();
+    expect(persistence).not.toBeNull();
+    await session.close();
+    const restored = await client.resumeSession(persistence!, { cwd });
+    try {
+      const replayed: AgentStreamEvent[] = [];
+      for await (const event of restored.streamHistory()) replayed.push(event);
+      expect(
+        replayed.filter(
+          (event) =>
+            event.type === "timeline" &&
+            event.item.type === "tool_call" &&
+            event.item.name === "task_notification",
+        ),
+      ).toEqual([]);
+      expect(replayed).toContainEqual(
+        expect.objectContaining({
+          type: "provider_subagent",
+          event: expect.objectContaining({
+            type: "upsert",
+            id: nested?.id,
+            parentSubagentId: direct?.id,
+          }),
+        }),
+      );
+      expect(replayed).toContainEqual(
+        expect.objectContaining({
+          type: "provider_subagent",
+          event: expect.objectContaining({
+            type: "timeline",
+            id: nested?.id,
+            item: expect.objectContaining({
+              name: "task_notification",
+              metadata: expect.objectContaining({
+                toolUseId: notification?.metadata?.toolUseId,
+                status: "completed",
+              }),
+            }),
+          }),
+        }),
+      );
+    } finally {
+      await restored.close();
+    }
+  } finally {
+    await session.close().catch(() => undefined);
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 360_000);
diff --git a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
index 5069c3653f..5393926520 100644
--- a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
@@ -327,6 +327,57 @@ test("fails an auto mode turn when Claude Code uses Vertex", async () => {
   }
 });
 
+test("switches an auto mode session to another mode when Claude Code uses Bedrock", async () => {
+  const previousBedrock = process.env.CLAUDE_CODE_USE_BEDROCK;
+  process.env.CLAUDE_CODE_USE_BEDROCK = "1";
+  const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    queryFactory: sdkQueryFactory,
+    resolveBinary: async () => "/test/claude/bin",
+  });
+  const session = await client.createSession({
+    provider: "claude",
+    cwd: process.cwd(),
+    modeId: "auto",
+  });
+
+  try {
+    await session.setMode("acceptEdits");
+
+    expect(await session.getCurrentMode()).toBe("acceptEdits");
+    expect(sdkQueryFactory).toHaveBeenCalledTimes(1);
+    expect(sdkQueryFactory.mock.calls[0]?.[0]?.options?.permissionMode).toBe("acceptEdits");
+  } finally {
+    restoreEnvValue("CLAUDE_CODE_USE_BEDROCK", previousBedrock);
+    await session.close();
+  }
+});
+
+test("does not keep a query started in a mode that Claude Code rejected", async () => {
+  const launchedModes: Array<string | undefined> = [];
+  sdkQueryFactory.mockImplementation(({ options }: { options: { permissionMode?: string } }) => {
+    launchedModes.push(options.permissionMode);
+    const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
+    if (launchedModes.length === 1) {
+      queryMock.setPermissionMode.mockRejectedValue(new Error("bypass refused"));
+    }
+    return queryMock;
+  });
+  const session = await createSession();
+
+  try {
+    await expect(session.setMode("bypassPermissions")).rejects.toThrow("bypass refused");
+    await session.listCommands();
+
+    expect(await session.getCurrentMode()).toBe("default");
+    expect(launchedModes).toEqual(["bypassPermissions", "default"]);
+  } finally {
+    await session.close();
+  }
+});
+
 test("logs redacted query summary and never leaks sentinel secrets", async () => {
   const envSecret = "PASEO_ENV_SENTINEL_SECRET";
   const runtimeSecret = "PASEO_RUNTIME_SENTINEL_SECRET";
@@ -435,6 +486,7 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
     } | null;
     input: { end: () => void } | null;
     queryRestartNeeded: boolean;
+    mainTurnInFlight: boolean;
     interruptActiveTurn: () => Promise<void>;
   } = asInternals(session);
   const interrupt = vi.fn(async () => undefined);
@@ -447,6 +499,7 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
   };
   internal.input = { end };
   internal.queryRestartNeeded = false;
+  internal.mainTurnInFlight = true;
 
   try {
     await internal.interruptActiveTurn();
@@ -1037,11 +1090,11 @@ test("preserves bypass capability across query restarts triggered by thinking ch
 
     expect(capturedOptions).toHaveLength(2);
     expect(capturedOptions[0]).toMatchObject({
-      permissionMode: "default",
+      permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
     });
     expect(capturedOptions[1]).toMatchObject({
-      permissionMode: "acceptEdits",
+      permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       effort: "high",
     });
@@ -1140,6 +1193,7 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
   const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
 
   internal.turnState = "idle";
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
   await internal.routeSdkMessageFromPump(
     {
       type: "stream_event",
@@ -1182,6 +1236,468 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
   await session.close();
 });
 
+interface SessionStateInternals {
+  turnState: "idle" | "foreground" | "autonomous";
+  routeSdkMessageFromPump: (
+    message: Record<string, unknown>,
+    activeQuery: QueryMock,
+  ) => Promise<void>;
+  autonomousTurn: { id: string } | null;
+  activeForegroundTurnId: string | null;
+}
+
+function sessionState(state: "idle" | "running" | "requires_action") {
+  return {
+    type: "system",
+    subtype: "session_state_changed",
+    state,
+    uuid: `state-${state}`,
+    session_id: "sess-1",
+  };
+}
+
+/** Claude opening a turn of its own. Every main-session turn starts with one. */
+function claudeTurnInit() {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: "sess-1",
+    permissionMode: "default",
+    model: "opus",
+  };
+}
+
+function successResult() {
+  return { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 };
+}
+
+function commandLifecycle(
+  commandUuid: string,
+  state: "queued" | "started" | "completed" | "cancelled",
+) {
+  return { type: "command_lifecycle", command_uuid: commandUuid, state };
+}
+
+function unboundTextDelta(text: string) {
+  return {
+    type: "stream_event",
+    parent_tool_use_id: null,
+    event: { type: "content_block_delta", delta: { type: "text_delta", text } },
+  };
+}
+
+// What a background subagent emits on the main stream with no parent tool use id, so by frame
+// shape alone each looks like main-session work. Verified on the wire: none arrives inside a turn
+// Claude opened, and no result follows any of them.
+const helperTaskStarted = {
+  type: "system",
+  subtype: "task_started",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  task_type: "local_agent",
+  subagent_type: "general-purpose",
+  description: "Background helper",
+  is_backgrounded: true,
+  uuid: "uuid-task-started",
+  session_id: "sess-1",
+};
+const helperTaskProgress = {
+  type: "system",
+  subtype: "task_progress",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  description: "Background helper",
+  usage: { total_tokens: 1200, tool_uses: 3, duration_ms: 900 },
+  last_tool_name: "Bash",
+  uuid: "uuid-task-progress",
+  session_id: "sess-1",
+};
+// A subagent's own background Bash job completing.
+const subagentOwnedTaskNotification = {
+  type: "system",
+  subtype: "task_notification",
+  task_id: "bg-job-of-subagent",
+  tool_use_id: "toolu_subagent_bash",
+  status: "completed",
+  summary: "Background command completed",
+  output_file: "/tmp/bg-job-of-subagent.output",
+  uuid: "uuid-task-notification",
+  session_id: "sess-1",
+};
+const helperCompleted = {
+  type: "system",
+  subtype: "task_notification",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  status: "completed",
+  summary: "Background helper finished",
+  output_file: "/tmp/helper-task.output",
+  uuid: "uuid-helper-completed",
+  session_id: "sess-1",
+};
+const rateLimitEvent = {
+  type: "rate_limit_event",
+  rate_limit_info: { status: "allowed" },
+  uuid: "uuid-rate-limit",
+  session_id: "sess-1",
+};
+
+function createPendingQueryMock(): QueryMock {
+  return createBaseQueryMock(vi.fn(() => new Promise<never>(() => {})));
+}
+
+test("a main-session frame opens no turn until Claude starts one", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  // Main-session output only ever arrives inside a turn Claude opened with system/init, so a
+  // stray unbound frame is not the start of one.
+  await internal.routeSdkMessageFromPump(unboundTextDelta("stray"), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  // The wake-up case autonomous turns exist for: a completed background subagent makes the main
+  // session start a turn of its own, with no prompt from the user.
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(unboundTextDelta("picking this up"), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await session.close();
+});
+
+test("a background subagent's frames never open a turn while the main session is idle", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  // Claude Code 2.1.280 reports "running" for as long as any background subagent is alive.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  for (const frame of [
+    helperTaskStarted,
+    helperTaskProgress,
+    subagentOwnedTaskNotification,
+    rateLimitEvent,
+    helperCompleted,
+  ]) {
+    await internal.routeSdkMessageFromPump(frame, queryMock);
+    expect(internal.autonomousTurn).toBeNull();
+    expect(internal.turnState).toBe("idle");
+  }
+
+  // The next user message starts its own foreground turn rather than landing on a phantom one.
+  const { turnId } = await session.startTurn("PING");
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("foreground");
+
+  await session.close();
+});
+
+test("Claude waking up after a helper finishes gets an autonomous turn that its result closes", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // The helper's completion arrives outside any turn. Claude then starts one to react to it.
+  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
+  await internal.routeSdkMessageFromPump(helperCompleted, queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+  expect(internal.turnState).toBe("autonomous");
+
+  await internal.routeSdkMessageFromPump(unboundTextDelta("the helper is done"), queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(1);
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("a steer folded into a turn keeps one turn, and a turn Claude starts after it gets its own", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  const { turnId } = await session.startTurn("hello");
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  // A message pushed mid-turn is folded in at the next tool boundary: Claude acknowledges it, but
+  // starts no new turn.
+  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "queued"), queryMock);
+  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "started"), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(internal.turnState).toBe("idle");
+
+  // A message that arrived while Claude wrote its final answer runs as a turn of its own.
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-2");
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(2);
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(2);
+
+  await session.close();
+});
+
+test("session state never opens a turn", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // "running" covers background subagents too, so it says nothing about the main session.
+  for (const state of ["idle", "running", "requires_action", "idle"] as const) {
+    await internal.routeSdkMessageFromPump(sessionState(state), queryMock);
+    expect(internal.autonomousTurn).toBeNull();
+    expect(internal.turnState).toBe("idle");
+  }
+  // State frames are bookkeeping, never timeline content.
+  expect(events).toEqual([]);
+
+  await session.close();
+});
+
+test("an idle session state closes an autonomous turn that no result closed", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  // Safety net: Claude says nothing at all is running any more.
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("session state never opens or closes a foreground turn", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  const { turnId } = await session.startTurn("hello");
+
+  // The send's own running, then an idle that trails the previous turn and lands late.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("foreground");
+
+  await internal.routeSdkMessageFromPump(
+    { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 },
+    queryMock,
+  );
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(internal.turnState).toBe("idle");
+
+  await session.close();
+});
+
+interface InterruptInternals extends SessionStateInternals {
+  pendingInterruptAbort: boolean;
+}
+
+type InterruptibleQueryMock = QueryMock & { cancelAsyncMessage: ReturnType<typeof vi.fn> };
+
+function createInterruptibleQueryMock(): InterruptibleQueryMock {
+  return Object.assign(createPendingQueryMock(), {
+    cancelAsyncMessage: vi.fn(async () => true),
+  });
+}
+
+/** The uuid Paseo stamped on the first message it pushed into the SDK input. */
+async function readFirstPromptUuid(): Promise<string | null> {
+  const input = sdkQueryFactory.mock.calls[0]?.[0] as { prompt: AsyncIterable<unknown> };
+  return await createPromptUuidReader(input.prompt)();
+}
+
+function abortedResult() {
+  return {
+    type: "result",
+    subtype: "error_during_execution",
+    errors: [],
+    usage: buildUsage(),
+    total_cost_usd: 0,
+  };
+}
+
+test("an interrupt before Claude starts the message withdraws it instead of interrupting", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await session.startTurn("hello");
+  // Claude has not acknowledged the message yet: no init, no command_lifecycle "started".
+  await session.interrupt();
+
+  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
+  expect(queryMock.interrupt).not.toHaveBeenCalled();
+  // No result follows an interrupt that never happened, so no flag may wait for one.
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(events.filter((event) => event.type === "turn_canceled")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("an interrupt after Claude took the message but before it started stops it", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  // Claude has dequeued the message for its next turn, so withdrawing it is a no-op.
+  queryMock.cancelAsyncMessage.mockImplementation(async () => false);
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+
+  await session.startTurn("hello");
+  // No command_lifecycle "started" or init has reached Paseo yet.
+  await session.interrupt();
+
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
+  expect(internal.pendingInterruptAbort).toBe(true);
+
+  await session.close();
+});
+
+test("a prompt sent while a stopped prompt is being withdrawn is not withdrawn too", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  let settleWithdrawal: (cancelled: boolean) => void = () => {};
+  queryMock.cancelAsyncMessage.mockImplementationOnce(
+    () => new Promise<boolean>((resolve) => (settleWithdrawal = resolve)),
+  );
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+
+  await session.startTurn("first");
+  const firstUuid = await readFirstPromptUuid();
+  await session.interrupt();
+  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
+
+  await session.startTurn("second");
+  settleWithdrawal(false);
+
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1);
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(firstUuid);
+
+  await session.close();
+});
+
+test("an interrupt while only background subagents run never reaches Claude", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+
+  await session.startTurn("delegate to a helper");
+  const promptUuid = await readFirstPromptUuid();
+  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  // The main session is done; its helper keeps working.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  await internal.routeSdkMessageFromPump(helperTaskProgress, queryMock);
+
+  // Without perTaskStopAffordance, an interrupt here kills every running helper.
+  await session.interrupt();
+
+  expect(queryMock.interrupt).not.toHaveBeenCalled();
+  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
+  expect(internal.pendingInterruptAbort).toBe(false);
+
+  await session.close();
+});
+
+test("an interrupt during a main turn interrupts Claude once and drops the aborted result", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await session.startTurn("long task");
+  const promptUuid = await readFirstPromptUuid();
+  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+
+  await session.interrupt();
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  // Claude already started the message, so there is nothing to withdraw.
+  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
+  expect(internal.pendingInterruptAbort).toBe(true);
+
+  // A replacement starts before the aborted turn reports its result.
+  const { turnId } = await session.startTurn("replacement");
+  await internal.routeSdkMessageFromPump(abortedResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(0);
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(queryMock.interrupt).toHaveBeenCalledTimes(1);
+
+  await session.close();
+});
+
+test("a new turn clears an interrupt flag no result will consume", async () => {
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // An interrupt that landed just after its turn had ended: Claude emits no result for it.
+  internal.pendingInterruptAbort = true;
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  // This turn's own failure is reported, not swallowed as the interrupted turn's leftover.
+  await internal.routeSdkMessageFromPump(
+    { ...abortedResult(), errors: ["API Error: 500 upstream failure"] },
+    queryMock,
+  );
+  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(1);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await session.close();
+});
+
 test("tracks run lifecycle transitions for success, error, and interrupt", async () => {
   const session = await createSession();
   let streamCase: "success" | "error" | "interrupt" = "success";
diff --git a/packages/server/src/server/agent/providers/claude/agent.rewind-anchors.test.ts b/packages/server/src/server/agent/providers/claude/agent.rewind-anchors.test.ts
new file mode 100644
index 0000000000..1b1932e9cd
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.rewind-anchors.test.ts
@@ -0,0 +1,269 @@
+import { describe, expect, test, vi } from "vitest";
+
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import { ClaudeAgentClient } from "./agent.js";
+import { FakeClaudeSdk } from "./test-rewind-claude-sdk.js";
+import { streamSession } from "../test-utils/session-stream-adapter.js";
+import type { AgentSession } from "../../agent-sdk-types.js";
+
+const SESSION_ID = "session-1";
+
+/** Claude Code replies to a turn either with an assistant message or with nothing at all. */
+type TurnOutcome = { assistantMessageId: string; subagentMessageId?: string } | "no-response";
+
+function initMessage(): Record<string, unknown> {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: SESSION_ID,
+    permissionMode: "default",
+    model: "claude-sonnet-4-6",
+  };
+}
+
+/** Claude Code echoes the user message back under the uuid Paseo minted for it. */
+function userEcho(uuid: string): Record<string, unknown> {
+  return {
+    type: "user",
+    uuid,
+    session_id: SESSION_ID,
+    message: { role: "user", content: [{ type: "text", text: "prompt" }] },
+  };
+}
+
+function assistantReply(uuid: string): Record<string, unknown> {
+  return {
+    type: "assistant",
+    uuid,
+    session_id: SESSION_ID,
+    message: { id: uuid, role: "assistant", content: [{ type: "text", text: "ok" }] },
+  };
+}
+
+/**
+ * A message from a Task subagent. The CLI streams these on the same query as the main
+ * conversation, and their uuids live on the subagent's sidechain, not on the session's
+ * own message chain, so `forkSession` cannot resolve one.
+ */
+function subagentReply(uuid: string): Record<string, unknown> {
+  return {
+    type: "assistant",
+    uuid,
+    session_id: SESSION_ID,
+    parent_tool_use_id: "toolu_subagent_1",
+    message: { id: uuid, role: "assistant", content: [{ type: "text", text: "subagent work" }] },
+  };
+}
+
+function successResult(): Record<string, unknown> {
+  return {
+    type: "result",
+    subtype: "success",
+    uuid: "result-ok",
+    session_id: SESSION_ID,
+    duration_ms: 1,
+    duration_api_ms: 1,
+    is_error: false,
+    num_turns: 1,
+    result: "",
+    total_cost_usd: 0,
+    usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
+    permission_denials: [],
+  };
+}
+
+/** A turn that dies upstream before the model emits its first token. */
+function failedResult(): Record<string, unknown> {
+  return {
+    type: "result",
+    subtype: "error_during_execution",
+    uuid: "result-failed",
+    session_id: SESSION_ID,
+    duration_ms: 1,
+    duration_api_ms: 1,
+    is_error: true,
+    num_turns: 1,
+    errors: ["upstream gateway returned 503"],
+    total_cost_usd: 0,
+    usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 0 },
+    permission_denials: [],
+  };
+}
+
+interface Conversation {
+  queryFactory: ReturnType<typeof vi.fn>;
+  /** The uuid Paseo minted for each prompt, in the order the turns ran. */
+  userMessageIds: string[];
+}
+
+function createConversation(outcomes: TurnOutcome[]): Conversation {
+  const userMessageIds: string[] = [];
+  const queryFactory = vi.fn(({ prompt }: { prompt: AsyncIterable<unknown> }) => {
+    const queued: Array<Record<string, unknown>> = [];
+    const waiters: Array<() => void> = [];
+    const closedRef = { value: false };
+    let turnIndex = 0;
+
+    const wake = () => waiters.shift()?.();
+    const enqueue = (message: Record<string, unknown>) => {
+      queued.push(message);
+      wake();
+    };
+
+    void (async () => {
+      for await (const sent of prompt) {
+        const userMessageId = String((sent as { uuid?: unknown }).uuid);
+        userMessageIds.push(userMessageId);
+        const outcome = outcomes[turnIndex];
+        turnIndex += 1;
+        if (turnIndex === 1) {
+          enqueue(initMessage());
+        }
+        enqueue(userEcho(userMessageId));
+        if (outcome === "no-response" || !outcome) {
+          enqueue(failedResult());
+          continue;
+        }
+        enqueue(assistantReply(outcome.assistantMessageId));
+        if (outcome.subagentMessageId) {
+          enqueue(subagentReply(outcome.subagentMessageId));
+        }
+        enqueue(successResult());
+      }
+      closedRef.value = true;
+      wake();
+    })();
+
+    return {
+      next: vi.fn(async () => {
+        while (queued.length === 0 && !closedRef.value) {
+          await new Promise<void>((resolve) => {
+            waiters.push(resolve);
+          });
+        }
+        if (queued.length === 0) {
+          return { done: true, value: undefined };
+        }
+        return { done: false, value: queued.shift() };
+      }),
+      interrupt: vi.fn(async () => undefined),
+      return: vi.fn(async () => {
+        closedRef.value = true;
+        wake();
+        return undefined;
+      }),
+      close: vi.fn(() => {
+        closedRef.value = true;
+        wake();
+      }),
+      setPermissionMode: vi.fn(async () => undefined),
+      setModel: vi.fn(async () => undefined),
+      supportedModels: vi.fn(async () => []),
+      supportedCommands: vi.fn(async () => []),
+      rewindFiles: vi.fn(async () => ({ canRewind: true })),
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+    };
+  });
+  return { queryFactory, userMessageIds };
+}
+
+async function createSession(
+  conversation: Conversation,
+  rewindSdk: FakeClaudeSdk,
+): Promise<AgentSession> {
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    queryFactory: conversation.queryFactory as never,
+    resolveBinary: async () => "/test/claude/bin",
+    rewindSdk,
+  });
+  return client.createSession({
+    provider: "claude",
+    cwd: process.cwd(),
+    model: "claude-sonnet-4-6",
+  });
+}
+
+async function runTurns(session: AgentSession, count: number): Promise<void> {
+  for (let index = 0; index < count; index += 1) {
+    for await (const _ of streamSession(session, `turn ${index + 1}`)) {
+      // drain to the terminal event
+    }
+  }
+}
+
+describe("Claude rewind across a turn that produced no response", () => {
+  test("forks at the most recent turn that did produce a response", async () => {
+    const conversation = createConversation([
+      { assistantMessageId: "assistant-1" },
+      "no-response",
+      { assistantMessageId: "assistant-3" },
+    ]);
+    const rewindSdk = new FakeClaudeSdk();
+    const session = await createSession(conversation, rewindSdk);
+
+    try {
+      await runTurns(session, 3);
+      await session.revertConversation?.({ messageId: conversation.userMessageIds[2] });
+    } finally {
+      await session.close();
+    }
+
+    expect(rewindSdk.recordedForks).toEqual([{ upToMessageId: "assistant-1" }]);
+  });
+
+  test("starts a fresh session when no earlier turn produced a response", async () => {
+    const conversation = createConversation(["no-response", { assistantMessageId: "assistant-2" }]);
+    const rewindSdk = new FakeClaudeSdk();
+    const session = await createSession(conversation, rewindSdk);
+
+    try {
+      await runTurns(session, 2);
+      await session.revertConversation?.({ messageId: conversation.userMessageIds[1] });
+    } finally {
+      await session.close();
+    }
+
+    expect(rewindSdk.recordedForks).toEqual([]);
+  });
+
+  test("still forks at the previous turn when every turn produced a response", async () => {
+    const conversation = createConversation([
+      { assistantMessageId: "assistant-1" },
+      { assistantMessageId: "assistant-2" },
+    ]);
+    const rewindSdk = new FakeClaudeSdk();
+    const session = await createSession(conversation, rewindSdk);
+
+    try {
+      await runTurns(session, 2);
+      await session.revertConversation?.({ messageId: conversation.userMessageIds[1] });
+    } finally {
+      await session.close();
+    }
+
+    expect(rewindSdk.recordedForks).toEqual([{ upToMessageId: "assistant-1" }]);
+  });
+});
+
+describe("Claude rewind after a turn whose last assistant message came from a subagent", () => {
+  test("forks at the turn's own reply, not at the subagent message", async () => {
+    const conversation = createConversation([
+      { assistantMessageId: "assistant-1", subagentMessageId: "subagent-1" },
+      { assistantMessageId: "assistant-2" },
+    ]);
+    const rewindSdk = new FakeClaudeSdk();
+    const session = await createSession(conversation, rewindSdk);
+
+    try {
+      await runTurns(session, 2);
+      await session.revertConversation?.({ messageId: conversation.userMessageIds[1] });
+    } finally {
+      await session.close();
+    }
+
+    expect(rewindSdk.recordedForks).toEqual([{ upToMessageId: "assistant-1" }]);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts b/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
index 4ced29b489..48ddab5973 100644
--- a/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
@@ -259,6 +259,89 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
     rmSync(tempRoot, { recursive: true, force: true });
   });
 
+  test.each(["system", "user", "queue-operation"] as const)(
+    "restores nested background notification ownership from %s history",
+    async (form) => {
+      const nestedId = "toolu_nested";
+      const bashId = "toolu_nested_bash";
+      const timestamp = "2026-07-26T06:28:01.000Z";
+      function notification(toolUseId: string) {
+        const content = `<task-notification><task-id>${toolUseId}-task</task-id><tool-use-id>${toolUseId}</tool-use-id><status>completed</status><summary>Background command completed</summary></task-notification>`;
+        const records = {
+          system: {
+            subtype: "task_notification",
+            task_id: `${toolUseId}-task`,
+            tool_use_id: toolUseId,
+            status: "completed",
+            summary: "Background command completed",
+          },
+          user: { uuid: `${toolUseId}-notification`, message: { role: "user", content } },
+          "queue-operation": { operation: "enqueue", content },
+        };
+        return JSON.stringify({ type: form, timestamp, ...records[form] });
+      }
+      const subagentDir = writeParentSession([
+        taskToolUse(),
+        taskToolResult(),
+        notification(bashId),
+        notification("toolu_root_bash"),
+        notification("toolu_orphan_bash"),
+      ]);
+      function toolEntry(agentId: string, id: string, name: string) {
+        return JSON.stringify({
+          type: "assistant",
+          isSidechain: true,
+          agentId,
+          message: { role: "assistant", content: [{ type: "tool_use", id, name, input: {} }] },
+        });
+      }
+      writeSubagent({
+        subagentDir,
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [toolEntry(AGENT_ID, nestedId, "Agent")],
+      });
+      writeSubagent({
+        subagentDir,
+        agentId: "nested-agent",
+        meta: JSON.stringify({ toolUseId: nestedId }),
+        sidechainLines: [toolEntry("nested-agent", bashId, "Bash")],
+      });
+      writeSubagent({
+        subagentDir,
+        agentId: "orphan-agent",
+        meta: JSON.stringify({ toolUseId: "missing-parent-tool" }),
+        sidechainLines: [toolEntry("orphan-agent", "toolu_orphan_bash", "Bash")],
+      });
+
+      const replayed = await replayEvents();
+      const rootNotifications = replayed.flatMap((event) =>
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.name === "task_notification"
+          ? [event.item.metadata?.toolUseId]
+          : [],
+      );
+      expect(rootNotifications).toEqual(["toolu_root_bash", "toolu_orphan_bash"]);
+      const childNotifications = replayed.flatMap((event) =>
+        event.type === "provider_subagent" &&
+        event.event.type === "timeline" &&
+        event.event.item.type === "tool_call" &&
+        event.event.item.name === "task_notification"
+          ? [event.event]
+          : [],
+      );
+      expect(childNotifications).toEqual([
+        expect.objectContaining({
+          id: nestedId,
+          timestamp,
+          item: expect.objectContaining({
+            metadata: expect.objectContaining({ toolUseId: bashId }),
+          }),
+        }),
+      ]);
+    },
+  );
+
   test("links a subagent to its Task call through the meta sidecar", async () => {
     writeSession({
       parentLines: [taskToolUse(), taskToolResult()],
@@ -551,6 +634,72 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
     expect(events[0]).toMatchObject({ id: TOOL_USE_ID });
   });
 
+  test.each(["Agent", "Task"] as const)(
+    "labels a background %s call's card with its type and task after a restart",
+    async (toolName) => {
+      writeSession({
+        parentLines: [
+          parentEntry([
+            {
+              type: "tool_use",
+              id: TOOL_USE_ID,
+              name: toolName,
+              input: {
+                subagent_type: "general-purpose",
+                description: "Count files here",
+                prompt: "Run ls and reply with the number of entries.",
+              },
+            },
+          ]),
+          JSON.stringify({
+            type: "user",
+            sessionId: "replay-session",
+            timestamp: "2026-07-26T06:27:48.000Z",
+            message: {
+              role: "user",
+              content: [
+                {
+                  type: "tool_result",
+                  tool_use_id: TOOL_USE_ID,
+                  content: [
+                    {
+                      type: "text",
+                      text: `Async agent launched successfully.\nagentId: ${AGENT_ID}`,
+                    },
+                  ],
+                },
+              ],
+            },
+            toolUseResult: { isAsync: true, status: "async_launched", agentId: AGENT_ID },
+          }),
+        ],
+        meta: JSON.stringify({
+          agentType: "general-purpose",
+          description: "Count files here",
+          toolUseId: TOOL_USE_ID,
+          spawnDepth: 1,
+          requestShape: "background",
+        }),
+      });
+
+      const cards = (await replayEvents()).flatMap((event) =>
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.callId === TOOL_USE_ID
+          ? [event.item]
+          : [],
+      );
+      expect(cards.at(-1)).toMatchObject({
+        status: "completed",
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
+          description: "Count files here",
+        },
+      });
+    },
+  );
+
   test("replays the subagent's own transcript onto its timeline", async () => {
     writeSession({
       parentLines: [taskToolUse(), taskToolResult()],
@@ -563,4 +712,56 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
     expect(timeline.length).toBeGreaterThan(0);
     expect(timeline[0]).toMatchObject({ id: TOOL_USE_ID });
   });
+
+  test("replays a SubagentHandback report as the subagent's final message", async () => {
+    const handbackId = "toolu_handback";
+    const report = "## Verdict\n\n- **Coherent**";
+    writeSession({
+      parentLines: [taskToolUse(), taskToolResult()],
+      meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+      sidechainLines: [
+        JSON.stringify({
+          type: "assistant",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          message: {
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: handbackId,
+                name: "SubagentHandback",
+                input: { message: report },
+              },
+            ],
+          },
+        }),
+        JSON.stringify({
+          type: "user",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: handbackId,
+                content: [
+                  {
+                    type: "text",
+                    text: '{"success":true,"message":"Report delivered to your caller."}',
+                  },
+                ],
+              },
+            ],
+          },
+        }),
+      ],
+    });
+
+    const items = (await replayDescriptors()).flatMap((event) =>
+      event.event.type === "timeline" ? [event.event.item] : [],
+    );
+    expect(items).toEqual([{ type: "assistant_message", text: report }]);
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts b/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
index efb452e9bf..84293afa6a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
@@ -587,4 +587,75 @@ describe("ClaudeAgentSession sub-agent sidechain updates", () => {
     expect(latest.detail.log).toContain("[Read] file-6.md");
     expect(latest.detail.log).toContain("[Read] file-205.md");
   });
+
+  test("keeps a long main-thread tool call out of the subagents track", async () => {
+    // Claude Code sends a heartbeat every 30 s while a tool runs, with the tool's own id as
+    // parent_tool_use_id. Frames captured from Claude Code 2.1.291 for a 40 s MCP call.
+    queryFactory.mockImplementation(() =>
+      buildQueryMock([
+        {
+          type: "system",
+          subtype: "init",
+          session_id: "heartbeat-session",
+          permissionMode: "bypassPermissions",
+          model: "opus",
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: null,
+          message: {
+            id: "msg-heartbeat-1",
+            role: "assistant",
+            content: [
+              { type: "tool_use", id: "toolu_slow", name: "mcp__slow__slow_check", input: {} },
+            ],
+          },
+        },
+        {
+          type: "tool_progress",
+          tool_use_id: "toolu_slow-heartbeat-0",
+          tool_name: "mcp__slow__slow_check",
+          parent_tool_use_id: "toolu_slow",
+          elapsed_time_seconds: 30,
+          heartbeat: true,
+        },
+        {
+          type: "user",
+          parent_tool_use_id: null,
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_slow",
+                content: [{ type: "text", text: "SLOW_CHECK_OK" }],
+                is_error: false,
+              },
+            ],
+          },
+        },
+        {
+          type: "result",
+          subtype: "success",
+          usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
+          total_cost_usd: 0,
+        },
+      ]),
+    );
+    const session = await new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+
+    const events = await collectUntilTerminal(streamSession(session, "run the slow check"));
+    await session.close();
+
+    expect(events.filter((event) => event.type === "provider_subagent")).toEqual([]);
+    const toolCallNames = events.flatMap((event) =>
+      event.type === "timeline" && event.item.type === "tool_call" ? [event.item.name] : [],
+    );
+    expect(toolCallNames).toContain("mcp__slow__slow_check");
+    expect(toolCallNames).not.toContain("Task");
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts
new file mode 100644
index 0000000000..e5e8d117a4
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts
@@ -0,0 +1,56 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import pino from "pino";
+import { expect, test } from "vitest";
+
+import type { AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+
+const ROOT_PROMPT = `Use Claude Code's native Agent tool exactly once, never Paseo tools, with this complete task:
+
+Do not use any tools. Reply with exactly this markdown report and nothing else:
+## HANDBACK_HEADING
+- **HANDBACK_BOLD** item
+
+Then reply exactly ROOT_DONE.`;
+
+function subagentItems(events: AgentStreamEvent[]): AgentTimelineItem[] {
+  return events.flatMap((event) =>
+    event.type === "provider_subagent" && event.event.type === "timeline" ? [event.event.item] : [],
+  );
+}
+
+function expectHandbackAsReport(items: AgentTimelineItem[]): void {
+  expect(items.filter((item) => item.type === "tool_call")).toEqual([]);
+  expect(
+    items.flatMap((item) => (item.type === "assistant_message" ? [item.text] : [])).join(""),
+  ).toContain("## HANDBACK_HEADING\n- **HANDBACK_BOLD** item");
+}
+
+test("an auto-mode Claude subagent's handback report shows as its final message", async () => {
+  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-claude-subagent-handback-"));
+  const client = new ClaudeAgentClient({ logger: pino({ level: "warn" }) });
+  const session = await client.createSession({ provider: "claude", cwd, modeId: "auto" });
+  try {
+    const events = await collectSessionTurnEvents(session, ROOT_PROMPT);
+    expectHandbackAsReport(subagentItems(events));
+
+    const persistence = session.describePersistence();
+    expect(persistence).not.toBeNull();
+    await session.close();
+    const restored = await client.resumeSession(persistence!, { cwd });
+    try {
+      const replayed: AgentStreamEvent[] = [];
+      for await (const event of restored.streamHistory()) replayed.push(event);
+      expectHandbackAsReport(subagentItems(replayed));
+    } finally {
+      await restored.close();
+    }
+  } finally {
+    await session.close();
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 240_000);
diff --git a/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts b/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
index d4fc0bcc0c..1223bbc541 100644
--- a/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
@@ -78,7 +78,7 @@ describe("subagent lifecycle across an interrupt", () => {
     queryFactory.mockReset();
   });
 
-  async function startInterruptibleTurn() {
+  async function startInterruptibleTurn(taskStarted: Record<string, unknown> = {}) {
     const channel = buildOpenQueryMock();
     queryFactory.mockImplementation(() => channel.query);
     const session = await new ClaudeAgentClient({
@@ -107,6 +107,7 @@ describe("subagent lifecycle across an interrupt", () => {
       task_type: "local_agent",
       subagent_type: "general-purpose",
       description: "Reply with banana",
+      ...taskStarted,
     });
     await vi.waitFor(() => expect(subagentEvents.length).toBeGreaterThan(0));
 
@@ -169,6 +170,31 @@ describe("subagent lifecycle across an interrupt", () => {
     await session.close();
   });
 
+  test("a child spawned in the background is not canceled with the turn that spawned it", async () => {
+    // Claude announces a background spawn on task_started itself and sends no task_updated patch.
+    const { channel, session, subagentEvents } = await startInterruptibleTurn({
+      is_backgrounded: true,
+    });
+
+    await session.interrupt();
+    channel.push({
+      type: "system",
+      subtype: "task_notification",
+      task_id: TASK_ID,
+      tool_use_id: SUBAGENT_ID,
+      status: "completed",
+    });
+
+    await vi.waitFor(() =>
+      expect(subagentEvents).toContainEqual(
+        expect.objectContaining({ id: SUBAGENT_ID, status: "completed" }),
+      ),
+    );
+    expect(statuses(subagentEvents, SUBAGENT_ID)).toEqual(["running", "completed"]);
+
+    await session.close();
+  });
+
   test("a foreground child is canceled with the turn that spawned it", async () => {
     const { session, subagentEvents } = await startInterruptibleTurn();
 
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index 5b5a9deda6..5e26e6a55a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -17,13 +17,26 @@ import {
 } from "./agent.js";
 import { claudeProjectDirSync } from "./project-dir.js";
 import { streamSession } from "../test-utils/session-stream-adapter.js";
-import type { AgentSession, AgentTimelineItem, AgentStreamEvent } from "../../agent-sdk-types.js";
+import type {
+  AgentPromptInput,
+  AgentSession,
+  AgentTimelineItem,
+  AgentStreamEvent,
+} from "../../agent-sdk-types.js";
+import type { AgentAttachment } from "@getpaseo/protocol/messages";
+import { buildAgentPrompt, renderPromptAttachmentAsText } from "../../prompt-attachments.js";
 
 interface TestClaudeSession {
   translateMessageToEvents(message: SDKMessage): AgentStreamEvent[];
   close(): Promise<void>;
 }
 
+function isLoadingCompactionEvent(event: AgentStreamEvent): boolean {
+  return (
+    event.type === "timeline" && event.item.type === "compaction" && event.item.status === "loading"
+  );
+}
+
 function isPermissionResolvedEvent(
   event: AgentStreamEvent,
 ): event is Extract<AgentStreamEvent, { type: "permission_resolved" }> {
@@ -413,9 +426,17 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveBinary: async () => "/test/claude/bin",
         resolveVersion: async () => "2.1.219",
-        configDir: emptyConfigDir,
+        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
       });
       const { models } = await client.fetchCatalog({
         scope: "workspace",
@@ -425,6 +446,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
 
       expect(models.map((m) => m.id)).toEqual([
         "claude-opus-5",
+        "claude-mythos-5-1",
         "claude-fable-5-1",
         "claude-fable-5",
         "claude-fable-5[1m]",
@@ -459,10 +481,18 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveVersion: async () => {
           throw new Error("unrecognized version output");
         },
-        configDir: emptyConfigDir,
+        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
       });
       const { models } = await client.fetchCatalog({
         scope: "workspace",
@@ -470,7 +500,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
         force: false,
       });
 
-      expect(models.find((model) => model.isDefault)?.id).toBe("claude-opus-5");
+      expect(models.find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
       expect(models.map((model) => model.id)).toContain("claude-fable-5");
     } finally {
       await fs.rm(emptyConfigDir, { recursive: true, force: true });
@@ -482,9 +512,17 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveBinary: async () => "/test/claude/bin",
-        resolveVersion: async () => "2.1.219",
-        configDir: emptyConfigDir,
+        resolveVersion: async () => "2.1.293",
+        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
       });
       const { models } = await client.fetchCatalog({
         scope: "workspace",
@@ -496,12 +534,31 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
       };
 
       expect(getThinkingIds("claude-opus-5")).toContain("ultracode");
+      expect(getThinkingIds("claude-mythos-5-1")).toEqual([
+        "low",
+        "medium",
+        "high",
+        "xhigh",
+        "max",
+        "ultracode",
+      ]);
       expect(getThinkingIds("claude-fable-5-1")).toContain("ultracode");
       expect(getThinkingIds("claude-fable-5")).toContain("ultracode");
       expect(getThinkingIds("claude-opus-4-8[1m]")).toContain("ultracode");
       expect(getThinkingIds("claude-opus-4-8")).toContain("ultracode");
       expect(getThinkingIds("claude-sonnet-5")).toContain("xhigh");
       expect(getThinkingIds("claude-sonnet-5")).toContain("ultracode");
+      expect(getThinkingIds("claude-haiku-5-5")).toEqual([
+        "off",
+        "low",
+        "medium",
+        "high",
+        "xhigh",
+        "max",
+        "ultracode",
+      ]);
+      expect(getThinkingIds("claude-sonnet-5-5")).toContain("xhigh");
+      expect(getThinkingIds("claude-sonnet-5-5")).not.toContain("off");
       expect(getThinkingIds("claude-opus-4-7[1m]")).toContain("ultracode");
       expect(getThinkingIds("claude-opus-4-7")).toContain("ultracode");
       expect(getThinkingIds("claude-sonnet-4-6")).not.toContain("ultracode");
@@ -772,6 +829,29 @@ describe("ClaudeAgentSession features", () => {
     await session.close();
   });
 
+  test("passes extra Claude Code CLI arguments to the SDK", async () => {
+    const { queryFactory, launches } = createQueryMock();
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      providerOptions: {
+        extraArgs: { chrome: null, model: "x" },
+      },
+    });
+
+    await expect(session.startTurn("hello")).resolves.toEqual({
+      turnId: expect.stringMatching(/^foreground-turn-/),
+    });
+
+    expect(launches[0]?.options.extraArgs).toEqual({ chrome: null, model: "x" });
+    await session.close();
+  });
+
   test("lists fast mode only for supported Opus models", async () => {
     const client = new ClaudeAgentClient({ logger, resolveBinary: async () => "/test/claude/bin" });
 
@@ -860,6 +940,97 @@ describe("ClaudeAgentSession features", () => {
     await session.close();
   });
 
+  async function captureSdkUserMessage(prompt: AgentPromptInput): Promise<SDKUserMessage> {
+    const { queryFactory, queryMock } = createQueryMock();
+    let resolveSent: ((message: SDKUserMessage) => void) | null = null;
+    const sent = new Promise<SDKUserMessage>((resolve) => {
+      resolveSent = resolve;
+    });
+    queryFactory.mockImplementation((input: { prompt: AsyncIterable<SDKUserMessage> }) => {
+      void (async () => {
+        for await (const message of input.prompt) {
+          resolveSent?.(message);
+          break;
+        }
+      })();
+      return queryMock;
+    });
+    const session = await new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+    try {
+      await session.startTurn(prompt);
+      return await sent;
+    } finally {
+      await session.close();
+    }
+  }
+
+  const issueAttachment: AgentAttachment = {
+    type: "forge_issue",
+    mimeType: "application/paseo-forge-issue",
+    forge: "github",
+    number: 12,
+    title: "Fake issue for QA",
+    url: "https://example.invalid/acme/app/issues/12",
+    body: "This is an attached issue body.",
+  };
+
+  // Claude Code expands a slash command only when it is the last content block of the user
+  // message, so an auto-attached issue or a pasted screenshot must not be appended after it.
+  test("sends a typed slash command last when an attachment follows it", async () => {
+    const message = await captureSdkUserMessage(
+      buildAgentPrompt("/hello please", undefined, [issueAttachment]),
+    );
+
+    expect(message.message.content).toEqual([
+      { type: "text", text: renderPromptAttachmentAsText(issueAttachment) },
+      { type: "text", text: "/hello please" },
+    ]);
+  });
+
+  test("sends a typed slash command last when an image follows it", async () => {
+    const message = await captureSdkUserMessage(
+      buildAgentPrompt("/hello please", [{ data: "aGk=", mimeType: "image/png" }], undefined),
+    );
+
+    expect(message.message.content).toEqual([
+      { type: "image", source: { type: "base64", media_type: "image/png", data: "aGk=" } },
+      { type: "text", text: "/hello please" },
+    ]);
+  });
+
+  test("keeps typed text before attachments when it is not a slash command", async () => {
+    const message = await captureSdkUserMessage(
+      buildAgentPrompt("please look at this issue", undefined, [issueAttachment]),
+    );
+
+    expect(message.message.content).toEqual([
+      { type: "text", text: "please look at this issue" },
+      { type: "text", text: renderPromptAttachmentAsText(issueAttachment) },
+    ]);
+  });
+
+  test("moves the typed slash command, not an attachment that reads like one", async () => {
+    const chatHistory: AgentAttachment = {
+      type: "text",
+      mimeType: "text/plain",
+      contextKind: "chat_history",
+      text: "/earlier command quoted from another chat",
+    };
+    const message = await captureSdkUserMessage(
+      buildAgentPrompt("/hello please", undefined, [chatHistory, issueAttachment]),
+    );
+
+    expect(message.message.content).toEqual([
+      { type: "text", text: chatHistory.text },
+      { type: "text", text: renderPromptAttachmentAsText(issueAttachment) },
+      { type: "text", text: "/hello please" },
+    ]);
+  });
+
   test("maps Ultracode to xhigh effort and Claude ultracode settings", async () => {
     const { queryFactory } = createQueryMock();
     const client = new ClaudeAgentClient({
@@ -880,13 +1051,42 @@ describe("ClaudeAgentSession features", () => {
 
     expect(queryFactory.mock.calls[0]?.[0].options).toMatchObject({
       effort: "xhigh",
-      thinking: { type: "adaptive" },
+      thinking: { type: "adaptive", display: "summarized" },
       settings: { ultracode: true },
     });
 
     await session.close();
   });
 
+  test("disables Claude hooks for internal agents only", async () => {
+    const { queryFactory } = createQueryMock();
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const internalSession = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      internal: true,
+    });
+    const userSession = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+    });
+
+    await internalSession.startTurn("hello");
+    await userSession.startTurn("hello");
+
+    expect(queryFactory.mock.calls[0]?.[0].options.settings).toMatchObject({
+      disableAllHooks: true,
+    });
+    expect(queryFactory.mock.calls[1]?.[0].options.settings).toBeUndefined();
+
+    await internalSession.close();
+    await userSession.close();
+  });
+
   test("turns Claude thinking off without retaining an effort level", async () => {
     const { queryFactory, launches } = createQueryMock();
     const client = new ClaudeAgentClient({
@@ -1065,7 +1265,9 @@ describe("ClaudeAgentSession features", () => {
 
   test.each([
     ["supported model", "claude-opus-4-8", { type: "disabled" }, undefined],
-    ["unsupported model", "claude-fable-5", { type: "adaptive" }, "high"],
+    ["Mythos 5.1", "claude-mythos-5-1", { type: "adaptive", display: "summarized" }, "high"],
+    ["Haiku 5.5", "claude-haiku-5-5", { type: "disabled" }, undefined],
+    ["unsupported model", "claude-fable-5", { type: "adaptive", display: "summarized" }, "high"],
     ["custom model", "openrouter/anthropic/claude-opus-4-8", undefined, undefined],
     ["provider default", null, undefined, undefined],
   ])("reconciles Off when switching to a %s", async (_label, modelId, thinking, effort) => {
@@ -1111,6 +1313,26 @@ describe("ClaudeAgentSession features", () => {
     await session.close();
   });
 
+  test("rejects disabled thinking on Sonnet 5.5, which only runs with adaptive thinking", async () => {
+    const { queryFactory } = createQueryMock();
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      model: "claude-sonnet-5-5",
+    });
+
+    await expect(session.setThinkingOption?.("off")).rejects.toThrow(
+      "Thinking option 'off' is not available for model 'claude-sonnet-5-5'",
+    );
+
+    await session.close();
+  });
+
   test("rejects an initial disabled-thinking config for an unsupported model", async () => {
     const { queryFactory } = createQueryMock();
     const client = new ClaudeAgentClient({
@@ -1913,13 +2135,15 @@ describe("ClaudeAgentSession context window usage", () => {
   }
 
   function createMessageDeltaEvent(outputTokens: number): Record<string, unknown> {
+    return createMessageDeltaUsageEvent({ output_tokens: outputTokens });
+  }
+
+  function createMessageDeltaUsageEvent(usage: Record<string, unknown>): Record<string, unknown> {
     return {
       type: "stream_event",
       event: {
         type: "message_delta",
-        usage: {
-          output_tokens: outputTokens,
-        },
+        usage,
       },
       session_id: "session-1",
     };
@@ -1981,6 +2205,15 @@ describe("ClaudeAgentSession context window usage", () => {
     };
   }
 
+  function createCompactingStatus(): Record<string, unknown> {
+    return {
+      type: "system",
+      subtype: "status",
+      status: "compacting",
+      session_id: "session-1",
+    };
+  }
+
   test("emits turn_started before the submitted user message", async () => {
     const session = await createSessionForTurns([[]]);
     const events: AgentStreamEvent[] = [];
@@ -2656,6 +2889,119 @@ describe("ClaudeAgentSession context window usage", () => {
     }
   });
 
+  test("message_delta input usage replaces an empty message_start count", async () => {
+    // Translating gateways (LiteLLM in front of an OpenAI-compatible backend) do not know the
+    // prompt size when message_start is emitted, so they report input_tokens: 0 there and send
+    // the cumulative counts on message_delta, as the Anthropic Messages API allows.
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageStartEvent({
+          input_tokens: 0,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 0,
+        }),
+        createMessageDeltaUsageEvent({ input_tokens: 20_236, output_tokens: 64 }),
+        createSuccessResult({
+          usage: {
+            input_tokens: 20_236,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+            output_tokens: 64,
+            iterations: [],
+          },
+        }),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          provider: "claude",
+          usage: {
+            contextWindowUsedTokens: 20_300,
+          },
+        }),
+      );
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "turn_completed",
+          usage: expect.objectContaining({
+            inputTokens: 20_236,
+            outputTokens: 64,
+            contextWindowUsedTokens: 20_300,
+          }),
+        }),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("message_delta without cache counters keeps the message_start cache usage", async () => {
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageStartEvent({
+          input_tokens: 5,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 1_000,
+        }),
+        createMessageDeltaUsageEvent({ input_tokens: 5, output_tokens: 64 }),
+        createSuccessResult(),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          provider: "claude",
+          usage: {
+            contextWindowUsedTokens: 1_069,
+          },
+        }),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("message_delta before this request's message_start does not seed usage", async () => {
+    // A canceled request can leave its terminal message_delta queued behind the next turn.
+    // Nothing is known about the new request until its message_start, so that straggler
+    // must not produce a usage_updated event or leak into the next request's counters.
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageDeltaUsageEvent({ input_tokens: 20_236, output_tokens: 64 }),
+        createMessageStartEvent({
+          input_tokens: 40,
+          cache_creation_input_tokens: 5,
+          cache_read_input_tokens: 10,
+        }),
+        createMessageDeltaEvent(7),
+        createSuccessResult(),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      const usedTokens = events
+        .filter((event) => event.type === "usage_updated")
+        .map((event) => event.usage.contextWindowUsedTokens);
+      expect(usedTokens).toEqual([55, 62]);
+    } finally {
+      await session.close();
+    }
+  });
+
   test("per-request stream usage is not cumulative across API calls in a turn", async () => {
     const session = await createSessionForTurns([
       [
@@ -2857,6 +3203,153 @@ describe("ClaudeAgentSession context window usage", () => {
     }
   });
 
+  test("repeated compacting statuses open a single compaction marker", async () => {
+    const session = await createSessionForTurns([
+      [
+        createCompactingStatus(),
+        createCompactingStatus(),
+        createCompactingStatus(),
+        createCompactBoundary(),
+        createCompactingStatus(),
+        createCompactingStatus(),
+        createCompactBoundary(),
+        createSuccessResult(),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session, "compact twice");
+      const compactions = events.flatMap((event) =>
+        event.type === "timeline" && event.item.type === "compaction" ? [event.item.status] : [],
+      );
+      expect(compactions).toEqual(["loading", "completed", "loading", "completed"]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("reports the plan mode Claude enters on its own with EnterPlanMode", async () => {
+    // Claude Code announces a mode it switched to itself as a status message
+    // carrying the new permissionMode, right after the EnterPlanMode tool call.
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory: createQueryFactoryForTurns([
+        [
+          { ...createInitMessage(), permissionMode: "acceptEdits" },
+          {
+            type: "system",
+            subtype: "status",
+            status: null,
+            permissionMode: "plan",
+            session_id: "session-1",
+          },
+          createSuccessResult(),
+        ],
+      ]),
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      modeId: "acceptEdits",
+    });
+
+    try {
+      const events = await collectStreamEvents(session, "enter plan mode");
+
+      expect(events).toContainEqual(
+        expect.objectContaining({ type: "mode_changed", currentModeId: "plan" }),
+      );
+      expect(await session.getCurrentMode()).toBe("plan");
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("a compaction abandoned mid-turn does not suppress the next compaction marker", async () => {
+    // The first turn starts compacting and then ends without ever reaching a
+    // compact_boundary, so the marker it opened is never resolved.
+    const session = await createSessionForTurns([
+      [createCompactingStatus(), createSuccessResult()],
+      [createCompactingStatus(), createSuccessResult()],
+    ]);
+
+    try {
+      const abandonedTurn = await collectStreamEvents(session, "abandoned compaction");
+      expect(abandonedTurn.filter(isLoadingCompactionEvent)).toHaveLength(1);
+
+      const nextTurn = await collectStreamEvents(session, "next compaction");
+      expect(nextTurn.filter(isLoadingCompactionEvent)).toHaveLength(1);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("an interrupted compaction does not suppress the next compaction marker", async () => {
+    // The first turn starts compacting and is then interrupted, so it never reaches a
+    // compact_boundary and the marker it opened is never resolved.
+    const session = await createSessionForTurns([
+      [createCompactingStatus()],
+      [createCompactingStatus(), createSuccessResult()],
+    ]);
+
+    try {
+      const interruptedTurn: AgentStreamEvent[] = [];
+      const streaming = (async () => {
+        for await (const event of streamSession(session, "interrupted compaction")) {
+          interruptedTurn.push(event);
+        }
+      })();
+
+      await vi.waitFor(() => {
+        expect(interruptedTurn.filter(isLoadingCompactionEvent)).toHaveLength(1);
+      });
+      await session.interrupt();
+      await streaming;
+
+      expect(interruptedTurn).toContainEqual(
+        expect.objectContaining({ type: "turn_canceled", provider: "claude" }),
+      );
+
+      const nextTurn = await collectStreamEvents(session, "next compaction");
+      expect(nextTurn.filter(isLoadingCompactionEvent)).toHaveLength(1);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("a compaction abandoned in an autonomous turn does not suppress the next marker", async () => {
+    // Claude starts a turn of its own after the foreground result, which starts compacting and is
+    // then ended by the next foreground turn, never reaching a boundary.
+    const session = await createSessionForTurns([
+      [
+        createSuccessResult(),
+        createInitMessage(),
+        createMessageStartEvent(),
+        createCompactingStatus(),
+      ],
+      [createCompactingStatus(), createSuccessResult()],
+    ]);
+
+    try {
+      const observed: AgentStreamEvent[] = [];
+      const unsubscribe = session.subscribe((event) => {
+        observed.push(event);
+      });
+
+      await collectStreamEvents(session, "foreground turn");
+      await vi.waitFor(() => {
+        expect(observed.filter(isLoadingCompactionEvent)).toHaveLength(1);
+      });
+      unsubscribe();
+
+      const nextTurn = await collectStreamEvents(session, "next compaction");
+      expect(nextTurn.filter(isLoadingCompactionEvent)).toHaveLength(1);
+    } finally {
+      await session.close();
+    }
+  });
+
   test("result.result is surfaced as an assistant message when no model output was produced", async () => {
     const session = await createSessionForTest();
 
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index b041c3b233..51885f74e8 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -1,8 +1,8 @@
+import { validateProviderOptions } from "../../provider-options.js";
 import type { ChildProcess } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import { promises } from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import {
   type AgentDefinition,
@@ -44,6 +44,7 @@ import {
 } from "./model-manifest.js";
 import { parsePartialJsonObject } from "./partial-json.js";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
+import { readClaudeSubagentHandback } from "./subagent-handback.js";
 import { ClaudeTaskState } from "./task-state.js";
 import {
   ClaudeTaskProtocolSource,
@@ -75,10 +76,16 @@ import {
   type ClaudeProviderOptions,
 } from "./options.js";
 import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
+import { discoverClaudeModels } from "./model-discovery.js";
 import { claudeQuery, type ClaudeOptions, type ClaudeQueryFactory } from "./query.js";
-import { realClaudeRewindSdk, revertClaudeConversation, revertClaudeFiles } from "./rewind.js";
+import {
+  realClaudeRewindSdk,
+  revertClaudeConversation,
+  revertClaudeFiles,
+  type ClaudeRewindSdk,
+} from "./rewind.js";
 import { normalizeProviderReplayTimestamp } from "../../provider-history-timestamps.js";
-import { claudeProjectDirSync } from "./project-dir.js";
+import { claudeConfigDir, claudeProjectDirSync, claudeTranscriptPathSync } from "./project-dir.js";
 import { THINKING_APPLIES_NEXT_TURN_NOTICE } from "../../provider-notices.js";
 import {
   isProviderImageMarkdown,
@@ -125,6 +132,7 @@ import {
   type ProviderCatalog,
   type ProviderRefreshContext,
   type ResolveAgentDefaultModeInput,
+  type ToolCallDetail,
 } from "../../agent-sdk-types.js";
 import { importSessionFromPersistence } from "../../provider-session-import.js";
 import { runProviderRefreshActivity } from "../../provider-refresh-deadline.js";
@@ -287,6 +295,18 @@ interface AsyncMessageInput<T> {
   iterable: AsyncIterable<T>;
 }
 
+interface ClaudeReplayOwnership {
+  restoredIds: ReadonlySet<string>;
+  toolOwners: ReadonlyMap<string, string>;
+  /** The parent's Task calls, keyed by tool-call id, so their cards replay labeled as they were live. */
+  subagentToolCalls: ReadonlyMap<string, ClaudeSubagentCardFacts>;
+}
+
+interface ClaudeSubagentCardFacts {
+  title?: string;
+  description?: string;
+}
+
 interface PersistedTimelineEntry {
   item: AgentTimelineItem;
   timestamp?: string;
@@ -393,13 +413,14 @@ export interface ClaudeContentChunk {
 }
 
 interface ClaudeAgentClientOptions {
+  discoverModels?: typeof discoverClaudeModels;
   defaults?: { agents?: Record<string, AgentDefinition> };
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
   queryFactory?: ClaudeQueryFactory;
   resolveBinary?: () => Promise<string>;
   resolveVersion?: (signal?: AbortSignal) => Promise<string>;
-  configDir?: string;
+  rewindSdk?: ClaudeRewindSdk;
 }
 
 interface ClaudeAgentSessionOptions {
@@ -412,6 +433,7 @@ interface ClaudeAgentSessionOptions {
   logger: Logger;
   queryFactory?: ClaudeQueryFactory;
   resolveBinary: () => Promise<string>;
+  rewindSdk?: ClaudeRewindSdk;
 }
 
 type ClaudeThinkingEffort = "low" | "medium" | "high" | "xhigh" | "max";
@@ -432,6 +454,15 @@ function errorToMessageString(error: unknown): string {
   return "";
 }
 
+/**
+ * Claude opens every main-session turn with system/init and closes it with exactly one result:
+ * a prompt, a wake-up after background work, a slash command, an API error. Background subagents
+ * never emit either on the main stream.
+ */
+function isClaudeTurnInit(message: SDKMessage): boolean {
+  return message.type === "system" && message.subtype === "init";
+}
+
 function firstStringField(
   input: Record<string, unknown>,
   primaryKey: string,
@@ -1485,6 +1516,7 @@ export function readEventIdentifiers(message: SDKMessage): EventIdentifiers {
 }
 
 export class ClaudeAgentClient implements AgentClient {
+  private readonly discoverModels: typeof discoverClaudeModels;
   readonly provider = "claude" as const;
   readonly capabilities = CLAUDE_CAPABILITIES;
 
@@ -1494,9 +1526,10 @@ export class ClaudeAgentClient implements AgentClient {
   private readonly queryFactory?: ClaudeQueryFactory;
   private readonly resolveBinary: () => Promise<string>;
   private readonly resolveVersion: (signal?: AbortSignal) => Promise<string>;
-  private readonly configDir?: string;
+  private readonly rewindSdk: ClaudeRewindSdk;
 
   constructor(options: ClaudeAgentClientOptions) {
+    this.discoverModels = options.discoverModels ?? discoverClaudeModels;
     this.defaults = options.defaults;
     this.logger = options.logger.child({ module: "agent", provider: "claude" });
     this.runtimeSettings = options.runtimeSettings;
@@ -1505,7 +1538,7 @@ export class ClaudeAgentClient implements AgentClient {
     this.resolveVersion =
       options.resolveVersion ??
       ((signal) => resolveClaudeCodeVersion(this.runtimeSettings, signal));
-    this.configDir = options.configDir;
+    this.rewindSdk = options.rewindSdk ?? realClaudeRewindSdk;
   }
 
   resolveConfiguredModel(model: AgentModelDefinition): AgentModelDefinition {
@@ -1527,6 +1560,7 @@ export class ClaudeAgentClient implements AgentClient {
       logger: this.logger,
       queryFactory: this.queryFactory,
       resolveBinary: this.resolveBinary,
+      rewindSdk: this.rewindSdk,
     });
   }
 
@@ -1555,9 +1589,15 @@ export class ClaudeAgentClient implements AgentClient {
       logger: this.logger,
       queryFactory: this.queryFactory,
       resolveBinary: this.resolveBinary,
+      rewindSdk: this.rewindSdk,
     });
   }
 
+  async getCatalogCacheKey(_options: FetchCatalogOptions): Promise<string> {
+    // This client discovers through host configuration, independent of project cwd.
+    return "host";
+  }
+
   async fetchCatalog(
     _options: FetchCatalogOptions,
     context?: ProviderRefreshContext,
@@ -1571,12 +1611,38 @@ export class ClaudeAgentClient implements AgentClient {
     } catch (error) {
       this.logger.warn({ err: error }, "Failed to resolve Claude Code version for model catalog");
     }
+    const env = this.buildProviderEnv();
+    let discoveredModelIds = new Set<string>();
+    try {
+      const advertisedModels = await runProviderRefreshActivity(context, "models", () =>
+        this.discoverModels({
+          resolveBinary: this.resolveBinary,
+          runtimeSettings: this.runtimeSettings,
+          env,
+          signal: context?.signal,
+        }),
+      );
+      discoveredModelIds = new Set(
+        advertisedModels
+          .map((model) => normalizeClaudeRuntimeModelId(model.resolvedModel ?? model.value))
+          .filter((id): id is string => id !== null),
+      );
+    } catch (error) {
+      context?.signal.throwIfAborted();
+      this.logger.warn(
+        { err: error },
+        "Claude model discovery failed; omitting discovery-required models",
+      );
+    }
     const models = await runProviderRefreshActivity(context, "settings", () =>
-      getClaudeModelsWithSettings(this.logger, this.configDir, claudeCodeVersion),
-    );
-    const modeCatalog = claudeModeCatalog(
-      createProviderEnv({ baseEnv: process.env, runtimeSettings: this.runtimeSettings }),
+      getClaudeModelsWithSettings(
+        this.logger,
+        claudeConfigDir(env),
+        claudeCodeVersion,
+        discoveredModelIds,
+      ),
     );
+    const modeCatalog = claudeModeCatalog(env);
     return {
       models,
       ...modeCatalog,
@@ -1584,12 +1650,15 @@ export class ClaudeAgentClient implements AgentClient {
   }
 
   async resolveDefaultModeId({ env: launchEnv }: ResolveAgentDefaultModeInput): Promise<string> {
-    const env = createProviderEnv({
+    return claudeModeCatalog(this.buildProviderEnv(launchEnv)).defaultModeId;
+  }
+
+  private buildProviderEnv(launchEnv?: Record<string, string>): NodeJS.ProcessEnv {
+    return createProviderEnv({
       baseEnv: process.env,
       runtimeSettings: this.runtimeSettings,
       overlays: [launchEnv],
     });
-    return claudeModeCatalog(env).defaultModeId;
   }
 
   async listFeatures(config: AgentSessionConfig): Promise<AgentFeature[]> {
@@ -1603,7 +1672,7 @@ export class ClaudeAgentClient implements AgentClient {
   async listImportableSessions(
     options?: ListImportableSessionsOptions,
   ): Promise<ImportableProviderSession[]> {
-    const configDir = process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
+    const configDir = claudeConfigDir(this.buildProviderEnv());
     const sessionsRoot = options?.cwd
       ? claudeProjectDirSync(options.cwd, { configDir })
       : path.join(configDir, "projects");
@@ -1673,7 +1742,8 @@ export class ClaudeAgentClient implements AgentClient {
       throw new Error(`ClaudeAgentClient received config for provider '${config.provider}'`);
     }
     const model = config.model?.trim();
-    const providerOptions = ClaudeProviderOptionsSchema.parse(config.providerOptions ?? {});
+    const providerOptions =
+      validateProviderOptions("claude", ClaudeProviderOptionsSchema, config.providerOptions) ?? {};
     return {
       ...config,
       provider: "claude",
@@ -1785,30 +1855,59 @@ function extractContextWindowSize(modelUsage: unknown): number | undefined {
   return maxContextWindow;
 }
 
-function readStreamRequestInputTokens(event: Record<string, unknown>): number | undefined {
-  const messageUsage = toObjectRecord(toObjectRecord(event.message)?.usage);
-  if (!messageUsage) {
+interface StreamRequestInputUsage {
+  inputTokens: number;
+  cacheCreationInputTokens: number;
+  cacheReadInputTokens: number;
+}
+
+function readUsageCount(usage: Record<string, unknown>, key: string): number | undefined {
+  const value = usage[key];
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
     return undefined;
   }
-  const usage = messageUsage;
-  const inputTokens =
-    typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens)
-      ? usage.input_tokens
-      : undefined;
-  const cacheCreationInputTokens =
-    typeof usage.cache_creation_input_tokens === "number" &&
-    Number.isFinite(usage.cache_creation_input_tokens)
-      ? usage.cache_creation_input_tokens
-      : 0;
-  const cacheReadInputTokens =
-    typeof usage.cache_read_input_tokens === "number" &&
-    Number.isFinite(usage.cache_read_input_tokens)
-      ? usage.cache_read_input_tokens
-      : 0;
-  if (typeof inputTokens !== "number" || inputTokens < 0) {
+  return value;
+}
+
+function readStreamRequestInputUsage(
+  event: Record<string, unknown>,
+): StreamRequestInputUsage | undefined {
+  const usage = toObjectRecord(toObjectRecord(event.message)?.usage);
+  if (!usage) {
     return undefined;
   }
-  return inputTokens + cacheCreationInputTokens + cacheReadInputTokens;
+  const inputTokens = readUsageCount(usage, "input_tokens");
+  if (inputTokens === undefined) {
+    return undefined;
+  }
+  return {
+    inputTokens,
+    cacheCreationInputTokens: readUsageCount(usage, "cache_creation_input_tokens") ?? 0,
+    cacheReadInputTokens: readUsageCount(usage, "cache_read_input_tokens") ?? 0,
+  };
+}
+
+/**
+ * The input counters on `message_delta.usage` are cumulative whole-request totals and are
+ * optional. Mirror the Anthropic SDK's MessageStream: a counter present on the delta replaces
+ * the `message_start` value, a missing counter keeps it. Translating gateways report
+ * `input_tokens: 0` on `message_start` and only know the real count by `message_delta`.
+ */
+function mergeStreamDeltaInputUsage(
+  current: StreamRequestInputUsage,
+  event: Record<string, unknown>,
+): StreamRequestInputUsage {
+  const usage = toObjectRecord(event.usage);
+  if (!usage) {
+    return current;
+  }
+  return {
+    inputTokens: readUsageCount(usage, "input_tokens") ?? current.inputTokens,
+    cacheCreationInputTokens:
+      readUsageCount(usage, "cache_creation_input_tokens") ?? current.cacheCreationInputTokens,
+    cacheReadInputTokens:
+      readUsageCount(usage, "cache_read_input_tokens") ?? current.cacheReadInputTokens,
+  };
 }
 
 function readStreamRequestOutputTokens(event: Record<string, unknown>): number | undefined {
@@ -1877,13 +1976,18 @@ function readClaudeParentToolUseId(message: SDKMessage): string | null {
   if (!("parent_tool_use_id" in message)) {
     return null;
   }
+  // Claude Code's liveness tick for a tool still running after 30 s names that tool as its
+  // parent, so a long main-thread call would otherwise read as a subagent.
+  if (message.type === "tool_progress" && message.heartbeat === true) {
+    return null;
+  }
   const parentToolUseId = (message as { parent_tool_use_id?: unknown }).parent_tool_use_id;
   return typeof parentToolUseId === "string" && parentToolUseId.length > 0 ? parentToolUseId : null;
 }
 
 class ClaudeContextUsageState {
   private contextWindowMaxTokens: number | undefined;
-  private streamRequestInputTokens: number | undefined;
+  private streamRequestInputUsage: StreamRequestInputUsage | undefined;
   private streamRequestOutputTokens: number | undefined;
   private compactedContextWindowUsedTokens: number | undefined;
   private completedResultTurns = 0;
@@ -1893,7 +1997,7 @@ class ClaudeContextUsageState {
   }
 
   beginTurn(): void {
-    this.streamRequestInputTokens = undefined;
+    this.streamRequestInputUsage = undefined;
     this.streamRequestOutputTokens = undefined;
     this.compactedContextWindowUsedTokens = undefined;
   }
@@ -1917,11 +2021,11 @@ class ClaudeContextUsageState {
     }
     const eventType = readTrimmedString(streamEvent.type);
     if (eventType === "message_start") {
-      const inputTokens = readStreamRequestInputTokens(streamEvent);
-      if (typeof inputTokens !== "number") {
+      const inputUsage = readStreamRequestInputUsage(streamEvent);
+      if (!inputUsage) {
         return null;
       }
-      this.streamRequestInputTokens = inputTokens;
+      this.streamRequestInputUsage = inputUsage;
       this.streamRequestOutputTokens = 0;
     } else if (eventType === "message_delta") {
       const outputTokens = readStreamRequestOutputTokens(streamEvent);
@@ -1929,6 +2033,12 @@ class ClaudeContextUsageState {
         return null;
       }
       this.streamRequestOutputTokens = outputTokens;
+      if (this.streamRequestInputUsage) {
+        this.streamRequestInputUsage = mergeStreamDeltaInputUsage(
+          this.streamRequestInputUsage,
+          streamEvent,
+        );
+      }
     } else {
       return null;
     }
@@ -1975,13 +2085,15 @@ class ClaudeContextUsageState {
   }
 
   private streamUsedTokens(): number | undefined {
-    if (
-      typeof this.streamRequestInputTokens !== "number" ||
-      typeof this.streamRequestOutputTokens !== "number"
-    ) {
+    const inputUsage = this.streamRequestInputUsage;
+    if (!inputUsage || typeof this.streamRequestOutputTokens !== "number") {
       return undefined;
     }
-    const usedTokens = this.streamRequestInputTokens + this.streamRequestOutputTokens;
+    const usedTokens =
+      inputUsage.inputTokens +
+      inputUsage.cacheCreationInputTokens +
+      inputUsage.cacheReadInputTokens +
+      this.streamRequestOutputTokens;
     return usedTokens > 0 ? usedTokens : undefined;
   }
 
@@ -2000,7 +2112,7 @@ class ClaudeContextUsageState {
   }
 
   buildCompactionUsageEvent(postTokens: number | undefined): AgentStreamEvent {
-    this.streamRequestInputTokens = undefined;
+    this.streamRequestInputUsage = undefined;
     this.streamRequestOutputTokens = undefined;
     this.compactedContextWindowUsedTokens = postTokens;
     const usage: AgentUsage = {};
@@ -2032,17 +2144,20 @@ class ClaudeAgentSession implements AgentSession {
   private readonly queryFactory?: ClaudeQueryFactory;
   private readonly resolveBinary: () => Promise<string>;
   private query: Query | null = null;
+  private readonly harnessEnvironment: Record<string, string>;
+  private readonly usageSessionKey = randomUUID();
   private childProcess: ChildProcess | null = null;
   private input: AsyncMessageInput<SDKUserMessage> | null = null;
   /** The exact SDK query/input pair that owns the current foreground turn. */
   private activeForegroundQuery: Query | null = null;
   private activeForegroundInput: AsyncMessageInput<SDKUserMessage> | null = null;
   /**
-   * Steers pushed into the live SDK input that Claude may not have read yet. Interrupting the turn
-   * has to discard them, or the SDK dequeues one and resumes the turn we just stopped. SDK user
-   * UUIDs are provider-private; never let them escape the adapter boundary.
+   * Messages pushed into the live SDK input (steers, and a foreground turn's own prompt) whose
+   * command_lifecycle has not reached "started". Interrupting has to withdraw them, or the SDK
+   * dequeues one and resumes the turn we just stopped. SDK user UUIDs are provider-private; never
+   * let them escape the adapter boundary.
    */
-  private readonly queuedSteerUuids = new Set<string>();
+  private readonly unstartedMessageUuids = new Set<string>();
   /** Human steers whose text has not reached Claude yet and therefore supersede blocking cards. */
   private readonly permissionClearingSteerUuids = new Set<string>();
   private claudeSessionId: string | null;
@@ -2053,6 +2168,7 @@ class ClaudeAgentSession implements AgentSession {
   private toolUseCache = new Map<string, ToolUseCacheEntry>();
   private toolUseIndexToId = new Map<number, string>();
   private toolUseInputBuffers = new Map<string, string>();
+  private subagentHandbackIds = new Set<string>();
   private pendingPermissions = new Map<string, PendingPermission>();
   private activeForegroundTurnId: string | null = null;
   private autonomousTurn: AutonomousTurnState | null = null;
@@ -2069,7 +2185,11 @@ class ClaudeAgentSession implements AgentSession {
     // identity and status from frames for them. Detecting the capability beats comparing version
     // strings: it reacts to what this session actually does.
     isDescriptorOwnedElsewhere: () => this.taskProtocolSource.isActive,
+    // The parent's tool call owns its card once its result arrives. A background child streams
+    // its frames after Claude has already answered the call, and re-emitting the card from them
+    // would replace the settled card with an unlabeled, running one.
     needsSyntheticParentToolCard: (toolUseId) =>
+      this.toolUseCache.has(toolUseId) &&
       this.taskProtocolSource.needsSyntheticParentToolCard(toolUseId),
   });
   private persistedHistory: PersistedTimelineEntry[] = [];
@@ -2085,15 +2205,23 @@ class ClaudeAgentSession implements AgentSession {
   private lastOptionsModel: string | null = null;
   private lastRuntimeModel: string | null = null;
   private compacting = false;
+  private compactionMarkerOpen = false;
   private queryPumpPromise: Promise<void> | null = null;
   private queryRestartNeeded = false;
   private pendingInterruptAbort = false;
+  /**
+   * Whether Claude's main session is inside one of its own turns: set by system/init and by a
+   * pushed message's command_lifecycle "started" (/compact works for seconds before its init),
+   * cleared by the turn's result or an idle session state. See observeMainTurnBracket.
+   */
+  private mainTurnInFlight = false;
   private foregroundHasVisibleActivity = false;
   private activeTurnHasAssistantText = false;
   private readonly contextUsage: ClaudeContextUsageState;
   private userMessageIds: string[] = [];
   private readonly emittedUserMessageIds = new Set<string>();
   private readonly rewindTurnAnchors: ClaudeRewindTurnAnchor[] = [];
+  private readonly rewindSdk: ClaudeRewindSdk;
   private pendingFreshSessionId: string | null = null;
   private recentStderr = "";
   private closed = false;
@@ -2105,10 +2233,12 @@ class ClaudeAgentSession implements AgentSession {
     this.agentId = options.agentId;
     this.defaults = options.defaults;
     this.runtimeSettings = options.runtimeSettings;
+    this.harnessEnvironment = this.buildSdkEnv();
     this.persistSession = options.persistSession;
     this.logger = options.logger.child({ agentId: this.agentId });
     this.queryFactory = options.queryFactory;
     this.resolveBinary = options.resolveBinary;
+    this.rewindSdk = options.rewindSdk ?? realClaudeRewindSdk;
     this.contextUsage = new ClaudeContextUsageState(
       findClaudeModel(this.config.model)?.contextWindowMaxTokens,
     );
@@ -2231,6 +2361,7 @@ class ClaudeAgentSession implements AgentSession {
     this.contextUsage.beginTurn();
     this.transitionTurnState("foreground", "foreground turn started");
     this.clearRecentStderr();
+    if (sdkUserMessageId) this.unstartedMessageUuids.add(sdkUserMessageId);
 
     let cancelIssued = false;
     const requestCancel = () => {
@@ -2241,13 +2372,18 @@ class ClaudeAgentSession implements AgentSession {
       if (this.cancelCurrentTurn === requestCancel) {
         this.cancelCurrentTurn = null;
       }
+      // Whether Claude has this message in hand. A late idle from the previous turn can clear
+      // mainTurnInFlight after Claude started it, so the message's own lifecycle counts too.
+      const claudeStartedTurn =
+        this.mainTurnInFlight ||
+        (sdkUserMessageId !== null && !this.unstartedMessageUuids.has(sdkUserMessageId));
       this.rejectAllPendingPermissions(new Error("Permission request canceled"));
       this.finishForegroundTurn({
         type: "turn_canceled",
         provider: "claude",
         reason: "Interrupted",
       });
-      void this.interruptActiveTurn().catch((error) => {
+      void this.interruptActiveTurn(claudeStartedTurn).catch((error) => {
         this.logger.warn({ err: error }, "Failed to interrupt during cancel");
       });
     };
@@ -2257,6 +2393,11 @@ class ClaudeAgentSession implements AgentSession {
 
     try {
       await this.ensureQuery();
+      if (cancelIssued) {
+        // Stopped while Claude was still starting up: withdrawn by never sending it.
+        if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
+        return { turnId };
+      }
       if (!this.input) {
         throw new Error("Claude session input stream not initialized");
       }
@@ -2270,6 +2411,7 @@ class ClaudeAgentSession implements AgentSession {
         }
       }, 0);
     } catch (error) {
+      if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
       this.finishForegroundTurn(
         this.buildTurnFailedEvent(error instanceof Error ? error.message : "Claude stream failed"),
       );
@@ -2318,7 +2460,7 @@ class ClaudeAgentSession implements AgentSession {
     clearPendingPermissions: boolean,
   ): void {
     const uuid = message.uuid;
-    if (uuid) this.queuedSteerUuids.add(uuid);
+    if (uuid) this.unstartedMessageUuids.add(uuid);
     if (uuid && clearPendingPermissions) {
       this.permissionClearingSteerUuids.add(uuid);
     }
@@ -2329,7 +2471,7 @@ class ClaudeAgentSession implements AgentSession {
       }
     } catch (error) {
       if (uuid) {
-        this.queuedSteerUuids.delete(uuid);
+        this.unstartedMessageUuids.delete(uuid);
         this.permissionClearingSteerUuids.delete(uuid);
       }
       throw error;
@@ -2398,10 +2540,17 @@ class ClaudeAgentSession implements AgentSession {
     }
 
     const normalized = isPermissionMode(modeId) ? modeId : "default";
-    assertClaudeModeCanRun(normalized, this.buildSdkEnv());
+    assertClaudeModeCanRun(normalized, this.harnessEnvironment);
     const previousMode = this.currentMode;
-    const activeQuery = await this.ensureQuery();
-    await activeQuery.setPermissionMode(normalized);
+    const launchesQuery = !this.query || this.queryRestartNeeded;
+    const activeQuery = await this.ensureQuery(normalized);
+    try {
+      await activeQuery.setPermissionMode(normalized);
+    } catch (error) {
+      // The query was launched in the rejected mode; relaunch in the current mode next time.
+      if (launchesQuery) this.queryRestartNeeded = true;
+      throw error;
+    }
     if (normalized === "plan") {
       if (previousMode !== "plan") {
         this.planResumeMode = previousMode;
@@ -2504,9 +2653,8 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   /**
-   * A denied request is the only record the transcript gets. Plans especially:
-   * the pending card is the only place the plan text lives, so losing it means
-   * the user can no longer read what they just declined.
+   * Settle the original call immediately, before waiting for the SDK tool result.
+   * Plan resolution must use the native call ID so it cannot move past a follow-up.
    */
   private recordDeniedPermissionTimeline(
     request: AgentPermissionRequest,
@@ -2527,28 +2675,24 @@ class ClaudeAgentSession implements AgentSession {
       return;
     }
     if (request.kind === "plan") {
-      let planText: string | null = null;
-      if (typeof request.metadata?.planText === "string") {
-        planText = request.metadata.planText;
-      } else if (typeof request.input?.plan === "string") {
-        planText = request.input.plan;
-      }
-      if (!planText) return;
-      this.pushToolCall({
-        type: "tool_call",
-        name: "plan_approval",
-        callId: request.id,
-        status: "completed",
-        error: null,
-        detail: { type: "plan", text: planText },
-        metadata: {
-          approved: false,
-          actionId: response.selectedActionId ?? "reject",
-        },
-      });
+      this.pushToolCall(
+        mapClaudeFailedToolCall({
+          name: "ExitPlanMode",
+          callId: this.planToolCallId(request),
+          input: request.input,
+          error: response.message ?? "Permission denied",
+          metadata: { actionId: response.selectedActionId ?? "reject" },
+        }),
+      );
     }
   }
 
+  private planToolCallId(request: AgentPermissionRequest): string {
+    return typeof request.metadata?.toolUseId === "string"
+      ? request.metadata.toolUseId
+      : request.id;
+  }
+
   private resolveDeniedPermission(
     request: AgentPermissionRequest,
     response: Extract<AgentPermissionResponse, { behavior: "deny" }>,
@@ -2599,8 +2743,8 @@ class ClaudeAgentSession implements AgentSession {
         await this.setMode(targetMode);
         this.pushToolCall(
           mapClaudeCompletedToolCall({
-            name: "plan_approval",
-            callId: pending.request.id,
+            name: "ExitPlanMode",
+            callId: this.planToolCallId(pending.request),
             input: pending.request.input ?? null,
             output: {
               approved: true,
@@ -2642,11 +2786,12 @@ class ClaudeAgentSession implements AgentSession {
     if (!this.claudeSessionId) {
       return null;
     }
+    const { providerOptions: _providerOptions, ...persistedConfig } = this.config;
     this.persistence = {
       provider: "claude",
       sessionId: this.claudeSessionId,
       nativeHandle: this.claudeSessionId,
-      metadata: { ...this.config },
+      metadata: { ...persistedConfig },
     };
     return this.persistence;
   }
@@ -2754,7 +2899,7 @@ class ClaudeAgentSession implements AgentSession {
       return;
     }
     await revertClaudeConversation({
-      sdk: realClaudeRewindSdk,
+      sdk: this.rewindSdk,
       sessionId: this.claudeSessionId,
       messageId: target.messageId,
       resolveMessageId: (messageId) => this.resolveClaudeMessageId(messageId),
@@ -3035,6 +3180,13 @@ class ClaudeAgentSession implements AgentSession {
     if (!messageId) {
       return;
     }
+    // Subagent frames ride the same stream as the conversation, but their uuids live on the
+    // subagent's sidechain, so forkSession cannot resolve one. Anchoring a turn on one leaves
+    // rewind throwing "Message <uuid> not found in session". The persisted history path already
+    // skips sidechain entries; the live stream has to skip them too.
+    if (readClaudeParentToolUseId(message)) {
+      return;
+    }
     if (
       message.type === "user" &&
       !isSyntheticUserEntry(message) &&
@@ -3070,20 +3222,21 @@ class ClaudeAgentSession implements AgentSession {
       throw new Error(`Claude rewind target ${messageId} is not in the tracked conversation`);
     }
 
-    if (index === 0) {
-      return { kind: "fresh-session" };
+    // A turn the model never answered — an instant gateway error, or an abort before the first
+    // token — leaves its anchor without an assistant id, and carries no conversation state worth
+    // preserving. Fork at the most recent turn before the target that did answer. Reading only
+    // the immediately preceding anchor let one such turn fail every later rewind in the
+    // conversation.
+    for (let previous = index - 1; previous >= 0; previous -= 1) {
+      const assistantMessageId = this.rewindTurnAnchors[previous]?.assistantMessageId;
+      if (assistantMessageId) {
+        return { kind: "fork", messageId: assistantMessageId };
+      }
     }
-
-    const previousTurn = this.rewindTurnAnchors[index - 1];
-    if (!previousTurn?.assistantMessageId) {
-      throw new Error(
-        `Claude rewind cannot preserve turn ${index} because its assistant response id was not observed`,
-      );
-    }
-    return { kind: "fork", messageId: previousTurn.assistantMessageId };
+    return { kind: "fresh-session" };
   }
 
-  private async ensureQuery(): Promise<Query> {
+  private async ensureQuery(launchMode: PermissionMode = this.currentMode): Promise<Query> {
     if (this.query && !this.queryRestartNeeded) {
       return this.query;
     }
@@ -3127,9 +3280,11 @@ class ClaudeAgentSession implements AgentSession {
     this.persistence = null;
 
     const input = createAsyncMessageInput<SDKUserMessage>();
-    const options = await this.buildOptions();
+    const options = await this.buildOptions(launchMode);
     this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
     this.input = input;
+    // A fresh Claude process has no turn of its own in flight.
+    this.mainTurnInFlight = false;
     this.query = claudeQuery(
       { prompt: input.iterable, options },
       {
@@ -3213,10 +3368,18 @@ class ClaudeAgentSession implements AgentSession {
       return { thinking: { type: "disabled" }, effort: undefined, ultracode: false };
     }
     if (thinkingOptionId === CLAUDE_ULTRACODE_THINKING_OPTION_ID) {
-      return { thinking: { type: "adaptive" }, effort: "xhigh", ultracode: true };
+      return {
+        thinking: { type: "adaptive", display: "summarized" },
+        effort: "xhigh",
+        ultracode: true,
+      };
     }
     if (thinkingOptionId && isClaudeThinkingEffort(thinkingOptionId)) {
-      return { thinking: { type: "adaptive" }, effort: thinkingOptionId, ultracode: false };
+      return {
+        thinking: { type: "adaptive", display: "summarized" },
+        effort: thinkingOptionId,
+        ultracode: false,
+      };
     }
     return { thinking: undefined, effort: undefined, ultracode: false };
   }
@@ -3227,15 +3390,30 @@ class ClaudeAgentSession implements AgentSession {
     );
   }
 
-  private buildSdkEnv(): NodeJS.ProcessEnv {
+  usageSession() {
+    if (this.closed) return null;
+    return {
+      provider: "claude",
+      model: this.config.model,
+      env: this.harnessEnvironment,
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
+  private buildSdkEnv() {
     return createProviderEnv({
       baseEnv: process.env,
       runtimeSettings: this.runtimeSettings,
-      overlays: [this.launchEnv],
+      overlays: [
+        this.launchEnv,
+        // Makes the CLI announce session_state_changed, whose "idle" is the safety net that closes
+        // an autonomous turn (see consumeSessionStateChange).
+        { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" },
+      ],
     });
   }
 
-  private async buildOptions(): Promise<ClaudeOptions> {
+  private async buildOptions(permissionMode: PermissionMode): Promise<ClaudeOptions> {
     const { thinking, effort, ultracode } = this.resolveThinkingConfig();
     const appendedSystemPrompt = this.buildAppendedSystemPrompt();
     const providerOptions = applyClaudeToolPolicy(
@@ -3243,8 +3421,8 @@ class ClaudeAgentSession implements AgentSession {
       this.config.toolPolicy,
     );
     const settingsOptions = this.buildSettingsOptions(providerOptions, { ultracode });
-    const sdkEnv = this.buildSdkEnv();
-    assertClaudeModeCanRun(this.currentMode, sdkEnv);
+    const sdkEnv = this.harnessEnvironment;
+    assertClaudeModeCanRun(permissionMode, sdkEnv);
 
     const claudeBinary = await this.resolveBinary();
     this.logger.debug(
@@ -3267,7 +3445,7 @@ class ClaudeAgentSession implements AgentSession {
     const base: ClaudeOptions = {
       cwd: this.config.cwd,
       includePartialMessages: true,
-      permissionMode: this.currentMode,
+      permissionMode,
       // Dynamic mode switching can recreate the underlying Claude query. Keep the
       // bypass launch capability available so later setPermissionMode("bypassPermissions")
       // calls do not fail after a model/thinking/rewind-driven restart.
@@ -3298,6 +3476,10 @@ class ClaudeAgentSession implements AgentSession {
       ...settingsOptions,
       // Provider subagent panes render the child's nested transcript.
       forwardSubagentText: true,
+      // Stop and replace abort only the main turn, like Esc in Claude Code, and background
+      // subagents keep running. Without this declaration an interrupt kills every one of them.
+      // Claude stops a helper itself with its TaskStop tool.
+      perTaskStopAffordance: true,
       hooks: this.buildSubagentEffortHooks(),
       ...(this.persistSession === undefined ? {} : { persistSession: this.persistSession }),
       env: sdkEnv,
@@ -3328,13 +3510,17 @@ class ClaudeAgentSession implements AgentSession {
     input: { ultracode: boolean },
   ): Pick<ClaudeOptions, "settings"> | Record<string, never> {
     const fastMode = this.resolveFastModeSetting();
-    if (fastMode === null && !input.ultracode) {
+    // Internal agents do daemon work such as naming a branch, so the user's and
+    // project's hooks must not run for them.
+    const disableAllHooks = this.config.internal === true;
+    if (fastMode === null && !input.ultracode && !disableAllHooks) {
       return {};
     }
     return {
       settings: mergeClaudeSettings(providerOptions.settings, {
         ...(fastMode === null ? {} : { fastMode }),
         ...(input.ultracode ? { ultracode: true } : {}),
+        ...(disableAllHooks ? { disableAllHooks: true } : {}),
       }),
     };
   }
@@ -3368,9 +3554,19 @@ class ClaudeAgentSession implements AgentSession {
           };
         }
     > = [];
+    // Claude Code expands a slash command only when it is the last content block of the user
+    // message. buildAgentPrompt places the typed text ahead of images and rendered attachments,
+    // so a "/command" sent with a pasted link or a screenshot would otherwise reach the model as
+    // literal text instead of the command it names.
+    let typedSlashCommandIndex = -1;
     if (Array.isArray(prompt)) {
       for (const chunk of prompt) {
         if (chunk.type === "text") {
+          // Attachments rendered as text always carry a mimeType; the composer's typed text does
+          // not. Only the typed block can be a slash command the user meant to invoke.
+          if (!("mimeType" in chunk) && this.parseSlashCommandInput(chunk.text)) {
+            typedSlashCommandIndex = content.length;
+          }
           content.push({ type: "text", text: chunk.text });
         } else if (chunk.type === "image") {
           if (isImageMimeType(chunk.mimeType)) {
@@ -3390,6 +3586,10 @@ class ClaudeAgentSession implements AgentSession {
     } else {
       content.push({ type: "text", text: prompt });
     }
+    if (typedSlashCommandIndex >= 0 && typedSlashCommandIndex < content.length - 1) {
+      const [slashCommand] = content.splice(typedSlashCommandIndex, 1);
+      content.push(slashCommand);
+    }
 
     const messageId = randomUUID();
     this.rememberUserMessageId(messageId);
@@ -3562,6 +3762,7 @@ class ClaudeAgentSession implements AgentSession {
     this.activeForegroundInput = null;
     this.cancelCurrentTurn = null;
     this.activeTurnHasAssistantText = false;
+    this.compactionMarkerOpen = false;
     this.syncTurnState("foreground turn terminal");
   }
 
@@ -3573,6 +3774,7 @@ class ClaudeAgentSession implements AgentSession {
     }
 
     if (terminalSeen) {
+      this.compactionMarkerOpen = false;
       if (this.activeForegroundTurnId) {
         this.activeForegroundTurnId = null;
         this.activeForegroundQuery = null;
@@ -3614,6 +3816,7 @@ class ClaudeAgentSession implements AgentSession {
     this.activeForegroundQuery = null;
     this.activeForegroundInput = null;
     this.activeTurnHasAssistantText = false;
+    this.compactionMarkerOpen = false;
     this.syncTurnState("autonomous turn completed");
   }
 
@@ -3807,35 +4010,67 @@ class ClaudeAgentSession implements AgentSession {
     return false;
   }
 
-  private isAssistantishMessage(message: SDKMessage): boolean {
-    return (
-      message.type === "assistant" ||
-      message.type === "stream_event" ||
-      message.type === "tool_progress" ||
-      (message.type === "system" && message.subtype === "task_notification")
-    );
+  /**
+   * Claude's account of whether anything in the session is working, which is not the same as the
+   * main session working: Claude Code 2.1.280 stays "running" for as long as any background
+   * subagent is alive. So "running" never opens a turn.
+   *
+   * "idle" means nothing at all is running, so it closes an autonomous turn whatever opened it.
+   * It never closes a foreground turn: an idle can trail the previous turn and land just after a
+   * new send, and it must not end that send.
+   *
+   * Returns true when the frame was a state change, which is bookkeeping and never reaches the
+   * timeline.
+   */
+  private consumeSessionStateChange(message: SDKMessage): boolean {
+    if (message.type !== "system" || message.subtype !== "session_state_changed") {
+      return false;
+    }
+    if (message.state === "idle") {
+      this.mainTurnInFlight = false;
+      this.completeAutonomousTurn();
+    }
+    return true;
+  }
+
+  /** Tracks mainTurnInFlight from Claude's own turn brackets (isClaudeTurnInit). */
+  private observeMainTurnBracket(message: SDKMessage): void {
+    if (message.type === "result") {
+      this.mainTurnInFlight = false;
+      return;
+    }
+    if (isClaudeTurnInit(message)) {
+      this.mainTurnInFlight = true;
+      // A new turn has begun, so the interrupted one is over. An interrupt that landed after its
+      // turn had already ended gets no result, and the leftover flag would swallow this turn's.
+      this.pendingInterruptAbort = false;
+      return;
+    }
+    if (readClaudeCommandLifecycle(message)?.state === "started") {
+      this.mainTurnInFlight = true;
+    }
   }
 
   /**
-   * Claude keeps talking about the request it was told to kill — the notification for the tool it
-   * just stopped, trailing assistant output. That is not new work, so it must not open a turn: the
-   * only message that would close that turn is the result shouldSuppressStaleResult drops, leaving
-   * the agent stuck reporting "running" forever.
+   * Only the main session's own turn start opens an autonomous turn. Everything a background
+   * subagent emits (its task frames, its own background jobs' notifications, rate limit events)
+   * arrives outside one, and no result would ever close a turn it opened.
    */
-  private shouldStartAutonomousTurn(message: SDKMessage): boolean {
-    if (this.activeForegroundTurnId || this.pendingInterruptAbort) {
-      return false;
-    }
-    return this.isAssistantishMessage(message);
+  private opensAutonomousTurn(message: SDKMessage): boolean {
+    return isClaudeTurnInit(message) && !this.activeForegroundTurnId;
   }
 
   private async routeSdkMessageFromPump(message: SDKMessage): Promise<void> {
+    if (this.consumeSessionStateChange(message)) {
+      return;
+    }
+    this.observeMainTurnBracket(message);
     if (this.shouldSuppressStaleResult(message)) {
       return;
     }
 
     const isForeground = Boolean(this.activeForegroundTurnId);
-    if (this.shouldStartAutonomousTurn(message)) {
+    if (this.opensAutonomousTurn(message)) {
       this.startAutonomousTurn();
     }
     if (!isForeground && !this.autonomousTurn && message.type === "result") {
@@ -3977,7 +4212,13 @@ class ClaudeAgentSession implements AgentSession {
     return true;
   }
 
-  private async interruptActiveTurn(): Promise<void> {
+  /**
+   * Interrupts Claude only when a turn of its main session is running. With nothing running there
+   * is nothing to stop but our own queued messages, so those are withdrawn instead: an interrupt
+   * would reach only background helpers (and kill them on a CLI that ignores
+   * perTaskStopAffordance), and no result would follow to consume pendingInterruptAbort.
+   */
+  private async interruptActiveTurn(claudeStartedTurn = this.mainTurnInFlight): Promise<void> {
     const queryToInterrupt = this.query;
     if (!queryToInterrupt || typeof queryToInterrupt.interrupt !== "function") {
       this.logger.trace(
@@ -3991,8 +4232,16 @@ class ClaudeAgentSession implements AgentSession {
       );
       return;
     }
-    this.pendingInterruptAbort = true;
-    await this.discardQueuedSteers(queryToInterrupt);
+    if (claudeStartedTurn) {
+      this.pendingInterruptAbort = true;
+      await this.withdrawUnstartedMessages(queryToInterrupt);
+    } else {
+      // Claude can dequeue a message for its next turn before announcing it started; withdrawing
+      // it is then a no-op, and only an interrupt stops it. Withdraw once: a prompt sent while
+      // this withdrawal was in flight belongs to the next turn.
+      if (await this.withdrawUnstartedMessages(queryToInterrupt)) return;
+      this.pendingInterruptAbort = true;
+    }
     try {
       await this.awaitWithTimeout(
         queryToInterrupt.interrupt(),
@@ -4004,14 +4253,15 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   /**
-   * Interrupt means interrupt: a steer Claude never read dies with the turn instead of resuming it.
-   * A steer already dequeued cannot be recalled, and does not need to be — the interrupt kills it.
+   * Interrupt means interrupt: a message Claude never started dies with the turn instead of
+   * resuming it. One already dequeued cannot be recalled, and does not need to be, since the
+   * interrupt kills it. Returns whether Claude confirmed every message withdrawn.
    */
-  private async discardQueuedSteers(query: Query): Promise<void> {
-    const uuids = [...this.queuedSteerUuids];
-    this.queuedSteerUuids.clear();
+  private async withdrawUnstartedMessages(query: Query): Promise<boolean> {
+    const uuids = [...this.unstartedMessageUuids];
+    this.unstartedMessageUuids.clear();
     this.permissionClearingSteerUuids.clear();
-    if (uuids.length === 0) return;
+    if (uuids.length === 0) return true;
     // The SDK runtime supports this, but its public Query type has not caught up. Keep the
     // compatibility escape hatch inside the Claude adapter.
     const cancelAsyncMessage = (
@@ -4019,14 +4269,17 @@ class ClaudeAgentSession implements AgentSession {
         cancelAsyncMessage?: (uuid: string) => Promise<boolean>;
       }
     ).cancelAsyncMessage;
-    if (!cancelAsyncMessage) return;
+    if (!cancelAsyncMessage) return false;
+    let withdrewAll = true;
     for (const uuid of uuids) {
       try {
-        await cancelAsyncMessage.call(query, uuid);
+        if (!(await cancelAsyncMessage.call(query, uuid))) withdrewAll = false;
       } catch (error) {
-        this.logger.warn({ err: error }, "Failed to discard a queued Claude steer");
+        withdrewAll = false;
+        this.logger.warn({ err: error }, "Failed to withdraw a queued Claude message");
       }
     }
+    return withdrewAll;
   }
 
   private translateMessageToEvents(
@@ -4075,7 +4328,7 @@ class ClaudeAgentSession implements AgentSession {
       }
     }
 
-    this.forgetReadSteer(message);
+    this.forgetStartedMessage(message);
 
     switch (message.type) {
       case "system":
@@ -4109,11 +4362,14 @@ class ClaudeAgentSession implements AgentSession {
     return events;
   }
 
-  /** Once Claude has read a steer there is nothing left to discard on interrupt. */
-  private forgetReadSteer(message: unknown): void {
+  /**
+   * Once Claude has started a message, or cancelled it, there is nothing left to withdraw on
+   * interrupt.
+   */
+  private forgetStartedMessage(message: unknown): void {
     const lifecycle = readClaudeCommandLifecycle(message);
     if (!lifecycle || lifecycle.state === "queued") return;
-    this.queuedSteerUuids.delete(lifecycle.commandUuid);
+    this.unstartedMessageUuids.delete(lifecycle.commandUuid);
     this.permissionClearingSteerUuids.delete(lifecycle.commandUuid);
   }
 
@@ -4162,6 +4418,9 @@ class ClaudeAgentSession implements AgentSession {
   private buildSubagentToolCallCard(
     declaration: Extract<SubagentObservation, { kind: "declared" }>,
   ): AgentStreamEvent | null {
+    // The launching sidechain already owns and renders this tool call. Mirroring it into the
+    // managed parent's transcript would flatten both the card and the child relationship.
+    if (declaration.parentSubagentId) return null;
     const toolCall = mapClaudeRunningToolCall({
       name: "Task",
       callId: declaration.id,
@@ -4172,16 +4431,7 @@ class ClaudeAgentSession implements AgentSession {
     return {
       type: "timeline",
       provider: "claude",
-      item: {
-        ...toolCall,
-        detail: {
-          type: "sub_agent",
-          ...(declaration.title ? { subAgentType: declaration.title } : {}),
-          ...(declaration.description ? { description: declaration.description } : {}),
-          log: "",
-          actions: [],
-        },
-      },
+      item: { ...toolCall, detail: buildClaudeSubagentCardDetail(declaration) },
     };
   }
 
@@ -4244,18 +4494,38 @@ class ClaudeAgentSession implements AgentSession {
       return;
     }
     if (message.subtype === "status") {
+      // Claude Code reports a mode it switched to on its own, such as entering
+      // plan mode with the EnterPlanMode tool, through the status message.
+      if (
+        isPermissionMode(message.permissionMode) &&
+        this.observePermissionMode(message.permissionMode)
+      ) {
+        events.push({
+          type: "mode_changed",
+          provider: "claude",
+          currentModeId: this.currentMode,
+          availableModes: this.availableModes,
+        });
+      }
       const status = toObjectRecord(message)?.status;
       if (status === "compacting") {
         this.compacting = true;
-        events.push({
-          type: "timeline",
-          item: { type: "compaction", status: "loading" },
-          provider: "claude",
-        });
+        // Claude Code repeats this status every 30 seconds until the compaction
+        // finishes. Each repeat used to open its own marker, and the app only ever
+        // resolves one of them, so the rest stayed on "Compacting..." forever.
+        if (!this.compactionMarkerOpen) {
+          this.compactionMarkerOpen = true;
+          events.push({
+            type: "timeline",
+            item: { type: "compaction", status: "loading" },
+            provider: "claude",
+          });
+        }
       }
       return;
     }
     if (message.subtype === "compact_boundary") {
+      this.compactionMarkerOpen = false;
       const compactMetadata = readCompactionMetadata(message);
       events.push({
         type: "timeline",
@@ -4283,11 +4553,6 @@ class ClaudeAgentSession implements AgentSession {
     message: Extract<SDKMessage, { type: "system"; subtype: "task_notification" }>,
     events: AgentStreamEvent[],
   ): void {
-    // TODO: subagent timelines are best-effort. Subagent task_notifications
-    // arrive without parent_tool_use_id but with tool_use_id pointing at the
-    // the parent's subagent tool call, so they slip past the sidechain router and pollute
-    // the parent timeline. Drop them here; eventually thread them into the
-    // parent tool call's sub_agent log instead.
     const taskUseId = message.tool_use_id;
     const cachedTool = taskUseId ? this.toolUseCache.get(taskUseId) : undefined;
     // The task protocol owns provider-subagent identity. Workflow launch results arrive before
@@ -4300,6 +4565,15 @@ class ClaudeAgentSession implements AgentSession {
       return;
     }
     const taskNotificationItem = mapTaskNotificationSystemRecordToToolCall(message);
+    const ownerSubagentId = this.taskProtocolSource.resolveTaskOwner(message.task_id, taskUseId);
+    if (taskNotificationItem && ownerSubagentId) {
+      events.push({
+        type: "provider_subagent",
+        provider: "claude",
+        event: { type: "timeline", id: ownerSubagentId, item: taskNotificationItem },
+      });
+      return;
+    }
     if (taskNotificationItem) {
       events.push({
         type: "timeline",
@@ -4333,11 +4607,7 @@ class ClaudeAgentSession implements AgentSession {
       messageId,
     });
     if (taskNotificationItem) {
-      events.push({
-        type: "timeline",
-        item: taskNotificationItem,
-        provider: "claude",
-      });
+      this.appendUserTaskNotificationEvent(taskNotificationItem, events);
       return;
     }
     if (typeof content === "string" && content.length > 0) {
@@ -4359,6 +4629,28 @@ class ClaudeAgentSession implements AgentSession {
     }
   }
 
+  private appendUserTaskNotificationEvent(
+    item: Extract<AgentTimelineItem, { type: "tool_call" }>,
+    events: AgentStreamEvent[],
+  ): void {
+    const taskId = typeof item.metadata?.taskId === "string" ? item.metadata.taskId : undefined;
+    const toolUseId =
+      typeof item.metadata?.toolUseId === "string" ? item.metadata.toolUseId : undefined;
+    if (taskId && this.taskProtocolSource.isDeclaredTask(taskId)) return;
+    const ownerSubagentId = taskId
+      ? this.taskProtocolSource.resolveTaskOwner(taskId, toolUseId)
+      : undefined;
+    if (ownerSubagentId) {
+      events.push({
+        type: "provider_subagent",
+        provider: "claude",
+        event: { type: "timeline", id: ownerSubagentId, item },
+      });
+      return;
+    }
+    events.push({ type: "timeline", item, provider: "claude" });
+  }
+
   private appendUserContentArrayEvents(
     content: ReadonlyArray<unknown>,
     messageId: string | undefined,
@@ -4526,10 +4818,7 @@ class ClaudeAgentSession implements AgentSession {
       notice = this.createClaudeSessionChangedNotice(existingSessionId, newSessionId);
     }
     this.availableModes = DEFAULT_MODES;
-    this.currentMode = message.permissionMode;
-    if (this.currentMode !== "plan") {
-      this.planResumeMode = this.currentMode;
-    }
+    this.observePermissionMode(message.permissionMode);
     this.persistence = null;
     if (message.model) {
       const normalizedRuntimeModel = normalizeClaudeRuntimeModelId(message.model);
@@ -4548,6 +4837,16 @@ class ClaudeAgentSession implements AgentSession {
     return { threadStartedSessionId, notice };
   }
 
+  /** Records a mode Claude Code reports, returning whether it differs from the current one. */
+  private observePermissionMode(mode: PermissionMode): boolean {
+    const changed = this.currentMode !== mode;
+    this.currentMode = mode;
+    if (mode !== "plan") {
+      this.planResumeMode = mode;
+    }
+    return changed;
+  }
+
   private readMissingResumedConversationError(message: SDKMessage): string | null {
     if (message.type !== "result" || message.subtype !== "error_during_execution") {
       return null;
@@ -4800,34 +5099,39 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   private loadPersistedHistory(sessionId: string): void {
+    let historyPath: string | null = null;
     try {
       this.taskState.reset();
-      const historyPath = this.resolveHistoryPath(sessionId);
+      historyPath = this.resolveHistoryPath(sessionId);
       if (!historyPath || !fs.existsSync(historyPath)) {
+        this.logger.info(
+          { sessionId, cwd: this.config.cwd, historyPath },
+          "No Claude transcript to load history from",
+        );
         return;
       }
       const content = fs.readFileSync(historyPath, "utf8");
-      const restoredProviderSubagentIds = this.ingestPersistedSidechains(
+      const replay = this.ingestPersistedSidechains(
         content,
         readClaudeSidechainHistory(historyPath),
       );
-      this.ingestPersistedHistory(content, restoredProviderSubagentIds);
-    } catch {
-      // ignore history load failures
+      this.ingestPersistedHistory(content, replay);
+    } catch (error) {
+      this.logger.warn(
+        { err: error, sessionId, historyPath },
+        "Failed to load Claude history from transcript",
+      );
     }
   }
 
-  private ingestPersistedHistory(
-    content: string,
-    restoredProviderSubagentIds: ReadonlySet<string>,
-  ): void {
+  private ingestPersistedHistory(content: string, replay: ClaudeReplayOwnership): void {
     if (!content) {
       return;
     }
 
     const timeline: PersistedTimelineEntry[] = [];
     for (const line of content.split(/\r?\n/)) {
-      this.ingestPersistedHistoryLine(line, timeline, restoredProviderSubagentIds);
+      this.ingestPersistedHistoryLine(line, timeline, replay);
     }
 
     if (timeline.length > 0) {
@@ -4839,26 +5143,29 @@ class ClaudeAgentSession implements AgentSession {
   private ingestPersistedSidechains(
     parentContent: string,
     sidechains: ClaudeSidechainHistory,
-  ): Set<string> {
+  ): ClaudeReplayOwnership {
     const parentEntries = parseClaudeHistoryRecords(parentContent).filter(
       (entry) => entry.isSidechain !== true,
     );
     const sidechainEntries = [parentContent, ...sidechains.contents]
       .flatMap(parseClaudeHistoryRecords)
       .filter((entry) => entry.isSidechain === true && typeof entry.agentId === "string");
+    const parentFacts = readClaudeReplayParentFacts(parentEntries);
 
     // Replay produces the same observations the live task protocol produces, then folds them
     // with the same function, so identity and status are derived once for both paths.
+    const subagentReplay = observeReplaySubagents({
+      subagents: [...groupClaudeSidechainEntries(sidechainEntries)].map(([agentId, entries]) => ({
+        agentId,
+        meta: sidechains.metaByAgentId.get(agentId) ?? null,
+        entries,
+        parentFacts: readClaudeReplayParentFacts(entries as ClaudeHistoryEntry[]),
+      })),
+      parent: parentFacts,
+      convertEntry: (entry) => this.convertHistoryEntry(entry as ClaudeHistoryEntry),
+    });
     const observations = [
-      ...observeReplaySubagents({
-        subagents: [...groupClaudeSidechainEntries(sidechainEntries)].map(([agentId, entries]) => ({
-          agentId,
-          meta: sidechains.metaByAgentId.get(agentId) ?? null,
-          entries,
-        })),
-        parent: readClaudeReplayParentFacts(parentEntries),
-        convertEntry: (entry) => this.convertHistoryEntry(entry as ClaudeHistoryEntry),
-      }),
+      ...subagentReplay.observations,
       ...observeReplayWorkflows({
         workflows: sidechains.workflowContents
           .map(parseClaudeWorkflowRun)
@@ -4880,7 +5187,12 @@ class ClaudeAgentSession implements AgentSession {
         .filter((observation) => observation.kind === "declared")
         .map((observation) => observation.id),
     );
-    if (observations.length === 0) return restoredProviderSubagentIds;
+    const replay = {
+      restoredIds: restoredProviderSubagentIds,
+      toolOwners: subagentReplay.toolOwners,
+      subagentToolCalls: parentFacts.toolCalls,
+    };
+    if (observations.length === 0) return replay;
 
     this.persistedProviderSubagentEvents.push(
       ...foldSubagentObservations(observations).map(
@@ -4892,13 +5204,13 @@ class ClaudeAgentSession implements AgentSession {
       ),
     );
     this.historyPending = true;
-    return restoredProviderSubagentIds;
+    return replay;
   }
 
   private ingestPersistedHistoryLine(
     line: string,
     timeline: PersistedTimelineEntry[],
-    restoredProviderSubagentIds: ReadonlySet<string>,
+    replay: ClaudeReplayOwnership,
   ): void {
     const trimmed = line.trim();
     if (!trimmed) {
@@ -4921,13 +5233,36 @@ class ClaudeAgentSession implements AgentSession {
       return;
     }
     const notificationToolUseId = readTaskNotificationToolUseIdFromHistoryRecord(entry);
-    if (notificationToolUseId && restoredProviderSubagentIds.has(notificationToolUseId)) {
+    if (notificationToolUseId && replay.restoredIds.has(notificationToolUseId)) {
       return;
     }
 
     const historyTimestamp = normalizeProviderReplayTimestamp(entry.timestamp);
+    const notificationOwner = notificationToolUseId
+      ? replay.toolOwners.get(notificationToolUseId)
+      : undefined;
+    if (notificationOwner) {
+      for (const item of this.convertHistoryEntry(entry)) {
+        this.persistedProviderSubagentEvents.push({
+          type: "provider_subagent",
+          provider: "claude",
+          event: {
+            type: "timeline",
+            id: notificationOwner,
+            item,
+            timestamp: historyTimestamp ?? undefined,
+          },
+        });
+      }
+      return;
+    }
     const taskSnapshot = this.taskState.observe(entry);
-    const items = [...(taskSnapshot ? [taskSnapshot] : []), ...this.convertHistoryEntry(entry)];
+    const items = [
+      ...(taskSnapshot ? [taskSnapshot] : []),
+      ...this.convertHistoryEntry(entry).map((item) =>
+        labelReplayedSubagentCard(item, replay.subagentToolCalls),
+      ),
+    ];
     const isVisibleUserEntry =
       entry.type === "user" &&
       typeof entry.uuid === "string" &&
@@ -4954,26 +5289,11 @@ class ClaudeAgentSession implements AgentSession {
   private resolveHistoryPath(sessionId: string): string | null {
     const cwd = this.config.cwd;
     if (!cwd) return null;
-    const configDir = process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
-    const candidates = [cwd];
-    try {
-      const realCwd = fs.realpathSync(cwd);
-      if (realCwd !== cwd) {
-        candidates.push(realCwd);
-      }
-    } catch {
-      // Fall back to the configured cwd when the path has already disappeared.
-    }
-    for (const candidate of candidates) {
-      const historyPath = path.join(
-        claudeProjectDirSync(candidate, { configDir }),
-        `${sessionId}.jsonl`,
-      );
-      if (fs.existsSync(historyPath)) {
-        return historyPath;
-      }
-    }
-    return path.join(claudeProjectDirSync(cwd, { configDir }), `${sessionId}.jsonl`);
+    return claudeTranscriptPathSync({
+      cwd,
+      sessionId,
+      configDir: claudeConfigDir(this.harnessEnvironment),
+    });
   }
 
   private convertHistoryEntry(entry: ClaudeHistoryEntry): AgentTimelineItem[] {
@@ -5023,7 +5343,7 @@ class ClaudeAgentSession implements AgentSession {
     // User SDK entries can arrive as multiple text blocks, but Paseo treats them as one message.
     const userTextParts: string[] = [];
     for (const block of content) {
-      if (!isClaudeContentChunk(block)) {
+      if (!isClaudeContentChunk(block) || this.mapSubagentHandbackBlock(block, items)) {
         continue;
       }
       this.mapBlockToTimeline(block, {
@@ -5111,6 +5431,24 @@ class ClaudeAgentSession implements AgentSession {
     }
   }
 
+  // A subagent's handback call is its final message, and the call's result is only an
+  // acknowledgement, so neither becomes a tool call.
+  private mapSubagentHandbackBlock(block: ClaudeContentChunk, items: AgentTimelineItem[]): boolean {
+    if (typeof block.tool_use_id === "string" && this.subagentHandbackIds.has(block.tool_use_id)) {
+      this.subagentHandbackIds.delete(block.tool_use_id);
+      return true;
+    }
+    const handback = readClaudeSubagentHandback(block);
+    if (!handback) {
+      return false;
+    }
+    this.subagentHandbackIds.add(handback.callId);
+    if (handback.report) {
+      items.push({ type: "assistant_message", text: handback.report });
+    }
+    return true;
+  }
+
   private handleToolUseStart(block: ClaudeContentChunk, items: AgentTimelineItem[]): void {
     const entry = this.upsertToolUseEntry(block);
     if (!entry) {
@@ -5677,6 +6015,33 @@ function parseClaudeHistoryRecords(content: string): ClaudeHistoryEntry[] {
   return entries;
 }
 
+/** The parent's card for a subagent, labeled with its type and task. */
+function buildClaudeSubagentCardDetail(
+  facts: ClaudeSubagentCardFacts,
+): Extract<ToolCallDetail, { type: "sub_agent" }> {
+  return {
+    type: "sub_agent",
+    ...(facts.title ? { subAgentType: facts.title } : {}),
+    ...(facts.description ? { description: facts.description } : {}),
+    log: "",
+    actions: [],
+  };
+}
+
+/**
+ * Live, a Task call's card is built from the task protocol's declaration. Replay has no task
+ * protocol, so the generic tool mapper leaves the card unlabeled; label it from the same facts.
+ */
+function labelReplayedSubagentCard(
+  item: AgentTimelineItem,
+  subagentToolCalls: ReadonlyMap<string, ClaudeSubagentCardFacts>,
+): AgentTimelineItem {
+  if (item.type !== "tool_call") return item;
+  const facts = subagentToolCalls.get(item.callId);
+  if (!facts) return item;
+  return { ...item, detail: buildClaudeSubagentCardDetail(facts) };
+}
+
 /**
  * Collect what the parent transcript knows about its Task calls, in the shape the shared replay
  * source consumes. The agentId scrape is kept only as a fallback for sessions recorded before
@@ -6304,7 +6669,8 @@ function extractClaudeUserText(messageRaw: unknown): string | null {
 
 interface ClaudeCommandLifecycle {
   commandUuid: string;
-  state: "queued" | "started" | "completed";
+  /** "cancelled" is terminal too: API errors, interrupts and "now" pre-emption end a message. */
+  state: "queued" | "started" | "completed" | "cancelled";
 }
 
 /** Runtime-only Claude frames are validated here because the SDK's public union omits them. */
@@ -6313,7 +6679,7 @@ function readClaudeCommandLifecycle(message: unknown): ClaudeCommandLifecycle |
   if (record?.type !== "command_lifecycle") return null;
   if (
     typeof record.command_uuid !== "string" ||
-    !["queued", "started", "completed"].includes(String(record.state))
+    !["queued", "started", "completed", "cancelled"].includes(String(record.state))
   ) {
     return null;
   }
diff --git a/packages/server/src/server/agent/providers/claude/model-discovery.ts b/packages/server/src/server/agent/providers/claude/model-discovery.ts
new file mode 100644
index 0000000000..d74898472b
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/model-discovery.ts
@@ -0,0 +1,89 @@
+import type { ChildProcess } from "node:child_process";
+import os from "node:os";
+import type { ModelInfo, Query, SDKUserMessage } from "@anthropic-ai/claude-agent-sdk";
+import { raceProviderRefreshAbort } from "../../provider-refresh-deadline.js";
+import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
+import { terminateWithTreeKill } from "../../../../utils/tree-kill.js";
+import { claudeQuery, type ClaudeQueryInput, type ClaudeQueryContext } from "./query.js";
+
+interface ClaudeModelDiscoveryOptions {
+  resolveBinary: () => Promise<string>;
+  runtimeSettings?: ProviderRuntimeSettings;
+  env: NodeJS.ProcessEnv;
+  signal?: AbortSignal;
+}
+
+type OpenDiscoveryQuery = (
+  input: ClaudeQueryInput,
+  context: ClaudeQueryContext,
+) => Pick<Query, "supportedModels" | "close">;
+
+// The curated catalog survives a failed or slow probe. This process never receives
+// a prompt and must not persist a session or launch user MCP servers/hooks.
+export async function discoverClaudeModels(
+  options: ClaudeModelDiscoveryOptions,
+  openQuery: OpenDiscoveryQuery = claudeQuery,
+): Promise<ModelInfo[]> {
+  const controller = new AbortController();
+  const signal = options.signal
+    ? AbortSignal.any([options.signal, controller.signal])
+    : controller.signal;
+  const timer = setTimeout(
+    () => controller.abort(new Error("Claude model discovery timed out")),
+    5_000,
+  );
+  let endInput!: () => void;
+  const ended = new Promise<void>((resolve) => {
+    endInput = resolve;
+  });
+  const input: AsyncIterable<SDKUserMessage> = {
+    [Symbol.asyncIterator]() {
+      return {
+        next: async () => {
+          await ended;
+          return { done: true, value: undefined };
+        },
+      };
+    },
+  };
+  let query: ReturnType<OpenDiscoveryQuery> | undefined;
+  let child: ChildProcess | undefined;
+  try {
+    signal.throwIfAborted();
+    const binary = await raceProviderRefreshAbort(signal, options.resolveBinary());
+    query = openQuery(
+      {
+        prompt: input,
+        options: {
+          pathToClaudeCodeExecutable: binary,
+          cwd: os.homedir(),
+          env: options.env,
+          persistSession: false,
+          tools: [],
+          mcpServers: {},
+          strictMcpConfig: true,
+          settingSources: ["user"],
+          settings: { disableAllHooks: true },
+          abortController: controller,
+        },
+      },
+      {
+        runtimeSettings: options.runtimeSettings,
+        onChildProcess: (process) => {
+          child = process;
+        },
+      },
+    );
+    return await raceProviderRefreshAbort(signal, query.supportedModels());
+  } finally {
+    clearTimeout(timer);
+    endInput();
+    try {
+      query?.close();
+    } finally {
+      if (child) {
+        await terminateWithTreeKill(child, { gracefulTimeoutMs: 200, forceTimeoutMs: 200 });
+      }
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/claude/model-manifest.ts b/packages/server/src/server/agent/providers/claude/model-manifest.ts
index e7e660a229..45a5441109 100644
--- a/packages/server/src/server/agent/providers/claude/model-manifest.ts
+++ b/packages/server/src/server/agent/providers/claude/model-manifest.ts
@@ -9,8 +9,10 @@ interface ClaudeModelManifestEntry {
   description: string;
   defaultPriority?: number;
   minimumClaudeCodeVersion?: string;
+  requiresDiscovery?: boolean;
   contextWindowMaxTokens?: number;
   effortLevels?: readonly ClaudeEffortLevel[];
+  defaultThinkingOptionId?: ClaudeEffortLevel;
   supportsThinkingDisabled?: boolean;
   supportsFastMode?: boolean;
 }
@@ -34,10 +36,21 @@ export const CLAUDE_DISABLED_THINKING_OPTION_ID = "off";
 export const CLAUDE_ULTRACODE_THINKING_OPTION_ID = "ultracode";
 
 export const CLAUDE_MODEL_MANIFEST = [
+  {
+    id: "claude-opus-5-5",
+    label: "Opus 5.5",
+    description: "Opus 5.5 · Latest release",
+    defaultPriority: 3,
+    minimumClaudeCodeVersion: "2.1.280",
+    defaultThinkingOptionId: "medium",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+    supportsFastMode: true,
+  },
   {
     id: "claude-opus-5",
     label: "Opus 5",
-    description: "Opus 5 · Latest release",
+    description: "Opus 5 · Previous release",
     defaultPriority: 2,
     minimumClaudeCodeVersion: "2.1.219",
     contextWindowMaxTokens: 1_000_000,
@@ -45,6 +58,14 @@ export const CLAUDE_MODEL_MANIFEST = [
     supportsThinkingDisabled: true,
     supportsFastMode: true,
   },
+  {
+    id: "claude-mythos-5-1",
+    label: "Mythos 5.1",
+    requiresDiscovery: true,
+    description: "Mythos 5.1 · Requires verified access",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+  },
   {
     id: "claude-fable-5-1",
     label: "Fable 5.1",
@@ -81,10 +102,19 @@ export const CLAUDE_MODEL_MANIFEST = [
     supportsThinkingDisabled: true,
     supportsFastMode: true,
   },
+  {
+    id: "claude-sonnet-5-5",
+    label: "Sonnet 5.5",
+    description: "Sonnet 5.5 · Best for everyday tasks",
+    minimumClaudeCodeVersion: "2.1.284",
+    defaultThinkingOptionId: "medium",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+  },
   {
     id: "claude-sonnet-5",
     label: "Sonnet 5",
-    description: "Sonnet 5 · Best for everyday tasks",
+    description: "Sonnet 5 · Previous release",
     contextWindowMaxTokens: 200_000,
     effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
     supportsThinkingDisabled: true,
@@ -149,17 +179,32 @@ export const CLAUDE_MODEL_MANIFEST = [
     effortLevels: CLAUDE_EFFORT_LEVELS.standard,
     supportsThinkingDisabled: true,
   },
+  {
+    id: "claude-haiku-5-5",
+    label: "Haiku 5.5",
+    description: "Haiku 5.5 · Fastest for quick answers",
+    minimumClaudeCodeVersion: "2.1.293",
+    defaultThinkingOptionId: "medium",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+    supportsThinkingDisabled: true,
+  },
   {
     id: "claude-haiku-4-5",
     label: "Haiku 4.5",
-    description: "Haiku 4.5 · Fastest for quick answers",
+    description: "Haiku 4.5 · Previous release",
     contextWindowMaxTokens: 200_000,
   },
 ] as const satisfies readonly ClaudeModelManifestEntry[];
 
+function getDefaultThinkingOptionId(model: ClaudeModelManifestEntry): ClaudeEffortLevel {
+  return model.defaultThinkingOptionId ?? CLAUDE_DEFAULT_THINKING_OPTION_ID;
+}
+
 function buildThinkingOptions(
   effortLevels: readonly ClaudeEffortLevel[] | undefined,
   supportsThinkingDisabled: boolean,
+  defaultThinkingOptionId: ClaudeEffortLevel,
 ): AgentSelectOption[] | undefined {
   if (!effortLevels) {
     return undefined;
@@ -170,7 +215,7 @@ function buildThinkingOptions(
     ...effortLevels.map((id) => ({
       id,
       label: CLAUDE_EFFORT_LABELS[id],
-      ...(id === CLAUDE_DEFAULT_THINKING_OPTION_ID ? { isDefault: true } : {}),
+      ...(id === defaultThinkingOptionId ? { isDefault: true } : {}),
     })),
   ];
 
@@ -181,9 +226,16 @@ function buildThinkingOptions(
   return options;
 }
 
-export function getClaudeManifestModels(claudeCodeVersion?: string): AgentModelDefinition[] {
+export function getClaudeManifestModels(
+  claudeCodeVersion?: string,
+  discoveredModelIds?: ReadonlySet<string>,
+): AgentModelDefinition[] {
   const availableModels: readonly ClaudeModelManifestEntry[] = CLAUDE_MODEL_MANIFEST.filter(
-    (model) => isModelAvailableInClaudeCode(model, claudeCodeVersion),
+    (model) =>
+      isModelAvailableInClaudeCode(model, claudeCodeVersion) &&
+      (discoveredModelIds === undefined ||
+        !("requiresDiscovery" in model && model.requiresDiscovery) ||
+        discoveredModelIds.has(model.id)),
   );
   const defaultModel = availableModels.reduce<ClaudeModelManifestEntry | undefined>(
     (selected, candidate) =>
@@ -196,6 +248,7 @@ export function getClaudeManifestModels(claudeCodeVersion?: string): AgentModelD
     const thinkingOptions = buildThinkingOptions(
       model.effortLevels,
       model.supportsThinkingDisabled === true,
+      getDefaultThinkingOptionId(model),
     );
     const definition: AgentModelDefinition = {
       provider: "claude",
@@ -214,7 +267,7 @@ export function getClaudeManifestModels(claudeCodeVersion?: string): AgentModelD
     }
     if (thinkingOptions) {
       definition.thinkingOptions = thinkingOptions;
-      definition.defaultThinkingOptionId = CLAUDE_DEFAULT_THINKING_OPTION_ID;
+      definition.defaultThinkingOptionId = getDefaultThinkingOptionId(model);
     }
     definitions.push(definition);
     if (!("aliases" in model) || !model.aliases) {
@@ -286,7 +339,7 @@ export function resolveClaudeDisabledThinkingForModel(
     supported:
       !!model && "supportsThinkingDisabled" in model && model.supportsThinkingDisabled === true,
     fallbackThinkingOptionId:
-      model && "effortLevels" in model ? CLAUDE_DEFAULT_THINKING_OPTION_ID : undefined,
+      model && "effortLevels" in model ? getDefaultThinkingOptionId(model) : undefined,
   };
 }
 
@@ -322,7 +375,7 @@ export function normalizeClaudeManifestModelId(value: string | null | undefined)
   }
 
   const singleSegmentMatch = trimmed.match(
-    /^(?:claude[-_ ])?(fable|opus|sonnet|haiku)[-_ ]+(\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
+    /^(?:claude[-_ ])?(mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
   );
   if (singleSegmentMatch) {
     return normalizeSingleSegmentClaudeModelId(
@@ -333,7 +386,7 @@ export function normalizeClaudeManifestModelId(value: string | null | undefined)
   }
 
   const runtimeMatch = trimmed.match(
-    /^(?:claude[-_ ])?(fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
+    /^(?:claude[-_ ])?(mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
   );
   if (!runtimeMatch) {
     return null;
@@ -350,7 +403,9 @@ export function normalizeClaudeManifestModelId(value: string | null | undefined)
 /**
  * Normalize a Claude Code runtime/config model string to a known manifest ID.
  * Runtime metadata may include provider prefixes such as Bedrock model IDs; feature
- * gates should use normalizeClaudeManifestModelId instead.
+ * gates should use normalizeClaudeManifestModelId instead. The prefixed matches are
+ * unanchored, so major-minor runs first: "claude-opus-5-5" would otherwise stop at the
+ * "claude-opus-5" entry.
  */
 export function normalizeClaudeRuntimeModelId(value: string | null | undefined): string | null {
   const normalizedManifestModelId = normalizeClaudeManifestModelId(value);
@@ -363,13 +418,14 @@ export function normalizeClaudeRuntimeModelId(value: string | null | undefined):
     return null;
   }
 
-  const singleSegmentMatch = trimmed.match(
-    /claude[-_ ](fable|opus|sonnet|haiku)[-_ ]+(\d+)(\[1m\])?/i,
+  const runtimeMatch = trimmed.match(
+    /claude[-_ ](mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(\[1m\])?/i,
   );
-  if (singleSegmentMatch) {
-    const normalizedModelId = normalizeSingleSegmentClaudeModelId(
-      singleSegmentMatch[1],
-      singleSegmentMatch[2],
+  if (runtimeMatch) {
+    const normalizedModelId = normalizeMajorMinorClaudeModelId(
+      runtimeMatch[1],
+      runtimeMatch[2],
+      runtimeMatch[3],
       trimmed.toLowerCase().includes("[1m]"),
     );
     if (normalizedModelId) {
@@ -377,17 +433,16 @@ export function normalizeClaudeRuntimeModelId(value: string | null | undefined):
     }
   }
 
-  const runtimeMatch = trimmed.match(
-    /claude[-_ ](fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(\[1m\])?/i,
+  const singleSegmentMatch = trimmed.match(
+    /claude[-_ ](mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)(\[1m\])?/i,
   );
-  if (!runtimeMatch) {
+  if (!singleSegmentMatch) {
     return null;
   }
 
-  return normalizeMajorMinorClaudeModelId(
-    runtimeMatch[1],
-    runtimeMatch[2],
-    runtimeMatch[3],
+  return normalizeSingleSegmentClaudeModelId(
+    singleSegmentMatch[1],
+    singleSegmentMatch[2],
     trimmed.toLowerCase().includes("[1m]"),
   );
 }
diff --git a/packages/server/src/server/agent/providers/claude/models.test.ts b/packages/server/src/server/agent/providers/claude/models.test.ts
index 9e3cc088bd..1ef8177bbf 100644
--- a/packages/server/src/server/agent/providers/claude/models.test.ts
+++ b/packages/server/src/server/agent/providers/claude/models.test.ts
@@ -13,6 +13,8 @@ import {
   parseClaudeCodeVersion,
   resolveClaudeDisabledThinkingForModel,
 } from "./model-manifest.js";
+import { discoverClaudeModels } from "./model-discovery.js";
+import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
 import { findClaudeModel, getClaudeModels, normalizeClaudeRuntimeModelId } from "./models.js";
 
 const createdClaudeConfigDirs: string[] = [];
@@ -39,10 +41,18 @@ async function createClaudeConfigDirWithRawSettings(settings: string): Promise<s
   return configDir;
 }
 
-function createCatalogClient(claudeCodeVersion = "2.1.219"): ClaudeAgentClient {
+function createCatalogClient(claudeCodeVersion = "2.1.293"): ClaudeAgentClient {
   return new ClaudeAgentClient({
     logger: createTestLogger(),
     resolveVersion: async () => claudeCodeVersion,
+    discoverModels: async () => [
+      {
+        value: "mythos",
+        resolvedModel: "claude-mythos-5-1",
+        displayName: "Mythos",
+        description: "",
+      },
+    ],
   });
 }
 
@@ -50,12 +60,15 @@ describe("getClaudeModels", () => {
   it("returns all claude models", () => {
     const models = getClaudeModels();
     expect(models.map((m) => m.id)).toEqual([
+      "claude-opus-5-5",
       "claude-opus-5",
+      "claude-mythos-5-1",
       "claude-fable-5-1",
       "claude-fable-5",
       "claude-fable-5[1m]",
       "claude-opus-4-8[1m]",
       "claude-opus-4-8",
+      "claude-sonnet-5-5",
       "claude-sonnet-5",
       "claude-sonnet-5[1m]",
       "claude-opus-4-7[1m]",
@@ -64,6 +77,7 @@ describe("getClaudeModels", () => {
       "claude-opus-4-6",
       "claude-sonnet-4-6[1m]",
       "claude-sonnet-4-6",
+      "claude-haiku-5-5",
       "claude-haiku-4-5",
     ]);
   });
@@ -72,7 +86,7 @@ describe("getClaudeModels", () => {
     const models = getClaudeModels();
     const defaults = models.filter((m) => m.isDefault);
     expect(defaults).toHaveLength(1);
-    expect(defaults[0].id).toBe("claude-opus-5");
+    expect(defaults[0].id).toBe("claude-opus-5-5");
   });
 
   it("defines context window sizes in the catalog", () => {
@@ -82,12 +96,15 @@ describe("getClaudeModels", () => {
 
     expect(contextWindows).toEqual(
       new Map([
+        ["claude-opus-5-5", 1_000_000],
         ["claude-opus-5", 1_000_000],
+        ["claude-mythos-5-1", 1_000_000],
         ["claude-fable-5-1", 1_000_000],
         ["claude-fable-5", 1_000_000],
         ["claude-fable-5[1m]", 1_000_000],
         ["claude-opus-4-8[1m]", 1_000_000],
         ["claude-opus-4-8", 200_000],
+        ["claude-sonnet-5-5", 1_000_000],
         ["claude-sonnet-5", 200_000],
         ["claude-sonnet-5[1m]", 1_000_000],
         ["claude-opus-4-7[1m]", 1_000_000],
@@ -96,6 +113,7 @@ describe("getClaudeModels", () => {
         ["claude-opus-4-6", 200_000],
         ["claude-sonnet-4-6[1m]", 1_000_000],
         ["claude-sonnet-4-6", 200_000],
+        ["claude-haiku-5-5", 1_000_000],
         ["claude-haiku-4-5", 200_000],
       ]),
     );
@@ -109,6 +127,20 @@ describe("getClaudeModels", () => {
 
     expect(getClaudeModels("2.1.168").map((model) => model.id)).not.toContain("claude-fable-5");
     expect(getClaudeModels("2.1.169").map((model) => model.id)).toContain("claude-fable-5");
+
+    expect(getClaudeModels("2.1.279").map((model) => model.id)).not.toContain("claude-opus-5-5");
+    expect(getClaudeModels("2.1.279").find((model) => model.isDefault)?.id).toBe("claude-opus-5");
+    expect(getClaudeModels("2.1.280").map((model) => model.id)).toContain("claude-opus-5-5");
+    expect(getClaudeModels("2.1.280").find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
+
+    expect(getClaudeModels("2.1.283").map((model) => model.id)).not.toContain("claude-sonnet-5-5");
+    expect(getClaudeModels("2.1.284").map((model) => model.id)).toContain("claude-sonnet-5-5");
+  });
+
+  it("gates Haiku 5.5 on Claude Code 2.1.293 without changing the default", () => {
+    expect(getClaudeModels("2.1.292").map((model) => model.id)).not.toContain("claude-haiku-5-5");
+    expect(getClaudeModels("2.1.293").map((model) => model.id)).toContain("claude-haiku-5-5");
+    expect(getClaudeModels("2.1.293").find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
   });
 
   it("derives thinking options from model effort capabilities", () => {
@@ -169,6 +201,10 @@ describe("getClaudeModels", () => {
   });
 
   it.each([
+    ["claude-opus-5-5", false, "medium"],
+    ["claude-opus-5-5-20260401", false, "medium"],
+    ["claude-sonnet-5-5", false, "medium"],
+    ["claude-sonnet-5-5-20260928", false, "medium"],
     ["claude-opus-5", true, "high"],
     ["claude-opus-5-20260724", true, "high"],
     ["claude-sonnet-5", true, "high"],
@@ -176,6 +212,8 @@ describe("getClaudeModels", () => {
     ["claude-sonnet-5-20260101", true, "high"],
     ["claude-fable-5", false, "high"],
     ["claude-fable-5-1", false, "high"],
+    ["claude-haiku-5-5", true, "medium"],
+    ["claude-haiku-5-5-20261007", true, "medium"],
     ["claude-haiku-4-5", false, undefined],
     ["openrouter/anthropic/claude-opus-4-8", false, undefined],
     [null, false, undefined],
@@ -195,12 +233,125 @@ describe("getClaudeModels", () => {
 });
 
 describe("ClaudeAgentClient.fetchCatalog", () => {
+  it.each([
+    { value: "mythos", resolvedModel: "claude-mythos-5-1", expected: true },
+    { value: "claude-mythos-5-1", expected: true },
+    { value: "claude-mythos-5-1[1m]", expected: true },
+    { value: "global.anthropic.claude-mythos-5-1", expected: true },
+    { value: "mythos", expected: false },
+    { value: "mythos", resolvedModel: "claude-mythos-5-2", expected: false },
+    { value: "claude-mythos-5-1", resolvedModel: "claude-fable-5-1", expected: false },
+  ])(
+    "uses advertised identity $value / $resolvedModel to gate Mythos",
+    async ({ value, resolvedModel, expected }) => {
+      const configDir = await createClaudeConfigDir({});
+      const client = new ClaudeAgentClient({
+        logger: createTestLogger(),
+        resolveVersion: async () => "2.1.293",
+        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+        discoverModels: async () => [
+          { value, resolvedModel, displayName: "Untrusted label", description: "" },
+        ],
+      });
+      const { models } = await client.fetchCatalog({
+        scope: "workspace",
+        cwd: configDir,
+        force: false,
+      });
+      expect(models.find((model) => model.id === "claude-mythos-5-1")).toEqual(
+        expected ? findClaudeModel("claude-mythos-5-1") : undefined,
+      );
+    },
+  );
+
+  it("preserves the curated catalog and explicitly configured models after discovery failure", async () => {
+    const configDir = await createClaudeConfigDir({ model: "claude-mythos-5-1" });
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => {
+        throw new Error("discovery unavailable");
+      },
+    });
+    const { models } = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: configDir,
+      force: false,
+    });
+    expect(models.filter((model) => model.id !== "claude-mythos-5-1")).toEqual(
+      getClaudeModels("2.1.293").filter((model) => model.id !== "claude-mythos-5-1"),
+    );
+    expect(models.find((model) => model.id === "claude-mythos-5-1")).toEqual({
+      ...findClaudeModel("claude-mythos-5-1"),
+      label: "claude-mythos-5-1",
+      description: "From Claude settings.json model",
+    });
+  });
+
+  it("omits unconfirmed Mythos after a failed probe and retries on refresh", async () => {
+    const configDir = await createClaudeConfigDir({});
+    let fail = true;
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => {
+        if (fail) throw new Error("discovery unavailable");
+        return [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ];
+      },
+    });
+    const options = { scope: "workspace" as const, cwd: configDir, force: true };
+    expect(
+      (await client.fetchCatalog(options)).models.some((model) => model.id === "claude-mythos-5-1"),
+    ).toBe(false);
+    fail = false;
+    expect(
+      (await client.fetchCatalog(options)).models.find((model) => model.id === "claude-mythos-5-1"),
+    ).toEqual(findClaudeModel("claude-mythos-5-1"));
+  });
+
+  it("keeps the curated catalog when discovery does not advertise Mythos", async () => {
+    const configDir = await createClaudeConfigDir({});
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => [
+        {
+          value: "opus",
+          resolvedModel: "claude-opus-5-5",
+          displayName: "Opus",
+          description: "Latest",
+        },
+      ],
+    });
+    const { models } = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: configDir,
+      force: false,
+    });
+    expect(models.map((model) => model.id)).toEqual(
+      getClaudeModels("2.1.293")
+        .filter((model) => model.id !== "claude-mythos-5-1")
+        .map((model) => model.id),
+    );
+  });
+
   it("appends concrete models from Claude settings.json", async () => {
     const configDir = await createClaudeConfigDir({
       model: "us.anthropic.claude-opus-4-7[1m]",
       env: {
         ANTHROPIC_MODEL: "openrouter/anthropic/claude-sonnet-4.5",
         ANTHROPIC_SMALL_FAST_MODEL: "ollama/qwen3-coder",
+        ANTHROPIC_DEFAULT_FABLE_MODEL: "claude-fable-5-1[1M]",
         ANTHROPIC_DEFAULT_OPUS_MODEL: "bedrock-opus-from-env",
         ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-5.1",
         ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-5",
@@ -235,6 +386,12 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
         label: "ollama/qwen3-coder",
         description: "From Claude settings.json env.ANTHROPIC_SMALL_FAST_MODEL",
       },
+      {
+        provider: "claude",
+        id: "claude-fable-5-1[1M]",
+        label: "claude-fable-5-1[1M]",
+        description: "From Claude settings.json env.ANTHROPIC_DEFAULT_FABLE_MODEL",
+      },
       {
         provider: "claude",
         id: "bedrock-opus-from-env",
@@ -254,6 +411,28 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
         description: "From Claude settings.json env.ANTHROPIC_DEFAULT_HAIKU_MODEL",
       },
     ]);
+    expect(models.filter((model) => model.id === "claude-fable-5-1[1M]")).toHaveLength(1);
+    expect(models.some((model) => model.id === "claude-fable-5-1")).toBe(true);
+  });
+
+  it("reads settings.json from the provider's own CLAUDE_CONFIG_DIR", async () => {
+    const daemonConfigDir = await createClaudeConfigDir({});
+    const providerConfigDir = await createClaudeConfigDir({ model: "glm-5.1" });
+    vi.stubEnv("CLAUDE_CONFIG_DIR", daemonConfigDir);
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.280",
+      discoverModels: async () => [],
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: providerConfigDir } },
+    });
+
+    const { models } = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: os.tmpdir(),
+      force: true,
+    });
+
+    expect(models.map((model) => model.id)).toContain("glm-5.1");
   });
 
   it("falls back to hardcoded models when settings.json is missing", async () => {
@@ -417,6 +596,29 @@ describe("normalizeClaudeRuntimeModelId", () => {
       "claude-opus-4-8",
     );
   });
+
+  it("does not collapse a prefixed minor release onto the major it extends", () => {
+    expect(normalizeClaudeRuntimeModelId("anthropic/claude-opus-5-5")).toBe("claude-opus-5-5");
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-opus-5-5-20260401-v1:0")).toBe(
+      "claude-opus-5-5",
+    );
+    expect(normalizeClaudeRuntimeModelId("openrouter/anthropic/claude-fable-5-1")).toBe(
+      "claude-fable-5-1",
+    );
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-opus-5-20260724-v1:0")).toBe(
+      "claude-opus-5",
+    );
+  });
+
+  it("does not collapse a prefixed Sonnet 5.5 onto Sonnet 5", () => {
+    expect(normalizeClaudeRuntimeModelId("anthropic/claude-sonnet-5-5")).toBe("claude-sonnet-5-5");
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-sonnet-5-5-20260928-v1:0")).toBe(
+      "claude-sonnet-5-5",
+    );
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-sonnet-5-20260101-v1:0")).toBe(
+      "claude-sonnet-5",
+    );
+  });
 });
 
 describe("parseClaudeCodeVersion", () => {
@@ -438,7 +640,7 @@ describe("findClaudeModel", () => {
 describe("Claude Opus 5 catalog", () => {
   it("offers a single Opus 5 entry with a 1M context window", () => {
     const opus5Models = getClaudeModels()
-      .filter((model) => model.id.startsWith("claude-opus-5"))
+      .filter((model) => /^claude-opus-5(\[1m\])?$/.test(model.id))
       .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
 
     expect(opus5Models).toEqual([
@@ -515,6 +717,122 @@ describe("Claude Fable 5.1 catalog", () => {
   });
 });
 
+describe("Claude Opus 5.5 catalog", () => {
+  it("offers one Opus 5.5 entry with a 1M context window", () => {
+    const opus55Models = getClaudeModels()
+      .filter((model) => model.id.startsWith("claude-opus-5-5"))
+      .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
+
+    expect(opus55Models).toEqual([
+      { id: "claude-opus-5-5", label: "Opus 5.5", contextWindowMaxTokens: 1_000_000 },
+    ]);
+  });
+
+  it("offers every effort level except off, because Opus 5.5 cannot disable thinking", () => {
+    const opus55 = getClaudeModels().find((model) => model.id === "claude-opus-5-5");
+
+    expect(opus55?.thinkingOptions?.map((option) => option.id)).toEqual([
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(opus55?.defaultThinkingOptionId).toBe("medium");
+    expect(
+      opus55?.thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["medium"]);
+  });
+
+  it("resolves suffixed and dated Opus 5.5 IDs to the catalog entry", () => {
+    expect(findClaudeModel("claude-opus-5-5[1m]")?.id).toBe("claude-opus-5-5");
+    expect(findClaudeModel("claude-opus-5-5-20260401")?.id).toBe("claude-opus-5-5");
+    expect(findClaudeModel("claude-opus-5-5-20260401[1m]")?.id).toBe("claude-opus-5-5");
+  });
+});
+
+describe("Claude Sonnet 5.5 catalog", () => {
+  it("offers one Sonnet 5.5 entry with a 1M context window", () => {
+    const sonnet55Models = getClaudeModels()
+      .filter((model) => model.id.startsWith("claude-sonnet-5-5"))
+      .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
+
+    expect(sonnet55Models).toEqual([
+      { id: "claude-sonnet-5-5", label: "Sonnet 5.5", contextWindowMaxTokens: 1_000_000 },
+    ]);
+  });
+
+  it("offers every effort level except off, because Sonnet 5.5 cannot disable thinking", () => {
+    const sonnet55 = getClaudeModels().find((model) => model.id === "claude-sonnet-5-5");
+
+    expect(sonnet55?.thinkingOptions?.map((option) => option.id)).toEqual([
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(sonnet55?.defaultThinkingOptionId).toBe("medium");
+    expect(
+      sonnet55?.thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["medium"]);
+  });
+
+  it("resolves suffixed and dated Sonnet 5.5 IDs to the single catalog entry", () => {
+    expect(findClaudeModel("claude-sonnet-5-5[1m]")?.id).toBe("claude-sonnet-5-5");
+    expect(findClaudeModel("claude-sonnet-5-5-20260928")?.id).toBe("claude-sonnet-5-5");
+    expect(findClaudeModel("claude-sonnet-5-5-20260928[1m]")?.id).toBe("claude-sonnet-5-5");
+    expect(findClaudeModel("claude-sonnet-5-5[1m]")?.contextWindowMaxTokens).toBe(1_000_000);
+  });
+});
+
+describe("Claude Haiku 5.5 catalog", () => {
+  it("offers one Haiku 5.5 entry with a 1M context window", () => {
+    const haiku55Models = getClaudeModels()
+      .filter((model) => model.id.startsWith("claude-haiku-5-5"))
+      .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
+
+    expect(haiku55Models).toEqual([
+      { id: "claude-haiku-5-5", label: "Haiku 5.5", contextWindowMaxTokens: 1_000_000 },
+    ]);
+  });
+
+  it("offers Off and every effort level with medium as the default", () => {
+    const haiku55 = getClaudeModels().find((model) => model.id === "claude-haiku-5-5");
+
+    expect(haiku55?.thinkingOptions?.map((option) => option.id)).toEqual([
+      CLAUDE_DISABLED_THINKING_OPTION_ID,
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(haiku55?.defaultThinkingOptionId).toBe("medium");
+    expect(
+      haiku55?.thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["medium"]);
+  });
+
+  it("normalizes provider-prefixed runtime IDs", () => {
+    expect(normalizeClaudeRuntimeModelId("anthropic/claude-haiku-5-5")).toBe("claude-haiku-5-5");
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-haiku-5-5-v1:0")).toBe(
+      "claude-haiku-5-5",
+    );
+    expect(claudeManifestModelSupportsFastMode("claude-haiku-5-5")).toBe(false);
+  });
+
+  it("resolves suffixed and dated Haiku 5.5 IDs to the single catalog entry", () => {
+    expect(findClaudeModel("claude-haiku-5-5[1m]")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5-20261007")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5-20261007[1m]")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5[1m]")?.contextWindowMaxTokens).toBe(1_000_000);
+  });
+});
+
 describe("claudeManifestModelSupportsFastMode", () => {
   it("keeps fast mode strict to first-party manifest model IDs", () => {
     expect(normalizeClaudeManifestModelId("openrouter/anthropic/claude-opus-4-8")).toBeNull();
@@ -523,9 +841,132 @@ describe("claudeManifestModelSupportsFastMode", () => {
   });
 
   it("supports fast mode on Opus 5 but not on other Claude 5 models", () => {
+    expect(claudeManifestModelSupportsFastMode("claude-opus-5-5")).toBe(true);
     expect(claudeManifestModelSupportsFastMode("claude-opus-5")).toBe(true);
+    expect(claudeManifestModelSupportsFastMode("claude-sonnet-5-5")).toBe(false);
     expect(claudeManifestModelSupportsFastMode("claude-sonnet-5")).toBe(false);
     expect(claudeManifestModelSupportsFastMode("claude-fable-5")).toBe(false);
     expect(claudeManifestModelSupportsFastMode("claude-fable-5-1")).toBe(false);
   });
 });
+
+describe("Claude Mythos 5.1 catalog", () => {
+  it("offers one 1M model with high default effort and always-on thinking", () => {
+    const models = getClaudeModels().filter((model) => model.id.startsWith("claude-mythos"));
+    expect(models).toHaveLength(1);
+    expect(models[0]).toMatchObject({
+      id: "claude-mythos-5-1",
+      label: "Mythos 5.1",
+      contextWindowMaxTokens: 1_000_000,
+      defaultThinkingOptionId: "high",
+    });
+    expect(models[0].thinkingOptions?.map((option) => option.id)).toEqual([
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(
+      models[0].thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["high"]);
+    expect(resolveClaudeDisabledThinkingForModel("claude-mythos-5-1")).toEqual({
+      supported: false,
+      fallbackThinkingOptionId: "high",
+    });
+    expect(claudeManifestModelSupportsFastMode("claude-mythos-5-1")).toBe(false);
+    expect(getClaudeModels().find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
+  });
+
+  it.each([
+    "claude-mythos-5-1[1m]",
+    "claude-mythos-5-1-20260901",
+    "claude-mythos-5-1-20260901[1m]",
+    "Mythos 5.1",
+  ])("resolves %s to the single catalog entry", (id) => {
+    expect(findClaudeModel(id)?.id).toBe("claude-mythos-5-1");
+  });
+
+  it.each(["anthropic/claude-mythos-5-1", "us.anthropic.claude-mythos-5-1-v1:0"])(
+    "normalizes runtime identity without granting first-party capabilities: %s",
+    (id) => {
+      expect(normalizeClaudeRuntimeModelId(id)).toBe("claude-mythos-5-1");
+      expect(normalizeClaudeManifestModelId(id)).toBeNull();
+    },
+  );
+});
+
+describe("Claude model discovery process", () => {
+  it("does not send a prompt or persist a session and closes after discovery", async () => {
+    let closed = false;
+    let promptEnded: Promise<IteratorResult<unknown>> | undefined;
+    const advertised: ModelInfo[] = [
+      {
+        value: "mythos",
+        resolvedModel: "claude-mythos-5-1",
+        displayName: "Mythos",
+        description: "",
+      },
+    ];
+    const models = await discoverClaudeModels(
+      { resolveBinary: async () => "/claude", env: { CLAUDE_CONFIG_DIR: "/provider-config" } },
+      (input) => {
+        expect(input.options).toMatchObject({
+          pathToClaudeCodeExecutable: "/claude",
+          env: { CLAUDE_CONFIG_DIR: "/provider-config" },
+          persistSession: false,
+          tools: [],
+          mcpServers: {},
+          strictMcpConfig: true,
+          settingSources: ["user"],
+          settings: { disableAllHooks: true },
+        });
+        if (typeof input.prompt === "string") throw new Error("unexpected inference prompt");
+        promptEnded = input.prompt[Symbol.asyncIterator]().next();
+        return {
+          supportedModels: async () => advertised,
+          close: () => {
+            closed = true;
+          },
+        };
+      },
+    );
+    expect(models).toEqual(advertised);
+    expect(closed).toBe(true);
+    await expect(promptEnded).resolves.toEqual({ done: true, value: undefined });
+  });
+
+  it("times out and closes an unresponsive discovery process", async () => {
+    let closed = false;
+    await expect(
+      discoverClaudeModels({ resolveBinary: async () => "/claude", env: {} }, () => ({
+        supportedModels: () => new Promise(() => {}),
+        close: () => {
+          closed = true;
+        },
+      })),
+    ).rejects.toThrow("Claude model discovery timed out");
+    expect(closed).toBe(true);
+  }, 10_000);
+
+  it("closes a stalled probe when its refresh is canceled", async () => {
+    const controller = new AbortController();
+    const failure = new Error("refresh canceled");
+    let closed = false;
+    const result = discoverClaudeModels(
+      { resolveBinary: async () => "/claude", env: {}, signal: controller.signal },
+      () => ({
+        supportedModels: () => {
+          controller.abort(failure);
+          return new Promise(() => {});
+        },
+        close: () => {
+          closed = true;
+        },
+      }),
+    );
+    await expect(result).rejects.toBe(failure);
+    expect(closed).toBe(true);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/claude/models.ts b/packages/server/src/server/agent/providers/claude/models.ts
index c24e5ad36c..39e0dcf1dd 100644
--- a/packages/server/src/server/agent/providers/claude/models.ts
+++ b/packages/server/src/server/agent/providers/claude/models.ts
@@ -1,5 +1,4 @@
 import * as fs from "node:fs/promises";
-import * as os from "node:os";
 import * as path from "node:path";
 import type { Logger } from "pino";
 
@@ -14,6 +13,7 @@ import {
 const CLAUDE_SETTINGS_MODEL_ENV_KEYS = [
   "ANTHROPIC_MODEL",
   "ANTHROPIC_SMALL_FAST_MODEL",
+  "ANTHROPIC_DEFAULT_FABLE_MODEL",
   "ANTHROPIC_DEFAULT_OPUS_MODEL",
   "ANTHROPIC_DEFAULT_SONNET_MODEL",
   "ANTHROPIC_DEFAULT_HAIKU_MODEL",
@@ -50,10 +50,11 @@ export function findClaudeModel(
 
 export async function getClaudeModelsWithSettings(
   logger: Logger,
-  configDir?: string,
+  configDir: string,
   claudeCodeVersion?: string,
+  discoveredModelIds: ReadonlySet<string> = new Set(),
 ): Promise<AgentModelDefinition[]> {
-  const hardcodedModels = getClaudeModels(claudeCodeVersion);
+  const hardcodedModels = getClaudeManifestModels(claudeCodeVersion, discoveredModelIds);
   const settingsModels = await readClaudeSettingsModels(logger, configDir);
   if (settingsModels.length === 0) {
     return hardcodedModels;
@@ -70,7 +71,10 @@ export async function getClaudeModelsWithSettings(
       }
       continue;
     }
-    models.push(model);
+    const manifestModel = getClaudeModels(claudeCodeVersion).find(
+      (candidate) => candidate.id === model.id,
+    );
+    models.push({ ...manifestModel, ...model });
   }
 
   return models;
@@ -78,9 +82,9 @@ export async function getClaudeModelsWithSettings(
 
 async function readClaudeSettingsModels(
   logger: Logger,
-  configDir?: string,
+  configDir: string,
 ): Promise<AgentModelDefinition[]> {
-  const settingsPath = path.join(resolveClaudeConfigDir(configDir), "settings.json");
+  const settingsPath = path.join(configDir, "settings.json");
 
   let parsed: unknown;
   try {
@@ -115,10 +119,6 @@ async function readClaudeSettingsModels(
   return models;
 }
 
-function resolveClaudeConfigDir(configDir?: string): string {
-  return configDir ?? process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
-}
-
 function addSettingsModel(
   models: AgentModelDefinition[],
   value: unknown,
diff --git a/packages/server/src/server/agent/providers/claude/options.ts b/packages/server/src/server/agent/providers/claude/options.ts
index 78766c504b..591accce19 100644
--- a/packages/server/src/server/agent/providers/claude/options.ts
+++ b/packages/server/src/server/agent/providers/claude/options.ts
@@ -48,6 +48,7 @@ export const ClaudeProviderOptionsSchema = z
     allowedTools: z.array(z.string()).optional(),
     disallowedTools: z.array(z.string()).optional(),
     additionalDirectories: z.array(z.string()).optional(),
+    extraArgs: z.record(z.string(), z.string().nullable()).optional(),
     sandbox: z
       .object({
         enabled: z.boolean().optional(),
diff --git a/packages/server/src/server/agent/providers/claude/project-dir.ts b/packages/server/src/server/agent/providers/claude/project-dir.ts
index 6a89711eea..030a54c813 100644
--- a/packages/server/src/server/agent/providers/claude/project-dir.ts
+++ b/packages/server/src/server/agent/providers/claude/project-dir.ts
@@ -1,4 +1,4 @@
-import { realpathSync } from "node:fs";
+import { existsSync, readdirSync, realpathSync } from "node:fs";
 import { realpath } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -30,6 +30,46 @@ export function claudeProjectDirSync(cwd: string, options?: ClaudeProjectDirOpti
   return join(projectsRoot, encode(canonical));
 }
 
+// Claude Code resumes a session by id from any working directory and keeps appending to the
+// transcript in the project folder where the session started. That folder differs from the
+// one `cwd` encodes to when the project moved, the daemon migrated, or Claude Code sees the
+// cwd under another name (a Windows binary under WSL). Returns the expected path when no
+// transcript exists anywhere.
+export function claudeTranscriptPathSync(input: {
+  cwd: string;
+  sessionId: string;
+  configDir?: string;
+}): string {
+  const options = { configDir: input.configDir };
+  const fileName = `${input.sessionId}.jsonl`;
+  const expected = join(claudeProjectDirSync(input.cwd, options), fileName);
+  if (existsSync(expected)) {
+    return expected;
+  }
+  const projectsRoot = join(resolveConfigDir(options), "projects");
+  let projectDirs: string[];
+  try {
+    projectDirs = readdirSync(projectsRoot);
+  } catch (error) {
+    if (isMissingDirectoryError(error)) {
+      return expected;
+    }
+    throw error;
+  }
+  for (const projectDir of projectDirs) {
+    const candidate = join(projectsRoot, projectDir, fileName);
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return expected;
+}
+
+function isMissingDirectoryError(error: unknown): boolean {
+  const code = (error as NodeJS.ErrnoException | null)?.code;
+  return code === "ENOENT" || code === "ENOTDIR";
+}
+
 async function canonicalize(input: string): Promise<string> {
   try {
     return normalizeProjectPath(await realpath(input));
@@ -66,6 +106,11 @@ function hashSuffix(input: string): string {
   return Math.abs(hash).toString(36);
 }
 
+// Claude Code keeps its settings and transcripts here for a process launched with `env`.
+export function claudeConfigDir(env: NodeJS.ProcessEnv): string {
+  return env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude");
+}
+
 function resolveConfigDir(options?: ClaudeProjectDirOptions): string {
-  return options?.configDir ?? process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude");
+  return options?.configDir ?? claudeConfigDir(process.env);
 }
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
index 615ca81f3a..f762557879 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
@@ -35,4 +35,64 @@ describe("ClaudeSidechainTracker", () => {
       },
     });
   });
+
+  it("shows a SubagentHandback report as the subagent's final message", () => {
+    const tracker = new ClaudeSidechainTracker({ getToolInput: () => null });
+    const report = "    indented code\n\n## Verdict\n\n- **Coherent**";
+    const frames = [
+      {
+        type: "stream_event",
+        parent_tool_use_id: "task-1",
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "tool_use",
+            id: "handback-1",
+            name: "SubagentHandback",
+            input: {},
+          },
+        },
+      },
+      {
+        type: "assistant",
+        parent_tool_use_id: "task-1",
+        message: {
+          id: "msg-1",
+          content: [
+            {
+              type: "tool_use",
+              id: "handback-1",
+              name: "SubagentHandback",
+              input: { message: report },
+            },
+          ],
+        },
+      },
+      {
+        type: "user",
+        parent_tool_use_id: "task-1",
+        message: {
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: "handback-1",
+              tool_name: "SubagentHandback",
+              content: [{ type: "text", text: '{"success":true}' }],
+            },
+          ],
+        },
+      },
+    ];
+
+    const childItems = frames
+      .flatMap((frame) => tracker.handleMessage(frame as unknown as SDKMessage, "task-1"))
+      .flatMap((event) =>
+        event.type === "provider_subagent" && event.event.type === "timeline"
+          ? [event.event.item]
+          : [],
+      );
+
+    expect(childItems).toEqual([{ type: "assistant_message", text: report, messageId: "msg-1" }]);
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
index 6973d1db5d..195e21f857 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
@@ -6,6 +6,10 @@ import {
   mapClaudeRunningToolCall,
 } from "./tool-call-mapper.js";
 import { buildToolCallDisplayModel } from "@getpaseo/protocol/tool-call-display";
+import {
+  isClaudeSubagentHandbackToolName,
+  readClaudeSubagentHandback,
+} from "./subagent-handback.js";
 
 import type { AgentMetadata, AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
 
@@ -91,7 +95,7 @@ export class ClaudeSidechainTracker {
     const contextUpdated = this.updateSubAgentContextFromTaskInput(state, parentToolUseId);
     const actionCandidates = this.extractSubAgentActionCandidates(message);
     const childTimelineItems = [
-      ...this.extractSubAgentTimelineItems(message),
+      ...this.extractSubAgentTimelineItems(message, state),
       ...this.extractSubAgentToolResults(message, state),
     ];
     let actionUpdated = false;
@@ -233,7 +237,10 @@ export class ClaudeSidechainTracker {
     this.activeSidechains.clear();
   }
 
-  private extractSubAgentTimelineItems(message: SDKMessage): AgentTimelineItem[] {
+  private extractSubAgentTimelineItems(
+    message: SDKMessage,
+    state: SubAgentActivityState,
+  ): AgentTimelineItem[] {
     if (message.type !== "assistant" || !Array.isArray(message.message?.content)) {
       return [];
     }
@@ -253,6 +260,18 @@ export class ClaudeSidechainTracker {
       } else if (block.type === "thinking") {
         const text = readTrimmedString(block.thinking);
         if (text) items.push({ type: "reasoning", text });
+      } else {
+        const handback = readClaudeSubagentHandback(block);
+        if (!handback) continue;
+        // The handback's result is only an acknowledgement, never a tool card.
+        state.completedActionKeys.add(handback.callId);
+        if (handback.report) {
+          items.push({
+            type: "assistant_message",
+            text: handback.report,
+            ...(messageId ? { messageId } : {}),
+          });
+        }
       }
     }
     return items;
@@ -391,6 +410,12 @@ export class ClaudeSidechainTracker {
   }
 
   private extractSubAgentActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
+    return this.extractToolActionCandidates(message).filter(
+      (action) => !isClaudeSubagentHandbackToolName(action.toolName),
+    );
+  }
+
+  private extractToolActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
     if (message.type === "assistant") {
       return this.extractAssistantMessageActions(message);
     }
diff --git a/packages/server/src/server/agent/providers/claude/subagent-handback.ts b/packages/server/src/server/agent/providers/claude/subagent-handback.ts
new file mode 100644
index 0000000000..2a8613ed31
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/subagent-handback.ts
@@ -0,0 +1,27 @@
+/**
+ * Since Claude Code 2.1.271, a subagent in auto mode delivers its report to its caller through a
+ * `SubagentHandback` tool call instead of its final text. The report is the subagent's final
+ * message, so Paseo shows it as one and hides the call and its acknowledgement.
+ */
+const SUBAGENT_HANDBACK_TOOL_NAME = "SubagentHandback";
+
+export interface ClaudeSubagentHandback {
+  callId: string;
+  /** Null while the call is still streaming its input. */
+  report: string | null;
+}
+
+export function isClaudeSubagentHandbackToolName(name: unknown): boolean {
+  return name === SUBAGENT_HANDBACK_TOOL_NAME;
+}
+
+export function readClaudeSubagentHandback(block: {
+  type: string;
+  [key: string]: unknown;
+}): ClaudeSubagentHandback | null {
+  if (block.type !== "tool_use" || !isClaudeSubagentHandbackToolName(block.name)) return null;
+  if (typeof block.id !== "string" || block.id.length === 0) return null;
+  const input = block.input as { message?: unknown } | null | undefined;
+  const report = typeof input?.message === "string" ? input.message : "";
+  return { callId: block.id, report: report.trim().length > 0 ? report : null };
+}
diff --git a/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts b/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
index 3b2ef59a80..b0bfc3d755 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
@@ -180,6 +180,83 @@ describe("ClaudeTaskProtocolSource", () => {
     ]);
   });
 
+  it("declares a nested task beneath the sidechain agent that launched it", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(
+      taskStarted({
+        task_id: "direct-task",
+        tool_use_id: "toolu_direct",
+        spawn_depth: 1,
+      }),
+    );
+    source.observeSidechainFrame(
+      {
+        type: "assistant",
+        parent_tool_use_id: "toolu_direct",
+        message: {
+          model: "claude-sonnet-5",
+          content: [
+            {
+              type: "tool_use",
+              id: "toolu_nested",
+              name: "Agent",
+              input: { name: "nested-owner" },
+            },
+          ],
+        },
+      } as unknown as SDKMessage,
+      "toolu_direct",
+    );
+
+    expect(
+      source.observe(
+        taskStarted({
+          task_id: "nested-task",
+          tool_use_id: "toolu_nested",
+          spawn_depth: 2,
+        }),
+      ),
+    ).toContainEqual(
+      expect.objectContaining({
+        kind: "declared",
+        id: "toolu_nested",
+        parentSubagentId: "toolu_direct",
+      }),
+    );
+    expect(source.needsSyntheticParentToolCard("toolu_nested")).toBe(false);
+  });
+
+  it("resolves a background task to the sidechain agent that launched it", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(
+      taskStarted({ task_id: "direct-task", tool_use_id: "toolu_direct", spawn_depth: 1 }),
+    );
+    source.observeSidechainFrame(
+      {
+        type: "assistant",
+        parent_tool_use_id: "toolu_direct",
+        message: {
+          model: "claude-sonnet-5",
+          content: [
+            { type: "tool_use", id: "toolu_bash", name: "Bash", input: { command: "sleep 2" } },
+          ],
+        },
+      } as unknown as SDKMessage,
+      "toolu_direct",
+    );
+    source.observe(
+      taskStarted({
+        task_id: "bash-task",
+        tool_use_id: "toolu_bash",
+        task_type: "local_bash",
+        subagent_type: undefined,
+        owned_by_subagent: true,
+      }),
+    );
+
+    expect(source.resolveTaskOwner("bash-task", "toolu_bash")).toBe("toolu_direct");
+  });
+
   it("does not re-announce a status that already holds", () => {
     const source = new ClaudeTaskProtocolSource();
     source.observe(taskStarted());
@@ -434,6 +511,33 @@ describe("ClaudeTaskProtocolSource", () => {
     expect(source.cancelRunningForegroundTasks()).toEqual([]);
   });
 
+  it("does not cancel a subagent announced as backgrounded at spawn", () => {
+    // Claude sets is_backgrounded on task_started for a child spawned in the background, and
+    // sends no task_updated patch for it.
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ is_backgrounded: true }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([]);
+  });
+
+  it("does not cancel a resumed subagent, which Claude always runs in the background", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ tool_use_id: "toolu_original", is_backgrounded: false }));
+    source.observe(taskUpdated("completed"));
+    source.observe(taskStarted({ tool_use_id: "toolu_resumed", is_backgrounded: true }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([]);
+  });
+
+  it("still cancels a subagent announced in the foreground", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ is_backgrounded: false }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([
+      { kind: "status", id: "toolu_01DgLoPMW9", status: "canceled" },
+    ]);
+  });
+
   it("still routes a backgrounded subagent that settles after the interrupt", () => {
     // The headline case: interrupt, continue, and the child that was told to outlive the turn
     // reports completion later. Wiping the routing table on cancel drops this on the floor and
diff --git a/packages/server/src/server/agent/providers/claude/subagents/live-source.ts b/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
index 308c1a6087..2149fae139 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
@@ -16,7 +16,8 @@ import {
  *
  * Verified on the wire (Claude Code 2.1.220, Paseo's own query options):
  *
- *   task_started       task_id, tool_use_id, description, subagent_type, task_type
+ *   task_started       task_id, tool_use_id, description, subagent_type, task_type,
+ *                      is_backgrounded
  *   task_updated       task_id, patch.status, patch.is_backgrounded
  *   task_notification  task_id, tool_use_id, status
  *
@@ -39,6 +40,11 @@ interface TaskStartedMessage {
   task_type?: string;
   prompt?: string;
   skip_transcript?: boolean;
+  /**
+   * Set at spawn: true for a task registered in the background. A resumed subagent is always
+   * registered in the background.
+   */
+  is_backgrounded?: boolean;
 }
 
 /** Task-tool subagents. Backgrounded shell commands announce as `local_bash`. */
@@ -71,8 +77,8 @@ interface TaskUpdatedMessage {
   task_id: string;
   /**
    * `is_backgrounded` is declared on `SDKTaskUpdatedMessage["patch"]`: it flips when a foreground
-   * task is backgrounded, which is the only signal that separates a child that dies with its turn
-   * from one that was explicitly told to outlive it.
+   * task is moved to the background after `task_started`. Together with `task_started`'s own
+   * flag it separates a child that dies with its turn from one told to outlive it.
    */
   patch?: { status?: string; is_backgrounded?: boolean };
 }
@@ -154,6 +160,10 @@ export class ClaudeTaskProtocolSource {
   private readonly subagentIdByTaskId = new Map<string, string>();
   /** Every announced tool id -> the first tool id that publicly identifies the child. */
   private readonly canonicalIdByToolUseId = new Map<string, string>();
+  /** Tool calls made inside a sidechain, keyed to the direct child that emitted them. */
+  private readonly ownerSubagentIdByToolUseId = new Map<string, string>();
+  /** Announced tasks inherit the owner recorded for their tool call, including local_bash. */
+  private readonly ownerSubagentIdByTaskId = new Map<string, string>();
   /**
    * Every subagent id this source declared. It is the source's whole vocabulary: an id that is
    * not in here was either filtered at declaration or never announced, and this source has
@@ -167,8 +177,8 @@ export class ClaudeTaskProtocolSource {
   /** Workflow invocations already own a real Workflow card in the parent timeline. */
   private readonly idsWithExistingParentToolCard = new Set<string>();
   /**
-   * Declared subagents that were moved to the background. They outlive the turn that spawned
-   * them, so a turn ending is not evidence that they stopped.
+   * Declared subagents running in the background, whether spawned there or moved there later.
+   * They outlive the turn that spawned them, so a turn ending is not evidence that they stopped.
    */
   private readonly backgroundedIds = new Set<string>();
   /** Last status emitted per subagent, so a redundant announcement is not re-broadcast. */
@@ -229,6 +239,14 @@ export class ClaudeTaskProtocolSource {
     return subagentId !== undefined && this.declaredIds.has(subagentId);
   }
 
+  /** Resolve a non-subagent task (for example local_bash) to its emitting sidechain. */
+  resolveTaskOwner(taskId: string, toolUseId?: string): string | undefined {
+    return (
+      this.ownerSubagentIdByTaskId.get(taskId) ??
+      (toolUseId ? this.ownerSubagentIdByToolUseId.get(toolUseId) : undefined)
+    );
+  }
+
   needsSyntheticParentToolCard(subagentId: string): boolean {
     return !this.idsWithExistingParentToolCard.has(subagentId);
   }
@@ -259,6 +277,8 @@ export class ClaudeTaskProtocolSource {
   reset(): void {
     this.subagentIdByTaskId.clear();
     this.canonicalIdByToolUseId.clear();
+    this.ownerSubagentIdByToolUseId.clear();
+    this.ownerSubagentIdByTaskId.clear();
     this.declaredIds.clear();
     this.workflowTaskIds.clear();
     this.lastWorkflowResultByTaskId.clear();
@@ -310,32 +330,51 @@ export class ClaudeTaskProtocolSource {
     this.sawAnyTask = true;
 
     const id = readString(message.tool_use_id);
+    const parentSubagentId = id ? this.ownerSubagentIdByToolUseId.get(id) : undefined;
+    if (parentSubagentId) this.ownerSubagentIdByTaskId.set(message.task_id, parentSubagentId);
     // skip_transcript marks ambient housekeeping the transcript should not show.
     if (!id || message.skip_transcript === true || !isProviderSubagentTask(message)) return [];
 
     this.sawTaskStarted = true;
     const existingId = this.subagentIdByTaskId.get(message.task_id);
+    this.recordBackgrounded(existingId ?? id, message.is_backgrounded);
     if (existingId) {
-      this.canonicalIdByToolUseId.set(id, existingId);
-      const observations: SubagentObservation[] = [];
-      if (this.lastStatusById.get(existingId) !== "running") {
-        this.lastStatusById.set(existingId, "running");
-        observations.push({ kind: "status", id: existingId, status: "running" });
-      }
-      const prompt =
-        message.task_type === CLAUDE_WORKFLOW_TASK_TYPE
-          ? readString(message.description)
-          : readString(message.prompt);
-      if (prompt) {
-        observations.push({
-          kind: "timeline",
-          id: existingId,
-          item: { type: "user_message", text: prompt },
-        });
-      }
-      return observations;
+      return this.observeExistingTaskStart(message, id, existingId);
     }
 
+    return this.observeNewTaskStart(message, id, parentSubagentId);
+  }
+
+  private observeExistingTaskStart(
+    message: TaskStartedMessage,
+    toolUseId: string,
+    existingId: string,
+  ): SubagentObservation[] {
+    this.canonicalIdByToolUseId.set(toolUseId, existingId);
+    const observations: SubagentObservation[] = [];
+    if (this.lastStatusById.get(existingId) !== "running") {
+      this.lastStatusById.set(existingId, "running");
+      observations.push({ kind: "status", id: existingId, status: "running" });
+    }
+    const prompt =
+      message.task_type === CLAUDE_WORKFLOW_TASK_TYPE
+        ? readString(message.description)
+        : readString(message.prompt);
+    if (prompt) {
+      observations.push({
+        kind: "timeline",
+        id: existingId,
+        item: { type: "user_message", text: prompt },
+      });
+    }
+    return observations;
+  }
+
+  private observeNewTaskStart(
+    message: TaskStartedMessage,
+    id: string,
+    parentSubagentId: string | undefined,
+  ): SubagentObservation[] {
     this.subagentIdByTaskId.set(message.task_id, id);
     this.canonicalIdByToolUseId.set(id, id);
     this.declaredIds.add(id);
@@ -344,8 +383,10 @@ export class ClaudeTaskProtocolSource {
     // An explicit `name` on the Task call wins over the agent type, matching how replay titles the
     // same subagent. Without it a fan-out of five Explores reads as five identical rows.
     const isWorkflow = message.task_type === CLAUDE_WORKFLOW_TASK_TYPE;
-    if (isWorkflow) {
+    if (isWorkflow || parentSubagentId) {
       this.idsWithExistingParentToolCard.add(id);
+    }
+    if (isWorkflow) {
       this.workflowTaskIds.add(message.task_id);
     }
     const title = isWorkflow
@@ -359,6 +400,7 @@ export class ClaudeTaskProtocolSource {
         toolCallId: id,
         ...(title ? { title } : {}),
         ...(description ? { description } : {}),
+        ...(parentSubagentId ? { parentSubagentId } : {}),
       },
     ];
     const initialPresentation = title ? { title } : {};
@@ -379,14 +421,15 @@ export class ClaudeTaskProtocolSource {
 
   private observeTaskUpdated(message: TaskUpdatedMessage): SubagentObservation[] {
     const id = this.subagentIdByTaskId.get(message.task_id);
-    const backgrounded = message.patch?.is_backgrounded;
-    if (id && typeof backgrounded === "boolean") {
-      if (backgrounded) this.backgroundedIds.add(id);
-      else this.backgroundedIds.delete(id);
-    }
+    if (id) this.recordBackgrounded(id, message.patch?.is_backgrounded);
     return this.observeStatus(message.task_id, message.patch?.status);
   }
 
+  private recordBackgrounded(id: string, backgrounded: boolean | undefined): void {
+    if (backgrounded === true) this.backgroundedIds.add(id);
+    else if (backgrounded === false) this.backgroundedIds.delete(id);
+  }
+
   private observeTaskNotification(message: TaskNotificationMessage): SubagentObservation[] {
     const observations = this.observeWorkflowResult(message);
     observations.push(...this.observeUsage(message.task_id, message.usage));
@@ -447,13 +490,23 @@ export class ClaudeTaskProtocolSource {
    * The model the child is actually running, read off its own assistant frames.
    *
    * Routed through the declaration for the same reason status is: a frame carrying the tool_use
-   * id of a task this source filtered out — ambient housekeeping, a workflow child, a nested
-   * grandchild announced in someone else's session — would otherwise fold to an upsert with no
+   * id of a task this source filtered out — ambient housekeeping or a workflow child — would
+   * otherwise fold to an upsert with no
    * identity and a defaulted "running" status. That is the nameless, never-finishing row the
    * declaration filter exists to prevent, arriving by a different door.
    */
   observeSidechainFrame(message: SDKMessage, subagentId: string): SubagentObservation[] {
     if (message.type !== "assistant" || !this.declaredIds.has(subagentId)) return [];
+    const content = message.message?.content;
+    if (Array.isArray(content)) {
+      for (const block of content) {
+        if (!block || typeof block !== "object") continue;
+        const record = block as { type?: unknown; id?: unknown };
+        if (record.type === "tool_use" && typeof record.id === "string") {
+          this.ownerSubagentIdByToolUseId.set(record.id, subagentId);
+        }
+      }
+    }
     const model = resolveObservedClaudeModelId(
       typeof message.message?.model === "string" ? message.message.model : undefined,
     );
diff --git a/packages/server/src/server/agent/providers/claude/subagents/observation.ts b/packages/server/src/server/agent/providers/claude/subagents/observation.ts
index 718a9fc10a..147d8690a4 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/observation.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/observation.ts
@@ -24,6 +24,8 @@ export type SubagentObservation =
       /** The task this child was given. What actually distinguishes it from its siblings. */
       description?: string;
       toolCallId?: string;
+      /** Provider subagent that launched this one. Absent means a direct child of the agent. */
+      parentSubagentId?: string;
       timestamp?: string;
     }
   | { kind: "status"; id: string; status: ProviderSubagentStatus; timestamp?: string }
@@ -84,6 +86,9 @@ export function foldSubagentObservations(
       ...(observation.title === undefined ? {} : { title: observation.title }),
       ...(observation.description === undefined ? {} : { description: observation.description }),
       ...(observation.toolCallId === undefined ? {} : { toolCallId: observation.toolCallId }),
+      ...(observation.parentSubagentId === undefined
+        ? {}
+        : { parentSubagentId: observation.parentSubagentId }),
       ...(observation.timestamp ? { timestamp: observation.timestamp } : {}),
     });
   }
diff --git a/packages/server/src/server/agent/providers/claude/subagents/replay-source.test.ts b/packages/server/src/server/agent/providers/claude/subagents/replay-source.test.ts
index 6dceb8d0ce..e28d15b8c1 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/replay-source.test.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/replay-source.test.ts
@@ -84,7 +84,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: [] }],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations[0]).toMatchObject({
       kind: "declared",
@@ -95,25 +95,39 @@ describe("observeReplaySubagents", () => {
     });
   });
 
-  it("replays only this session's own children, not their descendants", () => {
-    // Claude Code writes every descendant into the same subagents/ directory. A grandchild's
-    // toolUseId names a Task call made inside its parent's session, so nothing here can resolve
-    // it: it would replay as an extra row the live stream never showed, with no Task card and no
-    // outcome. One recorded session showed 10 subagents live and 22 on reopen.
+  it("replays descendants beneath the sidechain that declared their Task", () => {
+    const nestedToolUseId = "toolu_012rzYnFZA";
     const observations = observeReplaySubagents({
       subagents: [
-        { agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID, spawnDepth: 1 }, entries: [] },
+        {
+          agentId: AGENT_ID,
+          meta: { toolUseId: TOOL_USE_ID, spawnDepth: 1 },
+          entries: [],
+          parentFacts: {
+            toolCalls: new Map([
+              [nestedToolUseId, { title: "Explore", description: "Nested audit" }],
+            ]),
+            linksByAgentId: new Map(),
+            outcomesByToolCallId: new Map([[nestedToolUseId, { failed: false }]]),
+          },
+        },
         {
           agentId: "a6acb4b898",
-          meta: { toolUseId: "toolu_012rzYnFZA", agentType: "Explore", spawnDepth: 2 },
+          meta: { toolUseId: nestedToolUseId, agentType: "Explore", spawnDepth: 2 },
           entries: [],
         },
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
-    expect([...new Set(observations.map((observation) => observation.id))]).toEqual([TOOL_USE_ID]);
+    expect(observations).toContainEqual(
+      expect.objectContaining({
+        kind: "declared",
+        id: nestedToolUseId,
+        parentSubagentId: TOOL_USE_ID,
+      }),
+    );
   });
 
   it("keeps a subagent recorded before spawnDepth existed", () => {
@@ -121,7 +135,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: [] }],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations[0]).toMatchObject({ kind: "declared", id: TOOL_USE_ID });
   });
@@ -137,7 +151,7 @@ describe("observeReplaySubagents", () => {
       ],
       parent: emptyParent(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations).toEqual([]);
   });
@@ -153,7 +167,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: null, entries: [] }],
       parent,
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(declared).toMatchObject({ id: TOOL_USE_ID, toolCallId: TOOL_USE_ID, title: "Explore" });
     expect(rest.at(-1)).toMatchObject({ kind: "status", status: "completed" });
@@ -164,7 +178,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: null, entries: [] }],
       parent: emptyParent(),
       convertEntry: () => [],
-    });
+    }).observations;
     expect(observations).toEqual([]);
   });
 
@@ -188,7 +202,7 @@ describe("observeReplaySubagents", () => {
         ],
         parent: emptyParent(),
         convertEntry: () => [],
-      }),
+      }).observations,
     );
 
     expect(descriptor).toBeNull();
@@ -214,7 +228,7 @@ describe("observeReplaySubagents", () => {
         ],
         parent: emptyParent(),
         convertEntry: () => [],
-      }),
+      }).observations,
     );
 
     expect(descriptor).toBeNull();
@@ -230,7 +244,7 @@ describe("observeReplaySubagents", () => {
           outcomesByToolCallId: new Map(),
         },
         convertEntry: () => [],
-      }),
+      }).observations,
     );
 
     expect(descriptor).toMatchObject({ id: TOOL_USE_ID, status: "failed" });
@@ -253,7 +267,7 @@ describe("observeReplaySubagents", () => {
       ],
       parent: emptyParent(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations).toEqual([]);
   });
@@ -276,7 +290,7 @@ describe("observeReplaySubagents", () => {
         ],
         parent: { ...parentWithTaskCall(), outcomesByToolCallId: new Map() },
         convertEntry: () => [],
-      }),
+      }).observations,
     );
 
     expect(descriptor).toMatchObject({ status: "completed" });
@@ -287,7 +301,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: [] }],
       parent: { ...parentWithTaskCall(), outcomesByToolCallId: new Map() },
       convertEntry: () => [],
-    });
+    }).observations;
     expect(observations.some((o) => o.kind === "status")).toBe(false);
   });
 
@@ -296,7 +310,7 @@ describe("observeReplaySubagents", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: [] }],
       parent: parentWithTaskCall(true),
       convertEntry: () => [],
-    });
+    }).observations;
     expect(observations.at(-1)).toMatchObject({ kind: "status", status: "failed" });
   });
 
@@ -311,7 +325,7 @@ describe("observeReplaySubagents", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [{ type: "reasoning", text: "thinking" }],
-    });
+    }).observations;
 
     expect(observations.find((observation) => observation.kind === "timeline")).toMatchObject({
       kind: "timeline",
@@ -333,7 +347,7 @@ describe("replay runtime", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations.find((o) => o.kind === "subtitle")).toEqual({
       kind: "subtitle",
@@ -356,7 +370,7 @@ describe("replay runtime", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     expect(observations.find((o) => o.kind === "subtitle")).toMatchObject({
       subtitle: "general-purpose · Sonnet 5 · Low",
@@ -368,7 +382,7 @@ describe("replay runtime", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: [] }],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
     expect(observations.some((o) => o.kind === "subtitle")).toBe(false);
   });
 
@@ -384,7 +398,7 @@ describe("replay runtime", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
     expect(observations.find((o) => o.kind === "subtitle")).toMatchObject({
       subtitle: "general-purpose · glm-5.1",
     });
@@ -397,7 +411,7 @@ describe("replay usage", () => {
       subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries }],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    }).find((observation) => observation.kind === "subtitle");
+    }).observations.find((observation) => observation.kind === "subtitle");
   }
 
   it("derives the counters Claude Code itself reports, from a real transcript's shape", () => {
@@ -532,7 +546,7 @@ describe("replay usage", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
     for (const event of foldSubagentObservations(observations)) {
       store.apply("parent", "claude", event);
     }
@@ -579,7 +593,7 @@ describe("live and replay agree", () => {
       ],
       parent: parentWithTaskCall(),
       convertEntry: () => [],
-    });
+    }).observations;
 
     const fromWire = applyToStore(liveObservations);
     const fromDisk = applyToStore(replayObservations);
diff --git a/packages/server/src/server/agent/providers/claude/subagents/replay-source.ts b/packages/server/src/server/agent/providers/claude/subagents/replay-source.ts
index 99eb8e6c69..372cbc01b2 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/replay-source.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/replay-source.ts
@@ -142,6 +142,8 @@ export interface ClaudeReplaySubagentInput {
   agentId: string;
   meta: ClaudeSubagentMeta | null;
   entries: ClaudeReplayEntry[];
+  /** Task declarations made by this subagent, used to attach its direct children. */
+  parentFacts?: ClaudeReplayParentFacts;
 }
 
 export interface ClaudeReplayParentFacts {
@@ -229,6 +231,7 @@ function declareSubagent(
   subagent: ClaudeReplaySubagentInput,
   link: ParentLink,
   toolCall: { title?: string; description?: string } | undefined,
+  parentSubagentId?: string,
 ): SubagentObservation {
   const title = toolCall?.title ?? subagent.meta?.agentType;
   const description = toolCall?.description ?? subagent.meta?.description;
@@ -239,6 +242,7 @@ function declareSubagent(
     ...(title ? { title } : {}),
     ...(description ? { description } : {}),
     ...(link.toolCallId ? { toolCallId: link.toolCallId } : {}),
+    ...(parentSubagentId ? { parentSubagentId } : {}),
     ...(firstTimestamp ? { timestamp: firstTimestamp } : {}),
   };
 }
@@ -274,12 +278,15 @@ function observeSubagent(
   subagent: ClaudeReplaySubagentInput,
   parent: ClaudeReplayParentFacts,
   convertEntry: (entry: ClaudeReplayEntry) => AgentTimelineItem[],
+  parentSubagentId?: string,
 ): SubagentObservation[] {
   const link = resolveParentLink(subagent, parent);
   if (!link) return [];
   const toolCall = parent.toolCalls.get(link.toolCallId);
 
-  const observations: SubagentObservation[] = [declareSubagent(subagent, link, toolCall)];
+  const observations: SubagentObservation[] = [
+    declareSubagent(subagent, link, toolCall, parentSubagentId),
+  ];
   const subtitle = observeSubtitle(subagent, link, toolCall?.title ?? subagent.meta?.agentType);
   if (subtitle) observations.push(subtitle);
 
@@ -311,34 +318,72 @@ function observeSubagent(
   return observations;
 }
 
-/**
- * Whether this transcript belongs to a child of the session being replayed.
- *
- * Claude Code writes every descendant into the same `subagents/` directory, not just the session's
- * own children, and `spawnDepth` is what separates them: 1 is a direct child, 2+ was spawned by
- * another subagent. A grandchild's `toolUseId` names a Task call made inside its parent's session,
- * so nothing in this transcript can resolve it — surveyed across recorded sessions, every depth-1
- * id matched a Task tool_use block in the parent transcript and no deeper id did. Replaying them
- * anyway adds rows the live stream never showed, each with no Task card and no recoverable outcome.
- * One session recorded 10 subagents live and would replay 22.
- *
- * Absent depth means a session recorded before the field existed: keep the subagent rather than
- * lose it, matching how every other missing field here is treated.
- */
-function isDirectChild(subagent: ClaudeReplaySubagentInput): boolean {
-  const depth = subagent.meta?.spawnDepth;
-  return depth === undefined || depth <= 1;
+function recordReplayToolOwners(
+  owners: Map<string, string>,
+  entries: readonly ClaudeReplayEntry[],
+  subagentId: string,
+): void {
+  for (const entry of entries) {
+    if (entry.type !== "assistant" || !Array.isArray(entry.message?.content)) continue;
+    for (const block of entry.message.content) {
+      if (block?.type === "tool_use" && typeof block.id === "string") {
+        owners.set(block.id, subagentId);
+      }
+    }
+  }
 }
 
 export function observeReplaySubagents(input: {
   subagents: readonly ClaudeReplaySubagentInput[];
   parent: ClaudeReplayParentFacts;
   convertEntry: (entry: ClaudeReplayEntry) => AgentTimelineItem[];
-}): SubagentObservation[] {
+}): { observations: SubagentObservation[]; toolOwners: ReadonlyMap<string, string> } {
   const observations: SubagentObservation[] = [];
-  for (const subagent of input.subagents) {
-    if (!isDirectChild(subagent)) continue;
-    observations.push(...observeSubagent(subagent, input.parent, input.convertEntry));
+  const toolOwners = new Map<string, string>();
+  const unresolved = [...input.subagents].sort(
+    (left, right) => (left.meta?.spawnDepth ?? 1) - (right.meta?.spawnDepth ?? 1),
+  );
+  const resolvedParents = new Map<string, ClaudeReplayParentFacts>();
+
+  // Claude stores every descendant beside the root transcript. Resolve one generation at a
+  // time: a child is admitted only when its tool id is declared by a transcript whose own parent
+  // has already been proven. This preserves the old boundary against unrelated ambient sidecars.
+  let madeProgress = true;
+  while (unresolved.length > 0 && madeProgress) {
+    madeProgress = false;
+    for (let index = unresolved.length - 1; index >= 0; index--) {
+      const subagent = unresolved[index];
+      if (!subagent) continue;
+      const resolved = resolveReplayOwner(subagent, input.parent, resolvedParents);
+      if (!resolved) continue;
+      const { ownerId, parent, link } = resolved;
+
+      // Only proven descendants may own notifications; ambient sidecars cannot claim them.
+      recordReplayToolOwners(toolOwners, subagent.entries, link.id);
+      observations.push(...observeSubagent(subagent, parent, input.convertEntry, ownerId));
+      if (subagent.parentFacts) resolvedParents.set(link.id, subagent.parentFacts);
+      unresolved.splice(index, 1);
+      madeProgress = true;
+    }
   }
-  return observations;
+  return { observations, toolOwners };
+}
+
+function resolveReplayOwner(
+  subagent: ClaudeReplaySubagentInput,
+  rootParent: ClaudeReplayParentFacts,
+  resolvedParents: ReadonlyMap<string, ClaudeReplayParentFacts>,
+): {
+  ownerId?: string;
+  parent: ClaudeReplayParentFacts;
+  link: NonNullable<ReturnType<typeof resolveParentLink>>;
+} | null {
+  const rootLink = resolveParentLink(subagent, rootParent);
+  if (rootLink) return { parent: rootParent, link: rootLink };
+
+  for (const [ownerId, parent] of resolvedParents) {
+    const link = resolveParentLink(subagent, parent);
+    if (link) return { ownerId, parent, link };
+  }
+  return null;
 }
diff --git a/packages/server/src/server/agent/providers/claude/task-notification-tool-call.test.ts b/packages/server/src/server/agent/providers/claude/task-notification-tool-call.test.ts
index cbf65194de..d538e14c29 100644
--- a/packages/server/src/server/agent/providers/claude/task-notification-tool-call.test.ts
+++ b/packages/server/src/server/agent/providers/claude/task-notification-tool-call.test.ts
@@ -7,6 +7,18 @@ import {
 } from "./task-notification-tool-call.js";
 
 describe("task-notification-tool-call", () => {
+  it.each([undefined, "ordinary queued prompt"])(
+    "ignores queue bookkeeping without a task notification (%s)",
+    (content) => {
+      expect(
+        mapTaskNotificationSystemRecordToToolCall({
+          type: "queue-operation",
+          operation: "enqueue",
+          content,
+        }),
+      ).toBeNull();
+    },
+  );
   it("detects task notification user content in string payloads", () => {
     expect(
       isTaskNotificationUserContent(
diff --git a/packages/server/src/server/agent/providers/claude/task-notification-tool-call.ts b/packages/server/src/server/agent/providers/claude/task-notification-tool-call.ts
index d305e72e89..2db4beddb0 100644
--- a/packages/server/src/server/agent/providers/claude/task-notification-tool-call.ts
+++ b/packages/server/src/server/agent/providers/claude/task-notification-tool-call.ts
@@ -178,8 +178,9 @@ function parseTaskNotificationFromSystemRecord(record: unknown): TaskNotificatio
   const systemRecord: TaskNotificationHistoryRecord = parsedRecord.data;
   const isSystemTaskNotification =
     systemRecord.type === "system" && systemRecord.subtype === "task_notification";
-  const isQueueOperation = systemRecord.type === "queue-operation";
-  if (!isSystemTaskNotification && !isQueueOperation) {
+  const isQueuedTaskNotification =
+    systemRecord.type === "queue-operation" && isTaskNotificationUserContent(systemRecord.content);
+  if (!isSystemTaskNotification && !isQueuedTaskNotification) {
     return null;
   }
   const rawText = toNonEmptyString(systemRecord.content);
@@ -278,6 +279,7 @@ function toTaskNotificationToolCall(
     synthetic: true,
     source: "claude_task_notification",
     ...(envelope.taskId ? { taskId: envelope.taskId } : {}),
+    ...(envelope.toolUseId ? { toolUseId: envelope.toolUseId } : {}),
     ...(envelope.status ? { status: envelope.status } : {}),
     ...(envelope.outputFile ? { outputFile: envelope.outputFile } : {}),
   };
diff --git a/packages/server/src/server/agent/providers/claude/tool-call-mapper.test.ts b/packages/server/src/server/agent/providers/claude/tool-call-mapper.test.ts
index 0522d0cd50..f0b3ea2af1 100644
--- a/packages/server/src/server/agent/providers/claude/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/claude/tool-call-mapper.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 
 import {
+  mapClaudeCanceledToolCall,
   mapClaudeCompletedToolCall,
   mapClaudeFailedToolCall,
   mapClaudeRunningToolCall,
@@ -15,6 +16,40 @@ function expectMapped<T>(item: T | null): T {
 }
 
 describe("claude tool-call mapper", () => {
+  it("preserves a plan's original tool identity and outcome for live and replayed results", () => {
+    const proposal = { name: "ExitPlanMode", callId: "plan-tool-1", input: { plan: "Ship it" } };
+    const pending = expectMapped(mapClaudeRunningToolCall(proposal));
+    const rejected = expectMapped(
+      mapClaudeFailedToolCall({ ...proposal, error: "Denied by user" }),
+    );
+    const approved = expectMapped(mapClaudeCompletedToolCall(proposal));
+    const canceled = expectMapped(mapClaudeCanceledToolCall(proposal));
+    expect(canceled).toMatchObject({
+      callId: proposal.callId,
+      name: "plan_approval",
+      status: "canceled",
+      detail: { type: "plan", text: "Ship it" },
+    });
+    expect(pending).toMatchObject({
+      callId: "plan-tool-1",
+      detail: { type: "plan", text: "Ship it" },
+    });
+    expect(rejected).toMatchObject({
+      callId: pending.callId,
+      name: "plan_approval",
+      status: "completed",
+      error: null,
+      detail: pending.detail,
+      metadata: { approved: false },
+    });
+    expect(approved).toMatchObject({
+      callId: pending.callId,
+      name: "plan_approval",
+      status: "completed",
+      detail: pending.detail,
+      metadata: { approved: true },
+    });
+  });
   it("maps running shell calls with canonical fields", () => {
     const item = expectMapped(
       mapClaudeRunningToolCall({
diff --git a/packages/server/src/server/agent/providers/claude/tool-call-mapper.ts b/packages/server/src/server/agent/providers/claude/tool-call-mapper.ts
index cc8ed529f0..896cdc962a 100644
--- a/packages/server/src/server/agent/providers/claude/tool-call-mapper.ts
+++ b/packages/server/src/server/agent/providers/claude/tool-call-mapper.ts
@@ -12,6 +12,8 @@ interface MapperParams {
   metadata?: Record<string, unknown>;
 }
 
+const ClaudePlanInputSchema = z.object({ plan: z.string() });
+
 const ClaudeToolCallStatusSchema = z.enum(["running", "completed", "failed", "canceled"]);
 type ClaudeToolCallStatus = z.infer<typeof ClaudeToolCallStatusSchema>;
 
@@ -113,6 +115,28 @@ function mapClaudeToolCall(
   }
 
   const trimmedName = raw.name.trim();
+  if (trimmedName === "ExitPlanMode") {
+    const plan = ClaudePlanInputSchema.safeParse(raw.input);
+    if (plan.success) {
+      // The permission callback and transcript tool_result describe the same call.
+      // Keep its native identity so resolution updates the proposal's original position.
+      return {
+        type: "tool_call",
+        callId,
+        // Older clients suppress the pending native call while showing its approval card.
+        name: status === "running" ? trimmedName : "plan_approval",
+        status: status === "failed" ? "completed" : status,
+        error: null,
+        detail: { type: "plan", text: plan.data.plan },
+        metadata: {
+          ...raw.metadata,
+          ...(status === "completed" || status === "failed"
+            ? { approved: status === "completed" }
+            : {}),
+        },
+      };
+    }
+  }
   const toolKind = resolveClaudeToolKind(trimmedName);
   const name = toolKind === "speak" ? "speak" : trimmedName;
   const input = raw.input ?? null;
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.features.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.features.test.ts
index d6583a2759..8f3f8fc76d 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.features.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.features.test.ts
@@ -19,6 +19,41 @@ interface CollaborationModeRecord {
   developer_instructions?: string | null;
 }
 
+const TEST_SPEED_MODELS = [
+  "gpt-6-astra",
+  "gpt-6.1-sol",
+  "gpt-6-sol",
+  "gpt-6-luna",
+  "gpt-5.6",
+  "gpt-5.6-sol",
+  "gpt-5.6-terra",
+  "gpt-5.6-luna",
+  "gpt-5.5",
+  "gpt-5.4",
+].map((id) => ({
+  id,
+  isDefault: id === "gpt-5.4",
+  defaultReasoningEffort: "medium",
+  serviceTiers: [{ id: "priority", name: "Fast", description: "Faster processing" }],
+}));
+
+function speedFeature(value: string) {
+  return {
+    type: "select",
+    id: "service_tier",
+    label: "Speed",
+    description: "Choose processing speed. Faster tiers increase usage.",
+    tooltip: "Select speed",
+    icon: "zap",
+    desktopTrigger: "icon",
+    value,
+    options: [
+      { id: "default", label: "Normal", isDefault: true },
+      { id: "priority", label: "Fast" },
+    ],
+  };
+}
+
 const TEST_COLLABORATION_MODES: CollaborationModeRecord[] = [
   {
     name: "Code",
@@ -65,7 +100,7 @@ function createConfig(overrides: Partial<AgentSessionConfig> = {}): AgentSession
 
 function createSessionHarness(
   configOverrides: Partial<AgentSessionConfig> = {},
-  options: { logger?: pino.Logger } = {},
+  options: { logger?: pino.Logger; models?: unknown[] } = {},
 ): {
   session: CodexFeaturesTestSession;
   appServer: FakeCodexAppServer;
@@ -73,6 +108,7 @@ function createSessionHarness(
   const config = createConfig(configOverrides);
   const appServer = createFakeCodexAppServer({
     "collaborationMode/list": () => ({ data: TEST_COLLABORATION_MODES }),
+    "model/list": () => ({ data: options.models ?? TEST_SPEED_MODELS }),
   });
   const session = new CodexAppServerAgentSession(
     { ...config, provider: CODEX_PROVIDER },
@@ -85,7 +121,7 @@ function createSessionHarness(
 
 async function createConnectedSession(
   configOverrides: Partial<AgentSessionConfig> = {},
-  options: { logger?: pino.Logger } = {},
+  options: { logger?: pino.Logger; models?: unknown[] } = {},
 ): Promise<{
   session: CodexFeaturesTestSession;
   appServer: FakeCodexAppServer;
@@ -97,19 +133,256 @@ async function createConnectedSession(
 }
 
 describe("Codex app-server provider features", () => {
-  test("features returns fast and plan toggles when supported", async () => {
+  test("GPT-6.1 Sol offers catalog speed tiers and sends Ultrafast", async () => {
+    const { session, appServer } = await createConnectedSession(
+      { model: "gpt-6.1-sol" },
+      {
+        models: [
+          {
+            id: "gpt-6.1-sol",
+            serviceTiers: [
+              { id: "priority", name: "Fast", description: "Faster processing" },
+              { id: "ultrafast", name: "Ultrafast", description: "Lowest latency" },
+            ],
+          },
+        ],
+      },
+    );
+    try {
+      expect(session.features).toContainEqual(
+        expect.objectContaining({
+          id: "service_tier",
+          type: "select",
+          value: "default",
+          options: [
+            { id: "default", label: "Normal", isDefault: true },
+            { id: "priority", label: "Fast" },
+            { id: "ultrafast", label: "Ultrafast" },
+          ],
+        }),
+      );
+      await session.setFeature?.("service_tier", "ultrafast");
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        serviceTier: "ultrafast",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("new models and service tiers work without a Paseo catalog update", async () => {
+    const { session, appServer } = await createConnectedSession(
+      { model: "future-codex-model" },
+      {
+        models: [
+          {
+            id: "future-codex-model",
+            serviceTiers: [
+              { id: "future-tier", name: "Future speed", description: "A newly advertised tier" },
+            ],
+          },
+        ],
+      },
+    );
+    try {
+      expect(session.features).toContainEqual(
+        expect.objectContaining({
+          id: "service_tier",
+          options: [
+            { id: "default", label: "Normal", isDefault: true },
+            { id: "future-tier", label: "Future speed" },
+          ],
+        }),
+      );
+      await session.setFeature?.("service_tier", "future-tier");
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        model: "future-codex-model",
+        serviceTier: "future-tier",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test.each(["priority", "ultrafast"])(
+    "restores %s and Normal explicitly overrides an existing thread tier",
+    async (tier) => {
+      const { session, appServer } = await createConnectedSession(
+        { model: "future-model", featureValues: { service_tier: tier } },
+        {
+          models: [
+            {
+              id: "future-model",
+              serviceTiers: [
+                { id: "priority", name: "Fast", description: "Fast processing" },
+                { id: "ultrafast", name: "Ultrafast", description: "Ultra processing" },
+              ],
+            },
+          ],
+        },
+      );
+      try {
+        expect(session.features).toContainEqual(
+          expect.objectContaining({ id: "service_tier", value: tier }),
+        );
+        await session.getRuntimeInfo();
+        await session.setFeature?.("service_tier", "default");
+        await session.startTurn("hello");
+        await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+          serviceTier: "default",
+        });
+      } finally {
+        await session.close();
+      }
+    },
+  );
+
+  test("rejects unadvertised tiers and non-string values", async () => {
+    const { session } = await createConnectedSession();
+    try {
+      for (const value of ["ultrafast", "bogus", true, null]) {
+        await expect(session.setFeature?.("service_tier", value)).rejects.toThrow(
+          "is not available",
+        );
+      }
+      expect(session.features).toContainEqual(
+        expect.objectContaining({ id: "service_tier", value: "default" }),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("switching to a model without the selected tier resets speed", async () => {
+    const { session, appServer } = await createConnectedSession(
+      { model: "ultra-model", featureValues: { service_tier: "ultrafast" } },
+      {
+        models: [
+          {
+            id: "ultra-model",
+            serviceTiers: [{ id: "ultrafast", name: "Ultrafast", description: "Ultra processing" }],
+          },
+          ...TEST_SPEED_MODELS,
+        ],
+      },
+    );
+    try {
+      await session.setModel("gpt-6.1-sol");
+      expect(session.features).toContainEqual(
+        expect.objectContaining({ id: "service_tier", value: "default" }),
+      );
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({ serviceTier: "default" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("maps legacy Fast commands to the catalog's request id", async () => {
+    const { session, appServer } = await createConnectedSession();
+    try {
+      await session.setFeature?.("fast_mode", true);
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        serviceTier: "priority",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test.each([
+    "gpt-6-astra",
+    "gpt-6.1-sol",
+    "gpt-6-sol",
+    "gpt-6-luna",
+    "gpt-5.6",
+    "gpt-5.6-sol",
+    "gpt-5.6-terra",
+    "gpt-5.6-luna",
+    "gpt-5.5",
+    "gpt-5.4",
+  ])("exposes and sends Fast for %s", async (model) => {
+    const { session, appServer } = await createConnectedSession({ model });
+    try {
+      expect(session.features).toContainEqual(
+        expect.objectContaining({
+          id: "service_tier",
+          value: "default",
+        }),
+      );
+      await session.setFeature?.("service_tier", "priority");
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        model,
+        serviceTier: "priority",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test.each([
+    "gpt-5.3-codex-spark",
+    "gpt-5.3-codex",
+    "gpt-5.4-mini",
+    "gpt-5.4-nano",
+    "gpt-5.5-pro",
+    "gpt-5",
+    "gpt-4.1",
+    "o3",
+    "o4-mini",
+    "gpt-6-unknown",
+  ])("does not expose or restore Fast for %s", async (model) => {
+    const { session, appServer } = await createConnectedSession({
+      model,
+      featureValues: { fast_mode: true },
+    });
+    try {
+      expect(session.features.map((feature) => feature.id)).toEqual(["plan_mode"]);
+      await expect(session.setFeature?.("fast_mode", true)).rejects.toThrow(
+        `Codex fast mode is not available for model '${model}'`,
+      );
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        serviceTier: "default",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("restores Fast on Astra and preserves it when switching supported models", async () => {
+    const { session, appServer } = await createConnectedSession({
+      model: "gpt-6-astra",
+      featureValues: { fast_mode: true },
+    });
+    try {
+      expect(session.features).toContainEqual(
+        expect.objectContaining({
+          id: "service_tier",
+          value: "priority",
+        }),
+      );
+      await session.setModel("gpt-5.6-sol");
+      await session.setModel("gpt-6-astra");
+      await session.startTurn("hello");
+      await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+        model: "gpt-6-astra",
+        serviceTier: "priority",
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("features returns speed selector and plan toggle when supported", async () => {
     const { session } = await createConnectedSession();
 
     expect(session.features).toEqual([
-      {
-        type: "toggle",
-        id: "fast_mode",
-        label: "Fast",
-        description: "Priority inference at 2x usage",
-        tooltip: "Toggle fast mode",
-        icon: "zap",
-        value: false,
-      },
+      speedFeature("default"),
       {
         type: "toggle",
         id: "plan_mode",
@@ -121,19 +394,11 @@ describe("Codex app-server provider features", () => {
       },
     ]);
 
-    await session.setFeature?.("fast_mode", true);
+    await session.setFeature?.("service_tier", "priority");
     await session.setFeature?.("plan_mode", true);
 
     expect(session.features).toEqual([
-      {
-        type: "toggle",
-        id: "fast_mode",
-        label: "Fast",
-        description: "Priority inference at 2x usage",
-        tooltip: "Toggle fast mode",
-        icon: "zap",
-        value: true,
-      },
+      speedFeature("priority"),
       {
         type: "toggle",
         id: "plan_mode",
@@ -181,23 +446,23 @@ describe("Codex app-server provider features", () => {
     ]);
 
     await session.startTurn("hello");
-    await expect(appServer.waitForTurnStart()).resolves.not.toMatchObject({
-      serviceTier: expect.anything(),
+    await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+      serviceTier: "default",
     });
   });
 
-  test("setFeature('fast_mode', true) sets serviceTier to fast", async () => {
+  test("selecting Fast sends the catalog service tier", async () => {
     const { session, appServer } = await createConnectedSession();
 
-    await session.setFeature?.("fast_mode", true);
+    await session.setFeature?.("service_tier", "priority");
     await session.startTurn("hello");
 
     await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
-      serviceTier: "fast",
+      serviceTier: "priority",
     });
   });
 
-  test("setFeature('fast_mode', false) clears serviceTier to null", async () => {
+  test("legacy Fast off explicitly selects Normal", async () => {
     const { session, appServer } = await createConnectedSession({
       featureValues: { fast_mode: true },
     });
@@ -205,8 +470,8 @@ describe("Codex app-server provider features", () => {
     await session.setFeature?.("fast_mode", false);
     await session.startTurn("hello");
 
-    await expect(appServer.waitForTurnStart()).resolves.not.toMatchObject({
-      serviceTier: expect.anything(),
+    await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+      serviceTier: "default",
     });
   });
 
@@ -246,15 +511,7 @@ describe("Codex app-server provider features", () => {
     });
 
     expect(session.features).toEqual([
-      {
-        type: "toggle",
-        id: "fast_mode",
-        label: "Fast",
-        description: "Priority inference at 2x usage",
-        tooltip: "Toggle fast mode",
-        icon: "zap",
-        value: true,
-      },
+      speedFeature("priority"),
       {
         type: "toggle",
         id: "plan_mode",
@@ -268,7 +525,7 @@ describe("Codex app-server provider features", () => {
 
     await session.startTurn("hello");
     await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
-      serviceTier: "fast",
+      serviceTier: "priority",
       collaborationMode: expect.objectContaining({
         mode: "plan",
       }),
@@ -278,11 +535,11 @@ describe("Codex app-server provider features", () => {
   test("startTurn includes serviceTier when fast mode is enabled", async () => {
     const { session, appServer } = await createConnectedSession();
 
-    await session.setFeature?.("fast_mode", true);
+    await session.setFeature?.("service_tier", "priority");
     await session.startTurn("hello");
 
     await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
-      serviceTier: "fast",
+      serviceTier: "priority",
     });
   });
 
@@ -304,7 +561,7 @@ describe("Codex app-server provider features", () => {
       msg: "Starting Codex app-server turn",
       model: "gpt-5.4",
       modeId: "auto",
-      serviceTier: "fast",
+      serviceTier: "priority",
       cwd: "/tmp/codex-fast-mode-test",
     });
     expect(JSON.stringify(entry)).not.toContain(prompt);
@@ -313,7 +570,7 @@ describe("Codex app-server provider features", () => {
   test("setModel clears fast mode when switching to an unsupported model", async () => {
     const { session, appServer } = await createConnectedSession();
 
-    await session.setFeature?.("fast_mode", true);
+    await session.setFeature?.("service_tier", "priority");
     await session.setModel("gpt-3.5-turbo");
 
     expect(session.features).toEqual([
@@ -329,8 +586,8 @@ describe("Codex app-server provider features", () => {
     ]);
     await session.startTurn("hello");
 
-    await expect(appServer.waitForTurnStart()).resolves.not.toMatchObject({
-      serviceTier: expect.anything(),
+    await expect(appServer.waitForTurnStart()).resolves.toMatchObject({
+      serviceTier: "default",
     });
   });
 
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
index 28d0252cf5..0469d9fbe1 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { execFileSync } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
@@ -6,6 +6,9 @@ import { createServer } from "node:http";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { once } from "node:events";
 
+import { AgentManager } from "../agent-manager.js";
+import { AgentStorage } from "../agent-storage.js";
+
 import { CodexAppServerAgentClient } from "./codex-app-server-agent.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import type { AgentStreamEvent } from "../agent-sdk-types.js";
@@ -173,7 +176,7 @@ function writeMockCodexConfig(codexHome: string, serverUrl: string): void {
     path.join(codexHome, "config.toml"),
     `
 model = "mock-model"
-approval_policy = "untrusted"
+approval_policy = "on-request"
 sandbox_mode = "read-only"
 
 model_provider = "mock_provider"
@@ -214,6 +217,53 @@ function waitForEvent<TEvent extends AgentStreamEvent>(params: {
 }
 
 describe("Codex app-server provider (local e2e)", () => {
+  test.runIf(isCodexInstalled())(
+    "reloads a persisted idle thread repeatedly without overlapping writers",
+    async () => {
+      const cwd = mkdtempSync(path.join(os.tmpdir(), "codex-reload-cwd-"));
+      const codexHome = mkdtempSync(path.join(os.tmpdir(), "codex-reload-home-"));
+      const mockServer = await startMockResponsesServer([assistantMessageSse("saved")]);
+      const logger = createTestLogger();
+      const storage = new AgentStorage(path.join(cwd, "agents"), logger);
+      const manager = new AgentManager({
+        clients: { codex: new CodexAppServerAgentClient(logger) },
+        registry: storage,
+        logger,
+      });
+      let agentId: string | undefined;
+      try {
+        writeMockCodexConfig(codexHome, mockServer.url);
+        vi.stubEnv("CODEX_HOME", codexHome);
+        const created = await manager.createAgent(
+          { provider: "codex", cwd, modeId: "auto", model: "mock-model" },
+          undefined,
+          { workspaceId: undefined },
+        );
+        agentId = created.id;
+        await manager.runAgent(agentId, "save this turn");
+        const threadId = manager.getAgent(agentId)?.persistence?.sessionId;
+        expect(threadId).toBeTruthy();
+        for (let i = 0; i < 3; i++) {
+          const reloaded = await manager.reloadAgentSession(agentId, undefined, {
+            rehydrateFromDisk: true,
+          });
+          expect(reloaded.persistence?.sessionId).toBe(threadId);
+          expect(reloaded.lifecycle).toBe("idle");
+        }
+        await manager.runAgent(agentId, "continue after reload");
+        expect(manager.getAgent(agentId)?.lifecycle).toBe("idle");
+      } finally {
+        if (agentId && manager.getAgent(agentId)) await manager.closeAgent(agentId);
+        await storage.flush();
+        vi.unstubAllEnvs();
+        await mockServer.close();
+        rmSync(cwd, { recursive: true, force: true });
+        rmSync(codexHome, { recursive: true, force: true });
+      }
+    },
+    30_000,
+  );
+
   test.runIf(isCodexInstalled())(
     "surfaces request_user_input from the app-server as question permissions and timeline tool calls",
     async () => {
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.process-exit.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.process-exit.test.ts
index 63a45be061..9cfeca60d3 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.process-exit.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.process-exit.test.ts
@@ -11,6 +11,7 @@ import type {
   AgentLaunchContext,
   AgentSession,
   AgentSessionConfig,
+  AgentStreamEvent,
 } from "../agent-sdk-types.js";
 import { CodexAppServerAgentClient, CodexAppServerAgentSession } from "./codex-app-server-agent.js";
 import {
@@ -20,6 +21,87 @@ import {
 
 const logger = createTestLogger();
 
+interface PendingPlanLifecycle {
+  close(): Promise<void>;
+  crashDuringActiveTurn(): Promise<void>;
+  expectCanceledPlan(): void;
+}
+
+async function withPendingPlan(
+  runScenario: (plan: PendingPlanLifecycle) => Promise<void>,
+): Promise<void> {
+  const workdir = mkdtempSync(join(tmpdir(), "codex-plan-cancel-"));
+  const appServer = createFakeCodexAppServer();
+  const client = new ProcessExitCodexClient([appServer]);
+  const session = await client.createSession({
+    provider: "codex",
+    cwd: workdir,
+    modeId: "auto",
+    model: "gpt-5.4",
+    featureValues: { plan_mode: true },
+  });
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+  try {
+    const run = session.run("make a plan");
+    await appServer.waitForTurnStart();
+    appServer.startsTurn({ threadId: "thread-1", turnId: "plan-turn" });
+    appServer.updatesPlan({ threadId: "thread-1", steps: ["Inspect README"] });
+    appServer.completeTurn();
+    await run;
+    const proposal = events.find(
+      (event) =>
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.name === "plan_approval",
+    );
+    expect(proposal).toBeDefined();
+    const [request] = session.getPendingPermissions?.() ?? [];
+    expect(request).toBeDefined();
+    await runScenario({
+      close: () => session.close(),
+      async crashDuringActiveTurn() {
+        appServer.startsTurn({ threadId: "thread-1", turnId: "autonomous-turn" });
+        await expect
+          .poll(() => events.filter((event) => event.type === "turn_started").length)
+          .toBe(2);
+        appServer.child.emit("exit", 17, null);
+        await expect.poll(() => events.some((event) => event.type === "turn_failed")).toBe(true);
+      },
+      expectCanceledPlan() {
+        expect(session.getPendingPermissions?.()).toEqual([]);
+        expect(events).toContainEqual({
+          ...proposal,
+          item: expect.objectContaining({
+            type: "tool_call",
+            name: "plan_approval",
+            callId: request?.id,
+            status: "canceled",
+            detail: { type: "plan", text: "- Inspect README" },
+          }),
+        });
+      },
+    });
+  } finally {
+    await session.close();
+    rmSync(workdir, { recursive: true, force: true });
+  }
+}
+
+test("closing a session retains a canceled pending plan", async () => {
+  await withPendingPlan(async (plan) => {
+    await plan.close();
+    plan.expectCanceledPlan();
+  });
+});
+
+test("an active provider crash retains a canceled pending plan", async () => {
+  await withPendingPlan(async (plan) => {
+    await plan.crashDuringActiveTurn();
+    plan.expectCanceledPlan();
+  });
+});
+
 class ProcessExitCodexClient extends CodexAppServerAgentClient implements AgentClient {
   constructor(private readonly appServers: FakeCodexAppServer[]) {
     super(logger);
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.spawn-error.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.spawn-error.test.ts
index bd1e0580f7..bff992e2ff 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.spawn-error.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.spawn-error.test.ts
@@ -1,7 +1,9 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 
 import { CodexAppServerAgentClient } from "./codex-app-server-agent.js";
+import { runProviderRefreshWithDeadline } from "../provider-refresh-deadline.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { createCodexAppServerChildProcess } from "./codex/test-utils/fake-app-server.js";
 
 describe("CodexAppServerAgentClient spawn error handling", () => {
   const logger = createTestLogger();
@@ -32,6 +34,31 @@ describe("CodexAppServerAgentClient spawn error handling", () => {
     }
   });
 
+  test("fetchCatalog settles when the refresh deadline aborts an unanswered initialize", async () => {
+    const client = new CodexAppServerAgentClient(logger, {
+      command: {
+        mode: "replace",
+        argv: ["/nonexistent/codex-binary-that-does-not-exist"],
+      },
+    });
+    const child = createCodexAppServerChildProcess();
+    const kill = vi.spyOn(child, "kill");
+    Object.assign(client, { spawnAppServer: async () => child });
+
+    await expect(
+      runProviderRefreshWithDeadline({
+        label: "Codex",
+        timeoutMs: 50,
+        operation: (context) =>
+          client.fetchCatalog(
+            { scope: "workspace", cwd: "/tmp/codex-models", force: false },
+            context,
+          ),
+      }),
+    ).rejects.toThrow("Timed out refreshing Codex after 50ms");
+    expect(kill).toHaveBeenCalled();
+  });
+
   test("listImportableSessions rejects gracefully when the codex binary does not exist", async () => {
     const client = new CodexAppServerAgentClient(logger, {
       command: {
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
index 1046532867..c8269722a7 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
@@ -10,6 +10,7 @@ import { fileURLToPath } from "node:url";
 
 import type {
   AgentLaunchContext,
+  AgentPermissionRequest,
   AgentSession,
   AgentSessionConfig,
   AgentSlashCommand,
@@ -111,7 +112,7 @@ interface CodexSessionTestAccess {
   ensureThreadLoaded(): Promise<void>;
   handleToolApprovalRequest(params: unknown): Promise<unknown>;
   handleNotification(method: string, params: unknown): void;
-  loadPersistedHistory(): Promise<void>;
+  loadPersistedHistory(client: CodexClientLike | null): Promise<void>;
   refreshResolvedCollaborationMode(): void;
   serviceTier: "fast" | null;
   planModeEnabled: boolean;
@@ -124,7 +125,7 @@ interface CodexClientLike {
 }
 
 type CodexTestSession = AgentSession & {
-  connected: boolean;
+  connectionState: "disconnected" | "history-ready" | "connected";
   currentThreadId: string | null;
   activeForegroundTurnId: string | null;
   client: CodexClientLike | null;
@@ -165,14 +166,22 @@ function createSession(
     options.goalsEnabled === true,
     options.autoReviewEnabled === true,
   ) as CodexTestSession;
-  session.connected = true;
+  session.connectionState = "connected";
   session.currentThreadId = "test-thread";
   session.activeForegroundTurnId = "test-turn";
   return session;
 }
 
-function createProviderWithFakeAppServer(appServer: FakeCodexAppServer): CodexAppServerAgentClient {
-  const provider = new CodexAppServerAgentClient(createTestLogger());
+function createProviderWithFakeAppServer(
+  appServer: FakeCodexAppServer,
+  options?: {
+    runtimeSettings?: ConstructorParameters<typeof CodexAppServerAgentClient>[1];
+    customProvider?: { id: string; label: string; extends: string };
+  },
+): CodexAppServerAgentClient {
+  const provider = new CodexAppServerAgentClient(createTestLogger(), options?.runtimeSettings, {
+    customProvider: options?.customProvider,
+  });
   const internals = castInternals<{
     goalsEnabledPromise: Promise<boolean> | null;
     autoReviewEnabledPromise: Promise<boolean> | null;
@@ -609,6 +618,131 @@ process.stdin.on("data", (chunk) => {
   }
 }
 
+async function withCustomCodexProviderHome<T>(
+  run: (input: {
+    session: AgentSession;
+    readCaptured: () => CapturedFakeCodexRecord[];
+  }) => Promise<T>,
+  providerPrompts: Record<string, string> = {},
+): Promise<T> {
+  const tempDir = await mkdtemp(path.join(tmpdir(), "codex-provider-home-"));
+  const daemonCodexHome = path.join(tempDir, "daemon-codex-home");
+  const providerCodexHome = path.join(tempDir, "provider-codex-home");
+  const fakeAppServerPath = path.join(tempDir, "fake-codex-app-server.cjs");
+  const capturedRequestsPath = path.join(tempDir, "requests.jsonl");
+  mkdirSync(path.join(daemonCodexHome, "prompts"), { recursive: true });
+  mkdirSync(path.join(providerCodexHome, "prompts"), { recursive: true });
+  writeFileSync(
+    path.join(daemonCodexHome, "prompts", "probe-default.md"),
+    "---\ndescription: Daemon home prompt\n---\nfrom the daemon home\n",
+  );
+  writeFileSync(
+    path.join(providerCodexHome, "prompts", "probe-profile.md"),
+    "---\ndescription: Provider home prompt\n---\nfrom the provider home\n",
+  );
+  for (const [name, content] of Object.entries(providerPrompts)) {
+    writeFileSync(path.join(providerCodexHome, "prompts", `${name}.md`), content);
+  }
+  writeFileSync(
+    fakeAppServerPath,
+    `
+const fs = require("node:fs");
+
+const capturePath = process.env.PASEO_FAKE_CODEX_CAPTURE;
+let buffer = "";
+
+fs.appendFileSync(capturePath, JSON.stringify({ kind: "env", CODEX_HOME: process.env.CODEX_HOME }) + "\\n");
+
+function resultFor(method) {
+  if (method === "collaborationMode/list") return { data: [] };
+  if (method === "skills/list") return { data: [] };
+  if (method === "model/list") return { data: [{ id: "profile-model", isDefault: true }] };
+  if (method === "thread/start") return { thread: { id: "thread-1" } };
+  return {};
+}
+
+process.stdin.on("data", (chunk) => {
+  buffer += chunk.toString();
+  for (;;) {
+    const newlineIndex = buffer.indexOf("\\n");
+    if (newlineIndex === -1) break;
+    const line = buffer.slice(0, newlineIndex).trim();
+    buffer = buffer.slice(newlineIndex + 1);
+    if (!line) continue;
+    const message = JSON.parse(line);
+    fs.appendFileSync(capturePath, JSON.stringify({ kind: "request", method: message.method, params: message.params }) + "\\n");
+    process.stdout.write(JSON.stringify({ id: message.id, result: resultFor(message.method) }) + "\\n");
+  }
+});
+`,
+  );
+
+  vi.stubEnv("CODEX_HOME", daemonCodexHome);
+  const registry = buildProviderRegistry(createTestLogger(), {
+    providerOverrides: {
+      "profile-codex": {
+        extends: "codex",
+        label: "Profile Codex",
+        command: [process.execPath, fakeAppServerPath],
+        env: {
+          CODEX_HOME: providerCodexHome,
+          PASEO_FAKE_CODEX_CAPTURE: capturedRequestsPath,
+        },
+      },
+    },
+  });
+  const session = await registry["profile-codex"].createClient(createTestLogger()).createSession({
+    provider: "profile-codex",
+    cwd: tempDir,
+    modeId: "auto",
+  });
+
+  try {
+    expect(session.usageSession?.()).toMatchObject({
+      provider: "codex",
+      env: { CODEX_HOME: providerCodexHome },
+    });
+    expect(session.usageSession?.()?.sessionKey).toBe(session.usageSession?.()?.sessionKey);
+    return await run({
+      session,
+      readCaptured: () =>
+        readFileSync(capturedRequestsPath, "utf8")
+          .trim()
+          .split("\n")
+          .map((line) => JSON.parse(line) as CapturedFakeCodexRecord),
+    });
+  } finally {
+    await session.close();
+    expect(session.usageSession?.()).toBeNull();
+    vi.unstubAllEnvs();
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+async function listPromptCommandsFromCustomCodexHome(): Promise<string[]> {
+  return withCustomCodexProviderHome(async ({ session }) => {
+    const commands = await session.listCommands!();
+    return commands.map((command) => command.name).filter((name) => name.startsWith("prompts:"));
+  });
+}
+
+async function runPromptFromCustomCodexHome(
+  prompt: string,
+  providerPrompts: Record<string, string> = {},
+): Promise<CapturedFakeCodexRecord[]> {
+  return withCustomCodexProviderHome(async ({ session, readCaptured }) => {
+    await session.startTurn(prompt);
+    return readCaptured();
+  }, providerPrompts);
+}
+
+async function expandCustomPrompt(template: string, args: string): Promise<string> {
+  const records = await runPromptFromCustomCodexHome(`/prompts:template ${args}`, { template });
+  const turnStart = records.find((record) => record.method === "turn/start");
+  const params = turnStart?.params as { input: Array<{ text: string }> };
+  return params.input[0].text;
+}
+
 function capturedThreadStartConfig(records: CapturedFakeCodexRecord[]): unknown {
   const threadStart = records.find((record) => record.method === "thread/start");
   const params = threadStart?.params as Record<string, unknown> | undefined;
@@ -639,6 +773,7 @@ let buffer = "";
 function resultFor(method, params) {
   if (method === "initialize") return {};
   if (method === "collaborationMode/list") return { data: [] };
+  if (method === "model/list") return { data: [] };
   if (method === "skills/list") {
     const cwds = params && params.cwds;
     const projectCwd = ${JSON.stringify(projectCwd)};
@@ -744,6 +879,94 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("Default Permissions pins the user as approvals reviewer on thread/start", async () => {
+    const requests: Array<{ method: string; params: unknown }> = [];
+    const session = createSession(
+      { modeId: "auto", thinkingOptionId: "medium" },
+      { autoReviewEnabled: true },
+    );
+    session.currentThreadId = null;
+    session.activeForegroundTurnId = null;
+    session.client = {
+      request: vi.fn(async (method: string, params: unknown) => {
+        requests.push({ method, params });
+        if (method === "thread/start") {
+          return { thread: { id: "default-mode-thread" } };
+        }
+        if (method === "turn/start") {
+          return {};
+        }
+        throw new Error(`Unexpected request: ${method}`);
+      }),
+    };
+
+    await session.startTurn("trigger thread creation");
+
+    const startCall = requests.find((req) => req.method === "thread/start");
+    expect(startCall?.params).toMatchObject({
+      approvalPolicy: "on-request",
+      sandbox: "workspace-write",
+      approvalsReviewer: "user",
+    });
+  });
+
+  test("switching from auto-review back to Default returns approvals to the user", async () => {
+    const session = createSession({ modeId: "auto-review" }, { autoReviewEnabled: true });
+    const request = vi.fn(async (method: string) => {
+      if (method === "thread/loaded/list") {
+        return { data: ["test-thread"] };
+      }
+      if (method === "turn/start") {
+        return {};
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    session.activeForegroundTurnId = null;
+    session.client = createStub<CodexClientLike>({ request });
+
+    await session.setMode("auto");
+    await session.startTurn("needs approval");
+
+    const turnStartCall = request.mock.calls.find(([method]) => method === "turn/start");
+    expect(turnStartCall?.[1]).toEqual(
+      expect.objectContaining({
+        approvalPolicy: "on-request",
+        approvalsReviewer: "user",
+      }),
+    );
+  });
+
+  test("Read-only pins the user as approvals reviewer on thread/start", async () => {
+    const requests: Array<{ method: string; params: unknown }> = [];
+    const session = createSession(
+      { modeId: "read-only", thinkingOptionId: "medium" },
+      { autoReviewEnabled: true },
+    );
+    session.currentThreadId = null;
+    session.activeForegroundTurnId = null;
+    session.client = {
+      request: vi.fn(async (method: string, params: unknown) => {
+        requests.push({ method, params });
+        if (method === "thread/start") {
+          return { thread: { id: "read-only-thread" } };
+        }
+        if (method === "turn/start") {
+          return {};
+        }
+        throw new Error(`Unexpected request: ${method}`);
+      }),
+    };
+
+    await session.startTurn("trigger thread creation");
+
+    const startCall = requests.find((req) => req.method === "thread/start");
+    expect(startCall?.params).toMatchObject({
+      approvalPolicy: "on-request",
+      sandbox: "read-only",
+      approvalsReviewer: "user",
+    });
+  });
+
   test("setMode and setThinkingOption return a next-turn notice while a turn is active", async () => {
     const session = createSession({ modeId: "auto", thinkingOptionId: "medium" });
 
@@ -834,6 +1057,7 @@ describe("Codex app-server provider", () => {
     const turnStart = request.mock.calls.find(([method]) => method === "turn/start")?.[1];
     expect(turnStart).not.toHaveProperty("approvalPolicy");
     expect(turnStart).not.toHaveProperty("sandboxPolicy");
+    expect(turnStart).not.toHaveProperty("approvalsReviewer");
   });
 
   test("carries the complete native workspace-write policy including writable roots", async () => {
@@ -916,6 +1140,53 @@ describe("Codex app-server provider", () => {
     }
   });
 
+  test("keeps the default effort when a session without one is resumed after a restart", async () => {
+    const beforeRestart = createFakeCodexAppServer();
+    const firstSession = await createProviderWithFakeAppServer(beforeRestart).createSession(
+      createConfig({ thinkingOptionId: undefined }),
+    );
+    await firstSession.startTurn("first turn");
+    await expect(beforeRestart.waitForTurnStart()).resolves.toMatchObject({ effort: "medium" });
+    const handle = firstSession.describePersistence()!;
+    await firstSession.close();
+
+    const afterRestart = createFakeCodexAppServer();
+    // The daemon resumes with the stored agent config, which never recorded an effort.
+    const resumed = await createProviderWithFakeAppServer(afterRestart).resumeSession(handle, {
+      model: "gpt-5.4",
+      thinkingOptionId: undefined,
+    });
+
+    try {
+      await expect(resumed.getRuntimeInfo()).resolves.toMatchObject({
+        thinkingOptionId: "medium",
+      });
+      await resumed.startTurn("turn after restart");
+      await expect(afterRestart.waitForTurnStart()).resolves.toMatchObject({ effort: "medium" });
+      beforeRestart.assertNoErrors();
+      afterRestart.assertNoErrors();
+    } finally {
+      await resumed.close();
+    }
+  });
+
+  test("provider persistence leaves options owned by the stored agent config", async () => {
+    const appServer = createFakeCodexAppServer();
+    const provider = createProviderWithFakeAppServer(appServer);
+    const session = await provider.createSession(
+      createConfig({ providerOptions: { sandbox_mode: "read-only", approval_policy: "never" } }),
+    );
+    try {
+      await session.startTurn("persist the configured session");
+      await appServer.waitForTurnStart();
+      const handle = session.describePersistence()!;
+      expect(handle.metadata).not.toHaveProperty("providerOptions");
+      appServer.assertNoErrors();
+    } finally {
+      await session.close();
+    }
+  });
+
   test("preapproves only granted tools on the injected Codex MCP server", async () => {
     const session = createSession({
       modeId: undefined,
@@ -1022,7 +1293,13 @@ describe("Codex app-server provider", () => {
     child.stderr = new PassThrough() as ChildProcessWithoutNullStreams["stderr"];
     child.exitCode = null;
     child.signalCode = null;
-    child.kill = vi.fn(() => true) as ChildProcessWithoutNullStreams["kill"];
+    child.kill = vi.fn((signal) => {
+      if (signal === "SIGKILL") {
+        child.signalCode = "SIGKILL";
+        child.emit("exit", null, "SIGKILL");
+      }
+      return true;
+    }) as ChildProcessWithoutNullStreams["kill"];
     const client = new CodexAppServerClient(child, createTestLogger());
 
     try {
@@ -1093,6 +1370,75 @@ describe("Codex app-server provider", () => {
     await session.close();
   });
 
+  test("answers each concurrent command approval callback that shares one item", async () => {
+    const appServer = createFakeCodexAppServer({
+      initialize: () => ({}),
+      "collaborationMode/list": () => ({ data: [] }),
+      "skills/list": () => ({ data: [] }),
+    });
+    const session = new CodexAppServerAgentSession(
+      createConfig({ cwd: "/workspace/project" }),
+      null,
+      createTestLogger(),
+      async () => appServer.child,
+    );
+    const requested: AgentPermissionRequest[] = [];
+    session.subscribe((event) => {
+      if (event.type === "permission_requested") requested.push(event.request);
+    });
+
+    try {
+      await session.connect();
+
+      const firstPermission = waitForNextPermission(session);
+      appServer.requestCommandApproval({
+        itemId: "shared-item",
+        approvalId: "callback-a",
+        threadId: "thread-1",
+        turnId: "turn-1",
+        command: "git add a.txt",
+        cwd: "/workspace/project",
+        reason: "subcommand a",
+      });
+      await firstPermission;
+      const secondPermission = waitForNextPermission(session);
+      appServer.requestCommandApproval({
+        itemId: "shared-item",
+        approvalId: "callback-b",
+        threadId: "thread-1",
+        turnId: "turn-1",
+        command: "git add b.txt",
+        cwd: "/workspace/project",
+        reason: "subcommand b",
+      });
+      await secondPermission;
+
+      expect(requested.map((request) => request.input?.command)).toEqual([
+        "git add a.txt",
+        "git add b.txt",
+      ]);
+      expect(new Set(requested.map((request) => request.id)).size).toBe(2);
+      expect(session.getPendingPermissions()).toHaveLength(2);
+
+      await session.respondToPermission(requested[0]!.id, { behavior: "allow" });
+      await session.respondToPermission(requested[1]!.id, {
+        behavior: "deny",
+        message: "not b",
+      });
+
+      await expect(appServer.waitForCommandApprovalDecision("callback-a")).resolves.toEqual({
+        decision: "accept",
+      });
+      await expect(appServer.waitForCommandApprovalDecision("callback-b")).resolves.toEqual({
+        decision: "decline",
+      });
+      expect(session.getPendingPermissions()).toHaveLength(0);
+      appServer.assertNoErrors();
+    } finally {
+      await session.close();
+    }
+  });
+
   test("shows a successful shell command that produces no output", async () => {
     const appServer = createFakeCodexAppServer();
     const session = new CodexAppServerAgentSession(
@@ -1255,6 +1601,51 @@ describe("Codex app-server provider", () => {
     }
   });
 
+  test.each(["python3 -i", "/usr/bin/zsh -lc 'python3 -i'"])(
+    "labels a terminal write started as %s with the command that started the terminal",
+    async (command) => {
+      const appServer = createFakeCodexAppServer();
+      const session = new CodexAppServerAgentSession(
+        createConfig({ cwd: "/workspace/project" }),
+        null,
+        createTestLogger(),
+        async () => appServer.child,
+      );
+
+      try {
+        await session.connect();
+        appServer.startsTerminalCommand({
+          threadId: "thread-1",
+          turnId: "turn-1",
+          itemId: "interactive-shell",
+          processId: "73",
+          command,
+        });
+
+        const terminalWrite = waitForTimelineToolCall(session, "terminal-session-73-1");
+        appServer.typesIntoTerminal({
+          threadId: "thread-1",
+          turnId: "turn-1",
+          itemId: "interactive-shell",
+          processId: "73",
+          text: "print(1)\n",
+        });
+
+        await expect(terminalWrite).resolves.toMatchObject({
+          item: {
+            callId: "terminal-session-73-1",
+            name: "terminal",
+            detail: { type: "plain_text", label: "python3 -i", text: "print(1)\n" },
+            metadata: { processId: "73" },
+          },
+        });
+        appServer.assertNoErrors();
+      } finally {
+        await session.close();
+      }
+    },
+  );
+
   test("keeps repeated writes to one terminal as separate timeline rows", async () => {
     const appServer = createFakeCodexAppServer();
     const session = new CodexAppServerAgentSession(
@@ -1407,6 +1798,28 @@ describe("Codex app-server provider", () => {
     await session.close();
   });
 
+  test("resumed session exposes usage before connecting and not after close", async () => {
+    let spawns = 0;
+    const session = new CodexAppServerAgentSession(
+      createConfig({ cwd: "/workspace/project" }),
+      { sessionId: "saved-thread" },
+      createTestLogger(),
+      async () => {
+        spawns++;
+        throw new Error("unexpected spawn");
+      },
+      { environment: { HOME: "/fixture/codex", CODEX_HOME: "/fixture/profile" } },
+    );
+    expect(session.usageSession()).toMatchObject({
+      provider: "codex",
+      env: { CODEX_HOME: "/fixture/profile" },
+      sessionKey: expect.any(String),
+    });
+    expect(spawns).toBe(0);
+    await session.close();
+    expect(session.usageSession()).toBeNull();
+  });
+
   test("loads archived Codex history without resuming the native thread", async () => {
     const threadRequests: string[] = [];
     const appServer = createFakeCodexAppServer({
@@ -1429,7 +1842,7 @@ describe("Codex app-server provider", () => {
       purpose: "history",
     });
 
-    expect(threadRequests).toEqual(["thread/loaded/list", "thread/resume", "thread/read"]);
+    expect(threadRequests).toEqual(["thread/read"]);
     await session.close();
     appServer.assertNoErrors();
   });
@@ -1674,6 +2087,66 @@ describe("Codex app-server provider", () => {
     await session.close();
   });
 
+  test("rewinds a legacy conversation with a bounded fork on Codex without thread/rollback", async () => {
+    const appServer = createFakeCodexAppServer({
+      initialize: () => ({ userAgent: "paseo/0.159.0 (Ubuntu 26.4.0; x86_64) (paseo; 0)" }),
+      "thread/read": () => ({
+        thread: { id: "thread-1", historyMode: "legacy", turns: [] },
+      }),
+      "thread/rollback": () => ({
+        __jsonRpcError: {
+          code: -32600,
+          message: "Invalid request: unknown variant `thread/rollback`",
+        },
+      }),
+    });
+    const session = new CodexAppServerAgentSession(
+      createConfig({ cwd: "/workspace/project" }),
+      null,
+      createTestLogger(),
+      async () => appServer.child,
+    );
+
+    await session.startTurn("remember first");
+    emitCodexUserMessage(appServer, {
+      id: "codex-first",
+      text: "remember first",
+      turnId: "turn-first",
+    });
+    appServer.completeTurn();
+    await session.startTurn("remember second");
+    emitCodexUserMessage(appServer, {
+      id: "codex-second",
+      text: "remember second",
+      turnId: "turn-second",
+    });
+    appServer.completeTurn();
+
+    await session.revertConversation({ messageId: "codex-second" });
+
+    const forkRequests = appServer
+      .requests()
+      .filter((request) => request.method === "thread/fork")
+      .map((request) => request.params);
+    expect(forkRequests).toEqual([
+      {
+        threadId: "thread-1",
+        beforeTurnId: "turn-second",
+        cwd: "/workspace/project",
+        model: "gpt-5.4",
+        serviceTier: null,
+        excludeTurns: false,
+        persistExtendedHistory: true,
+      },
+    ]);
+    expect(appServer.recordedRollbacks).toEqual([]);
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({
+      sessionId: "forked-thread",
+    });
+    appServer.assertNoErrors();
+    await session.close();
+  });
+
   test("rewinds a paginated conversation through the public session capability", async () => {
     const appServer = createFakeCodexAppServer({
       "thread/read": () => ({
@@ -1730,6 +2203,79 @@ describe("Codex app-server provider", () => {
     await session.close();
   });
 
+  test.each(["legacy", "paginated"] as const)(
+    "rewinds a %s thread onto a fork that keeps the custom provider and runtime MCP servers",
+    async (historyMode) => {
+      const appServer = createFakeCodexAppServer(
+        historyMode === "paginated"
+          ? {
+              "thread/read": () => ({
+                thread: { id: "thread-1", historyMode: "paginated", turns: [] },
+              }),
+            }
+          : undefined,
+      );
+      const customCodexConfig = {
+        model_provider: "codex-custom",
+        model_providers: {
+          "codex-custom": {
+            name: "Custom Codex",
+            base_url: "https://custom-relay.example.com/v1",
+            env_key: "OPENAI_API_KEY",
+            requires_openai_auth: false,
+            wire_api: "responses",
+          },
+        },
+      };
+      const session = new CodexAppServerAgentSession(
+        createConfig({
+          cwd: "/workspace/project",
+          mcpServers: {
+            paseo: { type: "http", url: "http://127.0.0.1:6767/mcp/agents?callerAgentId=agent-1" },
+          },
+        }),
+        null,
+        createTestLogger(),
+        async () => appServer.child,
+        { customCodexConfig },
+      );
+
+      await session.startTurn("remember first");
+      emitCodexUserMessage(appServer, {
+        id: "codex-first",
+        text: "remember first",
+        turnId: "turn-first",
+      });
+      appServer.completeTurn();
+      await session.startTurn("remember second");
+      emitCodexUserMessage(appServer, {
+        id: "codex-second",
+        text: "remember second",
+        turnId: "turn-second",
+      });
+      appServer.completeTurn();
+
+      await session.revertConversation({ messageId: "codex-first" });
+
+      const forkConfigs = appServer
+        .requests()
+        .filter((request) => request.method === "thread/fork")
+        .map((request) => (request.params as { config?: unknown }).config);
+      expect(forkConfigs).toEqual([
+        expect.objectContaining({
+          ...customCodexConfig,
+          mcp_servers: {
+            paseo: expect.objectContaining({
+              url: "http://127.0.0.1:6767/mcp/agents?callerAgentId=agent-1",
+            }),
+          },
+        }),
+      ]);
+      appServer.assertNoErrors();
+      await session.close();
+    },
+  );
+
   test("correlates a Codex user message with the submitting client message", async () => {
     const appServer = createFakeCodexAppServer();
     const session = new CodexAppServerAgentSession(
@@ -1866,7 +2412,12 @@ describe("Codex app-server provider", () => {
       throw new Error(`resumeSession timed out; thread requests: ${threadRequests.join(", ")}`);
     }
 
-    expect(threadRequests).toEqual(["config/read", "thread/loaded/list", "thread/resume"]);
+    expect(threadRequests).toEqual([
+      "model/list",
+      "config/read",
+      "thread/loaded/list",
+      "thread/resume",
+    ]);
     expect(outcome).toBe("rejected");
     appServer.assertNoErrors();
   });
@@ -1886,7 +2437,9 @@ describe("Codex app-server provider", () => {
     };
 
     try {
-      await expect(listCodexSkills(cwd, workspaceGitService)).resolves.toContainEqual({
+      await expect(
+        listCodexSkills(cwd, path.join(tempDir, "codex-home"), workspaceGitService),
+      ).resolves.toContainEqual({
         name: "shipper",
         description: "Ship changes carefully.",
         argumentHint: "",
@@ -2038,6 +2591,71 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("keeps an output field named properties as a field", () => {
+    const input = {
+      type: "object",
+      properties: { properties: { type: "string" } },
+      required: ["properties"],
+      additionalProperties: false,
+    };
+
+    expect(normalizeCodexOutputSchema(input)).toEqual(input);
+  });
+
+  test("normalizes schemas under keywords and leaves literal values alone", () => {
+    const literal = { type: "object", properties: { type: "string" } };
+    const input = {
+      type: "object",
+      properties: {
+        result: { $ref: "#/$defs/result" },
+        choice: { anyOf: [{ type: "object", properties: { id: { type: "string" } } }] },
+      },
+      $defs: {
+        properties: { type: "string" },
+        result: {
+          type: "object",
+          properties: { value: { type: "string" } },
+          default: literal,
+          examples: [literal],
+          enum: [literal],
+          const: literal,
+        },
+      },
+    };
+
+    expect(normalizeCodexOutputSchema(input)).toEqual({
+      type: "object",
+      properties: {
+        result: { $ref: "#/$defs/result" },
+        choice: {
+          anyOf: [
+            {
+              type: "object",
+              properties: { id: { type: "string" } },
+              required: ["id"],
+              additionalProperties: false,
+            },
+          ],
+        },
+      },
+      required: ["result", "choice"],
+      additionalProperties: false,
+      $defs: {
+        properties: { type: "string" },
+        result: {
+          type: "object",
+          properties: { value: { type: "string" } },
+          default: literal,
+          examples: [literal],
+          enum: [literal],
+          const: literal,
+          required: ["value"],
+          additionalProperties: false,
+        },
+      },
+    });
+  });
+
   test("passes a normalized output schema to turn/start", async () => {
     const session = createSession();
     const request = vi.fn(async (method: string) => {
@@ -2147,6 +2765,45 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("lists custom prompts from the CODEX_HOME a custom provider runs Codex with", async () => {
+    await expect(listPromptCommandsFromCustomCodexHome()).resolves.toEqual([
+      "prompts:probe-profile",
+    ]);
+  });
+
+  test("runs a custom prompt from the CODEX_HOME a custom provider runs Codex with", async () => {
+    const records = await runPromptFromCustomCodexHome("/prompts:probe-profile");
+
+    expect(records.find((record) => record.kind === "env")?.CODEX_HOME).toMatch(
+      /provider-codex-home$/,
+    );
+    const turnStart = records.find((record) => record.method === "turn/start");
+    expect(JSON.stringify(turnStart?.params)).toContain("from the provider home");
+  });
+
+  test("inserts custom prompt arguments literally", async () => {
+    await expect(
+      expandCustomPrompt("Implement this exact request: $ARGUMENTS", "Preserve $1 unchanged"),
+    ).resolves.toBe("Implement this exact request: Preserve $1 unchanged");
+    await expect(
+      expandCustomPrompt("Treat this as literal replacement text: $VALUE.", 'VALUE="$&"'),
+    ).resolves.toBe("Treat this as literal replacement text: $&.");
+    await expect(expandCustomPrompt("$1 then $2", '"$2" two')).resolves.toBe("$2 then two");
+    await expect(expandCustomPrompt("$A and $B", 'A="$B" B=b')).resolves.toBe("$B and b");
+    await expect(
+      expandCustomPrompt("$ARGUMENTS", "keep __CODEX_DOLLAR_PLACEHOLDER__ as typed"),
+    ).resolves.toBe("keep __CODEX_DOLLAR_PLACEHOLDER__ as typed");
+  });
+
+  test("expands custom prompt placeholders and escapes", async () => {
+    await expect(
+      expandCustomPrompt("$1/$2 $NAME costs $$5, all: $ARGUMENTS, $MISSING", "one NAME=n two"),
+    ).resolves.toBe("one/two n costs $5, all: one NAME=n two, $MISSING");
+    await expect(
+      expandCustomPrompt("$$ARGUMENTS $$1 $$NAME $9|$NAME_SUFFIX", "first NAME=value"),
+    ).resolves.toBe("$ARGUMENTS $1 $NAME |$NAME_SUFFIX");
+  });
+
   test("deduplicates Codex skill slash commands returned from multiple skill roots", async () => {
     const commands = await listCommandsFromFakeCodex([
       {
@@ -3266,6 +3923,22 @@ describe("Codex app-server provider", () => {
       turn: { status: "completed" },
     });
 
+    const providerSubagents = events.flatMap((event) =>
+      event.type === "provider_subagent" && event.event.type === "upsert" ? [event.event] : [],
+    );
+    expect(providerSubagents).toContainEqual(
+      expect.objectContaining({
+        id: "child-thread-root",
+        parentSubagentId: null,
+      }),
+    );
+    expect(providerSubagents).toContainEqual(
+      expect.objectContaining({
+        id: "grandchild-thread",
+        parentSubagentId: "child-thread-root",
+      }),
+    );
+
     const beforeParentCompletes = events
       .filter((event) => event.type === "timeline" && event.item.type === "tool_call")
       .map((event) => event.item);
@@ -3288,6 +3961,70 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("keeps a nested child under its spawning parent after a root interaction", () => {
+    const session = createSession();
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    asInternals(session).handleNotification("item/completed", {
+      threadId: "test-thread",
+      item: {
+        type: "subAgentActivity",
+        id: "spawn-child-root",
+        kind: "started",
+        agentThreadId: "child-thread-root",
+        agentPath: "/root/child",
+      },
+    });
+    asInternals(session).handleNotification("item/completed", {
+      threadId: "child-thread-root",
+      item: {
+        type: "subAgentActivity",
+        id: "spawn-grandchild",
+        kind: "started",
+        agentThreadId: "grandchild-thread",
+        agentPath: "/root/child/grandchild",
+      },
+    });
+    asInternals(session).handleNotification("item/completed", {
+      threadId: "test-thread",
+      item: {
+        type: "collabAgentToolCall",
+        id: "wait-for-grandchild",
+        tool: "wait",
+        status: "completed",
+        receiverThreadIds: ["grandchild-thread"],
+        agentsStates: {
+          "grandchild-thread": { status: "running", message: null },
+        },
+      },
+    });
+    asInternals(session).handleNotification("item/agentMessage/delta", {
+      threadId: "grandchild-thread",
+      itemId: "grandchild-after-wait",
+      delta: "Still nested.",
+    });
+
+    const grandchildUpserts = events.flatMap((event) =>
+      event.type === "provider_subagent" &&
+      event.event.type === "upsert" &&
+      event.event.id === "grandchild-thread"
+        ? [event.event]
+        : [],
+    );
+    expect(grandchildUpserts.map((event) => event.parentSubagentId)).toEqual([
+      "child-thread-root",
+      "child-thread-root",
+    ]);
+    expect(events.at(-1)).toMatchObject({
+      type: "timeline",
+      item: {
+        callId: "spawn-child-root",
+        detail: { type: "sub_agent", log: expect.stringContaining("Still nested.") },
+      },
+    });
+  });
+
   test("never treats an unmapped foreign terminal as the root terminal", () => {
     const session = createSession();
     const events: AgentStreamEvent[] = [];
@@ -3845,7 +4582,7 @@ describe("Codex app-server provider", () => {
       }),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     const history: AgentStreamEvent[] = [];
     for await (const event of session.streamHistory()) {
@@ -3899,7 +4636,7 @@ describe("Codex app-server provider", () => {
       })),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     expect(asInternals(session).codexUserMessageTurns().resolve("message-history")).toEqual({
       index: 0,
@@ -3968,7 +4705,7 @@ describe("Codex app-server provider", () => {
       }),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     const history: AgentStreamEvent[] = [];
     for await (const event of session.streamHistory()) {
@@ -4085,6 +4822,69 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("restores nested MultiAgentV2 ownership from persisted child threads", async () => {
+    const session = createSession();
+    session.client = {
+      request: vi.fn(async (method: string, params: unknown) => {
+        if (method !== "thread/read") {
+          return {};
+        }
+        const threadId = (params as { threadId?: string }).threadId;
+        const itemsByThreadId = {
+          "test-thread": [
+            {
+              type: "subAgentActivity",
+              id: "spawn-persisted-child",
+              kind: "started",
+              agentThreadId: "persisted-child",
+              agentPath: "/root/persisted-child",
+            },
+            {
+              type: "collabAgentToolCall",
+              id: "root-wait-grandchild",
+              tool: "wait",
+              status: "completed",
+              receiverThreadIds: ["persisted-grandchild"],
+              agentsStates: { "persisted-grandchild": { status: "completed" } },
+            },
+          ],
+          "persisted-child": [
+            {
+              type: "subAgentActivity",
+              id: "spawn-persisted-grandchild",
+              kind: "started",
+              agentThreadId: "persisted-grandchild",
+              agentPath: "/root/persisted-child/grandchild",
+            },
+          ],
+        } as const;
+        const items = threadId ? itemsByThreadId[threadId as keyof typeof itemsByThreadId] : [];
+        return {
+          thread: {
+            turns: items ? [{ items }] : [],
+          },
+        };
+      }),
+    };
+
+    await asInternals(session).loadPersistedHistory(session.client);
+
+    const history: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) {
+      history.push(event);
+    }
+    const upserts = history.flatMap((event) =>
+      event.type === "provider_subagent" && event.event.type === "upsert" ? [event.event] : [],
+    );
+    expect(upserts).toEqual([
+      expect.objectContaining({ id: "persisted-child", parentSubagentId: null }),
+      expect.objectContaining({
+        id: "persisted-grandchild",
+        parentSubagentId: "persisted-child",
+      }),
+    ]);
+  });
+
   test("coalesces persisted MultiAgentV2 activity for one child into one terminal card", async () => {
     const session = createSession();
     session.client = {
@@ -4132,7 +4932,7 @@ describe("Codex app-server provider", () => {
       }),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     const history: AgentStreamEvent[] = [];
     for await (const event of session.streamHistory()) {
@@ -4306,7 +5106,7 @@ describe("Codex app-server provider", () => {
       }),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     const history: AgentStreamEvent[] = [];
     for await (const event of session.streamHistory()) {
@@ -4367,7 +5167,7 @@ describe("Codex app-server provider", () => {
       }),
     };
 
-    await asInternals(session).loadPersistedHistory();
+    await asInternals(session).loadPersistedHistory(session.client);
 
     const history: AgentStreamEvent[] = [];
     for await (const event of session.streamHistory()) {
@@ -4874,14 +5674,22 @@ describe("Codex app-server provider", () => {
       turn: { status: "completed", error: null },
     });
 
-    expect(
-      events.some(
-        (event) =>
-          event.type === "timeline" &&
-          event.item.type === "tool_call" &&
-          event.item.detail.type === "plan",
-      ),
-    ).toBe(false);
+    expect(events.at(-3)).toEqual({
+      type: "timeline",
+      provider: "codex",
+      turnId: "test-turn",
+      item: {
+        type: "tool_call",
+        callId: session.getPendingPermissions()[0]?.id,
+        name: "plan_approval",
+        status: "running",
+        error: null,
+        detail: {
+          type: "plan",
+          text: "- Inspect the existing auth flow\n- Implement the button behavior",
+        },
+      },
+    });
     expect(events.at(-2)).toEqual({
       type: "permission_requested",
       provider: "codex",
@@ -4916,7 +5724,7 @@ describe("Codex app-server provider", () => {
     });
   });
 
-  test("does not emit Codex plan thread items as timeline cards while plan approval is pending", () => {
+  test("does not complete Codex plan timeline cards while plan approval is pending", () => {
     const session = createSession({
       featureValues: { plan_mode: true, fast_mode: true },
     });
@@ -4942,6 +5750,7 @@ describe("Codex app-server provider", () => {
         type: "timeline",
         item: expect.objectContaining({
           type: "tool_call",
+          status: "completed",
           detail: expect.objectContaining({ type: "plan" }),
         }),
       }),
@@ -5411,6 +6220,107 @@ describe("Codex app-server provider", () => {
     ]);
   });
 
+  test.each([
+    [
+      "a usage limit",
+      { type: "usageLimitExceeded", limitId: "image_gen", resetsAt: 1786150800 },
+      { type: "usageLimitExceeded", limitId: "image_gen", resetsAt: 1786150800 },
+    ],
+    ["no failure details", null, { message: "Image generation failed" }],
+  ])(
+    "emits failed imageGeneration items with %s as failed tool calls",
+    (_label, failure, expectedError) => {
+      const session = createSession();
+      const events: AgentStreamEvent[] = [];
+      session.subscribe((event) => events.push(event));
+
+      asInternals(session).handleNotification("item/completed", {
+        item: {
+          id: "image-generation-failed",
+          type: "imageGeneration",
+          status: "failed",
+          revisedPrompt: "paint a blue whale",
+          result: "",
+          transparentBackground: null,
+          failure,
+          savedPath: null,
+        },
+      });
+
+      expect(events).toEqual([
+        {
+          type: "timeline",
+          provider: "codex",
+          turnId: "test-turn",
+          item: {
+            type: "tool_call",
+            callId: "image-generation-failed",
+            name: "image_generation",
+            status: "failed",
+            error: expectedError,
+            detail: {
+              type: "unknown",
+              input: { prompt: "paint a blue whale" },
+              output: null,
+            },
+          },
+        },
+      ]);
+    },
+  );
+
+  test("keeps failed imageGeneration items in persisted history", async () => {
+    const session = createSession();
+    session.client = {
+      request: vi.fn(async () => ({
+        thread: {
+          turns: [
+            {
+              items: [
+                {
+                  type: "imageGeneration",
+                  id: "image-generation-failed",
+                  status: "failed",
+                  revisedPrompt: "paint a blue whale",
+                  result: "",
+                  transparentBackground: null,
+                  failure: { type: "usageLimitExceeded", limitId: "image_gen", resetsAt: null },
+                  savedPath: null,
+                },
+              ],
+            },
+          ],
+        },
+      })),
+    };
+
+    await asInternals(session).loadPersistedHistory(session.client);
+
+    const history: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) {
+      history.push(event);
+    }
+
+    expect(history).toEqual([
+      {
+        type: "timeline",
+        provider: "codex",
+        item: {
+          type: "tool_call",
+          callId: "image-generation-failed",
+          name: "image_generation",
+          status: "failed",
+          error: { type: "usageLimitExceeded", limitId: "image_gen", resetsAt: null },
+          detail: {
+            type: "unknown",
+            input: { prompt: "paint a blue whale" },
+            output: null,
+          },
+        },
+      },
+    ]);
+  });
+
   test("emits usage_updated on token usage updates and keeps usage on turn completion", () => {
     const session = createSession();
     const events: AgentStreamEvent[] = [];
@@ -5833,6 +6743,187 @@ describe("Codex app-server provider", () => {
 });
 
 describe("Codex importable sessions", () => {
+  const CODEX_THREAD_PAGE_CAP = 100;
+
+  // Codex answers thread/list with at most 100 rows per response whatever limit
+  // the caller asks for, and hands back a cursor for the remaining threads.
+  function cappedThreadListHandler(threads: Array<Record<string, unknown>>) {
+    return (input: unknown) => {
+      const params = (input ?? {}) as {
+        limit?: number;
+        cursor?: string;
+        cwd?: string;
+        sortKey?: string;
+      };
+      const recencyKey = params.sortKey === "updated_at" ? "updatedAt" : "createdAt";
+      const matching = threads
+        .filter((thread) => !params.cwd || thread.cwd === params.cwd)
+        .sort((a, b) => Number(b[recencyKey]) - Number(a[recencyKey]));
+      const offset = Number(params.cursor ?? 0);
+      const page = matching.slice(
+        offset,
+        offset + Math.min(params.limit ?? CODEX_THREAD_PAGE_CAP, CODEX_THREAD_PAGE_CAP),
+      );
+      const nextOffset = offset + page.length;
+      return {
+        data: page,
+        nextCursor: nextOffset < matching.length ? String(nextOffset) : null,
+      };
+    };
+  }
+
+  function threadsUsedInReverseCreationOrder(count: number) {
+    // The most recently used thread is also the oldest one created, so a scan
+    // that follows Codex's creation-time page order misses it.
+    return Array.from({ length: count }, (_, index) => ({
+      id: `thread-${index}`,
+      cwd: "/workspace/project-a",
+      preview: `Session ${index}`,
+      createdAt: index,
+      updatedAt: count - index,
+    }));
+  }
+
+  test("fills the requested window across the pages Codex caps at 100 rows", async () => {
+    const threads = threadsUsedInReverseCreationOrder(250);
+    const appServer = createFakeCodexAppServer({
+      "thread/list": cappedThreadListHandler([
+        ...threads,
+        { id: "other-project", cwd: "/workspace/project-b", createdAt: 9000, updatedAt: 9000 },
+      ]),
+    });
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const sessions = await provider.listImportableSessions({
+      limit: 240,
+      cwd: "/workspace/project-a",
+    });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual(
+      threads.slice(0, 240).map((thread) => thread.id),
+    );
+    appServer.assertNoErrors();
+  });
+
+  test("keeps the scanned window on the most recently used threads", async () => {
+    const threads = threadsUsedInReverseCreationOrder(550);
+    const appServer = createFakeCodexAppServer({
+      "thread/list": cappedThreadListHandler(threads),
+    });
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const sessions = await provider.listImportableSessions({ limit: 500, scanLimit: 700 });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual(
+      threads.slice(0, 500).map((thread) => thread.id),
+    );
+    appServer.assertNoErrors();
+  });
+
+  test("keeps a thread once when it moves onto a later page mid-scan", async () => {
+    // A thread used while the scan is paging sorts to the front and comes back
+    // on the next page.
+    const appServer = createFakeCodexAppServer({
+      "thread/list": (input) => {
+        const { cursor } = (input ?? {}) as { cursor?: string };
+        return cursor
+          ? {
+              data: [
+                { id: "thread-1", cwd: "/workspace/project-a", updatedAt: 9000 },
+                { id: "thread-3", cwd: "/workspace/project-a", updatedAt: 1000 },
+              ],
+              nextCursor: null,
+            }
+          : {
+              data: [
+                { id: "thread-1", cwd: "/workspace/project-a", updatedAt: 3000 },
+                { id: "thread-2", cwd: "/workspace/project-a", updatedAt: 2000 },
+              ],
+              nextCursor: "page-2",
+            };
+      },
+    });
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const sessions = await provider.listImportableSessions({ limit: 500, scanLimit: 500 });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual([
+      "thread-1",
+      "thread-2",
+      "thread-3",
+    ]);
+    appServer.assertNoErrors();
+  });
+
+  test("stops scanning when Codex pages without handing back a new thread", async () => {
+    const appServer = createFakeCodexAppServer({
+      // A cursor cycle: the two pages after the first serve threads the scan
+      // already holds and point at each other, so it can never fill its window.
+      "thread/list": (input) => {
+        const { cursor } = (input ?? {}) as { cursor?: string };
+        const thread = { id: "thread-1", cwd: "/workspace/project-a" };
+        if (cursor === "page-a") return { data: [thread], nextCursor: "page-b" };
+        if (cursor === "page-b") return { data: [thread], nextCursor: "page-a" };
+        return { data: [thread], nextCursor: "page-a" };
+      },
+    });
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const sessions = await provider.listImportableSessions({ limit: 500, scanLimit: 500 });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual(["thread-1"]);
+    appServer.assertNoErrors();
+  });
+
+  // Codex filters thread/list by model provider: with no `modelProviders` it
+  // returns only threads of the provider its own config selects, an empty
+  // list returns every provider, and a list returns only those providers.
+  function providerFilteringThreadListHandler(threads: Array<Record<string, unknown>>) {
+    return (input: unknown) => {
+      const { modelProviders } = (input ?? {}) as { modelProviders?: string[] };
+      const included = (thread: Record<string, unknown>) => {
+        if (modelProviders === undefined) return thread.modelProvider === "openai";
+        if (modelProviders.length === 0) return true;
+        return modelProviders.includes(String(thread.modelProvider));
+      };
+      return { data: threads.filter(included), nextCursor: null };
+    };
+  }
+
+  const threadsByModelProvider = [
+    { id: "stock-thread", cwd: "/workspace/project-a", modelProvider: "openai", updatedAt: 2 },
+    { id: "custom-thread", cwd: "/workspace/project-a", modelProvider: "my-codex", updatedAt: 1 },
+  ];
+
+  test("a custom Codex provider lists the threads it created", async () => {
+    const appServer = createFakeCodexAppServer({
+      "thread/list": providerFilteringThreadListHandler(threadsByModelProvider),
+    });
+    const provider = createProviderWithFakeAppServer(appServer, {
+      runtimeSettings: {
+        env: { OPENAI_BASE_URL: "https://llm.example.test/v1", OPENAI_API_KEY: "test-key" },
+      },
+      customProvider: { id: "my-codex", label: "My Codex", extends: "codex" },
+    });
+
+    const sessions = await provider.listImportableSessions({ cwd: "/workspace/project-a" });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual(["custom-thread"]);
+    appServer.assertNoErrors();
+  });
+
+  test("stock Codex keeps listing only its own threads", async () => {
+    const appServer = createFakeCodexAppServer({
+      "thread/list": providerFilteringThreadListHandler(threadsByModelProvider),
+    });
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const sessions = await provider.listImportableSessions({ cwd: "/workspace/project-a" });
+
+    expect(sessions.map((session) => session.providerHandleId)).toEqual(["stock-thread"]);
+    appServer.assertNoErrors();
+  });
+
   test("listImportableSessions uses thread list metadata without hydrating thread history", async () => {
     const allThreads = [
       {
@@ -5913,7 +7004,10 @@ describe("Codex importable sessions", () => {
           capabilities: { experimentalApi: true, mcpServerOpenaiFormElicitation: true },
         },
       },
-      { method: "thread/list", params: { limit: 50, cwd: "/workspace/project-a" } },
+      {
+        method: "thread/list",
+        params: { limit: 50, sortKey: "updated_at", cwd: "/workspace/project-a" },
+      },
     ]);
   });
 });
@@ -5924,7 +7018,8 @@ describe("Codex denied plan approvals", () => {
       (event) =>
         event.type === "timeline" &&
         event.item.type === "tool_call" &&
-        event.item.name === "plan_approval",
+        event.item.name === "plan_approval" &&
+        event.item.status === "completed",
     );
   }
 
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.ts
index 48744f84ac..36267592f8 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.ts
@@ -1,3 +1,4 @@
+import { validateProviderOptions } from "../provider-options.js";
 import {
   getAgentStreamEventTurnId,
   type AgentPermissionAction,
@@ -52,15 +53,16 @@ import { z } from "zod";
 import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
 import { composeSystemPromptParts } from "../system-prompt.js";
 import { curateAgentActivity } from "../activity-curator.js";
+import { CodexAsyncQuestions, codexAsyncQuestionToTimeline } from "./codex/async-questions.js";
 import {
   mapCodexToolCallEnvelope,
   mapCodexToolCallFromThreadItem,
+  normalizeCommandExecutionCommand,
   splitCodexMcpToolResultImages,
 } from "./codex/tool-call-mapper.js";
 import {
   checkProviderLaunchAvailable,
   createProviderEnv,
-  createProviderEnvSpec,
   resolveProviderLaunch,
   type ProviderRuntimeSettings,
   type ResolvedProviderLaunch,
@@ -72,7 +74,12 @@ import {
 import { createPathEquivalenceMatcher } from "../../../utils/path.js";
 import { spawnProcess } from "../../../utils/spawn.js";
 import { extractCodexTerminalSessionId, nonEmptyString } from "./tool-call-mapper-utils.js";
-import { buildCodexFeatures, codexModelSupportsFastMode } from "./codex-feature-definitions.js";
+import {
+  buildCodexFeatures,
+  CodexServiceTierSchema,
+  readCodexServiceTier,
+  type CodexServiceTier,
+} from "./codex-feature-definitions.js";
 import {
   CodexAppServerClient,
   CodexAppServerRpcError,
@@ -168,6 +175,9 @@ const CODEX_PLAN_IMPLEMENTATION_PROMPT_PREFIX =
 // (and the /goal slash command) when the binary is too old.
 const CODEX_GOALS_MIN_VERSION: readonly [number, number, number] = [0, 128, 0];
 const CODEX_AUTO_REVIEW_MIN_VERSION: readonly [number, number, number] = [0, 115, 0];
+// Codex removed `thread/rollback` in 0.156.0, so rewinding a legacy thread there
+// has to fork before the target turn instead.
+const CODEX_THREAD_ROLLBACK_REMOVED_VERSION: readonly [number, number, number] = [0, 156, 0];
 
 function parseCodexVersion(versionOutput: string): [number, number, number] | null {
   const match = versionOutput.match(/(\d+)\.(\d+)\.(\d+)/);
@@ -188,6 +198,15 @@ function codexVersionAtLeast(
   return true;
 }
 
+// The initialize userAgent starts with `<client>/<codex version>`. An agent we
+// cannot parse is treated as an older server that still has rollback.
+function codexServerHasThreadRollback(userAgent: unknown): boolean {
+  return (
+    typeof userAgent !== "string" ||
+    !codexVersionAtLeast(userAgent, CODEX_THREAD_ROLLBACK_REMOVED_VERSION)
+  );
+}
+
 type GoalSubcommand =
   | { kind: "set"; objective: string }
   | { kind: "pause" }
@@ -252,13 +271,16 @@ interface CodexAppServerClientLike {
 }
 
 interface CodexAppServerAgentDeps {
+  environment?: Record<string, string>;
   workspaceGitService?: Pick<WorkspaceGitService, "resolveRepoRoot">;
   customProvider?: {
     id: string;
     label: string;
     extends: string;
   };
-  customCodexConfig?: Record<string, unknown> | null;
+  customCodexConfig?: CodexCustomProviderConfig | null;
+  // The CODEX_HOME the session's app-server runs with; prompts and skills are read from it.
+  codexHome?: string;
   _createCodexClient?: (
     child: ChildProcessWithoutNullStreams,
     logger: Logger,
@@ -272,17 +294,19 @@ interface CodexAppServerAgentDeps {
 interface CodexModePreset {
   approvalPolicy: string;
   sandbox: string;
-  approvalsReviewer?: "auto_review";
+  approvalsReviewer: "user" | "auto_review";
 }
 
 const MODE_PRESETS: Record<string, CodexModePreset> = {
   "read-only": {
     approvalPolicy: "on-request",
     sandbox: "read-only",
+    approvalsReviewer: "user",
   },
   auto: {
     approvalPolicy: "on-request",
     sandbox: "workspace-write",
+    approvalsReviewer: "user",
   },
   "auto-review": {
     approvalPolicy: "on-request",
@@ -292,6 +316,7 @@ const MODE_PRESETS: Record<string, CodexModePreset> = {
   "full-access": {
     approvalPolicy: "never",
     sandbox: "danger-full-access",
+    approvalsReviewer: "user",
   },
 };
 
@@ -299,15 +324,6 @@ function isAutoReviewReviewer(value: string | undefined): boolean {
   return value === "auto_review" || value === "guardian_subagent";
 }
 
-function applyApprovalsReviewerParam(
-  params: Record<string, unknown>,
-  preset: CodexModePreset,
-): void {
-  if (preset.approvalsReviewer) {
-    params.approvalsReviewer = preset.approvalsReviewer;
-  }
-}
-
 function shouldPromoteThreadResponseToAutoReview(params: {
   approvalsReviewer: string | undefined;
   approvalPolicy: string;
@@ -368,19 +384,67 @@ function isObjectSchemaNode(schema: Record<string, unknown>): boolean {
   );
 }
 
-function normalizeCodexOutputSchemaNode(schema: unknown, schemaPath: string): unknown {
+// Keywords whose value maps names to schemas.
+const SCHEMA_MAP_KEYWORDS = [
+  "properties",
+  "patternProperties",
+  "$defs",
+  "definitions",
+  "dependentSchemas",
+] as const;
+
+// Keywords whose value is a schema or an array of schemas.
+const SUBSCHEMA_KEYWORDS = [
+  "items",
+  "prefixItems",
+  "additionalItems",
+  "contains",
+  "additionalProperties",
+  "unevaluatedProperties",
+  "unevaluatedItems",
+  "propertyNames",
+  "allOf",
+  "anyOf",
+  "oneOf",
+  "not",
+  "if",
+  "then",
+  "else",
+] as const;
+
+function normalizeCodexOutputSubschema(schema: unknown, schemaPath: string): unknown {
   if (Array.isArray(schema)) {
     return schema.map((entry, index) =>
       normalizeCodexOutputSchemaNode(entry, `${schemaPath}[${index}]`),
     );
   }
+  return normalizeCodexOutputSchemaNode(schema, schemaPath);
+}
+
+function normalizeCodexOutputSchemaNode(schema: unknown, schemaPath: string): unknown {
   if (!isSchemaRecord(schema)) {
     return schema;
   }
 
-  const normalized: Record<string, unknown> = {};
-  for (const [key, value] of Object.entries(schema)) {
-    normalized[key] = normalizeCodexOutputSchemaNode(value, `${schemaPath}.${key}`);
+  const normalized: Record<string, unknown> = { ...schema };
+  for (const keyword of SCHEMA_MAP_KEYWORDS) {
+    const schemas = schema[keyword];
+    if (isSchemaRecord(schemas)) {
+      normalized[keyword] = Object.fromEntries(
+        Object.entries(schemas).map(([name, child]) => [
+          name,
+          normalizeCodexOutputSchemaNode(child, `${schemaPath}.${keyword}.${name}`),
+        ]),
+      );
+    }
+  }
+  for (const keyword of SUBSCHEMA_KEYWORDS) {
+    if (keyword in schema) {
+      normalized[keyword] = normalizeCodexOutputSubschema(
+        schema[keyword],
+        `${schemaPath}.${keyword}`,
+      );
+    }
   }
 
   if (!isObjectSchemaNode(normalized)) {
@@ -550,8 +614,8 @@ async function checkCodexLaunchAvailable(launch: ResolvedProviderLaunch) {
   });
 }
 
-function resolveCodexHomeDir(): string {
-  return process.env.CODEX_HOME ?? path.join(os.homedir(), ".codex");
+function resolveCodexHomeDir(env: NodeJS.ProcessEnv): string {
+  return env.CODEX_HOME ?? path.join(os.homedir(), ".codex");
 }
 
 function decodeEscapedChar(next: string): string {
@@ -661,8 +725,7 @@ function parseFrontMatter(markdown: string): {
   return { frontMatter, body };
 }
 
-async function listCodexCustomPrompts(): Promise<AgentSlashCommand[]> {
-  const codexHome = resolveCodexHomeDir();
+async function listCodexCustomPrompts(codexHome: string): Promise<AgentSlashCommand[]> {
   const promptsDir = path.join(codexHome, "prompts");
   let entries: Dirent[];
   try {
@@ -704,6 +767,7 @@ async function listCodexCustomPrompts(): Promise<AgentSlashCommand[]> {
 
 export async function listCodexSkills(
   cwd: string,
+  codexHome: string,
   workspaceGitService?: Pick<WorkspaceGitService, "resolveRepoRoot">,
 ): Promise<AgentSlashCommand[]> {
   const candidates: string[] = [];
@@ -717,7 +781,7 @@ export async function listCodexSkills(
     candidates.push(path.join(repoRoot, ".codex", "skills"));
   }
 
-  candidates.push(path.join(resolveCodexHomeDir(), "skills"));
+  candidates.push(path.join(codexHome, "skills"));
 
   const candidateReads = await Promise.all(
     candidates.map(async (dir) => {
@@ -789,25 +853,21 @@ function expandCodexCustomPrompt(template: string, args: string | undefined): st
     positional.push(token);
   }
 
-  const dollarPlaceholder = "__CODEX_DOLLAR_PLACEHOLDER__";
-  let out = template.split("$$").join(dollarPlaceholder);
+  // Match every placeholder in one pass, so inserted argument text is never expanded again.
+  const namedPlaceholders = Object.keys(named)
+    .sort((a, b) => b.length - a.length)
+    .map((key) => `${escapeRegExp(key)}\\b`);
+  const placeholder = new RegExp(
+    `\\$(${["\\$", "ARGUMENTS", "[1-9]", ...namedPlaceholders].join("|")})`,
+    "g",
+  );
 
-  out = out.split("$ARGUMENTS").join(trimmedArgs);
-
-  for (let i = 1; i <= 9; i += 1) {
-    const value = positional[i - 1] ?? "";
-    out = out.split(`$${i}`).join(value);
-  }
-
-  const namedKeys = Object.keys(named).sort((a, b) => b.length - a.length);
-  for (const key of namedKeys) {
-    const value = named[key] ?? "";
-    const re = new RegExp(`\\$${escapeRegExp(key)}\\b`, "g");
-    out = out.replace(re, value);
-  }
-
-  out = out.split(dollarPlaceholder).join("$");
-  return out;
+  return template.replace(placeholder, (match, name: string) => {
+    if (name === "$") return "$";
+    if (name === "ARGUMENTS") return trimmedArgs;
+    if (/^[1-9]$/.test(name)) return positional[Number(name) - 1] ?? "";
+    return named[name] ?? match;
+  });
 }
 
 interface CodexMcpServerConfig {
@@ -888,6 +948,7 @@ interface CodexModel {
   model?: string;
   defaultReasoningEffort?: string;
   supportedReasoningEfforts?: CodexReasoningEffortEntry[];
+  serviceTiers?: CodexServiceTier[];
 }
 
 const CodexModelListResponseSchema = z.object({
@@ -895,6 +956,7 @@ const CodexModelListResponseSchema = z.object({
     .array(
       z.object({
         id: z.string(),
+        serviceTiers: z.array(CodexServiceTierSchema).optional(),
         displayName: z.string().optional(),
         description: z.string().optional(),
         isDefault: z.boolean().optional(),
@@ -913,6 +975,61 @@ const CodexModelListResponseSchema = z.object({
     .optional(),
 });
 
+/**
+ * Read the newest `window.limit` threads Codex knows about.
+ *
+ * Codex caps every `thread/list` response at 100 rows whatever limit it is
+ * given (codex-cli 0.153 and 0.155), so one request only ever sees the newest
+ * page and hands back a cursor for the rest. Follow that cursor until the
+ * caller's window is full or Codex runs out of threads.
+ */
+async function readCodexThreadWindow(
+  client: Pick<CodexAppServerClientLike, "request">,
+  logger: Logger,
+  window: { limit: number; cwd?: string; modelProviders?: string[] },
+): Promise<Array<Record<string, unknown>>> {
+  // A thread updated while the scan is paging moves under `updated_at` order
+  // and can come back on a later page, so identify each one and keep it once.
+  // A row Codex sends without an id stands for itself.
+  const threads = new Map<unknown, Record<string, unknown>>();
+  let cursor: string | undefined;
+  while (threads.size < window.limit) {
+    const response = toObjectRecord(
+      await client.request("thread/list", {
+        limit: window.limit - threads.size,
+        // Rank the window by last use. Codex pages by creation time by default,
+        // which drops an old conversation that is still being worked in.
+        // Older Codex builds ignore the unknown key and keep that order.
+        sortKey: "updated_at",
+        ...(window.cwd ? { cwd: window.cwd } : {}),
+        ...(window.modelProviders ? { modelProviders: window.modelProviders } : {}),
+        ...(cursor ? { cursor } : {}),
+      }),
+    );
+    const page = Array.isArray(response?.data) ? response.data.filter(isRecord) : [];
+    const sizeBeforePage = threads.size;
+    for (const thread of page) {
+      const identity = typeof thread.id === "string" ? thread.id : thread;
+      if (!threads.has(identity)) threads.set(identity, thread);
+    }
+    const nextCursor = typeof response?.nextCursor === "string" ? response.nextCursor : undefined;
+    if (!nextCursor) break;
+    if (threads.size === sizeBeforePage) {
+      // Every page that continues the scan brings a thread the scan has not
+      // seen, so the loop is bounded by the window. A page that brings none
+      // would let a Codex-side cursor bug (a stuck cursor, or a cycle) page for
+      // ever behind a caller that has already timed out.
+      logger.warn(
+        { cursor: nextCursor },
+        "codex thread/list returned no new threads mid-scan, stopping the session scan",
+      );
+      break;
+    }
+    cursor = nextCursor;
+  }
+  return [...threads.values()];
+}
+
 function filterCodexThreadsByCwd(
   threads: Array<Record<string, unknown>>,
   cwd: string | undefined,
@@ -1781,13 +1898,17 @@ function updateHistoricalSubAgentActivity(
 function readCodexHistoricalSubAgentThreadIds(item: unknown): string[] {
   const activity = readCodexSubAgentActivity(item);
   if (activity) {
-    return [activity.agentThreadId];
+    return activity.kind === "started" ? [activity.agentThreadId] : [];
   }
   const record = toObjectRecord(item);
   const normalizedType = normalizeCodexThreadItemType(
     typeof record?.type === "string" ? record.type : undefined,
   );
-  if (normalizedType !== "collabAgentToolCall" || !Array.isArray(record?.receiverThreadIds)) {
+  if (
+    normalizedType !== "collabAgentToolCall" ||
+    record?.tool !== "spawnAgent" ||
+    !Array.isArray(record.receiverThreadIds)
+  ) {
     return [];
   }
   return record.receiverThreadIds.filter(
@@ -1828,6 +1949,15 @@ function mapCodexThreadImageItem(
     });
   }
 
+  if (normalizedItem.status === "failed") {
+    return mapCodexToolCallEnvelope({
+      callId: firstStringField(normalizedItem, ["id"]),
+      name: "image_generation",
+      input: { prompt: firstStringField(normalizedItem, ["revisedPrompt", "revised_prompt"]) },
+      error: normalizedItem.failure ?? { message: "Image generation failed" },
+    });
+  }
+
   const savedPath = firstStringField(normalizedItem, ["savedPath", "saved_path"]);
   const result = codexImageOutputFromResult(normalizedItem.result);
   return renderProviderImageOutputAsAssistantMarkdown(
@@ -1841,6 +1971,17 @@ function mapCodexThreadImageItem(
   );
 }
 
+function mapCodexAgentMessage(item: Record<string, unknown>): AgentTimelineItem {
+  const question = codexAsyncQuestionToTimeline(item);
+  if (question) return question;
+  const messageId = nonEmptyString(item.id);
+  return {
+    type: "assistant_message",
+    text: typeof item.text === "string" ? item.text : "",
+    ...(messageId ? { messageId } : {}),
+  };
+}
+
 export function threadItemToTimeline(
   item: unknown,
   options?: { includeUserMessage?: boolean; cwd?: string | null },
@@ -1867,14 +2008,8 @@ export function threadItemToTimeline(
   switch (normalizedType) {
     case "userMessage":
       return mapCodexThreadUserMessageItem(normalizedItem, includeUserMessage);
-    case "agentMessage": {
-      const messageId = nonEmptyString(normalizedItem.id);
-      return {
-        type: "assistant_message",
-        text: typeof normalizedItem.text === "string" ? normalizedItem.text : "",
-        ...(messageId ? { messageId } : {}),
-      };
-    }
+    case "agentMessage":
+      return mapCodexAgentMessage(normalizedItem);
     case "plan":
       return mapCodexThreadPlanItem(normalizedItem);
     case "reasoning":
@@ -3188,7 +3323,7 @@ function toCodexTextInput(text: string): Extract<CodexAppServerUserInput, { type
 export function buildCodexAppServerEnv(
   runtimeSettings?: ProviderRuntimeSettings,
   launchEnv?: Record<string, string>,
-): NodeJS.ProcessEnv {
+) {
   return createProviderEnv({
     runtimeSettings,
     overlays: [launchEnv],
@@ -3220,10 +3355,15 @@ function normalizeOpenAICompatibleBaseUrl(value: string): string | null {
   return `${withoutTrailingSlashes}/v1`;
 }
 
+interface CodexCustomProviderConfig {
+  model_provider: string;
+  model_providers: Record<string, Record<string, unknown>>;
+}
+
 function buildCodexCustomProviderConfig(
   runtimeSettings: ProviderRuntimeSettings | undefined,
   customProvider: CodexAppServerAgentDeps["customProvider"],
-): Record<string, unknown> | null {
+): CodexCustomProviderConfig | null {
   if (customProvider?.extends !== CODEX_PROVIDER) {
     return null;
   }
@@ -3256,6 +3396,7 @@ interface CodexSubAgentCallState {
   callId: string;
   toolCall: ToolCallTimelineItem;
   parentCallId: string | null;
+  parentSubagentId: string | null;
   activityItemIds: Set<string>;
   pendingCommandOutputDeltas: Map<string, string[]>;
   pendingFileChangeOutputDeltas: Map<string, string[]>;
@@ -3264,11 +3405,18 @@ interface CodexSubAgentCallState {
   childThreadIds: Set<string>;
 }
 
+function resolveCodexParentSubagentId(
+  parentCallId: string | null,
+  emittingThreadId: string | null,
+): string | null {
+  return parentCallId ? emittingThreadId : null;
+}
+
 interface CodexPendingPermissionHandler {
   resolve: (value: unknown) => void;
   kind: "command" | "file" | "question" | "mcp_elicitation" | "plan";
   questions?: CodexQuestionPrompt[];
-  planText?: string;
+  plan?: { text: string; turnId: string | undefined };
 }
 
 interface ConsumedRootCompaction {
@@ -3281,6 +3429,8 @@ export class CodexAppServerAgentSession implements AgentSession {
 
   private readonly logger: Logger;
   private readonly config: AgentSessionConfig;
+  private readonly asyncQuestions: CodexAsyncQuestions;
+  private readonly codexHome: string;
   private currentMode: string;
   private hasWorkflowModeOverride: boolean;
   private readonly providerOptions: CodexProviderOptions;
@@ -3301,12 +3451,14 @@ export class CodexAppServerAgentSession implements AgentSession {
     cancelRequested: boolean;
   } | null = null;
   private client: CodexAppServerClient | null = null;
+  private threadRollbackAvailable = true;
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private nextTurnOrdinal = 0;
   private activeForegroundTurnId: string | null = null;
   private activeClientMessageId: string | null = null;
   private cachedRuntimeInfo: AgentRuntimeInfo | null = null;
-  private serviceTier: "fast" | null = null;
+  private serviceTier: string | null = null;
+  private speedModels: CodexModel[] = [];
   private planModeEnabled = false;
   private historyPending = false;
   private persistedHistory: PersistedTimelineEntry[] = [];
@@ -3352,7 +3504,7 @@ export class CodexAppServerAgentSession implements AgentSession {
   // `thread/compacted` and a completed `contextCompaction` item.
   private unpairedCompactionNotificationCompletions = 0;
   private unpairedCompactionItemCompletions = 0;
-  private connected = false;
+  private connectionState: "disconnected" | "history-ready" | "connected" = "disconnected";
   private connectionPromise: Promise<void> | null = null;
   private closed = false;
   private collaborationModes: Array<{
@@ -3369,6 +3521,19 @@ export class CodexAppServerAgentSession implements AgentSession {
   } | null = null;
   private cachedSkills: Array<{ name: string; description: string; path: string }> | null = null;
 
+  private readonly usageSessionKey = randomUUID();
+  private readonly harnessEnvironment: Record<string, string>;
+
+  usageSession() {
+    if (this.closed) return null;
+    return {
+      provider: "codex",
+      model: this.config.model,
+      env: this.harnessEnvironment,
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
   constructor(
     config: AgentSessionConfig,
     private readonly resumeHandle: { sessionId: string; metadata?: Record<string, unknown> } | null,
@@ -3391,12 +3556,14 @@ export class CodexAppServerAgentSession implements AgentSession {
     }
     this.hasWorkflowModeOverride = config.modeId !== undefined;
     this.currentMode = config.modeId ?? DEFAULT_CODEX_MODE_ID;
-    this.providerOptions = CodexProviderOptionsSchema.parse(config.providerOptions ?? {});
+    this.providerOptions =
+      validateProviderOptions("codex", CodexProviderOptionsSchema, config.providerOptions) ?? {};
     this.config = config;
+    this.harnessEnvironment = deps.environment ?? buildCodexAppServerEnv();
+    this.asyncQuestions = new CodexAsyncQuestions(resumeHandle?.metadata?.asyncQuestions);
+    this.codexHome = deps.codexHome ?? resolveCodexHomeDir(process.env);
     this.config.thinkingOptionId = normalizeCodexThinkingOptionId(this.config.thinkingOptionId);
-    if (this.config.featureValues?.fast_mode && codexModelSupportsFastMode(this.config.model)) {
-      this.serviceTier = "fast";
-    }
+    this.serviceTier = readCodexServiceTier(this.config.featureValues);
     if (this.config.featureValues?.plan_mode) {
       this.planModeEnabled = true;
     }
@@ -3413,8 +3580,8 @@ export class CodexAppServerAgentSession implements AgentSession {
 
   get features(): AgentFeature[] {
     return buildCodexFeatures({
-      modelId: this.config.model,
-      fastModeEnabled: this.serviceTier === "fast",
+      serviceTiers: this.currentServiceTiers(),
+      serviceTier: this.serviceTier ?? "default",
       planModeEnabled: this.planModeEnabled,
       planModeAvailable: this.hasPlanCollaborationMode(),
     });
@@ -3424,7 +3591,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     if (this.closed) {
       throw this.createClosedError();
     }
-    if (this.connected) return;
+    if (this.connectionState !== "disconnected") return;
     if (this.connectionPromise) {
       await this.connectionPromise;
       if (this.closed) {
@@ -3448,6 +3615,11 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   private async establishConnection(): Promise<void> {
+    if (this.initialResumePurpose === "history") {
+      await this.readArchivedHistory();
+      this.connectionState = "history-ready";
+      return;
+    }
     const child = await this.spawnAppServer();
     const client = new CodexAppServerClient(child, this.logger, () => this.traceContext());
     if (this.closed) {
@@ -3462,24 +3634,29 @@ export class CodexAppServerAgentSession implements AgentSession {
     this.registerRequestHandlers();
 
     try {
-      await client.request("initialize", buildCodexAppServerInitializeParams());
+      const initialized = toObjectRecord(
+        await client.request("initialize", buildCodexAppServerInitializeParams()),
+      );
+      this.threadRollbackAvailable = codexServerHasThreadRollback(initialized?.userAgent);
       client.notify("initialized", {});
 
+      this.speedModels =
+        CodexModelListResponseSchema.parse(await client.request("model/list", {})).data ?? [];
+      this.reconcileServiceTier();
       await this.loadResolvedWorkspaceWrite();
       await this.loadCollaborationModes();
       await this.loadSkills();
 
       if (this.currentThreadId) {
-        await this.ensureThreadLoaded({
-          allowArchivedHistory: this.initialResumePurpose === "history",
-        });
-        await this.loadPersistedHistory();
+        await this.ensureThreadLoaded();
+        await this.loadPersistedHistory(this.client);
+        await this.applyDefaultModelAndThinking();
       }
 
       if (this.closed) {
         throw this.createClosedError();
       }
-      this.connected = true;
+      this.connectionState = "connected";
     } catch (error) {
       try {
         if (this.client === client) {
@@ -3530,7 +3707,7 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   private handleUnexpectedTermination(error: Error): void {
-    this.connected = false;
+    this.connectionState = "disconnected";
     const hasActiveRootTurn = this.activeForegroundTurnId !== null || this.currentTurnId !== null;
     this.clearPendingPermissions({ preservePlanApprovals: !hasActiveRootTurn });
     if (hasActiveRootTurn) {
@@ -3670,18 +3847,30 @@ export class CodexAppServerAgentSession implements AgentSession {
     this.resolvedCollaborationMode = this.resolveCollaborationMode();
   }
 
-  private applyFeatureValue(featureId: "fast_mode" | "plan_mode", value: boolean): void {
-    this.config.featureValues = {
-      ...this.config.featureValues,
-      [featureId]: value,
-    };
+  private currentServiceTiers(): CodexServiceTier[] {
+    const selectedModel = this.config.model
+      ? this.speedModels.find(
+          (model) => model.id === this.config.model || model.model === this.config.model,
+        )
+      : (this.speedModels.find((model) => model.isDefault) ?? this.speedModels[0]);
+    return selectedModel?.serviceTiers ?? [];
+  }
 
-    if (featureId === "fast_mode") {
-      this.serviceTier = value ? "fast" : null;
-      this.cachedRuntimeInfo = null;
-      return;
+  private reconcileServiceTier(): void {
+    const tiers = this.currentServiceTiers();
+    // COMPAT(codexFastPreference): added in v0.10.0, remove after 2027-03-29 once saved Fast preferences have migrated.
+    if (this.serviceTier === "fast" && !tiers.some((tier) => tier.id === "fast")) {
+      this.serviceTier = tiers.find((tier) => tier.name.toLowerCase() === "fast")?.id ?? null;
     }
+    if (this.serviceTier !== "default" && !tiers.some((tier) => tier.id === this.serviceTier)) {
+      this.serviceTier = null;
+    }
+    const { fast_mode: _legacyFast, ...values } = this.config.featureValues ?? {};
+    this.config.featureValues = { ...values, service_tier: this.serviceTier ?? "default" };
+  }
 
+  private applyFeatureValue(featureId: "plan_mode", value: boolean): void {
+    this.config.featureValues = { ...this.config.featureValues, [featureId]: value };
     this.planModeEnabled = value;
     this.refreshResolvedCollaborationMode();
     this.cachedRuntimeInfo = null;
@@ -3722,7 +3911,20 @@ export class CodexAppServerAgentSession implements AgentSession {
     this.pendingPermissionHandlers.set(requestId, {
       resolve: () => undefined,
       kind: "plan",
-      planText,
+      plan: { text: planText, turnId: this.activeForegroundTurnId ?? undefined },
+    });
+    // Reserve the proposal's place before a later prompt can resolve it.
+    this.emitEvent({
+      type: "timeline",
+      provider: CODEX_PROVIDER,
+      item: {
+        type: "tool_call",
+        callId: requestId,
+        name: "plan_approval",
+        status: "running",
+        error: null,
+        detail: { type: "plan", text: planText },
+      },
     });
     this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
   }
@@ -3762,9 +3964,20 @@ export class CodexAppServerAgentSession implements AgentSession {
     );
   }
 
-  private async loadPersistedHistory(): Promise<void> {
-    if (!this.client || !this.currentThreadId) return;
-    const client = this.client;
+  private async readArchivedHistory(): Promise<void> {
+    const child = await this.spawnAppServer();
+    const client = new CodexAppServerClient(child, this.logger, () => this.traceContext());
+    try {
+      await client.request("initialize", buildCodexAppServerInitializeParams());
+      client.notify("initialized", {});
+      await this.loadPersistedHistory(client);
+    } finally {
+      await client.dispose();
+    }
+  }
+
+  private async loadPersistedHistory(client: CodexAppServerClientLike | null): Promise<void> {
+    if (!client || !this.currentThreadId) return;
     const threadId = this.currentThreadId;
 
     const history = await loadCodexThreadHistoryTimeline({
@@ -3787,6 +4000,9 @@ export class CodexAppServerAgentSession implements AgentSession {
     }
     this.resetCodexUserMessageTurns();
     for (const entry of timeline) {
+      if (entry.item.type === "tool_call" && entry.item.name === "request_user_input_async") {
+        entry.item = this.asyncQuestions.timeline(entry.item.callId) ?? entry.item;
+      }
       if (entry.item.type === "user_message") {
         this.rememberCodexUserMessageTurn(entry.item.messageId, entry.providerTurnId);
       }
@@ -3799,7 +4015,11 @@ export class CodexAppServerAgentSession implements AgentSession {
     client: CodexAppServerClientLike,
     rootRoutes: readonly PersistedSubAgentRoute[],
   ): Promise<void> {
-    const queue = rootRoutes.map((route) => ({ route, parentCallId: null as string | null }));
+    const queue = rootRoutes.map((route) => ({
+      route,
+      parentCallId: null as string | null,
+      parentSubagentId: null as string | null,
+    }));
     const visitedThreadIds = new Set(this.currentThreadId ? [this.currentThreadId] : []);
     while (queue.length > 0 && visitedThreadIds.size < 100) {
       const next = queue.shift();
@@ -3811,6 +4031,7 @@ export class CodexAppServerAgentSession implements AgentSession {
         timelineItem: next.route.toolCall,
         rawItem: { agentThreadId: next.route.childThreadId },
         parentCallId: next.parentCallId,
+        parentSubagentId: next.parentSubagentId,
       });
       try {
         const childHistory = await loadCodexThreadHistoryTimeline({
@@ -3822,7 +4043,11 @@ export class CodexAppServerAgentSession implements AgentSession {
           this.emitProviderSubagentTimeline(next.route.childThreadId, entry.item, entry.timestamp);
         }
         for (const route of childHistory.subAgentRoutes) {
-          queue.push({ route, parentCallId: next.route.toolCall.callId });
+          queue.push({
+            route,
+            parentCallId: next.route.toolCall.callId,
+            parentSubagentId: next.route.childThreadId,
+          });
         }
       } catch (error) {
         this.logger.trace(
@@ -3833,9 +4058,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     }
   }
 
-  private async ensureThreadLoaded(
-    options: { allowArchivedHistory?: boolean } = {},
-  ): Promise<void> {
+  private async ensureThreadLoaded(): Promise<void> {
     if (!this.client || !this.currentThreadId) return;
     const params: Record<string, unknown> = { threadId: this.currentThreadId };
     const developerInstructions = composeSystemPromptParts(
@@ -3860,16 +4083,6 @@ export class CodexAppServerAgentSession implements AgentSession {
     } catch (error) {
       const threadId = this.currentThreadId;
       const message = error instanceof Error ? error.message : String(error);
-      if (
-        options.allowArchivedHistory === true &&
-        isArchivedCodexThreadResumeError(error, threadId)
-      ) {
-        this.logger.info(
-          { threadId },
-          "Loading archived Codex thread history without resuming the native session",
-        );
-        return;
-      }
       if (isArchivedCodexThreadResumeError(error, threadId)) {
         try {
           await this.client.request("thread/unarchive", { threadId });
@@ -3936,14 +4149,13 @@ export class CodexAppServerAgentSession implements AgentSession {
   ): Promise<CodexPromptInput> {
     if (commandName.startsWith("prompts:")) {
       const promptName = commandName.slice("prompts:".length);
-      const codexHome = resolveCodexHomeDir();
-      const promptPath = path.join(codexHome, "prompts", `${promptName}.md`);
+      const promptPath = path.join(this.codexHome, "prompts", `${promptName}.md`);
       const raw = await fs.readFile(promptPath, "utf8");
       const parsed = parseFrontMatter(raw);
       return expandCodexCustomPrompt(parsed.body, args);
     }
 
-    if (!this.connected) {
+    if (this.connectionState === "disconnected") {
       await this.connect();
     } else {
       await this.loadSkills();
@@ -3989,9 +4201,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     if (thinkingOptionId) {
       params.effort = thinkingOptionId;
     }
-    if (this.serviceTier) {
-      params.serviceTier = this.serviceTier;
-    }
+    params.serviceTier = this.serviceTier ?? "default";
     if (this.resolvedCollaborationMode) {
       params.collaborationMode = {
         mode: this.resolvedCollaborationMode.mode,
@@ -4050,7 +4260,7 @@ export class CodexAppServerAgentSession implements AgentSession {
           : toSandboxPolicy(sandboxPolicyType, workspaceWrite);
     }
     if (this.hasWorkflowModeOverride) {
-      applyApprovalsReviewerParam(params, preset);
+      params.approvalsReviewer = preset.approvalsReviewer;
     }
     return { approvalPolicy, sandboxPolicyType };
   }
@@ -4365,7 +4575,7 @@ export class CodexAppServerAgentSession implements AgentSession {
 
   async getRuntimeInfo(): Promise<AgentRuntimeInfo> {
     if (this.cachedRuntimeInfo) return { ...this.cachedRuntimeInfo };
-    if (!this.connected) {
+    if (this.connectionState === "disconnected") {
       await this.connect();
     }
     if (!this.currentThreadId) {
@@ -4409,9 +4619,7 @@ export class CodexAppServerAgentSession implements AgentSession {
 
   async setModel(modelId: string | null): Promise<void> {
     this.config.model = modelId ?? undefined;
-    if (!codexModelSupportsFastMode(this.config.model)) {
-      this.serviceTier = null;
-    }
+    this.reconcileServiceTier();
     this.refreshResolvedCollaborationMode();
     this.cachedRuntimeInfo = null;
   }
@@ -4426,13 +4634,27 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   async setFeature(featureId: string, value: unknown): Promise<void> {
+    // COMPAT(codexFastPreference): added in v0.10.0, remove after 2027-03-29 once clients use service_tier.
     if (featureId === "fast_mode") {
-      if (Boolean(value) && !codexModelSupportsFastMode(this.config.model)) {
+      const fast = this.currentServiceTiers().find((tier) => tier.name.toLowerCase() === "fast");
+      if (value && !fast)
         throw new Error(
           `Codex fast mode is not available for model '${this.config.model ?? "default"}'`,
         );
+      return this.setFeature("service_tier", value ? fast!.id : "default");
+    }
+    if (featureId === "service_tier") {
+      if (
+        typeof value !== "string" ||
+        (value !== "default" && !this.currentServiceTiers().some((tier) => tier.id === value))
+      ) {
+        throw new Error(
+          `Codex speed '${String(value)}' is not available for model '${this.config.model ?? "default"}'`,
+        );
       }
-      this.applyFeatureValue("fast_mode", Boolean(value));
+      this.serviceTier = value;
+      this.reconcileServiceTier();
+      this.cachedRuntimeInfo = null;
       return;
     }
     if (featureId === "plan_mode") {
@@ -4443,13 +4665,16 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   getPendingPermissions(): AgentPermissionRequest[] {
-    return Array.from(this.pendingPermissions.values());
+    return [...this.pendingPermissions.values(), ...this.asyncQuestions.pending()];
   }
 
   async respondToPermission(
     requestId: string,
     response: AgentPermissionResponse,
   ): Promise<AgentPermissionResult | void> {
+    if (this.asyncQuestions.hasPending(requestId)) {
+      return this.respondToAsyncQuestion(requestId, response);
+    }
     const pending = this.pendingPermissionHandlers.get(requestId);
     if (!pending) {
       throw new Error(`No pending Codex app-server permission request with id '${requestId}'`);
@@ -4543,6 +4768,33 @@ export class CodexAppServerAgentSession implements AgentSession {
     pending.resolve({ answers: {} });
   }
 
+  private async respondToAsyncQuestion(
+    requestId: string,
+    response: AgentPermissionResponse,
+  ): Promise<AgentPermissionResult | void> {
+    const prepared = this.asyncQuestions.prepareResponse(requestId, response);
+    let followUpPrompt = prepared.prompt;
+    const expectedTurnId = this.activeForegroundTurnId;
+    if (prepared.prompt && expectedTurnId) {
+      const result = await this.steerActiveTurn(prepared.prompt, {
+        expectedTurnId,
+        clientMessageId: randomUUID(),
+      });
+      if (result.status !== "accepted") {
+        throw new Error("The active Codex turn changed. Retry sending your answer.");
+      }
+      followUpPrompt = undefined;
+    }
+    this.emitEvent({ type: "timeline", provider: CODEX_PROVIDER, item: prepared.complete() });
+    this.emitEvent({
+      type: "permission_resolved",
+      provider: CODEX_PROVIDER,
+      requestId,
+      resolution: response,
+    });
+    return followUpPrompt ? { followUpPrompt } : undefined;
+  }
+
   private handlePlanPermissionResponse(params: {
     requestId: string;
     response: AgentPermissionResponse;
@@ -4553,7 +4805,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     let followUpPrompt: string | undefined;
     if (response.behavior === "allow") {
       followUpPrompt = this.preparePlanImplementation({
-        planText: pending.planText ?? pendingRequest?.metadata?.planText,
+        planText: pending.plan?.text ?? pendingRequest?.metadata?.planText,
       });
     }
 
@@ -4585,29 +4837,7 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   private resolvePlanPermission(requestId: string, resolution: AgentPermissionResponse): void {
-    if (resolution.behavior === "deny") {
-      // Every route into a denial lands here — the response handler, a new
-      // prompt, and an accepted steer — so the transcript record belongs here
-      // rather than in handlePlanPermissionResponse.
-      const planText =
-        this.pendingPermissionHandlers.get(requestId)?.planText ??
-        this.pendingPermissions.get(requestId)?.metadata?.planText;
-      if (typeof planText === "string") {
-        this.emitEvent({
-          type: "timeline",
-          provider: CODEX_PROVIDER,
-          item: {
-            type: "tool_call",
-            callId: requestId,
-            name: "plan_approval",
-            status: "completed",
-            error: null,
-            detail: { type: "plan", text: planText },
-            metadata: { approved: false },
-          },
-        });
-      }
-    }
+    this.recordPlanOutcome(requestId, resolution.behavior === "allow" ? "approved" : "rejected");
     this.pendingPermissionHandlers.delete(requestId);
     this.pendingPermissions.delete(requestId);
     this.resolvedPermissionRequests.add(requestId);
@@ -4619,6 +4849,29 @@ export class CodexAppServerAgentSession implements AgentSession {
     });
   }
 
+  private recordPlanOutcome(
+    requestId: string,
+    outcome: "approved" | "rejected" | "canceled",
+  ): void {
+    const plan = this.pendingPermissionHandlers.get(requestId)?.plan;
+    if (plan) {
+      this.emitEvent({
+        type: "timeline",
+        provider: CODEX_PROVIDER,
+        turnId: plan.turnId,
+        item: {
+          type: "tool_call",
+          callId: requestId,
+          name: "plan_approval",
+          status: outcome === "canceled" ? "canceled" : "completed",
+          error: null,
+          detail: { type: "plan", text: plan.text },
+          metadata: outcome === "canceled" ? {} : { approved: outcome === "approved" },
+        },
+      });
+    }
+  }
+
   private emitDeniedToolCallTimelineEvent(params: {
     requestId: string;
     response: Extract<AgentPermissionResponse, { behavior: "deny" }>;
@@ -4675,10 +4928,10 @@ export class CodexAppServerAgentSession implements AgentSession {
         modeId: this.config.modeId,
         model: this.config.model ?? null,
         thinkingOptionId,
-        providerOptions: this.config.providerOptions,
         toolPolicy: this.config.toolPolicy,
         systemPrompt: this.config.systemPrompt,
         mcpServers: this.config.mcpServers,
+        asyncQuestions: this.asyncQuestions.serialize(),
       },
     };
   }
@@ -4701,13 +4954,16 @@ export class CodexAppServerAgentSession implements AgentSession {
       cwd: this.config.cwd ?? null,
       model: this.config.model ?? null,
       serviceTier: this.serviceTier,
+      config: this.buildCodexInnerConfig(),
       userMessageTurns: this.codexUserMessageTurns(),
+      threadRollbackAvailable: this.threadRollbackAvailable,
       setThreadId: async (threadId) => {
         this.currentThreadId = threadId;
         this.cachedRuntimeInfo = null;
         this.persistedHistory = [];
         this.historyPending = false;
-        await this.loadPersistedHistory();
+        await this.loadPersistedHistory(this.client);
+        this.reconcileAsyncQuestionsAfterRewind();
       },
     });
   }
@@ -4785,6 +5041,9 @@ export class CodexAppServerAgentSession implements AgentSession {
       if (options?.preservePlanApprovals && pending.kind === "plan") {
         continue;
       }
+      if (pending.kind === "plan") {
+        this.recordPlanOutcome(requestId, "canceled");
+      }
       pending.resolve({ decision: "cancel" });
       this.pendingPermissionHandlers.delete(requestId);
       this.pendingPermissions.delete(requestId);
@@ -4795,17 +5054,17 @@ export class CodexAppServerAgentSession implements AgentSession {
 
   private async disposeClient(): Promise<void> {
     const client = this.client;
-    this.client = null;
-    this.connected = false;
+    this.connectionState = "disconnected";
     this.currentTurnId = null;
     if (client) {
       await client.dispose();
     }
+    this.client = null;
   }
 
   async listCommands(): Promise<AgentSlashCommand[]> {
-    const prompts = await listCodexCustomPrompts();
-    if (!this.connected) {
+    const prompts = await listCodexCustomPrompts(this.codexHome);
+    if (this.connectionState === "disconnected") {
       await this.connect();
     } else {
       await this.loadSkills();
@@ -4818,7 +5077,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     }));
     const fallbackSkills =
       this.cachedSkills === null
-        ? await listCodexSkills(this.config.cwd, this.deps.workspaceGitService)
+        ? await listCodexSkills(this.config.cwd, this.codexHome, this.deps.workspaceGitService)
         : [];
     const builtin: AgentSlashCommand[] = [
       {
@@ -5011,13 +5270,21 @@ export class CodexAppServerAgentSession implements AgentSession {
     return { model, thinkingOptionId };
   }
 
+  // A session without a model or effort runs on Codex's configured defaults, whether its
+  // thread is new or resumed after a restart.
+  private async applyDefaultModelAndThinking(): Promise<string> {
+    const { model, thinkingOptionId } = await this.resolveModelAndThinking();
+    this.config.model = model;
+    this.reconcileServiceTier();
+    this.config.thinkingOptionId = thinkingOptionId;
+    return model;
+  }
+
   private async ensureThread(): Promise<void> {
     if (!this.client) return;
     if (this.currentThreadId) return;
 
-    const { model, thinkingOptionId } = await this.resolveModelAndThinking();
-    this.config.model = model;
-    this.config.thinkingOptionId = thinkingOptionId;
+    const model = await this.applyDefaultModelAndThinking();
 
     const { params, approvalPolicy, sandbox } = this.buildThreadStartRequest(model);
     const rawResponse = await this.client.request("thread/start", params);
@@ -5068,7 +5335,7 @@ export class CodexAppServerAgentSession implements AgentSession {
       ...(this.ephemeral ? { ephemeral: true } : {}),
     };
     if (this.hasWorkflowModeOverride) {
-      applyApprovalsReviewerParam(params, preset);
+      params.approvalsReviewer = preset.approvalsReviewer;
     }
     return { params, approvalPolicy, sandbox };
   }
@@ -5106,7 +5373,7 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   private notifySubscribers(event: AgentStreamEvent): void {
-    const turnId = this.activeForegroundTurnId;
+    const turnId = getAgentStreamEventTurnId(event) ?? this.activeForegroundTurnId;
     const tagged = turnId ? { ...event, turnId } : event;
     this.logger.trace(
       {
@@ -5354,8 +5621,9 @@ export class CodexAppServerAgentSession implements AgentSession {
     timelineItem: ToolCallTimelineItem;
     rawItem: { [key: string]: unknown };
     parentCallId: string | null;
+    parentSubagentId: string | null;
   }): string[] {
-    const { timelineItem, rawItem, parentCallId } = params;
+    const { timelineItem, rawItem, parentCallId, parentSubagentId } = params;
     if (timelineItem.detail.type !== "sub_agent") {
       return [];
     }
@@ -5367,6 +5635,7 @@ export class CodexAppServerAgentSession implements AgentSession {
         callId: timelineItem.callId,
         toolCall: timelineItem,
         parentCallId,
+        parentSubagentId,
         activityItemIds: new Set<string>(),
         pendingCommandOutputDeltas: new Map<string, string[]>(),
         pendingFileChangeOutputDeltas: new Map<string, string[]>(),
@@ -5385,6 +5654,7 @@ export class CodexAppServerAgentSession implements AgentSession {
       },
     };
     state.parentCallId ??= parentCallId;
+    state.parentSubagentId ??= parentSubagentId;
     const activity = readCodexSubAgentActivity(rawItem);
     if (activity?.id) {
       state.activityItemIds.add(activity.id);
@@ -5402,6 +5672,10 @@ export class CodexAppServerAgentSession implements AgentSession {
       new Set(agentThreadId ? [...receiverThreadIds, agentThreadId] : receiverThreadIds),
     ).filter((threadId) => threadId !== this.currentThreadId);
     for (const receiverThreadId of childThreadIds) {
+      const owningCallId = this.subAgentCallIdByChildThreadId.get(receiverThreadId);
+      if (owningCallId && owningCallId !== timelineItem.callId) {
+        continue;
+      }
       this.subAgentCallIdByChildThreadId.set(receiverThreadId, timelineItem.callId);
       state.childThreadIds.add(receiverThreadId);
       this.emitProviderSubagentUpsert(receiverThreadId, state, timelineItem.status);
@@ -5620,6 +5894,7 @@ export class CodexAppServerAgentSession implements AgentSession {
         description: detail.description ?? null,
         status: providerStatus,
         toolCallId: state.callId,
+        parentSubagentId: state.parentSubagentId,
       },
     });
   }
@@ -5874,6 +6149,7 @@ export class CodexAppServerAgentSession implements AgentSession {
         error: parsed.errorMessage ?? "Codex turn failed",
       });
     } else if (parsed.status === "interrupted") {
+      this.dismissInterruptedAsyncQuestions();
       this.emitEvent({ type: "turn_canceled", provider: CODEX_PROVIDER, reason: "interrupted" });
     } else {
       if (this.planModeEnabled && this.latestPlanResult?.text) {
@@ -6226,6 +6502,43 @@ export class CodexAppServerAgentSession implements AgentSession {
     }
   }
 
+  private receiveAsyncQuestion(threadId: string | null, item: unknown): void {
+    if (threadId !== this.currentThreadId) return;
+    const request = this.asyncQuestions.receive(item);
+    if (request)
+      this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
+  }
+
+  private dismissInterruptedAsyncQuestions(): void {
+    const resolution: AgentPermissionResponse = { behavior: "deny", message: "Interrupted" };
+    for (const request of this.asyncQuestions.pending()) {
+      const prepared = this.asyncQuestions.prepareResponse(request.id, resolution);
+      this.emitEvent({ type: "timeline", provider: CODEX_PROVIDER, item: prepared.complete() });
+      this.emitEvent({
+        type: "permission_resolved",
+        provider: CODEX_PROVIDER,
+        requestId: request.id,
+        resolution,
+      });
+    }
+  }
+
+  private reconcileAsyncQuestionsAfterRewind(): void {
+    const retainedIds = new Set(
+      this.persistedHistory.flatMap(({ item }) =>
+        item.type === "tool_call" && item.name === "request_user_input_async" ? [item.callId] : [],
+      ),
+    );
+    for (const requestId of this.asyncQuestions.retain(retainedIds)) {
+      this.emitEvent({
+        type: "permission_resolved",
+        provider: CODEX_PROVIDER,
+        requestId,
+        resolution: { behavior: "deny", message: "Removed by rewind" },
+      });
+    }
+  }
+
   private handleItemCompletedNotification(
     parsed: Extract<ParsedCodexNotification, { kind: "item_completed" }>,
   ): void {
@@ -6236,6 +6549,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     if (shouldIgnoreMirroredLifecycleItem(parsed.source, parsed.item)) {
       return;
     }
+    this.receiveAsyncQuestion(parsed.threadId, parsed.item);
     if (this.isUserMessageItem(parsed.item)) {
       this.handleUserMessageItem(parsed);
       return;
@@ -6257,6 +6571,7 @@ export class CodexAppServerAgentSession implements AgentSession {
             timelineItem,
             rawItem: parsed.item,
             parentCallId: childSubAgentCallId,
+            parentSubagentId: resolveCodexParentSubagentId(childSubAgentCallId, parsed.threadId),
           })
         : [];
     const imageItems = mcpToolResultImagesToTimeline(parsed.item);
@@ -6424,6 +6739,7 @@ export class CodexAppServerAgentSession implements AgentSession {
       timelineItem,
       rawItem: parsed.item,
       parentCallId: childSubAgentCallId,
+      parentSubagentId: resolveCodexParentSubagentId(childSubAgentCallId, parsed.threadId),
     });
     if (childSubAgentCallId) {
       this.emitStartedProviderSubagentItem(parsed.threadId, timelineItem);
@@ -6439,6 +6755,7 @@ export class CodexAppServerAgentSession implements AgentSession {
     );
     const itemId = parsed.item.id;
     if (normalizedItemType === "commandExecution") {
+      this.rememberTerminalProcessForItem(parsed.item);
       const callId = timelineItem.callId || itemId;
       if (callId && this.emittedExecCommandStartedCallIds.has(callId)) {
         return;
@@ -6558,19 +6875,21 @@ export class CodexAppServerAgentSession implements AgentSession {
   }
 
   private rememberTerminalProcessForCommand(command: unknown, output: string | null): void {
-    const normalizedCommand = normalizeCodexCommandValue(command);
-    if (!normalizedCommand) {
-      return;
-    }
-    const displayCommand =
-      typeof normalizedCommand === "string"
-        ? normalizedCommand
-        : normalizedCommand.join(" ").trim();
-    if (!displayCommand) {
-      return;
-    }
     const processId = extractCodexTerminalSessionId(output ?? undefined);
-    if (!processId) {
+    if (processId) {
+      this.rememberTerminalProcess(processId, command);
+    }
+  }
+
+  private rememberTerminalProcessForItem(item: { [key: string]: unknown }): void {
+    if (typeof item.processId === "string" && item.processId) {
+      this.rememberTerminalProcess(item.processId, item.command);
+    }
+  }
+
+  private rememberTerminalProcess(processId: string, command: unknown): void {
+    const displayCommand = normalizeCommandExecutionCommand(command);
+    if (!displayCommand) {
       return;
     }
     this.terminalCommandByProcessId.set(processId, displayCommand);
@@ -6642,6 +6961,8 @@ export class CodexAppServerAgentSession implements AgentSession {
     const parsed = z
       .object({
         itemId: z.string(),
+        // Set when several approval callbacks belong to one item; it names the callback.
+        approvalId: z.string().nullable().optional(),
         threadId: z.string(),
         turnId: z.string(),
         command: z.string().nullable().optional(),
@@ -6655,7 +6976,7 @@ export class CodexAppServerAgentSession implements AgentSession {
       cwd: parsed.cwd ?? this.config.cwd ?? null,
       running: true,
     });
-    const requestId = `permission-${parsed.itemId}`;
+    const requestId = `permission-${parsed.approvalId ?? parsed.itemId}`;
     const title = parsed.command ? `Run command: ${parsed.command}` : "Run command";
     const request: AgentPermissionRequest = {
       id: requestId,
@@ -6838,16 +7159,18 @@ export class CodexAppServerAgentClient implements AgentClient {
     private readonly deps: CodexAppServerAgentDeps = {},
   ) {}
 
-  private sessionDeps(): CodexAppServerAgentDeps {
+  private sessionDeps(launchEnv: Record<string, string> | undefined): CodexAppServerAgentDeps {
     return {
       ...this.deps,
-      customCodexConfig: buildCodexCustomProviderConfig(
-        this.runtimeSettings,
-        this.deps.customProvider,
-      ),
+      codexHome: resolveCodexHomeDir(buildCodexAppServerEnv(this.runtimeSettings, launchEnv)),
+      customCodexConfig: this.customProviderConfig(),
     };
   }
 
+  private customProviderConfig(): CodexCustomProviderConfig | null {
+    return buildCodexCustomProviderConfig(this.runtimeSettings, this.deps.customProvider);
+  }
+
   private resolveGoalsEnabled(): Promise<boolean> {
     if (!this.goalsEnabledPromise) {
       this.goalsEnabledPromise = (async () => {
@@ -6902,7 +7225,7 @@ export class CodexAppServerAgentClient implements AgentClient {
 
   private async spawnAppServer(
     launchEnv?: Record<string, string>,
-    options?: { goalsEnabled?: boolean; agentId?: string },
+    options?: { goalsEnabled?: boolean; agentId?: string; environment?: Record<string, string> },
   ): Promise<ChildProcessWithoutNullStreams> {
     const launchPrefix = await resolveCodexLaunchPrefix(this.runtimeSettings);
     const args = [...launchPrefix.args, "app-server"];
@@ -6921,10 +7244,7 @@ export class CodexAppServerAgentClient implements AgentClient {
     const child = spawnProcess(launchPrefix.command, args, {
       detached: process.platform !== "win32",
       stdio: ["pipe", "pipe", "pipe"],
-      ...createProviderEnvSpec({
-        runtimeSettings: this.runtimeSettings,
-        overlays: [launchEnv],
-      }),
+      baseEnv: options?.environment ?? buildCodexAppServerEnv(this.runtimeSettings, launchEnv),
     });
     assertChildWithPipes(child);
     return child;
@@ -6945,17 +7265,23 @@ export class CodexAppServerAgentClient implements AgentClient {
     const sessionConfig: AgentSessionConfig = { ...config, provider: CODEX_PROVIDER };
     const goalsEnabled = await this.resolveGoalsEnabled();
     const autoReviewEnabled = await this.resolveAutoReviewEnabled();
+    const environment = buildCodexAppServerEnv(this.runtimeSettings, launchContext?.env);
     const session = new CodexAppServerAgentSession(
       sessionConfig,
       null,
       this.logger,
       () =>
-        this.spawnAppServer(launchContext?.env, { goalsEnabled, agentId: launchContext?.agentId }),
-      this.sessionDeps(),
+        this.spawnAppServer(launchContext?.env, {
+          goalsEnabled,
+          agentId: launchContext?.agentId,
+          environment,
+        }),
+      { ...this.sessionDeps(launchContext?.env), environment },
       options?.persistSession === false,
       goalsEnabled,
       autoReviewEnabled,
       launchContext?.agentId,
+      "interactive",
     );
     await session.connect();
     return session;
@@ -6976,13 +7302,18 @@ export class CodexAppServerAgentClient implements AgentClient {
     };
     const goalsEnabled = await this.resolveGoalsEnabled();
     const autoReviewEnabled = await this.resolveAutoReviewEnabled();
+    const environment = buildCodexAppServerEnv(this.runtimeSettings, launchContext?.env);
     const session = new CodexAppServerAgentSession(
       merged,
       handle,
       this.logger,
       () =>
-        this.spawnAppServer(launchContext?.env, { goalsEnabled, agentId: launchContext?.agentId }),
-      this.sessionDeps(),
+        this.spawnAppServer(launchContext?.env, {
+          goalsEnabled,
+          agentId: launchContext?.agentId,
+          environment,
+        }),
+      { ...this.sessionDeps(launchContext?.env), environment },
       false,
       goalsEnabled,
       autoReviewEnabled,
@@ -7011,13 +7342,15 @@ export class CodexAppServerAgentClient implements AgentClient {
       // filtering since most threads will be from other cwds, then keep the
       // local realpath-aware filter for symlink-equivalent workspace paths.
       const listLimit = options?.cwd ? Math.max(scanLimit, 50) : scanLimit;
-      const response = toObjectRecord(
-        await client.request("thread/list", {
-          limit: listLimit,
-          ...(options?.cwd ? { cwd: options.cwd } : {}),
-        }),
-      );
-      const allThreads = Array.isArray(response?.data) ? response.data.filter(isRecord) : [];
+      // Codex records each thread under the model provider that ran it and,
+      // unless told otherwise, lists only the provider its own config selects.
+      // A custom provider runs under its own id, so ask for exactly that one.
+      const customProviderConfig = this.customProviderConfig();
+      const allThreads = await readCodexThreadWindow(client, this.logger, {
+        limit: listLimit,
+        cwd: options?.cwd,
+        ...(customProviderConfig ? { modelProviders: [customProviderConfig.model_provider] } : {}),
+      });
       const threads = filterCodexThreadsByCwd(allThreads, options?.cwd);
       return threads.slice(0, limit).map((thread) => {
         const threadId = typeof thread.id === "string" ? thread.id : "";
@@ -7052,6 +7385,11 @@ export class CodexAppServerAgentClient implements AgentClient {
     });
   }
 
+  async getCatalogCacheKey(_options: FetchCatalogOptions): Promise<string> {
+    // This client discovers through host configuration, independent of project cwd.
+    return "host";
+  }
+
   async fetchCatalog(
     _options: FetchCatalogOptions,
     context?: ProviderRefreshContext,
diff --git a/packages/server/src/server/agent/providers/codex-async-questions.test.ts b/packages/server/src/server/agent/providers/codex-async-questions.test.ts
new file mode 100644
index 0000000000..8915688bde
--- /dev/null
+++ b/packages/server/src/server/agent/providers/codex-async-questions.test.ts
@@ -0,0 +1,436 @@
+import { tmpdir } from "node:os";
+import { expect, test } from "vitest";
+import { CodexAppServerAgentSession } from "./codex-app-server-agent.js";
+import {
+  createFakeCodexAppServer,
+  waitForNextEvent,
+  waitForTimelineToolCall,
+} from "./codex/test-utils/fake-app-server.js";
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../agent-sdk-types.js";
+import { AgentManager } from "../agent-manager.js";
+
+const questionItem = {
+  type: "agentMessage",
+  id: "async-question-1",
+  text: "Which color?\n- Blue\n- Green",
+  phase: "final_answer",
+  delivery: "async",
+  questions: [{ title: "Which color?", options: ["Blue", "Green"] }],
+};
+
+async function setup(metadata?: Record<string, unknown>, rejectSteer = false) {
+  const appServer = createFakeCodexAppServer({
+    "turn/interrupt": () => ({}),
+    "turn/steer": () => {
+      if (rejectSteer) return { __jsonRpcError: { code: -32000, message: "Delivery failed" } };
+      return { turnId: "native-turn" };
+    },
+    "thread/read": () => ({ thread: { id: "thread-1", turns: [] } }),
+  });
+  const session = new CodexAppServerAgentSession(
+    { provider: "codex", cwd: tmpdir(), model: "gpt-5.4", modeId: "full-access" },
+    metadata ? { sessionId: "thread-1", metadata } : null,
+    createTestLogger(),
+    async () => appServer.child,
+  );
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+  await session.startTurn("Help me choose a color while you inspect the project.");
+  const started = waitForNextEvent(session, "turn_started");
+  appServer.startsTurn({ threadId: "thread-1", turnId: "native-turn" });
+  await started;
+  async function ask() {
+    const shown = waitForTimelineToolCall(session, questionItem.id);
+    appServer.child.stdout.write(
+      JSON.stringify({
+        method: "item/completed",
+        params: { threadId: "thread-1", turnId: "native-turn", item: questionItem },
+      }) + "\n",
+    );
+    await shown;
+  }
+  async function say(text: string) {
+    const shown = waitForNextEvent(
+      session,
+      "timeline",
+      (event) => event.item.type === "assistant_message" && event.item.text.includes(text),
+    );
+    appServer.says({ threadId: "thread-1", text });
+    await shown;
+  }
+  async function finish(status: "completed" | "interrupted" = "completed") {
+    const finished = waitForNextEvent(
+      session,
+      status === "completed" ? "turn_completed" : "turn_canceled",
+    );
+    appServer.completeTurn({ status });
+    await finished;
+  }
+  function allowAnswers() {
+    rejectSteer = false;
+  }
+  return { session, appServer, events, ask, say, finish, allowAnswers };
+}
+
+const answer = { behavior: "allow" as const, updatedInput: { answers: { "Question 1": "Green" } } };
+
+async function setupRewind(fail = false) {
+  const records = [
+    { item: { ...questionItem, id: "earlier-pending" } },
+    { item: { ...questionItem, id: "earlier-answered" }, resolution: ["Blue"] },
+    { item: { ...questionItem, id: "removed-pending" } },
+    { item: { ...questionItem, id: "removed-answered" }, resolution: ["Green"] },
+  ];
+  function userMessage(id: string) {
+    return { type: "userMessage", id, content: [{ type: "text", text: id }] };
+  }
+  const turns = [
+    {
+      id: "earlier-turn",
+      items: [userMessage("earlier"), ...records.slice(0, 2).map((r) => r.item)],
+    },
+    {
+      id: "removed-turn",
+      items: [userMessage("rewind-here"), ...records.slice(2).map((r) => r.item)],
+    },
+  ];
+  const appServer = createFakeCodexAppServer({
+    "thread/read": (params) => {
+      const { threadId } = params as { threadId: string };
+      return {
+        thread: { id: threadId, turns: threadId === "thread-1" ? turns : turns.slice(0, 1) },
+      };
+    },
+    ...(fail
+      ? {
+          "thread/rollback": () => ({ __jsonRpcError: { code: -32000, message: "Rewind failed" } }),
+        }
+      : {}),
+  });
+  const session = new CodexAppServerAgentSession(
+    { provider: "codex", cwd: tmpdir(), model: "gpt-5.4", modeId: "full-access" },
+    { sessionId: "thread-1", metadata: { asyncQuestions: records } },
+    createTestLogger(),
+    async () => appServer.child,
+  );
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+  await session.connect();
+  return { session, events, records };
+}
+
+test("rewind removes only questions outside the remaining history, including after resume", async () => {
+  const { session, events, records } = await setupRewind();
+  let metadata: Record<string, unknown> | undefined;
+  try {
+    await session.revertConversation({ messageId: "rewind-here" });
+    expect(session.getPendingPermissions().map((p) => p.id)).toEqual([
+      "permission-earlier-pending",
+    ]);
+    metadata = session.describePersistence()!.metadata;
+    expect(metadata.asyncQuestions).toEqual(
+      records.slice(0, 2).map((record) => ({
+        resolution: record.resolution,
+        item: {
+          type: "agentMessage",
+          id: record.item.id,
+          delivery: "async",
+          questions: questionItem.questions,
+        },
+      })),
+    );
+    expect(events.filter((e) => e.type === "permission_resolved")).toEqual([
+      expect.objectContaining({ requestId: "permission-removed-pending" }),
+    ]);
+    const history = [];
+    for await (const event of session.streamHistory()) history.push(event);
+    expect(
+      history.some(
+        (e) =>
+          e.type === "timeline" &&
+          e.item.type === "tool_call" &&
+          e.item.callId === "removed-pending",
+      ),
+    ).toBe(false);
+  } finally {
+    await session.close();
+  }
+  const resumed = await setup(metadata);
+  try {
+    expect(resumed.session.getPendingPermissions().map((p) => p.id)).toEqual([
+      "permission-earlier-pending",
+    ]);
+  } finally {
+    await resumed.session.close();
+  }
+});
+
+test("failed rewind preserves question state", async () => {
+  const { session, events } = await setupRewind(true);
+  try {
+    const before = session.describePersistence();
+    await expect(session.revertConversation({ messageId: "rewind-here" })).rejects.toThrow(
+      "Rewind failed",
+    );
+    expect(session.describePersistence()).toEqual(before);
+    expect(session.getPendingPermissions().map((p) => p.id)).toEqual([
+      "permission-earlier-pending",
+      "permission-removed-pending",
+    ]);
+    expect(events.some((e) => e.type === "permission_resolved")).toBe(false);
+  } finally {
+    await session.close();
+  }
+});
+
+async function manage(session: CodexAppServerAgentSession) {
+  const manager = new AgentManager({
+    clients: {
+      codex: {
+        provider: "codex",
+        capabilities: session.capabilities,
+        createSession: async () => session,
+        resumeSession: async () => session,
+        isAvailable: async () => true,
+        fetchCatalog: async () => ({ models: [], modes: [] }),
+      },
+    },
+    logger: createTestLogger(),
+  });
+  const agent = await manager.createAgent(
+    { provider: "codex", cwd: tmpdir(), model: "gpt-5.4" },
+    undefined,
+    { workspaceId: undefined },
+  );
+  return { manager, agent };
+}
+
+test("manager publishes and saves the provider state after rewind", async () => {
+  const { session } = await setupRewind();
+  const { manager, agent } = await manage(session);
+  try {
+    await manager.rewind(agent.id, "rewind-here", "conversation");
+    const snapshot = manager.getAgent(agent.id)!;
+    expect(Array.from(snapshot.pendingPermissions.keys())).toEqual(["permission-earlier-pending"]);
+    expect(snapshot.persistence).toEqual(session.describePersistence());
+    expect(snapshot.persistence?.sessionId).toBe("forked-thread");
+  } finally {
+    await manager.closeAgent(agent.id);
+  }
+});
+
+test("manager snapshots capture pending and answered question state before the turn ends", async () => {
+  const { session, ask } = await setup();
+  const { manager, agent } = await manage(session);
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    expect(manager.getAgent(agent.id)?.persistence?.metadata?.asyncQuestions).toEqual([
+      {
+        item: {
+          type: "agentMessage",
+          id: questionItem.id,
+          delivery: "async",
+          questions: questionItem.questions,
+        },
+      },
+    ]);
+    await manager.respondToPermission(agent.id, permission.id, answer);
+    expect(manager.getAgent(agent.id)?.persistence?.metadata?.asyncQuestions).toEqual([
+      {
+        item: {
+          type: "agentMessage",
+          id: questionItem.id,
+          delivery: "async",
+          questions: questionItem.questions,
+        },
+        resolution: ["Green"],
+      },
+    ]);
+  } finally {
+    await manager.closeAgent(agent.id);
+  }
+});
+
+test("concurrent answers deliver only one response to the active Codex turn", async () => {
+  const { session, appServer, ask } = await setup();
+  const { manager, agent } = await manage(session);
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    const results = await Promise.allSettled([
+      manager.respondToPermission(agent.id, permission.id, answer),
+      manager.respondToPermission(agent.id, permission.id, answer),
+    ]);
+    expect(results.map((result) => result.status)).toEqual(["fulfilled", "rejected"]);
+    expect(appServer.requests().filter((request) => request.method === "turn/steer")).toHaveLength(
+      1,
+    );
+    expect(session.getPendingPermissions()).toEqual([]);
+  } finally {
+    await manager.closeAgent(agent.id);
+  }
+});
+
+test("a failed submission releases the request so the user can retry", async () => {
+  const { session, ask, allowAnswers } = await setup(undefined, true);
+  const { manager, agent } = await manage(session);
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    await expect(manager.respondToPermission(agent.id, permission.id, answer)).rejects.toThrow(
+      "Delivery failed",
+    );
+    expect(session.getPendingPermissions().map((request) => request.id)).toEqual([permission.id]);
+    allowAnswers();
+    await manager.respondToPermission(agent.id, permission.id, answer);
+    expect(session.getPendingPermissions()).toEqual([]);
+  } finally {
+    await manager.closeAgent(agent.id);
+  }
+});
+
+test("shows an async question, keeps streaming, and delivers its answer without interrupting", async () => {
+  const { session, appServer, events, ask, say } = await setup();
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    expect(permission).toMatchObject({
+      kind: "question",
+      input: {
+        questions: [
+          {
+            header: "Question 1",
+            question: "Which color?",
+            isOther: true,
+            options: [{ label: "Blue" }, { label: "Green" }],
+          },
+        ],
+      },
+    });
+    await say("I am still inspecting the project.");
+    expect(
+      events.some(
+        (event) =>
+          event.type === "timeline" &&
+          event.item.type === "assistant_message" &&
+          event.item.text.includes("still inspecting"),
+      ),
+    ).toBe(true);
+    await session.respondToPermission(permission.id, answer);
+    expect(session.getPendingPermissions()).toEqual([]);
+    expect(appServer.requests().filter((request) => request.method === "turn/steer")).toMatchObject(
+      [
+        {
+          params: {
+            expectedTurnId: "native-turn",
+            clientUserMessageId: expect.any(String),
+            input: [{ type: "text", text: expect.stringContaining("Which color?\nGreen") }],
+          },
+        },
+      ],
+    );
+    expect(appServer.requests().filter((request) => request.method === "turn/interrupt")).toEqual(
+      [],
+    );
+    expect(
+      events.some(
+        (event) => event.type === "permission_resolved" && event.requestId === permission.id,
+      ),
+    ).toBe(true);
+  } finally {
+    await session.close();
+  }
+});
+
+test("keeps a failed answer pending for retry", async () => {
+  const { session, ask } = await setup(undefined, true);
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    expect(permission).toBeDefined();
+    await expect(session.respondToPermission(permission.id, answer)).rejects.toThrow();
+    expect(session.getPendingPermissions()).toHaveLength(1);
+  } finally {
+    await session.close();
+  }
+});
+
+test("Stop dismisses async questions before cancellation and keeps them dismissed after resume", async () => {
+  const first = await setup();
+  let metadata: Record<string, unknown> | undefined;
+  try {
+    await first.ask();
+    expect(first.session.getPendingPermissions()).toHaveLength(1);
+    first.session.subscribe((event) => {
+      if (event.type === "turn_canceled") {
+        metadata = first.session.describePersistence()!.metadata;
+      }
+    });
+    await first.session.interrupt();
+    await first.finish("interrupted");
+    expect(first.session.getPendingPermissions()).toEqual([]);
+    expect(metadata?.asyncQuestions).toEqual([
+      expect.objectContaining({ resolution: "dismissed" }),
+    ]);
+    expect(first.events).toContainEqual(
+      expect.objectContaining({
+        type: "permission_resolved",
+        requestId: "permission-async-question-1",
+        resolution: { behavior: "deny", message: "Interrupted" },
+      }),
+    );
+  } finally {
+    await first.session.close();
+  }
+  const resumed = await setup(metadata);
+  try {
+    await resumed.ask();
+    expect(resumed.session.getPendingPermissions()).toEqual([]);
+  } finally {
+    await resumed.session.close();
+  }
+});
+
+test("late answers use the existing follow-up prompt and dismissal does not interrupt", async () => {
+  const { session, appServer, ask, finish } = await setup();
+  try {
+    await ask();
+    const [permission] = session.getPendingPermissions();
+    expect(permission).toBeDefined();
+    await finish();
+    expect(session.getPendingPermissions()).toHaveLength(1);
+    expect(await session.respondToPermission(permission.id, answer)).toEqual({
+      followUpPrompt: "Answers to your questions:\n\nWhich color?\nGreen",
+    });
+    expect(appServer.requests().some((request) => request.method === "turn/interrupt")).toBe(false);
+  } finally {
+    await session.close();
+  }
+});
+
+test("restores unanswered questions and does not reopen answered questions on duplicate events", async () => {
+  const first = await setup();
+  let metadata: Record<string, unknown> | undefined;
+  try {
+    await first.ask();
+    expect(first.session.getPendingPermissions()).toHaveLength(1);
+    metadata = first.session.describePersistence()!.metadata;
+  } finally {
+    await first.session.close();
+  }
+  const resumed = await setup(metadata);
+  try {
+    const [permission] = resumed.session.getPendingPermissions();
+    expect(permission).toBeDefined();
+    await resumed.session.respondToPermission(permission.id, { behavior: "deny" });
+    await resumed.ask();
+    expect(resumed.session.getPendingPermissions()).toEqual([]);
+    expect(
+      resumed.appServer.requests().some((request) => request.method === "turn/interrupt"),
+    ).toBe(false);
+  } finally {
+    await resumed.session.close();
+  }
+});
diff --git a/packages/server/src/server/agent/providers/codex-custom-provider-import.local.e2e.test.ts b/packages/server/src/server/agent/providers/codex-custom-provider-import.local.e2e.test.ts
new file mode 100644
index 0000000000..ebd8de5ab5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/codex-custom-provider-import.local.e2e.test.ts
@@ -0,0 +1,139 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { once } from "node:events";
+import { createServer, type Server } from "node:http";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { CodexAppServerAgentClient } from "./codex-app-server-agent.js";
+
+// Runs the real `codex` binary against a local Responses endpoint standing in
+// for a custom provider's OPENAI_BASE_URL, so no login is needed.
+
+function sse(events: Array<Record<string, unknown>>): string {
+  return events
+    .map((event) => `event: ${String(event.type)}\ndata: ${JSON.stringify(event)}\n\n`)
+    .join("");
+}
+
+function finalAnswer(): string {
+  return sse([
+    { type: "response.created", response: { id: "resp-1" } },
+    {
+      type: "response.output_item.done",
+      item: {
+        type: "message",
+        role: "assistant",
+        id: "msg-1",
+        content: [{ type: "output_text", text: "done" }],
+      },
+    },
+    {
+      type: "response.completed",
+      response: {
+        id: "resp-1",
+        usage: {
+          input_tokens: 0,
+          input_tokens_details: null,
+          output_tokens: 0,
+          output_tokens_details: null,
+          total_tokens: 0,
+        },
+      },
+    },
+  ]);
+}
+
+async function startResponsesEndpoint(): Promise<{
+  baseUrl: string;
+  server: Server;
+  requestCount: () => number;
+}> {
+  let requests = 0;
+  const server = createServer((req, res) => {
+    req.resume();
+    req.on("end", () => {
+      if (req.method !== "POST" || req.url !== "/v1/responses") {
+        res.statusCode = 404;
+        res.end();
+        return;
+      }
+      requests += 1;
+      res.setHeader("content-type", "text/event-stream");
+      res.end(finalAnswer());
+    });
+  });
+  server.listen(0, "127.0.0.1");
+  await once(server, "listening");
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("no server address");
+  return {
+    baseUrl: `http://127.0.0.1:${address.port}/v1`,
+    server,
+    requestCount: () => requests,
+  };
+}
+
+async function closeServer(server: Server): Promise<void> {
+  server.close();
+  await once(server, "close");
+}
+
+describe("Codex custom provider import list", () => {
+  const cleanups: Array<() => void | Promise<void>> = [];
+
+  afterEach(async () => {
+    for (const cleanup of cleanups.splice(0).toReversed()) await cleanup();
+  });
+
+  test("lists a custom provider's session under that provider and imports it there", async () => {
+    const codexHome = mkdtempSync(path.join(os.tmpdir(), "codex-custom-import-home-"));
+    const cwd = mkdtempSync(path.join(os.tmpdir(), "codex-custom-import-cwd-"));
+    cleanups.push(() => rmSync(codexHome, { recursive: true, force: true }));
+    cleanups.push(() => rmSync(cwd, { recursive: true, force: true }));
+    const { baseUrl, server, requestCount } = await startResponsesEndpoint();
+    cleanups.push(() => closeServer(server));
+
+    const logger = createTestLogger();
+    const customCodex = new CodexAppServerAgentClient(
+      logger,
+      { env: { CODEX_HOME: codexHome, OPENAI_BASE_URL: baseUrl, OPENAI_API_KEY: "test-key" } },
+      { customProvider: { id: "my-codex", label: "My Codex", extends: "codex" } },
+    );
+    const stockCodex = new CodexAppServerAgentClient(logger, { env: { CODEX_HOME: codexHome } });
+
+    const session = await customCodex.createSession({
+      provider: "codex",
+      cwd,
+      model: "mock-model",
+    });
+    try {
+      await session.run("hello from the custom provider");
+    } finally {
+      await session.close();
+    }
+
+    const customSessions = await customCodex.listImportableSessions({ cwd });
+    const stockSessions = await stockCodex.listImportableSessions({ cwd });
+
+    expect(customSessions.map((entry) => entry.firstPromptPreview)).toEqual([
+      "hello from the custom provider",
+    ]);
+    expect(stockSessions).toEqual([]);
+
+    const config = { provider: "codex", cwd, model: "mock-model" };
+    const imported = await customCodex.importSession(
+      { providerHandleId: customSessions[0].providerHandleId, cwd },
+      { config, storedConfig: config },
+    );
+    const requestsBeforeImportedTurn = requestCount();
+    try {
+      await imported.session.run("hello again after import");
+    } finally {
+      await imported.session.close();
+    }
+    expect(requestCount()).toBeGreaterThan(requestsBeforeImportedTurn);
+  }, 120_000);
+});
diff --git a/packages/server/src/server/agent/providers/codex-feature-definitions.ts b/packages/server/src/server/agent/providers/codex-feature-definitions.ts
index a850317e56..5eb11d8a0c 100644
--- a/packages/server/src/server/agent/providers/codex-feature-definitions.ts
+++ b/packages/server/src/server/agent/providers/codex-feature-definitions.ts
@@ -1,15 +1,33 @@
 import type { AgentFeature, AgentFeatureToggle } from "../agent-sdk-types.js";
 
-const CODEX_FAST_MODE_SUPPORTED_MODEL_PREFIXES = ["gpt-5", "gpt-4.1", "o3", "o4-mini"] as const;
+import { z } from "zod";
 
-export const CODEX_FAST_MODE_FEATURE: Omit<AgentFeatureToggle, "value"> = {
-  type: "toggle",
-  id: "fast_mode",
-  label: "Fast",
-  description: "Priority inference at 2x usage",
-  tooltip: "Toggle fast mode",
-  icon: "zap",
-};
+export const CodexServiceTierSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  description: z.string(),
+});
+export type CodexServiceTier = z.infer<typeof CodexServiceTierSchema>;
+
+function buildCodexSpeedFeature(tiers: CodexServiceTier[], value: string): AgentFeature[] {
+  if (tiers.length === 0) return [];
+  return [
+    {
+      type: "select",
+      id: "service_tier",
+      label: "Speed",
+      description: "Choose processing speed. Faster tiers increase usage.",
+      tooltip: "Select speed",
+      icon: "zap",
+      desktopTrigger: "icon",
+      value,
+      options: [
+        { id: "default", label: "Normal", isDefault: true },
+        ...tiers.map((tier) => ({ id: tier.id, label: tier.name })),
+      ],
+    },
+  ];
+}
 
 export const CODEX_PLAN_MODE_FEATURE: Omit<AgentFeatureToggle, "value"> = {
   type: "toggle",
@@ -20,42 +38,22 @@ export const CODEX_PLAN_MODE_FEATURE: Omit<AgentFeatureToggle, "value"> = {
   icon: "list-todo",
 };
 
-function normalizeCodexModelId(modelId: string | null | undefined): string | null {
-  const normalized = typeof modelId === "string" ? modelId.trim() : "";
-  return normalized.length > 0 ? normalized : null;
-}
-
-export function codexModelSupportsFastMode(modelId: string | null | undefined): boolean {
-  const normalizedModelId = normalizeCodexModelId(modelId);
-  if (!normalizedModelId) {
-    return false;
-  }
-  return CODEX_FAST_MODE_SUPPORTED_MODEL_PREFIXES.some(
-    (prefix) => normalizedModelId === prefix || normalizedModelId.startsWith(prefix),
-  );
-}
-
 export function buildCodexFeatures(input: {
-  modelId: string | null | undefined;
-  fastModeEnabled: boolean;
+  serviceTiers: CodexServiceTier[];
+  serviceTier: string;
   planModeEnabled: boolean;
   planModeAvailable?: boolean;
 }): AgentFeature[] {
-  const features: AgentFeature[] = [];
-
-  if (codexModelSupportsFastMode(input.modelId)) {
-    features.push({
-      ...CODEX_FAST_MODE_FEATURE,
-      value: input.fastModeEnabled,
-    });
-  }
-
+  const features = buildCodexSpeedFeature(input.serviceTiers, input.serviceTier);
   if (input.planModeAvailable !== false) {
-    features.push({
-      ...CODEX_PLAN_MODE_FEATURE,
-      value: input.planModeEnabled,
-    });
+    features.push({ ...CODEX_PLAN_MODE_FEATURE, value: input.planModeEnabled });
   }
-
   return features;
 }
+
+export function readCodexServiceTier(values: Record<string, unknown> | undefined): string | null {
+  const tier = values?.service_tier;
+  if (typeof tier === "string") return tier;
+  // COMPAT(codexFastPreference): added in v0.10.0, remove after 2027-03-29 once saved Fast preferences have migrated.
+  return values?.fast_mode ? "fast" : null;
+}
diff --git a/packages/server/src/server/agent/providers/codex-history-lifecycle.real.e2e.test.ts b/packages/server/src/server/agent/providers/codex-history-lifecycle.real.e2e.test.ts
new file mode 100644
index 0000000000..0d14f29930
--- /dev/null
+++ b/packages/server/src/server/agent/providers/codex-history-lifecycle.real.e2e.test.ts
@@ -0,0 +1,151 @@
+import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "vitest";
+import { z } from "zod";
+import { CodexAppServerClient } from "./codex/app-server-transport.js";
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { CodexAppServerAgentClient, CodexAppServerAgentSession } from "./codex-app-server-agent.js";
+import type { AgentSession } from "../agent-sdk-types.js";
+
+async function readNativeThreadPath(threadId: string): Promise<string> {
+  const client = new CodexAppServerClient(
+    spawn("codex", ["app-server"], { stdio: ["pipe", "pipe", "pipe"] }),
+    createTestLogger(),
+  );
+  try {
+    await client.request("initialize", {
+      clientInfo: { name: "paseo-archive-regression", version: "1.0.0" },
+    });
+    client.notify("initialized", {});
+    const response = await client.request("thread/read", { threadId });
+    return z.object({ thread: z.object({ path: z.string() }) }).parse(response).thread.path;
+  } finally {
+    await client.dispose();
+  }
+}
+
+// Real native processes and a real completion. The second case represents records
+// archived by older Paseo versions whose best-effort native archive failed.
+test.runIf(process.env.PASEO_NATIVE_ARCHIVE_QA === "1").each([true, false])(
+  "Codex history releases its process and leaves native archive unchanged (native archived: %s)",
+  async (nativeArchived) => {
+    const cwd = await mkdtemp(path.join(tmpdir(), "codex-history-lifecycle-"));
+    const logger = createTestLogger();
+    const provider = new CodexAppServerAgentClient(logger);
+    const spawned: ChildProcessWithoutNullStreams[] = [];
+    let active: AgentSession | undefined;
+    let history: CodexAppServerAgentSession | undefined;
+    try {
+      const catalog = await provider.fetchCatalog({ scope: "global", force: false });
+      const model = catalog.models.find((entry) => entry.isDefault)!;
+      const config = {
+        provider: "codex",
+        cwd,
+        model: model.id,
+        modeId: "full-access",
+        thinkingOptionId: "low",
+      };
+      const initialProcesses: ChildProcessWithoutNullStreams[] = [];
+      const initial = new CodexAppServerAgentSession(config, null, logger, async () => {
+        const child = spawn("codex", ["app-server"], { stdio: ["pipe", "pipe", "pipe"] });
+        initialProcesses.push(child);
+        return child;
+      });
+      active = initial;
+      await initial.connect();
+      const reply = await active.run(
+        "Reply with exactly HISTORY_REMAINS_READ_ONLY. Do not use tools.",
+      );
+      expect(reply.finalText).toContain("HISTORY_REMAINS_READ_ONLY");
+      const handle = active.describePersistence()!;
+      await active.close();
+      active = undefined;
+      expect(
+        initialProcesses.every((child) => child.exitCode !== null || child.signalCode !== null),
+      ).toBe(true);
+      if (nativeArchived) await provider.archiveNativeSession(handle);
+
+      const nativePath = await readNativeThreadPath(handle.sessionId);
+      expect(nativePath.includes(`${path.sep}archived_sessions${path.sep}`)).toBe(nativeArchived);
+      history = new CodexAppServerAgentSession(
+        config,
+        handle,
+        logger,
+        async () => {
+          const child = spawn("codex", ["app-server"], { stdio: ["pipe", "pipe", "pipe"] });
+          spawned.push(child);
+          return child;
+        },
+        {},
+        false,
+        false,
+        false,
+        undefined,
+        "history",
+      );
+      await history.connect();
+      const text: string[] = [];
+      for await (const event of history.streamHistory()) {
+        if (event.type === "timeline" && event.item.type === "assistant_message")
+          text.push(event.item.text);
+      }
+      expect(text.join("\n")).toContain("HISTORY_REMAINS_READ_ONLY");
+      expect(spawned).toHaveLength(1);
+      expect(
+        spawned.filter((child) => child.exitCode === null && child.signalCode === null),
+      ).toEqual([]);
+
+      expect(await readNativeThreadPath(handle.sessionId)).toBe(nativePath);
+
+      // Native unarchive is possible after reading history; history held no writer.
+      await provider.unarchiveNativeSession(handle);
+      active = await provider.resumeSession(handle, config);
+      expect(active.describePersistence()?.sessionId).toBe(handle.sessionId);
+      const followUp = await active.run(
+        "Repeat exactly your previous assistant reply from this conversation. Do not use tools.",
+      );
+      expect(followUp.finalText).toContain("HISTORY_REMAINS_READ_ONLY");
+      expect(active.describePersistence()?.sessionId).toBe(handle.sessionId);
+    } finally {
+      await history?.close();
+      await active?.close();
+      await rm(cwd, { recursive: true, force: true });
+    }
+  },
+  120_000,
+);
+
+test.runIf(process.env.PASEO_NATIVE_ARCHIVE_QA === "1")(
+  "a failed Codex history read releases its temporary process",
+  async () => {
+    const spawned: ChildProcessWithoutNullStreams[] = [];
+    const session = new CodexAppServerAgentSession(
+      { provider: "codex", cwd: tmpdir() },
+      { sessionId: "00000000-0000-4000-8000-000000000001" },
+      createTestLogger(),
+      async () => {
+        const child = spawn("codex", ["app-server"], { stdio: ["pipe", "pipe", "pipe"] });
+        spawned.push(child);
+        return child;
+      },
+      {},
+      false,
+      false,
+      false,
+      undefined,
+      "history",
+    );
+    try {
+      await expect(session.connect()).rejects.toThrow();
+      expect(spawned).toHaveLength(1);
+      expect(spawned.every((child) => child.exitCode !== null || child.signalCode !== null)).toBe(
+        true,
+      );
+    } finally {
+      await session.close();
+    }
+  },
+  30_000,
+);
diff --git a/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts b/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
index a6c5d2a8b2..5c9dbe956c 100644
--- a/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
+++ b/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
 import {
@@ -22,6 +22,39 @@ describe("Codex app-server transport", () => {
     child.stdin.end();
   });
 
+  test("dispose rejects pending requests instead of leaving them hanging", async () => {
+    const child = createCodexAppServerChildProcess();
+    const client = new CodexAppServerClient(child, createTestLogger());
+
+    const request = client.request("initialize", {});
+    await client.dispose();
+
+    await expect(request).rejects.toThrow("Codex app-server client is closed");
+  });
+
+  test("dispose rejects until the child has actually exited", async () => {
+    vi.useFakeTimers();
+    const child = createCodexAppServerChildProcess();
+    child.kill = () => true;
+    const client = new CodexAppServerClient(child, createTestLogger());
+    try {
+      for (let i = 0; i < 2; i++) {
+        const closing = expect(client.dispose()).rejects.toThrow(
+          "did not report exit after SIGKILL",
+        );
+        await vi.advanceTimersByTimeAsync(3_000);
+        await closing;
+      }
+      child.exitCode = 0;
+      child.emit("exit", 0, null);
+      await expect(client.dispose()).resolves.toBeUndefined();
+    } finally {
+      vi.useRealTimers();
+      child.stdout.end();
+      child.stderr.end();
+    }
+  });
+
   test.each([
     "item/commandExecution/requestApproval",
     "item/fileChange/requestApproval",
diff --git a/packages/server/src/server/agent/providers/codex/app-server-transport.ts b/packages/server/src/server/agent/providers/codex/app-server-transport.ts
index e143cd6863..1720118c63 100644
--- a/packages/server/src/server/agent/providers/codex/app-server-transport.ts
+++ b/packages/server/src/server/agent/providers/codex/app-server-transport.ts
@@ -257,10 +257,10 @@ export class CodexAppServerClient {
   }
 
   async dispose(): Promise<void> {
-    if (this.disposed) return;
     this.disposed = true;
     this.unexpectedTerminationHandler = null;
     this.rl.close();
+    this.rejectPending(new Error("Codex app-server client is closed"));
     try {
       this.child.stdin.end();
     } catch {
@@ -277,10 +277,7 @@ export class CodexAppServerClient {
       },
     });
     if (result === "kill-timeout") {
-      this.logger.warn(
-        { timeoutMs: APP_SERVER_FORCE_SHUTDOWN_TIMEOUT_MS },
-        "Codex app-server did not report exit after SIGKILL",
-      );
+      throw new Error("Codex app-server did not report exit after SIGKILL");
     }
   }
 
@@ -290,11 +287,7 @@ export class CodexAppServerClient {
     }
     this.disposed = true;
     this.rl.close();
-    for (const pending of this.pending.values()) {
-      clearTimeout(pending.timer);
-      pending.reject(error);
-    }
-    this.pending.clear();
+    this.rejectPending(error);
     const handler = this.unexpectedTerminationHandler;
     this.unexpectedTerminationHandler = null;
     if (!handler) {
@@ -307,6 +300,14 @@ export class CodexAppServerClient {
     }
   }
 
+  private rejectPending(error: Error): void {
+    for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
+      pending.reject(error);
+    }
+    this.pending.clear();
+  }
+
   private writeJsonRpcResponse(response: JsonRpcResponse): void {
     if (this.disposed || this.child.stdin.destroyed || !this.child.stdin.writable) {
       return;
diff --git a/packages/server/src/server/agent/providers/codex/async-questions.ts b/packages/server/src/server/agent/providers/codex/async-questions.ts
new file mode 100644
index 0000000000..6fdba7b67e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/codex/async-questions.ts
@@ -0,0 +1,155 @@
+import { z } from "zod";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  ToolCallTimelineItem,
+} from "../../agent-sdk-types.js";
+
+const QuestionSchema = z.object({
+  title: z.string().trim().min(1),
+  options: z.array(z.string().min(1)).nullish(),
+});
+const ItemSchema = z.object({
+  type: z.literal("agentMessage"),
+  id: z.string().min(1),
+  delivery: z.literal("async"),
+  questions: z.array(QuestionSchema).min(1),
+});
+const RecordSchema = z.object({
+  item: ItemSchema,
+  resolution: z.union([z.literal("dismissed"), z.array(z.string())]).optional(),
+});
+type QuestionRecord = z.infer<typeof RecordSchema>;
+
+function requestId(itemId: string): string {
+  return `permission-${itemId}`;
+}
+
+function toPermission(record: QuestionRecord): AgentPermissionRequest {
+  return {
+    id: requestId(record.item.id),
+    provider: "codex",
+    name: "request_user_input_async",
+    kind: "question",
+    title: "Question",
+    input: {
+      questions: record.item.questions.map((question, index) => ({
+        id: String(index),
+        header: `Question ${index + 1}`,
+        question: question.title,
+        options: (question.options ?? []).map((label) => ({ label })),
+        isOther: true,
+      })),
+    },
+  };
+}
+
+function toTimeline(record: QuestionRecord): ToolCallTimelineItem {
+  const answers = Array.isArray(record.resolution) ? record.resolution : undefined;
+  return {
+    type: "tool_call",
+    callId: record.item.id,
+    name: "request_user_input_async",
+    status: "completed",
+    error: null,
+    detail: {
+      type: "plain_text",
+      icon: "brain",
+      text:
+        record.item.questions
+          .map((question, index) =>
+            [question.title, answers ? answers[index] : (question.options ?? []).join(", ")]
+              .filter(Boolean)
+              .join("\n"),
+          )
+          .join("\n\n") + (record.resolution === "dismissed" ? "\n\nDismissed" : ""),
+    },
+  };
+}
+
+export function codexAsyncQuestionToTimeline(item: unknown): ToolCallTimelineItem | null {
+  const parsed = ItemSchema.safeParse(item);
+  return parsed.success ? toTimeline({ item: parsed.data }) : null;
+}
+
+/** Codex emits these as completed messages; the outstanding answer belongs to the session. */
+export class CodexAsyncQuestions {
+  private readonly records = new Map<string, QuestionRecord>();
+
+  constructor(saved: unknown) {
+    const parsed = z.array(RecordSchema).safeParse(saved);
+    if (parsed.success) {
+      for (const record of parsed.data) this.records.set(requestId(record.item.id), record);
+    }
+  }
+
+  receive(item: unknown): AgentPermissionRequest | null {
+    const parsed = ItemSchema.safeParse(item);
+    if (!parsed.success || this.records.has(requestId(parsed.data.id))) return null;
+    const record = { item: parsed.data };
+    this.records.set(requestId(parsed.data.id), record);
+    return toPermission(record);
+  }
+
+  pending(): AgentPermissionRequest[] {
+    return Array.from(this.records.values())
+      .filter((record) => record.resolution === undefined)
+      .map(toPermission);
+  }
+
+  hasPending(id: string): boolean {
+    const record = this.records.get(id);
+    return record !== undefined && record.resolution === undefined;
+  }
+
+  prepareResponse(
+    id: string,
+    response: AgentPermissionResponse,
+  ): { prompt?: string; complete: () => ToolCallTimelineItem } {
+    const record = this.records.get(id);
+    if (!record || record.resolution !== undefined)
+      throw new Error("Question is no longer pending");
+    let resolution: QuestionRecord["resolution"] = "dismissed";
+    let prompt: string | undefined;
+    if (response.behavior === "allow") {
+      const answers = z.record(z.string(), z.string()).parse(response.updatedInput?.answers);
+      resolution = record.item.questions.map((_, index) => {
+        const answer = answers[`Question ${index + 1}`]?.trim();
+        if (!answer) throw new Error(`Answer Question ${index + 1} before submitting`);
+        return answer;
+      });
+      const values = resolution;
+      prompt =
+        "Answers to your questions:\n\n" +
+        record.item.questions
+          .map((question, index) => `${question.title}\n${values[index]}`)
+          .join("\n\n");
+    }
+    return {
+      prompt,
+      complete: () => {
+        record.resolution = resolution;
+        return toTimeline(record);
+      },
+    };
+  }
+
+  timeline(itemId: string): ToolCallTimelineItem | null {
+    const record = this.records.get(requestId(itemId));
+    return record ? toTimeline(record) : null;
+  }
+
+  retain(itemIds: ReadonlySet<string>): string[] {
+    const removedPendingIds: string[] = [];
+    for (const [id, record] of this.records) {
+      if (itemIds.has(record.item.id)) continue;
+      this.records.delete(id);
+      if (record.resolution === undefined) removedPendingIds.push(id);
+    }
+    return removedPendingIds;
+  }
+
+  serialize(): unknown {
+    return Array.from(this.records.values());
+  }
+}
diff --git a/packages/server/src/server/agent/providers/codex/rewind.test.ts b/packages/server/src/server/agent/providers/codex/rewind.test.ts
index 923b8074bb..da7fe6a8f5 100644
--- a/packages/server/src/server/agent/providers/codex/rewind.test.ts
+++ b/packages/server/src/server/agent/providers/codex/rewind.test.ts
@@ -96,6 +96,7 @@ describe("Codex Rewind", () => {
       model: "gpt-5.4-mini",
       serviceTier: null,
       userMessageTurns,
+      threadRollbackAvailable: true,
       setThreadId: (threadId) => {
         reboundThreadId = threadId;
       },
@@ -131,6 +132,7 @@ describe("Codex Rewind", () => {
       threadId: "source-thread",
       messageId: "codex-second",
       userMessageTurns,
+      threadRollbackAvailable: true,
       setThreadId: (threadId) => {
         reboundThreadId = threadId;
       },
@@ -175,6 +177,7 @@ describe("Codex Rewind", () => {
       model: "gpt-5.4-mini",
       serviceTier: null,
       userMessageTurns,
+      threadRollbackAvailable: true,
       setThreadId: (threadId) => {
         reboundThreadId = threadId;
       },
@@ -218,6 +221,7 @@ describe("Codex Rewind", () => {
         model: "gpt-5.4-mini",
         serviceTier: null,
         userMessageTurns,
+        threadRollbackAvailable: true,
         setThreadId: (threadId) => {
           reboundThreadId = threadId;
         },
@@ -239,6 +243,7 @@ describe("Codex Rewind", () => {
         threadId: "source-thread",
         messageId: "missing-message",
         userMessageTurns,
+        threadRollbackAvailable: true,
         setThreadId: () => undefined,
       }),
     ).rejects.toThrow("Codex could not find user message missing-message");
diff --git a/packages/server/src/server/agent/providers/codex/rewind.ts b/packages/server/src/server/agent/providers/codex/rewind.ts
index f3573c58a8..021d57645c 100644
--- a/packages/server/src/server/agent/providers/codex/rewind.ts
+++ b/packages/server/src/server/agent/providers/codex/rewind.ts
@@ -67,7 +67,9 @@ export async function revertCodexConversation(input: {
   cwd?: string | null;
   model?: string | null;
   serviceTier?: string | null;
+  config?: Record<string, unknown> | null;
   userMessageTurns: CodexUserMessageTurnIndex;
+  threadRollbackAvailable: boolean;
   setThreadId: (threadId: string) => void | Promise<void>;
 }): Promise<void> {
   if (!input.threadId) {
@@ -85,34 +87,37 @@ export async function revertCodexConversation(input: {
     throw new Error(`Codex user message ${input.messageId} is outside the current thread`);
   }
 
-  const historyMode = await readCodexThreadHistoryMode(input.client, input.threadId);
-  if (historyMode === "paginated") {
+  // Codex does not carry the parent thread's config into a fork; without it the
+  // forked thread falls back to the default model provider.
+  const forkParams: CodexThreadForkParams = {
+    threadId: input.threadId,
+    cwd: input.cwd ?? null,
+    model: input.model ?? null,
+    serviceTier: input.serviceTier ?? null,
+    ...(input.config ? { config: input.config } : {}),
+    excludeTurns: false,
+    persistExtendedHistory: true,
+  };
+
+  if (
+    !input.threadRollbackAvailable ||
+    (await readCodexThreadHistoryMode(input.client, input.threadId)) === "paginated"
+  ) {
     if (!targetTurn.turnId) {
       throw new Error(`Codex could not find the turn containing user message ${input.messageId}`);
     }
     const forked = await forkCodexThread(input.client, {
-      threadId: input.threadId,
+      ...forkParams,
       beforeTurnId: targetTurn.turnId,
-      cwd: input.cwd ?? null,
-      model: input.model ?? null,
-      serviceTier: input.serviceTier ?? null,
-      excludeTurns: false,
-      persistExtendedHistory: true,
     });
     await input.setThreadId(forked.thread.id);
     return;
   }
 
-  // Fork is non-destructive: the old thread file stays on disk and remains
+  // Legacy threads on Codex before 0.156 fork and then roll back. Fork is
+  // non-destructive: the old thread file stays on disk and remains
   // recoverable with `codex resume <old-uuid>` if the rewind target was wrong.
-  const forked = await forkCodexThread(input.client, {
-    threadId: input.threadId,
-    cwd: input.cwd ?? null,
-    model: input.model ?? null,
-    serviceTier: input.serviceTier ?? null,
-    excludeTurns: false,
-    persistExtendedHistory: true,
-  });
+  const forked = await forkCodexThread(input.client, forkParams);
   const forkedThreadId = forked.thread.id;
 
   // Codex rollback is chat-only by design. File edits from rewound turns stay
diff --git a/packages/server/src/server/agent/providers/codex/test-utils/fake-app-server.ts b/packages/server/src/server/agent/providers/codex/test-utils/fake-app-server.ts
index 3f4a7af01c..226eeb9738 100644
--- a/packages/server/src/server/agent/providers/codex/test-utils/fake-app-server.ts
+++ b/packages/server/src/server/agent/providers/codex/test-utils/fake-app-server.ts
@@ -25,6 +25,13 @@ interface FakeSilentCommand {
   command: string;
   cwd: string;
 }
+interface FakeTerminalCommand {
+  threadId: string;
+  turnId: string;
+  itemId: string;
+  processId: string;
+  command: string;
+}
 interface FakeTerminalInput {
   threadId: string;
   turnId: string;
@@ -81,17 +88,20 @@ export interface FakeCodexAppServer {
   completesCommand(params: FakeLegacyCommand): void;
   completesSilentCommand(params: FakeSilentCommand): void;
   completesSilentLegacyCommand(params: FakeSilentCommand): void;
+  startsTerminalCommand(params: FakeTerminalCommand): void;
   typesIntoTerminal(params: FakeTerminalInput): void;
   says(params: { threadId: string; itemId?: string; text: string; chunks?: string[] }): void;
   requestCommandApproval(params: {
     itemId: string;
+    approvalId?: string;
     threadId: string;
     turnId: string;
     command: string;
     cwd: string;
     reason: string;
   }): void;
-  waitForCommandApprovalDecision(itemId: string): Promise<unknown>;
+  /** Keyed by `approvalId` when the request carried one, otherwise by `itemId`. */
+  waitForCommandApprovalDecision(callbackId: string): Promise<unknown>;
   requestFileChangeApproval(params: {
     itemId: string;
     threadId: string;
@@ -485,6 +495,19 @@ export function createFakeCodexAppServer(
         success: true,
       });
     },
+    startsTerminalCommand(params) {
+      writeNotification("item/started", {
+        threadId: params.threadId,
+        turnId: params.turnId,
+        item: {
+          type: "commandExecution",
+          id: params.itemId,
+          status: "inProgress",
+          command: params.command,
+          processId: params.processId,
+        },
+      });
+    },
     typesIntoTerminal(params) {
       writeNotification("item/commandExecution/terminalInteraction", {
         threadId: params.threadId,
@@ -518,7 +541,7 @@ export function createFakeCodexAppServer(
     requestCommandApproval(params) {
       const requestId = nextServerRequestId;
       nextServerRequestId += 1;
-      approvalRequestIds.set(params.itemId, requestId);
+      approvalRequestIds.set(params.approvalId ?? params.itemId, requestId);
       child.stdout.write(
         `${JSON.stringify({
           jsonrpc: "2.0",
@@ -528,8 +551,8 @@ export function createFakeCodexAppServer(
         })}\n`,
       );
     },
-    async waitForCommandApprovalDecision(itemId) {
-      return await this.waitForApprovalDecision(itemId);
+    async waitForCommandApprovalDecision(callbackId) {
+      return await this.waitForApprovalDecision(callbackId);
     },
     requestFileChangeApproval(params) {
       const requestId = nextServerRequestId;
@@ -618,7 +641,7 @@ function toJsonObject(value: unknown): JsonObject {
 type StreamEventType = AgentStreamEvent["type"];
 type StreamEventOfType<TType extends StreamEventType> = Extract<AgentStreamEvent, { type: TType }>;
 
-function waitForNextEvent<TType extends StreamEventType>(
+export function waitForNextEvent<TType extends StreamEventType>(
   session: AgentSession,
   type: TType,
   accepts?: (event: StreamEventOfType<TType>) => boolean,
diff --git a/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts b/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts
index 6ce2d4fe13..566fd10083 100644
--- a/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts
@@ -656,6 +656,29 @@ describe("codex tool-call mapper", () => {
     });
   });
 
+  it.each([
+    {
+      type: "commandExecution",
+      id: "codex-declined-command",
+      status: "declined",
+      command: "printf ok > /outside/permission.txt",
+      cwd: "/tmp/repo",
+      aggregatedOutput: null,
+      exitCode: null,
+    },
+    {
+      type: "fileChange",
+      id: "codex-declined-patch",
+      status: "declined",
+      changes: [],
+    },
+  ])("settles a declined $type as failed instead of running", (threadItem) => {
+    const item = expectMapped(mapCodexToolCallFromThreadItem(threadItem));
+
+    expect(item.callId).toBe(threadItem.id);
+    expect(item.status).toBe("failed");
+  });
+
   it("maps unknown tools to unknown detail with raw payloads", () => {
     const item = expectMapped(
       mapCodexToolCallEnvelope({
diff --git a/packages/server/src/server/agent/providers/codex/tool-call-mapper.ts b/packages/server/src/server/agent/providers/codex/tool-call-mapper.ts
index 2f274d2d3f..64629bc5d9 100644
--- a/packages/server/src/server/agent/providers/codex/tool-call-mapper.ts
+++ b/packages/server/src/server/agent/providers/codex/tool-call-mapper.ts
@@ -245,7 +245,7 @@ function isWindowsShellCommand(command: string): boolean {
   return /(?:^|\\)(?:pwsh|powershell|cmd)(?:\.exe)?$/i.test(normalized);
 }
 
-function normalizeCommandExecutionCommand(value: unknown): string | undefined {
+export function normalizeCommandExecutionCommand(value: unknown): string | undefined {
   if (typeof value === "string") {
     const normalized = unwrapShellCommand(value);
     return normalized.length > 0 ? normalized : undefined;
diff --git a/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts b/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
index a38fb77128..bd43d913e8 100644
--- a/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
@@ -1,22 +1,42 @@
+import type { SessionConfigOption } from "@agentclientprotocol/sdk";
 import { describe, expect, test, vi } from "vitest";
 
+import { ACPAgentSession } from "./acp-agent.js";
 import type { SpawnedACPProcess, SessionStateResponse } from "./acp-agent.js";
+import type { AgentSessionConfig } from "../agent-sdk-types.js";
 import { CURSOR_FAST_FEATURE_OPTION, CursorACPAgentClient } from "./cursor-acp-agent.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 
+function captureWarnings(): {
+  logger: ReturnType<typeof createTestLogger>;
+  messages: () => string[];
+} {
+  const logged: string[] = [];
+  const logger = createTestLogger();
+  const child = {
+    trace: vi.fn(),
+    warn: (_context: unknown, message: string) => logged.push(message),
+  };
+  vi.spyOn(logger, "child").mockReturnValue(
+    child as unknown as ReturnType<typeof createTestLogger>,
+  );
+  return { logger, messages: () => logged };
+}
+
+function fastConfigOption(currentValue: "false" | "true"): SessionConfigOption {
+  return {
+    id: "fast",
+    name: "Fast",
+    type: "select",
+    currentValue,
+    options: [
+      { value: "false", name: "Off" },
+      { value: "true", name: "Fast" },
+    ],
+  };
+}
+
 describe("CursorACPAgentClient model discovery", () => {
-  function fastConfigOption(currentValue: "false" | "true") {
-    return {
-      id: "fast",
-      name: "Fast",
-      type: "select" as const,
-      currentValue,
-      options: [
-        { value: "false", name: "Off" },
-        { value: "true", name: "Fast" },
-      ],
-    };
-  }
   class TestCursorACPAgentClient extends CursorACPAgentClient {
     constructor(response: SessionStateResponse) {
       super({
@@ -33,6 +53,13 @@ describe("CursorACPAgentClient model discovery", () => {
         child: { kill: vi.fn(), exitCode: 0, signalCode: null, once: vi.fn() },
         connection: {
           newSession: vi.fn().mockResolvedValue(this.response),
+          extMethod: async () => ({
+            models: (this.response.models?.availableModels ?? []).map((model) => ({
+              value: model.modelId,
+              name: model.name,
+              configOptions: [],
+            })),
+          }),
         },
         initialize: { agentCapabilities: {} },
       } as SpawnedACPProcess;
@@ -174,3 +201,157 @@ describe("CursorACPAgentClient model discovery", () => {
     ]);
   });
 });
+
+describe("CursorACPAgentClient session start", () => {
+  // Kimi K3 exposes reasoning but no fast option.
+  const KIMI_K3_CONFIG_OPTIONS: SessionConfigOption[] = [
+    {
+      id: "reasoning",
+      name: "Reasoning",
+      category: "thought_level",
+      type: "select",
+      currentValue: "max",
+      options: [
+        { value: "low", name: "Low" },
+        { value: "high", name: "High" },
+        { value: "max", name: "Max" },
+      ],
+    },
+  ];
+
+  function createCursorSession(
+    config: Partial<AgentSessionConfig>,
+    session: {
+      currentModelId: string;
+      configOptions: SessionConfigOption[];
+      setSessionConfigOption?: () => Promise<{ configOptions: SessionConfigOption[] }>;
+    } = { currentModelId: "kimi-k3", configOptions: KIMI_K3_CONFIG_OPTIONS },
+    logger = createTestLogger(),
+  ): ACPAgentSession {
+    class StubbedCursorSession extends ACPAgentSession {
+      protected override async spawnProcess(): Promise<SpawnedACPProcess> {
+        return {
+          child: { kill: vi.fn(), exitCode: 0, signalCode: null, once: vi.fn() },
+          connection: {
+            newSession: vi.fn().mockResolvedValue({
+              sessionId: "session-1",
+              models: {
+                currentModelId: session.currentModelId,
+                availableModels: [
+                  { modelId: "composer-2.5", name: "Composer 2.5", description: null },
+                  { modelId: "kimi-k3", name: "Kimi K3", description: null },
+                ],
+              },
+              configOptions: session.configOptions,
+            }),
+            // cursor-agent switches the model without returning refreshed config options.
+            unstable_setSessionModel: vi.fn().mockResolvedValue(undefined),
+            setSessionConfigOption:
+              session.setSessionConfigOption ??
+              vi.fn().mockResolvedValue({ configOptions: session.configOptions }),
+          },
+          initialize: { agentCapabilities: {} },
+        } as SpawnedACPProcess;
+      }
+    }
+
+    return new StubbedCursorSession(
+      { provider: "acp", cwd: "/tmp/cursor", ...config },
+      {
+        provider: "acp",
+        logger,
+        defaultCommand: ["cursor-agent", "acp"],
+        defaultModes: [],
+        capabilities: { supportsStreaming: true, supportsSessionPersistence: true },
+        configFeatureOptions: [CURSOR_FAST_FEATURE_OPTION],
+      },
+    );
+  }
+
+  test("starts on a model without a fast variant while Fast is still stored", async () => {
+    // The composer stored Fast while a fast-capable model was selected, and it is
+    // still stored after the draft moved to a model that has no fast variant.
+    const warn = captureWarnings();
+    const session = createCursorSession(
+      { model: "kimi-k3", featureValues: { [CURSOR_FAST_FEATURE_OPTION.id]: "true" } },
+      { currentModelId: "kimi-k3", configOptions: KIMI_K3_CONFIG_OPTIONS },
+      warn.logger,
+    );
+
+    await session.initializeNewSession();
+
+    expect(session.id).toBe("session-1");
+    expect(warn.messages()).toContain(
+      "acp cannot apply ACP feature 'fast' to the current model; using the provider default",
+    );
+  });
+
+  test("starts when the CLI rejects a stored feature the switched-to model dropped", async () => {
+    // The CLI keeps the pre-switch config options for the session, so Fast is
+    // still listed after the model moves to one that has no fast variant.
+    const warn = captureWarnings();
+    const session = createCursorSession(
+      { model: "kimi-k3", featureValues: { [CURSOR_FAST_FEATURE_OPTION.id]: "true" } },
+      {
+        currentModelId: "composer-2.5",
+        configOptions: [fastConfigOption("false"), ...KIMI_K3_CONFIG_OPTIONS],
+        setSessionConfigOption: vi.fn().mockRejectedValue(
+          Object.assign(new Error("Invalid params"), {
+            code: -32602,
+            data: { message: "Unknown model config option: fast" },
+          }),
+        ),
+      },
+      warn.logger,
+    );
+
+    await session.initializeNewSession();
+
+    expect(session.id).toBe("session-1");
+    expect(warn.messages()).toContain(
+      "acp cannot apply ACP feature 'fast' to the current model; using the provider default",
+    );
+  });
+
+  test("still fails session start when a stored feature write fails for another reason", async () => {
+    const session = createCursorSession(
+      { model: "kimi-k3", featureValues: { [CURSOR_FAST_FEATURE_OPTION.id]: "true" } },
+      {
+        currentModelId: "composer-2.5",
+        configOptions: [fastConfigOption("false"), ...KIMI_K3_CONFIG_OPTIONS],
+        setSessionConfigOption: vi.fn().mockRejectedValue(new Error("write EPIPE")),
+      },
+    );
+
+    await expect(session.initializeNewSession()).rejects.toThrow("write EPIPE");
+  });
+
+  test("reports the failure when the user turns Fast on for a model without it", async () => {
+    const session = createCursorSession({ model: "kimi-k3" });
+    await session.initializeNewSession();
+
+    await expect(session.setFeature(CURSOR_FAST_FEATURE_OPTION.id, "true")).rejects.toThrow(
+      "acp does not expose ACP feature 'fast'",
+    );
+  });
+
+  test("still fails session start when the provider rejects a write it should accept", async () => {
+    // No model switch, so the session's options came straight from session/new and the
+    // provider disagreeing about a feature it just advertised is a real failure.
+    const session = createCursorSession(
+      { model: "composer-2.5", featureValues: { [CURSOR_FAST_FEATURE_OPTION.id]: "true" } },
+      {
+        currentModelId: "composer-2.5",
+        configOptions: [fastConfigOption("false")],
+        setSessionConfigOption: vi.fn().mockRejectedValue(
+          Object.assign(new Error("Invalid params"), {
+            code: -32602,
+            data: { message: "sessionId is required" },
+          }),
+        ),
+      },
+    );
+
+    await expect(session.initializeNewSession()).rejects.toThrow("Invalid params");
+  });
+});
diff --git a/packages/server/src/server/agent/providers/cursor-acp-agent.ts b/packages/server/src/server/agent/providers/cursor-acp-agent.ts
index 6dce76c973..0b5b9ac4ec 100644
--- a/packages/server/src/server/agent/providers/cursor-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/cursor-acp-agent.ts
@@ -1,6 +1,13 @@
+import { zSessionConfigOption } from "@agentclientprotocol/sdk/dist/schema/zod.gen.js";
 import type { Logger } from "pino";
+import { z } from "zod";
 
-import type { ACPConfigFeatureOption } from "./acp-agent.js";
+import type { AgentModelDefinition } from "../agent-sdk-types.js";
+import {
+  deriveSelectorOptions,
+  type ACPCatalogModelResolverContext,
+  type ACPConfigFeatureOption,
+} from "./acp-agent.js";
 import { GenericACPAgentClient } from "./generic-acp-agent.js";
 
 interface CursorACPAgentClientOptions {
@@ -9,7 +16,6 @@ interface CursorACPAgentClientOptions {
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
-  providerParams?: unknown;
 }
 
 const CURSOR_INITIAL_COMMANDS_WAIT_TIMEOUT_MS = 10_000;
@@ -26,6 +32,58 @@ export const CURSOR_FAST_FEATURE_OPTION: ACPConfigFeatureOption = {
   icon: "zap",
 };
 
+const CursorModelCatalogSchema = z.object({
+  models: z.array(
+    z.object({
+      value: z.string().min(1),
+      name: z.string(),
+      configOptions: z.array(zSessionConfigOption),
+    }),
+  ),
+});
+
+// Cursor model switches persist CLI preferences, even in a throwaway probe session.
+// Its extension returns each model's parameter definitions without selecting it.
+export async function resolveCursorCatalogModels({
+  connection,
+  models,
+  provider,
+  runRequest,
+}: ACPCatalogModelResolverContext): Promise<AgentModelDefinition[]> {
+  const catalog = await runRequest(() => fetchCursorModelCatalog(connection));
+  const currentModelId = models.find((model) => model.isDefault)?.id;
+
+  return catalog.models.map((model) => {
+    const thinkingOptions = deriveSelectorOptions(model.configOptions, "thought_level");
+    const defaultThinkingOptionId = thinkingOptions.find((option) => option.isDefault)?.id;
+    return {
+      provider,
+      id: model.value,
+      label: model.name,
+      isDefault: model.value === currentModelId,
+      thinkingOptions: thinkingOptions.length > 0 ? thinkingOptions : undefined,
+      defaultThinkingOptionId,
+    };
+  });
+}
+
+async function fetchCursorModelCatalog(connection: ACPCatalogModelResolverContext["connection"]) {
+  try {
+    const response = await connection.extMethod("cursor/list_available_models", {});
+    return CursorModelCatalogSchema.parse(response);
+  } catch (error) {
+    const extensionUnavailable =
+      typeof error === "object" && error !== null && "code" in error && error.code === -32601;
+    if (extensionUnavailable) {
+      throw new Error(
+        "Update Cursor CLI: this version does not support cursor/list_available_models.",
+        { cause: error },
+      );
+    }
+    throw error;
+  }
+}
+
 export class CursorACPAgentClient extends GenericACPAgentClient {
   constructor(options: CursorACPAgentClientOptions) {
     super({
@@ -34,12 +92,12 @@ export class CursorACPAgentClient extends GenericACPAgentClient {
       env: options.env,
       providerId: options.providerId,
       label: options.label,
-      providerParams: options.providerParams,
       // cursor-agent publishes slash commands asynchronously via available_commands_update.
       waitForInitialCommands: true,
       initialCommandsWaitTimeoutMs: CURSOR_INITIAL_COMMANDS_WAIT_TIMEOUT_MS,
       clientCapabilityMeta: CURSOR_CLIENT_CAPABILITY_META,
       configFeatureOptions: [CURSOR_FAST_FEATURE_OPTION],
+      catalogModelResolver: resolveCursorCatalogModels,
     });
   }
 }
diff --git a/packages/server/src/server/agent/providers/cursor-acp-catalog.test.ts b/packages/server/src/server/agent/providers/cursor-acp-catalog.test.ts
new file mode 100644
index 0000000000..9facfda374
--- /dev/null
+++ b/packages/server/src/server/agent/providers/cursor-acp-catalog.test.ts
@@ -0,0 +1,213 @@
+import type { SessionConfigOption } from "@agentclientprotocol/sdk";
+import { expect, test } from "vitest";
+import { ZodError } from "zod";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { deriveModelDefinitionsFromACP, type ACPCatalogModelResolverContext } from "./acp-agent.js";
+import { resolveCursorCatalogModels } from "./cursor-acp-agent.js";
+
+const modelOption: SessionConfigOption = {
+  id: "model",
+  name: "Model",
+  category: "model",
+  type: "select",
+  currentValue: "claude-haiku-4-5",
+  options: [
+    { value: "claude-haiku-4-5", name: "Haiku 4.5" },
+    { value: "grok-4.6", name: "Grok 4.6" },
+  ],
+};
+
+const booleanThinking: SessionConfigOption = {
+  id: "thinking",
+  name: "Thinking",
+  category: "thought_level",
+  type: "select",
+  currentValue: "true",
+  options: [
+    { value: "false", name: "Off" },
+    { value: "true", name: "On" },
+  ],
+};
+
+const effortThinking: SessionConfigOption = {
+  id: "effort",
+  name: "Effort",
+  category: "thought_level",
+  type: "select",
+  currentValue: "xhigh",
+  options: [
+    { value: "low", name: "Low" },
+    { value: "medium", name: "Medium" },
+    { value: "high", name: "High" },
+    { value: "xhigh", name: "Extra High" },
+  ],
+};
+
+class CursorCatalogConnection {
+  selectedModel = "claude-haiku-4-5";
+  selectionHistory = ["claude-haiku-4-5"];
+  error: unknown = null;
+  catalog: Record<string, unknown> = {
+    models: [
+      { value: "claude-haiku-4-5", name: "Haiku 4.5", configOptions: [booleanThinking] },
+      { value: "grok-4.6", name: "Grok 4.6", configOptions: [effortThinking] },
+    ],
+  };
+
+  async extMethod(method: string, params: Record<string, unknown>) {
+    if (method !== "cursor/list_available_models" || Object.keys(params).length !== 0) {
+      throw new Error(`Unsupported catalog request: ${method}`);
+    }
+    if (this.error) throw this.error;
+    return this.catalog;
+  }
+
+  async setSessionConfigOption({ value }: { value: string }) {
+    this.selectedModel = value;
+    this.selectionHistory.push(value);
+    const thinking = value === "grok-4.6" ? effortThinking : booleanThinking;
+    return { configOptions: [thinking] };
+  }
+}
+
+function createCatalogContext(
+  connection: CursorCatalogConnection,
+  configOptions: SessionConfigOption[] = [modelOption, booleanThinking],
+): ACPCatalogModelResolverContext {
+  return {
+    connection,
+    sessionId: "catalog-session",
+    models: deriveModelDefinitionsFromACP("acp", null, configOptions),
+    configOptions,
+    runRequest: (request) => request(),
+    transformConfigOptions: (options) => options,
+    logger: createTestLogger(),
+    provider: "acp",
+  };
+}
+
+test("lists each model's thinking options without changing Cursor preferences", async () => {
+  const connection = new CursorCatalogConnection();
+  const context = createCatalogContext(connection);
+
+  const models = await resolveCursorCatalogModels(context);
+
+  expect(connection.selectedModel).toBe("claude-haiku-4-5");
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+  expect(
+    models.map(({ id, isDefault, thinkingOptions, defaultThinkingOptionId }) => ({
+      id,
+      isDefault,
+      thinking: thinkingOptions?.map((option) => option.id),
+      defaultThinkingOptionId,
+    })),
+  ).toEqual([
+    {
+      id: "claude-haiku-4-5",
+      isDefault: true,
+      thinking: ["false", "true"],
+      defaultThinkingOptionId: "true",
+    },
+    {
+      id: "grok-4.6",
+      isDefault: false,
+      thinking: ["low", "medium", "high", "xhigh"],
+      defaultThinkingOptionId: "xhigh",
+    },
+  ]);
+});
+
+test("reports that Cursor must be updated when the model extension is unavailable", async () => {
+  const connection = new CursorCatalogConnection();
+  connection.error = { code: -32601, message: "Method not found" };
+
+  await expect(resolveCursorCatalogModels(createCatalogContext(connection))).rejects.toThrow(
+    "Update Cursor CLI",
+  );
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+});
+
+test("discovers thinking models when the session default has no thinking selector", async () => {
+  const connection = new CursorCatalogConnection();
+  const context = createCatalogContext(connection, [modelOption]);
+
+  const models = await resolveCursorCatalogModels(context);
+
+  expect(models[1].thinkingOptions?.map((option) => option.id)).toEqual([
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+  ]);
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+});
+
+test("uses the extension's complete catalog even when session/new lists only one model", async () => {
+  const connection = new CursorCatalogConnection();
+  const context = createCatalogContext(connection);
+  context.models = context.models.slice(0, 1);
+
+  const models = await resolveCursorCatalogModels(context);
+
+  expect(models.map((model) => model.id)).toEqual(["claude-haiku-4-5", "grok-4.6"]);
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+});
+
+test("does not copy session thinking options onto a model without a selector", async () => {
+  const connection = new CursorCatalogConnection();
+  connection.catalog = {
+    models: [{ value: "composer-2", name: "Composer", configOptions: [] }],
+  };
+
+  const models = await resolveCursorCatalogModels(createCatalogContext(connection));
+
+  expect(models).toEqual([
+    {
+      provider: "acp",
+      id: "composer-2",
+      label: "Composer",
+      isDefault: false,
+      thinkingOptions: undefined,
+      defaultThinkingOptionId: undefined,
+    },
+  ]);
+});
+
+test("keeps an empty extension catalog empty", async () => {
+  const connection = new CursorCatalogConnection();
+  connection.catalog = { models: [] };
+
+  await expect(resolveCursorCatalogModels(createCatalogContext(connection))).resolves.toEqual([]);
+});
+
+test.each([
+  {},
+  { models: [{ value: "grok-4.6", name: "Grok 4.6" }] },
+  {
+    models: [
+      {
+        value: "grok-4.6",
+        name: "Grok 4.6",
+        configOptions: [{ ...effortThinking, currentValue: 1 }],
+      },
+    ],
+  },
+])("rejects malformed extension responses: %j", async (catalog) => {
+  const connection = new CursorCatalogConnection();
+  connection.catalog = catalog;
+
+  await expect(resolveCursorCatalogModels(createCatalogContext(connection))).rejects.toBeInstanceOf(
+    ZodError,
+  );
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+});
+
+test("propagates extension failures without changing preferences or returning stale options", async () => {
+  const connection = new CursorCatalogConnection();
+  const error = new Error("Connection closed");
+  connection.error = error;
+
+  await expect(resolveCursorCatalogModels(createCatalogContext(connection))).rejects.toBe(error);
+  expect(connection.selectionHistory).toEqual(["claude-haiku-4-5"]);
+});
diff --git a/packages/server/src/server/agent/providers/custom-message.ts b/packages/server/src/server/agent/providers/custom-message.ts
new file mode 100644
index 0000000000..3dd15b2d9c
--- /dev/null
+++ b/packages/server/src/server/agent/providers/custom-message.ts
@@ -0,0 +1,26 @@
+import type { AgentTimelineItem } from "../agent-sdk-types.js";
+
+/** Preserve extension context as an expandable tool row instead of assistant speech. */
+export function mapCustomMessageToToolCall(
+  message: { role: "custom"; customType?: unknown; details?: unknown },
+  text: string,
+  callId: string,
+): Extract<AgentTimelineItem, { type: "tool_call" }> {
+  const customType =
+    typeof message.customType === "string" && message.customType.trim()
+      ? message.customType
+      : "custom-message";
+  return {
+    type: "tool_call",
+    callId,
+    name: customType,
+    status: "completed",
+    detail: { type: "plain_text", text },
+    metadata: {
+      synthetic: true,
+      customType,
+      ...(message.details === undefined ? {} : { details: message.details }),
+    },
+    error: null,
+  };
+}
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
new file mode 100644
index 0000000000..ec17dd7ecf
--- /dev/null
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
@@ -0,0 +1,154 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../agent-sdk-types.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
+
+describe("GenericACPAgentClient archived history", () => {
+  test("replays an archived session whose working directory was removed", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd, loadRequestsPath }) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "history" },
+      );
+      try {
+        expect(await collectTimelineText(session.streamHistory())).toEqual([
+          "user_message:What is in the README?",
+          "assistant_message:It describes the project.",
+        ]);
+        const loadRequests = JSON.parse(await readFile(loadRequestsPath, "utf8"));
+        expect(loadRequests).toEqual([{ sessionId: "archived-session", cwd: removedCwd }]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("replays an archived session whose working directory path is now a file", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd }) => {
+      await writeFile(removedCwd, "not a directory", "utf8");
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "history" },
+      );
+      try {
+        expect(await collectTimelineText(session.streamHistory())).toEqual([
+          "user_message:What is in the README?",
+          "assistant_message:It describes the project.",
+        ]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("still requires the working directory to resume a session that will run", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd }) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      await expect(
+        client.resumeSession(
+          { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+          undefined,
+          undefined,
+          { purpose: "interactive" },
+        ),
+      ).rejects.toThrow("ENOENT");
+    });
+  });
+});
+
+async function collectTimelineText(events: AsyncGenerator<AgentStreamEvent>): Promise<string[]> {
+  const text: string[] = [];
+  for await (const event of events) {
+    if (event.type !== "timeline") {
+      continue;
+    }
+    if (event.item.type === "user_message" || event.item.type === "assistant_message") {
+      text.push(`${event.item.type}:${event.item.text}`);
+    }
+  }
+  return text;
+}
+
+async function withFakeACPAgent(
+  run: (input: {
+    command: [string, ...string[]];
+    removedCwd: string;
+    loadRequestsPath: string;
+  }) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-archived-history-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    const loadRequestsPath = path.join(testDir, "load-requests.json");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run({
+      command: [process.execPath, scriptPath, loadRequestsPath],
+      removedCwd: path.join(testDir, "removed-worktree"),
+      loadRequestsPath,
+    });
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+const fakeACPAgentScript = `
+const fs = require("node:fs");
+const readline = require("node:readline");
+
+const loadRequestsPath = process.argv[2];
+const loadRequests = [];
+const rl = readline.createInterface({ input: process.stdin });
+
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+
+function replay(sessionId, sessionUpdate, text) {
+  write({
+    method: "session/update",
+    params: { sessionId, update: { sessionUpdate, content: { type: "text", text } } },
+  });
+}
+
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    write({
+      id: message.id,
+      result: {
+        protocolVersion: message.params?.protocolVersion ?? 1,
+        agentCapabilities: { loadSession: true, sessionCapabilities: { close: {} } },
+      },
+    });
+    return;
+  }
+
+  if (message.method === "session/load") {
+    const { sessionId, cwd } = message.params;
+    loadRequests.push({ sessionId, cwd });
+    fs.writeFileSync(loadRequestsPath, JSON.stringify(loadRequests));
+    replay(sessionId, "user_message_chunk", "What is in the README?");
+    replay(sessionId, "agent_message_chunk", "It describes the project.");
+    write({ id: message.id, result: {} });
+    return;
+  }
+
+  if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts
new file mode 100644
index 0000000000..2411773a7e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts
@@ -0,0 +1,112 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
+
+describe("GenericACPAgentClient slash commands", () => {
+  test("lists commands an agent advertises right after session/new", async () => {
+    await withFakeACPAgent("commands-after-session-new", async (command, cwd) => {
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command,
+        initialCommandsWaitTimeoutMs: 1_500,
+      });
+      const session = await client.createSession({ provider: "acp", cwd });
+      try {
+        await expect(session.listCommands?.()).resolves.toEqual([
+          { name: "review", description: "Review the diff", argumentHint: "", kind: "command" },
+        ]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("answers with no commands for an agent that never advertises any", async () => {
+    await withFakeACPAgent("silent", async (command, cwd) => {
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command,
+        initialCommandsWaitTimeoutMs: 50,
+      });
+      const session = await client.createSession({ provider: "acp", cwd });
+      try {
+        await expect(session.listCommands?.()).resolves.toEqual([]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+});
+
+async function withFakeACPAgent(
+  mode: "commands-after-session-new" | "silent",
+  run: (command: [string, ...string[]], cwd: string) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-commands-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run([process.execPath, scriptPath, mode], testDir);
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+const fakeACPAgentScript = `
+const readline = require("node:readline");
+
+const mode = process.argv[2];
+const rl = readline.createInterface({ input: process.stdin });
+
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    write({
+      id: message.id,
+      result: {
+        protocolVersion: message.params?.protocolVersion ?? 1,
+        agentCapabilities: { sessionCapabilities: { close: {} } },
+      },
+    });
+    return;
+  }
+
+  if (message.method === "session/new") {
+    if (mode === "commands-after-session-new") {
+      process.stdout.write(
+        [
+          { id: message.id, result: { sessionId: "session-1" } },
+          {
+            method: "session/update",
+            params: {
+              sessionId: "session-1",
+              update: {
+                sessionUpdate: "available_commands_update",
+                availableCommands: [{ name: "review", description: "Review the diff" }],
+              },
+            },
+          },
+        ]
+          .map((entry) => JSON.stringify({ jsonrpc: "2.0", ...entry }) + "\\n")
+          .join(""),
+      );
+    } else {
+      write({ id: message.id, result: { sessionId: "session-1" } });
+    }
+    return;
+  }
+
+  if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.diagnostic.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.diagnostic.test.ts
index 5bac343fdc..d70117d57d 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.diagnostic.test.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.diagnostic.test.ts
@@ -1,3 +1,4 @@
+import { buildProviderRegistry } from "../provider-registry.js";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -17,7 +18,132 @@ function parseInitializeTrace(content: string): Array<{ clientCapabilities: unkn
     .map((line) => JSON.parse(line) as { clientCapabilities: unknown });
 }
 
+function historyBudgetClock(): () => number {
+  let calls = 0;
+  return () => (calls++ < 2 ? 0 : 60_001);
+}
+
 describe("GenericACPAgentClient diagnostics", () => {
+  test("filters empty ACP sessions by replaying history and returns prompt previews", async () => {
+    await withFakeACPAgent("history-list", async (scriptPath, mode, testDir) => {
+      const closeTracePath = path.join(testDir, "session-close.jsonl");
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", closeTracePath, testDir],
+      });
+
+      await expect(client.listImportableSessions({ limit: 1 })).resolves.toEqual([
+        {
+          providerHandleId: "conversation-session",
+          cwd: testDir,
+          title: "Conversation",
+          firstPromptPreview: "First prompt",
+          lastPromptPreview: "Last prompt",
+          lastActivityAt: new Date("2026-09-04T20:00:00.000Z"),
+        },
+      ]);
+      await expect(readFile(closeTracePath, "utf8")).resolves.toBe(
+        `${JSON.stringify({ sessionId: "empty-session" })}\n${JSON.stringify({ sessionId: "conversation-session" })}\n`,
+      );
+    });
+  });
+
+  test("keeps a listed session visible when its ACP history cannot be loaded", async () => {
+    await withFakeACPAgent("history-load-failure", async (scriptPath, mode, testDir) => {
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", "", testDir],
+      });
+
+      await expect(client.listImportableSessions({ limit: 1 })).resolves.toEqual([
+        {
+          providerHandleId: "stale-session",
+          cwd: testDir,
+          title: "Could still be real",
+          firstPromptPreview: null,
+          lastPromptPreview: null,
+          lastActivityAt: new Date("2026-09-04T20:00:00.000Z"),
+        },
+      ]);
+    });
+  });
+
+  test("keeps sessions with replayed conversation activity but no user text preview", async () => {
+    await withFakeACPAgent("history-list", async (scriptPath, mode, testDir) => {
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", "", testDir],
+      });
+
+      const result = await client.listImportableSessions({ limit: 2 });
+
+      expect(result).toMatchObject([
+        { providerHandleId: "conversation-session" },
+        { providerHandleId: "assistant-only-session" },
+      ]);
+      expect(result[1]).toMatchObject({
+        firstPromptPreview: null,
+        lastPromptPreview: null,
+      });
+    });
+  });
+
+  test("reuses ACP prompt previews while the listed session timestamp is unchanged", async () => {
+    await withFakeACPAgent("history-list", async (scriptPath, mode, testDir) => {
+      const loadTracePath = path.join(testDir, "session-load.jsonl");
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", "", testDir, loadTracePath],
+      });
+
+      const first = await client.listImportableSessions({ limit: 1 });
+      const second = await client.listImportableSessions({ limit: 1 });
+
+      expect(second).toEqual(first);
+      await expect(readFile(loadTracePath, "utf8")).resolves.toBe(
+        `${JSON.stringify({ sessionId: "empty-session" })}\n${JSON.stringify({ sessionId: "conversation-session" })}\n`,
+      );
+    });
+  });
+
+  test("bounds history loads by scanLimit when every inspected session is empty", async () => {
+    await withFakeACPAgent("history-list", async (scriptPath, mode, testDir) => {
+      const closeTracePath = path.join(testDir, "session-close.jsonl");
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", closeTracePath, testDir],
+      });
+
+      await expect(client.listImportableSessions({ limit: 1, scanLimit: 1 })).resolves.toEqual([]);
+      await expect(readFile(closeTracePath, "utf8")).resolves.toBe(
+        `${JSON.stringify({ sessionId: "empty-session" })}\n`,
+      );
+    });
+  });
+
+  test("bounds the total time spent loading inaccessible session histories", async () => {
+    await withFakeACPAgent("history-load-failures", async (scriptPath, mode, testDir) => {
+      const loadTracePath = path.join(testDir, "session-load.jsonl");
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", "", testDir, loadTracePath],
+        now: historyBudgetClock(),
+      });
+
+      const sessions = await client.listImportableSessions({ limit: 4 });
+
+      expect(sessions).toMatchObject([
+        { providerHandleId: "failed-session-1" },
+        { providerHandleId: "failed-session-2" },
+        { providerHandleId: "failed-session-3" },
+        { providerHandleId: "failed-session-4" },
+      ]);
+      await expect(readFile(loadTracePath, "utf8")).resolves.toBe(
+        `${JSON.stringify({ sessionId: "failed-session-1" })}\n`,
+      );
+    });
+  });
+
   test("probes npx-backed agent packages instead of npx itself", () => {
     expect(buildVersionProbeCommand(["npx", "-y", "@google/gemini-cli@0.41.1", "--acp"])).toEqual({
       command: "npx",
@@ -57,6 +183,25 @@ describe("GenericACPAgentClient diagnostics", () => {
     });
   });
 
+  test("closes the native diagnostic probe session", async () => {
+    await withFakeACPAgent("success", async (scriptPath, mode, testDir) => {
+      const closeTracePath = path.join(testDir, "session-close.jsonl");
+      const client = new GenericACPAgentClient({
+        logger: createTestLogger(),
+        command: [process.execPath, scriptPath, mode, "", "", closeTracePath],
+        providerId: "custom-acp",
+        label: "Custom ACP",
+        diagnosticPhaseTimeoutMs: TEST_ACP_TIMEOUT_MS,
+      });
+
+      await client.getDiagnostic();
+
+      await expect(readFile(closeTracePath, "utf8")).resolves.toContain(
+        JSON.stringify({ sessionId: "session-1" }),
+      );
+    });
+  });
+
   test("reports a hung ACP session/new phase without failing the diagnostic", async () => {
     await withFakeACPAgent("hang-session", async (scriptPath, mode) => {
       const client = new GenericACPAgentClient({
@@ -110,22 +255,28 @@ describe("GenericACPAgentClient diagnostics", () => {
   test("sends configured client capabilities in catalog and live session initialization", async () => {
     await withFakeACPAgent("success", async (scriptPath, mode, testDir) => {
       const initializeTracePath = path.join(testDir, "initialize.jsonl");
-      const client = new GenericACPAgentClient({
-        logger: createTestLogger(),
-        command: [process.execPath, scriptPath, mode, "", initializeTracePath],
-        providerParams: {
-          clientCapabilities: {
-            fs: {
-              readTextFile: true,
-              writeTextFile: true,
+      const logger = createTestLogger();
+      const registry = buildProviderRegistry(logger, {
+        providerOverrides: {
+          "configured-acp": {
+            extends: "acp",
+            label: "Configured ACP",
+            command: [process.execPath, scriptPath, mode, "", initializeTracePath],
+            options: {
+              supportsMcpServers: false,
+              clientCapabilities: {
+                fs: { readTextFile: true, writeTextFile: true },
+                terminal: true,
+              },
             },
-            terminal: true,
           },
         },
       });
+      const client = registry["configured-acp"].createClient(logger);
 
       await client.fetchCatalog({ scope: "workspace", cwd: testDir, force: true });
-      const session = await client.createSession({ provider: "acp", cwd: testDir });
+      const session = await client.createSession({ provider: "configured-acp", cwd: testDir });
+      expect(session.capabilities.supportsMcpServers).toBe(false);
       await session.close();
 
       const initializeRequests = parseInitializeTrace(await readFile(initializeTracePath, "utf8"));
@@ -181,7 +332,12 @@ describe("GenericACPAgentClient diagnostics", () => {
 });
 
 async function withFakeACPAgent(
-  mode: "success" | "hang-session",
+  mode:
+    | "success"
+    | "hang-session"
+    | "history-list"
+    | "history-load-failure"
+    | "history-load-failures",
   run: (scriptPath: string, mode: string, testDir: string) => Promise<void>,
 ): Promise<void> {
   await withTempDir("paseo-acp-diagnostic-", async (testDir) => {
@@ -230,6 +386,9 @@ const readline = require("node:readline");
 const mode = process.argv[2];
 const pidPath = process.argv[3];
 const initializeTracePath = process.argv[4];
+const closeTracePath = process.argv[5];
+const sessionCwd = process.argv[6];
+const loadTracePath = process.argv[7];
 if (pidPath) {
   fs.writeFileSync(pidPath, String(process.pid));
 }
@@ -239,6 +398,10 @@ function send(id, result) {
   process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id, result }) + "\\n");
 }
 
+function sendError(id, code, message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id, error: { code, message } }) + "\\n");
+}
+
 rl.on("line", (line) => {
   const message = JSON.parse(line);
   if (message.method === "initialize") {
@@ -250,7 +413,13 @@ rl.on("line", (line) => {
     }
     send(message.id, {
       protocolVersion: message.params?.protocolVersion ?? 1,
-      agentCapabilities: {},
+      agentCapabilities: {
+        loadSession:
+          mode === "history-list" ||
+          mode === "history-load-failure" ||
+          mode === "history-load-failures",
+        sessionCapabilities: { close: {}, list: {} },
+      },
     });
     return;
   }
@@ -272,6 +441,122 @@ rl.on("line", (line) => {
       },
       configOptions: [],
     });
+    return;
+  }
+
+  if (message.method === "session/close") {
+    if (closeTracePath) {
+      fs.appendFileSync(closeTracePath, JSON.stringify(message.params) + "\\n");
+    }
+    send(message.id, {});
+    return;
+  }
+
+  if (message.method === "session/list" && mode === "history-list") {
+    send(message.id, {
+      sessions: [
+        {
+          sessionId: "empty-session",
+          cwd: sessionCwd,
+          title: "Empty",
+          updatedAt: "2026-09-04T21:00:00.000Z",
+        },
+        {
+          sessionId: "conversation-session",
+          cwd: sessionCwd,
+          title: "Conversation",
+          updatedAt: "2026-09-04T20:00:00.000Z",
+        },
+        {
+          sessionId: "assistant-only-session",
+          cwd: sessionCwd,
+          title: "Recovered conversation",
+          updatedAt: "2026-09-04T19:00:00.000Z",
+        },
+      ],
+      nextCursor: null,
+    });
+    return;
+  }
+
+  if (message.method === "session/list" && mode === "history-load-failure") {
+    send(message.id, {
+      sessions: [{
+        sessionId: "stale-session",
+        cwd: sessionCwd,
+        title: "Could still be real",
+        updatedAt: "2026-09-04T20:00:00.000Z",
+      }],
+      nextCursor: null,
+    });
+    return;
+  }
+
+  if (message.method === "session/list" && mode === "history-load-failures") {
+    send(message.id, {
+      sessions: [1, 2, 3, 4].map((number) => ({
+        sessionId: "failed-session-" + number,
+        cwd: sessionCwd,
+        title: "Could still be real " + number,
+        updatedAt: "2026-09-04T20:00:00.000Z",
+      })),
+      nextCursor: null,
+    });
+    return;
+  }
+
+  if (message.method === "session/load" && mode === "history-list") {
+    if (loadTracePath) {
+      fs.appendFileSync(
+        loadTracePath,
+        JSON.stringify({ sessionId: message.params.sessionId }) + "\\n",
+      );
+    }
+    if (message.params.sessionId === "conversation-session") {
+      for (const [messageId, text] of [["user-1", "First prompt"], ["user-2", "Last prompt"]]) {
+        process.stdout.write(JSON.stringify({
+          jsonrpc: "2.0",
+          method: "session/update",
+          params: {
+            sessionId: message.params.sessionId,
+            update: {
+              sessionUpdate: "user_message_chunk",
+              messageId,
+              content: { type: "text", text },
+            },
+          },
+        }) + "\\n");
+      }
+    }
+    if (message.params.sessionId === "assistant-only-session") {
+      process.stdout.write(JSON.stringify({
+        jsonrpc: "2.0",
+        method: "session/update",
+        params: {
+          sessionId: message.params.sessionId,
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: { type: "text", text: "Recovered response" },
+          },
+        },
+      }) + "\\n");
+    }
+    send(message.id, { modes: null, models: null, configOptions: [] });
+    return;
+  }
+
+  if (
+    message.method === "session/load" &&
+    (mode === "history-load-failure" || mode === "history-load-failures")
+  ) {
+    if (loadTracePath) {
+      fs.appendFileSync(
+        loadTracePath,
+        JSON.stringify({ sessionId: message.params.sessionId }) + "\\n",
+      );
+    }
+    sendError(message.id, -32602, "stale session");
+    return;
   }
 });
 `;
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.permission-turn-failure.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.permission-turn-failure.test.ts
new file mode 100644
index 0000000000..aaa6a5110e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.permission-turn-failure.test.ts
@@ -0,0 +1,165 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import type { AgentSession, AgentStreamEvent } from "../agent-sdk-types.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
+
+describe("GenericACPAgentClient permission requests when a turn ends early", () => {
+  test.each([
+    { ending: "fail", terminalEvent: "turn_failed" },
+    { ending: "cancel", terminalEvent: "turn_canceled" },
+  ] as const)(
+    "answers a permission request left open by a $terminalEvent turn with cancelled",
+    async ({ ending, terminalEvent }) => {
+      await withFakeACPAgent(ending, async (command, cwd) => {
+        const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+        const session = await client.createSession({ provider: "acp", cwd });
+        try {
+          const events = collectEvents(session);
+
+          await session.startTurn("turn one");
+          await waitForEvent(events, terminalEvent);
+          expect(hasEvent(events, "permission_requested")).toBe(true);
+          expect(session.getPendingPermissions()).toEqual([]);
+
+          const replyStart = events.length;
+          await session.startTurn("turn two");
+          await waitForEvent(events, "turn_completed", replyStart);
+
+          expect(assistantText(events.slice(replyStart))).toBe(
+            'perm-1 answered: {"outcome":{"outcome":"cancelled"}}',
+          );
+        } finally {
+          await session.close();
+        }
+      });
+    },
+  );
+});
+
+function collectEvents(session: AgentSession): AgentStreamEvent[] {
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+  return events;
+}
+
+function hasEvent(
+  events: AgentStreamEvent[],
+  type: AgentStreamEvent["type"],
+  fromIndex = 0,
+): boolean {
+  return events.slice(fromIndex).some((event) => event.type === type);
+}
+
+async function waitForEvent(
+  events: AgentStreamEvent[],
+  type: AgentStreamEvent["type"],
+  fromIndex = 0,
+): Promise<void> {
+  const deadline = Date.now() + 5_000;
+  while (!hasEvent(events, type, fromIndex)) {
+    if (Date.now() > deadline) {
+      throw new Error(`Timed out waiting for ${type}`);
+    }
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  }
+}
+
+function assistantText(events: AgentStreamEvent[]): string {
+  return events
+    .flatMap((event) =>
+      event.type === "timeline" && event.item.type === "assistant_message" ? [event.item.text] : [],
+    )
+    .join("");
+}
+
+async function withFakeACPAgent(
+  ending: "fail" | "cancel",
+  run: (command: [string, ...string[]], cwd: string) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-permission-turn-failure-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run([process.execPath, scriptPath, ending], testDir);
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+// Turn one asks for permission, then fails or is cancelled while the request is
+// still open.
+// Later turns report whether that request was ever answered.
+const fakeACPAgentScript = `
+const readline = require("node:readline");
+
+const ending = process.argv[2];
+const rl = readline.createInterface({ input: process.stdin });
+let promptCount = 0;
+let permissionAnswer = null;
+
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === undefined && message.id === "perm-1") {
+    permissionAnswer = message.result ?? { error: message.error };
+    return;
+  }
+  if (message.method === "initialize") {
+    write({ id: message.id, result: { protocolVersion: 1, agentCapabilities: {} } });
+    return;
+  }
+  if (message.method === "session/new") {
+    write({ id: message.id, result: { sessionId: "session-1" } });
+    return;
+  }
+  if (message.method === "session/prompt") {
+    const sessionId = message.params.sessionId;
+    promptCount += 1;
+    if (promptCount === 1) {
+      const toolCall = { toolCallId: "tool-1", title: "echo hello", kind: "execute", status: "pending" };
+      write({ method: "session/update", params: { sessionId, update: { sessionUpdate: "tool_call", ...toolCall } } });
+      write({
+        id: "perm-1",
+        method: "session/request_permission",
+        params: {
+          sessionId,
+          toolCall,
+          options: [
+            { optionId: "allow", name: "Allow once", kind: "allow_once" },
+            { optionId: "reject", name: "Reject", kind: "reject_once" },
+          ],
+        },
+      });
+      setTimeout(() => {
+        if (ending === "cancel") {
+          write({ id: message.id, result: { stopReason: "cancelled" } });
+        } else {
+          write({ id: message.id, error: { code: -32603, message: "turn failed with a permission open" } });
+        }
+      }, 50);
+      return;
+    }
+    const state = permissionAnswer === null ? "unanswered" : "answered: " + JSON.stringify(permissionAnswer);
+    write({
+      method: "session/update",
+      params: {
+        sessionId,
+        update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "perm-1 " + state } },
+      },
+    });
+    write({ id: message.id, result: { stopReason: "end_turn" } });
+    return;
+  }
+  if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.request-errors.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.request-errors.test.ts
new file mode 100644
index 0000000000..9e652a37d5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.request-errors.test.ts
@@ -0,0 +1,121 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
+
+describe("GenericACPAgentClient request errors", () => {
+  test("reports the agent's message when it rejects the configured mode", async () => {
+    await withFakeACPAgent("reject-set-mode", async (command, cwd) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const created = client.createSession({ provider: "acp", cwd, modeId: "plan" });
+
+      await expect(created).rejects.toBeInstanceOf(Error);
+      await expect(created).rejects.toThrow("Internal error: Mode plan is not allowed");
+    });
+  });
+
+  test("reports the agent's message when it rejects the configured thinking option", async () => {
+    await withFakeACPAgent("reject-set-config-option", async (command, cwd) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const created = client.createSession({ provider: "acp", cwd, thinkingOptionId: "high" });
+
+      await expect(created).rejects.toBeInstanceOf(Error);
+      await expect(created).rejects.toThrow("Internal error: Effort high is not allowed");
+    });
+  });
+});
+
+async function withFakeACPAgent(
+  mode: "reject-set-mode" | "reject-set-config-option",
+  run: (command: [string, ...string[]], cwd: string) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-request-errors-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run([process.execPath, scriptPath, mode], testDir);
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+const fakeACPAgentScript = `
+const readline = require("node:readline");
+
+const mode = process.argv[2];
+const rl = readline.createInterface({ input: process.stdin });
+
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    write({
+      id: message.id,
+      result: {
+        protocolVersion: message.params?.protocolVersion ?? 1,
+        agentCapabilities: { sessionCapabilities: { close: {} } },
+      },
+    });
+    return;
+  }
+
+  if (message.method === "session/new") {
+    write({
+      id: message.id,
+      result: {
+        sessionId: "session-1",
+        modes: {
+          currentModeId: "agent",
+          availableModes: [
+            { id: "agent", name: "Agent" },
+            { id: "plan", name: "Plan" },
+          ],
+        },
+        configOptions: [
+          {
+            id: "effort",
+            name: "Effort",
+            category: "thought_level",
+            type: "select",
+            currentValue: "low",
+            options: [
+              { value: "low", name: "Low" },
+              { value: "high", name: "High" },
+            ],
+          },
+        ],
+      },
+    });
+    return;
+  }
+
+  if (message.method === "session/set_mode" && mode === "reject-set-mode") {
+    write({
+      id: message.id,
+      error: { code: -32603, message: "Internal error", data: { details: "Mode plan is not allowed" } },
+    });
+    return;
+  }
+
+  if (message.method === "session/set_config_option" && mode === "reject-set-config-option") {
+    write({
+      id: message.id,
+      error: { code: -32603, message: "Internal error", data: { details: "Effort high is not allowed" } },
+    });
+    return;
+  }
+
+  if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.test.ts
index 19a1e9f8ee..a1f5c497ec 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.test.ts
@@ -62,24 +62,8 @@ describe("GenericACPAgentClient", () => {
           supportsRewindFiles: false,
           supportsRewindBoth: false,
         },
+        waitForInitialCommands: true,
       },
     ]);
   });
-
-  test("uses provider params to report MCP support", () => {
-    const _client = new GenericACPAgentClient({
-      logger: createTestLogger(),
-      command: ["no-mcp-acp", "serve"],
-      providerParams: {
-        supportsMcpServers: false,
-      },
-    });
-    void _client;
-
-    expect(mockState.superConstructorOptions.at(-1)).toMatchObject({
-      capabilities: {
-        supportsMcpServers: false,
-      },
-    });
-  });
 });
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.ts b/packages/server/src/server/agent/providers/generic-acp-agent.ts
index 095d4e10a8..5a14d99137 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.ts
@@ -1,7 +1,5 @@
 import type { Logger } from "pino";
-import { z } from "zod";
 
-import type { AgentCapabilityFlags } from "../agent-sdk-types.js";
 import { checkProviderLaunchAvailable, resolveProviderLaunch } from "../provider-launch-config.js";
 import {
   ACPAgentClient,
@@ -18,32 +16,12 @@ import {
   toDiagnosticErrorMessage,
 } from "./diagnostic-utils.js";
 
-export const GenericACPProviderParamsSchema = z
-  .object({
-    supportsMcpServers: z.boolean().optional(),
-    clientCapabilities: z
-      .object({
-        fs: z
-          .object({
-            readTextFile: z.boolean().optional(),
-            writeTextFile: z.boolean().optional(),
-          })
-          .optional(),
-        terminal: z.boolean().optional(),
-      })
-      .optional(),
-  })
-  .passthrough();
-
-type GenericACPProviderParams = z.infer<typeof GenericACPProviderParamsSchema>;
-
 interface GenericACPAgentClientOptions {
   logger: Logger;
   command: [string, ...string[]];
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
-  providerParams?: unknown;
   waitForInitialCommands?: boolean;
   initialCommandsWaitTimeoutMs?: number;
   diagnosticPhaseTimeoutMs?: number;
@@ -51,6 +29,7 @@ interface GenericACPAgentClientOptions {
   configFeatureOptions?: ACPConfigFeatureOption[];
   extensionCommandsParser?: ACPExtensionCommandsParser;
   catalogModelResolver?: ACPCatalogModelResolver;
+  now?: () => number;
 }
 
 export class GenericACPAgentClient extends ACPAgentClient {
@@ -60,7 +39,6 @@ export class GenericACPAgentClient extends ACPAgentClient {
   private readonly diagnosticPhaseTimeoutMs?: number;
 
   constructor(options: GenericACPAgentClientOptions) {
-    const providerParams = parseGenericACPProviderParams(options.providerParams);
     super({
       provider: "acp",
       logger: options.logger,
@@ -68,14 +46,16 @@ export class GenericACPAgentClient extends ACPAgentClient {
         env: options.env,
       },
       defaultCommand: options.command,
-      capabilities: buildGenericACPCapabilities(providerParams),
-      waitForInitialCommands: options.waitForInitialCommands,
+      capabilities: DEFAULT_ACP_CAPABILITIES,
+      // ACP agents advertise slash commands with available_commands_update after
+      // session/new, so the first listCommands() waits for that batch.
+      waitForInitialCommands: options.waitForInitialCommands ?? true,
       initialCommandsWaitTimeoutMs: options.initialCommandsWaitTimeoutMs,
-      clientCapabilities: providerParams.clientCapabilities,
       clientCapabilityMeta: options.clientCapabilityMeta,
       configFeatureOptions: options.configFeatureOptions,
       extensionCommandsParser: options.extensionCommandsParser,
       catalogModelResolver: options.catalogModelResolver,
+      now: options.now,
     });
 
     this.command = options.command;
@@ -161,17 +141,6 @@ export class GenericACPAgentClient extends ACPAgentClient {
   }
 }
 
-function buildGenericACPCapabilities(params: GenericACPProviderParams): AgentCapabilityFlags {
-  return {
-    ...DEFAULT_ACP_CAPABILITIES,
-    supportsMcpServers: params.supportsMcpServers ?? DEFAULT_ACP_CAPABILITIES.supportsMcpServers,
-  };
-}
-
-function parseGenericACPProviderParams(params: unknown): GenericACPProviderParams {
-  return GenericACPProviderParamsSchema.parse(params ?? {});
-}
-
 export interface CommandInvocation {
   command: string;
   args: string[];
diff --git a/packages/server/src/server/agent/providers/jsonl-rpc-process.test.ts b/packages/server/src/server/agent/providers/jsonl-rpc-process.test.ts
index 2b3e88659a..7dfbb6abb8 100644
--- a/packages/server/src/server/agent/providers/jsonl-rpc-process.test.ts
+++ b/packages/server/src/server/agent/providers/jsonl-rpc-process.test.ts
@@ -154,6 +154,28 @@ describe("JsonlRpcProcess", () => {
     }
   });
 
+  test("publishes unmatched responses without publishing the response that settles a request", async () => {
+    const child = createInMemoryChildProcess();
+    const transport = startProcess({ child });
+    const messages: Record<string, unknown>[] = [];
+    transport.onMessage((message) => messages.push(message));
+
+    try {
+      const { id, promise } = transport.startRequest({ type: "prompt" });
+      const response = { id, type: "response", command: "prompt" };
+      const rejection = { ...response, success: false, error: "rejected after acknowledgement" };
+      const unknownResponse = { ...response, id: "unknown-request", success: true };
+      child.stdout.write(`${JSON.stringify({ ...response, success: true })}\n`);
+      child.stdout.write(`${JSON.stringify(rejection)}\n`);
+      child.stdout.write(`${JSON.stringify(unknownResponse)}\n`);
+
+      await expect(promise).resolves.toBeUndefined();
+      expect(messages).toEqual([rejection, unknownResponse]);
+    } finally {
+      await transport.close();
+    }
+  });
+
   test("rejects unsuccessful responses", async () => {
     const transport = startProcess();
 
@@ -268,6 +290,41 @@ describe("JsonlRpcProcess", () => {
     },
   );
 
+  test("requestStopWork resolves once the child has exited", async () => {
+    const child = createInMemoryChildProcess();
+    const transport = startProcess({ child });
+
+    child.emit("exit", 1, null);
+
+    await expect(transport.requestStopWork({ type: "abort" })).resolves.toBeUndefined();
+  });
+
+  // A dying child's stdin pipe breaks a fraction before its exit event, so deciding at the
+  // moment of the write failure would refuse a stop the runtime did honor.
+  test("requestStopWork resolves when stdin fails just before the child exits", async () => {
+    const child = createInMemoryChildProcess();
+    const transport = startProcess({ child });
+
+    const stopped = transport.requestStopWork({ type: "abort" });
+    child.stdin.emit("error", Object.assign(new Error("write EPIPE"), { code: "EPIPE" }));
+
+    await expect(stopped).resolves.toBeUndefined();
+  });
+
+  // `close()` and a spawn error dispose the transport before the child is known to be
+  // gone, and a child can outlive SIGKILL, so a disposed transport is not proof that the
+  // requested work stopped.
+  test("requestStopWork keeps failing while the transport is disposed but the child has not exited", async () => {
+    const child = createInMemoryChildProcess();
+    const transport = startProcess({ child });
+
+    child.emit("error", new Error("spawn failed"));
+
+    await expect(transport.requestStopWork({ type: "abort" })).rejects.toThrow(
+      "JSONL RPC process is closed",
+    );
+  });
+
   test("stdin error events close the transport instead of becoming uncaught exceptions", async () => {
     const child = createInMemoryChildProcess();
     const transport = startProcess({ child });
diff --git a/packages/server/src/server/agent/providers/jsonl-rpc-process.ts b/packages/server/src/server/agent/providers/jsonl-rpc-process.ts
index 791df2500a..9d8b9af623 100644
--- a/packages/server/src/server/agent/providers/jsonl-rpc-process.ts
+++ b/packages/server/src/server/agent/providers/jsonl-rpc-process.ts
@@ -81,6 +81,8 @@ export class JsonlRpcProcess {
   private stderrBuffer = "";
   private nextRequestId = 1;
   private disposed = false;
+  private exited = false;
+  private closing: Promise<void> | null = null;
   private readonly frameDecoder: JsonlFrameDecoder;
 
   constructor(private readonly options: JsonlRpcProcessOptions) {
@@ -111,6 +113,7 @@ export class JsonlRpcProcess {
       this.failAll(error instanceof Error ? error : new Error(String(error)));
     });
     this.child.on("exit", (code, signal) => {
+      this.exited = true;
       const error = new Error(
         `${this.diagnosticName} process exited with code ${code ?? "null"} and signal ${signal ?? "null"}\n${this.stderrBuffer}`.trim(),
       );
@@ -175,6 +178,36 @@ export class JsonlRpcProcess {
     return this.startRequest(command, timeoutMs).promise;
   }
 
+  /**
+   * Send a command whose goal an exited process has already met — stopping a turn,
+   * clearing a queue. Resolves once the child has exited instead of rejecting,
+   * because nothing is queued and nothing is running, which is what the caller
+   * asked for. Use `request` when the caller needs an answer from a live process.
+   *
+   * Keyed on an observed exit rather than on `disposed`: `close()` disposes the
+   * transport before termination completes, and a child that outlives SIGKILL can
+   * still be working, so a disposed transport is not proof the work stopped.
+   */
+  async requestStopWork(
+    command: { type: string; [key: string]: unknown },
+    timeoutMs?: number | null,
+  ): Promise<void> {
+    if (this.exited) {
+      return;
+    }
+    try {
+      await this.request(command, timeoutMs);
+    } catch (error) {
+      // A dying child breaks its stdin pipe a fraction before it emits `exit`, which
+      // fails this request and starts a termination. Wait for that termination to reach
+      // an answer rather than refusing a stop the runtime went on to honor.
+      await this.closing?.catch(() => undefined);
+      if (!this.exited) {
+        throw error;
+      }
+    }
+  }
+
   send(message: Record<string, unknown>): void {
     if (this.disposed) {
       return;
@@ -193,6 +226,11 @@ export class JsonlRpcProcess {
   async close(error = new Error(`${this.diagnosticName} process is closed`)): Promise<void> {
     if (this.disposed) return;
     this.failAll(error);
+    this.closing = this.terminate();
+    await this.closing;
+  }
+
+  private async terminate(): Promise<void> {
     try {
       this.child.stdin.end();
     } catch {
@@ -220,25 +258,27 @@ export class JsonlRpcProcess {
     this.frameDecoder.write(chunk);
   }
 
-  /** Route a complete logical frame to its consumer (response or subscriber). */
+  /** Route a complete logical frame to its consumer (pending request or subscriber). */
   private dispatchFrame(message: Record<string, unknown>): void {
-    if (message.type === "response") {
-      this.handleResponse(message as unknown as JsonlRpcResponse);
+    const pending =
+      message.type === "response" && typeof message.id === "string"
+        ? this.pending.get(message.id)
+        : undefined;
+    if (pending) {
+      this.settleRequest(pending, message as unknown as JsonlRpcResponse & { id: string });
       return;
     }
+    // A response nothing is waiting for is published like any other frame, so a provider
+    // can read it as an event, such as OMP 18.3 rejecting a prompt after acknowledging it.
     for (const subscriber of this.messageSubscribers) {
       subscriber(message);
     }
   }
 
-  private handleResponse(response: JsonlRpcResponse): void {
-    if (!response.id) {
-      return;
-    }
-    const pending = this.pending.get(response.id);
-    if (!pending) {
-      return;
-    }
+  private settleRequest(
+    pending: PendingRequest,
+    response: JsonlRpcResponse & { id: string },
+  ): void {
     if (pending.timer) {
       clearTimeout(pending.timer);
     }
diff --git a/packages/server/src/server/agent/providers/kimi-acp-agent.test.ts b/packages/server/src/server/agent/providers/kimi-acp-agent.test.ts
index ce296726a1..b388fdb01a 100644
--- a/packages/server/src/server/agent/providers/kimi-acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/kimi-acp-agent.test.ts
@@ -156,8 +156,13 @@ describe("KimiACPAgentClient per-model thinking options", () => {
     expect(setSessionConfigOption).not.toHaveBeenCalled();
   });
 
-  test("skips per-model probing when the provider has no thinking picker", async () => {
-    const setSessionConfigOption = vi.fn();
+  test("probes each model when session/new has no thought_level so a later model can still expose thinking options", async () => {
+    const setSessionConfigOption = vi.fn(async ({ value }: { value: string }) => ({
+      configOptions:
+        value === "kimi-k3"
+          ? [modelConfigOption(value), effortThinkingConfigOption()]
+          : [modelConfigOption(value)],
+    }));
 
     const client = createKimiClient(
       async () =>
@@ -174,16 +179,28 @@ describe("KimiACPAgentClient per-model thinking options", () => {
         }) as unknown as SpawnedACPProcess,
     );
 
-    await client.fetchCatalog({
+    const catalog = await client.fetchCatalog({
       scope: "workspace",
       cwd: "/tmp/acp-kimi-no-thinking",
       force: false,
     });
 
-    expect(setSessionConfigOption).not.toHaveBeenCalled();
+    expect(setSessionConfigOption).toHaveBeenCalledTimes(2);
+
+    const kimiForCoding = catalog.models.find((model) => model.id === "kimi-for-coding");
+    const kimiK3 = catalog.models.find((model) => model.id === "kimi-k3");
+    expect(kimiForCoding?.thinkingOptions).toBeUndefined();
+    expect(kimiForCoding?.defaultThinkingOptionId).toBeUndefined();
+    expect(kimiK3?.thinkingOptions).toEqual([
+      expect.objectContaining({ id: "off", isDefault: false }),
+      expect.objectContaining({ id: "low", isDefault: false }),
+      expect.objectContaining({ id: "medium", isDefault: true }),
+      expect.objectContaining({ id: "high", isDefault: false }),
+    ]);
+    expect(kimiK3?.defaultThinkingOptionId).toBe("medium");
   });
 
-  test("keeps a model's default thinking options when its probe fails", async () => {
+  test("omits thinking options when a model's probe fails instead of keeping another model's list", async () => {
     const setSessionConfigOption = vi.fn(async ({ value }: { value: string }) => {
       if (value === "kimi-k3") {
         throw new Error("probe rejected model switch");
@@ -212,10 +229,13 @@ describe("KimiACPAgentClient per-model thinking options", () => {
       force: false,
     });
 
+    const kimiForCoding = catalog.models.find((model) => model.id === "kimi-for-coding");
     const kimiK3 = catalog.models.find((model) => model.id === "kimi-k3");
-    expect(kimiK3?.thinkingOptions).toEqual([
+    expect(kimiForCoding?.thinkingOptions).toEqual([
       expect.objectContaining({ id: "off", isDefault: true }),
       expect.objectContaining({ id: "on", isDefault: false }),
     ]);
+    expect(kimiK3?.thinkingOptions).toBeUndefined();
+    expect(kimiK3?.defaultThinkingOptionId).toBeUndefined();
   });
 });
diff --git a/packages/server/src/server/agent/providers/kimi-acp-agent.ts b/packages/server/src/server/agent/providers/kimi-acp-agent.ts
index e8ff7ce252..7ae144f653 100644
--- a/packages/server/src/server/agent/providers/kimi-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/kimi-acp-agent.ts
@@ -15,26 +15,10 @@ interface KimiACPAgentClientOptions {
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
-  providerParams?: unknown;
 }
 
-/**
- * Kimi reports different thinking-effort levels per model (a boolean on/off toggle for one
- * model, a multi-level select for another), but only exposes the *currently selected*
- * model's levels through `configOptions` — the model list itself carries no per-model
- * effort metadata. `deriveModelDefinitionsFromACP` can only see whichever model the probe
- * session defaulted to, so every other model would otherwise inherit that one model's
- * thinking options.
- *
- * Reuse the single catalog probe session to switch through each candidate model in turn and
- * read back its real thinking options, rather than spawning a probe per model. Skipped
- * entirely when the provider reports one model or no thinking picker, so a misbehaving ACP
- * that only advertises a single model pays no extra round trips.
- *
- * This lives on the Kimi client, not the base ACP adapter: only Kimi needs the extra
- * `setSessionConfigOption` round trips, so no other ACP provider risks a slow or
- * nonconforming agent stalling its catalog probe on model switching.
- */
+// Kimi exposes thinking options only for the selected model. Keep its model-switching
+// discovery here: other providers can supply a read-only catalog instead.
 export async function resolveKimiCatalogModels({
   connection,
   sessionId,
@@ -49,7 +33,7 @@ export async function resolveKimiCatalogModels({
     return models;
   }
   const modelOption = findSelectConfigOption({ configOptions, category: "model" });
-  if (!modelOption || !findSelectConfigOption({ configOptions, category: "thought_level" })) {
+  if (!modelOption) {
     return models;
   }
 
@@ -72,11 +56,24 @@ export async function resolveKimiCatalogModels({
           thinkingOptions.find((option) => option.isDefault)?.id ?? undefined,
       });
     } catch (error) {
+      const errorMessage = toDiagnosticErrorMessage(error);
+      if (model.isDefault) {
+        logger.warn(
+          { modelId: model.id, error: errorMessage },
+          `${provider} catalog probe could not refresh thinking options for current model "${model.id}"; keeping session options`,
+        );
+        resolved.push(model);
+        continue;
+      }
       logger.warn(
-        { modelId: model.id, error: toDiagnosticErrorMessage(error) },
-        `${provider} catalog probe could not resolve thinking options for model "${model.id}"; keeping its default options`,
+        { modelId: model.id, error: errorMessage },
+        `${provider} catalog probe could not resolve thinking options for model "${model.id}"; omitting thinking options`,
       );
-      resolved.push(model);
+      resolved.push({
+        ...model,
+        thinkingOptions: undefined,
+        defaultThinkingOptionId: undefined,
+      });
     }
   }
   return resolved;
@@ -90,7 +87,6 @@ export class KimiACPAgentClient extends GenericACPAgentClient {
       env: options.env,
       providerId: options.providerId,
       label: options.label,
-      providerParams: options.providerParams,
       catalogModelResolver: resolveKimiCatalogModels,
     });
   }
diff --git a/packages/server/src/server/agent/providers/kiro-acp-agent.ts b/packages/server/src/server/agent/providers/kiro-acp-agent.ts
index 53fd7f2408..41bbd97647 100644
--- a/packages/server/src/server/agent/providers/kiro-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/kiro-acp-agent.ts
@@ -10,7 +10,6 @@ interface KiroACPAgentClientOptions {
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
-  providerParams?: unknown;
 }
 
 // Kiro CLI publishes its slash commands and skills asynchronously through the
@@ -92,7 +91,6 @@ export class KiroACPAgentClient extends GenericACPAgentClient {
       env: options.env,
       providerId: options.providerId,
       label: options.label,
-      providerParams: options.providerParams,
       waitForInitialCommands: true,
       initialCommandsWaitTimeoutMs: KIRO_INITIAL_COMMANDS_WAIT_TIMEOUT_MS,
       extensionCommandsParser: parseKiroExtensionCommands,
diff --git a/packages/server/src/server/agent/providers/mock-load-test-agent.test.ts b/packages/server/src/server/agent/providers/mock-load-test-agent.test.ts
index 27afed7b9a..c9c0f07161 100644
--- a/packages/server/src/server/agent/providers/mock-load-test-agent.test.ts
+++ b/packages/server/src/server/agent/providers/mock-load-test-agent.test.ts
@@ -449,6 +449,18 @@ describe("MockLoadTestAgentClient", () => {
     unsubscribe();
   });
 
+  test("emits distinct configured responses across consecutive fixture turns", async () => {
+    const session = await new MockLoadTestAgentClient().createSession({
+      provider: "mock",
+      cwd: process.cwd(),
+      model: "e2e-fast-stream",
+      featureValues: { mockAssistantResponses: ["First response", "![Second](second.png)"] },
+    });
+    await session.run("Emit a synthetic turn failure.");
+    expect((await session.run("First prompt")).finalText).toBe("First response");
+    expect((await session.run("Second prompt")).finalText).toBe("![Second](second.png)");
+  });
+
   test("emits a settled assistant Markdown image path selected by prompt", async () => {
     vi.useFakeTimers();
     const client = new MockLoadTestAgentClient();
diff --git a/packages/server/src/server/agent/providers/mock-load-test-agent.ts b/packages/server/src/server/agent/providers/mock-load-test-agent.ts
index 315bc728c1..14733e0601 100644
--- a/packages/server/src/server/agent/providers/mock-load-test-agent.ts
+++ b/packages/server/src/server/agent/providers/mock-load-test-agent.ts
@@ -145,6 +145,18 @@ const MODELS: AgentModelDefinition[] = [
       intervalMs: 5,
     },
   },
+  {
+    provider: MOCK_LOAD_TEST_PROVIDER_ID,
+    id: "max-only-thinking-stream",
+    label: "Max-only thinking stream",
+    description: "Fast realistic stream with one supported thinking level.",
+    thinkingOptions: [{ id: "max", label: "Max", isDefault: true }],
+    defaultThinkingOptionId: "max",
+    metadata: {
+      durationMs: 10_000,
+      intervalMs: 5,
+    },
+  },
   {
     provider: MOCK_LOAD_TEST_PROVIDER_ID,
     id: "e2e-fast-stream",
@@ -714,11 +726,19 @@ export class MockLoadTestAgentClient implements AgentClient {
   }
 }
 
+function getConfiguredAssistantResponses(value: unknown): string[] {
+  return Array.isArray(value) && value.every((response) => typeof response === "string")
+    ? [...value]
+    : [];
+}
+
 export class MockLoadTestAgentSession implements AgentSession {
   readonly provider: AgentProvider = MOCK_LOAD_TEST_PROVIDER_ID;
   readonly capabilities = CAPABILITIES;
   readonly features: AgentFeature[] = [];
   readonly id: string;
+  private readonly usageSessionKey = randomUUID();
+
   private readonly listeners = new Set<(event: AgentStreamEvent) => void>();
   private readonly history: AgentStreamEvent[] = [];
   private readonly logger?: Logger;
@@ -727,6 +747,7 @@ export class MockLoadTestAgentSession implements AgentSession {
   private modeId: string | null;
   private modelId: string | null;
   private readonly assistantResponse: string | null;
+  private readonly assistantResponses: string[];
   private readonly streamingAssistantResponse: string | null;
   private readonly streamingAssistantIntervalMs: number;
   private readonly rewindError: string | null;
@@ -742,6 +763,9 @@ export class MockLoadTestAgentSession implements AgentSession {
       typeof options.config.featureValues?.mockAssistantResponse === "string"
         ? options.config.featureValues.mockAssistantResponse
         : null;
+    this.assistantResponses = getConfiguredAssistantResponses(
+      options.config.featureValues?.mockAssistantResponses,
+    );
     this.streamingAssistantResponse =
       typeof options.config.featureValues?.mockStreamingAssistantResponse === "string"
         ? options.config.featureValues.mockStreamingAssistantResponse
@@ -770,6 +794,15 @@ export class MockLoadTestAgentSession implements AgentSession {
     );
   }
 
+  usageSession() {
+    return {
+      provider: this.provider,
+      model: this.modelId ?? undefined,
+      env: {},
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
   async run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult> {
     const { turnId } = await this.startTurn(prompt, options);
     const turn = this.activeTurn;
@@ -829,8 +862,11 @@ export class MockLoadTestAgentSession implements AgentSession {
         this.scheduleSteeringReplayTurn(turn, steeringReplayShape);
       } else if (this.streamingAssistantResponse !== null) {
         this.scheduleStreamingAssistantTurn(turn, this.streamingAssistantResponse);
-      } else if (this.assistantResponse !== null) {
-        this.scheduleSettledAssistantTurn(turn, this.assistantResponse);
+      } else if (this.assistantResponses.length > 0 || this.assistantResponse !== null) {
+        this.scheduleSettledAssistantTurn(
+          turn,
+          (this.assistantResponses.shift() ?? this.assistantResponse)!,
+        );
       } else if (structuredBranchName) {
         this.scheduleSettledAssistantTurn(turn, JSON.stringify(structuredBranchName));
       } else if (settledAssistantImageMarkdown) {
diff --git a/packages/server/src/server/agent/providers/omp/agent.history-purpose.test.ts b/packages/server/src/server/agent/providers/omp/agent.history-purpose.test.ts
new file mode 100644
index 0000000000..ddd30a2590
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/agent.history-purpose.test.ts
@@ -0,0 +1,64 @@
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import type { AgentPersistenceHandle } from "../../agent-sdk-types.js";
+import { OmpAgentClient } from "./agent.js";
+import { FakeOmp } from "./test-utils/fake-omp.js";
+
+test("archived OMP history replays messages and todos without leaving a runtime", async () => {
+  const directory = await mkdtemp(join(tmpdir(), "paseo-omp-history-purpose-"));
+  const sessionFile = join(directory, "session.jsonl");
+  const entries = [
+    { type: "session", id: "root", parentId: null },
+    {
+      type: "message",
+      id: "user-1",
+      parentId: "root",
+      message: { role: "user", content: "make a plan" },
+    },
+    {
+      type: "message",
+      id: "todo-1",
+      parentId: "user-1",
+      message: {
+        role: "toolResult",
+        toolName: "todo",
+        toolCallId: "call-1",
+        content: [{ type: "text", text: "one task" }],
+        details: {
+          phases: [{ name: "Tasks", tasks: [{ content: "Check history", status: "pending" }] }],
+        },
+      },
+    },
+  ];
+  await writeFile(sessionFile, entries.map((entry) => JSON.stringify(entry)).join("\n"));
+  const runtime = new FakeOmp();
+  const client = new OmpAgentClient({ logger: createTestLogger(), runtime });
+  const handle: AgentPersistenceHandle = {
+    provider: "omp",
+    sessionId: "history-1",
+    nativeHandle: sessionFile,
+    metadata: { cwd: directory },
+  };
+
+  const session = await client.resumeSession(handle, undefined, undefined, { purpose: "history" });
+  const events = [];
+  try {
+    for await (const event of session.streamHistory()) events.push(event);
+  } finally {
+    await session.close();
+  }
+
+  expect(runtime.recordedLaunches).toHaveLength(0);
+  expect(events).toContainEqual({
+    type: "timeline",
+    provider: "omp",
+    item: {
+      type: "todo",
+      items: [{ text: "Check history", status: "pending", completed: false }],
+    },
+  });
+});
diff --git a/packages/server/src/server/agent/providers/omp/agent.test.ts b/packages/server/src/server/agent/providers/omp/agent.test.ts
index 79fc4d8d11..c0e6193bb5 100644
--- a/packages/server/src/server/agent/providers/omp/agent.test.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.test.ts
@@ -1,23 +1,119 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, onTestFinished, test } from "vitest";
 import { setImmediate as waitForImmediate } from "node:timers/promises";
+import { mkdtemp, mkdir, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 
+import type { AgentStreamEvent } from "../../agent-sdk-types.js";
 import type { PaseoToolCatalog } from "../../tools/types.js";
+import type { OmpAgentMessage } from "./rpc-types.js";
 import type { OmpNoTurnScheduler, OmpProviderIdleScheduler } from "./agent.js";
 import type { OmpUsagePollScheduler } from "./usage-poller.js";
-import { resolveOmpProviderParams } from "./provider-config.js";
+import { resolveOmpProviderOptions } from "./provider-config.js";
+import { OmpRuntimeEventSchema } from "./rpc-types.js";
 import { OmpHarness } from "./test-utils/omp-harness.js";
+import { OmpAgentClient } from "./agent.js";
+import { FakeOmp } from "./test-utils/fake-omp.js";
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+
+const TURN_LIFECYCLE_EVENTS = new Set<AgentStreamEvent["type"]>([
+  "turn_started",
+  "turn_completed",
+  "turn_failed",
+  "turn_canceled",
+]);
+
+function isTurnLifecycle(type: AgentStreamEvent["type"]): boolean {
+  return TURN_LIFECYCLE_EVENTS.has(type);
+}
+
+// What OMP reports for a turn the user stopped: an error message on a terminal
+// response whose stop reason says the request was aborted.
+const ABORTED_TERMINAL_RESPONSE: OmpAgentMessage = {
+  role: "assistant",
+  content: [],
+  provider: "ai-harness-omp",
+  model: "glm-5.3-flash-high",
+  responseId: "chatcmpl-aborted",
+  stopReason: "aborted",
+  errorMessage: "Interrupted by user",
+};
 
 test("OMP ready timeout defaults to 20 seconds and RPC timeout overrides both", () => {
-  expect(resolveOmpProviderParams({}).runtimeProviderParams).toMatchObject({
+  expect(resolveOmpProviderOptions({}).runtimeOptions).toMatchObject({
     readyTimeoutMs: 20_000,
     rpcTimeoutMs: 60_000,
   });
-  expect(resolveOmpProviderParams({ rpcTimeoutMs: 90_000 }).runtimeProviderParams).toMatchObject({
+  expect(resolveOmpProviderOptions({ rpcTimeoutMs: 90_000 }).runtimeOptions).toMatchObject({
     readyTimeoutMs: 90_000,
     rpcTimeoutMs: 90_000,
   });
 });
 
+test("OMP import uses the runtime's custom agent directory without a configured sessionDir", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo-omp-import-dir-"));
+  const agentDir = path.join(root, "agent");
+  const sessionFile = path.join(agentDir, "sessions", "project", "session.jsonl");
+  await mkdir(path.dirname(sessionFile), { recursive: true });
+  await writeFile(
+    sessionFile,
+    JSON.stringify({ type: "session", id: "custom-dir", cwd: root, timestamp: "2026-09-28" }),
+  );
+  const client = new OmpAgentClient({
+    logger: createTestLogger(),
+    runtime: new FakeOmp(),
+    runtimeSettings: { env: { PI_CODING_AGENT_DIR: agentDir } },
+  });
+
+  expect(await client.listImportableSessions({ cwd: root })).toEqual([
+    expect.objectContaining({ providerHandleId: sessionFile }),
+  ]);
+});
+test("OMP resumes a session whose model was removed on the model OMP falls back to", async () => {
+  const runtime = new FakeOmp();
+  runtime.removeModel("9router/deepseek-v4-flash");
+  runtime.queueSessionSetup((session) => {
+    session.state = { ...session.state, model: { provider: "openrouter", id: "fallback" } };
+  });
+  const client = new OmpAgentClient({ logger: createTestLogger(), runtime });
+
+  const session = await client.resumeSession({
+    provider: "omp",
+    sessionId: "omp-session-1",
+    nativeHandle: "/tmp/omp-session.jsonl",
+    metadata: { cwd: "/workspace/project", model: "9router/deepseek-v4-flash" },
+  });
+  onTestFinished(() => session.close());
+
+  await expect(session.getRuntimeInfo()).resolves.toMatchObject({ model: "openrouter/fallback" });
+  expect(session.describePersistence()?.metadata?.model).toBe("openrouter/fallback");
+});
+
+test("OMP resumes a session on the requested model when it differs from the session's", async () => {
+  const runtime = new FakeOmp();
+  const requestedModel = { provider: "openrouter", id: "requested" };
+  runtime.queueSessionSetup((session) => {
+    session.state = { ...session.state, model: { provider: "openrouter", id: "recorded" } };
+    session.models = [requestedModel];
+    session.setModelResult = requestedModel;
+  });
+  const client = new OmpAgentClient({ logger: createTestLogger(), runtime });
+
+  const session = await client.resumeSession({
+    provider: "omp",
+    sessionId: "omp-session-1",
+    nativeHandle: "/tmp/omp-session.jsonl",
+    metadata: { cwd: "/workspace/project", model: "openrouter/requested" },
+  });
+  onTestFinished(() => session.close());
+
+  expect(runtime.latestSession().setModelRequests).toEqual([
+    { provider: "openrouter", modelId: "requested" },
+  ]);
+  await expect(session.getRuntimeInfo()).resolves.toMatchObject({ model: "openrouter/requested" });
+  expect(session.describePersistence()?.metadata?.model).toBe("openrouter/requested");
+});
+
 class ManualIdleScheduler implements OmpProviderIdleScheduler {
   private readonly retries: Array<() => void> = [];
   private readonly waiters: Array<{ count: number; resolve: () => void }> = [];
@@ -133,7 +229,7 @@ describe("OMP agent client and session", () => {
       [expect.objectContaining({ name: "create_agent" })],
     ]);
     expect(omp.capabilities()).toMatchObject({
-      supportsMcpServers: false,
+      supportsMcpServers: true,
       supportsNativePaseoTools: true,
     });
   });
@@ -145,6 +241,26 @@ describe("OMP agent client and session", () => {
     expect(omp.launchConfiguration().argv).toEqual(expect.arrayContaining(["--thinking", "max"]));
   });
 
+  test("launches with auto thinking when auto is selected", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ thinkingOptionId: "auto" });
+
+    expect(omp.launchConfiguration().argv).toEqual(expect.arrayContaining(["--thinking", "auto"]));
+  });
+
+  test("keeps auto thinking when resuming a session", async () => {
+    const omp = new OmpHarness();
+    await omp.resume(
+      {
+        user: { id: "user-auto", text: "continue" },
+        assistant: { id: "assistant-auto", text: "ready" },
+      },
+      { thinkingOptionId: "auto" },
+    );
+
+    expect(omp.launchConfiguration().argv).toEqual(expect.arrayContaining(["--thinking", "auto"]));
+  });
+
   test("launches with write approval mode", async () => {
     const omp = new OmpHarness();
     await omp.start({ modeId: "write" });
@@ -341,6 +457,184 @@ describe("OMP agent client and session", () => {
     await expect(completion).resolves.toMatchObject({ finalText: "first done" });
   });
 
+  test("fails a turn when the provider idle gate passes its deadline", async () => {
+    const scheduler = new ManualIdleScheduler();
+    // Long enough that the gate's first check, made right after the turn ends, cannot already
+    // be past it on a slow runner.
+    const omp = new OmpHarness({ providerIdleScheduler: scheduler, providerIdleDeadlineMs: 50 });
+    await omp.start();
+    const { completion } = await omp.startPromptUntilProviderIdle("first", "first done", {
+      isStreaming: true,
+      isCompacting: false,
+    });
+    await scheduler.waitForWaits(1);
+    omp.runtime().emit({
+      type: "tool_execution_start",
+      toolCallId: "tool-at-deadline",
+      toolName: "bash",
+      args: { command: "sleep 30" },
+    });
+    expect(omp.runningToolCallIds()).toEqual(["tool-at-deadline"]);
+    await new Promise((resolve) => setTimeout(resolve, 60));
+    scheduler.retry();
+    await expect(completion).rejects.toThrow(/provider idle/i);
+    expect(omp.runningToolCallIds()).toEqual([]);
+  });
+
+  test("steers a running turn and correlates a template-expanded echo exactly once", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    const session = omp.requireSession();
+    const { turnId } = await session.startTurn("first", { clientMessageId: "client-first" });
+    const runtime = omp.runtime();
+    runtime.beginTurn();
+    runtime.acceptPrompt("first", "native-first");
+    await expect(
+      session.steerActiveTurn?.("expand template", {
+        expectedTurnId: turnId,
+        clientMessageId: "client-steer",
+      }),
+    ).resolves.toEqual({ status: "accepted" });
+    runtime.acceptPrompt("expanded prompt", "native-steer");
+    runtime.acceptPrompt("expanded prompt", "native-steer");
+    expect(omp.timeline().filter((item) => item.type === "user_message")).toEqual([
+      expect.objectContaining({ messageId: "native-first", clientMessageId: "client-first" }),
+      expect.objectContaining({ messageId: "native-steer", clientMessageId: "client-steer" }),
+    ]);
+  });
+
+  test("reports a rejected steer as unavailable", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    const session = omp.requireSession();
+    const { turnId } = await session.startTurn("first");
+    omp.runtime().steerError = new Error("extension command cannot be steered");
+    await expect(
+      session.steerActiveTurn?.("extension input", { expectedTurnId: turnId }),
+    ).resolves.toEqual({ status: "unavailable" });
+  });
+
+  test("propagates an OMP steer transport timeout", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    const session = omp.requireSession();
+    const { turnId } = await session.startTurn("first");
+    const timeout = new Error(
+      "OMP RPC request timed out phase=steer elapsedMs=60000 timeoutMs=60000",
+    );
+    omp.runtime().steerError = timeout;
+    await expect(session.steerActiveTurn?.("second", { expectedTurnId: turnId })).rejects.toBe(
+      timeout,
+    );
+  });
+
+  test("shows OMP's fallback model without persisting it as the selected model", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ model: "openrouter/google/gemini-3.8-flash" });
+    const runtime = omp.runtime();
+    runtime.state = {
+      ...runtime.state,
+      model: { provider: "openrouter", id: "google/gemini-3.8-flash" },
+    };
+    runtime.emit({
+      type: "retry_fallback_applied",
+      from: "openrouter/google/gemini-3.8-flash",
+      to: "openrouter/other/model",
+      role: "primary",
+    });
+    runtime.state = { ...runtime.state, model: { provider: "openrouter", id: "other/model" } };
+    runtime.state = { ...runtime.state, fastModeEnabled: true, fastModeActive: false };
+    runtime.emit({ type: "model_changed" });
+    await waitForImmediate();
+    expect(omp.eventTypes()).toContain("model_changed");
+    expect((await omp.requireSession().getRuntimeInfo()).model).toBe("openrouter/other/model");
+    expect(omp.requireSession().describePersistence()?.metadata?.model).toBe(
+      "openrouter/google/gemini-3.8-flash",
+    );
+    expect(omp.requireSession().features).toEqual([
+      expect.objectContaining({
+        value: true,
+        description: expect.stringMatching(/does not apply/i),
+      }),
+    ]);
+  });
+
+  test("Fast stays selected when OMP says it is inactive for the current model", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ model: "openrouter/google/gemini-3.8-flash" });
+    const session = omp.requireSession();
+    omp.runtime().fastModeResult = { enabled: true, active: false };
+    await session.setFeature?.("fast_mode", true);
+    expect(omp.runtime().setFastModeRequests).toEqual([true]);
+    expect(session.features).toEqual([
+      expect.objectContaining({
+        id: "fast_mode",
+        value: true,
+        description: expect.stringMatching(/does not apply to this model/i),
+        tooltip: expect.stringMatching(/does not apply to this model/i),
+      }),
+    ]);
+  });
+
+  test("shows Fast only when OMP reports its state fields", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    const session = omp.requireSession();
+    const {
+      fastModeEnabled: _enabled,
+      fastModeActive: _active,
+      ...olderState
+    } = omp.runtime().state;
+    omp.runtime().state = olderState;
+    await session.getRuntimeInfo();
+    expect(session.features).toEqual([]);
+    await expect(session.setFeature?.("fast_mode", true)).rejects.toThrow(/unavailable/i);
+    omp.runtime().state = { ...olderState, fastModeEnabled: false, fastModeActive: false };
+    await session.getRuntimeInfo();
+    expect(session.features).toHaveLength(1);
+  });
+
+  test("switching model refreshes whether Fast applies", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ model: "openrouter/google/gemini-3.8-flash" });
+    const session = omp.requireSession();
+    omp.runtime().fastModeResult = { enabled: true, active: true };
+    await session.setFeature?.("fast_mode", true);
+    expect(session.features).toEqual([expect.objectContaining({ value: true })]);
+
+    omp.runtime().setModelResult = { provider: "openrouter", id: "other/model" };
+    omp.runtime().queueStateReports([
+      {
+        ...omp.runtime().state,
+        model: omp.runtime().setModelResult,
+        fastModeEnabled: true,
+        fastModeActive: false,
+      },
+    ]);
+    await session.setModel?.("openrouter/other/model");
+    expect(session.features).toEqual([
+      expect.objectContaining({
+        value: true,
+        description: expect.stringMatching(/does not apply/i),
+      }),
+    ]);
+  });
+
+  test("restores Fast from the initial OMP state on create and resume", async () => {
+    const created = new OmpHarness();
+    await created.start({ featureValues: { fast_mode: true } });
+    expect(created.runtime().setFastModeRequests).toEqual([true]);
+    expect(created.runtime().getStateRequestCount).toBe(1);
+
+    const resumed = new OmpHarness();
+    await resumed.resume(
+      { user: { id: "user-1", text: "hello" }, assistant: { id: "assistant-1", text: "hi" } },
+      { featureValues: { fast_mode: true } },
+    );
+    expect(resumed.runtime().setFastModeRequests).toEqual([true]);
+    expect(resumed.runtime().getStateRequestCount).toBe(1);
+  });
+
   test("does not complete on OMP's extension-notice agent_end", async () => {
     const omp = new OmpHarness();
     await omp.start();
@@ -351,6 +645,65 @@ describe("OMP agent client and session", () => {
     expect(omp.completedTurnCount()).toBe(1);
   });
 
+  test("does not complete a turn when a custom message arrives before its user message", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    await omp.requireStartTurn("hello OMP");
+
+    const runtime = omp.runtime();
+    runtime.beginTurn();
+    runtime.acceptCustomMessage("startup notice");
+
+    expect(omp.completedTurnCount()).toBe(0);
+
+    runtime.acceptPrompt("hello OMP", "user-1");
+    runtime.streamAssistantText("model turn completed");
+    runtime.finishTurn();
+    await waitForImmediate();
+
+    expect(omp.completedTurnCount()).toBe(1);
+  });
+
+  test("keeps custom context in separate tools while a turn continues", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    await omp.requireStartTurn("Explain the project");
+    omp.runtime().beginTurn();
+    for (const display of [true, false, true]) {
+      omp.emit({
+        type: "message_end",
+        message: {
+          role: "custom",
+          customType: "project-context",
+          content: [{ type: "text", text: "Project instructions" }],
+          details: { project: "example" },
+          display,
+        },
+      });
+    }
+    const items = omp.timeline();
+    expect(items).toEqual(
+      [1, 2].map(() => ({
+        type: "tool_call",
+        callId: expect.stringMatching(/^omp-custom-/),
+        name: "project-context",
+        status: "completed",
+        detail: { type: "plain_text", text: "Project instructions" },
+        metadata: {
+          synthetic: true,
+          customType: "project-context",
+          details: { project: "example" },
+        },
+        error: null,
+      })),
+    );
+    expect(new Set(items.map((item) => item.type === "tool_call" && item.callId)).size).toBe(2);
+    expect(omp.completedTurnCount()).toBe(0);
+    omp.runtime().finishTurn();
+    await waitForImmediate();
+    expect(omp.completedTurnCount()).toBe(1);
+  });
+
   test("omits live custom messages when display is false", async () => {
     const omp = new OmpHarness();
     await omp.start();
@@ -368,7 +721,7 @@ describe("OMP agent client and session", () => {
     ]);
   });
 
-  test("renders a live system-notice custom message as a synthetic tool call", async () => {
+  test("renders a live system-notice custom message as a notification", async () => {
     const omp = new OmpHarness();
     await omp.start();
 
@@ -387,16 +740,177 @@ describe("OMP agent client and session", () => {
       );
     omp.runtime().acceptCustomMessage("plain custom status text");
 
-    expect(omp.timeline().filter((item) => item.type === "tool_call")).toMatchObject([
-      { callId: "omp-notice:DocsSmokeTwo", name: "task_notification", status: "completed" },
+    expect(omp.timeline().filter((item) => item.type === "notification")).toEqual([
+      {
+        type: "notification",
+        level: "info",
+        message: "Background job DocsSmokeTwo completed",
+      },
     ]);
-    // Non-notice custom messages still fall through as assistant messages.
-    expect(omp.timeline().filter((item) => item.type === "assistant_message")).toMatchObject([
-      { text: "done" },
-      { text: "plain custom status text" },
+    expect(
+      omp.timeline().filter((item) => item.type !== "notification" && item.type !== "user_message"),
+    ).toEqual([
+      { type: "assistant_message", text: "done", messageId: "omp-assistant-1" },
+      {
+        type: "tool_call",
+        callId: expect.stringMatching(/^omp-custom-/),
+        name: "custom-message",
+        status: "completed",
+        detail: { type: "plain_text", text: "plain custom status text" },
+        metadata: { synthetic: true, customType: "custom-message" },
+        error: null,
+      },
     ]);
   });
 
+  test("shows a concise error for a failed tool while keeping shell output", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "tool_execution_start",
+      toolCallId: "failed-shell",
+      toolName: "bash",
+      args: { command: "false" },
+    });
+    omp.emit({
+      type: "tool_execution_end",
+      toolCallId: "failed-shell",
+      toolName: "bash",
+      result: {
+        content: [{ type: "text", text: "Command exited with code 1" }],
+        details: {},
+        isError: true,
+        exitCode: 1,
+      },
+      isError: true,
+    });
+    expect(omp.timeline().at(-1)).toMatchObject({
+      type: "tool_call",
+      status: "failed",
+      error: "Command exited with code 1",
+      detail: { type: "shell", command: "false", exitCode: 1 },
+    });
+  });
+
+  test("uses the exit message when a failed shell has no output", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "tool_execution_start",
+      toolCallId: "empty-shell",
+      toolName: "bash",
+      args: { command: "false" },
+    });
+    omp.emit({
+      type: "tool_execution_end",
+      toolCallId: "empty-shell",
+      toolName: "bash",
+      result: {
+        content: [
+          {
+            type: "text",
+            text: "(no output)\n\nWall time: 0.02 seconds\n\nCommand exited with code 1",
+          },
+        ],
+        isError: true,
+      },
+      isError: true,
+    });
+    expect(omp.timeline().at(-1)).toMatchObject({ error: "Command exited with code 1" });
+  });
+
+  test("does not duplicate the typed invocation for a live skill expansion", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    await omp.runPromptWithCustomMessage(
+      "hello",
+      {
+        role: "custom",
+        content: "[IMPORTANT] Full skill body",
+        customType: "skill-prompt",
+        attribution: "user",
+        details: { name: "commit" },
+        display: true,
+        id: "skill-1",
+      },
+      "done",
+    );
+    expect(omp.timeline().filter((item) => item.type === "user_message")).toEqual([
+      { type: "user_message", text: "hello", messageId: "user-1" },
+    ]);
+    expect(omp.timeline()).not.toContainEqual(
+      expect.objectContaining({ text: "[IMPORTANT] Full skill body" }),
+    );
+  });
+
+  test.each([
+    { kind: "initial", priorPrompt: false },
+    { kind: "follow-up", priorPrompt: true },
+  ])("correlates a $kind skill invocation without a user echo", async ({ priorPrompt }) => {
+    const omp = new OmpHarness();
+    await omp.start();
+    if (priorPrompt) {
+      await omp.runPrompt("Reply OK", "OK");
+    }
+
+    const typed = "/skill:tldr Summarize: hi.";
+    const runtime = omp.runtime();
+    const promptStarted = runtime.nextPrompt();
+    const run = omp.requireSession().run(typed, { clientMessageId: "client-skill" });
+    await promptStarted;
+    runtime.beginTurn();
+    runtime.emit({
+      type: "message_end",
+      message: {
+        role: "custom",
+        content: "[IMPORTANT] Full skill body",
+        customType: "skill-prompt",
+        attribution: "user",
+        details: { name: "tldr", args: "Summarize: hi." },
+        display: true,
+        id: "skill-1",
+      },
+    });
+    runtime.streamAssistantText("done");
+    runtime.finishTurn();
+    await run;
+
+    expect(omp.timeline().filter((item) => item.type === "user_message")).toEqual([
+      ...(priorPrompt ? [{ type: "user_message", text: "Reply OK", messageId: "user-1" }] : []),
+      { type: "user_message", text: typed, clientMessageId: "client-skill" },
+    ]);
+  });
+
+  test("marks an OMP web search details error as failed even without isError", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "tool_execution_start",
+      toolCallId: "search-failed",
+      toolName: "web_search",
+      args: { query: "Paseo" },
+    });
+    omp.emit({
+      type: "tool_execution_end",
+      toolCallId: "search-failed",
+      toolName: "web_search",
+      result: {
+        content: [{ type: "text", text: "Error: All web search providers failed" }],
+        details: {
+          response: { provider: "mojeek", sources: [] },
+          error: "All web search providers failed",
+        },
+      },
+      isError: false,
+    });
+    expect(omp.timeline().at(-1)).toMatchObject({
+      type: "tool_call",
+      status: "failed",
+      error: "All web search providers failed",
+      detail: { type: "search", query: "Paseo" },
+    });
+  });
+
   test("does not complete a queued model turn from OMP's local-only hint", async () => {
     const omp = new OmpHarness();
     await omp.start();
@@ -415,6 +929,46 @@ describe("OMP agent client and session", () => {
     expect(omp.completedTurnCount()).toBe(1);
   });
 
+  test.each(["result after ack", "result before ack"] as const)(
+    "fails a prompt OMP rejects before its agent runs (%s)",
+    async (order) => {
+      const omp = new OmpHarness();
+      await omp.start();
+
+      await expect(
+        omp.runPromptRejectedBeforeAgentRuns(
+          "Reply with ok.",
+          "No API key found for anthropic.",
+          order,
+        ),
+      ).rejects.toThrow("No API key found for anthropic.");
+      expect(omp.turnFailures()).toEqual(["No API key found for anthropic."]);
+      expect(omp.completedTurnCount()).toBe(0);
+    },
+  );
+
+  test("completes a no-turn notify with one notification and no assistant text", async () => {
+    const scheduler = new ManualNoTurnScheduler();
+    const omp = new OmpHarness({ noTurnScheduler: scheduler });
+    await omp.start();
+    const prompt = await omp.startPromptWithFalseLocalOnlyResult("/autoresearch off");
+    omp.emit({
+      type: "extension_ui_request",
+      id: "local-notify",
+      method: "notify",
+      message: "Autoresearch mode disabled",
+      notifyType: "info",
+    });
+
+    scheduler.settle();
+    await expect(prompt.completion).resolves.toMatchObject({ finalText: "" });
+    expect(omp.completedTurnCount()).toBe(1);
+    expect(omp.timeline().filter((item) => item.type === "notification")).toEqual([
+      { type: "notification", level: "info", message: "Autoresearch mode disabled" },
+    ]);
+    expect(omp.timeline().filter((item) => item.type === "assistant_message")).toEqual([]);
+  });
+
   test("waits for a delayed queued model turn after OMP's local-only result", async () => {
     const omp = new OmpHarness();
     await omp.start();
@@ -517,6 +1071,9 @@ describe("OMP agent client and session", () => {
         messageId: "assistant-history",
       },
     ]);
+    expect(omp.usageSession()).toMatchObject({ provider: "omp", sessionKey: expect.any(String) });
+    await omp.close();
+    expect(omp.usageSession()).toBeNull();
   });
 
   test("maps permissions and sends the selected OMP response", async () => {
@@ -534,6 +1091,98 @@ describe("OMP agent client and session", () => {
     ]);
   });
 
+  test("shows OMP notifications during a turn and while idle with their levels", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    await omp.startTurn("work");
+    omp.runtime().beginTurn();
+    omp.emit({
+      type: "extension_ui_request",
+      id: "n1",
+      method: "notify",
+      message: "Working",
+      notifyType: "warning",
+    });
+    omp.runtime().finishTurn();
+    omp.emit({
+      type: "extension_ui_request",
+      id: "n2",
+      method: "notify",
+      message: "Done",
+      notifyType: "info",
+    });
+    expect(omp.timeline().filter((item) => item.type === "notification")).toEqual([
+      { type: "notification", level: "warning", message: "Working" },
+      { type: "notification", level: "info", message: "Done" },
+    ]);
+    expect(omp.timeline().filter((item) => item.type === "assistant_message")).toEqual([]);
+  });
+
+  test("maps legacy select options without descriptions and preserves ordinary responses", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    omp.emit({
+      type: "extension_ui_request",
+      id: "select-legacy",
+      method: "select",
+      title: "Choose",
+      options: ["Approve", "Deny"],
+    });
+
+    expect(omp.pendingPermissions()[0]?.input).toMatchObject({
+      questions: [{ options: [{ label: "Approve" }, { label: "Deny" }] }],
+    });
+    await omp.respondToPermission("select-legacy", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Deny" } },
+    });
+    expect(omp.extensionUiResponses()).toContainEqual({
+      id: "select-legacy",
+      response: { value: "Deny" },
+    });
+  });
+
+  test("maps described and mixed select metadata by option index", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    omp.emit({
+      type: "extension_ui_request",
+      id: "select-described",
+      method: "select",
+      title: "Choose",
+      options: ["First", "Second", "Third"],
+      optionDetails: [{ description: "First detail" }, {}, { description: " \t" }],
+    });
+
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]?.options).toStrictEqual([
+      { label: "First", description: "First detail" },
+      { label: "Second" },
+      { label: "Third" },
+    ]);
+  });
+
+  test("accepts malformed or misaligned optional metadata and falls back to labels", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    const parsed = OmpRuntimeEventSchema.safeParse({
+      type: "extension_ui_request",
+      id: "select-malformed",
+      method: "select",
+      options: ["First", "Second"],
+      optionDetails: [{ description: 42 }, { description: "\n\t" }, { description: "extra" }],
+    });
+    expect(parsed.success).toBe(true);
+    if (!parsed.success) throw new Error("Expected malformed metadata event to parse");
+
+    omp.emit(parsed.data);
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]?.options).toStrictEqual([
+      { label: "First" },
+      { label: "Second" },
+    ]);
+  });
+
   test("exposes OMP modes and commands through the domain session", async () => {
     const omp = new OmpHarness();
     omp.queueCommands([{ name: "review", description: "Review changes", source: "skill" }]);
@@ -550,10 +1199,118 @@ describe("OMP agent client and session", () => {
         expect.objectContaining({ name: "review", kind: "skill" }),
       ]),
     );
+    await expect(omp.setMode("ask")).resolves.toBeUndefined();
+    await expect(omp.currentMode()).resolves.toBe("ask");
+    expect(omp.runtimeLaunches()[1]?.argv).toContain("--approval-mode");
+    expect(omp.runtimeLaunches()[1]?.argv).toContain("always-ask");
+  });
+
+  test("restarts the same conversation after an idle process exit", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ modeId: "full" });
+    const previousId = omp.runtime().state.sessionId;
+    omp.processExit("OMP RPC process exited with code null and signal SIGKILL\nBun crashed");
+    expect(omp.turnFailures()).toEqual([
+      "OMP RPC process exited with code null and signal SIGKILL\nBun crashed",
+    ]);
+
+    await omp.startTurn("remember the conversation");
+    expect(omp.runtimeLaunches()).toHaveLength(2);
+    expect(omp.runtimeLaunches()[1]?.session).toBe("/tmp/omp-session");
+    expect(omp.runtime().state.sessionId).toBe(previousId);
+    expect(omp.threadStartedSessionIds()).toEqual([]);
+    expect(omp.runtime().prompts).toEqual([
+      { message: "remember the conversation", imageCount: 0 },
+    ]);
+  });
+
+  test("reports a mid-turn process exit and resumes on the following prompt", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    await omp.requireStartTurn("sleep 30");
+    omp.runtime().beginTurn();
+    omp.processExit("OMP RPC process exited with code 137 and signal null\nOOM");
+    expect(omp.turnFailures()).toEqual([
+      "OMP RPC process exited with code 137 and signal null\nOOM",
+    ]);
+    await omp.startTurn("continue");
+    expect(omp.runtimeLaunches()).toHaveLength(2);
+    expect(omp.runtime().prompts).toEqual([{ message: "continue", imageCount: 0 }]);
+  });
+
+  test("ignores a prompt rejection a previous OMP process left for a reused request id", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "prompt_result",
+      id: "req_1",
+      agentInvoked: false,
+      status: "error",
+      error: { message: "No API key found for anthropic." },
+    });
+    omp.processExit("OMP RPC process exited with code 1 and signal null");
+
+    await omp.runPromptWithoutTurnOnNextRuntime("/session", "req_1");
+
+    expect(omp.runtimeLaunches()).toHaveLength(2);
+    expect(omp.turnFailures()).toEqual(["OMP RPC process exited with code 1 and signal null"]);
+    expect(omp.completedTurnCount()).toBe(1);
+  });
+
+  test("reports an immediate relaunch failure without retrying in a loop", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.processExit("OMP RPC process exited with code null and signal SIGKILL");
+    omp.failNextStart(new Error("Bun failed during startup"));
+    await omp.startTurn("continue");
+    expect(omp.turnFailures()).toEqual([
+      "OMP RPC process exited with code null and signal SIGKILL",
+      "Bun failed during startup",
+    ]);
+    expect(omp.runtimeLaunches()).toHaveLength(1);
+  });
+
+  test("closes a replacement process if the session closes during relaunch", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.processExit("OMP RPC process exited with code 1 and signal null");
+    const turn = omp.startTurnDetached("continue");
+    await omp.close();
+    await turn;
+    await waitForImmediate();
+    expect(omp.runtimeSessions().every((session) => session.closed)).toBe(true);
+  });
+
+  test("announces a fresh native session when an internal agent recovers", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ internal: true });
+    const previousId = omp.runtime().state.sessionId;
+    omp.processExit("OMP RPC process exited with code 1 and signal null");
+    await omp.startTurn("continue");
+    expect(omp.runtimeLaunches()[1]?.argv).toContain("--no-session");
+    expect(omp.runtime().state.sessionId).not.toBe(previousId);
+    expect(omp.threadStartedSessionIds()).toEqual([omp.runtime().state.sessionId]);
+  });
+
+  test("leaves the current approval mode in place when relaunch fails", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ modeId: "full" });
+    omp.failNextStart(new Error("OMP launch failed"));
+    await expect(omp.setMode("ask")).rejects.toThrow("OMP launch failed");
+    expect(await omp.currentMode()).toBe("full");
+    expect(omp.runtimeLaunches()).toHaveLength(1);
+  });
+
+  test("rejects a running approval-mode change until the turn ends", async () => {
+    const omp = new OmpHarness();
+    await omp.start({ modeId: "full" });
+    await omp.requireStartTurn("work");
     await expect(omp.setMode("ask")).resolves.toEqual({
       type: "warning",
-      message: "Start a new OMP session to change approval mode",
+      message: "Change approval mode once the current turn ends",
     });
+    expect(omp.runtimeLaunches()).toHaveLength(1);
+    expect(await omp.currentMode()).toBe("full");
   });
 
   test("rewinds natively, interrupts, and shuts down", async () => {
@@ -620,6 +1377,74 @@ describe("OMP agent client and session", () => {
     expect(omp.runningToolCallIds()).toEqual([]);
   });
 
+  test("an interrupt that OMP reports as an aborted turn cancels instead of failing", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    await omp.requireStartTurn("do something long");
+    const runtime = omp.runtime();
+    runtime.beginTurn();
+    runtime.emit({
+      type: "tool_execution_start",
+      toolCallId: "tool-1",
+      toolName: "bash",
+      args: { command: "sleep 30" },
+    });
+    runtime.streamAssistantText("working on it");
+    // OMP ends the turn with an aborted terminal response before answering the abort.
+    runtime.onAbort = () => {
+      runtime.emit({ type: "message_end", message: ABORTED_TERMINAL_RESPONSE });
+      runtime.finishTurn(ABORTED_TERMINAL_RESPONSE);
+    };
+
+    await omp.interrupt();
+    await waitForImmediate();
+    await waitForImmediate();
+
+    expect(omp.eventTypes().filter(isTurnLifecycle)).toEqual(["turn_started", "turn_canceled"]);
+    expect(omp.runningToolCallIds()).toEqual([]);
+  });
+
+  test("an aborted turn that settles after the interrupt cancels exactly once", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    await omp.requireStartTurn("do something long");
+    const runtime = omp.runtime();
+    runtime.beginTurn();
+    runtime.streamAssistantText("working on it");
+    // The provider-idle check is still in flight when the abort is acknowledged.
+    const releaseState = runtime.holdStateRequests();
+    runtime.emit({ type: "message_end", message: ABORTED_TERMINAL_RESPONSE });
+    runtime.finishTurn(ABORTED_TERMINAL_RESPONSE);
+
+    await omp.interrupt();
+    releaseState();
+    await waitForImmediate();
+    await waitForImmediate();
+
+    expect(omp.eventTypes().filter(isTurnLifecycle)).toEqual(["turn_started", "turn_canceled"]);
+  });
+
+  test("an autonomous OMP turn aborted with no client turn id cancels", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    const runtime = omp.runtime();
+    runtime.beginTurn();
+    runtime.streamAssistantText("autonomous work");
+    runtime.onAbort = () => {
+      runtime.emit({ type: "message_end", message: ABORTED_TERMINAL_RESPONSE });
+      runtime.finishTurn(ABORTED_TERMINAL_RESPONSE);
+    };
+
+    await omp.interrupt();
+    await waitForImmediate();
+    await waitForImmediate();
+
+    expect(omp.eventTypes().filter(isTurnLifecycle)).toEqual(["turn_started", "turn_canceled"]);
+  });
+
   test("a resumed session does not re-emit replayed events as live timeline items", async () => {
     const omp = new OmpHarness();
     await omp.resume({
diff --git a/packages/server/src/server/agent/providers/omp/agent.ts b/packages/server/src/server/agent/providers/omp/agent.ts
index 78b79fe9b1..2dc6c58dea 100644
--- a/packages/server/src/server/agent/providers/omp/agent.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.ts
@@ -1,3 +1,4 @@
+import { mapCustomMessageToToolCall } from "../custom-message.js";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
@@ -19,6 +20,7 @@ import {
   type AgentPersistenceHandle,
   type AgentPromptInput,
   type AgentProvider,
+  type AgentResumeSessionOptions,
   type AgentRunOptions,
   type AgentRunResult,
   type AgentRuntimeInfo,
@@ -34,6 +36,8 @@ import {
   type ListImportableSessionsOptions,
   type ProviderCatalog,
   type ProviderRefreshContext,
+  type SteerActiveTurnOptions,
+  type SteerResult,
   type ToolCallDetail,
 } from "../../agent-sdk-types.js";
 import type { PaseoToolCatalog } from "../../tools/types.js";
@@ -60,20 +64,20 @@ import {
   mergeOmpRuntimeSettings,
   resolveOmpDiagnosticPaths,
   resolveOmpLaunchMode,
-  resolveOmpProviderParams,
+  resolveOmpProviderOptions,
   OMP_MODES,
-  type OmpModelRoleParams,
-  type OmpRuntimeProviderParams,
+  type OmpRuntimeOptions,
 } from "./provider-config.js";
 export { formatOmpVersionSupport, resolveOmpDiagnosticPaths } from "./provider-config.js";
 import { OmpSubagentCardTracker, type OmpSubagentCardScheduler } from "./subagent-card-tracker.js";
-import { shouldDisplayOmpCustomMessage } from "./custom-message.js";
+import { ompSkillPromptUserText, shouldDisplayOmpCustomMessage } from "./custom-message.js";
 import { getUserMessageText } from "./message-history.js";
-import { mapOmpSystemNoticeToToolCall } from "./system-notice.js";
+import { mapOmpSystemNoticeToNotification } from "./system-notice.js";
 import { materializeProviderImage } from "../provider-image-output.js";
 import { OmpCliRuntime } from "./cli-runtime.js";
 import { listOmpImportableSessions, readOmpImportSessionConfig } from "./session-descriptor.js";
 import type { OmpRuntime, OmpRuntimeSession, OmpStartSessionInput } from "./runtime.js";
+import { OmpMcpBridge, type OmpBridgedToolIdentity } from "./mcp-bridge.js";
 import type {
   OmpAgentSessionEvent,
   OmpAgentMessage,
@@ -86,21 +90,20 @@ import type {
 import {
   parseToolArgs,
   parseToolResult,
+  toolFailureMessage,
+  isOmpToolFailure,
   resolveToolCallName,
   type OmpToolResult,
   type OmpTrackedToolCall,
 } from "./tool-call-detail.js";
 import { mapOmpAvailableCommandsUpdate, mapOmpRuntimeSlashCommands } from "./commands.js";
-import { streamOmpHistory } from "./history.js";
+import { readOmpHistoryTodoState, streamOmpHistory } from "./history.js";
 import { mapOmpTodoReminderEvent, mapOmpTodoState, mapOmpTodoToolResult } from "./todo-mapper.js";
 import { mapOmpRuntimeEventToTimelineItem } from "./event-mapper.js";
 import { mapOmpAdvisorMessageToToolCall } from "./advisor-message.js";
-import {
-  clearOmpHostToolState,
-  handleOmpHostToolRuntimeEvent,
-  setOmpHostTools,
-} from "./host-tools.js";
+import { handleOmpHostToolRuntimeEvent, OmpHostToolRouter } from "./host-tools.js";
 import { OmpSubagentIndex } from "./subagent-index.js";
+import { OmpQuestionUi } from "./question-ui.js";
 import { mapOmpToolDetail } from "./tool-call-mapper.js";
 import { OmpUsagePoller, type OmpUsagePollScheduler } from "./usage-poller.js";
 import {
@@ -110,17 +113,12 @@ import {
 import { DEFAULT_OMP_THINKING_LEVEL, mapOmpModel } from "./map-omp-model.js";
 
 const OMP_PROVIDER = "omp";
-const QUESTION_RESPONSE_HEADER = "Response";
-const QUESTION_COMMENT_HEADER = "Comment";
-const OMP_ASK_USER_FREEFORM_SENTINEL = "✏️ Type custom response...";
-const COMBINED_ASK_USER_METADATA = "ask_user_select_optional_comment";
-
 const OMP_CORE_CAPABILITIES: AgentCapabilityFlags = {
   supportsStreaming: true,
   supportsSessionPersistence: true,
   supportsSessionListing: true,
   supportsDynamicModes: true,
-  supportsMcpServers: false,
+  supportsMcpServers: true,
   supportsReasoningStream: true,
   supportsToolInvocations: true,
   supportsRewindConversation: true,
@@ -131,12 +129,12 @@ const OMP_CORE_CAPABILITIES: AgentCapabilityFlags = {
 export interface OmpAgentClientOptions {
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
-  providerParams?: unknown;
   runtime?: OmpRuntime;
   subagentCardScheduler?: OmpSubagentCardScheduler;
   providerIdleScheduler?: OmpProviderIdleScheduler;
   noTurnScheduler?: OmpNoTurnScheduler;
   usagePollScheduler?: OmpUsagePollScheduler;
+  providerIdleDeadlineMs?: number;
 }
 
 export interface OmpProviderIdleScheduler {
@@ -152,6 +150,8 @@ export interface OmpNoTurnScheduler {
 // v0.2.0-beta.1; remove after January 20, 2027 once the minimum OMP version
 // guarantees prompt_result waits for queued extension work.
 const OMP_NO_TURN_SETTLE_MS = 5_000;
+const OMP_PROVIDER_IDLE_DEADLINE_MS = 600_000;
+const OMP_FAST_INACTIVE_MESSAGE = "Fast is enabled but does not apply to this model.";
 
 interface OmpPromptPayload {
   text: string;
@@ -169,6 +169,22 @@ interface OmpPersistenceMetadata {
   thinkingOptionId?: string;
   modeId?: string;
   systemPrompt?: string;
+  bridgedTools: Map<string, OmpBridgedToolIdentity>;
+}
+
+/** OMP's outcome for one prompt, correlated by the prompt's request id. */
+interface OmpPromptResult {
+  agentInvoked: boolean;
+  /** Why OMP rejected the prompt before its agent ran, such as a missing API key. */
+  error: string | null;
+}
+
+function promptResultError(result: {
+  status?: string;
+  error?: { message: string };
+}): string | null {
+  if (result.status !== "error") return null;
+  return result.error?.message || "OMP rejected the prompt";
 }
 
 interface StartTurnResult {
@@ -177,6 +193,14 @@ interface StartTurnResult {
 
 interface OmpAgentSessionOptions {
   runtimeSession: OmpRuntimeSession;
+  hostTools?: OmpHostToolRouter;
+  restartRuntime: (
+    sessionFile: string | null,
+    modeId: string,
+  ) => Promise<{
+    runtimeSession: OmpRuntimeSession;
+    hostTools?: OmpHostToolRouter;
+  }>;
   config: AgentSessionConfig;
   initialState: OmpSessionState;
   currentModeId?: string | null;
@@ -185,7 +209,7 @@ interface OmpAgentSessionOptions {
   providerIdleScheduler?: OmpProviderIdleScheduler;
   noTurnScheduler?: OmpNoTurnScheduler;
   usagePollScheduler?: OmpUsagePollScheduler;
-  paseoTools?: PaseoToolCatalog;
+  providerIdleDeadlineMs?: number;
   /**
    * When false (resumed sessions), replayed session events are dropped until
    * the first prompt or agent_start so history is not re-emitted as live
@@ -218,24 +242,6 @@ interface OmpResumeConfig {
   config: AgentSessionConfig;
 }
 
-interface ActiveAskUserDialog {
-  allowComment: boolean;
-  allowFreeform: boolean;
-  allowMultiple: boolean;
-}
-
-interface PendingCombinedAskUserResponse {
-  comment: string;
-  freeform: string | null;
-}
-
-interface ExtensionUiMappingOptions {
-  provider?: AgentProvider;
-  label?: string;
-  combineOptionalComment?: boolean;
-  allowFreeform?: boolean;
-}
-
 interface OmpSlashCommandInvocation {
   commandName: string;
   args?: string;
@@ -281,7 +287,8 @@ function isOmpThinkingLevel(value: string | null | undefined): value is OmpThink
     value === "medium" ||
     value === "high" ||
     value === "xhigh" ||
-    value === "max"
+    value === "max" ||
+    value === "auto"
   );
 }
 
@@ -388,9 +395,20 @@ function parseModelReference(modelId: string | null): OmpModelReference | null {
 
 function parsePersistenceMetadata(metadata: AgentMetadata | undefined): OmpPersistenceMetadata {
   if (!metadata) {
-    return {};
+    return { bridgedTools: new Map() };
+  }
+  const bridgedTools = new Map<string, OmpBridgedToolIdentity>();
+  if (Array.isArray(metadata.bridgedTools)) {
+    for (const entry of metadata.bridgedTools) {
+      if (!Array.isArray(entry) || entry.length !== 2 || typeof entry[0] !== "string") continue;
+      const identity = entry[1];
+      if (!identity || typeof identity !== "object" || Array.isArray(identity)) continue;
+      if (typeof identity.server !== "string" || typeof identity.tool !== "string") continue;
+      bridgedTools.set(entry[0], { server: identity.server, tool: identity.tool });
+    }
   }
   return {
+    bridgedTools,
     ...(typeof metadata.cwd === "string" ? { cwd: metadata.cwd } : {}),
     ...(typeof metadata.model === "string" ? { model: metadata.model } : {}),
     ...(typeof metadata.thinkingOptionId === "string"
@@ -439,7 +457,6 @@ function buildResumeStartInput(input: {
     protocolMode: "rpc-ui",
     env: input.launchContext?.env,
     session: input.sessionFile,
-    model: input.resumeConfig.model,
     thinkingOptionId: normalizeOmpThinkingOption(input.resumeConfig.thinkingOptionId) ?? undefined,
     ...(input.launchMode.modeId ? { modeId: input.launchMode.modeId } : {}),
     ...(input.launchMode.extraArgs ? { extraArgs: input.launchMode.extraArgs } : {}),
@@ -462,7 +479,7 @@ function readNativeMessageId(
 function withOmpCapabilities(): AgentCapabilityFlags {
   return {
     ...OMP_CORE_CAPABILITIES,
-    supportsMcpServers: false,
+    supportsMcpServers: true,
     supportsNativePaseoTools: true,
   };
 }
@@ -475,6 +492,20 @@ function isOmpRequestAbortError(error: unknown): boolean {
   return /\brequest was aborted\b|\babort(ed)?\b/i.test(toDiagnosticErrorMessage(error));
 }
 
+function isOmpSteerTransportFailure(error: unknown): boolean {
+  // JsonlRpcProcess currently uses plain Error for both RPC rejections and transport failures.
+  // Only its own timeout/closed-process messages are transport failures; OMP rejections are unavailable.
+  const message = toDiagnosticErrorMessage(error);
+  return (
+    /^OMP RPC request timed out phase=steer\b/.test(message) ||
+    /^OMP RPC process (?:is closed|exited\b)/.test(message)
+  );
+}
+
+function hasOmpFastMode(state: OmpSessionState): boolean {
+  return typeof state.fastModeEnabled === "boolean" && typeof state.fastModeActive === "boolean";
+}
+
 function resolveThinkingOptionId(
   cachedThinkingOptionId: string | null,
   sessionThinkingLevel: OmpThinkingLevel | undefined,
@@ -526,116 +557,15 @@ function latestOmpErrorMessage(messages: OmpAgentMessage[]): string | null {
   return formatOmpErrorMessage(latestAssistant);
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function isOmpAbortedTerminalResponse(messages: OmpAgentMessage[]): boolean {
+  const latestAssistant = messages.findLast((message) => message.role === "assistant");
+  return latestAssistant?.stopReason?.toLowerCase() === "aborted";
 }
 
 function optionalString(value: unknown): string | undefined {
   return typeof value === "string" ? value : undefined;
 }
 
-function optionalBoolean(value: unknown): boolean | undefined {
-  return typeof value === "boolean" ? value : undefined;
-}
-
-function readActiveAskUserDialog(toolName: string, args: unknown): ActiveAskUserDialog | null {
-  if (toolName !== "ask_user" || !isRecord(args)) {
-    return null;
-  }
-  return {
-    allowComment: optionalBoolean(args.allowComment) ?? false,
-    allowFreeform: optionalBoolean(args.allowFreeform) ?? true,
-    allowMultiple: optionalBoolean(args.allowMultiple) ?? false,
-  };
-}
-
-function isOptionalInputPlaceholder(placeholder: string | undefined): boolean {
-  return /\boptional\b|\bskip\b/i.test(placeholder ?? "");
-}
-
-function getInputQuestionTitle(title: string | undefined, placeholder: string | undefined): string {
-  if (!isOptionalInputPlaceholder(placeholder)) {
-    return title ?? "Enter a value";
-  }
-  if (/\bcomment\b/i.test(`${title ?? ""}\n${placeholder ?? ""}`)) {
-    return "Optional comment";
-  }
-  return "Optional response";
-}
-
-function readStringArray(value: unknown): string[] {
-  return Array.isArray(value)
-    ? value.filter((item): item is string => typeof item === "string")
-    : [];
-}
-
-function isOmpAskUserFreeformOption(option: string): boolean {
-  return option === OMP_ASK_USER_FREEFORM_SENTINEL;
-}
-
-function mapExtensionUiRequestToPermission(
-  event: Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>,
-  options: ExtensionUiMappingOptions = {},
-): AgentPermissionRequest | null {
-  const provider = options.provider ?? OMP_PROVIDER;
-  const label = options.label ?? "OMP";
-  switch (event.method) {
-    case "select": {
-      const selectOptions = readStringArray(event.options);
-      if (options.combineOptionalComment) {
-        return buildCombinedAskUserQuestionPermission(event, {
-          provider,
-          label,
-          question: optionalString(event.title) ?? "Select an option",
-          options: selectOptions,
-          allowFreeform: options.allowFreeform === true,
-        });
-      }
-      return buildExtensionUiQuestionPermission(event, {
-        provider,
-        label,
-        question: optionalString(event.title) ?? "Select an option",
-        options: selectOptions,
-        multiSelect: false,
-      });
-    }
-    case "input": {
-      const placeholder = optionalString(event.placeholder);
-      const title = optionalString(event.title);
-      const allowEmpty = isOptionalInputPlaceholder(placeholder);
-      return buildExtensionUiQuestionPermission(event, {
-        provider,
-        label,
-        question: getInputQuestionTitle(title, placeholder),
-        options: [],
-        multiSelect: false,
-        ...(placeholder ? { placeholder } : {}),
-        ...(allowEmpty ? { allowEmpty: true, dismissLabel: "Skip" } : {}),
-      });
-    }
-    case "editor":
-      return buildExtensionUiQuestionPermission(event, {
-        provider,
-        label,
-        question: optionalString(event.title) ?? "Edit text",
-        options: [],
-        multiSelect: false,
-      });
-    case "confirm":
-      return buildExtensionUiQuestionPermission(event, {
-        provider,
-        label,
-        question: [optionalString(event.title), optionalString(event.message)]
-          .filter(Boolean)
-          .join("\n\n"),
-        options: ["Yes", "No"],
-        multiSelect: false,
-      });
-    default:
-      return null;
-  }
-}
-
 function isExtensionUiRequestEvent(
   event: OmpRuntimeEvent,
 ): event is Extract<OmpRuntimeEvent, { type: "extension_ui_request" }> {
@@ -667,179 +597,100 @@ function isOmpAgentSessionEvent(event: OmpRuntimeEvent): event is OmpAgentSessio
   }
 }
 
-function buildExtensionUiQuestionPermission(
-  event: Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>,
-  input: {
-    provider: AgentProvider;
-    label: string;
-    question: string;
-    options: string[];
-    multiSelect: boolean;
-    placeholder?: string;
-    allowEmpty?: boolean;
-    dismissLabel?: string;
-  },
-): AgentPermissionRequest {
-  return {
-    id: event.id,
-    provider: input.provider,
-    name: `${input.label} ${event.method}`,
-    kind: "question",
-    title: input.question,
-    input: {
-      questions: [
-        {
-          question: input.question,
-          header: QUESTION_RESPONSE_HEADER,
-          options: input.options.map((label) => ({ label })),
-          multiSelect: input.multiSelect,
-          ...(input.placeholder ? { placeholder: input.placeholder } : {}),
-          ...(input.allowEmpty ? { allowEmpty: true } : {}),
-          ...(input.dismissLabel ? { dismissLabel: input.dismissLabel } : {}),
-        },
-      ],
-    },
-    metadata: {
-      extensionUiMethod: event.method,
-      answerHeader: QUESTION_RESPONSE_HEADER,
-    },
-  };
-}
-
-function buildCombinedAskUserQuestionPermission(
-  event: Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>,
-  input: {
-    provider: AgentProvider;
-    label: string;
-    question: string;
-    options: string[];
-    allowFreeform: boolean;
-  },
-): AgentPermissionRequest {
-  const visibleOptions = input.options.filter((option) => !isOmpAskUserFreeformOption(option));
-  const allowOther = input.allowFreeform || visibleOptions.length !== input.options.length;
-  return {
-    id: event.id,
-    provider: input.provider,
-    name: `${input.label} ask_user`,
-    kind: "question",
-    title: input.question,
-    input: {
-      questions: [
-        {
-          question: input.question,
-          header: QUESTION_RESPONSE_HEADER,
-          options: visibleOptions.map((label) => ({ label })),
-          multiSelect: false,
-          ...(allowOther ? { allowOther: true } : {}),
-        },
-        {
-          question: "Optional comment",
-          header: QUESTION_COMMENT_HEADER,
-          options: [],
-          multiSelect: false,
-          placeholder: "Optional comment (press Enter to skip)...",
-          allowEmpty: true,
-        },
-      ],
-    },
-    metadata: {
-      extensionUiMethod: event.method,
-      answerHeader: QUESTION_RESPONSE_HEADER,
-      commentHeader: QUESTION_COMMENT_HEADER,
-      combinedAskUser: COMBINED_ASK_USER_METADATA,
-      selectOptions: visibleOptions,
-      ...(allowOther ? { freeformSentinel: OMP_ASK_USER_FREEFORM_SENTINEL } : {}),
-    },
-  };
-}
-
-function permissionAnswer(input: AgentMetadata | undefined, header: string): string | null {
-  const answers = isRecord(input?.answers) ? input.answers : null;
-  if (!answers) {
-    return null;
-  }
-  const answer = answers[header];
-  return typeof answer === "string" ? answer : null;
-}
-
-function firstPermissionAnswer(input: AgentMetadata | undefined): string | null {
-  const answers = isRecord(input?.answers) ? input.answers : null;
-  if (!answers) {
-    return null;
-  }
-  const first = Object.values(answers).find((value) => typeof value === "string");
-  return typeof first === "string" ? first : null;
-}
-
-function isCombinedAskUserPermission(request: AgentPermissionRequest): boolean {
-  return request.metadata?.combinedAskUser === COMBINED_ASK_USER_METADATA;
-}
-
-function buildCombinedAskUserSelectionResponse(
-  request: AgentPermissionRequest,
-  response: AgentPermissionResponse,
-): {
-  uiResponse: { value?: string; cancelled?: boolean };
-  pendingResponse: PendingCombinedAskUserResponse | null;
-} {
-  if (response.behavior === "deny") {
-    return { uiResponse: { cancelled: true }, pendingResponse: null };
-  }
-
-  const answer = permissionAnswer(response.updatedInput, QUESTION_RESPONSE_HEADER);
-  if (answer === null) {
-    return { uiResponse: { cancelled: true }, pendingResponse: null };
-  }
-
-  const selectOptions = readStringArray(request.metadata?.selectOptions);
-  const freeformSentinel = optionalString(request.metadata?.freeformSentinel);
-  const isFreeform = Boolean(freeformSentinel) && !selectOptions.includes(answer);
-  const comment = permissionAnswer(response.updatedInput, QUESTION_COMMENT_HEADER) ?? "";
-  return {
-    uiResponse: { value: isFreeform ? freeformSentinel : answer },
-    pendingResponse: {
-      comment,
-      freeform: isFreeform ? answer : null,
-    },
-  };
-}
-
-function buildExtensionUiResponse(
-  request: AgentPermissionRequest,
-  response: AgentPermissionResponse,
-): { value?: string; confirmed?: boolean; cancelled?: boolean } {
-  if (response.behavior === "deny") {
-    return { cancelled: true };
-  }
-
-  const method = optionalString(request.metadata?.extensionUiMethod);
-  const answer = firstPermissionAnswer(response.updatedInput);
-  if (answer === null) {
-    return { cancelled: true };
-  }
-
-  if (method === "confirm") {
-    return { confirmed: /^yes$/i.test(answer.trim()) };
-  }
-  return { value: answer };
-}
-
 function createRuntime(
   logger: Logger,
   runtimeSettings: ProviderRuntimeSettings | undefined,
-  providerParams: OmpRuntimeProviderParams,
+  providerOptions: OmpRuntimeOptions,
 ): OmpRuntime {
   return new OmpCliRuntime({
     logger,
     runtimeSettings,
     command: ["omp"],
     commandsRpcName: "get_available_commands",
-    readyTimeoutMs: providerParams.readyTimeoutMs,
-    requestTimeoutMs: providerParams.rpcTimeoutMs,
+    readyTimeoutMs: providerOptions.readyTimeoutMs,
+    requestTimeoutMs: providerOptions.rpcTimeoutMs,
   });
 }
 
+class OmpHistorySession implements AgentSession {
+  readonly provider: AgentProvider;
+  readonly capabilities: AgentCapabilityFlags = withOmpCapabilities();
+
+  constructor(
+    private readonly handle: AgentPersistenceHandle,
+    private readonly config: OmpResumeConfig,
+    private readonly sessionFile: string,
+    provider: AgentProvider,
+    private readonly bridgedTools: ReadonlyMap<string, OmpBridgedToolIdentity>,
+  ) {
+    this.provider = provider;
+  }
+
+  get id(): string | null {
+    return this.handle.sessionId;
+  }
+
+  async run(): Promise<AgentRunResult> {
+    throw new Error("OMP history session cannot start a turn");
+  }
+
+  async startTurn(): Promise<{ turnId: string }> {
+    throw new Error("OMP history session cannot start a turn");
+  }
+
+  subscribe(): () => void {
+    return () => undefined;
+  }
+
+  async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    yield* streamOmpHistory({
+      sessionFile: this.sessionFile,
+      provider: this.provider,
+      bridgedTools: this.bridgedTools,
+    });
+    const todo = await readOmpHistoryTodoState(this.sessionFile);
+    if (todo) yield { type: "timeline", provider: this.provider, item: todo };
+  }
+
+  async getRuntimeInfo(): Promise<AgentRuntimeInfo> {
+    return {
+      provider: this.provider,
+      sessionId: this.handle.sessionId,
+      model: this.config.model ?? null,
+      thinkingOptionId: this.config.thinkingOptionId ?? null,
+      modeId: this.config.modeId ?? null,
+    };
+  }
+
+  async getAvailableModes(): Promise<AgentMode[]> {
+    return [...OMP_MODES];
+  }
+
+  async getCurrentMode(): Promise<string | null> {
+    return this.config.modeId ?? null;
+  }
+
+  async setMode(): Promise<void> {
+    throw new Error("OMP history session cannot change mode");
+  }
+
+  getPendingPermissions(): AgentPermissionRequest[] {
+    return [];
+  }
+
+  async respondToPermission(): Promise<void> {
+    throw new Error("OMP history session has no pending permissions");
+  }
+
+  describePersistence(): AgentPersistenceHandle {
+    return this.handle;
+  }
+
+  async interrupt(): Promise<void> {}
+
+  async close(): Promise<void> {}
+}
+
 export class OmpAgentSession implements AgentSession {
   readonly provider: AgentProvider = OMP_PROVIDER;
   readonly capabilities: AgentCapabilityFlags = withOmpCapabilities();
@@ -847,10 +698,10 @@ export class OmpAgentSession implements AgentSession {
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private readonly activeToolCalls = new Map<string, OmpTrackedToolCall>();
   private readonly pendingExtensionUiRequests = new Map<string, AgentPermissionRequest>();
-  private activeAskUserDialog: ActiveAskUserDialog | null = null;
-  private pendingCombinedAskUserResponse: PendingCombinedAskUserResponse | null = null;
+  private readonly questionUi = new OmpQuestionUi();
   private activeTurnId: string | null = null;
-  private activeClientMessageId: string | null = null;
+  private readonly pendingClientMessages: Array<{ clientMessageId: string | null; text: string }> =
+    [];
   private activeAssistantMessageId: string | null = null;
   private activeTurnTerminalAssistantMessage: OmpAgentMessage | null = null;
   private activeTurnStarted = false;
@@ -859,7 +710,8 @@ export class OmpAgentSession implements AgentSession {
   private readonly pendingNoTurnOutputs: Array<{ turnId: string; message: string }> = [];
   private activePromptRequestId: string | null = null;
   private activePromptAgentInvoked: boolean | null = null;
-  private readonly pendingPromptResults = new Map<string, boolean>();
+  private activePromptError: string | null = null;
+  private readonly pendingPromptResults = new Map<string, OmpPromptResult>();
   private pendingNoTurnCompletionAbort: AbortController | null = null;
   private lastKnownThinkingOptionId: string | null;
   private outOfBandCompactionEmit: ((event: AgentStreamEvent) => void) | null = null;
@@ -870,23 +722,42 @@ export class OmpAgentSession implements AgentSession {
   private readonly subagentCardTracker: OmpSubagentCardTracker;
   private lastTodoItem: Extract<AgentTimelineItem, { type: "todo" }> | null = null;
   private state: OmpSessionState;
-  private readonly currentModeId: string | null;
+  private currentModeId: string | null;
+  private runtimeDead = false;
+  private replacingRuntime: Promise<void> | null = null;
+  private unsubscribeRuntime: (() => void) | null = null;
   private readonly providerIdleScheduler: OmpProviderIdleScheduler;
+  private readonly providerIdleDeadlineMs: number;
   private readonly noTurnScheduler: OmpNoTurnScheduler;
   private readonly usagePoller: OmpUsagePoller;
   private closed = false;
   private live: boolean;
   private readonly emittedUserMessageIds = new Set<string>();
 
+  private readonly usageSessionKey = randomUUID();
+
+  usageSession() {
+    const env = this.runtimeSession.environment;
+    if (this.closed) return null;
+    return {
+      provider: "omp",
+      model: modelToId(this.state.model) ?? undefined,
+      env,
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
   constructor(options: OmpAgentSessionOptions) {
     this.runtimeSession = options.runtimeSession;
+    this.hostTools = options.hostTools;
+    this.restartRuntime = options.restartRuntime;
     this.config = options.config;
     this.state = options.initialState;
     this.currentModeId = options.currentModeId ?? null;
     this.logger = options.logger;
-    this.paseoTools = options.paseoTools;
     this.live = options.live ?? true;
     this.providerIdleScheduler = options.providerIdleScheduler ?? createOmpProviderIdleScheduler();
+    this.providerIdleDeadlineMs = options.providerIdleDeadlineMs ?? OMP_PROVIDER_IDLE_DEADLINE_MS;
     this.noTurnScheduler = options.noTurnScheduler ?? createOmpNoTurnScheduler();
     this.usagePoller = new OmpUsagePoller({
       scheduler: options.usagePollScheduler,
@@ -910,34 +781,63 @@ export class OmpAgentSession implements AgentSession {
       normalizeOmpThinkingOption(options.config.thinkingOptionId) ??
       this.state.thinkingLevel ??
       null;
-    this.runtimeSession.onEvent((event) => {
-      this.handleRuntimeEvent(event);
+    this.attachRuntime(this.runtimeSession);
+  }
+
+  private attachRuntime(runtime: OmpRuntimeSession): void {
+    this.unsubscribeRuntime = runtime.onEvent((event) => {
+      if (!this.closed && runtime === this.runtimeSession) this.handleRuntimeEvent(event);
     });
-    void this.runtimeSession.setSubagentSubscription("events").catch((eventsError: unknown) => {
+    void runtime.setSubagentSubscription("events").catch((eventsError: unknown) => {
       this.logger.debug(
         { err: eventsError },
         "OMP subagent event subscription unavailable; falling back to progress",
       );
-      void this.runtimeSession
-        .setSubagentSubscription("progress")
-        .catch((progressError: unknown) => {
-          this.logger.debug(
-            { err: progressError },
-            "OMP subagent progress subscription unavailable",
-          );
-        });
+      void runtime.setSubagentSubscription("progress").catch((progressError: unknown) => {
+        this.logger.debug({ err: progressError }, "OMP subagent progress subscription unavailable");
+      });
     });
   }
 
-  private readonly runtimeSession: OmpRuntimeSession;
+  private runtimeSession: OmpRuntimeSession;
+  private hostTools?: OmpHostToolRouter;
+  private readonly restartRuntime: OmpAgentSessionOptions["restartRuntime"];
   private readonly config: AgentSessionConfig;
   private readonly logger: Logger;
-  private readonly paseoTools?: PaseoToolCatalog;
 
   get id(): string | null {
     return this.state.sessionId;
   }
 
+  get features(): AgentFeature[] {
+    if (!hasOmpFastMode(this.state)) return [];
+    return [
+      {
+        type: "toggle",
+        id: "fast_mode",
+        label: "Fast",
+        icon: "zap",
+        value: this.state.fastModeEnabled === true,
+        ...(this.state.fastModeEnabled && !this.state.fastModeActive
+          ? { description: OMP_FAST_INACTIVE_MESSAGE, tooltip: OMP_FAST_INACTIVE_MESSAGE }
+          : {}),
+      },
+    ];
+  }
+
+  async setFeature(featureId: string, value: unknown): Promise<void> {
+    if (featureId !== "fast_mode") throw new Error(`Unknown OMP feature: ${featureId}`);
+    if (typeof value !== "boolean") throw new Error("OMP fast mode requires a boolean");
+    if (!hasOmpFastMode(this.state)) throw new Error("OMP fast mode is unavailable");
+    const result = await this.runtimeSession.setFastMode(value);
+    this.state = {
+      ...this.state,
+      fastModeEnabled: result.enabled,
+      fastModeActive: result.active,
+    };
+    this.config.featureValues = { ...this.config.featureValues, fast_mode: result.enabled };
+  }
+
   async run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult> {
     return runProviderTurn({
       prompt,
@@ -959,7 +859,7 @@ export class OmpAgentSession implements AgentSession {
     const turnId = randomUUID();
     this.live = true;
     this.activeTurnId = turnId;
-    this.activeClientMessageId = options?.clientMessageId ?? null;
+    this.rememberClientMessage(options?.clientMessageId ?? null, payload.text);
     this.activeAssistantMessageId = null;
     this.activeTurnTerminalAssistantMessage = null;
     this.activeTurnStarted = false;
@@ -971,6 +871,8 @@ export class OmpAgentSession implements AgentSession {
 
     void (async () => {
       try {
+        if (this.runtimeDead) await this.replaceRuntime(this.currentModeId ?? "full");
+        if (this.closed) throw new Error("OMP session is closed");
         const ack = await this.runtimeSession.prompt(payload.text, payload.images);
         this.activePromptRequestId = ack.requestId ?? null;
         const correlatedResult = ack.requestId
@@ -979,12 +881,13 @@ export class OmpAgentSession implements AgentSession {
         if (ack.requestId) {
           this.pendingPromptResults.delete(ack.requestId);
         }
-        this.activePromptAgentInvoked = correlatedResult ?? ack.agentInvoked ?? null;
-        if (correlatedResult === false) {
+        this.activePromptAgentInvoked = correlatedResult?.agentInvoked ?? ack.agentInvoked ?? null;
+        this.activePromptError = correlatedResult?.error ?? null;
+        if (correlatedResult?.agentInvoked === false) {
           this.scheduleNoTurnPromptCompletion(turnId);
           return;
         }
-        if (correlatedResult !== true && ack.agentInvoked === false) {
+        if (correlatedResult?.agentInvoked !== true && ack.agentInvoked === false) {
           await this.completeNoTurnPrompt(turnId);
           return;
         }
@@ -993,13 +896,7 @@ export class OmpAgentSession implements AgentSession {
           return;
         }
         this.usagePoller.stopTurn();
-        this.activeTurnId = null;
-        this.activeClientMessageId = null;
-        this.activeTurnStarted = false;
-        this.activeTurnHasUserMessage = false;
-        this.activeAssistantMessageId = null;
-        this.activeTurnTerminalAssistantMessage = null;
-        this.clearNoTurnBuffers();
+        this.resetActiveTurn({ terminalizeWork: true });
         if (isOmpRequestAbortError(error)) {
           this.emit({
             type: "turn_canceled",
@@ -1021,6 +918,57 @@ export class OmpAgentSession implements AgentSession {
     return { turnId };
   }
 
+  async steerActiveTurn(
+    prompt: AgentPromptInput,
+    options: SteerActiveTurnOptions,
+  ): Promise<SteerResult> {
+    if (this.closed || this.activeTurnId !== options.expectedTurnId)
+      return { status: "unavailable" };
+    const payload = convertPromptInput(prompt, { model: this.state.model });
+    if (this.parseSlashCommandInput(payload.text)) return { status: "unavailable" };
+    const submission = this.rememberClientMessage(options.clientMessageId ?? null, payload.text);
+    try {
+      await this.runtimeSession.steer(payload.text, payload.images);
+    } catch (error) {
+      this.forgetClientMessage(submission);
+      if (isOmpSteerTransportFailure(error)) throw error;
+      return { status: "unavailable" };
+    }
+    if (this.closed || this.activeTurnId !== options.expectedTurnId)
+      return { status: "unavailable" };
+    if (options.clearPendingPermissions) {
+      for (const requestId of this.pendingExtensionUiRequests.keys()) {
+        await this.respondToPermission(requestId, {
+          behavior: "deny",
+          message: "The user sent a message instead of approving.",
+        });
+      }
+    }
+    return { status: "accepted" };
+  }
+
+  private rememberClientMessage(
+    clientMessageId: string | null,
+    text: string,
+  ): {
+    clientMessageId: string | null;
+    text: string;
+  } {
+    const submission = { clientMessageId, text };
+    this.pendingClientMessages.push(submission);
+    if (this.pendingClientMessages.length > 16) this.pendingClientMessages.shift();
+    return submission;
+  }
+
+  private forgetClientMessage(submission: { clientMessageId: string | null; text: string }): void {
+    const index = this.pendingClientMessages.indexOf(submission);
+    if (index >= 0) this.pendingClientMessages.splice(index, 1);
+  }
+
+  private takeClientMessage(): { clientMessageId: string | null; text: string } | undefined {
+    return this.pendingClientMessages.shift();
+  }
+
   subscribe(callback: (event: AgentStreamEvent) => void): () => void {
     this.subscribers.add(callback);
     return () => {
@@ -1033,6 +981,7 @@ export class OmpAgentSession implements AgentSession {
       sessionFile: this.state.sessionFile,
       runtimeSession: this.runtimeSession,
       provider: this.provider,
+      bridgedTools: this.hostTools?.bridge?.toolIdentities(),
     });
     for (const item of mapOmpTodoState(this.state)) {
       yield {
@@ -1045,6 +994,10 @@ export class OmpAgentSession implements AgentSession {
 
   async getRuntimeInfo(): Promise<AgentRuntimeInfo> {
     await this.refreshState();
+    return this.runtimeInfoFromState();
+  }
+
+  private runtimeInfoFromState(): AgentRuntimeInfo {
     return {
       provider: this.provider,
       sessionId: this.state.sessionId,
@@ -1069,10 +1022,59 @@ export class OmpAgentSession implements AgentSession {
     if (!OMP_MODES.some((mode) => mode.id === modeId)) {
       throw new Error(`Invalid OMP mode '${modeId}'`);
     }
-    return {
-      type: "warning",
-      message: "Start a new OMP session to change approval mode",
+    if (modeId === this.currentModeId) return;
+    if (this.activeTurnId || this.state.isStreaming || this.state.isCompacting) {
+      return { type: "warning", message: "Change approval mode once the current turn ends" };
+    }
+    await this.replaceRuntime(modeId);
+  }
+
+  private async replaceRuntime(modeId: string): Promise<void> {
+    if (this.replacingRuntime) return this.replacingRuntime;
+    const replace = async () => {
+      const old = this.runtimeSession;
+      const oldHostTools = this.hostTools;
+      const previousSessionId = this.state.sessionId;
+      const restarted = await this.restartRuntime(
+        this.config.internal ? null : (this.state.sessionFile ?? null),
+        modeId,
+      );
+      const next = restarted.runtimeSession;
+      try {
+        if (this.closed) throw new Error("OMP session is closed");
+        const state = await next.getState();
+        if (this.closed) throw new Error("OMP session is closed");
+        this.unsubscribeRuntime?.();
+        // Request ids restart with each OMP process, so results held for the old one cannot
+        // correlate with prompts sent to the new one.
+        this.pendingPromptResults.clear();
+        this.runtimeSession = next;
+        this.hostTools = restarted.hostTools;
+        this.state = state;
+        this.currentModeId = modeId;
+        this.config.modeId = modeId;
+        this.runtimeDead = false;
+        this.attachRuntime(next);
+        this.subagentIndex.clear(old);
+        await oldHostTools?.close();
+        await old.close().catch(() => undefined);
+        if (state.sessionId !== previousSessionId) {
+          this.emit({
+            type: "thread_started",
+            provider: this.provider,
+            sessionId: state.sessionId,
+          });
+        }
+      } catch (error) {
+        await restarted.hostTools?.close();
+        await next.close().catch(() => undefined);
+        throw error;
+      }
     };
+    this.replacingRuntime = replace().finally(() => {
+      this.replacingRuntime = null;
+    });
+    return this.replacingRuntime;
   }
 
   getPendingPermissions(): AgentPermissionRequest[] {
@@ -1086,15 +1088,12 @@ export class OmpAgentSession implements AgentSession {
     }
     this.pendingExtensionUiRequests.delete(requestId);
 
-    if (isCombinedAskUserPermission(request)) {
-      const combined = buildCombinedAskUserSelectionResponse(request, response);
-      this.pendingCombinedAskUserResponse = combined.pendingResponse;
-      this.runtimeSession.respondToExtensionUiRequest(requestId, combined.uiResponse);
+    const approvalResponse = buildOmpRpcUiPermissionResponse(request, response);
+    if (approvalResponse) {
+      this.runtimeSession.respondToExtensionUiRequest(requestId, approvalResponse);
     } else {
-      this.runtimeSession.respondToExtensionUiRequest(
-        requestId,
-        buildOmpRpcUiPermissionResponse(request, response) ??
-          buildExtensionUiResponse(request, response),
+      this.questionUi.respond(request, response, (id, uiResponse) =>
+        this.runtimeSession.respondToExtensionUiRequest(id, uiResponse),
       );
     }
     this.emit({
@@ -1113,6 +1112,9 @@ export class OmpAgentSession implements AgentSession {
       nativeHandle: this.state.sessionFile,
       metadata: {
         cwd: this.config.cwd,
+        ...(this.hostTools?.bridge
+          ? { bridgedTools: [...this.hostTools.bridge.toolIdentities()] }
+          : {}),
         ...(this.config.model ? { model: this.config.model } : {}),
         ...(this.config.thinkingOptionId ? { thinkingOptionId: this.config.thinkingOptionId } : {}),
         ...(this.currentModeId ? { modeId: this.currentModeId } : {}),
@@ -1124,15 +1126,8 @@ export class OmpAgentSession implements AgentSession {
     const turnId = this.activeTurnId;
     await this.runtimeSession.abort();
     if (turnId && this.activeTurnId === turnId) {
-      this.terminalizeActiveWork();
       this.usagePoller.stopTurn();
-      this.activeTurnId = null;
-      this.activeClientMessageId = null;
-      this.activeTurnStarted = false;
-      this.activeTurnHasUserMessage = false;
-      this.activeAssistantMessageId = null;
-      this.activeTurnTerminalAssistantMessage = null;
-      this.clearNoTurnBuffers();
+      this.resetActiveTurn({ terminalizeWork: true });
       this.emit({
         type: "turn_canceled",
         provider: this.provider,
@@ -1160,11 +1155,13 @@ export class OmpAgentSession implements AgentSession {
       return;
     }
     this.closed = true;
+    this.unsubscribeRuntime?.();
     this.usagePoller.close();
     this.cancelNoTurnPromptCompletion();
     try {
       await this.runtimeSession.close();
     } finally {
+      await this.hostTools?.close();
       this.clearOmpSessionState();
     }
   }
@@ -1175,7 +1172,7 @@ export class OmpAgentSession implements AgentSession {
   }
 
   private clearOmpTurnState(): void {
-    clearOmpHostToolState(this.runtimeSession);
+    this.hostTools?.clear();
     this.subagentCardTracker.clear();
   }
 
@@ -1190,6 +1187,17 @@ export class OmpAgentSession implements AgentSession {
     this.clearOmpTurnState();
   }
 
+  private resetActiveTurn({ terminalizeWork }: { terminalizeWork: boolean }): void {
+    if (terminalizeWork) this.terminalizeActiveWork();
+    this.activeTurnId = null;
+    this.activeAssistantMessageId = null;
+    this.activeTurnTerminalAssistantMessage = null;
+    this.activeTurnStarted = false;
+    this.activeTurnHasUserMessage = false;
+    this.pendingClientMessages.length = 0;
+    this.clearNoTurnBuffers();
+  }
+
   async listCommands(): Promise<AgentSlashCommand[]> {
     if (this.commandCache) {
       return this.commandCache;
@@ -1259,11 +1267,8 @@ export class OmpAgentSession implements AgentSession {
     }
 
     const model = await this.runtimeSession.setModel(parsedReference.provider, parsedReference.id);
-    this.state = {
-      ...this.state,
-      model,
-    };
     this.config.model = `${model.provider}/${model.id}`;
+    await this.refreshState();
   }
 
   async setThinkingOption(thinkingOptionId: string | null): Promise<void> {
@@ -1324,7 +1329,14 @@ export class OmpAgentSession implements AgentSession {
     ) {
       return;
     }
+    const error = this.activePromptError;
     this.emitBufferedNoTurnOutputs(turnId);
+    if (error) {
+      this.usagePoller.stopTurn();
+      this.resetActiveTurn({ terminalizeWork: true });
+      this.emit({ type: "turn_failed", provider: this.provider, turnId, error });
+      return;
+    }
     this.completeTurn(turnId, []);
   }
 
@@ -1333,6 +1345,7 @@ export class OmpAgentSession implements AgentSession {
     this.activeNoTurnPromptText = null;
     this.activePromptRequestId = null;
     this.activePromptAgentInvoked = null;
+    this.activePromptError = null;
     this.pendingNoTurnOutputs.splice(0, this.pendingNoTurnOutputs.length);
   }
 
@@ -1341,6 +1354,7 @@ export class OmpAgentSession implements AgentSession {
     const outputs = this.pendingNoTurnOutputs.filter((output) => output.turnId === turnId);
     this.clearNoTurnBuffers();
     if (promptText) {
+      const clientMessageId = this.takeClientMessage()?.clientMessageId;
       this.emit({
         type: "timeline",
         provider: this.provider,
@@ -1348,7 +1362,7 @@ export class OmpAgentSession implements AgentSession {
         item: {
           type: "user_message",
           text: promptText,
-          ...(this.activeClientMessageId ? { clientMessageId: this.activeClientMessageId } : {}),
+          ...(clientMessageId ? { clientMessageId } : {}),
         },
       });
     }
@@ -1518,7 +1532,20 @@ export class OmpAgentSession implements AgentSession {
   ): void {
     const message = optionalString(event.message);
     if (event.method === "notify" && message) {
-      this.bufferNoTurnOutput(message);
+      this.emit({
+        type: "timeline",
+        provider: this.provider,
+        turnId: this.currentTurnIdForEvent(),
+        item: {
+          type: "notification",
+          level:
+            event.notifyType === "warning" || event.notifyType === "error"
+              ? event.notifyType
+              : "info",
+          message,
+        },
+      });
+      return;
     }
 
     const sideEffectItem = this.mapExtensionUiSideEffect(event);
@@ -1532,22 +1559,11 @@ export class OmpAgentSession implements AgentSession {
       return;
     }
 
-    if (this.respondToCombinedAskUserFollowUp(event)) {
-      return;
-    }
-
-    const shouldCombineOptionalComment =
-      event.method === "select" &&
-      this.activeAskUserDialog?.allowComment === true &&
-      this.activeAskUserDialog.allowMultiple === false;
     const request =
       mapOmpRpcUiPermissionRequest(event, { provider: this.provider }) ??
-      mapExtensionUiRequestToPermission(event, {
-        provider: this.provider,
-        label: "OMP",
-        combineOptionalComment: shouldCombineOptionalComment,
-        allowFreeform: this.activeAskUserDialog?.allowFreeform,
-      });
+      this.questionUi.handleRequest(event, this.provider, (id, response) =>
+        this.runtimeSession.respondToExtensionUiRequest(id, response),
+      );
     if (!request) {
       return;
     }
@@ -1577,33 +1593,6 @@ export class OmpAgentSession implements AgentSession {
     return { type: "assistant_message", text: lines.join("\n") };
   }
 
-  private respondToCombinedAskUserFollowUp(
-    event: Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>,
-  ): boolean {
-    const pending = this.pendingCombinedAskUserResponse;
-    if (!pending || event.method !== "input") {
-      return false;
-    }
-
-    const placeholder = optionalString(event.placeholder);
-    if (pending.freeform !== null && !isOptionalInputPlaceholder(placeholder)) {
-      this.pendingCombinedAskUserResponse = {
-        ...pending,
-        freeform: null,
-      };
-      this.runtimeSession.respondToExtensionUiRequest(event.id, { value: pending.freeform });
-      return true;
-    }
-
-    if (isOptionalInputPlaceholder(placeholder)) {
-      this.pendingCombinedAskUserResponse = null;
-      this.runtimeSession.respondToExtensionUiRequest(event.id, { value: pending.comment });
-      return true;
-    }
-
-    return false;
-  }
-
   private handleCommandOutput(textValue: unknown): void {
     if (!this.activeTurnId) {
       return;
@@ -1625,13 +1614,21 @@ export class OmpAgentSession implements AgentSession {
   }
 
   private handleExtraRuntimeEvent(event: OmpRuntimeEvent): boolean {
-    if (
-      handleOmpHostToolRuntimeEvent(event, {
-        runtimeSession: this.runtimeSession,
-        paseoTools: this.paseoTools,
-        logger: this.logger,
-      })
-    ) {
+    if (event.type === "model_changed") {
+      void this.refreshState()
+        .then(() =>
+          this.emit({
+            type: "model_changed",
+            provider: this.provider,
+            runtimeInfo: this.runtimeInfoFromState(),
+          }),
+        )
+        .catch((error: unknown) =>
+          this.logger.debug({ err: error }, "OMP state unavailable after model change"),
+        );
+      return true;
+    }
+    if (handleOmpHostToolRuntimeEvent(event, this.hostTools, this.runtimeSession, this.logger)) {
       return true;
     }
     if (event.type === "subagent_lifecycle") {
@@ -1746,15 +1743,17 @@ export class OmpAgentSession implements AgentSession {
           ? event.agentInvoked
           : undefined;
       if (requestId && agentInvoked !== undefined) {
+        const result = { agentInvoked, error: promptResultError(event) };
         if (requestId === this.activePromptRequestId && this.activeTurnId) {
           this.activePromptAgentInvoked = agentInvoked;
+          this.activePromptError = result.error;
           if (agentInvoked === false) {
             this.scheduleNoTurnPromptCompletion(this.activeTurnId);
           } else {
             this.cancelNoTurnPromptCompletion();
           }
         } else if (this.activePromptRequestId === null) {
-          this.pendingPromptResults.set(requestId, agentInvoked);
+          this.pendingPromptResults.set(requestId, result);
         }
       }
       return;
@@ -1778,19 +1777,18 @@ export class OmpAgentSession implements AgentSession {
   }
 
   private handleProcessExit(error: string): void {
+    this.runtimeDead = true;
+    void this.hostTools?.close();
     this.usagePoller.stopTurn();
-    this.terminalizeActiveWork();
-    this.subagentIndex.clear(this.runtimeSession);
     if (!this.activeTurnId) {
+      this.terminalizeActiveWork();
+      this.subagentIndex.clear(this.runtimeSession);
+      this.emit({ type: "turn_failed", provider: this.provider, error });
       return;
     }
     const turnId = this.activeTurnId;
-    this.activeTurnId = null;
-    this.activeClientMessageId = null;
-    this.activeTurnStarted = false;
-    this.activeTurnHasUserMessage = false;
-    this.activeTurnTerminalAssistantMessage = null;
-    this.clearNoTurnBuffers();
+    this.resetActiveTurn({ terminalizeWork: true });
+    this.subagentIndex.clear(this.runtimeSession);
     this.emit({
       type: "turn_failed",
       provider: this.provider,
@@ -1836,7 +1834,7 @@ export class OmpAgentSession implements AgentSession {
       case "tool_execution_start": {
         const toolCall = parseToolArgs(event.toolName, event.args);
         this.activeToolCalls.set(event.toolCallId, toolCall);
-        this.activeAskUserDialog = readActiveAskUserDialog(event.toolName, event.args);
+        this.questionUi.start(event.toolName, event.args);
         this.emitToolCallEvent(event.toolCallId, toolCall, "running", null, null);
         return;
       }
@@ -1906,14 +1904,12 @@ export class OmpAgentSession implements AgentSession {
       this.activeToolCalls.get(event.toolCallId) ?? parseToolArgs(event.toolName, null);
     this.activeToolCalls.delete(event.toolCallId);
 
-    if (event.toolName === "ask_user") {
-      this.activeAskUserDialog = null;
-      this.pendingCombinedAskUserResponse = null;
-    }
+    this.questionUi.finish(event.toolName);
 
     const result = parseToolResult(event.result);
-    const error = event.isError ? event.result : null;
-    const status = event.isError ? "failed" : "completed";
+    const failed = isOmpToolFailure(toolCall, result, Boolean(event.isError));
+    const error = failed ? toolFailureMessage(result) : null;
+    const status = failed ? "failed" : "completed";
     this.emitToolCallEvent(event.toolCallId, toolCall, status, result, error);
     if (event.toolName === "task") {
       this.subagentCardTracker.delete(event.toolCallId);
@@ -2008,6 +2004,7 @@ export class OmpAgentSession implements AgentSession {
   ): void {
     if (event.message.role === "assistant") {
       this.activeAssistantMessageId = null;
+      this.questionUi.observeMessage(event.message);
       if (turnId) {
         this.activeTurnTerminalAssistantMessage = event.message;
       }
@@ -2017,20 +2014,23 @@ export class OmpAgentSession implements AgentSession {
       if (shouldDisplayOmpCustomMessage(event.message)) {
         const text = getUserMessageText(event.message.content);
         if (text) {
+          const skillPrompt = ompSkillPromptUserText(event.message);
+          if (skillPrompt) {
+            this.emitSkillPromptEcho(turnId);
+            return;
+          }
           const item =
             mapOmpAdvisorMessageToToolCall(event.message, text) ??
-            mapOmpSystemNoticeToToolCall(text);
+            mapOmpSystemNoticeToNotification(text);
           this.emit({
             type: "timeline",
             provider: this.provider,
             turnId,
-            item: item ?? { type: "assistant_message", text },
+            item:
+              item ?? mapCustomMessageToToolCall(event.message, text, `omp-custom-${randomUUID()}`),
           });
         }
       }
-      if (!this.activeTurnHasUserMessage) {
-        this.completeTurn(turnId, []);
-      }
       return;
     }
 
@@ -2043,7 +2043,6 @@ export class OmpAgentSession implements AgentSession {
     }
     const nativeMessage = event.message as OmpAgentMessage & { id?: unknown; entryId?: unknown };
     const messageId = readNativeMessageId(nativeMessage);
-    const clientMessageId = this.activeClientMessageId;
     const emitUserMessage = (resolvedMessageId?: string): void => {
       if (resolvedMessageId) {
         // OMP re-emits user message_end frames for entries it has already
@@ -2054,6 +2053,7 @@ export class OmpAgentSession implements AgentSession {
         }
         this.emittedUserMessageIds.add(resolvedMessageId);
       }
+      const clientMessageId = this.takeClientMessage()?.clientMessageId;
       this.emit({
         type: "timeline",
         provider: this.provider,
@@ -2084,6 +2084,22 @@ export class OmpAgentSession implements AgentSession {
       });
   }
 
+  private emitSkillPromptEcho(turnId: string | undefined): void {
+    const pending = this.takeClientMessage();
+    if (!pending) return;
+    this.activeTurnHasUserMessage = true;
+    this.emit({
+      type: "timeline",
+      provider: this.provider,
+      turnId,
+      item: {
+        type: "user_message",
+        text: pending.text,
+        ...(pending.clientMessageId ? { clientMessageId: pending.clientMessageId } : {}),
+      },
+    });
+  }
+
   private emitToolCallEvent(
     toolCallId: string,
     toolCall: OmpTrackedToolCall,
@@ -2096,10 +2112,13 @@ export class OmpAgentSession implements AgentSession {
     if (!detail) {
       return false;
     }
+    const bridgedTool = this.hostTools?.bridge?.tool(toolCall.toolName);
     const baseItem = {
       type: "tool_call" as const,
       callId: toolCallId,
-      name: resolveToolCallName(toolCall, result),
+      name: bridgedTool
+        ? `${bridgedTool.server} / ${bridgedTool.tool}`
+        : resolveToolCallName(toolCall, result),
       detail,
     };
     const item =
@@ -2120,22 +2139,30 @@ export class OmpAgentSession implements AgentSession {
   ): ToolCallDetail | null {
     return mapOmpToolDetail(toolCall, result, {
       toolCallId,
+      bridgedTool: this.hostTools?.bridge?.tool(toolCall.toolName),
       mapSubagentDetail: (detail) =>
         this.subagentCardTracker.detailFor(toolCallId, detail) ?? detail,
     });
   }
 
   private completeTurn(turnId: string | undefined, messages: OmpAgentMessage[]): void {
-    this.activeTurnId = null;
-    this.activeClientMessageId = null;
-    this.activeAssistantMessageId = null;
-    this.activeTurnTerminalAssistantMessage = null;
-    this.activeTurnStarted = false;
-    this.activeTurnHasUserMessage = false;
-    this.clearNoTurnBuffers();
+    // OMP reports a stopped turn as a terminal response carrying its interrupt
+    // text as an error. That is the user's own Stop, not a failed turn.
+    if (isOmpAbortedTerminalResponse(messages)) {
+      this.usagePoller.stopTurn();
+      this.resetActiveTurn({ terminalizeWork: true });
+      this.emit({
+        type: "turn_canceled",
+        provider: this.provider,
+        turnId,
+        reason: "interrupted",
+      });
+      return;
+    }
     const errorMessage = latestOmpErrorMessage(messages);
     if (typeof errorMessage === "string" && errorMessage.length > 0) {
       this.usagePoller.stopTurn();
+      this.resetActiveTurn({ terminalizeWork: true });
       this.emit({
         type: "turn_failed",
         provider: this.provider,
@@ -2145,6 +2172,7 @@ export class OmpAgentSession implements AgentSession {
       return;
     }
     const finalUsage = this.usagePoller.completeTurn(turnId);
+    this.resetActiveTurn({ terminalizeWork: false });
     this.emit({
       type: "turn_completed",
       provider: this.provider,
@@ -2157,10 +2185,26 @@ export class OmpAgentSession implements AgentSession {
     turnId: string | undefined,
     messages: OmpAgentMessage[],
   ): Promise<void> {
+    const deadline = Date.now() + this.providerIdleDeadlineMs;
     while (!this.closed && this.activeTurnStarted && this.currentTurnIdForEvent() === turnId) {
+      if (Date.now() >= deadline) {
+        this.usagePoller.stopTurn();
+        this.resetActiveTurn({ terminalizeWork: true });
+        this.emit({
+          type: "turn_failed",
+          provider: this.provider,
+          turnId,
+          error: "OMP provider idle deadline exceeded",
+        });
+        return;
+      }
       try {
         const state = await this.runtimeSession.getState();
         this.state = state;
+        if (this.closed || !this.activeTurnStarted || this.currentTurnIdForEvent() !== turnId) {
+          // An interrupt settled this turn while the state check was in flight.
+          return;
+        }
         if (!state.isStreaming && !state.isCompacting) {
           this.completeTurn(turnId, messages);
           return;
@@ -2187,18 +2231,14 @@ export class OmpAgentClient implements AgentClient {
 
   private readonly logger: Logger;
   private readonly runtimeSettings?: ProviderRuntimeSettings;
-  private readonly providerParams: OmpRuntimeProviderParams;
-  private readonly modelRoleParams: OmpModelRoleParams;
   private readonly subagentCardScheduler?: OmpSubagentCardScheduler;
   private readonly providerIdleScheduler?: OmpProviderIdleScheduler;
   private readonly noTurnScheduler?: OmpNoTurnScheduler;
   private readonly usagePollScheduler?: OmpUsagePollScheduler;
-  private readonly runtime: OmpRuntime;
+  private readonly providerIdleDeadlineMs?: number;
+  private readonly runtime?: OmpRuntime;
 
   constructor(options: OmpAgentClientOptions) {
-    const { runtimeProviderParams, modelRoleParams } = resolveOmpProviderParams(
-      options.providerParams,
-    );
     const runtimeSettings = mergeOmpRuntimeSettings(
       {
         command: {
@@ -2210,32 +2250,56 @@ export class OmpAgentClient implements AgentClient {
     );
     this.logger = options.logger;
     this.runtimeSettings = runtimeSettings;
-    this.providerParams = runtimeProviderParams;
-    this.modelRoleParams = modelRoleParams;
     this.subagentCardScheduler = options.subagentCardScheduler;
     this.providerIdleScheduler = options.providerIdleScheduler;
     this.noTurnScheduler = options.noTurnScheduler;
     this.usagePollScheduler = options.usagePollScheduler;
-    this.runtime =
-      options.runtime ?? createRuntime(options.logger, runtimeSettings, this.providerParams);
+    this.providerIdleDeadlineMs = options.providerIdleDeadlineMs;
+    this.runtime = options.runtime;
   }
 
   private async configureNativePaseoTools(
     runtimeSession: OmpRuntimeSession,
     catalog: PaseoToolCatalog | undefined,
-  ): Promise<void> {
-    if (!catalog) {
+    config: AgentSessionConfig,
+    launchEnv?: NodeJS.ProcessEnv,
+  ): Promise<OmpHostToolRouter | undefined> {
+    if (!catalog && !config.mcpServers) {
       return;
     }
-    await setOmpHostTools(runtimeSession, catalog);
+    const bridge = await OmpMcpBridge.connect(config.mcpServers, config.cwd, this.logger, {
+      ...process.env,
+      ...this.runtimeSettings?.env,
+      ...launchEnv,
+    });
+    const router = new OmpHostToolRouter({ runtimeSession, catalog, bridge, logger: this.logger });
+    try {
+      await router.register();
+      return router;
+    } catch (error) {
+      await router.close();
+      throw error;
+    }
+  }
+
+  private async restoreFastMode(
+    runtimeSession: OmpRuntimeSession,
+    config: AgentSessionConfig,
+    state: OmpSessionState,
+  ): Promise<OmpSessionState> {
+    const value = config.featureValues?.fast_mode;
+    if (typeof value !== "boolean" || !hasOmpFastMode(state) || value === state.fastModeEnabled)
+      return state;
+    const result = await runtimeSession.setFastMode(value);
+    return { ...state, fastModeEnabled: result.enabled, fastModeActive: result.active };
   }
 
   async createSession(
     config: AgentSessionConfig,
     launchContext?: AgentLaunchContext,
   ): Promise<AgentSession> {
-    const launchMode = this.resolveLaunchMode(config.modeId);
-    const runtimeSession = await this.runtime.startSession({
+    const launchMode = this.resolveLaunchMode(config.modeId, config.providerOptions);
+    const startInput: OmpStartSessionInput = {
       cwd: config.cwd,
       protocolMode: "rpc-ui",
       model: config.model,
@@ -2245,22 +2309,39 @@ export class OmpAgentClient implements AgentClient {
       extraArgs: launchMode.extraArgs,
       systemPrompt: composeSystemPromptParts(config.systemPrompt, config.daemonAppendSystemPrompt),
       env: launchContext?.env,
-    });
+    };
+    const runtimeSession = await this.resolveRuntime(config.providerOptions).startSession(
+      startInput,
+    );
+    let hostTools: OmpHostToolRouter | undefined;
     try {
-      await this.configureNativePaseoTools(runtimeSession, launchContext?.paseoTools);
-      return new OmpAgentSession({
+      hostTools = await this.configureNativePaseoTools(
+        runtimeSession,
+        launchContext?.paseoTools,
+        config,
+        startInput.env,
+      );
+      const initialState = await this.restoreFastMode(
         runtimeSession,
         config,
-        initialState: await runtimeSession.getState(),
+        await runtimeSession.getState(),
+      );
+      return new OmpAgentSession({
+        runtimeSession,
+        hostTools,
+        restartRuntime: this.buildRestartRuntime(startInput, config, launchContext),
+        config,
+        initialState,
         currentModeId: launchMode.modeId,
         logger: this.logger,
         subagentCardScheduler: this.subagentCardScheduler,
         providerIdleScheduler: this.providerIdleScheduler,
         noTurnScheduler: this.noTurnScheduler,
         usagePollScheduler: this.usagePollScheduler,
-        paseoTools: launchContext?.paseoTools,
+        providerIdleDeadlineMs: this.providerIdleDeadlineMs,
       });
     } catch (error) {
+      await hostTools?.close();
       await runtimeSession.close().catch(() => undefined);
       throw error;
     }
@@ -2270,6 +2351,7 @@ export class OmpAgentClient implements AgentClient {
     handle: AgentPersistenceHandle,
     overrides?: Partial<AgentSessionConfig>,
     launchContext?: AgentLaunchContext,
+    options?: AgentResumeSessionOptions,
   ): Promise<AgentSession> {
     const sessionFile = handle.nativeHandle;
     if (!sessionFile) {
@@ -2279,41 +2361,133 @@ export class OmpAgentClient implements AgentClient {
     const persistenceMetadata = parsePersistenceMetadata(handle.metadata);
     const resumeConfig = buildResumeConfig(persistenceMetadata, overrides, this.provider);
 
-    const launchMode = this.resolveLaunchMode(resumeConfig.modeId);
-    const runtimeSession = await this.runtime.startSession(
-      buildResumeStartInput({
+    if (options?.purpose === "history") {
+      return new OmpHistorySession(
+        handle,
         resumeConfig,
         sessionFile,
-        launchContext,
-        launchMode,
-      }),
+        this.provider,
+        persistenceMetadata.bridgedTools,
+      );
+    }
+
+    const launchMode = this.resolveLaunchMode(
+      resumeConfig.modeId,
+      resumeConfig.config.providerOptions,
     );
+    const startInput = buildResumeStartInput({
+      resumeConfig,
+      sessionFile,
+      launchContext,
+      launchMode,
+    });
+    const runtimeSession = await this.resolveRuntime(
+      resumeConfig.config.providerOptions,
+    ).startSession(startInput);
+    let hostTools: OmpHostToolRouter | undefined;
     try {
-      await this.configureNativePaseoTools(runtimeSession, launchContext?.paseoTools);
+      hostTools = await this.configureNativePaseoTools(
+        runtimeSession,
+        launchContext?.paseoTools,
+        resumeConfig.config,
+        startInput.env,
+      );
+      const resumedState = await this.applyResumeModel(runtimeSession, resumeConfig.model);
+      const config = {
+        ...resumeConfig.config,
+        model: modelToId(resumedState.model) ?? resumeConfig.config.model,
+      };
+      const initialState = await this.restoreFastMode(runtimeSession, config, resumedState);
       return new OmpAgentSession({
         runtimeSession,
-        config: resumeConfig.config,
-        initialState: await runtimeSession.getState(),
+        hostTools,
+        restartRuntime: this.buildRestartRuntime(startInput, config, launchContext),
+        config,
+        initialState,
         currentModeId: launchMode.modeId,
         logger: this.logger,
         subagentCardScheduler: this.subagentCardScheduler,
         providerIdleScheduler: this.providerIdleScheduler,
         noTurnScheduler: this.noTurnScheduler,
         usagePollScheduler: this.usagePollScheduler,
-        paseoTools: launchContext?.paseoTools,
+        providerIdleDeadlineMs: this.providerIdleDeadlineMs,
         live: false,
       });
     } catch (error) {
+      await hostTools?.close();
       await runtimeSession.close().catch(() => undefined);
       throw error;
     }
   }
 
+  // OMP resumes a session on the model it recorded, or on its default when that model
+  // is gone. Switching afterwards keeps a removed model from blocking the resume.
+  private async applyResumeModel(
+    runtimeSession: OmpRuntimeSession,
+    requestedModel: string | undefined,
+  ): Promise<OmpSessionState> {
+    const state = await runtimeSession.getState();
+    const reference = parseModelReference(requestedModel ?? null);
+    if (!reference?.provider) {
+      return state;
+    }
+    const { provider, id } = reference;
+    const isRequested = (model: OmpModel | null | undefined) =>
+      model?.provider === provider && model.id === id;
+    if (isRequested(state.model)) {
+      return state;
+    }
+    const availableModels = await runtimeSession.getAvailableModels();
+    if (!availableModels.some(isRequested)) {
+      this.logger.warn(
+        { requestedModel, sessionModel: modelToId(state.model) },
+        "OMP resumed on the session's model because the requested model is unavailable",
+      );
+      return state;
+    }
+    await runtimeSession.setModel(provider, id);
+    return runtimeSession.getState();
+  }
+
+  private buildRestartRuntime(
+    startInput: OmpStartSessionInput,
+    config: AgentSessionConfig,
+    launchContext?: AgentLaunchContext,
+  ): OmpAgentSessionOptions["restartRuntime"] {
+    return async (sessionFile, modeId) => {
+      const launchMode = this.resolveLaunchMode(modeId, config.providerOptions);
+      const next = await this.resolveRuntime(config.providerOptions).startSession({
+        ...startInput,
+        model: config.model,
+        thinkingOptionId: normalizeOmpThinkingOption(config.thinkingOptionId) ?? undefined,
+        modeId: launchMode.modeId,
+        extraArgs: launchMode.extraArgs,
+        ...(!startInput.noSession && sessionFile ? { session: sessionFile } : {}),
+      });
+      let hostTools: OmpHostToolRouter | undefined;
+      try {
+        hostTools = await this.configureNativePaseoTools(
+          next,
+          launchContext?.paseoTools,
+          config,
+          startInput.env,
+        );
+        const state = await next.getState();
+        await this.restoreFastMode(next, config, state);
+        return { runtimeSession: next, hostTools };
+      } catch (error) {
+        await hostTools?.close();
+        await next.close().catch(() => undefined);
+        throw error;
+      }
+    };
+  }
+
   async fetchCatalog(
     options: FetchCatalogOptions,
     context?: ProviderRefreshContext,
   ): Promise<ProviderCatalog> {
-    const launchMode = this.resolveLaunchMode(undefined);
+    const launchMode = this.resolveLaunchMode(undefined, options.providerOptions);
     let runtimeSession: OmpRuntimeSession | undefined;
     let closePromise: Promise<void> | undefined;
     const closeSession = () => {
@@ -2325,7 +2499,7 @@ export class OmpAgentClient implements AgentClient {
     context?.signal.addEventListener("abort", handleAbort, { once: true });
     try {
       await runProviderRefreshActivity(context, "runtime.start", async () => {
-        runtimeSession = await this.runtime.startSession({
+        runtimeSession = await this.resolveRuntime(options.providerOptions).startSession({
           cwd: options.scope === "global" ? homedir() : options.cwd,
           protocolMode: "rpc-ui",
           modeId: launchMode.modeId,
@@ -2359,13 +2533,21 @@ export class OmpAgentClient implements AgentClient {
   ): Promise<ImportableProviderSession[]> {
     return await listOmpImportableSessions({
       ...options,
-      sessionDir: this.providerParams.sessionDir,
+      sessionDir: resolveOmpProviderOptions(options?.providerOptions).runtimeOptions.sessionDir,
       runtimeSettings: this.runtimeSettings,
     });
   }
 
   async importSession(input: ImportProviderSessionInput, context: ImportProviderSessionContext) {
-    const importConfig = await readOmpImportSessionConfig(input.providerHandleId);
+    const descriptorOptions = {
+      sessionDir: resolveOmpProviderOptions(context.config.providerOptions).runtimeOptions
+        .sessionDir,
+      runtimeSettings: this.runtimeSettings,
+    };
+    const importConfig = await readOmpImportSessionConfig(
+      input.providerHandleId,
+      descriptorOptions,
+    );
     return importSessionFromPersistence({
       provider: this.provider,
       request: input,
@@ -2434,11 +2616,19 @@ export class OmpAgentClient implements AgentClient {
     }
   }
 
-  private resolveLaunchMode(modeId: string | undefined): {
+  private resolveLaunchMode(
+    modeId: string | undefined,
+    providerOptions?: Record<string, unknown>,
+  ): {
     modeId: string;
     extraArgs: string[];
   } {
-    return resolveOmpLaunchMode(modeId, this.modelRoleParams);
+    return resolveOmpLaunchMode(modeId, resolveOmpProviderOptions(providerOptions).modelRoles);
+  }
+
+  private resolveRuntime(providerOptions: Record<string, unknown> | undefined): OmpRuntime {
+    const { runtimeOptions } = resolveOmpProviderOptions(providerOptions);
+    return this.runtime ?? createRuntime(this.logger, this.runtimeSettings, runtimeOptions);
   }
 
   private async resolveOmpLaunch(): Promise<ResolvedProviderLaunch> {
diff --git a/packages/server/src/server/agent/providers/omp/ask.test.ts b/packages/server/src/server/agent/providers/omp/ask.test.ts
new file mode 100644
index 0000000000..7c72004e4a
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/ask.test.ts
@@ -0,0 +1,311 @@
+import { describe, expect, test } from "vitest";
+
+import { OmpHarness } from "./test-utils/omp-harness.js";
+
+function startAsk(omp: OmpHarness, multi: boolean): void {
+  omp.emit({
+    type: "tool_execution_start",
+    toolCallId: "ask-1",
+    toolName: "ask",
+    args: {
+      questions: [
+        {
+          id: "colors",
+          question: "Which colors?",
+          multi,
+          options: [
+            { label: "Red", description: "Warm" },
+            { label: "Blue", description: "Cool" },
+          ],
+        },
+      ],
+    },
+  });
+}
+
+function select(omp: OmpHarness, id: string, title: string, options: string[]): void {
+  omp.emit({ type: "extension_ui_request", id, method: "select", title, options });
+}
+
+describe("OMP ask RPC UI", () => {
+  test("recognizes ask arguments from the assistant message before the UI request", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "message_end",
+      message: {
+        role: "assistant",
+        content: [
+          {
+            type: "toolCall",
+            id: "ask-1",
+            name: "ask",
+            arguments: {
+              questions: [
+                {
+                  id: "colors",
+                  question: "Which colors?",
+                  multi: true,
+                  options: [
+                    { label: "Red", description: "Warm" },
+                    { label: "Blue", description: "Cool" },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+      },
+    });
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]).toMatchObject({
+      multiSelect: true,
+      allowOther: true,
+    });
+    startAsk(omp, true);
+  });
+  test("answers the multi-select loop from one Paseo question", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, true);
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+
+    expect(omp.pendingPermissions()).toHaveLength(1);
+    expect(omp.pendingPermissions()[0]).toMatchObject({
+      kind: "question",
+      input: {
+        questions: [
+          {
+            question: "Which colors?",
+            multiSelect: true,
+            allowOther: true,
+            options: [{ label: "Red" }, { label: "Blue" }],
+          },
+        ],
+      },
+    });
+    await omp.respondToPermission("select-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Blue, Red" } },
+    });
+    select(omp, "select-2", "(1 selected) Which colors?", [
+      "Red",
+      "Blue",
+      "✓ Done selecting",
+      "Other (type your own)",
+    ]);
+    select(omp, "select-3", "(2 selected) Which colors?", [
+      "Red",
+      "Blue",
+      "✔ Done selecting",
+      "Other (type your own)",
+    ]);
+
+    expect(omp.pendingPermissions()).toHaveLength(0);
+    expect(omp.extensionUiResponses()).toEqual([
+      { id: "select-1", response: { value: "Blue" } },
+      { id: "select-2", response: { value: "Red" } },
+      { id: "select-3", response: { value: "✔ Done selecting" } },
+    ]);
+  });
+
+  test("passes a single-select Other answer through OMP's editor", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, false);
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]).toMatchObject({ allowOther: true });
+    await omp.respondToPermission("select-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Violet" } },
+    });
+    omp.emit({
+      type: "extension_ui_request",
+      id: "editor-1",
+      method: "editor",
+      title: "Which colors? ○ Red ○ Blue ◉ Other (type your own) Enter your response:",
+    });
+
+    expect(omp.pendingPermissions()).toHaveLength(0);
+    expect(omp.extensionUiResponses()).toEqual([
+      { id: "select-1", response: { value: "Other (type your own)" } },
+      { id: "editor-1", response: { value: "Violet" } },
+    ]);
+  });
+
+  test("passes multi-select choices and Other through the same editor flow", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, true);
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+    await omp.respondToPermission("select-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Red, Violet" } },
+    });
+    select(omp, "select-2", "(1 selected) Which colors?", [
+      "Red",
+      "Blue",
+      "✓ Done selecting",
+      "Other (type your own)",
+    ]);
+    omp.emit({
+      type: "extension_ui_request",
+      id: "editor-1",
+      method: "editor",
+      title: "(1 selected) Which colors?",
+    });
+
+    expect(omp.pendingPermissions()).toHaveLength(0);
+    expect(omp.extensionUiResponses()).toEqual([
+      { id: "select-1", response: { value: "Red" } },
+      { id: "select-2", response: { value: "Other (type your own)" } },
+      { id: "editor-1", response: { value: "Violet" } },
+    ]);
+  });
+
+  test("cancels an ask without leaving replay state behind", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, true);
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+    await omp.respondToPermission("select-1", { behavior: "deny" });
+    select(omp, "select-after-cancel", "Another question", ["One", "Two"]);
+
+    expect(omp.extensionUiResponses()).toEqual([{ id: "select-1", response: { cancelled: true } }]);
+    expect(omp.pendingPermissions()).toHaveLength(1);
+    expect(omp.pendingPermissions()[0]?.id).toBe("select-after-cancel");
+  });
+
+  test("keeps single choices, tool approvals, and free-form input independent", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, false);
+    select(omp, "select-1", "Which colors?", ["Red", "Blue", "Other (type your own)"]);
+    await omp.respondToPermission("select-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Blue" } },
+    });
+    expect(omp.extensionUiResponses()).toContainEqual({
+      id: "select-1",
+      response: { value: "Blue" },
+    });
+
+    omp.emit({
+      type: "tool_execution_end",
+      toolCallId: "ask-1",
+      toolName: "ask",
+      result: "Blue",
+      isError: false,
+    });
+    omp.requestToolApproval({ id: "approval", tool: "bash", detail: "echo hi" });
+    expect(omp.pendingPermissions()[0]).toMatchObject({ id: "approval", kind: "tool" });
+    await omp.respondToPermission("approval", { behavior: "allow" });
+    expect(omp.extensionUiResponses()).toContainEqual({
+      id: "approval",
+      response: { value: "Approve" },
+    });
+
+    omp.emit({ type: "extension_ui_request", id: "input", method: "input", title: "Type a value" });
+    expect(omp.pendingPermissions()[0]).toMatchObject({ id: "input", kind: "question" });
+    await omp.respondToPermission("input", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "typed value" } },
+    });
+    expect(omp.extensionUiResponses()).toContainEqual({
+      id: "input",
+      response: { value: "typed value" },
+    });
+  });
+
+  test("recognizes OMP's numbered question title", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, true);
+    select(omp, "select-1", "Which colors? (1/2)", ["Red", "Blue", "Other (type your own)"]);
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]).toMatchObject({ multiSelect: true });
+  });
+
+  test("keeps descriptions with their labels when a select event reorders rows", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, true);
+    select(omp, "select-1", "Which colors?", ["Blue", "Red", "Other (type your own)"]);
+
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]?.options).toEqual([
+      { label: "Blue", description: "Cool" },
+      { label: "Red", description: "Warm" },
+    ]);
+  });
+
+  test("keeps a recommended option's description with its display label", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    startAsk(omp, false);
+    select(omp, "select-1", "Which colors?", [
+      "Red (Recommended)",
+      "Blue",
+      "Other (type your own)",
+    ]);
+    expect(omp.pendingPermissions()[0]?.input?.questions?.[0]?.options).toEqual([
+      { label: "Red (Recommended)", description: "Warm" },
+      { label: "Blue", description: "Cool" },
+    ]);
+  });
+
+  test("cancels cleanly when OMP omits Done selecting in a multi-question ask", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+    omp.emit({
+      type: "tool_execution_start",
+      toolCallId: "ask-1",
+      toolName: "ask",
+      args: {
+        questions: [
+          {
+            id: "colors",
+            question: "Which colors?",
+            multi: true,
+            options: [{ label: "Red" }, { label: "Blue" }],
+          },
+          {
+            id: "shape",
+            question: "Which shape?",
+            options: [{ label: "Round" }, { label: "Square" }],
+          },
+        ],
+      },
+    });
+    select(omp, "select-1", "Which colors? (1/2)", ["Red", "Blue", "Other (type your own)"]);
+    await omp.respondToPermission("select-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "Red" } },
+    });
+    // OMP's RPC select omits the right-arrow navigation callback and, with
+    // allowForward true, also omits its Done row on every follow-up request.
+    select(omp, "select-2", "(1 selected) Which colors? (1/2)", [
+      "Red",
+      "Blue",
+      "Other (type your own)",
+    ]);
+
+    expect(omp.extensionUiResponses()).toEqual([
+      { id: "select-1", response: { value: "Red" } },
+      { id: "select-2", response: { cancelled: true } },
+    ]);
+    expect(omp.pendingPermissions()).toHaveLength(0);
+    omp.emit({
+      type: "tool_execution_end",
+      toolCallId: "ask-1",
+      toolName: "ask",
+      result: "Ask tool was cancelled by the user",
+      isError: true,
+    });
+    expect(omp.timeline()).toContainEqual(
+      expect.objectContaining({
+        type: "tool_call",
+        name: "ask",
+        status: "failed",
+      }),
+    );
+  });
+});
diff --git a/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts b/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
index 9df9da68dd..2deae45850 100644
--- a/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
+++ b/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
@@ -66,10 +66,7 @@ function createRuntime(
   });
 }
 
-function replyToCommands(
-  child: OmpChild,
-  handler: (command: Record<string, unknown>) => unknown,
-): void {
+function onOmpCommand(child: OmpChild, handler: (command: Record<string, unknown>) => void): void {
   let buffer = "";
   child.stdin.on("data", (chunk) => {
     buffer += chunk.toString();
@@ -78,17 +75,42 @@ function replyToCommands(
       if (newlineIndex === -1) break;
       const line = buffer.slice(0, newlineIndex);
       buffer = buffer.slice(newlineIndex + 1);
-      const command = JSON.parse(line) as Record<string, unknown>;
-      const result = handler(command);
-      child.stdout.write(
-        `${JSON.stringify({
-          id: command.id,
-          type: "response",
-          command: command.type,
-          success: true,
-          data: result,
-        })}\n`,
-      );
+      handler(JSON.parse(line) as Record<string, unknown>);
+    }
+  });
+}
+
+function replyToCommands(
+  child: OmpChild,
+  handler: (command: Record<string, unknown>) => unknown,
+): void {
+  onOmpCommand(child, (command) => {
+    const result = handler(command);
+    child.stdout.write(
+      `${JSON.stringify({
+        id: command.id,
+        type: "response",
+        command: command.type,
+        success: true,
+        data: result,
+      })}\n`,
+    );
+  });
+}
+
+function capturePendingCommand(child: OmpChild, type: string): Promise<Record<string, unknown>> {
+  return new Promise((resolve) => {
+    onOmpCommand(child, (command) => {
+      if (command.type === type) resolve(command);
+    });
+  });
+}
+
+/** Kill the child the moment it receives `type`, so the request is in flight when it dies. */
+function exitOnCommand(child: OmpChild, type: string): void {
+  onOmpCommand(child, (command) => {
+    if (command.type === type) {
+      child.emit("exit", 1, null);
     }
   });
 }
@@ -99,6 +121,28 @@ function withoutRequestId(command: Record<string, unknown>): Record<string, unkn
 }
 
 describe("OMP CLI runtime", () => {
+  test("steer waits for OMP's response and surfaces rejection", async () => {
+    const child = createOmpChild();
+    let pending: Record<string, unknown> | null = null;
+    onOmpCommand(child, (command) => {
+      if (command.type === "steer") pending = command;
+    });
+    const launches: OmpRuntimeLaunch[] = [];
+    const session = await createRuntime(child, launches).startSession({
+      cwd: "/workspace/project",
+      env: { HOME: "/fixture/omp-home" },
+    });
+    expect(session.environment).toBe(launches[0]?.env);
+    expect(session.environment?.HOME).toBe("/fixture/omp-home");
+    const result = session.steer("change direction");
+    await new Promise((resolve) => setImmediate(resolve));
+    expect(pending).toMatchObject({ type: "steer", message: "change direction" });
+    child.stdout.write(
+      `${JSON.stringify({ id: pending!.id, type: "response", command: "steer", success: false, error: "rejected" })}\n`,
+    );
+    await expect(result).rejects.toThrow("rejected");
+    await session.close();
+  });
   test("uses the configured RPC timeout and attributes the pending phase", async () => {
     vi.useFakeTimers();
     const child = createOmpChild();
@@ -183,6 +227,95 @@ describe("OMP CLI runtime", () => {
     expect(eventTypes).toEqual(["notice"]);
   });
 
+  test("emits agent_end for a run that contains an OMP developer message", async () => {
+    const child = createOmpChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+    const eventTypes: string[] = [];
+    session.onEvent((event) => eventTypes.push(event.type));
+
+    // OMP 18.5 injects a developer reminder mid-run when a tool call matches a rule.
+    const reminder = {
+      role: "developer",
+      content: [
+        { type: "text", text: '<system-reminder reason="rule_violation">…</system-reminder>' },
+      ],
+      attribution: "agent",
+      timestamp: 2,
+    };
+    child.stdout.write(`${JSON.stringify({ type: "message_end", message: reminder })}\n`);
+    child.stdout.write(
+      `${JSON.stringify({
+        type: "agent_end",
+        messages: [
+          { role: "user", content: [{ type: "text", text: "Write tiny.ts" }], timestamp: 1 },
+          reminder,
+          {
+            role: "assistant",
+            content: [{ type: "text", text: "Done" }],
+            stopReason: "stop",
+            timestamp: 3,
+          },
+        ],
+      })}\n`,
+    );
+
+    expect(eventTypes).toEqual(["message_end", "agent_end"]);
+  });
+
+  test("emits agent_end for a run that contains every OMP message role Paseo does not render", async () => {
+    const child = createOmpChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+    const eventTypes: string[] = [];
+    session.onEvent((event) => eventTypes.push(event.type));
+
+    // A prompt that @-mentions a file makes OMP add a fileMention message to the run.
+    const fileMention = {
+      role: "fileMention",
+      files: [{ path: "notes.md", content: "# Notes\n", lineCount: 1 }],
+      timestamp: 2,
+    };
+    child.stdout.write(`${JSON.stringify({ type: "message_end", message: fileMention })}\n`);
+    child.stdout.write(
+      `${JSON.stringify({
+        type: "agent_end",
+        messages: [
+          { role: "user", content: [{ type: "text", text: "Read @notes.md" }], timestamp: 1 },
+          fileMention,
+          {
+            role: "pythonExecution",
+            code: "print(1)",
+            output: "1\n",
+            cancelled: false,
+            truncated: false,
+            timestamp: 3,
+          },
+          {
+            role: "hookMessage",
+            customType: "hook",
+            content: "hook output",
+            display: false,
+            timestamp: 4,
+          },
+          { role: "branchSummary", summary: "Earlier branch", fromId: "entry-1", timestamp: 5 },
+          {
+            role: "compactionSummary",
+            summary: "Earlier turns",
+            tokensBefore: 1000,
+            timestamp: 6,
+          },
+          {
+            role: "assistant",
+            content: [{ type: "text", text: "Done" }],
+            stopReason: "stop",
+            timestamp: 7,
+          },
+        ],
+      })}\n`,
+    );
+
+    expect(eventTypes).toEqual(["message_end", "agent_end"]);
+  });
+
   test("lists commands through get_available_commands", async () => {
     const child = createOmpChild();
     const commandTypes: string[] = [];
@@ -279,6 +412,27 @@ describe("OMP CLI runtime", () => {
     ]);
   });
 
+  test("compact waits beyond the control-plane timeout for a late response", async () => {
+    vi.useFakeTimers();
+    const child = createOmpChild();
+    const pending = capturePendingCommand(child, "compact");
+    const session = await createRuntime(child, [], { requestTimeoutMs: 100 }).startSession({
+      cwd: "/workspace/project",
+    });
+    try {
+      const compact = session.compact("focus on tests");
+      const command = await pending;
+      await vi.advanceTimersByTimeAsync(101);
+      child.stdout.write(
+        `${JSON.stringify({ id: command.id, type: "response", command: "compact", success: true, data: {} })}\n`,
+      );
+      await expect(compact).resolves.toBeUndefined();
+    } finally {
+      vi.useRealTimers();
+      await session.close();
+    }
+  });
+
   test("accepts the empty prompt acknowledgement emitted by OMP 17", async () => {
     const child = createOmpChild();
     replyToCommands(child, () => undefined);
@@ -287,6 +441,31 @@ describe("OMP CLI runtime", () => {
     await expect(session.prompt("hello")).resolves.toEqual({ requestId: "req_1" });
   });
 
+  test("reports OMP 18.3's late prompt rejection as a failed prompt result", async () => {
+    const child = createOmpChild();
+    onOmpCommand(child, (command) => {
+      if (command.type !== "prompt") return;
+      const response = { id: command.id, type: "response", command: "prompt" };
+      const rejection = { ...response, success: false, error: "No API key found for anthropic." };
+      child.stdout.write(
+        `${JSON.stringify({ ...response, success: true })}\n${JSON.stringify(rejection)}\n`,
+      );
+    });
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+    const events: unknown[] = [];
+    session.onEvent((event) => events.push(event));
+
+    await expect(session.prompt("hello")).resolves.toEqual({ requestId: "req_1" });
+
+    expect(events).toContainEqual({
+      type: "prompt_result",
+      id: "req_1",
+      agentInvoked: false,
+      status: "error",
+      error: { message: "No API key found for anthropic." },
+    });
+  });
+
   test("negotiates RPC protocol v2 when OMP advertises it", async () => {
     const child = createOmpChild({ supportedProtocolVersions: [1, 2] });
     const commands: Record<string, unknown>[] = [];
@@ -418,4 +597,27 @@ describe("OMP CLI runtime", () => {
     expect(result).toHaveLength(2_000);
     expect(result[0]).toEqual(expect.objectContaining({ id: "model-0" }));
   });
+
+  // A dead runtime owns no turn, so aborting it is already satisfied. Rejecting here
+  // makes AgentManager treat the interrupt as unacknowledged and refuse the stop, which
+  // pins the agent at `running` until the daemon restarts. See issue #3749.
+  test("abort resolves once the OMP process has exited", async () => {
+    const child = createOmpChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+
+    const environment = session.environment;
+    child.emit("exit", 1, null);
+    expect(session.environment).toBe(environment);
+    expect(environment).toBeDefined();
+
+    await expect(session.abort()).resolves.toBeUndefined();
+  });
+
+  test("abort resolves when the OMP process exits while the abort is in flight", async () => {
+    const child = createOmpChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+    exitOnCommand(child, "abort");
+
+    await expect(session.abort()).resolves.toBeUndefined();
+  });
 });
diff --git a/packages/server/src/server/agent/providers/omp/cli-runtime.ts b/packages/server/src/server/agent/providers/omp/cli-runtime.ts
index 2ec98fb9b6..75bd79f5f0 100644
--- a/packages/server/src/server/agent/providers/omp/cli-runtime.ts
+++ b/packages/server/src/server/agent/providers/omp/cli-runtime.ts
@@ -1,8 +1,14 @@
+import { createExternalProcessEnv } from "../../../paseo-env.js";
 import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import type { Logger } from "pino";
+import { z } from "zod";
 
 import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
-import { JsonlRpcProcess, type JsonlRpcLaunch } from "../jsonl-rpc-process.js";
+import {
+  JSONL_RPC_NO_TIMEOUT,
+  JsonlRpcProcess,
+  type JsonlRpcLaunch,
+} from "../jsonl-rpc-process.js";
 import { establishOmpProtocol } from "./protocol-session.js";
 import {
   buildOmpLaunch,
@@ -21,7 +27,7 @@ import {
   OmpModelsResultSchema,
   OmpPromptAckSchema,
   OmpRpcCommandSchema,
-  OmpRuntimeEventSchema,
+  parseOmpRuntimeEvent,
   OmpSessionStateSchema,
   OmpSessionStatsSchema,
   type OmpThinkingLevel,
@@ -69,6 +75,7 @@ export class OmpCliRuntime implements OmpRuntime {
       runtimeSettings: this.options.runtimeSettings,
       session: input,
     });
+    launch.env = createExternalProcessEnv(globalThis.process.env, launch.env ?? {});
     const [command, ...args] = launch.argv;
     const processLaunch: JsonlRpcLaunch = {
       command,
@@ -93,7 +100,7 @@ export class OmpCliRuntime implements OmpRuntime {
         requestTimeoutMs: this.options.requestTimeoutMs,
       });
       input.signal?.throwIfAborted();
-      return new OmpCliRuntimeSession(process, this.commandsRpcName);
+      return new OmpCliRuntimeSession(process, this.commandsRpcName, launch.env);
     } catch (error) {
       const startupError = error instanceof Error ? error : new Error(String(error));
       await process.close(startupError);
@@ -111,11 +118,12 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
   constructor(
     private readonly process: JsonlRpcProcess,
     private readonly commandsRpcName: "get_available_commands",
+    private readonly launchEnvironment: Record<string, string>,
   ) {
     process.onMessage((message) => {
-      const event = OmpRuntimeEventSchema.safeParse(message);
-      if (event.success) {
-        this.emit(event.data);
+      const event = parseOmpRuntimeEvent(message);
+      if (event) {
+        this.emit(event);
       }
     });
     process.onExit(({ error }) => {
@@ -123,6 +131,10 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
     });
   }
 
+  get environment(): Record<string, string> {
+    return this.launchEnvironment;
+  }
+
   onEvent(callback: (event: OmpRuntimeEvent) => void): () => void {
     this.subscribers.add(callback);
     return () => {
@@ -144,10 +156,13 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
   }
 
   async compact(customInstructions?: string): Promise<void> {
-    await this.request({
-      type: "compact",
-      ...(customInstructions ? { customInstructions } : {}),
-    });
+    await this.request(
+      {
+        type: "compact",
+        ...(customInstructions ? { customInstructions } : {}),
+      },
+      JSONL_RPC_NO_TIMEOUT,
+    );
   }
 
   async setAutoCompaction(enabled: boolean): Promise<void> {
@@ -155,13 +170,18 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
   }
 
   async abort(): Promise<void> {
-    await this.request({ type: "abort" });
+    await this.requestStopWork({ type: "abort" });
   }
 
   async getState(): Promise<OmpSessionState> {
     return OmpSessionStateSchema.parse(await this.request({ type: "get_state" }));
   }
 
+  async setFastMode(enabled: boolean): Promise<{ enabled: boolean; active: boolean }> {
+    const result = await this.request({ type: "set_fast_mode", enabled });
+    return z.object({ enabled: z.boolean(), active: z.boolean() }).parse(result);
+  }
+
   async getMessages(): Promise<OmpAgentMessage[]> {
     const data = OmpMessagesResultSchema.parse(await this.request({ type: "get_messages" }));
     return data.messages ?? [];
@@ -255,8 +275,11 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
     return data.messages ?? [];
   }
 
-  steer(message: string, images?: Array<{ type: "image"; data: string; mimeType: string }>): void {
-    this.process.send({ type: "steer", message, ...(images?.length ? { images } : {}) });
+  async steer(
+    message: string,
+    images?: Array<{ type: "image"; data: string; mimeType: string }>,
+  ): Promise<void> {
+    await this.request({ type: "steer", message, ...(images?.length ? { images } : {}) });
   }
 
   followUp(
@@ -292,6 +315,10 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
     return this.process.request(OmpRpcCommandSchema.parse(command), timeoutMs);
   }
 
+  private requestStopWork(command: OmpRpcCommand): Promise<void> {
+    return this.process.requestStopWork(OmpRpcCommandSchema.parse(command));
+  }
+
   private emit(event: OmpRuntimeEvent): void {
     for (const subscriber of this.subscribers) {
       subscriber(event);
diff --git a/packages/server/src/server/agent/providers/omp/custom-message.ts b/packages/server/src/server/agent/providers/omp/custom-message.ts
index e84095b4f0..4a85b198e7 100644
--- a/packages/server/src/server/agent/providers/omp/custom-message.ts
+++ b/packages/server/src/server/agent/providers/omp/custom-message.ts
@@ -5,3 +5,30 @@ type OmpCustomMessage = Extract<OmpAgentMessage, { role: "custom" }>;
 export function shouldDisplayOmpCustomMessage(message: OmpCustomMessage): boolean {
   return Reflect.get(message, "display") !== false;
 }
+
+// injected rows need their own message id so the stream coalescer never glues them
+// onto the assistant reply they arrive next to
+export function ompCustomMessageId(message: OmpCustomMessage, nextIndex: () => number): string {
+  const id = Reflect.get(message, "id");
+  return `omp-custom-${typeof id === "string" && id ? id : nextIndex()}`;
+}
+
+// omp does not persist the typed /skill:<name> as a user message, only the expansion
+// it injected on the user's behalf; rebuild the bubble from the expansion's details
+export function ompSkillPromptUserText(message: OmpCustomMessage): string | null {
+  if (
+    Reflect.get(message, "customType") !== "skill-prompt" ||
+    Reflect.get(message, "attribution") !== "user"
+  ) {
+    return null;
+  }
+  const details = Reflect.get(message, "details");
+  const name = details && typeof details === "object" ? Reflect.get(details, "name") : undefined;
+  if (typeof name !== "string" || !name) {
+    return null;
+  }
+  const args = Reflect.get(details as object, "args");
+  return typeof args === "string" && args.trim()
+    ? `/skill:${name} ${args.trim()}`
+    : `/skill:${name}`;
+}
diff --git a/packages/server/src/server/agent/providers/omp/event-mapper.test.ts b/packages/server/src/server/agent/providers/omp/event-mapper.test.ts
index 4c53ee9c0d..2959969e15 100644
--- a/packages/server/src/server/agent/providers/omp/event-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/omp/event-mapper.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest";
 import { mapOmpRuntimeEventToTimelineItem } from "./event-mapper.js";
 
 describe("OMP runtime event mapper", () => {
-  test("maps notice events to timeline status lines", () => {
+  test("maps notice events to timeline notifications", () => {
     const event = {
       type: "notice",
       level: "warning",
@@ -14,23 +14,9 @@ describe("OMP runtime event mapper", () => {
     expect(mapOmpRuntimeEventToTimelineItem(event)).toMatchObject({
       handled: true,
       item: {
-        type: "tool_call",
-        callId: expect.stringMatching(/^omp-notice:/),
-        name: "omp_notice",
-        status: "completed",
-        error: null,
-        detail: {
-          type: "plain_text",
-          label: "OMP warning notice from anthropic",
-          text: "Provider quota is getting low",
-          icon: "sparkles",
-        },
-        metadata: {
-          synthetic: true,
-          source: "omp_notice",
-          level: "warning",
-          eventSource: "anthropic",
-        },
+        type: "notification",
+        level: "warning",
+        message: "Provider quota is getting low",
       },
     });
   });
diff --git a/packages/server/src/server/agent/providers/omp/event-mapper.ts b/packages/server/src/server/agent/providers/omp/event-mapper.ts
index 83fbf95937..cec883dc69 100644
--- a/packages/server/src/server/agent/providers/omp/event-mapper.ts
+++ b/packages/server/src/server/agent/providers/omp/event-mapper.ts
@@ -30,7 +30,7 @@ export type OmpRuntimeEventMapping =
       logReason: string;
     };
 
-interface StatusLineNoticeInput {
+interface StatusLineInput {
   callId: string;
   name: string;
   label: string;
@@ -70,26 +70,13 @@ function mapNoticeEvent(event: unknown): OmpRuntimeEventMapping {
   if (!parsed.success) {
     return { handled: true, item: null, logReason: "malformed_omp_notice" };
   }
-  const label = parsed.data.source
-    ? `OMP ${parsed.data.level} notice from ${parsed.data.source}`
-    : `OMP ${parsed.data.level} notice`;
   return {
     handled: true,
-    item: buildStatusLineNotice({
-      callId: `omp-notice:${hashParts(parsed.data.level, parsed.data.source ?? "", parsed.data.message)}`,
-      name: "omp_notice",
-      label,
-      text: parsed.data.message,
-      icon: "sparkles",
-      status: parsed.data.level === "error" ? "failed" : "completed",
-      error: parsed.data.level === "error" ? parsed.data.message : undefined,
-      metadata: {
-        synthetic: true,
-        source: "omp_notice",
-        level: parsed.data.level,
-        ...(parsed.data.source ? { eventSource: parsed.data.source } : {}),
-      },
-    }),
+    item: {
+      type: "notification",
+      level: parsed.data.level,
+      message: parsed.data.message,
+    },
   };
 }
 
@@ -103,7 +90,7 @@ function mapGoalUpdatedEvent(event: unknown): OmpRuntimeEventMapping {
   const text = formatGoalText(parsed.data, goal);
   return {
     handled: true,
-    item: buildStatusLineNotice({
+    item: buildStatusLineItem({
       callId: `omp-goal:${goal?.id ?? hashParts(text)}`,
       name: "omp_goal_updated",
       label,
@@ -127,7 +114,7 @@ function mapAutoRetryStartEvent(event: unknown): OmpRuntimeEventMapping {
   const data = parsed.data;
   return {
     handled: true,
-    item: buildStatusLineNotice({
+    item: buildStatusLineItem({
       callId: `omp-auto-retry:${data.attempt}`,
       name: "omp_auto_retry",
       label: `OMP retry ${data.attempt}/${data.maxAttempts}`,
@@ -155,7 +142,7 @@ function mapAutoRetryEndEvent(event: unknown): OmpRuntimeEventMapping {
   const status = data.success ? "completed" : "failed";
   return {
     handled: true,
-    item: buildStatusLineNotice({
+    item: buildStatusLineItem({
       callId: `omp-auto-retry:${data.attempt}`,
       name: "omp_auto_retry",
       label: data.success
@@ -183,7 +170,7 @@ function mapRetryFallbackAppliedEvent(event: unknown): OmpRuntimeEventMapping {
   const data = parsed.data;
   return {
     handled: true,
-    item: buildStatusLineNotice({
+    item: buildStatusLineItem({
       callId: `omp-retry-fallback:${hashParts(data.role, data.from, data.to)}`,
       name: "omp_retry_fallback",
       label: `OMP fallback applied for ${data.role}`,
@@ -208,7 +195,7 @@ function mapRetryFallbackSucceededEvent(event: unknown): OmpRuntimeEventMapping
   const data = parsed.data;
   return {
     handled: true,
-    item: buildStatusLineNotice({
+    item: buildStatusLineItem({
       callId: `omp-retry-fallback-succeeded:${hashParts(data.role, data.model)}`,
       name: "omp_retry_fallback",
       label: `OMP fallback succeeded for ${data.role}`,
@@ -257,7 +244,7 @@ function mapAutoCompactionEndEvent(event: unknown): OmpRuntimeEventMapping {
   };
 }
 
-function buildStatusLineNotice(input: StatusLineNoticeInput): OmpTelemetryToolCallItem {
+function buildStatusLineItem(input: StatusLineInput): OmpTelemetryToolCallItem {
   const base = {
     type: "tool_call" as const,
     callId: input.callId,
diff --git a/packages/server/src/server/agent/providers/omp/history-hooks.ts b/packages/server/src/server/agent/providers/omp/history-hooks.ts
index 75b9505c3f..860d64443b 100644
--- a/packages/server/src/server/agent/providers/omp/history-hooks.ts
+++ b/packages/server/src/server/agent/providers/omp/history-hooks.ts
@@ -1,6 +1,6 @@
 import type { OmpHistoryMapperHooks } from "./message-history.js";
 import { mapOmpAdvisorMessageToToolCall } from "./advisor-message.js";
-import { mapOmpSystemNoticeToToolCall } from "./system-notice.js";
+import { mapOmpSystemNoticeToNotification } from "./system-notice.js";
 import { mapOmpToolDetail } from "./tool-call-mapper.js";
 import { resolveOmpEmittedToolCallId } from "./tool-call-id.js";
 
@@ -8,7 +8,7 @@ export const OMP_HISTORY_MAPPER_HOOKS: OmpHistoryMapperHooks = {
   mapToolDetail: mapOmpToolDetail,
   mapCustomMessage: (message, text, provider) => {
     const item =
-      mapOmpAdvisorMessageToToolCall(message, text) ?? mapOmpSystemNoticeToToolCall(text);
+      mapOmpAdvisorMessageToToolCall(message, text) ?? mapOmpSystemNoticeToNotification(text);
     return item ? { type: "timeline", provider, item } : null;
   },
   resolveToolCallId: resolveOmpEmittedToolCallId,
diff --git a/packages/server/src/server/agent/providers/omp/history-mapper.test.ts b/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
index db67f0cbe3..e64a93fd64 100644
--- a/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
@@ -8,7 +8,7 @@ import { streamOmpCoreHistory, type OmpCapturedUserMessageEntry } from "./messag
 import type { OmpAgentMessage } from "./rpc-types.js";
 import { FakeOmp } from "./test-utils/fake-omp.js";
 import { OMP_HISTORY_MAPPER_HOOKS } from "./history-hooks.js";
-import { streamOmpHistory } from "./history.js";
+import { readOmpHistoryTodoState, streamOmpHistory } from "./history.js";
 
 async function collectHistory(
   messages: OmpAgentMessage[],
@@ -27,6 +27,315 @@ async function collectHistory(
 }
 
 describe("OMP history mapper", () => {
+  test("renders visible custom messages as completed tools with their type and content", async () => {
+    const events = await collectHistory([
+      {
+        role: "custom",
+        customType: "project-context",
+        content: "Project instructions",
+        display: true,
+      },
+      {
+        role: "custom",
+        customType: "private-context",
+        content: "Hidden instructions",
+        display: false,
+      },
+      {
+        role: "custom",
+        customType: "project-context",
+        content: "Project instructions",
+        display: true,
+      },
+    ]);
+    expect(events.map((event) => event.item)).toEqual(
+      [1, 2].map((index) => ({
+        type: "tool_call",
+        callId: `omp-custom-${index}`,
+        name: "project-context",
+        status: "completed",
+        detail: { type: "plain_text", text: "Project instructions" },
+        metadata: { synthetic: true, customType: "project-context" },
+        error: null,
+      })),
+    );
+  });
+
+  test("replays a web search details error as failed when OMP sets isError false", async () => {
+    const events = await collectHistory([
+      {
+        role: "assistant",
+        content: [
+          { type: "toolCall", id: "web-1", name: "web_search", arguments: { query: "Paseo" } },
+        ],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "web-1",
+        toolName: "web_search",
+        content: [{ type: "text", text: "Error: All web search providers failed" }],
+        details: {
+          error: "All web search providers failed",
+          response: { provider: "none", sources: [] },
+        },
+        isError: false,
+      },
+    ]);
+    expect(events.at(-1)?.item).toMatchObject({
+      type: "tool_call",
+      status: "failed",
+      error: "All web search providers failed",
+    });
+  });
+
+  test("replays a Paseo browser tool result whose details error is an object", async () => {
+    const events = await collectHistory([
+      {
+        role: "assistant",
+        content: [{ type: "toolCall", id: "shot-1", name: "browser_screenshot", arguments: {} }],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "shot-1",
+        toolName: "browser_screenshot",
+        content: [{ type: "text", text: "The tab has not painted yet. Retry the screenshot." }],
+        details: {
+          ok: false,
+          error: {
+            code: "screenshot_no_frame",
+            message: "The tab has not painted yet. Retry the screenshot.",
+            retryable: true,
+          },
+        },
+        isError: false,
+      },
+      { role: "assistant", content: [{ type: "text", text: "Retrying later." }] },
+    ]);
+
+    expect(events.map((event) => event.item)).toEqual([
+      expect.objectContaining({ type: "tool_call", callId: "shot-1", status: "running" }),
+      expect.objectContaining({
+        type: "tool_call",
+        callId: "shot-1",
+        name: "browser_screenshot",
+        detail: expect.objectContaining({
+          type: "unknown",
+          output: expect.objectContaining({
+            details: expect.objectContaining({
+              error: expect.objectContaining({ code: "screenshot_no_frame", retryable: true }),
+            }),
+          }),
+        }),
+      }),
+      expect.objectContaining({ type: "assistant_message", text: "Retrying later." }),
+    ]);
+  });
+
+  test("reports a failed tool's structured details error by its message", async () => {
+    const events = await collectHistory([
+      {
+        role: "assistant",
+        content: [{ type: "toolCall", id: "tabs-1", name: "browser_list_tabs", arguments: {} }],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "tabs-1",
+        toolName: "browser_list_tabs",
+        content: [],
+        details: {
+          ok: false,
+          error: {
+            code: "browser_no_host",
+            message: "No browser automation host is connected.",
+            retryable: true,
+          },
+        },
+        isError: true,
+      },
+    ]);
+
+    expect(events.at(-1)?.item).toMatchObject({
+      type: "tool_call",
+      status: "failed",
+      error: "No browser automation host is connected.",
+    });
+  });
+
+  test("restores blocked and abandoned todo state from a session file", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-todo-state-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root" },
+        {
+          type: "message",
+          id: "todos",
+          parentId: "root",
+          message: {
+            role: "toolResult",
+            toolName: "todo",
+            details: {
+              phases: [
+                {
+                  name: "Tasks",
+                  tasks: [
+                    { content: "Wait for approval", status: "blocked", blocker: "review" },
+                    { content: "Old route", status: "abandoned" },
+                  ],
+                },
+              ],
+            },
+          },
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+    expect(await readOmpHistoryTodoState(sessionFile)).toEqual({
+      type: "todo",
+      items: [{ text: "Wait for approval (blocked: review)", status: "pending", completed: false }],
+    });
+  });
+
+  test("hides persisted developer reminders and shows other developer messages", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-developer-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root" },
+        {
+          type: "message",
+          id: "reminder",
+          parentId: "root",
+          message: {
+            role: "developer",
+            attribution: "agent",
+            content: [
+              {
+                type: "text",
+                text: "<system-reminder>\nContinue unfinished tasks\n</system-reminder>",
+              },
+            ],
+          },
+        },
+        {
+          type: "message",
+          id: "other",
+          parentId: "reminder",
+          message: {
+            role: "developer",
+            content: [{ type: "text", text: "External instruction" }],
+          },
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+    const events: AgentStreamEvent[] = [];
+    for await (const event of streamOmpHistory({ sessionFile, provider: "omp" }))
+      events.push(event);
+    expect(events.map((event) => event.item)).toEqual([
+      {
+        type: "tool_call",
+        callId: "omp-custom-1",
+        name: "custom-message",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          text: "[developer] External instruction",
+        },
+        metadata: { synthetic: true, customType: "custom-message" },
+        error: null,
+      },
+    ]);
+  });
+
+  test("replays a rule-violation run with the same rows the live timeline showed", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-rule-reminder-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root" },
+        {
+          type: "message",
+          id: "prompt",
+          parentId: "root",
+          message: {
+            role: "user",
+            content: "Read @notes.md, then write tiny.ts",
+          },
+        },
+        {
+          type: "message",
+          id: "mention",
+          parentId: "prompt",
+          message: {
+            role: "fileMention",
+            files: [
+              {
+                path: "notes.md",
+                content: "[notes.md#468D]\n1:# notes",
+                lineCount: 1,
+              },
+            ],
+          },
+        },
+        {
+          type: "ttsr_injection",
+          id: "injection",
+          parentId: "mention",
+          injectedRules: ["ts-no-tiny-functions"],
+        },
+        {
+          type: "message",
+          id: "rule-reminder",
+          parentId: "injection",
+          message: {
+            role: "developer",
+            content: [
+              {
+                type: "text",
+                text: '<system-reminder reason="rule_violation" rule="ts-no-tiny-functions" path="builtin-defaults:ts-no-tiny-functions">\nAvoid tiny functions.\n</system-reminder>',
+              },
+            ],
+          },
+        },
+        {
+          type: "message",
+          id: "answer",
+          parentId: "rule-reminder",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "FINAL_ANSWER" }],
+          },
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+    const events: AgentStreamEvent[] = [];
+    for await (const event of streamOmpHistory({
+      sessionFile,
+      provider: "omp",
+    }))
+      events.push(event);
+    expect(events.map((event) => event.item)).toEqual([
+      {
+        type: "user_message",
+        text: "Read @notes.md, then write tiny.ts",
+        messageId: "prompt",
+      },
+      {
+        type: "assistant_message",
+        text: "FINAL_ANSWER",
+        messageId: "omp-history-assistant-1",
+      },
+    ]);
+  });
+
   test("coalesces replayed subagent poll calls by target set", async () => {
     const events = await collectHistory([
       {
@@ -88,7 +397,7 @@ describe("OMP history mapper", () => {
     ]);
   });
 
-  test("absorbs replayed omp system-notice custom messages as synthetic tool calls", async () => {
+  test("maps replayed OMP system-notice custom messages to notifications", async () => {
     const notice = [
       "<system-notice>",
       "Background job DocsSmokeTwo has completed. Resume your work using the result below.",
@@ -124,24 +433,9 @@ describe("OMP history mapper", () => {
         type: "timeline",
         provider: "omp",
         item: {
-          type: "tool_call",
-          callId: "omp-notice:DocsSmokeTwo",
-          name: "task_notification",
-          status: "completed",
-          detail: {
-            type: "plain_text",
-            label: "Background job DocsSmokeTwo completed",
-            text: notice,
-            icon: "wrench",
-          },
-          metadata: {
-            synthetic: true,
-            source: "omp_system_notice",
-            taskId: "DocsSmokeTwo",
-            subagentType: "explore",
-            status: "completed",
-          },
-          error: null,
+          type: "notification",
+          level: "info",
+          message: "Background job DocsSmokeTwo completed",
         },
       },
       {
@@ -238,12 +532,28 @@ describe("OMP history mapper", () => {
       {
         type: "timeline",
         provider: "omp",
-        item: { type: "assistant_message", text: "visible explicit custom" },
+        item: {
+          type: "tool_call",
+          callId: "omp-custom-1",
+          name: "custom-message",
+          status: "completed",
+          detail: { type: "plain_text", text: "visible explicit custom" },
+          metadata: { synthetic: true, customType: "custom-message" },
+          error: null,
+        },
       },
       {
         type: "timeline",
         provider: "omp",
-        item: { type: "assistant_message", text: "visible legacy custom" },
+        item: {
+          type: "tool_call",
+          callId: "omp-custom-2",
+          name: "custom-message",
+          status: "completed",
+          detail: { type: "plain_text", text: "visible legacy custom" },
+          metadata: { synthetic: true, customType: "custom-message" },
+          error: null,
+        },
       },
       {
         type: "timeline",
@@ -381,6 +691,17 @@ describe("OMP history mapper", () => {
         },
       },
     });
+    // The running row must share the completed row's detail type, or the timeline merge keeps
+    // the running detail and drops the result.
+    expect(
+      events.flatMap((event) =>
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.callId === "xd-write-call"
+          ? [event.item.detail.type]
+          : [],
+      ),
+    ).toEqual(["plain_text", "unknown"]);
   });
 
   test("maps only the active JSONL chain with native user ids and visible unknown roles", async () => {
@@ -462,8 +783,27 @@ describe("OMP history mapper", () => {
     }
     expect(events.map((event) => event.item)).toEqual([
       { type: "user_message", text: "active branch", messageId: "user-active" },
-      { type: "assistant_message", text: "[future_control] Unsupported history record" },
-      { type: "assistant_message", text: "[developer] developer note" },
+      {
+        type: "tool_call",
+        callId: "omp-custom-1",
+        name: "custom-message",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          text: "[future_control] Unsupported history record",
+        },
+        metadata: { synthetic: true, customType: "custom-message" },
+        error: null,
+      },
+      {
+        type: "tool_call",
+        callId: "omp-custom-2",
+        name: "custom-message",
+        status: "completed",
+        detail: { type: "plain_text", text: "[developer] developer note" },
+        metadata: { synthetic: true, customType: "custom-message" },
+        error: null,
+      },
     ]);
 
     const omp = new FakeOmp();
@@ -489,6 +829,266 @@ describe("OMP history mapper", () => {
     ]);
   });
 
+  test("replays a compaction entry as a completed compaction row", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-compaction-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root", parentId: null },
+        {
+          type: "message",
+          id: "answer-1",
+          parentId: "root",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "Before." }],
+            responseId: "resp-1",
+          },
+        },
+        {
+          type: "compaction",
+          id: "compaction-1",
+          parentId: "answer-1",
+          timestamp: "2026-10-05T04:31:19.537Z",
+          summary: "## Goal\nSummary",
+          shortSummary: "Summary",
+          firstKeptEntryId: "answer-1",
+          tokensBefore: 77611,
+          tokensAfter: 37526,
+          method: "snapcompact",
+          details: { readFiles: [], modifiedFiles: [] },
+          fromExtension: false,
+        },
+        {
+          type: "message",
+          id: "answer-2",
+          parentId: "compaction-1",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "After." }],
+            responseId: "resp-2",
+          },
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+
+    const events: AgentStreamEvent[] = [];
+    for await (const event of streamOmpHistory({ sessionFile, provider: "omp" })) {
+      events.push(event);
+    }
+    expect(events.map((event) => event.item)).toEqual([
+      { type: "assistant_message", text: "Before.", messageId: "resp-1" },
+      { type: "compaction", status: "completed", preTokens: 77611 },
+      { type: "assistant_message", text: "After.", messageId: "resp-2" },
+    ]);
+    expect(events[1]).toMatchObject({ type: "timeline", timestamp: "2026-10-05T04:31:19.537Z" });
+  });
+
+  test("maps omp 18.1 custom_message entries like live custom messages", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-custom-message-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    const skillPrompt =
+      '[IMPORTANT: User invoked the "commit" skill; follow its instructions. Full skill below.]\n\n# Commit';
+    const ircMessage = "<irc>\n<from>worker-1</from>\n<message>ready for review</message>\n</irc>";
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root", parentId: null },
+        {
+          type: "message",
+          id: "answer-1",
+          parentId: "root",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "Done." }],
+            responseId: "resp-1",
+          },
+        },
+        {
+          type: "custom_message",
+          customType: "skill-prompt",
+          content: skillPrompt,
+          display: true,
+          details: {
+            name: "commit",
+            path: "/home/me/.agents/skills/commit/SKILL.md",
+            lineCount: 12,
+          },
+          attribution: "user",
+          id: "skill-1",
+          parentId: "answer-1",
+          timestamp: "2026-09-13T13:11:35.811Z",
+        },
+        {
+          type: "custom_message",
+          customType: "irc:incoming",
+          content: ircMessage,
+          display: true,
+          details: { from: "worker-1", message: "ready for review" },
+          attribution: "user",
+          id: "irc-1",
+          parentId: "skill-1",
+          timestamp: "2026-09-13T13:11:36.811Z",
+        },
+        {
+          type: "custom_message",
+          customType: "hidden-reminder",
+          content: "must stay hidden",
+          display: false,
+          attribution: "user",
+          id: "hidden-1",
+          parentId: "irc-1",
+          timestamp: "2026-09-13T13:11:37.811Z",
+        },
+        {
+          type: "custom_message",
+          customType: "legacy-no-display",
+          content: "visible without display flag",
+          attribution: "user",
+          id: "legacy-1",
+          parentId: "hidden-1",
+          timestamp: "2026-09-13T13:11:38.811Z",
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+
+    const events: AgentStreamEvent[] = [];
+    for await (const event of streamOmpHistory({ sessionFile, provider: "omp" })) {
+      events.push(event);
+    }
+    expect(events.map((event) => event.item)).toEqual([
+      { type: "assistant_message", text: "Done.", messageId: "resp-1" },
+      { type: "user_message", text: "/skill:commit", messageId: "omp-custom-skill-1-user" },
+      {
+        type: "tool_call",
+        callId: "omp-custom-irc-1",
+        name: "irc:incoming",
+        status: "completed",
+        detail: { type: "plain_text", text: ircMessage },
+        metadata: {
+          synthetic: true,
+          customType: "irc:incoming",
+          details: { from: "worker-1", message: "ready for review" },
+        },
+        error: null,
+      },
+      {
+        type: "tool_call",
+        callId: "omp-custom-legacy-1",
+        name: "legacy-no-display",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          text: "visible without display flag",
+        },
+        metadata: { synthetic: true, customType: "legacy-no-display" },
+        error: null,
+      },
+    ]);
+  });
+
+  test("synthesises the typed /skill bubble only for user-attributed skill prompts", async () => {
+    await expect(
+      collectHistory([
+        {
+          role: "custom",
+          content: '[IMPORTANT: User invoked the "improve" skill; follow its instructions.]',
+          customType: "skill-prompt",
+          display: true,
+          details: {
+            name: "improve",
+            path: "/home/me/.agents/skills/improve/SKILL.md",
+            lineCount: 9,
+            args: "tests",
+          },
+          attribution: "user",
+          id: "skill-args",
+        },
+        {
+          role: "custom",
+          content: '[IMPORTANT: Agent invoked the "improve" skill.]',
+          customType: "skill-prompt",
+          display: true,
+          details: {
+            name: "improve",
+            path: "/home/me/.agents/skills/improve/SKILL.md",
+            lineCount: 9,
+          },
+          attribution: "agent",
+          id: "skill-agent",
+        },
+        {
+          role: "custom",
+          content: "<irc>\n<from>worker-1</from>\n<message>hi</message>\n</irc>",
+          customType: "irc:incoming",
+          display: true,
+          details: { from: "worker-1", message: "hi" },
+          attribution: "user",
+          id: "irc-user",
+        },
+      ]),
+    ).resolves.toEqual([
+      {
+        type: "timeline",
+        provider: "omp",
+        item: {
+          type: "user_message",
+          text: "/skill:improve tests",
+          messageId: "omp-custom-skill-args-user",
+        },
+      },
+      {
+        type: "timeline",
+        provider: "omp",
+        item: {
+          type: "tool_call",
+          callId: "omp-custom-skill-agent",
+          name: "skill-prompt",
+          status: "completed",
+          detail: {
+            type: "plain_text",
+            text: '[IMPORTANT: Agent invoked the "improve" skill.]',
+          },
+          metadata: {
+            synthetic: true,
+            customType: "skill-prompt",
+            details: {
+              name: "improve",
+              path: "/home/me/.agents/skills/improve/SKILL.md",
+              lineCount: 9,
+            },
+          },
+          error: null,
+        },
+      },
+      {
+        type: "timeline",
+        provider: "omp",
+        item: {
+          type: "tool_call",
+          callId: "omp-custom-irc-user",
+          name: "irc:incoming",
+          status: "completed",
+          detail: {
+            type: "plain_text",
+            text: "<irc>\n<from>worker-1</from>\n<message>hi</message>\n</irc>",
+          },
+          metadata: {
+            synthetic: true,
+            customType: "irc:incoming",
+            details: { from: "worker-1", message: "hi" },
+          },
+          error: null,
+        },
+      },
+    ]);
+  });
+
   test("rehydrates structured batch and nested task transcripts with stable status and time", async () => {
     const dir = mkdtempSync(join(tmpdir(), "omp-subagent-history-"));
     const parentFile = join(dir, "parent.jsonl");
diff --git a/packages/server/src/server/agent/providers/omp/history.ts b/packages/server/src/server/agent/providers/omp/history.ts
index 7147e35e59..2c818dfc5a 100644
--- a/packages/server/src/server/agent/providers/omp/history.ts
+++ b/packages/server/src/server/agent/providers/omp/history.ts
@@ -1,12 +1,15 @@
 import { readFile } from "node:fs/promises";
 import { basename, extname, join } from "node:path";
-import type { AgentProvider, AgentStreamEvent } from "../../agent-sdk-types.js";
+import type { AgentProvider, AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
 import { normalizeProviderReplayTimestamp } from "../../provider-history-timestamps.js";
 import { OmpHistoryMapper, type OmpCapturedUserMessageEntry } from "./message-history.js";
 import type { OmpAgentMessage } from "./rpc-types.js";
 import type { OmpRuntimeSession } from "./runtime.js";
 import { OMP_HISTORY_MAPPER_HOOKS } from "./history-hooks.js";
+import type { OmpBridgedToolIdentity } from "./mcp-bridge.js";
 import { formatOmpSubagentTitle } from "./subagent-title.js";
+import { mapOmpTodoPhases } from "./todo-mapper.js";
+import { OmpTodoPhaseSchema } from "./rpc-types.js";
 
 interface OmpSessionEntry {
   type?: string;
@@ -17,6 +20,28 @@ interface OmpSessionEntry {
   [key: string]: unknown;
 }
 
+type OmpReplayEntry =
+  | { entry: OmpSessionEntry; message: OmpAgentMessage }
+  | { entry: OmpSessionEntry; item: AgentTimelineItem };
+
+export async function readOmpHistoryTodoState(
+  sessionFile: string,
+): Promise<AgentTimelineItem | null> {
+  const entries = await readActiveOmpEntryChain(sessionFile).catch((error: unknown) => {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
+    throw error;
+  });
+  for (let index = entries.length - 1; index >= 0; index -= 1) {
+    const message = entries[index]?.message;
+    if (message?.role !== "toolResult" || message.toolName !== "todo") continue;
+    const details = message.details;
+    if (!details || typeof details !== "object") return null;
+    const phases = OmpTodoPhaseSchema.array().safeParse(Reflect.get(details, "phases"));
+    return phases.success ? mapOmpTodoPhases(phases.data) : null;
+  }
+  return null;
+}
+
 function extractOmpSubagentModel(entries: readonly OmpSessionEntry[]): string | null {
   let resolvedModel: string | null = null;
   for (const entry of entries) {
@@ -45,6 +70,7 @@ export async function* streamOmpHistory(input: {
   sessionFile?: string;
   runtimeSession?: OmpRuntimeSession;
   provider: AgentProvider;
+  bridgedTools?: ReadonlyMap<string, OmpBridgedToolIdentity>;
   visitedSessionFiles?: Set<string>;
 }): AsyncGenerator<AgentStreamEvent> {
   if (!input.sessionFile) {
@@ -68,21 +94,34 @@ export async function* streamOmpHistory(input: {
     throw error;
   }
   const messages: OmpAgentMessage[] = [];
-  const messageEntries: OmpSessionEntry[] = [];
+  const replayEntries: OmpReplayEntry[] = [];
   const userEntries: OmpCapturedUserMessageEntry[] = [];
   for (const entry of entries) {
+    if (entry.type === "compaction") {
+      replayEntries.push({ entry, item: mapCompactionEntry(entry) });
+      continue;
+    }
     const mapped = mapEntryMessage(entry);
     if (!mapped) continue;
     messages.push(mapped);
-    messageEntries.push(entry);
+    replayEntries.push({ entry, message: mapped });
     if (mapped.role === "user" && entry.id) {
       userEntries.push({ id: entry.id, text: textOf(mapped.content) });
     }
   }
-  const mapper = new OmpHistoryMapper(input.provider, userEntries, OMP_HISTORY_MAPPER_HOOKS);
-  for (let index = 0; index < messages.length; index += 1) {
-    const timestamp = normalizeProviderReplayTimestamp(messageEntries[index]?.timestamp);
-    for (const event of mapper.mapMessages([messages[index]!])) {
+  const mapper = new OmpHistoryMapper(
+    input.provider,
+    userEntries,
+    OMP_HISTORY_MAPPER_HOOKS,
+    input.bridgedTools,
+  );
+  for (const replayEntry of replayEntries) {
+    const timestamp = normalizeProviderReplayTimestamp(replayEntry.entry.timestamp);
+    const events: AgentStreamEvent[] =
+      "item" in replayEntry
+        ? [{ type: "timeline", provider: input.provider, item: replayEntry.item }]
+        : mapper.mapMessages([replayEntry.message]);
+    for (const event of events) {
       yield timestamp && event.type === "timeline" ? { ...event, timestamp } : event;
     }
   }
@@ -326,17 +365,81 @@ function mapEntryMessage(entry: OmpSessionEntry): OmpAgentMessage | null {
     if (message.role === "system") {
       return null;
     }
+    if (message.role === "developer") {
+      const content = message.content;
+      if (
+        Array.isArray(content) &&
+        content.length === 1 &&
+        content[0]?.type === "text" &&
+        typeof content[0].text === "string" &&
+        isSystemReminder(content[0].text)
+      ) {
+        return null;
+      }
+      return visibleFallback(message.role, message);
+    }
     if (["user", "assistant", "toolResult", "custom", "bashExecution"].includes(message.role)) {
       return message as unknown as OmpAgentMessage;
     }
+    // OMP roles the live timeline does not render either, such as the fileMention that carries
+    // an @-mentioned file's content.
+    if (
+      [
+        "pythonExecution",
+        "hookMessage",
+        "branchSummary",
+        "compactionSummary",
+        "fileMention",
+      ].includes(message.role)
+    ) {
+      return null;
+    }
     return visibleFallback(message.role, message);
   }
+  if (entry.type === "custom_message") {
+    return mapCustomMessageEntry(entry);
+  }
   if (!entry.type || isControlEntryType(entry.type)) {
     return null;
   }
   return visibleFallback(entry.type, entry);
 }
 
+// OMP persists a compaction as a top-level entry; the live timeline shows it as a compaction row.
+// The entry does not record whether a manual /compact or auto-compaction produced it.
+function mapCompactionEntry(entry: OmpSessionEntry): AgentTimelineItem {
+  return {
+    type: "compaction",
+    status: "completed",
+    ...(typeof entry.tokensBefore === "number" ? { preTokens: entry.tokensBefore } : {}),
+  };
+}
+
+// omp 18.1+ persists injected rows (skill prompts, hub messages, job notices) as top-level
+// custom_message entries without a message object; replay them as live custom messages
+function mapCustomMessageEntry(entry: OmpSessionEntry): OmpAgentMessage | null {
+  const content = entry.content;
+  if (typeof content !== "string" && !Array.isArray(content)) {
+    return null;
+  }
+  return {
+    role: "custom",
+    content,
+    id: entry.id,
+    customType: entry.customType,
+    display: entry.display,
+    details: entry.details,
+    attribution: entry.attribution,
+  } as OmpAgentMessage;
+}
+
+// OMP's rule-violation reminder carries attributes: <system-reminder reason="rule_violation" ...>
+function isSystemReminder(text: string): boolean {
+  return (
+    /^<system-reminder[\s>]/.test(text.trimStart()) && text.trimEnd().endsWith("</system-reminder>")
+  );
+}
+
 function isControlEntryType(type: string): boolean {
   return (
     type === "session" ||
@@ -348,6 +451,7 @@ function isControlEntryType(type: string): boolean {
     type === "system_prompt" ||
     type === "model_change" ||
     type === "thinking_level_change" ||
+    type === "ttsr_injection" ||
     type === "tool_execution" ||
     type.startsWith("tool_execution_")
   );
@@ -357,6 +461,8 @@ function visibleFallback(role: string, value: Record<string, unknown>): OmpAgent
   let text = "Unsupported history record";
   if (typeof value.content === "string") {
     text = value.content;
+  } else if (Array.isArray(value.content)) {
+    text = textOf(value.content) || text;
   } else if (typeof value.text === "string") {
     text = value.text;
   }
diff --git a/packages/server/src/server/agent/providers/omp/host-tools.test.ts b/packages/server/src/server/agent/providers/omp/host-tools.test.ts
index 70a795a5ee..61be9887c8 100644
--- a/packages/server/src/server/agent/providers/omp/host-tools.test.ts
+++ b/packages/server/src/server/agent/providers/omp/host-tools.test.ts
@@ -4,10 +4,9 @@ import { z } from "zod";
 
 import type { PaseoToolCatalog, PaseoToolDefinition, PaseoToolResult } from "../../tools/types.js";
 import {
-  clearOmpHostToolState,
   handleOmpHostToolRuntimeEvent,
+  OmpHostToolRouter,
   serializeOmpHostTools,
-  waitForOmpHostToolsIdle,
 } from "./host-tools.js";
 import type { OmpRpcHostToolResult } from "./rpc-types.js";
 import { FakeOmp } from "./test-utils/fake-omp.js";
@@ -33,11 +32,14 @@ class OmpHostToolHarness {
   private readonly controlledStart = new Promise<void>((resolve) => {
     this.resolveControlledStart = resolve;
   });
+  private readonly router: OmpHostToolRouter;
 
   private constructor(
     private readonly catalog: PaseoToolCatalog,
     private readonly runtimeSession: Awaited<ReturnType<FakeOmp["startSession"]>>,
-  ) {}
+  ) {
+    this.router = new OmpHostToolRouter({ runtimeSession, catalog, logger: this.logger });
+  }
 
   static async withTools(tools: PaseoToolDefinition[]): Promise<OmpHostToolHarness> {
     const omp = new FakeOmp();
@@ -69,7 +71,12 @@ class OmpHostToolHarness {
     arguments: Record<string, unknown>;
   }): Promise<OmpRpcHostToolResult> {
     const result = this.runtimeSession.nextHostToolResult();
-    handleOmpHostToolRuntimeEvent({ type: "host_tool_call", ...input }, this.routerInput());
+    handleOmpHostToolRuntimeEvent(
+      { type: "host_tool_call", ...input },
+      this.router,
+      this.runtimeSession,
+      this.logger,
+    );
     return await result;
   }
 
@@ -82,7 +89,9 @@ class OmpHostToolHarness {
         toolName: "wait_for_agent",
         arguments: { agentId: "child-1" },
       },
-      this.routerInput(),
+      this.router,
+      this.runtimeSession,
+      this.logger,
     );
   }
 
@@ -93,7 +102,9 @@ class OmpHostToolHarness {
   cancelControlledCall(): void {
     handleOmpHostToolRuntimeEvent(
       { type: "host_tool_cancel", id: "cancel-1", targetId: "host-cancel" },
-      this.routerInput(),
+      this.router,
+      this.runtimeSession,
+      this.logger,
     );
   }
 
@@ -103,7 +114,7 @@ class OmpHostToolHarness {
   }
 
   async waitForIdle(): Promise<void> {
-    await waitForOmpHostToolsIdle(this.runtimeSession);
+    await this.router.waitForIdle();
   }
 
   wasControlledCallAborted(): boolean {
@@ -119,11 +130,7 @@ class OmpHostToolHarness {
   }
 
   close(): void {
-    clearOmpHostToolState(this.runtimeSession);
-  }
-
-  private routerInput() {
-    return { runtimeSession: this.runtimeSession, paseoTools: this.catalog, logger: this.logger };
+    this.router.clear();
   }
 }
 
diff --git a/packages/server/src/server/agent/providers/omp/host-tools.ts b/packages/server/src/server/agent/providers/omp/host-tools.ts
index 9850c654dd..1b0f7a24a7 100644
--- a/packages/server/src/server/agent/providers/omp/host-tools.ts
+++ b/packages/server/src/server/agent/providers/omp/host-tools.ts
@@ -6,6 +6,7 @@ import {
 } from "../../tools/paseo-tool-serialization.js";
 import type { PaseoToolCatalog, PaseoToolResult } from "../../tools/types.js";
 import type { OmpRuntimeSession } from "./runtime.js";
+import type { OmpMcpBridge } from "./mcp-bridge.js";
 import {
   OmpRpcHostToolCallRequestSchema,
   OmpRpcHostToolCancelRequestSchema,
@@ -24,12 +25,11 @@ interface PendingOmpHostToolCall {
 
 interface OmpHostToolRouterInput {
   runtimeSession: OmpRuntimeSession;
-  catalog: PaseoToolCatalog;
+  catalog?: PaseoToolCatalog;
+  bridge?: OmpMcpBridge;
   logger: Logger;
 }
 
-const routersByRuntimeSession = new WeakMap<OmpRuntimeSession, OmpHostToolRouter>();
-
 export function serializeOmpHostTools(catalog: PaseoToolCatalog): OmpRpcHostToolDefinition[] {
   return [...catalog.tools.values()].map((tool) => {
     const definition: OmpRpcHostToolDefinition = {
@@ -45,20 +45,11 @@ export function serializeOmpHostTools(catalog: PaseoToolCatalog): OmpRpcHostTool
   });
 }
 
-export async function setOmpHostTools(
-  runtimeSession: OmpRuntimeSession,
-  catalog: PaseoToolCatalog,
-): Promise<string[]> {
-  return await runtimeSession.setHostTools(serializeOmpHostTools(catalog));
-}
-
 export function handleOmpHostToolRuntimeEvent(
   event: unknown,
-  input: {
-    runtimeSession: OmpRuntimeSession;
-    paseoTools?: PaseoToolCatalog;
-    logger: Logger;
-  },
+  router: OmpHostToolRouter | undefined,
+  runtimeSession: OmpRuntimeSession,
+  logger: Logger,
 ): boolean {
   if (!isRecord(event) || typeof event.type !== "string" || !isOmpHostToolEventType(event.type)) {
     return false;
@@ -66,9 +57,8 @@ export function handleOmpHostToolRuntimeEvent(
 
   const call = OmpRpcHostToolCallRequestSchema.safeParse(event);
   if (call.success) {
-    const router = getRouter(input);
     if (!router) {
-      sendMissingCatalogResult(input.runtimeSession, call.data);
+      sendMissingCatalogResult(runtimeSession, call.data);
       return true;
     }
     router.handleCall(call.data);
@@ -77,17 +67,17 @@ export function handleOmpHostToolRuntimeEvent(
 
   const cancel = OmpRpcHostToolCancelRequestSchema.safeParse(event);
   if (cancel.success) {
-    getRouter(input)?.handleCancel(cancel.data.targetId);
+    router?.handleCancel(cancel.data.targetId);
     return true;
   }
 
   const update = OmpRpcHostToolUpdateSchema.safeParse(event);
   if (update.success) {
-    input.logger.debug({ id: update.data.id }, "Ignoring unexpected inbound OMP host tool update");
+    logger.debug({ id: update.data.id }, "Ignoring unexpected inbound OMP host tool update");
     return true;
   }
 
-  input.logger.debug({ event }, "Dropped malformed OMP host tool frame");
+  logger.debug({ event }, "Dropped malformed OMP host tool frame");
   return true;
 }
 
@@ -95,36 +85,6 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-export function clearOmpHostToolState(runtimeSession: OmpRuntimeSession): void {
-  routersByRuntimeSession.get(runtimeSession)?.clear();
-  routersByRuntimeSession.delete(runtimeSession);
-}
-
-export async function waitForOmpHostToolsIdle(runtimeSession: OmpRuntimeSession): Promise<void> {
-  await routersByRuntimeSession.get(runtimeSession)?.waitForIdle();
-}
-
-function getRouter(input: {
-  runtimeSession: OmpRuntimeSession;
-  paseoTools?: PaseoToolCatalog;
-  logger: Logger;
-}): OmpHostToolRouter | null {
-  if (!input.paseoTools) {
-    return null;
-  }
-  const existing = routersByRuntimeSession.get(input.runtimeSession);
-  if (existing) {
-    return existing;
-  }
-  const router = new OmpHostToolRouter({
-    runtimeSession: input.runtimeSession,
-    catalog: input.paseoTools,
-    logger: input.logger,
-  });
-  routersByRuntimeSession.set(input.runtimeSession, router);
-  return router;
-}
-
 function sendMissingCatalogResult(
   runtimeSession: OmpRuntimeSession,
   request: OmpRpcHostToolCallRequest,
@@ -141,9 +101,10 @@ function isOmpHostToolEventType(type: string): boolean {
   return type === "host_tool_call" || type === "host_tool_cancel" || type === "host_tool_update";
 }
 
-class OmpHostToolRouter {
+export class OmpHostToolRouter {
   private readonly runtimeSession: OmpRuntimeSession;
-  private readonly catalog: PaseoToolCatalog;
+  private readonly catalog?: PaseoToolCatalog;
+  readonly bridge?: OmpMcpBridge;
   private readonly logger: Logger;
   private readonly pendingCalls = new Map<string, PendingOmpHostToolCall>();
   private readonly idleWaiters = new Set<() => void>();
@@ -151,9 +112,17 @@ class OmpHostToolRouter {
   constructor(input: OmpHostToolRouterInput) {
     this.runtimeSession = input.runtimeSession;
     this.catalog = input.catalog;
+    this.bridge = input.bridge;
     this.logger = input.logger;
   }
 
+  async register(): Promise<string[]> {
+    return await this.runtimeSession.setHostTools([
+      ...(this.catalog ? serializeOmpHostTools(this.catalog) : []),
+      ...(this.bridge?.definitions ?? []),
+    ]);
+  }
+
   handleCall(request: OmpRpcHostToolCallRequest): void {
     const entry: PendingOmpHostToolCall = {
       controller: new AbortController(),
@@ -183,6 +152,11 @@ class OmpHostToolRouter {
     this.resolveIdleWaiters();
   }
 
+  async close(): Promise<void> {
+    this.clear();
+    await this.bridge?.close();
+  }
+
   waitForIdle(): Promise<void> {
     if (this.pendingCalls.size === 0) return Promise.resolve();
     return new Promise((resolve) => this.idleWaiters.add(resolve));
@@ -193,15 +167,20 @@ class OmpHostToolRouter {
     entry: PendingOmpHostToolCall,
   ): Promise<void> {
     try {
-      const result = await this.catalog.executeTool(request.toolName, request.arguments, {
-        signal: entry.controller.signal,
-        sendUpdate: (update) => {
-          if (entry.canceled || entry.controller.signal.aborted) {
-            return;
-          }
-          this.sendUpdate(request.id, update);
-        },
-      });
+      const result = this.bridge?.tool(request.toolName)
+        ? await this.bridge.execute(request.toolName, request.arguments, entry.controller.signal)
+        : ((await this.catalog?.executeTool(request.toolName, request.arguments, {
+            signal: entry.controller.signal,
+            sendUpdate: (update) => {
+              if (entry.canceled || entry.controller.signal.aborted) {
+                return;
+              }
+              this.sendUpdate(request.id, update);
+            },
+          })) ?? {
+            content: [{ type: "text", text: `Unknown host tool: ${request.toolName}` }],
+            isError: true,
+          });
       if (entry.canceled || entry.controller.signal.aborted) {
         return;
       }
diff --git a/packages/server/src/server/agent/providers/omp/map-omp-model.test.ts b/packages/server/src/server/agent/providers/omp/map-omp-model.test.ts
index 5a380e553d..da86a38ba7 100644
--- a/packages/server/src/server/agent/providers/omp/map-omp-model.test.ts
+++ b/packages/server/src/server/agent/providers/omp/map-omp-model.test.ts
@@ -26,7 +26,7 @@ describe("mapOmpModel thinking options", () => {
 
     const result = mapOmpModel(model, "omp");
 
-    expect(result.thinkingOptions?.map((option) => option.id)).toEqual(["high", "xhigh"]);
+    expect(result.thinkingOptions?.map((option) => option.id)).toEqual(["auto", "high", "xhigh"]);
     expect(result.defaultThinkingOptionId).toBe("xhigh");
     expect(result.thinkingOptions?.find((option) => option.isDefault)?.id).toBe("xhigh");
   });
@@ -37,6 +37,7 @@ describe("mapOmpModel thinking options", () => {
     const result = mapOmpModel(model, "omp");
 
     expect(result.thinkingOptions?.map((option) => option.id)).toEqual([
+      "auto",
       "off",
       "minimal",
       "low",
@@ -57,6 +58,7 @@ describe("mapOmpModel thinking options", () => {
     const result = mapOmpModel(model, "omp");
 
     expect(result.thinkingOptions?.map((option) => option.id)).toEqual([
+      "auto",
       "off",
       "minimal",
       "low",
@@ -93,7 +95,7 @@ describe("mapOmpModel thinking options", () => {
 
     const result = mapOmpModel(model, "omp");
 
-    expect(result.thinkingOptions?.map((option) => option.id)).toEqual(["low", "high"]);
+    expect(result.thinkingOptions?.map((option) => option.id)).toEqual(["auto", "low", "high"]);
     expect(result.defaultThinkingOptionId).toBe("low");
     expect(result.thinkingOptions?.find((option) => option.isDefault)?.id).toBe("low");
   });
@@ -106,7 +108,12 @@ describe("mapOmpModel thinking options", () => {
 
     const result = mapOmpModel(model, "omp");
 
-    expect(result.thinkingOptions?.map((option) => option.id)).toEqual(["low", "medium", "high"]);
+    expect(result.thinkingOptions?.map((option) => option.id)).toEqual([
+      "auto",
+      "low",
+      "medium",
+      "high",
+    ]);
     expect(result.defaultThinkingOptionId).toBe("low");
   });
 
@@ -119,6 +126,7 @@ describe("mapOmpModel thinking options", () => {
     const result = mapOmpModel(model, "omp");
 
     expect(result.thinkingOptions?.map((option) => option.id)).toEqual([
+      "auto",
       "off",
       "minimal",
       "low",
@@ -130,6 +138,22 @@ describe("mapOmpModel thinking options", () => {
     expect(result.defaultThinkingOptionId).toBe("medium");
   });
 
+  test("offers auto alongside reported efforts without making it the default", () => {
+    const model = baseModel({
+      reasoning: true,
+      thinking: { mode: "effort", efforts: ["low", "high"], defaultLevel: "high" },
+    });
+
+    const result = mapOmpModel(model, "omp");
+
+    expect(result.thinkingOptions?.at(0)).toEqual({
+      id: "auto",
+      label: "Auto",
+      description: "OMP picks the effort each turn",
+    });
+    expect(result.defaultThinkingOptionId).toBe("high");
+  });
+
   test("preserves provider and model id in the mapped definition", () => {
     const model = baseModel({
       reasoning: true,
diff --git a/packages/server/src/server/agent/providers/omp/map-omp-model.ts b/packages/server/src/server/agent/providers/omp/map-omp-model.ts
index 6cffc77949..094b1adf35 100644
--- a/packages/server/src/server/agent/providers/omp/map-omp-model.ts
+++ b/packages/server/src/server/agent/providers/omp/map-omp-model.ts
@@ -13,6 +13,7 @@ export const OMP_THINKING_OPTIONS: ReadonlyArray<{
   description: string;
   isDefault?: boolean;
 }> = [
+  { id: "auto", label: "Auto", description: "OMP picks the effort each turn" },
   { id: "off", label: "Off", description: "No extra reasoning" },
   { id: "minimal", label: "Minimal", description: "Light reasoning" },
   { id: "low", label: "Low", description: "Faster reasoning" },
@@ -82,8 +83,10 @@ function resolveOmpThinkingConfig(model: OmpModel): {
     reportedDefault && filtered.some((option) => option.id === reportedDefault)
       ? reportedDefault
       : (filtered[0]?.id ?? DEFAULT_OMP_THINKING_LEVEL);
+  // `auto` is a session-level OMP mode, never a per-model effort, so models do not list it.
+  const options = [OMP_THINKING_OPTIONS[0], ...filtered.filter((option) => option.id !== "auto")];
   return {
-    thinkingOptions: filtered.map((option) =>
+    thinkingOptions: options.map((option) =>
       mapThinkingOption(option, option.id === defaultThinkingOptionId),
     ),
     defaultThinkingOptionId,
diff --git a/packages/server/src/server/agent/providers/omp/mcp-bridge.test.ts b/packages/server/src/server/agent/providers/omp/mcp-bridge.test.ts
new file mode 100644
index 0000000000..20cab26fd5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/mcp-bridge.test.ts
@@ -0,0 +1,340 @@
+import { fileURLToPath } from "node:url";
+import { mkdir, mkdtemp, readFile, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, expect, test, vi } from "vitest";
+import { OmpHarness } from "./test-utils/omp-harness.js";
+import type { PaseoToolCatalog } from "../../tools/types.js";
+
+const fixture = fileURLToPath(new URL("./test-utils/echo-mcp-server.mjs", import.meta.url));
+const healthy = { type: "stdio" as const, command: process.execPath, args: [fixture] };
+
+describe("OMP MCP host tools", () => {
+  test("registers a stdio MCP tool and proxies its call", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness();
+    await omp.start({ mcpServers: { local: healthy } });
+    try {
+      const tool = omp.registeredHostTools().at(-1)?.[0];
+      expect(tool?.name).toMatch(/^mcp_local__echo_secret/);
+      const runtime = omp.runtime();
+      const result = runtime.nextHostToolResult();
+      runtime.emit({
+        type: "host_tool_call",
+        id: "call-1",
+        toolCallId: "tool-1",
+        toolName: tool!.name,
+        arguments: { word: "hello" },
+      });
+      expect(await result).toMatchObject({
+        id: "call-1",
+        result: { content: [{ type: "text", text: "MANGO:hello" }] },
+      });
+      const failed = runtime.nextHostToolResult();
+      runtime.emit({
+        type: "host_tool_call",
+        id: "call-2",
+        toolCallId: "tool-2",
+        toolName: tool!.name,
+        arguments: { word: "FAIL" },
+      });
+      expect(await failed).toMatchObject({
+        id: "call-2",
+        isError: true,
+        result: { isError: true, content: [{ type: "text", text: "fixture failure" }] },
+      });
+      runtime.emit({
+        type: "tool_execution_start",
+        toolCallId: "tool-1",
+        toolName: tool!.name,
+        args: { word: "hello" },
+      });
+      runtime.emit({
+        type: "tool_execution_end",
+        toolCallId: "tool-1",
+        toolName: tool!.name,
+        result: { content: [{ type: "text", text: "MANGO:hello" }] },
+      });
+      expect(omp.timeline().at(-1)).toMatchObject({
+        type: "tool_call",
+        name: "local / echo_secret",
+        status: "completed",
+        detail: {
+          type: "unknown",
+          input: { word: "hello" },
+          output: { content: [{ type: "text", text: "MANGO:hello" }] },
+        },
+      });
+      runtime.emit({
+        type: "tool_execution_start",
+        toolCallId: "native-1",
+        toolName: "mcp__native_echo_secret",
+        args: { word: "native" },
+      });
+      runtime.emit({
+        type: "tool_execution_end",
+        toolCallId: "native-1",
+        toolName: "mcp__native_echo_secret",
+        result: { content: [{ type: "text", text: "native result" }] },
+      });
+      expect(omp.timeline().at(-1)).toMatchObject({
+        type: "tool_call",
+        name: "mcp__native_echo_secret",
+        detail: { type: "unknown", input: { word: "native" } },
+      });
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("skips a failed server and registers a healthy one", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness();
+    await omp.start({
+      mcpServers: { broken: { type: "stdio", command: "/nonexistent/omp-mcp" }, local: healthy },
+    });
+    try {
+      expect(
+        omp
+          .registeredHostTools()
+          .at(-1)
+          ?.map((tool) => tool.name),
+      ).toEqual([expect.stringMatching(/^mcp_local__echo_secret/)]);
+      const runtime = omp.runtime();
+      const result = runtime.nextHostToolResult();
+      runtime.emit({
+        type: "host_tool_call",
+        id: "healthy-call",
+        toolCallId: "healthy-tool",
+        toolName: omp.registeredHostTools()[0]![0]!.name,
+        arguments: { word: "healthy" },
+      });
+      expect(await result).toMatchObject({
+        result: { content: [{ type: "text", text: "MANGO:healthy" }] },
+      });
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("starts with a healthy server when another never answers initialize", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness();
+    const started = Date.now();
+    await omp.start({
+      mcpServers: {
+        silent: {
+          type: "stdio",
+          command: process.execPath,
+          args: ["-e", "process.stdin.resume();setInterval(()=>{},1<<30)"],
+        },
+        local: healthy,
+      },
+    });
+    try {
+      expect(Date.now() - started).toBeLessThan(15_000);
+      expect(
+        omp
+          .registeredHostTools()
+          .at(-1)
+          ?.map((tool) => tool.name),
+      ).toEqual([expect.stringMatching(/^mcp_local__echo_secret/)]);
+    } finally {
+      await omp.close();
+    }
+  }, 80_000);
+
+  test("passes runtime and launch env to stdio, then applies server env", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness({
+      runtimeEnv: { OMP_MCP_RUNTIME_ENV: "runtime", OMP_MCP_PRECEDENCE: "runtime" },
+    });
+    await omp.start(
+      {
+        mcpServers: {
+          local: { ...healthy, env: { OMP_MCP_PRECEDENCE: "server" } },
+        },
+      },
+      undefined,
+      { PASEO_AGENT_ID: "agent-123", OMP_MCP_PRECEDENCE: "launch" },
+    );
+    try {
+      const runtime = omp.runtime();
+      const result = runtime.nextHostToolResult();
+      runtime.emit({
+        type: "host_tool_call",
+        id: "env-call",
+        toolCallId: "env-tool",
+        toolName: omp.registeredHostTools()[0]![0]!.name,
+        arguments: { word: "ENV" },
+      });
+      expect(await result).toMatchObject({
+        result: {
+          content: [
+            {
+              type: "text",
+              text: '{"runtime":"runtime","agent":"agent-123","precedence":"server"}',
+            },
+          ],
+        },
+      });
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("replays the bridge label and Codex-style detail after archive", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness();
+    await omp.start({ mcpServers: { local: healthy } });
+    try {
+      const exposedName = omp.registeredHostTools()[0]![0]!.name;
+      const persisted = omp.persistence();
+      expect(persisted?.metadata?.bridgedTools).toEqual([
+        [exposedName, { server: "local", tool: "echo_secret" }],
+      ]);
+      const directory = await mkdtemp(join(tmpdir(), "omp-mcp-history-"));
+      const sessionFile = join(directory, "session.jsonl");
+      await writeFile(
+        sessionFile,
+        [
+          { type: "session", id: "root", parentId: null },
+          {
+            type: "message",
+            id: "call",
+            parentId: "root",
+            message: {
+              role: "assistant",
+              content: [
+                {
+                  type: "toolCall",
+                  id: "tool-1",
+                  name: exposedName,
+                  arguments: { word: "REVIEW" },
+                },
+              ],
+            },
+          },
+          {
+            type: "message",
+            id: "result",
+            parentId: "call",
+            message: {
+              role: "toolResult",
+              toolCallId: "tool-1",
+              toolName: exposedName,
+              content: [{ type: "text", text: "MANGO:REVIEW" }],
+            },
+          },
+        ]
+          .map((entry) => JSON.stringify(entry))
+          .join("\n"),
+      );
+      const events = await omp.replayHistory({ ...persisted!, nativeHandle: sessionFile });
+      expect(events.findLast((event) => event.type === "timeline")?.item).toMatchObject({
+        type: "tool_call",
+        name: "local / echo_secret",
+        detail: {
+          type: "unknown",
+          input: { word: "REVIEW" },
+          output: { content: [{ type: "text", text: "MANGO:REVIEW" }] },
+        },
+      });
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("registers Paseo and MCP tools in the same replacement set", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const paseoTools: PaseoToolCatalog = {
+      tools: new Map([
+        [
+          "create_agent",
+          {
+            name: "create_agent",
+            description: "Create an agent",
+            handler: async () => ({ content: [] }),
+          },
+        ],
+      ]),
+      getTool: () => undefined,
+      executeTool: async () => ({ content: [] }),
+    };
+    const omp = new OmpHarness();
+    await omp.start({ mcpServers: { local: healthy } }, paseoTools);
+    try {
+      expect(omp.registeredHostTools()).toHaveLength(1);
+      expect(omp.registeredHostTools()[0]?.map((tool) => tool.name)).toEqual([
+        "create_agent",
+        expect.stringMatching(/^mcp_local__echo_secret_/),
+      ]);
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("registers MCP tools after resume and crash relaunch", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const omp = new OmpHarness();
+    await omp.resume(
+      { user: { id: "user-1", text: "hello" }, assistant: { id: "assistant-1", text: "hi" } },
+      { mcpServers: { local: healthy } },
+    );
+    try {
+      expect(omp.registeredHostTools().at(-1)?.[0]?.name).toMatch(/^mcp_local__echo_secret/);
+      omp.processExit("crashed");
+      await omp.startTurn("again");
+      await vi.waitFor(() => {
+        expect(omp.runtimeSessions()).toHaveLength(2);
+        expect(omp.registeredHostTools().at(-1)?.[0]?.name).toMatch(/^mcp_local__echo_secret/);
+      });
+    } finally {
+      await omp.close();
+    }
+  });
+
+  test("closes the stdio MCP child with the session", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const directory = await mkdtemp(join(tmpdir(), "omp-mcp-pid-"));
+    const pidFile = join(directory, "pid");
+    const omp = new OmpHarness();
+    await omp.start({ mcpServers: { local: { ...healthy, env: { OMP_MCP_PID_FILE: pidFile } } } });
+    const pid = Number(await readFile(pidFile, "utf8"));
+    expect(() => process.kill(pid, 0)).not.toThrow();
+    await omp.close();
+    expect(() => process.kill(pid, 0)).toThrow();
+  });
+
+  test("cancels an in-flight MCP call when OMP cancels its host tool", async () => {
+    await mkdir("/tmp/paseo-omp-agent-test", { recursive: true });
+    const directory = await mkdtemp(join(tmpdir(), "omp-mcp-cancel-"));
+    const waitFile = join(directory, "waiting");
+    const cancelFile = join(directory, "cancelled");
+    const omp = new OmpHarness();
+    await omp.start({
+      mcpServers: {
+        local: {
+          ...healthy,
+          env: { OMP_MCP_WAIT_FILE: waitFile, OMP_MCP_CANCEL_FILE: cancelFile },
+        },
+      },
+    });
+    try {
+      const runtime = omp.runtime();
+      runtime.emit({
+        type: "host_tool_call",
+        id: "wait-call",
+        toolCallId: "wait-tool",
+        toolName: omp.registeredHostTools()[0]![0]!.name,
+        arguments: { word: "WAIT" },
+      });
+      await vi.waitFor(async () => expect(await readFile(waitFile, "utf8")).toBe("waiting"));
+      runtime.emit({ type: "host_tool_cancel", id: "cancel-1", targetId: "wait-call" });
+      await vi.waitFor(async () => expect(await readFile(cancelFile, "utf8")).toBe("cancelled"));
+      expect(runtime.hostToolResults).toEqual([]);
+    } finally {
+      await omp.close();
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/omp/mcp-bridge.ts b/packages/server/src/server/agent/providers/omp/mcp-bridge.ts
new file mode 100644
index 0000000000..72f7a093f4
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/mcp-bridge.ts
@@ -0,0 +1,142 @@
+import { createHash } from "node:crypto";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import type { Logger } from "pino";
+import type { McpServerConfig } from "../../agent-sdk-types.js";
+import type { PaseoToolResult } from "../../tools/types.js";
+import type { OmpRpcHostToolDefinition } from "./rpc-types.js";
+
+interface BridgedTool {
+  client: Client;
+  server: string;
+  tool: string;
+}
+
+export interface OmpBridgedToolIdentity {
+  server: string;
+  tool: string;
+}
+
+const SERVER_TIMEOUT_MS = 10_000;
+
+export class OmpMcpBridge {
+  readonly definitions: OmpRpcHostToolDefinition[] = [];
+  private readonly tools = new Map<string, BridgedTool>();
+  private readonly clients: Client[] = [];
+  private closed = false;
+
+  static async connect(
+    servers: Record<string, McpServerConfig> | undefined,
+    cwd: string,
+    logger: Logger,
+    env: NodeJS.ProcessEnv,
+  ): Promise<OmpMcpBridge> {
+    const bridge = new OmpMcpBridge();
+    const connections = await Promise.all(
+      Object.entries(servers ?? {}).map(async ([serverName, config]) => {
+        const client = new Client({ name: "paseo-omp-mcp", version: "1.0.0" });
+        try {
+          const transport = makeTransport(config, cwd, env);
+          await client.connect(transport, { timeout: SERVER_TIMEOUT_MS });
+          const listed = await client.listTools(undefined, { timeout: SERVER_TIMEOUT_MS });
+          return { serverName, client, tools: listed.tools };
+        } catch (error) {
+          logger.warn({ err: error, server: serverName }, "OMP MCP server unavailable");
+          await client.close().catch(() => undefined);
+          return null;
+        }
+      }),
+    );
+    for (const connection of connections) {
+      if (!connection) continue;
+      const { serverName, client, tools } = connection;
+      bridge.clients.push(client);
+      for (const tool of tools) {
+        const name = bridgeName(serverName, tool.name);
+        bridge.tools.set(name, { client, server: serverName, tool: tool.name });
+        bridge.definitions.push({
+          name,
+          label: `${serverName} / ${tool.name}`,
+          description: tool.description || `${tool.name} from ${serverName}`,
+          loadMode: "essential",
+          parameters: tool.inputSchema,
+        });
+      }
+    }
+    return bridge;
+  }
+
+  tool(name: string): OmpBridgedToolIdentity | undefined {
+    const entry = this.tools.get(name);
+    return entry ? { server: entry.server, tool: entry.tool } : undefined;
+  }
+
+  toolIdentities(): Map<string, OmpBridgedToolIdentity> {
+    return new Map(
+      [...this.tools].map(([name, entry]) => [name, { server: entry.server, tool: entry.tool }]),
+    );
+  }
+
+  async execute(
+    name: string,
+    args: Record<string, unknown>,
+    signal: AbortSignal,
+  ): Promise<PaseoToolResult> {
+    const entry = this.tools.get(name);
+    if (!entry || this.closed) throw new Error(`MCP tool ${name} is unavailable`);
+    const raw = await entry.client.callTool({ name: entry.tool, arguments: args }, undefined, {
+      signal,
+    });
+    const result = CallToolResultSchema.parse(raw);
+    return {
+      content: result.content.map((item) => ({ ...item })),
+      ...(result.structuredContent !== undefined
+        ? { structuredContent: result.structuredContent }
+        : {}),
+      ...(result.isError !== undefined ? { isError: result.isError } : {}),
+    };
+  }
+
+  async close(): Promise<void> {
+    if (this.closed) return;
+    this.closed = true;
+    await Promise.all(this.clients.map((client) => client.close().catch(() => undefined)));
+    this.clients.length = 0;
+  }
+}
+
+function makeTransport(config: McpServerConfig, cwd: string, env: NodeJS.ProcessEnv) {
+  if (config.type === "stdio") {
+    return new StdioClientTransport({
+      command: config.command,
+      args: config.args,
+      cwd,
+      env: { ...env, ...config.env } as Record<string, string>,
+      stderr: "ignore",
+    });
+  }
+  if (config.type === "http") {
+    return new StreamableHTTPClientTransport(new URL(config.url), {
+      requestInit: { headers: config.headers },
+    });
+  }
+  return new SSEClientTransport(new URL(config.url), {
+    requestInit: { headers: config.headers },
+    eventSourceInit: {
+      fetch: (url, init) =>
+        fetch(url, { ...init, headers: { ...init?.headers, ...config.headers } }),
+    },
+  });
+}
+
+function bridgeName(server: string, tool: string): string {
+  const key = `${server}\0${tool}`;
+  const hash = createHash("sha256").update(key).digest("hex").slice(0, 12);
+  const clean = (name: string, length: number) =>
+    name.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, length);
+  // 64 characters also fits the stricter model tool-name limits OMP can reach.
+  return `mcp_${clean(server, 20)}__${clean(tool, 25)}_${hash}`;
+}
diff --git a/packages/server/src/server/agent/providers/omp/message-history.ts b/packages/server/src/server/agent/providers/omp/message-history.ts
index b030ec513c..1950502c89 100644
--- a/packages/server/src/server/agent/providers/omp/message-history.ts
+++ b/packages/server/src/server/agent/providers/omp/message-history.ts
@@ -1,12 +1,19 @@
+import { mapCustomMessageToToolCall } from "../custom-message.js";
 import type { AgentStreamEvent, AgentTimelineItem, ToolCallDetail } from "../../agent-sdk-types.js";
 import type { OmpAgentMessage, OmpImageContent, OmpTextContent } from "./rpc-types.js";
-import { shouldDisplayOmpCustomMessage } from "./custom-message.js";
+import type { OmpBridgedToolIdentity } from "./mcp-bridge.js";
+import {
+  ompCustomMessageId,
+  ompSkillPromptUserText,
+  shouldDisplayOmpCustomMessage,
+} from "./custom-message.js";
 import {
-  extractTextFromToolResult,
   mapToolDetail,
   parseToolArgs,
   parseToolResult,
   resolveToolCallName,
+  toolFailureMessage,
+  isOmpToolFailure,
   type OmpToolResult,
   type OmpTrackedToolCall,
 } from "./tool-call-detail.js";
@@ -26,7 +33,7 @@ export interface OmpHistoryMapperHooks {
   mapToolDetail?: (
     toolCall: OmpTrackedToolCall,
     result: OmpToolResult,
-    context: { toolCallId: string },
+    context: { toolCallId: string; bridgedTool?: OmpBridgedToolIdentity },
   ) => ToolCallDetail | null;
 }
 
@@ -58,11 +65,13 @@ export class OmpHistoryMapper {
   private readonly pendingToolCalls = new Map<string, OmpTrackedToolCall>();
   private userIndex = 0;
   private assistantIndex = 0;
+  private customIndex = 0;
 
   constructor(
     private readonly provider: string,
     private readonly userEntries: readonly OmpCapturedUserMessageEntry[] = [],
     private readonly hooks: OmpHistoryMapperHooks = {},
+    private readonly bridgedTools: ReadonlyMap<string, OmpBridgedToolIdentity> = new Map(),
   ) {}
 
   mapMessages(messages: readonly OmpAgentMessage[]): AgentStreamEvent[] {
@@ -126,15 +135,30 @@ export class OmpHistoryMapper {
     if (mappedEvent) {
       return [mappedEvent];
     }
-    return text
-      ? [
-          {
-            type: "timeline",
-            provider: this.provider,
-            item: { type: "assistant_message", text },
-          },
-        ]
-      : [];
+    if (!text) {
+      return [];
+    }
+    const messageId = ompCustomMessageId(message, () => {
+      this.customIndex += 1;
+      return this.customIndex;
+    });
+    const skillPrompt = ompSkillPromptUserText(message);
+    if (skillPrompt) {
+      return [
+        {
+          type: "timeline",
+          provider: this.provider,
+          item: { type: "user_message", text: skillPrompt, messageId: `${messageId}-user` },
+        },
+      ];
+    }
+    return [
+      {
+        type: "timeline",
+        provider: this.provider,
+        item: mapCustomMessageToToolCall(message, text, messageId),
+      },
+    ];
   }
 
   private mapAssistantMessage(
@@ -174,7 +198,7 @@ export class OmpHistoryMapper {
           item: {
             type: "tool_call",
             callId: this.resolveToolCallId(content.id, tracked),
-            name: tracked.toolName,
+            name: this.toolName(tracked, null),
             status: "running",
             detail,
             error: null,
@@ -201,10 +225,10 @@ export class OmpHistoryMapper {
       provider: this.provider,
       item: toToolResultTimelineItem({
         callId: this.resolveToolCallId(message.toolCallId, tracked),
-        name: resolveToolCallName(tracked, result),
-        isError: Boolean(message.isError),
+        name: this.toolName(tracked, result),
+        isError: isOmpToolFailure(tracked, result, Boolean(message.isError)),
         detail,
-        errorText: extractTextFromToolResult(result) ?? "Tool call failed",
+        errorText: toolFailureMessage(result),
       }),
     };
   }
@@ -242,7 +266,17 @@ export class OmpHistoryMapper {
     result: OmpToolResult,
   ): ToolCallDetail | null {
     const hook = this.hooks.mapToolDetail;
-    return hook ? hook(toolCall, result, { toolCallId }) : mapToolDetail(toolCall, result);
+    return hook
+      ? hook(toolCall, result, {
+          toolCallId,
+          bridgedTool: this.bridgedTools.get(toolCall.toolName),
+        })
+      : mapToolDetail(toolCall, result);
+  }
+
+  private toolName(toolCall: OmpTrackedToolCall, result: OmpToolResult): string {
+    const bridged = this.bridgedTools.get(toolCall.toolName);
+    return bridged ? `${bridged.server} / ${bridged.tool}` : resolveToolCallName(toolCall, result);
   }
 }
 
diff --git a/packages/server/src/server/agent/providers/omp/provider-config.ts b/packages/server/src/server/agent/providers/omp/provider-config.ts
index 6c360cbc60..0bcd369a1c 100644
--- a/packages/server/src/server/agent/providers/omp/provider-config.ts
+++ b/packages/server/src/server/agent/providers/omp/provider-config.ts
@@ -6,7 +6,6 @@ import { z } from "zod";
 
 import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
 
-const OMP_SESSION_DIR = "~/.omp/agent/sessions";
 const DEFAULT_OMP_MODE_ID = "full";
 const DEFAULT_OMP_READY_TIMEOUT_MS = 20_000;
 const DEFAULT_OMP_RPC_TIMEOUT_MS = 60_000;
@@ -14,7 +13,7 @@ const DEFAULT_OMP_RPC_TIMEOUT_MS = 60_000;
 export const MIN_SUPPORTED_OMP_VERSION = "16.3.9";
 export { OMP_MODES };
 
-export const OmpProviderParamsSchema = z
+export const OmpProviderOptionsSchema = z
   .object({
     sessionDir: z.string().min(1).optional(),
     rpcTimeoutMs: z.number().int().positive().optional(),
@@ -24,13 +23,13 @@ export const OmpProviderParamsSchema = z
   })
   .strict();
 
-export interface OmpRuntimeProviderParams {
-  sessionDir: string;
+export interface OmpRuntimeOptions {
+  sessionDir?: string;
   readyTimeoutMs: number;
   rpcTimeoutMs: number;
 }
 
-export interface OmpModelRoleParams {
+export interface OmpModelRoles {
   smolModel?: string;
   slowModel?: string;
   planModel?: string;
@@ -38,9 +37,9 @@ export interface OmpModelRoleParams {
 
 export function resolveOmpLaunchMode(
   modeId: string | undefined,
-  modelRoleParams: OmpModelRoleParams = {},
+  modelRoles: OmpModelRoles = {},
 ): { modeId: string; extraArgs: string[] } {
-  const modelRoleArgs = resolveOmpModelRoleArgs(modelRoleParams);
+  const modelRoleArgs = resolveOmpModelRoleArgs(modelRoles);
   switch (modeId ?? DEFAULT_OMP_MODE_ID) {
     case "full":
       return { modeId: "full", extraArgs: ["--approval-mode", "yolo", ...modelRoleArgs] };
@@ -59,11 +58,11 @@ export function resolveOmpLaunchMode(
   }
 }
 
-function resolveOmpModelRoleArgs(modelRoleParams: OmpModelRoleParams): string[] {
+function resolveOmpModelRoleArgs(modelRoles: OmpModelRoles): string[] {
   const args: string[] = [];
-  if (modelRoleParams.smolModel) args.push("--smol", modelRoleParams.smolModel);
-  if (modelRoleParams.slowModel) args.push("--slow", modelRoleParams.slowModel);
-  if (modelRoleParams.planModel) args.push("--plan", modelRoleParams.planModel);
+  if (modelRoles.smolModel) args.push("--smol", modelRoles.smolModel);
+  if (modelRoles.slowModel) args.push("--slow", modelRoles.slowModel);
+  if (modelRoles.planModel) args.push("--plan", modelRoles.planModel);
   return args;
 }
 
@@ -129,22 +128,22 @@ export function formatOmpVersionSupport(versionOutput: string): string {
   return `${match[1]}.${match[2]}.${match[3]} (${supported ? "supported" : "unsupported"}; minimum ${MIN_SUPPORTED_OMP_VERSION})`;
 }
 
-export function resolveOmpProviderParams(providerParams: unknown): {
-  runtimeProviderParams: OmpRuntimeProviderParams;
-  modelRoleParams: OmpModelRoleParams;
+export function resolveOmpProviderOptions(providerOptions: unknown): {
+  runtimeOptions: OmpRuntimeOptions;
+  modelRoles: OmpModelRoles;
 } {
-  const params = OmpProviderParamsSchema.parse(providerParams ?? {});
-  const configuredRpcTimeoutMs = params.rpcTimeoutMs;
+  const options = OmpProviderOptionsSchema.parse(providerOptions ?? {});
+  const configuredRpcTimeoutMs = options.rpcTimeoutMs;
   return {
-    runtimeProviderParams: {
-      sessionDir: params.sessionDir ?? OMP_SESSION_DIR,
+    runtimeOptions: {
+      sessionDir: options.sessionDir,
       readyTimeoutMs: configuredRpcTimeoutMs ?? DEFAULT_OMP_READY_TIMEOUT_MS,
       rpcTimeoutMs: configuredRpcTimeoutMs ?? DEFAULT_OMP_RPC_TIMEOUT_MS,
     },
-    modelRoleParams: {
-      ...(params.smolModel ? { smolModel: params.smolModel } : {}),
-      ...(params.slowModel ? { slowModel: params.slowModel } : {}),
-      ...(params.planModel ? { planModel: params.planModel } : {}),
+    modelRoles: {
+      ...(options.smolModel ? { smolModel: options.smolModel } : {}),
+      ...(options.slowModel ? { slowModel: options.slowModel } : {}),
+      ...(options.planModel ? { planModel: options.planModel } : {}),
     },
   };
 }
diff --git a/packages/server/src/server/agent/providers/omp/question-ui.ts b/packages/server/src/server/agent/providers/omp/question-ui.ts
new file mode 100644
index 0000000000..4fdb37f61c
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/question-ui.ts
@@ -0,0 +1,355 @@
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  AgentProvider,
+} from "../../agent-sdk-types.js";
+import type { OmpAgentMessage, OmpRuntimeEvent } from "./rpc-types.js";
+
+type UiRequest = Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>;
+interface UiResponse {
+  value?: string;
+  confirmed?: boolean;
+  cancelled?: boolean;
+}
+type SendResponse = (id: string, response: UiResponse) => void;
+
+const OTHER = "Other (type your own)";
+const ANSWER_HEADER = "Response";
+
+interface SelectOption {
+  label: string;
+  description?: string;
+}
+
+interface AskQuestion {
+  title: string;
+  multi: boolean;
+  options: SelectOption[];
+}
+
+interface PendingAnswer {
+  question: AskQuestion;
+  selected: string[];
+  custom: string | null;
+  next: "select" | "editor";
+}
+
+function record(value: unknown): Record<string, unknown> | null {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function string(value: unknown): string | undefined {
+  return typeof value === "string" ? value : undefined;
+}
+
+function readSelectOptions(event: UiRequest): SelectOption[] {
+  const details = Array.isArray(event.optionDetails) ? event.optionDetails : [];
+  return (event.options ?? []).map((label, index) => {
+    const description = string(record(details[index])?.description);
+    return description?.trim() ? { label, description } : { label };
+  });
+}
+
+function isOptionalInput(placeholder: string | undefined): boolean {
+  return /\boptional\b|\bskip\b/i.test(placeholder ?? "");
+}
+
+function inputTitle(title: string | undefined, placeholder: string | undefined): string {
+  if (!isOptionalInput(placeholder)) return title ?? "Enter a value";
+  return /\bcomment\b/i.test(`${title ?? ""}\n${placeholder ?? ""}`)
+    ? "Optional comment"
+    : "Optional response";
+}
+
+function genericQuestion(
+  event: UiRequest,
+  provider: AgentProvider,
+  title: string,
+  options: SelectOption[],
+  input: { placeholder?: string; allowEmpty?: boolean; dismissLabel?: string } = {},
+): AgentPermissionRequest {
+  return {
+    id: event.id,
+    provider,
+    name: `OMP ${event.method}`,
+    kind: "question",
+    title,
+    input: {
+      questions: [
+        { question: title, header: ANSWER_HEADER, options, multiSelect: false, ...input },
+      ],
+    },
+    metadata: { extensionUiMethod: event.method, answerHeader: ANSWER_HEADER },
+  };
+}
+
+function mapGenericQuestion(
+  event: UiRequest,
+  provider: AgentProvider,
+): AgentPermissionRequest | null {
+  switch (event.method) {
+    case "select":
+      return genericQuestion(
+        event,
+        provider,
+        event.title ?? "Select an option",
+        readSelectOptions(event),
+      );
+    case "input": {
+      const placeholder = event.placeholder;
+      const optional = isOptionalInput(placeholder);
+      return genericQuestion(event, provider, inputTitle(event.title, placeholder), [], {
+        ...(placeholder ? { placeholder } : {}),
+        ...(optional ? { allowEmpty: true, dismissLabel: "Skip" } : {}),
+      });
+    }
+    case "editor":
+      return genericQuestion(event, provider, event.title ?? "Edit text", []);
+    case "confirm":
+      return genericQuestion(
+        event,
+        provider,
+        [event.title, event.message].filter(Boolean).join("\n\n"),
+        [{ label: "Yes" }, { label: "No" }],
+      );
+    default:
+      return null;
+  }
+}
+
+function genericResponse(
+  request: AgentPermissionRequest,
+  response: AgentPermissionResponse,
+): UiResponse {
+  if (response.behavior === "deny") return { cancelled: true };
+  const answers = record(response.updatedInput?.answers);
+  const answer = Object.values(answers ?? {}).find(
+    (value): value is string => typeof value === "string",
+  );
+  if (answer === undefined) return { cancelled: true };
+  return request.metadata?.extensionUiMethod === "confirm"
+    ? { confirmed: /^yes$/i.test(answer.trim()) }
+    : { value: answer };
+}
+
+function questionTitle(title: string): string {
+  return title.replace(/^\(\d+ selected\) /, "");
+}
+
+function matchesQuestion(title: string, question: AskQuestion): boolean {
+  const plainTitle = questionTitle(title);
+  if (plainTitle === question.title) return true;
+  return (
+    plainTitle.startsWith(question.title) &&
+    /^ \(\d+\/\d+\)$/.test(plainTitle.slice(question.title.length))
+  );
+}
+
+function readQuestions(args: unknown): AskQuestion[] {
+  const questions = record(args)?.questions;
+  if (!Array.isArray(questions)) return [];
+  return questions.flatMap((item) => {
+    const question = record(item);
+    if (typeof question?.question !== "string" || !Array.isArray(question.options)) return [];
+    const options = question.options.flatMap((optionValue) => {
+      const option = record(optionValue);
+      if (typeof option?.label !== "string") return [];
+      return [
+        {
+          label: option.label,
+          ...(typeof option.description === "string" ? { description: option.description } : {}),
+        },
+      ];
+    });
+    return [{ title: question.question, multi: question.multi === true, options }];
+  });
+}
+
+function selectedAnswer(
+  answer: string,
+  labels: string[],
+  multi: boolean,
+): { selected: string[]; custom: string | null } {
+  if (!multi)
+    return labels.includes(answer)
+      ? { selected: [answer], custom: null }
+      : { selected: [], custom: answer };
+
+  // The shared question UI sends a comma-joined answer in click order. Consume
+  // exact option labels from the front; any remaining text is the Other answer.
+  let remaining = answer;
+  const selected: string[] = [];
+  while (remaining.length > 0) {
+    const label = labels
+      .filter((candidate) => !selected.includes(candidate))
+      .sort((left, right) => right.length - left.length)
+      .find((candidate) => remaining === candidate || remaining.startsWith(`${candidate}, `));
+    if (!label) break;
+    selected.push(label);
+    remaining = remaining === label ? "" : remaining.slice(label.length + 2);
+  }
+  return { selected, custom: remaining || null };
+}
+
+/** Owns OMP question mapping and the ask tool's multi-RPC answer sequence. */
+export class OmpQuestionUi {
+  private questions: AskQuestion[] = [];
+  private pending: PendingAnswer | null = null;
+
+  observeMessage(message: OmpAgentMessage): void {
+    if (message.role !== "assistant") return;
+    for (const item of message.content) {
+      if (item.type === "toolCall" && item.name === "ask") this.start(item.name, item.arguments);
+    }
+  }
+
+  start(toolName: string, args: unknown): void {
+    if (toolName === "ask") {
+      this.questions = readQuestions(args);
+      this.pending = null;
+    }
+  }
+
+  finish(toolName: string): void {
+    if (toolName === "ask") {
+      this.questions = [];
+      this.pending = null;
+    }
+  }
+
+  handleRequest(
+    event: UiRequest,
+    provider: AgentProvider,
+    send: SendResponse,
+  ): AgentPermissionRequest | null {
+    if (this.consume(event, send)) return null;
+    return this.mapAsk(event, provider) ?? mapGenericQuestion(event, provider);
+  }
+
+  private mapAsk(event: UiRequest, provider: AgentProvider): AgentPermissionRequest | null {
+    if (event.method !== "select" || typeof event.title !== "string") return null;
+    const title = event.title;
+    const question = this.questions.find((item) => matchesQuestion(title, item));
+    if (!question || !Array.isArray(event.options) || !event.options.includes(OTHER)) return null;
+
+    const descriptions = new Map(
+      question.options.map((option) => [option.label, option.description]),
+    );
+    const options = readSelectOptions(event)
+      .filter((option) => option.label !== OTHER && !option.label.endsWith(" Done selecting"))
+      .map((option) => {
+        const description =
+          descriptions.get(option.label) ??
+          descriptions.get(option.label.replace(/ \(Recommended\)$/, "")) ??
+          option.description;
+        return description ? { label: option.label, description } : { label: option.label };
+      });
+    return {
+      id: event.id,
+      provider,
+      name: "OMP ask",
+      kind: "question",
+      title: question.title,
+      input: {
+        questions: [
+          {
+            question: question.title,
+            header: ANSWER_HEADER,
+            options,
+            multiSelect: question.multi,
+            allowOther: true,
+          },
+        ],
+      },
+      metadata: {
+        ompAsk: true,
+        answerHeader: ANSWER_HEADER,
+        optionLabels: options.map((option) => option.label),
+      },
+    };
+  }
+
+  respond(
+    request: AgentPermissionRequest,
+    response: AgentPermissionResponse,
+    send: SendResponse,
+  ): void {
+    if (request.metadata?.ompAsk !== true) {
+      send(request.id, genericResponse(request, response));
+      return;
+    }
+    const question = this.questions.find((item) => item.title === request.title);
+    const answers = record(
+      response.behavior === "allow" ? response.updatedInput?.answers : undefined,
+    );
+    const answer = answers?.[ANSWER_HEADER];
+    if (response.behavior === "deny" || typeof answer !== "string" || !question) {
+      this.pending = null;
+      send(request.id, { cancelled: true });
+      return;
+    }
+
+    const labels = Array.isArray(request.metadata.optionLabels)
+      ? request.metadata.optionLabels.filter((item): item is string => typeof item === "string")
+      : [];
+    const { selected, custom } = selectedAnswer(answer, labels, question.multi);
+    if (selected.length === 0 && custom === null) {
+      this.pending = null;
+      send(request.id, { cancelled: true });
+      return;
+    }
+    if (question.multi) {
+      this.pending = { question, selected: selected.slice(1), custom, next: "select" };
+      send(request.id, { value: selected[0] ?? OTHER });
+      if (selected.length === 0) this.pending.next = "editor";
+    } else if (custom !== null) {
+      this.pending = { question, selected: [], custom, next: "editor" };
+      send(request.id, { value: OTHER });
+    } else {
+      this.pending = null;
+      send(request.id, { value: selected[0] });
+    }
+  }
+
+  consume(event: UiRequest, send: SendResponse): boolean {
+    const pending = this.pending;
+    if (pending?.next === "editor" && event.method === "editor" && pending.custom !== null) {
+      this.pending = null;
+      send(event.id, { value: pending.custom });
+      return true;
+    }
+    if (
+      !pending ||
+      typeof event.title !== "string" ||
+      !matchesQuestion(event.title, pending.question)
+    )
+      return false;
+    if (pending.next !== "select" || event.method !== "select" || !Array.isArray(event.options))
+      return false;
+
+    const choice = pending.selected[0];
+    if (choice && event.options.includes(choice)) {
+      pending.selected.shift();
+      send(event.id, { value: choice });
+      return true;
+    }
+    if (pending.custom !== null && event.options.includes(OTHER)) {
+      pending.next = "editor";
+      send(event.id, { value: OTHER });
+      return true;
+    }
+    const done = event.options.find((option) => option.endsWith(" Done selecting"));
+    if (!done) {
+      // OMP omits Done for multi-question asks and expects a right-arrow
+      // navigation callback, which its RPC response cannot express.
+      this.pending = null;
+      send(event.id, { cancelled: true });
+      return true;
+    }
+    this.pending = null;
+    send(event.id, { value: done });
+    return true;
+  }
+}
diff --git a/packages/server/src/server/agent/providers/omp/rpc-types.ts b/packages/server/src/server/agent/providers/omp/rpc-types.ts
index 63aaa7d265..b0514c7863 100644
--- a/packages/server/src/server/agent/providers/omp/rpc-types.ts
+++ b/packages/server/src/server/agent/providers/omp/rpc-types.ts
@@ -8,6 +8,7 @@ export const OmpThinkingLevelSchema = z.enum([
   "high",
   "xhigh",
   "max",
+  "auto",
 ]);
 
 export const OmpImageContentSchema = z
@@ -40,6 +41,13 @@ const OmpUserMessageSchema = z
     content: z.union([z.string(), z.array(z.union([OmpTextContentSchema, OmpImageContentSchema]))]),
   })
   .passthrough();
+// OMP injects hidden developer messages, such as rule-violation reminders, into a run.
+const OmpDeveloperMessageSchema = z
+  .object({
+    role: z.literal("developer"),
+    content: z.union([z.string(), z.array(z.union([OmpTextContentSchema, OmpImageContentSchema]))]),
+  })
+  .passthrough();
 const OmpCustomMessageSchema = z
   .object({
     role: z.literal("custom"),
@@ -78,13 +86,30 @@ const OmpBashExecutionMessageSchema = z
     timestamp: z.number(),
   })
   .passthrough();
+// Roles Paseo does not render. They are listed so that a frame carrying one, such as
+// agent_end, still parses; every role in OMP's RPC AgentMessage must appear in the union.
+const OmpPythonExecutionMessageSchema = z
+  .object({ role: z.literal("pythonExecution") })
+  .passthrough();
+const OmpHookMessageSchema = z.object({ role: z.literal("hookMessage") }).passthrough();
+const OmpBranchSummaryMessageSchema = z.object({ role: z.literal("branchSummary") }).passthrough();
+const OmpCompactionSummaryMessageSchema = z
+  .object({ role: z.literal("compactionSummary") })
+  .passthrough();
+const OmpFileMentionMessageSchema = z.object({ role: z.literal("fileMention") }).passthrough();
 
 export const OmpAgentMessageSchema = z.discriminatedUnion("role", [
   OmpUserMessageSchema,
+  OmpDeveloperMessageSchema,
   OmpCustomMessageSchema,
   OmpAssistantMessageSchema,
   OmpToolResultMessageSchema,
   OmpBashExecutionMessageSchema,
+  OmpPythonExecutionMessageSchema,
+  OmpHookMessageSchema,
+  OmpBranchSummaryMessageSchema,
+  OmpCompactionSummaryMessageSchema,
+  OmpFileMentionMessageSchema,
 ]);
 
 export const OmpModelThinkingSchema = z
@@ -128,6 +153,8 @@ export const OmpSessionStateSchema = z
     isStreaming: z.boolean(),
     isCompacting: z.boolean(),
     autoCompactionEnabled: z.boolean().optional(),
+    fastModeEnabled: z.boolean().optional(),
+    fastModeActive: z.boolean().optional(),
     sessionFile: z.string().optional(),
     sessionId: z.string(),
     sessionName: z.string().optional(),
@@ -333,7 +360,8 @@ export const OmpAgentSessionEventSchema = z.discriminatedUnion("type", [
 export const OmpTodoItemSchema = z
   .object({
     content: z.string(),
-    status: z.enum(["pending", "in_progress", "completed", "abandoned"]),
+    status: z.enum(["pending", "in_progress", "completed", "abandoned", "blocked"]),
+    blocker: z.string().optional(),
   })
   .passthrough();
 export const OmpTodoPhaseSchema = z
@@ -444,6 +472,7 @@ const OmpExtensionUiRequestSchema = z
     title: z.string().optional(),
     message: z.string().optional(),
     options: z.array(z.string()).optional(),
+    optionDetails: z.unknown().optional(),
     placeholder: z.string().optional(),
     url: z.string().optional(),
     launchUrl: z.string().optional(),
@@ -475,6 +504,8 @@ export const OmpRuntimeEventSchema = z.discriminatedUnion("type", [
       type: z.literal("prompt_result"),
       id: z.string().optional(),
       agentInvoked: z.boolean().optional(),
+      status: z.string().optional(),
+      error: z.object({ message: z.string() }).passthrough().optional(),
     })
     .passthrough(),
   z.object({ type: z.literal("process_exit"), error: z.string() }).passthrough(),
@@ -494,6 +525,7 @@ export const OmpRuntimeEventSchema = z.discriminatedUnion("type", [
   OmpRpcHostToolCallRequestSchema,
   OmpRpcHostToolCancelRequestSchema,
   OmpRpcHostToolUpdateSchema,
+  z.object({ type: z.literal("model_changed") }).passthrough(),
 ]);
 
 const OmpCommandBase = { id: z.string().optional() };
@@ -512,6 +544,13 @@ export const OmpRpcCommandSchema = z.discriminatedUnion("type", [
   z.object({ ...OmpCommandBase, type: z.literal("set_auto_compaction"), enabled: z.boolean() }),
   z.object({ ...OmpCommandBase, type: z.literal("abort") }),
   z.object({ ...OmpCommandBase, type: z.literal("get_state") }),
+  z.object({
+    ...OmpCommandBase,
+    type: z.literal("steer"),
+    message: z.string(),
+    images: z.array(OmpImageContentSchema).optional(),
+  }),
+  z.object({ ...OmpCommandBase, type: z.literal("set_fast_mode"), enabled: z.boolean() }),
   z.object({ ...OmpCommandBase, type: z.literal("get_messages") }),
   z.object({ ...OmpCommandBase, type: z.literal("get_available_models") }),
   z.object({
@@ -596,6 +635,36 @@ export type OmpSubagentEventPayload = z.infer<typeof OmpSubagentEventPayloadSche
 export type OmpAssistantMessageEvent = z.infer<typeof OmpAssistantMessageEventSchema>;
 export type OmpAgentSessionEvent = z.infer<typeof OmpAgentSessionEventSchema>;
 export type OmpRuntimeEvent = z.infer<typeof OmpRuntimeEventSchema>;
+
+/**
+ * COMPAT(ompLatePromptRejection): added in v0.11.0, remove after 2027-04-05 once the
+ * minimum supported OMP version emits prompt_result errors.
+ * OMP 18.3 reports a prompt it rejects after acknowledging it, such as one whose model has
+ * no API key, only as a second failed `response` frame for the prompt id. Later releases
+ * report the same outcome as a `prompt_result` with `status: "error"`.
+ */
+const OmpLatePromptRejectionSchema = z.object({
+  type: z.literal("response"),
+  command: z.literal("prompt"),
+  id: z.string(),
+  success: z.literal(false),
+  error: z.string(),
+});
+
+export function parseOmpRuntimeEvent(message: unknown): OmpRuntimeEvent | null {
+  const rejection = OmpLatePromptRejectionSchema.safeParse(message);
+  if (rejection.success) {
+    return {
+      type: "prompt_result",
+      id: rejection.data.id,
+      agentInvoked: false,
+      status: "error",
+      error: { message: rejection.data.error },
+    };
+  }
+  const event = OmpRuntimeEventSchema.safeParse(message);
+  return event.success ? event.data : null;
+}
 export type OmpTodoItem = z.infer<typeof OmpTodoItemSchema>;
 export type OmpTodoPhase = z.infer<typeof OmpTodoPhaseSchema>;
 export type OmpTodoReminderEvent = z.infer<typeof OmpTodoReminderEventSchema>;
diff --git a/packages/server/src/server/agent/providers/omp/runtime.ts b/packages/server/src/server/agent/providers/omp/runtime.ts
index dc8001e3ec..691e907139 100644
--- a/packages/server/src/server/agent/providers/omp/runtime.ts
+++ b/packages/server/src/server/agent/providers/omp/runtime.ts
@@ -43,6 +43,7 @@ export interface OmpStartSessionInput {
 }
 
 export interface OmpRuntimeSession {
+  readonly environment: Record<string, string>;
   onEvent(callback: (event: OmpRuntimeEvent) => void): () => void;
   prompt(
     message: string,
@@ -52,6 +53,7 @@ export interface OmpRuntimeSession {
   setAutoCompaction(enabled: boolean): Promise<void>;
   abort(): Promise<void>;
   getState(): Promise<OmpSessionState>;
+  setFastMode(enabled: boolean): Promise<{ enabled: boolean; active: boolean }>;
   getMessages(): Promise<OmpAgentMessage[]>;
   getAvailableModels(timeoutMs?: number | null): Promise<OmpModel[]>;
   setModel(provider: string, modelId: string): Promise<OmpModel>;
@@ -65,7 +67,10 @@ export interface OmpRuntimeSession {
   branch(entryId: string): Promise<{ text: string }>;
   getBranchMessages(): Promise<Array<{ entryId: string; text: string }>>;
   activeBranchEntryId?: string;
-  steer(message: string, images?: Array<{ type: "image"; data: string; mimeType: string }>): void;
+  steer(
+    message: string,
+    images?: Array<{ type: "image"; data: string; mimeType: string }>,
+  ): Promise<void>;
   followUp(
     message: string,
     images?: Array<{ type: "image"; data: string; mimeType: string }>,
diff --git a/packages/server/src/server/agent/providers/omp/session-descriptor.test.ts b/packages/server/src/server/agent/providers/omp/session-descriptor.test.ts
index 9dc4ba876c..916c61e042 100644
--- a/packages/server/src/server/agent/providers/omp/session-descriptor.test.ts
+++ b/packages/server/src/server/agent/providers/omp/session-descriptor.test.ts
@@ -3,7 +3,11 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { describe, expect, test } from "vitest";
 
-import { listOmpImportableSessions, readOmpImportSessionConfig } from "./session-descriptor.js";
+import {
+  listOmpImportableSessions,
+  readOmpImportSessionConfig,
+  resolveOmpSessionFile,
+} from "./session-descriptor.js";
 
 async function writeSession(root: string, relativePath: string, lines: unknown[]): Promise<string> {
   const filePath = path.join(root, "sessions", relativePath);
@@ -95,6 +99,50 @@ describe("OMP session descriptor", () => {
     });
   });
 
+  test("resolves a bare session id to its file and reads the same import config", async () => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-omp-session-by-id-"));
+    const sessionDir = path.join(root, "sessions");
+    const cwd = path.join(root, "repo");
+    const sessionId = "01a03dc8-77bb-7000-b0a3-bb7d25477e81";
+    const sessionFile = await writeSession(
+      root,
+      `project/2026-08-26T11-15-43-163Z_${sessionId}.jsonl`,
+      [
+        { type: "title", v: 1, title: "", updatedAt: "2026-08-26T11:15:43.163Z" },
+        { type: "session", version: 3, id: sessionId, timestamp: "2026-08-26T11:15:43.163Z", cwd },
+        {
+          type: "model_change",
+          id: "model-1",
+          timestamp: "2026-08-26T11:15:43.200Z",
+          model: "anthropic/claude-opus-5",
+        },
+      ],
+    );
+    // A decoy whose filename does not follow the `<timestamp>_<id>` convention
+    // but whose header carries the id must still be found.
+    const oddlyNamedId = "renamed-session";
+    const oddlyNamed = await writeSession(root, "project/notes.jsonl", [
+      { type: "session", id: oddlyNamedId, timestamp: "2026-08-27T00:00:00.000Z", cwd },
+      {
+        type: "model_change",
+        id: "model-2",
+        timestamp: "2026-08-27T00:00:00.100Z",
+        model: "mimorouter/claude-fable-5-1",
+      },
+    ]);
+
+    await expect(resolveOmpSessionFile(sessionId, { sessionDir })).resolves.toBe(sessionFile);
+    await expect(resolveOmpSessionFile(sessionFile, { sessionDir })).resolves.toBe(sessionFile);
+    await expect(resolveOmpSessionFile(oddlyNamedId, { sessionDir })).resolves.toBe(oddlyNamed);
+    await expect(resolveOmpSessionFile("does-not-exist", { sessionDir })).resolves.toBeNull();
+
+    const byId = await readOmpImportSessionConfig(sessionId, { sessionDir });
+    const byPath = await readOmpImportSessionConfig(sessionFile, { sessionDir });
+    expect(byId).toEqual({ model: "anthropic/claude-opus-5" });
+    expect(byId).toEqual(byPath);
+    await expect(readOmpImportSessionConfig("does-not-exist", { sessionDir })).resolves.toEqual({});
+  });
+
   test("keeps recent nested OMP subagent sessions importable", async () => {
     const root = await mkdtemp(path.join(tmpdir(), "paseo-omp-session-nested-"));
     const cwd = path.join(root, "repo");
@@ -145,4 +193,99 @@ describe("OMP session descriptor", () => {
       expect.objectContaining({ providerHandleId: sessionFile, cwd }),
     ]);
   });
+
+  test("uses a named OMP profile's session directory", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-omp-profile-home-"));
+    const cwd = path.join(home, "repo");
+    const sessionFile = path.join(
+      home,
+      ".omp",
+      "profiles",
+      "qa",
+      "agent",
+      "sessions",
+      "project",
+      "profile.jsonl",
+    );
+    await mkdir(path.dirname(sessionFile), { recursive: true });
+    await writeFile(sessionFile, JSON.stringify({ type: "session", id: "qa-profile", cwd }));
+
+    await expect(
+      listOmpImportableSessions({
+        homeDir: home,
+        env: {},
+        runtimeSettings: { env: { OMP_PROFILE: "qa" } },
+      }),
+    ).resolves.toEqual([expect.objectContaining({ providerHandleId: sessionFile })]);
+  });
+
+  test.skipIf(process.platform === "win32")(
+    "uses a profile's XDG data directory after OMP has created it",
+    async () => {
+      const home = await mkdtemp(path.join(tmpdir(), "paseo-omp-xdg-home-"));
+      const cwd = path.join(home, "repo");
+      const xdgDataHome = path.join(home, "xdg-data");
+      const sessionFile = path.join(
+        xdgDataHome,
+        "omp",
+        "profiles",
+        "qa",
+        "sessions",
+        "project",
+        "session.jsonl",
+      );
+      await mkdir(path.dirname(sessionFile), { recursive: true });
+      await writeFile(sessionFile, JSON.stringify({ type: "session", id: "xdg-profile", cwd }));
+
+      await expect(
+        listOmpImportableSessions({
+          homeDir: home,
+          env: { OMP_PROFILE: "qa", XDG_DATA_HOME: xdgDataHome },
+        }),
+      ).resolves.toEqual([expect.objectContaining({ providerHandleId: sessionFile })]);
+    },
+  );
+
+  test.runIf(process.platform === "win32")(
+    "ignores a profile's XDG data directory on Windows",
+    async () => {
+      const home = await mkdtemp(path.join(tmpdir(), "paseo-omp-windows-xdg-home-"));
+      const cwd = path.join(home, "repo");
+      const xdgDataHome = path.join(home, "xdg-data");
+      const xdgSessionFile = path.join(
+        xdgDataHome,
+        "omp",
+        "profiles",
+        "qa",
+        "sessions",
+        "project",
+        "xdg.jsonl",
+      );
+      const profileSessionFile = path.join(
+        home,
+        ".omp",
+        "profiles",
+        "qa",
+        "agent",
+        "sessions",
+        "project",
+        "profile.jsonl",
+      );
+      await Promise.all([
+        mkdir(path.dirname(xdgSessionFile), { recursive: true }),
+        mkdir(path.dirname(profileSessionFile), { recursive: true }),
+      ]);
+      await Promise.all([
+        writeFile(xdgSessionFile, JSON.stringify({ type: "session", id: "xdg-profile", cwd })),
+        writeFile(profileSessionFile, JSON.stringify({ type: "session", id: "qa-profile", cwd })),
+      ]);
+
+      await expect(
+        listOmpImportableSessions({
+          homeDir: home,
+          env: { OMP_PROFILE: "qa", XDG_DATA_HOME: xdgDataHome },
+        }),
+      ).resolves.toEqual([expect.objectContaining({ providerHandleId: profileSessionFile })]);
+    },
+  );
 });
diff --git a/packages/server/src/server/agent/providers/omp/session-descriptor.ts b/packages/server/src/server/agent/providers/omp/session-descriptor.ts
index 5b471cb1ff..a97afe861d 100644
--- a/packages/server/src/server/agent/providers/omp/session-descriptor.ts
+++ b/packages/server/src/server/agent/providers/omp/session-descriptor.ts
@@ -2,6 +2,7 @@ import type { Dirent } from "node:fs";
 import { open, readdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import path from "node:path";
+import { existsSync } from "node:fs";
 
 import type {
   ImportableProviderSession,
@@ -11,8 +12,7 @@ import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
 import { createRealpathAwarePathMatcher } from "../../../../utils/path.js";
 
 const OMP_CONFIG_DIR_NAME = ".omp";
-const OMP_AGENT_DIR_ENV = "OMP_AGENT_DIR";
-const OMP_SESSION_DIR_ENV = "OMP_SESSION_DIR";
+const OMP_SESSION_DIR_ENV = "PI_CODING_AGENT_SESSION_DIR";
 // Import listing intentionally bounds header parsing to this window. Sessions
 // with unusually large preambles may omit their first-prompt preview.
 const HEAD_BYTES = 64 * 1024;
@@ -24,7 +24,7 @@ const FULL_SCAN_LINE_LIMIT = 2_000;
 const IMPORT_CANDIDATE_OVERSCAN = 40;
 const IMPORT_CANDIDATE_MIN = 400;
 
-interface OmpSessionDescriptorOptions extends ListImportableSessionsOptions {
+export interface OmpSessionDescriptorOptions extends ListImportableSessionsOptions {
   sessionDir?: string;
   runtimeSettings?: ProviderRuntimeSettings;
   env?: NodeJS.ProcessEnv;
@@ -102,16 +102,70 @@ export async function listOmpImportableSessions(
   );
 }
 
+/**
+ * Reads the model/thinking config of an OMP session for import.
+ *
+ * `handle` is either an absolute path to the session `.jsonl` (what the
+ * importable-sessions list hands back) or a bare OMP session id (what
+ * `paseo import <id>` supplies). Ids are resolved against the configured
+ * sessions directory; an unresolvable handle yields `{}`.
+ */
 export async function readOmpImportSessionConfig(
-  filePath: string,
+  handle: string,
+  options: OmpSessionDescriptorOptions = {},
 ): Promise<OmpImportSessionConfig> {
+  const filePath = await resolveOmpSessionFile(handle, options);
+  if (!filePath) return {};
   const descriptor = await readOmpSessionDescriptor(filePath);
   if (!descriptor) return {};
   return toOmpImportSessionConfig(descriptor);
 }
 
+/**
+ * Resolves an import handle to a session file path. Returns the handle itself
+ * when it already names a readable file; otherwise searches the sessions
+ * directory for a file whose header `id` matches.
+ */
+export async function resolveOmpSessionFile(
+  handle: string,
+  options: OmpSessionDescriptorOptions = {},
+): Promise<string | null> {
+  const trimmed = handle.trim();
+  if (!trimmed) return null;
+  if (await isReadableFile(trimmed)) return trimmed;
+
+  const sessionsDir = await resolveOmpSessionsDir(options);
+  const files = await walkJsonlFiles(sessionsDir);
+  // OMP names session files `<timestamp>_<id>.jsonl`; try those first so the
+  // common case opens a single file instead of scanning the directory.
+  const nameSuffix = `_${trimmed}.jsonl`;
+  const byName = files.filter((file) => path.basename(file).endsWith(nameSuffix));
+  for (const file of byName) {
+    if (await headerSessionIdMatches(file, trimmed)) return file;
+  }
+  const rest = byName.length > 0 ? files.filter((file) => !byName.includes(file)) : files;
+  for (const file of rest) {
+    if (await headerSessionIdMatches(file, trimmed)) return file;
+  }
+  return null;
+}
+
+async function isReadableFile(filePath: string): Promise<boolean> {
+  try {
+    return (await stat(filePath)).isFile();
+  } catch {
+    return false;
+  }
+}
+
+async function headerSessionIdMatches(filePath: string, sessionId: string): Promise<boolean> {
+  const headChunk = await readHeadChunk(filePath);
+  if (!headChunk) return false;
+  return parseSessionHeaderFromChunk(headChunk)?.sessionId === sessionId;
+}
+
 async function resolveOmpSessionsDir(options: OmpSessionDescriptorOptions): Promise<string> {
-  const env = options.env ?? process.env;
+  const env = { ...(options.env ?? process.env), ...options.runtimeSettings?.env };
   const homeDir = options.homeDir ?? homedir();
   const baseDir = options.cwd ?? process.cwd();
 
@@ -119,10 +173,9 @@ async function resolveOmpSessionsDir(options: OmpSessionDescriptorOptions): Prom
     return resolveConfigPath(options.sessionDir, { baseDir, homeDir });
   }
 
-  const agentDir = resolveOmpAgentDir({ runtimeSettings: options.runtimeSettings, env, homeDir });
+  const agentDir = resolveOmpAgentDir({ env, homeDir });
 
-  const envSessionDir =
-    options.runtimeSettings?.env?.[OMP_SESSION_DIR_ENV] ?? env[OMP_SESSION_DIR_ENV];
+  const envSessionDir = env[OMP_SESSION_DIR_ENV];
   if (envSessionDir?.trim()) {
     return resolveConfigPath(envSessionDir, { baseDir, homeDir });
   }
@@ -135,20 +188,50 @@ async function resolveOmpSessionsDir(options: OmpSessionDescriptorOptions): Prom
     return resolveConfigPath(settingsSessionDir, { baseDir, homeDir });
   }
 
+  return resolveOmpDefaultSessionsDir(env, agentDir);
+}
+
+function resolveOmpDefaultSessionsDir(env: NodeJS.ProcessEnv, agentDir: string): string {
+  const profile = resolveOmpProfile(env);
+  const xdgDataHome = env.XDG_DATA_HOME;
+  if (
+    xdgDataHome &&
+    (process.platform === "linux" || process.platform === "darwin") &&
+    (profile || !env.PI_CODING_AGENT_DIR?.trim())
+  ) {
+    const xdgRoot = path.join(xdgDataHome, "omp", ...(profile ? ["profiles", profile] : []));
+    if (existsSync(xdgRoot)) return path.join(xdgRoot, "sessions");
+  }
   return path.join(agentDir, "sessions");
 }
 
-function resolveOmpAgentDir(input: {
-  runtimeSettings?: ProviderRuntimeSettings;
-  env: NodeJS.ProcessEnv;
-  homeDir: string;
-}): string {
-  const configured =
-    input.runtimeSettings?.env?.[OMP_AGENT_DIR_ENV] ?? input.env[OMP_AGENT_DIR_ENV];
-  if (configured?.trim()) {
-    return resolveConfigPath(configured, { baseDir: process.cwd(), homeDir: input.homeDir });
+function resolveOmpAgentDir(input: { env: NodeJS.ProcessEnv; homeDir: string }): string {
+  const env = input.env;
+  const profile = resolveOmpProfile(env);
+  if (!profile) {
+    const configured = env.PI_CODING_AGENT_DIR;
+    if (configured?.trim()) {
+      return resolveConfigPath(configured, { baseDir: process.cwd(), homeDir: input.homeDir });
+    }
   }
-  return path.join(input.homeDir, OMP_CONFIG_DIR_NAME, "agent");
+  const configRoot = path.join(input.homeDir, env.PI_CONFIG_DIR || OMP_CONFIG_DIR_NAME);
+  const profileRoot = profile ? path.join(configRoot, "profiles", profile) : configRoot;
+  return path.join(profileRoot, "agent");
+}
+
+function resolveOmpProfile(env: NodeJS.ProcessEnv): string | undefined {
+  const profile = (env.OMP_PROFILE !== undefined ? env.OMP_PROFILE : env.PI_PROFILE)?.trim();
+  if (!profile || profile === "default") return undefined;
+  if (
+    profile === "." ||
+    profile === ".." ||
+    profile.endsWith(".") ||
+    !/^[a-z0-9][a-z0-9._-]{0,63}$/.test(profile) ||
+    /^(?:CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])(?:\..*)?$/i.test(profile)
+  ) {
+    throw new Error(`Invalid OMP profile "${profile}"`);
+  }
+  return profile;
 }
 
 async function readConfiguredSessionDir(input: {
diff --git a/packages/server/src/server/agent/providers/omp/system-notice.test.ts b/packages/server/src/server/agent/providers/omp/system-notice.test.ts
index 0125ec08d4..bac0ec5508 100644
--- a/packages/server/src/server/agent/providers/omp/system-notice.test.ts
+++ b/packages/server/src/server/agent/providers/omp/system-notice.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest";
 
-import { isOmpSystemNotice, mapOmpSystemNoticeToToolCall } from "./system-notice.js";
+import { isOmpSystemNotice, mapOmpSystemNoticeToNotification } from "./system-notice.js";
 
 const COMPLETED_NOTICE = [
   "<system-notice>",
@@ -24,31 +24,16 @@ describe("omp system notice detection", () => {
   test("ignores regular prompts, including ones that mention the tag mid-message", () => {
     expect(isOmpSystemNotice("please fix the bug")).toBe(false);
     expect(isOmpSystemNotice("what does <system-notice> mean in omp?")).toBe(false);
-    expect(mapOmpSystemNoticeToToolCall("what does <system-notice> mean in omp?")).toBeNull();
+    expect(mapOmpSystemNoticeToNotification("what does <system-notice> mean in omp?")).toBeNull();
   });
 });
 
-describe("omp system notice tool call mapping", () => {
-  test("maps a completed task-result notice to a synthetic completed tool call", () => {
-    expect(mapOmpSystemNoticeToToolCall(COMPLETED_NOTICE)).toEqual({
-      type: "tool_call",
-      callId: "omp-notice:DocsSmokeTwo",
-      name: "task_notification",
-      status: "completed",
-      detail: {
-        type: "plain_text",
-        label: "Background job DocsSmokeTwo completed",
-        text: COMPLETED_NOTICE,
-        icon: "wrench",
-      },
-      metadata: {
-        synthetic: true,
-        source: "omp_system_notice",
-        taskId: "DocsSmokeTwo",
-        subagentType: "explore",
-        status: "completed",
-      },
-      error: null,
+describe("omp system notice notification mapping", () => {
+  test("maps a completed task-result notice to an info notification", () => {
+    expect(mapOmpSystemNoticeToNotification(COMPLETED_NOTICE)).toEqual({
+      type: "notification",
+      level: "info",
+      message: "Background job DocsSmokeTwo completed",
     });
   });
 
@@ -62,11 +47,11 @@ describe("omp system notice tool call mapping", () => {
       "</system-notice>",
     ].join("\n");
 
-    const item = mapOmpSystemNoticeToToolCall(notice);
-    expect(item).toMatchObject({
-      callId: "omp-notice:RepoSmokeOne",
-      status: "failed",
-      error: "Background job RepoSmokeOne failed",
+    const item = mapOmpSystemNoticeToNotification(notice);
+    expect(item).toEqual({
+      type: "notification",
+      level: "error",
+      message: "Background job RepoSmokeOne failed",
     });
   });
 
@@ -80,30 +65,23 @@ describe("omp system notice tool call mapping", () => {
       "</system-notice>",
     ].join("\n");
 
-    expect(mapOmpSystemNoticeToToolCall(notice)).toMatchObject({
-      callId: "omp-notice:DocsSmokeTwo",
-      status: "completed",
-      metadata: {
-        taskId: "DocsSmokeTwo",
-        subagentType: "explore",
-      },
+    expect(mapOmpSystemNoticeToNotification(notice)).toEqual({
+      type: "notification",
+      level: "info",
+      message: "Background job DocsSmokeTwo completed",
     });
   });
 
-  test("maps a notice without a task-result using its first line and a stable hash id", () => {
+  test("maps a notice without a task-result using its first line", () => {
     const notice = "<system-notice>\nThe daemon rotated its logs.\n</system-notice>";
 
-    const first = mapOmpSystemNoticeToToolCall(notice);
-    const second = mapOmpSystemNoticeToToolCall(notice);
+    const first = mapOmpSystemNoticeToNotification(notice);
+    const second = mapOmpSystemNoticeToNotification(notice);
     expect(first).toEqual(second);
-    expect(first).toMatchObject({
-      status: "completed",
-      detail: {
-        type: "plain_text",
-        label: "The daemon rotated its logs.",
-        text: notice,
-      },
+    expect(first).toEqual({
+      type: "notification",
+      level: "info",
+      message: "The daemon rotated its logs.",
     });
-    expect(first?.callId).toMatch(/^omp-notice:[0-9a-f]{12}$/);
   });
 });
diff --git a/packages/server/src/server/agent/providers/omp/system-notice.ts b/packages/server/src/server/agent/providers/omp/system-notice.ts
index 73dd5e3e55..141ee68afe 100644
--- a/packages/server/src/server/agent/providers/omp/system-notice.ts
+++ b/packages/server/src/server/agent/providers/omp/system-notice.ts
@@ -1,5 +1,3 @@
-import { createHash } from "node:crypto";
-
 import type { AgentTimelineItem } from "../../agent-sdk-types.js";
 
 const SYSTEM_NOTICE_OPEN_TAG = "<system-notice>";
@@ -9,7 +7,7 @@ const TASK_RESULT_TAG_PATTERN = /<task-result\b([^>]*)>/i;
 // with typographic quotes after copy/paste round-trips; accept both.
 const TASK_RESULT_ATTRIBUTE_PATTERN = /([\w-]+)=["'“‘]([^"'“”‘’]*)["'”’]/g;
 
-type OmpSystemNoticeToolCallItem = Extract<AgentTimelineItem, { type: "tool_call" }>;
+type OmpSystemNotificationItem = Extract<AgentTimelineItem, { type: "notification" }>;
 
 interface OmpTaskResultSummary {
   id: string | null;
@@ -17,11 +15,6 @@ interface OmpTaskResultSummary {
   status: string | null;
 }
 
-type OmpNoticeLifecycle =
-  | { status: "completed"; error: null }
-  | { status: "failed"; error: string }
-  | { status: "canceled"; error: null };
-
 export function isOmpSystemNotice(text: string): boolean {
   return text.trimStart().startsWith(SYSTEM_NOTICE_OPEN_TAG);
 }
@@ -62,18 +55,17 @@ function readNoticeFirstLine(text: string): string | null {
   return null;
 }
 
-function buildLifecycle(
+function notificationLevel(
   taskResult: OmpTaskResultSummary | null,
-  label: string,
-): OmpNoticeLifecycle {
+): OmpSystemNotificationItem["level"] {
   const status = taskResult?.status?.toLowerCase() ?? null;
   if (status === "failed" || status === "error") {
-    return { status: "failed", error: label };
+    return "error";
   }
   if (status === "canceled" || status === "cancelled" || status === "stopped") {
-    return { status: "canceled", error: null };
+    return "warning";
   }
-  return { status: "completed", error: null };
+  return "info";
 }
 
 function buildLabel(taskResult: OmpTaskResultSummary | null, text: string): string {
@@ -83,46 +75,15 @@ function buildLabel(taskResult: OmpTaskResultSummary | null, text: string): stri
   return readNoticeFirstLine(text) ?? "System notice";
 }
 
-function buildCallId(taskResult: OmpTaskResultSummary | null, text: string): string {
-  if (taskResult?.id) {
-    return `omp-notice:${taskResult.id}`;
-  }
-  const digest = createHash("sha1").update(text.trim()).digest("hex").slice(0, 12);
-  return `omp-notice:${digest}`;
-}
-
-export function mapOmpSystemNoticeToToolCall(text: string): OmpSystemNoticeToolCallItem | null {
+export function mapOmpSystemNoticeToNotification(text: string): OmpSystemNotificationItem | null {
   if (!isOmpSystemNotice(text)) {
     return null;
   }
 
   const taskResult = readTaskResult(text);
-  const label = buildLabel(taskResult, text);
-  const lifecycle = buildLifecycle(taskResult, label);
-  const base = {
-    type: "tool_call" as const,
-    callId: buildCallId(taskResult, text),
-    name: "task_notification",
-    detail: {
-      type: "plain_text" as const,
-      label,
-      text,
-      icon: "wrench" as const,
-    },
-    metadata: {
-      synthetic: true,
-      source: "omp_system_notice",
-      ...(taskResult?.id ? { taskId: taskResult.id } : {}),
-      ...(taskResult?.agent ? { subagentType: taskResult.agent } : {}),
-      ...(taskResult?.status ? { status: taskResult.status } : {}),
-    },
+  return {
+    type: "notification",
+    level: notificationLevel(taskResult),
+    message: buildLabel(taskResult, text),
   };
-
-  if (lifecycle.status === "failed") {
-    return { ...base, status: "failed", error: lifecycle.error };
-  }
-  if (lifecycle.status === "canceled") {
-    return { ...base, status: "canceled", error: null };
-  }
-  return { ...base, status: "completed", error: null };
 }
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/echo-mcp-server.mjs b/packages/server/src/server/agent/providers/omp/test-utils/echo-mcp-server.mjs
new file mode 100644
index 0000000000..1821afb47d
--- /dev/null
+++ b/packages/server/src/server/agent/providers/omp/test-utils/echo-mcp-server.mjs
@@ -0,0 +1,47 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { z } from "zod";
+import { writeFileSync } from "node:fs";
+
+if (process.env.OMP_MCP_PID_FILE) writeFileSync(process.env.OMP_MCP_PID_FILE, String(process.pid));
+
+const server = new McpServer({ name: "omp-echo-fixture", version: "1.0.0" });
+server.registerTool(
+  "echo_secret",
+  { description: "Returns the fixture word", inputSchema: { word: z.string() } },
+  async ({ word }, extra) => {
+    if (word === "ENV") {
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({
+              runtime: process.env.OMP_MCP_RUNTIME_ENV,
+              agent: process.env.PASEO_AGENT_ID,
+              precedence: process.env.OMP_MCP_PRECEDENCE,
+            }),
+          },
+        ],
+      };
+    }
+    if (word === "WAIT") {
+      if (process.env.OMP_MCP_WAIT_FILE) writeFileSync(process.env.OMP_MCP_WAIT_FILE, "waiting");
+      return await new Promise((resolve) => {
+        extra.signal.addEventListener(
+          "abort",
+          () => {
+            if (process.env.OMP_MCP_CANCEL_FILE) {
+              writeFileSync(process.env.OMP_MCP_CANCEL_FILE, "cancelled");
+            }
+            resolve({ content: [{ type: "text", text: "cancelled" }] });
+          },
+          { once: true },
+        );
+      });
+    }
+    return word === "FAIL"
+      ? { content: [{ type: "text", text: "fixture failure" }], isError: true }
+      : { content: [{ type: "text", text: `MANGO:${word}` }] };
+  },
+);
+await server.connect(new StdioServerTransport());
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
index 0b17fe8c5b..403a389647 100644
--- a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
+++ b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
@@ -54,6 +54,11 @@ export class FakeOmp implements OmpRuntime {
   private readonly sessions: FakeOmpSession[] = [];
   private readonly command: [string, ...string[]];
   private readonly queuedCommands: OmpRpcSlashCommand[][] = [];
+  private readonly queuedSessionSetups: Array<(session: FakeOmpSession) => void> = [];
+  private readonly removedModels = new Set<string>();
+  private nextStartError: Error | null = null;
+  private nextSessionId = 0;
+  private readonly sessionIdsByFile = new Map<string, string>();
   private readonly queuedSubagentSubscriptionErrors = new Map<
     FakeOmpSubagentSubscriptionLevel,
     Error
@@ -64,17 +69,28 @@ export class FakeOmp implements OmpRuntime {
   }
 
   async startSession(input: OmpStartSessionInput): Promise<FakeOmpSession> {
+    const startError = this.nextStartError;
+    this.nextStartError = null;
+    if (startError) throw startError;
     const launch = buildOmpLaunch({
       command: this.command,
       session: input,
     });
     this.recordedLaunches.push(launch);
-    const session = new FakeOmpSession(launch);
+    if (launch.model && this.removedModels.has(launch.model)) {
+      throw new Error(`Model "${launch.model}" not found`);
+    }
+    const sessionId =
+      (launch.session ? this.sessionIdsByFile.get(launch.session) : undefined) ??
+      `omp-session-${++this.nextSessionId}`;
+    const session = new FakeOmpSession(launch, sessionId, this.removedModels);
+    if (!launch.noSession) this.sessionIdsByFile.set(session.state.sessionFile, sessionId);
     session.commands = this.queuedCommands.shift() ?? [];
     for (const [level, error] of this.queuedSubagentSubscriptionErrors) {
       session.subagentSubscriptionErrors.set(level, error);
     }
     this.queuedSubagentSubscriptionErrors.clear();
+    this.queuedSessionSetups.shift()?.(session);
     this.sessions.push(session);
     return session;
   }
@@ -83,6 +99,19 @@ export class FakeOmp implements OmpRuntime {
     this.queuedCommands.push(commands);
   }
 
+  queueSessionSetup(setup: (session: FakeOmpSession) => void): void {
+    this.queuedSessionSetups.push(setup);
+  }
+
+  // OMP refuses to launch with, or switch to, a model it no longer knows.
+  removeModel(modelId: string): void {
+    this.removedModels.add(modelId);
+  }
+
+  failNextStart(error: Error): void {
+    this.nextStartError = error;
+  }
+
   failNextSubagentSubscription(level: FakeOmpSubagentSubscriptionLevel, error: Error): void {
     this.queuedSubagentSubscriptionErrors.set(level, error);
   }
@@ -94,9 +123,16 @@ export class FakeOmp implements OmpRuntime {
     }
     return session;
   }
+
+  allSessions(): FakeOmpSession[] {
+    return [...this.sessions];
+  }
 }
 
 export class FakeOmpSession implements OmpRuntimeSession {
+  readonly environment: Record<string, string>;
+  fastModeResult = { enabled: false, active: false };
+  readonly setFastModeRequests: boolean[] = [];
   readonly prompts: Array<{ message: string; imageCount: number }> = [];
   readonly compactRequests: Array<{ customInstructions?: string }> = [];
   readonly setAutoCompactionRequests: boolean[] = [];
@@ -106,6 +142,7 @@ export class FakeOmpSession implements OmpRuntimeSession {
   readonly setThinkingLevelRequests: OmpThinkingLevel[] = [];
   readonly handoffRequests: Array<{ customInstructions?: string }> = [];
   readonly steerRequests: Array<{ message: string; imageCount: number }> = [];
+  steerError: Error | null = null;
   readonly followUpRequests: Array<{ message: string; imageCount: number }> = [];
   readonly hostToolSetRequests: OmpRpcHostToolDefinition[][] = [];
   readonly hostToolResults: OmpRpcHostToolResult[] = [];
@@ -113,6 +150,8 @@ export class FakeOmpSession implements OmpRuntimeSession {
   getStateRequestCount = 0;
   abortRequested = false;
   abortError: Error | null = null;
+  onAbort: (() => void) | null = null;
+  private heldStateRequests: Array<() => void> | null = null;
   readonly canceledExtensionUiRequests: string[] = [];
   readonly extensionUiResponses: Array<{
     id: string;
@@ -150,15 +189,22 @@ export class FakeOmpSession implements OmpRuntimeSession {
   private activeHeldPrompt: { promise: Promise<void>; reject: (error: Error) => void } | null =
     null;
 
-  constructor(launch: OmpRuntimeLaunch) {
+  constructor(
+    launch: OmpRuntimeLaunch,
+    sessionId = "omp-session-1",
+    private readonly removedModels: ReadonlySet<string> = new Set(),
+  ) {
+    this.environment = launch.env ?? {};
     this.state = {
       model: null,
       thinkingLevel: "medium",
       isStreaming: false,
       isCompacting: false,
       autoCompactionEnabled: true,
+      fastModeEnabled: false,
+      fastModeActive: false,
       sessionFile: launch.session ?? "/tmp/omp-session",
-      sessionId: "omp-session-1",
+      sessionId,
       messageCount: 0,
       queuedMessageCount: 0,
     };
@@ -243,6 +289,8 @@ export class FakeOmpSession implements OmpRuntimeSession {
       throw this.abortError;
     }
     this.abortRequested = true;
+    // OMP can stream a turn's teardown before it answers the abort request.
+    this.onAbort?.();
   }
 
   async getState(): Promise<OmpSessionState> {
@@ -251,6 +299,10 @@ export class FakeOmpSession implements OmpRuntimeSession {
       if (this.getStateRequestCount >= waiter.count) waiter.resolve();
       else this.stateRequestWaiters.push(waiter);
     }
+    if (this.heldStateRequests) {
+      const held = this.heldStateRequests;
+      await new Promise<void>((resolve) => held.push(resolve));
+    }
     if (this.getStateError) {
       throw this.getStateError;
     }
@@ -261,6 +313,26 @@ export class FakeOmpSession implements OmpRuntimeSession {
     return this.state;
   }
 
+  async setFastMode(enabled: boolean): Promise<{ enabled: boolean; active: boolean }> {
+    this.setFastModeRequests.push(enabled);
+    this.state = {
+      ...this.state,
+      fastModeEnabled: this.fastModeResult.enabled,
+      fastModeActive: this.fastModeResult.active,
+    };
+    return this.fastModeResult;
+  }
+
+  /** Holds every state request until the returned function releases them. */
+  holdStateRequests(): () => void {
+    const held: Array<() => void> = [];
+    this.heldStateRequests = held;
+    return () => {
+      this.heldStateRequests = null;
+      for (const resolve of held.splice(0)) resolve();
+    };
+  }
+
   queueStateReports(states: OmpSessionState[]): void {
     this.stateReports.push(...states);
   }
@@ -280,9 +352,13 @@ export class FakeOmpSession implements OmpRuntimeSession {
 
   async setModel(provider: string, modelId: string): Promise<OmpModel> {
     this.setModelRequests.push({ provider, modelId });
+    if (this.removedModels.has(`${provider}/${modelId}`)) {
+      throw new Error(`Model not found: ${provider}/${modelId}`);
+    }
     if (!this.setModelResult) {
       throw new Error("FakeOmp setModel requires setModelResult to be scripted");
     }
+    this.state = { ...this.state, model: this.setModelResult };
     return this.setModelResult;
   }
 
@@ -332,8 +408,12 @@ export class FakeOmpSession implements OmpRuntimeSession {
     return this.branchMessages;
   }
 
-  steer(message: string, images?: Array<{ type: "image"; data: string; mimeType: string }>): void {
+  async steer(
+    message: string,
+    images?: Array<{ type: "image"; data: string; mimeType: string }>,
+  ): Promise<void> {
     this.steerRequests.push({ message, imageCount: images?.length ?? 0 });
+    if (this.steerError) throw this.steerError;
   }
 
   followUp(
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts b/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
index 30d75bb8f4..1820c187c9 100644
--- a/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
+++ b/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
@@ -19,7 +19,7 @@ import {
   type OmpProviderIdleScheduler,
 } from "../agent.js";
 import type { OmpUsagePollScheduler } from "../usage-poller.js";
-import type { OmpAgentMessage, OmpRpcSlashCommand } from "../rpc-types.js";
+import type { OmpAgentMessage, OmpRpcSlashCommand, OmpRuntimeEvent } from "../rpc-types.js";
 import { FakeOmp } from "./fake-omp.js";
 
 const CWD = "/tmp/paseo-omp-agent-test";
@@ -71,14 +71,18 @@ export class OmpHarness {
       providerIdleScheduler?: OmpProviderIdleScheduler;
       noTurnScheduler?: OmpNoTurnScheduler;
       usagePollScheduler?: OmpUsagePollScheduler;
+      providerIdleDeadlineMs?: number;
+      runtimeEnv?: Record<string, string>;
     } = {},
   ) {
     this.client = new OmpAgentClient({
       logger: pino({ level: "silent" }),
+      runtimeSettings: { env: options.runtimeEnv },
       runtime: this.omp,
       providerIdleScheduler: options.providerIdleScheduler,
       noTurnScheduler: options.noTurnScheduler,
       usagePollScheduler: options.usagePollScheduler,
+      providerIdleDeadlineMs: options.providerIdleDeadlineMs,
     });
   }
 
@@ -93,10 +97,11 @@ export class OmpHarness {
   async start(
     config: Partial<AgentSessionConfig> = {},
     paseoTools?: PaseoToolCatalog,
+    env?: Record<string, string>,
   ): Promise<void> {
     const session = await this.client.createSession(
       { provider: "omp", cwd: CWD, ...config },
-      paseoTools ? { paseoTools } : undefined,
+      paseoTools || env ? { paseoTools, env } : undefined,
     );
     if (!(session instanceof OmpAgentSession)) {
       throw new Error("OMP client returned a non-OMP session");
@@ -150,6 +155,20 @@ export class OmpHarness {
     return this.client.capabilities;
   }
 
+  persistence() {
+    return this.requireSession().describePersistence();
+  }
+
+  async replayHistory(handle: AgentPersistenceHandle): Promise<AgentStreamEvent[]> {
+    const session = await this.client.resumeSession(handle, undefined, undefined, {
+      purpose: "history",
+    });
+    const events: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) events.push(event);
+    await session.close();
+    return events;
+  }
+
   async runPrompt(
     input: string,
     output: string,
@@ -275,6 +294,14 @@ export class OmpHarness {
     return await run;
   }
 
+  async runPromptWithoutTurnOnNextRuntime(input: string, requestId: string): Promise<unknown> {
+    const session = this.requireSession();
+    this.omp.queueSessionSetup((runtime) => {
+      runtime.promptAck = { requestId, agentInvoked: false };
+    });
+    return await session.run(input);
+  }
+
   async runPromptWithoutTurn(input: string): Promise<unknown> {
     const session = this.requireSession();
     this.omp.latestSession().promptAck = { agentInvoked: false };
@@ -310,6 +337,31 @@ export class OmpHarness {
     return { completed: () => isCompleted, completion };
   }
 
+  async runPromptRejectedBeforeAgentRuns(
+    input: string,
+    error: string,
+    order: "result after ack" | "result before ack",
+  ): Promise<unknown> {
+    const session = this.requireSession();
+    const runtime = this.omp.latestSession();
+    runtime.promptAck = { requestId: "prompt-rejected" };
+    const rejection = {
+      type: "prompt_result",
+      id: "prompt-rejected",
+      agentInvoked: false,
+      status: "error",
+      sessionSettled: true,
+      error: { message: error, retryable: false },
+    } as const;
+    const promptStarted = runtime.nextPrompt();
+    const run = session.run(input);
+    if (order === "result before ack") runtime.emit(rejection);
+    await promptStarted;
+    await waitForImmediate();
+    if (order === "result after ack") runtime.emit(rejection);
+    return await run;
+  }
+
   async runPromptAfterCorrelatedTrueResult(
     input: string,
     output: string,
@@ -422,6 +474,10 @@ export class OmpHarness {
     this.omp.latestSession().requestToolApproval(input);
   }
 
+  emit(event: OmpRuntimeEvent): void {
+    this.omp.latestSession().emit(event);
+  }
+
   pendingPermissions() {
     return this.requireSession().getPendingPermissions();
   }
@@ -446,6 +502,36 @@ export class OmpHarness {
     return await this.requireSession().setMode(modeId);
   }
 
+  currentMode() {
+    return this.requireSession().getCurrentMode();
+  }
+
+  runtimeLaunches() {
+    return this.omp.recordedLaunches;
+  }
+
+  runtimeSessions() {
+    return this.omp.allSessions();
+  }
+
+  processExit(error: string): void {
+    this.omp.latestSession().emit({ type: "process_exit", error });
+  }
+
+  failNextStart(error: Error): void {
+    this.omp.failNextStart(error);
+  }
+
+  turnFailures(): string[] {
+    return this.events.flatMap((event) => (event.type === "turn_failed" ? [event.error] : []));
+  }
+
+  threadStartedSessionIds(): string[] {
+    return this.events.flatMap((event) =>
+      event.type === "thread_started" ? [event.sessionId] : [],
+    );
+  }
+
   async rewind(messageId: string, restoredPrompt: string): Promise<void> {
     this.omp.latestSession().branchResponse = { text: restoredPrompt };
     await this.requireSession().revertConversation({ messageId });
@@ -466,6 +552,15 @@ export class OmpHarness {
     await promptStarted;
   }
 
+  async startTurn(message: string): Promise<void> {
+    await this.requireSession().startTurn(message);
+    await waitForImmediate();
+  }
+
+  startTurnDetached(message: string) {
+    return this.requireSession().startTurn(message);
+  }
+
   async interrupt(): Promise<void> {
     await this.requireSession().interrupt();
   }
@@ -504,6 +599,10 @@ export class OmpHarness {
     return this.events.filter((event) => event.type === "turn_canceled").length;
   }
 
+  usageSession() {
+    return this.requireSession().usageSession();
+  }
+
   async close(): Promise<void> {
     await this.requireSession().close();
     await waitForImmediate();
diff --git a/packages/server/src/server/agent/providers/omp/todo-mapper.test.ts b/packages/server/src/server/agent/providers/omp/todo-mapper.test.ts
index e04ddee2bc..85e4b9a3a9 100644
--- a/packages/server/src/server/agent/providers/omp/todo-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/omp/todo-mapper.test.ts
@@ -103,4 +103,41 @@ describe("OMP todo mapper", () => {
       mapOmpTodoToolResult({ details: { phases: [{ name: "Bad", tasks: [{}] }] } }),
     ).toBeNull();
   });
+
+  test("keeps blocked work visible and excludes abandoned work from active todos", () => {
+    const phases = [
+      {
+        name: "Tasks",
+        tasks: [
+          { content: "Wait for access", status: "blocked", blocker: "approval" },
+          { content: "Old approach", status: "abandoned" },
+        ],
+      },
+    ];
+    const expected = {
+      type: "todo",
+      items: [{ text: "Wait for access (blocked: approval)", status: "pending", completed: false }],
+    };
+    expect(mapOmpTodoToolResult(parseToolResult({ content: [], details: { phases } }))).toEqual(
+      expected,
+    );
+    expect(
+      mapOmpTodoState({
+        isStreaming: false,
+        isCompacting: false,
+        sessionId: "s",
+        todoPhases: phases,
+      }),
+    ).toEqual([expected]);
+    expect(
+      mapOmpTodoToolResult(
+        parseToolResult({
+          content: [],
+          details: {
+            phases: [{ name: "Tasks", tasks: [{ content: "Old approach", status: "abandoned" }] }],
+          },
+        }),
+      ),
+    ).toEqual({ type: "todo", items: [] });
+  });
 });
diff --git a/packages/server/src/server/agent/providers/omp/todo-mapper.ts b/packages/server/src/server/agent/providers/omp/todo-mapper.ts
index 0b41d5a43f..699a40d3aa 100644
--- a/packages/server/src/server/agent/providers/omp/todo-mapper.ts
+++ b/packages/server/src/server/agent/providers/omp/todo-mapper.ts
@@ -39,11 +39,16 @@ function mapOmpTodoItems(items: readonly OmpTodoItem[]): AgentTimelineItem | nul
   }
   return {
     type: "todo",
-    items: items.map((item) => ({
-      text: item.content,
-      status: normalizeOmpTodoStatus(item.status),
-      completed: item.status === "completed",
-    })),
+    items: items
+      .filter((item) => item.status !== "abandoned")
+      .map((item) => ({
+        text:
+          item.status === "blocked"
+            ? `${item.content} (${item.blocker ? `blocked: ${item.blocker}` : "blocked"})`
+            : item.content,
+        status: normalizeOmpTodoStatus(item.status),
+        completed: item.status === "completed",
+      })),
   };
 }
 
diff --git a/packages/server/src/server/agent/providers/omp/tool-call-detail.ts b/packages/server/src/server/agent/providers/omp/tool-call-detail.ts
index 7df6efb676..cece7f0398 100644
--- a/packages/server/src/server/agent/providers/omp/tool-call-detail.ts
+++ b/packages/server/src/server/agent/providers/omp/tool-call-detail.ts
@@ -57,8 +57,13 @@ interface OmpToolResultObject {
   details?: OmpToolResultDetails;
 }
 
+interface OmpToolResultStructuredError {
+  message: string;
+}
+
 interface OmpToolResultDetails {
   diff?: string;
+  error?: string | OmpToolResultStructuredError;
   mode?: string;
   xdev?: unknown;
 }
@@ -154,9 +159,17 @@ const OmpToolResultContentSchema = z.union([
   OmpToolResultUnknownContentSchema,
 ]);
 
+// OMP's own tools report a string error; Paseo host tools (browser_*) report
+// a structured `{ code, message, retryable }` error.
+const OmpToolResultErrorSchema = z.union([
+  z.string(),
+  z.object({ message: z.string() }).passthrough(),
+]);
+
 const OmpToolResultDetailsSchema = z
   .object({
     diff: z.string().optional(),
+    error: OmpToolResultErrorSchema.optional(),
   })
   .passthrough();
 
@@ -270,6 +283,41 @@ export function extractTextFromToolResult(result: OmpToolResult): string | undef
   return textParts.length > 0 ? textParts.join("\n") : undefined;
 }
 
+export function toolFailureMessage(result: OmpToolResult): string {
+  const error = result && typeof result !== "string" ? result.details?.error : undefined;
+  const errorMessage = typeof error === "string" ? error : error?.message;
+  if (errorMessage) {
+    return errorMessage.split("\n", 1)[0].slice(0, 240);
+  }
+  const output = extractTextFromToolResult(result);
+  const exitMessage = output?.match(/(?:Command|Process) exited with code \d+/i)?.[0];
+  if (exitMessage) return exitMessage;
+  const firstLine = output
+    ?.split("\n")
+    .find((line) => line.trim())
+    ?.trim();
+  if (firstLine) return firstLine.slice(0, 240);
+  if (result && typeof result !== "string") {
+    const code = result.exitCode ?? result.code;
+    if (typeof code === "number") return `Tool exited with code ${code}`;
+  }
+  return "Tool call failed";
+}
+
+export function isOmpToolFailure(
+  toolCall: OmpTrackedToolCall,
+  result: OmpToolResult,
+  isError: boolean,
+): boolean {
+  return (
+    isError ||
+    (toolCall.toolName === "web_search" &&
+      result !== null &&
+      typeof result !== "string" &&
+      typeof result.details?.error === "string")
+  );
+}
+
 export function parseToolArgs(toolName: string, rawArgs: unknown): OmpTrackedToolCall {
   if (toolName === "edit") {
     return parseEditToolArgs(rawArgs);
@@ -289,6 +337,12 @@ export function parseToolArgs(toolName: string, rawArgs: unknown): OmpTrackedToo
 }
 
 export function resolveToolCallName(toolCall: OmpTrackedToolCall, result?: OmpToolResult): string {
+  if (
+    (toolCall.kind === "read" || toolCall.kind === "write") &&
+    toolCall.args.path.startsWith("xd://")
+  ) {
+    return toolCall.args.path.slice("xd://".length).split(/[/?#]/, 1)[0] || toolCall.toolName;
+  }
   if (toolCall.kind === "write" && result && typeof result !== "string") {
     const xdev = XdevExecuteDetailsSchema.safeParse(result.details?.xdev);
     if (xdev.success) {
@@ -316,6 +370,20 @@ export function mapToolDetail(
       };
     }
     case "read":
+      if (toolCall.args.path.startsWith("xd://")) {
+        return {
+          type: "plain_text",
+          label: resolveToolCallName(toolCall),
+          text: extractTextFromToolResult(parsedResult),
+        };
+      }
+      if (/^https?:\/\//.test(toolCall.args.path)) {
+        return {
+          type: "fetch",
+          url: toolCall.args.path,
+          result: extractTextFromToolResult(parsedResult),
+        };
+      }
       return {
         type: "read",
         filePath: toolCall.args.path,
@@ -374,6 +442,15 @@ function mapWriteToolDetail(args: WriteToolInput, result: OmpToolResult): ToolCa
     };
   }
 
+  // A write to `xd://` runs a tool, not a file write. Name the invoked tool while it runs.
+  if (args.path.startsWith("xd://")) {
+    return {
+      type: "plain_text",
+      label: args.path.slice("xd://".length).split(/[/?#]/, 1)[0],
+      text: extractTextFromToolResult(result),
+    };
+  }
+
   return {
     type: "write",
     filePath: args.path,
diff --git a/packages/server/src/server/agent/providers/omp/tool-call-mapper.test.ts b/packages/server/src/server/agent/providers/omp/tool-call-mapper.test.ts
index dcccea3b60..ae4c0d0d77 100644
--- a/packages/server/src/server/agent/providers/omp/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/omp/tool-call-mapper.test.ts
@@ -117,4 +117,218 @@ describe("OMP tool call mapper", () => {
       output: null,
     });
   });
+
+  test("uses current OMP task arguments and wait results for readable rows", () => {
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("task", {
+          name: "Docs",
+          agent: "explore",
+          task: "Read src/a.ts",
+          solutionSpace: "Report findings",
+        }),
+        null,
+      ),
+    ).toMatchObject({ type: "sub_agent", subAgentType: "Docs", description: "Read src/a.ts" });
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("wait", {}),
+        parseToolResult({ content: [{ type: "text", text: "Waiting for Docs to finish" }] }),
+      ),
+    ).toMatchObject({ type: "plain_text", label: "Waiting for Docs to finish" });
+  });
+
+  test("names a task from OMP's tasks array while it runs and after it completes", () => {
+    const call = parseToolArgs("task", {
+      context: "Read a scratch file",
+      tasks: [{ name: "ReadNotes", task: "Read src/notes.ts and report its content" }],
+      i: "Delegating the read",
+    });
+    expect(mapOmpToolDetail(call, null)).toMatchObject({
+      type: "sub_agent",
+      subAgentType: "ReadNotes",
+      description: "Delegating the read",
+    });
+    expect(
+      mapOmpToolDetail(
+        call,
+        parseToolResult({ content: [{ type: "text", text: "Spawned agent `ReadNotes`" }] }),
+      ),
+    ).toMatchObject({ type: "sub_agent", subAgentType: "ReadNotes" });
+  });
+
+  test("uses the first task instruction when OMP omits its short intent", () => {
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("task", {
+          tasks: [
+            {
+              name: "WaitThenRead",
+              task: "# Target src/notes.ts in the scratch repository.\n# Change\nRun bash sleep 8.",
+            },
+          ],
+        }),
+        null,
+      ),
+    ).toMatchObject({
+      type: "sub_agent",
+      subAgentType: "WaitThenRead",
+      description: "src/notes.ts in the scratch repository.",
+    });
+  });
+
+  test("skips a standalone target heading in a running task", () => {
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("task", {
+          tasks: [
+            {
+              name: "SlowRead",
+              task: "# Target\nsrc/notes.ts in the scratch repository.\n# Change\nRead the file.",
+            },
+          ],
+        }),
+        null,
+      ),
+    ).toMatchObject({ description: "src/notes.ts in the scratch repository." });
+  });
+
+  test("names a structured subagent yield by its action", () => {
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("yield", { data: { content: "done" } }),
+        parseToolResult({ content: [{ type: "text", text: "Result submitted." }] }),
+      ),
+    ).toEqual({
+      type: "plain_text",
+      label: "Submitted subagent result",
+      text: "Result submitted.",
+    });
+  });
+
+  test("connects a steered background bash call with its wait result", () => {
+    const command = "sleep 2; echo finished";
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("bash", { command }),
+        parseToolResult({
+          content: [
+            {
+              type: "text",
+              text: "Backgrounded early to handle an incoming message; the command keeps running.\nJob: bg_1",
+            },
+          ],
+        }),
+      ),
+    ).toMatchObject({ type: "shell", command });
+    const resultText =
+      "## Completed (1)\n\n### bg_1 [bash] — completed\nLabel: sleep 2; echo finished\nDelivery: not auto-delivered; recovered by this snapshot.\n```\nfinished\n```";
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("wait", {}),
+        parseToolResult({
+          content: [{ type: "text", text: resultText }],
+          details: {
+            op: "wait",
+            jobs: [
+              {
+                id: "bg_1",
+                type: "bash",
+                status: "completed",
+                label: command,
+                resultText: "finished",
+              },
+            ],
+          },
+        }),
+      ),
+    ).toEqual({ type: "plain_text", label: `bash completed: ${command}`, text: "finished" });
+  });
+
+  test("maps web search and URL reads to search and fetch", () => {
+    expect(mapOmpToolDetail(parseToolArgs("web_search", { query: "Paseo" }), null)).toMatchObject({
+      type: "search",
+      query: "Paseo",
+      toolName: "web_search",
+    });
+    expect(
+      mapOmpToolDetail(parseToolArgs("read", { path: "https://example.com/" }), null),
+    ).toMatchObject({ type: "fetch", url: "https://example.com/" });
+  });
+
+  test("names virtual device calls from their path on failure and while running", () => {
+    expect(mapOmpToolDetail(parseToolArgs("read", { path: "xd://ast_grep" }), null)).toMatchObject({
+      type: "plain_text",
+      label: "ast_grep",
+    });
+    expect(
+      mapOmpToolDetail(parseToolArgs("write", { path: "xd://lsp", content: "{}" }), null),
+    ).toMatchObject({ type: "plain_text", label: "lsp" });
+  });
+
+  test("renders executed OMP device tools with readable action and output", () => {
+    expect(
+      mapOmpToolDetail(
+        parseToolArgs("write", { path: "xd://github", content: '{"op":"status"}' }),
+        parseToolResult({
+          content: [{ type: "text", text: "Working tree clean" }],
+          details: {
+            xdev: { tool: "github", mode: "execute", args: { op: "status" }, inner: {} },
+          },
+        }),
+      ),
+    ).toEqual({ type: "plain_text", label: "status", text: "Working tree clean" });
+  });
+
+  test("shows the first question in an ask row", () => {
+    expect(
+      mapOmpToolDetail(parseToolArgs("ask", { questions: [{ question: "Which file?" }] }), null),
+    ).toMatchObject({ type: "plain_text", label: "Which file?" });
+  });
+
+  test("shows the question and selected answers after ask completes", () => {
+    const detail = mapOmpToolDetail(
+      parseToolArgs("ask", { questions: [{ question: "Which colors?" }] }),
+      parseToolResult({
+        content: [{ type: "text", text: "User selected: Red, Blue" }],
+        details: { question: "Which colors?", selectedOptions: ["Red", "Blue"] },
+      }),
+    );
+    expect(detail).toEqual({
+      type: "plain_text",
+      label: "Which colors?",
+      text: "Which colors?\nRed, Blue",
+    });
+  });
+
+  test("shows meaningful labels for OMP's remaining built-in tools", () => {
+    expect(mapOmpToolDetail(parseToolArgs("glob", { pattern: "src/**/*.ts" }), null)).toMatchObject(
+      { type: "search", query: "src/**/*.ts", toolName: "glob" },
+    );
+    expect(
+      mapOmpToolDetail(parseToolArgs("ast_grep", { pattern: "console.log($X)" }), null),
+    ).toMatchObject({ type: "search", query: "console.log($X)" });
+    expect(
+      mapOmpToolDetail(parseToolArgs("checkpoint", { goal: "Inspect parser" }), null),
+    ).toMatchObject({ type: "plain_text", label: "Inspect parser" });
+    expect(
+      mapOmpToolDetail(parseToolArgs("manage_skill", { action: "create", name: "demo" }), null),
+    ).toMatchObject({ type: "plain_text", label: "create demo" });
+    expect(
+      mapOmpToolDetail(parseToolArgs("think", { thoughts: "Check the next step" }), null),
+    ).toEqual({
+      type: "plain_text",
+      label: "Thinking",
+      text: "Check the next step",
+    });
+  });
+
+  test("uses OMP ast_grep pat as the search query", () => {
+    expect(
+      mapOmpToolDetail(parseToolArgs("ast_grep", { pat: "console.log($A)" }), null),
+    ).toMatchObject({
+      type: "search",
+      query: "console.log($A)",
+    });
+  });
 });
diff --git a/packages/server/src/server/agent/providers/omp/tool-call-mapper.ts b/packages/server/src/server/agent/providers/omp/tool-call-mapper.ts
index 180790ab3a..86b1ee53ef 100644
--- a/packages/server/src/server/agent/providers/omp/tool-call-mapper.ts
+++ b/packages/server/src/server/agent/providers/omp/tool-call-mapper.ts
@@ -1,7 +1,9 @@
 import type { ToolCallDetail } from "../../agent-sdk-types.js";
+import type { OmpBridgedToolIdentity } from "./mcp-bridge.js";
 import {
   extractTextFromToolResult,
   mapToolDetail as mapOmpCoreToolDetail,
+  resolveToolCallName,
   type OmpToolResult,
   type OmpTrackedToolCall,
 } from "./tool-call-detail.js";
@@ -11,9 +13,13 @@ export function mapOmpToolDetail(
   result: OmpToolResult,
   context?: {
     toolCallId: string;
+    bridgedTool?: OmpBridgedToolIdentity;
     mapSubagentDetail?: (baseDetail: ToolCallDetail) => ToolCallDetail;
   },
 ): ToolCallDetail | null {
+  if (context?.bridgedTool) {
+    return { type: "unknown", input: toolCall.args, output: result };
+  }
   if (toolCall.toolName === "todo") {
     return null;
   }
@@ -21,6 +27,10 @@ export function mapOmpToolDetail(
     const detail = mapOmpTaskDetail(toolCall.args, result);
     return context?.mapSubagentDetail?.(detail) ?? detail;
   }
+  const deviceDetail = mapOmpDeviceToolDetail(toolCall, result);
+  if (deviceDetail) return deviceDetail;
+  const extended = mapOmpExtendedToolDetail(toolCall, result);
+  if (extended) return extended;
   if (toolCall.toolName === "edit") {
     return mapOmpEditDetail(toolCall, result);
   }
@@ -30,19 +40,160 @@ export function mapOmpToolDetail(
   return mapOmpCoreToolDetail(toolCall, result);
 }
 
+function mapOmpDeviceToolDetail(
+  toolCall: OmpTrackedToolCall,
+  result: OmpToolResult,
+): ToolCallDetail | null {
+  if (toolCall.kind !== "write" || !toolCall.args.path.startsWith("xd://")) return null;
+  const toolName = resolveToolCallName(toolCall, result);
+  if (!OPAQUE_TEXT_TOOLS.has(toolName) && toolName !== "ast_grep") return null;
+  let args: unknown;
+  try {
+    args = JSON.parse(toolCall.args.content);
+  } catch {
+    args = null;
+  }
+  return mapOmpExtendedToolDetail({ kind: "unknown", toolName, args }, result);
+}
+
+function mapOmpExtendedToolDetail(
+  toolCall: OmpTrackedToolCall,
+  result: OmpToolResult,
+): ToolCallDetail | null {
+  if (toolCall.toolName === "yield") {
+    return {
+      type: "plain_text",
+      label: "Submitted subagent result",
+      text: extractTextFromToolResult(result),
+    };
+  }
+  if (toolCall.toolName === "wait") {
+    return mapOmpWaitDetail(result);
+  }
+  if (toolCall.toolName === "web_search") {
+    const args = isRecord(toolCall.args) ? toolCall.args : {};
+    return {
+      type: "search",
+      query: firstString(args.query) ?? "Web search",
+      toolName: "web_search",
+      content: extractTextFromToolResult(result),
+    };
+  }
+  if (toolCall.toolName === "ask" || toolCall.toolName === "ask_user") {
+    return mapOmpAskDetail(toolCall.args, result);
+  }
+  if (toolCall.toolName === "glob" || toolCall.toolName === "ast_grep") {
+    const args = isRecord(toolCall.args) ? toolCall.args : {};
+    return {
+      type: "search",
+      query: firstString(args.pattern, args.pat, args.query) ?? toolCall.toolName,
+      ...(toolCall.toolName === "glob" ? { toolName: "glob" as const } : {}),
+      content: extractTextFromToolResult(result),
+    };
+  }
+  if (toolCall.toolName === "think") {
+    const args = isRecord(toolCall.args) ? toolCall.args : {};
+    return { type: "plain_text", label: "Thinking", text: firstString(args.thoughts) };
+  }
+  return mapOmpOpaqueToolDetail(toolCall, result);
+}
+
+function mapOmpWaitDetail(result: OmpToolResult): ToolCallDetail {
+  const text = extractTextFromToolResult(result)?.trim();
+  const jobs = resultDetails(result)?.jobs;
+  const firstJob = Array.isArray(jobs) ? jobs.find(isRecord) : undefined;
+  const jobType = firstString(firstJob?.type);
+  const jobStatus = firstString(firstJob?.status);
+  const jobLabel = firstString(firstJob?.label, firstJob?.id);
+  const label =
+    jobType && jobStatus && jobLabel
+      ? `${jobType} ${jobStatus}: ${jobLabel}`
+      : (text?.split("\n", 1)[0] ?? "Waiting for background work");
+  return {
+    type: "plain_text",
+    label,
+    text: firstString(firstJob?.resultText, firstJob?.errorText) ?? text,
+  };
+}
+
+function mapOmpAskDetail(rawArgs: unknown, result: OmpToolResult): ToolCallDetail {
+  const args = isRecord(rawArgs) ? rawArgs : {};
+  const firstQuestion = Array.isArray(args.questions) ? args.questions[0] : undefined;
+  const askedQuestion = isRecord(firstQuestion) ? firstString(firstQuestion.question) : undefined;
+  const details =
+    result && typeof result !== "string" && isRecord(result.details) ? result.details : {};
+  const answers = Array.isArray(details.results) ? details.results : [details];
+  const lines = answers.flatMap((answer) => {
+    if (!isRecord(answer)) return [];
+    const question = firstString(answer.question);
+    const selected = Array.isArray(answer.selectedOptions)
+      ? answer.selectedOptions.filter((option): option is string => typeof option === "string")
+      : [];
+    const response =
+      [...selected, firstString(answer.customInput)].filter(Boolean).join(", ") || "No selection";
+    return question ? [`${question}\n${response}`] : [];
+  });
+  const text = lines.length ? lines.join("\n\n") : extractTextFromToolResult(result);
+  return {
+    type: "plain_text",
+    label: firstString(details.question, askedQuestion, args.question, args.title) ?? "Question",
+    text,
+  };
+}
+
+function mapOmpOpaqueToolDetail(
+  toolCall: OmpTrackedToolCall,
+  result: OmpToolResult,
+): ToolCallDetail | null {
+  if (OPAQUE_TEXT_TOOLS.has(toolCall.toolName)) {
+    const args = isRecord(toolCall.args) ? toolCall.args : {};
+    const action = firstString(args.action, args.op, args.operation, args.command);
+    const target = firstString(args.name, args.goal, args.path, args.query, args.id, args.report);
+    const label =
+      [action, target].filter(Boolean).join(" ") || toolCall.toolName.replaceAll("_", " ");
+    return { type: "plain_text", label, text: extractTextFromToolResult(result) };
+  }
+  return null;
+}
+
+const OPAQUE_TEXT_TOOLS = new Set([
+  "ast_edit",
+  "debug",
+  "eval",
+  "github",
+  "checkpoint",
+  "rewind",
+  "context_notes",
+  "new_context",
+  "security_scan",
+  "memory_edit",
+  "retain",
+  "recall",
+  "reflect",
+  "learn",
+  "manage_skill",
+  "yield",
+  "goal",
+]);
+
 function mapOmpTaskDetail(args: unknown, result: OmpToolResult): ToolCallDetail {
   const argRecord = isRecord(args) ? args : {};
+  const firstTask = Array.isArray(argRecord.tasks) ? argRecord.tasks.find(isRecord) : undefined;
   const resultText = extractTextFromToolResult(result);
   const childSessionId = readChildSessionId(result);
   return {
     type: "sub_agent",
     subAgentType: firstString(
+      firstTask?.name,
+      argRecord.name,
       argRecord.agent,
       argRecord.subAgentType,
       argRecord.agentType,
       argRecord.type,
     ),
     description: firstString(
+      argRecord.i,
+      taskInstructionSummary(firstTask?.task),
       argRecord.description,
       argRecord.task,
       argRecord.prompt,
@@ -53,6 +204,15 @@ function mapOmpTaskDetail(args: unknown, result: OmpToolResult): ToolCallDetail
   };
 }
 
+function taskInstructionSummary(value: unknown): string | undefined {
+  const instruction = firstString(value);
+  if (!instruction) return undefined;
+  return instruction
+    .split("\n")
+    .map((line) => line.replace(/^#+\s*(?:Target|Goal|Task)\s*/i, "").trim())
+    .find(Boolean);
+}
+
 function mapOmpEditDetail(
   toolCall: OmpTrackedToolCall,
   result: OmpToolResult,
diff --git a/packages/server/src/server/agent/providers/opencode-agent.recovery.test.ts b/packages/server/src/server/agent/providers/opencode-agent.recovery.test.ts
index 49993202dd..8a4f43426e 100644
--- a/packages/server/src/server/agent/providers/opencode-agent.recovery.test.ts
+++ b/packages/server/src/server/agent/providers/opencode-agent.recovery.test.ts
@@ -15,29 +15,63 @@ import { OpenCodeServerManager } from "./opencode/server-manager.js";
 
 test("dispatches ascending OpenCode message identifiers through the public provider path", async () => {
   const upstream = await createRecoveryUpstream();
-  const fixture = await createPublicRecoverySession(upstream, new RecoveryTiming());
-  const observed: AgentStreamEvent[] = [];
-  fixture.session.subscribe((event) => observed.push(event));
-  await upstream.connected(1);
-  upstream.send(0, connectedRecord());
-
-  await fixture.session.startTurn("first");
-  await upstream.dispatched(1);
-  upstream.send(0, idleRecord());
-  await eventually(() =>
-    expect(observed.filter((event) => event.type === "turn_completed")).toHaveLength(1),
+  const client = new OpenCodeAgentClient(
+    createTestLogger(),
+    {
+      command: {
+        mode: "replace",
+        argv: [
+          process.execPath,
+          "-e",
+          `setInterval(() => {}, 1000); fetch(${JSON.stringify(
+            `${upstream.url}/test/listening`,
+          )}).then(() => console.log("listening on test server"));`,
+          "--",
+        ],
+      },
+    },
+    {
+      resolveHomeDir: () => process.cwd(),
+      createClient: ({ directory }) => createOpencodeClient({ baseUrl: upstream.url, directory }),
+    },
   );
-  await fixture.session.startTurn("second");
-  const ids = await upstream.dispatched(2);
+  try {
+    const creating = client.createSession({
+      provider: "opencode",
+      cwd: "/workspace",
+    });
+    void creating.catch(() => undefined);
+    await upstream.awaitingListening();
+    // The process is alive but has not reported listening, so even a reachable endpoint must stay untouched.
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    expect(upstream.connectionCount()).toBe(0);
+    upstream.reportListening();
+    const session = await creating;
+    const observed: AgentStreamEvent[] = [];
+    session.subscribe((event) => observed.push(event));
+    await upstream.connected(1);
+    upstream.send(0, connectedRecord());
 
-  expect(ids).toHaveLength(2);
-  expect(ids[0]).toMatch(/^msg_[0-9a-f]{12}[0-9A-Za-z]{14}$/);
-  expect(ids[1]).toMatch(/^msg_[0-9a-f]{12}[0-9A-Za-z]{14}$/);
-  expect((ids[0] as string) < (ids[1] as string)).toBe(true);
+    await session.startTurn("first");
+    await upstream.dispatched(1);
+    upstream.send(0, idleRecord());
+    await eventually(() =>
+      expect(observed.filter((event) => event.type === "turn_completed")).toHaveLength(1),
+    );
+    await session.startTurn("second");
+    const ids = await upstream.dispatched(2);
 
-  await fixture.session.close();
-  await fixture.manager.shutdown();
-  await upstream.close();
+    expect(ids).toHaveLength(2);
+    expect(ids[0]).toMatch(/^msg_[0-9a-f]{12}[0-9A-Za-z]{14}$/);
+    expect(ids[1]).toMatch(/^msg_[0-9a-f]{12}[0-9A-Za-z]{14}$/);
+    expect((ids[0] as string) < (ids[1] as string)).toBe(true);
+
+    await session.close();
+  } finally {
+    upstream.reportListening();
+    await client.shutdown();
+    await upstream.close();
+  }
 });
 
 test("recovers missed output after EOF without failing the active turn", async () => {
@@ -169,6 +203,105 @@ test("orders queued live deltas behind an incomplete recovery snapshot and suppr
   await upstream.close();
 });
 
+test("sends the next turn to the new OpenCode server after the old one exits", async () => {
+  const exited = await createRecoveryUpstream();
+  const current = await createRecoveryUpstream();
+  const ports = [exited.port, current.port];
+  const processes: RecoveryServerProcess[] = [];
+  const manager = new OpenCodeServerManager({
+    logger: createTestLogger(),
+    portAllocator: async () => ports.shift() as number,
+    resolveCommandPrefix: async () => ({ command: "opencode", args: [] }),
+    resolveHomeDir: () => process.cwd(),
+    spawnServerProcess: () => {
+      const serverProcess = new RecoveryServerProcess();
+      processes.push(serverProcess);
+      return serverProcess as unknown as ChildProcess;
+    },
+    terminateProcess: async (serverProcess) => {
+      (serverProcess as unknown as RecoveryServerProcess).exit();
+      return "terminated";
+    },
+  });
+  const client = new OpenCodeAgentClient(createTestLogger(), undefined, {
+    serverManager: manager,
+    createClient: ({ baseUrl, directory }) => createOpencodeClient({ baseUrl, directory }),
+  });
+  const session = await client.createSession({ provider: "opencode", cwd: "/workspace" });
+  const observed: AgentStreamEvent[] = [];
+  session.subscribe((event) => observed.push(event));
+  await exited.connected(1);
+  exited.send(0, connectedRecord());
+  processes[0]?.exit();
+  await exited.close();
+
+  const turn = session.startTurn("after restart");
+  await current.connected(1);
+  current.send(0, connectedRecord());
+  await turn;
+  await current.dispatched(1);
+  current.send(0, idleRecord());
+
+  await eventually(() => expect(observed.map((event) => event.type)).toContain("turn_completed"));
+  expect(observed.filter((event) => event.type === "turn_failed")).toHaveLength(0);
+
+  await session.close();
+  await manager.shutdown();
+  await current.close();
+});
+
+test("adds the session's MCP servers to the new OpenCode server after the old one exits", async () => {
+  const exited = await createRecoveryUpstream();
+  const current = await createRecoveryUpstream();
+  const ports = [exited.port, current.port];
+  const processes: RecoveryServerProcess[] = [];
+  const manager = new OpenCodeServerManager({
+    logger: createTestLogger(),
+    portAllocator: async () => ports.shift() as number,
+    resolveCommandPrefix: async () => ({ command: "opencode", args: [] }),
+    resolveHomeDir: () => process.cwd(),
+    spawnServerProcess: () => {
+      const serverProcess = new RecoveryServerProcess();
+      processes.push(serverProcess);
+      return serverProcess as unknown as ChildProcess;
+    },
+    terminateProcess: async (serverProcess) => {
+      (serverProcess as unknown as RecoveryServerProcess).exit();
+      return "terminated";
+    },
+  });
+  const client = new OpenCodeAgentClient(createTestLogger(), undefined, {
+    serverManager: manager,
+    createClient: ({ baseUrl, directory }) => createOpencodeClient({ baseUrl, directory }),
+  });
+  const session = await client.createSession({
+    provider: "opencode",
+    cwd: "/workspace",
+    mcpServers: { paseo: { type: "http", url: "http://127.0.0.1:1/mcp" } },
+  });
+  await exited.connected(1);
+  exited.send(0, connectedRecord());
+  const firstTurn = session.startTurn("before restart");
+  await exited.dispatched(1);
+  exited.send(0, idleRecord());
+  await firstTurn;
+  expect(exited.mcpAdds()).toEqual(["paseo"]);
+  processes[0]?.exit();
+  await exited.close();
+
+  const turn = session.startTurn("after restart");
+  await current.connected(1);
+  current.send(0, connectedRecord());
+  await turn;
+  await current.dispatched(1);
+
+  expect(current.mcpAdds()).toEqual(["paseo"]);
+
+  await session.close();
+  await manager.shutdown();
+  await current.close();
+});
+
 class RecoveryTiming implements OpenCodeEventConsumerTiming {
   private resolveWait: (() => void) | null = null;
   arm(): () => void {
@@ -207,7 +340,10 @@ async function createPublicRecoverySession(
       serverProcess?.exit();
       return "terminated";
     },
-    createEventSource: (options) => new OpenCodeEventConsumer({ ...options, timing }),
+    createEventSource: (options) => {
+      expect(options.listening).toBeInstanceOf(Promise);
+      return new OpenCodeEventConsumer({ ...options, timing });
+    },
   });
   const client = new OpenCodeAgentClient(createTestLogger(), undefined, {
     serverManager: manager,
@@ -239,12 +375,18 @@ class RecoveryServerProcess extends EventEmitter {
 
 async function createRecoveryUpstream() {
   const streams: ServerResponse[] = [];
+  let listeningResponse: ServerResponse | null = null;
   const dispatchIds: string[] = [];
+  const mcpAddNames: string[] = [];
   let messages: unknown[] = [];
   let messageReadCount = 0;
   let status: "busy" | "idle" = "idle";
   const server = createServer(async (request, response) => {
     const pathname = new URL(request.url ?? "/", "http://127.0.0.1").pathname;
+    if (pathname === "/test/listening") {
+      listeningResponse = response;
+      return;
+    }
     if (request.url?.startsWith("/global/event")) {
       response.writeHead(200, { "content-type": "text/event-stream" });
       response.flushHeaders();
@@ -254,6 +396,11 @@ async function createRecoveryUpstream() {
     if (request.method === "POST" && pathname === "/session") {
       return json(response, { id: "session-1", directory: "/workspace" });
     }
+    if (request.method === "POST" && pathname === "/mcp") {
+      const body = JSON.parse(await readBody(request)) as { name: string };
+      mcpAddNames.push(body.name);
+      return json(response, {});
+    }
     if (request.url?.includes("/prompt_async")) {
       const body = JSON.parse(await readBody(request)) as { messageID: string };
       dispatchIds.push(body.messageID);
@@ -273,6 +420,10 @@ async function createRecoveryUpstream() {
   return {
     port: address.port,
     url: `http://127.0.0.1:${address.port}`,
+    awaitingListening: async () =>
+      expect.poll(() => listeningResponse, { timeout: 3_000 }).not.toBeNull(),
+    reportListening: () => listeningResponse?.end(),
+    connectionCount: () => streams.length,
     connected: async (count: number) => eventually(() => expect(streams).toHaveLength(count)),
     send(index: number, value: unknown) {
       streams[index]?.write(`data: ${JSON.stringify(value)}\n\n`);
@@ -285,6 +436,7 @@ async function createRecoveryUpstream() {
       return [...dispatchIds];
     },
     messageReads: () => messageReadCount,
+    mcpAdds: () => [...mcpAddNames],
     setMessages(nextMessages: unknown[]) {
       messages = nextMessages;
     },
diff --git a/packages/server/src/server/agent/providers/opencode-agent.test.ts b/packages/server/src/server/agent/providers/opencode-agent.test.ts
index 1f63c4d08e..d6b6c5513a 100644
--- a/packages/server/src/server/agent/providers/opencode-agent.test.ts
+++ b/packages/server/src/server/agent/providers/opencode-agent.test.ts
@@ -333,6 +333,76 @@ describe("OpenCodeAgentClient adapter smoke tests", () => {
     model: TEST_MODEL,
   });
 
+  test.each([
+    { variants: { medium: {}, custom: {} }, selected: "medium", expected: "medium" },
+    { variants: { custom: {} }, selected: "custom", expected: "custom" },
+    { variants: { high: {} }, selected: "medium", expected: undefined },
+    { variants: {}, selected: "medium", expected: undefined },
+  ])(
+    "model switches resolve the retained variant: $selected / $variants",
+    async ({ variants, selected, expected }) => {
+      const cwd = tmpCwd();
+      const runtime = new TestOpenCodeHarness();
+      const upstream = new TestOpenCodeClient();
+      upstream.providerListResponse = {
+        data: {
+          connected: ["test"],
+          all: [
+            {
+              id: "test",
+              name: "Test",
+              source: "api",
+              models: { target: { name: "Target", variants } },
+            },
+          ],
+        },
+      };
+      runtime.enqueueClient(upstream);
+      const client = new OpenCodeAgentClient(logger, undefined, {
+        serverManager: runtime,
+        createClient: runtime.createClient,
+      });
+      const session = await client.createSession({
+        provider: "opencode",
+        cwd,
+        model: "test/source",
+        thinkingOptionId: selected,
+      });
+      const events: AgentStreamEvent[] = [];
+      session.subscribe((event) => events.push(event));
+      try {
+        await session.setModel!("test/target");
+        expect((await session.getRuntimeInfo()).thinkingOptionId).toBe(expected ?? null);
+        expect(events).toContainEqual({
+          type: "thinking_option_changed",
+          provider: "opencode",
+          thinkingOptionId: expected ?? null,
+        });
+        upstream.sessionPromptAsyncEvents = [
+          { type: "session.idle", properties: { sessionID: "session-1" } },
+        ];
+        await collectTurnEvents(streamSession(session, "Use the selected model"));
+        expect(upstream.calls.sessionPromptAsync).toEqual([
+          expect.objectContaining({
+            model: { providerID: "test", modelID: "target" },
+            ...(expected ? { variant: expected } : {}),
+          }),
+        ]);
+        if (!expected) expect(upstream.calls.sessionPromptAsync[0]).not.toHaveProperty("variant");
+        await session.setThinkingOption!("medium");
+        await expect(session.setModel!("test/missing")).rejects.toThrow(
+          "OpenCode model unavailable",
+        );
+        upstream.providerListResponse = { error: "Catalog unavailable" };
+        await expect(session.setModel!("test/source")).rejects.toThrow("Catalog unavailable");
+        expect((await session.getRuntimeInfo()).model).toBe("test/target");
+      } finally {
+        await session.close();
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
   test("creates a session with valid id and provider", async () => {
     const cwd = tmpCwd();
     const runtime = new TestOpenCodeHarness();
@@ -612,6 +682,115 @@ describe("OpenCodeAgentClient adapter smoke tests", () => {
     rmSync(cwd, { recursive: true, force: true });
   }, 120_000);
 
+  test.each([
+    { name: "absent", variants: {} },
+    { name: "empty", variants: { default: {} } },
+    { name: "configured", variants: { default: { reasoningEffort: "low" } } },
+  ])("catalog exposes one Default when upstream default is $name", async ({ variants }) => {
+    const runtime = new TestOpenCodeHarness();
+    const openCodeClient = new TestOpenCodeClient();
+    openCodeClient.providerListResponse = {
+      data: {
+        connected: ["catalog-provider"],
+        all: [
+          {
+            id: "catalog-provider",
+            name: "Catalog provider",
+            source: "api",
+            models: {
+              model: {
+                name: "Variant model",
+                variants: { ...variants, high: {}, "variant:default": {} },
+              },
+            },
+          },
+        ],
+      },
+    };
+    runtime.enqueueClient(openCodeClient);
+    const cwd = tmpCwd();
+    try {
+      const client = new OpenCodeAgentClient(logger, undefined, {
+        serverManager: runtime,
+        createClient: runtime.createClient,
+        resolveHomeDir: () => cwd,
+      });
+      const catalog = await client.fetchCatalog({ scope: "global", force: false });
+      const options = catalog.models[0].thinkingOptions ?? [];
+      expect(options).toEqual([
+        { id: "default", label: "Default", isDefault: true },
+        { id: "high", label: "high" },
+        { id: "variant:default", label: "variant:default" },
+      ]);
+      expect(catalog.models[0].defaultThinkingOptionId).toBe("default");
+      const execution = new TestOpenCodeClient();
+      execution.sessionCreateResponse = { data: { id: "ses_catalog_variants" } };
+      execution.sessionPromptAsyncEvents = [
+        { type: "session.idle", properties: { sessionID: "ses_catalog_variants" } },
+      ];
+      runtime.enqueueClient(execution);
+      const session = await client.createSession({
+        provider: "opencode",
+        cwd,
+        model: "catalog-provider/model",
+        thinkingOptionId: "default",
+      });
+      try {
+        await collectTurnEvents(streamSession(session, "Use OpenCode's default"));
+        await session.setThinkingOption!("high");
+        await collectTurnEvents(streamSession(session, "Use high"));
+        await session.setThinkingOption!("variant:default");
+        await collectTurnEvents(streamSession(session, "Use the literal variant name"));
+        await session.setThinkingOption!("default");
+        await collectTurnEvents(streamSession(session, "Return to OpenCode's default"));
+        expect(execution.calls.sessionPromptAsync).toEqual([
+          expect.not.objectContaining({ variant: expect.anything() }),
+          expect.objectContaining({ variant: "high" }),
+          expect.objectContaining({ variant: "variant:default" }),
+          expect.not.objectContaining({ variant: expect.anything() }),
+        ]);
+      } finally {
+        await session.close();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test.each([
+    { saved: "default", variant: undefined },
+    { saved: "high", variant: "high" },
+    { saved: "variant:default", variant: "variant:default" },
+  ])("resume preserves saved thinking choice $saved", async ({ saved, variant }) => {
+    const runtime = new TestOpenCodeHarness();
+    const execution = new TestOpenCodeClient();
+    execution.sessionPromptAsyncEvents = [
+      { type: "session.idle", properties: { sessionID: "ses_saved_variant" } },
+    ];
+    runtime.enqueueClient(execution);
+    const client = new OpenCodeAgentClient(logger, undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    const cwd = tmpCwd();
+    try {
+      const session = await client.resumeSession(
+        { provider: "opencode", sessionId: "ses_saved_variant", metadata: { cwd } },
+        { thinkingOptionId: saved },
+      );
+      try {
+        await collectTurnEvents(streamSession(session, "Keep my saved choice"));
+        expect(execution.calls.sessionPromptAsync.map((request) => request.variant)).toEqual([
+          variant,
+        ]);
+      } finally {
+        await session.close();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
   test("fetchCatalog returns models with required fields", async () => {
     const runtime = new TestOpenCodeHarness();
     const openCodeClient = new TestOpenCodeClient();
@@ -1439,6 +1618,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
       new Map(),
       createDirectEventSource(fakeClient),
     );
@@ -1549,6 +1729,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
       new Map(),
       createDirectEventSource(fakeClient),
     );
@@ -1633,6 +1814,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
       new Map(),
       createDirectEventSource(fakeClient),
     );
@@ -1674,6 +1856,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
       new Map(),
       undefined,
       undefined,
@@ -1702,6 +1885,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
     );
 
     await session.close();
@@ -1726,6 +1910,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
       new Map(),
       events,
     );
@@ -1798,6 +1983,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
     );
 
     const history: AgentStreamEvent[] = [];
@@ -1835,6 +2021,76 @@ describe("OpenCode adapter startTurn error handling", () => {
     ]);
   });
 
+  test("streamHistory hides user text that OpenCode marks synthetic", async () => {
+    const fakeClient = {
+      session: {
+        get: vi.fn().mockResolvedValue({
+          data: { revert: undefined },
+          error: undefined,
+        }),
+        messages: vi.fn().mockResolvedValue({
+          data: [
+            {
+              info: { id: "msg_continue", sessionID: "ses_unit_test", role: "user" },
+              parts: [
+                {
+                  id: "prt_continue",
+                  sessionID: "ses_unit_test",
+                  messageID: "msg_continue",
+                  type: "text",
+                  text: "Summarize the task tool output above and continue with your task.",
+                  synthetic: true,
+                },
+              ],
+            },
+            {
+              info: { id: "msg_user", sessionID: "ses_unit_test", role: "user" },
+              parts: [
+                {
+                  id: "prt_user",
+                  sessionID: "ses_unit_test",
+                  messageID: "msg_user",
+                  type: "text",
+                  text: "Read the notes",
+                },
+                {
+                  id: "prt_resource",
+                  sessionID: "ses_unit_test",
+                  messageID: "msg_user",
+                  type: "text",
+                  text: "Reading MCP resource: notes.md",
+                  synthetic: true,
+                },
+              ],
+            },
+          ],
+          error: undefined,
+        }),
+      },
+    } as never;
+
+    const session = new __openCodeInternals.OpenCodeAgentSession(
+      { provider: "opencode", cwd: "/tmp/test" },
+      fakeClient,
+      "ses_unit_test",
+      createTestLogger(),
+      {},
+    );
+
+    const history: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) {
+      history.push(event);
+    }
+
+    expect(history).toEqual([
+      {
+        type: "timeline",
+        provider: "opencode",
+        item: { type: "user_message", text: "Read the notes", messageId: "msg_user" },
+      },
+    ]);
+  });
+
   test("streamHistory omits replay timestamps when OpenCode omits times", async () => {
     const fakeClient = {
       session: {
@@ -1871,6 +2127,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
     );
 
     const history: AgentStreamEvent[] = [];
@@ -1984,6 +2241,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
     );
 
     const history: AgentStreamEvent[] = [];
@@ -2099,6 +2357,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       fakeClient,
       "ses_unit_test",
       createTestLogger(),
+      {},
     );
 
     const events: AgentStreamEvent[] = [];
@@ -2276,49 +2535,41 @@ describe("OpenCode adapter startTurn error handling", () => {
   });
 
   test("sends exact Hub MCP permission grants without approving unrelated tools", async () => {
-    const promptAsync = vi.fn(async () => ({ data: {}, error: undefined }));
-    const fakeClient = {
-      global: {
-        event: vi.fn().mockImplementation(async ({ signal }: { signal: AbortSignal }) => ({
-          stream: {
-            async *[Symbol.asyncIterator](): AsyncGenerator<OpenCodeEvent> {
-              yield { type: "server.connected", properties: {} } as OpenCodeEvent;
-              await waitForAbort(signal);
-            },
-          },
-        })),
-      },
-      session: { promptAsync },
-    } as never;
-    const session = new __openCodeInternals.OpenCodeAgentSession(
-      {
+    const cwd = tmpCwd();
+    const runtime = new TestOpenCodeHarness();
+    const openCode = new TestOpenCodeClient();
+    runtime.enqueueClient(openCode);
+    const client = new OpenCodeAgentClient(createTestLogger(), undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    try {
+      const session = await client.createSession({
         provider: "opencode",
-        cwd: "/tmp/test",
-        providerOptions: { permission: { bash: "ask", hub_reply: "deny" } },
+        cwd,
+        providerOptions: { permission: { bash: "ask", question: "deny" } },
         toolPolicy: {
           preapproved: [{ kind: "mcp", server: "hub", tool: "finish_execution" }],
         },
-      },
-      fakeClient,
-      "ses_unit_test",
-      createTestLogger(),
-    );
-
-    await session.startTurn("finish");
-
-    expect(promptAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        permission: [
+      });
+      try {
+        const created = openCode.calls.sessionCreate[0] as {
+          permission?: Array<{ permission: string; pattern: string; action: string }>;
+        };
+        expect(created.permission).toEqual([
           { permission: "hub_finish_execution", pattern: "*", action: "allow" },
           { permission: "bash", pattern: "*", action: "ask" },
-          { permission: "hub_reply", pattern: "*", action: "deny" },
-        ],
-      }),
-    );
-    expect(promptAsync.mock.calls[0]?.[0].permission).not.toContainEqual(
-      expect.objectContaining({ permission: "bash", action: "allow" }),
-    );
-    await session.close();
+          { permission: "question", pattern: "*", action: "deny" },
+        ]);
+        expect(created.permission).not.toContainEqual(
+          expect.objectContaining({ permission: "bash", action: "allow" }),
+        );
+      } finally {
+        await session.close();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
   });
 
   test("waits for the stop abort and provider idle before starting the next prompt", async () => {
@@ -2906,6 +3157,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       sdkClient,
       "ses_sync_abort_failure",
       createTestLogger(),
+      {},
     );
 
     try {
@@ -3504,7 +3756,10 @@ describe("OpenCode adapter startTurn error handling", () => {
     try {
       await session.startTurn("first");
       await session.interrupt();
+      const descriptor = session.usageSession?.();
       openCode.emitEvent({ type: "server-exited", error: new Error("OpenCode exited") });
+      expect(session.usageSession?.()).toEqual(descriptor);
+      expect(descriptor).not.toBeNull();
       await vi.advanceTimersByTimeAsync(0);
 
       openCode.sessionPromptAsyncEvents = [
@@ -3559,6 +3814,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       openCode.asSdkClient(),
       "ses_readiness_timeout",
       createTestLogger(),
+      {},
       new Map(),
       {
         ready: () => new Promise<void>(() => undefined),
@@ -3612,6 +3868,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       openCode.asSdkClient(),
       "ses_readiness_slow_stream",
       createTestLogger(),
+      {},
       new Map(),
       {
         ready: () => streamReady.promise,
@@ -3644,6 +3901,7 @@ describe("OpenCode adapter startTurn error handling", () => {
       openCode.asSdkClient(),
       "ses_readiness_retry",
       createTestLogger(),
+      {},
       new Map(),
       {
         ready: () => streamReady.promise,
@@ -4414,6 +4672,7 @@ describe("OpenCode provider subagent contract", () => {
       event: {
         type: "upsert",
         id: "ses_child_registry",
+        parentSubagentId: null,
         description: "Live child",
         status: "running",
       },
@@ -5321,6 +5580,7 @@ describe("OpenCode provider subagent contract", () => {
       fakeClient,
       "ses_parent",
       createTestLogger(),
+      {},
       new Map(),
       createDirectEventSource(fakeClient),
     );
@@ -5338,6 +5598,7 @@ describe("OpenCode provider subagent contract", () => {
       event: {
         type: "upsert",
         id: "ses_child_background",
+        parentSubagentId: null,
         description: "Plugin child",
         status: "running",
       },
@@ -5386,6 +5647,7 @@ describe("OpenCode provider subagent contract", () => {
         event: {
           type: "upsert",
           id: "ses_child_plugin",
+          parentSubagentId: null,
           description: "Background plugin child",
           status: "running",
         },
@@ -5477,6 +5739,7 @@ describe("OpenCode provider subagent contract", () => {
       fakeClient,
       "ses_parent",
       createTestLogger(),
+      {},
       new Map(),
       createDirectEventSource(fakeClient),
     );
@@ -5629,6 +5892,7 @@ describe("OpenCode provider subagent contract", () => {
         event: {
           type: "upsert",
           id: "ses_child_rich",
+          parentSubagentId: null,
           title: "explore",
           description: "Investigate flaky test",
           status: "running",
@@ -5655,7 +5919,12 @@ describe("OpenCode provider subagent contract", () => {
       {
         type: "provider_subagent",
         provider: "opencode",
-        event: { type: "upsert", id: "ses_child_bare", status: "running" },
+        event: {
+          type: "upsert",
+          id: "ses_child_bare",
+          parentSubagentId: null,
+          status: "running",
+        },
       },
     ]);
   });
@@ -5980,12 +6249,24 @@ describe("OpenCode provider subagent contract", () => {
       {
         type: "provider_subagent",
         provider: "opencode",
-        event: { type: "upsert", id: "ses_child_a", description: "Child A", status: "completed" },
+        event: {
+          type: "upsert",
+          id: "ses_child_a",
+          parentSubagentId: null,
+          description: "Child A",
+          status: "completed",
+        },
       },
       {
         type: "provider_subagent",
         provider: "opencode",
-        event: { type: "upsert", id: "ses_child_b", description: "Child B", status: "completed" },
+        event: {
+          type: "upsert",
+          id: "ses_child_b",
+          parentSubagentId: null,
+          description: "Child B",
+          status: "completed",
+        },
       },
       {
         type: "provider_subagent",
@@ -5993,6 +6274,7 @@ describe("OpenCode provider subagent contract", () => {
         event: {
           type: "upsert",
           id: "ses_grandchild_a",
+          parentSubagentId: "ses_child_a",
           description: "Grandchild A",
           status: "completed",
         },
@@ -6055,6 +6337,7 @@ describe("OpenCode provider subagent contract", () => {
       event: {
         type: "upsert",
         id: "ses_child_with_history",
+        parentSubagentId: null,
         description: "Historical child",
         status: "completed",
         cwd: "/workspace/child",
@@ -6142,6 +6425,7 @@ describe("OpenCode provider subagent contract", () => {
       event: {
         type: "upsert",
         id: "ses_child_hydrated_facts",
+        parentSubagentId: null,
         description: "Chase the regression",
         status: "completed",
         subtitle: "claude-sonnet-5 · Max",
@@ -6600,3 +6884,129 @@ describe("OpenCode snapshot summary false-idle regression", () => {
     await session.close();
   });
 });
+
+describe("OpenCode session permission rules", () => {
+  const logger = createTestLogger();
+  function permissionConfig(cwd: string): AgentSessionConfig {
+    return {
+      provider: "opencode",
+      cwd,
+      providerOptions: { permission: { bash: "ask", external_directory: "allow" } },
+      toolPolicy: { preapproved: [{ kind: "mcp", server: "hub", tool: "finish_execution" }] },
+    };
+  }
+  // OpenCode stores permission rules on the session (POST /session, PATCH /session/{id}) and
+  // drops an unknown `permission` field on prompt_async, so rules sent with a prompt never
+  // reach the server.
+  const expectedRules = [
+    { permission: "hub_finish_execution", pattern: "*", action: "allow" },
+    { permission: "bash", pattern: "*", action: "ask" },
+    { permission: "external_directory", pattern: "*", action: "allow" },
+  ];
+
+  test("creates the session with the agent's permission rules", async () => {
+    const cwd = tmpCwd();
+    const runtime = new TestOpenCodeHarness();
+    const openCode = new TestOpenCodeClient();
+    runtime.enqueueClient(openCode);
+    const client = new OpenCodeAgentClient(logger, undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    try {
+      const session = await client.createSession(permissionConfig(cwd));
+      try {
+        expect(openCode.calls.sessionCreate[0]).toEqual(
+          expect.objectContaining({ permission: expectedRules }),
+        );
+      } finally {
+        await session.close();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("applies the agent's permission rules to a resumed session", async () => {
+    const cwd = tmpCwd();
+    const runtime = new TestOpenCodeHarness();
+    const openCode = new TestOpenCodeClient();
+    runtime.enqueueClient(openCode);
+    const client = new OpenCodeAgentClient(logger, undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    try {
+      const session = await client.resumeSession(
+        { provider: "opencode", sessionId: "ses_resumed_rules", metadata: { cwd } },
+        permissionConfig(cwd),
+      );
+      try {
+        expect(openCode.calls.sessionUpdate[0]).toEqual(
+          expect.objectContaining({
+            sessionID: "ses_resumed_rules",
+            permission: expectedRules,
+          }),
+        );
+      } finally {
+        await session.close();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("fails the resume when the rules cannot be applied", async () => {
+    const cwd = tmpCwd();
+    const runtime = new TestOpenCodeHarness();
+    const openCode = new TestOpenCodeClient();
+    openCode.sessionUpdateResponse = { error: { data: { message: "session is archived" } } };
+    runtime.enqueueClient(openCode);
+    const client = new OpenCodeAgentClient(logger, undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    try {
+      // Resuming without the rules would run the agent under a more permissive policy than
+      // the one it was configured with, which is the failure this guards.
+      await expect(
+        client.resumeSession(
+          { provider: "opencode", sessionId: "ses_archived", metadata: { cwd } },
+          permissionConfig(cwd),
+        ),
+      ).rejects.toThrow("Failed to apply OpenCode session permission rules");
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("leaves a session without rules untouched", async () => {
+    const cwd = tmpCwd();
+    const runtime = new TestOpenCodeHarness();
+    const openCode = new TestOpenCodeClient();
+    runtime.enqueueClient(openCode);
+    const client = new OpenCodeAgentClient(logger, undefined, {
+      serverManager: runtime,
+      createClient: runtime.createClient,
+    });
+    try {
+      const session = await client.resumeSession({
+        provider: "opencode",
+        sessionId: "ses_resumed_no_rules",
+        metadata: { cwd },
+      });
+      try {
+        expect(session.usageSession?.()).toMatchObject({
+          provider: "opencode",
+          sessionKey: expect.any(String),
+        });
+        expect(openCode.calls.sessionUpdate).toEqual([]);
+      } finally {
+        await session.close();
+        expect(session.usageSession?.()).toBeNull();
+      }
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode-agent.ts b/packages/server/src/server/agent/providers/opencode-agent.ts
index ad22023ec0..7e49bc50d3 100644
--- a/packages/server/src/server/agent/providers/opencode-agent.ts
+++ b/packages/server/src/server/agent/providers/opencode-agent.ts
@@ -1,3 +1,4 @@
+import { validateProviderOptions } from "../provider-options.js";
 import {
   createOpencodeClient,
   type AssistantMessage as OpenCodeAssistantMessage,
@@ -12,7 +13,7 @@ import {
   type TextPartInput as OpenCodeTextPartInput,
 } from "@opencode-ai/sdk/v2/client";
 import fs from "node:fs/promises";
-import { randomBytes } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { createPathEquivalenceMatcher } from "../../../utils/path.js";
 import pLimit from "p-limit";
@@ -806,11 +807,14 @@ function buildOpenCodeModelDefinition(
   },
 ): AgentModelDefinition {
   const rawVariants = model.variants ? Object.keys(model.variants) : [];
-  // OpenCode lists only overrides; its base model behavior is selected by omitting `variant`.
+  // Like OpenCode's web UI, Default omits `variant` and lets OpenCode resolve it.
+  // Reserve that choice instead of exposing a second upstream `default` entry.
   const thinkingOptions = rawVariants.length
     ? [
         { id: OPENCODE_DEFAULT_VARIANT_ID, label: "Default", isDefault: true },
-        ...rawVariants.map((id) => ({ id, label: id })),
+        ...rawVariants
+          .filter((id) => id !== OPENCODE_DEFAULT_VARIANT_ID)
+          .map((id) => ({ id, label: id })),
       ]
     : [];
 
@@ -1315,7 +1319,10 @@ function buildOpenCodeReplayTimelineEvents(
   }
   if (info.role === "user") {
     const text = parts
-      .filter((part): part is Extract<OpenCodePart, { type: "text" }> => part.type === "text")
+      .filter(
+        (part): part is Extract<OpenCodePart, { type: "text" }> =>
+          part.type === "text" && isUserAuthoredOpenCodeText(part),
+      )
       .map((part) => part.text)
       .join("");
 
@@ -1422,10 +1429,11 @@ export class OpenCodeAgentClient implements AgentClient {
       OpenCodeServerManager.getInstance(this.logger, runtimeSettings, {
         managedProcesses: deps.managedProcesses,
         resolveHomeDir: deps.resolveHomeDir,
-        createEventSource: ({ serverUrl, processExit, logger: eventLogger }) =>
+        createEventSource: ({ serverUrl, processExit, listening, logger: eventLogger }) =>
           new OpenCodeEventConsumer({
             serverUrl,
             processExit,
+            listening,
             logger: eventLogger,
             createClient: (baseUrl) => this.createOpenCodeClient({ baseUrl, directory: "" }),
           }),
@@ -1442,19 +1450,26 @@ export class OpenCodeAgentClient implements AgentClient {
     options?: AgentCreateSessionOptions,
   ): Promise<AgentSession> {
     const openCodeConfig = this.assertConfig(config);
-    const acquisition = await this.acquireServer(openCodeConfig, launchContext);
-    const { url } = acquisition.server;
-    const client = this.createOpenCodeClient({
-      baseUrl: url,
-      directory: openCodeConfig.cwd,
-    });
+    const connectServer = this.connectServer.bind(this, openCodeConfig, launchContext);
+    const connection = await connectServer();
+    const { client } = connection;
+
+    // OpenCode stores permission rules on the session, so they are set here and on resume
+    // rather than sent with each prompt, which drops them.
+    const permission = buildOpenCodePermissionRules(
+      openCodeConfig.providerOptions,
+      openCodeConfig.toolPolicy,
+    );
 
     try {
       // Creating the first session for a directory is part of OpenCode coming up, so it
       // shares the server startup budget instead of a shorter one that fails agent
       // creation on contended cold starts.
       const response = await withTimeout(
-        client.session.create({ directory: openCodeConfig.cwd }),
+        client.session.create({
+          directory: openCodeConfig.cwd,
+          ...(permission ? { permission } : {}),
+        }),
         OPENCODE_SERVER_STARTUP_TIMEOUT_MS,
         `OpenCode session.create timed out after ${Math.round(
           OPENCODE_SERVER_STARTUP_TIMEOUT_MS / 1000,
@@ -1478,17 +1493,19 @@ export class OpenCodeAgentClient implements AgentClient {
         client,
         session.id,
         this.logger,
+        connection.environment,
         new Map(this.modelContextWindows),
-        acquisition.events,
-        acquisition.release,
+        connection.events,
+        connection.release,
         options?.persistSession,
         launchContext?.agentId,
-        url,
+        connection.url,
         false,
         unbindBridge,
+        connectServer,
       );
     } catch (error) {
-      await acquisition.release();
+      await connection.release();
       throw error;
     }
   }
@@ -1515,15 +1532,14 @@ export class OpenCodeAgentClient implements AgentClient {
     const registeredAcquisition = registeredServerUrl
       ? this.serverManager.acquireExisting(registeredServerUrl)
       : null;
-    const acquisition =
-      registeredAcquisition ?? (await this.acquireServer(openCodeConfig, launchContext));
-    const { url } = acquisition.server;
-    const client = this.createOpenCodeClient({
-      baseUrl: url,
-      directory: openCodeConfig.cwd,
-    });
+    const connectServer = this.connectServer.bind(this, openCodeConfig, launchContext);
+    const connection = registeredAcquisition
+      ? this.toServerConnection(registeredAcquisition, openCodeConfig.cwd)
+      : await connectServer();
+    const { client } = connection;
 
     try {
+      await this.applySessionPermissionRules(client, openCodeConfig, handle.sessionId);
       await this.populateModelContextWindowCache(client, openCodeConfig.cwd);
       const unbindBridge = this.bindBridgeSession(handle.sessionId, launchContext);
 
@@ -1532,21 +1548,61 @@ export class OpenCodeAgentClient implements AgentClient {
         client,
         handle.sessionId,
         this.logger,
+        connection.environment,
         new Map(this.modelContextWindows),
-        acquisition.events,
-        acquisition.release,
+        connection.events,
+        connection.release,
         undefined,
         launchContext?.agentId,
-        url,
+        connection.url,
         registeredAcquisition !== null,
         unbindBridge,
+        connectServer,
       );
     } catch (error) {
-      await acquisition.release();
+      await connection.release();
       throw error;
     }
   }
 
+  private async applySessionPermissionRules(
+    client: OpencodeClient,
+    config: OpenCodeAgentConfig,
+    sessionId: string,
+  ): Promise<void> {
+    const permission = buildOpenCodePermissionRules(config.providerOptions, config.toolPolicy);
+    if (!permission) return;
+    const response = readOpenCodeRecord(
+      await client.session.update({ sessionID: sessionId, directory: config.cwd, permission }),
+    );
+    if (response?.error) {
+      throw new Error(
+        `Failed to apply OpenCode session permission rules: ${toDiagnosticErrorMessage(response.error)}`,
+      );
+    }
+  }
+
+  private async connectServer(
+    config: OpenCodeAgentConfig,
+    launchContext?: AgentLaunchContext,
+  ): Promise<OpenCodeServerConnection> {
+    const acquisition = await this.acquireServer(config, launchContext);
+    return this.toServerConnection(acquisition, config.cwd);
+  }
+
+  private toServerConnection(
+    acquisition: OpenCodeServerAcquisition,
+    directory: string,
+  ): OpenCodeServerConnection {
+    return {
+      client: this.createOpenCodeClient({ baseUrl: acquisition.server.url, directory }),
+      events: acquisition.events,
+      environment: acquisition.environment,
+      url: acquisition.server.url,
+      release: acquisition.release,
+    };
+  }
+
   private acquireServer(
     config: OpenCodeAgentConfig,
     launchContext?: AgentLaunchContext,
@@ -1879,7 +1935,9 @@ export class OpenCodeAgentClient implements AgentClient {
     if (config.provider !== "opencode") {
       throw new Error(`OpenCodeAgentClient received config for provider '${config.provider}'`);
     }
-    const providerOptions = OpenCodeProviderOptionsSchema.parse(config.providerOptions ?? {});
+    const providerOptions =
+      validateProviderOptions("opencode", OpenCodeProviderOptionsSchema, config.providerOptions) ??
+      {};
     return normalizeOpenCodeConfig({ ...config, provider: "opencode", providerOptions });
   }
 
@@ -2423,6 +2481,7 @@ function appendOpenCodeChildSessionDetected(
     event: {
       type: "upsert",
       id: child.id,
+      parentSubagentId: child.parentSessionId === state.sessionId ? null : child.parentSessionId,
       ...(title ? { title } : {}),
       ...(child.title && !presentation.descriptionFromLink ? { description: child.title } : {}),
       ...(status ? { status } : {}),
@@ -2805,6 +2864,11 @@ function shouldSuppressOpenCodeAssistantPart(
   );
 }
 
+// OpenCode marks text it adds to a user message itself with `synthetic` and hides it from its own UI.
+function isUserAuthoredOpenCodeText(part: { synthetic?: boolean }): boolean {
+  return part.synthetic !== true;
+}
+
 function appendOpenCodeTextPart(
   part: Extract<
     Extract<OpenCodeEvent, { type: "message.part.updated" }>["properties"]["part"],
@@ -2815,7 +2879,11 @@ function appendOpenCodeTextPart(
   events: AgentStreamEvent[],
 ): void {
   if (messageRole === "user") {
-    if (!part.text || state.emittedUserMessageIds?.has(part.messageID)) {
+    if (
+      !part.text ||
+      !isUserAuthoredOpenCodeText(part) ||
+      state.emittedUserMessageIds?.has(part.messageID)
+    ) {
       return;
     }
     state.emittedUserMessageIds?.add(part.messageID);
@@ -3218,7 +3286,7 @@ function isOpenCodeTerminalEvent(event: OpenCodeEvent, sessionId: string): boole
 }
 
 function isOpenCodeProviderInternalEvent(event: AgentStreamEvent): boolean {
-  return event.type === "provider_subagent";
+  return event.type === "provider_subagent" || event.type === "model_changed";
 }
 
 function readOpenCodeChildSessionInfo(value: unknown): OpenCodeChildSessionInfo | null {
@@ -3291,12 +3359,25 @@ async function listOpenCodeChildSessions(
   return readOpenCodeChildSessionInfosFromResponse(sessionIdResponse) ?? [];
 }
 
+/** One OpenCode server generation a session talks to. */
+interface OpenCodeServerConnection {
+  environment: Record<string, string>;
+  client: OpencodeClient;
+  events: OpenCodeEventSource;
+  url: string;
+  release: () => Promise<void>;
+}
+
 class OpenCodeAgentSession implements AgentSession {
   readonly provider = "opencode" as const;
   readonly capabilities = OPENCODE_CAPABILITIES;
 
   private readonly config: OpenCodeAgentConfig;
-  private readonly client: OpencodeClient;
+  private server: OpenCodeServerConnection;
+  /** Connects to the server generation that is current now. */
+  private readonly connectServer: (() => Promise<OpenCodeServerConnection>) | null;
+  private serverExited = false;
+  private reconnection: Promise<void> | null = null;
   private readonly sessionId: string;
   private readonly logger: Logger;
   private readonly modelContextWindowsByModelKey: ReadonlyMap<string, number>;
@@ -3306,8 +3387,7 @@ class OpenCodeAgentSession implements AgentSession {
   private abortController: AbortController | null = null;
   private accumulatedUsage: AgentUsage = {};
   private sessionTotalCostUsd: number | undefined;
-  private mcpConfigured = false;
-  private mcpSetupPromise: Promise<void> | null = null;
+  private mcpSetup: Promise<void> | null = null;
   private messageRoles = new Map<string, OpenCodeMessageRole>();
   private pendingUserMessageText: string | null = null;
   private pendingClientMessageId: string | null = null;
@@ -3354,7 +3434,6 @@ class OpenCodeAgentSession implements AgentSession {
   private childHydrationCompleted = false;
   private readonly unrelatedSessionIds = new Set<string>();
   private selectedModelContextWindowMaxTokens: number | undefined;
-  private releaseServer: (() => Promise<void>) | null;
   private releaseBridge: (() => void) | null;
   private ingress = Promise.resolve();
   private gapRepairRevision = 0;
@@ -3363,36 +3442,69 @@ class OpenCodeAgentSession implements AgentSession {
   private closed = false;
   private readonly persistSession: boolean;
   private deletedFromProvider = false;
+  private readonly usageSessionKey = randomUUID();
   constructor(
     config: OpenCodeAgentConfig,
     client: OpencodeClient,
     sessionId: string,
     logger: Logger,
+    private readonly harnessEnvironment: Record<string, string>,
     modelContextWindowsByModelKey: ReadonlyMap<string, number> = new Map(),
-    private readonly events: OpenCodeEventSource = EMPTY_OPENCODE_EVENT_SOURCE,
-    releaseServer?: () => Promise<void>,
+    events: OpenCodeEventSource = EMPTY_OPENCODE_EVENT_SOURCE,
+    releaseServer: () => Promise<void> = async () => undefined,
     persistSession = true,
     private readonly agentId?: string,
-    private readonly serverUrl?: string,
+    serverUrl?: string,
     private readonly externallyDriven = false,
     releaseBridge?: () => void,
+    connectServer?: () => Promise<OpenCodeServerConnection>,
   ) {
     this.config = config;
-    this.client = client;
+    this.server = {
+      client,
+      events,
+      url: serverUrl ?? "",
+      release: releaseServer,
+      environment: this.harnessEnvironment,
+    };
+    this.connectServer = connectServer ?? null;
     this.sessionId = sessionId;
     this.logger = logger.child({ agentId: this.agentId });
     this.modelContextWindowsByModelKey = modelContextWindowsByModelKey;
     this.currentMode = normalizeOpenCodeModeId(config.modeId);
     this.autoAcceptEnabled = !config.toolPolicy && isOpenCodeAutoAcceptEnabled(config);
-    this.releaseServer = releaseServer ?? null;
     this.releaseBridge = releaseBridge ?? null;
     this.persistSession = persistSession;
     this.selectedModelContextWindowMaxTokens = this.resolveConfiguredModelContextWindowMaxTokens(
       config.model,
     );
+    this.subscribeServerEvents();
+  }
+
+  usageSession() {
+    if (this.closed) return null;
+    return {
+      provider: "opencode",
+      model: this.config.model,
+      env: this.harnessEnvironment,
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
+  private get client(): OpencodeClient {
+    return this.server.client;
+  }
+
+  private get events(): OpenCodeEventSource {
+    return this.server.events;
+  }
+
+  private subscribeServerEvents(): void {
     this.unsubscribeEvents = this.events.subscribe((input) => {
-      if ("type" in input && input.type === "server-exited")
+      if ("type" in input && input.type === "server-exited") {
         this.recoveryAbortController.abort(input.error);
+        this.serverExited = true;
+      }
       this.ingress = this.ingress
         .then(() => this.consumeEventSourceInput(input))
         .catch((error) => {
@@ -3404,6 +3516,47 @@ class OpenCodeAgentSession implements AgentSession {
     });
   }
 
+  /**
+   * The OpenCode session outlives the server process that served it, and Paseo starts the
+   * next server on a new port. Move to the current server before talking to OpenCode again,
+   * so the session does not keep calling a port nothing listens on.
+   */
+  private async reconnectIfServerExited(): Promise<void> {
+    if (!this.serverExited || !this.connectServer) return;
+    this.reconnection ??= this.reconnect(this.connectServer).finally(() => {
+      this.reconnection = null;
+    });
+    await this.reconnection;
+  }
+
+  private async reconnect(connectServer: () => Promise<OpenCodeServerConnection>): Promise<void> {
+    const exited = this.server;
+    const next = await connectServer();
+    if (this.closed) {
+      await next.release();
+      return;
+    }
+    this.unsubscribeEvents?.();
+    this.unsubscribeEvents = null;
+    // Let the exited server's queued events, including its exit, settle while no turn is
+    // running, so none of them can fail a turn started on the new server.
+    await this.ingress;
+    if (this.closed) {
+      await next.release();
+      return;
+    }
+    this.server = next;
+    this.serverExited = false;
+    this.recoveryAbortController = new AbortController();
+    this.mcpSetup = null;
+    this.subscribeServerEvents();
+    this.logger.info(
+      { sessionId: this.sessionId, previousUrl: exited.url, url: next.url },
+      "OpenCode session moved to the current server after its server exited",
+    );
+    await exited.release();
+  }
+
   get id(): string | null {
     return this.sessionId;
   }
@@ -3422,16 +3575,37 @@ class OpenCodeAgentSession implements AgentSession {
       sessionId: this.sessionId,
       model: this.config.model ?? null,
       modeId: this.currentMode,
+      thinkingOptionId: this.config.thinkingOptionId ?? null,
     };
   }
 
   async setModel(modelId: string | null): Promise<void> {
+    await this.reconnectIfServerExited();
     const normalizedModelId =
       typeof modelId === "string" && modelId.trim().length > 0 ? modelId : null;
+    let variant = this.config.thinkingOptionId;
+    if (!normalizedModelId) {
+      variant = undefined;
+    } else if (variant) {
+      const model = this.parseModel(normalizedModelId);
+      const response = await this.client.provider.list({ directory: this.config.cwd });
+      if (response.error)
+        throw new Error(`Failed to fetch OpenCode providers: ${JSON.stringify(response.error)}`);
+      const provider = response.data?.all.find((entry) => entry.id === model?.providerID);
+      const target = model && provider?.models[model.modelID];
+      if (!target) throw new Error(`OpenCode model unavailable: ${normalizedModelId}`);
+      if (!Object.hasOwn(target.variants ?? {}, variant)) variant = undefined;
+    }
     this.config.model = normalizedModelId ?? undefined;
+    this.config.thinkingOptionId = variant;
     this.selectedModelContextWindowMaxTokens = this.resolveConfiguredModelContextWindowMaxTokens(
       this.config.model,
     );
+    this.notifySubscribers({
+      type: "thinking_option_changed",
+      provider: "opencode",
+      thinkingOptionId: variant ?? null,
+    });
   }
 
   async setThinkingOption(thinkingOptionId: string | null): Promise<void> {
@@ -3506,10 +3680,6 @@ class OpenCodeAgentSession implements AgentSession {
       this.config.systemPrompt,
       this.config.daemonAppendSystemPrompt,
     );
-    const permission = buildOpenCodePermissionRules(
-      this.config.providerOptions,
-      this.config.toolPolicy,
-    );
     const model = this.parseModel(this.config.model);
     const effectiveMode = resolveOpenCodeRuntimeAgentId(this.currentMode);
     const effectiveVariant = this.config.thinkingOptionId ?? undefined;
@@ -3521,7 +3691,6 @@ class OpenCodeAgentSession implements AgentSession {
         messageID: promptId,
         parts,
         ...(systemPrompt ? { system: systemPrompt } : {}),
-        ...(permission ? { permission } : {}),
         ...(model ? { model } : {}),
         ...(effectiveMode ? { agent: effectiveMode } : {}),
         ...(effectiveVariant ? { variant: effectiveVariant } : {}),
@@ -3574,6 +3743,7 @@ class OpenCodeAgentSession implements AgentSession {
   }
 
   async revertBoth(input: { messageId: string }): Promise<void> {
+    await this.reconnectIfServerExited();
     await revertOpenCodeConversationAndFiles({
       client: this.client,
       sessionId: this.sessionId,
@@ -3698,6 +3868,7 @@ class OpenCodeAgentSession implements AgentSession {
     if (this.turnState.status === "running") {
       throw new Error("A foreground turn is already active");
     }
+    await this.reconnectIfServerExited();
     try {
       await this.awaitRunnerQuiescence();
     } catch (error) {
@@ -3846,10 +4017,6 @@ class OpenCodeAgentSession implements AgentSession {
             this.config.systemPrompt,
             this.config.daemonAppendSystemPrompt,
           );
-          const permission = buildOpenCodePermissionRules(
-            this.config.providerOptions,
-            this.config.toolPolicy,
-          );
           const promptResponse = await this.client.session.promptAsync({
             sessionID: this.sessionId,
             directory: this.config.cwd,
@@ -3864,7 +4031,6 @@ class OpenCodeAgentSession implements AgentSession {
                 }
               : {}),
             ...(systemPrompt ? { system: systemPrompt } : {}),
-            ...(permission ? { permission } : {}),
             ...(model ? { model } : {}),
             ...(effectiveMode ? { agent: effectiveMode } : {}),
             ...(effectiveVariant ? { variant: effectiveVariant } : {}),
@@ -4209,8 +4375,8 @@ class OpenCodeAgentSession implements AgentSession {
       if (event.event.cwd) {
         this.childSessionCwds.set(event.event.id, event.event.cwd);
       }
-      if (this.serverUrl) {
-        registerOpenCodeChildSessionServerUrl(event.event.id, this.serverUrl);
+      if (this.server.url) {
+        registerOpenCodeChildSessionServerUrl(event.event.id, this.server.url);
       }
     } else if (event.event.type === "remove") {
       unregisterOpenCodeChildSessionServerUrl(event.event.id);
@@ -4702,8 +4868,13 @@ class OpenCodeAgentSession implements AgentSession {
       return;
     }
     if (event.type === "provider_subagent" && event.event.type === "upsert" && event.event.status) {
-      if (isDeepStrictEqual(this.childStatuses.get(event.event.id), event.event)) return;
-      this.childStatuses.set(event.event.id, structuredClone(event.event));
+      const previous = this.childStatuses.get(event.event.id);
+      const current =
+        event.event.parentSubagentId === undefined && previous?.parentSubagentId !== undefined
+          ? { ...event.event, parentSubagentId: previous.parentSubagentId }
+          : event.event;
+      if (isDeepStrictEqual(previous, current)) return;
+      this.childStatuses.set(event.event.id, structuredClone(current));
     }
     const turnId = turnIdOverride === null ? null : (turnIdOverride ?? this.activeForegroundTurnId);
     const tagged = turnId ? { ...event, turnId } : event;
@@ -4737,6 +4908,7 @@ class OpenCodeAgentSession implements AgentSession {
   }
 
   async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    await this.reconnectIfServerExited();
     const sessionResponse = await this.client.session.get({
       sessionID: this.sessionId,
       directory: this.config.cwd,
@@ -4766,6 +4938,7 @@ class OpenCodeAgentSession implements AgentSession {
       return this.availableModesCache;
     }
 
+    await this.reconnectIfServerExited();
     const response = await openCodeMetadataLimit(() =>
       this.client.app.agents({
         directory: this.config.cwd,
@@ -4784,6 +4957,7 @@ class OpenCodeAgentSession implements AgentSession {
   }
 
   async listCommands(): Promise<AgentSlashCommand[]> {
+    await this.reconnectIfServerExited();
     return await listOpenCodeCommandsFromSdk(this.client, this.config.cwd);
   }
 
@@ -4901,8 +5075,7 @@ class OpenCodeAgentSession implements AgentSession {
     } finally {
       this.releaseBridge?.();
       this.releaseBridge = null;
-      await this.releaseServer?.();
-      this.releaseServer = null;
+      await this.server.release();
     }
   }
 
@@ -4978,25 +5151,18 @@ class OpenCodeAgentSession implements AgentSession {
   }
 
   private async ensureMcpServersConfigured(): Promise<void> {
-    if (this.mcpConfigured) {
-      return;
-    }
-
     const mcpServers = this.config.mcpServers;
     if (!mcpServers || Object.keys(mcpServers).length === 0) {
-      this.mcpConfigured = true;
       return;
     }
 
-    if (!this.mcpSetupPromise) {
-      this.mcpSetupPromise = this.configureMcpServers(mcpServers);
-    }
-
+    const setup = (this.mcpSetup ??= this.configureMcpServers(mcpServers));
     try {
-      await this.mcpSetupPromise;
-      this.mcpConfigured = true;
+      await setup;
     } catch (error) {
-      this.mcpSetupPromise = null;
+      if (this.mcpSetup === setup) {
+        this.mcpSetup = null;
+      }
       throw error;
     }
   }
@@ -5227,6 +5393,7 @@ class OpenCodeAgentSession implements AgentSession {
 
   private async translateEvent(event: OpenCodeEvent): Promise<AgentStreamEvent[]> {
     const eventSessionId = getOpenCodeEventSessionId(event);
+    const runtimeModelChanged = this.syncRuntimeModel(event, eventSessionId);
     if (
       event.type !== "session.created" &&
       eventSessionId &&
@@ -5243,6 +5410,12 @@ class OpenCodeAgentSession implements AgentSession {
       }
     }
     const translated = translateOpenCodeEvent(event, this.createTranslationState());
+    if (runtimeModelChanged)
+      translated.push({
+        type: "model_changed",
+        provider: this.provider,
+        runtimeInfo: await this.getRuntimeInfo(),
+      });
     this.appendProviderSubagentEvents(event, translated);
 
     const events: AgentStreamEvent[] = [];
@@ -5283,6 +5456,20 @@ class OpenCodeAgentSession implements AgentSession {
     return events;
   }
 
+  private syncRuntimeModel(event: OpenCodeEvent, eventSessionId: string | null): boolean {
+    if (event.type !== "message.updated" || eventSessionId !== this.sessionId) return false;
+    const info = event.properties.info;
+    let model: string | undefined;
+    if (info.role === "assistant") model = resolveOpenCodeModelLookupKeyFromAssistantMessage(info);
+    if (info.role === "user" && info.model)
+      model = buildOpenCodeModelLookupKey(info.model.providerID, info.model.modelID);
+    if (!model || model === this.config.model) return false;
+    this.config.model = model;
+    this.selectedModelContextWindowMaxTokens =
+      this.resolveConfiguredModelContextWindowMaxTokens(model);
+    return true;
+  }
+
   private async tryAutoApproveToolPermission(
     request: AgentPermissionRequest,
     directory: string,
diff --git a/packages/server/src/server/agent/providers/opencode-bridge.local.e2e.test.ts b/packages/server/src/server/agent/providers/opencode-bridge.local.e2e.test.ts
index af67c2604a..d3d295cc8e 100644
--- a/packages/server/src/server/agent/providers/opencode-bridge.local.e2e.test.ts
+++ b/packages/server/src/server/agent/providers/opencode-bridge.local.e2e.test.ts
@@ -1,3 +1,4 @@
+import { OpenCodeRuntimeClient } from "./opencode/runtime-client.js";
 import { mkdir, mkdtemp, rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -5,11 +6,68 @@ import path from "node:path";
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client";
 import { expect, test } from "vitest";
 
+import { execCommand } from "../../../utils/spawn.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
+import {
+  getRealProviderConfig,
+  getRealProviderRuntimeSettings,
+} from "../../daemon-e2e/real-provider-test-config.js";
 import type { PaseoToolCatalog } from "../tools/types.js";
 import { OpenCodeAgentClient } from "./opencode-agent.js";
+import { OpenCodeV2AgentClient } from "./opencode/v2/agent.js";
 import { OpenCodeBridge } from "./opencode/bridge.js";
 import { OpenCodeServerManager } from "./opencode/server-manager.js";
+import {
+  drainPersistedTimeline,
+  readAssistantText,
+  requireSessionId,
+} from "./opencode/test-utils/v2-local-e2e-helpers.js";
+
+test("real OpenCode server persists provider permissions across creation and resume", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-permissions-"));
+  const cwd = path.join(root, "repo");
+  const logger = createTestLogger();
+  const manager = new OpenCodeServerManager({ logger, resolveHomeDir: () => root });
+  const client = new OpenCodeAgentClient(logger, undefined, { serverManager: manager });
+  let session: Awaited<ReturnType<OpenCodeAgentClient["createSession"]>> | undefined;
+  let inspection: Awaited<ReturnType<OpenCodeServerManager["acquireCurrent"]>> | undefined;
+
+  try {
+    await mkdir(cwd);
+    session = await client.createSession({
+      provider: "opencode",
+      cwd,
+      providerOptions: { permission: { external_directory: "allow" } },
+    });
+    inspection = await manager.acquireCurrent();
+    const sdk = createOpencodeClient({ baseUrl: inspection.server.url, directory: cwd });
+    async function readPermission(sessionId: string) {
+      const response = await sdk.session.get({ sessionID: sessionId, directory: cwd });
+      if (response.error) throw new Error(JSON.stringify(response.error));
+      return response.data?.permission;
+    }
+    const handle = session.describePersistence()!;
+    expect(await readPermission(handle.sessionId)).toEqual([
+      { permission: "external_directory", pattern: "*", action: "allow" },
+    ]);
+
+    await session.close();
+    // OpenCode appends session-update rules and the last matching rule wins, so a resume
+    // with a different policy leaves both entries in order.
+    session = await client.resumeSession(handle, {
+      providerOptions: { permission: { external_directory: "deny" } },
+    });
+    expect(await readPermission(handle.sessionId)).toEqual([
+      { permission: "external_directory", pattern: "*", action: "allow" },
+      { permission: "external_directory", pattern: "*", action: "deny" },
+    ]);
+  } finally {
+    await inspection?.release();
+    await session?.close();
+    await manager.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
 
 test("real OpenCode server shares one process while shell.env stays session-scoped", async () => {
   const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-real-"));
@@ -40,7 +98,12 @@ test("real OpenCode server shares one process while shell.env stays session-scop
       mkdir(secondCwd, { recursive: true }),
     ]);
     first = await client.createSession(
-      { provider: "opencode", cwd: firstCwd, model: "opencode/big-pickle", modeId: "build" },
+      {
+        provider: "opencode",
+        cwd: firstCwd,
+        model: process.env.OPENCODE_TEST_MODEL ?? "opencode/big-pickle",
+        modeId: "build",
+      },
       {
         agentId: "real-agent-one",
         env: { PASEO_AGENT_ID: "real-agent-one", PASEO_AGENT_CWD: firstCwd },
@@ -81,6 +144,22 @@ test("real OpenCode server shares one process while shell.env stays session-scop
     expect(JSON.stringify(secondShell.data)).toContain(`real-agent-two|${secondCwd}`);
     expect(inspection.server.url).toMatch(/^http:\/\/127\.0\.0\.1:/);
 
+    // Keep the prompt assertions independent of asynchronous events from the direct shell API.
+    await first.close();
+    first = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: firstCwd,
+        model: process.env.OPENCODE_TEST_MODEL ?? "opencode/big-pickle",
+        modeId: "build",
+      },
+      {
+        agentId: "real-agent-one",
+        env: { PASEO_AGENT_ID: "real-agent-one", PASEO_AGENT_CWD: firstCwd },
+        paseoTools: firstTools,
+      },
+      { persistSession: false },
+    );
     const agentResult = await first.run(
       [
         "Use the bash tool to run: env | grep -E '^(PASEO_AGENT_ID|PASEO_AGENT_CWD)='",
@@ -124,10 +203,71 @@ test("real OpenCode server shares one process while shell.env stays session-scop
   }
 }, 240_000);
 
-function requireSessionId(session: { id: string | null }): string {
-  if (!session.id) throw new Error("OpenCode session has no id");
-  return session.id;
-}
+test("real OpenCode server asks before running a Paseo tool with an ask rule", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-ask-"));
+  const cwd = path.join(root, "repo");
+  const logger = createTestLogger();
+  const bridge = new OpenCodeBridge({ paseoHome: root, logger });
+  await bridge.start();
+  const catalog = createCallerCatalog("ask-rule-agent");
+  bridge.setManifestCatalog(catalog);
+  const realSettings = getRealProviderRuntimeSettings("opencode");
+  const runtimeSettings = {
+    ...realSettings,
+    env: {
+      ...realSettings.env,
+      OPENCODE_CONFIG_CONTENT: JSON.stringify({ permission: { "paseo_*": "ask" } }),
+    },
+  };
+  const manager = new OpenCodeServerManager({
+    logger,
+    runtimeSettings,
+    resolveHomeDir: () => root,
+    decorateServerEnv: (env) => bridge.decorateServerEnv(env),
+  });
+  const client = new OpenCodeAgentClient(logger, runtimeSettings, {
+    serverManager: manager,
+    bridge,
+  });
+  let session: Awaited<ReturnType<OpenCodeAgentClient["createSession"]>> | undefined;
+
+  try {
+    await mkdir(cwd);
+    session = await client.createSession(
+      { ...getRealProviderConfig("opencode"), cwd },
+      { agentId: "ask-rule-agent", paseoTools: catalog },
+      { persistSession: false },
+    );
+    const asked: string[] = [];
+    const completedTools: string[] = [];
+    const activeSession = session;
+    session.subscribe((event) => {
+      if (event.type === "permission_requested") {
+        asked.push(event.request.name);
+        void activeSession.respondToPermission(event.request.id, { behavior: "allow" });
+      }
+      if (
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.status === "completed"
+      ) {
+        completedTools.push(event.item.name);
+      }
+    });
+
+    await session.run(
+      "Call the paseo_report_caller_agent_id tool once, then reply with its exact result. Do not use any other tools.",
+    );
+
+    expect(completedTools).toContain("paseo_report_caller_agent_id");
+    expect(asked).toContain("paseo_report_caller_agent_id");
+  } finally {
+    await session?.close();
+    await manager.shutdown();
+    await bridge.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 180_000);
 
 function createCallerCatalog(callerAgentId: string): PaseoToolCatalog {
   const tool = {
@@ -151,8 +291,143 @@ function createCallerCatalog(callerAgentId: string): PaseoToolCatalog {
   };
 }
 
-function readAssistantText(timeline: ReadonlyArray<{ type: string; text?: string }>): string {
-  return timeline
-    .flatMap((item) => (item.type === "assistant_message" ? [item.text ?? ""] : []))
-    .join("");
-}
+test("v2 native tool bridge preserves caller identity", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-"));
+  const logger = createTestLogger();
+  const bridge = new OpenCodeBridge({ paseoHome: root, logger });
+  const catalog = createCallerCatalog("paseo-v2-caller");
+  bridge.setManifestCatalog(catalog);
+  await bridge.start();
+  const client = new OpenCodeV2AgentClient({ logger, bridge });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+        featureValues: { auto_accept: true },
+      },
+      { agentId: "paseo-v2-caller", paseoTools: catalog, env: { PASEO_TEST_SCOPE: "V2_ENV_OK" } },
+      { persistSession: false },
+    );
+    const result = await session.run(
+      "Call the paseo_report_caller_agent_id tool once, then reply with its exact result. Do not use any other tools.",
+    );
+    expect(readAssistantText(result.timeline)).toContain("paseo-v2-caller");
+    const environment = await session.run(
+      "Use the shell tool to run printf '%s' \"$PASEO_TEST_SCOPE\", then reply with its output.",
+    );
+    expect(environment.finalText).toContain("V2_ENV_OK");
+    expect(result.timeline).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "tool_call",
+          name: "paseo_report_caller_agent_id",
+          status: "completed",
+        }),
+      ]),
+    );
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await bridge.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test.each([
+  {
+    major: 1,
+    package: "opencode-ai@1.14.46",
+    windowsPackage: "opencode-windows",
+    expectedTimeline: [],
+    expectedInitialTimeline: undefined,
+    expectedNotices: undefined,
+  },
+  {
+    major: 2,
+    package: "@opencode/cli@2.0.10",
+    windowsPackage: "@opencode/cli-windows",
+    expectedTimeline: [
+      { type: "notification", level: "info", message: "This chat uses OpenCode v2." },
+    ],
+    expectedInitialTimeline: [
+      expect.objectContaining({
+        item: { type: "notification", level: "info", message: "This chat uses OpenCode v2." },
+      }),
+    ],
+    expectedNotices: [expect.objectContaining({ major: 2 })],
+  },
+])(
+  "versioned runtime v$major discovers models and preserves a native session handle",
+  async ({
+    package: cliPackage,
+    windowsPackage,
+    expectedTimeline,
+    expectedInitialTimeline,
+    expectedNotices,
+  }) => {
+    const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-versioned-"));
+    const client = new OpenCodeRuntimeClient(createTestLogger(), {
+      command: {
+        mode: "replace",
+        argv: [
+          process.platform === "win32"
+            ? path.join(
+                root,
+                "node_modules",
+                `${windowsPackage}-${process.arch}`,
+                "bin",
+                "opencode.exe",
+              )
+            : path.join(root, "node_modules", ".bin", "opencode"),
+        ],
+      },
+      env: {
+        XDG_CONFIG_HOME: path.join(root, "config"),
+        XDG_DATA_HOME: path.join(root, "data"),
+        XDG_CACHE_HOME: path.join(root, "cache"),
+        XDG_STATE_HOME: path.join(root, "state"),
+      },
+    });
+    let original: Awaited<ReturnType<typeof client.createSession>> | undefined;
+    let resumed: Awaited<ReturnType<typeof client.resumeSession>> | undefined;
+    try {
+      await execCommand(
+        "npm",
+        ["install", "--prefix", root, "--no-audit", "--no-fund", cliPackage],
+        {
+          cwd: root,
+          timeout: 180_000,
+        },
+      );
+      const catalog = await client.fetchCatalog({ scope: "workspace", cwd: root, force: true });
+      expect(catalog.models.length).toBeGreaterThan(0);
+      expect(catalog.modes.map((mode) => mode.id)).toContain("build");
+      original = await client.createSession(
+        { provider: "opencode", cwd: root, modeId: "build" },
+        undefined,
+        { persistSession: false },
+      );
+      const handle = await original.describePersistence();
+      expect(original.initialTimeline).toEqual(expectedInitialTimeline);
+      expect(handle.metadata?.openCodeRuntimeNotices).toEqual(expectedNotices);
+      resumed = await client.resumeSession(handle, { cwd: root });
+      expect((await resumed.describePersistence()).nativeHandle).toBe(handle.nativeHandle);
+      expect(
+        (await drainPersistedTimeline(resumed)).map((event) =>
+          event.type === "timeline" ? event.item : event,
+        ),
+      ).toEqual(expectedTimeline);
+    } finally {
+      await resumed?.close();
+      await original?.close();
+      await client.shutdown();
+      // Windows can retain a transient executable lock after provider shutdown.
+      await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+    }
+  },
+  240_000,
+);
diff --git a/packages/server/src/server/agent/providers/opencode-server-manager.test.ts b/packages/server/src/server/agent/providers/opencode-server-manager.test.ts
index 74c6143c1f..151fb57610 100644
--- a/packages/server/src/server/agent/providers/opencode-server-manager.test.ts
+++ b/packages/server/src/server/agent/providers/opencode-server-manager.test.ts
@@ -2,7 +2,6 @@ import type { ChildProcess } from "node:child_process";
 import { EventEmitter } from "node:events";
 import { mkdtempSync, rmSync } from "node:fs";
 import { createServer, type ServerResponse } from "node:http";
-import net from "node:net";
 import os from "node:os";
 import path from "node:path";
 import { Writable } from "node:stream";
@@ -89,6 +88,7 @@ describe("OpenCodeServerManager generations", () => {
     const acquisition = await manager.acquireCurrent();
 
     expect(runtime.spawnCalls[0]?.options.baseEnv).toEqual(baseEnv);
+    expect(acquisition.environment).toBe(runtime.spawnCalls[0]?.options.baseEnv);
     await acquisition.release();
   });
 
@@ -367,7 +367,7 @@ describe("OpenCodeServerManager managed process ledger", () => {
 describe.runIf(process.platform === "win32")(
   "OpenCodeServerManager Windows OpenCode npm install",
   () => {
-    test("starts the helper server from opencode.exe instead of the npm opencode.cmd shim", async () => {
+    test("resolves the Windows npm shim to its native helper executable", async () => {
       const detectedOpenCode = await findExecutable("opencode");
       expect(detectedOpenCode, "Windows CI must install opencode-ai before server tests").not.toBe(
         null,
@@ -376,43 +376,35 @@ describe.runIf(process.platform === "win32")(
 
       const tempDir = mkdtempSync(path.join(os.tmpdir(), "opencode-real-windows-"));
       const opencodeHomeDir = path.join(tempDir, "opencode-home");
-      const managedProcesses = new FakeManagedProcesses();
+      const runtime = new FakeOpenCodeServerRuntime([4604], { autoAnnounce: true });
       const manager = new OpenCodeServerManager({
         logger: createTestLogger(),
-        managedProcesses,
+        managedProcesses: runtime.managedProcesses,
         resolveHomeDir: () => opencodeHomeDir,
+        portAllocator: runtime.allocatePort,
+        spawnServerProcess: runtime.spawnServerProcess,
+        terminateProcess: runtime.terminateProcess,
       });
-      let acquiredPort: number | null = null;
 
       try {
-        const acquisition = await manager.acquireDedicated({
-          OPENCODE_AUTH_CONTENT: "{}",
-          OPENCODE_DISABLE_AUTOUPDATE: "1",
-          OPENCODE_DISABLE_AUTOCOMPACT: "1",
-          OPENCODE_DISABLE_MODELS_FETCH: "1",
-          OPENCODE_DISABLE_PROJECT_CONFIG: "1",
-          OPENCODE_PURE: "1",
-          OPENCODE_TEST_HOME: path.join(tempDir, "test-home"),
-        });
-        acquiredPort = acquisition.server.port;
-
-        const records = await managedProcesses.list();
+        // Resolve the actual npm installation. Generation lifecycle coverage above
+        // owns process readiness; this regression owns the Windows launch command.
+        const acquisition = await manager.acquireCurrent();
+        const records = await runtime.managedProcesses.list();
         expect(records).toHaveLength(1);
         const record = records[0]!;
         expect(path.extname(record.command).toLowerCase()).toBe(".exe");
-        expect(path.normalize(record.command).toLowerCase()).toContain(
-          path.normalize("node_modules/opencode-ai/bin/opencode.exe").toLowerCase(),
+        expect(path.normalize(record.command).toLowerCase()).toMatch(
+          /opencode-(?:ai|windows-(?:x64|arm64))[\\/]bin[\\/]opencode\.exe$/,
         );
         expect(record.command.toLowerCase()).not.toBe(detectedOpenCode!.toLowerCase());
-        expect(record.args).toEqual(["serve", "--port", String(acquiredPort)]);
+        expect(record.args).toEqual(["serve", "--port", String(acquisition.server.port)]);
+        await acquisition.release();
       } finally {
-        await manager.shutdown().catch(() => undefined);
-        if (acquiredPort !== null) {
-          await waitForClosedPort(acquiredPort, 5_000);
-        }
-        rmSync(tempDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+        await manager.shutdown();
+        rmSync(tempDir, { recursive: true, force: true });
       }
-    }, 60_000);
+    });
   },
 );
 
@@ -610,37 +602,3 @@ class FakeManagedProcesses implements ManagedProcessRegistry {
     };
   }
 }
-
-async function waitForClosedPort(port: number, timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (!(await canConnectToPort(port))) {
-      return;
-    }
-    await sleep(100);
-  }
-  throw new Error(`OpenCode helper server still accepts connections on port ${port}`);
-}
-
-function canConnectToPort(port: number): Promise<boolean> {
-  return new Promise((resolve) => {
-    const socket = net.createConnection({ host: "127.0.0.1", port });
-    let settled = false;
-    const settle = (connected: boolean) => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      socket.destroy();
-      resolve(connected);
-    };
-
-    socket.once("connect", () => settle(true));
-    socket.once("error", () => settle(false));
-    socket.setTimeout(500, () => settle(false));
-  });
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
diff --git a/packages/server/src/server/agent/providers/opencode-v2.local.e2e.test.ts b/packages/server/src/server/agent/providers/opencode-v2.local.e2e.test.ts
new file mode 100644
index 0000000000..625ea99a39
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode-v2.local.e2e.test.ts
@@ -0,0 +1,409 @@
+import { V2Runtime } from "./opencode/v2/runtime.js";
+import type { V2Api } from "./opencode/v2/api.js";
+import { execCommand } from "../../../utils/spawn.js";
+import { OpenCodeV2AgentClient } from "./opencode/v2/agent.js";
+import { mkdir, mkdtemp, rm, writeFile, readFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import {
+  autoRespondToPermissions,
+  collectPermissions,
+  collectProviderSubagents,
+  collectRunningToolCalls,
+  collectStreamedAssistantText,
+  drainPersistedAssistantText,
+  drainPersistedTimeline,
+  findSkillCommand,
+  requireNativeUserMessageId,
+} from "./opencode/test-utils/v2-local-e2e-helpers.js";
+
+test("v2 shares a helper across agent identities and keeps the remaining session alive", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-shared-"));
+  const runtime = new V2Runtime({ logger: createTestLogger() });
+  const clients = new Set<V2Api>();
+  const client = new OpenCodeV2AgentClient({
+    logger: createTestLogger(),
+    runtime: {
+      acquire: async (input) => {
+        const connection = await runtime.acquire(input);
+        clients.add(connection.client);
+        return connection;
+      },
+      shutdown: () => runtime.shutdown(),
+    },
+  });
+  const sessions: Awaited<ReturnType<typeof client.createSession>>[] = [];
+  try {
+    for (const agentId of ["first", "second"]) {
+      sessions.push(
+        await client.createSession(
+          { provider: "opencode", cwd: root },
+          { agentId, env: { PASEO_AGENT_ID: agentId, PASEO_AGENT_CWD: root } },
+          { persistSession: false },
+        ),
+      );
+    }
+    expect(clients.size).toBe(1);
+    expect(sessions[0].id).not.toBe(sessions[1].id);
+    await sessions[0].close();
+    expect((await sessions[1].getRuntimeInfo()).sessionId).toBe(sessions[1].id);
+  } finally {
+    for (const session of sessions) await session.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("v2 structured output survives history and does not affect the next ordinary turn", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-schema-"));
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+      },
+      undefined,
+      { persistSession: false },
+    );
+    const result = await session.run("Compute six times seven and return the answer.", {
+      outputSchema: {
+        type: "object",
+        properties: { answer: { type: "integer", const: 42 } },
+        required: ["answer"],
+        additionalProperties: false,
+      },
+    });
+    expect(JSON.parse(result.finalText)).toEqual({ answer: 42 });
+    expect(await drainPersistedTimeline(session)).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "timeline",
+          item: expect.objectContaining({ type: "assistant_message", text: result.finalText }),
+        }),
+      ]),
+    );
+    const ordinary = await session.run("Reply with exactly ORDINARY, without using tools.");
+    expect(ordinary.finalText.trim()).toBe("ORDINARY");
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test("v2 preserves final text without duplicating streamed content", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-stream-"));
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+      },
+      undefined,
+      { persistSession: false },
+    );
+    const chunks = collectStreamedAssistantText(session);
+    const result = await session.run("Count from one to five, one word per line, with no tools.");
+    // Delta granularity is the provider's: some coalesce a whole reply into a
+    // single `session.text.delta`. Assert delivery happened and, critically,
+    // that the post-turn snapshot did not replay delivered content.
+    expect(chunks.length).toBeGreaterThanOrEqual(1);
+    const persistedText = await drainPersistedAssistantText(session);
+    expect(chunks.join("")).toBe(persistedText.join(""));
+    expect(result.finalText).toBe(persistedText.join(""));
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test("v2 handles live tool approvals and questions", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-approvals-"));
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    const active = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+        providerOptions: { permission: { bash: "ask" } },
+      },
+      undefined,
+      { persistSession: false },
+    );
+    session = active;
+    const permissions = autoRespondToPermissions(active);
+    const command = await active.run(
+      "Use the shell tool to run exactly: printf PASEO_APPROVED. Then report its output.",
+    );
+    expect(command.finalText).toContain("PASEO_APPROVED");
+    expect(permissions.kinds).toContain("tool");
+    const question = await active.run(
+      "Use the question tool to ask me to choose Red or Blue. Wait for my answer, then reply with exactly the color I selected.",
+    );
+    expect(question.finalText).toContain("Blue");
+    expect(permissions.kinds).toContain("question");
+    expect(permissions.errors).toEqual([]);
+    expect(active.getPendingPermissions()).toEqual([]);
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test("v2 invokes an injected MCP tool with exact preapproval", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-mcp-"));
+  const fixture = path.join(root, "mcp.mjs");
+  await writeFile(
+    fixture,
+    `import { McpServer } from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/server/mcp.js"))};
+import { StdioServerTransport } from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/server/stdio.js"))};
+const server = new McpServer({ name: "paseo-validation", version: "1.0.0" });
+server.registerTool("marker", { description: "Return the validation marker", inputSchema: {} }, async () => ({ content: [{ type: "text", text: "PASEO_MCP_OK" }] }));
+await server.connect(new StdioServerTransport());
+`,
+  );
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    const active = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+        mcpServers: { validation: { type: "stdio", command: process.execPath, args: [fixture] } },
+        toolPolicy: { preapproved: [{ server: "validation", tool: "marker" }] },
+      },
+      undefined,
+      { persistSession: false },
+    );
+    session = active;
+    const permissions = collectPermissions(active);
+    const result = await active.run(
+      "Call the validation_marker MCP tool once and report its output. Do not use other tools.",
+    );
+    expect(result.finalText).toContain("PASEO_MCP_OK");
+    expect(result.timeline).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "tool_call",
+          name: "validation_marker",
+          status: "completed",
+        }),
+      ]),
+    );
+    expect(permissions).toEqual([]);
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test("v2 stops a running tool before replacement work and imports the same session", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-stop-"));
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  let imported: Awaited<ReturnType<typeof client.importSession>> | undefined;
+  try {
+    const config = {
+      provider: "opencode",
+      cwd: root,
+      model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+      featureValues: { auto_accept: true },
+    } as const;
+    session = await client.createSession(config, undefined, { persistSession: false });
+    const tools = collectRunningToolCalls(session);
+    await session.startTurn("Use the shell tool to run sleep 30, then say finished.");
+    await expect.poll(tools.hasRunningTool, { timeout: 45_000 }).toBe(true);
+    const stopping = session.interrupt();
+    const replacement = session.run("Reply with exactly REPLACED. Do not use tools.");
+    await stopping;
+    expect((await replacement).finalText.trim()).toBe("REPLACED");
+    expect(tools.canceledTurns()).toBe(1);
+    const handle = await session.describePersistence();
+    const listing = await client.listImportableSessions({ cwd: root });
+    expect(listing).toEqual(
+      expect.arrayContaining([expect.objectContaining({ providerHandleId: handle.nativeHandle })]),
+    );
+    imported = await client.importSession(
+      { providerHandleId: handle.nativeHandle!, cwd: root },
+      { config, storedConfig: config },
+    );
+    expect(imported.persistence.nativeHandle).toBe(handle.nativeHandle);
+    expect(imported.timeline).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          item: expect.objectContaining({ type: "assistant_message", text: "REPLACED" }),
+        }),
+      ]),
+    );
+  } finally {
+    await imported?.session.close();
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
+
+test("v2 rewinds conversation and files and reports autonomous subagents", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-rewind-"));
+  await execCommand("git", ["init", root]);
+  await writeFile(path.join(root, "marker.txt"), "before\n");
+  await execCommand("git", ["add", "marker.txt"], { cwd: root });
+  await execCommand(
+    "git",
+    [
+      "-c",
+      "user.name=Paseo Test",
+      "-c",
+      "user.email=test@example.invalid",
+      "-c",
+      "commit.gpgsign=false",
+      "commit",
+      "-m",
+      "baseline",
+    ],
+    { cwd: root },
+  );
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+        featureValues: { auto_accept: true },
+      },
+      undefined,
+      { persistSession: false },
+    );
+    await session.setMode!("plan");
+    expect(await session.getCurrentMode!()).toBe("plan");
+    await session.setMode!("build");
+    const edited = await session.run(
+      "Edit marker.txt so its entire content is after followed by a newline. Use the file editing tools; do not use shell commands. Then say done.",
+    );
+    expect((await readFile(path.join(root, "marker.txt"), "utf8")).trim()).toBe("after");
+    const userMessageId = requireNativeUserMessageId(edited.timeline);
+    await session.revertBoth!({ messageId: userMessageId });
+    expect(await readFile(path.join(root, "marker.txt"), "utf8")).toBe("before\n");
+    expect(await drainPersistedAssistantText(session)).toEqual([]);
+    const subagents = collectProviderSubagents(session);
+    const delegated = await session.run(
+      "Use the subagent tool to delegate to a general subagent. Tell it to reply with exactly CHILD_OK without using tools. Wait for it, then report CHILD_OK.",
+    );
+    expect(delegated.finalText).toContain("CHILD_OK");
+    await expect.poll(subagents.hasCompletedChild, { timeout: 10_000 }).toBe(true);
+    expect(subagents.childText()).toContain("CHILD_OK");
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 180_000);
+
+test("v2 executes commands and retains context after compaction", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-commands-"));
+  const commandDir = path.join(root, ".opencode", "command");
+  await mkdir(commandDir, { recursive: true });
+  await writeFile(
+    path.join(commandDir, "validation.md"),
+    "---\ndescription: Validation command\n---\nReply with exactly COMMAND_OK. Do not use tools.\n",
+  );
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+      },
+      undefined,
+      { persistSession: false },
+    );
+    await session.setThinkingOption!("low");
+    expect((await session.getRuntimeInfo!()).thinkingOptionId).toBe("low");
+    const commands = await session.listCommands!();
+    expect(commands).toEqual(
+      expect.arrayContaining([expect.objectContaining({ name: "validation", kind: "command" })]),
+    );
+    expect((await session.run("/validation")).finalText).toContain("COMMAND_OK");
+    await session.run("Remember the secret word ORANGE. Reply OK without tools.");
+    await session.run("/compact");
+    expect(
+      (await session.run("What secret word did I ask you to remember? Reply with only that word."))
+        .finalText,
+    ).toContain("ORANGE");
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 180_000);
+
+test("v2 executes discovered skills and accepts image attachments", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-attachments-"));
+  const skillDir = path.join(root, ".opencode", "skills", "validation");
+  await mkdir(skillDir, { recursive: true });
+  await writeFile(
+    path.join(skillDir, "SKILL.md"),
+    "---\nname: validation\ndescription: Validation skill\n---\nReply with exactly SKILL_OK when asked to use this skill. Do not use tools.\n",
+  );
+  const client = new OpenCodeV2AgentClient({ logger: createTestLogger() });
+  let session: Awaited<ReturnType<typeof client.createSession>> | undefined;
+  try {
+    session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: root,
+        model: process.env.OPENCODE_TEST_MODEL ?? "openai/gpt-6-astra",
+      },
+      undefined,
+      { persistSession: false },
+    );
+    const skill = findSkillCommand(await session.listCommands!(), "validation");
+    expect((await session.run(`/${skill.name}`)).finalText).toContain("SKILL_OK");
+    const result = await session.run([
+      {
+        type: "text",
+        text: "An image is attached. Reply exactly IMAGE_OK if you received it. Do not use tools.",
+      },
+      {
+        type: "image",
+        mimeType: "image/png",
+        data: (
+          await readFile(new URL("../../../../../desktop/assets/32x32.png", import.meta.url))
+        ).toString("base64"),
+      },
+    ]);
+    expect(result.finalText).toContain("IMAGE_OK");
+  } finally {
+    await session?.interrupt();
+    await session?.close();
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 120_000);
diff --git a/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
index 058ade60f8..82e4166492 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
+++ b/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
@@ -33,6 +33,13 @@ export default async function paseoPlugin(input, options) {
       description: definition.description,
       args: jsonSchemaObjectToZodShape(definition.inputSchema),
       execute: async (args, context) => {
+        // OpenCode leaves permission checks to plugin tools, so ask it the way it asks for MCP tools.
+        await context.ask({
+          permission: `paseo_${definition.name}`,
+          patterns: ["*"],
+          always: ["*"],
+          metadata: {},
+        });
         let result;
         try {
           result = await request(
diff --git a/packages/server/src/server/agent/providers/opencode/bridge.test.ts b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
index 261487c279..076cbe94bd 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
@@ -1,4 +1,5 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import type { SessionMessageInfo } from "@opencode/client";
+import { mkdtemp, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -8,7 +9,15 @@ import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
 import type { PaseoToolCatalog } from "../../tools/types.js";
-import { OpenCodeBridge, loadOpenCodeBridgePluginArtifact } from "./bridge.js";
+import { createPaseoToolCatalog } from "../../tools/paseo-tools.js";
+import { AgentManager } from "../../agent-manager.js";
+import { AgentStorage } from "../../agent-storage.js";
+import { ProviderSnapshotManager } from "../../provider-snapshot-manager.js";
+import {
+  OpenCodeBridge,
+  loadOpenCodeBridgePluginArtifact,
+  materializeOpenCodeV2Plugin,
+} from "./bridge.js";
 
 const temporaryDirectories: string[] = [];
 
@@ -97,6 +106,12 @@ describe("OpenCodeBridge", () => {
     const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-bridge-"));
     temporaryDirectories.push(paseoHome);
     const catalog = createCatalog();
+    const executedInputs: unknown[] = [];
+    const executeTool = catalog.executeTool;
+    catalog.executeTool = async (name, input, context) => {
+      executedInputs.push(input);
+      return await executeTool(name, input, context);
+    };
     const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
     await bridge.start();
     bridge.setManifestCatalog(catalog);
@@ -168,12 +183,30 @@ describe("OpenCodeBridge", () => {
           token: plugin.token,
         },
       );
+      const asked: unknown[] = [];
       await expect(
         hooks.tool.paseo_echo_context.execute(
           { value: "through bundled plugin" },
-          { sessionID: "ses_one" },
+          { sessionID: "ses_one", ask: async (request: unknown) => void asked.push(request) },
         ),
       ).resolves.toMatchObject({ output: "through bundled plugin" });
+      expect(asked).toEqual([
+        { permission: "paseo_echo_context", patterns: ["*"], always: ["*"], metadata: {} },
+      ]);
+
+      executedInputs.length = 0;
+      await expect(
+        hooks.tool.paseo_echo_context.execute(
+          { value: "rejected" },
+          {
+            sessionID: "ses_one",
+            ask: async () => {
+              throw new Error("The user rejected permission to use this specific tool call.");
+            },
+          },
+        ),
+      ).rejects.toThrow("rejected permission");
+      expect(executedInputs).toEqual([]);
 
       release();
       const pluginError = vi.spyOn(console, "error").mockImplementation(() => undefined);
@@ -196,6 +229,327 @@ describe("OpenCodeBridge", () => {
     }
   });
 
+  test("v2 plugin filters caller tools and inherits child session bindings", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-scope-"));
+    temporaryDirectories.push(paseoHome);
+    const catalog = createCatalog();
+    const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
+    bridge.setManifestCatalog(catalog);
+    await bridge.start();
+    const release = bridge.bindSession({ sessionId: "parent", env: {}, tools: catalog });
+    const releaseDisabled = bridge.bindSession({ sessionId: "disabled", env: {} });
+    try {
+      const env = await bridge.decorateV2ServerEnv({});
+      const config = z
+        .object({
+          plugins: z.array(
+            z.object({
+              package: z.string(),
+              options: z.object({ baseUrl: z.string(), token: z.string() }),
+            }),
+          ),
+        })
+        .parse(JSON.parse(env.OPENCODE_CONFIG_CONTENT));
+      expect(await bridge.decorateV2ServerEnv(env)).toEqual(env);
+      const plugin = config.plugins[0]!;
+      const tools = new Map<string, V2TestTool>();
+      let filter!: (input: V2TestContext) => Promise<void>;
+      const module: {
+        default: { setup(context: V2TestPluginContext): Promise<() => Promise<void>> };
+      } = await import(pathToFileURL(path.join(fileURLToPath(plugin.package), "server.js")).href);
+      const dispose = await module.default.setup({
+        options: plugin.options,
+        tool: {
+          transform: async (transform) => {
+            transform({
+              add: (tool) => {
+                tools.set(tool.name, tool);
+              },
+            });
+            return { dispose: async () => undefined };
+          },
+        },
+        session: {
+          context: async () => [],
+          get: async () => ({ parentID: "parent" }),
+          hook: async (_name, callback) => {
+            filter = callback;
+            return { dispose: async () => undefined };
+          },
+        },
+      });
+      const allowed: V2TestContext = {
+        sessionID: "child",
+        tools: { paseo_echo_context: {}, native: {} },
+      };
+      await filter(allowed);
+      expect(Object.keys(allowed.tools)).toEqual(["paseo_echo_context", "native"]);
+      const disabled: V2TestContext = {
+        sessionID: "disabled",
+        tools: { paseo_echo_context: {}, native: {} },
+      };
+      await filter(disabled);
+      expect(Object.keys(disabled.tools)).toEqual(["native"]);
+      await expect(
+        tools.get("paseo_echo_context")!.execute({ value: "child result" }, { sessionID: "child" }),
+      ).resolves.toMatchObject({ content: [{ type: "text", text: "child result" }] });
+      await expect(
+        tools.get("paseo_echo_context")!.execute({ value: "blocked" }, { sessionID: "disabled" }),
+      ).rejects.toMatchObject({
+        message: "Paseo tools are disabled for this session",
+        status: 403,
+      });
+      await dispose();
+    } finally {
+      release();
+      releaseDisabled();
+      await bridge.close();
+    }
+  });
+
+  test("v2 plugin preserves create_agent validation errors from the daemon", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-errors-"));
+    temporaryDirectories.push(paseoHome);
+    const logger = createTestLogger();
+    const providerSnapshotManager = new ProviderSnapshotManager({ logger });
+    const catalog = createPaseoToolCatalog({
+      agentManager: new AgentManager({ logger }),
+      agentStorage: new AgentStorage(paseoHome, logger),
+      providerSnapshotManager,
+      logger,
+    });
+    const bridge = new OpenCodeBridge({ paseoHome, logger });
+    bridge.setManifestCatalog(catalog);
+    await bridge.start();
+    const release = bridge.bindSession({ sessionId: "caller", env: {}, tools: catalog });
+    try {
+      const env = await bridge.decorateV2ServerEnv({});
+      const { plugins } = JSON.parse(env.OPENCODE_CONFIG_CONTENT);
+      const plugin = plugins[0];
+      const module = await import(
+        pathToFileURL(path.join(fileURLToPath(plugin.package), "server.js")).href
+      );
+      const tools = new Map<string, V2TestTool>();
+      const dispose = await module.default.setup({
+        options: plugin.options,
+        tool: {
+          transform: async (transform: (editor: { add(tool: V2TestTool): void }) => void) => {
+            transform({ add: (tool) => tools.set(tool.name, tool) });
+            return { dispose: async () => undefined };
+          },
+        },
+        session: {
+          context: async () => [],
+          get: async () => ({ parentID: "" }),
+          hook: async () => ({ dispose: async () => undefined }),
+        },
+      } satisfies V2TestPluginContext);
+      try {
+        const input = { provider: "codex", title: "Invalid provider", initialPrompt: "Hello" };
+        const response = await fetch(
+          `${plugin.options.baseUrl}/_internal/opencode/sessions/caller/tools/create_agent`,
+          {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${plugin.options.token}`,
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify(input),
+          },
+        );
+        expect(response.status).toBe(500);
+        const payload = await response.json();
+        expect(payload.error).toContain("provider must be provider/model");
+        await expect(
+          tools.get("paseo_create_agent")!.execute(input, { sessionID: "caller" }),
+        ).rejects.toMatchObject({ message: payload.error, status: 500 });
+      } finally {
+        await dispose();
+      }
+    } finally {
+      release();
+      await bridge.close();
+      await providerSnapshotManager.shutdown();
+    }
+  });
+
+  test("v2 plugin returns a tool image as OpenCode file content", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-image-"));
+    temporaryDirectories.push(paseoHome);
+    const png =
+      "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+    const screenshot = {
+      name: "browser_screenshot",
+      title: "Browser screenshot",
+      description: "Captures the page.",
+      inputSchema: {},
+      async handler() {
+        return {
+          content: [
+            { type: "text", text: "Captured browser screenshot." },
+            { type: "image", data: png, mimeType: "image/png" },
+          ],
+        };
+      },
+    };
+    const tools = new Map([[screenshot.name, screenshot]]);
+    const catalog: PaseoToolCatalog = {
+      tools,
+      getTool: (name) => tools.get(name),
+      executeTool: async (name, input, context) =>
+        await tools.get(name)!.handler(input, context ?? {}),
+    };
+    const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
+    bridge.setManifestCatalog(catalog);
+    await bridge.start();
+    const release = bridge.bindSession({ sessionId: "session", env: {}, tools: catalog });
+    try {
+      const env = await bridge.decorateV2ServerEnv({});
+      const plugin = z
+        .object({
+          plugins: z.array(
+            z.object({
+              package: z.string(),
+              options: z.object({ baseUrl: z.string(), token: z.string() }),
+            }),
+          ),
+        })
+        .parse(JSON.parse(env.OPENCODE_CONFIG_CONTENT)).plugins[0]!;
+      const pluginTools = new Map<string, V2TestTool>();
+      const module: {
+        default: { setup(context: V2TestPluginContext): Promise<() => Promise<void>> };
+      } = await import(pathToFileURL(path.join(fileURLToPath(plugin.package), "server.js")).href);
+      const dispose = await module.default.setup({
+        options: plugin.options,
+        tool: {
+          transform: async (transform) => {
+            transform({ add: (tool) => pluginTools.set(tool.name, tool) });
+            return { dispose: async () => undefined };
+          },
+        },
+        session: {
+          context: async () => [],
+          get: async () => ({ parentID: undefined }),
+          hook: async () => ({ dispose: async () => undefined }),
+        },
+      });
+      const result = await pluginTools
+        .get("paseo_browser_screenshot")!
+        .execute({}, { sessionID: "session" });
+      expect(result).toMatchObject({
+        content: [
+          { type: "text", text: "Captured browser screenshot." },
+          { type: "file", mime: "image/png", uri: `data:image/png;base64,${png}` },
+        ],
+      });
+      await dispose();
+    } finally {
+      release();
+      await bridge.close();
+    }
+  });
+
+  test("v2 structured output validates values and clears its tool on ordinary turns", async () => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-structured-"));
+    temporaryDirectories.push(root);
+    const pluginUrl = await materializeOpenCodeV2Plugin(root);
+    const module: {
+      default: { setup(context: V2TestPluginContext): Promise<() => Promise<void>> };
+    } = await import(pathToFileURL(path.join(fileURLToPath(pluginUrl), "server.js")).href);
+    const schema = {
+      type: "object",
+      properties: { answer: { type: "integer" } },
+      required: ["answer"],
+      additionalProperties: false,
+    };
+    const history: SessionMessageInfo[] = [
+      {
+        id: "user",
+        type: "user",
+        text: "answer",
+        time: { created: 1 },
+        metadata: { paseoOutputSchema: schema },
+      },
+    ];
+    const tools = new Map<string, V2TestTool>();
+    let hook!: (input: V2TestContext) => Promise<void>;
+    const dispose = await module.default.setup({
+      options: { baseUrl: "", token: "" },
+      tool: {
+        transform: async (transform) => {
+          transform({
+            add: (tool) => {
+              tools.set(tool.name, tool);
+            },
+          });
+          return { dispose: async () => undefined };
+        },
+      },
+      session: {
+        context: async () => history,
+        get: async () => ({ parentID: "parent" }),
+        hook: async (_name, callback) => {
+          hook = callback;
+          return { dispose: async () => undefined };
+        },
+      },
+    });
+    try {
+      const context: V2TestContext = {
+        sessionID: "session",
+        tools: { paseo_structured_output: {} },
+        system: [],
+      };
+      await hook(context);
+      expect(context.tools.paseo_structured_output.input).toMatchObject({
+        properties: { value: schema },
+      });
+      const tool = tools.get("paseo_structured_output")!;
+      await expect(
+        tool.execute({ value: { answer: "wrong" } }, { sessionID: "session" }),
+      ).rejects.toThrow("Invalid structured output");
+      await expect(
+        tool.execute({ value: { answer: 42 } }, { sessionID: "session" }),
+      ).resolves.toMatchObject({ metadata: { paseoStructuredOutput: { answer: 42 } } });
+      history.push({ id: "next", type: "user", text: "ordinary", time: { created: 2 } });
+      await hook(context);
+      expect(context.tools).toEqual({});
+      await expect(
+        tool.execute({ value: { answer: 42 } }, { sessionID: "session" }),
+      ).rejects.toThrow("no structured-output request");
+    } finally {
+      await dispose();
+    }
+  });
+
+  test("packages the v2 bridge as a directory with a server entry point", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-package-"));
+    temporaryDirectories.push(paseoHome);
+    const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
+    await bridge.start();
+    try {
+      expect(
+        (await readdir(path.join(paseoHome, "runtime", "opencode"))).filter((name) =>
+          name.startsWith("paseo-v2-"),
+        ),
+      ).toEqual([]);
+      const env = await bridge.decorateV2ServerEnv({
+        OPENCODE_CONFIG_CONTENT: JSON.stringify({ plugins: ["user-plugin"] }),
+      });
+      const config = z
+        .object({ plugins: z.tuple([z.literal("user-plugin"), z.object({ package: z.string() })]) })
+        .parse(JSON.parse(env.OPENCODE_CONFIG_CONTENT));
+      const directory = fileURLToPath(config.plugins[1].package);
+      expect((await stat(directory)).isDirectory()).toBe(true);
+      const entry = await readFile(path.join(directory, "server.js"), "utf8");
+      expect(entry).toContain('id: "paseo"');
+      const manifest = JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"));
+      expect(manifest).toMatchObject({ type: "module", exports: { "./server": "./server.js" } });
+    } finally {
+      await bridge.close();
+    }
+  });
+
   test("preserves user OpenCode config while installing one content-addressed plugin", async () => {
     const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-bridge-config-"));
     temporaryDirectories.push(paseoHome);
@@ -224,3 +578,29 @@ describe("OpenCodeBridge", () => {
     }
   });
 });
+
+interface V2TestTool {
+  name: string;
+  execute(input: unknown, call: { sessionID: string }): Promise<unknown>;
+}
+interface V2TestContext {
+  sessionID: string;
+  tools: Record<string, { input?: unknown }>;
+  system?: Array<{ type: "text"; text: string }>;
+}
+interface V2TestPluginContext {
+  options: { baseUrl: string; token: string };
+  tool: {
+    transform(
+      callback: (editor: { add(tool: V2TestTool): void }) => void,
+    ): Promise<{ dispose(): Promise<void> }>;
+  };
+  session: {
+    context(input: { sessionID: string }): Promise<SessionMessageInfo[]>;
+    get(input: { sessionID: string }): Promise<{ parentID: string }>;
+    hook(
+      name: string,
+      callback: (input: V2TestContext) => Promise<void>,
+    ): Promise<{ dispose(): Promise<void> }>;
+  };
+}
diff --git a/packages/server/src/server/agent/providers/opencode/bridge.ts b/packages/server/src/server/agent/providers/opencode/bridge.ts
index 98e12e7eb1..52a2cd3612 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.ts
@@ -48,6 +48,7 @@ export class OpenCodeBridge {
   private server: Server | null = null;
   private baseUrl: string | null = null;
   private pluginUrl: string | null = null;
+  private v2PluginUrl: string | null = null;
   private manifestCatalog: PaseoToolCatalog | null = null;
 
   constructor(options: OpenCodeBridgeOptions) {
@@ -115,6 +116,14 @@ export class OpenCodeBridge {
     };
   }
 
+  async decorateV2ServerEnv(env: Record<string, string>): Promise<Record<string, string>> {
+    this.v2PluginUrl ??= await this.materializePlugin(2);
+    return decorateOpenCodeV2Env(env, this.v2PluginUrl, {
+      baseUrl: this.requireBaseUrl(),
+      token: this.token,
+    });
+  }
+
   async close(): Promise<void> {
     const server = this.server;
     this.server = null;
@@ -123,7 +132,8 @@ export class OpenCodeBridge {
     if (server) await closeServer(server);
   }
 
-  private async materializePlugin(): Promise<string> {
+  private async materializePlugin(version: 1 | 2 = 1): Promise<string> {
+    if (version === 2) return materializeOpenCodeV2Plugin(this.paseoHome);
     const artifact = await loadOpenCodeBridgePluginArtifact(import.meta.url);
     const digest = createHash("sha256").update(artifact).digest("hex");
     const destination = path.join(this.paseoHome, "runtime", "opencode", `paseo-${digest}.mjs`);
@@ -152,7 +162,12 @@ export class OpenCodeBridge {
           sendJson(response, 404, { error: "OpenCode session is not bound to a Paseo agent" });
           return;
         }
-        sendJson(response, 200, { env: binding.env });
+        sendJson(response, 200, {
+          env: binding.env,
+          ...(url.searchParams.has("tools")
+            ? { tools: [...(binding.tools?.tools.keys() ?? [])] }
+            : {}),
+        });
         return;
       }
 
@@ -231,13 +246,63 @@ export class OpenCodeBridge {
   }
 }
 
+export async function materializeOpenCodeV2Plugin(paseoHome: string): Promise<string> {
+  const artifact = await loadOpenCodeBridgePluginArtifact(import.meta.url, undefined, 2);
+  const digest = createHash("sha256").update(artifact).digest("hex");
+  // V2 ignores configured file paths; it loads a package directory's server entry point.
+  const directory = path.join(paseoHome, "runtime", "opencode", `paseo-v2-${digest}`);
+  await writeFileAtomic(path.join(directory, "server.js"), artifact);
+  await writeFileAtomic(
+    path.join(directory, "package.json"),
+    JSON.stringify({
+      name: "paseo-opencode-bridge",
+      private: true,
+      type: "module",
+      exports: { "./server": "./server.js" },
+    }),
+  );
+  return pathToFileURL(directory).href;
+}
+
+export function decorateOpenCodeV2Env(
+  env: Record<string, string>,
+  pluginUrl: string,
+  options: Record<string, string> = {},
+): Record<string, string> {
+  const config = parseOpenCodeConfig(env.OPENCODE_CONFIG_CONTENT);
+  const plugins = config.plugins;
+  if (plugins !== undefined && !Array.isArray(plugins))
+    throw new Error("OpenCode v2 plugins must be an array");
+  return {
+    ...env,
+    OPENCODE_CONFIG_CONTENT: JSON.stringify({
+      ...config,
+      plugins: [
+        ...(plugins ?? []).filter(
+          (plugin: unknown) =>
+            plugin !== pluginUrl &&
+            !(
+              typeof plugin === "object" &&
+              plugin !== null &&
+              "package" in plugin &&
+              plugin.package === pluginUrl
+            ),
+        ),
+        { package: pluginUrl, options },
+      ],
+    }),
+  };
+}
+
 type CompileOpenCodeBridgePlugin = (sourcePath: string) => Promise<Uint8Array>;
 
 export async function loadOpenCodeBridgePluginArtifact(
   moduleUrl: string,
   compileSource: CompileOpenCodeBridgePlugin = compileOpenCodeBridgePlugin,
+  version: 1 | 2 = 1,
 ): Promise<Uint8Array> {
-  const bundleUrl = new URL("./bridge-plugin.bundle.mjs", moduleUrl);
+  const directory = version === 2 ? "./v2/" : "./";
+  const bundleUrl = new URL(`${directory}bridge-plugin.bundle.mjs`, moduleUrl);
   try {
     return await readFile(bundleUrl);
   } catch (error) {
@@ -245,7 +310,7 @@ export async function loadOpenCodeBridgePluginArtifact(
       throw new Error("Bundled OpenCode bridge plugin artifact is missing", { cause: error });
     }
   }
-  return compileSource(fileURLToPath(new URL("./bridge-plugin.mjs", moduleUrl)));
+  return compileSource(fileURLToPath(new URL(`${directory}bridge-plugin.mjs`, moduleUrl)));
 }
 
 async function compileOpenCodeBridgePlugin(sourcePath: string): Promise<Uint8Array> {
@@ -260,6 +325,7 @@ async function compileOpenCodeBridgePlugin(sourcePath: string): Promise<Uint8Arr
     bundle: true,
     format: "esm",
     platform: "neutral",
+    mainFields: ["module", "main"],
     target: "es2022",
     write: false,
   });
diff --git a/packages/server/src/server/agent/providers/opencode/event-consumer.test.ts b/packages/server/src/server/agent/providers/opencode/event-consumer.test.ts
index aad9702ad0..2a0999f74e 100644
--- a/packages/server/src/server/agent/providers/opencode/event-consumer.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/event-consumer.test.ts
@@ -49,9 +49,11 @@ describe("OpenCodeEventConsumer", () => {
     const upstream = await createSseUpstream();
     const timing = new ControlledTiming();
     const processExit = deferred<Error>();
+    const listening = deferred<void>();
     const consumer = new OpenCodeEventConsumer({
       serverUrl: upstream.url,
       processExit: processExit.promise,
+      listening: listening.promise,
       logger: createRecordingLogger(),
       timing,
     });
@@ -62,6 +64,10 @@ describe("OpenCodeEventConsumer", () => {
     const inputs: OpenCodeEventSourceInput[] = [];
     consumer.subscribe((input) => inputs.push(input));
 
+    await new Promise<void>((resolve) => setImmediate(resolve));
+    expect(upstream.requests).toHaveLength(0);
+    expect(consumer.diagnostics().attempt).toBe(0);
+    listening.resolve();
     await upstream.connected(1);
     expect(await promiseState(consumer.ready())).toBe("pending");
     upstream.send(0, arbitraryRecord("/one"));
@@ -106,10 +112,7 @@ describe("OpenCodeEventConsumer", () => {
     await consumer.ready();
 
     timing.expireWatchdog();
-    expect(timing.watchdogDelays).toEqual([
-      EXPECTED_STREAM_WATCHDOG_MS,
-      EXPECTED_STREAM_WATCHDOG_MS,
-    ]);
+    expect(timing.watchdogDelays).toEqual([5_000, EXPECTED_STREAM_WATCHDOG_MS]);
     await timing.waiting();
     timing.advanceWait();
     await upstream.connected(2);
@@ -120,6 +123,7 @@ describe("OpenCodeEventConsumer", () => {
 
   test("retries a first-record watchdog and exposes the recovery attempt", async () => {
     const upstream = await createSseUpstream();
+    upstream.stallNext(1);
     const timing = new ControlledTiming();
     const logger = createRecordingLogger();
     const consumer = new OpenCodeEventConsumer({
@@ -127,6 +131,12 @@ describe("OpenCodeEventConsumer", () => {
       processExit: new Promise<Error>(() => undefined),
       logger,
       timing,
+      createClient: (baseUrl) =>
+        createOpencodeClient({
+          baseUrl,
+          // Keep the abandoned socket open to reproduce a fetch that does not unwind on abort.
+          fetch: (request) => fetch(new Request(request, { signal: null })),
+        }),
     });
     cleanups.push(async () => {
       await consumer.close();
@@ -134,6 +144,7 @@ describe("OpenCodeEventConsumer", () => {
     });
 
     await upstream.connected(1);
+    expect(timing.watchdogDelays).toEqual([5_000]);
     timing.expireWatchdog();
     await timing.waiting();
     expect(consumer.diagnostics()).toMatchObject({
@@ -156,7 +167,18 @@ describe("OpenCodeEventConsumer", () => {
     await upstream.connected(2);
     upstream.send(1, connectedRecord("/recovered"));
     await consumer.ready();
-    expect(consumer.diagnostics()).toMatchObject({ attempt: 2, phase: "stream" });
+    expect(consumer.diagnostics()).toMatchObject({
+      attempt: 2,
+      phase: "stream",
+    });
+    expect(upstream.isOpen(0)).toBe(true);
+    upstream.resume(0);
+    upstream.send(0, connectedRecord("/abandoned"));
+    upstream.send(0, arbitraryRecord("/abandoned"));
+    const inputs: OpenCodeEventSourceInput[] = [];
+    consumer.subscribe((input) => inputs.push(input));
+    await new Promise<void>((resolve) => setImmediate(resolve));
+    expect(inputs).toEqual([]);
   });
 
   test("publishes one terminal and stops reconnecting on process exit", async () => {
@@ -422,6 +444,16 @@ describe("OpenCodeEventConsumer", () => {
     await consumer.close();
 
     expect(inputs).toEqual([]);
+
+    const waitingConsumer = new OpenCodeEventConsumer({
+      serverUrl: upstream.url,
+      processExit: new Promise<Error>(() => undefined),
+      listening: new Promise<void>(() => undefined),
+      logger: createRecordingLogger(),
+    });
+    await waitingConsumer.close();
+    await expect(waitingConsumer.ready()).rejects.toThrow("OpenCode event source closed");
+    expect(upstream.requests).toHaveLength(1);
   });
 });
 
@@ -499,8 +531,14 @@ async function createSseUpstream() {
   const responses: ServerResponse[] = [];
   const requests: Array<{ url: string | undefined }> = [];
   let failuresRemaining = 0;
+  let stallsRemaining = 0;
   const server = createServer((request, response) => {
     requests.push({ url: request.url });
+    if (stallsRemaining > 0) {
+      stallsRemaining -= 1;
+      responses.push(response);
+      return;
+    }
     if (failuresRemaining > 0) {
       failuresRemaining -= 1;
       response.writeHead(503).end();
@@ -533,7 +571,21 @@ async function createSseUpstream() {
     failNext(count: number) {
       failuresRemaining = count;
     },
-    close: async () => new Promise<void>((resolve) => server.close(() => resolve())),
+    stallNext(count: number) {
+      stallsRemaining = count;
+    },
+    isOpen(index: number) {
+      return responses[index]?.socket?.destroyed === false;
+    },
+    resume(index: number) {
+      responses[index]?.writeHead(200, { "content-type": "text/event-stream" });
+      responses[index]?.flushHeaders();
+    },
+    close: async () =>
+      new Promise<void>((resolve) => {
+        server.close(() => resolve());
+        server.closeAllConnections();
+      }),
   };
 }
 
diff --git a/packages/server/src/server/agent/providers/opencode/event-consumer.ts b/packages/server/src/server/agent/providers/opencode/event-consumer.ts
index 064d6d6905..9471a28745 100644
--- a/packages/server/src/server/agent/providers/opencode/event-consumer.ts
+++ b/packages/server/src/server/agent/providers/opencode/event-consumer.ts
@@ -29,11 +29,13 @@ export interface OpenCodeEventConsumerTiming {
 export interface OpenCodeEventConsumerOptions {
   serverUrl: string;
   processExit: Promise<Error>;
+  listening?: Promise<void>;
   logger: Pick<Logger, "debug" | "warn">;
   createClient?: (baseUrl: string) => OpencodeClient;
   timing?: OpenCodeEventConsumerTiming;
 }
 
+const FIRST_RECORD_WATCHDOG_MS = 5_000;
 const WATCHDOG_MS = 30_000;
 const MAX_BACKOFF_MS = 5_000;
 const FAILURE_WARNING_ATTEMPT = 4;
@@ -98,7 +100,7 @@ export class OpenCodeEventConsumer implements OpenCodeEventSource {
       this.rejectReady = reject;
     });
     void this.readyPromise.catch(() => undefined);
-    this.connectionTask = this.consume(options.processExit);
+    this.connectionTask = this.consume(options.processExit, options.listening);
     void this.connectionTask.catch(() => undefined);
   }
 
@@ -131,8 +133,23 @@ export class OpenCodeEventConsumer implements OpenCodeEventSource {
     await this.connectionTask.catch(() => undefined);
   }
 
-  private async consume(processExit: Promise<Error>): Promise<void> {
+  private async consume(processExit: Promise<Error>, listening?: Promise<void>): Promise<void> {
     void processExit.then((error) => this.exit(error));
+    if (listening) {
+      const signal = this.connectionAbort.signal;
+      let stopWaiting!: () => void;
+      const stopped = new Promise<void>((resolve) => {
+        stopWaiting = resolve;
+      });
+      signal.addEventListener("abort", stopWaiting, { once: true });
+      try {
+        await Promise.race([listening, stopped]);
+      } catch {
+        return;
+      } finally {
+        signal.removeEventListener("abort", stopWaiting);
+      }
+    }
     let reconnectAttempt = 0;
     while (!this.closed) {
       this.attempt += 1;
@@ -150,62 +167,83 @@ export class OpenCodeEventConsumer implements OpenCodeEventSource {
 
   private async consumeConnection(signal: AbortSignal): Promise<OpenCodeConnectionResult> {
     const requestAbort = new AbortController();
-    const abortRequest = () => requestAbort.abort(signal.reason);
+    const attemptToken = { active: true };
+    let resolveAbandoned!: (result: OpenCodeConnectionResult) => void;
+    const abandoned = new Promise<OpenCodeConnectionResult>((resolve) => {
+      resolveAbandoned = resolve;
+    });
+    const abortRequest = () => {
+      attemptToken.active = false;
+      resolveAbandoned({ delivered, phase, outcome: "ended" });
+      requestAbort.abort(signal.reason);
+    };
     signal.addEventListener("abort", abortRequest, { once: true });
     let cancelWatchdog: () => void = () => undefined;
     let delivered = false;
     let phase: OpenCodeEventStreamPhase = "first-record";
-    let watchdogPhase: OpenCodeEventStreamPhase | null = null;
     let sseError: unknown;
     const armWatchdog = () => {
       cancelWatchdog();
-      cancelWatchdog = this.timing.arm(WATCHDOG_MS, () => {
-        watchdogPhase = phase;
-        requestAbort.abort(new Error(`OpenCode event stream ${phase} watchdog expired`));
-      });
-    };
-    try {
-      const result = await this.client.global.event({
-        signal: requestAbort.signal,
-        sseMaxRetryAttempts: 0,
-        onSseError: (error) => {
-          sseError = error;
+      cancelWatchdog = this.timing.arm(
+        this.connected ? WATCHDOG_MS : FIRST_RECORD_WATCHDOG_MS,
+        () => {
+          const error = new Error(`OpenCode event stream ${phase} watchdog expired`);
+          // Abandon a stalled request even when fetch ignores abort, for example during OpenCode startup.
+          attemptToken.active = false;
+          resolveAbandoned({ delivered, phase, outcome: "watchdog", error });
+          requestAbort.abort(error);
         },
-      });
-      armWatchdog();
-      for await (const event of result.stream) {
-        if (this.closed) {
-          return { delivered, phase, outcome: "ended" };
+      );
+    };
+    const consumeStream = async (): Promise<OpenCodeConnectionResult> => {
+      try {
+        const result = await this.client.global.event({
+          signal: requestAbort.signal,
+          sseMaxRetryAttempts: 0,
+          onSseError: (error) => {
+            sseError = error;
+          },
+        });
+        for await (const event of result.stream) {
+          // Ignore late records from abandoned requests, for example a delayed server.connected event.
+          if (this.closed || !attemptToken.active) {
+            return { delivered, phase, outcome: "ended" };
+          }
+          delivered = true;
+          phase = "stream";
+          this.phase = phase;
+          if (!this.connected && event.payload.type === "server.connected") {
+            this.connected = true;
+            this.resolveReady();
+            armWatchdog();
+            continue;
+          }
+          armWatchdog();
+          this.logPluginFailure(event);
+          this.publish(event);
         }
-        armWatchdog();
-        delivered = true;
-        phase = "stream";
-        this.phase = phase;
-        if (!this.connected && event.payload.type === "server.connected") {
-          this.connected = true;
-          this.resolveReady();
-          continue;
-        }
-        this.logPluginFailure(event);
-        this.publish(event);
+        let outcome: OpenCodeConnectionOutcome = "ended";
+        if (sseError !== undefined) outcome = "error";
+        return {
+          delivered,
+          phase,
+          outcome,
+          ...(sseError === undefined ? {} : { error: sseError }),
+        };
+      } catch (error) {
+        return {
+          delivered,
+          phase,
+          outcome: "error",
+          error,
+        };
       }
-      let outcome: OpenCodeConnectionOutcome = "ended";
-      if (watchdogPhase) outcome = "watchdog";
-      else if (sseError !== undefined) outcome = "error";
-      return {
-        delivered,
-        phase: watchdogPhase ?? phase,
-        outcome,
-        ...(sseError === undefined ? {} : { error: sseError }),
-      };
-    } catch (error) {
-      return {
-        delivered,
-        phase: watchdogPhase ?? phase,
-        outcome: watchdogPhase ? "watchdog" : "error",
-        error,
-      };
+    };
+    armWatchdog();
+    try {
+      return await Promise.race([consumeStream(), abandoned]);
     } finally {
+      attemptToken.active = false;
       cancelWatchdog();
       signal.removeEventListener("abort", abortRequest);
       requestAbort.abort();
@@ -285,5 +323,5 @@ function containsPluginError(error: unknown): boolean {
 }
 
 export type OpenCodeEventConsumerFactory = (
-  options: Pick<OpenCodeEventConsumerOptions, "serverUrl" | "processExit" | "logger">,
+  options: Pick<OpenCodeEventConsumerOptions, "serverUrl" | "processExit" | "logger" | "listening">,
 ) => OpenCodeEventConsumer;
diff --git a/packages/server/src/server/agent/providers/opencode/event-translator.test.ts b/packages/server/src/server/agent/providers/opencode/event-translator.test.ts
index 50a3a9edfe..9ed61fef67 100644
--- a/packages/server/src/server/agent/providers/opencode/event-translator.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/event-translator.test.ts
@@ -1,3 +1,5 @@
+import type { SessionMessageAssistant, SessionMessageUser } from "@opencode/client";
+import { V2Timeline } from "./v2/timeline.js";
 import { describe, expect, it } from "vitest";
 
 import { translateOpenCodeEvent, type OpenCodeEventTranslationState } from "../opencode-agent.js";
@@ -1276,6 +1278,44 @@ describe("translateOpenCodeEvent", () => {
     expect(result).toEqual([]);
   });
 
+  it("shows OpenCode user text parts unless OpenCode marks them synthetic", () => {
+    const state = createState();
+    const userTextPart = (messageId: string, text: string, synthetic: boolean) => {
+      translateOpenCodeEvent(
+        {
+          type: "message.updated",
+          properties: { info: { id: messageId, sessionID: "session-1", role: "user" } },
+        },
+        state,
+      );
+      return translateOpenCodeEvent(
+        {
+          type: "message.part.updated",
+          properties: {
+            part: {
+              id: `part-${messageId}`,
+              sessionID: "session-1",
+              messageID: messageId,
+              type: "text",
+              text,
+              synthetic,
+            },
+          },
+        },
+        state,
+      );
+    };
+
+    expect(userTextPart("msg-continue", "Continue if you have next steps", true)).toEqual([]);
+    expect(userTextPart("msg-user", "Plugin prompt", false)).toEqual([
+      {
+        type: "timeline",
+        provider: "opencode",
+        item: { type: "user_message", text: "Plugin prompt", messageId: "msg-user" },
+      },
+    ]);
+  });
+
   it("ignores message.part.delta for user messages", () => {
     const state = createState();
 
@@ -1518,3 +1558,90 @@ describe("translateOpenCodeEvent", () => {
     ]);
   });
 });
+
+describe("OpenCode v2 history reconciliation", () => {
+  it("keeps client message identity on live echoes but omits it from history", () => {
+    const user: SessionMessageUser = {
+      id: "native-message",
+      type: "user",
+      text: "hello",
+      time: { created: 1 },
+      metadata: { paseoClientMessageId: "client-message" },
+    };
+    expect(new V2Timeline().messages([user])).toMatchObject([
+      { item: { clientMessageId: "client-message", messageId: "native-message" } },
+    ]);
+    expect(new V2Timeline(false).messages([user])).toMatchObject([
+      { item: { type: "user_message", messageId: "native-message" } },
+    ]);
+    const [event] = new V2Timeline(false).messages([user]);
+    expect(event && "item" in event && event.item).not.toHaveProperty("clientMessageId");
+  });
+  function assistant(text: string): SessionMessageAssistant {
+    return {
+      id: "message",
+      type: "assistant",
+      agent: "build",
+      model: { id: "model", providerID: "provider" },
+      time: { created: 1 },
+      content: [{ type: "text", text }],
+    };
+  }
+  it("emits only the missing suffix after reconnect, even if an intermediate snapshot lags", () => {
+    const timeline = new V2Timeline();
+    const text = (messages: ReturnType<V2Timeline["messages"]>) =>
+      messages.flatMap((event) =>
+        event.type === "timeline" && event.item.type === "assistant_message"
+          ? [event.item.text]
+          : [],
+      );
+    expect(text(timeline.messages([assistant("hello")]))).toEqual(["hello"]);
+    expect(timeline.messages([assistant("hel")])).toEqual([]);
+    expect(text(timeline.messages([assistant("hello world")]))).toEqual([" world"]);
+    expect(timeline.messages([assistant("hello world")])).toEqual([]);
+  });
+  it("keeps reasoning separate from assistant output", () => {
+    const timeline = new V2Timeline();
+    const message = assistant("answer");
+    message.content.unshift({ type: "reasoning", text: "thinking" });
+    expect(
+      timeline.messages([message]).map((event) => (event.type === "timeline" ? event.item : null)),
+    ).toEqual([
+      { type: "reasoning", text: "thinking" },
+      { type: "assistant_message", text: "answer", messageId: "message" },
+    ]);
+  });
+  it("emits tool state transitions once and keeps their call identity", () => {
+    const timeline = new V2Timeline();
+    const message = assistant("");
+    message.content = [
+      {
+        type: "tool",
+        id: "call",
+        name: "bash",
+        time: { created: 1 },
+        state: { status: "running", input: { command: "pwd" }, metadata: {} },
+      },
+    ];
+    expect(timeline.messages([message])).toMatchObject([
+      { item: { type: "tool_call", callId: "call", status: "running" } },
+    ]);
+    message.content = [
+      {
+        type: "tool",
+        id: "call",
+        name: "bash",
+        time: { created: 1, completed: 2 },
+        state: {
+          status: "completed",
+          input: { command: "pwd" },
+          content: [{ type: "text", text: "/workspace" }],
+        },
+      },
+    ];
+    expect(timeline.messages([message])).toMatchObject([
+      { item: { type: "tool_call", callId: "call", status: "completed" } },
+    ]);
+    expect(timeline.messages([message])).toEqual([]);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/http-error.ts b/packages/server/src/server/agent/providers/opencode/http-error.ts
new file mode 100644
index 0000000000..883f82deae
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/http-error.ts
@@ -0,0 +1,16 @@
+export class OpenCodeHttpError extends Error {
+  readonly name = "OpenCodeHttpError";
+
+  constructor(
+    readonly operation: string,
+    readonly status: number | undefined,
+    readonly html: boolean,
+  ) {
+    const statusLabel = status === undefined ? "" : ` (HTTP ${status})`;
+    super(
+      html
+        ? `OpenCode ${operation} returned HTML instead of JSON; incompatible OpenCode API${statusLabel}`
+        : `OpenCode ${operation} failed${statusLabel}`,
+    );
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/rewind.test.ts b/packages/server/src/server/agent/providers/opencode/rewind.test.ts
index 18baba3a3f..b65da2de10 100644
--- a/packages/server/src/server/agent/providers/opencode/rewind.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/rewind.test.ts
@@ -1,3 +1,5 @@
+import { V2Harness } from "./test-utils/v2-harness.js";
+import { OpenCodeV2AgentClient } from "./v2/agent.js";
 import { describe, expect, test } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
@@ -67,3 +69,37 @@ describe("OpenCode rewind", () => {
     });
   });
 });
+
+test("OpenCode v2 commits conversation and file rewind only after staging succeeds", async () => {
+  const harness = new V2Harness();
+  const operations: string[] = [];
+  harness.interrupt = async () => {
+    operations.push("interrupt");
+    return { interrupted: true };
+  };
+  harness.api.session.revert.stage = async (input) => {
+    expect(input).toEqual({ sessionID: "session", messageID: "user-message", files: true });
+    operations.push("stage");
+    return harness.info;
+  };
+  harness.api.session.revert.commit = async () => {
+    operations.push("commit");
+    return harness.info;
+  };
+  const client = new OpenCodeV2AgentClient({
+    logger: createTestLogger(),
+    runtime: harness.runtime,
+  });
+  const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+  try {
+    await session.revertBoth!({ messageId: "user-message" });
+    expect(operations).toEqual(["interrupt", "stage", "commit"]);
+    harness.api.session.revert.stage = async () => {
+      throw new Error("snapshot missing");
+    };
+    await expect(session.revertBoth!({ messageId: "missing" })).rejects.toThrow("snapshot missing");
+    expect(operations).toEqual(["interrupt", "stage", "commit", "interrupt"]);
+  } finally {
+    await session.close();
+  }
+});
diff --git a/packages/server/src/server/agent/providers/opencode/runtime-client.test.ts b/packages/server/src/server/agent/providers/opencode/runtime-client.test.ts
new file mode 100644
index 0000000000..b1ee5be697
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/runtime-client.test.ts
@@ -0,0 +1,211 @@
+import { expect, test } from "vitest";
+import { openCodeMajorVersion } from "./runtime-client.js";
+
+test.each([
+  ["1.14.46", 1],
+  ["unexpected wrapper output", 1],
+  ["", 1],
+  ["opencode v2.0.10\n", 2],
+  ["v2.0.10-beta.1", 2],
+])("identifies the OpenCode runtime version %s", (output, major) => {
+  expect(openCodeMajorVersion(String(output))).toBe(major);
+});
+
+test.each(["3.0.0", "2.0.9", "2.0.7", "2.0.4", "2.0.3", "v2.0.1"])(
+  "rejects unsupported OpenCode version output %s",
+  (output) => {
+    expect(() => openCodeMajorVersion(output)).toThrow();
+  },
+);
+
+test("records the runtime once and retains its position across resume", async () => {
+  const { withOpenCodeRuntimeNotice } = await import("./runtime-notice.js");
+  const { V2Harness } = await import("./test-utils/v2-harness.js");
+  const { OpenCodeV2AgentClient } = await import("./v2/agent.js");
+  const { createTestLogger } = await import("../../../../test-utils/test-logger.js");
+  const harness = new V2Harness();
+  const client = new OpenCodeV2AgentClient({
+    logger: createTestLogger(),
+    runtime: harness.runtime,
+  });
+  const original = withOpenCodeRuntimeNotice(
+    await client.createSession({ provider: "opencode", cwd: "/tmp/project" }),
+    2,
+  );
+  const notice = { type: "notification", level: "info", message: "This chat uses OpenCode v2." };
+  try {
+    expect(original.initialTimeline?.map((entry) => entry.item)).toEqual([notice]);
+    const handle = original.describePersistence()!;
+    await original.close();
+    const resumed = withOpenCodeRuntimeNotice(await client.resumeSession(handle), 2, handle);
+    try {
+      expect(resumed.initialTimeline).toEqual([]);
+      const history = [];
+      for await (const event of resumed.streamHistory()) history.push(event);
+      expect(history).toEqual([
+        { type: "timeline", provider: "opencode", ...original.initialTimeline![0] },
+      ]);
+      expect(resumed.describePersistence()?.metadata?.openCodeRuntimeNotices).toEqual(
+        handle.metadata?.openCodeRuntimeNotices,
+      );
+    } finally {
+      await resumed.close();
+    }
+  } finally {
+    await client.shutdown();
+  }
+});
+
+test("retries a rejected version probe after the configured binary changes", async () => {
+  const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+  const { tmpdir } = await import("node:os");
+  const { join } = await import("node:path");
+  const { OpenCodeRuntimeClient } = await import("./runtime-client.js");
+  const { createTestLogger } = await import("../../../../test-utils/test-logger.js");
+  const root = await mkdtemp(join(tmpdir(), "opencode-version-probe-"));
+  const script = join(root, "version.cjs");
+  const client = new OpenCodeRuntimeClient(createTestLogger(), {
+    command: { mode: "replace", argv: [process.execPath, script] },
+  });
+  try {
+    await writeFile(script, 'console.log("opencode v2.0.3")');
+    await expect(client.fetchCatalog({ scope: "global", force: true })).rejects.toThrow(
+      "Update OpenCode to 2.0.10 or newer, then refresh the provider in Paseo",
+    );
+    await writeFile(script, 'console.log("opencode v3.0.0")');
+    await expect(client.fetchCatalog({ scope: "global", force: true })).rejects.toThrow(
+      "Unsupported OpenCode major version 3",
+    );
+  } finally {
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test.each([
+  ["console.log('wrapper output')", "unrecognized output"],
+  ["process.exit(1)", "failed command"],
+])("retries a %s version probe after updating to v2 (%s)", async (initialSource) => {
+  const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+  const { tmpdir } = await import("node:os");
+  const { join } = await import("node:path");
+  const { OpenCodeRuntimeClient } = await import("./runtime-client.js");
+  const { createTestLogger } = await import("../../../../test-utils/test-logger.js");
+  const root = await mkdtemp(join(tmpdir(), "opencode-version-retry-"));
+  const script = join(root, "version.cjs");
+  const client = new OpenCodeRuntimeClient(createTestLogger(), {
+    command: { mode: "replace", argv: [process.execPath, script] },
+  });
+  try {
+    await writeFile(script, initialSource);
+    expect((await client.listFeatures({ provider: "opencode", cwd: root }))[0]?.label).toBe(
+      "Auto Accept",
+    );
+    await writeFile(script, 'console.log("opencode v2.0.10")');
+    expect((await client.listFeatures({ provider: "opencode", cwd: root }))[0]?.label).toBe(
+      "Auto-accept",
+    );
+  } finally {
+    await client.shutdown();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test("appends a first notice after old history and records a changed major version", async () => {
+  const { withOpenCodeRuntimeNotice } = await import("./runtime-notice.js");
+  const { V2Harness } = await import("./test-utils/v2-harness.js");
+  const { OpenCodeV2AgentClient } = await import("./v2/agent.js");
+  const { createTestLogger } = await import("../../../../test-utils/test-logger.js");
+  const harness = new V2Harness();
+  harness.history.push({ id: "old", type: "user", text: "Earlier prompt", time: { created: 1 } });
+  const client = new OpenCodeV2AgentClient({
+    logger: createTestLogger(),
+    runtime: harness.runtime,
+  });
+  const previous = {
+    provider: "opencode",
+    sessionId: "session",
+    metadata: { cwd: "/tmp/project" },
+  };
+  const session = withOpenCodeRuntimeNotice(await client.resumeSession(previous), 2, previous);
+  try {
+    const history = [];
+    for await (const event of session.streamHistory()) history.push(event);
+    expect(history).toEqual([
+      expect.objectContaining({
+        type: "timeline",
+        item: { type: "user_message", text: "Earlier prompt", messageId: "old" },
+      }),
+      expect.objectContaining({
+        type: "timeline",
+        item: { type: "notification", level: "info", message: "This chat uses OpenCode v2." },
+      }),
+    ]);
+    await session.close();
+    const v1Handle = {
+      ...previous,
+      metadata: {
+        ...previous.metadata,
+        openCodeRuntimeNotices: [{ major: 1, timestamp: "2026-01-01T00:00:00.000Z" }],
+      },
+    };
+    const changed = withOpenCodeRuntimeNotice(await client.resumeSession(v1Handle), 2, v1Handle);
+    try {
+      expect(changed.initialTimeline?.map((entry) => entry.item)).toEqual([
+        { type: "notification", level: "info", message: "This chat uses OpenCode v2." },
+      ]);
+      expect(changed.describePersistence()?.metadata?.openCodeRuntimeNotices).toHaveLength(2);
+    } finally {
+      await changed.close();
+    }
+  } finally {
+    await session.close();
+    await client.shutdown();
+  }
+});
+
+test.each([
+  "process.exit(1)",
+  'console.log("custom wrapper output")',
+  "setTimeout(() => {}, 30000)",
+])(
+  "preserves legacy operations when the version probe is inconclusive: %s",
+  async (source) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const { tmpdir } = await import("node:os");
+    const { join } = await import("node:path");
+    const { OpenCodeRuntimeClient } = await import("./runtime-client.js");
+    const { OpenCodeAgentClient } = await import("../opencode-agent.js");
+    const { createTestLogger } = await import("../../../../test-utils/test-logger.js");
+    const { OpenCodeServerManager } = await import("./server-manager.js");
+    const root = await mkdtemp(join(tmpdir(), "opencode-legacy-probe-"));
+    const script = join(root, "version.cjs");
+    await writeFile(script, source);
+    const logger = createTestLogger();
+    let legacyShutdown = false;
+    class TrackedServerManager extends OpenCodeServerManager {
+      override async shutdown() {
+        legacyShutdown = true;
+        await super.shutdown();
+      }
+    }
+    const client = new OpenCodeRuntimeClient(
+      logger,
+      {
+        command: { mode: "replace", argv: [process.execPath, script] },
+      },
+      { serverManager: new TrackedServerManager({ logger }) },
+    );
+    const legacy = new OpenCodeAgentClient(logger);
+    const config = { provider: "opencode", cwd: root };
+    try {
+      expect(await client.listFeatures(config)).toEqual(await legacy.listFeatures(config));
+    } finally {
+      await client.shutdown();
+      await legacy.shutdown();
+      await rm(root, { recursive: true, force: true });
+    }
+    expect(legacyShutdown).toBe(true);
+  },
+  10000,
+);
diff --git a/packages/server/src/server/agent/providers/opencode/runtime-client.ts b/packages/server/src/server/agent/providers/opencode/runtime-client.ts
new file mode 100644
index 0000000000..2a34abe35d
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/runtime-client.ts
@@ -0,0 +1,164 @@
+import type { Logger } from "pino";
+import type {
+  AgentClient,
+  AgentSessionConfig,
+  AgentLaunchContext,
+  AgentCreateSessionOptions,
+  AgentPersistenceHandle,
+  FetchCatalogOptions,
+  ProviderRefreshContext,
+  ListImportableSessionsOptions,
+  ImportProviderSessionInput,
+  ImportProviderSessionContext,
+} from "../../agent-sdk-types.js";
+import {
+  createProviderEnvSpec,
+  resolveProviderLaunch,
+  type ProviderRuntimeSettings,
+} from "../../provider-launch-config.js";
+import { execCommand } from "../../../../utils/spawn.js";
+import { OpenCodeAgentClient } from "../opencode-agent.js";
+import type { OpenCodeV2AgentClient } from "./v2/agent.js";
+import { withOpenCodeRuntimeNotice } from "./runtime-notice.js";
+
+// Keep the minimum aligned with the SDK and binary exercised by CI.
+const MINIMUM_V2: readonly [number, number] = [0, 10];
+const VERSION_PATTERN = /^(?:opencode\s+)?v?(\d+)\.(\d+)\.(\d+)(?:[-+][\w.-]+)?$/i;
+
+export function openCodeMajorVersion(output: string): 1 | 2 {
+  const version = output.trim().match(VERSION_PATTERN);
+  if (!version) return 1;
+  if (version[1] === "1") return 1;
+  if (version[1] === "2") {
+    const [minimumMinor, minimumPatch] = MINIMUM_V2;
+    const minor = Number(version[2]);
+    const patch = Number(version[3]);
+    if (minor < minimumMinor || (minor === minimumMinor && patch < minimumPatch))
+      throw new Error(
+        `OpenCode ${version[1]}.${version[2]}.${version[3]} is too old for this Paseo integration. Update OpenCode to 2.${minimumMinor}.${minimumPatch} or newer, then refresh the provider in Paseo.`,
+      );
+    return 2;
+  }
+  throw new Error(
+    `Unsupported OpenCode major version ${version[1]}; supported versions are 1 and 2`,
+  );
+}
+
+export type OpenCodeRuntimeClientOptions = NonNullable<
+  ConstructorParameters<typeof OpenCodeAgentClient>[2]
+>;
+
+// Selection belongs to the configured client, which provider reload replaces.
+export class OpenCodeRuntimeClient implements AgentClient {
+  readonly provider = "opencode";
+  readonly capabilities;
+  readonly resolveCreateConfig;
+  readonly isCreateConfigUnattended;
+  private selected: Promise<OpenCodeAgentClient | OpenCodeV2AgentClient> | null = null;
+  private legacySelected = false;
+  private readonly legacy: OpenCodeAgentClient;
+  constructor(
+    private readonly logger: Logger,
+    private readonly settings?: ProviderRuntimeSettings,
+    private readonly options: OpenCodeRuntimeClientOptions = {},
+  ) {
+    this.legacy = new OpenCodeAgentClient(logger, settings, options);
+    this.capabilities = this.legacy.capabilities;
+    this.resolveCreateConfig = this.legacy.resolveCreateConfig;
+    this.isCreateConfigUnattended = this.legacy.isCreateConfigUnattended;
+  }
+  private client(): Promise<OpenCodeAgentClient | OpenCodeV2AgentClient> {
+    this.selected ??= (async () => {
+      let output: string;
+      try {
+        const launch = await resolveProviderLaunch({
+          commandConfig: this.settings?.command,
+          defaultBinary: "opencode",
+        });
+        const result = await execCommand(launch.command, [...launch.args, "--version"], {
+          ...createProviderEnvSpec({ runtimeSettings: this.settings }),
+          timeout: 5_000,
+        });
+        output = result.stdout;
+      } catch {
+        // Version discovery is additive: legacy wrappers need not support --version.
+        this.selected = null;
+        this.legacySelected = true;
+        return this.legacy;
+      }
+      if (!VERSION_PATTERN.test(output.trim())) this.selected = null;
+      if (openCodeMajorVersion(output) === 1) {
+        this.legacySelected = true;
+        return this.legacy;
+      }
+      const { OpenCodeV2AgentClient } = await import("./v2/agent.js");
+      return new OpenCodeV2AgentClient({
+        logger: this.logger,
+        settings: this.settings,
+        managedProcesses: this.options.managedProcesses,
+        bridge: this.options.bridge,
+      });
+    })().catch((error: unknown) => {
+      // A failed probe must not poison refresh after the user updates the binary.
+      this.selected = null;
+      throw error;
+    });
+    return this.selected;
+  }
+  async isAvailable() {
+    return this.legacy.isAvailable();
+  }
+  async getDiagnostic() {
+    return this.legacy.getDiagnostic();
+  }
+  async createSession(
+    config: AgentSessionConfig,
+    launch?: AgentLaunchContext,
+    options?: AgentCreateSessionOptions,
+  ) {
+    const client = await this.client();
+    const session = await client.createSession(config, launch, options);
+    return client === this.legacy ? session : withOpenCodeRuntimeNotice(session, 2);
+  }
+  async resumeSession(
+    handle: AgentPersistenceHandle,
+    config?: Partial<AgentSessionConfig>,
+    launch?: AgentLaunchContext,
+  ) {
+    const client = await this.client();
+    const session = await client.resumeSession(handle, config, launch);
+    return client === this.legacy ? session : withOpenCodeRuntimeNotice(session, 2, handle);
+  }
+  async fetchCatalog(options: FetchCatalogOptions, context?: ProviderRefreshContext) {
+    return (await this.client()).fetchCatalog(options, context);
+  }
+  async listCommands(config: AgentSessionConfig) {
+    return (await this.client()).listCommands(config);
+  }
+  async listFeatures(config: AgentSessionConfig) {
+    return (await this.client()).listFeatures(config);
+  }
+  async listImportableSessions(options?: ListImportableSessionsOptions) {
+    return (await this.client()).listImportableSessions(options);
+  }
+  async importSession(input: ImportProviderSessionInput, context: ImportProviderSessionContext) {
+    const client = await this.client();
+    const imported = await client.importSession(input, context);
+    return client === this.legacy
+      ? imported
+      : { ...imported, session: withOpenCodeRuntimeNotice(imported.session, 2) };
+  }
+  async archiveNativeSession(handle: AgentPersistenceHandle) {
+    const client = await this.client();
+    if (client instanceof OpenCodeAgentClient) await client.archiveNativeSession(handle);
+  }
+  async unarchiveNativeSession(handle: AgentPersistenceHandle) {
+    const client = await this.client();
+    if (client instanceof OpenCodeAgentClient) await client.unarchiveNativeSession(handle);
+  }
+  async shutdown() {
+    const selected = await this.selected?.catch(() => null);
+    if (this.legacySelected) await this.legacy.shutdown();
+    if (selected && selected !== this.legacy) await selected.shutdown();
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/runtime-notice.ts b/packages/server/src/server/agent/providers/opencode/runtime-notice.ts
new file mode 100644
index 0000000000..4b480e7c18
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/runtime-notice.ts
@@ -0,0 +1,62 @@
+import { z } from "zod";
+import type {
+  AgentPersistenceHandle,
+  AgentSession,
+  AgentStreamEvent,
+  ImportedTimelineEntry,
+} from "../../agent-sdk-types.js";
+
+const Notices = z.array(
+  z.object({ major: z.union([z.literal(1), z.literal(2)]), timestamp: z.string().datetime() }),
+);
+
+// These rows belong to Paseo, not OpenCode's conversation. Keep their original
+// timestamps in the persistence handle so history rebuilds preserve placement.
+export function withOpenCodeRuntimeNotice(
+  session: AgentSession,
+  major: 1 | 2,
+  previous?: AgentPersistenceHandle,
+): AgentSession {
+  const notices = Notices.parse(previous?.metadata?.openCodeRuntimeNotices ?? []);
+  const added = notices.at(-1)?.major !== major;
+  if (added) notices.push({ major, timestamp: new Date().toISOString() });
+  const entries: ImportedTimelineEntry[] = notices.map(({ major: recordedMajor, timestamp }) => ({
+    timestamp,
+    item: {
+      type: "notification",
+      level: "info",
+      message: `This chat uses OpenCode v${recordedMajor}.`,
+    },
+  }));
+  const describePersistence = session.describePersistence.bind(session);
+  const streamHistory = session.streamHistory.bind(session);
+  return Object.assign(session, {
+    initialTimeline: added ? entries.slice(-1) : [],
+    describePersistence() {
+      const handle = describePersistence();
+      return (
+        handle && { ...handle, metadata: { ...handle.metadata, openCodeRuntimeNotices: notices } }
+      );
+    },
+    async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+      const pending = [...entries];
+      const event = (entry: ImportedTimelineEntry): AgentStreamEvent => ({
+        type: "timeline",
+        provider: "opencode",
+        ...entry,
+      });
+      for await (const row of streamHistory()) {
+        while (
+          row.type === "timeline" &&
+          row.timestamp &&
+          pending[0]?.timestamp &&
+          pending[0].timestamp <= row.timestamp
+        ) {
+          yield event(pending.shift()!);
+        }
+        yield row;
+      }
+      for (const entry of pending) yield event(entry);
+    },
+  });
+}
diff --git a/packages/server/src/server/agent/providers/opencode/server-manager.ts b/packages/server/src/server/agent/providers/opencode/server-manager.ts
index 4161cd9876..9ff5dc6c96 100644
--- a/packages/server/src/server/agent/providers/opencode/server-manager.ts
+++ b/packages/server/src/server/agent/providers/opencode/server-manager.ts
@@ -2,6 +2,7 @@ import type { ChildProcess } from "node:child_process";
 import { mkdirSync } from "node:fs";
 import { stat } from "node:fs/promises";
 import net from "node:net";
+import { createRequire } from "node:module";
 import path from "node:path";
 import type { Logger } from "pino";
 
@@ -10,7 +11,7 @@ import { spawnProcess, type SpawnProcessOptions } from "../../../../utils/spawn.
 import { terminateWithTreeKill, type ProcessTerminator } from "../../../../utils/tree-kill.js";
 import type { ManagedProcessRegistry } from "../../../managed-processes/managed-processes.js";
 import {
-  createProviderEnvSpec,
+  createProviderEnv,
   resolveProviderCommandPrefix,
   type ProviderRuntimeSettings,
 } from "../../provider-launch-config.js";
@@ -29,6 +30,7 @@ const OPENCODE_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT_MS = 5_000;
 const OPENCODE_SERVER_FORCE_SHUTDOWN_TIMEOUT_MS = 1_000;
 
 export interface OpenCodeServerAcquisition {
+  environment: Record<string, string>;
   server: { port: number; url: string };
   events: OpenCodeEventSource;
   release: () => Promise<void>;
@@ -43,6 +45,7 @@ export interface OpenCodeServerManagerLike {
 }
 
 export interface OpenCodeServerGeneration {
+  environment: Record<string, string>;
   process: ChildProcess;
   port: number;
   url: string;
@@ -210,6 +213,7 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
     return {
       server: { port: server.port, url: server.url },
       events: server.events,
+      environment: server.environment,
       release: async () => {
         if (releasePromise) {
           return releasePromise;
@@ -331,15 +335,16 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
     const bridgeEnv = this.decorateServerEnv?.(
       existingConfigContent ? { OPENCODE_CONFIG_CONTENT: existingConfigContent } : {},
     );
+    const environment = createProviderEnv({
+      baseEnv: this.baseEnv,
+      runtimeSettings: this.runtimeSettings,
+      overlays: [launchEnv, bridgeEnv],
+    });
     const serverProcess = this.spawnServerProcess(launchPrefix.command, serverArgs, {
       cwd: serverCwd,
       detached: process.platform !== "win32",
       stdio: ["ignore", "pipe", "pipe"],
-      ...createProviderEnvSpec({
-        baseEnv: this.baseEnv,
-        runtimeSettings: this.runtimeSettings,
-        overlays: [launchEnv, bridgeEnv],
-      }),
+      baseEnv: environment,
     });
     const managedProcessRecord = this.recordManagedServerProcess({
       process: serverProcess,
@@ -351,14 +356,26 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
     const processExit = new Promise<Error>((resolve) => {
       resolveProcessExit = resolve;
     });
+    let resolveListening!: () => void;
+    let rejectListening!: (error: Error) => void;
+    const ready = new Promise<void>((resolve, reject) => {
+      resolveListening = resolve;
+      rejectListening = reject;
+    });
     const server: OpenCodeServerGeneration = {
+      environment,
       process: serverProcess,
       port,
       url,
       refCount: 0,
       retired: false,
       ready: Promise.resolve(),
-      events: this.createEventSource({ serverUrl: url, processExit, logger: this.logger }),
+      events: this.createEventSource({
+        serverUrl: url,
+        processExit,
+        logger: this.logger,
+        listening: ready,
+      }),
       managedProcessRecord,
     };
     this.logger.info(
@@ -397,7 +414,7 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
       return sections.join("\n");
     };
 
-    const ready = new Promise<void>((resolve, reject) => {
+    {
       let timeout: ReturnType<typeof setTimeout>;
       const failStartup = (error: Error) => {
         if (settled) {
@@ -405,7 +422,7 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
         }
         settled = true;
         clearTimeout(timeout);
-        reject(error);
+        rejectListening(error);
       };
       timeout = setTimeout(() => {
         if (!started) {
@@ -420,7 +437,7 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
           started = true;
           settled = true;
           clearTimeout(timeout);
-          resolve();
+          resolveListening();
         }
       });
 
@@ -456,7 +473,7 @@ export class OpenCodeServerManager implements OpenCodeServerManagerLike {
           }
         }
       });
-    });
+    }
 
     server.ready = ready.catch(async (error) => {
       await this.killServer(server);
@@ -622,25 +639,23 @@ async function resolveOpenCodeBinary(): Promise<string> {
   }
 
   if (process.platform === "win32" && path.extname(found).toLowerCase() === ".cmd") {
-    // Global npm: <prefix>/opencode.cmd → <prefix>/node_modules/opencode-ai/bin/opencode.exe
-    const globalCandidate = path.join(
-      path.dirname(found),
-      "node_modules",
-      "opencode-ai",
-      "bin",
-      "opencode.exe",
-    );
-    if (await pathExists(globalCandidate)) return globalCandidate;
+    const packageDirectories = [
+      path.join(path.dirname(found), "node_modules", "opencode-ai"),
+      path.join(path.dirname(found), "..", "opencode-ai"),
+    ];
+    for (const packageDirectory of packageDirectories) {
+      const bundledBinary = path.join(packageDirectory, "bin", "opencode.exe");
+      if (await pathExists(bundledBinary)) return bundledBinary;
 
-    // Local/pnpm: <project>/node_modules/.bin/opencode.cmd → <project>/node_modules/opencode-ai/bin/opencode.exe
-    const localCandidate = path.join(
-      path.dirname(found),
-      "..",
-      "opencode-ai",
-      "bin",
-      "opencode.exe",
-    );
-    if (await pathExists(localCandidate)) return localCandidate;
+      // Newer npm releases keep the executable in a platform dependency.
+      // Resolve from the CLI package so nested installs and pnpm both work.
+      try {
+        const require = createRequire(path.join(packageDirectory, "package.json"));
+        return require.resolve(`opencode-windows-${process.arch}/bin/opencode.exe`);
+      } catch {
+        // Try the other npm layout before retaining the original command.
+      }
+    }
 
     console.warn(
       "[opencode-server] Found opencode.cmd but could not resolve the real opencode.exe. " +
diff --git a/packages/server/src/server/agent/providers/opencode/test-server-manager.ts b/packages/server/src/server/agent/providers/opencode/test-server-manager.ts
index fc1748dd28..aa8e644a10 100644
--- a/packages/server/src/server/agent/providers/opencode/test-server-manager.ts
+++ b/packages/server/src/server/agent/providers/opencode/test-server-manager.ts
@@ -46,6 +46,7 @@ export class TestOpenCodeServerManager implements OpenCodeServerManagerLike {
     this.acquisitions.push(acquisition);
     return {
       server: this.server,
+      environment: input.env ?? {},
       events,
       release: async () => {
         acquisition.released = true;
diff --git a/packages/server/src/server/agent/providers/opencode/test-utils/test-opencode-harness.ts b/packages/server/src/server/agent/providers/opencode/test-utils/test-opencode-harness.ts
index 59c3f9d695..7bad72b8b1 100644
--- a/packages/server/src/server/agent/providers/opencode/test-utils/test-opencode-harness.ts
+++ b/packages/server/src/server/agent/providers/opencode/test-utils/test-opencode-harness.ts
@@ -74,6 +74,7 @@ export class TestOpenCodeHarness implements OpenCodeServerManagerLike {
     return {
       server: this.server,
       events: this.events,
+      environment: input.env ?? {},
       release: async () => {
         acquisition.releaseCount += 1;
       },
diff --git a/packages/server/src/server/agent/providers/opencode/test-utils/v2-harness.ts b/packages/server/src/server/agent/providers/opencode/test-utils/v2-harness.ts
new file mode 100644
index 0000000000..e2dc4f68a6
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/test-utils/v2-harness.ts
@@ -0,0 +1,204 @@
+import type {
+  OpenCodeEvent,
+  SessionInfo,
+  SessionMessageInfo,
+  SessionCreateInput,
+  SessionLogItem,
+} from "@opencode/client";
+import type { V2Api } from "../v2/api.js";
+import type { V2Connection } from "../v2/runtime.js";
+
+function unexpected(): never {
+  throw new Error("Unexpected OpenCode v2 test operation");
+}
+
+export class V2Harness {
+  readonly info: SessionInfo = {
+    id: "session",
+    projectID: "project",
+    location: { directory: "/tmp/project" },
+    agent: "build",
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+    cost: 0,
+    time: { created: 1, updated: 1 },
+    outcome: "succeeded",
+  };
+  readonly history: SessionMessageInfo[] = [];
+  readonly creates: SessionCreateInput[] = [];
+  readonly prompts: string[] = [];
+  readonly environments: Array<{ sessionID: string; variables: Record<string, string> }> = [];
+  readonly mcpAdds: string[] = [];
+  releases = 0;
+  active = false;
+  activeReads = 0;
+  autoComplete = true;
+  constructor(private sequence = 0) {}
+  private executions: SessionLogItem[] = [];
+  startExecution() {
+    this.active = true;
+    this.push({
+      id: `execution-${++this.sequence}`,
+      created: this.sequence,
+      type: "session.execution.started",
+      durable: { aggregateID: this.info.id, seq: this.sequence, version: 1 },
+      data: { sessionID: this.info.id },
+    });
+  }
+  finishExecution(outcome: "succeeded" | "interrupted" = "succeeded", publish = true) {
+    this.active = false;
+    this.info.outcome = outcome;
+    const common = {
+      id: `execution-${++this.sequence}`,
+      created: this.sequence,
+      durable: { aggregateID: this.info.id, seq: this.sequence, version: 1 as const },
+    };
+    this.push(
+      outcome === "succeeded"
+        ? { ...common, type: "session.execution.succeeded", data: { sessionID: this.info.id } }
+        : {
+            ...common,
+            type: "session.execution.interrupted",
+            data: { sessionID: this.info.id, reason: "user" },
+          },
+      publish,
+    );
+  }
+  prompt: V2Api["session"]["prompt"] = async (input) => {
+    this.prompts.push(input.text);
+    if (!this.autoComplete) this.startExecution();
+  };
+  interrupt: V2Api["session"]["interrupt"] = async () => {
+    this.finishExecution("interrupted");
+    return { interrupted: true };
+  };
+  private pendingEvents: OpenCodeEvent[] = [];
+  private notify: (() => void) | null = null;
+  push(event: OpenCodeEvent, publish = true) {
+    if (
+      event.type === "session.execution.started" ||
+      event.type === "session.execution.succeeded" ||
+      event.type === "session.execution.failed" ||
+      event.type === "session.execution.interrupted"
+    ) {
+      this.sequence = Math.max(this.sequence, event.durable.seq);
+      this.executions.push(event);
+    }
+    if (!publish) return;
+    this.pendingEvents.push(event);
+    this.notify?.();
+  }
+
+  readonly api: V2Api = {
+    server: { info: unexpected },
+    plugin: {
+      list: async () => ({
+        location: { directory: this.info.location.directory },
+        data: [
+          { id: "paseo", source: { type: "builtin" }, features: {}, state: { status: "active" } },
+        ],
+      }),
+    },
+    agent: {
+      list: async () => ({
+        location: {
+          ...this.info.location,
+          project: { id: "project", directory: "/tmp/project", canonical: "/tmp/project" },
+        },
+        data: [],
+      }),
+    },
+    model: { list: unexpected, default: unexpected },
+    provider: { list: unexpected },
+    command: { list: unexpected },
+    skill: { list: unexpected },
+    mcp: {
+      add: async (input) => {
+        this.mcpAdds.push(input.server);
+      },
+      list: async (input) => ({
+        location: { directory: input?.location?.directory ?? this.info.location.directory },
+        data: this.mcpAdds.map((name) => ({
+          name,
+          status: { status: "connected" as const },
+        })),
+      }),
+    },
+    message: {
+      list: async (input) => {
+        if (input.cursor && input.order) throw new Error("cursor cannot be combined with order");
+        return { data: [...this.history], cursor: {} };
+      },
+    },
+    permission: { list: async () => [], reply: unexpected },
+    session: {
+      form: { list: async () => [], reply: unexpected, cancel: unexpected },
+      create: async (input = {}) => {
+        this.creates.push(input);
+        return this.info;
+      },
+      get: async () => this.info,
+      list: async () => ({ data: [], cursor: {} }),
+      active: async () => {
+        this.activeReads += 1;
+        return this.active ? { [this.info.id]: { type: "running" as const } } : {};
+      },
+      remove: async () => undefined,
+      switchAgent: unexpected,
+      switchModel: unexpected,
+      environment: async (input) => {
+        this.environments.push(input);
+      },
+      instructions: { entry: { list: unexpected, put: unexpected, remove: unexpected } },
+      prompt: async (input, options) => {
+        const before = this.executions.length;
+        await this.prompt(input, options);
+        if (
+          this.autoComplete &&
+          this.executions.length === before &&
+          this.info.outcome !== "failed"
+        )
+          this.finishExecution();
+      },
+      interrupt: (input, options) => this.interrupt(input, options),
+      command: unexpected,
+      compact: unexpected,
+      revert: { stage: unexpected, clear: unexpected, commit: unexpected },
+      log: (input) => this.executionLog(input.after),
+    },
+    event: { subscribe: (options) => this.events(options?.signal) },
+  };
+  readonly connection: V2Connection = {
+    client: this.api,
+    release: async () => {
+      this.releases += 1;
+    },
+    retain: () => this.connection,
+    exited: new Promise<Error>(() => undefined),
+  };
+  readonly runtime = { acquire: async () => this.connection, shutdown: async () => undefined };
+
+  private async *executionLog(after = 0) {
+    for (const event of this.executions) {
+      if ("durable" in event && event.durable.seq > after) yield event;
+    }
+  }
+
+  private async *events(signal?: AbortSignal): AsyncGenerator<OpenCodeEvent> {
+    yield { id: "connected", created: 1, type: "server.connected", data: {} };
+    const wake = () => this.notify?.();
+    signal?.addEventListener("abort", wake);
+    try {
+      while (true) {
+        if (signal?.aborted) return;
+        const event = this.pendingEvents.shift();
+        if (event) yield event;
+        else
+          await new Promise<void>((resolve) => {
+            this.notify = resolve;
+          });
+      }
+    } finally {
+      signal?.removeEventListener("abort", wake);
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/test-utils/v2-local-e2e-helpers.ts b/packages/server/src/server/agent/providers/opencode/test-utils/v2-local-e2e-helpers.ts
new file mode 100644
index 0000000000..3365932c6e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/test-utils/v2-local-e2e-helpers.ts
@@ -0,0 +1,152 @@
+import { z } from "zod";
+import type {
+  AgentPermissionRequest,
+  AgentSession,
+  AgentSlashCommand,
+  AgentStreamEvent,
+  AgentTimelineItem,
+} from "../../../agent-sdk-types.js";
+
+export function requireSessionId(session: { id: string | null }): string {
+  if (!session.id) throw new Error("OpenCode session has no id");
+  return session.id;
+}
+
+export function readAssistantText(
+  timeline: ReadonlyArray<Pick<AgentTimelineItem, "type"> & { text?: string }>,
+): string {
+  return timeline
+    .flatMap((item) => (item.type === "assistant_message" ? [item.text ?? ""] : []))
+    .join("");
+}
+
+export function requireNativeUserMessageId(timeline: readonly AgentTimelineItem[]): string {
+  const user = timeline.find((item) => item.type === "user_message");
+  if (!user || user.type !== "user_message" || !user.messageId)
+    throw new Error("Missing native user message ID");
+  return user.messageId;
+}
+
+export function findSkillCommand(
+  commands: readonly AgentSlashCommand[],
+  nameFragment: string,
+): AgentSlashCommand {
+  const skill = commands.find((item) => item.kind === "skill" && item.name.includes(nameFragment));
+  if (!skill) throw new Error(`Missing skill command matching ${nameFragment}`);
+  return skill;
+}
+
+/** Live assistant text as it streams, so tests never spell out the event filter. */
+export function collectStreamedAssistantText(session: AgentSession): string[] {
+  const text: string[] = [];
+  session.subscribe((event) => {
+    if (event.type === "timeline" && event.item.type === "assistant_message")
+      text.push(event.item.text);
+  });
+  return text;
+}
+
+export function drainPersistedTimeline(session: AgentSession): Promise<AgentStreamEvent[]> {
+  return drain(session);
+}
+
+async function drain(session: AgentSession): Promise<AgentStreamEvent[]> {
+  const events: AgentStreamEvent[] = [];
+  for await (const event of session.streamHistory()) events.push(event);
+  return events;
+}
+
+/** Assistant text replayed from persisted history. */
+export async function drainPersistedAssistantText(session: AgentSession): Promise<string[]> {
+  return (await drainPersistedTimeline(session)).flatMap((event) =>
+    event.type === "timeline" && event.item.type === "assistant_message" ? [event.item.text] : [],
+  );
+}
+
+export function collectRunningToolCalls(session: AgentSession) {
+  let running = false;
+  let canceledTurns = 0;
+  session.subscribe((event) => {
+    if (event.type === "turn_canceled") canceledTurns += 1;
+    if (
+      event.type === "timeline" &&
+      event.item.type === "tool_call" &&
+      event.item.status === "running"
+    )
+      running = true;
+  });
+  return {
+    hasRunningTool: () => running,
+    canceledTurns: () => canceledTurns,
+  };
+}
+
+export function collectPermissions(session: AgentSession): string[] {
+  const names: string[] = [];
+  session.subscribe((event) => {
+    if (event.type === "permission_requested") names.push(event.request.name);
+  });
+  return names;
+}
+
+interface AutoRespondOptions {
+  /** Answer value applied to every question header. */
+  questionAnswer?: string;
+}
+
+/**
+ * Answers provider permissions as they arrive: questions with the configured
+ * answer, tools with a one-time approval. Tests assert the collected kinds and
+ * errors instead of branching on permission type.
+ */
+export function autoRespondToPermissions(session: AgentSession, options: AutoRespondOptions = {}) {
+  const kinds: string[] = [];
+  const errors: unknown[] = [];
+  session.subscribe((event) => {
+    if (event.type !== "permission_requested") return;
+    kinds.push(event.request.kind);
+    void respondToRequest(session, event.request, options).catch((error: unknown) => {
+      errors.push(error);
+    });
+  });
+  return { kinds, errors };
+}
+
+function respondToRequest(
+  session: AgentSession,
+  request: AgentPermissionRequest,
+  options: AutoRespondOptions,
+): Promise<void> {
+  if (request.kind !== "question") {
+    return session.respondToPermission(request.id, {
+      behavior: "allow",
+      selectedActionId: "once",
+    });
+  }
+  const input = z
+    .object({ questions: z.array(z.object({ header: z.string() })) })
+    .parse(request.input);
+  return session.respondToPermission(request.id, {
+    behavior: "allow",
+    updatedInput: {
+      answers: Object.fromEntries(
+        input.questions.map((question) => [question.header, options.questionAnswer ?? "Blue"]),
+      ),
+    },
+  });
+}
+
+export function collectProviderSubagents(session: AgentSession) {
+  let completed = false;
+  let text = "";
+  session.subscribe((event) => {
+    if (event.type !== "provider_subagent") return;
+    if (event.event.type === "upsert" && event.event.status === "completed") completed = true;
+    if (event.event.type === "timeline" && event.event.item.type === "assistant_message")
+      text += event.event.item.text;
+  });
+  return {
+    hasCompletedChild: () => completed,
+    childText: () => text,
+  };
+}
diff --git a/packages/server/src/server/agent/providers/opencode/tool-call-detail-parser.ts b/packages/server/src/server/agent/providers/opencode/tool-call-detail-parser.ts
index afe89b85b4..8214ebb1d0 100644
--- a/packages/server/src/server/agent/providers/opencode/tool-call-detail-parser.ts
+++ b/packages/server/src/server/agent/providers/opencode/tool-call-detail-parser.ts
@@ -221,6 +221,15 @@ function deriveOpencodeTaskDetail(
   };
 }
 
+function toOpencodeEditInput(value: { filePath: string; oldString?: string; newString?: string }) {
+  return {
+    filePath: value.filePath,
+    oldString: nonEmptyString(value.oldString),
+    newString: nonEmptyString(value.newString),
+    unifiedDiff: undefined,
+  };
+}
+
 const OpencodeEditInputSchema = z.union([
   z
     .object({
@@ -229,12 +238,12 @@ const OpencodeEditInputSchema = z.union([
       newString: z.string().optional(),
     })
     .passthrough()
-    .transform((value) => ({
-      filePath: value.filePath,
-      oldString: nonEmptyString(value.oldString),
-      newString: nonEmptyString(value.newString),
-      unifiedDiff: undefined,
-    })),
+    .transform(toOpencodeEditInput),
+  // OpenCode v2's edit tool names the file `path`.
+  z
+    .object({ path: z.string(), oldString: z.string(), newString: z.string() })
+    .passthrough()
+    .transform((value) => toOpencodeEditInput({ ...value, filePath: value.path })),
   ToolEditInputSchema,
 ]);
 
@@ -303,6 +312,10 @@ const OpencodeKnownToolDetailSchema = z.union([
     z.unknown(),
     (input) => toEditToolDetail(input, null),
   ),
+  // OpenCode v2 reports apply_patch as `patch`.
+  toolDetailBranchByToolName("patch", OpencodeApplyPatchTextInputSchema, z.unknown(), (input) =>
+    toEditToolDetail(input, null),
+  ),
   toolDetailBranchByToolName(
     "apply_diff",
     OpencodeEditInputSchema,
diff --git a/packages/server/src/server/agent/providers/opencode/tool-call-mapper.test.ts b/packages/server/src/server/agent/providers/opencode/tool-call-mapper.test.ts
index 54f3faa514..1c9ba212e1 100644
--- a/packages/server/src/server/agent/providers/opencode/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/tool-call-mapper.test.ts
@@ -387,6 +387,34 @@ describe("opencode tool-call mapper", () => {
     });
   });
 
+  it("maps OpenCode v2 patch payloads from GPT models into edit detail", () => {
+    const item = expectMapped(
+      mapOpencodeToolCall({
+        toolName: "patch",
+        callId: "opencode-v2-patch-1",
+        status: "completed",
+        input: {
+          patchText:
+            "*** Begin Patch\n*** Update File: patch.txt\n@@\n-north south\n+NORTH south\n*** End Patch",
+        },
+        output: "Success. Updated the following files:\nM patch.txt",
+      }),
+    );
+
+    expect(item.detail).toEqual({
+      type: "edit",
+      filePath: "patch.txt",
+      unifiedDiff: [
+        "diff --git a/patch.txt b/patch.txt",
+        "--- a/patch.txt",
+        "+++ b/patch.txt",
+        "@@",
+        "-north south",
+        "+NORTH south",
+      ].join("\n"),
+    });
+  });
+
   it("maps unknown tools to unknown detail with raw payloads", () => {
     const item = expectMapped(
       mapOpencodeToolCall({
diff --git a/packages/server/src/server/agent/providers/opencode/v2/agent.test.ts b/packages/server/src/server/agent/providers/opencode/v2/agent.test.ts
new file mode 100644
index 0000000000..26cb65885d
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/agent.test.ts
@@ -0,0 +1,1076 @@
+import type { FormInfo, ModelInfo, SessionMessageInfo } from "@opencode/client";
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+import { OpenCodeV2AgentClient } from "./agent.js";
+import { V2Harness } from "../test-utils/v2-harness.js";
+import type { V2Api } from "./api.js";
+
+function terminalEvents(events: AgentStreamEvent[]) {
+  return events.filter(
+    (event) =>
+      event.type === "turn_completed" ||
+      event.type === "turn_failed" ||
+      event.type === "turn_canceled",
+  );
+}
+
+describe("OpenCode v2 session lifecycle", () => {
+  test("completes from execution events without a long-lived HTTP wait", async () => {
+    const harness = new V2Harness();
+    harness.prompt = async (input) => {
+      harness.prompts.push(input.text);
+      harness.startExecution();
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("long-running work");
+      await expect.poll(() => harness.prompts).toEqual(["long-running work"]);
+      expect(events.filter((event) => event.type === "turn_failed")).toEqual([]);
+      expect(events.filter((event) => event.type === "turn_completed")).toEqual([]);
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(events.filter((event) => event.type === "turn_failed")).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
+  test.each(["reconnect", "watchdog"])(
+    "recovers a missed completion through %s without reconnecting a quiet stream",
+    async (recovery) => {
+      const harness = new V2Harness();
+      harness.autoComplete = false;
+      let subscriptions = 0;
+      const subscribe = harness.api.event.subscribe;
+      harness.api.event.subscribe = (options) => {
+        subscriptions += 1;
+        return subscribe(options);
+      };
+      const client = new OpenCodeV2AgentClient({
+        logger: createTestLogger(),
+        runtime: harness.runtime,
+      });
+      const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+      const events: AgentStreamEvent[] = [];
+      session.subscribe((event) => events.push(event));
+      try {
+        await session.startTurn("finish while disconnected");
+        await expect.poll(() => harness.prompts).toHaveLength(1);
+        // Persisted completion without its event, as after an upstream stream gap.
+        harness.finishExecution("succeeded", false);
+        if (recovery === "reconnect")
+          harness.push({ id: "reconnect", created: 3, type: "server.connected", data: {} });
+        await expect.poll(() => terminalEvents(events), { timeout: 7_000 }).toHaveLength(1);
+        expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+        expect(subscriptions).toBe(1);
+      } finally {
+        await session.close();
+      }
+    },
+    10_000,
+  );
+
+  test("does not finish from a previous outcome before prompt admission", async () => {
+    const harness = new V2Harness();
+    let accept!: () => void;
+    harness.prompt = () =>
+      new Promise<void>((resolve) => {
+        accept = resolve;
+      });
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("fast execution");
+      const reads = harness.activeReads;
+      harness.push({ id: "reconnect", created: 3, type: "server.connected", data: {} });
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.startExecution();
+      harness.finishExecution();
+      accept();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("follows a queued successor until the session is idle", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("first and queued work");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      harness.finishExecution();
+      harness.startExecution();
+      const reads = harness.activeReads;
+      harness.push({ id: "reconnect", created: 3, type: "server.connected", data: {} });
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("discards an idle snapshot overtaken by a new execution event", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    let readSnapshot!: () => void;
+    let release!: () => void;
+    const reading = new Promise<void>((resolve) => {
+      readSnapshot = resolve;
+    });
+    const blocked = new Promise<void>((resolve) => {
+      release = resolve;
+    });
+    try {
+      await session.startTurn("work");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      harness.api.session.get = async () => {
+        const snapshot = { ...harness.info };
+        readSnapshot();
+        await blocked;
+        return snapshot;
+      };
+      harness.finishExecution();
+      await reading;
+      const reads = harness.activeReads;
+      harness.startExecution();
+      release();
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+    } finally {
+      release();
+      await session.close();
+    }
+  });
+
+  test("does not treat shutdown interruption as a completed or canceled turn", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("resumable work");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      harness.active = false;
+      // Shutdown does not project an idle outcome; the preceding run's outcome can remain.
+      harness.info.outcome = "succeeded";
+      harness.push({
+        id: "shutdown",
+        created: 3,
+        type: "session.execution.interrupted",
+        durable: { aggregateID: "session", seq: 3, version: 1 },
+        data: { sessionID: "session", reason: "shutdown" },
+      });
+      const reads = harness.activeReads;
+      harness.push({ id: "reconnect", created: 4, type: "server.connected", data: {} });
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.startExecution();
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("ends the turn when the user dismisses a question", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    let form: FormInfo | null = null;
+    harness.api.session.form.list = async () => (form ? [form] : []);
+    harness.api.session.form.cancel = async () => {
+      form = null;
+      harness.active = false;
+      // OpenCode 2.0.20 reports a dismissed question as an interruption without a user reason.
+      harness.push({
+        id: "dismissed",
+        created: 3,
+        type: "session.execution.interrupted",
+        durable: { aggregateID: "session", seq: 3, version: 1 },
+        data: { sessionID: "session", reason: "shutdown" },
+      });
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("ask me something");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      form = {
+        id: "question",
+        sessionID: "session",
+        title: "Color",
+        fields: [{ key: "color", type: "string", options: [{ label: "Red", value: "red" }] }],
+      };
+      harness.push({
+        id: "form",
+        created: 2,
+        type: "form.created",
+        data: { form },
+      });
+      await expect.poll(() => session.getPendingPermissions()).toHaveLength(1);
+
+      await session.respondToPermission("question", { behavior: "deny" });
+
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_canceled" });
+
+      await session.startTurn("next message");
+      await expect.poll(() => harness.prompts).toHaveLength(2);
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(2);
+      expect(terminalEvents(events)[1]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("ends the turn when the user denies a tool permission", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    let permission: Awaited<ReturnType<V2Api["permission"]["list"]>>[number] | null = null;
+    harness.api.permission.list = async () => (permission ? [permission] : []);
+    harness.api.permission.reply = async () => {
+      permission = null;
+      harness.active = false;
+      // OpenCode 2.0.20 reports a denied tool call as an interruption without a user reason.
+      harness.push({
+        id: "denied",
+        created: 3,
+        type: "session.execution.interrupted",
+        durable: { aggregateID: "session", seq: 3, version: 1 },
+        data: { sessionID: "session", reason: "shutdown" },
+      });
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("run printf");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      permission = {
+        id: "approval",
+        sessionID: "session",
+        action: "shell",
+        resources: ["printf TOOL_PERMISSION_QA"],
+      };
+      harness.push({
+        id: "asked",
+        created: 2,
+        type: "permission.asked",
+        data: permission,
+      });
+      await expect.poll(() => session.getPendingPermissions()).toHaveLength(1);
+
+      await session.respondToPermission("approval", { behavior: "deny" });
+
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_canceled" });
+
+      await session.startTurn("next message");
+      await expect.poll(() => harness.prompts).toHaveLength(2);
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(2);
+      expect(terminalEvents(events)[1]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("keeps the turn resumable after the user denies a child session's permission", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const child = { ...harness.info, id: "child", parentID: "session" };
+    harness.api.session.list = async (input) => ({
+      data: input?.parentID === "session" ? [child] : [],
+      cursor: {},
+    });
+    let permission: Awaited<ReturnType<V2Api["permission"]["list"]>>[number] | null = {
+      id: "child-approval",
+      sessionID: "child",
+      action: "shell",
+      resources: ["pwd"],
+    };
+    harness.api.permission.list = async (input) =>
+      permission && input.sessionID === "child" ? [permission] : [];
+    harness.api.permission.reply = async () => {
+      permission = null;
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("delegate work");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      expect(session.getPendingPermissions()).toHaveLength(1);
+
+      await session.respondToPermission("child-approval", { behavior: "deny" });
+
+      harness.active = false;
+      harness.push({
+        id: "shutdown",
+        created: 3,
+        type: "session.execution.interrupted",
+        durable: { aggregateID: "session", seq: 3, version: 1 },
+        data: { sessionID: "session", reason: "shutdown" },
+      });
+      const reads = harness.activeReads;
+      harness.push({ id: "reconnect", created: 4, type: "server.connected", data: {} });
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.startExecution();
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("recovers the latest execution from the durable log when shutdown and resume events were missed", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      await session.startTurn("resumable work");
+      await expect.poll(() => harness.prompts).toHaveLength(1);
+      harness.active = false;
+      harness.info.outcome = "succeeded";
+      harness.api.session.log = async function* () {
+        yield {
+          id: "shutdown",
+          created: 3,
+          type: "session.execution.interrupted",
+          durable: { aggregateID: "session", seq: 3, version: 1 },
+          data: { sessionID: "session", reason: "shutdown" },
+        };
+      };
+      const reads = harness.activeReads;
+      harness.push({ id: "reconnect", created: 4, type: "server.connected", data: {} });
+      await expect.poll(() => harness.activeReads).toBeGreaterThan(reads);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.api.session.log = async function* () {
+        yield {
+          id: "done",
+          created: 6,
+          type: "session.execution.succeeded",
+          durable: { aggregateID: "session", seq: 6, version: 1 },
+          data: { sessionID: "session" },
+        };
+      };
+      harness.push({
+        id: "reconnect-after-resume",
+        created: 7,
+        type: "server.connected",
+        data: {},
+      });
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("keeps the turn alive through an observation transport failure", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    const active = harness.api.session.active;
+    let attempted = false;
+    harness.api.session.active = async () => {
+      attempted = true;
+      throw new Error("fetch failed");
+    };
+    try {
+      await session.startTurn("work");
+      await expect.poll(() => attempted).toBe(true);
+      expect(terminalEvents(events)).toEqual([]);
+      harness.api.session.active = active;
+      harness.finishExecution();
+      await expect.poll(() => terminalEvents(events)).toHaveLength(1);
+      expect(terminalEvents(events)[0]).toMatchObject({ type: "turn_completed" });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test.each([
+    { variants: ["medium", "custom"], selected: "medium", expected: "medium" },
+    { variants: ["custom"], selected: "custom", expected: "custom" },
+    { variants: ["high"], selected: "medium", expected: undefined },
+    { variants: [], selected: "medium", expected: undefined },
+    { variants: ["medium"], selected: "default", expected: undefined },
+  ])(
+    "model switches retain only supported variants: $selected / $variants",
+    async ({ variants, selected, expected }) => {
+      const harness = new V2Harness();
+      const target: ModelInfo = {
+        id: "target",
+        modelID: "target",
+        providerID: "test",
+        name: "Target",
+        capabilities: { tools: true, input: ["text"], output: ["text"] },
+        variants: variants.map((id) => ({ id })),
+        time: { released: 1 },
+        cost: [],
+        status: "active",
+        enabled: true,
+        limit: { context: 200000, output: 10000 },
+      };
+      harness.info.model = { providerID: "test", id: "source", variant: selected };
+      harness.api.model.list = async () => ({ location: harness.info.location, data: [target] });
+      harness.api.session.switchModel = async ({ model }) => {
+        harness.info.model = model;
+      };
+      const client = new OpenCodeV2AgentClient({
+        logger: createTestLogger(),
+        runtime: harness.runtime,
+      });
+      const session = await client.createSession({
+        provider: "opencode",
+        cwd: "/tmp/project",
+        model: "test/source",
+        thinkingOptionId: selected,
+      });
+      const events: AgentStreamEvent[] = [];
+      session.subscribe((event) => events.push(event));
+      try {
+        await session.setModel!("test/target");
+        expect(await session.getRuntimeInfo()).toMatchObject({
+          model: "test/target",
+          thinkingOptionId: expected ?? null,
+        });
+        expect(session.describePersistence().metadata?.thinkingOptionId).toBe(expected);
+        expect(events).toContainEqual({
+          type: "thinking_option_changed",
+          provider: "opencode",
+          thinkingOptionId: expected ?? null,
+        });
+        await expect(session.setModel!("test/missing")).rejects.toThrow(
+          "OpenCode model unavailable",
+        );
+        harness.api.session.switchModel = async () => {
+          throw new Error("Switch failed");
+        };
+        await expect(session.setModel!("test/target")).rejects.toThrow("Switch failed");
+        expect(session.describePersistence().metadata?.thinkingOptionId).toBe(expected);
+        expect(harness.info.model).toEqual({
+          providerID: "test",
+          id: "target",
+          ...(expected ? { variant: expected } : {}),
+        });
+        harness.api.session.switchModel = async ({ model }) => {
+          harness.info.model = model;
+        };
+        harness.api.model.default = async () => ({ location: harness.info.location, data: target });
+        await session.setThinkingOption!("unsupported");
+        await session.setModel!(null);
+        expect((await session.getRuntimeInfo()).thinkingOptionId).toBeNull();
+        harness.api.model.list = async () => {
+          throw new Error("Catalog unavailable");
+        };
+        await expect(session.setModel!("test/source")).rejects.toThrow("Catalog unavailable");
+        expect((await session.getRuntimeInfo()).model).toBe("test/target");
+      } finally {
+        await session.close();
+      }
+    },
+  );
+
+  test("restores each same-directory agent environment on reconnect and resume", async () => {
+    const first = new V2Harness();
+    const second = new V2Harness();
+    first.info.id = "session-first";
+    second.info.id = "session-second";
+    const environments = new Map<string, Record<string, string>>();
+    const bind = async (input: { sessionID: string; variables: Record<string, string> }) => {
+      environments.set(input.sessionID, { ...input.variables });
+    };
+    first.api.session.environment = bind;
+    second.api.session.environment = bind;
+    const clients = [first, second].map(
+      (harness) =>
+        new OpenCodeV2AgentClient({
+          logger: createTestLogger(),
+          runtime: harness.runtime,
+          settings: {
+            env: {
+              PASEO_ENV_TEST: "configured",
+              PASEO_AGENT_ID: "configured",
+              ELECTRON_RUN_AS_NODE: "1",
+              PASEO_SUPERVISED: "1",
+              CLAUDECODE: "1",
+            },
+          },
+        }),
+    );
+    const config = { provider: "opencode" as const, cwd: "/tmp/project" };
+    const launches = ["first", "second"].map((id) => ({
+      env: { PASEO_AGENT_ID: id, PASEO_AGENT_CWD: config.cwd },
+    }));
+    const assertEnvironment = (index: number) => {
+      const env = environments.get([first, second][index].info.id);
+      expect(env?.PATH).toBe(process.env.PATH);
+      expect(env).toMatchObject({ ...launches[index].env, PASEO_ENV_TEST: "configured" });
+      expect(env?.USER).toBe(process.env.USER);
+      for (const key of [
+        "ELECTRON_RUN_AS_NODE",
+        "PASEO_SUPERVISED",
+        "CLAUDECODE",
+        "ESBUILD_BINARY_PATH",
+        "PASEO_NODE_ENV",
+      ]) {
+        expect(env).not.toHaveProperty(key);
+      }
+    };
+    const sessions = await Promise.all(
+      clients.map((client, i) => client.createSession(config, launches[i])),
+    );
+    try {
+      assertEnvironment(0);
+      assertEnvironment(1);
+      environments.clear();
+      first.push({ id: "reconnected-first", created: 2, type: "server.connected", data: {} });
+      second.push({ id: "reconnected-second", created: 2, type: "server.connected", data: {} });
+      await expect.poll(() => environments.size).toBe(2);
+      assertEnvironment(0);
+      assertEnvironment(1);
+    } finally {
+      await Promise.all(sessions.map((session) => session.close()));
+    }
+    environments.clear();
+    const resumed = await Promise.all(
+      clients.map((client, i) =>
+        client.resumeSession(sessions[i].describePersistence(), undefined, launches[i]),
+      ),
+    );
+    try {
+      assertEnvironment(0);
+      assertEnvironment(1);
+      expect(first.prompts).toEqual([]);
+      expect(second.prompts).toEqual([]);
+    } finally {
+      await Promise.all(resumed.map((session) => session.close()));
+    }
+  });
+
+  test("reconnects after a helper exits and restores session configuration on the next turn", async () => {
+    const first = new V2Harness();
+    const second = new V2Harness(1);
+    let exit!: (error: Error) => void;
+    const exited = new Promise<Error>((resolve) => {
+      exit = resolve;
+    });
+    let acquisitions = 0;
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: {
+        acquire: async () => {
+          acquisitions += 1;
+          return acquisitions === 1 ? { ...first.connection, exited } : second.connection;
+        },
+        shutdown: async () => undefined,
+      },
+    });
+    first.autoComplete = false;
+    second.prompt = async (input) => {
+      second.history.push({
+        id: "answer",
+        type: "assistant",
+        agent: "build",
+        model: { providerID: "test", id: "model" },
+        time: { created: 2 },
+        content: [{ type: "text", text: "recovered" }],
+      });
+      second.prompts.push(input.text);
+    };
+    const session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: "/tmp/project",
+        mcpServers: { tools: { type: "stdio", command: "tools" } },
+      },
+      { env: { TOKEN: "test" } },
+    );
+    const running = session.run("before exit");
+    await expect.poll(() => first.prompts).toEqual(["before exit"]);
+    exit(new Error("helper exited"));
+    await expect(running).rejects.toThrow("helper exited");
+    expect(acquisitions).toBe(1);
+    try {
+      expect((await session.run("after exit")).finalText).toBe("recovered");
+      expect(second.prompts).toEqual(["after exit"]);
+      expect(second.mcpAdds).toEqual(["tools"]);
+      expect(second.environments).toMatchObject([
+        { sessionID: "session", variables: { TOKEN: "test", PATH: process.env.PATH } },
+      ]);
+      expect(second.environments).toEqual(first.environments);
+      expect(first.releases).toBe(1);
+    } finally {
+      await session.close();
+    }
+    await expect(session.startTurn("after close")).rejects.toThrow("OpenCode session is closed");
+  });
+  test("fails initialization when the event stream ends before connecting", async () => {
+    const harness = new V2Harness();
+    harness.api.event.subscribe = async function* () {};
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    await expect(
+      client.createSession({ provider: "opencode", cwd: "/tmp/project" }),
+    ).rejects.toThrow("event stream ended before connecting");
+    expect(harness.releases).toBeGreaterThan(0);
+  });
+
+  test("returns only validated structured output and preserves it in history", async () => {
+    const harness = new V2Harness();
+    harness.prompt = async (input) => {
+      harness.history.push({
+        id: "user",
+        type: "user",
+        text: input.text,
+        metadata: input.metadata,
+        time: { created: 1 },
+      });
+      harness.history.push({
+        id: "answer",
+        type: "assistant",
+        agent: "build",
+        model: { providerID: "test", id: "model" },
+        time: { created: 2 },
+        content: [
+          { type: "text", text: "Here is the answer" },
+          {
+            type: "tool",
+            id: "output",
+            name: "paseo_structured_output",
+            time: { created: 2 },
+            state: {
+              status: "completed",
+              input: { value: { answer: 42 } },
+              content: [{ type: "text", text: "accepted" }],
+              metadata: { paseoStructuredOutput: { answer: 42 } },
+            },
+          },
+        ],
+      });
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      const result = await session.run("answer", {
+        outputSchema: {
+          type: "object",
+          properties: { answer: { const: 42 } },
+          required: ["answer"],
+        },
+      });
+      expect(result.finalText).toBe('{"answer":42}');
+      const history = [];
+      for await (const event of session.streamHistory!()) history.push(event);
+      expect(history).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: "timeline",
+            item: expect.objectContaining({ type: "assistant_message", text: result.finalText }),
+          }),
+        ]),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("fails a structured turn when the model omits the validated output tool", async () => {
+    const harness = new V2Harness();
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      await expect(session.run("answer", { outputSchema: { type: "object" } })).rejects.toThrow(
+        "without submitting the required structured output",
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("resumes the native session ID and never replaces a missing session", async () => {
+    const harness = new V2Harness();
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const handle = {
+      provider: "opencode",
+      sessionId: "session",
+      nativeHandle: "session",
+      metadata: { cwd: "/tmp/project" },
+    } as const;
+    harness.api.session.switchAgent = async ({ agent }) => {
+      harness.info.agent = agent;
+    };
+    harness.api.session.switchModel = async ({ model }) => {
+      harness.info.model = model;
+    };
+    const session = await client.resumeSession(handle, {
+      modeId: "plan",
+      model: "synthetic/test",
+      thinkingOptionId: "low",
+    });
+    try {
+      expect(await session.getRuntimeInfo!()).toMatchObject({
+        modeId: "plan",
+        model: "synthetic/test",
+        thinkingOptionId: "low",
+      });
+      expect(await session.describePersistence()).toMatchObject({
+        sessionId: "session",
+        nativeHandle: "session",
+      });
+      expect(harness.creates).toEqual([]);
+    } finally {
+      await session.close();
+    }
+    harness.api.session.get = async () => {
+      throw new Error("Session not found");
+    };
+    await expect(client.resumeSession(handle)).rejects.toThrow("Session not found");
+    expect(harness.creates).toEqual([]);
+  });
+
+  test("reconciles reconnect snapshots without replaying text or losing repeated chunks", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const finish = () => harness.finishExecution();
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const chunks: string[] = [];
+    session.subscribe((event) => {
+      if (event.type === "timeline" && event.item.type === "assistant_message")
+        chunks.push(event.item.text);
+    });
+    try {
+      const running = session.run("laugh");
+      await expect.poll(() => harness.prompts).toEqual(["laugh"]);
+      const answer = {
+        id: "answer",
+        type: "assistant",
+        agent: "build",
+        model: { providerID: "test", id: "model" },
+        time: { created: 2 },
+        content: [{ type: "text", text: "ha" }],
+      } satisfies SessionMessageInfo;
+      harness.history.push(answer);
+      harness.push({ id: "reconnect-1", created: 2, type: "server.connected", data: {} });
+      await expect.poll(() => chunks).toEqual(["ha"]);
+      answer.content[0].text = "haha";
+      harness.push({ id: "reconnect-2", created: 3, type: "server.connected", data: {} });
+      await expect.poll(() => chunks).toEqual(["ha", "ha"]);
+      finish();
+      expect((await running).finalText).toBe("haha");
+      expect(chunks).toEqual(["ha", "ha"]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("retries observation failures without replacing the execution error", async () => {
+    const harness = new V2Harness();
+    harness.info.outcome = "failed";
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      let attempted = false;
+      harness.api.session.log = () => {
+        attempted = true;
+        throw new Error("log unavailable");
+      };
+      await session.startTurn("hello");
+      const failures = () => events.filter((event) => event.type === "turn_failed");
+      await expect.poll(() => attempted).toBe(true);
+      expect(failures()).toEqual([]);
+      harness.api.session.log = async function* () {
+        yield {
+          id: "failure",
+          created: 2,
+          durable: { aggregateID: "session", seq: 2, version: 1 },
+          type: "session.execution.failed",
+          data: { sessionID: "session", error: { type: "provider", message: "quota exhausted" } },
+        };
+      };
+      harness.push({ id: "reconnect", created: 3, type: "server.connected", data: {} });
+      await expect.poll(failures).toHaveLength(1);
+      expect(failures()[0]).toMatchObject({ error: "quota exhausted" });
+      expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(0);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("waits for prompt acceptance before interrupting", async () => {
+    const harness = new V2Harness();
+    let accept!: () => void;
+    const settle = () => harness.finishExecution("interrupted");
+    let interruptions = 0;
+    harness.prompt = () =>
+      new Promise<void>((resolve) => {
+        accept = resolve;
+      });
+
+    harness.interrupt = async () => {
+      interruptions += 1;
+      harness.info.outcome = "interrupted";
+      settle();
+      return { interrupted: true };
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      await session.startTurn("first");
+      const stopping = session.interrupt();
+      await Promise.resolve();
+      expect(interruptions).toBe(0);
+      accept();
+      await stopping;
+      expect(interruptions).toBe(1);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("completes a submitted turn once and reconciles its final text", async () => {
+    const harness = new V2Harness();
+    harness.prompt = async (input) => {
+      harness.prompts.push(input.text);
+      harness.history.push({
+        id: "answer",
+        type: "assistant",
+        agent: "build",
+        model: { providerID: "test", id: "model" },
+        time: { created: 2 },
+        content: [{ type: "text", text: "done" }],
+      });
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    try {
+      const result = await session.run("hello");
+      expect(result.finalText).toBe("done");
+      expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
+      expect(harness.creates[0]).toMatchObject({
+        agent: "build",
+        location: { directory: "/tmp/project" },
+      });
+    } finally {
+      await session.close();
+    }
+    expect(harness.releases).toBe(1);
+  });
+
+  test("waits for interruption settlement before submitting replacement work", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const finishFirst = () => harness.finishExecution("interrupted");
+    let finishStop!: () => void;
+    harness.interrupt = () =>
+      new Promise((resolve) => {
+        finishStop = () => {
+          harness.info.outcome = "interrupted";
+          finishFirst();
+          resolve({ interrupted: true });
+        };
+      });
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      await session.startTurn("first");
+      await expect.poll(() => harness.prompts).toEqual(["first"]);
+      const stopping = session.interrupt();
+      const replacement = session.startTurn("second");
+      await Promise.resolve();
+      expect(harness.prompts).toEqual(["first"]);
+      harness.autoComplete = true;
+      finishStop();
+      await stopping;
+      await replacement;
+      await expect.poll(() => harness.prompts).toEqual(["first", "second"]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("reuses the shared helper for sessions whose env is only agent identity", async () => {
+    const harness = new V2Harness();
+    const acquires: Array<{ env?: Record<string, string>; dedicated?: boolean }> = [];
+    const runtime = {
+      acquire: async (input: { env?: Record<string, string>; dedicated?: boolean } = {}) => {
+        acquires.push(input);
+        return harness.connection;
+      },
+      shutdown: async () => undefined,
+    };
+    const client = new OpenCodeV2AgentClient({ logger: createTestLogger(), runtime });
+    const session = await client.createSession(
+      { provider: "opencode", cwd: "/tmp/project" },
+      { agentId: "agent", env: { PASEO_AGENT_ID: "agent", PASEO_AGENT_CWD: "/tmp/project" } },
+    );
+    try {
+      expect(acquires).toEqual([{}]);
+      expect(harness.environments).toMatchObject([
+        {
+          sessionID: "session",
+          variables: { PASEO_AGENT_ID: "agent", PASEO_AGENT_CWD: "/tmp/project" },
+        },
+      ]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("starts a dedicated helper when the session carries custom MCP", async () => {
+    const harness = new V2Harness();
+    const acquires: Array<{ env?: Record<string, string>; dedicated?: boolean }> = [];
+    const runtime = {
+      acquire: async (input: { env?: Record<string, string>; dedicated?: boolean } = {}) => {
+        acquires.push(input);
+        return harness.connection;
+      },
+      shutdown: async () => undefined,
+    };
+    const client = new OpenCodeV2AgentClient({ logger: createTestLogger(), runtime });
+    const session = await client.createSession(
+      {
+        provider: "opencode",
+        cwd: "/tmp/project",
+        mcpServers: { custom: { type: "stdio", command: "custom", args: [] } },
+      },
+      { agentId: "agent", env: { PASEO_AGENT_ID: "agent", PASEO_AGENT_CWD: "/tmp/project" } },
+    );
+    try {
+      expect(acquires).toHaveLength(1);
+      expect(acquires[0]?.dedicated).toBe(true);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("refuses replacement work after a failed stop until Stop succeeds", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const finishFirst = () => harness.finishExecution("interrupted");
+    harness.interrupt = async () => {
+      throw new Error("stop failed");
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      await session.startTurn("first");
+      await expect.poll(() => harness.prompts).toEqual(["first"]);
+      await expect(session.interrupt()).rejects.toThrow("stop failed");
+      await expect(session.startTurn("unsafe replacement")).rejects.toThrow("stop failed");
+      expect(harness.prompts).toEqual(["first"]);
+      harness.interrupt = async () => {
+        finishFirst();
+        return { interrupted: true };
+      };
+      await session.interrupt();
+      harness.autoComplete = true;
+      await session.startTurn("retry");
+      await expect.poll(() => harness.prompts).toEqual(["first", "retry"]);
+    } finally {
+      await session.close();
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/agent.ts b/packages/server/src/server/agent/providers/opencode/v2/agent.ts
new file mode 100644
index 0000000000..2e50e759bd
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/agent.ts
@@ -0,0 +1,283 @@
+import { OpenCodeV2Session } from "./session.js";
+import { V2_CAPABILITIES } from "./capabilities.js";
+import {
+  features,
+  permissionRules,
+  applyResumeOverrides,
+  requiresDedicatedV2Server,
+} from "./configuration.js";
+import { commands } from "./commands.js";
+
+import { waitForLocationReady, awaitPaseoPlugin } from "./readiness.js";
+
+import type { SessionInfo } from "@opencode/client";
+
+import type { Logger } from "pino";
+import type {
+  AgentCapabilityFlags,
+  AgentClient,
+  AgentCreateSessionOptions,
+  AgentFeature,
+  AgentLaunchContext,
+  AgentPersistenceHandle,
+  AgentSession,
+  AgentSessionConfig,
+  FetchCatalogOptions,
+  ImportableProviderSession,
+  ImportProviderSessionInput,
+  ImportProviderSessionContext,
+  ListImportableSessionsOptions,
+  ProviderRefreshContext,
+} from "../../../agent-sdk-types.js";
+import {
+  createProviderEnv,
+  type ProviderRuntimeSettings,
+} from "../../../provider-launch-config.js";
+import type { ManagedProcessRegistry } from "../../../../managed-processes/managed-processes.js";
+
+import { importSessionFromPersistence } from "../../../provider-session-import.js";
+
+import type { OpenCodeBridge } from "../bridge.js";
+import { resolveOpenCodeHomeDir } from "../paths.js";
+import { V2Runtime, type V2Connection } from "./runtime.js";
+import { modelRef, modesFromV2, modelsFromV2 } from "./mapping.js";
+
+interface V2AgentOptions {
+  logger: Logger;
+  settings?: ProviderRuntimeSettings;
+  managedProcesses?: ManagedProcessRegistry;
+  bridge?: OpenCodeBridge;
+  runtime?: Pick<V2Runtime, "acquire" | "shutdown">;
+}
+
+export class OpenCodeV2AgentClient implements AgentClient {
+  readonly provider = "opencode";
+  readonly capabilities: AgentCapabilityFlags;
+  private readonly runtime: Pick<V2Runtime, "acquire" | "shutdown">;
+  private readonly connections = new Map<string, V2Connection>();
+  constructor(private readonly options: V2AgentOptions) {
+    this.capabilities = { ...V2_CAPABILITIES, supportsNativePaseoTools: Boolean(options.bridge) };
+    this.runtime =
+      options.runtime ??
+      new V2Runtime({
+        ...options,
+        decorateEnv: options.bridge ? (env) => options.bridge!.decorateV2ServerEnv(env) : undefined,
+      });
+  }
+  async isAvailable() {
+    return true;
+  }
+  async shutdown() {
+    await this.runtime.shutdown();
+  }
+  async fetchCatalog(options: FetchCatalogOptions, context?: ProviderRefreshContext) {
+    const connection = await this.runtime.acquire({
+      fresh: options.force,
+      signal: context?.signal,
+    });
+    const location = {
+      directory: options.scope === "workspace" ? options.cwd : resolveOpenCodeHomeDir(),
+    };
+    const request = { signal: context?.signal };
+    const activity = <T>(name: string, operation: () => Promise<T>) =>
+      context ? context.runActivity(name, operation) : operation();
+    try {
+      await activity("plugin.list", () =>
+        waitForLocationReady({ client: connection.client, location, signal: request.signal }),
+      );
+      const [models, agents, providers] = await Promise.all([
+        activity("model.list", () => connection.client.model.list({ location }, request)),
+        activity("agent.list", () => connection.client.agent.list({ location }, request)),
+        activity("provider.list", () => connection.client.provider.list({ location }, request)),
+      ]);
+      if (!providers.data.length)
+        throw new Error(
+          "OpenCode has no connected providers. Authenticate using opencode auth login.",
+        );
+      return { models: modelsFromV2(models.data), modes: modesFromV2(agents.data) };
+    } finally {
+      await connection.release();
+    }
+  }
+  async createSession(
+    config: AgentSessionConfig,
+    launch?: AgentLaunchContext,
+    options?: AgentCreateSessionOptions,
+  ): Promise<AgentSession> {
+    const connection = await this.runtime.acquire(
+      requiresDedicatedV2Server(config, launch) ? { env: launch?.env, dedicated: true } : {},
+    );
+    try {
+      const info = await connection.client.session.create({
+        location: { directory: config.cwd },
+        title: config.title,
+        agent: config.modeId ?? "build",
+        model: config.model ? modelRef(config.model, config.thinkingOptionId) : undefined,
+        permissions: permissionRules(config),
+      });
+      return await this.attach(connection, info, config, launch, options?.persistSession !== false);
+    } catch (error) {
+      await connection.release();
+      throw error;
+    }
+  }
+  async resumeSession(
+    handle: AgentPersistenceHandle,
+    overrides?: Partial<AgentSessionConfig>,
+    launch?: AgentLaunchContext,
+  ): Promise<AgentSession> {
+    const cwd = overrides?.cwd ?? handle.metadata?.cwd;
+    if (typeof cwd !== "string")
+      throw new Error("OpenCode resume requires the original working directory");
+    const config: AgentSessionConfig = {
+      ...handle.metadata,
+      ...overrides,
+      provider: "opencode",
+      cwd,
+    };
+    const connection =
+      this.connections.get(handle.nativeHandle ?? handle.sessionId)?.retain() ??
+      (await this.runtime.acquire(
+        requiresDedicatedV2Server(config, launch) ? { env: launch?.env, dedicated: true } : {},
+      ));
+    try {
+      const info = await connection.client.session.get({
+        sessionID: handle.nativeHandle ?? handle.sessionId,
+      });
+      await applyResumeOverrides(connection.client, info, overrides);
+      return await this.attach(connection, info, config, launch, true);
+    } catch (error) {
+      await connection.release();
+      throw error;
+    }
+  }
+  private async attach(
+    connection: V2Connection,
+    info: SessionInfo,
+    config: AgentSessionConfig,
+    launch: AgentLaunchContext | undefined,
+    persist: boolean,
+  ) {
+    const acquire = () =>
+      this.runtime.acquire(
+        requiresDedicatedV2Server(config, launch) ? { env: launch?.env, dedicated: true } : {},
+      );
+    let ownedConnection = connection;
+    const unbind = this.options.bridge?.bindSession({
+      sessionId: info.id,
+      env: launch?.env ?? {},
+      tools: launch?.paseoTools,
+    });
+    const bound = new Map<string, () => void>();
+    const bindChild = (childId: string) => {
+      this.connections.set(childId, ownedConnection);
+      if (bound.has(childId)) return;
+      const childUnbind = this.options.bridge?.bindSession({
+        sessionId: childId,
+        env: launch?.env ?? {},
+        tools: launch?.paseoTools,
+      });
+      if (childUnbind) bound.set(childId, childUnbind);
+    };
+    this.connections.set(info.id, connection);
+    const releaseBindings = () => {
+      unbind?.();
+      for (const cleanup of bound.values()) cleanup();
+      for (const [id, owner] of this.connections)
+        if (owner === ownedConnection) this.connections.delete(id);
+    };
+    const moved = (next: V2Connection) => {
+      for (const [id, owner] of this.connections)
+        if (owner === ownedConnection) this.connections.set(id, next);
+      ownedConnection = next;
+    };
+    const session = new OpenCodeV2Session(
+      connection,
+      info,
+      config,
+      this.options.logger,
+      persist,
+      Boolean(this.options.bridge),
+      releaseBindings,
+      bindChild,
+      acquire,
+      moved,
+    );
+    try {
+      if (this.options.bridge) {
+        const location = { directory: config.cwd };
+        await awaitPaseoPlugin({ client: connection.client, location });
+      }
+      await session.initialize(
+        launch?.env
+          ? createProviderEnv({ runtimeSettings: this.options.settings, overlays: [launch.env] })
+          : undefined,
+      );
+      return session;
+    } catch (error) {
+      await session.close();
+      throw error;
+    }
+  }
+  async listFeatures(config: AgentSessionConfig): Promise<AgentFeature[]> {
+    return features(config);
+  }
+  async listCommands(config: AgentSessionConfig) {
+    const connection = await this.runtime.acquire();
+    try {
+      return await commands(connection.client, config.cwd);
+    } finally {
+      await connection.release();
+    }
+  }
+  async listImportableSessions(
+    options: ListImportableSessionsOptions = {},
+  ): Promise<ImportableProviderSession[]> {
+    const connection = await this.runtime.acquire();
+    try {
+      const sessions: SessionInfo[] = [];
+      let cursor: string | undefined;
+      const scanLimit = Math.min(options.scanLimit ?? 100, 500);
+      do {
+        const page = await connection.client.session.list({
+          ...(cursor ? { cursor } : { directory: options.cwd, search: options.query }),
+          limit: Math.min(50, scanLimit - sessions.length),
+        });
+        sessions.push(...page.data);
+        cursor = page.cursor.next ?? undefined;
+      } while (cursor && sessions.length < scanLimit);
+      return sessions
+        .filter((info) => !info.parentID && !info.time.archived)
+        .slice(0, options.limit ?? 50)
+        .map((info) => ({
+          providerHandleId: info.id,
+          cwd: info.location.directory,
+          title: info.title ?? null,
+          firstPromptPreview: null,
+          lastPromptPreview: null,
+          lastActivityAt: new Date(info.time.updated),
+        }));
+    } finally {
+      await connection.release();
+    }
+  }
+  async importSession(input: ImportProviderSessionInput, context: ImportProviderSessionContext) {
+    const connection = await this.runtime.acquire();
+    try {
+      const info = await connection.client.session.get({ sessionID: input.providerHandleId });
+      return await importSessionFromPersistence({
+        provider: "opencode",
+        request: input,
+        context,
+        resumeSession: this.resumeSession.bind(this),
+        config: {
+          title: info.title,
+          modeId: info.agent,
+          model: info.model ? `${info.model.providerID}/${info.model.id}` : undefined,
+        },
+      });
+    } finally {
+      await connection.release();
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/api.ts b/packages/server/src/server/agent/providers/opencode/v2/api.ts
new file mode 100644
index 0000000000..fe225cade2
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/api.ts
@@ -0,0 +1,35 @@
+import type { OpenCodeClient } from "@opencode/client";
+
+export interface V2Api {
+  server: OpenCodeClient["server"];
+  session: Pick<
+    OpenCodeClient["session"],
+    | "create"
+    | "get"
+    | "list"
+    | "active"
+    | "remove"
+    | "switchAgent"
+    | "switchModel"
+    | "environment"
+    | "instructions"
+    | "prompt"
+    | "command"
+    | "compact"
+    | "interrupt"
+    | "revert"
+    | "log"
+  > & {
+    form: Pick<OpenCodeClient["session"]["form"], "list" | "reply" | "cancel">;
+  };
+  plugin: Pick<OpenCodeClient["plugin"], "list">;
+  model: OpenCodeClient["model"];
+  provider: Pick<OpenCodeClient["provider"], "list">;
+  agent: Pick<OpenCodeClient["agent"], "list">;
+  command: OpenCodeClient["command"];
+  skill: OpenCodeClient["skill"];
+  message: OpenCodeClient["message"];
+  mcp: Pick<OpenCodeClient["mcp"], "add" | "list">;
+  permission: Pick<OpenCodeClient["permission"], "list" | "reply">;
+  event: OpenCodeClient["event"];
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
new file mode 100644
index 0000000000..6b845d19ed
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
@@ -0,0 +1,87 @@
+import { registerStructuredOutput, STRUCTURED_OUTPUT_TOOL } from "./structured-output-plugin.mjs";
+
+export default {
+  id: "paseo",
+  async setup(context) {
+    const disposeStructuredOutput = await registerStructuredOutput(context);
+    const { baseUrl, token } = context.options;
+    if (!baseUrl || !token) return disposeStructuredOutput;
+    async function request(pathname, body, allowMissing = false) {
+      const response = await fetch(new URL(`/_internal/opencode${pathname}`, baseUrl), {
+        method: body === undefined ? "GET" : "POST",
+        headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+        ...(body === undefined ? {} : { body: JSON.stringify(body) }),
+      });
+      if (allowMissing && response.status === 404) return null;
+      if (!response.ok) {
+        const payload = await response.json().catch(() => null);
+        const message =
+          typeof payload?.error === "string" && payload.error
+            ? payload.error
+            : `Paseo tool bridge returned HTTP ${response.status}`;
+        const error = new Error(message);
+        error.status = response.status;
+        throw error;
+      }
+      return response.json();
+    }
+    async function scope(sessionID) {
+      const visited = new Set();
+      while (sessionID && !visited.has(sessionID)) {
+        visited.add(sessionID);
+        const binding = await request(
+          `/sessions/${encodeURIComponent(sessionID)}/context?tools`,
+          undefined,
+          true,
+        );
+        if (binding) return { ...binding, sessionID };
+        const session = await context.session.get({ sessionID });
+        sessionID = session.parentID;
+      }
+      throw new Error("OpenCode session is not bound to a Paseo agent");
+    }
+    const manifest = await request("/tools");
+    const registration = await context.tool.transform((editor) => {
+      for (const definition of manifest.tools) {
+        editor.add({
+          name: `paseo_${definition.name}`,
+          description: definition.description,
+          input: definition.inputSchema,
+          options: { codemode: false },
+          async execute(input, call) {
+            const binding = await scope(call.sessionID);
+            const result = await request(
+              `/sessions/${encodeURIComponent(binding.sessionID)}/tools/${encodeURIComponent(definition.name)}`,
+              input,
+            );
+            return {
+              content: result.content.map(toOpenCodeContent),
+              metadata: { paseoTool: definition.name },
+            };
+          },
+        });
+      }
+    });
+    const filtering = await context.session.hook("context", async (input) => {
+      const binding = await scope(input.sessionID);
+      const allowed = new Set(binding.tools.map((name) => `paseo_${name}`));
+      for (const name of Object.keys(input.tools)) {
+        if (name !== STRUCTURED_OUTPUT_TOOL && name.startsWith("paseo_") && !allowed.has(name))
+          delete input.tools[name];
+      }
+    });
+    return async () => {
+      await disposeStructuredOutput();
+      await filtering.dispose();
+      await registration.dispose();
+    };
+  },
+};
+
+// OpenCode tool content is text or a file; MCP images arrive as base64 data.
+function toOpenCodeContent(part) {
+  if (part.type === "image") {
+    return { type: "file", uri: `data:${part.mimeType};base64,${part.data}`, mime: part.mimeType };
+  }
+  return part;
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/capabilities.ts b/packages/server/src/server/agent/providers/opencode/v2/capabilities.ts
new file mode 100644
index 0000000000..4369af279b
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/capabilities.ts
@@ -0,0 +1,13 @@
+import type { AgentCapabilityFlags } from "../../../agent-sdk-types.js";
+export const V2_CAPABILITIES: AgentCapabilityFlags = {
+  supportsStreaming: true,
+  supportsSessionPersistence: true,
+  supportsSessionListing: true,
+  supportsDynamicModes: true,
+  supportsMcpServers: true,
+  supportsReasoningStream: true,
+  supportsToolInvocations: true,
+  supportsRewindBoth: true,
+  supportsRewindConversation: false,
+  supportsRewindFiles: false,
+};
diff --git a/packages/server/src/server/agent/providers/opencode/v2/children.ts b/packages/server/src/server/agent/providers/opencode/v2/children.ts
new file mode 100644
index 0000000000..95853b71c7
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/children.ts
@@ -0,0 +1,91 @@
+import { V2Timeline } from "./timeline.js";
+
+import type { SessionInfo } from "@opencode/client";
+
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+
+import type { ProviderSubagentInputEvent } from "../../../provider-subagents/store.js";
+
+import { messages } from "./history.js";
+
+import type { V2Api } from "./api.js";
+interface ChildrenOptions {
+  client(): V2Api;
+  id: string;
+  emit(event: AgentStreamEvent): void;
+  reconcilePermissions(id: string): Promise<void>;
+  bindChild?: (id: string) => void;
+}
+export class SessionChildren {
+  private readonly children = new Map<string, V2Timeline>();
+  private readonly childStates = new Map<string, string>();
+  constructor(private readonly options: ChildrenOptions) {}
+  async observe(event: import("@opencode/client").OpenCodeEvent) {
+    if (
+      event.type === "session.created" &&
+      event.data.parentID &&
+      (event.data.parentID === this.options.id || this.children.has(event.data.parentID))
+    ) {
+      await this.reconcile(event.data.parentID);
+    }
+    if (
+      "sessionID" in event.data &&
+      typeof event.data.sessionID === "string" &&
+      this.children.has(event.data.sessionID)
+    ) {
+      await this.reconcileChild(
+        await this.options.client().session.get({ sessionID: event.data.sessionID }),
+      );
+    }
+  }
+  async reconcile(parentID: string) {
+    let cursor: string | undefined;
+    do {
+      const page = await this.options.client().session.list({
+        ...(cursor ? { cursor } : { parentID }),
+        limit: 100,
+      });
+      for (const child of page.data) {
+        await this.reconcileChild(child);
+        await this.reconcile(child.id);
+      }
+      cursor = page.cursor.next ?? undefined;
+    } while (cursor);
+  }
+  private async reconcileChild(info: SessionInfo) {
+    await this.options.reconcilePermissions(info.id);
+    let timeline = this.children.get(info.id);
+    if (!timeline) {
+      timeline = new V2Timeline();
+      this.children.set(info.id, timeline);
+      this.options.bindChild?.(info.id);
+    }
+    const active = await this.options.client().session.active();
+    let status: "running" | "failed" | "canceled" | "completed" = "completed";
+    if (active[info.id]) status = "running";
+    else if (info.outcome === "failed") status = "failed";
+    else if (info.outcome === "interrupted") status = "canceled";
+    const presentation: ProviderSubagentInputEvent = {
+      type: "upsert",
+      id: info.id,
+      parentSubagentId: info.parentID === this.options.id ? null : info.parentID,
+      title: info.title ?? null,
+      status,
+      cwd: info.location.directory,
+      timestamp: new Date(info.time.updated).toISOString(),
+    };
+    const signature = JSON.stringify(presentation);
+    if (this.childStates.get(info.id) !== signature) {
+      this.childStates.set(info.id, signature);
+      this.options.emit({ type: "provider_subagent", provider: "opencode", event: presentation });
+    }
+    for (const event of timeline.messages(await messages(this.options.client(), info.id))) {
+      if (event.type === "timeline")
+        this.options.emit({
+          type: "provider_subagent",
+          provider: "opencode",
+          event: { type: "timeline", id: info.id, item: event.item, timestamp: event.timestamp },
+        });
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/commands.ts b/packages/server/src/server/agent/providers/opencode/v2/commands.ts
new file mode 100644
index 0000000000..1bd52db1ee
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/commands.ts
@@ -0,0 +1,39 @@
+import { waitForLocationReady } from "./readiness.js";
+
+import type { V2Api } from "./api.js";
+
+import type { AgentSlashCommand } from "../../../agent-sdk-types.js";
+
+export async function commands(client: V2Api, directory: string): Promise<AgentSlashCommand[]> {
+  const location = { directory };
+  await waitForLocationReady({ client, location });
+  const [configured, skills] = await Promise.all([
+    client.command.list({ location }),
+    client.skill.list({ location }),
+  ]);
+  const result = new Map<string, AgentSlashCommand>();
+  for (const name of ["compact", "summarize"])
+    result.set(name, {
+      name,
+      description: "Compact the current session",
+      argumentHint: "",
+      kind: "command",
+    });
+  for (const command of configured.data)
+    result.set(command.name, {
+      name: command.name,
+      description: command.description ?? "",
+      argumentHint: "",
+      kind: "command",
+    });
+  for (const skill of skills.data) {
+    if (result.has(skill.id)) continue;
+    result.set(skill.id, {
+      name: skill.id,
+      description: skill.description ?? "",
+      argumentHint: "",
+      kind: "skill",
+    });
+  }
+  return [...result.values()];
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/configuration.test.ts b/packages/server/src/server/agent/providers/opencode/v2/configuration.test.ts
new file mode 100644
index 0000000000..6479ca3851
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/configuration.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, test } from "vitest";
+
+import { features, permissionRules, requiresDedicatedV2Server } from "./configuration.js";
+
+describe("OpenCode v2 permission rules", () => {
+  test("maps authored native permissions and exact injected MCP grants", () => {
+    expect(
+      permissionRules({
+        provider: "opencode",
+        cwd: "/tmp/project",
+        providerOptions: { permission: { bash: { pwd: "allow" }, task: "ask" } },
+        toolPolicy: { preapproved: [{ server: "paseo.host", tool: "read/info" }] },
+      }),
+    ).toEqual([
+      { action: "paseo_host_read_info", resource: "*", effect: "allow" },
+      { action: "shell", resource: "pwd", effect: "allow" },
+      { action: "subagent", resource: "*", effect: "ask" },
+    ]);
+  });
+});
+
+describe("OpenCode v2 helper isolation", () => {
+  test("shares the helper for agent-identity environment only", () => {
+    expect(
+      requiresDedicatedV2Server(
+        { provider: "opencode", cwd: "/tmp/project" },
+        { agentId: "agent", env: { PASEO_AGENT_ID: "agent", PASEO_AGENT_CWD: "/tmp/project" } },
+      ),
+    ).toBe(false);
+  });
+
+  test("dedicates a helper for any other process environment", () => {
+    expect(
+      requiresDedicatedV2Server(
+        { provider: "opencode", cwd: "/tmp/project" },
+        { agentId: "agent", env: { CUSTOM_FLAG: "1" } },
+      ),
+    ).toBe(true);
+  });
+
+  test("dedicates a helper when the session carries custom MCP", () => {
+    expect(
+      requiresDedicatedV2Server({
+        provider: "opencode",
+        cwd: "/tmp/project",
+        mcpServers: { custom: { type: "stdio", command: "custom", args: [] } },
+      }),
+    ).toBe(true);
+  });
+});
+
+describe("OpenCode v2 features", () => {
+  test("reports the auto-accept toggle from the session value", () => {
+    expect(features({ provider: "opencode", cwd: "/tmp/project" })).toEqual([
+      { type: "toggle", id: "auto_accept", label: "Auto-accept", value: false },
+    ]);
+    expect(
+      features({
+        provider: "opencode",
+        cwd: "/tmp/project",
+        featureValues: { auto_accept: true },
+      }),
+    ).toEqual([{ type: "toggle", id: "auto_accept", label: "Auto-accept", value: true }]);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/configuration.ts b/packages/server/src/server/agent/providers/opencode/v2/configuration.ts
new file mode 100644
index 0000000000..9a565e6fca
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/configuration.ts
@@ -0,0 +1,83 @@
+import type { SessionInfo, PermissionRuleset } from "@opencode/client";
+import type { V2Api } from "./api.js";
+
+import type {
+  AgentFeature,
+  AgentLaunchContext,
+  AgentSessionConfig,
+} from "../../../agent-sdk-types.js";
+
+import { OpenCodeProviderOptionsSchema, buildOpenCodePermissionRules } from "../options.js";
+
+import { modelRef } from "./mapping.js";
+
+export function features(config: AgentSessionConfig): AgentFeature[] {
+  return [
+    {
+      type: "toggle",
+      id: "auto_accept",
+      label: "Auto-accept",
+      value: config.featureValues?.["auto_accept"] === true,
+    },
+  ];
+}
+export function permissionRules(config: AgentSessionConfig): PermissionRuleset {
+  const rules =
+    buildOpenCodePermissionRules(
+      OpenCodeProviderOptionsSchema.parse(config.providerOptions ?? {}),
+      undefined,
+    ) ?? [];
+  const grants: PermissionRuleset = (config.toolPolicy?.preapproved ?? []).map((grant) => ({
+    action: `${grant.server.replace(/[^a-zA-Z0-9_-]/g, "_")}_${grant.tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`,
+    resource: "*",
+    effect: "allow",
+  }));
+  return [
+    ...grants,
+    ...rules.map((rule) => ({
+      action: nativePermissionAction(rule.permission),
+      resource: rule.pattern,
+      effect: rule.action,
+    })),
+  ];
+}
+function nativePermissionAction(action: string): string {
+  if (action === "bash") return "shell";
+  if (action === "task") return "subagent";
+  return action;
+}
+export async function applyResumeOverrides(
+  client: V2Api,
+  info: SessionInfo,
+  overrides?: Partial<AgentSessionConfig>,
+) {
+  if (overrides?.modeId) {
+    await client.session.switchAgent({
+      sessionID: info.id,
+      agent: overrides.modeId,
+    });
+    info.agent = overrides.modeId;
+  }
+  if (overrides?.model || overrides?.thinkingOptionId !== undefined) {
+    const model = overrides.model
+      ? modelRef(overrides.model, overrides.thinkingOptionId ?? info.model?.variant)
+      : info.model && { ...info.model, variant: overrides.thinkingOptionId };
+    if (!model) throw new Error("Select an OpenCode model before changing its variant");
+    await client.session.switchModel({ sessionID: info.id, model });
+    info.model = model;
+  }
+}
+
+// Agent identity env is applied per session through `session.environment`, so
+// it must not force a dedicated server. Custom MCP is location-scoped, and any
+// other env key belongs to the process, so both need isolation. Mirrors the v1
+// adapter's `requiresDedicatedOpenCodeServer`.
+const V2_SESSION_ENV_KEYS = new Set(["PASEO_AGENT_ID", "PASEO_AGENT_CWD"]);
+
+export function requiresDedicatedV2Server(
+  config: AgentSessionConfig,
+  launch?: AgentLaunchContext,
+): boolean {
+  if (Object.keys(config.mcpServers ?? {}).length > 0) return true;
+  return Object.keys(launch?.env ?? {}).some((key) => !V2_SESSION_ENV_KEYS.has(key));
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/history.ts b/packages/server/src/server/agent/providers/opencode/v2/history.ts
new file mode 100644
index 0000000000..8687ced82d
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/history.ts
@@ -0,0 +1,17 @@
+import type { SessionMessageInfo } from "@opencode/client";
+import type { V2Api } from "./api.js";
+
+export async function messages(client: V2Api, sessionID: string): Promise<SessionMessageInfo[]> {
+  const result: SessionMessageInfo[] = [];
+  let cursor: string | undefined;
+  do {
+    const page = await client.message.list({
+      sessionID,
+      ...(cursor ? { cursor } : { order: "asc" }),
+      limit: 100,
+    });
+    result.push(...page.data);
+    cursor = page.cursor.next ?? undefined;
+  } while (cursor);
+  return result;
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/mapping.test.ts b/packages/server/src/server/agent/providers/opencode/v2/mapping.test.ts
new file mode 100644
index 0000000000..b0286f0160
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/mapping.test.ts
@@ -0,0 +1,50 @@
+import type { AgentInfo, ModelInfo } from "@opencode/client";
+import { expect, test } from "vitest";
+import { modelsFromV2, modesFromV2 } from "./mapping.js";
+
+test("normalizes v2 model capabilities, variants, and visible primary modes", () => {
+  const model: ModelInfo = {
+    id: "model",
+    modelID: "native-model",
+    providerID: "provider",
+    name: "Model",
+    capabilities: { tools: true, input: ["text", "image"], output: ["text"] },
+    variants: [{ id: "high" }],
+    time: { released: 1 },
+    cost: [],
+    status: "active",
+    enabled: true,
+    limit: { context: 200000, output: 10000 },
+  };
+  expect(modelsFromV2([model, { ...model, id: "disabled", enabled: false }])).toEqual([
+    {
+      provider: "opencode",
+      id: "provider/model",
+      label: "Model",
+      contextWindowMaxTokens: 200000,
+      metadata: {
+        providerId: "provider",
+        modelId: "model",
+        supportsAttachments: true,
+        supportsToolCall: true,
+        contextWindowMaxTokens: 200000,
+      },
+      thinkingOptions: [{ id: "high", label: "high" }],
+    },
+  ]);
+  const agent: AgentInfo = {
+    id: "build",
+    name: "Build",
+    mode: "primary",
+    hidden: false,
+    request: { settings: {}, headers: {}, body: {} },
+    permissions: [],
+  };
+  expect(
+    modesFromV2([
+      agent,
+      { ...agent, id: "hidden", hidden: true },
+      { ...agent, id: "child", mode: "subagent" },
+    ]),
+  ).toEqual([{ id: "build", label: "Build", description: undefined }]);
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/mapping.ts b/packages/server/src/server/agent/providers/opencode/v2/mapping.ts
new file mode 100644
index 0000000000..fc37897476
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/mapping.ts
@@ -0,0 +1,47 @@
+import type { AgentInfo, ModelInfo, ModelRef, SessionInfo } from "@opencode/client";
+import type { AgentMode, AgentModelDefinition, AgentUsage } from "../../../agent-sdk-types.js";
+
+export function modelRef(id: string, variant?: string | null): ModelRef {
+  const slash = id.indexOf("/");
+  if (slash < 1 || slash === id.length - 1)
+    throw new Error("OpenCode model must be provider/model");
+  return {
+    providerID: id.slice(0, slash),
+    id: id.slice(slash + 1),
+    ...(variant ? { variant } : {}),
+  };
+}
+
+export function modelsFromV2(models: ModelInfo[]): AgentModelDefinition[] {
+  return models
+    .filter((model) => model.enabled)
+    .map((model) => ({
+      provider: "opencode",
+      id: `${model.providerID}/${model.id}`,
+      label: model.name,
+      contextWindowMaxTokens: model.limit.context,
+      metadata: {
+        providerId: model.providerID,
+        modelId: model.id,
+        supportsAttachments: model.capabilities.input.includes("image"),
+        supportsToolCall: model.capabilities.tools,
+        contextWindowMaxTokens: model.limit.context,
+      },
+      thinkingOptions: model.variants.map((variant) => ({ id: variant.id, label: variant.id })),
+    }));
+}
+
+export function modesFromV2(agents: AgentInfo[]): AgentMode[] {
+  return agents
+    .filter((agent) => !agent.hidden && agent.mode !== "subagent")
+    .map((agent) => ({ id: agent.id, label: agent.name, description: agent.description }));
+}
+
+export function usageFromV2(session: SessionInfo): AgentUsage {
+  return {
+    inputTokens: session.tokens.input,
+    outputTokens: session.tokens.output,
+    cachedInputTokens: session.tokens.cache.read,
+    totalCostUsd: session.cost,
+  };
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts b/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts
new file mode 100644
index 0000000000..50a6d98549
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts
@@ -0,0 +1,193 @@
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../../../test-utils/test-logger.js";
+import type { V2Api } from "./api.js";
+import { OpenCodeV2AgentClient } from "./agent.js";
+import { V2Harness } from "../test-utils/v2-harness.js";
+
+describe("OpenCode v2 questions", () => {
+  test("maps selected labels to native values and parses numeric and boolean answers", async () => {
+    const harness = new V2Harness();
+    harness.api.session.form.list = async () => [
+      {
+        id: "question",
+        sessionID: "session",
+        title: "Preferences",
+        fields: [
+          { key: "color", type: "string", options: [{ label: "Blue", value: "blue-id" }] },
+          {
+            key: "features",
+            type: "multiselect",
+            options: [{ label: "Search", value: "search-id" }],
+          },
+          { key: "count", type: "integer" },
+          { key: "enabled", type: "boolean" },
+        ],
+      },
+    ];
+    const answers: Parameters<V2Api["session"]["form"]["reply"]>[0][] = [];
+    harness.api.session.form.reply = async (input) => {
+      answers.push(input);
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      expect(session.getPendingPermissions()).toHaveLength(1);
+      await session.respondToPermission("question", {
+        behavior: "allow",
+        updatedInput: {
+          answers: {
+            color: "Blue",
+            features: ["Search"],
+            count: "3",
+            enabled: "false",
+          },
+        },
+      });
+      expect(answers).toEqual([
+        {
+          sessionID: "session",
+          formID: "question",
+          answer: {
+            color: "blue-id",
+            features: ["search-id"],
+            count: 3,
+            enabled: false,
+          },
+        },
+      ]);
+      expect(session.getPendingPermissions()).toHaveLength(0);
+    } finally {
+      await session.close();
+    }
+  });
+});
+
+describe("OpenCode v2 question tool", () => {
+  test("shows the question text and accepts a typed answer", async () => {
+    const harness = new V2Harness();
+    harness.api.session.form.list = async () => [
+      {
+        id: "question",
+        sessionID: "session",
+        title: "Questions",
+        fields: [
+          {
+            key: "q0",
+            title: "Next task",
+            description: "What would you like me to work on next?",
+            type: "string",
+            options: [
+              { value: "Explore", label: "Explore", description: "Map the codebase" },
+              { value: "Fix a bug", label: "Fix a bug", description: "Track down a bug" },
+            ],
+            custom: true,
+          },
+        ],
+      },
+    ];
+    const answers: Parameters<V2Api["session"]["form"]["reply"]>[0][] = [];
+    harness.api.session.form.reply = async (input) => {
+      answers.push(input);
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      const [request] = session.getPendingPermissions();
+      expect(request.input).toEqual({
+        questions: [
+          {
+            header: "Next task",
+            question: "What would you like me to work on next?",
+            options: [
+              { value: "Explore", label: "Explore", description: "Map the codebase" },
+              { value: "Fix a bug", label: "Fix a bug", description: "Track down a bug" },
+            ],
+            multiple: false,
+            allowOther: true,
+          },
+        ],
+      });
+      await session.respondToPermission("question", {
+        behavior: "allow",
+        updatedInput: { answers: { "Next task": "Write the release notes" } },
+      });
+      expect(answers).toEqual([
+        {
+          sessionID: "session",
+          formID: "question",
+          answer: { q0: "Write the release notes" },
+        },
+      ]);
+    } finally {
+      await session.close();
+    }
+  });
+});
+
+describe("OpenCode v2 permission routing", () => {
+  test("routes a child approval back to its owning session", async () => {
+    const harness = new V2Harness();
+    const child = { ...harness.info, id: "child", parentID: "session" };
+    harness.api.session.list = async (input) => ({
+      data: input?.parentID === "session" ? [child] : [],
+      cursor: {},
+    });
+    harness.api.permission.list = async (input) =>
+      input.sessionID === "child"
+        ? [{ id: "child-permission", sessionID: "child", action: "shell", resources: ["pwd"] }]
+        : [];
+    const replies: Parameters<V2Api["permission"]["reply"]>[0][] = [];
+    harness.api.permission.reply = async (input) => {
+      replies.push(input);
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      expect(session.getPendingPermissions()).toHaveLength(1);
+      await session.respondToPermission("child-permission", {
+        behavior: "allow",
+        selectedActionId: "once",
+      });
+      expect(replies).toEqual([
+        { sessionID: "child", requestID: "child-permission", decision: "once" },
+      ]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("clears an approval resolved by another native client", async () => {
+    const harness = new V2Harness();
+    harness.api.permission.list = async () => [
+      { id: "approval", sessionID: "session", action: "shell", resources: ["pwd"] },
+    ];
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      expect(session.getPendingPermissions()).toHaveLength(1);
+      harness.api.permission.list = async () => [];
+      harness.push({
+        id: "resolved",
+        created: 2,
+        type: "permission.replied",
+        data: { sessionID: "session", requestID: "approval", reply: "once" },
+      });
+      await expect.poll(() => session.getPendingPermissions()).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/permissions.ts b/packages/server/src/server/agent/providers/opencode/v2/permissions.ts
new file mode 100644
index 0000000000..cc13b99e4b
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/permissions.ts
@@ -0,0 +1,164 @@
+import type { FormInfo, FormValue } from "@opencode/client";
+import type { V2Api } from "./api.js";
+
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  AgentSessionConfig,
+  AgentStreamEvent,
+} from "../../../agent-sdk-types.js";
+
+export class SessionPermissions {
+  private readonly pending = new Map<string, AgentPermissionRequest>();
+  private readonly permissionOwners = new Map<string, string>();
+  private readonly forms = new Map<string, FormInfo>();
+  constructor(
+    private readonly getClient: () => V2Api,
+    private readonly id: string,
+    private readonly config: AgentSessionConfig,
+    private readonly emit: (event: AgentStreamEvent) => void,
+  ) {}
+  observe(event: import("@opencode/client").OpenCodeEvent) {
+    if (event.type === "permission.replied") {
+      this.resolvePending(event.data.requestID, {
+        behavior: event.data.reply === "reject" ? "deny" : "allow",
+      });
+    }
+    if (event.type === "form.replied" || event.type === "form.cancelled") {
+      this.resolvePending(event.data.id, {
+        behavior: event.type === "form.cancelled" ? "deny" : "allow",
+      });
+    }
+  }
+  list() {
+    return [...this.pending.values()];
+  }
+  isOwnedBy(requestId: string, sessionID: string) {
+    return (
+      this.forms.get(requestId)?.sessionID === sessionID ||
+      this.permissionOwners.get(requestId) === sessionID
+    );
+  }
+  async respondToPermission(requestId: string, response: AgentPermissionResponse) {
+    const form = this.forms.get(requestId);
+    if (form) {
+      if (response.behavior === "deny")
+        await this.getClient().session.form.cancel({ sessionID: form.sessionID, formID: form.id });
+      else {
+        const raw = response.updatedInput?.answers;
+        const answer: Record<string, FormValue> = {};
+        if (!raw || typeof raw !== "object" || Array.isArray(raw))
+          throw new Error("OpenCode question response requires answers");
+        for (const field of form.fields) {
+          const value: unknown =
+            Reflect.get(raw, field.key) ?? Reflect.get(raw, field.title ?? field.key);
+          const normalized = formAnswer(field, value);
+          if (normalized !== undefined) answer[field.key] = normalized;
+        }
+        await this.getClient().session.form.reply({
+          sessionID: form.sessionID,
+          formID: form.id,
+          answer,
+        });
+      }
+      this.forms.delete(requestId);
+    } else {
+      await this.getClient().permission.reply({
+        sessionID: this.permissionOwners.get(requestId) ?? this.id,
+        requestID: requestId,
+        decision: permissionReply(response),
+      });
+    }
+    this.resolvePending(requestId, response);
+  }
+  async reconcile(sessionID: string) {
+    const [permissions, forms] = await Promise.all([
+      this.getClient().permission.list({ sessionID }),
+      this.getClient().session.form.list({ sessionID }),
+    ]);
+    for (const request of permissions) {
+      if (this.pending.has(request.id)) continue;
+      const pending: AgentPermissionRequest = {
+        id: request.id,
+        provider: "opencode",
+        kind: "tool",
+        name: request.action,
+        description: request.message ?? request.resources.join("\n"),
+        actions: [
+          { id: "once", label: "Allow once", behavior: "allow" },
+          { id: "always", label: "Always allow", behavior: "allow" },
+          { id: "reject", label: "Deny", behavior: "deny" },
+        ],
+      };
+      this.pending.set(request.id, pending);
+      this.permissionOwners.set(request.id, sessionID);
+      if (!this.config.toolPolicy && this.config.featureValues?.["auto_accept"] === true)
+        await this.respondToPermission(request.id, { behavior: "allow" });
+      else this.emit({ type: "permission_requested", provider: "opencode", request: pending });
+    }
+    for (const form of forms) {
+      if (this.pending.has(form.id)) continue;
+      const pending: AgentPermissionRequest = {
+        id: form.id,
+        provider: "opencode",
+        name: "question",
+        kind: "question",
+        title: form.title,
+        input: {
+          questions: form.fields.map((field) => ({
+            header: field.title ?? field.key,
+            question: field.description ?? field.title ?? field.key,
+            options: "options" in field ? field.options : undefined,
+            multiple: field.type === "multiselect",
+            allowOther: "custom" in field && field.custom === true,
+          })),
+        },
+      };
+      this.forms.set(form.id, form);
+      this.pending.set(form.id, pending);
+      this.emit({ type: "permission_requested", provider: "opencode", request: pending });
+    }
+  }
+  resolvePending(requestId: string, resolution: AgentPermissionResponse) {
+    if (!this.pending.delete(requestId)) return;
+    this.forms.delete(requestId);
+    this.permissionOwners.delete(requestId);
+    this.emit({ type: "permission_resolved", provider: "opencode", requestId, resolution });
+  }
+}
+function permissionReply(response: AgentPermissionResponse): "reject" | "once" | "always" {
+  if (response.behavior === "deny") return "reject";
+  return response.selectedActionId === "always" ? "always" : "once";
+}
+
+function formAnswer(field: FormInfo["fields"][number], value: unknown): FormValue | undefined {
+  if (value === undefined) return undefined;
+  if (field.type === "external") return undefined;
+  const labelValue = (label: string) => {
+    const options = "options" in field ? field.options : undefined;
+    return (
+      options?.find((option) => option.value === label)?.value ??
+      options?.find((option) => option.label === label)?.value ??
+      label
+    );
+  };
+  if (field.type === "multiselect") {
+    if (Array.isArray(value) && value.every((item: unknown) => typeof item === "string"))
+      return value.map(labelValue);
+  } else if (field.type === "string" && typeof value === "string") {
+    return labelValue(value);
+  } else if (field.type === "boolean") {
+    if (typeof value === "boolean") return value;
+    if (value === "true") return true;
+    if (value === "false") return false;
+  } else if (field.type === "number" || field.type === "integer") {
+    const numeric = typeof value === "string" && value.trim() ? Number(value) : value;
+    if (
+      typeof numeric === "number" &&
+      Number.isFinite(numeric) &&
+      (field.type !== "integer" || Number.isInteger(numeric))
+    )
+      return numeric;
+  }
+  throw new Error(`Invalid answer for OpenCode question ${field.key}`);
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/readiness.test.ts b/packages/server/src/server/agent/providers/opencode/v2/readiness.test.ts
new file mode 100644
index 0000000000..0305a40c27
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/readiness.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, test } from "vitest";
+import { OpenCodeLocationReadyTimeoutError, waitForLocationReady } from "./readiness.js";
+
+describe("OpenCode v2 location readiness", () => {
+  test("fails location readiness when the plugin inventory never populates", async () => {
+    await expect(
+      waitForLocationReady({
+        client: { plugin: { list: async () => ({ location: { directory: "/tmp" }, data: [] }) } },
+        location: { directory: "/tmp" },
+        timeoutMs: 25,
+      }),
+    ).rejects.toBeInstanceOf(OpenCodeLocationReadyTimeoutError);
+  });
+
+  test("bounds location readiness even when the inventory request never settles", async () => {
+    await expect(
+      waitForLocationReady({
+        client: { plugin: { list: () => new Promise(() => undefined) } },
+        location: { directory: "/tmp" },
+        timeoutMs: 25,
+      }),
+    ).rejects.toBeInstanceOf(OpenCodeLocationReadyTimeoutError);
+  });
+
+  test("preserves inventory errors instead of reporting a readiness timeout", async () => {
+    const error = new Error("inventory unavailable");
+    await expect(
+      waitForLocationReady({
+        client: {
+          plugin: {
+            list: async () => {
+              throw error;
+            },
+          },
+        },
+        location: { directory: "/tmp" },
+      }),
+    ).rejects.toBe(error);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/readiness.ts b/packages/server/src/server/agent/providers/opencode/v2/readiness.ts
new file mode 100644
index 0000000000..186bbeee1d
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/readiness.ts
@@ -0,0 +1,66 @@
+import { setTimeout as delay } from "node:timers/promises";
+import { raceProviderRefreshAbort } from "../../../provider-refresh-deadline.js";
+import type { V2Api } from "./api.js";
+
+interface ReadinessInput {
+  client: Pick<V2Api, "plugin">;
+  location: { directory: string };
+  signal?: AbortSignal;
+  timeoutMs?: number;
+}
+
+export class OpenCodeLocationReadyTimeoutError extends Error {
+  constructor(
+    readonly directory: string,
+    readonly waitedMs: number,
+  ) {
+    super(`OpenCode location ${directory} did not activate within ${waitedMs}ms`);
+    this.name = "OpenCodeLocationReadyTimeoutError";
+  }
+}
+
+export function waitForLocationReady(input: ReadinessInput): Promise<void> {
+  return waitForPlugins({ ...input, requireBridge: false });
+}
+
+export function awaitPaseoPlugin(input: ReadinessInput): Promise<void> {
+  return waitForPlugins({ ...input, requireBridge: true });
+}
+
+// A cold location exposes an empty inventory before its config plugins register
+// commands and skills. Bound both the inventory request and the polling loop.
+interface PluginReadinessInput extends ReadinessInput {
+  requireBridge: boolean;
+}
+async function waitForPlugins(input: PluginReadinessInput): Promise<void> {
+  const { client, location, signal, requireBridge, timeoutMs = 30_000 } = input;
+  signal?.throwIfAborted();
+  const deadline = AbortSignal.timeout(timeoutMs);
+  const lifetime = signal ? AbortSignal.any([signal, deadline]) : deadline;
+  try {
+    while (true) {
+      const requestTimeout = AbortSignal.timeout(5_000);
+      const requestSignal = AbortSignal.any([lifetime, requestTimeout]);
+      try {
+        const plugins = await raceProviderRefreshAbort(
+          requestSignal,
+          client.plugin.list({ location }, { signal: requestSignal }),
+        );
+        if (!requireBridge && plugins.data.length > 0) return;
+        const bridge = plugins.data.find((plugin) => plugin.id === "paseo");
+        if (requireBridge && bridge?.state.status === "active") return;
+        if (requireBridge && bridge?.state.status === "failed")
+          throw new Error(`OpenCode Paseo tool bridge plugin failed: ${bridge.state.error}`);
+      } catch (error) {
+        lifetime.throwIfAborted();
+        if (!requestTimeout.aborted) throw error;
+      }
+      await delay(50, undefined, { signal: lifetime });
+    }
+  } catch (error) {
+    signal?.throwIfAborted();
+    if (deadline.aborted)
+      throw new OpenCodeLocationReadyTimeoutError(location.directory, timeoutMs);
+    throw error;
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/runtime.ts b/packages/server/src/server/agent/providers/opencode/v2/runtime.ts
new file mode 100644
index 0000000000..cab5544582
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/runtime.ts
@@ -0,0 +1,270 @@
+import { decorateOpenCodeV2Env, materializeOpenCodeV2Plugin } from "../bridge.js";
+import { resolvePaseoHome } from "../../../../paseo-home.js";
+import { OpenCode } from "@opencode/client";
+import type { V2Api } from "./api.js";
+import { randomBytes } from "node:crypto";
+import { mkdir } from "node:fs/promises";
+import type { Logger } from "pino";
+import { spawnProcess } from "../../../../../utils/spawn.js";
+import { terminateWithTreeKill } from "../../../../../utils/tree-kill.js";
+import {
+  createProviderEnvSpec,
+  resolveProviderLaunch,
+  type ProviderRuntimeSettings,
+} from "../../../provider-launch-config.js";
+import type { ManagedProcessRegistry } from "../../../../managed-processes/managed-processes.js";
+import { resolveOpenCodeHomeDir } from "../paths.js";
+import { OpenCodeHttpError } from "../http-error.js";
+import { raceProviderRefreshAbort } from "../../../provider-refresh-deadline.js";
+
+export interface V2Connection {
+  client: V2Api;
+  release(): Promise<void>;
+  retain(): V2Connection;
+  readonly exited: Promise<Error>;
+}
+interface Generation {
+  client: V2Api;
+  users: number;
+  stop(): Promise<void>;
+  exited: Promise<Error>;
+}
+export interface V2RuntimeOptions {
+  logger: Logger;
+  settings?: ProviderRuntimeSettings;
+  managedProcesses?: ManagedProcessRegistry;
+  decorateEnv?: (env: Record<string, string>) => Promise<Record<string, string>>;
+}
+
+export interface V2RuntimeAcquireOptions {
+  fresh?: boolean;
+  dedicated?: boolean;
+  env?: Record<string, string>;
+  signal?: AbortSignal;
+}
+
+// The runtime owns a credential for each subprocess; sessions only receive its authenticated client.
+export class V2Runtime {
+  private current: Promise<Generation> | null = null;
+  private generations = new Set<Generation>();
+  private starts = new Set<Promise<Generation>>();
+  private closed = false;
+
+  constructor(private readonly options: V2RuntimeOptions) {}
+
+  async acquire(input: V2RuntimeAcquireOptions = {}): Promise<V2Connection> {
+    if (this.closed) throw new Error("OpenCode runtime is closed");
+    input.signal?.throwIfAborted();
+    let pending: Promise<Generation>;
+    if (input.env || input.dedicated) {
+      pending = this.startTracked(input.env);
+    } else {
+      if (input.fresh || !this.current) this.current = this.startTracked();
+      pending = this.current;
+    }
+    let generation: Generation;
+    try {
+      generation = await raceProviderRefreshAbort(input.signal, pending);
+    } catch (error) {
+      if (this.current === pending) this.current = null;
+      if (input.signal?.aborted) {
+        void pending
+          .then(async (started) => {
+            if (started.users !== 0) return undefined;
+            this.generations.delete(started);
+            await started.stop();
+            return undefined;
+          })
+          .catch((cleanupError: unknown) => {
+            this.options.logger.warn(
+              { error: String(cleanupError) },
+              "OpenCode canceled startup cleanup failed",
+            );
+          });
+      }
+      throw error;
+    }
+    if (!this.generations.has(generation)) {
+      if (this.current === pending) this.current = null;
+      throw new Error("OpenCode helper server exited");
+    }
+    const connection = this.lease(generation, pending);
+    if (input.signal?.aborted || this.closed) {
+      await connection.release();
+      input.signal?.throwIfAborted();
+      throw new Error("OpenCode runtime is closed");
+    }
+    return connection;
+  }
+
+  private lease(generation: Generation, pending: Promise<Generation>): V2Connection {
+    if (this.closed || !this.generations.has(generation))
+      throw new Error("OpenCode helper server is no longer running");
+    generation.users += 1;
+    let released = false;
+    const release = async () => {
+      if (released) return;
+      released = true;
+      generation.users -= 1;
+      if (generation.users !== 0) return;
+      if (this.current === pending) this.current = null;
+      this.generations.delete(generation);
+      await generation.stop();
+    };
+    return {
+      client: generation.client,
+      release,
+      retain: () => this.lease(generation, pending),
+      exited: generation.exited,
+    };
+  }
+
+  async shutdown(): Promise<void> {
+    this.closed = true;
+    await Promise.allSettled(this.starts);
+    await Promise.all([...this.generations].map((generation) => generation.stop()));
+    this.generations.clear();
+    this.current = null;
+  }
+
+  private startTracked(env?: Record<string, string>): Promise<Generation> {
+    const pending = this.start(env);
+    this.starts.add(pending);
+    void pending.then(
+      (generation) =>
+        generation.exited.then(() => {
+          if (this.current === pending) this.current = null;
+          return undefined;
+        }),
+      () => undefined,
+    );
+    void pending.then(
+      () => this.starts.delete(pending),
+      () => this.starts.delete(pending),
+    );
+    return pending;
+  }
+
+  private async start(env: Record<string, string> = {}): Promise<Generation> {
+    const { settings, managedProcesses, logger } = this.options;
+    const launch = await resolveProviderLaunch({
+      commandConfig: settings?.command,
+      defaultBinary: "opencode",
+    });
+    const cwd = resolveOpenCodeHomeDir();
+    await mkdir(cwd, { recursive: true });
+    const password = randomBytes(32).toString("base64url");
+    const inheritedConfig = globalThis.process.env.OPENCODE_CONFIG_CONTENT;
+    const configured = {
+      ...(inheritedConfig ? { OPENCODE_CONFIG_CONTENT: inheritedConfig } : {}),
+      ...settings?.env,
+      ...env,
+    };
+    const decorated = this.options.decorateEnv
+      ? await this.options.decorateEnv(configured)
+      : decorateOpenCodeV2Env(configured, await materializeOpenCodeV2Plugin(resolvePaseoHome()));
+    const args = [...launch.args, "serve", "--hostname", "127.0.0.1", "--port", "0"];
+    const process = spawnProcess(launch.command, args, {
+      cwd,
+      detached: globalThis.process.platform !== "win32",
+      stdio: ["ignore", "pipe", "pipe"],
+      ...createProviderEnvSpec({
+        runtimeSettings: settings,
+        overlays: [{ ...decorated, OPENCODE_PASSWORD: password }],
+      }),
+    });
+    const processAbort = new AbortController();
+    const exited = new Promise<Error>((resolve) =>
+      process.once("exit", (code) => {
+        const error = new Error(`OpenCode helper server exited (${code})`);
+        processAbort.abort(error);
+        resolve(error);
+      }),
+    );
+    let stopped: Promise<void> | undefined;
+    const record =
+      process.pid && managedProcesses
+        ? managedProcesses
+            .record({
+              owner: { provider: "opencode", kind: "helper-server" },
+              pid: process.pid,
+              command: launch.command,
+              args,
+            })
+            .catch((error: unknown) => {
+              logger.warn({ error }, "Could not record OpenCode helper process");
+              return null;
+            })
+        : Promise.resolve(null);
+    const stop = () => {
+      stopped ??= (async () => {
+        await terminateWithTreeKill(process, { gracefulTimeoutMs: 5_000, forceTimeoutMs: 1_000 });
+        const entry = await record;
+        if (entry) await managedProcesses?.remove(entry.id);
+      })();
+      return stopped;
+    };
+    const deadline = Date.now() + 30_000;
+    try {
+      const url = await new Promise<string>((resolve, reject) => {
+        const timer = setTimeout(
+          () => finish(new Error("OpenCode v2 server startup timed out after 30s")),
+          30_000,
+        );
+        let buffer = "";
+        const finish = (result: string | Error) => {
+          clearTimeout(timer);
+          process.stdout?.off("data", onData);
+          process.off("error", onError);
+          process.off("exit", onExit);
+          if (result instanceof Error) reject(result);
+          else resolve(result);
+        };
+        const onData = (chunk: Buffer) => {
+          buffer = (buffer + chunk.toString()).slice(-8192);
+          const match = buffer.match(/server listening on (http:\/\/127\.0\.0\.1:\d+)(?:\r?\n)/);
+          if (match) finish(match[1]);
+        };
+        const onError = (error: Error) => finish(error);
+        const onExit = (code: number | null) =>
+          finish(new Error(`OpenCode v2 server exited during startup (${code})`));
+        process.stdout?.on("data", onData);
+        process.once("error", onError);
+        process.once("exit", onExit);
+        // Drain stderr without retaining provider output that may contain credentials.
+        process.stderr?.on("data", () => undefined);
+      });
+      const client = OpenCode.make({
+        baseUrl: url,
+        headers: {
+          Authorization: `Basic ${Buffer.from(`opencode:${password}`).toString("base64")}`,
+        },
+        fetch: async (request, init) => {
+          const signal = init?.signal
+            ? AbortSignal.any([init.signal, processAbort.signal])
+            : processAbort.signal;
+          const response = await fetch(request, { ...init, signal });
+          const html = response.headers.get("content-type")?.includes("text/html") ?? false;
+          if (!response.ok || html) {
+            const requestUrl = request instanceof Request ? request.url : String(request);
+            throw new OpenCodeHttpError(new URL(requestUrl).pathname, response.status, html);
+          }
+          return response;
+        },
+      });
+      await client.server.info({ signal: AbortSignal.timeout(Math.max(1, deadline - Date.now())) });
+      const generation: Generation = { client, users: 0, stop, exited };
+      this.generations.add(generation);
+      process.once("exit", () => {
+        this.generations.delete(generation);
+        void stop().catch((error: unknown) =>
+          logger.warn({ error }, "OpenCode process cleanup failed"),
+        );
+      });
+      return generation;
+    } catch (error) {
+      await stop();
+      throw error;
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/session.ts b/packages/server/src/server/agent/providers/opencode/v2/session.ts
new file mode 100644
index 0000000000..5cd45b1ff7
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/session.ts
@@ -0,0 +1,537 @@
+import { SessionChildren } from "./children.js";
+import { SessionTurns } from "./turns.js";
+import { V2Timeline } from "./timeline.js";
+import { waitForLocationReady, awaitPaseoPlugin } from "./readiness.js";
+
+import type { SessionInfo, SessionMessageInfo } from "@opencode/client";
+
+import { setTimeout as delay } from "node:timers/promises";
+import type { Logger } from "pino";
+import type {
+  AgentMode,
+  AgentPermissionResponse,
+  AgentPersistenceHandle,
+  AgentPromptInput,
+  AgentRunOptions,
+  AgentSession,
+  AgentSessionConfig,
+  AgentStreamEvent,
+  SteerActiveTurnOptions,
+  SteerResult,
+} from "../../../agent-sdk-types.js";
+
+import { toDiagnosticErrorMessage } from "../../diagnostic-utils.js";
+
+import { runProviderTurn } from "../../provider-runner.js";
+
+import { composeSystemPromptParts } from "../../../system-prompt.js";
+import { raceProviderRefreshAbort } from "../../../provider-refresh-deadline.js";
+
+import { type V2Connection } from "./runtime.js";
+import { modelRef, modesFromV2 } from "./mapping.js";
+
+import { V2_CAPABILITIES } from "./capabilities.js";
+import { features } from "./configuration.js";
+import { commands } from "./commands.js";
+import { messages } from "./history.js";
+import { SessionPermissions } from "./permissions.js";
+import { SessionUsage } from "./usage.js";
+
+export class OpenCodeV2Session implements AgentSession {
+  readonly provider = "opencode";
+  readonly capabilities = V2_CAPABILITIES;
+  private readonly listeners = new Set<(event: AgentStreamEvent) => void>();
+  private readonly timeline = new V2Timeline();
+  private readonly abort = new AbortController();
+  private readonly permissions: SessionPermissions;
+  private readonly turns: SessionTurns;
+  private readonly children: SessionChildren;
+  private readonly usage: SessionUsage;
+  private stream: Promise<void> | null = null;
+  private streamAbort = new AbortController();
+  private exited = false;
+  private reconnecting: Promise<void> | null = null;
+  private launchEnv: Record<string, string> | undefined;
+  private sync: Promise<void> = Promise.resolve();
+  private dirty = false;
+  private refreshTimer: ReturnType<typeof setTimeout> | null = null;
+  private closed = false;
+  private history: SessionMessageInfo[] = [];
+  private modes: AgentMode[] = [];
+  constructor(
+    private connection: V2Connection,
+    private info: SessionInfo,
+    private readonly config: AgentSessionConfig,
+    private readonly logger: Logger,
+    private readonly persist: boolean,
+    private readonly requiresPaseoPlugin: boolean,
+    private readonly unbind?: () => void,
+    bindChild?: (id: string) => void,
+    private readonly acquire?: () => Promise<V2Connection>,
+    private readonly moved?: (connection: V2Connection) => void,
+  ) {
+    this.permissions = new SessionPermissions(
+      () => this.client,
+      info.id,
+      config,
+      (event) => this.emit(event),
+    );
+    this.children = new SessionChildren({
+      client: () => this.client,
+      id: info.id,
+      emit: (event) => this.emit(event),
+      reconcilePermissions: (id) => this.permissions.reconcile(id),
+      bindChild,
+    });
+    this.turns = new SessionTurns({
+      client: () => this.client,
+      id: info.id,
+      cwd: config.cwd,
+      signal: this.abort.signal,
+      emit: (event) => this.emit(event),
+      reconcile: async () => {
+        await this.reconcile();
+        return { info: this.info, history: this.history };
+      },
+      reportReconciliationError: (error) =>
+        this.logger.warn(
+          { error: toDiagnosticErrorMessage(error) },
+          "OpenCode turn reconciliation failed; retrying",
+        ),
+      clearPermissions: async () => {
+        for (const request of this.permissions.list())
+          await this.permissions.respondToPermission(request.id, { behavior: "deny" });
+      },
+    });
+    this.usage = new SessionUsage({
+      client: () => this.client,
+      cwd: config.cwd,
+      info: () => this.info,
+      emit: (event) => this.emit(event),
+      reportError: (error) =>
+        this.logger.warn(
+          { error: toDiagnosticErrorMessage(error) },
+          "OpenCode context usage update failed",
+        ),
+    });
+  }
+  get id() {
+    return this.info.id;
+  }
+  get features() {
+    return features(this.config);
+  }
+  private get client() {
+    return this.connection.client;
+  }
+  async initialize(environment?: Record<string, string>) {
+    // OpenCode replaces the whole local shell environment, rather than overlaying it.
+    this.launchEnv = environment;
+    this.watchExit(this.connection);
+    await this.configureConnection();
+    const location = { directory: this.config.cwd };
+    this.modes = modesFromV2((await this.client.agent.list({ location })).data);
+    this.timeline.messages(await messages(this.client, this.id));
+    await this.startStream();
+    await this.children.reconcile(this.id);
+  }
+  private watchExit(connection: V2Connection) {
+    void connection.exited.then((error) => {
+      if (this.closed || this.connection !== connection) return undefined;
+      this.exited = true;
+      this.streamAbort.abort(error);
+      this.turns.fail(error);
+      return undefined;
+    });
+  }
+  private async configureConnection() {
+    const location = { directory: this.config.cwd };
+    await waitForLocationReady({ client: this.client, location, signal: this.abort.signal });
+    if (this.requiresPaseoPlugin)
+      await awaitPaseoPlugin({ client: this.client, location, signal: this.abort.signal });
+    for (const [server, config] of Object.entries(this.config.mcpServers ?? {})) {
+      await this.client.mcp.add({
+        server,
+        location,
+        config:
+          config.type === "stdio"
+            ? {
+                type: "local",
+                command: [config.command, ...(config.args ?? [])],
+                environment: config.env,
+                codemode: false,
+              }
+            : {
+                type: "remote",
+                url: config.url,
+                headers: config.headers,
+                oauth: false,
+                codemode: false,
+              },
+      });
+      await this.awaitMcp(server);
+    }
+    const system = composeSystemPromptParts(
+      this.config.systemPrompt,
+      this.config.daemonAppendSystemPrompt,
+    );
+    if (system)
+      await this.client.session.instructions.entry.put({
+        sessionID: this.id,
+        key: "paseo",
+        value: system,
+      });
+  }
+  private async startStream() {
+    let ready!: () => void;
+    let fail!: (error: unknown) => void;
+    const first = new Promise<void>((resolve, reject) => {
+      ready = resolve;
+      fail = reject;
+    });
+    this.stream = this.consume(ready, fail);
+    await raceProviderRefreshAbort(
+      AbortSignal.any([this.abort.signal, AbortSignal.timeout(30_000)]),
+      first,
+    );
+  }
+  private async reconnectIfExited() {
+    if (this.closed) throw new Error("OpenCode session is closed");
+    if (!this.exited) return;
+    this.reconnecting ??= this.reconnect().finally(() => {
+      this.reconnecting = null;
+    });
+    await this.reconnecting;
+  }
+  private async reconnect() {
+    if (!this.acquire) throw new Error("OpenCode helper server exited");
+    await this.stream;
+    await this.sync.catch(() => undefined);
+    const next = await this.acquire();
+    if (this.closed) {
+      await next.release();
+      throw new Error("OpenCode session is closed");
+    }
+    const old = this.connection;
+    this.connection = next;
+    this.streamAbort = new AbortController();
+    this.exited = false;
+    this.watchExit(next);
+    try {
+      await this.configureConnection();
+      await this.startStream();
+    } catch (error) {
+      this.connection = old;
+      this.exited = true;
+      this.streamAbort.abort();
+      await next.release();
+      throw error;
+    }
+    this.moved?.(next);
+    await old.release();
+  }
+  subscribe(callback: (event: AgentStreamEvent) => void) {
+    this.listeners.add(callback);
+    return () => {
+      this.listeners.delete(callback);
+    };
+  }
+  private async awaitMcp(server: string) {
+    const signal = AbortSignal.any([this.abort.signal, AbortSignal.timeout(30_000)]);
+    while (true) {
+      const catalog = await this.client.mcp.list(
+        { location: { directory: this.config.cwd } },
+        { signal },
+      );
+      const entry = catalog.data.find((item) => item.name === server);
+      if (entry?.status.status === "connected") return;
+      if (entry && entry.status.status !== "pending") {
+        const reason = entry.status.status === "failed" ? entry.status.error : entry.status.status;
+        throw new Error(`OpenCode MCP server ${server} failed to connect: ${reason}`);
+      }
+      await delay(50, undefined, { signal });
+    }
+  }
+  private emit(event: AgentStreamEvent) {
+    for (const listener of this.listeners) listener(event);
+  }
+  private emitTimeline(event: AgentStreamEvent) {
+    this.emit({ ...event, ...(this.turns.id ? { turnId: this.turns.id } : {}) });
+  }
+  async *streamHistory() {
+    await this.reconnectIfExited();
+    const history = new V2Timeline(false);
+    yield* history.messages(await messages(this.client, this.id));
+  }
+  async getRuntimeInfo() {
+    await this.reconnectIfExited();
+    this.info = await this.client.session.get({ sessionID: this.id });
+    return {
+      provider: "opencode",
+      sessionId: this.id,
+      model: this.info.model ? `${this.info.model.providerID}/${this.info.model.id}` : null,
+      modeId: this.info.agent ?? null,
+      thinkingOptionId: this.info.model?.variant ?? null,
+    };
+  }
+  async getAvailableModes() {
+    return this.modes;
+  }
+  async getCurrentMode() {
+    return this.info.agent ?? null;
+  }
+  async setMode(modeId: string) {
+    await this.reconnectIfExited();
+    await this.client.session.switchAgent({ sessionID: this.id, agent: modeId });
+    this.info.agent = modeId;
+    this.config.modeId = modeId;
+    this.emit({
+      type: "mode_changed",
+      provider: "opencode",
+      currentModeId: modeId,
+      availableModes: this.modes,
+    });
+  }
+  async setModel(model: string | null) {
+    await this.reconnectIfExited();
+    const location = { directory: this.config.cwd };
+    const selected = model ? modelRef(model) : (await this.client.model.default({ location })).data;
+    if (!selected) throw new Error("OpenCode has no default model");
+    const catalog = await this.client.model.list({ location });
+    const target = catalog.data.find(
+      (entry) =>
+        entry.enabled && entry.providerID === selected.providerID && entry.id === selected.id,
+    );
+    if (!target)
+      throw new Error(`OpenCode model unavailable: ${selected.providerID}/${selected.id}`);
+    const retainedVariant = this.config.thinkingOptionId;
+    const variant =
+      retainedVariant !== "default" && target.variants.some((entry) => entry.id === retainedVariant)
+        ? retainedVariant
+        : undefined;
+    const nextModel = {
+      id: selected.id,
+      providerID: selected.providerID,
+      ...(variant ? { variant } : {}),
+    };
+    await this.client.session.switchModel({ sessionID: this.id, model: nextModel });
+    this.info.model = nextModel;
+    this.config.model = model ?? undefined;
+    this.config.thinkingOptionId = variant;
+    this.emit({
+      type: "thinking_option_changed",
+      provider: "opencode",
+      thinkingOptionId: variant ?? null,
+    });
+    this.emit({
+      type: "model_changed",
+      provider: "opencode",
+      runtimeInfo: {
+        provider: "opencode",
+        sessionId: this.id,
+        model: `${selected.providerID}/${selected.id}`,
+        modeId: this.info.agent ?? null,
+        thinkingOptionId: variant ?? null,
+      },
+    });
+  }
+
+  async setThinkingOption(variant: string | null) {
+    await this.reconnectIfExited();
+    const model = this.info.model;
+    if (!model) throw new Error("Select an OpenCode model before changing its variant");
+    await this.client.session.switchModel({
+      sessionID: this.id,
+      model: { id: model.id, providerID: model.providerID, ...(variant ? { variant } : {}) },
+    });
+    this.config.thinkingOptionId = variant ?? undefined;
+    this.info = await this.client.session.get({ sessionID: this.id });
+    this.emit({ type: "thinking_option_changed", provider: "opencode", thinkingOptionId: variant });
+  }
+  async setFeature(id: string, value: unknown) {
+    if (id !== "auto_accept" || typeof value !== "boolean")
+      throw new Error("Unknown OpenCode feature");
+    this.config.featureValues = { ...this.config.featureValues, [id]: value };
+    if (value && !this.config.toolPolicy)
+      for (const request of this.permissions.list())
+        if (request.kind !== "question")
+          await this.respondToPermission(request.id, { behavior: "allow" });
+  }
+  async listCommands() {
+    await this.reconnectIfExited();
+    return commands(this.client, this.config.cwd);
+  }
+  describePersistence(): AgentPersistenceHandle {
+    return {
+      provider: "opencode",
+      sessionId: this.id,
+      nativeHandle: this.id,
+      metadata: { ...this.config },
+    };
+  }
+  run(prompt: AgentPromptInput, options?: AgentRunOptions) {
+    return runProviderTurn({
+      prompt,
+      runOptions: options,
+      startTurn: this.startTurn.bind(this),
+      subscribe: this.subscribe.bind(this),
+      getSessionId: () => this.id,
+      reduceFinalText: ({ current, item }) =>
+        item.type === "assistant_message" ? current + item.text : current,
+    });
+  }
+  async startTurn(prompt: AgentPromptInput, options?: AgentRunOptions) {
+    await this.reconnectIfExited();
+    return this.turns.startTurn(prompt, options);
+  }
+  steerActiveTurn(prompt: AgentPromptInput, options: SteerActiveTurnOptions): Promise<SteerResult> {
+    return this.turns.steerActiveTurn(prompt, options);
+  }
+  interrupt() {
+    return this.turns.interrupt();
+  }
+  async revertBoth(input: { messageId: string }) {
+    await this.interrupt();
+    await this.reconnectIfExited();
+    await this.client.session.revert.stage({
+      sessionID: this.id,
+      messageID: input.messageId,
+      files: true,
+    });
+    await this.client.session.revert.commit({ sessionID: this.id });
+  }
+  getPendingPermissions() {
+    return [...this.permissions.list()];
+  }
+  async respondToPermission(requestId: string, response: AgentPermissionResponse) {
+    await this.reconnectIfExited();
+    const deniesOwnRequest =
+      response.behavior === "deny" && this.permissions.isOwnedBy(requestId, this.id);
+    await this.permissions.respondToPermission(requestId, response);
+    if (deniesOwnRequest) this.turns.requestDenied();
+  }
+  private async reconcileSnapshot() {
+    const [info, history] = await Promise.all([
+      this.client.session.get({ sessionID: this.id }),
+      messages(this.client, this.id),
+    ]);
+    this.info = info;
+    this.history = history;
+    for (const event of this.timeline.messages(history)) this.emitTimeline(event);
+    await this.permissions.reconcile(this.id);
+  }
+  private async reconcile() {
+    this.dirty = true;
+    this.sync = this.sync.catch(() => undefined).then(() => this.drainReconciliation());
+    return this.sync;
+  }
+  private async drainReconciliation() {
+    while (this.dirty && !this.closed) {
+      this.dirty = false;
+      await this.reconcileSnapshot();
+    }
+  }
+  private async reconcileConnection() {
+    // Session environments are process-local. Reapply this agent's snapshot before
+    // reconciling a new connection, including event-stream reconnections.
+    if (this.launchEnv)
+      await this.client.session.environment({ sessionID: this.id, variables: this.launchEnv });
+    await this.reconcile();
+    await this.children.reconcile(this.id);
+    await this.turns.reconcile();
+  }
+  private scheduleReconcile() {
+    if (this.refreshTimer || this.closed) return;
+    this.refreshTimer = setTimeout(() => {
+      this.refreshTimer = null;
+      void this.reconcile().catch((error: unknown) =>
+        this.logger.warn(
+          { error: toDiagnosticErrorMessage(error) },
+          "OpenCode reconciliation failed",
+        ),
+      );
+    }, 25);
+  }
+  private observeOwnEvent(event: import("@opencode/client").OpenCodeEvent) {
+    if (event.type === "form.created" && event.data.form.sessionID === this.id) {
+      this.scheduleReconcile();
+      return;
+    }
+    if (!("sessionID" in event.data) || event.data.sessionID !== this.id) return;
+    if (event.type === "session.text.started" || event.type === "session.reasoning.started") {
+      if (event.type === "session.text.started" && this.turns.hasStructuredOutput) return;
+      this.timeline.startPart({
+        ...event.data,
+        type: event.type === "session.text.started" ? "text" : "reasoning",
+      });
+      return;
+    }
+    if (event.type === "session.text.delta" || event.type === "session.reasoning.delta") {
+      const isText = event.type === "session.text.delta";
+      // A structured-output turn supplies its answer through a tool, so streamed
+      // prose is not part of the result and must not reach the timeline.
+      if (isText && this.turns.hasStructuredOutput) return;
+      const streamed = this.timeline.delta({
+        assistantMessageID: event.data.assistantMessageID,
+        ordinal: event.data.ordinal,
+        delta: event.data.delta,
+        type: isText ? "text" : "reasoning",
+      });
+      if (streamed) this.emitTimeline(streamed);
+      return;
+    }
+    this.permissions.observe(event);
+    this.usage.observe(event);
+    this.turns.observe(event);
+    this.scheduleReconcile();
+  }
+  private async consume(ready: () => void, fail: (error: unknown) => void) {
+    const signal = AbortSignal.any([this.abort.signal, this.streamAbort.signal]);
+    let connected = false;
+    while (!this.closed && !signal.aborted) {
+      try {
+        for await (const event of this.client.event.subscribe({ signal })) {
+          if (this.closed || signal.aborted) return;
+          if (event.type === "server.connected") {
+            this.timeline.resetStreams();
+            await this.reconcileConnection();
+            connected = true;
+            ready();
+          }
+          await this.children.observe(event);
+          this.observeOwnEvent(event);
+        }
+        if (!connected) throw new Error("OpenCode event stream ended before connecting");
+      } catch (error) {
+        if (this.closed || signal.aborted) return;
+        if (!connected) {
+          fail(error);
+          return;
+        }
+        this.logger.warn(
+          { error: toDiagnosticErrorMessage(error) },
+          "OpenCode event stream interrupted; reconciling on reconnect",
+        );
+      }
+      await delay(100, undefined, { signal }).catch(() => undefined);
+    }
+  }
+  async close() {
+    if (this.closed) return;
+    this.closed = true;
+    this.abort.abort();
+    this.turns.close();
+    this.streamAbort.abort();
+    if (this.refreshTimer) clearTimeout(this.refreshTimer);
+    await this.stream;
+    await this.reconnecting?.catch(() => undefined);
+    await this.sync.catch(() => undefined);
+    this.unbind?.();
+    try {
+      if (!this.persist) await this.client.session.remove({ sessionID: this.id });
+    } finally {
+      await this.connection.release();
+    }
+    this.listeners.clear();
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/streaming.test.ts b/packages/server/src/server/agent/providers/opencode/v2/streaming.test.ts
new file mode 100644
index 0000000000..aa74faa6cf
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/streaming.test.ts
@@ -0,0 +1,205 @@
+import { V2Timeline } from "./timeline.js";
+import type { SessionMessageAssistant } from "@opencode/client";
+import { describe, expect, test } from "vitest";
+import { OpenCodeV2AgentClient } from "./agent.js";
+import { V2Harness } from "../test-utils/v2-harness.js";
+import { createTestLogger } from "../../../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+
+function collectAssistantText(session: {
+  subscribe: (cb: (e: AgentStreamEvent) => void) => () => void;
+}) {
+  const chunks: string[] = [];
+  session.subscribe((event) => {
+    if (event.type === "timeline" && event.item.type === "assistant_message")
+      chunks.push(event.item.text);
+  });
+  return chunks;
+}
+
+function assistant(content: SessionMessageAssistant["content"]): SessionMessageAssistant {
+  return {
+    id: "answer",
+    type: "assistant",
+    agent: "build",
+    model: { providerID: "test", id: "model" },
+    time: { created: 2 },
+    content,
+  };
+}
+
+describe("OpenCode v2 token streaming", () => {
+  test("emits text and reasoning deltas as they arrive", async () => {
+    const harness = new V2Harness();
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const text = collectAssistantText(session);
+    const reasoning: string[] = [];
+    session.subscribe((event) => {
+      if (event.type === "timeline" && event.item.type === "reasoning")
+        reasoning.push(event.item.text);
+    });
+    try {
+      harness.push({
+        id: "rs",
+        created: 2,
+        type: "session.reasoning.started",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0 },
+      });
+      harness.push({
+        id: "r1",
+        created: 3,
+        type: "session.reasoning.delta",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0, delta: "think" },
+      });
+      harness.push({
+        id: "ts",
+        created: 2,
+        type: "session.text.started",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0 },
+      });
+      harness.push({
+        id: "t1",
+        created: 4,
+        type: "session.text.delta",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0, delta: "Hel" },
+      });
+      harness.push({
+        id: "t2",
+        created: 5,
+        type: "session.text.delta",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0, delta: "lo" },
+      });
+      await expect.poll(() => text).toEqual(["Hel", "lo"]);
+      expect(reasoning).toEqual(["think"]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("deduplicates snapshots before and after deltas using per-type ordinals", () => {
+    const timeline = new V2Timeline();
+    const text = { assistantMessageID: "answer", type: "text", ordinal: 0 } as const;
+    const reasoning = { ...text, type: "reasoning" } as const;
+    timeline.startPart(text);
+    timeline.startPart(reasoning);
+    expect(timeline.delta({ ...text, delta: "Hel" })).toMatchObject({ item: { text: "Hel" } });
+    expect(timeline.delta({ ...reasoning, delta: "think" })).toMatchObject({
+      item: { text: "think" },
+    });
+    const snapshot = assistant([
+      {
+        type: "reasoning",
+        text: "think",
+        state: { reasoningField: "reasoning_content" },
+        time: { created: 2, completed: 2 },
+      },
+      { type: "text", text: "Hello" },
+    ]);
+    expect(timeline.messages([snapshot])).toMatchObject([{ item: { text: "lo" } }]);
+    expect(timeline.delta({ ...text, delta: "lo" })).toBeNull();
+    expect(timeline.messages([snapshot])).toEqual([]);
+    expect(timeline.delta({ ...text, delta: "!" })).toMatchObject({ item: { text: "!" } });
+    expect(timeline.messages([snapshot])).toEqual([]);
+  });
+
+  test("recovers missed fragments from snapshots after reconnect", () => {
+    const timeline = new V2Timeline();
+    const part = { assistantMessageID: "answer", type: "text", ordinal: 0 } as const;
+    timeline.startPart(part);
+    expect(timeline.delta({ ...part, delta: "Hel" })).toMatchObject({ item: { text: "Hel" } });
+    timeline.resetStreams();
+    expect(timeline.delta({ ...part, delta: "!" })).toBeNull();
+    expect(timeline.messages([assistant([{ type: "text", text: "Hello!" }])])).toMatchObject([
+      { item: { text: "lo!" } },
+    ]);
+    expect(timeline.messages([assistant([{ type: "text", text: "Hello!" }])])).toEqual([]);
+  });
+
+  test("withholds streamed prose during a structured-output turn", async () => {
+    const harness = new V2Harness();
+    harness.autoComplete = false;
+    const settle = () => harness.finishExecution();
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    const text = collectAssistantText(session);
+    const reasoning: string[] = [];
+    session.subscribe((event) => {
+      if (event.type === "timeline" && event.item.type === "reasoning")
+        reasoning.push(event.item.text);
+    });
+    const failures: AgentStreamEvent[] = [];
+    session.subscribe((event) => {
+      if (event.type === "turn_failed") failures.push(event);
+    });
+    try {
+      await session.startTurn("answer", {
+        outputSchema: { type: "object", properties: { answer: { type: "integer" } } },
+      });
+      await expect.poll(() => harness.prompts).toEqual(["answer"]);
+      harness.push({
+        id: "ts",
+        created: 2,
+        type: "session.text.started",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0 },
+      });
+      harness.push({
+        id: "t1",
+        created: 3,
+        type: "session.text.delta",
+        data: {
+          sessionID: "session",
+          assistantMessageID: "answer",
+          ordinal: 0,
+          delta: "ignore me",
+        },
+      });
+      // A following reasoning delta is still delivered, so its arrival proves
+      // the text delta was seen and suppressed rather than merely not yet read.
+      harness.push({
+        id: "rs",
+        created: 2,
+        type: "session.reasoning.started",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0 },
+      });
+      harness.push({
+        id: "r1",
+        created: 4,
+        type: "session.reasoning.delta",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0, delta: "thought" },
+      });
+      await expect.poll(() => reasoning).toEqual(["thought"]);
+      expect(text).toEqual([]);
+      // A late delta after the structured turn failed must remain suppressed.
+      settle();
+      await expect.poll(() => failures.length).toBe(1);
+      harness.push({
+        id: "late",
+        created: 5,
+        type: "session.text.delta",
+        data: {
+          sessionID: "session",
+          assistantMessageID: "answer",
+          ordinal: 0,
+          delta: "still hidden",
+        },
+      });
+      harness.push({
+        id: "r2",
+        created: 6,
+        type: "session.reasoning.delta",
+        data: { sessionID: "session", assistantMessageID: "answer", ordinal: 0, delta: "done" },
+      });
+      await expect.poll(() => reasoning).toEqual(["thought", "done"]);
+      expect(text).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/structured-output-plugin.mjs b/packages/server/src/server/agent/providers/opencode/v2/structured-output-plugin.mjs
new file mode 100644
index 0000000000..adb306e558
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/structured-output-plugin.mjs
@@ -0,0 +1,60 @@
+import Ajv from "ajv";
+
+export const STRUCTURED_OUTPUT_TOOL = "paseo_structured_output";
+
+export async function registerStructuredOutput(context) {
+  const ajv = new Ajv({ strict: false, allErrors: true });
+  async function schemaFor(sessionID) {
+    const history = await context.session.context({ sessionID });
+    const prompt = history.findLast((message) => message.type === "user");
+    return prompt?.metadata?.paseoOutputSchema;
+  }
+  const tools = await context.tool.transform((editor) => {
+    editor.add({
+      name: STRUCTURED_OUTPUT_TOOL,
+      description: "Submit the final answer in the required structured format.",
+      input: {
+        type: "object",
+        properties: { value: {} },
+        required: ["value"],
+        additionalProperties: false,
+      },
+      options: { codemode: false },
+      async execute(input, call) {
+        const schema = await schemaFor(call.sessionID);
+        if (schema === undefined) throw new Error("This turn has no structured-output request");
+        const validate = ajv.compile(schema);
+        if (!validate(input.value))
+          throw new Error(`Invalid structured output: ${ajv.errorsText(validate.errors)}`);
+        return {
+          content:
+            "Final structured answer accepted. End this turn without additional text or tool calls.",
+          metadata: { paseoStructuredOutput: input.value },
+        };
+      },
+    });
+  });
+  const hook = await context.session.hook("context", async (input) => {
+    const schema = await schemaFor(input.sessionID);
+    if (schema === undefined) {
+      delete input.tools[STRUCTURED_OUTPUT_TOOL];
+      return;
+    }
+    const tool = input.tools[STRUCTURED_OUTPUT_TOOL];
+    if (!tool) throw new Error("Structured-output tool is unavailable");
+    tool.input = {
+      type: "object",
+      properties: { value: schema },
+      required: ["value"],
+      additionalProperties: false,
+    };
+    input.system.push({
+      type: "text",
+      text: `Complete the user's task, then submit the final answer using ${STRUCTURED_OUTPUT_TOOL}. Its value must satisfy the tool schema. Do not finish with an ordinary text answer. After the tool accepts the value, end the turn without additional text or tool calls.`,
+    });
+  });
+  return async () => {
+    await hook.dispose();
+    await tools.dispose();
+  };
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/structured-output.ts b/packages/server/src/server/agent/providers/opencode/v2/structured-output.ts
new file mode 100644
index 0000000000..dd9472acf2
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/structured-output.ts
@@ -0,0 +1,36 @@
+import { Ajv } from "ajv";
+import { z } from "zod";
+import type { SessionMessageInfo } from "@opencode/client";
+
+export const STRUCTURED_OUTPUT_TOOL = "paseo_structured_output";
+const schemas = new Ajv({ strict: false, allErrors: true });
+
+export function structuredOutput(input: unknown) {
+  const schema = z.union([z.boolean(), z.record(z.string(), z.json())]).parse(input);
+  const validate = schemas.compile(schema);
+  return {
+    schema,
+    assert(history: SessionMessageInfo[]) {
+      const start = history.findLastIndex((message) => message.type === "user");
+      for (const message of history.slice(start + 1)) {
+        if (message.type !== "assistant") continue;
+        for (const part of message.content) {
+          if (
+            part.type !== "tool" ||
+            part.name !== STRUCTURED_OUTPUT_TOOL ||
+            part.state.status !== "completed"
+          )
+            continue;
+          const result = part.state.metadata?.paseoStructuredOutput;
+          if (result === undefined) continue;
+          if (!validate(result))
+            throw new Error(
+              `Invalid OpenCode structured output: ${schemas.errorsText(validate.errors)}`,
+            );
+          return;
+        }
+      }
+      throw new Error("OpenCode finished without submitting the required structured output");
+    },
+  };
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
new file mode 100644
index 0000000000..9189f5d3c5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
@@ -0,0 +1,97 @@
+import type { SessionMessageAssistant } from "@opencode/client";
+import { expect, test } from "vitest";
+import { V2Timeline } from "./timeline.js";
+
+function assistant(content: SessionMessageAssistant["content"]): SessionMessageAssistant {
+  return {
+    id: "answer",
+    type: "assistant",
+    agent: "build",
+    model: { providerID: "test", id: "model" },
+    time: { created: 2 },
+    content,
+  };
+}
+
+test("a completed edit carries the replaced and replacement text", () => {
+  // Captured from OpenCode 2.0.18, whose edit tool takes `path` instead of `filePath`.
+  const edit = assistant([
+    {
+      type: "tool",
+      id: "call-edit",
+      name: "edit",
+      executed: false,
+      state: {
+        status: "completed",
+        input: { path: "a.txt", oldString: "beta", newString: "BETA" },
+        content: [{ type: "text", text: "Edited a.txt (1 replacement)" }],
+        metadata: {
+          files: [
+            {
+              file: "a.txt",
+              patch:
+                "Index: a.txt\n===================================================================\n--- a.txt\n+++ a.txt\n@@ -1,3 +1,3 @@\n alpha\n-beta\n+BETA\n gamma\n",
+              status: "modified",
+              additions: 1,
+              deletions: 1,
+            },
+          ],
+          truncated: false,
+        },
+      },
+      time: { created: 2, ran: 2, completed: 2 },
+    },
+  ]);
+
+  expect(new V2Timeline().messages([edit])).toMatchObject([
+    {
+      item: {
+        type: "tool_call",
+        name: "edit",
+        status: "completed",
+        detail: { type: "edit", filePath: "a.txt", oldString: "beta", newString: "BETA" },
+      },
+    },
+  ]);
+});
+
+test("a tool's image output is shown as an image, not as base64 in the tool output", () => {
+  const png =
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==";
+  const screenshot = assistant([
+    {
+      type: "tool",
+      id: "call-screenshot",
+      name: "paseo_browser_screenshot",
+      executed: false,
+      state: {
+        status: "completed",
+        input: {},
+        content: [
+          { type: "text", text: "Captured browser screenshot (1x1)." },
+          { type: "file", uri: `data:image/png;base64,${png}`, mime: "image/png" },
+        ],
+        metadata: {},
+      },
+      time: { created: 2, ran: 2, completed: 2 },
+    },
+  ]);
+  const timeline = new V2Timeline();
+
+  const events = timeline.messages([screenshot]);
+
+  expect(JSON.stringify(events)).not.toContain(png);
+  expect(events.map((event) => event.type === "timeline" && event.item)).toMatchObject([
+    {
+      type: "tool_call",
+      name: "paseo_browser_screenshot",
+      status: "completed",
+      detail: { output: "Captured browser screenshot (1x1).\n[image]" },
+    },
+    {
+      type: "assistant_message",
+      text: expect.stringMatching(/^!\[Image\]\(file:\/\/.*paseo-attachments.*\.png\)$/),
+    },
+  ]);
+  expect(timeline.messages([screenshot])).toEqual([]);
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
new file mode 100644
index 0000000000..c58316df9e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
@@ -0,0 +1,238 @@
+import { mapOpencodeToolCall } from "../tool-call-mapper.js";
+import {
+  materializeProviderImage,
+  renderProviderImageOutputAsAssistantMarkdown,
+} from "../../provider-image-output.js";
+import type { SessionMessageAssistantTool } from "@opencode/client";
+import { STRUCTURED_OUTPUT_TOOL } from "./structured-output.js";
+import type { SessionMessageInfo } from "@opencode/client";
+import type { AgentStreamEvent, AgentTimelineItem } from "../../../agent-sdk-types.js";
+
+function textPartKey(messageID: string, part: "text" | "reasoning", ordinal: number): string {
+  return `${messageID}:${part}:${ordinal}`;
+}
+
+// Text and reasoning each number parts from zero, independent of snapshot position.
+export class V2Timeline {
+  private readonly content = new Map<string, string>();
+  private readonly streams = new Map<string, string>();
+
+  resetStreams() {
+    this.streams.clear();
+  }
+
+  startPart(part: TextPartIdentity) {
+    this.streams.set(textPartKey(part.assistantMessageID, part.type, part.ordinal), "");
+  }
+
+  constructor(private readonly includeClientMessageId = true) {}
+
+  delta(event: TextPartDelta): AgentStreamEvent | null {
+    const key = textPartKey(event.assistantMessageID, event.type, event.ordinal);
+    const streamed = this.streams.get(key);
+    // Deltas are ephemeral and have no offset. After reconnect, only stream
+    // parts whose start we observed; snapshots recover any interrupted part.
+    if (streamed === undefined || event.delta.length === 0) return null;
+    const text = streamed + event.delta;
+    this.streams.set(key, text);
+    const emitted = this.content.get(key) ?? "";
+    if (text.length <= emitted.length) return null;
+    if (!text.startsWith(emitted))
+      throw new Error("OpenCode changed previously emitted message content");
+    this.content.set(key, text);
+    const suffix = text.slice(emitted.length);
+    const item: AgentTimelineItem =
+      event.type === "text"
+        ? { type: "assistant_message", text: suffix, messageId: event.assistantMessageID }
+        : { type: "reasoning", text: suffix };
+    return { type: "timeline", provider: "opencode", item, timestamp: new Date().toISOString() };
+  }
+
+  messages(messages: SessionMessageInfo[]): AgentStreamEvent[] {
+    const events: AgentStreamEvent[] = [];
+    const state: TimelineState = { structured: false, accepted: false };
+    for (const message of messages) {
+      const timestamp = new Date(message.time.created).toISOString();
+      const push = (item: AgentTimelineItem) =>
+        events.push({ type: "timeline", provider: "opencode", item, timestamp });
+      if (message.type === "user") this.userMessage(message, state, push);
+      else if (message.type === "assistant") this.assistantMessage(message, state, push);
+      else if (message.type === "compaction") this.compactionMessage(message, push);
+    }
+    return events;
+  }
+
+  private userMessage(
+    message: Extract<SessionMessageInfo, { type: "user" }>,
+    state: TimelineState,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    state.structured = message.metadata?.paseoOutputSchema !== undefined;
+    state.accepted = false;
+    if (this.content.has(message.id)) return;
+    this.content.set(message.id, message.text);
+    const clientMessageId = message.metadata?.paseoClientMessageId;
+    push({
+      type: "user_message",
+      text: message.text,
+      messageId: message.id,
+      ...(this.includeClientMessageId && typeof clientMessageId === "string"
+        ? { clientMessageId }
+        : {}),
+    });
+  }
+
+  private assistantMessage(
+    message: Extract<SessionMessageInfo, { type: "assistant" }>,
+    state: TimelineState,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    // Snapshot parts are indexed by position in `message.content`, but deltas
+    // number text and reasoning separately. Track a per-type ordinal so both
+    // paths address the same cursor entry.
+    let textOrdinal = 0;
+    let reasoningOrdinal = 0;
+    message.content.forEach((part, partIndex) => {
+      if (part.type === "tool" && part.name === STRUCTURED_OUTPUT_TOOL) {
+        this.structuredOutputPart(message.id, partIndex, part, state, push);
+      } else if (part.type === "text" || part.type === "reasoning") {
+        const ordinal = part.type === "text" ? textOrdinal++ : reasoningOrdinal++;
+        this.textPart(message.id, part, ordinal, state, push);
+      } else {
+        this.toolPart(message.id, partIndex, part, push);
+      }
+    });
+  }
+
+  private structuredOutputPart(
+    messageID: string,
+    partIndex: number,
+    part: Extract<
+      Extract<SessionMessageInfo, { type: "assistant" }>["content"][number],
+      { type: "tool" }
+    >,
+    state: TimelineState,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    if (!state.structured || state.accepted || part.state.status !== "completed") return;
+    const value = part.state.metadata?.paseoStructuredOutput;
+    if (value === undefined) return;
+    state.accepted = true;
+    const key = `${messageID}:${partIndex}`;
+    const text = JSON.stringify(value);
+    if (this.content.get(key) === text) return;
+    this.content.set(key, text);
+    push({ type: "assistant_message", text, messageId: messageID });
+  }
+
+  private textPart(
+    messageID: string,
+    part: Extract<
+      Extract<SessionMessageInfo, { type: "assistant" }>["content"][number],
+      { type: "text" } | { type: "reasoning" }
+    >,
+    ordinal: number,
+    state: TimelineState,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    if (state.structured && part.type === "text") return;
+    const key = textPartKey(messageID, part.type, ordinal);
+    const previous = this.content.get(key) ?? "";
+    // Upstream snapshots may briefly lag the volatile delta stream.
+    if (part.text.length <= previous.length) return;
+    if (!part.text.startsWith(previous))
+      throw new Error("OpenCode changed previously emitted message content");
+    this.content.set(key, part.text);
+    const suffix = part.text.slice(previous.length);
+    if (part.type === "text")
+      push({ type: "assistant_message", text: suffix, messageId: messageID });
+    else push({ type: "reasoning", text: suffix });
+  }
+
+  private toolPart(
+    messageID: string,
+    partIndex: number,
+    part: Extract<
+      Extract<SessionMessageInfo, { type: "assistant" }>["content"][number],
+      { type: "tool" }
+    >,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    const key = `${messageID}:${partIndex}`;
+    const serialized = JSON.stringify(part);
+    if (serialized === this.content.get(key)) return;
+    this.content.set(key, serialized);
+    const { output, images } = splitToolContent(part.state);
+    const item = toolFromV2(part, output);
+    if (item) push(item);
+    // Images follow their tool call as markdown, as Claude and Codex emit them,
+    // so base64 never reaches the tool output.
+    images.forEach((image, index) => {
+      const imageKey = `${key}:image:${index}`;
+      if (this.content.has(imageKey)) return;
+      this.content.set(imageKey, "");
+      const imageItem = renderProviderImageOutputAsAssistantMarkdown(
+        { url: image.uri, mimeType: image.mime },
+        { materialize: materializeProviderImage },
+      );
+      if (imageItem) push(imageItem);
+    });
+  }
+
+  private compactionMessage(
+    message: Extract<SessionMessageInfo, { type: "compaction" }>,
+    push: (item: AgentTimelineItem) => void,
+  ) {
+    const status = message.status === "running" ? "loading" : "completed";
+    if (this.content.get(message.id) === status) return;
+    this.content.set(message.id, status);
+    push({ type: "compaction", status });
+  }
+}
+
+interface TimelineState {
+  structured: boolean;
+  accepted: boolean;
+}
+
+interface TextPartIdentity {
+  assistantMessageID: string;
+  type: "text" | "reasoning";
+  ordinal: number;
+}
+
+interface TextPartDelta extends TextPartIdentity {
+  delta: string;
+}
+function splitToolContent(state: SessionMessageAssistantTool["state"]): {
+  output: string | undefined;
+  images: { uri: string; mime: string }[];
+} {
+  if (!("content" in state) || !state.content) return { output: undefined, images: [] };
+  const images: { uri: string; mime: string }[] = [];
+  const output = state.content
+    .map((part) => {
+      if (part.type === "text") return part.text;
+      if (!part.uri.startsWith("data:image/")) return part.uri;
+      images.push(part);
+      return "[image]";
+    })
+    .join("\n");
+  return { output, images };
+}
+
+function toolFromV2(
+  tool: SessionMessageAssistantTool,
+  output: string | undefined,
+): AgentTimelineItem | null {
+  const state = tool.state;
+  return mapOpencodeToolCall({
+    toolName: tool.name,
+    callId: tool.id,
+    input: state.input,
+    status: state.status === "error" ? "failed" : state.status,
+    output,
+    error: state.status === "error" ? state.error : undefined,
+    metadata: "metadata" in state ? state.metadata : undefined,
+  });
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/turns.ts b/packages/server/src/server/agent/providers/opencode/v2/turns.ts
new file mode 100644
index 0000000000..2b2c21d0c5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/turns.ts
@@ -0,0 +1,375 @@
+import { structuredOutput } from "./structured-output.js";
+import type { OpenCodeEvent, SessionInfo, SessionMessageInfo } from "@opencode/client";
+
+import { randomUUID } from "node:crypto";
+
+import type {
+  AgentPromptInput,
+  AgentRunOptions,
+  AgentStreamEvent,
+  SteerActiveTurnOptions,
+  SteerResult,
+} from "../../../agent-sdk-types.js";
+
+import { toDiagnosticErrorMessage } from "../../diagnostic-utils.js";
+
+import { renderPromptAttachmentAsText } from "../../../prompt-attachments.js";
+
+import { usageFromV2 } from "./mapping.js";
+
+import { commands } from "./commands.js";
+
+import type { V2Api } from "./api.js";
+type ExecutionEvent = Extract<
+  OpenCodeEvent,
+  {
+    type:
+      | "session.execution.started"
+      | "session.execution.succeeded"
+      | "session.execution.failed"
+      | "session.execution.interrupted";
+  }
+>;
+function isExecutionEvent(event: { type: string }): event is ExecutionEvent {
+  return (
+    event.type === "session.execution.started" ||
+    event.type === "session.execution.succeeded" ||
+    event.type === "session.execution.failed" ||
+    event.type === "session.execution.interrupted"
+  );
+}
+
+interface TurnSnapshot {
+  info: SessionInfo;
+  history: SessionMessageInfo[];
+}
+interface TurnOptions {
+  client(): V2Api;
+  id: string;
+  cwd: string;
+  signal: AbortSignal;
+  emit(event: AgentStreamEvent): void;
+  reconcile(): Promise<TurnSnapshot>;
+  clearPermissions(): Promise<void>;
+  reportReconciliationError(error: unknown): void;
+}
+interface Turn {
+  output?: ReturnType<typeof structuredOutput>;
+  id: string;
+  submitted: Promise<void>;
+  completion: Promise<void>;
+  settle(): void;
+  accepted: boolean;
+  requestDenied: boolean;
+}
+
+export class SessionTurns {
+  private turn: Turn | null = null;
+  private stopping: Promise<void> | null = null;
+  private stopFailed = false;
+  private revision = 0;
+  private execution: ExecutionEvent | null = null;
+  private sequence = 0;
+  private refresh: Promise<void> | null = null;
+  private dirty = false;
+  private retryTimer: ReturnType<typeof setTimeout> | null = null;
+  constructor(private readonly options: TurnOptions) {}
+  get id() {
+    return this.turn?.id;
+  }
+  get hasStructuredOutput() {
+    return Boolean(this.turn?.output);
+  }
+  fail(error: Error) {
+    const turn = this.turn;
+    if (!turn) return;
+    this.release(turn);
+    this.options.emit({
+      type: "turn_failed",
+      provider: "opencode",
+      turnId: turn.id,
+      error: toDiagnosticErrorMessage(error),
+    });
+  }
+  private release(turn: Turn) {
+    this.turn = null;
+    this.revision += 1;
+    if (this.retryTimer) clearTimeout(this.retryTimer);
+    this.retryTimer = null;
+    turn.settle();
+  }
+  close() {
+    if (this.turn) this.release(this.turn);
+  }
+  private createTurn(submitted: Promise<void>, accepted: boolean, output?: Turn["output"]): Turn {
+    let settle!: () => void;
+    const completion = new Promise<void>((resolve) => {
+      settle = resolve;
+    });
+    const turn: Turn = {
+      id: randomUUID(),
+      submitted,
+      completion,
+      settle,
+      accepted,
+      output,
+      requestDenied: false,
+    };
+    this.turn = turn;
+    this.execution = null;
+    this.revision += 1;
+    this.options.emit({ type: "turn_started", provider: "opencode", turnId: turn.id });
+    this.scheduleRecovery();
+    return turn;
+  }
+  async startTurn(prompt: AgentPromptInput, options?: AgentRunOptions) {
+    await this.stopping;
+    if (this.options.signal.aborted) throw new Error("OpenCode session is closed");
+    if (this.turn) throw new Error("OpenCode session already has an active turn");
+    const input = this.promptInput(prompt);
+    let accept!: () => void;
+    const submitted = new Promise<void>((resolve) => {
+      accept = resolve;
+    });
+    const output =
+      options?.outputSchema === undefined ? undefined : structuredOutput(options.outputSchema);
+    const turn = this.createTurn(submitted, false, output);
+    void this.submit(turn, input, accept, options);
+    return { turnId: turn.id };
+  }
+  private async submit(
+    turn: Turn,
+    input: ReturnType<SessionTurns["promptInput"]>,
+    accept: () => void,
+    options?: AgentRunOptions,
+  ) {
+    try {
+      await this.dispatch(input, options, turn.output);
+      if (this.turn !== turn) return;
+      turn.accepted = true;
+      this.revision += 1;
+      // Covers a fast execution whose terminal event preceded the admission response.
+      this.requestReconciliation();
+    } catch (error) {
+      if (this.turn === turn) this.fail(new Error(toDiagnosticErrorMessage(error)));
+    } finally {
+      accept();
+    }
+  }
+  observe(event: OpenCodeEvent) {
+    if (!isExecutionEvent(event) || event.durable.seq <= this.sequence) return;
+    this.revision += 1;
+    if (event.type === "session.execution.started") this.observeActiveTurn();
+    this.execution = event;
+    this.sequence = event.durable.seq;
+    this.requestReconciliation();
+  }
+  // OpenCode ends the execution when the user denies its permission or dismisses its question,
+  // but reports the interruption as "shutdown", the same reason as an execution it will resume.
+  requestDenied() {
+    if (!this.turn) return;
+    this.turn.requestDenied = true;
+    this.requestReconciliation();
+  }
+  private requestReconciliation() {
+    void this.reconcile().catch((error: unknown) => this.options.reportReconciliationError(error));
+  }
+  // Recovery reads state; a quiet stream (including SSE comment heartbeats) is not a reason to reconnect.
+  private scheduleRecovery() {
+    if (this.retryTimer || !this.turn || this.options.signal.aborted) return;
+    this.retryTimer = setTimeout(() => {
+      this.retryTimer = null;
+      this.requestReconciliation();
+    }, 5_000);
+    this.retryTimer.unref();
+  }
+  reconcile(): Promise<void> {
+    this.dirty = true;
+    if (this.refresh) return this.refresh;
+    this.refresh = Promise.resolve()
+      .then(() => this.drainReconciliation())
+      .finally(() => {
+        this.refresh = null;
+        this.scheduleRecovery();
+      });
+    return this.refresh;
+  }
+  private async drainReconciliation() {
+    while (this.dirty && !this.options.signal.aborted) {
+      this.dirty = false;
+      await this.reconcileTurn();
+    }
+  }
+  private async reconcileTurn() {
+    const revision = this.revision;
+    const turn = this.turn;
+    const active = await this.options.client().session.active({ signal: this.options.signal });
+    if (revision !== this.revision) {
+      this.dirty = true;
+      return;
+    }
+    if (active[this.options.id]) {
+      this.observeActiveTurn();
+      return;
+    }
+    if (!turn?.accepted) return;
+    // Idle outcome survives shutdown, and /event has no replay. Recover the latest
+    // durable execution even when its start or terminal was lost across reconnect.
+    const execution = await this.readExecution();
+    if (revision !== this.revision) {
+      this.dirty = true;
+      return;
+    }
+    if (!execution) return;
+    this.execution = execution;
+    this.sequence = execution.durable.seq;
+    if (
+      execution.type === "session.execution.started" ||
+      (execution.type === "session.execution.interrupted" &&
+        execution.data.reason === "shutdown" &&
+        !turn.requestDenied)
+    )
+      return;
+    // Read the final history only after observing idle. Never turn an observation transport error into an execution failure.
+    const snapshot = await this.options.reconcile();
+    if (revision !== this.revision) {
+      this.dirty = true;
+      return;
+    }
+    try {
+      this.finish(turn, snapshot, execution);
+    } catch (error) {
+      if (this.turn === turn) this.fail(new Error(toDiagnosticErrorMessage(error)));
+    }
+  }
+  private async dispatch(
+    input: ReturnType<SessionTurns["promptInput"]>,
+    options?: AgentRunOptions,
+    output?: ReturnType<typeof structuredOutput>,
+  ) {
+    const command = input.text.match(/^\/([^\s]+)(?:\s+([\s\S]*))?$/);
+    if (command?.[1] === "compact" || command?.[1] === "summarize") {
+      await this.options.client().session.compact({ sessionID: this.options.id });
+      return;
+    }
+    const selected = command
+      ? (await commands(this.options.client(), this.options.cwd)).find(
+          (item) => item.name === command[1],
+        )
+      : undefined;
+    if (selected && selected.kind !== "skill") {
+      await this.options.client().session.command({
+        sessionID: this.options.id,
+        name: selected.name,
+        text: command?.[2] ?? "",
+        files: input.files,
+      });
+      return;
+    }
+    await this.options.client().session.prompt({
+      sessionID: this.options.id,
+      ...input,
+      ...(selected?.kind === "skill"
+        ? {
+            skills: [{ id: selected.name }],
+            text: command?.[2] ?? `Use the ${selected.name} skill.`,
+          }
+        : {}),
+      metadata: {
+        ...(options?.clientMessageId ? { paseoClientMessageId: options.clientMessageId } : {}),
+        ...(output ? { paseoOutputSchema: output.schema } : {}),
+      },
+    });
+  }
+  private finish(turn: Turn, { info, history }: TurnSnapshot, execution: ExecutionEvent) {
+    if (execution.type === "session.execution.succeeded") turn.output?.assert(history);
+    this.release(turn);
+    if (execution.type === "session.execution.interrupted")
+      this.options.emit({
+        type: "turn_canceled",
+        provider: "opencode",
+        turnId: turn.id,
+        reason: "OpenCode interrupted execution",
+      });
+    else if (execution.type === "session.execution.failed")
+      this.options.emit({
+        type: "turn_failed",
+        provider: "opencode",
+        turnId: turn.id,
+        error: execution.data.error.message,
+      });
+    else
+      this.options.emit({
+        type: "turn_completed",
+        provider: "opencode",
+        turnId: turn.id,
+        usage: usageFromV2(info),
+      });
+  }
+  private async readExecution(): Promise<ExecutionEvent | null> {
+    let execution = this.execution;
+    for await (const event of this.options
+      .client()
+      .session.log(
+        { sessionID: this.options.id, follow: false, after: this.sequence },
+        { signal: this.options.signal },
+      )) {
+      if (isExecutionEvent(event) && event.durable.seq > (execution?.durable.seq ?? this.sequence))
+        execution = event;
+    }
+    return execution;
+  }
+  private promptInput(prompt: AgentPromptInput) {
+    if (typeof prompt === "string") return { text: prompt, files: [] };
+    const text: string[] = [];
+    const files: Array<{ uri: string }> = [];
+    for (const part of prompt) {
+      if (part.type === "text") text.push(part.text);
+      else if (part.type === "image")
+        files.push({ uri: `data:${part.mimeType};base64,${part.data}` });
+      else text.push(renderPromptAttachmentAsText(part));
+    }
+    return { text: text.join("\n"), files };
+  }
+  async steerActiveTurn(
+    prompt: AgentPromptInput,
+    options: SteerActiveTurnOptions,
+  ): Promise<SteerResult> {
+    if (this.turn?.id !== options.expectedTurnId || this.stopping) return { status: "unavailable" };
+    await this.options.client().session.prompt({
+      sessionID: this.options.id,
+      ...this.promptInput(prompt),
+      delivery: "steer",
+      metadata: options.clientMessageId
+        ? { paseoClientMessageId: options.clientMessageId }
+        : undefined,
+    });
+    if (options.clearPendingPermissions) await this.options.clearPermissions();
+    return { status: "accepted" };
+  }
+  async interrupt() {
+    if (!this.stopping || this.stopFailed) {
+      this.stopFailed = false;
+      const turn = this.turn;
+      const stop = (async () => {
+        // A stop sent before the queued prompt is accepted would interrupt an idle session.
+        await turn?.submitted;
+        await this.options.client().session.interrupt({ sessionID: this.options.id });
+        await this.reconcile();
+        await turn?.completion;
+      })();
+      this.stopping = stop;
+      try {
+        await stop;
+        this.stopping = null;
+      } catch (error) {
+        this.stopFailed = true;
+        throw error;
+      }
+    } else await this.stopping;
+  }
+  private observeActiveTurn() {
+    if (this.turn || this.options.signal.aborted) return;
+    this.createTurn(Promise.resolve(), true);
+  }
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/usage.test.ts b/packages/server/src/server/agent/providers/opencode/v2/usage.test.ts
new file mode 100644
index 0000000000..4fa64079c2
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/usage.test.ts
@@ -0,0 +1,100 @@
+import type { ModelInfo, TokenUsageInfo } from "@opencode/client";
+import { describe, expect, test } from "vitest";
+import { OpenCodeV2AgentClient } from "./agent.js";
+import { V2Harness } from "../test-utils/v2-harness.js";
+import { createTestLogger } from "../../../../../test-utils/test-logger.js";
+import type { AgentUsage } from "../../../agent-sdk-types.js";
+
+function model(context: number): ModelInfo {
+  return {
+    id: "model",
+    modelID: "model",
+    providerID: "test",
+    name: "Model",
+    capabilities: { tools: true, input: ["text"], output: ["text"] },
+    variants: [],
+    time: { released: 1 },
+    cost: [],
+    status: "active",
+    enabled: true,
+    limit: { context, output: 10_000 },
+  };
+}
+
+function stepEnded(harness: V2Harness, id: string, tokens: TokenUsageInfo) {
+  harness.push({
+    id,
+    created: 2,
+    type: "session.step.ended",
+    durable: { aggregateID: "session", seq: 1, version: 1 },
+    data: {
+      sessionID: "session",
+      assistantMessageID: "answer",
+      finish: "tool-calls",
+      cost: 0.1,
+      tokens,
+    },
+  });
+}
+
+describe("OpenCode v2 context usage", () => {
+  test("reports each step's context against the model limit, in step order", async () => {
+    const harness = new V2Harness();
+    harness.info.model = { providerID: "test", id: "model" };
+    harness.info.tokens = {
+      input: 900,
+      output: 90,
+      reasoning: 0,
+      cache: { read: 40, write: 0 },
+    };
+    harness.info.cost = 0.5;
+    // Each lookup answers faster than the one before it, so a lookup per step would
+    // deliver step 1's usage after step 2's.
+    const lookupDelays = [50, 0];
+    harness.api.model.list = async (input) => {
+      await new Promise((resolve) => setTimeout(resolve, lookupDelays.shift() ?? 0));
+      return {
+        location: { directory: input.location.directory },
+        data: [model(200_000)],
+      };
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({
+      provider: "opencode",
+      cwd: "/tmp/project",
+    });
+    const usage: AgentUsage[] = [];
+    session.subscribe((event) => {
+      if (event.type === "usage_updated") usage.push(event.usage);
+    });
+    try {
+      stepEnded(harness, "step-1", {
+        input: 100,
+        output: 10,
+        reasoning: 5,
+        cache: { read: 1_000, write: 20 },
+      });
+      stepEnded(harness, "step-2", {
+        input: 300,
+        output: 10,
+        reasoning: 5,
+        cache: { read: 1_000, write: 20 },
+      });
+      await expect.poll(() => usage.length).toBe(2);
+      expect(usage.map((entry) => entry.contextWindowUsedTokens)).toEqual([1_135, 1_335]);
+      expect(usage[1]).toEqual({
+        inputTokens: 900,
+        outputTokens: 90,
+        cachedInputTokens: 40,
+        totalCostUsd: 0.5,
+        contextWindowUsedTokens: 1_335,
+        contextWindowMaxTokens: 200_000,
+      });
+    } finally {
+      await session.close();
+    }
+  });
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/usage.ts b/packages/server/src/server/agent/providers/opencode/v2/usage.ts
new file mode 100644
index 0000000000..17a4885cbc
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/v2/usage.ts
@@ -0,0 +1,61 @@
+import type { ModelRef, OpenCodeEvent, SessionInfo, TokenUsageInfo } from "@opencode/client";
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+import type { V2Api } from "./api.js";
+import { usageFromV2 } from "./mapping.js";
+
+interface UsageOptions {
+  client(): V2Api;
+  cwd: string;
+  info(): SessionInfo;
+  emit(event: AgentStreamEvent): void;
+  reportError(error: unknown): void;
+}
+
+// A step is one model call, so its tokens are the context that call used.
+function contextWindowUsedTokens(tokens: TokenUsageInfo) {
+  return tokens.input + tokens.output + tokens.reasoning + tokens.cache.read + tokens.cache.write;
+}
+
+export class SessionUsage {
+  private readonly limits = new Map<string, Promise<number | undefined>>();
+  private reports: Promise<void> = Promise.resolve();
+  constructor(private readonly options: UsageOptions) {}
+  observe(event: OpenCodeEvent) {
+    if (event.type !== "session.step.ended") return;
+    const { tokens } = event.data;
+    // Reports stay in step order while a model's context limit is still being looked up.
+    this.reports = this.reports
+      .then(() => this.report(tokens))
+      .catch((error: unknown) => this.options.reportError(error));
+  }
+  private async report(tokens: TokenUsageInfo) {
+    const model = this.options.info().model;
+    const contextWindowMaxTokens = model ? await this.contextLimit(model) : undefined;
+    this.options.emit({
+      type: "usage_updated",
+      provider: "opencode",
+      usage: {
+        ...usageFromV2(this.options.info()),
+        contextWindowUsedTokens: contextWindowUsedTokens(tokens),
+        ...(contextWindowMaxTokens === undefined ? {} : { contextWindowMaxTokens }),
+      },
+    });
+  }
+  private contextLimit(model: ModelRef) {
+    const key = `${model.providerID}/${model.id}`;
+    const cached = this.limits.get(key);
+    if (cached) return cached;
+    const limit = this.options
+      .client()
+      .model.list({ location: { directory: this.options.cwd } })
+      .then(
+        (catalog) =>
+          catalog.data.find(
+            (entry) => entry.providerID === model.providerID && entry.id === model.id,
+          )?.limit.context,
+      );
+    this.limits.set(key, limit);
+    limit.catch(() => this.limits.delete(key));
+    return limit;
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/agent.test.ts b/packages/server/src/server/agent/providers/pi/agent.test.ts
index da2e785ca5..927a9defd2 100644
--- a/packages/server/src/server/agent/providers/pi/agent.test.ts
+++ b/packages/server/src/server/agent/providers/pi/agent.test.ts
@@ -18,20 +18,46 @@ import { describe, expect, onTestFinished, test } from "vitest";
 
 import type { AgentSession, AgentSessionConfig, AgentStreamEvent } from "../../agent-sdk-types.js";
 import {
-  PiProviderParamsSchema,
+  PiProviderOptionsSchema,
   PiRpcAgentClient,
   PiRpcAgentSession,
   transformPiModels,
 } from "./agent.js";
 import { FakePi } from "./test-utils/fake-pi.js";
+import { createPiExtensionHost } from "./extensions/index.js";
+import { PiExtensionHost } from "./extensions/host.js";
+import type { PiModel, PiThinkingLevel } from "./rpc-types.js";
 import type { PiUsagePollScheduler } from "./usage-poller.js";
 
 const ONE_BY_ONE_PNG_BASE64 =
   "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII=";
 
+const RESTRICTED_THINKING_MODEL: PiModel = {
+  provider: "kimi-coding",
+  id: "kimi-k3",
+  name: "Kimi K3",
+  reasoning: true,
+  thinkingLevelMap: {
+    off: null,
+    minimal: null,
+    low: "low",
+    medium: null,
+    high: "high",
+    xhigh: null,
+    max: "max",
+  },
+};
+
+interface PiThinkingCatalogCase {
+  name: string;
+  model: PiModel;
+  optionIds: PiThinkingLevel[] | undefined;
+  defaultThinkingOptionId: PiThinkingLevel | undefined;
+}
+
 test("Pi RPC timeout defaults to 60 seconds and accepts an override", () => {
-  expect(PiProviderParamsSchema.parse({}).rpcTimeoutMs).toBe(60_000);
-  expect(PiProviderParamsSchema.parse({ rpcTimeoutMs: 90_000 }).rpcTimeoutMs).toBe(90_000);
+  expect(PiProviderOptionsSchema.parse({}).rpcTimeoutMs).toBe(60_000);
+  expect(PiProviderOptionsSchema.parse({ rpcTimeoutMs: 90_000 }).rpcTimeoutMs).toBe(90_000);
 });
 
 function createClient(
@@ -96,23 +122,72 @@ function readUtf8File(pathname: string): string {
 
 type PaseoExtensionListener = (event: unknown, context?: unknown) => unknown;
 
+interface PiSessionEntry {
+  type: "message";
+  id: string;
+  parentId: string | null;
+  message: { role: string; content: unknown };
+}
+
+function piUserEntry(input: { id: string; parentId: string | null; text: string }): PiSessionEntry {
+  return {
+    type: "message",
+    id: input.id,
+    parentId: input.parentId,
+    message: { role: "user", content: input.text },
+  };
+}
+
+function piAssistantEntry(id: string, parentId: string): PiSessionEntry {
+  return { type: "message", id, parentId, message: { role: "assistant", content: [] } };
+}
+
+// Pi's context path: the entries from the root to the leaf.
+function piBranchTo(entries: PiSessionEntry[], leafId: string): PiSessionEntry[] {
+  const byId = new Map(entries.map((entry) => [entry.id, entry]));
+  const branch: PiSessionEntry[] = [];
+  for (let entry = byId.get(leafId); entry; entry = byId.get(entry.parentId ?? "")) {
+    branch.unshift(entry);
+  }
+  return branch;
+}
+
+function parseEntryCapture(notification: string): unknown {
+  const prefix = "PASEO_ENTRY_CAPTURE ";
+  expect(notification.startsWith(prefix)).toBe(true);
+  return JSON.parse(notification.slice(prefix.length));
+}
+
 async function loadPaseoExtensionListeners(
   extensionPath: string,
+  registerMcpServer: (name: string, config: unknown) => void = () => undefined,
 ): Promise<Map<string, PaseoExtensionListener>> {
   const listeners = new Map<string, PaseoExtensionListener>();
   const extension = (await import(pathToFileURL(extensionPath).href)) as {
     default: (piApi: {
       on: (event: string, listener: PaseoExtensionListener) => void;
+      events: { on: () => void };
       registerCommand: () => void;
+      registerMcpServer: (name: string, config: unknown) => void;
     }) => void;
   };
   extension.default({
     on: (event, listener) => listeners.set(event, listener),
+    events: { on: () => undefined },
     registerCommand: () => undefined,
+    registerMcpServer,
   });
   return listeners;
 }
 
+async function readRegisteredMcpServers(extensionPath: string): Promise<Record<string, unknown>> {
+  const servers: Record<string, unknown> = {};
+  await loadPaseoExtensionListeners(extensionPath, (name, config) => {
+    servers[name] = config;
+  });
+  return servers;
+}
+
 async function applyPaseoExtensionSystemPrompt(
   extensionPath: string,
   systemPrompt: string,
@@ -179,6 +254,51 @@ test("keeps normal Pi agent sessions persisted", async () => {
   await session.close();
 });
 
+test("lets Pi choose the thinking level when none is requested", async () => {
+  const pi = new FakePi();
+  pi.queueSessionSetup((session) => {
+    session.state = {
+      ...session.state,
+      model: RESTRICTED_THINKING_MODEL,
+      thinkingLevel: "max",
+    };
+  });
+  const session = await createClient(pi).createSession(
+    createConfig({ model: "kimi-coding/kimi-k3" }),
+  );
+  onTestFinished(() => session.close());
+
+  expect(pi.recordedLaunches[0]?.thinkingOptionId).toBeUndefined();
+  expect(pi.recordedLaunches[0]?.argv).not.toContain("--thinking");
+  expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("max");
+  await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: "max" });
+});
+
+test.each([
+  { requested: "medium", effective: "high" },
+  { requested: "xhigh", effective: "max" },
+] as const)(
+  "adopts Pi's $effective level when creating with $requested",
+  async ({ requested, effective }) => {
+    const pi = new FakePi();
+    pi.queueSessionSetup((session) => {
+      session.state = {
+        ...session.state,
+        model: RESTRICTED_THINKING_MODEL,
+        thinkingLevel: effective,
+      };
+    });
+    const session = await createClient(pi).createSession(
+      createConfig({ model: "kimi-coding/kimi-k3", thinkingOptionId: requested }),
+    );
+    onTestFinished(() => session.close());
+
+    expect(pi.recordedLaunches[0]?.thinkingOptionId).toBe(requested);
+    expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(effective);
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: effective });
+  },
+);
+
 class SessionEvents {
   private readonly events: AgentStreamEvent[] = [];
   private readonly waiters: Array<{
@@ -312,6 +432,103 @@ class SessionEvents {
 }
 
 describe("PiRpcAgentSession", () => {
+  test("completes a turn and answers a dialog when an adapter throws", async () => {
+    const { pi, session, events } = await createSession();
+    Object.assign(session, {
+      extensionHost: createPiExtensionHost(undefined, [
+        {
+          id: "throwing-test-adapter",
+          createSession: () => ({
+            mapToolCall: () => {
+              throw new Error("tool failed");
+            },
+            onToolStart: () => {
+              throw new Error("start failed");
+            },
+            onToolEnd: () => {
+              throw new Error("end failed");
+            },
+            mapDialog: () => {
+              throw new Error("dialog failed");
+            },
+            respondToPermission: () => {
+              throw new Error("response failed");
+            },
+          }),
+        },
+      ]),
+    });
+    const fakeSession = pi.latestSession();
+    await session.startTurn("run");
+    fakeSession.emit({
+      type: "tool_execution_start",
+      toolCallId: "x",
+      toolName: "other",
+      args: {},
+    });
+    fakeSession.emit({
+      type: "tool_execution_end",
+      toolCallId: "x",
+      toolName: "other",
+      result: { content: [{ type: "text", text: "ok" }] },
+      isError: false,
+    });
+    fakeSession.emit({
+      type: "extension_ui_request",
+      id: "ui-1",
+      method: "select",
+      title: "Pick",
+      options: ["A", "B"],
+    });
+    const permission = await events.nextPermissionRequest();
+    expect(permission.request.kind).toBe("question");
+    await session.respondToPermission("ui-1", {
+      behavior: "allow",
+      updatedInput: { answers: { Response: "B" } },
+    });
+    expect(fakeSession.extensionUiResponses).toEqual([{ id: "ui-1", response: { value: "B" } }]);
+    fakeSession.finishTurn();
+    await events.nextTurnCompletion();
+    expect(events.timelineItems()).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "tool_call",
+          name: "other",
+          status: "completed",
+          detail: expect.objectContaining({ type: "unknown" }),
+        }),
+      ]),
+    );
+  });
+
+  test("close resolves after rejected child hydration", async () => {
+    const { pi, session } = await createSession();
+    Object.assign(session, {
+      extensionHost: new PiExtensionHost(
+        [
+          {
+            id: "child-test",
+            createSession: () => ({
+              mapToolCall: () => ({ childSessions: [{ id: "child-1", file: "unused" }] }),
+            }),
+          },
+        ],
+        undefined,
+        2 * 1024 * 1024,
+        async () => {
+          throw new Error("read failed");
+        },
+      ),
+    });
+    await session.startTurn("run");
+    pi.latestSession().emit({
+      type: "tool_execution_start",
+      toolCallId: "x",
+      toolName: "other",
+      args: {},
+    });
+    await expect(session.close()).resolves.toBeUndefined();
+  });
   test("bridges Pi RPC select extension UI requests through question permissions", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -535,19 +752,60 @@ describe("PiRpcAgentSession", () => {
     ]);
   });
 
-  test("ignores Pi RPC fire-and-forget extension UI requests", async () => {
-    const { pi } = await createSession();
+  test("surfaces Pi fire-and-forget notify requests as timeline notifications", async () => {
+    const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
 
     fakeSession.emit({
       type: "extension_ui_request",
       id: "notify-1",
       method: "notify",
-      message: "hello",
+      message: "Search finished",
+      notifyType: "info",
+    });
+    fakeSession.emit({
+      type: "extension_ui_request",
+      id: "notify-2",
+      method: "notify",
+      message: "Command blocked by user",
+      notifyType: "warning",
+    });
+    fakeSession.emit({
+      type: "extension_ui_request",
+      id: "notify-3",
+      method: "notify",
+      message: "no type",
     });
 
     expect(fakeSession.extensionUiResponses).toEqual([]);
     expect(fakeSession.canceledExtensionUiRequests).toEqual([]);
+    expect(events.timelineItems()).toEqual([
+      { type: "notification", level: "info", message: "Search finished" },
+      { type: "notification", level: "warning", message: "Command blocked by user" },
+      { type: "notification", level: "info", message: "no type" },
+    ]);
+
+    await session.close();
+  });
+
+  test("surfaces Pi notify requests emitted during an active turn", async () => {
+    const { pi, session, events } = await createSession();
+    const fakeSession = pi.latestSession();
+
+    await session.startTurn("hello");
+    fakeSession.emit({
+      type: "extension_ui_request",
+      id: "notify-live",
+      method: "notify",
+      message: "Turn running notice",
+      notifyType: "error",
+    });
+
+    expect(events.timelineItems()).toEqual([
+      { type: "notification", level: "error", message: "Turn running notice" },
+    ]);
+
+    await session.close();
   });
 
   test("streams assistant text, reasoning, and tool calls from Pi events", async () => {
@@ -614,61 +872,6 @@ describe("PiRpcAgentSession", () => {
     ]);
   });
 
-  test("streams Pi task calls as sub-agent cards with lifecycle status", async () => {
-    const { pi, session, events } = await createSession();
-    const fakeSession = pi.latestSession();
-
-    await session.startTurn("delegate this");
-    fakeSession.emit({
-      type: "tool_execution_start",
-      toolCallId: "task-1",
-      toolName: "task",
-      args: {
-        agent: "explore",
-        task: "Trace the Pi provider tool mapper",
-      },
-    });
-    fakeSession.emit({
-      type: "tool_execution_end",
-      toolCallId: "task-1",
-      toolName: "task",
-      result: { content: [{ type: "text", text: "Found the mapper." }] },
-      isError: false,
-    });
-    fakeSession.finishTurn();
-
-    await events.nextTurnCompletion();
-
-    expect(events.timelineItems()).toEqual([
-      {
-        type: "tool_call",
-        callId: "task-1",
-        name: "task",
-        status: "running",
-        detail: {
-          type: "sub_agent",
-          subAgentType: "explore",
-          description: "Trace the Pi provider tool mapper",
-          log: "",
-        },
-        error: null,
-      },
-      {
-        type: "tool_call",
-        callId: "task-1",
-        name: "task",
-        status: "completed",
-        detail: {
-          type: "sub_agent",
-          subAgentType: "explore",
-          description: "Trace the Pi provider tool mapper",
-          log: "Found the mapper.",
-        },
-        error: null,
-      },
-    ]);
-  });
-
   test("keeps one generated message id when Pi omits message start and response id", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -811,7 +1014,8 @@ describe("PiRpcAgentSession", () => {
     })) as PiRpcAgentSession;
     const events = new SessionEvents(session);
     const fakeSession = pi.latestSession();
-    fakeSession.capturedUserEntries = [{ id: "entry-old", parentId: null, text: "old prompt" }];
+    fakeSession.treeUserEntries = [{ id: "entry-old", parentId: null, text: "old prompt" }];
+    fakeSession.contextUserEntries = fakeSession.treeUserEntries;
 
     await session.startTurn("new prompt", { clientMessageId: "client-new" });
     fakeSession.finishSubmittedUserMessage({
@@ -832,6 +1036,47 @@ describe("PiRpcAgentSession", () => {
     ]);
   });
 
+  test("keeps custom context in separate tools while a turn continues", async () => {
+    const { pi, session, events } = await createSession();
+    const runtime = pi.latestSession();
+    await session.startTurn("Explain the project");
+    runtime.emit({ type: "agent_start" });
+    runtime.emit({ type: "turn_start" });
+    for (const display of [true, false, true]) {
+      runtime.emit({
+        type: "message_end",
+        message: {
+          role: "custom",
+          customType: "project-context",
+          content: [{ type: "text", text: "Project instructions" }],
+          details: { project: "example" },
+          display,
+        },
+      });
+    }
+    const items = events.timelineItems();
+    expect(items).toEqual(
+      [1, 2].map(() => ({
+        type: "tool_call",
+        callId: expect.stringMatching(/^pi-custom-/),
+        name: "project-context",
+        status: "completed",
+        detail: { type: "plain_text", text: "Project instructions" },
+        metadata: {
+          synthetic: true,
+          customType: "project-context",
+          details: { project: "example" },
+        },
+        error: null,
+      })),
+    );
+    expect(new Set(items.map((item) => item.type === "tool_call" && item.callId)).size).toBe(2);
+    expect(events.turnCompletedEvents()).toHaveLength(0);
+    runtime.finishTurn();
+    await events.nextTurnCompletion();
+    await session.close();
+  });
+
   test("surfaces Pi extension command messages and completes when no agent turn starts", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -848,12 +1093,66 @@ describe("PiRpcAgentSession", () => {
     expect(events.timelineAndCompletionEvents()).toEqual([
       {
         type: "timeline",
-        item: { type: "assistant_message", text: "Extension command output" },
+        item: {
+          type: "tool_call",
+          callId: expect.stringMatching(/^pi-custom-/),
+          name: "custom-message",
+          status: "completed",
+          detail: { type: "plain_text", text: "Extension command output" },
+          metadata: { synthetic: true, customType: "custom-message" },
+          error: null,
+        },
       },
       { type: "turn_completed" },
     ]);
   });
 
+  test("settles an autonomous turn triggered by a Pi extension custom message", async () => {
+    const { pi, events } = await createSession();
+    const fakeSession = pi.latestSession();
+
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    fakeSession.emit({
+      type: "message_end",
+      message: {
+        role: "custom",
+        content: [{ type: "text", text: "Background process completed" }],
+      },
+    });
+    fakeSession.finishAgentRun({
+      message: {
+        role: "assistant",
+        stopReason: "stop",
+        content: [{ type: "text", text: "Continuation finished" }],
+      },
+      willRetry: false,
+    });
+
+    expect(events.timelineItems()).toEqual([
+      {
+        type: "tool_call",
+        callId: expect.stringMatching(/^pi-custom-/),
+        name: "custom-message",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          text: "Background process completed",
+        },
+        metadata: { synthetic: true, customType: "custom-message" },
+        error: null,
+      },
+    ]);
+    expect(events.turnLifecycleEvents()).toEqual([{ type: "turn_started", turnId: undefined }]);
+
+    fakeSession.settleTurn();
+
+    expect(events.turnLifecycleEvents()).toEqual([
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_completed", turnId: undefined },
+    ]);
+  });
+
   test("canceling a silent Pi extension command leaves the session usable", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -912,6 +1211,143 @@ describe("PiRpcAgentSession", () => {
     });
   });
 
+  test.each(["aborted", "error"])(
+    "canceling autonomous work with Pi stopReason=%s waits for abort and allows a follow-up",
+    async (stopReason) => {
+      const { pi, session, events } = await createSession();
+      const fakeSession = pi.latestSession();
+      const abortFinished = Promise.withResolvers<void>();
+      const turnFinished = Promise.withResolvers<void>();
+      fakeSession.abort = async () => {
+        fakeSession.finishTurn({
+          role: "assistant",
+          stopReason,
+          errorMessage: "This operation was aborted",
+          content: [],
+        });
+        turnFinished.resolve();
+        await abortFinished.promise;
+      };
+      fakeSession.emit({ type: "agent_start" });
+      fakeSession.emit({ type: "turn_start" });
+
+      const stopping = session.interrupt();
+      await turnFinished.promise;
+      expect(events.turnLifecycleEvents()).toEqual([{ type: "turn_started", turnId: undefined }]);
+      abortFinished.resolve();
+      await stopping;
+      expect(events.turnLifecycleEvents()).toEqual([
+        { type: "turn_started", turnId: undefined },
+        { type: "turn_canceled", turnId: undefined },
+      ]);
+
+      const { turnId } = await session.startTurn("follow-up");
+      fakeSession.finishTurn({ role: "assistant", stopReason: "stop", content: [] });
+      expect(events.turnLifecycleEvents().at(-1)).toEqual({ type: "turn_completed", turnId });
+    },
+  );
+
+  test("a natural completion during Stop does not cancel the next autonomous run", async () => {
+    const { pi, session, events } = await createSession();
+    const fakeSession = pi.latestSession();
+    const abortFinished = Promise.withResolvers<void>();
+    const turnFinished = Promise.withResolvers<void>();
+    fakeSession.abort = async () => {
+      fakeSession.finishTurn({ role: "assistant", stopReason: "stop", content: [] });
+      turnFinished.resolve();
+      await abortFinished.promise;
+    };
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    const stopping = session.interrupt();
+    await turnFinished.promise;
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    abortFinished.resolve();
+    await stopping;
+    fakeSession.finishTurn({ role: "assistant", stopReason: "stop", content: [] });
+
+    expect(events.turnLifecycleEvents()).toEqual([
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_completed", turnId: undefined },
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_completed", turnId: undefined },
+    ]);
+  });
+
+  test("a completed foreground Stop does not suppress a later autonomous abort", async () => {
+    const { pi, session, events } = await createSession();
+    const fakeSession = pi.latestSession();
+    fakeSession.abort = async () => {
+      fakeSession.finishTurn({ role: "assistant", stopReason: "stop", content: [] });
+    };
+    const { turnId } = await session.startTurn("finish while stopping");
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    await session.interrupt();
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    fakeSession.finishTurn({
+      role: "assistant",
+      stopReason: "aborted",
+      errorMessage: "Autonomous run aborted",
+      content: [],
+    });
+
+    expect(events.turnLifecycleEvents()).toEqual([
+      { type: "turn_started", turnId },
+      { type: "turn_completed", turnId },
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_failed", turnId: undefined },
+    ]);
+  });
+
+  test("Pi process exit during Stop emits one autonomous failure", async () => {
+    const { pi, session, events } = await createSession();
+    const fakeSession = pi.latestSession();
+    fakeSession.abort = async () => {
+      fakeSession.finishTurn({
+        role: "assistant",
+        stopReason: "error",
+        errorMessage: "This operation was aborted",
+        content: [],
+      });
+      fakeSession.emit({ type: "process_exit", error: "Pi process exited" });
+      throw new Error("Pi process exited");
+    };
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+
+    await expect(session.interrupt()).rejects.toThrow("Pi process exited");
+    expect(events.turnLifecycleEvents()).toEqual([
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_failed", turnId: undefined },
+    ]);
+    await expect(events.nextTurnFailure()).resolves.toMatchObject({ error: "Pi process exited" });
+  });
+
+  test("preserves the autonomous terminal error when abort rejects", async () => {
+    const { pi, session, events } = await createSession();
+    const fakeSession = pi.latestSession();
+    fakeSession.abort = async () => {
+      fakeSession.finishTurn({
+        role: "assistant",
+        stopReason: "error",
+        errorMessage: "Provider disconnected",
+        content: [],
+      });
+      throw new Error("Abort failed");
+    };
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+
+    await expect(session.interrupt()).rejects.toThrow("Abort failed");
+    await expect(events.nextTurnFailure()).resolves.toMatchObject({
+      turnId: undefined,
+      error: expect.stringContaining("Provider disconnected"),
+    });
+  });
+
   test("suppresses late aborted terminal response arriving after interrupt resolves", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -1119,7 +1555,7 @@ describe("PiRpcAgentSession", () => {
     const pi = new FakePi();
     const client = createClient(pi);
 
-    await client.resumeSession(
+    const session = await client.resumeSession(
       {
         provider: "pi",
         sessionId: "pi-session-1",
@@ -1134,6 +1570,12 @@ describe("PiRpcAgentSession", () => {
       { env: { RESUME_PROBE: "expected" } },
     );
 
+    expect(session.usageSession?.()).toMatchObject({
+      provider: "pi",
+      sessionKey: expect.any(String),
+    });
+    await session.close();
+    expect(session.usageSession?.()).toBeNull();
     expect(pi.recordedLaunches).toHaveLength(1);
     const actualLaunch = pi.recordedLaunches[0]!;
     expect(actualLaunch).toMatchObject({
@@ -1146,8 +1588,6 @@ describe("PiRpcAgentSession", () => {
       "pi",
       "--mode",
       "rpc",
-      "--model",
-      "openrouter/model-a",
       "--thinking",
       "high",
       "--session",
@@ -1157,6 +1597,113 @@ describe("PiRpcAgentSession", () => {
     ]);
   });
 
+  test("resumes a session whose model was removed on the model Pi falls back to", async () => {
+    const pi = new FakePi();
+    pi.removeModel("9router/deepseek-v4-flash");
+    pi.queueSessionSetup((session) => {
+      session.state = { ...session.state, model: RESTRICTED_THINKING_MODEL };
+    });
+
+    const session = await createClient(pi).resumeSession({
+      provider: "pi",
+      sessionId: "pi-session-1",
+      nativeHandle: "/tmp/native-pi-session",
+      metadata: { cwd: "/workspace/project", model: "9router/deepseek-v4-flash" },
+    });
+    onTestFinished(() => session.close());
+
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({
+      model: "kimi-coding/kimi-k3",
+    });
+    expect(session.describePersistence()?.metadata?.model).toBe("kimi-coding/kimi-k3");
+  });
+
+  test("resumes a session on the requested model when it differs from the session's", async () => {
+    const pi = new FakePi();
+    const requestedModel = { ...RESTRICTED_THINKING_MODEL, provider: "openrouter", id: "a" };
+    pi.queueSessionSetup((session) => {
+      session.state = { ...session.state, model: RESTRICTED_THINKING_MODEL };
+      session.models = [RESTRICTED_THINKING_MODEL, requestedModel];
+      session.setModelResult = requestedModel;
+    });
+
+    const session = await createClient(pi).resumeSession({
+      provider: "pi",
+      sessionId: "pi-session-1",
+      nativeHandle: "/tmp/native-pi-session",
+      metadata: { cwd: "/workspace/project", model: "openrouter/a" },
+    });
+    onTestFinished(() => session.close());
+
+    expect(pi.latestSession().setModelRequests).toEqual([{ provider: "openrouter", modelId: "a" }]);
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({ model: "openrouter/a" });
+    expect(session.describePersistence()?.metadata?.model).toBe("openrouter/a");
+  });
+
+  test("resumes on a requested model written as provider:id", async () => {
+    const pi = new FakePi();
+    const requestedModel = { ...RESTRICTED_THINKING_MODEL, provider: "openrouter", id: "a" };
+    pi.queueSessionSetup((session) => {
+      session.state = { ...session.state, model: RESTRICTED_THINKING_MODEL };
+      session.models = [RESTRICTED_THINKING_MODEL, requestedModel];
+      session.setModelResult = requestedModel;
+    });
+
+    const session = await createClient(pi).resumeSession({
+      provider: "pi",
+      sessionId: "pi-session-1",
+      nativeHandle: "/tmp/native-pi-session",
+      metadata: { cwd: "/workspace/project", model: "openrouter:a" },
+    });
+    onTestFinished(() => session.close());
+
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({ model: "openrouter/a" });
+  });
+
+  test("fails the resume when switching to an available model fails", async () => {
+    const pi = new FakePi();
+    const requestedModel = { ...RESTRICTED_THINKING_MODEL, provider: "openrouter", id: "a" };
+    pi.queueSessionSetup((session) => {
+      session.state = { ...session.state, model: RESTRICTED_THINKING_MODEL };
+      session.models = [RESTRICTED_THINKING_MODEL, requestedModel];
+    });
+
+    await expect(
+      createClient(pi).resumeSession({
+        provider: "pi",
+        sessionId: "pi-session-1",
+        nativeHandle: "/tmp/native-pi-session",
+        metadata: { cwd: "/workspace/project", model: "openrouter/a" },
+      }),
+    ).rejects.toThrow("FakePi setModel requires setModelResult to be scripted");
+  });
+
+  test("adopts Pi's clamped thinking level when resuming a session", async () => {
+    const pi = new FakePi();
+    pi.queueSessionSetup((session) => {
+      session.state = {
+        ...session.state,
+        model: RESTRICTED_THINKING_MODEL,
+        thinkingLevel: "high",
+      };
+    });
+    const session = await createClient(pi).resumeSession({
+      provider: "pi",
+      sessionId: "pi-session-1",
+      nativeHandle: "/tmp/native-pi-session",
+      metadata: {
+        cwd: "/workspace/project",
+        model: "kimi-coding/kimi-k3",
+        thinkingOptionId: "medium",
+      },
+    });
+    onTestFinished(() => session.close());
+
+    expect(pi.recordedLaunches[0]?.thinkingOptionId).toBe("medium");
+    expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("high");
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: "high" });
+  });
+
   test("reports the persisted Pi entry attached to the submitted message", async () => {
     const pi = new FakePi();
     const client = createClient(pi);
@@ -1203,6 +1750,47 @@ describe("PiRpcAgentSession", () => {
     await session.close();
   });
 
+  test("captures the session's user entries apart from the ones on the current branch", async () => {
+    const pi = new FakePi();
+    const session = await createClient(pi).createSession(createConfig());
+    onTestFinished(() => session.close());
+    const listeners = await loadPaseoExtensionListeners(pi.recordedLaunches[0]!.extensionPaths[0]!);
+    // "abandoned" was rewound; "two" was sent from the same parent afterwards.
+    const entries = [
+      piUserEntry({ id: "one", parentId: null, text: "first" }),
+      piAssistantEntry("one-reply", "one"),
+      piUserEntry({ id: "abandoned", parentId: "one-reply", text: "rewound away" }),
+      piAssistantEntry("abandoned-reply", "abandoned"),
+      piUserEntry({ id: "two", parentId: "one-reply", text: "second" }),
+      piAssistantEntry("two-reply", "two"),
+    ];
+    const notifications: string[] = [];
+    const context = {
+      sessionManager: {
+        getEntries: () => entries,
+        buildContextEntries: () => piBranchTo(entries, "two-reply"),
+      },
+      ui: { notify: (message: string) => notifications.push(message) },
+    };
+
+    await listeners.get("session_start")?.({}, context);
+
+    expect(notifications.map(parseEntryCapture)).toEqual([
+      {
+        reason: "session_start",
+        treeEntries: [
+          { id: "one", parentId: null, text: "first" },
+          { id: "abandoned", parentId: "one-reply", text: "rewound away" },
+          { id: "two", parentId: "one-reply", text: "second" },
+        ],
+        contextEntries: [
+          { id: "one", parentId: null, text: "first" },
+          { id: "two", parentId: "one-reply", text: "second" },
+        ],
+      },
+    ]);
+  });
+
   test("appends agent and daemon prompts after Pi's discovered system prompt", async () => {
     const pi = new FakePi();
     const client = createClient(pi);
@@ -1223,8 +1811,6 @@ describe("PiRpcAgentSession", () => {
       "pi",
       "--mode",
       "rpc",
-      "--thinking",
-      "medium",
       "--extension",
       actualLaunch.extensionPaths[0],
     ]);
@@ -1268,8 +1854,6 @@ describe("PiRpcAgentSession", () => {
       "pi",
       "--mode",
       "rpc",
-      "--model",
-      "openrouter/model-a",
       "--thinking",
       "high",
       "--session",
@@ -1294,6 +1878,133 @@ describe("PiRpcAgentSession", () => {
     expect(fakeSession.setThinkingLevelRequests).toEqual(["high"]);
   });
 
+  test.each([
+    { requested: "medium", effective: "high", rpcRequest: "medium" },
+    { requested: "xhigh", effective: "max", rpcRequest: "xhigh" },
+    { requested: null, effective: "high", rpcRequest: "medium" },
+  ] as const)(
+    "stores Pi's $effective thinking level after requesting $requested",
+    async ({ requested, effective, rpcRequest }) => {
+      const pi = new FakePi();
+      pi.queueSessionSetup((session) => {
+        session.state = {
+          ...session.state,
+          model: RESTRICTED_THINKING_MODEL,
+          thinkingLevel: "low",
+        };
+      });
+      const { session } = await createSession(pi);
+      onTestFinished(() => session.close());
+      const fakeSession = pi.latestSession();
+      fakeSession.state = { ...fakeSession.state, thinkingLevel: effective };
+
+      await session.setThinkingOption(requested);
+
+      expect(fakeSession.setThinkingLevelRequests).toEqual([rpcRequest]);
+      expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(effective);
+      await expect(session.getRuntimeInfo()).resolves.toEqual({
+        provider: "pi",
+        sessionId: "pi-session-1",
+        model: "kimi-coding/kimi-k3",
+        thinkingOptionId: effective,
+        modeId: null,
+      });
+    },
+  );
+
+  test("refreshes Pi's thinking level after changing models", async () => {
+    const { pi, session } = await createSession();
+    onTestFinished(() => session.close());
+    const fakeSession = pi.latestSession();
+    fakeSession.setModelResult = RESTRICTED_THINKING_MODEL;
+    fakeSession.state = { ...fakeSession.state, thinkingLevel: "high" };
+
+    await session.setModel("kimi-coding/kimi-k3");
+
+    expect(fakeSession.setModelRequests).toEqual([{ provider: "kimi-coding", modelId: "kimi-k3" }]);
+    expect(session.describePersistence()?.metadata).toEqual({
+      cwd: "/tmp/paseo-pi-rpc-test",
+      model: "kimi-coding/kimi-k3",
+      thinkingOptionId: "high",
+    });
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({
+      model: "kimi-coding/kimi-k3",
+      thinkingOptionId: "high",
+    });
+  });
+
+  test("reports updated Pi thinking state instead of a cached selection", async () => {
+    const { pi, session } = await createSession();
+    onTestFinished(() => session.close());
+    const fakeSession = pi.latestSession();
+    fakeSession.state = { ...fakeSession.state, thinkingLevel: "off" };
+
+    await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: "off" });
+    expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("off");
+  });
+
+  test.each(["high", "off", "max"] as const)(
+    "publishes an extension's thinking change to %s before refreshing state",
+    async (level) => {
+      const { pi, session } = await createSession();
+      onTestFinished(() => session.close());
+      const changes: AgentStreamEvent[] = [];
+      session.subscribe((event) => {
+        if (event.type === "thinking_option_changed") {
+          expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(level);
+          changes.push(event);
+        }
+      });
+      const runtime = pi.latestSession();
+      runtime.state = { ...runtime.state, thinkingLevel: level };
+      runtime.emit({ type: "thinking_level_changed", level });
+
+      expect(changes).toEqual([
+        { type: "thinking_option_changed", provider: "pi", thinkingOptionId: level },
+      ]);
+      expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(level);
+      await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: level });
+    },
+  );
+
+  test.each([undefined, null, "invalid", 123])(
+    "ignores a thinking change with invalid level %s",
+    async (level) => {
+      const { pi, session } = await createSession();
+      onTestFinished(() => session.close());
+      const initialThinking = session.describePersistence()?.metadata?.thinkingOptionId;
+      const changes: AgentStreamEvent[] = [];
+      session.subscribe((event) => {
+        if (event.type === "thinking_option_changed") changes.push(event);
+      });
+
+      pi.latestSession().emit({ type: "thinking_level_changed", level });
+
+      expect(changes).toEqual([]);
+      expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(initialThinking);
+    },
+  );
+
+  test("surfaces state refresh failures after a Pi thinking update", async () => {
+    const { pi, session } = await createSession();
+    onTestFinished(() => session.close());
+    pi.latestSession().getStateError = new Error("Pi state unavailable");
+
+    await expect(session.setThinkingOption("high")).rejects.toThrow("Pi state unavailable");
+    expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("medium");
+  });
+
+  test("surfaces state refresh failures after a Pi model update", async () => {
+    const { pi, session } = await createSession();
+    onTestFinished(() => session.close());
+    const fakeSession = pi.latestSession();
+    fakeSession.setModelResult = RESTRICTED_THINKING_MODEL;
+    fakeSession.getStateError = new Error("Pi state unavailable");
+
+    await expect(session.setModel("kimi-coding/kimi-k3")).rejects.toThrow("Pi state unavailable");
+    expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("medium");
+  });
+
   test("materializes image prompts as text hints for text-only Pi models", async () => {
     const { pi, session } = await createSession();
     const fakeSession = pi.latestSession();
@@ -1390,6 +2101,24 @@ describe("PiRpcAgentSession", () => {
     });
   });
 
+  test("fails an autonomous turn when the Pi process exits before settlement", async () => {
+    const { pi, events } = await createSession();
+    const fakeSession = pi.latestSession();
+
+    fakeSession.emit({ type: "agent_start" });
+    fakeSession.emit({ type: "turn_start" });
+    fakeSession.emit({ type: "process_exit", error: "Pi exited" });
+
+    await expect(events.nextTurnFailure()).resolves.toMatchObject({
+      error: "Pi exited",
+      turnId: undefined,
+    });
+    expect(events.turnLifecycleEvents()).toEqual([
+      { type: "turn_started", turnId: undefined },
+      { type: "turn_failed", turnId: undefined },
+    ]);
+  });
+
   test("completes locally handled slash commands when agentInvoked is false", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
@@ -1438,7 +2167,7 @@ describe("PiRpcAgentSession", () => {
     expect(events.turnCompletedEvents()).toHaveLength(1);
   });
 
-  test("probes slash prompts without agentInvoked and surfaces buffered notify output", async () => {
+  test("probes slash prompts without agentInvoked and surfaces notify output immediately", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
 
@@ -1454,13 +2183,16 @@ describe("PiRpcAgentSession", () => {
     const completion = await events.nextTurnCompletion();
     expect(completion).toMatchObject({ type: "turn_completed", turnId });
     expect(events.timelineAndCompletionEvents()).toEqual([
+      {
+        type: "timeline",
+        item: { type: "notification", level: "info", message: "Plan mode enabled" },
+      },
       { type: "timeline", item: { type: "user_message", text: "/plan on" } },
-      { type: "timeline", item: { type: "assistant_message", text: "Plan mode enabled" } },
       { type: "turn_completed" },
     ]);
   });
 
-  test("does not synthesize completion when lifecycle starts before the no-turn probe", async () => {
+  test("surfaces notify requests immediately even when the turn has started", async () => {
     const { pi, session, events } = await createSession();
     const fakeSession = pi.latestSession();
 
@@ -1469,13 +2201,15 @@ describe("PiRpcAgentSession", () => {
       type: "extension_ui_request",
       id: "notify-buffered",
       method: "notify",
-      message: "Should not appear after turn starts",
+      message: "Shown despite turn start",
     });
     fakeSession.emit({ type: "agent_start" });
 
     await flushTurnScheduling();
     expect(events.turnCompletedEvents()).toHaveLength(0);
-    expect(events.timelineItems()).toEqual([]);
+    expect(events.timelineItems()).toEqual([
+      { type: "notification", level: "info", message: "Shown despite turn start" },
+    ]);
 
     fakeSession.finishTurn();
     await flushTurnScheduling();
@@ -1916,10 +2650,11 @@ describe("PiRpcAgentClient", () => {
     const client = new PiRpcAgentClient({
       logger: pino({ level: "silent" }),
       runtime: new FakePi(),
-      providerParams: { sessionDir: sessionsDir },
     });
 
-    await expect(client.listImportableSessions({ cwd })).resolves.toEqual([
+    await expect(
+      client.listImportableSessions({ cwd, providerOptions: { sessionDir: sessionsDir } }),
+    ).resolves.toEqual([
       {
         providerHandleId: sessionFile,
         cwd,
@@ -1967,7 +2702,9 @@ describe("PiRpcAgentClient", () => {
       },
     });
 
-    await expect(client.listImportableSessions({ cwd })).resolves.toMatchObject([
+    await expect(
+      client.listImportableSessions({ cwd, providerOptions: { sessionDir: sessionsDir } }),
+    ).resolves.toMatchObject([
       {
         providerHandleId: sessionFile,
         cwd,
@@ -2017,10 +2754,17 @@ describe("PiRpcAgentClient", () => {
       "utf8",
     );
     const pi = new FakePi();
+    pi.queueSessionSetup((session) => {
+      session.state.model = {
+        ...RESTRICTED_THINKING_MODEL,
+        provider: "openrouter",
+        id: "anthropic/claude-sonnet-4.5",
+      };
+      session.state.thinkingLevel = "high";
+    });
     const client = new PiRpcAgentClient({
       logger: pino({ level: "silent" }),
       runtime: pi,
-      providerParams: { sessionDir: sessionsDir },
     });
 
     const imported = await client.importSession(
@@ -2034,8 +2778,6 @@ describe("PiRpcAgentClient", () => {
       "pi",
       "--mode",
       "rpc",
-      "--model",
-      "openrouter/anthropic/claude-sonnet-4.5",
       "--thinking",
       "high",
       "--session",
@@ -2088,6 +2830,133 @@ describe("PiRpcAgentClient", () => {
     expect(pi.recordedLaunches[0]).toMatchObject({ cwd: "/workspace/with-extension" });
   });
 
+  test("marks the model Pi resolves from its own settings as the catalog default", async () => {
+    const pi = new FakePi();
+    const unconfigured = { provider: "openai", id: "gpt-4", name: "GPT-4", reasoning: false };
+    const configured = { provider: "zai", id: "glm-5.3", name: "GLM-5.3", reasoning: true };
+    pi.queueSessionSetup((session) => {
+      session.models = [unconfigured, configured];
+      session.state = { ...session.state, model: configured };
+    });
+
+    const catalog = await createClient(pi).fetchCatalog({
+      scope: "workspace",
+      cwd: "/workspace/project",
+      force: false,
+    });
+
+    expect(catalog.models.filter((model) => model.isDefault).map((model) => model.id)).toEqual([
+      "zai/glm-5.3",
+    ]);
+  });
+
+  test("honors per-model Pi thinking maps and clamps the catalog default upward", async () => {
+    const pi = new FakePi();
+    pi.queueSessionSetup((session) => {
+      session.models = [RESTRICTED_THINKING_MODEL];
+    });
+    const client = createClient(pi);
+
+    const catalog = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: "/workspace/project",
+      force: false,
+    });
+
+    expect(catalog.models).toEqual([
+      {
+        provider: "pi",
+        id: "kimi-coding/kimi-k3",
+        label: "Kimi K3",
+        description: "kimi-coding/kimi-k3",
+        metadata: { provider: "kimi-coding", modelId: "kimi-k3" },
+        thinkingOptions: [
+          { id: "low", label: "Low", description: "Faster reasoning" },
+          { id: "high", label: "High", description: "Deeper reasoning", isDefault: true },
+          { id: "max", label: "Max", description: "Extreme reasoning" },
+        ],
+        defaultThinkingOptionId: "high",
+      },
+    ]);
+  });
+
+  test.each<PiThinkingCatalogCase>([
+    {
+      name: "no thinking map",
+      model: { ...RESTRICTED_THINKING_MODEL, thinkingLevelMap: undefined },
+      optionIds: ["off", "minimal", "low", "medium", "high"],
+      defaultThinkingOptionId: "medium",
+    },
+    {
+      name: "a partial thinking map",
+      model: {
+        ...RESTRICTED_THINKING_MODEL,
+        thinkingLevelMap: { minimal: null, medium: null, xhigh: "extra-high", max: null },
+      },
+      optionIds: ["off", "low", "high", "xhigh"],
+      defaultThinkingOptionId: "high",
+    },
+    {
+      name: "explicitly mapped extended levels",
+      model: {
+        ...RESTRICTED_THINKING_MODEL,
+        thinkingLevelMap: { xhigh: "extra-high", max: "maximum" },
+      },
+      optionIds: ["off", "minimal", "low", "medium", "high", "xhigh", "max"],
+      defaultThinkingOptionId: "medium",
+    },
+    {
+      name: "only lower thinking levels",
+      model: {
+        ...RESTRICTED_THINKING_MODEL,
+        thinkingLevelMap: { medium: null, high: null },
+      },
+      optionIds: ["off", "minimal", "low"],
+      defaultThinkingOptionId: "low",
+    },
+    {
+      name: "a non-reasoning model",
+      model: { ...RESTRICTED_THINKING_MODEL, reasoning: false },
+      optionIds: undefined,
+      defaultThinkingOptionId: undefined,
+    },
+    {
+      name: "no supported thinking levels",
+      model: {
+        ...RESTRICTED_THINKING_MODEL,
+        thinkingLevelMap: {
+          ...RESTRICTED_THINKING_MODEL.thinkingLevelMap,
+          low: null,
+          high: null,
+          max: null,
+        },
+      },
+      optionIds: [],
+      defaultThinkingOptionId: "off",
+    },
+  ])(
+    "resolves Pi thinking options for $name",
+    async ({ model, optionIds, defaultThinkingOptionId }) => {
+      const pi = new FakePi();
+      pi.queueSessionSetup((session) => {
+        session.models = [model];
+      });
+      const catalog = await createClient(pi).fetchCatalog({
+        scope: "workspace",
+        cwd: "/workspace/project",
+        force: false,
+      });
+
+      expect(catalog.models).toHaveLength(1);
+      const thinkingOptions = catalog.models[0]?.thinkingOptions;
+      expect(thinkingOptions?.map((option) => option.id)).toEqual(optionIds);
+      expect(catalog.models[0]?.defaultThinkingOptionId).toBe(defaultThinkingOptionId);
+      expect(
+        thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+      ).toEqual(optionIds?.filter((id) => id === defaultThinkingOptionId));
+    },
+  );
+
   test("lists no draft features without starting a Pi session", async () => {
     const pi = new FakePi();
     const client = createClient(pi);
@@ -2312,10 +3181,11 @@ describe("PiRpcAgentClient", () => {
 
   test("rewinds conversation through the Pi tree navigation bridge", async () => {
     const { pi, session, events } = await createSession();
-    pi.latestSession().capturedUserEntries = [
+    pi.latestSession().treeUserEntries = [
       { id: "entry-1", parentId: null, text: "first prompt" },
       { id: "entry-3", parentId: "entry-2", text: "second prompt" },
     ];
+    pi.latestSession().contextUserEntries = pi.latestSession().treeUserEntries;
 
     await session.startTurn("first prompt");
     pi.latestSession().finishTurn({ role: "assistant", content: [] });
@@ -2331,6 +3201,23 @@ describe("PiRpcAgentClient", () => {
     expect(pi.latestSession().treeNavigationRequests).toEqual(["entry-1"]);
   });
 
+  test("rewinds a row whose Pi entry compaction summarized away", async () => {
+    const { pi, session } = await createSession();
+    const fakeSession = pi.latestSession();
+    // Compaction summarized entry-1, so the replayed branch starts at entry-3.
+    fakeSession.treeUserEntries = [
+      { id: "entry-1", parentId: null, text: "first prompt" },
+      { id: "entry-3", parentId: "entry-2", text: "second prompt" },
+    ];
+    fakeSession.contextUserEntries = [
+      { id: "entry-3", parentId: "entry-2", text: "second prompt" },
+    ];
+
+    await session.revertConversation?.({ messageId: "entry-1" });
+
+    expect(fakeSession.treeNavigationRequests).toEqual(["entry-1"]);
+  });
+
   test("injects MCP servers without replacing the Pi global MCP config", async () => {
     const agentDir = mkdtempSync(path.join(tmpdir(), "paseo-pi-agent-"));
     onTestFinished(() => rmSync(agentDir, { recursive: true, force: true }));
@@ -2386,8 +3273,6 @@ describe("PiRpcAgentClient", () => {
       "pi",
       "--mode",
       "rpc",
-      "--thinking",
-      "medium",
       "--mcp-config",
       actualLaunch.mcpConfigPath,
       "--extension",
@@ -2445,6 +3330,102 @@ describe("PiRpcAgentClient", () => {
     ).rejects.toThrow(`Failed to parse Pi MCP config: ${configPath}`);
   });
 
+  test("registers MCP servers through Pi's built-in MCP when pi-mcp-adapter is not loaded", async () => {
+    const pi = new FakePi();
+    pi.queueCommands([
+      {
+        name: "mcp",
+        source: "extension",
+        sourceInfo: { path: "builtin:mcp", source: "builtin" },
+      },
+    ]);
+    const session = await createClient(pi).createSession(
+      createConfig({
+        mcpServers: {
+          paseo: {
+            type: "http",
+            url: "http://127.0.0.1:6767/mcp/agents?callerAgentId=agent-1",
+            headers: { Authorization: "Bearer token" },
+          },
+          local: { type: "stdio", command: "node", args: ["server.js"], env: { KEY: "`${x}`" } },
+        },
+      }),
+    );
+
+    expect(session.capabilities.supportsMcpServers).toBe(true);
+    const actualLaunch = pi.recordedLaunches[1]!;
+    expect(actualLaunch.argv).not.toContain("--mcp-config");
+    const extensionPath = actualLaunch.extensionPaths[0]!;
+    expect(await readRegisteredMcpServers(extensionPath)).toEqual({
+      paseo: {
+        url: "http://127.0.0.1:6767/mcp/agents?callerAgentId=agent-1",
+        headers: { Authorization: "Bearer token" },
+      },
+      local: { command: "node", args: ["server.js"], env: { KEY: "`${x}`" } },
+    });
+
+    await session.close();
+    expect(existsSync(extensionPath)).toBe(false);
+  });
+
+  test("registers the resumed session's MCP servers through Pi's built-in MCP", async () => {
+    const pi = new FakePi();
+    const client = createClient(pi);
+    const original = await client.createSession(createConfig());
+    const persistence = original.describePersistence()!;
+    await original.close();
+
+    pi.queueCommands([{ name: "mcp", source: "extension", sourceInfo: { path: "builtin:mcp" } }]);
+    const session = await client.resumeSession(persistence, {
+      mcpServers: {
+        paseo: { type: "http", url: "http://127.0.0.1:7777/mcp/agents?callerAgentId=agent-2" },
+      },
+    });
+    onTestFinished(() => session.close());
+
+    expect(session.capabilities.supportsMcpServers).toBe(true);
+    const actualLaunch = pi.recordedLaunches.at(-1)!;
+    expect(actualLaunch.session).toBe(persistence.nativeHandle);
+    expect(actualLaunch.argv).not.toContain("--mcp-config");
+    expect(await readRegisteredMcpServers(actualLaunch.extensionPaths[0]!)).toEqual({
+      paseo: { url: "http://127.0.0.1:7777/mcp/agents?callerAgentId=agent-2" },
+    });
+  });
+
+  test("uses pi-mcp-adapter when it replaces Pi's built-in MCP", async () => {
+    const agentDir = mkdtempSync(path.join(tmpdir(), "paseo-pi-agent-"));
+    onTestFinished(() => rmSync(agentDir, { recursive: true, force: true }));
+    const pi = new FakePi();
+    pi.queueCommands([
+      { name: "mcp", source: "extension", sourceInfo: { path: "builtin:mcp" } },
+      { name: "mcp:1", source: "extension", sourceInfo: { source: "npm:pi-mcp-adapter" } },
+    ]);
+    const session = await createClient(pi).createSession(
+      createConfig({
+        mcpServers: { paseo: { type: "http", url: "http://127.0.0.1:6767/mcp/agents" } },
+      }),
+      { env: { PI_CODING_AGENT_DIR: agentDir } },
+    );
+    onTestFinished(() => session.close());
+
+    const actualLaunch = pi.recordedLaunches[1]!;
+    expect(actualLaunch.argv).toContain("--mcp-config");
+    expect(await readRegisteredMcpServers(actualLaunch.extensionPaths[0]!)).toEqual({});
+  });
+
+  test.each([
+    { name: "legacy", config: { type: "sse" as const, url: "https://example.com/sse" } },
+    { name: "foo.bar", config: { type: "http" as const, url: "https://example.com/mcp" } },
+  ])("rejects $name, which Pi's built-in MCP cannot register", async ({ name, config }) => {
+    const pi = new FakePi();
+    pi.queueCommands([{ name: "mcp", source: "extension", sourceInfo: { path: "builtin:mcp" } }]);
+
+    await expect(
+      createClient(pi).createSession(createConfig({ mcpServers: { [name]: config } })),
+    ).rejects.toThrow(name);
+    expect(pi.recordedLaunches).toHaveLength(1);
+  });
+
   test("does not pass MCP config when pi-mcp-adapter is not loaded", async () => {
     const pi = new FakePi();
     pi.queueCommands([]);
@@ -2468,8 +3449,6 @@ describe("PiRpcAgentClient", () => {
       "pi",
       "--mode",
       "rpc",
-      "--thinking",
-      "medium",
       "--extension",
       actualLaunch.extensionPaths[0],
     ]);
diff --git a/packages/server/src/server/agent/providers/pi/agent.ts b/packages/server/src/server/agent/providers/pi/agent.ts
index dc5c84375e..146b56b36f 100644
--- a/packages/server/src/server/agent/providers/pi/agent.ts
+++ b/packages/server/src/server/agent/providers/pi/agent.ts
@@ -1,3 +1,4 @@
+import { mapCustomMessageToToolCall } from "../custom-message.js";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
@@ -24,6 +25,7 @@ import {
   type AgentRunOptions,
   type AgentRunResult,
   type AgentRuntimeInfo,
+  type AgentSelectOption,
   type AgentSession,
   type AgentSessionConfig,
   type AgentSlashCommand,
@@ -38,7 +40,6 @@ import {
   type ListImportableSessionsOptions,
   type ProviderCatalog,
   type ProviderRefreshContext,
-  type ToolCallDetail,
 } from "../../agent-sdk-types.js";
 import { importSessionFromPersistence } from "../../provider-session-import.js";
 import { runProviderRefreshActivity } from "../../provider-refresh-deadline.js";
@@ -65,6 +66,11 @@ import {
 } from "./history-mapper.js";
 import { materializeProviderImage } from "../provider-image-output.js";
 import { PiCliRuntime } from "./cli-runtime.js";
+import {
+  createPiExtensionHost,
+  piExtensionRuntimeBridge,
+  type PiExtensionEventOutput,
+} from "./extensions/index.js";
 import { revertPiConversation } from "./rewind.js";
 import { listPiImportableSessions, readPiImportSessionConfig } from "./session-descriptor.js";
 import type { PiRuntime, PiRuntimeSession, PiStartSessionInput } from "./runtime.js";
@@ -83,7 +89,6 @@ import {
   mapToolDetail,
   parseToolArgs,
   parseToolResult,
-  resolveToolCallName,
   type PiToolResult,
   type PiTrackedToolCall,
 } from "./tool-call-mapper.js";
@@ -93,17 +98,15 @@ const DEFAULT_PI_THINKING_LEVEL: PiThinkingLevel = "medium";
 const PI_BINARY_COMMAND = process.env.PI_COMMAND ?? process.env.PI_ACP_PI_COMMAND ?? "pi";
 const PASEO_PI_TREE_EXTENSION_COMMAND = "paseo_tree";
 const PASEO_PI_CAPTURE_EXTENSION_COMMAND = "paseo_capture_entries";
+const PASEO_PI_REWIND_ENTRY_TYPE = "paseo_rewind";
 const PASEO_PI_ENTRY_CAPTURE_MARKER = "PASEO_ENTRY_CAPTURE";
 const PASEO_PI_SUBMITTED_USER_ENTRY_MARKER = "PASEO_SUBMITTED_USER_ENTRY";
 const PASEO_PI_COMMAND_RESULT_MARKER = "PASEO_COMMAND_RESULT";
 const DEFAULT_PI_EXTENSION_RESULT_TIMEOUT_MS = 30_000;
 const DEFAULT_PI_RPC_TIMEOUT_MS = 60_000;
 const QUESTION_RESPONSE_HEADER = "Response";
-const QUESTION_COMMENT_HEADER = "Comment";
-const PI_ASK_USER_FREEFORM_SENTINEL = "✏️ Type custom response...";
-const COMBINED_ASK_USER_METADATA = "ask_user_select_optional_comment";
 
-export const PiProviderParamsSchema = z
+export const PiProviderOptionsSchema = z
   .object({
     sessionDir: z.string().min(1).optional(),
     rpcTimeoutMs: z.number().int().positive().default(DEFAULT_PI_RPC_TIMEOUT_MS),
@@ -111,8 +114,6 @@ export const PiProviderParamsSchema = z
   })
   .strict();
 
-type PiProviderParams = z.infer<typeof PiProviderParamsSchema>;
-
 const PI_HANDLED_BUILTIN_SLASH_COMMANDS: AgentSlashCommand[] = [
   {
     name: "compact",
@@ -171,12 +172,11 @@ const PI_THINKING_OPTIONS: ReadonlyArray<{
   id: PiThinkingLevel;
   label: string;
   description: string;
-  isDefault?: boolean;
 }> = [
   { id: "off", label: "Off", description: "No extra reasoning" },
   { id: "minimal", label: "Minimal", description: "Light reasoning" },
   { id: "low", label: "Low", description: "Faster reasoning" },
-  { id: "medium", label: "Medium", description: "Balanced reasoning", isDefault: true },
+  { id: "medium", label: "Medium", description: "Balanced reasoning" },
   { id: "high", label: "High", description: "Deeper reasoning" },
   { id: "xhigh", label: "XHigh", description: "Very deep reasoning" },
   { id: "max", label: "Max", description: "Extreme reasoning" },
@@ -185,7 +185,6 @@ const PI_THINKING_OPTIONS: ReadonlyArray<{
 export interface PiRpcAgentClientOptions {
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
-  providerParams?: unknown;
   runtime?: PiRuntime;
   usagePollScheduler?: PiUsagePollScheduler;
 }
@@ -261,13 +260,17 @@ interface PiMcpServerConfig {
   env?: Record<string, string>;
   url?: string;
   headers?: Record<string, string>;
-  auth?: false;
-  oauth?: false;
 }
 
-interface PiMcpConfigFile {
-  path: string;
-  cleanup: () => void;
+// Pi's built-in MCP extension takes servers from Paseo's extension; pi-mcp-adapter replaces it
+// and takes them from a --mcp-config file.
+type PiMcpInjection =
+  | { kind: "builtin"; servers: Record<string, PiMcpServerConfig> }
+  | { kind: "adapter"; configFile: PiTempFile };
+
+interface PiPaseoExtensionOptions {
+  systemPrompt?: string;
+  mcpServers?: Record<string, PiMcpServerConfig>;
 }
 
 interface PiTempFile {
@@ -285,22 +288,9 @@ interface PendingExtensionResult {
   timer: NodeJS.Timeout;
 }
 
-interface ActiveAskUserDialog {
-  allowComment: boolean;
-  allowFreeform: boolean;
-  allowMultiple: boolean;
-}
-
-interface PendingCombinedAskUserResponse {
-  comment: string;
-  freeform: string | null;
-}
-
 interface ExtensionUiMappingOptions {
   provider?: AgentProvider;
   label?: string;
-  combineOptionalComment?: boolean;
-  allowFreeform?: boolean;
 }
 
 interface PiSlashCommandInvocation {
@@ -373,21 +363,6 @@ function parseAutoCompactMode(value: string | undefined): AutoCompactMode {
   return "unknown";
 }
 
-function mapThinkingOption(option: (typeof PI_THINKING_OPTIONS)[number]) {
-  const mappedOption = {
-    id: option.id,
-    label: option.label,
-    description: option.description,
-  };
-  if (option.isDefault) {
-    return {
-      ...mappedOption,
-      isDefault: true,
-    };
-  }
-  return mappedOption;
-}
-
 function piModelSupportsImageInput(model: PiModel | null | undefined): boolean {
   return model?.input?.includes("image") === true;
 }
@@ -514,16 +489,15 @@ function buildResumeStartInput(input: {
   resumeConfig: PiResumeConfig;
   sessionFile: string;
   launchContext: AgentLaunchContext | undefined;
-  mcpConfig: PiMcpConfigFile | null;
+  mcpConfigFile: PiTempFile | null;
   paseoExtension: PiTempFile | null;
 }): PiStartSessionInput {
   return {
     cwd: input.resumeConfig.cwd,
     env: input.launchContext?.env,
     session: input.sessionFile,
-    model: input.resumeConfig.model,
     thinkingOptionId: normalizePiThinkingOption(input.resumeConfig.thinkingOptionId) ?? undefined,
-    mcpConfigPath: input.mcpConfig?.path,
+    mcpConfigPath: input.mcpConfigFile?.path,
     extensionPaths: input.paseoExtension ? [input.paseoExtension.path] : undefined,
   };
 }
@@ -540,11 +514,36 @@ function toPiMcpConfig(config: McpServerConfig): PiMcpServerConfig {
   return {
     url: config.url,
     ...(config.headers ? { headers: config.headers } : {}),
-    auth: false,
-    oauth: false,
   };
 }
 
+function toPiMcpAdapterConfig(
+  config: McpServerConfig,
+): PiMcpServerConfig & { auth?: false; oauth?: false } {
+  const piConfig = toPiMcpConfig(config);
+  return config.type === "stdio" ? piConfig : { ...piConfig, auth: false, oauth: false };
+}
+
+function toPiBuiltinMcpServers(
+  servers: Record<string, McpServerConfig>,
+): Record<string, PiMcpServerConfig> {
+  const piServers: Record<string, PiMcpServerConfig> = {};
+  for (const [name, config] of Object.entries(servers)) {
+    if (!/^[A-Za-z0-9_-]+$/.test(name)) {
+      throw new Error(
+        `Pi's built-in MCP cannot register server "${name}": names may only contain letters, digits, "_", and "-".`,
+      );
+    }
+    if (config.type === "sse") {
+      throw new Error(
+        `Pi's built-in MCP cannot register SSE server "${name}": use streamable HTTP or load pi-mcp-adapter.`,
+      );
+    }
+    piServers[name] = toPiMcpConfig(config);
+  }
+  return piServers;
+}
+
 function resolvePiAgentDir(env: Record<string, string> | undefined): string {
   const configured = env?.PI_CODING_AGENT_DIR?.trim() || process.env.PI_CODING_AGENT_DIR?.trim();
   if (!configured) {
@@ -585,7 +584,7 @@ function createPiMcpConfigFile(
   options?: {
     piGlobalConfigEnv?: Record<string, string>;
   },
-): PiMcpConfigFile {
+): PiTempFile {
   const globalConfig = options?.piGlobalConfigEnv
     ? readPiGlobalMcpConfig(options.piGlobalConfigEnv)
     : {};
@@ -597,7 +596,7 @@ function createPiMcpConfigFile(
   }
   const mcpServers: Record<string, unknown> = { ...configuredServers };
   for (const [name, serverConfig] of Object.entries(servers)) {
-    mcpServers[name] = toPiMcpConfig(serverConfig);
+    mcpServers[name] = toPiMcpAdapterConfig(serverConfig);
   }
 
   const dir = mkdtempSync(join(tmpdir(), "paseo-pi-mcp-"));
@@ -614,7 +613,10 @@ function createPiMcpConfigFile(
   };
 }
 
-function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
+function createPiPaseoExtensionFile({
+  systemPrompt,
+  mcpServers = {},
+}: PiPaseoExtensionOptions): PiTempFile {
   const dir = mkdtempSync(join(tmpdir(), "paseo-pi-extension-"));
   const filePath = join(dir, "paseo-integration.mjs");
   writeFileSync(
@@ -637,9 +639,8 @@ function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
 	    .join("\\n\\n");
 	}
 
-	function getCapturedUserEntries(ctx) {
-	  return ctx.sessionManager
-	    .getEntries()
+	function toCapturedUserEntries(entries) {
+	  return entries
 	    .filter((entry) => entry.type === "message" && entry.message?.role === "user")
 	    .map(toCapturedUserEntry);
 	}
@@ -655,7 +656,14 @@ function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
 	function emitEntryCapture(ctx, reason, requestId) {
 	  ctx.ui.notify(
 	    "${PASEO_PI_ENTRY_CAPTURE_MARKER} " +
-	      JSON.stringify({ reason, requestId, entries: getCapturedUserEntries(ctx) }),
+	      JSON.stringify({
+	        reason,
+	        requestId,
+	        // Rewind targets: rows can still show entries that a rewind or compaction left off the branch.
+	        treeEntries: toCapturedUserEntries(ctx.sessionManager.getEntries()),
+	        // The entries getMessages() replays, so the nth one is the nth replayed user message.
+	        contextEntries: toCapturedUserEntries(ctx.sessionManager.buildContextEntries()),
+	      }),
 	    "info",
 	  );
 	}
@@ -668,7 +676,11 @@ function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
 	}
 
 	export default function paseoIntegration(pi) {
+	  for (const [name, config] of Object.entries(${JSON.stringify(mcpServers)})) {
+	    pi.registerMcpServer(name, config);
+	  }
 	  const submittedUserMessages = [];
+	  ${piExtensionRuntimeBridge}
 
 	  function emitSubmittedUserEntries(ctx) {
 	    const entries = ctx.sessionManager.getEntries();
@@ -735,6 +747,8 @@ function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
 	      const payload = decodePayload(args.trim());
 	      try {
 	        const result = await ctx.navigateTree(payload.targetId, { summarize: false });
+	        // Pi reopens a session at its last entry, so record the rewind on the new branch to keep it.
+	        pi.appendEntry("${PASEO_PI_REWIND_ENTRY_TYPE}", { targetId: payload.targetId });
 	        emitEntryCapture(ctx, "tree_navigation");
 	        emitCommandResult(ctx, payload.requestId, { ok: true, result });
 	      } catch (error) {
@@ -746,7 +760,8 @@ function createPiPaseoExtensionFile(systemPrompt?: string): PiTempFile {
 	  });
 	}
 `.trimStart(),
-    "utf8",
+    // MCP server headers and env can carry credentials.
+    { encoding: "utf8", mode: 0o600 },
   );
   return {
     path: filePath,
@@ -776,6 +791,14 @@ function isPiMcpAdapterCommand(command: PiRpcSlashCommand): boolean {
   return JSON.stringify(command.sourceInfo).includes("pi-mcp-adapter");
 }
 
+function isPiBuiltinMcpCommand(command: PiRpcSlashCommand): boolean {
+  return (
+    command.source === "extension" &&
+    command.name === "mcp" &&
+    command.sourceInfo?.path === "builtin:mcp"
+  );
+}
+
 function withPiCapabilities(supportsMcpServers: boolean): AgentCapabilityFlags {
   return {
     ...PI_CAPABILITIES,
@@ -791,14 +814,6 @@ function isPiRequestAbortError(error: unknown): boolean {
   return /\brequest was aborted\b|\babort(ed)?\b/i.test(toDiagnosticErrorMessage(error));
 }
 
-function resolveThinkingOptionId(
-  cachedThinkingOptionId: string | null,
-  sessionThinkingLevel: PiThinkingLevel,
-): PiThinkingLevel | null {
-  const currentThinking = cachedThinkingOptionId ?? sessionThinkingLevel;
-  return normalizePiThinkingOption(currentThinking);
-}
-
 function modelToId(model: PiModel | null | undefined): string | null {
   return model?.provider && model.id ? `${model.provider}/${model.id}` : null;
 }
@@ -855,6 +870,13 @@ function optionalString(value: unknown): string | undefined {
   return typeof value === "string" ? value : undefined;
 }
 
+function toNotificationLevel(value: unknown): "info" | "warning" | "error" {
+  if (value === "info" || value === "warning" || value === "error") {
+    return value;
+  }
+  return "info";
+}
+
 function parseExtensionMarkerPayload(
   message: string,
   marker: string,
@@ -895,21 +917,6 @@ function parseCapturedEntries(value: unknown): PiCapturedEntry[] {
   });
 }
 
-function optionalBoolean(value: unknown): boolean | undefined {
-  return typeof value === "boolean" ? value : undefined;
-}
-
-function readActiveAskUserDialog(toolName: string, args: unknown): ActiveAskUserDialog | null {
-  if (toolName !== "ask_user" || !isRecord(args)) {
-    return null;
-  }
-  return {
-    allowComment: optionalBoolean(args.allowComment) ?? false,
-    allowFreeform: optionalBoolean(args.allowFreeform) ?? true,
-    allowMultiple: optionalBoolean(args.allowMultiple) ?? false,
-  };
-}
-
 function isOptionalInputPlaceholder(placeholder: string | undefined): boolean {
   return /\boptional\b|\bskip\b/i.test(placeholder ?? "");
 }
@@ -930,10 +937,6 @@ function readStringArray(value: unknown): string[] {
     : [];
 }
 
-function isPiAskUserFreeformOption(option: string): boolean {
-  return option === PI_ASK_USER_FREEFORM_SENTINEL;
-}
-
 function mapExtensionUiRequestToPermission(
   event: Extract<PiRuntimeEvent, { type: "extension_ui_request" }>,
   options: ExtensionUiMappingOptions = {},
@@ -943,15 +946,6 @@ function mapExtensionUiRequestToPermission(
   switch (event.method) {
     case "select": {
       const selectOptions = readStringArray(event.options);
-      if (options.combineOptionalComment) {
-        return buildCombinedAskUserQuestionPermission(event, {
-          provider,
-          label,
-          question: optionalString(event.title) ?? "Select an option",
-          options: selectOptions,
-          allowFreeform: options.allowFreeform === true,
-        });
-      }
       return buildExtensionUiQuestionPermission(event, {
         provider,
         label,
@@ -1011,6 +1005,8 @@ function isProcessExitEvent(
 
 function isPiAgentSessionEvent(event: PiRuntimeEvent): event is PiAgentSessionEvent {
   switch (event.type) {
+    case "thinking_level_changed":
+      return typeof event.level === "string" && normalizePiThinkingOption(event.level) !== null;
     case "agent_start":
     case "turn_start":
     case "message_start":
@@ -1069,63 +1065,6 @@ function buildExtensionUiQuestionPermission(
   };
 }
 
-function buildCombinedAskUserQuestionPermission(
-  event: Extract<PiRuntimeEvent, { type: "extension_ui_request" }>,
-  input: {
-    provider: AgentProvider;
-    label: string;
-    question: string;
-    options: string[];
-    allowFreeform: boolean;
-  },
-): AgentPermissionRequest {
-  const visibleOptions = input.options.filter((option) => !isPiAskUserFreeformOption(option));
-  const allowOther = input.allowFreeform || visibleOptions.length !== input.options.length;
-  return {
-    id: event.id,
-    provider: input.provider,
-    name: `${input.label} ask_user`,
-    kind: "question",
-    title: input.question,
-    input: {
-      questions: [
-        {
-          question: input.question,
-          header: QUESTION_RESPONSE_HEADER,
-          options: visibleOptions.map((label) => ({ label })),
-          multiSelect: false,
-          ...(allowOther ? { allowOther: true } : {}),
-        },
-        {
-          question: "Optional comment",
-          header: QUESTION_COMMENT_HEADER,
-          options: [],
-          multiSelect: false,
-          placeholder: "Optional comment (press Enter to skip)...",
-          allowEmpty: true,
-        },
-      ],
-    },
-    metadata: {
-      extensionUiMethod: event.method,
-      answerHeader: QUESTION_RESPONSE_HEADER,
-      commentHeader: QUESTION_COMMENT_HEADER,
-      combinedAskUser: COMBINED_ASK_USER_METADATA,
-      selectOptions: visibleOptions,
-      ...(allowOther ? { freeformSentinel: PI_ASK_USER_FREEFORM_SENTINEL } : {}),
-    },
-  };
-}
-
-function permissionAnswer(input: AgentMetadata | undefined, header: string): string | null {
-  const answers = isRecord(input?.answers) ? input.answers : null;
-  if (!answers) {
-    return null;
-  }
-  const answer = answers[header];
-  return typeof answer === "string" ? answer : null;
-}
-
 function firstPermissionAnswer(input: AgentMetadata | undefined): string | null {
   const answers = isRecord(input?.answers) ? input.answers : null;
   if (!answers) {
@@ -1135,39 +1074,6 @@ function firstPermissionAnswer(input: AgentMetadata | undefined): string | null
   return typeof first === "string" ? first : null;
 }
 
-function isCombinedAskUserPermission(request: AgentPermissionRequest): boolean {
-  return request.metadata?.combinedAskUser === COMBINED_ASK_USER_METADATA;
-}
-
-function buildCombinedAskUserSelectionResponse(
-  request: AgentPermissionRequest,
-  response: AgentPermissionResponse,
-): {
-  uiResponse: { value?: string; cancelled?: boolean };
-  pendingResponse: PendingCombinedAskUserResponse | null;
-} {
-  if (response.behavior === "deny") {
-    return { uiResponse: { cancelled: true }, pendingResponse: null };
-  }
-
-  const answer = permissionAnswer(response.updatedInput, QUESTION_RESPONSE_HEADER);
-  if (answer === null) {
-    return { uiResponse: { cancelled: true }, pendingResponse: null };
-  }
-
-  const selectOptions = readStringArray(request.metadata?.selectOptions);
-  const freeformSentinel = optionalString(request.metadata?.freeformSentinel);
-  const isFreeform = Boolean(freeformSentinel) && !selectOptions.includes(answer);
-  const comment = permissionAnswer(response.updatedInput, QUESTION_COMMENT_HEADER) ?? "";
-  return {
-    uiResponse: { value: isFreeform ? freeformSentinel : answer },
-    pendingResponse: {
-      comment,
-      freeform: isFreeform ? answer : null,
-    },
-  };
-}
-
 function buildExtensionUiResponse(
   request: AgentPermissionRequest,
   response: AgentPermissionResponse,
@@ -1188,7 +1094,50 @@ function buildExtensionUiResponse(
   return { value: answer };
 }
 
+function resolvePiThinkingConfig(
+  model: PiModel,
+): Pick<AgentModelDefinition, "thinkingOptions" | "defaultThinkingOptionId"> {
+  if (!model.reasoning) {
+    return { thinkingOptions: undefined, defaultThinkingOptionId: undefined };
+  }
+
+  const supportedOptions = PI_THINKING_OPTIONS.filter((option) => {
+    const mapped = model.thinkingLevelMap?.[option.id];
+    if (mapped === null) {
+      return false;
+    }
+    if (option.id === "xhigh" || option.id === "max") {
+      return mapped !== undefined;
+    }
+    return true;
+  });
+  const defaultIndex = PI_THINKING_OPTIONS.findIndex(
+    (option) => option.id === DEFAULT_PI_THINKING_LEVEL,
+  );
+  // Pi clamps upward first, then falls back to the highest remaining lower level.
+  const higherDefault = supportedOptions.find(
+    (option) => PI_THINKING_OPTIONS.indexOf(option) >= defaultIndex,
+  );
+  const defaultOption = higherDefault ?? supportedOptions.at(-1);
+  const defaultThinkingOptionId = defaultOption?.id ?? "off";
+  return {
+    thinkingOptions: supportedOptions.map((option) => {
+      const mappedOption: AgentSelectOption = {
+        id: option.id,
+        label: option.label,
+        description: option.description,
+      };
+      if (option.id === defaultThinkingOptionId) {
+        mappedOption.isDefault = true;
+      }
+      return mappedOption;
+    }),
+    defaultThinkingOptionId,
+  };
+}
+
 function mapPiModel(model: PiModel, provider: AgentProvider): AgentModelDefinition {
+  const { thinkingOptions, defaultThinkingOptionId } = resolvePiThinkingConfig(model);
   return {
     provider,
     id: `${model.provider}/${model.id}`,
@@ -1198,8 +1147,8 @@ function mapPiModel(model: PiModel, provider: AgentProvider): AgentModelDefiniti
       provider: model.provider,
       modelId: model.id,
     },
-    thinkingOptions: model.reasoning ? PI_THINKING_OPTIONS.map(mapThinkingOption) : undefined,
-    defaultThinkingOptionId: model.reasoning ? DEFAULT_PI_THINKING_LEVEL : undefined,
+    thinkingOptions,
+    defaultThinkingOptionId,
   };
 }
 
@@ -1224,8 +1173,7 @@ export class PiRpcAgentSession implements AgentSession {
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private readonly activeToolCalls = new Map<string, PiTrackedToolCall>();
   private readonly pendingExtensionUiRequests = new Map<string, AgentPermissionRequest>();
-  private activeAskUserDialog: ActiveAskUserDialog | null = null;
-  private pendingCombinedAskUserResponse: PendingCombinedAskUserResponse | null = null;
+  private readonly extensionHost: ReturnType<typeof createPiExtensionHost>;
   private activeTurnId: string | null = null;
   private activeClientMessageId: string | null = null;
   private activeAssistantMessageId: string | null = null;
@@ -1237,10 +1185,9 @@ export class PiRpcAgentSession implements AgentSession {
   private activePromptRequestId: string | null = null;
   private readonly pendingPromptResults = new Map<string, boolean>();
   private readonly pendingSteerSubmissions: PiPendingSteerSubmission[] = [];
-  private lastKnownThinkingOptionId: string | null;
   currentLeafOverrideId: string | null | undefined;
-  private readonly capturedUserEntries: PiCapturedEntry[] = [];
-  private readonly capturedUserEntriesById = new Map<string, PiCapturedEntry>();
+  private readonly contextUserEntries: PiCapturedEntry[] = [];
+  private readonly treeUserEntriesById = new Map<string, PiCapturedEntry>();
   private readonly pendingExtensionResults = new Map<string, PendingExtensionResult>();
   private outOfBandCompactionEmit: ((event: AgentStreamEvent) => void) | null = null;
   private outOfBandCompactionStarted = false;
@@ -1251,26 +1198,40 @@ export class PiRpcAgentSession implements AgentSession {
   private readonly logger: Logger;
   private readonly usagePoller: PiUsagePoller;
   private closed = false;
-  // Pi reports an aborted OpenAI Responses stream before the abort RPC resolves.
-  // Keep the turn active until that RPC acknowledges the user-requested cancellation.
-  private interruptingTurnId: string | null = null;
-  private lastInterruptedTurnId: string | null = null;
-  private interruptedTerminalError: { turnId: string; error: string } | null = null;
+  private readonly closeController = new AbortController();
+  private readonly pendingExtensionHydrations = new Set<Promise<void>>();
+  // Pi publishes the terminal before acknowledging abort. Autonomous runs have no
+  // turn ID; retain their errors too until the cancellation request settles.
+  private interruptingTurn: { turnId: string | undefined; error: string | null } | null = null;
+
+  private readonly usageSessionKey = randomUUID();
+
+  usageSession() {
+    const env = this.runtimeSession.environment;
+    if (this.closed) return null;
+    return {
+      provider: "pi",
+      model: modelToId(this.state.model) ?? undefined,
+      env,
+      sessionKey: this.usageSessionKey,
+    };
+  }
 
   constructor(options: PiRpcAgentSessionOptions) {
     this.runtimeSession = options.runtimeSession;
     this.config = options.config;
     this.state = options.initialState;
+    this.config.thinkingOptionId = this.state.thinkingLevel;
     this.capabilities = options.capabilities;
     this.provider = PI_PROVIDER;
     this.currentModeId = options.currentModeId ?? null;
     this.cleanup = options.cleanup;
-    this.lastKnownThinkingOptionId =
-      normalizePiThinkingOption(options.config.thinkingOptionId) ??
-      this.state.thinkingLevel ??
-      null;
     this.extensionTimeoutMs = options.extensionTimeoutMs ?? DEFAULT_PI_EXTENSION_RESULT_TIMEOUT_MS;
     this.logger = options.logger;
+    this.extensionHost = createPiExtensionHost(this.logger);
+    this.extensionHost.follow((event) => {
+      if (!this.closeController.signal.aborted) this.emit(event);
+    });
     this.usagePoller = new PiUsagePoller({
       scheduler: options.usagePollScheduler,
       readStats: () => this.runtimeSession.getSessionStats(),
@@ -1322,7 +1283,6 @@ export class PiRpcAgentSession implements AgentSession {
     const turnId = randomUUID();
     this.activeTurnId = turnId;
     this.usagePoller.startTurn();
-    this.lastInterruptedTurnId = null;
     this.activeClientMessageId = options?.clientMessageId ?? null;
     this.activeAssistantMessageId = null;
     this.activeTurnStarted = false;
@@ -1455,7 +1415,11 @@ export class PiRpcAgentSession implements AgentSession {
     yield* streamPiHistory(
       this.provider,
       await this.runtimeSession.getMessages(),
-      this.capturedUserEntries,
+      this.contextUserEntries,
+      {},
+      // At most eight 2 MiB child files per replay; later cards retain their summaries.
+      createPiExtensionHost(this.logger, undefined, 16 * 1024 * 1024),
+      this.closeController.signal,
     );
   }
 
@@ -1465,10 +1429,7 @@ export class PiRpcAgentSession implements AgentSession {
       provider: this.provider,
       sessionId: this.state.sessionId,
       model: modelToId(this.state.model),
-      thinkingOptionId: resolveThinkingOptionId(
-        this.lastKnownThinkingOptionId,
-        this.state.thinkingLevel,
-      ),
+      thinkingOptionId: this.state.thinkingLevel,
       modeId: this.currentModeId,
     };
   }
@@ -1496,15 +1457,11 @@ export class PiRpcAgentSession implements AgentSession {
     }
     this.pendingExtensionUiRequests.delete(requestId);
 
-    if (isCombinedAskUserPermission(request)) {
-      const combined = buildCombinedAskUserSelectionResponse(request, response);
-      this.pendingCombinedAskUserResponse = combined.pendingResponse;
-      this.runtimeSession.respondToExtensionUiRequest(requestId, combined.uiResponse);
-    } else {
-      this.runtimeSession.respondToExtensionUiRequest(
-        requestId,
-        buildExtensionUiResponse(request, response),
-      );
+    const mapped = this.extensionHost.respondToPermission(request, response);
+    for (const reply of mapped?.responses ?? [
+      { id: requestId, response: buildExtensionUiResponse(request, response) },
+    ]) {
+      this.runtimeSession.respondToExtensionUiRequest(reply.id, reply.response);
     }
     this.emit({
       type: "permission_resolved",
@@ -1530,11 +1487,10 @@ export class PiRpcAgentSession implements AgentSession {
   }
 
   async interrupt(): Promise<void> {
-    const turnId = this.activeTurnId;
-    if (turnId) {
-      this.interruptingTurnId = turnId;
-      this.lastInterruptedTurnId = turnId;
-    }
+    const turnId = this.activeTurnId ?? undefined;
+    const interruption: typeof this.interruptingTurn =
+      this.activeTurnId || this.activeTurnStarted ? { turnId, error: null } : null;
+    this.interruptingTurn = interruption;
     try {
       try {
         await this.runtimeSession.clearQueue();
@@ -1547,12 +1503,11 @@ export class PiRpcAgentSession implements AgentSession {
       }
       await this.runtimeSession.abort();
     } catch (error) {
-      if (this.interruptingTurnId === turnId) {
-        this.interruptingTurnId = null;
+      const terminalError = this.interruptingTurn === interruption ? interruption?.error : null;
+      if (this.interruptingTurn === interruption) {
+        this.interruptingTurn = null;
       }
-      if (this.interruptedTerminalError?.turnId === turnId) {
-        const terminalError = this.interruptedTerminalError;
-        this.interruptedTerminalError = null;
+      if (terminalError) {
         this.usagePoller.stopTurn();
         this.activeTurnId = null;
         this.activeClientMessageId = null;
@@ -1566,12 +1521,17 @@ export class PiRpcAgentSession implements AgentSession {
           type: "turn_failed",
           provider: this.provider,
           turnId,
-          error: terminalError.error,
+          error: terminalError,
         });
       }
       throw error;
     }
-    if (turnId && this.activeTurnId === turnId) {
+    if (
+      interruption &&
+      this.interruptingTurn === interruption &&
+      (this.activeTurnId || this.activeTurnStarted) &&
+      (this.activeTurnId ?? undefined) === turnId
+    ) {
       this.usagePoller.stopTurn();
       this.activeTurnId = null;
       this.activeClientMessageId = null;
@@ -1588,11 +1548,8 @@ export class PiRpcAgentSession implements AgentSession {
         turnId,
       });
     }
-    if (this.interruptingTurnId === turnId) {
-      this.interruptingTurnId = null;
-    }
-    if (this.interruptedTerminalError?.turnId === turnId) {
-      this.interruptedTerminalError = null;
+    if (this.interruptingTurn === interruption) {
+      this.interruptingTurn = null;
     }
   }
 
@@ -1602,7 +1559,7 @@ export class PiRpcAgentSession implements AgentSession {
     }
     await this.refreshState().catch(() => undefined);
     await this.requestEntryCapture("rewind");
-    const targetEntry = this.capturedUserEntriesById.get(input.messageId);
+    const targetEntry = this.treeUserEntriesById.get(input.messageId);
     if (!targetEntry) {
       throw new Error(`Pi rewind target ${input.messageId} was not found in captured tree entries`);
     }
@@ -1629,10 +1586,13 @@ export class PiRpcAgentSession implements AgentSession {
       return;
     }
     this.closed = true;
+    this.closeController.abort();
+    this.extensionHost.close();
     this.usagePoller.close();
     try {
       await this.runtimeSession.close();
     } finally {
+      await Promise.all(this.pendingExtensionHydrations);
       this.rejectAllExtensionResults(new Error("Pi session closed"));
       this.cleanup?.();
     }
@@ -1685,22 +1645,14 @@ export class PiRpcAgentSession implements AgentSession {
     }
 
     const model = await this.runtimeSession.setModel(parsedReference.provider, parsedReference.id);
-    this.state = {
-      ...this.state,
-      model,
-    };
+    await this.refreshState();
     this.config.model = `${model.provider}/${model.id}`;
   }
 
   async setThinkingOption(thinkingOptionId: string | null): Promise<void> {
     const thinkingLevel = normalizePiThinkingOption(thinkingOptionId) ?? DEFAULT_PI_THINKING_LEVEL;
     await this.runtimeSession.setThinkingLevel(thinkingLevel);
-    this.lastKnownThinkingOptionId = thinkingLevel;
-    this.config.thinkingOptionId = thinkingLevel;
-    this.state = {
-      ...this.state,
-      thinkingLevel,
-    };
+    await this.refreshState();
   }
 
   private emit(event: AgentStreamEvent): void {
@@ -1709,6 +1661,24 @@ export class PiRpcAgentSession implements AgentSession {
     }
   }
 
+  private emitExtensionOutput(output: PiExtensionEventOutput | undefined, turnId?: string): void {
+    if (!output || this.closed) return;
+    for (const event of output.events) {
+      this.emit(event.type === "timeline" ? { ...event, turnId } : event);
+    }
+    const pending = output.hydration
+      .then((events) => {
+        if (this.closeController.signal.aborted) return;
+        for (const event of events) this.emit(event);
+        return undefined;
+      })
+      .catch((error) => {
+        this.logger.warn({ err: error }, "Pi extension hydration failed");
+      });
+    this.pendingExtensionHydrations.add(pending);
+    void pending.then(() => this.pendingExtensionHydrations.delete(pending));
+  }
+
   private currentTurnIdForEvent(): string | undefined {
     return this.activeTurnId ?? undefined;
   }
@@ -1956,11 +1926,14 @@ export class PiRpcAgentSession implements AgentSession {
     }
   }
 
-  private recordCapturedUserEntries(entries: PiCapturedEntry[]): void {
-    this.capturedUserEntries.splice(0, this.capturedUserEntries.length, ...entries);
-    this.capturedUserEntriesById.clear();
-    for (const entry of entries) {
-      this.capturedUserEntriesById.set(entry.id, entry);
+  private recordCapturedUserEntries(input: {
+    treeEntries: PiCapturedEntry[];
+    contextEntries: PiCapturedEntry[];
+  }): void {
+    this.contextUserEntries.splice(0, this.contextUserEntries.length, ...input.contextEntries);
+    this.treeUserEntriesById.clear();
+    for (const entry of input.treeEntries) {
+      this.treeUserEntriesById.set(entry.id, entry);
     }
   }
 
@@ -1996,10 +1969,12 @@ export class PiRpcAgentSession implements AgentSession {
     if (!payload) {
       return false;
     }
-    const entries = parseCapturedEntries(payload.entries);
-    this.recordCapturedUserEntries(entries);
+    this.recordCapturedUserEntries({
+      treeEntries: parseCapturedEntries(payload.treeEntries),
+      contextEntries: parseCapturedEntries(payload.contextEntries),
+    });
     if (typeof payload.requestId === "string") {
-      this.resolveExtensionResult(payload.requestId, entries);
+      this.resolveExtensionResult(payload.requestId, undefined);
     }
     return true;
   }
@@ -2026,6 +2001,11 @@ export class PiRpcAgentSession implements AgentSession {
   ): void {
     const message = optionalString(event.message);
     if (event.method === "notify" && message) {
+      const extensionMapping = this.extensionHost.mapRuntimeNotification(message);
+      if (extensionMapping) {
+        this.emitExtensionOutput(extensionMapping, this.currentTurnIdForEvent());
+        return;
+      }
       if (
         this.handleSubmittedUserEntryMarker(message) ||
         this.handleEntryCaptureMarker(message) ||
@@ -2033,23 +2013,29 @@ export class PiRpcAgentSession implements AgentSession {
       ) {
         return;
       }
-      this.bufferNoTurnOutput(message);
-    }
-
-    if (this.respondToCombinedAskUserFollowUp(event)) {
+      this.emit({
+        type: "timeline",
+        provider: this.provider,
+        turnId: this.currentTurnIdForEvent(),
+        item: {
+          type: "notification",
+          level: toNotificationLevel(event.notifyType),
+          message,
+        },
+      });
       return;
     }
 
-    const shouldCombineOptionalComment =
-      event.method === "select" &&
-      this.activeAskUserDialog?.allowComment === true &&
-      this.activeAskUserDialog.allowMultiple === false;
-    const request = mapExtensionUiRequestToPermission(event, {
-      provider: this.provider,
-      label: "Pi",
-      combineOptionalComment: shouldCombineOptionalComment,
-      allowFreeform: this.activeAskUserDialog?.allowFreeform,
-    });
+    const mapped = this.extensionHost.mapDialog(event, this.provider);
+    if (mapped?.type === "response") {
+      this.runtimeSession.respondToExtensionUiRequest(event.id, mapped.response);
+      return;
+    }
+    if (mapped?.type === "deferred") return;
+    const request =
+      mapped?.type === "permission"
+        ? mapped.request
+        : mapExtensionUiRequestToPermission(event, { provider: this.provider, label: "Pi" });
     if (!request) {
       return;
     }
@@ -2063,33 +2049,6 @@ export class PiRpcAgentSession implements AgentSession {
     });
   }
 
-  private respondToCombinedAskUserFollowUp(
-    event: Extract<PiRuntimeEvent, { type: "extension_ui_request" }>,
-  ): boolean {
-    const pending = this.pendingCombinedAskUserResponse;
-    if (!pending || event.method !== "input") {
-      return false;
-    }
-
-    const placeholder = optionalString(event.placeholder);
-    if (pending.freeform !== null && !isOptionalInputPlaceholder(placeholder)) {
-      this.pendingCombinedAskUserResponse = {
-        ...pending,
-        freeform: null,
-      };
-      this.runtimeSession.respondToExtensionUiRequest(event.id, { value: pending.freeform });
-      return true;
-    }
-
-    if (isOptionalInputPlaceholder(placeholder)) {
-      this.pendingCombinedAskUserResponse = null;
-      this.runtimeSession.respondToExtensionUiRequest(event.id, { value: pending.comment });
-      return true;
-    }
-
-    return false;
-  }
-
   private handleCommandOutput(textValue: unknown): void {
     if (!this.activeTurnId) {
       return;
@@ -2150,10 +2109,11 @@ export class PiRpcAgentSession implements AgentSession {
 
   private handleProcessExit(error: string): void {
     this.rejectAllExtensionResults(new Error(error));
-    if (!this.activeTurnId) {
+    this.interruptingTurn = null;
+    if (!this.activeTurnId && !this.activeTurnStarted) {
       return;
     }
-    const turnId = this.activeTurnId;
+    const turnId = this.activeTurnId ?? undefined;
     this.usagePoller.stopTurn();
     this.activeTurnId = null;
     this.activeClientMessageId = null;
@@ -2178,6 +2138,15 @@ export class PiRpcAgentSession implements AgentSession {
     }
 
     switch (event.type) {
+      case "thinking_level_changed":
+        this.state = { ...this.state, thinkingLevel: event.level };
+        this.config.thinkingOptionId = event.level;
+        this.emit({
+          type: "thinking_option_changed",
+          provider: this.provider,
+          thinkingOptionId: event.level,
+        });
+        return;
       case "agent_start":
         this.activeTurnStarted = true;
         this.clearNoTurnBuffers();
@@ -2212,7 +2181,25 @@ export class PiRpcAgentSession implements AgentSession {
       case "tool_execution_start": {
         const toolCall = parseToolArgs(event.toolName, event.args);
         this.activeToolCalls.set(event.toolCallId, toolCall);
-        this.activeAskUserDialog = readActiveAskUserDialog(event.toolName, event.args);
+        const request = this.extensionHost.onToolStart(
+          {
+            callId: event.toolCallId,
+            toolName: event.toolName,
+            args: toolCall.args,
+            status: "running",
+            result: null,
+          },
+          this.provider,
+        );
+        if (request) {
+          this.pendingExtensionUiRequests.set(request.id, request);
+          this.emit({
+            type: "permission_requested",
+            provider: this.provider,
+            request,
+            turnId: this.currentTurnIdForEvent(),
+          });
+        }
         this.emitToolCallEvent(event.toolCallId, toolCall, "running", null, null);
         return;
       }
@@ -2273,6 +2260,9 @@ export class PiRpcAgentSession implements AgentSession {
     event: Extract<PiAgentSessionEvent, { type: "agent_end" | "agent_settled" }>;
     turnId: string | undefined;
   }): void {
+    if (!this.activeTurnId && !this.activeTurnStarted) {
+      return;
+    }
     if (event.type === "agent_end") {
       // COMPAT(piAgentSettled): added in v0.5.0, remove after 2027-02-21 once the Pi
       // floor emits agent_settled and willRetry.
@@ -2280,14 +2270,10 @@ export class PiRpcAgentSession implements AgentSession {
         this.completeTurn(turnId, event.messages ?? []);
         return;
       }
-      if (this.activeTurnId) {
-        this.pendingSettledMessages = event.messages ?? [];
-      }
+      this.pendingSettledMessages = event.messages ?? [];
       return;
     }
-    if (this.activeTurnId) {
-      this.completeTurn(turnId, this.pendingSettledMessages ?? []);
-    }
+    this.completeTurn(turnId, this.pendingSettledMessages ?? []);
   }
 
   private handleToolExecutionEnd(
@@ -2297,14 +2283,16 @@ export class PiRpcAgentSession implements AgentSession {
       this.activeToolCalls.get(event.toolCallId) ?? parseToolArgs(event.toolName, null);
     this.activeToolCalls.delete(event.toolCallId);
 
-    if (event.toolName === "ask_user") {
-      this.activeAskUserDialog = null;
-      this.pendingCombinedAskUserResponse = null;
-    }
-
     const result = parseToolResult(event.result);
     const error = event.isError ? event.result : null;
     const status = event.isError ? "failed" : "completed";
+    this.extensionHost.onToolEnd({
+      callId: event.toolCallId,
+      toolName: toolCall.toolName,
+      args: toolCall.args,
+      status,
+      result,
+    });
     this.emitToolCallEvent(event.toolCallId, toolCall, status, result, error);
   }
 
@@ -2389,16 +2377,24 @@ export class PiRpcAgentSession implements AgentSession {
       return;
     }
     if (event.message.role === "custom") {
+      const customMapping = this.extensionHost.mapCustomMessage(event.message);
+      this.emitExtensionOutput(customMapping, turnId);
       const text = getUserMessageText(event.message.content);
-      if (text) {
+      if (event.message.display !== false && text) {
         this.emit({
           type: "timeline",
           provider: this.provider,
           turnId,
-          item: { type: "assistant_message", text },
+          item: mapCustomMessageToToolCall(
+            event.message,
+            text,
+            `${this.provider}-custom-${randomUUID()}`,
+          ),
         });
       }
-      this.completeTurn(turnId, []);
+      if (!this.activeTurnStarted) {
+        this.completeTurn(turnId, []);
+      }
       return;
     }
   }
@@ -2411,14 +2407,21 @@ export class PiRpcAgentSession implements AgentSession {
     error: unknown,
   ): boolean {
     const turnId = this.currentTurnIdForEvent();
-    const detail = this.mapToolDetail(toolCallId, toolCall, result);
+    const mapping = this.extensionHost.mapToolCall({
+      callId: toolCallId,
+      toolName: toolCall.toolName,
+      args: toolCall.args,
+      status,
+      result,
+    });
+    const detail = mapping?.detail ?? mapToolDetail(toolCall, result);
     if (!detail) {
       return false;
     }
     const baseItem = {
       type: "tool_call" as const,
       callId: toolCallId,
-      name: resolveToolCallName(toolCall, result),
+      name: mapping?.name ?? toolCall.toolName,
       detail,
     };
     const item =
@@ -2429,32 +2432,21 @@ export class PiRpcAgentSession implements AgentSession {
       turnId,
       item,
     });
+    this.emitExtensionOutput(mapping, turnId);
     return true;
   }
 
-  private mapToolDetail(
-    _toolCallId: string,
-    toolCall: PiTrackedToolCall,
-    result: PiToolResult,
-  ): ToolCallDetail | null {
-    return mapToolDetail(toolCall, result);
-  }
-
   private completeTurn(turnId: string | undefined, messages: PiAgentMessage[]): void {
-    if (turnId && this.interruptingTurnId === turnId && isPiAbortedTerminalResponse(messages)) {
-      this.interruptedTerminalError = {
-        turnId,
-        error: latestPiErrorMessage(messages) ?? "Pi turn failed",
-      };
-      return;
-    }
+    const errorMessage = latestPiErrorMessage(messages);
     if (
-      isPiAbortedTerminalResponse(messages) &&
-      (turnId === this.lastInterruptedTurnId || (!turnId && this.lastInterruptedTurnId !== null))
+      this.interruptingTurn &&
+      this.interruptingTurn.turnId === turnId &&
+      (errorMessage || isPiAbortedTerminalResponse(messages))
     ) {
-      this.lastInterruptedTurnId = null;
+      this.interruptingTurn.error = errorMessage ?? "Pi turn failed";
       return;
     }
+    this.interruptingTurn = null;
     this.activeTurnId = null;
     this.activeClientMessageId = null;
     this.activeAssistantMessageId = null;
@@ -2463,7 +2455,6 @@ export class PiRpcAgentSession implements AgentSession {
     this.pendingSettledMessages = null;
     this.pendingSteerSubmissions.length = 0;
     this.clearNoTurnBuffers();
-    const errorMessage = latestPiErrorMessage(messages);
     if (typeof errorMessage === "string" && errorMessage.length > 0) {
       this.usagePoller.stopTurn();
       this.emit({
@@ -2485,6 +2476,7 @@ export class PiRpcAgentSession implements AgentSession {
 
   private async refreshState(): Promise<void> {
     this.state = await this.runtimeSession.getState();
+    this.config.thinkingOptionId = this.state.thinkingLevel;
   }
 
   private async refreshAfterTurn(finalUsage: Promise<void>): Promise<void> {
@@ -2498,8 +2490,7 @@ export class PiRpcAgentClient implements AgentClient {
 
   private readonly logger: Logger;
   private readonly runtimeSettings?: ProviderRuntimeSettings;
-  private readonly providerParams: PiProviderParams;
-  private readonly runtime: PiRuntime;
+  private readonly runtime?: PiRuntime;
   private readonly usagePollScheduler?: PiUsagePollScheduler;
 
   constructor(options: PiRpcAgentClientOptions) {
@@ -2507,10 +2498,7 @@ export class PiRpcAgentClient implements AgentClient {
     this.capabilities = capabilitiesForClient();
     this.logger = options.logger;
     this.runtimeSettings = options.runtimeSettings;
-    this.providerParams = PiProviderParamsSchema.parse(options.providerParams ?? {});
-    this.runtime =
-      options.runtime ??
-      createRuntime(options.logger, options.runtimeSettings, this.providerParams.rpcTimeoutMs);
+    this.runtime = options.runtime;
     this.usagePollScheduler = options.usagePollScheduler;
   }
 
@@ -2518,28 +2506,31 @@ export class PiRpcAgentClient implements AgentClient {
     config: AgentSessionConfig,
     launchContext?: AgentLaunchContext,
   ): Promise<AgentSession> {
+    const providerOptions = PiProviderOptionsSchema.parse(config.providerOptions ?? {});
+    const runtime = this.resolveRuntime(providerOptions.rpcTimeoutMs);
     const mcpEnv = {
       ...this.runtimeSettings?.env,
       ...launchContext?.env,
     };
-    const mcpConfig = await this.prepareMcpConfig(config.cwd, config.mcpServers, mcpEnv);
-    const paseoExtension = createPiPaseoExtensionFile(
-      composeSystemPromptParts(config.systemPrompt, config.daemonAppendSystemPrompt),
-    );
+    const mcp = await this.prepareMcpInjection(config.cwd, config.mcpServers, mcpEnv, runtime);
+    const mcpConfigFile = mcp?.kind === "adapter" ? mcp.configFile : null;
+    const paseoExtension = createPiPaseoExtensionFile({
+      systemPrompt: composeSystemPromptParts(config.systemPrompt, config.daemonAppendSystemPrompt),
+      mcpServers: mcp?.kind === "builtin" ? mcp.servers : undefined,
+    });
     let runtimeSession: PiRuntimeSession;
     try {
-      runtimeSession = await this.runtime.startSession({
+      runtimeSession = await runtime.startSession({
         cwd: config.cwd,
         model: config.model,
-        thinkingOptionId:
-          normalizePiThinkingOption(config.thinkingOptionId) ?? DEFAULT_PI_THINKING_LEVEL,
+        thinkingOptionId: normalizePiThinkingOption(config.thinkingOptionId) ?? undefined,
         noSession: config.internal === true,
         env: launchContext?.env,
-        mcpConfigPath: mcpConfig?.path,
+        mcpConfigPath: mcpConfigFile?.path,
         extensionPaths: paseoExtension ? [paseoExtension.path] : undefined,
       });
     } catch (error) {
-      mcpConfig?.cleanup();
+      mcpConfigFile?.cleanup();
       paseoExtension?.cleanup();
       throw error;
     }
@@ -2548,15 +2539,15 @@ export class PiRpcAgentClient implements AgentClient {
         runtimeSession,
         config,
         initialState: await runtimeSession.getState(),
-        capabilities: capabilitiesForSession(mcpConfig !== null),
-        cleanup: combineCleanup([mcpConfig?.cleanup, paseoExtension?.cleanup]),
-        extensionTimeoutMs: this.providerParams.extensionTimeoutMs,
+        capabilities: capabilitiesForSession(mcp !== null),
+        cleanup: combineCleanup([mcpConfigFile?.cleanup, paseoExtension?.cleanup]),
+        extensionTimeoutMs: providerOptions.extensionTimeoutMs,
         logger: this.logger,
         usagePollScheduler: this.usagePollScheduler,
       });
     } catch (error) {
       await runtimeSession.close().catch(() => undefined);
-      mcpConfig?.cleanup();
+      mcpConfigFile?.cleanup();
       paseoExtension?.cleanup();
       throw error;
     }
@@ -2575,60 +2566,102 @@ export class PiRpcAgentClient implements AgentClient {
     const persistenceMetadata = parsePersistenceMetadata(handle.metadata);
     const resumeConfig = buildResumeConfig(persistenceMetadata, overrides, this.provider);
 
+    const providerOptions = PiProviderOptionsSchema.parse(
+      resumeConfig.config.providerOptions ?? {},
+    );
+    const runtime = this.resolveRuntime(providerOptions.rpcTimeoutMs);
     const mcpEnv = {
       ...this.runtimeSettings?.env,
       ...launchContext?.env,
     };
-    const mcpConfig = await this.prepareMcpConfig(
+    const mcp = await this.prepareMcpInjection(
       resumeConfig.cwd,
       resumeConfig.config.mcpServers,
       mcpEnv,
+      runtime,
     );
-    const paseoExtension = createPiPaseoExtensionFile(
-      composeSystemPromptParts(
+    const mcpConfigFile = mcp?.kind === "adapter" ? mcp.configFile : null;
+    const paseoExtension = createPiPaseoExtensionFile({
+      systemPrompt: composeSystemPromptParts(
         resumeConfig.config.systemPrompt,
         resumeConfig.config.daemonAppendSystemPrompt,
       ),
-    );
+      mcpServers: mcp?.kind === "builtin" ? mcp.servers : undefined,
+    });
     let runtimeSession: PiRuntimeSession;
     try {
-      runtimeSession = await this.runtime.startSession(
+      runtimeSession = await runtime.startSession(
         buildResumeStartInput({
           resumeConfig,
           sessionFile,
           launchContext,
-          mcpConfig,
+          mcpConfigFile,
           paseoExtension,
         }),
       );
     } catch (error) {
-      mcpConfig?.cleanup();
+      mcpConfigFile?.cleanup();
       paseoExtension?.cleanup();
       throw error;
     }
     try {
+      const initialState = await this.applyResumeModel(runtimeSession, resumeConfig.model);
       return new PiRpcAgentSession({
         runtimeSession,
-        config: resumeConfig.config,
-        initialState: await runtimeSession.getState(),
-        capabilities: capabilitiesForSession(mcpConfig !== null),
-        cleanup: combineCleanup([mcpConfig?.cleanup, paseoExtension?.cleanup]),
-        extensionTimeoutMs: this.providerParams.extensionTimeoutMs,
+        config: {
+          ...resumeConfig.config,
+          model: modelToId(initialState.model) ?? resumeConfig.config.model,
+        },
+        initialState,
+        capabilities: capabilitiesForSession(mcp !== null),
+        cleanup: combineCleanup([mcpConfigFile?.cleanup, paseoExtension?.cleanup]),
+        extensionTimeoutMs: providerOptions.extensionTimeoutMs,
         logger: this.logger,
         usagePollScheduler: this.usagePollScheduler,
       });
     } catch (error) {
       await runtimeSession.close().catch(() => undefined);
-      mcpConfig?.cleanup();
+      mcpConfigFile?.cleanup();
       paseoExtension?.cleanup();
       throw error;
     }
   }
 
+  // Pi resumes a session on the model it recorded, or on its default when that model
+  // is gone. Switching afterwards keeps a removed model from blocking the resume.
+  private async applyResumeModel(
+    runtimeSession: PiRuntimeSession,
+    requestedModel: string | undefined,
+  ): Promise<PiSessionState> {
+    const state = await runtimeSession.getState();
+    const reference = parseModelReference(requestedModel ?? null);
+    if (!reference?.provider) {
+      return state;
+    }
+    const { provider, id } = reference;
+    const isRequested = (model: PiModel | null | undefined) =>
+      model?.provider === provider && model.id === id;
+    if (isRequested(state.model)) {
+      return state;
+    }
+    const availableModels = await runtimeSession.getAvailableModels();
+    if (!availableModels.some(isRequested)) {
+      this.logger.warn(
+        { requestedModel, sessionModel: modelToId(state.model) },
+        "Pi resumed on the session's model because the requested model is unavailable",
+      );
+      return state;
+    }
+    await runtimeSession.setModel(provider, id);
+    return runtimeSession.getState();
+  }
+
   async fetchCatalog(
     options: FetchCatalogOptions,
     context?: ProviderRefreshContext,
   ): Promise<ProviderCatalog> {
+    const providerOptions = PiProviderOptionsSchema.parse(options.providerOptions ?? {});
+    const runtime = this.resolveRuntime(providerOptions.rpcTimeoutMs);
     let runtimeSession: PiRuntimeSession | undefined;
     let closePromise: Promise<void> | undefined;
     const closeSession = () => {
@@ -2640,7 +2673,7 @@ export class PiRpcAgentClient implements AgentClient {
     context?.signal.addEventListener("abort", handleAbort, { once: true });
     try {
       await runProviderRefreshActivity(context, "runtime.start", async () => {
-        runtimeSession = await this.runtime.startSession({
+        runtimeSession = await runtime.startSession({
           cwd: options.scope === "global" ? homedir() : options.cwd,
           signal: context?.signal,
         });
@@ -2648,12 +2681,23 @@ export class PiRpcAgentClient implements AgentClient {
       });
       if (!runtimeSession) throw new Error("Pi catalog runtime did not start");
       const catalogSession = runtimeSession;
+      const piModels = await runProviderRefreshActivity(context, "get_available_models", () =>
+        catalogSession.getAvailableModels(null),
+      );
+      // A fresh Pi session starts on the model Pi resolves from its own settings.
+      const { model: configuredModel } = await runProviderRefreshActivity(
+        context,
+        "get_state",
+        () => catalogSession.getState(),
+      );
       const models = transformPiModels(
-        (
-          await runProviderRefreshActivity(context, "get_available_models", () =>
-            catalogSession.getAvailableModels(null),
-          )
-        ).map((model) => mapPiModel(model, PI_PROVIDER)),
+        piModels.map((model) => {
+          const mapped = mapPiModel(model, PI_PROVIDER);
+          const isConfigured =
+            model.provider === configuredModel?.provider && model.id === configuredModel?.id;
+          if (isConfigured) mapped.isDefault = true;
+          return mapped;
+        }),
       );
       return { models, modes: [] };
     } finally {
@@ -2671,7 +2715,7 @@ export class PiRpcAgentClient implements AgentClient {
   ): Promise<ImportableProviderSession[]> {
     return await listPiImportableSessions({
       ...options,
-      sessionDir: this.providerParams.sessionDir,
+      sessionDir: PiProviderOptionsSchema.parse(options?.providerOptions ?? {}).sessionDir,
       runtimeSettings: this.runtimeSettings,
     });
   }
@@ -2723,33 +2767,53 @@ export class PiRpcAgentClient implements AgentClient {
     }
   }
 
-  private async prepareMcpConfig(
+  private resolveRuntime(rpcTimeoutMs: number): PiRuntime {
+    return this.runtime ?? createRuntime(this.logger, this.runtimeSettings, rpcTimeoutMs);
+  }
+
+  private async prepareMcpInjection(
     cwd: string,
     servers: Record<string, McpServerConfig> | undefined,
     env: Record<string, string> | undefined,
-  ): Promise<PiMcpConfigFile | null> {
+    runtime: PiRuntime,
+  ): Promise<PiMcpInjection | null> {
     if (!servers || Object.keys(servers).length === 0) {
       return null;
     }
-    if (!(await this.detectMcpAdapter(cwd, env))) {
-      return null;
+    const mcpSupport = await this.detectMcpSupport(cwd, env, runtime);
+    if (mcpSupport === "builtin") {
+      return { kind: "builtin", servers: toPiBuiltinMcpServers(servers) };
     }
-    return createPiMcpConfigFile(servers, { piGlobalConfigEnv: env });
+    if (mcpSupport === "adapter") {
+      return {
+        kind: "adapter",
+        configFile: createPiMcpConfigFile(servers, { piGlobalConfigEnv: env }),
+      };
+    }
+    return null;
   }
 
-  private async detectMcpAdapter(cwd: string, env?: Record<string, string>): Promise<boolean> {
-    const runtimeSession = await this.runtime.startSession({ cwd, env }).catch((error) => {
-      this.logger.debug({ err: error, cwd }, "Pi MCP adapter probe failed to start");
+  private async detectMcpSupport(
+    cwd: string,
+    env: Record<string, string> | undefined,
+    runtime: PiRuntime,
+  ): Promise<PiMcpInjection["kind"] | null> {
+    const runtimeSession = await runtime.startSession({ cwd, env }).catch((error) => {
+      this.logger.debug({ err: error, cwd }, "Pi MCP probe failed to start");
       return null;
     });
     if (!runtimeSession) {
-      return false;
+      return null;
     }
     try {
-      return (await runtimeSession.getCommands()).some(isPiMcpAdapterCommand);
+      const commands = await runtimeSession.getCommands();
+      if (commands.some(isPiMcpAdapterCommand)) {
+        return "adapter";
+      }
+      return commands.some(isPiBuiltinMcpCommand) ? "builtin" : null;
     } catch (error) {
-      this.logger.debug({ err: error, cwd }, "Pi MCP adapter probe failed");
-      return false;
+      this.logger.debug({ err: error, cwd }, "Pi MCP probe failed");
+      return null;
     } finally {
       await runtimeSession.close().catch(() => undefined);
     }
diff --git a/packages/server/src/server/agent/providers/pi/cli-runtime.test.ts b/packages/server/src/server/agent/providers/pi/cli-runtime.test.ts
index 94517bde0d..463870760f 100644
--- a/packages/server/src/server/agent/providers/pi/cli-runtime.test.ts
+++ b/packages/server/src/server/agent/providers/pi/cli-runtime.test.ts
@@ -62,6 +62,15 @@ function onPiCommand(child: PiChild, handler: (command: Record<string, unknown>)
   });
 }
 
+/** Kill the child the moment it receives `type`, so the request is in flight when it dies. */
+function exitOnCommand(child: PiChild, type: string): void {
+  onPiCommand(child, (command) => {
+    if (command.type === type) {
+      child.emit("exit", 1, null);
+    }
+  });
+}
+
 function replyToCommands(
   child: PiChild,
   handler: (command: Record<string, unknown>) => unknown,
@@ -137,7 +146,12 @@ describe("PiCliRuntime", () => {
     const launches: PiRuntimeLaunch[] = [];
     const runtime = createRuntime(child, launches);
 
-    const session = await runtime.startSession({ cwd: "/workspace/project" });
+    const session = await runtime.startSession({
+      cwd: "/workspace/project",
+      env: { HOME: "/fixture/pi-home" },
+    });
+    expect(session.environment).toBe(launches[0]?.env);
+    expect(session.environment?.HOME).toBe("/fixture/pi-home");
 
     await expect(session.getState()).resolves.toMatchObject({
       sessionId: "pi-session-1",
@@ -278,7 +292,10 @@ describe("PiCliRuntime", () => {
 
     const state = session.getState();
     child.stderr.write("boom");
+    const environment = session.environment;
     child.emit("exit", 1, null);
+    expect(session.environment).toBe(environment);
+    expect(environment).toBeDefined();
 
     await expect(state).rejects.toThrow("boom");
   });
@@ -506,4 +523,25 @@ describe("PiCliRuntime", () => {
     // Neither RPC returned usable data — should resolve with empty object
     expect(stats).toEqual({});
   });
+
+  // A dead runtime owns no turn, so interrupting it is already satisfied. Rejecting here
+  // makes AgentManager treat the interrupt as unacknowledged and refuse the stop, which
+  // pins the agent at `running` until the daemon restarts. See issue #3749.
+  test("abort and clearQueue resolve once the Pi process has exited", async () => {
+    const child = createPiChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+
+    child.emit("exit", 1, null);
+
+    await expect(session.clearQueue()).resolves.toBeUndefined();
+    await expect(session.abort()).resolves.toBeUndefined();
+  });
+
+  test("abort resolves when the Pi process exits while the abort is in flight", async () => {
+    const child = createPiChild();
+    const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
+    exitOnCommand(child, "abort");
+
+    await expect(session.abort()).resolves.toBeUndefined();
+  });
 });
diff --git a/packages/server/src/server/agent/providers/pi/cli-runtime.ts b/packages/server/src/server/agent/providers/pi/cli-runtime.ts
index 783be30249..62ee01c503 100644
--- a/packages/server/src/server/agent/providers/pi/cli-runtime.ts
+++ b/packages/server/src/server/agent/providers/pi/cli-runtime.ts
@@ -1,3 +1,4 @@
+import { createExternalProcessEnv } from "../../../paseo-env.js";
 import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import type { Logger } from "pino";
 
@@ -56,6 +57,7 @@ export class PiCliRuntime implements PiRuntime {
       runtimeSettings: this.options.runtimeSettings,
       session: input,
     });
+    launch.env = createExternalProcessEnv(globalThis.process.env, launch.env ?? {});
     const [command, ...args] = launch.argv;
     const processLaunch: JsonlRpcLaunch = {
       command,
@@ -76,7 +78,7 @@ export class PiCliRuntime implements PiRuntime {
       await process.close(input.signal.reason);
       input.signal.throwIfAborted();
     }
-    return new PiCliRuntimeSession(process, this.commandsRpcName);
+    return new PiCliRuntimeSession(process, this.commandsRpcName, launch.env);
   }
 }
 
@@ -86,6 +88,7 @@ class PiCliRuntimeSession implements PiRuntimeSession {
   constructor(
     private readonly process: JsonlRpcProcess,
     private readonly commandsRpcName: string,
+    private readonly launchEnvironment: Record<string, string>,
   ) {
     process.onMessage((message) => {
       this.emit(message as PiRuntimeEvent);
@@ -95,6 +98,10 @@ class PiCliRuntimeSession implements PiRuntimeSession {
     });
   }
 
+  get environment(): Record<string, string> {
+    return this.launchEnvironment;
+  }
+
   onEvent(callback: (event: PiRuntimeEvent) => void): () => void {
     this.subscribers.add(callback);
     return () => {
@@ -133,7 +140,7 @@ class PiCliRuntimeSession implements PiRuntimeSession {
   }
 
   async clearQueue(): Promise<void> {
-    await this.request({ type: "clear_queue" });
+    await this.requestStopWork({ type: "clear_queue" });
   }
 
   async compact(customInstructions?: string): Promise<void> {
@@ -148,7 +155,7 @@ class PiCliRuntimeSession implements PiRuntimeSession {
   }
 
   async abort(): Promise<void> {
-    await this.request({ type: "abort" });
+    await this.requestStopWork({ type: "abort" });
   }
 
   async getState(): Promise<PiSessionState> {
@@ -237,6 +244,10 @@ class PiCliRuntimeSession implements PiRuntimeSession {
     return this.process.request(command, timeoutMs);
   }
 
+  private requestStopWork(command: PiRpcCommand): Promise<void> {
+    return this.process.requestStopWork(command);
+  }
+
   private async waitForCompletion(command: PiRpcCommand): Promise<void> {
     // Pi only replies after its compaction work is durable. Its child process and
     // session close paths already reject pending RPCs, so no elapsed-time failure
diff --git a/packages/server/src/server/agent/providers/pi/extensions/child-session.ts b/packages/server/src/server/agent/providers/pi/extensions/child-session.ts
new file mode 100644
index 0000000000..2013b831be
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/child-session.ts
@@ -0,0 +1,98 @@
+import { open } from "node:fs/promises";
+import { limitAgentTimelineItemContent } from "../../../agent-timeline-content.js";
+import type { ProviderSubagentInputEvent } from "../../../provider-subagents/store.js";
+import { PiHistoryMapper } from "../history-mapper.js";
+import type { PiAgentMessage } from "../rpc-types.js";
+import { extractTextFromToolResult, type PiToolResult } from "../tool-call-mapper.js";
+
+const MAX_BYTES = 2 * 1024 * 1024;
+const MAX_ITEMS = 200;
+
+export function outputFileFromToolResult(result: PiToolResult): string | undefined {
+  return extractTextFromToolResult(result)?.match(/^Output file:\s*(\S+)$/m)?.[1];
+}
+
+/** Reads a finished child transcript once, up to `maxBytes`. */
+export function mapPiChildSession(
+  id: string,
+  file: string,
+  maxBytes = MAX_BYTES,
+): Promise<ProviderSubagentInputEvent[]> {
+  return new PiChildSessionFollower(id, file, maxBytes).readNew();
+}
+
+function mapChildLine(
+  mapper: PiHistoryMapper,
+  id: string,
+  line: string,
+): ProviderSubagentInputEvent[] {
+  let entry: { message?: PiAgentMessage; timestamp?: string };
+  try {
+    entry = JSON.parse(line);
+  } catch {
+    return [];
+  }
+  if (!entry.message || typeof entry.message !== "object" || !("role" in entry.message)) return [];
+  return mapper.mapMessages([entry.message]).flatMap((mapped) =>
+    mapped.type === "timeline"
+      ? [
+          {
+            type: "timeline" as const,
+            id,
+            item: limitAgentTimelineItemContent(mapped.item),
+            ...(entry.timestamp ? { timestamp: entry.timestamp } : {}),
+          },
+        ]
+      : [],
+  );
+}
+
+/** Incrementally reads one append-only child transcript. A partial JSONL row is held until newline. */
+export class PiChildSessionFollower {
+  private offset = 0;
+  private pending = Buffer.alloc(0);
+  private readonly mapper = new PiHistoryMapper("pi");
+  private items = 0;
+  private readonly maxBytes: number;
+
+  constructor(
+    private readonly id: string,
+    private readonly file: string,
+    maxBytes = MAX_BYTES,
+  ) {
+    this.maxBytes = Math.min(maxBytes, MAX_BYTES);
+  }
+
+  async readNew(): Promise<ProviderSubagentInputEvent[]> {
+    if (this.offset >= this.maxBytes || this.items >= MAX_ITEMS) return [];
+    try {
+      const handle = await open(this.file, "r");
+      try {
+        const size = Math.min((await handle.stat()).size, this.maxBytes) - this.offset;
+        if (size <= 0) return [];
+        const buffer = Buffer.alloc(size);
+        const { bytesRead } = await handle.read(buffer, 0, size, this.offset);
+        this.offset += bytesRead;
+        const data = Buffer.concat([this.pending, buffer.subarray(0, bytesRead)]);
+        const lastNewline = data.lastIndexOf(10);
+        if (lastNewline < 0) {
+          this.pending = data;
+          return [];
+        }
+        this.pending = data.subarray(lastNewline + 1);
+        const events: ProviderSubagentInputEvent[] = [];
+        for (const line of data.subarray(0, lastNewline).toString("utf8").split("\n")) {
+          if (this.items >= MAX_ITEMS) break;
+          const mapped = mapChildLine(this.mapper, this.id, line).slice(0, MAX_ITEMS - this.items);
+          this.items += mapped.length;
+          events.push(...mapped);
+        }
+        return events;
+      } finally {
+        await handle.close();
+      }
+    } catch {
+      return [];
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/contract.ts b/packages/server/src/server/agent/providers/pi/extensions/contract.ts
new file mode 100644
index 0000000000..93129a0476
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/contract.ts
@@ -0,0 +1,83 @@
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  ToolCallDetail,
+  AgentTimelineItem,
+} from "../../../agent-sdk-types.js";
+import type { PiRuntimeEvent } from "../rpc-types.js";
+import type { PiToolResult } from "../tool-call-mapper.js";
+import type { ProviderSubagentInputEvent } from "../../../provider-subagents/store.js";
+import type { PiAgentMessage } from "../rpc-types.js";
+
+export interface PiExtensionToolCall {
+  callId: string;
+  toolName: string;
+  args: unknown;
+  status: "running" | "completed" | "failed";
+  result: PiToolResult;
+}
+
+export interface PiExtensionToolMapping {
+  name?: string;
+  detail?: ToolCallDetail;
+  timeline?: AgentTimelineItem[];
+  subagents?: ProviderSubagentInputEvent[];
+  childSessions?: PiChildSessionFile[];
+}
+
+export interface PiExtensionCustomMapping {
+  subagents: ProviderSubagentInputEvent[];
+  childSessions?: PiChildSessionFile[];
+}
+
+/**
+ * A Pi child's append-only session file, mapped through the normal Pi history mapper. Report it as
+ * soon as it is known; a live session follows it until the child's upsert reaches a final status.
+ */
+export interface PiChildSessionFile {
+  id: string;
+  file: string;
+}
+
+export type PiExtensionDialog = Extract<PiRuntimeEvent, { type: "extension_ui_request" }>;
+export interface PiExtensionUiResponse {
+  value?: string;
+  cancelled?: boolean;
+  confirmed?: boolean;
+}
+export type PiExtensionDialogMapping =
+  | { type: "permission"; request: AgentPermissionRequest }
+  | { type: "response"; response: PiExtensionUiResponse }
+  | { type: "deferred" };
+
+export interface PiExtensionUiReply {
+  responses: Array<{ id: string; response: PiExtensionUiResponse }>;
+}
+
+export interface PiExtensionSession {
+  mapToolCall?(call: PiExtensionToolCall): PiExtensionToolMapping | undefined;
+  /** Claims a `ctx.ui.notify` message sent by this extension's `runtimeBridge`. */
+  mapRuntimeNotification?(message: string): PiExtensionCustomMapping | undefined;
+  /** Called on the live follow cadence to report state Pi only writes to disk. */
+  poll?(): PiExtensionCustomMapping | undefined;
+  mapCustomMessage?(
+    message: Extract<PiAgentMessage, { role: "custom" }>,
+  ): PiExtensionCustomMapping | undefined;
+  onToolStart?(call: PiExtensionToolCall, provider: string): AgentPermissionRequest | undefined;
+  onToolEnd?(call: PiExtensionToolCall): void;
+  mapDialog?(dialog: PiExtensionDialog, provider: string): PiExtensionDialogMapping | undefined;
+  respondToPermission?(
+    request: AgentPermissionRequest,
+    response: AgentPermissionResponse,
+  ): PiExtensionUiReply | undefined;
+}
+
+export interface PiExtension {
+  id: string;
+  /**
+   * JavaScript statements run inside Paseo's Pi integration extension, with `pi` in scope. Reports
+   * state that Pi's RPC stream omits through `ctx.ui.notify`, which reaches `mapRuntimeNotification`.
+   */
+  runtimeBridge?: string;
+  createSession(): PiExtensionSession;
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/background.json b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/background.json
new file mode 100644
index 0000000000..3da491c8ca
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/background.json
@@ -0,0 +1,248 @@
+{
+  "provenance": {
+    "package": "@gotgenes/pi-subagents",
+    "version": "21.7.6",
+    "sourceCommit": "1ac6bc6a36e6da5d00f1cd2482f1b971f5ea1fdf",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_403820",
+      "toolName": "subagent",
+      "args": {
+        "description": "list files",
+        "subagent_type": "general-purpose",
+        "prompt": "list files in this empty workspace",
+        "run_in_background": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_403820",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent started in background.\nAgent ID: b913f6d2-2b1e-4be\nType: Agent\nDescription: list files\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "list files",
+          "subagentType": "general-purpose",
+          "tags": ["twin", "background"],
+          "toolUses": 0,
+          "tokens": "",
+          "durationMs": 0,
+          "status": "background",
+          "agentId": "b913f6d2-2b1e-4be"
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notification",
+        "content": "<task-notification>\n<task-id>b913f6d2-2b1e-4be</task-id>\n<tool-use-id>call_403820</tool-use-id>\n<output-file>/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl</output-file>\n<status>Done</status>\n<summary>Subagent \"list files\" completed</summary>\n<result>The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.</result>\n<usage><total_tokens>8843</total_tokens><tool_uses>1</tool_uses><context_percent>1</context_percent><duration_ms>3714</duration_ms></usage>\n</task-notification>\nFull transcript available at: /tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl\nCall get_subagent_result(\"b913f6d2-2b1e-4be\") to collect the full result.",
+        "display": true,
+        "details": {
+          "id": "b913f6d2-2b1e-4be",
+          "description": "list files",
+          "status": "completed",
+          "toolUses": 1,
+          "turnCount": 3,
+          "totalTokens": 8843,
+          "durationMs": 3714,
+          "outputFile": "/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl",
+          "resultPreview": "The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty."
+        },
+        "timestamp": 1790197700057
+      }
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_380752",
+      "toolName": "get_subagent_result",
+      "args": {
+        "agent_id": "b913f6d2-2b1e-4be"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_380752",
+      "toolName": "get_subagent_result",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent: b913f6d2-2b1e-4be\nType: Agent | Status: completed | Tool uses: 1 | 8.8k token | Context: 1% | Duration: 3.7s\nDescription: list files\n\nThe workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.\n\nFull transcript available at: /tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl"
+          }
+        ],
+        "details": {
+          "agentId": "b913f6d2-2b1e-4be",
+          "displayName": "Agent",
+          "status": "completed",
+          "description": "list files",
+          "toolUses": 1,
+          "tokens": "8.8k token",
+          "contextPercent": 0.6055831909179688,
+          "compactionCount": 0,
+          "duration": "3.7s",
+          "preview": "The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.",
+          "verbose": false,
+          "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl"
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_403820",
+          "name": "subagent",
+          "arguments": {
+            "description": "list files",
+            "subagent_type": "general-purpose",
+            "prompt": "list files in this empty workspace",
+            "run_in_background": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 6590,
+        "output": 46,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 6636,
+        "cost": {
+          "input": 0.0049425,
+          "output": 0.0001725,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.005115
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197694784,
+      "responseId": "gen-1790197695-1oeKbQMynKXs4RNlIMQ7",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_403820",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent started in background.\nAgent ID: b913f6d2-2b1e-4be\nType: Agent\nDescription: list files\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "list files",
+        "subagentType": "general-purpose",
+        "tags": ["twin", "background"],
+        "toolUses": 0,
+        "tokens": "",
+        "durationMs": 0,
+        "status": "background",
+        "agentId": "b913f6d2-2b1e-4be"
+      },
+      "isError": false,
+      "timestamp": 1790197696346
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notification",
+      "content": "<task-notification>\n<task-id>b913f6d2-2b1e-4be</task-id>\n<tool-use-id>call_403820</tool-use-id>\n<output-file>/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl</output-file>\n<status>Done</status>\n<summary>Subagent \"list files\" completed</summary>\n<result>The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.</result>\n<usage><total_tokens>8843</total_tokens><tool_uses>1</tool_uses><context_percent>1</context_percent><duration_ms>3714</duration_ms></usage>\n</task-notification>\nFull transcript available at: /tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl\nCall get_subagent_result(\"b913f6d2-2b1e-4be\") to collect the full result.",
+      "display": true,
+      "details": {
+        "id": "b913f6d2-2b1e-4be",
+        "description": "list files",
+        "status": "completed",
+        "toolUses": 1,
+        "turnCount": 3,
+        "totalTokens": 8843,
+        "durationMs": 3714,
+        "outputFile": "/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl",
+        "resultPreview": "The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty."
+      },
+      "timestamp": 1790197700057
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_380752",
+          "name": "get_subagent_result",
+          "arguments": {
+            "agent_id": "b913f6d2-2b1e-4be"
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 3383,
+        "output": 36,
+        "cacheRead": 3846,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 7265,
+        "cost": {
+          "input": 0.00253725,
+          "output": 0.000135,
+          "cacheRead": 0.00028845,
+          "cacheWrite": 0,
+          "total": 0.0029607
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197700058,
+      "responseId": "gen-1790197700-cKcLwp60V13TphEI0fPk",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_380752",
+      "toolName": "get_subagent_result",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent: b913f6d2-2b1e-4be\nType: Agent | Status: completed | Tool uses: 1 | 8.8k token | Context: 1% | Duration: 3.7s\nDescription: list files\n\nThe workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.\n\nFull transcript available at: /tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl"
+        }
+      ],
+      "details": {
+        "agentId": "b913f6d2-2b1e-4be",
+        "displayName": "Agent",
+        "status": "completed",
+        "description": "list files",
+        "toolUses": 1,
+        "tokens": "8.8k token",
+        "contextPercent": 0.6055831909179688,
+        "compactionCount": 0,
+        "duration": "3.7s",
+        "preview": "The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty.",
+        "verbose": false,
+        "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-gotgenes/2026-09-23T21-08-13-733Z_01a0d018-fd25-783b-b9e9-27f4bd6c8851/tasks/2026-09-23T21-08-17-217Z_01a0d019-0ac1-72e0-a277-0fea25d9da6c.jsonl"
+      },
+      "isError": false,
+      "timestamp": 1790197701316
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/child-session.jsonl b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/child-session.jsonl
new file mode 100644
index 0000000000..16da52431b
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/child-session.jsonl
@@ -0,0 +1,4 @@
+{"type":"message","id":"813a565d","parentId":"2837e00c","timestamp":"2026-09-23T21:08:17.356Z","message":{"role":"user","content":[{"type":"text","text":"list files in this empty workspace"}],"timestamp":1790197697355}}
+{"type":"message","id":"869bc287","parentId":"813a565d","timestamp":"2026-09-23T21:08:18.797Z","message":{"role":"assistant","content":[{"type":"thinking","thinking":"","thinkingSignature":"[{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a19A4eeufqsAJet9RoM5pf8bwBMUrJ4+R+m99YFQJ3pNYkkRTPI+5rHRCLH4sAKmyqJiSFTcFR+qKfVFQN91nm2RkncAczuy2UwYJ+mcvU1bG42y9Ca3gcGSZcBhP6IU6cu4KdfkqeEuBCx+bZQwylVRZlpiarhlv+fLQD/nE+m9KeFW+eZUJrIkd6nZYIdK0xAGVAxcbjDCh4rbZKMzCE7RB0G7adwu4ZxY2Sw1IVmIXz2Hgob+U1BXcm1YYNutIIDCN3q343v7QBEvmYpCm/ugM4C4KUrZHet8wudZUGmnAxDkVJxzBUjeUdmJiLDbJ/uCuRwjrvmxnaixsq0yeiSq4EisboKHtgWTMflaAAary+ClXQgY8sh00LjLQdO++Cp+Sn3per2ehlGW7680KBncXSDNiZXcjPJPRju6TRYseddNfdJdW6eDelqm6/GuBKX9hc8cVUT33kdkOqQDHbcHCw==\",\"format\":\"google-gemini-v1\",\"id\":\"call_342819\",\"index\":0}]"},{"type":"toolCall","id":"call_342819","name":"ls","arguments":{}}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":6230,"output":76,"cacheRead":0,"cacheWrite":0,"reasoning":68,"totalTokens":6306,"cost":{"input":0.0046725000000000004,"output":0.000285,"cacheRead":0,"cacheWrite":0,"total":0.0049575}},"stopReason":"toolUse","timestamp":1790197697356,"responseId":"gen-1790197697-mVNTI1th8irocnyQ3PSP","rawStopReason":"tool_calls"}}
+{"type":"message","id":"e2c2c160","parentId":"869bc287","timestamp":"2026-09-23T21:08:18.799Z","message":{"role":"toolResult","toolCallId":"call_342819","toolName":"ls","content":[{"type":"text","text":"(empty directory)"}],"isError":false,"timestamp":1790197698799}}
+{"type":"message","id":"97009824","parentId":"e2c2c160","timestamp":"2026-09-23T21:08:20.054Z","message":{"role":"assistant","content":[{"type":"text","text":"The workspace `/tmp/paseo-pi-extension-phase3/workspace` is currently empty."}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":2500,"output":37,"cacheRead":3813,"cacheWrite":0,"reasoning":16,"totalTokens":6350,"cost":{"input":0.0018750000000000001,"output":0.00013875,"cacheRead":0.000285975,"cacheWrite":0,"total":0.0022997250000000003}},"stopReason":"stop","timestamp":1790197698800,"responseId":"gen-1790197698-HsngQmcltNO0wKvZKyQe","rawStopReason":"stop"}}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/foreground.json b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/foreground.json
new file mode 100644
index 0000000000..45e4d39429
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/fixtures/foreground.json
@@ -0,0 +1,111 @@
+{
+  "provenance": {
+    "package": "@gotgenes/pi-subagents",
+    "version": "21.7.6",
+    "sourceCommit": "1ac6bc6a36e6da5d00f1cd2482f1b971f5ea1fdf",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_502323",
+      "toolName": "subagent",
+      "args": {
+        "subagent_type": "general-purpose",
+        "description": "List workspace files",
+        "prompt": "list the files in this empty workspace."
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_502323",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent completed in 4.7s (1 tool uses, 9.0k token).\nAgent ID: 848583f5-6749-4a1\n\nThe workspace is empty."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "List workspace files",
+          "subagentType": "general-purpose",
+          "tags": ["twin"],
+          "toolUses": 1,
+          "tokens": "9.0k token",
+          "turnCount": 3,
+          "durationMs": 4723,
+          "status": "completed",
+          "agentId": "848583f5-6749-4a1"
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_502323",
+          "name": "subagent",
+          "arguments": {
+            "subagent_type": "general-purpose",
+            "description": "List workspace files",
+            "prompt": "list the files in this empty workspace."
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 6584,
+        "output": 96,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 55,
+        "totalTokens": 6680,
+        "cost": {
+          "input": 0.0049380000000000005,
+          "output": 0.00036,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.005298000000000001
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197658835,
+      "responseId": "gen-1790197658-Jx3ylOivC0gHsP3uBU0f",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_502323",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent completed in 4.7s (1 tool uses, 9.0k token).\nAgent ID: 848583f5-6749-4a1\n\nThe workspace is empty."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "List workspace files",
+        "subagentType": "general-purpose",
+        "tags": ["twin"],
+        "toolUses": 1,
+        "tokens": "9.0k token",
+        "turnCount": 3,
+        "durationMs": 4723,
+        "status": "completed",
+        "agentId": "848583f5-6749-4a1"
+      },
+      "isError": false,
+      "timestamp": 1790197665254
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.test.ts
new file mode 100644
index 0000000000..6bbe1b3b06
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.test.ts
@@ -0,0 +1,189 @@
+import { describe, expect, test } from "vitest";
+import { fileURLToPath } from "node:url";
+import { createPiExtensionHost } from "../index.js";
+import { readSubagentFixture, verifySubagentFixture } from "../subagent-fixture-test.js";
+import { streamPiHistory } from "../../history-mapper.js";
+import { GOTGENES_CHILD_SESSION_MARKER, gotgenesRuntimeBridge } from "./runtime-bridge.js";
+
+const SERVICE_KEY = Symbol.for("@gotgenes/pi-subagents:service");
+
+function loadRuntimeBridge() {
+  const listeners = new Map<string, (event: unknown, ctx?: unknown) => void>();
+  const pi = {
+    on: (name: string, listener: (event: unknown, ctx?: unknown) => void) =>
+      listeners.set(name, listener),
+    events: {
+      on: (name: string, listener: (event: unknown) => void) => listeners.set(name, listener),
+    },
+  };
+  new Function("pi", gotgenesRuntimeBridge)(pi);
+  return (name: string, event: unknown, ctx?: unknown) => listeners.get(name)?.(event, ctx);
+}
+
+function publishService(agents: Array<{ id: string; outputFile?: string }>): void {
+  (globalThis as Record<symbol, unknown>)[SERVICE_KEY] = { listAgents: () => agents };
+}
+
+describe("@gotgenes/pi-subagents adapter", () => {
+  test("reports a child's file after the child republishes the gotgenes service", async () => {
+    const notifications: string[] = [];
+    const emit = loadRuntimeBridge();
+    const file = "/sessions/parent/tasks/2026-09-30_child-session.jsonl";
+    try {
+      publishService([{ id: "native-1", outputFile: file }]);
+      emit(
+        "session_start",
+        {},
+        { ui: { notify: (message: string) => notifications.push(message) } },
+      );
+      // Pi loads gotgenes again inside the child, and that copy replaces the global service.
+      publishService([]);
+      emit("subagents:child:session-created", { sessionId: "child-session" });
+
+      await expect.poll(() => notifications).toHaveLength(1);
+      const host = createPiExtensionHost();
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { subagent_type: "Explore", prompt: "Inspect" },
+        status: "completed",
+        result: { details: { agentId: "native-1", status: "background" } },
+      });
+      expect(host.mapRuntimeNotification(notifications[0]!)?.childSessions).toEqual([
+        { id: "call-1", file },
+      ]);
+    } finally {
+      delete (globalThis as Record<symbol, unknown>)[SERVICE_KEY];
+    }
+  });
+
+  test("accepts a live child path before or after the spawn result", () => {
+    for (const early of [true, false]) {
+      const host = createPiExtensionHost();
+      const marker = `${GOTGENES_CHILD_SESSION_MARKER} ${JSON.stringify({ agentId: "native-1", file: "/tmp/child.jsonl" })}`;
+      if (early) expect(host.mapRuntimeNotification(marker)?.subagents).toEqual([]);
+      const spawn = host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { subagent_type: "Explore", prompt: "Inspect" },
+        status: "completed",
+        result: { details: { agentId: "native-1", status: "background" } },
+      });
+      const path = early
+        ? spawn?.childSessions
+        : host.mapRuntimeNotification(marker)?.childSessions;
+      expect(path).toEqual([{ id: "call-1", file: "/tmp/child.jsonl" }]);
+    }
+  });
+
+  test("accepts a running subagent-update without a status field", () => {
+    const host = createPiExtensionHost();
+    host.mapToolCall({
+      callId: "call-1",
+      toolName: "subagent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: { details: { agentId: "native-1", status: "background" } },
+    });
+    const update = host.mapCustomMessage({
+      role: "custom",
+      customType: "subagent-update",
+      content: "progress",
+      details: { id: "native-1", description: "Inspect", message: "progress" },
+    });
+    expect(update?.subagents).toEqual([
+      { type: "upsert", id: "call-1", description: "Inspect", status: "running" },
+    ]);
+  });
+  test("maps captured foreground lifecycle live and on replay", async () => {
+    const events = await verifySubagentFixture(
+      readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url)),
+    );
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toEqual(["running", "completed"]);
+  });
+  test("correlates a background notification and result collection", async () => {
+    const source = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url));
+    const file = (
+      source.messages.find((message) => message.role === "custom") as {
+        details: { outputFile: string };
+      }
+    ).details.outputFile;
+    const fixture = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url), {
+      from: file,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    const events = await verifySubagentFixture(fixture);
+    const upserts = events
+      .filter((event) => event.event.type === "upsert")
+      .map((event) => (event.event.type === "upsert" ? event.event : null));
+    expect(upserts.map((event) => event?.status)).toEqual([
+      "running",
+      "running",
+      "completed",
+      "completed",
+    ]);
+    expect(new Set(upserts.map((event) => event?.id)).size).toBe(1);
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
+  test("keeps claimed notification text in a tool row in history", async () => {
+    const fixture = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url));
+    const notification = fixture.messages.find((message) => message.role === "custom");
+    const text = notification?.content;
+    const events = [];
+    for await (const event of streamPiHistory("pi", fixture.messages)) events.push(event);
+    expect(events).toContainEqual({
+      type: "timeline",
+      provider: "pi",
+      item: {
+        type: "tool_call",
+        callId: "pi-custom-1",
+        name: notification?.customType,
+        status: "completed",
+        detail: { type: "plain_text", text },
+        metadata: {
+          synthetic: true,
+          customType: notification?.customType,
+          details: notification?.details,
+        },
+        error: null,
+      },
+    });
+    expect(events.some((event) => event.type === "provider_subagent")).toBe(true);
+  });
+  test("shares the subagent tool name with Nico without claiming Nico's args", () => {
+    const host = createPiExtensionHost();
+    const nico = host.mapToolCall({
+      callId: "nico",
+      toolName: "subagent",
+      args: { agent: "scout", task: "Inspect" },
+      status: "running",
+      result: null,
+    });
+    const gotgenes = host.mapToolCall({
+      callId: "gotgenes",
+      toolName: "subagent",
+      args: { subagent_type: "general-purpose", prompt: "Inspect" },
+      status: "running",
+      result: null,
+    });
+    expect(nico?.detail).toEqual(
+      expect.objectContaining({ type: "sub_agent", subAgentType: "scout" }),
+    );
+    expect(gotgenes?.detail).toEqual(
+      expect.objectContaining({ type: "sub_agent", subAgentType: "general-purpose" }),
+    );
+    expect(
+      host.mapToolCall({
+        callId: "foreign",
+        toolName: "subagent",
+        args: { description: "Inspect" },
+        status: "running",
+        result: null,
+      }),
+    ).toBeUndefined();
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.ts b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.ts
new file mode 100644
index 0000000000..62db93c79e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/index.ts
@@ -0,0 +1,189 @@
+import { z } from "zod";
+import { extractTextFromToolResult } from "../../tool-call-mapper.js";
+import { outputFileFromToolResult } from "../child-session.js";
+import { GOTGENES_CHILD_SESSION_MARKER, gotgenesRuntimeBridge } from "./runtime-bridge.js";
+import type { PiExtension, PiExtensionToolCall } from "../contract.js";
+
+const SpawnArgs = z
+  .object({
+    subagent_type: z.string().trim().min(1),
+    prompt: z.string().trim().min(1),
+    description: z.string().optional(),
+  })
+  .passthrough();
+const FollowupArgs = z.object({ agent_id: z.string().trim().min(1) }).passthrough();
+const Details = z
+  .object({
+    agentId: z.string().trim().min(1),
+    status: z.string(),
+    displayName: z.string().optional(),
+    description: z.string().optional(),
+    transcriptPath: z.string().trim().min(1).optional(),
+  })
+  .passthrough();
+const Notification = z
+  .object({
+    id: z.string().trim().min(1),
+    status: z.string().optional(),
+    description: z.string().optional(),
+    outputFile: z.string().trim().min(1).optional(),
+  })
+  .passthrough();
+const LiveSession = z.object({
+  agentId: z.string().trim().min(1),
+  file: z.string().trim().min(1),
+});
+const status = (value: string): "running" | "completed" | "failed" | "canceled" => {
+  if (value === "completed") return "completed";
+  if (value === "error") return "failed";
+  if (value === "aborted" || value === "stopped") return "canceled";
+  return "running";
+};
+
+export const gotgenesPiSubagents: PiExtension = {
+  id: "@gotgenes/pi-subagents",
+  runtimeBridge: gotgenesRuntimeBridge,
+  createSession: () => {
+    const callsByAgent = new Map<string, string>();
+    const readSessions = new Set<string>();
+    const pendingFilesByAgent = new Map<string, string>();
+    const childSession = (id: string, file: string | undefined) => {
+      if (!file || readSessions.has(file)) return [];
+      readSessions.add(file);
+      return [{ id, file }];
+    };
+    const mapSpawn = (call: PiExtensionToolCall) => {
+      const args = SpawnArgs.safeParse(call.args);
+      if (!args.success) return undefined;
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      const title = args.data.subagent_type;
+      const description = args.data.description ?? args.data.prompt;
+      const detail = {
+        type: "sub_agent" as const,
+        subAgentType: title,
+        description,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      if (call.status === "running")
+        return {
+          detail,
+          subagents: [
+            {
+              type: "upsert" as const,
+              id: call.callId,
+              title,
+              description,
+              toolCallId: call.callId,
+              status: "running" as const,
+            },
+          ],
+        };
+      if (!details.success)
+        return call.status === "failed"
+          ? {
+              detail,
+              subagents: [{ type: "upsert" as const, id: call.callId, status: "failed" as const }],
+            }
+          : { detail };
+      callsByAgent.set(details.data.agentId, call.callId);
+      const file =
+        outputFileFromToolResult(call.result) ?? pendingFilesByAgent.get(details.data.agentId);
+      pendingFilesByAgent.delete(details.data.agentId);
+      const childSessions = childSession(call.callId, file);
+      return {
+        detail,
+        subagents: [
+          {
+            type: "upsert" as const,
+            id: call.callId,
+            title,
+            description,
+            toolCallId: call.callId,
+            status: status(details.data.status),
+          },
+        ],
+        childSessions,
+      };
+    };
+    const mapFollowup = (call: PiExtensionToolCall) => {
+      const args = FollowupArgs.safeParse(call.args);
+      if (!args.success) return undefined;
+      const id = callsByAgent.get(args.data.agent_id);
+      if (!id) return undefined;
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      const detail = {
+        type: "sub_agent" as const,
+        description: details.success ? details.data.description : undefined,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      if (call.status === "running" || !details.success) return { detail };
+      const file = details.data.transcriptPath;
+      const childSessions = childSession(id, file);
+      return {
+        detail,
+        subagents: [{ type: "upsert" as const, id, status: status(details.data.status) }],
+        childSessions,
+      };
+    };
+    return {
+      mapToolCall(call) {
+        // This fork's result details resemble tintinweb's, but its spawn tool is `subagent` and its
+        // follow-up result shape differs. Keep each parser at its own package boundary.
+        if (call.toolName === "subagent") return mapSpawn(call);
+        if (call.toolName === "get_subagent_result" || call.toolName === "steer_subagent")
+          return mapFollowup(call);
+        return undefined;
+      },
+      mapCustomMessage(message) {
+        if (
+          message.customType !== "subagent-notification" &&
+          message.customType !== "subagent-update"
+        )
+          return undefined;
+        const details = Notification.safeParse(message.details);
+        if (!details.success) return undefined;
+        const id = callsByAgent.get(details.data.id);
+        if (!id) return undefined;
+        const file = details.data.outputFile;
+        const childSessions = childSession(id, file);
+        return {
+          subagents: [
+            {
+              type: "upsert",
+              id,
+              description: details.data.description,
+              status: details.data.status ? status(details.data.status) : "running",
+            },
+          ],
+          childSessions,
+        };
+      },
+      mapRuntimeNotification(message) {
+        const prefix = `${GOTGENES_CHILD_SESSION_MARKER} `;
+        if (!message.startsWith(prefix)) return undefined;
+        let raw: unknown;
+        try {
+          raw = JSON.parse(message.slice(prefix.length));
+        } catch {
+          return { subagents: [] };
+        }
+        const parsed = LiveSession.safeParse(raw);
+        if (!parsed.success) return { subagents: [] };
+        const { agentId, file } = parsed.data;
+        const id = callsByAgent.get(agentId);
+        if (!id) {
+          pendingFilesByAgent.set(agentId, file);
+          return { subagents: [] };
+        }
+        return {
+          subagents: [{ type: "upsert", id, status: "running" }],
+          childSessions: childSession(id, file),
+        };
+      },
+    };
+  },
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/runtime-bridge.ts b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/runtime-bridge.ts
new file mode 100644
index 0000000000..386fbb4705
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/gotgenes-pi-subagents/runtime-bridge.ts
@@ -0,0 +1,33 @@
+export const GOTGENES_CHILD_SESSION_MARKER = "PASEO_GOTGENES_CHILD_SESSION";
+
+/**
+ * Runs inside Pi. The spawn result omits the child's session file, so the parent's public service
+ * is the live source. Each child session loads its own copy of gotgenes, which republishes the
+ * global service and deletes it on exit, so the parent's service is captured at session_start.
+ */
+export const gotgenesRuntimeBridge = `
+  let gotgenesParent;
+  pi.on("session_start", (_event, ctx) => {
+    gotgenesParent = { ctx, service: globalThis[Symbol.for("@gotgenes/pi-subagents:service")] };
+  });
+  pi.events.on("subagents:child:session-created", (event) => {
+    const parent = gotgenesParent;
+    let attempts = 0;
+    // The record gets its session file after the child's extensions bind.
+    const report = () => {
+      const record = parent?.service?.listAgents().find((agent) =>
+        agent.outputFile?.includes(event.sessionId),
+      );
+      if (record) {
+        parent.ctx.ui.notify(
+          "${GOTGENES_CHILD_SESSION_MARKER} " +
+            JSON.stringify({ agentId: record.id, file: record.outputFile }),
+          "info",
+        );
+      } else if (++attempts < 240) {
+        setTimeout(report, 250);
+      }
+    };
+    setTimeout(report, 0);
+  });
+`;
diff --git a/packages/server/src/server/agent/providers/pi/extensions/host.ts b/packages/server/src/server/agent/providers/pi/extensions/host.ts
new file mode 100644
index 0000000000..8915e3df01
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/host.ts
@@ -0,0 +1,256 @@
+import type { Logger } from "pino";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+  AgentStreamEvent,
+} from "../../../agent-sdk-types.js";
+import type { PiAgentMessage } from "../rpc-types.js";
+import { mapPiChildSession, PiChildSessionFollower } from "./child-session.js";
+import type {
+  PiExtension,
+  PiExtensionCustomMapping,
+  PiExtensionDialog,
+  PiExtensionDialogMapping,
+  PiExtensionSession,
+  PiExtensionToolCall,
+  PiExtensionToolMapping,
+  PiExtensionUiReply,
+} from "./contract.js";
+
+export type PiExtensionOutput<T> = T & {
+  events: AgentStreamEvent[];
+  hydration: Promise<AgentStreamEvent[]>;
+};
+export type PiExtensionEventOutput = PiExtensionOutput<
+  PiExtensionToolMapping | PiExtensionCustomMapping
+>;
+
+interface Session {
+  id: string;
+  adapter: PiExtensionSession;
+}
+
+interface Follower {
+  reader: PiChildSessionFollower;
+  /** Reads run in order so a final read cannot overtake a tick. */
+  pending: Promise<void>;
+}
+
+export class PiExtensionHost {
+  private readonly sessions: Session[] = [];
+  private remainingHydrationBytes: number;
+  private readonly followers = new Map<string, Follower>();
+  private onFollowEvent?: (event: AgentStreamEvent) => void;
+  private followTimer?: ReturnType<typeof setInterval>;
+  private pollingExtensions = false;
+
+  constructor(
+    extensions: readonly PiExtension[],
+    private readonly logger?: Pick<Logger, "warn">,
+    hydrationByteBudget = Number.POSITIVE_INFINITY,
+    private readonly readChildSession: typeof mapPiChildSession = mapPiChildSession,
+  ) {
+    this.remainingHydrationBytes = hydrationByteBudget;
+    for (const extension of extensions) {
+      const adapter = this.safe(extension.id, "createSession", () => extension.createSession());
+      if (adapter) this.sessions.push({ id: extension.id, adapter });
+    }
+  }
+
+  /** Live sessions follow child files and adapter polls; replay hosts read each file once. */
+  follow(onEvent: (event: AgentStreamEvent) => void): void {
+    this.onFollowEvent = onEvent;
+    this.followTimer ??= setInterval(() => {
+      for (const [id, follower] of this.followers) void this.readFollower(id, follower);
+      void this.pollExtensions();
+    }, 250);
+  }
+
+  close(): void {
+    if (this.followTimer) clearInterval(this.followTimer);
+    this.followTimer = undefined;
+    this.onFollowEvent = undefined;
+    this.followers.clear();
+  }
+
+  private readFollower(id: string, follower: Follower): Promise<void> {
+    follower.pending = follower.pending
+      .then(async () => {
+        const events = await follower.reader.readNew();
+        for (const event of events) {
+          this.onFollowEvent?.({ type: "provider_subagent", provider: "pi", event });
+        }
+        return undefined;
+      })
+      .catch((error) => {
+        this.logger?.warn(
+          { err: error, operation: "follow", childId: id },
+          "Pi child follow failed",
+        );
+      });
+    return follower.pending;
+  }
+
+  private async pollExtensions(): Promise<void> {
+    if (this.pollingExtensions || !this.onFollowEvent) return;
+    this.pollingExtensions = true;
+    try {
+      for (const { id, adapter } of this.sessions) {
+        const mapping = this.safe(id, "poll", () => adapter.poll?.());
+        if (!mapping) continue;
+        const output = this.prepare(id, mapping);
+        for (const event of output.events) this.onFollowEvent?.(event);
+        for (const event of await output.hydration) this.onFollowEvent?.(event);
+      }
+    } finally {
+      this.pollingExtensions = false;
+    }
+  }
+
+  private safe<T>(id: string, operation: string, call: () => T): T | undefined {
+    try {
+      return call();
+    } catch (error) {
+      this.logger?.warn({ err: error, extensionId: id, operation }, "Pi extension adapter failed");
+      return undefined;
+    }
+  }
+
+  mapToolCall(call: PiExtensionToolCall): PiExtensionOutput<PiExtensionToolMapping> | undefined {
+    for (const { id, adapter } of this.sessions) {
+      const mapping = this.safe(id, "mapToolCall", () => adapter.mapToolCall?.(call));
+      if (mapping) {
+        const prepared = this.safe(id, "prepare", () => this.prepare(id, mapping));
+        if (prepared) return prepared;
+      }
+    }
+    return undefined;
+  }
+
+  mapCustomMessage(
+    message: Extract<PiAgentMessage, { role: "custom" }>,
+  ): PiExtensionOutput<PiExtensionCustomMapping> | undefined {
+    for (const { id, adapter } of this.sessions) {
+      const mapping = this.safe(id, "mapCustomMessage", () => adapter.mapCustomMessage?.(message));
+      if (mapping) {
+        const prepared = this.safe(id, "prepare", () => this.prepare(id, mapping));
+        if (prepared) return prepared;
+      }
+    }
+    return undefined;
+  }
+
+  mapRuntimeNotification(message: string): PiExtensionOutput<PiExtensionCustomMapping> | undefined {
+    for (const { id, adapter } of this.sessions) {
+      const mapping = this.safe(id, "mapRuntimeNotification", () =>
+        adapter.mapRuntimeNotification?.(message),
+      );
+      if (mapping) {
+        const prepared = this.safe(id, "prepare", () => this.prepare(id, mapping));
+        if (prepared) return prepared;
+      }
+    }
+    return undefined;
+  }
+
+  private prepare<T extends PiExtensionToolMapping | PiExtensionCustomMapping>(
+    id: string,
+    mapping: T,
+  ): PiExtensionOutput<T> {
+    const events: AgentStreamEvent[] = [
+      ...("timeline" in mapping ? (mapping.timeline ?? []) : []).map(
+        (item): AgentStreamEvent => ({ type: "timeline", provider: "pi", item }),
+      ),
+      ...(mapping.subagents ?? []).map(
+        (event): AgentStreamEvent => ({ type: "provider_subagent", provider: "pi", event }),
+      ),
+    ];
+    const hydration = (
+      this.onFollowEvent ? this.followChildren(mapping) : this.readChildren(mapping)
+    ).catch((error): AgentStreamEvent[] => {
+      this.logger?.warn(
+        { err: error, extensionId: id, operation: "hydrate" },
+        "Pi extension adapter failed",
+      );
+      return [];
+    });
+    return { ...mapping, events, hydration };
+  }
+
+  private async followChildren(
+    mapping: PiExtensionToolMapping | PiExtensionCustomMapping,
+  ): Promise<AgentStreamEvent[]> {
+    for (const { id, file } of mapping.childSessions ?? []) {
+      if (!this.followers.has(id)) {
+        this.followers.set(id, {
+          reader: new PiChildSessionFollower(id, file),
+          pending: Promise.resolve(),
+        });
+      }
+    }
+    const finished = (mapping.subagents ?? []).flatMap((event) =>
+      event.type === "upsert" && event.status && event.status !== "running" ? [event.id] : [],
+    );
+    const reads = [
+      ...new Set([...(mapping.childSessions ?? []).map(({ id }) => id), ...finished]),
+    ].flatMap((id) => {
+      const follower = this.followers.get(id);
+      return follower ? [this.readFollower(id, follower)] : [];
+    });
+    for (const id of finished) this.followers.delete(id);
+    await Promise.all(reads);
+    return [];
+  }
+
+  private async readChildren(
+    mapping: PiExtensionToolMapping | PiExtensionCustomMapping,
+  ): Promise<AgentStreamEvent[]> {
+    const groups = await Promise.all(
+      (mapping.childSessions ?? []).map(async ({ id, file }) => {
+        const bytes = Math.min(this.remainingHydrationBytes, 2 * 1024 * 1024);
+        if (bytes <= 0) return [];
+        this.remainingHydrationBytes -= bytes;
+        return (await this.readChildSession(id, file, bytes)).map(
+          (event): AgentStreamEvent => ({ type: "provider_subagent", provider: "pi", event }),
+        );
+      }),
+    );
+    return groups.flat();
+  }
+
+  onToolStart(call: PiExtensionToolCall, provider = "pi"): AgentPermissionRequest | undefined {
+    let request: AgentPermissionRequest | undefined;
+    for (const { id, adapter } of this.sessions) {
+      const candidate = this.safe(id, "onToolStart", () => adapter.onToolStart?.(call, provider));
+      request ??= candidate;
+    }
+    return request;
+  }
+
+  onToolEnd(call: PiExtensionToolCall): void {
+    for (const { id, adapter } of this.sessions) {
+      this.safe(id, "onToolEnd", () => adapter.onToolEnd?.(call));
+    }
+  }
+
+  mapDialog(dialog: PiExtensionDialog, provider: string): PiExtensionDialogMapping | undefined {
+    for (const { id, adapter } of this.sessions) {
+      const mapping = this.safe(id, "mapDialog", () => adapter.mapDialog?.(dialog, provider));
+      if (mapping) return mapping;
+    }
+    return undefined;
+  }
+
+  respondToPermission(
+    request: AgentPermissionRequest,
+    response: AgentPermissionResponse,
+  ): PiExtensionUiReply | undefined {
+    for (const { id, adapter } of this.sessions) {
+      const mapped = this.safe(id, "respondToPermission", () =>
+        adapter.respondToPermission?.(request, response),
+      );
+      if (mapped) return mapped;
+    }
+    return undefined;
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/index.test.ts
new file mode 100644
index 0000000000..9afacae977
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/index.test.ts
@@ -0,0 +1,253 @@
+import { describe, expect, test } from "vitest";
+import { mkdtemp, appendFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { createPiExtensionHost } from "./index.js";
+import { PiHistoryMapper } from "../history-mapper.js";
+import { parseToolArgs, parseToolResult } from "../tool-call-mapper.js";
+import type { PiExtension } from "./contract.js";
+import { PiExtensionHost } from "./host.js";
+
+const throwingAdapter: PiExtension = {
+  id: "throwing-test-adapter",
+  createSession: () => ({
+    mapToolCall: () => {
+      throw new Error("tool failed");
+    },
+    mapDialog: () => {
+      throw new Error("dialog failed");
+    },
+    respondToPermission: () => {
+      throw new Error("response failed");
+    },
+    onToolStart: () => {
+      throw new Error("start failed");
+    },
+    onToolEnd: () => {
+      throw new Error("end failed");
+    },
+    mapCustomMessage: () => {
+      throw new Error("custom failed");
+    },
+  }),
+};
+
+describe("Pi extension host", () => {
+  test("streams appended child rows before the child completes", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-live-child-"));
+    const file = join(dir, "child.jsonl");
+    const received: string[] = [];
+    const host = new PiExtensionHost([
+      {
+        id: "child",
+        createSession: () => ({
+          mapToolCall: () => ({
+            subagents: [{ type: "upsert", id: "child-1", status: "running" }],
+            childSessions: [{ id: "child-1", file }],
+          }),
+        }),
+      },
+    ]);
+    try {
+      host.follow((event) => {
+        if (event.type === "provider_subagent" && event.event.type === "timeline") {
+          received.push(JSON.stringify(event.event.item));
+        }
+      });
+      host.mapToolCall({
+        callId: "x",
+        toolName: "child",
+        args: {},
+        status: "completed",
+        result: null,
+      });
+      await appendFile(
+        file,
+        '{"type":"message","message":{"role":"assistant","content":[{"type":"text","text":"BEGIN"}]}}\n',
+      );
+      await expect.poll(() => received.length).toBe(1);
+      await appendFile(
+        file,
+        '{"type":"message","message":{"role":"assistant","content":[{"type":"text","text":"DO',
+      );
+      await new Promise((resolve) => setTimeout(resolve, 350));
+      expect(received).toHaveLength(1);
+      await appendFile(file, 'NE"}]}}\n');
+      await expect.poll(() => received.length).toBe(2);
+      expect(received.join(" ")).toContain("DONE");
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+  test("declines a throwing adapter and preserves generic history", async () => {
+    const host = createPiExtensionHost(undefined, [throwingAdapter]);
+    const mapper = new PiHistoryMapper("pi", [], {}, host);
+    const events = mapper.mapMessages([
+      {
+        role: "assistant",
+        content: [{ type: "toolCall", id: "call-1", name: "other", arguments: {} }],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "call-1",
+        toolName: "other",
+        content: [{ type: "text", text: "ok" }],
+      },
+      { role: "assistant", content: [{ type: "text", text: "done" }] },
+    ]);
+    expect(events.filter((event) => event.type === "timeline")).toHaveLength(3);
+    expect(await mapper.hydrate()).toEqual([]);
+  });
+
+  test("declines throwing lifecycle and dialog hooks", () => {
+    const host = createPiExtensionHost(undefined, [throwingAdapter]);
+    const call = {
+      callId: "x",
+      toolName: "other",
+      args: {},
+      status: "running" as const,
+      result: null,
+    };
+    expect(host.onToolStart(call)).toBeUndefined();
+    expect(() => host.onToolEnd(call)).not.toThrow();
+    expect(
+      host.mapDialog(
+        {
+          type: "extension_ui_request",
+          id: "ui-1",
+          method: "select",
+          title: "Pick",
+          options: ["A"],
+        },
+        "pi",
+      ),
+    ).toBeUndefined();
+    expect(
+      host.respondToPermission(
+        { id: "ui-1", provider: "pi", kind: "question", title: "Pick", input: { questions: [] } },
+        { behavior: "allow" },
+      ),
+    ).toBeUndefined();
+    expect(
+      host.mapCustomMessage({ role: "custom", customType: "other", content: "hello" }),
+    ).toBeUndefined();
+  });
+
+  test("rejected child hydration emits no events", async () => {
+    const host = new PiExtensionHost(
+      [
+        {
+          id: "child",
+          createSession: () => ({
+            mapToolCall: () => ({ childSessions: [{ id: "child-1", file: "unused" }] }),
+          }),
+        },
+      ],
+      undefined,
+      2 * 1024 * 1024,
+      async () => {
+        throw new Error("read failed");
+      },
+    );
+    const output = host.mapToolCall({
+      callId: "x",
+      toolName: "other",
+      args: {},
+      status: "completed",
+      result: null,
+    });
+    expect(await output?.hydration).toEqual([]);
+  });
+
+  test("limits total child reads during replay", async () => {
+    const reads: string[] = [];
+    const host = new PiExtensionHost(
+      [
+        {
+          id: "child",
+          createSession: () => ({
+            mapToolCall: () => ({
+              childSessions: Array.from({ length: 10 }, (_, index) => ({
+                id: String(index),
+                file: String(index),
+              })),
+            }),
+          }),
+        },
+      ],
+      undefined,
+      16 * 1024 * 1024,
+      async (id) => {
+        reads.push(id);
+        return [];
+      },
+    );
+    const output = host.mapToolCall({
+      callId: "x",
+      toolName: "other",
+      args: {},
+      status: "completed",
+      result: null,
+    });
+    await output?.hydration;
+    expect(reads).toHaveLength(8);
+  });
+  test("claims a tool, declines an unrelated one, and maps history like live events", () => {
+    const host = createPiExtensionHost();
+    const args = { agent: "scout", task: "Inspect files" };
+    const result = parseToolResult({ content: [{ type: "text", text: "Found two files" }] });
+    const live = host.mapToolCall({
+      callId: "call-1",
+      toolName: "subagent",
+      args,
+      status: "completed",
+      result,
+    });
+    expect(live).toEqual(
+      expect.objectContaining({
+        detail: {
+          type: "sub_agent",
+          subAgentType: "scout",
+          description: "Inspect files",
+          log: "Found two files",
+        },
+      }),
+    );
+    expect(
+      host.mapToolCall({
+        callId: "call-2",
+        toolName: "unrelated",
+        args: {},
+        status: "completed",
+        result,
+      }),
+    ).toBeUndefined();
+
+    const mapper = new PiHistoryMapper("pi");
+    const events = mapper.mapMessages([
+      {
+        role: "assistant",
+        content: [{ type: "toolCall", id: "call-1", name: "subagent", arguments: args }],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "call-1",
+        toolName: "subagent",
+        content: [{ type: "text", text: "Found two files" }],
+      },
+    ]);
+    const completed = events.find(
+      (event) =>
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.status === "completed",
+    );
+    expect(
+      completed?.type === "timeline" && completed.item.type === "tool_call"
+        ? completed.item.detail
+        : null,
+    ).toEqual(live?.detail);
+    expect(parseToolArgs("subagent", args).toolName).toBe("subagent");
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/index.ts b/packages/server/src/server/agent/providers/pi/extensions/index.ts
new file mode 100644
index 0000000000..2ac68178da
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/index.ts
@@ -0,0 +1,19 @@
+import { PiExtensionHost } from "./host.js";
+import { piExtensions } from "./registry.js";
+import type { Logger } from "pino";
+import type { PiExtension } from "./contract.js";
+
+export const piExtensionRuntimeBridge = piExtensions
+  .flatMap((extension) => extension.runtimeBridge ?? [])
+  .join("\n");
+
+export type { PiExtensionHost } from "./host.js";
+export type { PiExtensionEventOutput } from "./host.js";
+
+export function createPiExtensionHost(
+  logger?: Pick<Logger, "warn">,
+  extensions: readonly PiExtension[] = piExtensions,
+  hydrationByteBudget?: number,
+): PiExtensionHost {
+  return new PiExtensionHost(extensions, logger, hydrationByteBudget);
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.test.ts
new file mode 100644
index 0000000000..4d6991495a
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, test } from "vitest";
+import { createPiExtensionHost } from "../index.js";
+
+describe("pi-ask-user adapter", () => {
+  test("combines selection and comment, then answers the follow-up dialog", () => {
+    const host = createPiExtensionHost();
+    host.onToolStart({
+      callId: "ask-1",
+      toolName: "ask_user",
+      args: { allowComment: true, allowFreeform: false },
+      status: "running",
+      result: null,
+    });
+    const mapped = host.mapDialog(
+      {
+        type: "extension_ui_request",
+        id: "select-1",
+        method: "select",
+        title: "Pick one",
+        options: ["A", "B"],
+      },
+      "pi",
+    );
+    expect(mapped?.type).toBe("permission");
+    if (mapped?.type !== "permission") throw new Error("Expected a combined permission");
+    expect(mapped.request.input?.questions).toHaveLength(2);
+    expect(
+      host.respondToPermission(mapped.request, {
+        behavior: "allow",
+        updatedInput: { answers: { Response: "B", Comment: "Looks good" } },
+      }),
+    ).toEqual({ responses: [{ id: "select-1", response: { value: "B" } }] });
+    expect(
+      host.mapDialog(
+        {
+          type: "extension_ui_request",
+          id: "comment-1",
+          method: "input",
+          placeholder: "Optional comment (press Enter to skip)...",
+        },
+        "pi",
+      ),
+    ).toEqual({ type: "response", response: { value: "Looks good" } });
+  });
+
+  test("declines unrelated dialogs and cancels denied selection", () => {
+    const host = createPiExtensionHost();
+    expect(
+      host.mapDialog(
+        { type: "extension_ui_request", id: "other", method: "select", options: ["A"] },
+        "pi",
+      ),
+    ).toBeUndefined();
+    host.onToolStart({
+      callId: "ask-2",
+      toolName: "ask_user",
+      args: { allowComment: true },
+      status: "running",
+      result: null,
+    });
+    const mapped = host.mapDialog(
+      { type: "extension_ui_request", id: "select-2", method: "select", options: ["A"] },
+      "pi",
+    );
+    if (mapped?.type !== "permission") throw new Error("Expected a combined permission");
+    expect(host.respondToPermission(mapped.request, { behavior: "deny" })).toEqual({
+      responses: [{ id: "select-2", response: { cancelled: true } }],
+    });
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.ts
new file mode 100644
index 0000000000..4de58c86f8
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-ask-user/index.ts
@@ -0,0 +1,158 @@
+import { z } from "zod";
+import type {
+  AgentMetadata,
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+} from "../../../../agent-sdk-types.js";
+import type { PiExtension, PiExtensionDialog, PiExtensionUiReply } from "../contract.js";
+
+const QUESTION_RESPONSE_HEADER = "Response";
+const QUESTION_COMMENT_HEADER = "Comment";
+const FREEFORM_SENTINEL = "✏️ Type custom response...";
+const COMBINED_METADATA = "ask_user_select_optional_comment";
+const Args = z
+  .object({
+    allowComment: z.boolean().catch(false),
+    allowFreeform: z.boolean().catch(true),
+    allowMultiple: z.boolean().catch(false),
+  })
+  .passthrough();
+const Select = z
+  .object({ title: z.string().optional(), options: z.array(z.string()).optional() })
+  .passthrough();
+const Input = z.object({ placeholder: z.string().optional() }).passthrough();
+
+function answer(input: AgentMetadata | undefined, header: string): string | null {
+  const answers = input?.answers;
+  if (!answers || typeof answers !== "object" || Array.isArray(answers)) return null;
+  const value = Reflect.get(answers, header);
+  return typeof value === "string" ? value : null;
+}
+
+function optionalInput(placeholder: string | undefined): boolean {
+  return /\boptional\b|\bskip\b/i.test(placeholder ?? "");
+}
+
+function combinedPermission(
+  dialog: PiExtensionDialog,
+  provider: string,
+  options: string[],
+  allowFreeform: boolean,
+  question: string,
+): AgentPermissionRequest {
+  const visibleOptions = options.filter((option) => option !== FREEFORM_SENTINEL);
+  const allowOther = allowFreeform || visibleOptions.length !== options.length;
+  return {
+    id: dialog.id,
+    provider,
+    name: "Pi ask_user",
+    kind: "question",
+    title: question,
+    input: {
+      questions: [
+        {
+          question,
+          header: QUESTION_RESPONSE_HEADER,
+          options: visibleOptions.map((label) => ({ label })),
+          multiSelect: false,
+          ...(allowOther ? { allowOther: true } : {}),
+        },
+        {
+          question: "Optional comment",
+          header: QUESTION_COMMENT_HEADER,
+          options: [],
+          multiSelect: false,
+          placeholder: "Optional comment (press Enter to skip)...",
+          allowEmpty: true,
+        },
+      ],
+    },
+    metadata: {
+      extensionUiMethod: dialog.method,
+      answerHeader: QUESTION_RESPONSE_HEADER,
+      commentHeader: QUESTION_COMMENT_HEADER,
+      combinedAskUser: COMBINED_METADATA,
+      selectOptions: visibleOptions,
+      ...(allowOther ? { freeformSentinel: FREEFORM_SENTINEL } : {}),
+    },
+  };
+}
+
+export const piAskUser: PiExtension = {
+  id: "pi-ask-user",
+  createSession() {
+    let active: z.infer<typeof Args> | null = null;
+    let pending: { comment: string; freeform: string | null } | null = null;
+    return {
+      onToolStart(call) {
+        active = call.toolName === "ask_user" ? (Args.safeParse(call.args).data ?? null) : null;
+        return undefined;
+      },
+      onToolEnd(call) {
+        if (call.toolName === "ask_user") {
+          active = null;
+          pending = null;
+        }
+      },
+      mapDialog(dialog, provider) {
+        if (pending && dialog.method === "input") {
+          const input = Input.safeParse(dialog);
+          const placeholder = input.success ? input.data.placeholder : undefined;
+          if (pending.freeform !== null && !optionalInput(placeholder)) {
+            const value = pending.freeform;
+            pending = { ...pending, freeform: null };
+            return { type: "response", response: { value } };
+          }
+          if (optionalInput(placeholder)) {
+            const value = pending.comment;
+            pending = null;
+            return { type: "response", response: { value } };
+          }
+        }
+        if (dialog.method !== "select" || !active?.allowComment || active.allowMultiple)
+          return undefined;
+        const select = Select.safeParse(dialog);
+        const options = select.success ? (select.data.options ?? []) : [];
+        const question = select.success
+          ? (select.data.title ?? "Select an option")
+          : "Select an option";
+        return {
+          type: "permission",
+          request: combinedPermission(dialog, provider, options, active.allowFreeform, question),
+        };
+      },
+      respondToPermission(
+        request: AgentPermissionRequest,
+        response: AgentPermissionResponse,
+      ): PiExtensionUiReply | undefined {
+        if (request.metadata?.combinedAskUser !== COMBINED_METADATA) return undefined;
+        if (response.behavior === "deny") {
+          pending = null;
+          return { responses: [{ id: request.id, response: { cancelled: true } }] };
+        }
+        const selected = answer(response.updatedInput, QUESTION_RESPONSE_HEADER);
+        if (selected === null) {
+          pending = null;
+          return { responses: [{ id: request.id, response: { cancelled: true } }] };
+        }
+        const selectOptions = Array.isArray(request.metadata?.selectOptions)
+          ? request.metadata.selectOptions.filter(
+              (item): item is string => typeof item === "string",
+            )
+          : [];
+        const sentinel =
+          typeof request.metadata?.freeformSentinel === "string"
+            ? request.metadata.freeformSentinel
+            : undefined;
+        const isFreeform = Boolean(sentinel) && !selectOptions.includes(selected);
+        pending = {
+          comment: answer(response.updatedInput, QUESTION_COMMENT_HEADER) ?? "",
+          freeform: isFreeform ? selected : null,
+        };
+        return {
+          responses: [{ id: request.id, response: { value: isFreeform ? sentinel : selected } }],
+        };
+      },
+    };
+  },
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/fixtures/rpc-session.json b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/fixtures/rpc-session.json
new file mode 100644
index 0000000000..46465d196e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/fixtures/rpc-session.json
@@ -0,0 +1,250 @@
+{
+  "provenance": {
+    "package": "@earendil-works/pi-coding-agent examples/extensions/todo.ts",
+    "version": "0.87.1",
+    "sourceCommit": "7fd564cbb78f35f3de14d5382fea692b87ec4026",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23",
+    "mode": "pi --mode rpc; OpenRouter google/gemini-3.6-flash"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_433291",
+      "toolName": "todo",
+      "args": {
+        "action": "add",
+        "text": "Inspect workspace"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_433291",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Added todo #1: Inspect workspace"
+          }
+        ],
+        "details": {
+          "action": "add",
+          "todos": [
+            {
+              "id": 1,
+              "text": "Inspect workspace",
+              "done": false
+            }
+          ],
+          "nextId": 2
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_453655",
+      "toolName": "todo",
+      "args": {
+        "action": "add",
+        "text": "Summarize findings"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_453655",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Added todo #2: Summarize findings"
+          }
+        ],
+        "details": {
+          "action": "add",
+          "todos": [
+            {
+              "id": 1,
+              "text": "Inspect workspace",
+              "done": false
+            },
+            {
+              "id": 2,
+              "text": "Summarize findings",
+              "done": false
+            }
+          ],
+          "nextId": 3
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_525797",
+      "toolName": "todo",
+      "args": {
+        "action": "toggle",
+        "id": 1
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_525797",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Todo #1 completed"
+          }
+        ],
+        "details": {
+          "action": "toggle",
+          "todos": [
+            {
+              "id": 1,
+              "text": "Inspect workspace",
+              "done": true
+            },
+            {
+              "id": 2,
+              "text": "Summarize findings",
+              "done": false
+            }
+          ],
+          "nextId": 3
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_433291",
+          "name": "todo",
+          "arguments": {
+            "action": "add",
+            "text": "Inspect workspace"
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_433291",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Added todo #1: Inspect workspace"
+        }
+      ],
+      "details": {
+        "action": "add",
+        "todos": [
+          {
+            "id": 1,
+            "text": "Inspect workspace",
+            "done": false
+          }
+        ],
+        "nextId": 2
+      },
+      "isError": false,
+      "timestamp": 1790195609694
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_453655",
+          "name": "todo",
+          "arguments": {
+            "action": "add",
+            "text": "Summarize findings"
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_453655",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Added todo #2: Summarize findings"
+        }
+      ],
+      "details": {
+        "action": "add",
+        "todos": [
+          {
+            "id": 1,
+            "text": "Inspect workspace",
+            "done": false
+          },
+          {
+            "id": 2,
+            "text": "Summarize findings",
+            "done": false
+          }
+        ],
+        "nextId": 3
+      },
+      "isError": false,
+      "timestamp": 1790195610962
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_525797",
+          "name": "todo",
+          "arguments": {
+            "action": "toggle",
+            "id": 1
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_525797",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Todo #1 completed"
+        }
+      ],
+      "details": {
+        "action": "toggle",
+        "todos": [
+          {
+            "id": 1,
+            "text": "Inspect workspace",
+            "done": true
+          },
+          {
+            "id": 2,
+            "text": "Summarize findings",
+            "done": false
+          }
+        ],
+        "nextId": 3
+      },
+      "isError": false,
+      "timestamp": 1790195612441
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.test.ts
new file mode 100644
index 0000000000..e2a858fd6c
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.test.ts
@@ -0,0 +1,16 @@
+import { expect, test } from "vitest";
+import { capturedToolCall, verifyTaskFixture } from "../task-fixture-test.js";
+import { piExampleTodo } from "./index.js";
+
+test("Pi example todo maps captured RPC tasks through live and history", async () => {
+  await verifyTaskFixture(new URL("./fixtures/rpc-session.json", import.meta.url), [
+    "pending",
+    "pending,pending",
+    "completed,pending",
+  ]);
+});
+
+test("example todo declines rpiv-todo's shape", () => {
+  const call = capturedToolCall(new URL("../rpiv-todo/fixtures/rpc-session.json", import.meta.url));
+  expect(piExampleTodo.createSession().mapToolCall?.(call)).toBeUndefined();
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.ts
new file mode 100644
index 0000000000..31d7e21199
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-example-todo/index.ts
@@ -0,0 +1,41 @@
+import { z } from "zod";
+import type { PiExtension } from "../contract.js";
+
+const Details = z.object({
+  action: z.enum(["list", "add", "toggle", "clear"]),
+  nextId: z.number().int(),
+  todos: z.array(z.object({ id: z.number().int(), text: z.string(), done: z.boolean() })),
+  error: z.string().optional(),
+});
+
+export const piExampleTodo: PiExtension = {
+  id: "pi-example-todo",
+  createSession: () => ({
+    mapToolCall(call) {
+      if (
+        call.toolName !== "todo" ||
+        call.status !== "completed" ||
+        !call.result ||
+        typeof call.result === "string"
+      )
+        return undefined;
+      const parsed = Details.safeParse(call.result.details);
+      if (!parsed.success) return undefined;
+      return {
+        timeline: parsed.data.error
+          ? []
+          : [
+              {
+                type: "todo",
+                items: parsed.data.todos.map((todo) => ({
+                  id: String(todo.id),
+                  text: todo.text,
+                  status: todo.done ? "completed" : "pending",
+                  completed: todo.done,
+                })),
+              },
+            ],
+      };
+    },
+  }),
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/fixtures/rpc-session.json b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/fixtures/rpc-session.json
new file mode 100644
index 0000000000..2ef2df977f
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/fixtures/rpc-session.json
@@ -0,0 +1,422 @@
+{
+  "provenance": {
+    "package": "pi-goal-x",
+    "version": "0.31.8",
+    "sourceCommit": "f366b5cdf36e9329c980f8c44b0d300c910e2f41",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23",
+    "mode": "pi --mode rpc; OpenRouter google/gemini-3.6-flash"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_476725",
+      "toolName": "create_goal",
+      "args": {
+        "objective": "Inspect the empty workspace"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_476725",
+      "toolName": "create_goal",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Goal confirmed and created.\n\nFinalized goal:\n\nInspect the empty workspace\n\nGoal details:\nBudget: none\nGoal: Inspect the empty workspace\nStatus: running\nAuto-continue: on\nTime spent: 0s\nTokens used: 0 tokens\nFile: .pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md\n1 other open goal remain in .pi/goals — this goal is now the session focus."
+          }
+        ],
+        "details": {
+          "version": 3,
+          "goal": {
+            "id": "muekaval-uhhfg8",
+            "objective": "Inspect the empty workspace",
+            "status": "active",
+            "autoContinue": true,
+            "usage": {
+              "tokensUsed": 0,
+              "activeSeconds": 0
+            },
+            "sisyphus": false,
+            "revision": 0,
+            "createdAt": "2026-09-23T20:35:06.093Z",
+            "updatedAt": "2026-09-23T20:35:06.093Z",
+            "scheduler": {
+              "version": 1,
+              "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+              "generation": "048961d8-6a89-471e-9562-0c09798cc070",
+              "used": 0,
+              "phase": "idle",
+              "repairUsed": false
+            },
+            "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md"
+          }
+        },
+        "terminate": true,
+        "addedToolNames": ["update_goal", "set_goal_tasks"]
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_434120",
+      "toolName": "set_goal_tasks",
+      "args": {
+        "tasks": [
+          {
+            "title": "Inspect workspace",
+            "id": "task-1"
+          },
+          {
+            "title": "Summarize findings",
+            "id": "task-2"
+          }
+        ]
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_434120",
+      "toolName": "set_goal_tasks",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Task list set and confirmed. 2 tasks."
+          }
+        ],
+        "details": {
+          "version": 3,
+          "goal": {
+            "id": "muekaval-uhhfg8",
+            "objective": "Inspect the empty workspace",
+            "status": "active",
+            "autoContinue": true,
+            "usage": {
+              "tokensUsed": 6287,
+              "activeSeconds": 0
+            },
+            "sisyphus": false,
+            "revision": 5,
+            "createdAt": "2026-09-23T20:35:06.093Z",
+            "updatedAt": "2026-09-23T20:35:08.560Z",
+            "scheduler": {
+              "version": 1,
+              "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+              "generation": "3eb8953c-0d95-44d9-b319-b4c4ab9d2cfe",
+              "used": 0,
+              "phase": "idle",
+              "repairUsed": false
+            },
+            "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md",
+            "taskList": {
+              "tasks": [
+                {
+                  "id": "task-1",
+                  "title": "Inspect workspace",
+                  "status": "pending"
+                },
+                {
+                  "id": "task-2",
+                  "title": "Summarize findings",
+                  "status": "pending"
+                }
+              ],
+              "blockCompletion": false,
+              "proposedAt": "2026-09-23T20:35:08.559Z"
+            }
+          }
+        },
+        "terminate": true,
+        "addedToolNames": ["update_goal_task"]
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_23432",
+      "toolName": "update_goal_task",
+      "args": {
+        "updates": [
+          {
+            "status": "start",
+            "task_id": "task-1"
+          },
+          {
+            "status": "complete",
+            "task_id": "task-1"
+          }
+        ]
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_23432",
+      "toolName": "update_goal_task",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "task-1 start; task-1 complete. 1/2 tasks complete."
+          }
+        ],
+        "details": {
+          "version": 3,
+          "goal": {
+            "id": "muekaval-uhhfg8",
+            "objective": "Inspect the empty workspace",
+            "status": "active",
+            "autoContinue": true,
+            "usage": {
+              "tokensUsed": 13828,
+              "activeSeconds": 2
+            },
+            "sisyphus": false,
+            "createdAt": "2026-09-23T20:35:06.093Z",
+            "updatedAt": "2026-09-23T20:35:10.977Z",
+            "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md",
+            "revision": 11,
+            "scheduler": {
+              "version": 1,
+              "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+              "generation": "d4598e43-6c04-47ab-a004-0f335da65426",
+              "used": 0,
+              "phase": "idle",
+              "repairUsed": false
+            },
+            "taskList": {
+              "tasks": [
+                {
+                  "id": "task-1",
+                  "title": "Inspect workspace",
+                  "status": "complete",
+                  "completedAt": "2026-09-23T20:35:10.976Z"
+                },
+                {
+                  "id": "task-2",
+                  "title": "Summarize findings",
+                  "status": "pending"
+                }
+              ],
+              "blockCompletion": false,
+              "proposedAt": "2026-09-23T20:35:08.559Z"
+            }
+          }
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_476725",
+          "name": "create_goal",
+          "arguments": {
+            "objective": "Inspect the empty workspace"
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_476725",
+      "toolName": "create_goal",
+      "content": [
+        {
+          "type": "text",
+          "text": "Goal confirmed and created.\n\nFinalized goal:\n\nInspect the empty workspace\n\nGoal details:\nBudget: none\nGoal: Inspect the empty workspace\nStatus: running\nAuto-continue: on\nTime spent: 0s\nTokens used: 0 tokens\nFile: .pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md\n1 other open goal remain in .pi/goals — this goal is now the session focus."
+        }
+      ],
+      "details": {
+        "version": 3,
+        "goal": {
+          "id": "muekaval-uhhfg8",
+          "objective": "Inspect the empty workspace",
+          "status": "active",
+          "autoContinue": true,
+          "usage": {
+            "tokensUsed": 0,
+            "activeSeconds": 0
+          },
+          "sisyphus": false,
+          "revision": 0,
+          "createdAt": "2026-09-23T20:35:06.093Z",
+          "updatedAt": "2026-09-23T20:35:06.093Z",
+          "scheduler": {
+            "version": 1,
+            "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+            "generation": "048961d8-6a89-471e-9562-0c09798cc070",
+            "used": 0,
+            "phase": "idle",
+            "repairUsed": false
+          },
+          "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md"
+        }
+      },
+      "addedToolNames": ["update_goal", "set_goal_tasks"],
+      "isError": false,
+      "timestamp": 1790195706099
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_434120",
+          "name": "set_goal_tasks",
+          "arguments": {
+            "tasks": [
+              {
+                "title": "Inspect workspace",
+                "id": "task-1"
+              },
+              {
+                "title": "Summarize findings",
+                "id": "task-2"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_434120",
+      "toolName": "set_goal_tasks",
+      "content": [
+        {
+          "type": "text",
+          "text": "Task list set and confirmed. 2 tasks."
+        }
+      ],
+      "details": {
+        "version": 3,
+        "goal": {
+          "id": "muekaval-uhhfg8",
+          "objective": "Inspect the empty workspace",
+          "status": "active",
+          "autoContinue": true,
+          "usage": {
+            "tokensUsed": 6287,
+            "activeSeconds": 0
+          },
+          "sisyphus": false,
+          "revision": 5,
+          "createdAt": "2026-09-23T20:35:06.093Z",
+          "updatedAt": "2026-09-23T20:35:08.560Z",
+          "scheduler": {
+            "version": 1,
+            "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+            "generation": "3eb8953c-0d95-44d9-b319-b4c4ab9d2cfe",
+            "used": 0,
+            "phase": "idle",
+            "repairUsed": false
+          },
+          "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md",
+          "taskList": {
+            "tasks": [
+              {
+                "id": "task-1",
+                "title": "Inspect workspace",
+                "status": "pending"
+              },
+              {
+                "id": "task-2",
+                "title": "Summarize findings",
+                "status": "pending"
+              }
+            ],
+            "blockCompletion": false,
+            "proposedAt": "2026-09-23T20:35:08.559Z"
+          }
+        }
+      },
+      "addedToolNames": ["update_goal_task"],
+      "isError": false,
+      "timestamp": 1790195708561
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_23432",
+          "name": "update_goal_task",
+          "arguments": {
+            "updates": [
+              {
+                "status": "start",
+                "task_id": "task-1"
+              },
+              {
+                "status": "complete",
+                "task_id": "task-1"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_23432",
+      "toolName": "update_goal_task",
+      "content": [
+        {
+          "type": "text",
+          "text": "task-1 start; task-1 complete. 1/2 tasks complete."
+        }
+      ],
+      "details": {
+        "version": 3,
+        "goal": {
+          "id": "muekaval-uhhfg8",
+          "objective": "Inspect the empty workspace",
+          "status": "active",
+          "autoContinue": true,
+          "usage": {
+            "tokensUsed": 13828,
+            "activeSeconds": 2
+          },
+          "sisyphus": false,
+          "createdAt": "2026-09-23T20:35:06.093Z",
+          "updatedAt": "2026-09-23T20:35:10.977Z",
+          "activePath": ".pi/goals/active_goal_2026092322350609_muekaval-uhhfg8.md",
+          "revision": 11,
+          "scheduler": {
+            "version": 1,
+            "owner": "01a0cffa-99a6-7e64-888a-debde9407a25",
+            "generation": "d4598e43-6c04-47ab-a004-0f335da65426",
+            "used": 0,
+            "phase": "idle",
+            "repairUsed": false
+          },
+          "taskList": {
+            "tasks": [
+              {
+                "id": "task-1",
+                "title": "Inspect workspace",
+                "status": "complete",
+                "completedAt": "2026-09-23T20:35:10.976Z"
+              },
+              {
+                "id": "task-2",
+                "title": "Summarize findings",
+                "status": "pending"
+              }
+            ],
+            "blockCompletion": false,
+            "proposedAt": "2026-09-23T20:35:08.559Z"
+          }
+        }
+      },
+      "isError": false,
+      "timestamp": 1790195710978
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.test.ts
new file mode 100644
index 0000000000..14de2391a3
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.test.ts
@@ -0,0 +1,15 @@
+import { expect, test } from "vitest";
+import { capturedToolCall, verifyTaskFixture } from "../task-fixture-test.js";
+import { piGoalX } from "./index.js";
+
+test("pi-goal-x maps captured RPC task tree through live and history", async () => {
+  await verifyTaskFixture(new URL("./fixtures/rpc-session.json", import.meta.url), [
+    "pending,pending",
+    "completed,pending",
+  ]);
+});
+
+test("pi-goal-x declines a foreign goal shape", () => {
+  const call = capturedToolCall(new URL("../rpiv-todo/fixtures/rpc-session.json", import.meta.url));
+  expect(piGoalX.createSession().mapToolCall?.({ ...call, toolName: "get_goal" })).toBeUndefined();
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.ts
new file mode 100644
index 0000000000..581d7096d1
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-goal-x/index.ts
@@ -0,0 +1,73 @@
+import { z } from "zod";
+import type { AgentTaskItem } from "../../../../agent-sdk-types.js";
+import type { PiExtension } from "../contract.js";
+
+interface GoalTask {
+  id: string;
+  title: string;
+  status: "pending" | "complete" | "skipped";
+  subtasks?: GoalTask[];
+}
+const Task: z.ZodType<GoalTask> = z.lazy(() =>
+  z.object({
+    id: z.string(),
+    title: z.string(),
+    status: z.enum(["pending", "complete", "skipped"]),
+    subtasks: z.array(Task).optional(),
+  }),
+);
+const Details = z.object({
+  version: z.literal(3),
+  goal: z
+    .object({
+      currentTaskId: z.string().optional(),
+      taskList: z.object({ tasks: z.array(Task) }).optional(),
+    })
+    .nullable(),
+});
+const toolNames = new Set([
+  "create_goal",
+  "get_goal",
+  "update_goal",
+  "set_goal_tasks",
+  "update_goal_task",
+]);
+
+function toItems(tasks: GoalTask[], currentTaskId?: string): AgentTaskItem[] {
+  return tasks.flatMap((task) => {
+    let status: AgentTaskItem["status"] = "pending";
+    if (task.status !== "pending") status = "completed";
+    else if (task.id === currentTaskId) status = "in_progress";
+    return [
+      {
+        id: task.id,
+        text: task.title,
+        status,
+        completed: task.status !== "pending",
+      },
+      ...toItems(task.subtasks ?? [], currentTaskId),
+    ];
+  });
+}
+
+export const piGoalX: PiExtension = {
+  id: "pi-goal-x",
+  createSession: () => ({
+    mapToolCall(call) {
+      if (
+        !toolNames.has(call.toolName) ||
+        call.status !== "completed" ||
+        !call.result ||
+        typeof call.result === "string"
+      )
+        return undefined;
+      const parsed = Details.safeParse(call.result.details);
+      if (!parsed.success) return undefined;
+      const goal = parsed.data.goal;
+      if (!goal?.taskList) return undefined;
+      return {
+        timeline: [{ type: "todo", items: toItems(goal.taskList.tasks, goal.currentTaskId) }],
+      };
+    },
+  }),
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.test.ts
new file mode 100644
index 0000000000..5316d6f6be
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, test } from "vitest";
+import { createPiExtensionHost } from "../index.js";
+import {
+  parseToolArgs,
+  parseToolResult,
+  type PiToolResult,
+  type PiTrackedToolCall,
+} from "../../tool-call-mapper.js";
+
+function mapping(toolCall: PiTrackedToolCall, result: PiToolResult) {
+  return createPiExtensionHost().mapToolCall({
+    callId: "test-call",
+    toolName: toolCall.toolName,
+    args: toolCall.args,
+    status: result ? "completed" : "running",
+    result,
+  });
+}
+function resolveToolCallName(toolCall: PiTrackedToolCall, result: PiToolResult) {
+  return mapping(toolCall, result)?.name ?? toolCall.toolName;
+}
+
+describe("pi-mcp-adapter adapter", () => {
+  test("normalizes Pi MCP proxy calls from requested tool args while running", () => {
+    const toolCall = parseToolArgs("mcp", {
+      tool: "paseo_list_models",
+      args: '{"provider":"pi"}',
+    });
+
+    expect(resolveToolCallName(toolCall, null)).toBe("paseo.list_models");
+  });
+
+  test("normalizes Pi MCP proxy calls from result details when completed", () => {
+    const toolCall = parseToolArgs("mcp", {
+      tool: "paseo_list_models",
+      args: '{"provider":"pi"}',
+    });
+    const result = parseToolResult({
+      content: [{ type: "text", text: "(empty result)" }],
+      details: {
+        mode: "call",
+        server: "paseo",
+        tool: "list_models",
+      },
+    });
+
+    expect(resolveToolCallName(toolCall, result)).toBe("paseo.list_models");
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.ts
new file mode 100644
index 0000000000..c36e18731f
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-mcp-adapter/index.ts
@@ -0,0 +1,46 @@
+import { z } from "zod";
+import type { PiExtension } from "../contract.js";
+
+const Args = z
+  .object({
+    tool: z.string().optional().catch(undefined),
+    server: z.string().optional().catch(undefined),
+  })
+  .passthrough();
+const Details = z
+  .object({
+    server: z.string().optional().catch(undefined),
+    tool: z.string().optional().catch(undefined),
+  })
+  .passthrough();
+const nonEmpty = (value: string | undefined) => value?.trim() || undefined;
+
+export const piMcpAdapter: PiExtension = {
+  id: "pi-mcp-adapter",
+  createSession: () => ({
+    mapToolCall(call) {
+      if (call.toolName !== "mcp") return undefined;
+      if (call.result && typeof call.result !== "string") {
+        const details = Details.safeParse(call.result.details);
+        if (details.success) {
+          const server = nonEmpty(details.data.server);
+          const tool = nonEmpty(details.data.tool);
+          if (server && tool) return { name: `${server}.${tool}` };
+        }
+      }
+      const args = Args.safeParse(call.args);
+      if (!args.success) return undefined;
+      const tool = nonEmpty(args.data.tool);
+      const server = nonEmpty(args.data.server);
+      if (tool && server)
+        return {
+          name: `${server}.${tool.startsWith(`${server}_`) ? tool.slice(server.length + 1) : tool}`,
+        };
+      if (tool) {
+        const [prefix, ...rest] = tool.split("_");
+        if (prefix && rest.length > 0) return { name: `${prefix}.${rest.join("_")}` };
+      }
+      return undefined;
+    },
+  }),
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/background.json b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/background.json
new file mode 100644
index 0000000000..e5f9c9f770
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/background.json
@@ -0,0 +1,238 @@
+{
+  "provenance": {
+    "package": "pi-subagents",
+    "version": "0.71.0",
+    "sourceCommit": "4af5e85a427b9f87334585ae8d0eb365d4dd2a1e",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_1334451",
+      "toolName": "subagent",
+      "args": {
+        "task": "list files in this empty workspace and report",
+        "agent": "scout",
+        "async": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_1334451",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Run fan-out: 1/64 used, 63 remaining\nAsync: scout [005cfec2-1376-4e96-b622-5ad8f4c15cb5]\n\nThe async run is detached and running in the background.\nYou are in an interactive session. Return control to the user now; Pi will wake you through the native completion notification when this subagent completes or needs attention. Do not run sleep/polling loops to wait for this async subagent; it does not need a wait call.\nUse bg_wait only for provider, detached, or other background work that lacks a native completion notification.\nIf the current turn must receive results from work without a native notification before it ends, call blocking bg_wait(); ordinary async subagent runs do not need a wait call because their completion is delivered natively.\nOtherwise, continue any independent work or return control to the user. Use subagent({ action: \"status\", id: \"...\" }) for a one-shot status/result or to inspect a blocked/stale run, never as a wait loop.\nMission: bc1a1172-b106-4b35-9325-9fd304278827 (active)"
+          }
+        ],
+        "details": {
+          "mode": "single",
+          "runId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+          "results": [],
+          "asyncId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+          "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+          "launchContractDigest": "d7ed0cb6c99feb265efdaf7294fdac2e9eceacf3560c3cf8fd5a7fa22ea4dac1",
+          "launchResolvedExtensions": {
+            "version": 1,
+            "source": "launch-resolved",
+            "disableAmbientExtensions": false,
+            "runtime": ["sha256:c41552bd9557eaab"],
+            "configured": [],
+            "required": [],
+            "effective": ["sha256:c41552bd9557eaab"],
+            "omitted": {
+              "runtime": 0,
+              "configured": 0,
+              "required": 0,
+              "effective": 0
+            }
+          },
+          "context": "fresh",
+          "timeoutMs": 1800000,
+          "deadlineAt": 1790199499998,
+          "runFanoutBudget": {
+            "used": 1,
+            "limit": 64,
+            "remaining": 63
+          },
+          "missionId": "bc1a1172-b106-4b35-9325-9fd304278827",
+          "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/bc1a1172-b106-4b35-9325-9fd304278827.json",
+          "mission": {
+            "schemaVersion": 1,
+            "id": "bc1a1172-b106-4b35-9325-9fd304278827",
+            "title": "[prompt redacted]",
+            "objective": "[prompt redacted]",
+            "status": "active",
+            "createdAt": "2026-09-23T21:08:19.994Z",
+            "updatedAt": "2026-09-23T21:08:20.008Z",
+            "runs": [
+              {
+                "runId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+                "mode": "single",
+                "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+                "status": "active",
+                "startedAt": "2026-09-23T21:08:20.008Z"
+              }
+            ],
+            "workflowChildren": [],
+            "decisions": [],
+            "artifacts": [
+              {
+                "kind": "status",
+                "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/status.json"
+              },
+              {
+                "kind": "other",
+                "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/events.jsonl",
+                "description": "Lifecycle events"
+              }
+            ],
+            "receipts": [],
+            "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+            "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-08-13-722Z_01a0d018-fd1a-7711-9c17-933fd34f0cff.jsonl"
+          }
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notify",
+        "content": "Background task completed: **scout**\n\nscout:\n# Code Context\n\n## Files Retrieved\n(No files found; the workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty.)\n\n## Key Code\nN/A - Empty repository / workspace.\n\n## Architecture\nN/A - Empty repository / workspace.\n\n## Start Here\nThe workspace is currently empty. Initialize or populate the workspace with source code to begin development.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/context.md (356 B, 13 lines). Read this file if needed.\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-08-13-722Z_01a0d018-fd1a-7711-9c17-933fd34f0cff/2a37ef22-e1f9-4f75-b9a0-510e82ffd422/run-0/session.jsonl",
+        "display": false,
+        "timestamp": 1790197711046
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_1334451",
+          "name": "subagent",
+          "arguments": {
+            "task": "list files in this empty workspace and report",
+            "agent": "scout",
+            "async": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 3303,
+        "output": 114,
+        "cacheRead": 7053,
+        "cacheWrite": 0,
+        "reasoning": 81,
+        "totalTokens": 10470,
+        "cost": {
+          "input": 0.00247725,
+          "output": 0.00042750000000000004,
+          "cacheRead": 0.000528975,
+          "cacheWrite": 0,
+          "total": 0.003433725
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197697608,
+      "responseId": "gen-1790197697-lxluaTrDkdaxjSXsO957",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_1334451",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Run fan-out: 1/64 used, 63 remaining\nAsync: scout [005cfec2-1376-4e96-b622-5ad8f4c15cb5]\n\nThe async run is detached and running in the background.\nYou are in an interactive session. Return control to the user now; Pi will wake you through the native completion notification when this subagent completes or needs attention. Do not run sleep/polling loops to wait for this async subagent; it does not need a wait call.\nUse bg_wait only for provider, detached, or other background work that lacks a native completion notification.\nIf the current turn must receive results from work without a native notification before it ends, call blocking bg_wait(); ordinary async subagent runs do not need a wait call because their completion is delivered natively.\nOtherwise, continue any independent work or return control to the user. Use subagent({ action: \"status\", id: \"...\" }) for a one-shot status/result or to inspect a blocked/stale run, never as a wait loop.\nMission: bc1a1172-b106-4b35-9325-9fd304278827 (active)"
+        }
+      ],
+      "details": {
+        "mode": "single",
+        "runId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+        "results": [],
+        "asyncId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+        "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+        "launchContractDigest": "d7ed0cb6c99feb265efdaf7294fdac2e9eceacf3560c3cf8fd5a7fa22ea4dac1",
+        "launchResolvedExtensions": {
+          "version": 1,
+          "source": "launch-resolved",
+          "disableAmbientExtensions": false,
+          "runtime": ["sha256:c41552bd9557eaab"],
+          "configured": [],
+          "required": [],
+          "effective": ["sha256:c41552bd9557eaab"],
+          "omitted": {
+            "runtime": 0,
+            "configured": 0,
+            "required": 0,
+            "effective": 0
+          }
+        },
+        "context": "fresh",
+        "timeoutMs": 1800000,
+        "deadlineAt": 1790199499998,
+        "runFanoutBudget": {
+          "used": 1,
+          "limit": 64,
+          "remaining": 63
+        },
+        "missionId": "bc1a1172-b106-4b35-9325-9fd304278827",
+        "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/bc1a1172-b106-4b35-9325-9fd304278827.json",
+        "mission": {
+          "schemaVersion": 1,
+          "id": "bc1a1172-b106-4b35-9325-9fd304278827",
+          "title": "[prompt redacted]",
+          "objective": "[prompt redacted]",
+          "status": "active",
+          "createdAt": "2026-09-23T21:08:19.994Z",
+          "updatedAt": "2026-09-23T21:08:20.008Z",
+          "runs": [
+            {
+              "runId": "005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+              "mode": "single",
+              "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5",
+              "status": "active",
+              "startedAt": "2026-09-23T21:08:20.008Z"
+            }
+          ],
+          "workflowChildren": [],
+          "decisions": [],
+          "artifacts": [
+            {
+              "kind": "status",
+              "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/status.json"
+            },
+            {
+              "kind": "other",
+              "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/events.jsonl",
+              "description": "Lifecycle events"
+            }
+          ],
+          "receipts": [],
+          "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+          "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-08-13-722Z_01a0d018-fd1a-7711-9c17-933fd34f0cff.jsonl"
+        }
+      },
+      "isError": false,
+      "timestamp": 1790197700011
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notify",
+      "content": "Background task completed: **scout**\n\nscout:\n# Code Context\n\n## Files Retrieved\n(No files found; the workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty.)\n\n## Key Code\nN/A - Empty repository / workspace.\n\n## Architecture\nN/A - Empty repository / workspace.\n\n## Start Here\nThe workspace is currently empty. Initialize or populate the workspace with source code to begin development.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/005cfec2-1376-4e96-b622-5ad8f4c15cb5/context.md (356 B, 13 lines). Read this file if needed.\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/005cfec2-1376-4e96-b622-5ad8f4c15cb5\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-08-13-722Z_01a0d018-fd1a-7711-9c17-933fd34f0cff/2a37ef22-e1f9-4f75-b9a0-510e82ffd422/run-0/session.jsonl",
+      "display": false,
+      "timestamp": 1790197711046
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/child-session.jsonl b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/child-session.jsonl
new file mode 100644
index 0000000000..4c91517bc7
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/child-session.jsonl
@@ -0,0 +1,6 @@
+{"type":"message","id":"e795eaf5","parentId":"1246b701","timestamp":"2026-09-23T21:07:15.911Z","message":{"role":"user","content":[{"type":"text","text":"Task: list the files in the current empty workspace\n\n---\n**Output:**\nWrite your findings to exactly this path: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md\nThis path is authoritative for this run.\nIgnore any other output filename or output path mentioned elsewhere, including output destinations in the base agent prompt, system prompt, or task instructions."}],"timestamp":1790197635909}}
+{"type":"message","id":"9c3e635a","parentId":"e795eaf5","timestamp":"2026-09-23T21:07:17.023Z","message":{"role":"assistant","content":[{"type":"thinking","thinking":"","thinkingSignature":"[{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a18r+r0Pz/qlYHWE7rzBu05Qld2Nrf1tWvryqCbkr58iwJN1Xd5cBJXIWN9eGQldY3pt9HBzDHMx7+0/FrcUJrNRI9pMFmZ1+RX/\",\"format\":\"google-gemini-v1\",\"id\":\"call_1077973\",\"index\":0}]"},{"type":"toolCall","id":"call_1077973","name":"ls","arguments":{"path":"."}}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":2269,"output":14,"cacheRead":0,"cacheWrite":0,"reasoning":0,"totalTokens":2283,"cost":{"input":0.0017017500000000001,"output":0.0000525,"cacheRead":0,"cacheWrite":0,"total":0.0017542500000000002}},"stopReason":"toolUse","timestamp":1790197635958,"responseId":"gen-1790197636-iGm6QGfRbBF1JVOGTV3F","rawStopReason":"tool_calls"}}
+{"type":"message","id":"5dc50c52","parentId":"9c3e635a","timestamp":"2026-09-23T21:07:17.025Z","message":{"role":"toolResult","toolCallId":"call_1077973","toolName":"ls","content":[{"type":"text","text":"(empty directory)"}],"isError":false,"timestamp":1790197637025}}
+{"type":"message","id":"ccd5b53b","parentId":"5dc50c52","timestamp":"2026-09-23T21:07:18.699Z","message":{"role":"assistant","content":[{"type":"thinking","thinking":"","thinkingSignature":"[{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a1/cR3gdBgtKF94+BF+RZ/GhtIJDc1LiOKIgJzdWTU0PUyGthIMRtW3RcTe+vmD6jxfZpiQnLfpVHFF2u0nRbYKUS2d2JdYvEYoP\",\"format\":\"google-gemini-v1\",\"id\":\"call_509063\",\"index\":0}]"},{"type":"toolCall","id":"call_509063","name":"write","arguments":{"content":"# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.\n","path":"/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"}}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":2286,"output":161,"cacheRead":0,"cacheWrite":0,"reasoning":0,"totalTokens":2447,"cost":{"input":0.0017145,"output":0.00060375,"cacheRead":0,"cacheWrite":0,"total":0.00231825}},"stopReason":"toolUse","timestamp":1790197637026,"responseId":"gen-1790197637-JwIo6AVv6AVYwzaK9hmY","rawStopReason":"tool_calls"}}
+{"type":"message","id":"5ae9c4b7","parentId":"ccd5b53b","timestamp":"2026-09-23T21:07:18.701Z","message":{"role":"toolResult","toolCallId":"call_509063","toolName":"write","content":[{"type":"text","text":"Successfully wrote 312 bytes to /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"}],"isError":false,"timestamp":1790197638701}}
+{"type":"message","id":"034e2862","parentId":"5ae9c4b7","timestamp":"2026-09-23T21:07:21.572Z","message":{"role":"assistant","content":[{"type":"text","text":"I have inspected the current workspace and confirmed that it is an empty directory. The scouting context documentation has been written to `/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md`.\n\n# Code Context Summary\n\n## Files Retrieved\n- `.`: Directory contents checked via `ls`, confirmed empty directory.\n\n## Key Code\n- None (workspace is empty).\n\n## Architecture\n- N/A\n\n## Start Here\n- N/A\n\n```acceptance-report\n{\n  \"criteriaSatisfied\": [\n    {\n      \"id\": \"criterion-1\",\n      \"status\": \"satisfied\",\n      \"evidence\": \"Listed current workspace using ls and confirmed it is empty; output written to designated context path.\"\n    }\n  ],\n  \"changedFiles\": [],\n  \"testsAddedOrUpdated\": [],\n  \"commandsRun\": [],\n  \"validationOutput\": [\n    \"Directory contents: (empty directory)\"\n  ],\n  \"residualRisks\": [\n    \"Workspace is empty\"\n  ],\n  \"noStagedFiles\": true,\n  \"diffSummary\": \"No source files changed. Output written to subagent artifacts path.\",\n  \"reviewFindings\": [\n    \"No code issues; directory is empty.\"\n  ],\n  \"manualNotes\": \"Listed current workspace directory and generated required context artifact.\"\n}\n```"}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":2510,"output":336,"cacheRead":0,"cacheWrite":0,"reasoning":0,"totalTokens":2846,"cost":{"input":0.0018825,"output":0.00126,"cacheRead":0,"cacheWrite":0,"total":0.0031425000000000003}},"stopReason":"stop","timestamp":1790197638701,"responseId":"gen-1790197638-a2hJ13SAsm2PpAbEH64L","rawStopReason":"stop"}}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/foreground.json b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/foreground.json
new file mode 100644
index 0000000000..e48353293e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/foreground.json
@@ -0,0 +1,619 @@
+{
+  "provenance": {
+    "package": "pi-subagents",
+    "version": "0.71.0",
+    "sourceCommit": "4af5e85a427b9f87334585ae8d0eb365d4dd2a1e",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_930237",
+      "toolName": "subagent",
+      "args": {
+        "async": false,
+        "agent": "scout",
+        "task": "list the files in the current empty workspace"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_930237",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Run fan-out: 1/64 used, 63 remaining\n# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed.\nMission: 17cc387f-50eb-4a34-bb98-4452434c1274 (completed)"
+          }
+        ],
+        "details": {
+          "mode": "single",
+          "runId": "679ba95f-8fae-466c-a889-6717de1dc2f0",
+          "timeoutMs": 1800000,
+          "results": [
+            {
+              "index": 0,
+              "agent": "scout",
+              "task": "[prompt redacted]",
+              "sessionName": "scout: list the files in the current empty workspace --- **Outpu...",
+              "launchContractDigest": "017d16009783e723e7ceb19f4895d8a91d9ac4b1cade1ca0f5f50c8fbbac8a41",
+              "launchResolvedExtensions": {
+                "version": 1,
+                "source": "launch-resolved",
+                "disableAmbientExtensions": true,
+                "runtime": ["sha256:c41552bd9557eaab"],
+                "configured": [],
+                "required": [],
+                "effective": ["sha256:c41552bd9557eaab"],
+                "omitted": {
+                  "runtime": 0,
+                  "configured": 0,
+                  "required": 0,
+                  "effective": 0
+                }
+              },
+              "exitCode": 0,
+              "outputState": "present",
+              "usage": {
+                "input": 7065,
+                "output": 511,
+                "cacheRead": 0,
+                "cacheWrite": 0,
+                "cost": 0.007215,
+                "turns": 3
+              },
+              "model": "openrouter/google/gemini-3.6-flash:low",
+              "thinking": "low",
+              "artifactPaths": {
+                "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_input.md",
+                "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md",
+                "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0.jsonl",
+                "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+                "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_meta.json"
+              },
+              "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+              "context": "fresh",
+              "progressSummary": {
+                "sessionName": "scout: list the files in the current empty workspace --- **Outpu...",
+                "toolCount": 2,
+                "tokens": 7576,
+                "durationMs": 6330
+              },
+              "savedOutputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+              "outputReference": {
+                "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+                "bytes": 311,
+                "lines": 13,
+                "message": "Output saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed."
+              },
+              "outputMode": "inline",
+              "finalOutput": "# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.",
+              "sessionFile": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-07-08-019Z_01a0d017-fc73-7e52-b822-9235801e5403/679ba95f-8fae-466c-a889-6717de1dc2f0/run-0/session.jsonl",
+              "acceptance": {
+                "status": "attested",
+                "evidenceStatus": "attested",
+                "explicit": false,
+                "effectiveAcceptance": {
+                  "level": "attested",
+                  "explicit": false,
+                  "inferredReason": ["default lightweight attestation"],
+                  "criteria": [
+                    {
+                      "id": "criterion-1",
+                      "must": "Return a concise result and residual risks when applicable",
+                      "evidence": ["manual-notes", "residual-risks"],
+                      "severity": "required"
+                    }
+                  ],
+                  "evidence": ["manual-notes", "residual-risks"],
+                  "verify": [],
+                  "stopRules": []
+                },
+                "inferredReason": ["default lightweight attestation"],
+                "criteria": [
+                  {
+                    "id": "criterion-1",
+                    "must": "Return a concise result and residual risks when applicable",
+                    "evidence": ["manual-notes", "residual-risks"],
+                    "severity": "required"
+                  }
+                ],
+                "runtimeChecks": [],
+                "verifyRuns": [],
+                "childReport": {
+                  "criteriaSatisfied": [
+                    {
+                      "id": "criterion-1",
+                      "status": "satisfied",
+                      "evidence": "Listed current workspace using ls and confirmed it is empty; output written to designated context path."
+                    }
+                  ],
+                  "changedFiles": [],
+                  "testsAddedOrUpdated": [],
+                  "commandsRun": [],
+                  "validationOutput": ["Directory contents: (empty directory)"],
+                  "residualRisks": ["Workspace is empty"],
+                  "noStagedFiles": true,
+                  "diffSummary": "No source files changed. Output written to subagent artifacts path.",
+                  "reviewFindings": ["No code issues; directory is empty."],
+                  "manualNotes": "Listed current workspace directory and generated required context artifact."
+                }
+              },
+              "toolCalls": [
+                {
+                  "text": "ls {\"path\":\".\"}",
+                  "expandedText": "ls {\"path\":\".\"}"
+                },
+                {
+                  "text": "write /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+                  "expandedText": "write /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"
+                }
+              ]
+            }
+          ],
+          "artifacts": {
+            "dir": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts",
+            "files": [
+              {
+                "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_input.md",
+                "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md",
+                "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0.jsonl",
+                "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+                "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_meta.json"
+              }
+            ]
+          },
+          "totalChildUsage": {
+            "input": 7065,
+            "output": 511,
+            "cacheRead": 0,
+            "cacheWrite": 0,
+            "cost": 0.007215,
+            "turns": 3
+          },
+          "totalCost": {
+            "inputTokens": 7065,
+            "outputTokens": 511,
+            "costUsd": 0.007215
+          },
+          "context": "fresh",
+          "runFanoutBudget": {
+            "used": 1,
+            "limit": 64,
+            "remaining": 63
+          },
+          "missionId": "17cc387f-50eb-4a34-bb98-4452434c1274",
+          "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/17cc387f-50eb-4a34-bb98-4452434c1274.json",
+          "mission": {
+            "schemaVersion": 1,
+            "id": "17cc387f-50eb-4a34-bb98-4452434c1274",
+            "title": "[prompt redacted]",
+            "objective": "[prompt redacted]",
+            "status": "completed",
+            "createdAt": "2026-09-23T21:07:15.238Z",
+            "updatedAt": "2026-09-23T21:07:21.578Z",
+            "runs": [
+              {
+                "runId": "679ba95f-8fae-466c-a889-6717de1dc2f0",
+                "mode": "single",
+                "agent": "scout",
+                "status": "completed",
+                "startedAt": "2026-09-23T21:07:21.578Z",
+                "completedAt": "2026-09-23T21:07:21.578Z",
+                "usage": {
+                  "tokens": 7576
+                }
+              }
+            ],
+            "workflowChildren": [],
+            "decisions": [],
+            "artifacts": [
+              {
+                "kind": "output",
+                "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md"
+              },
+              {
+                "kind": "output",
+                "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"
+              },
+              {
+                "kind": "other",
+                "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+                "description": "Child transcript"
+              }
+            ],
+            "receipts": [],
+            "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+            "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-07-08-019Z_01a0d017-fc73-7e52-b822-9235801e5403.jsonl",
+            "summary": "Run fan-out: 1/64 used, 63 remaining\n# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed.",
+            "acceptance": {
+              "status": "attested",
+              "evidenceStatus": "attested",
+              "explicit": false,
+              "effectiveAcceptance": {
+                "level": "attested",
+                "explicit": false,
+                "inferredReason": ["default lightweight attestation"],
+                "criteria": [
+                  {
+                    "id": "criterion-1",
+                    "must": "Return a concise result and residual risks when applicable",
+                    "evidence": ["manual-notes", "residual-risks"],
+                    "severity": "required"
+                  }
+                ],
+                "evidence": ["manual-notes", "residual-risks"],
+                "verify": [],
+                "stopRules": []
+              },
+              "inferredReason": ["default lightweight attestation"],
+              "criteria": [
+                {
+                  "id": "criterion-1",
+                  "must": "Return a concise result and residual risks when applicable",
+                  "evidence": ["manual-notes", "residual-risks"],
+                  "severity": "required"
+                }
+              ],
+              "runtimeChecks": [],
+              "verifyRuns": [],
+              "childReport": {
+                "criteriaSatisfied": [
+                  {
+                    "id": "criterion-1",
+                    "status": "satisfied",
+                    "evidence": "Listed current workspace using ls and confirmed it is empty; output written to designated context path."
+                  }
+                ],
+                "changedFiles": [],
+                "testsAddedOrUpdated": [],
+                "commandsRun": [],
+                "validationOutput": ["Directory contents: (empty directory)"],
+                "residualRisks": ["Workspace is empty"],
+                "noStagedFiles": true,
+                "diffSummary": "No source files changed. Output written to subagent artifacts path.",
+                "reviewFindings": ["No code issues; directory is empty."],
+                "manualNotes": "Listed current workspace directory and generated required context artifact."
+              }
+            }
+          }
+        },
+        "usage": {
+          "input": 7065,
+          "output": 511,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "totalTokens": 7576,
+          "cost": {
+            "input": 0,
+            "output": 0,
+            "cacheRead": 0,
+            "cacheWrite": 0,
+            "total": 0.007215
+          }
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_930237",
+          "name": "subagent",
+          "arguments": {
+            "async": false,
+            "agent": "scout",
+            "task": "list the files in the current empty workspace"
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 3368,
+        "output": 130,
+        "cacheRead": 7060,
+        "cacheWrite": 0,
+        "reasoning": 97,
+        "totalTokens": 10558,
+        "cost": {
+          "input": 0.002526,
+          "output": 0.00048750000000000003,
+          "cacheRead": 0.0005295,
+          "cacheWrite": 0,
+          "total": 0.003543
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197632837,
+      "responseId": "gen-1790197632-7WtHYojgcq3aQeXi5a9Y",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_930237",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Run fan-out: 1/64 used, 63 remaining\n# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed.\nMission: 17cc387f-50eb-4a34-bb98-4452434c1274 (completed)"
+        }
+      ],
+      "details": {
+        "mode": "single",
+        "runId": "679ba95f-8fae-466c-a889-6717de1dc2f0",
+        "timeoutMs": 1800000,
+        "results": [
+          {
+            "index": 0,
+            "agent": "scout",
+            "task": "[prompt redacted]",
+            "sessionName": "scout: list the files in the current empty workspace --- **Outpu...",
+            "launchContractDigest": "017d16009783e723e7ceb19f4895d8a91d9ac4b1cade1ca0f5f50c8fbbac8a41",
+            "launchResolvedExtensions": {
+              "version": 1,
+              "source": "launch-resolved",
+              "disableAmbientExtensions": true,
+              "runtime": ["sha256:c41552bd9557eaab"],
+              "configured": [],
+              "required": [],
+              "effective": ["sha256:c41552bd9557eaab"],
+              "omitted": {
+                "runtime": 0,
+                "configured": 0,
+                "required": 0,
+                "effective": 0
+              }
+            },
+            "exitCode": 0,
+            "outputState": "present",
+            "usage": {
+              "input": 7065,
+              "output": 511,
+              "cacheRead": 0,
+              "cacheWrite": 0,
+              "cost": 0.007215,
+              "turns": 3
+            },
+            "model": "openrouter/google/gemini-3.6-flash:low",
+            "thinking": "low",
+            "artifactPaths": {
+              "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_input.md",
+              "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md",
+              "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0.jsonl",
+              "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+              "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_meta.json"
+            },
+            "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+            "context": "fresh",
+            "progressSummary": {
+              "sessionName": "scout: list the files in the current empty workspace --- **Outpu...",
+              "toolCount": 2,
+              "tokens": 7576,
+              "durationMs": 6330
+            },
+            "savedOutputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+            "outputReference": {
+              "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+              "bytes": 311,
+              "lines": 13,
+              "message": "Output saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed."
+            },
+            "outputMode": "inline",
+            "finalOutput": "# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.",
+            "sessionFile": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-07-08-019Z_01a0d017-fc73-7e52-b822-9235801e5403/679ba95f-8fae-466c-a889-6717de1dc2f0/run-0/session.jsonl",
+            "acceptance": {
+              "status": "attested",
+              "evidenceStatus": "attested",
+              "explicit": false,
+              "effectiveAcceptance": {
+                "level": "attested",
+                "explicit": false,
+                "inferredReason": ["default lightweight attestation"],
+                "criteria": [
+                  {
+                    "id": "criterion-1",
+                    "must": "Return a concise result and residual risks when applicable",
+                    "evidence": ["manual-notes", "residual-risks"],
+                    "severity": "required"
+                  }
+                ],
+                "evidence": ["manual-notes", "residual-risks"],
+                "verify": [],
+                "stopRules": []
+              },
+              "inferredReason": ["default lightweight attestation"],
+              "criteria": [
+                {
+                  "id": "criterion-1",
+                  "must": "Return a concise result and residual risks when applicable",
+                  "evidence": ["manual-notes", "residual-risks"],
+                  "severity": "required"
+                }
+              ],
+              "runtimeChecks": [],
+              "verifyRuns": [],
+              "childReport": {
+                "criteriaSatisfied": [
+                  {
+                    "id": "criterion-1",
+                    "status": "satisfied",
+                    "evidence": "Listed current workspace using ls and confirmed it is empty; output written to designated context path."
+                  }
+                ],
+                "changedFiles": [],
+                "testsAddedOrUpdated": [],
+                "commandsRun": [],
+                "validationOutput": ["Directory contents: (empty directory)"],
+                "residualRisks": ["Workspace is empty"],
+                "noStagedFiles": true,
+                "diffSummary": "No source files changed. Output written to subagent artifacts path.",
+                "reviewFindings": ["No code issues; directory is empty."],
+                "manualNotes": "Listed current workspace directory and generated required context artifact."
+              }
+            },
+            "toolCalls": [
+              {
+                "text": "ls {\"path\":\".\"}",
+                "expandedText": "ls {\"path\":\".\"}"
+              },
+              {
+                "text": "write /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md",
+                "expandedText": "write /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"
+              }
+            ]
+          }
+        ],
+        "artifacts": {
+          "dir": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts",
+          "files": [
+            {
+              "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_input.md",
+              "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md",
+              "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0.jsonl",
+              "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+              "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_meta.json"
+            }
+          ]
+        },
+        "totalChildUsage": {
+          "input": 7065,
+          "output": 511,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "cost": 0.007215,
+          "turns": 3
+        },
+        "totalCost": {
+          "inputTokens": 7065,
+          "outputTokens": 511,
+          "costUsd": 0.007215
+        },
+        "context": "fresh",
+        "runFanoutBudget": {
+          "used": 1,
+          "limit": 64,
+          "remaining": 63
+        },
+        "missionId": "17cc387f-50eb-4a34-bb98-4452434c1274",
+        "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/17cc387f-50eb-4a34-bb98-4452434c1274.json",
+        "mission": {
+          "schemaVersion": 1,
+          "id": "17cc387f-50eb-4a34-bb98-4452434c1274",
+          "title": "[prompt redacted]",
+          "objective": "[prompt redacted]",
+          "status": "completed",
+          "createdAt": "2026-09-23T21:07:15.238Z",
+          "updatedAt": "2026-09-23T21:07:21.578Z",
+          "runs": [
+            {
+              "runId": "679ba95f-8fae-466c-a889-6717de1dc2f0",
+              "mode": "single",
+              "agent": "scout",
+              "status": "completed",
+              "startedAt": "2026-09-23T21:07:21.578Z",
+              "completedAt": "2026-09-23T21:07:21.578Z",
+              "usage": {
+                "tokens": 7576
+              }
+            }
+          ],
+          "workflowChildren": [],
+          "decisions": [],
+          "artifacts": [
+            {
+              "kind": "output",
+              "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_output.md"
+            },
+            {
+              "kind": "output",
+              "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md"
+            },
+            {
+              "kind": "other",
+              "path": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/679ba95f-8fae-466c-a889-6717de1dc2f0_scout_0_transcript.jsonl",
+              "description": "Child transcript"
+            }
+          ],
+          "receipts": [],
+          "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+          "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-07-08-019Z_01a0d017-fc73-7e52-b822-9235801e5403.jsonl",
+          "summary": "Run fan-out: 1/64 used, 63 remaining\n# Code Context\n\n## Files Retrieved\nWorkspace directory `/tmp/paseo-pi-extension-phase3/workspace` was inspected using `ls`. No files found.\n\n## Key Code\nN/A - The workspace is currently empty.\n\n## Architecture\nN/A - No code structure or files exist in the workspace yet.\n\n## Start Here\nN/A - Workspace is empty.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/679ba95f-8fae-466c-a889-6717de1dc2f0/context.md (311 B, 13 lines). Read this file if needed.",
+          "acceptance": {
+            "status": "attested",
+            "evidenceStatus": "attested",
+            "explicit": false,
+            "effectiveAcceptance": {
+              "level": "attested",
+              "explicit": false,
+              "inferredReason": ["default lightweight attestation"],
+              "criteria": [
+                {
+                  "id": "criterion-1",
+                  "must": "Return a concise result and residual risks when applicable",
+                  "evidence": ["manual-notes", "residual-risks"],
+                  "severity": "required"
+                }
+              ],
+              "evidence": ["manual-notes", "residual-risks"],
+              "verify": [],
+              "stopRules": []
+            },
+            "inferredReason": ["default lightweight attestation"],
+            "criteria": [
+              {
+                "id": "criterion-1",
+                "must": "Return a concise result and residual risks when applicable",
+                "evidence": ["manual-notes", "residual-risks"],
+                "severity": "required"
+              }
+            ],
+            "runtimeChecks": [],
+            "verifyRuns": [],
+            "childReport": {
+              "criteriaSatisfied": [
+                {
+                  "id": "criterion-1",
+                  "status": "satisfied",
+                  "evidence": "Listed current workspace using ls and confirmed it is empty; output written to designated context path."
+                }
+              ],
+              "changedFiles": [],
+              "testsAddedOrUpdated": [],
+              "commandsRun": [],
+              "validationOutput": ["Directory contents: (empty directory)"],
+              "residualRisks": ["Workspace is empty"],
+              "noStagedFiles": true,
+              "diffSummary": "No source files changed. Output written to subagent artifacts path.",
+              "reviewFindings": ["No code issues; directory is empty."],
+              "manualNotes": "Listed current workspace directory and generated required context artifact."
+            }
+          }
+        }
+      },
+      "usage": {
+        "input": 7065,
+        "output": 511,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "totalTokens": 7576,
+        "cost": {
+          "input": 0,
+          "output": 0,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.007215
+        }
+      },
+      "isError": false,
+      "timestamp": 1790197641579
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/wait.json b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/wait.json
new file mode 100644
index 0000000000..0e43c8dd25
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/fixtures/wait.json
@@ -0,0 +1,412 @@
+{
+  "provenance": {
+    "package": "pi-subagents",
+    "version": "0.71.0",
+    "sourceCommit": "4af5e85a427b9f87334585ae8d0eb365d4dd2a1e",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_451394",
+      "toolName": "subagent",
+      "args": {
+        "agent": "scout",
+        "task": "list files in this empty workspace",
+        "async": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_451394",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Run fan-out: 1/64 used, 63 remaining\nAsync: scout [33b193f7-7519-4395-a09c-e45e8f5ce4fa]\n\nThe async run is detached and running in the background.\nYou are in an interactive session. Return control to the user now; Pi will wake you through the native completion notification when this subagent completes or needs attention. Do not run sleep/polling loops to wait for this async subagent; it does not need a wait call.\nUse bg_wait only for provider, detached, or other background work that lacks a native completion notification.\nIf the current turn must receive results from work without a native notification before it ends, call blocking bg_wait(); ordinary async subagent runs do not need a wait call because their completion is delivered natively.\nOtherwise, continue any independent work or return control to the user. Use subagent({ action: \"status\", id: \"...\" }) for a one-shot status/result or to inspect a blocked/stale run, never as a wait loop.\nMission: 812446a0-b883-48e0-ac3c-f810ffbcb7a9 (active)"
+          }
+        ],
+        "details": {
+          "mode": "single",
+          "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+          "results": [],
+          "asyncId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+          "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+          "launchContractDigest": "1c2799c32119977a96c1e4987cea70fccbe931d8cd1904fd2da8d8689dd0fa08",
+          "launchResolvedExtensions": {
+            "version": 1,
+            "source": "launch-resolved",
+            "disableAmbientExtensions": false,
+            "runtime": ["sha256:c41552bd9557eaab"],
+            "configured": [],
+            "required": [],
+            "effective": ["sha256:c41552bd9557eaab"],
+            "omitted": {
+              "runtime": 0,
+              "configured": 0,
+              "required": 0,
+              "effective": 0
+            }
+          },
+          "context": "fresh",
+          "timeoutMs": 1800000,
+          "deadlineAt": 1790200012953,
+          "runFanoutBudget": {
+            "used": 1,
+            "limit": 64,
+            "remaining": 63
+          },
+          "missionId": "812446a0-b883-48e0-ac3c-f810ffbcb7a9",
+          "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/812446a0-b883-48e0-ac3c-f810ffbcb7a9.json",
+          "mission": {
+            "schemaVersion": 1,
+            "id": "812446a0-b883-48e0-ac3c-f810ffbcb7a9",
+            "title": "[prompt redacted]",
+            "objective": "[prompt redacted]",
+            "status": "active",
+            "createdAt": "2026-09-23T21:16:52.950Z",
+            "updatedAt": "2026-09-23T21:16:52.962Z",
+            "runs": [
+              {
+                "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+                "mode": "single",
+                "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+                "status": "active",
+                "startedAt": "2026-09-23T21:16:52.962Z"
+              }
+            ],
+            "workflowChildren": [],
+            "decisions": [],
+            "artifacts": [
+              {
+                "kind": "status",
+                "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/status.json"
+              },
+              {
+                "kind": "other",
+                "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/events.jsonl",
+                "description": "Lifecycle events"
+              }
+            ],
+            "receipts": [],
+            "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+            "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198.jsonl"
+          }
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_512773",
+      "toolName": "bg_wait",
+      "args": {
+        "all": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_512773",
+      "toolName": "bg_wait",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Waited 7.8s for 1 async run(s); done. Outcome: 1 complete.\nResult [33b193f7-7519-4395-a09c-e45e8f5ce4fa]: /tmp/pi-subagents-uid-1000/async-subagent-results/output-archives/33b193f7-7519-4395-a09c-e45e8f5ce4fa.json\n Completion/control events have been observed; inspect status if a notification is not visible yet."
+          }
+        ],
+        "usage": {
+          "input": 7435,
+          "output": 884,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "totalTokens": 8319,
+          "cost": {
+            "input": 0,
+            "output": 0,
+            "cacheRead": 0,
+            "cacheWrite": 0,
+            "total": 0.00889125
+          }
+        },
+        "details": {
+          "mode": "management",
+          "results": [],
+          "completions": [
+            {
+              "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+              "agent": "scout",
+              "mode": "single",
+              "state": "complete",
+              "success": true,
+              "results": [
+                {
+                  "agent": "scout",
+                  "usage": {
+                    "input": 7435,
+                    "output": 884,
+                    "cacheRead": 0,
+                    "cacheWrite": 0,
+                    "cost": 0.00889125,
+                    "turns": 3
+                  },
+                  "sessionFile": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198/53dcdf6f-7871-44ae-bf72-7744df7845f2/run-0/session.jsonl",
+                  "success": true,
+                  "outputState": "present",
+                  "model": "openrouter/google/gemini-3.6-flash:low",
+                  "artifactPaths": {
+                    "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_input.md",
+                    "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_output.md",
+                    "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout.jsonl",
+                    "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_transcript.jsonl",
+                    "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_meta.json"
+                  }
+                }
+              ],
+              "archivePath": "/tmp/pi-subagents-uid-1000/async-subagent-results/output-archives/33b193f7-7519-4395-a09c-e45e8f5ce4fa.json"
+            }
+          ]
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notify",
+        "content": "Background task completed: **scout**\n\nscout:\n# Code Context\n\n## Files Retrieved\nNo files found in workspace `/tmp/paseo-pi-extension-phase3/workspace`.\n\n## Key Code\nNone. The directory is empty.\n\n## Architecture\nN/A - Empty workspace.\n\n## Start Here\n`/tmp/paseo-pi-extension-phase3/workspace` - Root workspace directory.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/context.md (275 B, 13 lines). Read this file if needed.\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198/53dcdf6f-7871-44ae-bf72-7744df7845f2/run-0/session.jsonl",
+        "display": false,
+        "timestamp": 1790198222119
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_451394",
+          "name": "subagent",
+          "arguments": {
+            "agent": "scout",
+            "task": "list files in this empty workspace",
+            "async": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 9469,
+        "output": 127,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 96,
+        "totalTokens": 9596,
+        "cost": {
+          "input": 0.00710175,
+          "output": 0.00047625,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.0075780000000000005
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790198210866,
+      "responseId": "gen-1790198211-rIrfe6SMT2s34Gp8iGou",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_451394",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Run fan-out: 1/64 used, 63 remaining\nAsync: scout [33b193f7-7519-4395-a09c-e45e8f5ce4fa]\n\nThe async run is detached and running in the background.\nYou are in an interactive session. Return control to the user now; Pi will wake you through the native completion notification when this subagent completes or needs attention. Do not run sleep/polling loops to wait for this async subagent; it does not need a wait call.\nUse bg_wait only for provider, detached, or other background work that lacks a native completion notification.\nIf the current turn must receive results from work without a native notification before it ends, call blocking bg_wait(); ordinary async subagent runs do not need a wait call because their completion is delivered natively.\nOtherwise, continue any independent work or return control to the user. Use subagent({ action: \"status\", id: \"...\" }) for a one-shot status/result or to inspect a blocked/stale run, never as a wait loop.\nMission: 812446a0-b883-48e0-ac3c-f810ffbcb7a9 (active)"
+        }
+      ],
+      "details": {
+        "mode": "single",
+        "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+        "results": [],
+        "asyncId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+        "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+        "launchContractDigest": "1c2799c32119977a96c1e4987cea70fccbe931d8cd1904fd2da8d8689dd0fa08",
+        "launchResolvedExtensions": {
+          "version": 1,
+          "source": "launch-resolved",
+          "disableAmbientExtensions": false,
+          "runtime": ["sha256:c41552bd9557eaab"],
+          "configured": [],
+          "required": [],
+          "effective": ["sha256:c41552bd9557eaab"],
+          "omitted": {
+            "runtime": 0,
+            "configured": 0,
+            "required": 0,
+            "effective": 0
+          }
+        },
+        "context": "fresh",
+        "timeoutMs": 1800000,
+        "deadlineAt": 1790200012953,
+        "runFanoutBudget": {
+          "used": 1,
+          "limit": 64,
+          "remaining": 63
+        },
+        "missionId": "812446a0-b883-48e0-ac3c-f810ffbcb7a9",
+        "missionPath": "/tmp/paseo-pi-extension-phase3/pi-agent/missions/projects/8618955a5c85eb731bdb33d90016edaaf64963be032225b8a26a6936621a378d/812446a0-b883-48e0-ac3c-f810ffbcb7a9.json",
+        "mission": {
+          "schemaVersion": 1,
+          "id": "812446a0-b883-48e0-ac3c-f810ffbcb7a9",
+          "title": "[prompt redacted]",
+          "objective": "[prompt redacted]",
+          "status": "active",
+          "createdAt": "2026-09-23T21:16:52.950Z",
+          "updatedAt": "2026-09-23T21:16:52.962Z",
+          "runs": [
+            {
+              "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+              "mode": "single",
+              "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+              "status": "active",
+              "startedAt": "2026-09-23T21:16:52.962Z"
+            }
+          ],
+          "workflowChildren": [],
+          "decisions": [],
+          "artifacts": [
+            {
+              "kind": "status",
+              "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/status.json"
+            },
+            {
+              "kind": "other",
+              "path": "/tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/events.jsonl",
+              "description": "Lifecycle events"
+            }
+          ],
+          "receipts": [],
+          "cwd": "/tmp/paseo-pi-extension-phase3/workspace",
+          "ownerSessionId": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198.jsonl"
+        }
+      },
+      "isError": false,
+      "timestamp": 1790198212965
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_512773",
+          "name": "bg_wait",
+          "arguments": {
+            "all": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 2622,
+        "output": 32,
+        "cacheRead": 6971,
+        "cacheWrite": 0,
+        "reasoning": 18,
+        "totalTokens": 9625,
+        "cost": {
+          "input": 0.0019665,
+          "output": 0.00012,
+          "cacheRead": 0.000522825,
+          "cacheWrite": 0,
+          "total": 0.002609325
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790198212966,
+      "responseId": "gen-1790198213-Dg2TqjSl8UQiCKWHWbRE",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_512773",
+      "toolName": "bg_wait",
+      "content": [
+        {
+          "type": "text",
+          "text": "Waited 7.8s for 1 async run(s); done. Outcome: 1 complete.\nResult [33b193f7-7519-4395-a09c-e45e8f5ce4fa]: /tmp/pi-subagents-uid-1000/async-subagent-results/output-archives/33b193f7-7519-4395-a09c-e45e8f5ce4fa.json\n Completion/control events have been observed; inspect status if a notification is not visible yet."
+        }
+      ],
+      "details": {
+        "mode": "management",
+        "results": [],
+        "completions": [
+          {
+            "runId": "33b193f7-7519-4395-a09c-e45e8f5ce4fa",
+            "agent": "scout",
+            "mode": "single",
+            "state": "complete",
+            "success": true,
+            "results": [
+              {
+                "agent": "scout",
+                "usage": {
+                  "input": 7435,
+                  "output": 884,
+                  "cacheRead": 0,
+                  "cacheWrite": 0,
+                  "cost": 0.00889125,
+                  "turns": 3
+                },
+                "sessionFile": "/tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198/53dcdf6f-7871-44ae-bf72-7744df7845f2/run-0/session.jsonl",
+                "success": true,
+                "outputState": "present",
+                "model": "openrouter/google/gemini-3.6-flash:low",
+                "artifactPaths": {
+                  "inputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_input.md",
+                  "outputPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_output.md",
+                  "jsonlPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout.jsonl",
+                  "transcriptPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_transcript.jsonl",
+                  "metadataPath": "/tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/33b193f7-7519-4395-a09c-e45e8f5ce4fa_scout_meta.json"
+                }
+              }
+            ],
+            "archivePath": "/tmp/pi-subagents-uid-1000/async-subagent-results/output-archives/33b193f7-7519-4395-a09c-e45e8f5ce4fa.json"
+          }
+        ]
+      },
+      "usage": {
+        "input": 7435,
+        "output": 884,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "totalTokens": 8319,
+        "cost": {
+          "input": 0,
+          "output": 0,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.00889125
+        }
+      },
+      "isError": false,
+      "timestamp": 1790198222122
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notify",
+      "content": "Background task completed: **scout**\n\nscout:\n# Code Context\n\n## Files Retrieved\nNo files found in workspace `/tmp/paseo-pi-extension-phase3/workspace`.\n\n## Key Code\nNone. The directory is empty.\n\n## Architecture\nN/A - Empty workspace.\n\n## Start Here\n`/tmp/paseo-pi-extension-phase3/workspace` - Root workspace directory.\n\nOutput saved to: /tmp/paseo-pi-extension-phase3/sessions-nico/subagent-artifacts/outputs/33b193f7-7519-4395-a09c-e45e8f5ce4fa/context.md (275 B, 13 lines). Read this file if needed.\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/33b193f7-7519-4395-a09c-e45e8f5ce4fa\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-09-23T21-16-49-809Z_01a0d020-dd11-7a6e-a902-107f51c3c198/53dcdf6f-7871-44ae-bf72-7744df7845f2/run-0/session.jsonl",
+      "display": false,
+      "timestamp": 1790198222119
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.test.ts
new file mode 100644
index 0000000000..8e9db54047
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.test.ts
@@ -0,0 +1,276 @@
+import { describe, expect, test } from "vitest";
+import { fileURLToPath } from "node:url";
+import { mkdtemp, writeFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { createPiExtensionHost } from "../index.js";
+import {
+  parseToolArgs,
+  parseToolResult,
+  type PiToolResult,
+  type PiTrackedToolCall,
+} from "../../tool-call-mapper.js";
+import { mapPiChildSession } from "../child-session.js";
+import { readSubagentFixture, verifySubagentFixture } from "../subagent-fixture-test.js";
+import pino from "pino";
+import { PiRpcAgentClient } from "../../agent.js";
+import { FakePi } from "../../test-utils/fake-pi.js";
+import type { AgentStreamEvent } from "../../../../agent-sdk-types.js";
+
+function mapping(toolCall: PiTrackedToolCall, result: PiToolResult) {
+  return createPiExtensionHost().mapToolCall({
+    callId: "test-call",
+    toolName: toolCall.toolName,
+    args: toolCall.args,
+    status: result ? "completed" : "running",
+    result,
+  });
+}
+function mapToolDetail(toolCall: PiTrackedToolCall, result: PiToolResult) {
+  return mapping(toolCall, result)?.detail;
+}
+
+function hasChildTimeline(events: AgentStreamEvent[]) {
+  return events.some(
+    (event) => event.type === "provider_subagent" && event.event.type === "timeline",
+  );
+}
+
+function hasCompletedChild(events: AgentStreamEvent[]) {
+  return events.some(
+    (event) =>
+      event.type === "provider_subagent" &&
+      event.event.type === "upsert" &&
+      event.event.status === "completed",
+  );
+}
+
+describe("pi-subagents adapter", () => {
+  test("follows async status and transcript without bg_wait", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-async-"));
+    const file = join(dir, "child.jsonl");
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.follow((event) => received.push(event));
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: { mode: "single", runId: "run-1", asyncId: "run-1", asyncDir: dir, results: [] },
+        },
+      });
+      await writeFile(
+        file,
+        '{"type":"message","message":{"role":"assistant","content":[{"type":"text","text":"BEGIN"}]}}\n',
+      );
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [{ agent: "scout", status: "running", sessionFile: file }],
+        }),
+      );
+      await expect.poll(() => hasChildTimeline(received)).toBe(true);
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "complete",
+          steps: [{ agent: "scout", status: "complete", sessionFile: file }],
+        }),
+      );
+      await expect.poll(() => hasCompletedChild(received)).toBe(true);
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+  test("settles an async run and reads its transcript from the completion notice on replay", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-async-"));
+    const file = join(dir, "child.jsonl");
+    try {
+      await writeFile(
+        file,
+        '{"type":"message","message":{"role":"assistant","content":[{"type":"text","text":"DONE"}]}}\n',
+      );
+      const host = createPiExtensionHost();
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: { mode: "single", runId: "run-1", asyncId: "run-1", asyncDir: dir, results: [] },
+        },
+      });
+      const notice = host.mapCustomMessage({
+        role: "custom",
+        customType: "subagent-notify",
+        content: [
+          "Background task completed: **scout**",
+          "",
+          "Session file: /tmp/not-the-session-line.jsonl",
+          "",
+          `Retention-managed async directory: ${dir}`,
+          "",
+          `Session file: ${file}`,
+        ].join("\n"),
+      });
+      expect(notice?.subagents).toEqual([{ type: "upsert", id: "call-1", status: "completed" }]);
+      expect(hasChildTimeline(await notice!.hydration)).toBe(true);
+    } finally {
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+  test("maps completed subagent calls with task input to sub-agent detail", () => {
+    const toolCall = parseToolArgs("subagent", {
+      agent: "reviewer",
+      task: "Review the Pi mapper change",
+    });
+    const result = parseToolResult({
+      content: [{ type: "text", text: "The mapper change preserves provider status." }],
+    });
+
+    expect(mapToolDetail(toolCall, result)).toEqual({
+      type: "sub_agent",
+      subAgentType: "reviewer",
+      description: "Review the Pi mapper change",
+      log: "The mapper change preserves provider status.",
+    });
+  });
+
+  test("maps the captured foreground run and child Pi timeline live and on replay", async () => {
+    const raw = readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url));
+    const result = raw.events.find(
+      (event) =>
+        event.type === "tool_execution_end" &&
+        event.toolName === "subagent" &&
+        event.result &&
+        typeof event.result === "object" &&
+        "details" in event.result &&
+        Array.isArray(event.result.details?.results) &&
+        event.result.details.results.length > 0,
+    );
+    if (!result || result.type !== "tool_execution_end")
+      throw new Error("Missing captured child session");
+    const original = (result.result as { details: { results: Array<{ sessionFile: string }> } })
+      .details.results[0].sessionFile;
+    const fixture = readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url), {
+      from: original,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    const events = await verifySubagentFixture(fixture);
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toContain("completed");
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
+
+  test("settles captured async runs from the completion notice live and on replay", async () => {
+    const fixture = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url));
+    const events = await verifySubagentFixture(fixture);
+    expect(events.findLast((event) => event.event.type === "upsert")?.event).toEqual(
+      expect.objectContaining({ status: "completed" }),
+    );
+  });
+
+  test("maps bg_wait completion to the original async child", async () => {
+    const raw = readSubagentFixture(new URL("./fixtures/wait.json", import.meta.url));
+    const wait = raw.events.find(
+      (event) => event.type === "tool_execution_end" && event.toolName === "bg_wait",
+    );
+    if (!wait || wait.type !== "tool_execution_end")
+      throw new Error("Missing captured bg_wait result");
+    const original = (
+      wait.result as {
+        details: { completions: Array<{ results: Array<{ sessionFile: string }> }> };
+      }
+    ).details.completions[0].results[0].sessionFile;
+    const fixture = readSubagentFixture(new URL("./fixtures/wait.json", import.meta.url), {
+      from: original,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    const events = await verifySubagentFixture(fixture);
+    const upserts = events
+      .filter((event) => event.event.type === "upsert")
+      .map((event) => (event.event.type === "upsert" ? event.event : null));
+    // bg_wait settles the child; the later completion notice repeats it.
+    expect(upserts.map((event) => event?.status)).toEqual([
+      "running",
+      "running",
+      "completed",
+      "completed",
+    ]);
+    expect(new Set(upserts.map((event) => event?.id)).size).toBe(1);
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
+
+  test("missing child file produces no timeline", async () => {
+    expect(await mapPiChildSession("child", "/does-not-exist/pi-child.jsonl")).toEqual([]);
+  });
+
+  test("does not emit child timeline after session close", async () => {
+    const raw = readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url));
+    const completion = raw.events.find(
+      (event) => event.type === "tool_execution_end" && event.toolName === "subagent",
+    );
+    if (!completion || completion.type !== "tool_execution_end") throw new Error("No completion");
+    const original = (completion.result as { details: { results: Array<{ sessionFile: string }> } })
+      .details.results[0].sessionFile;
+    const fixture = readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url), {
+      from: original,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    const pi = new FakePi();
+    const client = new PiRpcAgentClient({ logger: pino({ level: "silent" }), runtime: pi });
+    const session = await client.createSession({
+      provider: "pi",
+      cwd: "/tmp/paseo-pi-child-close",
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    await session.startTurn("Delegate work");
+    for (const event of fixture.events) pi.latestSession().emit(event);
+    await session.close();
+    expect(
+      events.some((event) => event.type === "provider_subagent" && event.event.type === "upsert"),
+    ).toBe(true);
+    expect(
+      events.some((event) => event.type === "provider_subagent" && event.event.type === "timeline"),
+    ).toBe(false);
+  });
+
+  test("a failed spawn without result rows finishes its descriptor", () => {
+    const host = createPiExtensionHost();
+    const args = { agent: "scout", task: "Inspect" };
+    host.mapToolCall({
+      callId: "failed",
+      toolName: "subagent",
+      args,
+      status: "running",
+      result: null,
+    });
+    expect(
+      host.mapToolCall({
+        callId: "failed",
+        toolName: "subagent",
+        args,
+        status: "failed",
+        result: { content: [{ type: "text", text: "spawn failed" }] },
+      })?.subagents,
+    ).toEqual([
+      {
+        type: "upsert",
+        id: "failed",
+        title: "scout",
+        description: "Inspect",
+        toolCallId: "failed",
+        status: "failed",
+      },
+    ]);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.ts b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.ts
new file mode 100644
index 0000000000..64e814af3f
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/pi-subagents/index.ts
@@ -0,0 +1,247 @@
+import { z } from "zod";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { extractTextFromToolResult } from "../../tool-call-mapper.js";
+import type { PiExtension, PiExtensionToolCall, PiExtensionToolMapping } from "../contract.js";
+
+const Args = z
+  .object({
+    agent: z.string().trim().min(1).optional(),
+    task: z.string().trim().min(1).optional(),
+    async: z.boolean().optional(),
+    action: z.unknown().optional(),
+  })
+  .passthrough();
+const Row = z
+  .object({
+    index: z.number().int().nonnegative().optional(),
+    agent: z.string().trim().min(1),
+    exitCode: z.number().optional(),
+    success: z.boolean().optional(),
+    sessionFile: z.string().trim().min(1).optional(),
+  })
+  .passthrough();
+const Completion = z
+  .object({ runId: z.string().trim().min(1), results: z.array(Row) })
+  .passthrough();
+const Details = z
+  .object({
+    mode: z.string(),
+    runId: z.string().optional(),
+    asyncId: z.string().optional(),
+    asyncDir: z.string().trim().min(1).optional(),
+    results: z.array(Row),
+    completions: z.array(Completion).optional(),
+  })
+  .passthrough();
+const AsyncStatus = z
+  .object({
+    state: z.string(),
+    steps: z.array(
+      z
+        .object({
+          agent: z.string().trim().min(1),
+          status: z.string().optional(),
+          sessionFile: z.string().trim().min(1).optional(),
+        })
+        .passthrough(),
+    ),
+  })
+  .passthrough();
+
+function asyncChildStatus(runState: string, stepStatus?: string) {
+  if (!["complete", "failed", "stopped"].includes(runState)) return "running";
+  if (runState === "stopped" || stepStatus === "stopped") return "canceled";
+  if (runState === "failed" || stepStatus === "failed" || stepStatus === "error") return "failed";
+  return "completed";
+}
+
+/** The `subagent-notify` header; a grouped notice reports every run as completed. */
+function noticeStatus(header: string) {
+  if (/^Background tasks completed \(\d+\):/.test(header)) return "completed";
+  const outcome = header.match(
+    /^(?:Background task|Detached foreground task) (completed|failed|stopped): \*\*/,
+  )?.[1];
+  if (outcome === "stopped") return "canceled";
+  return outcome as "completed" | "failed" | undefined;
+}
+
+export const piSubagents: PiExtension = {
+  id: "pi-subagents",
+  createSession: () => {
+    const callsByRun = new Map<string, string>();
+    const readSessions = new Set<string>();
+    /** Keyed by async directory, which both status.json and the completion notice carry. */
+    const asyncRuns = new Map<string, { owner: string; polling: boolean }>();
+    const rememberAsyncRun = (details: z.infer<typeof Details>, call: PiExtensionToolCall) => {
+      if (details.asyncDir && call.status !== "failed") {
+        asyncRuns.set(details.asyncDir, { owner: call.callId, polling: true });
+      }
+    };
+    const collectRows = (
+      owner: string,
+      rows: z.infer<typeof Row>[],
+      description?: string,
+      failed = false,
+    ) => {
+      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+      const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+      for (const [index, row] of rows.entries()) {
+        const id = rows.length === 1 ? owner : `${owner}:${row.index ?? index}`;
+        subagents.push({
+          type: "upsert",
+          id,
+          title: row.agent,
+          description,
+          toolCallId: owner,
+          status:
+            failed || row.success === false || (row.success !== true && row.exitCode !== 0)
+              ? "failed"
+              : "completed",
+        });
+        if (row.sessionFile && !readSessions.has(row.sessionFile)) {
+          readSessions.add(row.sessionFile);
+          childSessions.push({ id, file: row.sessionFile });
+        }
+      }
+      return { subagents, childSessions };
+    };
+    const mapWait = (call: PiExtensionToolCall) => {
+      if (call.status === "running") return undefined;
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      if (!details.success || !details.data.completions) return undefined;
+      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+      const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+      for (const completion of details.data.completions) {
+        const owner = callsByRun.get(completion.runId);
+        if (!owner) continue;
+        const mapped = collectRows(owner, completion.results);
+        subagents.push(...mapped.subagents);
+        childSessions.push(...mapped.childSessions);
+      }
+      return subagents.length ? { subagents, childSessions } : undefined;
+    };
+    const mapSpawn = (call: PiExtensionToolCall) => {
+      const args = Args.safeParse(call.args);
+      if (!args.success || args.data.action !== undefined || !args.data.agent || !args.data.task)
+        return undefined;
+      const detail = {
+        type: "sub_agent" as const,
+        subAgentType: args.data.agent,
+        description: args.data.task,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      const base = {
+        type: "upsert" as const,
+        id: call.callId,
+        title: args.data.agent,
+        description: args.data.task,
+        toolCallId: call.callId,
+      };
+      if (call.status === "running")
+        return { detail, subagents: [{ ...base, status: "running" as const }] };
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      if (!details.success || details.data.mode === "management")
+        return call.status === "failed"
+          ? { detail, subagents: [{ ...base, status: "failed" as const }] }
+          : { detail };
+      if (details.data.runId) callsByRun.set(details.data.runId, call.callId);
+      if (details.data.results.length === 0 && (details.data.asyncId || args.data.async)) {
+        rememberAsyncRun(details.data, call);
+        return {
+          detail,
+          subagents: [
+            {
+              ...base,
+              status: call.status === "failed" ? ("failed" as const) : ("running" as const),
+            },
+          ],
+        };
+      }
+      if (details.data.results.length === 0 && call.status === "failed")
+        return { detail, subagents: [{ ...base, status: "failed" as const }] };
+      return {
+        detail,
+        ...collectRows(call.callId, details.data.results, args.data.task, call.status === "failed"),
+      };
+    };
+    return {
+      mapToolCall(call) {
+        if (call.toolName === "bg_wait") return mapWait(call);
+        if (call.toolName === "subagent") return mapSpawn(call);
+        return undefined;
+      },
+      // The notice is the only completion Pi persists, so replay settles async runs from it.
+      mapCustomMessage(message) {
+        if (message.customType !== "subagent-notify") return undefined;
+        const text =
+          typeof message.content === "string"
+            ? message.content
+            : extractTextFromToolResult({ content: message.content });
+        const lines = text?.split("\n") ?? [];
+        const status = noticeStatus(lines[0] ?? "");
+        if (!status) return undefined;
+        const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+        const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+        // Each run's session line follows its async directory line; earlier lines are child output.
+        let owner: string | undefined;
+        for (const line of lines) {
+          const dir = line.match(/^Retention-managed async directory: (.+)$/)?.[1];
+          if (dir) {
+            owner = asyncRuns.get(dir)?.owner;
+            if (owner) subagents.push({ type: "upsert", id: owner, status });
+            continue;
+          }
+          const file = owner ? line.match(/^Session file: (.+)$/)?.[1] : undefined;
+          if (!owner || !file) continue;
+          if (!readSessions.has(file)) {
+            readSessions.add(file);
+            childSessions.push({ id: owner, file });
+          }
+          owner = undefined;
+        }
+        return subagents.length ? { subagents, childSessions } : undefined;
+      },
+      poll() {
+        const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+        const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+        for (const [dir, run] of asyncRuns) {
+          if (!run.polling) continue;
+          let raw: unknown;
+          try {
+            raw = JSON.parse(readFileSync(join(dir, "status.json"), "utf8"));
+          } catch {
+            continue;
+          }
+          const parsed = AsyncStatus.safeParse(raw);
+          if (!parsed.success) continue;
+          const terminal = ["complete", "failed", "stopped"].includes(parsed.data.state);
+          for (const [index, step] of parsed.data.steps.entries()) {
+            const id = parsed.data.steps.length === 1 ? run.owner : `${run.owner}:${index}`;
+            const status = asyncChildStatus(parsed.data.state, step.status);
+            subagents.push({ type: "upsert", id, title: step.agent, status });
+            if (step.sessionFile && !readSessions.has(step.sessionFile)) {
+              readSessions.add(step.sessionFile);
+              childSessions.push({ id, file: step.sessionFile });
+            }
+          }
+          if (terminal) {
+            if (parsed.data.steps.length === 0) {
+              subagents.push({
+                type: "upsert",
+                id: run.owner,
+                status: parsed.data.state === "complete" ? "completed" : "failed",
+              });
+            }
+            run.polling = false;
+          }
+        }
+        return subagents.length || childSessions.length ? { subagents, childSessions } : undefined;
+      },
+    };
+  },
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/registry.ts b/packages/server/src/server/agent/providers/pi/extensions/registry.ts
new file mode 100644
index 0000000000..c66fabad80
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/registry.ts
@@ -0,0 +1,21 @@
+import { piAskUser } from "./pi-ask-user/index.js";
+import { piSubagents } from "./pi-subagents/index.js";
+import { piMcpAdapter } from "./pi-mcp-adapter/index.js";
+import { rpivTodo } from "./rpiv-todo/index.js";
+import { piExampleTodo } from "./pi-example-todo/index.js";
+import { piGoalX } from "./pi-goal-x/index.js";
+import { tintinwebPiSubagents } from "./tintinweb-pi-subagents/index.js";
+import { gotgenesPiSubagents } from "./gotgenes-pi-subagents/index.js";
+import { rpivAskUserQuestion } from "./rpiv-ask-user-question/index.js";
+
+export const piExtensions = [
+  piAskUser, // Dialog correlation
+  piSubagents, // Delegation calls
+  tintinwebPiSubagents,
+  gotgenesPiSubagents,
+  piMcpAdapter, // MCP proxy names
+  rpivTodo,
+  piExampleTodo,
+  piGoalX,
+  rpivAskUserQuestion,
+];
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/cancel-result.json b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/cancel-result.json
new file mode 100644
index 0000000000..801757b33f
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/cancel-result.json
@@ -0,0 +1,23 @@
+{
+  "provenance": {
+    "package": "@juicesharp/rpiv-ask-user-question",
+    "version": "2.11.0",
+    "sourceCommit": "61904e69e1a50e12585bdf15f0310e633a62ba36",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23",
+    "model": "openrouter/google/gemini-3.6-flash",
+    "source": "isolated Paseo web QA Pi session JSONL"
+  },
+  "result": {
+    "content": [
+      {
+        "type": "text",
+        "text": "User declined to answer questions"
+      }
+    ],
+    "details": {
+      "answers": [],
+      "cancelled": true
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/rpc-session.json b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/rpc-session.json
new file mode 100644
index 0000000000..eea1cde847
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/fixtures/rpc-session.json
@@ -0,0 +1,134 @@
+{
+  "provenance": {
+    "package": "@juicesharp/rpiv-ask-user-question",
+    "version": "2.11.0",
+    "sourceCommit": "61904e69e1a50e12585bdf15f0310e633a62ba36",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23",
+    "model": "openrouter/google/gemini-3.6-flash"
+  },
+  "frames": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_1400136",
+      "toolName": "ask_user_question",
+      "args": {
+        "questions": [
+          {
+            "options": [
+              {
+                "label": "Apple",
+                "description": "Fresh fruit"
+              },
+              {
+                "description": "Sweet treat",
+                "label": "Cookie"
+              }
+            ],
+            "question": "Which snack?",
+            "header": "Snack"
+          },
+          {
+            "multiSelect": true,
+            "question": "Which colors?",
+            "options": [
+              {
+                "description": "Warm",
+                "label": "Red"
+              },
+              {
+                "description": "Cool",
+                "label": "Blue"
+              }
+            ],
+            "header": "Colors"
+          },
+          {
+            "header": "Project",
+            "options": [
+              {
+                "description": "Map theme",
+                "label": "Atlas"
+              },
+              {
+                "description": "Light theme",
+                "label": "Beacon"
+              }
+            ],
+            "question": "What project name?"
+          }
+        ]
+      }
+    },
+    {
+      "type": "extension_ui_request",
+      "id": "8b00ad15-da50-42d8-ab9c-6cbc1a4d31a5",
+      "method": "select",
+      "title": "[Snack] Which snack?",
+      "options": [
+        "1. Apple \u2014 Fresh fruit",
+        "2. Cookie \u2014 Sweet treat",
+        "3. Type something."
+      ]
+    },
+    {
+      "type": "extension_ui_request",
+      "id": "ade366ea-0cfd-4e9d-9fd0-0690736947c8",
+      "method": "input",
+      "title": "[Colors] Which colors?\n\n1. Red \u2014 Warm\n2. Blue \u2014 Cool\n\nEnter the numbers of all that apply, comma-separated (e.g. \"1,3\"), or type a custom answer as plain text.",
+      "placeholder": "1,3"
+    },
+    {
+      "type": "extension_ui_request",
+      "id": "be2fd390-c4e3-4dcb-b14e-3aaf0a64ca70",
+      "method": "select",
+      "title": "[Project] What project name?",
+      "options": ["1. Atlas \u2014 Map theme", "2. Beacon \u2014 Light theme", "3. Type something."]
+    },
+    {
+      "type": "extension_ui_request",
+      "id": "8b34e9ca-75d4-4cc2-8439-0bb9836ad128",
+      "method": "input",
+      "title": "[Project] What project name?\n\nType your answer:",
+      "placeholder": ""
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_1400136",
+      "toolName": "ask_user_question",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "User has answered your questions: \"Which snack?\"=\"Cookie\". \"Which colors?\"=\"Red, Blue\". \"What project name?\"=\"Nebula\". You can now continue with the user's answers in mind."
+          }
+        ],
+        "details": {
+          "answers": [
+            {
+              "questionIndex": 0,
+              "question": "Which snack?",
+              "kind": "option",
+              "answer": "Cookie"
+            },
+            {
+              "questionIndex": 1,
+              "question": "Which colors?",
+              "kind": "multi",
+              "answer": null,
+              "selected": ["Red", "Blue"]
+            },
+            {
+              "questionIndex": 2,
+              "question": "What project name?",
+              "kind": "custom",
+              "answer": "Nebula"
+            }
+          ],
+          "cancelled": false
+        }
+      },
+      "isError": false
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.test.ts
new file mode 100644
index 0000000000..3ec9256a29
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.test.ts
@@ -0,0 +1,171 @@
+import { readFileSync } from "node:fs";
+import { expect, test } from "vitest";
+import pino from "pino";
+import { PiRpcAgentClient } from "../../agent.js";
+import { PiHistoryMapper } from "../../history-mapper.js";
+import { parseToolResult } from "../../tool-call-mapper.js";
+import { FakePi } from "../../test-utils/fake-pi.js";
+import { createPiExtensionHost } from "../index.js";
+import { rpivAskUserQuestion } from "./index.js";
+
+const fixture = JSON.parse(
+  readFileSync(new URL("./fixtures/rpc-session.json", import.meta.url), "utf8"),
+);
+const [start, ...rest] = fixture.frames;
+const dialogs = rest.filter((frame: { type: string }) => frame.type === "extension_ui_request");
+const end = rest.find((frame: { type: string }) => frame.type === "tool_execution_end");
+
+function startedHost() {
+  const host = createPiExtensionHost();
+  const permission = host.onToolStart({
+    callId: start.toolCallId,
+    toolName: start.toolName,
+    args: start.args,
+    status: "running",
+    result: null,
+  });
+  if (!permission) throw new Error("Question permission missing");
+  return { host, permission };
+}
+
+test("real rpiv RPC dialogs use one form and preserve choices, multi-select, and custom text", () => {
+  const { host, permission } = startedHost();
+  expect(permission).toMatchObject({
+    kind: "question",
+    input: {
+      questions: [
+        {
+          header: "Snack",
+          options: [{ description: "Fresh fruit" }, { description: "Sweet treat" }],
+          allowOther: true,
+          multiSelect: false,
+        },
+        { header: "Colors", multiSelect: true },
+        { header: "Project", allowOther: true },
+      ],
+    },
+  });
+  expect(host.mapDialog(dialogs[0], "pi")).toEqual({ type: "deferred" });
+  expect(
+    host.respondToPermission(permission, {
+      behavior: "allow",
+      updatedInput: {
+        answers: { Snack: "Cookie", Colors: "Red, Blue", Project: "Nebula" },
+      },
+    }),
+  ).toEqual({ responses: [{ id: dialogs[0].id, response: { value: dialogs[0].options[1] } }] });
+  expect(host.mapDialog(dialogs[1], "pi")).toEqual({
+    type: "response",
+    response: { value: "1,2" },
+  });
+  expect(host.mapDialog(dialogs[2], "pi")).toEqual({
+    type: "response",
+    response: { value: dialogs[2].options[2] },
+  });
+  expect(host.mapDialog(dialogs[3], "pi")).toEqual({
+    type: "response",
+    response: { value: "Nebula" },
+  });
+});
+
+test("cancellation declines each remaining real RPC dialog", () => {
+  const { host, permission } = startedHost();
+  expect(host.respondToPermission(permission, { behavior: "deny" })).toEqual({ responses: [] });
+  for (const dialog of dialogs) {
+    expect(host.mapDialog(dialog, "pi")).toEqual({
+      type: "response",
+      response: { cancelled: true },
+    });
+  }
+});
+
+test("captured result renders in live and history tool rows, while foreign shapes decline", () => {
+  const call = {
+    callId: end.toolCallId,
+    toolName: end.toolName,
+    args: start.args,
+    status: "completed" as const,
+    result: parseToolResult(end.result),
+  };
+  const live = createPiExtensionHost().mapToolCall(call);
+  expect(live?.detail).toEqual({
+    type: "plain_text",
+    label: "Questions",
+    text: "Which snack?: Cookie\nWhich colors?: Red, Blue\nWhat project name?: Nebula",
+  });
+  const history = new PiHistoryMapper("pi").mapMessages([
+    {
+      role: "assistant",
+      content: [
+        { type: "toolCall", id: start.toolCallId, name: start.toolName, arguments: start.args },
+      ],
+    },
+    {
+      role: "toolResult",
+      toolCallId: end.toolCallId,
+      toolName: end.toolName,
+      content: end.result.content,
+      details: end.result.details,
+    },
+  ]);
+  expect(history).toContainEqual(
+    expect.objectContaining({
+      type: "timeline",
+      item: expect.objectContaining({
+        type: "tool_call",
+        status: "completed",
+        detail: live?.detail,
+      }),
+    }),
+  );
+  expect(
+    rpivAskUserQuestion.createSession().mapToolCall?.({
+      ...call,
+      result: parseToolResult({ content: [], details: { unrelated: true } }),
+    }),
+  ).toBeUndefined();
+});
+
+test("captured cancellation renders as cancelled in the tool row", () => {
+  const cancelled = JSON.parse(
+    readFileSync(new URL("./fixtures/cancel-result.json", import.meta.url), "utf8"),
+  );
+  const mapped = createPiExtensionHost().mapToolCall({
+    callId: "cancelled",
+    toolName: "ask_user_question",
+    args: start.args,
+    status: "completed",
+    result: parseToolResult(cancelled.result),
+  });
+  expect(mapped?.detail).toEqual({ type: "plain_text", label: "Questions", text: "Cancelled" });
+});
+
+test("the Pi agent releases a deferred captured dialog when the form is answered", async () => {
+  const pi = new FakePi();
+  const client = new PiRpcAgentClient({ logger: pino({ level: "silent" }), runtime: pi });
+  const session = await client.createSession({
+    provider: "pi",
+    cwd: "/tmp/paseo-pi-question-test",
+  });
+  const runtime = pi.latestSession();
+  runtime.emit(start);
+  const [permission] = session.getPendingPermissions();
+  expect(permission.input?.questions).toHaveLength(3);
+  runtime.emit(dialogs[0]);
+  expect(runtime.extensionUiResponses).toEqual([]);
+  await session.respondToPermission(permission.id, {
+    behavior: "allow",
+    updatedInput: {
+      answers: { Snack: "Cookie", Colors: "Red, Blue", Project: "Nebula" },
+    },
+  });
+  for (const dialog of dialogs.slice(1)) runtime.emit(dialog);
+  expect(runtime.extensionUiResponses).toEqual([
+    { id: dialogs[0].id, response: { value: dialogs[0].options[1] } },
+    { id: dialogs[1].id, response: { value: "1,2" } },
+    { id: dialogs[2].id, response: { value: dialogs[2].options[2] } },
+    { id: dialogs[3].id, response: { value: "Nebula" } },
+  ]);
+  expect(session.getPendingPermissions()).toEqual([]);
+  await session.close();
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.ts b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.ts
new file mode 100644
index 0000000000..07906cc955
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-ask-user-question/index.ts
@@ -0,0 +1,212 @@
+import { z } from "zod";
+import type { AgentPermissionRequest } from "../../../../agent-sdk-types.js";
+import type { PiExtension, PiExtensionDialog, PiExtensionUiResponse } from "../contract.js";
+
+const Params = z
+  .object({
+    questions: z
+      .array(
+        z.object({
+          question: z.string(),
+          header: z.string(),
+          options: z
+            .array(
+              z.object({
+                label: z.string(),
+                description: z.string(),
+                preview: z.string().optional(),
+              }),
+            )
+            .min(2)
+            .max(4),
+          multiSelect: z.boolean().optional(),
+        }),
+      )
+      .min(1)
+      .max(4),
+  })
+  .refine(({ questions }) => {
+    const texts = questions.map((question) => question.question);
+    return (
+      new Set(texts).size === texts.length &&
+      questions.every((question) => {
+        const labels = question.options.map((option) => option.label);
+        return (
+          new Set(labels).size === labels.length &&
+          labels.every(
+            (label) => label !== "Other" && label !== "Type something." && label !== "Next",
+          )
+        );
+      })
+    );
+  });
+const Result = z.object({
+  answers: z.array(
+    z.object({
+      question: z.string(),
+      kind: z.enum(["option", "custom", "multi"]),
+      answer: z.string().nullable(),
+      selected: z.array(z.string()).optional(),
+    }),
+  ),
+  cancelled: z.boolean(),
+  error: z.string().optional(),
+});
+type Question = z.infer<typeof Params>["questions"][number];
+const PERMISSION_PREFIX = "rpiv-question:";
+
+function answerFor(answers: Record<string, unknown>, question: Question): string | null {
+  const answer = answers[question.header];
+  return typeof answer === "string" ? answer : null;
+}
+
+function replyToDialog(
+  dialog: PiExtensionDialog,
+  question: Question,
+  answer: string,
+  customInput: boolean,
+): { response: PiExtensionUiResponse; customInput: boolean } {
+  const options = z.array(z.string()).safeParse(dialog.options).data;
+  if (customInput) return { response: { value: answer }, customInput: false };
+  if (question.multiSelect) {
+    const labels = answer.split(", ");
+    const indices = labels.map((label) =>
+      question.options.findIndex((option) => option.label === label),
+    );
+    if (indices.every((index) => index >= 0)) {
+      return {
+        response: { value: indices.map((index) => index + 1).join(",") },
+        customInput: false,
+      };
+    }
+    return { response: { value: answer }, customInput: false };
+  }
+  const index = question.options.findIndex((option) => option.label === answer);
+  if (index >= 0) {
+    return {
+      response: {
+        value:
+          options?.[index] ?? `${index + 1}. ${answer} — ${question.options[index].description}`,
+      },
+      customInput: false,
+    };
+  }
+  return {
+    response: {
+      value:
+        options?.[question.options.length] ?? `${question.options.length + 1}. Type something.`,
+    },
+    customInput: true,
+  };
+}
+
+export const rpivAskUserQuestion: PiExtension = {
+  id: "rpiv-ask-user-question",
+  createSession() {
+    let active: {
+      callId: string;
+      questions: Question[];
+      answers: Record<string, unknown> | null;
+      cancelled: boolean;
+      index: number;
+      customInput: boolean;
+      deferred: PiExtensionDialog | null;
+    } | null = null;
+
+    function answerDialog(dialog: PiExtensionDialog): PiExtensionUiResponse {
+      if (!active || active.cancelled) return { cancelled: true };
+      const question = active.questions[active.index];
+      if (!question || !active.answers) return { cancelled: true };
+      const answer = answerFor(active.answers, question);
+      if (answer === null) return { cancelled: true };
+      const mapped = replyToDialog(dialog, question, answer, active.customInput);
+      active.customInput = mapped.customInput;
+      if (!active.customInput) active.index++;
+      return mapped.response;
+    }
+
+    return {
+      onToolStart(call, provider): AgentPermissionRequest | undefined {
+        if (call.toolName !== "ask_user_question") return undefined;
+        const parsed = Params.safeParse(call.args);
+        if (!parsed.success) return undefined;
+        active = {
+          callId: call.callId,
+          questions: parsed.data.questions,
+          answers: null,
+          cancelled: false,
+          index: 0,
+          customInput: false,
+          deferred: null,
+        };
+        return {
+          id: `${PERMISSION_PREFIX}${call.callId}`,
+          provider,
+          name: "Pi ask_user_question",
+          kind: "question",
+          title: parsed.data.questions[0].question,
+          input: {
+            questions: parsed.data.questions.map((question) => ({
+              question: question.question,
+              header: question.header,
+              options: question.options,
+              multiSelect: question.multiSelect ?? false,
+              allowOther: true,
+            })),
+          },
+        };
+      },
+      onToolEnd(call) {
+        if (active?.callId === call.callId) active = null;
+      },
+      mapDialog(dialog) {
+        if (!active || (dialog.method !== "select" && dialog.method !== "input")) return undefined;
+        if (!active.answers && !active.cancelled) {
+          active.deferred = dialog;
+          return { type: "deferred" };
+        }
+        return { type: "response", response: answerDialog(dialog) };
+      },
+      respondToPermission(request, response) {
+        if (!active || request.id !== `${PERMISSION_PREFIX}${active.callId}`) return undefined;
+        const answers = response.behavior === "allow" ? response.updatedInput?.answers : undefined;
+        active.answers =
+          answers && typeof answers === "object" && !Array.isArray(answers)
+            ? (answers as Record<string, unknown>)
+            : null;
+        active.cancelled = response.behavior === "deny" || !active.answers;
+        const deferred = active.deferred;
+        active.deferred = null;
+        return {
+          responses: deferred ? [{ id: deferred.id, response: answerDialog(deferred) }] : [],
+        };
+      },
+      mapToolCall(call) {
+        if (
+          call.toolName !== "ask_user_question" ||
+          !call.result ||
+          typeof call.result === "string"
+        )
+          return undefined;
+        const result = Result.safeParse(call.result.details);
+        if (!result.success) return undefined;
+        return {
+          detail: {
+            type: "plain_text",
+            label: "Questions",
+            text:
+              result.data.error ??
+              (result.data.cancelled
+                ? "Cancelled"
+                : result.data.answers
+                    .map(
+                      (answer) =>
+                        `${answer.question}: ${answer.kind === "multi" ? (answer.selected ?? []).join(", ") : (answer.answer ?? "")}`,
+                    )
+                    .join("\n")),
+          },
+        };
+      },
+    };
+  },
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/fixtures/rpc-session.json b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/fixtures/rpc-session.json
new file mode 100644
index 0000000000..41dbd8b755
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/fixtures/rpc-session.json
@@ -0,0 +1,380 @@
+{
+  "provenance": {
+    "package": "@juicesharp/rpiv-todo",
+    "version": "2.11.0",
+    "sourceCommit": "d74b1c99830a565f3df3f37e0a36616d17ffc574",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23",
+    "mode": "pi --mode rpc; OpenRouter google/gemini-3.6-flash"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_406425",
+      "toolName": "todo",
+      "args": {
+        "action": "create",
+        "subject": "Inspect workspace"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_406425",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Created #1: Inspect workspace (pending)"
+          }
+        ],
+        "details": {
+          "action": "create",
+          "params": {
+            "action": "create",
+            "subject": "Inspect workspace"
+          },
+          "tasks": [
+            {
+              "id": 1,
+              "subject": "Inspect workspace",
+              "status": "pending"
+            }
+          ],
+          "nextId": 2
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_1389683",
+      "toolName": "todo",
+      "args": {
+        "subject": "Summarize findings",
+        "action": "create"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_1389683",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Created #2: Summarize findings (pending)"
+          }
+        ],
+        "details": {
+          "action": "create",
+          "params": {
+            "subject": "Summarize findings",
+            "action": "create"
+          },
+          "tasks": [
+            {
+              "id": 1,
+              "subject": "Inspect workspace",
+              "status": "pending"
+            },
+            {
+              "id": 2,
+              "subject": "Summarize findings",
+              "status": "pending"
+            }
+          ],
+          "nextId": 3
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_1228319",
+      "toolName": "todo",
+      "args": {
+        "status": "in_progress",
+        "activeForm": "inspecting workspace",
+        "action": "update",
+        "id": 1
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_1228319",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Updated #1 (pending → in_progress)"
+          }
+        ],
+        "details": {
+          "action": "update",
+          "params": {
+            "status": "in_progress",
+            "activeForm": "inspecting workspace",
+            "action": "update",
+            "id": 1
+          },
+          "tasks": [
+            {
+              "id": 1,
+              "subject": "Inspect workspace",
+              "status": "in_progress",
+              "activeForm": "inspecting workspace"
+            },
+            {
+              "id": 2,
+              "subject": "Summarize findings",
+              "status": "pending"
+            }
+          ],
+          "nextId": 3
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_1444595",
+      "toolName": "todo",
+      "args": {
+        "action": "update",
+        "status": "completed",
+        "id": 1
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_1444595",
+      "toolName": "todo",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Updated #1 (in_progress → completed)"
+          }
+        ],
+        "details": {
+          "action": "update",
+          "params": {
+            "action": "update",
+            "status": "completed",
+            "id": 1
+          },
+          "tasks": [
+            {
+              "id": 1,
+              "subject": "Inspect workspace",
+              "status": "completed",
+              "activeForm": "inspecting workspace"
+            },
+            {
+              "id": 2,
+              "subject": "Summarize findings",
+              "status": "pending"
+            }
+          ],
+          "nextId": 3
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_406425",
+          "name": "todo",
+          "arguments": {
+            "action": "create",
+            "subject": "Inspect workspace"
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_406425",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Created #1: Inspect workspace (pending)"
+        }
+      ],
+      "details": {
+        "action": "create",
+        "params": {
+          "action": "create",
+          "subject": "Inspect workspace"
+        },
+        "tasks": [
+          {
+            "id": 1,
+            "subject": "Inspect workspace",
+            "status": "pending"
+          }
+        ],
+        "nextId": 2
+      },
+      "isError": false,
+      "timestamp": 1790195575419
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_1389683",
+          "name": "todo",
+          "arguments": {
+            "subject": "Summarize findings",
+            "action": "create"
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_1389683",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Created #2: Summarize findings (pending)"
+        }
+      ],
+      "details": {
+        "action": "create",
+        "params": {
+          "subject": "Summarize findings",
+          "action": "create"
+        },
+        "tasks": [
+          {
+            "id": 1,
+            "subject": "Inspect workspace",
+            "status": "pending"
+          },
+          {
+            "id": 2,
+            "subject": "Summarize findings",
+            "status": "pending"
+          }
+        ],
+        "nextId": 3
+      },
+      "isError": false,
+      "timestamp": 1790195576353
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_1228319",
+          "name": "todo",
+          "arguments": {
+            "status": "in_progress",
+            "activeForm": "inspecting workspace",
+            "action": "update",
+            "id": 1
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_1228319",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Updated #1 (pending → in_progress)"
+        }
+      ],
+      "details": {
+        "action": "update",
+        "params": {
+          "status": "in_progress",
+          "activeForm": "inspecting workspace",
+          "action": "update",
+          "id": 1
+        },
+        "tasks": [
+          {
+            "id": 1,
+            "subject": "Inspect workspace",
+            "status": "in_progress",
+            "activeForm": "inspecting workspace"
+          },
+          {
+            "id": 2,
+            "subject": "Summarize findings",
+            "status": "pending"
+          }
+        ],
+        "nextId": 3
+      },
+      "isError": false,
+      "timestamp": 1790195577401
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_1444595",
+          "name": "todo",
+          "arguments": {
+            "action": "update",
+            "status": "completed",
+            "id": 1
+          }
+        }
+      ]
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_1444595",
+      "toolName": "todo",
+      "content": [
+        {
+          "type": "text",
+          "text": "Updated #1 (in_progress → completed)"
+        }
+      ],
+      "details": {
+        "action": "update",
+        "params": {
+          "action": "update",
+          "status": "completed",
+          "id": 1
+        },
+        "tasks": [
+          {
+            "id": 1,
+            "subject": "Inspect workspace",
+            "status": "completed",
+            "activeForm": "inspecting workspace"
+          },
+          {
+            "id": 2,
+            "subject": "Summarize findings",
+            "status": "pending"
+          }
+        ],
+        "nextId": 3
+      },
+      "isError": false,
+      "timestamp": 1790195578305
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.test.ts
new file mode 100644
index 0000000000..9e5b28fd73
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.test.ts
@@ -0,0 +1,19 @@
+import { expect, test } from "vitest";
+import { capturedToolCall, verifyTaskFixture } from "../task-fixture-test.js";
+import { rpivTodo } from "./index.js";
+
+test("rpiv-todo maps captured RPC tasks through live and history", async () => {
+  await verifyTaskFixture(new URL("./fixtures/rpc-session.json", import.meta.url), [
+    "pending",
+    "pending,pending",
+    "in_progress,pending",
+    "completed,pending",
+  ]);
+});
+
+test("rpiv-todo declines the example todo result shape", () => {
+  const call = capturedToolCall(
+    new URL("../pi-example-todo/fixtures/rpc-session.json", import.meta.url),
+  );
+  expect(rpivTodo.createSession().mapToolCall?.(call)).toBeUndefined();
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.ts b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.ts
new file mode 100644
index 0000000000..d439e079fe
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/rpiv-todo/index.ts
@@ -0,0 +1,55 @@
+import { z } from "zod";
+import type { AgentTaskItem } from "../../../../agent-sdk-types.js";
+import type { PiExtension } from "../contract.js";
+
+const Details = z.object({
+  action: z.enum(["create", "update", "list", "get", "delete", "clear"]),
+  params: z.record(z.string(), z.unknown()),
+  nextId: z.number().int(),
+  tasks: z.array(
+    z.object({
+      id: z.number().int(),
+      subject: z.string(),
+      status: z.enum(["pending", "in_progress", "completed", "deleted"]),
+      activeForm: z.string().optional(),
+    }),
+  ),
+  error: z.string().optional(),
+});
+
+export const rpivTodo: PiExtension = {
+  id: "rpiv-todo",
+  createSession: () => ({
+    mapToolCall(call) {
+      if (
+        call.toolName !== "todo" ||
+        call.status !== "completed" ||
+        !call.result ||
+        typeof call.result === "string"
+      )
+        return undefined;
+      const parsed = Details.safeParse(call.result.details);
+      if (!parsed.success) return undefined;
+      return {
+        timeline: parsed.data.error
+          ? []
+          : [
+              {
+                type: "todo",
+                items: parsed.data.tasks.flatMap((task): AgentTaskItem[] => {
+                  if (task.status === "deleted") return [];
+                  const item: AgentTaskItem = {
+                    id: String(task.id),
+                    text: task.subject,
+                    status: task.status,
+                    completed: task.status === "completed",
+                  };
+                  if (task.activeForm) item.activeForm = task.activeForm;
+                  return [item];
+                }),
+              },
+            ],
+      };
+    },
+  }),
+};
diff --git a/packages/server/src/server/agent/providers/pi/extensions/subagent-fixture-test.ts b/packages/server/src/server/agent/providers/pi/extensions/subagent-fixture-test.ts
new file mode 100644
index 0000000000..8a9ca61d08
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/subagent-fixture-test.ts
@@ -0,0 +1,121 @@
+import { readFileSync } from "node:fs";
+import pino from "pino";
+import { expect, vi } from "vitest";
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+import { PiRpcAgentClient } from "../agent.js";
+import { streamPiHistory } from "../history-mapper.js";
+import type { PiAgentMessage, PiAgentSessionEvent } from "../rpc-types.js";
+import { FakePi } from "../test-utils/fake-pi.js";
+
+interface Fixture {
+  provenance: {
+    package: string;
+    version: string;
+    sourceCommit: string;
+    piVersion: string;
+    captureDate: string;
+  };
+  events: PiAgentSessionEvent[];
+  messages: PiAgentMessage[];
+}
+
+export function readSubagentFixture(
+  path: URL,
+  replaceSessionFile?: { from: string; to: string },
+): Fixture {
+  let source = readFileSync(path, "utf8");
+  if (replaceSessionFile)
+    source = source.replaceAll(
+      replaceSessionFile.from,
+      JSON.stringify(replaceSessionFile.to).slice(1, -1),
+    );
+  const fixture = JSON.parse(source) as Fixture;
+  expect(fixture.provenance).toEqual({
+    package: expect.any(String),
+    version: expect.any(String),
+    sourceCommit: expect.any(String),
+    piVersion: expect.any(String),
+    captureDate: expect.any(String),
+  });
+  return fixture;
+}
+
+export async function verifySubagentFixture(
+  fixture: Fixture,
+): Promise<Extract<AgentStreamEvent, { type: "provider_subagent" }>[]> {
+  const pi = new FakePi();
+  const client = new PiRpcAgentClient({ logger: pino({ level: "silent" }), runtime: pi });
+  const session = await client.createSession({
+    provider: "pi",
+    cwd: "/tmp/paseo-pi-subagent-fixture",
+  });
+  const live: AgentStreamEvent[] = [];
+  session.subscribe((event) => live.push(event));
+  try {
+    await session.startTurn("Delegate work");
+    for (const event of fixture.events) pi.latestSession().emit(event);
+    const immediate = live.filter((event) => event.type === "provider_subagent");
+    expect(immediate.some((event) => event.event.type === "timeline")).toBe(false);
+    pi.latestSession().finishTurn();
+    const replay: AgentStreamEvent[] = [];
+    for await (const event of streamPiHistory("pi", fixture.messages)) replay.push(event);
+    const replaySubagents = replay.filter((event) => event.type === "provider_subagent");
+    await vi.waitFor(() => {
+      expect(live.filter((event) => event.type === "provider_subagent")).toEqual(replaySubagents);
+    });
+    for (const message of fixture.messages) {
+      if (message.role !== "custom" || typeof message.content !== "string") continue;
+      for (const events of [live, replay]) {
+        const tools = events.flatMap((event) =>
+          event.type === "timeline" &&
+          event.item.type === "tool_call" &&
+          event.item.detail.type === "plain_text" &&
+          event.item.detail.text === message.content
+            ? [event.item]
+            : [],
+        );
+        expect(tools).toEqual(
+          message.display === false
+            ? []
+            : [
+                {
+                  type: "tool_call",
+                  callId: expect.stringMatching(/^pi-custom-/),
+                  name: message.customType ?? "custom-message",
+                  status: "completed",
+                  detail: {
+                    type: "plain_text",
+                    text: message.content,
+                  },
+                  metadata: {
+                    synthetic: true,
+                    customType: message.customType ?? "custom-message",
+                    ...(message.details === undefined ? {} : { details: message.details }),
+                  },
+                  error: null,
+                },
+              ],
+        );
+        expect(
+          events.filter(
+            (event) =>
+              event.type === "timeline" &&
+              event.item.type === "assistant_message" &&
+              event.item.text === message.content,
+          ),
+        ).toEqual([]);
+      }
+    }
+    const liveSubagents = live.filter((event) => event.type === "provider_subagent");
+    const firstTimeline = liveSubagents.findIndex((event) => event.event.type === "timeline");
+    if (firstTimeline !== -1) {
+      expect(
+        liveSubagents.slice(0, firstTimeline).some((event) => event.event.type === "upsert"),
+      ).toBe(true);
+    }
+    expect(liveSubagents).toEqual(replaySubagents);
+    return liveSubagents;
+  } finally {
+    await session.close();
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/task-fixture-test.ts b/packages/server/src/server/agent/providers/pi/extensions/task-fixture-test.ts
new file mode 100644
index 0000000000..a3b2114cab
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/task-fixture-test.ts
@@ -0,0 +1,105 @@
+import { readFileSync } from "node:fs";
+import pino from "pino";
+import { expect } from "vitest";
+import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
+import { PiRpcAgentClient } from "../agent.js";
+import { PiHistoryMapper } from "../history-mapper.js";
+import type { PiAgentMessage, PiAgentSessionEvent } from "../rpc-types.js";
+import { FakePi } from "../test-utils/fake-pi.js";
+import { parseToolResult } from "../tool-call-mapper.js";
+import { createPiExtensionHost } from "./index.js";
+import type { PiExtensionToolCall } from "./contract.js";
+
+interface TaskFixture {
+  provenance: {
+    package: string;
+    version: string;
+    sourceCommit: string;
+    piVersion: string;
+    captureDate: string;
+  };
+  events: PiAgentSessionEvent[];
+  messages: PiAgentMessage[];
+}
+
+function todos(events: readonly AgentStreamEvent[]) {
+  return events.flatMap((event) =>
+    event.type === "timeline" && event.item.type === "todo" ? [event.item] : [],
+  );
+}
+
+export function capturedToolCall(path: URL, index = 0): PiExtensionToolCall {
+  const fixture = JSON.parse(readFileSync(path, "utf8")) as TaskFixture;
+  const ends = fixture.events.filter((event) => event.type === "tool_execution_end");
+  const end = ends[index];
+  if (!end) throw new Error(`Missing captured tool result ${index}`);
+  const start = fixture.events.find(
+    (event) => event.type === "tool_execution_start" && event.toolCallId === end.toolCallId,
+  );
+  if (!start || start.type !== "tool_execution_start")
+    throw new Error("Missing captured tool start");
+  return {
+    callId: end.toolCallId,
+    toolName: end.toolName,
+    args: start.args,
+    status: end.isError ? "failed" : "completed",
+    result: parseToolResult(end.result),
+  };
+}
+
+export async function verifyTaskFixture(path: URL, expectedStatuses: string[]): Promise<void> {
+  const fixture = JSON.parse(readFileSync(path, "utf8")) as TaskFixture;
+  expect(fixture.provenance).toEqual(
+    expect.objectContaining({
+      package: expect.any(String),
+      version: expect.any(String),
+      sourceCommit: expect.any(String),
+      piVersion: expect.any(String),
+      captureDate: expect.any(String),
+    }),
+  );
+  const host = createPiExtensionHost();
+  const starts = new Map<string, Extract<PiAgentSessionEvent, { type: "tool_execution_start" }>>();
+  const mapped = [];
+  for (const event of fixture.events) {
+    if (event.type === "tool_execution_start") starts.set(event.toolCallId, event);
+    if (event.type !== "tool_execution_end") continue;
+    const start = starts.get(event.toolCallId);
+    expect(start).toBeDefined();
+    const mapping = host.mapToolCall({
+      callId: event.toolCallId,
+      toolName: event.toolName,
+      args: start?.args,
+      status: event.isError ? "failed" : "completed",
+      result: parseToolResult(event.result),
+    });
+    mapped.push(...(mapping?.timeline ?? []).filter((item) => item.type === "todo"));
+  }
+  expect(mapped.map((item) => item.items.map((task) => task.status))).toEqual(
+    expectedStatuses.map((status) => status.split(",")),
+  );
+
+  const pi = new FakePi();
+  const client = new PiRpcAgentClient({ logger: pino({ level: "silent" }), runtime: pi });
+  const session = await client.createSession({ provider: "pi", cwd: "/tmp/paseo-pi-task-fixture" });
+  const live: AgentStreamEvent[] = [];
+  session.subscribe((event) => live.push(event));
+  try {
+    await session.startTurn("Use tasks");
+    for (const event of fixture.events) pi.latestSession().emit(event);
+    pi.latestSession().finishTurn();
+    expect(todos(live)).toEqual(mapped);
+    const replay = new PiHistoryMapper("pi").mapMessages(fixture.messages);
+    expect(todos(replay)).toEqual(mapped);
+    expect(
+      replay.filter(
+        (event) =>
+          event.type === "timeline" &&
+          event.item.type === "tool_call" &&
+          event.item.status === "completed",
+      ),
+    ).toHaveLength(fixture.events.filter((event) => event.type === "tool_execution_end").length);
+  } finally {
+    await session.close();
+  }
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background-group.json b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background-group.json
new file mode 100644
index 0000000000..083e57744e
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background-group.json
@@ -0,0 +1,419 @@
+{
+  "provenance": {
+    "package": "@tintinweb/pi-subagents",
+    "version": "0.19.0",
+    "sourceCommit": "4f572eaa04c09d3dbc16e4a5f13a16b295e84e14",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-10-01"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_277173",
+      "toolName": "Agent",
+      "args": {
+        "run_in_background": true,
+        "description": "Test agent 1",
+        "prompt": "reply with exactly OK",
+        "subagent_type": "general-purpose"
+      }
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_277176",
+      "toolName": "Agent",
+      "args": {
+        "prompt": "reply with exactly OK",
+        "run_in_background": true,
+        "description": "Test agent 2",
+        "subagent_type": "general-purpose"
+      }
+    },
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_277179",
+      "toolName": "Agent",
+      "args": {
+        "subagent_type": "general-purpose",
+        "description": "Test agent 3",
+        "prompt": "reply with exactly OK",
+        "run_in_background": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_277173",
+      "toolName": "Agent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent started in background.\nAgent ID: 4b4fd01d-aaa8-46d\nType: Agent\nDescription: Test agent 1\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "Test agent 1",
+          "subagentType": "general-purpose",
+          "modelName": "google: gemini 3.6 flash",
+          "tags": ["twin", "background"],
+          "toolUses": 0,
+          "tokens": "",
+          "durationMs": 0,
+          "status": "background",
+          "agentId": "4b4fd01d-aaa8-46d"
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_277176",
+      "toolName": "Agent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent started in background.\nAgent ID: a92b022c-cd9e-41e\nType: Agent\nDescription: Test agent 2\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "Test agent 2",
+          "subagentType": "general-purpose",
+          "modelName": "google: gemini 3.6 flash",
+          "tags": ["twin", "background"],
+          "toolUses": 0,
+          "tokens": "",
+          "durationMs": 0,
+          "status": "background",
+          "agentId": "a92b022c-cd9e-41e"
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_277179",
+      "toolName": "Agent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent started in background.\nAgent ID: 13336b9f-79c3-49e\nType: Agent\nDescription: Test agent 3\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "Test agent 3",
+          "subagentType": "general-purpose",
+          "modelName": "google: gemini 3.6 flash",
+          "tags": ["twin", "background"],
+          "toolUses": 0,
+          "tokens": "",
+          "durationMs": 0,
+          "status": "background",
+          "agentId": "13336b9f-79c3-49e"
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notification",
+        "content": "Background agent group completed: 3 agent(s) finished\n\n<task-notification>\n<task-id>4b4fd01d-aaa8-46d</task-id>\n<tool-use-id>call_277173</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 1\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1054</duration_ms></usage>\n</task-notification>\n\n<task-notification>\n<task-id>a92b022c-cd9e-41e</task-id>\n<tool-use-id>call_277176</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 2\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1182</duration_ms></usage>\n</task-notification>\n\n<task-notification>\n<task-id>13336b9f-79c3-49e</task-id>\n<tool-use-id>call_277179</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 3\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1472</duration_ms></usage>\n</task-notification>\n\nUse get_subagent_result for full output.",
+        "display": true,
+        "details": {
+          "id": "4b4fd01d-aaa8-46d",
+          "description": "Test agent 1",
+          "status": "completed",
+          "toolUses": 0,
+          "turnCount": 0,
+          "totalTokens": 10186,
+          "totalCost": 0.007642500000000001,
+          "durationMs": 1054,
+          "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output",
+          "resultPreview": "OK",
+          "others": [
+            {
+              "id": "a92b022c-cd9e-41e",
+              "description": "Test agent 2",
+              "status": "completed",
+              "toolUses": 0,
+              "turnCount": 0,
+              "totalTokens": 10186,
+              "totalCost": 0.007642500000000001,
+              "durationMs": 1182,
+              "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output",
+              "resultPreview": "OK"
+            },
+            {
+              "id": "13336b9f-79c3-49e",
+              "description": "Test agent 3",
+              "status": "completed",
+              "toolUses": 0,
+              "turnCount": 0,
+              "totalTokens": 10186,
+              "totalCost": 0.007642500000000001,
+              "durationMs": 1472,
+              "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output",
+              "resultPreview": "OK"
+            }
+          ]
+        },
+        "timestamp": 1790833737082
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "thinking",
+          "thinking": "",
+          "thinkingSignature": "[{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a19lxhI31c8Kjto2eEqQuEoAa1jXk+6WHw4RxcJiLq9eTkm6UtOU0r9mP+xFrs3A9GkNyIfpaIzLUGuPKjiYw648QdaOOVbR7jCqPVFA+CEYQH0V\",\"format\":\"google-gemini-v1\",\"id\":\"call_277173\",\"index\":0}]"
+        },
+        {
+          "type": "toolCall",
+          "id": "call_277173",
+          "name": "Agent",
+          "arguments": {
+            "run_in_background": true,
+            "description": "Test agent 1",
+            "prompt": "reply with exactly OK",
+            "subagent_type": "general-purpose"
+          }
+        },
+        {
+          "type": "toolCall",
+          "id": "call_277176",
+          "name": "Agent",
+          "arguments": {
+            "prompt": "reply with exactly OK",
+            "run_in_background": true,
+            "description": "Test agent 2",
+            "subagent_type": "general-purpose"
+          }
+        },
+        {
+          "type": "toolCall",
+          "id": "call_277179",
+          "name": "Agent",
+          "arguments": {
+            "subagent_type": "general-purpose",
+            "description": "Test agent 3",
+            "prompt": "reply with exactly OK",
+            "run_in_background": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 13147,
+        "output": 135,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 13282,
+        "cost": {
+          "input": 0.009860250000000001,
+          "output": 0.00050625,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.0103665
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790833733536,
+      "responseId": "gen-1790833733-Qo0mjOAU6129xnYfl8rM",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_277173",
+      "toolName": "Agent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent started in background.\nAgent ID: 4b4fd01d-aaa8-46d\nType: Agent\nDescription: Test agent 1\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "Test agent 1",
+        "subagentType": "general-purpose",
+        "modelName": "google: gemini 3.6 flash",
+        "tags": ["twin", "background"],
+        "toolUses": 0,
+        "tokens": "",
+        "durationMs": 0,
+        "status": "background",
+        "agentId": "4b4fd01d-aaa8-46d"
+      },
+      "isError": false,
+      "timestamp": 1790833735411
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_277176",
+      "toolName": "Agent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent started in background.\nAgent ID: a92b022c-cd9e-41e\nType: Agent\nDescription: Test agent 2\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "Test agent 2",
+        "subagentType": "general-purpose",
+        "modelName": "google: gemini 3.6 flash",
+        "tags": ["twin", "background"],
+        "toolUses": 0,
+        "tokens": "",
+        "durationMs": 0,
+        "status": "background",
+        "agentId": "a92b022c-cd9e-41e"
+      },
+      "isError": false,
+      "timestamp": 1790833735412
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_277179",
+      "toolName": "Agent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent started in background.\nAgent ID: 13336b9f-79c3-49e\nType: Agent\nDescription: Test agent 3\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "Test agent 3",
+        "subagentType": "general-purpose",
+        "modelName": "google: gemini 3.6 flash",
+        "tags": ["twin", "background"],
+        "toolUses": 0,
+        "tokens": "",
+        "durationMs": 0,
+        "status": "background",
+        "agentId": "13336b9f-79c3-49e"
+      },
+      "isError": false,
+      "timestamp": 1790833735412
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "text",
+          "text": "I have spawned the 3 background agents and am waiting for their completion notifications."
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 2004,
+        "output": 16,
+        "cacheRead": 11743,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 13763,
+        "cost": {
+          "input": 0.001503,
+          "output": 6e-5,
+          "cacheRead": 0.000880725,
+          "cacheWrite": 0,
+          "total": 0.002443725
+        }
+      },
+      "stopReason": "stop",
+      "timestamp": 1790833735412,
+      "responseId": "gen-1790833735-adM3whTd4mLRXnKi2Xu0",
+      "rawStopReason": "stop"
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notification",
+      "content": "Background agent group completed: 3 agent(s) finished\n\n<task-notification>\n<task-id>4b4fd01d-aaa8-46d</task-id>\n<tool-use-id>call_277173</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 1\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1054</duration_ms></usage>\n</task-notification>\n\n<task-notification>\n<task-id>a92b022c-cd9e-41e</task-id>\n<tool-use-id>call_277176</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 2\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1182</duration_ms></usage>\n</task-notification>\n\n<task-notification>\n<task-id>13336b9f-79c3-49e</task-id>\n<tool-use-id>call_277179</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output</output-file>\n<status>Done</status>\n<summary>Agent \"Test agent 3\" completed</summary>\n<result>OK</result>\n<usage><total_tokens>10186</total_tokens><tool_uses>0</tool_uses><context_percent>1</context_percent><duration_ms>1472</duration_ms></usage>\n</task-notification>\n\nUse get_subagent_result for full output.",
+      "display": true,
+      "details": {
+        "id": "4b4fd01d-aaa8-46d",
+        "description": "Test agent 1",
+        "status": "completed",
+        "toolUses": 0,
+        "turnCount": 0,
+        "totalTokens": 10186,
+        "totalCost": 0.007642500000000001,
+        "durationMs": 1054,
+        "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/4b4fd01d-aaa8-46d.output",
+        "resultPreview": "OK",
+        "others": [
+          {
+            "id": "a92b022c-cd9e-41e",
+            "description": "Test agent 2",
+            "status": "completed",
+            "toolUses": 0,
+            "turnCount": 0,
+            "totalTokens": 10186,
+            "totalCost": 0.007642500000000001,
+            "durationMs": 1182,
+            "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/a92b022c-cd9e-41e.output",
+            "resultPreview": "OK"
+          },
+          {
+            "id": "13336b9f-79c3-49e",
+            "description": "Test agent 3",
+            "status": "completed",
+            "toolUses": 0,
+            "turnCount": 0,
+            "totalTokens": 10186,
+            "totalCost": 0.007642500000000001,
+            "durationMs": 1472,
+            "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-subagent-fixture/01a0f602-2dd3-7755-8969-96e4d126cd2e/tasks/13336b9f-79c3-49e.output",
+            "resultPreview": "OK"
+          }
+        ]
+      },
+      "timestamp": 1790833737082
+    },
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "text",
+          "text": "DONE"
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 2740,
+        "output": 1,
+        "cacheRead": 11762,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 14503,
+        "cost": {
+          "input": 0.002055,
+          "output": 3.75e-6,
+          "cacheRead": 0.00088215,
+          "cacheWrite": 0,
+          "total": 0.0029408999999999998
+        }
+      },
+      "stopReason": "stop",
+      "timestamp": 1790833737083,
+      "responseId": "gen-1790833737-3IfsB2wLuE8DMNlJMgmI",
+      "rawStopReason": "stop"
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background.json b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background.json
new file mode 100644
index 0000000000..41ebae67f3
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/background.json
@@ -0,0 +1,154 @@
+{
+  "provenance": {
+    "package": "@tintinweb/pi-subagents",
+    "version": "0.19.0",
+    "sourceCommit": "4f572eaa04c09d3dbc16e4a5f13a16b295e84e14",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_411074",
+      "toolName": "Agent",
+      "args": {
+        "prompt": "list files in this empty workspace.",
+        "subagent_type": "general-purpose",
+        "run_in_background": true,
+        "description": "list files"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_411074",
+      "toolName": "Agent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent started in background.\nAgent ID: 98cdb309-045e-45d\nType: Agent\nDescription: list files\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "list files",
+          "subagentType": "general-purpose",
+          "modelName": "google: gemini 3.6 flash",
+          "tags": ["twin", "background"],
+          "toolUses": 0,
+          "tokens": "",
+          "durationMs": 0,
+          "status": "background",
+          "agentId": "98cdb309-045e-45d"
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notification",
+        "content": "<task-notification>\n<task-id>98cdb309-045e-45d</task-id>\n<tool-use-id>call_411074</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output</output-file>\n<status>Done</status>\n<summary>Agent \"list files\" completed</summary>\n<result>The workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty.</result>\n<usage><total_tokens>18642</total_tokens><tool_uses>1</tool_uses><context_percent>1</context_percent><duration_ms>5292</duration_ms></usage>\n</task-notification>\nFull transcript available at: /tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output",
+        "display": true,
+        "details": {
+          "id": "98cdb309-045e-45d",
+          "description": "list files",
+          "status": "completed",
+          "toolUses": 1,
+          "turnCount": 0,
+          "totalTokens": 18642,
+          "totalCost": 0.015582600000000002,
+          "durationMs": 5292,
+          "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output",
+          "resultPreview": "The workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty."
+        },
+        "timestamp": 1790197702084
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_411074",
+          "name": "Agent",
+          "arguments": {
+            "prompt": "list files in this empty workspace.",
+            "subagent_type": "general-purpose",
+            "run_in_background": true,
+            "description": "list files"
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 13438,
+        "output": 125,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 79,
+        "totalTokens": 13563,
+        "cost": {
+          "input": 0.0100785,
+          "output": 0.00046875000000000004,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.010547250000000001
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197694776,
+      "responseId": "gen-1790197694-XL8DSeExpZQLQE8377rX",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_411074",
+      "toolName": "Agent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent started in background.\nAgent ID: 98cdb309-045e-45d\nType: Agent\nDescription: list files\nOutput file: /tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output\n\nYou will be notified when this agent completes.\nUse get_subagent_result to retrieve full results, or steer_subagent to send it messages.\nDo not duplicate this agent's work."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "list files",
+        "subagentType": "general-purpose",
+        "modelName": "google: gemini 3.6 flash",
+        "tags": ["twin", "background"],
+        "toolUses": 0,
+        "tokens": "",
+        "durationMs": 0,
+        "status": "background",
+        "agentId": "98cdb309-045e-45d"
+      },
+      "isError": false,
+      "timestamp": 1790197696594
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notification",
+      "content": "<task-notification>\n<task-id>98cdb309-045e-45d</task-id>\n<tool-use-id>call_411074</tool-use-id>\n<output-file>/tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output</output-file>\n<status>Done</status>\n<summary>Agent \"list files\" completed</summary>\n<result>The workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty.</result>\n<usage><total_tokens>18642</total_tokens><tool_uses>1</tool_uses><context_percent>1</context_percent><duration_ms>5292</duration_ms></usage>\n</task-notification>\nFull transcript available at: /tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output",
+      "display": true,
+      "details": {
+        "id": "98cdb309-045e-45d",
+        "description": "list files",
+        "status": "completed",
+        "toolUses": 1,
+        "turnCount": 0,
+        "totalTokens": 18642,
+        "totalCost": 0.015582600000000002,
+        "durationMs": 5292,
+        "outputFile": "/tmp/pi-subagents-1000/tmp-paseo-pi-extension-phase3-workspace/01a0d018-fd1c-7ee8-bafa-16831f748cf1/tasks/98cdb309-045e-45d.output",
+        "resultPreview": "The workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty."
+      },
+      "timestamp": 1790197702084
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/child-session.jsonl b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/child-session.jsonl
new file mode 100644
index 0000000000..b25ac4a4a3
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/child-session.jsonl
@@ -0,0 +1,4 @@
+{"isSidechain":true,"agentId":"98cdb309-045e-45d","type":"user","message":{"role":"user","content":"list files in this empty workspace."},"timestamp":"2026-09-23T21:08:16.594Z","cwd":"/tmp/paseo-pi-extension-phase3/workspace"}
+{"isSidechain":true,"agentId":"98cdb309-045e-45d","type":"assistant","message":{"role":"assistant","content":[{"type":"thinking","thinking":"**Exploring File Listing Options**\n\nI'm currently evaluating the available tools like `ls` and `find` to fulfill the request of listing files in the empty `/tmp/paseo-pi-extension-phase3/workspace`. My next step is to determine the most efficient command for this purpose.\n\n","thinkingSignature":"[{\"type\":\"reasoning.text\",\"text\":\"**Exploring File Listing Options**\\n\\nI'm currently evaluating the available tools like `ls` and `find` to fulfill the request of listing files in the empty `/tmp/paseo-pi-extension-phase3/workspace`. My next step is to determine the most efficient command for this purpose.\\n\\n\",\"format\":\"google-gemini-v1\",\"index\":0},{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a192ypUlDWGHPw18bSatn/b/48MmqVr7V0YSiUNNQ+0T+GC5rJwP1JXRK5sYaYHmvC3vKWcK9ecoV7oK0HTgrg9sNj4x8EVGiIi0NnIBR5jRegqcJ/uzfPEWcrl4J2VZ3UDTrjLCQPvQhVm0cr2G0W3LQd+jDaH4OBDNufV7kQPoYi9RMJPV9WdX7Mqh0TTfg+/pyUDZ5J3IESZgs5P+MKhiH38wpd5+0FqvalefDkAhJSXPwOkyylSG8+8L3lQf4bR+cZlD0k+lN73AjihntAZhAFGfbQWzeUfqGRCC+nsdcE4Fb5nGBu4iToIiu7FNWKt8q7oYQL5g0i5VB0raV8He5OkZV3QzxjvjtWykchkb6wpJWRkBOYkNNQXZKEj1E9seJ+PhiJWaNCGEr1IUoOu9u4W2O4VGoKhnFrEK3QN0Ny8HJAASG4zcZpR1RmkUyImmnydgQelbll3i1osGfl2zAq9ndNtuWpiv31kw6mNntcM2GR8vj46wynIoVltSmrCf4Ki47Xzbew+8neOVJZ54DHWl4Un72VtfUAqvkrXNuPC4S9P6YQBH8XquUzvzpU7PeZZ/l+WjBFaBWPXz2DlPdHiCqa9bf8biI/fL4yL+maEx0DcWVG+1LT/HT6T9b6AzHDDr7XewKv5A0XL769IJDb+ROTUS6275Sj/GL4CYaz8ejfyDfgx8i/jI1SzehSeBnF99Pv3EY9jFTavNt86gLU31EsUNPt5iC18W4ReIoGt6AExRApczMd6fWhLagF6vTXzGq+qgS+BaCsLAMWiptdJaEfp5x9mcN6Iuddk1nxRUEuO7/PmJgC5NnD6xHVsWc6eEl6VGBS7uqrGtGmXfHhfQDtZxf+qLpJKBsHMbuOXe85ZwhQ==\",\"format\":\"google-gemini-v1\",\"id\":\"call_417499\",\"index\":0}]"},{"type":"toolCall","id":"call_417499","name":"ls","arguments":{"path":"/tmp/paseo-pi-extension-phase3/workspace"}}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":15478,"output":175,"cacheRead":0,"cacheWrite":0,"reasoning":148,"totalTokens":15653,"cost":{"input":0.0116085,"output":0.00065625,"cacheRead":0,"cacheWrite":0,"total":0.012264750000000001}},"stopReason":"toolUse","timestamp":1790197697300,"responseId":"gen-1790197697-VIbshov8B0i407MK5sjj","rawStopReason":"tool_calls"},"timestamp":"2026-09-23T21:08:20.155Z","cwd":"/tmp/paseo-pi-extension-phase3/workspace"}
+{"isSidechain":true,"agentId":"98cdb309-045e-45d","type":"toolResult","message":{"role":"toolResult","toolCallId":"call_417499","toolName":"ls","content":[{"type":"text","text":"(empty directory)"}],"isError":false,"timestamp":1790197700155},"timestamp":"2026-09-23T21:08:20.155Z","cwd":"/tmp/paseo-pi-extension-phase3/workspace"}
+{"isSidechain":true,"agentId":"98cdb309-045e-45d","type":"assistant","message":{"role":"assistant","content":[{"type":"text","text":"The workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty."}],"api":"openai-completions","provider":"openrouter","model":"google/gemini-3.6-flash","usage":{"input":2948,"output":41,"cacheRead":12708,"cacheWrite":0,"reasoning":20,"totalTokens":15697,"cost":{"input":0.002211,"output":0.00015375,"cacheRead":0.0009530999999999999,"cacheWrite":0,"total":0.00331785}},"stopReason":"stop","timestamp":1790197700155,"responseId":"gen-1790197700-mOWiePGBCZu5WhYs3r1n","rawStopReason":"stop"},"timestamp":"2026-09-23T21:08:21.881Z","cwd":"/tmp/paseo-pi-extension-phase3/workspace"}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/foreground.json b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/foreground.json
new file mode 100644
index 0000000000..66857a3ced
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/fixtures/foreground.json
@@ -0,0 +1,117 @@
+{
+  "provenance": {
+    "package": "@tintinweb/pi-subagents",
+    "version": "0.19.0",
+    "sourceCommit": "4f572eaa04c09d3dbc16e4a5f13a16b295e84e14",
+    "piVersion": "0.84.4",
+    "captureDate": "2026-09-23"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_458926",
+      "toolName": "Agent",
+      "args": {
+        "subagent_type": "general-purpose",
+        "run_in_background": false,
+        "description": "List files in empty workspace",
+        "prompt": "list the files in this empty workspace"
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_458926",
+      "toolName": "Agent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Agent completed in 6.6s (1 tool uses, 18.8k token).\n\nThe workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty (no files or hidden dotfiles)."
+          }
+        ],
+        "details": {
+          "displayName": "Agent",
+          "description": "List files in empty workspace",
+          "subagentType": "general-purpose",
+          "modelName": "google: gemini 3.6 flash",
+          "tags": ["twin", "thinking: high"],
+          "toolUses": 1,
+          "tokens": "18.8k token",
+          "cost": 0.016011675,
+          "turnCount": 2,
+          "durationMs": 6637,
+          "status": "completed",
+          "agentId": "4f961541-49c3-430"
+        }
+      },
+      "isError": false
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_458926",
+          "name": "Agent",
+          "arguments": {
+            "subagent_type": "general-purpose",
+            "run_in_background": false,
+            "description": "List files in empty workspace",
+            "prompt": "list the files in this empty workspace"
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 13432,
+        "output": 49,
+        "cacheRead": 0,
+        "cacheWrite": 0,
+        "reasoning": 0,
+        "totalTokens": 13481,
+        "cost": {
+          "input": 0.010074,
+          "output": 0.00018375,
+          "cacheRead": 0,
+          "cacheWrite": 0,
+          "total": 0.01025775
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197658831,
+      "responseId": "gen-1790197658-itiLcQoBdeRe3YHKtihF",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_458926",
+      "toolName": "Agent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Agent completed in 6.6s (1 tool uses, 18.8k token).\n\nThe workspace directory `/tmp/paseo-pi-extension-phase3/workspace` is empty (no files or hidden dotfiles)."
+        }
+      ],
+      "details": {
+        "displayName": "Agent",
+        "description": "List files in empty workspace",
+        "subagentType": "general-purpose",
+        "modelName": "google: gemini 3.6 flash",
+        "tags": ["twin", "thinking: high"],
+        "toolUses": 1,
+        "tokens": "18.8k token",
+        "cost": 0.016011675,
+        "turnCount": 2,
+        "durationMs": 6637,
+        "status": "completed",
+        "agentId": "4f961541-49c3-430"
+      },
+      "isError": false,
+      "timestamp": 1790197667103
+    }
+  ]
+}
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts
new file mode 100644
index 0000000000..ad666bb4d3
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts
@@ -0,0 +1,229 @@
+import { describe, expect, test } from "vitest";
+import { fileURLToPath } from "node:url";
+import { createPiExtensionHost } from "../index.js";
+import { readSubagentFixture, verifySubagentFixture } from "../subagent-fixture-test.js";
+import type { PiAgentMessage } from "../../rpc-types.js";
+
+describe("@tintinweb/pi-subagents adapter", () => {
+  test("exposes the background output file while the child is running", () => {
+    const mapping = createPiExtensionHost().mapToolCall({
+      callId: "call-1",
+      toolName: "Agent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: {
+        details: { agentId: "native-1", status: "background" },
+        content: [
+          { type: "text", text: "Agent started in background.\nOutput file: /tmp/child.output\n" },
+        ],
+      },
+    });
+    expect(mapping?.subagents).toEqual([
+      expect.objectContaining({ id: "call-1", status: "running" }),
+    ]);
+    expect(mapping?.childSessions).toEqual([{ id: "call-1", file: "/tmp/child.output" }]);
+  });
+  test("marks a foreground child that wrapped up at its turn limit as completed", () => {
+    const mapping = createPiExtensionHost().mapToolCall({
+      callId: "call-1",
+      toolName: "Agent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: {
+        details: { agentId: "native-1", status: "steered" },
+        content: [{ type: "text", text: "Wrapped up (turn limit)" }],
+      },
+    });
+    expect(mapping?.subagents).toEqual([
+      expect.objectContaining({ id: "call-1", status: "completed" }),
+    ]);
+    expect(mapping?.detail).toEqual({
+      type: "sub_agent",
+      subAgentType: "Explore",
+      description: "Inspect",
+      log: "Wrapped up (turn limit)",
+    });
+  });
+  test("maps captured foreground lifecycle live and on replay", async () => {
+    const events = await verifySubagentFixture(
+      readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url)),
+    );
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toEqual(["running", "completed"]);
+  });
+  test("uses a structured notification to complete a background child", async () => {
+    const source = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url));
+    const file = (
+      source.messages.find((message) => message.role === "custom") as {
+        details: { outputFile: string };
+      }
+    ).details.outputFile;
+    const fixture = readSubagentFixture(new URL("./fixtures/background.json", import.meta.url), {
+      from: file,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    const events = await verifySubagentFixture(fixture);
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toEqual(["running", "running", "completed"]);
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
+  test("completes every background child in a grouped notification", async () => {
+    const events = await verifySubagentFixture(
+      readSubagentFixture(new URL("./fixtures/background-group.json", import.meta.url)),
+    );
+    const finalStatus = new Map<string, string>();
+    for (const { event } of events) {
+      if (event.type === "upsert" && event.status) finalStatus.set(event.id, event.status);
+    }
+    expect(Object.fromEntries(finalStatus)).toEqual({
+      call_277173: "completed",
+      call_277176: "completed",
+      call_277179: "completed",
+    });
+  });
+  test.each(["subagent-notification", "subagent-update"])(
+    "completes turn-limited children in a grouped %s",
+    (customType) => {
+      const host = createPiExtensionHost();
+      for (const id of ["1", "2", "3"]) {
+        host.mapToolCall({
+          callId: `call-${id}`,
+          toolName: "Agent",
+          args: { subagent_type: "Explore", prompt: "Inspect" },
+          status: "completed",
+          result: { details: { agentId: `native-${id}`, status: "background" } },
+        });
+      }
+      const mapping = host.mapCustomMessage({
+        role: "custom",
+        customType,
+        content: "Wrapped up (turn limit)",
+        display: true,
+        timestamp: 0,
+        details: {
+          id: "native-1",
+          status: "steered",
+          others: [
+            { id: "native-2", status: "steered" },
+            { id: "native-3", status: "running" },
+          ],
+        },
+      });
+      expect(mapping?.subagents).toEqual([
+        expect.objectContaining({ id: "call-1", status: "completed" }),
+        expect.objectContaining({ id: "call-2", status: "completed" }),
+        expect.objectContaining({ id: "call-3", status: "running" }),
+      ]);
+    },
+  );
+  test.each(["get_subagent_result", "steer_subagent"])(
+    "completes a turn-limited child when collected through %s",
+    (toolName) => {
+      const host = createPiExtensionHost();
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "Agent",
+        args: { subagent_type: "Explore", prompt: "Inspect" },
+        status: "completed",
+        result: { details: { agentId: "native-1", status: "background" } },
+      });
+      const mapping = host.mapToolCall({
+        callId: "followup-1",
+        toolName,
+        args: { agent_id: "native-1" },
+        status: "completed",
+        result: {
+          details: { agentId: "native-1", status: "steered" },
+          content: [{ type: "text", text: "Wrapped up (turn limit)" }],
+        },
+      });
+      expect(mapping?.subagents).toEqual([{ type: "upsert", id: "call-1", status: "completed" }]);
+      expect(mapping?.detail).toEqual({
+        type: "sub_agent",
+        description: undefined,
+        log: "Wrapped up (turn limit)",
+      });
+    },
+  );
+  test.each([
+    ["background", "running"],
+    ["queued", "running"],
+    ["running", "running"],
+    ["completed", "completed"],
+    ["error", "failed"],
+    ["aborted", "canceled"],
+    ["stopped", "canceled"],
+    ["unknown", "running"],
+  ])("preserves the mapping of %s to %s", (status, expected) => {
+    const mapping = createPiExtensionHost().mapToolCall({
+      callId: "call-1",
+      toolName: "Agent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: { details: { agentId: "native-1", status } },
+    });
+    expect(mapping?.subagents).toEqual([
+      expect.objectContaining({ id: "call-1", status: expected }),
+    ]);
+  });
+  test("completes a turn-limited background child live and on history replay", async () => {
+    const path = new URL("./fixtures/background.json", import.meta.url);
+    const source = readSubagentFixture(path);
+    const notification = source.messages.find((message) => message.role === "custom");
+    const notificationDetails = notification?.details;
+    if (
+      !notificationDetails ||
+      typeof notificationDetails !== "object" ||
+      !("outputFile" in notificationDetails) ||
+      typeof notificationDetails.outputFile !== "string"
+    ) {
+      throw new Error("Background fixture is missing its child output file");
+    }
+    const fixture = readSubagentFixture(path, {
+      from: notificationDetails.outputFile,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    function wrapUp(message: PiAgentMessage): PiAgentMessage {
+      if (message.role !== "custom") return message;
+      const details = message.details;
+      if (!details || typeof details !== "object") {
+        throw new Error("Background fixture is missing its notification details");
+      }
+      return {
+        ...message,
+        content: "Wrapped up (turn limit)",
+        details: { ...details, status: "steered" },
+      };
+    }
+    const events = await verifySubagentFixture({
+      ...fixture,
+      events: fixture.events.map((event) =>
+        event.type === "message_end" ? { ...event, message: wrapUp(event.message) } : event,
+      ),
+      messages: fixture.messages.map(wrapUp),
+    });
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toEqual(["running", "running", "completed"]);
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
+  test("declines foreign Agent results", () => {
+    expect(
+      createPiExtensionHost().mapToolCall({
+        callId: "foreign",
+        toolName: "Agent",
+        args: { prompt: "foo" },
+        status: "completed",
+        result: { details: { agentId: "other", status: "completed" } },
+      }),
+    ).toBeUndefined();
+  });
+});
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts
new file mode 100644
index 0000000000..56b5935172
--- /dev/null
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts
@@ -0,0 +1,158 @@
+import { z } from "zod";
+import { extractTextFromToolResult } from "../../tool-call-mapper.js";
+import { outputFileFromToolResult } from "../child-session.js";
+import type { PiExtension, PiExtensionToolCall } from "../contract.js";
+
+const SpawnArgs = z
+  .object({
+    subagent_type: z.string().trim().min(1),
+    prompt: z.string().trim().min(1),
+    description: z.string().optional(),
+  })
+  .passthrough();
+const FollowupArgs = z.object({ agent_id: z.string().trim().min(1) }).passthrough();
+const Details = z
+  .object({
+    agentId: z.string().trim().min(1),
+    status: z.string(),
+    displayName: z.string().optional(),
+    description: z.string().optional(),
+  })
+  .passthrough();
+const NotificationEntry = z
+  .object({
+    id: z.string().trim().min(1),
+    status: z.string(),
+    description: z.string().optional(),
+    outputFile: z.string().trim().min(1).optional(),
+  })
+  .passthrough();
+// Completions that land close together arrive as one notification: the first
+// agent at the top level and the rest in `others`.
+const Notification = NotificationEntry.extend({
+  others: z.array(NotificationEntry).optional(),
+});
+const status = (value: string): "running" | "completed" | "failed" | "canceled" => {
+  // A soft turn-limit wrap-up has finished; it is not an in-flight steering request.
+  if (value === "completed" || value === "steered") return "completed";
+  if (value === "error") return "failed";
+  if (value === "aborted" || value === "stopped") return "canceled";
+  return "running";
+};
+
+export const tintinwebPiSubagents: PiExtension = {
+  id: "@tintinweb/pi-subagents",
+  createSession: () => {
+    const callsByAgent = new Map<string, string>();
+    const readSessions = new Set<string>();
+    const mapSpawn = (call: PiExtensionToolCall) => {
+      const args = SpawnArgs.safeParse(call.args);
+      if (!args.success) return undefined;
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      const title = args.data.subagent_type;
+      const description = args.data.description ?? args.data.prompt;
+      const detail = {
+        type: "sub_agent" as const,
+        subAgentType: title,
+        description,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      if (call.status === "running")
+        return {
+          detail,
+          subagents: [
+            {
+              type: "upsert" as const,
+              id: call.callId,
+              title,
+              description,
+              toolCallId: call.callId,
+              status: "running" as const,
+            },
+          ],
+        };
+      if (!details.success)
+        return call.status === "failed"
+          ? {
+              detail,
+              subagents: [{ type: "upsert" as const, id: call.callId, status: "failed" as const }],
+            }
+          : { detail };
+      callsByAgent.set(details.data.agentId, call.callId);
+      const file = outputFileFromToolResult(call.result);
+      const childSessions = file && !readSessions.has(file) ? [{ id: call.callId, file }] : [];
+      if (file) readSessions.add(file);
+      return {
+        detail,
+        subagents: [
+          {
+            type: "upsert" as const,
+            id: call.callId,
+            title,
+            description,
+            toolCallId: call.callId,
+            status: status(details.data.status),
+          },
+        ],
+        childSessions,
+      };
+    };
+    const mapFollowup = (call: PiExtensionToolCall) => {
+      const args = FollowupArgs.safeParse(call.args);
+      if (!args.success) return undefined;
+      const id = callsByAgent.get(args.data.agent_id);
+      if (!id) return undefined;
+      const details = Details.safeParse(
+        typeof call.result === "object" ? call.result?.details : null,
+      );
+      const detail = {
+        type: "sub_agent" as const,
+        description: details.success ? details.data.description : undefined,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      if (call.status === "running" || !details.success) return { detail };
+      return {
+        detail,
+        subagents: [{ type: "upsert" as const, id, status: status(details.data.status) }],
+      };
+    };
+    return {
+      mapToolCall(call) {
+        if (call.toolName === "Agent") return mapSpawn(call);
+        if (call.toolName === "get_subagent_result" || call.toolName === "steer_subagent")
+          return mapFollowup(call);
+        return undefined;
+      },
+      mapCustomMessage(message) {
+        if (
+          message.customType !== "subagent-notification" &&
+          message.customType !== "subagent-update"
+        )
+          return undefined;
+        const details = Notification.safeParse(message.details);
+        if (!details.success) return undefined;
+        const subagents = [];
+        const childSessions = [];
+        for (const entry of [details.data, ...(details.data.others ?? [])]) {
+          const id = callsByAgent.get(entry.id);
+          if (!id) continue;
+          const file = entry.outputFile;
+          if (file && !readSessions.has(file)) {
+            readSessions.add(file);
+            childSessions.push({ id, file });
+          }
+          subagents.push({
+            type: "upsert" as const,
+            id,
+            description: entry.description,
+            status: status(entry.status),
+          });
+        }
+        if (subagents.length === 0) return undefined;
+        return { subagents, childSessions };
+      },
+    };
+  },
+};
diff --git a/packages/server/src/server/agent/providers/pi/history-mapper.test.ts b/packages/server/src/server/agent/providers/pi/history-mapper.test.ts
index 380cf4ee75..24d18306b2 100644
--- a/packages/server/src/server/agent/providers/pi/history-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/pi/history-mapper.test.ts
@@ -16,6 +16,35 @@ async function collectHistory(
 }
 
 describe("Pi history mapper", () => {
+  test("renders visible custom messages as completed tools and hides private context", async () => {
+    const events = await collectHistory([
+      {
+        role: "custom",
+        customType: "project-context",
+        content: "Project instructions",
+        display: true,
+      },
+      {
+        role: "custom",
+        customType: "private-context",
+        content: "Hidden instructions",
+        display: false,
+      },
+      { role: "custom", customType: "project-context", content: "Project instructions" },
+    ]);
+    expect(events.map((event) => event.item)).toEqual(
+      [1, 2].map((index) => ({
+        type: "tool_call",
+        callId: `pi-custom-${index}`,
+        name: "project-context",
+        status: "completed",
+        detail: { type: "plain_text", text: "Project instructions" },
+        metadata: { synthetic: true, customType: "project-context" },
+        error: null,
+      })),
+    );
+  });
+
   test("replays user, assistant, reasoning, and completed tool calls", async () => {
     await expect(
       collectHistory([
@@ -128,14 +157,22 @@ describe("Pi history mapper", () => {
     ]);
   });
 
-  test("replays non-notice custom messages as assistant text, matching the live path", async () => {
+  test("replays custom messages as completed tools, matching the live path", async () => {
     await expect(
       collectHistory([{ role: "custom", content: "Extension command output" }]),
     ).resolves.toEqual([
       {
         type: "timeline",
         provider: "pi",
-        item: { type: "assistant_message", text: "Extension command output" },
+        item: {
+          type: "tool_call",
+          callId: "pi-custom-1",
+          name: "custom-message",
+          status: "completed",
+          detail: { type: "plain_text", text: "Extension command output" },
+          metadata: { synthetic: true, customType: "custom-message" },
+          error: null,
+        },
       },
     ]);
   });
diff --git a/packages/server/src/server/agent/providers/pi/history-mapper.ts b/packages/server/src/server/agent/providers/pi/history-mapper.ts
index cdb2257daa..27a0250b00 100644
--- a/packages/server/src/server/agent/providers/pi/history-mapper.ts
+++ b/packages/server/src/server/agent/providers/pi/history-mapper.ts
@@ -1,11 +1,16 @@
+import { mapCustomMessageToToolCall } from "../custom-message.js";
 import type { AgentStreamEvent, AgentTimelineItem, ToolCallDetail } from "../../agent-sdk-types.js";
+import {
+  createPiExtensionHost,
+  type PiExtensionEventOutput,
+  type PiExtensionHost,
+} from "./extensions/index.js";
 import type { PiAgentMessage, PiImageContent, PiTextContent } from "./rpc-types.js";
 import {
   extractTextFromToolResult,
   mapToolDetail,
   parseToolArgs,
   parseToolResult,
-  resolveToolCallName,
   type PiToolResult,
   type PiTrackedToolCall,
 } from "./tool-call-mapper.js";
@@ -54,13 +59,16 @@ export function getUserMessageText(content: string | (PiTextContent | PiImageCon
 
 export class PiHistoryMapper {
   private readonly pendingToolCalls = new Map<string, PiTrackedToolCall>();
+  private readonly hydrations: Promise<AgentStreamEvent[]>[] = [];
   private userIndex = 0;
   private assistantIndex = 0;
+  private customIndex = 0;
 
   constructor(
     private readonly provider: string,
     private readonly userEntries: readonly PiCapturedUserMessageEntry[] = [],
     private readonly hooks: PiHistoryMapperHooks = {},
+    private readonly extensionHost: PiExtensionHost = createPiExtensionHost(),
   ) {}
 
   mapMessages(messages: readonly PiAgentMessage[]): AgentStreamEvent[] {
@@ -78,10 +86,7 @@ export class PiHistoryMapper {
           events.push(...this.mapAssistantMessage(message));
           break;
         case "toolResult": {
-          const event = this.mapToolResultMessage(message);
-          if (event) {
-            events.push(event);
-          }
+          events.push(...this.mapToolResultMessage(message));
           break;
         }
         case "bashExecution":
@@ -93,6 +98,10 @@ export class PiHistoryMapper {
     return events;
   }
 
+  async hydrate(): Promise<AgentStreamEvent[]> {
+    return (await Promise.all(this.hydrations)).flat();
+  }
+
   private mapUserMessage(message: Extract<PiAgentMessage, { role: "user" }>): AgentStreamEvent[] {
     const text = getUserMessageText(message.content);
     this.userIndex += 1;
@@ -116,20 +125,30 @@ export class PiHistoryMapper {
   private mapCustomMessage(
     message: Extract<PiAgentMessage, { role: "custom" }>,
   ): AgentStreamEvent[] {
+    const extensionMapping = this.extensionHost.mapCustomMessage(message);
+    const extensionEvents = this.extensionEvents(extensionMapping);
+    if (message.display === false) return extensionEvents;
     const text = getUserMessageText(message.content);
     const mappedEvent = text ? this.hooks.mapCustomMessage?.(text, this.provider) : null;
     if (mappedEvent) {
-      return [mappedEvent];
+      return [...extensionEvents, mappedEvent];
     }
-    return text
-      ? [
-          {
-            type: "timeline",
-            provider: this.provider,
-            item: { type: "assistant_message", text },
-          },
-        ]
-      : [];
+    return [
+      ...extensionEvents,
+      ...(text
+        ? [
+            {
+              type: "timeline",
+              provider: this.provider,
+              item: mapCustomMessageToToolCall(
+                message,
+                text,
+                `${this.provider}-custom-${++this.customIndex}`,
+              ),
+            } as AgentStreamEvent,
+          ]
+        : []),
+    ];
   }
 
   private mapAssistantMessage(
@@ -159,7 +178,14 @@ export class PiHistoryMapper {
       if (content.type === "toolCall") {
         const tracked = parseToolArgs(content.name, content.arguments);
         this.pendingToolCalls.set(content.id, tracked);
-        const detail = this.mapToolDetail(content.id, tracked, null);
+        const mapping = this.extensionHost.mapToolCall({
+          callId: content.id,
+          toolName: tracked.toolName,
+          args: tracked.args,
+          status: "running",
+          result: null,
+        });
+        const detail = this.mapToolDetail(content.id, tracked, null, mapping?.detail);
         if (!detail) {
           continue;
         }
@@ -169,12 +195,13 @@ export class PiHistoryMapper {
           item: {
             type: "tool_call",
             callId: this.resolveToolCallId(content.id, tracked),
-            name: tracked.toolName,
+            name: mapping?.name ?? tracked.toolName,
             status: "running",
             detail,
             error: null,
           },
         });
+        events.push(...this.extensionEvents(mapping));
       }
     }
     return events;
@@ -182,26 +209,42 @@ export class PiHistoryMapper {
 
   private mapToolResultMessage(
     message: Extract<PiAgentMessage, { role: "toolResult" }>,
-  ): AgentStreamEvent | null {
+  ): AgentStreamEvent[] {
     const tracked =
       this.pendingToolCalls.get(message.toolCallId) ?? parseToolArgs(message.toolName, null);
     this.pendingToolCalls.delete(message.toolCallId);
     const result = parseToolResult({ content: message.content, details: message.details });
-    const detail = this.mapToolDetail(message.toolCallId, tracked, result);
+    const mapping = this.extensionHost.mapToolCall({
+      callId: message.toolCallId,
+      toolName: tracked.toolName,
+      args: tracked.args,
+      status: message.isError ? "failed" : "completed",
+      result,
+    });
+    const detail = this.mapToolDetail(message.toolCallId, tracked, result, mapping?.detail);
     if (!detail) {
-      return null;
+      return [];
     }
-    return {
-      type: "timeline",
-      provider: this.provider,
-      item: toToolResultTimelineItem({
-        callId: this.resolveToolCallId(message.toolCallId, tracked),
-        name: resolveToolCallName(tracked, result),
-        isError: Boolean(message.isError),
-        detail,
-        errorText: extractTextFromToolResult(result) ?? "Tool call failed",
-      }),
-    };
+    return [
+      {
+        type: "timeline",
+        provider: this.provider,
+        item: toToolResultTimelineItem({
+          callId: this.resolveToolCallId(message.toolCallId, tracked),
+          name: mapping?.name ?? tracked.toolName,
+          isError: Boolean(message.isError),
+          detail,
+          errorText: extractTextFromToolResult(result) ?? "Tool call failed",
+        }),
+      },
+      ...this.extensionEvents(mapping),
+    ];
+  }
+
+  private extensionEvents(mapping: PiExtensionEventOutput | undefined): AgentStreamEvent[] {
+    if (!mapping) return [];
+    this.hydrations.push(mapping.hydration);
+    return mapping.events;
   }
 
   private mapBashExecutionMessage(
@@ -235,9 +278,12 @@ export class PiHistoryMapper {
     toolCallId: string,
     toolCall: PiTrackedToolCall,
     result: PiToolResult,
+    extensionDetail?: ToolCallDetail,
   ): ToolCallDetail | null {
     const hook = this.hooks.mapToolDetail;
-    return hook ? hook(toolCall, result, { toolCallId }) : mapToolDetail(toolCall, result);
+    return hook
+      ? hook(toolCall, result, { toolCallId })
+      : (extensionDetail ?? mapToolDetail(toolCall, result));
   }
 }
 
@@ -246,13 +292,21 @@ export async function* streamPiHistory(
   messages: PiAgentMessage[],
   userEntries: readonly PiCapturedUserMessageEntry[] = [],
   hooks: PiHistoryMapperHooks = {},
+  // At most eight 2 MiB child files per replay; remaining cards keep their summaries.
+  extensionHost: PiExtensionHost = createPiExtensionHost(undefined, undefined, 16 * 1024 * 1024),
+  signal?: AbortSignal,
 ): AsyncGenerator<AgentStreamEvent> {
-  const mapper = new PiHistoryMapper(provider, userEntries, hooks);
+  const mapper = new PiHistoryMapper(provider, userEntries, hooks, extensionHost);
   for (const event of mapper.mapMessages(messages)) {
+    if (signal?.aborted) return;
     if (event) {
       yield event;
     }
   }
+  for (const event of await mapper.hydrate()) {
+    if (signal?.aborted) return;
+    yield event;
+  }
 }
 
 function toToolResultTimelineItem(input: {
diff --git a/packages/server/src/server/agent/providers/pi/rpc-types.ts b/packages/server/src/server/agent/providers/pi/rpc-types.ts
index f84e0ff69e..3e488c028c 100644
--- a/packages/server/src/server/agent/providers/pi/rpc-types.ts
+++ b/packages/server/src/server/agent/providers/pi/rpc-types.ts
@@ -41,6 +41,9 @@ export type PiAgentMessage =
   | {
       role: "custom";
       content: string | Array<PiTextContent | PiImageContent>;
+      customType?: string;
+      details?: unknown;
+      display?: boolean;
     }
   | {
       role: "assistant";
@@ -74,6 +77,7 @@ export interface PiModel {
   id: string;
   name?: string;
   reasoning?: boolean;
+  thinkingLevelMap?: Record<string, string | null>;
   contextWindow?: number;
   maxTokens?: number;
   api?: string;
@@ -156,6 +160,7 @@ export type PiAssistantMessageEvent =
   | { type: "start" | "text_start" | "text_end" | "thinking_start" | "thinking_end" | "done" };
 
 export type PiAgentSessionEvent =
+  | { type: "thinking_level_changed"; level: PiThinkingLevel }
   | { type: "agent_start" }
   | { type: "turn_start" }
   | { type: "message_start"; message: PiAgentMessage }
diff --git a/packages/server/src/server/agent/providers/pi/runtime.ts b/packages/server/src/server/agent/providers/pi/runtime.ts
index 3582a902bd..1064952e6d 100644
--- a/packages/server/src/server/agent/providers/pi/runtime.ts
+++ b/packages/server/src/server/agent/providers/pi/runtime.ts
@@ -40,6 +40,7 @@ export interface PiStartSessionInput {
 }
 
 export interface PiRuntimeSession {
+  readonly environment: Record<string, string>;
   onEvent(callback: (event: PiRuntimeEvent) => void): () => void;
   prompt(
     message: string,
diff --git a/packages/server/src/server/agent/providers/pi/test-utils/fake-pi.ts b/packages/server/src/server/agent/providers/pi/test-utils/fake-pi.ts
index b1d369eb85..b8c7930bc4 100644
--- a/packages/server/src/server/agent/providers/pi/test-utils/fake-pi.ts
+++ b/packages/server/src/server/agent/providers/pi/test-utils/fake-pi.ts
@@ -57,6 +57,7 @@ export class FakePi implements PiRuntime {
   private readonly command: [string, ...string[]];
   private readonly queuedCommands: PiRpcSlashCommand[][] = [];
   private readonly queuedSessionSetups: Array<(session: FakePiSession) => void> = [];
+  private readonly removedModels = new Set<string>();
 
   constructor(command: [string, ...string[]] = ["pi"]) {
     this.command = command;
@@ -68,7 +69,10 @@ export class FakePi implements PiRuntime {
       session: input,
     });
     this.recordedLaunches.push(launch);
-    const session = new FakePiSession(launch);
+    if (launch.model && this.removedModels.has(launch.model)) {
+      throw new Error(`Model "${launch.model}" not found`);
+    }
+    const session = new FakePiSession(launch, this.removedModels);
     session.commands = this.queuedCommands.shift() ?? [];
     this.queuedSessionSetups.shift()?.(session);
     this.sessions.push(session);
@@ -83,6 +87,11 @@ export class FakePi implements PiRuntime {
     this.queuedSessionSetups.push(setup);
   }
 
+  // Pi refuses to launch with, or switch to, a model it no longer knows.
+  removeModel(modelId: string): void {
+    this.removedModels.add(modelId);
+  }
+
   latestSession(): FakePiSession {
     const session = this.sessions.at(-1);
     if (!session) {
@@ -93,6 +102,7 @@ export class FakePi implements PiRuntime {
 }
 
 export class FakePiSession implements PiRuntimeSession {
+  readonly environment: Record<string, string>;
   readonly prompts: Array<{ message: string; imageCount: number }> = [];
   readonly steerCalls: Array<{ message: string; imageCount: number }> = [];
   steerError: Error | null = null;
@@ -108,7 +118,10 @@ export class FakePiSession implements PiRuntimeSession {
   readonly handoffRequests: Array<{ customInstructions?: string }> = [];
   readonly sessionNameRequests: string[] = [];
   readonly rawFrames: Array<object & { type: string }> = [];
-  capturedUserEntries: Array<{ id: string; parentId: string | null; text: string }> = [];
+  // Every user entry in the session file, including rewound and compacted ones.
+  treeUserEntries: FakePiUserEntry[] = [];
+  // The user entries on the current branch that getMessages() replays.
+  contextUserEntries: FakePiUserEntry[] = [];
   abortRequested = false;
   readonly canceledExtensionUiRequests: string[] = [];
   readonly extensionUiResponses: Array<{
@@ -141,7 +154,11 @@ export class FakePiSession implements PiRuntimeSession {
   private activeHeldPrompt: { promise: Promise<void>; reject: (error: Error) => void } | null =
     null;
 
-  constructor(launch: PiRuntimeLaunch) {
+  constructor(
+    launch: PiRuntimeLaunch,
+    private readonly removedModels: ReadonlySet<string> = new Set(),
+  ) {
+    this.environment = launch.env ?? {};
     this.state = {
       model: null,
       thinkingLevel: "medium",
@@ -262,9 +279,13 @@ export class FakePiSession implements PiRuntimeSession {
 
   async setModel(provider: string, modelId: string): Promise<PiModel> {
     this.setModelRequests.push({ provider, modelId });
+    if (this.removedModels.has(`${provider}/${modelId}`)) {
+      throw new Error(`Model not found: ${provider}/${modelId}`);
+    }
     if (!this.setModelResult) {
       throw new Error("FakePi setModel requires setModelResult to be scripted");
     }
+    this.state = { ...this.state, model: this.setModelResult };
     return this.setModelResult;
   }
 
@@ -453,7 +474,8 @@ export class FakePiSession implements PiRuntimeSession {
       message: `PASEO_ENTRY_CAPTURE ${JSON.stringify({
         reason,
         requestId,
-        entries: this.capturedUserEntries,
+        treeEntries: this.treeUserEntries,
+        contextEntries: this.contextUserEntries,
       })}`,
     });
   }
diff --git a/packages/server/src/server/agent/providers/pi/tool-call-mapper.test.ts b/packages/server/src/server/agent/providers/pi/tool-call-mapper.test.ts
index 224e861769..63b557f994 100644
--- a/packages/server/src/server/agent/providers/pi/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/pi/tool-call-mapper.test.ts
@@ -1,11 +1,6 @@
 import { describe, expect, test } from "vitest";
 
-import {
-  mapToolDetail,
-  parseToolArgs,
-  parseToolResult,
-  resolveToolCallName,
-} from "./tool-call-mapper.js";
+import { mapToolDetail, parseToolArgs, parseToolResult } from "./tool-call-mapper.js";
 
 describe("Pi tool call mapper", () => {
   test("maps bash args and result to shell detail", () => {
@@ -50,81 +45,6 @@ describe("Pi tool call mapper", () => {
     });
   });
 
-  test("maps executed xdev writes to their wrapped tool detail", () => {
-    const toolCall = parseToolArgs("write", {
-      path: "xd://browser",
-      content: "{}",
-    });
-    const result = parseToolResult({
-      content: [{ type: "text", text: "Opened Example Domain" }],
-      details: {
-        xdev: {
-          tool: "browser",
-          mode: "execute",
-          args: { action: "open", url: "https://example.com" },
-          inner: { title: "Example Domain" },
-        },
-      },
-    });
-
-    expect(mapToolDetail(toolCall, result)).toEqual({
-      type: "unknown",
-      input: { action: "open", url: "https://example.com" },
-      output: {
-        content: [{ type: "text", text: "Opened Example Domain" }],
-        details: { title: "Example Domain" },
-      },
-    });
-    expect(resolveToolCallName(toolCall, result)).toBe("browser");
-  });
-
-  test("does not treat xdev help metadata as an executed inner tool", () => {
-    const toolCall = parseToolArgs("write", {
-      path: "xd://browser",
-      content: "",
-    });
-    const result = parseToolResult({
-      details: {
-        xdev: {
-          tool: "browser",
-          mode: "help",
-          inner: "Browser help",
-        },
-      },
-    });
-
-    expect(mapToolDetail(toolCall, result)).toEqual({
-      type: "unknown",
-      input: { path: "xd://browser", content: "" },
-      output: result,
-    });
-    expect(resolveToolCallName(toolCall, result)).toBe("write");
-  });
-
-  test("does not treat malformed xdev metadata as an executed inner tool", () => {
-    const toolCall = parseToolArgs("write", {
-      path: "xd://browser",
-      content: "{}",
-    });
-    const result = parseToolResult({
-      details: {
-        xdev: {
-          tool: "",
-          mode: "execute",
-          args: { action: "open" },
-          inner: { title: "must not surface" },
-        },
-      },
-    });
-
-    expect(mapToolDetail(toolCall, result)).toEqual({
-      type: "unknown",
-      input: { path: "xd://browser", content: "{}" },
-      output: result,
-    });
-    expect(resolveToolCallName(toolCall, result)).toBe("write");
-  });
-
   test("preserves unknown tool input and parsed output", () => {
     const toolCall = parseToolArgs("custom_tool", { value: 42 });
     const result = parseToolResult({ text: "custom result" });
@@ -135,61 +55,4 @@ describe("Pi tool call mapper", () => {
       output: { text: "custom result" },
     });
   });
-
-  test("maps task calls to sub-agent detail while running", () => {
-    const toolCall = parseToolArgs("task", {
-      agent: "explore",
-      task: "Trace the Pi provider tool mapper",
-    });
-
-    expect(mapToolDetail(toolCall, null)).toEqual({
-      type: "sub_agent",
-      subAgentType: "explore",
-      description: "Trace the Pi provider tool mapper",
-      log: "",
-    });
-  });
-
-  test("maps completed subagent calls with task input to sub-agent detail", () => {
-    const toolCall = parseToolArgs("subagent", {
-      agent: "reviewer",
-      task: "Review the Pi mapper change",
-    });
-    const result = parseToolResult({
-      content: [{ type: "text", text: "The mapper change preserves provider status." }],
-    });
-
-    expect(mapToolDetail(toolCall, result)).toEqual({
-      type: "sub_agent",
-      subAgentType: "reviewer",
-      description: "Review the Pi mapper change",
-      log: "The mapper change preserves provider status.",
-    });
-  });
-
-  test("normalizes Pi MCP proxy calls from requested tool args while running", () => {
-    const toolCall = parseToolArgs("mcp", {
-      tool: "paseo_list_models",
-      args: '{"provider":"pi"}',
-    });
-
-    expect(resolveToolCallName(toolCall, null)).toBe("paseo.list_models");
-  });
-
-  test("normalizes Pi MCP proxy calls from result details when completed", () => {
-    const toolCall = parseToolArgs("mcp", {
-      tool: "paseo_list_models",
-      args: '{"provider":"pi"}',
-    });
-    const result = parseToolResult({
-      content: [{ type: "text", text: "(empty result)" }],
-      details: {
-        mode: "call",
-        server: "paseo",
-        tool: "list_models",
-      },
-    });
-
-    expect(resolveToolCallName(toolCall, result)).toBe("paseo.list_models");
-  });
 });
diff --git a/packages/server/src/server/agent/providers/pi/tool-call-mapper.ts b/packages/server/src/server/agent/providers/pi/tool-call-mapper.ts
index 499627377e..8c18a8fdbf 100644
--- a/packages/server/src/server/agent/providers/pi/tool-call-mapper.ts
+++ b/packages/server/src/server/agent/providers/pi/tool-call-mapper.ts
@@ -59,11 +59,7 @@ interface PiToolResultObject {
 
 interface PiToolResultDetails {
   diff?: string;
-  mode?: string;
-  server?: string;
-  tool?: string;
-  mcpResult?: unknown;
-  xdev?: unknown;
+  [key: string]: unknown;
 }
 
 interface PiToolResultTextContent {
@@ -163,13 +159,6 @@ const PiToolResultDetailsSchema = z
   })
   .passthrough();
 
-const XdevExecuteDetailsSchema = z.object({
-  tool: z.string().trim().min(1),
-  mode: z.literal("execute"),
-  args: z.unknown().optional(),
-  inner: z.unknown().optional(),
-});
-
 const PiToolResultObjectSchema = z
   .object({
     output: z.string().optional(),
@@ -184,14 +173,6 @@ const PiToolResultObjectSchema = z
 
 const PiToolResultSchema = z.union([z.string(), PiToolResultObjectSchema, z.null()]);
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function readNonEmptyString(value: unknown): string | undefined {
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
-}
-
 const BashToolInputSchema: z.ZodType<BashToolInput> = z.object({
   command: z.string(),
   timeout: z.number().optional(),
@@ -295,55 +276,9 @@ export function parseToolArgs(toolName: string, rawArgs: unknown): PiTrackedTool
   return { kind: "unknown", toolName, args: rawArgs ?? null };
 }
 
-function stripMcpProxyPrefix(toolName: string, serverName: string): string {
-  const prefix = `${serverName}_`;
-  return toolName.startsWith(prefix) ? toolName.slice(prefix.length) : toolName;
-}
-
-export function resolveToolCallName(toolCall: PiTrackedToolCall, result?: PiToolResult): string {
-  if (toolCall.kind === "write" && result && typeof result !== "string") {
-    const xdev = XdevExecuteDetailsSchema.safeParse(result.details?.xdev);
-    if (xdev.success) {
-      return xdev.data.tool;
-    }
-  }
-
-  if (toolCall.toolName !== "mcp") {
-    return toolCall.toolName;
-  }
-
-  if (result && typeof result !== "string") {
-    const serverName = readNonEmptyString(result.details?.server);
-    const toolName = readNonEmptyString(result.details?.tool);
-    if (serverName && toolName) {
-      return `${serverName}.${toolName}`;
-    }
-  }
-
-  if (isRecord(toolCall.args)) {
-    const requestedTool = readNonEmptyString(toolCall.args.tool);
-    const requestedServer = readNonEmptyString(toolCall.args.server);
-    if (requestedTool && requestedServer) {
-      return `${requestedServer}.${stripMcpProxyPrefix(requestedTool, requestedServer)}`;
-    }
-    if (requestedTool) {
-      const [serverName, ...toolParts] = requestedTool.split("_");
-      if (serverName && toolParts.length > 0) {
-        return `${serverName}.${toolParts.join("_")}`;
-      }
-    }
-  }
-
-  return toolCall.toolName;
-}
-
 export function mapToolDetail(toolCall: PiTrackedToolCall, result?: PiToolResult): ToolCallDetail {
   const parsedResult = result ?? null;
 
-  if (isTaskToolCall(toolCall)) {
-    return mapTaskToolDetail(toolCall.args, parsedResult);
-  }
-
   switch (toolCall.kind) {
     case "bash": {
       const summary = resolveToolCallOutput(parsedResult);
@@ -376,7 +311,7 @@ export function mapToolDetail(toolCall: PiTrackedToolCall, result?: PiToolResult
       };
     }
     case "write":
-      return mapWriteToolDetail(toolCall.args, parsedResult);
+      return { type: "write", filePath: toolCall.args.path, content: toolCall.args.content };
     case "find":
       return mapFindToolDetail(toolCall.args, parsedResult);
     case "grep":
@@ -392,58 +327,6 @@ export function mapToolDetail(toolCall: PiTrackedToolCall, result?: PiToolResult
   }
 }
 
-function isTaskToolCall(toolCall: PiTrackedToolCall): boolean {
-  if (toolCall.toolName === "task") {
-    return true;
-  }
-  if (toolCall.toolName !== "subagent" || !isRecord(toolCall.args)) {
-    return false;
-  }
-  return (
-    toolCall.args.action === undefined &&
-    (readNonEmptyString(toolCall.args.agent) !== undefined ||
-      readNonEmptyString(toolCall.args.task) !== undefined)
-  );
-}
-
-function mapTaskToolDetail(args: unknown, result: PiToolResult): ToolCallDetail {
-  const argRecord = isRecord(args) ? args : {};
-  return {
-    type: "sub_agent",
-    subAgentType: readNonEmptyString(argRecord.agent),
-    description: readNonEmptyString(argRecord.task),
-    log: extractTextFromToolResult(result)?.trim() ?? "",
-  };
-}
-
-function mapWriteToolDetail(args: WriteToolInput, result: PiToolResult): ToolCallDetail {
-  if (result && typeof result !== "string" && result.details && "xdev" in result.details) {
-    const xdev = XdevExecuteDetailsSchema.safeParse(result.details.xdev);
-    if (xdev.success) {
-      return {
-        type: "unknown",
-        input: xdev.data.args ?? null,
-        output: {
-          ...result,
-          details: xdev.data.inner ?? null,
-        },
-      };
-    }
-
-    return {
-      type: "unknown",
-      input: args,
-      output: result,
-    };
-  }
-
-  return {
-    type: "write",
-    filePath: args.path,
-    content: args.content,
-  };
-}
-
 function resolveToolCallOutput(result: PiToolResult): ToolCallOutputSummary {
   if (typeof result === "string") {
     return { output: result };
diff --git a/packages/server/src/server/agent/providers/provider-windows-launch.test.ts b/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
index 93ea5e526c..1f48d7edfe 100644
--- a/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
+++ b/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
@@ -90,7 +90,7 @@ if (${JSON.stringify(launchMode)} === "piRuntime") {
   });
   process.stdin.on("end", () => process.exit(0));
 } else {
-  console.log("ARGV_OK");
+  process.stdout.write("ARGV_OK\\n", () => process.exit(0));
 }
 `,
   );
diff --git a/packages/server/src/server/agent/providers/test-utils/session-stream-adapter.ts b/packages/server/src/server/agent/providers/test-utils/session-stream-adapter.ts
index 5cd550a730..e49a57e309 100644
--- a/packages/server/src/server/agent/providers/test-utils/session-stream-adapter.ts
+++ b/packages/server/src/server/agent/providers/test-utils/session-stream-adapter.ts
@@ -76,3 +76,15 @@ export async function* streamSession(
     }
   }
 }
+
+export async function collectSessionTurnEvents(
+  session: Pick<AgentSession, "startTurn" | "subscribe">,
+  prompt: AgentPromptInput,
+  options?: AgentRunOptions,
+): Promise<AgentStreamEvent[]> {
+  const events: AgentStreamEvent[] = [];
+  for await (const event of streamSession(session, prompt, options)) {
+    events.push(event);
+  }
+  return events;
+}
diff --git a/packages/server/src/server/agent/providers/tool-call-mapper-utils.ts b/packages/server/src/server/agent/providers/tool-call-mapper-utils.ts
index 281a2bcf32..cd0e4776b7 100644
--- a/packages/server/src/server/agent/providers/tool-call-mapper-utils.ts
+++ b/packages/server/src/server/agent/providers/tool-call-mapper-utils.ts
@@ -7,6 +7,7 @@ const FAILED_STATUS_VOCAB = new Set([
   "errored",
   "rejected",
   "denied",
+  "declined",
 ]);
 const CANCELED_STATUS_VOCAB = new Set(["canceled", "cancelled", "interrupted", "aborted"]);
 const COMPLETED_STATUS_VOCAB = new Set(["completed", "complete", "done", "success", "succeeded"]);
diff --git a/packages/server/src/server/agent/providers/trae-acp-agent.ts b/packages/server/src/server/agent/providers/trae-acp-agent.ts
index b1e0893e4b..c14525211e 100644
--- a/packages/server/src/server/agent/providers/trae-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/trae-acp-agent.ts
@@ -8,7 +8,6 @@ interface TraeACPAgentClientOptions {
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
-  providerParams?: unknown;
 }
 
 const TRAE_INITIAL_COMMANDS_WAIT_TIMEOUT_MS = 10_000;
@@ -21,7 +20,6 @@ export class TraeACPAgentClient extends GenericACPAgentClient {
       env: options.env,
       providerId: options.providerId,
       label: options.label,
-      providerParams: options.providerParams,
       // traecli publishes slash commands and skills asynchronously via available_commands_update.
       waitForInitialCommands: true,
       initialCommandsWaitTimeoutMs: TRAE_INITIAL_COMMANDS_WAIT_TIMEOUT_MS,
diff --git a/packages/server/src/server/agent/rewind/rewind.test.ts b/packages/server/src/server/agent/rewind/rewind.test.ts
index 7040c42e3e..df5c242251 100644
--- a/packages/server/src/server/agent/rewind/rewind.test.ts
+++ b/packages/server/src/server/agent/rewind/rewind.test.ts
@@ -82,10 +82,11 @@ describe("AgentManager rewind", () => {
 
   test("replaces the canonical epoch without replaying reconstructed parent rows", async () => {
     const { manager, session, agentId } = await createRewindHarness();
-    session.history = Array.from({ length: 250 }, (_, index) => ({
+    const history = Array.from({ length: 250 }, (_, index) => ({
       type: "assistant_message" as const,
       text: `rewound ${index}`,
     }));
+    session.history = history;
     const epochBefore = manager.fetchTimeline(agentId, { limit: 0 }).epoch;
     const events: string[] = [];
     const unsubscribe = manager.subscribe((event) => events.push(event.type), {
@@ -97,7 +98,18 @@ describe("AgentManager rewind", () => {
 
     const replacement = manager.fetchTimeline(agentId, { limit: 0 });
     expect(replacement.epoch).not.toBe(epochBefore);
-    expect(replacement.rows).toHaveLength(250);
+    expect(replacement.rows).toEqual([
+      expect.objectContaining({
+        seq: 250,
+        seqStart: 1,
+        seqEnd: 250,
+        sourceSeqRanges: [{ startSeq: 1, endSeq: 250 }],
+        item: {
+          type: "assistant_message",
+          text: history.map((item) => item.text).join(""),
+        },
+      }),
+    ]);
     expect(events.filter((type) => type === "agent_stream")).toEqual([]);
   });
 
diff --git a/packages/server/src/server/agent/stale-provider-session-error.ts b/packages/server/src/server/agent/stale-provider-session-error.ts
new file mode 100644
index 0000000000..7039da3c61
--- /dev/null
+++ b/packages/server/src/server/agent/stale-provider-session-error.ts
@@ -0,0 +1,11 @@
+/** Thrown when a prompt reaches a plugin session whose connection died with its plugin. */
+export class StaleProviderSessionError extends Error {
+  constructor(sessionId: string) {
+    super(`Provider session ${sessionId} is stale after its plugin reloaded`);
+    this.name = "StaleProviderSessionError";
+  }
+}
+
+export function isStaleProviderSessionError(error: unknown): error is StaleProviderSessionError {
+  return error instanceof StaleProviderSessionError;
+}
diff --git a/packages/server/src/server/agent/timeline-projection.ts b/packages/server/src/server/agent/timeline-projection.ts
index cbcde7944e..1f72cdc498 100644
--- a/packages/server/src/server/agent/timeline-projection.ts
+++ b/packages/server/src/server/agent/timeline-projection.ts
@@ -1,7 +1,8 @@
 import type { AgentTimelineItem, ToolCallDetail } from "./agent-sdk-types.js";
-import type { AgentTimelineRow } from "./agent-manager.js";
 import { timelineItemIdentity } from "@getpaseo/protocol/timeline-identity";
 
+import type { AgentTimelineRow } from "./agent-timeline-store-types.js";
+
 export type TimelineProjectionMode = "canonical" | "projected";
 
 export interface TimelineSeqRange {
@@ -19,6 +20,7 @@ export type TimelineLimitDirection = "tail" | "before" | "after";
 export interface TimelineProjectionEntry {
   item: AgentTimelineItem;
   turnId?: string;
+  providerMessageId?: string;
   timestamp: string;
   seqStart: number;
   seqEnd: number;
@@ -54,7 +56,7 @@ function appendSeqToRanges(ranges: TimelineSeqRange[], seq: number): TimelineSeq
   }
 
   if (seq <= last.endSeq + 1) {
-    last.endSeq = Math.max(last.endSeq, seq);
+    next[next.length - 1] = { ...last, endSeq: Math.max(last.endSeq, seq) };
     return next;
   }
 
@@ -85,7 +87,8 @@ function mergeToolCallDetail(existing: ToolCallDetail, incoming: ToolCallDetail)
   return incoming;
 }
 
-function mergeToolCallItems(
+/** Fold a later update for the same tool call into the one it follows. */
+export function mergeToolCallItems(
   existing: Extract<AgentTimelineItem, { type: "tool_call" }>,
   incoming: Extract<AgentTimelineItem, { type: "tool_call" }>,
 ): Extract<AgentTimelineItem, { type: "tool_call" }> {
@@ -114,15 +117,19 @@ function mergeToolCallItems(
 }
 
 function makeCanonicalEntries(rows: readonly AgentTimelineRow[]): WorkingEntry[] {
-  return rows.map((row) => ({
-    item: row.item,
-    ...(row.turnId ? { turnId: row.turnId } : {}),
-    timestamp: row.timestamp,
-    seqStart: row.seq,
-    seqEnd: row.seq,
-    sourceSeqRanges: [{ startSeq: row.seq, endSeq: row.seq }],
-    collapsed: [],
-  }));
+  return rows.map((row) => {
+    if ("seqStart" in row) return { ...(row as ProjectedTimelineRow) };
+    return {
+      item: row.item,
+      timestamp: row.timestamp,
+      ...(row.turnId ? { turnId: row.turnId } : {}),
+      ...(row.providerMessageId ? { providerMessageId: row.providerMessageId } : {}),
+      seqStart: row.seq,
+      seqEnd: row.seq,
+      sourceSeqRanges: [{ startSeq: row.seq, endSeq: row.seq }],
+      collapsed: [],
+    };
+  });
 }
 
 function mergeIdentityMetadata(
@@ -285,6 +292,54 @@ function mergeAssistantChunks(entries: readonly WorkingEntry[]): WorkingEntry[]
   return output;
 }
 
+/** A retained item. `seq` is its latest source event, not its display anchor. */
+export type ProjectedTimelineRow = AgentTimelineRow & TimelineProjectionEntry;
+
+/** Owns projected state; source events are consumed, never retained. */
+export class TimelineProjection {
+  private readonly rows: ProjectedTimelineRow[] = [];
+  private readonly identities = new Map<string, number>();
+
+  append(row: AgentTimelineRow): void {
+    const entry = makeCanonicalEntries([row])[0];
+    const identity = timelineItemIdentity(row.item);
+    const index = identity === null ? undefined : this.identities.get(identity);
+    const existing = index === undefined ? undefined : this.rows[index];
+    const merged = existing ? mergeIdentityEntries(existing, entry) : null;
+    if (merged && index !== undefined) {
+      this.rows[index] = { ...merged, seq: merged.seqEnd };
+      return;
+    }
+    const previous = this.rows.at(-1);
+    const adjacent = previous
+      ? mergeReasoningChunks(mergeAssistantChunks([previous, entry]))
+      : [entry];
+    if (previous && adjacent.length === 1) {
+      const mergedText = adjacent[0];
+      this.rows[this.rows.length - 1] = { ...mergedText, seq: mergedText.seqEnd };
+      return;
+    }
+    if (identity !== null) this.identities.set(identity, this.rows.length);
+    this.rows.push({ ...entry, seq: entry.seqEnd });
+  }
+
+  getRows(): ProjectedTimelineRow[] {
+    return this.rows.map((row) => ({ ...row }));
+  }
+
+  enrichSubmittedUserMessage(
+    clientMessageId: string,
+    providerMessageId: string,
+  ): ProjectedTimelineRow | null {
+    const index = this.rows.findIndex(
+      (row) => row.item.type === "user_message" && row.item.clientMessageId === clientMessageId,
+    );
+    if (index < 0) return null;
+    this.rows[index] = { ...this.rows[index], providerMessageId };
+    return { ...this.rows[index] };
+  }
+}
+
 export function projectTimelineRows(input: {
   rows: readonly AgentTimelineRow[];
   mode: TimelineProjectionMode;
@@ -397,7 +452,11 @@ function getTimelineBounds(
   if (!first || !last) {
     return null;
   }
-  return { minSeq: first.seq, maxSeq: last.seq };
+  const entries = makeCanonicalEntries(rows);
+  return {
+    minSeq: entries.reduce((min, e) => Math.min(min, e.seqStart), Infinity),
+    maxSeq: entries.reduce((max, e) => Math.max(max, e.seqEnd), 0),
+  };
 }
 
 function firstSourceSeqInRange(
@@ -420,7 +479,6 @@ interface ProjectedEntryCandidate {
 
 function selectProjectedEntriesAfter(input: {
   entries: readonly TimelineProjectionEntry[];
-  rows: readonly AgentTimelineRow[];
   startSeq: number;
   maxSeq: number;
   limit: number;
@@ -445,16 +503,10 @@ function selectProjectedEntriesAfter(input: {
   // Wide projected entries can include future, discontiguous source ranges. The
   // page cursor advances only through source rows covered without a gap.
   let endSeq = input.startSeq - 1;
-  let rangeIndex = 0;
-  for (const row of input.rows) {
-    if (row.seq < input.startSeq) continue;
-    if (row.seq > input.maxSeq || row.seq !== endSeq + 1) break;
-    while (selectedRanges[rangeIndex] && selectedRanges[rangeIndex].endSeq < row.seq) {
-      rangeIndex += 1;
-    }
-    const range = selectedRanges[rangeIndex];
-    if (!range || row.seq < range.startSeq || row.seq > range.endSeq) break;
-    endSeq = row.seq;
+  for (const range of selectedRanges) {
+    if (range.endSeq <= endSeq) continue;
+    if (range.startSeq > endSeq + 1) break;
+    endSeq = Math.min(range.endSeq, input.maxSeq);
   }
 
   return {
@@ -484,6 +536,27 @@ function selectProjectedEntriesBefore(input: {
   };
 }
 
+function selectProjectedEntriesTail(
+  projectedAll: TimelineProjectionEntry[],
+  limit: number,
+  bounds: { minSeq: number; maxSeq: number },
+): ProjectedTimelinePageSelection {
+  let start = limit === 0 ? 0 : Math.max(0, projectedAll.length - limit);
+  // Include earlier display anchors with updates in the selected source window,
+  // so a tail certifies contiguous coverage even with interleaved tool updates.
+  for (let i = start - 1; i >= 0; i--) {
+    if (projectedAll[i].seqEnd >= projectedAll[start].seqStart) start = i;
+  }
+  const selected = projectedAll.slice(start);
+  return {
+    entries: selected,
+    startSeq: selected[0]?.seqStart ?? null,
+    endSeq: bounds.maxSeq,
+    hasOlder: start > 0,
+    hasNewer: false,
+  };
+}
+
 export function selectProjectedTimelinePage(input: {
   rows: readonly AgentTimelineRow[];
   bounds?: { minSeq: number; maxSeq: number };
@@ -535,18 +608,7 @@ export function selectProjectedTimelinePage(input: {
   }
 
   if (input.direction === "tail") {
-    const selected = selectTimelineWindowByProjectedLimit({
-      rows: input.rows,
-      direction: "tail",
-      limit,
-    });
-    return {
-      entries: selected.projectedEntries,
-      startSeq: selected.minSeq,
-      endSeq: selected.maxSeq,
-      hasOlder: selected.minSeq !== null && selected.minSeq > bounds.minSeq,
-      hasNewer: false,
-    };
+    return selectProjectedEntriesTail(projectedAll, limit, bounds);
   }
 
   if (input.direction === "after") {
@@ -554,7 +616,6 @@ export function selectProjectedTimelinePage(input: {
     const startSeq = Math.max(bounds.minSeq, cursorSeq + 1);
     const selected = selectProjectedEntriesAfter({
       entries: projectedAll,
-      rows: input.rows,
       startSeq,
       maxSeq: bounds.maxSeq,
       limit,
diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index fcc314ac11..dae9c16f4f 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -1,3 +1,5 @@
+import { AgentDirectory } from "../directory.js";
+import { stat } from "node:fs/promises";
 import { z } from "zod";
 import { ensureValidJson } from "../../json-utils.js";
 import type { Logger } from "pino";
@@ -58,9 +60,13 @@ import {
   sanitizePermissionRequest,
   serializeSnapshotWithMetadata,
   toScheduleSummary,
-  waitForAgentWithTimeout,
 } from "../mcp-shared.js";
-import { sendPromptToAgent, setupFinishNotification } from "../agent-prompt.js";
+import {
+  type PromptDispatchDisposition,
+  sendPromptToAgent,
+  setupFinishNotification,
+  waitForAgentRunStartWithTimeout,
+} from "../agent-prompt.js";
 import { respondToAgentPermission } from "../permission-response.js";
 import {
   archiveAgentCommand,
@@ -92,6 +98,8 @@ import type {
   PaseoToolExecutionContext,
   PaseoToolResult,
 } from "./types.js";
+import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
+import { isPaseoToolEnabled } from "../paseo-tool-policy.js";
 
 export interface PaseoToolHostDependencies {
   agentManager: AgentManager;
@@ -104,7 +112,7 @@ export interface PaseoToolHostDependencies {
   github?: ForgeService;
   workspaceGitService?: Pick<
     WorkspaceGitService,
-    "getSnapshot" | "listWorktrees" | "resolveRepoRoot"
+    "getSnapshot" | "listWorktrees" | "resolveRepoRoot" | "invalidateWorktrees"
   >;
   findWorkspaceIdForCwd?: ArchiveDependencies["findWorkspaceIdForCwd"];
   listActiveWorkspaces?: ArchiveDependencies["listActiveWorkspaces"];
@@ -116,6 +124,7 @@ export interface PaseoToolHostDependencies {
     cwd: string,
     title?: string | null,
     projectId?: string,
+    context?: { background?: boolean; callerWorkspaceId?: string },
   ) => Promise<PersistedWorkspaceRecord>;
   workspaceScripts?: Pick<WorkspaceScriptsService, "list" | "launch" | "stop">;
   markWorkspaceArchiving?: ArchiveDependencies["markWorkspaceArchiving"];
@@ -125,9 +134,11 @@ export interface PaseoToolHostDependencies {
   ensureWorkspaceForCreate?: (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ) => Promise<string>;
   browserToolsEnabled?: boolean;
   browserToolsBroker?: BrowserToolsBroker | null;
+  paseoToolPolicy?: ProviderPaseoToolsPolicy;
   paseoHome?: string;
   worktreesRoot?: string;
   /**
@@ -181,6 +192,7 @@ const WorkspaceAutomationSummarySchema = z.object({
   isolation: z.enum(["local", "worktree"]),
   kind: z.enum(["directory", "local_checkout", "worktree"]),
   title: z.string().nullable(),
+  background: z.boolean().optional(),
 });
 
 function toWorkspaceAutomationSummary(workspace: PersistedWorkspaceRecord) {
@@ -191,6 +203,7 @@ function toWorkspaceAutomationSummary(workspace: PersistedWorkspaceRecord) {
     isolation: workspace.kind === "worktree" ? ("worktree" as const) : ("local" as const),
     kind: workspace.kind,
     title: workspace.title,
+    background: workspace.background,
   };
 }
 
@@ -220,6 +233,20 @@ function assertOptionsAbsent(
   }
 }
 
+async function isExistingDirectory(path: string): Promise<boolean> {
+  try {
+    return (await stat(path)).isDirectory();
+  } catch (error) {
+    if (isMissingPathError(error)) return false;
+    throw error;
+  }
+}
+
+function isMissingPathError(error: unknown): boolean {
+  if (typeof error !== "object" || error === null || !("code" in error)) return false;
+  return error.code === "ENOENT" || error.code === "ENOTDIR";
+}
+
 function resolveWorkspaceWorktreeTarget(input: WorkspaceWorktreeOptions): WorkspaceWorktreeTarget {
   switch (input.mode ?? "branch-off") {
     case "branch-off":
@@ -576,6 +603,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Tool handlers are schema-validated at registration boundaries.
     handler: (input: any, context: PaseoToolExecutionContext) => Promise<PaseoToolResult>,
   ) => {
+    if (!isPaseoToolEnabled(options.paseoToolPolicy, name)) {
+      return;
+    }
     tools.set(name, {
       name,
       title: config.title,
@@ -1022,13 +1052,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const canonicalTopLevelInputSchema = {
     ...canonicalCreateAgentFields,
-    background: z
-      .boolean()
-      .optional()
-      .default(false)
-      .describe(
-        "Run agent in background. If false (default), waits for completion or permission request. If true, returns immediately.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1046,7 +1069,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     ...commonCreateAgentFields,
     relationship: legacyCreateAgentPlacementFields.relationship.optional(),
     workspace: legacyCreateAgentPlacementFields.workspace.optional(),
-    background: canonicalTopLevelInputSchema.background,
     notifyOnFinish: canonicalTopLevelInputSchema.notifyOnFinish,
     cwd: z
       .string()
@@ -1104,13 +1126,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const agentToAgentSendAgentPromptInputSchema = {
     ...commonSendAgentPromptInputSchema,
-    background: z
-      .boolean()
-      .optional()
-      .default(true)
-      .describe(
-        "Run agent in background. Agent-scoped default is true so you can continue until the finish notification arrives. Set false only when you need a blocking response.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1121,13 +1136,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const topLevelSendAgentPromptInputSchema = {
     ...commonSendAgentPromptInputSchema,
-    background: z
-      .boolean()
-      .optional()
-      .default(false)
-      .describe(
-        "Run agent in background. If false (default), waits for completion or permission request. If true, returns immediately.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1219,9 +1227,17 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         path: z
           .string()
           .optional()
-          .describe("Local directory or source checkout. Defaults to your current workspace."),
+          .describe(
+            "Local directory or source checkout. Defaults to your current workspace. Local isolation adopts an existing directory and never creates one.",
+          ),
         projectId: z.string().optional().describe("Existing project id to own the workspace."),
         title: z.string().trim().min(1).optional(),
+        background: z
+          .boolean()
+          .optional()
+          .describe(
+            "True hides the workspace from default lists and the sidebar while its contents remain durable and accessible; omit background to inherit your current workspace’s value (false without a caller), and override it only when the user explicitly asks.",
+          ),
         mode: z
           .enum(["branch-off", "checkout-branch", "checkout-pr"])
           .optional()
@@ -1260,6 +1276,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       path,
       projectId,
       title,
+      background,
       mode,
       worktreeSlug,
       branchName,
@@ -1271,6 +1288,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       let workspace: PersistedWorkspaceRecord;
       if (isolation === "local") {
         const cwd = resolveScopedCwd(path, { required: true });
+        if (!(await isExistingDirectory(cwd))) {
+          throw new Error(`Directory not found: ${cwd}`);
+        }
         assertOptionsAbsent(
           [
             ["mode", mode],
@@ -1286,7 +1306,10 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         if (!options.createDirectoryWorkspace) {
           throw new Error("Workspace provisioning is not configured");
         }
-        workspace = await options.createDirectoryWorkspace(cwd, title, projectId);
+        workspace = await options.createDirectoryWorkspace(cwd, title, projectId, {
+          background,
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        });
       } else {
         let cwd =
           path !== undefined || !projectId ? resolveScopedCwd(path, { required: true }) : null;
@@ -1317,6 +1340,8 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
             ...(worktreeSlug ? { worktreeSlug } : {}),
             ...worktreeTarget,
             ...(title ? { title } : {}),
+            background,
+            callerWorkspaceId: resolveCallerAgent()?.workspaceId,
           },
         );
         if (!result.ok) {
@@ -1337,15 +1362,17 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     {
       title: "List workspaces",
       description: "List active workspaces.",
-      inputSchema: {},
+      inputSchema: { includeBackground: z.boolean().optional().default(false) },
       outputSchema: { workspaces: z.array(WorkspaceAutomationSummarySchema) },
     },
-    async () => {
+    async ({ includeBackground = false }) => {
       if (!options.workspaceRegistry) {
         throw new Error("Workspace registry is not configured");
       }
       const workspaces = (await options.workspaceRegistry.list())
-        .filter((workspace) => !workspace.archivedAt)
+        .filter(
+          (workspace) => !workspace.archivedAt && (includeBackground || !workspace.background),
+        )
         .map(toWorkspaceAutomationSummary);
       return {
         content: [],
@@ -1412,30 +1439,21 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         workspaceId: z.string().optional(),
         currentModeId: z.string().nullable(),
         availableModes: z.array(ProviderModeSchema),
-        lastMessage: z.string().nullable().optional(),
-        permission: AgentPermissionRequestPayloadSchema.nullable().optional(),
         guidance: z.string().optional(),
       },
     },
     async (args: unknown) => {
       const resolvedArgs = await resolveCreateAgentToolArgs(args);
       const { parsedArgs, worktree } = resolvedArgs;
-      let requestedBackground: boolean;
       let notifyOnFinish: boolean;
       if (resolvedArgs.kind === "agent-scoped") {
-        requestedBackground = true;
         notifyOnFinish = parsedArgs.notifyOnFinish;
       } else {
-        requestedBackground = resolvedArgs.parsedArgs.background;
         notifyOnFinish = resolvedArgs.parsedArgs.notifyOnFinish ?? false;
       }
       const selectedProvider = resolveRequiredProviderModel(parsedArgs.provider).provider;
       const inheritedConfig = resolveInheritedProviderConfig(selectedProvider);
-      const {
-        snapshot,
-        background: createdInBackground,
-        initialPromptStarted,
-      } = await createAgentCommand(
+      const { snapshot, initialPromptStarted } = await createAgentCommand(
         {
           agentManager,
           agentStorage,
@@ -1461,7 +1479,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           features: parsedArgs.settings?.features,
           labels: parsedArgs.labels,
           mode: parsedArgs.settings?.modeId,
-          background: requestedBackground,
+          promptFailure: "throw",
           notifyOnFinish,
           detached: resolvedArgs.detached,
           callerAgentId,
@@ -1470,43 +1488,12 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         },
       );
 
-      try {
-        if (!createdInBackground && initialPromptStarted) {
-          const result = await waitForAgentWithTimeout(agentManager, snapshot.id, {
-            waitForActive: true,
-          });
-
-          const liveSnapshot = agentManager.getAgent(snapshot.id) ?? snapshot;
-          const responseData = {
-            agentId: snapshot.id,
-            type: snapshot.provider,
-            status: result.status,
-            cwd: liveSnapshot.cwd,
-            ...(liveSnapshot.workspaceId ? { workspaceId: liveSnapshot.workspaceId } : {}),
-            currentModeId: liveSnapshot.currentModeId,
-            availableModes: liveSnapshot.availableModes,
-            lastMessage: result.lastMessage,
-            permission: sanitizePermissionRequest(result.permission),
-          };
-          const validJson = ensureValidJson(responseData);
-
-          const response = {
-            content: [],
-            structuredContent: validJson,
-          };
-          return response;
-        }
-      } catch (error) {
-        childLogger.error({ err: error, agentId: snapshot.id }, "Failed to run initial prompt");
-        throw error;
-      }
-
       // Return immediately for async creation.
       const currentSnapshot = agentManager.getAgent(snapshot.id) ?? snapshot;
       const guidance =
         callerAgentId && notifyOnFinish && initialPromptStarted
           ? "You will get notified when the created agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives."
-          : undefined;
+          : "Creation acknowledged. Observe completion using get_agent_status/get_agent_activity or SDK/RPC subscriptions and wait APIs.";
       const response = {
         content: [],
         structuredContent: ensureValidJson({
@@ -1517,8 +1504,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           ...(currentSnapshot.workspaceId ? { workspaceId: currentSnapshot.workspaceId } : {}),
           currentModeId: currentSnapshot.currentModeId,
           availableModes: currentSnapshot.availableModes,
-          lastMessage: null,
-          permission: null,
           ...(guidance ? { guidance } : {}),
         }),
       };
@@ -1652,7 +1637,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       const cwd = process.cwd();
       return {
         cwd,
-        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext),
+        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext, {
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        }),
       };
     }
     const caller = resolveCallerAgent();
@@ -1820,7 +1807,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       }
       return {
         cwd,
-        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext),
+        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext, {
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        }),
         worktree: undefined,
       };
     }
@@ -1859,85 +1848,70 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     }
   }
 
+  const PROMPTED_AGENT_NOTIFICATION_GUIDANCE =
+    "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.";
+
   registerTool(
     "send_agent_prompt",
     {
       title: "Send agent prompt",
       description:
-        "Send a task to a running agent. Agent-scoped callers run in background by default; top-level callers wait by default.",
+        "Send a task and return after dispatch acknowledgement. Calling agents receive finish notifications by default.",
       inputSchema: sendAgentPromptInputSchema,
       outputSchema: {
         success: z.boolean(),
+        disposition: z.enum(["turn_started", "out_of_band"]).optional(),
         status: AgentStatusEnum,
-        lastMessage: z.string().nullable().optional(),
-        permission: AgentPermissionRequestPayloadSchema.nullable().optional(),
         guidance: z.string().optional(),
       },
     },
-    async ({
-      agentId,
-      prompt,
-      sessionMode,
-      background = Boolean(callerAgentId),
-      notifyOnFinish = Boolean(callerAgentId),
-    }) => {
-      const shouldNotifyOnFinish = Boolean(callerAgentId && notifyOnFinish && background);
-
-      await sendPromptToAgent({
-        agentManager,
-        agentStorage,
-        agentId,
-        prompt,
-        sessionMode,
-        logger: childLogger,
-      });
-
-      if (shouldNotifyOnFinish && callerAgentId) {
-        setupFinishNotification({
+    async ({ agentId, prompt, sessionMode, notifyOnFinish = Boolean(callerAgentId) }) => {
+      let stopNotification: (() => void) | undefined;
+      function armFinishNotification(disposition: PromptDispatchDisposition): void {
+        if (!callerAgentId || !notifyOnFinish) {
+          return;
+        }
+        stopNotification = setupFinishNotification({
           agentManager,
           agentStorage,
           childAgentId: agentId,
           callerAgentId,
+          waitForTurnStart: disposition === "turn_started",
           logger: childLogger,
         });
       }
 
-      // If not running in background, wait for completion
-      if (!background) {
-        const result = await waitForAgentWithTimeout(agentManager, agentId, {
-          waitForActive: true,
+      const notifying = Boolean(callerAgentId && notifyOnFinish);
+      const { disposition } = await sendPromptToAgent({
+        agentManager,
+        agentStorage,
+        agentId,
+        prompt,
+        source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
+        sessionMode,
+        onDispatch: armFinishNotification,
+        logger: childLogger,
+      }).catch((error) => {
+        stopNotification?.();
+        throw error;
+      });
+
+      // Return once the provider has accepted the turn, so the status reports it running.
+      if (disposition === "turn_started") {
+        await waitForAgentRunStartWithTimeout(agentManager, agentId).catch((error) => {
+          stopNotification?.();
+          throw error;
         });
-
-        const responseData = {
-          success: true,
-          status: result.status,
-          lastMessage: result.lastMessage,
-          permission: sanitizePermissionRequest(result.permission),
-        };
-        const validJson = ensureValidJson(responseData);
-
-        const response = {
-          content: [],
-          structuredContent: validJson,
-        };
-        return response;
       }
-
-      // Return immediately if background=true
-      // Re-fetch snapshot since the state may have changed
       const currentSnapshot = agentManager.getAgent(agentId);
 
       const responseData = {
         success: true,
+        disposition,
         status: currentSnapshot?.lifecycle ?? "idle",
-        lastMessage: null,
-        permission: null,
-        ...(shouldNotifyOnFinish
-          ? {
-              guidance:
-                "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.",
-            }
-          : {}),
+        guidance: notifying
+          ? PROMPTED_AGENT_NOTIFICATION_GUIDANCE
+          : "Dispatch acknowledged. Observe completion using get_agent_status/get_agent_activity or SDK/RPC subscriptions and wait APIs.",
       };
       const validJson = ensureValidJson(responseData);
 
@@ -2005,6 +1979,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       title: "List agents",
       description: "List recent agents as compact metadata.",
       inputSchema: {
+        includeBackground: z.boolean().optional().default(false),
         includeArchived: z.boolean().optional().default(false),
         cwd: z.string().optional(),
         sinceHours: z
@@ -2021,29 +1996,38 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         agents: z.array(AgentListItemPayloadSchema),
       },
     },
-    async ({ includeArchived = false, cwd, sinceHours = 48, statuses, limit = 50 }) => {
+    async ({
+      includeBackground = false,
+      includeArchived = false,
+      cwd,
+      sinceHours = 48,
+      statuses,
+      limit = 50,
+    }) => {
       const callerCwd = callerAgentId ? resolveCallerAgent()?.cwd : undefined;
       const requestedCwd = cwd?.trim() ? expandUserPath(cwd) : callerCwd;
       const statusFilter = statuses && statuses.length > 0 ? new Set(statuses) : null;
       const sinceMs = Date.now() - sinceHours * 60 * 60 * 1000;
-      const liveSnapshots = agentManager.listAgents();
-      const liveAgents = await Promise.all(
-        liveSnapshots.map((snapshot) =>
+      if (!options.workspaceRegistry) throw new Error("Workspace registry is not configured");
+      const directory = new AgentDirectory({
+        manager: agentManager,
+        storage: agentStorage,
+        workspaces: options.workspaceRegistry,
+        projectLive: (snapshot) =>
           serializeSnapshotWithMetadata(agentStorage, snapshot, childLogger),
-        ),
-      );
-      const liveIds = new Set(liveSnapshots.map((snapshot) => snapshot.id));
-      const storedRecords = await agentStorage.list();
-      const registeredProviderIds = new Set(providerSnapshotManager.listRegisteredProviderIds());
-      const storedAgents = storedRecords
-        .filter((record) => !record.internal && !liveIds.has(record.id))
-        .filter((record) => includeArchived || !record.archivedAt)
-        .filter(
-          (record) =>
-            includeArchived || isStoredAgentProviderAvailable(record, registeredProviderIds),
-        )
-        .map((record) => buildStoredAgentPayload(record, registeredProviderIds));
-      const agents = [...liveAgents, ...storedAgents]
+        projectStored: (record) =>
+          buildStoredAgentPayload(
+            record,
+            new Set(providerSnapshotManager.listRegisteredProviderIds()),
+          ),
+        isProviderVisible: () => true,
+        isStoredProviderAvailable: (record) =>
+          isStoredAgentProviderAvailable(
+            record,
+            new Set(providerSnapshotManager.listRegisteredProviderIds()),
+          ),
+      });
+      const agents = (await directory.list({ includeBackground, includeArchived }))
         .map(toAgentListItemPayload)
         .filter((agent) => !requestedCwd || isSameOrDescendantPath(requestedCwd, agent.cwd))
         .filter((agent) => !statusFilter || statusFilter.has(agent.status))
diff --git a/packages/server/src/server/agent/tools/types.ts b/packages/server/src/server/agent/tools/types.ts
index 1eb54dabfd..66a4a23da2 100644
--- a/packages/server/src/server/agent/tools/types.ts
+++ b/packages/server/src/server/agent/tools/types.ts
@@ -1,4 +1,5 @@
 import type { z } from "zod";
+import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
 
 export interface PaseoToolExecutionContext {
   signal?: AbortSignal;
@@ -36,6 +37,7 @@ export interface PaseoToolCatalog {
 
 export interface PaseoToolRuntimeContext {
   callerAgentId?: string;
+  paseoToolPolicy?: ProviderPaseoToolsPolicy;
   enableVoiceTools?: boolean;
   voiceOnly?: boolean;
 }
diff --git a/packages/server/src/server/auth.test.ts b/packages/server/src/server/auth.test.ts
index f53ce43a65..0adf442fb6 100644
--- a/packages/server/src/server/auth.test.ts
+++ b/packages/server/src/server/auth.test.ts
@@ -1,4 +1,7 @@
 import { describe, expect, test } from "vitest";
+import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 
 import {
   extractHttpBearerToken,
@@ -7,25 +10,27 @@ import {
   hashDaemonPassword,
   isAgentMcpRequestAuthorized,
   isBearerTokenValidAsync,
-  isBearerTokenValid,
   shouldBypassBearerAuth,
 } from "./auth.js";
+import { resolveSessionAdmission } from "./session-admission-auth.js";
+import {
+  deleteLocalCredential,
+  readLocalCredentialForTarget,
+  writeLocalCredential,
+} from "./local-credential.js";
 
 const CORRECT_PASSWORD_HASH = "$2b$12$OLxyuuP9uLK30Uzc4wQX0O6liuU/Q1t5P2b0Ebf36mULvpVK3DRZW";
 
 describe("daemon bearer validator", () => {
-  test("allows any token when no password is configured", () => {
-    expect(isBearerTokenValid({ password: undefined, token: null })).toBe(true);
-    expect(isBearerTokenValid({ password: undefined, token: "anything" })).toBe(true);
+  test("allows any token when no password is configured", async () => {
+    expect(await isBearerTokenValidAsync({ password: undefined, token: null })).toBe(true);
+    expect(await isBearerTokenValidAsync({ password: undefined, token: "anything" })).toBe(true);
   });
 
   test("accepts the plaintext token against the bcrypt hash and rejects missing or wrong tokens", async () => {
     expect(
       await isBearerTokenValidAsync({ password: CORRECT_PASSWORD_HASH, token: "correct-password" }),
     ).toBe(true);
-    expect(isBearerTokenValid({ password: CORRECT_PASSWORD_HASH, token: "correct-password" })).toBe(
-      true,
-    );
     expect(await isBearerTokenValidAsync({ password: CORRECT_PASSWORD_HASH, token: null })).toBe(
       false,
     );
@@ -34,11 +39,11 @@ describe("daemon bearer validator", () => {
     );
   });
 
-  test("hashes a password into a bcrypt value", () => {
+  test("hashes a password into a bcrypt value", async () => {
     const hash = hashDaemonPassword("correct-password");
 
     expect(hash).toMatch(/^\$2[aby]\$12\$/);
-    expect(isBearerTokenValid({ password: hash, token: "correct-password" })).toBe(true);
+    expect(await isBearerTokenValidAsync({ password: hash, token: "correct-password" })).toBe(true);
   });
 
   test("extracts HTTP bearer tokens", () => {
@@ -121,3 +126,88 @@ describe("agent MCP request authorizer", () => {
     ).toBe(false);
   });
 });
+
+describe("hello admission", () => {
+  test("admits a stale local credential when no password is configured", async () => {
+    expect(
+      await resolveSessionAdmission({
+        credential: { kind: "localCredential", token: "stale" },
+        passwordHash: undefined,
+        localCredential: "current",
+        transport: "direct",
+      }),
+    ).toMatchObject({ admission: { principalId: "owner" } });
+  });
+  test("accepts a password and current local credential, but rejects old and wrong credentials", async () => {
+    const home = await mkdtemp(join(tmpdir(), "paseo-local-auth-"));
+    try {
+      const first = await writeLocalCredential(home);
+      const second = await writeLocalCredential(home);
+      const input = {
+        passwordHash: CORRECT_PASSWORD_HASH,
+        localCredential: second,
+        transport: "direct" as const,
+      };
+      expect(
+        await resolveSessionAdmission({
+          ...input,
+          credential: { kind: "password", password: "correct-password" },
+        }),
+      ).toMatchObject({ admission: { principalId: "owner" } });
+      expect(
+        await resolveSessionAdmission({
+          ...input,
+          credential: { kind: "localCredential", token: second },
+        }),
+      ).toMatchObject({ admission: { principalId: "owner" } });
+      expect(
+        await resolveSessionAdmission({
+          ...input,
+          credential: { kind: "localCredential", token: first },
+        }),
+      ).toEqual({ rejection: "incorrect_password" });
+      expect(
+        await resolveSessionAdmission({
+          ...input,
+          credential: { kind: "password", password: "wrong" },
+        }),
+      ).toEqual({ rejection: "incorrect_password" });
+      expect(
+        await resolveSessionAdmission({
+          ...input,
+          transport: "relay",
+          credential: { kind: "password", password: "wrong" },
+        }),
+      ).toEqual({ rejection: "incorrect_password" });
+      expect(await resolveSessionAdmission({ ...input, credential: undefined })).toEqual({
+        rejection: "password_required",
+      });
+      expect(
+        await resolveSessionAdmission({ ...input, transport: "relay", credential: undefined }),
+      ).toMatchObject({ admission: { principalId: "owner" } });
+    } finally {
+      await deleteLocalCredential(home);
+      await rm(home, { recursive: true, force: true });
+    }
+  });
+
+  test("writes a private rotating credential and reads it only for the matching target", async () => {
+    const home = await mkdtemp(join(tmpdir(), "paseo-local-file-"));
+    try {
+      await writeFile(join(home, "paseo.pid"), JSON.stringify({ listen: "127.0.0.1:6767" }));
+      const first = await writeLocalCredential(home);
+      if (process.platform !== "win32") {
+        expect((await stat(join(home, "local-credential"))).mode & 0o777).toBe(0o600);
+      }
+      expect(readLocalCredentialForTarget(home, "tcp://localhost:6767")).toBe(first);
+      expect(readLocalCredentialForTarget(home, "tcp://remote.example:6767")).toBeNull();
+      const second = await writeLocalCredential(home);
+      expect(second).not.toBe(first);
+      expect((await readFile(join(home, "local-credential"), "utf8")).trim()).toBe(second);
+      await deleteLocalCredential(home);
+      expect(readLocalCredentialForTarget(home, "localhost:6767")).toBeNull();
+    } finally {
+      await rm(home, { recursive: true, force: true });
+    }
+  });
+});
diff --git a/packages/server/src/server/auth.ts b/packages/server/src/server/auth.ts
index 619bb238e0..81848927f3 100644
--- a/packages/server/src/server/auth.ts
+++ b/packages/server/src/server/auth.ts
@@ -1,11 +1,13 @@
-import { compare, compareSync, hashSync } from "bcryptjs";
+import { compare, hashSync } from "bcryptjs";
 import { timingSafeEqual } from "node:crypto";
 import type { RequestHandler } from "express";
+import { matchesLocalCredential } from "./local-credential.js";
 
 export const DAEMON_PASSWORD_BCRYPT_COST = 12;
 
 export interface DaemonAuthConfig {
   password?: string;
+  localCredential?: () => string | null;
 }
 
 export interface BearerAuthRejectContext {
@@ -19,10 +21,6 @@ interface BearerValidationInput {
   token: string | null;
 }
 
-export function isBearerTokenValid(input: BearerValidationInput): boolean {
-  return isBearerTokenValidSync(input);
-}
-
 export async function isBearerTokenValidAsync(input: BearerValidationInput): Promise<boolean> {
   if (!input.password) {
     return true;
@@ -34,17 +32,6 @@ export async function isBearerTokenValidAsync(input: BearerValidationInput): Pro
   return compare(input.token, input.password);
 }
 
-export function isBearerTokenValidSync(input: BearerValidationInput): boolean {
-  if (!input.password) {
-    return true;
-  }
-  if (input.token === null) {
-    return false;
-  }
-
-  return compareSync(input.token, input.password);
-}
-
 export function hashDaemonPassword(password: string): string {
   return hashSync(password, DAEMON_PASSWORD_BCRYPT_COST);
 }
@@ -101,7 +88,13 @@ export function createRequireBearerMiddleware(
     void (async () => {
       try {
         const token = extractHttpBearerToken(req.header("authorization"));
-        if (!(await isBearerTokenValidAsync({ password, token }))) {
+        const localCredential = req.path === "/api/status" ? auth?.localCredential?.() : null;
+        const isLocal =
+          localCredential !== null &&
+          localCredential !== undefined &&
+          token !== null &&
+          matchesLocalCredential(localCredential, token);
+        if (!isLocal && !(await isBearerTokenValidAsync({ password, token }))) {
           onReject?.({
             path: req.path,
             method: req.method,
diff --git a/packages/server/src/server/authorization/index.test.ts b/packages/server/src/server/authorization/index.test.ts
index 18e7feca2b..5230e51261 100644
--- a/packages/server/src/server/authorization/index.test.ts
+++ b/packages/server/src/server/authorization/index.test.ts
@@ -26,6 +26,11 @@ function inboundMessage(type: SessionInboundMessage["type"]): SessionInboundMess
 }
 
 function outboundMessage(type: SessionOutboundMessage["type"]): SessionOutboundMessage {
+  if (type === "status")
+    return {
+      type,
+      payload: { status: "agent_create_failed", error: "test", requestId: "test" },
+    } as SessionOutboundMessage;
   return { type } as SessionOutboundMessage;
 }
 
@@ -69,6 +74,58 @@ describe("SessionAuthorization", () => {
     ).toBe(false);
   });
 
+  test("Hub can operate ordinary agents and recover workspaces without daemon administration", () => {
+    const authorization = new SessionAuthorization(["hub.execute"]);
+    for (const type of [
+      "create_agent_request",
+      "workspace.title.set.request",
+      "fetch_agents_request",
+      "fetch_agent_request",
+      "agent.timeline.set_subscription.request",
+      "send_agent_message_request",
+      "workspace.recovery.inspect.request",
+      "workspace.recovery.restore.request",
+      "archive_workspace_request",
+      "cancel_agent_request",
+    ] as const) {
+      expect(authorization.allowsInbound(inboundMessage(type))).toBe(true);
+    }
+    for (const type of [
+      "status",
+      "agent_update",
+      "agent_stream",
+      "workspace_update",
+      "rpc_error",
+      "workspace.title.set.response",
+      "fetch_agents_response",
+      "fetch_agent_response",
+      "agent.timeline.set_subscription.response",
+      "send_agent_message_response",
+      "workspace.recovery.inspect.response",
+      "workspace.recovery.restore.response",
+      "archive_workspace_response",
+      "cancel_agent_response",
+    ] as const) {
+      expect(authorization.allowsOutbound(outboundMessage(type))).toBe(true);
+    }
+    for (const type of [
+      "restart_server_request",
+      "terminal_input",
+      "hub.management.daemon.permissions.update.request",
+    ] as const) {
+      expect(authorization.allowsInbound(inboundMessage(type))).toBe(false);
+    }
+    expect(
+      authorization.allowsOutbound({
+        type: "status",
+        payload: { status: "shutdown_requested", clientId: "owner", requestId: "shutdown" },
+      }),
+    ).toBe(false);
+    authorization.replacePermissions([]);
+    expect(authorization.allowsInbound(inboundMessage("send_agent_message_request"))).toBe(false);
+    expect(authorization.allowsOutbound(outboundMessage("agent_update"))).toBe(false);
+  });
+
   test("correlated authorization errors can always be emitted", () => {
     const authorization = new SessionAuthorization([]);
 
diff --git a/packages/server/src/server/authorization/index.ts b/packages/server/src/server/authorization/index.ts
index 38414f33f9..e79f5d28e7 100644
--- a/packages/server/src/server/authorization/index.ts
+++ b/packages/server/src/server/authorization/index.ts
@@ -34,7 +34,7 @@ export class SessionAuthorization {
   }
 
   allowsOutbound(message: SessionOutboundMessage): boolean {
-    return this.allows(requiredPermissionForOutbound(message.type));
+    return this.allows(requiredPermissionForOutbound(message));
   }
 
   replacePermissions(permissions: readonly DaemonPermission[]): void {
diff --git a/packages/server/src/server/authorization/operation-permissions.ts b/packages/server/src/server/authorization/operation-permissions.ts
index 95995bc65e..e7e77bc0d3 100644
--- a/packages/server/src/server/authorization/operation-permissions.ts
+++ b/packages/server/src/server/authorization/operation-permissions.ts
@@ -7,7 +7,7 @@ export type PermissionRequirement = DaemonPermission | readonly DaemonPermission
 
 const INBOUND_PERMISSION = {
   abort_request: "workspace.write",
-  "agent.config.apply.request": "workspace.write",
+  "agent.config.apply.request": ["workspace.write", "hub.execute"],
   "agent.detach.request": "workspace.write",
   "agent.fork_context.request": "workspace.read",
   "agent.provider_subagents.list.request": "workspace.read",
@@ -18,16 +18,20 @@ const INBOUND_PERMISSION = {
   "agent.skills.reconcile.request": "daemon.manage",
   "agent.skills.save_selection.request": "daemon.manage",
   "agent.skills.uninstall.request": "daemon.manage",
+  "agent.timeline.search.request": "workspace.read",
   "agent.timeline.list_prompts.request": "workspace.read",
   "agent.timeline.append.request": "workspace.write",
-  "agent.timeline.set_subscription.request": "workspace.read",
+  "browser.host.register.request": ["workspace.write"],
+  "subscription.release.request": null,
+  "session.events.set_subscription.request": ["workspace.read", "daemon.read", "hub.execute"],
+  "agent.timeline.set_subscription.request": ["workspace.read", "hub.execute"],
   agent_permission_response: "workspace.write",
-  archive_agent_request: "workspace.write",
-  archive_workspace_request: "workspace.manage",
+  archive_agent_request: ["workspace.write", "hub.execute"],
+  archive_workspace_request: ["workspace.manage", "hub.execute"],
   audio_played: "workspace.write",
   branch_suggestions_request: "workspace.read",
   "browser.automation.execute.response": "workspace.write",
-  cancel_agent_request: "workspace.write",
+  cancel_agent_request: ["workspace.write", "hub.execute"],
   capture_terminal_request: "workspace.read",
   "chat/create": "workspace.write",
   "chat/delete": "workspace.write",
@@ -58,7 +62,9 @@ const INBOUND_PERMISSION = {
   clear_agent_attention: "workspace.write",
   client_heartbeat: "workspace.read",
   close_items_request: "workspace.manage",
-  create_agent_request: "workspace.write",
+  create_agent_request: ["workspace.write", "hub.execute"],
+  "agent.create.request": ["workspace.write", "hub.execute"],
+  "creation.subscribe.request": "workspace.read",
   create_paseo_worktree_request: "workspace.manage",
   create_terminal_request: "workspace.write",
   "daemon.config.reload.request": "daemon.manage",
@@ -73,11 +79,11 @@ const INBOUND_PERMISSION = {
   dictation_stream_start: "workspace.write",
   directory_suggestions_request: "workspace.read",
   fetch_agent_history_request: "workspace.read",
-  fetch_agent_request: "workspace.read",
-  fetch_agent_timeline_request: "workspace.read",
-  fetch_agents_request: "workspace.read",
+  fetch_agent_request: ["workspace.read", "hub.execute"],
+  fetch_agent_timeline_request: ["workspace.read", "hub.execute"],
+  fetch_agents_request: ["workspace.read", "hub.execute"],
   fetch_recent_provider_sessions_request: "workspace.read",
-  fetch_workspaces_request: "workspace.read",
+  fetch_workspaces_request: ["workspace.read", "hub.execute"],
   "file.upload.request": "workspace.write",
   file_download_token_request: "workspace.read",
   file_explorer_request: "workspace.read",
@@ -131,6 +137,8 @@ const INBOUND_PERMISSION = {
   "plugin.source.install.request": "daemon.manage",
   "plugin.source.status.request": "daemon.manage",
   "plugin.source.update.request": "daemon.manage",
+  "plugin.source.update.preview.request": "daemon.manage",
+  "plugin.source.update.apply.request": "daemon.manage",
   "project.add.request": "workspace.manage",
   "project.create_directory.request": "workspace.manage",
   "project.github.clone.request": "workspace.manage",
@@ -141,6 +149,7 @@ const INBOUND_PERMISSION = {
   "project.rename.request": "workspace.manage",
   project_icon_request: "workspace.read",
   "provider.usage.list.request": "daemon.read",
+  "usage.list_reports.request": "daemon.read",
   provider_diagnostic_request: "daemon.read",
   pull_request_timeline_request: "workspace.read",
   "push.unregister.request": "workspace.read",
@@ -159,7 +168,7 @@ const INBOUND_PERMISSION = {
   "schedule/resume": "automation.manage",
   "schedule/run-once": "automation.manage",
   "schedule/update": "automation.manage",
-  send_agent_message_request: "workspace.write",
+  send_agent_message_request: ["workspace.write", "hub.execute"],
   set_agent_feature_request: "workspace.write",
   set_agent_mode_request: "workspace.write",
   set_agent_model_request: "workspace.write",
@@ -171,6 +180,7 @@ const INBOUND_PERMISSION = {
   stash_list_request: "workspace.read",
   stash_pop_request: "workspace.write",
   stash_save_request: "workspace.write",
+  "checkout.diff.get.request": "workspace.read",
   subscribe_checkout_diff_request: "workspace.read",
   subscribe_terminal_request: "workspace.read",
   subscribe_terminals_request: "workspace.read",
@@ -184,6 +194,7 @@ const INBOUND_PERMISSION = {
   voice_audio_chunk: "workspace.write",
   wait_for_finish_request: "workspace.read",
   "workspace.clear_attention.request": "workspace.write",
+  "workspace.mark_unread.request": "workspace.write",
   "workspace.create.request": "workspace.manage",
   "workspace.github.search_repositories.request": "workspace.read",
   "workspace.label.assignment.set.request": "workspace.manage",
@@ -192,20 +203,24 @@ const INBOUND_PERMISSION = {
   "workspace.label.list.request": "workspace.read",
   "workspace.label.update.request": "workspace.manage",
   "workspace.pin.set.request": "workspace.manage",
-  "workspace.recovery.inspect.request": "workspace.read",
-  "workspace.recovery.restore.request": "workspace.manage",
+  "workspace.recovery.inspect.request": ["workspace.read", "hub.execute"],
+  "workspace.recovery.restore.request": ["workspace.manage", "hub.execute"],
   "workspace.script.list.request": "workspace.read",
   "workspace.script.start.request": "workspace.write",
   "workspace.script.stop.request": "workspace.write",
-  "workspace.title.set.request": "workspace.manage",
+  "workspace.title.set.request": ["workspace.manage", "hub.execute"],
   workspace_setup_status_request: "workspace.read",
   "workspace.setup.run.request": "workspace.write",
   write_project_config_request: "workspace.write",
 } as const satisfies Record<InboundOperation, PermissionRequirement>;
 
 const OUTBOUND_PERMISSION = {
+  "agent.create.response": ["workspace.write", "hub.execute"],
+  "agent.create.update": ["workspace.write", "hub.execute"],
+  "workspace.create.update": "workspace.manage",
+  "creation.subscribe.response": "workspace.read",
   activity_log: "workspace.read",
-  "agent.config.apply.response": "workspace.write",
+  "agent.config.apply.response": ["workspace.write", "hub.execute"],
   "agent.detach.response": "workspace.write",
   "agent.fork_context.response": "workspace.read",
   "agent.provider_subagents.list.response": "workspace.read",
@@ -217,25 +232,29 @@ const OUTBOUND_PERMISSION = {
   "agent.skills.reconcile.response": "daemon.manage",
   "agent.skills.save_selection.response": "daemon.manage",
   "agent.skills.uninstall.response": "daemon.manage",
+  "agent.timeline.search.response": "workspace.read",
   "agent.timeline.list_prompts.response": "workspace.read",
   "agent.timeline.append.response": "workspace.write",
-  "agent.timeline.replacement": "workspace.read",
-  "agent.timeline.set_subscription.response": "workspace.read",
-  agent_archived: "workspace.read",
-  agent_attention_required: "workspace.read",
-  agent_deleted: "workspace.read",
-  agent_permission_request: "workspace.read",
-  agent_permission_resolved: "workspace.write",
-  agent_status: "workspace.read",
-  agent_stream: "workspace.read",
-  agent_update: "workspace.read",
-  archive_workspace_response: "workspace.manage",
+  "agent.timeline.replacement": ["workspace.read", "hub.execute"],
+  "browser.host.register.response": ["workspace.write"],
+  "subscription.release.response": null,
+  "session.events.set_subscription.response": ["workspace.read", "daemon.read", "hub.execute"],
+  "agent.timeline.set_subscription.response": ["workspace.read", "hub.execute"],
+  agent_archived: ["workspace.read", "hub.execute"],
+  agent_attention_required: ["workspace.read", "hub.execute"],
+  agent_deleted: ["workspace.read", "hub.execute"],
+  agent_permission_request: ["workspace.read", "hub.execute"],
+  agent_permission_resolved: ["workspace.write", "hub.execute"],
+  agent_status: ["workspace.read", "hub.execute"],
+  agent_stream: ["workspace.read", "hub.execute"],
+  agent_update: ["workspace.read", "hub.execute"],
+  archive_workspace_response: ["workspace.manage", "hub.execute"],
   artifact: "workspace.read",
   assistant_chunk: "workspace.read",
   audio_output: "workspace.write",
   branch_suggestions_response: "workspace.read",
   "browser.automation.execute.request": "workspace.write",
-  cancel_agent_response: "workspace.write",
+  cancel_agent_response: ["workspace.write", "hub.execute"],
   capture_terminal_response: "workspace.read",
   "chat/create/response": "workspace.write",
   "chat/delete/response": "workspace.write",
@@ -282,11 +301,11 @@ const OUTBOUND_PERMISSION = {
   dictation_stream_partial: "workspace.write",
   directory_suggestions_response: "workspace.read",
   fetch_agent_history_response: "workspace.read",
-  fetch_agent_response: "workspace.read",
-  fetch_agent_timeline_response: "workspace.read",
-  fetch_agents_response: "workspace.read",
+  fetch_agent_response: ["workspace.read", "hub.execute"],
+  fetch_agent_timeline_response: ["workspace.read", "hub.execute"],
+  fetch_agents_response: ["workspace.read", "hub.execute"],
   fetch_recent_provider_sessions_response: "workspace.read",
-  fetch_workspaces_response: "workspace.read",
+  fetch_workspaces_response: ["workspace.read", "hub.execute"],
   "file.upload.response": "workspace.write",
   file_download_token_response: "workspace.read",
   file_explorer_response: "workspace.read",
@@ -341,6 +360,8 @@ const OUTBOUND_PERMISSION = {
   "plugin.source.install.response": "daemon.manage",
   "plugin.source.status.response": "daemon.manage",
   "plugin.source.update.response": "daemon.manage",
+  "plugin.source.update.preview.response": "daemon.manage",
+  "plugin.source.update.apply.response": "daemon.manage",
   pong: "daemon.read",
   "project.add.response": "workspace.manage",
   "project.create_directory.response": "workspace.manage",
@@ -353,6 +374,8 @@ const OUTBOUND_PERMISSION = {
   "project.update": "workspace.read",
   project_icon_response: "workspace.read",
   "provider.usage.list.response": "daemon.read",
+  "usage.list_reports.update": "daemon.read",
+  "usage.list_reports.response": "daemon.read",
   provider_diagnostic_response: "daemon.read",
   providers_snapshot_update: ["daemon.read", "hub.execute"],
   pull_request_timeline_response: "workspace.read",
@@ -370,7 +393,7 @@ const OUTBOUND_PERMISSION = {
   "schedule/run-once/response": "automation.manage",
   "schedule/update/response": "automation.manage",
   script_status_update: "workspace.read",
-  send_agent_message_response: "workspace.write",
+  send_agent_message_response: ["workspace.write", "hub.execute"],
   set_agent_feature_response: "workspace.write",
   set_agent_mode_response: "workspace.write",
   set_agent_model_response: "workspace.write",
@@ -382,6 +405,7 @@ const OUTBOUND_PERMISSION = {
   stash_pop_response: "workspace.read",
   stash_save_response: "workspace.read",
   status: "daemon.read",
+  "checkout.diff.get.response": "workspace.read",
   subscribe_checkout_diff_response: "workspace.read",
   subscribe_terminal_response: "workspace.read",
   "terminal.rename.response": "workspace.write",
@@ -394,6 +418,7 @@ const OUTBOUND_PERMISSION = {
   voice_input_state: "workspace.write",
   wait_for_finish_response: "workspace.read",
   "workspace.clear_attention.response": "workspace.write",
+  "workspace.mark_unread.response": "workspace.write",
   "workspace.create.response": "workspace.manage",
   "workspace.github.search_repositories.response": "workspace.read",
   "workspace.label.assignment.set.response": "workspace.manage",
@@ -403,16 +428,16 @@ const OUTBOUND_PERMISSION = {
   "workspace.label.update": "workspace.read",
   "workspace.label.update.response": "workspace.manage",
   "workspace.pin.set.response": "workspace.manage",
-  "workspace.recovery.inspect.response": "workspace.read",
-  "workspace.recovery.restore.response": "workspace.manage",
+  "workspace.recovery.inspect.response": ["workspace.read", "hub.execute"],
+  "workspace.recovery.restore.response": ["workspace.manage", "hub.execute"],
   "workspace.script.list.response": "workspace.read",
   "workspace.script.start.response": "workspace.write",
   "workspace.script.stop.response": "workspace.write",
-  "workspace.title.set.response": "workspace.manage",
+  "workspace.title.set.response": ["workspace.manage", "hub.execute"],
   workspace_setup_progress: "workspace.read",
   workspace_setup_status_response: "workspace.read",
   "workspace.setup.run.response": "workspace.write",
-  workspace_update: "workspace.read",
+  workspace_update: ["workspace.read", "hub.execute"],
   write_project_config_response: "workspace.write",
 } as const satisfies Record<OutboundOperation, PermissionRequirement>;
 
@@ -420,6 +445,14 @@ export function requiredPermissionForInbound(operation: InboundOperation): Permi
   return INBOUND_PERMISSION[operation];
 }
 
-export function requiredPermissionForOutbound(operation: OutboundOperation): PermissionRequirement {
-  return OUTBOUND_PERMISSION[operation];
+export function requiredPermissionForOutbound(
+  message: SessionOutboundMessage,
+): PermissionRequirement {
+  // The legacy status envelope carries both agent RPC results and daemon configuration.
+  if (
+    message.type === "status" &&
+    (message.payload.status === "agent_created" || message.payload.status === "agent_create_failed")
+  )
+    return ["workspace.write", "hub.execute"];
+  return OUTBOUND_PERMISSION[message.type];
 }
diff --git a/packages/server/src/server/bootstrap-auth.test.ts b/packages/server/src/server/bootstrap-auth.test.ts
index 2fa7c860a6..4046bd6747 100644
--- a/packages/server/src/server/bootstrap-auth.test.ts
+++ b/packages/server/src/server/bootstrap-auth.test.ts
@@ -1,7 +1,12 @@
 import { WebSocket } from "ws";
+import { hash } from "bcryptjs";
+import { readFile, stat, writeFile } from "node:fs/promises";
+import { join } from "node:path";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
 import { createTestPaseoDaemon } from "./test-utils/paseo-daemon.js";
+import { DaemonAuthenticationError, DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { readLocalCredentialForTarget } from "./local-credential.js";
 
 const originalEnv = { ...process.env };
 const CORRECT_PASSWORD_HASH = "$2b$12$OLxyuuP9uLK30Uzc4wQX0O6liuU/Q1t5P2b0Ebf36mULvpVK3DRZW";
@@ -25,8 +30,10 @@ async function expectWebSocketCloses(params: {
   protocol?: string;
   code: number;
   reason: string;
+  hello?: Record<string, unknown>;
 }): Promise<void> {
   const { ws } = await connectWebSocket(params);
+  if (params.hello) ws.send(JSON.stringify(params.hello));
   await expect(
     new Promise<{ code: number; reason: string }>((resolve) => {
       ws.once("close", (code, reason) => {
@@ -77,6 +84,14 @@ describe("daemon bearer auth", () => {
         headers: { Authorization: "Bearer correct-password" },
       });
       expect(correct.status).toBe(200);
+
+      const localToken = (
+        await readFile(join(daemonHandle.paseoHome, "local-credential"), "utf8")
+      ).trim();
+      const local = await fetch(`http://127.0.0.1:${daemonHandle.port}/api/status`, {
+        headers: { Authorization: `Bearer ${localToken}` },
+      });
+      expect(local.status).toBe(200);
     } finally {
       await daemonHandle.close();
     }
@@ -133,6 +148,7 @@ describe("daemon bearer auth", () => {
         port: daemonHandle.port,
         code: 4401,
         reason: "Password required",
+        hello: { type: "hello", clientId: "missing", clientType: "cli", protocolVersion: 1 },
       });
       await expectWebSocketCloses({
         port: daemonHandle.port,
@@ -146,9 +162,269 @@ describe("daemon bearer auth", () => {
         protocol: "paseo.bearer.correct-password",
       });
       expect(protocol).toBe("paseo.bearer.correct-password");
+      const serverInfo = new Promise<unknown>((resolve) => {
+        ws.once("message", (data) => resolve(JSON.parse(data.toString())));
+      });
+      ws.send(
+        JSON.stringify({
+          type: "hello",
+          clientId: "legacy",
+          clientType: "cli",
+          protocolVersion: 1,
+        }),
+      );
+      await expect(serverInfo).resolves.toMatchObject({
+        type: "session",
+        message: { payload: { status: "server_info" } },
+      });
       ws.close();
     } finally {
       await daemonHandle.close();
     }
   });
+
+  test("accepts hello password and local credential and reports the negotiated protocol", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const token = (
+        await readFile(join(daemonHandle.paseoHome, "local-credential"), "utf8")
+      ).trim();
+      if (process.platform !== "win32") {
+        expect((await stat(join(daemonHandle.paseoHome, "local-credential"))).mode & 0o777).toBe(
+          0o600,
+        );
+      }
+      for (const auth of [
+        { kind: "password", password: "correct-password" },
+        { kind: "localCredential", token },
+      ]) {
+        const { ws } = await connectWebSocket({ port: daemonHandle.port });
+        const serverInfo = new Promise<Record<string, unknown>>((resolve, reject) => {
+          ws.once("message", (data) =>
+            resolve(JSON.parse(data.toString()) as Record<string, unknown>),
+          );
+          ws.once("close", () => reject(new Error("closed before server_info")));
+        });
+        ws.send(
+          JSON.stringify({
+            type: "hello",
+            clientId: `test-${auth.kind}`,
+            clientType: "cli",
+            protocolVersion: 2,
+            auth,
+          }),
+        );
+        await expect(serverInfo).resolves.toMatchObject({
+          type: "session",
+          message: { payload: { status: "server_info", protocolVersion: 1 } },
+        });
+        ws.close();
+      }
+    } finally {
+      await daemonHandle.close();
+    }
+    await expect(
+      readFile(join(daemonHandle.paseoHome, "local-credential"), "utf8"),
+    ).rejects.toThrow();
+  });
+
+  test("uses the per-run credential in memory after the file changes", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const path = join(daemonHandle.paseoHome, "local-credential");
+      const token = (await readFile(path, "utf8")).trim();
+      await writeFile(path, "stale-on-disk\n");
+      const { ws } = await connectWebSocket({ port: daemonHandle.port });
+      const serverInfo = new Promise<unknown>((resolve) => {
+        ws.once("message", (data) => resolve(JSON.parse(data.toString())));
+      });
+      ws.send(
+        JSON.stringify({
+          type: "hello",
+          clientId: "local-after-file-change",
+          clientType: "cli",
+          protocolVersion: 1,
+          auth: { kind: "localCredential", token },
+        }),
+      );
+      await expect(serverInfo).resolves.toMatchObject({
+        type: "session",
+        message: { payload: { status: "server_info" } },
+      });
+      ws.close();
+    } finally {
+      await daemonHandle.close();
+    }
+  });
+
+  test("a desktop-style client connects to its password-protected local daemon without a saved password", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    const target = `127.0.0.1:${daemonHandle.port}`;
+    await writeFile(join(daemonHandle.paseoHome, "paseo.pid"), JSON.stringify({ listen: target }));
+    const client = new DaemonClient({
+      url: `ws://${target}/ws`,
+      clientId: "desktop-managed-test",
+      clientType: "browser",
+      localCredential: async () =>
+        readLocalCredentialForTarget(daemonHandle.paseoHome, target) ?? undefined,
+      webSocketFactory: (url, options) =>
+        new WebSocket(url, options?.protocols, { headers: options?.headers }),
+      reconnect: { enabled: false },
+    });
+    try {
+      await client.connect();
+      expect(client.getLastServerInfoMessage()?.serverId).toBe(daemonHandle.daemon.getServerId());
+    } finally {
+      await client.close();
+      await daemonHandle.close();
+    }
+  });
+
+  test("rejects a wrong hello password with a protocol frame before close", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const { ws } = await connectWebSocket({ port: daemonHandle.port });
+      const frames: unknown[] = [];
+      const closed = new Promise<{ code: number; reason: string }>((resolve) => {
+        ws.on("message", (data) => frames.push(JSON.parse(data.toString())));
+        ws.once("close", (code, reason) => resolve({ code, reason: reason.toString() }));
+      });
+      ws.send(
+        JSON.stringify({
+          type: "hello",
+          clientId: "wrong",
+          clientType: "cli",
+          protocolVersion: 1,
+          auth: { kind: "password", password: "wrong" },
+        }),
+      );
+      await expect(closed).resolves.toEqual({ code: 4401, reason: "Incorrect password" });
+      expect(frames).toEqual([
+        { type: "hello.rejected", reason: "incorrect_password", accepts: ["password"] },
+      ]);
+    } finally {
+      await daemonHandle.close();
+    }
+  });
+
+  test("surfaces a typed auth reason from a real client with the wrong password", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemonHandle.port}/ws`,
+      clientId: "typed-wrong-password",
+      clientType: "browser",
+      password: "wrong password",
+      webSocketFactory: (url, options) =>
+        new WebSocket(url, options?.protocols, { headers: options?.headers }),
+      reconnect: { enabled: false },
+    });
+    try {
+      await expect(client.connect()).rejects.toMatchObject({
+        name: "DaemonAuthenticationError",
+        reason: "incorrect_password",
+      } satisfies Partial<DaemonAuthenticationError>);
+    } finally {
+      await client.close();
+      await daemonHandle.close();
+    }
+  });
+
+  test("authenticates a real browser client when its password is invalid as a WebSocket subprotocol", async () => {
+    const password = "two words";
+    const daemonHandle = await createTestPaseoDaemon({
+      auth: { password: await hash(password, 4) },
+    });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemonHandle.port}/ws`,
+      clientId: "browser-password-with-spaces",
+      clientType: "browser",
+      password,
+      webSocketFactory: (url, options) =>
+        new WebSocket(url, options?.protocols, { headers: options?.headers }),
+      reconnect: { enabled: false },
+    });
+    try {
+      await client.connect();
+      expect(client.getLastServerInfoMessage()?.serverId).toBeTruthy();
+    } finally {
+      await client.close();
+      await daemonHandle.close();
+    }
+  });
+
+  test("ignores a proxy Basic header and admits the hello password", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const ws = new WebSocket(`ws://127.0.0.1:${daemonHandle.port}/ws`, undefined, {
+        headers: { Authorization: "Basic proxy-credential" },
+      });
+      await new Promise<void>((resolve, reject) => {
+        ws.once("open", () => resolve());
+        ws.once("error", reject);
+      });
+      const info = new Promise<unknown>((resolve) => {
+        ws.once("message", (frame) => resolve(JSON.parse(frame.toString())));
+      });
+      ws.send(
+        JSON.stringify({
+          type: "hello",
+          clientId: "behind-basic-proxy",
+          clientType: "cli",
+          protocolVersion: 1,
+          auth: { kind: "password", password: "correct-password" },
+        }),
+      );
+      await expect(info).resolves.toMatchObject({
+        type: "session",
+        message: { payload: { status: "server_info" } },
+      });
+      ws.close();
+    } finally {
+      await daemonHandle.close();
+    }
+  });
+
+  test("sends password_required to a capable client without a credential", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const { ws } = await connectWebSocket({ port: daemonHandle.port });
+      const frames: unknown[] = [];
+      const closed = new Promise<number>((resolve) => {
+        ws.on("message", (data) => frames.push(JSON.parse(data.toString())));
+        ws.once("close", (code) => resolve(code));
+      });
+      ws.send(
+        JSON.stringify({
+          type: "hello",
+          clientId: "capable",
+          clientType: "cli",
+          protocolVersion: 1,
+          capabilities: { hello_rejection: true },
+        }),
+      );
+      await expect(closed).resolves.toBe(4401);
+      expect(frames).toEqual([
+        { type: "hello.rejected", reason: "password_required", accepts: ["password"] },
+      ]);
+    } finally {
+      await daemonHandle.close();
+    }
+  });
+
+  test("closes a pre-hello ping without sending server data", async () => {
+    const daemonHandle = await createTestPaseoDaemon({ auth: { password: CORRECT_PASSWORD_HASH } });
+    try {
+      const { ws } = await connectWebSocket({ port: daemonHandle.port });
+      const frames: unknown[] = [];
+      const closed = new Promise<number>((resolve) => {
+        ws.on("message", (data) => frames.push(JSON.parse(data.toString())));
+        ws.once("close", (code) => resolve(code));
+      });
+      ws.send(JSON.stringify({ type: "ping" }));
+      await expect(closed).resolves.toBe(4002);
+      expect(frames).toEqual([]);
+    } finally {
+      await daemonHandle.close();
+    }
+  });
 });
diff --git a/packages/server/src/server/bootstrap-web-ui.test.ts b/packages/server/src/server/bootstrap-web-ui.test.ts
index 348a6cf0eb..81afc3c166 100644
--- a/packages/server/src/server/bootstrap-web-ui.test.ts
+++ b/packages/server/src/server/bootstrap-web-ui.test.ts
@@ -2,10 +2,17 @@ import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import http from "node:http";
 import os from "node:os";
 import path from "node:path";
+import { execFileSync } from "node:child_process";
+import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, describe, expect, test } from "vitest";
 
 import { createTestPaseoDaemon, type TestPaseoDaemon } from "./test-utils/paseo-daemon.js";
 
+const expectedHostName =
+  process.platform === "darwin"
+    ? execFileSync("/usr/sbin/scutil", ["--get", "ComputerName"], { encoding: "utf8" }).trim()
+    : os.hostname();
+
 interface InitialDaemonConnectionHint {
   listen: string;
   useTls: boolean;
@@ -77,6 +84,23 @@ describe("daemon web UI bootstrap", () => {
     }
   });
 
+  test("advertises ComputerName as the hostname over HTTP and WebSocket", async () => {
+    daemonHandle = await createTestPaseoDaemon({ mcpEnabled: false });
+    const response = await fetch(`http://127.0.0.1:${daemonHandle.port}/api/status`);
+    expect(await response.json()).toMatchObject({ hostname: expectedHostName });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemonHandle.port}/ws`,
+      clientId: "host-name-test",
+      clientType: "mobile",
+    });
+    try {
+      await client.connect();
+      expect(client.getLastServerInfoMessage()?.hostname).toBe(expectedHostName);
+    } finally {
+      await client.close();
+    }
+  });
+
   test("injects a TLS initial connection hint only for HTTPS forwarded by a trusted proxy", async () => {
     const distDir = await createWebUiDist();
 
@@ -101,15 +125,53 @@ describe("daemon web UI bootstrap", () => {
     expect(httpHint).toEqual({
       listen: `daemon.example.test:${daemonHandle.port}`,
       useTls: false,
-      label: os.hostname(),
+      label: expectedHostName,
     });
     expect(httpsHint).toEqual({
       listen: `daemon.example.test:${daemonHandle.port}`,
       useTls: true,
-      label: os.hostname(),
+      label: expectedHostName,
     });
   });
 
+  test("spells out the scheme default port when the Host header omits it", async () => {
+    const distDir = await createWebUiDist();
+
+    daemonHandle = await createTestPaseoDaemon({
+      mcpEnabled: false,
+      webUi: {
+        enabled: true,
+        distDir,
+      },
+    });
+
+    // A browser reaching a proxy that terminates TLS on 443 sends a Host header
+    // with no port at all. The app rejects a portless `listen`, so the daemon
+    // has to supply the default itself.
+    const httpsHint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "paseo.example.test", "x-forwarded-proto": "https" },
+      }),
+    );
+    const httpHint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "paseo.example.test" },
+      }),
+    );
+    const ipv6Hint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "[::1]", "x-forwarded-proto": "https" },
+      }),
+    );
+
+    expect(httpsHint.listen).toBe("paseo.example.test:443");
+    expect(httpHint.listen).toBe("paseo.example.test:80");
+    expect(ipv6Hint.listen).toBe("[::1]:443");
+  });
+
   test("ignores forwarded HTTPS when proxy trust is disabled", async () => {
     const distDir = await createWebUiDist();
 
@@ -132,7 +194,7 @@ describe("daemon web UI bootstrap", () => {
     expect(httpsHint).toEqual({
       listen: `daemon.example.test:${daemonHandle.port}`,
       useTls: false,
-      label: os.hostname(),
+      label: expectedHostName,
     });
   });
 });
diff --git a/packages/server/src/server/bootstrap.smoke.test.ts b/packages/server/src/server/bootstrap.smoke.test.ts
index 40ea69e863..697dfda8a7 100644
--- a/packages/server/src/server/bootstrap.smoke.test.ts
+++ b/packages/server/src/server/bootstrap.smoke.test.ts
@@ -1,3 +1,4 @@
+import { resolveDaemonVersion } from "./daemon-version.js";
 import os from "node:os";
 import http from "node:http";
 import path from "node:path";
@@ -672,7 +673,10 @@ describe("paseo daemon bootstrap", () => {
       await mkdir(pluginDirectory);
       await writeFile(
         path.join(pluginDirectory, "paseo-plugin.json"),
-        JSON.stringify({ id: "startup-rollback" }),
+        JSON.stringify({
+          id: "startup-rollback",
+          requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+        }),
       );
       await writeFile(
         path.join(pluginDirectory, "index.server.ts"),
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 627a93d4e3..727c7b7899 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -1,9 +1,11 @@
+import type { PluginRegistries } from "@getpaseo/protocol/plugin-registry";
+import { describeHookWorkspace } from "./plugins/lifecycle/index.js";
 import express from "express";
 import { createServer as createHTTPServer, type IncomingMessage, type ServerResponse } from "http";
 import { constants, existsSync, unlinkSync } from "fs";
-import { open, rm } from "fs/promises";
+import { open, rm, stat } from "fs/promises";
 import { randomUUID } from "node:crypto";
-import { hostname as getHostname } from "node:os";
+import { getHostName } from "./host-name.js";
 import path from "node:path";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import type { Logger } from "pino";
@@ -79,12 +81,12 @@ export function parseListenString(listen: string): ListenTarget {
   throw new Error(`Invalid listen string: ${listen}`);
 }
 
-function formatListenTarget(listenTarget: ListenTarget | null): string | null {
+export function formatListenTarget(listenTarget: ListenTarget | null): string | null {
   if (!listenTarget) {
     return null;
   }
   if (listenTarget.type === "tcp") {
-    return `${listenTarget.host}:${listenTarget.port}`;
+    return `${formatHostForHttpUrl(listenTarget.host)}:${listenTarget.port}`;
   }
   return listenTarget.path;
 }
@@ -124,6 +126,7 @@ import { createPaseoWorktree as createRegisteredPaseoWorktree } from "./paseo-wo
 import { createWorkspaceProvisioningService } from "./session/workspace-provisioning/workspace-provisioning-service.js";
 import { createPaseoWorktreeWorkflow } from "./worktree-session.js";
 import { DownloadTokenStore } from "./file-download/token-store.js";
+import { formatAttachmentContentDisposition } from "./file-download/content-disposition.js";
 import type { OpenAiSpeechProviderConfig } from "./speech/providers/openai/config.js";
 import type { LocalSpeechProviderConfig } from "./speech/providers/local/config.js";
 import type { RequestedSpeechProviders } from "./speech/speech-types.js";
@@ -150,6 +153,7 @@ import { ScheduleService } from "./schedule/service.js";
 import { DaemonConfigStore, type MutableDaemonConfig } from "./daemon-config-store.js";
 import { createOrchestrationSkills } from "./orchestration-skills/index.js";
 import { resolveConfigFromPersisted, type CliConfigOverrides } from "./config.js";
+import { resolvePaseoToolPolicy } from "./agent/paseo-tool-policy.js";
 import { BrowserToolsBroker } from "./browser-tools/broker.js";
 import { DaemonConfigBrowserToolsPolicy } from "./browser-tools/policy.js";
 import { WorkspaceGitServiceImpl } from "./workspace-git-service.js";
@@ -197,12 +201,14 @@ import {
   type ManagedProcessRegistry,
 } from "./managed-processes/managed-processes.js";
 import { terminateWithTreeKill } from "../utils/tree-kill.js";
+import { withTimeout } from "../utils/promise-timeout.js";
 import { isHostnameAllowed, type HostnamesConfig } from "./hostnames.js";
 import {
   createRequireBearerMiddleware,
   isAgentMcpRequestAuthorized,
   type DaemonAuthConfig,
 } from "./auth.js";
+import { deleteLocalCredential, writeLocalCredential } from "./local-credential.js";
 import { createWebUiMiddleware } from "./web-ui.js";
 import { WorkspaceAutoName } from "./workspace-auto-name.js";
 import { createGitMutationService } from "./session/git-mutation/git-mutation-service.js";
@@ -227,6 +233,7 @@ import {
 } from "./hub/relationship-remote.js";
 import { DaemonExecutions } from "./hub/daemon-executions.js";
 import { PluginService } from "./plugins/index.js";
+import { BuiltinPluginLoader } from "./plugins/builtin/index.js";
 import { ManagedPluginSources } from "./plugins/managed-source.js";
 
 const MCP_DEBUG_BATCH_LIMIT = 10;
@@ -406,6 +413,8 @@ export interface PaseoDaemonConfig {
   skillSelection?: AgentSkillSelection;
   pluginsEnabled?: boolean;
   plugins?: Record<string, PluginSource>;
+  pluginRegistries?: PluginRegistries;
+  pluginRegistryUrl?: string;
   staticDir: string;
   mcpDebug: boolean;
   isDev?: boolean;
@@ -468,9 +477,11 @@ export interface PaseoDaemon {
   start(): Promise<void>;
   stop(): Promise<void>;
   getListenTarget(): ListenTarget | null;
+  getServerId(): string;
 }
 
 export interface PaseoDaemonDependencies {
+  builtinPlugins?: BuiltinPluginLoader;
   hubRelationshipRemote?: HubRelationshipRemote;
   hubRelationshipClock?: HubRelationshipClock;
   hubRelationshipRetryPolicy?: HubRelationshipRetryPolicy;
@@ -481,6 +492,10 @@ export interface PaseoDaemonDependencies {
   };
 }
 
+function resolveBuiltinPluginLoader(dependencies: PaseoDaemonDependencies): BuiltinPluginLoader {
+  return dependencies.builtinPlugins ?? new BuiltinPluginLoader();
+}
+
 function createBootstrapManagedProcessRegistry(
   config: Pick<PaseoDaemonConfig, "paseoHome" | "managedProcesses">,
   logger: Logger,
@@ -512,7 +527,7 @@ function mountWebUi(app: express.Application, config: PaseoDaemonConfig, logger:
     createWebUiMiddleware({
       enabled: config.webUi?.enabled ?? false,
       distDir: config.webUi?.distDir ?? null,
-      label: getHostname(),
+      label: getHostName(),
       logger,
     }),
   );
@@ -604,8 +619,17 @@ export async function createPaseoDaemon(
   });
   const browserToolsPolicy = new DaemonConfigBrowserToolsPolicy(daemonConfigStore);
   const browserToolsBroker = new BrowserToolsBroker({});
-  const pluginRuntime = new PluginService(logger, daemonConfigStore, daemonVersion, {
-    managedSources: new ManagedPluginSources(config.paseoHome),
+  const pluginRuntime: PluginService = new PluginService(logger, daemonConfigStore, daemonVersion, {
+    usageAgents: {
+      hasAgent: (id) => agentManager.getAgent(id) !== null,
+      usageSession: (id) => agentManager.usageSession(id),
+    },
+    managedSources: new ManagedPluginSources(config.paseoHome, {
+      registries: config.pluginRegistries,
+      defaultUrl: config.pluginRegistryUrl,
+    }),
+    builtinPlugins: resolveBuiltinPluginLoader(dependencies),
+    settingsDirectory: path.join(config.paseoHome, "plugin-settings"),
   });
 
   const serverId = getOrCreateServerId(config.paseoHome, { logger });
@@ -759,8 +783,10 @@ export async function createPaseoDaemon(
   // remain protected.
   mountWebUi(app, config, logger);
 
+  let localCredential: string | null = null;
+  const daemonAuth = { ...config.auth, localCredential: () => localCredential };
   app.use(
-    createRequireBearerMiddleware(config.auth, (context) => {
+    createRequireBearerMiddleware(daemonAuth, (context) => {
       logger.warn(context, "Rejected HTTP request with invalid daemon password");
     }),
   );
@@ -779,7 +805,7 @@ export async function createPaseoDaemon(
     res.json({
       status: "server_info",
       serverId,
-      hostname: getHostname(),
+      hostname: getHostName(),
       version: daemonVersion,
       listen: formatListenTarget(boundListenTarget ?? listenTarget),
     });
@@ -806,18 +832,21 @@ export async function createPaseoDaemon(
     try {
       fileHandle = await open(entry.absolutePath, DOWNLOAD_OPEN_FLAGS);
       const fileStats = await fileHandle.stat();
+      if (res.destroyed) {
+        return;
+      }
       if (!fileStats.isFile()) {
         res.status(404).json({ error: "File not found" });
         return;
       }
 
-      const safeFileName = entry.fileName.replace(/["\r\n]/g, "_");
       res.setHeader("Content-Type", entry.mimeType);
-      res.setHeader("Content-Disposition", `attachment; filename="${safeFileName}"`);
+      res.setHeader("Content-Disposition", formatAttachmentContentDisposition(entry.fileName));
       res.setHeader("Content-Length", fileStats.size.toString());
 
       const stream = fileHandle.createReadStream();
       fileHandle = null;
+      res.once("close", () => stream.destroy());
       stream.on("error", (err) => {
         logger.error({ err }, "Failed to stream download");
         if (!res.headersSent) {
@@ -875,11 +904,20 @@ export async function createPaseoDaemon(
       forgeOverrides: { github },
     },
   });
+  workspaceRegistry.subscribeToMutations((mutation) => {
+    if (mutation.kind === "archive" && mutation.workspace) {
+      pluginRuntime.emit("workspace.archived", {
+        workspace: describeHookWorkspace(mutation.workspace),
+      });
+    }
+  });
   const workspaceProvisioning = createWorkspaceProvisioningService({
+    lifecycle: pluginRuntime,
     serverId,
     projectRegistry,
     workspaceRegistry,
     workspaceGitService,
+    isDirectory: async (target) => (await stat(target).catch(() => null))?.isDirectory() ?? false,
     logger,
   });
   const agentProviderRuntime = await createAgentProviderRuntime({
@@ -909,6 +947,7 @@ export async function createPaseoDaemon(
   });
   const initialAgentManagerState = providerSnapshotManager.getAgentManagerProviderState();
   const agentManager = new AgentManager({
+    pluginLifecycle: pluginRuntime,
     clients: initialAgentManagerState.clients,
     providerDefinitions: initialAgentManagerState.providerDefinitions,
     registry: agentStorage,
@@ -917,8 +956,17 @@ export async function createPaseoDaemon(
       workspaceGitService.onWorkspaceStateMayHaveChanged(cwd);
     },
     mcpAuthToken: agentMcpAuthToken,
+    resolvePaseoToolPolicy: (provider) =>
+      resolvePaseoToolPolicy(provider, daemonConfigStore.get().providers),
     logger,
   });
+  const syncPluginProviders = () => {
+    agentManager.updateProviderRegistry(
+      providerSnapshotManager.replacePluginProviders(pluginRuntime.getProviderRegistrations()),
+    );
+  };
+  const unsubscribePluginProviders =
+    pluginRuntime.subscribeProviderRegistrations(syncPluginProviders);
 
   const detachAgentStoragePersistence = attachAgentStoragePersistence(
     logger,
@@ -987,10 +1035,13 @@ export async function createPaseoDaemon(
   const ensureWorkspaceForCreateExternal = async (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ): Promise<string> => {
     const workspace = await workspaceProvisioning.createWorkspaceForDirectory(
       cwd,
       resolveFirstAgentPromptTitle(firstAgentContext),
+      undefined,
+      context,
     );
     if (firstAgentContext) {
       workspaceAutoName.scheduleForDirectory({
@@ -1037,8 +1088,9 @@ export async function createPaseoDaemon(
   const ensureWorkspaceForCreateAndBroadcastExternal = async (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ): Promise<string> => {
-    const workspaceId = await ensureWorkspaceForCreateExternal(cwd, firstAgentContext);
+    const workspaceId = await ensureWorkspaceForCreateExternal(cwd, firstAgentContext, context);
     await emitWorkspaceUpdatesExternal([workspaceId]);
     return workspaceId;
   };
@@ -1126,7 +1178,6 @@ export async function createPaseoDaemon(
         emit: emitExternalSessionMessage,
         sessionLogger: logger,
         terminalManager,
-        archiveWorkspaceRecord: archiveWorkspaceRecordExternal,
         serviceProxy,
         scriptRuntimeStore,
         getDaemonTcpPort: () => (boundListenTarget?.type === "tcp" ? boundListenTarget.port : null),
@@ -1201,7 +1252,7 @@ export async function createPaseoDaemon(
   });
   const hubRelationships = new HubRelationshipController({
     paseoHome: config.paseoHome,
-    hostname: getHostname(),
+    hostname: getHostName(),
     serverId,
     daemonPublicKey: daemonKeyPair.publicKeyB64,
     logger,
@@ -1356,11 +1407,12 @@ export async function createPaseoDaemon(
     emitWorkspaceUpdatesForWorkspaceIds: emitWorkspaceUpdatesExternal,
     workspaceRegistry,
     projectRegistry,
-    createDirectoryWorkspace: async (cwd, title, projectId) => {
+    createDirectoryWorkspace: async (cwd, title, projectId, context) => {
       const workspace = await workspaceProvisioning.createWorkspaceForDirectory(
         cwd,
         title,
         projectId,
+        context,
       );
       await emitWorkspaceUpdatesExternal([workspace.workspaceId]);
       return workspace;
@@ -1377,9 +1429,8 @@ export async function createPaseoDaemon(
       serviceProxyPublicBaseUrl,
       resolveScriptHealth: (hostname) => scriptHealthMonitor.getHealthForHostname(hostname),
       logger,
-      // MCP operations do not belong to one WebSocket session, so lifecycle
-      // status updates fan out to every connected client.
       emit: (message) => wsServer?.broadcast(wrapSessionMessage(message)),
+      publishStatusUpdate: (message) => wsServer?.publishScriptStatusUpdate(message),
       spawnWorkspaceScript,
       assertAutomationAllowed: (workspaceId) =>
         assertWorkspaceAutomationAllowedForWorkspace(workspaceRegistry, workspaceId),
@@ -1391,6 +1442,9 @@ export async function createPaseoDaemon(
     createPaseoWorktree: createAgentCommandDependencies.createPaseoWorktree,
     browserToolsEnabled: browserToolsPolicy.isEnabled(),
     browserToolsBroker,
+    paseoToolPolicy:
+      runtime.paseoToolPolicy ??
+      (runtime.callerAgentId ? agentManager.getPaseoToolPolicy(runtime.callerAgentId) : undefined),
     paseoHome: config.paseoHome,
     worktreesRoot: config.worktreesRoot,
     callerAgentId: runtime.callerAgentId,
@@ -1416,7 +1470,12 @@ export async function createPaseoDaemon(
 
     const createAgentMcpSession = async (callerAgentId?: string) => {
       const agentMcpServer = await createAgentMcpServer(
-        createAgentToolHostDependencies({ callerAgentId }),
+        createAgentToolHostDependencies({
+          callerAgentId,
+          paseoToolPolicy: callerAgentId
+            ? agentManager.getPaseoToolPolicy(callerAgentId)
+            : undefined,
+        }),
       );
 
       // Stateless mode: each HTTP request builds a fresh server + transport that is
@@ -1544,6 +1603,7 @@ export async function createPaseoDaemon(
   const start = async () => {
     let mainStarted = false;
     try {
+      localCredential = await writeLocalCredential(config.paseoHome);
       if (serviceProxyListenTarget) {
         const boundServiceProxyTarget = await serviceProxy.startStandalone({
           listenTarget: serviceProxyListenTarget,
@@ -1637,7 +1697,7 @@ export async function createPaseoDaemon(
                 startPaused: true,
               },
               workspaceAutoName,
-              config.auth,
+              daemonAuth,
               speechService,
               terminalManager,
               {
@@ -1691,6 +1751,7 @@ export async function createPaseoDaemon(
             );
             pluginRuntime.bindPaseoSessionHost(wsServer);
             await pluginRuntime.start();
+            providerSnapshotManager.settlePluginProviders();
             wsServer.beginAcceptingConnections();
             relayRuntime = createRelayRuntime({
               config: {
@@ -1734,6 +1795,9 @@ export async function createPaseoDaemon(
       speechService.start();
       scriptHealthMonitor.start();
     } catch (error) {
+      localCredential = null;
+      await deleteLocalCredential(config.paseoHome);
+      unsubscribePluginProviders();
       await pluginRuntime.stopAllPlugins().catch(() => undefined);
       await serviceProxy.stopStandalone().catch(() => undefined);
       await agentProviderRuntime.shutdown().catch(() => undefined);
@@ -1746,7 +1810,13 @@ export async function createPaseoDaemon(
   };
 
   const stop = async () => {
-    await pluginRuntime.stopAllPlugins();
+    localCredential = null;
+    await deleteLocalCredential(config.paseoHome);
+    // Stop tracking plugin provider registrations before anything tears plugins
+    // down, so plugin shutdown cannot withdraw a provider from under an agent
+    // that is still open. Plugins themselves are stopped once every session
+    // they serve has been closed, further down.
+    unsubscribePluginProviders();
     await hubRelationships.stop();
     workspaceReconciliation.dispose();
     scriptHealthMonitor.stop();
@@ -1754,10 +1824,16 @@ export async function createPaseoDaemon(
     wsServer?.prepareForShutdown();
     agentManager.prepareForShutdown();
     await closeAllAgents(logger, agentManager);
+    await withTimeout({
+      promise: pluginRuntime.drainEvents(),
+      timeoutMs: AGENT_CLOSE_TIMEOUT_MS,
+      label: "drain plugin lifecycle events",
+    }).catch((error) => logger.warn({ err: error }, "Plugin lifecycle events did not finish"));
     await agentManager.flushForShutdown().catch(() => undefined);
     detachAgentStoragePersistence();
     await agentStorage.flush().catch(() => undefined);
     await agentProviderRuntime.shutdown();
+    await pluginRuntime.stopAllPlugins();
     terminalManager.killAll();
     await speechService.stop();
     await scheduleService.stop().catch(() => undefined);
@@ -1794,15 +1870,28 @@ export async function createPaseoDaemon(
     start,
     stop,
     getListenTarget: () => boundListenTarget,
+    getServerId: () => serverId,
   };
 }
 
+/**
+ * Closing an agent asks its provider to close the session and waits for the
+ * answer. A provider that never answers must not hold the daemon open, so a
+ * close that outlives this deadline is abandoned; `agentProviderRuntime`
+ * shutdown runs next and rejects the request that was still pending.
+ */
+const AGENT_CLOSE_TIMEOUT_MS = 5_000;
+
 async function closeAllAgents(logger: Logger, agentManager: AgentManager): Promise<void> {
-  const agents = agentManager.listAgents();
+  const agents = agentManager.listAgents({ includeInternal: true });
   await Promise.all(
     agents.map(async (agent) => {
       try {
-        await agentManager.closeAgent(agent.id);
+        await withTimeout({
+          promise: agentManager.closeAgent(agent.id),
+          timeoutMs: AGENT_CLOSE_TIMEOUT_MS,
+          label: `close agent ${agent.id}`,
+        });
       } catch (err) {
         logger.error({ err, agentId: agent.id }, "Failed to close agent");
       }
diff --git a/packages/server/src/server/browser-tools/broker.ts b/packages/server/src/server/browser-tools/broker.ts
index dc1eca7f2d..b59094de20 100644
--- a/packages/server/src/server/browser-tools/broker.ts
+++ b/packages/server/src/server/browser-tools/broker.ts
@@ -158,7 +158,10 @@ export class BrowserToolsBroker {
     });
   }
 
-  public receiveResponse(response: BrowserAutomationExecuteResponse): boolean {
+  public receiveResponse(
+    response: BrowserAutomationExecuteResponse,
+    clientIds?: readonly string[],
+  ): boolean {
     const parsed = BrowserAutomationExecuteResponseSchema.safeParse(response);
     if (!parsed.success) {
       const requestId = getBrowserAutomationResponseRequestId(response);
@@ -167,7 +170,7 @@ export class BrowserToolsBroker {
       }
 
       const pending = this.pending.get(requestId);
-      if (!pending) {
+      if (!pending || (clientIds && !clientIds.includes(pending.clientId))) {
         return false;
       }
 
@@ -184,7 +187,7 @@ export class BrowserToolsBroker {
     }
 
     const pending = this.pending.get(parsed.data.payload.requestId);
-    if (!pending) {
+    if (!pending || (clientIds && !clientIds.includes(pending.clientId))) {
       return false;
     }
 
diff --git a/packages/server/src/server/checkout-diff-cache.test.ts b/packages/server/src/server/checkout-diff-cache.test.ts
new file mode 100644
index 0000000000..e2ac4f31ba
--- /dev/null
+++ b/packages/server/src/server/checkout-diff-cache.test.ts
@@ -0,0 +1,116 @@
+import { expect, test } from "vitest";
+import { CheckoutDiffCache } from "@server/server/checkout-diff-cache.js";
+
+function createSequencedLoader<T>(first: Promise<T>, second: Promise<T>) {
+  let calls = 0;
+  return {
+    load: () => (++calls === 1 ? first : second),
+    get calls() {
+      return calls;
+    },
+  };
+}
+
+async function fillCompletedCache(cache: CheckoutDiffCache) {
+  for (let i = 0; i < 70; i++) {
+    await cache.read({
+      cwd: String(i),
+      compare: { mode: "base" },
+      load: async () => ({ diff: "" }),
+    });
+  }
+}
+
+test("forced reads after a mutation share a fresh build after the active build finishes", async () => {
+  const cache = new CheckoutDiffCache(() => 0);
+  const first = Promise.withResolvers<{ diff: string }>();
+  const second = Promise.withResolvers<{ diff: string }>();
+  const loader = createSequencedLoader(first.promise, second.promise);
+  const { load } = loader;
+  const pending = cache.read({ cwd: "repo", compare: { mode: "base" }, load });
+  await Promise.resolve();
+  const options = { force: true, reason: "repository-mutation" };
+  const fresh = cache.read({ cwd: "repo", compare: { mode: "base" }, ...options, load });
+  const another = cache.read({ cwd: "repo", compare: { mode: "base" }, ...options, load });
+  expect(loader.calls).toBe(1);
+  first.resolve({ diff: "before-mutation" });
+  expect(await pending).toEqual({ diff: "before-mutation" });
+  await Promise.resolve();
+  await Promise.resolve();
+  expect(loader.calls).toBe(2);
+  second.resolve({ diff: "after-mutation" });
+  expect(await fresh).toEqual({ diff: "after-mutation" });
+  expect(await another).toEqual({ diff: "after-mutation" });
+  expect(await cache.read({ cwd: "repo", compare: { mode: "base" }, load })).toEqual({
+    diff: "after-mutation",
+  });
+  expect(loader.calls).toBe(2);
+});
+
+test("reads after invalidation wait for fresh work without overlapping the original read", async () => {
+  const cache = new CheckoutDiffCache(() => 0);
+  const first = Promise.withResolvers<{ diff: string }>();
+  const second = Promise.withResolvers<{ diff: string }>();
+  const loader = createSequencedLoader(first.promise, second.promise);
+  const { load } = loader;
+  const read = () => cache.read({ cwd: "repo", compare: { mode: "base" }, load });
+  const pending = read();
+  await Promise.resolve();
+  cache.invalidate("repo", "base");
+  cache.invalidate("repo", "base");
+  const fresh = read();
+  const another = read();
+  expect(loader.calls).toBe(1);
+  first.resolve({ diff: "old" });
+  expect(await pending).toEqual({ diff: "old" });
+  await Promise.resolve();
+  await Promise.resolve();
+  expect(loader.calls).toBe(2);
+  second.resolve({ diff: "new" });
+  expect(await fresh).toEqual({ diff: "new" });
+  expect(await another).toEqual({ diff: "new" });
+  expect(await read()).toEqual({ diff: "new" });
+  expect(loader.calls).toBe(2);
+});
+
+test("edits during a read do not delay its caller or cache its outdated snapshot", async () => {
+  const cache = new CheckoutDiffCache(() => 0);
+  const deferred = Promise.withResolvers<{ diff: string }>();
+  let calls = 0;
+  const load = () => {
+    calls += 1;
+    return deferred.promise;
+  };
+  const pending = cache.read({ cwd: "repo", compare: { mode: "uncommitted" }, load });
+  await Promise.resolve();
+  cache.invalidate("repo", "uncommitted");
+  deferred.resolve({ diff: "snapshot" });
+  expect(await pending).toEqual({ diff: "snapshot" });
+  expect(calls).toBe(1);
+  expect(
+    await cache.read({
+      cwd: "repo",
+      compare: { mode: "uncommitted" },
+      load: async () => ({ diff: "fresh" }),
+    }),
+  ).toEqual({ diff: "fresh" });
+});
+
+test("active reads survive completed-payload eviction and failed reads can retry", async () => {
+  const cache = new CheckoutDiffCache(() => 0);
+  const deferred = Promise.withResolvers<{ diff: string }>();
+  const load = () => deferred.promise;
+  const first = cache.read({ cwd: "active", compare: { mode: "uncommitted" }, load });
+  const rejected = expect(first).rejects.toThrow("read failed");
+  await fillCompletedCache(cache);
+  expect(cache.read({ cwd: "active", compare: { mode: "uncommitted" }, load })).toBe(first);
+  deferred.reject(new Error("read failed"));
+  await rejected;
+  expect(
+    await cache.read({
+      cwd: "active",
+      compare: { mode: "uncommitted" },
+      load: async () => ({ diff: "retry" }),
+    }),
+  ).toEqual({ diff: "retry" });
+});
diff --git a/packages/server/src/server/checkout-diff-cache.ts b/packages/server/src/server/checkout-diff-cache.ts
new file mode 100644
index 0000000000..38675bea37
--- /dev/null
+++ b/packages/server/src/server/checkout-diff-cache.ts
@@ -0,0 +1,92 @@
+import { LRUCache } from "lru-cache";
+import type { CheckoutDiffCompare, CheckoutDiffResult } from "../utils/checkout-git.js";
+
+interface ActiveRead {
+  promise: Promise<CheckoutDiffResult>;
+  invalidated: boolean;
+}
+
+interface CachedDiff {
+  value: CheckoutDiffResult;
+  loadedAt: number;
+  lastReadStarted: number;
+}
+
+interface CheckoutDiffReadInput {
+  cwd: string;
+  compare: CheckoutDiffCompare;
+  force?: boolean;
+  reason?: string;
+  load: () => Promise<CheckoutDiffResult>;
+}
+
+/** Completed payloads are bounded; active work survives invalidation and eviction. */
+export class CheckoutDiffCache {
+  private readonly values = new LRUCache<string, CachedDiff>({
+    max: 64,
+  });
+  private readonly active = new Map<string, ActiveRead>();
+
+  constructor(private readonly now: () => number) {}
+
+  read(input: CheckoutDiffReadInput): Promise<CheckoutDiffResult> {
+    const { cwd, compare, force, reason, load } = input;
+    if (force && !reason) throw new Error("WorkspaceGitService forced read requires a reason");
+    const key = JSON.stringify([
+      cwd,
+      compare.mode,
+      compare.mode === "base" ? (compare.baseRef ?? null) : null,
+      compare.ignoreWhitespace === true,
+      compare.includeStructured === true,
+    ]);
+    const cached = this.values.get(key);
+    const now = this.now();
+    if (
+      !force &&
+      cached &&
+      (now - cached.loadedAt <= 15_000 || now - cached.lastReadStarted < 2_000)
+    )
+      return Promise.resolve(cached.value);
+    const pending = this.active.get(key);
+    if (pending) {
+      if (force) {
+        pending.invalidated = true;
+        this.values.delete(key);
+      }
+      if (!pending.invalidated) return pending.promise;
+      // A caller arriving after a change needs a fresh read, once the old one
+      // finishes. The original caller can still receive its snapshot promptly.
+      // The older result cannot enter the cache. Drop force when retrying so
+      // callers waiting on that same result share the next fresh build.
+      const reload = () => this.read({ ...input, force: false });
+      return pending.promise.then(reload, reload);
+    }
+    if (cached) cached.lastReadStarted = now;
+
+    // Defer load until ownership is installed, including synchronous invalidations.
+    const read: ActiveRead = {
+      invalidated: false,
+      promise: Promise.resolve()
+        .then(load)
+        .then((value) => {
+          // Never repopulate the cache with a snapshot invalidated during its build.
+          if (!read.invalidated)
+            this.values.set(key, { value, loadedAt: this.now(), lastReadStarted: now });
+          return value;
+        })
+        .finally(() => this.active.delete(key)),
+    };
+    this.active.set(key, read);
+    return read.promise;
+  }
+
+  invalidate(cwd: string, mode: CheckoutDiffCompare["mode"]): void {
+    for (const key of new Set([...this.values.keys(), ...this.active.keys()])) {
+      const [cachedCwd, cachedMode] = JSON.parse(key) as string[];
+      if (cachedCwd !== cwd || cachedMode !== mode) continue;
+      this.values.delete(key);
+      const pending = this.active.get(key);
+      if (pending) pending.invalidated = true;
+    }
+  }
+}
diff --git a/packages/server/src/server/checkout-diff-manager.ts b/packages/server/src/server/checkout-diff-manager.ts
index 9bf0439aff..628bb32a0a 100644
--- a/packages/server/src/server/checkout-diff-manager.ts
+++ b/packages/server/src/server/checkout-diff-manager.ts
@@ -73,6 +73,12 @@ export class CheckoutDiffManager {
     this.workspaceGitService = options.workspaceGitService;
   }
 
+  async read(
+    params: Omit<CheckoutDiffSubscriptionRequest, "signal">,
+  ): Promise<CheckoutDiffSnapshotPayload> {
+    return this.computeCheckoutDiffSnapshot(params.cwd, this.normalizeCompare(params.compare));
+  }
+
   async subscribe(
     params: CheckoutDiffSubscriptionRequest,
     listener: (snapshot: CheckoutDiffSnapshotPayload) => void,
diff --git a/packages/server/src/server/cli-agent-logs.test.ts b/packages/server/src/server/cli-agent-logs.test.ts
new file mode 100644
index 0000000000..634d0615c0
--- /dev/null
+++ b/packages/server/src/server/cli-agent-logs.test.ts
@@ -0,0 +1,283 @@
+import { test } from "vitest";
+import assert from "node:assert";
+import { spawn } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { fileURLToPath } from "node:url";
+import type { Readable } from "node:stream";
+import { join } from "node:path";
+import { createDaemonTestContext } from "./test-utils/daemon-test-context.js";
+import { createTestAgentClients } from "./test-utils/fake-agent-client.js";
+import type { AgentStreamEvent } from "@getpaseo/protocol/agent-types";
+
+interface CliResult {
+  exitCode: number | null;
+  stdout: string;
+  stderr: string;
+}
+type CliProcess = Promise<CliResult> & { stdout: Readable; kill: (signal: NodeJS.Signals) => void };
+
+function waitForCliOutput(child: CliProcess, text: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    let output = "";
+    const onData = (chunk: Buffer) => {
+      output += chunk.toString();
+      if (output.includes(text)) {
+        cleanup();
+        resolve();
+      }
+    };
+    const cleanup = () => {
+      clearTimeout(timer);
+      child.stdout.off("data", onData);
+    };
+    const timer = setTimeout(() => {
+      cleanup();
+      reject(new Error(`CLI did not print ${text}:\n${output}`));
+    }, 20_000);
+    child.stdout.on("data", onData);
+    void child.then(
+      (result) => {
+        cleanup();
+        return reject(new Error(`CLI exited before ${text}:\n${result.stderr}`));
+      },
+      (error) => {
+        cleanup();
+        reject(error);
+      },
+    );
+  });
+}
+
+test("logs --since filters history and live output through the CLI and daemon", async () => {
+  const cliHome = await mkdtemp(join(tmpdir(), "paseo-logs-cli-home-"));
+  const port = 1; // Invalid dates must fail before trying this unavailable endpoint.
+  const runLocalPaseo = (
+    args: string[],
+    env: NodeJS.ProcessEnv = {},
+    cwd = cliHome,
+  ): CliProcess => {
+    const child = spawn(
+      process.execPath,
+      [
+        "--no-warnings",
+        "--conditions=source",
+        "--import",
+        import.meta.resolve("tsx"),
+        fileURLToPath(new URL("../../../cli/src/index.ts", import.meta.url)),
+        ...args,
+      ],
+      {
+        cwd,
+        env: {
+          ...Object.fromEntries(
+            Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+          ),
+          ...env,
+          HOME: cliHome,
+          USERPROFILE: cliHome,
+        },
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 25_000,
+      },
+    );
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    const done = new Promise<CliResult>((resolve, reject) => {
+      child.on("error", reject);
+      child.on("close", (exitCode) => resolve({ exitCode, stdout, stderr }));
+    });
+    return Object.assign(done, {
+      stdout: child.stdout,
+      kill: (signal: NodeJS.Signals) => {
+        child.kill(signal);
+      },
+    });
+  };
+  // Follow assertions check output; Windows forcibly terminates Node on SIGINT.
+  try {
+    console.log("--since filters logs through the real CLI and daemon");
+    const historyEvents: AgentStreamEvent[] = [];
+    const ctx = await createDaemonTestContext({
+      agentClients: createTestAgentClients({ historyEvents }),
+    });
+    try {
+      const agent = await ctx.client.createAgent({
+        provider: "codex",
+        cwd: ctx.daemon.paseoHome,
+        title: "logs since",
+      });
+      const manager = ctx.daemon.daemon.agentManager;
+      await manager.appendTimelineItem(agent.id, { type: "user_message", text: "OLD_USER" });
+      await manager.appendTimelineItem(agent.id, { type: "assistant_message", text: "OLD_REPLY" });
+      const host = `127.0.0.1:${ctx.daemon.port}`;
+      const logs = (args: string[]) =>
+        runLocalPaseo(["--host", host, ...args], {}, ctx.daemon.paseoHome);
+
+      const baseline = await logs(["logs", agent.id]);
+      assert.strictEqual(baseline.exitCode, 0, baseline.stderr);
+      assert.strictEqual(baseline.stdout, "[User] OLD_USER\nOLD_REPLY\n");
+
+      for (const command of [["logs"], ["agent", "logs"]]) {
+        const result = await logs([...command, agent.id, "--since", "2100-01-01T00:00:00Z"]);
+        console.log(`paseo ${command.join(" ")} <id> --since 2100-01-01T00:00:00Z`);
+        console.log(`exit=${result.exitCode}\nstdout:\n${result.stdout}stderr:\n${result.stderr}`);
+        assert.strictEqual(result.exitCode, 0, result.stderr);
+        assert.strictEqual(result.stdout, "No activity to display.\n");
+      }
+
+      const timeline = await ctx.client.fetchAgentTimeline(agent.id, {
+        direction: "tail",
+        limit: 0,
+        projection: "projected",
+      });
+      const firstTimestamp = timeline.entries[0]?.timestamp;
+      assert(firstTimestamp !== undefined, "the fixture should have timestamped activity");
+      for (const since of ["2000-01-01T00:00:00Z", firstTimestamp]) {
+        const result = await logs(["logs", agent.id, "--since", since]);
+        assert.strictEqual(result.exitCode, 0, result.stderr);
+        assert.strictEqual(result.stdout, baseline.stdout);
+      }
+
+      const offset = await logs(["logs", agent.id, "--since", "2100-01-01T08:00:00+08:00"]);
+      assert.strictEqual(offset.exitCode, 0, offset.stderr);
+      assert.strictEqual(offset.stdout, "No activity to display.\n");
+
+      const tail = await logs([
+        "logs",
+        agent.id,
+        "--since",
+        "2000-01-01T00:00:00Z",
+        "--filter",
+        "text",
+        "--tail",
+        "1",
+      ]);
+      assert.strictEqual(tail.exitCode, 0, tail.stderr);
+      assert.strictEqual(tail.stdout, "OLD_REPLY\n");
+
+      const empty = await logs(["logs", agent.id, "--since", firstTimestamp, "--tail", "0"]);
+      assert.strictEqual(empty.exitCode, 0, empty.stderr);
+      assert.strictEqual(empty.stdout, "");
+
+      for (const followArgs of [[], ["--follow"]]) {
+        const invalid = await runLocalPaseo([
+          "--host",
+          `127.0.0.1:${port}`,
+          "logs",
+          "missing-agent",
+          "--since",
+          "not-a-date",
+          "--json",
+          ...followArgs,
+        ]);
+        assert.strictEqual(invalid.exitCode, 1, invalid.stderr);
+        assert.strictEqual(invalid.stdout, "");
+        assert.deepStrictEqual(JSON.parse(invalid.stderr), {
+          error: {
+            code: "INVALID_TIMESTAMP",
+            message: "Invalid --since value: not-a-date",
+            details: "Use a timestamp such as 2026-01-01T00:00:00Z.",
+          },
+        });
+      }
+
+      console.log("--since filters initial history in follow mode");
+      const follow = logs(["logs", agent.id, "--follow", "--since", "2100-01-01T00:00:00Z"]);
+      try {
+        await waitForCliOutput(follow, "--- Following logs");
+      } finally {
+        await follow.kill("SIGINT");
+      }
+      const followed = await follow;
+      console.log(`follow exit=${followed.exitCode}\nstdout:\n${followed.stdout}`);
+      assert.strictEqual(followed.stdout.includes("OLD_USER"), false);
+      assert.strictEqual(followed.stdout.includes("OLD_REPLY"), false);
+
+      console.log("--since filters live events in follow mode");
+      const futureFollow = logs([
+        "agent",
+        "logs",
+        agent.id,
+        "-f",
+        "--tail",
+        "0",
+        "--since",
+        "2100-01-01T00:00:00Z",
+      ]);
+      try {
+        await waitForCliOutput(futureFollow, "--- Following logs");
+        // A timestamped history replay follows the live item on the same socket.
+        // Its visible output proves the CLI consumed the earlier item too.
+        await Promise.all([
+          waitForCliOutput(futureFollow, "AFTER_CUTOFF"),
+          (async () => {
+            await manager.appendTimelineItem(agent.id, {
+              type: "user_message",
+              text: "LIVE_BEFORE_CUTOFF",
+            });
+            historyEvents.push({
+              type: "timeline",
+              provider: "codex",
+              timestamp: "2110-01-01T00:00:00Z",
+              item: { type: "user_message", text: "AFTER_CUTOFF" },
+            });
+            await ctx.client.refreshAgent(agent.id);
+          })(),
+        ]);
+      } finally {
+        await futureFollow.kill("SIGINT");
+      }
+      const futureOutput = await futureFollow;
+      console.log(`future follow exit=${futureOutput.exitCode}\nstdout:\n${futureOutput.stdout}`);
+      assert.strictEqual(futureOutput.stdout.includes("LIVE_BEFORE_CUTOFF"), false);
+
+      console.log("follow still prints live events after --since");
+      const pastFollow = logs([
+        "logs",
+        agent.id,
+        "--follow",
+        "--tail",
+        "0",
+        "--filter",
+        "text",
+        "--since",
+        "2000-01-01T00:00:00Z",
+      ]);
+      try {
+        await waitForCliOutput(pastFollow, "--- Following logs");
+        await Promise.all([
+          // Wait for a later visible item to close the streamed reply.
+          // Windows SIGINT forcibly exits without running shutdown handlers.
+          waitForCliOutput(pastFollow, "[User] LIVE_AFTER_REPLY\n"),
+          (async () => {
+            await manager.appendTimelineItem(agent.id, { type: "user_message", text: "LIVE_USER" });
+            await manager.appendTimelineItem(agent.id, {
+              type: "assistant_message",
+              text: "LIVE_REPLY",
+            });
+            await manager.appendTimelineItem(agent.id, {
+              type: "user_message",
+              text: "LIVE_AFTER_REPLY",
+            });
+          })(),
+        ]);
+      } finally {
+        await pastFollow.kill("SIGINT");
+      }
+      const pastOutput = await pastFollow;
+      console.log(`past follow exit=${pastOutput.exitCode}\nstdout:\n${pastOutput.stdout}`);
+      assert(pastOutput.stdout.includes("[User] LIVE_USER\nLIVE_REPLY\n"), pastOutput.stdout);
+    } finally {
+      await ctx.cleanup();
+    }
+  } finally {
+    await rm(cliHome, { recursive: true, force: true });
+  }
+}, 120_000);
diff --git a/packages/server/src/server/cli-run-workspace-precedence.e2e.test.ts b/packages/server/src/server/cli-run-workspace-precedence.e2e.test.ts
index e0524c8948..0247e7af97 100644
--- a/packages/server/src/server/cli-run-workspace-precedence.e2e.test.ts
+++ b/packages/server/src/server/cli-run-workspace-precedence.e2e.test.ts
@@ -40,7 +40,7 @@ test("daemon resolves human and managed CLI workspace ownership", async () => {
 
   try {
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
+    await client.fetchAgents({ subscribe: {} });
 
     // A bare run mints a fresh local workspace for the cwd, then the agent is
     // stamped with that workspace's id.
diff --git a/packages/server/src/server/client-activity.e2e.test.ts b/packages/server/src/server/client-activity.e2e.test.ts
index 5348ea44d8..316fca8d85 100644
--- a/packages/server/src/server/client-activity.e2e.test.ts
+++ b/packages/server/src/server/client-activity.e2e.test.ts
@@ -84,14 +84,11 @@ describe("client activity tracking", () => {
         reject(new Error(`Timeout waiting for attention_required (${timeout}ms)`));
       }, timeout);
 
-      const cleanup = client.on("agent_stream", (msg) => {
-        if (msg.type !== "agent_stream") return;
-        if (msg.payload.agentId !== agentId) return;
-        if (msg.payload.event.type !== "attention_required") return;
-
+      const cleanup = client.onAgentAttentionRequired((notification) => {
+        if (notification.agentId !== agentId) return;
         clearTimeout(timer);
         cleanup();
-        resolve(msg.payload.event);
+        resolve({ type: "attention_required", ...notification });
       });
     });
   }
@@ -107,7 +104,7 @@ describe("client activity tracking", () => {
         reject(new Error(`Timeout waiting for assistant timeline (${timeout}ms)`));
       }, timeout);
 
-      const cleanup = client.on("agent_stream", (msg) => {
+      const cleanup = client.subscribeAgentTimeline(agentId, (msg) => {
         if (msg.type !== "agent_stream") return;
         if (msg.payload.agentId !== agentId) return;
         if (msg.payload.event.type !== "timeline") return;
diff --git a/packages/server/src/server/config-auth.test.ts b/packages/server/src/server/config-auth.test.ts
index 0951a2438b..d7a9f25110 100644
--- a/packages/server/src/server/config-auth.test.ts
+++ b/packages/server/src/server/config-auth.test.ts
@@ -4,7 +4,7 @@ import path from "node:path";
 import { afterEach, describe, expect, test } from "vitest";
 
 import { loadConfig } from "./config.js";
-import { isBearerTokenValid } from "./auth.js";
+import { isBearerTokenValidAsync } from "./auth.js";
 
 const roots: string[] = [];
 const CONFIG_PASSWORD_HASH = "$2b$12$OLxyuuP9uLK30Uzc4wQX0O6liuU/Q1t5P2b0Ebf36mULvpVK3DRZW";
@@ -34,9 +34,9 @@ describe("daemon auth config", () => {
     const config = loadConfig(paseoHome, { env: {} });
 
     expect(config.auth?.password).toBe(CONFIG_PASSWORD_HASH);
-    expect(isBearerTokenValid({ password: config.auth?.password, token: "correct-password" })).toBe(
-      true,
-    );
+    expect(
+      await isBearerTokenValidAsync({ password: config.auth?.password, token: "correct-password" }),
+    ).toBe(true);
   });
 
   test("lets PASEO_PASSWORD override config.json auth password hash", async () => {
@@ -53,6 +53,8 @@ describe("daemon auth config", () => {
 
     expect(config.auth?.password).not.toBe(CONFIG_PASSWORD_HASH);
     expect(config.auth?.password).toMatch(/^\$2[aby]\$12\$/);
-    expect(isBearerTokenValid({ password: config.auth?.password, token: "from-env" })).toBe(true);
+    expect(
+      await isBearerTokenValidAsync({ password: config.auth?.password, token: "from-env" }),
+    ).toBe(true);
   });
 });
diff --git a/packages/server/src/server/config-environment.ts b/packages/server/src/server/config-environment.ts
new file mode 100644
index 0000000000..24134035de
--- /dev/null
+++ b/packages/server/src/server/config-environment.ts
@@ -0,0 +1,91 @@
+// Daemon configuration inputs. General provider credentials and executable/runtime
+// controls remain available to managed launches and their agent processes.
+export const DAEMON_SETTING_ENV_KEYS = [
+  "MCP_DEBUG",
+  "OPENAI_STT_BASE_URL",
+  "OPENAI_TTS_BASE_URL",
+  "PASEO_ALLOWED_HOSTS",
+  "PASEO_APP_BASE_URL",
+  "PASEO_CORS_ORIGINS",
+  "PASEO_DICTATION_ENABLED",
+  "PASEO_DICTATION_LANGUAGE",
+  "PASEO_DICTATION_LOCAL_STT_MODEL",
+  "PASEO_DICTATION_STT_PROVIDER",
+  "PASEO_GIT_CONCURRENCY",
+  "PASEO_GIT_MAX_PROCESSES_PER_SECOND",
+  "PASEO_GIT_MAX_PROCESS_CONCURRENCY",
+  "PASEO_HOSTNAMES",
+  "PASEO_LISTEN",
+  "PASEO_LOCAL_MODELS_DIR",
+  "PASEO_LOG",
+  "PASEO_LOG_CONSOLE_FORMAT",
+  "PASEO_LOG_CONSOLE_LEVEL",
+  "PASEO_LOG_FILE_LEVEL",
+  "PASEO_LOG_FILE_PATH",
+  "PASEO_LOG_FILE_ROTATE_COUNT",
+  "PASEO_LOG_FILE_ROTATE_SIZE",
+  "PASEO_LOG_FORMAT",
+  "PASEO_LOG_LEVEL",
+  "PASEO_LOG_ROTATE_COUNT",
+  "PASEO_LOG_ROTATE_SIZE",
+  "PASEO_PASSWORD",
+  "PASEO_PLUGIN_REGISTRY",
+  "PASEO_RELAY_ENABLED",
+  "PASEO_RELAY_ENDPOINT",
+  "PASEO_RELAY_PUBLIC_ENDPOINT",
+  "PASEO_RELAY_PUBLIC_USE_TLS",
+  "PASEO_RELAY_USE_TLS",
+  "PASEO_SERVICE_PROXY_ENABLED",
+  "PASEO_SERVICE_PROXY_LISTEN",
+  "PASEO_SERVICE_PROXY_PUBLIC_BASE_URL",
+  "PASEO_TRUSTED_PROXIES",
+  "PASEO_VOICE_LANGUAGE",
+  "PASEO_VOICE_LLM_PROVIDER",
+  "PASEO_VOICE_LOCAL_STT_MODEL",
+  "PASEO_VOICE_LOCAL_TTS_MODEL",
+  "PASEO_VOICE_LOCAL_TTS_SPEAKER_ID",
+  "PASEO_VOICE_LOCAL_TTS_SPEED",
+  "PASEO_VOICE_MODE_ENABLED",
+  "PASEO_VOICE_STT_PROVIDER",
+  "PASEO_VOICE_TTS_PROVIDER",
+  "PASEO_VOICE_TURN_DETECTION_PROVIDER",
+  "PASEO_WEB_UI_DIST_DIR",
+  "PASEO_WEB_UI_ENABLED",
+  "PORT",
+  "STT_CONFIDENCE_THRESHOLD",
+  "STT_MODEL",
+  "TTS_MODEL",
+  "TTS_VOICE",
+] as const;
+
+const CONFIG_CONTEXT_ENV_KEYS = [
+  "PASEO_NODE_ENV",
+  "PASEO_DESKTOP_MANAGED",
+  "OPENAI_API_KEY",
+  "OPENAI_BASE_URL",
+  "OPENAI_STT_API_KEY",
+  "OPENAI_TTS_API_KEY",
+] as const;
+
+export function configurationEnvironment(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
+  return Object.fromEntries(
+    [...DAEMON_SETTING_ENV_KEYS, ...CONFIG_CONTEXT_ENV_KEYS].map((key) => [key, env[key]]),
+  );
+}
+
+export function daemonLaunchEnvironment(input: {
+  env: NodeJS.ProcessEnv;
+  home: string;
+  mode: "managed" | "deployment";
+  desktopManaged?: boolean;
+}): NodeJS.ProcessEnv {
+  const env = { ...input.env };
+  if (input.mode === "managed") {
+    for (const key of DAEMON_SETTING_ENV_KEYS) delete env[key];
+  }
+  delete env.PASEO_HOST;
+  delete env.PASEO_DESKTOP_MANAGED;
+  env.PASEO_HOME = input.home;
+  if (input.desktopManaged) env.PASEO_DESKTOP_MANAGED = "1";
+  return env;
+}
diff --git a/packages/server/src/server/config.test.ts b/packages/server/src/server/config.test.ts
index 80045a4454..a71b5621e8 100644
--- a/packages/server/src/server/config.test.ts
+++ b/packages/server/src/server/config.test.ts
@@ -200,3 +200,18 @@ describe("server config", () => {
     ).toBe(path.join(packageRoot, "app-dist"));
   });
 });
+
+test("loads private plugin registry settings through the configuration boundary", async () => {
+  const home = await mkdtemp(path.join(os.tmpdir(), "paseo-registry-config-"));
+  try {
+    const pluginRegistries = { "plugins.example.test": { authorization: "Bearer fixture" } };
+    await writeFile(path.join(home, "config.json"), JSON.stringify({ pluginRegistries }));
+    const config = loadConfig(home, {
+      env: { PASEO_PLUGIN_REGISTRY: "https://plugins.example.test/internal" },
+    });
+    expect(config.pluginRegistryUrl).toBe("https://plugins.example.test/internal");
+    expect(config.pluginRegistries).toEqual(pluginRegistries);
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/config.ts b/packages/server/src/server/config.ts
index 7ed5f16519..7b2d06560e 100644
--- a/packages/server/src/server/config.ts
+++ b/packages/server/src/server/config.ts
@@ -1,3 +1,4 @@
+import { configurationEnvironment } from "./config-environment.js";
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -25,6 +26,15 @@ import type { RequestedSpeechProviders } from "./speech/speech-types.js";
 import { mergeHostnames, parseHostnamesEnv, type HostnamesConfig } from "./hostnames.js";
 import { resolveGitProcessPolicy } from "../utils/git-process-scheduler.js";
 
+export {
+  loadPersistedConfig,
+  readPersistedConfig,
+  savePersistedConfig,
+  getPersistedConfigValue,
+  editPersistedConfig,
+  type PersistedConfig,
+} from "./persisted-config.js";
+
 const DEFAULT_PORT = 6767;
 const DEFAULT_RELAY_ENDPOINT = "relay.paseo.sh:443";
 const DEFAULT_APP_BASE_URL = "https://app.paseo.sh";
@@ -554,7 +564,7 @@ export function resolveConfigFromPersisted(
   options?: ResolveConfigFromPersistedOptions,
 ): PaseoDaemonConfig {
   const resolvedOptions = options ?? {};
-  const env = resolvedOptions.env ?? process.env;
+  const env = configurationEnvironment(resolvedOptions.env ?? process.env);
   const cli = resolvedOptions.cli;
   const relayEnabledFallback =
     resolvedOptions.relayEnabledFallback ?? persisted.daemon?.relay?.enabled === undefined;
@@ -616,6 +626,8 @@ export function resolveConfigFromPersisted(
     skillSelection: persisted.agents?.skills?.selection,
     pluginsEnabled: persisted.pluginsEnabled ?? false,
     plugins: persisted.plugins,
+    pluginRegistries: persisted.pluginRegistries,
+    pluginRegistryUrl: env.PASEO_PLUGIN_REGISTRY,
     mcpDebug: env.MCP_DEBUG === "1",
     isDev: resolvePaseoNodeEnv(env) === "development",
     agentStoragePath: path.join(paseoHome, "agents"),
diff --git a/packages/server/src/server/creation/creation.e2e.test.ts b/packages/server/src/server/creation/creation.e2e.test.ts
new file mode 100644
index 0000000000..f4d35bd3f3
--- /dev/null
+++ b/packages/server/src/server/creation/creation.e2e.test.ts
@@ -0,0 +1,397 @@
+import { execFileSync } from "node:child_process";
+import type { z } from "zod";
+import { BUILTIN_PROVIDER_IDS } from "@getpaseo/protocol/provider-manifest";
+import { WebSocket } from "ws";
+import { SessionInboundMessageSchema, WSOutboundMessageSchema } from "@getpaseo/protocol/messages";
+import { randomUUID } from "node:crypto";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test, vi } from "vitest";
+import pino from "pino";
+import type { CreationSnapshot, SessionOutboundMessage } from "@getpaseo/protocol/messages";
+import type { AgentTimelineItem } from "../agent/agent-sdk-types.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+function createCreationDaemon(options: Parameters<typeof createTestPaseoDaemon>[0] = {}) {
+  const agentClients = options.agentClients ?? createTestAgentClients();
+  return createTestPaseoDaemon({
+    ...options,
+    agentClients,
+    // Installed provider CLIs must not change when background naming starts.
+    providerOverrides: Object.fromEntries(
+      BUILTIN_PROVIDER_IDS.map((id) => [id, { enabled: id in agentClients }]),
+    ),
+  });
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+
+test("creation progresses before agent readiness and continues after the disconnected Session is cleaned up", async () => {
+  const provider = deferred<void>();
+  const ready = deferred<CreationSnapshot>();
+  const disconnected = deferred<void>();
+  const cleaned = deferred<void>();
+  const directory = await mkdtemp(join(tmpdir(), "creation-wire-"));
+  let agents = 0;
+  let prompts = 0;
+  const daemon = await createCreationDaemon({
+    logger: pino(
+      { level: "trace" },
+      {
+        write(line) {
+          const { msg } = JSON.parse(line);
+          if (msg === "Client disconnected; waiting for reconnect") disconnected.resolve();
+          if (msg === "agent.session.lifecycle.cleanup") cleaned.resolve();
+        },
+      },
+    ),
+    agentClients: createTestAgentClients({
+      beforeCreateSession: async (config) => {
+        if (config.internal) return;
+        agents++;
+        await provider.promise;
+      },
+      onStartTurn: (_prompt, config) => {
+        if (config.internal) return;
+        prompts++;
+      },
+    }),
+  });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.7.2",
+    clientId: "creation-subscriber",
+  });
+  const observer = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.7.2",
+    clientId: "creation-independent-observer",
+  });
+  const observerMessages: SessionOutboundMessage[] = [];
+  const unsubscribe = observer.subscribeRawMessages((message) => observerMessages.push(message));
+  const workspaceId = "wks_0123456789abcdef";
+  const agentId = randomUUID();
+  const request = {
+    idempotencyKey: "workspace-one",
+    workspaceId,
+    source: { kind: "directory" as const, path: directory },
+    agent: {
+      agentId,
+      provider: "codex",
+      cwd: directory,
+      initialPrompt: "Create once",
+      clientMessageId: "initial-one",
+    },
+  };
+  try {
+    await client.connect();
+    await observer.connect();
+    const first = client.createWorkspace({
+      ...request,
+      onEvent: (snapshot) => {
+        if (snapshot.phase === "workspace_ready") ready.resolve(snapshot);
+      },
+    });
+    void first.catch(() => undefined);
+    const snapshot = await ready.promise;
+    expect(snapshot).toMatchObject({ workspaceId, agentId, phase: "workspace_ready" });
+    expect((await observer.fetchAgents()).entries).toHaveLength(0);
+    expect(
+      observerMessages.filter((message) => message.type === "workspace.create.update"),
+    ).toHaveLength(0);
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    await client.close();
+    await disconnected.promise;
+    await vi.advanceTimersByTimeAsync(90_000);
+    await cleaned.promise;
+    vi.useRealTimers();
+    await expect(first).rejects.toThrow("closed");
+    // A disconnected form cannot prevent the provider or initial prompt from starting.
+    provider.resolve();
+    await expect.poll(() => prompts).toBe(1);
+    const replay = await observer.createWorkspace(request);
+    expect(replay.error).toBeNull();
+    expect(replay.workspace?.id).toBe(workspaceId);
+    expect(replay.agent?.id).toBe(agentId);
+    expect(replay.agent?.title).toBe("Create once");
+    expect(agents).toBe(1);
+    expect(prompts).toBe(1);
+    const conflict = await observer.createWorkspace({
+      ...request,
+      idempotencyKey: "another-intent",
+    });
+    expect(conflict.error).toBe("workspace_id_conflict");
+    expect(agents).toBe(1);
+  } finally {
+    vi.useRealTimers();
+    provider.resolve();
+    unsubscribe();
+    await client.close();
+    await observer.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+  }
+}, 60000);
+
+async function connectCreationPeer(port: number) {
+  const timeout = 30_000;
+  const socket = new WebSocket(`ws://127.0.0.1:${port}/ws`);
+  const frames: SessionOutboundMessage[] = [];
+  socket.on("message", (data) => {
+    const frame = WSOutboundMessageSchema.parse(JSON.parse(data.toString()));
+    if (frame.type === "session") frames.push(frame.message);
+  });
+  await new Promise<void>((resolve, reject) => {
+    socket.once("open", resolve);
+    socket.once("error", reject);
+  });
+  socket.send(
+    JSON.stringify({
+      type: "hello",
+      clientType: "browser",
+      clientId: randomUUID(),
+      protocolVersion: 1,
+      appVersion: "0.8.0",
+    }),
+  );
+  await expect
+    .poll(() => frames.some((m) => m.type === "status" && m.payload.status === "server_info"), {
+      timeout,
+    })
+    .toBe(true);
+  return {
+    close: () => socket.close(),
+    request: async (
+      message: z.input<typeof SessionInboundMessageSchema> & { requestId: string },
+    ) => {
+      socket.send(JSON.stringify({ type: "session", message }));
+      const response = () =>
+        frames.find(
+          (m) =>
+            "payload" in m && "requestId" in m.payload && m.payload.requestId === message.requestId,
+        );
+      await expect.poll(response, { timeout }).toBeDefined();
+      return response()!;
+    },
+  };
+}
+
+test.each([false, true])(
+  "workspace identity does not depend on subscribing (first subscribe=%s)",
+  async (subscribe) => {
+    const directory = await mkdtemp(join(tmpdir(), "creation-identity-"));
+    const daemon = await createCreationDaemon();
+    const peer = await connectCreationPeer(daemon.port);
+    try {
+      const request = {
+        type: "workspace.create.request" as const,
+        source: { kind: "directory" as const, path: directory },
+        idempotencyKey: "same-workspace",
+      };
+      const first = await peer.request({ ...request, requestId: "first", subscribe });
+      const replay = await peer.request({ ...request, requestId: "replay", subscribe: !subscribe });
+      if (first.type !== "workspace.create.response" || replay.type !== "workspace.create.response")
+        throw new Error("Expected workspace responses");
+      expect(first.payload.error).toBeNull();
+      expect(replay.payload.error).toBeNull();
+      expect(replay.payload.workspace?.id).toBe(first.payload.workspace?.id);
+    } finally {
+      peer.close();
+      await daemon.close();
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+    }
+  },
+  60000,
+);
+
+test.each(["create_agent_request", "agent.create.request"] as const)(
+  "legacy and modern agent RPCs share one creation identity (first %s)",
+  async (type) => {
+    const directory = await mkdtemp(join(tmpdir(), "creation-agent-identity-"));
+    let creations = 0;
+    const daemon = await createCreationDaemon({
+      agentClients: createTestAgentClients({
+        beforeCreateSession: async (config) => {
+          if (config.internal) return;
+          creations++;
+          // A real provider or Git checkout may take longer than Vitest's default 1s poll budget.
+          await new Promise((resolve) => setTimeout(resolve, 1_200));
+        },
+      }),
+    });
+    const peer = await connectCreationPeer(daemon.port);
+    try {
+      const request = {
+        config: { provider: "codex", cwd: directory },
+        idempotencyKey: "same-agent",
+      };
+      const first = await peer.request({ ...request, type, requestId: "first" });
+      const replay = await peer.request({
+        ...request,
+        type: type === "agent.create.request" ? "create_agent_request" : "agent.create.request",
+        requestId: "replay",
+      });
+      const createdAgent = (message: SessionOutboundMessage) => {
+        if (message.type === "agent.create.response") {
+          expect(message.payload.error).toBeNull();
+          return message.payload.agent;
+        }
+        if (message.type === "status" && message.payload.status === "agent_created")
+          return message.payload.agent;
+        throw new Error(`Unexpected creation result ${JSON.stringify(message)}`);
+      };
+      expect(createdAgent(replay)?.id).toBe(createdAgent(first)?.id);
+      const agentId = createdAgent(first)!.id;
+      await daemon.daemon.agentManager.setTitle(agentId, "Updated after creation");
+      await daemon.daemon.agentManager.flush();
+      const legacyReplay = await peer.request({
+        ...request,
+        type: "create_agent_request",
+        requestId: "legacy-after-update",
+      });
+      expect(createdAgent(legacyReplay)?.title).toBe("Updated after creation");
+      expect(creations).toBe(1);
+    } finally {
+      peer.close();
+      await daemon.close();
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+    }
+  },
+  60000,
+);
+
+test("legacy keyed creation preserves checkout error codes", async () => {
+  const directory = await mkdtemp(join(tmpdir(), "creation-checkout-error-"));
+  execFileSync("git", ["init", "-b", "main", directory], { stdio: "pipe" });
+  execFileSync(
+    "git",
+    [
+      "-c",
+      "user.name=Test",
+      "-c",
+      "user.email=test@example.com",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "initial",
+    ],
+    { cwd: directory, stdio: "pipe" },
+  );
+  const daemon = await createCreationDaemon({ agentClients: createTestAgentClients() });
+  const peer = await connectCreationPeer(daemon.port);
+  try {
+    const result = await peer.request({
+      type: "create_agent_request",
+      requestId: "missing-branch",
+      idempotencyKey: "missing-branch",
+      config: { provider: "codex", cwd: directory },
+      worktree: { mode: "checkout-branch", branch: "does-not-exist" },
+    });
+    expect(result).toMatchObject({
+      type: "status",
+      payload: { status: "agent_create_failed", errorCode: "unknown_branch" },
+    });
+  } finally {
+    peer.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+  }
+}, 60000);
+
+test.each(["agent", "workspace"] as const)(
+  "%s creation succeeds when the provider rejects its initial prompt",
+  async (kind) => {
+    const directory = await mkdtemp(join(tmpdir(), "creation-prompt-rejected-"));
+    const rejection = "Input exceeds the maximum length of 1048576 characters.";
+    let sessions = 0;
+    let prompts = 0;
+    const daemon = await createCreationDaemon({
+      agentClients: createTestAgentClients({
+        beforeCreateSession: async (config) => {
+          if (config.internal) return;
+          sessions++;
+        },
+        onStartTurn: (_prompt, config) => {
+          if (config.internal) return;
+          prompts++;
+          throw new Error(rejection);
+        },
+      }),
+    });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      appVersion: "0.11.1",
+    });
+    const snapshots: CreationSnapshot[] = [];
+    const agent = {
+      config: { provider: "codex", cwd: directory },
+      initialPrompt: "Continue the attached conversation.",
+      clientMessageId: "draft:initial-message",
+    };
+    const streamed: AgentTimelineItem[] = [];
+    const unsubscribe = daemon.daemon.agentManager.subscribe((event) => {
+      if (event.type === "agent_stream" && event.event.type === "timeline") {
+        streamed.push(event.event.item);
+      }
+    });
+    try {
+      await client.connect();
+      const submit = async () => {
+        const common = {
+          idempotencyKey: "rejected-first-prompt",
+          onEvent: (snapshot: CreationSnapshot) => snapshots.push(snapshot),
+        };
+        if (kind === "agent") return client.createAgent({ ...common, ...agent });
+        const result = await client.createWorkspace({
+          ...common,
+          source: { kind: "directory", path: directory },
+          agent,
+        });
+        expect(result.error).toBeNull();
+        return result.agent!;
+      };
+      const created = await submit();
+      expect(created).toMatchObject({ status: "error", lastError: rejection });
+      expect(snapshots.map((snapshot) => snapshot.phase)).not.toContain("prompt_started");
+      expect(snapshots.at(-1)).toMatchObject({
+        phase: "completed",
+        error: null,
+        agent: { id: created.id },
+      });
+      const expectedTimeline = [
+        {
+          type: "user_message",
+          text: agent.initialPrompt,
+          clientMessageId: agent.clientMessageId,
+          messageId: agent.clientMessageId,
+        },
+        { type: "assistant_message", text: `[System Error] ${rejection}` },
+      ];
+      expect(
+        (await client.fetchAgentTimeline(created.id)).entries.map((entry) => entry.item),
+      ).toEqual(expectedTimeline);
+      expect(streamed).toEqual(expectedTimeline);
+      expect((await submit()).id).toBe(created.id);
+      expect(
+        (await client.fetchAgentTimeline(created.id)).entries.map((entry) => entry.item),
+      ).toEqual(expectedTimeline);
+      expect((await client.fetchAgents()).entries).toHaveLength(1);
+      expect({ sessions, prompts }).toEqual({ sessions: 1, prompts: 1 });
+    } finally {
+      unsubscribe();
+      await client.close();
+      await daemon.close();
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+    }
+  },
+  60000,
+);
diff --git a/packages/server/src/server/creation/index.test.ts b/packages/server/src/server/creation/index.test.ts
new file mode 100644
index 0000000000..a165110ef8
--- /dev/null
+++ b/packages/server/src/server/creation/index.test.ts
@@ -0,0 +1,324 @@
+import pino from "pino";
+import { createHash } from "node:crypto";
+import { cp, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, expect, test } from "vitest";
+import type {
+  AgentSnapshotPayload,
+  CreationSnapshot,
+  WorkspaceDescriptorPayload,
+} from "@getpaseo/protocol/messages";
+import { CreationService, type CreationInput } from "./index.js";
+
+const silentLogger = pino({ level: "silent" });
+const directories: string[] = [];
+afterEach(async () => {
+  await Promise.all(
+    directories.splice(0).map((directory) => rm(directory, { recursive: true, force: true })),
+  );
+});
+function deferred() {
+  let resolve!: () => void;
+  const promise = new Promise<void>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+const workspace: WorkspaceDescriptorPayload = {
+  id: "wks_0123456789abcdef",
+  projectId: "project",
+  projectDisplayName: "Project",
+  projectRootPath: "/project",
+  workspaceDirectory: "/project/worktree",
+  projectKind: "git",
+  workspaceKind: "worktree",
+  name: "Worktree",
+  status: "running",
+  statusEnteredAt: null,
+  activityAt: null,
+  archivingAt: null,
+  scripts: [],
+};
+const agent: AgentSnapshotPayload = {
+  id: "00000000-0000-4000-8000-000000000001",
+  workspaceId: workspace.id,
+  provider: "codex",
+  cwd: "/project/worktree",
+  model: null,
+  createdAt: "2026-09-11T00:00:00Z",
+  updatedAt: "2026-09-11T00:00:00Z",
+  lastUserMessageAt: null,
+  status: "idle",
+  capabilities: {
+    supportsStreaming: true,
+    supportsSessionPersistence: true,
+    supportsDynamicModes: false,
+    supportsMcpServers: false,
+    supportsReasoningStream: false,
+    supportsToolInvocations: true,
+    supportsRewindConversation: false,
+    supportsRewindFiles: false,
+    supportsRewindBoth: false,
+  },
+  currentModeId: null,
+  availableModes: [],
+  pendingPermissions: [],
+  persistence: null,
+  title: "Start once",
+  labels: {},
+};
+async function fixture() {
+  const directory = await mkdtemp(join(tmpdir(), "creation-lifecycle-"));
+  directories.push(directory);
+  const service = new CreationService(directory, silentLogger);
+  const provider = deferred();
+  const ready = deferred();
+  const calls: string[] = [];
+  const input: CreationInput = {
+    kind: "workspace",
+    key: "submit-one",
+    request: { source: "/project", prompt: "Start once" },
+    workspaceId: workspace.id,
+    agentId: agent.id,
+    hasAgent: true,
+    hasPrompt: true,
+    exists: async () => false,
+    provision: async () => {
+      calls.push("workspace");
+      return { workspace };
+    },
+    createAgent: async (_id, _workspace, onReady) => {
+      await provider.promise;
+      calls.push("agent");
+      await onReady(agent);
+      calls.push("prompt");
+      return { agent, initialPromptStarted: true };
+    },
+  };
+  const updates: CreationSnapshot[] = [];
+  const observe = (snapshot: CreationSnapshot) => {
+    updates.push(snapshot);
+    if (snapshot.phase === "workspace_ready") ready.resolve();
+  };
+  return { directory, service, input, provider, ready, calls, updates, observe };
+}
+
+test("workspace readiness is observable before provider startup and duplicate requests join the same work", async () => {
+  const f = await fixture();
+  const first = f.service.create(f.input, f.observe);
+  await f.ready.promise;
+  expect(f.calls).toEqual(["workspace"]);
+  expect(f.updates.map((s) => s.phase)).toEqual(["accepted", "workspace_ready"]);
+  expect(f.updates[0]).toMatchObject({ workspaceId: workspace.id, agentId: agent.id });
+  const duplicate = f.service.create(f.input);
+  f.provider.resolve();
+  expect(await first).toMatchObject({ phase: "completed", error: null, workspace, agent });
+  expect(await duplicate).toEqual(await first);
+  expect(f.calls).toEqual(["workspace", "agent", "prompt"]);
+  expect(await new CreationService(f.directory, silentLogger).create(f.input)).toEqual(await first);
+  expect(f.calls).toEqual(["workspace", "agent", "prompt"]);
+});
+
+test("a failed agent startup retries only that stage with the reserved IDs", async () => {
+  const f = await fixture();
+  let attempts = 0;
+  f.input.createAgent = async (id, readyWorkspace, onReady) => {
+    attempts++;
+    expect(id).toBe(agent.id);
+    expect(readyWorkspace).toEqual(workspace);
+    if (attempts === 1) throw new Error("provider unavailable");
+    await onReady(agent);
+    return { agent, initialPromptStarted: true };
+  };
+  expect(await f.service.create(f.input)).toMatchObject({
+    phase: "failed",
+    failedStage: "agent",
+    outcomeUnknown: false,
+    workspace,
+  });
+  expect(await new CreationService(f.directory, silentLogger).create(f.input)).toMatchObject({
+    phase: "completed",
+    agent,
+  });
+  expect(f.calls).toEqual(["workspace"]);
+  expect(attempts).toBe(2);
+});
+
+test("an uncertain prompt outcome never resends or removes its workspace and agent", async () => {
+  const f = await fixture();
+  let prompts = 0;
+  f.input.createAgent = async (_id, _workspace, onReady) => {
+    await onReady(agent);
+    prompts++;
+    throw new Error("connection lost after provider accepted prompt");
+  };
+  const result = await f.service.create(f.input);
+  expect(result).toMatchObject({
+    phase: "failed",
+    failedStage: "prompt",
+    outcomeUnknown: true,
+    workspace,
+    agent,
+  });
+  expect(await new CreationService(f.directory, silentLogger).create(f.input)).toEqual(result);
+  expect(prompts).toBe(1);
+});
+
+test("conflicting intents and resource IDs cannot start more work", async () => {
+  const f = await fixture();
+  const first = f.service.create(f.input, f.observe);
+  await f.ready.promise;
+  await expect(f.service.create({ ...f.input, request: { prompt: "changed" } })).rejects.toThrow(
+    "workspace_request_key_conflict",
+  );
+  await expect(f.service.create({ ...f.input, key: "another-intent" })).rejects.toThrow(
+    "workspace_id_conflict",
+  );
+  f.provider.resolve();
+  expect(await first).toMatchObject({ phase: "completed", error: null });
+  expect(f.calls).toEqual(["workspace", "agent", "prompt"]);
+});
+
+test("late subscribers recover readiness and removing an observer cannot stop creation", async () => {
+  const f = await fixture();
+  const first = f.service.create(f.input, f.observe);
+  await f.ready.promise;
+  const updates: CreationSnapshot[] = [];
+  const subscription = await f.service.subscribe("workspace", f.input.key, (snapshot) =>
+    updates.push(snapshot),
+  );
+  expect(subscription.snapshot).toMatchObject({ phase: "workspace_ready", workspace });
+  subscription.unsubscribe();
+  f.provider.resolve();
+  await first;
+  expect(updates).toEqual([]);
+  const completed = await new CreationService(f.directory, silentLogger).subscribe(
+    "workspace",
+    f.input.key,
+    () => {},
+  );
+  expect(completed.snapshot).toMatchObject({ phase: "completed", agent, workspace });
+  completed.unsubscribe();
+});
+
+test("omitted resource IDs are generated once and preserved on replay", async () => {
+  const f = await fixture();
+  f.input.workspaceId = undefined;
+  f.input.agentId = undefined;
+  f.input.provision = async (id) => ({ workspace: { ...workspace, id } });
+  f.input.createAgent = async (id, createdWorkspace, onReady) => {
+    const created = { ...agent, id, workspaceId: createdWorkspace!.id };
+    await onReady(created);
+    return { agent: created, initialPromptStarted: true };
+  };
+  const result = await f.service.create(f.input);
+  expect(result.workspaceId).toMatch(/^wks_[a-f0-9]{16}$/);
+  expect(result.agentId).toMatch(
+    /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$/,
+  );
+  expect(await new CreationService(f.directory, silentLogger).create(f.input)).toEqual(result);
+});
+
+test("restart after a committed agent without a prompt completes without recreating the agent", async () => {
+  const f = await fixture();
+  const recoveredDirectory = await mkdtemp(join(tmpdir(), "creation-checkpoint-"));
+  directories.push(recoveredDirectory);
+  f.input.hasPrompt = false;
+  let starts = 0;
+  f.input.createAgent = async (_id, _workspace, onReady) => {
+    starts++;
+    await onReady(agent);
+    // Capture the durable state at the exact milestone a process could stop after.
+    await cp(f.directory, recoveredDirectory, { recursive: true });
+    return { agent, initialPromptStarted: false };
+  };
+  await f.service.create(f.input);
+  const recovered = await new CreationService(recoveredDirectory, silentLogger).create(f.input);
+  expect(recovered).toMatchObject({ phase: "completed", workspace, agent });
+  expect(starts).toBe(1);
+});
+
+test("partial provisioning without a registered workspace is not repeated", async () => {
+  const f = await fixture();
+  let provisions = 0;
+  f.input.provision = async () => {
+    provisions++;
+    await writeFile(join(f.directory, "partial-checkout"), "disk was changed");
+    throw new Error("Git failed after creating the checkout");
+  };
+  const result = await f.service.create(f.input);
+  expect(result).toMatchObject({ phase: "failed", failedStage: "workspace", outcomeUnknown: true });
+  expect(await new CreationService(f.directory, silentLogger).create(f.input)).toEqual(result);
+  expect(provisions).toBe(1);
+});
+
+test.each(["pending", "completed"])(
+  "imports a %s legacy agent receipt without creating another agent",
+  async (state) => {
+    const f = await fixture();
+    const legacyDirectory = join(f.directory, "legacy");
+    await mkdir(legacyDirectory);
+    const request = { config: { cwd: "/project", provider: "codex" } };
+    const hash = (value: unknown) =>
+      createHash("sha256").update(JSON.stringify(value)).digest("hex");
+    await writeFile(
+      join(legacyDirectory, `${hash(["create", "old-key"])}.json`),
+      JSON.stringify({
+        fingerprint: hash({ ...request, type: "create_agent_request" }),
+        state,
+        agentId: agent.id,
+      }),
+    );
+    const input: CreationInput = {
+      kind: "agent",
+      key: "old-key",
+      request,
+      hasAgent: true,
+      hasPrompt: false,
+      exists: async () => true,
+      readAgent: async () => agent,
+      createAgent: async () => {
+        throw new Error("Must not create again");
+      },
+    };
+    const service = new CreationService(f.directory, silentLogger, undefined, legacyDirectory);
+    await expect(
+      service.create({ ...input, request: { config: { ...request.config, cwd: "/changed" } } }),
+    ).rejects.toThrow("agent_request_key_conflict");
+    expect(await service.create(input)).toMatchObject({ phase: "completed", agent });
+    expect(await new CreationService(f.directory, silentLogger).create(input)).toMatchObject({
+      phase: "completed",
+      agent,
+    });
+  },
+);
+
+test("observer failures are logged without failing creation", async () => {
+  const f = await fixture();
+  const logs: unknown[] = [];
+  const logger = pino(
+    { level: "warn" },
+    {
+      write: (line) => {
+        logs.push(JSON.parse(line));
+      },
+    },
+  );
+  const service = new CreationService(f.directory, logger);
+  f.provider.resolve();
+  const result = await service.create(f.input, () => {
+    throw new Error("delivery failed");
+  });
+  expect(result.phase).toBe("completed");
+  expect(f.calls).toEqual(["workspace", "agent", "prompt"]);
+  expect(logs).toContainEqual(
+    expect.objectContaining({
+      level: 40,
+      kind: "workspace",
+      idempotencyKey: f.input.key,
+      phase: "workspace_ready",
+      err: expect.objectContaining({ message: "delivery failed" }),
+    }),
+  );
+});
diff --git a/packages/server/src/server/creation/index.ts b/packages/server/src/server/creation/index.ts
new file mode 100644
index 0000000000..e0b28b8069
--- /dev/null
+++ b/packages/server/src/server/creation/index.ts
@@ -0,0 +1,377 @@
+import type { Logger } from "pino";
+import { createHash, randomUUID } from "node:crypto";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  CreationSnapshotSchema,
+  type AgentSnapshotPayload,
+  type CreationSnapshot,
+  type WorkspaceDescriptorPayload,
+} from "@getpaseo/protocol/messages";
+import { writeFileAtomic } from "../atomic-file.js";
+import { generateWorkspaceId } from "../workspace-registry-model.js";
+
+type Observer = (snapshot: CreationSnapshot) => void;
+export interface CreatedAgent {
+  agent: AgentSnapshotPayload;
+  initialPromptStarted: boolean;
+}
+interface CreationRequest {
+  key: string;
+  request: { [key: string]: unknown };
+  workspaceId?: string;
+  agentId?: string;
+  hasAgent: boolean;
+  hasPrompt: boolean;
+  exists: (kind: "workspace" | "agent", id: string) => Promise<boolean>;
+  provision?: (
+    workspaceId: string,
+  ) => Promise<{ workspace: WorkspaceDescriptorPayload; setupSkippedReason?: string }>;
+  createAgent?: (
+    agentId: string,
+    workspace: WorkspaceDescriptorPayload | undefined,
+    onReady: (agent: AgentSnapshotPayload) => Promise<void>,
+  ) => Promise<CreatedAgent>;
+}
+export type CreationInput = CreationRequest &
+  (
+    | { kind: "workspace" }
+    | { kind: "agent"; readAgent: (id: string) => Promise<AgentSnapshotPayload | null> }
+  );
+const RecordSchema = z.object({
+  fingerprint: z.string(),
+  snapshot: CreationSnapshotSchema,
+  inFlight: z.enum(["workspace", "agent", "prompt"]).nullable(),
+});
+type Record = z.infer<typeof RecordSchema>;
+
+/** Owns creation across socket lifetimes. Resource owners perform work; this module commits its milestones. */
+export class CreationService {
+  private admission: Promise<unknown> = Promise.resolve();
+  private readonly active = new Map<string, Promise<CreationSnapshot>>();
+  private readonly receiptOperations = new Map<string, Promise<void>>();
+  private readonly observers = new Map<string, Set<Observer>>();
+  constructor(
+    private readonly directory: string,
+    private readonly logger: Logger,
+    private readonly validateCompleted: (
+      snapshot: CreationSnapshot,
+    ) => Promise<void> = async () => {},
+    private readonly legacyDirectory?: string,
+  ) {}
+
+  async create(input: CreationInput, observer?: Observer): Promise<CreationSnapshot> {
+    const identity = identityFor(input.kind, input.key);
+    const admitted = this.admission.then(async () => {
+      await mkdir(this.directory, { recursive: true });
+      const fingerprint = digest(input.request);
+      let record = await this.read(identity);
+      if (!record) record = await this.readLegacyAgent(input, fingerprint);
+      if (record && record.fingerprint !== fingerprint)
+        throw new Error(`${input.kind}_request_key_conflict`);
+      const running = this.active.get(identity);
+      if (running && record) return { completion: running, snapshot: record.snapshot };
+      if (record?.snapshot.phase === "completed") await this.validateCompleted(record.snapshot);
+      if (record?.snapshot.phase === "completed" || record?.snapshot.outcomeUnknown) {
+        return { completion: Promise.resolve(record.snapshot), snapshot: record.snapshot };
+      }
+      if (record?.inFlight) {
+        await this.publish(identity, record, {
+          phase: "failed",
+          error: `${input.kind}_request_outcome_unknown`,
+          failedStage: record.inFlight,
+          outcomeUnknown: true,
+        });
+        return { completion: Promise.resolve(record.snapshot), snapshot: record.snapshot };
+      }
+      if (!record) {
+        record = initialRecord(input, fingerprint);
+        // Persist identity before claiming resources. A failed admission can only retry these IDs.
+        await this.write(identity, record);
+      }
+      await this.claimResources(identity, record.snapshot, input);
+      if (record.snapshot.phase === "failed") {
+        await this.publish(identity, record, {
+          phase: record.snapshot.workspace ? "workspace_ready" : "accepted",
+          error: null,
+          errorCode: undefined,
+          failedStage: undefined,
+          outcomeUnknown: undefined,
+        });
+      }
+      const snapshot = record.snapshot;
+      // Defer the runner until admission has installed the initiating observer.
+      const completion = Promise.resolve().then(() => this.run(identity, record, input));
+      this.active.set(identity, completion);
+      void completion.finally(() => this.active.delete(identity)).catch(() => undefined);
+      return { completion, snapshot };
+    });
+    this.admission = admitted.then(
+      () => undefined,
+      () => undefined,
+    );
+    // Install before admission starts, so even a fast local provision cannot outrun observation.
+    const unsubscribe = observer ? this.observe(identity, observer) : () => {};
+    try {
+      const { completion, snapshot } = await admitted;
+      if (observer) this.notify(observer, snapshot);
+      return await completion;
+    } finally {
+      unsubscribe();
+    }
+  }
+
+  async subscribe(
+    kind: CreationSnapshot["kind"],
+    key: string,
+    observer: Observer,
+  ): Promise<{ snapshot: CreationSnapshot | null; unsubscribe: () => void }> {
+    const identity = identityFor(kind, key);
+    const unsubscribe = this.observe(identity, observer);
+    try {
+      await this.admission;
+      const record = await this.read(identity);
+      if (record?.inFlight && !this.active.has(identity)) {
+        await this.publish(identity, record, {
+          phase: "failed",
+          failedStage: record.inFlight,
+          outcomeUnknown: true,
+          error: `${kind}_request_outcome_unknown`,
+        });
+      }
+      if (record?.snapshot.phase === "completed") await this.validateCompleted(record.snapshot);
+      return { snapshot: record?.snapshot ?? null, unsubscribe };
+    } catch (error) {
+      unsubscribe();
+      throw error;
+    }
+  }
+
+  private async run(
+    identity: string,
+    record: Record,
+    input: CreationInput,
+  ): Promise<CreationSnapshot> {
+    try {
+      if (input.provision && !record.snapshot.workspace) {
+        record.inFlight = "workspace";
+        await this.write(identity, record);
+        const { workspace, setupSkippedReason } = await input.provision(
+          record.snapshot.workspaceId!,
+        );
+        record.inFlight = null;
+        await this.publish(identity, record, {
+          phase: "workspace_ready",
+          workspace,
+          workspaceId: workspace.id,
+          setupSkippedReason,
+        });
+      }
+      if (input.hasAgent && input.createAgent && !record.snapshot.agent) {
+        record.inFlight = "agent";
+        await this.write(identity, record);
+        const { agent, initialPromptStarted } = await input.createAgent(
+          record.snapshot.agentId!,
+          record.snapshot.workspace,
+          async (readyAgent) => {
+            record.inFlight = input.hasPrompt ? "prompt" : null;
+            await this.publish(identity, record, {
+              phase: "agent_ready",
+              agent: readyAgent,
+              workspaceId: readyAgent.workspaceId ?? record.snapshot.workspaceId,
+            });
+          },
+        );
+        record.inFlight = null;
+        if (initialPromptStarted)
+          await this.publish(identity, record, { phase: "prompt_started", agent });
+        else record.snapshot = { ...record.snapshot, agent };
+      }
+      record.inFlight = null;
+      await this.publish(identity, record, { phase: "completed" });
+    } catch (error) {
+      const stage = record.inFlight ?? "agent";
+      const resourceId =
+        stage === "workspace" ? record.snapshot.workspaceId : record.snapshot.agentId;
+      const code =
+        error instanceof Error && "code" in error && typeof error.code === "string"
+          ? error.code
+          : undefined;
+      const rejectedBeforeProvision = code === "directory_not_found" || code === "source_required";
+      const unknown =
+        stage === "prompt" ||
+        (stage === "workspace" && !rejectedBeforeProvision) ||
+        (resourceId !== null && (await input.exists(stage, resourceId)));
+      // A failed provider startup with no registered resource can retry under the same ID.
+      // A partially provisioned resource or an attempted prompt needs reconciliation.
+      if (!unknown) record.inFlight = null;
+      await this.publish(identity, record, {
+        phase: "failed",
+        error: error instanceof Error ? error.message : String(error),
+        errorCode: code,
+        failedStage: stage,
+        outcomeUnknown: unknown,
+      });
+    }
+    return record.snapshot;
+  }
+
+  // COMPAT(agentRequestReceipts): added in v0.8.0, remove after 2027-03-11 once old creation receipts can expire.
+  // Import the previous receipt format; it is never a second execution path.
+  private async readLegacyAgent(input: CreationInput, fingerprint: string): Promise<Record | null> {
+    if (input.kind !== "agent" || !this.legacyDirectory) return null;
+    const text = await readOptional(
+      join(this.legacyDirectory, `${digest(["create", input.key])}.json`),
+    );
+    if (text === null) return null;
+    const receipt = z
+      .object({
+        fingerprint: z.string(),
+        state: z.enum(["pending", "completed"]),
+        agentId: z.string(),
+      })
+      .parse(JSON.parse(text));
+    if (receipt.fingerprint !== digest({ type: "create_agent_request", ...input.request }))
+      throw new Error("agent_request_key_conflict");
+    const agent = await input.readAgent(receipt.agentId);
+    if (!agent && receipt.state === "completed")
+      throw new Error("Previously created agent no longer exists");
+    const record = initialRecord({ ...input, agentId: receipt.agentId }, fingerprint);
+    record.snapshot = {
+      ...record.snapshot,
+      phase: agent ? "completed" : "failed",
+      agent: agent ?? undefined,
+      workspaceId: agent?.workspaceId ?? record.snapshot.workspaceId,
+      error: agent ? null : "agent_request_outcome_unknown",
+      ...(agent ? {} : { failedStage: "agent", outcomeUnknown: true }),
+    };
+    await this.write(identityFor(input.kind, input.key), record);
+    return record;
+  }
+
+  private async claimResources(
+    identity: string,
+    snapshot: CreationSnapshot,
+    input: CreationInput,
+  ): Promise<void> {
+    if (input.kind === "workspace" && snapshot.workspaceId)
+      await this.claim(identity, "workspace", snapshot.workspaceId, input.exists);
+    if (snapshot.agentId) await this.claim(identity, "agent", snapshot.agentId, input.exists);
+  }
+
+  private async claim(
+    identity: string,
+    kind: "workspace" | "agent",
+    id: string,
+    exists: CreationInput["exists"],
+  ): Promise<void> {
+    const file = join(this.directory, `${digest([kind, id])}.claim`);
+    const owner = await readOptional(file);
+    if (owner !== null) {
+      if (owner !== identity) throw new Error(`${kind}_id_conflict`);
+      return;
+    }
+    if (await exists(kind, id)) throw new Error(`${kind}_id_conflict`);
+    await writeFile(file, identity, { flag: "wx", mode: 0o600 });
+  }
+  private observe(identity: string, observer: Observer): () => void {
+    const observers = this.observers.get(identity) ?? new Set<Observer>();
+    observers.add(observer);
+    this.observers.set(identity, observers);
+    return () => {
+      observers.delete(observer);
+      if (!observers.size) this.observers.delete(identity);
+    };
+  }
+  private notify(observer: Observer, snapshot: CreationSnapshot): void {
+    try {
+      observer(snapshot);
+    } catch (err) {
+      this.logger.warn(
+        {
+          err,
+          kind: snapshot.kind,
+          idempotencyKey: snapshot.idempotencyKey,
+          phase: snapshot.phase,
+        },
+        "Creation observer failed",
+      );
+    }
+  }
+  private async publish(
+    identity: string,
+    record: Record,
+    update: Partial<CreationSnapshot>,
+  ): Promise<void> {
+    record.snapshot = { ...record.snapshot, ...update, revision: record.snapshot.revision + 1 };
+    await this.write(identity, record);
+    for (const observer of this.observers.get(identity) ?? [])
+      this.notify(observer, record.snapshot);
+  }
+  private write(identity: string, record: Record): Promise<void> {
+    // Serialize now: the runner mutates the record after queueing this write.
+    const contents = JSON.stringify(record, null, 2);
+    return this.accessReceipt(identity, () =>
+      writeFileAtomic(join(this.directory, `${identity}.json`), contents),
+    );
+  }
+  private read(identity: string): Promise<Record | null> {
+    return this.accessReceipt(identity, async () => {
+      const text = await readOptional(join(this.directory, `${identity}.json`));
+      return text === null ? null : RecordSchema.parse(JSON.parse(text));
+    });
+  }
+  private accessReceipt<T>(identity: string, access: () => Promise<T>): Promise<T> {
+    // Admission and the runner progress independently. Keep this owner from
+    // holding a receipt read open while atomically replacing the same file.
+    const previous = this.receiptOperations.get(identity) ?? Promise.resolve();
+    const result = previous.then(access);
+    const settled = result.then(
+      () => undefined,
+      () => undefined,
+    );
+    this.receiptOperations.set(identity, settled);
+    void settled.finally(() => {
+      if (this.receiptOperations.get(identity) === settled) this.receiptOperations.delete(identity);
+    });
+    return result;
+  }
+}
+function initialRecord(input: CreationInput, fingerprint: string): Record {
+  return {
+    fingerprint,
+    inFlight: null,
+    snapshot: {
+      kind: input.kind,
+      idempotencyKey: input.key,
+      revision: 0,
+      phase: "accepted",
+      error: null,
+      workspaceId: input.workspaceId ?? (input.kind === "workspace" ? generateWorkspaceId() : null),
+      agentId: input.hasAgent ? (input.agentId ?? randomUUID()) : null,
+    },
+  };
+}
+function identityFor(kind: string, key: string): string {
+  return digest([kind, key]);
+}
+function digest(input: unknown): string {
+  return createHash("sha256")
+    .update(
+      JSON.stringify(input, (_key, value: unknown) => {
+        if (value && typeof value === "object" && !Array.isArray(value))
+          return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)));
+        return value;
+      }),
+    )
+    .digest("hex");
+}
+async function readOptional(file: string): Promise<string | null> {
+  try {
+    return await readFile(file, "utf8");
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
+    throw error;
+  }
+}
diff --git a/packages/server/src/server/daemon-client.e2e.test.ts b/packages/server/src/server/daemon-client.e2e.test.ts
index 1c65316bdc..0bc3310b41 100644
--- a/packages/server/src/server/daemon-client.e2e.test.ts
+++ b/packages/server/src/server/daemon-client.e2e.test.ts
@@ -121,7 +121,7 @@ test("createAgent without an initial prompt returns an idle snapshot", async ()
 
   try {
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "create-no-prompt" } });
+    await client.fetchAgents({ subscribe: {} });
 
     const agent = await client.createAgent({
       provider: "codex",
@@ -185,7 +185,7 @@ test("createAgent with background initialPrompt returns a running snapshot befor
 
   try {
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "create-background-prompt" } });
+    await client.fetchAgents({ subscribe: {} });
 
     const agent = await client.createAgent({
       provider: "codex",
@@ -415,7 +415,7 @@ test("createAgent fails when the initial turn cannot start", async () => {
 
   try {
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "create-start-failure" } });
+    await client.fetchAgents({ subscribe: {} });
 
     await expect(
       client.createAgent({
@@ -831,6 +831,29 @@ test("send_agent_message auto-unarchives archived agents", async () => {
   }
 }, 180000);
 
+test("send_agent_message leaves an archived agent archived when its directory is gone", async () => {
+  const cwd = tmpCwd();
+  try {
+    const created = await ctx.client.createAgent({
+      config: {
+        ...getFullAccessConfig("codex"),
+        cwd,
+      },
+    });
+    const archived = await ctx.client.archiveAgent(created.id);
+    rmSync(cwd, { recursive: true, force: true });
+
+    await expect(ctx.client.sendMessage(created.id, "hello")).rejects.toThrow(
+      "Working directory does not exist",
+    );
+
+    const afterSend = await ctx.client.fetchAgent({ agentId: created.id });
+    expect(afterSend?.agent.archivedAt).toBe(archived.archivedAt);
+  } finally {
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 30000);
+
 test("refresh_agent auto-unarchives archived agents", async () => {
   const cwd = tmpCwd();
   try {
@@ -1325,7 +1348,7 @@ test("creates agent and exercises lifecycle", async () => {
   const cwd = tmpCwd();
 
   await ctx.client.fetchAgents({
-    subscribe: { subscriptionId: "daemon-client-lifecycle" },
+    subscribe: {},
   });
 
   const agentUpdatePromise = waitForSignal(15000, (resolve) => {
@@ -1473,7 +1496,7 @@ test("creates agent and exercises lifecycle", async () => {
       sawAssistantMessage = true;
     }
   });
-  const unsubscribeRawStream = ctx.client.on("agent_stream", (message) => {
+  const unsubscribeRawStream = ctx.client.subscribeAgentTimeline(agent.id, (message) => {
     if (message.type !== "agent_stream") {
       return;
     }
diff --git a/packages/server/src/server/daemon-config-store.test.ts b/packages/server/src/server/daemon-config-store.test.ts
index a8593a2c02..3629a0fd18 100644
--- a/packages/server/src/server/daemon-config-store.test.ts
+++ b/packages/server/src/server/daemon-config-store.test.ts
@@ -400,6 +400,48 @@ describe("DaemonConfigStore", () => {
     });
   });
 
+  test("patch persists provider Paseo-tool policy without changing availability", () => {
+    const paseoHome = mkdtempSync(path.join(tmpdir(), "paseo-daemon-config-store-"));
+    tempDirs.push(paseoHome);
+    writeFileSync(
+      path.join(paseoHome, "config.json"),
+      JSON.stringify({ agents: { providers: { claude: { enabled: false } } } }),
+    );
+    const store = new DaemonConfigStore(paseoHome, {
+      mcp: { injectIntoAgents: true },
+      browserTools: { enabled: false },
+      providers: { claude: { enabled: false } },
+      metadataGeneration: { providers: [] },
+      autoArchiveAfterMerge: false,
+      enableTerminalAgentHooks: false,
+      appendSystemPrompt: "",
+    });
+
+    store.patch({
+      providers: {
+        claude: {
+          paseoTools: { enabled: true, disabledTools: ["list_agents"] },
+        },
+      },
+    });
+    store.patch({
+      providers: {
+        claude: {
+          paseoTools: { disabledTools: ["create_agent"] },
+        },
+      },
+    });
+
+    expect(store.get().providers.claude).toEqual({
+      enabled: false,
+      paseoTools: { enabled: true, disabledTools: ["create_agent"] },
+    });
+    expect(loadPersistedConfig(paseoHome).agents?.providers?.claude).toEqual({
+      enabled: false,
+      paseoTools: { enabled: true, disabledTools: ["create_agent"] },
+    });
+  });
+
   test("patch removes provider entries from config.json", () => {
     const paseoHome = mkdtempSync(path.join(tmpdir(), "paseo-daemon-config-store-"));
     tempDirs.push(paseoHome);
diff --git a/packages/server/src/server/daemon-config-store.ts b/packages/server/src/server/daemon-config-store.ts
index 922d0dac1c..3e285bded0 100644
--- a/packages/server/src/server/daemon-config-store.ts
+++ b/packages/server/src/server/daemon-config-store.ts
@@ -289,9 +289,19 @@ export function applyMutableProviderConfigToOverrides(
 
   const nextOverrides: Record<string, ProviderOverride> = { ...baseOverrides };
   for (const [providerId, providerConfig] of Object.entries(mutableProviders ?? {})) {
+    const previousOverride = nextOverrides[providerId];
+    const parsedOverride = ProviderOverrideSchema.strip().parse(providerConfig);
     nextOverrides[providerId] = {
-      ...nextOverrides[providerId],
-      ...ProviderOverrideSchema.strip().parse(providerConfig),
+      ...previousOverride,
+      ...parsedOverride,
+      ...(parsedOverride.paseoTools
+        ? {
+            paseoTools: {
+              ...previousOverride?.paseoTools,
+              ...parsedOverride.paseoTools,
+            },
+          }
+        : {}),
     };
   }
 
diff --git a/packages/server/src/server/daemon-e2e/agent-archive.native.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/agent-archive.native.real.e2e.test.ts
new file mode 100644
index 0000000000..c3e58f8b94
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/agent-archive.native.real.e2e.test.ts
@@ -0,0 +1,110 @@
+import { execFileSync } from "node:child_process";
+import { existsSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { CodexAppServerAgentClient } from "../agent/providers/codex-app-server-agent.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+async function expectContextAfterWorkspaceRestore(legacyNativeArchive: boolean): Promise<void> {
+  const root = mkdtempSync(path.join(tmpdir(), "paseo-archive-codex-"));
+  const cwd = path.join(root, "repo");
+  mkdirSync(cwd);
+  execFileSync("git", ["init", "-b", "main", cwd]);
+  execFileSync(
+    "git",
+    [
+      "-c",
+      "user.name=QA",
+      "-c",
+      "user.email=qa@example.invalid",
+      "-c",
+      "commit.gpgsign=false",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "QA",
+    ],
+    { cwd },
+  );
+  const logger = pino({ level: "warn" });
+  const provider = new CodexAppServerAgentClient(logger);
+  let daemon: TestPaseoDaemon | undefined;
+  let client: DaemonClient | undefined;
+  try {
+    daemon = await createTestPaseoDaemon({
+      agentClients: { codex: provider },
+      logger,
+      pluginsEnabled: false,
+    });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({
+      config: {
+        provider: "codex",
+        cwd,
+        model: "gpt-5.6-sol",
+        modeId: "full-access",
+        thinkingOptionId: "low",
+      },
+      worktree: { mode: "branch-off", base: "main", newBranch: "archive-qa" },
+    });
+    const manager = daemon.daemon.agentManager;
+    const token = "ARCHIVE_CEDAR_7429";
+    const first = await manager.runAgent(
+      agent.id,
+      `Remember ${token}. Reply with only that token. Do not use tools.`,
+    );
+    expect(first.finalText).toContain(token);
+    const handle = manager.getAgent(agent.id)!.persistence!;
+    await client.archiveWorkspace(agent.workspaceId!);
+    expect(existsSync(agent.cwd)).toBe(false);
+    // Older daemons marked Paseo archived while native archive failed against its writer.
+    if (legacyNativeArchive) await provider.unarchiveNativeSession(handle);
+    await client.restoreWorkspace(agent.workspaceId!);
+    expect(existsSync(agent.cwd)).toBe(true);
+    await client.fetchAgentTimeline(agent.id, { direction: "tail", limit: 0 });
+    await client.sendAgentMessage(
+      agent.id,
+      "What token did I ask you to remember? Reply with RECALLED=<token>. Do not use tools.",
+      { activeTurnBehavior: "steer" },
+    );
+    const connectedClient = client;
+    await expect
+      .poll(
+        async () => {
+          const timeline = await connectedClient.fetchAgentTimeline(agent.id, {
+            direction: "tail",
+            limit: 0,
+            projection: "canonical",
+          });
+          return timeline.entries
+            .map(({ item }) => (item.type === "assistant_message" ? item.text : ""))
+            .join("");
+        },
+        { timeout: 30_000 },
+      )
+      .toContain(`RECALLED=${token}`);
+    expect(manager.getAgent(agent.id)?.persistence?.sessionId).toBe(handle.sessionId);
+    process.stdout.write(
+      `archived -> restored; same agent=${agent.id}; same session=${handle.sessionId}; two real replies recall ${token}; legacy=${legacyNativeArchive}\n`,
+    );
+    await client.archiveWorkspace(agent.workspaceId!);
+  } finally {
+    await client?.close();
+    await daemon?.close();
+    rmSync(root, { recursive: true, force: true });
+  }
+}
+
+// Opt in: real Codex requests using local authentication.
+test.runIf(process.env.PASEO_NATIVE_ARCHIVE_QA === "1").each([false, true])(
+  "Codex recalls context after workspace restore (legacy native archive: %s)",
+  async (legacyNativeArchive) => {
+    await expectContextAfterWorkspaceRestore(legacyNativeArchive);
+  },
+  90_000,
+);
diff --git a/packages/server/src/server/daemon-e2e/agent-operations.e2e.test.ts b/packages/server/src/server/daemon-e2e/agent-operations.e2e.test.ts
index c5618b9f09..e8bb548688 100644
--- a/packages/server/src/server/daemon-e2e/agent-operations.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/agent-operations.e2e.test.ts
@@ -130,7 +130,7 @@ describe("cancelAgent", () => {
     const cwd = tmpCwd();
 
     await ctx.client.fetchAgents({
-      subscribe: { subscriptionId: "agent-operations-cancel" },
+      subscribe: {},
     });
 
     // Create Codex agent
@@ -203,7 +203,7 @@ describe("setAgentMode", () => {
     const cwd = tmpCwd();
 
     await ctx.client.fetchAgents({
-      subscribe: { subscriptionId: "agent-operations-mode" },
+      subscribe: {},
     });
 
     // Create a Codex agent with default mode ("auto")
diff --git a/packages/server/src/server/daemon-e2e/agent-refresh-rehydrates-timeline.e2e.test.ts b/packages/server/src/server/daemon-e2e/agent-refresh-rehydrates-timeline.e2e.test.ts
index 44e774d7a3..301df35e4b 100644
--- a/packages/server/src/server/daemon-e2e/agent-refresh-rehydrates-timeline.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/agent-refresh-rehydrates-timeline.e2e.test.ts
@@ -113,7 +113,7 @@ describe("daemon E2E - refresh rehydrates timeline from on-disk session", () =>
     client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
     await client.connect();
     await client.fetchAgents({
-      subscribe: { subscriptionId: "refresh-rehydrate-test" },
+      subscribe: {},
     });
 
     const imported = await client.importAgent({ provider: "claude", sessionId, cwd });
diff --git a/packages/server/src/server/daemon-e2e/agent-reload.native.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/agent-reload.native.real.e2e.test.ts
new file mode 100644
index 0000000000..cbbacde969
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/agent-reload.native.real.e2e.test.ts
@@ -0,0 +1,128 @@
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+
+import type { AgentClient, AgentSessionConfig } from "../agent/agent-sdk-types.js";
+import { ClaudeAgentClient } from "../agent/providers/claude/agent.js";
+import { CodexAppServerAgentClient } from "../agent/providers/codex-app-server-agent.js";
+import { OpenCodeServerManager } from "../agent/providers/opencode/server-manager.js";
+import { OpenCodeAgentClient } from "../agent/providers/opencode-agent.js";
+import {
+  getRealProviderConfig,
+  getRealProviderRuntimeSettings,
+} from "./real-provider-test-config.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+type NativeProvider = "claude" | "codex" | "opencode";
+
+interface ReloadConversation {
+  rememberToken: () => Promise<string>;
+  reloadAndRecallToken: (sessionId: string) => Promise<void>;
+}
+
+async function withNativeConversation(
+  provider: NativeProvider,
+  run: (conversation: ReloadConversation) => Promise<void>,
+): Promise<void> {
+  const secret = `RELOAD_${provider.toUpperCase()}_7F31`;
+  const root = mkdtempSync(path.join(tmpdir(), `paseo-reload-${provider}-`));
+  const cwd = path.join(root, "workspace");
+  mkdirSync(cwd);
+  const logger = pino({ level: "warn" });
+  let daemon: TestPaseoDaemon | undefined;
+  let client: DaemonClient | undefined;
+  let openCode: OpenCodeAgentClient | undefined;
+  let openCodeRuntimeRoot: string | undefined;
+  try {
+    let providerClient: AgentClient;
+    let config: Partial<AgentSessionConfig>;
+    if (provider === "claude") {
+      providerClient = new ClaudeAgentClient({ logger });
+      config = { model: "haiku", modeId: "bypassPermissions" };
+    } else if (provider === "codex") {
+      providerClient = new CodexAppServerAgentClient(logger);
+      config = { modeId: "full-access", thinkingOptionId: "low" };
+    } else {
+      const settings = getRealProviderRuntimeSettings("opencode");
+      openCodeRuntimeRoot = path.dirname(settings.env!.XDG_CONFIG_HOME!);
+      openCode = new OpenCodeAgentClient(logger, settings, {
+        serverManager: new OpenCodeServerManager({ logger, runtimeSettings: settings }),
+      });
+      providerClient = openCode;
+      config = getRealProviderConfig("opencode");
+    }
+    daemon = await createTestPaseoDaemon({
+      agentClients: { [provider]: providerClient },
+      logger,
+      pluginsEnabled: false,
+    });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.7.2" });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({ provider, cwd, ...config });
+    process.stdout.write(`${provider}: model=${agent.model ?? "default"}\n`);
+    const manager = daemon.daemon.agentManager;
+    const connectedClient = client;
+    await run({
+      rememberToken: async () => {
+        const first = await manager.runAgent(
+          agent.id,
+          `Remember this token for this conversation: ${secret}. Reply with exactly that token. Do not use tools.`,
+        );
+        expect(first.finalText).toContain(secret);
+        const handle = manager.getAgent(agent.id)?.persistence;
+        expect(handle?.sessionId).toBeTruthy();
+        process.stdout.write(`${provider}: first real turn passed; session=${handle!.sessionId}\n`);
+        return handle!.sessionId;
+      },
+      reloadAndRecallToken: async (sessionId: string) => {
+        for (let round = 1; round <= 3; round++) {
+          await connectedClient.refreshAgent(agent.id);
+          expect(manager.getAgent(agent.id)?.persistence?.sessionId).toBe(sessionId);
+          const response = await manager.runAgent(
+            agent.id,
+            "What token did I ask you to remember? Reply with only that token. Do not use tools.",
+          );
+          expect(response.finalText).toContain(secret);
+          const timeline = await connectedClient.fetchAgentTimeline(agent.id, {
+            direction: "tail",
+            limit: 0,
+            projection: "canonical",
+          });
+          expect(
+            timeline.entries.some(
+              ({ item }) => item.type === "assistant_message" && item.text.includes(secret),
+            ),
+          ).toBe(true);
+          process.stdout.write(
+            `${provider}: refresh ${round}/3 passed; same session; memory recalled; timeline present\n`,
+          );
+        }
+      },
+    });
+    await manager.closeAgent(agent.id);
+  } finally {
+    await client?.close();
+    await daemon?.close();
+    await openCode?.shutdown();
+    if (openCodeRuntimeRoot) rmSync(openCodeRuntimeRoot, { recursive: true, force: true });
+    rmSync(root, { recursive: true, force: true });
+  }
+}
+
+// Opt in: real requests using local Claude/Codex auth and the OpenRouter test setup.
+test
+  .runIf(process.env.PASEO_NATIVE_RELOAD_QA === "1")
+  .each(["claude", "codex", "opencode"] as const)(
+  "%s retains its session and conversation through repeated refresh RPCs",
+  async (provider) => {
+    await withNativeConversation(provider, async (conversation) => {
+      const sessionId = await conversation.rememberToken();
+      await conversation.reloadAndRecallToken(sessionId);
+    });
+  },
+  180_000,
+);
diff --git a/packages/server/src/server/daemon-e2e/agent-rpc-durability.e2e.test.ts b/packages/server/src/server/daemon-e2e/agent-rpc-durability.e2e.test.ts
index ad56ac382e..b8a9cd7cfc 100644
--- a/packages/server/src/server/daemon-e2e/agent-rpc-durability.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/agent-rpc-durability.e2e.test.ts
@@ -1,4 +1,4 @@
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { expect, test } from "vitest";
@@ -74,6 +74,49 @@ test("agent fetch RPCs tolerate an agent whose workspace project record is gone"
   }
 });
 
+test("history search filters before pagination and keeps newest matches first", async () => {
+  const fixture = seedStaleAgentFixture();
+  let daemon: TestPaseoDaemon | null = null;
+  let client: DaemonClient | null = null;
+  try {
+    const agentsDir = path.join(fixture.paseoHomeRoot, ".paseo", "agents");
+    const template = JSON.parse(
+      readFileSync(path.join(agentsDir, `${fixture.healthyAgentId}.json`), "utf8"),
+    );
+    for (const [id, title, updatedAt] of [
+      ["newer-partial", "Unbilled usage", "2026-06-29T13:00:00.000Z"],
+      ["unrelated", "Terminal resizing", "2026-06-29T12:00:00.000Z"],
+      ["older-exact", "bill", "2026-06-28T12:00:00.000Z"],
+    ]) {
+      writeJson(path.join(agentsDir, `${id}.json`), {
+        ...template,
+        id,
+        title,
+        updatedAt,
+        lastActivityAt: updatedAt,
+      });
+    }
+    daemon = await createTestPaseoDaemon({ paseoHomeRoot: fixture.paseoHomeRoot, cleanup: false });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    await client.connect();
+    const first = await client.fetchAgentHistory({ search: "bill", page: { limit: 1 } });
+    expect(first.entries.map((entry) => entry.agent.id)).toEqual(["newer-partial"]);
+    expect(first.pageInfo.hasMore).toBe(true);
+    expect(first.pageInfo.nextCursor).toBeTypeOf("string");
+    const second = await client.fetchAgentHistory({
+      search: "bill",
+      page: { limit: 1, cursor: first.pageInfo.nextCursor! },
+    });
+    expect(second.entries.map((entry) => entry.agent.id)).toEqual(["older-exact"]);
+    expect(second.pageInfo.hasMore).toBe(false);
+    expect(second.entries[0].searchMatches).toBeUndefined();
+  } finally {
+    await client?.close().catch(() => undefined);
+    await daemon?.close().catch(() => undefined);
+    for (const target of fixture.cleanupPaths) rmSync(target, { recursive: true, force: true });
+  }
+});
+
 function seedStaleAgentFixture(): StaleAgentFixture {
   const healthyCwd = mkdtempSync(path.join(os.tmpdir(), "paseo-healthy-agent-"));
   const orphanCwd = mkdtempSync(path.join(os.tmpdir(), "paseo-orphan-agent-"));
diff --git a/packages/server/src/server/daemon-e2e/auto-archive-unrelated-github-merge.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/auto-archive-unrelated-github-merge.real.e2e.test.ts
index b3a3d4854f..67d39b3134 100644
--- a/packages/server/src/server/daemon-e2e/auto-archive-unrelated-github-merge.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/auto-archive-unrelated-github-merge.real.e2e.test.ts
@@ -126,7 +126,7 @@ githubTest(
       throw new Error("Failed to register both worktrees");
     }
     await context.client.fetchWorkspaces({
-      subscribe: { subscriptionId: "real-unrelated-merge" },
+      subscribe: {},
     });
 
     writeFileSync(path.join(merged.worktreePath, "feature.txt"), "merged\n");
diff --git a/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
new file mode 100644
index 0000000000..f0cd4495e1
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
@@ -0,0 +1,87 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+import { createDaemonTestContext } from "../test-utils/index.js";
+
+function git(cwd: string, ...args: string[]): string {
+  return execFileSync("git", args, { cwd, encoding: "utf8" });
+}
+
+test.each(["uncommitted", "base", "commit"] as const)(
+  "%s diff preserves removed SQL comments and their deletion counts",
+  async (mode) => {
+    const ctx = await createDaemonTestContext();
+    const cwd = mkdtempSync(join(tmpdir(), "checkout-diff-content-"));
+
+    try {
+      git(cwd, "init", "-b", "main");
+      git(cwd, "config", "user.name", "Test");
+      git(cwd, "config", "user.email", "test@example.com");
+      writeFileSync(join(cwd, "query.sql"), "-- old comment\nSELECT 1;\n");
+      writeFileSync(join(cwd, "control.sql"), "SELECT 1;\n");
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
+      writeFileSync(join(cwd, "query.sql"), "-- new comment\nSELECT 1;\n");
+      writeFileSync(join(cwd, "control.sql"), "SELECT 2;\n");
+
+      expect(git(cwd, "diff", "--numstat", "HEAD", "--", "query.sql").trim()).toBe(
+        "1\t1\tquery.sql",
+      );
+
+      if (mode !== "uncommitted") {
+        git(cwd, "checkout", "-b", "feature");
+        git(cwd, "add", ".");
+        git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      }
+
+      const files =
+        mode === "commit"
+          ? [
+              (
+                await ctx.client.getCommitFileDiff(
+                  cwd,
+                  git(cwd, "rev-parse", "HEAD").trim(),
+                  "query.sql",
+                )
+              ).file,
+              (
+                await ctx.client.getCommitFileDiff(
+                  cwd,
+                  git(cwd, "rev-parse", "HEAD").trim(),
+                  "control.sql",
+                )
+              ).file,
+            ]
+          : (await ctx.client.getCheckoutDiff(cwd, { mode, baseRef: "main" })).files;
+
+      const control = files.find((file) => file?.path === "control.sql");
+      expect(control).toMatchObject({ additions: 1, deletions: 1 });
+      expect(control?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "SELECT 1;" }),
+          expect.objectContaining({ type: "add", content: "SELECT 2;" }),
+        ]),
+      );
+
+      const query = files.find((file) => file?.path === "query.sql");
+      expect
+        .soft(query)
+        .toMatchObject({ additions: 1, deletions: 1, isNew: false, isDeleted: false });
+      expect
+        .soft(query?.hunks.flatMap((hunk) => hunk.lines))
+        .toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({ type: "remove", content: "-- old comment" }),
+            expect.objectContaining({ type: "add", content: "-- new comment" }),
+            expect.objectContaining({ type: "context", content: "SELECT 1;" }),
+          ]),
+        );
+    } finally {
+      await ctx.cleanup();
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  },
+  60_000,
+);
diff --git a/packages/server/src/server/daemon-e2e/checkout-diff-subscription.e2e.test.ts b/packages/server/src/server/daemon-e2e/checkout-diff-subscription.e2e.test.ts
index 7ce8cbb3a3..3af53a9133 100644
--- a/packages/server/src/server/daemon-e2e/checkout-diff-subscription.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/checkout-diff-subscription.e2e.test.ts
@@ -77,12 +77,9 @@ test("pushes file-level checkout diff updates with deterministic path order", as
     initGitRepo(cwd);
     commitFile(cwd, "base.txt", "base\n");
 
-    const subscriptionId = "checkout-diff-e2e-subscription";
-    const initial = await ctx.client.subscribeCheckoutDiff(
-      cwd,
-      { mode: "uncommitted" },
-      { subscriptionId },
-    );
+    const subscription = ctx.client.observeCheckoutDiff(cwd, { mode: "uncommitted" });
+    const initial = await subscription.ready;
+    const subscriptionId = initial.subscriptionId;
 
     expect(initial.error).toBeNull();
     expect(initial.files).toEqual([]);
@@ -98,7 +95,7 @@ test("pushes file-level checkout diff updates with deterministic path order", as
     expect(update.error).toBeNull();
     expect(update.files.map((file) => file.path)).toEqual(["alpha.txt", "zeta.txt"]);
 
-    ctx.client.unsubscribeCheckoutDiff(subscriptionId);
+    await subscription.release();
   } finally {
     rmSync(cwd, { recursive: true, force: true });
   }
@@ -114,12 +111,9 @@ test("pushes updates when subscribed from a subdirectory and files change outsid
     const nestedDir = path.join(cwd, "nested", "dir");
     mkdirSync(nestedDir, { recursive: true });
 
-    const subscriptionId = "checkout-diff-subdir-e2e-subscription";
-    const initial = await ctx.client.subscribeCheckoutDiff(
-      nestedDir,
-      { mode: "uncommitted" },
-      { subscriptionId },
-    );
+    const subscription = ctx.client.observeCheckoutDiff(nestedDir, { mode: "uncommitted" });
+    const initial = await subscription.ready;
+    const subscriptionId = initial.subscriptionId;
 
     expect(initial.error).toBeNull();
     expect(initial.files).toEqual([]);
@@ -133,7 +127,7 @@ test("pushes updates when subscribed from a subdirectory and files change outsid
     expect(update.error).toBeNull();
     expect(update.files.some((file) => file.path === "outside-subdir.txt")).toBe(true);
 
-    ctx.client.unsubscribeCheckoutDiff(subscriptionId);
+    await subscription.release();
   } finally {
     rmSync(cwd, { recursive: true, force: true });
   }
@@ -146,15 +140,14 @@ test("keeps the socket usable after rejecting an oversized structured diff", asy
     initGitRepo(cwd);
     commitFile(cwd, "large-a.js", "const value = 0;\n");
     commitFile(cwd, "large-b.js", "const value = 0;\n");
-    const denseExpression = `const value = ${"a+".repeat(450_000)}a;\n`;
+    // Short lines stay eligible for highlighting; a giant single line is skipped
+    // before token expansion and cannot exercise the structured-payload limit.
+    const denseExpression = `const value = ${"a+".repeat(100)}a;\n`.repeat(4_000);
     writeFileSync(path.join(cwd, "large-a.js"), denseExpression);
     writeFileSync(path.join(cwd, "large-b.js"), denseExpression);
 
-    const initial = await ctx.client.subscribeCheckoutDiff(
-      cwd,
-      { mode: "uncommitted" },
-      { subscriptionId: "oversized-checkout-diff" },
-    );
+    const subscription = ctx.client.observeCheckoutDiff(cwd, { mode: "uncommitted" });
+    const initial = await subscription.ready;
 
     expect(initial).toMatchObject({
       cwd,
@@ -165,6 +158,7 @@ test("keeps the socket usable after rejecting an oversized structured diff", asy
 
     const status = await ctx.client.getCheckoutStatus(cwd);
     expect(status).toMatchObject({ cwd, isGit: true });
+    await subscription.release();
   } finally {
     rmSync(cwd, { recursive: true, force: true });
   }
diff --git a/packages/server/src/server/daemon-e2e/claude-autonomous-wake-simple.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-autonomous-wake-simple.real.e2e.test.ts
index 77bd164732..0631cfd867 100644
--- a/packages/server/src/server/daemon-e2e/claude-autonomous-wake-simple.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-autonomous-wake-simple.real.e2e.test.ts
@@ -45,7 +45,7 @@ describe("daemon E2E (real claude) - autonomous wake simple", () => {
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-simple-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
diff --git a/packages/server/src/server/daemon-e2e/claude-autonomous-wake.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-autonomous-wake.real.e2e.test.ts
index fe482d00a5..5899a91bc8 100644
--- a/packages/server/src/server/daemon-e2e/claude-autonomous-wake.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-autonomous-wake.real.e2e.test.ts
@@ -451,7 +451,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-abc-a" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -524,7 +524,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-abc-b" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -597,7 +597,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-abc-c" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -663,7 +663,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-wake-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -721,7 +721,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-followup-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -767,7 +767,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-hang-repro-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -869,7 +869,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-background-repro-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -941,7 +941,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-autonomous-race-stress-real" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
@@ -1027,7 +1027,7 @@ describe("daemon E2E (real claude) - autonomous wake from background task", () =
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-transcript-parity-race" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
diff --git a/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
new file mode 100644
index 0000000000..00b365881f
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
@@ -0,0 +1,130 @@
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { claudeProjectDirSync } from "../agent/providers/claude/project-dir.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+// Claude Code resumes a session by id from any working directory and keeps writing to the
+// transcript under the project folder it started in. The agent's cwd can name a different
+// folder: a project that moved, a daemon migrated between machines or containers, or Claude
+// Code running under WSL interop and seeing the cwd as a Windows path.
+// The test daemon fakes the built-in providers; a provider that extends `claude` runs the real one.
+const PROVIDER_ID = "claude-real";
+const SESSION_ID = "6f0c5d8e-4c3a-4f7b-9a51-2d8e1b7c9f10";
+
+function timelineText(entries: ReadonlyArray<{ item: { type: string; text?: string } }>): string {
+  return entries
+    .filter(
+      (
+        entry,
+      ): entry is {
+        item: { type: "user_message" | "assistant_message"; text: string };
+      } => entry.item.type === "user_message" || entry.item.type === "assistant_message",
+    )
+    .map((entry) => entry.item.text)
+    .join("\n");
+}
+
+describe("daemon E2E - Claude history stored under another project folder", () => {
+  let tempRoot: string;
+  let paseoHomeRoot: string;
+  let configDir: string;
+  let transcriptCwd: string;
+  let agentCwd: string;
+  let daemon: TestPaseoDaemon | undefined;
+  let client: DaemonClient | undefined;
+
+  beforeEach(() => {
+    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-history-other-project-"));
+    paseoHomeRoot = path.join(tempRoot, "paseo-home");
+    configDir = path.join(tempRoot, "claude-config");
+    transcriptCwd = path.join(tempRoot, "where-claude-started");
+    agentCwd = path.join(tempRoot, "agent-cwd");
+    mkdirSync(paseoHomeRoot, { recursive: true });
+    mkdirSync(agentCwd, { recursive: true });
+
+    const projectDir = claudeProjectDirSync(transcriptCwd, { configDir });
+    mkdirSync(projectDir, { recursive: true });
+    writeFileSync(
+      path.join(projectDir, `${SESSION_ID}.jsonl`),
+      [
+        {
+          type: "user",
+          uuid: "user-uuid-1",
+          sessionId: SESSION_ID,
+          cwd: transcriptCwd,
+          message: { role: "user", content: "hello from the original folder" },
+        },
+        {
+          type: "assistant",
+          sessionId: SESSION_ID,
+          cwd: transcriptCwd,
+          message: {
+            role: "assistant",
+            content: "reply from the original folder",
+          },
+        },
+      ]
+        .map((entry) => `${JSON.stringify(entry)}\n`)
+        .join(""),
+      "utf8",
+    );
+  });
+
+  afterEach(async () => {
+    await client?.close().catch(() => undefined);
+    await daemon?.close().catch(() => undefined);
+    client = undefined;
+    daemon = undefined;
+    rmSync(tempRoot, { recursive: true, force: true });
+  }, 60_000);
+
+  async function startDaemon(): Promise<DaemonClient> {
+    daemon = await createTestPaseoDaemon({
+      paseoHomeRoot,
+      cleanup: false,
+      providerOverrides: {
+        [PROVIDER_ID]: {
+          extends: "claude",
+          label: "Claude",
+          env: { CLAUDE_CONFIG_DIR: configDir },
+        },
+      },
+    });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    return client;
+  }
+
+  async function stopDaemon(): Promise<void> {
+    await client?.close();
+    await daemon?.close();
+    client = undefined;
+    daemon = undefined;
+  }
+
+  test("an agent's timeline survives a daemon restart", async () => {
+    const firstClient = await startDaemon();
+    const agent = await firstClient.importAgent({
+      provider: PROVIDER_ID,
+      sessionId: SESSION_ID,
+      cwd: agentCwd,
+    });
+    await stopDaemon();
+
+    const restartedClient = await startDaemon();
+    const timeline = await restartedClient.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "canonical",
+    });
+
+    const text = timelineText(timeline.entries);
+    expect(text).toContain("hello from the original folder");
+    expect(text).toContain("reply from the original folder");
+  }, 60_000);
+});
diff --git a/packages/server/src/server/daemon-e2e/claude-live-usage.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-live-usage.e2e.test.ts
index 4d4ceb3a57..39b3d7d176 100644
--- a/packages/server/src/server/daemon-e2e/claude-live-usage.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-live-usage.e2e.test.ts
@@ -150,7 +150,7 @@ describe("daemon E2E (claude live usage)", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "claude-live-usage" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         provider: "claude",
diff --git a/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts
new file mode 100644
index 0000000000..29779fd1ef
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts
@@ -0,0 +1,137 @@
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { claudeProjectDirSync } from "../agent/providers/claude/project-dir.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+const PROVIDER_ID = "claude-secondary";
+const SESSION_ID = "provider-config-dir-session";
+
+function timelineText(entries: ReadonlyArray<{ item: { type: string; text?: string } }>): string {
+  return entries
+    .filter(
+      (entry): entry is { item: { type: "user_message" | "assistant_message"; text: string } } =>
+        entry.item.type === "user_message" || entry.item.type === "assistant_message",
+    )
+    .map((entry) => entry.item.text)
+    .join("\n");
+}
+
+describe("daemon E2E - Claude history lives in the provider's CLAUDE_CONFIG_DIR", () => {
+  let tempRoot: string;
+  let paseoHomeRoot: string;
+  let providerConfigDir: string;
+  let cwd: string;
+  let prevClaudeConfigDir: string | undefined;
+  let daemon: TestPaseoDaemon | undefined;
+  let client: DaemonClient | undefined;
+
+  beforeEach(() => {
+    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-provider-config-dir-"));
+    paseoHomeRoot = path.join(tempRoot, "paseo-home");
+    providerConfigDir = path.join(tempRoot, "custom-claude-dir");
+    cwd = path.join(tempRoot, "repo");
+    mkdirSync(paseoHomeRoot, { recursive: true });
+    mkdirSync(cwd, { recursive: true });
+
+    const projectDir = claudeProjectDirSync(cwd, { configDir: providerConfigDir });
+    mkdirSync(projectDir, { recursive: true });
+    writeFileSync(
+      path.join(projectDir, `${SESSION_ID}.jsonl`),
+      [
+        {
+          type: "user",
+          uuid: "user-uuid-1",
+          sessionId: SESSION_ID,
+          cwd,
+          message: { role: "user", content: "hello from the custom config dir" },
+        },
+        {
+          type: "assistant",
+          sessionId: SESSION_ID,
+          cwd,
+          message: { role: "assistant", content: "reply from the custom config dir" },
+        },
+      ]
+        .map((entry) => `${JSON.stringify(entry)}\n`)
+        .join(""),
+      "utf8",
+    );
+
+    // The daemon's own environment does not name the directory; only the provider's env does.
+    prevClaudeConfigDir = process.env.CLAUDE_CONFIG_DIR;
+    delete process.env.CLAUDE_CONFIG_DIR;
+  });
+
+  afterEach(async () => {
+    await client?.close().catch(() => undefined);
+    await daemon?.close().catch(() => undefined);
+    client = undefined;
+    daemon = undefined;
+    rmSync(tempRoot, { recursive: true, force: true });
+    if (prevClaudeConfigDir === undefined) {
+      delete process.env.CLAUDE_CONFIG_DIR;
+    } else {
+      process.env.CLAUDE_CONFIG_DIR = prevClaudeConfigDir;
+    }
+  }, 60_000);
+
+  async function startDaemon(): Promise<DaemonClient> {
+    daemon = await createTestPaseoDaemon({
+      paseoHomeRoot,
+      cleanup: false,
+      providerOverrides: {
+        [PROVIDER_ID]: {
+          extends: "claude",
+          label: "Claude (secondary)",
+          env: { CLAUDE_CONFIG_DIR: providerConfigDir },
+        },
+      },
+    });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    return client;
+  }
+
+  async function stopDaemon(): Promise<void> {
+    await client?.close();
+    await daemon?.close();
+    client = undefined;
+    daemon = undefined;
+  }
+
+  test("an agent's timeline survives a daemon restart", async () => {
+    const firstClient = await startDaemon();
+    const agent = await firstClient.importAgent({
+      provider: PROVIDER_ID,
+      sessionId: SESSION_ID,
+      cwd,
+    });
+    await stopDaemon();
+
+    const restartedClient = await startDaemon();
+    const timeline = await restartedClient.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "canonical",
+    });
+
+    const text = timelineText(timeline.entries);
+    expect(text).toContain("hello from the custom config dir");
+    expect(text).toContain("reply from the custom config dir");
+  }, 60_000);
+
+  test("the import list finds the provider's sessions", async () => {
+    const daemonClient = await startDaemon();
+    const recent = await daemonClient.fetchRecentProviderSessions({
+      cwd,
+      providers: [PROVIDER_ID],
+    });
+
+    expect(recent.entries.map((entry) => entry.providerHandleId)).toContain(SESSION_ID);
+  }, 60_000);
+});
diff --git a/packages/server/src/server/daemon-e2e/claude-rewind.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-rewind.real.e2e.test.ts
index c362529e23..23ab49e67d 100644
--- a/packages/server/src/server/daemon-e2e/claude-rewind.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-rewind.real.e2e.test.ts
@@ -234,7 +234,7 @@ describe("daemon E2E (real claude) - rewind", () => {
     });
 
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "claude-rewind-real" } });
+    await client.fetchAgents({ subscribe: {} });
     harness = { client, daemon };
   }, 30_000);
 
diff --git a/packages/server/src/server/daemon-e2e/claude-thinking-memory.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-thinking-memory.real.e2e.test.ts
index 937f3d0c6a..c1640a7d2d 100644
--- a/packages/server/src/server/daemon-e2e/claude-thinking-memory.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-thinking-memory.real.e2e.test.ts
@@ -72,7 +72,7 @@ describe("daemon E2E (real claude) - thinking effort memory", () => {
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-thinking-memory-real" },
+        subscribe: {},
       });
 
       const modelList = await client.listProviderModels("claude", { cwd });
diff --git a/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts b/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts
new file mode 100644
index 0000000000..d8388f9dd2
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts
@@ -0,0 +1,89 @@
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+// A real daemon and CLI with a deterministic provider emitting two text chunks.
+// The live Claude reproduction is recorded in the PR; this locks its CLI behavior.
+test("logs --follow preserves the same assistant text as one-shot logs", async () => {
+  const daemon = await createTestPaseoDaemon();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  let follow: ReturnType<typeof spawn> | undefined;
+  let stdout = "";
+  let stderr = "";
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({
+      provider: "claude",
+      cwd: daemon.paseoHome,
+      title: "Follow transcript regression",
+      modeId: "bypassPermissions",
+    });
+    follow = spawn(
+      process.execPath,
+      [
+        "--conditions=source",
+        "--import",
+        "tsx",
+        fileURLToPath(new URL("../../../../cli/src/index.ts", import.meta.url)),
+        "--host",
+        `127.0.0.1:${daemon.port}`,
+        "logs",
+        "--follow",
+        agent.id,
+        "--tail",
+        "0",
+        "--filter",
+        "assistant_message",
+      ],
+      {
+        env: { ...process.env, PASEO_HOME: daemon.paseoHome },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+    const exited = once(follow, "exit");
+    follow.stdout?.on("data", (chunk: Buffer) => {
+      stdout += chunk.toString();
+    });
+    follow.stderr?.on("data", (chunk: Buffer) => {
+      stderr += chunk.toString();
+    });
+    await expect
+      .poll(
+        () => {
+          if (follow?.exitCode !== null) {
+            throw new Error(`CLI exited before following logs: ${stderr}`);
+          }
+          return stdout;
+        },
+        { timeout: 20_000 },
+      )
+      .toContain("Following logs");
+    await client.sendMessage(agent.id, "respond with exactly: paseo-pr-cycle 한국어 보고서");
+    await client.waitForAgentUpsert(agent.id, (snapshot) => snapshot.status === "idle", 20_000);
+    const transcript = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 100,
+      projection: "projected",
+    });
+    const assistantText = transcript.entries
+      .filter((row) => row.item.type === "assistant_message")
+      .map((row) => (row.item.type === "assistant_message" ? row.item.text : ""))
+      .join("");
+    expect(assistantText).not.toBe("");
+    // Completion closes the message while follow mode is still running.
+    // Then stop through the CLI's normal signal path.
+    await expect.poll(() => stdout, { timeout: 10_000 }).toContain(`${assistantText.trim()}\n`);
+    follow.kill("SIGINT");
+    await exited;
+    const output = stdout.slice(stdout.indexOf("---\n") + 4).trim();
+    expect(output, stderr).toBe(assistantText.trim());
+  } finally {
+    follow?.kill("SIGTERM");
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);
diff --git a/packages/server/src/server/daemon-e2e/codex-auto-review.local.e2e.test.ts b/packages/server/src/server/daemon-e2e/codex-auto-review.local.e2e.test.ts
index c0e9bc6154..8237ce9ef7 100644
--- a/packages/server/src/server/daemon-e2e/codex-auto-review.local.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/codex-auto-review.local.e2e.test.ts
@@ -288,7 +288,7 @@ async function runScenario(modeId: "auto" | "auto-review") {
   try {
     writeMockCodexConfig(codexHome, mockServer.url);
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: `codex-auto-review-${modeId}` } });
+    await client.fetchAgents({ subscribe: {} });
 
     const agent = await client.createAgent({
       provider: "codex",
diff --git a/packages/server/src/server/daemon-e2e/codex-custom-provider-archive.local.e2e.test.ts b/packages/server/src/server/daemon-e2e/codex-custom-provider-archive.local.e2e.test.ts
new file mode 100644
index 0000000000..9917ba573f
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/codex-custom-provider-archive.local.e2e.test.ts
@@ -0,0 +1,135 @@
+import { once } from "node:events";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { createServer, type Server } from "node:http";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+// Runs the real `codex` binary against a local Responses endpoint standing in
+// for a custom provider's OPENAI_BASE_URL, so no login is needed.
+
+function sse(events: Array<Record<string, unknown>>): string {
+  return events
+    .map((event) => `event: ${String(event.type)}\ndata: ${JSON.stringify(event)}\n\n`)
+    .join("");
+}
+
+function finalAnswer(): string {
+  return sse([
+    { type: "response.created", response: { id: "resp-1" } },
+    {
+      type: "response.output_item.done",
+      item: {
+        type: "message",
+        role: "assistant",
+        id: "msg-1",
+        content: [{ type: "output_text", text: "done" }],
+      },
+    },
+    {
+      type: "response.completed",
+      response: {
+        id: "resp-1",
+        usage: {
+          input_tokens: 0,
+          input_tokens_details: null,
+          output_tokens: 0,
+          output_tokens_details: null,
+          total_tokens: 0,
+        },
+      },
+    },
+  ]);
+}
+
+async function startResponsesEndpoint(): Promise<{
+  baseUrl: string;
+  server: Server;
+  requestCount: () => number;
+}> {
+  let requests = 0;
+  const server = createServer((req, res) => {
+    req.resume();
+    req.on("end", () => {
+      if (req.method !== "POST" || req.url !== "/v1/responses") {
+        res.statusCode = 404;
+        res.end();
+        return;
+      }
+      requests += 1;
+      res.setHeader("content-type", "text/event-stream");
+      res.end(finalAnswer());
+    });
+  });
+  server.listen(0, "127.0.0.1");
+  await once(server, "listening");
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("no server address");
+  return {
+    baseUrl: `http://127.0.0.1:${address.port}/v1`,
+    server,
+    requestCount: () => requests,
+  };
+}
+
+async function closeServer(server: Server): Promise<void> {
+  server.close();
+  await once(server, "close");
+}
+
+describe("Codex custom provider archive", () => {
+  const cleanups: Array<() => void | Promise<void>> = [];
+
+  afterEach(async () => {
+    for (const cleanup of cleanups.splice(0).toReversed()) await cleanup();
+  });
+
+  test("archiving hides the session from Import session and unarchiving lists it again", async () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), "codex-custom-archive-"));
+    cleanups.push(() => rmSync(root, { recursive: true, force: true }));
+    const codexHome = path.join(root, "codex-home");
+    mkdirSync(codexHome);
+    const cwd = path.join(root, "project");
+    mkdirSync(cwd);
+    const { baseUrl, server } = await startResponsesEndpoint();
+    cleanups.push(() => closeServer(server));
+
+    const daemon = await createTestPaseoDaemon({
+      logger: createTestLogger(),
+      pluginsEnabled: false,
+      providerOverrides: {
+        "my-codex": {
+          extends: "codex",
+          label: "My Codex",
+          env: { CODEX_HOME: codexHome, OPENAI_BASE_URL: baseUrl, OPENAI_API_KEY: "test-key" },
+        },
+      },
+    });
+    cleanups.push(() => daemon.close());
+    const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    cleanups.push(() => client.close());
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const manager = daemon.daemon.agentManager;
+
+    const agent = await client.createAgent({
+      config: { provider: "my-codex", cwd, model: "mock-model", modeId: "full-access" },
+    });
+    await manager.runAgent(agent.id, "hello from the custom provider");
+    const importable = async () =>
+      (await manager.listImportableSessions({ cwd, providerFilter: new Set(["my-codex"]) }))
+        .sessions;
+    expect(await importable()).toHaveLength(1);
+
+    await client.archiveAgent(agent.id);
+    expect(await importable()).toEqual([]);
+
+    await client.refreshAgent(agent.id);
+    expect(await importable()).toHaveLength(1);
+  }, 120_000);
+});
diff --git a/packages/server/src/server/daemon-e2e/codex-goal-mid-turn.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/codex-goal-mid-turn.real.e2e.test.ts
index 9e4722ea26..6f43929f2d 100644
--- a/packages/server/src/server/daemon-e2e/codex-goal-mid-turn.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/codex-goal-mid-turn.real.e2e.test.ts
@@ -116,7 +116,7 @@ describe("daemon E2E (real codex) - /goal command", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
@@ -170,7 +170,7 @@ describe("daemon E2E (real codex) - /goal command", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
@@ -247,7 +247,7 @@ describe("daemon E2E (real codex) - /goal command", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
diff --git a/packages/server/src/server/daemon-e2e/codex-rewind.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/codex-rewind.real.e2e.test.ts
index e61346a6a2..c55322de0e 100644
--- a/packages/server/src/server/daemon-e2e/codex-rewind.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/codex-rewind.real.e2e.test.ts
@@ -164,7 +164,7 @@ describe("daemon E2E (real codex) - rewind", () => {
     });
 
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "codex-rewind-real" } });
+    await client.fetchAgents({ subscribe: {} });
     harness = { client, daemon };
   }, 30_000);
 
diff --git a/packages/server/src/server/daemon-e2e/empty-project-persists.e2e.test.ts b/packages/server/src/server/daemon-e2e/empty-project-persists.e2e.test.ts
index 1c5fed39ed..6b2e0bef4b 100644
--- a/packages/server/src/server/daemon-e2e/empty-project-persists.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/empty-project-persists.e2e.test.ts
@@ -108,7 +108,7 @@ test("archiving the last workspace leaves the project parent with no workspaces"
     const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
     cleanupClients.add(client);
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "empty-project-agents" } });
+    await client.fetchAgents({ subscribe: {} });
 
     const created = await client.createWorkspace({ source: { kind: "directory", path: repoRoot } });
     expect(created.error).toBeNull();
diff --git a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
index f9d7fce7b4..862923dec6 100644
--- a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
@@ -1,5 +1,15 @@
 import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync } from "fs";
+import {
+  mkdtempSync,
+  writeFileSync,
+  rmSync,
+  readdirSync,
+  readlinkSync,
+  realpathSync,
+  symlinkSync,
+} from "fs";
+import { once } from "node:events";
+import { get } from "node:http";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -8,6 +18,41 @@ function tmpCwd(): string {
   return mkdtempSync(path.join(tmpdir(), "daemon-e2e-"));
 }
 
+// Linux exposes the real open descriptors without replacing file or HTTP methods.
+function openDownloadDescriptors(filePath: string): string[] {
+  const realFilePath = realpathSync(filePath);
+  return readdirSync("/proc/self/fd").filter((fd) => {
+    try {
+      return readlinkSync(`/proc/self/fd/${fd}`) === realFilePath;
+    } catch (error) {
+      // A descriptor can close between listing it and reading its link.
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") return false;
+      throw error;
+    }
+  });
+}
+
+async function expectDownloadClosed(filePath: string): Promise<void> {
+  await expect.poll(() => openDownloadDescriptors(filePath)).toEqual([]);
+}
+
+async function cancelDownloadAfterFirstChunk(url: string): Promise<void> {
+  const request = get(url);
+  try {
+    const [response] = await once(request, "response");
+    expect(response.statusCode).toBe(200);
+    const [chunk] = await once(response, "data");
+    expect(chunk.length).toBeGreaterThan(0);
+    expect(chunk.length).toBeLessThan(64 * 1024 * 1024);
+    const closed = once(response, "close");
+    response.destroy();
+    request.destroy();
+    await closed;
+  } finally {
+    request.destroy();
+  }
+}
+
 // Use gpt-5.4-mini with low thinking preset for faster test execution
 const CODEX_TEST_MODEL = "gpt-5.4-mini";
 const CODEX_TEST_THINKING_OPTION_ID = "low";
@@ -24,42 +69,110 @@ describe("daemon E2E", () => {
   }, 60000);
 
   describe("file download tokens", () => {
-    test("issues token over WS and downloads via HTTP", async () => {
-      const cwd = tmpCwd();
-      const filePath = path.join(cwd, "download.txt");
-      const fileContents = "download test payload";
-      writeFileSync(filePath, fileContents, "utf-8");
+    test.skipIf(process.platform !== "linux")(
+      "releases file descriptors after repeated HTTP download cancellations",
+      async () => {
+        const directory = tmpCwd();
+        const cwd = path.join(directory, "linked-files");
+        symlinkSync(mkdtempSync(path.join(directory, "files-")), cwd, "dir");
+        const filePath = path.join(cwd, "large.bin");
+        const fileSize = 64 * 1024 * 1024;
+        writeFileSync(filePath, Buffer.alloc(fileSize));
+        try {
+          const completedToken = await ctx.client.requestDownloadToken(cwd, "large.bin");
+          expect(completedToken.error).toBeNull();
+          const completed = await fetch(
+            `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${completedToken.token}`,
+          );
+          expect(completed.status).toBe(200);
+          expect((await completed.arrayBuffer()).byteLength).toBe(fileSize);
+          await expectDownloadClosed(filePath);
 
-      const agent = await ctx.client.createAgent({
-        provider: "codex",
-        model: CODEX_TEST_MODEL,
-        thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
-        cwd,
-        title: "Download Token Test Agent",
-      });
+          for (let attempt = 0; attempt < 3; attempt++) {
+            const token = await ctx.client.requestDownloadToken(cwd, "large.bin");
+            expect(token.error).toBeNull();
+            await cancelDownloadAfterFirstChunk(
+              `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${token.token}`,
+            );
+            await expectDownloadClosed(filePath);
+          }
+        } finally {
+          rmSync(directory, { recursive: true, force: true });
+        }
+      },
+    );
 
-      expect(agent.id).toBeTruthy();
+    test.each([
+      { fileName: "download.txt", disposition: 'attachment; filename="download.txt"' },
+      {
+        fileName: "café.txt",
+        disposition: "attachment; filename=\"caf?.txt\"; filename*=UTF-8''caf%C3%A9.txt",
+      },
+      {
+        fileName: "中文报告 (最终版).txt",
+        disposition:
+          "attachment; filename=\"???? (???).txt\"; filename*=UTF-8''%E4%B8%AD%E6%96%87%E6%8A%A5%E5%91%8A%20%28%E6%9C%80%E7%BB%88%E7%89%88%29.txt",
+      },
+      {
+        fileName: "報告書.md",
+        disposition:
+          "attachment; filename=\"???.md\"; filename*=UTF-8''%E5%A0%B1%E5%91%8A%E6%9B%B8.md",
+      },
+      {
+        fileName: "보고서.txt",
+        disposition:
+          "attachment; filename=\"???.txt\"; filename*=UTF-8''%EB%B3%B4%EA%B3%A0%EC%84%9C.txt",
+      },
+      {
+        fileName: "report-📄.txt",
+        disposition:
+          "attachment; filename=\"report-??.txt\"; filename*=UTF-8''report-%F0%9F%93%84.txt",
+      },
+    ])(
+      "issues token over WS and downloads $fileName via HTTP",
+      async ({ fileName, disposition }) => {
+        const cwd = tmpCwd();
+        try {
+          const filePath = path.join(cwd, fileName);
+          const fileContents = "download test payload";
+          writeFileSync(filePath, fileContents, "utf-8");
 
-      const tokenResponse = await ctx.client.requestDownloadToken(cwd, "download.txt");
+          const agent = await ctx.client.createAgent({
+            provider: "codex",
+            model: CODEX_TEST_MODEL,
+            thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
+            cwd,
+            title: "Download Token Test Agent",
+          });
 
-      expect(tokenResponse.error).toBeNull();
-      expect(tokenResponse.token).toBeTruthy();
-      expect(tokenResponse.fileName).toBe("download.txt");
+          expect(agent.id).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+          );
 
-      const response = await fetch(
-        `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`,
-      );
+          const tokenResponse = await ctx.client.requestDownloadToken(cwd, fileName);
 
-      expect(response.status).toBe(200);
-      expect(response.headers.get("content-type")).toBe(tokenResponse.mimeType);
-      const disposition = response.headers.get("content-disposition") ?? "";
-      expect(disposition).toContain("download.txt");
+          expect(tokenResponse.error).toBeNull();
+          expect(tokenResponse.token).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+          );
+          expect(tokenResponse.fileName).toBe(fileName);
 
-      const body = await response.text();
-      expect(body).toBe(fileContents);
+          const response = await fetch(
+            `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`,
+          );
 
-      rmSync(cwd, { recursive: true, force: true });
-    }, 60000);
+          expect(response.status).toBe(200);
+          expect(response.headers.get("content-type")).toBe(tokenResponse.mimeType);
+          expect(response.headers.get("content-disposition")).toBe(disposition);
+
+          const body = await response.text();
+          expect(body).toBe(fileContents);
+        } finally {
+          rmSync(cwd, { recursive: true, force: true });
+        }
+      },
+      60000,
+    );
 
     test("rejects invalid token", async () => {
       const response = await fetch(
diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 4bb4736133..c0e14d72b8 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync, mkdirSync } from "fs";
+import { mkdtempSync, writeFileSync, rmSync, mkdirSync, symlinkSync, readdirSync } from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -23,6 +23,370 @@ afterEach(async () => {
 }, 60000);
 
 describe("file explorer", () => {
+  test.each(["..", "..."])(
+    "workspace suggestions resolve exact paths starting with %s",
+    async (prefix) => {
+      const cwd = tmpCwd();
+      const directoryName = `${prefix}docs`;
+      const nestedPath = `${directoryName}/notes.md`;
+      const fileName = `${prefix}notes.md`;
+      try {
+        mkdirSync(path.join(cwd, directoryName));
+        writeFileSync(path.join(cwd, nestedPath), "nested payload\n");
+        writeFileSync(path.join(cwd, fileName), "direct payload\n");
+        const file = await ctx.client.readFile(cwd, nestedPath);
+        expect(new TextDecoder().decode(file.bytes)).toBe("nested payload\n");
+
+        const nestedEntry = { path: nestedPath, kind: "file" };
+        const entries = [
+          nestedEntry,
+          { path: directoryName, kind: "directory" },
+          { path: fileName, kind: "file" },
+        ];
+        const cases = entries.flatMap((entry) => [
+          { query: `./${entry.path}`, entry },
+          { query: path.resolve(cwd, entry.path), entry },
+        ]);
+        cases.unshift({ query: nestedPath, entry: nestedEntry });
+        for (const { query, entry } of cases) {
+          const response = await ctx.client.getDirectorySuggestions({
+            cwd,
+            query,
+            limit: 1,
+            includeFiles: true,
+            includeDirectories: true,
+            matchMode: "suffix",
+          });
+          expect(response.error).toBeNull();
+          expect(response.entries).toEqual([entry]);
+        }
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
+  test("workspace suggestions exclude exact parent and sibling paths", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const sibling = path.join(directory, "workspace-other");
+    try {
+      mkdirSync(cwd);
+      mkdirSync(sibling);
+      writeFileSync(path.join(cwd, "visible.txt"), "inside payload\n");
+      writeFileSync(path.join(sibling, "outside.txt"), "outside payload\n");
+      for (const query of [
+        "./..",
+        "../workspace-other/outside.txt",
+        path.join(sibling, "outside.txt"),
+      ]) {
+        const response = await ctx.client.getDirectorySuggestions({
+          cwd,
+          query,
+          limit: 1,
+          includeFiles: true,
+          includeDirectories: true,
+          matchMode: "suffix",
+        });
+        expect(response.error).toBeNull();
+        expect(response.entries).toEqual([]);
+      }
+      const control = await ctx.client.getDirectorySuggestions({
+        cwd,
+        query: "./visible.txt",
+        limit: 1,
+        includeFiles: true,
+        includeDirectories: false,
+        matchMode: "suffix",
+      });
+      expect(control.error).toBeNull();
+      expect(control.entries).toEqual([{ path: "visible.txt", kind: "file" }]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
+  test.each([
+    { description: "a long ASCII name", fileName: `${"a".repeat(236)}.txt` },
+    { description: "an ordinary name", fileName: "notes.txt" },
+    { description: "a long Unicode name", fileName: `${"文".repeat(76)}.txt` },
+  ])("saves text files with $description", async ({ fileName }) => {
+    const cwd = tmpCwd();
+    try {
+      const created = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: fileName,
+        kind: "file",
+      });
+      expect(created).toMatchObject({ path: fileName, success: true, error: null });
+      writeFileSync(path.join(cwd, fileName), "original payload\n");
+      const initial = await ctx.client.readFile(cwd, fileName);
+
+      const saved = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "saved payload\n",
+        expectedModifiedAt: initial.modifiedAt,
+        expectedRevision: initial.revision,
+      });
+      expect(saved).toMatchObject({ status: "written", size: 14 });
+      const after = await ctx.client.readFile(cwd, fileName);
+      expect(after.path).toBe(fileName);
+      expect(new TextDecoder().decode(after.bytes)).toBe("saved payload\n");
+
+      const staleSave = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "stale payload\n",
+        expectedModifiedAt: initial.modifiedAt,
+        expectedRevision: initial.revision,
+      });
+      expect(staleSave).toMatchObject({
+        status: "conflict",
+        version: {
+          status: "ready",
+          path: fileName,
+          size: after.size,
+          modifiedAt: after.modifiedAt,
+          revision: after.revision,
+        },
+      });
+      const afterConflict = await ctx.client.readFile(cwd, fileName);
+      expect(new TextDecoder().decode(afterConflict.bytes)).toBe("saved payload\n");
+
+      const secondSave = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "second payload\n",
+        expectedModifiedAt: afterConflict.modifiedAt,
+        expectedRevision: afterConflict.revision,
+      });
+      expect(secondSave).toMatchObject({ status: "written", size: 15 });
+      const final = await ctx.client.readFile(cwd, fileName);
+      expect(new TextDecoder().decode(final.bytes)).toBe("second payload\n");
+      expect(readdirSync(cwd)).toEqual([fileName]);
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test.each([
+    {
+      query: "implementation",
+      expectedPaths: [
+        ".cursor/plans/implementation-plan.md",
+        ".codex/plans/implementation-plan.md",
+        ".claude/plans/implementation-plan.md",
+      ],
+    },
+    {
+      query: ".cursor/plans/implementation",
+      expectedPaths: [".cursor/plans/implementation-plan.md"],
+    },
+  ])(
+    "workspace suggestions find hidden agent plans for '$query'",
+    async ({ query, expectedPaths }) => {
+      const cwd = tmpCwd();
+      try {
+        for (const directory of [".cursor", ".codex", ".claude", ".hidden"]) {
+          mkdirSync(path.join(cwd, directory, "plans"), { recursive: true });
+          writeFileSync(path.join(cwd, directory, "plans", "implementation-plan.md"), "plan\n");
+        }
+
+        const response = await ctx.client.getDirectorySuggestions({
+          cwd,
+          query,
+          limit: 50,
+          includeFiles: true,
+          includeDirectories: true,
+        });
+        expect(response.error).toBeNull();
+        expect(response.entries).toHaveLength(expectedPaths.length);
+        expect(response.entries).toEqual(
+          expect.arrayContaining(
+            expectedPaths.map((entryPath) => ({ path: entryPath, kind: "file" })),
+          ),
+        );
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
+  test.each(["..", "..."])("supports file operations on names starting with %s", async (prefix) => {
+    const cwd = tmpCwd();
+    const fileName = `${prefix}notes.txt`;
+    const directoryName = `${prefix}drafts`;
+    try {
+      const createdFile = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: fileName,
+        kind: "file",
+      });
+      expect(createdFile).toMatchObject({ path: fileName, success: true, error: null });
+      writeFileSync(path.join(cwd, fileName), "notes payload\n");
+      writeFileSync(path.join(cwd, ".notes.txt"), "dotfile control\n");
+      writeFileSync(path.join(cwd, "notes.txt"), "ordinary control\n");
+
+      const createdDirectory = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: directoryName,
+        kind: "directory",
+      });
+      expect(createdDirectory).toMatchObject({ path: directoryName, success: true, error: null });
+      const createdChild = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: directoryName,
+        name: "inside.txt",
+        kind: "file",
+      });
+      expect(createdChild).toMatchObject({
+        path: `${directoryName}/inside.txt`,
+        success: true,
+        error: null,
+      });
+      writeFileSync(path.join(cwd, directoryName, "inside.txt"), "nested payload\n");
+
+      const directory = await ctx.client.listDirectory(cwd, ".");
+      expect(
+        Object.fromEntries(directory.entries.map((entry) => [entry.path, entry.kind])),
+      ).toEqual({
+        [directoryName]: "directory",
+        [fileName]: "file",
+        ".notes.txt": "file",
+        "notes.txt": "file",
+      });
+      const children = await ctx.client.listDirectory(cwd, directoryName);
+      expect(children.entries.map((entry) => entry.path)).toEqual([`${directoryName}/inside.txt`]);
+      const file = await ctx.client.readFile(cwd, fileName);
+      expect(file.path).toBe(fileName);
+      expect(new TextDecoder().decode(file.bytes)).toBe("notes payload\n");
+      const nestedFile = await ctx.client.readFile(cwd, `${directoryName}/inside.txt`);
+      expect(nestedFile.path).toBe(`${directoryName}/inside.txt`);
+      expect(new TextDecoder().decode(nestedFile.bytes)).toBe("nested payload\n");
+
+      const dotfile = await ctx.client.readFile(cwd, ".notes.txt");
+      expect(new TextDecoder().decode(dotfile.bytes)).toBe("dotfile control\n");
+      const ordinaryFile = await ctx.client.readFile(cwd, "notes.txt");
+      expect(new TextDecoder().decode(ordinaryFile.bytes)).toBe("ordinary control\n");
+
+      const download = await ctx.client.requestDownloadToken(cwd, fileName);
+      expect(download.error).toBeNull();
+      expect(download.fileName).toBe(fileName);
+      const response = await fetch(
+        `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${download.token}`,
+      );
+      expect(response.status).toBe(200);
+      expect(await response.text()).toBe("notes payload\n");
+
+      const renamedFileName = `${prefix}renamed.txt`;
+      const renamed = await ctx.client.renameFileEntry({
+        cwd,
+        path: fileName,
+        name: renamedFileName,
+      });
+      expect(renamed).toMatchObject({ renamedPath: renamedFileName, success: true, error: null });
+      const renamedFile = await ctx.client.readFile(cwd, renamedFileName);
+      expect(new TextDecoder().decode(renamedFile.bytes)).toBe("notes payload\n");
+
+      const copiedDirectoryName = `${directoryName} copy`;
+      const duplicated = await ctx.client.duplicateFileEntry({ cwd, path: directoryName });
+      expect(duplicated).toMatchObject({
+        duplicatedPath: copiedDirectoryName,
+        success: true,
+        error: null,
+      });
+      const copiedFile = await ctx.client.readFile(cwd, `${copiedDirectoryName}/inside.txt`);
+      expect(new TextDecoder().decode(copiedFile.bytes)).toBe("nested payload\n");
+
+      const deletedDirectory = await ctx.client.deleteFileEntry({ cwd, path: directoryName });
+      expect(deletedDirectory).toMatchObject({ success: true, error: null });
+      const deletedFile = await ctx.client.deleteFileEntry({ cwd, path: renamedFileName });
+      expect(deletedFile).toMatchObject({ success: true, error: null });
+      const remaining = await ctx.client.listDirectory(cwd, ".");
+      expect(remaining.entries.map((entry) => entry.path).sort()).toEqual(
+        [".notes.txt", "notes.txt", copiedDirectoryName].sort(),
+      );
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("rejects parent traversal and absolute paths to a sibling workspace", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const outside = path.join(directory, "workspace-sibling");
+    try {
+      mkdirSync(cwd);
+      mkdirSync(outside);
+      writeFileSync(path.join(outside, "secret.txt"), "outside payload\n");
+      for (const requestedPath of ["..", "../workspace-sibling", outside]) {
+        await expect(ctx.client.listDirectory(cwd, requestedPath)).rejects.toThrow(
+          "Access outside of workspace is not allowed",
+        );
+      }
+      for (const requestedPath of [
+        "../workspace-sibling/secret.txt",
+        path.join(outside, "secret.txt"),
+      ]) {
+        await expect(ctx.client.readFile(cwd, requestedPath)).rejects.toThrow(
+          "Access outside of workspace is not allowed",
+        );
+        const download = await ctx.client.requestDownloadToken(cwd, requestedPath);
+        expect(download).toMatchObject({
+          token: null,
+          error: "Access outside of workspace is not allowed",
+        });
+        const deleted = await ctx.client.deleteFileEntry({ cwd, path: requestedPath });
+        expect(deleted).toMatchObject({
+          success: false,
+          error: "Access outside of workspace is not allowed",
+        });
+      }
+      expect(readdirSync(outside)).toEqual(["secret.txt"]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
+  test("accepts symlinks to double-dot names inside the workspace and rejects outside targets", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const outside = path.join(directory, "workspace-sibling");
+    try {
+      mkdirSync(path.join(cwd, "..drafts"), { recursive: true });
+      mkdirSync(outside);
+      writeFileSync(path.join(cwd, "..drafts", "notes.txt"), "inside payload\n");
+      writeFileSync(path.join(outside, "secret.txt"), "outside payload\n");
+      // Junctions also work on Windows without requiring symlink privileges.
+      symlinkSync(path.join(cwd, "..drafts"), path.join(cwd, "inside-link"), "junction");
+      symlinkSync(outside, path.join(cwd, "outside-link"), "junction");
+
+      const listing = await ctx.client.listDirectory(cwd, ".");
+      expect(listing.entries.map((entry) => entry.path).sort()).toEqual([
+        "..drafts",
+        "inside-link",
+      ]);
+      const file = await ctx.client.readFile(cwd, "inside-link/notes.txt");
+      expect(file.path).toBe("inside-link/notes.txt");
+      expect(new TextDecoder().decode(file.bytes)).toBe("inside payload\n");
+      await expect(ctx.client.readFile(cwd, "outside-link/secret.txt")).rejects.toThrow(
+        "Access outside of workspace is not allowed",
+      );
+      const download = await ctx.client.requestDownloadToken(cwd, "outside-link/secret.txt");
+      expect(download).toMatchObject({
+        token: null,
+        error: "Access outside of workspace is not allowed",
+      });
+      expect(readdirSync(outside)).toEqual(["secret.txt"]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
   test("lists directory contents", async () => {
     const cwd = tmpCwd();
 
diff --git a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
index 64ba85eb48..be225f171d 100644
--- a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
@@ -1,5 +1,14 @@
 import { test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, existsSync, rmSync, readFileSync, realpathSync } from "fs";
+import {
+  mkdtempSync,
+  writeFileSync,
+  existsSync,
+  rmSync,
+  readFileSync,
+  realpathSync,
+  mkdirSync,
+} from "fs";
+import { execFileSync } from "node:child_process";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -152,6 +161,78 @@ afterEach(async () => {
   await ctx.cleanup();
 }, 60000);
 
+interface GitCommandOptions {
+  cwd: string;
+  args: string[];
+}
+
+async function mergeFeatureIntoBaseWorktree(baseName: string): Promise<void> {
+  const directory = realpathSync(tmpCwd());
+  const base = path.join(directory, baseName);
+  const feature = path.join(directory, "feature");
+  function git({ cwd, args }: GitCommandOptions): string {
+    return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  }
+  try {
+    mkdirSync(base);
+    git({ cwd: base, args: ["init", "-b", "main"] });
+    git({ cwd: base, args: ["config", "user.name", "Paseo Test"] });
+    git({ cwd: base, args: ["config", "user.email", "test@paseo.local"] });
+    git({ cwd: base, args: ["config", "commit.gpgsign", "false"] });
+    git({ cwd: base, args: ["config", "core.autocrlf", "false"] });
+    git({ cwd: base, args: ["commit", "--allow-empty", "-m", "base"] });
+    git({ cwd: base, args: ["worktree", "add", "-b", "feature", feature] });
+    writeFileSync(path.join(feature, "feature.txt"), "feature payload\n");
+    git({ cwd: feature, args: ["add", "feature.txt"] });
+    git({ cwd: feature, args: ["commit", "-m", "feature"] });
+    const featureCommit = git({ cwd: feature, args: ["rev-parse", "HEAD"] }).trim();
+
+    const merged = await ctx.client.checkoutMerge(feature, { baseRef: "main" });
+    expect(merged).toMatchObject({ success: true, error: null });
+    expect(git({ cwd: base, args: ["rev-parse", "HEAD"] }).trim()).toBe(featureCommit);
+    expect(readFileSync(path.join(base, "feature.txt"), "utf8")).toBe("feature payload\n");
+    expect(git({ cwd: feature, args: ["symbolic-ref", "--short", "HEAD"] }).trim()).toBe("feature");
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+}
+
+test.skipIf(isPlatform("win32")).each(["base\ncheckout", "base "])(
+  "merges into a base worktree whose path preserves %j",
+  mergeFeatureIntoBaseWorktree,
+);
+
+test.each(["base checkout", "中文 checkout"])(
+  "merges into a base worktree named %j",
+  mergeFeatureIntoBaseWorktree,
+);
+
+test("merges into a local base branch without another worktree", async () => {
+  const cwd = realpathSync(tmpCwd());
+  function git(args: string[]): string {
+    return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  }
+  try {
+    git(["init", "-b", "main"]);
+    git(["config", "user.name", "Paseo Test"]);
+    git(["config", "user.email", "test@paseo.local"]);
+    git(["config", "commit.gpgsign", "false"]);
+    git(["commit", "--allow-empty", "-m", "base"]);
+    git(["checkout", "-b", "feature"]);
+    writeFileSync(path.join(cwd, "feature.txt"), "feature payload\n");
+    git(["add", "feature.txt"]);
+    git(["commit", "-m", "feature"]);
+    const featureCommit = git(["rev-parse", "HEAD"]).trim();
+
+    const merged = await ctx.client.checkoutMerge(cwd, { baseRef: "main" });
+    expect(merged).toMatchObject({ success: true, error: null });
+    expect(git(["rev-parse", "main"]).trim()).toBe(featureCommit);
+    expect(git(["symbolic-ref", "--short", "HEAD"]).trim()).toBe("feature");
+  } finally {
+    rmSync(cwd, { recursive: true, force: true });
+  }
+});
+
 test("returns diff for modified file in git repo", async () => {
   const cwd = tmpCwd();
 
diff --git a/packages/server/src/server/daemon-e2e/live-preferences.e2e.test.ts b/packages/server/src/server/daemon-e2e/live-preferences.e2e.test.ts
index 25c74c62a0..9eb1ff929a 100644
--- a/packages/server/src/server/daemon-e2e/live-preferences.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/live-preferences.e2e.test.ts
@@ -96,7 +96,7 @@ beforeEach(async () => {
   unsubscribe = ctx.client.subscribeRawMessages((message) => {
     messages.push(message);
   });
-  await ctx.client.fetchAgents({ subscribe: { subscriptionId: "live-preferences" } });
+  await ctx.client.fetchAgents({ subscribe: {} });
 });
 
 afterEach(async () => {
diff --git a/packages/server/src/server/daemon-e2e/mode-switch-propagation.e2e.test.ts b/packages/server/src/server/daemon-e2e/mode-switch-propagation.e2e.test.ts
index d1acba0e55..81d60901a7 100644
--- a/packages/server/src/server/daemon-e2e/mode-switch-propagation.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/mode-switch-propagation.e2e.test.ts
@@ -115,7 +115,7 @@ describe("mode-switch update propagation", () => {
     await client2.connect();
 
     const bootstrapResult = await client2.fetchAgents({
-      subscribe: { subscriptionId: "bootstrap-test" },
+      subscribe: {},
     });
 
     const found = bootstrapResult.entries.find((e) => e.agent.id === agent.id);
diff --git a/packages/server/src/server/daemon-e2e/model-resolution-on-init.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/model-resolution-on-init.real.e2e.test.ts
index 71e9f9ed73..52bee9f79f 100644
--- a/packages/server/src/server/daemon-e2e/model-resolution-on-init.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/model-resolution-on-init.real.e2e.test.ts
@@ -41,7 +41,7 @@ describe("daemon E2E (real claude) - model resolution on init", () => {
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "model-init-test" },
+        subscribe: {},
       });
 
       const modelsResult = await client.listProviderModels("claude", { cwd });
diff --git a/packages/server/src/server/daemon-e2e/model-runtime-reconcile-claude.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/model-runtime-reconcile-claude.real.e2e.test.ts
index 83fe12e1e3..fba40a681c 100644
--- a/packages/server/src/server/daemon-e2e/model-runtime-reconcile-claude.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/model-runtime-reconcile-claude.real.e2e.test.ts
@@ -37,7 +37,7 @@ describe("daemon E2E (real claude) - runtime model reconciliation", () => {
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "claude-runtime-model-reconcile" },
+        subscribe: {},
       });
 
       const modelsResult = await client.listProviderModels("claude", { cwd });
diff --git a/packages/server/src/server/daemon-e2e/models.e2e.test.ts b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
index 7691e63713..1f2086c879 100644
--- a/packages/server/src/server/daemon-e2e/models.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
@@ -1,4 +1,11 @@
 import { describe, test, expect } from "vitest";
+import { mkdtemp, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { findExecutable } from "../../executable-resolution/executable-resolution.js";
+import { BuiltinPluginLoader } from "../plugins/builtin/index.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
 import { execFileSync } from "node:child_process";
 import { createDaemonTestContext } from "../test-utils/index.js";
 
@@ -96,3 +103,65 @@ describe("daemon E2E", () => {
     );
   });
 });
+
+test("Antigravity creates an agent and answers a prompt with real agy", async ({ skip }) => {
+  const command = await findExecutable(process.env.AGY_COMMAND ?? "agy");
+  if (command === null) {
+    skip("agy is not resolvable");
+    return;
+  }
+  const cwd = await mkdtemp(path.join(os.tmpdir(), "paseo-antigravity-e2e-"));
+  const daemon = await createTestPaseoDaemon({
+    agentClients: {},
+    mcpEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(undefined, ["antigravity-provider"]),
+    providerOverrides: { antigravity: { command: [command], paseoTools: { enabled: false } } },
+  });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.10.0",
+  });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await expect
+      .poll(
+        async () => {
+          const snapshot = await client.getProvidersSnapshot({ cwd });
+          return snapshot.entries.find((entry) => entry.provider === "antigravity")?.status;
+        },
+        { timeout: 30000 },
+      )
+      .toBe("ready");
+    const agent = await client.createAgent({
+      provider: "antigravity",
+      cwd,
+      title: "Antigravity E2E",
+    });
+    expect(agent.currentModeId).toBe("full-access");
+    expect(agent.availableModes?.map((mode) => mode.id)).toEqual(["full-access"]);
+    const openedTimeline = await client.fetchAgentTimeline(agent.id, { limit: 100 });
+    expect(openedTimeline.entries.map((entry) => entry.item)).toEqual([
+      {
+        type: "notification",
+        level: "warning",
+        message:
+          "Antigravity is running with full access\nAntigravity's CLI cannot ask for permission when another app drives it, so Paseo starts it with --dangerously-skip-permissions. Every tool call, including shell commands, runs without asking.",
+      },
+    ]);
+    await client.sendMessage(agent.id, "Reply with exactly ANTIGRAVITY_E2E_OK. No tools.");
+    const result = await client.waitForFinish(agent.id, 90000);
+    expect(result.status).toBe("idle");
+    const timeline = await client.fetchAgentTimeline(agent.id, { limit: 100 });
+    expect(
+      timeline.entries.some(
+        (entry) =>
+          entry.item.type === "assistant_message" && entry.item.text.includes("ANTIGRAVITY_E2E_OK"),
+      ),
+    ).toBe(true);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(cwd, { recursive: true, force: true });
+  }
+}, 120000);
diff --git a/packages/server/src/server/daemon-e2e/muse.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/muse.real.e2e.test.ts
new file mode 100644
index 0000000000..f8355065f4
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/muse.real.e2e.test.ts
@@ -0,0 +1,95 @@
+import { execFileSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { expect, test } from "vitest";
+import { isCommandAvailable } from "../../executable-resolution/executable-resolution.js";
+import { loadPersistedConfig } from "../persisted-config.js";
+import { resolvePaseoHome } from "../paseo-home.js";
+import { BuiltinPluginLoader } from "../plugins/builtin/index.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+test("Muse registers without a client settings bundle", async () => {
+  const daemon = await createTestPaseoDaemon({
+    builtinPlugins: new BuiltinPluginLoader(undefined, ["muse-provider"]),
+  });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.10.0",
+  });
+  try {
+    await client.connect();
+    const muse = (await client.getPluginCatalog()).find((plugin) => plugin.id === "muse-provider");
+    expect(muse).toBeDefined();
+    expect(muse?.clientBundle).toBe("");
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+});
+
+test("Muse creates an agent, streams a text reply, and executes a real tool", async (context) => {
+  if (!(await isCommandAvailable("muse"))) {
+    context.skip();
+    return;
+  }
+  const cwd = await mkdtemp(path.join(os.tmpdir(), "paseo-muse-e2e-"));
+  await writeFile(path.join(cwd, "f"), "MUSE_TOOL_E2E_OK\n");
+  execFileSync("git", ["init", cwd], { stdio: "ignore" });
+  const configured = loadPersistedConfig(resolvePaseoHome()).agents?.providers?.muse;
+  const daemon = await createTestPaseoDaemon({
+    builtinPlugins: new BuiltinPluginLoader(undefined, ["muse-provider"]),
+    providerOverrides: { muse: { ...configured, enabled: true } },
+  });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.10.0",
+  });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({ provider: "muse", cwd, modeId: "allowAll" });
+    await client.sendMessage(agent.id, "Reply exactly MUSE_TEXT_E2E_OK. Do not use tools.");
+    expect((await client.waitForFinish(agent.id, 120000)).status).toBe("idle");
+    const reply = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "canonical",
+    });
+    expect(
+      reply.entries.some(
+        (entry) =>
+          entry.item.type === "assistant_message" && entry.item.text.includes("MUSE_TEXT_E2E_OK"),
+      ),
+    ).toBe(true);
+    await client.sendMessage(
+      agent.id,
+      "Read the file f with the read_file tool and report its contents.",
+    );
+    expect((await client.waitForFinish(agent.id, 120000)).status).toBe("idle");
+    const tools = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "canonical",
+    });
+    expect(
+      tools.entries.some(
+        (entry) =>
+          entry.item.type === "tool_call" &&
+          entry.item.name === "read_file" &&
+          entry.item.status === "completed",
+      ),
+    ).toBe(true);
+    expect(
+      tools.entries.some(
+        (entry) =>
+          entry.item.type === "assistant_message" && entry.item.text.includes("MUSE_TOOL_E2E_OK"),
+      ),
+    ).toBe(true);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(cwd, { recursive: true, force: true });
+  }
+}, 300000);
diff --git a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
index a0634e2bd7..7149b16864 100644
--- a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
@@ -1,6 +1,5 @@
 import { execFile } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import { mkdtempSync, rmSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
@@ -11,6 +10,7 @@ import { afterEach, beforeAll, describe, expect, test } from "vitest";
 import type { AgentTimelineItem } from "../agent/agent-sdk-types.js";
 import {
   MIN_SUPPORTED_OMP_VERSION,
+  OmpAgentClient,
   formatOmpVersionSupport,
 } from "../agent/providers/omp/agent.js";
 import { DaemonClient } from "../test-utils/daemon-client.js";
@@ -49,14 +49,53 @@ async function preflight(): Promise<void> {
   }
 }
 
-async function createHarness(): Promise<Harness> {
+// OMP exits at startup when no model is usable at all, so the home offers one offline
+// model, and an agent on any other provider's model has no credentials.
+function createOfflineOmpHome(): string {
+  const home = mkdtempSync(path.join(tmpdir(), "paseo-real-omp-offline-"));
+  roots.add(home);
+  const agentDir = path.join(home, ".omp", "agent");
+  mkdirSync(agentDir, { recursive: true });
+  writeFileSync(
+    path.join(agentDir, "models.yml"),
+    [
+      "providers:",
+      "  offline:",
+      "    baseUrl: http://127.0.0.1:9/v1",
+      "    api: openai-completions",
+      "    auth: none",
+      "    models:",
+      "      - id: offline-1",
+      "        name: Offline",
+      "        api: openai-completions",
+      "        reasoning: false",
+      "        input: [text]",
+      "        contextWindow: 128000",
+      "        maxTokens: 4096",
+      "        cost: {input: 0, output: 0, cacheRead: 0, cacheWrite: 0}",
+      "",
+    ].join("\n"),
+  );
+  return home;
+}
+
+async function createHarness(options: { ompHome?: string } = {}): Promise<Harness> {
   const cwd = mkdtempSync(path.join(tmpdir(), "paseo-real-omp-"));
   const paseoHomeRoot = mkdtempSync(path.join(tmpdir(), "paseo-real-omp-home-"));
   const staticDir = mkdtempSync(path.join(tmpdir(), "paseo-real-omp-static-"));
   for (const root of [cwd, paseoHomeRoot, staticDir]) roots.add(root);
   const logger = pino({ level: process.env.OMP_E2E_LOG_LEVEL ?? "silent" });
   const daemon = await createTestPaseoDaemon({
-    agentClients: createRealProviderClients(["omp"], logger),
+    agentClients: options.ompHome
+      ? {
+          omp: new OmpAgentClient({
+            logger,
+            runtimeSettings: {
+              env: { HOME: options.ompHome, ANTHROPIC_API_KEY: "", ANTHROPIC_OAUTH_TOKEN: "" },
+            },
+          }),
+        }
+      : createRealProviderClients(["omp"], logger),
     providerOverrides: { omp: { enabled: true } },
     logger,
     paseoHomeRoot,
@@ -69,7 +108,7 @@ async function createHarness(): Promise<Harness> {
   });
   await client.connect();
   await client.fetchAgents({
-    subscribe: { subscriptionId: `omp-real-${randomUUID()}` },
+    subscribe: {},
   });
   return { daemon, client, cwd, paseoHomeRoot, staticDir };
 }
@@ -92,6 +131,15 @@ async function timeline(client: DaemonClient, agentId: string): Promise<AgentTim
   return result.entries.map((entry) => entry.item);
 }
 
+function compactionFiller(): string {
+  const teas = ["assam", "darjeeling", "sencha", "oolong"];
+  return Array.from(
+    { length: 1200 },
+    (_, index) =>
+      `Record ${String(index).padStart(5, "0")}: tea=${teas[index % teas.length]} origin=region-${index % 37} notes=lorem ipsum dolor sit amet`,
+  ).join("\n");
+}
+
 function latestTools(items: AgentTimelineItem[]) {
   const latest = new Map<string, Extract<AgentTimelineItem, { type: "tool_call" }>>();
   for (const item of items) if (item.type === "tool_call") latest.set(item.callId, item);
@@ -187,6 +235,29 @@ afterEach(() => {
 });
 
 describe("daemon E2E (real OMP)", () => {
+  test(
+    "a prompt OMP rejects before its agent runs fails the turn with OMP's error",
+    async () => {
+      const harness = await createHarness({ ompHome: createOfflineOmpHome() });
+      try {
+        const agent = await harness.client.createAgent({
+          cwd: harness.cwd,
+          title: "no-credentials",
+          provider: "omp",
+          model: "anthropic/claude-haiku-4-5",
+          modeId: "full",
+        });
+        await harness.client.sendMessage(agent.id, "Reply with ok.");
+        const finish = await harness.client.waitForFinish(agent.id, 60_000);
+        expect(finish.status).toBe("error");
+        expect(finish.error).toContain("No API key found for anthropic");
+      } finally {
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
   test(
     "prompt, native tool, and resumed follow-up",
     async () => {
@@ -448,6 +519,56 @@ describe("daemon E2E (real OMP)", () => {
     TIMEOUT_MS,
   );
 
+  test(
+    "a compaction shows as a compaction row after a daemon restart",
+    async () => {
+      const harness = await createHarness();
+      let restarted: TestPaseoDaemon | null = null;
+      let restartedClient: DaemonClient | null = null;
+      try {
+        const agent = await createAgent(harness, "compact-restart");
+        await promptAndFinish(
+          harness,
+          agent.id,
+          `${compactionFiller()}\n\nReply exactly OMP_COMPACT_FIRST`,
+        );
+        await promptAndFinish(harness, agent.id, "Reply exactly OMP_COMPACT_SECOND");
+        await harness.client.sendMessage(agent.id, "/compact");
+        await harness.client.waitForFinish(agent.id, TIMEOUT_MS);
+        await promptAndFinish(harness, agent.id, "Reply exactly OMP_COMPACT_THIRD");
+
+        await harness.client.close();
+        await harness.daemon.close();
+        restarted = await createTestPaseoDaemon({
+          agentClients: createRealProviderClients(["omp"], pino({ level: "silent" })),
+          providerOverrides: { omp: { enabled: true } },
+          logger: pino({ level: "silent" }),
+          paseoHomeRoot: harness.paseoHomeRoot,
+          staticDir: harness.staticDir,
+          cleanup: false,
+        });
+        restartedClient = new DaemonClient({ url: `ws://127.0.0.1:${restarted.port}/ws` });
+        await restartedClient.connect();
+        await restartedClient.fetchAgents({ subscribe: {} });
+        const replayed = await timeline(restartedClient, agent.id);
+
+        expect(
+          latestTools(replayed)
+            .map(toolResult)
+            .filter((text) => text.includes("Unsupported history record")),
+        ).toEqual([]);
+        expect(replayed.filter((item) => item.type === "compaction")).toEqual([
+          expect.objectContaining({ type: "compaction", status: "completed" }),
+        ]);
+      } finally {
+        await restartedClient?.close().catch(() => undefined);
+        await restarted?.close().catch(() => undefined);
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
   test(
     "native branch rewinds conversation history and keeps the session usable",
     async () => {
diff --git a/packages/server/src/server/daemon-e2e/open-project-missing-directory.e2e.test.ts b/packages/server/src/server/daemon-e2e/open-project-missing-directory.e2e.test.ts
index ebd93a4ff5..8989f9ebac 100644
--- a/packages/server/src/server/daemon-e2e/open-project-missing-directory.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/open-project-missing-directory.e2e.test.ts
@@ -48,7 +48,7 @@ test("openProject on a nonexistent directory does not broadcast an upsert that i
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   cleanupClients.add(client);
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "missing-dir-agents" } });
+  await client.fetchAgents({ subscribe: {} });
 
   const workspaceEvents: Array<{ kind: "upsert" | "remove"; workspaceId: string }> = [];
   client.subscribe((event: DaemonEvent) => {
@@ -57,7 +57,7 @@ test("openProject on a nonexistent directory does not broadcast an upsert that i
     }
     workspaceEvents.push({ kind: event.payload.kind, workspaceId: event.workspaceId });
   });
-  await client.fetchWorkspaces({ subscribe: { subscriptionId: "missing-dir-workspaces" } });
+  await client.fetchWorkspaces({ subscribe: {} });
 
   const tempParent = await mkdtemp(path.join(os.tmpdir(), "paseo-open-project-"));
   cleanupPaths.add(tempParent);
@@ -77,8 +77,8 @@ test("openProject expands tilde before creating the workspace", async () => {
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   cleanupClients.add(client);
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "tilde-project-agents" } });
-  await client.fetchWorkspaces({ subscribe: { subscriptionId: "tilde-project-workspaces" } });
+  await client.fetchAgents({ subscribe: {} });
+  await client.fetchWorkspaces({ subscribe: {} });
 
   const home = process.env.HOME || os.homedir();
   const workspacePath = await mkdtemp(path.join(home, ".paseo-open-project-"));
diff --git a/packages/server/src/server/daemon-e2e/open-project-worktree-reclassification.e2e.test.ts b/packages/server/src/server/daemon-e2e/open-project-worktree-reclassification.e2e.test.ts
index ab49ecf9d3..e463d2936a 100644
--- a/packages/server/src/server/daemon-e2e/open-project-worktree-reclassification.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/open-project-worktree-reclassification.e2e.test.ts
@@ -106,7 +106,7 @@ test("openProject preserves a worktree's exact-root project without rehoming it"
     const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
     cleanupClients.add(client);
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "worktree-reclassification" } });
+    await client.fetchAgents({ subscribe: {} });
 
     const response = await client.openProject(worktreeRoot);
     const persistedProjects = await readRegistry<PersistedProjectRecord>(projectsPath);
diff --git a/packages/server/src/server/daemon-e2e/opencode-custom-agents.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-custom-agents.real.e2e.test.ts
index 048a8dd0c6..93e227ecdd 100644
--- a/packages/server/src/server/daemon-e2e/opencode-custom-agents.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-custom-agents.real.e2e.test.ts
@@ -23,7 +23,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-custom-agents" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-draft-features.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-draft-features.real.e2e.test.ts
index d66ca028eb..a06880d612 100644
--- a/packages/server/src/server/daemon-e2e/opencode-draft-features.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-draft-features.real.e2e.test.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from "node:crypto";
 import { mkdtempSync, realpathSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -30,7 +29,7 @@ async function withConnectedOpenCodeDaemon(
   try {
     await client.connect();
     await client.fetchAgents({
-      subscribe: { subscriptionId: `opencode-draft-features-${randomUUID()}` },
+      subscribe: {},
     });
     await run({ client });
   } finally {
diff --git a/packages/server/src/server/daemon-e2e/opencode-import-persistence.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-import-persistence.real.e2e.test.ts
index 3d1aec0a96..d518dac227 100644
--- a/packages/server/src/server/daemon-e2e/opencode-import-persistence.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-import-persistence.real.e2e.test.ts
@@ -36,7 +36,7 @@ async function withConnectedOpenCodeDaemon(
   try {
     await client.connect();
     await client.fetchAgents({
-      subscribe: { subscriptionId: `opencode-import-persistence-${randomUUID()}` },
+      subscribe: {},
     });
     await run({ client });
   } finally {
diff --git a/packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts
index 9fa2f13cf6..e03c66bca0 100644
--- a/packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts
@@ -29,7 +29,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-init-prompt" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-invalid-mode.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-invalid-mode.real.e2e.test.ts
index 8235937f64..0291c5e338 100644
--- a/packages/server/src/server/daemon-e2e/opencode-invalid-mode.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-invalid-mode.real.e2e.test.ts
@@ -23,7 +23,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-invalid-mode" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-invalid-model.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-invalid-model.real.e2e.test.ts
index 455d099088..8cdc409c7f 100644
--- a/packages/server/src/server/daemon-e2e/opencode-invalid-model.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-invalid-model.real.e2e.test.ts
@@ -23,7 +23,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-invalid-model" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-omo-real-runtime.ts b/packages/server/src/server/daemon-e2e/opencode-omo-real-runtime.ts
index 923431f9bf..70296864ed 100644
--- a/packages/server/src/server/daemon-e2e/opencode-omo-real-runtime.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-omo-real-runtime.ts
@@ -187,7 +187,7 @@ export async function createOpenCodeOmoRealRuntime(): Promise<OpenCodeOmoRealRun
     });
     client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "opencode-omo-real" } });
+    await client.fetchAgents({ subscribe: {} });
 
     return {
       client,
diff --git a/packages/server/src/server/daemon-e2e/opencode-plan-and-questions.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-plan-and-questions.real.e2e.test.ts
index a75d5207bf..46f64717fe 100644
--- a/packages/server/src/server/daemon-e2e/opencode-plan-and-questions.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-plan-and-questions.real.e2e.test.ts
@@ -23,7 +23,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-real" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-rewind.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-rewind.real.e2e.test.ts
index 81934b463b..b167ecb360 100644
--- a/packages/server/src/server/daemon-e2e/opencode-rewind.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-rewind.real.e2e.test.ts
@@ -234,7 +234,7 @@ describe("daemon E2E (real opencode) - rewind", () => {
     });
 
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "opencode-rewind-real" } });
+    await client.fetchAgents({ subscribe: {} });
     harness = { client, daemon };
   }, 30_000);
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts
index bdf5012f67..6fafc0f40c 100644
--- a/packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts
@@ -256,7 +256,7 @@ async function createHarness(): Promise<{
   });
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "opencode-send-interrupt-real" } });
+  await client.fetchAgents({ subscribe: {} });
   return { client, daemon };
 }
 
diff --git a/packages/server/src/server/daemon-e2e/opencode-slow-plugin-readiness.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/opencode-slow-plugin-readiness.real.e2e.test.ts
index 3645b018f1..ebb603e0ee 100644
--- a/packages/server/src/server/daemon-e2e/opencode-slow-plugin-readiness.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/opencode-slow-plugin-readiness.real.e2e.test.ts
@@ -66,7 +66,7 @@ describe("daemon E2E (real opencode) - slow plugin readiness", () => {
     });
     const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "opencode-slow-plugin" } });
+    await client.fetchAgents({ subscribe: {} });
 
     try {
       const agent = await client.createAgent({
diff --git a/packages/server/src/server/daemon-e2e/permissions-codex.e2e.test.ts b/packages/server/src/server/daemon-e2e/permissions-codex.e2e.test.ts
index a3a84a17ea..16ba0da1f5 100644
--- a/packages/server/src/server/daemon-e2e/permissions-codex.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/permissions-codex.e2e.test.ts
@@ -42,8 +42,9 @@ describe("permission flow: Codex", () => {
       thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
       cwd,
       title: "Codex Permission Test",
-      modeId: "read-only",
+      modeId: "always-ask",
     });
+    await ctx.client.subscribeAgentTimeline(agent.id, () => {}).ready;
 
     expect(agent.id).toBeTruthy();
     expect(agent.status).toBe("idle");
@@ -81,17 +82,18 @@ describe("permission flow: Codex", () => {
 
     // Verify permission_resolved event was received
     const queue = messages;
-    const hasPermissionResolved = queue.some((m) => {
-      if (m.type === "agent_stream" && m.payload.agentId === agent.id) {
-        return (
-          m.payload.event.type === "permission_resolved" &&
-          m.payload.event.requestId === permission.id &&
-          m.payload.event.resolution.behavior === "allow"
-        );
-      }
-      return false;
-    });
-    expect(hasPermissionResolved).toBe(true);
+    const hasPermissionResolved = () =>
+      queue.some((m) => {
+        if (m.type === "agent_stream" && m.payload.agentId === agent.id) {
+          return (
+            m.payload.event.type === "permission_resolved" &&
+            m.payload.event.requestId === permission.id &&
+            m.payload.event.resolution.behavior === "allow"
+          );
+        }
+        return false;
+      });
+    await expect.poll(hasPermissionResolved).toBe(true);
 
     rmSync(cwd, { recursive: true, force: true });
   }, 30_000);
@@ -107,8 +109,9 @@ describe("permission flow: Codex", () => {
       thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
       cwd,
       title: "Codex Permission Deny Test",
-      modeId: "read-only",
+      modeId: "always-ask",
     });
+    await ctx.client.subscribeAgentTimeline(agent.id, () => {}).ready;
 
     expect(agent.id).toBeTruthy();
 
@@ -145,17 +148,18 @@ describe("permission flow: Codex", () => {
 
     // Verify permission_resolved event was received with deny
     const queue = messages;
-    const hasPermissionDenied = queue.some((m) => {
-      if (m.type === "agent_stream" && m.payload.agentId === agent.id) {
-        return (
-          m.payload.event.type === "permission_resolved" &&
-          m.payload.event.requestId === permission.id &&
-          m.payload.event.resolution.behavior === "deny"
-        );
-      }
-      return false;
-    });
-    expect(hasPermissionDenied).toBe(true);
+    const hasPermissionDenied = () =>
+      queue.some((m) => {
+        if (m.type === "agent_stream" && m.payload.agentId === agent.id) {
+          return (
+            m.payload.event.type === "permission_resolved" &&
+            m.payload.event.requestId === permission.id &&
+            m.payload.event.resolution.behavior === "deny"
+          );
+        }
+        return false;
+      });
+    await expect.poll(hasPermissionDenied).toBe(true);
 
     rmSync(cwd, { recursive: true, force: true });
   }, 30_000);
@@ -172,6 +176,7 @@ describe("permission flow: Codex", () => {
       title: "Codex Interrupt Test",
       modeId: "full-access",
     });
+    await ctx.client.subscribeAgentTimeline(agent.id, () => {}).ready;
 
     expect(agent.id).toBeTruthy();
     expect(agent.currentModeId).toBe("full-access");
diff --git a/packages/server/src/server/daemon-e2e/persistence.e2e.test.ts b/packages/server/src/server/daemon-e2e/persistence.e2e.test.ts
index 9e9e185895..78161f842a 100644
--- a/packages/server/src/server/daemon-e2e/persistence.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/persistence.e2e.test.ts
@@ -61,6 +61,7 @@ describe("daemon E2E - persistence", () => {
       const resumed = await ctx.client.resumeAgent(handle);
       expect(resumed.provider).toBe("codex");
       expect(resumed.cwd).toBe(cwd);
+      await ctx.client.subscribeAgentTimeline(resumed.id, () => {}).ready;
 
       messages.length = 0;
       await ctx.client.sendMessage(resumed.id, "What did I ask you to say earlier?");
diff --git a/packages/server/src/server/daemon-e2e/pi-rewind.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/pi-rewind.real.e2e.test.ts
index e013328a12..d198be9e09 100644
--- a/packages/server/src/server/daemon-e2e/pi-rewind.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/pi-rewind.real.e2e.test.ts
@@ -1,4 +1,7 @@
+import { mkdtempSync, rmSync } from "node:fs";
 import { readdir } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import pino from "pino";
 import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
@@ -63,14 +66,31 @@ function expectPiSessionId(value: string): void {
   expect(value.length).toBeGreaterThan(0);
 }
 
-function piPrompt(input: { promptToken: string; doneToken: string }): string {
+interface PiTurn {
+  promptToken: string;
+  doneToken: string;
+  filler?: string;
+}
+
+function piPrompt(input: PiTurn): string {
   return [
     `PASEO_PI_REWIND_PROMPT_${input.promptToken}.`,
     "Remember this marker for the conversation.",
+    ...(input.filler ? [`Ignore this filler: ${input.filler}`] : []),
     `Reply exactly: ${input.doneToken}`,
   ].join(" ");
 }
 
+function turn(token: string): PiTurn {
+  return { promptToken: token, doneToken: `PI_${token}_DONE` };
+}
+
+// Pi keeps the most recent 20k estimated tokens (4 characters each) when it compacts.
+// A turn larger than that makes /compact summarize every turn before it.
+function turnOutlastingCompaction(token: string): PiTurn {
+  return { ...turn(token), filler: "lorem ipsum ".repeat(8_000) };
+}
+
 function roleItems(items: AgentTimelineItem[], role: "user_message" | "assistant_message") {
   return items.filter((item) => item.type === role);
 }
@@ -91,10 +111,29 @@ async function expectNoCreatedFiles(session: PiRewindSession): Promise<void> {
   await expect(readdir(session.cwd)).resolves.toEqual([]);
 }
 
+async function compactPi(harness: PiRewindHarness, session: PiRewindSession): Promise<void> {
+  await harness.client.sendMessage(session.agentId, "/compact");
+  const deadline = Date.now() + TURN_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    const items = await fetchTimelineItems(harness.client, session.agentId);
+    const failure = items.find(
+      (item) => item.type === "assistant_message" && item.text.includes("Failed to compact"),
+    );
+    if (failure) {
+      throw new Error(`Pi compaction failed: ${JSON.stringify(failure)}`);
+    }
+    if (items.some((item) => item.type === "compaction" && item.status === "completed")) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error("Pi compaction did not complete");
+}
+
 async function askPi(
   harness: PiRewindHarness,
   session: PiRewindSession,
-  input: { promptToken: string; doneToken: string },
+  input: PiTurn,
 ): Promise<void> {
   await harness.client.sendMessage(session.agentId, piPrompt(input));
   const finish = await harness.client.waitForFinish(session.agentId, TURN_TIMEOUT_MS);
@@ -122,7 +161,7 @@ describe("daemon E2E (real pi) - rewind", () => {
     });
 
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "pi-rewind-real" } });
+    await client.fetchAgents({ subscribe: {} });
     harness = { client, daemon };
   }, 30_000);
 
@@ -204,4 +243,126 @@ describe("daemon E2E (real pi) - rewind", () => {
       await closePiRewindSession(session);
     }
   }, 420_000);
+
+  test("rewinds a replayed row to the selected message after an earlier rewind branched the session", async () => {
+    const session = await launchPiRewindSession(harness, "pi-rewind-branched-replay-real");
+
+    try {
+      await askPi(harness, session, turn("ONE"));
+      await askPi(harness, session, turn("ABANDONED"));
+      const abandonedId = userMessageIdForToken(
+        await fetchTimelineItems(harness.client, session.agentId),
+        "PI_REWIND_PROMPT_ABANDONED",
+      );
+      await harness.client.rewindAgent(session.agentId, abandonedId, "conversation");
+
+      await askPi(harness, session, turn("TWO"));
+      await askPi(harness, session, turn("THREE"));
+      await askPi(harness, session, turn("FOUR"));
+      const fourId = userMessageIdForToken(
+        await fetchTimelineItems(harness.client, session.agentId),
+        "PI_REWIND_PROMPT_FOUR",
+      );
+      await harness.client.rewindAgent(session.agentId, fourId, "conversation");
+
+      const replayedTimeline = await fetchTimelineItems(harness.client, session.agentId);
+      expectTimeline(replayedTimeline, {
+        userTexts: [piPrompt(turn("ONE")), piPrompt(turn("TWO")), piPrompt(turn("THREE"))],
+        assistantCount: 3,
+      });
+      const replayedThreeId = userMessageIdForToken(replayedTimeline, "PI_REWIND_PROMPT_THREE");
+      await harness.client.rewindAgent(session.agentId, replayedThreeId, "conversation");
+
+      expectTimeline(await fetchTimelineItems(harness.client, session.agentId), {
+        userTexts: [piPrompt(turn("ONE")), piPrompt(turn("TWO"))],
+        assistantCount: 2,
+      });
+      await expectNoCreatedFiles(session);
+    } finally {
+      await closePiRewindSession(session);
+    }
+  }, 900_000);
+
+  test("rewinds a row whose entry an earlier compaction summarized away", async () => {
+    const session = await launchPiRewindSession(harness, "pi-rewind-compacted-real");
+
+    try {
+      await askPi(harness, session, turn("ONE"));
+      await askPi(harness, session, turn("TWO"));
+      await askPi(harness, session, turnOutlastingCompaction("THREE"));
+      const twoId = userMessageIdForToken(
+        await fetchTimelineItems(harness.client, session.agentId),
+        "PI_REWIND_PROMPT_TWO",
+      );
+      await compactPi(harness, session);
+
+      await harness.client.rewindAgent(session.agentId, twoId, "conversation");
+
+      expectTimeline(await fetchTimelineItems(harness.client, session.agentId), {
+        userTexts: [piPrompt(turn("ONE"))],
+        assistantCount: 1,
+      });
+      await expectNoCreatedFiles(session);
+    } finally {
+      await closePiRewindSession(session);
+    }
+  }, 900_000);
+
+  test("keeps a rewind after the daemon restarts", async () => {
+    const cwd = tmpRewindCwd("daemon-real-pi-rewind-");
+    const paseoHomeRoot = mkdtempSync(path.join(tmpdir(), "daemon-real-pi-rewind-home-"));
+    const logger = pino({ level: "silent" });
+    const startDaemon = async (): Promise<PiRewindHarness> => {
+      const daemon = await createTestPaseoDaemon({
+        agentClients: createRealProviderClients(["pi"], logger),
+        logger,
+        paseoHomeRoot,
+        cleanup: false,
+      });
+      const client = new DaemonClient({
+        url: `ws://127.0.0.1:${daemon.port}/ws`,
+      });
+      await client.connect();
+      await client.fetchAgents({ subscribe: {} });
+      return { client, daemon };
+    };
+    const stopDaemon = async (restarted: PiRewindHarness): Promise<void> => {
+      await restarted.client.close().catch(() => undefined);
+      await restarted.daemon.close().catch(() => undefined);
+    };
+    let current = await startDaemon();
+
+    try {
+      const agent = await current.client.createAgent({
+        cwd,
+        title: "pi-rewind-restart-real",
+        provider: "pi",
+        model: PI_REAL_TEST_MODEL,
+        thinkingOptionId: "medium",
+      });
+      const session = { agentId: agent.id, cwd };
+      for (const token of ["ONE", "TWO", "THREE", "FOUR"]) {
+        await askPi(current, session, turn(token));
+      }
+      const threeId = userMessageIdForToken(
+        await fetchTimelineItems(current.client, agent.id),
+        "PI_REWIND_PROMPT_THREE",
+      );
+      await current.client.rewindAgent(agent.id, threeId, "conversation");
+      const rewound = {
+        userTexts: [piPrompt(turn("ONE")), piPrompt(turn("TWO"))],
+        assistantCount: 2,
+      };
+      expectTimeline(await fetchTimelineItems(current.client, agent.id), rewound);
+
+      await stopDaemon(current);
+      current = await startDaemon();
+
+      expectTimeline(await fetchTimelineItems(current.client, agent.id), rewound);
+    } finally {
+      await stopDaemon(current);
+      rmSync(paseoHomeRoot, { recursive: true, force: true });
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  }, 900_000);
 });
diff --git a/packages/server/src/server/daemon-e2e/pi.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/pi.real.e2e.test.ts
index 5a0510c1ea..984aa2fdcc 100644
--- a/packages/server/src/server/daemon-e2e/pi.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/pi.real.e2e.test.ts
@@ -1,7 +1,6 @@
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { randomUUID } from "node:crypto";
 import { beforeAll, beforeEach, expect, test } from "vitest";
 import pino from "pino";
 
@@ -118,7 +117,7 @@ async function withConnectedPiDaemon(
   try {
     await client.connect();
     await client.fetchAgents({
-      subscribe: { subscriptionId: `pi-real-${randomUUID()}` },
+      subscribe: {},
     });
     await run({ client, daemon });
   } finally {
diff --git a/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts b/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
index e7843f78ae..a4db7ce7bf 100644
--- a/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
@@ -62,7 +62,7 @@ test("an empty project becomes Git without changing its identity or creating a w
   const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
   cleanupClients.add(client);
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "project-becomes-git" } });
+  await client.fetchAgents({ subscribe: {} });
 
   const added = await client.addProject(projectRoot);
 
diff --git a/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts b/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts
new file mode 100644
index 0000000000..89385c67db
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts
@@ -0,0 +1,73 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, realpathSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { beforeEach, expect, onTestFinished, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+// Windows does not preserve trailing spaces in folder names.
+const testOnPosix = test.skipIf(process.platform === "win32");
+
+let client: DaemonClient;
+let repoDir: string;
+let projectId: string;
+
+beforeEach(async () => {
+  const root = realpathSync(mkdtempSync(join(tmpdir(), "paseo-project-path-spaces-")));
+  onTestFinished(() => rmSync(root, { recursive: true, force: true }));
+  repoDir = join(root, "repo ");
+  execFileSync("git", ["init", "-b", "main", repoDir], { stdio: "pipe" });
+  execFileSync(
+    "git",
+    [
+      "-c",
+      "user.name=Paseo Test",
+      "-c",
+      "user.email=test@getpaseo.local",
+      "-c",
+      "commit.gpgsign=false",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "initial",
+    ],
+    { cwd: repoDir, stdio: "pipe" },
+  );
+  const daemon = await createTestPaseoDaemon();
+  onTestFinished(() => daemon.close());
+  client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const testClient = client;
+  onTestFinished(() => testClient.close());
+  await client.connect();
+  const added = await client.addProject(repoDir);
+  expect(added.error).toBeNull();
+  expect(added.project?.projectRootPath).toBe(repoDir);
+  projectId = added.project!.projectId;
+});
+
+testOnPosix("a project folder ending in a space keeps its Git status", async () => {
+  const opened = await client.createWorkspace({
+    source: { kind: "directory", path: repoDir, projectId },
+  });
+  expect(opened.error).toBeNull();
+  expect(opened.workspace?.workspaceDirectory).toBe(repoDir);
+  const status = await client.getCheckoutStatus(repoDir);
+  expect(status.isGit).toBe(true);
+  expect(status.repoRoot).toBe(repoDir);
+  expect(status.currentBranch).toBe("main");
+});
+
+testOnPosix("a project folder ending in a space can create a worktree", async () => {
+  const created = await client.createWorkspace({
+    source: {
+      kind: "worktree",
+      projectId,
+      action: "branch-off",
+      branchName: "feature/spaces",
+      baseBranch: "main",
+    },
+  });
+  expect(created.error).toBeNull();
+  expect(created.workspace?.gitRuntime?.currentBranch).toBe("feature/spaces");
+});
diff --git a/packages/server/src/server/daemon-e2e/rewind-user-message-dedupe-claude.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/rewind-user-message-dedupe-claude.real.e2e.test.ts
index aaea430b7f..bafb61e2b4 100644
--- a/packages/server/src/server/daemon-e2e/rewind-user-message-dedupe-claude.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/rewind-user-message-dedupe-claude.real.e2e.test.ts
@@ -41,7 +41,7 @@ describe("daemon E2E (real claude) - rewind user message dedupe", () => {
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: "rewind-user-message-dedupe" },
+        subscribe: {},
       });
 
       const agent = await client.createAgent({
diff --git a/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
index 6638c425a0..5eea6dab24 100644
--- a/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
@@ -304,6 +304,166 @@ async function waitForRunningClaudeSleep(
   );
 }
 
+// Explicit point-in-time polls of agent status, on top of (not instead of) the pushed
+// agent_update events the collector already records. A phantom "running" flip that starts and
+// ends between two polls would still be caught by the pushed-event scan the callers pair this
+// with; polling here additionally proves the daemon answers fetchAgent with "idle" throughout,
+// not just that it eventually pushes one.
+async function sampleAgentStatuses(
+  client: DaemonClient,
+  agentId: string,
+  samples: number,
+  intervalMs: number,
+): Promise<string[]> {
+  const statuses: string[] = [];
+  for (let i = 0; i < samples; i += 1) {
+    const snapshot = await client.fetchAgent({ agentId });
+    statuses.push(snapshot?.agent.status ?? "missing");
+    if (i < samples - 1) {
+      await sleep(intervalMs);
+    }
+  }
+  return statuses;
+}
+
+// NOTE: agent_stream events on the wire (AgentStreamEventPayloadSchema in
+// packages/protocol/src/messages.ts) do not include a "provider_subagent" variant. A backgrounded
+// subagent's descriptor updates are forwarded exclusively as separate "agent.provider_subagents.update"
+// messages (see forwardProviderSubagentUpdate in session.ts), and that push channel's delivery is
+// gated by capabilities this test's plain DaemonClient does not declare. list_provider_subagents is a
+// plain request/response RPC unaffected by that gating, so status history below polls it directly
+// instead of trying to reconstruct status transitions from the stream.
+type ProviderSubagentDescriptor = Awaited<
+  ReturnType<DaemonClient["listProviderSubagents"]>
+>["subagents"][number];
+
+interface ProviderSubagentPoll {
+  subagent: ProviderSubagentDescriptor;
+  // Every status observed while polling, in order, so a transient cancel cannot hide behind a
+  // later "completed" read even though the store's status field is not expected to un-cancel.
+  history: string[];
+}
+
+// Polls agent.provider_subagents.list until the backgrounded helper is registered at all.
+// "Main's turn is running" (waitForAgentUpsert) fires on generic turn-start bookkeeping, which
+// can be true before Claude has actually issued the Agent tool call; canceling that early
+// cancels a turn with no helper launched yet, which is not what "Stop spares a helper" means to
+// test. This confirms the helper actually exists before the caller acts on it.
+async function waitForProviderSubagentToExist(
+  client: DaemonClient,
+  agentId: string,
+  timeoutMs = 60_000,
+): Promise<ProviderSubagentDescriptor> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const { subagents } = await client.listProviderSubagents(agentId);
+    if (subagents[0]) {
+      return subagents[0];
+    }
+    await sleep(300);
+  }
+  throw new Error(
+    `Timed out waiting for a background helper to be registered for agent ${agentId}`,
+  );
+}
+
+// Claude starts the wake-up turn a moment after the helper's completion lands (0.1 to 5 s in
+// recorded traces), so poll for it instead of checking the instant the helper reads completed.
+// The daemon announces an autonomous turn to subscribers as a pushed "running" agent_update,
+// not as an agent_stream turn_started (that stream reaches the client that started a run).
+async function waitForWakeTurn(
+  collector: ReturnType<typeof createMessageCollector>,
+  agentId: string,
+  fromIndex: number,
+  timeoutMs = 30_000,
+): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const window = collector.messages.slice(fromIndex);
+    const woke =
+      getAgentStatuses(window, agentId).includes("running") ||
+      window.some(
+        (message) =>
+          message.type === "agent_stream" &&
+          message.payload.agentId === agentId &&
+          message.payload.event.type === "turn_started",
+      );
+    if (woke) return true;
+    await sleep(500);
+  }
+  return false;
+}
+
+// The wake-up turn runs briefly after it opens, so the final state is read once it settles.
+async function waitForAgentStatus(
+  client: DaemonClient,
+  agentId: string,
+  status: string,
+  timeoutMs = 60_000,
+): Promise<string | undefined> {
+  const deadline = Date.now() + timeoutMs;
+  let last: string | undefined;
+  while (Date.now() < deadline) {
+    last = (await client.fetchAgent({ agentId }))?.agent.status;
+    if (last === status) return last;
+    await sleep(500);
+  }
+  return last;
+}
+
+// Polls agent.provider_subagents.list until the single backgrounded helper leaves "running".
+// Scenarios in this file always launch exactly one background helper, so subagents[0] is it.
+async function waitForProviderSubagentTerminal(
+  client: DaemonClient,
+  agentId: string,
+  timeoutMs = 90_000,
+): Promise<ProviderSubagentPoll> {
+  const deadline = Date.now() + timeoutMs;
+  const history: string[] = [];
+  let lastSeen: ProviderSubagentDescriptor[] = [];
+  while (Date.now() < deadline) {
+    const { subagents } = await client.listProviderSubagents(agentId);
+    lastSeen = subagents;
+    const subagent = subagents[0];
+    if (subagent) {
+      history.push(subagent.status);
+      if (subagent.status !== "running") {
+        return { subagent, history };
+      }
+    }
+    await sleep(1_000);
+  }
+  throw new Error(
+    `Timed out waiting for the background helper to leave "running". history=${JSON.stringify(history)} lastSeen=${JSON.stringify(lastSeen)}`,
+  );
+}
+
+// Pulls the main agent's own assistant text via fetchAgentTimeline rather than the push
+// collector. Assistant text delivery is paced (docs/agent-stream-performance.md), so checking
+// the collector immediately after waitForFinish resolves can still miss the final text; the
+// timeline fetch is authoritative and matches what the pre-existing tests in this file do.
+async function fetchAssistantTexts(
+  client: DaemonClient,
+  agentId: string,
+  limit = 100,
+): Promise<string[]> {
+  const timeline = await client.fetchAgentTimeline(agentId, { limit });
+  return timeline.entries
+    .filter((entry) => entry.item.type === "assistant_message")
+    .map((entry) => (entry.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text);
+}
+
+async function fetchSubagentAssistantTexts(
+  client: DaemonClient,
+  agentId: string,
+  subagentId: string,
+): Promise<string[]> {
+  const timeline = await client.fetchProviderSubagentTimeline(agentId, subagentId, { limit: 50 });
+  return timeline.rows
+    .filter((row) => row.item.type === "assistant_message")
+    .map((row) => (row.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text);
+}
+
 describe("daemon E2E (real claude) - send message during tool call", () => {
   let canRun = false;
   interface SteeringResources {
@@ -345,7 +505,7 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
       await within(
         "subscribe Claude steering test client",
         15_000,
-        client.fetchAgents({ subscribe: { subscriptionId: "steer" } }),
+        client.fetchAgents({ subscribe: {} }),
       );
       const agent = await within(
         "create Claude steering test agent",
@@ -504,6 +664,141 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
     }
   }, 210_000);
 
+  test("a background subagent keeps running after a message is sent while it works", async () => {
+    // The scenario the rest of this file explicitly rules out: every other test here tells Claude
+    // "Do not use a background task", so steering during a backgrounded subagent was never
+    // covered. A subagent streams on the parent's channel, so a parent that mistakes the child's
+    // frames for its own work reports "running" after it has already finished, and the message
+    // sent into that window is refused, or delivered by cancelling the turn and taking the
+    // subagent with it. Both outcomes are user-visible, and both are what this asserts against.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("Claude background-subagent test client was not created");
+      await within("connect background-subagent test client", 15_000, client.connect());
+      await within(
+        "subscribe background-subagent test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create background-subagent test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-background-survives-send",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+      await within(
+        "launch one background subagent and end the turn",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor".`,
+            `prompt: "Use the Bash tool with run_in_background: true to run exactly: sleep 40.`,
+            `Wait for its completion notification, then reply exactly: CHILD_DONE."`,
+            "Immediately after launching it, reply with the single word LAUNCHED and end your turn.",
+            "Do not wait for it. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // The main session has ended its turn. It must read as idle even though the subagent it
+      // launched is still streaming on the shared channel.
+      const afterLaunch = await within(
+        "wait for the main session to go idle after launching the subagent",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(
+        afterLaunch.status,
+        "a main session that finished its turn must not report busy because a subagent is running",
+      ).not.toBe("running");
+
+      // And a message sent in that window must be accepted rather than refused.
+      const followUpId = generateClientMessageId();
+      await within(
+        "send a message to the idle main session while the subagent runs",
+        30_000,
+        client.sendAgentMessage(agent.id, "Are you there? Reply exactly: MAIN_ALIVE.", {
+          messageId: followUpId,
+        }),
+      );
+      await within(
+        "wait for the main session to answer",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+
+      const timeline = await within(
+        "fetch background-subagent timeline",
+        15_000,
+        client.fetchAgentTimeline(agent.id, { limit: 200 }),
+      );
+      const assistantText = timeline.entries
+        .filter((entry) => entry.item.type === "assistant_message")
+        .map(
+          (entry) => (entry.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text,
+        )
+        .join("\\n");
+      expect(
+        assistantText,
+        "the main session must be reachable while its background subagent still runs",
+      ).toContain("MAIN_ALIVE");
+
+      // The subagent must have survived the send rather than being cancelled with the turn. Its
+      // status is read from agent.provider_subagents.list (see the note above
+      // waitForProviderSubagentToExist): agent_stream carries no provider_subagent events.
+      const { subagents } = await within(
+        "list provider subagents after the send",
+        15_000,
+        client.listProviderSubagents(agent.id),
+      );
+      expect(subagents.length, "the background subagent must be tracked").toBeGreaterThan(0);
+      expect(
+        subagents.map((subagent) => subagent.status),
+        "a backgrounded subagent must not be canceled by a message sent to the main session",
+      ).not.toContain("canceled");
+      const { subagent, history } = await within(
+        "wait for the background subagent to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(history, "no status poll may read canceled").not.toContain("canceled");
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "Claude background-subagent E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
   test("Stop cancels a queued Claude steer before it can resume the interrupted turn", async () => {
     const logger = pino({ level: "silent" });
     const cwd = tmpCwd();
@@ -518,7 +813,7 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
       await within(
         "subscribe queued-steer Stop client",
         15_000,
-        client.fetchAgents({ subscribe: { subscriptionId: "queued-steer-stop" } }),
+        client.fetchAgents({ subscribe: {} }),
       );
       const agent = await within(
         "create queued-steer Stop agent",
@@ -587,7 +882,7 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
@@ -678,4 +973,430 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
       rmSync(cwd, { recursive: true, force: true });
     }
   }, 300_000);
+
+  test("a helper's own nested background job does not phantom-run the parent or kill the helper", async () => {
+    // The exact reported bug: main backgrounds a helper, the helper itself starts its OWN
+    // background job (a grandchild from main's perspective) and then keeps working in the
+    // foreground. The grandchild's completion is bookkeeping that belongs to the helper, not to
+    // main, and must not make main phantom-report "running" or get treated as busy.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("nested background-job test client was not created");
+      await within("connect nested background-job test client", 15_000, client.connect());
+      await within(
+        "subscribe nested background-job test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create nested background-job test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-nested-background-job",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch a helper with its own nested background job and end the turn",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "nested bg survivor".`,
+            `prompt: "Use the Bash tool with run_in_background: true to run exactly:`,
+            `python3 -c 'import time; time.sleep(5)'.`,
+            `Immediately after starting it, without waiting for it, use the Bash tool again`,
+            `in the foreground to run exactly: python3 -c 'import time; time.sleep(50)'.`,
+            `After that foreground command finishes, reply exactly: CHILD_DONE."`,
+            "Immediately after launching it, reply with the single word LAUNCHED and end your turn.",
+            "Do not wait for it. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      const afterLaunch = await within(
+        "wait for the main session to go idle after launching the nested-background helper",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(afterLaunch.status, "the main session must be idle once it replied LAUNCHED").toBe(
+        "idle",
+      );
+
+      // The helper's own nested background job (5s) finishes while the helper is still busy
+      // in its unrelated foreground sleep (50s). Sample for 30s, well past the nested job's
+      // completion even when the helper is slow to start it,
+      // both by polling and by scanning every pushed agent_update in the window, so a brief
+      // phantom flip cannot slip between polls.
+      const sampleWindowStart = resources.collector.messages.length;
+      const polledStatuses = await sampleAgentStatuses(client, agent.id, 11, 3_000);
+      const pushedStatuses = getAgentStatuses(
+        resources.collector.messages.slice(sampleWindowStart),
+        agent.id,
+      );
+      const observedRunning = [...polledStatuses, ...pushedStatuses].filter(
+        (status) => status === "running",
+      );
+      expect(
+        observedRunning,
+        `the parent must stay idle across the nested job's completion; polled=${JSON.stringify(polledStatuses)} pushed=${JSON.stringify(pushedStatuses)}`,
+      ).toEqual([]);
+
+      // A message sent in that window must still be answered normally.
+      await within(
+        "send PONG request while the nested job settles",
+        30_000,
+        client.sendMessage(agent.id, "Reply with exactly PONG.", {
+          messageId: generateClientMessageId(),
+        }),
+      );
+      await within("wait for the PONG reply", 60_000, client.waitForFinish(agent.id, 50_000));
+      // Pulled via fetchAgentTimeline, not the push collector: assistant text delivery is paced
+      // (docs/agent-stream-performance.md) and can trail waitForFinish's own completion signal,
+      // so the collector can still be missing the final text the instant waitForFinish resolves.
+      const pongTexts = await within(
+        "fetch timeline for the PONG reply",
+        15_000,
+        fetchAssistantTexts(client, agent.id, 20),
+      );
+      expect(
+        pongTexts.join("\n"),
+        "the agent must answer PONG while the helper is still running",
+      ).toContain("PONG");
+
+      const messagesBeforeWake = resources.collector.messages.length;
+
+      // The helper itself must survive: never recorded canceled, and it eventually reports
+      // CHILD_DONE from its own foreground sleep finishing.
+      const { subagent, history } = await within(
+        "wait for the nested-background helper to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+
+      // The helper's completion should wake the main session with a fresh turn (the
+      // session-state-driven autonomous turn), separate from the PONG exchange above.
+      const wokeMainAgent = await waitForWakeTurn(
+        resources.collector,
+        agent.id,
+        messagesBeforeWake,
+      );
+      if (!wokeMainAgent) {
+        const wakeWindowMessages = resources.collector.messages.slice(messagesBeforeWake);
+        const wakeWindowEventTypes = wakeWindowMessages
+          .filter(
+            (message) => message.type === "agent_stream" && message.payload.agentId === agent.id,
+          )
+          .map((message) =>
+            message.type === "agent_stream" ? message.payload.event.type : "unknown",
+          );
+        const timeline = await client
+          .fetchAgentTimeline(agent.id, { limit: 100 })
+          .catch(() => null);
+        throw new Error(
+          `the helper's completion must wake the main session with a new turn. ` +
+            `wakeWindowEventTypes=${JSON.stringify(wakeWindowEventTypes)} ` +
+            `recentTimeline=${JSON.stringify(timeline ? summarizeTimelineItems(timeline) : null)}`,
+        );
+      }
+
+      expect(await waitForAgentStatus(client, agent.id, "idle"), "the agent must end idle").toBe(
+        "idle",
+      );
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "nested background-job E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
+  test("the app's default steer survives a backgrounded helper while the main session works", async () => {
+    // appSettings.sendBehavior defaults to "steer" (packages/app/src/hooks/use-settings/storage.ts),
+    // so this is what the app actually sends when a user replies while an agent looks busy.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("default-steer background-helper test client was not created");
+      await within("connect default-steer test client", 15_000, client.connect());
+      await within(
+        "subscribe default-steer test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create default-steer test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-default-steer-background-helper",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch the background helper and start the main session's own foreground sleep",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor b".`,
+            `prompt: "Use the Bash tool in the foreground to run exactly:`,
+            `python3 -c 'import time; time.sleep(42)'. After it finishes, reply exactly: CHILD_DONE."`,
+            "Do not wait for that background helper to finish before continuing.",
+            "After launching it, use the Bash tool one more time yourself, WITHOUT run_in_background,",
+            "to run exactly: python3 -c 'import time; time.sleep(16)'.",
+            // Matching the proven pattern from the first test in this file: tell Claude to wait
+            // for a later message rather than relying on the sleep call itself to block, since a
+            // Bash call can resolve through Claude Code's own async task_notification path once a
+            // background subagent is already active instead of blocking the turn.
+            "Do not reply or finish your turn until a later user message arrives, no matter how",
+            "quickly that Bash command finishes. When that later message arrives, address it and",
+            "end your turn. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // Confirm the daemon considers main's own turn active before steering it. This does not
+      // wait for a specific "sleep 16" shell call to show as running: Claude Code 2.1.280 can
+      // report a slower Bash call through its own async task_notification tool instead of a
+      // classic blocking call once a background subagent is already active, so pinning to a
+      // literal running shell tool_call is not reliable here. Busy at the daemon level is what
+      // "while main is busy with its own sleep" actually needs.
+      await within(
+        "confirm main's own turn is active before steering",
+        30_000,
+        client.waitForAgentUpsert(agent.id, (snapshot) => snapshot.status === "running", 25_000),
+      );
+      // The running status precedes the Agent tool call, so a steer sent on it alone can reach
+      // Claude before the helper exists and prove nothing about a helper surviving it.
+      await within(
+        "confirm the background helper is registered before steering",
+        60_000,
+        waitForProviderSubagentToExist(client, agent.id, 55_000),
+      );
+
+      await within(
+        "send the app's default steer while main is busy with its own sleep",
+        30_000,
+        client.sendMessage(agent.id, "Reply with exactly PONG.", {
+          messageId: generateClientMessageId(),
+          activeTurnBehavior: "steer",
+        }),
+      );
+
+      const finish = await within(
+        "wait for the main session to finish after the steer",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(finish.status, "the main session must end idle after the steer").toBe("idle");
+      // Pulled via fetchAgentTimeline, not the push collector: see fetchAssistantTexts.
+      const postSteerTexts = await within(
+        "fetch timeline for the post-steer PONG reply",
+        15_000,
+        fetchAssistantTexts(client, agent.id, 20),
+      );
+      expect(postSteerTexts.join("\n"), "PONG must be answered after the steer").toContain("PONG");
+
+      const { subagent, history } = await within(
+        "wait for the background helper to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "default-steer background-helper E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
+  test("Stop cancels the main session's own turn but spares its background helper", async () => {
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("Stop-spares-helper test client was not created");
+      await within("connect Stop-spares-helper test client", 15_000, client.connect());
+      await within(
+        "subscribe Stop-spares-helper test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create Stop-spares-helper test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-stop-spares-helper",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch the background helper and start the main session's own foreground sleep",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor c".`,
+            `prompt: "Use the Bash tool in the foreground to run exactly:`,
+            `python3 -c 'import time; time.sleep(43)'. After it finishes, reply exactly: CHILD_DONE."`,
+            "Do not wait for that background helper to finish before continuing.",
+            "After launching it, use the Bash tool one more time yourself, WITHOUT run_in_background,",
+            "to run exactly: python3 -c 'import time; time.sleep(23)'.",
+            "Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // Confirm the helper has actually been launched (registered) before Stop, not just that
+      // main's turn shows "running": that status can flip true on generic turn-start bookkeeping
+      // before Claude has issued the Agent tool call, and canceling that early cancels a turn
+      // with no helper to spare yet.
+      await within(
+        "confirm the background helper is registered before Stop",
+        60_000,
+        waitForProviderSubagentToExist(client, agent.id, 55_000),
+      );
+
+      const messagesBeforeStop = resources.collector.messages.length;
+      await within("Stop the main session's own turn", 30_000, client.cancelAgent(agent.id));
+      const afterStop = await within(
+        "wait for the agent to go idle after Stop",
+        60_000,
+        client.waitForFinish(agent.id, 50_000),
+      );
+      expect(afterStop.status, "Stop must leave the agent idle").toBe("idle");
+
+      // The helper must survive Stop: it keeps running and later reports CHILD_DONE, which
+      // wakes the main session with a fresh autonomous turn.
+      const { subagent, history } = await within(
+        "wait for the background helper to finish after Stop",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "Stop must not cancel or fail the background helper").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+
+      const wokeMainAgent = await waitForWakeTurn(
+        resources.collector,
+        agent.id,
+        messagesBeforeStop,
+      );
+      expect(
+        wokeMainAgent,
+        "the helper's completion after Stop must wake the main session with a new turn",
+      ).toBe(true);
+
+      expect(await waitForAgentStatus(client, agent.id, "idle"), "the agent must end idle").toBe(
+        "idle",
+      );
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "Stop-spares-helper E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
 });
diff --git a/packages/server/src/server/daemon-e2e/send-during-tool-call-codex.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/send-during-tool-call-codex.real.e2e.test.ts
index 73ccc01988..39cc2554cc 100644
--- a/packages/server/src/server/daemon-e2e/send-during-tool-call-codex.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/send-during-tool-call-codex.real.e2e.test.ts
@@ -254,11 +254,7 @@ describe("daemon E2E (real codex) - send message during tool call", () => {
       const { client, cwd } = resources;
       if (!client) throw new Error("Codex steering test client was not created");
       await within("connect steering test client", 15_000, client.connect());
-      await within(
-        "subscribe steering test client",
-        15_000,
-        client.fetchAgents({ subscribe: { subscriptionId: "steer" } }),
-      );
+      await within("subscribe steering test client", 15_000, client.fetchAgents({ subscribe: {} }));
       const agent = await within(
         "create Codex steering test agent",
         30_000,
@@ -399,7 +395,7 @@ describe("daemon E2E (real codex) - send message during tool call", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
@@ -478,7 +474,7 @@ describe("daemon E2E (real codex) - send message during tool call", () => {
 
     try {
       await client.connect();
-      await client.fetchAgents({ subscribe: { subscriptionId: "primary" } });
+      await client.fetchAgents({ subscribe: {} });
 
       const agent = await client.createAgent({
         cwd,
diff --git a/packages/server/src/server/daemon-e2e/send-while-running-stuck-claude.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/send-while-running-stuck-claude.real.e2e.test.ts
index f9f6eb6aff..310b7b5cd4 100644
--- a/packages/server/src/server/daemon-e2e/send-while-running-stuck-claude.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/send-while-running-stuck-claude.real.e2e.test.ts
@@ -44,8 +44,8 @@ describe("daemon E2E (real claude) - send while running recovery", () => {
     try {
       await primary.connect();
       await secondary.connect();
-      await primary.fetchAgents({ subscribe: { subscriptionId: "primary" } });
-      await secondary.fetchAgents({ subscribe: { subscriptionId: "secondary" } });
+      await primary.fetchAgents({ subscribe: {} });
+      await secondary.fetchAgents({ subscribe: {} });
 
       const agent = await primary.createAgent({
         cwd,
@@ -104,7 +104,7 @@ describe("daemon E2E (real claude) - send while running recovery", () => {
         });
 
         const initial = await reconnected.fetchAgents({
-          subscribe: { subscriptionId: "reconnected" },
+          subscribe: {},
         });
         const hydratedSnapshot = initial.entries.find(
           (candidate) => candidate.agent.id === agent.id,
diff --git a/packages/server/src/server/daemon-e2e/send-while-running-stuck.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/send-while-running-stuck.real.e2e.test.ts
index aa75a77ee2..4f179998ab 100644
--- a/packages/server/src/server/daemon-e2e/send-while-running-stuck.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/send-while-running-stuck.real.e2e.test.ts
@@ -44,8 +44,8 @@ describe("daemon E2E (real codex) - send while running recovery", () => {
     try {
       await primary.connect();
       await secondary.connect();
-      await primary.fetchAgents({ subscribe: { subscriptionId: "primary" } });
-      await secondary.fetchAgents({ subscribe: { subscriptionId: "secondary" } });
+      await primary.fetchAgents({ subscribe: {} });
+      await secondary.fetchAgents({ subscribe: {} });
 
       const agent = await primary.createAgent({
         cwd,
@@ -101,7 +101,7 @@ describe("daemon E2E (real codex) - send while running recovery", () => {
         });
 
         const initial = await reconnected.fetchAgents({
-          subscribe: { subscriptionId: "reconnected" },
+          subscribe: {},
         });
         const hydratedSnapshot = initial.entries.find(
           (candidate) => candidate.agent.id === agent.id,
diff --git a/packages/server/src/server/daemon-e2e/streaming.e2e.test.ts b/packages/server/src/server/daemon-e2e/streaming.e2e.test.ts
index df1a522018..3ef308701d 100644
--- a/packages/server/src/server/daemon-e2e/streaming.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/streaming.e2e.test.ts
@@ -51,6 +51,7 @@ describe("daemon E2E - streaming", () => {
         title: "Streaming concat test",
         modeId: "bypassPermissions",
       });
+      await ctx.client.subscribeAgentTimeline(agent.id, () => {}).ready;
 
       messages.length = 0;
       await ctx.client.sendMessage(
@@ -78,6 +79,7 @@ describe("daemon E2E - streaming", () => {
         title: "Overlap stream test",
         modeId: "full-access",
       });
+      await ctx.client.subscribeAgentTimeline(agent.id, () => {}).ready;
 
       messages.length = 0;
       await ctx.client.sendMessage(agent.id, "Run: sleep 30");
diff --git a/packages/server/src/server/daemon-e2e/terminal-byte-headless-parity.e2e.test.ts b/packages/server/src/server/daemon-e2e/terminal-byte-headless-parity.e2e.test.ts
index f21f5f9b36..2b789788ad 100644
--- a/packages/server/src/server/daemon-e2e/terminal-byte-headless-parity.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/terminal-byte-headless-parity.e2e.test.ts
@@ -8,7 +8,7 @@ import { expect, test } from "vitest";
 
 import type { TerminalCell, TerminalState } from "@getpaseo/protocol/messages";
 import { renderTerminalSnapshotToAnsi } from "@getpaseo/protocol/terminal-snapshot";
-import type { TerminalStreamEvent } from "@getpaseo/client/internal/terminal-stream-router";
+import type { TerminalStreamEvent } from "@getpaseo/client/internal/daemon-client";
 import { DaemonClient } from "../test-utils/daemon-client.js";
 import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
 
@@ -48,7 +48,7 @@ test("byte-stream headless terminal matches daemon state after high-output attac
     });
     const initialSnapshot = waitForTerminalStreamEvent(client, terminal.id, "snapshot");
 
-    await subscribeTerminal(client, terminal.id);
+    const liveSubscription = await subscribeTerminal(client, terminal.id);
     await initialSnapshot;
     client.sendTerminalInput(terminal.id, { type: "resize", ...BYTE_TEST_SIZE });
     liveHeadless.resize(BYTE_TEST_SIZE);
@@ -70,7 +70,7 @@ test("byte-stream headless terminal matches daemon state after high-output attac
     expect(liveHeadless.cursor()).toEqual(daemonSnapshot.cursor);
     expect(liveHeadless.visibleLines()).toEqual(capturedViewport.lines);
 
-    client.unsubscribeTerminal(terminal.id);
+    await liveSubscription.release();
     stopLive();
 
     const restoreHeadless = new ClientHeadlessTerminal(BYTE_TEST_SIZE);
@@ -179,11 +179,12 @@ async function subscribeTerminal(
   client: DaemonClient,
   terminalId: string,
   options?: Parameters<DaemonClient["subscribeTerminal"]>[1],
-): Promise<void> {
+) {
   const response = await client.subscribeTerminal(terminalId, options);
   if (response.error) {
     throw new Error(response.error);
   }
+  return response.subscription;
 }
 
 async function readTerminalSnapshot(input: {
diff --git a/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts b/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts
new file mode 100644
index 0000000000..19ccdf45e8
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts
@@ -0,0 +1,246 @@
+import { resolveDaemonVersion } from "../daemon-version.js";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { createPaseoClient, type PaseoClient } from "@getpaseo/client";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+let daemon: TestPaseoDaemon;
+let client: DaemonClient;
+let cwd: string;
+let sdk: PaseoClient;
+
+beforeEach(async () => {
+  cwd = await mkdtemp(path.join(tmpdir(), "terminal-workspace-sdk-"));
+  daemon = await createTestPaseoDaemon();
+  client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  await client.connect();
+  sdk = createPaseoClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  await sdk.connect();
+});
+
+afterEach(async () => {
+  await client.close();
+  await sdk.close();
+  await daemon.close();
+  await rm(cwd, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+});
+
+test("SDK and workspace handles preserve ownership and actual process directories", async () => {
+  const first = await createWorkspace("main");
+  const second = await createWorkspace("feature-work");
+  const nested = path.join(cwd, "nested");
+  await mkdir(nested);
+  const a = await sdk.terminals.create({ workspaceId: first, name: "Main" });
+  const b = await sdk.workspaces.ref(second).terminals.create({ name: "Feature", cwd: nested });
+  const c = await sdk.terminals.create({
+    workspaceId: second,
+    cwd: daemon.staticDir,
+    name: "Outside",
+  });
+  expect(a.current()).toEqual({ id: a.id, workspaceId: first, cwd, name: "Main" });
+  expect(b.current()).toEqual({ id: b.id, workspaceId: second, cwd: nested, name: "Feature" });
+  expect(c.current()).toEqual({
+    id: c.id,
+    workspaceId: second,
+    cwd: daemon.staticDir,
+    name: "Outside",
+  });
+  const result = await sdk.workspaces.ref(second).terminals.list({ requestId: "feature-list" });
+  expect(result.requestId).toBe("feature-list");
+  expect(result.entries).toEqual(expect.arrayContaining([b.current(), c.current()]));
+  expect(result.entries).toHaveLength(2);
+  expect((await sdk.terminals.list()).entries).toHaveLength(3);
+  expect((await sdk.terminals.list({ cwd })).entries).toEqual([a.current(), b.current()]);
+  const ref = sdk.terminals.ref(b.id);
+  expect(ref.current()).toBeNull();
+  expect(await ref.refresh()).toEqual(b.current());
+  await ref.kill();
+  expect(await ref.refresh()).toBeNull();
+  expect((await sdk.terminals.list({ workspaceId: second })).entries).toEqual([c.current()]);
+  expect((await sdk.terminals.list({ workspaceId: first })).entries).toEqual([a.current()]);
+});
+
+test("SDK creates a command terminal and sends literal input and key tokens", async () => {
+  const workspaceId = await createWorkspace("Input");
+  const terminal = await sdk.terminals.create({
+    workspaceId,
+    command: process.execPath,
+    args: [
+      "-e",
+      "process.stdin.setRawMode(true); process.stdin.resume(); console.log('READY'); let hex = ''; process.stdin.on('data', data => { hex += data.toString('hex'); console.log('HEX:' + hex); });",
+    ],
+    size: { rows: 35, cols: 120 },
+  });
+  const screen = async () => (await terminal.capture({ stripAnsi: true })).lines.join("\n");
+  await expect.poll(screen).toContain("READY");
+  expect(terminal.write("Enter")).toBe(5);
+  await expect.poll(screen).toContain("HEX:456e746572");
+  expect(terminal.sendKeys(["Enter", "Tab", "Escape", "C-c"])).toBe(4);
+  await expect.poll(screen).toContain("HEX:456e7465720d091b03");
+  const capture = await terminal.capture({
+    start: 0,
+    end: 0,
+    stripAnsi: true,
+    requestId: "capture-first",
+  });
+  expect(capture).toMatchObject({ terminalId: terminal.id, requestId: "capture-first" });
+  expect(capture.lines).toHaveLength(1);
+  await terminal.kill();
+  expect(terminal.current()).toBeNull();
+  expect((await sdk.terminals.list({ workspaceId })).entries).toEqual([]);
+});
+
+test("terminal creation rejects unknown and archived owners, including explicit cwd overrides", async () => {
+  const workspaceId = await createWorkspace("Archived");
+  await sdk.workspaces.ref(workspaceId).archive();
+  for (const id of [workspaceId, "wks_missing"]) {
+    await expect(sdk.terminals.create({ workspaceId: id })).rejects.toThrow(/not active/);
+    await expect(sdk.terminals.create({ workspaceId: id, cwd })).rejects.toThrow(/not active/);
+    const raw = await client.createTerminal(cwd, undefined, undefined, { workspaceId: id });
+    expect(raw).toMatchObject({
+      terminal: null,
+      error: `Workspace ${id} is not active or does not exist`,
+    });
+  }
+  expect((await sdk.terminals.list()).entries).toEqual([]);
+  expect((await client.fetchWorkspaces()).entries).toEqual([]);
+});
+
+test("plugin handlers operate terminals through their host-owned Paseo API", async () => {
+  const workspaceId = await createWorkspace("Plugin workspace");
+  const pluginDirectory = path.join(cwd, "plugin");
+  await mkdir(pluginDirectory);
+  await writeFile(
+    path.join(pluginDirectory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "terminal-sdk",
+      requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+    }),
+  );
+  await writeFile(
+    path.join(pluginDirectory, "index.server.ts"),
+    `
+import { defineRpc } from "@getpaseo/plugin";
+import { z } from "zod";
+const operate = defineRpc({ name: "operate", input: z.object({ workspaceId: z.string(), command: z.string() }), output: z.object({ workspaceIds: z.array(z.string()), lines: z.array(z.string()), remaining: z.number() }) });
+async function waitForTerminalOutput(terminal, text) {
+  const deadline = Date.now() + 10000;
+  while (Date.now() < deadline) {
+    const capture = await terminal.capture({ stripAnsi: true });
+    if (capture.lines.some(line => line.includes(text))) return capture.lines;
+    await new Promise(resolve => setTimeout(resolve, 20));
+  }
+  throw new Error("Timed out waiting for plugin terminal output: " + text);
+}
+export default function contribute(server) {
+  server.handle(operate, async ({ workspaceId, command }, { paseo }) => {
+    const workspace = paseo.workspaces.ref(workspaceId);
+    const terminal = await workspace.terminals.create({ command, args: ["-e", "process.stdin.setRawMode(true); process.stdin.resume(); console.log('PLUGIN READY'); let hex = ''; process.stdin.on('data', data => { hex += data.toString('hex'); console.log('PLUGIN:' + hex); });"] });
+    try {
+      await waitForTerminalOutput(terminal, "PLUGIN READY");
+      terminal.write("Enter");
+      await waitForTerminalOutput(terminal, "PLUGIN:456e746572");
+      terminal.sendKeys(["Enter"]);
+      const lines = await waitForTerminalOutput(terminal, "PLUGIN:456e7465720d");
+      const listed = await workspace.terminals.list();
+      await paseo.terminals.ref(terminal.id).kill();
+      return { workspaceIds: listed.entries.map(entry => entry.workspaceId), lines, remaining: (await workspace.terminals.list()).entries.length };
+    } finally {
+      await terminal.kill();
+    }
+  });
+  return () => {};
+}`,
+  );
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await client.installDirectoryPlugin(pluginDirectory);
+  try {
+    const result = await client.invokePluginRpc("terminal-sdk", "operate", {
+      workspaceId,
+      command: process.execPath,
+    });
+    expect(result).toMatchObject({
+      workspaceIds: [workspaceId],
+      remaining: 0,
+      lines: expect.arrayContaining([expect.stringContaining("PLUGIN:456e7465720d")]),
+    });
+  } finally {
+    await client.removePlugin("terminal-sdk");
+  }
+}, 30_000);
+
+async function createWorkspace(title: string): Promise<string> {
+  const result = await client.createWorkspace({ source: { kind: "directory", path: cwd }, title });
+  if (!result.workspace) throw new Error(result.error ?? "Workspace creation failed");
+  return result.workspace.id;
+}
+
+test("listing by workspace ID keeps terminals in a shared directory separate", async () => {
+  const first = await createWorkspace("main");
+  const second = await createWorkspace("feature-work");
+  await client.createTerminal(cwd, "main terminal", undefined, { workspaceId: first });
+  const created = await client.createTerminal(cwd, "feature terminal", undefined, {
+    workspaceId: second,
+  });
+  expect(created.error).toBeNull();
+
+  const result = await client.listTerminals(undefined, undefined, { workspaceId: second });
+  expect(result.terminals).toEqual([
+    expect.objectContaining({ id: created.terminal?.id, workspaceId: second, cwd }),
+  ]);
+});
+
+test("script status started and stopped by one client reaches every subscribed client", async () => {
+  await writeFile(
+    path.join(cwd, "paseo.json"),
+    JSON.stringify({
+      scripts: { sleeper: { type: "script", command: 'node -e "setInterval(() => {}, 60000)"' } },
+    }),
+  );
+  const observer = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const bystander = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await observer.connect();
+    await bystander.connect();
+    const bystanderEvents: string[] = [];
+    bystander.subscribeRawMessages((message) => bystanderEvents.push(message.type));
+    const opened = await client.openProject(cwd);
+    expect(opened.error).toBeNull();
+    const workspaceId = opened.workspace!.id;
+    const actorSeen = await observeScriptLifecycles(client, "sleeper");
+    const observerSeen = await observeScriptLifecycles(observer, "sleeper");
+
+    expect((await client.startWorkspaceScript(workspaceId, "sleeper")).error).toBeNull();
+    await expect.poll(() => actorSeen.at(-1)).toBe("running");
+    await expect.poll(() => observerSeen.at(-1)).toBe("running");
+
+    expect((await client.stopWorkspaceScript(workspaceId, "sleeper")).error).toBeNull();
+    await expect.poll(() => actorSeen.at(-1)).toBe("stopped");
+    await expect.poll(() => observerSeen.at(-1)).toBe("stopped");
+    expect(bystanderEvents).not.toContain("script_status_update");
+  } finally {
+    await observer.close();
+    await bystander.close();
+  }
+}, 60_000);
+
+async function observeScriptLifecycles(
+  daemonClient: DaemonClient,
+  scriptName: string,
+): Promise<string[]> {
+  const lifecycles: string[] = [];
+  const subscription = daemonClient.observeEvents(["script_status_update"]);
+  subscription.subscribe({
+    snapshot: () => {},
+    update: (message) => {
+      if (message.type !== "script_status_update") return;
+      const script = message.payload.scripts.find((entry) => entry.scriptName === scriptName);
+      if (script) lifecycles.push(script.lifecycle);
+    },
+  });
+  await subscription.ready;
+  return lifecycles;
+}
diff --git a/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts b/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts
index 6d22b4695e..633bd3bc1c 100644
--- a/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts
@@ -1048,6 +1048,9 @@ test("one client can stream two terminals concurrently", async () => {
 
   expect(firstSubscribe.error).toBeNull();
   expect(secondSubscribe.error).toBeNull();
+  if (firstSubscribe.error !== null || secondSubscribe.error !== null) {
+    throw new Error("Expected both terminal subscriptions to succeed");
+  }
   expect(firstSubscribe.slot).not.toBe(secondSubscribe.slot);
 
   const firstOutput = waitForTerminalOutput(ctx.client, firstTerminalId, (text) =>
@@ -1077,8 +1080,8 @@ test("disconnect and reconnect both receive the current snapshot", async () => {
   const created = await createTerminalInWorkspace(ctx.client, { cwd });
   const terminalId = created.terminal!.id;
 
-  await ctx.client.subscribeTerminal(terminalId);
-  ctx.client.unsubscribeTerminal(terminalId);
+  const observation = await ctx.client.subscribeTerminal(terminalId);
+  await observation.subscription.release();
 
   ctx.client.sendTerminalInput(terminalId, {
     type: "input",
diff --git a/packages/server/src/server/daemon-e2e/timeline-reconnect-contract.e2e.test.ts b/packages/server/src/server/daemon-e2e/timeline-reconnect-contract.e2e.test.ts
index 8a794b54b5..ae01a8539d 100644
--- a/packages/server/src/server/daemon-e2e/timeline-reconnect-contract.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/timeline-reconnect-contract.e2e.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, expect, test } from "vitest";
+import { afterEach, beforeEach, expect, onTestFinished, test } from "vitest";
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -11,6 +11,23 @@ import {
 import { createMessageCollector } from "../test-utils/message-collector.js";
 import type { SessionOutboundMessage } from "../messages.js";
 
+async function observeTimeline(
+  client: DaemonClient,
+  agentId: string,
+  messages: SessionOutboundMessage[],
+): Promise<void> {
+  const subscription = client.observeTimeline([agentId]);
+  onTestFinished(
+    subscription.subscribe({
+      snapshot() {},
+      update(message) {
+        messages.push(message);
+      },
+    }),
+  );
+  await subscription.ready;
+}
+
 function tmpCwd(): string {
   return mkdtempSync(path.join(tmpdir(), "daemon-e2e-"));
 }
@@ -32,7 +49,6 @@ async function waitFor(
 function isLiveAssistantTimeline(
   message: SessionOutboundMessage,
   agentId: string,
-  epoch?: string,
   text?: string,
 ): boolean {
   return (
@@ -41,8 +57,7 @@ function isLiveAssistantTimeline(
     message.payload.event.type === "timeline" &&
     message.payload.event.item.type === "assistant_message" &&
     message.payload.seq === undefined &&
-    typeof message.payload.epoch === "string" &&
-    (epoch === undefined || message.payload.epoch === epoch) &&
+    message.payload.epoch === undefined &&
     (text === undefined || message.payload.event.item.text === text)
   );
 }
@@ -69,6 +84,8 @@ test("reconnect catches up committed rows without replaying a provisional seed",
       modeId: "full-access",
     });
 
+    await observeTimeline(ctx.client, agent.id, primaryCollector.messages);
+
     for (let seq = 1; seq <= 120; seq += 1) {
       await ctx.daemon.daemon.agentManager.appendTimelineItem(agent.id, {
         type: "assistant_message",
@@ -91,7 +108,7 @@ test("reconnect catches up committed rows without replaying a provisional seed",
     });
     await waitFor(() =>
       primaryCollector.messages.some((message) =>
-        isLiveAssistantTimeline(message, agent.id, epoch, "partial before disconnect"),
+        isLiveAssistantTimeline(message, agent.id, "partial before disconnect"),
       ),
     );
 
@@ -107,16 +124,15 @@ test("reconnect catches up committed rows without replaying a provisional seed",
     });
     await reconnectClient.connect();
     const reconnectCollector = createMessageCollector(reconnectClient);
+    await observeTimeline(reconnectClient, agent.id, reconnectCollector.messages);
 
     try {
       await reconnectClient.fetchAgents({
-        subscribe: { subscriptionId: "timeline-reconnect-a" },
+        subscribe: {},
       });
 
       expect(
-        reconnectCollector.messages.some((message) =>
-          isLiveAssistantTimeline(message, agent.id, epoch),
-        ),
+        reconnectCollector.messages.some((message) => isLiveAssistantTimeline(message, agent.id)),
       ).toBe(false);
 
       const catchUp = await reconnectClient.fetchAgentTimeline(agent.id, {
@@ -133,11 +149,14 @@ test("reconnect catches up committed rows without replaying a provisional seed",
       expect(catchUp.entries).toHaveLength(1);
       expect(catchUp.startCursor).toEqual({ epoch, seq: 121 });
       expect(catchUp.endCursor).toEqual({ epoch, seq: 121 });
-      expect(catchUp.entries[0]?.seqStart).toBe(121);
+      expect(catchUp.projection).toBe("projected");
+      expect(catchUp.entries[0]?.seqStart).toBe(1);
       expect(catchUp.entries[0]?.seqEnd).toBe(121);
       expect(catchUp.entries[0]?.item).toEqual({
         type: "assistant_message",
-        text: "finalized while disconnected",
+        text:
+          Array.from({ length: 120 }, (_, index) => `committed row ${index + 1}`).join("") +
+          "finalized while disconnected",
       });
     } finally {
       reconnectCollector.unsubscribe();
@@ -161,6 +180,8 @@ test("reconnect with no new committed rows resumes from future live provisional
       modeId: "full-access",
     });
 
+    await observeTimeline(ctx.client, agent.id, primaryCollector.messages);
+
     for (let seq = 1; seq <= 120; seq += 1) {
       await ctx.daemon.daemon.agentManager.appendTimelineItem(agent.id, {
         type: "assistant_message",
@@ -183,7 +204,7 @@ test("reconnect with no new committed rows resumes from future live provisional
     });
     await waitFor(() =>
       primaryCollector.messages.some((message) =>
-        isLiveAssistantTimeline(message, agent.id, epoch, "partial before disconnect"),
+        isLiveAssistantTimeline(message, agent.id, "partial before disconnect"),
       ),
     );
 
@@ -194,16 +215,15 @@ test("reconnect with no new committed rows resumes from future live provisional
     });
     await reconnectClient.connect();
     const reconnectCollector = createMessageCollector(reconnectClient);
+    await observeTimeline(reconnectClient, agent.id, reconnectCollector.messages);
 
     try {
       await reconnectClient.fetchAgents({
-        subscribe: { subscriptionId: "timeline-reconnect-b" },
+        subscribe: {},
       });
 
       expect(
-        reconnectCollector.messages.some((message) =>
-          isLiveAssistantTimeline(message, agent.id, epoch),
-        ),
+        reconnectCollector.messages.some((message) => isLiveAssistantTimeline(message, agent.id)),
       ).toBe(false);
 
       const catchUp = await reconnectClient.fetchAgentTimeline(agent.id, {
@@ -228,7 +248,7 @@ test("reconnect with no new committed rows resumes from future live provisional
       });
       await waitFor(() =>
         reconnectCollector.messages.some((message) =>
-          isLiveAssistantTimeline(message, agent.id, epoch, "fresh live after reconnect"),
+          isLiveAssistantTimeline(message, agent.id, "fresh live after reconnect"),
         ),
       );
     } finally {
diff --git a/packages/server/src/server/daemon-e2e/timeline-window.e2e.test.ts b/packages/server/src/server/daemon-e2e/timeline-window.e2e.test.ts
index 1e809314be..78134d7865 100644
--- a/packages/server/src/server/daemon-e2e/timeline-window.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/timeline-window.e2e.test.ts
@@ -178,7 +178,7 @@ describe("daemon E2E - timeline window", () => {
     }
   });
 
-  test("canonical after fetch returns only committed rows after the cursor", async () => {
+  test("legacy canonical requests return full projected items after the cursor", async () => {
     const cwd = tmpCwd();
     try {
       const agent = await ctx.client.createAgent({
@@ -201,13 +201,16 @@ describe("daemon E2E - timeline window", () => {
         projection: "canonical",
       });
 
-      expect(timeline.projection).toBe("canonical");
+      expect(timeline.projection).toBe("projected");
       expect(timeline.entries).toHaveLength(1);
       expect(timeline.startCursor?.seq).toBe(250);
       expect(timeline.endCursor?.seq).toBe(250);
-      expect(timeline.entries[0]?.seqStart).toBe(250);
+      expect(timeline.entries[0]?.seqStart).toBe(1);
       expect(timeline.entries[0]?.seqEnd).toBe(250);
-      expect(timeline.entries[0]?.sourceSeqRanges).toEqual([{ startSeq: 250, endSeq: 250 }]);
+      expect(timeline.entries[0]?.sourceSeqRanges).toEqual([
+        { startSeq: 1, endSeq: 1 },
+        { startSeq: 250, endSeq: 250 },
+      ]);
       expect(timeline.entries[0]?.item.type).toBe("tool_call");
     } finally {
       rmSync(cwd, { recursive: true, force: true });
@@ -301,7 +304,6 @@ describe("daemon E2E - timeline window", () => {
         });
       }
 
-      const fetchSpy = vi.spyOn(ctx.daemon.daemon.agentManager, "fetchTimeline");
       const timeline = await ctx.client.fetchAgentTimeline(agent.id, {
         direction: "tail",
         limit: 100,
@@ -311,11 +313,6 @@ describe("daemon E2E - timeline window", () => {
       expect(timeline.startCursor?.seq).toBe(501);
       expect(timeline.endCursor?.seq).toBe(600);
       expect(timeline.hasOlder).toBe(true);
-      expect(
-        fetchSpy.mock.calls.some(
-          ([, options]) => options?.direction === "tail" && options.limit === 0,
-        ),
-      ).toBe(false);
     } finally {
       rmSync(cwd, { recursive: true, force: true });
     }
@@ -341,7 +338,6 @@ describe("daemon E2E - timeline window", () => {
         limit: 1,
       }).epoch;
 
-      const fetchSpy = vi.spyOn(ctx.daemon.daemon.agentManager, "fetchTimeline");
       const timeline = await ctx.client.fetchAgentTimeline(agent.id, {
         direction: "after",
         cursor: { epoch, seq: 300 },
@@ -352,11 +348,6 @@ describe("daemon E2E - timeline window", () => {
       expect(timeline.startCursor?.seq).toBe(301);
       expect(timeline.endCursor?.seq).toBe(400);
       expect(timeline.hasNewer).toBe(true);
-      expect(
-        fetchSpy.mock.calls.some(
-          ([, options]) => options?.direction === "tail" && options.limit === 0,
-        ),
-      ).toBe(false);
     } finally {
       rmSync(cwd, { recursive: true, force: true });
     }
@@ -490,7 +481,6 @@ describe("daemon E2E - timeline window", () => {
         limit: 1,
       }).epoch;
 
-      const fetchSpy = vi.spyOn(ctx.daemon.daemon.agentManager, "fetchTimeline");
       const timeline = await ctx.client.fetchAgentTimeline(agent.id, {
         direction: "before",
         cursor: { epoch, seq: 501 },
@@ -501,11 +491,6 @@ describe("daemon E2E - timeline window", () => {
       expect(timeline.startCursor?.seq).toBe(401);
       expect(timeline.endCursor?.seq).toBe(500);
       expect(timeline.hasOlder).toBe(true);
-      expect(
-        fetchSpy.mock.calls.some(
-          ([, options]) => options?.direction === "tail" && options.limit === 0,
-        ),
-      ).toBe(false);
     } finally {
       rmSync(cwd, { recursive: true, force: true });
     }
diff --git a/packages/server/src/server/daemon-e2e/ui-action-stress.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/ui-action-stress.real.e2e.test.ts
index 925415a96e..7643138e0e 100644
--- a/packages/server/src/server/daemon-e2e/ui-action-stress.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/ui-action-stress.real.e2e.test.ts
@@ -466,7 +466,7 @@ describe.each(realProviders)("daemon E2E (real %s) - UI action stress", (provide
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: `ui-stress-normal-${provider}` },
+        subscribe: {},
       });
       const agent = await client.createAgent({
         cwd,
@@ -504,7 +504,7 @@ describe.each(realProviders)("daemon E2E (real %s) - UI action stress", (provide
     try {
       await client.connect();
       await client.fetchAgents({
-        subscribe: { subscriptionId: `ui-stress-overlap-${provider}` },
+        subscribe: {},
       });
 
       for (const scenario of scenarios) {
diff --git a/packages/server/src/server/daemon-e2e/user-message-contract.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/user-message-contract.real.e2e.test.ts
index b22327c6ba..9e2d96f699 100644
--- a/packages/server/src/server/daemon-e2e/user-message-contract.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/user-message-contract.real.e2e.test.ts
@@ -61,7 +61,7 @@ function tmpCwd(provider: ContractProvider): string {
 
 function collectUserMessageEvents(client: DaemonClient, agentId: string): AgentStreamEvent[] {
   const events: AgentStreamEvent[] = [];
-  client.on("agent_stream", (message) => {
+  client.subscribeAgentTimeline(agentId, (message) => {
     if (message.type !== "agent_stream" || message.payload.agentId !== agentId) {
       return;
     }
@@ -103,7 +103,7 @@ describe.each(CONTRACT_CASES)("daemon E2E (real $provider) - user_message contra
       appVersion: "0.1.80",
     });
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: `${entry.provider}-user-contract` } });
+    await client.fetchAgents({ subscribe: {} });
   }, 30_000);
 
   afterEach(async () => {
diff --git a/packages/server/src/server/daemon-e2e/wait-for-idle.e2e.test.ts b/packages/server/src/server/daemon-e2e/wait-for-idle.e2e.test.ts
index e2220a4109..ad2a62c804 100644
--- a/packages/server/src/server/daemon-e2e/wait-for-idle.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/wait-for-idle.e2e.test.ts
@@ -130,7 +130,7 @@ test("waitForFinish resolves first idle edge even if a new run starts immediatel
   const secondary = new DaemonClient({ url: `ws://127.0.0.1:${ctx.daemon.port}/ws` });
 
   await secondary.connect();
-  await secondary.fetchAgents({ subscribe: { subscriptionId: "wait-for-idle-secondary" } });
+  await secondary.fetchAgents({ subscribe: {} });
 
   const agent = await ctx.client.createAgent({
     provider: "codex",
@@ -193,7 +193,7 @@ test("waitForFinish stays blocked when sendMessage transactionally replaces a ru
 
   try {
     await secondary.connect();
-    await secondary.fetchAgents({ subscribe: { subscriptionId: "secondary" } });
+    await secondary.fetchAgents({ subscribe: {} });
 
     await ctx.client.sendMessage(agent.id, "Run: sleep 5");
     await ctx.client.waitForAgentUpsert(
diff --git a/packages/server/src/server/daemon-instance.test.ts b/packages/server/src/server/daemon-instance.test.ts
new file mode 100644
index 0000000000..ee428b2e58
--- /dev/null
+++ b/packages/server/src/server/daemon-instance.test.ts
@@ -0,0 +1,135 @@
+import { spawn, type ChildProcess } from "node:child_process";
+import { existsSync } from "node:fs";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir, uptime } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+
+import { readDaemonInstance, stopDaemonInstance } from "./daemon-instance.js";
+import { acquirePidLock, getPidLockInfo, isLocked, type PidLockInfo } from "./pid-lock.js";
+
+// A process cannot have started before the machine booted, so a lock stamped
+// before this boot names a PID that some unrelated process now holds.
+function bootedAt(): number {
+  return Date.now() - uptime() * 1000;
+}
+
+async function writeLock(paseoHome: string, lock: PidLockInfo): Promise<void> {
+  await writeFile(join(paseoHome, "paseo.pid"), JSON.stringify(lock));
+}
+
+function lockFor(pid: number, startedAt: Date): PidLockInfo {
+  return {
+    pid,
+    startedAt: startedAt.toISOString(),
+    hostname: "old-host",
+    uid: process.getuid?.() ?? 0,
+    listen: "127.0.0.1:6767",
+    desktopManaged: true,
+    heartbeat: true,
+  };
+}
+
+describe("daemon instance identity across a reboot", () => {
+  let paseoHome: string;
+  let bystander: ChildProcess | undefined;
+
+  beforeEach(async () => {
+    paseoHome = await mkdtemp(join(tmpdir(), "paseo-daemon-instance-"));
+  });
+
+  afterEach(async () => {
+    bystander?.kill("SIGKILL");
+    bystander = undefined;
+    await rm(paseoHome, { recursive: true, force: true });
+  });
+
+  test("a lock stamped before this boot has no running owner", async () => {
+    await writeLock(paseoHome, lockFor(process.pid, new Date(bootedAt() - 60 * 60_000)));
+
+    expect(await readDaemonInstance(paseoHome)).toBeNull();
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: false });
+  });
+
+  test("a supervisor started during this boot still holds the lock", async () => {
+    await writeLock(paseoHome, lockFor(process.pid, new Date()));
+
+    expect(await readDaemonInstance(paseoHome)).toMatchObject({ pid: process.pid });
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: true });
+  });
+
+  test("a new supervisor takes over a lock stamped before this boot", async () => {
+    await writeLock(paseoHome, lockFor(process.pid, new Date(bootedAt() - 60 * 60_000)));
+
+    await acquirePidLock(paseoHome, null, { ownerPid: process.pid + 10_000 });
+
+    expect(await getPidLockInfo(paseoHome)).toMatchObject({ pid: process.pid + 10_000 });
+  });
+
+  test("stopping a lock stamped before this boot leaves the process holding that pid alone", async () => {
+    // Records delivery rather than dying of it, so a signal cannot be missed by arriving late.
+    const signalMarker = join(paseoHome, "bystander-signalled");
+    bystander = spawn(
+      process.execPath,
+      [
+        "-e",
+        `process.on("SIGTERM", () => require("node:fs").writeFileSync(${JSON.stringify(signalMarker)}, "SIGTERM"));` +
+          `setTimeout(() => {}, 120_000);`,
+      ],
+      { stdio: "ignore" },
+    );
+    const bystanderPid = bystander.pid;
+    if (bystanderPid === undefined) throw new Error("bystander process did not start");
+    let exited = false;
+    bystander.once("exit", () => {
+      exited = true;
+    });
+
+    await writeLock(paseoHome, lockFor(bystanderPid, new Date(bootedAt() - 60 * 60_000)));
+
+    expect(await stopDaemonInstance(paseoHome)).toMatchObject({ action: "not_running" });
+
+    expect(existsSync(signalMarker)).toBe(false);
+    expect(exited).toBe(false);
+    await expect(readFile(join(paseoHome, "paseo.pid"), "utf-8")).rejects.toThrow(/ENOENT/);
+  });
+});
+
+// Linux keeps a boot's id while a VM is paused for a host sleep, though the VM's wall clock
+// runs ahead of its uptime once it resumes. A sleep longer than the time between boot and
+// the supervisor's start puts the wall-clock boot instant after the lock's startedAt.
+describe.runIf(process.platform === "linux")("daemon instance identity on Linux", () => {
+  let paseoHome: string;
+
+  beforeEach(async () => {
+    paseoHome = await mkdtemp(join(tmpdir(), "paseo-daemon-instance-linux-"));
+  });
+
+  afterEach(async () => {
+    vi.useRealTimers();
+    await rm(paseoHome, { recursive: true, force: true });
+  });
+
+  test("a supervisor still holds the lock after its paused VM resumes", async () => {
+    await acquirePidLock(paseoHome, null, { ownerPid: process.pid });
+
+    vi.useFakeTimers({ toFake: ["Date"] });
+    vi.setSystemTime(Date.now() + uptime() * 1000 + 12 * 60 * 60_000);
+
+    expect(await readDaemonInstance(paseoHome)).toMatchObject({ pid: process.pid });
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: true });
+    await expect(
+      acquirePidLock(paseoHome, null, { ownerPid: process.pid + 10_000 }),
+    ).rejects.toThrow("Another Paseo daemon is already running");
+  });
+
+  test("a lock written during another boot has no running owner", async () => {
+    await writeLock(paseoHome, {
+      ...lockFor(process.pid, new Date()),
+      bootId: "00000000-0000-0000-0000-000000000000",
+    });
+
+    expect(await readDaemonInstance(paseoHome)).toBeNull();
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: false });
+  });
+});
diff --git a/packages/server/src/server/daemon-instance.ts b/packages/server/src/server/daemon-instance.ts
new file mode 100644
index 0000000000..02f4446795
--- /dev/null
+++ b/packages/server/src/server/daemon-instance.ts
@@ -0,0 +1,310 @@
+import { spawn } from "node:child_process";
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+import {
+  getPidLockInfo,
+  isPidLockOwnerRunning,
+  isSamePidLock,
+  releasePidLock,
+  type PidLockInfo,
+} from "./pid-lock.js";
+import { daemonLaunchEnvironment } from "./config-environment.js";
+import { readPersistedConfig } from "./persisted-config.js";
+import treeKill from "tree-kill";
+const killTree = (pid: number, signal: string): Promise<void> =>
+  new Promise((resolve, reject) =>
+    treeKill(pid, signal, (error) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve();
+    }),
+  );
+
+// Process ownership only: desktop and CLI load this entry in their own processes.
+// Keep daemon bootstrap and WebSocket schemas out of its dependency tree.
+export { resolvePaseoHome } from "./paseo-home.js";
+export { ensurePrivateDirectory } from "./private-files.js";
+export { daemonLaunchEnvironment } from "./config-environment.js";
+export { readLocalCredentialForTarget } from "./local-credential.js";
+export {
+  isSamePidLock as isSameDaemonInstance,
+  type PidLockInfo as DaemonInstance,
+} from "./pid-lock.js";
+
+export class DaemonInstanceError extends Error {
+  constructor(
+    public readonly code: string,
+    message: string,
+  ) {
+    super(message);
+  }
+}
+
+export async function readDaemonInstance(home: string): Promise<PidLockInfo | null> {
+  const lock = await getPidLockInfo(home);
+  return lock && isPidLockOwnerRunning(lock) ? lock : null;
+}
+
+export function daemonLogPath(home: string): string {
+  try {
+    return path.resolve(home, readPersistedConfig(home).log?.file?.path ?? "daemon.log");
+  } catch {
+    return path.join(home, "daemon.log");
+  }
+}
+
+export async function waitForDaemonReady(
+  home: string,
+  options: {
+    timeoutMs?: number;
+    instance?: PidLockInfo;
+    signal?: AbortSignal;
+  } = {},
+): Promise<PidLockInfo & { listen: string }> {
+  const deadline = Date.now() + (options.timeoutMs ?? 600_000);
+  while (true) {
+    options.signal?.throwIfAborted();
+    const instance = await readDaemonInstance(home);
+    if (!instance)
+      throw new DaemonInstanceError(
+        "DAEMON_NOT_RUNNING",
+        `Daemon is not running for ${home}. Start with: paseo daemon start --home ${JSON.stringify(home)}`,
+      );
+    if (options.instance && !isSamePidLock(instance, options.instance)) {
+      throw new DaemonInstanceError(
+        "DAEMON_REPLACED",
+        `Supervisor changed for ${home}; refusing to follow PID ${instance.pid}.`,
+      );
+    }
+    if (instance.listen) return { ...instance, listen: instance.listen };
+    if (Date.now() >= deadline) throw notReady(home, instance);
+    await delay(100, undefined, { signal: options.signal });
+  }
+}
+
+function notReady(home: string, instance: PidLockInfo): DaemonInstanceError {
+  return new DaemonInstanceError(
+    "DAEMON_NOT_READY",
+    `Daemon PID ${instance.pid} remains running but is not ready for ${home}.\nLogs: ${daemonLogPath(home)}\nStatus: paseo daemon status --home ${JSON.stringify(home)}\nStop: paseo daemon stop --home ${JSON.stringify(home)}`,
+  );
+}
+
+async function requestInstanceStop(
+  home: string,
+  instance: PidLockInfo,
+  options: {
+    force?: boolean;
+    requestShutdown?: (instance: PidLockInfo & { listen: string }) => Promise<void>;
+  },
+) {
+  let forced = false;
+  let usedLifecycleRpc = false;
+  if (process.platform === "win32") {
+    if (instance.listen && options.requestShutdown) {
+      try {
+        await options.requestShutdown({ ...instance, listen: instance.listen });
+        usedLifecycleRpc = true;
+      } catch (error) {
+        if (!options.force) throw error;
+        const current = await getPidLockInfo(home);
+        if (current && !isSamePidLock(instance, current))
+          throw new DaemonInstanceError(
+            "DAEMON_REPLACED",
+            `Supervisor changed for ${home}; refusing forced cleanup.`,
+          );
+        await killTree(instance.pid, "SIGKILL");
+        forced = true;
+      }
+    } else if (!options.force) {
+      throw new DaemonInstanceError(
+        "STOP_NO_GRACEFUL_CHANNEL",
+        `PID ${instance.pid} for ${home} has no graceful shutdown channel. Use --force explicitly to terminate it.`,
+      );
+    } else {
+      await killTree(instance.pid, "SIGKILL");
+      forced = true;
+    }
+  } else {
+    try {
+      process.kill(instance.pid, "SIGTERM");
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "ESRCH") throw error;
+    }
+  }
+  return { forced, usedLifecycleRpc };
+}
+
+export async function stopDaemonInstance(
+  home: string,
+  options: {
+    instance?: PidLockInfo;
+    force?: boolean;
+    timeoutMs?: number;
+    killTimeoutMs?: number;
+    requestShutdown?: (instance: PidLockInfo & { listen: string }) => Promise<void>;
+  } = {},
+): Promise<{
+  action: "stopped" | "not_running";
+  pid: number | null;
+  forced: boolean;
+  usedLifecycleRpc: boolean;
+}> {
+  const { timeoutMs = 15_000, killTimeoutMs = 3_000 } = options;
+  const deadline = Date.now() + timeoutMs;
+  const instance = await getPidLockInfo(home);
+  if (options.instance && instance && !isSamePidLock(instance, options.instance)) {
+    throw new DaemonInstanceError(
+      "DAEMON_REPLACED",
+      `Supervisor changed for ${home}; refusing to stop PID ${instance.pid}.`,
+    );
+  }
+  if (!instance || !isPidLockOwnerRunning(instance)) {
+    if (instance)
+      await releasePidLock(home, { ownerPid: instance.pid, startedAt: instance.startedAt });
+    return {
+      action: "not_running",
+      pid: instance?.pid ?? null,
+      forced: false,
+      usedLifecycleRpc: false,
+    };
+  }
+  if (instance.pid <= 1 || instance.pid === process.pid)
+    throw new Error("Refusing to stop invalid supervisor PID");
+  let { forced, usedLifecycleRpc } = await requestInstanceStop(home, instance, options);
+  const waitForExit = async (waitMs: number) => {
+    const exitDeadline = Date.now() + waitMs;
+    while (isPidLockOwnerRunning(instance)) {
+      const current = await getPidLockInfo(home);
+      if (current && !isSamePidLock(instance, current))
+        throw new DaemonInstanceError(
+          "DAEMON_REPLACED",
+          `Supervisor changed for ${home}; stop of PID ${instance.pid} was not confirmed.`,
+        );
+      if (Date.now() >= exitDeadline) return false;
+      await delay(100);
+    }
+    return true;
+  };
+  let stopped = await waitForExit(forced ? killTimeoutMs : Math.max(0, deadline - Date.now()));
+  if (!stopped && options.force && !forced) {
+    await killTree(instance.pid, "SIGKILL");
+    forced = true;
+    stopped = await waitForExit(killTimeoutMs);
+  }
+  if (!stopped)
+    throw new DaemonInstanceError(
+      "STOP_NOT_CONFIRMED",
+      `Timed out waiting for supervisor PID ${instance.pid} in ${home} to exit${options.force ? "" : "; use --force to permit forced cleanup"}.`,
+    );
+  await releasePidLock(home, { ownerPid: instance.pid, startedAt: instance.startedAt });
+  return { action: "stopped", pid: instance.pid, forced, usedLifecycleRpc };
+}
+
+export async function startDaemonInstance(input: {
+  home: string;
+  command: string;
+  args: string[];
+  env: NodeJS.ProcessEnv;
+  mode: "managed" | "deployment";
+  desktopManaged?: boolean;
+  foreground?: boolean;
+  timeoutMs?: number;
+  signal?: AbortSignal;
+  onAcquired?: (instance: PidLockInfo) => void;
+  onReady?: (instance: PidLockInfo & { listen: string }) => void;
+}): Promise<{ instance: PidLockInfo; spawned: boolean; exitCode?: number }> {
+  input.signal?.throwIfAborted();
+  const existing = await readDaemonInstance(input.home);
+  if (existing) return { instance: existing, spawned: false };
+  const {
+    foreground = false,
+    timeoutMs = 600_000,
+    signal,
+    onAcquired = () => {},
+    onReady = () => {},
+  } = input;
+  const child = spawn(input.command, input.args, {
+    env: daemonLaunchEnvironment(input),
+    detached: !foreground,
+    stdio: foreground ? "inherit" : "ignore",
+    windowsHide: true,
+  });
+  let exit: { code: number; error?: Error } | undefined;
+  const exited = new Promise<number>((resolve) => {
+    child.once("error", (error) => {
+      exit = { code: 1, error };
+      resolve(1);
+    });
+    child.once("exit", (code) => {
+      exit = { code: code ?? 1 };
+      resolve(code ?? 1);
+    });
+  });
+  const cancel = () => {
+    if (child.pid && !exit) {
+      child.ref();
+      child.kill("SIGTERM");
+    }
+  };
+  signal?.addEventListener("abort", cancel, { once: true });
+  if (!foreground) child.unref();
+  const deadline = foreground ? Infinity : Date.now() + timeoutMs;
+  let acquired: PidLockInfo | undefined;
+  async function waitUntilReady() {
+    while (true) {
+      signal?.throwIfAborted();
+      const instance = await readDaemonInstance(input.home);
+      if (instance && instance.pid !== child.pid) return { instance, spawned: false };
+      if (instance && !acquired) {
+        acquired = instance;
+        onAcquired(instance);
+      }
+      if (exit) {
+        const logPath = daemonLogPath(input.home);
+        const log = await readFile(logPath, "utf8").catch(() => "");
+        throw new DaemonInstanceError(
+          "DAEMON_START_FAILED",
+          `Daemon failed to start (${exit.error?.message ?? `exit ${exit.code}`}). Logs: ${logPath}\n${log.split("\n").slice(-30).join("\n")}`,
+        );
+      }
+      if (instance?.listen) {
+        const ready = { ...instance, listen: instance.listen };
+        onReady(ready);
+        return {
+          instance: ready,
+          spawned: true,
+          ...(foreground ? { exitCode: await exited } : {}),
+        };
+      }
+      if (Date.now() >= deadline) {
+        if (acquired) throw notReady(input.home, acquired);
+        throw new DaemonInstanceError(
+          "DAEMON_NOT_READY",
+          `Supervisor PID ${child.pid} remains running but has not published its lock for ${input.home}. Logs: ${daemonLogPath(input.home)}. Check paseo daemon status --home ${JSON.stringify(input.home)}. Stop with paseo daemon stop --home ${JSON.stringify(input.home)} once its lock is published, or signal this PID.`,
+        );
+      }
+      await delay(100, undefined, { signal });
+    }
+  }
+  try {
+    return await waitUntilReady();
+  } catch (error) {
+    if (!(error instanceof DaemonInstanceError && error.code === "DAEMON_NOT_READY")) {
+      cancel();
+      const stopped = await Promise.race([
+        exited.then(() => true),
+        delay(15_000, false, { ref: false }),
+      ]);
+      if (!stopped && child.pid) {
+        await killTree(child.pid, "SIGKILL");
+        await exited;
+      }
+    }
+    throw error;
+  } finally {
+    signal?.removeEventListener("abort", cancel);
+  }
+}
diff --git a/packages/server/src/server/daemon-worker.ts b/packages/server/src/server/daemon-worker.ts
index f7a770d8be..bc5acbc404 100644
--- a/packages/server/src/server/daemon-worker.ts
+++ b/packages/server/src/server/daemon-worker.ts
@@ -1,6 +1,6 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import path from "node:path";
-import { createPaseoDaemon } from "./bootstrap.js";
+import { createPaseoDaemon, formatListenTarget } from "./bootstrap.js";
 import { loadConfig } from "./config.js";
 import { resolvePaseoHome } from "./paseo-home.js";
 import { createRootLogger } from "./logger.js";
@@ -17,6 +17,7 @@ type SupervisorLifecycleMessage =
   | {
       type: "paseo:ready";
       listen: string;
+      serverId: string;
     }
   | {
       type: "paseo:restart";
@@ -323,14 +324,15 @@ async function main() {
   try {
     await daemon.start();
     const listenTarget = daemon.getListenTarget();
-    const listen =
-      listenTarget?.type === "tcp"
-        ? `${listenTarget.host}:${listenTarget.port}`
-        : listenTarget?.path;
+    const listen = formatListenTarget(listenTarget);
     if (!listen) {
       throw new Error("Daemon did not expose a listen target after startup");
     }
-    sendSupervisorLifecycleMessage({ type: "paseo:ready", listen });
+    sendSupervisorLifecycleMessage({
+      type: "paseo:ready",
+      listen,
+      serverId: daemon.getServerId(),
+    });
   } catch (err) {
     logger.fatal({ err }, "Daemon failed to start listening");
     throw err;
diff --git a/packages/server/src/server/dictation/dictation-stream-manager.test.ts b/packages/server/src/server/dictation/dictation-stream-manager.test.ts
index 6d389a17e8..975d6677b8 100644
--- a/packages/server/src/server/dictation/dictation-stream-manager.test.ts
+++ b/packages/server/src/server/dictation/dictation-stream-manager.test.ts
@@ -534,3 +534,54 @@ describe("DictationStreamManager (provider-agnostic provider)", () => {
     }
   });
 });
+
+it("cancellation during STT bootstrap closes the producer and never acknowledges a late connection", async () => {
+  let connected!: () => void;
+  const gate = new Promise<void>((resolve) => {
+    connected = resolve;
+  });
+  class ConnectingSession extends FakeRealtimeSession {
+    override async connect(): Promise<void> {
+      await gate;
+    }
+  }
+  const session = new ConnectingSession();
+  const messages: Array<{ type: string }> = [];
+  const manager = new DictationStreamManager({
+    logger: pino({ level: "silent" }),
+    emit: (message) => messages.push(message),
+    sessionId: "cancel-bootstrap",
+    stt: new FakeSttProvider(session),
+  });
+  const starting = manager.handleStart("dictation", "audio/pcm;rate=24000;bits=16");
+  manager.handleCancel("dictation");
+  expect(session.closed).toBe(true);
+  connected();
+  await starting;
+  expect(messages).toEqual([]);
+  manager.cleanupAll();
+});
+
+it("closes every dictation stream when one provider cleanup fails", async () => {
+  class FailingCloseSession extends FakeRealtimeSession {
+    override close(): void {
+      super.close();
+      throw new Error("provider cleanup failed");
+    }
+  }
+  const first = new FailingCloseSession();
+  const second = new FakeRealtimeSession();
+  const sessions = [first, second];
+  const manager = new DictationStreamManager({
+    logger: pino({ level: "silent" }),
+    sessionId: "cleanup-failure",
+    emit: () => {},
+    stt: { id: "controlled", createSession: () => sessions.shift()! },
+  });
+  await manager.handleStart("first", "audio/pcm;rate=24000;bits=16");
+  await manager.handleStart("second", "audio/pcm;rate=24000;bits=16");
+  expect(() => manager.cleanupAll()).toThrow();
+  expect(first.closed).toBe(true);
+  expect(second.closed).toBe(true);
+  expect(manager.hasDemand).toBe(false);
+});
diff --git a/packages/server/src/server/dictation/dictation-stream-manager.ts b/packages/server/src/server/dictation/dictation-stream-manager.ts
index e911db3d6e..b1b061501f 100644
--- a/packages/server/src/server/dictation/dictation-stream-manager.ts
+++ b/packages/server/src/server/dictation/dictation-stream-manager.ts
@@ -134,6 +134,7 @@ export class DictationStreamManager {
   private readonly language: string;
   private readonly finalTimeoutMs: number;
   private readonly autoCommitSeconds: number;
+  private readonly onIdle: (() => void) | undefined;
   private readonly streams = new Map<string, DictationStreamState>();
 
   constructor(params: {
@@ -144,7 +145,9 @@ export class DictationStreamManager {
     language?: string;
     finalTimeoutMs?: number;
     autoCommitSeconds?: number;
+    onIdle?: () => void;
   }) {
+    this.onIdle = params.onIdle;
     this.logger = params.logger.child({ component: "dictation-stream-manager" });
     this.emit = params.emit;
     this.sessionId = params.sessionId;
@@ -157,10 +160,20 @@ export class DictationStreamManager {
       DEFAULT_DICTATION_AUTO_COMMIT_SECONDS;
   }
 
+  get hasDemand(): boolean {
+    return this.streams.size > 0;
+  }
+
   public cleanupAll(): void {
+    const failures: unknown[] = [];
     for (const dictationId of this.streams.keys()) {
-      this.cleanupDictationStream(dictationId);
+      try {
+        this.cleanupDictationStream(dictationId);
+      } catch (error) {
+        failures.push(error);
+      }
     }
+    if (failures.length) throw new AggregateError(failures, "Dictation cleanup failed");
   }
 
   public async handleStart(dictationId: string, format: string): Promise<void> {
@@ -189,79 +202,6 @@ export class DictationStreamManager {
       return;
     }
 
-    stt.on("committed", ({ segmentId }) => {
-      const state = this.streams.get(dictationId);
-      if (!state) {
-        return;
-      }
-      if (state.inFlightCommitCount > 0) {
-        state.inFlightCommitCount -= 1;
-      }
-      state.committedSegmentIds.push(segmentId);
-
-      if (state.finishRequested && state.awaitingFinalCommit) {
-        state.awaitingFinalCommit = false;
-      }
-
-      this.maybeFinalizeDictationStream(dictationId);
-    });
-
-    stt.on("transcript", ({ segmentId, transcript, isFinal }) => {
-      const state = this.streams.get(dictationId);
-      if (!state) {
-        return;
-      }
-      state.transcriptsBySegmentId.set(segmentId, transcript);
-      if (isFinal) {
-        state.finalTranscriptSegmentIds.add(segmentId);
-      }
-
-      if (state.finishRequested && state.awaitingFinalCommit && isFinal) {
-        state.awaitingFinalCommit = false;
-      }
-
-      const orderedIds = state.committedSegmentIds.includes(segmentId)
-        ? state.committedSegmentIds
-        : [...state.committedSegmentIds, segmentId];
-      const partialText = orderedIds
-        .map((id) => state.transcriptsBySegmentId.get(id) ?? "")
-        .join(" ")
-        .trim();
-      this.emitDictationPartial(dictationId, partialText);
-
-      this.maybeSealDictationStreamFinish(dictationId);
-      this.maybeFinalizeDictationStream(dictationId);
-    });
-
-    stt.on("error", (err) => {
-      const message = err instanceof Error ? err.message : String(err);
-      const state = this.streams.get(dictationId);
-      if (state && state.finishRequested && isBufferTooSmallError(message)) {
-        if (state.inFlightCommitCount > 0) {
-          state.inFlightCommitCount -= 1;
-        }
-        if (state.awaitingFinalCommit) {
-          state.awaitingFinalCommit = false;
-        }
-        this.maybeFinalizeDictationStream(dictationId);
-        return;
-      }
-      void this.failAndCleanupDictationStream(dictationId, message, true);
-    });
-
-    try {
-      await stt.connect();
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.failDictationStream(dictationId, message, true);
-      try {
-        stt.close();
-      } catch {
-        // no-op
-      }
-      return;
-    }
-
     const inputRate = parsePcmRateFromFormat(format, 16000) ?? 16000;
     if (!Number.isFinite(inputRate) || inputRate <= 0) {
       this.failDictationStream(
@@ -322,6 +262,78 @@ export class DictationStreamManager {
       finalTimeout: null,
     });
 
+    stt.on("committed", ({ segmentId }) => {
+      const state = this.streams.get(dictationId);
+      if (state?.stt !== stt) {
+        return;
+      }
+      if (state.inFlightCommitCount > 0) {
+        state.inFlightCommitCount -= 1;
+      }
+      state.committedSegmentIds.push(segmentId);
+
+      if (state.finishRequested && state.awaitingFinalCommit) {
+        state.awaitingFinalCommit = false;
+      }
+
+      this.maybeFinalizeDictationStream(dictationId);
+    });
+
+    stt.on("transcript", ({ segmentId, transcript, isFinal }) => {
+      const state = this.streams.get(dictationId);
+      if (state?.stt !== stt) {
+        return;
+      }
+      state.transcriptsBySegmentId.set(segmentId, transcript);
+      if (isFinal) {
+        state.finalTranscriptSegmentIds.add(segmentId);
+      }
+
+      if (state.finishRequested && state.awaitingFinalCommit && isFinal) {
+        state.awaitingFinalCommit = false;
+      }
+
+      const orderedIds = state.committedSegmentIds.includes(segmentId)
+        ? state.committedSegmentIds
+        : [...state.committedSegmentIds, segmentId];
+      const partialText = orderedIds
+        .map((id) => state.transcriptsBySegmentId.get(id) ?? "")
+        .join(" ")
+        .trim();
+      this.emitDictationPartial(dictationId, partialText);
+
+      this.maybeSealDictationStreamFinish(dictationId);
+      this.maybeFinalizeDictationStream(dictationId);
+    });
+
+    stt.on("error", (err) => {
+      const message = err instanceof Error ? err.message : String(err);
+      const state = this.streams.get(dictationId);
+      if (state?.stt !== stt) return;
+      if (state.finishRequested && isBufferTooSmallError(message)) {
+        if (state.inFlightCommitCount > 0) {
+          state.inFlightCommitCount -= 1;
+        }
+        if (state.awaitingFinalCommit) {
+          state.awaitingFinalCommit = false;
+        }
+        this.maybeFinalizeDictationStream(dictationId);
+        return;
+      }
+      void this.failAndCleanupDictationStream(dictationId, message, true);
+    });
+
+    try {
+      await stt.connect();
+    } catch (error) {
+      if (this.streams.get(dictationId)?.stt !== stt) return;
+      const message = error instanceof Error ? error.message : String(error);
+      this.failDictationStream(dictationId, message, true);
+      this.cleanupDictationStream(dictationId);
+      return;
+    }
+    if (this.streams.get(dictationId)?.stt !== stt) return;
+
     this.emitDictationAck(dictationId, -1);
   }
 
@@ -528,7 +540,9 @@ export class DictationStreamManager {
     error: string,
     retryable: boolean,
   ): Promise<void> {
+    const state = this.streams.get(dictationId);
     const debugRecordingPath = await this.maybePersistDictationStreamAudio(dictationId);
+    if (!state || this.streams.get(dictationId) !== state) return;
     this.emit({
       type: "dictation_stream_error",
       payload: {
@@ -561,12 +575,12 @@ export class DictationStreamManager {
     if (state.finalTimeout) {
       clearTimeout(state.finalTimeout);
     }
+    this.streams.delete(dictationId);
     try {
       state.stt.close();
-    } catch {
-      // no-op
+    } finally {
+      if (this.streams.size === 0) this.onIdle?.();
     }
-    this.streams.delete(dictationId);
   }
 
   private estimateFinalizationTimeout(state: DictationStreamState): {
@@ -731,6 +745,7 @@ export class DictationStreamManager {
     if (orderedSegmentIds.length === 0) {
       void (async () => {
         const debugRecordingPath = await this.maybePersistDictationStreamAudio(dictationId);
+        if (this.streams.get(dictationId) !== state) return;
         this.emit({
           type: "dictation_stream_final",
           payload: {
@@ -770,6 +785,7 @@ export class DictationStreamManager {
 
     void (async () => {
       const debugRecordingPath = await this.maybePersistDictationStreamAudio(dictationId);
+      if (this.streams.get(dictationId) !== state) return;
       this.emit({
         type: "dictation_stream_final",
         payload: {
diff --git a/packages/server/src/server/directory-sync/index.ts b/packages/server/src/server/directory-sync/index.ts
index 1b08360cb7..e16e20302f 100644
--- a/packages/server/src/server/directory-sync/index.ts
+++ b/packages/server/src/server/directory-sync/index.ts
@@ -69,27 +69,29 @@ export class DirectorySyncService {
   synchronizeWorkspaces(
     snapshot: Iterable<WorkspaceDescriptorPayload>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): Pick<FetchWorkspacesResponse, "entries" | "emptyProjects" | "pageInfo" | "sync"> {
     this.workspaces.replaceAll(snapshot);
-    const read = this.read(this.workspaces, cursor);
+    const read = this.read(this.workspaces, cursor, includeBackground);
     return {
       entries: read.values.map(({ seq, value }) => ({ ...value, syncSeq: seq })),
       emptyProjects: [],
       pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-      sync: this.metadata(read),
+      sync: this.metadata(read, includeBackground),
     };
   }
 
   synchronizeAgents(
     snapshot: Iterable<AgentDirectoryEntry>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): Pick<FetchAgentsResponse, "entries" | "pageInfo" | "sync"> {
     this.agents.replaceAll(snapshot);
-    const read = this.read(this.agents, cursor);
+    const read = this.read(this.agents, cursor, includeBackground);
     return {
       entries: read.values.map(({ seq, value }) => ({ ...value, syncSeq: seq })),
       pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-      sync: this.metadata(read),
+      sync: this.metadata(read, includeBackground),
     };
   }
 
@@ -111,13 +113,19 @@ export class DirectorySyncService {
     value: WorkspaceDescriptorPayload | null,
     id: string,
     includeSequence: boolean,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
     if (value) {
       this.workspaces.replace(value);
     } else {
       this.workspaces.remove(id);
     }
-    return this.withVersion(payload, includeSequence, this.version(this.workspaces, id));
+    return this.withVersion(
+      payload,
+      includeSequence,
+      this.version(this.workspaces, id),
+      includeBackground,
+    );
   }
 
   sequenceAgentUpdate<T extends object>(
@@ -125,18 +133,24 @@ export class DirectorySyncService {
     value: AgentDirectoryEntry | null,
     id: string,
     includeSequence: boolean,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
     if (value) {
       this.agents.replace(value);
     } else {
       this.agents.remove(id);
     }
-    return this.withVersion(payload, includeSequence, this.version(this.agents, id));
+    return this.withVersion(
+      payload,
+      includeSequence,
+      this.version(this.agents, id),
+      includeBackground,
+    );
   }
 
-  private metadata(read: CollectionRead<unknown>) {
+  private metadata(read: CollectionRead<unknown>, includeBackground = false) {
     return {
-      generation: this.generation,
+      generation: this.generationFor(includeBackground),
       headSeq: read.headSeq,
       mode: read.mode,
       ...(read.reason ? { reason: read.reason } : {}),
@@ -148,15 +162,19 @@ export class DirectorySyncService {
     payload: T,
     includeSequence: boolean,
     version: DirectoryVersion | null,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
-    return version && includeSequence ? { ...payload, ...version } : payload;
+    return version && includeSequence
+      ? { ...payload, ...version, generation: this.generationFor(includeBackground) }
+      : payload;
   }
 
   private read<T>(
     collection: VersionedCollection<T>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): CollectionRead<T> {
-    if (cursor.generation !== this.generation) {
+    if (cursor.generation !== this.generationFor(includeBackground)) {
       return collection.readSnapshot(
         cursor.generation === undefined ? "no_cursor" : "generation_changed",
       );
@@ -167,6 +185,10 @@ export class DirectorySyncService {
     return collection.readAfter(cursor.afterSeq);
   }
 
+  private generationFor(includeBackground: boolean): string {
+    return includeBackground ? `${this.generation}:background` : this.generation;
+  }
+
   private version<T>(collection: VersionedCollection<T>, id: string): DirectoryVersion | null {
     const seq = collection.sequenceFor(id);
     return seq === null ? null : { generation: this.generation, seq };
diff --git a/packages/server/src/server/exports.test.ts b/packages/server/src/server/exports.test.ts
index 9c9a5af9bb..1edf1049c9 100644
--- a/packages/server/src/server/exports.test.ts
+++ b/packages/server/src/server/exports.test.ts
@@ -17,3 +17,58 @@ test("keeps daemon-client APIs out of the server public entry", async () => {
     expect(serverExports).not.toHaveProperty(name);
   }
 });
+
+// Keep the emitted dependency tree intact: production runs unbundled modules,
+// so tree-shaking must not hide the cost of an unused re-export.
+test.each([
+  ["desktop daemon management", "../../../desktop/src/daemon/daemon-manager.ts"],
+  ["supervisor", "../../scripts/supervisor-entrypoint.ts"],
+  ["daemon control", "@getpaseo/server/daemon-control"],
+  ["configuration without the session admission resolver", "@getpaseo/server/configuration"],
+])("%s does not load the daemon runtime or wire schemas", async (_name, entry) => {
+  const inputs = await runtimeDependencies(entry);
+  expect(inputs.filter((file) => /\/(?:bootstrap|messages)\.[jt]s$/.test(file))).toEqual([]);
+});
+
+test("CLI command registration does not load the daemon implementation", async () => {
+  const inputs = await runtimeDependencies("../../../cli/src/cli.ts");
+  expect(
+    inputs.filter((file) => /\/(?:bootstrap|agent-manager|session)\.[jt]s$/.test(file)),
+  ).toEqual([]);
+});
+
+async function runtimeDependencies(entry: string): Promise<string[]> {
+  const { build } = await import("esbuild");
+  const { fileURLToPath } = await import("node:url");
+  const { isAbsolute } = await import("node:path");
+  const result = await build({
+    stdin: {
+      contents: `import ${JSON.stringify(entry.startsWith("@") ? entry : fileURLToPath(new URL(entry, import.meta.url)))};`,
+      resolveDir: fileURLToPath(new URL(".", import.meta.url)),
+    },
+    bundle: true,
+    write: false,
+    metafile: true,
+    treeShaking: false,
+    platform: "node",
+    // Server unit CI builds dependency workspaces, then tests server source.
+    conditions: ["source"],
+    format: "esm",
+    logLevel: "silent",
+    plugins: [
+      {
+        name: "external-vendors",
+        setup(builder) {
+          builder.onResolve({ filter: /^[^./]/ }, ({ path }) => {
+            if (!isAbsolute(path) && !path.startsWith("@getpaseo/")) {
+              return { path, external: true };
+            }
+          });
+        },
+      },
+    ],
+  });
+  const inputs = Object.keys(result.metafile.inputs);
+  expect(inputs.length).toBeGreaterThan(1);
+  return inputs;
+}
diff --git a/packages/server/src/server/exports.ts b/packages/server/src/server/exports.ts
index 0961e08b11..2f5e2a8243 100644
--- a/packages/server/src/server/exports.ts
+++ b/packages/server/src/server/exports.ts
@@ -9,7 +9,7 @@ export {
   savePersistedConfig,
   type PersistedConfig,
 } from "./persisted-config.js";
-export { hashDaemonPassword, isBearerTokenValid } from "./auth.js";
+export { hashDaemonPassword, isBearerTokenValidAsync } from "./auth.js";
 export { generateLocalPairingOffer, type LocalPairingOffer } from "./pairing-offer.js";
 export {
   ConnectionOfferSchema,
@@ -96,3 +96,23 @@ export type {
   AgentStreamEventPayload,
   AgentStreamMessage,
 } from "@getpaseo/protocol/messages";
+
+export {
+  readDaemonInstance,
+  startDaemonInstance,
+  stopDaemonInstance,
+  waitForDaemonReady,
+  daemonLogPath,
+  daemonLaunchEnvironment,
+  isSameDaemonInstance,
+  DaemonInstanceError,
+  type DaemonInstance,
+} from "./daemon-instance.js";
+export {
+  readPersistedConfig,
+  getPersistedConfigValue,
+  editPersistedConfig,
+} from "./persisted-config.js";
+export { resolveConfigFromPersisted } from "./config.js";
+
+export { ensurePrivateDirectory } from "./private-files.js";
diff --git a/packages/server/src/server/file-download/content-disposition.test.ts b/packages/server/src/server/file-download/content-disposition.test.ts
new file mode 100644
index 0000000000..46748c21ef
--- /dev/null
+++ b/packages/server/src/server/file-download/content-disposition.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, test } from "vitest";
+import { formatAttachmentContentDisposition } from "./content-disposition.js";
+
+describe("formatAttachmentContentDisposition", () => {
+  test.each([
+    { fileName: "report.txt", disposition: 'attachment; filename="report.txt"' },
+    {
+      fileName: "café.txt",
+      disposition: "attachment; filename=\"caf?.txt\"; filename*=UTF-8''caf%C3%A9.txt",
+    },
+    {
+      fileName: "Résumé Ångström.pdf",
+      disposition:
+        "attachment; filename=\"R?sum? ?ngstr?m.pdf\"; filename*=UTF-8''R%C3%A9sum%C3%A9%20%C3%85ngstr%C3%B6m.pdf",
+    },
+    {
+      fileName: "中文报告 (最终版).txt",
+      disposition:
+        "attachment; filename=\"???? (???).txt\"; filename*=UTF-8''%E4%B8%AD%E6%96%87%E6%8A%A5%E5%91%8A%20%28%E6%9C%80%E7%BB%88%E7%89%88%29.txt",
+    },
+    {
+      fileName: "report-📄.txt",
+      disposition:
+        "attachment; filename=\"report-??.txt\"; filename*=UTF-8''report-%F0%9F%93%84.txt",
+    },
+    {
+      fileName: 'say "hi" \\ bye.txt',
+      disposition: 'attachment; filename="say \\"hi\\" \\\\ bye.txt"',
+    },
+    {
+      fileName: "100%25 done.txt",
+      disposition: "attachment; filename=\"100%25 done.txt\"; filename*=UTF-8''100%2525%20done.txt",
+    },
+    {
+      fileName: "l'été (1)*.txt",
+      disposition:
+        "attachment; filename=\"l'?t? (1)*.txt\"; filename*=UTF-8''l%27%C3%A9t%C3%A9%20%281%29%2A.txt",
+    },
+  ])("$fileName", ({ fileName, disposition }) => {
+    expect(formatAttachmentContentDisposition(fileName)).toBe(disposition);
+  });
+});
diff --git a/packages/server/src/server/file-download/content-disposition.ts b/packages/server/src/server/file-download/content-disposition.ts
new file mode 100644
index 0000000000..1ad7997b7c
--- /dev/null
+++ b/packages/server/src/server/file-download/content-disposition.ts
@@ -0,0 +1,32 @@
+const NON_PRINTABLE_ASCII = /[^\x20-\x7e]/g;
+const PERCENT_ESCAPE = /%[0-9A-Fa-f]{2}/;
+const QUOTED_STRING_SPECIALS = /[\\"]/g;
+const NON_ATTR_CHARS_LEFT_BY_URI_ENCODING = /['()*]/g;
+
+/**
+ * Content-Disposition for a file download (RFC 6266).
+ *
+ * Any name that is not plain ASCII also gets `filename*=UTF-8''…`, because
+ * browsers do not read raw Latin-1 bytes in `filename` and fall back to a name
+ * taken from the URL. A name with a percent escape gets it too, so browsers do
+ * not decode the escape in `filename`.
+ */
+export function formatAttachmentContentDisposition(fileName: string): string {
+  const asciiFileName = fileName.replace(NON_PRINTABLE_ASCII, "?");
+  const disposition = `attachment; filename=${quote(asciiFileName)}`;
+  if (asciiFileName === fileName && !PERCENT_ESCAPE.test(fileName)) {
+    return disposition;
+  }
+  return `${disposition}; filename*=UTF-8''${encodeExtendedValue(fileName)}`;
+}
+
+function quote(value: string): string {
+  return `"${value.replace(QUOTED_STRING_SPECIALS, "\\$&")}"`;
+}
+
+function encodeExtendedValue(value: string): string {
+  return encodeURIComponent(value).replace(
+    NON_ATTR_CHARS_LEFT_BY_URI_ENCODING,
+    (char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`,
+  );
+}
diff --git a/packages/server/src/server/file-explorer/service.test.ts b/packages/server/src/server/file-explorer/service.test.ts
index ea22ac24b9..a82e1a8f80 100644
--- a/packages/server/src/server/file-explorer/service.test.ts
+++ b/packages/server/src/server/file-explorer/service.test.ts
@@ -12,8 +12,8 @@ import {
 } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
-import { runGitCommand } from "../../utils/run-git-command.js";
+import { describe, expect, it, vi } from "vitest";
+import { runGitCommand, snapshotGitCommandRuntimeMetrics } from "../../utils/run-git-command.js";
 import {
   createExplorerEntry,
   deleteExplorerEntry,
@@ -517,6 +517,129 @@ describe("file explorer service", () => {
     }
   });
 
+  it("renames an untracked bracketed filename without matching a tracked sibling", async () => {
+    const root = await createTempDir("paseo-entry-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await writeFile(path.join(root, "i.tsx"), "tracked\n", "utf8");
+      await runGitCommand(["add", "i.tsx"], { cwd: root });
+      await writeFile(path.join(root, "[id].tsx"), "untracked\n", "utf8");
+
+      snapshotGitCommandRuntimeMetrics();
+      const result = await renameExplorerEntry({
+        root,
+        relativePath: "[id].tsx",
+        name: "renamed.tsx",
+      });
+
+      expect(result).toEqual({ status: "ok", path: "renamed.tsx" });
+      expect(snapshotGitCommandRuntimeMetrics().operationsTop).toEqual([
+        ["ls-files", 1],
+        ["rev-parse", 1],
+      ]);
+      expect(await readFile(path.join(root, "renamed.tsx"), "utf8")).toBe("untracked\n");
+      await expect(stat(path.join(root, "[id].tsx"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe("i.tsx\0");
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it("renames an untracked bracketed folder without matching a tracked sibling", async () => {
+    const root = await createTempDir("paseo-folder-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await mkdir(path.join(root, "i"));
+      await writeFile(path.join(root, "i", "route.tsx"), "tracked\n", "utf8");
+      await runGitCommand(["add", "i"], { cwd: root });
+      await mkdir(path.join(root, "[id]"));
+      await writeFile(path.join(root, "[id]", "route.tsx"), "untracked\n", "utf8");
+
+      const result = await renameExplorerEntry({ root, relativePath: "[id]", name: "route" });
+
+      expect(result).toEqual({ status: "ok", path: "route" });
+      expect(await readFile(path.join(root, "route", "route.tsx"), "utf8")).toBe("untracked\n");
+      await expect(stat(path.join(root, "[id]"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i", "route.tsx"), "utf8")).toBe("tracked\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe("i/route.tsx\0");
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it("uses Git to rename a tracked bracketed filename and preserves its tracked sibling", async () => {
+    const root = await createTempDir("paseo-tracked-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await writeFile(path.join(root, "[id].tsx"), "tracked route\n", "utf8");
+      await writeFile(path.join(root, "i.tsx"), "tracked sibling\n", "utf8");
+      await runGitCommand(["add", "--", "[id].tsx", "i.tsx"], { cwd: root });
+
+      const result = await renameExplorerEntry({
+        root,
+        relativePath: "[id].tsx",
+        name: "renamed.tsx",
+      });
+
+      expect(result).toEqual({ status: "ok", path: "renamed.tsx" });
+      expect(await readFile(path.join(root, "renamed.tsx"), "utf8")).toBe("tracked route\n");
+      await expect(stat(path.join(root, "[id].tsx"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked sibling\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe(
+        "i.tsx\0renamed.tsx\0",
+      );
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it.each([
+    {
+      sourcePath: "[id].tsx",
+      sourceFile: "[id].tsx",
+      targetName: "renamed.tsx",
+      targetFile: "renamed.tsx",
+    },
+    {
+      sourcePath: "[id]",
+      sourceFile: "[id]/route.tsx",
+      targetName: "route",
+      targetFile: "route/route.tsx",
+    },
+  ])(
+    "keeps tracked renames in the index with inherited literal pathspecs ($sourcePath)",
+    async ({ sourcePath, sourceFile, targetName, targetFile }) => {
+      const root = await createTempDir("paseo-inherited-literal-rename-");
+      try {
+        vi.stubEnv("GIT_LITERAL_PATHSPECS", "1");
+        await runGitCommand(["init"], { cwd: root });
+        await mkdir(path.dirname(path.join(root, sourceFile)), { recursive: true });
+        await writeFile(path.join(root, sourceFile), "tracked route\n", "utf8");
+        await writeFile(path.join(root, "i.tsx"), "tracked sibling\n", "utf8");
+        await runGitCommand(["add", "."], { cwd: root });
+
+        const result = await renameExplorerEntry({
+          root,
+          relativePath: sourcePath,
+          name: targetName,
+        });
+
+        expect(result).toEqual({ status: "ok", path: targetName });
+        expect(await readFile(path.join(root, targetFile), "utf8")).toBe("tracked route\n");
+        await expect(stat(path.join(root, sourcePath))).rejects.toMatchObject({ code: "ENOENT" });
+        expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked sibling\n");
+        expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe(
+          `i.tsx\0${targetFile}\0`,
+        );
+        expect(process.env.GIT_LITERAL_PATHSPECS).toBe("1");
+      } finally {
+        vi.unstubAllEnvs();
+        await rm(root, { recursive: true, force: true });
+      }
+    },
+  );
+
   it("supports case-only renames for tracked and untracked files", async () => {
     const root = await createTempDir("paseo-entry-case-rename-");
     try {
diff --git a/packages/server/src/server/file-explorer/service.ts b/packages/server/src/server/file-explorer/service.ts
index 5aa4efe974..b371a5e4af 100644
--- a/packages/server/src/server/file-explorer/service.ts
+++ b/packages/server/src/server/file-explorer/service.ts
@@ -489,7 +489,7 @@ export async function writeExplorerFile({
 
   const temporaryPath = path.join(
     path.dirname(filePath.resolvedPath),
-    `.${path.basename(filePath.resolvedPath)}.paseo-${randomUUID()}.tmp`,
+    `.paseo-${randomUUID()}.tmp`,
   );
   let temporaryHandle: FileHandle | null = null;
   try {
@@ -724,7 +724,11 @@ export async function renameExplorerEntry({
     });
     const tracked =
       repository.exitCode === 0
-        ? await runGitCommand(["ls-files", "-z", "--", sourcePath], { cwd: realRoot })
+        ? await runGitCommand(["ls-files", "-z", "--", `:(literal)${sourcePath}`], {
+            cwd: realRoot,
+            // Inherited literal mode disables the :(literal) pathspec magic.
+            envOverlay: { GIT_LITERAL_PATHSPECS: undefined },
+          })
         : null;
     if (tracked?.stdout) {
       await runGitCommand(["mv", "--", sourcePath, renamedPath], { cwd: realRoot });
@@ -820,8 +824,9 @@ async function resolveScopedPath({
 
 function assertWithinWorkspace(root: string, candidate: string): void {
   const relative = path.relative(root, candidate);
-  if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) return;
-  throw new Error(ACCESS_OUTSIDE_WORKSPACE_MESSAGE);
+  const isOutsideWorkspace =
+    relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative);
+  if (isOutsideWorkspace) throw new Error(ACCESS_OUTSIDE_WORKSPACE_MESSAGE);
 }
 
 async function openFileForRead(filePath: string): Promise<FileHandle> {
diff --git a/packages/server/src/server/file-observer/index.test.ts b/packages/server/src/server/file-observer/index.test.ts
index 0427cd823b..711b826348 100644
--- a/packages/server/src/server/file-observer/index.test.ts
+++ b/packages/server/src/server/file-observer/index.test.ts
@@ -1,6 +1,6 @@
 import { mkdir, mkdtemp, rename, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join, sep } from "node:path";
+import { basename, dirname, join, sep } from "node:path";
 import { afterEach, expect, test, vi } from "vitest";
 import {
   createFileObserver,
@@ -212,51 +212,59 @@ test("observes a thousand concurrent writes and remains healthy after delete and
   const root = await createRoot();
   const directories = Array.from({ length: 20 }, (_, index) => join(root, `dir-${index}`));
   await Promise.all(directories.map((directory) => mkdir(directory)));
-  const observed = new Map<string, Set<FileChange["type"]>>();
-  const subscription = await subscribeToFileChanges(root, (error, events) => {
-    expect(error).toBeNull();
-    for (const event of events) {
-      const types = observed.get(event.path) ?? new Set();
-      types.add(event.type);
-      observed.set(event.path, types);
-    }
-  });
   const paths = Array.from({ length: 1_000 }, (_, index) =>
     join(directories[index % directories.length], `file-${index}.txt`),
   );
-
   const populatedDirectory = join(root, "populated", "nested");
-  await mkdir(populatedDirectory, { recursive: true });
   const populatedPaths = Array.from({ length: 200 }, (_, index) =>
     join(populatedDirectory, `nested-${index}.txt`),
   );
+  const removedPaths = paths.slice(0, 100);
+  const moves = directories.slice(0, 10).map((from, index) => ({
+    from,
+    to: join(root, `renamed-${index}`),
+  }));
+  const movedPaths = moves.flatMap(({ from, to }) =>
+    paths
+      .slice(100)
+      .filter((path) => dirname(path) === from)
+      .map((path) => join(to, basename(path))),
+  );
+  const sentinel = join(directories[15], "still-observed.txt");
+  const population = expectFileChanges(populatedPaths);
+  const writes = expectFileChanges(paths);
+  const deletions = expectFileChanges(removedPaths, "delete");
+  const movedFiles = expectFileChanges(movedPaths);
+  const recovery = expectFileChanges([sentinel]);
+  const subscription = await subscribeToFileChanges(root, (error, events) => {
+    expect(error).toBeNull();
+    for (const event of events) {
+      population.record(event);
+      writes.record(event);
+      deletions.record(event);
+      movedFiles.record(event);
+      recovery.record(event);
+    }
+  });
+
+  await mkdir(populatedDirectory, { recursive: true });
   await Promise.all(populatedPaths.map((path, index) => writeFile(path, `${index}`)));
-  await expect
-    .poll(() => populatedPaths.filter((path) => !observed.has(path)), { timeout: 10_000 })
-    .toEqual([]);
+  await population.complete;
 
   await Promise.all(paths.map((path, index) => writeFile(path, `${index}`)));
-  await expect
-    .poll(() => paths.filter((path) => !observed.has(path)), { timeout: 60_000 })
-    .toEqual([]);
+  await writes.complete;
 
-  const removedPaths = paths.slice(0, 100);
+  // A native watcher may recover coalesced paths through its safety audit.
+  // Completion comes from the delivered deletions, not an idle diagnostic or
+  // a deadline shorter than that recovery cycle.
   await Promise.all(removedPaths.map((path) => rm(path)));
-  await expect
-    .poll(() => removedPaths.filter((path) => !observed.get(path)?.has("delete")), {
-      timeout: 10_000,
-    })
-    .toEqual([]);
+  await deletions.complete;
 
-  for (let index = 0; index < 10; index += 1) {
-    const from = directories[index];
-    const to = join(root, `renamed-${index}`);
-    await rename(from, to);
-    await rm(to, { recursive: true, force: true });
-  }
-  const sentinel = join(directories[15], "still-observed.txt");
+  await Promise.all(moves.map(({ from, to }) => rename(from, to)));
+  await movedFiles.complete;
+  await Promise.all(moves.map(({ to }) => rm(to, { recursive: true, force: true })));
   await writeFile(sentinel, "alive");
-  await expect.poll(() => observed.has(sentinel)).toBe(true);
+  await recovery.complete;
   await subscription.unsubscribe();
 }, 90_000);
 
@@ -312,6 +320,7 @@ test("closing the observer service releases every subscription and rejects reuse
     nativeTrackedFileCount: 0,
     pendingEventCount: 0,
     pendingReconciliationWorkCount: 0,
+    pendingClassificationCount: 0,
     reconciliationInFlightCount: 0,
     reconciliationCount: 0,
     scopedReconciliationCount: 0,
@@ -360,3 +369,16 @@ async function createRoot(): Promise<string> {
   roots.add(root);
   return root;
 }
+
+function expectFileChanges(paths: string[], type?: FileChange["type"]) {
+  const pending = new Set(paths);
+  const { promise: complete, resolve } = Promise.withResolvers<void>();
+  return {
+    complete,
+    record(event: FileChange) {
+      if (type && event.type !== type) return;
+      pending.delete(event.path);
+      if (pending.size === 0) resolve();
+    },
+  };
+}
diff --git a/packages/server/src/server/file-observer/index.ts b/packages/server/src/server/file-observer/index.ts
index 785161bea5..05c9fdac50 100644
--- a/packages/server/src/server/file-observer/index.ts
+++ b/packages/server/src/server/file-observer/index.ts
@@ -29,6 +29,7 @@ export interface FileObserverDiagnostics {
   nativeTrackedFileCount: number;
   pendingEventCount: number;
   pendingReconciliationWorkCount: number;
+  pendingClassificationCount: number;
   reconciliationInFlightCount: number;
   reconciliationCount: number;
   scopedReconciliationCount: number;
@@ -120,6 +121,7 @@ class FileObserverService implements FileObserver {
     let nativeTrackedFileCount = 0;
     let pendingEventCount = 0;
     let pendingReconciliationWorkCount = 0;
+    let pendingClassificationCount = 0;
     let reconciliationInFlightCount = 0;
     for (const observation of observations) {
       const diagnostics = observation.getDiagnostics();
@@ -127,6 +129,7 @@ class FileObserverService implements FileObserver {
       nativeTrackedFileCount += diagnostics.nativeTrackedFileCount;
       pendingEventCount += diagnostics.pendingEventCount;
       pendingReconciliationWorkCount += diagnostics.pendingReconciliationWorkCount;
+      pendingClassificationCount += diagnostics.pendingClassificationCount;
       reconciliationInFlightCount += Number(diagnostics.reconciliationInFlight);
     }
     return {
@@ -135,6 +138,7 @@ class FileObserverService implements FileObserver {
       nativeTrackedFileCount,
       pendingEventCount,
       pendingReconciliationWorkCount,
+      pendingClassificationCount,
       reconciliationInFlightCount,
       ...metrics,
     };
@@ -178,6 +182,7 @@ function emptyDiagnostics(): FileObserverDiagnostics {
     nativeTrackedFileCount: 0,
     pendingEventCount: 0,
     pendingReconciliationWorkCount: 0,
+    pendingClassificationCount: 0,
     reconciliationInFlightCount: 0,
     ...createObserverMetrics(),
   };
diff --git a/packages/server/src/server/file-observer/internal/contracts.ts b/packages/server/src/server/file-observer/internal/contracts.ts
index fa7a6ddb0f..1d38e14a19 100644
--- a/packages/server/src/server/file-observer/internal/contracts.ts
+++ b/packages/server/src/server/file-observer/internal/contracts.ts
@@ -7,6 +7,7 @@ export interface ObserverMetrics extends Omit<
   | "nativeTrackedFileCount"
   | "pendingEventCount"
   | "pendingReconciliationWorkCount"
+  | "pendingClassificationCount"
   | "reconciliationInFlightCount"
 > {}
 
@@ -14,6 +15,7 @@ export interface BackendDiagnostics {
   nativeHandleCount: number;
   nativeTrackedFileCount: number;
   pendingReconciliationWorkCount: number;
+  pendingClassificationCount: number;
   reconciliationInFlight: boolean;
 }
 
diff --git a/packages/server/src/server/file-observer/internal/linux.test.ts b/packages/server/src/server/file-observer/internal/linux.test.ts
new file mode 100644
index 0000000000..3c8d6666b7
--- /dev/null
+++ b/packages/server/src/server/file-observer/internal/linux.test.ts
@@ -0,0 +1,122 @@
+import { EventEmitter } from "node:events";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+import { createFileObserver } from "../index.js";
+import { createLinuxBackend } from "./linux.js";
+import { createObserverPaths } from "./paths.js";
+
+// This backend keeps no file-level inventory and runs no periodic full-tree
+// safety audit (see the comment on MAX_QUEUED_CLASSIFICATIONS in linux.ts), so
+// a shed classification could never be recovered later the way the native
+// backend's directory audit recovers one. Overflow must fail the observation
+// loudly instead of silently dropping a create or delete.
+test("the linux backend fails the observation when the classification queue overflows", async () => {
+  const root = await mkdtemp(join(tmpdir(), "linux-classify-"));
+  const paths = createObserverPaths(process.platform);
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  let failure: Error | null = null;
+  const backend = createLinuxBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: () => {},
+      fail: (error) => {
+        // Mirror the real Observation host: a failure ends the subscription,
+        // so isActive() must flip immediately and further events must not be
+        // processed.
+        active = false;
+        failure = error;
+      },
+    },
+    paths,
+    (_directory, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event: string, onError: (error: Error) => void) => notifications.on(event, onError),
+      } as never;
+    },
+  );
+  try {
+    await backend.start();
+    // Emitted synchronously: no stat can settle before the last event lands,
+    // so the queue grows monotonically until it overflows. Once it does,
+    // isActive() flips false and the backend's own listener guard skips the
+    // rest of the burst, so it's safe to keep emitting unconditionally.
+    for (let index = 0; index < 20_000; index += 1) {
+      notifications.emit("change", "rename", `module-${index}.js`);
+    }
+    expect(active).toBe(false);
+    expect(failure).toBeInstanceOf(Error);
+    expect(failure?.message).toMatch(/exceeded \d+ queued classifications/);
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test("an ignore update drains classifications queued below the new excluded root", async () => {
+  const root = await mkdtemp(join(tmpdir(), "linux-ignore-queue-"));
+  const ignored = join(root, "generated");
+  await mkdir(ignored);
+  const tracked = join(root, "tracked.txt");
+  await writeFile(tracked, "tracked");
+  // The backend is injected for deterministic queue admission, but its real
+  // temporary root uses the host filesystem's path format.
+  const paths = createObserverPaths(process.platform);
+  let onRootChange: ((eventType: string, filename: string | null) => void) | null = null;
+  const observer = createFileObserver();
+  let active = true;
+  let ignoreGenerated = false;
+  const delivered: string[] = [];
+  const backend = createLinuxBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: (path) => ignoreGenerated && paths.isInside(ignored, path),
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => {
+        if (type === "create") delivered.push(path);
+      },
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (directory, listener) => {
+      if (directory === root) onRootChange = listener;
+      return {
+        close: () => {},
+        on: () => {},
+      } as never;
+    },
+  );
+  try {
+    await backend.start();
+    delivered.length = 0;
+    for (let index = 0; index < 6_000; index += 1) {
+      onRootChange?.("rename", `generated/file-${index}.js`);
+    }
+    onRootChange?.("rename", "tracked.txt");
+    expect(backend.getDiagnostics().pendingClassificationCount).toBeGreaterThan(0);
+    ignoreGenerated = true;
+    await backend.updateIgnore();
+    expect(backend.getDiagnostics().pendingClassificationCount).toBeLessThanOrEqual(1);
+    await expect.poll(() => delivered.includes(tracked)).toBe(true);
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/file-observer/internal/linux.ts b/packages/server/src/server/file-observer/internal/linux.ts
index 70b1e549b1..d67517a006 100644
--- a/packages/server/src/server/file-observer/internal/linux.ts
+++ b/packages/server/src/server/file-observer/internal/linux.ts
@@ -7,22 +7,46 @@ import { isMissingPathError, toError } from "./paths.js";
 
 const MAX_WATCHED_DIRECTORIES = 5_000;
 const RECONCILIATION_DELAY_MS = 50;
+// fs.stat runs on the libuv threadpool, which is four threads and shared by the
+// whole daemon. One stat per native event pins it and unrelated filesystem work
+// stalls. The concurrency limit bounds that.
+//
+// Unlike the native backend, this backend keeps no file-level inventory
+// (nativeTrackedFileCount is always 0, and its own reconcile() diffs
+// directories, never files) and runs no periodic full-tree safety audit. A
+// classification shed here can never be recovered later, so overflow must
+// fail the observation loudly instead of silently dropping a create or
+// delete. WorkspaceGit already handles this failure mode: it catches the
+// existing MAX_WATCHED_DIRECTORIES overflow and falls back to bounded
+// polling. The cap is generous — it should only trip under genuine
+// pathology, not an ordinary large burst.
+const MAX_CONCURRENT_CLASSIFICATIONS = 32;
+const MAX_QUEUED_CLASSIFICATIONS = 16_384;
 
 interface DirectorySnapshot {
   directories: Set<string>;
   filesDiscoveredBeforeCoverage: Set<string>;
 }
 
+type WatchDirectory = (
+  directory: string,
+  listener: (eventType: string, filename: string | null) => void,
+) => FSWatcher;
+
+const watchDirectory: WatchDirectory = (directory, listener) => watch(directory, listener);
+
 export function createLinuxBackend(
   host: ObservationHost,
   paths: ObserverPaths,
+  observe: WatchDirectory = watchDirectory,
 ): ObservationBackend {
-  return new LinuxBackend(host, paths);
+  return new LinuxBackend(host, paths, observe);
 }
 
 class LinuxBackend implements ObservationBackend {
   private readonly watchers = new Map<string, FSWatcher>();
   private readonly classifications = new Set<Promise<void>>();
+  private readonly classificationQueue: Array<{ path: string }> = [];
   private readonly pendingScopes = new Set<string>();
   private reconcileTail: Promise<void> = Promise.resolve();
   private queueDepth = 0;
@@ -33,6 +57,7 @@ class LinuxBackend implements ObservationBackend {
   constructor(
     private readonly host: ObservationHost,
     private readonly paths: ObserverPaths,
+    private readonly observe: WatchDirectory,
   ) {}
 
   async start(): Promise<void> {
@@ -41,6 +66,8 @@ class LinuxBackend implements ObservationBackend {
   }
 
   async updateIgnore(): Promise<void> {
+    this.discardIgnoredClassifications();
+    const inFlight = [...this.classifications];
     for (const [directory, watcher] of this.watchers) {
       if (directory !== this.host.root && this.host.isIgnored(directory)) {
         watcher.close();
@@ -49,6 +76,7 @@ class LinuxBackend implements ObservationBackend {
     }
     this.cancelQueued();
     await this.enqueue([this.host.root]);
+    await Promise.allSettled(inFlight);
   }
 
   close(): Promise<void> {
@@ -67,14 +95,17 @@ class LinuxBackend implements ObservationBackend {
       pendingReconciliationWorkCount:
         this.pendingScopes.size +
         this.classifications.size +
+        this.classificationQueue.length +
         this.queueDepth +
         Number(this.timer !== null),
+      pendingClassificationCount: this.classifications.size + this.classificationQueue.length,
       reconciliationInFlight: this.inFlight,
     };
   }
 
   private async finishClose(): Promise<void> {
     await this.reconcileTail;
+    this.classificationQueue.length = 0;
     await Promise.allSettled(this.classifications);
     for (const watcher of this.watchers.values()) watcher.close();
     this.watchers.clear();
@@ -90,7 +121,7 @@ class LinuxBackend implements ObservationBackend {
         `Recursive file observation exceeded ${MAX_WATCHED_DIRECTORIES} directories under ${this.host.root}`,
       );
     }
-    const watcher = watch(directory, (eventType, filename) => {
+    const watcher = this.observe(directory, (eventType, filename) => {
       if (!this.host.isActive()) return;
       const path = filename ? resolve(directory, filename.toString()) : directory;
       if (!this.host.isIgnored(path)) {
@@ -247,6 +278,45 @@ class LinuxBackend implements ObservationBackend {
   }
 
   private classify(path: string): void {
+    if (this.classificationQueue.length >= MAX_QUEUED_CLASSIFICATIONS) {
+      // This backend has no file-level inventory and no full-tree safety
+      // audit to fall back on (see the comment on MAX_QUEUED_CLASSIFICATIONS
+      // above), so a shed here would silently and permanently lose this
+      // create/delete. Fail loudly instead, the same degradation path as
+      // MAX_WATCHED_DIRECTORIES overflow.
+      this.host.fail(
+        new Error(
+          `Recursive file observation exceeded ${MAX_QUEUED_CLASSIFICATIONS} queued classifications under ${this.host.root}`,
+        ),
+      );
+      return;
+    }
+    this.classificationQueue.push({ path });
+    this.pumpClassifications();
+  }
+
+  private discardIgnoredClassifications(): void {
+    let kept = 0;
+    for (const classification of this.classificationQueue) {
+      if (!this.host.isIgnored(classification.path)) {
+        this.classificationQueue[kept++] = classification;
+      }
+    }
+    this.classificationQueue.length = kept;
+  }
+
+  private pumpClassifications(): void {
+    while (
+      this.classifications.size < MAX_CONCURRENT_CLASSIFICATIONS &&
+      this.classificationQueue.length > 0
+    ) {
+      const next = this.classificationQueue.shift();
+      if (!next) return;
+      this.startClassification(next.path);
+    }
+  }
+
+  private startClassification(path: string): void {
     this.host.metrics.nativeClassificationCount += 1;
     let classification!: Promise<void>;
     classification = stat(path)
@@ -258,7 +328,10 @@ class LinuxBackend implements ObservationBackend {
         }
         this.host.fail(toError(error));
       })
-      .finally(() => this.classifications.delete(classification));
+      .finally(() => {
+        this.classifications.delete(classification);
+        if (this.host.isActive()) this.pumpClassifications();
+      });
     this.classifications.add(classification);
   }
 
diff --git a/packages/server/src/server/file-observer/internal/native-recursive.test.ts b/packages/server/src/server/file-observer/internal/native-recursive.test.ts
new file mode 100644
index 0000000000..12ab1b18f3
--- /dev/null
+++ b/packages/server/src/server/file-observer/internal/native-recursive.test.ts
@@ -0,0 +1,489 @@
+import { EventEmitter } from "node:events";
+import { writeFileSync } from "node:fs";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test, vi } from "vitest";
+import { createFileObserver, type FileChange } from "../index.js";
+import { createNativeRecursiveBackend } from "./native-recursive.js";
+import { createObserverPaths } from "./paths.js";
+
+// Native watchers may coalesce file removals into change notifications. Keep the
+// filesystem real while controlling which notifications reach reconciliation.
+test.each(["existing", "new"])(
+  "shallow scans recover coalesced deletes of %s files in nested scopes",
+  async (population) => {
+    const root = await mkdtemp(join(tmpdir(), "native-scopes-"));
+    const paths = createObserverPaths(process.platform);
+    const removed = [
+      join(root, "root.txt"),
+      join(root, "child", "child.txt"),
+      join(root, "child", "deep", "deep.txt"),
+    ];
+    await mkdir(join(root, "child", "deep"), { recursive: true });
+    if (population === "existing") {
+      await Promise.all(removed.map((path) => writeFile(path, "before")));
+    }
+    const events: FileChange[] = [];
+    const notifications = new EventEmitter();
+    let active = true;
+    const observer = createFileObserver();
+    const backend = createNativeRecursiveBackend(
+      {
+        root,
+        metrics: observer.getDiagnostics(),
+        isActive: () => active,
+        isIgnored: () => false,
+        isPathInside: paths.isInside,
+        queueEvent: (type, path) => events.push({ type, path }),
+        fail: (error) => {
+          throw error;
+        },
+      },
+      paths,
+      (_root, listener) => {
+        notifications.on("change", listener);
+        return {
+          close: () => {
+            notifications.removeAllListeners();
+          },
+          on: (event, onError) => notifications.on(event, onError),
+        };
+      },
+    );
+    try {
+      await backend.start();
+      if (population === "new") {
+        await Promise.all(removed.map((path) => writeFile(path, "before")));
+        for (const path of removed) notifications.emit("change", "change", path);
+      }
+      await Promise.all(removed.map((path) => rm(path)));
+      vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "performance"] });
+      for (const path of removed) notifications.emit("change", "change", path);
+      await vi.advanceTimersByTimeAsync(8_000);
+      vi.useRealTimers();
+      await expect
+        .poll(() =>
+          events
+            .filter((event) => event.type === "delete")
+            .map((event) => event.path)
+            .sort(),
+        )
+        .toEqual([...removed].sort());
+    } finally {
+      vi.useRealTimers();
+      active = false;
+      await backend.close();
+      await observer.close();
+      await rm(root, { recursive: true, force: true });
+    }
+  },
+);
+
+test("a file announced only as changed remains visible to coalesced deletion scans", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-change-only-"));
+  const directory = join(root, "nested");
+  await mkdir(directory);
+  const paths = createObserverPaths(process.platform);
+  const events: FileChange[] = [];
+  const notifications = new EventEmitter();
+  let active = true;
+  const observer = createFileObserver();
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => events.push({ type, path }),
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  try {
+    await backend.start();
+    const path = join(directory, "changed.txt");
+    await writeFile(path, "created");
+    notifications.emit("change", "change", path);
+    await expect.poll(() => backend.getDiagnostics().nativeTrackedFileCount).toBe(1);
+
+    await rm(path);
+    notifications.emit("change", "change", directory);
+    await expect
+      .poll(() => events.filter((event) => event.type === "delete"), { timeout: 10_000 })
+      .toEqual([{ path, type: "delete" }]);
+  } finally {
+    vi.useRealTimers();
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test("a native ignore update drains classifications queued below the new excluded root", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-ignore-queue-"));
+  const ignored = join(root, "generated");
+  await mkdir(ignored);
+  const tracked = join(root, "tracked.txt");
+  await writeFile(tracked, "tracked");
+  const paths = createObserverPaths(process.platform);
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  let ignoreGenerated = false;
+  const delivered: string[] = [];
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: (path) => ignoreGenerated && paths.isInside(ignored, path),
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => {
+        if (type === "create") delivered.push(path);
+      },
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  try {
+    await backend.start();
+    for (let index = 0; index < 2_000; index += 1) {
+      notifications.emit("change", "rename", join(ignored, `file-${index}.js`));
+    }
+    notifications.emit("change", "rename", tracked);
+    expect(backend.getDiagnostics().pendingClassificationCount).toBeGreaterThan(0);
+    ignoreGenerated = true;
+    await backend.updateIgnore();
+    expect(backend.getDiagnostics().pendingClassificationCount).toBeLessThanOrEqual(1);
+    await expect.poll(() => delivered.includes(tracked)).toBe(true);
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+// One fs.stat per native event is how a single dependency install pins the
+// libuv threadpool and the daemon stops answering.
+test("a rename burst does not spawn one stat per event", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-classify-"));
+  const paths = createObserverPaths(process.platform);
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: () => {},
+      fail: () => {},
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  try {
+    await backend.start();
+    // Emitted synchronously: no stat can settle before the last event lands.
+    for (let index = 0; index < 5_000; index += 1) {
+      notifications.emit("change", "rename", join(root, `package-${index}`, "index.js"));
+    }
+    expect(backend.getDiagnostics().pendingClassificationCount).toBeLessThanOrEqual(2_080);
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+// The shed path is only safe because this backend has a real files/entries
+// inventory to diff against. Prove it does the work: force a shed onto an
+// already-tracked directory and confirm the create still surfaces.
+test("a classification shed onto the scoped audit still recovers the file", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-shed-"));
+  const paths = createObserverPaths(process.platform);
+  const shedDirectory = join(root, "shed");
+  await mkdir(shedDirectory);
+  const events: FileChange[] = [];
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => events.push({ type, path }),
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  try {
+    await backend.start(); // The initial full audit tracks "shed" as known.
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "performance"] });
+
+    // Jam the queue exactly as in the burst test above: 32 in flight, 2,048
+    // queued, all against a directory that never existed.
+    const fillerDirectory = join(root, "filler");
+    for (let index = 0; index < 2_048 + 32; index += 1) {
+      notifications.emit("change", "rename", join(fillerDirectory, `file-${index}.js`));
+    }
+    expect(backend.getDiagnostics().pendingClassificationCount).toBe(2_080);
+
+    // A real file lands in the already-tracked "shed" directory while the
+    // queue is full, so this event must be shed rather than stat-ed. Written
+    // synchronously so no queued stat can settle and free a slot before this
+    // event is classified -- that would let it enqueue normally instead of
+    // exercising the shed branch.
+    const shedPath = join(shedDirectory, "recovered.txt");
+    writeFileSync(shedPath, "content");
+    notifications.emit("change", "rename", shedPath);
+
+    // 2s clears the mandatory-audit deadline (500ms quiet / 5s max-dirty)
+    // that the shed forces by adding "shed" to localScopes, but stays well
+    // under the optional-only deadline (8s) that the ambient per-event
+    // change-scope audit alone would use. Every event -- shed or not --
+    // already schedules that ambient audit, so advancing 8s would recover
+    // this file even if the shed branch were a no-op. The short window is
+    // what actually proves the shed's own requestAudit call did the work.
+    await vi.advanceTimersByTimeAsync(2_000);
+    vi.useRealTimers();
+
+    await expect
+      .poll(() => events.some((event) => event.type === "create" && event.path === shedPath))
+      .toBe(true);
+  } finally {
+    vi.useRealTimers();
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+// C1 regression: removeSubtree unlinks its root from the parent's
+// DirectoryEntry as part of tearing down the old subtree. reconcileSubtree
+// re-populates the index below `directory` via mergeInventory but must also
+// re-link `directory` itself back into its parent -- walkSubtree only
+// descends through that link, so without the re-link a later ancestor
+// removal can no longer reach anything below the reconciled directory.
+test("a recursive-scope reconcile re-links its directory so an ancestor removal still finds nested files", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-relink-"));
+  const paths = createObserverPaths(process.platform);
+  const deepDirectory = join(root, "a", "b", "c");
+  const deepFile = join(deepDirectory, "deep.txt");
+  await mkdir(deepDirectory, { recursive: true });
+  await writeFile(deepFile, "content");
+  const events: FileChange[] = [];
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => events.push({ type, path }),
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  const settled = () =>
+    expect
+      .poll(
+        () => {
+          const diagnostics = backend.getDiagnostics();
+          return (
+            diagnostics.pendingReconciliationWorkCount === 0 && !diagnostics.reconciliationInFlight
+          );
+        },
+        { timeout: 10_000 },
+      )
+      .toBe(true);
+  try {
+    await backend.start(); // Tracks a, a/b, a/b/c, and deep.txt.
+
+    // A rename event landing on the already-known directory a/b produces a
+    // local scope on its parent "a" (rebuilding a's DirectoryEntry from a
+    // fresh shallow scan) and, once classify()'s real stat() confirms a/b is
+    // still a directory, a recursive scope on a/b itself -- the same "known
+    // directory changes in place" shape the directory-churn benchmark
+    // exercises via atomic replace.
+    notifications.emit("change", "rename", join(root, "a", "b"));
+    await settled();
+
+    // Remove the ancestor while the native event names only a deleted file.
+    // The scoped scan must report its missing directory as well as that file.
+    await rm(join(root, "a"), { recursive: true, force: true });
+    notifications.emit("change", "rename", deepFile);
+    await settled();
+
+    expect(events.filter((event) => event.type === "delete").map((event) => event.path)).toContain(
+      deepFile,
+    );
+    expect(events).toContainEqual({ type: "delete", path: deepDirectory });
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 15_000);
+
+test("a full native inventory audit reports a removed directory", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-full-audit-"));
+  const directory = join(root, "removed");
+  await mkdir(directory);
+  await writeFile(join(directory, "tracked.txt"), "before");
+  const paths = createObserverPaths(process.platform);
+  const events: FileChange[] = [];
+  const observer = createFileObserver();
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => true,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => events.push({ type, path }),
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    () => ({ close: () => {}, on: () => {} }),
+  );
+  try {
+    await backend.start();
+    await rm(directory, { recursive: true, force: true });
+    await backend.updateIgnore(); // Uses the same full inventory diff as the safety audit.
+    expect(events).toContainEqual({ type: "delete", path: directory });
+  } finally {
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+// I2 regression: startClassification queues an unconditional "create" event
+// before onPresent runs. When a file's parent directory has no entries
+// bucket yet (a coalesced directory-creation event that never arrived),
+// declining to track the path at all announces a create it can never
+// retract -- no future scan can rediscover a path that is already gone from
+// disk to emit its matching delete.
+test("a file classified with no parent bucket yet still gets its delete emitted", async () => {
+  const root = await mkdtemp(join(tmpdir(), "native-orphan-"));
+  const paths = createObserverPaths(process.platform);
+  const newDirectory = join(root, "newdir");
+  const events: FileChange[] = [];
+  const notifications = new EventEmitter();
+  const observer = createFileObserver();
+  let active = true;
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: observer.getDiagnostics(),
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => events.push({ type, path }),
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+    (_root, listener) => {
+      notifications.on("change", listener);
+      return {
+        close: () => notifications.removeAllListeners(),
+        on: (event, onError) => notifications.on(event, onError),
+      };
+    },
+  );
+  try {
+    await backend.start(); // Tracks the (empty) root only.
+
+    // A brand-new directory with no directory-created event processed for
+    // it yet (coalesced away) has no entries bucket: entries.get(scope) is
+    // undefined for a file inside it.
+    await mkdir(newDirectory);
+    const filePath = join(newDirectory, "orphan.txt");
+    await writeFile(filePath, "content");
+    notifications.emit("change", "rename", filePath);
+
+    // The file must stay tracked so a later removal can still find and
+    // retract the create that startClassification already queued.
+    await expect.poll(() => backend.getDiagnostics().nativeTrackedFileCount).toBe(1);
+    expect(events.some((event) => event.type === "create" && event.path === filePath)).toBe(true);
+
+    // Remove the whole directory before any audit ever scans it. Nothing
+    // will see filePath as "on disk and gone from a known listing" through
+    // the normal directory-scan diff, since newdir never had one.
+    await rm(newDirectory, { recursive: true, force: true });
+
+    await expect
+      .poll(() => events.some((event) => event.type === "delete" && event.path === filePath), {
+        timeout: 10_000,
+      })
+      .toBe(true);
+    expect(backend.getDiagnostics().nativeTrackedFileCount).toBe(0);
+  } finally {
+    active = false;
+    await backend.close();
+    await observer.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/file-observer/internal/native-recursive.ts b/packages/server/src/server/file-observer/internal/native-recursive.ts
index e5ef077535..4df86d7745 100644
--- a/packages/server/src/server/file-observer/internal/native-recursive.ts
+++ b/packages/server/src/server/file-observer/internal/native-recursive.ts
@@ -1,4 +1,4 @@
-import { type Dirent, type FSWatcher, watch } from "node:fs";
+import { type Dirent, watch } from "node:fs";
 import { readdir, stat } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import type { BackendDiagnostics, ObservationBackend, ObservationHost } from "./contracts.js";
@@ -6,6 +6,12 @@ import type { ObserverPaths } from "./paths.js";
 import { isMissingPathError, toError } from "./paths.js";
 
 const MAX_TRACKED_ENTRIES = 250_000;
+// fs.stat runs on the libuv threadpool, which is four threads and shared by the
+// whole daemon. One stat per native event pins it and unrelated filesystem work
+// stalls. Beyond the queue bound, fall back to a directory scan, which finds the
+// same paths at a fraction of the cost.
+const MAX_CONCURRENT_CLASSIFICATIONS = 32;
+const MAX_QUEUED_CLASSIFICATIONS = 2_048;
 const AUDIT_QUIET_MS = 500;
 const AUDIT_MAX_DIRTY_MS = 5_000;
 const OPTIONAL_AUDIT_QUIET_MS = 8_000;
@@ -25,19 +31,42 @@ interface Inventory {
   files: Set<string>;
 }
 
+type WatchDirectory = (
+  root: string,
+  listener: (eventType: string, filename: string | null) => void,
+) => {
+  close(): void;
+  on(event: "error", listener: (error: Error) => void): unknown;
+};
+
+const watchDirectory: WatchDirectory = (root, listener) =>
+  watch(root, { recursive: true }, listener);
+
 export function createNativeRecursiveBackend(
   host: ObservationHost,
   paths: ObserverPaths,
+  observe: WatchDirectory = watchDirectory,
 ): ObservationBackend {
-  return new NativeRecursiveBackend(host, paths);
+  return new NativeRecursiveBackend(host, paths, observe);
 }
 
 class NativeRecursiveBackend implements ObservationBackend {
-  private watcher: FSWatcher | null = null;
+  private watcher: ReturnType<WatchDirectory> | null = null;
   private files = new Set<string>();
+  // Files classified before their parent directory has an entries bucket.
+  // walkSubtree can only reach files through that bucket, so these stay
+  // tracked directly until a scoped audit builds the bucket and adopts them.
+  // Bounded by every file classified within one full-audit window (up to
+  // FULL_AUDIT_MAX_DIRTY_MS, 5 minutes) whose parent never got a bucket, not
+  // by the size of the tracked set.
+  private orphanFiles = new Set<string>();
   private directories = new Set<string>();
   private entries = new Map<string, DirectoryEntry>();
   private readonly classifications = new Set<Promise<void>>();
+  private readonly classificationQueue: Array<{
+    path: string;
+    onPresent: (isDirectory: boolean) => void;
+  }> = [];
   private readonly localScopes = new Set<string>();
   private readonly changeScopes = new Set<string>();
   private readonly recursiveScopes = new Set<string>();
@@ -62,6 +91,7 @@ class NativeRecursiveBackend implements ObservationBackend {
   constructor(
     private readonly host: ObservationHost,
     private readonly paths: ObserverPaths,
+    private readonly observe: WatchDirectory,
   ) {}
 
   async start(): Promise<void> {
@@ -72,11 +102,14 @@ class NativeRecursiveBackend implements ObservationBackend {
   }
 
   async updateIgnore(): Promise<void> {
+    this.discardIgnoredClassifications();
+    const inFlight = [...this.classifications];
     this.generation += 1;
     this.cancelAudits();
     this.fullAuditRequested = true;
     this.auditQueued = true;
     await this.enqueueAudit(true, this.generation);
+    await Promise.allSettled(inFlight);
   }
 
   close(): Promise<void> {
@@ -97,24 +130,28 @@ class NativeRecursiveBackend implements ObservationBackend {
         this.changeScopes.size +
         this.recursiveScopes.size +
         this.classifications.size +
+        this.classificationQueue.length +
         this.queueDepth +
         Number(this.auditTimer !== null || this.auditQueued || this.auditDirty),
+      pendingClassificationCount: this.classifications.size + this.classificationQueue.length,
       reconciliationInFlight: this.inFlight,
     };
   }
 
   private async finishClose(): Promise<void> {
     await this.reconcileTail;
+    this.classificationQueue.length = 0;
     await Promise.allSettled(this.classifications);
     this.watcher?.close();
     this.watcher = null;
     this.files.clear();
+    this.orphanFiles.clear();
     this.directories.clear();
     this.entries.clear();
   }
 
   private watchRoot(): void {
-    const watcher = watch(this.host.root, { recursive: true }, (eventType, filename) => {
+    const watcher = this.observe(this.host.root, (eventType, filename) => {
       if (!this.host.isActive()) return;
       this.host.metrics.nativeEventCount += 1;
       if (!filename) {
@@ -126,22 +163,41 @@ class NativeRecursiveBackend implements ObservationBackend {
       const path = resolve(this.host.root, filename.toString());
       if (this.host.isIgnored(path)) return;
       const scope = path === this.host.root ? this.host.root : dirname(path);
+      const knownDirectory = this.directories.has(path);
+      this.requestChangeAudit(scope);
       if (eventType === "change") {
         this.host.metrics.nativeChangeEventCount += 1;
         this.host.queueEvent("update", path);
-        this.requestChangeAudit(scope);
-        if (this.directories.has(path)) this.requestAudit(path, true);
-        return;
+        if (knownDirectory) this.requestAudit(path, true);
+        if (knownDirectory || this.files.has(path)) return;
+        // A coalesced creation can arrive only as a change. Classify unknown
+        // paths so later deletion scans can find them in the inventory.
+      } else {
+        this.host.metrics.nativeRenameEventCount += 1;
+        if (knownDirectory) this.requestAudit(scope);
       }
-      this.host.metrics.nativeRenameEventCount += 1;
-      const knownDirectory = this.directories.has(path);
       this.classify(path, (isDirectory) => {
-        if (!isDirectory) return;
+        if (!isDirectory) {
+          const entry = this.entries.get(scope);
+          if (entry) {
+            // Remember files as soon as we announce them. A coalesced delete must
+            // still be found by the next audit, even before the first directory scan.
+            this.files.add(path);
+            entry.files.add(path);
+          } else {
+            // No inventory for the parent yet. startClassification already
+            // announced this as a create, so it must stay findable for a
+            // matching delete: track it directly until a scoped audit builds
+            // the bucket and adopts it (see orphanFiles above).
+            this.files.add(path);
+            this.orphanFiles.add(path);
+            this.requestAudit(scope);
+          }
+          return;
+        }
         if (knownDirectory) this.requestAudit(path, true);
         else this.requestAudit(scope);
       });
-      this.requestChangeAudit(scope);
-      if (knownDirectory) this.requestAudit(scope);
     });
     watcher.on("error", (error) => {
       if (this.host.isActive()) this.host.fail(toError(error));
@@ -182,7 +238,10 @@ class NativeRecursiveBackend implements ObservationBackend {
       if (fullAudit) {
         const next = await this.scanTree(this.host.root);
         if (!this.canCommit(generation)) return;
-        if (emitDiff) this.queueDiff(next.files, this.files);
+        if (emitDiff) {
+          this.queueDiff(next.files, this.files);
+          this.queueRemovedDirectories(next.directories, this.directories);
+        }
         this.replaceInventory(next);
         this.lastFullAuditAt = performance.now();
         this.host.metrics.fullReconciliationCount += 1;
@@ -257,18 +316,22 @@ class NativeRecursiveBackend implements ObservationBackend {
     for (const directory of new Set(localScopes)) {
       await this.reconcileDirectory(directory, generation);
       if (!this.canCommit(generation)) return;
+      await new Promise<void>((done) => setImmediate(done));
     }
     for (const directory of new Set(recursiveScopes)) {
       await this.reconcileSubtree(directory, generation);
       if (!this.canCommit(generation)) return;
+      await new Promise<void>((done) => setImmediate(done));
     }
-    for (const directory of this.paths.collapse(changeScopes)) {
+    // Parent scans are shallow, so a queued parent cannot cover its children.
+    for (const directory of new Set(changeScopes)) {
       const alreadyCovered =
         forcedLocalScopes.has(directory) ||
         forcedRecursiveScopes.some((scope) => this.host.isPathInside(scope, directory));
       if (alreadyCovered) continue;
       await this.reconcileDirectory(directory, generation);
       if (!this.canCommit(generation)) return;
+      await new Promise<void>((done) => setImmediate(done));
     }
   }
 
@@ -301,6 +364,7 @@ class NativeRecursiveBackend implements ObservationBackend {
       if (!next.directories.has(path)) this.removeSubtree(path, true);
     }
     for (const path of next.files) {
+      this.orphanFiles.delete(path);
       if (!previous.files.has(path)) {
         this.files.add(path);
         this.host.queueEvent("create", path);
@@ -355,11 +419,23 @@ class NativeRecursiveBackend implements ObservationBackend {
     if (!this.directories.has(directory) || this.host.isIgnored(directory)) return;
     const inventory = await this.scanTree(directory);
     if (!this.canCommit(generation)) return;
-    const previousFiles = new Set(
-      [...this.files].filter((path) => this.host.isPathInside(directory, path)),
-    );
+    const previousFiles = new Set<string>();
+    for (const tracked of this.walkSubtree(directory)) {
+      const entry = this.entries.get(tracked);
+      if (!entry) continue;
+      for (const file of entry.files) previousFiles.add(file);
+    }
     this.queueDiff(inventory.files, previousFiles);
+    this.queueRemovedDirectories(inventory.directories, this.walkSubtree(directory));
     this.removeSubtree(directory, false);
+    // removeSubtree unlinks `directory` from its own parent's directories set
+    // as part of tearing down the old subtree. Mirror reconcileUnknownSubtree
+    // and re-link it, guarded on the directory still existing -- it can
+    // vanish between the `this.directories.has` check above and this scan --
+    // or walkSubtree can no longer reach anything under it from the root.
+    if (inventory.directories.has(directory)) {
+      this.entries.get(dirname(directory))?.directories.add(directory);
+    }
     this.mergeInventory(inventory, false);
   }
 
@@ -372,8 +448,16 @@ class NativeRecursiveBackend implements ObservationBackend {
     }
   }
 
+  private queueRemovedDirectories(next: Set<string>, previous: Iterable<string>): void {
+    for (const directory of previous) {
+      if (!next.has(directory)) this.host.queueEvent("delete", directory);
+    }
+  }
+
   private replaceInventory(inventory: Inventory): void {
     this.files = inventory.files;
+    // A full scan gives every existing file a directory-index home.
+    this.orphanFiles.clear();
     this.directories = inventory.directories;
     this.entries = inventory.entries;
   }
@@ -382,6 +466,7 @@ class NativeRecursiveBackend implements ObservationBackend {
     for (const directory of inventory.directories) this.directories.add(directory);
     for (const [directory, entry] of inventory.entries) this.entries.set(directory, entry);
     for (const path of inventory.files) {
+      this.orphanFiles.delete(path);
       const added = !this.files.has(path);
       this.files.add(path);
       if (emitCreates && added) this.host.queueEvent("create", path);
@@ -389,17 +474,50 @@ class NativeRecursiveBackend implements ObservationBackend {
     this.assertWithinLimit(this.files.size + this.directories.size);
   }
 
+  // Depends on the invariant that every tracked directory has an `entries`
+  // bucket, and that `this.directories` and `this.entries` are written and
+  // cleared together. A root with no bucket yields nothing here, which makes
+  // `removeSubtree` a near no-op for that root — it deletes nothing from
+  // `entries`/`directories` and only cleans up matching `orphanFiles` — so
+  // nothing enforces the invariant beyond this comment.
+  private *walkSubtree(root: string): Generator<string> {
+    const stack = [root];
+    while (stack.length > 0) {
+      const directory = stack.pop();
+      if (directory === undefined) continue;
+      const entry = this.entries.get(directory);
+      if (!entry) continue;
+      yield directory;
+      for (const child of entry.directories) stack.push(child);
+    }
+  }
+
   private removeSubtree(root: string, emitDeletes: boolean): void {
-    for (const path of this.files) {
-      if (!this.host.isPathInside(root, path)) continue;
-      this.files.delete(path);
-      if (emitDeletes) this.host.queueEvent("delete", path);
-    }
-    for (const directory of this.directories) {
-      if (!this.host.isPathInside(root, directory)) continue;
-      this.directories.delete(directory);
+    for (const directory of this.walkSubtree(root)) {
+      const entry = this.entries.get(directory);
+      if (entry) {
+        for (const file of entry.files) {
+          if (!this.files.delete(file)) continue;
+          if (emitDeletes) this.host.queueEvent("delete", file);
+        }
+        // A native rename can name only a deleted file. The scoped scan still
+        // knows its parent disappeared, so report that topology change too.
+        if (emitDeletes) this.host.queueEvent("delete", directory);
+      }
       this.entries.delete(directory);
+      this.directories.delete(directory);
     }
+    // Orphaned files have no directory-index home, so walkSubtree cannot
+    // find them. This set is bounded by every file classified within one
+    // full-audit window (up to FULL_AUDIT_MAX_DIRTY_MS, 5 minutes) whose
+    // parent never got a bucket, not by the tracked-set size.
+    for (const path of this.orphanFiles) {
+      if (!this.host.isPathInside(root, path)) continue;
+      this.orphanFiles.delete(path);
+      if (this.files.delete(path) && emitDeletes) this.host.queueEvent("delete", path);
+    }
+    // `root` can be a tracked file rather than a directory.
+    if (this.files.delete(root) && emitDeletes) this.host.queueEvent("delete", root);
     const parent = this.entries.get(dirname(root));
     parent?.directories.delete(root);
     parent?.files.delete(root);
@@ -556,6 +674,38 @@ class NativeRecursiveBackend implements ObservationBackend {
   }
 
   private classify(path: string, onPresent: (isDirectory: boolean) => void): void {
+    if (this.classificationQueue.length >= MAX_QUEUED_CLASSIFICATIONS) {
+      // Shed load onto the scoped audit, which reads the directory once instead
+      // of stat-ing every entry in it.
+      this.requestAudit(dirname(path));
+      return;
+    }
+    this.classificationQueue.push({ path, onPresent });
+    this.pumpClassifications();
+  }
+
+  private discardIgnoredClassifications(): void {
+    let kept = 0;
+    for (const classification of this.classificationQueue) {
+      if (!this.host.isIgnored(classification.path)) {
+        this.classificationQueue[kept++] = classification;
+      }
+    }
+    this.classificationQueue.length = kept;
+  }
+
+  private pumpClassifications(): void {
+    while (
+      this.classifications.size < MAX_CONCURRENT_CLASSIFICATIONS &&
+      this.classificationQueue.length > 0
+    ) {
+      const next = this.classificationQueue.shift();
+      if (!next) return;
+      this.startClassification(next.path, next.onPresent);
+    }
+  }
+
+  private startClassification(path: string, onPresent: (isDirectory: boolean) => void): void {
     this.host.metrics.nativeClassificationCount += 1;
     let classification!: Promise<void>;
     classification = stat(path)
@@ -571,7 +721,10 @@ class NativeRecursiveBackend implements ObservationBackend {
         }
         this.host.fail(toError(error));
       })
-      .finally(() => this.classifications.delete(classification));
+      .finally(() => {
+        this.classifications.delete(classification);
+        if (this.host.isActive()) this.pumpClassifications();
+      });
     this.classifications.add(classification);
   }
 
diff --git a/packages/server/src/server/file-observer/internal/paths.test.ts b/packages/server/src/server/file-observer/internal/paths.test.ts
new file mode 100644
index 0000000000..8399760ef6
--- /dev/null
+++ b/packages/server/src/server/file-observer/internal/paths.test.ts
@@ -0,0 +1,42 @@
+import { win32 } from "node:path";
+import { describe, expect, test } from "vitest";
+import { createObserverPaths } from "./paths.js";
+
+// m3 regression: plain lexicographic sort does not put a parent immediately
+// before its descendants. A sibling whose name extends the parent's with a
+// character that sorts below the separator (POSIX "/" = 0x2F, so "-" and "."
+// qualify) lands between them, so the single backward look collapse()
+// relies on misses the real parent and keeps a redundant descendant scope.
+// This is this repo's own layout: packages/app, packages/app-web,
+// packages/app/src.
+describe("collapse", () => {
+  test("drops a redundant descendant but keeps a sibling whose name extends the parent's", () => {
+    const paths = createObserverPaths("linux");
+    const parent = "/repo/packages/app";
+    const sibling = "/repo/packages/app-web";
+    const descendant = "/repo/packages/app/src";
+
+    expect(paths.collapse([parent, sibling, descendant]).sort()).toEqual([parent, sibling].sort());
+  });
+
+  test("keeps unrelated roots and drops nested duplicates regardless of input order", () => {
+    const paths = createObserverPaths("linux");
+    const a = "/repo/a";
+    const aChild = "/repo/a/child";
+    const b = "/repo/b";
+
+    expect(paths.collapse([aChild, b, a]).sort()).toEqual([a, b].sort());
+  });
+
+  // The selected path strategy supplies separators and case comparison, so
+  // Windows paths can be checked on every CI host.
+  test("collapses win32 paths case-insensitively even with mismatched casing", () => {
+    const paths = createObserverPaths("win32");
+    const sep = win32.sep;
+    const parent = `C:${sep}repo${sep}packages${sep}app`;
+    const sibling = `C:${sep}repo${sep}packages${sep}APP-web`;
+    const descendant = `c:${sep}repo${sep}packages${sep}app${sep}src`;
+
+    expect(paths.collapse([parent, sibling, descendant]).sort()).toEqual([parent, sibling].sort());
+  });
+});
diff --git a/packages/server/src/server/file-observer/internal/paths.ts b/packages/server/src/server/file-observer/internal/paths.ts
index 71ffffb7d2..004b7ef298 100644
--- a/packages/server/src/server/file-observer/internal/paths.ts
+++ b/packages/server/src/server/file-observer/internal/paths.ts
@@ -1,4 +1,4 @@
-import { resolve, sep } from "node:path";
+import { posix, win32 } from "node:path";
 
 export interface ObserverPaths {
   isInside(root: string, path: string): boolean;
@@ -8,6 +8,8 @@ export interface ObserverPaths {
 }
 
 export function createObserverPaths(platform: NodeJS.Platform): ObserverPaths {
+  const pathApi = platform === "win32" ? win32 : posix;
+
   function comparable(path: string): string {
     return platform === "win32" ? path.toLowerCase() : path;
   }
@@ -15,13 +17,34 @@ export function createObserverPaths(platform: NodeJS.Platform): ObserverPaths {
   function isInside(root: string, path: string): boolean {
     const comparedRoot = comparable(root);
     const comparedPath = comparable(path);
-    return comparedPath === comparedRoot || comparedPath.startsWith(`${comparedRoot}${sep}`);
+    return (
+      comparedPath === comparedRoot || comparedPath.startsWith(`${comparedRoot}${pathApi.sep}`)
+    );
   }
 
   function collapse(paths: string[]): string[] {
-    return [...new Set(paths)]
-      .sort((left, right) => left.length - right.length)
-      .filter((path, index, all) => !all.slice(0, index).some((parent) => isInside(parent, path)));
+    // Plain lexicographic sort does not put a parent immediately before its
+    // descendants: a sibling whose name extends the parent's with a
+    // character that sorts below the separator (e.g. "app" vs "app-web")
+    // lands between them. Sort on a key with the separator swapped for a
+    // character below everything instead, so "app" < "app/src" < "app-web"
+    // holds and one backward look is enough.
+    const decorated = [...new Set(paths)].map((path) => ({
+      path,
+      key: comparable(path).split(pathApi.sep).join("\0"),
+    }));
+    decorated.sort((left, right) => {
+      if (left.key < right.key) return -1;
+      if (left.key > right.key) return 1;
+      return 0;
+    });
+    const kept: string[] = [];
+    for (const { path } of decorated) {
+      const previous = kept[kept.length - 1];
+      if (previous !== undefined && isInside(previous, path)) continue;
+      kept.push(path);
+    }
+    return kept;
   }
 
   return {
@@ -29,7 +52,7 @@ export function createObserverPaths(platform: NodeJS.Platform): ObserverPaths {
     collapse,
     normalizeIgnoredRoots(root, paths) {
       const inside = paths
-        .map((path) => resolve(path))
+        .map((path) => pathApi.resolve(path))
         .filter((path) => path !== root && isInside(root, path));
       return collapse(inside);
     },
diff --git a/packages/server/src/server/file-observer/native-recursive.test.ts b/packages/server/src/server/file-observer/native-recursive.test.ts
new file mode 100644
index 0000000000..cb442729fc
--- /dev/null
+++ b/packages/server/src/server/file-observer/native-recursive.test.ts
@@ -0,0 +1,65 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { expect, test } from "vitest";
+import type { FileChange } from "./index.js";
+import { createNativeRecursiveBackend } from "./internal/native-recursive.js";
+import { createObserverPaths } from "./internal/paths.js";
+
+test("the recursive watcher remembers newly announced files before reconciliation", async () => {
+  const root = await mkdtemp(join(tmpdir(), "paseo-observer-native-"));
+  const paths = createObserverPaths(process.platform);
+  const changes: FileChange[] = [];
+  let active = true;
+  const backend = createNativeRecursiveBackend(
+    {
+      root,
+      metrics: {
+        reconciliationCount: 0,
+        scopedReconciliationCount: 0,
+        fullReconciliationCount: 0,
+        reconciliationFailureCount: 0,
+        observerFailureCount: 0,
+        directoryLimitFailureCount: 0,
+        nativeEventCount: 0,
+        nativeChangeEventCount: 0,
+        nativeRenameEventCount: 0,
+        nativePathlessEventCount: 0,
+        nativeClassificationCount: 0,
+        nativeShallowScanCount: 0,
+        lastReconciliationDurationMs: 0,
+        maxReconciliationDurationMs: 0,
+      },
+      isActive: () => active,
+      isIgnored: () => false,
+      isPathInside: paths.isInside,
+      queueEvent: (type, path) => {
+        changes.push({ type, path });
+      },
+      fail: (error) => {
+        throw error;
+      },
+    },
+    paths,
+  );
+  try {
+    await backend.start();
+    const path = join(root, "new.txt");
+    await writeFile(path, "created");
+    await expect
+      .poll(() => changes.some((event) => event.path === path && event.type === "create"))
+      .toBe(true);
+    // Consumers have seen this file. A later audit needs it in its comparison
+    // inventory even if the native watcher coalesces the subsequent delete.
+    expect(backend.getDiagnostics().nativeTrackedFileCount).toBe(1);
+    await rm(path);
+    await backend.updateIgnore();
+    await expect
+      .poll(() => changes.some((event) => event.path === path && event.type === "delete"))
+      .toBe(true);
+  } finally {
+    active = false;
+    await backend.close();
+    await rm(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/file-upload/index.test.ts b/packages/server/src/server/file-upload/index.test.ts
index b338d7dd1c..8761529ec6 100644
--- a/packages/server/src/server/file-upload/index.test.ts
+++ b/packages/server/src/server/file-upload/index.test.ts
@@ -1,6 +1,6 @@
-import { existsSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 
 import {
@@ -37,14 +37,14 @@ describe("file uploads", () => {
     await expect(uploads.receiveFrame(uploadChunk("req-upload", "hello"))).resolves.toBeNull();
     await expect(uploads.receiveFrame(uploadChunk("req-upload", " world"))).resolves.toBeNull();
 
-    const path = join(paseoHome, "uploads", "upload_req-upload", "notes.txt");
+    const path = uploadedPath(paseoHome, "notes.txt");
     await expect(uploads.receiveFrame(uploadEnds("req-upload"))).resolves.toEqual({
       type: "file.upload.response",
       payload: {
         requestId: "req-upload",
         file: {
           type: "uploaded_file",
-          id: "upload_req-upload",
+          id: expect.any(String),
           fileName: "notes.txt",
           mimeType: "text/plain",
           size: 11,
@@ -56,6 +56,49 @@ describe("file uploads", () => {
     expect(readFileSync(path, "utf8")).toBe("hello world");
   });
 
+  it("keeps the original file name for non-ASCII and punctuated names", async () => {
+    const uploads = new FileUploadStore({ paseoHome: makePaseoHome() });
+
+    for (const fileName of [
+      "2026年9月绩效计划表.xlsx",
+      "테스트 파일 (1).xlsx",
+      "résumé [final] & notes, v2.pdf",
+      "cafe\u0301 हिंदी.txt",
+    ]) {
+      const file = await uploadNamed(uploads, fileName);
+      expect(file?.fileName).toBe(fileName);
+      expect(basename(file!.path)).toBe(fileName);
+      expect(readFileSync(file!.path, "utf8")).toBe("hello world");
+    }
+  });
+
+  it("replaces path separators, control characters, and characters Windows rejects", async () => {
+    const uploads = new FileUploadStore({ paseoHome: makePaseoHome() });
+
+    await expect(uploadNamed(uploads, "../../etc/passwd")).resolves.toMatchObject({
+      fileName: "passwd",
+    });
+    const backslashed = await uploadNamed(uploads, "dir\\name.txt");
+    expect(backslashed?.fileName).not.toContain("\\");
+    expect(backslashed?.fileName).toMatch(/name\.txt$/);
+    await expect(uploadNamed(uploads, 'a<b>:"c|?*.txt')).resolves.toMatchObject({
+      fileName: "a_b___c___.txt",
+    });
+    await expect(uploadNamed(uploads, "line\nbreak.txt")).resolves.toMatchObject({
+      fileName: "line_break.txt",
+    });
+  });
+
+  it("shortens a long non-ASCII name to the file system limit and keeps its extension", async () => {
+    const uploads = new FileUploadStore({ paseoHome: makePaseoHome() });
+
+    const file = await uploadNamed(uploads, `${"绩".repeat(100)}.xlsx`);
+
+    expect(file?.fileName).toBe(`${"绩".repeat(83)}.xlsx`);
+    expect(Buffer.byteLength(file!.fileName)).toBeLessThanOrEqual(255);
+    expect(readFileSync(file!.path, "utf8")).toBe("hello world");
+  });
+
   it("rejects chunks beyond the declared size and removes the partial file", async () => {
     const paseoHome = makePaseoHome();
     const uploads = new FileUploadStore({ paseoHome });
@@ -70,8 +113,8 @@ describe("file uploads", () => {
     });
     await expect(uploads.receiveFrame(uploadBegins("req-overflow"))).resolves.toBeNull();
 
-    const uploadDir = join(paseoHome, "uploads", "upload_req-overflow");
-    const path = join(uploadDir, "notes.txt");
+    const path = uploadedPath(paseoHome, "notes.txt");
+    const uploadDir = dirname(path);
     await expect(uploads.receiveFrame(uploadChunk("req-overflow", "hello!"))).resolves.toEqual({
       type: "file.upload.response",
       payload: {
@@ -106,9 +149,7 @@ describe("file uploads", () => {
 
     expect(results.slice(0, 3)).toEqual([null, null, null]);
     expect(results[3]?.payload.error).toBeNull();
-    expect(readFileSync(join(paseoHome, "uploads", "upload_req-queued", "notes.txt"), "utf8")).toBe(
-      "hello world",
-    );
+    expect(readFileSync(uploadedPath(paseoHome, "notes.txt"), "utf8")).toBe("hello world");
   });
 
   it("replaces duplicate upload starts without letting the old stale timeout evict the replacement", async () => {
@@ -139,16 +180,16 @@ describe("file uploads", () => {
     });
     await vi.advanceTimersByTimeAsync(30);
 
-    const path = join(paseoHome, "uploads", "upload_req-duplicate_2", "new.txt");
     await expect(uploads.receiveFrame(uploadBegins("req-duplicate"))).resolves.toBeNull();
     await expect(uploads.receiveFrame(uploadChunk("req-duplicate", "new"))).resolves.toBeNull();
+    const path = uploadedPath(paseoHome, "new.txt");
     await expect(uploads.receiveFrame(uploadEnds("req-duplicate"))).resolves.toEqual({
       type: "file.upload.response",
       payload: {
         requestId: "req-duplicate",
         file: {
           type: "uploaded_file",
-          id: "upload_req-duplicate_2",
+          id: expect.any(String),
           fileName: "new.txt",
           mimeType: "text/plain",
           size: 3,
@@ -184,14 +225,14 @@ describe("file uploads", () => {
       uploads.receiveFrame(uploadChunk("req-slow-active", " world")),
     ).resolves.toBeNull();
 
-    const path = join(paseoHome, "uploads", "upload_req-slow-active", "notes.txt");
+    const path = uploadedPath(paseoHome, "notes.txt");
     await expect(uploads.receiveFrame(uploadEnds("req-slow-active"))).resolves.toEqual({
       type: "file.upload.response",
       payload: {
         requestId: "req-slow-active",
         file: {
           type: "uploaded_file",
-          id: "upload_req-slow-active",
+          id: expect.any(String),
           fileName: "notes.txt",
           mimeType: "text/plain",
           size: 11,
@@ -204,6 +245,25 @@ describe("file uploads", () => {
   });
 });
 
+let uploadCount = 0;
+
+async function uploadNamed(uploads: FileUploadStore, fileName: string) {
+  const requestId = `req-named-${uploadCount++}`;
+  uploads.beginUpload({
+    type: "file.upload.request",
+    fileName,
+    mimeType: "text/plain",
+    size: 11,
+    modifiedAt: "2026-05-02T00:00:00.000Z",
+    requestId,
+  });
+  await uploads.receiveFrame(uploadBegins(requestId));
+  await uploads.receiveFrame(uploadChunk(requestId, "hello world"));
+  const response = await uploads.receiveFrame(uploadEnds(requestId));
+  expect(response?.payload.error).toBeNull();
+  return response?.payload.file;
+}
+
 function makePaseoHome(): string {
   const root = realpathSync(mkdtempSync(join(tmpdir(), "file-upload-test-")));
   tempDirs.push(root);
@@ -252,3 +312,12 @@ function decodeUploadFrame(bytes: Uint8Array): FileTransferFrame {
   }
   return frame;
 }
+
+function uploadedPath(paseoHome: string, fileName: string): string {
+  const root = join(paseoHome, "uploads");
+  const file = readdirSync(root)
+    .map((id) => join(root, id, fileName))
+    .find((candidate) => existsSync(candidate));
+  if (!file) throw new Error(`Upload file ${fileName} is missing`);
+  return file;
+}
diff --git a/packages/server/src/server/file-upload/index.ts b/packages/server/src/server/file-upload/index.ts
index 929e8e8a52..979130d875 100644
--- a/packages/server/src/server/file-upload/index.ts
+++ b/packages/server/src/server/file-upload/index.ts
@@ -1,5 +1,6 @@
+import { randomUUID } from "node:crypto";
 import { appendFile, mkdir, rm, writeFile } from "node:fs/promises";
-import { basename, join } from "node:path";
+import { basename, extname, join } from "node:path";
 
 import { FileTransferOpcode, type FileTransferFrame } from "@getpaseo/protocol/binary-frames/index";
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
@@ -13,7 +14,9 @@ interface FileUploadStoreOptions {
 interface PendingUpload {
   requestId: string;
   id: string;
-  attempt: number;
+  source: object;
+  completed: boolean;
+  finished(response: FileUploadResponse | null): void;
   fileName: string;
   mimeType: string;
   size: number;
@@ -22,6 +25,7 @@ interface PendingUpload {
   started: boolean;
   staleTimeout: ReturnType<typeof setTimeout>;
   queue: Promise<void>;
+  cleanup?: Promise<void>;
 }
 
 export class FileUploadStore {
@@ -29,7 +33,8 @@ export class FileUploadStore {
 
   private readonly paseoHome: string;
   private readonly staleUploadTimeoutMs: number;
-  private readonly pending = new Map<string, PendingUpload>();
+  private readonly defaultSource = {};
+  private readonly pending = new Map<object, Map<string, PendingUpload>>();
 
   constructor(options: FileUploadStoreOptions) {
     this.paseoHome = options.paseoHome;
@@ -37,41 +42,55 @@ export class FileUploadStore {
       options.staleUploadTimeoutMs ?? FileUploadStore.defaultStaleUploadTimeoutMs;
   }
 
-  beginUpload(request: FileUploadRequest): void {
-    const existingUpload = this.pending.get(request.requestId);
-    if (existingUpload) {
-      this.clearPendingUpload(existingUpload);
-      void existingUpload.queue.then(() => this.removeUploadDirectory(existingUpload));
-    }
-
+  beginUpload(
+    request: FileUploadRequest,
+    source: object = this.defaultSource,
+    finished: (response: FileUploadResponse | null) => void = () => {},
+  ): () => Promise<void> {
+    const existingUpload = this.pending.get(source)?.get(request.requestId);
+    if (existingUpload) void this.cancel(existingUpload).catch(() => {});
     const fileName = sanitizeFileName(request.fileName);
-    const attempt = existingUpload ? existingUpload.attempt + 1 : 1;
-    const id = buildUploadId(request.requestId, attempt);
+    const id = `upload_${randomUUID()}`;
     const uploadDir = join(this.paseoHome, "uploads", id);
     const upload: PendingUpload = {
       requestId: request.requestId,
       id,
-      attempt,
+      source,
+      completed: false,
+      finished,
       fileName,
       mimeType: request.mimeType,
       size: request.size,
       path: join(uploadDir, fileName),
       receivedBytes: 0,
       started: false,
-      staleTimeout: this.createStaleUploadTimeout(request.requestId),
+      staleTimeout: this.createStaleUploadTimeout(source, request.requestId),
       queue: Promise.resolve(),
     };
-    this.pending.set(request.requestId, upload);
+    const uploads = this.pending.get(source) ?? new Map<string, PendingUpload>();
+    uploads.set(request.requestId, upload);
+    this.pending.set(source, uploads);
+    return () => this.cancel(upload);
   }
 
-  async receiveFrame(frame: FileTransferFrame): Promise<FileUploadResponse | null> {
-    const upload = this.pending.get(frame.requestId);
+  async receiveFrame(
+    frame: FileTransferFrame,
+    source: object = this.defaultSource,
+  ): Promise<FileUploadResponse | null> {
+    const upload = this.pending.get(source)?.get(frame.requestId);
     if (!upload) {
       return null;
     }
     this.refreshStaleUploadTimeout(upload);
 
     const operation = upload.queue.then(() => this.applyFrame(upload, frame));
+    void operation.then(
+      (response) => {
+        if (response) upload.finished(response);
+        return undefined;
+      },
+      () => upload.finished(null),
+    );
     upload.queue = operation.then(
       () => undefined,
       () => undefined,
@@ -83,7 +102,7 @@ export class FileUploadStore {
     upload: PendingUpload,
     frame: FileTransferFrame,
   ): Promise<FileUploadResponse | null> {
-    if (this.pending.get(upload.requestId) !== upload) {
+    if (this.pending.get(upload.source)?.get(upload.requestId) !== upload) {
       return null;
     }
 
@@ -132,12 +151,17 @@ export class FileUploadStore {
         `Upload size mismatch: expected ${upload.size}, received ${upload.receivedBytes}.`,
       );
     }
+    upload.completed = true;
     return buildUploadResponse(upload, null);
   }
 
-  private createStaleUploadTimeout(requestId: string): ReturnType<typeof setTimeout> {
+  private createStaleUploadTimeout(
+    source: object,
+    requestId: string,
+  ): ReturnType<typeof setTimeout> {
     const timeout = setTimeout(() => {
-      this.expireStaleUpload(requestId);
+      const upload = this.pending.get(source)?.get(requestId);
+      if (upload) void this.cancel(upload).catch(() => {});
     }, this.staleUploadTimeoutMs);
     timeout.unref?.();
     return timeout;
@@ -145,30 +169,25 @@ export class FileUploadStore {
 
   private refreshStaleUploadTimeout(upload: PendingUpload): void {
     clearTimeout(upload.staleTimeout);
-    upload.staleTimeout = this.createStaleUploadTimeout(upload.requestId);
+    upload.staleTimeout = this.createStaleUploadTimeout(upload.source, upload.requestId);
   }
 
-  private expireStaleUpload(requestId: string): void {
-    const upload = this.pending.get(requestId);
-    if (!upload) {
-      return;
-    }
+  private cancel(upload: PendingUpload): Promise<void> {
+    if (upload.cleanup) return upload.cleanup;
     this.clearPendingUpload(upload);
-    const cleanup = upload.queue.then(
-      () => this.removeUploadDirectory(upload),
-      () => this.removeUploadDirectory(upload),
-    );
-    upload.queue = cleanup.then(
-      () => undefined,
-      () => undefined,
-    );
+    upload.cleanup = upload.queue.then(async () => {
+      if (!upload.completed) await this.removeUploadDirectory(upload);
+      return undefined;
+    });
+    upload.finished(null);
+    return upload.cleanup;
   }
 
   private clearPendingUpload(upload: PendingUpload): void {
     clearTimeout(upload.staleTimeout);
-    if (this.pending.get(upload.requestId) === upload) {
-      this.pending.delete(upload.requestId);
-    }
+    const uploads = this.pending.get(upload.source);
+    if (uploads?.get(upload.requestId) === upload) uploads.delete(upload.requestId);
+    if (uploads?.size === 0) this.pending.delete(upload.source);
   }
 
   private async removeFailedUpload(upload: PendingUpload): Promise<void> {
@@ -177,9 +196,7 @@ export class FileUploadStore {
   }
 
   private async removeUploadDirectory(upload: PendingUpload): Promise<void> {
-    await rm(join(this.paseoHome, "uploads", upload.id), { recursive: true, force: true }).catch(
-      () => undefined,
-    );
+    await rm(join(this.paseoHome, "uploads", upload.id), { recursive: true, force: true });
   }
 }
 
@@ -203,18 +220,26 @@ function buildUploadResponse(upload: PendingUpload, error: string | null): FileU
   };
 }
 
-function sanitizeUploadId(value: string): string {
-  return value.replace(/[^a-zA-Z0-9._-]/g, "_") || "file";
-}
-
-function buildUploadId(requestId: string, attempt: number): string {
-  const baseId = `upload_${sanitizeUploadId(requestId)}`;
-  return attempt === 1 ? baseId : `${baseId}_${attempt}`;
-}
+// Most file systems cap a single file name at 255 bytes.
+const MAX_FILE_NAME_BYTES = 255;
 
+// Keeps the client's file name, replacing only what cannot appear in a single
+// file name on Linux, macOS, or Windows.
 function sanitizeFileName(value: string): string {
   const name = basename(value)
-    .replace(/[^a-zA-Z0-9._ -]/g, "_")
+    .replace(/[\p{Cc}\\/:*?"<>|]/gu, "_")
     .trim();
-  return name.length > 0 && name !== "." && name !== ".." ? name : "upload";
+  return fitFileNameLength(name.length > 0 && name !== "." && name !== ".." ? name : "upload");
+}
+
+function fitFileNameLength(name: string): string {
+  if (Buffer.byteLength(name) <= MAX_FILE_NAME_BYTES) return name;
+  const extension = extname(name);
+  const keptExtension = Buffer.byteLength(extension) < MAX_FILE_NAME_BYTES ? extension : "";
+  let stem = "";
+  for (const char of name.slice(0, name.length - keptExtension.length)) {
+    if (Buffer.byteLength(stem + char + keptExtension) > MAX_FILE_NAME_BYTES) break;
+    stem += char;
+  }
+  return stem + keptExtension;
 }
diff --git a/packages/server/src/server/host-name.ts b/packages/server/src/server/host-name.ts
new file mode 100644
index 0000000000..5f36dcc368
--- /dev/null
+++ b/packages/server/src/server/host-name.ts
@@ -0,0 +1,14 @@
+import { execFileSync } from "node:child_process";
+import { hostname } from "node:os";
+
+let hostName: string | undefined;
+
+// macOS's kernel hostname comes from DHCP/reverse DNS and can be "UNKNOWN";
+// ComputerName is the name the user gave the Mac.
+export function getHostName(): string {
+  hostName ??=
+    process.platform === "darwin"
+      ? execFileSync("/usr/sbin/scutil", ["--get", "ComputerName"], { encoding: "utf8" }).trim()
+      : hostname();
+  return hostName;
+}
diff --git a/packages/server/src/server/hub/daemon-executions.test.ts b/packages/server/src/server/hub/daemon-executions.test.ts
index a96dc8cfdd..d78b29d732 100644
--- a/packages/server/src/server/hub/daemon-executions.test.ts
+++ b/packages/server/src/server/hub/daemon-executions.test.ts
@@ -1,3 +1,7 @@
+import type { AgentClient } from "../agent/agent-sdk-types.js";
+import { validateProviderOptions } from "../agent/provider-options.js";
+import { CodexProviderOptionsSchema } from "../agent/providers/codex/options.js";
+import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
 import { afterEach, expect, test } from "vitest";
 import { HubRelationshipHarness } from "./test-utils/relationship-harness.js";
 
@@ -8,8 +12,12 @@ afterEach(async () => {
   relationship = null;
 });
 
-async function launchRelationship(): Promise<HubRelationshipHarness> {
-  const launched = await HubRelationshipHarness.start();
+async function launchRelationship(
+  clients?: Record<string, AgentClient>,
+): Promise<HubRelationshipHarness> {
+  const launched = clients
+    ? await HubRelationshipHarness.startWithRealAgentClients(clients)
+    : await HubRelationshipHarness.start();
   await launched.beginConnect().result;
   launched.connectLatestSocket();
   relationship = launched;
@@ -127,8 +135,22 @@ test("Hub can preapprove only tools on MCP servers injected in the same request"
   expect(hub.providerCreations()).toBe(0);
 });
 
-test("Hub returns path-specific structured provider option feedback", async () => {
-  const hub = await launchRelationship();
+test("Hub returns path-specific feedback thrown by the provider", async () => {
+  const clients = createTestAgentClients();
+  const inner = clients.codex;
+  const provider: AgentClient = {
+    provider: inner.provider,
+    capabilities: inner.capabilities,
+    isAvailable: (signal, options) => inner.isAvailable(signal, options),
+    fetchCatalog: (options, context) => inner.fetchCatalog(options, context),
+    async createSession(config, launch, options) {
+      validateProviderOptions("codex", CodexProviderOptionsSchema, config.providerOptions);
+      return inner.createSession(config, launch, options);
+    },
+    resumeSession: (handle, overrides, launch, options) =>
+      inner.resumeSession(handle, overrides, launch, options),
+  };
+  const hub = await launchRelationship({ ...clients, codex: provider });
   hub.beginOwnedCreate("invalid-options", "invalid-options-execution", {
     providerOptions: {
       sandbox_workspace_write: { writable_roots: ["/tmp", 42] },
diff --git a/packages/server/src/server/hub/daemon-executions.ts b/packages/server/src/server/hub/daemon-executions.ts
index a619be18a8..ec629c3fc9 100644
--- a/packages/server/src/server/hub/daemon-executions.ts
+++ b/packages/server/src/server/hub/daemon-executions.ts
@@ -205,7 +205,6 @@ export class DaemonExecutions implements HubExecutionAgents {
             }
           : {}),
         worktree: toCreateAgentWorktree(input.worktree),
-        background: true,
         notifyOnFinish: false,
         owner,
         onWorktreeCreated: (worktree) => {
diff --git a/packages/server/src/server/hub/execution-controller.test.ts b/packages/server/src/server/hub/execution-controller.test.ts
index 4f2836d1ce..95c6555035 100644
--- a/packages/server/src/server/hub/execution-controller.test.ts
+++ b/packages/server/src/server/hub/execution-controller.test.ts
@@ -34,6 +34,7 @@ function deferred<T>(): Deferred<T> {
 }
 
 class ControlledHubExecutionAgents implements HubExecutionAgents {
+  observerCount = 0;
   private readonly createObserved = deferred<void>();
   private readonly createGate = deferred<OwnedAgentSnapshot>();
 
@@ -45,7 +46,10 @@ class ControlledHubExecutionAgents implements HubExecutionAgents {
   async control(): Promise<void> {}
 
   subscribe(_listener: (event: OwnedAgentEvent) => void): () => void {
-    return () => undefined;
+    this.observerCount++;
+    return () => {
+      this.observerCount--;
+    };
   }
 
   async invalidateAuthority(): Promise<void> {}
@@ -224,3 +228,28 @@ describe("HubExecutionController", () => {
     ]);
   });
 });
+
+test("Hub observation is acquired and released explicitly without closing its RPC controller", async () => {
+  const agents = new ControlledHubExecutionAgents();
+  const messages: SessionOutboundMessage[] = [];
+  const controller = new HubExecutionController({
+    agents,
+    validateAgentConfiguration: async () => [],
+    send: (message) => messages.push(message),
+  });
+  expect(agents.observerCount).toBe(0);
+  controller.setObserving(true);
+  expect(agents.observerCount).toBe(1);
+  controller.setObserving(true);
+  expect(agents.observerCount).toBe(1);
+  controller.setObserving(false);
+  expect(agents.observerCount).toBe(0);
+  await controller.validateAgent({
+    type: "hub.execution.agent.validate.request",
+    requestId: "plain-validation",
+    provider: "codex",
+  });
+  expect(messages).toHaveLength(1);
+  expect(agents.observerCount).toBe(0);
+  await controller.cleanup();
+});
diff --git a/packages/server/src/server/hub/execution-controller.ts b/packages/server/src/server/hub/execution-controller.ts
index 025b05a48b..4199433d3d 100644
--- a/packages/server/src/server/hub/execution-controller.ts
+++ b/packages/server/src/server/hub/execution-controller.ts
@@ -26,7 +26,7 @@ export class HubExecutionController {
   private readonly agents: HubExecutionAgents;
   private readonly send: (message: SessionOutboundMessage) => void;
   private readonly validateAgentConfiguration: HubExecutionControllerOptions["validateAgentConfiguration"];
-  private readonly unsubscribe: () => void;
+  private unsubscribe: (() => void) | null = null;
   private readonly pendingCreates = new Set<Promise<void>>();
   private readonly pendingControls = new Set<Promise<void>>();
   private readonly pendingValidations = new Set<Promise<void>>();
@@ -37,7 +37,19 @@ export class HubExecutionController {
     this.agents = options.agents;
     this.validateAgentConfiguration = options.validateAgentConfiguration;
     this.send = options.send;
-    this.unsubscribe = this.agents.subscribe((event) => this.sendOwnedEvent(event));
+  }
+
+  get isObserving(): boolean {
+    return this.unsubscribe !== null;
+  }
+
+  setObserving(observing: boolean): void {
+    if (observing && !this.closed)
+      this.unsubscribe ??= this.agents.subscribe((event) => this.sendOwnedEvent(event));
+    else {
+      this.unsubscribe?.();
+      this.unsubscribe = null;
+    }
   }
 
   cleanup(): Promise<void> {
@@ -47,7 +59,7 @@ export class HubExecutionController {
 
   private async cleanupOnce(): Promise<void> {
     this.closed = true;
-    this.unsubscribe();
+    this.setObserving(false);
     await Promise.allSettled([
       ...this.pendingCreates,
       ...this.pendingControls,
diff --git a/packages/server/src/server/hub/execution-session.websocket.test.ts b/packages/server/src/server/hub/execution-session.websocket.test.ts
index 925f1a6780..88f376b3ba 100644
--- a/packages/server/src/server/hub/execution-session.websocket.test.ts
+++ b/packages/server/src/server/hub/execution-session.websocket.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, expect, test } from "vitest";
+import type { SessionOutboundMessage } from "../messages.js";
 import { HubRelationshipHarness } from "./test-utils/relationship-harness.js";
 
 let relationship: HubRelationshipHarness | null = null;
@@ -16,6 +17,13 @@ async function launchRelationship(): Promise<HubRelationshipHarness> {
   return launched;
 }
 
+function createdAgentWorkspaceId(message: SessionOutboundMessage): string {
+  if (message.type !== "status" || message.payload.status !== "agent_created")
+    throw new Error("Agent was not created");
+  if (!message.payload.agent.workspaceId) throw new Error("Workspace was not created");
+  return message.payload.agent.workspaceId;
+}
+
 test("Hub retries one durable daemon execution across concurrency and reconstruction", async () => {
   const hub = await launchRelationship();
 
@@ -35,30 +43,213 @@ test("Hub retries one durable daemon execution across concurrency and reconstruc
   expect(reconstructed.durableAgentCount).toBe(1);
 });
 
-test("Hub session applies its scoped authorization to ordinary protocol messages", async () => {
+test("Hub execute can steer ordinary agents while unrelated administration stays denied", async () => {
   const hub = await launchRelationship();
-  const localAgentId = await hub.createUnrelatedLocalAgent();
-
-  const steeringDenial = await hub.deniedSteering(localAgentId);
-  const browserDenial = await hub.deniedBrowserDispatch();
-
-  expect(steeringDenial).toEqual({
-    requestId: "denied-steer",
-    requestType: "send_agent_message_request",
-    error: "Session is not authorized for send_agent_message_request",
-    code: "access_denied",
+  const agentId = await hub.createUnrelatedLocalAgent();
+  const response = await hub.requestOrdinary({
+    type: "send_agent_message_request",
+    requestId: "ordinary-steer",
+    agentId,
+    text: "hello",
+    messageId: "first-arrival",
+    activeTurnBehavior: "steer",
   });
-  expect(browserDenial).toEqual({
-    requestId: "browser-1",
-    requestType: "browser.automation.execute.response",
-    error: "Session is not authorized for browser.automation.execute.response",
-    code: "access_denied",
+  expect(response).toMatchObject({
+    type: "send_agent_message_response",
+    payload: { accepted: true },
   });
-  expect(hub.observedAgentIds()).not.toContain(localAgentId);
-  expect(hub.observedTrustedLifecycleMessages()).toEqual(["server_info"]);
+  expect(await hub.deniedBrowserDispatch()).toMatchObject({ code: "access_denied" });
   expect(hub.serverInfoPermissions()).toEqual([["hub.execute"]]);
 });
 
+test("Hub execute can title the workspace created with an agent", async () => {
+  const hub = await launchRelationship();
+  const created = await hub.requestOrdinary({
+    type: "create_agent_request",
+    requestId: "create-for-title",
+    config: { provider: "codex", cwd: hub.repoRoot() },
+  });
+  expect(created).toMatchObject({
+    type: "status",
+    payload: { status: "agent_created", agent: { workspaceId: expect.any(String) } },
+  });
+  const workspaceId = createdAgentWorkspaceId(created);
+
+  expect(
+    await hub.requestOrdinary({
+      type: "workspace.title.set.request",
+      requestId: "title-created-workspace",
+      workspaceId,
+      title: "Hub execution",
+    }),
+  ).toMatchObject({
+    type: "workspace.title.set.response",
+    payload: { workspaceId, accepted: true, title: "Hub execution", error: null },
+  });
+
+  expect(
+    await hub.requestOrdinary({
+      type: "fetch_workspaces_request",
+      requestId: "read-created-workspace",
+    }),
+  ).toMatchObject({
+    type: "fetch_workspaces_response",
+    payload: {
+      entries: expect.arrayContaining([
+        expect.objectContaining({ id: workspaceId, title: "Hub execution" }),
+      ]),
+    },
+  });
+});
+
+test("ordinary Hub create and message retries do not duplicate agents or prompts", async () => {
+  const hub = await launchRelationship();
+  const create = {
+    type: "create_agent_request",
+    idempotencyKey: "ordinary-create",
+    config: { provider: "codex", cwd: hub.repoRoot() },
+  };
+  const responses = await Promise.all([
+    hub.requestOrdinary({ ...create, requestId: "create-first" }),
+    hub.requestOrdinary({ ...create, requestId: "create-duplicate" }),
+  ]);
+  const first = responses[0];
+  expect(first).toEqual({
+    type: "status",
+    payload: {
+      status: "agent_created",
+      requestId: "create-first",
+      agentId: expect.any(String),
+      agent: expect.objectContaining({
+        id: expect.any(String),
+        workspaceId: expect.any(String),
+        provider: "codex",
+        cwd: hub.repoRoot(),
+        status: "idle",
+      }),
+    },
+  });
+  if (first?.type !== "status" || first.payload.status !== "agent_created")
+    throw new Error("Agent was not created");
+  const agentId = first.payload.agentId;
+  expect(first.payload.agent.id).toBe(agentId);
+  expect(responses[1]).toEqual({
+    type: "status",
+    payload: {
+      status: "agent_created",
+      requestId: "create-duplicate",
+      agentId,
+      agent: first.payload.agent,
+    },
+  });
+  expect(
+    await hub.requestOrdinary({
+      type: "fetch_agents_request",
+      requestId: "observe-agents",
+      subscribe: { subscriptionId: "hub-agents" },
+    }),
+  ).toMatchObject({ type: "fetch_agents_response" });
+  expect(
+    await hub.requestOrdinary({
+      type: "agent.timeline.set_subscription.request",
+      requestId: "observe-timeline",
+      agentIds: [agentId],
+    }),
+  ).toMatchObject({ type: "agent.timeline.set_subscription.response" });
+  const message = {
+    type: "send_agent_message_request",
+    agentId,
+    messageId: "ordinary-arrival",
+    text: "hello",
+    activeTurnBehavior: "steer",
+  };
+  expect(await hub.requestOrdinary({ ...message, requestId: "message-first" })).toEqual({
+    type: "send_agent_message_response",
+    payload: { requestId: "message-first", agentId, accepted: true, error: null },
+  });
+  expect(await hub.requestOrdinary({ ...message, requestId: "message-duplicate" })).toEqual({
+    type: "send_agent_message_response",
+    payload: { requestId: "message-duplicate", agentId, accepted: true, error: null },
+  });
+  expect(
+    hub
+      .hubMessages()
+      .some((event) => event.type === "agent_stream" && event.payload.agentId === agentId),
+  ).toBe(true);
+  expect(hub.providerPromptTexts().filter((text) => text === "hello")).toHaveLength(1);
+  expect(
+    await hub.requestOrdinary({ ...message, text: "changed", requestId: "message-conflict" }),
+  ).toMatchObject({ payload: { accepted: false } });
+});
+
+test("ordinary Hub requests survive daemon restart and restore an archived workspace", async () => {
+  const hub = await launchRelationship();
+  const create = {
+    type: "create_agent_request",
+    idempotencyKey: "restorable-agent",
+    config: { provider: "codex", cwd: hub.repoRoot() },
+    worktree: { mode: "branch-off", newBranch: "ordinary-restoration" },
+  };
+  const response = await hub.requestOrdinary({ ...create, requestId: "restorable-create" });
+  if (response.type !== "status" || response.payload.status !== "agent_created")
+    throw new Error("Agent was not created");
+  const { agentId, agent } = response.payload;
+  if (!agent?.workspaceId) throw new Error("Workspace was not created");
+  const workspaceId = agent.workspaceId;
+  const message = {
+    type: "send_agent_message_request",
+    agentId,
+    messageId: "before-restart",
+    text: "hello",
+    activeTurnBehavior: "steer",
+  };
+  expect(await hub.requestOrdinary({ ...message, requestId: "before-restart-send" })).toMatchObject(
+    { payload: { accepted: true } },
+  );
+  await hub.restartDaemon();
+  await hub.socketDialed();
+  hub.connectLatestSocket();
+  expect(await hub.requestOrdinary({ ...create, requestId: "replayed-create" })).toMatchObject({
+    payload: { agentId },
+  });
+  expect(await hub.requestOrdinary({ ...message, requestId: "replayed-send" })).toMatchObject({
+    payload: { accepted: true },
+  });
+  expect(hub.providerPromptTexts().filter((text) => text === "hello")).toHaveLength(1);
+  expect(
+    await hub.requestOrdinary({
+      type: "archive_workspace_request",
+      workspaceId,
+      requestId: "ordinary-archive",
+    }),
+  ).toMatchObject({ payload: { error: null, archivedAt: expect.any(String) } });
+  expect((await hub.worktreeState(agent.cwd)).exists).toBe(false);
+  expect(
+    await hub.requestOrdinary({
+      type: "workspace.recovery.inspect.request",
+      workspaceId,
+      requestId: "inspect-recovery",
+    }),
+  ).toMatchObject({ payload: { state: { kind: "recoverable" } } });
+  expect(
+    await hub.requestOrdinary({
+      type: "workspace.recovery.restore.request",
+      workspaceId,
+      requestId: "restore-workspace",
+    }),
+  ).toMatchObject({ payload: { accepted: true } });
+  expect((await hub.worktreeState(agent.cwd)).exists).toBe(true);
+  expect(
+    await hub.requestOrdinary({
+      ...message,
+      text: "follow up",
+      messageId: "after-restore",
+      requestId: "after-restore-send",
+    }),
+  ).toMatchObject({ payload: { agentId, accepted: true } });
+  expect(hub.providerPromptTexts().filter((text) => text === "follow up")).toHaveLength(1);
+}, 20_000);
+
 test("Hub completes the standard hello before rejecting a second hello", async () => {
   const hub = await launchRelationship();
 
@@ -66,7 +257,7 @@ test("Hub completes the standard hello before rejecting a second hello", async (
   expect(hub.probeTrustedHello()).toBe(4002);
 });
 
-test("legacy Hub wire behavior still enters the common Session bootstrap", async () => {
+test("legacy Hub wire behavior immediately enters the common Session bootstrap", async () => {
   const launched = await HubRelationshipHarness.start();
   await launched.beginConnect().result;
   launched.connectLatestLegacySocket();
diff --git a/packages/server/src/server/hub/hub-cli-contract.test.ts b/packages/server/src/server/hub/hub-cli-contract.test.ts
index 32aa866aed..03f1ab96a2 100644
--- a/packages/server/src/server/hub/hub-cli-contract.test.ts
+++ b/packages/server/src/server/hub/hub-cli-contract.test.ts
@@ -10,13 +10,21 @@ afterEach(async () => {
 
 test("the Hub CLI connects, reports status, and disconnects through the daemon", async () => {
   relationship = await HubRelationshipHarness.start();
-  const connected = await relationship.beginConnect().result;
+  const connected = await relationship.runCli([
+    "hub",
+    "connect",
+    "https://hub.test",
+    "--api-key",
+    "hub-contract-api-key:ceremony-token",
+    "--permission",
+    "hub.execute",
+  ]);
   relationship.connectLatestSocket();
 
-  const status = await relationship.status();
+  const status = await relationship.runCli(["hub", "status"]);
   const enrollment = relationship.enrollmentAttempts()[0];
   const secret = relationship.relationshipFile()?.credential?.secret;
-  const disconnected = await relationship.disconnect();
+  const disconnected = await relationship.runCli(["hub", "disconnect"]);
 
   expect(connected.state).toBe("connecting");
   expect(status.state).toBe("connected");
diff --git a/packages/server/src/server/hub/relationship-controller.test.ts b/packages/server/src/server/hub/relationship-controller.test.ts
index 0d091d66c1..51596b2384 100644
--- a/packages/server/src/server/hub/relationship-controller.test.ts
+++ b/packages/server/src/server/hub/relationship-controller.test.ts
@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
-import { hostname, platform } from "node:os";
+import { platform } from "node:os";
 import { afterEach, describe, expect, test } from "vitest";
+import { getHostName } from "../host-name.js";
 import { HubRelationshipHarness } from "./test-utils/relationship-harness.js";
 
 async function captureUnhandledRejections(action: () => Promise<void>): Promise<unknown[]> {
@@ -88,7 +89,7 @@ describe("Hub relationship", () => {
         .update(secret ?? "")
         .digest("base64url"),
     );
-    expect(enrollment.hostname).toBe(hostname());
+    expect(enrollment.hostname).toBe(getHostName());
     relationship.completeEnrollment();
     await connecting.result;
     await relationship.socketDialed();
@@ -297,7 +298,7 @@ describe("Hub relationship", () => {
       version: 2,
       relationship: { permissions: ["hub.execute"] },
     });
-    expect(await relationship.status()).toMatchObject({ permissions: "hub.execute" });
+    expect(await relationship.status()).toMatchObject({ permissions: ["hub.execute"] });
   });
 
   test.each([
@@ -419,7 +420,7 @@ describe("Hub relationship", () => {
 
     expect(disconnected).toMatchObject({
       state: "not_connected",
-      hub: null,
+      hubOrigin: null,
       warning: expect.stringContaining("server-side revocation may remain pending"),
     });
     expect(reconnected.state).toBe("connecting");
@@ -483,14 +484,14 @@ describe("Hub relationship", () => {
 
     const disconnected = await relationship.disconnect(true);
 
-    expect(disconnected).toMatchObject({ state: "not_connected", hub: null });
+    expect(disconnected).toMatchObject({ state: "not_connected", hubOrigin: null });
     expect(relationship.revocationAttempts()).toBe(0);
     expect(relationship.relationshipFile()).toBeNull();
 
     relationship.completeEnrollment();
     await connecting.result;
     expect(relationship.socketAttempts()).toBe(0);
-    expect(await relationship.status()).toMatchObject({ state: "not_connected", hub: null });
+    expect(await relationship.status()).toMatchObject({ state: "not_connected", hubOrigin: null });
   });
 
   test("daemon restart reconnects the same durable relationship", async () => {
@@ -811,9 +812,9 @@ describe("Hub relationship", () => {
     expect(status).toMatchObject({
       state: "revoked",
       daemonId: enrollment.daemonId,
-      hub: "https://hub.test",
-      permissions: "hub.execute",
-      error: reason,
+      hubOrigin: "https://hub.test",
+      permissions: ["hub.execute"],
+      lastError: reason,
     });
     expect(persisted?.state).toBe("revoked");
     expect(persisted?.relationship).toMatchObject({
@@ -848,10 +849,10 @@ describe("Hub relationship", () => {
 
     expect(disconnected).toMatchObject({
       state: "not_connected",
-      hub: null,
+      hubOrigin: null,
       warning: expect.stringContaining("server-side revocation may remain pending"),
     });
-    expect(await relationship.status()).toMatchObject({ state: "not_connected", hub: null });
+    expect(await relationship.status()).toMatchObject({ state: "not_connected", hubOrigin: null });
     expect(relationship.revocationAttempts()).toBe(1);
     expect(relationship.socketAttempts()).toBe(1);
     expect(relationship.pendingRelationshipRetries()).toBe(0);
@@ -864,10 +865,14 @@ describe("Hub relationship", () => {
 
     const disconnected = await relationship.disconnect();
 
-    expect(disconnected).toMatchObject({ state: "not_connected", hub: null, error: null });
+    expect(disconnected).toMatchObject({
+      state: "not_connected",
+      hubOrigin: null,
+      lastError: null,
+    });
     expect(disconnected).not.toHaveProperty("warning");
     expect(relationship.revocationAttempts()).toBe(1);
-    expect(await relationship.status()).toMatchObject({ state: "not_connected", error: null });
+    expect(await relationship.status()).toMatchObject({ state: "not_connected", lastError: null });
   });
 
   test("force disconnect removes local authority without notifying the Hub", async () => {
@@ -876,7 +881,7 @@ describe("Hub relationship", () => {
 
     const forced = await relationship.disconnect(true);
 
-    expect(forced).toMatchObject({ state: "not_connected", hub: null });
+    expect(forced).toMatchObject({ state: "not_connected", hubOrigin: null });
     expect(forced).not.toHaveProperty("warning");
     expect(relationship.revocationAttempts()).toBe(0);
     expect(relationship.loggableValues(forced)).not.toContain(
@@ -895,7 +900,7 @@ describe("Hub relationship", () => {
 
     await relationship.startStoppedDaemon();
 
-    expect(await relationship.status()).toMatchObject({ state: "not_connected", hub: null });
+    expect(await relationship.status()).toMatchObject({ state: "not_connected", hubOrigin: null });
     expect(relationship.relationshipFile()).toBeNull();
     expect(relationship.revocationAttempts()).toBe(0);
     expect(relationship.pendingRelationshipRetries()).toBe(0);
diff --git a/packages/server/src/server/hub/test-utils/relationship-harness.ts b/packages/server/src/server/hub/test-utils/relationship-harness.ts
index d29dfe8062..84726d0b02 100644
--- a/packages/server/src/server/hub/test-utils/relationship-harness.ts
+++ b/packages/server/src/server/hub/test-utils/relationship-harness.ts
@@ -160,7 +160,9 @@ class MemoryHubSocket extends EventEmitter implements WebSocketLike, HubSocketCo
     if (typeof data !== "string") return;
     const frame = JSON.parse(data) as { type: "session"; message: SessionOutboundMessage };
     this.sent.push(frame.message);
-    this.messageObserved.resolve();
+    const observed = this.messageObserved;
+    this.messageObserved = deferred<void>();
+    observed.resolve();
   }
 
   close(code = 1000): void {
@@ -192,7 +194,6 @@ class MemoryHubSocket extends EventEmitter implements WebSocketLike, HubSocketCo
       );
       if (message) return message;
       await this.messageObserved.promise;
-      this.messageObserved = deferred<void>();
     }
   }
 
@@ -203,7 +204,6 @@ class MemoryHubSocket extends EventEmitter implements WebSocketLike, HubSocketCo
       const message = this.sent.find(predicate);
       if (message) return message;
       await this.messageObserved.promise;
-      this.messageObserved = deferred<void>();
     }
   }
 }
@@ -425,7 +425,7 @@ class InMemoryHubRelationships implements HubRelationshipRemote {
   }
 }
 
-interface CliProcess {
+interface RelationshipOperation {
   result: Promise<Record<string, unknown>>;
 }
 
@@ -454,7 +454,7 @@ export class HubRelationshipHarness {
   private host = "";
   private readonly logs: string[] = [];
   private readonly providerPrompts: AgentPromptInput[] = [];
-  private readonly cliProcesses = new Set<Promise<unknown>>();
+  private readonly operations = new Set<Promise<unknown>>();
   private readonly claimedCliSockets = new Set<WebSocket>();
   private readonly promptsToFail = new Set<string>();
   private failNextSessionClose = false;
@@ -514,37 +514,44 @@ export class HubRelationshipHarness {
     this.remote.holdEnrollment();
   }
 
-  beginConnect(token = "ceremony-token", hubUrl = HUB_ORIGIN, execute = true): CliProcess {
+  beginConnect(
+    token = "ceremony-token",
+    hubUrl = HUB_ORIGIN,
+    execute = true,
+  ): RelationshipOperation {
     return {
-      result: this.runCli([
-        "hub",
-        "connect",
-        hubUrl,
-        "--api-key",
-        `hub-contract-api-key:${token}`,
-        ...(execute ? ["--permission", "hub.execute"] : []),
-      ]),
+      result: this.withClient(
+        async (client) =>
+          (await client.connectHub(hubUrl, token, execute ? ["hub.execute"] : [])).status,
+      ),
     };
   }
 
   async status(): Promise<Record<string, unknown>> {
-    return this.runCli(["hub", "status"]);
+    return this.withClient(async (client) => (await client.getHubStatus()).status);
   }
 
   async disconnect(force = false): Promise<Record<string, unknown>> {
-    return this.runCli(["hub", "disconnect", ...(force ? ["--force"] : [])]);
+    return this.withClient(async (client) => {
+      const { status, warning } = await client.disconnectHub(force);
+      return { ...status, ...(warning ? { warning } : {}) };
+    });
   }
 
   async grantPermission(permission: string): Promise<Record<string, unknown>> {
-    return this.runCli(["hub", "permissions", "grant", permission]);
+    return this.withClient(
+      async (client) => (await client.updateHubPermissions({ grant: [permission] })).status,
+    );
   }
 
   async revokePermission(permission: string): Promise<Record<string, unknown>> {
-    return this.runCli(["hub", "permissions", "revoke", permission]);
+    return this.withClient(
+      async (client) => (await client.updateHubPermissions({ revoke: [permission] })).status,
+    );
   }
 
-  beginDisconnect(force = false): CliProcess {
-    return { result: this.runCli(["hub", "disconnect", ...(force ? ["--force"] : [])]) };
+  beginDisconnect(force = false): RelationshipOperation {
+    return { result: this.disconnect(force) };
   }
 
   async relationshipStateBecomes(expected: string | null): Promise<void> {
@@ -728,6 +735,16 @@ export class HubRelationshipHarness {
     socket.socket.close(code);
   }
 
+  async requestOrdinary(message: {
+    type: string;
+    requestId: string;
+    [key: string]: unknown;
+  }): Promise<SessionOutboundMessage> {
+    const socket = this.latestSocket().socket;
+    socket.receive(message);
+    return socket.messageFor(message.requestId);
+  }
+
   sendHubRequestOnLatest(message: unknown): SessionOutboundMessage[] {
     const socket = this.latestSocket().socket;
     socket.receive(message);
@@ -1362,7 +1379,7 @@ export class HubRelationshipHarness {
 
   async close(): Promise<void> {
     await this.stopDaemon();
-    await Promise.allSettled(this.cliProcesses);
+    await Promise.allSettled(this.operations);
     await Promise.all(
       [...this.claimedCliSockets].map((socket) => this.closeClaimedCliSocket(socket)),
     );
@@ -1423,8 +1440,21 @@ export class HubRelationshipHarness {
     this.daemon = null;
   }
 
-  private runCli(args: string[]): Promise<Record<string, unknown>> {
-    return this.trackCli(this.executeCli(args));
+  private withClient<T>(action: (client: DaemonClient) => Promise<T>): Promise<T> {
+    return this.trackOperation(
+      (async () => {
+        const client = await this.trustedClient();
+        try {
+          return await action(client);
+        } finally {
+          await client.close();
+        }
+      })(),
+    );
+  }
+
+  runCli(args: string[]): Promise<Record<string, unknown>> {
+    return this.trackOperation(this.executeCli(args));
   }
 
   private async executeCli(args: string[]): Promise<Record<string, unknown>> {
@@ -1448,11 +1478,11 @@ export class HubRelationshipHarness {
     return parsed as Record<string, unknown>;
   }
 
-  private trackCli<T>(process: Promise<T>): Promise<T> {
-    this.cliProcesses.add(process);
+  private trackOperation<T>(process: Promise<T>): Promise<T> {
+    this.operations.add(process);
     void process.then(
-      () => this.cliProcesses.delete(process),
-      () => this.cliProcesses.delete(process),
+      () => this.operations.delete(process),
+      () => this.operations.delete(process),
     );
     return process;
   }
@@ -1572,7 +1602,6 @@ export class HubRelationshipHarness {
       appVersion: "0.1.106",
     });
     await client.connect();
-    await client.fetchAgents({ subscribe: { subscriptionId: "hub-relationship-trusted" } });
     return client;
   }
 
diff --git a/packages/server/src/server/local-credential.ts b/packages/server/src/server/local-credential.ts
new file mode 100644
index 0000000000..91818212ca
--- /dev/null
+++ b/packages/server/src/server/local-credential.ts
@@ -0,0 +1,81 @@
+import { randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { chmod, rename, unlink, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import {
+  normalizeLoopbackToLocalhost,
+  parseConnectionUri,
+} from "@getpaseo/protocol/daemon-endpoints";
+
+const FILE_NAME = "local-credential";
+
+export async function writeLocalCredential(home: string): Promise<string> {
+  const token = randomBytes(32).toString("base64url");
+  const temporary = join(home, `${FILE_NAME}.${randomUUID()}.tmp`);
+  try {
+    await writeFile(temporary, `${token}\n`, { mode: 0o600, flag: "wx" });
+    await chmod(temporary, 0o600);
+    await rename(temporary, join(home, FILE_NAME));
+    return token;
+  } finally {
+    await unlink(temporary).catch((error: NodeJS.ErrnoException) => {
+      if (error.code !== "ENOENT") throw error;
+    });
+  }
+}
+
+export async function deleteLocalCredential(home: string): Promise<void> {
+  await unlink(join(home, FILE_NAME)).catch((error: NodeJS.ErrnoException) => {
+    if (error.code !== "ENOENT") throw error;
+  });
+}
+
+export function readLocalCredential(home: string): string | null {
+  try {
+    const token = readFileSync(join(home, FILE_NAME), "utf8").trim();
+    return /^[A-Za-z0-9_-]{43}$/.test(token) ? token : null;
+  } catch {
+    return null;
+  }
+}
+
+export function matchesLocalCredential(expected: string, candidate: string): boolean {
+  const actual = Buffer.from(candidate);
+  const reference = Buffer.from(expected);
+  return actual.length === reference.length && timingSafeEqual(actual, reference);
+}
+
+function normalizeTarget(target: string): string | null {
+  try {
+    const trimmed = target.trim();
+    if (trimmed.startsWith("tcp://")) {
+      const parsed = parseConnectionUri(trimmed);
+      const endpoint = parsed.isIpv6
+        ? `[${parsed.host}]:${parsed.port}`
+        : `${parsed.host}:${parsed.port}`;
+      return normalizeLoopbackToLocalhost(endpoint);
+    }
+    if (trimmed.startsWith("unix://") || trimmed.startsWith("pipe://")) return trimmed;
+    if (trimmed.startsWith("/")) return `unix://${trimmed}`;
+    if (trimmed.startsWith("\\\\.\\pipe\\")) return `pipe://${trimmed}`;
+    if (/^\d+$/.test(trimmed)) return `localhost:${trimmed}`;
+    return normalizeLoopbackToLocalhost(trimmed);
+  } catch {
+    return null;
+  }
+}
+
+export function readLocalCredentialForTarget(home: string, target: string): string | null {
+  try {
+    const lock = JSON.parse(readFileSync(join(home, "paseo.pid"), "utf8")) as {
+      listen?: unknown;
+    };
+    if (typeof lock.listen !== "string") return null;
+    const selected = normalizeTarget(target);
+    const listening = normalizeTarget(lock.listen);
+    if (!selected || !listening || selected !== listening) return null;
+    return readLocalCredential(home);
+  } catch {
+    return null;
+  }
+}
diff --git a/packages/server/src/server/local-service-connection.ts b/packages/server/src/server/local-service-connection.ts
new file mode 100644
index 0000000000..a96a0a7094
--- /dev/null
+++ b/packages/server/src/server/local-service-connection.ts
@@ -0,0 +1,27 @@
+import http from "node:http";
+import net from "node:net";
+
+// A host can support IPv6 loopback without listing ::1 for localhost in DNS.
+const lookupLoopback: net.LookupFunction = (_hostname, _options, callback) => {
+  callback(null, [
+    { address: "127.0.0.1", family: 4 },
+    { address: "::1", family: 6 },
+  ]);
+};
+
+export function connectToLocalService(port: number): net.Socket {
+  return net.connect({ host: "localhost", port, autoSelectFamily: true, lookup: lookupLoopback });
+}
+
+export function requestLocalService(
+  options: Pick<http.RequestOptions, "port" | "path" | "method" | "headers">,
+  onResponse: (response: http.IncomingMessage) => void,
+): http.ClientRequest {
+  const requestOptions = {
+    ...options,
+    hostname: "localhost",
+    autoSelectFamily: true,
+    lookup: lookupLoopback,
+  };
+  return http.request(requestOptions, onResponse);
+}
diff --git a/packages/server/src/server/message-receipts/index.test.ts b/packages/server/src/server/message-receipts/index.test.ts
new file mode 100644
index 0000000000..10c1615a6a
--- /dev/null
+++ b/packages/server/src/server/message-receipts/index.test.ts
@@ -0,0 +1,77 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, expect, test } from "vitest";
+import { MessageReceipts } from "./index.js";
+
+const directories: string[] = [];
+afterEach(async () => {
+  await Promise.all(
+    directories.splice(0).map((directory) => rm(directory, { recursive: true, force: true })),
+  );
+});
+async function fixture() {
+  const directory = await mkdtemp(path.join(tmpdir(), "agent-requests-"));
+  directories.push(directory);
+  return { directory, requests: new MessageReceipts(directory) };
+}
+
+test("message retries survive reconstruction without submitting twice", async () => {
+  const { requests, directory } = await fixture();
+  let deliveries = 0;
+  const input = {
+    agentId: "agent",
+    messageId: "arrival",
+    request: { text: "hello" },
+    send: async () => {
+      deliveries++;
+    },
+  };
+  await Promise.all([requests.send(input), requests.send(input)]);
+  await new MessageReceipts(directory).send(input);
+  expect(deliveries).toBe(1);
+  await requests.send({ ...input, agentId: "another" });
+  expect(deliveries).toBe(2);
+});
+
+test("ambiguous provider delivery is never blindly replayed after restart", async () => {
+  const { requests, directory } = await fixture();
+  let deliveries = 0;
+  const input = {
+    agentId: "agent",
+    messageId: "arrival",
+    request: {},
+    send: async () => {
+      deliveries++;
+      throw new Error("connection lost");
+    },
+  };
+  await expect(requests.send(input)).rejects.toThrow("connection lost");
+  await expect(new MessageReceipts(directory).send(input)).rejects.toThrow(
+    "agent_request_outcome_unknown",
+  );
+  expect(deliveries).toBe(1);
+});
+
+test("failed local message preparation does not leave an ambiguous receipt", async () => {
+  const { requests, directory } = await fixture();
+  let available = false;
+  let sends = 0;
+  const input = {
+    agentId: "agent",
+    messageId: "message",
+    request: {},
+    prepare: async () => {
+      if (!available) throw new Error("load failed");
+    },
+    send: async () => {
+      sends++;
+    },
+  };
+  await expect(requests.send(input)).rejects.toThrow("load failed");
+  available = true;
+  await new MessageReceipts(directory).send(input);
+  available = false;
+  await requests.send(input);
+  expect(sends).toBe(1);
+});
diff --git a/packages/server/src/server/message-receipts/index.ts b/packages/server/src/server/message-receipts/index.ts
new file mode 100644
index 0000000000..6103160b12
--- /dev/null
+++ b/packages/server/src/server/message-receipts/index.ts
@@ -0,0 +1,81 @@
+import { createHash } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { z } from "zod";
+import { writeJsonFileAtomic } from "../atomic-file.js";
+
+const ReceiptSchema = z.object({
+  fingerprint: z.string(),
+  state: z.enum(["pending", "completed"]),
+  agentId: z.string(),
+});
+interface SendMessageInput {
+  agentId: string;
+  messageId: string;
+  request: unknown;
+  send: () => Promise<void>;
+  prepare?: () => Promise<void>;
+}
+
+/** Owns message delivery receipts; creation is owned by CreationService. */
+export class MessageReceipts {
+  private readonly pending = new Map<string, Promise<void>>();
+  constructor(private readonly directory: string) {}
+
+  send(input: SendMessageInput): Promise<void> {
+    // Preserve the existing on-disk identity and shape across daemon upgrades.
+    const key = digest(["send", input.agentId, input.messageId]);
+    const previous = this.pending.get(key);
+    const result = (previous ? previous.catch(() => undefined) : Promise.resolve()).then(() =>
+      this.sendOnce(key, input),
+    );
+    this.pending.set(key, result);
+    void result
+      .finally(() => {
+        if (this.pending.get(key) === result) this.pending.delete(key);
+      })
+      .catch(() => undefined);
+    return result;
+  }
+
+  private async sendOnce(key: string, input: SendMessageInput): Promise<void> {
+    const file = path.join(this.directory, `${key}.json`);
+    const fingerprint = digest(input.request);
+    const existing = await readReceipt(file);
+    if (existing) {
+      if (existing.fingerprint !== fingerprint) throw new Error("agent_request_key_conflict");
+      if (existing.state === "completed") return;
+      // A provider may have accepted the message before its receipt was committed.
+      throw new Error("agent_request_outcome_unknown");
+    }
+    await input.prepare?.();
+    const receipt = { fingerprint, agentId: input.agentId };
+    await writeJsonFileAtomic(file, { ...receipt, state: "pending" });
+    await input.send();
+    await writeJsonFileAtomic(file, { ...receipt, state: "completed" });
+  }
+}
+
+async function readReceipt(file: string): Promise<z.infer<typeof ReceiptSchema> | null> {
+  try {
+    return ReceiptSchema.parse(JSON.parse(await readFile(file, "utf8")));
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
+    throw error;
+  }
+}
+
+function digest(value: unknown): string {
+  return createHash("sha256")
+    .update(
+      JSON.stringify(value, (_key, candidate: unknown) => {
+        if (candidate !== null && typeof candidate === "object" && !Array.isArray(candidate)) {
+          return Object.fromEntries(
+            Object.entries(candidate).sort(([a], [b]) => a.localeCompare(b)),
+          );
+        }
+        return candidate;
+      }),
+    )
+    .digest("hex");
+}
diff --git a/packages/server/src/server/orchestration-skills/internal/controller.test.ts b/packages/server/src/server/orchestration-skills/internal/controller.test.ts
index d3dab5aa78..23b541e67d 100644
--- a/packages/server/src/server/orchestration-skills/internal/controller.test.ts
+++ b/packages/server/src/server/orchestration-skills/internal/controller.test.ts
@@ -210,7 +210,7 @@ async function blockAgentsDir(targets: SkillTargets): Promise<void> {
 }
 
 async function isInstalled(targets: SkillTargets, name: string): Promise<boolean> {
-  const dirs = [targets.agentsDir, targets.claudeDir, targets.codexDir];
+  const dirs = [targets.agentsDir, targets.claudeDir];
   const present = await Promise.all(
     dirs.map((dir) =>
       access(path.join(dir, name))
@@ -454,7 +454,7 @@ describe("skills controller", () => {
     expect(await installedEverywhere(readOnly.targets)).toEqual([
       ["paseo", "paseo-loop"],
       ["paseo", "paseo-loop"],
-      ["paseo", "paseo-loop"],
+      ["paseo-loop"],
     ]);
     expect(await readUserFile(readOnly.targets, "paseo-loop", "notes/mine.md")).toEqual([
       "hand written",
@@ -575,6 +575,7 @@ describe("skills controller", () => {
       };
       const next: SkillSelection = { mode: "custom", skills: ["paseo"] };
       await harness.controller.save(previous);
+      await writeUserFile(harness.targets, "paseo-loop", "SKILL.md", "paseo-loop-v1");
       const livePaths = [
         harness.targets.agentsDir,
         harness.targets.claudeDir,
@@ -601,6 +602,7 @@ describe("skills controller", () => {
     };
     const next: SkillSelection = { mode: "custom", skills: ["paseo"] };
     await harness.controller.save(previous);
+    await writeUserFile(harness.targets, "paseo-loop", "SKILL.md", "paseo-loop-v1");
 
     const transaction = await beginSkillsTransaction(harness.targets, previous, next, [
       { kind: "delete", name: "paseo-loop" },
@@ -666,6 +668,7 @@ describe("skills controller", () => {
     };
     const next: SkillSelection = { mode: "custom", skills: ["paseo"] };
     await harness.controller.save(previous);
+    await writeUserFile(harness.targets, "paseo-loop", "SKILL.md", "paseo-loop-v1");
     await writeUserFile(harness.targets, "paseo-loop", "notes/mine.md", "staged notes");
 
     const transaction = await beginSkillsTransaction(harness.targets, previous, next, [
@@ -1115,7 +1118,7 @@ describe("skills controller", () => {
     expect(await installedEverywhere(harness.targets)).toEqual([
       ["paseo", "paseo-advisor", "paseo-loop"],
       ["paseo", "paseo-advisor", "paseo-loop"],
-      ["paseo", "paseo-advisor", "paseo-loop"],
+      ["paseo-advisor"],
     ]);
     expect(result.selection).toEqual({ mode: "custom", skills: ["paseo", "paseo-loop"] });
   });
@@ -1131,7 +1134,7 @@ describe("skills controller", () => {
 
     expect(result.confirmationRequired).toBeNull();
     expect(result.selection).toEqual({ mode: "custom", skills: ["paseo"] });
-    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], ["paseo"]]);
+    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
   });
 
   it("asks again when another directory appears before the retry", async () => {
@@ -1150,7 +1153,7 @@ describe("skills controller", () => {
     expect(await installedEverywhere(harness.targets)).toEqual([
       ["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
       ["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
-      ["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
+      ["paseo-chat"],
     ]);
   });
 
@@ -1179,7 +1182,7 @@ describe("skills controller", () => {
     const result = await harness.controller.save({ mode: "custom", skills: ["paseo"] });
 
     expect(result.confirmationRequired).toBeNull();
-    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], ["paseo"]]);
+    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
   });
 
   it("preserves a regular file at a skill path when save convergence fails", async () => {
@@ -1211,7 +1214,7 @@ describe("skills controller", () => {
     ]);
 
     expect(saved.selection).toEqual({ mode: "custom", skills: ["paseo"] });
-    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], ["paseo"]]);
+    expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
     expect(await harness.controller.status()).toEqual({
       state: "up-to-date",
       ops: [],
diff --git a/packages/server/src/server/orchestration-skills/internal/operations.test.ts b/packages/server/src/server/orchestration-skills/internal/operations.test.ts
index 6b188d24b0..14363c4b42 100644
--- a/packages/server/src/server/orchestration-skills/internal/operations.test.ts
+++ b/packages/server/src/server/orchestration-skills/internal/operations.test.ts
@@ -1,4 +1,5 @@
 import { promises as fs } from "node:fs";
+import { createHash } from "node:crypto";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
@@ -298,8 +299,8 @@ describe("custom skill selection", () => {
       available: ["paseo", "paseo-advisor", "paseo-loop"],
       installed: ["paseo", "paseo-loop"],
     });
-    expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, true]);
-    expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([true, true, true]);
+    expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false]);
+    expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([true, true, false]);
     expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([false, false, false]);
   });
 
@@ -322,7 +323,7 @@ describe("custom skill selection", () => {
     const status = await installSkills(sandbox.targets, only("paseo"));
 
     expect(status.state).toBe("up-to-date");
-    expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, true]);
+    expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false]);
     expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([false, false, false]);
     expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([false, false, false]);
   });
@@ -395,7 +396,7 @@ describe("installSkills / updateSkills", () => {
     await fs.rm(sandbox.root, { recursive: true, force: true });
   });
 
-  it("installs from a clean machine, populates all three targets, and leaves user dirs alone", async () => {
+  it("installs into shared and Claude roots without duplicating Codex discovery", async () => {
     await writeCurrentBundle(sandbox.targets.sourceDir);
     await writeOnDiskSkill(sandbox.targets.agentsDir, "unslop", { "SKILL.md": "user-unslop" });
 
@@ -411,9 +412,7 @@ describe("installSkills / updateSkills", () => {
       expect(
         await fs.readFile(path.join(sandbox.targets.agentsDir, name, "SKILL.md"), "utf-8"),
       ).toBe(name === "paseo" ? "paseo-v1" : "loop-v1");
-      expect(
-        await fs.readFile(path.join(sandbox.targets.codexDir, name, "SKILL.md"), "utf-8"),
-      ).toBe(name === "paseo" ? "paseo-v1" : "loop-v1");
+      expect(await pathExists(path.join(sandbox.targets.codexDir, name, "SKILL.md"))).toBe(false);
       expect(await pathExists(path.join(sandbox.targets.claudeDir, name))).toBe(true);
     }
     expect(
@@ -421,6 +420,100 @@ describe("installSkills / updateSkills", () => {
     ).toBe("user-unslop");
   });
 
+  it("retires unchanged managed Codex copies while preserving personal files", async () => {
+    await writeCurrentBundle(sandbox.targets.sourceDir);
+    await installSkills(sandbox.targets, ALL_SKILLS);
+    const legacy = path.join(sandbox.targets.codexDir, "paseo");
+    const managed = { "SKILL.md": "paseo-v1", "references/old.md": "bundled reference" };
+    const hashes = Object.fromEntries(
+      Object.entries(managed).map(([name, content]) => [
+        name,
+        createHash("sha256").update(content).digest("hex"),
+      ]),
+    );
+    await writeFiles(legacy, {
+      ...managed,
+      "notes/mine.md": "personal notes",
+      ".paseo-managed-files.json": JSON.stringify({ version: 1, files: hashes }),
+    });
+    const status = await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS);
+    expect(status.state).toBe("up-to-date");
+    expect(status.ops).toEqual([]);
+    expect(await pathExists(path.join(legacy, "SKILL.md"))).toBe(false);
+    expect(await pathExists(path.join(legacy, "references/old.md"))).toBe(false);
+    expect(await fs.readFile(path.join(legacy, "notes/mine.md"), "utf8")).toBe("personal notes");
+    expect(await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS)).toEqual(status);
+  });
+
+  it("keeps edited or untracked Codex skill definitions", async () => {
+    await writeCurrentBundle(sandbox.targets.sourceDir);
+    await installSkills(sandbox.targets, ALL_SKILLS);
+    const originalHash = createHash("sha256").update("paseo-v1").digest("hex");
+    await writeOnDiskSkill(sandbox.targets.codexDir, "paseo", {
+      "SKILL.md": "personalized skill",
+      ".paseo-managed-files.json": JSON.stringify({
+        version: 1,
+        files: { "SKILL.md": originalHash },
+      }),
+    });
+    await writeOnDiskSkill(sandbox.targets.codexDir, "paseo-loop", {
+      "SKILL.md": "untracked skill",
+    });
+    expect((await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS)).state).toBe("up-to-date");
+    expect(
+      await fs.readFile(path.join(sandbox.targets.codexDir, "paseo", "SKILL.md"), "utf8"),
+    ).toBe("personalized skill");
+    expect(
+      await fs.readFile(path.join(sandbox.targets.codexDir, "paseo-loop", "SKILL.md"), "utf8"),
+    ).toBe("untracked skill");
+  });
+
+  it.each([
+    { alias: "codex", target: "agents" },
+    { alias: "codex", target: "claude" },
+    { alias: "claude", target: "codex" },
+  ] as const)(
+    "keeps installed skills when the $alias root links to the $target root",
+    async ({ alias, target }) => {
+      await writeCurrentBundle(sandbox.targets.sourceDir);
+      const rootOf = { agents: "agentsDir", claude: "claudeDir", codex: "codexDir" } as const;
+      const aliasRoot = sandbox.targets[rootOf[alias]];
+      const targetRoot = sandbox.targets[rootOf[target]];
+      await fs.mkdir(targetRoot, { recursive: true });
+      await fs.mkdir(path.dirname(aliasRoot), { recursive: true });
+      await fs.symlink(targetRoot, aliasRoot, "dir");
+
+      const installed = await installSkills(sandbox.targets, ALL_SKILLS);
+      const updated = await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS);
+
+      expect(installed.state).toBe("up-to-date");
+      expect(updated.state).toBe("up-to-date");
+      for (const name of ["paseo", "paseo-loop"]) {
+        expect(await installedIn(sandbox.targets, name)).toEqual([true, true, true]);
+      }
+    },
+  );
+
+  it("keeps an installed skill when its Codex directory links to the shared copy", async () => {
+    await writeCurrentBundle(sandbox.targets.sourceDir);
+    await fs.mkdir(path.join(sandbox.targets.agentsDir, "paseo"), { recursive: true });
+    await fs.mkdir(sandbox.targets.codexDir, { recursive: true });
+    await fs.symlink(
+      path.join(sandbox.targets.agentsDir, "paseo"),
+      path.join(sandbox.targets.codexDir, "paseo"),
+      "dir",
+    );
+
+    const installed = await installSkills(sandbox.targets, ALL_SKILLS);
+    const updated = await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS);
+
+    expect(installed.state).toBe("up-to-date");
+    expect(updated.state).toBe("up-to-date");
+    expect(
+      await fs.readFile(path.join(sandbox.targets.agentsDir, "paseo", "SKILL.md"), "utf8"),
+    ).toBe("paseo-v1");
+  });
+
   it("repairs missing and edited skills without deleting a legacy directory", async () => {
     await writeCurrentBundle(sandbox.targets.sourceDir);
     await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo", { "SKILL.md": "stale" });
diff --git a/packages/server/src/server/orchestration-skills/internal/operations.ts b/packages/server/src/server/orchestration-skills/internal/operations.ts
index a3b0831122..e45878a953 100644
--- a/packages/server/src/server/orchestration-skills/internal/operations.ts
+++ b/packages/server/src/server/orchestration-skills/internal/operations.ts
@@ -2,7 +2,13 @@ import { createHash } from "node:crypto";
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import type { AgentSkillSelection } from "@getpaseo/protocol/messages";
-import { listFilesRecursive, removeSkill, syncSkills } from "./sync.js";
+import {
+  isLegacyCodexCopy,
+  listFilesRecursive,
+  readManagedFilesManifest,
+  removeSkill,
+  syncSkills,
+} from "./sync.js";
 
 export type SkillsState = "not-installed" | "up-to-date" | "drift";
 
@@ -163,11 +169,23 @@ export async function getSkillsStatus(
     hashSkills(targets.claudeDir, names),
     hashSkills(targets.codexDir, names),
   ]);
-  const disks = [agentsDisk, claudeDisk, codexDisk];
-  const ops = diff(bundle, disks, names, resolveDesiredSkills(selection, available));
-  const installed = installedSkillNames(disks, names);
+  const disks = [agentsDisk, claudeDisk];
+  const desired = resolveDesiredSkills(selection, available);
+  const ops = diff(bundle, disks, names, desired);
+  for (const name of codexDisk.keys()) {
+    if (ops.some((op) => op.name === name)) continue;
+    if (!(await isLegacyCodexCopy(name, targets))) continue;
+    if (!desired.has(name)) ops.push({ kind: "delete", name });
+    else if (await readManagedFilesManifest(path.join(targets.codexDir, name))) {
+      ops.push({ kind: "update", name });
+    }
+  }
+  ops.sort((a, b) => compareStrings(a.name, b.name));
+  const allDisks = [...disks, codexDisk];
+  const installed = installedSkillNames(allDisks, names);
 
-  if (!hasInstalledPaseoSkill(disks)) return { state: "not-installed", ops, available, installed };
+  if (!hasInstalledPaseoSkill(allDisks))
+    return { state: "not-installed", ops, available, installed };
   if (ops.length === 0) return { state: "up-to-date", ops, available, installed };
   return { state: "drift", ops, available, installed };
 }
diff --git a/packages/server/src/server/orchestration-skills/internal/sync.test.ts b/packages/server/src/server/orchestration-skills/internal/sync.test.ts
index da5b1c8765..1848330fdb 100644
--- a/packages/server/src/server/orchestration-skills/internal/sync.test.ts
+++ b/packages/server/src/server/orchestration-skills/internal/sync.test.ts
@@ -75,11 +75,9 @@ describe("syncSkills", () => {
       "utf-8",
     );
     expect(claudeContent).toBe("new paseo content");
-    const codexContent = await fs.readFile(
-      path.join(sandbox.codexDir, "paseo", "SKILL.md"),
-      "utf-8",
-    );
-    expect(codexContent).toBe("new paseo content");
+    await expect(fs.stat(path.join(sandbox.codexDir, "paseo", "SKILL.md"))).rejects.toMatchObject({
+      code: "ENOENT",
+    });
   });
 
   it("installs new bundled skills, including references/, when not present on disk", async () => {
@@ -105,12 +103,9 @@ describe("syncSkills", () => {
         "utf-8",
       ),
     ).toBe("roles content");
-    expect(
-      await fs.readFile(
-        path.join(sandbox.codexDir, "paseo-committee", "references", "roles.md"),
-        "utf-8",
-      ),
-    ).toBe("roles content");
+    await expect(fs.stat(path.join(sandbox.codexDir, "paseo-committee"))).rejects.toMatchObject({
+      code: "ENOENT",
+    });
 
     const claudeSkillDir = path.join(sandbox.claudeDir, "paseo-committee");
     expect((await fs.lstat(claudeSkillDir)).isDirectory()).toBe(true);
diff --git a/packages/server/src/server/orchestration-skills/internal/sync.ts b/packages/server/src/server/orchestration-skills/internal/sync.ts
index 9233365549..255c61a274 100644
--- a/packages/server/src/server/orchestration-skills/internal/sync.ts
+++ b/packages/server/src/server/orchestration-skills/internal/sync.ts
@@ -51,7 +51,9 @@ export async function listFilesRecursive(rootDir: string): Promise<string[]> {
   return out;
 }
 
-async function readManagedFilesManifest(dstDir: string): Promise<ManagedFilesManifest | null> {
+export async function readManagedFilesManifest(
+  dstDir: string,
+): Promise<ManagedFilesManifest | null> {
   const raw = await fs
     .readFile(path.join(dstDir, MANAGED_FILES_MANIFEST), "utf-8")
     .catch(() => null);
@@ -185,6 +187,50 @@ export async function removeSkill(skillName: string, targets: RemoveSkillTargets
   }
 }
 
+async function isSameDirectory(a: string, b: string): Promise<boolean> {
+  const [realA, realB] = await Promise.all([a, b].map((p) => fs.realpath(p).catch(() => null)));
+  return realA !== null && realA === realB;
+}
+
+/**
+ * Codex also discovers .agents/skills, so its dedicated copy is a leftover. When
+ * the Codex skill directory resolves to the shared or Claude copy, it is that
+ * copy, and retiring it would delete the install.
+ */
+export async function isLegacyCodexCopy(
+  skillName: string,
+  targets: RemoveSkillTargets,
+): Promise<boolean> {
+  const codexSkillDir = path.join(targets.codexDir, skillName);
+  for (const root of [targets.agentsDir, targets.claudeDir]) {
+    if (await isSameDirectory(codexSkillDir, path.join(root, skillName))) return false;
+  }
+  return true;
+}
+
+async function retireManagedSkill(dstDir: string): Promise<number> {
+  const info = await fs.lstat(dstDir).catch(() => null);
+  if (!info?.isDirectory()) return 0;
+  const manifest = await readManagedFilesManifest(dstDir);
+  if (!manifest) return 0;
+  const files = Object.keys(manifest.files);
+  await assertManagedPathsStayInsideSkill(dstDir, [MANAGED_FILES_MANIFEST, ...files]);
+  const removed: string[] = [];
+  for (const [rel, previousHash] of Object.entries(manifest.files)) {
+    const filePath = path.join(dstDir, rel);
+    const currentHash = await hashFile(filePath).catch(() => null);
+    if (currentHash !== previousHash) continue;
+    await fs.rm(filePath);
+    removed.push(rel);
+  }
+  await pruneEmptyParentDirs(dstDir, removed);
+  await fs.rm(path.join(dstDir, MANAGED_FILES_MANIFEST));
+  await fs.rmdir(dstDir).catch((error: NodeJS.ErrnoException) => {
+    if (error.code !== "ENOTEMPTY" && error.code !== "ENOENT") throw error;
+  });
+  return removed.length + 1;
+}
+
 export async function syncSkills(options: SkillSyncOptions): Promise<SkillSyncResult> {
   let changedFiles = 0;
   let processedSkills = 0;
@@ -206,10 +252,10 @@ export async function syncSkills(options: SkillSyncOptions): Promise<SkillSyncRe
         path.join(options.claudeDir, skillName),
       );
 
-      changedFiles += await syncDirectoryFiles(
-        bundleSkillDir,
-        path.join(options.codexDir, skillName),
-      );
+      // Retain user edits to the old dedicated Codex copy.
+      if (await isLegacyCodexCopy(skillName, options)) {
+        changedFiles += await retireManagedSkill(path.join(options.codexDir, skillName));
+      }
 
       processedSkills++;
     } catch (error) {
diff --git a/packages/server/src/server/owned-subscriptions-client.e2e.test.ts b/packages/server/src/server/owned-subscriptions-client.e2e.test.ts
new file mode 100644
index 0000000000..623fa23ac6
--- /dev/null
+++ b/packages/server/src/server/owned-subscriptions-client.e2e.test.ts
@@ -0,0 +1,171 @@
+import { WebSocket } from "ws";
+import {
+  DaemonClient as PublicDaemonClient,
+  type WebSocketLike,
+} from "@getpaseo/client/internal/daemon-client";
+import { expect, test } from "vitest";
+import { createPaseoApi } from "@getpaseo/client";
+import { DaemonClient } from "./test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "./test-utils/paseo-daemon.js";
+
+test("two SDK facades own combined agent lists and disposal preserves the other facade", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.8.0",
+    capabilities: { owned_subscriptions: true },
+  });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const app = createPaseoApi(client);
+  const plugin = createPaseoApi(client);
+  try {
+    await admin.connect();
+    await client.connect();
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Before",
+    });
+    const appUpdates: unknown[] = [];
+    const pluginUpdates: unknown[] = [];
+    app.agents.subscribe((update) => appUpdates.push(update));
+    plugin.agents.subscribe((update) => pluginUpdates.push(update));
+    const broad = await app.agents.list({ scope: "active", subscribe: {} });
+    const filtered = await plugin.agents.list({
+      scope: "active",
+      filter: { labels: { role: "orchestrator" } },
+      page: { limit: 100 },
+      subscribe: {},
+    });
+    expect(broad.subscriptionId).toEqual(expect.any(String));
+    expect(filtered.subscriptionId).toEqual(expect.any(String));
+    expect(broad.subscriptionId).not.toBe(filtered.subscriptionId);
+    expect(filtered.entries).toEqual([]);
+    await admin.updateAgent(agent.id, { name: "After" });
+    await expect
+      .poll(() => appUpdates)
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            kind: "upsert",
+            subscriptionId: broad.subscriptionId,
+            agent: expect.objectContaining({ id: agent.id, title: "After" }),
+          }),
+        ]),
+      );
+    expect(appUpdates).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({ kind: "remove" })]),
+    );
+    expect(pluginUpdates).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          kind: "remove",
+          subscriptionId: filtered.subscriptionId,
+          agentId: agent.id,
+        }),
+      ]),
+    );
+    await plugin.dispose();
+    const before = pluginUpdates.length;
+    await admin.updateAgent(agent.id, { name: "Still observed" });
+    await expect
+      .poll(() => appUpdates)
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ agent: expect.objectContaining({ title: "Still observed" }) }),
+        ]),
+      );
+    expect(pluginUpdates).toHaveLength(before);
+  } finally {
+    await client.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("public SDK scope cancellation during bootstrap releases the returned ID", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const lifetime = new AbortController();
+  const api = createPaseoApi(client, { signal: lifetime.signal });
+  try {
+    await client.connect();
+    const listing = api.agents.list({ subscribe: {} });
+    lifetime.abort();
+    await expect(listing).rejects.toThrow("released");
+    await api.dispose();
+    const { diagnostic } = await client.collectDiagnostics();
+    expect(diagnostic).toContain("Source registrations: 0");
+    expect(diagnostic).toContain("Producer listeners: 0");
+    await expect(api.agents.list({ subscribe: {} })).rejects.toThrow("disposed");
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+});
+
+test("a restored public SDK timeline leaves missed history to the consumer", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const sockets: WebSocket[] = [];
+  const makeClient = (observer: boolean) =>
+    new PublicDaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      clientId: observer ? "timeline-observer" : "timeline-actor",
+      appVersion: "0.8.0",
+      reconnect: { enabled: false },
+      webSocketFactory: (url) => {
+        const socket = new WebSocket(url);
+        if (observer) {
+          sockets.push(socket);
+        }
+        return socket as unknown as WebSocketLike;
+      },
+    });
+  const observer = makeClient(true);
+  const actor = makeClient(false);
+  const api = createPaseoApi(observer);
+  const received: unknown[] = [];
+  try {
+    await actor.connect();
+    await observer.connect();
+    const agent = await actor.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Reconnect review",
+    });
+    const handle = api.agents.ref(agent.id);
+    const subscription = handle.timeline.subscribe((event) => received.push(event));
+    await subscription.ready;
+    await actor.sendMessage(agent.id, "before-outage");
+    await actor.waitForFinish(agent.id);
+    await expect.poll(() => JSON.stringify(received)).toContain("before-outage");
+    const cached = await handle.timeline.refetch();
+    expect(cached.endCursor).not.toBeNull();
+    const oldId = subscription.subscriptionId;
+    sockets[0]!.terminate();
+    await expect.poll(() => observer.getConnectionState().status).not.toBe("connected");
+    await actor.sendMessage(agent.id, "during-outage");
+    await actor.waitForFinish(agent.id);
+    await observer.connect();
+    await expect
+      .poll(() => subscription.subscriptionId)
+      .toSatisfy((id: unknown) => typeof id === "string" && id !== oldId);
+    await expect.poll(() => JSON.stringify(received)).toContain("subscription_restored");
+    expect(JSON.stringify(received)).not.toContain("during-outage");
+    await actor.sendMessage(agent.id, "after-outage");
+    await actor.waitForFinish(agent.id);
+    await expect.poll(() => JSON.stringify(received)).toContain("after-outage");
+    const history = await handle.timeline.refetch({
+      direction: "after",
+      cursor: cached.endCursor!,
+      projection: "projected",
+    });
+    expect(JSON.stringify(history)).toContain("during-outage");
+    expect(JSON.stringify(received)).not.toContain("during-outage");
+  } finally {
+    await api.dispose();
+    await observer.close();
+    await actor.close();
+    await daemon.close();
+  }
+});
diff --git a/packages/server/src/server/owned-subscriptions.e2e.test.ts b/packages/server/src/server/owned-subscriptions.e2e.test.ts
new file mode 100644
index 0000000000..68437daf70
--- /dev/null
+++ b/packages/server/src/server/owned-subscriptions.e2e.test.ts
@@ -0,0 +1,1755 @@
+import { MockLoadTestAgentClient } from "./agent/providers/mock-load-test-agent.js";
+import { createPaseoApi } from "@getpaseo/client";
+import { execFileSync } from "node:child_process";
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test } from "vitest";
+import type { z } from "zod";
+import { WebSocket, WebSocketServer } from "ws";
+import { createServer } from "node:http";
+import {
+  decodeTerminalStreamFrame,
+  encodeFileTransferFrame,
+  FileTransferOpcode,
+  TerminalStreamOpcode,
+} from "@getpaseo/protocol/binary-frames/index";
+import { DaemonClient } from "./test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "./test-utils/paseo-daemon.js";
+import {
+  SessionInboundMessageSchema,
+  type SessionInboundMessage,
+  type SessionOutboundMessage,
+  type WSOutboundMessage,
+} from "./messages.js";
+
+class SubscriptionPeer {
+  readonly frames: WSOutboundMessage[] = [];
+  readonly binaryFrames: Uint8Array[] = [];
+
+  private constructor(private readonly socket: WebSocket) {
+    socket.on("message", (data, binary) => {
+      if (!binary) this.frames.push(JSON.parse(data.toString()));
+      else this.binaryFrames.push(new Uint8Array(data as Buffer));
+    });
+  }
+
+  static async connect(
+    port: number,
+    clientId: string,
+    capabilities: Record<string, unknown> = {},
+  ): Promise<SubscriptionPeer> {
+    const socket = new WebSocket(`ws://127.0.0.1:${port}/ws`);
+    const peer = new SubscriptionPeer(socket);
+    await new Promise<void>((resolve, reject) => {
+      socket.once("open", resolve);
+      socket.once("error", reject);
+    });
+    socket.send(
+      JSON.stringify({
+        type: "hello",
+        clientType: "browser",
+        clientId,
+        protocolVersion: 1,
+        appVersion: "0.8.0",
+        capabilities: { owned_subscriptions: true, ...capabilities },
+      }),
+    );
+    await expect
+      .poll(() =>
+        peer.frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            frame.message.type === "status" &&
+            frame.message.payload.status === "server_info",
+        ),
+      )
+      .toBe(true);
+    peer.frames.length = 0;
+    return peer;
+  }
+
+  async request(message: z.input<typeof SessionInboundMessageSchema>): Promise<void> {
+    this.socket.send(JSON.stringify({ type: "session", message }));
+    await expect
+      .poll(() =>
+        this.frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            "payload" in frame.message &&
+            "requestId" in frame.message.payload &&
+            "requestId" in message &&
+            frame.message.payload.requestId === message.requestId,
+        ),
+      )
+      .toBe(true);
+  }
+
+  send(message: z.input<typeof SessionInboundMessageSchema>): void {
+    this.socket.send(
+      JSON.stringify({ type: "session", message: SessionInboundMessageSchema.parse(message) }),
+    );
+  }
+
+  upload(requestId: string, text: string, fileName: string): void {
+    this.socket.send(
+      encodeFileTransferFrame({
+        opcode: FileTransferOpcode.FileBegin,
+        requestId,
+        metadata: {
+          mime: "text/plain",
+          size: new TextEncoder().encode(text).byteLength,
+          encoding: "binary",
+          modifiedAt: "2026-09-09T00:00:00Z",
+          fileName,
+        },
+      }),
+    );
+    this.socket.send(
+      encodeFileTransferFrame({
+        opcode: FileTransferOpcode.FileChunk,
+        requestId,
+        payload: new TextEncoder().encode(text),
+      }),
+    );
+    this.socket.send(encodeFileTransferFrame({ opcode: FileTransferOpcode.FileEnd, requestId }));
+  }
+
+  close(): void {
+    this.socket.terminate();
+  }
+}
+
+test("a pure list reply belongs only to its source socket in a shared logical session", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const idle = await SubscriptionPeer.connect(daemon.port, "shared-owned-session");
+    peers.push(idle);
+    const reader = await SubscriptionPeer.connect(daemon.port, "shared-owned-session");
+    peers.push(reader);
+    await reader.request({ type: "fetch_agents_request", requestId: "reader-snapshot" });
+    await idle.request({ type: "ping", requestId: "idle-barrier", clientSentAt: 1 });
+    expect(
+      idle.frames.filter(
+        (frame) => frame.type === "session" && frame.message.type === "fetch_agents_response",
+      ),
+    ).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await daemon.close();
+  }
+});
+
+test("combined filtered agent lists create independent server-owned observations", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Before",
+    });
+    peer = await SubscriptionPeer.connect(daemon.port, "independent-agent-views");
+    await peer.request({ type: "fetch_agents_request", requestId: "all", subscribe: {} });
+    await peer.request({
+      type: "fetch_agents_request",
+      requestId: "filtered",
+      filter: { labels: { role: "orchestrator" } },
+      subscribe: {},
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "fetch_agents_response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    const [all, filtered] = snapshots;
+    expect(typeof all.subscriptionId).toBe("string");
+    expect(typeof filtered.subscriptionId).toBe("string");
+    expect(all.subscriptionId).not.toBe(filtered.subscriptionId);
+    await admin.updateAgent(agent.id, { name: "After" });
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "agent_update"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            subscriptionId: all.subscriptionId,
+            kind: "upsert",
+            agent: expect.objectContaining({ id: agent.id, title: "After" }),
+          }),
+          expect.objectContaining({
+            subscriptionId: filtered.subscriptionId,
+            kind: "remove",
+            agentId: agent.id,
+          }),
+        ]),
+      );
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-filtered",
+      subscriptionId: filtered.subscriptionId!,
+    });
+    peer.frames.length = 0;
+    await admin.updateAgent(agent.id, { name: "Still observed" });
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "agent_update"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual([
+        expect.objectContaining({
+          subscriptionId: all.subscriptionId,
+          kind: "upsert",
+          agent: expect.objectContaining({ id: agent.id, title: "Still observed" }),
+        }),
+      ]);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("workspace filters and identical queries coexist until their own release", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const aDir = path.join(daemon.staticDir, "a");
+    const bDir = path.join(daemon.staticDir, "b");
+    await mkdir(aDir);
+    await mkdir(bDir);
+    const a = (await admin.createWorkspace({ source: { kind: "directory", path: aDir } }))
+      .workspace!;
+    const b = (await admin.createWorkspace({ source: { kind: "directory", path: bDir } }))
+      .workspace!;
+    peer = await SubscriptionPeer.connect(daemon.port, "independent-workspace-views");
+    await peer.request({
+      type: "fetch_workspaces_request",
+      requestId: "a",
+      filter: { projectId: a.projectId },
+      subscribe: {},
+    });
+    await peer.request({
+      type: "fetch_workspaces_request",
+      requestId: "b",
+      filter: { projectId: b.projectId },
+      subscribe: {},
+    });
+    await peer.request({
+      type: "fetch_workspaces_request",
+      requestId: "b-copy",
+      filter: { projectId: b.projectId },
+      subscribe: {},
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "fetch_workspaces_response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(3);
+    const ids = snapshots.map((snapshot) => snapshot.subscriptionId!);
+    expect(new Set(ids).size).toBe(3);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-b",
+      subscriptionId: ids[1],
+    });
+    await admin.setWorkspaceTitle(a.id, "A updated");
+    await admin.setWorkspaceTitle(b.id, "B updated");
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "workspace_update"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            subscriptionId: ids[0],
+            kind: "upsert",
+            workspace: expect.objectContaining({ id: a.id, name: "A updated" }),
+          }),
+          expect.objectContaining({
+            subscriptionId: ids[2],
+            kind: "upsert",
+            workspace: expect.objectContaining({ id: b.id, name: "B updated" }),
+          }),
+        ]),
+      );
+    expect(
+      peer.frames.filter(
+        (frame) =>
+          frame.type === "session" &&
+          frame.message.type === "workspace_update" &&
+          "subscriptionId" in frame.message.payload &&
+          frame.message.payload.subscriptionId === ids[1],
+      ),
+    ).toEqual([]);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("label lists are pure and label observers have independent lifetimes", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace!;
+    peer = await SubscriptionPeer.connect(daemon.port, "label-views");
+    await peer.request({ type: "workspace.label.list.request", requestId: "plain" });
+    await peer.request({ type: "workspace.label.list.request", requestId: "first", subscribe: {} });
+    await peer.request({
+      type: "workspace.label.list.request",
+      requestId: "second",
+      subscribe: {},
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "workspace.label.list.response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(3);
+    expect(snapshots[0]).not.toHaveProperty("subscriptionId");
+    const first = snapshots[1] as (typeof snapshots)[number] & { subscriptionId: string };
+    const second = snapshots[2] as (typeof snapshots)[number] & { subscriptionId: string };
+    expect(typeof first.subscriptionId).toBe("string");
+    expect(first.subscriptionId).not.toBe(second.subscriptionId);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release",
+      subscriptionId: first.subscriptionId,
+    });
+    peer.frames.length = 0;
+    await peer.request({
+      type: "workspace.label.assignment.set.request",
+      requestId: "assign",
+      workspaceId: workspace.id,
+      label: { name: "QA", color: "blue" },
+      assigned: true,
+    });
+    await expect
+      .poll(() =>
+        peer!.frames.flatMap((frame) =>
+          frame.type === "session" && frame.message.type === "workspace.label.update"
+            ? [frame.message.payload]
+            : [],
+        ),
+      )
+      .toEqual([
+        expect.objectContaining({
+          kind: "upsert",
+          subscriptionId: second.subscriptionId,
+          label: { name: "QA", color: "blue" },
+        }),
+      ]);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("identical file observations get server IDs and release independently", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await writeFile(path.join(daemon.staticDir, "observed.txt"), "before");
+    peer = await SubscriptionPeer.connect(daemon.port, "file-observers");
+    await peer.request({
+      type: "fs.file.subscribe.request",
+      requestId: "file-a",
+      cwd: daemon.staticDir,
+      path: "observed.txt",
+    });
+    await peer.request({
+      type: "fs.file.subscribe.request",
+      requestId: "file-b",
+      cwd: daemon.staticDir,
+      path: "observed.txt",
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "fs.file.subscribe.response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    expect(snapshots[0].subscriptionId).not.toBe(snapshots[1].subscriptionId);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-file-a",
+      subscriptionId: snapshots[0].subscriptionId,
+    });
+    peer.frames.length = 0;
+    await writeFile(path.join(daemon.staticDir, "observed.txt"), "after");
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "fs.file.update"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual([
+        expect.objectContaining({
+          subscriptionId: snapshots[1].subscriptionId,
+          version: expect.objectContaining({ status: "ready" }),
+        }),
+      ]);
+  } finally {
+    peer?.close();
+    await daemon.close();
+  }
+});
+
+test("checkout diff reads are snapshots and identical observers release independently", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    const cwd = daemon.staticDir;
+    execFileSync("git", ["init", "-q", "--initial-branch=main", cwd]);
+    await writeFile(path.join(cwd, "tracked.txt"), "before\n");
+    execFileSync("git", ["-C", cwd, "add", "tracked.txt"]);
+    execFileSync("git", [
+      "-C",
+      cwd,
+      "-c",
+      "user.name=QA",
+      "-c",
+      "user.email=qa@example.invalid",
+      "commit",
+      "-qm",
+      "Initial",
+    ]);
+    peer = await SubscriptionPeer.connect(daemon.port, "diff-observers");
+    await peer.request({
+      type: "checkout.diff.get.request",
+      requestId: "read",
+      cwd,
+      compare: { mode: "uncommitted" },
+    });
+    await peer.request({
+      type: "subscribe_checkout_diff_request",
+      requestId: "diff-a",
+      cwd,
+      compare: { mode: "uncommitted" },
+    });
+    await peer.request({
+      type: "subscribe_checkout_diff_request",
+      requestId: "diff-b",
+      cwd,
+      compare: { mode: "uncommitted" },
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "subscribe_checkout_diff_response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    expect(snapshots[0].subscriptionId).not.toBe(snapshots[1].subscriptionId);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-diff-a",
+      subscriptionId: snapshots[0].subscriptionId,
+    });
+    peer.frames.length = 0;
+    await writeFile(path.join(cwd, "tracked.txt"), "after\n");
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" &&
+            frame.message.type === "checkout_diff_update" &&
+            frame.message.payload.files.length > 0
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 10000 },
+      )
+      .toEqual([
+        expect.objectContaining({
+          subscriptionId: snapshots[1].subscriptionId,
+          error: null,
+          files: [expect.objectContaining({ path: "tracked.txt" })],
+        }),
+      ]);
+  } finally {
+    peer?.close();
+    await daemon.close();
+  }
+});
+
+test("event-category observations use independent IDs without enabling other categories", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    peer = await SubscriptionPeer.connect(daemon.port, "event-observers");
+    await peer.request({
+      type: "session.events.set_subscription.request",
+      requestId: "events-a",
+      events: ["project.update"],
+    });
+    await peer.request({
+      type: "session.events.set_subscription.request",
+      requestId: "events-b",
+      events: ["project.update"],
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "session.events.set_subscription.response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    const ids = snapshots.map(
+      (snapshot) => (snapshot as typeof snapshot & { subscriptionId: string }).subscriptionId,
+    );
+    expect(ids.every((id) => typeof id === "string")).toBe(true);
+    expect(ids[0]).not.toBe(ids[1]);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-events-a",
+      subscriptionId: ids[0],
+    });
+    peer.frames.length = 0;
+    await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } });
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "project.update"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ subscriptionId: ids[1], kind: "upsert" }),
+        ]),
+      );
+    expect(
+      peer.frames.filter(
+        (frame) => frame.type === "session" && frame.message.type !== "project.update",
+      ),
+    ).toEqual([]);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("timeline observers for the same agent survive an independent release", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Timeline",
+    });
+    peer = await SubscriptionPeer.connect(daemon.port, "timeline-observers");
+    await peer.request({
+      type: "agent.timeline.set_subscription.request",
+      requestId: "timeline-a",
+      agentIds: [agent.id],
+    });
+    await peer.request({
+      type: "agent.timeline.set_subscription.request",
+      requestId: "timeline-b",
+      agentIds: [agent.id],
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "agent.timeline.set_subscription.response"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    const ids = snapshots.map(
+      (snapshot) => (snapshot as typeof snapshot & { subscriptionId: string }).subscriptionId,
+    );
+    expect(ids.every((id) => typeof id === "string")).toBe(true);
+    expect(ids[0]).not.toBe(ids[1]);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-timeline-a",
+      subscriptionId: ids[0],
+    });
+    peer.frames.length = 0;
+    await admin.sendMessage(agent.id, "An observed turn");
+    await expect
+      .poll(
+        () =>
+          peer!.frames.filter(
+            (frame) => frame.type === "session" && frame.message.type === "agent_stream",
+          ).length,
+        { timeout: 5000 },
+      )
+      .toBeGreaterThan(0);
+    const updates = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "agent_stream"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(
+      updates.every(
+        (update) =>
+          "subscriptionId" in update &&
+          update.subscriptionId === ids[1] &&
+          update.agentId === agent.id,
+      ),
+    ).toBe(true);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("same-workspace terminal directory observers do not share a teardown slot", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace!;
+    peer = await SubscriptionPeer.connect(daemon.port, "terminal-directory-observers");
+    await peer.request({
+      type: "subscribe_terminals_request",
+      requestId: "terminals-a",
+      cwd: daemon.staticDir,
+      workspaceId: workspace.id,
+    });
+    await peer.request({
+      type: "subscribe_terminals_request",
+      requestId: "terminals-b",
+      cwd: daemon.staticDir,
+      workspaceId: workspace.id,
+    });
+    const snapshots = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "terminals_changed"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(snapshots).toHaveLength(2);
+    const ids = snapshots.map(
+      (snapshot) => (snapshot as typeof snapshot & { subscriptionId: string }).subscriptionId,
+    );
+    expect(ids.every((id) => typeof id === "string")).toBe(true);
+    expect(ids[0]).not.toBe(ids[1]);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-terminals-a",
+      subscriptionId: ids[0],
+    });
+    peer.frames.length = 0;
+    const result = await admin.createTerminal(daemon.staticDir, "Observed terminal", undefined, {
+      workspaceId: workspace.id,
+      command: "/bin/cat",
+    });
+    expect(result.error).toBe(null);
+    await expect
+      .poll(
+        () =>
+          peer!.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "terminals_changed"
+              ? [frame.message.payload]
+              : [],
+          ),
+        { timeout: 5000 },
+      )
+      .toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            subscriptionId: ids[1],
+            workspaceId: workspace.id,
+            terminals: [expect.objectContaining({ id: result.terminal!.id })],
+          }),
+        ]),
+      );
+    const updates = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "terminals_changed"
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(
+      updates.every((update) => "subscriptionId" in update && update.subscriptionId === ids[1]),
+    ).toBe(true);
+    await admin.killTerminal(result.terminal!.id);
+  } finally {
+    peer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("terminal output has separate server IDs and binary slots, including in a shared session", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace!;
+    const result = await admin.createTerminal(daemon.staticDir, "Output ownership", undefined, {
+      workspaceId: workspace.id,
+      command: "/bin/cat",
+    });
+    expect(result.error).toBe(null);
+    const idle = await SubscriptionPeer.connect(daemon.port, "terminal-output-session");
+    peers.push(idle);
+    const peer = await SubscriptionPeer.connect(daemon.port, "terminal-output-session");
+    peers.push(peer);
+    for (const requestId of ["output-a", "output-b"]) {
+      await peer.request({
+        type: "subscribe_terminal_request",
+        requestId,
+        terminalId: result.terminal!.id,
+      });
+    }
+    const replies = peer.frames.flatMap((frame) =>
+      frame.type === "session" &&
+      frame.message.type === "subscribe_terminal_response" &&
+      frame.message.payload.error === null
+        ? [frame.message.payload]
+        : [],
+    );
+    expect(replies).toHaveLength(2);
+    const ids = replies.map(
+      (reply) => (reply as typeof reply & { subscriptionId: string }).subscriptionId,
+    );
+    expect(ids.every((id) => typeof id === "string")).toBe(true);
+    expect(ids[0]).not.toBe(ids[1]);
+    expect(replies[0].slot).not.toBe(replies[1].slot);
+    await expect
+      .poll(() =>
+        peer.binaryFrames
+          .map(decodeTerminalStreamFrame)
+          .filter((frame) => frame?.opcode === TerminalStreamOpcode.Snapshot)
+          .map((frame) => frame!.slot),
+      )
+      .toEqual(expect.arrayContaining(replies.map((reply) => reply.slot)));
+    expect(idle.binaryFrames).toEqual([]);
+    await peer.request({
+      type: "subscription.release.request",
+      requestId: "release-output-a",
+      subscriptionId: ids[0],
+    });
+    peer.binaryFrames.length = 0;
+    admin.sendTerminalInput(result.terminal!.id, { type: "input", data: "remaining-observer\n" });
+    await expect
+      .poll(
+        () =>
+          peer.binaryFrames
+            .map(decodeTerminalStreamFrame)
+            .filter((frame) => frame?.opcode === TerminalStreamOpcode.Output)
+            .map((frame) => Buffer.from(frame!.payload).toString())
+            .join(""),
+        { timeout: 5000 },
+      )
+      .toContain("remaining-observer");
+    expect(
+      peer.binaryFrames
+        .map(decodeTerminalStreamFrame)
+        .every((frame) => frame?.slot === replies[1].slot),
+    ).toBe(true);
+    expect(idle.binaryFrames).toEqual([]);
+    await admin.killTerminal(result.terminal!.id);
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("a modern connection and pure reads retain no client observation producers", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  let peer: SubscriptionPeer | undefined;
+  try {
+    peer = await SubscriptionPeer.connect(daemon.port, "no-demand-producers");
+    await peer.request({ type: "fetch_agents_request", requestId: "plain-agents" });
+    await peer.request({ type: "fetch_workspaces_request", requestId: "plain-workspaces" });
+    await peer.request({ type: "workspace.label.list.request", requestId: "plain-labels" });
+    await peer.request({ type: "list_terminals_request", requestId: "plain-terminals" });
+    await peer.request({ type: "diagnostics.request", requestId: "producer-diagnostics" });
+    const diagnostic = peer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "diagnostics.response"
+        ? [frame.message.payload.diagnostic]
+        : [],
+    )[0];
+    expect(diagnostic).toContain("Session observations");
+    expect(diagnostic).toContain("Registrations: 0");
+    expect(diagnostic).toContain("Producer listeners: 0");
+    expect(diagnostic).toContain("Git observations: 0");
+  } finally {
+    peer?.close();
+    await daemon.close();
+  }
+});
+
+test("config changes require their own event demand and cannot escape to an idle socket", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const idle = await SubscriptionPeer.connect(daemon.port, "config-session");
+    peers.push(idle);
+    const observer = await SubscriptionPeer.connect(daemon.port, "config-session");
+    peers.push(observer);
+    await observer.request({
+      type: "session.events.set_subscription.request",
+      requestId: "config-feed",
+      events: ["status.daemon_config_changed"],
+    });
+    await admin.patchDaemonConfig({ autoArchiveAfterMerge: true });
+    await expect
+      .poll(() =>
+        observer.frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            frame.message.type === "status" &&
+            frame.message.payload.status === "daemon_config_changed",
+        ),
+      )
+      .toBe(true);
+    expect(idle.frames).toEqual([]);
+    const changes = observer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "status" ? [frame.message.payload] : [],
+    );
+    expect(
+      changes.every(
+        (change) =>
+          change.status === "daemon_config_changed" && typeof change.subscriptionId === "string",
+      ),
+    ).toBe(true);
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("status-shaped operation replies use actual source request provenance", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const idle = await SubscriptionPeer.connect(daemon.port, "status-reply-session");
+    peers.push(idle);
+    const actor = await SubscriptionPeer.connect(daemon.port, "status-reply-session");
+    peers.push(actor);
+    await actor.request({
+      type: "create_agent_request",
+      requestId: "created-status",
+      config: { provider: "codex", cwd: daemon.staticDir },
+    });
+    expect(actor.frames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "session",
+          message: expect.objectContaining({
+            type: "status",
+            payload: expect.objectContaining({
+              status: "agent_created",
+              requestId: "created-status",
+            }),
+          }),
+        }),
+      ]),
+    );
+    expect(idle.frames).toEqual([]);
+    await actor.request({ type: "schedule/list", requestId: "schedule-list" });
+    expect(idle.frames).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await daemon.close();
+  }
+});
+
+test("browser capability advertisement is passive and explicit hosts own command delivery", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const capability = { hostKind: "QA browser", supportedCommands: ["list_tabs"] };
+    const idle = await SubscriptionPeer.connect(daemon.port, "browser-host-session", {
+      browser_host: capability,
+    });
+    peers.push(idle);
+    expect(daemon.daemon.browserToolsBroker.getRegisteredClientCount()).toBe(0);
+    const host = await SubscriptionPeer.connect(daemon.port, "browser-host-session", {
+      browser_host: capability,
+    });
+    peers.push(host);
+    await host.request({
+      type: "browser.host.register.request",
+      requestId: "host-register",
+      hostKind: capability.hostKind,
+      supportedCommands: ["list_tabs"],
+    });
+    expect(daemon.daemon.browserToolsBroker.getRegisteredClientCount()).toBe(1);
+    const pending = daemon.daemon.browserToolsBroker.execute({
+      command: { command: "list_tabs", args: {} },
+    });
+    await expect
+      .poll(() =>
+        host.frames.some(
+          (frame) =>
+            frame.type === "session" && frame.message.type === "browser.automation.execute.request",
+        ),
+      )
+      .toBe(true);
+    expect(idle.frames).toEqual([]);
+    const registration = host.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "browser.host.register.response"
+        ? [frame.message.payload]
+        : [],
+    )[0];
+    await host.request({
+      type: "subscription.release.request",
+      requestId: "release-host",
+      subscriptionId: registration.subscriptionId,
+    });
+    expect(daemon.daemon.browserToolsBroker.getRegisteredClientCount()).toBe(0);
+    expect(daemon.daemon.browserToolsBroker.getPendingRequestCount()).toBe(0);
+    await expect(pending).resolves.toMatchObject({ ok: false, error: { code: "browser_no_host" } });
+  } finally {
+    for (const peer of peers) peer.close();
+    await daemon.close();
+  }
+});
+
+test("adding raw client listeners does not create server observation demand", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.8.0",
+    capabilities: { owned_subscriptions: true },
+  });
+  try {
+    await client.connect();
+    const off = client.on("project.update", () => {});
+    const all = client.subscribe(() => {});
+    await client.ping();
+    const { diagnostic } = await client.collectDiagnostics();
+    expect(diagnostic).toContain("Registrations: 0");
+    expect(diagnostic).toContain("Producer listeners: 0");
+    off();
+    all();
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+});
+
+test("upload operations with identical request IDs belong to their source sockets", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const a = await SubscriptionPeer.connect(daemon.port, "upload-shared-session");
+    peers.push(a);
+    const b = await SubscriptionPeer.connect(daemon.port, "upload-shared-session");
+    peers.push(b);
+    const idle = await SubscriptionPeer.connect(daemon.port, "upload-shared-session");
+    peers.push(idle);
+    a.send({
+      type: "file.upload.request",
+      requestId: "same-upload",
+      fileName: "a.txt",
+      mimeType: "text/plain",
+      size: 5,
+      modifiedAt: "2026-09-09T00:00:00Z",
+    });
+    b.send({
+      type: "file.upload.request",
+      requestId: "same-upload",
+      fileName: "b.txt",
+      mimeType: "text/plain",
+      size: 5,
+      modifiedAt: "2026-09-09T00:00:00Z",
+    });
+    await a.request({ type: "ping", requestId: "a-upload-begun", clientSentAt: 1 });
+    await b.request({ type: "ping", requestId: "b-upload-begun", clientSentAt: 1 });
+    a.upload("same-upload", "alpha", "a.txt");
+    b.upload("same-upload", "bravo", "b.txt");
+    const uploads = (peer: SubscriptionPeer) =>
+      peer.frames.flatMap((frame) =>
+        frame.type === "session" && frame.message.type === "file.upload.response"
+          ? [frame.message.payload]
+          : [],
+      );
+    await expect
+      .poll(() => uploads(a))
+      .toEqual([
+        expect.objectContaining({
+          error: null,
+          file: expect.objectContaining({ fileName: "a.txt" }),
+        }),
+      ]);
+    await expect
+      .poll(() => uploads(b))
+      .toEqual([
+        expect.objectContaining({
+          error: null,
+          file: expect.objectContaining({ fileName: "b.txt" }),
+        }),
+      ]);
+    expect(uploads(a)[0]?.file?.id).not.toBe(uploads(b)[0]?.file?.id);
+    expect(uploads(idle)).toEqual([]);
+  } finally {
+    peers.forEach((peer) => peer.close());
+    await daemon.close();
+  }
+});
+
+test("notification ownership is separate from data demand and another socket's focus", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace;
+    if (!workspace) throw new Error("Workspace creation failed");
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      workspaceId: workspace.id,
+      title: "Attention",
+    });
+    const observer = await SubscriptionPeer.connect(daemon.port, "attention-sources");
+    const passive = await SubscriptionPeer.connect(daemon.port, "attention-sources");
+    peers.push(observer, passive);
+    for (const requestId of ["data-a", "data-b", "notifications"]) {
+      await observer.request({
+        type: "session.events.set_subscription.request",
+        requestId,
+        events: ["agent_attention_required"],
+        notifications: requestId === "notifications",
+      });
+    }
+    const snapshots = observer.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "session.events.set_subscription.response"
+        ? [frame.message.payload]
+        : [],
+    );
+    const notificationId = snapshots.find(
+      (snapshot) => snapshot.requestId === "notifications",
+    )!.subscriptionId;
+    observer.send({
+      type: "client_heartbeat",
+      deviceType: "web",
+      focusedAgentId: null,
+      lastActivityAt: new Date().toISOString(),
+      appVisible: true,
+    });
+    passive.send({
+      type: "client_heartbeat",
+      deviceType: "web",
+      focusedAgentId: agent.id,
+      lastActivityAt: new Date().toISOString(),
+      appVisible: true,
+    });
+    await passive.request({ type: "ping", requestId: "focused-barrier", clientSentAt: 1 });
+    observer.frames.length = 0;
+    passive.frames.length = 0;
+    await admin.sendMessage(agent.id, "Complete a turn");
+    const updates = () =>
+      observer.frames.flatMap((frame) =>
+        frame.type === "session" && frame.message.type === "agent_attention_required"
+          ? [frame.message.payload]
+          : [],
+      );
+    await expect.poll(() => updates().length, { timeout: 10000 }).toBe(3);
+    expect(
+      updates()
+        .filter((update) => update.shouldNotify)
+        .map((update) => update.subscriptionId),
+    ).toEqual([notificationId]);
+    expect(new Set(updates().map((update) => update.subscriptionId))).toEqual(
+      new Set(snapshots.map((snapshot) => snapshot.subscriptionId)),
+    );
+    expect(
+      passive.frames.filter(
+        (frame) => frame.type === "session" && frame.message.type === "agent_attention_required",
+      ),
+    ).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("protocol rejection is a source-only control reply on modern connections", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const sender = await SubscriptionPeer.connect(daemon.port, "invalid-message-sources");
+    const idle = await SubscriptionPeer.connect(daemon.port, "invalid-message-sources");
+    peers.push(sender, idle);
+    await sender.request({
+      type: "fetch_agents_request",
+      requestId: "invalid-query",
+      scope: 42,
+    } as unknown as SessionInboundMessage);
+    const replies = sender.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "rpc_error" ? [frame.message.payload] : [],
+    );
+    expect(replies).toEqual([
+      expect.objectContaining({ requestId: "invalid-query", requestType: "fetch_agents_request" }),
+    ]);
+    expect(idle.frames).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await daemon.close();
+  }
+});
+
+test("dictation failure belongs only to its requesting source and releases speech demand", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    const requester = await SubscriptionPeer.connect(daemon.port, "speech-sources");
+    const idle = await SubscriptionPeer.connect(daemon.port, "speech-sources");
+    peers.push(requester, idle);
+    requester.send({
+      type: "dictation_stream_start",
+      dictationId: "same-dictation",
+      format: "audio/pcm;rate=16000;bits=16",
+    });
+    await expect
+      .poll(() =>
+        requester.frames.some(
+          (frame) => frame.type === "session" && frame.message.type === "dictation_stream_error",
+        ),
+      )
+      .toBe(true);
+    expect(idle.frames).toEqual([]);
+    await requester.request({ type: "diagnostics.request", requestId: "speech-producers" });
+    const report = requester.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "diagnostics.response"
+        ? [frame.message.payload.diagnostic]
+        : [],
+    )[0];
+    expect(report).toContain("Registrations: 0");
+    expect(report).toContain("Producer listeners: 0");
+  } finally {
+    for (const peer of peers) peer.close();
+    await daemon.close();
+  }
+});
+
+test("a legacy socket cannot borrow a modern sibling's directory observation", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace!;
+    if (!workspace) throw new Error("Workspace creation failed");
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      workspaceId: workspace.id,
+    });
+    const modern = await SubscriptionPeer.connect(daemon.port, "mixed-notifications");
+    const legacy = await SubscriptionPeer.connect(daemon.port, "mixed-notifications", {
+      owned_subscriptions: false,
+      selective_agent_timeline: true,
+      explicit_event_subscriptions: true,
+    });
+    peers.push(modern, legacy);
+    await modern.request({
+      type: "fetch_agents_request",
+      requestId: "modern-directory",
+      subscribe: {},
+    });
+    await modern.request({
+      type: "session.events.set_subscription.request",
+      requestId: "modern-attention",
+      events: ["agent_attention_required"],
+    });
+    await admin.sendMessage(agent.id, "Finish a turn");
+    await expect
+      .poll(() =>
+        modern.frames.some(
+          (frame) => frame.type === "session" && frame.message.type === "agent_attention_required",
+        ),
+      )
+      .toBe(true);
+    expect(
+      legacy.frames.filter(
+        (frame) =>
+          frame.type === "session" &&
+          (frame.message.type === "agent_attention_required" ||
+            (frame.message.type === "agent_stream" &&
+              frame.message.payload.event.type === "attention_required")),
+      ),
+    ).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("archive and delete replies retain their historical names and reach only the requester", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const agent = await admin.createAgent({ provider: "codex", cwd: daemon.staticDir });
+    const requester = await SubscriptionPeer.connect(daemon.port, "mutation-replies");
+    const sibling = await SubscriptionPeer.connect(daemon.port, "mutation-replies");
+    peers.push(requester, sibling);
+    await requester.request({
+      type: "archive_agent_request",
+      requestId: "archive",
+      agentId: agent.id,
+    });
+    await requester.request({
+      type: "delete_agent_request",
+      requestId: "delete",
+      agentId: agent.id,
+    });
+    expect(
+      requester.frames.flatMap((frame) => (frame.type === "session" ? [frame.message.type] : [])),
+    ).toEqual(["agent_archived", "agent_deleted"]);
+    expect(sibling.frames).toEqual([]);
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("Hub bootstrap sends its server ID before the producer's synchronous snapshot", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const frames: WSOutboundMessage[] = [];
+  const hub = createServer(async (request, response) => {
+    let body = "";
+    for await (const chunk of request) body += chunk;
+    response.setHeader("content-type", "application/json");
+    if (request.url !== "/api/daemons/enroll") {
+      response.end("{}");
+      return;
+    }
+    const enrollment = JSON.parse(body);
+    const address = hub.address();
+    if (!address || typeof address === "string") throw new Error("Missing local Hub address");
+    response.end(
+      JSON.stringify({
+        daemonId: enrollment.daemonId,
+        permissions: enrollment.permissions,
+        webSocketUrl: `ws://127.0.0.1:${address.port}/socket`,
+      }),
+    );
+  });
+  const wss = new WebSocketServer({ server: hub });
+  wss.on("headers", (headers) => headers.push("x-paseo-session-protocol: 1"));
+  const connected = new Promise<WebSocket>((resolve) =>
+    wss.once("connection", (socket) => {
+      socket.on("message", (data) => frames.push(JSON.parse(data.toString())));
+      resolve(socket);
+    }),
+  );
+  let socket: WebSocket | undefined;
+  try {
+    await new Promise<void>((resolve) => hub.listen(0, "127.0.0.1", resolve));
+    const address = hub.address();
+    if (!address || typeof address === "string") throw new Error("Missing local Hub address");
+    await admin.connect();
+    await admin.connectHub(`http://127.0.0.1:${address.port}`, "local-fixture-token", [
+      "hub.execute",
+    ]);
+    socket = await connected;
+    socket.send(
+      JSON.stringify({
+        type: "hello",
+        clientId: "local-hub",
+        clientType: "hub",
+        protocolVersion: 1,
+        capabilities: { owned_subscriptions: true },
+      }),
+    );
+    await expect.poll(() => frames.length).toBeGreaterThan(0);
+    socket.send(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "hub.execution.agent.create.request",
+          requestId: "create",
+          executionId: "bootstrap",
+          provider: "codex",
+          cwd: daemon.staticDir,
+          prompt: "hello",
+        },
+      }),
+    );
+    await expect
+      .poll(() =>
+        frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            frame.message.type === "hub.execution.agent.create.response" &&
+            frame.message.payload.success,
+        ),
+      )
+      .toBe(true);
+    frames.length = 0;
+    socket.send(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "session.events.set_subscription.request",
+          requestId: "observe",
+          events: ["hub.execution.agent.update"],
+        },
+      }),
+    );
+    await expect
+      .poll(() =>
+        frames.some(
+          (frame) =>
+            frame.type === "session" && frame.message.type === "hub.execution.agent.update",
+        ),
+      )
+      .toBe(true);
+    expect(frames[0]).toMatchObject({
+      type: "session",
+      message: {
+        type: "session.events.set_subscription.response",
+        payload: { requestId: "observe", subscriptionId: expect.any(String) },
+      },
+    });
+  } finally {
+    await admin.disconnectHub(true).catch(() => {});
+    socket?.terminate();
+    await admin.close();
+    await daemon.close();
+    await new Promise<void>((resolve) => wss.close(() => resolve()));
+    await new Promise<void>((resolve) => hub.close(() => resolve()));
+  }
+});
+
+test("provider child changes require explicit event ownership and leave an idle peer quiet", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  let idle: SubscriptionPeer | undefined;
+  let observer: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    idle = await SubscriptionPeer.connect(daemon.port, "idle-provider-child");
+    observer = await SubscriptionPeer.connect(daemon.port, "provider-child-observer");
+    await observer.request({
+      type: "session.events.set_subscription.request",
+      requestId: "children",
+      events: ["agent.provider_subagents.update"],
+    });
+    const response = observer.frames.find(
+      (frame) =>
+        frame.type === "session" &&
+        frame.message.type === "session.events.set_subscription.response",
+    );
+    expect(response).toBeDefined();
+    const agent = await admin.createAgent({ provider: "codex", cwd: daemon.staticDir });
+    await admin.sendMessage(agent.id, "Emit a provider child");
+    await expect
+      .poll(() =>
+        observer!.frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            frame.message.type === "agent.provider_subagents.update" &&
+            frame.message.payload.kind === "upsert" &&
+            frame.message.payload.subagent.id === "fixture-child",
+        ),
+      )
+      .toBe(true);
+    expect(idle.frames).toEqual([]);
+    expect(idle.binaryFrames).toEqual([]);
+  } finally {
+    idle?.close();
+    observer?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("request outcomes for import and attention reach only their requesting socket", async () => {
+  const daemon = await createTestPaseoDaemon({
+    mcpEnabled: false,
+    isDev: true,
+    agentClients: { mock: new MockLoadTestAgentClient() },
+  });
+  const requester = await SubscriptionPeer.connect(daemon.port, "reply-shared");
+  const sibling = await SubscriptionPeer.connect(daemon.port, "reply-shared");
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await admin.connect();
+    await requester.request({
+      type: "import_agent_request",
+      requestId: "missing-import",
+      provider: "codex",
+      sessionId: "does-not-exist",
+    });
+    expect(requester.frames).toContainEqual(
+      expect.objectContaining({
+        message: expect.objectContaining({
+          type: "status",
+          payload: expect.objectContaining({
+            requestId: "missing-import",
+            status: "agent_create_failed",
+          }),
+        }),
+      }),
+    );
+    await requester.request({
+      type: "import_agent_request",
+      requestId: "successful-import",
+      provider: "mock",
+      sessionId: "saved-provider-session",
+      cwd: daemon.staticDir,
+    });
+    expect(requester.frames).toContainEqual(
+      expect.objectContaining({
+        message: expect.objectContaining({
+          type: "status",
+          payload: expect.objectContaining({
+            requestId: "successful-import",
+            status: "agent_resumed",
+          }),
+        }),
+      }),
+    );
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Attention",
+    });
+    await requester.request({
+      type: "clear_agent_attention",
+      requestId: "clear-attention",
+      agentId: agent.id,
+    });
+    expect(requester.frames).toContainEqual(
+      expect.objectContaining({
+        message: expect.objectContaining({ type: "clear_agent_attention_response" }),
+      }),
+    );
+    expect(sibling.frames).toEqual([]);
+    expect(sibling.binaryFrames).toEqual([]);
+  } finally {
+    requester.close();
+    sibling.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("SDK import failure settles without waiting for the request timeout", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    await expect(
+      client.importAgent({ provider: "codex", sessionId: "does-not-exist" }),
+    ).rejects.toThrow();
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+}, 5000);
+
+test("permission outcomes and domain observations keep independent source ownership", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const clients = [
+    "permission-shared",
+    "permission-shared",
+    "permission-control",
+    "permission-shared",
+  ].map((clientId) => new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, clientId }));
+  const legacy = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    clientId: "permission-shared",
+    capabilities: { owned_subscriptions: false, explicit_event_subscriptions: false },
+  });
+  clients.push(legacy);
+  const actor = clients[0];
+  const observed: SessionOutboundMessage[][] = clients.map(() => []);
+  const raw: SessionOutboundMessage[][] = clients.map(() => []);
+  try {
+    for (const [index, client] of clients.entries()) {
+      await client.connect();
+      client.subscribeRawMessages((message) => raw[index].push(message));
+    }
+    const owners = clients.slice(0, 3).map((client, index) => {
+      const owner = client.observeEvents(["agent_permission_request", "agent_permission_resolved"]);
+      owner.subscribe({ snapshot: () => {}, update: (message) => observed[index].push(message) });
+      return owner;
+    });
+    await Promise.all(owners.map((owner) => owner.ready));
+    const agent = await actor.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      modeId: "always-ask",
+    });
+    for (let round = 0; round < 3; round += 1) {
+      if (round === 1) await owners[1].release();
+      observed.forEach((messages) => {
+        messages.length = 0;
+      });
+      raw.forEach((messages) => {
+        messages.length = 0;
+      });
+      await actor.sendMessage(
+        agent.id,
+        'Request approval to run the command `printf "ok" > permission.txt`. If denied, stop.',
+      );
+      const state = await actor.waitForFinish(agent.id, 5000);
+      const permission = state.final?.pendingPermissions[0];
+      expect(permission).toBeDefined();
+      if (!permission) throw new Error("Expected a pending permission");
+      await (round === 2 ? legacy : actor).respondToPermission(agent.id, permission.id, {
+        behavior: "deny",
+        message: "Owned observation regression",
+      });
+      const resolutions = (messages: SessionOutboundMessage[]) =>
+        messages.filter(
+          (
+            message,
+          ): message is Extract<SessionOutboundMessage, { type: "agent_permission_resolved" }> =>
+            message.type === "agent_permission_resolved" &&
+            message.payload.requestId === permission.id,
+        );
+      await expect.poll(() => resolutions(observed[2]).length).toBe(1);
+      await actor.waitForFinish(agent.id, 5000);
+      await expect.poll(() => resolutions(observed[0]).length).toBe(1);
+      for (const index of [0, 1, 2]) {
+        const expected = index === 1 && round >= 1 ? 0 : 1;
+        expect(resolutions(observed[index])).toHaveLength(expected);
+        for (const message of resolutions(observed[index])) {
+          expect(message.payload).toMatchObject({
+            subscriptionId: owners[index].subscriptionId,
+            resolution: { behavior: "deny" },
+          });
+        }
+        const outcomes = resolutions(raw[index]).filter(
+          (message) => !message.payload.subscriptionId,
+        );
+        expect(outcomes).toHaveLength(index === 0 && round < 2 ? 1 : 0);
+      }
+      expect(resolutions(raw[4])).toHaveLength(1);
+      expect(raw[3]).toEqual([]);
+    }
+  } finally {
+    await Promise.all(clients.map((client) => client.close()));
+    await daemon.close();
+  }
+});
+
+test("mark unread replies remain source-owned while directory observers receive attention", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const peers: SubscriptionPeer[] = [];
+  try {
+    await admin.connect();
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      title: "Finished",
+    });
+    const actor = await SubscriptionPeer.connect(daemon.port, "mark-unread-shared");
+    peers.push(actor);
+    const sibling = await SubscriptionPeer.connect(daemon.port, "mark-unread-shared");
+    peers.push(sibling);
+    const quiet = await SubscriptionPeer.connect(daemon.port, "mark-unread-shared");
+    peers.push(quiet);
+    await sibling.request({ type: "fetch_agents_request", requestId: "directory", subscribe: {} });
+    const snapshot = sibling.frames.flatMap((frame) =>
+      frame.type === "session" && frame.message.type === "fetch_agents_response"
+        ? [frame.message.payload]
+        : [],
+    )[0];
+    const workspaceId = snapshot.entries.find((entry) => entry.agent.id === agent.id)!.agent
+      .workspaceId!;
+    await actor.request({
+      type: "workspace.clear_attention.request",
+      workspaceId,
+      requestId: "clear",
+    });
+    actor.frames.length = sibling.frames.length = quiet.frames.length = 0;
+    await actor.request({ type: "workspace.mark_unread.request", workspaceId, requestId: "mark" });
+    expect(actor.frames).toContainEqual(
+      expect.objectContaining({
+        message: {
+          type: "workspace.mark_unread.response",
+          payload: {
+            workspaceId,
+            requestId: "mark",
+            markedAgentId: agent.id,
+            success: true,
+            error: null,
+          },
+        },
+      }),
+    );
+    await expect
+      .poll(() =>
+        sibling.frames.some(
+          (frame) =>
+            frame.type === "session" &&
+            frame.message.type === "agent_update" &&
+            frame.message.payload.kind === "upsert" &&
+            frame.message.payload.agent.id === agent.id &&
+            frame.message.payload.agent.requiresAttention &&
+            frame.message.payload.subscriptionId === snapshot.subscriptionId,
+        ),
+      )
+      .toBe(true);
+    expect(
+      sibling.frames.some(
+        (frame) =>
+          frame.type === "session" && frame.message.type === "workspace.mark_unread.response",
+      ),
+    ).toBe(false);
+    expect(quiet.frames).toEqual([]);
+    expect(quiet.binaryFrames).toEqual([]);
+    await actor.request({
+      type: "workspace.mark_unread.request",
+      workspaceId,
+      requestId: "already-unread",
+    });
+    expect(actor.frames).toContainEqual(
+      expect.objectContaining({
+        message: expect.objectContaining({
+          type: "workspace.mark_unread.response",
+          payload: expect.objectContaining({ requestId: "already-unread", success: false }),
+        }),
+      }),
+    );
+  } finally {
+    for (const peer of peers) peer.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("legacy event subscribers retain notifications without the new notifications flag", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const admin = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  let legacy: SubscriptionPeer | undefined;
+  try {
+    await admin.connect();
+    const workspace = (
+      await admin.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } })
+    ).workspace!;
+    const agent = await admin.createAgent({
+      provider: "codex",
+      cwd: daemon.staticDir,
+      workspaceId: workspace.id,
+    });
+    legacy = await SubscriptionPeer.connect(daemon.port, "legacy-notifications", {
+      owned_subscriptions: false,
+      selective_agent_timeline: true,
+      explicit_event_subscriptions: true,
+    });
+    await legacy.request({
+      type: "fetch_agents_request",
+      requestId: "directory",
+      subscribe: { subscriptionId: "directory" },
+    });
+    await legacy.request({
+      type: "session.events.set_subscription.request",
+      requestId: "events",
+      events: ["agent_attention_required"],
+    });
+    legacy.send({
+      type: "client_heartbeat",
+      deviceType: "web",
+      focusedAgentId: null,
+      lastActivityAt: new Date().toISOString(),
+      appVisible: true,
+    });
+    await legacy.request({ type: "ping", requestId: "barrier", clientSentAt: 1 });
+    const peer = legacy;
+    await admin.sendMessage(agent.id, "Finish a legacy notification turn");
+    await expect
+      .poll(
+        () =>
+          peer.frames.flatMap((frame) =>
+            frame.type === "session" && frame.message.type === "agent_attention_required"
+              ? [frame.message.payload.shouldNotify]
+              : [],
+          ),
+        { timeout: 10_000 },
+      )
+      .toEqual([true]);
+  } finally {
+    legacy?.close();
+    await admin.close();
+    await daemon.close();
+  }
+});
+
+test("public project subscriptions request updates and release their producer demand", async () => {
+  const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const api = createPaseoApi(client);
+  try {
+    await client.connect();
+    const updates: unknown[] = [];
+    const unsubscribe = api.projects.subscribe((update) => updates.push(update));
+    await client.createWorkspace({ source: { kind: "directory", path: daemon.staticDir } });
+    await expect
+      .poll(() => updates)
+      .toEqual(expect.arrayContaining([expect.objectContaining({ kind: "upsert" })]));
+    unsubscribe();
+    await expect
+      .poll(async () => (await client.collectDiagnostics()).diagnostic)
+      .toContain("Registrations: 0");
+  } finally {
+    await api.dispose();
+    await client.close();
+    await daemon.close();
+  }
+});
diff --git a/packages/server/src/server/paseo-home.test.ts b/packages/server/src/server/paseo-home.test.ts
index 99a6c30d25..d8623d230b 100644
--- a/packages/server/src/server/paseo-home.test.ts
+++ b/packages/server/src/server/paseo-home.test.ts
@@ -1,24 +1,16 @@
-import { mkdtempSync, rmSync, statSync } from "node:fs";
+import { existsSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { describe, expect, test } from "vitest";
 
 import { resolvePaseoHome } from "./paseo-home.js";
-import { PRIVATE_DIRECTORY_MODE } from "./private-files.js";
-
-const MODE_MASK = 0o777;
-
-function modeOf(filePath: string): number {
-  return statSync(filePath).mode & MODE_MASK;
-}
-
-describe.skipIf(process.platform === "win32")("resolvePaseoHome permissions", () => {
-  test("creates PASEO_HOME with private permissions", () => {
+describe("resolvePaseoHome", () => {
+  test("resolves PASEO_HOME without creating it", () => {
     const parent = mkdtempSync(path.join(tmpdir(), "paseo-home-parent-"));
     const paseoHome = path.join(parent, "home");
     try {
       expect(resolvePaseoHome({ PASEO_HOME: paseoHome })).toBe(paseoHome);
-      expect(modeOf(paseoHome)).toBe(PRIVATE_DIRECTORY_MODE);
+      expect(existsSync(paseoHome)).toBe(false);
     } finally {
       rmSync(parent, { recursive: true, force: true });
     }
diff --git a/packages/server/src/server/paseo-home.ts b/packages/server/src/server/paseo-home.ts
index f933653b8b..90b0410cbd 100644
--- a/packages/server/src/server/paseo-home.ts
+++ b/packages/server/src/server/paseo-home.ts
@@ -1,6 +1,5 @@
 import os from "node:os";
 import path from "node:path";
-import { ensurePrivateDirectory } from "./private-files.js";
 
 function expandHomeDir(input: string): string {
   if (input.startsWith("~/")) {
@@ -15,6 +14,5 @@ function expandHomeDir(input: string): string {
 export function resolvePaseoHome(env: NodeJS.ProcessEnv = process.env): string {
   const raw = env.PASEO_HOME ?? "~/.paseo";
   const resolved = path.resolve(expandHomeDir(raw));
-  ensurePrivateDirectory(resolved);
   return resolved;
 }
diff --git a/packages/server/src/server/paseo-worktree-service.test.ts b/packages/server/src/server/paseo-worktree-service.test.ts
index c40f710d38..a5120aa5ff 100644
--- a/packages/server/src/server/paseo-worktree-service.test.ts
+++ b/packages/server/src/server/paseo-worktree-service.test.ts
@@ -71,7 +71,7 @@ test("creates a worktree and registers it in the source workspace project withou
   expect(result.workspace.workspaceId).toMatch(/^wks_[0-9a-f]{16}$/);
   expect(result.workspace.projectId).toBe("remote:github.com/acme/repo");
   expect(result.workspace.displayName).toBe("feature-one");
-  expect(result.workspace.baseBranch).toBe("main");
+  expect(result.workspace.baseBranch).toBe("refs/heads/main");
   expect(result.workspace.title).toBe("Feature One");
   expect(deps.workspaceGitService.getSnapshot).not.toHaveBeenCalled();
   expect(deps.projects.get(sourceProject.projectId)).toEqual({
@@ -791,13 +791,14 @@ test("does not mark checkout branch worktrees as eligible for first-agent rename
     createDeps(),
   );
 
+  // baseRefName must be the repo's default branch, not the checked-out branch
+  // itself — otherwise the diff panel compares the branch against itself and
+  // always shows no changes.
   expect(readPaseoWorktreeMetadata(created.worktree.worktreePath)).toMatchObject({
     version: 1,
-    baseRefName: "dev",
+    baseRefName: "main",
   });
-  // A checkout-branch worktree has no distinct base, so the workspace records a
-  // null baseBranch even though worktree.json's baseRefName is the branch itself.
-  expect(created.workspace.baseBranch).toBe(null);
+  expect(created.workspace.baseBranch).toBe("main");
   await expect(
     attemptFirstAgentBranchAutoName({
       cwd: created.worktree.worktreePath,
@@ -1117,6 +1118,7 @@ function createDeps(options?: {
     projectRegistry,
     workspaceRegistry,
     workspaceGitService,
+    isDirectory: async () => true,
     logger: createTestLogger(),
   });
 
diff --git a/packages/server/src/server/paseo-worktree-service.ts b/packages/server/src/server/paseo-worktree-service.ts
index dea17e1bb9..94e82d5e95 100644
--- a/packages/server/src/server/paseo-worktree-service.ts
+++ b/packages/server/src/server/paseo-worktree-service.ts
@@ -20,7 +20,6 @@ import {
 import { getCurrentBranch, localBranchExists, renameCurrentBranch } from "../utils/checkout-git.js";
 import {
   markPaseoWorktreeFirstAgentBranchAutoNameAttempted,
-  normalizeBaseRefName,
   readPaseoWorktreeMetadata,
   writePaseoWorktreeFirstAgentBranchAutoNameMetadata,
 } from "../utils/worktree-metadata.js";
@@ -31,8 +30,11 @@ import type { FirstAgentContext } from "@getpaseo/protocol/messages";
 import { runWithGitCommandPriority } from "../utils/run-git-command.js";
 
 export interface CreatePaseoWorktreeInput extends CreateWorktreeCoreInput {
+  workspaceId?: string;
   projectId?: string;
   title?: string;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface CreatePaseoWorktreeResult {
@@ -93,13 +95,16 @@ async function createPaseoWorktreeWithPriority(
     const workspace = await deps.workspaceProvisioning.createWorkspaceForWorktree({
       sourceCwd: workspaceCwdPlan.inputCwd,
       projectId: input.projectId,
+      workspaceId: input.workspaceId,
       repoRoot: createdWorktree.repoRoot,
       cwd: workspaceCwd,
       worktreeRoot: createdWorktree.worktree.worktreePath,
       branch: createdWorktree.worktree.branchName || null,
-      baseBranch: resolveIntentBaseBranch(createdWorktree.intent),
+      baseBranch: createdWorktree.worktree.comparisonBaseRef,
       title: input.title?.trim() || resolveFirstAgentPromptTitle(input.firstAgentContext),
       expectsInitialAgent: Boolean(input.firstAgentContext),
+      background: input.background,
+      callerWorkspaceId: input.callerWorkspaceId,
       ...(createdWorktree.intent.kind === "checkout-change-request" &&
       createdWorktree.intent.headRepository
         ? {
@@ -271,18 +276,3 @@ function maybeMarkFirstAgentBranchAutoNameEligible(options: {
     placeholderBranchName: createdWorktree.worktree.branchName,
   });
 }
-
-// The base branch is normalized to match worktree.json's baseRefName (origin/
-// stripped). checkout-branch worktrees have no distinct base, so they stay null.
-function resolveIntentBaseBranch(intent: WorktreeCreationIntent): string | null {
-  switch (intent.kind) {
-    case "branch-off":
-      return normalizeBaseRefName(intent.baseBranch);
-    case "checkout-change-request":
-      return normalizeBaseRefName(intent.baseRefName);
-    case "checkout-github-pr":
-      return normalizeBaseRefName(intent.baseRefName);
-    case "checkout-branch":
-      return null;
-  }
-}
diff --git a/packages/server/src/server/persisted-config-edit.test.ts b/packages/server/src/server/persisted-config-edit.test.ts
new file mode 100644
index 0000000000..4b4bf4c0db
--- /dev/null
+++ b/packages/server/src/server/persisted-config-edit.test.ts
@@ -0,0 +1,45 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "vitest";
+import {
+  editPersistedConfig,
+  getPersistedConfigValue,
+  readPersistedConfig,
+} from "./persisted-config.js";
+
+test("configuration edits validate before writing and preserve unrelated settings", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo-config-edit-"));
+  const home = path.join(root, "home");
+  try {
+    expect(readPersistedConfig(home)).toEqual({});
+    expect(existsSync(home)).toBe(false);
+    for (const field of [
+      "unknown",
+      "daemon.missing",
+      "daemon.__proto__.listen",
+      "daemon.auth.password",
+    ]) {
+      expect(() => editPersistedConfig(home, field, { value: "value" })).toThrow();
+      expect(existsSync(home)).toBe(false);
+    }
+    editPersistedConfig(home, "daemon.listen", { value: "127.0.0.1:12345" });
+    editPersistedConfig(home, "features.webUi.enabled", { value: true });
+    const before = await readFile(path.join(home, "config.json"), "utf8");
+    expect(() => editPersistedConfig(home, "features.webUi.enabled", { value: "true" })).toThrow();
+    expect(() =>
+      editPersistedConfig(home, "daemon", { value: { auth: { password: "plaintext" } } }),
+    ).toThrow(/set-password/);
+    expect(await readFile(path.join(home, "config.json"), "utf8")).toBe(before);
+    editPersistedConfig(home, "features.webUi.enabled", { unset: true });
+    const edited = readPersistedConfig(home);
+    expect(getPersistedConfigValue(edited, "features.webUi.enabled")).toBeUndefined();
+    expect(edited.daemon?.listen).toBe("127.0.0.1:12345");
+    await writeFile(path.join(home, "config.json"), "invalid json");
+    expect(() => editPersistedConfig(home, "daemon.listen", { value: "12345" })).toThrow();
+    expect(await readFile(path.join(home, "config.json"), "utf8")).toBe("invalid json");
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/persisted-config-json-schema.test.ts b/packages/server/src/server/persisted-config-json-schema.test.ts
new file mode 100644
index 0000000000..f943f859ec
--- /dev/null
+++ b/packages/server/src/server/persisted-config-json-schema.test.ts
@@ -0,0 +1,78 @@
+import { readFileSync } from "node:fs";
+import Ajv from "ajv";
+import { expect, test } from "vitest";
+import { z } from "zod";
+
+import { PersistedConfigSchema } from "./persisted-config.js";
+
+const publishedSchema = JSON.parse(
+  readFileSync(
+    new URL("../../../website/public/schemas/paseo.config.v1.json", import.meta.url),
+    "utf8",
+  ),
+);
+
+test("editors accept the daemon's browser, profile, plugin and metadata configuration", () => {
+  const config = {
+    $schema: "https://paseo.sh/schemas/paseo.config.v1.json",
+    version: 1,
+    daemon: {
+      browserTools: { enabled: true },
+      terminalProfiles: [],
+      agentProfiles: [],
+    },
+    pluginsEnabled: true,
+    plugins: {},
+    agents: {
+      metadataGeneration: { providers: [{ provider: "claude", model: "claude-opus-5" }] },
+    },
+  };
+  expect(PersistedConfigSchema.parse(config)).toEqual(config);
+  const validate = new Ajv({ allErrors: true, strict: false }).compile(publishedSchema);
+  const valid = validate(config);
+  expect(validate.errors).toBeNull();
+  expect(valid).toBe(true);
+});
+
+test("the published schema stays current with the daemon's configuration schema", () => {
+  const generated = z.toJSONSchema(PersistedConfigSchema, {
+    target: "draft-07",
+    unrepresentable: "any",
+    io: "input",
+  });
+  generated.title = "PaseoConfigV1";
+  expect(
+    publishedSchema,
+    "Run npm run generate:config-schema --workspace=@getpaseo/server",
+  ).toEqual(generated);
+});
+
+test("editors retain the existing proxy configuration help", () => {
+  const daemon = publishedSchema.properties.daemon.properties;
+  expect(daemon.trustedProxies.description).toBe(
+    'Express trusted proxy setting for X-Forwarded-* headers. Defaults to ["loopback"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.',
+  );
+  expect(daemon.serviceProxy.properties.enabled.description).toBe(
+    "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+  );
+  expect(daemon.serviceProxy.properties.listen.description).toBe(
+    "Optional service-only listener address. Presence enables the standalone service proxy listener.",
+  );
+  expect(daemon.serviceProxy.properties.publicBaseUrl.description).toBe(
+    "Optional public base URL for service host aliases.",
+  );
+});
+
+test.each([
+  { daemon: { browserTools: { enabled: "yes" } } },
+  { daemon: { terminalProfiles: "default" } },
+  { daemon: { agentProfiles: "default" } },
+  { pluginsEnabled: "yes" },
+  { plugins: [] },
+  { agents: { metadataGeneration: { providers: [{ provider: "" }] } } },
+  { unknownSetting: true },
+])("editors still reject invalid configuration: %j", (config) => {
+  expect(PersistedConfigSchema.safeParse(config).success).toBe(false);
+  const validate = new Ajv({ allErrors: true, strict: false }).compile(publishedSchema);
+  expect(validate(config)).toBe(false);
+});
diff --git a/packages/server/src/server/persisted-config.test.ts b/packages/server/src/server/persisted-config.test.ts
index 8ea1c5c25d..f443f84865 100644
--- a/packages/server/src/server/persisted-config.test.ts
+++ b/packages/server/src/server/persisted-config.test.ts
@@ -6,9 +6,10 @@ import { describe, expect, test } from "vitest";
 import {
   loadPersistedConfig,
   PersistedConfigSchema,
+  readPersistedConfig,
   savePersistedConfig,
 } from "./persisted-config.js";
-import { PRIVATE_FILE_MODE } from "./private-files.js";
+import { PRIVATE_DIRECTORY_MODE, PRIVATE_FILE_MODE } from "./private-files.js";
 
 const MODE_MASK = 0o777;
 const PERMISSIVE_FILE_MODE = 0o644;
@@ -412,20 +413,24 @@ describe("provider overrides (new format)", () => {
     expect(parsed.agents?.providers?.claude?.order).toBe(1);
   });
 
-  test("new provider without extends → error", () => {
-    const result = PersistedConfigSchema.safeParse({
-      agents: {
-        providers: {
-          zai: {
-            label: "ZAI",
-          },
-        },
-      },
+  test("accepts a plugin override before plugin registration", () => {
+    const override = { enabled: false, command: ["/opt/agent"], env: { LOGIN: "yes" } };
+    const parsed = PersistedConfigSchema.parse({
+      agents: { providers: { "plugin-agent": override } },
     });
-
-    expect(result.success).toBe(false);
+    expect(parsed.agents?.providers?.["plugin-agent"]).toEqual(override);
   });
 
+  test.each(["plugin.agent", "plugin_agent"])(
+    "keeps %s outside the config provider ID alphabet",
+    (id) => {
+      expect(
+        PersistedConfigSchema.safeParse({ agents: { providers: { [id]: { enabled: false } } } })
+          .success,
+      ).toBe(false);
+    },
+  );
+
   test("new provider without label → error", () => {
     const result = PersistedConfigSchema.safeParse({
       agents: {
@@ -736,6 +741,62 @@ describe("loadPersistedConfig", () => {
   });
 });
 
+describe("config.json saved with a UTF-8 byte order mark", () => {
+  // Windows Notepad writes this shape: a BOM, then CRLF line endings.
+  const notepadConfig =
+    '{\r\n  "version": 1,\r\n  "daemon": { "listen": "127.0.0.1:6767" }\r\n}\r\n';
+
+  test("loadPersistedConfig reads it", () => {
+    const home = createTempHome();
+    try {
+      writeFileSync(path.join(home, "config.json"), notepadConfig);
+
+      expect(loadPersistedConfig(home).daemon?.listen).toBe("127.0.0.1:6767");
+    } finally {
+      rmSync(home, { recursive: true, force: true });
+    }
+  });
+
+  test("readPersistedConfig reads it", () => {
+    const home = createTempHome();
+    try {
+      writeFileSync(path.join(home, "config.json"), notepadConfig);
+
+      expect(readPersistedConfig(home).daemon?.listen).toBe("127.0.0.1:6767");
+    } finally {
+      rmSync(home, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("readPersistedConfig with an unreadable config.json", () => {
+  test("names the file when it is not valid JSON", () => {
+    const home = createTempHome();
+    const configPath = path.join(home, "config.json");
+    try {
+      writeFileSync(configPath, '{"version":1,');
+
+      expect(() => readPersistedConfig(home)).toThrow(`[Config] Invalid JSON in ${configPath}: `);
+    } finally {
+      rmSync(home, { recursive: true, force: true });
+    }
+  });
+
+  test("names the file and the field when it does not match the schema", () => {
+    const home = createTempHome();
+    const configPath = path.join(home, "config.json");
+    try {
+      writeFileSync(configPath, '{"daemon":{"listen":5}}');
+
+      expect(() => readPersistedConfig(home)).toThrow(
+        `[Config] Invalid config in ${configPath}:\n  - daemon.listen: `,
+      );
+    } finally {
+      rmSync(home, { recursive: true, force: true });
+    }
+  });
+});
+
 describe.skipIf(process.platform === "win32")("persisted config file permissions", () => {
   test("initializes config.json with private permissions", () => {
     const home = createTempHome();
@@ -764,7 +825,8 @@ describe.skipIf(process.platform === "win32")("persisted config file permissions
   });
 
   test("saves config.json with private permissions", () => {
-    const home = createTempHome();
+    const parent = createTempHome();
+    const home = path.join(parent, "home");
     try {
       savePersistedConfig(home, {
         providers: {
@@ -774,9 +836,10 @@ describe.skipIf(process.platform === "win32")("persisted config file permissions
         },
       });
 
+      expect(modeOf(home)).toBe(PRIVATE_DIRECTORY_MODE);
       expect(modeOf(path.join(home, "config.json"))).toBe(PRIVATE_FILE_MODE);
     } finally {
-      rmSync(home, { recursive: true, force: true });
+      rmSync(parent, { recursive: true, force: true });
     }
   });
 });
diff --git a/packages/server/src/server/persisted-config.ts b/packages/server/src/server/persisted-config.ts
index 1cdaf209d8..4998455713 100644
--- a/packages/server/src/server/persisted-config.ts
+++ b/packages/server/src/server/persisted-config.ts
@@ -1,3 +1,4 @@
+import { PluginRegistriesSchema } from "@getpaseo/protocol/plugin-registry";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { z } from "zod";
@@ -9,13 +10,9 @@ import {
 } from "./agent/provider-launch-config.js";
 import type { AgentProviderRuntimeSettingsMap } from "./agent/provider-launch-config.js";
 import { ensurePrivateFile, writePrivateFileAtomicSync } from "./private-files.js";
-import {
-  AgentProfileSchema,
-  AgentSkillSelectionSchema,
-  PluginIdSchema,
-  PluginSourceSchema,
-  TerminalProfileSchema,
-} from "@getpaseo/protocol/messages";
+import { AgentProfileSchema, AgentSkillSelectionSchema } from "@getpaseo/protocol/agent-profile";
+import { PluginIdSchema, PluginSourceSchema } from "@getpaseo/protocol/plugin-config";
+import { TerminalProfileSchema } from "@getpaseo/protocol/terminal-profile";
 import { PaseoServicePortAllocationSchema } from "@getpaseo/protocol/paseo-config-schema";
 
 export const LogLevelSchema = z.enum(["trace", "debug", "info", "warn", "error", "fatal"]);
@@ -240,7 +237,12 @@ export const PersistedConfigSchema = z
         listen: z.string().optional(),
         hostnames: z.union([z.literal(true), z.array(z.string())]).optional(),
         allowedHosts: z.union([z.literal(true), z.array(z.string())]).optional(),
-        trustedProxies: z.union([z.literal(true), z.array(z.string())]).optional(),
+        trustedProxies: z
+          .union([z.literal(true), z.array(z.string())])
+          .optional()
+          .describe(
+            'Express trusted proxy setting for X-Forwarded-* headers. Defaults to ["loopback"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.',
+          ),
         mcp: z
           .object({
             enabled: z.boolean().optional(),
@@ -287,9 +289,22 @@ export const PersistedConfigSchema = z
             // COMPAT(serviceProxyEnabled): added 2026-06-02, remove after 2026-12-02.
             // Parsed only to suppress optional public/listen layers for old configs;
             // localhost service proxying remains always enabled.
-            enabled: z.boolean().optional(),
-            listen: z.string().optional(),
-            publicBaseUrl: z.url().optional(),
+            enabled: z
+              .boolean()
+              .optional()
+              .describe(
+                "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+              ),
+            listen: z
+              .string()
+              .optional()
+              .describe(
+                "Optional service-only listener address. Presence enables the standalone service proxy listener.",
+              ),
+            publicBaseUrl: z
+              .url()
+              .optional()
+              .describe("Optional public base URL for service host aliases."),
           })
           .strict()
           .optional(),
@@ -310,6 +325,7 @@ export const PersistedConfigSchema = z
       .optional(),
 
     providers: ProvidersSchema.optional(),
+    pluginRegistries: PluginRegistriesSchema.optional(),
     pluginsEnabled: z.boolean().optional(),
     plugins: z.record(PluginIdSchema, PluginSourceSchema).optional(),
     worktrees: WorktreesConfigSchema.optional(),
@@ -440,9 +456,32 @@ export function loadPersistedConfig(paseoHome: string, logger?: LoggerLike): Per
     });
   }
 
+  const config = parseConfigFile(configPath, raw);
+  log?.info(`Loaded from ${configPath}`);
+  return config;
+}
+
+/** Observe the file without initializing a home, identity, or default configuration. */
+export function readPersistedConfig(
+  paseoHome: string,
+  options: { defaultsIfMissing?: boolean } = {},
+): PersistedConfig {
+  const configPath = getConfigPath(paseoHome);
+  let raw: string;
+  try {
+    raw = readFileSync(configPath, "utf8");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT")
+      return options.defaultsIfMissing ? structuredClone(DEFAULT_PERSISTED_CONFIG) : {};
+    throw error;
+  }
+  return parseConfigFile(configPath, raw);
+}
+
+function parseConfigFile(configPath: string, raw: string): PersistedConfig {
   let parsed: unknown;
   try {
-    parsed = JSON.parse(raw);
+    parsed = parseConfigText(raw);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     throw new Error(`[Config] Invalid JSON in ${configPath}: ${message}`, {
@@ -450,19 +489,83 @@ export function loadPersistedConfig(paseoHome: string, logger?: LoggerLike): Per
     });
   }
 
-  const migrated = stripRemovedConfigFields(parsed);
-  const result = PersistedConfigSchema.safeParse(migrated);
+  const result = PersistedConfigSchema.safeParse(stripRemovedConfigFields(parsed));
   if (!result.success) {
     const issues = result.error.issues
       .map((i) => `  - ${i.path.join(".")}: ${i.message}`)
       .join("\n");
     throw new Error(`[Config] Invalid config in ${configPath}:\n${issues}`);
   }
-
-  log?.info(`Loaded from ${configPath}`);
   return result.data as PersistedConfig;
 }
 
+/** Editors such as Windows Notepad save UTF-8 with a byte order mark, which JSON.parse rejects. */
+function parseConfigText(raw: string): unknown {
+  return JSON.parse(raw.replace(/^\uFEFF/, ""));
+}
+
+function configPathParts(field: string): string[] {
+  const parts = field.split(".");
+  let schema: z.ZodType = PersistedConfigSchema;
+  for (const part of parts) {
+    if (!part || ["__proto__", "prototype", "constructor"].includes(part)) {
+      throw new Error(`Invalid configuration path: ${field}`);
+    }
+    while (
+      schema instanceof z.ZodOptional ||
+      schema instanceof z.ZodDefault ||
+      schema instanceof z.ZodPipe
+    )
+      schema = (schema instanceof z.ZodPipe ? schema.in : schema.unwrap()) as z.ZodType;
+    if (!(schema instanceof z.ZodObject) || !Object.hasOwn(schema.shape, part)) {
+      throw new Error(
+        `Unknown configuration path: ${field}. Replace its containing object with JSON for dynamic keys.`,
+      );
+    }
+    schema = schema.shape[part];
+  }
+  return parts;
+}
+
+export function getPersistedConfigValue(config: PersistedConfig, field: string): unknown {
+  return configPathParts(field).reduce<unknown>(
+    (value, part) =>
+      value && typeof value === "object" ? (value as Record<string, unknown>)[part] : undefined,
+    config,
+  );
+}
+
+export function editPersistedConfig(
+  paseoHome: string,
+  field: string,
+  edit: { value: unknown } | { unset: true },
+): PersistedConfig {
+  const parts = configPathParts(field);
+  if (field === "daemon.auth" || field.startsWith("daemon.auth.")) {
+    throw new Error("Use daemon set-password to change the daemon password.");
+  }
+  const config = readPersistedConfig(paseoHome, { defaultsIfMissing: true });
+  let object = config as Record<string, unknown>;
+  for (const part of parts.slice(0, -1)) {
+    object[part] ??= {};
+    object = object[part] as Record<string, unknown>;
+  }
+  const key = parts.at(-1)!;
+  if (field === "daemon") {
+    const previousAuth = config.daemon?.auth;
+    const nextAuth =
+      "value" in edit && edit.value && typeof edit.value === "object"
+        ? (edit.value as Record<string, unknown>).auth
+        : undefined;
+    if (JSON.stringify(previousAuth) !== JSON.stringify(nextAuth))
+      throw new Error("Use daemon set-password to change the daemon password.");
+  }
+  if ("unset" in edit) delete object[key];
+  else object[key] = edit.value;
+  savePersistedConfig(paseoHome, config);
+  return config;
+}
+
 export function savePersistedConfig(
   paseoHome: string,
   config: PersistedConfig,
diff --git a/packages/server/src/server/persistence-hooks.test.ts b/packages/server/src/server/persistence-hooks.test.ts
index da8b5419a5..a0bbb49035 100644
--- a/packages/server/src/server/persistence-hooks.test.ts
+++ b/packages/server/src/server/persistence-hooks.test.ts
@@ -27,9 +27,28 @@ function createRecord(overrides?: Partial<StoredAgentRecord>): StoredAgentRecord
 }
 
 describe("persistence hooks", () => {
+  test("buildConfigOverrides prefers the last live mode over the creation-time mode", () => {
+    const record = createRecord({
+      lastModeId: "bypass",
+      config: { modeId: "acceptEdits" },
+    });
+
+    expect(buildConfigOverrides(record).modeId).toBe("bypass");
+  });
+
+  test("buildConfigOverrides falls back to the configured mode when no live mode was recorded", () => {
+    const record = createRecord({
+      lastModeId: null,
+      config: { modeId: "acceptEdits" },
+    });
+
+    expect(buildConfigOverrides(record).modeId).toBe("acceptEdits");
+  });
+
   test("buildConfigOverrides preserves the complete private launch config", () => {
     const record = createRecord({
       title: "Voice agent (current)",
+      lastModeId: "default",
       config: {
         modeId: "default",
         model: "gpt-5.4-mini",
@@ -79,6 +98,7 @@ describe("persistence hooks", () => {
     const record = createRecord({
       provider: "codex",
       title: "Renamed title",
+      lastModeId: null,
       config: {
         model: "gpt-5.4-mini",
         systemPrompt: "Confirm and speak first.",
diff --git a/packages/server/src/server/persistence-hooks.ts b/packages/server/src/server/persistence-hooks.ts
index 16e850990f..e95743d6be 100644
--- a/packages/server/src/server/persistence-hooks.ts
+++ b/packages/server/src/server/persistence-hooks.ts
@@ -6,6 +6,7 @@ import type {
   AgentSessionConfig,
 } from "./agent/agent-sdk-types.js";
 import type { AgentStorage, StoredAgentRecord } from "./agent/agent-storage.js";
+import type { AttentionState } from "./agent/agent-manager.js";
 
 interface LoggerLike {
   child(bindings: Record<string, unknown>): LoggerLike;
@@ -66,7 +67,10 @@ export function buildConfigOverrides(record: StoredAgentRecord): Partial<AgentSe
   return stripInternalPaseoMcpServer({
     provider: record.provider,
     cwd: record.cwd,
-    modeId: record.config?.modeId ?? undefined,
+    // lastModeId is the last live mode — it also covers provider-side switches
+    // (ACP current_mode_update, in-session commands) that never reach
+    // record.config.modeId.
+    modeId: record.lastModeId ?? record.config?.modeId ?? undefined,
     model: record.config?.model ?? undefined,
     thinkingOptionId: record.config?.thinkingOptionId ?? undefined,
     featureValues: record.config?.featureValues ?? undefined,
@@ -106,6 +110,30 @@ export function isStoredAgentProviderAvailable(
   return isProviderRegistered(validProviders, record.provider);
 }
 
+/**
+ * When the record last changed, from either of the two timestamps it carries. They diverge
+ * because renaming, labelling, restoring from archive, marking unread, and clearing attention
+ * all move `updatedAt` on an unloaded agent without touching `lastActivityAt`. Reading one
+ * field alone hands consumers a time older than one they have already seen, and
+ * `acceptAgentDirectoryUpdate` drops every state update that goes backwards.
+ */
+export function resolveStoredAgentUpdatedAt(record: StoredAgentRecord): string {
+  const timestamps = [record.updatedAt, record.lastActivityAt]
+    .filter((value): value is string => typeof value === "string" && value.length > 0)
+    .map((value) => ({
+      raw: value,
+      parsed: Date.parse(value),
+    }))
+    .filter((value) => !Number.isNaN(value.parsed));
+
+  if (timestamps.length === 0) {
+    return record.updatedAt;
+  }
+
+  timestamps.sort((a, b) => b.parsed - a.parsed);
+  return timestamps[0].raw;
+}
+
 export function extractTimestamps(record: StoredAgentRecord): {
   createdAt: Date;
   updatedAt: Date;
@@ -116,7 +144,7 @@ export function extractTimestamps(record: StoredAgentRecord): {
 } {
   return {
     createdAt: new Date(record.createdAt),
-    updatedAt: new Date(record.lastActivityAt ?? record.updatedAt),
+    updatedAt: new Date(resolveStoredAgentUpdatedAt(record)),
     lastUserMessageAt: record.lastUserMessageAt ? new Date(record.lastUserMessageAt) : null,
     labels: record.labels,
     workspaceId: record.workspaceId,
@@ -124,6 +152,22 @@ export function extractTimestamps(record: StoredAgentRecord): {
   };
 }
 
+/**
+ * Unread state survives a resume. Attention is set by the agent finishing or failing and
+ * cleared by the user reading the chat (`workspace.clear_attention`); reloading the runtime
+ * is neither, so a resumed agent that drops it silently marks the chat read.
+ */
+export function extractAttention(record: StoredAgentRecord): AttentionState {
+  if (!record.requiresAttention || !record.attentionReason || !record.attentionTimestamp) {
+    return { requiresAttention: false };
+  }
+  return {
+    requiresAttention: true,
+    attentionReason: record.attentionReason,
+    attentionTimestamp: new Date(record.attentionTimestamp),
+  };
+}
+
 export function toAgentPersistenceHandle(
   registeredProviders: Iterable<AgentProvider>,
   handle: StoredAgentRecord["persistence"],
diff --git a/packages/server/src/server/pid-lock.test.ts b/packages/server/src/server/pid-lock.test.ts
index 1dc6c260bb..70e2eddae3 100644
--- a/packages/server/src/server/pid-lock.test.ts
+++ b/packages/server/src/server/pid-lock.test.ts
@@ -1,4 +1,4 @@
-import { mkdtemp, open, rm, utimes, writeFile } from "node:fs/promises";
+import { mkdtemp, open, readFile, rm, stat, utimes, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { describe, expect, test } from "vitest";
@@ -15,7 +15,8 @@ import {
 
 describe("pid-lock ownership", () => {
   test("writes and releases lock for explicit owner pid", async () => {
-    const paseoHome = await mkdtemp(join(tmpdir(), "paseo-pid-lock-owner-"));
+    const parent = await mkdtemp(join(tmpdir(), "paseo-pid-lock-owner-"));
+    const paseoHome = join(parent, "home");
     const ownerPid = process.pid + 10_000;
 
     try {
@@ -27,6 +28,9 @@ describe("pid-lock ownership", () => {
         ) => Promise<void>
       )(paseoHome, null, { ownerPid });
 
+      if (process.platform !== "win32") {
+        expect((await stat(paseoHome)).mode & 0o777).toBe(0o700);
+      }
       const lock = await getPidLockInfo(paseoHome);
       expect(lock?.pid).toBe(ownerPid);
       expect(lock?.listen).toBeNull();
@@ -55,7 +59,7 @@ describe("pid-lock ownership", () => {
       const lockAfterOwnerRelease = await getPidLockInfo(paseoHome);
       expect(lockAfterOwnerRelease).toBeNull();
     } finally {
-      await rm(paseoHome, { recursive: true, force: true });
+      await rm(parent, { recursive: true, force: true });
     }
   });
 
@@ -69,7 +73,7 @@ describe("pid-lock ownership", () => {
         pidPath,
         JSON.stringify({
           pid: process.pid,
-          startedAt: "2026-01-01T00:00:00.000Z",
+          startedAt: new Date().toISOString(),
           hostname: "old-host",
           uid: process.getuid?.() ?? 0,
           listen: "127.0.0.1:6767",
@@ -92,7 +96,7 @@ describe("pid-lock ownership", () => {
     }
   });
 
-  test("reclaims a stale desktop heartbeat lock after desktop confirms the daemon is unreachable", async () => {
+  test("preserves a stale live desktop heartbeat lock", async () => {
     const paseoHome = await mkdtemp(join(tmpdir(), "paseo-pid-lock-stale-desktop-heartbeat-"));
     const replacementOwnerPid = process.pid + 10_000;
 
@@ -102,7 +106,7 @@ describe("pid-lock ownership", () => {
         pidPath,
         JSON.stringify({
           pid: process.pid,
-          startedAt: "2026-01-01T00:00:00.000Z",
+          startedAt: new Date().toISOString(),
           hostname: "old-host",
           uid: process.getuid?.() ?? 0,
           listen: "127.0.0.1:6767",
@@ -113,14 +117,13 @@ describe("pid-lock ownership", () => {
       const staleTime = new Date(Date.now() - 10 * 60_000);
       await utimes(pidPath, staleTime, staleTime);
 
-      await acquirePidLock(paseoHome, null, {
-        ownerPid: replacementOwnerPid,
-        reclaimStaleDesktopLock: true,
-      });
+      await expect(
+        acquirePidLock(paseoHome, null, { ownerPid: replacementOwnerPid }),
+      ).rejects.toThrow("Another Paseo daemon is already running");
 
       const lock = await getPidLockInfo(paseoHome);
-      expect(lock?.pid).toBe(replacementOwnerPid);
-      expect(lock?.listen).toBeNull();
+      expect(lock?.pid).toBe(process.pid);
+      expect(lock?.listen).toBe("127.0.0.1:6767");
     } finally {
       await rm(paseoHome, { recursive: true, force: true });
     }
@@ -135,7 +138,7 @@ describe("pid-lock ownership", () => {
         pidPath,
         JSON.stringify({
           pid: process.pid,
-          startedAt: "2026-01-01T00:00:00.000Z",
+          startedAt: new Date().toISOString(),
           hostname: "old-host",
           uid: process.getuid?.() ?? 0,
           listen: "127.0.0.1:6767",
@@ -156,7 +159,7 @@ describe("pid-lock ownership", () => {
     }
   });
 
-  test("reclaims a stale legacy desktop lock after desktop confirms the daemon is unreachable", async () => {
+  test("preserves a stale live legacy desktop lock", async () => {
     const paseoHome = await mkdtemp(join(tmpdir(), "paseo-pid-lock-legacy-desktop-"));
     const replacementOwnerPid = process.pid + 10_000;
     const pidPath = join(paseoHome, "paseo.pid");
@@ -166,7 +169,7 @@ describe("pid-lock ownership", () => {
         pidPath,
         JSON.stringify({
           pid: process.pid,
-          startedAt: "2026-01-01T00:00:00.000Z",
+          startedAt: new Date().toISOString(),
           hostname: "old-host",
           uid: process.getuid?.() ?? 0,
           listen: "127.0.0.1:6767",
@@ -176,14 +179,13 @@ describe("pid-lock ownership", () => {
       const staleTime = new Date(Date.now() - 10 * 60_000);
       await utimes(pidPath, staleTime, staleTime);
 
-      await acquirePidLock(paseoHome, null, {
-        ownerPid: replacementOwnerPid,
-        reclaimStaleDesktopLock: true,
-      });
+      await expect(
+        acquirePidLock(paseoHome, null, { ownerPid: replacementOwnerPid }),
+      ).rejects.toThrow("Another Paseo daemon is already running");
 
       const lock = await getPidLockInfo(paseoHome);
-      expect(lock?.pid).toBe(replacementOwnerPid);
-      expect(lock?.heartbeat).toBe(true);
+      expect(lock?.pid).toBe(process.pid);
+      expect(lock?.heartbeat).toBeUndefined();
     } finally {
       await rm(paseoHome, { recursive: true, force: true });
     }
@@ -254,4 +256,38 @@ describe("pid-lock ownership", () => {
       await rm(paseoHome, { recursive: true, force: true });
     }
   });
+
+  test("starts over an empty lock file left by a supervisor killed before writing it", async () => {
+    const paseoHome = await mkdtemp(join(tmpdir(), "paseo-pid-lock-empty-"));
+    const ownerPid = process.pid + 10_000;
+
+    try {
+      await writeFile(join(paseoHome, "paseo.pid"), "");
+
+      await expect(getPidLockInfo(paseoHome)).resolves.toBeNull();
+      await acquirePidLock(paseoHome, null, { ownerPid });
+
+      const lock = await getPidLockInfo(paseoHome);
+      expect(lock?.pid).toBe(ownerPid);
+    } finally {
+      await rm(paseoHome, { recursive: true, force: true });
+    }
+  });
+
+  test("keeps a lock file whose contents cannot be read as a lock", async () => {
+    const paseoHome = await mkdtemp(join(tmpdir(), "paseo-pid-lock-unparseable-"));
+    const pidPath = join(paseoHome, "paseo.pid");
+
+    try {
+      await writeFile(pidPath, JSON.stringify({ pid: "unknown" }));
+
+      await expect(
+        acquirePidLock(paseoHome, null, { ownerPid: process.pid + 10_000 }),
+      ).rejects.toThrow("Cannot read daemon state");
+
+      await expect(readFile(pidPath, "utf-8")).resolves.toBe(JSON.stringify({ pid: "unknown" }));
+    } finally {
+      await rm(paseoHome, { recursive: true, force: true });
+    }
+  });
 });
diff --git a/packages/server/src/server/pid-lock.ts b/packages/server/src/server/pid-lock.ts
index 9202f49dfd..314b44ea47 100644
--- a/packages/server/src/server/pid-lock.ts
+++ b/packages/server/src/server/pid-lock.ts
@@ -1,18 +1,22 @@
-import { open, readFile, stat, unlink, mkdir, utimes } from "node:fs/promises";
+import { readFileSync } from "node:fs";
+import { open, readFile, stat, unlink, utimes } from "node:fs/promises";
 import type { FileHandle } from "node:fs/promises";
-import { existsSync } from "node:fs";
+import { ensurePrivateDirectory } from "./private-files.js";
 import { join } from "node:path";
-import { hostname } from "node:os";
+import { uptime } from "node:os";
+import { getHostName } from "./host-name.js";
 import { z } from "zod";
 
 export const pidLockInfoSchema = z.object({
-  pid: z.number(),
+  pid: z.number().int().positive(),
   startedAt: z.string(),
   hostname: z.string(),
   uid: z.number(),
   listen: z.string().nullable(),
+  serverId: z.string().nullable().optional(),
   desktopManaged: z.boolean().optional(),
   heartbeat: z.literal(true).optional(),
+  bootId: z.string().optional(),
 });
 
 export interface PidLockInfo extends z.infer<typeof pidLockInfoSchema> {}
@@ -36,8 +40,6 @@ export class PidLockError extends Error {
   }
 }
 
-// Stale recovery is for abandoned locks, so keep this well above ordinary event-loop stalls.
-const PID_LOCK_STALE_MS = 5 * 60_000;
 const PID_LOCK_HEARTBEAT_INTERVAL_MS = 30_000;
 const PID_LOCK_READ_RETRY_ATTEMPTS = 10;
 const PID_LOCK_READ_RETRY_DELAY_MS = 50;
@@ -46,36 +48,92 @@ function isPidRunning(pid: number): boolean {
   try {
     process.kill(pid, 0);
     return true;
-  } catch {
-    return false;
+  } catch (error) {
+    return isErrnoException(error) && error.code === "EPERM";
   }
 }
 
+// `uptime()` reports whole seconds on some platforms, so the derived boot instant carries
+// about a second of error. This covers that resolution and nothing more: every extra second
+// is a window in which a lock written just before a reboot still reads as current.
+const BOOT_INSTANT_TOLERANCE_MS = 5_000;
+
+function precedesThisBoot(startedAt: string): boolean {
+  const stamped = Date.parse(startedAt);
+  if (Number.isNaN(stamped)) return false;
+  return stamped < Date.now() - uptime() * 1000 - BOOT_INSTANT_TOLERANCE_MS;
+}
+
+let cachedBootId: string | null | undefined;
+
+// Linux names each boot. The wall-clock boot instant is not enough there: a VM paused while
+// its host sleeps keeps its uptime, so after it resumes the instant lands after locks its
+// running supervisor wrote.
+function currentBootId(): string | null {
+  if (cachedBootId === undefined) {
+    try {
+      cachedBootId = readFileSync("/proc/sys/kernel/random/boot_id", "utf-8").trim() || null;
+    } catch {
+      cachedBootId = null;
+    }
+  }
+  return cachedBootId;
+}
+
+function writtenDuringThisBoot(lock: PidLockInfo): boolean {
+  const thisBoot = currentBootId();
+  if (lock.bootId && thisBoot) return lock.bootId === thisBoot;
+  return !precedesThisBoot(lock.startedAt);
+}
+
+/**
+ * Whether the process that wrote this lock is still running.
+ *
+ * A PID alone does not identify the supervisor: the operating system hands the number to
+ * something else once the supervisor is gone, and a reboot reassigns it freely. A process
+ * cannot predate the boot it runs under, so a lock written during another boot is abandoned
+ * however alive its PID looks.
+ */
+export function isPidLockOwnerRunning(lock: PidLockInfo): boolean {
+  if (!writtenDuringThisBoot(lock)) return false;
+  return isPidRunning(lock.pid);
+}
+
 function getPidFilePath(paseoHome: string): string {
   return join(paseoHome, "paseo.pid");
 }
 
-async function isPidLockFresh(pidPath: string): Promise<boolean> {
-  try {
-    const lockStat = await stat(pidPath);
-    return lockStat.mtimeMs >= Date.now() - PID_LOCK_STALE_MS;
-  } catch {
-    return false;
-  }
-}
-
 async function touchPidLockFile(pidPath: string): Promise<void> {
   const now = new Date();
   await utimes(pidPath, now, now);
 }
 
 async function readPidLock(pidPath: string): Promise<PidLockInfo | null> {
-  try {
-    const content = await readFile(pidPath, "utf-8");
-    return parsePidLockInfo(JSON.parse(content));
-  } catch {
-    return null;
+  let lastError: unknown;
+  let empty = false;
+  for (let attempt = 0; attempt < PID_LOCK_READ_RETRY_ATTEMPTS; attempt++) {
+    try {
+      const content = await readFile(pidPath, "utf-8");
+      empty = content === "";
+      if (!empty) {
+        const lock = parsePidLockInfo(JSON.parse(content));
+        if (lock) return lock;
+        lastError = new Error("Invalid lock shape");
+      }
+    } catch (error) {
+      if (isErrnoException(error) && error.code === "ENOENT") return null;
+      empty = false;
+      lastError = error;
+    }
+    await new Promise((resolve) => setTimeout(resolve, PID_LOCK_READ_RETRY_DELAY_MS));
   }
+  // A supervisor writes its lock right after creating the file, so a file still empty
+  // after the retries was abandoned in between and names no owner.
+  if (empty) return null;
+  throw Object.assign(
+    new PidLockError(`Cannot read daemon state at ${pidPath}: ${String(lastError)}`),
+    { code: "DAEMON_STATE_READ_FAILED" },
+  );
 }
 
 function resolveOwnerPid(ownerPid?: number): number {
@@ -87,19 +145,9 @@ function resolveOwnerPid(ownerPid?: number): number {
 
 interface AcquirePidLockOptions {
   ownerPid?: number;
-  reclaimStaleDesktopLock?: boolean;
 }
 
-function canReclaimLiveLock(
-  lock: PidLockInfo,
-  options: AcquirePidLockOptions | undefined,
-): boolean {
-  // COMPAT(pidLockHeartbeat): v0.1.108 desktop startup has already confirmed the old daemon is
-  // unreachable before it launches the supervisor. Remove after 2027-01-15.
-  return options?.reclaimStaleDesktopLock === true && lock.desktopManaged === true;
-}
-
-function isSamePidLock(left: PidLockInfo, right: PidLockInfo): boolean {
+export function isSamePidLock(left: PidLockInfo, right: PidLockInfo): boolean {
   return left.pid === right.pid && left.startedAt === right.startedAt;
 }
 
@@ -114,35 +162,35 @@ async function clearExistingPidLock(
   pidPath: string,
   existingLock: PidLockInfo,
   lockOwnerPid: number,
-  options: AcquirePidLockOptions | undefined,
 ): Promise<"already_owned" | "cleared"> {
-  const lockOwnerRunning = isPidRunning(existingLock.pid);
+  const lockOwnerRunning = isPidLockOwnerRunning(existingLock);
   if (existingLock.pid === lockOwnerPid && lockOwnerRunning) {
     await touchPidLockFile(pidPath);
     return "already_owned";
   }
 
-  if (lockOwnerRunning) {
-    const reclaimable = canReclaimLiveLock(existingLock, options);
-    if (!reclaimable || (await isPidLockFresh(pidPath))) {
-      throw createLockHeldError(existingLock);
-    }
-
-    // Re-read immediately before unlinking so a heartbeat at the stale boundary wins.
-    const confirmedLock = await readPidLock(pidPath);
-    if (
-      !confirmedLock ||
-      !isSamePidLock(existingLock, confirmedLock) ||
-      (await isPidLockFresh(pidPath))
-    ) {
-      throw new PidLockError("PID lock changed while checking whether it was abandoned");
-    }
+  if (lockOwnerRunning) throw createLockHeldError(existingLock);
+  const confirmedLock = await readPidLock(pidPath);
+  if (
+    !confirmedLock ||
+    !isSamePidLock(existingLock, confirmedLock) ||
+    isPidLockOwnerRunning(confirmedLock)
+  ) {
+    throw new PidLockError("PID lock changed while checking whether it was abandoned");
   }
 
   await unlink(pidPath).catch(() => {});
   return "cleared";
 }
 
+async function removeEmptyPidLock(pidPath: string): Promise<void> {
+  try {
+    if ((await stat(pidPath)).size === 0) await unlink(pidPath);
+  } catch (error) {
+    if (!isErrnoException(error) || error.code !== "ENOENT") throw error;
+  }
+}
+
 async function writeNewPidLock(pidPath: string, lockInfo: PidLockInfo): Promise<void> {
   let fd;
   try {
@@ -173,10 +221,7 @@ export async function acquirePidLock(
 ): Promise<void> {
   const pidPath = getPidFilePath(paseoHome);
 
-  // Ensure paseoHome directory exists
-  if (!existsSync(paseoHome)) {
-    await mkdir(paseoHome, { recursive: true });
-  }
+  ensurePrivateDirectory(paseoHome);
 
   // Try to read existing lock
   const existingLock = await readPidLock(pidPath);
@@ -184,20 +229,24 @@ export async function acquirePidLock(
   // Check if existing lock is stale
   const lockOwnerPid = resolveOwnerPid(options?.ownerPid);
   if (existingLock) {
-    const result = await clearExistingPidLock(pidPath, existingLock, lockOwnerPid, options);
+    const result = await clearExistingPidLock(pidPath, existingLock, lockOwnerPid);
     if (result === "already_owned") {
       return;
     }
+  } else {
+    await removeEmptyPidLock(pidPath);
   }
 
   // Create new lock with exclusive flag
+  const bootId = currentBootId();
   const lockInfo: PidLockInfo = {
     pid: lockOwnerPid,
     startedAt: new Date().toISOString(),
-    hostname: hostname(),
+    hostname: getHostName(),
     uid: process.getuid?.() ?? 0,
     listen,
     heartbeat: true,
+    ...(bootId ? { bootId } : {}),
     ...(process.env.PASEO_DESKTOP_MANAGED === "1" ? { desktopManaged: true } : {}),
   };
 
@@ -298,7 +347,7 @@ export function startPidLockHeartbeat(
 
 export async function updatePidLock(
   paseoHome: string,
-  patch: { listen: string },
+  patch: { listen: string; serverId: string } | { listen: null; serverId: null },
   options?: { ownerPid?: number },
 ): Promise<void> {
   const pidPath = getPidFilePath(paseoHome);
@@ -329,7 +378,7 @@ export async function updatePidLock(
 
 export async function releasePidLock(
   paseoHome: string,
-  options?: { ownerPid?: number },
+  options?: { ownerPid?: number; startedAt?: string },
 ): Promise<void> {
   const pidPath = getPidFilePath(paseoHome);
   const lockOwnerPid = resolveOwnerPid(options?.ownerPid);
@@ -337,7 +386,10 @@ export async function releasePidLock(
     // Only remove if it's our lock
     const content = await readFile(pidPath, "utf-8");
     const lock = parsePidLockInfo(JSON.parse(content));
-    if (lock?.pid === lockOwnerPid) {
+    if (
+      lock?.pid === lockOwnerPid &&
+      (options?.startedAt === undefined || lock.startedAt === options.startedAt)
+    ) {
       await unlink(pidPath);
     }
   } catch {
@@ -357,7 +409,7 @@ export async function isLocked(
   if (!info) {
     return { locked: false };
   }
-  if (!isPidRunning(info.pid)) {
+  if (!isPidLockOwnerRunning(info)) {
     return { locked: false, info };
   }
   return { locked: true, info };
diff --git a/packages/server/src/server/plugins/agent-configuration.e2e.test.ts b/packages/server/src/server/plugins/agent-configuration.e2e.test.ts
new file mode 100644
index 0000000000..3228306297
--- /dev/null
+++ b/packages/server/src/server/plugins/agent-configuration.e2e.test.ts
@@ -0,0 +1,56 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestAgentClient } from "../test-utils/fake-agent-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+test("the configuration example adds MCP servers and overrides Codex options while preserving other configuration", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-config-example-"));
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.8.0",
+    agentClients: { codex: createTestAgentClient("codex", { supportsMcpServers: true }) },
+    mcpEnabled: false,
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(
+      fileURLToPath(new URL("../../../../../plugin-examples/agent-configuration", import.meta.url)),
+    );
+    const agent = await client.createAgent({
+      provider: "codex",
+      cwd: directory,
+      systemPrompt: "Keep the user's instructions.",
+      providerOptions: {
+        sandbox_mode: "read-only",
+        approval_policy: "never",
+        web_search: "disabled",
+      },
+      mcpServers: { existing: { type: "http", url: "https://existing.example.com/mcp" } },
+    });
+    expect(daemon.daemon.agentManager.getAgent(agent.id)?.config).toMatchObject({
+      provider: "codex",
+      cwd: directory,
+      systemPrompt: "Keep the user's instructions.",
+      providerOptions: {
+        sandbox_mode: "workspace-write",
+        approval_policy: "on-request",
+        web_search: "disabled",
+      },
+      mcpServers: {
+        existing: { type: "http", url: "https://existing.example.com/mcp" },
+        company: { type: "http", url: "https://tools.example.com/mcp" },
+      },
+    });
+    await client.archiveAgent(agent.id);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/builtin/index.test.ts b/packages/server/src/server/plugins/builtin/index.test.ts
new file mode 100644
index 0000000000..6160c8f855
--- /dev/null
+++ b/packages/server/src/server/plugins/builtin/index.test.ts
@@ -0,0 +1,134 @@
+import { execFileSync } from "node:child_process";
+import { mkdtemp, mkdir, rm, stat, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { afterEach, expect, test } from "vitest";
+import { compilePlugin } from "../compiler.js";
+import { readPluginManifest } from "../manifest.js";
+import { DaemonClient } from "../../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../../test-utils/paseo-daemon.js";
+import { BuiltinPluginLoader, builtinPlugins, resolveBuiltinPluginsRoot } from "./index.js";
+
+const roots: string[] = [];
+afterEach(async () => {
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+
+async function fixture(root: string, id: string, client = false): Promise<string> {
+  const directory = path.join(root, id);
+  await mkdir(directory, { recursive: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id, requirements: { paseo: ">=0.9.2" } }),
+  );
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    "export default function contribute() { return () => {}; }",
+  );
+  if (client) {
+    await writeFile(
+      path.join(directory, "index.client.tsx"),
+      "export default function contribute() { const marker = 'builtin-client-marker'; void marker; return () => {}; }",
+    );
+  }
+  return directory;
+}
+
+test("listed built-ins resolve to matching manifests and compile", async () => {
+  const root = resolveBuiltinPluginsRoot();
+  for (const id of builtinPlugins) {
+    const directory = path.join(root, id);
+    expect((await readPluginManifest(directory)).id).toBe(id);
+    const findEntry = async (names: string[]) => {
+      for (const name of names) {
+        const entry = path.join(directory, name);
+        if ((await stat(entry).catch(() => null))?.isFile()) return entry;
+      }
+      return null;
+    };
+    const bundles = await compilePlugin({
+      server: await findEntry(["index.server.ts", "index.server.tsx"]),
+      client: await findEntry(["index.client.ts", "index.client.tsx"]),
+    });
+    expect(bundles.serverBundle).toBeTruthy();
+  }
+});
+
+test("listed client bundle is published while plugins are disabled; unlisted directory is inert", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-builtin-fixture-"));
+  roots.push(root);
+  await fixture(root, "listed", true);
+  await fixture(root, "unlisted", true);
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.9.2",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(root, ["listed"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.2" });
+  try {
+    await client.connect();
+    expect(await client.listPlugins()).toEqual([]);
+    const catalog = await client.getPluginCatalog();
+    expect(catalog.map(({ id }) => id)).toEqual(["listed"]);
+    expect(catalog[0]?.clientBundle).toContain("builtin-client-marker");
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);
+
+test("directory, Git, and npm installs reject a built-in ID", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-builtin-install-"));
+  roots.push(root);
+  const directory = await fixture(root, "reserved");
+  const gitDirectory = await fixture(root, "git-source");
+  await writeFile(
+    path.join(gitDirectory, "paseo-plugin.json"),
+    JSON.stringify({ id: "reserved", requirements: { paseo: ">=0.9.2" } }),
+  );
+  execFileSync("git", ["init", "-q", gitDirectory]);
+  execFileSync("git", [
+    "-C",
+    gitDirectory,
+    "-c",
+    "user.name=Paseo Tests",
+    "-c",
+    "user.email=paseo@example.test",
+    "add",
+    ".",
+  ]);
+  execFileSync("git", [
+    "-C",
+    gitDirectory,
+    "-c",
+    "user.name=Paseo Tests",
+    "-c",
+    "user.email=paseo@example.test",
+    "commit",
+    "-qm",
+    "fixture",
+  ]);
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.9.2",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(root, ["reserved"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.2" });
+  try {
+    await client.connect();
+    await expect(client.installDirectoryPlugin(directory)).rejects.toThrow(
+      /reserved for a built-in/,
+    );
+    await expect(
+      client.installPluginSource({ source: pathToFileURL(gitDirectory).href }),
+    ).rejects.toThrow(/reserved for a built-in/);
+    await expect(
+      client.installPluginSource({ source: "npm:unused-fixture", id: "reserved" }),
+    ).rejects.toThrow(/reserved for a built-in/);
+    expect(await client.listPlugins()).toEqual([]);
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/builtin/index.ts b/packages/server/src/server/plugins/builtin/index.ts
new file mode 100644
index 0000000000..c14c027853
--- /dev/null
+++ b/packages/server/src/server/plugins/builtin/index.ts
@@ -0,0 +1,54 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+export const builtinPlugins = [
+  "antigravity-provider",
+  "claude-usage-source",
+  "codex-usage-source",
+  "copilot-usage-source",
+  "cursor-usage-source",
+  "grok-usage-source",
+  "kimi-usage-source",
+  "minimax-usage-source",
+  "muse-provider",
+  "opencode-go-usage-source",
+  "zai-usage-source",
+] as const;
+
+export function resolveBuiltinPluginsRoot(moduleUrl: string | URL = import.meta.url): string {
+  const moduleDir = path.dirname(fileURLToPath(moduleUrl));
+  const archiveSegment = `${path.sep}app.asar${path.sep}`;
+  const archiveIndex = moduleDir.indexOf(archiveSegment);
+  if (archiveIndex !== -1) {
+    // esbuild runs outside Electron's filesystem shim and cannot read archive entries.
+    return path.join(moduleDir.slice(0, archiveIndex), "builtin-plugins");
+  }
+  const candidates = [
+    path.resolve(moduleDir, "..", "..", "..", "builtin-plugins"),
+    path.resolve(moduleDir, "..", "..", "..", "..", "..", "..", "plugins"),
+  ];
+  return candidates.find((candidate) => existsSync(candidate)) ?? candidates[0]!;
+}
+
+export interface BuiltinPlugin {
+  id: string;
+  directory: string;
+}
+
+export class BuiltinPluginLoader {
+  readonly ids: ReadonlySet<string>;
+
+  constructor(
+    private readonly root = resolveBuiltinPluginsRoot(),
+    private readonly list: readonly string[] = builtinPlugins,
+  ) {
+    this.ids = new Set(list);
+  }
+
+  async load(start: (plugin: BuiltinPlugin) => Promise<void>): Promise<void> {
+    for (const id of this.list) {
+      await start({ id, directory: path.join(this.root, id) });
+    }
+  }
+}
diff --git a/packages/server/src/server/plugins/bundle-evaluator.ts b/packages/server/src/server/plugins/bundle-evaluator.ts
new file mode 100644
index 0000000000..e80db885ff
--- /dev/null
+++ b/packages/server/src/server/plugins/bundle-evaluator.ts
@@ -0,0 +1,39 @@
+import { createRequire } from "node:module";
+import * as pluginSharedRuntime from "@getpaseo/plugin";
+import * as pluginProviderRuntime from "@getpaseo/plugin/server/provider";
+import * as pluginAcpRuntime from "@getpaseo/plugin/server/acp";
+import * as pluginUsageRuntime from "@getpaseo/plugin/server/usage";
+import * as pluginServerRuntime from "@getpaseo/plugin/server";
+import type { PluginServerContribution } from "@getpaseo/plugin/server";
+import * as zod from "zod";
+import { isPluginClientOnlySdkSpecifier } from "./plugin-sdk-specifiers.js";
+
+const nodeRequire = createRequire(import.meta.url);
+
+function runtimeRequire(name: string): unknown {
+  if (isPluginClientOnlySdkSpecifier(name)) {
+    throw new Error(`${name} is available only in plugin client code`);
+  }
+  if (name === "@getpaseo/plugin") return pluginSharedRuntime;
+  if (name === "@getpaseo/plugin/server") return pluginServerRuntime;
+  if (name === "@getpaseo/plugin/server/provider") return pluginProviderRuntime;
+  if (name === "@getpaseo/plugin/server/acp") return pluginAcpRuntime;
+  if (name === "@getpaseo/plugin/server/usage") return pluginUsageRuntime;
+  if (name === "zod") return zod;
+  if (name === "@getpaseo/plugin/client/host")
+    throw new Error(`${name} is private to the app host`);
+  return nodeRequire(name);
+}
+
+export function evaluateBundle(bundle: string): PluginServerContribution {
+  const evaluate: (source: string) => unknown = globalThis.eval;
+  const factory = evaluate(bundle);
+  if (typeof factory !== "function") throw new Error("Plugin server bundle is not executable");
+  const exports = factory(runtimeRequire);
+  const setup =
+    exports !== null && typeof exports === "object" ? Reflect.get(exports, "default") : undefined;
+  if (typeof setup !== "function") {
+    throw new Error("Plugin server bundle must default export a function");
+  }
+  return setup as PluginServerContribution;
+}
diff --git a/packages/server/src/server/plugins/compiler-imports.ts b/packages/server/src/server/plugins/compiler-imports.ts
new file mode 100644
index 0000000000..04d5549d50
--- /dev/null
+++ b/packages/server/src/server/plugins/compiler-imports.ts
@@ -0,0 +1,126 @@
+import { readFileSync, realpathSync } from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import type { ImportKind } from "esbuild";
+import type { Node, NamedImportBindings, NamedExportBindings } from "typescript";
+
+const nodeRequire = createRequire(import.meta.url);
+
+export type PluginImportKind = ImportKind | "type-reference";
+
+interface ModuleImport {
+  specifier: string;
+  kind: PluginImportKind;
+  typeOnly: boolean;
+}
+
+// Keep the TypeScript compiler off daemon startup. esbuild erases these edges, so
+// ownership validation needs the original syntax and declaration-aware resolution.
+export function createPluginImportReader(directory: string) {
+  const ts = nodeRequire("typescript") as typeof import("typescript");
+  const configFile = ts.findConfigFile(directory, ts.sys.fileExists);
+  const config = configFile
+    ? ts.getParsedCommandLineOfConfigFile(
+        configFile,
+        {},
+        {
+          ...ts.sys,
+          onUnRecoverableConfigFileDiagnostic: (diagnostic) => {
+            throw new Error(ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
+          },
+        },
+      )
+    : undefined;
+  const options = {
+    ...config?.options,
+    module: ts.ModuleKind.ESNext,
+    moduleResolution: ts.ModuleResolutionKind.Bundler,
+    allowJs: true,
+  };
+  const cache = ts.createModuleResolutionCache(directory, (file) => file, options);
+  return {
+    resolve(specifier: string, importer: string, kind: PluginImportKind): string | undefined {
+      const resolved =
+        kind === "type-reference"
+          ? ts.resolveTypeReferenceDirective(specifier, importer, options, ts.sys)
+              .resolvedTypeReferenceDirective?.resolvedFileName
+          : ts.resolveModuleName(
+              specifier,
+              importer,
+              options,
+              ts.sys,
+              cache,
+              undefined,
+              kind === "require-call" ? ts.ModuleKind.CommonJS : ts.ModuleKind.ESNext,
+            ).resolvedModule?.resolvedFileName;
+      return resolved ? realpathSync.native(resolved) : undefined;
+    },
+    read(file: string): ModuleImport[] {
+      const source = ts.createSourceFile(
+        file,
+        readFileSync(file, "utf8"),
+        ts.ScriptTarget.Latest,
+        true,
+      );
+      const imports: ModuleImport[] = [];
+      function add(
+        node: Node | undefined,
+        typeOnly: boolean,
+        kind: ImportKind = "import-statement",
+      ) {
+        if (node && ts.isStringLiteralLike(node)) {
+          imports.push({
+            specifier: node.text,
+            kind,
+            typeOnly: source.isDeclarationFile || typeOnly,
+          });
+        }
+      }
+      function onlyTypeBindings(
+        bindings: NamedImportBindings | NamedExportBindings | undefined,
+      ): boolean {
+        return (
+          !!bindings &&
+          (ts.isNamedImports(bindings) || ts.isNamedExports(bindings)) &&
+          bindings.elements.length > 0 &&
+          bindings.elements.every((element) => element.isTypeOnly)
+        );
+      }
+      function visit(node: Node): void {
+        if (ts.isImportDeclaration(node)) {
+          const clause = node.importClause;
+          const typeOnly =
+            !!clause?.isTypeOnly || (!clause?.name && onlyTypeBindings(clause?.namedBindings));
+          add(node.moduleSpecifier, typeOnly);
+        } else if (ts.isExportDeclaration(node)) {
+          add(node.moduleSpecifier, node.isTypeOnly || onlyTypeBindings(node.exportClause));
+        } else if (ts.isImportTypeNode(node) && ts.isLiteralTypeNode(node.argument)) {
+          add(node.argument.literal, true);
+        } else if (
+          ts.isImportEqualsDeclaration(node) &&
+          ts.isExternalModuleReference(node.moduleReference)
+        ) {
+          add(node.moduleReference.expression, node.isTypeOnly, "require-call");
+        } else if (ts.isCallExpression(node)) {
+          if (node.expression.kind === ts.SyntaxKind.ImportKeyword)
+            add(node.arguments[0], false, "dynamic-import");
+          else if (ts.isIdentifier(node.expression) && node.expression.text === "require")
+            add(node.arguments[0], false, "require-call");
+        }
+        ts.forEachChild(node, visit);
+      }
+      visit(source);
+      for (const reference of source.referencedFiles) {
+        imports.push({
+          specifier: path.resolve(path.dirname(file), reference.fileName),
+          kind: "import-statement",
+          typeOnly: true,
+        });
+      }
+      for (const reference of source.typeReferenceDirectives) {
+        imports.push({ specifier: reference.fileName, kind: "type-reference", typeOnly: true });
+      }
+      return imports;
+    },
+  };
+}
diff --git a/packages/server/src/server/plugins/compiler.test.ts b/packages/server/src/server/plugins/compiler.test.ts
index a922403aa7..facba48fdb 100644
--- a/packages/server/src/server/plugins/compiler.test.ts
+++ b/packages/server/src/server/plugins/compiler.test.ts
@@ -1,3 +1,4 @@
+import { realpathSync } from "node:fs";
 import { mkdir, mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -80,6 +81,8 @@ async function createSplitPlugin(): Promise<{
   client: string;
   server: string;
 }> {
+  // Keep the platform's original spelling (including Windows short names) in symlink
+  // targets. Only diagnostic expectations use canonical paths.
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-compiler-"));
   temporaryDirectories.push(directory);
   await Promise.all([
@@ -126,7 +129,321 @@ export default function contribute(server) {
   return { directory, client, server };
 }
 
+async function createRootAlias(directory: string): Promise<string> {
+  const aliases = await mkdtemp(path.join(tmpdir(), "paseo-plugin-root-alias-"));
+  temporaryDirectories.push(aliases);
+  const rootAlias = path.join(aliases, "plugin");
+  await symlink(directory, rootAlias, process.platform === "win32" ? "junction" : "dir");
+  return rootAlias;
+}
+
 describe("plugin runtime entries", () => {
+  it.each([
+    "react",
+    "react/jsx-runtime",
+    "react-native",
+    "@getpaseo/plugin/client",
+    "@getpaseo/plugin/client/ui",
+  ])("rejects %s from server code", async (specifier) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      entries.server,
+      `import * as value from "${specifier}"; export default function contribute() { return value; }`,
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("client-only module");
+  });
+
+  it.each([
+    "@getpaseo/plugin/server",
+    "@getpaseo/plugin/server/provider",
+    "@getpaseo/plugin/server/acp",
+  ])("rejects %s from client code", async (specifier) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      entries.client,
+      `import * as value from "${specifier}"; export default function contribute() { return value; }`,
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("server-only module");
+  });
+
+  it.each([
+    "react",
+    "node:fs",
+    "fs",
+    "@getpaseo/plugin/client",
+    "@getpaseo/plugin/server",
+    "../client/surface",
+    "../server/handler",
+  ])("rejects %s from shared code", async (specifier) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      `import * as value from "${specifier}"; export const clientLabel = value; export const serverLabel = value;`,
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+  });
+
+  it.each([
+    { target: "client", dependency: "react" },
+    { target: "server", dependency: "node:fs" },
+    { target: "server", dependency: "@getpaseo/plugin/server/provider" },
+  ] as const)(
+    "rejects a shared dependency reaching $dependency in the $target bundle",
+    async ({ target, dependency }) => {
+      const entries = await createSplitPlugin();
+      const dependencyDirectory = path.join(entries.directory, "node_modules/impure");
+      await mkdir(dependencyDirectory, { recursive: true });
+      await writeFile(
+        path.join(dependencyDirectory, "package.json"),
+        JSON.stringify({ name: "impure", main: "index.js" }),
+      );
+      await writeFile(path.join(dependencyDirectory, "index.js"), `export * from "${dependency}";`);
+      await writeFile(
+        path.join(entries.directory, "shared/labels.ts"),
+        `import * as value from "impure"; export const clientLabel = value; export const serverLabel = value;`,
+      );
+      await expect(
+        compilePlugin({
+          client: target === "client" ? entries.client : null,
+          server: target === "server" ? entries.server : null,
+        }),
+      ).rejects.toThrow("plugin shared");
+    },
+  );
+
+  it.each([
+    'import type { PluginClientContext } from "@getpaseo/plugin/client"; export type Context = PluginClientContext;',
+    'export type { PluginClientContext } from "@getpaseo/plugin/client";',
+    'export type Context = import("@getpaseo/plugin/client").PluginClientContext;',
+    'import { type PluginClientContext } from "@getpaseo/plugin/client"; export type Context = PluginClientContext;',
+    'import type { ComponentType } from "react"; export type Component = ComponentType;',
+  ])("rejects runtime-owned types in shared code: %s", async (typeSource) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      typeSource + '\nexport const clientLabel = "client"; export const serverLabel = "server";',
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+  });
+
+  it.each([{ types: "./index.d.ts" }, { exports: { ".": { types: "./index.d.ts" } } }])(
+    "accepts declaration-only dependencies: %j",
+    async (manifest) => {
+      const entries = await createSplitPlugin();
+      const dependency = path.join(entries.directory, "node_modules/neutral-types");
+      await mkdir(dependency, { recursive: true });
+      await writeFile(
+        path.join(dependency, "package.json"),
+        JSON.stringify({ name: "neutral-types", ...manifest }),
+      );
+      await writeFile(
+        path.join(dependency, "index.d.ts"),
+        "export type JsonValue = string | number | boolean | null;",
+      );
+      await writeFile(
+        path.join(entries.directory, "shared/labels.ts"),
+        'import type { JsonValue } from "neutral-types"; export const clientLabel: JsonValue = "client"; export const serverLabel: JsonValue = "server";',
+      );
+      const result = await compilePlugin(entries);
+      expect(result.clientBundle).toContain('"client"');
+      expect(result.serverBundle).toContain('"server"');
+      expect(result.clientBundle).not.toContain("neutral-types");
+    },
+  );
+
+  it("accepts a declaration import used only as a type without import type", async () => {
+    const entries = await createSplitPlugin();
+    const dependency = path.join(entries.directory, "node_modules/neutral-types");
+    await mkdir(dependency, { recursive: true });
+    await writeFile(
+      path.join(dependency, "package.json"),
+      JSON.stringify({ name: "neutral-types", types: "./index.d.ts" }),
+    );
+    await writeFile(path.join(dependency, "index.d.ts"), "export type Value = string;");
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      'import { Value } from "neutral-types"; export const clientLabel: Value = "client"; export const serverLabel: Value = "server";',
+    );
+    await expect(compilePlugin(entries)).resolves.toMatchObject({
+      clientBundle: expect.any(String),
+      serverBundle: expect.any(String),
+    });
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      'import { Value } from "neutral-types"; export const clientLabel = Value; export const serverLabel = Value;',
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow('Could not resolve "neutral-types"');
+  });
+
+  it("preserves guarded optional requires in server dependencies", async () => {
+    const entries = await createSplitPlugin();
+    const dependency = path.join(entries.directory, "node_modules/optional-helper");
+    await mkdir(dependency, { recursive: true });
+    await writeFile(
+      path.join(dependency, "package.json"),
+      JSON.stringify({ name: "optional-helper", main: "index.js" }),
+    );
+    await writeFile(
+      path.join(dependency, "index.js"),
+      'let value = "fallback"; try { value = require("missing-accelerator"); } catch {} module.exports = value;',
+    );
+    await writeFile(entries.server, 'import value from "optional-helper"; export default value;');
+    await expect(compilePlugin({ client: null, server: entries.server })).resolves.toMatchObject({
+      serverBundle: expect.stringContaining("fallback"),
+    });
+    await writeFile(
+      path.join(dependency, "index.js"),
+      'module.exports = require("missing-accelerator");',
+    );
+    await expect(compilePlugin({ client: null, server: entries.server })).rejects.toThrow(
+      'Could not resolve "missing-accelerator"',
+    );
+  });
+
+  it.each(["path", "types"])(
+    "checks declaration reference %s directives",
+    async (referenceKind) => {
+      const entries = await createSplitPlugin();
+      const dependency = path.join(entries.directory, "node_modules/typed-helper");
+      const referencedDirectory =
+        referenceKind === "path"
+          ? dependency
+          : path.join(entries.directory, "node_modules/@types/referenced-helper");
+      await mkdir(dependency, { recursive: true });
+      await mkdir(referencedDirectory, { recursive: true });
+      await writeFile(
+        path.join(dependency, "package.json"),
+        JSON.stringify({ name: "typed-helper", types: "index.d.ts" }),
+      );
+      await writeFile(
+        path.join(dependency, "index.d.ts"),
+        `/// <reference ${referenceKind}="${referenceKind === "path" ? "./context.d.ts" : "referenced-helper"}" />
+export type Value = string;`,
+      );
+      const referencedFile = path.join(
+        referencedDirectory,
+        referenceKind === "path" ? "context.d.ts" : "index.d.ts",
+      );
+      await writeFile(
+        referencedFile,
+        'export type { PluginClientContext } from "@getpaseo/plugin/client";',
+      );
+      await writeFile(
+        path.join(entries.directory, "shared/labels.ts"),
+        'import type { Value } from "typed-helper"; export const clientLabel: Value = "client"; export const serverLabel: Value = "server";',
+      );
+      await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+      await writeFile(referencedFile, "export type Neutral = string;");
+      await expect(compilePlugin(entries)).resolves.toMatchObject({
+        clientBundle: expect.any(String),
+        serverBundle: expect.any(String),
+      });
+    },
+  );
+
+  it("checks the physical owner of type-only symlinks", async () => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "server/context.ts"),
+      "export type Value = string;",
+    );
+    await symlink(
+      path.join(entries.directory, "server/context.ts"),
+      path.join(entries.directory, "shared/context.ts"),
+    );
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      'import type { Value } from "./context"; export const clientLabel: Value = "client"; export const serverLabel: Value = "server";',
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("server-only module");
+  });
+
+  it("resolves type-only path aliases from the plugin tsconfig", async () => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "tsconfig.json"),
+      JSON.stringify({
+        compilerOptions: { baseUrl: ".", paths: { "shared-types": ["shared/types.ts"] } },
+      }),
+    );
+    await writeFile(path.join(entries.directory, "shared/types.ts"), "export type Value = string;");
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      'import type { Value } from "shared-types"; export const clientLabel: Value = "client"; export const serverLabel: Value = "server";',
+    );
+    await expect(compilePlugin(entries)).resolves.toMatchObject({
+      clientBundle: expect.any(String),
+      serverBundle: expect.any(String),
+    });
+    await writeFile(
+      path.join(entries.directory, "shared/types.ts"),
+      'export type { PluginClientContext as Value } from "@getpaseo/plugin/client";',
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+  });
+
+  it.each([
+    { specifier: "@getpaseo/plugin/client", importKind: "import type" },
+    { specifier: "@getpaseo/plugin/server", importKind: "import type" },
+    { specifier: "@getpaseo/plugin/client", importKind: "import" },
+    { specifier: "@getpaseo/plugin/server", importKind: "import" },
+  ])(
+    "rejects transitive declaration dependencies on $specifier through $importKind",
+    async ({ specifier, importKind }) => {
+      const entries = await createSplitPlugin();
+      const dependency = path.join(entries.directory, "node_modules/typed-helper");
+      await mkdir(dependency, { recursive: true });
+      await writeFile(
+        path.join(dependency, "package.json"),
+        JSON.stringify({ name: "typed-helper", main: "index.js", types: "index.d.ts" }),
+      );
+      await writeFile(path.join(dependency, "index.js"), "export {};");
+      await writeFile(
+        path.join(dependency, "index.d.ts"),
+        'export type { Context } from "./context";',
+      );
+      const context = specifier.endsWith("client") ? "PluginClientContext" : "PluginServerContext";
+      await writeFile(
+        path.join(dependency, "context.d.ts"),
+        `export type { ${context} as Context } from "${specifier}";`,
+      );
+      await writeFile(
+        path.join(entries.directory, "shared/labels.ts"),
+        `${importKind} { Context } from "typed-helper"; export type Value = Context; export const clientLabel = "client"; export const serverLabel = "server";`,
+      );
+      await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+    },
+  );
+
+  it("checks files reached only through type imports", async () => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "shared/types.ts"),
+      'export type { PluginClientContext } from "@getpaseo/plugin/client";',
+    );
+    await writeFile(
+      path.join(entries.directory, "shared/labels.ts"),
+      'export type { PluginClientContext } from "./types"; export const clientLabel = "client"; export const serverLabel = "server";',
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow("plugin shared");
+  });
+
+  it.each([
+    "@paseo/plugin",
+    "@getpaseo/plugin/react-native",
+    "@getpaseo/plugin/ui",
+    "@getpaseo/plugin/provider",
+    "@getpaseo/plugin/acp",
+    "@getpaseo/plugin/host",
+  ])("rejects retired entry %s", async (specifier) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      entries.server,
+      `import * as sdk from "${specifier}"; export default function contribute() { return sdk; }`,
+    );
+    await expect(compilePlugin(entries)).rejects.toThrow(specifier);
+  });
+
   it("builds each runtime from its own entry and shares neutral modules", async () => {
     const entries = await createSplitPlugin();
 
@@ -138,6 +455,33 @@ describe("plugin runtime entries", () => {
     expect(serverBundle).not.toContain("Client contribution");
   });
 
+  it.each(["main", "module"])(
+    "builds a dependency that declares only %s into both runtimes",
+    async (field) => {
+      const entries = await createSplitPlugin();
+      const dependency = path.join(entries.directory, "node_modules/legacy-entry");
+      await mkdir(dependency, { recursive: true });
+      await writeFile(
+        path.join(dependency, "package.json"),
+        JSON.stringify({ name: "legacy-entry", [field]: "lib/entry.js" }),
+      );
+      await mkdir(path.join(dependency, "lib"));
+      await writeFile(
+        path.join(dependency, "lib/entry.js"),
+        'exports.label = "legacy entry contribution";',
+      );
+      await writeFile(
+        path.join(entries.directory, "shared/labels.ts"),
+        'import { label } from "legacy-entry"; export const clientLabel = label; export const serverLabel = label;',
+      );
+
+      const { clientBundle, serverBundle } = await compilePlugin(entries);
+
+      expect(clientBundle).toContain("legacy entry contribution");
+      expect(serverBundle).toContain("legacy entry contribution");
+    },
+  );
+
   it("uses the automatic JSX runtime without a React import", async () => {
     const entries = await createSplitPlugin();
     const { clientBundle } = await compilePlugin(entries);
@@ -205,7 +549,7 @@ export default function contribute() { void Surface; return () => undefined; }`,
 export default function contribute() { void value; return () => undefined; }`,
     );
     await expect(compilePlugin(entries)).rejects.toThrow(
-      `Plugin modules belong in client/, server/, or shared/: ${path.join(entries.directory, "helper")}`,
+      `Plugin modules belong in client/, server/, or shared/: ${path.join(realpathSync.native(entries.directory), "helper")}`,
     );
   });
 
@@ -225,7 +569,7 @@ export default function contribute() { void secret; return () => undefined; }`,
     ]);
 
     await expect(compilePlugin({ client: null, server })).rejects.toThrow(
-      `Plugin modules belong in client/, server/, or shared/: ${path.join(parent, "secret")}`,
+      `Plugin modules belong in client/, server/, or shared/: ${path.join(realpathSync.native(parent), "secret")}`,
     );
   });
 
@@ -242,7 +586,7 @@ export default function contribute() { void secret; return () => undefined; }`,
     );
 
     await expect(compilePlugin(entries)).rejects.toThrow(
-      `Plugin modules belong in client/, server/, or shared/: ${outside}`,
+      `Plugin modules belong in client/, server/, or shared/: ${realpathSync.native(outside)}`,
     );
   });
 
@@ -263,7 +607,7 @@ export default function contribute() { void secret; return () => undefined; }`,
     ]);
 
     await expect(compilePlugin({ client: null, server })).rejects.toThrow(
-      `Plugin modules belong in client/, server/, or shared/: ${path.join(parent, "node_modules", "secret")}`,
+      `Plugin modules belong in client/, server/, or shared/: ${path.join(realpathSync.native(parent), "node_modules", "secret")}`,
     );
   });
 
@@ -363,10 +707,69 @@ export default function contribute() { void handler; return () => undefined; }`,
     );
   });
 
-  it("classifies symlinks by their canonical target", async () => {
+  it.each(["file", "directory"])(
+    "preserves authored ownership through root and %s aliases",
+    async (aliasKind) => {
+      const entries = await createSplitPlugin();
+      const rootAlias = await createRootAlias(entries.directory);
+      const sharedValue = path.join(entries.directory, "shared/value.ts");
+      await writeFile(sharedValue, 'export const value = "shared";');
+      if (aliasKind === "file") {
+        await symlink(sharedValue, path.join(entries.directory, "server/alias.ts"));
+      } else {
+        await rm(path.join(entries.directory, "server"), { recursive: true });
+        await symlink(
+          path.join(entries.directory, "shared"),
+          path.join(entries.directory, "server"),
+          process.platform === "win32" ? "junction" : "dir",
+        );
+      }
+      await writeFile(
+        entries.client,
+        `export { value } from ${JSON.stringify(path.join(rootAlias, "server", aliasKind === "file" ? "alias.ts" : "value.ts"))};`,
+      );
+      await expect(compilePlugin({ client: entries.client, server: null })).rejects.toThrow(
+        "server-only module",
+      );
+      await writeFile(
+        entries.client,
+        `export { value } from ${JSON.stringify(path.join(rootAlias, "shared/value.ts"))};`,
+      );
+      await expect(compilePlugin({ client: entries.client, server: null })).resolves.toMatchObject({
+        clientBundle: expect.stringContaining("shared"),
+      });
+    },
+  );
+
+  it("rejects generated React imports in dependencies reached through shared symlinks", async () => {
     const entries = await createSplitPlugin();
+    const rootAlias = await createRootAlias(entries.directory);
+    const dependency = path.join(entries.directory, "node_modules/decoration");
+    await mkdir(dependency, { recursive: true });
+    await writeFile(
+      path.join(dependency, "package.json"),
+      JSON.stringify({ name: "decoration", main: "index.tsx" }),
+    );
+    await writeFile(path.join(dependency, "index.tsx"), "export const decoration = <></>;");
+    await writeFile(
+      path.join(entries.directory, "shared/decoration.ts"),
+      'export { decoration } from "decoration";',
+    );
+    await symlink(
+      path.join(rootAlias, "shared/decoration.ts"),
+      path.join(entries.directory, "client/decoration.ts"),
+    );
+    await writeFile(entries.client, 'export { decoration } from "./client/decoration";');
+    await expect(compilePlugin({ client: entries.client, server: null })).rejects.toThrow(
+      "plugin shared",
+    );
+  });
+
+  it.each([false, true])("classifies symlink targets through a root alias: %s", async (aliased) => {
+    const entries = await createSplitPlugin();
+    const targetRoot = aliased ? await createRootAlias(entries.directory) : entries.directory;
     const link = path.join(entries.directory, "client", "handler.ts");
-    await symlink(path.join(entries.directory, "server", "handler.ts"), link);
+    await symlink(path.join(targetRoot, "server", "handler.ts"), link);
     await writeFile(
       entries.client,
       `import { handler } from "./client/handler";
@@ -432,33 +835,37 @@ export default function contribute() { void value; return () => undefined; }`,
     expect(serverBundle).toContain("linked dependency");
   });
 
-  it("does not treat the plugin package manifest as a linked dependency root", async () => {
-    const entries = await createSplitPlugin();
-    const dependency = path.join(entries.directory, "node_modules", "fixture-dependency");
-    const secret = path.join(entries.directory, "secret.ts");
-    await mkdir(dependency, { recursive: true });
-    await Promise.all([
-      writeFile(
-        path.join(entries.directory, "package.json"),
-        JSON.stringify({ name: "fixture-dependency" }),
-      ),
-      writeFile(
-        path.join(dependency, "package.json"),
-        JSON.stringify({ name: "fixture-dependency", main: "index.js" }),
-      ),
-      writeFile(secret, `export const secret = "plugin root";`),
-      symlink(secret, path.join(dependency, "index.js")),
-      writeFile(
-        entries.client,
-        `import { secret } from "fixture-dependency";
+  it.each([false, true])(
+    "rejects plugin manifests as linked roots through an alias: %s",
+    async (aliased) => {
+      const entries = await createSplitPlugin();
+      const targetRoot = aliased ? await createRootAlias(entries.directory) : entries.directory;
+      const dependency = path.join(entries.directory, "node_modules", "fixture-dependency");
+      const secret = path.join(entries.directory, "secret.ts");
+      await mkdir(dependency, { recursive: true });
+      await Promise.all([
+        writeFile(
+          path.join(entries.directory, "package.json"),
+          JSON.stringify({ name: "fixture-dependency" }),
+        ),
+        writeFile(
+          path.join(dependency, "package.json"),
+          JSON.stringify({ name: "fixture-dependency", main: "index.js" }),
+        ),
+        writeFile(secret, `export const secret = "plugin root";`),
+        symlink(path.join(targetRoot, "secret.ts"), path.join(dependency, "index.js")),
+        writeFile(
+          entries.client,
+          `import { secret } from "fixture-dependency";
 export default function contribute() { void secret; return () => undefined; }`,
-      ),
-    ]);
+        ),
+      ]);
 
-    await expect(compilePlugin(entries)).rejects.toThrow(
-      `Plugin modules belong in client/, server/, or shared/: ${secret}`,
-    );
-  });
+      await expect(compilePlugin(entries)).rejects.toThrow(
+        `Plugin modules belong in client/, server/, or shared/: ${realpathSync.native(secret)}`,
+      );
+    },
+  );
 
   it("does not let remembered linked roots hide plugin-local runtime boundaries", async () => {
     const entries = await createSplitPlugin();
diff --git a/packages/server/src/server/plugins/compiler.ts b/packages/server/src/server/plugins/compiler.ts
index 981ccc1229..15df395d06 100644
--- a/packages/server/src/server/plugins/compiler.ts
+++ b/packages/server/src/server/plugins/compiler.ts
@@ -1,13 +1,16 @@
-import { existsSync, readFileSync } from "node:fs";
-import { createRequire } from "node:module";
+import { existsSync, readFileSync, realpathSync } from "node:fs";
+import { createRequire, isBuiltin } from "node:module";
 import path from "node:path";
-import type { OnResolveResult, Plugin } from "esbuild";
+import { createPluginImportReader, type PluginImportKind } from "./compiler-imports.js";
+import type { Metafile, OnResolveResult, Plugin } from "esbuild";
 import {
-  PLUGIN_CLIENT_ONLY_SDK_SPECIFIERS,
+  isPluginClientOnlySdkSpecifier,
+  isPluginServerOnlySdkSpecifier,
   PLUGIN_SDK_SPECIFIERS,
 } from "./plugin-sdk-specifiers.js";
 
 const nodeRequire = createRequire(import.meta.url);
+export const SERVER_HOST_MODULES = [...PLUGIN_SDK_SPECIFIERS, "zod"];
 const ESBUILD_BINARY_PATH = "ESBUILD_BINARY_PATH";
 
 // esbuild resolves its own platform binary via require.resolve() the first time its
@@ -100,12 +103,13 @@ function findDependencyRoot(
   pluginDirectory: string,
 ): string | null {
   const expectedName = dependencyName(specifier);
+  const ambientName = `@types/${expectedName.replace(/^@/, "").replace("/", "__")}`;
   let directory = path.dirname(resolvedPath);
   for (;;) {
     const manifestPath = path.join(directory, "package.json");
     if (existsSync(manifestPath)) {
       const manifest = JSON.parse(readFileSync(manifestPath, "utf8")) as { name?: unknown };
-      if (manifest.name === expectedName) {
+      if (manifest.name === expectedName || manifest.name === ambientName) {
         if (containsPath(pluginDirectory, directory) || containsPath(directory, pluginDirectory)) {
           return null;
         }
@@ -120,7 +124,7 @@ function findDependencyRoot(
 
 function moduleBoundaryError(
   moduleLocation: PluginModuleLocation | null,
-  target: PluginBuildTarget,
+  target: PluginBuildTarget | "shared",
   filePath: string,
 ): OnResolveResult | null {
   if (moduleLocation === "invalid") {
@@ -144,12 +148,22 @@ function lexicalBoundaryError(
   specifier: string,
   resolveDirectory: string,
   pluginDirectory: string,
-  target: PluginBuildTarget,
+  target: PluginBuildTarget | "shared",
 ): OnResolveResult | null {
   if (!specifier.startsWith(".") && !path.isAbsolute(specifier)) return null;
   const lexicalPath = path.resolve(resolveDirectory, specifier);
-  if (!containsPath(pluginDirectory, lexicalPath)) return null;
-  return moduleBoundaryError(directoryTarget(lexicalPath, pluginDirectory), target, lexicalPath);
+  if (containsPath(pluginDirectory, lexicalPath)) {
+    return moduleBoundaryError(directoryTarget(lexicalPath, pluginDirectory), target, lexicalPath);
+  }
+  // Normalize only a containing root alias. Resolving the whole import would erase
+  // an authored server/ or client/ location when the final file is a symlink.
+  for (let ancestor = path.dirname(lexicalPath); ; ancestor = path.dirname(ancestor)) {
+    if (existsSync(ancestor) && realpathSync.native(ancestor) === pluginDirectory) {
+      const ownedPath = path.join(pluginDirectory, path.relative(ancestor, lexicalPath));
+      return moduleBoundaryError(directoryTarget(ownedPath, pluginDirectory), target, lexicalPath);
+    }
+    if (path.dirname(ancestor) === ancestor) return null;
+  }
 }
 
 function createRuntimeBoundaryPlugin(target: PluginBuildTarget, pluginDirectory: string): Plugin {
@@ -158,20 +172,115 @@ function createRuntimeBoundaryPlugin(target: PluginBuildTarget, pluginDirectory:
   return {
     name: `paseo-plugin-${target}-runtime-boundary`,
     setup(buildContext) {
+      const checked = new Set<string>();
+      const imports = createPluginImportReader(pluginDirectory);
+      function resolvedBoundaryError(
+        resolvedFile: string,
+        specifier: string,
+        importer: string,
+        owner: PluginBuildTarget | "shared",
+      ) {
+        const file = realpathSync.native(resolvedFile);
+        const location = directoryTarget(file, pluginDirectory);
+        if (location === "invalid") {
+          if (
+            [...linkedDependencyRoots].some(
+              (root) => containsPath(root, importer) && containsPath(root, file),
+            )
+          )
+            return null;
+          if (!specifier.startsWith(".") && !path.isAbsolute(specifier)) {
+            const root = findDependencyRoot(file, specifier, pluginDirectory);
+            if (root) {
+              linkedDependencyRoots.add(root);
+              return null;
+            }
+          }
+        }
+        return moduleBoundaryError(location, owner, file);
+      }
+      async function resolveImportFiles(
+        file: string,
+        specifier: string,
+        kind: PluginImportKind,
+        typeOnly: boolean,
+      ): Promise<Set<string>> {
+        const declaration = imports.resolve(specifier, file, kind);
+        const dependencyFiles = new Set<string>();
+        if (declaration && (typeOnly || /\.d\.[cm]?ts$/.test(declaration)))
+          dependencyFiles.add(declaration);
+        if (typeOnly && !declaration) {
+          throw new Error(`Could not resolve type dependency "${specifier}" imported by ${file}`);
+        }
+        if (!typeOnly && kind !== "type-reference") {
+          const resolution = await buildContext.resolve(specifier, {
+            importer: file,
+            resolveDir: path.dirname(file),
+            kind,
+          });
+          // esbuild owns missing-runtime errors: erased imports and guarded optional
+          // requires are legal. Inspect every dependency that actually resolves.
+          if (!resolution.errors.length && !resolution.external && resolution.namespace === "file")
+            dependencyFiles.add(realpathSync.native(resolution.path));
+        }
+        return dependencyFiles;
+      }
+      async function checkSourceImports(
+        sourcePath: string,
+        inheritedOwner: PluginBuildTarget | "shared",
+      ): Promise<OnResolveResult | null> {
+        const file = realpathSync.native(sourcePath);
+        const owner =
+          directoryTarget(file, pluginDirectory) === "shared" ? "shared" : inheritedOwner;
+        const key = `${owner}:${file}`;
+        if (checked.has(key) || !/\.[cm]?[jt]sx?$/.test(file)) return null;
+        checked.add(key);
+        for (const { specifier, kind, typeOnly } of imports.read(file)) {
+          const packageSpecifier =
+            kind === "type-reference"
+              ? `@types/${specifier.replace(/^@/, "").replace("/", "__")}`
+              : specifier;
+          const error =
+            runtimeSpecifierError(specifier, owner, file) ??
+            runtimeSpecifierError(packageSpecifier, owner, file) ??
+            lexicalBoundaryError(specifier, path.dirname(file), pluginDirectory, owner);
+          if (error) return error;
+          // Host modules have separately enforced SDK boundaries and need no local installation.
+          if (
+            (PLUGIN_SDK_SPECIFIERS as readonly string[]).includes(specifier) ||
+            /^(zod|react|react-native|@tanstack\/react-query)(\/|$)/.test(specifier) ||
+            isBuiltin(specifier) ||
+            packageSpecifier === "@types/node"
+          )
+            continue;
+          const dependencyFiles = await resolveImportFiles(file, specifier, kind, typeOnly);
+          for (const dependencyFile of dependencyFiles) {
+            const boundaryError = resolvedBoundaryError(dependencyFile, specifier, file, owner);
+            if (boundaryError) return boundaryError;
+            const dependencyError = await checkSourceImports(dependencyFile, owner);
+            if (dependencyError) return dependencyError;
+          }
+        }
+        return null;
+      }
+      buildContext.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, (args) =>
+        checkSourceImports(args.path, target),
+      );
       buildContext.onResolve({ filter: /.*/ }, async (args) => {
         if (args.kind === "entry-point") return null;
         if (args.pluginData === boundaryResolution) return null;
-        const lexicalError = lexicalBoundaryError(
-          args.path,
-          args.resolveDir,
-          pluginDirectory,
-          target,
-        );
+        const importer =
+          args.namespace === "file" ? realpathSync.native(args.importer) : args.importer;
+        const resolveDir = args.namespace === "file" ? path.dirname(importer) : args.resolveDir;
+        const owner = directoryTarget(importer, pluginDirectory) === "shared" ? "shared" : target;
+        const specifierError = runtimeSpecifierError(args.path, owner, importer);
+        if (specifierError) return specifierError;
+        const lexicalError = lexicalBoundaryError(args.path, resolveDir, pluginDirectory, owner);
         if (lexicalError) return lexicalError;
         const resolution = await buildContext.resolve(args.path, {
-          importer: args.importer,
+          importer,
           namespace: args.namespace,
-          resolveDir: args.resolveDir,
+          resolveDir,
           kind: args.kind,
           pluginData: boundaryResolution,
           with: args.with,
@@ -183,26 +292,7 @@ function createRuntimeBoundaryPlugin(target: PluginBuildTarget, pluginDirectory:
         ) {
           return null;
         }
-        const resolvedPath = resolution.path;
-        const importedTarget = directoryTarget(resolvedPath, pluginDirectory);
-        if (importedTarget === "invalid") {
-          if (
-            [...linkedDependencyRoots].some(
-              (root) => containsPath(root, args.importer) && containsPath(root, resolvedPath),
-            )
-          ) {
-            return null;
-          }
-          if (!args.path.startsWith(".") && !path.isAbsolute(args.path)) {
-            const dependencyRoot = findDependencyRoot(resolvedPath, args.path, pluginDirectory);
-            if (dependencyRoot) {
-              linkedDependencyRoots.add(dependencyRoot);
-              return null;
-            }
-          }
-          return moduleBoundaryError(importedTarget, target, resolvedPath);
-        }
-        return moduleBoundaryError(importedTarget, target, resolvedPath);
+        return resolvedBoundaryError(resolution.path, args.path, importer, owner);
       });
     },
   };
@@ -219,62 +309,92 @@ function makeHermesInteropEager(code: string): string {
   return code.replaceAll("get: () => from[key]", "value: from[key]");
 }
 
-function exactSpecifierFilter(specifiers: readonly string[]): RegExp {
-  const alternatives = specifiers.map((specifier) =>
-    specifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
-  );
-  return new RegExp(`^(${alternatives.join("|")})$`);
-}
-
-function createUnusedPlatformModulePlugin(): Plugin {
-  const filter = exactSpecifierFilter([
-    "@tanstack/react-query",
-    "react",
-    "react/jsx-runtime",
-    "react-native",
-    ...PLUGIN_CLIENT_ONLY_SDK_SPECIFIERS,
-  ]);
-  return {
-    name: "paseo-plugin-server-unused-platform-modules",
-    setup(buildContext) {
-      buildContext.onResolve({ filter }, (args) => ({
-        path: args.path,
-        namespace: "paseo-unused-platform-module",
-        sideEffects: false,
-      }));
-      buildContext.onLoad({ filter: /.*/, namespace: "paseo-unused-platform-module" }, () => ({
-        contents: "module.exports = {};",
-        loader: "js",
-      }));
-    },
-  };
-}
-
-function createClientNodeImportPlugin(): Plugin {
-  return {
-    name: "paseo-plugin-client-node-imports",
-    setup(buildContext) {
-      buildContext.onResolve({ filter: /^node:/ }, (args) => ({
+function runtimeSpecifierError(
+  specifier: string,
+  target: PluginBuildTarget | "shared",
+  importer: string,
+): OnResolveResult | null {
+  let kind: string | null = null;
+  if (specifier === "@getpaseo/plugin/client/host") kind = "host-private";
+  else if (
+    (specifier === "@getpaseo/plugin" ||
+      specifier.startsWith("@getpaseo/plugin/") ||
+      specifier === "@paseo/plugin" ||
+      specifier.startsWith("@paseo/plugin/")) &&
+    !(PLUGIN_SDK_SPECIFIERS as readonly string[]).includes(specifier)
+  )
+    kind = "Unknown SDK";
+  else if (target !== "server" && (isBuiltin(specifier) || specifier === "@types/node"))
+    kind = "Node";
+  else if (target !== "server" && isPluginServerOnlySdkSpecifier(specifier)) kind = "server-only";
+  else if (
+    target !== "client" &&
+    (isPluginClientOnlySdkSpecifier(specifier) ||
+      /^((?:@types\/)?react(?:-dom|-native)?|use-sync-external-store|@tanstack\/react-query)(\/|$)/.test(
+        specifier,
+      ))
+  )
+    kind = "client-only";
+  return kind
+    ? {
         errors: [
           {
-            text: `Node module cannot be imported into the plugin client bundle: ${args.path} imported by ${args.importer}`,
+            text: `${kind} module cannot be imported into the plugin ${target} bundle: ${specifier} imported by ${importer}`,
           },
         ],
-      }));
-    },
-  };
+      }
+    : null;
+}
+
+function checkSharedDependencies(inputs: Metafile["inputs"], pluginDirectory: string): void {
+  function inputLocation(file: string): PluginModuleLocation | null {
+    const absolutePath = path.resolve(file);
+    // Metafile keys must stay unchanged for graph traversal. Only filesystem
+    // inputs have canonical paths; data URLs and external specifiers do not.
+    return directoryTarget(
+      existsSync(absolutePath) ? realpathSync.native(absolutePath) : absolutePath,
+      pluginDirectory,
+    );
+  }
+  const pending = Object.keys(inputs).filter((file) => inputLocation(file) === "shared");
+  const visited = new Set<string>();
+  while (pending.length) {
+    const file = pending.pop()!;
+    if (visited.has(file)) continue;
+    visited.add(file);
+    for (const dependency of inputs[file]?.imports ?? []) {
+      const location = dependency.external ? null : inputLocation(dependency.path);
+      const error =
+        runtimeSpecifierError(dependency.original ?? dependency.path, "shared", file) ??
+        (dependency.external
+          ? null
+          : moduleBoundaryError(
+              location === "invalid" ? null : location,
+              "shared",
+              dependency.path,
+            ));
+      if (error?.errors?.length) throw new Error(error.errors[0].text);
+      if (!dependency.external) pending.push(dependency.path);
+    }
+  }
 }
 
 async function compileTarget(entryPath: string, target: PluginBuildTarget): Promise<string> {
   const { build } = loadEsbuild();
-  const pluginDirectory = path.dirname(entryPath);
+  // Use native canonical paths throughout: TypeScript expands Windows short names
+  // when resolving type references, while the JS realpath implementation retains them.
+  const pluginDirectory = realpathSync.native(path.dirname(entryPath));
   const result = await build({
-    entryPoints: [entryPath],
+    entryPoints: [realpathSync.native(entryPath)],
     bundle: true,
     format: "cjs",
-    jsx: target === "client" ? "automatic" : undefined,
+    jsx: "automatic",
     platform: target === "server" ? "node" : "neutral",
     target: target === "server" ? "node20" : "es2020",
+    // The neutral platform reads no package.json entry fields, so packages without
+    // `exports` would not resolve. Read the same fields as esbuild's browser platform
+    // minus `browser`, since the bundle also runs in React Native.
+    mainFields: target === "client" ? ["module", "main"] : undefined,
     // Metro lowers async syntax before Hermes sees app code. Plugin client bundles bypass Metro,
     // so apply the same compatibility transform before the app evaluates them from source.
     supported: target === "client" ? { "async-await": false } : undefined,
@@ -288,17 +408,14 @@ async function compileTarget(entryPath: string, target: PluginBuildTarget): Prom
             "react-native",
             "zod",
           ]
-        : [...PLUGIN_SDK_SPECIFIERS, "zod"],
-    plugins: [
-      createRuntimeBoundaryPlugin(target, pluginDirectory),
-      ...(target === "client"
-        ? [createClientNodeImportPlugin()]
-        : [createUnusedPlatformModulePlugin()]),
-    ],
+        : SERVER_HOST_MODULES,
+    plugins: [createRuntimeBoundaryPlugin(target, pluginDirectory)],
+    metafile: true,
     logLevel: "silent",
     treeShaking: true,
     write: false,
   });
+  checkSharedDependencies(result.metafile.inputs, pluginDirectory);
   const output = result.outputFiles[0]?.text;
   if (!output) throw new Error(`Plugin ${target} compilation produced no output`);
   return wrapCommonJsBundle(makeHermesInteropEager(output));
diff --git a/packages/server/src/server/plugins/connection-demand.e2e.test.ts b/packages/server/src/server/plugins/connection-demand.e2e.test.ts
new file mode 100644
index 0000000000..7c6cbfca28
--- /dev/null
+++ b/packages/server/src/server/plugins/connection-demand.e2e.test.ts
@@ -0,0 +1,91 @@
+import { mkdtemp, writeFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "vitest";
+import { createPaseoApi } from "@getpaseo/client";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+test("an RPC-only plugin receives no agent, project or provider data", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-quiet-plugin-"));
+  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: "quiet" }));
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    `
+import { defineRpc } from "@getpaseo/plugin";
+import { z } from "zod";
+export default function contribute(server) {
+  const counts = {};
+  const observe = message => {
+    if (message.type !== "paseo_frame" || typeof message.data !== "string") return;
+    const frame = JSON.parse(message.data);
+    const type = frame.message?.type;
+    if (type) counts[type] = (counts[type] ?? 0) + 1;
+  };
+  process.on("message", observe);
+  server.handle(defineRpc({name:"counts", input:z.object({}), output:z.record(z.string(),z.number())}), () => counts);
+  return () => process.off("message", observe);
+}`,
+  );
+  const daemon = await createTestPaseoDaemon();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const idle = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const legacy = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    capabilities: {
+      selective_agent_timeline: false,
+      explicit_event_subscriptions: false,
+      provider_snapshot_references: false,
+    },
+  });
+  const legacyTypes: string[] = [];
+  legacy.subscribeRawMessages((message) => legacyTypes.push(message.type));
+  const idleTypes: string[] = [];
+  idle.subscribeRawMessages((message) => idleTypes.push(message.type));
+  try {
+    await client.connect();
+    await idle.connect();
+    await legacy.connect();
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const agent = await client.createAgent({ provider: "claude", cwd: directory });
+    const api = createPaseoApi(client);
+    const received: string[] = [];
+    const release = api.agents
+      .ref(agent.id)
+      .timeline.subscribe((event) => received.push(event.event.type));
+    await release.ready;
+    await daemon.daemon.agentManager.emitLiveTimelineItem(agent.id, {
+      type: "assistant_message",
+      id: "row",
+      text: "only the subscriber sees this",
+    });
+    await expect.poll(() => received).toEqual(["timeline"]);
+    await client.sendMessage(agent.id, "Say hello");
+    await client.waitForFinish(agent.id);
+    await client.refreshProvidersSnapshot({ cwd: directory });
+    const counts = await client.invokePluginRpc("quiet", "counts", {});
+    expect(counts).toEqual({ status: 1 });
+    await legacy.getDaemonConfig();
+    expect(legacyTypes).toEqual(
+      expect.arrayContaining(["project.update", "providers_snapshot_update", "agent_stream"]),
+    );
+    expect(idleTypes.filter((type) => type !== "status")).toEqual([]);
+    const deliveredBeforeRelease = received.length;
+    release();
+    await client.getDaemonConfig();
+    await daemon.daemon.agentManager.emitLiveTimelineItem(agent.id, {
+      type: "assistant_message",
+      id: "row-2",
+      text: "unsubscribed",
+    });
+    await client.getDaemonConfig();
+    expect(received).toHaveLength(deliveredBeforeRelease);
+  } finally {
+    await legacy.close();
+    await idle.close();
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/index.posix.test.ts b/packages/server/src/server/plugins/index.posix.test.ts
index 33d790a59b..71fe2b96e9 100644
--- a/packages/server/src/server/plugins/index.posix.test.ts
+++ b/packages/server/src/server/plugins/index.posix.test.ts
@@ -1,4 +1,16 @@
-import { mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
+import {
+  cp,
+  rename,
+  mkdir,
+  mkdtemp,
+  readFile,
+  readdir,
+  rm,
+  stat,
+  writeFile,
+} from "node:fs/promises";
+import { createServer } from "node:http";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -6,12 +18,23 @@ import pino from "pino";
 import { afterEach, describe, expect, it } from "vitest";
 import { DaemonConfigStore } from "../daemon-config-store.js";
 import { PluginService } from "./index.js";
+import { BuiltinPluginLoader } from "./builtin/index.js";
 import { ManagedPluginSources } from "./managed-source.js";
+import {
+  startNpmRegistry,
+  npmPluginPackages,
+} from "../../../../../scripts/test-support/npm-registry.mjs";
 import { runGitCommand } from "../../utils/run-git-command.js";
 
 const roots: string[] = [];
 type TestPluginRuntime = NonNullable<ConstructorParameters<typeof PluginService>[3]["runtime"]>;
 
+const emptyUsageRuntime = {
+  getUsageSourceRegistrations: () => [],
+  fetchUsage: async () => undefined,
+  discoverUsage: async () => [],
+} satisfies Pick<TestPluginRuntime, "getUsageSourceRegistrations" | "fetchUsage" | "discoverUsage">;
+
 async function createPlugin(id: string, source: string): Promise<string> {
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-service-"));
   roots.push(directory);
@@ -99,6 +122,7 @@ function createPausedRuntime() {
   });
   const running = new Set<string>();
   const runtime: TestPluginRuntime = {
+    ...emptyUsageRuntime,
     catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
     invoke: async () => undefined,
     getLogs: () => [],
@@ -131,6 +155,7 @@ function createPluginSelectivePausedRuntime(pausedPluginId: string) {
   const starts: string[] = [];
   const running = new Set<string>();
   const runtime: TestPluginRuntime = {
+    ...emptyUsageRuntime,
     catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
     invoke: async () => undefined,
     getLogs: () => [],
@@ -155,6 +180,140 @@ function createPluginSelectivePausedRuntime(pausedPluginId: string) {
 }
 
 describe("PluginService", () => {
+  it.each([
+    { shadow: false, runtime: "subprocess" },
+    { shadow: true, runtime: "subprocess" },
+    { shadow: false, runtime: "builtin" },
+    { shadow: true, runtime: "builtin" },
+  ])(
+    "publishes status and launch metadata through $runtime despite a configured provider (extends: $shadow)",
+    async ({ shadow, runtime }) => {
+      const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+      roots.push(home);
+      const directory = await createPlugin(
+        "provider-status",
+        `export default function contribute(server) {
+      server.registerProvider({ id: "plugin-agent", label: "Plugin agent", command: ["agent", "serve"],
+        async status({ launch }) { return launch.env.LOGIN === "yes" ? { available: true } : { available: false, diagnostic: "Sign in" }; },
+        async getCatalogCacheKey({ launch }) { return launch.command + ":" + launch.env.LOGIN; },
+        async connect({ launch }) {
+          if (launch.command !== process.execPath || launch.env.LOGIN !== "no") throw new Error("Unexpected launch");
+          return { version: 1, capabilities: [], async send() {}, onEvent() { return () => {}; }, async close() {} };
+        },
+      });
+      return () => {};
+    }`,
+      );
+      const store = createStore(home);
+      await store.patch({
+        providers: {
+          "plugin-agent": shadow
+            ? { extends: "acp", label: "Own provider", command: ["own-agent"] }
+            : { command: ["configured-agent"], enabled: false },
+        },
+      });
+      const builtinRoot = path.join(home, "builtins");
+      if (runtime === "builtin") {
+        await mkdir(builtinRoot);
+        await cp(directory, path.join(builtinRoot, "provider-status"), { recursive: true });
+      }
+      const builtinPlugins = new BuiltinPluginLoader(
+        builtinRoot,
+        runtime === "builtin" ? ["provider-status"] : [],
+      );
+      const service = bindTestSessionHost(
+        new PluginService(pino({ level: "silent" }), store, "0.4.0", { builtinPlugins }),
+      );
+      await service.start();
+      try {
+        if (runtime === "subprocess") await service.installDirectory({ path: directory });
+        const [registration] = service.getProviderRegistrations();
+        expect(registration).toMatchObject({
+          id: "plugin-agent",
+          command: ["agent", "serve"],
+          status: expect.any(Function),
+        });
+        const launch = { command: process.execPath, args: [], env: { LOGIN: "no" } };
+        expect(await registration!.getCatalogCacheKey!({ scope: "global", launch })).toBe(
+          process.execPath + ":no",
+        );
+        expect(await registration!.status!({ launch })).toEqual({
+          available: false,
+          diagnostic: "Sign in",
+        });
+        expect(
+          await registration!.status!({ launch: { ...launch, env: { LOGIN: "yes" } } }),
+        ).toEqual({ available: true });
+        const connection = await registration!.connect({ versions: [1], capabilities: [], launch });
+        await connection.close();
+      } finally {
+        await service.stopAllPlugins();
+      }
+    },
+  );
+
+  it("resolves a provider icon path to sanitized inline SVG", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    roots.push(home);
+    const directory = await createPlugin(
+      "provider-icon",
+      `export default function contribute(server) {
+  server.registerProvider({
+    id: "plugin-agent",
+    label: "Plugin agent",
+    icon: "icon.svg",
+    async getCatalogCacheKey(options) { return options.scope === "workspace" ? "runtime:" + options.cwd : undefined; },
+    async connect() { throw new Error("not opened by this test"); },
+  });
+  return () => {};
+}`,
+    );
+    const iconSvg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
+    await writeFile(path.join(directory, "icon.svg"), iconSvg);
+    const service = createService(home);
+
+    await service.start();
+    await service.installDirectory({ path: directory });
+
+    expect(service.getProviderRegistrations()).toMatchObject([
+      { id: "plugin-agent", icon: iconSvg, getCatalogCacheKey: expect.any(Function) },
+    ]);
+    const provider = service.getProviderRegistrations()[0]!;
+    expect(await provider.getCatalogCacheKey!({ scope: "workspace", cwd: "/project-a" })).toBe(
+      "runtime:/project-a",
+    );
+    expect(
+      await provider.getCatalogCacheKey!({ scope: "workspace", cwd: "/project-b", force: true }),
+    ).toBe("runtime:/project-b");
+    expect(await provider.getCatalogCacheKey!({ scope: "global" })).toBeUndefined();
+  });
+
+  it("publishes provider registrations only while their plugin is running", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    roots.push(home);
+    const directory = await createPlugin(
+      "provider-lifecycle",
+      `export default function contribute(server) {
+  server.registerProvider({
+    id: "plugin-agent",
+    label: "Plugin agent",
+    async connect() { throw new Error("not opened by this test"); },
+  });
+  return () => {};
+}`,
+    );
+    const service = createService(home);
+
+    await service.start();
+    await service.installDirectory({ path: directory });
+    expect(service.getProviderRegistrations()).toMatchObject([
+      { id: "plugin-agent", label: "Plugin agent" },
+    ]);
+
+    await service.disablePlugin("provider-lifecycle");
+    expect(service.getProviderRegistrations()).toEqual([]);
+  });
+
   it("retains logs when disabled and clears them only when removed", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
@@ -168,6 +327,7 @@ describe("PluginService", () => {
     ];
     const cleared: string[] = [];
     const runtime: TestPluginRuntime = {
+      ...emptyUsageRuntime,
       catalog: () => [],
       invoke: async () => undefined,
       getLogs: () => entries,
@@ -247,7 +407,7 @@ describe("PluginService", () => {
     await writeFile(path.join(directory, "index.server.ts"), "export default broken syntax !!!");
     await expect(service.reloadPlugin("work-plugin")).rejects.toThrow();
     expect(service.catalog()).toEqual([]);
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
       expect.objectContaining({ id: "work-plugin", status: "failed", error: expect.any(String) }),
     ]);
 
@@ -259,7 +419,153 @@ describe("PluginService", () => {
     await service.stopAllPlugins();
   }, 20_000);
 
-  it("prefers an existing directory and installs its selected plugin subdirectory", async () => {
+  it("lists manifest metadata for running and disabled plugins without hiding malformed entries", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    roots.push(home);
+    const running = await createPlugin("running", "export default () => () => {};");
+    const disabled = await createPlugin("disabled", "export default () => () => {};");
+    const malformed = await createPlugin("malformed", "export default () => () => {};");
+    await writeFile(
+      path.join(running, "paseo-plugin.json"),
+      JSON.stringify({
+        id: "running",
+        description: "Runs checks",
+        name: "Checks",
+        icon: "icon.png",
+        media: ["screenshot.png", "https://example.com/demo.mp4"],
+      }),
+    );
+    await writeFile(
+      path.join(disabled, "paseo-plugin.json"),
+      JSON.stringify({ id: "disabled", description: "Waits until enabled" }),
+    );
+    await writeFile(path.join(malformed, "paseo-plugin.json"), "{");
+    const service = createService(home, {
+      running: { source: "directory", path: running },
+      disabled: { source: "directory", path: disabled, enabled: false },
+      malformed: { source: "directory", path: malformed },
+    });
+
+    await service.start();
+
+    expect(
+      (await service.listPlugins()).map(({ id, description, name, icon, media }) => ({
+        id,
+        description,
+        name,
+        icon,
+        media,
+      })),
+    ).toEqual([
+      { id: "disabled", description: "Waits until enabled" },
+      { id: "malformed", description: undefined },
+      {
+        id: "running",
+        description: "Runs checks",
+        name: "Checks",
+        icon: "icon.png",
+        media: ["screenshot.png", "https://example.com/demo.mp4"],
+      },
+    ]);
+    await service.stopAllPlugins();
+  });
+
+  it("resolves a bare registry id even when a matching directory exists in the daemon cwd", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    const owner = path.join(process.cwd(), `registry-shadow-${randomUUID()}`);
+    await mkdir(owner);
+    roots.push(home, owner);
+    const source = `${path.basename(owner)}/example`;
+    const repository = await createPlugin("registry-example", "export default () => () => {};\n");
+    await mkdir(path.join(owner, "example"));
+    await cp(repository, path.join(owner, "example"), { recursive: true });
+    await runGitCommand(["init", "-b", "main"], { cwd: repository });
+    await runGitCommand(["add", "-A"], { cwd: repository });
+    await runGitCommand(
+      [
+        "-c",
+        "user.name=Paseo Tests",
+        "-c",
+        "user.email=paseo@example.test",
+        "commit",
+        "-m",
+        "fixture",
+      ],
+      { cwd: repository },
+    );
+    const { stdout } = await runGitCommand(["rev-parse", "HEAD"], { cwd: repository });
+    const requests: Array<string | undefined> = [];
+    const server = createServer((request, response) => {
+      requests.push(request.url);
+      response.setHeader("Content-Type", "application/json");
+      response.end(
+        JSON.stringify({
+          id: source,
+          name: "Example",
+          description: "Test",
+          categories: [],
+          author: { github: path.basename(owner) },
+          repository: { url: "https://github.com/fixture/example" },
+          artifact: {
+            kind: "git",
+            remote: pathToFileURL(repository).href,
+            commit: stdout.trim(),
+            pluginPath: ".",
+          },
+          media: [],
+          submittedAt: "2026-10-03",
+          reviewedAt: "2026-10-03",
+          updatedAt: "2026-10-03",
+          publishedAt: "2026-10-03",
+          readme: "# Test",
+        }),
+      );
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    const url = `http://127.0.0.1:${address.port}`;
+    const store = createStore(home);
+    store.patch({ pluginsEnabled: false });
+    const service = bindTestSessionHost(
+      new PluginService(pino({ level: "silent" }), store, "0.4.0", {
+        managedSources: new ManagedPluginSources(home, { defaultUrl: url }),
+      }),
+    );
+    try {
+      await service.start();
+      await expect(service.installSource({ source })).resolves.toMatchObject({
+        id: "registry-example",
+        status: "disabled",
+        installation: {
+          identity: { kind: "git", registry: { url, id: source } },
+          currentRevision: stdout.trim(),
+        },
+      });
+      expect(requests).toEqual([`/plugins/${source}.json`]);
+      await expect(
+        service.installSource({ source: `./${source}`, id: "local-example" }),
+      ).resolves.toMatchObject({
+        installation: { identity: { kind: "directory", path: path.join(owner, "example") } },
+      });
+      expect(requests).toEqual([`/plugins/${source}.json`]);
+    } finally {
+      await service.stopAllPlugins();
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  }, 30_000);
+
+  it("names a missing explicit directory instead of trying a managed source", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    roots.push(home);
+    const directory = path.join(home, "missing");
+    const service = createService(home);
+    await expect(service.installSource({ source: directory })).rejects.toThrow(
+      `Plugin directory does not exist: ${directory}`,
+    );
+  });
+
+  it("installs an explicit directory and its selected plugin subdirectory", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
     const repository = await mkdtemp(path.join(tmpdir(), "owner-repository-"));
@@ -283,6 +589,150 @@ describe("PluginService", () => {
     await service.stopAllPlugins();
   }, 20_000);
 
+  it.each([true, false])(
+    "updates the shipped legacy Git layout with enabled=%s",
+    async (enabled) => {
+      const home = await mkdtemp(path.join(tmpdir(), "paseo-legacy-layout-"));
+      roots.push(home);
+      const repository = await mkdtemp(path.join(tmpdir(), "paseo-legacy-remote-"));
+      roots.push(repository);
+      const id = "legacy-review";
+      const pluginPath = "plugins/review";
+      await mkdir(path.join(repository, pluginPath), { recursive: true });
+      await writeFile(
+        path.join(repository, pluginPath, "paseo-plugin.json"),
+        JSON.stringify({ id, requirements: { paseo: ">=0.8.0" } }),
+      );
+      await writeFile(
+        path.join(repository, pluginPath, "index.server.ts"),
+        `import { defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+export default function contribute(server: PluginServerContext) {
+  server.registerSettings(defineSettings({ id: "preferences", scope: "host", version: 1, schema: z.object({ message: z.string().default("default") }) }));
+  return () => {};
+}`,
+      );
+      for (const args of [
+        ["init", "-b", "main"],
+        ["add", "."],
+        ["-c", "user.name=Test", "-c", "user.email=test@example.test", "commit", "-m", "initial"],
+        ["tag", "v1"],
+      ])
+        await runGitCommand(args, { cwd: repository });
+      const initial = (
+        await runGitCommand(["rev-parse", "HEAD"], { cwd: repository })
+      ).stdout.trim();
+      const remote = pathToFileURL(repository).href;
+      const legacyRoot = path.join(home, "plugins", id, `${initial.slice(0, 12)}-${randomUUID()}`);
+      const checkoutRoot = path.join(legacyRoot, "checkout");
+      const directory = path.join(checkoutRoot, pluginPath);
+      await mkdir(legacyRoot, { recursive: true });
+      await runGitCommand(["clone", remote, checkoutRoot], { cwd: home });
+      await runGitCommand(["checkout", "--detach", "v1"], { cwd: checkoutRoot });
+      await writeFile(
+        path.join(home, "plugins", "sources.json"),
+        JSON.stringify({
+          [id]: {
+            remote,
+            requestedRef: "v1",
+            trackingBranch: null,
+            commit: "f".repeat(40),
+            pluginPath,
+            checkoutRoot,
+          },
+        }),
+      );
+      const settingsDirectory = path.join(home, "plugin-settings");
+      await mkdir(path.join(settingsDirectory, id), { recursive: true });
+      const settingsFile = path.join(settingsDirectory, id, "preferences.json");
+      const savedSettings = JSON.stringify({ version: 1, values: { message: "keep my settings" } });
+      await writeFile(settingsFile, savedSettings);
+      const store = createStore(home, { [id]: { source: "directory", path: directory, enabled } });
+      const open = () =>
+        bindTestSessionHost(
+          new PluginService(pino({ level: "silent" }), store, "0.8.0", {
+            managedSources: new ManagedPluginSources(home),
+            settingsDirectory,
+          }),
+        );
+      let service = open();
+      try {
+        await service.start();
+        const expected = {
+          identity: { kind: "git", remote, pluginPath },
+          currentRevision: initial,
+        };
+        await rename(repository, `${repository}-offline`);
+        try {
+          expect(await new ManagedPluginSources(home).describe(id, directory)).toEqual(expected);
+          expect(await service.listPlugins()).toMatchObject([
+            { id, enabled, status: enabled ? "running" : "disabled", installation: expected },
+          ]);
+        } finally {
+          await rename(`${repository}-offline`, repository);
+        }
+        await service.stopAllPlugins();
+        service = open();
+        await service.start();
+        await runGitCommand(["checkout", "-b", "new-default"], { cwd: repository });
+        await writeFile(path.join(repository, pluginPath, "revision.txt"), "new default");
+        for (const args of [
+          ["add", "."],
+          ["-c", "user.name=Test", "-c", "user.email=test@example.test", "commit", "-m", "update"],
+        ])
+          await runGitCommand(args, { cwd: repository });
+        const latest = (
+          await runGitCommand(["rev-parse", "HEAD"], { cwd: repository })
+        ).stdout.trim();
+        const [preview] = await service.previewUpdates({ pluginId: id });
+        expect(preview).toMatchObject({
+          outcome: "update",
+          current: expected,
+          target: { kind: "git", commit: latest },
+        });
+        const [updated] = await service.applyUpdates([preview!.proposal!]);
+        expect(updated).toMatchObject({
+          outcome: "updated",
+          plugin: {
+            id,
+            enabled,
+            status: enabled ? "running" : "disabled",
+            installation: { identity: expected.identity, currentRevision: latest },
+          },
+        });
+        await expect(stat(legacyRoot)).rejects.toMatchObject({ code: "ENOENT" });
+        expect(await readFile(settingsFile, "utf8")).toBe(savedSettings);
+        await service.disablePlugin(id);
+        await service.enablePlugin(id);
+        expect(await service.reloadPlugin(id)).toMatchObject({ status: "running" });
+        expect(await service.invokePluginRpc(id, "settings.preferences.read", {})).toMatchObject({
+          status: "ready",
+          values: { message: "keep my settings" },
+        });
+        await service.removePlugin(id);
+        await expect(stat(path.join(home, "plugins", id))).rejects.toMatchObject({
+          code: "ENOENT",
+        });
+        expect(await stat(repository)).toBeDefined();
+        const sources = new ManagedPluginSources(home);
+        // A record cannot confer ownership on another plugin's tree or a malformed version name.
+        sources.commit(id, { kind: "git", remote });
+        for (const outside of [
+          path.join(home, "plugins", "other", path.basename(legacyRoot), "checkout"),
+          path.join(home, "plugins", id, "f".repeat(36), "checkout"),
+          path.join(home, "plugins", id, `${initial.slice(0, 12)}-invalid`, "checkout"),
+        ])
+          await expect(sources.describe(id, outside)).rejects.toThrow(
+            "outside its managed installation",
+          );
+      } finally {
+        await service.stopAllPlugins();
+      }
+    },
+    30_000,
+  );
+
   it("keeps the running commit when a Git update build command fails", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
@@ -329,12 +779,14 @@ describe("PluginService", () => {
     await runGitCommand(["add", "-A"], { cwd: repository });
     await runGitCommand(["commit", "-m", "broken update"], { cwd: repository });
 
-    await expect(service.updateSources("git-update")).rejects.toThrow();
+    expect(await applyReviewedUpdate(service, "git-update")).toMatchObject([
+      { outcome: "error", error: expect.stringContaining("build exploded") },
+    ]);
     expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
     expect(service.catalog()).toEqual([
       expect.objectContaining({ id: "git-update", clientBundle: expect.any(String) }),
     ]);
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
       expect.objectContaining({
         id: "git-update",
         path: installedPath,
@@ -374,6 +826,7 @@ describe("PluginService", () => {
     const events: string[] = [];
     const running = new Set<string>();
     const runtime: TestPluginRuntime = {
+      ...emptyUsageRuntime,
       catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
       invoke: async () => undefined,
       getLogs: () => [],
@@ -423,8 +876,8 @@ describe("PluginService", () => {
     await runGitCommand(["add", "-A"], { cwd: repository });
     await runGitCommand(["commit", "-m", "prepared update"], { cwd: repository });
 
-    await expect(service.updateSources("prepared-git-plugin")).resolves.toEqual([
-      expect.objectContaining({ id: "prepared-git-plugin", updated: true }),
+    await expect(applyReviewedUpdate(service, "prepared-git-plugin")).resolves.toEqual([
+      expect.objectContaining({ id: "prepared-git-plugin", outcome: "updated" }),
     ]);
     expect(events).toEqual(["validate:prepared", "start", "validate:updated", "start"]);
     await service.stopAllPlugins();
@@ -457,6 +910,7 @@ describe("PluginService", () => {
     const starts: string[] = [];
     let failNextStart = true;
     const runtime: TestPluginRuntime = {
+      ...emptyUsageRuntime,
       catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
       invoke: async () => undefined,
       getLogs: () => [],
@@ -483,7 +937,7 @@ describe("PluginService", () => {
       managedSources,
     });
     await service.start();
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
       expect.objectContaining({ id: "failed-update", status: "failed" }),
     ]);
 
@@ -494,17 +948,88 @@ describe("PluginService", () => {
     await runGitCommand(["add", "-A"], { cwd: repository });
     await runGitCommand(["commit", "-m", "fixed"], { cwd: repository });
 
-    await expect(service.updateSources("failed-update")).resolves.toEqual([
-      expect.objectContaining({ id: "failed-update", updated: true }),
+    await expect(applyReviewedUpdate(service, "failed-update")).resolves.toEqual([
+      expect.objectContaining({ id: "failed-update", outcome: "updated" }),
     ]);
     expect(starts).toHaveLength(2);
     expect(starts[1]).not.toBe(initial.directory);
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
       expect.objectContaining({ id: "failed-update", path: starts[1], status: "running" }),
     ]);
     await service.stopAllPlugins();
   }, 30_000);
 
+  it.each([false, true])(
+    "cleans a failed update when restoration also fails=%s",
+    async (failRestore) => {
+      const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-recovery-"));
+      roots.push(home);
+      const repository = await createPlugin("recovery", "export default () => () => {};\n");
+      for (const args of [
+        ["init", "-b", "main"],
+        ["add", "."],
+        ["-c", "user.name=Test", "-c", "user.email=test@example.test", "commit", "-m", "initial"],
+      ])
+        await runGitCommand(args, { cwd: repository });
+      const running = new Set<string>();
+      let starts = 0;
+      const runtime: TestPluginRuntime = {
+        ...emptyUsageRuntime,
+        catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
+        invoke: async () => undefined,
+        getLogs: () => [],
+        clearLogs: () => undefined,
+        validatePlugin: async () => undefined,
+        startPlugin: async (id) => {
+          starts++;
+          if (starts === 2) throw new Error("candidate activation failed");
+          if (starts === 3 && failRestore) throw new Error("prior activation failed");
+          running.add(id);
+        },
+        stopPluginById: async (id) => running.delete(id),
+        stopAll: async () => running.clear(),
+        subscribe: () => () => undefined,
+        bindPaseoSessionHost: () => undefined,
+      };
+      const service = createService(
+        home,
+        {},
+        { runtime, managedSources: new ManagedPluginSources(home) },
+      );
+      await service.start();
+      const installed = await service.installSource({ source: pathToFileURL(repository).href });
+      await writeFile(path.join(repository, "revision.txt"), "new");
+      for (const args of [
+        ["add", "."],
+        ["-c", "user.name=Test", "-c", "user.email=test@example.test", "commit", "-m", "update"],
+      ])
+        await runGitCommand(args, { cwd: repository });
+      const result = await applyReviewedUpdate(service, "recovery");
+      expect(result).toMatchObject([
+        {
+          outcome: "error",
+          error: expect.stringContaining(
+            failRestore ? "restoring previous plugin also failed" : "candidate activation failed",
+          ),
+        },
+      ]);
+      expect(await service.listPlugins()).toMatchObject([
+        {
+          path: installed.path,
+          enabled: true,
+          status: failRestore ? "failed" : "running",
+          installation: installed.installation,
+        },
+      ]);
+      expect(await readdir(path.join(home, "plugins", "recovery"))).toEqual([
+        path.basename(path.dirname(installed.path)),
+      ]);
+      expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
+      await service.stopAllPlugins();
+    },
+    30_000,
+  );
+
   it("disables and removes a plugin without touching its source directory", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
@@ -530,7 +1055,7 @@ export default function contribute(plugin: unknown) {
     expect(await readFile(cleanupFile, "utf8")).toBe("cleaned");
     await service.removePlugin("cleanup-plugin");
 
-    expect(service.listPlugins()).toEqual([]);
+    expect(await service.listPlugins()).toMatchObject([]);
     await expect(stat(directory)).resolves.toMatchObject({});
     await service.stopAllPlugins();
   }, 20_000);
@@ -562,7 +1087,7 @@ export default function contribute(plugin: unknown) {
     );
     store.patch({ pluginsEnabled: true });
     await service.reloadPlugin("first");
-    expect(service.listPlugins().map(({ id, status }) => ({ id, status }))).toEqual([
+    expect((await service.listPlugins()).map(({ id, status }) => ({ id, status }))).toEqual([
       { id: "first", status: "running" },
       { id: "second", status: "running" },
     ]);
@@ -589,7 +1114,7 @@ export default function contribute(plugin: unknown) {
     await service.stopAllPlugins();
 
     expect(service.catalog()).toEqual([]);
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
       { id: "slow", path: "/plugins/slow", enabled: true, status: "disabled" },
     ]);
   });
@@ -684,6 +1209,9 @@ export default function contribute(plugin: unknown) {
     await writeFile(path.join(invalid, "paseo-plugin.json"), JSON.stringify({}));
     const missingEntry = await createPlugin("missing-entry", "export default () => () => {};");
     await rm(path.join(missingEntry, "index.server.ts"));
+    const legacy = await createPlugin("legacy-plugin", "export default () => () => {};");
+    await rm(path.join(legacy, "index.server.ts"));
+    await writeFile(path.join(legacy, "index.ts"), "export default () => () => {};");
     const startupFailure = await createPlugin(
       "startup-failure",
       `export default function contribute(plugin: unknown) { void plugin; throw new Error("startup exploded"); }`,
@@ -695,10 +1223,19 @@ export default function contribute(plugin: unknown) {
     await expect(service.installDirectory({ path: missingEntry })).rejects.toThrow(
       "Plugin entry points are missing",
     );
+    await expect(service.installDirectory({ path: legacy })).rejects.toThrow(
+      "This plugin was made for an older version of Paseo and cannot run on Paseo v0.8. Ask its author to update it. Plugin authors can follow the migration guide: https://paseo.sh/docs/plugins/migration",
+    );
     await expect(service.installDirectory({ path: startupFailure })).rejects.toThrow(
       "startup exploded",
     );
-    expect(service.listPlugins()).toEqual([
+    expect(await service.listPlugins()).toMatchObject([
+      expect.objectContaining({
+        id: "legacy-plugin",
+        status: "failed",
+        error:
+          "This plugin was made for an older version of Paseo and cannot run on Paseo v0.8. Ask its author to update it. Plugin authors can follow the migration guide: https://paseo.sh/docs/plugins/migration",
+      }),
       expect.objectContaining({
         id: "missing-entry",
         status: "failed",
@@ -741,3 +1278,282 @@ export default function contribute(plugin: unknown) {
     expect((await readFile(cleanupFile, "utf8")).trim().split("\n")).toHaveLength(4);
   });
 });
+
+describe("npm plugin installation", () => {
+  it("preserves dependencies and metadata, and reloads without npm", async () => {
+    const packages = npmPluginPackages();
+    const fixture = packages[1];
+    packages.push({ ...fixture, version: "2.0.0", tags: ["future"] });
+    const failures: Array<[string, Record<string, string>]> = [
+      ["bad-manifest", { "paseo-plugin.json": "{}" }],
+      [
+        "bad-build",
+        {
+          "paseo-plugin.json": JSON.stringify({
+            id: "bad-build",
+            requirements: { paseo: ">=0.4.0" },
+            build: [[process.execPath, "-e", "throw new Error('preparation failed')"]],
+          }),
+        },
+      ],
+      [
+        "bad-requirements",
+        {
+          "paseo-plugin.json": JSON.stringify({
+            id: "bad-requirements",
+            requirements: { paseo: ">=999.0.0" },
+          }),
+        },
+      ],
+      ["bad-code", { "index.server.ts": "invalid syntax !!!" }],
+      [
+        "bad-activation",
+        { "index.server.ts": "export default () => { throw new Error('activation failed'); };" },
+      ],
+    ];
+    const failedPackages = [];
+    for (const [name, overrides] of failures) {
+      failedPackages.push({ ...fixture, name, files: { ...fixture.files, ...overrides } });
+    }
+    const registry = await startNpmRegistry([
+      ...packages,
+      {
+        name: "paseo-prepared-plugin",
+        version: "1.0.0",
+        dependencies: { "paseo-fixture-dependency": "1.0.0" },
+        scripts: { postinstall: "node -e \"throw new Error('npm lifecycle must not run')\"" },
+        files: {
+          "nested/paseo-plugin.json": JSON.stringify({
+            id: "prepared",
+            requirements: { paseo: ">=0.4.0" },
+            build: [
+              [
+                process.execPath,
+                "-e",
+                "require('node:fs').mkdirSync('server'); require('node:fs').writeFileSync('server/generated.js', 'export default 42;');",
+              ],
+            ],
+          }),
+          "nested/index.server.ts": `import generated from "./server/generated.js";
+import dependency from "paseo-fixture-dependency";
+import { z } from "zod";
+export default function contribute() {
+  if (generated !== 42 || z.string().parse(dependency) !== "dependency loaded") throw new Error("Preparation failed");
+  return () => {};
+}`,
+        },
+      },
+      ...failedPackages,
+    ]);
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-npm-service-"));
+    roots.push(home);
+    const previousConfig = process.env.npm_config_userconfig;
+    const previousPath = process.env.PATH;
+    process.env.npm_config_userconfig = registry.userconfig;
+    const store = createStore(home);
+    const open = () =>
+      bindTestSessionHost(
+        new PluginService(pino({ level: "silent" }), store, "0.8.0", {
+          managedSources: new ManagedPluginSources(home),
+        }),
+      );
+    let service = open();
+    try {
+      await service.start();
+      const installed = await service.installSource({ source: "npm:paseo-fixture-plugin@^1.0.0" });
+      expect(installed).toMatchObject({
+        id: "npm-review",
+        status: "running",
+        installation: {
+          identity: { kind: "npm", packageName: "paseo-fixture-plugin", pluginPath: "." },
+          currentRevision: "1.1.0",
+        },
+      });
+      expect(installed.commit).toBeUndefined();
+      expect(installed.remote).toBeUndefined();
+      expect(
+        service
+          .getLogs("npm-review")
+          .map((entry) => entry.message)
+          .join("\n"),
+      ).toContain("dependency loaded");
+      const installRoot = path.dirname(path.dirname(installed.path));
+      expect(
+        JSON.parse(await readFile(path.join(home, "plugins", "sources.json"), "utf8"))[
+          "npm-review"
+        ],
+      ).toEqual({ kind: "npm" });
+      expect(
+        JSON.parse(await readFile(path.join(installRoot, "package-lock.json"), "utf8")).packages[
+          "node_modules/paseo-fixture-dependency"
+        ].version,
+      ).toBe("1.0.0");
+      for (const [source, id, version] of [
+        ["npm:paseo-fixture-plugin@1.0.0", "exact", "1.0.0"],
+        ["paseo-fixture-plugin@stable", "tag", "1.0.0"],
+        ["npm:@paseo-fixture/review", "scoped", "2.0.0"],
+      ]) {
+        expect(await service.installSource({ source, id })).toMatchObject({
+          id,
+          status: "running",
+          installation: { currentRevision: version },
+        });
+      }
+      const [preview] = await service.previewUpdates({ pluginId: "exact" });
+      expect(preview).toMatchObject({
+        outcome: "update",
+        current: { currentRevision: "1.0.0" },
+        target: { version: "1.1.0" },
+      });
+      const before = (await service.listPlugins()).find((item) => item.id === "exact")!;
+      await service.disablePlugin("exact");
+      registry.setTag("paseo-fixture-plugin", "latest", "2.0.0");
+      const results = await service.applyUpdates([
+        { ...preview!.proposal!, id: "missing-plugin" },
+        preview!.proposal!,
+      ]);
+      expect(results).toMatchObject([
+        { outcome: "error" },
+        {
+          outcome: "updated",
+          plugin: { enabled: false, installation: { currentRevision: "1.1.0" } },
+        },
+      ]);
+      expect(results[1]?.plugin?.installation?.identity).toEqual(before.installation?.identity);
+      registry.setTag("paseo-fixture-plugin", "latest", "1.1.0");
+      expect(await service.applyUpdates([preview!.proposal!])).toMatchObject([
+        { outcome: "error", error: expect.stringContaining("changed since review") },
+      ]);
+      await service.enablePlugin("exact");
+      const [future] = await service.previewUpdates({
+        pluginId: "exact",
+        target: { kind: "npm", version: "future" },
+      });
+      expect(await service.applyUpdates([future!.proposal!])).toMatchObject([
+        { outcome: "updated", plugin: { installation: { currentRevision: "2.0.0" } } },
+      ]);
+      const [newer] = await service.previewUpdates({ pluginId: "exact" });
+      expect(newer).toMatchObject({
+        outcome: "installed-newer",
+        current: { currentRevision: "2.0.0" },
+        target: { version: "1.1.0" },
+      });
+      expect(newer?.proposal).toBeUndefined();
+      const [downgrade] = await service.previewUpdates({
+        pluginId: "exact",
+        target: { kind: "npm", version: "1.0.0" },
+      });
+      const wrongArtifact = {
+        ...downgrade!.proposal!,
+        target: { ...downgrade!.proposal!.target, integrity: "sha512-invalid" },
+      };
+      expect(await service.applyUpdates([wrongArtifact])).toMatchObject([{ outcome: "error" }]);
+      expect(await service.applyUpdates([downgrade!.proposal!])).toMatchObject([
+        { outcome: "updated", plugin: { installation: { currentRevision: "1.0.0" } } },
+      ]);
+      expect((await service.previewUpdates({ pluginId: "exact" }))[0]?.outcome).toBe("update");
+      await expect(service.updateSources("exact")).rejects.toThrow("Update the client");
+      const prepared = await service.installSource({
+        source: "npm:paseo-prepared-plugin@1.0.0:nested",
+      });
+      expect(prepared).toMatchObject({ id: "prepared", status: "running" });
+      expect(await readFile(path.join(prepared.path, "server/generated.js"), "utf8")).toBe(
+        "export default 42;",
+      );
+      expect(prepared.installation).toMatchObject({ identity: { pluginPath: "nested" } });
+      await service.removePlugin("prepared");
+      expect(registry.requests).not.toContain("/@getpaseo/plugin");
+      await expect(service.installSource({ source: "npm:missing-plugin" })).rejects.toThrow();
+      await expect(
+        service.installSource({ source: "npm:paseo-fixture-plugin", ref: "main" }),
+      ).rejects.toThrow("--ref is only valid for Git");
+      await expect(service.installSource({ source: "npm:paseo-fixture-plugin" })).rejects.toThrow(
+        "already configured",
+      );
+      expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
+      for (const name of [
+        "bad-manifest",
+        "bad-build",
+        "bad-requirements",
+        "bad-code",
+        "bad-activation",
+      ]) {
+        await expect(service.installSource({ source: `npm:${name}`, id: name })).rejects.toThrow();
+        expect((await service.listPlugins()).map((plugin) => plugin.id)).toEqual([
+          "exact",
+          "npm-review",
+          "scoped",
+          "tag",
+        ]);
+        expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
+      }
+      await service.disablePlugin("scoped");
+      await service.stopAllPlugins();
+      const recordsPath = path.join(home, "plugins", "sources.json");
+      const oldRecords = JSON.parse(await readFile(recordsPath, "utf8"));
+      Object.assign(oldRecords["npm-review"], {
+        requestedSpec: "0.0.1",
+        version: "0.0.1",
+        packageName: "obsolete",
+        installRoot: "/obsolete",
+        integrity: "obsolete",
+      });
+      await writeFile(recordsPath, JSON.stringify(oldRecords));
+      process.env.PATH = path.join(home, "no-executables");
+      service = open();
+      await service.start();
+      expect(await service.listPlugins()).toMatchObject(
+        expect.arrayContaining([
+          expect.objectContaining({
+            id: "npm-review",
+            status: "running",
+            installation: installed.installation,
+          }),
+          expect.objectContaining({ id: "scoped", enabled: false, status: "disabled" }),
+        ]),
+      );
+      expect(await service.reloadPlugin("npm-review")).toMatchObject({
+        status: "running",
+        installation: installed.installation,
+      });
+      await expect(
+        service.installSource({ source: "npm:paseo-fixture-plugin", id: "missing-npm" }),
+      ).rejects.toThrow("npm is required on the daemon host");
+      expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
+      const packagePath = path.join(installed.path, "package.json");
+      const packageJson = await readFile(packagePath, "utf8");
+      await writeFile(
+        packagePath,
+        JSON.stringify({ ...JSON.parse(packageJson), version: "99.0.0" }),
+      );
+      const corrupt = (await service.listPlugins()).find((plugin) => plugin.id === "npm-review")!;
+      expect(corrupt.status).toBe("running");
+      expect(corrupt.installation).toEqual({ identity: installed.installation!.identity });
+      expect((await service.previewUpdates({ pluginId: "npm-review" }))[0]).toMatchObject({
+        outcome: "error",
+        error: expect.stringContaining("Installed revision is unavailable"),
+      });
+      expect(await service.reloadPlugin("npm-review")).toMatchObject({ status: "running" });
+      await writeFile(packagePath, packageJson);
+      await service.removePlugin("npm-review");
+      await expect(stat(installRoot)).rejects.toMatchObject({ code: "ENOENT" });
+      expect(
+        JSON.parse(await readFile(path.join(home, "plugins", "sources.json"), "utf8"))[
+          "npm-review"
+        ],
+      ).toBeUndefined();
+    } finally {
+      process.env.PATH = previousPath;
+      if (previousConfig === undefined) delete process.env.npm_config_userconfig;
+      else process.env.npm_config_userconfig = previousConfig;
+      await service.stopAllPlugins();
+      await registry.close();
+    }
+  }, 120_000);
+});
+
+async function applyReviewedUpdate(service: PluginService, pluginId: string) {
+  const [preview] = await service.previewUpdates({ pluginId });
+  expect(preview?.outcome).toBe("update");
+  return service.applyUpdates([preview!.proposal!]);
+}
diff --git a/packages/server/src/server/plugins/index.ts b/packages/server/src/server/plugins/index.ts
index df987c903b..6c4af29e62 100644
--- a/packages/server/src/server/plugins/index.ts
+++ b/packages/server/src/server/plugins/index.ts
@@ -1,6 +1,8 @@
+import type { PluginLifecycle } from "./lifecycle/index.js";
 import path from "node:path";
-import { stat } from "node:fs/promises";
+import { stat, rm } from "node:fs/promises";
 import type pino from "pino";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
 import {
   PluginIdSchema,
   type PluginLogEntry,
@@ -8,21 +10,50 @@ import {
   type PluginSource,
   type PluginSourceStatusItem,
   type PluginSourceUpdateItem,
+  type PluginUpdateSelection,
+  type PluginUpdateProposal,
+  type PluginUpdatePreview,
+  type PluginUpdateResult,
 } from "@getpaseo/protocol/messages";
 import { parsePluginSourceReference } from "@getpaseo/protocol/plugin-source-reference";
+import { assertPluginCompatibility } from "@getpaseo/protocol/plugin-requirements";
+import { BUILTIN_PROVIDER_IDS } from "@getpaseo/protocol/provider-manifest";
 import type { DaemonConfigStore } from "../daemon-config-store.js";
 import { type ManagedPluginCandidate, ManagedPluginSources } from "./managed-source.js";
 import { readPluginManifest } from "./manifest.js";
+import { expandTilde } from "../../utils/path.js";
 import { runPluginBuild } from "./preparation.js";
 import { PluginRuntime } from "./runtime.js";
+import { BuiltinPluginLoader, type BuiltinPlugin } from "./builtin/index.js";
+import type { PluginProviderMetadata } from "./plugin-process-protocol.js";
+import { readPluginProviderIcon } from "./provider-icon.js";
+import {
+  type AgentUsageLookup,
+  type ListUsageReportsOptions,
+  UsageSourceRegistry,
+} from "./usage-sources/index.js";
+import type { PluginUsageSourceMetadata } from "./plugin-process-protocol.js";
+
+const BUILTIN_PROVIDER_ID_SET: ReadonlySet<string> = new Set(BUILTIN_PROVIDER_IDS);
 
 interface PluginRuntimePort {
-  catalog(): Array<{ id: string; clientBundle: string }>;
+  emit?: PluginLifecycle["emit"];
+  drainEvents?: PluginRuntime["drainEvents"];
+  before?: PluginLifecycle["before"];
+  catalog: PluginRuntime["catalog"];
   invoke(pluginId: string, method: string, input: unknown): Promise<unknown>;
   getLogs(pluginId: string): PluginLogEntry[];
   clearLogs(pluginId: string): void;
+  getProviderRegistrations?(pluginId: string): readonly PluginProviderMetadata[];
+  getUsageSourceRegistrations(pluginId: string): readonly PluginUsageSourceMetadata[];
+  fetchUsage: PluginRuntime["fetchUsage"];
+  discoverUsage: PluginRuntime["discoverUsage"];
+  connectProvider: PluginRuntime["connectProvider"];
+  getProviderCatalogCacheKey?: PluginRuntime["getProviderCatalogCacheKey"];
+  getProviderStatus?: PluginRuntime["getProviderStatus"];
   validatePlugin?(path: string): Promise<void>;
   startPlugin(pluginId: string, path: string, canPublish: () => boolean): Promise<void>;
+  startBuiltinPlugin?(plugin: BuiltinPlugin): Promise<void>;
   stopPluginById(pluginId: string): Promise<boolean>;
   stopAll(): Promise<void>;
   subscribe(listener: (pluginId: string, error?: string) => void): () => void;
@@ -30,8 +61,11 @@ interface PluginRuntimePort {
 }
 
 interface PluginServiceDependencies {
+  usageAgents?: AgentUsageLookup;
+  settingsDirectory?: string;
   runtime?: PluginRuntimePort;
   managedSources?: ManagedPluginSources;
+  builtinPlugins?: BuiltinPluginLoader;
 }
 
 function resolvePluginStatus(input: {
@@ -46,28 +80,73 @@ function resolvePluginStatus(input: {
 export class PluginService {
   private readonly runtime: PluginRuntimePort;
   private readonly managedSources: ManagedPluginSources | null;
+  private readonly builtinPluginIds: ReadonlySet<string>;
+  private readonly builtinPlugins: BuiltinPluginLoader;
   private readonly logger: pino.Logger;
   private readonly errors = new Map<string, string>();
   private readonly listeners = new Set<(pluginId: string) => void>();
+  private readonly providers = new Map<string, ProviderRegistration>();
+  private readonly usageSources: UsageSourceRegistry;
+  private readonly usageSourceIdsByPlugin = new Map<string, string[]>();
+  private readonly providerIdsByPlugin = new Map<string, readonly string[]>();
+  private readonly providerListeners = new Set<() => void>();
   private lifecycle = Promise.resolve();
   private globalStartsBlocked = true;
   private started = false;
+  private readonly settingsListeners = new Set<(pluginId: string, settingsId: string) => void>();
 
   constructor(
     logger: pino.Logger,
     private readonly configStore: DaemonConfigStore,
-    daemonVersion: string,
-    dependencies: PluginServiceDependencies = {},
+    private readonly daemonVersion: string,
+    private readonly dependencies: PluginServiceDependencies = {},
   ) {
     this.logger = logger.child({ module: "plugin-service" });
-    this.runtime = dependencies.runtime ?? new PluginRuntime(logger, daemonVersion);
+    this.usageSources = new UsageSourceRegistry(
+      Date.now,
+      300_000,
+      this.logger,
+      dependencies.usageAgents,
+    );
+    this.runtime =
+      dependencies.runtime ??
+      new PluginRuntime(logger, daemonVersion, {
+        settingsDirectory: dependencies.settingsDirectory,
+        onSettingsChanged: (pluginId, settingsId) => {
+          for (const listener of this.settingsListeners) listener(pluginId, settingsId);
+        },
+      });
     this.managedSources = dependencies.managedSources ?? null;
+    this.builtinPlugins = dependencies.builtinPlugins ?? new BuiltinPluginLoader(undefined, []);
+    this.builtinPluginIds = this.builtinPlugins.ids;
     this.runtime.subscribe((pluginId, error) => {
+      this.removeProviderRegistrations(pluginId);
+      this.removeUsageSources(pluginId);
       if (error) this.errors.set(pluginId, error);
       this.notify(pluginId);
     });
   }
 
+  readonly emit: PluginLifecycle["emit"] = (name, event) => {
+    this.runtime.emit?.(name, event);
+  };
+
+  async drainEvents(): Promise<void> {
+    await this.runtime.drainEvents?.();
+  }
+
+  readonly before: PluginLifecycle["before"] = async (name, request) => {
+    if (this.runtime.before) {
+      return this.runtime.before(name, request);
+    }
+    return request;
+  };
+
+  subscribeSettings(listener: (pluginId: string, settingsId: string) => void): () => void {
+    this.settingsListeners.add(listener);
+    return () => this.settingsListeners.delete(listener);
+  }
+
   subscribe(listener: (pluginId: string) => void): () => void {
     this.listeners.add(listener);
     return () => this.listeners.delete(listener);
@@ -77,11 +156,37 @@ export class PluginService {
     this.runtime.bindPaseoSessionHost(sessionHost);
   }
 
+  getProviderRegistrations(): readonly ProviderRegistration[] {
+    return [...this.providers.values()].sort((left, right) => left.id.localeCompare(right.id));
+  }
+
+  listUsageReports(options?: ListUsageReportsOptions) {
+    return this.usageSources.listReports(options);
+  }
+
+  listLegacyUsage() {
+    return this.usageSources.listLegacyUsage();
+  }
+
+  subscribeProviderRegistrations(listener: () => void): () => void {
+    this.providerListeners.add(listener);
+    return () => this.providerListeners.delete(listener);
+  }
+
   async start(): Promise<void> {
     if (this.started) return;
     this.started = true;
     const config = this.configStore.get();
     this.globalStartsBlocked = config.pluginsEnabled !== true;
+    await this.builtinPlugins.load(async (plugin) => {
+      try {
+        await this.runtime.startBuiltinPlugin?.(plugin);
+        await this.publishProviderRegistrations(plugin.id, plugin.directory);
+        this.publishUsageSources(plugin.id);
+      } catch (error) {
+        this.logger.error({ err: error, pluginId: plugin.id }, "Failed to start built-in plugin");
+      }
+    });
     if (config.pluginsEnabled === true) {
       for (const [pluginId, source] of Object.entries(config.plugins ?? {})) {
         if (source.enabled === false) continue;
@@ -94,11 +199,11 @@ export class PluginService {
     });
   }
 
-  listPlugins(): PluginListItem[] {
+  async listPlugins(): Promise<PluginListItem[]> {
     const config = this.configStore.get();
     const running = new Set(this.runtime.catalog().map((plugin) => plugin.id));
-    return Object.entries(config.plugins ?? {})
-      .map(([id, source]) => {
+    const plugins = await Promise.all(
+      Object.entries(config.plugins ?? {}).map(async ([id, source]) => {
         const enabled = source.enabled !== false;
         const item: PluginListItem = {
           id,
@@ -110,27 +215,39 @@ export class PluginService {
             running: running.has(id),
           }),
         };
-        const managed = this.managedSources?.get(id);
-        if (managed) {
+        const manifest = await readPluginManifest(path.resolve(source.path)).catch(() => null);
+        if (manifest) {
+          item.name = manifest.name;
+          item.description = manifest.description;
+          item.icon = manifest.icon;
+          item.media = manifest.media;
+        }
+        item.installation = await this.managedSources
+          ?.describe(id, source.path)
+          .catch(() => undefined);
+        if (!this.managedSources)
+          item.installation = { identity: { kind: "directory", path: path.resolve(source.path) } };
+        if (item.installation?.identity.kind === "git") {
           item.source = "git";
-          const remote = this.managedSources?.displayRemote(id);
-          if (remote) item.remote = remote;
-          item.ref = managed.requestedRef ?? managed.trackingBranch ?? managed.commit;
-          item.commit = managed.commit;
+          item.remote = item.installation.identity.remote;
+          item.commit = item.installation.currentRevision;
         }
         const error = this.errors.get(id);
         if (error && item.status === "failed") item.error = error;
         return item;
-      })
-      .sort((left, right) => left.id.localeCompare(right.id));
+      }),
+    );
+    return plugins.sort((left, right) => left.id.localeCompare(right.id));
   }
 
   getLogs(pluginId: string): PluginLogEntry[] {
-    this.requireSource(pluginId);
+    if (!this.builtinPluginIds.has(pluginId)) {
+      this.requireSource(pluginId);
+    }
     return this.runtime.getLogs(pluginId);
   }
 
-  catalog(): Array<{ id: string; clientBundle: string }> {
+  catalog(): ReturnType<PluginRuntime["catalog"]> {
     return this.runtime.catalog();
   }
 
@@ -138,7 +255,11 @@ export class PluginService {
     return this.enqueue(async () => {
       const directory = path.resolve(input.path);
       const manifest = await readPluginManifest(directory);
+      assertPluginCompatibility({ ...manifest, version: this.daemonVersion, runtime: "daemon" });
       const pluginId = PluginIdSchema.parse(input.id ?? manifest.id);
+      if (this.builtinPluginIds.has(pluginId)) {
+        throw new Error(`Plugin ID "${pluginId}" is reserved for a built-in plugin`);
+      }
       if (this.configStore.get().plugins?.[pluginId]) {
         throw new Error(
           `Plugin ID "${pluginId}" is already configured; choose another ID with --id`,
@@ -151,7 +272,7 @@ export class PluginService {
       this.configStore.patch({ plugins: sources });
       if (this.canPublish(pluginId)) await this.startConfigured(pluginId);
       this.notify(pluginId);
-      const installed = this.requireItem(pluginId);
+      const installed = await this.requireItem(pluginId);
       if (installed.status === "failed") {
         throw new Error(installed.error ?? `Plugin failed to start: ${pluginId}`);
       }
@@ -168,14 +289,14 @@ export class PluginService {
     id?: string;
     ref?: string;
   }): Promise<PluginListItem> {
-    const directDirectory = path.resolve(input.source);
-    const directInfo = await stat(directDirectory).catch(() => null);
-    const reference = directInfo?.isDirectory()
-      ? { source: input.source, pluginPath: undefined }
-      : parsePluginSourceReference(input.source);
-    const directory = path.resolve(reference.source);
-    const info = directInfo?.isDirectory() ? directInfo : await stat(directory).catch(() => null);
-    if (info?.isDirectory()) {
+    if (input.id && this.builtinPluginIds.has(input.id)) {
+      throw new Error(`Plugin ID "${input.id}" is reserved for a built-in plugin`);
+    }
+    const reference = parsePluginSourceReference(input.source);
+    if (reference.kind === "directory") {
+      const directory = path.resolve(expandTilde(reference.source));
+      const info = await stat(directory).catch(() => null);
+      if (!info?.isDirectory()) throw new Error(`Plugin directory does not exist: ${directory}`);
       if (input.ref) throw new Error("Plugin --ref is only valid for Git sources");
       const pluginDirectory = resolveLocalPluginPath(directory, reference.pluginPath);
       return this.installDirectory({ path: pluginDirectory, id: input.id });
@@ -189,32 +310,40 @@ export class PluginService {
       });
       let pluginId: string;
       try {
-        await runPluginBuild(candidate.directory, candidate.build, this.logger);
+        await this.checkRequirements(candidate.directory);
         pluginId = PluginIdSchema.parse(input.id ?? candidate.defaultId);
+        if (this.builtinPluginIds.has(pluginId)) {
+          throw new Error(`Plugin ID "${pluginId}" is reserved for a built-in plugin`);
+        }
         if (this.configStore.get().plugins?.[pluginId]) {
           throw new Error(
             `Plugin ID "${pluginId}" is already configured; choose another ID with --id`,
           );
         }
+        await runPluginBuild(candidate.directory, candidate.build, this.logger);
         candidate = await managedSources.place(pluginId, candidate);
         await this.validateCandidate(candidate);
+        await managedSources.verifyCandidate(pluginId, candidate);
       } catch (error) {
         await managedSources.discard(candidate);
         throw error;
       }
-      const sources = {
-        ...this.configStore.get().plugins,
-        [pluginId]: { source: "directory" as const, path: candidate.directory, enabled: true },
-      };
-      managedSources.commit(pluginId, candidate.record);
-      this.configStore.patch({ plugins: sources });
-      if (this.canPublish(pluginId)) await this.startConfigured(pluginId);
-      this.notify(pluginId);
-      const installed = this.requireItem(pluginId);
-      if (installed.status === "failed") {
-        throw new Error(installed.error ?? `Plugin failed to start: ${pluginId}`);
+      this.patchSource(pluginId, { source: "directory", path: candidate.directory, enabled: true });
+      try {
+        if (this.canPublish(pluginId)) await this.startExplicit(pluginId, candidate.directory);
+        managedSources.commit(pluginId, candidate.record);
+      } catch (error) {
+        await this.stopPlugin(pluginId);
+        const sources = { ...this.configStore.get().plugins };
+        delete sources[pluginId];
+        this.configStore.patch({ plugins: sources });
+        await managedSources.discard(candidate);
+        this.errors.delete(pluginId);
+        this.notify(pluginId);
+        throw error;
       }
-      return installed;
+      this.notify(pluginId);
+      return this.requireItem(pluginId);
     });
   }
 
@@ -233,15 +362,54 @@ export class PluginService {
     });
   }
 
-  async updateSources(pluginId?: string): Promise<PluginSourceUpdateItem[]> {
+  // COMPAT(plugin-immediate-update): added in v0.8.0; remove after 2027-03-16 when clients use reviewed targets.
+  async updateSources(_pluginId?: string): Promise<PluginSourceUpdateItem[]> {
+    throw new Error("Update the client to review plugin updates before applying them.");
+  }
+
+  async previewUpdates(input: {
+    pluginId?: string;
+    target?: PluginUpdateSelection;
+  }): Promise<PluginUpdatePreview[]> {
+    if (input.target && !input.pluginId)
+      throw new Error("An explicit update target requires one plugin ID");
+    const sources = this.configStore.get().plugins ?? {};
+    const ids = input.pluginId ? [input.pluginId] : Object.keys(sources).sort();
+    return Promise.all(
+      ids.map(async (id) => {
+        try {
+          return await this.requireManagedSources().preview(
+            id,
+            this.requireSource(id).path,
+            input.target,
+          );
+        } catch (error) {
+          return {
+            id,
+            outcome: "error" as const,
+            links: [],
+            error: error instanceof Error ? error.message : String(error),
+          };
+        }
+      }),
+    );
+  }
+
+  async applyUpdates(proposals: PluginUpdateProposal[]): Promise<PluginUpdateResult[]> {
     return this.enqueue(async () => {
-      const sources = this.configStore.get().plugins ?? {};
-      const ids = pluginId
-        ? [pluginId]
-        : Object.keys(sources).filter((id) => this.managedSources?.get(id));
-      const updates: PluginSourceUpdateItem[] = [];
-      for (const id of ids.sort()) updates.push(await this.updateSource(id));
-      return updates;
+      const results: PluginUpdateResult[] = [];
+      for (const proposal of proposals) {
+        try {
+          results.push(await this.updateSource(proposal));
+        } catch (error) {
+          results.push({
+            id: proposal.id,
+            outcome: "error",
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+      }
+      return results;
     });
   }
 
@@ -252,7 +420,7 @@ export class PluginService {
         throw new Error("Plugins are globally disabled");
       }
       this.errors.delete(pluginId);
-      await this.runtime.stopPluginById(pluginId);
+      await this.stopPlugin(pluginId);
       await this.startExplicit(pluginId, source.path);
       this.notify(pluginId);
       return this.requireItem(pluginId);
@@ -276,7 +444,7 @@ export class PluginService {
   async disablePlugin(pluginId: string): Promise<PluginListItem> {
     const source = this.requireSource(pluginId);
     this.patchSource(pluginId, { ...source, enabled: false });
-    const stopping = this.runtime.stopPluginById(pluginId);
+    const stopping = this.stopPlugin(pluginId);
     return this.enqueue(async () => {
       await stopping;
       this.errors.delete(pluginId);
@@ -287,7 +455,7 @@ export class PluginService {
 
   async removePlugin(pluginId: string): Promise<void> {
     this.requireSource(pluginId);
-    const stopping = this.runtime.stopPluginById(pluginId);
+    const stopping = this.stopPlugin(pluginId);
     const sources = { ...this.configStore.get().plugins };
     delete sources[pluginId];
     this.configStore.patch({ plugins: sources });
@@ -297,6 +465,11 @@ export class PluginService {
       this.errors.delete(pluginId);
       this.notify(pluginId);
       await this.managedSources?.remove(pluginId);
+      if (this.dependencies.settingsDirectory)
+        await rm(path.join(this.dependencies.settingsDirectory, pluginId), {
+          recursive: true,
+          force: true,
+        });
     });
   }
 
@@ -306,17 +479,17 @@ export class PluginService {
 
   async stopAllPlugins(): Promise<void> {
     this.globalStartsBlocked = true;
-    const stopping = this.runtime.stopAll();
+    const stopping = this.stopAll();
     await this.enqueue(async () => {
       await stopping;
-      await this.runtime.stopAll();
+      await this.stopAll();
     });
   }
 
   private handleGlobalSwitch(enabled: boolean): void {
     if (!enabled) {
       this.globalStartsBlocked = true;
-      const stopping = this.runtime.stopAll();
+      const stopping = this.stopConfiguredPlugins();
       for (const id of Object.keys(this.configStore.get().plugins ?? {})) this.notify(id);
       void this.enqueue(async () => {
         await stopping;
@@ -337,7 +510,7 @@ export class PluginService {
     if (!source || source.enabled === false || !this.canPublish(pluginId)) return;
     this.errors.delete(pluginId);
     try {
-      await this.runtime.startPlugin(pluginId, source.path, () => this.canPublish(pluginId));
+      await this.startPlugin(pluginId, source.path);
     } catch (error) {
       if (this.canPublish(pluginId)) this.recordFailure(pluginId, error);
     }
@@ -345,7 +518,7 @@ export class PluginService {
 
   private async startExplicit(pluginId: string, sourcePath: string): Promise<void> {
     try {
-      await this.runtime.startPlugin(pluginId, sourcePath, () => this.canPublish(pluginId));
+      await this.startPlugin(pluginId, sourcePath);
     } catch (error) {
       if (this.canPublish(pluginId)) {
         this.recordFailure(pluginId, error);
@@ -365,6 +538,142 @@ export class PluginService {
     );
   }
 
+  private async startPlugin(pluginId: string, sourcePath: string): Promise<void> {
+    await this.runtime.startPlugin(pluginId, sourcePath, () => this.canPublish(pluginId));
+    try {
+      await this.publishProviderRegistrations(pluginId, sourcePath);
+      this.publishUsageSources(pluginId);
+    } catch (error) {
+      try {
+        this.removeProviderRegistrations(pluginId);
+        this.removeUsageSources(pluginId);
+      } finally {
+        await this.runtime.stopPluginById(pluginId);
+      }
+      throw error;
+    }
+  }
+
+  private stopPlugin(pluginId: string): Promise<boolean> {
+    this.removeProviderRegistrations(pluginId);
+    this.removeUsageSources(pluginId);
+    return this.runtime.stopPluginById(pluginId);
+  }
+
+  private async stopConfiguredPlugins(): Promise<void> {
+    const stopping = Object.keys(this.configStore.get().plugins ?? {}).map((id) =>
+      this.stopPlugin(id),
+    );
+    await Promise.all(stopping);
+  }
+
+  private async stopAll(): Promise<void> {
+    for (const pluginId of this.providerIdsByPlugin.keys()) {
+      this.removeProviderRegistrations(pluginId);
+    }
+    for (const pluginId of this.usageSourceIdsByPlugin.keys()) this.removeUsageSources(pluginId);
+    await this.runtime.stopAll();
+  }
+
+  private publishUsageSources(pluginId: string): void {
+    const metadata = this.runtime.getUsageSourceRegistrations(pluginId);
+    const registered: string[] = [];
+    try {
+      for (const source of metadata) {
+        this.usageSources.register({
+          id: source.id,
+          label: source.label,
+          icon: source.icon,
+          discover: async (scope) => {
+            const result = await this.runtime.discoverUsage(pluginId, source.id, scope);
+            if (!Array.isArray(result))
+              throw new Error(`Invalid usage discovery from ${source.id}`);
+            return result;
+          },
+          fetch: (input) => {
+            return this.runtime.fetchUsage(pluginId, source.id, input);
+          },
+        });
+        registered.push(source.id);
+      }
+    } catch (error) {
+      for (const id of registered) this.usageSources.unregister(id);
+      throw error;
+    }
+    this.usageSourceIdsByPlugin.set(pluginId, registered);
+  }
+
+  private removeUsageSources(pluginId: string): void {
+    for (const id of this.usageSourceIdsByPlugin.get(pluginId) ?? [])
+      this.usageSources.unregister(id);
+    this.usageSourceIdsByPlugin.delete(pluginId);
+  }
+
+  private async publishProviderRegistrations(
+    pluginId: string,
+    pluginDirectory: string,
+  ): Promise<void> {
+    const metadata = this.runtime.getProviderRegistrations?.(pluginId) ?? [];
+    for (const provider of metadata) {
+      if (BUILTIN_PROVIDER_ID_SET.has(provider.id)) {
+        throw new Error(`Plugin ${pluginId} cannot register builtin provider ID "${provider.id}"`);
+      }
+      if (this.providers.has(provider.id)) {
+        throw new Error(`Plugin ${pluginId} cannot register provider ID "${provider.id}" twice`);
+      }
+    }
+    const registrations = await Promise.all(
+      metadata.map(
+        async (provider): Promise<ProviderRegistration> => ({
+          id: provider.id,
+          label: provider.label,
+          description: provider.description,
+          command: provider.command,
+          status: provider.hasStatus
+            ? (request) => {
+                if (!this.runtime.getProviderStatus)
+                  throw new Error("Plugin runtime cannot resolve provider status");
+                return this.runtime.getProviderStatus(pluginId, provider.id, request);
+              }
+            : undefined,
+          getCatalogCacheKey: provider.hasCatalogCacheKey
+            ? (options) => {
+                if (!this.runtime.getProviderCatalogCacheKey)
+                  throw new Error("Plugin runtime cannot resolve catalogue keys");
+                return this.runtime.getProviderCatalogCacheKey(pluginId, provider.id, options);
+              }
+            : undefined,
+          icon: provider.iconPath
+            ? await readPluginProviderIcon(pluginDirectory, provider.iconPath)
+            : undefined,
+          connect: (request) => this.runtime.connectProvider(pluginId, provider.id, request),
+        }),
+      ),
+    );
+    const ids = registrations.map((provider) => provider.id);
+    for (const provider of registrations) {
+      this.providers.set(provider.id, {
+        ...provider,
+      });
+    }
+    if (ids.length > 0) {
+      this.providerIdsByPlugin.set(pluginId, ids);
+      this.notifyProviderRegistrations();
+    }
+  }
+
+  private removeProviderRegistrations(pluginId: string): void {
+    const ids = this.providerIdsByPlugin.get(pluginId);
+    if (!ids) return;
+    this.providerIdsByPlugin.delete(pluginId);
+    for (const id of ids) this.providers.delete(id);
+    this.notifyProviderRegistrations();
+  }
+
+  private notifyProviderRegistrations(): void {
+    for (const listener of this.providerListeners) listener();
+  }
+
   private enqueue<T>(operation: () => Promise<T>): Promise<T> {
     const result = this.lifecycle.then(operation, operation);
     this.lifecycle = result.then(
@@ -378,87 +687,88 @@ export class PluginService {
     this.errors.set(pluginId, error instanceof Error ? error.message : String(error));
   }
 
-  private async updateSource(pluginId: string): Promise<PluginSourceUpdateItem> {
+  private async checkRequirements(directory: string): Promise<void> {
+    const manifest = await readPluginManifest(directory);
+    assertPluginCompatibility({ ...manifest, version: this.daemonVersion, runtime: "daemon" });
+  }
+
+  private async updateSource(proposal: PluginUpdateProposal): Promise<PluginUpdateResult> {
+    const pluginId = proposal.id;
     const managedSources = this.requireManagedSources();
     const source = this.requireSource(pluginId);
-    const previous = managedSources.get(pluginId);
-    if (!previous) throw new Error(`Plugin is not managed by Git: ${pluginId}`);
-    const prepared = await managedSources.prepareUpdate(pluginId, source.path);
-    if (!prepared.candidate) {
-      return {
-        id: pluginId,
-        previousCommit: previous.commit,
-        currentCommit: previous.commit,
-        commits: 0,
-        updated: false,
-      };
-    }
-    let candidate = prepared.candidate;
+    let candidate = await managedSources.prepareUpdate(proposal, source.path);
     try {
+      await this.checkRequirements(candidate.directory);
       await runPluginBuild(candidate.directory, candidate.build, this.logger);
       candidate = await managedSources.place(pluginId, candidate);
       await this.validateCandidate(candidate);
+      await managedSources.verifyCandidate(pluginId, candidate, proposal.target);
+      await managedSources.assertCurrent(proposal, this.requireSource(pluginId).path);
     } catch (error) {
       await managedSources.discard(candidate);
       throw error;
     }
 
-    const current = this.configStore.get().plugins?.[pluginId];
-    if (!current) {
-      await managedSources.discard(candidate);
-      throw new Error(`Plugin is no longer configured: ${pluginId}`);
-    }
+    const current = this.requireSource(pluginId);
     const isRunning = this.runtime.catalog().some((plugin) => plugin.id === pluginId);
-    const isEnabled = current.enabled !== false;
-    const isGloballyEnabled = this.configStore.get().pluginsEnabled === true;
-    const shouldActivate = isEnabled && isGloballyEnabled;
+    const shouldActivate =
+      current.enabled !== false && this.configStore.get().pluginsEnabled === true;
     if (shouldActivate) {
-      if (isRunning) await this.runtime.stopPluginById(pluginId);
+      if (isRunning) await this.stopPlugin(pluginId);
       try {
         await this.startExplicit(pluginId, candidate.directory);
       } catch (error) {
-        this.errors.delete(pluginId);
-        const latest = this.configStore.get().plugins?.[pluginId];
-        const isStillConfigured = latest !== undefined;
-        const isStillEnabled = isStillConfigured && latest.enabled !== false;
-        const isStillGloballyEnabled = this.configStore.get().pluginsEnabled === true;
-        const canRestore = isRunning && isStillEnabled && isStillGloballyEnabled;
-        if (canRestore) await this.startExplicit(pluginId, source.path);
-        await managedSources.discard(candidate);
-        this.notify(pluginId);
+        let recoveryError: unknown;
+        try {
+          this.errors.delete(pluginId);
+          if (isRunning && this.canPublish(pluginId))
+            await this.startExplicit(pluginId, source.path);
+        } catch (restoreError) {
+          recoveryError = restoreError;
+        } finally {
+          await managedSources.discard(candidate);
+          this.notify(pluginId);
+        }
+        if (recoveryError)
+          throw new Error(
+            `Update failed: ${error instanceof Error ? error.message : String(error)}; restoring previous plugin also failed: ${recoveryError instanceof Error ? recoveryError.message : String(recoveryError)}`,
+            { cause: error },
+          );
         throw error;
       }
     }
-
     const activatedSource = this.configStore.get().plugins?.[pluginId];
     if (!activatedSource) {
-      await this.runtime.stopPluginById(pluginId);
+      await this.stopPlugin(pluginId);
       await managedSources.discard(candidate);
       throw new Error(`Plugin is no longer configured: ${pluginId}`);
     }
     this.patchSource(pluginId, { ...activatedSource, path: candidate.directory });
-    managedSources.commit(pluginId, candidate.record);
-    await managedSources.removeVersion(previous);
     this.errors.delete(pluginId);
     this.notify(pluginId);
+    let warning: string | undefined;
+    try {
+      await managedSources.removeVersion(pluginId, source.path);
+    } catch (error) {
+      warning = `Plugin updated, but previous installation cleanup failed: ${error instanceof Error ? error.message : String(error)}`;
+    }
     return {
       id: pluginId,
-      previousCommit: previous.commit,
-      currentCommit: candidate.record.commit,
-      commits: prepared.commits,
-      updated: true,
+      outcome: "updated",
+      plugin: await this.requireItem(pluginId),
+      ...(warning ? { warning } : {}),
     };
   }
 
   private validateCandidate(candidate: ManagedPluginCandidate): Promise<void> {
     if (!this.runtime.validatePlugin) {
-      throw new Error("Plugin runtime cannot validate managed Git sources");
+      throw new Error("Plugin runtime cannot validate managed sources");
     }
     return this.runtime.validatePlugin(candidate.directory);
   }
 
   private requireManagedSources(): ManagedPluginSources {
-    if (!this.managedSources) throw new Error("Git plugin management is unavailable");
+    if (!this.managedSources) throw new Error("Plugin source management is unavailable");
     return this.managedSources;
   }
 
@@ -481,8 +791,8 @@ export class PluginService {
     });
   }
 
-  private requireItem(pluginId: string): PluginListItem {
-    const item = this.listPlugins().find((plugin) => plugin.id === pluginId);
+  private async requireItem(pluginId: string): Promise<PluginListItem> {
+    const item = (await this.listPlugins()).find((plugin) => plugin.id === pluginId);
     if (!item) throw new Error(`Plugin is not configured: ${pluginId}`);
     return item;
   }
diff --git a/packages/server/src/server/plugins/internal-child.ts b/packages/server/src/server/plugins/internal-child.ts
new file mode 100644
index 0000000000..a80a8c5ec5
--- /dev/null
+++ b/packages/server/src/server/plugins/internal-child.ts
@@ -0,0 +1,66 @@
+import { EventEmitter } from "node:events";
+import { PassThrough } from "node:stream";
+import type { PluginServerContribution } from "@getpaseo/plugin/server";
+import { createPluginWorker, type PluginWorkerChannel } from "./plugin-process.js";
+import type { PluginProcessMessage, PluginProcessRequest } from "./plugin-process-protocol.js";
+
+export class InternalPluginChild extends EventEmitter {
+  connected = true;
+  killed = false;
+  readonly stdout = new PassThrough();
+  readonly stderr = new PassThrough();
+  private readonly worker: ReturnType<typeof createPluginWorker>;
+  private readonly workerMessages = new Set<(message: PluginProcessRequest) => void>();
+  private closing: Promise<void> | null = null;
+
+  constructor(contribute: PluginServerContribution) {
+    super();
+    const channel: PluginWorkerChannel = {
+      send: (message: PluginProcessMessage, callback?: () => void) => {
+        const copy = structuredClone(message);
+        queueMicrotask(() => {
+          if (this.connected) this.emit("message", copy);
+          callback?.();
+        });
+      },
+      onMessage: (handler) => {
+        this.workerMessages.add(handler);
+        return () => this.workerMessages.delete(handler);
+      },
+      disconnect: () => this.disconnect(),
+    };
+    this.worker = createPluginWorker({ channel, contribute });
+  }
+
+  send(message: PluginProcessRequest, callback?: (error: Error | null) => void): boolean {
+    if (!this.connected) {
+      callback?.(new Error("Plugin child is disconnected"));
+      return false;
+    }
+    const copy = structuredClone(message);
+    queueMicrotask(() => {
+      for (const handler of this.workerMessages) handler(copy);
+      callback?.(null);
+    });
+    return true;
+  }
+
+  kill(): boolean {
+    if (this.killed) return false;
+    this.killed = true;
+    this.disconnect();
+    return true;
+  }
+
+  disconnect(): void {
+    if (this.closing) return;
+    this.closing = Promise.resolve()
+      .then(() => this.worker.shutdown())
+      .finally(() => {
+        this.connected = false;
+        this.stdout.end();
+        this.stderr.end();
+        this.emit("close", 0, null);
+      });
+  }
+}
diff --git a/packages/server/src/server/plugins/internal-seam.e2e.test.ts b/packages/server/src/server/plugins/internal-seam.e2e.test.ts
new file mode 100644
index 0000000000..a3771f4ac5
--- /dev/null
+++ b/packages/server/src/server/plugins/internal-seam.e2e.test.ts
@@ -0,0 +1,82 @@
+import { cp, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { BuiltinPluginLoader } from "./builtin/index.js";
+
+const directory = fileURLToPath(new URL("./test-fixtures/internal-seam/", import.meta.url));
+const fixtureRoot = fileURLToPath(new URL("./test-fixtures/", import.meta.url));
+
+test("built-in and directory plugins share RPC and lifecycle behavior while built-ins stay hidden and enabled", async () => {
+  const workspaceDirectory = await mkdtemp(path.join(tmpdir(), "paseo-internal-seam-"));
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.8.0",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(fixtureRoot, ["internal-seam"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await client.connect();
+    expect(await client.listPlugins()).toEqual([]);
+    expect(await client.invokePluginRpc("internal-seam", "state", {})).toEqual({ workspaces: 0 });
+    expect((await client.getPluginLogs("internal-seam")).map(({ message }) => message)).toContain(
+      "[paseo] Plugin ready",
+    );
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory, "directory-seam");
+    expect((await client.listPlugins()).map(({ id }) => id)).toEqual(["directory-seam"]);
+    expect(await client.invokePluginRpc("directory-seam", "state", {})).toEqual({ workspaces: 0 });
+    await client.createWorkspace({
+      idempotencyKey: "internal-seam-workspace",
+      source: { kind: "directory", path: workspaceDirectory },
+    });
+    await expect
+      .poll(() => client.invokePluginRpc("internal-seam", "state", {}))
+      .toEqual({ workspaces: 1 });
+    await expect
+      .poll(() => client.invokePluginRpc("directory-seam", "state", {}))
+      .toEqual({ workspaces: 1 });
+    await client.patchDaemonConfig({ pluginsEnabled: false });
+    expect(await client.invokePluginRpc("internal-seam", "state", {})).toEqual({ workspaces: 1 });
+    expect(await client.listPlugins()).toMatchObject([
+      { id: "directory-seam", status: "disabled" },
+    ]);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(workspaceDirectory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("a failing built-in does not stop the daemon or the next built-in", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo-builtin-failure-"));
+  const failingDirectory = path.join(root, "failing-builtin");
+  await mkdir(failingDirectory);
+  await writeFile(
+    path.join(failingDirectory, "paseo-plugin.json"),
+    JSON.stringify({ id: "failing-builtin", requirements: { paseo: ">=0.8.0" } }),
+  );
+  await writeFile(
+    path.join(failingDirectory, "index.server.ts"),
+    "export default function contribute() { throw new Error('fixture startup failure'); }",
+  );
+  await cp(directory, path.join(root, "internal-seam"), { recursive: true });
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.8.0",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(root, ["failing-builtin", "internal-seam"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await client.connect();
+    expect(await client.invokePluginRpc("internal-seam", "state", {})).toEqual({ workspaces: 0 });
+    expect(await client.listPlugins()).toEqual([]);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/lifecycle-archive.e2e.test.ts b/packages/server/src/server/plugins/lifecycle-archive.e2e.test.ts
new file mode 100644
index 0000000000..6f3d8661e7
--- /dev/null
+++ b/packages/server/src/server/plugins/lifecycle-archive.e2e.test.ts
@@ -0,0 +1,109 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+test("closing and archiving agents publish their distinct lifecycle hooks once", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-archive-hooks-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(
+      fileURLToPath(new URL("../../../../../plugin-examples/lifecycle-logger", import.meta.url)),
+    );
+    const created = await client.createWorkspace({
+      source: { kind: "directory", path: directory },
+    });
+    expect(created.error).toBeNull();
+    const workspace = created.workspace!;
+    const live = await client.createAgent({
+      provider: "claude",
+      cwd: directory,
+      workspaceId: workspace.id,
+    });
+    const closed = await client.createAgent({
+      provider: "claude",
+      cwd: directory,
+      workspaceId: workspace.id,
+    });
+    await daemon.daemon.agentManager.closeAgent(closed.id);
+    await daemon.daemon.agentManager.closeAgent(closed.id);
+    expect(daemon.daemon.agentManager.getAgent(closed.id)).toBeNull();
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("lifecycle-logger");
+        return logs
+          .filter((entry) => entry.message.startsWith('{"hook":"agent.closed"'))
+          .map((entry) => JSON.parse(entry.message).data.agent.id);
+      })
+      .toEqual([closed.id]);
+    await client.archiveWorkspace(workspace.id);
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("lifecycle-logger");
+        return logs
+          .filter((entry) => {
+            return entry.message.startsWith('{"hook":"agent.archived"');
+          })
+          .map((entry) => {
+            return JSON.parse(entry.message).data.agent.id;
+          })
+          .sort();
+      })
+      .toEqual([live.id, closed.id].sort());
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("lifecycle-logger");
+        return logs
+          .filter((entry) => entry.message.startsWith('{"hook":"agent.closed"'))
+          .map((entry) => JSON.parse(entry.message).data.agent.id)
+          .sort();
+      })
+      .toEqual([live.id, closed.id].sort());
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("daemon shutdown lets agent close hooks finish before stopping plugins", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-close-hook-shutdown-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  const completedFile = path.join(directory, "closed.txt");
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "close-hook-shutdown", requirements: { paseo: ">=0.8.0" } }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `import { writeFile } from "node:fs/promises";
+import { setTimeout } from "node:timers/promises";
+export default function contribute(server) {
+  server.on("agent.closed", async (event, context) => {
+    await setTimeout(200, undefined, { signal: context.signal });
+    await writeFile(${JSON.stringify(completedFile)}, event.agent.id);
+  });
+  return () => {};
+}`,
+    );
+    await client.connect();
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const agent = await client.createAgent({ provider: "claude", cwd: directory });
+    await daemon.close();
+    expect(await readFile(completedFile, "utf8")).toBe(agent.id);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/lifecycle.e2e.test.ts b/packages/server/src/server/plugins/lifecycle.e2e.test.ts
new file mode 100644
index 0000000000..fd408da004
--- /dev/null
+++ b/packages/server/src/server/plugins/lifecycle.e2e.test.ts
@@ -0,0 +1,586 @@
+import { cp, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, onTestFinished, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { resolveDaemonVersion } from "../daemon-version.js";
+
+test("a plugin transforms workspace creation once across receipt replays and observes its committed lifecycle", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-lifecycle-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "lifecycle", requirements: { paseo: ">=0.8.0" } }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+export default function contribute(server) {
+  server.before("workspace.create", ({ request }) => {
+    console.log(JSON.stringify({ hook: "workspace.before" }));
+    return { ...request, title: "Created through a hook" };
+  });
+  server.on("workspace.created", (event) => {
+    console.log(JSON.stringify({ hook: "workspace.created", event }));
+  });
+  server.on("workspace.archived", (event) => {
+    console.log(JSON.stringify({ hook: "workspace.archived", event }));
+  });
+  return () => {};
+}
+`,
+    );
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const created = await client.createWorkspace({
+      idempotencyKey: "plugin-workspace",
+      source: { kind: "directory", path: directory },
+    });
+    expect(created.workspace?.name).toBe("Created through a hook");
+    const workspaceId = created.workspace!.id;
+    const replay = await client.createWorkspace({
+      idempotencyKey: "plugin-workspace",
+      source: { kind: "directory", path: directory },
+    });
+    expect(replay.error).toBeNull();
+    expect(replay.workspace?.id).toBe(workspaceId);
+    await client.archiveWorkspace(workspaceId);
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("lifecycle");
+        return logs
+          .filter((entry) => {
+            return entry.message.startsWith('{"hook":');
+          })
+          .map((entry) => {
+            return JSON.parse(entry.message);
+          });
+      })
+      .toMatchObject([
+        { hook: "workspace.before" },
+        { hook: "workspace.created", event: { workspace: { id: workspaceId, cwd: directory } } },
+        { hook: "workspace.archived", event: { workspace: { id: workspaceId } } },
+      ]);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("plugins observe turns, answer permissions, and observe archive without blocking the agent", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-turn-hooks-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "turn-hooks", requirements: { paseo: ">=0.8.0" } }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+export default function contribute(server) {
+  server.on("agent.turn_started", (event) => {
+    console.log(JSON.stringify({ hook: "agent.turn_started", event }));
+  });
+  server.on("agent.turn_ended", (event) => {
+    console.log(JSON.stringify({ hook: "agent.turn_ended", event }));
+  });
+  server.on("agent.permission_requested", async (event, context) => {
+    console.log(JSON.stringify({ hook: "agent.permission_requested", event }));
+    await context.paseo.agents.ref(event.agent.id).respondToPermission({
+      requestId: event.request.id,
+      response: { behavior: "deny", message: "Declined by plugin" },
+    });
+  });
+  server.on("agent.permission_resolved", (event) => {
+    console.log(JSON.stringify({ hook: "agent.permission_resolved", event }));
+  });
+  server.on("agent.archived", (event) => {
+    console.log(JSON.stringify({ hook: "agent.archived", event }));
+  });
+  return () => {};
+}
+`,
+    );
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const agent = await client.createAgent({
+      provider: "claude",
+      cwd: directory,
+      title: "Turn hooks",
+      modeId: "default",
+    });
+    await client.sendMessage(agent.id, "Run rm -f permission.txt");
+    await expect
+      .poll(
+        async () => {
+          const logs = await client.getPluginLogs("turn-hooks");
+          return logs
+            .filter((entry) => {
+              return entry.message.startsWith('{"hook":');
+            })
+            .map((entry) => {
+              return JSON.parse(entry.message);
+            })
+            .sort((left, right) => {
+              return left.hook.localeCompare(right.hook);
+            });
+        },
+        { timeout: 10_000 },
+      )
+      .toMatchObject([
+        {
+          hook: "agent.permission_requested",
+          event: { request: { input: { command: "rm -f permission.txt" } } },
+        },
+        { hook: "agent.permission_resolved", event: { resolution: { behavior: "deny" } } },
+        {
+          hook: "agent.turn_ended",
+          event: { outcome: { kind: "completed" }, timeline: expect.any(Array) },
+        },
+        { hook: "agent.turn_started", event: { agent: { id: agent.id } } },
+      ]);
+    await client.archiveAgent(agent.id);
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("turn-hooks");
+        return logs.filter((entry) => {
+          return entry.message.startsWith('{"hook":"agent.archived"');
+        }).length;
+      })
+      .toBe(1);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("agent creation hooks change the provider and environment before the session opens", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-agent-hooks-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "agent-hooks", requirements: { paseo: ">=0.8.0" } }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+export default function contribute(server) {
+  server.before("agent.create", ({ request }) => {
+    return { ...request, config: { ...request.config, provider: "codex" }, env: { ...request.env, HOOK_CREATE: "created" } };
+  });
+  server.before("agent.session_open", ({ request }) => {
+    console.log(JSON.stringify({ hook: "agent.session_open", request }));
+    return { ...request, env: { ...request.env, HOOK_OPEN: "opened" } };
+  });
+  server.on("agent.created", (event) => {
+    console.log(JSON.stringify({ hook: "agent.created", event }));
+  });
+  return () => {};
+}
+`,
+    );
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const agent = await client.createAgent({
+      provider: "claude",
+      cwd: directory,
+      title: "Hook test",
+    });
+    expect(agent.provider).toBe("codex");
+    await expect
+      .poll(async () => {
+        const logs = await client.getPluginLogs("agent-hooks");
+        return logs
+          .filter((entry) => {
+            return entry.message.startsWith('{"hook":');
+          })
+          .map((entry) => {
+            return JSON.parse(entry.message);
+          });
+      })
+      .toMatchObject([
+        {
+          hook: "agent.session_open",
+          request: { agentId: agent.id, env: { HOOK_CREATE: "created" } },
+        },
+        { hook: "agent.created", event: { agent: { id: agent.id, provider: "codex" } } },
+      ]);
+    await client.archiveAgent(agent.id);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("invalid output from an untyped plugin rejects creation before later callbacks run", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-invalid-hook-"));
+  const daemon = await createTestPaseoDaemon({ daemonVersion: "0.8.0" });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "invalid-hook", requirements: { paseo: ">=0.8.0" } }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+export default function contribute(server) {
+  server.before("workspace.create", () => {
+    return { source: { kind: "worktree", branchName: 42 } };
+  });
+  server.before("workspace.create", ({ request }) => {
+    console.log("Unexpected later callback");
+    return request;
+  });
+  return () => {};
+}
+`,
+    );
+    await client.connect();
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    const result = await client.createWorkspace({ source: { kind: "directory", path: directory } });
+    expect(result.workspace).toBeNull();
+    expect(result.error).toContain("Plugin invalid-hook before workspace.create failed");
+    const logs = await client.getPluginLogs("invalid-hook");
+    expect(
+      logs.some((entry) => {
+        return entry.message.includes("Unexpected later callback");
+      }),
+    ).toBe(false);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
+
+const PROVIDER_ID = "shutdown-provider";
+
+async function createProviderPlugin(
+  root: string,
+  options: { acknowledgeClose: boolean } = { acknowledgeClose: true },
+): Promise<string> {
+  const directory = path.join(root, "plugin");
+  await mkdir(directory, { recursive: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "shutdown-provider-plugin",
+      requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+    }),
+  );
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    `import type {
+  ProviderEvent,
+  ProviderInput,
+  ProviderRegistration,
+} from "@getpaseo/plugin/server/provider";
+
+const CAPABILITIES = ["prompt.message", "session.persistence"];
+
+const provider: ProviderRegistration = {
+  id: ${JSON.stringify(PROVIDER_ID)},
+  label: "Shutdown provider",
+  async connect() {
+    let listener: ((event: ProviderEvent) => void) | null = null;
+    const emit = (event: ProviderEvent) => listener?.(event);
+    let turn = 0;
+    return {
+      version: 1,
+      capabilities: CAPABILITIES,
+      async send(input: ProviderInput) {
+        if (input.type === "catalog") {
+          emit({
+            type: "catalog",
+            requestId: input.requestId,
+            catalog: {
+              models: [{ id: "shutdown-model", label: "Shutdown model" }],
+              modes: [],
+              thinkingOptions: [],
+              defaultModel: "shutdown-model",
+            },
+          });
+          return;
+        }
+        if (input.type === "session.open") {
+          emit({
+            type: "session.opened",
+            requestId: input.requestId,
+            sessionId: input.sessionId,
+            capabilities: CAPABILITIES,
+            restoration: "core",
+            persistence: { version: 1, data: { token: "root" } },
+            cwd: input.config.cwd,
+          });
+          emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+          return;
+        }
+        if (input.type === "session.prompt") {
+          turn += 1;
+          const turnId = "turn-" + turn;
+          emit({
+            type: "session.prompt_result",
+            sessionId: input.sessionId,
+            clientMessageId: input.prompt.clientMessageId,
+            result: { type: "turn", turnId },
+          });
+          emit({ type: "session.turn", sessionId: input.sessionId, turnId, state: "started" });
+          emit({
+            type: "timeline.item",
+            sessionId: input.sessionId,
+            item: { type: "assistant_message", id: "answer-" + turn, text: "Done" },
+          });
+          emit({ type: "session.turn", sessionId: input.sessionId, turnId, state: "completed" });
+          return;
+        }
+        if (input.type === "session.close") {
+          if (!${JSON.stringify(options.acknowledgeClose)}) return;
+          emit({ type: "session.closed", sessionId: input.sessionId });
+        }
+        if ("requestId" in input) {
+          emit({ type: "request.completed", requestId: input.requestId });
+        }
+      },
+      onEvent(next: (event: ProviderEvent) => void) {
+        listener = next;
+        return () => {
+          if (listener === next) listener = null;
+        };
+      },
+      async close() {},
+    };
+  },
+};
+
+export default function contribute(server: { registerProvider(p: ProviderRegistration): void }) {
+  server.registerProvider(provider);
+  return () => undefined;
+}`,
+  );
+  return directory;
+}
+
+test("a clean daemon shutdown leaves a completed plugin-provider agent without an error", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "plugin-provider-shutdown-"));
+  onTestFinished(() => rm(root, { recursive: true, force: true }));
+  const pluginDirectory = await createProviderPlugin(root);
+  const workspace = path.join(root, "workspace");
+  await mkdir(workspace, { recursive: true });
+
+  const daemon = await createTestPaseoDaemon({
+    paseoHomeRoot: path.join(root, "daemon"),
+    staticDir: path.join(root, "static"),
+    cleanup: false,
+    pluginsEnabled: true,
+    plugins: {
+      "shutdown-provider-plugin": { source: "directory", path: pluginDirectory, enabled: true },
+    },
+  });
+
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.1" });
+  await client.connect();
+  await client.fetchAgents({ subscribe: {} });
+
+  const agent = await client.createAgent({
+    provider: PROVIDER_ID,
+    model: "shutdown-model",
+    cwd: workspace,
+    title: "Shutdown provider agent",
+  });
+  await client.sendMessage(agent.id, "hello");
+  const finished = await client.waitForFinish(agent.id, 30_000);
+  expect(finished.status).toBe("idle");
+
+  const beforeShutdown = await daemon.daemon.agentStorage.get(agent.id);
+  expect(beforeShutdown?.lastError ?? null).toBeNull();
+
+  await client.close();
+  await daemon.daemon.stop();
+  await daemon.daemon.agentStorage.flush().catch(() => undefined);
+
+  const persisted = await daemon.daemon.agentStorage.get(agent.id);
+  expect(persisted).not.toBeNull();
+  expect(persisted?.lastError ?? null).toBeNull();
+  expect(persisted?.attentionReason ?? null).not.toBe("error");
+}, 60_000);
+
+test("reloading a plugin leaves a completed plugin-provider agent without an error", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "plugin-provider-reload-"));
+  onTestFinished(() => rm(root, { recursive: true, force: true }));
+  const pluginDirectory = await createProviderPlugin(root);
+  const workspace = path.join(root, "workspace");
+  await mkdir(workspace, { recursive: true });
+
+  const daemon = await createTestPaseoDaemon({
+    paseoHomeRoot: path.join(root, "daemon"),
+    staticDir: path.join(root, "static"),
+    pluginsEnabled: true,
+    plugins: {
+      "shutdown-provider-plugin": { source: "directory", path: pluginDirectory, enabled: true },
+    },
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.1" });
+  onTestFinished(async () => {
+    await client.close();
+    await daemon.close();
+  });
+  await client.connect();
+  await client.fetchAgents({ subscribe: {} });
+
+  const agent = await client.createAgent({
+    provider: PROVIDER_ID,
+    model: "shutdown-model",
+    cwd: workspace,
+    title: "Reload provider agent",
+  });
+  await client.sendMessage(agent.id, "hello");
+  expect((await client.waitForFinish(agent.id, 30_000)).status).toBe("idle");
+
+  const reloaded = await client.reloadPlugin("shutdown-provider-plugin");
+  expect(reloaded.status).toBe("running");
+
+  const afterReload = await daemon.daemon.agentStorage.get(agent.id);
+  expect(afterReload?.lastError ?? null).toBeNull();
+  expect(afterReload?.attentionReason ?? null).not.toBe("error");
+  const timeline = await client.fetchAgentTimeline(agent.id, {
+    direction: "tail",
+    limit: 0,
+    projection: "canonical",
+  });
+  expect(JSON.stringify(timeline.entries)).not.toContain("Provider connection closed");
+
+  await client.sendMessage(agent.id, "after reload");
+  expect((await client.waitForFinish(agent.id, 30_000)).status).toBe("idle");
+}, 60_000);
+
+test("a provider that never acknowledges session.close does not hold the daemon open", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "plugin-provider-stuck-close-"));
+  onTestFinished(() => rm(root, { recursive: true, force: true }));
+  const pluginDirectory = await createProviderPlugin(root, { acknowledgeClose: false });
+  const workspace = path.join(root, "workspace");
+  await mkdir(workspace, { recursive: true });
+
+  const daemon = await createTestPaseoDaemon({
+    paseoHomeRoot: path.join(root, "daemon"),
+    staticDir: path.join(root, "static"),
+    cleanup: false,
+    pluginsEnabled: true,
+    plugins: {
+      "shutdown-provider-plugin": { source: "directory", path: pluginDirectory, enabled: true },
+    },
+  });
+
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.1" });
+  await client.connect();
+  await client.fetchAgents({ subscribe: {} });
+
+  const agent = await client.createAgent({
+    provider: PROVIDER_ID,
+    model: "shutdown-model",
+    cwd: workspace,
+    title: "Stuck close agent",
+  });
+  await client.sendMessage(agent.id, "hello");
+  await client.waitForFinish(agent.id, 30_000);
+  await client.close();
+
+  // Without a deadline on each agent close, stop() never returns here and the
+  // test fails by timing out.
+  await expect(daemon.daemon.stop()).resolves.toBeUndefined();
+}, 90_000);
+
+const repoRoot = fileURLToPath(new URL("../../../../../", import.meta.url));
+
+// Hold the provider close until the subprocess has entered shutdown cleanup.
+async function createSlowClosingProviderPlugin() {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-slow-close-plugin-"));
+  const closeStarted = path.join(directory, "close-started");
+  const closeRelease = path.join(directory, "close-release");
+  const cleanupStarted = path.join(directory, "cleanup-started");
+  await cp(path.join(repoRoot, "plugin-examples/provider-direct"), directory, { recursive: true });
+  const providerPath = path.join(directory, "server", "provider.ts");
+  const source = (await readFile(providerPath, "utf8")).replaceAll("\r\n", "\n");
+  const patched = `import { readFile, writeFile } from "node:fs/promises";\n${source.replace(
+    "      closed = true;\n      sessions.clear();",
+    `      closed = true;
+      await writeFile(${JSON.stringify(closeStarted)}, "started");
+      while (true) {
+        try { await readFile(${JSON.stringify(closeRelease)}); break; }
+        catch { await new Promise((resolve) => setTimeout(resolve, 10)); }
+      }
+      sessions.clear();
+      console.log("provider close completed");`,
+  )}`;
+  expect(patched).toContain(`await writeFile(${JSON.stringify(closeStarted)}, "started")`);
+  await writeFile(providerPath, patched);
+  const entryPath = path.join(directory, "index.server.ts");
+  const entry = (await readFile(entryPath, "utf8")).replaceAll("\r\n", "\n");
+  const withCleanup = `import { writeFile } from "node:fs/promises";\n${entry.replace(
+    "  return () => {};",
+    `  return async () => { await writeFile(${JSON.stringify(cleanupStarted)}, "started"); console.log("plugin cleanup completed"); };`,
+  )}`;
+  expect(withCleanup).toContain(`await writeFile(${JSON.stringify(cleanupStarted)}, "started")`);
+  await writeFile(entryPath, withCleanup);
+  return { directory, closeStarted, closeRelease, cleanupStarted };
+}
+
+test("reloading a plugin does not send on a closed IPC channel", async () => {
+  const {
+    directory: pluginDirectory,
+    closeStarted,
+    closeRelease,
+    cleanupStarted,
+  } = await createSlowClosingProviderPlugin();
+  const cwd = await mkdtemp(path.join(tmpdir(), "paseo-reload-teardown-"));
+  const daemon = await createTestPaseoDaemon();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(pluginDirectory);
+    const agent = await client.createAgent({ provider: "direct-example", cwd });
+    const turn = client.sendMessage(agent.id, "Say hello").catch(() => undefined);
+    const reload = client.reloadPlugin("provider-direct-example");
+    await expect
+      .poll(() => readFile(closeStarted, "utf8").catch(() => null), { timeout: 20_000 })
+      .toBe("started");
+    await expect
+      .poll(() => readFile(cleanupStarted, "utf8").catch(() => null), { timeout: 20_000 })
+      .toBe("started");
+    await writeFile(closeRelease, "release");
+    const reloaded = await reload;
+    expect(reloaded.status).toBe("running");
+    const entries = await client.getPluginLogs("provider-direct-example");
+    const messages = entries.map((entry) => entry.message).join("\n");
+    expect(messages).not.toContain("ERR_IPC_CHANNEL_CLOSED");
+    expect(entries.filter((entry) => entry.message === "plugin cleanup completed")).toHaveLength(1);
+    expect(entries.filter((entry) => entry.message === "provider close completed")).toHaveLength(1);
+    await turn;
+    await client.archiveAgent(agent.id).catch(() => undefined);
+  } finally {
+    await writeFile(closeRelease, "release");
+    await client.close();
+    await daemon.close();
+    await rm(cwd, { recursive: true, force: true });
+    await rm(pluginDirectory, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/lifecycle.real.e2e.test.ts b/packages/server/src/server/plugins/lifecycle.real.e2e.test.ts
new file mode 100644
index 0000000000..fc9cfbd84d
--- /dev/null
+++ b/packages/server/src/server/plugins/lifecycle.real.e2e.test.ts
@@ -0,0 +1,342 @@
+import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+import { execFileSync } from "node:child_process";
+import { mkdir, mkdtemp, readFile, readlink, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import pino from "pino";
+import { expect, test } from "vitest";
+import type { PluginBeforeRequests, PluginLifecycleEvents } from "@getpaseo/plugin/server";
+import { ClaudeAgentClient } from "../agent/providers/claude/agent.js";
+import { CodexAppServerAgentClient } from "../agent/providers/codex-app-server-agent.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+type RecordedHook =
+  | {
+      [Name in keyof PluginLifecycleEvents]: { hook: Name; data: PluginLifecycleEvents[Name] };
+    }[keyof PluginLifecycleEvents]
+  | {
+      [Name in keyof PluginBeforeRequests]: {
+        hook: `before ${Name}`;
+        data: { request: PluginBeforeRequests[Name] };
+      };
+    }[keyof PluginBeforeRequests];
+
+const repoRoot = fileURLToPath(new URL("../../../../../", import.meta.url));
+const evidenceDirectory = path.join(repoRoot, ".dev", "lifecycle-proof");
+
+async function readHooks(client: DaemonClient): Promise<RecordedHook[]> {
+  const logs = await client.getPluginLogs("lifecycle-logger");
+  const events: RecordedHook[] = [];
+  for (const entry of logs) {
+    if (entry.message.startsWith('{"hook":')) {
+      events.push(JSON.parse(entry.message) as RecordedHook);
+    }
+  }
+  return events;
+}
+
+async function endedTurns(client: DaemonClient, agentId: string) {
+  const events = await readHooks(client);
+  return events.filter((event): event is Extract<RecordedHook, { hook: "agent.turn_ended" }> => {
+    return event.hook === "agent.turn_ended" && event.data.agent.id === agentId;
+  });
+}
+
+async function waitForTurns(client: DaemonClient, agentId: string, count: number): Promise<void> {
+  await expect
+    .poll(
+      async () => {
+        return (await endedTurns(client, agentId)).length;
+      },
+      { timeout: 120_000, interval: 250 },
+    )
+    .toBe(count);
+}
+
+async function waitForPermission(client: DaemonClient, agentId: string, command: string) {
+  let requestId = "";
+  await expect
+    .poll(
+      async () => {
+        const events = await readHooks(client);
+        for (const event of events) {
+          if (
+            event.hook === "agent.permission_requested" &&
+            event.data.agent.id === agentId &&
+            event.data.request.input?.command === command
+          ) {
+            requestId = event.data.request.id;
+          }
+        }
+        return requestId;
+      },
+      { timeout: 120_000, interval: 250 },
+    )
+    .not.toBe("");
+  return requestId;
+}
+
+test.skipIf(process.platform !== "linux")(
+  "all lifecycle hooks and the example actions work with a real Claude agent on an isolated daemon",
+  async () => {
+    await mkdir(evidenceDirectory, { recursive: true });
+    const fixture = await mkdtemp(path.join(tmpdir(), "paseo-real-hooks-"));
+    const project = path.join(fixture, "project");
+    await mkdir(path.join(project, ".claude"), { recursive: true });
+    await writeFile(
+      path.join(project, ".claude", "settings.json"),
+      JSON.stringify({ permissions: { ask: ["Bash"] } }),
+    );
+    await writeFile(path.join(project, "canary.txt"), "preserve me\n");
+    execFileSync("git", ["init", "-b", "main"], { cwd: project, stdio: "pipe" });
+    execFileSync("git", ["add", "."], { cwd: project });
+    execFileSync(
+      "git",
+      [
+        "-c",
+        "user.name=Lifecycle Test",
+        "-c",
+        "user.email=lifecycle@example.invalid",
+        "commit",
+        "-m",
+        "Fixture",
+      ],
+      { cwd: project, stdio: "pipe" },
+    );
+    const destination = pino.destination({
+      dest: path.join(evidenceDirectory, "daemon.log"),
+      sync: true,
+    });
+    const logger = pino({ level: "info" }, destination);
+    const daemon = await createTestPaseoDaemon({
+      daemonVersion: "0.8.0",
+      logger,
+      agentClients: {
+        claude: new ClaudeAgentClient({ logger }),
+        codex: new CodexAppServerAgentClient(logger),
+      },
+      mcpEnabled: false,
+    });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      appVersion: "0.8.0",
+    });
+    const proof: Record<string, unknown> = {
+      port: daemon.port,
+      paseoHome: daemon.paseoHome,
+      startedAt: new Date().toISOString(),
+    };
+    try {
+      await client.connect();
+      await client.fetchAgents({ subscribe: {} });
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(path.join(repoRoot, "plugin-examples/lifecycle-logger"));
+      await client.installDirectoryPlugin(path.join(repoRoot, "plugin-examples/lifecycle-actions"));
+      const created = await client.createWorkspace({
+        title: "Isolated lifecycle example",
+        source: { kind: "directory", path: project },
+      });
+      expect(created.error).toBeNull();
+      const workspace = created.workspace!;
+      expect(workspace.workspaceKind).toBe("worktree");
+      expect(workspace.workspaceDirectory).not.toBe(project);
+      proof.workspace = workspace;
+      const agent = await client.createAgent({
+        provider: "codex",
+        cwd: workspace.workspaceDirectory,
+        workspaceId: workspace.id,
+        title: "Real lifecycle example",
+      });
+      expect(agent.provider).toBe("claude");
+      proof.agent = { id: agent.id, requestedProvider: "codex", actualProvider: agent.provider };
+
+      await client.sendMessage(
+        agent.id,
+        "This is a hook integration test. Reply exactly: out of credits. If the next user message is Try again., reply exactly RETRY_OK instead. Do not use tools.",
+      );
+      await waitForTurns(client, agent.id, 2);
+      const retryTurns = await endedTurns(client, agent.id);
+      expect(assistantText(retryTurns[1].data.timeline)).toBe("RETRY_OK");
+      proof.followup = "RETRY_OK";
+
+      await client.sendMessage(
+        agent.id,
+        "Call the Bash tool with exactly git status. Do not combine it with other commands. Then reply STATUS_OK.",
+      );
+      await waitForTurns(client, agent.id, 3);
+      const approvalId = await waitForPermission(client, agent.id, "git status");
+      expect(await readHooks(client)).toContainEqual(
+        expect.objectContaining({
+          hook: "agent.permission_resolved",
+          data: expect.objectContaining({
+            requestId: approvalId,
+            resolution: expect.objectContaining({ behavior: "allow" }),
+          }),
+        }),
+      );
+      proof.approvedRequestId = approvalId;
+
+      await client.sendMessage(
+        agent.id,
+        "Call the Bash tool with exactly rm -rf canary.txt. If declined, do not try any other command or tool. Reply DECLINED and stop.",
+      );
+      await waitForTurns(client, agent.id, 4);
+      const deniedId = await waitForPermission(client, agent.id, "rm -rf canary.txt");
+      expect(await readHooks(client)).toContainEqual(
+        expect.objectContaining({
+          hook: "agent.permission_resolved",
+          data: expect.objectContaining({
+            requestId: deniedId,
+            resolution: expect.objectContaining({ behavior: "deny" }),
+          }),
+        }),
+      );
+      expect(await readFile(path.join(workspace.workspaceDirectory, "canary.txt"), "utf8")).toBe(
+        "preserve me\n",
+      );
+      proof.deniedRequestId = deniedId;
+      proof.canaryPreserved = true;
+
+      const envCommand = 'printf \'%s|%s\' "$PASEO_HOOK_CREATE_EXAMPLE" "$PASEO_HOOK_OPEN_EXAMPLE"';
+      await client.sendMessage(
+        agent.id,
+        `Call Bash with exactly this command: ${envCommand}. Reply with its exact output only.`,
+      );
+      const envPermission = await waitForPermission(client, agent.id, envCommand);
+      await client.respondToPermission(agent.id, envPermission, { behavior: "allow" });
+      await waitForTurns(client, agent.id, 5);
+      const envTurns = await endedTurns(client, agent.id);
+      expect(assistantText(envTurns[4].data.timeline)).toBe("created|opened");
+      proof.environmentOutput = "created|opened";
+
+      await client.refreshAgent(agent.id);
+      await daemon.daemon.agentManager.closeAgent(agent.id);
+      await client.sendMessage(agent.id, "Reply exactly RESUMED. Do not use tools.");
+      await waitForTurns(client, agent.id, 6);
+
+      await client.sendMessage(
+        agent.id,
+        "Write a detailed 2000-word essay about binary trees. Do not use tools.",
+      );
+      await expect
+        .poll(
+          async () => {
+            return (await readHooks(client)).filter((event) => {
+              return event.hook === "agent.turn_started" && event.data.agent.id === agent.id;
+            }).length;
+          },
+          { timeout: 30_000 },
+        )
+        .toBe(7);
+      await client.cancelAgent(agent.id);
+      await waitForTurns(client, agent.id, 7);
+      expect((await endedTurns(client, agent.id))[6].data.outcome.kind).toBe("canceled");
+      await client.archiveAgent(agent.id);
+
+      const failed = await client.createAgent({
+        provider: "claude",
+        model: "haiku",
+        cwd: workspace.workspaceDirectory,
+        workspaceId: workspace.id,
+        title: "Expected runtime crash",
+      });
+      await client.sendMessage(failed.id, "Reply READY. Do not use tools.");
+      await waitForTurns(client, failed.id, 1);
+      const rows = execFileSync("ps", ["-eo", "pid=,ppid=,args="], { encoding: "utf8" }).split(
+        "\n",
+      );
+      const providerPids: number[] = [];
+      for (const row of rows) {
+        const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/.exec(row);
+        if (match && Number(match[2]) === process.pid && match[3].includes("claude")) {
+          const cwd = await readlink(`/proc/${match[1]}/cwd`);
+          if (cwd === workspace.workspaceDirectory) {
+            providerPids.push(Number(match[1]));
+          }
+        }
+      }
+      expect(providerPids).toHaveLength(1);
+      const providerPid = providerPids[0];
+      await client.sendMessage(
+        failed.id,
+        "Write a detailed 2000-word essay about binary trees. Do not use tools.",
+      );
+      process.kill(providerPid, "SIGKILL");
+      await waitForTurns(client, failed.id, 2);
+      expect((await endedTurns(client, failed.id))[1].data.outcome.kind).toBe("failed");
+      proof.crashedProviderPid = providerPid;
+      await client.archiveAgent(failed.id);
+      await client.archiveWorkspace(workspace.id);
+      await expect
+        .poll(async () => {
+          const names = new Set(
+            (await readHooks(client)).map((event) => {
+              return event.hook;
+            }),
+          );
+          return [...names].sort();
+        })
+        .toEqual([
+          "agent.archived",
+          "agent.closed",
+          "agent.created",
+          "agent.permission_requested",
+          "agent.permission_resolved",
+          "agent.turn_ended",
+          "agent.turn_started",
+          "before agent.create",
+          "before agent.session_open",
+          "before workspace.create",
+          "workspace.archived",
+          "workspace.created",
+        ]);
+      const openReasons = (await readHooks(client))
+        .filter((event) => {
+          return event.hook === "before agent.session_open";
+        })
+        .map((event) => {
+          return event.data.request.reason;
+        });
+      expect(openReasons).toContain("create");
+      expect(openReasons).toContain("refresh");
+      expect(openReasons).toContain("resume");
+      proof.passed = true;
+    } finally {
+      proof.finishedAt = new Date().toISOString();
+      await writeFile(path.join(evidenceDirectory, "proof.json"), JSON.stringify(proof, null, 2));
+      const logs = await client.getPluginLogs("lifecycle-logger").catch(() => {
+        return [];
+      });
+      await writeFile(
+        path.join(evidenceDirectory, "hooks.jsonl"),
+        logs
+          .filter((entry) => {
+            return entry.message.startsWith('{"hook":');
+          })
+          .map((entry) => {
+            return entry.message;
+          })
+          .join("\n") + "\n",
+      );
+      await client.close();
+      await daemon.close();
+      destination.end();
+      await rm(fixture, { recursive: true, force: true });
+    }
+  },
+  600_000,
+);
+
+function assistantText(timeline: readonly AgentTimelineItem[]): string {
+  let text = "";
+  for (const item of timeline) {
+    if (item.type === "user_message") {
+      text = "";
+    } else if (item.type === "assistant_message") {
+      text += item.text;
+    }
+  }
+  return text;
+}
diff --git a/packages/server/src/server/plugins/lifecycle/handlers.test.ts b/packages/server/src/server/plugins/lifecycle/handlers.test.ts
new file mode 100644
index 0000000000..5e30535953
--- /dev/null
+++ b/packages/server/src/server/plugins/lifecycle/handlers.test.ts
@@ -0,0 +1,100 @@
+import { expect, test } from "vitest";
+import { createPaseoApi } from "@getpaseo/client";
+import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { PluginHookHandlers } from "./index.js";
+
+const paseo = createPaseoApi(
+  new DaemonClient({ url: "ws://127.0.0.1:1/ws", clientId: "lifecycle-unit" }),
+);
+
+test("removing an old registration twice preserves a newer registration for the same hook", async () => {
+  const hooks = new PluginHookHandlers(() => {});
+  const remove = hooks.before("workspace.create", ({ request }) => {
+    return { ...request, title: "old" };
+  });
+  remove();
+  hooks.before("workspace.create", ({ request }) => {
+    return { ...request, title: "new" };
+  });
+  remove();
+  const output = await hooks.invoke(
+    "operation",
+    "before",
+    "workspace.create",
+    {
+      source: { kind: "directory", path: "/project" },
+    },
+    paseo,
+  );
+  expect(output).toEqual({ source: { kind: "directory", path: "/project" }, title: "new" });
+});
+
+test("before hooks compose returned requests and preserve the original input", async () => {
+  const hooks = new PluginHookHandlers(() => {});
+  hooks.before("workspace.create", ({ request }) => {
+    return { ...request, title: "first" };
+  });
+  hooks.before("workspace.create", () => {
+    return;
+  });
+  hooks.before("workspace.create", ({ request }) => {
+    return { ...request, title: request.title + ":second" };
+  });
+  const input = { source: { kind: "directory", path: "/project" } };
+  expect(await hooks.invoke("operation", "before", "workspace.create", input, paseo)).toEqual({
+    source: { kind: "directory", path: "/project" },
+    title: "first:second",
+  });
+  expect(input).toEqual({ source: { kind: "directory", path: "/project" } });
+});
+
+test("teardown aborts an active callback and removes its registrations", async () => {
+  const hooks = new PluginHookHandlers(() => {});
+  hooks.before("workspace.create", async (_input, context) => {
+    await new Promise<void>((_resolve, reject) => {
+      context.signal.addEventListener(
+        "abort",
+        () => {
+          reject(new Error("Hook aborted"));
+        },
+        { once: true },
+      );
+    });
+  });
+  const invocation = hooks.invoke(
+    "operation",
+    "before",
+    "workspace.create",
+    {
+      source: { kind: "directory", path: "/project" },
+    },
+    paseo,
+  );
+  hooks.close();
+  await expect(invocation).rejects.toThrow("Hook aborted");
+  expect(hooks.catalog()).toEqual({ events: [], before: [] });
+});
+
+test("session-open hooks reject changes to session identity instead of silently ignoring them", async () => {
+  const hooks = new PluginHookHandlers(() => {});
+  hooks.before("agent.session_open", ({ request }) => {
+    return { ...request, provider: "another-provider" };
+  });
+  await expect(
+    hooks.invoke(
+      "operation",
+      "before",
+      "agent.session_open",
+      {
+        agentId: "agent",
+        workspaceId: "workspace",
+        provider: "claude",
+        cwd: "/project",
+        reason: "resume",
+        purpose: "interactive",
+        env: {},
+      },
+      paseo,
+    ),
+  ).rejects.toThrow("agent.session_open hooks can only change env");
+});
diff --git a/packages/server/src/server/plugins/lifecycle/index.ts b/packages/server/src/server/plugins/lifecycle/index.ts
new file mode 100644
index 0000000000..447c325ad4
--- /dev/null
+++ b/packages/server/src/server/plugins/lifecycle/index.ts
@@ -0,0 +1,274 @@
+import type { AgentStreamEvent, AgentTimelineItem } from "../../agent/agent-sdk-types.js";
+import { z } from "zod";
+import { CreateAgentRequestMessageSchema } from "@getpaseo/protocol/messages";
+import type {
+  PluginHookAgent,
+  PluginHookContext,
+  PluginLifecycleRegistration,
+} from "@getpaseo/plugin/server";
+import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
+import type {
+  PluginBeforeRequests,
+  PluginHookWorkspace,
+  PluginLifecycleEvents,
+} from "@getpaseo/plugin/server";
+import { WorkspaceCreateRequestSchema } from "@getpaseo/protocol/messages";
+import type { PersistedWorkspaceRecord } from "../../workspace-registry.js";
+
+export const lifecycleEventNames = [
+  "agent.created",
+  "agent.closed",
+  "agent.turn_started",
+  "agent.turn_ended",
+  "agent.permission_requested",
+  "agent.permission_resolved",
+  "agent.archived",
+  "workspace.created",
+  "workspace.archived",
+] as const;
+export const beforeHookNames = ["agent.create", "agent.session_open", "workspace.create"] as const;
+
+const beforeSchemas = {
+  "agent.create": CreateAgentRequestMessageSchema.pick({ config: true, env: true }).strict(),
+  "agent.session_open": z
+    .object({
+      agentId: z.string(),
+      workspaceId: z.string().nullable(),
+      provider: z.string(),
+      cwd: z.string(),
+      reason: z.enum(["create", "resume", "refresh", "import"]),
+      purpose: z.enum(["interactive", "history"]),
+      env: z.record(z.string(), z.string()),
+    })
+    .strict(),
+  "workspace.create": WorkspaceCreateRequestSchema.omit({ type: true, requestId: true }).strict(),
+};
+
+export interface PluginLifecycle {
+  emit<Name extends keyof PluginLifecycleEvents>(
+    name: Name,
+    event: PluginLifecycleEvents[Name],
+  ): void;
+  before<Name extends keyof PluginBeforeRequests>(
+    name: Name,
+    request: PluginBeforeRequests[Name],
+  ): Promise<PluginBeforeRequests[Name]>;
+}
+
+export function validateBeforeRequest<Name extends keyof PluginBeforeRequests>(
+  name: Name,
+  value: unknown,
+): PluginBeforeRequests[Name] {
+  return beforeSchemas[name].parse(value) as PluginBeforeRequests[Name];
+}
+
+export function describeHookWorkspace(workspace: PersistedWorkspaceRecord): PluginHookWorkspace {
+  return {
+    id: workspace.workspaceId,
+    projectId: workspace.projectId,
+    cwd: workspace.cwd,
+    name: workspace.title,
+    archivedAt: workspace.archivedAt,
+  };
+}
+
+export function describeHookAgent(agent: {
+  id: string;
+  workspaceId?: string;
+  provider: string;
+  cwd: string;
+  title?: string | null;
+  labels: Record<string, string>;
+}): PluginHookAgent {
+  return {
+    id: agent.id,
+    workspaceId: agent.workspaceId ?? null,
+    parentAgentId: agent.labels[PARENT_AGENT_ID_LABEL] ?? null,
+    provider: agent.provider,
+    cwd: agent.cwd,
+    title: agent.title ?? null,
+  };
+}
+
+export function publishAgentStream(
+  lifecycle: PluginLifecycle,
+  agent: PluginHookAgent,
+  event: AgentStreamEvent,
+  timeline: readonly AgentTimelineItem[],
+): void {
+  if (event.type === "turn_started") {
+    lifecycle.emit("agent.turn_started", { agent, turnId: event.turnId ?? null });
+  } else if (event.type === "turn_completed") {
+    lifecycle.emit("agent.turn_ended", {
+      agent,
+      turnId: event.turnId ?? null,
+      timeline,
+      outcome: { kind: "completed" },
+    });
+  } else if (event.type === "turn_failed") {
+    lifecycle.emit("agent.turn_ended", {
+      agent,
+      turnId: event.turnId ?? null,
+      timeline,
+      outcome: { kind: "failed", error: { message: event.error, code: event.code } },
+    });
+  } else if (event.type === "turn_canceled") {
+    lifecycle.emit("agent.turn_ended", {
+      agent,
+      turnId: event.turnId ?? null,
+      timeline,
+      outcome: { kind: "canceled", reason: event.reason },
+    });
+  } else if (event.type === "permission_requested") {
+    lifecycle.emit("agent.permission_requested", { agent, request: event.request });
+  } else if (event.type === "permission_resolved") {
+    lifecycle.emit("agent.permission_resolved", {
+      agent,
+      requestId: event.requestId,
+      resolution: event.resolution,
+    });
+  }
+}
+
+export function validateBeforeResult<Name extends keyof PluginBeforeRequests>(
+  name: Name,
+  input: PluginBeforeRequests[Name],
+  output: unknown,
+): PluginBeforeRequests[Name] {
+  const result = validateBeforeRequest(name, output);
+  if (name === "agent.session_open") {
+    const previous = beforeSchemas["agent.session_open"].parse(input);
+    const next = beforeSchemas["agent.session_open"].parse(result);
+    if (
+      previous.agentId !== next.agentId ||
+      previous.workspaceId !== next.workspaceId ||
+      previous.provider !== next.provider ||
+      previous.cwd !== next.cwd ||
+      previous.reason !== next.reason ||
+      previous.purpose !== next.purpose
+    ) {
+      throw new Error("agent.session_open hooks can only change env");
+    }
+  }
+  if (name === "agent.create") {
+    const previous = beforeSchemas["agent.create"].parse(input);
+    const next = beforeSchemas["agent.create"].parse(result);
+    if (previous.config.cwd !== next.config.cwd) {
+      throw new Error("agent.create hooks cannot change the workspace directory");
+    }
+  }
+  return result;
+}
+
+type Handler = (input: unknown, context: PluginHookContext) => unknown;
+
+export class PluginHookHandlers implements PluginLifecycleRegistration {
+  private readonly events = new Map<string, Set<Handler>>();
+  private readonly transforms = new Map<string, Set<Handler>>();
+  private readonly active = new Map<string, AbortController>();
+
+  private readonly changed: () => void;
+
+  constructor(changed: () => void) {
+    this.changed = changed;
+  }
+
+  readonly on: PluginLifecycleRegistration["on"] = (name, handler) => {
+    if (!lifecycleEventNames.includes(name)) {
+      throw new Error(`Unknown lifecycle event: ${name}`);
+    }
+    return this.register(this.events, name, handler as Handler);
+  };
+
+  readonly before: PluginLifecycleRegistration["before"] = (name, handler) => {
+    if (!beforeHookNames.includes(name)) {
+      throw new Error(`Unknown before hook: ${name}`);
+    }
+    return this.register(this.transforms, name, handler as Handler);
+  };
+
+  catalog(): { events: string[]; before: string[] } {
+    return { events: [...this.events.keys()], before: [...this.transforms.keys()] };
+  }
+
+  async invoke(
+    id: string,
+    kind: "event" | "before",
+    name: string,
+    input: unknown,
+    paseo: PluginHookContext["paseo"],
+  ): Promise<unknown> {
+    const controller = new AbortController();
+    this.active.set(id, controller);
+    try {
+      if (kind === "before") {
+        if (
+          !beforeHookNames.includes(
+            name as keyof import("@getpaseo/plugin/server").PluginBeforeRequests,
+          )
+        ) {
+          throw new Error(`Unknown before hook: ${name}`);
+        }
+        const hookName = name as keyof import("@getpaseo/plugin/server").PluginBeforeRequests;
+        let request = validateBeforeRequest(hookName, input);
+        for (const handler of this.transforms.get(name) ?? []) {
+          controller.signal.throwIfAborted();
+          const result = await handler(
+            { request: structuredClone(request) },
+            { paseo, signal: controller.signal },
+          );
+          if (result !== undefined) {
+            request = validateBeforeResult(hookName, request, result);
+          }
+        }
+        return request;
+      }
+      for (const handler of this.events.get(name) ?? []) {
+        controller.signal.throwIfAborted();
+        try {
+          await handler(structuredClone(input), { paseo, signal: controller.signal });
+        } catch (error) {
+          console.error(`Lifecycle hook ${name} failed`, error);
+        }
+      }
+      return null;
+    } finally {
+      this.active.delete(id);
+    }
+  }
+
+  cancel(id: string): void {
+    this.active.get(id)?.abort();
+  }
+
+  close(): void {
+    for (const controller of this.active.values()) {
+      controller.abort();
+    }
+    this.events.clear();
+    this.transforms.clear();
+  }
+
+  private register(
+    registry: Map<string, Set<Handler>>,
+    name: string,
+    handler: Handler,
+  ): () => void {
+    let handlers = registry.get(name);
+    if (!handlers) {
+      handlers = new Set();
+      registry.set(name, handlers);
+    }
+    handlers.add(handler);
+    this.changed();
+    return () => {
+      if (!handlers.delete(handler)) {
+        return;
+      }
+      if (handlers.size === 0) {
+        registry.delete(name);
+      }
+      this.changed();
+    };
+  }
+}
diff --git a/packages/server/src/server/plugins/managed-source.posix.test.ts b/packages/server/src/server/plugins/managed-source.posix.test.ts
index d315a146d3..466780b79a 100644
--- a/packages/server/src/server/plugins/managed-source.posix.test.ts
+++ b/packages/server/src/server/plugins/managed-source.posix.test.ts
@@ -1,4 +1,6 @@
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, rename, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { readFileSync } from "node:fs";
+import { createServer } from "node:http";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -34,6 +36,25 @@ async function commitAll(repository: string, message: string): Promise<string> {
   return stdout.trim();
 }
 
+/** Points https://github.com/fixture/repository.git at a local repository for the callback. */
+async function withGitHubFixture(repository: string, run: () => Promise<void>): Promise<void> {
+  const overlay = {
+    GIT_CONFIG_COUNT: "1",
+    GIT_CONFIG_KEY_0: `url.${pathToFileURL(repository).href}.insteadOf`,
+    GIT_CONFIG_VALUE_0: "https://github.com/fixture/repository.git",
+  };
+  const previous = Object.fromEntries(Object.keys(overlay).map((key) => [key, process.env[key]]));
+  Object.assign(process.env, overlay);
+  try {
+    await run();
+  } finally {
+    for (const [key, value] of Object.entries(previous)) {
+      if (value === undefined) delete process.env[key];
+      else process.env[key] = value;
+    }
+  }
+}
+
 describe("managed Git plugin sources", () => {
   it("does not expose Git URL credentials when cloning fails", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-git-home-"));
@@ -41,24 +62,56 @@ describe("managed Git plugin sources", () => {
     const sources = new ManagedPluginSources(home);
 
     const failure = sources.prepareInstall({
-      source: "https://oauth2:super-secret@127.0.0.1:1/missing.git",
+      source: "git:https://oauth2:super-secret@127.0.0.1:1/missing.git",
     });
     await expect(failure).rejects.not.toThrow(/oauth2|super-secret/);
   });
 
-  it("tracks branches, prepares updates, persists commits, and keeps tags pinned", async () => {
+  it("normalizes explicit GitHub and Git identifiers to the same Git source", async () => {
+    const repository = await createRepository();
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-github-home-"));
+    roots.push(home);
+    await withGitHubFixture(repository, async () => {
+      const sources = new ManagedPluginSources(home);
+      for (const source of ["github:fixture/repository", "git:fixture/repository"]) {
+        const candidate = await sources.prepareInstall({ source });
+        expect(candidate.record).toMatchObject({
+          kind: "git",
+          remote: "https://github.com/fixture/repository.git",
+        });
+        await sources.discard(candidate);
+      }
+    });
+  }, 30_000);
+
+  it("offers current default HEAD after installing a tag", async () => {
     const repository = await createRepository();
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-git-home-"));
     roots.push(home);
     const remote = pathToFileURL(repository).href;
     const sources = new ManagedPluginSources(home);
 
-    let candidate = await sources.prepareInstall({ source: remote });
+    let candidate = await sources.prepareInstall({ source: `git:${remote}` });
     expect(candidate.defaultId).toBe("managed-example");
     candidate = await sources.place("managed-example", candidate);
     sources.commit("managed-example", candidate.record);
+    const metadataPath = path.join(home, "plugins", "sources.json");
+    const metadata = JSON.parse(await readFile(metadataPath, "utf8"));
+    delete metadata["managed-example"].kind;
+    Object.assign(metadata["managed-example"], {
+      commit: "obsolete",
+      requestedRef: "v0",
+      trackingBranch: "missing",
+      checkoutRoot: "/obsolete",
+    });
+    await writeFile(metadataPath, JSON.stringify(metadata));
+    expect(
+      await new ManagedPluginSources(home).describe("managed-example", candidate.directory),
+    ).toMatchObject({ identity: { kind: "git", remote } });
 
-    const initial = candidate.record.commit;
+    if (candidate.record.kind !== "git") throw new Error("Expected Git source");
+    const initial = (await sources.describe("managed-example", candidate.directory))
+      .currentRevision!;
     await writeFile(
       path.join(repository, "index.server.ts"),
       "export default () => () => { new Date(); };\n",
@@ -68,29 +121,443 @@ describe("managed Git plugin sources", () => {
     expect(status).toMatchObject({
       currentCommit: initial,
       latestCommit: latest,
-      commitsBehind: 1,
       updateAvailable: true,
     });
 
-    const prepared = await sources.prepareUpdate("managed-example", candidate.directory);
-    expect(prepared.commits).toBe(1);
-    if (!prepared.candidate) throw new Error("Expected an update candidate");
-    const updated = await sources.place("managed-example", prepared.candidate);
+    const preview = await new ManagedPluginSources(home).preview(
+      "managed-example",
+      candidate.directory,
+    );
+    expect(preview.outcome).toBe("update");
+    const prepared = await sources.prepareUpdate(preview.proposal!, candidate.directory);
+    const updated = await sources.place("managed-example", prepared);
     sources.commit("managed-example", updated.record);
     expect(await readFile(path.join(updated.directory, "index.server.ts"), "utf8")).toContain(
       "new Date",
     );
-    expect(new ManagedPluginSources(home).get("managed-example")?.commit).toBe(latest);
+    expect(
+      await new ManagedPluginSources(home).describe("managed-example", updated.directory),
+    ).toMatchObject({ currentRevision: latest });
+    expect(JSON.parse(await readFile(metadataPath, "utf8"))["managed-example"]).toEqual({
+      kind: "git",
+      remote,
+    });
 
     await runGitCommand(["tag", "v1", initial], { cwd: repository });
-    let pinned = await sources.prepareInstall({ source: remote, ref: "v1" });
-    pinned = await sources.place("pinned-example", pinned);
-    sources.commit("pinned-example", pinned.record);
-    expect(await sources.status("pinned-example", pinned.directory)).toMatchObject({
+    let tagged = await sources.prepareInstall({ source: remote, ref: "v1" });
+    tagged = await sources.place("tagged-example", tagged);
+    sources.commit("tagged-example", tagged.record);
+    expect(await sources.status("tagged-example", tagged.directory)).toMatchObject({
       currentCommit: initial,
-      latestCommit: initial,
-      commitsBehind: 0,
-      updateAvailable: false,
+      latestCommit: latest,
+      updateAvailable: true,
     });
   }, 30_000);
+  it("resolves branch, tag and commit installs against changed default HEAD and preserves the reviewed commit", async () => {
+    const repository = await createRepository();
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-review-"));
+    roots.push(home);
+    const remote = pathToFileURL(repository).href;
+    const initial = (await runGitCommand(["rev-parse", "HEAD"], { cwd: repository })).stdout.trim();
+    await runGitCommand(["tag", "v1"], { cwd: repository });
+    const sources = new ManagedPluginSources(home);
+    const installations = [];
+    for (const [index, ref] of [undefined, "main", "v1", initial].entries()) {
+      const id = `review-${index}`;
+      const candidate = await sources.place(
+        id,
+        await sources.prepareInstall({ source: remote, ref }),
+      );
+      sources.commit(id, candidate.record);
+      installations.push({ id, candidate });
+    }
+    await runGitCommand(["checkout", "-b", "new-default"], { cwd: repository });
+    await writeFile(path.join(repository, "revision.txt"), "reviewed");
+    const reviewed = await commitAll(repository, "new default");
+    const previews = await Promise.all(
+      installations.map(({ id, candidate }) => sources.preview(id, candidate.directory)),
+    );
+    for (const preview of previews)
+      expect(preview).toMatchObject({
+        outcome: "update",
+        current: { currentRevision: initial },
+        target: { commit: reviewed },
+      });
+    await writeFile(path.join(repository, "revision.txt"), "moved after review");
+    const moved = await commitAll(repository, "move again");
+    const restarted = new ManagedPluginSources(home);
+    const { id, candidate } = installations[0]!;
+    const updated = await restarted.place(
+      id,
+      await restarted.prepareUpdate(previews[0]!.proposal!, candidate.directory),
+    );
+    expect(await restarted.describe(id, updated.directory)).toEqual({
+      identity: previews[0]!.current!.identity,
+      currentRevision: reviewed,
+    });
+    expect(await readFile(path.join(updated.directory, "revision.txt"), "utf8")).toBe("reviewed");
+    expect(await restarted.preview(id, updated.directory)).toMatchObject({
+      target: { commit: moved },
+    });
+    await expect(
+      restarted.assertCurrent(previews[0]!.proposal!, updated.directory),
+    ).rejects.toThrow("changed since review");
+    const sameRevision = await restarted.place(
+      id,
+      await restarted.prepareInstall({ source: remote, ref: initial }),
+    );
+    await expect(
+      restarted.assertCurrent(previews[0]!.proposal!, sameRevision.directory),
+    ).rejects.toThrow("changed since review");
+    expect(
+      await restarted.preview(id, updated.directory, { kind: "git", ref: initial.slice(0, 8) }),
+    ).toMatchObject({ target: { commit: initial } });
+  }, 30_000);
+  it("uses retained acquisition remote when credential rewriting changes origin, preserving nested identity", async () => {
+    const repository = await createRepository();
+    const nested = path.join(repository, "plugins", "review");
+    await mkdir(nested, { recursive: true });
+    for (const name of ["paseo-plugin.json", "index.server.ts"])
+      await rename(path.join(repository, name), path.join(nested, name));
+    await commitAll(repository, "nested plugin");
+    await runGitCommand(["update-server-info"], { cwd: repository });
+    const server = createServer((request, response) => {
+      const pathname = new URL(request.url!, "http://localhost").pathname;
+      const file = path.resolve(repository, ".git", `.${pathname}`);
+      if (!file.startsWith(path.join(repository, ".git") + path.sep)) {
+        response.writeHead(404).end();
+        return;
+      }
+      try {
+        response.end(readFileSync(file));
+      } catch {
+        response.writeHead(404).end();
+      }
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Expected HTTP port");
+    const remote = `http://fixture:fake-secret@127.0.0.1:${address.port}/`;
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-credential-"));
+    roots.push(home);
+    try {
+      const sources = new ManagedPluginSources(home);
+      const candidate = await sources.place(
+        "nested",
+        await sources.prepareInstall({ source: remote, pluginPath: "plugins/review" }),
+      );
+      sources.commit("nested", candidate.record);
+      expect(
+        (
+          await runGitCommand(["remote", "get-url", "origin"], { cwd: candidate.directory })
+        ).stdout.trim(),
+      ).toBe("https://paseo.invalid/plugin.git");
+      const before = await sources.describe("nested", candidate.directory);
+      expect(before.identity).toEqual({
+        kind: "git",
+        remote: `http://127.0.0.1:${address.port}/`,
+        pluginPath: "plugins/review",
+      });
+      await writeFile(path.join(nested, "revision.txt"), "new");
+      const latest = await commitAll(repository, "advance");
+      await runGitCommand(["update-server-info"], { cwd: repository });
+      const restarted = new ManagedPluginSources(home);
+      const preview = await restarted.preview("nested", candidate.directory);
+      expect(preview.target).toEqual({ kind: "git", commit: latest });
+      const updated = await restarted.place(
+        "nested",
+        await restarted.prepareUpdate(preview.proposal!, candidate.directory),
+      );
+      expect(await restarted.describe("nested", updated.directory)).toEqual({
+        identity: before.identity,
+        currentRevision: latest,
+      });
+    } finally {
+      server.closeAllConnections();
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  }, 30_000);
 });
+
+describe("registry plugin sources", () => {
+  it("explains how to choose a revision when --ref is used with a registry id", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-ref-home-"));
+    roots.push(home);
+    const sources = new ManagedPluginSources(home);
+    await expect(
+      sources.prepareInstall({ source: "fixture/example", ref: "main" }),
+    ).rejects.toThrow(
+      "Registry installs pin the reviewed revision. Drop --ref, or install from an explicit github:owner/repository source to choose a revision.",
+    );
+  });
+
+  it("names the registry URL and recovery steps when the registry fetch fails", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-offline-home-"));
+    roots.push(home);
+    const server = createServer((request) => request.socket.destroy());
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    const url = `http://127.0.0.1:${address.port}`;
+    try {
+      const sources = new ManagedPluginSources(home, { defaultUrl: url });
+      await expect(sources.prepareInstall({ source: "fixture/example" })).rejects.toThrow(
+        `Could not reach plugin registry ${url}/plugins/fixture/example.json. Plugin fixture/example was not installed. Retry or use an explicit npm: or github: source.`,
+      );
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+
+  it("explains explicit local and GitHub sources when a registry ID is missing", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-missing-home-"));
+    roots.push(home);
+    const requests: Array<string | undefined> = [];
+    const server = createServer((request, response) => {
+      requests.push(request.url);
+      response.writeHead(404).end();
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    try {
+      const sources = new ManagedPluginSources(home, {
+        defaultUrl: `http://127.0.0.1:${address.port}`,
+      });
+      await expect(sources.prepareInstall({ source: "fixture/missing" })).rejects.toThrow(
+        "If you intended a local directory, use ./fixture/missing. If you intended a GitHub source, use git:fixture/missing, or a full Git URL for another Git host.",
+      );
+      expect(requests).toEqual(["/plugins/fixture/missing.json"]);
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+
+  it("keeps explicit Git sources and persisted Git installs independent of the registry", async () => {
+    const repository = await createRepository();
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-off-home-"));
+    roots.push(home);
+    const requests: Array<string | undefined> = [];
+    const server = createServer((req, res) => {
+      requests.push(req.url);
+      res.statusCode = 404;
+      res.end();
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    try {
+      await withGitHubFixture(repository, async () => {
+        const sources = new ManagedPluginSources(home, {
+          defaultUrl: `http://127.0.0.1:${address.port}`,
+        });
+        for (const source of [
+          "git:fixture/repository",
+          "https://github.com/fixture/repository.git",
+        ]) {
+          const candidate = await sources.place(
+            "managed-example",
+            await sources.prepareInstall({ source }),
+          );
+          expect(candidate.record).toEqual({
+            kind: "git",
+            remote: "https://github.com/fixture/repository.git",
+          });
+          sources.commit("managed-example", candidate.record);
+          const restarted = new ManagedPluginSources(home, {
+            defaultUrl: `http://127.0.0.1:${address.port}/changed`,
+          });
+          expect((await restarted.preview("managed-example", candidate.directory)).outcome).toBe(
+            "current",
+          );
+          expect(
+            (await restarted.describe("managed-example", candidate.directory)).identity,
+          ).toEqual({
+            kind: "git",
+            remote: "https://github.com/fixture/repository.git",
+            pluginPath: ".",
+          });
+          await sources.discard(candidate);
+        }
+      });
+      expect(requests).toEqual([]);
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  }, 30_000);
+
+  it("installs a bare id from a private registry and polls its pin without install intent", async () => {
+    const repository = await createRepository();
+    await mkdir(path.join(repository, "packages/example"), { recursive: true });
+    await rename(
+      path.join(repository, "paseo-plugin.json"),
+      path.join(repository, "packages/example/paseo-plugin.json"),
+    );
+    await rename(
+      path.join(repository, "index.server.ts"),
+      path.join(repository, "packages/example/index.server.ts"),
+    );
+    await commitAll(repository, "move plugin into monorepo");
+    const revision = await runGitCommand(["rev-parse", "HEAD"], { cwd: repository });
+    const commit = revision.stdout.trim();
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-home-"));
+    roots.push(home);
+    const requests: Array<{
+      path: string | undefined;
+      intent: string | string[] | undefined;
+      authorization: string | undefined;
+    }> = [];
+    let missing = false;
+    const server = createServer((req, res) => {
+      requests.push({
+        path: req.url,
+        intent: req.headers["x-paseo-install"],
+        authorization: req.headers.authorization,
+      });
+      if (missing) {
+        res.writeHead(404).end();
+        return;
+      }
+      res.setHeader("Content-Type", "application/json");
+      res.end(
+        JSON.stringify({
+          id: "acme/example",
+          name: "Example",
+          description: "Test",
+          categories: [],
+          author: { github: "acme" },
+          repository: { url: "https://github.com/acme/example" },
+          artifact: {
+            kind: "git",
+            remote: pathToFileURL(repository).href,
+            commit,
+            pluginPath: "packages/example",
+          },
+          media: [],
+          submittedAt: "2026-10-03",
+          reviewedAt: "2026-10-03",
+          updatedAt: "2026-10-03",
+          publishedAt: "2026-10-03",
+          readme: "# Test",
+        }),
+      );
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    const host = `127.0.0.1:${address.port}`;
+    const url = `http://${host}/internal`;
+    try {
+      const sources = new ManagedPluginSources(home, {
+        defaultUrl: url,
+        registries: { [host]: { authorization: "Bearer test" } },
+      });
+      let candidate = await sources.prepareInstall({ source: "acme/example" });
+      candidate = await sources.place("managed-example", candidate);
+      expect(
+        JSON.parse(await readFile(path.join(candidate.directory, "paseo-plugin.json"), "utf8")).id,
+      ).toBe("managed-example");
+      await sources.verifyCandidate("managed-example", candidate);
+      sources.commit("managed-example", candidate.record);
+      const restarted = new ManagedPluginSources(home, {
+        defaultUrl: "http://127.0.0.1:1/changed",
+        registries: { [host]: { authorization: "Bearer test" } },
+      });
+      const preview = await restarted.preview("managed-example", candidate.directory);
+      expect(preview.outcome).toBe("current");
+      expect(preview.current?.identity).toEqual({
+        kind: "git",
+        remote: pathToFileURL(repository).href,
+        pluginPath: "packages/example",
+        registry: { url, id: "acme/example" },
+      });
+      missing = true;
+      await expect(restarted.preview("managed-example", candidate.directory)).rejects.toThrow(
+        "Check that the installed plugin is still published in this registry before updating",
+      );
+      expect(requests).toEqual([
+        { path: "/internal/plugins/acme/example.json", intent: "1", authorization: "Bearer test" },
+        {
+          path: "/internal/plugins/acme/example.json",
+          intent: undefined,
+          authorization: "Bearer test",
+        },
+        {
+          path: "/internal/plugins/acme/example.json",
+          intent: undefined,
+          authorization: "Bearer test",
+        },
+      ]);
+    } finally {
+      await new Promise<void>((resolve, reject) =>
+        server.close((error) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+          resolve();
+        }),
+      );
+    }
+  });
+});
+
+it("installs and updates only the npm artifacts pinned by the plugin registry", async () => {
+  const { startNpmRegistry, npmPluginPackages } =
+    await import("../../../../../scripts/test-support/npm-registry.mjs");
+  const { resolveNpm } = await import("./managed-source/npm.js");
+  const npm = await startNpmRegistry(npmPluginPackages());
+  const previous = process.env.npm_config_userconfig;
+  process.env.npm_config_userconfig = npm.userconfig;
+  const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-npm-"));
+  roots.push(home);
+  const intents: Array<string | string[] | undefined> = [];
+  let pin = await resolveNpm("paseo-fixture-plugin", "1.0.0", home);
+  const server = createServer((request, response) => {
+    intents.push(request.headers["x-paseo-install"]);
+    response.end(
+      // Install reads only the ID and artifact, so the document omits the directory's display fields.
+      JSON.stringify({
+        id: "acme/example",
+        artifact: { kind: "npm", package: "paseo-fixture-plugin", ...pin },
+      }),
+    );
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("Missing registry address");
+  const options = { defaultUrl: `http://127.0.0.1:${address.port}` };
+  try {
+    const sources = new ManagedPluginSources(home, options);
+    const candidate = await sources.place(
+      "example",
+      await sources.prepareInstall({ source: "acme/example" }),
+    );
+    await sources.verifyCandidate("example", candidate);
+    sources.commit("example", candidate.record);
+    expect((await sources.describe("example", candidate.directory)).currentRevision).toBe("1.0.0");
+    expect((await sources.preview("example", candidate.directory)).outcome).toBe("current");
+    pin = await resolveNpm("paseo-fixture-plugin", "1.1.0", home);
+    const restarted = new ManagedPluginSources(home, options);
+    const preview = await restarted.preview("example", candidate.directory);
+    expect(preview.target).toEqual({ kind: "npm", ...pin });
+    expect(preview.outcome).toBe("update");
+    const updated = await restarted.place(
+      "example",
+      await restarted.prepareUpdate(preview.proposal!, candidate.directory),
+    );
+    await restarted.verifyCandidate("example", updated);
+    expect(updated.record.registry).toEqual({ url: options.defaultUrl, id: "acme/example" });
+    expect(intents).toEqual(["1", undefined, undefined, undefined]);
+    pin = { ...pin, integrity: "sha512-YWJj" };
+    await expect(sources.prepareInstall({ source: "acme/example" })).rejects.toThrow(
+      "changed since review",
+    );
+  } finally {
+    server.closeAllConnections();
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+    await npm.close();
+    if (previous === undefined) delete process.env.npm_config_userconfig;
+    else process.env.npm_config_userconfig = previous;
+  }
+}, 30_000);
diff --git a/packages/server/src/server/plugins/managed-source.ts b/packages/server/src/server/plugins/managed-source.ts
index 844289eb22..5373b7453a 100644
--- a/packages/server/src/server/plugins/managed-source.ts
+++ b/packages/server/src/server/plugins/managed-source.ts
@@ -1,100 +1,198 @@
+import {
+  PluginRegistryIdentitySchema,
+  parsePluginRegistryReference,
+} from "@getpaseo/protocol/plugin-registry";
+import { resolveRegistryPlugin, type RegistryOptions } from "./managed-source/registry.js";
 import { randomUUID } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
-import { mkdir, rename, rm } from "node:fs/promises";
+import { mkdir, realpath, rename, rm } from "node:fs/promises";
 import path from "node:path";
+import { isDeepStrictEqual } from "node:util";
+import compareVersions from "semver/functions/compare.js";
 import { z } from "zod";
-import { PluginIdSchema, type PluginSourceStatusItem } from "@getpaseo/protocol/messages";
+import {
+  PluginIdSchema,
+  type PluginInstallation,
+  type PluginSourceStatusItem,
+  type PluginUpdatePreview,
+  type PluginUpdateProposal,
+  type PluginUpdateSelection,
+  type PluginUpdateTarget,
+} from "@getpaseo/protocol/messages";
 import { runGitCommand } from "../../utils/run-git-command.js";
 import { ensurePrivateDirectory, writePrivateFileAtomicSync } from "../private-files.js";
-import { readPluginManifest } from "./manifest.js";
-import type { PluginManifest } from "./manifest.js";
+import { readPluginManifest, type PluginManifest } from "./manifest.js";
+import { acquireNpm, isNpmSource, readNpmArtifact, resolveNpm } from "./managed-source/npm.js";
 
 const GIT_TIMEOUT_MS = 120_000;
 const GIT_ENV = { GIT_TERMINAL_PROMPT: "0" } as const;
-
-const ManagedPluginRecordSchema = z
-  .object({
+// COMPAT(plugin-source-record): v0.8.0; accept and strip pre-correction selector/revision/root copies until daemon floor supports artifact-derived metadata.
+const ManagedPluginRecordSchema = z.union([
+  z.object({
+    kind: z.literal("git").default("git"),
     remote: z.string().min(1),
-    requestedRef: z.string().min(1).nullable(),
-    trackingBranch: z.string().min(1).nullable(),
-    commit: z.string().regex(/^[0-9a-f]{40,64}$/),
-    pluginPath: z.string(),
-    checkoutRoot: z.string().min(1),
-  })
-  .strict();
-
-const ManagedPluginRecordsSchema = z.record(PluginIdSchema, ManagedPluginRecordSchema);
-
-export interface ManagedPluginRecord extends z.infer<typeof ManagedPluginRecordSchema> {}
-
+    registry: PluginRegistryIdentitySchema.optional(),
+  }),
+  z.object({ kind: z.literal("npm"), registry: PluginRegistryIdentitySchema.optional() }),
+]);
+export type ManagedPluginRecord = z.infer<typeof ManagedPluginRecordSchema>;
 export interface ManagedPluginCandidate {
   build: PluginManifest["build"];
   defaultId: string;
   directory: string;
   record: ManagedPluginRecord;
   versionRoot: string;
+  target?: PluginUpdateTarget;
 }
-
 interface InstallInput {
   source: string;
   ref?: string;
   pluginPath?: string;
 }
-
-interface RefResolution {
-  commit: string;
-  requestedRef: string | null;
-  trackingBranch: string | null;
+interface OwnedLocation {
+  versionRoot: string;
+  sourceRoot: string;
+  identity: PluginInstallation["identity"];
 }
 
 export class ManagedPluginSources {
   private readonly root: string;
   private readonly metadataPath: string;
   private readonly records: Record<string, ManagedPluginRecord>;
-
-  constructor(paseoHome: string) {
-    this.root = path.join(paseoHome, "plugins");
+  constructor(
+    paseoHome: string,
+    private readonly registryOptions: RegistryOptions = {},
+  ) {
+    this.root = path.resolve(paseoHome, "plugins");
     this.metadataPath = path.join(this.root, "sources.json");
-    this.records = this.readRecords();
+    this.records = existsSync(this.metadataPath)
+      ? z
+          .record(PluginIdSchema, ManagedPluginRecordSchema)
+          .parse(JSON.parse(readFileSync(this.metadataPath, "utf8")))
+      : {};
   }
 
-  get(pluginId: string): ManagedPluginRecord | null {
-    return this.records[pluginId] ?? null;
-  }
-
-  displayRemote(pluginId: string): string | null {
-    const remote = this.records[pluginId]?.remote;
-    return remote ? redactRemoteCredentials(remote) : null;
-  }
-
-  async prepareInstall(input: InstallInput): Promise<ManagedPluginCandidate> {
-    const remote = normalizeGitSource(input.source);
-    const pluginPath = normalizePluginPath(input.pluginPath);
-    const stagingRoot = await this.createStagingRoot();
-    try {
-      const checkoutRoot = path.join(stagingRoot, "checkout");
-      await clone(remote, checkoutRoot);
-      const resolution = await resolveRequestedRef(checkoutRoot, input.ref);
-      await checkout(checkoutRoot, resolution.commit);
-      const directory = path.resolve(checkoutRoot, pluginPath);
-      assertPluginPath(checkoutRoot, directory);
-      const { id: defaultId, build } = await readPluginManifest(directory);
+  private locate(
+    pluginId: string,
+    configuredPath: string,
+    record = this.records[pluginId],
+  ): OwnedLocation {
+    if (!record) throw new Error(`Plugin is a local directory: ${pluginId}`);
+    const pluginRoot = path.join(this.root, PluginIdSchema.parse(pluginId));
+    const parts = path.relative(pluginRoot, path.resolve(configuredPath)).split(path.sep);
+    // COMPAT(plugin-git-layout): added in v0.8.0; retain while pre-correction installations exist.
+    // Git originally used <12-hex-commit>-<uuid>; the prefix is a directory name, never revision truth.
+    const versionId =
+      record.kind === "git" ? (parts[0] ?? "").replace(/^[0-9a-f]{12}-/, "") : (parts[0] ?? "");
+    if (
+      !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(versionId) ||
+      parts.some((part) => part === "..")
+    )
+      throw new Error(`Plugin directory is outside its managed installation: ${pluginId}`);
+    const versionRoot = path.join(pluginRoot, parts[0]!);
+    if (record.kind === "git") {
+      if (parts[1] !== "checkout")
+        throw new Error(`Invalid Git installation directory: ${pluginId}`);
       return {
-        build,
-        defaultId,
-        directory,
-        record: {
-          remote,
-          requestedRef: resolution.requestedRef,
-          trackingBranch: resolution.trackingBranch,
-          commit: resolution.commit,
-          pluginPath,
-          checkoutRoot,
+        versionRoot,
+        sourceRoot: path.join(versionRoot, "checkout"),
+        identity: {
+          kind: "git",
+          ...(record.registry ? { registry: record.registry } : {}),
+          remote: redactRemoteCredentials(record.remote),
+          pluginPath: parts.slice(2).join("/") || ".",
         },
-        versionRoot: stagingRoot,
       };
+    }
+    if (parts[1] !== "node_modules" || !parts[2])
+      throw new Error(`Invalid npm installation directory: ${pluginId}`);
+    const packageParts = parts[2].startsWith("@") ? 2 : 1;
+    const packageName = parts.slice(2, 2 + packageParts).join("/");
+    if (!isNpmSource(packageName)) throw new Error(`Invalid npm package directory: ${pluginId}`);
+    return {
+      versionRoot,
+      sourceRoot: path.join(versionRoot, "node_modules", packageName),
+      identity: {
+        kind: "npm",
+        ...(record.registry ? { registry: record.registry } : {}),
+        packageName,
+        pluginPath: parts.slice(2 + packageParts).join("/") || ".",
+      },
+    };
+  }
+
+  async describe(pluginId: string, configuredPath: string): Promise<PluginInstallation> {
+    if (!this.records[pluginId])
+      return { identity: { kind: "directory", path: path.resolve(configuredPath) } };
+    const location = this.locate(pluginId, configuredPath);
+    try {
+      return {
+        identity: location.identity,
+        currentRevision: await this.revision(location, configuredPath),
+      };
+    } catch {
+      return { identity: location.identity };
+    }
+  }
+
+  private async revision(location: OwnedLocation, configuredPath: string): Promise<string> {
+    await assertRealContainment(this.root, location.versionRoot);
+    await assertRealContainment(location.versionRoot, configuredPath);
+    return location.identity.kind === "npm"
+      ? (await readNpmArtifact(location.versionRoot, location.identity.packageName)).version
+      : revParse(location.sourceRoot, "HEAD");
+  }
+
+  async prepareInstall(
+    input: InstallInput,
+    target?: PluginUpdateTarget,
+  ): Promise<ManagedPluginCandidate> {
+    const registry = parsePluginRegistryReference(input.source, this.registryOptions.defaultUrl);
+    if (registry) {
+      if (input.ref)
+        throw new Error(
+          "Registry installs pin the reviewed revision. Drop --ref, or install from an explicit github:owner/repository source to choose a revision.",
+        );
+      if (input.pluginPath)
+        throw new Error("Registry sources use their reviewed artifact path and revision");
+      const resolved = await resolveRegistryPlugin(registry, this.registryOptions, true);
+      const candidate = await this.prepareInstall(resolved.input, resolved.target);
+      return { ...candidate, record: { ...candidate.record, registry } };
+    }
+    const pluginPath = normalizePluginPath(input.pluginPath);
+    const versionRoot = await this.createStagingRoot();
+    try {
+      let record: ManagedPluginRecord;
+      let sourceRoot: string;
+      if (isNpmSource(input.source)) {
+        if (input.ref)
+          throw new Error(
+            "Plugin --ref is only valid for Git sources; use npm:package@version for npm",
+          );
+        const artifact = await acquireNpm(
+          input.source,
+          versionRoot,
+          target?.kind === "npm" ? target : undefined,
+        );
+        sourceRoot = path.join(versionRoot, "node_modules", artifact.packageName);
+        record = { kind: "npm" };
+      } else {
+        const remote = normalizeGitSource(input.source);
+        sourceRoot = path.join(versionRoot, "checkout");
+        await clone(remote, sourceRoot);
+        const commit = await resolveRequestedRef(sourceRoot, input.ref);
+        if (target?.kind === "git" && commit !== target.commit)
+          throw new Error("Git target changed since review");
+        await checkout(sourceRoot, commit);
+        record = { kind: "git", remote };
+      }
+      const directory = path.resolve(sourceRoot, pluginPath);
+      assertPluginPath(sourceRoot, directory);
+      await assertRealContainment(sourceRoot, directory);
+      const { id: defaultId, build } = await readPluginManifest(directory);
+      return { build, defaultId, directory, record, versionRoot, ...(target ? { target } : {}) };
     } catch (error) {
-      await rm(stagingRoot, { recursive: true, force: true });
+      await rm(versionRoot, { recursive: true, force: true });
       throw error;
     }
   }
@@ -103,146 +201,257 @@ export class ManagedPluginSources {
     pluginId: string,
     candidate: ManagedPluginCandidate,
   ): Promise<ManagedPluginCandidate> {
-    const pluginRoot = path.join(this.root, pluginId);
+    const pluginRoot = path.join(this.root, PluginIdSchema.parse(pluginId));
     ensurePrivateDirectory(pluginRoot);
-    const versionRoot = path.join(
-      pluginRoot,
-      `${candidate.record.commit.slice(0, 12)}-${randomUUID()}`,
-    );
+    await assertRealContainment(this.root, pluginRoot);
+    const versionRoot = path.join(pluginRoot, randomUUID());
+    const relativeDirectory = path.relative(candidate.versionRoot, candidate.directory);
     await rename(candidate.versionRoot, versionRoot);
-    const checkoutRoot = path.join(versionRoot, "checkout");
-    const directory = path.resolve(checkoutRoot, candidate.record.pluginPath);
+    return { ...candidate, directory: path.join(versionRoot, relativeDirectory), versionRoot };
+  }
+
+  async preview(
+    pluginId: string,
+    configuredPath: string,
+    selection?: PluginUpdateSelection,
+  ): Promise<PluginUpdatePreview> {
+    const current = await this.describe(pluginId, configuredPath);
+    if (current.identity.kind === "directory") {
+      if (selection) throw new Error(`Plugin is a local directory: ${pluginId}`);
+      return { id: pluginId, outcome: "local", current, links: [] };
+    }
+    if (!current.currentRevision)
+      throw new Error(
+        `Installed revision is unavailable for ${pluginId}; restore its acquisition artifacts before updating`,
+      );
+    if (selection && selection.kind !== current.identity.kind)
+      throw new Error(`Update target does not match ${current.identity.kind} source: ${pluginId}`);
+    const location = this.locate(pluginId, configuredPath);
+    let target: PluginUpdateTarget;
+    let outcome: PluginUpdatePreview["outcome"];
+    if (current.identity.registry) {
+      if (selection) throw new Error("Registry updates use only the reviewed registry pin");
+      const resolved = await resolveRegistryPlugin(
+        current.identity.registry,
+        this.registryOptions,
+        false,
+      );
+      assertRegistryArtifactIdentity(current.identity, resolved.artifact);
+      target = resolved.target;
+      const revision = target.kind === "npm" ? target.version : target.commit;
+      outcome = revision === current.currentRevision ? "current" : "update";
+    } else if (current.identity.kind === "npm") {
+      target = {
+        kind: "npm",
+        ...(await resolveNpm(
+          current.identity.packageName,
+          selection?.kind === "npm" ? selection.version : "latest",
+          this.root,
+        )),
+      };
+      outcome = npmUpdateOutcome(target.version, current.currentRevision, selection);
+    } else {
+      const record = this.records[pluginId];
+      if (record?.kind !== "git") throw new Error("Git source is no longer configured");
+      target = {
+        kind: "git",
+        commit: await resolveRemoteCommit(
+          record.remote,
+          this.root,
+          selection?.kind === "git" ? selection.ref : undefined,
+        ),
+      };
+      outcome = target.commit === current.currentRevision ? "current" : "update";
+    }
+    const links = reviewLinks(current, target);
     return {
-      ...candidate,
-      directory,
-      versionRoot,
-      record: { ...candidate.record, checkoutRoot },
+      id: pluginId,
+      outcome,
+      current,
+      target,
+      links,
+      ...(outcome === "update"
+        ? {
+            proposal: {
+              id: pluginId,
+              expected: {
+                identity: current.identity,
+                installationRoot: location.versionRoot,
+                revision: current.currentRevision,
+              },
+              target,
+            },
+          }
+        : {}),
     };
   }
 
-  async status(pluginId: string, configuredPath: string): Promise<PluginSourceStatusItem> {
-    const record = this.records[pluginId];
-    if (!record) return { id: pluginId, source: "directory", path: configuredPath };
-    if (!record.trackingBranch) {
-      return {
-        id: pluginId,
-        source: "git",
-        path: configuredPath,
-        remote: redactRemoteCredentials(record.remote),
-        ref: record.requestedRef ?? record.commit,
-        currentCommit: record.commit,
-        latestCommit: record.commit,
-        commitsBehind: 0,
-        updateAvailable: false,
-      };
-    }
-    await fetchOrigin(record.checkoutRoot);
-    const latestCommit = await revParse(
-      record.checkoutRoot,
-      `refs/remotes/origin/${record.trackingBranch}^{commit}`,
-    );
-    const commitsBehind = await countCommits(record.checkoutRoot, record.commit, latestCommit);
-    return {
-      id: pluginId,
-      source: "git",
-      path: configuredPath,
-      remote: redactRemoteCredentials(record.remote),
-      ref: record.requestedRef ?? record.trackingBranch,
-      currentCommit: record.commit,
-      latestCommit,
-      commitsBehind,
-      updateAvailable: latestCommit !== record.commit,
-    };
+  async assertCurrent(proposal: PluginUpdateProposal, configuredPath: string): Promise<void> {
+    const current = await this.describe(proposal.id, configuredPath);
+    const location = this.locate(proposal.id, configuredPath);
+    if (
+      !isDeepStrictEqual(current.identity, proposal.expected.identity) ||
+      current.currentRevision !== proposal.expected.revision ||
+      location.versionRoot !== proposal.expected.installationRoot
+    )
+      throw new Error(`Plugin ${proposal.id} changed since review; check again`);
+    if (proposal.target.kind !== current.identity.kind)
+      throw new Error("Update target does not match the installed source");
   }
 
   async prepareUpdate(
-    pluginId: string,
+    proposal: PluginUpdateProposal,
     configuredPath: string,
-  ): Promise<{ candidate: ManagedPluginCandidate | null; commits: number }> {
-    const record = this.records[pluginId];
-    if (!record) throw new Error(`Plugin is not managed by Git: ${pluginId}`);
-    const status = await this.status(pluginId, configuredPath);
-    const latestCommit = status.latestCommit;
-    if (!latestCommit || latestCommit === record.commit) return { candidate: null, commits: 0 };
-    const candidate = await this.prepareCommit(record, latestCommit);
-    return { candidate, commits: status.commitsBehind ?? 0 };
+  ): Promise<ManagedPluginCandidate> {
+    await this.assertCurrent(proposal, configuredPath);
+    const identity = this.locate(proposal.id, configuredPath).identity;
+    const record = this.records[proposal.id];
+    if (identity.kind !== "directory" && identity.registry) {
+      const resolved = await resolveRegistryPlugin(identity.registry, this.registryOptions, false);
+      assertRegistryArtifactIdentity(identity, resolved.artifact);
+      if (!isDeepStrictEqual(resolved.target, proposal.target))
+        throw new Error("Registry pin changed since review; check again");
+      const candidate = await this.prepareInstall(resolved.input, proposal.target);
+      return { ...candidate, record: { ...candidate.record, registry: identity.registry } };
+    }
+    if (identity.kind === "git" && record?.kind === "git" && proposal.target.kind === "git")
+      return this.prepareInstall(
+        {
+          source: `git:${record.remote}`,
+          ref: proposal.target.commit,
+          pluginPath: identity.pluginPath,
+        },
+        proposal.target,
+      );
+    if (identity.kind === "npm" && proposal.target.kind === "npm")
+      return this.prepareInstall(
+        {
+          source: `npm:${identity.packageName}@${proposal.target.version}`,
+          pluginPath: identity.pluginPath,
+        },
+        proposal.target,
+      );
+    throw new Error("Update target does not match the installed source");
+  }
+
+  async verifyCandidate(
+    pluginId: string,
+    candidate: ManagedPluginCandidate,
+    target?: PluginUpdateTarget,
+  ): Promise<void> {
+    target ??= candidate.target;
+    const location = this.locate(pluginId, candidate.directory, candidate.record);
+    const revision = await this.revision(location, candidate.directory);
+    if (target?.kind === "git" && revision !== target.commit)
+      throw new Error("Preparation changed the reviewed Git commit");
+    if (target?.kind === "npm" && location.identity.kind === "npm") {
+      const artifact = await readNpmArtifact(location.versionRoot, location.identity.packageName);
+      if (
+        artifact.version !== target.version ||
+        artifact.integrity !== target.integrity ||
+        artifact.resolved !== target.resolved
+      )
+        throw new Error("Preparation changed the reviewed npm artifact");
+    }
+  }
+
+  async status(pluginId: string, configuredPath: string): Promise<PluginSourceStatusItem> {
+    const preview = await this.preview(pluginId, configuredPath);
+    const installation = preview.current!;
+    return {
+      id: pluginId,
+      source: installation.identity.kind === "git" ? "git" : "directory",
+      path: configuredPath,
+      installation,
+      ...(installation.identity.kind === "git"
+        ? {
+            remote: installation.identity.remote,
+            currentCommit: installation.currentRevision,
+            latestCommit: preview.target?.kind === "git" ? preview.target.commit : undefined,
+            updateAvailable: preview.outcome === "update",
+          }
+        : {}),
+    };
   }
 
   commit(pluginId: string, record: ManagedPluginRecord): void {
-    this.records[pluginId] = record;
+    this.records[pluginId] = ManagedPluginRecordSchema.parse(record);
     this.writeRecords();
   }
-
   async discard(candidate: ManagedPluginCandidate): Promise<void> {
     await rm(candidate.versionRoot, { recursive: true, force: true });
   }
-
-  async removeVersion(record: ManagedPluginRecord): Promise<void> {
-    const versionRoot = path.dirname(record.checkoutRoot);
-    const pluginRoot = path.dirname(versionRoot);
-    const expectedRoot = path.resolve(this.root);
-    if (path.dirname(pluginRoot) !== expectedRoot) {
-      throw new Error(
-        `Managed plugin checkout is outside the plugin store: ${record.checkoutRoot}`,
-      );
-    }
-    await rm(versionRoot, { recursive: true, force: true });
+  async removeVersion(pluginId: string, configuredPath: string): Promise<void> {
+    const location = this.locate(pluginId, configuredPath);
+    await assertRealContainment(this.root, path.dirname(location.versionRoot));
+    await rm(location.versionRoot, { recursive: true, force: true });
   }
-
   async remove(pluginId: string): Promise<void> {
     if (!this.records[pluginId]) return;
+    const pluginRoot = path.join(this.root, PluginIdSchema.parse(pluginId));
+    if (existsSync(pluginRoot)) {
+      await assertRealContainment(this.root, pluginRoot);
+      await rm(pluginRoot, { recursive: true, force: true });
+    }
     delete this.records[pluginId];
     this.writeRecords();
-    await rm(path.join(this.root, pluginId), { recursive: true, force: true });
   }
-
-  private async prepareCommit(
-    record: ManagedPluginRecord,
-    commit: string,
-  ): Promise<ManagedPluginCandidate> {
-    const stagingRoot = await this.createStagingRoot();
-    try {
-      const checkoutRoot = path.join(stagingRoot, "checkout");
-      await clone(record.remote, checkoutRoot);
-      const resolvedCommit = await revParse(checkoutRoot, `${commit}^{commit}`);
-      if (resolvedCommit !== commit)
-        throw new Error(`Git source no longer contains commit ${commit}`);
-      await checkout(checkoutRoot, commit);
-      const directory = path.resolve(checkoutRoot, record.pluginPath);
-      assertPluginPath(checkoutRoot, directory);
-      const { id: defaultId, build } = await readPluginManifest(directory);
-      return {
-        build,
-        defaultId,
-        directory,
-        versionRoot: stagingRoot,
-        record: { ...record, commit, checkoutRoot },
-      };
-    } catch (error) {
-      await rm(stagingRoot, { recursive: true, force: true });
-      throw error;
-    }
-  }
-
   private async createStagingRoot(): Promise<string> {
     const stagingRoot = path.join(this.root, ".staging", randomUUID());
     await mkdir(stagingRoot, { recursive: true, mode: 0o700 });
+    await assertRealContainment(this.root, stagingRoot);
     return stagingRoot;
   }
-
-  private readRecords(): Record<string, ManagedPluginRecord> {
-    if (!existsSync(this.metadataPath)) return {};
-    return ManagedPluginRecordsSchema.parse(JSON.parse(readFileSync(this.metadataPath, "utf8")));
-  }
-
   private writeRecords(): void {
     writePrivateFileAtomicSync(this.metadataPath, `${JSON.stringify(this.records, null, 2)}\n`);
   }
 }
 
+async function assertRealContainment(root: string, directory: string): Promise<void> {
+  assertPluginPath(await realpath(root), await realpath(directory));
+}
+function reviewLinks(current: PluginInstallation, target: PluginUpdateTarget): string[] {
+  if (
+    current.identity.kind === "npm" &&
+    target.kind === "npm" &&
+    new URL(target.resolved).hostname === "registry.npmjs.org"
+  )
+    return [current.currentRevision, target.version].map(
+      (version) =>
+        `https://www.npmjs.com/package/${current.identity.kind === "npm" ? current.identity.packageName : ""}/v/${encodeURIComponent(version!)}`,
+    );
+  if (current.identity.kind !== "git" || target.kind !== "git") return [];
+  const remote = current.identity.remote
+    .replace(/^git@([^:]+):/, "https://$1/")
+    .replace(/^ssh:\/\/(?:git@)?/, "https://")
+    .replace(/\.git$/, "");
+  try {
+    const url = new URL(remote);
+    if (url.hostname === "github.com")
+      return [`${url.origin}${url.pathname}/compare/${current.currentRevision}...${target.commit}`];
+    if (url.hostname === "gitlab.com")
+      return [
+        `${url.origin}${url.pathname}/-/compare/${current.currentRevision}...${target.commit}`,
+      ];
+  } catch {
+    /* Local remotes have no review website. */
+  }
+  return [];
+}
+/** Only explicit Git prefixes expand GitHub shorthand. */
 function normalizeGitSource(source: string): string {
+  const expandsShorthand = source.startsWith("github:") || source.startsWith("git:");
+  if (source.startsWith("github:")) {
+    const shorthand = source.slice(7);
+    if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(shorthand)) {
+      throw new Error("Use github:owner/repository for a GitHub plugin source");
+    }
+    source = shorthand;
+  } else if (source.startsWith("git:") && !source.startsWith("git://")) {
+    source = source.slice(4);
+  }
   const github = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(source);
-  if (github) {
+  if (github && expandsShorthand) {
     const repository = github[2].replace(/\.git$/, "");
     return `https://github.com/${github[1]}/${repository}.git`;
   }
@@ -337,29 +546,70 @@ async function checkout(checkoutRoot: string, commit: string): Promise<void> {
 async function resolveRequestedRef(
   checkoutRoot: string,
   requestedRef: string | undefined,
-): Promise<RefResolution> {
-  if (!requestedRef) {
-    const { stdout } = await runGitCommand(
-      ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"],
-      { cwd: checkoutRoot },
-    );
-    const trackingBranch = stdout.trim().replace(/^origin\//, "");
-    const commit = await revParse(checkoutRoot, `refs/remotes/origin/${trackingBranch}^{commit}`);
-    return { commit, requestedRef: null, trackingBranch };
-  }
+): Promise<string> {
+  if (!requestedRef) return revParse(checkoutRoot, "refs/remotes/origin/HEAD^{commit}");
   if (requestedRef.startsWith("-")) throw new Error("Plugin Git ref cannot start with '-'");
-  const branchRef = `refs/remotes/origin/${requestedRef}`;
-  if (await refExists(checkoutRoot, branchRef)) {
-    const commit = await revParse(checkoutRoot, `${branchRef}^{commit}`);
-    return { commit, requestedRef, trackingBranch: requestedRef };
+  for (const ref of [
+    `refs/remotes/origin/${requestedRef}`,
+    `refs/tags/${requestedRef}`,
+    requestedRef,
+  ]) {
+    if (await refExists(checkoutRoot, ref)) return revParse(checkoutRoot, `${ref}^{commit}`);
   }
-  const tagRef = `refs/tags/${requestedRef}`;
-  if (await refExists(checkoutRoot, tagRef)) {
-    const commit = await revParse(checkoutRoot, `${tagRef}^{commit}`);
-    return { commit, requestedRef, trackingBranch: null };
+  return revParse(checkoutRoot, `${requestedRef}^{commit}`);
+}
+async function resolveRemoteCommit(remote: string, cwd: string, ref?: string): Promise<string> {
+  if (ref?.startsWith("-")) throw new Error("Plugin Git ref cannot start with '-'");
+  if (ref && /^[0-9a-f]{40,64}$/.test(ref)) return ref;
+  const publicRemote = redactRemoteCredentials(remote);
+  const cloneRemote = publicRemote === remote ? remote : "https://paseo.invalid/plugin.git";
+  const envOverlay =
+    cloneRemote === remote
+      ? GIT_ENV
+      : {
+          ...GIT_ENV,
+          GIT_CONFIG_COUNT: "1",
+          GIT_CONFIG_KEY_0: `url.${remote}.insteadOf`,
+          GIT_CONFIG_VALUE_0: cloneRemote,
+        };
+  try {
+    const names = ref
+      ? [`refs/heads/${ref}`, `refs/tags/${ref}^{}`, `refs/tags/${ref}`, ref]
+      : ["HEAD"];
+    const { stdout } = await runGitCommand(["ls-remote", "--symref", "--", cloneRemote, ...names], {
+      cwd,
+      envOverlay,
+      timeout: GIT_TIMEOUT_MS,
+    });
+    const entries = new Map(
+      stdout
+        .trim()
+        .split("\n")
+        .map((line) => {
+          const [commit, name] = line.split("\t");
+          return [name, commit];
+        }),
+    );
+    for (const name of names) {
+      const commit = entries.get(name);
+      if (commit && /^[0-9a-f]{40,64}$/.test(commit)) return commit;
+    }
+    if (ref) {
+      // Abbreviated commits and revision expressions are not advertised by ls-remote.
+      // Resolve them in a temporary object database without preparing or touching the installed plugin.
+      const staging = path.join(cwd, ".staging", randomUUID());
+      await mkdir(staging, { recursive: true, mode: 0o700 });
+      try {
+        await clone(remote, path.join(staging, "checkout"));
+        return await resolveRequestedRef(path.join(staging, "checkout"), ref);
+      } finally {
+        await rm(staging, { recursive: true, force: true });
+      }
+    }
+    throw new Error("Cannot resolve Git default HEAD");
+  } catch (error) {
+    throw redactRemoteError(error, remote);
   }
-  const commit = await revParse(checkoutRoot, `${requestedRef}^{commit}`);
-  return { commit, requestedRef, trackingBranch: null };
 }
 
 async function refExists(cwd: string, ref: string): Promise<boolean> {
@@ -375,16 +625,28 @@ async function revParse(cwd: string, ref: string): Promise<string> {
   return stdout.trim();
 }
 
-async function fetchOrigin(cwd: string): Promise<void> {
-  await runGitCommand(["fetch", "--prune", "--tags", "origin"], {
-    cwd,
-    envOverlay: GIT_ENV,
-    timeout: GIT_TIMEOUT_MS,
-  });
+function assertRegistryArtifactIdentity(
+  identity: Exclude<PluginInstallation["identity"], { kind: "directory" }>,
+  artifact: Awaited<ReturnType<typeof resolveRegistryPlugin>>["artifact"],
+): void {
+  const matches =
+    identity.kind === "npm" && artifact.kind === "npm"
+      ? identity.packageName === artifact.package && identity.pluginPath === "."
+      : identity.kind === "git" &&
+        artifact.kind === "git" &&
+        identity.remote === redactRemoteCredentials(artifact.remote) &&
+        identity.pluginPath === (artifact.pluginPath ?? ".");
+  if (!matches)
+    throw new Error("Registry artifact source changed; reinstall to approve the new source");
 }
 
-async function countCommits(cwd: string, current: string, latest: string): Promise<number> {
-  if (current === latest) return 0;
-  const { stdout } = await runGitCommand(["rev-list", "--count", `${current}..${latest}`], { cwd });
-  return Number.parseInt(stdout.trim(), 10);
+function npmUpdateOutcome(
+  version: string,
+  current: string,
+  selection: PluginUpdateSelection | undefined,
+): PluginUpdatePreview["outcome"] {
+  const comparison = compareVersions(version, current);
+  if (comparison === 0) return "current";
+  if (comparison < 0 && !selection) return "installed-newer";
+  return "update";
 }
diff --git a/packages/server/src/server/plugins/managed-source/npm.ts b/packages/server/src/server/plugins/managed-source/npm.ts
new file mode 100644
index 0000000000..315bbc981e
--- /dev/null
+++ b/packages/server/src/server/plugins/managed-source/npm.ts
@@ -0,0 +1,157 @@
+import compareVersions from "semver/functions/compare.js";
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { z } from "zod";
+
+import { execCommand } from "../../../utils/spawn.js";
+import { findExecutable } from "../../../executable-resolution/executable-resolution.js";
+
+const LockfileSchema = z.object({
+  lockfileVersion: z.number().min(2),
+  packages: z.record(
+    z.string(),
+    z.object({
+      version: z.string().optional(),
+      resolved: z.string().optional(),
+      integrity: z.string().optional(),
+    }),
+  ),
+});
+
+const NPM_SOURCE_PATTERN =
+  /^(?<name>(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*)(?:@(?<spec>[^:@/\\]+))?$/;
+
+export function isNpmSource(source: string): boolean {
+  return source.startsWith("npm:") || NPM_SOURCE_PATTERN.test(source);
+}
+
+function parseNpmSource(source: string): { packageName: string; requestedSpec: string } {
+  const spec = source.replace(/^npm:/, "");
+  const match = NPM_SOURCE_PATTERN.exec(spec);
+  if (!match?.groups) {
+    throw new Error(
+      `Invalid npm plugin source: ${source}. Use npm:package or npm:@scope/package@version, tag, or range.`,
+    );
+  }
+  const requestedSpec = match.groups.spec ?? "latest";
+  if (!requestedSpec.trim() || requestedSpec !== requestedSpec.trim()) {
+    throw new Error("An npm version, tag, or range must be non-empty without surrounding spaces");
+  }
+  return { packageName: match.groups.name, requestedSpec };
+}
+
+export async function acquireNpm(source: string, installRoot: string, target?: NpmArtifact) {
+  const { packageName, requestedSpec } = parseNpmSource(source);
+  await writeFile(
+    path.join(installRoot, "package.json"),
+    JSON.stringify({
+      name: "paseo-plugin-installation",
+      version: "1.0.0",
+      private: true,
+      dependencies: { [packageName]: target?.resolved ?? requestedSpec },
+    }),
+  );
+  const npm = await requireNpm();
+  await execCommand(
+    npm,
+    [
+      "install",
+      "--ignore-scripts",
+      "--legacy-peer-deps",
+      "--no-audit",
+      "--no-fund",
+      "--package-lock=true",
+      "--lockfile-version=3",
+      "--include=prod",
+      "--omit=dev",
+      "--global=false",
+      "--workspaces=false",
+    ],
+    { cwd: installRoot, timeout: 120_000, maxBuffer: 1024 * 1024 },
+  );
+  const installed = await readNpmArtifact(installRoot, packageName);
+  if (
+    target &&
+    (installed.version !== target.version ||
+      installed.integrity !== target.integrity ||
+      installed.resolved !== target.resolved)
+  ) {
+    throw new Error(`npm artifact changed since review for ${packageName}`);
+  }
+  return { packageName, ...installed };
+}
+
+export interface NpmArtifact {
+  version: string;
+  resolved: string;
+  integrity: string;
+}
+
+export async function readNpmArtifact(
+  installRoot: string,
+  packageName: string,
+): Promise<NpmArtifact> {
+  const lock = LockfileSchema.parse(
+    JSON.parse(await readFile(path.join(installRoot, "package-lock.json"), "utf8")),
+  );
+  const artifact = lock.packages[`node_modules/${packageName}`];
+  if (!artifact?.version || !artifact.resolved || !artifact.integrity)
+    throw new Error(`Missing npm artifact for ${packageName}`);
+  const installed = z
+    .object({ name: z.string(), version: z.string() })
+    .parse(
+      JSON.parse(
+        await readFile(path.join(installRoot, "node_modules", packageName, "package.json"), "utf8"),
+      ),
+    );
+  const root = z
+    .object({ dependencies: z.record(z.string(), z.string()) })
+    .parse(JSON.parse(await readFile(path.join(installRoot, "package.json"), "utf8")));
+  if (
+    Object.keys(root.dependencies).length !== 1 ||
+    !(packageName in root.dependencies) ||
+    installed.name !== packageName ||
+    installed.version !== artifact.version
+  ) {
+    throw new Error(
+      `Installed npm package does not match its acquisition artifacts: ${packageName}`,
+    );
+  }
+  return { version: artifact.version, resolved: artifact.resolved, integrity: artifact.integrity };
+}
+
+export async function resolveNpm(
+  packageName: string,
+  selector: string,
+  cwd: string,
+): Promise<NpmArtifact> {
+  // Validate selectors using the same grammar as installation; never interpret an update as another source.
+  parseNpmSource(`npm:${packageName}@${selector}`);
+  const { stdout } = await execCommand(
+    await requireNpm(),
+    ["view", `${packageName}@${selector}`, "version", "dist", "--json"],
+    { cwd, timeout: 120_000, maxBuffer: 1024 * 1024 },
+  );
+  const schema = z.object({
+    version: z.string(),
+    dist: z.object({ tarball: z.string().url(), integrity: z.string().min(1) }),
+  });
+  const raw: unknown = JSON.parse(stdout);
+  const entries = z.array(schema).parse(Array.isArray(raw) ? raw : [raw]);
+  const latest = entries.sort((a, b) => compareVersions(b.version, a.version))[0];
+  if (!latest) throw new Error(`No npm version matches ${packageName}@${selector}`);
+  return {
+    version: latest.version,
+    resolved: latest.dist.tarball,
+    integrity: latest.dist.integrity,
+  };
+}
+
+async function requireNpm(): Promise<string> {
+  const npm = await findExecutable("npm");
+  if (!npm)
+    throw new Error(
+      "npm is required on the daemon host to acquire or check npm plugins. Install Node.js with npm and make npm available on the daemon's PATH.",
+    );
+  return npm;
+}
diff --git a/packages/server/src/server/plugins/managed-source/registry.ts b/packages/server/src/server/plugins/managed-source/registry.ts
new file mode 100644
index 0000000000..009cac5a68
--- /dev/null
+++ b/packages/server/src/server/plugins/managed-source/registry.ts
@@ -0,0 +1,77 @@
+import {
+  PluginRegistryArtifactSchema,
+  PluginRegistryIdSchema,
+  type PluginRegistries,
+  type PluginRegistryIdentity,
+} from "@getpaseo/protocol/plugin-registry";
+import type { PluginUpdateTarget } from "@getpaseo/protocol/messages";
+import { z } from "zod";
+
+// Install reads only these fields; the rest of a published plugin is the directory's display data.
+const RegistryInstallDocumentSchema = z.object({
+  id: PluginRegistryIdSchema,
+  artifact: PluginRegistryArtifactSchema,
+});
+
+export interface RegistryOptions {
+  defaultUrl?: string;
+  registries?: PluginRegistries;
+}
+export async function resolveRegistryPlugin(
+  identity: PluginRegistryIdentity,
+  options: RegistryOptions,
+  install: boolean,
+) {
+  const base = new URL(identity.url);
+  if (!["http:", "https:"].includes(base.protocol) || base.username || base.password)
+    throw new Error("Registry base must be an HTTP(S) URL without credentials");
+  const authorization = options.registries?.[base.host]?.authorization;
+  if (
+    authorization &&
+    base.protocol !== "https:" &&
+    !["localhost", "127.0.0.1", "[::1]"].includes(base.hostname)
+  )
+    throw new Error("Registry credentials require HTTPS");
+  const headers: Record<string, string> = {};
+  if (authorization) headers.Authorization = authorization;
+  if (install) headers["X-Paseo-Install"] = "1";
+  const url = `${identity.url.replace(/\/+$/, "")}/plugins/${identity.id}.json`;
+  let response: Response;
+  try {
+    response = await fetch(url, {
+      headers,
+      redirect: "error",
+      signal: AbortSignal.timeout(30000),
+    });
+  } catch (cause) {
+    const guidance = install
+      ? `Plugin ${identity.id} was not installed. Retry or use an explicit npm: or github: source.`
+      : `Could not check updates for ${identity.id}. Retry later.`;
+    throw new Error(`Could not reach plugin registry ${url}. ${guidance}`, { cause });
+  }
+  if (response.status === 404) {
+    const guidance = install
+      ? `If you intended a local directory, use ./${identity.id}. If you intended a GitHub source, use git:${identity.id}, or a full Git URL for another Git host.`
+      : "Check that the installed plugin is still published in this registry before updating.";
+    throw new Error(`Plugin ${identity.id} was not found in registry ${base.host}. ${guidance}`);
+  }
+  if (!response.ok)
+    throw new Error(`Registry ${base.host} returned ${response.status} for ${identity.id}`);
+  const plugin = RegistryInstallDocumentSchema.parse(await response.json());
+  if (plugin.id !== identity.id) throw new Error("Registry returned a different plugin ID");
+  const artifact = plugin.artifact;
+  const target: PluginUpdateTarget =
+    artifact.kind === "npm"
+      ? {
+          kind: "npm",
+          version: artifact.version,
+          resolved: artifact.resolved,
+          integrity: artifact.integrity,
+        }
+      : { kind: "git", commit: artifact.commit };
+  const input =
+    artifact.kind === "npm"
+      ? { source: `npm:${artifact.package}@${artifact.version}` }
+      : { source: `git:${artifact.remote}`, ref: artifact.commit, pluginPath: artifact.pluginPath };
+  return { input, target, artifact };
+}
diff --git a/packages/server/src/server/plugins/manifest.test.ts b/packages/server/src/server/plugins/manifest.test.ts
index 07328c95b9..399e350493 100644
--- a/packages/server/src/server/plugins/manifest.test.ts
+++ b/packages/server/src/server/plugins/manifest.test.ts
@@ -1,16 +1,133 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdtemp, readdir, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { afterEach, describe, expect, it } from "vitest";
 import { readPluginManifest } from "./manifest.js";
 
 const directories: string[] = [];
+const examplesDirectory = fileURLToPath(
+  new URL("../../../../../plugin-examples/", import.meta.url),
+);
+const examples = (await readdir(examplesDirectory, { withFileTypes: true }))
+  .filter((entry) => entry.isDirectory())
+  .map((entry) => entry.name);
 
 afterEach(async () => {
   await Promise.all(directories.splice(0).map((directory) => rm(directory, { recursive: true })));
 });
 
 describe("plugin manifest", () => {
+  it.each(examples)("validates the %s example manifest", async (name) => {
+    await expect(readPluginManifest(path.join(examplesDirectory, name))).resolves.toMatchObject({
+      id: expect.any(String),
+    });
+  });
+
+  it("reads display metadata and ignores future top-level fields", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    const manifest = {
+      id: "review",
+      name: "Review tools",
+      icon: "assets/icon.png",
+      media: ["assets/screenshot.webp", "demo.mp4", "https://example.com/media?id=1"],
+    };
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ ...manifest, futureField: { enabled: true } }),
+    );
+    await expect(readPluginManifest(directory)).resolves.toEqual(manifest);
+  });
+
+  it.each([
+    { name: "   " },
+    { name: 42 },
+    { icon: "" },
+    { icon: 42 },
+    { icon: "icon.svg" },
+    { icon: "/icon.png" },
+    { icon: "../icon.png" },
+    { icon: "assets/../../icon.png" },
+    { icon: "https://example.com/icon.png" },
+    { icon: "C:/icon.png" },
+    { icon: "assets\\icon.png" },
+    { icon: "icon.png?query" },
+    { media: "screenshot.png" },
+    { media: [42] },
+    { media: [""] },
+    { media: ["../demo.mp4"] },
+    { media: ["/demo.mp4"] },
+    { media: ["http://example.com/demo.mp4"] },
+    { media: ["https://"] },
+    { media: ["//example.com/demo.mp4"] },
+    { media: ["file:///demo.mp4"] },
+    { media: ["data:image/png;base64,abc"] },
+    { media: ["."] },
+    { media: ["assets/"] },
+    { id: "INVALID" },
+    { description: 42 },
+    { requirements: { paseoo: ">=0.11.0" } },
+  ])("rejects invalid known fields: %j", async (fields) => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "example", futureField: true, ...fields }),
+    );
+    await expect(readPluginManifest(directory)).rejects.toThrow();
+  });
+
+  it("accepts omitted metadata and empty media", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    for (const manifest of [{ id: "example" }, { id: "example", media: [] }]) {
+      await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify(manifest));
+      await expect(readPluginManifest(directory)).resolves.toEqual(manifest);
+    }
+  });
+
+  it("reads and validates requirements before any plugin code runs", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    const manifest = path.join(directory, "paseo-plugin.json");
+    await writeFile(manifest, JSON.stringify({ id: "example", requirements: { paseo: "^0.8.0" } }));
+    await expect(readPluginManifest(directory)).resolves.toEqual({
+      id: "example",
+      requirements: { paseo: "^0.8.0" },
+    });
+    for (const requirements of [
+      { paseo: "latest" },
+      { paseo: "" },
+      { paseo: 8 },
+      { node: ">=20" },
+      "0.8.0",
+    ]) {
+      await writeFile(manifest, JSON.stringify({ id: "example", requirements }));
+      await expect(readPluginManifest(directory)).rejects.toThrow();
+    }
+  });
+
+  it("reads an optional description", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "described", description: "Reviews changes before merge" }),
+    );
+
+    await expect(readPluginManifest(directory)).resolves.toEqual({
+      id: "described",
+      description: "Reviews changes before merge",
+    });
+
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "described", description: "   " }),
+    );
+    await expect(readPluginManifest(directory)).rejects.toThrow();
+  });
+
   it("accepts only non-empty argv arrays for build commands", async () => {
     const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
     directories.push(directory);
diff --git a/packages/server/src/server/plugins/manifest.ts b/packages/server/src/server/plugins/manifest.ts
index b721f395d3..2312a2cb5a 100644
--- a/packages/server/src/server/plugins/manifest.ts
+++ b/packages/server/src/server/plugins/manifest.ts
@@ -1,18 +1,40 @@
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
-import { PluginIdSchema } from "@getpaseo/protocol/messages";
+import { PluginIdSchema, PluginRequirementsSchema } from "@getpaseo/protocol/messages";
+import { validatePluginRequirements } from "@getpaseo/protocol/plugin-requirements";
 
 const MANIFEST_FILENAME = "paseo-plugin.json";
 const PluginBuildCommandSchema = z
   .array(z.string().refine((argument) => argument.trim().length > 0))
   .min(1);
-const PluginManifestSchema = z
-  .object({
-    id: PluginIdSchema,
-    build: z.array(PluginBuildCommandSchema).min(1).optional(),
-  })
-  .strict();
+// Manifest asset paths use forward slashes and stay inside the plugin package.
+const PluginAssetPathSchema = z
+  .string()
+  .min(1)
+  .refine(
+    (value) =>
+      value === value.trim() &&
+      !value.startsWith("/") &&
+      !/[\\:?#\p{Cc}]/u.test(value) &&
+      !value.split("/").includes("..") &&
+      !value.endsWith("/") &&
+      value.split("/").at(-1) !== ".",
+    "Expected a relative file path inside the plugin package",
+  );
+const PluginManifestSchema = z.object({
+  id: PluginIdSchema,
+  name: z.string().trim().min(1).optional(),
+  description: z.string().trim().min(1).optional(),
+  icon: PluginAssetPathSchema.refine(
+    (value) => /\.png$/i.test(value),
+    "Expected a relative path to a PNG",
+  ).optional(),
+  media: z.array(z.union([PluginAssetPathSchema, z.url({ protocol: /^https$/ })])).optional(),
+  // A misspelled requirement must not silently disable compatibility checks.
+  requirements: PluginRequirementsSchema.strict().optional(),
+  build: z.array(PluginBuildCommandSchema).min(1).optional(),
+});
 
 export type PluginManifest = z.infer<typeof PluginManifestSchema>;
 
@@ -20,5 +42,7 @@ export async function readPluginManifest(directory: string): Promise<PluginManif
   const manifestPath = path.join(directory, MANIFEST_FILENAME);
   const info = await stat(manifestPath).catch(() => null);
   if (!info?.isFile()) throw new Error(`Plugin manifest is missing: ${manifestPath}`);
-  return PluginManifestSchema.parse(JSON.parse(await readFile(manifestPath, "utf8")));
+  const manifest = PluginManifestSchema.parse(JSON.parse(await readFile(manifestPath, "utf8")));
+  validatePluginRequirements(manifest.requirements);
+  return manifest;
 }
diff --git a/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts b/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
index ed28f04196..d0ad016cec 100644
--- a/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
+++ b/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
@@ -1,7 +1,10 @@
+import { EventEmitter, once } from "node:events";
+import { resolveDaemonVersion } from "../daemon-version.js";
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, expect, test } from "vitest";
+import { z } from "zod";
 import { DaemonClient } from "../test-utils/daemon-client.js";
 import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
 import { createTestAgentClient, createTestAgentClients } from "../test-utils/fake-agent-client.js";
@@ -18,11 +21,15 @@ test("plugin handlers create workspaces and agents through their Paseo API", asy
   roots.push(pluginDirectory, workspaceDirectory);
   await writeFile(
     path.join(pluginDirectory, "paseo-plugin.json"),
-    JSON.stringify({ id: "paseo-api" }),
+    JSON.stringify({
+      id: "paseo-api",
+      requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+    }),
   );
   await writeFile(
     path.join(pluginDirectory, "index.server.ts"),
-    `import { defineRpc, type PluginServerContext } from "@getpaseo/plugin";
+    `import { defineRpc } from "@getpaseo/plugin";
+import { type PluginServerContext } from "@getpaseo/plugin/server";
 import { z } from "zod";
 
 const create = defineRpc({
@@ -141,7 +148,10 @@ test("daemon config reload enables and disables configured plugins without resta
   roots.push(pluginDirectory, paseoHomeRoot);
   await writeFile(
     path.join(pluginDirectory, "paseo-plugin.json"),
-    JSON.stringify({ id: "reloadable-plugin" }),
+    JSON.stringify({
+      id: "reloadable-plugin",
+      requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+    }),
   );
   await writeFile(
     path.join(pluginDirectory, "index.server.ts"),
@@ -170,6 +180,7 @@ test("daemon config reload enables and disables configured plugins without resta
     appVersion: "0.4.0",
   });
   const configPath = path.join(daemon.paseoHome, "config.json");
+  const catalogChanges = new EventEmitter();
 
   async function setPluginsEnabled(enabled: boolean): Promise<void> {
     const config = JSON.parse(await readFile(configPath, "utf8"));
@@ -181,10 +192,25 @@ test("daemon config reload enables and disables configured plugins without resta
 
   try {
     await client.connect();
+    const catalog = client.observeEvents(["status.plugin_catalog_changed"]);
+    catalog.subscribe({
+      snapshot: () => undefined,
+      update: (message) => {
+        if (
+          message.type === "status" &&
+          message.payload.status === "plugin_catalog_changed" &&
+          message.payload.pluginId === "reloadable-plugin"
+        ) {
+          catalogChanges.emit("changed");
+        }
+      },
+    });
+    await catalog.ready;
     await expect(client.listPlugins()).resolves.toEqual([
       expect.objectContaining({ id: "reloadable-plugin", status: "disabled" }),
     ]);
 
+    const enabled = once(catalogChanges, "changed");
     await setPluginsEnabled(true);
     await expect(client.reloadDaemonConfig()).resolves.toMatchObject({
       requestId: expect.any(String),
@@ -192,9 +218,12 @@ test("daemon config reload enables and disables configured plugins without resta
       restartRequiredPaths: [],
       overrideControlledPaths: [],
     });
-    await expect
-      .poll(async () => (await client.listPlugins()).find(({ id }) => id === "reloadable-plugin"))
-      .toMatchObject({ enabled: true, status: "running" });
+    await enabled;
+    expect((await client.listPlugins()).find(({ id }) => id === "reloadable-plugin")).toMatchObject(
+      { enabled: true, status: "running" },
+    );
+
+    const disabled = once(catalogChanges, "changed");
 
     await setPluginsEnabled(false);
     await expect(client.reloadDaemonConfig()).resolves.toEqual({
@@ -203,11 +232,179 @@ test("daemon config reload enables and disables configured plugins without resta
       restartRequiredPaths: [],
       overrideControlledPaths: [],
     });
-    await expect
-      .poll(async () => (await client.listPlugins()).find(({ id }) => id === "reloadable-plugin"))
-      .toMatchObject({ enabled: true, status: "disabled" });
+    await disabled;
+    expect((await client.listPlugins()).find(({ id }) => id === "reloadable-plugin")).toMatchObject(
+      { enabled: true, status: "disabled" },
+    );
+    await catalog.release();
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
   }
 }, 60_000);
+
+const ReconnectingPluginStateSchema = z.object({
+  snapshots: z.array(z.string()),
+  names: z.array(z.string()),
+});
+
+async function readReconnectingPluginState(client: DaemonClient) {
+  return ReconnectingPluginStateSchema.parse(
+    await client.invokePluginRpc("reconnecting", "state", {}),
+  );
+}
+
+test("plugin host APIs and observations recover after repeated daemon-side socket closes", async () => {
+  const pluginDirectory = await mkdtemp(path.join(tmpdir(), "paseo-reconnecting-plugin-"));
+  const workspaceDirectory = await mkdtemp(path.join(tmpdir(), "paseo-reconnecting-workspace-"));
+  roots.push(pluginDirectory, workspaceDirectory);
+  await writeFile(
+    path.join(pluginDirectory, "paseo-plugin.json"),
+    JSON.stringify({ id: "reconnecting", requirements: { paseo: ">=0.8.0" } }),
+  );
+  await writeFile(
+    path.join(pluginDirectory, "index.server.ts"),
+    `
+import { defineRpc } from "@getpaseo/plugin";
+import { type PluginServerContext } from "@getpaseo/plugin/server";
+import { z } from "zod";
+
+export default function contribute(server: PluginServerContext) {
+  const snapshots: string[] = [];
+  const names: string[] = [];
+  const snapshotWaiters = new Map<number, (id: string) => void>();
+  const nameWaiters = new Map<string, (name: string) => void>();
+  let reconnected = Promise.resolve();
+  let release: (() => Promise<void>) | undefined;
+  server.handle(defineRpc({ name: "observe", input: z.object({}), output: z.string() }), async (_, { paseo }) => {
+    const { subscription } = await paseo.workspaces.list({ subscribe: {} });
+    subscription.subscribe({
+      snapshot: (snapshot) => {
+        const id = snapshot.subscriptionId!;
+        snapshots.push(id);
+        snapshotWaiters.get(snapshots.length)?.(id);
+        snapshotWaiters.delete(snapshots.length);
+      },
+      update: (message) => {
+        if (message.type === "workspace_update" && message.payload.kind === "upsert") {
+          const name = message.payload.workspace.name;
+          names.push(name);
+          nameWaiters.get(name)?.(name);
+          nameWaiters.delete(name);
+        }
+      },
+    });
+    release = () => subscription.release();
+    return subscription.subscriptionId!;
+  });
+  server.handle(defineRpc({ name: "wait-snapshot", input: z.object({ count: z.number().int().positive() }), output: z.string() }), ({ count }) => {
+    const id = snapshots[count - 1];
+    return id ?? new Promise<string>((resolve) => snapshotWaiters.set(count, resolve));
+  });
+  server.handle(defineRpc({ name: "wait-name", input: z.object({ name: z.string() }), output: z.string() }), ({ name }) => {
+    return names.includes(name) ? name : new Promise<string>((resolve) => nameWaiters.set(name, resolve));
+  });
+  server.handle(defineRpc({ name: "state", input: z.object({}), output: z.object({ snapshots: z.array(z.string()), names: z.array(z.string()) }) }), () => ({ snapshots, names }));
+  server.handle(defineRpc({ name: "probe", input: z.object({}), output: z.object({ pid: z.number(), projectIds: z.array(z.string()) }) }), async (_, { paseo }) => {
+    await reconnected;
+    return { pid: process.pid, projectIds: (await paseo.projects.list()).projects.map((project) => project.projectId) };
+  });
+  server.handle(defineRpc({ name: "release", input: z.object({}), output: z.null() }), async () => {
+    await release?.();
+    return null;
+  });
+  server.handle(defineRpc({ name: "disconnect", input: z.object({}), output: z.null() }), () => new Promise((resolve) => {
+    // Inject a protocol violation through real IPC. The real daemon closes the
+    // active socket, and the worker's normal transport must observe that close.
+    function closed(message: { type: string }) {
+      if (message.type !== "paseo_close") return;
+      process.off("message", closed);
+      resolve(null);
+    }
+    process.on("message", closed);
+    reconnected = new Promise<void>((connected) => {
+      function ready(message: { type: string; data?: unknown }) {
+        if (message.type !== "paseo_frame" || typeof message.data !== "string") return;
+        const frame = JSON.parse(message.data);
+        if (frame.type !== "session" || frame.message.type !== "status" || frame.message.payload.status !== "server_info") return;
+        process.off("message", ready);
+        connected();
+      }
+      process.on("message", ready);
+    });
+    process.send!({ type: "paseo_frame", isBinary: false, data: JSON.stringify({
+      type: "hello", clientId: "plugin:reconnecting", clientType: "cli", protocolVersion: 1,
+    }) });
+  }));
+  return async () => { await release?.(); };
+}`,
+  );
+  const daemon = await createTestPaseoDaemon();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  let projectId: string | undefined;
+  try {
+    await client.connect();
+    const opened = await client.openProject(workspaceDirectory);
+    if (!opened.workspace) throw new Error(opened.error ?? "Workspace did not open");
+    projectId = opened.workspace.projectId;
+    const workspaceId = opened.workspace.id;
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(pluginDirectory);
+    const original = await client.invokePluginRpc("reconnecting", "probe", {});
+    expect(original).toEqual({ pid: expect.any(Number), projectIds: [projectId] });
+    const initialId = await client.invokePluginRpc("reconnecting", "observe", {});
+    const app = await client.fetchWorkspaces({ subscribe: {} });
+    const appUpdates = new EventEmitter();
+    app.subscription.subscribe({
+      snapshot: () => undefined,
+      update: (message) => {
+        if (message.type === "workspace_update" && message.payload.kind === "upsert") {
+          appUpdates.emit(message.payload.workspace.name);
+        }
+      },
+    });
+    await client.setWorkspaceTitle(workspaceId, "Before disconnect");
+    await expect(
+      client.invokePluginRpc("reconnecting", "wait-name", { name: "Before disconnect" }),
+    ).resolves.toBe("Before disconnect");
+    const ids = [initialId];
+    for (const name of ["First recovery", "Second recovery"]) {
+      await client.invokePluginRpc("reconnecting", "disconnect", {});
+      const id = await client.invokePluginRpc("reconnecting", "wait-snapshot", {
+        count: ids.length + 1,
+      });
+      ids.push(id);
+      expect((await readReconnectingPluginState(client)).snapshots).toEqual(ids);
+      expect(new Set(ids).size).toBe(ids.length);
+      expect(app.subscription.subscriptionId).toBe(app.subscriptionId);
+      const appUpdate = once(appUpdates, name);
+      await client.setWorkspaceTitle(workspaceId, name);
+      await expect(client.invokePluginRpc("reconnecting", "wait-name", { name })).resolves.toBe(
+        name,
+      );
+      await appUpdate;
+      expect(await client.invokePluginRpc("reconnecting", "probe", {})).toEqual(original);
+    }
+    await client.invokePluginRpc("reconnecting", "release", {});
+    const releasedState = await client.invokePluginRpc("reconnecting", "state", {});
+    await client.invokePluginRpc("reconnecting", "disconnect", {});
+    expect(await client.invokePluginRpc("reconnecting", "probe", {})).toEqual(original);
+    const appUpdateAfterRelease = once(appUpdates, "After release");
+    await client.setWorkspaceTitle(workspaceId, "After release");
+    await appUpdateAfterRelease;
+    await client.invokePluginRpc("reconnecting", "probe", {});
+    expect(await client.invokePluginRpc("reconnecting", "state", {})).toEqual(releasedState);
+    await app.subscription.release();
+    // Removal while reconnect is scheduled must stop the child, not reload it.
+    await client.invokePluginRpc("reconnecting", "disconnect", {});
+    await client.removePlugin("reconnecting");
+    expect(await client.listPlugins()).toEqual([]);
+    await expect(client.invokePluginRpc("reconnecting", "probe", {})).rejects.toThrow(
+      "Plugin is not available",
+    );
+  } finally {
+    if (projectId) await client.removeProject(projectId);
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/plugin-process-protocol.ts b/packages/server/src/server/plugins/plugin-process-protocol.ts
index c9d61336c0..e959780389 100644
--- a/packages/server/src/server/plugins/plugin-process-protocol.ts
+++ b/packages/server/src/server/plugins/plugin-process-protocol.ts
@@ -1,14 +1,309 @@
+import { UsageScopeSchema, type UsageScope } from "@getpaseo/plugin/server/usage";
+import type {
+  ProviderConnectRequest,
+  ProviderCatalogOptions,
+  ProviderEvent,
+  ProviderInput,
+  ProviderStatusRequest,
+} from "@getpaseo/plugin/server/provider";
+import {
+  ProviderEventSchema,
+  ProviderInputSchema,
+  ProviderLaunchSchema,
+} from "@getpaseo/plugin/server/provider";
+import { z } from "zod";
+
+export interface PluginProviderMetadata {
+  hasCatalogCacheKey?: boolean;
+  hasStatus?: boolean;
+  command?: readonly [string, ...string[]];
+  id: string;
+  label: string;
+  description?: string;
+  iconPath?: string;
+}
+
+export interface PluginUsageSourceMetadata {
+  id: string;
+  label: string;
+  icon?: string;
+}
+
 export type PluginProcessRequest =
-  | { type: "initialize"; pluginId: string; bundle: string; appVersion: string }
+  | {
+      type: "provider.status";
+      requestId: string;
+      providerId: string;
+      request: ProviderStatusRequest;
+    }
+  | {
+      type: "initialize";
+      pluginId: string;
+      bundle: string;
+      appVersion: string;
+      pluginDirectory: string;
+      settingsDirectory?: string;
+    }
+  | {
+      type: "provider.catalog_key";
+      requestId: string;
+      providerId: string;
+      options: ProviderCatalogOptions;
+    }
+  | { type: "hook"; requestId: string; kind: "event" | "before"; name: string; input: unknown }
+  | { type: "hook.cancel"; requestId: string }
+  | { type: "usage.fetch"; requestId: string; sourceId: string; input: unknown }
+  | { type: "usage.discover"; requestId: string; sourceId: string; scope: UsageScope }
   | { type: "invoke"; requestId: string; method: string; input: unknown }
+  | {
+      type: "provider.connect";
+      providerId: string;
+      connectionId: string;
+      request: ProviderConnectRequest;
+    }
+  | {
+      type: "provider.send";
+      connectionId: string;
+      acceptanceId: string;
+      input: ProviderInput;
+    }
+  | { type: "provider.close"; connectionId: string }
   | { type: "shutdown" }
   | { type: "paseo_frame"; data: string | Uint8Array; isBinary: boolean }
   | { type: "paseo_close" };
 
 export type PluginProcessMessage =
-  | { type: "ready"; methods: string[] }
+  | { type: "settings.changed"; settingsId: string }
+  | { type: "hooks.changed"; hooks: { events: string[]; before: string[] } }
+  | {
+      type: "ready";
+      methods: string[];
+      providers: PluginProviderMetadata[];
+      usageSources?: PluginUsageSourceMetadata[];
+      hooks?: { events: string[]; before: string[] };
+    }
   | { type: "result"; requestId: string; output: unknown }
   | { type: "error"; requestId: string; error: string }
   | { type: "fatal"; error: string }
+  | {
+      type: "provider.connected";
+      connectionId: string;
+      version: number;
+      capabilities: readonly string[];
+    }
+  | { type: "provider.connect_failed"; connectionId: string; error: string }
+  | { type: "provider.accepted"; connectionId: string; acceptanceId: string }
+  | {
+      type: "provider.rejected";
+      connectionId: string;
+      acceptanceId: string;
+      error: string;
+    }
+  | { type: "provider.event"; connectionId: string; event: ProviderEvent }
+  | { type: "provider.closed"; connectionId: string; error?: string }
   | { type: "paseo_frame"; data: string | Uint8Array; isBinary: boolean }
   | { type: "paseo_close" };
+
+const hooksSchema = z.object({ events: z.array(z.string()), before: z.array(z.string()) }).strict();
+
+const providerMetadataSchema = z
+  .object({
+    id: z.string().min(1),
+    label: z.string().min(1),
+    description: z.string().optional(),
+    iconPath: z.string().optional(),
+    hasCatalogCacheKey: z.boolean().optional(),
+    hasStatus: z.boolean().optional(),
+    command: z.tuple([z.string().min(1)], z.string()).optional(),
+  })
+  .strict();
+const usageSourceMetadataSchema = z
+  .object({
+    id: z.string().min(1),
+    label: z.string().min(1),
+    icon: z.string().optional(),
+  })
+  .strict();
+const providerConnectRequestSchema = z
+  .object({
+    launch: ProviderLaunchSchema.optional(),
+    versions: z.array(z.number().int().positive()),
+    capabilities: z.array(z.string()),
+  })
+  .strict();
+const frameFields = {
+  data: z.union([z.string(), z.instanceof(Uint8Array)]),
+  isBinary: z.boolean(),
+};
+
+export const PluginProcessRequestSchema: z.ZodType<PluginProcessRequest> = z.discriminatedUnion(
+  "type",
+  [
+    z
+      .object({
+        type: z.literal("provider.status"),
+        requestId: z.string().min(1),
+        providerId: z.string().min(1),
+        request: z.object({ launch: ProviderLaunchSchema.optional() }).strict(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("initialize"),
+        pluginId: z.string().min(1),
+        bundle: z.string(),
+        appVersion: z.string(),
+        pluginDirectory: z.string(),
+        settingsDirectory: z.string().optional(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.catalog_key"),
+        requestId: z.string().min(1),
+        providerId: z.string().min(1),
+        options: z.discriminatedUnion("scope", [
+          z
+            .object({
+              scope: z.literal("global"),
+              force: z.boolean().optional(),
+              launch: ProviderLaunchSchema.optional(),
+            })
+            .strict(),
+          z
+            .object({
+              scope: z.literal("workspace"),
+              cwd: z.string(),
+              force: z.boolean().optional(),
+              launch: ProviderLaunchSchema.optional(),
+            })
+            .strict(),
+        ]),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("hook"),
+        requestId: z.string(),
+        kind: z.enum(["event", "before"]),
+        name: z.string(),
+        input: z.unknown(),
+      })
+      .strict(),
+    z.object({ type: z.literal("hook.cancel"), requestId: z.string() }).strict(),
+    z
+      .object({
+        type: z.literal("usage.fetch"),
+        requestId: z.string(),
+        sourceId: z.string(),
+        input: z.unknown(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("usage.discover"),
+        requestId: z.string(),
+        sourceId: z.string(),
+        scope: UsageScopeSchema,
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("invoke"),
+        requestId: z.string().min(1),
+        method: z.string().min(1),
+        input: z.unknown(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.connect"),
+        providerId: z.string().min(1),
+        connectionId: z.string().min(1),
+        request: providerConnectRequestSchema,
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.send"),
+        connectionId: z.string().min(1),
+        acceptanceId: z.string().min(1),
+        input: ProviderInputSchema,
+      })
+      .strict(),
+    z.object({ type: z.literal("provider.close"), connectionId: z.string().min(1) }).strict(),
+    z.object({ type: z.literal("shutdown") }).strict(),
+    z.object({ type: z.literal("paseo_frame"), ...frameFields }).strict(),
+    z.object({ type: z.literal("paseo_close") }).strict(),
+  ],
+);
+
+export const PluginProcessMessageSchema: z.ZodType<PluginProcessMessage> = z.discriminatedUnion(
+  "type",
+  [
+    z.object({ type: z.literal("settings.changed"), settingsId: z.string() }).strict(),
+    z.object({ type: z.literal("hooks.changed"), hooks: hooksSchema }).strict(),
+    z
+      .object({
+        type: z.literal("ready"),
+        methods: z.array(z.string()),
+        providers: z.array(providerMetadataSchema),
+        usageSources: z.array(usageSourceMetadataSchema).optional(),
+        hooks: hooksSchema.optional(),
+      })
+      .strict(),
+    z
+      .object({ type: z.literal("result"), requestId: z.string().min(1), output: z.unknown() })
+      .strict(),
+    z
+      .object({ type: z.literal("error"), requestId: z.string().min(1), error: z.string() })
+      .strict(),
+    z.object({ type: z.literal("fatal"), error: z.string() }).strict(),
+    z
+      .object({
+        type: z.literal("provider.connected"),
+        connectionId: z.string().min(1),
+        version: z.number().int().positive(),
+        capabilities: z.array(z.string()),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.connect_failed"),
+        connectionId: z.string().min(1),
+        error: z.string(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.accepted"),
+        connectionId: z.string().min(1),
+        acceptanceId: z.string().min(1),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.rejected"),
+        connectionId: z.string().min(1),
+        acceptanceId: z.string().min(1),
+        error: z.string(),
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.event"),
+        connectionId: z.string().min(1),
+        event: ProviderEventSchema,
+      })
+      .strict(),
+    z
+      .object({
+        type: z.literal("provider.closed"),
+        connectionId: z.string().min(1),
+        error: z.string().optional(),
+      })
+      .strict(),
+    z.object({ type: z.literal("paseo_frame"), ...frameFields }).strict(),
+    z.object({ type: z.literal("paseo_close") }).strict(),
+  ],
+);
diff --git a/packages/server/src/server/plugins/plugin-process.test.ts b/packages/server/src/server/plugins/plugin-process.test.ts
new file mode 100644
index 0000000000..ddee3cb291
--- /dev/null
+++ b/packages/server/src/server/plugins/plugin-process.test.ts
@@ -0,0 +1,50 @@
+import { fileURLToPath } from "node:url";
+import { build } from "esbuild";
+import { expect, it } from "vitest";
+
+it("keeps React out of the plugin host's runtime dependency graph", async () => {
+  await expect(
+    build({
+      entryPoints: [
+        fileURLToPath(new URL("./plugin-process.ts", import.meta.url)),
+        "@getpaseo/plugin",
+        "@getpaseo/plugin/server",
+        "@getpaseo/plugin/server/provider",
+        "@getpaseo/plugin/server/acp",
+      ],
+      outdir: "unused",
+      conditions: ["source"],
+      bundle: true,
+      platform: "node",
+      format: "esm",
+      // Node evaluates re-exports even when the host only imports one helper.
+      treeShaking: false,
+      write: false,
+      logLevel: "silent",
+      plugins: [
+        {
+          name: "no-react",
+          setup(context) {
+            context.onResolve(
+              { filter: /^(react|react-dom|react-native|use-sync-external-store)(\/|$)/ },
+              ({ path, importer }) => ({
+                errors: [{ text: `React dependency ${path} imported by ${importer}` }],
+              }),
+            );
+          },
+        },
+      ],
+    }),
+  ).resolves.toMatchObject({ errors: [] });
+});
+
+it("exposes CLI probes through the plugin host's server SDK", async () => {
+  const { evaluateBundle } = await import("./bundle-evaluator.js");
+  const setup = evaluateBundle(`(require) => ({ default: async () => {
+    const { execCommand } = require("@getpaseo/plugin/server");
+    const { stdout } = await execCommand(${JSON.stringify(process.execPath)}, ["-e", "process.stdout.write('plugin CLI ready')"]);
+    if (stdout !== "plugin CLI ready") throw new Error("CLI output was lost");
+  } })`);
+  // This contribution uses no server context APIs; it exercises the host's real SDK binding.
+  await expect(setup(undefined as never)).resolves.toBeUndefined();
+});
diff --git a/packages/server/src/server/plugins/plugin-process.ts b/packages/server/src/server/plugins/plugin-process.ts
index 1b4082df4d..3f11926d7d 100644
--- a/packages/server/src/server/plugins/plugin-process.ts
+++ b/packages/server/src/server/plugins/plugin-process.ts
@@ -1,174 +1,575 @@
-import type { PluginProcessMessage, PluginProcessRequest } from "./plugin-process-protocol.js";
-import { createRequire } from "node:module";
-import { defineAttachmentSource, defineRpc, type PluginRpcContract } from "@getpaseo/plugin";
-import type { PluginHandlerContext } from "@getpaseo/plugin/server";
+import { PluginHookHandlers } from "./lifecycle/index.js";
+import { evaluateBundle } from "./bundle-evaluator.js";
+import {
+  PluginProcessRequestSchema,
+  type PluginProcessMessage,
+  type PluginProcessRequest,
+} from "./plugin-process-protocol.js";
+import type { UsageSourceRegistration } from "@getpaseo/plugin/server/usage";
+import type { SettingsDefinition, PluginRpcContract } from "@getpaseo/plugin";
+import type { PluginHandlerContext, PluginServerContribution } from "@getpaseo/plugin/server";
+import { fileURLToPath } from "node:url";
+import type { ZodType } from "zod";
+import {
+  ProviderEventSchema,
+  type ProviderConnection,
+  type ProviderRegistration,
+  ProviderStatusSchema,
+} from "@getpaseo/plugin/server/provider";
 import { createPaseoApi, type PaseoApi } from "@getpaseo/client";
 import { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { createPluginDaemonTransportFactory } from "./daemon-transport.js";
-import {
-  isPluginClientOnlySdkSpecifier,
-  isPluginSdkSpecifier,
-  isPluginServerTypesSdkSpecifier,
-} from "./plugin-sdk-specifiers.js";
 import { createPluginClientId } from "./plugin-session-identity.js";
 
-type RpcHandler = (input: unknown, context: PluginHandlerContext) => unknown | Promise<unknown>;
-
-interface RegisteredRpc {
-  contract: PluginRpcContract;
-  handler: RpcHandler;
-}
-
-const handlers = new Map<string, RegisteredRpc>();
-let cleanup: (() => void | Promise<void>) | null = null;
-let daemonClient: DaemonClient | null = null;
-let paseo: PaseoApi | null = null;
-let stopping = false;
-const nodeRequire = createRequire(import.meta.url);
-
-function send(message: PluginProcessMessage): void {
-  process.send?.(message);
-}
-
-function sendAndWait(message: PluginProcessMessage): Promise<void> {
-  return new Promise((resolve) => {
-    if (!process.send) {
-      resolve();
-      return;
-    }
-    process.send(message, () => resolve());
-  });
-}
-
+import { PluginSettingsStore } from "./settings/index.js";
+import { readPluginProviderIcon } from "./provider-icon.js";
 function describeError(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-function validateMethod(method: string): string {
-  const normalized = method.trim();
-  if (!/^[a-z][a-z0-9._-]*$/.test(normalized)) {
-    throw new Error(`Invalid plugin RPC method: ${method}`);
-  }
-  if (handlers.has(normalized)) {
-    throw new Error(`Duplicate plugin RPC method: ${normalized}`);
-  }
-  return normalized;
+export interface PluginWorkerChannel {
+  send(message: PluginProcessMessage, callback?: () => void): void;
+  onMessage(handler: (message: PluginProcessRequest) => void): () => void;
+  disconnect(): void;
 }
 
-function register(contract: PluginRpcContract, handler: RpcHandler): void {
-  if (typeof handler !== "function") {
-    throw new Error(`Plugin RPC ${contract.name} must provide a handler`);
+export function createPluginWorker(options: {
+  channel: PluginWorkerChannel;
+  contribute: PluginServerContribution;
+}): { shutdown(): Promise<void> } {
+  const { channel, contribute } = options;
+  let settingsStore: PluginSettingsStore | null = null;
+  function registerSettings<Schema extends ZodType>(definition: SettingsDefinition<Schema>) {
+    if (!settingsStore) throw new Error("Plugin settings storage is unavailable");
+    const handlers = settingsStore.register(definition);
+    register(handlers.read.contract, handlers.read.handle);
+    register(handlers.write.contract, (input) =>
+      handlers.write.handle(handlers.write.contract.input.parse(input)),
+    );
+    register(handlers.reset.contract, (input) =>
+      handlers.reset.handle(handlers.reset.contract.input.parse(input)),
+    );
+    return handlers.settings;
   }
-  const method = validateMethod(contract.name);
-  handlers.set(method, { contract: { ...contract, name: method }, handler });
-}
 
-const pluginAuthorRuntime = {
-  defineAttachmentSource,
-  defineRpc,
-  Icon() {
-    throw new Error("Icon is available only in plugin client code");
-  },
-};
+  type RpcHandler = (input: unknown, context: PluginHandlerContext) => unknown | Promise<unknown>;
 
-function runtimeRequire(name: string): unknown {
-  if (isPluginClientOnlySdkSpecifier(name)) {
-    throw new Error(`${name} is available only in plugin client code`);
+  interface RegisteredRpc {
+    contract: PluginRpcContract;
+    handler: RpcHandler;
   }
-  if (isPluginServerTypesSdkSpecifier(name)) return {};
-  if (isPluginSdkSpecifier(name)) return pluginAuthorRuntime;
-  return nodeRequire(name);
-}
 
-function evaluateBundle(bundle: string): void {
-  const evaluate: (source: string) => unknown = globalThis.eval;
-  const factory = evaluate(bundle);
-  if (typeof factory !== "function") throw new Error("Plugin server bundle is not executable");
-  const exports = factory(runtimeRequire);
-  const setup =
-    exports !== null && typeof exports === "object" ? Reflect.get(exports, "default") : undefined;
-  if (typeof setup !== "function") {
-    throw new Error("Plugin server bundle must default export a function");
-  }
-  const contributedCleanup = setup({ handle: register });
-  if (typeof contributedCleanup !== "function") {
-    throw new Error("Plugin contribution must return a cleanup function");
-  }
-  cleanup = contributedCleanup;
-}
-
-const transportFactory = createPluginDaemonTransportFactory({
-  send,
-  onMessage(handler) {
-    process.on("message", handler);
-    return () => process.off("message", handler);
-  },
-});
-
-async function initialize(message: Extract<PluginProcessRequest, { type: "initialize" }>) {
-  daemonClient = new DaemonClient({
-    url: `ipc://plugin/${encodeURIComponent(message.pluginId)}`,
-    clientId: createPluginClientId(message.pluginId),
-    clientType: "cli",
-    appVersion: message.appVersion,
-    reconnect: { enabled: false },
-    transportFactory,
+  const hooks = new PluginHookHandlers(() => {
+    send({ type: "hooks.changed", hooks: hooks.catalog() });
   });
-  paseo = createPaseoApi(daemonClient);
-  await daemonClient.connect();
-  evaluateBundle(message.bundle);
-  send({ type: "ready", methods: [...handlers.keys()].sort() });
-}
-
-async function shutdown(): Promise<void> {
-  if (stopping) return;
-  stopping = true;
-  const currentCleanup = cleanup;
-  cleanup = null;
-  try {
-    await currentCleanup?.();
-  } catch (error) {
-    console.error("Plugin cleanup failed", error);
+  const handlers = new Map<string, RegisteredRpc>();
+  const providers = new Map<string, ProviderRegistration>();
+  const usageSources = new Map<string, UsageSourceRegistration>();
+  const providerConnections = new Map<
+    string,
+    { connection: ProviderConnection; unsubscribe: () => void; closing?: Promise<void> }
+  >();
+  const pendingProviderConnections = new Map<string, { tombstoned: boolean }>();
+  let cleanup: (() => void | Promise<void>) | null = null;
+  let daemonClient: DaemonClient | null = null;
+  let paseo: PaseoApi | null = null;
+  let stopping = false;
+  function send(message: PluginProcessMessage): void {
+    channel.send(message);
   }
-  await daemonClient?.close().catch(() => undefined);
-  await sendAndWait({ type: "paseo_close" });
-  daemonClient = null;
-  paseo = null;
-  process.disconnect();
-}
 
-process.on("message", (message: PluginProcessRequest) => {
-  if (message.type === "initialize") {
-    void initialize(message).catch(async (error) => {
-      send({ type: "fatal", error: describeError(error) });
-      await daemonClient?.close().catch(() => undefined);
+  function sendAndWait(message: PluginProcessMessage): Promise<void> {
+    return new Promise((resolve) => {
+      channel.send(message, () => resolve());
     });
-    return;
   }
-  if (message.type === "shutdown") {
-    void shutdown();
-    return;
+
+  function jsonTransportValue<Value>(value: Value): Value {
+    const encoded = JSON.stringify(value);
+    if (encoded === undefined) throw new Error("Provider value is not JSON-serializable");
+    return JSON.parse(encoded) as Value;
   }
-  if (message.type === "paseo_frame" || message.type === "paseo_close") return;
-  if (stopping) return;
-  const registered = handlers.get(message.method);
-  if (!registered) {
+
+  function validateMethod(method: string): string {
+    const normalized = method.trim();
+    if (!/^[a-z][a-z0-9._-]*$/.test(normalized)) {
+      throw new Error(`Invalid plugin RPC method: ${method}`);
+    }
+    if (handlers.has(normalized)) {
+      throw new Error(`Duplicate plugin RPC method: ${normalized}`);
+    }
+    return normalized;
+  }
+
+  function register(contract: PluginRpcContract, handler: RpcHandler): void {
+    if (typeof handler !== "function") {
+      throw new Error(`Plugin RPC ${contract.name} must provide a handler`);
+    }
+    const method = validateMethod(contract.name);
+    handlers.set(method, { contract: { ...contract, name: method }, handler });
+  }
+
+  function registerProvider(provider: ProviderRegistration): void {
+    const id = provider.id.trim();
+    if (!/^[a-z][a-z0-9._-]*$/.test(id)) {
+      throw new Error(`Invalid plugin provider ID: ${provider.id}`);
+    }
+    if (!provider.label.trim()) throw new Error(`Plugin provider ${id} requires a label`);
+    if (typeof provider.connect !== "function") {
+      throw new Error(`Plugin provider ${id} must implement connect()`);
+    }
+    if (
+      provider.getCatalogCacheKey !== undefined &&
+      typeof provider.getCatalogCacheKey !== "function"
+    ) {
+      throw new Error(`Invalid catalogue key callback for plugin provider ${id}`);
+    }
+    if (provider.status !== undefined && typeof provider.status !== "function")
+      throw new Error(`Invalid status callback for plugin provider ${id}`);
+    if (
+      provider.command !== undefined &&
+      (provider.command.length === 0 ||
+        provider.command.some((part) => typeof part !== "string" || !part.trim()))
+    )
+      throw new Error(`Invalid command for plugin provider ${id}`);
+    if (providers.has(id)) throw new Error(`Duplicate plugin provider ID: ${id}`);
+    providers.set(id, { ...provider, id });
+  }
+
+  function registerUsageSource(source: UsageSourceRegistration): void {
+    const id = source.id.trim();
+    if (
+      !/^[a-z][a-z0-9._-]*$/.test(id) ||
+      !source.label.trim() ||
+      typeof source.fetch !== "function" ||
+      typeof source.discover !== "function" ||
+      !source.input ||
+      typeof source.input.parseAsync !== "function"
+    ) {
+      throw new Error(`Invalid usage source: ${source.id}`);
+    }
+    if (usageSources.has(id)) throw new Error(`Duplicate usage source: ${id}`);
+    usageSources.set(id, { ...source, id });
+  }
+
+  function providerMetadata(provider: ProviderRegistration) {
+    return {
+      id: provider.id,
+      label: provider.label,
+      description: provider.description,
+      iconPath: provider.icon,
+      hasCatalogCacheKey: provider.getCatalogCacheKey !== undefined,
+      hasStatus: provider.status !== undefined,
+      command: provider.command,
+    };
+  }
+
+  async function connectProvider(
+    message: Extract<PluginProcessRequest, { type: "provider.connect" }>,
+  ): Promise<void> {
+    if (stopping) throw new Error("Plugin is stopping");
+    const provider = providers.get(message.providerId);
+    if (!provider) throw new Error(`Unknown plugin provider: ${message.providerId}`);
+    if (
+      providerConnections.has(message.connectionId) ||
+      pendingProviderConnections.has(message.connectionId)
+    ) {
+      throw new Error(`Duplicate provider connection: ${message.connectionId}`);
+    }
+    const pending = { tombstoned: false };
+    pendingProviderConnections.set(message.connectionId, pending);
+    let connection: ProviderConnection;
+    try {
+      connection = await provider.connect(message.request);
+    } catch (error) {
+      pendingProviderConnections.delete(message.connectionId);
+      if (pending.tombstoned || stopping) return;
+      throw error;
+    }
+    pendingProviderConnections.delete(message.connectionId);
+    if (pending.tombstoned || stopping) {
+      await connection.close().catch(() => undefined);
+      return;
+    }
+    let unsubscribe = () => {};
+    unsubscribe = connection.onEvent((event) => {
+      try {
+        send({
+          type: "provider.event",
+          connectionId: message.connectionId,
+          event: ProviderEventSchema.parse(jsonTransportValue(event)),
+        });
+      } catch (error) {
+        providerConnections.delete(message.connectionId);
+        unsubscribe();
+        void connection.close().catch(() => undefined);
+        send({
+          type: "provider.closed",
+          connectionId: message.connectionId,
+          error: describeError(error),
+        });
+      }
+    });
+    providerConnections.set(message.connectionId, { connection, unsubscribe });
     send({
-      type: "error",
-      requestId: message.requestId,
-      error: `Unknown RPC method: ${message.method}`,
+      type: "provider.connected",
+      connectionId: message.connectionId,
+      version: connection.version,
+      capabilities: connection.capabilities,
     });
-    return;
   }
-  void registered.contract.input
-    .parseAsync(message.input)
-    .then((input) => {
-      if (!paseo) throw new Error("Plugin Paseo API is unavailable");
-      return registered.handler(input, { paseo });
-    })
-    .then((output) => registered.contract.output.parseAsync(output))
-    .then(
+
+  async function sendProviderInput(
+    message: Extract<PluginProcessRequest, { type: "provider.send" }>,
+  ): Promise<void> {
+    if (stopping) throw new Error("Plugin is stopping");
+    const current = providerConnections.get(message.connectionId);
+    if (!current) throw new Error(`Unknown provider connection: ${message.connectionId}`);
+    if (current.closing) throw new Error("Provider connection is closing");
+    await current.connection.send(message.input);
+    send({
+      type: "provider.accepted",
+      connectionId: message.connectionId,
+      acceptanceId: message.acceptanceId,
+    });
+  }
+
+  // The connection stays registered until its close has reported, so shutdown
+  // waits for a close already in flight instead of disconnecting underneath it.
+  async function closeProviderConnection(connectionId: string): Promise<void> {
+    const current = providerConnections.get(connectionId);
+    if (!current) return;
+    if (current.closing) return current.closing;
+    const closing = (async () => {
+      current.unsubscribe();
+      try {
+        await current.connection.close();
+        send({ type: "provider.closed", connectionId });
+      } catch (error) {
+        send({ type: "provider.closed", connectionId, error: describeError(error) });
+      } finally {
+        providerConnections.delete(connectionId);
+      }
+    })();
+    current.closing = closing;
+    return closing;
+  }
+
+  const transportFactory = createPluginDaemonTransportFactory({
+    send,
+    onMessage(handler) {
+      return channel.onMessage(handler);
+    },
+  });
+
+  async function initialize(message: Extract<PluginProcessRequest, { type: "initialize" }>) {
+    daemonClient = new DaemonClient({
+      url: `ipc://plugin/${encodeURIComponent(message.pluginId)}`,
+      clientId: createPluginClientId(message.pluginId),
+      clientType: "cli",
+      appVersion: message.appVersion,
+      // The runtime re-attaches a session when the daemon drops this socket.
+      reconnect: { enabled: true },
+      transportFactory,
+    });
+    paseo = createPaseoApi(daemonClient);
+    await daemonClient.connect();
+    settingsStore = message.settingsDirectory
+      ? new PluginSettingsStore(message.settingsDirectory, (settingsId) =>
+          send({ type: "settings.changed", settingsId }),
+        )
+      : null;
+    const contributedCleanup = contribute({
+      handle: (contract, handler) =>
+        register(contract, (input, context) => handler(contract.input.parse(input), context)),
+      registerProvider,
+      registerUsageSource,
+      registerSettings,
+      on: hooks.on,
+      before: hooks.before,
+    });
+    if (typeof contributedCleanup !== "function") {
+      throw new Error("Plugin contribution must return a cleanup function");
+    }
+    cleanup = contributedCleanup;
+    const usageSourceMetadata = await Promise.all(
+      [...usageSources.values()]
+        .sort((a, b) => a.id.localeCompare(b.id))
+        .map(async (source) => ({
+          id: source.id,
+          label: source.label,
+          icon: source.icon
+            ? await readPluginProviderIcon(message.pluginDirectory, source.icon)
+            : undefined,
+        })),
+    );
+    send({
+      type: "ready",
+      methods: [...handlers.keys()].sort(),
+      hooks: hooks.catalog(),
+      providers: [...providers.values()]
+        .sort((left, right) => left.id.localeCompare(right.id))
+        .map(providerMetadata),
+      usageSources: usageSourceMetadata,
+    });
+  }
+
+  async function shutdown(): Promise<void> {
+    if (stopping) return;
+    stopping = true;
+    const releaseApi = paseo
+      ?.dispose()
+      .catch((error) => console.error("Plugin API cleanup failed", error));
+    hooks.close();
+    for (const pending of pendingProviderConnections.values()) pending.tombstoned = true;
+    const currentCleanup = cleanup;
+    cleanup = null;
+    try {
+      await currentCleanup?.();
+    } catch (error) {
+      console.error("Plugin cleanup failed", error);
+    }
+    await Promise.all([...providerConnections.keys()].map(closeProviderConnection));
+    await releaseApi;
+    await daemonClient?.close().catch(() => undefined);
+    await sendAndWait({ type: "paseo_close" });
+    daemonClient = null;
+    paseo = null;
+    channel.disconnect();
+  }
+
+  function handleUsageRequest(
+    message: Extract<PluginProcessRequest, { type: "usage.fetch" | "usage.discover" }>,
+  ): void {
+    void (async () => {
+      const source = usageSources.get(message.sourceId);
+      if (!source) throw new Error(`Unknown usage source: ${message.sourceId}`);
+      if (message.type === "usage.discover")
+        return jsonTransportValue(await source.discover(message.scope));
+      const input = await source.input.parseAsync(message.input);
+      return jsonTransportValue(await source.fetch(input));
+    })().then(
       (output) => send({ type: "result", requestId: message.requestId, output }),
       (error) => send({ type: "error", requestId: message.requestId, error: describeError(error) }),
     );
-});
+  }
+
+  function rejectWhileStopping(message: PluginProcessRequest): void {
+    if (
+      message.type === "provider.status" ||
+      message.type === "provider.catalog_key" ||
+      message.type === "usage.fetch" ||
+      message.type === "usage.discover"
+    ) {
+      send({ type: "error", requestId: message.requestId, error: "Plugin is stopping" });
+    } else if (message.type === "provider.connect") {
+      send({
+        type: "provider.connect_failed",
+        connectionId: message.connectionId,
+        error: "Plugin is stopping",
+      });
+    } else if (message.type === "provider.send") {
+      send({
+        type: "provider.rejected",
+        connectionId: message.connectionId,
+        acceptanceId: message.acceptanceId,
+        error: "Plugin is stopping",
+      });
+    } else if (message.type === "provider.close") {
+      send({ type: "provider.closed", connectionId: message.connectionId });
+    }
+  }
+
+  function handleMessage(rawMessage: unknown): void {
+    const parsed = PluginProcessRequestSchema.safeParse(rawMessage);
+    if (!parsed.success) {
+      const value = rawMessage as { connectionId?: unknown; acceptanceId?: unknown } | null;
+      if (
+        value &&
+        typeof value.connectionId === "string" &&
+        typeof value.acceptanceId === "string"
+      ) {
+        send({
+          type: "provider.rejected",
+          connectionId: value.connectionId,
+          acceptanceId: value.acceptanceId,
+          error: `Invalid provider input: ${parsed.error.message}`,
+        });
+        void closeProviderConnection(value.connectionId);
+        return;
+      }
+      send({ type: "fatal", error: `Invalid plugin process request: ${parsed.error.message}` });
+      void shutdown();
+      return;
+    }
+    const message = parsed.data;
+    if (message.type === "initialize") {
+      void initialize(message).catch(async (error) => {
+        send({ type: "fatal", error: describeError(error) });
+        await paseo
+          ?.dispose()
+          .catch((failure) => console.error("Plugin API cleanup failed", failure));
+        await daemonClient?.close().catch(() => undefined);
+      });
+      return;
+    }
+    if (message.type === "shutdown") {
+      void shutdown();
+      return;
+    }
+    if (stopping) {
+      rejectWhileStopping(message);
+      return;
+    }
+    if (message.type === "provider.status") {
+      void (async () => {
+        const provider = providers.get(message.providerId);
+        if (!provider || !provider.status)
+          throw new Error(`Provider has no status capability: ${message.providerId}`);
+        const output = ProviderStatusSchema.parse(await provider.status(message.request));
+        send({ type: "result", requestId: message.requestId, output });
+      })().catch((error) =>
+        send({ type: "error", requestId: message.requestId, error: describeError(error) }),
+      );
+      return;
+    }
+    if (message.type === "provider.catalog_key") {
+      void (async () => {
+        const provider = providers.get(message.providerId);
+        if (!provider) throw new Error(`Unknown provider: ${message.providerId}`);
+        const output = await provider.getCatalogCacheKey?.(message.options);
+        if (output !== undefined && typeof output !== "string")
+          throw new Error("Invalid catalogue key");
+        send({ type: "result", requestId: message.requestId, output });
+      })().catch((error) =>
+        send({ type: "error", requestId: message.requestId, error: describeError(error) }),
+      );
+      return;
+    }
+    if (message.type === "usage.fetch" || message.type === "usage.discover") {
+      handleUsageRequest(message);
+      return;
+    }
+    if (message.type === "provider.connect") {
+      void connectProvider(message).catch((error) => {
+        if (stopping) return;
+        send({
+          type: "provider.connect_failed",
+          connectionId: message.connectionId,
+          error: describeError(error),
+        });
+      });
+      return;
+    }
+    if (message.type === "provider.send") {
+      void sendProviderInput(message).catch((error) => {
+        if (stopping) return;
+        send({
+          type: "provider.rejected",
+          connectionId: message.connectionId,
+          acceptanceId: message.acceptanceId,
+          error: describeError(error),
+        });
+      });
+      return;
+    }
+    if (message.type === "provider.close") {
+      void closeProviderConnection(message.connectionId);
+      return;
+    }
+    if (message.type === "paseo_frame" || message.type === "paseo_close") return;
+    if (isHookMessage(message)) {
+      handleHookMessage(message);
+      return;
+    }
+    const registered = handlers.get(message.method);
+    if (!registered) {
+      send({
+        type: "error",
+        requestId: message.requestId,
+        error: `Unknown RPC method: ${message.method}`,
+      });
+      return;
+    }
+    void registered.contract.input
+      .parseAsync(message.input)
+      .then((input) => {
+        if (!paseo) throw new Error("Plugin Paseo API is unavailable");
+        return registered.handler(input, { paseo });
+      })
+      .then((output) => registered.contract.output.parseAsync(output))
+      .then(
+        (output) => send({ type: "result", requestId: message.requestId, output }),
+        (error) =>
+          send({ type: "error", requestId: message.requestId, error: describeError(error) }),
+      );
+  }
+  channel.onMessage(handleMessage);
+
+  function handleHookMessage(
+    message: Extract<PluginProcessRequest, { type: "hook" | "hook.cancel" }>,
+  ): void {
+    if (message.type === "hook.cancel") {
+      hooks.cancel(message.requestId);
+      return;
+    }
+    if (message.type === "hook") {
+      if (!paseo) {
+        send({
+          type: "error",
+          requestId: message.requestId,
+          error: "Plugin Paseo API is unavailable",
+        });
+        return;
+      }
+      void hooks.invoke(message.requestId, message.kind, message.name, message.input, paseo).then(
+        (output) => {
+          return send({ type: "result", requestId: message.requestId, output });
+        },
+        (error) => {
+          return send({ type: "error", requestId: message.requestId, error: describeError(error) });
+        },
+      );
+      return;
+    }
+  }
+
+  function isHookMessage(
+    message: PluginProcessRequest,
+  ): message is Extract<PluginProcessRequest, { type: "hook" | "hook.cancel" }> {
+    return message.type === "hook" || message.type === "hook.cancel";
+  }
+  return { shutdown };
+}
+
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+  let worker: ReturnType<typeof createPluginWorker> | null = null;
+  const handlers = new Set<(message: PluginProcessRequest) => void>();
+  const channel: PluginWorkerChannel = {
+    send(message, callback) {
+      if (callback) process.send?.(message, () => callback());
+      else process.send?.(message);
+    },
+    onMessage(handler) {
+      handlers.add(handler);
+      return () => {
+        handlers.delete(handler);
+      };
+    },
+    disconnect() {
+      process.disconnect();
+    },
+  };
+  process.on("message", (raw) => {
+    const parsed = PluginProcessRequestSchema.safeParse(raw);
+    if (!worker && parsed.success && parsed.data.type === "initialize") {
+      try {
+        worker = createPluginWorker({ channel, contribute: evaluateBundle(parsed.data.bundle) });
+      } catch (error) {
+        channel.send({ type: "fatal", error: describeError(error) });
+        return;
+      }
+    }
+    if (worker) for (const handler of handlers) handler(raw as PluginProcessRequest);
+  });
+}
diff --git a/packages/server/src/server/plugins/plugin-sdk-specifiers.ts b/packages/server/src/server/plugins/plugin-sdk-specifiers.ts
index f4ae72e55b..079f1c501d 100644
--- a/packages/server/src/server/plugins/plugin-sdk-specifiers.ts
+++ b/packages/server/src/server/plugins/plugin-sdk-specifiers.ts
@@ -1,35 +1,27 @@
-// Specifiers a plugin author can import to reach the SDK. The daemon never resolves these
-// from disk: the compiler marks them external and the plugin subprocess hands back its own
-// runtime, so a plugin typechecks against generated declarations without installing anything.
-//
-// COMPAT(plugin-sdk-scope): @paseo/plugin was the SDK name through 0.5.0-beta.1 and was never
-// published — that scope is not ours. Plugins scaffolded against that name still import it, so
-// both spellings resolve. Remove the @paseo/* entries after 2026-11-19.
+// These entries are supplied by the host and remain external in author bundles.
 export const PLUGIN_CLIENT_ONLY_SDK_SPECIFIERS = [
-  "@getpaseo/plugin/react-native",
-  "@paseo/plugin/react-native",
+  "@getpaseo/plugin/client",
+  "@getpaseo/plugin/client/ui",
+  "@getpaseo/plugin/client/react-native",
 ] as const;
 
-export const PLUGIN_SERVER_TYPES_SDK_SPECIFIERS = [
+const PLUGIN_SERVER_ONLY_SDK_SPECIFIERS = [
   "@getpaseo/plugin/server",
-  "@paseo/plugin/server",
+  "@getpaseo/plugin/server/provider",
+  "@getpaseo/plugin/server/usage",
+  "@getpaseo/plugin/server/acp",
 ] as const;
 
 export const PLUGIN_SDK_SPECIFIERS = [
   "@getpaseo/plugin",
-  "@paseo/plugin",
-  ...PLUGIN_SERVER_TYPES_SDK_SPECIFIERS,
+  ...PLUGIN_SERVER_ONLY_SDK_SPECIFIERS,
   ...PLUGIN_CLIENT_ONLY_SDK_SPECIFIERS,
 ] as const;
 
-export function isPluginSdkSpecifier(name: string): boolean {
-  return (PLUGIN_SDK_SPECIFIERS as readonly string[]).includes(name);
-}
-
 export function isPluginClientOnlySdkSpecifier(name: string): boolean {
   return (PLUGIN_CLIENT_ONLY_SDK_SPECIFIERS as readonly string[]).includes(name);
 }
 
-export function isPluginServerTypesSdkSpecifier(name: string): boolean {
-  return (PLUGIN_SERVER_TYPES_SDK_SPECIFIERS as readonly string[]).includes(name);
+export function isPluginServerOnlySdkSpecifier(name: string): boolean {
+  return (PLUGIN_SERVER_ONLY_SDK_SPECIFIERS as readonly string[]).includes(name);
 }
diff --git a/packages/server/src/server/plugins/preparation.test.ts b/packages/server/src/server/plugins/preparation.test.ts
new file mode 100644
index 0000000000..0fdb0e34fc
--- /dev/null
+++ b/packages/server/src/server/plugins/preparation.test.ts
@@ -0,0 +1,128 @@
+import { chmod, mkdtemp, readFile, realpath, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import { runPluginBuild } from "./preparation.js";
+
+describe("runPluginBuild", () => {
+  const directories: string[] = [];
+
+  afterEach(async () => {
+    await Promise.all(
+      directories.splice(0).map((dir) => rm(dir, { recursive: true, force: true })),
+    );
+  });
+
+  it("executes build commands in the target directory", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+
+    await runPluginBuild(
+      directory,
+      [
+        [process.execPath, "-e", 'require("node:fs").writeFileSync("step1.txt", process.cwd());'],
+        [
+          process.execPath,
+          "-e",
+          'require("node:fs").writeFileSync("step2.txt", process.argv[1]);',
+          "step2-arg",
+        ],
+      ],
+      logger,
+    );
+
+    const step1 = await readFile(path.join(directory, "step1.txt"), "utf8");
+    const step2 = await readFile(path.join(directory, "step2.txt"), "utf8");
+
+    expect(await realpath(step1)).toBe(await realpath(directory));
+    expect(step2).toBe("step2-arg");
+  });
+
+  it.runIf(process.platform === "win32")("executes Windows command scripts (.cmd)", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+    const scriptPath = path.join(directory, "build.cmd");
+    await writeFile(scriptPath, "@echo off\r\necho %1> result.txt\r\n");
+
+    await runPluginBuild(directory, [[scriptPath, "windows-build-ok"]], logger);
+
+    const result = await readFile(path.join(directory, "result.txt"), "utf8");
+    expect(result.trim()).toBe("windows-build-ok");
+  });
+
+  it.runIf(process.platform === "win32")(
+    "executes bare Windows command scripts resolved through PATH",
+    async () => {
+      const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+      directories.push(directory);
+      const logger = createTestLogger();
+
+      await runPluginBuild(directory, [["npm", "init", "-y"]], logger);
+
+      const manifest = JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"));
+      expect(manifest.name).toBe(path.basename(directory).toLowerCase());
+    },
+  );
+
+  it("passes arguments unchanged to a native executable", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+
+    await runPluginBuild(
+      directory,
+      [
+        [
+          process.execPath,
+          "-e",
+          'require("node:fs").writeFileSync("args.txt", process.argv[1]);',
+          "a & b (c) !",
+        ],
+      ],
+      logger,
+    );
+
+    const args = await readFile(path.join(directory, "args.txt"), "utf8");
+    expect(args).toBe("a & b (c) !");
+  });
+
+  it.runIf(process.platform !== "win32")("executes POSIX shell scripts", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+    const scriptPath = path.join(directory, "build.sh");
+    await writeFile(scriptPath, '#!/bin/sh\necho "$1" > result.txt\n');
+    await chmod(scriptPath, 0o755);
+
+    await runPluginBuild(directory, [[scriptPath, "posix-build-ok"]], logger);
+
+    const result = await readFile(path.join(directory, "result.txt"), "utf8");
+    expect(result.trim()).toBe("posix-build-ok");
+  });
+
+  it("throws when a build command exits with a non-zero code", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+
+    await expect(
+      runPluginBuild(
+        directory,
+        [[process.execPath, "-e", "console.error('build failed'); process.exit(2);"]],
+        logger,
+      ),
+    ).rejects.toThrow(/Plugin build command failed \(exit 2\)/);
+  });
+
+  it("handles empty or undefined build commands gracefully", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-build-"));
+    directories.push(directory);
+    const logger = createTestLogger();
+
+    await expect(runPluginBuild(directory, undefined, logger)).resolves.toBeUndefined();
+    await expect(runPluginBuild(directory, [], logger)).resolves.toBeUndefined();
+  });
+});
diff --git a/packages/server/src/server/plugins/preparation.ts b/packages/server/src/server/plugins/preparation.ts
index 1e9b4aabef..267f9697e9 100644
--- a/packages/server/src/server/plugins/preparation.ts
+++ b/packages/server/src/server/plugins/preparation.ts
@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { spawnProcess } from "../../utils/spawn.js";
 import type pino from "pino";
 import type { PluginManifest } from "./manifest.js";
 
@@ -33,14 +33,14 @@ function run(command: string[], directory: string): Promise<CommandResult> {
   return new Promise((resolve) => {
     const executable = command[0]!;
     const arguments_ = command.slice(1);
-    const child = spawn(executable, arguments_, { cwd: directory, shell: false });
+    const child = spawnProcess(executable, arguments_, { cwd: directory });
     let stdout = "";
     let stderr = "";
     let error: Error | undefined;
-    child.stdout.on("data", (chunk: Buffer | string) => {
+    child.stdout?.on("data", (chunk: Buffer | string) => {
       stdout = appendOutput(stdout, chunk.toString());
     });
-    child.stderr.on("data", (chunk: Buffer | string) => {
+    child.stderr?.on("data", (chunk: Buffer | string) => {
       stderr = appendOutput(stderr, chunk.toString());
     });
     child.once("error", (spawnError) => {
diff --git a/packages/server/src/server/plugins/provider-icon.test.ts b/packages/server/src/server/plugins/provider-icon.test.ts
new file mode 100644
index 0000000000..4faf9d289c
--- /dev/null
+++ b/packages/server/src/server/plugins/provider-icon.test.ts
@@ -0,0 +1,84 @@
+import { mkdir, mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, test } from "vitest";
+import { readPluginProviderIcon } from "./provider-icon.js";
+
+const directories: string[] = [];
+
+async function writeIcon(contents: string): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-icon-"));
+  directories.push(directory);
+  await writeFile(path.join(directory, "icon.svg"), contents);
+  return directory;
+}
+
+afterEach(async () => {
+  await Promise.all(
+    directories.splice(0).map((directory) => rm(directory, { recursive: true, force: true })),
+  );
+});
+
+describe("readPluginProviderIcon", () => {
+  test("accepts a self-contained SVG", async () => {
+    const svg =
+      '<svg viewBox="0 0 24 24"><defs><path id="mark" d="M0 0h1v1z" /></defs><use href="#mark" /></svg>';
+    const directory = await writeIcon(svg);
+
+    await expect(readPluginProviderIcon(directory, "icon.svg")).resolves.toBe(svg);
+  });
+
+  test.each([
+    ["non-SVG document", "hello", "file is not an SVG document"],
+    ["script", "<svg><script /></svg>", "script elements"],
+    ["foreign object", "<svg><foreignObject /></svg>", "foreignObject elements"],
+    ["style", "<svg><style /></svg>", "style elements"],
+    ["event handler", '<svg><path onclick="run()" /></svg>', "event-handler attributes"],
+    ["javascript URL", '<svg><a href="javascript:run()" /></svg>', "javascript URLs"],
+    ["external href", '<svg><use href="https://example.com/icon.svg" /></svg>', "external href"],
+  ])("rejects %s", async (_name, svg, reason) => {
+    const directory = await writeIcon(svg);
+
+    await expect(readPluginProviderIcon(directory, "icon.svg")).rejects.toThrow(
+      `icon.svg": ${reason}`,
+    );
+  });
+
+  test("rejects a path outside the plugin directory", async () => {
+    const directory = await writeIcon("<svg />");
+
+    await expect(readPluginProviderIcon(directory, "../icon.svg")).rejects.toThrow(
+      "path leaves the plugin directory",
+    );
+  });
+
+  test("rejects a symlink that escapes the plugin directory", async () => {
+    const directory = await writeIcon("<svg />");
+    const externalDirectory = await mkdtemp(path.join(tmpdir(), "paseo-external-icon-"));
+    directories.push(externalDirectory);
+    const externalIcon = path.join(externalDirectory, "external.svg");
+    await writeFile(externalIcon, "<svg />");
+    await symlink(externalIcon, path.join(directory, "linked.svg"));
+
+    await expect(readPluginProviderIcon(directory, "linked.svg")).rejects.toThrow(
+      "path leaves the plugin directory",
+    );
+  });
+
+  test("rejects a directory instead of a regular file", async () => {
+    const directory = await writeIcon("<svg />");
+    await mkdir(path.join(directory, "nested.svg"));
+
+    await expect(readPluginProviderIcon(directory, "nested.svg")).rejects.toThrow(
+      "file does not exist or is not a regular file",
+    );
+  });
+
+  test("rejects an icon larger than 64 KiB", async () => {
+    const directory = await writeIcon(`<svg>${" ".repeat(64 * 1024)}</svg>`);
+
+    await expect(readPluginProviderIcon(directory, "icon.svg")).rejects.toThrow(
+      "file exceeds 64 KiB",
+    );
+  });
+});
diff --git a/packages/server/src/server/plugins/provider-icon.ts b/packages/server/src/server/plugins/provider-icon.ts
new file mode 100644
index 0000000000..9a1e3f6714
--- /dev/null
+++ b/packages/server/src/server/plugins/provider-icon.ts
@@ -0,0 +1,64 @@
+import { readFile, realpath, stat } from "node:fs/promises";
+import path from "node:path";
+
+const MAX_ICON_BYTES = 64 * 1024;
+
+export async function readPluginProviderIcon(
+  pluginDirectory: string,
+  iconPath: string,
+): Promise<string> {
+  const resolvedDirectory = await realpath(path.resolve(pluginDirectory));
+  const requestedIcon = path.resolve(resolvedDirectory, iconPath);
+  assertInsidePluginDirectory(resolvedDirectory, requestedIcon, iconPath);
+  const resolvedIcon = await realpath(requestedIcon).catch(() => null);
+  if (!resolvedIcon) {
+    throw iconError(iconPath, "file does not exist or is not a regular file");
+  }
+  assertInsidePluginDirectory(resolvedDirectory, resolvedIcon, iconPath);
+
+  const iconStat = await stat(resolvedIcon);
+  if (!iconStat.isFile()) {
+    throw iconError(iconPath, "file does not exist or is not a regular file");
+  }
+  if (iconStat.size > MAX_ICON_BYTES) throw iconError(iconPath, "file exceeds 64 KiB");
+
+  const svg = await readFile(resolvedIcon, "utf8");
+  validateSvg(iconPath, svg);
+  return svg;
+}
+
+function assertInsidePluginDirectory(
+  resolvedDirectory: string,
+  resolvedIcon: string,
+  iconPath: string,
+): void {
+  const relative = path.relative(resolvedDirectory, resolvedIcon);
+  const escapesDirectory =
+    relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative);
+  if (escapesDirectory) throw iconError(iconPath, "path leaves the plugin directory");
+}
+
+function validateSvg(iconPath: string, svg: string): void {
+  if (!/^\s*<svg(?:\s|>)/i.test(svg)) throw iconError(iconPath, "file is not an SVG document");
+  if (/<script(?:\s|>)/i.test(svg)) throw iconError(iconPath, "script elements are not allowed");
+  if (/<foreignObject(?:\s|>)/i.test(svg)) {
+    throw iconError(iconPath, "foreignObject elements are not allowed");
+  }
+  if (/<style(?:\s|>)/i.test(svg)) throw iconError(iconPath, "style elements are not allowed");
+  if (/\son[a-z0-9_-]*\s*=/i.test(svg)) {
+    throw iconError(iconPath, "event-handler attributes are not allowed");
+  }
+  if (/javascript\s*:/i.test(svg)) throw iconError(iconPath, "javascript URLs are not allowed");
+
+  const hrefPattern = /\s(?:href|xlink:href)\s*=\s*(?:(["'])(.*?)\1|([^\s>]+))/gi;
+  for (const match of svg.matchAll(hrefPattern)) {
+    const href = match[2] ?? match[3] ?? "";
+    if (!href.startsWith("#")) {
+      throw iconError(iconPath, "external href references are not allowed");
+    }
+  }
+}
+
+function iconError(iconPath: string, reason: string): Error {
+  return new Error(`Invalid plugin provider icon "${iconPath}": ${reason}`);
+}
diff --git a/packages/server/src/server/plugins/requirements.posix.test.ts b/packages/server/src/server/plugins/requirements.posix.test.ts
new file mode 100644
index 0000000000..65462336a3
--- /dev/null
+++ b/packages/server/src/server/plugins/requirements.posix.test.ts
@@ -0,0 +1,137 @@
+import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import pino from "pino";
+import { afterEach, expect, it } from "vitest";
+import { DaemonConfigStore } from "../daemon-config-store.js";
+import { runGitCommand } from "../../utils/run-git-command.js";
+import { PluginService } from "./index.js";
+import { ManagedPluginSources } from "./managed-source.js";
+
+const roots: string[] = [];
+const services: PluginService[] = [];
+async function directory() {
+  const root = await mkdtemp(path.join(tmpdir(), "plugin-requirements-"));
+  roots.push(root);
+  return root;
+}
+async function writePlugin(root: string, paseo?: string, build?: string[][]) {
+  await writeFile(
+    path.join(root, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "example",
+      requirements: paseo === undefined ? undefined : { paseo },
+      build,
+    }),
+  );
+  await writeFile(
+    path.join(root, "index.client.ts"),
+    "export default function contribute() { return () => {}; }",
+  );
+}
+async function host(version = "0.8.0", pluginPath?: string) {
+  const home = await directory();
+  const store = new DaemonConfigStore(home, {
+    mcp: { injectIntoAgents: true },
+    browserTools: { enabled: false },
+    providers: {},
+    metadataGeneration: { providers: [] },
+    autoArchiveAfterMerge: false,
+    enableTerminalAgentHooks: false,
+    appendSystemPrompt: "",
+    pluginsEnabled: true,
+    plugins: pluginPath
+      ? { example: { source: "directory", path: pluginPath, enabled: true } }
+      : {},
+  });
+  const service = new PluginService(pino({ level: "silent" }), store, version, {
+    managedSources: new ManagedPluginSources(home),
+  });
+  services.push(service);
+  await service.start();
+  return { home, store, service };
+}
+afterEach(async () => {
+  await Promise.all(services.splice(0).map((service) => service.stopAllPlugins()));
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+
+it("rejects incompatible installs without persisting them, then accepts the corrected manifest", async () => {
+  const root = await directory();
+  await writePlugin(root, ">=0.9.0");
+  const { service, store } = await host();
+  await expect(service.installDirectory({ path: root })).rejects.toThrow("Your daemon is 0.8.0");
+  expect(store.get().plugins).toEqual({});
+  expect(service.catalog()).toEqual([]);
+  await writePlugin(root, "^0.8.0");
+  await expect(service.installDirectory({ path: root })).resolves.toMatchObject({
+    status: "running",
+  });
+  expect(service.catalog()).toEqual([
+    { id: "example", requirements: { paseo: "^0.8.0" }, clientBundle: expect.any(String) },
+  ]);
+});
+
+it("marks pre-0.8 plugins failed on startup and recovers after migration and reload", async () => {
+  const root = await directory();
+  await writePlugin(root);
+  const { service } = await host("0.8.0", root);
+  expect(await service.listPlugins()).toEqual([
+    expect.objectContaining({
+      status: "failed",
+      error: expect.stringContaining("https://paseo.sh/docs/plugins/migration"),
+    }),
+  ]);
+  await writePlugin(root, ">=0.8.0");
+  await expect(service.reloadPlugin("example")).resolves.toMatchObject({ status: "running" });
+  await writePlugin(root, ">=0.9.0");
+  await expect(service.reloadPlugin("example")).rejects.toThrow("requires Paseo >=0.9.0");
+  expect(service.catalog()).toEqual([]);
+});
+
+it("still requires entry migration when an old plugin adds a compatible requirement", async () => {
+  const root = await directory();
+  await writePlugin(root, ">=0.8.0");
+  await rm(path.join(root, "index.client.ts"));
+  await writeFile(path.join(root, "index.ts"), "export default () => () => {};");
+  const { service } = await host();
+  await expect(service.installDirectory({ path: root })).rejects.toThrow(
+    "https://paseo.sh/docs/plugins/migration",
+  );
+});
+
+it("rejects Git install and update before build commands, preserving the running revision", async () => {
+  const repository = await directory();
+  await runGitCommand(["init", "-b", "main"], { cwd: repository });
+  await runGitCommand(["config", "user.name", "Paseo Tests"], { cwd: repository });
+  await runGitCommand(["config", "user.email", "tests@example.test"], { cwd: repository });
+  const commit = async () => {
+    await runGitCommand(["add", "-A"], { cwd: repository });
+    await runGitCommand(["commit", "-m", "plugin"], { cwd: repository });
+  };
+  await writePlugin(repository, ">=0.8.0");
+  await commit();
+  const { service, home } = await host();
+  const source = pathToFileURL(repository).href;
+  const installed = await service.installSource({ source });
+  const marker = path.join(home, "build-executed");
+  await writePlugin(repository, ">=0.9.0", [
+    [process.execPath, "-e", 'require("node:fs").writeFileSync(process.argv[1], "ran")', marker],
+  ]);
+  await commit();
+  const [preview] = await service.previewUpdates({ pluginId: "example" });
+  expect(preview).toMatchObject({ outcome: "update" });
+  await expect(service.applyUpdates([preview!.proposal!])).resolves.toMatchObject([
+    { id: "example", outcome: "error", error: expect.stringContaining("requires Paseo >=0.9.0") },
+  ]);
+  expect(await service.listPlugins()).toEqual([installed]);
+  expect(service.catalog()).toHaveLength(1);
+  expect(await readdir(path.join(home, "plugins", ".staging"))).toEqual([]);
+  await expect(readFile(marker)).rejects.toMatchObject({ code: "ENOENT" });
+  await expect(service.installSource({ source, id: "second" })).rejects.toThrow(
+    "requires Paseo >=0.9.0",
+  );
+  await expect(readFile(marker)).rejects.toMatchObject({ code: "ENOENT" });
+  expect(await service.listPlugins()).toEqual([installed]);
+});
diff --git a/packages/server/src/server/plugins/runtime.posix.test.ts b/packages/server/src/server/plugins/runtime.posix.test.ts
index 6980a6f7e3..8dd80ce499 100644
--- a/packages/server/src/server/plugins/runtime.posix.test.ts
+++ b/packages/server/src/server/plugins/runtime.posix.test.ts
@@ -1,15 +1,23 @@
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { fork } from "node:child_process";
 import { tmpdir } from "node:os";
 import { PassThrough } from "node:stream";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import pino from "pino";
+import type { ProviderEvent, ProviderRegistration } from "@getpaseo/plugin/server/provider";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import type { AgentStreamEvent } from "../agent/agent-sdk-types.js";
+import { PluginAgentClientRegistry } from "../agent/plugin-provider.js";
 import { PluginRuntime } from "./runtime.js";
 import type { PluginSessionSocket } from "./session-socket.js";
 
 const temporaryDirectories: string[] = [];
 
+function hasCompletedAgentTurn(events: readonly AgentStreamEvent[]): boolean {
+  return events.some((event) => event.type === "turn_completed");
+}
+
 async function createPlugin(id: string, source: string): Promise<string> {
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-"));
   temporaryDirectories.push(directory);
@@ -18,7 +26,40 @@ async function createPlugin(id: string, source: string): Promise<string> {
   return directory;
 }
 
-function createReloadChild(name: string, events: string[], methods: string[] = []) {
+async function readTextIfPresent(filePath: string): Promise<string | null> {
+  try {
+    return await readFile(filePath, "utf8");
+  } catch {
+    return null;
+  }
+}
+
+function pluginMessages(runtime: PluginRuntime, pluginId: string): string[] {
+  return runtime.getLogs(pluginId).map((entry) => entry.message);
+}
+
+function spawnObservedPluginProcess(onMessage: (message: unknown) => void) {
+  const loaderUrl = new URL("../../terminal/terminal-ts-loader.mjs", import.meta.url).href;
+  const setup = `import { register } from "node:module"; register(${JSON.stringify(loaderUrl)});`;
+  const child = fork(new URL("./plugin-process.ts", import.meta.url), [], {
+    execArgv: [
+      "--experimental-strip-types",
+      "--import",
+      `data:text/javascript,${encodeURIComponent(setup)}`,
+    ],
+    serialization: "advanced",
+    stdio: ["ignore", "pipe", "pipe", "ipc"],
+  });
+  child.on("message", onMessage);
+  return child;
+}
+
+function createReloadChild(
+  name: string,
+  events: string[],
+  methods: string[] = [],
+  providers: Array<{ id: string; label: string }> = [],
+) {
   const listeners = new Map<string, Array<(message: never) => void>>();
   const emit = (event: string, message: unknown) => {
     for (const listener of listeners.get(event) ?? []) listener(message as never);
@@ -32,7 +73,7 @@ function createReloadChild(name: string, events: string[], methods: string[] = [
       callback?.(null);
       if (message.type === "initialize") {
         events.push(`start:${name}`);
-        queueMicrotask(() => emit("message", { type: "ready", methods }));
+        queueMicrotask(() => emit("message", { type: "ready", methods, providers }));
       }
       if (message.type === "shutdown") {
         events.push(`shutdown:${name}`);
@@ -59,14 +100,18 @@ function createReloadChild(name: string, events: string[], methods: string[] = [
       listeners.set(event, registered);
       return this;
     },
+    emitMessage(message: unknown) {
+      emit("message", message);
+    },
   };
 }
 
 function createTestRuntime(
   dependencies: NonNullable<ConstructorParameters<typeof PluginRuntime>[2]> = {},
   logger = pino({ level: "silent" }),
+  version = "0.4.0",
 ): PluginRuntime {
-  return new PluginRuntime(logger, "0.4.0", {
+  return new PluginRuntime(logger, version, {
     ...dependencies,
     sessionHost: dependencies.sessionHost ?? {
       async attachPluginSocket(_pluginId, socket) {
@@ -84,7 +129,7 @@ function createTestRuntime(
                   status: "server_info",
                   serverId: "plugin-test",
                   hostname: "plugin-test",
-                  version: "0.4.0",
+                  version,
                   features: {},
                 },
               },
@@ -99,8 +144,28 @@ function createTestRuntime(
 
 function createTrackedSessionHost() {
   const active = new Set<object>();
+  // One entry per hello handshake: an attached socket is not a redialled one.
+  const hellos: object[] = [];
+  const waiters = new Set<{ count: number; resolve: () => void }>();
+  function recordHello(socket: object): void {
+    hellos.push(socket);
+    for (const waiter of waiters) {
+      if (hellos.length < waiter.count) continue;
+      waiters.delete(waiter);
+      waiter.resolve();
+    }
+  }
   return {
     active,
+    hellos,
+    // Resolves on the handshake itself rather than after a delay, so the test
+    // waits for the event it cares about instead of a guess at how long it takes.
+    waitForHellos(count: number): Promise<void> {
+      if (hellos.length >= count) return Promise.resolve();
+      return new Promise<void>((resolve) => {
+        waiters.add({ count, resolve });
+      });
+    },
     host: {
       async attachPluginSocket(_pluginId: string, socket: PluginSessionSocket) {
         const closed = new Promise<void>((resolve) => socket.once("close", resolve));
@@ -110,6 +175,7 @@ function createTrackedSessionHost() {
           if (typeof data !== "string") return;
           const message = JSON.parse(data);
           if (message.type !== "hello") return;
+          recordHello(socket);
           socket.send(
             JSON.stringify({
               type: "session",
@@ -140,6 +206,42 @@ function lifecycleMessages(runtime: PluginRuntime): string[] {
     .sort();
 }
 
+function hasCompletedTurn(events: readonly ProviderEvent[]): boolean {
+  return events.some((event) => event.type === "session.turn" && event.state === "completed");
+}
+
+function hasReadyRequest(events: readonly ProviderEvent[], requestId: string): boolean {
+  return events.some((event) => event.type === "session.ready" && event.requestId === requestId);
+}
+
+function runtimeFailure(events: readonly ProviderEvent[]): ProviderEvent | undefined {
+  return events.find((event) => event.type === "session.runtime_failed");
+}
+
+function providerCloseCount(
+  messages: readonly { type: string; connectionId?: string }[],
+  connectionId: string | undefined,
+): number {
+  return messages.filter(
+    (message) => message.type === "provider.close" && message.connectionId === connectionId,
+  ).length;
+}
+
+function hasMessageType(messages: readonly { type: string }[], type: string): boolean {
+  return messages.some((message) => message.type === type);
+}
+
+function adaptRuntimeProvider(
+  runtime: PluginRuntime,
+  pluginId: string,
+  metadata: { id: string; label: string; description?: string; icon?: string },
+): ProviderRegistration {
+  return {
+    ...metadata,
+    connect: (request) => runtime.connectProvider(pluginId, metadata.id, request),
+  };
+}
+
 afterEach(async () => {
   await Promise.all(
     temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
@@ -147,6 +249,582 @@ afterEach(async () => {
 });
 
 describe("PluginRuntime", () => {
+  it.each([
+    { specifier: "@getpaseo/plugin", moduleDirectory: "shared" },
+    { specifier: "@getpaseo/plugin", moduleDirectory: "server" },
+  ])(
+    "loads $specifier contracts without React in the subprocess module graph",
+    async ({ specifier, moduleDirectory }) => {
+      const directory = await createPlugin(
+        "react-free",
+        `import { rpc } from "./${moduleDirectory}/contract";
+export default function contribute(server) {
+  server.handle(rpc, (input) => input);
+  return () => {};
+}`,
+      );
+      await mkdir(path.join(directory, moduleDirectory));
+      await writeFile(
+        path.join(directory, moduleDirectory, "contract.ts"),
+        `import { defineRpc, defineAttachmentSource } from "${specifier}";
+import { z } from "zod";
+export const rpc = defineRpc({ name: "echo", input: z.string(), output: z.string() });
+const source = defineAttachmentSource({ id: "test", search: rpc });
+if (source.search !== rpc) throw new Error("Attachment contract was not preserved");`,
+      );
+      // Reject imports even when the workspace has React installed. This covers the host's
+      // static graph and SDK imports evaluated through the compiled plugin's runtimeRequire.
+      const guard = `export function resolve(specifier, context, nextResolve) {
+  if (/^(react|react-dom|react-native|use-sync-external-store)(\\/|$)/.test(specifier)) {
+    throw new Error("React module reached plugin subprocess: " + specifier);
+  }
+  return nextResolve(specifier, context);
+}`;
+      const guardUrl = `data:text/javascript,${encodeURIComponent(guard)}`;
+      const loaderUrl = new URL("../../terminal/terminal-ts-loader.mjs", import.meta.url).href;
+      const setup = `import { register } from "node:module";
+register(${JSON.stringify(loaderUrl)});
+register(${JSON.stringify(guardUrl)});`;
+      const runtime = createTestRuntime({
+        spawnChild: () =>
+          fork(new URL("./plugin-process.ts", import.meta.url), [], {
+            execArgv: [
+              "--experimental-strip-types",
+              "--import",
+              `data:text/javascript,${encodeURIComponent(setup)}`,
+            ],
+            serialization: "advanced",
+            stdio: ["ignore", "pipe", "pipe", "ipc"],
+          }),
+      });
+      try {
+        await runtime.startPlugin("react-free", directory);
+        await expect(runtime.invoke("react-free", "echo", "hello")).resolves.toBe("hello");
+      } catch (error) {
+        throw new Error(JSON.stringify(runtime.getLogs("react-free")), { cause: error });
+      } finally {
+        await runtime.stopAll();
+      }
+    },
+  );
+
+  it("runs the direct example through the existing AgentClient path", async () => {
+    const pluginId = "provider-direct-example";
+    const directory = fileURLToPath(
+      new URL("../../../../../plugin-examples/provider-direct/", import.meta.url),
+    );
+    const runtime = createTestRuntime({}, undefined, "0.8.0");
+    await runtime.startPlugin(pluginId, directory);
+    const [metadata] = runtime.getProviderRegistrations(pluginId);
+    expect(metadata).toBeDefined();
+    const adapters = new PluginAgentClientRegistry(pino({ level: "silent" }));
+    adapters.replace([adaptRuntimeProvider(runtime, pluginId, metadata!)]);
+    const client = adapters.clients()[metadata!.id];
+
+    const session = await client!.createSession({ provider: metadata!.id, cwd: directory });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    await expect(session.startTurn("hello", { clientMessageId: "direct-client" })).resolves.toEqual(
+      { turnId: "turn-1" },
+    );
+    await expect.poll(() => hasCompletedAgentTurn(events)).toBe(true);
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline",
+        item: {
+          type: "assistant_message",
+          id: undefined,
+          messageId: "assistant-1",
+          text: "Echo: hello",
+        },
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "provider_subagent",
+        event: expect.objectContaining({ type: "timeline" }),
+      }),
+    );
+
+    await session.close();
+    await adapters.shutdown();
+    await runtime.stopAll();
+  });
+
+  it("runs a provider connection through the real plugin subprocess boundary", async () => {
+    const directory = await createPlugin(
+      "provider-round-trip",
+      `import type { PluginServerContext } from "@getpaseo/plugin/server";
+import type { ProviderEvent, ProviderRegistration } from "@getpaseo/plugin/server/provider";
+
+const provider: ProviderRegistration = {
+  id: "direct-example",
+  label: "Direct example",
+  icon: "icon.svg",
+  async connect(request) {
+    const listeners = new Set<(event: ProviderEvent) => void>();
+    const emit = (event: ProviderEvent) => {
+      for (const listener of listeners) listener(event);
+    };
+    return {
+      version: request.versions[0] ?? 1,
+      capabilities: request.capabilities,
+      async send(input) {
+        if (input.type === "session.open") {
+          emit({
+            type: "session.opened",
+            requestId: input.requestId,
+            sessionId: input.sessionId,
+            capabilities: request.capabilities,
+            restoration: "core",
+            persistence: { version: 1, data: { resume: "native-1" } },
+            cwd: input.config.cwd,
+            futureField: "ignored by this protocol version",
+          } as ProviderEvent);
+          emit({
+            type: "session.config",
+            sessionId: input.sessionId,
+            config: {
+              model: "example-1",
+              models: [{ id: "example-1", label: "Example 1" }],
+              modes: [],
+              thinkingOptions: [],
+              settings: [
+                { type: "toggle", id: "concise", label: "Concise", value: true },
+              ],
+            },
+          });
+          emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+          return;
+        }
+        if (input.type !== "session.prompt") return;
+        if (input.prompt.input.type === "command") {
+          emit({
+            type: "session.prompt_result",
+            sessionId: input.sessionId,
+            clientMessageId: input.prompt.clientMessageId,
+            result: { type: "completed" },
+          });
+          return;
+        }
+        emit({
+          type: "timeline.item",
+          sessionId: input.sessionId,
+          item: {
+            type: "user_message",
+            id: "user-1",
+            text: "hello",
+            clientMessageId: input.prompt.clientMessageId,
+          },
+        });
+        emit({
+          type: "session.prompt_result",
+          sessionId: input.sessionId,
+          clientMessageId: input.prompt.clientMessageId,
+          result: { type: "turn", turnId: "turn-1" },
+        });
+        emit({
+          type: "session.opened",
+          sessionId: "child-1",
+          parentSessionId: input.sessionId,
+          capabilities: [],
+          restoration: "parent",
+          cwd: "/repo",
+        });
+        emit({
+          type: "timeline.item",
+          sessionId: "child-1",
+          item: {
+            type: "plugin",
+            id: "review-1",
+            pluginId: "provider-round-trip",
+            kind: "review",
+            version: 1,
+            data: { verdict: "ship" },
+          },
+        });
+      },
+      onEvent(listener) {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+      async close() {},
+    };
+  },
+};
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(provider);
+  return () => {};
+}`,
+    );
+    const runtime = createTestRuntime();
+    await runtime.startPlugin("provider-round-trip", directory);
+
+    const [registration] = runtime.getProviderRegistrations("provider-round-trip");
+    expect(registration).toMatchObject({
+      id: "direct-example",
+      label: "Direct example",
+      iconPath: "icon.svg",
+    });
+    const connection = await runtime.connectProvider("provider-round-trip", "direct-example", {
+      versions: [1],
+      capabilities: [
+        "prompt.message",
+        "prompt.command",
+        "session.configure",
+        "session.persistence",
+        "session.subsession",
+        "timeline.plugin",
+        "future.capability",
+      ],
+    });
+    expect(connection.capabilities).not.toContain("future.capability");
+    const events: ProviderEvent[] = [];
+    const unsubscribe = connection.onEvent((event) => events.push(event));
+
+    await connection.send({
+      type: "session.open",
+      requestId: "open-1",
+      sessionId: "root-1",
+      config: {
+        cwd: "/repo",
+        env: {},
+        mcpServers: {},
+        settings: {},
+        persist: true,
+      },
+      history: "replay",
+    });
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "root-1",
+      prompt: {
+        clientMessageId: "client-1",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "hello" }] },
+      },
+    });
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "root-1",
+      prompt: {
+        clientMessageId: "client-2",
+        delivery: "auto",
+        input: { type: "command", name: "compact", arguments: "" },
+      },
+    });
+
+    await expect.poll(() => events.length).toBe(8);
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.prompt_result",
+        clientMessageId: "client-1",
+        result: { type: "turn", turnId: "turn-1" },
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.prompt_result",
+        clientMessageId: "client-2",
+        result: { type: "completed" },
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.opened",
+        sessionId: "child-1",
+        parentSessionId: "root-1",
+      }),
+    );
+    expect(events.find((event) => event.type === "session.opened")).not.toHaveProperty(
+      "futureField",
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        sessionId: "child-1",
+        item: expect.objectContaining({ type: "plugin", pluginId: "provider-round-trip" }),
+      }),
+    );
+
+    unsubscribe();
+    await connection.close();
+    await runtime.stopAll();
+  });
+
+  it("adapts an ACP command and example transformer through the AgentClient path", async () => {
+    const transformerPath = fileURLToPath(
+      new URL(
+        "../../../../../plugin-examples/provider-acp-transformer/server/vendor-edit.ts",
+        import.meta.url,
+      ),
+    );
+    const directory = await createPlugin(
+      "provider-acp-round-trip",
+      `import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { runAcpProvider } from "@getpaseo/plugin/server/acp";
+import { vendorEditTransformer } from "./server/vendor-edit.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(runAcpProvider({
+    id: "acp-example",
+    label: "ACP example",
+    command: [process.execPath, __ACP_COMMAND__],
+    transformers: [vendorEditTransformer],
+  }));
+  return () => {};
+}`,
+    );
+    await mkdir(path.join(directory, "server"));
+    await writeFile(
+      path.join(directory, "server/vendor-edit.ts"),
+      await readFile(transformerPath, "utf8"),
+      "utf8",
+    );
+    const agentPath = path.join(directory, "fake-acp.cjs");
+    await writeFile(
+      agentPath,
+      `const readline = require("node:readline");
+const lines = readline.createInterface({ input: process.stdin });
+const send = (message) => process.stdout.write(JSON.stringify(message) + "\\n");
+lines.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    send({ jsonrpc: "2.0", id: message.id, result: { protocolVersion: message.params.protocolVersion, agentCapabilities: {} } });
+  } else if (message.method === "session/new") {
+    send({ jsonrpc: "2.0", id: message.id, result: { sessionId: "native-1", modes: null, configOptions: [] } });
+  } else if (message.method === "session/prompt") {
+    send({ jsonrpc: "2.0", method: "session/update", params: { sessionId: "native-1", update: { sessionUpdate: "tool_call", toolCallId: "edit-1", name: "vendor_file_edit", title: "Vendor edit", status: "completed", rawInput: { path: "/tmp/example.ts", before: "old", after: "new" } } } });
+    send({ jsonrpc: "2.0", method: "session/update", params: { sessionId: "native-1", update: { sessionUpdate: "agent_message_chunk", messageId: "assistant-1", content: { type: "text", text: "ACP says hi" } } } });
+    send({ jsonrpc: "2.0", id: message.id, result: { stopReason: "end_turn" } });
+  } else if (message.method === "session/close" || message.method === "session/cancel") {
+    send({ jsonrpc: "2.0", id: message.id, result: {} });
+  }
+});`,
+      "utf8",
+    );
+    const pluginPath = path.join(directory, "index.server.ts");
+    const pluginSource = (await readFile(pluginPath, "utf8")).replace(
+      "__ACP_COMMAND__",
+      JSON.stringify(agentPath),
+    );
+    await writeFile(pluginPath, pluginSource, "utf8");
+
+    const runtime = createTestRuntime();
+    await runtime.startPlugin("provider-acp-round-trip", directory);
+    const connection = await runtime.connectProvider("provider-acp-round-trip", "acp-example", {
+      versions: [1],
+      capabilities: ["prompt.message", "session.persistence"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+
+    await connection.send({
+      type: "session.open",
+      requestId: "open-acp",
+      sessionId: "paseo-1",
+      config: { cwd: directory, env: {}, mcpServers: {}, settings: {}, persist: true },
+      history: "skip",
+    });
+    await expect.poll(() => hasReadyRequest(events, "open-acp")).toBe(true);
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "paseo-1",
+      prompt: {
+        clientMessageId: "client-acp",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "hello" }] },
+      },
+    });
+
+    await expect.poll(() => hasCompletedTurn(events)).toBe(true);
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.prompt_result",
+        clientMessageId: "client-acp",
+        result: { type: "turn", turnId: "acp:client-acp" },
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          type: "assistant_message",
+          id: "assistant-1",
+          text: "ACP says hi",
+        }),
+      }),
+    );
+
+    await connection.close();
+    const [metadata] = runtime.getProviderRegistrations("provider-acp-round-trip");
+    const adapters = new PluginAgentClientRegistry(pino({ level: "silent" }));
+    adapters.replace([adaptRuntimeProvider(runtime, "provider-acp-round-trip", metadata!)]);
+    const client = adapters.clients()[metadata!.id];
+    const session = await client!.createSession({ provider: metadata!.id, cwd: directory });
+    const agentEvents: AgentStreamEvent[] = [];
+    session.subscribe((event) => agentEvents.push(event));
+    await expect(
+      session.startTurn("hello", { clientMessageId: "agent-client-acp" }),
+    ).resolves.toEqual({ turnId: "acp:agent-client-acp" });
+    await expect.poll(() => hasCompletedAgentTurn(agentEvents)).toBe(true);
+    expect(agentEvents).toContainEqual(
+      expect.objectContaining({
+        type: "timeline",
+        item: expect.objectContaining({ type: "assistant_message", text: "ACP says hi" }),
+      }),
+    );
+    expect(agentEvents).toContainEqual(
+      expect.objectContaining({
+        type: "timeline",
+        item: expect.objectContaining({
+          type: "tool_call",
+          callId: "edit-1",
+          detail: {
+            type: "edit",
+            filePath: "/tmp/example.ts",
+            oldString: "old",
+            newString: "new",
+            unifiedDiff: undefined,
+          },
+        }),
+      }),
+    );
+    await session.close();
+    await adapters.shutdown();
+    await runtime.stopAll();
+  });
+
+  it("rejects a malformed provider event from a real plugin subprocess", async () => {
+    const directory = await createPlugin(
+      "malicious-provider",
+      `import type { ProviderEvent, ProviderRegistration } from "@getpaseo/plugin/server/provider";
+let connectionId = "";
+process.on("message", (message: unknown) => {
+  const value = message as { type?: string; connectionId?: string };
+  if (value.type === "provider.connect") connectionId = value.connectionId ?? "";
+});
+const provider: ProviderRegistration = {
+  id: "malicious",
+  label: "Malicious",
+  async connect(request) {
+    const listeners = new Set<(event: ProviderEvent) => void>();
+    const emit = (event: ProviderEvent) => { for (const listener of listeners) listener(event); };
+    return {
+      version: request.versions[0] ?? 1,
+      capabilities: ["prompt.message"],
+      async send(input) {
+        if (input.type === "session.open") {
+          emit({ type: "session.opened", requestId: input.requestId, sessionId: input.sessionId, capabilities: ["prompt.message"], restoration: "core", cwd: input.config.cwd });
+          emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+        } else if (input.type === "session.prompt") {
+          process.send?.({ type: "provider.event", connectionId, event: { type: "invented.event", sessionId: input.sessionId } });
+        }
+      },
+      onEvent(listener) { listeners.add(listener); return () => listeners.delete(listener); },
+      async close() {},
+    };
+  },
+};
+export default function contribute(server: any) { server.registerProvider(provider); return () => undefined; }`,
+    );
+    const runtime = createTestRuntime();
+    await runtime.startPlugin("malicious-provider", directory);
+    const connection = await runtime.connectProvider("malicious-provider", "malicious", {
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send({
+      type: "session.open",
+      requestId: "open-malicious",
+      sessionId: "root-malicious",
+      config: { cwd: "/repo", env: {}, mcpServers: {}, settings: {}, persist: true },
+      history: "skip",
+    });
+
+    await expect(
+      connection.send({
+        type: "session.prompt",
+        sessionId: "root-malicious",
+        prompt: {
+          clientMessageId: "malformed-now",
+          delivery: "auto",
+          input: { type: "message", content: [{ type: "text", text: "break transport" }] },
+        },
+      }),
+    ).rejects.toThrow("invalid message");
+    expect(events).toContainEqual(
+      expect.objectContaining({ type: "session.runtime_failed", sessionId: "root-malicious" }),
+    );
+    expect(runtime.catalog()).toHaveLength(1);
+    await runtime.stopAll();
+  });
+
+  it("emits runtime failure for live sessions when a real plugin process dies", async () => {
+    const directory = await createPlugin(
+      "dying-provider",
+      `import type { ProviderEvent, ProviderRegistration } from "@getpaseo/plugin/server/provider";
+const provider: ProviderRegistration = {
+  id: "dying",
+  label: "Dying",
+  async connect(request) {
+    const listeners = new Set<(event: ProviderEvent) => void>();
+    const emit = (event: ProviderEvent) => { for (const listener of listeners) listener(event); };
+    return {
+      version: request.versions[0] ?? 1,
+      capabilities: ["prompt.message"],
+      async send(input) {
+        if (input.type === "session.open") {
+          emit({ type: "session.opened", requestId: input.requestId, sessionId: input.sessionId, capabilities: ["prompt.message"], restoration: "core", cwd: input.config.cwd });
+          emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+        }
+        if (input.type === "session.prompt") setTimeout(() => process.exit(17), 10);
+      },
+      onEvent(listener) { listeners.add(listener); return () => listeners.delete(listener); },
+      async close() {},
+    };
+  },
+};
+export default function contribute(server: any) { server.registerProvider(provider); return () => undefined; }`,
+    );
+    const runtime = createTestRuntime();
+    await runtime.startPlugin("dying-provider", directory);
+    const connection = await runtime.connectProvider("dying-provider", "dying", {
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send({
+      type: "session.open",
+      requestId: "open-dying",
+      sessionId: "root-dying",
+      config: { cwd: "/repo", env: {}, mcpServers: {}, settings: {}, persist: true },
+      history: "skip",
+    });
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "root-dying",
+      prompt: {
+        clientMessageId: "die-now",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "bye" }] },
+      },
+    });
+
+    await expect
+      .poll(() => runtimeFailure(events))
+      .toMatchObject({
+        type: "session.runtime_failed",
+        sessionId: "root-dying",
+        error: { message: "Plugin process exited: dying-provider" },
+      });
+    await runtime.stopAll();
+  });
+
   it("records host-owned plugin lifecycle events", async () => {
     const directory = await createPlugin(
       "lifecycle",
@@ -382,38 +1060,367 @@ export default function contribute(plugin: unknown) {
     await rm(cleanupFile, { force: true });
   });
 
-  it("does not kill a healthy child while its graceful cleanup is still running", async () => {
+  it("rejects provider input while a connection is closing", async () => {
+    const releaseDirectory = await mkdtemp(path.join(tmpdir(), "paseo-provider-close-"));
+    const releaseFile = path.join(releaseDirectory, "release");
+    const directory = await createPlugin(
+      "closing-provider",
+      `import { readFile, writeFile } from "node:fs/promises";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
+const provider: ProviderRegistration = {
+  id: "delayed",
+  label: "Delayed",
+  async connect() {
+    return {
+      version: 1,
+      capabilities: [],
+      async send() { console.log("provider accepted input"); },
+      onEvent() { return () => undefined; },
+      async close() {
+        console.log("provider close started");
+        while (true) {
+          try { await readFile(${JSON.stringify(releaseFile)}); break; }
+          catch { await new Promise((resolve) => setTimeout(resolve, 10)); }
+        }
+        console.log("provider close completed");
+      },
+    };
+  },
+};
+export default function contribute(server: { registerProvider(provider: ProviderRegistration): void }) {
+  server.registerProvider(provider);
+  return () => console.log("plugin cleanup started");
+}`,
+    );
+    const closedReports: unknown[] = [];
+    const observeMessage = (message: unknown) => {
+      if ((message as { type?: string }).type === "provider.closed") closedReports.push(message);
+    };
+    const runtime = createTestRuntime({
+      spawnChild: () => spawnObservedPluginProcess(observeMessage),
+    });
+    await runtime.startPlugin("closing-provider", directory);
+    try {
+      const connection = await runtime.connectProvider("closing-provider", "delayed", {
+        versions: [1],
+        capabilities: [],
+      });
+      const closing = connection.close();
+      await expect
+        .poll(() => pluginMessages(runtime, "closing-provider"))
+        .toContain("provider close started");
+      await expect(connection.send({ type: "catalog", requestId: "during-close" })).rejects.toThrow(
+        "Provider connection is closing",
+      );
+      const stopping = runtime.stopPluginById("closing-provider");
+      await expect
+        .poll(() => pluginMessages(runtime, "closing-provider"))
+        .toContain("plugin cleanup started");
+      await writeFile(releaseFile, "release");
+      await Promise.all([closing, stopping]);
+      const messages = pluginMessages(runtime, "closing-provider");
+      expect(messages).toContain("provider close completed");
+      expect(messages).not.toContain("provider accepted input");
+      expect(closedReports).toHaveLength(1);
+    } finally {
+      await writeFile(releaseFile, "release");
+      await runtime.stopAll();
+      await rm(releaseDirectory, { recursive: true, force: true });
+    }
+  });
+
+  it("closes a provider connection that resolves during plugin shutdown", async () => {
+    const suffix = `${process.pid}-${Date.now()}`;
+    const startedFile = path.join(tmpdir(), `paseo-provider-connect-started-${suffix}`);
+    const closedFile = path.join(tmpdir(), `paseo-provider-connect-closed-${suffix}`);
+    const directory = await createPlugin(
+      "shutdown-connect",
+      `import { writeFile } from "node:fs/promises";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
+
+const provider: ProviderRegistration = {
+  id: "delayed",
+  label: "Delayed",
+  async connect() {
+    await writeFile(${JSON.stringify(startedFile)}, "started");
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    return {
+      version: 1,
+      capabilities: [],
+      async send() {},
+      onEvent() { return () => undefined; },
+      async close() { await writeFile(${JSON.stringify(closedFile)}, "closed"); },
+    };
+  },
+};
+
+export default function contribute(server: { registerProvider(provider: ProviderRegistration): void }) {
+  server.registerProvider(provider);
+  return () => undefined;
+}`,
+    );
+    const runtime = createTestRuntime();
+    await runtime.startPlugin("shutdown-connect", directory);
+    const pending = runtime.connectProvider("shutdown-connect", "delayed", {
+      versions: [1],
+      capabilities: [],
+    });
+    await expect.poll(() => readTextIfPresent(startedFile)).toBe("started");
+
+    const stopping = runtime.stopPluginById("shutdown-connect");
+    await expect(pending).rejects.toThrow("Plugin stopped: shutdown-connect");
+    await stopping;
+
+    await expect(readFile(closedFile, "utf8")).resolves.toBe("closed");
+    await Promise.all([rm(startedFile, { force: true }), rm(closedFile, { force: true })]);
+  });
+
+  it("closes a provider connection that arrives after negotiation timed out", async () => {
+    const directory = await createPlugin(
+      "late-provider",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const child = createReloadChild(
+      "late-provider",
+      [],
+      [],
+      [{ id: "provider", label: "Provider" }],
+    );
+    const sent: Array<{ type: string; connectionId?: string }> = [];
+    const originalSend = child.send.bind(child);
+    child.send = (message, callback) => {
+      sent.push(message);
+      if (message.type === "provider.connect") {
+        callback?.(null);
+        return true;
+      }
+      return originalSend(message, callback);
+    };
+    const runtime = createTestRuntime({ spawnChild: () => child });
+    await runtime.startPlugin("late-provider", directory);
+    vi.useFakeTimers();
+    try {
+      const rejected = expect(
+        runtime.connectProvider("late-provider", "provider", {
+          versions: [1],
+          capabilities: [],
+        }),
+      ).rejects.toThrow("timed out");
+      await vi.advanceTimersByTimeAsync(30_000);
+      await rejected;
+      const connectionId = sent.find(
+        (message) => message.type === "provider.connect",
+      )?.connectionId;
+      expect(
+        sent.filter(
+          (message) => message.type === "provider.close" && message.connectionId === connectionId,
+        ),
+      ).toHaveLength(1);
+
+      child.emitMessage({
+        type: "provider.connected",
+        connectionId,
+        version: 1,
+        capabilities: [],
+      });
+      await vi.advanceTimersByTimeAsync(0);
+
+      expect(
+        sent.filter(
+          (message) => message.type === "provider.close" && message.connectionId === connectionId,
+        ),
+      ).toHaveLength(2);
+      child.emitMessage({ type: "provider.closed", connectionId });
+    } finally {
+      await runtime.stopAll();
+      vi.useRealTimers();
+    }
+  });
+
+  it("closes child-side state after invalid provider negotiation", async () => {
+    const directory = await createPlugin(
+      "invalid-provider",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const child = createReloadChild(
+      "invalid-provider",
+      [],
+      [],
+      [{ id: "provider", label: "Provider" }],
+    );
+    const sent: Array<{ type: string; connectionId?: string }> = [];
+    const originalSend = child.send.bind(child);
+    child.send = (message, callback) => {
+      sent.push(message);
+      if (message.type === "provider.connect") {
+        callback?.(null);
+        queueMicrotask(() =>
+          child.emitMessage({
+            type: "provider.connected",
+            connectionId: message.connectionId,
+            version: 2,
+            capabilities: [],
+          }),
+        );
+        return true;
+      }
+      return originalSend(message, callback);
+    };
+    const runtime = createTestRuntime({ spawnChild: () => child });
+    await runtime.startPlugin("invalid-provider", directory);
+
+    await expect(
+      runtime.connectProvider("invalid-provider", "provider", {
+        versions: [1],
+        capabilities: [],
+      }),
+    ).rejects.toThrow("unoffered version");
+    const connectionId = sent.find((message) => message.type === "provider.connect")?.connectionId;
+    await expect.poll(() => sent).toContainEqual({ type: "provider.close", connectionId });
+    child.emitMessage({ type: "provider.closed", connectionId });
+    await runtime.stopAll();
+  });
+
+  it("closes a late connection after the child rejected its negotiation", async () => {
+    const directory = await createPlugin(
+      "rejected-provider",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const child = createReloadChild(
+      "rejected-provider",
+      [],
+      [],
+      [{ id: "provider", label: "Provider" }],
+    );
+    const sent: Array<{ type: string; connectionId?: string }> = [];
+    const originalSend = child.send.bind(child);
+    child.send = (message, callback) => {
+      sent.push(message);
+      if (message.type === "provider.connect") {
+        callback?.(null);
+        queueMicrotask(() =>
+          child.emitMessage({
+            type: "provider.connect_failed",
+            connectionId: message.connectionId,
+            error: "provider rejected connection",
+          }),
+        );
+        return true;
+      }
+      return originalSend(message, callback);
+    };
+    const runtime = createTestRuntime({ spawnChild: () => child });
+    await runtime.startPlugin("rejected-provider", directory);
+
+    await expect(
+      runtime.connectProvider("rejected-provider", "provider", {
+        versions: [1],
+        capabilities: [],
+      }),
+    ).rejects.toThrow("provider rejected connection");
+    const connectionId = sent.find((message) => message.type === "provider.connect")?.connectionId;
+    const closesBeforeLateSuccess = providerCloseCount(sent, connectionId);
+
+    child.emitMessage({
+      type: "provider.connected",
+      connectionId,
+      version: 1,
+      capabilities: [],
+    });
+
+    await expect
+      .poll(() => providerCloseCount(sent, connectionId))
+      .toBe(closesBeforeLateSuccess + 1);
+    child.emitMessage({ type: "provider.closed", connectionId });
+    await runtime.stopAll();
+  });
+
+  it("closes a late connection after plugin shutdown cancels negotiation", async () => {
+    const directory = await createPlugin(
+      "canceled-provider",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const child = createReloadChild(
+      "canceled-provider",
+      [],
+      [],
+      [{ id: "provider", label: "Provider" }],
+    );
+    const sent: Array<{ type: string; connectionId?: string }> = [];
+    const originalSend = child.send.bind(child);
+    child.send = (message, callback) => {
+      sent.push(message);
+      if (message.type === "provider.connect" || message.type === "shutdown") {
+        callback?.(null);
+        return true;
+      }
+      return originalSend(message, callback);
+    };
+    const runtime = createTestRuntime({ spawnChild: () => child });
+    await runtime.startPlugin("canceled-provider", directory);
+    const pending = runtime.connectProvider("canceled-provider", "provider", {
+      versions: [1],
+      capabilities: [],
+    });
+    await expect.poll(() => hasMessageType(sent, "provider.connect")).toBe(true);
+    const connectionId = sent.find((message) => message.type === "provider.connect")?.connectionId;
+    const rejection = pending.then(
+      () => null,
+      (error: unknown) => error,
+    );
+    const stopping = runtime.stopPluginById("canceled-provider");
+    try {
+      await expect.poll(() => providerCloseCount(sent, connectionId)).toBe(1);
+      await expect(rejection).resolves.toMatchObject({
+        message: "Plugin stopped: canceled-provider",
+      });
+      const closesBeforeLateSuccess = providerCloseCount(sent, connectionId);
+      child.emitMessage({
+        type: "provider.connected",
+        connectionId,
+        version: 1,
+        capabilities: [],
+      });
+      await expect
+        .poll(() => providerCloseCount(sent, connectionId))
+        .toBe(closesBeforeLateSuccess + 1);
+    } finally {
+      child.kill();
+      await stopping;
+    }
+  });
+
+  it("escalates a plugin that ignores graceful shutdown from TERM to KILL", async () => {
     vi.useFakeTimers();
     try {
       const directory = await createPlugin(
         "held-cleanup",
         `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
       );
-      const events: string[] = [];
-      const child = createReloadChild("held-cleanup", events);
+      const child = createReloadChild("held-cleanup", []);
       const originalSend = child.send.bind(child);
-      let releaseCleanup = () => undefined;
       child.send = (message, callback) => {
         if (message.type !== "shutdown") return originalSend(message, callback);
         callback?.(null);
-        events.push("shutdown:held-cleanup");
-        releaseCleanup = () => {
-          child.connected = false;
-          child.kill();
-          child.killed = false;
-        };
+        return true;
+      };
+      const signals: Array<NodeJS.Signals | undefined> = [];
+      const originalKill = child.kill.bind(child);
+      child.kill = (signal?: NodeJS.Signals) => {
+        signals.push(signal);
+        if (signal === "SIGKILL") return originalKill();
+        child.killed = true;
         return true;
       };
       const runtime = createTestRuntime({ spawnChild: () => child });
       await runtime.startPlugin("held-cleanup", directory);
 
       const stopping = runtime.stopPluginById("held-cleanup");
-      await vi.advanceTimersByTimeAsync(60_000);
-      expect(child.killed).toBe(false);
-
-      releaseCleanup();
+      await vi.advanceTimersByTimeAsync(2_000);
+      expect(signals).toEqual(["SIGTERM"]);
+      await vi.advanceTimersByTimeAsync(2_000);
       await stopping;
-      expect(events).toContain("shutdown:held-cleanup");
+      expect(signals).toEqual(["SIGTERM", "SIGKILL"]);
     } finally {
       vi.useRealTimers();
     }
@@ -483,7 +1490,7 @@ export default function contribute(plugin: unknown) {
       path.dirname(fileURLToPath(import.meta.url)),
       "../../../../../plugin-examples/linear",
     );
-    const runtime = createTestRuntime();
+    const runtime = createTestRuntime({}, undefined, "0.8.0");
 
     await runtime.startPlugin("linear", directory);
 
@@ -494,7 +1501,7 @@ export default function contribute(plugin: unknown) {
     await runtime.stopAll();
   });
 
-  it("rejects an index.ts plugin with the migration path", async () => {
+  it("explains that an index.ts plugin was made for an older Paseo version", async () => {
     const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-"));
     temporaryDirectories.push(directory);
     await Promise.all([
@@ -504,10 +1511,7 @@ export default function contribute(plugin: unknown) {
     const runtime = createTestRuntime();
 
     await expect(runtime.startPlugin("legacy", directory)).rejects.toThrow(
-      "Plugin entry split is required",
-    );
-    await expect(runtime.startPlugin("legacy", directory)).rejects.toThrow(
-      "https://paseo.sh/docs/plugins/v0.8/migration",
+      "This plugin was made for an older version of Paseo and cannot run on Paseo v0.8. Ask its author to update it. Plugin authors can follow the migration guide: https://paseo.sh/docs/plugins/migration",
     );
   });
 
@@ -615,34 +1619,6 @@ export default function contribute(server: any) {
     await runtime.stopAll();
   });
 
-  // COMPAT(plugin-sdk-scope): plugins scaffolded through 0.5.0-beta.1 import the unpublished
-  // @paseo/plugin name. Drop with the specifiers in plugin-sdk-specifiers.ts.
-  it("loads a plugin that imports the pre-rename @paseo/plugin specifier", async () => {
-    const directory = await createPlugin(
-      "legacy-sdk",
-      `import { z } from "zod";
-import { defineRpc } from "@paseo/plugin";
-
-const pingRpc = defineRpc({
-  name: "ping",
-  input: z.object({}),
-  output: z.object({ ok: z.boolean() }),
-});
-
-export default function contribute(plugin: any) {
-  plugin.handle(pingRpc, async () => ({ ok: true }));
-  return () => undefined;
-}`,
-    );
-    const runtime = createTestRuntime();
-
-    await runtime.startPlugin("legacy-sdk", directory);
-
-    await expect(runtime.invoke("legacy-sdk", "ping", {})).resolves.toMatchObject({ ok: true });
-
-    await runtime.stopAll();
-  });
-
   it("keeps client and server modules in their target runtime", async () => {
     const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-"));
     temporaryDirectories.push(directory);
@@ -659,7 +1635,7 @@ export default function contribute(plugin: any) {
       ),
       writeFile(
         path.join(directory, "index.client.tsx"),
-        `import type { PluginClientContext } from "@getpaseo/plugin";
+        `import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { Surface } from "./client/surface";
 export default function contribute(client: PluginClientContext) {
   client.addSurface("main", Surface);
@@ -669,7 +1645,7 @@ export default function contribute(client: PluginClientContext) {
       ),
       writeFile(
         path.join(directory, "index.server.ts"),
-        `import type { PluginServerContext } from "@getpaseo/plugin";
+        `import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { inspectRpc } from "./shared/inspect";
 import { inspectHost } from "./server/inspect";
 export default function contribute(server: PluginServerContext) {
@@ -742,7 +1718,7 @@ export function inspectHost(_input: z.input<typeof inspectRpc.input>) {
       ),
       writeFile(
         path.join(directory, "index.client.tsx"),
-        `import type { PluginClientContext } from "@getpaseo/plugin";
+        `import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { Surface } from "./client/surface";
 
 export default function contribute(client: PluginClientContext) {
@@ -787,7 +1763,7 @@ export function Surface() { return readSecret(); }`,
       ),
       writeFile(
         path.join(directory, "index.server.ts"),
-        `import type { PluginServerContext } from "@getpaseo/plugin";
+        `import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { inspect } from "./server/inspect";
 import { inspectRpc } from "./shared/inspect";
 
@@ -908,4 +1884,174 @@ export default function contribute(plugin: any) {
       "Plugin is not available",
     );
   });
+
+  it("re-attaches a plugin session when the daemon closes the socket under a live child", async () => {
+    const directory = await createPlugin(
+      "reattaching",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const sessions = createTrackedSessionHost();
+    const runtime = createTestRuntime({ sessionHost: sessions.host });
+    await runtime.startPlugin("reattaching", directory);
+
+    expect(sessions.active.size).toBe(1);
+    expect(sessions.hellos).toHaveLength(1);
+    const first = [...sessions.active][0] as PluginSessionSocket;
+
+    // What an expired lease does: drop the socket, leave the process running.
+    first.close(1000, "expired application lease");
+
+    // A second handshake, not just a second attachment: the client really redialled.
+    await sessions.waitForHellos(2);
+
+    expect(sessions.active.size).toBe(1);
+    expect([...sessions.active][0]).not.toBe(first);
+    await runtime.stopAll();
+    expect(sessions.active.size).toBe(0);
+  });
+
+  it("replaces a closed plugin session only once the child sends a fresh hello", async () => {
+    const directory = await createPlugin(
+      "lazy-reattach",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const sessions = createTrackedSessionHost();
+    const child = createReloadChild("lazy-reattach", []);
+    const runtime = createTestRuntime({ spawnChild: () => child, sessionHost: sessions.host });
+    await runtime.startPlugin("lazy-reattach", directory);
+    const first = [...sessions.active][0] as PluginSessionSocket;
+    // This child is a stub with no real client, so no handshake has happened.
+    expect(sessions.hellos).toHaveLength(0);
+
+    first.close(1000, "expired application lease");
+    expect(sessions.active.size).toBe(0);
+
+    // Frames the child had already queued belong to the session that just died.
+    // Standing a socket up for one would leave it unspoken to until the host's
+    // hello timeout closed it, and that close would stand up another.
+    child.emitMessage({
+      type: "paseo_frame",
+      data: JSON.stringify({ type: "session", message: { type: "ping" } }),
+      isBinary: false,
+    });
+    expect(sessions.active.size).toBe(0);
+
+    child.emitMessage({
+      type: "paseo_frame",
+      data: JSON.stringify({
+        type: "hello",
+        clientId: "plugin:lazy-reattach",
+        clientType: "cli",
+        protocolVersion: 1,
+      }),
+      isBinary: false,
+    });
+    await sessions.waitForHellos(1);
+
+    expect(sessions.active.size).toBe(1);
+    expect([...sessions.active][0]).not.toBe(first);
+    await runtime.stopAll();
+    expect(sessions.active.size).toBe(0);
+  });
+
+  it("attaches no replacement session when the plugin is stopped", async () => {
+    const directory = await createPlugin(
+      "stopping",
+      `export default function contribute(plugin: unknown) { void plugin; return () => undefined; }`,
+    );
+    const sessions = createTrackedSessionHost();
+    const runtime = createTestRuntime({ sessionHost: sessions.host });
+    await runtime.startPlugin("stopping", directory);
+    expect(sessions.active.size).toBe(1);
+
+    await runtime.stopPluginById("stopping");
+
+    expect(runtime.getLogs("stopping").map((entry) => entry.message)).not.toContain(
+      "[paseo] Re-attached plugin session",
+    );
+    expect(sessions.active.size).toBe(0);
+  });
+  it("closes an in-flight replacement when the plugin stops before attachment completes", async () => {
+    const directory = await createPlugin(
+      "stopping-redial",
+      `export default function contribute() { return () => undefined; }`,
+    );
+    const child = createReloadChild("stopping-redial", []);
+    const sessions = createTrackedSessionHost();
+    let finishAttachment!: () => void;
+    const attachmentHeld = new Promise<void>((resolve) => {
+      finishAttachment = resolve;
+    });
+    let replacementAttached!: (socket: PluginSessionSocket) => void;
+    const replacementStarted = new Promise<PluginSessionSocket>((resolve) => {
+      replacementAttached = resolve;
+    });
+    let attachments = 0;
+    const runtime = createTestRuntime({
+      spawnChild: () => child,
+      sessionHost: {
+        async attachPluginSocket(pluginId, socket) {
+          const attachment = await sessions.host.attachPluginSocket(pluginId, socket);
+          attachments += 1;
+          if (attachments === 2) {
+            replacementAttached(socket);
+            await attachmentHeld;
+          }
+          return attachment;
+        },
+      },
+    });
+    try {
+      await runtime.startPlugin("stopping-redial", directory);
+      const first = [...sessions.active][0] as PluginSessionSocket;
+      first.close();
+      child.emitMessage({
+        type: "paseo_frame",
+        data: JSON.stringify({ type: "hello" }),
+        isBinary: false,
+      });
+      const replacement = await replacementStarted;
+      const replacementClosed = new Promise<void>((resolve) => replacement.once("close", resolve));
+      await runtime.stopPluginById("stopping-redial");
+      finishAttachment();
+      await replacementClosed;
+      expect(sessions.active.size).toBe(0);
+      expect(sessions.hellos).toEqual([]);
+      expect(runtime.catalog()).toEqual([]);
+      child.emitMessage({
+        type: "paseo_frame",
+        data: JSON.stringify({ type: "hello" }),
+        isBinary: false,
+      });
+      expect(attachments).toBe(2);
+    } finally {
+      finishAttachment();
+      await runtime.stopAll();
+    }
+  });
+});
+
+it("rejects a usage source without discovery at registration", async () => {
+  const directory = await createPlugin(
+    "missing-discovery",
+    `
+export default function contribute(server) {
+  server.registerUsageSource({
+    id: "missing-discovery",
+    label: "Missing discovery",
+    input: { parseAsync: async (value) => value },
+    fetch: async () => ({ status: "available", windows: [] }),
+  });
+  return () => {};
+}
+`,
+  );
+  const runtime = createTestRuntime();
+  try {
+    await expect(runtime.startPlugin("missing-discovery", directory)).rejects.toThrow(
+      "Invalid usage source: missing-discovery",
+    );
+  } finally {
+    await runtime.stopAll();
+  }
 });
diff --git a/packages/server/src/server/plugins/runtime.ts b/packages/server/src/server/plugins/runtime.ts
index 11951ecad3..9886a368e7 100644
--- a/packages/server/src/server/plugins/runtime.ts
+++ b/packages/server/src/server/plugins/runtime.ts
@@ -1,14 +1,41 @@
+import type { UsageScope } from "@getpaseo/plugin/server/usage";
+import {
+  ProviderStatusSchema,
+  type ProviderStatus,
+  type ProviderStatusRequest,
+} from "@getpaseo/plugin/server/provider";
+import type { PluginBeforeRequests, PluginLifecycleEvents } from "@getpaseo/plugin/server";
+import { validateBeforeRequest, validateBeforeResult } from "./lifecycle/index.js";
 import { fork } from "node:child_process";
 import { stat } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { randomUUID } from "node:crypto";
 import type pino from "pino";
+import {
+  PROVIDER_CAPABILITIES,
+  requireProviderCapabilities,
+  type ProviderConnectRequest,
+  type ProviderCatalogOptions,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderInput,
+} from "@getpaseo/plugin/server/provider";
 import type { PluginLogEntry } from "@getpaseo/protocol/messages";
 import { compilePlugin } from "./compiler.js";
 import { readPluginManifest } from "./manifest.js";
-import type { PluginProcessMessage, PluginProcessRequest } from "./plugin-process-protocol.js";
+import type { PluginRequirements } from "@getpaseo/protocol/messages";
+import { assertPluginCompatibility } from "@getpaseo/protocol/plugin-requirements";
+import type {
+  PluginProcessMessage,
+  PluginProcessRequest,
+  PluginProviderMetadata,
+  PluginUsageSourceMetadata,
+} from "./plugin-process-protocol.js";
+import { PluginProcessMessageSchema } from "./plugin-process-protocol.js";
 import { PluginSessionSocket } from "./session-socket.js";
+import { InternalPluginChild } from "./internal-child.js";
+import { evaluateBundle } from "./bundle-evaluator.js";
 
 const CLIENT_ENTRY_FILENAMES = ["index.client.ts", "index.client.tsx"] as const;
 const SERVER_ENTRY_FILENAMES = ["index.server.ts", "index.server.tsx"] as const;
@@ -16,6 +43,7 @@ const REQUEST_TIMEOUT_MS = 30_000;
 const MAX_LOG_ENTRIES = 500;
 const MAX_LOG_BYTES = 256 * 1024;
 const MAX_LOG_LINE_BYTES = 16 * 1024;
+const SOFT_SHUTDOWN_TIMEOUT_MS = 2_000;
 
 interface PluginOutputStream {
   on(event: "data", listener: (chunk: Buffer | string) => void): this;
@@ -27,9 +55,9 @@ interface PluginChild {
   stdout?: PluginOutputStream | null;
   stderr?: PluginOutputStream | null;
   send(message: PluginProcessRequest, callback?: (error: Error | null) => void): boolean;
-  kill(): boolean;
+  kill(signal?: NodeJS.Signals): boolean;
   disconnect(): void;
-  on(event: "message", listener: (message: PluginProcessMessage) => void): this;
+  on(event: "message", listener: (message: unknown) => void): this;
   on(event: "close", listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
 }
 
@@ -41,16 +69,61 @@ interface PendingInvocation {
 
 interface LoadedPlugin {
   id: string;
+  requirements: PluginRequirements | undefined;
   clientBundle: string;
   methods: ReadonlySet<string>;
+  hooks: { events: string[]; before: string[] };
+  providers: readonly PluginProviderMetadata[];
+  usageSources: readonly PluginUsageSourceMetadata[];
   child: PluginChild | null;
   outputCapture: PluginOutputCapture | null;
   pending: Map<string, PendingInvocation>;
+  providerConnections: Map<string, RemoteProviderConnection>;
+  providerConnectionTombstones: Set<string>;
   sessionSocket: PluginSessionSocket | null;
   sessionClosed: Promise<void> | null;
 }
 
+/** The session socket a loaded plugin currently speaks through. */
+interface PluginSessionBinding {
+  socket: PluginSessionSocket;
+  reattaching: boolean;
+  plugin: LoadedPlugin | null;
+}
+
+interface PluginFrameInput {
+  session: PluginSessionBinding;
+  pluginId: string;
+  child: PluginChild;
+  sessionHost: PluginPaseoSessionHost;
+  frame: string | Uint8Array;
+  isBinary: boolean;
+}
+
+interface PendingProviderSend {
+  input: ProviderInput;
+  resolve: () => void;
+  reject: (error: Error) => void;
+}
+
+interface RemoteProviderConnection {
+  request: ProviderConnectRequest;
+  capabilities: readonly string[];
+  listeners: Set<(event: ProviderEvent) => void>;
+  pendingSends: Map<string, PendingProviderSend>;
+  sessions: Map<string, readonly string[]>;
+  connected: boolean;
+  closed: boolean;
+  closedPromise: Promise<void>;
+  resolveConnected(connection: ProviderConnection): void;
+  rejectConnected(error: Error): void;
+  resolveClosed(): void;
+  rejectClosed(error: Error): void;
+}
+
 interface PluginRuntimeDependencies {
+  settingsDirectory?: string;
+  onSettingsChanged?: (pluginId: string, settingsId: string) => void;
   spawnChild?: () => PluginChild;
   sessionHost?: PluginPaseoSessionHost;
 }
@@ -174,6 +247,12 @@ function describeError(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
+function jsonTransportValue<Value>(value: Value): Value {
+  const encoded = JSON.stringify(value);
+  if (encoded === undefined) throw new Error("Provider value is not JSON-serializable");
+  return JSON.parse(encoded) as Value;
+}
+
 function send(child: PluginChild, message: PluginProcessRequest): Promise<void> {
   return new Promise((resolve, reject) => {
     child.send(message, (error) => {
@@ -207,7 +286,7 @@ async function resolveEntryPaths(directory: string): Promise<{
   const legacyEntry = await findEntry(directory, ["index.ts", "index.tsx"]);
   if (legacyEntry) {
     throw new Error(
-      "Plugin entry split is required: migrate index.ts to index.client.tsx and/or index.server.ts. See https://paseo.sh/docs/plugins/v0.8/migration",
+      "This plugin was made for an older version of Paseo and cannot run on Paseo v0.8. Ask its author to update it. Plugin authors can follow the migration guide: https://paseo.sh/docs/plugins/migration",
     );
   }
   throw new Error(
@@ -217,6 +296,7 @@ async function resolveEntryPaths(directory: string): Promise<{
 
 export class PluginRuntime {
   private readonly plugins = new Map<string, LoadedPlugin>();
+  private readonly pendingEvents = new Set<Promise<void>>();
   private readonly logTails = new Map<string, PluginLogTail>();
   private readonly logger: pino.Logger;
   private readonly spawnChild: () => PluginChild;
@@ -226,7 +306,7 @@ export class PluginRuntime {
   constructor(
     logger: pino.Logger,
     private readonly daemonVersion: string,
-    dependencies: PluginRuntimeDependencies = {},
+    private readonly dependencies: PluginRuntimeDependencies = {},
   ) {
     this.logger = logger.child({ module: "plugins" });
     this.spawnChild = dependencies.spawnChild ?? spawnPluginChild;
@@ -263,9 +343,33 @@ export class PluginRuntime {
     this.appendLog(pluginId, "stdout", "[paseo] Plugin ready");
   }
 
+  async startBuiltinPlugin(input: { id: string; directory: string }): Promise<void> {
+    if (this.plugins.has(input.id)) throw new Error(`Plugin is already running: ${input.id}`);
+    this.appendLog(input.id, "stdout", "[paseo] Loading plugin");
+    const directory = path.resolve(input.directory);
+    const manifest = await readPluginManifest(directory);
+    if (manifest.id !== input.id) {
+      throw new Error(`Built-in plugin ${input.id} has manifest ID ${manifest.id}`);
+    }
+    assertPluginCompatibility({ ...manifest, version: this.daemonVersion, runtime: "daemon" });
+    const bundles = await compilePlugin(await resolveEntryPaths(directory));
+    if (!bundles.serverBundle) throw new Error(`Built-in plugin ${input.id} needs a server entry`);
+    const loaded = await this.launchPlugin({
+      pluginId: input.id,
+      pluginDirectory: directory,
+      requirements: manifest.requirements,
+      child: new InternalPluginChild(evaluateBundle(bundles.serverBundle)),
+      bundle: "",
+      clientBundle: bundles.clientBundle ?? "",
+    });
+    this.plugins.set(input.id, loaded);
+    this.appendLog(input.id, "stdout", "[paseo] Plugin ready");
+  }
+
   async validatePlugin(configuredPath: string): Promise<void> {
     const directory = path.resolve(configuredPath);
-    await readPluginManifest(directory);
+    const manifest = await readPluginManifest(directory);
+    assertPluginCompatibility({ ...manifest, version: this.daemonVersion, runtime: "daemon" });
     const entryPaths = await resolveEntryPaths(directory);
     await compilePlugin(entryPaths);
   }
@@ -279,12 +383,114 @@ export class PluginRuntime {
     return true;
   }
 
-  catalog(): Array<{ id: string; clientBundle: string }> {
+  catalog(): Array<{ id: string; clientBundle: string; requirements?: PluginRequirements }> {
     return [...this.plugins.values()]
-      .map(({ id, clientBundle }) => ({ id, clientBundle }))
+      .map(({ id, clientBundle, requirements }) => ({ id, clientBundle, requirements }))
       .sort((left, right) => left.id.localeCompare(right.id));
   }
 
+  getProviderRegistrations(pluginId: string): readonly PluginProviderMetadata[] {
+    return this.plugins.get(pluginId)?.providers ?? [];
+  }
+
+  getUsageSourceRegistrations(pluginId: string): readonly PluginUsageSourceMetadata[] {
+    return this.plugins.get(pluginId)?.usageSources ?? [];
+  }
+
+  fetchUsage(pluginId: string, sourceId: string, input: unknown): Promise<unknown> {
+    const loaded = this.plugins.get(pluginId);
+    if (!loaded) throw new Error(`Plugin is not available: ${pluginId}`);
+    return this.request(loaded, { type: "usage.fetch", requestId: randomUUID(), sourceId, input });
+  }
+
+  discoverUsage(pluginId: string, sourceId: string, scope: UsageScope): Promise<unknown> {
+    const loaded = this.plugins.get(pluginId);
+    if (!loaded) throw new Error(`Plugin is not available: ${pluginId}`);
+    return this.request(loaded, {
+      type: "usage.discover",
+      requestId: randomUUID(),
+      sourceId,
+      scope,
+    });
+  }
+
+  async getProviderStatus(
+    pluginId: string,
+    providerId: string,
+    request: ProviderStatusRequest,
+  ): Promise<ProviderStatus> {
+    const loaded = this.plugins.get(pluginId);
+    if (!loaded) throw new Error(`Plugin is not available: ${pluginId}`);
+    return ProviderStatusSchema.parse(
+      await this.request(loaded, {
+        type: "provider.status",
+        requestId: randomUUID(),
+        providerId,
+        request,
+      }),
+    );
+  }
+
+  async connectProvider(
+    pluginId: string,
+    providerId: string,
+    request: ProviderConnectRequest,
+  ): Promise<ProviderConnection> {
+    const loaded = this.plugins.get(pluginId);
+    if (!loaded?.child) throw new Error(`Plugin is not available: ${pluginId}`);
+    if (!loaded.providers.some((provider) => provider.id === providerId)) {
+      throw new Error(`Plugin ${pluginId} does not contribute provider ${providerId}`);
+    }
+    const connectionId = randomUUID();
+    let resolveConnected!: (connection: ProviderConnection) => void;
+    let rejectConnected!: (error: Error) => void;
+    let resolveClosed!: () => void;
+    let rejectClosed!: (error: Error) => void;
+    const connected = new Promise<ProviderConnection>((resolve, reject) => {
+      resolveConnected = resolve;
+      rejectConnected = reject;
+    });
+    const closed = new Promise<void>((resolve, reject) => {
+      resolveClosed = resolve;
+      rejectClosed = reject;
+    });
+    void closed.catch(() => undefined);
+    const state: RemoteProviderConnection = {
+      request,
+      capabilities: [],
+      listeners: new Set(),
+      pendingSends: new Map(),
+      sessions: new Map(),
+      connected: false,
+      closed: false,
+      closedPromise: closed,
+      resolveConnected,
+      rejectConnected,
+      resolveClosed,
+      rejectClosed,
+    };
+    loaded.providerConnections.set(connectionId, state);
+    const timeout = setTimeout(() => {
+      if (state.connected) return;
+      this.abandonProviderConnect(
+        loaded,
+        connectionId,
+        state,
+        new Error(`Plugin provider connection timed out: ${pluginId}.${providerId}`),
+      );
+    }, REQUEST_TIMEOUT_MS);
+    void send(loaded.child, {
+      type: "provider.connect",
+      providerId,
+      connectionId,
+      request,
+    }).catch((error) => {
+      clearTimeout(timeout);
+      this.abandonProviderConnect(loaded, connectionId, state, error);
+    });
+    return connected.finally(() => clearTimeout(timeout));
+  }
+
   getLogs(pluginId: string): PluginLogEntry[] {
     return (
       this.logTails.get(pluginId)?.entries.map((entry) => ({
@@ -305,16 +511,107 @@ export class PluginRuntime {
     if (!loaded) throw new Error(`Plugin is not available: ${pluginId}`);
     if (!loaded.methods.has(method))
       throw new Error(`Plugin ${pluginId} does not contribute RPC ${method}`);
+    return this.request(loaded, { type: "invoke", requestId: randomUUID(), method, input });
+  }
+
+  emit<Name extends keyof PluginLifecycleEvents>(
+    name: Name,
+    event: PluginLifecycleEvents[Name],
+  ): void {
+    for (const loaded of this.plugins.values()) {
+      if (!loaded.hooks.events.includes(name)) {
+        continue;
+      }
+      const request = this.request(loaded, {
+        type: "hook",
+        requestId: randomUUID(),
+        kind: "event",
+        name,
+        input: event,
+      })
+        .then(() => undefined)
+        .catch((error) => {
+          this.appendLog(
+            loaded.id,
+            "stderr",
+            `Lifecycle hook ${name} failed: ${describeError(error)}`,
+          );
+        });
+      this.pendingEvents.add(request);
+      void request.finally(() => this.pendingEvents.delete(request));
+    }
+  }
+
+  async drainEvents(): Promise<void> {
+    await Promise.all(this.pendingEvents);
+  }
+
+  async before<Name extends keyof PluginBeforeRequests>(
+    name: Name,
+    input: PluginBeforeRequests[Name],
+  ): Promise<PluginBeforeRequests[Name]> {
+    let request = validateBeforeRequest(name, input);
+    const plugins = [...this.plugins.values()].sort((left, right) => {
+      return left.id.localeCompare(right.id);
+    });
+    for (const loaded of plugins) {
+      if (!loaded.hooks.before.includes(name)) {
+        continue;
+      }
+      try {
+        const output = await this.request(loaded, {
+          type: "hook",
+          requestId: randomUUID(),
+          kind: "before",
+          name,
+          input: request,
+        });
+        request = validateBeforeResult(name, request, output);
+      } catch (error) {
+        throw new Error(`Plugin ${loaded.id} before ${name} failed: ${describeError(error)}`, {
+          cause: error,
+        });
+      }
+    }
+    return request;
+  }
+
+  async getProviderCatalogCacheKey(
+    pluginId: string,
+    providerId: string,
+    options: ProviderCatalogOptions,
+  ): Promise<string | undefined> {
+    const loaded = this.plugins.get(pluginId);
+    if (!loaded) throw new Error(`Plugin is not available: ${pluginId}`);
+    const output = await this.request(loaded, {
+      type: "provider.catalog_key",
+      requestId: randomUUID(),
+      providerId,
+      options,
+    });
+    if (output !== undefined && typeof output !== "string")
+      throw new Error("Invalid catalogue key from plugin");
+    return output;
+  }
+
+  private request(
+    loaded: LoadedPlugin,
+    message: Extract<PluginProcessRequest, { requestId: string }>,
+  ): Promise<unknown> {
     const child = loaded.child;
+    const pluginId = loaded.id;
     if (!child) throw new Error(`Plugin ${pluginId} has no server entry`);
-    const requestId = randomUUID();
+    const requestId = message.requestId;
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         loaded.pending.delete(requestId);
-        reject(new Error(`Plugin RPC timed out: ${pluginId}.${method}`));
+        if (message.type === "hook") {
+          void send(child, { type: "hook.cancel", requestId }).catch(() => {});
+        }
+        reject(new Error(`Plugin RPC timed out: ${pluginId}.${message.type}`));
       }, REQUEST_TIMEOUT_MS);
       loaded.pending.set(requestId, { resolve, reject, timeout });
-      void send(child, { type: "invoke", requestId, method, input }).catch((error) => {
+      void send(child, message).catch((error) => {
         clearTimeout(timeout);
         loaded.pending.delete(requestId);
         reject(error);
@@ -336,7 +633,8 @@ export class PluginRuntime {
     configuredPath: string,
   ): Promise<LoadedPlugin> {
     const directory = path.resolve(configuredPath);
-    await readPluginManifest(directory);
+    const manifest = await readPluginManifest(directory);
+    assertPluginCompatibility({ ...manifest, version: this.daemonVersion, runtime: "daemon" });
     const entryPaths = await resolveEntryPaths(directory);
     const bundles = await compilePlugin(entryPaths);
     const serverBundle = bundles.serverBundle;
@@ -344,95 +642,227 @@ export class PluginRuntime {
       return {
         id: pluginId,
         clientBundle: bundles.clientBundle ?? "",
+        requirements: manifest.requirements,
         methods: new Set(),
+        hooks: { events: [], before: [] },
+        providers: [],
+        usageSources: [],
         child: null,
         outputCapture: null,
         pending: new Map(),
+        providerConnections: new Map(),
+        providerConnectionTombstones: new Set(),
         sessionSocket: null,
         sessionClosed: null,
       };
     }
+    return this.launchPlugin({
+      pluginId,
+      pluginDirectory: directory,
+      requirements: manifest.requirements,
+      child: this.spawnChild(),
+      bundle: serverBundle,
+      clientBundle: bundles.clientBundle ?? "",
+    });
+  }
+
+  private async launchPlugin(input: {
+    pluginId: string;
+    pluginDirectory: string;
+    requirements: PluginRequirements | undefined;
+    child: PluginChild;
+    bundle: string;
+    clientBundle: string;
+  }): Promise<LoadedPlugin> {
+    const { pluginId, requirements, child, bundle, clientBundle } = input;
     const sessionHost = this.sessionHost;
     if (!sessionHost) throw new Error("Plugin Paseo session host is not attached");
-    const child = this.spawnChild();
     const outputCapture = new PluginOutputCapture(child, (stream, message) => {
       this.appendLog(pluginId, stream, message);
     });
-    const sessionSocket = new PluginSessionSocket(child);
+    const session: PluginSessionBinding = {
+      socket: new PluginSessionSocket(child),
+      reattaching: false,
+      plugin: null,
+    };
     const pending = new Map<string, PendingInvocation>();
     const sessionAttachment = await sessionHost
-      .attachPluginSocket(pluginId, sessionSocket)
+      .attachPluginSocket(pluginId, session.socket)
       .catch((error) => {
         terminatePluginChild(child);
         throw error;
       });
     let loaded: LoadedPlugin | null = null;
-    let methods: string[];
+    let ready: Extract<PluginProcessMessage, { type: "ready" }>;
     try {
-      methods = await new Promise<string[]>((resolve, reject) => {
-        let settled = false;
-        const timeout = setTimeout(
-          () => fail(new Error(`Plugin ${pluginId} did not initialize`)),
-          REQUEST_TIMEOUT_MS,
-        );
-        const fail = (error: Error): void => {
-          if (settled) return;
-          settled = true;
-          clearTimeout(timeout);
-          reject(error);
-        };
-        child.on("message", (message) => {
-          if (message.type === "paseo_frame") {
-            sessionSocket.receive(message.data, message.isBinary);
-          } else if (message.type === "paseo_close") {
-            sessionSocket.peerClosed();
-          } else if (message.type === "ready") {
+      ready = await new Promise<Extract<PluginProcessMessage, { type: "ready" }>>(
+        (resolve, reject) => {
+          let settled = false;
+          const timeout = setTimeout(
+            () => fail(new Error(`Plugin ${pluginId} did not initialize`)),
+            REQUEST_TIMEOUT_MS,
+          );
+          const fail = (error: Error): void => {
             if (settled) return;
             settled = true;
             clearTimeout(timeout);
-            resolve(message.methods);
-          } else if (message.type === "fatal") {
-            fail(new Error(message.error));
-          } else if (loaded) {
-            this.handleChildMessage(loaded, message);
-          }
-        });
-        child.on("close", () => {
-          sessionSocket.peerClosed();
-          if (!loaded) {
-            fail(new Error(`Plugin ${pluginId} exited during initialization`));
-            return;
-          }
-          void this.handleChildClose(loaded);
-        });
-        void send(child, {
-          type: "initialize",
-          pluginId,
-          appVersion: this.daemonVersion,
-          bundle: serverBundle,
-        }).catch(fail);
-      });
+            reject(error);
+          };
+          child.on("message", (rawMessage) => {
+            const parsed = PluginProcessMessageSchema.safeParse(rawMessage);
+            if (!parsed.success) {
+              const error = new Error(
+                `Plugin ${pluginId} sent an invalid message: ${parsed.error.message}`,
+              );
+              if (loaded) this.handleMalformedChildMessage(loaded, rawMessage, error);
+              else fail(error);
+              return;
+            }
+            const message = parsed.data;
+            if (message.type === "paseo_frame") {
+              this.routePluginFrame({
+                session,
+                pluginId,
+                child,
+                sessionHost,
+                frame: message.data,
+                isBinary: message.isBinary,
+              });
+            } else if (message.type === "paseo_close") {
+              session.socket.peerClosed();
+            } else if (message.type === "ready") {
+              if (settled) return;
+              settled = true;
+              clearTimeout(timeout);
+              resolve(message);
+            } else if (message.type === "fatal") {
+              fail(new Error(message.error));
+            } else if (loaded) {
+              this.handleChildMessage(loaded, message);
+            }
+          });
+          child.on("close", () => {
+            session.socket.peerClosed();
+            if (!loaded) {
+              fail(new Error(`Plugin ${pluginId} exited during initialization`));
+              return;
+            }
+            void this.handleChildClose(loaded);
+          });
+          void send(child, {
+            type: "initialize",
+            pluginId,
+            pluginDirectory: input.pluginDirectory,
+            appVersion: this.daemonVersion,
+            bundle,
+            settingsDirectory: this.dependencies.settingsDirectory
+              ? path.join(this.dependencies.settingsDirectory, pluginId)
+              : undefined,
+          }).catch(fail);
+        },
+      );
     } catch (error) {
-      sessionSocket.close();
+      session.socket.close();
       await sessionAttachment.closed;
       terminatePluginChild(child);
       throw error;
     }
     loaded = {
       id: pluginId,
-      clientBundle: bundles.clientBundle ?? "",
-      methods: new Set(methods),
+      clientBundle,
+      requirements,
+      methods: new Set(ready.methods),
+      hooks: ready.hooks ?? { events: [], before: [] },
+      providers: ready.providers ?? [],
+      usageSources: ready.usageSources ?? [],
       child,
       outputCapture,
       pending,
-      sessionSocket,
+      providerConnections: new Map(),
+      providerConnectionTombstones: new Set(),
+      sessionSocket: session.socket,
       sessionClosed: sessionAttachment.closed,
     };
-    this.logger.info({ pluginId, methods }, "Loaded plugin");
+    session.plugin = loaded;
+    this.logger.info(
+      { pluginId, methods: ready.methods, providers: ready.providers },
+      "Loaded plugin",
+    );
     return loaded;
   }
 
+  /**
+   * Frames still in flight belong to the closed session; only a fresh hello
+   * means the child redialled and wants a new one. Attaching on the close
+   * instead would leave a socket nobody speaks to until the host's hello
+   * timeout closed it, and that close would attach another.
+   */
+  private routePluginFrame(input: PluginFrameInput): void {
+    const { session, frame, isBinary } = input;
+    if (session.socket.readyState === 1) {
+      session.socket.receive(frame, isBinary);
+      return;
+    }
+    if (session.reattaching || !isSessionHelloFrame({ frame, isBinary })) return;
+    if (!this.canReattachPluginSession(input)) return;
+    session.reattaching = true;
+    void this.reattachPluginSession(input).finally(() => {
+      session.reattaching = false;
+    });
+  }
+
+  private async reattachPluginSession(input: PluginFrameInput): Promise<void> {
+    const { session, pluginId, sessionHost, child, frame, isBinary } = input;
+    const replacement = new PluginSessionSocket(child);
+    try {
+      const attachment = await sessionHost.attachPluginSocket(pluginId, replacement);
+      if (!this.canReattachPluginSession(input)) {
+        replacement.close();
+        return;
+      }
+      session.socket = replacement;
+      if (session.plugin) {
+        session.plugin.sessionSocket = replacement;
+        session.plugin.sessionClosed = attachment.closed;
+      }
+      replacement.receive(frame, isBinary);
+      this.appendLog(pluginId, "stdout", "[paseo] Re-attached plugin session");
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      this.appendLog(pluginId, "stderr", `[paseo] Failed to re-attach plugin session: ${reason}`);
+      this.logger.warn({ pluginId, err: error }, "Failed to re-attach a plugin session");
+      this.notify(pluginId, `Plugin session could not be re-attached: ${pluginId}`);
+    }
+  }
+
+  /**
+   * A published plugin whose process is still up. Anything else is either still
+   * loading or being torn down, and must not get a new session.
+   */
+  private canReattachPluginSession(input: {
+    session: PluginSessionBinding;
+    pluginId: string;
+    child: PluginChild;
+  }): boolean {
+    const { session, pluginId, child } = input;
+    return (
+      session.plugin !== null && this.plugins.get(pluginId) === session.plugin && child.connected
+    );
+  }
+
   private handleChildMessage(loaded: LoadedPlugin, message: PluginProcessMessage): void {
+    if (message.type === "hooks.changed") {
+      loaded.hooks = message.hooks;
+      return;
+    }
+    if (message.type === "settings.changed") {
+      this.dependencies.onSettingsChanged?.(loaded.id, message.settingsId);
+      return;
+    }
+    if (message.type.startsWith("provider.")) {
+      this.handleProviderMessage(loaded, message);
+      return;
+    }
     if (message.type !== "result" && message.type !== "error") return;
     const pending = loaded.pending.get(message.requestId);
     if (!pending) return;
@@ -442,6 +872,295 @@ export class PluginRuntime {
     else pending.reject(new Error(message.error));
   }
 
+  private handleProviderMessage(loaded: LoadedPlugin, message: PluginProcessMessage): void {
+    if (!("connectionId" in message)) return;
+    const state = loaded.providerConnections.get(message.connectionId);
+    if (!state) {
+      if (!loaded.providerConnectionTombstones.has(message.connectionId)) return;
+      if (message.type === "provider.connected" && loaded.child?.connected) {
+        void send(loaded.child, {
+          type: "provider.close",
+          connectionId: message.connectionId,
+        }).catch(() => undefined);
+      }
+      if (message.type === "provider.closed" || message.type === "provider.connect_failed") {
+        loaded.providerConnectionTombstones.delete(message.connectionId);
+      }
+      return;
+    }
+    if (message.type === "provider.connected") {
+      this.finishProviderConnect(loaded, message.connectionId, state, message);
+      return;
+    }
+    if (message.type === "provider.connect_failed") {
+      this.abandonProviderConnect(loaded, message.connectionId, state, new Error(message.error));
+      return;
+    }
+    if (message.type === "provider.accepted" || message.type === "provider.rejected") {
+      const pending = state.pendingSends.get(message.acceptanceId);
+      if (!pending) return;
+      state.pendingSends.delete(message.acceptanceId);
+      if (message.type === "provider.accepted") {
+        this.trackAcceptedProviderInput(state, pending.input);
+        pending.resolve();
+      } else pending.reject(new Error(message.error));
+      return;
+    }
+    if (message.type === "provider.event") {
+      this.publishProviderEvent(loaded, message.connectionId, state, message.event);
+      return;
+    }
+    if (message.type === "provider.closed") {
+      loaded.providerConnections.delete(message.connectionId);
+      if (message.error) {
+        this.failRemoteProviderConnection(state, new Error(message.error));
+        return;
+      }
+      state.closed = true;
+      this.rejectProviderSends(state, "Provider connection closed");
+      state.resolveClosed();
+    }
+  }
+
+  private finishProviderConnect(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+    message: Extract<PluginProcessMessage, { type: "provider.connected" }>,
+  ): void {
+    if (!Number.isInteger(message.version) || message.version < 1) {
+      this.abandonProviderConnect(
+        loaded,
+        connectionId,
+        state,
+        new Error(`Plugin provider selected invalid version: ${message.version}`),
+      );
+      return;
+    }
+    if (!state.request.versions.includes(message.version)) {
+      this.abandonProviderConnect(
+        loaded,
+        connectionId,
+        state,
+        new Error(`Plugin provider selected an unoffered version: ${message.version}`),
+      );
+      return;
+    }
+    const knownCapabilities = new Set<string>(PROVIDER_CAPABILITIES);
+    const invalidCapability = message.capabilities.find(
+      (capability) =>
+        knownCapabilities.has(capability) && !state.request.capabilities.includes(capability),
+    );
+    if (invalidCapability) {
+      this.abandonProviderConnect(
+        loaded,
+        connectionId,
+        state,
+        new Error(`Plugin provider selected an unoffered capability: ${invalidCapability}`),
+      );
+      return;
+    }
+    const capabilities = PROVIDER_CAPABILITIES.filter((capability) =>
+      message.capabilities.includes(capability),
+    );
+    const connection: ProviderConnection = {
+      version: message.version,
+      capabilities,
+      send: (input) => this.sendProviderInput(loaded, connectionId, state, input),
+      onEvent(listener) {
+        state.listeners.add(listener);
+        return () => state.listeners.delete(listener);
+      },
+      close: () => this.closeProviderConnection(loaded, connectionId, state),
+    };
+    state.capabilities = capabilities;
+    state.connected = true;
+    state.resolveConnected(connection);
+  }
+
+  private abandonProviderConnect(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+    error: Error,
+  ): void {
+    if (state.connected || state.closed) return;
+    loaded.providerConnections.delete(connectionId);
+    loaded.providerConnectionTombstones.add(connectionId);
+    state.closed = true;
+    state.rejectConnected(error);
+    state.rejectClosed(error);
+    if (loaded.child?.connected) {
+      void send(loaded.child, { type: "provider.close", connectionId }).catch(() => undefined);
+    }
+  }
+
+  private sendProviderInput(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+    input: ProviderInput,
+  ): Promise<void> {
+    if (state.closed) return Promise.reject(new Error("Provider connection is closed"));
+    try {
+      if (input.type === "session.open" || !("sessionId" in input)) {
+        requireProviderCapabilities(state.capabilities, input);
+      } else {
+        const capabilities = state.sessions.get(input.sessionId);
+        if (!capabilities) throw new Error(`Unknown provider session: ${input.sessionId}`);
+        requireProviderCapabilities(capabilities, input);
+      }
+    } catch (error) {
+      return Promise.reject(error);
+    }
+    const child = loaded.child;
+    if (!child) return Promise.reject(new Error(`Plugin has no server entry: ${loaded.id}`));
+    const acceptanceId = randomUUID();
+    return new Promise((resolve, reject) => {
+      state.pendingSends.set(acceptanceId, { input, resolve, reject });
+      void send(child, {
+        type: "provider.send",
+        connectionId,
+        acceptanceId,
+        input: jsonTransportValue(input),
+      }).catch((error) => {
+        state.pendingSends.delete(acceptanceId);
+        reject(error);
+      });
+    });
+  }
+
+  private async closeProviderConnection(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+  ): Promise<void> {
+    if (state.closed) return;
+    const child = loaded.child;
+    if (!child) throw new Error(`Plugin has no server entry: ${loaded.id}`);
+    await send(child, { type: "provider.close", connectionId });
+    await state.closedPromise;
+  }
+
+  private publishProviderEvent(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+    event: ProviderEvent,
+  ): void {
+    if (
+      event.type === "timeline.item" &&
+      event.item.type === "plugin" &&
+      event.item.pluginId !== loaded.id
+    ) {
+      this.failProviderConnection(
+        loaded,
+        connectionId,
+        state,
+        new Error(
+          `Provider plugin ${loaded.id} cannot emit timeline items for ${event.item.pluginId}`,
+        ),
+      );
+      return;
+    }
+    if (event.type === "session.opened") {
+      const knownCapabilities = new Set<string>(PROVIDER_CAPABILITIES);
+      const invalidCapability = event.capabilities.find(
+        (capability) =>
+          knownCapabilities.has(capability) && !state.capabilities.includes(capability),
+      );
+      if (invalidCapability) {
+        this.failProviderConnection(
+          loaded,
+          connectionId,
+          state,
+          new Error(`Provider session selected an unoffered capability: ${invalidCapability}`),
+        );
+        return;
+      }
+      const selectedCapabilities = event.capabilities;
+      event = {
+        ...event,
+        capabilities: PROVIDER_CAPABILITIES.filter((capability) =>
+          selectedCapabilities.includes(capability),
+        ),
+      };
+      if (
+        event.parentSessionId &&
+        !state.sessions.get(event.parentSessionId)?.includes("session.subsession")
+      ) {
+        this.failProviderConnection(
+          loaded,
+          connectionId,
+          state,
+          new Error(`Provider parent session did not negotiate session.subsession`),
+        );
+        return;
+      }
+    }
+    if (event.type === "session.opened") {
+      state.sessions.set(event.sessionId, event.capabilities);
+    }
+    for (const listener of state.listeners) listener(event);
+    if (event.type === "session.closed") state.sessions.delete(event.sessionId);
+  }
+
+  private failProviderConnection(
+    loaded: LoadedPlugin,
+    connectionId: string,
+    state: RemoteProviderConnection,
+    error: Error,
+  ): void {
+    loaded.providerConnections.delete(connectionId);
+    this.failRemoteProviderConnection(state, error);
+    if (loaded.child?.connected) {
+      void send(loaded.child, { type: "provider.close", connectionId }).catch(() => undefined);
+    }
+  }
+
+  private trackAcceptedProviderInput(state: RemoteProviderConnection, input: ProviderInput): void {
+    if (input.type === "session.open" && !state.sessions.has(input.sessionId)) {
+      state.sessions.set(input.sessionId, []);
+    }
+    if (input.type === "session.close") state.sessions.delete(input.sessionId);
+  }
+
+  private handleMalformedChildMessage(
+    loaded: LoadedPlugin,
+    rawMessage: unknown,
+    error: Error,
+  ): void {
+    const connectionId = readConnectionId(rawMessage);
+    const state = connectionId ? loaded.providerConnections.get(connectionId) : undefined;
+    if (!connectionId || !state) {
+      this.appendLog(loaded.id, "stderr", `[paseo] ${error.message}`);
+      terminatePluginChild(loaded.child!);
+      return;
+    }
+    this.failProviderConnection(loaded, connectionId, state, error);
+  }
+
+  private failRemoteProviderConnection(state: RemoteProviderConnection, error: Error): void {
+    if (state.closed) return;
+    for (const sessionId of state.sessions.keys()) {
+      const event: ProviderEvent = {
+        type: "session.runtime_failed",
+        sessionId,
+        error: { message: error.message },
+      };
+      for (const listener of state.listeners) listener(event);
+    }
+    state.closed = true;
+    state.rejectConnected(error);
+    this.rejectProviderSends(state, error.message);
+    state.rejectClosed(error);
+  }
+
+  private rejectProviderSends(state: RemoteProviderConnection, message: string): void {
+    for (const pending of state.pendingSends.values()) pending.reject(new Error(message));
+    state.pendingSends.clear();
+  }
+
   private async handleChildClose(loaded: LoadedPlugin): Promise<void> {
     loaded.sessionSocket?.peerClosed();
     const wasPublished = this.plugins.get(loaded.id) === loaded;
@@ -449,12 +1168,25 @@ export class PluginRuntime {
       this.plugins.delete(loaded.id);
     }
     this.rejectPending(loaded, `Plugin process exited: ${loaded.id}`);
+    for (const state of loaded.providerConnections.values()) {
+      this.failRemoteProviderConnection(state, new Error(`Plugin process exited: ${loaded.id}`));
+    }
+    loaded.providerConnections.clear();
     await loaded.sessionClosed;
     if (wasPublished) this.notify(loaded.id, `Plugin process exited: ${loaded.id}`);
   }
 
   private async stopPlugin(loaded: LoadedPlugin): Promise<void> {
     this.appendLog(loaded.id, "stdout", "[paseo] Stopping plugin");
+    for (const [connectionId, state] of loaded.providerConnections) {
+      if (state.connected) continue;
+      this.abandonProviderConnect(
+        loaded,
+        connectionId,
+        state,
+        new Error(`Plugin stopped: ${loaded.id}`),
+      );
+    }
     const { child, sessionSocket, sessionClosed } = loaded;
     if (!child || !sessionSocket || !sessionClosed) {
       this.appendLog(loaded.id, "stdout", "[paseo] Plugin stopped");
@@ -474,7 +1206,15 @@ export class PluginRuntime {
     if (child.connected) {
       await send(child, { type: "shutdown" }).catch(() => undefined);
     }
-    await closed;
+    let forceTimer: ReturnType<typeof setTimeout> | null = setTimeout(() => {
+      if (!child.killed) child.kill("SIGTERM");
+      forceTimer = setTimeout(() => {
+        child.kill("SIGKILL");
+      }, SOFT_SHUTDOWN_TIMEOUT_MS);
+    }, SOFT_SHUTDOWN_TIMEOUT_MS);
+    await closed.finally(() => {
+      if (forceTimer) clearTimeout(forceTimer);
+    });
     sessionSocket.peerClosed();
     await sessionClosed;
     this.appendLog(loaded.id, "stdout", "[paseo] Plugin stopped");
@@ -515,3 +1255,19 @@ export class PluginRuntime {
     for (const listener of this.listeners) listener(pluginId, error);
   }
 }
+
+function isSessionHelloFrame(input: { frame: string | Uint8Array; isBinary: boolean }): boolean {
+  const { frame, isBinary } = input;
+  if (isBinary || typeof frame !== "string") return false;
+  try {
+    return (JSON.parse(frame) as { type?: unknown }).type === "hello";
+  } catch {
+    return false;
+  }
+}
+
+function readConnectionId(value: unknown): string | null {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+  const connectionId = Reflect.get(value, "connectionId");
+  return typeof connectionId === "string" ? connectionId : null;
+}
diff --git a/packages/server/src/server/plugins/settings.e2e.test.ts b/packages/server/src/server/plugins/settings.e2e.test.ts
new file mode 100644
index 0000000000..a6ccf3f2cc
--- /dev/null
+++ b/packages/server/src/server/plugins/settings.e2e.test.ts
@@ -0,0 +1,190 @@
+import { resolveDaemonVersion } from "../daemon-version.js";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, onTestFinished, test } from "vitest";
+import { z } from "zod";
+import { defineRpc, settingsRpc } from "@getpaseo/plugin";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+test("server reads saved settings after daemon restart before any client connects", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "settings-restart-"));
+  onTestFinished(() => rm(root, { recursive: true, force: true }));
+  const directory = path.join(root, "plugin");
+  const startupReport = path.join(root, "startup.json");
+  await mkdir(path.join(directory, "server"), { recursive: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "settings-startup",
+      requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+    }),
+  );
+  await writeFile(
+    path.join(directory, "server", "report.ts"),
+    `import { writeFile } from "node:fs/promises";
+export async function reportStartup(settings) {
+  const state = await settings.read();
+  await writeFile(${JSON.stringify(startupReport)}, JSON.stringify(state));
+}`,
+  );
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    `import { defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+import { reportStartup } from "./server/report";
+export default function(server) {
+  const settings = server.registerSettings(defineSettings({ id: "display", scope: "host", version: 1, schema: z.object({ enabled: z.boolean().default(true) }) }));
+  const startup = reportStartup(settings);
+  return async () => { await startup; };
+}`,
+  );
+  const options = {
+    paseoHomeRoot: path.join(root, "daemon"),
+    staticDir: path.join(root, "static"),
+    cleanup: false,
+    pluginsEnabled: true,
+    plugins: {
+      "settings-startup": { source: "directory" as const, path: directory, enabled: true },
+    },
+  };
+  const first = await createTestPaseoDaemon(options);
+  onTestFinished(() => first.close());
+  const rpc = settingsRpc("display");
+  const readStartup = async () =>
+    rpc.read.output.parse(JSON.parse(await readFile(startupReport, "utf8")));
+  await expect
+    .poll(readStartup)
+    .toEqual({ status: "ready", revision: "missing", values: { enabled: true } });
+
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${first.port}/ws`, appVersion: "0.8.0" });
+  onTestFinished(() => client.close());
+  await client.connect();
+  const saved = rpc.write.output.parse(
+    await client.invokePluginRpc("settings-startup", rpc.write.name, {
+      revision: "missing",
+      values: { enabled: false },
+    }),
+  );
+  expect(saved).toMatchObject({ status: "saved", values: { enabled: false } });
+  const persisted = rpc.read.output.parse(
+    await client.invokePluginRpc("settings-startup", rpc.read.name, {}),
+  );
+  await client.close();
+  await first.close();
+  await rm(startupReport);
+
+  const restarted = await createTestPaseoDaemon(options);
+  onTestFinished(() => restarted.close());
+  // No client is created for this daemon: the report comes from server startup alone.
+  await expect.poll(readStartup).toEqual(persisted);
+}, 60_000);
+
+test("two clients share settings, observe changes, and preserve values through plugin lifecycle", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "settings-plugin-"));
+  const daemon = await createTestPaseoDaemon();
+  const first = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.7.2" });
+  const second = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.7.2" });
+  const rpc = settingsRpc("display");
+  const serverReadRpc = defineRpc({
+    name: "settings-test.server-read",
+    input: z.object({}),
+    output: z.json(),
+  });
+  const serverChangesRpc = defineRpc({
+    name: "settings-test.server-changes",
+    input: z.object({}),
+    output: z.object({ count: z.number().int() }),
+  });
+  const read = async (client: DaemonClient, pluginId = "settings-test") =>
+    rpc.read.output.parse(await client.invokePluginRpc(pluginId, rpc.read.name, {}));
+  const changed: string[] = [];
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({
+        id: "settings-test",
+        requirements: { paseo: `>=${resolveDaemonVersion(import.meta.url)}` },
+      }),
+    );
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `import { defineRpc, defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+const serverRead = defineRpc({ name: "settings-test.server-read", input: z.object({}), output: z.json() });
+const serverChanges = defineRpc({ name: "settings-test.server-changes", input: z.object({}), output: z.object({ count: z.number().int() }) });
+export default function(server) {
+  const settings = server.registerSettings(defineSettings({ id: "display", scope: "host", version: 1, schema: z.object({ enabled: z.boolean().default(true) }) }));
+  let changes = 0;
+  settings.subscribe(() => { changes += 1; });
+  server.handle(serverRead, () => settings.read());
+  server.handle(serverChanges, () => ({ count: changes }));
+  return () => {};
+}`,
+    );
+    await first.connect();
+    await second.connect();
+    await second.observeEvents(["status.plugin_settings_changed"]).ready;
+    second.on("status", (message) => {
+      if (message.payload.status === "plugin_settings_changed")
+        changed.push(z.string().parse(message.payload.settingsId));
+    });
+    await first.patchDaemonConfig({ pluginsEnabled: true });
+    await first.installDirectoryPlugin(directory);
+    const initial = await read(first);
+    expect(initial).toMatchObject({ status: "ready", values: { enabled: true } });
+    expect(
+      serverReadRpc.output.parse(
+        await first.invokePluginRpc("settings-test", serverReadRpc.name, {}),
+      ),
+    ).toMatchObject({ status: "ready", values: { enabled: true } });
+    expect(
+      serverChangesRpc.output.parse(
+        await first.invokePluginRpc("settings-test", serverChangesRpc.name, {}),
+      ),
+    ).toEqual({ count: 0 });
+    expect(
+      await second.invokePluginRpc("settings-test", rpc.write.name, {
+        revision: initial.revision,
+        values: { enabled: false },
+      }),
+    ).toMatchObject({ status: "saved" });
+    await expect.poll(() => changed).toEqual(["display"]);
+    expect(await read(first)).toMatchObject({ values: { enabled: false } });
+    expect(
+      serverReadRpc.output.parse(
+        await first.invokePluginRpc("settings-test", serverReadRpc.name, {}),
+      ),
+    ).toMatchObject({ status: "ready", values: { enabled: false } });
+    expect(
+      serverChangesRpc.output.parse(
+        await first.invokePluginRpc("settings-test", serverChangesRpc.name, {}),
+      ),
+    ).toEqual({ count: 1 });
+    expect(
+      await first.invokePluginRpc("settings-test", rpc.write.name, {
+        revision: initial.revision,
+        values: { enabled: true },
+      }),
+    ).toMatchObject({ status: "conflict" });
+    await first.reloadPlugin("settings-test");
+    expect(await read(first)).toMatchObject({ values: { enabled: false } });
+    await first.disablePlugin("settings-test");
+    await first.enablePlugin("settings-test");
+    expect(await read(first)).toMatchObject({ values: { enabled: false } });
+    await first.installDirectoryPlugin(directory, "other-installation");
+    expect(await read(first, "other-installation")).toMatchObject({ values: { enabled: true } });
+    await first.removePlugin("settings-test");
+    await first.installDirectoryPlugin(directory);
+    expect(await read(first)).toMatchObject({ values: { enabled: true } });
+  } catch (error) {
+    console.error(await first.getPluginLogs("settings-test"));
+    throw error;
+  } finally {
+    await first.close();
+    await second.close();
+    await daemon.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/settings/index.test.ts b/packages/server/src/server/plugins/settings/index.test.ts
new file mode 100644
index 0000000000..de81919eae
--- /dev/null
+++ b/packages/server/src/server/plugins/settings/index.test.ts
@@ -0,0 +1,177 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, expect, test } from "vitest";
+import { defineSettings } from "@getpaseo/plugin";
+import type { PluginSettingsState } from "@getpaseo/plugin/server";
+import { z } from "zod";
+import { PluginSettingsStore } from "./index.js";
+
+const roots: string[] = [];
+afterEach(async () => {
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+const definition = defineSettings({
+  id: "display",
+  scope: "host",
+  version: 1,
+  schema: z.object({
+    enabled: z.boolean().default(true),
+    count: z.number().int().min(1).default(5),
+  }),
+});
+type DisplaySettingsState = PluginSettingsState<typeof definition.schema>;
+function mutateNotification(state: DisplaySettingsState): void {
+  if (state.status === "ready") state.values.count = 99;
+}
+async function setup() {
+  const directory = await mkdtemp(path.join(tmpdir(), "plugin-settings-"));
+  roots.push(directory);
+  const changes: string[] = [];
+  const store = new PluginSettingsStore(directory, (id) => changes.push(id));
+  return { directory, changes, handlers: store.register(definition) };
+}
+
+test("defaults, atomic saves, concurrent revisions, and restart persistence", async () => {
+  const { directory, changes, handlers } = await setup();
+  expect(await handlers.read.handle()).toEqual({
+    status: "ready",
+    revision: "missing",
+    values: { enabled: true, count: 5 },
+  });
+  const outcomes = await Promise.all([
+    handlers.write.handle({ revision: "missing", values: { enabled: false, count: 10 } }),
+    handlers.write.handle({ revision: "missing", values: { enabled: true, count: 20 } }),
+  ]);
+  expect(outcomes.map((result) => result.status)).toEqual(["saved", "conflict"]);
+  const reopened = new PluginSettingsStore(directory, () => {}).register(definition);
+  expect(await reopened.read.handle()).toMatchObject({
+    status: "ready",
+    values: { enabled: false, count: 10 },
+  });
+  expect(changes).toEqual(["display"]);
+});
+
+test("server settings read current values and notify after successful writes", async () => {
+  const { handlers } = await setup();
+  const notifications: unknown[] = [];
+  const unsubscribe = handlers.settings.subscribe((state) => {
+    notifications.push(state);
+    mutateNotification(state);
+  });
+
+  expect(await handlers.settings.read()).toEqual({
+    status: "ready",
+    revision: "missing",
+    values: { enabled: true, count: 5 },
+  });
+  const saved = await handlers.write.handle({
+    revision: "missing",
+    values: { enabled: false, count: 10 },
+  });
+  expect(saved).toMatchObject({ status: "saved", values: { enabled: false, count: 10 } });
+  const current = await handlers.settings.read();
+  expect(current).toMatchObject({
+    status: "ready",
+    values: { enabled: false, count: 10 },
+  });
+  expect(notifications).toEqual([
+    {
+      status: "ready",
+      revision: current.revision,
+      values: { enabled: false, count: 99 },
+    },
+  ]);
+
+  expect(
+    await handlers.write.handle({ revision: current.revision, values: { count: -1 } }),
+  ).toMatchObject({ status: "invalid" });
+  expect(notifications).toHaveLength(1);
+
+  unsubscribe();
+  await handlers.reset.handle({ revision: current.revision });
+  expect(notifications).toHaveLength(1);
+});
+
+test("validation failure preserves disk and leaves the writer usable", async () => {
+  const { handlers, changes } = await setup();
+  expect(await handlers.write.handle({ revision: "missing", values: { count: -1 } })).toMatchObject(
+    { status: "invalid" },
+  );
+  expect(await handlers.read.handle()).toMatchObject({ revision: "missing" });
+  expect(changes).toEqual([]);
+  expect(await handlers.write.handle({ revision: "missing", values: { count: 2 } })).toMatchObject({
+    status: "saved",
+    values: { enabled: true, count: 2 },
+  });
+});
+
+test("migrates once, persists the validated version, and rejects old clients", async () => {
+  const { directory, handlers } = await setup();
+  const saved = await handlers.write.handle({ revision: "missing", values: { count: 7 } });
+  if (saved.status !== "saved") throw new Error("save failed");
+  let migrations = 0;
+  const upgraded = new PluginSettingsStore(directory, () => {}).register({
+    ...definition,
+    version: 2,
+    schema: z.object({ total: z.number().default(0) }),
+    migrate(values, version) {
+      migrations++;
+      expect(version).toBe(1);
+      return { total: z.object({ count: z.number() }).parse(values).count };
+    },
+  });
+  expect(await upgraded.read.handle()).toMatchObject({ status: "ready", values: { total: 7 } });
+  await upgraded.read.handle();
+  expect(migrations).toBe(1);
+  expect(
+    await handlers.write.handle({ revision: saved.revision, values: { count: 9 } }),
+  ).toMatchObject({ status: "conflict" });
+  const newer = await handlers.read.handle();
+  expect(newer).toMatchObject({
+    status: "invalid",
+    error: expect.stringContaining("newer plugin"),
+  });
+  expect(
+    await handlers.write.handle({ revision: newer.revision, values: { count: 9 } }),
+  ).toMatchObject({ status: "invalid" });
+  expect(await upgraded.read.handle()).toMatchObject({ values: { total: 7 } });
+});
+
+test("failed migrations and corrupt data survive reads until an explicit reset", async () => {
+  const { directory, handlers } = await setup();
+  await handlers.write.handle({ revision: "missing", values: { count: 7 } });
+  const file = path.join(directory, "display.json");
+  const before = await readFile(file, "utf8");
+  const upgraded = new PluginSettingsStore(directory, () => {}).register({
+    ...definition,
+    version: 2,
+    migrate() {
+      throw new Error("migration failed");
+    },
+  });
+  expect(await upgraded.read.handle()).toMatchObject({
+    status: "invalid",
+    error: "migration failed",
+  });
+  expect(await readFile(file, "utf8")).toBe(before);
+  await writeFile(file, "broken JSON");
+  const invalid = await handlers.read.handle();
+  expect(invalid.status).toBe("invalid");
+  expect(await readFile(file, "utf8")).toBe("broken JSON");
+  expect(await handlers.reset.handle({ revision: invalid.revision })).toMatchObject({
+    status: "saved",
+    values: { enabled: true, count: 5 },
+  });
+});
+
+test("installation namespaces and definition IDs remain separate", async () => {
+  const first = await setup();
+  const second = await setup();
+  await first.handlers.write.handle({ revision: "missing", values: { enabled: false } });
+  expect(await second.handlers.read.handle()).toMatchObject({ values: { enabled: true } });
+  const store = new PluginSettingsStore(first.directory, () => {});
+  store.register(definition);
+  expect(() => store.register(definition)).toThrow("Duplicate settings");
+  expect(() => store.register({ ...definition, id: "../escape" })).toThrow("Invalid settings ID");
+});
diff --git a/packages/server/src/server/plugins/settings/index.ts b/packages/server/src/server/plugins/settings/index.ts
new file mode 100644
index 0000000000..775a47f6a4
--- /dev/null
+++ b/packages/server/src/server/plugins/settings/index.ts
@@ -0,0 +1,185 @@
+import { createHash, randomUUID } from "node:crypto";
+import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { z, type ZodType } from "zod";
+import { defineSettings, settingsRpc, type SettingsDefinition } from "@getpaseo/plugin";
+import type { PluginSettings, PluginSettingsState } from "@getpaseo/plugin/server";
+
+const envelopeSchema = z.object({ version: z.number().int().positive(), values: z.json() });
+function message(error: unknown): string {
+  if (error instanceof z.ZodError) return error.issues.map((issue) => issue.message).join("\n");
+  return error instanceof Error ? error.message : String(error);
+}
+const revisionOf = (raw: string) => createHash("sha256").update(raw).digest("hex");
+
+type SettingsListener<Schema extends ZodType> = (
+  state: PluginSettingsState<Schema>,
+) => void | Promise<void>;
+type SettingsWriteState<Schema extends ZodType> =
+  | { status: "saved"; revision: string; values: z.output<Schema> }
+  | { status: "conflict"; error: string }
+  | { status: "invalid"; error: string };
+
+function reportListenerError(id: string, error: unknown): void {
+  console.error(`Plugin settings subscriber failed for ${id}`, error);
+}
+
+function copySettingsState<Schema extends ZodType>(
+  state: PluginSettingsState<Schema>,
+): PluginSettingsState<Schema> {
+  if (state.status === "invalid") return { ...state };
+  return { ...state, values: structuredClone(state.values) };
+}
+
+/** One instance per installation. The subprocess lifetime gives writes a single owner. */
+export class PluginSettingsStore {
+  private readonly definitions = new Map<string, SettingsDefinition>();
+  private queue: Promise<unknown> = Promise.resolve();
+
+  private readonly directory: string;
+  private readonly changed: (id: string) => void;
+  constructor(directory: string, changed: (id: string) => void) {
+    this.directory = directory;
+    this.changed = changed;
+  }
+
+  register<Schema extends ZodType>(definition: SettingsDefinition<Schema>) {
+    defineSettings(definition);
+    if (this.definitions.has(definition.id))
+      throw new Error(`Duplicate settings: ${definition.id}`);
+    this.definitions.set(definition.id, definition);
+    const listeners = new Set<SettingsListener<Schema>>();
+    const notify = (state: PluginSettingsState<Schema>): void => {
+      for (const listener of listeners) {
+        try {
+          void Promise.resolve(listener(copySettingsState(state))).catch((error) =>
+            reportListenerError(definition.id, error),
+          );
+        } catch (error) {
+          reportListenerError(definition.id, error);
+        }
+      }
+    };
+    const rpc = settingsRpc(definition.id);
+    const read = () => this.serial(() => this.read(definition, notify));
+    const write = (input: z.output<typeof rpc.write.input>) =>
+      this.serial(() => this.write(definition, input.revision, input.values, "save", notify));
+    const reset = (input: z.output<typeof rpc.reset.input>) =>
+      this.serial(() => this.write(definition, input.revision, {}, "reset", notify));
+    const settings: PluginSettings<Schema> = {
+      read,
+      subscribe(listener) {
+        listeners.add(listener);
+        return () => {
+          listeners.delete(listener);
+        };
+      },
+    };
+    return {
+      settings,
+      read: { contract: rpc.read, handle: read },
+      write: { contract: rpc.write, handle: write },
+      reset: { contract: rpc.reset, handle: reset },
+    };
+  }
+
+  private serial<T>(work: () => Promise<T>): Promise<T> {
+    const pending = this.queue.then(work);
+    this.queue = pending.catch(() => undefined);
+    return pending;
+  }
+
+  private async stored(id: string) {
+    try {
+      const raw = await readFile(path.join(this.directory, `${id}.json`), "utf8");
+      return { raw, revision: revisionOf(raw) };
+    } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "ENOENT")
+        return { raw: null, revision: "missing" };
+      throw error;
+    }
+  }
+
+  private async read<Schema extends ZodType>(
+    definition: SettingsDefinition<Schema>,
+    notify: (state: PluginSettingsState<Schema>) => void,
+  ): Promise<PluginSettingsState<Schema>> {
+    const stored = await this.stored(definition.id);
+    try {
+      const envelope = stored.raw === null ? null : envelopeSchema.parse(JSON.parse(stored.raw));
+      let values: unknown = envelope?.values ?? {};
+      if (envelope && envelope.version !== definition.version) {
+        if (envelope.version > definition.version)
+          throw new Error("Settings were saved by a newer plugin version");
+        if (!definition.migrate)
+          throw new Error(`Settings version ${envelope.version} requires a migration`);
+        values = await definition.migrate(values, envelope.version);
+      }
+      const parsed = await definition.schema.parseAsync(values);
+      z.json().parse(parsed);
+      const migrated = envelope !== null && envelope.version !== definition.version;
+      const revision = migrated ? await this.persist(definition, parsed) : stored.revision;
+      const result: PluginSettingsState<Schema> = {
+        status: "ready",
+        values: parsed,
+        revision,
+      };
+      if (migrated) {
+        notify(result);
+        this.changed(definition.id);
+      }
+      return result;
+    } catch (error) {
+      return { status: "invalid", revision: stored.revision, error: message(error) };
+    }
+  }
+
+  private async write<Schema extends ZodType>(
+    definition: SettingsDefinition<Schema>,
+    revision: string,
+    values: unknown,
+    intent: "save" | "reset",
+    notify: (state: PluginSettingsState<Schema>) => void,
+  ): Promise<SettingsWriteState<Schema>> {
+    const stored = await this.stored(definition.id);
+    if (stored.revision !== revision)
+      return {
+        status: "conflict",
+        error: "Settings changed on another client. Reload before saving again.",
+      };
+    let parsed: z.output<Schema>;
+    try {
+      if (intent === "save" && stored.raw !== null) {
+        const envelope = envelopeSchema.parse(JSON.parse(stored.raw));
+        if (envelope.version !== definition.version)
+          throw new Error("Reload or reset settings before saving a different schema version");
+      }
+      parsed = await definition.schema.parseAsync(values);
+      z.json().parse(parsed);
+    } catch (error) {
+      return { status: "invalid", error: message(error) };
+    }
+    const nextRevision = await this.persist(definition, parsed);
+    notify({ status: "ready", values: parsed, revision: nextRevision });
+    this.changed(definition.id);
+    return { status: "saved", values: parsed, revision: nextRevision };
+  }
+
+  private async persist<Schema extends ZodType>(
+    definition: SettingsDefinition<Schema>,
+    values: z.output<Schema>,
+  ) {
+    const jsonValues = z.json().parse(values);
+    await mkdir(this.directory, { recursive: true });
+    const target = path.join(this.directory, `${definition.id}.json`);
+    const temporary = `${target}.${randomUUID()}.tmp`;
+    const raw = JSON.stringify({ version: definition.version, values: jsonValues });
+    try {
+      await writeFile(temporary, raw, { mode: 0o600 });
+      await rename(temporary, target);
+    } finally {
+      await rm(temporary, { force: true });
+    }
+    return revisionOf(raw);
+  }
+}
diff --git a/packages/server/src/server/plugins/test-fixtures/internal-seam/index.server.ts b/packages/server/src/server/plugins/test-fixtures/internal-seam/index.server.ts
new file mode 100644
index 0000000000..8f0914a4c8
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/internal-seam/index.server.ts
@@ -0,0 +1,18 @@
+import { defineRpc } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { z } from "zod";
+
+const state = defineRpc({
+  name: "state",
+  input: z.object({}),
+  output: z.object({ workspaces: z.number() }),
+});
+
+export default function contribute(server: PluginServerContext) {
+  let workspaces = 0;
+  server.handle(state, () => ({ workspaces }));
+  server.on("workspace.created", () => {
+    workspaces += 1;
+  });
+  return () => {};
+}
diff --git a/packages/server/src/server/plugins/test-fixtures/internal-seam/paseo-plugin.json b/packages/server/src/server/plugins/test-fixtures/internal-seam/paseo-plugin.json
new file mode 100644
index 0000000000..e84dff55d8
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/internal-seam/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "internal-seam", "requirements": { "paseo": ">=0.8.0" } }
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source-directory/icon.svg b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/icon.svg
new file mode 100644
index 0000000000..b7d6b25aef
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle cx="5" cy="5" r="4"/></svg>
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source-directory/index.server.ts b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/index.server.ts
new file mode 100644
index 0000000000..9a0f102a29
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/index.server.ts
@@ -0,0 +1,47 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { z } from "zod";
+import { windowFromReportedDuration } from "@getpaseo/plugin/server/usage";
+
+let fetches = 0;
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "fixture-directory",
+    label: "Fixture",
+    icon: "icon.svg",
+    input: z.object({ account: z.string() }).strict(),
+    discover: async () => {
+      const inputs: Array<Record<string, string | boolean>> = [
+        { account: "one" },
+        { account: "bad", extra: true },
+        { account: "throws" },
+        { account: "expired" },
+      ];
+      return inputs.map((input) => ({ key: String(input.account), input }));
+    },
+    fetch: async (input) => {
+      const account = (input as { account: string }).account;
+      if (account === "expired")
+        return {
+          status: "unavailable",
+          problem: {
+            kind: "expired",
+            expiresAt: new Date(Date.now() - 3_600_000).toISOString(),
+            refreshedBy: "claude",
+          },
+        };
+      if (account === "throws") throw new Error("fixture failure");
+      fetches++;
+      return {
+        status: "available",
+        windows: [
+          windowFromReportedDuration({
+            durationSeconds: 604800,
+            unknown: { id: "unknown", label: "Limit", shortLabel: "" },
+            utilizationPct: fetches,
+          }),
+        ],
+      };
+    },
+  });
+  return () => {};
+}
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source-directory/paseo-plugin.json b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/paseo-plugin.json
new file mode 100644
index 0000000000..273f46f948
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source-directory/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "usage-source-fixture", "requirements": { "paseo": ">=0.8.0" } }
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source/icon.svg b/packages/server/src/server/plugins/test-fixtures/usage-source/icon.svg
new file mode 100644
index 0000000000..b7d6b25aef
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle cx="5" cy="5" r="4"/></svg>
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source/index.server.ts b/packages/server/src/server/plugins/test-fixtures/usage-source/index.server.ts
new file mode 100644
index 0000000000..e42aa64edc
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source/index.server.ts
@@ -0,0 +1,47 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { z } from "zod";
+import { windowFromReportedDuration } from "@getpaseo/plugin/server/usage";
+
+let fetches = 0;
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "fixture",
+    label: "Fixture",
+    icon: "icon.svg",
+    input: z.object({ account: z.string() }).strict(),
+    discover: async () => {
+      const inputs: Array<Record<string, string | boolean>> = [
+        { account: "one" },
+        { account: "bad", extra: true },
+        { account: "throws" },
+        { account: "expired" },
+      ];
+      return inputs.map((input) => ({ key: String(input.account), input }));
+    },
+    fetch: async (input) => {
+      const account = (input as { account: string }).account;
+      if (account === "expired")
+        return {
+          status: "unavailable",
+          problem: {
+            kind: "expired",
+            expiresAt: new Date(Date.now() - 3_600_000).toISOString(),
+            refreshedBy: "claude",
+          },
+        };
+      if (account === "throws") throw new Error("fixture failure");
+      fetches++;
+      return {
+        status: "available",
+        windows: [
+          windowFromReportedDuration({
+            durationSeconds: 604800,
+            unknown: { id: "unknown", label: "Limit", shortLabel: "" },
+            utilizationPct: fetches,
+          }),
+        ],
+      };
+    },
+  });
+  return () => {};
+}
diff --git a/packages/server/src/server/plugins/test-fixtures/usage-source/paseo-plugin.json b/packages/server/src/server/plugins/test-fixtures/usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..a509a64163
--- /dev/null
+++ b/packages/server/src/server/plugins/test-fixtures/usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "usage-source", "requirements": { "paseo": ">=0.8.0" } }
diff --git a/packages/server/src/server/plugins/usage-sources.e2e.test.ts b/packages/server/src/server/plugins/usage-sources.e2e.test.ts
new file mode 100644
index 0000000000..037da5e0c6
--- /dev/null
+++ b/packages/server/src/server/plugins/usage-sources.e2e.test.ts
@@ -0,0 +1,337 @@
+import { cp, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { expect, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { BuiltinPluginLoader, resolveBuiltinPluginsRoot } from "./builtin/index.js";
+
+const fixtureRoot = fileURLToPath(new URL("./test-fixtures/", import.meta.url));
+const subprocessDirectory = fileURLToPath(
+  new URL("./test-fixtures/usage-source-directory/", import.meta.url),
+);
+
+test("lists built-in and subprocess usage; validates input and isolates fetch errors", async () => {
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.9.2",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(fixtureRoot, ["usage-source"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.2" });
+  try {
+    await client.connect();
+    const updates: string[] = [];
+    const first = await client.listUsageReports({}, (report) => updates.push(report.id));
+    expect(updates).toEqual(first.reports.map((report) => report.id));
+    await expect(client.listUsageReports({ agentId: "missing-agent" })).rejects.toThrow(
+      "Unknown agent",
+    );
+    expect(first.reports).toHaveLength(4);
+    expect(first.reports[0]?.icon).toContain("<svg");
+    expect(first.reports[0]?.fetchedAt).toMatch(/^\d{4}-/);
+    expect(
+      first.reports.find((entry) => entry.id === "fixture:one")?.report.windows[0]?.usedPct,
+    ).toBe(1);
+    expect(first.reports.filter((entry) => entry.report.status === "error")).toHaveLength(2);
+    expect(
+      (await client.listUsageReports()).reports.find((entry) => entry.id === "fixture:one")?.report
+        .windows[0]?.usedPct,
+    ).toBe(1);
+    expect(
+      (
+        await client.listUsageReports({ reportIds: ["fixture:one"], forceRefresh: true })
+      ).reports.find((entry) => entry.id === "fixture:one")?.report.windows[0]?.usedPct,
+    ).toBe(2);
+    expect(
+      (await client.listUsageReports({ reportIds: ["fixture:throws"] })).reports[0]?.report.status,
+    ).toBe("error");
+    const expired = first.reports.find((entry) => entry.id === "fixture:expired");
+    expect(expired?.report).toEqual({
+      status: "unavailable",
+      problem: { kind: "expired", expiresAt: expect.any(String), refreshedBy: "claude" },
+    });
+    const legacy = await client.listProviderUsage();
+    expect(legacy.providers.find((provider) => provider.displayName === "Fixture")?.status).toBe(
+      "available",
+    );
+    expect(legacy.providers.find((provider) => provider.status === "unavailable")?.error).toBe(
+      "Login expired 1h ago. Run claude to refresh it.",
+    );
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(subprocessDirectory, "fixture-directory");
+    const both = await client.listUsageReports({ forceRefresh: true });
+    expect(both.reports).toHaveLength(8);
+    for (const id of ["fixture:one", "fixture-directory:one"]) {
+      expect(both.reports.find((entry) => entry.id === id)?.report.windows[0]).toMatchObject({
+        id: "weekly",
+        label: "Weekly",
+        shortLabel: "wk",
+      });
+    }
+    await client.patchDaemonConfig({ pluginsEnabled: false });
+    await expect.poll(async () => (await client.listUsageReports()).reports.length).toBe(4);
+  } finally {
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);
+
+test("a packaged daemon serves usage from external built-in resources", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-builtin-asar-"));
+  const packagePath = path.join("node_modules", "@getpaseo", "server", "dist", "server");
+  const resourceRoot = path.join(root, "builtin-plugins");
+  // An archive is a file, so the external compiler cannot traverse paths beneath it.
+  // Actual Electron archive packaging is covered by the packaged-app smoke check.
+  await writeFile(path.join(root, "app.asar"), "opaque archive fixture");
+  const directory = path.join(resourceRoot, "listed");
+  await mkdir(path.join(directory, "server"), { recursive: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: "listed", requirements: { paseo: ">=0.9.2" } }),
+  );
+  await writeFile(
+    path.join(directory, "server", "contract.d.ts"),
+    "export interface Account { key: string; label: string; }",
+  );
+  await writeFile(
+    path.join(directory, "server", "account.ts"),
+    "import type { Account } from './contract.js'; export const account: Account = { key: 'one', label: 'Test account' };",
+  );
+  await writeFile(
+    path.join(directory, "index.server.ts"),
+    `import { z } from 'zod';
+import { account } from './server/account.js';
+export default function contribute(server) {
+  server.registerUsageSource({
+    id: 'fixture', label: 'Fixture', input: z.object({}),
+    discover: async () => [{...account, input: {}}],
+    fetch: async () => ({ status: 'available', windows: [{ id: 'session', label: 'Session', usedPct: 37 }] }),
+  });
+  return () => {};
+}`,
+  );
+  const moduleUrl = pathToFileURL(
+    path.join(root, "app.asar", packagePath, "server", "plugins", "builtin", "index.js"),
+  );
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.9.2",
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(resolveBuiltinPluginsRoot(moduleUrl), ["listed"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.2" });
+  try {
+    await client.connect();
+    const { reports } = await client.listUsageReports();
+    expect(
+      reports.map(({ id, sourceId, sourceLabel, account, report }) => ({
+        id,
+        sourceId,
+        sourceLabel,
+        account,
+        report,
+      })),
+    ).toEqual([
+      {
+        id: "fixture:one",
+        sourceId: "fixture",
+        sourceLabel: "Fixture",
+        account: { label: "Test account" },
+        report: {
+          status: "available",
+          windows: [{ id: "session", label: "Session", usedPct: 37 }],
+        },
+      },
+    ]);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("built-in sources deduplicate cross-harness accounts and fall back without session wiring", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "usage-cross-harness-"));
+  const home = path.join(root, "home");
+  const plugins = path.join(root, "plugins");
+  const codexHome = path.join(home, ".codex");
+  const env = { CODEX_HOME: codexHome };
+  async function json(file: string, value: unknown) {
+    await mkdir(path.dirname(file), { recursive: true });
+    await writeFile(file, JSON.stringify(value));
+  }
+  async function codexToken(token: string) {
+    await json(path.join(codexHome, "auth.json"), {
+      tokens: { access_token: token, account_id: "chatgpt-one" },
+    });
+  }
+  await codexToken("fixture-codex");
+  const openCodePath = path.join(home, ".local", "share", "opencode", "auth.json");
+  await json(openCodePath, {
+    openai: { type: "oauth", access: "fixture-opencode", accountId: "chatgpt-one" },
+  });
+  const piPath = path.join(home, ".pi", "agent", "auth.json");
+  await json(piPath, {
+    "openai-codex": { type: "oauth", access: "fixture-pi-codex", accountId: "chatgpt-one" },
+    anthropic: { type: "oauth", access: "fixture-pi-claude" },
+  });
+  await json(path.join(home, ".claude", ".credentials.json"), {
+    claudeAiOauth: { accessToken: "fixture-claude" },
+  });
+  const dbPath = path.join(home, ".omp", "agent", "agent.db");
+  await mkdir(path.dirname(dbPath), { recursive: true });
+  const { DatabaseSync } = await import("node:sqlite");
+  const db = new DatabaseSync(dbPath);
+  db.exec(
+    "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
+  );
+  const insert = db.prepare("INSERT INTO auth_credentials VALUES (?, ?, 'oauth', ?, NULL)");
+  insert.run(
+    1,
+    "openai-codex",
+    JSON.stringify({
+      access: "fixture-omp-codex",
+      accountId: "chatgpt-one",
+      expires: Date.now() + 60_000,
+    }),
+  );
+  insert.run(
+    2,
+    "anthropic",
+    JSON.stringify({ access: "fixture-omp-claude", expires: Date.now() + 60_000 }),
+  );
+  db.close();
+  for (const source of ["codex", "claude"]) {
+    const directory = path.join(plugins, `${source}-usage-source`);
+    await cp(path.join(resolveBuiltinPluginsRoot(), `${source}-usage-source`), directory, {
+      recursive: true,
+    });
+    // Inject home/env/HTTP at the source boundary; compile and register the real readers.
+    await writeFile(
+      path.join(directory, "index.server.ts"),
+      `
+import { inputSchema } from './shared/input.js';
+import { discover, fetchUsage } from './server/usage.js';
+const lookup = { home: ${JSON.stringify(home)}, env: ${JSON.stringify(env)}, platform: 'linux' };
+async function fetchApi(url, init) {
+  const token = new Headers(init.headers).get('Authorization');
+  if (String(url).endsWith('/profile')) {
+    const second = token === 'Bearer fixture-pi-claude';
+    return new Response(JSON.stringify({ account: { uuid: second ? 'claude-two' : 'claude-one' }, organization: { uuid: second ? 'org-two' : 'org-one' } }));
+  }
+  if (token === 'Bearer fixture-revoked') return new Response(null, { status: 401 });
+  const used = { 'Bearer fixture-codex': 11, 'Bearer fixture-opencode': 22, 'Bearer fixture-pi-codex': 33, 'Bearer fixture-omp-codex': 44, 'Bearer fixture-omp-claude': 66, 'Bearer fixture-pi-claude': 77 }[token] || 55;
+  return new Response(JSON.stringify({ rate_limit: { primary_window: { used_percent: used } }, five_hour: { utilization: used } }));
+}
+export default function contribute(server) {
+  server.registerUsageSource({ id: '${source}', label: '${source}', input: inputSchema,
+    discover: (scope) => discover(scope, lookup${source === "claude" ? ", fetchApi" : ""}),
+    fetch: (input) => fetchUsage(inputSchema.parse(input), fetchApi, lookup),
+  });
+  return () => {};
+}
+`,
+    );
+  }
+  const daemon = await createTestPaseoDaemon({
+    pluginsEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(plugins, ["codex-usage-source", "claude-usage-source"]),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    const first = (await client.listUsageReports()).reports;
+    expect(first.map((entry) => entry.id).sort()).toEqual([
+      "claude:claude-one.org-one",
+      "claude:claude-two.org-two",
+      "codex:chatgpt-one",
+    ]);
+    expect(first.find((entry) => entry.sourceId === "codex")?.report.windows[0]?.usedPct).toBe(11);
+    expect(
+      first.find((entry) => entry.id === "claude:claude-two.org-two")?.report.windows[0]?.usedPct,
+    ).toBe(77);
+    expect(JSON.stringify(first)).not.toContain("fixture-");
+    await json(path.join(home, ".claude", ".credentials.json"), {
+      claudeAiOauth: { accessToken: "fixture-revoked" },
+    });
+    const claudeFallback = (
+      await client.listUsageReports({
+        reportIds: ["claude:claude-one.org-one"],
+        forceRefresh: true,
+      })
+    ).reports;
+    expect(claudeFallback[0]?.report.windows[0]?.usedPct).toBe(66);
+    await codexToken("fixture-revoked");
+    const refresh = async () =>
+      (await client.listUsageReports({ reportIds: ["codex:chatgpt-one"], forceRefresh: true }))
+        .reports[0];
+    expect((await refresh())?.report.windows[0]?.usedPct).toBe(22);
+    await rm(openCodePath);
+    expect((await refresh())?.report.windows[0]?.usedPct).toBe(33);
+    await json(piPath, {
+      "openai-codex": {
+        type: "oauth",
+        access: "fixture-pi-codex",
+        accountId: "chatgpt-one",
+        expires: 1,
+      },
+      anthropic: { type: "oauth", access: "fixture-pi-claude" },
+    });
+    expect((await refresh())?.report.windows[0]?.usedPct).toBe(44);
+    await codexToken("fixture-codex");
+    expect((await refresh())?.report.windows[0]?.usedPct).toBe(11);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 60_000);
+
+test("a killed discovery subprocess logs kimi once and produces no provider card", async () => {
+  const { readFile } = await import("node:fs/promises");
+  const { default: pino } = await import("pino");
+  const root = await mkdtemp(path.join(os.tmpdir(), "usage-crash-"));
+  const log = path.join(root, "daemon.log");
+  const destination = pino.destination({ dest: log, sync: true });
+  const daemon = await createTestPaseoDaemon({
+    daemonVersion: "0.9.2",
+    pluginsEnabled: true,
+    logger: pino({ level: "warn" }, destination),
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.9.2" });
+  try {
+    await writeFile(
+      path.join(root, "paseo-plugin.json"),
+      JSON.stringify({ id: "crashing-usage", requirements: { paseo: ">=0.9.2" } }),
+    );
+    await writeFile(
+      path.join(root, "index.server.ts"),
+      `
+import {z} from "zod";
+export default function contribute(server) {
+  server.registerUsageSource({id: "kimi", label: "Kimi", input: z.object({}),
+    discover: async () => {process.exit(1);},
+    fetch: async () => {throw new Error("discovery must never produce an account");},
+  });
+  return () => {};
+}`,
+    );
+    await client.connect();
+    await client.installDirectoryPlugin(root, "crashing-usage");
+    expect((await client.listUsageReports({ forceRefresh: true })).reports).toEqual([]);
+    const warnings = (await readFile(log, "utf8"))
+      .trim()
+      .split("\n")
+      .map((line) => JSON.parse(line))
+      .filter((entry) => entry.msg === "Usage source discovery failed");
+    expect(warnings.map(({ level, sourceId }) => ({ level, sourceId }))).toEqual([
+      { level: 40, sourceId: "kimi" },
+    ]);
+    expect((await client.listUsageReports({ forceRefresh: true })).reports).toEqual([]);
+  } finally {
+    await client.close();
+    await daemon.close();
+    destination.end();
+    await rm(root, { recursive: true, force: true });
+  }
+}, 60_000);
diff --git a/packages/server/src/server/plugins/usage-sources/index.test.ts b/packages/server/src/server/plugins/usage-sources/index.test.ts
new file mode 100644
index 0000000000..eeea242788
--- /dev/null
+++ b/packages/server/src/server/plugins/usage-sources/index.test.ts
@@ -0,0 +1,558 @@
+import { expect, test } from "vitest";
+import { UsageSourceRegistry } from "./index.js";
+
+function source(input: {
+  id: string;
+  discover?: () => Promise<Array<{ key: string; label?: string; input: unknown }>>;
+  fetch?: (value: unknown) => Promise<unknown>;
+}) {
+  return {
+    id: input.id,
+    label: input.id,
+    discover: input.discover ?? (async () => []),
+    fetch: input.fetch ?? (async () => ({ status: "available", windows: [] })),
+  };
+}
+
+test("discovery preserves account IDs and updates input after token rotation", async () => {
+  const registry = new UsageSourceRegistry();
+  let token = "old";
+  registry.register(
+    source({
+      id: "codex",
+      discover: async () => [{ key: "work", input: { token } }],
+      fetch: async (input) => ({
+        status: "available",
+        windows: [{ id: "token", label: (input as { token: string }).token }],
+      }),
+    }),
+  );
+  const first = await registry.listReports();
+  expect(first.map((entry) => entry.id)).toEqual(["codex:work"]);
+  expect(first[0]?.report.windows[0]?.label).toBe("old");
+  token = "new";
+  const refreshed = await registry.listReports({ forceRefresh: true });
+  expect(refreshed.map((entry) => entry.id)).toEqual(["codex:work"]);
+  expect(refreshed[0]?.report.windows[0]?.label).toBe("new");
+});
+
+test("coalesces per account, caches errors, and refreshes only requested IDs", async () => {
+  let now = 0;
+  const counts = new Map<string, number>();
+  const registry = new UsageSourceRegistry(() => now);
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => ["a", "b"].map((account) => ({ key: account, input: { account } })),
+      fetch: async (input) => {
+        const account = (input as { account: string }).account;
+        counts.set(account, (counts.get(account) ?? 0) + 1);
+        if (account === "b") throw new Error("failed");
+        return { status: "available", windows: [] };
+      },
+    }),
+  );
+  const first = await registry.listReports();
+  expect(first.map((entry) => entry.id)).toEqual(["source:a", "source:b"]);
+  expect(first[1]?.report.status).toBe("error");
+  expect(await registry.listReports()).toEqual(first);
+  expect(counts.get("a")).toBe(1);
+  expect(counts.get("b")).toBe(1);
+  now = 1000;
+  const refreshed = await registry.listReports({
+    reportIds: ["source:a", "missing:id"],
+    forceRefresh: true,
+  });
+  expect(refreshed.map((entry) => entry.id)).toEqual(["source:a"]);
+  expect(refreshed[0]?.fetchedAt).not.toBe(first[0]?.fetchedAt);
+  expect(counts.get("a")).toBe(2);
+  expect(counts.get("b")).toBe(1);
+  now = 301_001;
+  await registry.listReports({ reportIds: ["source:a"] });
+  expect(counts.get("a")).toBe(3);
+});
+
+test("legacy listing uses oldest fetchedAt", async () => {
+  let now = 1000;
+  const registry = new UsageSourceRegistry(() => now);
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => ["a", "b"].map((account) => ({ key: account, input: { account } })),
+    }),
+  );
+  await registry.listReports();
+  now = 2000;
+  await registry.listReports({ reportIds: ["source:b"], forceRefresh: true });
+  expect((await registry.listLegacyUsage()).fetchedAt).toBe(new Date(1000).toISOString());
+});
+
+test("concurrent requests for the same ID share one vendor fetch", async () => {
+  let finish!: (report: unknown) => void;
+  const response = new Promise<unknown>((resolve) => {
+    finish = resolve;
+  });
+  let fetches = 0;
+  const registry = new UsageSourceRegistry();
+  registry.register(
+    source({
+      id: "coalesced",
+      discover: async () => [{ key: "one", input: {} }],
+      fetch: async () => {
+        fetches++;
+        return response;
+      },
+    }),
+  );
+  const first = registry.listReports();
+  const second = registry.listReports();
+  finish({ status: "available", windows: [] });
+  const [one, two] = await Promise.all([first, second]);
+  expect(one[0]).toBe(two[0]);
+  expect(fetches).toBe(1);
+});
+
+test("rediscovery removes an old account from targeted refreshes", async () => {
+  let now = 0;
+  const registry = new UsageSourceRegistry(() => now, 100);
+  let account = "old";
+  registry.register(source({ id: "source", discover: async () => [{ key: account, input: {} }] }));
+  await registry.listReports();
+  await registry.listReports({ reportIds: ["source:old"] });
+  now = 101;
+  account = "new";
+  await registry.listReports();
+  await registry.listReports({ reportIds: ["source:new"] });
+  expect(await registry.listReports({ reportIds: ["source:old"] })).toEqual([]);
+});
+
+test("discovery failures log once while other sources still report", async () => {
+  const warnings: unknown[][] = [];
+  const registry = new UsageSourceRegistry(Date.now, 300_000, {
+    warn: (...args: unknown[]) => {
+      warnings.push(args);
+    },
+  });
+  const err = new Error("subprocess stopped");
+  registry.register(
+    source({
+      id: "kimi",
+      discover: async () => {
+        throw err;
+      },
+    }),
+  );
+  registry.register(source({ id: "healthy", discover: async () => [{ key: "one", input: {} }] }));
+  const updates: string[] = [];
+  const reports = await registry.listReports({ onReport: (report) => updates.push(report.id) });
+  expect(reports.map((report) => report.id)).toEqual(["healthy:one"]);
+  expect(updates).toEqual(["healthy:one"]);
+  expect(warnings).toEqual([[{ sourceId: "kimi", err }, "Usage source discovery failed"]]);
+});
+
+test("a failed fetch is logged as well as reported", async () => {
+  const warnings: unknown[][] = [];
+  const registry = new UsageSourceRegistry(Date.now, 300_000, {
+    warn: (...args: unknown[]) => {
+      warnings.push(args);
+    },
+  });
+  const err = new Error("Rate limited by Claude. Try again in 38m.");
+  registry.register(
+    source({
+      id: "claude",
+      discover: async () => [{ key: "work", input: {} }],
+      fetch: async () => {
+        throw err;
+      },
+    }),
+  );
+  const [report] = await registry.listReports();
+  expect(report?.report).toEqual({ status: "error", error: err.message });
+  expect(warnings).toEqual([[{ sourceId: "claude", err }, "Usage fetch failed"]]);
+});
+
+test("legacy listing distinguishes labeled accounts and preserves unlabeled names", async () => {
+  const registry = new UsageSourceRegistry(() => 1000);
+  registry.register(
+    source({
+      id: "claude",
+      discover: async () =>
+        ["work", "personal", "default"].map((key) => ({
+          key,
+          label: key === "default" ? undefined : key,
+          input: {},
+        })),
+    }),
+  );
+  expect(
+    (await registry.listLegacyUsage()).providers.map((provider) => provider.displayName),
+  ).toEqual(["claude (work)", "claude (personal)", "claude"]);
+});
+
+test("duplicate logins prefer discovery order across unavailable, error and thrown fetches", async () => {
+  for (const failure of ["unavailable", "error", "throw"]) {
+    const registry = new UsageSourceRegistry();
+    const calls: number[] = [];
+    registry.register(
+      source({
+        id: "codex",
+        discover: async () => [0, 1, 2].map((input) => ({ key: "same", input })),
+        fetch: async (input) => {
+          calls.push(Number(input));
+          if (input === 0) {
+            if (failure === "throw") throw new Error("revoked");
+            return failure === "unavailable"
+              ? { status: failure, problem: { kind: "rejected", status: 401 } }
+              : { status: failure, error: "revoked" };
+          }
+          return {
+            status: "available",
+            windows: [{ id: "session", label: "Session", usedPct: 42 }],
+          };
+        },
+      }),
+    );
+    const reports = await registry.listReports();
+    expect(reports).toHaveLength(1);
+    expect(reports[0]?.report.status).toBe("available");
+    expect(calls).toEqual([0, 1, 2]);
+  }
+});
+
+test("targeted refresh re-reads the login without discovering again", async () => {
+  let discoveries = 0;
+  let value = "old";
+  const registry = new UsageSourceRegistry();
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => {
+        discoveries++;
+        return [{ key: "original", input: {} }];
+      },
+      fetch: async () => ({ status: "available", windows: [{ id: "session", label: value }] }),
+    }),
+  );
+  await registry.listReports();
+  value = "new";
+  const reports = await registry.listReports({
+    reportIds: ["source:original"],
+    forceRefresh: true,
+  });
+  expect(reports[0]?.report).toEqual({
+    status: "available",
+    windows: [{ id: "session", label: "new" }],
+  });
+  expect(discoveries).toBe(1);
+});
+
+test("a thrown fetch is an error card", async () => {
+  const registry = new UsageSourceRegistry();
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => [{ key: "one", input: {} }],
+      fetch: async () => {
+        throw new Error("Store deleted");
+      },
+    }),
+  );
+  expect((await registry.listReports())[0]?.report).toEqual({
+    status: "error",
+    error: "Store deleted",
+  });
+});
+
+test("an unavailable login falls back to the next available login", async () => {
+  const calls: unknown[] = [];
+  const registry = new UsageSourceRegistry();
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => [1, 2].map((input) => ({ key: "same", input })),
+      fetch: async (input) => {
+        calls.push(input);
+        return input === 1
+          ? {
+              status: "unavailable",
+              problem: { kind: "expired", expiresAt: "1970-01-01T00:00:00.000Z" },
+            }
+          : { status: "available", windows: [] };
+      },
+    }),
+  );
+  expect(
+    (await registry.listReports()).map((entry) => ({ id: entry.id, report: entry.report })),
+  ).toEqual([{ id: "source:same", report: { status: "available", windows: [] } }]);
+  expect(calls).toEqual([1, 2]);
+});
+
+test("failed fallbacks preserve the final problem", async () => {
+  const registry = new UsageSourceRegistry();
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => [1, 2].map((input) => ({ key: "same", input })),
+      fetch: async (input) => ({
+        status: "unavailable",
+        problem: { kind: "rejected", status: input === 1 ? 401 : 403 },
+      }),
+    }),
+  );
+  expect((await registry.listReports())[0]?.report).toEqual({
+    status: "unavailable",
+    problem: { kind: "rejected", status: 403 },
+  });
+});
+
+test("session discovery reuses accounts, separates launches, and retains live agent reports globally", async () => {
+  const sessions = new Map([
+    ["one", { provider: "claude", env: { HOME: "/one" }, sessionKey: "launch-1" }],
+    ["two", { provider: "claude", env: { HOME: "/two" }, sessionKey: "launch-2" }],
+  ]);
+  const existing = new Set(["one", "two", "closed"]);
+  const discoveries: string[] = [];
+  let fetches = 0;
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => existing.has(id),
+    usageSession: (id) => sessions.get(id) ?? null,
+  });
+  registry.register({
+    id: "claude",
+    label: "Claude",
+    discover: async (scope) => {
+      discoveries.push(scope.kind === "global" ? "global" : scope.env.HOME);
+      if (scope.kind === "global") return [{ key: "default", input: "default" }];
+      return [{ key: scope.env.HOME === "/new" ? "new" : "same", input: scope.env.HOME }];
+    },
+    fetch: async () => {
+      fetches++;
+      return { status: "available", windows: [] };
+    },
+  });
+  expect(await registry.listReports({ agentId: "closed" })).toEqual([]);
+  expect((await registry.listReports({ agentId: "one" })).map((r) => r.id)).toEqual([
+    "claude:same",
+  ]);
+  await registry.listReports({ agentId: "one" });
+  await registry.listReports({ agentId: "two" });
+  expect(discoveries).toEqual(["/one", "/two"]);
+  expect(fetches).toBe(2);
+  expect((await registry.listReports()).map((r) => r.id)).toEqual([
+    "claude:default",
+    "claude:same",
+  ]);
+  sessions.set("one", { provider: "claude", env: { HOME: "/new" }, sessionKey: "launch-3" });
+  expect((await registry.listReports({ agentId: "one" })).map((r) => r.id)).toEqual(["claude:new"]);
+  existing.delete("two");
+  sessions.delete("two");
+  expect((await registry.listReports()).map((r) => r.id)).toEqual(["claude:default", "claude:new"]);
+  await expect(registry.listReports({ agentId: "missing" })).rejects.toThrow("Unknown agent");
+  await expect(registry.listReports({ agentId: "one", reportIds: [] })).rejects.toThrow("agentId");
+});
+
+test("reports arrive independently and a hung fetch settles as an error before completion", async () => {
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, undefined, 25);
+  let finishSlow!: (value: unknown) => void;
+  const slow = new Promise<unknown>((resolve) => {
+    finishSlow = resolve;
+  });
+  const reports: string[] = [];
+  let firstReport!: () => void;
+  const first = new Promise<void>((resolve) => {
+    firstReport = resolve;
+  });
+  for (const id of ["slow", "fast", "also-fast"]) {
+    registry.register(
+      source({
+        id,
+        discover: async () => [{ key: "account", input: {} }],
+        fetch: async () => (id === "slow" ? slow : { status: "available", windows: [] }),
+      }),
+    );
+  }
+  let complete = false;
+  const request = registry
+    .listReports({
+      onReport: (entry) => {
+        reports.push(entry.id);
+        firstReport();
+      },
+    })
+    .then((entries) => {
+      complete = true;
+      return entries;
+    });
+  await first;
+  expect(reports).toEqual(["fast:account", "also-fast:account"]);
+  expect(complete).toBe(false);
+  const entries = await request;
+  expect(reports).toEqual(["fast:account", "also-fast:account", "slow:account"]);
+  expect(entries[0]?.report).toEqual({ status: "error", error: "Usage fetch timed out" });
+  finishSlow({ status: "available", windows: [] });
+  expect((await registry.listReports({ reportIds: ["slow:account"] }))[0]?.report).toEqual(
+    entries[0]?.report,
+  );
+});
+
+test("#6155: agent reports use only their session login despite host and sibling discoveries", async () => {
+  const sessions = new Map([
+    ["codex-agent", { provider: "codex", env: {}, sessionKey: "codex-launch" }],
+    ["opencode-agent", { provider: "opencode", env: {}, sessionKey: "opencode-launch" }],
+  ]);
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => sessions.has(id),
+    usageSession: (id) => sessions.get(id) ?? null,
+  });
+  const codexError = { status: "error", error: "Codex usage API returned 500" };
+  const expired = {
+    status: "unavailable",
+    problem: { kind: "expired", expiresAt: "2026-07-07T00:00:00.000Z", refreshedBy: "opencode" },
+  };
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: async (scope) =>
+      (scope.kind === "global" ? ["codex", "opencode"] : [scope.provider]).map((harness) => ({
+        key: "same",
+        harness,
+        input: { harness },
+      })),
+    fetch: async (input) =>
+      (input as { harness: string }).harness === "codex" ? codexError : expired,
+  });
+  await registry.listReports();
+  await registry.listReports({ agentId: "opencode-agent" });
+  expect((await registry.listReports({ agentId: "codex-agent" }))[0]?.report).toEqual(codexError);
+});
+
+test("all failed host logins retain each source-supplied harness and remedy", async () => {
+  const registry = new UsageSourceRegistry();
+  const failures = [
+    { status: "error", error: "Codex usage API returned 500" },
+    {
+      status: "unavailable",
+      problem: { kind: "expired", expiresAt: "2026-07-07T00:00:00.000Z", refreshedBy: "opencode" },
+    },
+    { status: "unavailable", problem: { kind: "rejected", status: 401, refreshedBy: "pi" } },
+    { status: "unavailable", problem: { kind: "rejected", status: 403, refreshedBy: "omp" } },
+  ];
+  const harnesses = ["Codex", "OpenCode", "Pi", "OMP"];
+  registry.register(
+    source({
+      id: "codex",
+      discover: async () => harnesses.map((harness, input) => ({ key: "same", harness, input })),
+      fetch: async (input) => failures[Number(input)],
+    }),
+  );
+  const [entry] = await registry.listReports();
+  expect(entry?.loginErrors).toEqual(
+    harnesses.map((harness, index) => ({ harness, report: failures[index] })),
+  );
+});
+
+test("a working agent login never uses another harness's failure or host fallback cache", async () => {
+  const sessions = new Map([
+    ["working", { provider: "codex", env: {}, sessionKey: "one" }],
+    ["broken", { provider: "opencode", env: {}, sessionKey: "two" }],
+  ]);
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => sessions.has(id),
+    usageSession: (id) => sessions.get(id) ?? null,
+  });
+  const available = {
+    status: "available",
+    windows: [{ id: "weekly", label: "Weekly", usedPct: 31 }],
+  };
+  const error = { status: "error", error: "OpenCode login rejected. Run opencode to refresh it." };
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: async (scope) =>
+      (scope.kind === "global" ? ["opencode", "codex"] : [scope.provider]).map((harness) => ({
+        key: "same",
+        harness,
+        input: harness,
+      })),
+    fetch: async (input) => (input === "codex" ? available : error),
+  });
+  const [host] = await registry.listReports();
+  expect(host?.report).toEqual(available);
+  expect(host?.loginErrors).toBeUndefined();
+  expect((await registry.listReports({ agentId: "working" }))[0]?.report).toEqual(available);
+  expect((await registry.listReports({ agentId: "broken" }))[0]?.report).toEqual(error);
+  expect(
+    (await registry.listReports({ agentId: "broken", forceRefresh: true }))[0]?.report,
+  ).toEqual(error);
+  expect(
+    (await registry.listReports({ reportIds: ["codex:same"], forceRefresh: true }))[0]?.report,
+  ).toEqual(available);
+});
+
+test("concurrent host and agent requests never share a different login's pending fetch", async () => {
+  let finish!: (report: unknown) => void;
+  const slow = new Promise<unknown>((resolve) => {
+    finish = resolve;
+  });
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: () => true,
+    usageSession: () => ({ provider: "codex", env: {}, sessionKey: "launch" }),
+  });
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: async (scope) => [{ key: "same", harness: "Codex", input: scope.kind }],
+    fetch: async (input) =>
+      input === "global" ? slow : { status: "error", error: "Session login failed" },
+  });
+  const host = registry.listReports();
+  const [agent] = await registry.listReports({ agentId: "agent" });
+  expect(agent?.report).toEqual({ status: "error", error: "Session login failed" });
+  finish({ status: "available", windows: [] });
+  expect((await host)[0]?.report.status).toBe("available");
+});
+
+test("duplicate logins across scopes appear only once in the host's errors", async () => {
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: () => true,
+    usageSession: () => ({ provider: "codex", env: {}, sessionKey: "launch" }),
+  });
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: async (scope) => [
+      {
+        key: "same",
+        harness: "Codex",
+        input:
+          scope.kind === "global"
+            ? { path: "/auth", kind: "file" }
+            : { kind: "file", path: "/auth" },
+      },
+    ],
+    fetch: async () => ({ status: "error", error: "Login failed" }),
+  });
+  await registry.listReports({ agentId: "agent" });
+  expect((await registry.listReports())[0]?.loginErrors).toEqual([
+    { harness: "Codex", report: { status: "error", error: "Login failed" } },
+  ]);
+});
+
+test("a hung login records its own timeout and still tries the next login", async () => {
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, undefined, 25);
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: async () => [
+      { key: "same", harness: "Codex", input: 0 },
+      { key: "same", harness: "OpenCode", input: 1 },
+    ],
+    fetch: async (input) =>
+      input === 0 ? new Promise(() => {}) : { status: "error", error: "Login rejected" },
+  });
+  expect((await registry.listReports())[0]?.loginErrors).toEqual([
+    { harness: "Codex", report: { status: "error", error: "Usage fetch timed out" } },
+    { harness: "OpenCode", report: { status: "error", error: "Login rejected" } },
+  ]);
+});
diff --git a/packages/server/src/server/plugins/usage-sources/index.ts b/packages/server/src/server/plugins/usage-sources/index.ts
new file mode 100644
index 0000000000..c0c9d781e5
--- /dev/null
+++ b/packages/server/src/server/plugins/usage-sources/index.ts
@@ -0,0 +1,348 @@
+import { createHash } from "node:crypto";
+import type { AgentUsageSession } from "../../agent/agent-sdk-types.js";
+import type { UsageScope } from "@getpaseo/plugin/server/usage";
+import { z } from "zod";
+import type { Logger } from "pino";
+import {
+  UsageReportSchema,
+  type ProviderUsage,
+  type UsageReportEntry,
+  type UsageProblem,
+  type UsageReport,
+} from "@getpaseo/protocol/messages";
+
+export interface UsageSource {
+  id: string;
+  label: string;
+  icon?: string;
+  discover(scope: UsageScope): Promise<unknown>;
+  fetch(input: unknown): Promise<unknown>;
+}
+
+interface Login {
+  input: unknown;
+  harness: string;
+}
+
+interface KnownReport {
+  source: UsageSource;
+  logins: [Login, ...Login[]];
+  label?: string;
+}
+
+export interface AgentUsageLookup {
+  hasAgent(id: string): boolean;
+  usageSession(id: string): AgentUsageSession | null;
+}
+
+export interface ListUsageReportsOptions {
+  forceRefresh?: boolean;
+  reportIds?: string[];
+  agentId?: string;
+  onReport?: (report: UsageReportEntry) => void;
+}
+
+interface AgentReports {
+  provider: string;
+  model?: string;
+  sessionKey: string;
+  reports: Map<string, KnownReport>;
+}
+
+/** Owns account identity, ordered logins for each account, and the five-minute fetch cache. */
+export class UsageSourceRegistry {
+  private readonly sources = new Map<string, UsageSource>();
+  private readonly known = new Map<string, KnownReport>();
+  private defaults = new Map<string, KnownReport>();
+  private readonly byAgent = new Map<string, AgentReports>();
+  private readonly cache = new Map<string, { at: number; entry: UsageReportEntry }>();
+  private readonly pending = new Map<string, Promise<UsageReportEntry>>();
+
+  constructor(
+    private readonly now: () => number = Date.now,
+    private readonly ttlMs = 300_000,
+    private readonly logger: Pick<Logger, "warn"> = { warn: console.warn },
+    private readonly agents: AgentUsageLookup = { hasAgent: () => false, usageSession: () => null },
+    private readonly deadlineMs = 20_000,
+  ) {}
+
+  register(source: UsageSource): void {
+    if (this.sources.has(source.id)) throw new Error(`Duplicate usage source: ${source.id}`);
+    this.sources.set(source.id, source);
+  }
+
+  unregister(id: string): void {
+    this.sources.delete(id);
+    for (const key of this.defaults.keys()) if (key.startsWith(`${id}:`)) this.defaults.delete(key);
+    // Re-discover on the next session query when a source is replaced.
+    for (const [agentId, mapping] of this.byAgent) {
+      if ([...mapping.reports.values()].some((report) => report.source.id === id))
+        this.byAgent.delete(agentId);
+    }
+    for (const key of this.known.keys()) if (key.startsWith(`${id}:`)) this.known.delete(key);
+    for (const key of this.cache.keys()) if (key.startsWith(`${id}:`)) this.cache.delete(key);
+    for (const key of this.pending.keys()) if (key.startsWith(`${id}:`)) this.pending.delete(key);
+  }
+
+  async listReports(options: ListUsageReportsOptions = {}): Promise<UsageReportEntry[]> {
+    if (options.agentId !== undefined && options.reportIds !== undefined)
+      throw new Error("agentId and reportIds cannot be combined");
+    this.pruneAgents();
+    let ids: string[];
+    let reports = this.known;
+    if (options.agentId !== undefined) {
+      ids = await this.discoverAgent(options.agentId);
+      reports = this.byAgent.get(options.agentId)?.reports ?? new Map();
+    } else if (options.reportIds !== undefined) {
+      ids = options.reportIds;
+    } else {
+      this.defaults = await this.discover({ kind: "global" });
+      this.mergeKnown();
+      ids = [...this.known.keys()];
+    }
+    return Promise.all(
+      [...new Set(ids)].flatMap((id) => {
+        const known = reports.get(id);
+        if (!known) return [];
+        return [
+          this.fetchId(id, known, options.forceRefresh).then((entry) => {
+            options.onReport?.(entry);
+            return entry;
+          }),
+        ];
+      }),
+    );
+  }
+
+  private pruneAgents(): void {
+    for (const id of this.byAgent.keys()) {
+      if (!this.agents.hasAgent(id)) this.byAgent.delete(id);
+    }
+    this.mergeKnown();
+  }
+
+  private async discoverAgent(agentId: string): Promise<string[]> {
+    if (!this.agents.hasAgent(agentId)) throw new Error(`Unknown agent: ${agentId}`);
+    const session = this.agents.usageSession(agentId);
+    if (!session) return [];
+    const previous = this.byAgent.get(agentId);
+    const sameScope =
+      previous?.sessionKey === session.sessionKey &&
+      previous.provider === session.provider &&
+      previous.model === session.model;
+    if (sameScope) return [...previous.reports.keys()];
+    const reports = await this.discover({
+      kind: "session",
+      provider: session.provider,
+      model: session.model,
+      env: session.env,
+    });
+    // A query that finishes after a resume must not publish the previous launch's mapping.
+    if (this.agents.usageSession(agentId)?.sessionKey !== session.sessionKey) return [];
+    this.byAgent.set(agentId, {
+      sessionKey: session.sessionKey,
+      provider: session.provider,
+      model: session.model,
+      reports,
+    });
+    this.mergeKnown();
+    return [...reports.keys()];
+  }
+
+  private mergeKnown(): void {
+    this.known.clear();
+    for (const reports of [
+      this.defaults,
+      ...[...this.byAgent.values()].map((agent) => agent.reports),
+    ]) {
+      for (const [id, report] of reports) {
+        if (this.sources.get(report.source.id) !== report.source) continue;
+        const known = this.known.get(id);
+        if (!known) {
+          this.known.set(id, { ...report, logins: [...report.logins] });
+          continue;
+        }
+        for (const login of report.logins) {
+          if (!known.logins.some((existing) => loginKey(existing) === loginKey(login)))
+            known.logins.push(login);
+        }
+      }
+    }
+  }
+
+  private async discover(scope: UsageScope): Promise<Map<string, KnownReport>> {
+    const discovered = await Promise.all(
+      [...this.sources.values()].map(async (source) => {
+        const reports = new Map<string, KnownReport>();
+        try {
+          const accounts = z
+            .array(
+              z.object({
+                key: z.string().regex(/^[A-Za-z0-9._-]{1,128}$/),
+                label: z.string().optional(),
+                harness: z.string().min(1).optional(),
+                input: z.json(),
+              }),
+            )
+            .parse(await source.discover(scope));
+          for (const account of accounts) {
+            const id = `${source.id}:${account.key}`;
+            const known = reports.get(id);
+            // COMPAT(usageLoginHarness): added in v0.11.0, remove after 2027-04-05 once plugin floor >= v0.11.0.
+            const login = { input: account.input, harness: account.harness ?? source.label };
+            if (known) {
+              if (!known.logins.some((existing) => loginKey(existing) === loginKey(login)))
+                known.logins.push(login);
+            } else reports.set(id, { source, logins: [login], label: account.label });
+          }
+        } catch (error) {
+          this.logger.warn({ sourceId: source.id, err: error }, "Usage source discovery failed");
+        }
+        return reports;
+      }),
+    );
+    const merged = new Map<string, KnownReport>();
+    for (const reports of discovered) {
+      for (const [id, report] of reports) merged.set(id, report);
+    }
+    return merged;
+  }
+
+  // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+  async listLegacyUsage(): Promise<{ fetchedAt: string; providers: ProviderUsage[] }> {
+    const reports = await this.listReports();
+    return {
+      fetchedAt: reports.length
+        ? reports.reduce(
+            (oldest, entry) => (entry.fetchedAt < oldest ? entry.fetchedAt : oldest),
+            reports[0]!.fetchedAt,
+          )
+        : new Date(this.now()).toISOString(),
+      providers: reports.map((entry) => ({
+        providerId: entry.sourceId,
+        displayName: entry.account.label
+          ? `${entry.sourceLabel} (${entry.account.label})`
+          : entry.sourceLabel,
+        status: entry.report.status,
+        planLabel: entry.report.status === "available" ? (entry.report.planLabel ?? null) : null,
+        windows: entry.report.status === "available" ? entry.report.windows : [],
+        balances: entry.report.status === "available" ? (entry.report.balances ?? []) : [],
+        details: entry.report.status === "available" ? (entry.report.details ?? []) : [],
+        error: legacyError(entry.report, this.now()),
+      })),
+    };
+  }
+
+  private fetchId(id: string, known: KnownReport, forceRefresh = false): Promise<UsageReportEntry> {
+    // Account identity groups cards; the ordered login set identifies a fetch result.
+    const cacheKey = `${id}:${createHash("sha256")
+      .update(JSON.stringify([known.label, known.logins.map(loginKey)]))
+      .digest("hex")}`;
+    const cached = this.cache.get(cacheKey);
+    if (!forceRefresh && cached && this.now() - cached.at < this.ttlMs)
+      return Promise.resolve(cached.entry);
+    const pending = this.pending.get(cacheKey);
+    if (pending) return pending;
+    const request = (async () => {
+      const entry: UsageReportEntry = {
+        id,
+        sourceId: known.source.id,
+        sourceLabel: known.source.label,
+        icon: known.source.icon,
+        account: { label: known.label },
+        fetchedAt: new Date(this.now()).toISOString(),
+        ...(await this.fetchWithFallback(known)),
+      };
+      if (this.sources.get(known.source.id) === known.source) this.writeCache(cacheKey, entry);
+      return entry;
+    })();
+    this.pending.set(cacheKey, request);
+    void request.finally(() => {
+      if (this.pending.get(cacheKey) === request) this.pending.delete(cacheKey);
+    });
+    return request;
+  }
+
+  private writeCache(id: string, entry: UsageReportEntry): void {
+    const at = this.now();
+    for (const [cachedId, cached] of this.cache) {
+      if (at - cached.at >= this.ttlMs) this.cache.delete(cachedId);
+    }
+    this.cache.set(id, { at, entry });
+  }
+
+  private async fetchBeforeDeadline(source: UsageSource, input: unknown): Promise<UsageReport> {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const deadline = new Promise<UsageReport>((resolve) => {
+      timer = setTimeout(
+        () => resolve({ status: "error", error: "Usage fetch timed out" }),
+        this.deadlineMs,
+      );
+    });
+    try {
+      return await Promise.race([this.fetchLogin(source, input), deadline]);
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  private async fetchWithFallback(
+    known: KnownReport,
+  ): Promise<Pick<UsageReportEntry, "report" | "loginErrors">> {
+    // Start each login within the same deadline window, then prefer discovery order.
+    // Sequential deadlines can exceed the client's RPC timeout before all errors arrive.
+    const attempts = known.logins.map((login) =>
+      this.fetchBeforeDeadline(known.source, login.input),
+    );
+    const loginErrors: NonNullable<UsageReportEntry["loginErrors"]> = [];
+    for (const [index, login] of known.logins.entries()) {
+      const report = await attempts[index]!;
+      if (report.status === "available") return { report };
+      loginErrors.push({ harness: login.harness, report });
+    }
+    // COMPAT(usageLoginErrors): added in v0.11.0, remove after 2027-04-05 once app floor >= v0.11.0.
+    // Keep the final single report so older apps still parse and display failed accounts.
+    return { report: loginErrors[loginErrors.length - 1]!.report, loginErrors };
+  }
+
+  private async fetchLogin(source: UsageSource, input: unknown): Promise<UsageReport> {
+    try {
+      return UsageReportSchema.parse(await source.fetch(input));
+    } catch (error) {
+      this.logger.warn({ sourceId: source.id, err: error }, "Usage fetch failed");
+      return { status: "error", error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+}
+
+// The legacy RPC has only an error string; the current app owns its own presentation.
+// COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+function legacyProblem(problem: UsageProblem, now: number): string {
+  if (problem.kind === "no_quota") return problem.detail;
+  const remedy = problem.refreshedBy
+    ? `Run ${problem.refreshedBy} to refresh it.`
+    : "Sign in again.";
+  if (problem.kind === "rejected") return `Login rejected (HTTP ${problem.status}). ${remedy}`;
+  const elapsed = Math.max(0, now - Date.parse(problem.expiresAt));
+  let ago = "just now";
+  if (elapsed >= 86_400_000) ago = `${Math.floor(elapsed / 86_400_000)}d ago`;
+  else if (elapsed >= 3_600_000) ago = `${Math.floor(elapsed / 3_600_000)}h ago`;
+  else if (elapsed >= 60_000) ago = `${Math.floor(elapsed / 60_000)}m ago`;
+  return `Login expired ${ago}. ${remedy}`;
+}
+
+// COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+function legacyError(report: UsageReport, now: number): string | null {
+  if (report.status === "error") return report.error;
+  if (report.status === "unavailable") return legacyProblem(report.problem, now);
+  return null;
+}
+
+// Inputs are opaque JSON locators. Canonical equality deduplicates discovery across scopes.
+function loginKey(login: Login): string {
+  return JSON.stringify(login, (_key, value) =>
+    value !== null && typeof value === "object" && !Array.isArray(value)
+      ? Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)))
+      : value,
+  );
+}
diff --git a/packages/server/src/server/relay-transport.test.ts b/packages/server/src/server/relay-transport.test.ts
index 06775e5c5c..2dcf29b948 100644
--- a/packages/server/src/server/relay-transport.test.ts
+++ b/packages/server/src/server/relay-transport.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import type pino from "pino";
+import pino from "pino";
 import { createClientChannel, type Transport } from "@getpaseo/relay/e2ee";
 import { exportPublicKey, generateKeyPair } from "@getpaseo/relay";
 import { startRelayTransport } from "./relay-transport";
@@ -146,6 +146,37 @@ describe("relay-transport control lifecycle", () => {
     vi.useRealTimers();
   });
 
+  test("releases a stalled encrypted data connection without restarting control", async () => {
+    vi.useFakeTimers();
+    let attachments = 0;
+    controllers.push(
+      startRelayTransport({
+        logger: pino({ level: "silent" }),
+        attachSocket: async () => {
+          attachments += 1;
+        },
+        relayEndpoint: "relay.paseo.sh:443",
+        relayUseTls: true,
+        serverId: "srv_test",
+        daemonKeyPair: generateKeyPair(),
+        createWebSocket: relay.createWebSocket,
+      }),
+    );
+    const control = relay.sockets[0];
+    control.open();
+    const connected = JSON.stringify({ type: "connected", connectionId: "stalled" });
+    control.message(connected);
+    const stalled = relay.sockets[1];
+    stalled.open();
+    await vi.advanceTimersByTimeAsync(15_000);
+    expect(stalled.terminateCalls).toBe(1);
+    expect(attachments).toBe(0);
+    expect(control.terminateCalls).toBe(0);
+    control.message(connected);
+    expect(relay.sockets).toHaveLength(3);
+    expect(relay.sockets[2].url).toBe(stalled.url);
+  });
+
   test("logs relay_control_connected only after first valid control message", () => {
     const logger = createMockLogger();
     const controller = startRelayTransport({
diff --git a/packages/server/src/server/relay-transport.ts b/packages/server/src/server/relay-transport.ts
index ddf1a3c234..f7b73a5367 100644
--- a/packages/server/src/server/relay-transport.ts
+++ b/packages/server/src/server/relay-transport.ts
@@ -420,6 +420,10 @@ async function attachEncryptedSocket(
   attachSocket: (ws: RelaySocketLike, metadata?: ExternalSocketMetadata) => Promise<void>,
   metadata?: ExternalSocketMetadata,
 ): Promise<void> {
+  const handshakeTimeout = setTimeout(() => {
+    logger.warn("relay_e2ee_handshake_timeout_terminating");
+    socket.terminate();
+  }, 15_000);
   try {
     const relayTransport = createRelayTransportAdapter(socket, logger);
     const emitter = new EventEmitter();
@@ -440,6 +444,7 @@ async function attachEncryptedSocket(
         emitter.emit("error", error);
       },
     });
+    clearTimeout(handshakeTimeout);
     const encryptedSocket = createEncryptedRelaySocket({
       channel,
       emitter,
@@ -459,6 +464,8 @@ async function attachEncryptedSocket(
     } catch {
       // ignore
     }
+  } finally {
+    clearTimeout(handshakeTimeout);
   }
 }
 
diff --git a/packages/server/src/server/resolve-worktree-creation-intent.ts b/packages/server/src/server/resolve-worktree-creation-intent.ts
index 1d6ae13677..73403f5908 100644
--- a/packages/server/src/server/resolve-worktree-creation-intent.ts
+++ b/packages/server/src/server/resolve-worktree-creation-intent.ts
@@ -1,7 +1,10 @@
 import type { ForgeService, PullRequestCheckoutTarget } from "../services/forge-service.js";
 import type { WorktreeSource } from "../utils/worktree.js";
 
-export type WorktreeCreationIntent = WorktreeSource;
+export type WorktreeCreationIntent = Exclude<
+  WorktreeSource,
+  { kind: "restore" | "restore-from-base" }
+>;
 
 export interface ResolveWorktreeCreationIntentInput {
   worktreeSlug?: string;
diff --git a/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts b/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
index 250d8ec583..877ec3aced 100644
--- a/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
+++ b/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
@@ -222,7 +222,7 @@ test("archiveOnFinish=false local scheduled run emits upserts and remains active
     },
     runOnCreate: false,
   });
-  await ctx.client.fetchWorkspaces({ subscribe: { subscriptionId: "schedule-local-workspaces" } });
+  await ctx.client.fetchWorkspaces({ subscribe: {} });
   const events = collectLifecycleUpdates();
 
   const ran = await runScheduleOnce(schedule.id);
@@ -235,6 +235,10 @@ test("archiveOnFinish=false local scheduled run emits upserts and remains active
   await waitForAgentUpsert(events.agentUpdates, agentId);
   expect(workspaceWasRemoved(events.workspaceUpdates, workspaceId!)).toBe(false);
   expect(await activeAgentIds()).toContain(agentId);
+  expect(
+    (await ctx.client.fetchWorkspaces()).entries.find((entry) => entry.id === workspaceId)
+      ?.background,
+  ).toBe(false);
 
   events.stop();
 });
@@ -256,7 +260,7 @@ test("archiveOnFinish=true scheduled run emits a workspace remove", async () =>
     runOnCreate: false,
   });
   await ctx.client.fetchWorkspaces({
-    subscribe: { subscriptionId: "schedule-archive-workspaces" },
+    subscribe: {},
   });
   const events = collectLifecycleUpdates();
 
@@ -293,7 +297,7 @@ test("worktree isolation creates a run worktree and archiveOnFinish removes it",
     runOnCreate: false,
   });
   await ctx.client.fetchWorkspaces({
-    subscribe: { subscriptionId: "schedule-worktree-workspaces" },
+    subscribe: {},
   });
   const events = collectLifecycleUpdates();
 
diff --git a/packages/server/src/server/schedule/service.test.ts b/packages/server/src/server/schedule/service.test.ts
index 322bffa8fb..1a9f0f5fd4 100644
--- a/packages/server/src/server/schedule/service.test.ts
+++ b/packages/server/src/server/schedule/service.test.ts
@@ -1,4 +1,4 @@
-import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { chmod, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
@@ -21,8 +21,6 @@ import type {
   AgentStreamEvent,
 } from "../agent/agent-sdk-types.js";
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
-import { validateProviderOptions } from "../agent/provider-options.js";
-import { ClaudeProviderOptionsSchema } from "../agent/providers/claude/options.js";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import type { ProviderSnapshotManager } from "../agent/provider-snapshot-manager.js";
 import { createWorkspaceProvisioningService } from "../session/workspace-provisioning/workspace-provisioning-service.js";
@@ -46,6 +44,37 @@ interface ScheduleServiceInternals {
   executeSchedule(schedule: StoredSchedule, runId: string): Promise<ScheduleExecutionResult>;
 }
 
+class OverlappingTickRunner {
+  private resolveFirstRunStarted: () => void = () => {};
+  private resolveFirstRunBlocked: () => void = () => {};
+  private laterScheduleRunCount = 0;
+
+  readonly firstRunStarted = new Promise<void>((resolve) => {
+    this.resolveFirstRunStarted = resolve;
+  });
+  private readonly firstRunBlocked = new Promise<void>((resolve) => {
+    this.resolveFirstRunBlocked = resolve;
+  });
+
+  async run(schedule: StoredSchedule): Promise<ScheduleExecutionResult> {
+    if (schedule.prompt === "block the first tick") {
+      this.resolveFirstRunStarted();
+      await this.firstRunBlocked;
+    } else {
+      this.laterScheduleRunCount += 1;
+    }
+    return { agentId: null, output: "ok" };
+  }
+
+  unblockFirstRun(): void {
+    this.resolveFirstRunBlocked();
+  }
+
+  get laterScheduleRuns(): number {
+    return this.laterScheduleRunCount;
+  }
+}
+
 const SCHEDULE_TEST_CAPABILITIES: AgentCapabilityFlags = {
   supportsStreaming: true,
   supportsSessionPersistence: true,
@@ -66,12 +95,6 @@ const NO_UNATTENDED_SCHEDULE_POLICY: Pick<ProviderSnapshotManager, "resolveCreat
 
 const TEST_CLAUDE_PROVIDER_DEFINITION = {
   enabled: true,
-  validateOptions: (options: AgentSessionConfig["providerOptions"]) =>
-    validateProviderOptions("claude", ClaudeProviderOptionsSchema, options),
-  applyOptions: (config: AgentSessionConfig, options: AgentSessionConfig["providerOptions"]) => ({
-    ...config,
-    ...(options ? { providerOptions: options } : {}),
-  }),
 };
 
 let workspaceArchiveInProgress = false;
@@ -212,6 +235,7 @@ async function createRegistryBackedScheduleWorkspaceDeps(rootDir: string): Promi
     projectRegistry,
     workspaceRegistry,
     workspaceGitService,
+    isDirectory: async () => true,
   });
   return {
     workspaceRegistry,
@@ -352,6 +376,241 @@ describe("ScheduleService", () => {
     expect(inspected.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
   });
 
+  test.each(["new-agent", "agent", "maxRuns: 1"] as const)(
+    "dispatches a shared cron slot only once for %s after an earlier tick resumes",
+    async (targetKind) => {
+      const runner = new OverlappingTickRunner();
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: (schedule) => runner.run(schedule),
+      });
+      const cadence = { type: "cron" as const, expression: "0 6 * * 1", timezone: "Europe/Prague" };
+      await service.create({
+        prompt: "block the first tick",
+        cadence,
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      });
+      // Give the later schedule a distinct creation time so file ordering cannot affect the race.
+      now = new Date("2026-01-01T00:00:01.000Z");
+      const agentId = "00000000-0000-0000-0000-000000000001";
+      await agentStorage.upsert(
+        buildAgentRecord({ id: agentId, cwd: tempDir, iso: now.toISOString() }),
+      );
+      const later = await service.create({
+        prompt: "later due schedule",
+        cadence,
+        target:
+          targetKind === "agent"
+            ? { type: "agent", agentId }
+            : { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+        maxRuns: targetKind === "maxRuns: 1" ? 1 : undefined,
+      });
+      now = new Date("2026-01-05T05:00:00.000Z");
+      const delayedTick = service.tick();
+      await runner.firstRunStarted;
+      try {
+        now = new Date("2026-01-05T05:00:01.000Z");
+        await service.tick();
+      } finally {
+        runner.unblockFirstRun();
+        await delayedTick;
+      }
+      const result = await service.inspect(later.id);
+      expect.soft(runner.laterScheduleRuns).toBe(1);
+      expect.soft(result.runs).toHaveLength(1);
+      expect.soft(result.runs.map((run) => run.scheduledFor)).toEqual(["2026-01-05T05:00:00.000Z"]);
+      expect(result.nextRunAt).toBe(
+        targetKind === "maxRuns: 1" ? null : "2026-01-12T05:00:00.000Z",
+      );
+      expect(result.status).toBe(targetKind === "maxRuns: 1" ? "completed" : "active");
+    },
+  );
+
+  test("advances the next scheduled slot past a run that crosses a cadence boundary", async () => {
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => {
+        now = new Date("2026-01-01T00:02:00.000Z");
+        return { agentId: null, output: "ok" };
+      },
+    });
+
+    const created = await service.create({
+      prompt: "long-running task",
+      cadence: { type: "every", everyMs: 60_000 },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+    });
+
+    now = new Date("2026-01-01T00:01:00.000Z");
+    await service.tick();
+
+    expect((await service.inspect(created.id)).nextRunAt).toBe("2026-01-01T00:03:00.000Z");
+  });
+
+  test("runs the final allowed cron slot without requiring another occurrence", async () => {
+    let dispatches = 0;
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => {
+        dispatches += 1;
+        return { agentId: null, output: "done" };
+      },
+    });
+    const created = await service.create({
+      prompt: "Run once on January 5 when it is Monday",
+      cadence: { type: "cron", expression: "0 6 5 1 1" },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      maxRuns: 1,
+    });
+    now = new Date("2026-01-05T06:00:00.000Z");
+    await service.tick();
+    const result = await service.inspect(created.id);
+    expect(dispatches).toBe(1);
+    expect(result.status).toBe("completed");
+    expect(result.nextRunAt).toBeNull();
+    expect(result.runs).toHaveLength(1);
+    expect(result.runs[0].status).toBe("succeeded");
+  });
+
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "keeps firing future slots after an outcome could not be saved",
+    async () => {
+      const schedulesDir = join(tempDir, "schedules");
+      let dispatches = 0;
+      const failOutcomeWrite = async (): Promise<ScheduleExecutionResult> => {
+        dispatches += 1;
+        if (dispatches === 1) {
+          await chmod(schedulesDir, 0o555);
+        }
+        return { agentId: null, output: "done" };
+      };
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: failOutcomeWrite,
+      });
+      const created = await service.create({
+        prompt: "Check status each minute",
+        runOnCreate: false,
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      });
+      now = new Date("2026-01-01T00:01:00.000Z");
+      try {
+        await expect(service.tick()).rejects.toThrow();
+      } finally {
+        await chmod(schedulesDir, 0o755);
+      }
+      expect((await service.inspect(created.id)).runs[0].status).toBe("running");
+      now = new Date("2026-01-01T00:02:00.000Z");
+      await service.tick();
+      const result = await service.inspect(created.id);
+      expect(dispatches).toBe(2);
+      expect(result.runs.map((run) => run.scheduledFor)).toEqual([
+        "2026-01-01T00:01:00.000Z",
+        "2026-01-01T00:02:00.000Z",
+      ]);
+      expect(result.nextRunAt).toBe("2026-01-01T00:03:00.000Z");
+    },
+  );
+
+  test("completes an interrupted final slot during restart recovery", async () => {
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => ({ agentId: null, output: "done" }),
+    });
+    const created = await service.create({
+      prompt: "Run once",
+      cadence: { type: "cron", expression: "0 6 5 1 1" },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      maxRuns: 1,
+    });
+    now = new Date("2026-01-05T06:00:00.000Z");
+    const store = new ScheduleStore(join(tempDir, "schedules"), createTestLogger());
+    await store.update(created.id, (schedule) => ({
+      ...schedule,
+      nextRunAt: null,
+      runs: [
+        {
+          id: "interrupted-final-slot",
+          scheduledFor: now.toISOString(),
+          startedAt: now.toISOString(),
+          endedAt: null,
+          status: "running",
+          agentId: null,
+          output: null,
+          error: null,
+        },
+      ],
+    }));
+    now = new Date("2026-01-05T06:01:00.000Z");
+    await service.start();
+    try {
+      const result = await service.inspect(created.id);
+      expect(result.status).toBe("completed");
+      expect(result.nextRunAt).toBeNull();
+      expect(result.runs).toHaveLength(1);
+      expect(result.runs[0].status).toBe("failed");
+    } finally {
+      await service.stop();
+    }
+  });
+
+  test.each([2, null])(
+    "keeps a next slot when the final run's limit changes to %s",
+    async (maxRuns) => {
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: async (schedule) => {
+          await service.update({ id: schedule.id, maxRuns });
+          return { agentId: null, output: "done" };
+        },
+      });
+      const created = await service.create({
+        prompt: "Allow more runs during execution",
+        runOnCreate: false,
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+        maxRuns: 1,
+      });
+      now = new Date("2026-01-01T00:01:30.000Z");
+      await service.tick();
+      const result = await service.inspect(created.id);
+      expect(result.status).toBe("active");
+      expect(result.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
+      expect(result.runs).toHaveLength(1);
+    },
+  );
+
   test("pause and resume update persisted schedule state", async () => {
     const service = createScheduleService({
       paseoHome: tempDir,
@@ -802,7 +1061,7 @@ describe("ScheduleService", () => {
     const runStarted = new Promise<void>((resolve) => {
       releaseRun = resolve;
     });
-    const store = new ScheduleStore(join(tempDir, "schedules"));
+    const store = new ScheduleStore(join(tempDir, "schedules"), createTestLogger());
     const legacy = await store.create({
       name: null,
       prompt: "finish/update race",
@@ -911,7 +1170,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -989,7 +1247,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -1059,7 +1316,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -1119,7 +1375,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -1901,6 +2156,51 @@ describe("ScheduleService", () => {
     await service2.stop();
   });
 
+  test("starts with the valid schedules when the schedules directory holds files that are not schedules", async () => {
+    const service1 = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => ({ agentId: null, output: "ok" }),
+    });
+    const created = await service1.create({
+      prompt: "Still scheduled",
+      cadence: { type: "every", everyMs: 60_000 },
+      target: {
+        type: "new-agent",
+        config: { provider: "claude", cwd: tempDir },
+      },
+      runOnCreate: false,
+    });
+    await service1.stop();
+
+    const schedulesDir = join(tempDir, "schedules");
+    await writeFile(join(schedulesDir, "notes.json"), JSON.stringify({ hello: "world" }));
+    const { lastRunAt: _omitted, ...withoutLastRunAt } = created;
+    await writeFile(
+      join(schedulesDir, "deadbeef.json"),
+      JSON.stringify({ ...withoutLastRunAt, id: "deadbeef" }),
+    );
+    await writeFile(join(schedulesDir, "broken.json"), "{ not json");
+
+    const service2 = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => ({ agentId: null, output: "ok" }),
+    });
+    await service2.start();
+
+    expect((await service2.list()).map((schedule) => schedule.id)).toEqual([created.id]);
+    await service2.stop();
+  });
+
   test("startup recovery archives an interrupted run workspace with an associated agent", async () => {
     const service1 = createScheduleService({
       paseoHome: tempDir,
@@ -1925,7 +2225,7 @@ describe("ScheduleService", () => {
     const interruptedAt = now.toISOString();
     const associatedAgentId = "11111111-1111-4111-8111-111111111111";
     const workspaceId = "wks_interrupted_with_agent";
-    const store = new ScheduleStore(join(tempDir, "schedules"));
+    const store = new ScheduleStore(join(tempDir, "schedules"), createTestLogger());
     await store.update(created.id, (schedule) => ({
       ...schedule,
       runs: [
@@ -1993,7 +2293,7 @@ describe("ScheduleService", () => {
 
     const interruptedAt = now.toISOString();
     const workspaceId = "wks_interrupted_without_agent";
-    const store = new ScheduleStore(join(tempDir, "schedules"));
+    const store = new ScheduleStore(join(tempDir, "schedules"), createTestLogger());
     await store.update(created.id, (schedule) => ({
       ...schedule,
       runs: [
@@ -2829,6 +3129,44 @@ describe("ScheduleService", () => {
     expect(inspected.runs[0]?.error).toBe("network blip");
   });
 
+  // chmod cannot make a directory unwritable on Windows or for root.
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "fires again after a tick whose run could not be recorded",
+    async () => {
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: async () => ({ agentId: null, output: "ran" }),
+      });
+
+      const created = await service.create({
+        prompt: "ping target",
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "agent", agentId: "88888888-8888-4888-8888-888888888888" },
+      });
+
+      const schedulesDir = join(tempDir, "schedules");
+      now = new Date("2026-01-01T00:01:00.000Z");
+      await chmod(schedulesDir, 0o555);
+      try {
+        await expect(service.tick()).rejects.toThrow();
+      } finally {
+        await chmod(schedulesDir, 0o755);
+      }
+
+      await service.tick();
+
+      const inspected = await service.inspect(created.id);
+      expect(inspected.runs).toHaveLength(1);
+      expect(inspected.runs[0]?.status).toBe("succeeded");
+      expect(inspected.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
+    },
+  );
+
   test("completes the schedule when a scheduled run targets an archived agent", async () => {
     const service = createScheduleService({
       paseoHome: tempDir,
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index e3e9504e46..7b5487c3f8 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -1,3 +1,4 @@
+import { formatSystemNotificationPrompt } from "../agent/agent-messages/index.js";
 import { randomUUID } from "node:crypto";
 import { stat } from "node:fs/promises";
 import { join } from "node:path";
@@ -7,11 +8,7 @@ import type { AgentSessionConfig } from "../agent/agent-sdk-types.js";
 import type { AgentStorage } from "../agent/agent-storage.js";
 import { curateAgentActivity } from "../agent/activity-curator.js";
 import { ensureAgentLoaded } from "../agent/agent-loading.js";
-import {
-  formatSystemNotificationPrompt,
-  startAgentRun,
-  type AgentRunController,
-} from "../agent/agent-prompt.js";
+import { startAgentRun, type AgentRunController } from "../agent/agent-prompt.js";
 import { resolveCreateAgentTitles } from "../agent/create-agent-title.js";
 import { type BoundCreateAgentCommand, formatProviderModel } from "../agent/create-agent/create.js";
 import type { PersistedWorkspaceRecord } from "../workspace-registry.js";
@@ -41,6 +38,18 @@ export class ScheduleTargetGoneError extends Error {
   }
 }
 
+function advanceNextRunAtPast(
+  cadence: StoredSchedule["cadence"],
+  nextRunAt: Date,
+  now: Date,
+): Date {
+  let next = nextRunAt;
+  while (next.getTime() <= now.getTime()) {
+    next = computeNextRunAt(cadence, next);
+  }
+  return next;
+}
+
 function trimOptionalName(value: string | null | undefined): string | null {
   if (typeof value !== "string") {
     return null;
@@ -202,6 +211,7 @@ function buildRunOutput(params: {
 type ScheduleAgentManager = Pick<
   AgentRunController,
   | "getAgent"
+  | "reloadAgentSession"
   | "tryRunOutOfBand"
   | "hasInFlightRun"
   | "replaceAgentRun"
@@ -263,8 +273,8 @@ export class ScheduleService {
   private tickTimer: ReturnType<typeof setInterval> | null = null;
 
   constructor(options: ScheduleServiceOptions) {
-    this.store = new ScheduleStore(join(options.paseoHome, "schedules"));
     this.logger = options.logger.child({ module: "schedule-service" });
+    this.store = new ScheduleStore(join(options.paseoHome, "schedules"), this.logger);
     this.agentManager = options.agentManager;
     this.agentStorage = options.agentStorage;
     this.createAgent = options.createAgent;
@@ -623,6 +633,9 @@ export class ScheduleService {
           error: "Daemon restarted before the scheduled run completed",
         };
         updated = { ...updated, runs };
+        if (shouldCompleteSchedule(updated, now)) {
+          updated = completeSchedule(updated, now);
+        }
         dirty = true;
       }
 
@@ -692,48 +705,113 @@ export class ScheduleService {
     options?: { manual?: boolean },
   ): Promise<void> {
     const manual = options?.manual === true;
+    // Reserve before store I/O; persisted history cannot prove a run is still alive.
     this.runningScheduleIds.add(schedule.id);
-    const runId = randomUUID();
-    const runningRun: ScheduleRun = {
-      id: runId,
-      scheduledFor: manual ? now.toISOString() : (schedule.nextRunAt ?? now.toISOString()),
-      startedAt: now.toISOString(),
-      endedAt: null,
-      status: "running",
-      agentId: null,
-      output: null,
-      error: null,
-    };
-    const scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
-
     try {
-      const result = await this.runner(scheduleWithRun, runId);
-      await this.finishRun({
-        scheduleId: schedule.id,
-        runId,
-        status: "succeeded",
-        agentId: result.agentId,
-        output: result.output,
-        error: null,
-        targetGone: false,
-        manual,
-      });
-    } catch (error) {
-      await this.finishRun({
-        scheduleId: schedule.id,
-        runId,
-        status: "failed",
-        agentId: null,
-        output: null,
-        error: error instanceof Error ? error.message : String(error),
-        targetGone: error instanceof ScheduleTargetGoneError,
-        manual,
-      });
+      let runId: string;
+      let scheduleWithRun: StoredSchedule;
+      if (manual) {
+        runId = randomUUID();
+        const runningRun: ScheduleRun = {
+          id: runId,
+          scheduledFor: now.toISOString(),
+          startedAt: now.toISOString(),
+          endedAt: null,
+          status: "running",
+          agentId: null,
+          output: null,
+          error: null,
+        };
+        scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
+      } else {
+        const claimed = await this.claimDueRun(schedule.id, now);
+        if (!claimed) {
+          return;
+        }
+        ({ schedule: scheduleWithRun, runId } = claimed);
+      }
+
+      try {
+        const result = await this.runner(scheduleWithRun, runId);
+        await this.finishRun({
+          scheduleId: schedule.id,
+          runId,
+          status: "succeeded",
+          agentId: result.agentId,
+          output: result.output,
+          error: null,
+          targetGone: false,
+          manual,
+        });
+      } catch (error) {
+        await this.finishRun({
+          scheduleId: schedule.id,
+          runId,
+          status: "failed",
+          agentId: null,
+          output: null,
+          error: error instanceof Error ? error.message : String(error),
+          targetGone: error instanceof ScheduleTargetGoneError,
+          manual,
+        });
+      }
     } finally {
       this.runningScheduleIds.delete(schedule.id);
     }
   }
 
+  private async claimDueRun(
+    scheduleId: string,
+    now: Date,
+  ): Promise<{ schedule: StoredSchedule; runId: string } | null> {
+    let claimed: { schedule: StoredSchedule; runId: string } | null = null;
+    const updatedSchedule = await this.store.update(scheduleId, (schedule) => {
+      if (
+        schedule.status !== "active" ||
+        !schedule.nextRunAt ||
+        shouldCompleteSchedule(schedule, now) ||
+        new Date(schedule.nextRunAt).getTime() > now.getTime()
+      ) {
+        return schedule;
+      }
+
+      const scheduledFor = schedule.nextRunAt;
+      const isFinalRun =
+        schedule.maxRuns !== null && countCompletedRuns(schedule) + 1 >= schedule.maxRuns;
+      const nextRunAt = isFinalRun
+        ? null
+        : advanceNextRunAtPast(
+            schedule.cadence,
+            computeNextRunAt(schedule.cadence, new Date(scheduledFor)),
+            now,
+          ).toISOString();
+
+      // Claim the due slot and advance its cursor in the same serialized update.
+      // A tick can hold a stale list while another tick finishes this schedule.
+      const runId = randomUUID();
+      const runningRun: ScheduleRun = {
+        id: runId,
+        scheduledFor,
+        startedAt: now.toISOString(),
+        endedAt: null,
+        status: "running",
+        agentId: null,
+        output: null,
+        error: null,
+      };
+      const updated: StoredSchedule = {
+        ...schedule,
+        nextRunAt,
+        updatedAt: now.toISOString(),
+        runs: [...schedule.runs, runningRun],
+      };
+      claimed = { schedule: updated, runId };
+      return updated;
+    });
+    requireSchedule(updatedSchedule, scheduleId);
+    return claimed;
+  }
+
   private async appendRunningRun(
     scheduleId: string,
     runningRun: ScheduleRun,
@@ -794,14 +872,16 @@ export class ScheduleService {
           nextRunAt: null,
         };
       } else {
-        const after = new Date(schedule.nextRunAt ?? now.toISOString());
-        let nextRunAt = computeNextRunAt(updated.cadence, after);
-        while (nextRunAt.getTime() <= now.getTime()) {
-          nextRunAt = computeNextRunAt(updated.cadence, nextRunAt);
-        }
+        // A final slot has no successor until its run limit is raised or cleared.
+        // Every runner invocation has a recorded run with this id.
+        const finishedRun = completedRuns.find((run) => run.id === params.runId)!;
+        const nextRunAt = updated.nextRunAt
+          ? new Date(updated.nextRunAt)
+          : computeNextRunAt(updated.cadence, new Date(finishedRun.scheduledFor));
+        // Move an overdue cursor past a long run without advancing a future one twice.
         updated = {
           ...updated,
-          nextRunAt: nextRunAt.toISOString(),
+          nextRunAt: advanceNextRunAtPast(updated.cadence, nextRunAt, now).toISOString(),
         };
       }
 
@@ -909,7 +989,6 @@ export class ScheduleService {
         features: config.featureValues,
         unattended: true,
         promptFailure: "return-error",
-        background: true,
         notifyOnFinish: false,
       });
       const agent = created.snapshot;
diff --git a/packages/server/src/server/schedule/store.test.ts b/packages/server/src/server/schedule/store.test.ts
index 7e19bbfd92..5f69119d4d 100644
--- a/packages/server/src/server/schedule/store.test.ts
+++ b/packages/server/src/server/schedule/store.test.ts
@@ -1,7 +1,10 @@
-import { mkdtemp, rm } from "node:fs/promises";
+import { chmod, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
+import { Writable } from "node:stream";
+import pino from "pino";
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { createTestLogger } from "../../test-utils/test-logger.js";
 import { ScheduleStore } from "./store.js";
 
 describe("ScheduleStore", () => {
@@ -10,7 +13,7 @@ describe("ScheduleStore", () => {
 
   beforeEach(async () => {
     tempDir = await mkdtemp(join(tmpdir(), "schedule-store-test-"));
-    store = new ScheduleStore(tempDir);
+    store = new ScheduleStore(tempDir, createTestLogger());
   });
 
   afterEach(async () => {
@@ -40,13 +43,66 @@ describe("ScheduleStore", () => {
       runs: [],
     });
 
-    const reloaded = new ScheduleStore(tempDir);
+    const reloaded = new ScheduleStore(tempDir, createTestLogger());
     const listed = await reloaded.list();
 
     expect(created.id).toHaveLength(8);
     expect(listed).toEqual([created]);
   });
 
+  test("reports an invalid schedule file once while it stays invalid, by name, and lists the rest", async () => {
+    const created = await store.create({
+      name: "Morning summary",
+      prompt: "Summarize new commits",
+      cadence: { type: "every", everyMs: 60_000 },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      status: "active",
+      createdAt: "2026-01-01T00:00:00.000Z",
+      updatedAt: "2026-01-01T00:00:00.000Z",
+      nextRunAt: "2026-01-01T00:01:00.000Z",
+      lastRunAt: null,
+      pausedAt: null,
+      expiresAt: null,
+      maxRuns: null,
+      runs: [],
+    });
+    await writeFile(join(tempDir, "notes.json"), JSON.stringify({ hello: "world" }));
+    const logLines: Array<{ msg: string; filePath?: string }> = [];
+    const logger = pino(
+      { level: "error" },
+      new Writable({
+        write(chunk, _encoding, callback) {
+          logLines.push(JSON.parse(chunk.toString("utf8")));
+          callback();
+        },
+      }),
+    );
+    const reloaded = new ScheduleStore(tempDir, logger);
+
+    expect(await reloaded.list()).toEqual([created]);
+    expect(await reloaded.list()).toEqual([created]);
+    await rm(join(tempDir, "notes.json"));
+    expect(await reloaded.list()).toEqual([created]);
+    await writeFile(join(tempDir, "notes.json"), "{ not json");
+    expect(await reloaded.list()).toEqual([created]);
+
+    const skipped = {
+      msg: "Skipping invalid schedule file",
+      filePath: join(tempDir, "notes.json"),
+    };
+    expect(logLines.map(({ msg, filePath }) => ({ msg, filePath }))).toEqual([skipped, skipped]);
+  });
+
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "fails the listing when a schedule file cannot be read",
+    async () => {
+      await writeFile(join(tempDir, "unreadable.json"), "{}");
+      await chmod(join(tempDir, "unreadable.json"), 0o000);
+
+      await expect(store.list()).rejects.toMatchObject({ code: "EACCES" });
+    },
+  );
+
   test("update round-trips an updated schedule to disk", async () => {
     const created = await store.create({
       name: "before",
@@ -81,7 +137,7 @@ describe("ScheduleStore", () => {
     };
     await store.update(created.id, () => updated);
 
-    const reloaded = await new ScheduleStore(tempDir).get(created.id);
+    const reloaded = await new ScheduleStore(tempDir, createTestLogger()).get(created.id);
     expect(reloaded).toEqual(updated);
   });
 
@@ -182,7 +238,9 @@ describe("ScheduleStore", () => {
       prompt: "after",
       runs: [{ id: "run-1" }],
     });
-    await expect(new ScheduleStore(tempDir).get(created.id)).resolves.toMatchObject({
+    await expect(
+      new ScheduleStore(tempDir, createTestLogger()).get(created.id),
+    ).resolves.toMatchObject({
       prompt: "after",
       runs: [{ id: "run-1" }],
     });
@@ -211,7 +269,7 @@ describe("ScheduleStore", () => {
       }
     }
 
-    const gatedStore = new GatedListScheduleStore(tempDir);
+    const gatedStore = new GatedListScheduleStore(tempDir, createTestLogger());
     const target = {
       type: "new-agent" as const,
       config: { provider: "claude" as const, cwd: tempDir },
diff --git a/packages/server/src/server/schedule/store.ts b/packages/server/src/server/schedule/store.ts
index f3583d5f70..6feee5bc85 100644
--- a/packages/server/src/server/schedule/store.ts
+++ b/packages/server/src/server/schedule/store.ts
@@ -1,6 +1,7 @@
 import { randomBytes } from "node:crypto";
 import { mkdir, readFile, readdir, rm } from "node:fs/promises";
 import { join } from "node:path";
+import type { Logger } from "pino";
 import {
   StoredScheduleSchema,
   type ScheduleTarget,
@@ -87,11 +88,27 @@ function matchesNameAndTarget(
   );
 }
 
+function parseStoredSchedule(
+  content: string,
+): { success: true; data: StoredSchedule } | { success: false; error: unknown } {
+  let json: unknown;
+  try {
+    json = JSON.parse(content);
+  } catch (error) {
+    return { success: false, error };
+  }
+  return StoredScheduleSchema.safeParse(json);
+}
+
 export class ScheduleStore {
   private readonly scheduleMutations = new Map<string, Promise<unknown>>();
   private readonly identityMutations = new Map<string, Promise<unknown>>();
+  private reportedInvalidFiles = new Set<string>();
 
-  constructor(private readonly dir: string) {}
+  constructor(
+    private readonly dir: string,
+    private readonly logger: Logger,
+  ) {}
 
   private filePath(id: string): string {
     return join(this.dir, `${id}.json`);
@@ -101,17 +118,32 @@ export class ScheduleStore {
     await mkdir(this.dir, { recursive: true });
   }
 
+  // The service lists schedules on every tick, so a file that is not a valid schedule is
+  // reported when it first appears rather than once per second.
   async list(): Promise<StoredSchedule[]> {
     await this.ensureDir();
     const entries = await readdir(this.dir, { withFileTypes: true });
-    const schedules = await Promise.all(
+    const files = await Promise.all(
       entries
         .filter((entry) => entry.isFile() && entry.name.endsWith(".json"))
         .map(async (entry) => {
-          const content = await readFile(join(this.dir, entry.name), "utf-8");
-          return StoredScheduleSchema.parse(JSON.parse(content));
+          const filePath = join(this.dir, entry.name);
+          return { filePath, parsed: parseStoredSchedule(await readFile(filePath, "utf-8")) };
         }),
     );
+    const schedules: StoredSchedule[] = [];
+    const invalidFiles = new Set<string>();
+    for (const { filePath, parsed } of files) {
+      if (parsed.success) {
+        schedules.push(parsed.data);
+        continue;
+      }
+      invalidFiles.add(filePath);
+      if (!this.reportedInvalidFiles.has(filePath)) {
+        this.logger.error({ err: parsed.error, filePath }, "Skipping invalid schedule file");
+      }
+    }
+    this.reportedInvalidFiles = invalidFiles;
     return schedules.sort((left, right) => left.createdAt.localeCompare(right.createdAt));
   }
 
diff --git a/packages/server/src/server/script-health-monitor.test.ts b/packages/server/src/server/script-health-monitor.test.ts
index bbc5acf3c7..96af0133ca 100644
--- a/packages/server/src/server/script-health-monitor.test.ts
+++ b/packages/server/src/server/script-health-monitor.test.ts
@@ -99,14 +99,14 @@ function createStubTerminalManager(
   };
 }
 
-async function startTcpServer(): Promise<TcpServerHandle> {
+async function startTcpServer(host = "127.0.0.1"): Promise<TcpServerHandle> {
   const server = net.createServer((socket) => {
     socket.end();
   });
 
   await new Promise<void>((resolve, reject) => {
     server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => {
+    server.listen(0, host, () => {
       server.off("error", reject);
       resolve();
     });
@@ -153,6 +153,45 @@ describe("ScriptHealthMonitor", () => {
     servers.clear();
   });
 
+  it.each(["127.0.0.1", "::1"])("reports a service bound only to %s as healthy", async (host) => {
+    const service = await startTcpServer(host);
+    servers.add(service.server);
+    const serviceProxy = new ScriptRouteStore();
+    serviceProxy.registerWorkspaceService({
+      workspaceId: "workspace-a",
+      projectSlug: "repo",
+      branchName: "main",
+      scriptName: "api",
+      port: service.port,
+    });
+    const updates: ScriptHealthEntry[][] = [];
+    const monitor = new ScriptHealthMonitor({
+      serviceProxy,
+      onChange: (_workspaceId, scripts) => updates.push(scripts),
+      pollIntervalMs: 10,
+      probeTimeoutMs: 100,
+      graceMs: 0,
+      failuresBeforeStopped: 1,
+    });
+    monitor.start();
+    try {
+      await vi.waitFor(() => {
+        expect(updates).toEqual([
+          [
+            {
+              scriptName: "api",
+              hostname: "api--repo.localhost",
+              port: service.port,
+              health: "healthy",
+            },
+          ],
+        ]);
+      });
+    } finally {
+      monitor.stop();
+    }
+  });
+
   it("starts new service routes in pending and transitions to healthy after the grace period", async () => {
     vi.useFakeTimers();
 
diff --git a/packages/server/src/server/script-health-monitor.ts b/packages/server/src/server/script-health-monitor.ts
index 810518f999..7992608f24 100644
--- a/packages/server/src/server/script-health-monitor.ts
+++ b/packages/server/src/server/script-health-monitor.ts
@@ -1,4 +1,4 @@
-import net from "node:net";
+import { connectToLocalService } from "./local-service-connection.js";
 import type { ServiceProxyHealthTarget, ServiceProxySubsystem } from "./service-proxy.js";
 
 export type ScriptHealthState = "pending" | "healthy" | "unhealthy";
@@ -208,7 +208,7 @@ export class ScriptHealthMonitor {
 
   private probeRoute(port: number): Promise<boolean> {
     return new Promise((resolve) => {
-      const socket = net.connect({ host: "127.0.0.1", port });
+      const socket = connectToLocalService(port);
       let settled = false;
 
       const finish = (healthy: boolean) => {
diff --git a/packages/server/src/server/selective-timeline-delivery.e2e.test.ts b/packages/server/src/server/selective-timeline-delivery.e2e.test.ts
index c9d57c4b59..f47b30ce85 100644
--- a/packages/server/src/server/selective-timeline-delivery.e2e.test.ts
+++ b/packages/server/src/server/selective-timeline-delivery.e2e.test.ts
@@ -1,9 +1,18 @@
+import type { AgentStreamEvent, AgentSessionConfig } from "./agent/agent-sdk-types.js";
+import { mkdtemp, mkdir, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { createPersistedWorkspaceRecord } from "./workspace-registry.js";
 import { afterEach, beforeEach, expect, test } from "vitest";
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
 import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
-import { DaemonClient } from "./test-utils/daemon-client.js";
+import { DaemonClient, type WebSocketLike } from "@getpaseo/client/internal/daemon-client";
+import { WebSocket } from "ws";
 import { createTestPaseoDaemon, type TestPaseoDaemon } from "./test-utils/paseo-daemon.js";
-import { MockLoadTestAgentClient } from "./agent/providers/mock-load-test-agent.js";
+import {
+  MockLoadTestAgentClient,
+  MockLoadTestAgentSession,
+} from "./agent/providers/mock-load-test-agent.js";
 
 interface MessageWaiter {
   predicate(message: SessionOutboundMessage): boolean;
@@ -17,7 +26,10 @@ class ConnectedClient {
   private readonly waiters: MessageWaiter[] = [];
   private readonly unsubscribe: () => void;
 
-  constructor(readonly client: DaemonClient) {
+  constructor(
+    readonly client: DaemonClient,
+    private readonly socket: WebSocket,
+  ) {
     this.unsubscribe = client.subscribeRawMessages((message) => {
       this.messages.push(message);
       for (let waiterIndex = this.waiters.length - 1; waiterIndex >= 0; waiterIndex -= 1) {
@@ -30,6 +42,46 @@ class ConnectedClient {
     });
   }
 
+  // These cases exercise the pre-owned-subscriptions selective timeline contract.
+  async setLegacyTimelineMembership(agentIds: string[]): Promise<void> {
+    const requestId = crypto.randomUUID();
+    this.socket.send(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "agent.timeline.set_subscription.request",
+          requestId,
+          agentIds,
+        },
+      }),
+    );
+    await this.next(
+      (message) =>
+        message.type === "agent.timeline.set_subscription.response" &&
+        message.payload.requestId === requestId,
+      "legacy timeline acknowledgement",
+    );
+  }
+
+  async observeLegacyDirectory(subscriptionId: string): Promise<void> {
+    const requestId = crypto.randomUUID();
+    this.socket.send(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "fetch_agents_request",
+          requestId,
+          subscribe: { subscriptionId },
+        },
+      }),
+    );
+    await this.next(
+      (message) =>
+        message.type === "fetch_agents_response" && message.payload.requestId === requestId,
+      "legacy directory acknowledgement",
+    );
+  }
+
   clear(): void {
     this.messages.length = 0;
   }
@@ -129,24 +181,201 @@ async function connect(input: {
   clientId: string;
   selective: boolean;
   timelineReplacementInvalidation?: boolean;
+  timelineNotifications?: boolean;
+  pluginTimelineItems?: boolean;
+  workspaceSetupBlocked?: boolean;
 }): Promise<ConnectedClient> {
+  let socket!: WebSocket;
   const client = new DaemonClient({
     url: `ws://127.0.0.1:${daemon.port}/ws`,
     clientId: input.clientId,
+    webSocketFactory: (url) => {
+      socket = new WebSocket(url);
+      return socket as unknown as WebSocketLike;
+    },
     capabilities: {
+      [CLIENT_CAPS.ownedSubscriptions]: false,
       [CLIENT_CAPS.selectiveAgentTimeline]: input.selective,
-      ...(input.timelineReplacementInvalidation
-        ? { [CLIENT_CAPS.timelineReplacementInvalidation]: true }
-        : {}),
+      [CLIENT_CAPS.pluginTimelineItems]: input.pluginTimelineItems ?? false,
+      [CLIENT_CAPS.workspaceSetupBlocked]: input.workspaceSetupBlocked ?? false,
+      ...(input.timelineNotifications === undefined
+        ? {}
+        : { [CLIENT_CAPS.timelineNotifications]: input.timelineNotifications }),
+      [CLIENT_CAPS.timelineReplacementInvalidation]: input.timelineReplacementInvalidation ?? false,
     },
     reconnect: { enabled: false },
   });
   await client.connect();
-  const connected = new ConnectedClient(client);
+  const connected = new ConnectedClient(client, socket);
   clients.push(connected);
   return connected;
 }
 
+test("notification timeline items are sent only to clients that advertise support", async () => {
+  await daemon.close();
+  daemon = await createTestPaseoDaemon({
+    isDev: true,
+    agentClients: { mock: new MockLoadTestAgentClient() },
+  });
+  const capable = await connect({
+    clientId: "notification-capable",
+    selective: false,
+    timelineNotifications: true,
+  });
+  const legacy = await connect({
+    clientId: "notification-legacy",
+    selective: false,
+    timelineNotifications: false,
+  });
+  const agent = await capable.client.createAgent({
+    provider: "mock",
+    cwd: "/tmp",
+    title: "Notification compatibility",
+    model: "ten-second-stream",
+  });
+  capable.clear();
+  legacy.clear();
+
+  await daemon.daemon.agentManager.appendTimelineItem(agent.id, {
+    type: "notification",
+    level: "warning",
+    message: "Capable clients only",
+  });
+  await daemon.daemon.agentManager.appendTimelineItem(agent.id, {
+    type: "assistant_message",
+    text: "Visible to every client",
+  });
+  await Promise.all([
+    capable.next(isAgentStream(agent.id), "capable timeline delivery"),
+    legacy.next(isAgentStream(agent.id), "legacy timeline delivery"),
+  ]);
+  await Promise.all([
+    capable.barrier("notification-capable"),
+    legacy.barrier("notification-legacy"),
+  ]);
+
+  const capableLiveItems = capable.messages.flatMap((message) =>
+    message.type === "agent_stream" && message.payload.event.type === "timeline"
+      ? [message.payload.event.item]
+      : [],
+  );
+  const legacyLiveItems = legacy.messages.flatMap((message) =>
+    message.type === "agent_stream" && message.payload.event.type === "timeline"
+      ? [message.payload.event.item]
+      : [],
+  );
+  expect(capableLiveItems.some((item) => item.type === "notification")).toBe(true);
+  expect(legacyLiveItems.some((item) => item.type === "notification")).toBe(false);
+  expect(legacyLiveItems).toContainEqual(
+    expect.objectContaining({ type: "assistant_message", text: "Visible to every client" }),
+  );
+
+  const [capableTimeline, legacyTimeline] = await Promise.all([
+    capable.client.fetchAgentTimeline(agent.id, { direction: "tail", projection: "canonical" }),
+    legacy.client.fetchAgentTimeline(agent.id, { direction: "tail", projection: "canonical" }),
+  ]);
+  expect(capableTimeline.entries.some((entry) => entry.item.type === "notification")).toBe(true);
+  expect(legacyTimeline.entries.some((entry) => entry.item.type === "notification")).toBe(false);
+  expect(legacyTimeline.entries).toContainEqual(
+    expect.objectContaining({
+      item: expect.objectContaining({
+        type: "assistant_message",
+        text: "Visible to every client",
+      }),
+    }),
+  );
+  expect(legacyTimeline.window).toEqual(capableTimeline.window);
+  expect(legacyTimeline.endCursor).toEqual(capableTimeline.endCursor);
+});
+
+test("plugin timeline items are sent only to clients that advertise support", async () => {
+  await daemon.close();
+  daemon = await createTestPaseoDaemon({
+    isDev: true,
+    agentClients: { mock: new MockLoadTestAgentClient() },
+  });
+  const capable = await connect({
+    clientId: "plugin-shared",
+    selective: false,
+    pluginTimelineItems: true,
+  });
+  const legacy = await connect({
+    clientId: "plugin-shared",
+    selective: false,
+    pluginTimelineItems: false,
+  });
+  const agent = await capable.client.createAgent({
+    provider: "mock",
+    cwd: "/tmp",
+    title: "Plugin compatibility",
+    model: "ten-second-stream",
+  });
+  capable.clear();
+  legacy.clear();
+
+  await daemon.daemon.agentManager.appendTimelineItem(agent.id, {
+    type: "plugin",
+    id: "compat-row",
+    pluginId: "timeline-items",
+    kind: "notice",
+    version: 1,
+    data: { text: "Capable clients only" },
+  });
+  await daemon.daemon.agentManager.appendTimelineItem(agent.id, {
+    type: "plugin",
+    id: "compat-row",
+    pluginId: "timeline-items",
+    kind: "notice",
+    version: 1,
+    data: { text: "Updated" },
+  });
+  await daemon.daemon.agentManager.appendTimelineItem(agent.id, {
+    type: "assistant_message",
+    text: "Visible to every client",
+  });
+  await Promise.all([
+    capable.next(isAgentStream(agent.id), "capable timeline delivery"),
+    legacy.next(isAgentStream(agent.id), "legacy timeline delivery"),
+  ]);
+  await Promise.all([capable.barrier("plugin-capable"), legacy.barrier("plugin-legacy")]);
+
+  const capableLiveItems = capable.messages.flatMap((message) =>
+    message.type === "agent_stream" && message.payload.event.type === "timeline"
+      ? [message.payload.event.item]
+      : [],
+  );
+  const legacyLiveItems = legacy.messages.flatMap((message) =>
+    message.type === "agent_stream" && message.payload.event.type === "timeline"
+      ? [message.payload.event.item]
+      : [],
+  );
+  expect(capableLiveItems.some((item) => item.type === "plugin")).toBe(true);
+  expect(legacyLiveItems.some((item) => item.type === "plugin")).toBe(false);
+  expect(legacyLiveItems).toContainEqual(
+    expect.objectContaining({ type: "assistant_message", text: "Visible to every client" }),
+  );
+
+  for (const projection of ["canonical", "projected"] as const) {
+    const [capableTimeline, legacyTimeline] = await Promise.all([
+      capable.client.fetchAgentTimeline(agent.id, { direction: "tail", projection }),
+      legacy.client.fetchAgentTimeline(agent.id, { direction: "tail", projection }),
+    ]);
+    expect(capableTimeline.entries.some((entry) => entry.item.type === "plugin")).toBe(true);
+    expect(legacyTimeline.entries.some((entry) => entry.item.type === "plugin")).toBe(false);
+    expect(legacyTimeline.entries).toContainEqual(
+      expect.objectContaining({
+        item: expect.objectContaining({
+          type: "assistant_message",
+          text: "Visible to every client",
+        }),
+      }),
+    );
+    expect(legacyTimeline.window).toEqual(capableTimeline.window);
+    expect(legacyTimeline.endCursor).toEqual(capableTimeline.endCursor);
+    expect(legacyTimeline.entries.flatMap((entry) => entry.collapsed)).not.toContain("identity");
+  }
+});
+
 test("rewind routes replacement completion by source capability and subscription", async () => {
   await daemon.close();
   daemon = await createTestPaseoDaemon({
@@ -177,9 +406,9 @@ test("rewind routes replacement completion by source capability and subscription
   });
 
   await Promise.all([
-    initiating.client.setAgentTimelineSubscription([agent.id]),
-    passive.client.setAgentTimelineSubscription([agent.id]),
-    unrelated.client.setAgentTimelineSubscription([]),
+    initiating.setLegacyTimelineMembership([agent.id]),
+    passive.setLegacyTimelineMembership([agent.id]),
+    unrelated.setLegacyTimelineMembership([]),
   ]);
   await initiating.client.sendMessage(agent.id, "Rewind this synthetic prompt");
   await initiating.client.cancelAgent(agent.id);
@@ -228,7 +457,7 @@ test("subscription acknowledgements stay on the requesting socket of a retained
   legacy.clear();
   capable.clear();
 
-  await capable.client.setAgentTimelineSubscription(["agent-a"]);
+  await capable.setLegacyTimelineMembership(["agent-a"]);
   await capable.barrier("targeted-subscription-ack");
 
   expect(
@@ -239,12 +468,14 @@ test("subscription acknowledgements stay on the requesting socket of a retained
 test("real WebSocket sessions enforce selective delivery, retained resets, downgrade, and dedicated attention", async () => {
   const legacy = await connect({ clientId: "legacy-client", selective: false });
   let capable = await connect({ clientId: "capable-client", selective: true });
+  const workspaceId = await createAttentionWorkspace(legacy.client);
   const agents = await Promise.all(
     ["A", "B", "C"].map((title) =>
       legacy.client.createAgent({
         provider: "codex",
-        cwd: "/tmp",
+        cwd: daemon.paseoHome,
         title: `Selective ${title}`,
+        workspaceId,
         modeId: "full-access",
       }),
     ),
@@ -261,7 +492,7 @@ test("real WebSocket sessions enforce selective delivery, retained resets, downg
   await capable.barrier("before-membership");
   expect(capable.hasTimeline(agentC.id)).toBe(false);
 
-  await capable.client.setAgentTimelineSubscription([agentA.id, agentB.id]);
+  await capable.setLegacyTimelineMembership([agentA.id, agentB.id]);
   legacy.clear();
   capable.clear();
   await daemon.daemon.agentManager.emitLiveTimelineItem(agentA.id, {
@@ -284,7 +515,7 @@ test("real WebSocket sessions enforce selective delivery, retained resets, downg
   await capable.barrier("unviewed-c");
   expect(capable.hasTimeline(agentC.id)).toBe(false);
 
-  await capable.client.setAgentTimelineSubscription([agentB.id]);
+  await capable.setLegacyTimelineMembership([agentB.id]);
   legacy.clear();
   capable.clear();
   await daemon.daemon.agentManager.emitLiveTimelineItem(agentA.id, {
@@ -316,6 +547,10 @@ test("real WebSocket sessions enforce selective delivery, retained resets, downg
   await capable.barrier("resumed-membership-reset");
   expect(capable.hasTimeline(agentB.id)).toBe(false);
 
+  await Promise.all([
+    legacy.observeLegacyDirectory("legacy-directory"),
+    capable.observeLegacyDirectory("capable-directory"),
+  ]);
   capable.client.sendHeartbeat({
     deviceType: "mobile",
     focusedAgentId: null,
@@ -370,3 +605,190 @@ test("real WebSocket sessions enforce selective delivery, retained resets, downg
 
   expect(downgradedDelivery.type).toBe("agent_stream");
 }, 30_000);
+
+test("blocked setup remains readable on mixed-capability sockets sharing a session", async () => {
+  await daemon.close();
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-blocked-compat-"));
+  const projects = path.join(root, ".paseo", "projects");
+  await mkdir(projects, { recursive: true });
+  const workspace = createPersistedWorkspaceRecord({
+    workspaceId: "blocked-workspace",
+    projectId: "project",
+    cwd: root,
+    kind: "directory",
+    displayName: "Fork PR",
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    untrustedSource: {
+      kind: "change_request",
+      forge: "github",
+      number: 42,
+      headRepository: "contributor/project",
+    },
+  });
+  await writeFile(path.join(projects, "workspaces.json"), JSON.stringify([workspace]));
+  daemon = await createTestPaseoDaemon({ paseoHomeRoot: root });
+  const legacy = await connect({ clientId: "setup-shared", selective: false });
+  const capable = await connect({
+    clientId: "setup-shared",
+    selective: false,
+    workspaceSetupBlocked: true,
+  });
+  const oldStatus = await legacy.client.fetchWorkspaceSetupStatus(workspace.workspaceId);
+  const newStatus = await capable.client.fetchWorkspaceSetupStatus(workspace.workspaceId);
+  expect(oldStatus.snapshot).toMatchObject({
+    status: "failed",
+    error:
+      "Workspace setup is blocked pending approval of code from a fork pull request. Update Paseo to review and run setup.",
+  });
+  expect(newStatus.snapshot).toMatchObject({
+    status: "blocked",
+    error: null,
+    blockedSource: workspace.untrustedSource,
+  });
+  expect(oldStatus.snapshot?.detail).toEqual(newStatus.snapshot?.detail);
+});
+
+// A provider adapter with controllable events and durable provider history.
+class CompatibilityProviderSession extends MockLoadTestAgentSession {
+  private readonly observers = new Set<(event: AgentStreamEvent) => void>();
+  private readonly injectedHistory: AgentStreamEvent[] = [];
+  override subscribe(callback: (event: AgentStreamEvent) => void): () => void {
+    const unsubscribe = super.subscribe(callback);
+    this.observers.add(callback);
+    return () => {
+      unsubscribe();
+      this.observers.delete(callback);
+    };
+  }
+  push(event: AgentStreamEvent): void {
+    this.injectedHistory.push(event);
+    for (const callback of this.observers) callback(event);
+  }
+  override async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    yield* this.injectedHistory;
+    yield* super.streamHistory();
+  }
+}
+
+class CompatibilityProvider extends MockLoadTestAgentClient {
+  session!: CompatibilityProviderSession;
+  override async createSession(config: AgentSessionConfig): Promise<CompatibilityProviderSession> {
+    this.session = new CompatibilityProviderSession({
+      config,
+      sessionId: "compat-provider-session",
+    });
+    return this.session;
+  }
+}
+
+test("plugin items are gated in provider child streams, child fetches, and rewind replay", async () => {
+  await daemon.close();
+  const provider = new CompatibilityProvider();
+  daemon = await createTestPaseoDaemon({ isDev: true, agentClients: { mock: provider } });
+  const legacy = await connect({ clientId: "provider-shared", selective: false });
+  const capable = await connect({
+    clientId: "provider-shared",
+    selective: false,
+    pluginTimelineItems: true,
+  });
+  const agent = await capable.client.createAgent({
+    provider: "mock",
+    cwd: "/tmp",
+    model: "ten-second-stream",
+  });
+  const plugin = {
+    type: "plugin" as const,
+    id: "provider-row",
+    pluginId: "provider",
+    kind: "notice",
+    version: 1,
+    data: { text: "Provider notice" },
+  };
+  provider.session.push({ type: "timeline", provider: "mock", item: plugin });
+  provider.session.push({
+    type: "provider_subagent",
+    provider: "mock",
+    event: { type: "upsert", id: "child", title: "Child", status: "running" },
+  });
+  provider.session.push({
+    type: "provider_subagent",
+    provider: "mock",
+    event: { type: "timeline", id: "child", item: plugin },
+  });
+  provider.session.push({
+    type: "provider_subagent",
+    provider: "mock",
+    event: {
+      type: "timeline",
+      id: "child",
+      item: { type: "assistant_message", text: "Child result" },
+    },
+  });
+  function childResult(message: SessionOutboundMessage): boolean {
+    return (
+      message.type === "agent.provider_subagents.update" &&
+      message.payload.kind === "timeline" &&
+      message.payload.item.type === "assistant_message"
+    );
+  }
+  await Promise.all([
+    capable.next(childResult, "capable child result"),
+    legacy.next(childResult, "legacy child result"),
+  ]);
+  function childItems(client: ConnectedClient) {
+    return client.messages.flatMap((message) =>
+      message.type === "agent.provider_subagents.update" && message.payload.kind === "timeline"
+        ? [message.payload.item]
+        : [],
+    );
+  }
+  expect(childItems(capable)).toContainEqual(plugin);
+  expect(childItems(legacy)).toEqual([{ type: "assistant_message", text: "Child result" }]);
+  const oldChild = await legacy.client.fetchProviderSubagentTimeline(agent.id, "child");
+  const newChild = await capable.client.fetchProviderSubagentTimeline(agent.id, "child");
+  expect(newChild.rows.map((row) => row.item)).toContainEqual(plugin);
+  expect(oldChild.rows.map((row) => row.item)).toEqual([
+    { type: "assistant_message", text: "Child result" },
+  ]);
+  expect(oldChild.window).toEqual(newChild.window);
+
+  await capable.client.sendMessage(agent.id, "Rewind target");
+  await capable.client.cancelAgent(agent.id);
+  const timeline = await capable.client.fetchAgentTimeline(agent.id, {
+    direction: "tail",
+    projection: "canonical",
+  });
+  const targetMessageId = rewindMessageId(timeline);
+  capable.clear();
+  legacy.clear();
+  await capable.client.rewindAgent(agent.id, targetMessageId, "conversation");
+  await Promise.all([capable.barrier("provider-rewind"), legacy.barrier("provider-rewind")]);
+  function replayItems(client: ConnectedClient) {
+    return client.messages.flatMap((message) =>
+      message.type === "agent_stream" && message.payload.event.type === "timeline"
+        ? [message.payload.event.item]
+        : [],
+    );
+  }
+  expect(replayItems(capable)).toContainEqual(plugin);
+  expect(replayItems(legacy).some((item) => item.type === "plugin")).toBe(false);
+  expect(replayItems(legacy)).toContainEqual(expect.objectContaining({ type: "user_message" }));
+});
+
+async function createAttentionWorkspace(client: DaemonClient): Promise<string> {
+  const result = await client.createWorkspace({
+    source: { kind: "directory", path: daemon.paseoHome },
+  });
+  if (!result.workspace) throw new Error(result.error ?? "Expected workspace");
+  return result.workspace.id;
+}
+
+function rewindMessageId(
+  timeline: Awaited<ReturnType<DaemonClient["fetchAgentTimeline"]>>,
+): string {
+  const target = timeline.entries.find((entry) => entry.item.type === "user_message");
+  if (target?.item.type !== "user_message" || !target.item.messageId)
+    throw new Error("Expected rewind target");
+  return target.item.messageId;
+}
diff --git a/packages/server/src/server/service-proxy.test.ts b/packages/server/src/server/service-proxy.test.ts
index 5313b01d2d..5764b19539 100644
--- a/packages/server/src/server/service-proxy.test.ts
+++ b/packages/server/src/server/service-proxy.test.ts
@@ -32,15 +32,20 @@ function readServerSourceFiles(dir = path.resolve(import.meta.dirname)): string[
 }
 
 interface HttpGetOptions {
+  hostname?: string;
   path?: string;
   headers?: Record<string, string>;
 }
 
 function httpGet(port: number, host: string, options: HttpGetOptions = {}) {
-  const { path: requestPath = "/api/health", headers: extraHeaders = {} } = options;
+  const {
+    hostname = "127.0.0.1",
+    path: requestPath = "/api/health",
+    headers: extraHeaders = {},
+  } = options;
   return new Promise<{ status: number; body: string }>((resolve, reject) => {
     const req = http.get(
-      { hostname: "127.0.0.1", port, path: requestPath, headers: { host, ...extraHeaders } },
+      { hostname, port, path: requestPath, headers: { host, ...extraHeaders } },
       (res) => {
         let body = "";
         res.on("data", (chunk: Buffer) => {
@@ -53,6 +58,31 @@ function httpGet(port: number, host: string, options: HttpGetOptions = {}) {
   });
 }
 
+function httpPost(port: number, host: string, requestPath: string, payload: string) {
+  return new Promise<{ status: number; body: string }>((resolve, reject) => {
+    const request = http.request(
+      {
+        hostname: "127.0.0.1",
+        port,
+        method: "POST",
+        path: requestPath,
+        headers: { host, "content-type": "application/json" },
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (chunk: Buffer) => {
+          body += chunk.toString();
+        });
+        res.on("end", () => resolve({ status: res.statusCode ?? 0, body }));
+        res.on("error", reject);
+      },
+    );
+    request.on("error", reject);
+    request.write(payload.slice(0, 5));
+    request.end(payload.slice(5));
+  });
+}
+
 describe("service proxy subsystem shape", () => {
   it("keeps production imports behind the service-proxy entrypoint", () => {
     const offenders: string[] = [];
@@ -303,6 +333,7 @@ describe("service proxy subsystem shape", () => {
 });
 
 interface ForwardedFixture {
+  upstreamPort: number;
   daemonPort: number;
   hostname: string;
   close(): Promise<void>;
@@ -313,11 +344,16 @@ interface ForwardedFixture {
  * echoes the headers it received so tests can assert what actually crossed the
  * proxy, not what a helper returned.
  */
-async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
-  const upstreamPort = await findFreePort();
+async function startForwardedHeadersFixture(upstreamHost = "127.0.0.1"): Promise<ForwardedFixture> {
   const upstream = http.createServer((req, res) => {
-    res.writeHead(200, { "content-type": "application/json" });
-    res.end(JSON.stringify(req.headers));
+    let body = "";
+    req.on("data", (chunk: Buffer) => {
+      body += chunk.toString();
+    });
+    req.on("end", () => {
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ...req.headers, method: req.method, url: req.url, body }));
+    });
   });
   const upgradeSockets: net.Socket[] = [];
   upstream.on("upgrade", (req, socket) => {
@@ -331,7 +367,11 @@ async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
       `HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nX-Echo-Length: ${payload.length}\r\n\r\n${payload}`,
     );
   });
-  await new Promise<void>((resolve) => upstream.listen(upstreamPort, "127.0.0.1", resolve));
+  await new Promise<void>((resolve, reject) => {
+    upstream.once("error", reject);
+    upstream.listen(0, upstreamHost, resolve);
+  });
+  const upstreamPort = (upstream.address() as net.AddressInfo).port;
 
   const serviceProxy = createServiceProxySubsystem({ logger });
   const route = serviceProxy.registerWorkspaceService({
@@ -354,6 +394,7 @@ async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
   await new Promise<void>((resolve) => daemon.listen(daemonPort, "127.0.0.1", resolve));
 
   return {
+    upstreamPort,
     daemonPort,
     hostname: route.hostname,
     async close() {
@@ -416,6 +457,59 @@ function upgradeThroughProxy(
   });
 }
 
+describe("service proxy loopback services", () => {
+  it.each(["127.0.0.1", "::1"])("forwards HTTP to a service bound only to %s", async (host) => {
+    const fixture = await startForwardedHeadersFixture(host);
+    try {
+      const direct = await httpGet(fixture.upstreamPort, fixture.hostname, { hostname: host });
+      expect(direct.status).toBe(200);
+
+      const response = await httpGet(fixture.daemonPort, fixture.hostname);
+      expect(response.status).toBe(200);
+      expect(JSON.parse(response.body).host).toBe(fixture.hostname);
+    } finally {
+      await fixture.close();
+    }
+  });
+
+  it.each(["127.0.0.1", "::1"])(
+    "streams POST bodies to a service bound only to %s",
+    async (host) => {
+      const fixture = await startForwardedHeadersFixture(host);
+      try {
+        const payload = JSON.stringify({ message: "hello" });
+        const response = await httpPost(
+          fixture.daemonPort,
+          fixture.hostname,
+          "/submit?q=one%20two",
+          payload,
+        );
+        expect(response.status).toBe(200);
+        expect(JSON.parse(response.body)).toMatchObject({
+          host: fixture.hostname,
+          "content-type": "application/json",
+          method: "POST",
+          url: "/submit?q=one%20two",
+          body: payload,
+        });
+      } finally {
+        await fixture.close();
+      }
+    },
+  );
+
+  it.each(["127.0.0.1", "::1"])("forwards upgrades to a service bound only to %s", async (host) => {
+    const fixture = await startForwardedHeadersFixture(host);
+    try {
+      const headers = await upgradeThroughProxy(fixture.daemonPort, fixture.hostname);
+      expect(headers.host).toBe(fixture.hostname);
+      expect(headers.upgrade).toBe("websocket");
+    } finally {
+      await fixture.close();
+    }
+  });
+});
+
 describe("service proxy forwarded headers", () => {
   it("forwards the client authority with its port so services build reachable URLs", async () => {
     const fixture = await startForwardedHeadersFixture();
diff --git a/packages/server/src/server/service-proxy.ts b/packages/server/src/server/service-proxy.ts
index 525a95ac5d..ef93a27f9a 100644
--- a/packages/server/src/server/service-proxy.ts
+++ b/packages/server/src/server/service-proxy.ts
@@ -1,5 +1,6 @@
 import http, { createServer as createHTTPServer } from "node:http";
 import net from "node:net";
+import { connectToLocalService, requestLocalService } from "./local-service-connection.js";
 import { createHash } from "node:crypto";
 import { existsSync, unlinkSync } from "node:fs";
 import type { IncomingMessage } from "node:http";
@@ -328,9 +329,8 @@ function proxyHttpRequest({
 }): void {
   const forwardedHeaders = buildForwardedHeaders({ req, route, protocol: req.protocol });
 
-  const proxyReq = http.request(
+  const proxyReq = requestLocalService(
     {
-      hostname: "127.0.0.1",
       port: route.port,
       path: req.originalUrl,
       method: req.method,
@@ -368,7 +368,8 @@ function proxyUpgradeRequest({
   route: ServiceProxyRoute;
   logger: Logger;
 }): void {
-  const targetSocket = net.connect({ host: "127.0.0.1", port: route.port }, () => {
+  const targetSocket = connectToLocalService(route.port);
+  targetSocket.on("connect", () => {
     const forwardedHeaders = buildForwardedHeaders({ req, route, protocol: "http" });
     forwardedHeaders.connection = "Upgrade";
     forwardedHeaders.upgrade = req.headers.upgrade ?? "websocket";
diff --git a/packages/server/src/server/session-admission-auth.ts b/packages/server/src/server/session-admission-auth.ts
new file mode 100644
index 0000000000..b4195b8d3f
--- /dev/null
+++ b/packages/server/src/server/session-admission-auth.ts
@@ -0,0 +1,37 @@
+import { compare } from "bcryptjs";
+import type { WSHelloMessage } from "@getpaseo/protocol/messages";
+import { OWNER_PERMISSIONS } from "./authorization/index.js";
+import { matchesLocalCredential } from "./local-credential.js";
+import type { SessionAdmission } from "./websocket-server.js";
+
+export type AdmissionFailure = "password_required" | "incorrect_password";
+
+type AdmissionResolution = { admission: SessionAdmission } | { rejection: AdmissionFailure };
+
+export async function resolveSessionAdmission(input: {
+  credential: WSHelloMessage["auth"];
+  passwordHash: string | undefined;
+  localCredential: string | null;
+  transport: "direct" | "relay";
+}): Promise<AdmissionResolution> {
+  const { credential, passwordHash, localCredential, transport } = input;
+  if (!passwordHash) {
+    return { admission: { principalId: "owner", permissions: OWNER_PERMISSIONS } };
+  }
+  if (!credential) {
+    // COMPAT(relayPasswordOptional): added in v0.9.1, remove once release N mobile builds are live on App Store and Play.
+    if (transport === "relay") {
+      return { admission: { principalId: "owner", permissions: OWNER_PERMISSIONS } };
+    }
+    return { rejection: "password_required" };
+  }
+  if (credential.kind === "localCredential") {
+    if (localCredential && matchesLocalCredential(localCredential, credential.token)) {
+      return { admission: { principalId: "owner", permissions: OWNER_PERMISSIONS } };
+    }
+    return { rejection: "incorrect_password" };
+  }
+  return (await compare(credential.password, passwordHash))
+    ? { admission: { principalId: "owner", permissions: OWNER_PERMISSIONS } }
+    : { rejection: "incorrect_password" };
+}
diff --git a/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts b/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
index 94e45d7452..fb23daa6f0 100644
--- a/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
+++ b/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
@@ -1,11 +1,16 @@
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, expect, test } from "vitest";
 
+import { createTestAgentClients } from "./test-utils/fake-agent-client.js";
 import { getFullAccessConfig } from "./daemon-e2e/agent-configs.js";
-import { createDaemonTestContext, type DaemonTestContext } from "./test-utils/index.js";
+import {
+  createDaemonTestContext,
+  DaemonClient,
+  type DaemonTestContext,
+} from "./test-utils/index.js";
 import type { CreateAgentOptions } from "./test-utils/index.js";
 import type { CreateAgentWorktreeTarget } from "./messages.js";
 import { createRealpathAwarePathMatcher } from "../utils/path.js";
@@ -96,6 +101,7 @@ async function expectWorktreeListEmpty(repoDir: string): Promise<void> {
 
 async function createAgentInBranchOffWorktree(options?: {
   autoArchive?: boolean;
+  initialPrompt?: string;
   branchName?: string;
   repoDir?: string;
 }): Promise<{ repoDir: string; agentId: string; worktreePath: string }> {
@@ -112,7 +118,7 @@ async function createAgentInBranchOffWorktree(options?: {
       base: "main",
     },
     ...(options?.autoArchive !== undefined ? { autoArchive: options.autoArchive } : {}),
-    initialPrompt: "Say done.",
+    initialPrompt: options?.initialPrompt ?? "Say done.",
   });
   return { repoDir, agentId: created.id, worktreePath: created.cwd };
 }
@@ -154,12 +160,15 @@ test("create_agent_request creates a worktree and auto-archives both after the f
   // last-reference worktree directory is gone.
   await expectAgentAbsentFromActiveList(created.id);
   await expect.poll(() => existsSync(created.cwd), { timeout: 10000, interval: 100 }).toBe(false);
-  // Archived tabs can continue asking for history. These reads must not recreate
-  // the removed workspace observation or compromise the next agent lifecycle.
+  // Archived tabs can continue asking for history, and those reads are served from
+  // persisted state. They must not recreate the removed worktree or its workspace
+  // observation, and must not compromise the next agent lifecycle.
   const staleTimelineReads = await Promise.allSettled(
     Array.from({ length: 10 }, () => ctx.client.fetchAgentTimeline(created.id, { limit: 20 })),
   );
-  expect(staleTimelineReads.every((result) => result.status === "rejected")).toBe(true);
+  expect(staleTimelineReads.every((result) => result.status === "fulfilled")).toBe(true);
+  expect(existsSync(created.cwd)).toBe(false);
+  expect((await ctx.client.fetchWorkspaces()).entries).toHaveLength(0);
   const subsequent = await ctx.client.createAgent({
     config: { ...getFullAccessConfig("codex"), cwd: repoDir },
     initialPrompt: "Say done.",
@@ -347,24 +356,39 @@ test("archiving a created worktree removes the directory on last reference", asy
 });
 
 test("auto-archiving a created worktree keeps the directory when a sibling workspace references it", async () => {
-  const created = await createAgentInBranchOffWorktree({ autoArchive: true });
-
-  // Create a sibling workspace that shares the same backing directory.
-  const sibling = await ctx.client.createWorkspace({
-    source: { kind: "directory", path: created.worktreePath },
-    title: "sibling",
+  // Hold turn completion while establishing the sibling reference. The original
+  // ordering raced a fast completed turn against sibling workspace creation.
+  await ctx.cleanup();
+  let finishTurn!: () => void;
+  const completion = new Promise<void>((resolve) => {
+    finishTurn = resolve;
   });
-  if (!sibling.workspace) {
-    throw new Error(sibling.error ?? "Failed to create sibling workspace");
+  ctx = await createDaemonTestContext({
+    agentClients: createTestAgentClients({
+      beforeTurnComplete: async (prompt) => {
+        if (prompt === "Hold for sibling workspace") await completion;
+      },
+    }),
+  });
+  try {
+    const created = await createAgentInBranchOffWorktree({
+      autoArchive: true,
+      initialPrompt: "Hold for sibling workspace",
+    });
+    const sibling = await ctx.client.createWorkspace({
+      source: { kind: "directory", path: created.worktreePath },
+      title: "sibling",
+    });
+    if (!sibling.workspace) throw new Error(sibling.error ?? "Failed to create sibling workspace");
+    finishTurn();
+    await ctx.client.waitForFinish(created.agentId, 10000);
+    await expectAgentAbsentFromActiveList(created.agentId);
+    await expectWorktreePresentInList(created.repoDir, created.worktreePath);
+    expect(existsSync(created.worktreePath)).toBe(true);
+    await ctx.client.archivePaseoWorktree({ worktreePath: created.worktreePath });
+  } finally {
+    finishTurn();
   }
-
-  await ctx.client.waitForFinish(created.agentId, 10000);
-
-  await expectAgentAbsentFromActiveList(created.agentId);
-  await expectWorktreePresentInList(created.repoDir, created.worktreePath);
-  expect(existsSync(created.worktreePath)).toBe(true);
-
-  await ctx.client.archivePaseoWorktree({ worktreePath: created.worktreePath });
 });
 
 test("create_agent_request rejects legacy git options before creating a worktree", async () => {
@@ -413,3 +437,248 @@ test("create_agent_request fails cleanly when worktree creation cannot resolve t
   await expectActiveAgentListEmpty();
   await expectWorktreeListEmpty(repoDir);
 });
+
+/** Every agent id with a record under `$PASEO_HOME/agents`, whatever its cwd bucket. */
+function storedAgentIds(): string[] {
+  const root = path.join(ctx.daemon.paseoHome, "agents");
+  if (!existsSync(root)) return [];
+  return readdirSync(root, { recursive: true, encoding: "utf8" })
+    .filter((entry) => entry.endsWith(".json"))
+    .map((entry) => path.basename(entry, ".json"));
+}
+
+test.each(["git", "worktreeName"] as const)(
+  "legacy %s worktree creation resolves final workspace visibility without intermediate records",
+  async (placement) => {
+    const cwd = createGitRepo();
+    const config = { ...getFullAccessConfig("codex"), cwd };
+    const backgroundCaller = await ctx.client.createAgent({ config, background: true });
+    const visibleCaller = await ctx.client.createAgent({ config });
+    const cases = [
+      { name: "review", background: true, expected: true },
+      { name: "review-child", callerAgentId: backgroundCaller.id, expected: true },
+      {
+        name: "visible-child",
+        callerAgentId: backgroundCaller.id,
+        background: false,
+        expected: false,
+      },
+      { name: "hidden-child", callerAgentId: visibleCaller.id, background: true, expected: true },
+      { name: "human-default", expected: false },
+    ];
+    const orderedCases =
+      placement === "worktreeName" ? [cases[1]!, cases[0]!, ...cases.slice(2)] : cases;
+    for (const entry of orderedCases) {
+      const before = await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } });
+      const child = await ctx.client.createAgent({
+        config,
+        ...(entry.callerAgentId ? { callerAgentId: entry.callerAgentId } : {}),
+        ...(entry.background !== undefined ? { background: entry.background } : {}),
+        ...(placement === "git"
+          ? {
+              git: {
+                createWorktree: true,
+                createNewBranch: true,
+                newBranchName: entry.name,
+                baseBranch: "main",
+              },
+            }
+          : { worktreeName: entry.name }),
+      });
+      const inclusive = await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } });
+      const created = inclusive.entries.filter(
+        (workspace) => !before.entries.some((existing) => existing.id === workspace.id),
+      );
+      expect(created).toHaveLength(1);
+      expect(created[0]).toMatchObject({
+        id: child.workspaceId,
+        workspaceDirectory: child.cwd,
+        background: entry.expected,
+        workspaceKind: "worktree",
+      });
+      expect(child.cwd).not.toBe(cwd);
+      expect(child.labels?.["paseo.parent-agent-id"]).toBe(entry.callerAgentId);
+      const defaultAgents = await ctx.client.fetchAgents();
+      const allAgents = await ctx.client.fetchAgents({ filter: { includeBackground: true } });
+      expect(defaultAgents.entries.some((item) => item.agent.id === child.id)).toBe(
+        !entry.expected,
+      );
+      expect(allAgents.entries.some((item) => item.agent.id === child.id)).toBe(true);
+      const defaultWorkspaces = await ctx.client.fetchWorkspaces();
+      expect(
+        defaultWorkspaces.entries.some((workspace) => workspace.id === child.workspaceId),
+      ).toBe(!entry.expected);
+    }
+  },
+  30_000,
+);
+
+test("background workspaces keep durable agents addressable through restart and archive", async () => {
+  const cwd = createGitRepo();
+  const config = { ...getFullAccessConfig("codex"), cwd };
+  const hidden = await ctx.client.createAgent({
+    config,
+    background: true,
+    idempotencyKey: "background-durable",
+  });
+  expect(hidden.internal).not.toBe(true);
+  expect(
+    (await ctx.client.fetchWorkspaces({ filter: { query: hidden.workspaceId } })).entries.map(
+      (entry) => entry.id,
+    ),
+  ).toContain(hidden.workspaceId);
+  expect(storedAgentIds()).toContain(hidden.id);
+  expect((await ctx.client.fetchWorkspaces()).entries).not.toContainEqual(
+    expect.objectContaining({ id: hidden.workspaceId }),
+  );
+  expect(
+    (await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } })).entries,
+  ).toContainEqual(expect.objectContaining({ id: hidden.workspaceId, background: true }));
+  expect((await ctx.client.fetchAgents()).entries.map((entry) => entry.agent.id)).not.toContain(
+    hidden.id,
+  );
+  expect(
+    (await ctx.client.fetchAgents({ filter: { includeBackground: true } })).entries.map(
+      (entry) => entry.agent.id,
+    ),
+  ).toContain(hidden.id);
+  const child = await ctx.client.createAgent({ config, callerAgentId: hidden.id });
+  expect(child.workspaceId).toBe(hidden.workspaceId);
+  const inherited = await ctx.client.createWorkspace({
+    source: { kind: "directory", path: cwd },
+    callerAgentId: hidden.id,
+  });
+  expect(inherited.workspace?.background).toBe(true);
+  const visible = await ctx.client.createWorkspace({
+    source: { kind: "directory", path: cwd },
+    callerAgentId: hidden.id,
+    background: false,
+  });
+  expect(visible.workspace?.background).toBe(false);
+  const inheritedWorktree = await ctx.client.createAgent({
+    config,
+    callerAgentId: hidden.id,
+    worktree: { mode: "branch-off", newBranch: "background-child", base: "main" },
+  });
+  const overriddenWorktree = await ctx.client.createAgent({
+    config,
+    callerAgentId: hidden.id,
+    background: false,
+    worktree: { mode: "branch-off", newBranch: "visible-child", base: "main" },
+  });
+  const workspaces = (await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } }))
+    .entries;
+  expect(workspaces.find((entry) => entry.id === inheritedWorktree.workspaceId)?.background).toBe(
+    true,
+  );
+  expect(workspaces.find((entry) => entry.id === overriddenWorktree.workspaceId)?.background).toBe(
+    false,
+  );
+
+  await expect(
+    ctx.client.createAgent({ config, workspaceId: hidden.workspaceId, background: false }),
+  ).rejects.toThrow("workspace creation intent");
+  await ctx.client.sendAgentMessage(hidden.id, "Say done.");
+  await ctx.client.waitForFinish(hidden.id, 10_000);
+  expect(
+    (await ctx.client.fetchAgentTimeline(hidden.id, { limit: 20 })).entries.length,
+  ).toBeGreaterThan(0);
+  const homeRoot = path.dirname(ctx.daemon.paseoHome);
+  tempRoots.push(ctx.daemon.staticDir);
+  await ctx.client.close();
+  await ctx.daemon.daemon.stop();
+  await ctx.daemon.daemon.agentManager.flush();
+  ctx = await createDaemonTestContext({ paseoHomeRoot: homeRoot });
+  const replay = await ctx.client.createAgent({
+    config,
+    background: true,
+    idempotencyKey: "background-durable",
+  });
+  expect(replay.id).toBe(hidden.id);
+  expect((await ctx.client.fetchAgent(hidden.id))?.agent.workspaceId).toBe(hidden.workspaceId);
+  await ctx.client.sendAgentMessage(hidden.id, "Say done again.");
+  await ctx.client.waitForFinish(hidden.id, 10_000);
+  await ctx.client.archiveAgent(hidden.id);
+  expect((await ctx.client.fetchAgent(hidden.id))?.agent.archivedAt).toEqual(expect.any(String));
+  expect(
+    (await ctx.client.fetchAgentHistory()).entries.map((entry) => entry.agent.id),
+  ).not.toContain(hidden.id);
+  expect(
+    (await ctx.client.fetchAgentHistory({ filter: { includeBackground: true } })).entries.map(
+      (entry) => entry.agent.id,
+    ),
+  ).toContain(hidden.id);
+}, 30_000);
+
+test("default and inclusive observers retain independent snapshots, live updates and catch-up", async () => {
+  const otherClient = new DaemonClient({ url: `ws://127.0.0.1:${ctx.daemon.port}/ws` });
+  await otherClient.connect();
+  try {
+    const cwd = createGitRepo();
+    const config = { ...getFullAccessConfig("codex"), cwd };
+    const hidden = await ctx.client.createAgent({ config, background: true });
+    const visible = await ctx.client.createAgent({ config });
+    const inclusive = ctx.client.observeAgents({
+      scope: "active",
+      sync: {},
+      includeBackground: true,
+    });
+    const ordinary = otherClient.observeAgents({ scope: "active", sync: {} });
+    const inclusiveSnapshot = await inclusive.ready;
+    const defaultSnapshot = await ordinary.ready;
+    expect(inclusiveSnapshot.entries.map((entry) => entry.agent.id)).toContain(hidden.id);
+    expect(defaultSnapshot.entries.map((entry) => entry.agent.id)).toEqual([visible.id]);
+    const inclusiveWorkspaces = ctx.client.observeWorkspaces({ sync: {}, includeBackground: true });
+    const ordinaryWorkspaces = otherClient.observeWorkspaces({ sync: {} });
+    const full = await inclusiveWorkspaces.ready;
+    const partial = await ordinaryWorkspaces.ready;
+    expect(full.entries.map((entry) => entry.id)).toContain(hidden.workspaceId);
+    expect(partial.entries.map((entry) => entry.id)).not.toContain(hidden.workspaceId);
+    const received: string[] = [];
+    const defaultReceived: string[] = [];
+    inclusive.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "agent_update" && message.payload.kind === "upsert")
+          received.push(message.payload.agent.id);
+      },
+    });
+    ordinary.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "agent_update" && message.payload.kind === "upsert")
+          defaultReceived.push(message.payload.agent.id);
+      },
+    });
+    await ctx.client.sendAgentMessage(hidden.id, "Say done.");
+    await ctx.client.waitForFinish(hidden.id, 10_000);
+    await expect.poll(() => received).toContain(hidden.id);
+    expect(defaultReceived).not.toContain(hidden.id);
+    const catchup = await ctx.client.fetchAgents({
+      scope: "active",
+      includeBackground: true,
+      sync: {
+        generation: inclusiveSnapshot.sync?.generation,
+        afterSeq: inclusiveSnapshot.sync?.headSeq,
+      },
+    });
+    expect(catchup.sync?.mode).toBe("changes");
+    expect(catchup.sync?.removals.map((item) => item.id)).not.toContain(hidden.id);
+    const scopeChanged = await ctx.client.fetchAgents({
+      scope: "active",
+      includeBackground: true,
+      sync: {
+        generation: defaultSnapshot.sync?.generation,
+        afterSeq: defaultSnapshot.sync?.headSeq,
+      },
+    });
+    expect(scopeChanged.sync?.mode).toBe("snapshot");
+    expect(scopeChanged.entries.map((entry) => entry.agent.id)).toContain(hidden.id);
+    await inclusive.release();
+    await ordinary.release();
+    await inclusiveWorkspaces.release();
+    await ordinaryWorkspaces.release();
+  } finally {
+    await otherClient.close();
+  }
+}, 30_000);
diff --git a/packages/server/src/server/session.test.ts b/packages/server/src/server/session.test.ts
index af9fd2d539..e114d8b26e 100644
--- a/packages/server/src/server/session.test.ts
+++ b/packages/server/src/server/session.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 import { execSync } from "child_process";
 import { existsSync, mkdtempSync, realpathSync, rmSync, symlinkSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
@@ -41,6 +45,8 @@ import {
   asGitHubService,
   asWorkspaceGitService,
   asDaemonConfigStore,
+  findByType,
+  createProviderSnapshot,
   createProviderSnapshotManagerStub,
 } from "./test-utils/session-stubs.js";
 import { isPlatform } from "../test-utils/platform.js";
@@ -361,6 +367,8 @@ function createSessionForTest(options: SessionForTestOptions = {}): Session {
   const messages = options.messages ?? [];
 
   const sessionOptions: SessionOptions = {
+    messageReceipts: createMessageReceiptsStub(),
+    creationService: createTestCreationService(),
     clientId: options.clientId ?? "test-client",
     onMessage: (message) => messages.push(message),
     ...(options.targetedMessages
@@ -368,7 +376,10 @@ function createSessionForTest(options: SessionForTestOptions = {}): Session {
           onMessageToSource: (source: object, message: SessionOutboundMessage) =>
             options.targetedMessages?.push({ source, message }),
         }
-      : {}),
+      : {
+          onMessageToSource: (_source: object, message: SessionOutboundMessage) =>
+            messages.push(message),
+        }),
     onBinaryMessage: createBinaryMessageHandler(options.binaryMessages),
     logger,
     downloadTokenStore: options.downloadTokenStore ?? asDownloadTokenStore(),
@@ -485,7 +496,11 @@ test("routes plugin requests and releases its owned catalog subscription on clea
     status: "running" as const,
   };
   const pluginRuntime: NonNullable<SessionOptions["pluginRuntime"]> = {
-    listPlugins: () => [plugin],
+    before: async (_name, request) => {
+      return request;
+    },
+    emit: () => {},
+    listPlugins: async () => [plugin],
     getLogs: () => [
       {
         sequence: 1,
@@ -506,9 +521,17 @@ test("routes plugin requests and releases its owned catalog subscription on clea
     },
     catalog: () => [{ id: "example", clientBundle: "bundle" }],
     invokePluginRpc: async () => ({ ok: true }),
+    listUsageReports: async () => [],
+    listLegacyUsage: async () => ({ fetchedAt: "2026-01-01T00:00:00.000Z", providers: [] }),
   };
   const session = createSessionForTest({ messages, pluginRuntime });
 
+  await session.handleMessage({
+    type: "session.events.set_subscription.request",
+    requestId: "catalog",
+    events: ["status.plugin_catalog_changed"],
+  });
+  messages.length = 0;
   await session.handleMessage({ type: "plugin.list.request", requestId: "list" });
   await session.handleMessage({
     type: "plugin.logs.get.request",
@@ -1300,43 +1323,56 @@ describe("workspace file access (behavior preservation)", () => {
     const messages: SessionOutboundMessage[] = [];
     const session = createSessionForTest({ messages, paseoHome });
 
-    await session.handleMessage({
-      type: "file.upload.request",
-      fileName: "notes.txt",
-      mimeType: "text/plain",
-      size: 11,
-      modifiedAt: "2026-05-02T00:00:00.000Z",
-      requestId: "req-upload",
-    });
-    await session.handleBinaryFrame({
-      kind: "file_transfer",
-      frame: uploadFrame({
-        opcode: FileTransferOpcode.FileBegin,
+    const source = {};
+    await session.handleMessage(
+      {
+        type: "file.upload.request",
+        fileName: "notes.txt",
+        mimeType: "text/plain",
+        size: 11,
+        modifiedAt: "2026-05-02T00:00:00.000Z",
         requestId: "req-upload",
-        metadata: {
-          mime: "text/plain",
-          size: 11,
-          encoding: "binary",
-          modifiedAt: "2026-05-02T00:00:00.000Z",
-          fileName: "notes.txt",
-        },
-      }),
-    });
-    await session.handleBinaryFrame({
-      kind: "file_transfer",
-      frame: uploadFrame({
-        opcode: FileTransferOpcode.FileChunk,
-        requestId: "req-upload",
-        payload: new TextEncoder().encode("hello world"),
-      }),
-    });
-    await session.handleBinaryFrame({
-      kind: "file_transfer",
-      frame: uploadFrame({
-        opcode: FileTransferOpcode.FileEnd,
-        requestId: "req-upload",
-      }),
-    });
+      },
+      source,
+    );
+    await session.handleBinaryFrame(
+      {
+        kind: "file_transfer",
+        frame: uploadFrame({
+          opcode: FileTransferOpcode.FileBegin,
+          requestId: "req-upload",
+          metadata: {
+            mime: "text/plain",
+            size: 11,
+            encoding: "binary",
+            modifiedAt: "2026-05-02T00:00:00.000Z",
+            fileName: "notes.txt",
+          },
+        }),
+      },
+      source,
+    );
+    await session.handleBinaryFrame(
+      {
+        kind: "file_transfer",
+        frame: uploadFrame({
+          opcode: FileTransferOpcode.FileChunk,
+          requestId: "req-upload",
+          payload: new TextEncoder().encode("hello world"),
+        }),
+      },
+      source,
+    );
+    await session.handleBinaryFrame(
+      {
+        kind: "file_transfer",
+        frame: uploadFrame({
+          opcode: FileTransferOpcode.FileEnd,
+          requestId: "req-upload",
+        }),
+      },
+      source,
+    );
 
     const response = messages.find((message) => message.type === "file.upload.response");
     if (response?.type !== "file.upload.response") {
@@ -2145,13 +2181,15 @@ describe("session provider refresh cwd routing", () => {
       getSnapshot,
       warmUpSnapshotForCwd,
     } = createProviderSnapshotManagerStub();
-    getSnapshot.mockReturnValue([
-      {
-        provider: "codex",
-        status: "loading",
-        enabled: true,
-      },
-    ]);
+    getSnapshot.mockReturnValue(
+      createProviderSnapshot([
+        {
+          provider: "codex",
+          status: "loading",
+          enabled: true,
+        },
+      ]),
+    );
     const session = createSessionForTest({ messages, providerSnapshotManager });
 
     await session.handleMessage({
@@ -2176,13 +2214,15 @@ describe("session provider refresh cwd routing", () => {
     const messages: unknown[] = [];
     const { manager: providerSnapshotManager, warmUpSnapshotForCwd } =
       createProviderSnapshotManagerStub();
-    providerSnapshotManager.getSnapshot = vi.fn(() => [
-      {
-        provider: "codex",
-        status: "loading",
-        enabled: false,
-      },
-    ]);
+    providerSnapshotManager.getSnapshot = vi.fn(() =>
+      createProviderSnapshot([
+        {
+          provider: "codex",
+          status: "loading",
+          enabled: false,
+        },
+      ]),
+    );
     const session = createSessionForTest({ messages, providerSnapshotManager });
 
     await session.handleMessage({
@@ -2207,13 +2247,15 @@ describe("session provider refresh cwd routing", () => {
     const messages: unknown[] = [];
     const { manager: providerSnapshotManager, warmUpSnapshotForCwd } =
       createProviderSnapshotManagerStub();
-    providerSnapshotManager.getSnapshot = vi.fn(() => [
-      {
-        provider: "codex",
-        status: "loading",
-        enabled: false,
-      },
-    ]);
+    providerSnapshotManager.getSnapshot = vi.fn(() =>
+      createProviderSnapshot([
+        {
+          provider: "codex",
+          status: "loading",
+          enabled: false,
+        },
+      ]),
+    );
     const session = createSessionForTest({ messages, providerSnapshotManager });
 
     await session.handleMessage({
@@ -2242,23 +2284,27 @@ describe("session provider refresh cwd routing", () => {
       getSnapshot,
       warmUpSnapshotForCwd,
     } = createProviderSnapshotManagerStub();
-    getSnapshot.mockReturnValueOnce([
-      {
-        provider: "codex",
-        status: "loading",
-        enabled: true,
-      },
-    ]);
-    getSnapshot.mockReturnValue([
-      {
-        provider: "codex",
-        status: "ready",
-        enabled: true,
-        models: [{ provider: "codex", id: "gpt-5.4", label: "GPT-5.4" }],
-        modes: [],
-        fetchedAt: "2026-05-28T00:00:00.000Z",
-      },
-    ]);
+    getSnapshot.mockReturnValueOnce(
+      createProviderSnapshot([
+        {
+          provider: "codex",
+          status: "loading",
+          enabled: true,
+        },
+      ]),
+    );
+    getSnapshot.mockReturnValue(
+      createProviderSnapshot([
+        {
+          provider: "codex",
+          status: "ready",
+          enabled: true,
+          models: [{ provider: "codex", id: "gpt-5.4", label: "GPT-5.4" }],
+          modes: [],
+          fetchedAt: "2026-05-28T00:00:00.000Z",
+        },
+      ]),
+    );
     warmUpSnapshotForCwd.mockReturnValue(warmupDeferred.promise);
     const session = createSessionForTest({ messages, providerSnapshotManager });
 
@@ -2413,10 +2459,14 @@ describe("session checkout merge handling", () => {
       requestId: "request-merge-from-base-success",
     });
 
-    expect(checkoutGitMocks.mergeFromBase).toHaveBeenCalledWith("/tmp/request-worktree", {
-      baseRef: "main",
-      requireCleanTarget: true,
-    });
+    expect(checkoutGitMocks.mergeFromBase).toHaveBeenCalledWith(
+      "/tmp/request-worktree",
+      {
+        baseRef: "main",
+        requireCleanTarget: true,
+      },
+      { paseoHome: "/tmp/paseo-home", worktreesRoot: undefined },
+    );
     expect(workspaceGitService.getSnapshot).toHaveBeenCalledWith("/tmp/request-worktree", {
       force: true,
       reason: "merge-from-base",
@@ -2873,6 +2923,7 @@ diff --git a/file.txt b/file.txt
         base: "main",
       },
       expect.anything(),
+      { paseoHome: "/tmp/paseo-home", worktreesRoot: undefined },
     );
     expect(messages).toContainEqual({
       type: "checkout_pr_create_response",
@@ -2997,6 +3048,7 @@ diff --git a/file.txt b/file.txt
         base: "main",
       },
       expect.anything(),
+      { paseoHome: "/tmp/paseo-home", worktreesRoot: undefined },
     );
     expect(messages).toContainEqual({
       type: "checkout_pr_create_response",
@@ -5182,6 +5234,7 @@ test("acknowledges a timeline subscription only to its socket source", async ()
         payload: {
           agentIds: ["agent-a"],
           requestId: "timeline-subscription-targeted",
+          subscriptionId: expect.any(String),
         },
       },
     },
@@ -5194,6 +5247,7 @@ test("unions viewed timelines across socket sources and removes detached sources
   const session = createSessionForTest({
     messages,
     agentManager: {
+      getAgent: (id: string) => ({ id, internal: false }),
       subscribe: vi.fn((listener: (event: AgentManagerEvent) => void) => {
         agentEventListeners.push(listener);
         return () => {};
@@ -5301,6 +5355,7 @@ test("keeps selective delivery scoped per socket when a retained session also ha
     messages,
     targetedMessages,
     agentManager: {
+      getAgent: (id: string) => ({ id, internal: false }),
       subscribe: vi.fn((listener: (event: AgentManagerEvent) => void) => {
         agentEventListeners.push(listener);
         return () => {};
@@ -5692,3 +5747,70 @@ describe("agent config setters", () => {
     });
   });
 });
+
+test("provider snapshots preserve versionless visibility while capabilities update independently", async () => {
+  const messages: SessionOutboundMessage[] = [];
+  const { manager } = createProviderSnapshotManagerStub();
+  manager.getSnapshot = () =>
+    createProviderSnapshot([
+      {
+        provider: "codex",
+        status: "ready",
+        enabled: true,
+        modes: [{ id: "default", label: "Default", icon: "Sparkles" }],
+      },
+      { provider: "plugin-provider", status: "ready", enabled: true },
+    ]);
+  const session = createSessionForTest({ messages, providerSnapshotManager: manager });
+  const source = {};
+  session.updateClientCapabilities(null, source);
+  const read = async () => {
+    messages.length = 0;
+    await session.handleMessage(
+      {
+        type: "get_providers_snapshot_request",
+        requestId: "visibility",
+      },
+      source,
+    );
+    return findByType(messages, "get_providers_snapshot_response")!.payload;
+  };
+  const versionless = await read();
+  expect(versionless.entries.map((entry) => entry.provider)).toEqual(["codex"]);
+  expect(versionless.entries[0]!.modes![0]!.icon).toBe("ShieldCheck");
+  session.updateClientCapabilities(
+    {
+      [CLIENT_CAPS.customModeIcons]: true,
+      [CLIENT_CAPS.providerSnapshotReferences]: true,
+    },
+    source,
+  );
+  const iconsOnly = await read();
+  expect(iconsOnly.entries.map((entry) => entry.provider)).toEqual(["codex"]);
+  expect(iconsOnly.entries[0]!.modes![0]!.icon).toBe("Sparkles");
+  expect(iconsOnly.snapshotHash).toBeUndefined();
+  session.updateClientCapabilities(
+    { [CLIENT_CAPS.customModeIcons]: true, [CLIENT_CAPS.providerSnapshotReferences]: true },
+    source,
+    "0.1.45",
+  );
+  expect((await read()).entries.map((entry) => entry.provider)).toEqual([
+    "codex",
+    "plugin-provider",
+  ]);
+  session.updateClientCapabilities(
+    {
+      [CLIENT_CAPS.compactProviderSnapshots]: true,
+      [CLIENT_CAPS.providerSnapshotReferences]: true,
+    },
+    source,
+    "0.1.45",
+  );
+  const references = await read();
+  expect(references.entries).toEqual([]);
+  expect(references.compactSnapshot!.entries.map((entry) => entry.provider)).toEqual([
+    "codex",
+    "plugin-provider",
+  ]);
+  expect(references.compactSnapshot!.entries[0]!.modes![0]!.icon).toBe("ShieldCheck");
+});
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index bb07240014..08d3f0eefb 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -1,7 +1,22 @@
+import { AgentDirectory } from "./agent/directory.js";
+import { searchTimeline } from "./agent/chat-search/index.js";
+import type { BrowserToolsBroker } from "./browser-tools/broker.js";
+import { BrowserAutomationHostCapabilitySchema } from "@getpaseo/protocol/browser-automation/capabilities";
+import type {
+  SessionEventSubscription,
+  UsageReportEntry,
+  ProviderUsage,
+} from "@getpaseo/protocol/messages";
+import { relative } from "node:path";
+import { isAbsolute } from "node:path";
+import { CreationService, type CreatedAgent } from "./creation/index.js";
+import type { CreationSnapshot, AgentCreateRequest } from "@getpaseo/protocol/messages";
+import type { MessageReceipts } from "./message-receipts/index.js";
 import equal from "fast-deep-equal";
+import { SessionDelivery, type OwnedSubscription } from "./session/owned-subscriptions/index.js";
 import { v4 as uuidv4 } from "uuid";
 import { lstat, mkdir, mkdtemp, rename, rm, stat } from "node:fs/promises";
-import { basename, resolve, sep } from "path";
+import { basename, join, resolve, sep } from "path";
 import { homedir } from "node:os";
 import { CLIENT_CAPS, type ClientCapability } from "@getpaseo/protocol/client-capabilities";
 import { formatPluginSourceReference } from "@getpaseo/protocol/plugin-source-reference";
@@ -12,6 +27,7 @@ import {
   type FirstAgentContext,
   type SessionInboundMessage,
   type SessionOutboundMessage,
+  type ScriptStatusUpdateMessage,
   type GitSetupOptions,
   type StartWorkspaceScriptRequest,
   type WorkspaceScriptListRequest,
@@ -32,12 +48,13 @@ import type { TerminalActivity } from "@getpaseo/protocol/terminal-activity";
 import type { BinaryFrame } from "@getpaseo/protocol/binary-frames/index";
 import { CursorError } from "./pagination/cursor.js";
 import { SortablePager, type SortSpec } from "./pagination/sortable-pager.js";
-import { describeAgentHistoryMatches, rankAgentHistoryCandidates } from "./agent-history-search.js";
+import { matchesAgentHistoryQuery } from "./agent-history-search.js";
 import type { SpeechToTextProvider, TextToSpeechProvider } from "./speech/speech-provider.js";
 import type { TurnDetectionProvider } from "./speech/turn-detection-provider.js";
 import {
   buildConfigOverrides,
   isStoredAgentProviderAvailable,
+  resolveStoredAgentUpdatedAt,
   toAgentPersistenceHandle,
 } from "./persistence-hooks.js";
 import { ensureAgentLoaded, ensureUnarchivedAgentLoaded } from "./agent/agent-loading.js";
@@ -103,23 +120,13 @@ import {
   setAgentModeCommand,
   updateAgentCommand,
 } from "./agent/lifecycle-command.js";
-import {
-  buildStoredAgentPayload,
-  resolveStoredAgentPayloadUpdatedAt,
-  toAgentPayload,
-} from "./agent/agent-projections.js";
+import { buildStoredAgentPayload, toAgentPayload } from "./agent/agent-projections.js";
 import {
   appendTimelineItemIfAgentKnown,
   emitLiveTimelineItemIfAgentKnown,
 } from "./agent/timeline-append.js";
 import { assertPluginTimelineDataSize } from "./agent/agent-timeline-content.js";
 import { parsePluginClientId } from "./plugins/plugin-session-identity.js";
-import {
-  projectTimelineRows,
-  selectProjectedTimelinePage,
-  type TimelineProjectionEntry,
-  type TimelineProjectionMode,
-} from "./agent/timeline-projection.js";
 import { buildAgentForkContextAttachment } from "./agent/activity-curator.js";
 import { buildAgentPrompt } from "./agent/prompt-attachments.js";
 import type { StructuredGenerationDaemonConfig } from "./agent/structured-generation-providers.js";
@@ -162,7 +169,7 @@ import {
   removeProjectCustomIcon,
   setProjectCustomIcon,
 } from "../utils/project-custom-icon.js";
-import { VoiceSession } from "./session/voice/voice-session.js";
+import { VoiceSessions } from "./session/voice/index.js";
 import { CheckoutSession } from "./session/checkout/checkout-session.js";
 import {
   createWorkspaceGitObserverService,
@@ -174,6 +181,7 @@ import {
 } from "./session/checkout/git-metadata-generator.js";
 import { ScheduleSession } from "./session/schedule/schedule-session.js";
 import { ProviderCatalogSession } from "./session/provider/provider-catalog-session.js";
+import { UsageSession } from "./session/usage/usage-session.js";
 import { WorkspaceFilesSession } from "./session/files/workspace-files-session.js";
 import { AgentConfigSession } from "./session/agent-config/agent-config-session.js";
 import { ProjectConfigSession } from "./session/project-config/project-config-session.js";
@@ -196,7 +204,6 @@ import {
 } from "./session/git-mutation/git-mutation-service.js";
 import {
   createWorkspaceProvisioningService,
-  WorkspaceProvisioningError,
   type WorkspaceProvisioningService,
 } from "./session/workspace-provisioning/workspace-provisioning-service.js";
 import {
@@ -226,8 +233,8 @@ import {
   type GitHubService,
 } from "../services/github-service.js";
 import type { ForgeService } from "../services/forge-service.js";
-import type { ProviderUsageService } from "../services/quota-fetcher/service.js";
 import {
+  resolveWorkspaceRootAgent,
   summarizeFetchWorkspacesEntries,
   workspaceIdsOnCheckout,
   WorkspaceDirectory,
@@ -242,6 +249,7 @@ import {
 import { WorkspaceAutoName } from "./workspace-auto-name.js";
 import {
   buildAgentSessionConfig as buildWorktreeAgentSessionConfig,
+  normalizeAgentCreationGitOptions,
   createPaseoWorktreeWorkflow as createWorktreeWorkflow,
   type CreatePaseoWorktreeSetupContinuationInput,
   type CreatePaseoWorktreeWorkflowResult,
@@ -287,17 +295,6 @@ function errorToFriendlyMessage(error: unknown): string {
   return "Unknown error";
 }
 
-function resolveSubscriptionId(
-  subscribe: unknown,
-  requestedSubscriptionId: string | undefined,
-): string | null {
-  if (!subscribe) return null;
-  if (requestedSubscriptionId && requestedSubscriptionId.length > 0) {
-    return requestedSubscriptionId;
-  }
-  return uuidv4();
-}
-
 function isAppVersionAtLeast(appVersion: string | null, minVersion: string): boolean {
   if (!appVersion) return false;
   // Strip prerelease suffix: "0.1.45-beta.4" -> "0.1.45"
@@ -410,6 +407,7 @@ type WorkspaceUpdatePayload = Extract<
 >["payload"];
 interface WorkspaceUpdatesSubscriptionState {
   subscriptionId: string;
+  owner: OwnedSubscription;
   syncEnabled?: boolean;
   filter?: WorkspaceUpdatesFilter;
   isBootstrapping: boolean;
@@ -443,6 +441,7 @@ const nodeSessionFileSystem: SessionFileSystem = {
 type AgentMcpTransportFactory = () => Promise<unknown>;
 
 export interface SessionOptions {
+  browserToolsBroker?: BrowserToolsBroker | null;
   clientId: string;
   permissions: readonly DaemonPermission[];
   appVersion?: string | null;
@@ -451,9 +450,10 @@ export interface SessionOptions {
   onMessageToSource?: (source: object, msg: SessionOutboundMessage) => void;
   onBinaryMessage?: (frame: Uint8Array) => void;
   onBinaryMessageToSource?: (source: object, frame: Uint8Array) => Promise<void>;
-  getTransportBufferedAmount?: () => number | null;
+  getTransportBufferedAmount?: (source?: object) => number | null;
   onLifecycleIntent?: (intent: SessionLifecycleIntent) => void;
   onWorkspaceRecovered?: (workspace: PersistedWorkspaceRecord) => Promise<void>;
+  publishScriptStatusUpdate?: (message: ScriptStatusUpdateMessage) => void;
   logger: pino.Logger;
   downloadTokenStore: DownloadTokenStore;
   pushNotifications: PushNotifications;
@@ -461,6 +461,8 @@ export interface SessionOptions {
   worktreesRoot?: string;
   agentManager: AgentManager;
   agentStorage: AgentStorage;
+  messageReceipts: Pick<MessageReceipts, "send">;
+  creationService: Pick<CreationService, "create" | "subscribe">;
   projectRegistry: ProjectRegistry;
   workspaceRegistry: WorkspaceRegistry;
   directorySync?: DirectorySyncService;
@@ -477,7 +479,9 @@ export interface SessionOptions {
   workspaceAutoName: WorkspaceAutoName;
   daemonConfigStore: DaemonConfigStore;
   pluginRuntime?: {
-    listPlugins(): import("@getpaseo/protocol/messages").PluginListItem[];
+    before: import("./plugins/lifecycle/index.js").PluginLifecycle["before"];
+    emit: import("./plugins/lifecycle/index.js").PluginLifecycle["emit"];
+    listPlugins(): Promise<import("@getpaseo/protocol/messages").PluginListItem[]>;
     getLogs(pluginId: string): import("@getpaseo/protocol/messages").PluginLogEntry[];
     installDirectory(input: {
       path: string;
@@ -492,6 +496,13 @@ export interface SessionOptions {
     statusSources(
       pluginId?: string,
     ): Promise<import("@getpaseo/protocol/messages").PluginSourceStatusItem[]>;
+    previewUpdates(input: {
+      pluginId?: string;
+      target?: import("@getpaseo/protocol/messages").PluginUpdateSelection;
+    }): Promise<import("@getpaseo/protocol/messages").PluginUpdatePreview[]>;
+    applyUpdates(
+      proposals: import("@getpaseo/protocol/messages").PluginUpdateProposal[],
+    ): Promise<import("@getpaseo/protocol/messages").PluginUpdateResult[]>;
     updateSources(
       pluginId?: string,
     ): Promise<import("@getpaseo/protocol/messages").PluginSourceUpdateItem[]>;
@@ -500,8 +511,14 @@ export interface SessionOptions {
     disablePlugin(pluginId: string): Promise<import("@getpaseo/protocol/messages").PluginListItem>;
     removePlugin(pluginId: string): Promise<void>;
     subscribe(listener: (pluginId: string) => void): () => void;
+    subscribeSettings?(listener: (pluginId: string, settingsId: string) => void): () => void;
     catalog(): Array<{ id: string; clientBundle: string }>;
     invokePluginRpc(pluginId: string, method: string, input: unknown): Promise<unknown>;
+    listUsageReports(options?: {
+      forceRefresh?: boolean;
+      reportIds?: string[];
+    }): Promise<UsageReportEntry[]>;
+    listLegacyUsage(): Promise<{ fetchedAt: string; providers: ProviderUsage[] }>;
   };
   orchestrationSkills?: import("./orchestration-skills/index.js").OrchestrationSkills;
   mcpBaseUrl?: string | null;
@@ -510,7 +527,6 @@ export interface SessionOptions {
   tts: Resolvable<TextToSpeechProvider | null>;
   terminalManager: TerminalManager | null;
   providerSnapshotManager: ProviderSnapshotManager;
-  providerUsageService: ProviderUsageService;
   hubExecutionAgents?: HubExecutionAgents;
   hubRelationships?: HubRelationshipManagement;
   serviceProxy?: ServiceProxySubsystem;
@@ -593,15 +609,6 @@ function sessionRequestId(message: SessionInboundMessage): string | null {
   return null;
 }
 
-interface AgentTimelineProjectionSelection {
-  timeline: AgentTimelineFetchResult;
-  entries: TimelineProjectionEntry[];
-  startSeq: number | null;
-  endSeq: number | null;
-  hasOlder: boolean;
-  hasNewer: boolean;
-}
-
 type RegistryTransition = "created" | "unarchived" | "existing";
 
 interface ArchivedRecordSnapshot {
@@ -609,7 +616,6 @@ interface ArchivedRecordSnapshot {
 }
 
 interface WorkspaceUpdateOptions {
-  dedupeGitState?: boolean;
   removedProjectId?: string;
   optimisticStatus?: WorkspaceDescriptorPayload["status"];
 }
@@ -636,6 +642,16 @@ function resolveWorkspaceLabelService(
   return service ?? null;
 }
 
+function hasInitialCreationPrompt(
+  request?: Pick<AgentCreateRequest, "initialPrompt" | "images" | "attachments">,
+): boolean {
+  return Boolean(
+    request &&
+    buildAgentPrompt(request.initialPrompt?.trim() ?? "", request.images, request.attachments)
+      .length,
+  );
+}
+
 function workspaceLabelErrorCode(error: unknown): string {
   if (
     error instanceof WorkspaceLabelError ||
@@ -647,7 +663,41 @@ function workspaceLabelErrorCode(error: unknown): string {
   return "workspace_label_failed";
 }
 
+interface ClientActivity {
+  deviceType: "web" | "mobile";
+  focusedAgentId: string | null;
+  focusedTerminalId: string | null;
+  lastActivityAt: Date;
+  appVisible: boolean;
+  appVisibilityChangedAt: Date;
+}
+
 export class Session {
+  readonly delivery = new SessionDelivery(
+    (source, message) => {
+      if (!this.authorization.allowsOutbound(message)) return;
+      if (this.onMessageToSource) this.onMessageToSource(source, message);
+      else this.onMessage(message);
+    },
+    (source, frame) => {
+      if (this.onBinaryMessageToSource) {
+        void this.onBinaryMessageToSource(source, frame).catch((error) =>
+          this.sessionLogger.warn({ err: error }, "Failed to emit binary frame"),
+        );
+      } else this.emitBinary(frame);
+    },
+    (source, message) => this.workspaceSetupMessageForClient(message, source),
+    (request, message) =>
+      this.sessionLogger.warn(
+        {
+          requestType: request.type,
+          messageType: message.type,
+          status: message.type === "status" ? message.payload.status : undefined,
+        },
+        "Unrecognized reply contract; application delivery denied",
+      ),
+  );
+  private readonly browserToolsBroker: SessionOptions["browserToolsBroker"];
   private readonly clientId: string;
   private readonly authorization: SessionAuthorization;
   private appVersion: string | null;
@@ -661,7 +711,7 @@ export class Session {
   private readonly onBinaryMessageToSource:
     | ((source: object, frame: Uint8Array) => Promise<void>)
     | null;
-  private readonly getTransportBufferedAmount: () => number | null;
+  private readonly getTransportBufferedAmount: (source?: object) => number | null;
   private readonly onLifecycleIntent: ((intent: SessionLifecycleIntent) => void) | null;
   private readonly onWorkspaceRecovered:
     | ((workspace: PersistedWorkspaceRecord) => Promise<void>)
@@ -676,6 +726,7 @@ export class Session {
   private readonly agentStorage: AgentStorage;
   private readonly projectRegistry: ProjectRegistry;
   private readonly workspaceRegistry: WorkspaceRegistry;
+  private readonly agentDirectory: AgentDirectory;
   private readonly directorySync: DirectorySyncService;
   private readonly filesystem: SessionFileSystem;
   private readonly github: ForgeService;
@@ -696,30 +747,31 @@ export class Session {
   private registryMutationQueue: Promise<void> = Promise.resolve();
   private projectUpdateQueue: Promise<void> = Promise.resolve();
   private isCleanedUp = false;
-  private viewedTimelineAgentIds = new Set<string>();
-  private readonly viewedTimelineAgentIdsBySource = new Map<object, Set<string>>();
-  private readonly clientCapabilitiesBySource = new Map<object, ReadonlySet<ClientCapability>>();
-  private readonly defaultTimelineSubscriptionSource = {};
+  private readonly timelineSubscriptions = new Map<
+    string,
+    { owner: OwnedSubscription; agentIds: Set<string> }
+  >();
+  private readonly clientSources = new Map<
+    object,
+    {
+      capabilities: ReadonlySet<ClientCapability>;
+      appVersion: string | null;
+      activity: ClientActivity | null;
+      pushToken: string | null;
+    }
+  >();
   private unsubscribeTerminalWorkspaceContributionEvents: (() => void) | null = null;
   private readonly agentUpdates: AgentUpdatesService;
-  private workspaceUpdatesSubscription: WorkspaceUpdatesSubscriptionState | null = null;
+  private readonly workspaceUpdatesSubscriptions = new Map<
+    string,
+    WorkspaceUpdatesSubscriptionState
+  >();
   private readonly workspaceLabelService: WorkspaceLabelService | null;
-  private workspaceLabelSubscription: {
-    owner: object;
-    id: string;
-    unsubscribe: () => void;
-  } | null = null;
-  private projectSyncEnabled = false;
+  private readonly eventSubscriptions = new Map<
+    string,
+    { owner: OwnedSubscription; events: Set<SessionEventSubscription>; notifications: boolean }
+  >();
   private readonly workspaceUpdateTails = new Map<string, Promise<void>>();
-  private clientActivity: {
-    deviceType: "web" | "mobile";
-    focusedAgentId: string | null;
-    focusedTerminalId: string | null;
-    lastActivityAt: Date;
-    appVisible: boolean;
-    appVisibilityChangedAt: Date;
-  } | null = null;
-  private registeredPushToken: string | null = null;
   private readonly terminalManager: TerminalManager | null;
   private readonly providerSnapshotManager: ProviderSnapshotManager;
   private readonly serviceProxy: ServiceProxySubsystem | null;
@@ -735,17 +787,20 @@ export class Session {
   private readonly workspaceSetupRuntime: WorkspaceSetupRuntime;
   private readonly workspaceGitObserver: WorkspaceGitObserverService;
   private readonly workspaceDirectory: WorkspaceDirectory;
-  private readonly voiceSession: VoiceSession;
+  private readonly voiceSessions: VoiceSessions;
   private readonly checkoutSession: CheckoutSession;
   private readonly scheduleSession: ScheduleSession;
   private readonly providerCatalogSession: ProviderCatalogSession;
+  private readonly usageSession: UsageSession;
   private readonly workspaceFilesSession: WorkspaceFilesSession;
   private readonly agentConfigSession: AgentConfigSession;
   private readonly projectConfigSession: ProjectConfigSession;
   private readonly daemonSession: DaemonSession;
   private readonly hubExecutionController: HubExecutionController | null;
   private readonly workspaceScripts: WorkspaceScriptsService;
+  private readonly messageReceipts: Pick<MessageReceipts, "send">;
   private readonly createAgentLifecycleDispatch: CreateAgentLifecycleDispatch;
+  private readonly creationService: Pick<CreationService, "create" | "subscribe">;
 
   constructor(options: SessionOptions) {
     const {
@@ -760,6 +815,7 @@ export class Session {
       getTransportBufferedAmount,
       onLifecycleIntent,
       onWorkspaceRecovered,
+      publishScriptStatusUpdate,
       logger,
       downloadTokenStore,
       pushNotifications,
@@ -786,7 +842,6 @@ export class Session {
       tts,
       terminalManager,
       providerSnapshotManager,
-      providerUsageService,
       serviceProxy,
       scriptRuntimeStore,
       workspaceSetupSnapshots,
@@ -804,6 +859,7 @@ export class Session {
       daemonRuntimeConfig,
       getWebSocketRuntimeMetrics,
     } = options;
+    this.browserToolsBroker = options.browserToolsBroker;
     this.clientId = clientId;
     this.authorization = new SessionAuthorization(permissions);
     this.appVersion = appVersion ?? null;
@@ -818,11 +874,12 @@ export class Session {
     this.onWorkspaceRecovered = onWorkspaceRecovered ?? null;
     this.pushNotifications = pushNotifications;
     this.paseoHome = paseoHome;
+    this.messageReceipts = options.messageReceipts;
+    this.creationService = options.creationService;
     this.projectIcons = new ProjectIconReader(paseoHome);
     this.worktreesRoot = worktreesRoot;
     this.pluginRuntime = pluginRuntime;
     this.orchestrationSkills = orchestrationSkills;
-    this.unsubscribePluginChanges = this.subscribeToPluginChanges(pluginRuntime);
     this.sessionLogger = logger.child({
       module: "session",
       clientId: this.clientId,
@@ -854,10 +911,12 @@ export class Session {
     });
     this.workspaceAutoName = workspaceAutoName;
     this.workspaceProvisioning = createWorkspaceProvisioningService({
+      lifecycle: this.pluginRuntime,
       serverId,
       workspaceRegistry: this.workspaceRegistry,
       projectRegistry: this.projectRegistry,
       workspaceGitService: this.workspaceGitService,
+      isDirectory: (path) => this.filesystem.isDirectory(path),
       logger: this.sessionLogger,
     });
     this.workspaceRecovery = createWorkspaceRecoveryService({
@@ -897,11 +956,7 @@ export class Session {
     });
     this.workspaceGitObserver = createWorkspaceGitObserverService({
       workspaceGitService: this.workspaceGitService,
-      describeWorkspaceRecordWithGitData: (workspace) =>
-        this.describeWorkspaceRecordWithGitData(workspace),
       emitWorkspaceUpdateForCwd: (cwd) => this.emitWorkspaceUpdateForCwd(cwd),
-      emitWorkspaceUpdateForWorkspaceId: (workspaceId) =>
-        this.emitWorkspaceUpdateForWorkspaceId(workspaceId),
       emitStatusUpdate: (cwd, snapshot) => this.checkoutSession.emitStatusUpdate(cwd, snapshot),
       onBranchChanged,
       logger: this.sessionLogger,
@@ -917,11 +972,37 @@ export class Session {
         isProviderVisibleToClient: (provider) => this.isProviderVisibleToClient(provider),
         supportsCustomModeIcons: () => this.supports(CLIENT_CAPS.customModeIcons),
         supportsCompactProviderSnapshots: () => this.supports(CLIENT_CAPS.compactProviderSnapshots),
+        publishSnapshot: (project) => {
+          const delivered = new Set<object>();
+          for (const subscription of this.eventSubscriptions.values()) {
+            if (!subscription.events.has("providers_snapshot_update")) continue;
+            const message = this.delivery.forSource(subscription.owner.source, project);
+            if (message) subscription.owner.emit(message);
+            delivered.add(subscription.owner.source);
+          }
+          // COMPAT(ownedSubscriptions): added in v0.8.0, remove implicit provider delivery after 2027-03-09.
+          for (const source of this.clientSources.keys()) {
+            if (
+              delivered.has(source) ||
+              this.delivery.isModern(source) ||
+              !this.wantsEvent("providers_snapshot_update", source)
+            )
+              continue;
+            const message = this.delivery.forSource(source, project);
+            if (message) this.onMessageToSource?.(source, message);
+          }
+        },
+        supportsProviderSnapshotReferences: () =>
+          this.supports(CLIENT_CAPS.providerSnapshotReferences),
         listProviderAvailability: () => this.agentManager.listProviderAvailability(),
         listDraftFeatures: (config) => this.agentManager.listDraftFeatures(config),
       },
       providerSnapshotManager,
-      providerUsageService,
+      logger: this.sessionLogger,
+    });
+    this.usageSession = new UsageSession({
+      emit: (msg) => this.emit(msg),
+      runtime: pluginRuntime,
       logger: this.sessionLogger,
     });
     this.agentConfigSession = new AgentConfigSession({
@@ -964,6 +1045,22 @@ export class Session {
       daemonVersion,
       daemonRuntimeConfig,
       getWebSocketRuntimeMetrics,
+      getObservationMetrics: () => ({
+        Registrations: this.delivery.registrationCount,
+        "Source registrations": this.delivery.sourceRegistrationCount(),
+        "Producer listeners": [
+          this.unsubscribeAgentEvents,
+          this.unsubscribeProjectMutations,
+          this.unsubscribeWorkspaceMutations,
+          this.unsubscribePluginChanges,
+          this.unsubscribeTerminalWorkspaceContributionEvents,
+          this.providerCatalogSession.isObserving,
+          this.hubExecutionController?.isObserving,
+        ].filter(Boolean).length,
+        "Git observations": this.workspaceGitObserver.getMetrics().subscriptionCount,
+        "Terminal directories": this.terminalController.getMetrics().directorySubscriptionCount,
+        "Terminal output": this.terminalController.getMetrics().streamSubscriptionCount,
+      }),
       listProviderAvailability: () => this.agentManager.listProviderAvailability(),
       listAgents: () => this.agentManager.listAgents(),
       listProjects: () => this.projectRegistry.list(),
@@ -985,16 +1082,30 @@ export class Session {
     this.terminalController = new TerminalSessionController({
       terminalManager,
       emit: (msg) => this.emit(msg),
-      emitBinary: (frame) => this.emitBinary(frame),
       hasBinaryChannel: () => this.onBinaryMessage !== null,
       isPathWithinRoot: (rootPath, candidatePath) => this.isPathWithinRoot(rootPath, candidatePath),
       sessionLogger: this.sessionLogger,
       listTerminalWorkspaceRefs: () => this.listActiveWorkspaceRefs(),
-      clientSupportsWrapReflow: () =>
-        this.clientCapabilities.has(CLIENT_CAPS.terminalReflowableSnapshot),
-      getClientBufferedAmount: () => this.getTransportBufferedAmount(),
+      clientSupportsWrapReflow: (source) =>
+        this.supportsForSource(CLIENT_CAPS.terminalReflowableSnapshot, source),
+      getClientBufferedAmount: (source) => this.getTransportBufferedAmount(source),
+    });
+    this.agentDirectory = new AgentDirectory({
+      manager: this.agentManager,
+      storage: this.agentStorage,
+      workspaces: this.workspaceRegistry,
+      projectLive: (agent) => this.buildAgentPayload(agent),
+      projectStored: (record) => this.buildStoredAgentPayload(record),
+      isProviderVisible: (provider) => this.isProviderVisibleToClient(provider),
+      isStoredProviderAvailable: (record) =>
+        isStoredAgentProviderAvailable(
+          record,
+          new Set(this.providerSnapshotManager.listRegisteredProviderIds()),
+        ),
     });
     this.agentUpdates = createAgentUpdatesService({
+      includesWorkspace: (agent, includeBackground) =>
+        this.agentDirectory.includes(agent, includeBackground),
       emit: (message) => this.emit(message),
       enrichAgentPayload: (payload) => this.enrichAgentPayload(payload),
       buildStoredAgentPayload: (record) => this.buildStoredAgentPayload(record),
@@ -1003,12 +1114,13 @@ export class Session {
         this.buildProjectPlacementForWorkspaceId(workspaceId),
       emitWorkspaceUpdateForWorkspaceId: (workspaceId) =>
         this.emitWorkspaceUpdateForWorkspaceId(workspaceId),
-      sequenceAgentUpdate: (payload, agent, project, agentId, includeSequence) =>
+      sequenceAgentUpdate: (payload, agent, project, agentId, includeSequence, includeBackground) =>
         this.directorySync.sequenceAgentUpdate(
           payload,
           agent && project ? { agent, project } : null,
           agentId,
           includeSequence,
+          includeBackground,
         ),
       logger: this.sessionLogger,
     });
@@ -1058,60 +1170,64 @@ export class Session {
       resolveScriptHealth: this.resolveScriptHealth,
       logger: this.sessionLogger,
       emit: (message) => this.emit(message),
+      publishStatusUpdate: (message) => {
+        if (publishScriptStatusUpdate) publishScriptStatusUpdate(message);
+        else this.emit(message);
+      },
       spawnWorkspaceScript,
       assertAutomationAllowed: (workspaceId) =>
         assertWorkspaceAutomationAllowedForWorkspace(this.workspaceRegistry, workspaceId),
       globalServicePorts: loadPersistedConfig(this.paseoHome).worktrees?.servicePorts,
     });
-    this.subscribeToOptionalManagers();
     this.workspaceDirectory = new WorkspaceDirectory({
       logger: this.sessionLogger,
       projectRegistry: this.projectRegistry,
       workspaceRegistry: this.workspaceRegistry,
-      listAgentPayloads: () => this.listAgentPayloads(),
+      listAgentPayloads: () => this.listAgentPayloads({ includeBackground: true }),
       listProviderSubagentActivity: async () => this.agentManager.listProviderSubagentActivity(),
       listTerminalActivityContributions: () => this.listTerminalActivityContributions(),
       isProviderVisibleToClient: (provider) => this.isProviderVisibleToClient(provider),
       buildWorkspaceDescriptor: (input) => this.buildWorkspaceDescriptor(input),
     });
 
-    this.voiceSession = new VoiceSession({
-      host: {
-        emit: (msg) => this.emit(msg),
-        loadAgent: (agentId) =>
-          ensureAgentLoaded(agentId, {
-            agentManager: this.agentManager,
-            agentStorage: this.agentStorage,
-            logger: this.sessionLogger,
-          }),
-        reloadAgentSession: (agentId, overrides) =>
-          this.agentManager.reloadAgentSession(agentId, overrides),
-        sendSpokenInput: async (agentId, text) => {
-          await this.handleSendAgentMessage(
-            agentId,
-            text,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            { spokenInput: true },
-          );
+    this.voiceSessions = new VoiceSessions(
+      {
+        host: {
+          emit: (msg) => this.emit(msg),
+          loadAgent: (agentId) =>
+            ensureAgentLoaded(agentId, {
+              agentManager: this.agentManager,
+              agentStorage: this.agentStorage,
+              logger: this.sessionLogger,
+            }),
+          reloadAgentSession: (agentId, overrides) =>
+            this.agentManager.reloadAgentSession(agentId, overrides),
+          sendSpokenInput: async (agentId, text) => {
+            await this.handleSendAgentMessage(
+              agentId,
+              text,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              { spokenInput: true },
+            );
+          },
+          interruptAgentIfRunning: (agentId) => this.interruptAgentIfRunning(agentId),
+          hasActiveAgentRun: (agentId) => this.hasActiveAgentRun(agentId),
         },
-        interruptAgentIfRunning: (agentId) => this.interruptAgentIfRunning(agentId),
-        hasActiveAgentRun: (agentId) => this.hasActiveAgentRun(agentId),
+        logger: this.sessionLogger,
+        sessionId: this.sessionId,
+        sttLanguage,
+        tts,
+        stt,
+        voice,
+        voiceBridge,
+        dictation,
       },
-      logger: this.sessionLogger,
-      sessionId: this.sessionId,
-      sttLanguage,
-      tts,
-      stt,
-      voice,
-      voiceBridge,
-      dictation,
-    });
-
-    this.subscribeToAgentEvents();
-    this.subscribeToRegistryMutations();
+      this.delivery,
+      () => this.refreshObservationProducers(),
+    );
 
     this.sessionLogger.trace({}, "agent.session.lifecycle.created");
   }
@@ -1122,116 +1238,148 @@ export class Session {
     }
   }
 
-  updateClientCapabilities(capabilities: Record<string, unknown> | null, source?: object): void {
+  updateClientCapabilities(
+    capabilities: Record<string, unknown> | null,
+    source?: object,
+    appVersion = this.appVersion,
+  ): void {
     this.clientCapabilities = parseClientCapabilities(capabilities);
     if (source) {
-      this.clientCapabilitiesBySource.set(source, this.clientCapabilities);
-    }
-    if (!source && !this.supports(CLIENT_CAPS.selectiveAgentTimeline)) {
-      this.viewedTimelineAgentIdsBySource.clear();
-      this.viewedTimelineAgentIds.clear();
+      this.delivery.attach(source, capabilities?.[CLIENT_CAPS.ownedSubscriptions] === true);
+      this.clientSources.set(source, {
+        capabilities: this.clientCapabilities,
+        appVersion,
+        activity: this.clientSources.get(source)?.activity ?? null,
+        pushToken: this.clientSources.get(source)?.pushToken ?? null,
+      });
+      this.refreshObservationProducers();
+      // COMPAT(ownedSubscriptions): added in v0.8.0, remove capability-driven legacy host registration after 2027-03-09.
+      if (
+        !this.delivery.isModern(source) &&
+        this.authorization.allowsPermission("workspace.write")
+      ) {
+        const host = BrowserAutomationHostCapabilitySchema.safeParse(capabilities?.browser_host);
+        if (host.success && this.browserToolsBroker) {
+          const request = {
+            type: "browser.host.register.request" as const,
+            requestId: uuidv4(),
+            hostKind: host.data.hostKind,
+            supportedCommands: host.data.supportedCommands,
+          };
+          void this.delivery
+            .request(source, request, () => this.registerBrowserHost(request, false))
+            .catch((error) =>
+              this.sessionLogger.warn({ err: error }, "Failed to register legacy browser host"),
+            );
+        }
+      }
     }
   }
 
   clearAgentTimelineSubscription(source: object): void {
-    this.clientCapabilitiesBySource.delete(source);
-    if (this.viewedTimelineAgentIdsBySource.delete(source)) {
-      this.rebuildViewedTimelineAgentIds();
-    }
+    void this.delivery
+      .detach(source)
+      .catch((err) => this.sessionLogger.error({ err }, "Failed to release source subscriptions"));
+    this.clientSources.delete(source);
+    this.refreshObservationProducers();
   }
 
-  private replaceAgentTimelineSubscription(source: object | undefined, agentIds: string[]): void {
-    const subscriptionSource = source ?? this.defaultTimelineSubscriptionSource;
-    if (agentIds.length === 0) this.viewedTimelineAgentIdsBySource.delete(subscriptionSource);
-    else this.viewedTimelineAgentIdsBySource.set(subscriptionSource, new Set(agentIds));
-    this.rebuildViewedTimelineAgentIds();
+  private subscribeAgentTimelines(agentIds: string[]): OwnedSubscription {
+    const owner = this.delivery.begin("timelines", undefined, (id) => {
+      this.timelineSubscriptions.delete(id);
+      this.refreshObservationProducers();
+    });
+    this.timelineSubscriptions.set(owner.id, { owner, agentIds: new Set(agentIds) });
+    this.refreshObservationProducers();
+    return owner;
   }
 
-  private rebuildViewedTimelineAgentIds(): void {
-    const viewedAgentIds = new Set<string>();
-    for (const agentIds of this.viewedTimelineAgentIdsBySource.values()) {
-      for (const agentId of agentIds) viewedAgentIds.add(agentId);
-    }
-    this.viewedTimelineAgentIds = viewedAgentIds;
-  }
-
-  private usesSelectiveTimelineDelivery(): boolean {
-    if (this.clientCapabilitiesBySource.size === 0) {
-      return this.supports(CLIENT_CAPS.selectiveAgentTimeline);
-    }
-    for (const capabilities of this.clientCapabilitiesBySource.values()) {
-      if (!capabilities.has(CLIENT_CAPS.selectiveAgentTimeline)) return false;
-    }
-    return true;
+  // COMPAT(timelineItemCapabilities): plugin items added in v0.8.0, notifications in v0.7.2.
+  // Remove after 2027-03-07 once the supported client floor is >= v0.8.0.
+  private supportsTimelineItem(item: { type: string }, source?: object): boolean {
+    let capability: ClientCapability;
+    if (item.type === "notification") capability = CLIENT_CAPS.timelineNotifications;
+    else if (item.type === "plugin") capability = CLIENT_CAPS.pluginTimelineItems;
+    else return true;
+    return source ? this.supportsForSource(capability, source) : this.supports(capability);
   }
 
   private forwardAgentStream(
     event: Extract<AgentManagerEvent, { type: "agent_stream" }>,
     serializedEvent: Extract<SessionOutboundMessage, { type: "agent_stream" }>["payload"]["event"],
   ): void {
-    if (this.clientCapabilitiesBySource.size === 0 || !this.onMessageToSource) {
-      if (this.usesSelectiveTimelineDelivery() && serializedEvent.type === "attention_required") {
-        this.emit({
-          type: "agent_attention_required",
-          payload: {
-            agentId: event.agentId,
-            reason: serializedEvent.reason,
-            timestamp: serializedEvent.timestamp,
-            shouldNotify: serializedEvent.shouldNotify,
-            ...(serializedEvent.notification ? { notification: serializedEvent.notification } : {}),
-          },
-        });
-      } else if (
-        !this.usesSelectiveTimelineDelivery() ||
-        this.viewedTimelineAgentIds.has(event.agentId)
-      ) {
-        this.emit({
-          type: "agent_stream",
-          payload: this.buildAgentStreamPayload(event, serializedEvent),
-        });
-      }
-      return;
-    }
-
-    for (const [source, capabilities] of this.clientCapabilitiesBySource) {
-      const supportsSelectiveDelivery = capabilities.has(CLIENT_CAPS.selectiveAgentTimeline);
-      if (supportsSelectiveDelivery && serializedEvent.type === "attention_required") {
-        this.onMessageToSource(source, {
-          type: "agent_attention_required",
-          payload: {
-            agentId: event.agentId,
-            reason: serializedEvent.reason,
-            timestamp: serializedEvent.timestamp,
-            shouldNotify: serializedEvent.shouldNotify,
-            ...(serializedEvent.notification ? { notification: serializedEvent.notification } : {}),
-          },
-        });
-        continue;
-      }
-      if (
-        supportsSelectiveDelivery &&
-        !this.viewedTimelineAgentIdsBySource.get(source)?.has(event.agentId)
-      ) {
-        continue;
-      }
-      this.onMessageToSource(source, {
-        type: "agent_stream",
-        payload: this.buildAgentStreamPayload(event, serializedEvent),
+    const attention = serializedEvent.type === "attention_required";
+    if (attention) {
+      this.emit({
+        type: "agent_attention_required",
+        payload: {
+          agentId: event.agentId,
+          reason: serializedEvent.reason,
+          timestamp: serializedEvent.timestamp,
+          shouldNotify: serializedEvent.shouldNotify,
+          ...(serializedEvent.notification ? { notification: serializedEvent.notification } : {}),
+        },
       });
     }
+    const message: SessionOutboundMessage = {
+      type: "agent_stream",
+      payload: this.buildAgentStreamPayload(event, serializedEvent),
+    };
+    for (const subscription of this.timelineSubscriptions.values()) {
+      const source = subscription.owner.source;
+      if (!subscription.agentIds.has(event.agentId)) continue;
+      if (
+        attention &&
+        (this.delivery.isModern(source) ||
+          this.supportsForSource(CLIENT_CAPS.selectiveAgentTimeline, source))
+      )
+        continue;
+      if (
+        serializedEvent.type === "timeline" &&
+        !this.supportsTimelineItem(serializedEvent.item, source)
+      )
+        continue;
+      subscription.owner.emit(message);
+    }
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove implicit timeline delivery after 2027-03-09.
+    for (const [source, { capabilities }] of this.clientSources) {
+      if (this.delivery.isModern(source) || capabilities.has(CLIENT_CAPS.selectiveAgentTimeline))
+        continue;
+      if (
+        serializedEvent.type === "timeline" &&
+        !this.supportsTimelineItem(serializedEvent.item, source)
+      )
+        continue;
+      const alreadyDelivered = [...this.timelineSubscriptions.values()].some(
+        (subscription) =>
+          subscription.owner.source === source && subscription.agentIds.has(event.agentId),
+      );
+      if (!alreadyDelivered) this.onMessageToSource?.(source, message);
+    }
+    if (
+      this.clientSources.size === 0 &&
+      !this.supports(CLIENT_CAPS.selectiveAgentTimeline) &&
+      this.timelineSubscriptions.size === 0
+    )
+      this.emit(message);
   }
 
   supports(capability: ClientCapability): boolean {
-    return this.clientCapabilities.has(capability);
+    const source = this.delivery.currentSource;
+    return source
+      ? this.supportsForSource(capability, source)
+      : this.clientCapabilities.has(capability);
   }
 
   supportsForSource(capability: ClientCapability, source: object): boolean {
     return (
-      this.clientCapabilitiesBySource.get(source)?.has(capability) ?? this.supports(capability)
+      this.clientSources.get(source)?.capabilities.has(capability) ??
+      this.clientCapabilities.has(capability)
     );
   }
 
   emitProjectUpdate(update: ProjectUpdate): Promise<void> {
+    if (!this.wantsEvent("project.update")) return Promise.resolve();
     const queued = this.projectUpdateQueue
       .catch(() => undefined)
       .then(() => this.publishProjectUpdate(update));
@@ -1240,27 +1388,28 @@ export class Session {
   }
 
   private async publishProjectUpdate(update: ProjectUpdate): Promise<void> {
+    if (!this.wantsEvent("project.update")) return;
     const projectedPayload =
       update.kind === "upsert"
         ? { kind: "upsert" as const, project: await this.buildProjectDescriptor(update.project) }
         : update;
+    if (!this.wantsEvent("project.update")) return;
     const message: SessionOutboundMessage = {
       type: "project.update",
-      payload: this.directorySync.sequenceProjectUpdate(projectedPayload, this.projectSyncEnabled),
+      payload: this.directorySync.sequenceProjectUpdate(projectedPayload, true),
     };
-    if (this.clientCapabilitiesBySource.size === 0 || !this.onMessageToSource) {
-      if (this.supports(CLIENT_CAPS.projectUpdates)) this.emit(message);
-      return;
-    }
-    for (const [source, capabilities] of this.clientCapabilitiesBySource) {
-      if (capabilities.has(CLIENT_CAPS.projectUpdates)) {
-        this.onMessageToSource(source, message);
-      }
-    }
+    this.emit(message);
   }
 
   async syncWorkspaceGitObserverForWorkspace(workspace: PersistedWorkspaceRecord): Promise<void> {
-    await this.workspaceGitObserver.syncObserverForWorkspace(workspace);
+    if (this.workspaceUpdatesSubscriptions.size === 0 && !this.wantsEvent("checkout_status_update"))
+      return;
+    const descriptor = await this.describeWorkspaceRecord(workspace);
+    const demanded = [...this.workspaceUpdatesSubscriptions.values()].some((subscription) =>
+      this.matchesWorkspaceFilter({ workspace: descriptor, filter: subscription.filter }),
+    );
+    if (demanded || this.wantsEvent("checkout_status_update"))
+      this.workspaceGitObserver.syncObservers([descriptor]);
   }
 
   async emitWorkspaceUpdateForWorkspaceId(workspaceId: string): Promise<void> {
@@ -1271,7 +1420,7 @@ export class Session {
     workspace: WorkspaceDescriptorPayload,
     optimisticStatus?: WorkspaceDescriptorPayload["status"],
   ): Promise<void> {
-    if (this.workspaceUpdatesSubscription) {
+    if (this.workspaceUpdatesSubscriptions.size > 0) {
       await this.emitWorkspaceUpdatesForWorkspaceIds(
         [workspace.id],
         optimisticStatus ? { optimisticStatus } : undefined,
@@ -1280,6 +1429,7 @@ export class Session {
     }
     // COMPAT(workspaceCreateCausalUpdate): added in v0.1.106, remove after 2027-01-12.
     // Older clients create before subscribing and require the causal update beside the response.
+    if (workspace.background) return;
     this.emit({
       type: "workspace_update",
       payload: {
@@ -1307,25 +1457,29 @@ export class Session {
   async syncWorkspaceGitObserversForExternalWorkspaceIds(
     workspaceIds: Iterable<string>,
   ): Promise<void> {
+    if (!this.delivery.hasDemand("workspaces") && !this.wantsEvent("checkout_status_update"))
+      return;
     await Promise.all(
       Array.from(new Set(workspaceIds)).map(async (workspaceId) => {
         const workspace = await this.workspaceRegistry.get(workspaceId);
         if (workspace && !workspace.archivedAt) {
-          await this.workspaceGitObserver.syncObserverForWorkspace(workspace);
+          await this.syncWorkspaceGitObserverForWorkspace(workspace);
         }
       }),
     );
   }
 
   async warmWorkspaceGitDataForWorkspace(workspace: PersistedWorkspaceRecord): Promise<void> {
-    await this.workspaceGitObserver.warmGitData(workspace);
+    await this.syncWorkspaceGitObserverForWorkspace(workspace);
+    await this.emitWorkspaceUpdateForWorkspaceId(workspace.workspaceId);
   }
 
   async refreshRecoveredWorkspaceForExternalMutation(
     workspace: PersistedWorkspaceRecord,
   ): Promise<void> {
     try {
-      await this.workspaceGitObserver.warmGitData(workspace);
+      await this.syncWorkspaceGitObserverForWorkspace(workspace);
+      await this.emitWorkspaceUpdateForWorkspaceId(workspace.workspaceId);
     } catch (error) {
       this.sessionLogger.warn(
         { err: error, workspaceId: workspace.workspaceId },
@@ -1345,15 +1499,25 @@ export class Session {
   /**
    * Get the client's current activity state
    */
-  public getClientActivity(): {
-    deviceType: "web" | "mobile";
-    focusedAgentId: string | null;
-    focusedTerminalId: string | null;
-    lastActivityAt: Date;
-    appVisible: boolean;
-    appVisibilityChangedAt: Date;
-  } | null {
-    return this.clientActivity;
+  private currentClientMetadata() {
+    const source = this.delivery.currentSource;
+    if (!source) throw new Error("Client control has no source");
+    let metadata = this.clientSources.get(source);
+    if (!metadata) {
+      // COMPAT(ownedSubscriptions): added in v0.8.0, remove socketless legacy session adapter after 2027-03-09.
+      metadata = {
+        capabilities: this.clientCapabilities,
+        appVersion: this.appVersion,
+        activity: null,
+        pushToken: null,
+      };
+      this.clientSources.set(source, metadata);
+    }
+    return metadata;
+  }
+
+  public getClientActivity(source = this.delivery.currentSource): ClientActivity | null {
+    return source ? (this.clientSources.get(source)?.activity ?? null) : null;
   }
 
   private getFocusedAgentSelectionForCwd(cwd: string):
@@ -1363,7 +1527,7 @@ export class Session {
         thinkingOptionId?: string | null;
       }
     | undefined {
-    const focusedAgentId = this.clientActivity?.focusedAgentId;
+    const focusedAgentId = this.getClientActivity()?.focusedAgentId;
     if (!focusedAgentId) {
       return undefined;
     }
@@ -1481,33 +1645,75 @@ export class Session {
   /**
    * Subscribe to AgentManager events and forward them to the client
    */
-  private subscribeToOptionalManagers(): void {
-    this.terminalController.start();
-    if (this.terminalManager) {
-      this.unsubscribeTerminalWorkspaceContributionEvents =
-        this.terminalManager.subscribeTerminalWorkspaceContributionChanged((event) => {
-          void this.emitWorkspaceUpdateForTerminalContribution(event).catch((error) => {
-            this.sessionLogger.warn(
-              { err: error, terminalId: event.terminalId },
-              "Failed to emit workspace update after terminal contribution changed",
-            );
-          });
-        });
+  private refreshObservationProducers(): void {
+    const legacy = this.delivery.hasLegacySources();
+    const workspaces =
+      legacy || this.delivery.hasDemand("workspaces") || this.wantsEvent("checkout_status_update");
+    const agents =
+      workspaces ||
+      this.delivery.hasDemand("agents") ||
+      this.delivery.hasDemand("timelines") ||
+      this.voiceSessions.hasDemand ||
+      this.wantsEvent("agent_attention_required") ||
+      this.wantsEvent("agent_permission_request") ||
+      this.wantsEvent("agent_permission_resolved") ||
+      this.wantsEvent("agent.provider_subagents.update");
+    if (agents && !this.unsubscribeAgentEvents) this.subscribeToAgentEvents();
+    if (!agents) {
+      this.unsubscribeAgentEvents?.();
+      this.unsubscribeAgentEvents = null;
     }
-    this.providerCatalogSession.start();
+    this.refreshWorkspaceProducers(workspaces);
+    this.refreshCatalogProducers(legacy);
   }
 
-  private subscribeToRegistryMutations(): void {
-    this.unsubscribeProjectMutations?.();
-    this.unsubscribeProjectMutations =
-      this.projectRegistry.subscribeToMutations?.((mutation) =>
-        this.enqueueRegistryMutation(() => this.handleProjectMutation(mutation)),
-      ) ?? null;
-    this.unsubscribeWorkspaceMutations?.();
-    this.unsubscribeWorkspaceMutations =
-      this.workspaceRegistry.subscribeToMutations?.((mutation) =>
-        this.enqueueRegistryMutation(() => this.handleWorkspaceMutation(mutation)),
-      ) ?? null;
+  private refreshWorkspaceProducers(observing: boolean): void {
+    if (observing) {
+      this.unsubscribeProjectMutations ??=
+        this.projectRegistry.subscribeToMutations?.((mutation) =>
+          this.enqueueRegistryMutation(() => this.handleProjectMutation(mutation)),
+        ) ?? null;
+      this.unsubscribeWorkspaceMutations ??=
+        this.workspaceRegistry.subscribeToMutations?.((mutation) =>
+          this.enqueueRegistryMutation(() => this.handleWorkspaceMutation(mutation)),
+        ) ?? null;
+      this.unsubscribeTerminalWorkspaceContributionEvents ??=
+        this.terminalManager?.subscribeTerminalWorkspaceContributionChanged((event) => {
+          void this.emitWorkspaceUpdateForTerminalContribution(event).catch((error) =>
+            this.sessionLogger.warn(
+              { err: error, terminalId: event.terminalId },
+              "Failed to emit workspace terminal contribution",
+            ),
+          );
+        }) ?? null;
+    } else {
+      this.unsubscribeProjectMutations?.();
+      this.unsubscribeProjectMutations = null;
+      this.unsubscribeWorkspaceMutations?.();
+      this.unsubscribeWorkspaceMutations = null;
+      this.unsubscribeTerminalWorkspaceContributionEvents?.();
+      this.unsubscribeTerminalWorkspaceContributionEvents = null;
+    }
+  }
+
+  private refreshCatalogProducers(legacy: boolean): void {
+    this.hubExecutionController?.setObserving(
+      legacy ||
+        this.wantsEvent("hub.execution.agent.update") ||
+        this.wantsEvent("hub.execution.agent.stream"),
+    );
+    if (this.wantsEvent("providers_snapshot_update")) this.providerCatalogSession.start();
+    else this.providerCatalogSession.dispose();
+    if (
+      legacy ||
+      this.wantsEvent("status.plugin_catalog_changed") ||
+      this.wantsEvent("status.plugin_settings_changed")
+    )
+      this.unsubscribePluginChanges ??= this.subscribeToPluginChanges(this.pluginRuntime);
+    else {
+      this.unsubscribePluginChanges?.();
+      this.unsubscribePluginChanges = null;
+    }
   }
 
   private enqueueRegistryMutation(handleMutation: () => Promise<void>): Promise<void> {
@@ -1546,10 +1752,11 @@ export class Session {
   }
 
   private async syncWorkspaceMutationObserver(mutation: WorkspaceMutation): Promise<void> {
-    const subscription = this.workspaceUpdatesSubscription;
-    if (!mutation.workspace || !subscription) {
+    if (
+      !mutation.workspace ||
+      (this.workspaceUpdatesSubscriptions.size === 0 && !this.wantsEvent("checkout_status_update"))
+    )
       return;
-    }
     const descriptorsByWorkspaceId = await this.buildWorkspaceDescriptorMap({
       workspaceIds: [mutation.workspaceId],
       includeGitData: false,
@@ -1557,7 +1764,10 @@ export class Session {
     const descriptor = descriptorsByWorkspaceId.get(mutation.workspaceId);
     if (
       !descriptor ||
-      !this.matchesWorkspaceFilter({ workspace: descriptor, filter: subscription.filter })
+      (!this.wantsEvent("checkout_status_update") &&
+        ![...this.workspaceUpdatesSubscriptions.values()].some((subscription) =>
+          this.matchesWorkspaceFilter({ workspace: descriptor, filter: subscription.filter }),
+        ))
     ) {
       this.workspaceGitObserver.removeForWorkspaceId(mutation.workspaceId);
       return;
@@ -1567,16 +1777,24 @@ export class Session {
       this.workspaceGitObserver.removeForWorkspaceId(mutation.workspaceId);
       return;
     }
-    await this.workspaceGitObserver.syncObserverForWorkspace(currentWorkspace);
+    await this.syncWorkspaceGitObserverForWorkspace(currentWorkspace);
     if (this.isCleanedUp) {
       this.workspaceGitObserver.removeForWorkspaceId(mutation.workspaceId);
     }
   }
 
   private async handleProjectMutation(mutation: ProjectMutation): Promise<void> {
+    for (const subscription of this.workspaceUpdatesSubscriptions.values()) {
+      await this.handleProjectMutationForSubscription(mutation, subscription);
+    }
+  }
+
+  private async handleProjectMutationForSubscription(
+    mutation: ProjectMutation,
+    subscription: WorkspaceUpdatesSubscriptionState,
+  ): Promise<void> {
     try {
-      const subscription = this.workspaceUpdatesSubscription;
-      if (this.isCleanedUp || !subscription) {
+      if (this.isCleanedUp) {
         return;
       }
       const projectWorkspaceIds = (await this.workspaceRegistry.list())
@@ -1605,7 +1823,7 @@ export class Session {
         for (const workspaceId of projectWorkspaceIds) {
           this.workspaceGitObserver.removeForWorkspaceId(workspaceId);
         }
-        await this.emitWorkspaceUpdatesForWorkspaceIds(updateIds, {
+        await this.enqueueWorkspaceUpdates(new Set(updateIds), subscription, {
           removedProjectId: mutation.projectId,
         });
         return;
@@ -1616,7 +1834,7 @@ export class Session {
           this.workspaceGitObserver.removeForWorkspaceId(workspaceId);
         }
       }
-      await this.emitWorkspaceUpdatesForWorkspaceIds(projectWorkspaceIds);
+      await this.enqueueWorkspaceUpdates(new Set(projectWorkspaceIds), subscription, undefined);
     } catch (error) {
       this.sessionLogger.warn(
         { err: error, projectId: mutation.projectId, mutationKind: mutation.kind },
@@ -1625,6 +1843,84 @@ export class Session {
     }
   }
 
+  private supportsSubagentTimelineItem(
+    item: AgentTimelineFetchResult["rows"][number]["item"],
+    source?: object,
+  ): boolean {
+    // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove gate after 2027-03-14.
+    const supportsProjection = source
+      ? this.supportsForSource(CLIENT_CAPS.projectedSubagentTimeline, source)
+      : this.supports(CLIENT_CAPS.projectedSubagentTimeline);
+    return supportsProjection && this.supportsTimelineItem(item, source);
+  }
+
+  private forwardProviderSubagentUpdate(
+    update: Extract<AgentManagerEvent, { type: "provider_subagent" }>["event"],
+  ): void {
+    let message: SessionOutboundMessage;
+    if (update.type === "upsert") {
+      message = {
+        type: "agent.provider_subagents.update",
+        payload: { kind: "upsert", subagent: update.subagent },
+      };
+    } else if (update.type === "timeline") {
+      message = {
+        type: "agent.provider_subagents.update",
+        payload: {
+          kind: "timeline",
+          parentAgentId: update.parentAgentId,
+          subagentId: update.subagentId,
+          provider: update.provider,
+          item: update.row.item,
+          timestamp: update.row.timestamp,
+          seq: update.row.seq,
+          epoch: update.epoch,
+        },
+      };
+    } else {
+      message = {
+        type: "agent.provider_subagents.update",
+        payload: {
+          kind: "remove",
+          parentAgentId: update.parentAgentId,
+          subagentId: update.subagentId,
+        },
+      };
+    }
+
+    const delivered = new Set<object>();
+    for (const subscription of this.eventSubscriptions.values()) {
+      if (!subscription.events.has("agent.provider_subagents.update")) continue;
+      if (
+        update.type === "timeline" &&
+        !this.supportsSubagentTimelineItem(update.row.item, subscription.owner.source)
+      )
+        continue;
+      subscription.owner.emit(message);
+      delivered.add(subscription.owner.source);
+    }
+    if (this.clientSources.size === 0 || !this.onMessageToSource) {
+      if (
+        this.supports(CLIENT_CAPS.providerSubagents) &&
+        (update.type !== "timeline" || this.supportsSubagentTimelineItem(update.row.item))
+      ) {
+        this.emit(message);
+      }
+      return;
+    }
+    for (const [source, { capabilities }] of this.clientSources) {
+      if (
+        delivered.has(source) ||
+        this.delivery.isModern(source) ||
+        !capabilities.has(CLIENT_CAPS.providerSubagents)
+      )
+        continue;
+      if (update.type === "timeline" && !this.supportsSubagentTimelineItem(update.row.item, source))
+        continue;
+      this.onMessageToSource(source, message);
+    }
+  }
+
   private subscribeToAgentEvents(): void {
     if (this.unsubscribeAgentEvents) {
       this.unsubscribeAgentEvents();
@@ -1653,45 +1949,19 @@ export class Session {
         }
 
         if (event.type === "provider_subagent") {
+          // The subagents track of an internal parent stays hidden.
+          const parentAgentId =
+            event.event.type === "upsert"
+              ? event.event.subagent.parentAgentId
+              : event.event.parentAgentId;
+          if (this.agentManager.getAgent(parentAgentId)?.internal) return;
           this.emitProviderSubagentWorkspaceUpdate(event.event);
-          if (!this.supports(CLIENT_CAPS.providerSubagents)) {
-            return;
-          }
-          const update = event.event;
-          if (update.type === "upsert") {
-            this.emit({
-              type: "agent.provider_subagents.update",
-              payload: { kind: "upsert", subagent: update.subagent },
-            });
-          } else if (update.type === "timeline") {
-            this.emit({
-              type: "agent.provider_subagents.update",
-              payload: {
-                kind: "timeline",
-                parentAgentId: update.parentAgentId,
-                subagentId: update.subagentId,
-                provider: update.provider,
-                item: update.row.item,
-                timestamp: update.row.timestamp,
-                seq: update.row.seq,
-                epoch: update.epoch,
-              },
-            });
-          } else {
-            this.emit({
-              type: "agent.provider_subagents.update",
-              payload: {
-                kind: "remove",
-                parentAgentId: update.parentAgentId,
-                subagentId: update.subagentId,
-              },
-            });
-          }
+          this.forwardProviderSubagentUpdate(event.event);
           return;
         }
 
         if (
-          this.voiceSession.isActiveForAgent(event.agentId) &&
+          this.voiceSessions.isActiveForAgent(event.agentId) &&
           event.event.type === "permission_requested" &&
           isVoicePermissionAllowed(event.event.request)
         ) {
@@ -1730,7 +2000,10 @@ export class Session {
 
         this.forwardAgentStream(event, serializedEvent);
 
-        if (event.event.type === "permission_requested") {
+        // An internal agent streams only to clients subscribed to it by id;
+        // session-wide prompts would surface it everywhere.
+        const internal = this.agentManager.getAgent(event.agentId)?.internal === true;
+        if (event.event.type === "permission_requested" && !internal) {
           this.emit({
             type: "agent_permission_request",
             payload: {
@@ -1739,7 +2012,8 @@ export class Session {
             },
           });
         } else if (event.event.type === "permission_resolved") {
-          this.emit({
+          // A provider event is not the outcome of whichever request is currently running.
+          this.emitSubscribedEvent({
             type: "agent_permission_resolved",
             payload: {
               agentId: event.agentId,
@@ -1751,7 +2025,9 @@ export class Session {
 
         // Title updates may be applied asynchronously after agent creation.
       },
-      { replayState: false },
+      // Internal agents flow through so exact-id subscribers and opted-in
+      // listings see them; everything else above filters them out.
+      { replayState: false, includeInternal: true },
     );
   }
 
@@ -1805,7 +2081,14 @@ export class Session {
   }
 
   private isProviderVisibleToClient(provider: string): boolean {
-    if (clientSupportsAllProviders(this.appVersion)) {
+    if (
+      this.supports(CLIENT_CAPS.allProviders) ||
+      clientSupportsAllProviders(
+        this.delivery.currentSource
+          ? (this.clientSources.get(this.delivery.currentSource)?.appVersion ?? null)
+          : this.appVersion,
+      )
+    ) {
       return true;
     }
     return LEGACY_PROVIDER_IDS.has(provider);
@@ -1851,6 +2134,10 @@ export class Session {
    * Main entry point for processing session messages
    */
   public async handleMessage(msg: SessionInboundMessage, source?: object): Promise<void> {
+    return this.delivery.request(source, msg, () => this.handleRequest(msg, source));
+  }
+
+  private async handleRequest(msg: SessionInboundMessage, source?: object): Promise<void> {
     this.inflightRequests++;
     if (this.inflightRequests > this.peakInflightRequests) {
       this.peakInflightRequests = this.inflightRequests;
@@ -1919,6 +2206,13 @@ export class Session {
 
   public setPermissions(permissions: readonly DaemonPermission[]): void {
     this.authorization.replacePermissions(permissions);
+    if (!this.authorization.allowsPermission("workspace.write")) {
+      void this.delivery
+        .releaseFamily("browser-host")
+        .catch((error) =>
+          this.sessionLogger.error({ err: error }, "Failed to release revoked browser hosting"),
+        );
+    }
   }
 
   public getPermissions(): DaemonPermission[] {
@@ -1933,28 +2227,106 @@ export class Session {
     return this.authorization.allowsPermission(permission);
   }
 
-  public subscribesToAgent(agent: ManagedAgent): Promise<boolean> {
-    return this.agentUpdates.includesLiveAgent(agent);
+  public subscribesToAgent(agent: ManagedAgent, source: object): Promise<boolean> {
+    return this.agentUpdates.includesLiveAgent(
+      agent,
+      new Set(this.delivery.subscriptionIds(source, "agents")),
+    );
   }
 
-  public subscribesToTerminalDirectory(input: {
-    cwd: string;
-    workspaceId?: string;
-  }): Promise<boolean> {
-    return this.terminalController.hasDirectorySubscription(input);
+  public subscribesToTerminalDirectory(
+    input: {
+      cwd: string;
+      workspaceId?: string;
+    },
+    source: object,
+  ): Promise<boolean> {
+    return this.terminalController.hasDirectorySubscription(input, source);
+  }
+
+  public publishToSource(source: object, message: SessionOutboundMessage): void {
+    if (!this.authorization.allowsOutbound(message)) return;
+    this.emitSubscribedEvent(message, source);
+  }
+
+  public wantsSourceEvent(source: object, event: SessionEventSubscription): boolean {
+    return this.wantsEvent(event, source);
+  }
+
+  public wantsSourceNotification(source: object, event: SessionEventSubscription): boolean {
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove legacy notification selection after 2027-03-09.
+    if (!this.delivery.isModern(source)) return true;
+    return [...this.eventSubscriptions.values()].some(
+      (subscription) =>
+        subscription.owner.source === source &&
+        subscription.notifications &&
+        subscription.events.has(event),
+    );
   }
 
   public publish(message: SessionOutboundMessage): void {
     this.emit(message);
   }
 
+  private async registerBrowserHost(
+    request: Extract<SessionInboundMessage, { type: "browser.host.register.request" }>,
+    respond = true,
+  ): Promise<void> {
+    if (!this.browserToolsBroker) throw new Error("Browser hosting is unavailable");
+    let unregister: (() => void) | undefined;
+    const owner = this.delivery.begin("browser-host", undefined, () => unregister?.());
+    try {
+      unregister = this.browserToolsBroker.registerClient({
+        id: owner.id,
+        hostKind: request.hostKind,
+        supportedCommands: request.supportedCommands,
+        sendBrowserAutomationRequest: (message) => owner.emit(message),
+      });
+      if (respond)
+        this.emit({
+          type: "browser.host.register.response",
+          payload: { requestId: request.requestId, subscriptionId: owner.responseId },
+        });
+    } catch (error) {
+      await owner.release();
+      throw error;
+    }
+  }
+
+  private dispatchSubscriptionMessage(
+    msg: SessionInboundMessage,
+    source?: object,
+  ): Promise<void> | undefined {
+    if (msg.type === "browser.host.register.request") return this.registerBrowserHost(msg);
+    if (msg.type === "browser.automation.execute.response") {
+      if (source)
+        this.browserToolsBroker?.receiveResponse(
+          msg,
+          this.delivery.subscriptionIds(source, "browser-host"),
+        );
+      return Promise.resolve();
+    }
+    if (msg.type === "subscription.release.request") {
+      return this.delivery.release(msg.subscriptionId).then(() => {
+        this.emit({
+          type: "subscription.release.response",
+          payload: { requestId: msg.requestId, subscriptionId: msg.subscriptionId },
+        });
+        return undefined;
+      });
+    }
+    return undefined;
+  }
+
   private async dispatchInboundMessage(msg: SessionInboundMessage, source?: object): Promise<void> {
     const promise =
+      this.dispatchSubscriptionMessage(msg, source) ??
       this.dispatchVoiceAndControlMessage(msg) ??
       this.dispatchAgentRewindMessage(msg, source) ??
       this.dispatchAgentRelationshipMessage(msg) ??
       this.dispatchAgentTimelineMessage(msg, source) ??
       this.dispatchHubExecutionMessage(msg) ??
+      this.dispatchCreationMessage(msg, source) ??
       this.dispatchAgentLifecycleMessage(msg) ??
       this.dispatchAgentConfigMessage(msg) ??
       this.dispatchCheckoutMessage(msg) ??
@@ -1972,7 +2344,7 @@ export class Session {
 
   private dispatchWorkspaceLifecycleMessage(msg: SessionInboundMessage): Promise<void> | undefined {
     return (
-      this.dispatchWorkspaceRecoveryMessage(msg) ??
+      this.dispatchWorkspaceStateMessage(msg) ??
       this.dispatchWorkspaceLabelMessage(msg) ??
       this.dispatchWorkspaceSetupMessage(msg) ??
       this.dispatchWorkspaceAndProjectMessage(msg)
@@ -2041,11 +2413,13 @@ export class Session {
 
   private dispatchPluginMessage(msg: SessionInboundMessage): Promise<void> | undefined {
     if (msg.type === "plugin.list.request") {
-      this.emit({
-        type: "plugin.list.response",
-        payload: { requestId: msg.requestId, plugins: this.pluginRuntime?.listPlugins() ?? [] },
+      return (this.pluginRuntime?.listPlugins() ?? Promise.resolve([])).then((plugins) => {
+        this.emit({
+          type: "plugin.list.response",
+          payload: { requestId: msg.requestId, plugins },
+        });
+        return undefined;
       });
-      return undefined;
     }
     if (msg.type === "plugin.logs.get.request") {
       if (!this.pluginRuntime) throw new Error("Plugin service is unavailable");
@@ -2149,6 +2523,28 @@ export class Session {
         return undefined;
       });
     }
+    if (msg.type === "plugin.source.update.preview.request") {
+      if (!this.pluginRuntime) throw new Error("Plugin service is unavailable");
+      return this.pluginRuntime
+        .previewUpdates({ pluginId: msg.pluginId, target: msg.target })
+        .then((plugins) => {
+          this.emit({
+            type: "plugin.source.update.preview.response",
+            payload: { requestId: msg.requestId, plugins },
+          });
+          return undefined;
+        });
+    }
+    if (msg.type === "plugin.source.update.apply.request") {
+      if (!this.pluginRuntime) throw new Error("Plugin service is unavailable");
+      return this.pluginRuntime.applyUpdates(msg.proposals).then((plugins) => {
+        this.emit({
+          type: "plugin.source.update.apply.response",
+          payload: { requestId: msg.requestId, plugins },
+        });
+        return undefined;
+      });
+    }
     if (msg.type === "plugin.source.update.request") {
       if (!this.pluginRuntime) throw new Error("Plugin service is unavailable");
       return this.pluginRuntime.updateSources(msg.pluginId).then((plugins) => {
@@ -2186,36 +2582,32 @@ export class Session {
     pluginRuntime: SessionOptions["pluginRuntime"],
   ): (() => void) | null {
     if (!pluginRuntime) return null;
-    return pluginRuntime.subscribe((pluginId) => {
+    const catalog = pluginRuntime.subscribe((pluginId) => {
       this.emit({ type: "status", payload: { status: "plugin_catalog_changed", pluginId } });
     });
+    const settings = pluginRuntime.subscribeSettings?.((pluginId, settingsId) => {
+      this.emit({
+        type: "status",
+        payload: { status: "plugin_settings_changed", pluginId, settingsId },
+      });
+    });
+    return () => {
+      catalog();
+      settings?.();
+    };
   }
 
   private dispatchVoiceAndControlMessage(msg: SessionInboundMessage): Promise<void> | undefined {
     switch (msg.type) {
       case "voice_audio_chunk":
-        return this.voiceSession.handleAudioChunk(msg);
       case "abort_request":
-        return this.voiceSession.handleAbort();
       case "audio_played":
-        this.voiceSession.handleAudioPlayed(msg.id);
-        return undefined;
       case "set_voice_mode":
-        return this.voiceSession.handleSetVoiceMode(msg.enabled, msg.agentId, msg.requestId);
       case "dictation_stream_start":
-        return this.voiceSession.handleDictationStreamStart(msg);
       case "dictation_stream_chunk":
-        return this.voiceSession.handleDictationChunk({
-          dictationId: msg.dictationId,
-          seq: msg.seq,
-          audioBase64: msg.audio,
-          format: msg.format,
-        });
       case "dictation_stream_finish":
-        return this.voiceSession.handleDictationFinish(msg.dictationId, msg.finalSeq);
       case "dictation_stream_cancel":
-        this.voiceSession.handleDictationCancel(msg.dictationId);
-        return undefined;
+        return this.voiceSessions.handleMessage(msg);
       case "restart_server_request":
         return this.handleRestartServerRequest(msg.requestId, msg.reason);
       case "shutdown_server_request":
@@ -2271,27 +2663,50 @@ export class Session {
         return this.handleFetchAgentTimelineRequest(msg, source);
       case "agent.timeline.append.request":
         return this.handleAgentTimelineAppendRequest(msg);
+      case "agent.timeline.search.request":
+        return this.handleAgentTimelineSearchRequest(msg, source);
       case "agent.timeline.list_prompts.request":
         return this.handleAgentTimelineListPromptsRequest(msg, source);
       case "agent.provider_subagents.list.request":
         return this.handleProviderSubagentListRequest(msg);
       case "agent.provider_subagents.timeline.get.request":
-        return this.handleProviderSubagentTimelineRequest(msg);
+        return this.handleProviderSubagentTimelineRequest(msg, source);
+      case "session.events.set_subscription.request": {
+        const owner = this.delivery.begin("events", undefined, async (id) => {
+          this.eventSubscriptions.delete(id);
+          this.refreshObservationProducers();
+          if (msg.events.includes("checkout_status_update"))
+            await this.reconcileWorkspaceGitObservers();
+        });
+        this.eventSubscriptions.set(owner.id, {
+          owner,
+          events: new Set(msg.events),
+          notifications: msg.notifications === true,
+        });
+        this.emitForSource(
+          {
+            type: "session.events.set_subscription.response",
+            payload: { requestId: msg.requestId, subscriptionId: owner.responseId },
+          },
+          source,
+        );
+        this.refreshObservationProducers();
+        if (!msg.events.includes("checkout_status_update")) return undefined;
+        return this.reconcileWorkspaceGitObservers().catch(async (error) => {
+          await owner.release();
+          throw error;
+        });
+      }
       case "agent.timeline.set_subscription.request": {
         const agentIds = [...new Set(msg.agentIds)].sort();
-        if (
-          source
-            ? this.supportsForSource(CLIENT_CAPS.selectiveAgentTimeline, source)
-            : this.supports(CLIENT_CAPS.selectiveAgentTimeline)
-        ) {
-          this.replaceAgentTimelineSubscription(source, agentIds);
-        }
-        const response: SessionOutboundMessage = {
-          type: "agent.timeline.set_subscription.response",
-          payload: { agentIds, requestId: msg.requestId },
-        };
-        if (source && this.onMessageToSource) this.onMessageToSource(source, response);
-        else this.emit(response);
+        const owner = this.subscribeAgentTimelines(agentIds);
+        this.emitForSource(
+          {
+            type: "agent.timeline.set_subscription.response",
+            payload: { agentIds, requestId: msg.requestId, subscriptionId: owner.responseId },
+          },
+          source,
+        );
         return undefined;
       }
       case "agent.fork_context.request":
@@ -2314,6 +2729,22 @@ export class Session {
     return undefined;
   }
 
+  private dispatchCreationMessage(
+    msg: SessionInboundMessage,
+    source?: object,
+  ): Promise<void> | undefined {
+    switch (msg.type) {
+      case "agent.create.request":
+        return this.handleAgentCreation(msg, source);
+      case "creation.subscribe.request":
+        return this.handleCreationSubscription(msg, source);
+      case "workspace.create.request":
+        return this.handleWorkspaceCreation(msg, source);
+      default:
+        return undefined;
+    }
+  }
+
   private dispatchAgentLifecycleMessage(msg: SessionInboundMessage): Promise<void> | undefined {
     switch (msg.type) {
       case "fetch_agents_request":
@@ -2426,11 +2857,12 @@ export class Session {
         return this.checkoutSession.handleBranchSuggestionsRequest(msg);
       case "directory_suggestions_request":
         return this.handleDirectorySuggestionsRequest(msg);
+      case "checkout.diff.get.request":
+        return this.checkoutSession.handleReadDiffRequest(msg);
       case "subscribe_checkout_diff_request":
-        return this.checkoutSession.handleSubscribeDiffRequest(msg);
+        return this.checkoutSession.handleSubscribeDiffRequest(msg, this.delivery);
       case "unsubscribe_checkout_diff_request":
-        this.checkoutSession.handleUnsubscribeDiffRequest(msg);
-        return undefined;
+        return this.checkoutSession.handleUnsubscribeDiffRequest(msg, this.delivery);
       case "checkout_switch_branch_request":
         return this.checkoutSession.handleCheckoutSwitchBranchRequest(msg);
       case "checkout.rename_branch.request":
@@ -2510,10 +2942,6 @@ export class Session {
         return this.handleArchiveWorkspaceRequest(msg);
       case "project.remove.request":
         return this.handleProjectRemoveRequest(msg);
-      case "workspace.create.request":
-        return this.handleWorkspaceCreateRequest(msg);
-      case "workspace.clear_attention.request":
-        return this.handleWorkspaceClearAttentionRequest(msg);
       case "workspace.title.set.request":
         return this.handleWorkspaceTitleSetRequest(msg.workspaceId, msg.title, msg.requestId);
       case "workspace.pin.set.request":
@@ -2558,10 +2986,9 @@ export class Session {
       case "file_explorer_request":
         return this.workspaceFilesSession.handleFileExplorerRequest(msg, source);
       case "fs.file.subscribe.request":
-        return this.workspaceFilesSession.handleFileSubscribeRequest(msg);
+        return this.workspaceFilesSession.handleFileSubscribeRequest(msg, this.delivery);
       case "fs.file.unsubscribe.request":
-        this.workspaceFilesSession.handleFileUnsubscribeRequest(msg);
-        return undefined;
+        return this.workspaceFilesSession.handleFileUnsubscribeRequest(msg, this.delivery);
       case "fs.file.write.request":
         return this.workspaceFilesSession.handleFileWriteRequest(msg);
       case "fs.entry.create.request":
@@ -2579,19 +3006,23 @@ export class Session {
       case "file_download_token_request":
         return this.workspaceFilesSession.handleFileDownloadTokenRequest(msg);
       case "file.upload.request":
-        this.workspaceFilesSession.handleFileUploadRequest(msg);
+        this.workspaceFilesSession.handleFileUploadRequest(msg, this.delivery);
         return undefined;
       default:
         return undefined;
     }
   }
 
-  private dispatchWorkspaceRecoveryMessage(msg: SessionInboundMessage): Promise<void> | undefined {
+  private dispatchWorkspaceStateMessage(msg: SessionInboundMessage): Promise<void> | undefined {
     switch (msg.type) {
       case "workspace.recovery.inspect.request":
         return this.handleWorkspaceRecoveryInspectRequest(msg);
       case "workspace.recovery.restore.request":
         return this.handleWorkspaceRecoveryRestoreRequest(msg);
+      case "workspace.clear_attention.request":
+        return this.handleWorkspaceClearAttentionRequest(msg);
+      case "workspace.mark_unread.request":
+        return this.handleWorkspaceMarkUnreadRequest(msg);
       default:
         return undefined;
     }
@@ -2614,7 +3045,9 @@ export class Session {
       case "provider_diagnostic_request":
         return this.providerCatalogSession.handleProviderDiagnosticRequest(msg);
       case "provider.usage.list.request":
-        return this.providerCatalogSession.handleProviderUsageListRequest(msg);
+        return this.usageSession.handleLegacyList(msg);
+      case "usage.list_reports.request":
+        return this.usageSession.handleListReports(msg);
       default:
         return undefined;
     }
@@ -2631,7 +3064,7 @@ export class Session {
       case "workspace.script.stop.request":
         return this.handleWorkspaceScriptStopRequest(msg);
       default:
-        return this.terminalController.dispatch(msg);
+        return this.terminalController.dispatch(msg, this.delivery);
     }
   }
 
@@ -2670,8 +3103,8 @@ export class Session {
         return;
       case "push.unregister.request":
         this.pushNotifications.revoke(msg.token);
-        if (this.registeredPushToken?.trim() === msg.token.trim()) {
-          this.registeredPushToken = null;
+        if (this.currentClientMetadata().pushToken?.trim() === msg.token.trim()) {
+          this.currentClientMetadata().pushToken = null;
         }
         this.emit({
           type: "push.unregister.response",
@@ -2689,15 +3122,15 @@ export class Session {
     return this.sessionId;
   }
 
-  public async handleBinaryFrame(binaryFrame: BinaryFrame): Promise<void> {
+  public async handleBinaryFrame(binaryFrame: BinaryFrame, source: object): Promise<void> {
     if (!this.authorization.allowsPermission("workspace.write")) {
       return;
     }
     if (binaryFrame.kind === "file_transfer") {
-      await this.workspaceFilesSession.handleFileTransferFrame(binaryFrame.frame);
+      await this.workspaceFilesSession.handleFileTransferFrame(binaryFrame.frame, source);
       return;
     }
-    this.terminalController.handleBinaryFrame(binaryFrame.frame);
+    this.terminalController.handleBinaryFrame(binaryFrame.frame, source);
   }
 
   private async handleRestartServerRequest(requestId: string, reason?: string): Promise<void> {
@@ -2829,7 +3262,7 @@ export class Session {
       agentId,
     );
 
-    if (this.agentUpdates.hasSubscription()) {
+    if (archivedRecord && this.agentUpdates.hasSubscription()) {
       const payload = await this.agentUpdates.emitStoredRecord(archivedRecord);
       if (payload.workspaceId) {
         await this.emitWorkspaceUpdateForWorkspaceId(payload.workspaceId);
@@ -2947,8 +3380,8 @@ export class Session {
         return candidate;
       }
       const updatedDelta =
-        Date.parse(resolveStoredAgentPayloadUpdatedAt(candidate)) -
-        Date.parse(resolveStoredAgentPayloadUpdatedAt(latest));
+        Date.parse(resolveStoredAgentUpdatedAt(candidate)) -
+        Date.parse(resolveStoredAgentUpdatedAt(latest));
       if (updatedDelta !== 0) {
         return updatedDelta > 0 ? candidate : latest;
       }
@@ -3495,11 +3928,343 @@ export class Session {
   /**
    * Handle create agent request
    */
+  private creationUpdate(snapshot: CreationSnapshot): SessionOutboundMessage {
+    return {
+      type: snapshot.kind === "workspace" ? "workspace.create.update" : "agent.create.update",
+      payload: snapshot,
+    };
+  }
+
+  private async handleCreationSubscription(
+    request: Extract<SessionInboundMessage, { type: "creation.subscribe.request" }>,
+    source?: object,
+  ): Promise<void> {
+    let unsubscribe = () => {};
+    const owner =
+      request.subscribe === false
+        ? undefined
+        : this.delivery.begin(
+            "creation",
+            undefined,
+            () => unsubscribe(),
+            JSON.stringify([request.kind, request.idempotencyKey]),
+          );
+    try {
+      const observation = await this.creationService.subscribe(
+        request.kind,
+        request.idempotencyKey,
+        (snapshot) => owner?.emit(this.creationUpdate(snapshot)),
+      );
+      unsubscribe = observation.unsubscribe;
+      if (!owner || owner.signal.aborted) unsubscribe();
+      this.emitForSource(
+        {
+          type: "creation.subscribe.response",
+          payload: {
+            requestId: request.requestId,
+            subscriptionId: owner?.responseId,
+            snapshot: observation.snapshot,
+            error: null,
+          },
+        },
+        source,
+      );
+    } catch (error) {
+      await owner?.release();
+      this.emitForSource(
+        {
+          type: "creation.subscribe.response",
+          payload: {
+            requestId: request.requestId,
+            snapshot: null,
+            error: error instanceof Error ? error.message : String(error),
+          },
+        },
+        source,
+      );
+    }
+  }
+
+  private creationResourceExists = async (
+    kind: "workspace" | "agent",
+    id: string,
+  ): Promise<boolean> =>
+    kind === "workspace"
+      ? (await this.workspaceRegistry.get(id)) !== null
+      : this.agentManager.getAgent(id) != null || (await this.agentStorage.get(id)) !== null;
+
+  private createRequestedAgent(
+    request: AgentCreateRequest,
+    observer?: (snapshot: CreationSnapshot) => void,
+  ): Promise<CreationSnapshot> {
+    const { requestId, type: _type, subscribe: _subscribe, idempotencyKey, ...intent } = request;
+    return this.creationService.create(
+      {
+        kind: "agent",
+        key: idempotencyKey ?? requestId,
+        request: intent,
+        workspaceId: request.workspaceId,
+        agentId: request.agentId,
+        hasAgent: true,
+        hasPrompt: hasInitialCreationPrompt(request),
+        exists: this.creationResourceExists,
+        readAgent: async (id) => {
+          const record = await this.agentStorage.get(id);
+          return record ? this.buildStoredAgentPayload(record) : null;
+        },
+        createAgent: async (id, _workspace, onReady) => {
+          try {
+            return await this.createSessionAgent(
+              { ...request, type: "create_agent_request" },
+              id,
+              onReady,
+            );
+          } catch (error) {
+            throw new WorktreeRequestError(toWorktreeWireError(error));
+          }
+        },
+      },
+      observer,
+    );
+  }
+
+  private async handleAgentCreation(request: AgentCreateRequest, source?: object): Promise<void> {
+    const { requestId, subscribe } = request;
+    const progress = subscribe
+      ? this.delivery.operation(
+          (message) =>
+            message.type === "workspace.create.update" || message.type === "agent.create.update",
+          () => {},
+        )
+      : undefined;
+    try {
+      const creation = await this.createRequestedAgent(
+        request,
+        progress ? (snapshot) => progress.emit(this.creationUpdate(snapshot)) : undefined,
+      );
+      this.emitForSource(
+        {
+          type: "agent.create.response",
+          payload: { requestId, agent: creation.agent ?? null, error: creation.error, creation },
+        },
+        source,
+      );
+    } catch (error) {
+      this.emitForSource(
+        {
+          type: "agent.create.response",
+          payload: {
+            requestId,
+            agent: null,
+            error: error instanceof Error ? error.message : String(error),
+          },
+        },
+        source,
+      );
+    } finally {
+      await progress?.release();
+    }
+  }
+
+  private async handleWorkspaceCreation(
+    request: Extract<SessionInboundMessage, { type: "workspace.create.request" }>,
+    source?: object,
+  ): Promise<void> {
+    const { requestId, subscribe, type: _type, idempotencyKey, ...intent } = request;
+    const progress = subscribe
+      ? this.delivery.operation(
+          (message) =>
+            message.type === "workspace.create.update" || message.type === "agent.create.update",
+          () => {},
+        )
+      : undefined;
+    try {
+      if (
+        request.agent &&
+        !this.authorization.allowsPermission("workspace.write") &&
+        !this.authorization.allowsPermission("hub.execute")
+      ) {
+        throw new Error("Session is not authorized to create an agent");
+      }
+      const agentInput = request.agent;
+      const creation = await this.creationService.create(
+        {
+          kind: "workspace",
+          key: idempotencyKey ?? requestId,
+          request: intent,
+          workspaceId: request.workspaceId,
+          agentId: agentInput?.agentId,
+          hasAgent: Boolean(agentInput),
+          hasPrompt: hasInitialCreationPrompt(agentInput),
+          exists: this.creationResourceExists,
+          provision: async (id) => {
+            const descriptor = await this.createRequestedWorkspace(
+              {
+                ...request,
+                firstAgentContext: agentInput
+                  ? { prompt: agentInput.initialPrompt, attachments: agentInput.attachments }
+                  : request.firstAgentContext,
+              },
+              id,
+            );
+            const workspace = await this.workspaceRegistry.get(descriptor.id);
+            return {
+              workspace: descriptor,
+              setupSkippedReason: workspace?.untrustedSource
+                ? formatWorkspaceAutomationBlockedMessage(workspace.untrustedSource)
+                : undefined,
+            };
+          },
+          createAgent: agentInput
+            ? async (id, workspace, onReady) => {
+                if (!workspace?.workspaceDirectory)
+                  throw new Error("Created workspace has no directory");
+                const sourceCwd =
+                  request.source.kind === "directory"
+                    ? request.source.path
+                    : await resolveWorktreeSourceCwd(request.source, this.projectRegistry);
+                const relativeCwd = relative(resolve(sourceCwd), resolve(agentInput.config.cwd));
+                if (
+                  relativeCwd === ".." ||
+                  relativeCwd.startsWith(`..${sep}`) ||
+                  isAbsolute(relativeCwd)
+                )
+                  throw new Error("Agent directory must be inside the workspace source");
+                return this.createSessionAgent(
+                  {
+                    ...agentInput,
+                    type: "create_agent_request",
+                    requestId,
+                    config: {
+                      ...agentInput.config,
+                      cwd: resolve(workspace.workspaceDirectory, relativeCwd),
+                    },
+                    workspaceId: workspace.id,
+                  },
+                  id,
+                  onReady,
+                );
+              }
+            : undefined,
+        },
+        progress ? (snapshot) => progress.emit(this.creationUpdate(snapshot)) : undefined,
+      );
+      this.emitForSource(
+        {
+          type: "workspace.create.response",
+          payload: {
+            requestId,
+            workspace: creation.workspace ?? null,
+            agent: creation.agent,
+            creation,
+            setupSkippedReason: creation.setupSkippedReason,
+            error: creation.error,
+            errorCode: creation.errorCode,
+            setupTerminalId: null,
+          },
+        },
+        source,
+      );
+    } catch (error) {
+      this.emitForSource(
+        {
+          type: "workspace.create.response",
+          payload: {
+            requestId,
+            workspace: null,
+            error: error instanceof Error ? error.message : String(error),
+            errorCode:
+              error instanceof Error && "code" in error && typeof error.code === "string"
+                ? error.code
+                : undefined,
+            setupTerminalId: null,
+          },
+        },
+        source,
+      );
+    } finally {
+      await progress?.release();
+    }
+  }
+
   private async handleCreateAgentRequest(msg: CreateAgentRequestMessage): Promise<void> {
+    try {
+      let agent: AgentSnapshotPayload;
+      if (msg.idempotencyKey !== undefined) {
+        if (msg.initialPrompt !== undefined) {
+          throw new Error("Idempotent creation requires sending the initial prompt separately");
+        }
+        const creation = await this.createRequestedAgent({ ...msg, type: "agent.create.request" });
+        if (creation.error || !creation.agent)
+          throw new SessionRequestError(
+            creation.errorCode ?? "unknown",
+            creation.error ?? "Agent creation failed",
+          );
+        const record = await this.agentStorage.get(creation.agent.id);
+        if (!record) throw new Error("Previously created agent no longer exists");
+        agent = this.buildStoredAgentPayload(record);
+      } else {
+        ({ agent } = await this.createSessionAgent(msg));
+      }
+      this.emit({
+        type: "status",
+        payload: {
+          status: "agent_created",
+          agentId: agent.id,
+          requestId: msg.requestId,
+          agent,
+        },
+      });
+    } catch (error) {
+      const wireError = error instanceof SessionRequestError ? error : toWorktreeWireError(error);
+      this.sessionLogger.error({ err: error }, "Failed to create agent");
+      this.emit({
+        type: "status",
+        payload: {
+          status: "agent_create_failed",
+          requestId: msg.requestId,
+          error: wireError.message,
+          errorCode: wireError.code,
+        },
+      });
+      this.emit({
+        type: "activity_log",
+        payload: {
+          id: uuidv4(),
+          timestamp: new Date(),
+          type: "error",
+          content: `Failed to create agent: ${wireError.message}`,
+        },
+      });
+    }
+  }
+
+  private validatePublicAgentWorkspaceIntent(
+    request: CreateAgentRequestMessage,
+    createsWorktree: boolean,
+  ): void {
+    if (request.internal)
+      throw new Error(
+        "Public internal agents were removed; create a background workspace instead.",
+      );
+    if (
+      request.background !== undefined &&
+      (request.workspaceId || (request.callerAgentId && !createsWorktree))
+    ) {
+      throw new Error(
+        "background is workspace creation intent; configure the selected workspace at creation.",
+      );
+    }
+  }
+
+  private async createSessionAgent(
+    msg: CreateAgentRequestMessage,
+    agentId?: string,
+    onAgentReady?: (agent: AgentSnapshotPayload) => Promise<void>,
+  ): Promise<CreatedAgent> {
     const {
       config,
       worktreeName,
-      requestId,
       initialPrompt,
       clientMessageId,
       outputSchema,
@@ -3526,6 +4291,9 @@ export class Session {
       if (needsRequestedDirectory && !(await this.filesystem.isDirectory(requestedCwd))) {
         throw new Error(`Working directory does not exist or is not a directory: ${requestedCwd}`);
       }
+      // Resolve all supported worktree input forms before provisioning workspace ownership.
+      const gitIntent = normalizeAgentCreationGitOptions(git, worktreeName, worktree);
+      this.validatePublicAgentWorkspaceIntent(msg, gitIntent?.createWorktree === true);
       const trimmedPrompt = initialPrompt?.trim();
       const { provisionalTitle } = resolveCreateAgentTitles({
         configTitle: config.title,
@@ -3539,9 +4307,11 @@ export class Session {
       const workspacePromptTitle = resolveFirstAgentPromptTitle(firstAgentContext);
       const createdWorktree = await this.createAgentLifecycleDispatch.createWorktreeForRequest({
         cwd: config.cwd,
-        target: worktree,
+        target: gitIntent,
         firstAgentContext,
-        hasLegacyGitOptions: Boolean(git),
+        setupContinuation: worktree ? undefined : this.agentWorktreeSetupContinuation(),
+        background: msg.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(msg.callerAgentId),
       });
       createdWorktreeForCleanup = createdWorktree;
       const resolvedIntent = await this.resolveSessionCreateAgentIntent({
@@ -3554,7 +4324,7 @@ export class Session {
         throw new Error(`Working directory does not exist or is not a directory: ${resolvedCwd}`);
       }
 
-      const { snapshot, liveSnapshot } = await createAgentCommand(
+      const { snapshot, liveSnapshot, initialPromptStarted } = await createAgentCommand(
         {
           agentManager: this.agentManager,
           agentStorage: this.agentStorage,
@@ -3565,10 +4335,18 @@ export class Session {
         },
         {
           kind: "session",
+          onAgentReady: async (agent) => {
+            createdAgentId = agent.id;
+            await onAgentReady?.(await this.buildAgentPayload(agent));
+          },
+          agentId,
           config: resolvedIntent.config,
           workspaceId: resolvedIntent.intent.workspaceId,
           worktreeName,
           initialPrompt,
+          source: msg.callerAgentId
+            ? { kind: "agent-message", agentId: msg.callerAgentId }
+            : undefined,
           clientMessageId,
           outputSchema,
           images,
@@ -3578,8 +4356,14 @@ export class Session {
           env,
           provisionalTitle,
           firstAgentContext,
-          buildSessionConfig: (sessionConfig, gitOptions, legacyWorktreeName, ctx) =>
-            this.buildAgentSessionConfig(sessionConfig, gitOptions, legacyWorktreeName, ctx),
+          buildSessionConfig: async (sessionConfig, gitOptions, legacyWorktreeName, ctx) =>
+            createdWorktree
+              ? {
+                  sessionConfig,
+                  setupContinuation: createdWorktree.setupContinuation,
+                  createdWorkspaceId: createdWorktree.workspace.workspaceId,
+                }
+              : this.buildAgentSessionConfig(sessionConfig, gitOptions, legacyWorktreeName, ctx),
         },
       );
       createdAgentId = snapshot.id;
@@ -3599,50 +4383,17 @@ export class Session {
         agentId: snapshot.id,
         createdWorktree,
       });
-      if (requestId) {
-        const agentPayload = await this.buildAgentPayload(liveSnapshot);
-        this.emit({
-          type: "status",
-          payload: {
-            status: "agent_created",
-            agentId: liveSnapshot.id,
-            requestId,
-            agent: agentPayload,
-          },
-        });
-      }
-
       this.sessionLogger.info(
         { agentId: snapshot.id, provider: snapshot.provider },
-        `Created agent ${snapshot.id} (${snapshot.provider})`,
+        "Created agent",
       );
+      return { agent: await this.buildAgentPayload(liveSnapshot), initialPromptStarted };
     } catch (error) {
       await this.createAgentLifecycleDispatch.cleanupCreatedWorktreeAfterFailedAgentCreate({
         createdWorktree: createdWorktreeForCleanup,
         createdAgentId,
       });
-      const wireError = toWorktreeWireError(error);
-      this.sessionLogger.error({ err: error }, "Failed to create agent");
-      if (requestId) {
-        this.emit({
-          type: "status",
-          payload: {
-            status: "agent_create_failed",
-            requestId,
-            error: wireError.message,
-            errorCode: wireError.code,
-          },
-        });
-      }
-      this.emit({
-        type: "activity_log",
-        payload: {
-          id: uuidv4(),
-          timestamp: new Date(),
-          type: "error",
-          content: `Failed to create agent: ${wireError.message}`,
-        },
-      });
+      throw error;
     }
   }
 
@@ -3682,6 +4433,8 @@ export class Session {
           createdWorktree: null,
           cwd: config.cwd,
           initialTitle: input.workspacePromptTitle,
+          background: request.background,
+          callerWorkspaceId: callerAgent?.workspaceId,
         }),
         cwd: config.cwd,
       }),
@@ -4018,29 +4771,36 @@ export class Session {
     const timeline = this.agentManager.fetchTimeline(agentId, { limit: 0 });
     const epoch = timeline.epoch;
 
-    if (this.clientCapabilitiesBySource.size === 0 || !this.onMessageToSource) {
+    if (this.clientSources.size === 0 || !this.onMessageToSource) {
       if (!this.supports(CLIENT_CAPS.timelineReplacementInvalidation)) {
         this.emitReconstructedTimelineRows(agentId, agent.provider, timeline.rows, epoch);
       }
       return;
     }
 
-    for (const [source, capabilities] of this.clientCapabilitiesBySource) {
-      const isInitiator = source === initiatingSource;
-      const supportsReplacement = capabilities.has(CLIENT_CAPS.timelineReplacementInvalidation);
-      const isSubscribed = this.viewedTimelineAgentIdsBySource.get(source)?.has(agentId) === true;
-      if (supportsReplacement) {
-        if (isSubscribed && !isInitiator) {
-          this.onMessageToSource(source, {
-            type: "agent.timeline.replacement",
-            payload: { agentId, epoch },
-          });
-        }
-        continue;
+    for (const subscription of this.timelineSubscriptions.values()) {
+      const source = subscription.owner.source;
+      if (!subscription.agentIds.has(agentId)) continue;
+      const modern = this.delivery.isModern(source);
+      if (
+        modern ||
+        (source !== initiatingSource &&
+          this.supportsForSource(CLIENT_CAPS.timelineReplacementInvalidation, source))
+      ) {
+        subscription.owner.emit({
+          type: "agent.timeline.replacement",
+          payload: { agentId, epoch },
+        });
+      }
+    }
+    // COMPAT(timelineReplacementInvalidation): added in v0.5.0, remove reconstructed replay after 2027-02-21.
+    for (const [source, { capabilities }] of this.clientSources) {
+      if (
+        !this.delivery.isModern(source) &&
+        !capabilities.has(CLIENT_CAPS.timelineReplacementInvalidation)
+      ) {
+        this.emitReconstructedTimelineRows(agentId, agent.provider, timeline.rows, epoch, source);
       }
-      // COMPAT(timelineReplacementInvalidation): added in v0.5.0, replay reconstructed
-      // rows to legacy clients until the supported client floor is >= v0.5.0 after 2027-02-21.
-      this.emitReconstructedTimelineRows(agentId, agent.provider, timeline.rows, epoch, source);
     }
   }
 
@@ -4052,6 +4812,9 @@ export class Session {
     source?: object,
   ): void {
     for (const row of rows) {
+      if (!this.supportsTimelineItem(row.item, source)) {
+        continue;
+      }
       const event = serializeAgentStreamEvent({
         type: "timeline",
         provider,
@@ -4070,6 +4833,26 @@ export class Session {
     }
   }
 
+  private agentWorktreeSetupContinuation(): CreatePaseoWorktreeSetupContinuationInput {
+    return {
+      kind: "agent",
+      terminalManager: this.terminalManager,
+      appendTimelineItem: ({ agentId, item }) =>
+        appendTimelineItemIfAgentKnown({
+          agentManager: this.agentManager,
+          agentId,
+          item,
+        }),
+      emitLiveTimelineItem: ({ agentId, item }) =>
+        emitLiveTimelineItemIfAgentKnown({
+          agentManager: this.agentManager,
+          agentId,
+          item,
+        }),
+      logger: this.sessionLogger,
+    };
+  }
+
   private async buildAgentSessionConfig(
     config: AgentSessionConfig,
     gitOptions?: GitSetupOptions,
@@ -4089,23 +4872,7 @@ export class Session {
         createPaseoWorktree: (input, serviceOptions) =>
           this.createPaseoWorktreeWorkflow(input, {
             ...serviceOptions,
-            setupContinuation: {
-              kind: "agent",
-              terminalManager: this.terminalManager,
-              appendTimelineItem: ({ agentId, item }) =>
-                appendTimelineItemIfAgentKnown({
-                  agentManager: this.agentManager,
-                  agentId,
-                  item,
-                }),
-              emitLiveTimelineItem: ({ agentId, item }) =>
-                emitLiveTimelineItemIfAgentKnown({
-                  agentManager: this.agentManager,
-                  agentId,
-                  item,
-                }),
-              logger: this.sessionLogger,
-            },
+            setupContinuation: this.agentWorktreeSetupContinuation(),
           }),
         checkoutExistingBranch: (cwd, branch) =>
           this.gitMutation.checkoutExistingBranch(cwd, branch),
@@ -4186,7 +4953,8 @@ export class Session {
     const appVisibilityChangedAt = msg.appVisibilityChangedAt
       ? new Date(msg.appVisibilityChangedAt)
       : new Date(msg.lastActivityAt);
-    this.clientActivity = {
+    const metadata = this.currentClientMetadata();
+    metadata.activity = {
       deviceType: msg.deviceType,
       focusedAgentId: msg.focusedAgentId,
       focusedTerminalId,
@@ -4197,8 +4965,8 @@ export class Session {
     if (msg.appVisible && focusedTerminalId) {
       void this.clearFocusedTerminalAttention(focusedTerminalId);
     }
-    if (this.registeredPushToken) {
-      this.pushNotifications.renew(this.registeredPushToken);
+    if (metadata.pushToken) {
+      this.pushNotifications.renew(metadata.pushToken);
     }
   }
 
@@ -4218,7 +4986,7 @@ export class Session {
    * Handle push token registration
    */
   private handleRegisterPushToken(token: string): void {
-    this.registeredPushToken = token;
+    this.currentClientMetadata().pushToken = token;
     this.pushNotifications.renew(token);
     this.sessionLogger.info("Registered push token");
   }
@@ -4324,6 +5092,15 @@ export class Session {
         response,
         logger: this.sessionLogger,
       });
+      // COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09.
+      // Legacy clients consume the single domain resolution; modern request outcomes
+      // are independent of whether this socket (or its logical Session) observes it.
+      if (this.delivery.isModern(this.delivery.currentSource)) {
+        this.delivery.reply({
+          type: "agent_permission_resolved",
+          payload: { agentId, requestId, resolution: response },
+        });
+      }
     } catch (error) {
       this.sessionLogger.error(
         { err: error, agentId, requestId },
@@ -4348,8 +5125,13 @@ export class Session {
     try {
       const workspaceCwd = cwd?.trim();
       const searchesWorkspace = Boolean(workspaceCwd);
+      const homeRoot = process.env.HOME ?? homedir();
+      // readdir on TCC-protected folders under ~/Library blocks forever for a process that cannot
+      // show a consent prompt, and each blocked call holds a libuv threadpool thread.
+      const excludedDiscoveryPaths =
+        !searchesWorkspace && process.platform === "darwin" ? [join(homeRoot, "Library")] : [];
       const entries = await searchDirectoryEntries({
-        root: workspaceCwd ? expandTilde(workspaceCwd) : (process.env.HOME ?? homedir()),
+        root: workspaceCwd ? expandTilde(workspaceCwd) : homeRoot,
         query,
         pathFormat: searchesWorkspace ? "relative" : "absolute",
         pathQueryPolicy: searchesWorkspace ? "slashes" : "rooted",
@@ -4360,6 +5142,7 @@ export class Session {
           : [],
         confidentResultScanThreshold: searchesWorkspace ? undefined : 5_000,
         respectGitIgnore: searchesWorkspace,
+        excludedDiscoveryPaths,
         includeFiles,
         includeDirectories,
         matchMode,
@@ -4458,60 +5241,25 @@ export class Session {
   /**
    * Build the current agent list payload (live + persisted), optionally filtered by labels.
    */
-  private async listAgentPayloads(filter?: {
-    labels?: Record<string, string>;
-    includeArchived?: boolean;
-    includeUnavailablePersisted?: boolean;
-  }): Promise<AgentSnapshotPayload[]> {
-    const includeArchived = filter?.includeArchived === true;
-    const labelEntries = filter?.labels ? Object.entries(filter.labels) : [];
-
-    // Get live agents with session modes
-    const agentSnapshots = this.agentManager.listAgents();
-    const liveAgents = await Promise.all(
-      agentSnapshots.map((agent) => this.buildAgentPayload(agent)),
-    );
-
-    // Add persisted agents that have not been lazily initialized yet
-    // (excluding internal agents which are for ephemeral system tasks)
-    const registryRecords = await this.agentStorage.list();
-    const liveIds = new Set(agentSnapshots.map((a) => a.id));
-    const registeredProviderIds = new Set(this.providerSnapshotManager.listRegisteredProviderIds());
-    const persistedAgents = registryRecords
-      .filter((record) => !liveIds.has(record.id) && !record.internal)
-      // Keep raw-record filters ahead of projection; seeded homes can carry thousands of archived agents.
-      .filter((record) => includeArchived || !record.archivedAt)
-      .filter((record) => labelEntries.every(([key, value]) => record.labels?.[key] === value))
-      .filter(
-        (record) =>
-          filter?.includeUnavailablePersisted === true ||
-          isStoredAgentProviderAvailable(record, registeredProviderIds),
-      )
-      .map((record) => this.buildStoredAgentPayload(record, registeredProviderIds));
-
-    let agents = [...liveAgents, ...persistedAgents];
-
-    agents = agents.filter((agent) => this.isProviderVisibleToClient(agent.provider));
-    if (!includeArchived) {
-      agents = agents.filter((agent) => !agent.archivedAt);
-    }
-
-    // Filter by labels if filter provided
-    if (labelEntries.length > 0) {
-      agents = agents.filter((agent) =>
-        labelEntries.every(([key, value]) => agent.labels[key] === value),
-      );
-    }
-
-    return agents;
+  private listAgentPayloads(
+    filter?: Parameters<AgentDirectory["list"]>[0],
+  ): Promise<AgentSnapshotPayload[]> {
+    return this.agentDirectory.list(filter);
   }
 
   private async resolveAgentIdentifier(
     identifier: string,
-  ): Promise<{ ok: true; agentId: string } | { ok: false; error: string }> {
+  ): Promise<{ ok: true; agentId: string } | { ok: false; notFound: boolean; error: string }> {
     const trimmed = identifier.trim();
     if (!trimmed) {
-      return { ok: false, error: "Agent identifier cannot be empty" };
+      return { ok: false, notFound: false, error: "Agent identifier cannot be empty" };
+    }
+
+    // An internal agent, live or recently archived, is addressable by its exact
+    // id and nothing else: the caller that created it holds the id, and no
+    // listing ever includes it.
+    if (this.agentManager.getAgent(trimmed) || this.agentManager.getRetiredInternalAgent(trimmed)) {
+      return { ok: true, agentId: trimmed };
     }
 
     const stored = await this.agentStorage.list();
@@ -4535,6 +5283,7 @@ export class Session {
     if (prefixMatches.length > 1) {
       return {
         ok: false,
+        notFound: false,
         error: `Agent identifier "${trimmed}" is ambiguous (${prefixMatches
           .slice(0, 5)
           .map((id) => id.slice(0, 8))
@@ -4549,6 +5298,7 @@ export class Session {
     if (titleMatches.length > 1) {
       return {
         ok: false,
+        notFound: false,
         error: `Agent title "${trimmed}" is ambiguous (${titleMatches
           .slice(0, 5)
           .map((r) => r.id.slice(0, 8))
@@ -4556,7 +5306,26 @@ export class Session {
       };
     }
 
-    return { ok: false, error: `Agent not found: ${trimmed}` };
+    return { ok: false, notFound: true, error: `Agent not found: ${trimmed}` };
+  }
+
+  /**
+   * An agent that is no longer live, in its settled form: the retained snapshot
+   * of a recently archived internal agent, else its stored record. Null when
+   * neither exists, and for a stored internal record, which is never served.
+   */
+  private async readSettledAgent(
+    agentId: string,
+  ): Promise<{ record: StoredAgentRecord; lastMessage: string | null } | null> {
+    const retired = this.agentManager.getRetiredInternalAgent(agentId);
+    if (retired) {
+      return { record: retired.record, lastMessage: retired.lastMessage };
+    }
+    const record = await this.agentStorage.get(agentId);
+    if (!record || record.internal) {
+      return null;
+    }
+    return { record, lastMessage: null };
   }
 
   private async getAgentPayloadById(agentId: string): Promise<AgentSnapshotPayload | null> {
@@ -4566,11 +5335,11 @@ export class Session {
       return this.isProviderVisibleToClient(payload.provider) ? payload : null;
     }
 
-    const record = await this.agentStorage.get(agentId);
-    if (!record || record.internal) {
+    const settled = await this.readSettledAgent(agentId);
+    if (!settled) {
       return null;
     }
-    const payload = this.buildStoredAgentPayload(record);
+    const payload = this.buildStoredAgentPayload(settled.record);
     return this.isProviderVisibleToClient(payload.provider) ? payload : null;
   }
 
@@ -4638,8 +5407,9 @@ export class Session {
     limit: number;
     getPlacement: (workspaceId: string | undefined) => Promise<ProjectPlacementPayload | null>;
     filter: AgentUpdatesFilter | undefined;
+    search?: string;
   }): Promise<FetchAgentsResponseEntry[]> {
-    const { candidates, limit, getPlacement, filter } = params;
+    const { candidates, limit, getPlacement, filter, search } = params;
     const matchedEntries: FetchAgentsResponseEntry[] = [];
     const batchSize = 25;
     for (
@@ -4667,6 +5437,7 @@ export class Session {
         ) {
           continue;
         }
+        if (search && !matchesAgentHistoryQuery(search, entry)) continue;
         matchedEntries.push(entry);
         if (matchedEntries.length > limit) {
           break;
@@ -4692,6 +5463,9 @@ export class Session {
     let agents = await this.listAgentPayloads({
       labels: filter?.labels,
       includeArchived: filter?.includeArchived,
+      includeBackground:
+        filter?.includeBackground ||
+        (request.type === "fetch_agents_request" && request.includeBackground),
       includeUnavailablePersisted: request.type === "fetch_agent_history_request",
     });
     const activePlacementsByWorkspaceId =
@@ -4725,17 +5499,6 @@ export class Session {
     };
 
     const search = agentDirectorySearchQuery(request);
-    if (search) {
-      return this.listRankedAgentHistoryEntries({
-        search,
-        agents,
-        sort,
-        filter,
-        getPlacement,
-        page: request.page,
-      });
-    }
-
     let candidates = [...agents];
     candidates.sort((left, right) => this.agentsPager.compare(left, right, sort));
     const cursorToken = request.page?.cursor;
@@ -4753,6 +5516,7 @@ export class Session {
       limit,
       getPlacement,
       filter,
+      search,
     });
 
     const pagedEntries = matchedEntries.slice(0, limit);
@@ -4772,64 +5536,6 @@ export class Session {
     };
   }
 
-  /**
-   * The searched history page. Ranking has to see every candidate before it can
-   * name the best one, so this path resolves placements for the whole set
-   * instead of stopping at the page limit — that is what makes a query answer
-   * from all persisted sessions rather than from the first page of them.
-   */
-  private async listRankedAgentHistoryEntries(params: {
-    search: string;
-    agents: AgentSnapshotPayload[];
-    sort: FetchAgentsRequestSort[];
-    filter: AgentUpdatesFilter | undefined;
-    getPlacement: (workspaceId: string | undefined) => Promise<ProjectPlacementPayload | null>;
-    page: AgentDirectoryRequestMessage["page"];
-  }): Promise<{
-    entries: FetchAgentsResponseEntry[];
-    pageInfo: FetchAgentsResponsePageInfo;
-    searchTruncated: boolean;
-  }> {
-    const { search, agents, sort, filter, getPlacement, page } = params;
-    if (page?.cursor) {
-      // A ranked result set has no pages to walk, so a cursor here is caller
-      // misuse. Returning the ranked head instead would hide it.
-      throw new SessionRequestError(
-        "invalid_cursor",
-        "A history search returns one ranked page; it cannot be paged with a cursor.",
-      );
-    }
-
-    const allEntries = await this.collectFetchAgentsEntries({
-      candidates: agents,
-      limit: Number.MAX_SAFE_INTEGER,
-      getPlacement,
-      filter,
-    });
-
-    const ranked = rankAgentHistoryCandidates(search, allEntries, (left, right) =>
-      this.agentsPager.compare(left.agent, right.agent, sort),
-    );
-
-    const limit = page?.limit ?? 200;
-    // Ranges are derived only for the rows that will be rendered; ranking
-    // itself never needs them.
-    const entries = ranked.slice(0, limit).map((result) =>
-      Object.assign({}, result.candidate, {
-        searchScore: result.searchScore,
-        searchMatches: describeAgentHistoryMatches(search, result.candidate),
-      }),
-    );
-
-    return {
-      entries,
-      // No next page exists, so `hasMore` is false and truncation is reported
-      // on its own field. See the note on rankAgentHistoryCandidates.
-      pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-      searchTruncated: ranked.length > limit,
-    };
-  }
-
   private readonly agentsPager = new SortablePager<
     AgentSnapshotPayload,
     FetchAgentsRequestSort["key"]
@@ -4903,6 +5609,7 @@ export class Session {
       title: workspace.title,
       pinnedAt: workspace.pinnedAt,
       ...(workspace.labels && workspace.labels.length > 0 ? { labels: workspace.labels } : {}),
+      background: workspace.background,
       archivingAt: null,
       status: "done",
       statusEnteredAt: null,
@@ -4988,6 +5695,7 @@ export class Session {
       worktreeSlug: basename(result.worktree.worktreePath),
       projectKind: projectRecord?.kind ?? "git",
       workspaceKind: result.workspace.kind,
+      background: result.workspace.background,
       name: resolveWorkspaceName({
         title: result.workspace.title,
         derivedDisplayName: result.worktree.branchName || result.workspace.displayName,
@@ -5066,7 +5774,13 @@ export class Session {
     pageInfo: FetchWorkspacesResponsePageInfo;
   }> {
     try {
-      return await this.workspaceDirectory.listFetchEntries(request);
+      return await this.workspaceDirectory.listFetchEntries({
+        ...request,
+        filter: {
+          ...request.filter,
+          ...(request.includeBackground ? { includeBackground: true } : {}),
+        },
+      });
     } catch (error) {
       if (error instanceof CursorError) {
         throw new SessionRequestError("invalid_cursor", error.message);
@@ -5079,6 +5793,8 @@ export class Session {
     subscription: WorkspaceUpdatesSubscriptionState,
     payload: WorkspaceUpdatePayload,
   ): void {
+    if (this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription)
+      return;
     if (payload.kind === "upsert") {
       subscription.visibleEmptyProjectIds?.delete(payload.workspace.projectId);
     } else {
@@ -5096,20 +5812,22 @@ export class Session {
     }
     const workspaceId = payload.kind === "upsert" ? payload.workspace.id : payload.id;
     subscription.lastEmittedByWorkspaceId.set(workspaceId, payload);
-    this.emit({
-      type: "workspace_update",
-      payload,
-    });
+    subscription.owner.emit({ type: "workspace_update", payload });
   }
 
-  private flushBootstrappedWorkspaceUpdates(options?: {
-    snapshotByWorkspaceId?: Map<
-      string,
-      { status: string; statusEnteredAt: string | null; activityAtMs: number | null }
-    >;
-  }): void {
-    const subscription = this.workspaceUpdatesSubscription;
-    if (!subscription || !subscription.isBootstrapping) {
+  private flushBootstrappedWorkspaceUpdates(
+    subscription: WorkspaceUpdatesSubscriptionState,
+    options?: {
+      snapshotByWorkspaceId?: Map<
+        string,
+        { status: string; statusEnteredAt: string | null; activityAtMs: number | null }
+      >;
+    },
+  ): void {
+    if (
+      this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription ||
+      !subscription.isBootstrapping
+    ) {
       return;
     }
 
@@ -5143,10 +5861,7 @@ export class Session {
       }
       const workspaceId = payload.kind === "upsert" ? payload.workspace.id : payload.id;
       subscription.lastEmittedByWorkspaceId.set(workspaceId, payload);
-      this.emit({
-        type: "workspace_update",
-        payload,
-      });
+      subscription.owner.emit({ type: "workspace_update", payload });
     }
   }
 
@@ -5284,17 +5999,11 @@ export class Session {
     workspaceIds: Iterable<string>,
     options?: WorkspaceUpdateOptions,
   ): Promise<void> {
-    const subscription = this.workspaceUpdatesSubscription;
-    if (!subscription) {
-      return;
+    const uniqueWorkspaceIds = new Set(workspaceIds);
+    if (uniqueWorkspaceIds.size === 0) return;
+    for (const subscription of this.workspaceUpdatesSubscriptions.values()) {
+      await this.enqueueWorkspaceUpdates(uniqueWorkspaceIds, subscription, options);
     }
-
-    const uniqueWorkspaceIds = new Set(Array.from(workspaceIds));
-    if (uniqueWorkspaceIds.size === 0) {
-      return;
-    }
-
-    await this.enqueueWorkspaceUpdates(uniqueWorkspaceIds, subscription, options);
   }
 
   private enqueueWorkspaceUpdates(
@@ -5306,7 +6015,9 @@ export class Session {
       (this.workspaceUpdateTails.get(workspaceId) ?? Promise.resolve()).catch(() => undefined),
     );
     const next = Promise.all(previous).then(() =>
-      this.emitWorkspaceUpdateBatch(workspaceIds, subscription, options),
+      this.delivery.forSource(subscription.owner.source, () =>
+        this.emitWorkspaceUpdateBatch(workspaceIds, subscription, options),
+      ),
     );
     for (const workspaceId of workspaceIds) {
       this.workspaceUpdateTails.set(workspaceId, next);
@@ -5328,7 +6039,7 @@ export class Session {
     subscription: WorkspaceUpdatesSubscriptionState,
     options: WorkspaceUpdateOptions | undefined,
   ): Promise<void> {
-    if (this.workspaceUpdatesSubscription !== subscription) {
+    if (this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription) {
       return;
     }
 
@@ -5338,7 +6049,7 @@ export class Session {
     });
 
     for (const workspaceId of workspaceIds) {
-      if (this.workspaceUpdatesSubscription !== subscription) {
+      if (this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription) {
         return;
       }
       const workspace = descriptorsByWorkspaceId.get(workspaceId);
@@ -5351,18 +6062,12 @@ export class Session {
         options?.optimisticStatus,
       );
       const lastEmitted = subscription.lastEmittedByWorkspaceId.get(workspaceId);
-      if (
-        options?.dedupeGitState &&
-        this.workspaceGitObserver.shouldSkipUpdate(workspaceId, nextWorkspace)
-      ) {
-        continue;
-      }
       this.workspaceGitObserver.recordDescriptorState(workspaceId, nextWorkspace);
       if (!nextWorkspace) {
         if (this.shouldSkipWorkspaceRemoval(lastEmitted, options?.removedProjectId)) {
           continue;
         }
-        if (this.workspaceUpdatesSubscription !== subscription) {
+        if (this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription) {
           return;
         }
         subscription.lastEmittedByWorkspaceId.delete(workspaceId);
@@ -5377,6 +6082,7 @@ export class Session {
             workspace ?? null,
             workspaceId,
             subscription.syncEnabled === true,
+            subscription.filter?.includeBackground,
           ),
         );
         continue;
@@ -5387,6 +6093,7 @@ export class Session {
         workspace ?? null,
         workspaceId,
         subscription.syncEnabled === true,
+        subscription.filter?.includeBackground,
       );
 
       if (
@@ -5467,12 +6174,8 @@ export class Session {
   // and emits its own per-id descriptor. This is a deliberate same-folder fan,
   // not a cwd → id ownership lookup: git never resolves which workspace owns a
   // path. See `workspaceIdsOnCheckout`.
-  private async emitWorkspaceUpdateForCwd(
-    cwd: string,
-    options?: {
-      dedupeGitState?: boolean;
-    },
-  ): Promise<void> {
+  private async emitWorkspaceUpdateForCwd(cwd: string, options?: {}): Promise<void> {
+    if (this.workspaceUpdatesSubscriptions.size === 0) return;
     const workspaceIds = workspaceIdsOnCheckout(await this.workspaceRegistry.list(), cwd);
     if (workspaceIds.length === 0) {
       return;
@@ -5483,16 +6186,29 @@ export class Session {
   private async handleFetchAgents(
     request: Extract<SessionInboundMessage, { type: "fetch_agents_request" }>,
   ): Promise<void> {
-    const requestedSubscriptionId = request.subscribe?.subscriptionId?.trim();
-    const subscriptionId = resolveSubscriptionId(request.subscribe, requestedSubscriptionId);
-
+    const owner = request.subscribe
+      ? this.delivery.begin("agents", request.subscribe.subscriptionId, (id) => {
+          this.agentUpdates.clearSubscription(id);
+          this.refreshObservationProducers();
+        })
+      : null;
+    const subscriptionId = owner?.responseId;
     try {
-      if (subscriptionId) {
+      if (owner) {
         this.agentUpdates.beginSubscription({
-          subscriptionId,
-          filter: request.filter,
+          subscriptionId: owner.id,
+          isProviderVisible: (provider) =>
+            this.delivery.forSource(owner.source, () => this.isProviderVisibleToClient(provider)),
+          filter: {
+            ...request.filter,
+            ...(request.includeBackground ? { includeBackground: true } : {}),
+          },
           syncEnabled: Boolean(request.sync),
+          emit: (message) => {
+            if (message.type === "agent_update") owner.emit(message);
+          },
         });
+        this.refreshObservationProducers();
       }
 
       const payload = request.sync
@@ -5516,11 +6232,11 @@ export class Session {
       });
 
       if (subscriptionId) {
-        this.agentUpdates.flushBootstrapped(subscriptionId, { snapshotUpdatedAtByAgentId });
+        this.agentUpdates.flushBootstrapped(owner!.id, { snapshotUpdatedAtByAgentId });
       }
     } catch (error) {
       if (subscriptionId) {
-        this.agentUpdates.clearSubscription(subscriptionId);
+        await owner?.release();
       }
       const code = error instanceof SessionRequestError ? error.code : "fetch_agents_failed";
       const message = error instanceof Error ? error.message : "Failed to fetch agents";
@@ -5612,9 +6328,33 @@ export class Session {
   private async handleFetchWorkspacesRequest(
     request: Extract<SessionInboundMessage, { type: "fetch_workspaces_request" }>,
   ): Promise<void> {
-    const requestedSubscriptionId = request.subscribe?.subscriptionId?.trim();
-    const subscriptionId = resolveSubscriptionId(request.subscribe, requestedSubscriptionId);
-
+    const owner = request.subscribe
+      ? this.delivery.begin("workspaces", request.subscribe.subscriptionId, async (id) => {
+          this.workspaceUpdatesSubscriptions.delete(id);
+          this.refreshObservationProducers();
+          await this.reconcileWorkspaceGitObservers();
+        })
+      : null;
+    const subscriptionId = owner?.responseId;
+    const subscription: WorkspaceUpdatesSubscriptionState | null = owner
+      ? {
+          subscriptionId: owner.id,
+          owner,
+          syncEnabled: Boolean(request.sync),
+          filter: {
+            ...request.filter,
+            ...(request.includeBackground ? { includeBackground: true } : {}),
+          },
+          isBootstrapping: true,
+          pendingUpdatesByWorkspaceId: new Map(),
+          lastEmittedByWorkspaceId: new Map(),
+          visibleEmptyProjectIds: new Set(),
+        }
+      : null;
+    if (subscription) {
+      this.workspaceUpdatesSubscriptions.set(subscription.subscriptionId, subscription);
+      this.refreshObservationProducers();
+    }
     try {
       this.sessionLogger.debug(
         {
@@ -5626,22 +6366,10 @@ export class Session {
         },
         "fetch_workspaces_request_received",
       );
-      if (subscriptionId) {
-        this.workspaceUpdatesSubscription = {
-          subscriptionId,
-          syncEnabled: Boolean(request.sync),
-          filter: request.filter,
-          isBootstrapping: true,
-          pendingUpdatesByWorkspaceId: new Map(),
-          lastEmittedByWorkspaceId: new Map(),
-          visibleEmptyProjectIds: new Set(),
-        };
-      }
-
       const payload = request.sync
         ? await this.readWorkspaceDirectorySync(request)
         : await this.listFetchWorkspacesEntries(request);
-      this.workspaceGitObserver.syncObservers(payload.entries);
+
       this.sessionLogger.debug(
         {
           requestId: request.requestId,
@@ -5652,12 +6380,13 @@ export class Session {
         "fetch_workspaces_response_ready",
       );
       const snapshot = this.buildBootstrapSnapshot(payload.entries);
-      this.seedWorkspaceSubscriptionSnapshot(
-        subscriptionId,
-        request.filter,
-        payload.entries,
-        payload.emptyProjects,
-      );
+      if (subscription) {
+        this.seedWorkspaceSubscriptionSnapshot(
+          subscription,
+          payload.entries,
+          payload.emptyProjects,
+        );
+      }
 
       this.emit({
         type: "fetch_workspaces_response",
@@ -5668,13 +6397,12 @@ export class Session {
         },
       });
 
-      if (subscriptionId && this.workspaceUpdatesSubscription?.subscriptionId === subscriptionId) {
-        this.flushBootstrappedWorkspaceUpdates(snapshot);
+      if (subscription) {
+        await this.reconcileWorkspaceGitObservers();
+        this.flushBootstrappedWorkspaceUpdates(subscription, snapshot);
       }
     } catch (error) {
-      if (subscriptionId && this.workspaceUpdatesSubscription?.subscriptionId === subscriptionId) {
-        this.workspaceUpdatesSubscription = null;
-      }
+      await owner?.release();
       const code = error instanceof SessionRequestError ? error.code : "fetch_workspaces_failed";
       const message = error instanceof Error ? error.message : "Failed to fetch workspaces";
       this.sessionLogger.error({ err: error }, "Failed to handle fetch_workspaces_request");
@@ -5702,7 +6430,6 @@ export class Session {
       const synchronized = request.sync
         ? this.directorySync.synchronizeProjects(projects, request.sync)
         : null;
-      if (synchronized) this.projectSyncEnabled = true;
       this.emit({
         type: "project.list.response",
         payload: {
@@ -5749,70 +6476,57 @@ export class Session {
   private async handleWorkspaceLabelList(
     request: Extract<SessionInboundMessage, { type: "workspace.label.list.request" }>,
   ): Promise<void> {
-    const owner = {};
+    const service = this.requireWorkspaceLabels();
+    if (!request.subscribe) {
+      this.emit({
+        type: "workspace.label.list.response",
+        payload: { requestId: request.requestId, ...(await service.list(request.sync)) },
+      });
+      return;
+    }
+    let bootstrap: ReturnType<typeof service.subscribe> | undefined;
+    const owner = this.delivery.begin("labels", request.subscribe.subscriptionId, async () => {
+      await bootstrap?.then(
+        (subscription) => subscription.unsubscribe(),
+        () => undefined,
+      );
+    });
     try {
-      this.workspaceLabelSubscription?.unsubscribe();
-      this.workspaceLabelSubscription = {
-        owner,
-        id: request.subscribe.subscriptionId,
-        unsubscribe: () => undefined,
-      };
-      const service = this.requireWorkspaceLabels();
       type LiveChange = Parameters<Parameters<typeof service.subscribe>[0]["onChange"]>[0];
-      const pending: LiveChange[] = [];
+      const pending = new Map<string, LiveChange>();
       let ready = false;
       const emitChange = (change: LiveChange): void => {
-        this.emit({
+        owner.emit({
           type: "workspace.label.update",
-          payload:
-            change.kind === "upsert"
-              ? {
-                  kind: "upsert",
-                  label: change.label,
-                  ...(change.previousName ? { previousName: change.previousName } : {}),
-                  generation: change.generation,
-                  seq: change.seq,
-                }
-              : {
-                  kind: "remove",
-                  name: change.name,
-                  generation: change.generation,
-                  seq: change.seq,
-                },
+          payload: change,
         });
       };
-      const subscription = await service.subscribe({
+      bootstrap = service.subscribe({
         cursor: request.sync,
         onChange: (change) => {
-          if (this.workspaceLabelSubscription?.owner !== owner) return;
-          if (!ready) pending.push(change);
+          if (owner.signal.aborted) return;
+          if (!ready)
+            pending.set(change.kind === "upsert" ? change.label.name : change.name, change);
           else emitChange(change);
         },
       });
-      const ownsSubscription = this.workspaceLabelSubscription?.owner === owner;
-      if (ownsSubscription) {
-        this.workspaceLabelSubscription = {
-          owner,
-          id: request.subscribe.subscriptionId,
-          unsubscribe: subscription.unsubscribe,
-        };
-      } else {
-        subscription.unsubscribe();
-      }
+      const subscription = await bootstrap;
+      if (owner.signal.aborted) return;
       this.emit({
         type: "workspace.label.list.response",
-        payload: { requestId: request.requestId, ...subscription.snapshot },
+        payload: {
+          requestId: request.requestId,
+          subscriptionId: owner.responseId,
+          ...subscription.snapshot,
+        },
       });
       ready = true;
-      if (ownsSubscription) {
-        for (const change of pending) {
-          if (change.seq > subscription.snapshot.sync.headSeq) emitChange(change);
-        }
+      for (const change of pending.values()) {
+        if (change.seq > subscription.snapshot.sync.headSeq) emitChange(change);
       }
+      pending.clear();
     } catch (error) {
-      if (this.workspaceLabelSubscription?.owner === owner) {
-        this.workspaceLabelSubscription = null;
-      }
+      await owner.release();
       this.emitWorkspaceLabelError(request, error);
     }
   }
@@ -5886,24 +6600,41 @@ export class Session {
     }
     const snapshot = await this.listFetchAgentsEntries({
       ...request,
+      includeBackground: true,
       page: { limit: Number.MAX_SAFE_INTEGER },
     });
-    return this.directorySync.synchronizeAgents(snapshot.entries, request.sync ?? {});
+    const result = this.directorySync.synchronizeAgents(
+      snapshot.entries,
+      request.sync ?? {},
+      request.includeBackground,
+    );
+    const entries = await Promise.all(
+      result.entries.map(async (entry) =>
+        (await this.agentDirectory.includes(entry.agent, request.includeBackground)) ? entry : null,
+      ),
+    );
+    return { ...result, entries: entries.filter((entry) => entry !== null) };
   }
 
   private async readWorkspaceDirectorySync(
     request: Extract<SessionInboundMessage, { type: "fetch_workspaces_request" }>,
   ) {
-    if (request.filter) {
+    if (request.filter)
       throw new SessionRequestError(
         "invalid_request",
         "Sequenced workspace directory reads do not support filters.",
       );
-    }
-    return this.directorySync.synchronizeWorkspaces(
+    const result = this.directorySync.synchronizeWorkspaces(
       await this.workspaceDirectory.listDescriptors(),
       request.sync ?? {},
+      request.includeBackground,
     );
+    return {
+      ...result,
+      entries: result.entries.filter(
+        (workspace) => request.includeBackground || !workspace.background,
+      ),
+    };
   }
 
   // Build the bootstrap snapshot used by `flushBootstrappedWorkspaceUpdates`
@@ -5933,16 +6664,27 @@ export class Session {
     return { snapshotByWorkspaceId };
   }
 
+  private async reconcileWorkspaceGitObservers(): Promise<void> {
+    const all = this.wantsEvent("checkout_status_update")
+      ? await this.workspaceDirectory.listObservationTargets()
+      : [];
+    const entries = [...this.workspaceUpdatesSubscriptions.values()].flatMap((subscription) =>
+      [...subscription.lastEmittedByWorkspaceId.values()].flatMap((update) =>
+        update.kind === "upsert" ? [update.workspace] : [],
+      ),
+    );
+    this.workspaceGitObserver.reconcileObservers(
+      this.wantsEvent("checkout_status_update") ? [...entries, ...all] : entries,
+    );
+  }
+
   private seedWorkspaceSubscriptionSnapshot(
-    subscriptionId: string | null,
-    filter: FetchWorkspacesRequestFilter | undefined,
+    subscription: WorkspaceUpdatesSubscriptionState,
     entries: FetchWorkspacesResponseEntry[],
     emptyProjects: WorkspaceProjectDescriptorPayload[],
   ): void {
-    const subscription = this.workspaceUpdatesSubscription;
-    if (!subscription) return;
-    if (subscriptionId && subscription.subscriptionId !== subscriptionId) return;
-    if (!subscriptionId && !equal(subscription.filter, filter)) return;
+    if (this.workspaceUpdatesSubscriptions.get(subscription.subscriptionId) !== subscription)
+      return;
     for (const entry of entries) {
       subscription.lastEmittedByWorkspaceId.set(entry.id, {
         kind: "upsert",
@@ -5969,56 +6711,48 @@ export class Session {
     }
   }
 
-  private async handleWorkspaceCreateRequest(
+  private getCallerWorkspaceId(callerAgentId?: string): string | undefined {
+    if (!callerAgentId) return undefined;
+    const caller = this.agentManager.getAgent(callerAgentId);
+    if (!caller) throw new Error(`Caller agent ${callerAgentId} not found`);
+    return caller.workspaceId;
+  }
+
+  private async createRequestedWorkspace(
     request: Extract<SessionInboundMessage, { type: "workspace.create.request" }>,
-  ): Promise<void> {
-    try {
-      if (request.source.kind === "directory") {
-        await this.handleWorkspaceCreateLocal(request);
-        return;
-      }
-      await this.handleWorkspaceCreateWorktree(request);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "Failed to create workspace";
-      this.sessionLogger.error(
-        { err: error, sourceKind: request.source.kind, requestId: request.requestId },
-        "Failed to create workspace",
+    workspaceId?: string,
+  ): Promise<WorkspaceDescriptorPayload> {
+    if (request.internal)
+      throw new Error(
+        "Public internal workspaces were removed; use background workspace creation.",
       );
-      const errorCode = error instanceof WorkspaceProvisioningError ? error.code : undefined;
-      this.emit({
-        type: "workspace.create.response",
-        payload: {
-          requestId: request.requestId,
-          workspace: null,
-          setupTerminalId: null,
-          error: message,
-          errorCode,
-        },
-      });
+    if (request.agent?.background !== undefined)
+      throw new Error("Configure background on the workspace, not its initial agent.");
+    let creationRequest = request;
+    // Hooks belong to the operation: retries fingerprint the caller's input
+    // and must not rerun hooks or compare their potentially changing output.
+    if (this.pluginRuntime) {
+      const { type, requestId, ...input } = request;
+      const transformed = await this.pluginRuntime.before("workspace.create", input);
+      creationRequest = { ...transformed, type, requestId };
     }
+    return creationRequest.source.kind === "directory"
+      ? this.handleWorkspaceCreateLocal(creationRequest, workspaceId)
+      : this.handleWorkspaceCreateWorktree(creationRequest, workspaceId);
   }
 
   private async handleWorkspaceCreateLocal(
     request: Extract<SessionInboundMessage, { type: "workspace.create.request" }>,
-  ): Promise<void> {
+    workspaceId?: string,
+  ): Promise<WorkspaceDescriptorPayload> {
     if (request.source.kind !== "directory") {
-      return;
+      throw new Error("Unexpected workspace source");
     }
 
     const cwd = expandTilde(request.source.path);
     const directoryExists = await this.filesystem.isDirectory(cwd).catch(() => false);
     if (!directoryExists) {
-      this.emit({
-        type: "workspace.create.response",
-        payload: {
-          requestId: request.requestId,
-          workspace: null,
-          setupTerminalId: null,
-          error: `Directory not found: ${cwd}`,
-          errorCode: "directory_not_found",
-        },
-      });
-      return;
+      throw new SessionRequestError("directory_not_found", `Directory not found: ${cwd}`);
     }
 
     const explicitTitle = request.title?.trim() || null;
@@ -6027,19 +6761,15 @@ export class Session {
       cwd,
       explicitTitle ?? promptTitle,
       request.source.projectId,
-      { expectsInitialAgent: Boolean(request.firstAgentContext) },
+      {
+        expectsInitialAgent: Boolean(request.firstAgentContext),
+        workspaceId,
+        background: request.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(request.callerAgentId),
+      },
     );
     await this.syncWorkspaceGitObserverForWorkspace(workspace);
     const descriptor = await this.describeWorkspaceRecord(workspace);
-    this.emit({
-      type: "workspace.create.response",
-      payload: {
-        requestId: request.requestId,
-        workspace: descriptor,
-        setupTerminalId: null,
-        error: null,
-      },
-    });
     await this.emitCreatedWorkspaceUpdate(
       descriptor,
       request.firstAgentContext ? "running" : undefined,
@@ -6063,29 +6793,24 @@ export class Session {
         { currentSelection: this.getFocusedAgentSelectionForCwd(workspace.cwd) },
       );
     }
+    return descriptor;
   }
 
   private async handleWorkspaceCreateWorktree(
     request: Extract<SessionInboundMessage, { type: "workspace.create.request" }>,
-  ): Promise<void> {
+    workspaceId?: string,
+  ): Promise<WorkspaceDescriptorPayload> {
     if (request.source.kind !== "worktree") {
-      return;
+      throw new Error("Unexpected workspace source");
     }
 
     const source = request.source;
 
     if (!source.cwd && !source.projectId) {
-      this.emit({
-        type: "workspace.create.response",
-        payload: {
-          requestId: request.requestId,
-          workspace: null,
-          setupTerminalId: null,
-          error: "cwd or projectId is required for a worktree-backed workspace",
-          errorCode: "source_required",
-        },
-      });
-      return;
+      throw new SessionRequestError(
+        "source_required",
+        "cwd or projectId is required for a worktree-backed workspace",
+      );
     }
 
     const sourceCwd = await resolveWorktreeSourceCwd(source, this.projectRegistry);
@@ -6093,6 +6818,7 @@ export class Session {
     const result = await this.createPaseoWorktreeWorkflow(
       {
         cwd: sourceCwd,
+        workspaceId,
         projectId: source.projectId,
         worktreeSlug: source.worktreeSlug,
         action: source.action,
@@ -6102,6 +6828,8 @@ export class Session {
         githubPrNumber: source.githubPrNumber,
         firstAgentContext: request.firstAgentContext,
         title: request.title,
+        background: request.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(request.callerAgentId),
       },
       source.baseBranch
         ? { resolveDefaultBranch: async () => source.baseBranch as string }
@@ -6109,26 +6837,11 @@ export class Session {
     );
 
     const descriptor = await this.describeCreatedWorktreeWorkspace(result);
-    this.emit({
-      type: "workspace.create.response",
-      payload: {
-        requestId: request.requestId,
-        workspace: descriptor,
-        setupTerminalId: null,
-        ...(result.workspace.untrustedSource
-          ? {
-              setupSkippedReason: formatWorkspaceAutomationBlockedMessage(
-                result.workspace.untrustedSource,
-              ),
-            }
-          : {}),
-        error: null,
-      },
-    });
     await this.emitCreatedWorkspaceUpdate(
       descriptor,
       request.firstAgentContext ? "running" : undefined,
     );
+    return descriptor;
   }
 
   private async handleOpenProjectRequest(
@@ -6657,7 +7370,6 @@ export class Session {
         emit: (message) => this.emit(message),
         sessionLogger: this.sessionLogger,
         terminalManager: this.terminalManager,
-        archiveWorkspaceRecord: (workspaceId) => this.archiveWorkspaceRecord(workspaceId),
         serviceProxy: this.serviceProxy,
         scriptRuntimeStore: this.scriptRuntimeStore,
         getDaemonTcpPort: this.getDaemonTcpPort,
@@ -6704,7 +7416,6 @@ export class Session {
         emit: (message) => this.emit(message),
         sessionLogger: this.sessionLogger,
         terminalManager: this.terminalManager,
-        archiveWorkspaceRecord: (workspaceId) => this.archiveWorkspaceRecord(workspaceId),
         serviceProxy: this.serviceProxy,
         scriptRuntimeStore: this.scriptRuntimeStore,
         getDaemonTcpPort: this.getDaemonTcpPort,
@@ -6792,7 +7503,7 @@ export class Session {
     const requestedWorkspaceIds = Array.isArray(workspaceId) ? workspaceId : [workspaceId];
     let agents: AgentSnapshotPayload[];
     try {
-      agents = await this.listAgentPayloads();
+      agents = await this.listAgentPayloads({ includeBackground: true });
     } catch (error) {
       const message = getErrorMessage(error);
       const results = requestedWorkspaceIds.map((requestedWorkspaceId) => ({
@@ -6921,12 +7632,76 @@ export class Session {
     });
   }
 
+  private async handleWorkspaceMarkUnreadRequest(
+    request: Extract<SessionInboundMessage, { type: "workspace.mark_unread.request" }>,
+  ): Promise<void> {
+    const { requestId, workspaceId } = request;
+    let markedAgentId: string | null = null;
+    try {
+      const workspace = await this.workspaceRegistry.get(workspaceId);
+      if (!workspace || workspace.archivedAt) {
+        throw new Error(`Workspace not found: ${workspaceId}`);
+      }
+
+      const agents = (await this.listAgentPayloads({ includeBackground: true })).filter((agent) =>
+        this.isProviderVisibleToClient(agent.provider),
+      );
+      const agentsById = new Map(agents.map((agent) => [agent.id, agent] as const));
+      const candidates = agents
+        .filter((agent) => !agent.archivedAt && agent.workspaceId === workspace.workspaceId)
+        .filter((agent) => resolveWorkspaceRootAgent(agent, agentsById)?.id === agent.id)
+        .filter((agent) => agent.status === "idle" || agent.status === "closed")
+        .filter((agent) => agent.requiresAttention !== true)
+        .filter((agent) => (agent.pendingPermissions?.length ?? 0) === 0)
+        .sort(
+          (left, right) =>
+            right.updatedAt.localeCompare(left.updatedAt) || left.id.localeCompare(right.id),
+        );
+      const candidate = candidates[0];
+      if (!candidate) {
+        throw new Error(`Workspace has no finished agent to mark unread: ${workspaceId}`);
+      }
+
+      await this.agentManager.markAgentUnread(candidate.id);
+      markedAgentId = candidate.id;
+      this.emit({
+        type: "workspace.mark_unread.response",
+        payload: {
+          requestId,
+          workspaceId,
+          markedAgentId,
+          success: true,
+          error: null,
+        },
+      });
+    } catch (error) {
+      const message = getErrorMessage(error);
+      this.sessionLogger.error({ err: error, workspaceId }, "Failed to mark workspace unread");
+      this.emit({
+        type: "workspace.mark_unread.response",
+        payload: {
+          requestId,
+          workspaceId,
+          markedAgentId,
+          success: false,
+          error: message,
+        },
+      });
+    }
+  }
+
   private async handleFetchAgent(agentIdOrIdentifier: string, requestId: string): Promise<void> {
+    // An unknown agent is a null agent, not an error. Errors are for empty or ambiguous identifiers.
     const resolved = await this.resolveAgentIdentifier(agentIdOrIdentifier);
     if (!resolved.ok) {
       this.emit({
         type: "fetch_agent_response",
-        payload: { requestId, agent: null, project: null, error: resolved.error },
+        payload: {
+          requestId,
+          agent: null,
+          project: null,
+          error: resolved.notFound ? null : resolved.error,
+        },
       });
       return;
     }
@@ -6935,12 +7710,7 @@ export class Session {
     if (!agent) {
       this.emit({
         type: "fetch_agent_response",
-        payload: {
-          requestId,
-          agent: null,
-          project: null,
-          error: `Agent not found: ${resolved.agentId}`,
-        },
+        payload: { requestId, agent: null, project: null, error: null },
       });
       return;
     }
@@ -6954,105 +7724,12 @@ export class Session {
     });
   }
 
-  private shouldUseFullTimelineForProjectedPage(input: {
-    timeline: AgentTimelineFetchResult;
-    pageLimit: number;
-  }): boolean {
-    const { timeline } = input;
-    if (timeline.rows.length === 0) return false;
-
-    if (timeline.rows.some((row) => row.item.type === "tool_call")) return true;
-
-    const firstRow = timeline.rows[0];
-    if (
-      timeline.hasOlder &&
-      (firstRow?.item.type === "assistant_message" || firstRow?.item.type === "reasoning")
-    ) {
-      return true;
-    }
-
-    const lastRow = timeline.rows.at(-1);
-    if (
-      timeline.hasNewer &&
-      (lastRow?.item.type === "assistant_message" || lastRow?.item.type === "reasoning")
-    ) {
-      return true;
-    }
-
-    if (!timeline.hasNewer || input.pageLimit === 0) return false;
-    return projectTimelineRows({ rows: timeline.rows, mode: "projected" }).length < input.pageLimit;
-  }
-
-  private selectCanonicalTimelineProjection(input: {
-    timeline: AgentTimelineFetchResult;
-  }): AgentTimelineProjectionSelection {
-    const entries = projectTimelineRows({ rows: input.timeline.rows, mode: "canonical" });
-    return {
-      timeline: input.timeline,
-      entries,
-      startSeq: entries[0]?.seqStart ?? null,
-      endSeq: entries[entries.length - 1]?.seqEnd ?? null,
-      hasOlder: input.timeline.hasOlder,
-      hasNewer: input.timeline.hasNewer,
-    };
-  }
-
-  private selectProjectedTimelineProjection(input: {
-    agentId: string;
-    controlTimeline: AgentTimelineFetchResult;
-    direction: AgentTimelineFetchDirection;
-    cursor?: AgentTimelineCursor;
-    pageLimit: number;
-    fullTimeline?: AgentTimelineFetchResult;
-  }): AgentTimelineProjectionSelection {
-    const selectedTimeline = this.shouldUseFullTimelineForProjectedPage({
-      timeline: input.controlTimeline,
-      pageLimit: input.pageLimit,
-    })
-      ? (input.fullTimeline ??
-        this.agentManager.fetchTimeline(input.agentId, { direction: "tail", limit: 0 }))
-      : input.controlTimeline;
-    const page = selectProjectedTimelinePage({
-      rows: selectedTimeline.rows,
-      bounds: selectedTimeline.window,
-      direction: input.controlTimeline.reset ? "tail" : input.direction,
-      ...(input.cursor ? { cursorSeq: input.cursor.seq } : {}),
-      limit: input.pageLimit,
-    });
-
-    return {
-      timeline: selectedTimeline,
-      entries: page.entries,
-      startSeq: page.startSeq,
-      endSeq: page.endSeq,
-      hasOlder:
-        page.hasOlder || (page.startSeq !== null && page.startSeq > selectedTimeline.window.minSeq),
-      hasNewer: page.hasNewer,
-    };
-  }
-
-  private selectTimelineProjection(input: {
-    agentId: string;
-    projection: TimelineProjectionMode;
-    controlTimeline: AgentTimelineFetchResult;
-    direction: AgentTimelineFetchDirection;
-    cursor?: AgentTimelineCursor;
-    pageLimit: number;
-    fullTimeline?: AgentTimelineFetchResult;
-  }): AgentTimelineProjectionSelection {
-    if (input.projection === "canonical") {
-      return this.selectCanonicalTimelineProjection({ timeline: input.controlTimeline });
-    }
-
-    return this.selectProjectedTimelineProjection(input);
-  }
-
   private async handleFetchAgentTimelineRequest(
     msg: Extract<SessionInboundMessage, { type: "fetch_agent_timeline_request" }>,
     source?: object,
   ): Promise<void> {
     const direction: AgentTimelineFetchDirection = msg.direction ?? (msg.cursor ? "after" : "tail");
-    const projection: TimelineProjectionMode = msg.projection ?? "projected";
+    const projection = "projected" as const;
     const requestedLimit = msg.limit;
     const pageLimit = requestedLimit ?? (direction === "after" ? 0 : 200);
     const cursor: AgentTimelineCursor | undefined = msg.cursor
@@ -7075,14 +7752,14 @@ export class Session {
         cursor,
         limit: pageLimit,
       });
-      const selectedTimeline = this.selectTimelineProjection({
-        agentId: msg.agentId,
-        projection,
-        controlTimeline: fetchedControlTimeline,
-        direction,
-        ...(cursor ? { cursor } : {}),
-        pageLimit,
-      });
+      const selectedTimeline = {
+        timeline: fetchedControlTimeline,
+        entries: fetchedControlTimeline.rows,
+        startSeq: fetchedControlTimeline.startSeq,
+        endSeq: fetchedControlTimeline.endSeq,
+        hasOlder: fetchedControlTimeline.hasOlder,
+        hasNewer: fetchedControlTimeline.hasNewer,
+      };
       const startCursor =
         selectedTimeline.startSeq !== null
           ? { epoch: selectedTimeline.timeline.epoch, seq: selectedTimeline.startSeq }
@@ -7091,6 +7768,9 @@ export class Session {
         selectedTimeline.endSeq !== null
           ? { epoch: selectedTimeline.timeline.epoch, seq: selectedTimeline.endSeq }
           : null;
+      const entries = selectedTimeline.entries.filter((entry) =>
+        this.supportsTimelineItem(entry.item, source),
+      );
 
       this.emitForSource(
         {
@@ -7111,7 +7791,7 @@ export class Session {
             hasOlder: selectedTimeline.hasOlder,
             hasNewer: selectedTimeline.hasNewer,
             ...(msg.mergeWindow === true ? { mergeWindow: true } : {}),
-            entries: selectedTimeline.entries.map((entry) => {
+            entries: entries.map((entry) => {
               const payloadEntry = {
                 provider: snapshot.provider,
                 item: entry.item,
@@ -7185,6 +7865,59 @@ export class Session {
     });
   }
 
+  private async handleAgentTimelineSearchRequest(
+    msg: Extract<SessionInboundMessage, { type: "agent.timeline.search.request" }>,
+    source?: object,
+  ): Promise<void> {
+    try {
+      await ensureAgentLoaded(msg.agentId, {
+        agentManager: this.agentManager,
+        agentStorage: this.agentStorage,
+        logger: this.sessionLogger,
+      });
+      const rows = await this.agentManager.getTimelineRows(msg.agentId);
+      const { epoch } = this.agentManager.fetchTimeline(msg.agentId, {
+        direction: "tail",
+        limit: 1,
+      });
+      const result = await searchTimeline({ rows, query: msg.query, cursor: msg.cursor });
+      if (
+        this.agentManager.fetchTimeline(msg.agentId, { direction: "tail", limit: 1 }).epoch !==
+        epoch
+      ) {
+        throw new Error("History changed; search again");
+      }
+      this.emitForSource(
+        {
+          type: "agent.timeline.search.response",
+          payload: {
+            requestId: msg.requestId,
+            agentId: msg.agentId,
+            epoch,
+            ...result,
+            error: null,
+          },
+        },
+        source,
+      );
+    } catch (error) {
+      this.emitForSource(
+        {
+          type: "agent.timeline.search.response",
+          payload: {
+            requestId: msg.requestId,
+            agentId: msg.agentId,
+            epoch: "",
+            locations: [],
+            nextCursor: null,
+            error: error instanceof Error ? error.message : String(error),
+          },
+        },
+        source,
+      );
+    }
+  }
+
   private async handleAgentTimelineListPromptsRequest(
     msg: Extract<SessionInboundMessage, { type: "agent.timeline.list_prompts.request" }>,
     source?: object,
@@ -7267,6 +8000,7 @@ export class Session {
 
   private async handleProviderSubagentTimelineRequest(
     msg: Extract<SessionInboundMessage, { type: "agent.provider_subagents.timeline.get.request" }>,
+    source?: object,
   ): Promise<void> {
     const direction: AgentTimelineFetchDirection = msg.direction ?? (msg.cursor ? "after" : "tail");
     try {
@@ -7279,6 +8013,10 @@ export class Session {
       if (!descriptor) {
         throw new Error("Provider subagent not found");
       }
+      // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove after 2027-03-14.
+      const supportsProjection = source
+        ? this.supportsForSource(CLIENT_CAPS.projectedSubagentTimeline, source)
+        : this.supports(CLIENT_CAPS.projectedSubagentTimeline);
       const timeline = this.agentManager.fetchProviderSubagentTimeline(
         msg.parentAgentId,
         msg.subagentId,
@@ -7288,49 +8026,75 @@ export class Session {
           limit: msg.limit ?? (direction === "after" ? 0 : 200),
         },
       );
-      this.emit({
-        type: "agent.provider_subagents.timeline.get.response",
-        payload: {
-          requestId: msg.requestId,
-          parentAgentId: msg.parentAgentId,
-          subagentId: msg.subagentId,
-          provider: descriptor.provider,
-          direction,
-          epoch: timeline.epoch,
-          reset: timeline.reset,
-          staleCursor: timeline.staleCursor,
-          gap: timeline.gap,
-          window: timeline.window,
-          hasOlder: timeline.hasOlder,
-          hasNewer: timeline.hasNewer,
-          rows: timeline.rows.map((row) => ({
-            item: row.item,
-            timestamp: row.timestamp,
-            seq: row.seq,
-          })),
-          error: null,
+      const rows = timeline.rows.filter((row) => this.supportsTimelineItem(row.item, source));
+      this.emitForSource(
+        {
+          type: "agent.provider_subagents.timeline.get.response",
+          payload: {
+            requestId: msg.requestId,
+            parentAgentId: msg.parentAgentId,
+            subagentId: msg.subagentId,
+            provider: descriptor.provider,
+            direction,
+            epoch: timeline.epoch,
+            projection: "projected",
+            startCursor:
+              timeline.startSeq === null ? null : { epoch: timeline.epoch, seq: timeline.startSeq },
+            endCursor:
+              timeline.endSeq === null ? null : { epoch: timeline.epoch, seq: timeline.endSeq },
+            reset: timeline.reset,
+            staleCursor: timeline.staleCursor,
+            gap: timeline.gap,
+            window: timeline.window,
+            hasOlder: supportsProjection && timeline.hasOlder,
+            hasNewer: supportsProjection && timeline.hasNewer,
+            rows: supportsProjection
+              ? rows.map((row) => ({
+                  item: row.item,
+                  timestamp: row.timestamp,
+                  seq: row.seqEnd,
+                  seqStart: row.seqStart,
+                  seqEnd: row.seqEnd,
+                  sourceSeqRanges: row.sourceSeqRanges,
+                }))
+              : [
+                  {
+                    seq: timeline.window.maxSeq,
+                    timestamp: new Date().toISOString(),
+                    item: {
+                      type: "assistant_message",
+                      text: "Please upgrade the Paseo app to view this subagent conversation.",
+                    },
+                  },
+                ],
+            error: null,
+          },
         },
-      });
+        source,
+      );
     } catch (error) {
-      this.emit({
-        type: "agent.provider_subagents.timeline.get.response",
-        payload: {
-          requestId: msg.requestId,
-          parentAgentId: msg.parentAgentId,
-          subagentId: msg.subagentId,
-          provider: null,
-          direction,
-          epoch: "",
-          reset: false,
-          staleCursor: false,
-          gap: false,
-          window: { minSeq: 0, maxSeq: 0, nextSeq: 0 },
-          hasOlder: false,
-          hasNewer: false,
-          rows: [],
-          error: error instanceof Error ? error.message : String(error),
+      this.emitForSource(
+        {
+          type: "agent.provider_subagents.timeline.get.response",
+          payload: {
+            requestId: msg.requestId,
+            parentAgentId: msg.parentAgentId,
+            subagentId: msg.subagentId,
+            provider: null,
+            direction,
+            epoch: "",
+            reset: false,
+            staleCursor: false,
+            gap: false,
+            window: { minSeq: 0, maxSeq: 0, nextSeq: 0 },
+            hasOlder: false,
+            hasNewer: false,
+            rows: [],
+            error: error instanceof Error ? error.message : String(error),
+          },
         },
-      });
+        source,
+      );
     }
   }
 
@@ -7390,6 +8154,19 @@ export class Session {
     }
   }
 
+  private async prepareAgentMessage(agentId: string, text: string): Promise<void> {
+    await ensureAgentLoaded(agentId, {
+      agentManager: this.agentManager,
+      agentStorage: this.agentStorage,
+      logger: this.sessionLogger,
+    });
+    const stored = await this.agentStorage.get(agentId);
+    if (stored && !stored.title && !stored.lastUserMessageAt) {
+      const { provisionalTitle } = resolveCreateAgentTitles({ initialPrompt: text });
+      if (provisionalTitle) await this.agentManager.setTitle(agentId, provisionalTitle);
+    }
+  }
+
   private async handleSendAgentMessageRequest(
     msg: Extract<SessionInboundMessage, { type: "send_agent_message_request" }>,
   ): Promise<void> {
@@ -7420,59 +8197,44 @@ export class Session {
         },
         "agent.session.send_agent_message",
       );
-      let dispatchResult: { disposition: "out_of_band" | "steered" | "turn_started" };
-      try {
-        dispatchResult = await sendPromptToAgent({
+      const send = async () => {
+        const result = await sendPromptToAgent({
           agentManager: this.agentManager,
           agentStorage: this.agentStorage,
           agentId,
           prompt,
+          source: msg.sourceAgentId
+            ? { kind: "agent-message", agentId: msg.sourceAgentId }
+            : undefined,
           messageId: msg.messageId,
           activeTurnBehavior: msg.activeTurnBehavior ?? "interrupt",
           clearPendingPermissions: true,
           logger: this.sessionLogger,
         });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        this.handleAgentRunError(agentId, error, "Failed to send agent message");
-        this.emit({
-          type: "send_agent_message_response",
-          payload: {
-            requestId: msg.requestId,
+        if (result.disposition === "turn_started") {
+          await waitForAgentRunStartWithTimeout(
+            this.agentManager,
             agentId,
-            accepted: false,
-            error: message,
+            this.delivery.requestSignal,
+          );
+        }
+      };
+      if (msg.messageId) {
+        await this.messageReceipts.send({
+          agentId,
+          messageId: msg.messageId,
+          request: {
+            prompt,
+            sourceAgentId: msg.sourceAgentId,
+            activeTurnBehavior: msg.activeTurnBehavior ?? "interrupt",
           },
-        });
-        return;
-      }
-
-      if (dispatchResult.disposition !== "turn_started") {
-        this.emit({
-          type: "send_agent_message_response",
-          payload: {
-            requestId: msg.requestId,
-            agentId,
-            accepted: true,
-            error: null,
+          prepare: async () => {
+            if (!msg.sourceAgentId) await this.prepareAgentMessage(agentId, msg.text);
           },
+          send,
         });
-        return;
-      }
-
-      try {
-        await waitForAgentRunStartWithTimeout(this.agentManager, agentId);
-      } catch (error) {
-        this.emit({
-          type: "send_agent_message_response",
-          payload: {
-            requestId: msg.requestId,
-            agentId,
-            accepted: false,
-            error: errorToFriendlyMessage(error),
-          },
-        });
-        return;
+      } else {
+        await send();
       }
 
       this.emit({
@@ -7485,6 +8247,8 @@ export class Session {
         },
       });
     } catch (error) {
+      if (this.delivery.requestSignal.aborted) return;
+      this.handleAgentRunError(resolved.agentId, error, "Failed to send agent message");
       this.emit({
         type: "send_agent_message_response",
         payload: {
@@ -7502,6 +8266,8 @@ export class Session {
     requestId: string,
     timeoutMs?: number,
   ): Promise<void> {
+    const sourceSignal = this.delivery.requestSignal;
+    sourceSignal.throwIfAborted();
     const resolved = await this.resolveAgentIdentifier(agentIdOrIdentifier);
     if (!resolved.ok) {
       this.emit({
@@ -7520,8 +8286,8 @@ export class Session {
     const agentId = resolved.agentId;
     const live = this.agentManager.getAgent(agentId);
     if (!live) {
-      const record = await this.agentStorage.get(agentId);
-      if (!record || record.internal) {
+      const settled = await this.readSettledAgent(agentId);
+      if (!settled) {
         this.emit({
           type: "wait_for_finish_response",
           payload: {
@@ -7534,6 +8300,7 @@ export class Session {
         });
         return;
       }
+      const { record, lastMessage } = settled;
       const final = this.buildStoredAgentPayload(record);
       let status: "permission" | "error" | "idle";
       if (record.attentionReason === "permission") {
@@ -7546,7 +8313,7 @@ export class Session {
       const error = resolveWaitForFinishError({ status, final });
       this.emit({
         type: "wait_for_finish_response",
-        payload: { requestId, status, final, error, lastMessage: null },
+        payload: { requestId, status, final, error, lastMessage },
       });
       return;
     }
@@ -7561,7 +8328,7 @@ export class Session {
 
     try {
       let result = await this.agentManager.waitForAgentEvent(agentId, {
-        signal: abortController.signal,
+        signal: AbortSignal.any([abortController.signal, sourceSignal]),
         waitForActive: true,
       });
       let final = await this.getAgentPayloadById(agentId);
@@ -7584,6 +8351,7 @@ export class Session {
         payload: { requestId, status, final, error, lastMessage: result.lastMessage },
       });
     } catch (error) {
+      if (sourceSignal.aborted) return;
       const isAbort =
         error instanceof Error &&
         (error.name === "AbortError" || error.message.toLowerCase().includes("aborted"));
@@ -7622,10 +8390,82 @@ export class Session {
   /**
    * Emit a message to the client
    */
-  private emit(msg: SessionOutboundMessage): void {
-    if (!this.authorization.allowsOutbound(msg)) {
+  // COMPAT(explicitEventSubscriptions): added in v0.8.0, remove legacy broadcasts after 2027-03-08.
+  private wantsEvent(event: SessionEventSubscription, source?: object): boolean {
+    for (const subscription of this.eventSubscriptions.values()) {
+      if ((!source || subscription.owner.source === source) && subscription.events.has(event))
+        return true;
+    }
+    if (!source && this.clientSources.size > 0) {
+      return [...this.clientSources.keys()].some((candidate) => this.wantsEvent(event, candidate));
+    }
+    if (source && this.delivery.isModern(source)) return false;
+    if (!source && !this.delivery.hasLegacySources()) return false;
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove implicit event delivery after 2027-03-09.
+    const capabilities = source
+      ? (this.clientSources.get(source)?.capabilities ?? this.clientCapabilities)
+      : this.clientCapabilities;
+    return legacyWantsEvent(event, capabilities);
+  }
+
+  private emitEventToOwner(
+    subscription: { owner: OwnedSubscription; notifications: boolean },
+    message: SessionOutboundMessage,
+    notified: Set<object>,
+  ): void {
+    if (
+      message.type !== "agent_attention_required" &&
+      message.type !== "terminal_attention_required"
+    ) {
+      subscription.owner.emit(message);
       return;
     }
+    const shouldNotify =
+      message.payload.shouldNotify &&
+      subscription.notifications &&
+      !notified.has(subscription.owner.source);
+    subscription.owner.emit(
+      message.type === "agent_attention_required"
+        ? { ...message, payload: { ...message.payload, shouldNotify } }
+        : { ...message, payload: { ...message.payload, shouldNotify } },
+    );
+    if (shouldNotify) notified.add(subscription.owner.source);
+  }
+
+  private emitSubscribedEvent(message: SessionOutboundMessage, onlySource?: object): boolean {
+    const event = sessionEventCategory(message);
+    if (!event) return false;
+    if (!this.authorization.allowsOutbound(message)) return true;
+    const delivered = new Set<object>();
+    const notified = new Set<object>();
+    for (const subscription of this.eventSubscriptions.values()) {
+      if (
+        !subscription.events.has(event) ||
+        (onlySource && subscription.owner.source !== onlySource)
+      )
+        continue;
+      this.emitEventToOwner(subscription, message, notified);
+      delivered.add(subscription.owner.source);
+    }
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove implicit event delivery after 2027-03-09.
+    if (this.onMessageToSource && this.clientSources.size > 0) {
+      for (const source of this.clientSources.keys()) {
+        if (
+          (!onlySource || source === onlySource) &&
+          !delivered.has(source) &&
+          !this.delivery.isModern(source) &&
+          this.wantsEvent(event, source)
+        )
+          this.onMessageToSource(source, this.workspaceSetupMessageForClient(message, source));
+      }
+    } else if (delivered.size === 0 && this.wantsEvent(event)) this.onMessage(message);
+    return true;
+  }
+
+  private emit(msg: SessionOutboundMessage): void {
+    if (!this.authorization.allowsOutbound(msg)) return;
+    if (this.delivery.reply(msg)) return;
+    if (this.emitSubscribedEvent(msg)) return;
     // JSON.stringify(msg) is only computed when trace is enabled — it runs for
     // every outbound message otherwise, and trace is disabled by default.
     // Optional-chained because test logger stubs don't implement isLevelEnabled.
@@ -7638,9 +8478,45 @@ export class Session {
         "agent.session.outbound",
       );
     }
+    if (msg.type === "workspace_setup_progress" || msg.type === "workspace_setup_status_response") {
+      if (this.clientSources.size > 0 && this.onMessageToSource) {
+        for (const [source] of this.clientSources) {
+          this.onMessageToSource(source, this.workspaceSetupMessageForClient(msg, source));
+        }
+        return;
+      }
+      msg = this.workspaceSetupMessageForClient(msg);
+    }
     this.onMessage(msg);
   }
 
+  // COMPAT(workspaceSetupBlocked): added in v0.8.0, remove after 2027-03-07 once client floor >= v0.8.0.
+  private workspaceSetupMessageForClient(
+    message: SessionOutboundMessage,
+    source?: object,
+  ): SessionOutboundMessage {
+    if (
+      message.type !== "workspace_setup_progress" &&
+      message.type !== "workspace_setup_status_response"
+    )
+      return message;
+    const supportsBlocked = source
+      ? this.supportsForSource(CLIENT_CAPS.workspaceSetupBlocked, source)
+      : this.supports(CLIENT_CAPS.workspaceSetupBlocked);
+    const snapshot =
+      message.type === "workspace_setup_progress" ? message.payload : message.payload.snapshot;
+    if (supportsBlocked || snapshot?.status !== "blocked") return message;
+    const legacySnapshot = {
+      ...snapshot,
+      status: "failed" as const,
+      error:
+        "Workspace setup is blocked pending approval of code from a fork pull request. Update Paseo to review and run setup.",
+    };
+    return message.type === "workspace_setup_progress"
+      ? { ...message, payload: { ...message.payload, ...legacySnapshot } }
+      : { ...message, payload: { ...message.payload, snapshot: legacySnapshot } };
+  }
+
   private emitBinary(frame: Uint8Array): void {
     if (!this.onBinaryMessage) {
       return;
@@ -7654,6 +8530,7 @@ export class Session {
 
   private async emitBinaryForFileTransfer(frame: Uint8Array, source?: object): Promise<void> {
     if (source && this.onBinaryMessageToSource) {
+      this.delivery.authorizeFileReply(frame, source);
       await this.onBinaryMessageToSource(source, frame);
       return;
     }
@@ -7662,6 +8539,7 @@ export class Session {
 
   private emitForSource(msg: SessionOutboundMessage, source?: object): void {
     if (source && this.onMessageToSource) {
+      msg = this.delivery.authorizeReply(msg, source);
       this.onMessageToSource(source, msg);
       return;
     }
@@ -7674,6 +8552,7 @@ export class Session {
   public async cleanup(): Promise<void> {
     this.sessionLogger.trace({}, "agent.session.lifecycle.cleanup");
     this.isCleanedUp = true;
+    await this.delivery.close();
 
     if (this.unsubscribeAgentEvents) {
       this.unsubscribeAgentEvents();
@@ -7685,8 +8564,6 @@ export class Session {
     this.unsubscribePluginChanges = null;
     this.unsubscribeWorkspaceMutations?.();
     this.unsubscribeWorkspaceMutations = null;
-    this.workspaceLabelSubscription?.unsubscribe();
-    this.workspaceLabelSubscription = null;
     this.agentUpdates.dispose();
     await this.hubExecutionController?.cleanup();
     if (this.unsubscribeTerminalWorkspaceContributionEvents) {
@@ -7695,14 +8572,11 @@ export class Session {
     }
     this.providerCatalogSession.dispose();
 
-    await this.voiceSession.cleanup();
-
     this.terminalController.dispose();
 
     this.checkoutSession.cleanup();
 
     this.workspaceGitObserver.dispose();
-    this.workspaceFilesSession.dispose();
   }
 }
 
@@ -7756,3 +8630,57 @@ function normalizeCloneRepository(input: {
 function isValidGitHubRepoSegment(value: string): boolean {
   return /^[A-Za-z0-9._-]+$/u.test(value);
 }
+
+function sessionEventCategory(message: SessionOutboundMessage): SessionEventSubscription | null {
+  switch (message.type) {
+    case "project.update":
+    case "providers_snapshot_update":
+    case "agent_attention_required":
+    case "agent_permission_request":
+    case "agent_permission_resolved":
+    case "checkout_status_update":
+    case "script_status_update":
+    case "workspace_setup_progress":
+    case "agent.provider_subagents.update":
+    case "terminal_attention_required":
+    case "activity_log":
+    case "hub.execution.agent.update":
+    case "hub.execution.agent.stream":
+      return message.type;
+    case "status":
+      switch (message.payload.status) {
+        case "server_info":
+          return "status.server_info";
+        case "daemon_config_changed":
+          return "status.daemon_config_changed";
+        case "plugin_catalog_changed":
+          return "status.plugin_catalog_changed";
+        case "plugin_settings_changed":
+          return "status.plugin_settings_changed";
+        default:
+          return null;
+      }
+    default:
+      return null;
+  }
+}
+
+// COMPAT(ownedSubscriptions): added in v0.8.0, remove implicit event delivery after 2027-03-09.
+function legacyWantsEvent(
+  event: SessionEventSubscription,
+  capabilities: ReadonlySet<ClientCapability>,
+): boolean {
+  if (event === "project.update" && !capabilities.has(CLIENT_CAPS.projectUpdates)) return false;
+  switch (event) {
+    case "project.update":
+    case "providers_snapshot_update":
+    case "agent_attention_required":
+    case "agent_permission_request":
+    case "agent_permission_resolved":
+      return !capabilities.has(CLIENT_CAPS.explicitEventSubscriptions);
+    case "agent.provider_subagents.update":
+      return capabilities.has(CLIENT_CAPS.providerSubagents);
+    default:
+      return true;
+  }
+}
diff --git a/packages/server/src/server/session.workspace-git-watch.test.ts b/packages/server/src/server/session.workspace-git-watch.test.ts
index 61dce39c5f..836703fd30 100644
--- a/packages/server/src/server/session.workspace-git-watch.test.ts
+++ b/packages/server/src/server/session.workspace-git-watch.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 import { describe, expect, test, vi } from "vitest";
 import path from "node:path";
 import type pino from "pino";
@@ -23,13 +27,6 @@ import { createNoopWorkspaceGitService } from "./test-utils/workspace-git-servic
 import type { WorkspaceGitObserverService } from "./session/workspace-git-observer/workspace-git-observer-service.js";
 
 interface SessionInternals {
-  workspaceUpdatesSubscription: {
-    subscriptionId: string;
-    filter: undefined;
-    isBootstrapping: boolean;
-    pendingUpdatesByWorkspaceId: Map<string, unknown>;
-    lastEmittedByWorkspaceId: Map<string, unknown>;
-  };
   buildWorkspaceDescriptorMap: () => Promise<Map<string, unknown>>;
   workspaceGitObserver: WorkspaceGitObserverService;
   listAgentPayloads: () => Promise<unknown[]>;
@@ -191,6 +188,8 @@ function createSessionForWorkspaceGitWatchTests(options?: {
   };
 
   const session = new Session({
+    messageReceipts: createMessageReceiptsStub(),
+    creationService: createTestCreationService(),
     clientId: "test-client",
     permissions: OWNER_PERMISSIONS,
     onMessage: (message) => emitted.push(message as { type: string; payload: unknown }),
@@ -201,6 +200,7 @@ function createSessionForWorkspaceGitWatchTests(options?: {
     agentManager: createStub<SessionOptions["agentManager"]>({
       subscribe: () => () => {},
       listAgents: () => [],
+      listProviderSubagentActivity: () => [],
       getAgent: () => null,
     }),
     agentStorage: createStub<SessionOptions["agentStorage"]>({
@@ -329,13 +329,11 @@ describe("workspace git watch targets", () => {
       cwd: REPO_CWD,
       name: "main",
     });
-    sessionAny.workspaceUpdatesSubscription = {
-      subscriptionId: "sub-1",
-      filter: undefined,
-      isBootstrapping: false,
-      pendingUpdatesByWorkspaceId: new Map(),
-      lastEmittedByWorkspaceId: new Map(),
-    };
+    await session.handleMessage({
+      type: "fetch_workspaces_request",
+      requestId: "workspace-demand",
+      subscribe: {},
+    });
 
     let descriptor = {
       id: "ws-10",
@@ -392,7 +390,6 @@ describe("workspace git watch targets", () => {
   test("emits checkout_status_update to a client subscribed to the workspace git target", async () => {
     const { session, emitted, projects, workspaces, workspaceGitService, subscriptions } =
       createSessionForWorkspaceGitWatchTests();
-    const sessionAny = asInternals<SessionInternals>(session);
     seedGitWorkspace({
       projects,
       workspaces,
@@ -401,13 +398,11 @@ describe("workspace git watch targets", () => {
       cwd: REPO_CWD,
       name: "main",
     });
-    sessionAny.workspaceUpdatesSubscription = {
-      subscriptionId: "sub-1",
-      filter: undefined,
-      isBootstrapping: false,
-      pendingUpdatesByWorkspaceId: new Map(),
-      lastEmittedByWorkspaceId: new Map(),
-    };
+    await session.handleMessage({
+      type: "fetch_workspaces_request",
+      requestId: "workspace-demand",
+      subscribe: {},
+    });
 
     syncGitObserver(session, REPO_CWD, "ws-10");
     emitted.length = 0;
@@ -491,6 +486,11 @@ describe("workspace git watch targets", () => {
       name: "old-branch",
     });
 
+    await session.handleMessage({
+      type: "fetch_workspaces_request",
+      requestId: "branch-demand",
+      subscribe: {},
+    });
     await session.syncWorkspaceGitObserversForExternalWorkspaceIds(["ws-10"]);
 
     subscriptions[0]?.listener(
@@ -573,7 +573,6 @@ describe("workspace git watch targets", () => {
   test("embeds PR status in checkout_status_update for GitHub-inclusive snapshot pushes", async () => {
     const { session, emitted, projects, workspaces, subscriptions } =
       createSessionForWorkspaceGitWatchTests();
-    const sessionAny = asInternals<SessionInternals>(session);
     seedGitWorkspace({
       projects,
       workspaces,
@@ -582,13 +581,11 @@ describe("workspace git watch targets", () => {
       cwd: REPO_CWD,
       name: "main",
     });
-    sessionAny.workspaceUpdatesSubscription = {
-      subscriptionId: "sub-1",
-      filter: undefined,
-      isBootstrapping: false,
-      pendingUpdatesByWorkspaceId: new Map(),
-      lastEmittedByWorkspaceId: new Map(),
-    };
+    await session.handleMessage({
+      type: "fetch_workspaces_request",
+      requestId: "workspace-demand",
+      subscribe: {},
+    });
 
     syncGitObserver(session, REPO_CWD, "ws-10");
     emitted.length = 0;
diff --git a/packages/server/src/server/session.workspace-resolution-invariants.test.ts b/packages/server/src/server/session.workspace-resolution-invariants.test.ts
index b25912beb6..e848e46f01 100644
--- a/packages/server/src/server/session.workspace-resolution-invariants.test.ts
+++ b/packages/server/src/server/session.workspace-resolution-invariants.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 // Invariant tests for cwd → workspace resolution on the open_project_request path.
 // Each test encodes a default behavior we want from `findOrCreateWorkspaceForDirectory`.
 // Run to see which invariants the current code already satisfies (green) and which
@@ -88,6 +92,8 @@ function createHarness(input: {
   };
 
   const session = new Session({
+    messageReceipts: createMessageReceiptsStub(),
+    creationService: createTestCreationService(),
     clientId: "test",
     permissions: OWNER_PERMISSIONS,
     appVersion: null,
diff --git a/packages/server/src/server/session.workspaces.test.ts b/packages/server/src/server/session.workspaces.test.ts
index 97166cdf76..b9c04e8244 100644
--- a/packages/server/src/server/session.workspaces.test.ts
+++ b/packages/server/src/server/session.workspaces.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 import { execFileSync } from "node:child_process";
 import {
   existsSync,
@@ -145,7 +149,6 @@ interface SessionTestAccess {
     upsert(record: unknown): Promise<unknown>;
   };
   agentUpdates: AgentUpdatesService;
-  workspaceUpdatesSubscription: unknown;
   interruptAgentIfRunning(agentId: string): unknown;
   reconcileWorkspaceRecord(workspaceId: string): Promise<{
     changed: boolean;
@@ -154,7 +157,7 @@ interface SessionTestAccess {
     [key: string]: unknown;
   }>;
   handleArchiveAgentRequest(agentId: string, requestId: string): Promise<unknown>;
-  handleMessage(message: unknown): Promise<unknown>;
+  handleMessage(message: unknown, source?: object): Promise<unknown>;
   handleCreatePaseoWorktreeRequest(params: unknown): Promise<unknown>;
   listAgentPayloads(...args: unknown[]): Promise<unknown[]>;
   listFetchWorkspacesEntries(params: unknown): Promise<ListFetchResult>;
@@ -171,7 +174,7 @@ interface SessionTestAccess {
   emitWorkspaceUpdateForCwd(...args: unknown[]): Promise<unknown>;
   emitWorkspaceUpdatesForWorkspaceIds(...args: unknown[]): Promise<unknown>;
   emitWorkspaceUpdatesForExternalWorkspaceIds(workspaceIds: Iterable<string>): Promise<void>;
-  updateClientCapabilities(capabilities: Record<string, unknown> | null): void;
+  updateClientCapabilities(capabilities: Record<string, unknown> | null, source?: object): void;
   emit(message: unknown): void;
   onMessage(message: unknown): void;
   paseoHome: string;
@@ -208,16 +211,17 @@ type AgentUpdatesSubscriptionFilter = Parameters<
   AgentUpdatesService["beginSubscription"]
 >[0]["filter"];
 
-// Drives the agent-updates module to a live (non-bootstrapping) subscription —
-// the post-extraction equivalent of assigning a subscription with
-// `isBootstrapping: false`. begin → flush leaves an empty buffer and emits nothing.
-function activateAgentUpdatesSubscription(
+async function activateAgentUpdatesSubscription(
   session: TestSession,
   subscriptionId: string,
   filter?: AgentUpdatesSubscriptionFilter,
-): void {
-  session.agentUpdates.beginSubscription({ subscriptionId, filter });
-  session.agentUpdates.flushBootstrapped(subscriptionId);
+): Promise<void> {
+  await session.handleMessage({
+    type: "fetch_agents_request",
+    requestId: subscriptionId,
+    filter,
+    subscribe: { subscriptionId },
+  });
 }
 
 const AgentIdEntrySchema = z.object({ agent: z.object({ id: z.string() }) });
@@ -232,6 +236,7 @@ function makeAgent(input: {
   requiresAttention?: boolean;
   attentionReason?: AgentSnapshotPayload["attentionReason"];
   attentionTimestamp?: string | null;
+  labels?: Record<string, string>;
 }): AgentSnapshotPayload {
   const pendingPermissionCount = input.pendingPermissions ?? 0;
   return {
@@ -268,7 +273,7 @@ function makeAgent(input: {
       sessionId: null,
     },
     title: null,
-    labels: {},
+    labels: input.labels ?? {},
     requiresAttention: input.requiresAttention ?? false,
     attentionReason: input.attentionReason ?? null,
     attentionTimestamp: input.attentionTimestamp ?? null,
@@ -282,17 +287,20 @@ function makeStoredAgent(input: {
   updatedAt: string;
   requiresAttention?: boolean;
   attentionReason?: StoredAgentRecord["attentionReason"];
+  workspaceId?: string;
+  labels?: Record<string, string>;
 }): StoredAgentRecord {
   return {
     id: input.id,
     provider: "codex",
     cwd: input.cwd,
+    ...(input.workspaceId ? { workspaceId: input.workspaceId } : {}),
     createdAt: input.updatedAt,
     updatedAt: input.updatedAt,
     lastActivityAt: input.updatedAt,
     lastUserMessageAt: null,
     title: null,
-    labels: {},
+    labels: input.labels ?? {},
     lastStatus: "closed",
     lastModeId: null,
     config: { provider: "codex", cwd: input.cwd },
@@ -582,6 +590,7 @@ function createSessionForWorkspaceTests(
     archiveSnapshot: async () => ({}),
     unarchiveSnapshot: async () => true,
     clearAgentAttention: async () => {},
+    markAgentUnread: async () => {},
     notifyAgentState: () => {},
     ...options.agentManager,
   });
@@ -636,6 +645,8 @@ function createSessionForWorkspaceTests(
 
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       appVersion: options.appVersion ?? null,
@@ -858,7 +869,7 @@ test("agent updates preserve queued live transitions across stored metadata read
       createdAt: "2026-07-31T10:00:00.000Z",
       updatedAt: "2026-07-31T10:00:00.000Z",
     });
-  activateAgentUpdatesSubscription(session, "sub-coherent");
+  await activateAgentUpdatesSubscription(session, "sub-coherent");
   if (!forwardAgentEvent) throw new Error("Agent event listener was not installed");
 
   forwardAgentEvent({ type: "agent_state", agent: running });
@@ -908,17 +919,21 @@ test("client heartbeat clears attention for the focused terminal", async () => {
     }),
   });
 
-  await session.handleMessage({
-    type: "client_heartbeat",
-    deviceType: "web",
-    focusedAgentId: null,
-    focusedTerminalId: "terminal-1",
-    lastActivityAt: "2026-06-13T12:00:00.000Z",
-    appVisible: true,
-  });
+  const source = {};
+  await session.handleMessage(
+    {
+      type: "client_heartbeat",
+      deviceType: "web",
+      focusedAgentId: null,
+      focusedTerminalId: "terminal-1",
+      lastActivityAt: "2026-06-13T12:00:00.000Z",
+      appVisible: true,
+    },
+    source,
+  );
 
   expect(clearedTerminalIds).toEqual(["terminal-1"]);
-  expect(session.getClientActivity()).toMatchObject({
+  expect(session.getClientActivity(source)).toMatchObject({
     focusedAgentId: null,
     focusedTerminalId: "terminal-1",
     appVisible: true,
@@ -992,6 +1007,8 @@ test("create_agent_request keeps requested child cwd when grouped under an exist
     const emitted: SessionOutboundMessage[] = [];
     const session = asTestSession(
       new Session({
+        messageReceipts: createMessageReceiptsStub(),
+        creationService: createTestCreationService(),
         clientId: "test-client",
         serverId: "test-server",
         permissions: OWNER_PERMISSIONS,
@@ -1145,6 +1162,8 @@ test("create_agent_request launches from an exact subdirectory in a created work
 
     const emitted: SessionOutboundMessage[] = [];
     const session = new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       appVersion: null,
@@ -1282,6 +1301,8 @@ test("create_agent_request does not title an existing workspace from the agent p
     let generateCalls = 0;
     const session = asTestSession(
       new Session({
+        messageReceipts: createMessageReceiptsStub(),
+        creationService: createTestCreationService(),
         clientId: "test-client",
         permissions: OWNER_PERMISSIONS,
         appVersion: null,
@@ -1452,7 +1473,7 @@ test("agent_update placement does not refresh git snapshots", async () => {
   session.workspaceRegistry.list = async () => [workspace];
   session.workspaceRegistry.get = async (id: string) =>
     id === workspace.workspaceId ? workspace : null;
-  activateAgentUpdatesSubscription(session, "sub-agents", {});
+  await activateAgentUpdatesSubscription(session, "sub-agents", {});
 
   await session.agentUpdates.forwardLiveAgent(
     makeManagedAgent({
@@ -1494,7 +1515,7 @@ test("agent_update emits remove when the agent has no workspaceId", async () =>
     }),
   );
 
-  activateAgentUpdatesSubscription(session, "sub-agents", {});
+  await activateAgentUpdatesSubscription(session, "sub-agents", {});
 
   await session.agentUpdates.forwardLiveAgent(
     makeManagedAgent({
@@ -1551,6 +1572,8 @@ test("archive emits an authoritative agent_update upsert for subscribed clients"
 
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       onMessage: (message) => emitted.push(message),
@@ -1653,7 +1676,7 @@ test("archive emits an authoritative agent_update upsert for subscribed clients"
     }),
   );
 
-  activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
+  await activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
 
   await session.handleArchiveAgentRequest("agent-1", "req-archive");
 
@@ -1765,6 +1788,123 @@ test("workspace clear attention responds with an error instead of timing out", a
   });
 });
 
+test("workspace mark unread selects the newest finished workspace root", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const workspace = createPersistedWorkspaceRecord({
+    workspaceId: REPO_CWD,
+    projectId: REPO_CWD,
+    cwd: REPO_CWD,
+    kind: "directory",
+    displayName: "repo",
+    createdAt: "2026-03-30T15:00:00.000Z",
+    updatedAt: "2026-03-30T15:00:00.000Z",
+  });
+  const project = createPersistedProjectRecord({
+    projectId: REPO_CWD,
+    rootPath: REPO_CWD,
+    kind: "non_git",
+    displayName: "repo",
+    createdAt: "2026-03-30T15:00:00.000Z",
+    updatedAt: "2026-03-30T15:00:00.000Z",
+  });
+  const storedRecords = new Map<string, StoredAgentRecord>([
+    [
+      "root-agent",
+      makeStoredAgent({
+        id: "root-agent",
+        cwd: REPO_CWD,
+        workspaceId: workspace.workspaceId,
+        updatedAt: "2026-03-30T16:00:00.000Z",
+      }),
+    ],
+    [
+      "newer-child",
+      makeStoredAgent({
+        id: "newer-child",
+        cwd: REPO_CWD,
+        workspaceId: workspace.workspaceId,
+        updatedAt: "2026-03-30T17:00:00.000Z",
+        labels: { "paseo.parent-agent-id": "root-agent" },
+      }),
+    ],
+  ]);
+  const markedAgentIds: string[] = [];
+  const session = createSessionForWorkspaceTests({
+    onMessage: (message) => emitted.push(message),
+    agentManager: {
+      markAgentUnread: async (agentId: string) => {
+        markedAgentIds.push(agentId);
+      },
+    },
+  });
+
+  session.workspaceRegistry.list = async () => [workspace];
+  session.workspaceRegistry.get = async (id: string) =>
+    id === workspace.workspaceId ? workspace : null;
+  session.projectRegistry.list = async () => [project];
+  session.projectRegistry.get = async (id: string) => (id === project.projectId ? project : null);
+  session.listAgentPayloads = async () =>
+    Array.from(storedRecords.values()).map((record) =>
+      makeAgent({
+        id: record.id,
+        cwd: record.cwd,
+        workspaceId: record.workspaceId,
+        status: record.lastStatus,
+        updatedAt: record.updatedAt,
+        requiresAttention: record.requiresAttention,
+        attentionReason: record.attentionReason,
+        attentionTimestamp: record.attentionTimestamp,
+        labels: record.labels,
+      }),
+    );
+
+  await session.handleMessage({
+    type: "workspace.mark_unread.request",
+    workspaceId: workspace.workspaceId,
+    requestId: "req-mark-unread",
+  });
+
+  expect(markedAgentIds).toEqual(["root-agent"]);
+  expect(findByType(emitted, "workspace.mark_unread.response").payload).toEqual({
+    requestId: "req-mark-unread",
+    workspaceId: workspace.workspaceId,
+    markedAgentId: "root-agent",
+    success: true,
+    error: null,
+  });
+});
+
+test("workspace mark unread rejects workspaces without a finished root agent", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const workspace = createPersistedWorkspaceRecord({
+    workspaceId: REPO_CWD,
+    projectId: REPO_CWD,
+    cwd: REPO_CWD,
+    kind: "directory",
+    displayName: "repo",
+    createdAt: "2026-03-30T15:00:00.000Z",
+    updatedAt: "2026-03-30T15:00:00.000Z",
+  });
+  const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
+  session.workspaceRegistry.get = async (id: string) =>
+    id === workspace.workspaceId ? workspace : null;
+  session.listAgentPayloads = async () => [];
+
+  await session.handleMessage({
+    type: "workspace.mark_unread.request",
+    workspaceId: workspace.workspaceId,
+    requestId: "req-mark-unread",
+  });
+
+  expect(findByType(emitted, "workspace.mark_unread.response").payload).toEqual({
+    requestId: "req-mark-unread",
+    workspaceId: workspace.workspaceId,
+    markedAgentId: null,
+    success: false,
+    error: `Workspace has no finished agent to mark unread: ${workspace.workspaceId}`,
+  });
+});
+
 test("workspace clear attention can clear multiple workspaces in one request", async () => {
   const emitted: SessionOutboundMessage[] = [];
   const workspaces = [
@@ -1916,6 +2056,8 @@ test("close_items_request archives agents and kills terminals in one batch", asy
   const cancelAgentRun = vi.fn(async () => ({ status: "settled" as const }));
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       onMessage: (message) => emitted.push(message),
@@ -2016,7 +2158,7 @@ test("close_items_request archives agents and kills terminals in one batch", asy
     }),
   );
 
-  activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
+  await activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
 
   await session.handleMessage({
     type: "close_items_request",
@@ -2084,6 +2226,8 @@ test("close_items_request archives stored agents that are not currently loaded",
 
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       onMessage: (message) => emitted.push(message),
@@ -2198,7 +2342,7 @@ test("close_items_request archives stored agents that are not currently loaded",
     }),
   );
 
-  activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
+  await activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
 
   await session.handleMessage({
     type: "close_items_request",
@@ -2243,6 +2387,8 @@ test("close_items_request continues after an archive failure", async () => {
   const killTerminalBestEffort = vi.fn();
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       onMessage: (message) => emitted.push(message),
@@ -2348,7 +2494,7 @@ test("close_items_request continues after an archive failure", async () => {
     }),
   );
 
-  activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
+  await activateAgentUpdatesSubscription(session, "sub-agents", { includeArchived: true });
 
   await session.handleMessage({
     type: "close_items_request",
@@ -2821,7 +2967,7 @@ test("fetch_agent_history_request pages archived historical rows separately", as
   expect(session.agentUpdates.hasSubscription()).toBe(false);
 });
 
-test("fetch_agent_history_request ranks a search across the whole history, not one page", async () => {
+test("fetch_agent_history_request filters across history and paginates chronologically", async () => {
   const emitted: SessionOutboundMessage[] = [];
   const session = createSessionForWorkspaceTests();
   const historyCwd = path.resolve("/tmp/history-search");
@@ -2850,8 +2996,7 @@ test("fetch_agent_history_request ranks a search across the whole history, not o
   session.workspaceRegistry.list = async () => [workspace];
   session.workspaceRegistry.get = async () => workspace;
   session.listAgentPayloads = async () => [
-    // The strong match is the oldest row, so a chronological answer would rank
-    // it last and a first-page-only search would not see it at all.
+    // Search keeps chronological order, skipping unrelated rows between pages.
     {
       ...makeAgent({
         id: "weak",
@@ -2891,38 +3036,24 @@ test("fetch_agent_history_request ranks a search across the whole history, not o
     page: { limit: 1 },
   });
 
-  const truncated = emitted[0];
-  if (truncated?.type !== "fetch_agent_history_response") {
-    throw new Error(`Expected a history response, got ${truncated?.type}`);
-  }
-  expect(truncated.payload.entries.map((entry) => entry.agent.id)).toEqual(["strong"]);
-  expect(truncated.payload.entries[0].searchScore).toBeTypeOf("number");
-  // More matched than fit. `hasMore` stays false because no page is fetchable;
-  // truncation is its own fact, so a rank offset can never go stale.
-  expect(truncated.payload.searchTruncated).toBe(true);
-  expect(truncated.payload.pageInfo).toEqual({
-    nextCursor: null,
-    prevCursor: null,
-    hasMore: false,
-  });
-
+  expect(emitted).toHaveLength(1);
+  const first = filterByType(emitted, "fetch_agent_history_response")[0];
+  expect(first.payload.entries.map((entry) => entry.agent.id)).toEqual(["weak"]);
+  expect(first.payload.pageInfo.hasMore).toBe(true);
+  expect(first.payload.entries[0].searchScore).toBeUndefined();
   await session.handleMessage({
     type: "fetch_agent_history_request",
-    requestId: "req-search-whole",
+    requestId: "req-search-next",
     search: "bill",
-    page: { limit: 25 },
+    page: { limit: 1, cursor: first.payload.pageInfo.nextCursor! },
   });
-
-  const whole = emitted[1];
-  if (whole?.type !== "fetch_agent_history_response") {
-    throw new Error(`Expected a history response, got ${whole?.type}`);
-  }
-  expect(whole.payload.entries.map((entry) => entry.agent.id)).toEqual(["strong", "weak"]);
-  expect(whole.payload.searchTruncated).toBe(false);
-  expect(whole.payload.pageInfo.hasMore).toBe(false);
+  expect(emitted).toHaveLength(2);
+  const second = filterByType(emitted, "fetch_agent_history_response")[1];
+  expect(second.payload.entries.map((entry) => entry.agent.id)).toEqual(["strong"]);
+  expect(second.payload.pageInfo.hasMore).toBe(false);
 });
 
-test("fetch_agent_history_request rejects a cursor on a searched request", async () => {
+test("fetch_agent_history_request rejects a malformed search cursor", async () => {
   const emitted: SessionOutboundMessage[] = [];
   const session = createSessionForWorkspaceTests();
   const historyCwd = path.resolve("/tmp/history-cursor");
@@ -2963,8 +3094,7 @@ test("fetch_agent_history_request rejects a cursor on a searched request", async
     },
   ];
 
-  // A ranked result set has no pages to walk. Answering with the ranked head
-  // would let a caller believe it had paged, so this fails loudly instead.
+  // Search uses the same validated chronological cursor as unfiltered history.
   await session.handleMessage({
     type: "fetch_agent_history_request",
     requestId: "req-cursor",
@@ -3336,7 +3466,7 @@ test("fetch_agent_request still resolves archived historical agents", async () =
   session.resolveAgentIdentifier = async (identifier: string) =>
     identifier === "Archived History Agent"
       ? { ok: true, agentId: agent.id }
-      : { ok: false, error: `Agent not found: ${identifier}` };
+      : { ok: false, notFound: true, error: `Agent not found: ${identifier}` };
   session.getAgentPayloadById = async (agentId: string) => (agentId === agent.id ? agent : null);
   session.buildProjectPlacementForWorkspaceId = async () => ({
     projectKey: "proj-history-detail",
@@ -3514,6 +3644,8 @@ test("workspace update stream keeps persisted workspace visible after agents sto
 
   const session = asTestSession(
     new Session({
+      messageReceipts: createMessageReceiptsStub(),
+      creationService: createTestCreationService(),
       clientId: "test-client",
       permissions: OWNER_PERMISSIONS,
       onMessage: (message) => emitted.push(message),
@@ -3599,13 +3731,13 @@ test("workspace update stream keeps persisted workspace visible after agents sto
     }),
   );
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-1",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-1",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-1" },
+  });
+  expect(filterByType(emitted, "rpc_error")).toEqual([]);
   session.buildWorkspaceDescriptorMap = async () =>
     new Map([
       [
@@ -3693,33 +3825,13 @@ test("archiving the last workspace emits a remove carrying the now-empty project
   session.workspaceRegistry.get = async (workspaceId: string) =>
     workspaceId === archivedWorkspace.workspaceId ? archivedWorkspace : null;
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-1",
-    filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map([
-      [
-        archivedWorkspace.workspaceId,
-        {
-          kind: "upsert",
-          workspace: {
-            id: archivedWorkspace.workspaceId,
-            projectId: project.projectId,
-            projectDisplayName: project.displayName,
-            projectRootPath: project.rootPath,
-            workspaceDirectory: archivedWorkspace.cwd,
-            projectKind: project.kind,
-            workspaceKind: archivedWorkspace.kind,
-            name: archivedWorkspace.displayName,
-            status: "done",
-            activityAt: null,
-            diffStat: null,
-          },
-        },
-      ],
-    ]),
-  };
+  archivedWorkspace.archivedAt = null;
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-1",
+    subscribe: { subscriptionId: "sub-1" },
+  });
+  archivedWorkspace.archivedAt = "2026-03-02T12:00:00.000Z";
   // The archived workspace no longer resolves to an active descriptor.
   session.buildWorkspaceDescriptorMap = async () => new Map();
 
@@ -3783,13 +3895,12 @@ test("project.remove.request archives active workspaces and removes the project
     if (!existing) return;
     workspaces.set(workspaceId, { ...existing, updatedAt: archivedAt, archivedAt });
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-project-remove",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-project-remove",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-project-remove" },
+  });
   session.listAgentPayloads = async () => [];
   session.buildWorkspaceDescriptorMap = async (options: { workspaceIds?: Iterable<string> }) => {
     const workspaceIds = Array.from(options.workspaceIds ?? workspaces.keys());
@@ -3880,15 +3991,11 @@ test("project.remove.request removes an already-empty project", async () => {
     if (!existing) return;
     workspaces.set(workspaceId, { ...existing, updatedAt: archivedAt, archivedAt });
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-empty-project-remove",
-    filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map([
-      [archivedWorkspace.workspaceId, { kind: "remove", id: archivedWorkspace.workspaceId }],
-    ]),
-  };
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-empty-project-remove",
+    subscribe: { subscriptionId: "sub-empty-project-remove" },
+  });
   session.listAgentPayloads = async () => [];
   session.buildWorkspaceDescriptorMap = async () => new Map();
 
@@ -4097,13 +4204,12 @@ test("workspace updates stay scoped to the matching cwd", async () => {
   session.workspaceRegistry.archive = async (workspaceId) => {
     archivedWorkspaceIds.push(workspaceId);
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-dedup",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-dedup",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-dedup" },
+  });
   session.buildWorkspaceDescriptorMap = async () =>
     new Map([
       [
@@ -4260,13 +4366,12 @@ test("import_agent_request registers a workspace for a never-seen cwd", async ()
   session.agentStorage.get = async () => null;
   session.agentUpdates.forwardLiveAgent = async () => undefined;
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-import",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-import",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-import" },
+  });
   session.buildWorkspaceDescriptorMap = async () => {
     const workspace = Array.from(workspaces.values()).find(
       (candidate) => candidate.cwd === importedCwd,
@@ -4463,7 +4568,7 @@ test("open_project_response returns immediately even when the GitHub fetch is sl
 
 test("open_project_request emits a workspace_update with githubRuntime once the snapshot resolves", async () => {
   const emitted: SessionOutboundMessage[] = [];
-  const session = createSessionForWorkspaceTests();
+  const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
   const projects = new Map<string, ReturnType<typeof createPersistedProjectRecord>>();
   const workspaces = new Map<string, ReturnType<typeof createPersistedWorkspaceRecord>>();
   const cwd = path.resolve("/tmp/github-runtime-repo");
@@ -4472,9 +4577,6 @@ test("open_project_request emits a workspace_update with githubRuntime once the
   let listener: ((snapshot: WorkspaceGitRuntimeSnapshot) => void) | null = null;
   const peeked = { value: null as WorkspaceGitRuntimeSnapshot | null };
 
-  session.emit = (message) => {
-    if (isSessionOutboundMessage(message)) emitted.push(message);
-  };
   session.projectRegistry.get = async (projectId: string) => projects.get(projectId) ?? null;
   session.projectRegistry.getOrCreateActiveByRoot = async (allocation) => {
     const project = createPersistedProjectRecord({
@@ -4524,13 +4626,12 @@ test("open_project_request emits a workspace_update with githubRuntime once the
     listener?.(snapshot);
     return snapshot;
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-open-project",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-open-project",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-open-project" },
+  });
   await session.handleMessage({
     type: "open_project_request",
     cwd,
@@ -5171,13 +5272,12 @@ test("workspace recovery stays accepted when git observer warming fails", async
   session.workspaceRegistry.upsert = async (record: PersistedWorkspaceRecord) => {
     workspace = record;
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-recovery-warm-failure",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-recovery-warm-failure",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-recovery-warm-failure" },
+  });
   session.listAgentPayloads = async () => [];
 
   await session.handleMessage({
@@ -5973,13 +6073,12 @@ test.skip("opening a new worktree reconciles older local workspaces into the rem
   session.emit = (message) => {
     if (isSessionOutboundMessage(message)) emitted.push(message);
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-reconcile",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-reconcile",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-reconcile" },
+  });
   session.listAgentPayloads = async () => [];
   session.projectRegistry.get = async (projectId: string) => projects.get(projectId) ?? null;
   session.projectRegistry.list = async () => Array.from(projects.values());
@@ -6713,7 +6812,7 @@ test("buildWorkspaceDescriptorMap stamps workspace archiving state", async () =>
 
 test("emitWorkspaceUpdatesForWorkspaceIds includes archiving state and dedupes unchanged emits", async () => {
   const emitted: SessionOutboundMessage[] = [];
-  const session = createSessionForWorkspaceTests();
+  const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
   const archivingAt = "2026-04-30T20:45:00.000Z";
   const project = createPersistedProjectRecord({
     projectId: "proj-archiving-emit",
@@ -6733,20 +6832,17 @@ test("emitWorkspaceUpdatesForWorkspaceIds includes archiving state and dedupes u
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
 
-  session.emit = (message) => {
-    if (isSessionOutboundMessage(message)) emitted.push(message);
-  };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-archiving",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-archiving",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-archiving" },
+  });
   session.listAgentPayloads = async () => [];
   session.projectRegistry.list = async () => [project];
   session.workspaceRegistry.list = async () => [workspace];
 
+  emitted.length = 0;
   session.markWorkspaceArchiving([workspace.workspaceId], archivingAt);
 
   await session.emitWorkspaceUpdatesForWorkspaceIds([workspace.workspaceId]);
@@ -6805,13 +6901,16 @@ test("external workspace updates emit one deduplicated batch", async () => {
     return [main, feature];
   };
   session.listAgentPayloads = async () => [];
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-observer-batch",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-observer-batch",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-observer-batch" },
+  });
+  main.displayName = "Updated main";
+  feature.displayName = "Updated feature";
+  snapshotReads.projects = 0;
+  snapshotReads.workspaces = 0;
   session.onMessage = (message) => {
     if (isSessionOutboundMessage(message)) emitted.push(message);
   };
@@ -6980,6 +7079,10 @@ test("fetch_workspaces_response emits before cold registration-triggered git wor
   const session = asTestSession(
     createSessionForWorkspaceTests({
       workspaceGitService,
+      onMessage: (message) => {
+        if (message.type === "fetch_workspaces_response") events.push("response");
+        emitted.push(message);
+      },
     }),
   );
   const project = createPersistedProjectRecord({
@@ -7000,13 +7103,6 @@ test("fetch_workspaces_response emits before cold registration-triggered git wor
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
 
-  session.emit = (message: unknown) => {
-    if (!isSessionOutboundMessage(message)) return;
-    if (message.type === "fetch_workspaces_response") {
-      events.push("response");
-    }
-    emitted.push(message);
-  };
   session.listAgentPayloads = async () => [];
   session.projectRegistry.list = async () => [project];
   session.workspaceRegistry.list = async () => [workspace];
@@ -7046,6 +7142,7 @@ test("workspace_update includes updated runtime fields", async () => {
   const session = asTestSession(
     createSessionForWorkspaceTests({
       workspaceGitService,
+      onMessage: (message) => emitted.push(message),
     }),
   );
   const project = createPersistedProjectRecord({
@@ -7066,16 +7163,12 @@ test("workspace_update includes updated runtime fields", async () => {
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
 
-  session.emit = (message) => {
-    if (isSessionOutboundMessage(message)) emitted.push(message);
-  };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-runtime",
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-runtime",
     filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map(),
-  };
+    subscribe: { subscriptionId: "sub-runtime" },
+  });
   session.listAgentPayloads = async () => [];
   session.projectRegistry.list = async () => [project];
   session.workspaceRegistry.list = async () => [workspace];
@@ -7248,19 +7341,6 @@ test("workspace mutation handling does not let a delayed upsert recreate an arch
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const descriptor = {
-    id: workspace.workspaceId,
-    projectId: project.projectId,
-    projectDisplayName: project.displayName,
-    projectRootPath: project.rootPath,
-    workspaceDirectory: workspace.cwd,
-    projectKind: project.kind,
-    workspaceKind: workspace.kind,
-    name: workspace.displayName,
-    status: "done",
-    activityAt: null,
-    diffStat: null,
-  } as WorkspaceDescriptorPayload;
   let listedWorkspaces: PersistedWorkspaceRecord[] = [];
   const workspaceRegistry: SessionOptions["workspaceRegistry"] = {
     initialize: async () => {},
@@ -7312,12 +7392,12 @@ test("workspace mutation handling does not let a delayed upsert recreate an arch
 
   let resumeDescribe!: () => void;
   const describeStarted = new Promise<void>((resolveStarted) => {
-    session.describeWorkspaceRecordWithGitData = async () => {
+    workspaceRegistry.list = async () => {
       resolveStarted();
       await new Promise<void>((resolveResume) => {
         resumeDescribe = resolveResume;
       });
-      return descriptor;
+      return listedWorkspaces;
     };
   });
 
@@ -7427,12 +7507,17 @@ test("workspace mutations outside a filtered subscription neither watch nor emit
   });
   session.buildWorkspaceDescriptorMap = async () => new Map([[descriptor.id, descriptor]]);
 
-  await session.handleMessage({
-    type: "fetch_workspaces_request",
-    requestId: "req-filtered-mutation",
-    filter: { projectId: "some-other-project" },
-    subscribe: {},
-  });
+  const source = {};
+  session.updateClientCapabilities({ [CLIENT_CAPS.ownedSubscriptions]: true }, source);
+  await session.handleMessage(
+    {
+      type: "fetch_workspaces_request",
+      requestId: "req-filtered-mutation",
+      filter: { projectId: "some-other-project" },
+      subscribe: {},
+    },
+    source,
+  );
   emitted.length = 0;
 
   await mutationListener?.({
@@ -7506,28 +7591,19 @@ test("project removal mutation broadcasts the final delta to another subscribed
       remove: async () => {},
     },
   });
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-global-remove",
-    filter: undefined,
-    isBootstrapping: false,
-    pendingUpdatesByWorkspaceId: new Map(),
-    lastEmittedByWorkspaceId: new Map([
-      [
-        workspace.workspaceId,
-        {
-          kind: "remove",
-          id: workspace.workspaceId,
-          emptyProject: {
-            projectId: project.projectId,
-            projectDisplayName: project.displayName,
-            projectCustomName: null,
-            projectRootPath: project.rootPath,
-            projectKind: project.kind,
-          },
-        },
-      ],
-    ]),
-  };
+  workspace.archivedAt = null;
+  projectRegistry.list = async () => [project];
+  projectRegistry.get = async () => project;
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-global-remove",
+    subscribe: { subscriptionId: "sub-global-remove" },
+  });
+  workspace.archivedAt = "2026-03-02T12:00:00.000Z";
+  await session.emitWorkspaceUpdatesForWorkspaceIds([workspace.workspaceId]);
+  emitted.length = 0;
+  projectRegistry.list = async () => [];
+  projectRegistry.get = async () => null;
 
   await projectRegistry.remove(project.projectId);
 
@@ -7940,13 +8016,11 @@ test("project.rename.request stores customName and emits an updated workspace de
   session.workspaceRegistry.get = async (id: string) =>
     id === workspace.workspaceId ? workspace : null;
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-workspaces",
-    filter: {},
-    isBootstrapping: false,
-    lastEmittedByWorkspaceId: new Map(),
-    pendingUpdatesByWorkspaceId: new Map(),
-  };
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-workspaces",
+    subscribe: { subscriptionId: "sub-workspaces" },
+  });
 
   await session.handleMessage({
     type: "project.rename.request",
@@ -8117,13 +8191,11 @@ test("workspace.title.set.request stores the title and emits an updated descript
     return updated;
   };
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-workspaces",
-    filter: {},
-    isBootstrapping: false,
-    lastEmittedByWorkspaceId: new Map(),
-    pendingUpdatesByWorkspaceId: new Map(),
-  };
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-workspaces",
+    subscribe: { subscriptionId: "sub-workspaces" },
+  });
 
   await session.handleMessage({
     type: "workspace.title.set.request",
@@ -8187,13 +8259,11 @@ test("workspace.pin.set.request stores the pin timestamp and emits an updated de
     workspaces.set(id, updated);
     return updated;
   };
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-workspaces",
-    filter: {},
-    isBootstrapping: false,
-    lastEmittedByWorkspaceId: new Map(),
-    pendingUpdatesByWorkspaceId: new Map(),
-  };
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-workspaces",
+    subscribe: { subscriptionId: "sub-workspaces" },
+  });
 
   await session.handleMessage({
     type: "workspace.pin.set.request",
@@ -8290,11 +8360,11 @@ test("workspace.title.set.request returns accepted=false when workspace is not f
   expect(response?.payload.error).toBeTruthy();
 });
 
-function createSessionWithTerminalManager(options: {
+async function createSessionWithTerminalManager(options: {
   workspaces: PersistedWorkspaceRecord[];
   projects: PersistedProjectRecord[];
   onMessage?: (message: SessionOutboundMessage) => void;
-}): { session: TestSession; terminalManager: TerminalManager } {
+}): Promise<{ session: TestSession; terminalManager: TerminalManager }> {
   const terminalManager = createTerminalManager();
   terminalManagers.push(terminalManager);
 
@@ -8327,13 +8397,11 @@ function createSessionWithTerminalManager(options: {
     workspaceRegistry,
   });
 
-  session.workspaceUpdatesSubscription = {
-    subscriptionId: "sub-workspaces",
-    filter: undefined,
-    isBootstrapping: false,
-    lastEmittedByWorkspaceId: new Map(),
-    pendingUpdatesByWorkspaceId: new Map(),
-  };
+  await session.handleMessage({
+    type: "fetch_workspaces_request",
+    requestId: "sub-workspaces",
+    subscribe: { subscriptionId: "sub-workspaces" },
+  });
 
   return { session, terminalManager };
 }
@@ -8463,7 +8531,7 @@ test("title-only terminal change does not build workspace descriptors or emit wo
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { session, terminalManager } = createSessionWithTerminalManager({
+  const { session, terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspace],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -8507,7 +8575,7 @@ test("terminal activity contribution change updates the correct workspace", asyn
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { terminalManager } = createSessionWithTerminalManager({
+  const { terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspace],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -8565,7 +8633,7 @@ test("same-cwd terminal activity updates only the workspace that owns the termin
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { terminalManager } = createSessionWithTerminalManager({
+  const { terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspaceA, workspaceB],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -8629,7 +8697,7 @@ test("a worktree terminal updates only the workspace that owns it", async () =>
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { terminalManager } = createSessionWithTerminalManager({
+  const { terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspaceRoot, workspaceWorktree],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -8682,7 +8750,7 @@ test("removing an idle terminal does not update workspace status", async () => {
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { session, terminalManager } = createSessionWithTerminalManager({
+  const { session, terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspace],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -8721,7 +8789,7 @@ test("removing a contributing terminal clears workspace status", async () => {
     createdAt: "2026-03-01T12:00:00.000Z",
     updatedAt: "2026-03-01T12:00:00.000Z",
   });
-  const { terminalManager } = createSessionWithTerminalManager({
+  const { terminalManager } = await createSessionWithTerminalManager({
     workspaces: [workspace],
     projects: [project],
     onMessage: (message) => emitted.push(message),
@@ -9446,6 +9514,50 @@ test("workspace.create.request attaches a directory workspace to its explicit ac
   });
 });
 
+test("workspace.create.request with background persists a hidden workspace that only opted-in listings show", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const workspaces = new Map<string, PersistedWorkspaceRecord>();
+  const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
+  session.workspaceRegistry.upsert = async (record: unknown) => {
+    const workspace = record as PersistedWorkspaceRecord;
+    workspaces.set(workspace.workspaceId, workspace);
+  };
+  session.workspaceRegistry.get = async (workspaceId: string) =>
+    workspaces.get(workspaceId) ?? null;
+  session.workspaceRegistry.list = async () => Array.from(workspaces.values());
+
+  await session.handleMessage({
+    type: "workspace.create.request",
+    requestId: "req-background-workspace",
+    background: true,
+    source: { kind: "directory", path: REPO_CWD },
+  });
+
+  const response = findByType(emitted, "workspace.create.response");
+  expect(response?.payload).toMatchObject({
+    requestId: "req-background-workspace",
+    error: null,
+    workspace: { background: true },
+  });
+  const workspaceId = response?.payload.workspace?.id as string;
+  expect(workspaces.get(workspaceId)?.background).toBe(true);
+  // No subscription exists, and the legacy causal update stays quiet for a hidden workspace.
+  expect(filterByType(emitted, "workspace_update")).toEqual([]);
+
+  const hidden = await session.listFetchWorkspacesEntries({
+    type: "fetch_workspaces_request",
+    requestId: "req-list-hidden",
+  });
+  expect(hidden.entries).toEqual([]);
+
+  const shown = await session.listFetchWorkspacesEntries({
+    type: "fetch_workspaces_request",
+    requestId: "req-list-shown",
+    filter: { includeBackground: true },
+  });
+  expect(shown.entries.map((entry) => [entry.id, entry.background])).toEqual([[workspaceId, true]]);
+});
+
 test("workspace.create.request reports an unknown explicit project", async () => {
   const emitted: SessionOutboundMessage[] = [];
   const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
diff --git a/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts b/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
index c8b00332fe..78343c95ac 100644
--- a/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
+++ b/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
@@ -36,6 +36,7 @@ function makeAgentPayload(input: {
   requiresAttention?: boolean;
   effectiveThinkingOptionId?: string | null;
   thinkingOptionId?: string | null;
+  internal?: boolean;
 }): AgentSnapshotPayload {
   const updatedAt = input.updatedAt ?? "2026-03-01T12:00:00.000Z";
   const provider = input.provider ?? "codex";
@@ -44,6 +45,7 @@ function makeAgentPayload(input: {
     provider,
     cwd: "/tmp/repo",
     ...(input.workspaceId ? { workspaceId: input.workspaceId } : {}),
+    ...(input.internal ? { internal: true } : {}),
     model: null,
     thinkingOptionId: input.thinkingOptionId ?? null,
     effectiveThinkingOptionId: input.effectiveThinkingOptionId ?? null,
@@ -235,6 +237,15 @@ describe("matchesAgentUpdatesFilter", () => {
     );
   });
 
+  test("internal agents are excluded unless includeInternal", () => {
+    const agent = makeAgentPayload({ id: "a", internal: true });
+    expect(matchesAgentUpdatesFilter({ agent, project })).toBe(false);
+    expect(matchesAgentUpdatesFilter({ agent, project, filter: {} })).toBe(false);
+    expect(matchesAgentUpdatesFilter({ agent, project, filter: { includeInternal: true } })).toBe(
+      true,
+    );
+  });
+
   test("thinking-option filter compares the resolved option", () => {
     const high = makeAgentPayload({ id: "a", effectiveThinkingOptionId: "high" });
     expect(
@@ -681,3 +692,13 @@ describe("subscription lifecycle", () => {
     expect(h.agentUpdates()).toEqual([{ kind: "remove", agentId: "a" }]);
   });
 });
+
+test("an idle session skips agent hydration while preserving workspace updates", async () => {
+  const h = buildHarness();
+  const agent = { ...h.managed("unobserved"), workspaceId: "workspace" };
+  // No payload is registered: attempting to hydrate this agent would fail.
+  await h.service.forwardLiveAgent(agent);
+  expect(h.loggedErrors).toEqual([]);
+  expect(h.agentUpdates()).toEqual([]);
+  expect(h.workspaceUpdates).toEqual([agent.workspaceId]);
+});
diff --git a/packages/server/src/server/session/agent-updates/agent-updates-service.ts b/packages/server/src/server/session/agent-updates/agent-updates-service.ts
index 61919378c5..f17e2a2067 100644
--- a/packages/server/src/server/session/agent-updates/agent-updates-service.ts
+++ b/packages/server/src/server/session/agent-updates/agent-updates-service.ts
@@ -16,30 +16,20 @@ type AgentUpdatesFilter = NonNullable<
 
 interface AgentUpdatesSubscriptionState {
   subscriptionId: string;
-  syncEnabled?: boolean;
+  emit: (message: SessionOutboundMessage) => void;
+  syncEnabled: boolean;
   filter?: AgentUpdatesFilter;
+  isProviderVisible: (provider: string) => boolean;
   isBootstrapping: boolean;
   pendingUpdatesByAgentId: Map<string, AgentUpdatePayload>;
 }
 
-/**
- * Owns the single per-client `agent_update` subscription: when a client subscribes
- * via `fetch_agents_request`, every later agent lifecycle change (live forward,
- * stored-record archive/detach, delete) is filtered against the subscription's
- * filter and either emitted or — while the initial snapshot is still being built —
- * buffered and replayed on flush. Keeping the mutable subscription state, the
- * bootstrap buffer, the provider-visibility gate, and the filter predicate behind
- * one interface stops the rest of session.ts from poking the subscription shape or
- * hand-rolling `agent_update` payloads, and the (previously untested) filter/buffer/
- * flush branches become exercisable through injected fakes.
- *
- * The snapshot listing path applies the SAME filter via the pure
- * `matchesAgentUpdatesFilter` so a subscription's initial page and its live updates
- * stay consistent.
- */
+/** Owns filtered agent snapshots and live updates for independent observers. */
 export interface AgentUpdatesService {
   beginSubscription(input: {
     subscriptionId: string;
+    isProviderVisible?: (provider: string) => boolean;
+    emit?: (message: SessionOutboundMessage) => void;
     filter?: AgentUpdatesFilter;
     syncEnabled?: boolean;
   }): void;
@@ -49,7 +39,7 @@ export interface AgentUpdatesService {
   ): void;
   clearSubscription(subscriptionId: string): void;
   hasSubscription(): boolean;
-  includesLiveAgent(agent: ManagedAgent): Promise<boolean>;
+  includesLiveAgent(agent: ManagedAgent, subscriptionIds?: ReadonlySet<string>): Promise<boolean>;
   forwardLiveAgent(agent: ManagedAgent): Promise<void>;
   emitStoredRecord(record: StoredAgentRecord): Promise<AgentSnapshotPayload>;
   removeAgent(agentId: string): Promise<void>;
@@ -57,6 +47,7 @@ export interface AgentUpdatesService {
 }
 
 export interface AgentUpdatesServiceDeps {
+  includesWorkspace?(agent: AgentSnapshotPayload, includeBackground?: boolean): Promise<boolean>;
   emit(message: SessionOutboundMessage): void;
   enrichAgentPayload(payload: AgentSnapshotPayload): Promise<AgentSnapshotPayload>;
   buildStoredAgentPayload(record: StoredAgentRecord): AgentSnapshotPayload;
@@ -69,6 +60,7 @@ export interface AgentUpdatesServiceDeps {
     project: ProjectPlacementPayload | null,
     agentId: string,
     includeSequence: boolean,
+    includeBackground?: boolean,
   ): T;
   logger: pino.Logger;
 }
@@ -146,6 +138,10 @@ export function matchesAgentUpdatesFilter(input: {
     return false;
   }
 
+  if (agent.internal && filter?.includeInternal !== true) {
+    return false;
+  }
+
   if (filter && !agentThinkingOptionMatchesFilter(agent, filter)) {
     return false;
   }
@@ -162,7 +158,7 @@ function agentUpdateTargetId(update: AgentUpdatePayload): string {
 }
 
 export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentUpdatesService {
-  let subscription: AgentUpdatesSubscriptionState | null = null;
+  const subscriptions = new Map<string, AgentUpdatesSubscriptionState>();
   const liveAgentUpdateTails = new Map<string, Promise<void>>();
   const sequence = <T extends AgentUpdatePayload>(
     sub: AgentUpdatesSubscriptionState,
@@ -170,10 +166,19 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
     agent: AgentSnapshotPayload | null,
     project: ProjectPlacementPayload | null,
     agentId: string,
-  ) => deps.sequenceAgentUpdate(payload, agent, project, agentId, sub.syncEnabled === true);
+  ) =>
+    deps.sequenceAgentUpdate(
+      payload,
+      agent,
+      project,
+      agentId,
+      sub.syncEnabled === true,
+      sub.filter?.includeBackground,
+    );
 
   function bufferOrEmit(sub: AgentUpdatesSubscriptionState, payload: AgentUpdatePayload): void {
-    if (payload.kind === "upsert" && !deps.isProviderVisibleToClient(payload.agent.provider)) {
+    if (subscriptions.get(sub.subscriptionId) !== sub) return;
+    if (payload.kind === "upsert" && !sub.isProviderVisible(payload.agent.provider)) {
       return;
     }
     if (sub.isBootstrapping) {
@@ -181,194 +186,120 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
       return;
     }
 
-    deps.emit({
-      type: "agent_update",
-      payload,
-    });
+    sub.emit({ type: "agent_update", payload });
   }
 
   function beginSubscription(input: {
     subscriptionId: string;
+    isProviderVisible?: (provider: string) => boolean;
+    emit?: (message: SessionOutboundMessage) => void;
     filter?: AgentUpdatesFilter;
     syncEnabled?: boolean;
   }): void {
-    subscription = {
-      subscriptionId: input.subscriptionId,
-      syncEnabled: input.syncEnabled,
-      filter: input.filter,
+    subscriptions.set(input.subscriptionId, {
+      ...input,
+      emit: input.emit ?? deps.emit,
+      syncEnabled: input.syncEnabled ?? false,
+      isProviderVisible: input.isProviderVisible ?? deps.isProviderVisibleToClient,
       isBootstrapping: true,
       pendingUpdatesByAgentId: new Map(),
-    };
+    });
   }
 
   function flushBootstrapped(
     subscriptionId: string,
     options?: { snapshotUpdatedAtByAgentId?: Map<string, number> },
   ): void {
-    if (!subscription || subscription.subscriptionId !== subscriptionId) {
-      return;
-    }
-    if (!subscription.isBootstrapping) {
-      return;
-    }
-
-    subscription.isBootstrapping = false;
-    const pending = Array.from(subscription.pendingUpdatesByAgentId.values());
-    subscription.pendingUpdatesByAgentId.clear();
-
+    const sub = subscriptions.get(subscriptionId);
+    if (!sub?.isBootstrapping) return;
+    sub.isBootstrapping = false;
+    const pending = Array.from(sub.pendingUpdatesByAgentId.values());
+    sub.pendingUpdatesByAgentId.clear();
     for (const payload of pending) {
       if (payload.kind === "upsert") {
         const snapshotUpdatedAt = options?.snapshotUpdatedAtByAgentId?.get(payload.agent.id);
-        if (typeof snapshotUpdatedAt === "number") {
-          const updateUpdatedAt = Date.parse(payload.agent.updatedAt);
-          if (!Number.isNaN(updateUpdatedAt) && updateUpdatedAt < snapshotUpdatedAt) {
-            continue;
-          }
-        }
+        if (
+          snapshotUpdatedAt !== undefined &&
+          Date.parse(payload.agent.updatedAt) < snapshotUpdatedAt
+        )
+          continue;
       }
-
-      deps.emit({
-        type: "agent_update",
-        payload,
-      });
+      bufferOrEmit(sub, payload);
     }
   }
 
   function clearSubscription(subscriptionId: string): void {
-    if (subscription && subscription.subscriptionId === subscriptionId) {
-      subscription = null;
-    }
+    subscriptions.delete(subscriptionId);
   }
 
   function hasSubscription(): boolean {
-    return subscription !== null;
+    return subscriptions.size > 0;
   }
 
-  async function includesLiveAgent(agent: ManagedAgent): Promise<boolean> {
-    const activeSubscription = subscription;
-    if (!activeSubscription) return false;
-
+  async function includesLiveAgent(
+    agent: ManagedAgent,
+    subscriptionIds?: ReadonlySet<string>,
+  ): Promise<boolean> {
+    const observers = [...subscriptions.values()].filter(
+      (sub) => !subscriptionIds || subscriptionIds.has(sub.subscriptionId),
+    );
+    if (observers.length === 0) return false;
     const payload = await deps.enrichAgentPayload(toAgentPayload(agent));
-    if (subscription !== activeSubscription || !deps.isProviderVisibleToClient(payload.provider)) {
-      return false;
-    }
     const project = payload.workspaceId
       ? await deps.buildProjectPlacementForWorkspaceId(payload.workspaceId)
       : null;
-    return (
-      subscription === activeSubscription &&
-      project !== null &&
-      matchesAgentUpdatesFilter({
-        agent: payload,
-        project,
-        filter: activeSubscription.filter,
-      })
+    const backgroundVisible = await Promise.all(
+      observers.map(
+        (sub) => deps.includesWorkspace?.(payload, sub.filter?.includeBackground) ?? true,
+      ),
     );
+    return (
+      project !== null &&
+      observers.some(
+        (sub, index) =>
+          backgroundVisible[index] &&
+          sub.isProviderVisible(payload.provider) &&
+          matchesAgentUpdatesFilter({ agent: payload, project, filter: sub.filter }),
+      )
+    );
+  }
+
+  async function publishPayload(payload: AgentSnapshotPayload): Promise<void> {
+    const observers = [...subscriptions.values()];
+    if (observers.length === 0) return;
+    const project = payload.workspaceId
+      ? await deps.buildProjectPlacementForWorkspaceId(payload.workspaceId)
+      : null;
+    for (const sub of observers) {
+      const matches =
+        project &&
+        ((await deps.includesWorkspace?.(payload, sub.filter?.includeBackground)) ?? true) &&
+        matchesAgentUpdatesFilter({ agent: payload, project, filter: sub.filter });
+      bufferOrEmit(
+        sub,
+        sequence(
+          sub,
+          matches
+            ? { kind: "upsert", agent: payload, project }
+            : { kind: "remove", agentId: payload.id },
+          payload,
+          project,
+          payload.id,
+        ),
+      );
+    }
   }
 
   async function emitStoredRecord(record: StoredAgentRecord): Promise<AgentSnapshotPayload> {
     const payload = deps.buildStoredAgentPayload(record);
-    const sub = subscription;
-    if (!sub) {
-      return payload;
-    }
-
-    const project = payload.workspaceId
-      ? await deps.buildProjectPlacementForWorkspaceId(payload.workspaceId)
-      : null;
-    if (!project) {
-      bufferOrEmit(
-        sub,
-        sequence(sub, { kind: "remove", agentId: payload.id }, null, null, payload.id),
-      );
-      return payload;
-    }
-
-    const matches = matchesAgentUpdatesFilter({
-      agent: payload,
-      project,
-      filter: sub.filter,
-    });
-    bufferOrEmit(
-      sub,
-      sequence(
-        sub,
-        matches
-          ? {
-              kind: "upsert",
-              agent: payload,
-              project,
-            }
-          : {
-              kind: "remove",
-              agentId: payload.id,
-            },
-        payload,
-        project,
-        payload.id,
-      ),
-    );
+    await publishPayload(payload);
     return payload;
   }
 
   async function emitLiveAgentUpdate(payload: AgentSnapshotPayload): Promise<void> {
     try {
-      const sub = subscription;
-      payload = await deps.enrichAgentPayload(payload);
-      if (sub) {
-        const project = payload.workspaceId
-          ? await deps.buildProjectPlacementForWorkspaceId(payload.workspaceId)
-          : null;
-        if (!project) {
-          bufferOrEmit(
-            sub,
-            sequence(sub, { kind: "remove", agentId: payload.id }, null, null, payload.id),
-          );
-        } else {
-          const matches = matchesAgentUpdatesFilter({
-            agent: payload,
-            project,
-            filter: sub.filter,
-          });
-
-          if (matches) {
-            bufferOrEmit(
-              sub,
-              sequence(
-                sub,
-                {
-                  kind: "upsert",
-                  agent: payload,
-                  project,
-                },
-                payload,
-                project,
-                payload.id,
-              ),
-            );
-          } else {
-            bufferOrEmit(
-              sub,
-              sequence(
-                sub,
-                {
-                  kind: "remove",
-                  agentId: payload.id,
-                },
-                payload,
-                project,
-                payload.id,
-              ),
-            );
-          }
-        }
-      }
-
-      // A lifecycle change updates exactly the agent's owning workspace, never
-      // every workspace sharing its cwd. Ownership is the agent's workspaceId.
-      if (payload.workspaceId) {
-        await deps.emitWorkspaceUpdateForWorkspaceId(payload.workspaceId);
-      }
+      if (hasSubscription()) await publishPayload(await deps.enrichAgentPayload(payload));
+      if (payload.workspaceId) await deps.emitWorkspaceUpdateForWorkspaceId(payload.workspaceId);
     } catch (error) {
       deps.logger.error({ err: error }, "Failed to emit agent update");
     }
@@ -390,23 +321,32 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
   }
 
   function forwardLiveAgent(agent: ManagedAgent): Promise<void> {
+    if (!hasSubscription()) {
+      const workspaceId = agent.workspaceId;
+      return workspaceId
+        ? enqueueAgentUpdate(agent.id, async () => {
+            try {
+              await deps.emitWorkspaceUpdateForWorkspaceId(workspaceId);
+            } catch (error) {
+              deps.logger.error({ err: error }, "Failed to emit workspace update");
+            }
+          })
+        : Promise.resolve();
+    }
     const payload = toAgentPayload(agent);
     return enqueueAgentUpdate(payload.id, () => emitLiveAgentUpdate(payload));
   }
 
   function removeAgent(agentId: string): Promise<void> {
     return enqueueAgentUpdate(agentId, () => {
-      if (subscription) {
-        bufferOrEmit(
-          subscription,
-          sequence(subscription, { kind: "remove", agentId }, null, null, agentId),
-        );
+      for (const sub of subscriptions.values()) {
+        bufferOrEmit(sub, sequence(sub, { kind: "remove", agentId }, null, null, agentId));
       }
     });
   }
 
   function dispose(): void {
-    subscription = null;
+    subscriptions.clear();
   }
 
   return {
diff --git a/packages/server/src/server/session/checkout/checkout-session.test.ts b/packages/server/src/server/session/checkout/checkout-session.test.ts
index d29418a9a5..bc65b01d87 100644
--- a/packages/server/src/server/session/checkout/checkout-session.test.ts
+++ b/packages/server/src/server/session/checkout/checkout-session.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "../owned-subscriptions/index.js";
 import { execFileSync } from "node:child_process";
 import { mkdtempSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -26,6 +27,7 @@ import {
   createNoGitWorkspaceRuntimeSnapshot,
   createNoopWorkspaceGitService,
 } from "../../test-utils/workspace-git-service-stub.js";
+import { createWorktree, deletePaseoWorktree } from "../../../utils/worktree.js";
 import { expandTilde } from "../../../utils/path.js";
 import type { GitMetadataGenerator } from "./git-metadata-generator.js";
 
@@ -48,6 +50,7 @@ function createFakeDiffSubscriber(initial: CheckoutDiffSnapshotPayload) {
   const subscriptions: FakeDiffSubscription[] = [];
   const refreshedCwds: string[] = [];
   const subscriber: CheckoutDiffSubscriber = {
+    read: async (params) => ({ ...initial, cwd: params.cwd }),
     subscribe: async (params, listener) => {
       let isSubscribed = true;
       const subscription: FakeDiffSubscription = {
@@ -104,6 +107,7 @@ interface RecordedGeneratorCalls {
 }
 
 function makeCheckoutSession(options?: {
+  paseoHome?: string;
   git?: Partial<WorkspaceGitService>;
   diff?: CheckoutDiffSubscriber;
   github?: Partial<ForgeService>;
@@ -169,11 +173,27 @@ function makeCheckoutSession(options?: {
     checkoutDiffManager:
       options?.diff ?? createFakeDiffSubscriber({ cwd: "", files: [], error: null }).subscriber,
     gitMetadataGenerator,
-    paseoHome: "/tmp/paseo-home",
+    paseoHome: options?.paseoHome ?? "/tmp/paseo-home",
     worktreesRoot: undefined,
     logger: pino({ level: "silent" }),
   });
-  return { checkout, emitted, hostCalls, gitMutationCalls, generatorCalls };
+  const delivery = new SessionDelivery((_source, message) => emitted.push(message));
+  return {
+    checkout,
+    emitted,
+    hostCalls,
+    gitMutationCalls,
+    generatorCalls,
+    subscribe: (request: Parameters<CheckoutSession["handleSubscribeDiffRequest"]>[0]) =>
+      delivery.request(undefined, request, () =>
+        checkout.handleSubscribeDiffRequest(request, delivery),
+      ),
+    unsubscribe: (request: Parameters<CheckoutSession["handleUnsubscribeDiffRequest"]>[0]) =>
+      delivery.request(undefined, request, () =>
+        checkout.handleUnsubscribeDiffRequest(request, delivery),
+      ),
+    close: () => delivery.close(),
+  };
 }
 
 function createGitSnapshot(
@@ -532,9 +552,9 @@ describe("CheckoutSession", () => {
         files: [],
         error: null,
       });
-      const { checkout, emitted } = makeCheckoutSession({ diff: subscriber });
+      const { subscribe, unsubscribe, emitted } = makeCheckoutSession({ diff: subscriber });
 
-      await checkout.handleSubscribeDiffRequest({
+      await subscribe({
         type: "subscribe_checkout_diff_request",
         subscriptionId: "s1",
         cwd: "/repo",
@@ -566,7 +586,7 @@ describe("CheckoutSession", () => {
         },
       });
 
-      checkout.handleUnsubscribeDiffRequest({
+      await unsubscribe({
         type: "unsubscribe_checkout_diff_request",
         subscriptionId: "s1",
       });
@@ -574,22 +594,22 @@ describe("CheckoutSession", () => {
       expect(subscriptions[0].unsubscribeCalls).toBe(1);
     });
 
-    it("replaces an existing subscription when the same id subscribes again", async () => {
+    it("preserves legacy replacement when an existing id when the same id subscribes again", async () => {
       const { subscriber, subscriptions } = createFakeDiffSubscriber({
         cwd: "/repo",
         files: [],
         error: null,
       });
-      const { checkout } = makeCheckoutSession({ diff: subscriber });
+      const { subscribe } = makeCheckoutSession({ diff: subscriber });
 
-      await checkout.handleSubscribeDiffRequest({
+      await subscribe({
         type: "subscribe_checkout_diff_request",
         subscriptionId: "s1",
         cwd: "/repo",
         compare: { mode: "uncommitted" },
         requestId: "first",
       });
-      await checkout.handleSubscribeDiffRequest({
+      await subscribe({
         type: "subscribe_checkout_diff_request",
         subscriptionId: "s1",
         cwd: "/repo",
@@ -608,16 +628,16 @@ describe("CheckoutSession", () => {
         files: [],
         error: null,
       });
-      const { checkout } = makeCheckoutSession({ diff: subscriber });
+      const { subscribe, close } = makeCheckoutSession({ diff: subscriber });
 
-      await checkout.handleSubscribeDiffRequest({
+      await subscribe({
         type: "subscribe_checkout_diff_request",
         subscriptionId: "s1",
         cwd: "/repo",
         compare: { mode: "uncommitted" },
         requestId: "r",
       });
-      await checkout.handleSubscribeDiffRequest({
+      await subscribe({
         type: "subscribe_checkout_diff_request",
         subscriptionId: "s2",
         cwd: "/repo",
@@ -625,7 +645,7 @@ describe("CheckoutSession", () => {
         requestId: "r",
       });
 
-      checkout.cleanup();
+      await close();
 
       expect(subscriptions[0].unsubscribeCalls).toBe(1);
       expect(subscriptions[1].unsubscribeCalls).toBe(1);
@@ -1704,3 +1724,91 @@ describe("CheckoutSession", () => {
     });
   });
 });
+
+it("creates a PR from a restored exact base using the host metadata and a forge branch name", async () => {
+  const root = realpathSync(mkdtempSync(join(tmpdir(), "paseo-restored-pr-")));
+  const repo = join(root, "repo");
+  const remote = join(root, "remote.git");
+  const paseoHome = join(root, "home");
+  const git = (cwd: string, ...args: string[]) =>
+    execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" }).trim();
+  try {
+    git(root, "init", "-b", "main", repo);
+    git(repo, "config", "user.name", "Test");
+    git(repo, "config", "user.email", "test@example.com");
+    git(repo, "commit", "--allow-empty", "-m", "base");
+    git(root, "init", "--bare", remote);
+    git(repo, "remote", "add", "origin", remote);
+    git(repo, "push", "-u", "origin", "main");
+    const baseRef = "refs/remotes/origin/main";
+    const created = await createWorktree({
+      cwd: repo,
+      paseoHome,
+      worktreeSlug: "restored-pr",
+      source: { kind: "branch-off", baseBranch: baseRef, branchName: "restored-pr" },
+      runSetup: false,
+    });
+    writeFileSync(join(created.worktreePath, "feature.txt"), "feature\n");
+    git(created.worktreePath, "add", ".");
+    git(created.worktreePath, "commit", "-m", "feature");
+    await deletePaseoWorktree({ cwd: repo, paseoHome, worktreePath: created.worktreePath });
+    const restored = await createWorktree({
+      cwd: repo,
+      paseoHome,
+      worktreeSlug: "restored-pr",
+      source: { kind: "restore", branchName: created.branchName, baseRef },
+      runSetup: false,
+    });
+    const requests: Array<Parameters<ForgeService["createPullRequest"]>[0]> = [];
+    const service: ForgeService = {
+      ...createGitHubService(),
+      createPullRequest: async (input) => {
+        requests.push(input);
+        return { url: "https://example.com/pull/1", number: 1 };
+      },
+    };
+    const { checkout, emitted } = makeCheckoutSession({
+      paseoHome,
+      git: { resolveForge: async () => ({ forge: "github", host: "github.com", service }) },
+    });
+    await checkout.handleCheckoutPrCreateRequest({
+      type: "checkout_pr_create_request",
+      cwd: restored.worktreePath,
+      baseRef: "refs/heads/main",
+      title: "Feature",
+      body: "Description",
+      requestId: "wrong-base",
+    });
+    expect(emitted.at(-1)).toMatchObject({
+      type: "checkout_pr_create_response",
+      payload: { error: { message: expect.stringContaining("Base ref mismatch") } },
+    });
+    expect(requests).toHaveLength(0);
+    await checkout.handleCheckoutPrCreateRequest({
+      type: "checkout_pr_create_request",
+      cwd: restored.worktreePath,
+      baseRef: "main",
+      title: "Feature",
+      body: "Description",
+      requestId: "right-base",
+    });
+    expect(emitted.at(-1)).toMatchObject({
+      type: "checkout_pr_create_response",
+      payload: { error: null, number: 1 },
+    });
+    expect(requests).toEqual([
+      {
+        cwd: restored.worktreePath,
+        base: "main",
+        head: created.branchName,
+        title: "Feature",
+        body: "Description",
+      },
+    ]);
+    expect(git(remote, "rev-parse", `refs/heads/${created.branchName}`)).toBe(
+      git(restored.worktreePath, "rev-parse", "HEAD"),
+    );
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/session/checkout/checkout-session.ts b/packages/server/src/server/session/checkout/checkout-session.ts
index 789f1f0449..419d418050 100644
--- a/packages/server/src/server/session/checkout/checkout-session.ts
+++ b/packages/server/src/server/session/checkout/checkout-session.ts
@@ -1,4 +1,5 @@
 import type pino from "pino";
+import type { SessionDelivery } from "../owned-subscriptions/index.js";
 import { isAbsolute } from "node:path";
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
 import { getForgeDefinitionOrNeutral } from "@getpaseo/protocol/forge-manifest";
@@ -108,6 +109,9 @@ function toLegacyGithubSearchItems(items: ForgeSearchResultItem[]): LegacyGithub
  * real CheckoutDiffManager satisfies this structurally; tests supply a fake.
  */
 export interface CheckoutDiffSubscriber {
+  read(
+    params: Omit<CheckoutDiffSubscriptionRequest, "signal">,
+  ): Promise<CheckoutDiffSnapshotPayload>;
   subscribe(
     params: CheckoutDiffSubscriptionRequest,
     listener: (snapshot: CheckoutDiffSnapshotPayload) => void,
@@ -152,7 +156,6 @@ export class CheckoutSession {
   private readonly paseoHome: string;
   private readonly worktreesRoot: string | undefined;
   private readonly logger: pino.Logger;
-  private readonly diffSubscriptions = new Map<string, () => void>();
   private readonly statusUpdateFingerprints = new Map<string, string>();
 
   constructor(options: CheckoutSessionOptions) {
@@ -271,7 +274,10 @@ export class CheckoutSession {
     const { cwd, requestId } = msg;
 
     try {
-      const { baseRef, commits } = await listCheckoutCommits({ cwd: expandTilde(cwd) });
+      const { baseRef, commits } = await listCheckoutCommits({
+        cwd: expandTilde(cwd),
+        context: { paseoHome: this.paseoHome, worktreesRoot: this.worktreesRoot },
+      });
       this.host.emit({
         type: "checkout.commits.list.response",
         payload: { cwd, baseRef, commits, error: null, requestId },
@@ -400,48 +406,77 @@ export class CheckoutSession {
     }
   }
 
-  async handleSubscribeDiffRequest(msg: SubscribeCheckoutDiffRequest): Promise<void> {
-    const cwd = expandTilde(msg.cwd);
-    this.diffSubscriptions.get(msg.subscriptionId)?.();
-    const abort = new AbortController();
-    const unsubscribe = () => abort.abort();
-    this.diffSubscriptions.set(msg.subscriptionId, unsubscribe);
+  async handleReadDiffRequest(
+    msg: Extract<SessionInboundMessage, { type: "checkout.diff.get.request" }>,
+  ): Promise<void> {
+    const snapshot = await this.checkoutDiffManager.read({
+      cwd: expandTilde(msg.cwd),
+      compare: msg.compare,
+    });
+    this.host.emit({
+      type: "checkout.diff.get.response",
+      payload: { ...snapshot, requestId: msg.requestId },
+    });
+  }
 
+  async handleSubscribeDiffRequest(
+    msg: SubscribeCheckoutDiffRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
+    let bootstrap: Promise<CheckoutDiffSubscription> | undefined;
+    const owner = ownership.begin(
+      "diffs",
+      msg.subscriptionId,
+      async () => {
+        await bootstrap?.then(
+          (subscription) => subscription.unsubscribe(),
+          () => undefined,
+        );
+      },
+      `diff:${msg.subscriptionId}`,
+    );
+    let ready = false;
+    let pending: CheckoutDiffSnapshotPayload | null = null;
+    const emitSnapshot = (snapshot: CheckoutDiffSnapshotPayload) =>
+      owner.emit({
+        type: "checkout_diff_update",
+        payload: { ...snapshot, subscriptionId: owner.responseId },
+      });
     try {
-      const subscription = await this.checkoutDiffManager.subscribe(
-        { cwd, compare: msg.compare, signal: abort.signal },
+      bootstrap = this.checkoutDiffManager.subscribe(
+        { cwd: expandTilde(msg.cwd), compare: msg.compare, signal: owner.signal },
         (snapshot) => {
-          this.host.emit({
-            type: "checkout_diff_update",
-            payload: {
-              subscriptionId: msg.subscriptionId,
-              ...snapshot,
-            },
-          });
+          if (owner.signal.aborted) return;
+          if (ready) emitSnapshot(snapshot);
+          else pending = snapshot;
         },
       );
-
+      const subscription = await bootstrap;
+      if (owner.signal.aborted) {
+        subscription.unsubscribe();
+        return;
+      }
       this.host.emit({
         type: "subscribe_checkout_diff_response",
         payload: {
-          subscriptionId: msg.subscriptionId,
           ...subscription.initial,
+          subscriptionId: owner.responseId,
           requestId: msg.requestId,
         },
       });
+      ready = true;
+      if (pending) emitSnapshot(pending);
     } catch (error) {
-      if (this.diffSubscriptions.get(msg.subscriptionId) === unsubscribe) {
-        this.diffSubscriptions.delete(msg.subscriptionId);
-      }
-      unsubscribe();
+      await owner.release();
       throw error;
     }
   }
 
-  handleUnsubscribeDiffRequest(msg: UnsubscribeCheckoutDiffRequest): void {
-    const unsubscribe = this.diffSubscriptions.get(msg.subscriptionId);
-    this.diffSubscriptions.delete(msg.subscriptionId);
-    unsubscribe?.();
+  async handleUnsubscribeDiffRequest(
+    msg: UnsubscribeCheckoutDiffRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
+    await ownership.release(msg.subscriptionId);
   }
 
   async handleRefreshRequest(msg: CheckoutRefreshRequest): Promise<void> {
@@ -818,10 +853,14 @@ export class CheckoutSession {
         }
       }
 
-      await mergeFromBase(cwd, {
-        baseRef: msg.baseRef,
-        requireCleanTarget: msg.requireCleanTarget ?? true,
-      });
+      await mergeFromBase(
+        cwd,
+        {
+          baseRef: msg.baseRef,
+          requireCleanTarget: msg.requireCleanTarget ?? true,
+        },
+        { paseoHome: this.paseoHome, worktreesRoot: this.worktreesRoot },
+      );
       await this.gitMutation.notifyGitMutation(cwd, "merge-from-base", { invalidateForge: true });
       this.scheduleDiffRefresh(cwd);
 
@@ -933,6 +972,7 @@ export class CheckoutSession {
           base: msg.baseRef,
         },
         service,
+        { paseoHome: this.paseoHome, worktreesRoot: this.worktreesRoot },
       );
       await this.gitMutation.notifyGitMutation(cwd, "create-pr", { invalidateForge: true });
 
@@ -1413,10 +1453,6 @@ export class CheckoutSession {
   }
 
   cleanup(): void {
-    for (const unsubscribe of this.diffSubscriptions.values()) {
-      unsubscribe();
-    }
-    this.diffSubscriptions.clear();
     this.statusUpdateFingerprints.clear();
   }
 }
diff --git a/packages/server/src/server/session/daemon/daemon-self-update-session-controller.test.ts b/packages/server/src/server/session/daemon/daemon-self-update-session-controller.test.ts
index ff274d9019..81c41f3421 100644
--- a/packages/server/src/server/session/daemon/daemon-self-update-session-controller.test.ts
+++ b/packages/server/src/server/session/daemon/daemon-self-update-session-controller.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "../owned-subscriptions/index.js";
 import { describe, expect, test } from "vitest";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import type { SessionInboundMessage, SessionOutboundMessage } from "../../messages.js";
@@ -176,3 +177,48 @@ describe("DaemonSelfUpdateSessionController", () => {
     expect(restartIntents).toEqual([]);
   });
 });
+
+test("self-update progress is request-owned through the final delivery boundary", async () => {
+  const source = {},
+    sibling = {};
+  const frames: SessionOutboundMessage[] = [];
+  const delivery = new SessionDelivery((socket, message) => {
+    expect(socket).toBe(source);
+    expect(delivery.permits(source, message)).toBe(true);
+    expect(delivery.permits(sibling, message)).toBe(false);
+    frames.push(message);
+  });
+  delivery.attach(source, true);
+  delivery.attach(sibling, true);
+  let lateProgress: (() => void) | undefined;
+  const controller = new DaemonSelfUpdateSessionController({
+    clientId: "safe-update",
+    daemonVersion: "0.8.0",
+    sessionLogger: createTestLogger(),
+    emit: (message) => {
+      delivery.reply(message);
+    },
+    emitLifecycleIntent: () => {
+      throw new Error("No restart is allowed in this test");
+    },
+    updater: {
+      async update(input) {
+        input.onProgress("starting");
+        await Promise.resolve();
+        input.onProgress("installing");
+        lateProgress = () => input.onProgress("starting");
+        return { success: false, error: "Safe injected update stopped", newVersion: null };
+      },
+    },
+  });
+  await delivery.request(source, updateRequest, async () => {
+    await controller.dispatch(updateRequest);
+  });
+  expect(frames.map((message) => message.type)).toEqual([
+    "daemon.update.progress",
+    "daemon.update.progress",
+    "daemon.update.response",
+  ]);
+  lateProgress?.();
+  expect(frames).toHaveLength(3);
+});
diff --git a/packages/server/src/server/session/daemon/daemon-self-updater.test.ts b/packages/server/src/server/session/daemon/daemon-self-updater.test.ts
index faf9491f50..711fd11d80 100644
--- a/packages/server/src/server/session/daemon/daemon-self-updater.test.ts
+++ b/packages/server/src/server/session/daemon/daemon-self-updater.test.ts
@@ -1,11 +1,18 @@
-import { describe, expect, test } from "vitest";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { describe, expect, onTestFinished, test } from "vitest";
 import {
   DaemonSelfUpdateInProgressError,
   DaemonSelfUpdater,
   type DaemonSelfUpdateRuntime,
   type DaemonSelfUpdatePhase,
 } from "./daemon-self-updater.js";
-import type { CommandResult, NpmGlobalPaseoInstall } from "./npm-global-cli.js";
+import {
+  DefaultNpmGlobalPaseoCli,
+  type CommandResult,
+  type NpmGlobalPaseoInstall,
+} from "./npm-global-cli.js";
 
 interface TestLogger {
   errors: Array<{ obj: object; msg?: string }>;
@@ -100,6 +107,47 @@ async function runUpdate(input: {
 }
 
 describe("DaemonSelfUpdater", () => {
+  test("probes and updates the running install's prefix when npm defaults elsewhere", async () => {
+    const prefix = mkdtempSync(path.join(tmpdir(), "custom npm prefix "));
+    onTestFinished(() => rmSync(prefix, { recursive: true, force: true }));
+    const root = process.platform === "win32" ? prefix : path.join(prefix, "lib");
+    const packagePath = path.join(root, "node_modules", "@getpaseo", "cli");
+    mkdirSync(packagePath, { recursive: true });
+    const commands: string[][] = [];
+    let version = "0.1.15";
+    const npm = new DefaultNpmGlobalPaseoCli(async (_command, args) => {
+      commands.push(args);
+      if (args[args.indexOf("--prefix") + 1] !== prefix) {
+        return { exitCode: 1, stdout: "{}", stderr: "No CLI in npm's default prefix" };
+      }
+      if (args.includes("install")) version = "0.1.96";
+      return {
+        exitCode: 0,
+        stderr: "",
+        stdout: JSON.stringify({
+          path: root,
+          dependencies: { "@getpaseo/cli": { version, path: packagePath } },
+        }),
+      };
+    });
+    const { result } = await runUpdate({
+      runtime: {
+        npm,
+        installOrigin: {
+          resolveCurrentServerPackageRoot: () =>
+            path.join(packagePath, "node_modules", "@getpaseo", "server"),
+        },
+      },
+    });
+    expect(result).toEqual({ success: true, error: null, newVersion: "0.1.96" });
+    expect(commands).toHaveLength(3);
+    expect(commands.map((args) => args.slice(-2))).toEqual([
+      ["--prefix", prefix],
+      ["--prefix", prefix],
+      ["--prefix", prefix],
+    ]);
+  });
+
   test("refuses a Desktop-managed daemon without touching npm", async () => {
     const calls: RuntimeCall[] = [];
     const runtime = createRuntime({ calls, inspections: [] });
diff --git a/packages/server/src/server/session/daemon/daemon-self-updater.ts b/packages/server/src/server/session/daemon/daemon-self-updater.ts
index b7ca60eda3..91b5b166d4 100644
--- a/packages/server/src/server/session/daemon/daemon-self-updater.ts
+++ b/packages/server/src/server/session/daemon/daemon-self-updater.ts
@@ -1,6 +1,7 @@
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
 import {
   daemonInstallOriginRuntime,
+  resolveNpmGlobalPrefix,
   validateDaemonInstallOrigin,
   type DaemonInstallOriginRuntime,
 } from "./install-origin.js";
@@ -63,7 +64,12 @@ export class DaemonSelfUpdater {
     this.inProgress = true;
     try {
       input.onProgress("starting");
-      const install = await this.runtime.npm.inspect();
+      const npmOptions = {
+        prefix: resolveNpmGlobalPrefix(
+          this.runtime.installOrigin.resolveCurrentServerPackageRoot(),
+        ),
+      };
+      const install = await this.runtime.npm.inspect(npmOptions);
       const unsupportedReason = validateDaemonInstallOrigin(
         install,
         input.daemonVersion,
@@ -76,7 +82,7 @@ export class DaemonSelfUpdater {
       input.onProgress("downloading");
       input.onProgress("installing");
 
-      const result = await this.runtime.npm.installLatest();
+      const result = await this.runtime.npm.installLatest(npmOptions);
       if (result.exitCode !== 0) {
         const error =
           result.stderr.trim() || result.stdout.trim() || `npm exited with code ${result.exitCode}`;
@@ -87,7 +93,7 @@ export class DaemonSelfUpdater {
         return { success: false, error, newVersion: null };
       }
 
-      const updatedInstall = await this.runtime.npm.inspect().catch((error: unknown) => {
+      const updatedInstall = await this.runtime.npm.inspect(npmOptions).catch((error: unknown) => {
         input.logger.warn({ err: error }, "Unable to read updated npm package version");
         return null;
       });
diff --git a/packages/server/src/server/session/daemon/daemon-session.ts b/packages/server/src/server/session/daemon/daemon-session.ts
index 8c3aa2f167..95caafc58b 100644
--- a/packages/server/src/server/session/daemon/daemon-session.ts
+++ b/packages/server/src/server/session/daemon/daemon-session.ts
@@ -49,6 +49,7 @@ export interface DaemonSessionOptions {
   listWorkspaces: () => Promise<PersistedWorkspaceRecord[]>;
   listProviderAvailability: () => Promise<ProviderAvailability[]>;
   getWebSocketRuntimeMetrics?: () => DaemonWebSocketRuntimeDiagnosticSnapshot | null;
+  getObservationMetrics?: () => Record<string, number>;
   logger: pino.Logger;
   hubRelationships?: HubRelationshipManagement;
   reloadConfig: () => DaemonConfigReloadResult;
@@ -73,6 +74,7 @@ export class DaemonSession {
   private readonly listWorkspaces: () => Promise<PersistedWorkspaceRecord[]>;
   private readonly listProviderAvailability: () => Promise<ProviderAvailability[]>;
   private readonly getWebSocketRuntimeMetrics: () => DaemonWebSocketRuntimeDiagnosticSnapshot | null;
+  private readonly getObservationMetrics: DaemonSessionOptions["getObservationMetrics"];
   private readonly logger: pino.Logger;
   private readonly selfUpdate: DaemonSelfUpdateSessionController;
   private readonly hubRelationships: HubRelationshipManagement | null;
@@ -90,6 +92,7 @@ export class DaemonSession {
     this.listWorkspaces = options.listWorkspaces;
     this.listProviderAvailability = options.listProviderAvailability;
     this.getWebSocketRuntimeMetrics = options.getWebSocketRuntimeMetrics ?? (() => null);
+    this.getObservationMetrics = options.getObservationMetrics;
     this.logger = options.logger;
     this.hubRelationships = options.hubRelationships ?? null;
     this.reloadConfig = options.reloadConfig;
@@ -283,6 +286,7 @@ export class DaemonSession {
         listWorkspaces: this.listWorkspaces,
         listProviderAvailability: this.listProviderAvailability,
         getWebSocketRuntimeMetrics: this.getWebSocketRuntimeMetrics,
+        getObservationMetrics: this.getObservationMetrics,
         logger: this.logger,
       });
       this.host.emit({
diff --git a/packages/server/src/server/session/daemon/diagnostics.ts b/packages/server/src/server/session/daemon/diagnostics.ts
index 87ea2b2faa..9cff35cb3b 100644
--- a/packages/server/src/server/session/daemon/diagnostics.ts
+++ b/packages/server/src/server/session/daemon/diagnostics.ts
@@ -25,6 +25,7 @@ export interface DaemonDiagnosticsOptions {
   listWorkspaces: () => Promise<PersistedWorkspaceRecord[]>;
   listProviderAvailability: () => Promise<ProviderAvailability[]>;
   getWebSocketRuntimeMetrics: () => DaemonWebSocketRuntimeDiagnosticSnapshot | null;
+  getObservationMetrics?: () => Record<string, number>;
   logger: pino.Logger;
 }
 
@@ -68,6 +69,16 @@ export async function collectDaemonDiagnostics(options: DaemonDiagnosticsOptions
     ]),
   ];
 
+  if (options.getObservationMetrics)
+    sections.push(
+      formatSection(
+        "Session observations",
+        Object.entries(options.getObservationMetrics()).map(([label, value]) => ({
+          label,
+          value: String(value),
+        })),
+      ),
+    );
   sections.push(
     await safeSection("Daemon process", () => collectProcessEntries(options), options.logger),
   );
diff --git a/packages/server/src/server/session/daemon/install-origin.ts b/packages/server/src/server/session/daemon/install-origin.ts
index 3f305ab3ad..cddd905e47 100644
--- a/packages/server/src/server/session/daemon/install-origin.ts
+++ b/packages/server/src/server/session/daemon/install-origin.ts
@@ -15,6 +15,21 @@ export const daemonInstallOriginRuntime: DaemonInstallOriginRuntime = {
   resolveCurrentServerPackageRoot,
 };
 
+export function resolveNpmGlobalPrefix(serverPackageRoot: string | null): string | undefined {
+  if (!serverPackageRoot) return undefined;
+  let directory = serverPackageRoot;
+  let prefix: string | undefined;
+  while (path.dirname(directory) !== directory) {
+    if (path.basename(directory) === "node_modules") {
+      const root = path.dirname(directory);
+      if (process.platform === "win32") prefix = root;
+      else if (path.basename(root) === "lib") prefix = path.dirname(root);
+    }
+    directory = path.dirname(directory);
+  }
+  return prefix;
+}
+
 export function validateDaemonInstallOrigin(
   install: NpmGlobalPaseoInstall,
   daemonVersion: string | null,
diff --git a/packages/server/src/server/session/daemon/npm-global-cli.test.ts b/packages/server/src/server/session/daemon/npm-global-cli.test.ts
index aece7eb09a..ba852e232e 100644
--- a/packages/server/src/server/session/daemon/npm-global-cli.test.ts
+++ b/packages/server/src/server/session/daemon/npm-global-cli.test.ts
@@ -1,5 +1,7 @@
+import { mkdirSync, mkdtempSync, rmSync, symlinkSync } from "node:fs";
+import { tmpdir } from "node:os";
 import path from "node:path";
-import { describe, expect, test } from "vitest";
+import { afterEach, describe, expect, test } from "vitest";
 import { DefaultNpmGlobalPaseoCli } from "./npm-global-cli.js";
 
 interface CommandCall {
@@ -10,25 +12,65 @@ interface CommandCall {
 }
 
 const globalRoot = path.join(path.sep, "global", "lib");
-const globalNodeModules = path.join(globalRoot, "node_modules");
-const cliPackagePath = path.join(globalNodeModules, "@getpaseo", "cli");
 
-function npmGlobalPaseoCliJson(version: string, options?: { linked?: boolean }): string {
-  return JSON.stringify({
-    name: "lib",
-    path: globalRoot,
-    dependencies: {
-      "@getpaseo/cli": {
-        version,
-        path: cliPackagePath,
-        link: options?.linked === true,
-      },
-    },
-  });
+interface GlobalInstall {
+  root: string;
+  packagePath: string;
+  // npm 7+ `ls --json --long` marks neither kind of install with a link flag.
+  npmLsJson: string;
 }
 
 describe("DefaultNpmGlobalPaseoCli", () => {
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    for (const dir of tempDirs.splice(0)) {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  function createGlobalInstall(options: { linked: boolean }): GlobalInstall {
+    const dir = mkdtempSync(path.join(tmpdir(), "paseo-npm-global-"));
+    tempDirs.push(dir);
+    const root = path.join(dir, "prefix", "lib");
+    const packagePath = path.join(root, "node_modules", "@getpaseo", "cli");
+    const checkoutCli = path.join(dir, "checkout", "packages", "cli");
+    if (options.linked) {
+      mkdirSync(checkoutCli, { recursive: true });
+      mkdirSync(path.dirname(packagePath), { recursive: true });
+      symlinkSync(checkoutCli, packagePath, "junction");
+    } else {
+      mkdirSync(packagePath, { recursive: true });
+    }
+    const npmLsJson = JSON.stringify({
+      name: "lib",
+      path: root,
+      dependencies: {
+        "@getpaseo/cli": {
+          version: "0.1.15",
+          resolved: options.linked
+            ? `file:${path.relative(root, checkoutCli)}`
+            : "https://registry.npmjs.org/@getpaseo/cli/-/cli-0.1.15.tgz",
+          path: packagePath,
+        },
+      },
+    });
+    return { root, packagePath, npmLsJson };
+  }
+
+  test("reports a global install linked to a local checkout as linked", async () => {
+    const install = createGlobalInstall({ linked: true });
+    const cli = new DefaultNpmGlobalPaseoCli(async () => ({
+      exitCode: 0,
+      stdout: install.npmLsJson,
+      stderr: "",
+    }));
+
+    await expect(cli.inspect()).resolves.toMatchObject({ isLinked: true });
+  });
+
   test("inspects the npm global cli install with npm -g ls", async () => {
+    const install = createGlobalInstall({ linked: false });
     const calls: CommandCall[] = [];
     const cli = new DefaultNpmGlobalPaseoCli(async (command, args, options) => {
       calls.push({
@@ -37,13 +79,13 @@ describe("DefaultNpmGlobalPaseoCli", () => {
         timeout: options?.timeout,
         maxBuffer: options?.maxBuffer,
       });
-      return { exitCode: 0, stdout: npmGlobalPaseoCliJson("0.1.15"), stderr: "" };
+      return { exitCode: 0, stdout: install.npmLsJson, stderr: "" };
     });
 
     await expect(cli.inspect()).resolves.toEqual({
       version: "0.1.15",
-      packagePath: cliPackagePath,
-      globalRootPath: globalRoot,
+      packagePath: install.packagePath,
+      globalRootPath: install.root,
       isLinked: false,
     });
     expect(calls).toEqual([
diff --git a/packages/server/src/server/session/daemon/npm-global-cli.ts b/packages/server/src/server/session/daemon/npm-global-cli.ts
index d1e0444058..6133dcd9d1 100644
--- a/packages/server/src/server/session/daemon/npm-global-cli.ts
+++ b/packages/server/src/server/session/daemon/npm-global-cli.ts
@@ -1,3 +1,4 @@
+import { lstatSync } from "node:fs";
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
 import { z } from "zod";
 import { execCommand } from "../../../utils/spawn.js";
@@ -19,7 +20,6 @@ const NpmGlobalCliPackageSchema = z
   .object({
     version: z.string(),
     path: z.string(),
-    link: z.boolean().optional(),
   })
   .passthrough();
 
@@ -50,8 +50,12 @@ export interface NpmGlobalPaseoInstall {
 }
 
 export interface NpmGlobalPaseoCli {
-  inspect(): Promise<NpmGlobalPaseoInstall>;
-  installLatest(): Promise<CommandResult>;
+  inspect(options?: NpmGlobalOptions): Promise<NpmGlobalPaseoInstall>;
+  installLatest(options?: NpmGlobalOptions): Promise<CommandResult>;
+}
+
+interface NpmGlobalOptions {
+  prefix?: string;
 }
 
 export type CommandRunner = (
@@ -108,17 +112,20 @@ function parseNpmGlobalPaseoInstall(stdout: string): NpmGlobalPaseoInstall | nul
     version: cliPackage.data.version,
     packagePath: cliPackage.data.path,
     globalRootPath: list.data.path ?? null,
-    isLinked: cliPackage.data.link === true,
+    // npm links an install by making its node_modules entry a symlink (a junction
+    // on Windows), and `npm ls --json` reports no flag for it.
+    isLinked: lstatSync(cliPackage.data.path).isSymbolicLink(),
   };
 }
 
 export class DefaultNpmGlobalPaseoCli implements NpmGlobalPaseoCli {
   constructor(private readonly runCommand: CommandRunner = runExternalCommand) {}
 
-  async inspect(): Promise<NpmGlobalPaseoInstall> {
+  async inspect(options: NpmGlobalOptions = {}): Promise<NpmGlobalPaseoInstall> {
+    const prefixArgs = options.prefix ? ["--prefix", options.prefix] : [];
     const result = await this.runCommand(
       "npm",
-      ["-g", "ls", PASEO_CLI_PACKAGE, "--json", "--depth=0", "--long"],
+      ["-g", "ls", PASEO_CLI_PACKAGE, "--json", "--depth=0", "--long", ...prefixArgs],
       {
         timeout: NPM_PROBE_TIMEOUT_MS,
         maxBuffer: NPM_MAX_BUFFER_BYTES,
@@ -136,8 +143,9 @@ export class DefaultNpmGlobalPaseoCli implements NpmGlobalPaseoCli {
     return install;
   }
 
-  installLatest(): Promise<CommandResult> {
-    return this.runCommand("npm", ["install", "-g", `${PASEO_CLI_PACKAGE}@latest`], {
+  installLatest(options: NpmGlobalOptions = {}): Promise<CommandResult> {
+    const prefixArgs = options.prefix ? ["--prefix", options.prefix] : [];
+    return this.runCommand("npm", ["install", "-g", `${PASEO_CLI_PACKAGE}@latest`, ...prefixArgs], {
       timeout: NPM_INSTALL_TIMEOUT_MS,
       maxBuffer: NPM_MAX_BUFFER_BYTES,
     });
diff --git a/packages/server/src/server/session/files/workspace-files-session.test.ts b/packages/server/src/server/session/files/workspace-files-session.test.ts
index 6d27509fbe..43c517453b 100644
--- a/packages/server/src/server/session/files/workspace-files-session.test.ts
+++ b/packages/server/src/server/session/files/workspace-files-session.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "../owned-subscriptions/index.js";
 import {
   existsSync,
   mkdtempSync,
@@ -555,14 +556,22 @@ describe("WorkspaceFilesSession", () => {
   test("round-trips an upload through transfer frames", async () => {
     const { subsystem, emitted, paseoHome } = makeSubsystem();
 
-    subsystem.handleFileUploadRequest({
+    const source = {};
+    const ownership = new SessionDelivery((_source, message) => {
+      emitted.push(message);
+    });
+    ownership.attach(source, true);
+    const request = {
       type: "file.upload.request",
       fileName: "notes.txt",
       mimeType: "text/plain",
       size: 11,
       modifiedAt: "2026-05-02T00:00:00.000Z",
       requestId: "req-upload",
-    });
+    } as const;
+    await ownership.request(source, request, async () =>
+      subsystem.handleFileUploadRequest(request, ownership),
+    );
     await subsystem.handleFileTransferFrame(
       uploadFrame({
         opcode: FileTransferOpcode.FileBegin,
@@ -575,6 +584,7 @@ describe("WorkspaceFilesSession", () => {
           fileName: "notes.txt",
         },
       }),
+      source,
     );
     await subsystem.handleFileTransferFrame(
       uploadFrame({
@@ -582,9 +592,11 @@ describe("WorkspaceFilesSession", () => {
         requestId: "req-upload",
         payload: new TextEncoder().encode("hello world"),
       }),
+      source,
     );
     await subsystem.handleFileTransferFrame(
       uploadFrame({ opcode: FileTransferOpcode.FileEnd, requestId: "req-upload" }),
+      source,
     );
 
     const message = emitted.find((entry) => entry.type === "file.upload.response");
@@ -593,8 +605,10 @@ describe("WorkspaceFilesSession", () => {
     }
     expect(message.payload.error).toBeNull();
     expect(message.payload.file?.fileName).toBe("notes.txt");
-    expect(readFileSync(join(paseoHome, "uploads", "upload_req-upload", "notes.txt"), "utf8")).toBe(
-      "hello world",
-    );
+    const file = message.payload.file;
+    if (!file) throw new Error("Expected uploaded file");
+    expect(file.path.startsWith(join(paseoHome, "uploads"))).toBe(true);
+    expect(readFileSync(file.path, "utf8")).toBe("hello world");
+    await ownership.close();
   });
 });
diff --git a/packages/server/src/server/session/files/workspace-files-session.ts b/packages/server/src/server/session/files/workspace-files-session.ts
index 0f833479c2..a0bcb6ed2d 100644
--- a/packages/server/src/server/session/files/workspace-files-session.ts
+++ b/packages/server/src/server/session/files/workspace-files-session.ts
@@ -1,4 +1,6 @@
 import type pino from "pino";
+import type { SessionDelivery } from "../owned-subscriptions/index.js";
+import type { FileVersion } from "@getpaseo/protocol/messages";
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
 import {
   encodeFileTransferFrame,
@@ -68,7 +70,6 @@ export class WorkspaceFilesSession {
   private readonly logger: pino.Logger;
   private readonly fileUploads: FileUploadStore;
   private readonly fileObserver: FileObserver;
-  private readonly fileSubscriptions = new Map<string, () => void>();
 
   constructor(options: WorkspaceFilesSessionOptions) {
     this.host = options.host;
@@ -78,32 +79,59 @@ export class WorkspaceFilesSession {
     this.fileObserver = options.fileObserver ?? workspaceFileObserver;
   }
 
-  async handleFileSubscribeRequest(request: FileSubscribeRequest): Promise<void> {
-    this.fileSubscriptions.get(request.subscriptionId)?.();
+  async handleFileSubscribeRequest(
+    request: FileSubscribeRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
+    let bootstrap: ReturnType<FileObserver["subscribe"]> | undefined;
+    const owner = ownership.begin(
+      "files",
+      request.subscriptionId,
+      async () => {
+        await bootstrap?.then(
+          (subscription) => subscription.unsubscribe(),
+          () => undefined,
+        );
+      },
+      `file:${request.subscriptionId}`,
+    );
+    let ready = false;
+    let pending: FileVersion | null = null;
+    const emitVersion = (version: FileVersion) =>
+      owner.emit({
+        type: "fs.file.update",
+        payload: { subscriptionId: owner.responseId, version },
+      });
     try {
-      const subscription = await this.fileObserver.subscribe(
+      bootstrap = this.fileObserver.subscribe(
         { cwd: request.cwd, path: request.path },
         (version) => {
-          this.host.emit({
-            type: "fs.file.update",
-            payload: { subscriptionId: request.subscriptionId, version },
-          });
+          if (owner.signal.aborted) return;
+          if (ready) emitVersion(version);
+          else pending = version;
         },
       );
-      this.fileSubscriptions.set(request.subscriptionId, subscription.unsubscribe);
+      const subscription = await bootstrap;
+      if (owner.signal.aborted) {
+        subscription.unsubscribe();
+        return;
+      }
       this.host.emit({
         type: "fs.file.subscribe.response",
         payload: {
-          subscriptionId: request.subscriptionId,
+          subscriptionId: owner.responseId,
           initial: subscription.initial,
           requestId: request.requestId,
         },
       });
+      ready = true;
+      if (pending) emitVersion(pending);
     } catch (error) {
+      await owner.release();
       this.host.emit({
         type: "fs.file.subscribe.response",
         payload: {
-          subscriptionId: request.subscriptionId,
+          subscriptionId: owner.responseId,
           initial: {
             status: "error",
             cwd: request.cwd,
@@ -116,9 +144,11 @@ export class WorkspaceFilesSession {
     }
   }
 
-  handleFileUnsubscribeRequest(request: FileUnsubscribeRequest): void {
-    this.fileSubscriptions.get(request.subscriptionId)?.();
-    this.fileSubscriptions.delete(request.subscriptionId);
+  async handleFileUnsubscribeRequest(
+    request: FileUnsubscribeRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
+    await ownership.release(request.subscriptionId);
     this.host.emit({
       type: "fs.file.unsubscribe.response",
       payload: { subscriptionId: request.subscriptionId, requestId: request.requestId },
@@ -213,11 +243,6 @@ export class WorkspaceFilesSession {
     });
   }
 
-  dispose(): void {
-    for (const unsubscribe of this.fileSubscriptions.values()) unsubscribe();
-    this.fileSubscriptions.clear();
-  }
-
   async handleFileExplorerRequest(request: FileExplorerRequest, source?: object): Promise<void> {
     const { cwd: workspaceCwd, path: requestedPath = ".", mode, requestId } = request;
     const cwd = workspaceCwd.trim();
@@ -349,15 +374,23 @@ export class WorkspaceFilesSession {
     }
   }
 
-  handleFileUploadRequest(request: FileUploadRequest): void {
-    this.fileUploads.beginUpload(request);
+  handleFileUploadRequest(request: FileUploadRequest, ownership: SessionDelivery): void {
+    let cancel: (() => Promise<void>) | undefined;
+    const operation = ownership.operation(
+      (message) =>
+        message.type === "file.upload.response" && message.payload.requestId === request.requestId,
+      () => cancel?.(),
+    );
+    cancel = this.fileUploads.beginUpload(request, operation.source, (response) => {
+      if (response) operation.emit(response);
+      void operation
+        .release()
+        .catch((error) => this.logger.error({ err: error }, "Upload cleanup failed"));
+    });
   }
 
-  async handleFileTransferFrame(frame: FileTransferFrame): Promise<void> {
-    const response = await this.fileUploads.receiveFrame(frame);
-    if (response) {
-      this.host.emit(response);
-    }
+  async handleFileTransferFrame(frame: FileTransferFrame, source: object): Promise<void> {
+    await this.fileUploads.receiveFrame(frame, source);
   }
 
   async handleProjectIconRequest(
diff --git a/packages/server/src/server/session/git-mutation/git-mutation-service.test.ts b/packages/server/src/server/session/git-mutation/git-mutation-service.test.ts
index 1910722765..0a16cd2c8d 100644
--- a/packages/server/src/server/session/git-mutation/git-mutation-service.test.ts
+++ b/packages/server/src/server/session/git-mutation/git-mutation-service.test.ts
@@ -85,6 +85,43 @@ function headBranch(dir: string): string {
   return execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd: dir }).toString().trim();
 }
 
+// A clone whose local branch tracks origin/main. Upstream inheritance only shows up
+// against a real remote, so these fixtures cross the git boundary like the happy paths above.
+function initClonedRepo(): string {
+  const root = realpathSync(mkdtempSync(join(tmpdir(), "git-mutation-clone-")));
+  tempRepos.push(root);
+  const remote = join(root, "remote.git");
+  const seed = join(root, "seed");
+  const work = join(root, "work");
+  function run(cwd: string, ...args: string[]): void {
+    execFileSync("git", args, { cwd, stdio: "pipe" });
+  }
+  execFileSync("git", ["init", "--bare", "-b", "main", remote], { cwd: root, stdio: "pipe" });
+  execFileSync("git", ["clone", "--quiet", remote, seed], { cwd: root, stdio: "pipe" });
+  run(seed, "config", "user.email", "test@example.com");
+  run(seed, "config", "user.name", "Paseo Test");
+  writeFileSync(join(seed, "README.md"), "hello\n");
+  run(seed, "add", "-A");
+  run(seed, "commit", "-m", "init");
+  run(seed, "push", "--quiet", "-u", "origin", "main");
+  execFileSync("git", ["clone", "--quiet", remote, work], { cwd: root, stdio: "pipe" });
+  run(work, "config", "user.email", "test@example.com");
+  run(work, "config", "user.name", "Paseo Test");
+  return work;
+}
+
+// Always exits 0 and prints an empty line when the branch has no upstream, so a git or
+// process failure surfaces as a throw instead of being read as "no upstream".
+function upstreamOf(dir: string, branch: string): string {
+  return execFileSync(
+    "git",
+    ["for-each-ref", "--format=%(upstream:short)", `refs/heads/${branch}`],
+    { cwd: dir, stdio: ["pipe", "pipe", "pipe"] },
+  )
+    .toString()
+    .trim();
+}
+
 afterEach(() => {
   while (tempRepos.length > 0) {
     const dir = tempRepos.pop();
@@ -189,6 +226,40 @@ describe("createBranchFromBase", () => {
     expect(invalidateCalls).toEqual([]);
     expect(snapshotCalls).toContainEqual({ cwd: dir, force: true, reason: "create-branch" });
   });
+
+  // https://github.com/getpaseo/paseo/issues/5213 — a branch that tracks origin/main sends the
+  // next push to main: `git push` under push.default=tracking and Paseo's own push both read
+  // branch.<name>.merge. A branch Paseo creates must carry no upstream, exactly as the worktree
+  // path already guarantees with `git worktree add -b <branch> --no-track <base>`.
+  test("leaves no upstream when the base is a remote-tracking ref (real repo)", async () => {
+    const dir = initClonedRepo();
+    const { service } = buildService({
+      resolution: { kind: "remote-only", name: "main", remoteRef: "origin/main" },
+    });
+    await service.createBranchFromBase({
+      cwd: dir,
+      baseBranch: "origin/main",
+      newBranchName: "feature-from-remote",
+    });
+    expect(headBranch(dir)).toBe("feature-from-remote");
+    expect(upstreamOf(dir, "feature-from-remote")).toBe("");
+  });
+
+  test("leaves no upstream when git is configured to inherit tracking (real repo)", async () => {
+    const dir = initClonedRepo();
+    execFileSync("git", ["config", "branch.autoSetupMerge", "inherit"], {
+      cwd: dir,
+      stdio: "pipe",
+    });
+    const { service } = buildService({ resolution: { kind: "local", name: "main" } });
+    await service.createBranchFromBase({
+      cwd: dir,
+      baseBranch: "main",
+      newBranchName: "feature-inherited",
+    });
+    expect(headBranch(dir)).toBe("feature-inherited");
+    expect(upstreamOf(dir, "feature-inherited")).toBe("");
+  });
 });
 
 describe("notifyGitMutation", () => {
diff --git a/packages/server/src/server/session/git-mutation/git-mutation-service.ts b/packages/server/src/server/session/git-mutation/git-mutation-service.ts
index 7611ba89bc..42c19668b5 100644
--- a/packages/server/src/server/session/git-mutation/git-mutation-service.ts
+++ b/packages/server/src/server/session/git-mutation/git-mutation-service.ts
@@ -118,7 +118,12 @@ export function createGitMutationService(deps: {
       }
 
       await ensureCleanWorkingTree(cwd);
-      await runGitCommand(["checkout", "-b", newBranchName, baseBranch], {
+      // --no-track: a branch we create is not a continuation of its base, so it gets no
+      // upstream. Without it git hands the new branch `origin/<base>` whenever the base is a
+      // remote-tracking ref or branch.autoSetupMerge asks for inheritance, and every later
+      // push then reads that upstream and lands the work on the default branch. The worktree
+      // path makes the same promise with `git worktree add -b <branch> --no-track <base>`.
+      await runGitCommand(["checkout", "-b", newBranchName, "--no-track", baseBranch], {
         cwd,
         timeout: 120_000,
       });
diff --git a/packages/server/src/server/session/owned-subscriptions/index.test.ts b/packages/server/src/server/session/owned-subscriptions/index.test.ts
new file mode 100644
index 0000000000..8e8e33a4ce
--- /dev/null
+++ b/packages/server/src/server/session/owned-subscriptions/index.test.ts
@@ -0,0 +1,171 @@
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { SessionDelivery } from "./index.js";
+
+function retainedPromiseBytes(cycles: number): number {
+  const fixture = fileURLToPath(new URL("./test-utils/memory-repro.ts", import.meta.url));
+  const output = execFileSync(
+    process.execPath,
+    ["--expose-gc", "--import", "tsx", fixture, String(cycles)],
+    {
+      encoding: "utf8",
+    },
+  );
+  return Number(output);
+}
+
+test("closed deliveries do not increase memory used by unrelated promises", () => {
+  const control = retainedPromiseBytes(0);
+  const afterChurn = retainedPromiseBytes(40);
+  expect(control).toBeGreaterThan(0);
+  expect(afterChurn).toBeLessThan(control * 4);
+});
+
+test("concurrent requests keep their source through asynchronous work", async () => {
+  const delivery = new SessionDelivery(() => {});
+  const sources = [{}, {}];
+  for (const source of sources) delivery.attach(source, true);
+
+  const requests: Promise<void>[] = [];
+  for (const [index, source] of sources.entries()) {
+    requests.push(
+      delivery.request(source, { type: "ping", requestId: String(index) }, async () => {
+        await Promise.resolve();
+        expect(delivery.currentSource).toBe(source);
+        expect(delivery.forSource(sources[1 - index], () => delivery.currentSource)).toBe(
+          sources[1 - index],
+        );
+        expect(delivery.currentSource).toBe(source);
+      }),
+    );
+  }
+  await Promise.all(requests);
+  await delivery.close();
+});
+
+test("an asynchronous projection keeps its source after close without delaying cleanup", async () => {
+  const delivery = new SessionDelivery(() => {});
+  const other = new SessionDelivery(() => {});
+  const source = {};
+  const otherSource = {};
+  delivery.attach(source, true);
+  other.attach(otherSource, true);
+  let resume!: () => void;
+  const paused = new Promise<void>((resolve) => {
+    resume = resolve;
+  });
+  const projection = delivery.forSource(source, async () => {
+    await paused;
+    expect(delivery.currentSource).toBe(source);
+    expect(other.currentSource).toBeUndefined();
+  });
+
+  await delivery.close();
+  await other.request(otherSource, { type: "ping", requestId: "other" }, async () => {
+    await Promise.resolve();
+    expect(other.currentSource).toBe(otherSource);
+    expect(delivery.currentSource).toBeUndefined();
+  });
+  resume();
+  await projection;
+  await other.close();
+});
+
+test("close finishes with a paused request and late work sees cancellation without leaking a reply", async () => {
+  const sent: string[] = [];
+  const delivery = new SessionDelivery((_source, message) => sent.push(message.type));
+  const other = new SessionDelivery((_source, message) => sent.push(`other:${message.type}`));
+  const source = {};
+  const otherSource = {};
+  delivery.attach(source, true);
+  other.attach(otherSource, true);
+  let resume!: () => void;
+  const paused = new Promise<void>((resolve) => {
+    resume = resolve;
+  });
+  let stopped = false;
+  const request = delivery.request(source, { type: "ping", requestId: "pending" }, async () => {
+    delivery.begin("test", undefined, () => {
+      stopped = true;
+    });
+    await paused;
+    expect(delivery.currentSource).toBe(source);
+    expect(delivery.requestSignal.aborted).toBe(true);
+    expect(other.currentSource).toBeUndefined();
+    expect(
+      delivery.reply({
+        type: "pong",
+        payload: { requestId: "pending", clientSentAt: 1, serverReceivedAt: 1, serverSentAt: 1 },
+      }),
+    ).toBe(true);
+  });
+  const closing = delivery.close();
+  let closed = false;
+  void closing.then(() => {
+    closed = true;
+    return undefined;
+  });
+  const outcome = await Promise.race([
+    closing.then(() => "closed"),
+    new Promise<string>((resolve) => setImmediate(() => resolve("blocked"))),
+  ]);
+  resume();
+  await request;
+  await closing;
+  expect(outcome).toBe("closed");
+  expect(closed).toBe(true);
+  expect(stopped).toBe(true);
+  expect(delivery.registrationCount).toBe(0);
+  await other.request(otherSource, { type: "ping", requestId: "other" }, async () => {
+    await Promise.resolve();
+    expect(other.currentSource).toBe(otherSource);
+    expect(delivery.currentSource).toBeUndefined();
+    expect(
+      other.reply({
+        type: "pong",
+        payload: { requestId: "other", clientSentAt: 1, serverReceivedAt: 1, serverSentAt: 1 },
+      }),
+    ).toBe(true);
+  });
+  expect(sent).toEqual(["other:pong"]);
+  await other.close();
+});
+
+test("a failed in-flight request does not fail delivery teardown", async () => {
+  const delivery = new SessionDelivery(() => {});
+  const source = {};
+  delivery.attach(source, true);
+  let resume!: () => void;
+  const paused = new Promise<void>((resolve) => {
+    resume = resolve;
+  });
+  const request = delivery.request(source, { type: "ping", requestId: "failed" }, async () => {
+    await paused;
+    throw new Error("request canceled");
+  });
+
+  const closing = delivery.close();
+  resume();
+  await expect(request).rejects.toThrow("request canceled");
+  await expect(closing).resolves.toBeUndefined();
+});
+
+test("failed teardown still closes the delivery and rejects late work", async () => {
+  const delivery = new SessionDelivery(() => {});
+  const source = {};
+  delivery.attach(source, true);
+  await delivery.request(source, { type: "ping", requestId: "subscribe" }, async () => {
+    delivery.begin("test", undefined, () => {
+      throw new Error("teardown failed");
+    });
+  });
+
+  await expect(delivery.close()).rejects.toThrow("teardown failed");
+  await expect(delivery.close()).rejects.toThrow("teardown failed");
+  expect(() => delivery.attach({}, true)).toThrow("Session delivery is closed");
+  expect(() => delivery.forSource(source, () => {})).toThrow("Session delivery is closed");
+  await expect(
+    delivery.request(source, { type: "ping", requestId: "late" }, async () => {}),
+  ).rejects.toThrow("Session delivery is closed");
+});
diff --git a/packages/server/src/server/session/owned-subscriptions/index.ts b/packages/server/src/server/session/owned-subscriptions/index.ts
new file mode 100644
index 0000000000..6ee5c91fa5
--- /dev/null
+++ b/packages/server/src/server/session/owned-subscriptions/index.ts
@@ -0,0 +1,468 @@
+import { isReply } from "./replies.js";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { randomUUID } from "node:crypto";
+import type { SessionInboundMessage, SessionOutboundMessage } from "../../messages.js";
+
+interface Source {
+  socket: object;
+  modern: boolean;
+  active: boolean;
+  handshakePending: boolean;
+  cancellation: AbortController;
+  subscriptions: Map<string, SubscriptionOwner>;
+  operations: Set<RetainedOwner>;
+}
+interface DeliveryOwner {
+  source: Source;
+  active: boolean;
+}
+interface RequestOwner extends DeliveryOwner {
+  scope: object;
+  request: SessionInboundMessage;
+}
+interface ProjectionOwner {
+  scope: object;
+  source: object;
+}
+interface RetainedOwner extends DeliveryOwner {
+  cancellation: AbortController;
+  stop(): void | Promise<void>;
+  forget(): void;
+  release?: Promise<void>;
+}
+interface SubscriptionOwner extends RetainedOwner {
+  id: string;
+  family: string;
+  legacySlot: string;
+  responseId: string;
+}
+
+export interface OwnedOperation {
+  readonly source: object;
+  readonly signal: AbortSignal;
+  emit(message: SessionOutboundMessage): void;
+  release(): Promise<void>;
+}
+
+export interface OwnedSubscription {
+  readonly id: string;
+  readonly responseId: string;
+  readonly source: object;
+  readonly signal: AbortSignal;
+  emit(message: SessionOutboundMessage): void;
+  emitBinary(frame: Uint8Array): void;
+  release(): Promise<void>;
+}
+
+// One registration per context kind; per-session registrations outlive closed sessions in Node.
+const requests = new AsyncLocalStorage<RequestOwner>();
+const projectionSource = new AsyncLocalStorage<ProjectionOwner>();
+
+/** Source provenance and lifetimes. Domain producers own snapshots, filters and buffering. */
+export class SessionDelivery {
+  private readonly sources = new Map<object, Source>();
+  private readonly proofs = new WeakMap<object, DeliveryOwner>();
+  private readonly defaultSource = {};
+  private readonly scope = {};
+  private closing?: Promise<void>;
+
+  constructor(
+    private readonly send: (source: object, message: SessionOutboundMessage) => void,
+    private readonly sendBinary: (source: object, frame: Uint8Array) => void = () => {},
+    private readonly project: (
+      source: object,
+      message: SessionOutboundMessage,
+    ) => SessionOutboundMessage = (_source, message) => message,
+    private readonly unexpectedReply: (
+      request: SessionInboundMessage,
+      message: SessionOutboundMessage,
+    ) => void = () => {},
+  ) {}
+
+  attach(socket: object, modern: boolean): void {
+    if (this.closing) throw new Error("Session delivery is closed");
+    const existing = this.sources.get(socket);
+    if (existing) {
+      if (existing.modern !== modern)
+        throw new Error("Cannot renegotiate subscription ownership on an active source");
+      return;
+    }
+    this.sources.set(socket, {
+      socket,
+      modern,
+      active: true,
+      handshakePending: true,
+      cancellation: new AbortController(),
+      subscriptions: new Map(),
+      operations: new Set(),
+    });
+  }
+
+  get currentSource(): object | undefined {
+    const projection = projectionSource.getStore();
+    if (projection?.scope === this.scope) return projection.source;
+    return this.currentRequest?.source.socket;
+  }
+
+  private get currentRequest(): RequestOwner | undefined {
+    const owner = requests.getStore();
+    return owner?.scope === this.scope ? owner : undefined;
+  }
+
+  get requestSignal(): AbortSignal {
+    const request = this.currentRequest;
+    if (!request) throw new Error("Operation has no requesting source");
+    return request.source.cancellation.signal;
+  }
+
+  forSource<T>(source: object, project: () => T): T {
+    if (this.closing) throw new Error("Session delivery is closed");
+    return projectionSource.run({ scope: this.scope, source }, project);
+  }
+
+  hasLegacySources(): boolean {
+    return [...this.sources.values()].some((source) => source.active && !source.modern);
+  }
+
+  hasDemand(family: string): boolean {
+    return [...this.sources.values()].some(
+      (source) =>
+        source.active &&
+        [...source.subscriptions.values()].some((owner) => owner.active && owner.family === family),
+    );
+  }
+
+  subscriptionIds(source: object, family: string): string[] {
+    return [...(this.sources.get(source)?.subscriptions.values() ?? [])]
+      .filter((owner) => owner.active && owner.family === family)
+      .map((owner) => owner.id);
+  }
+
+  get registrationCount(): number {
+    return [...this.sources.values()].reduce(
+      (count, source) => count + source.subscriptions.size + source.operations.size,
+      0,
+    );
+  }
+
+  sourceRegistrationCount(socket = this.currentSource): number {
+    const source = socket ? this.sources.get(socket) : undefined;
+    return source ? source.subscriptions.size + source.operations.size : 0;
+  }
+
+  async releaseFamily(family: string): Promise<void> {
+    await Promise.all(
+      [...this.sources.values()].flatMap((source) =>
+        [...source.subscriptions.values()]
+          .filter((owner) => owner.family === family)
+          .map((owner) => this.releaseOwner(owner)),
+      ),
+    );
+  }
+
+  isModern(socket: object | undefined): boolean {
+    return socket ? this.sources.get(socket)?.modern === true : false;
+  }
+
+  async detach(socket: object): Promise<void> {
+    const source = this.sources.get(socket);
+    if (!source) return;
+    source.active = false;
+    source.cancellation.abort();
+    await Promise.all(
+      [...source.subscriptions.values(), ...source.operations].map((owner) =>
+        this.releaseOwner(owner),
+      ),
+    );
+    this.sources.delete(socket);
+  }
+
+  close(): Promise<void> {
+    this.closing ??= Promise.resolve().then(() => this.dispose());
+    return this.closing;
+  }
+
+  private async dispose(): Promise<void> {
+    const releases = [...this.sources.keys()].map((socket) => this.detach(socket));
+    const releaseResults = await Promise.allSettled(releases);
+    for (const result of releaseResults) {
+      if (result.status === "rejected") throw result.reason;
+    }
+  }
+
+  async request(
+    socket: object | undefined,
+    request: SessionInboundMessage,
+    run: () => Promise<void>,
+  ): Promise<void> {
+    if (this.closing) throw new Error("Session delivery is closed");
+    socket ??= this.defaultSource;
+    if (!this.sources.has(socket)) this.attach(socket, false);
+    const source = this.sources.get(socket)!;
+    const owner: RequestOwner = { scope: this.scope, source, request, active: true };
+    try {
+      await requests.run(owner, run);
+    } finally {
+      owner.active = false;
+    }
+  }
+
+  protocolFailure(
+    socket: object,
+    failure: {
+      requestId?: string;
+      requestType?: string;
+      error: string;
+      code: "invalid_message" | "unknown_schema";
+    },
+  ): void {
+    const source = this.sources.get(socket);
+    if (!source?.active) return;
+    const message: SessionOutboundMessage =
+      failure.requestId !== undefined
+        ? { type: "rpc_error", payload: { ...failure, requestId: failure.requestId } }
+        : { type: "status", payload: { status: "error", message: failure.error } };
+    const owner: DeliveryOwner = { source, active: true };
+    try {
+      this.sendOwned(owner, message);
+    } finally {
+      owner.active = false;
+    }
+  }
+
+  authorizeReply(message: SessionOutboundMessage, socket: object): SessionOutboundMessage {
+    message = this.project(socket, message);
+    const owner = this.currentRequest;
+    if (
+      owner?.active &&
+      owner.source.active &&
+      owner.source.socket === socket &&
+      isReply(owner.request, message)
+    )
+      this.proofs.set(message, owner);
+    return message;
+  }
+
+  reply(message: SessionOutboundMessage): boolean {
+    const owner = this.currentRequest;
+    if (!owner) return false;
+    if (!isReply(owner.request, message)) {
+      if (
+        "requestId" in owner.request &&
+        "payload" in message &&
+        "requestId" in message.payload &&
+        message.payload.requestId === owner.request.requestId
+      ) {
+        this.unexpectedReply(owner.request, message);
+      }
+      return false;
+    }
+    if (owner.active && owner.source.active) {
+      const reply = owner.source.modern ? message : legacyMessage(message);
+      this.sendOwned(owner, reply);
+    }
+    return true;
+  }
+
+  begin(
+    family: string,
+    requestedId: string | undefined,
+    stop: (id: string) => void | Promise<void>,
+    legacySlot = family,
+  ): OwnedSubscription {
+    const request = this.currentRequest;
+    if (!request?.active || !request.source.active)
+      throw new Error("Subscription source is closed");
+    const source = request.source;
+    if (source.modern && (!("requestId" in request.request) || !request.request.requestId))
+      throw new Error("Owned subscriptions require a requestId");
+    if (source.modern && requestedId !== undefined)
+      throw new Error("Subscription IDs are assigned by the host");
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09 once client floor >= v0.8.0.
+    if (!source.modern) {
+      for (const prior of source.subscriptions.values()) {
+        // Keep failed teardown registered so disconnect/close can report it.
+        if (prior.legacySlot === legacySlot) void this.releaseOwner(prior).catch(() => {});
+      }
+    }
+    const id = randomUUID();
+    const responseId = source.modern ? id : requestedId?.trim() || id;
+    const owner: SubscriptionOwner = {
+      id,
+      responseId,
+      source,
+      family,
+      legacySlot,
+      active: true,
+      cancellation: new AbortController(),
+      stop: () => stop(id),
+      forget: () => {
+        source.subscriptions.delete(id);
+      },
+    };
+    source.subscriptions.set(id, owner);
+    return {
+      id,
+      responseId,
+      source: source.socket,
+      signal: owner.cancellation.signal,
+      emit: (message) => {
+        if (!owner.active || !source.active) return;
+        const tagged =
+          source.modern ||
+          message.type === "fs.file.update" ||
+          message.type === "checkout_diff_update"
+            ? withSubscriptionId(message, responseId)
+            : legacyMessage(message);
+        this.sendOwned(owner, tagged);
+      },
+      emitBinary: (frame) => {
+        if (!owner.active || !source.active) return;
+        this.proofs.set(frame, owner);
+        this.sendBinary(source.socket, frame);
+      },
+      release: () => this.releaseOwner(owner),
+    };
+  }
+
+  /** A domain extends the originating request until its asynchronous operation ends. */
+  operation(
+    accepts: (message: SessionOutboundMessage) => boolean,
+    stop: () => void | Promise<void>,
+  ): OwnedOperation {
+    const request = this.currentRequest;
+    if (!request?.active || !request.source.active) throw new Error("Operation source is closed");
+    const source = request.source;
+    const owner: RetainedOwner = {
+      source,
+      active: true,
+      cancellation: new AbortController(),
+      stop,
+      forget: () => {
+        source.operations.delete(owner);
+      },
+    };
+    source.operations.add(owner);
+    return {
+      source: source.socket,
+      signal: owner.cancellation.signal,
+      emit: (message) => {
+        if (!owner.active || !source.active || !accepts(message)) return;
+        this.sendOwned(owner, message);
+      },
+      release: () => this.releaseOwner(owner),
+    };
+  }
+
+  async release(id: string): Promise<void> {
+    const source = this.currentRequest?.source;
+    const owner =
+      source?.subscriptions.get(id) ??
+      (source && !source.modern
+        ? [...source.subscriptions.values()].find((candidate) => candidate.responseId === id)
+        : undefined);
+    if (owner) await this.releaseOwner(owner);
+  }
+
+  async releaseLegacySlot(slot: string): Promise<void> {
+    const source = this.currentRequest?.source;
+    if (!source) return;
+    if (source.modern)
+      throw new Error("Release subscriptions using the server-assigned subscription ID");
+    const owner = [...source.subscriptions.values()].find(
+      (candidate) => candidate.legacySlot === slot,
+    );
+    if (owner) await this.releaseOwner(owner);
+  }
+
+  authorizeFileReply(frame: Uint8Array, socket: object): void {
+    const owner = this.currentRequest;
+    if (
+      owner?.active &&
+      owner.source.socket === socket &&
+      owner.request.type === "file_explorer_request"
+    )
+      this.proofs.set(frame, owner);
+  }
+
+  permitsBinary(socket: object, frame: Uint8Array): boolean {
+    const source = this.sources.get(socket);
+    if (!source?.active) return false;
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09 once client floor >= v0.8.0.
+    if (!source.modern) return true;
+    const owner = this.proofs.get(frame);
+    return owner?.active === true && owner.source === source;
+  }
+
+  permits(socket: object, message: SessionOutboundMessage): boolean {
+    const source = this.sources.get(socket);
+    if (!source?.active) return false;
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09 once client floor >= v0.8.0.
+    if (!source.modern) return true;
+    if (
+      message.type === "status" &&
+      message.payload.status === "server_info" &&
+      source.handshakePending
+    ) {
+      source.handshakePending = false;
+      return true;
+    }
+    const owner = this.proofs.get(message);
+    return owner?.active === true && owner.source === source;
+  }
+
+  private sendOwned(owner: DeliveryOwner, message: SessionOutboundMessage): void {
+    const projected = this.project(owner.source.socket, message);
+    this.proofs.set(projected, owner);
+    this.send(owner.source.socket, projected);
+  }
+
+  private releaseOwner(owner: RetainedOwner): Promise<void> {
+    if (owner.release) return owner.release;
+    owner.active = false;
+    let resolve!: () => void;
+    let reject!: (error: unknown) => void;
+    owner.release = new Promise<void>((accept, fail) => {
+      resolve = accept;
+      reject = fail;
+    });
+    owner.cancellation.abort();
+    try {
+      void Promise.resolve(owner.stop()).then(() => {
+        owner.forget();
+        resolve();
+        return undefined;
+      }, reject);
+    } catch (error) {
+      reject(error);
+    }
+    return owner.release;
+  }
+}
+
+function withSubscriptionId<T extends SessionOutboundMessage>(
+  message: T,
+  subscriptionId: string,
+): T {
+  return "payload" in message
+    ? { ...message, payload: { ...message.payload, subscriptionId } }
+    : { ...message, subscriptionId };
+}
+
+// COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09 once client floor >= v0.8.0.
+function legacyMessage(message: SessionOutboundMessage): SessionOutboundMessage {
+  if (message.type === "terminals_changed") {
+    const { workspaceId: _workspaceId, ...payload } = message.payload;
+    return { ...message, payload };
+  }
+  if (
+    message.type !== "subscribe_terminal_response" &&
+    message.type !== "session.events.set_subscription.response" &&
+    message.type !== "agent.timeline.set_subscription.response" &&
+    message.type !== "workspace.label.list.response"
+  )
+    return message;
+  if (!("subscriptionId" in message.payload)) return message;
+  const { subscriptionId: _subscriptionId, ...payload } = message.payload;
+  return { ...message, payload } as SessionOutboundMessage;
+}
diff --git a/packages/server/src/server/session/owned-subscriptions/replies.ts b/packages/server/src/server/session/owned-subscriptions/replies.ts
new file mode 100644
index 0000000000..cf8a44b3cc
--- /dev/null
+++ b/packages/server/src/server/session/owned-subscriptions/replies.ts
@@ -0,0 +1,70 @@
+import type {
+  KnownStatusPayload,
+  SessionInboundMessage,
+  SessionOutboundMessage,
+} from "../../messages.js";
+
+type Request = Extract<SessionInboundMessage, { requestId?: string }>;
+type ConventionalReply<T extends string> = T extends `${infer P}.request`
+  ? `${P}.response`
+  : T extends `${infer P}_request`
+    ? `${P}_response`
+    : T extends `${string}/${string}`
+      ? `${T}/response`
+      : `${T}_response`;
+type CorrelatedType<M> = M extends { type: infer T; payload: infer P }
+  ? "requestId" extends keyof P
+    ? T
+    : never
+  : never;
+type StatusReply = Extract<KnownStatusPayload, { requestId: string }>["status"];
+type ExceptionalReply = Exclude<
+  CorrelatedType<Exclude<SessionOutboundMessage, { type: "status" }>>,
+  ConventionalReply<Request["type"]> | "rpc_error"
+>;
+
+// Naming is a protocol convention, not proof. Every nonconforming correlated output
+// must declare its originating request; additions to the wire union fail typecheck here.
+const exceptions = {
+  pong: ["ping"],
+  agent_archived: ["archive_agent_request"],
+  agent_deleted: ["delete_agent_request"],
+  agent_permission_resolved: ["agent_permission_response"],
+  terminals_changed: ["subscribe_terminals_request"],
+  "usage.list_reports.update": ["usage.list_reports.request"],
+  "daemon.update.progress": ["daemon.update.request"],
+  // Transcription belongs to the explicitly retained voice operation, not a request ID.
+  transcription_result: [],
+  // This legacy requestId is a producer marker; checkout updates require event demand.
+  checkout_status_update: [],
+} satisfies Record<ExceptionalReply, readonly Request["type"][]>;
+const statuses = {
+  agent_created: ["create_agent_request"],
+  agent_create_failed: ["create_agent_request", "import_agent_request"],
+  agent_resumed: ["resume_agent_request", "import_agent_request"],
+  agent_refreshed: ["refresh_agent_request"],
+  restart_requested: ["restart_server_request"],
+  shutdown_requested: ["shutdown_server_request"],
+} satisfies Record<StatusReply, readonly Request["type"][]>;
+
+export function isReply(request: SessionInboundMessage, message: SessionOutboundMessage): boolean {
+  if (
+    !("requestId" in request) ||
+    !("payload" in message) ||
+    !("requestId" in message.payload) ||
+    message.payload.requestId !== request.requestId
+  )
+    return false;
+  if (message.type === "rpc_error") return message.payload.requestType === request.type;
+  const declared: Readonly<Record<string, readonly string[]>> =
+    message.type === "status" ? statuses : exceptions;
+  const key = message.type === "status" ? message.payload.status : message.type;
+  if (key in declared) return declared[key].includes(request.type);
+  if (message.type === "status") return false;
+  if (request.type.endsWith(".request"))
+    return message.type === request.type.replace(/\.request$/, ".response");
+  if (request.type.endsWith("_request"))
+    return message.type === request.type.replace(/_request$/, "_response");
+  if (request.type.includes("/")) return message.type === `${request.type}/response`;
+  return message.type === `${request.type}_response`;
+}
diff --git a/packages/server/src/server/session/owned-subscriptions/test-utils/memory-repro.ts b/packages/server/src/server/session/owned-subscriptions/test-utils/memory-repro.ts
new file mode 100644
index 0000000000..7bf86b4642
--- /dev/null
+++ b/packages/server/src/server/session/owned-subscriptions/test-utils/memory-repro.ts
@@ -0,0 +1,21 @@
+import { SessionDelivery } from "../index.js";
+
+const cycles = Number(process.argv[2]);
+const count = 4096;
+for (let index = 0; index <= cycles; index++) {
+  const delivery = new SessionDelivery(() => {});
+  const source = {};
+  delivery.attach(source, true);
+  delivery.forSource(source, () => {});
+  await delivery.request(source, { type: "ping", requestId: String(index) }, async () => {});
+  await delivery.close();
+}
+
+if (!global.gc) throw new Error("Run with --expose-gc");
+global.gc();
+const before = process.memoryUsage().heapUsed;
+const held = Array.from({ length: count }, () => new Promise<void>(() => {}));
+global.gc();
+const retainedBytes = process.memoryUsage().heapUsed - before;
+process.stdout.write(String(retainedBytes));
+if (held.length !== count) throw new Error("Promise allocation failed");
diff --git a/packages/server/src/server/session/provider/provider-catalog-session.test.ts b/packages/server/src/server/session/provider/provider-catalog-session.test.ts
index 63000ca0d0..c1cec0b42a 100644
--- a/packages/server/src/server/session/provider/provider-catalog-session.test.ts
+++ b/packages/server/src/server/session/provider/provider-catalog-session.test.ts
@@ -5,24 +5,24 @@ import {
   type ProviderCatalogSessionHost,
 } from "./provider-catalog-session.js";
 import { createStub } from "../../test-utils/class-mocks.js";
-import { findByType } from "../../test-utils/session-stubs.js";
+import { createProviderSnapshot, findByType } from "../../test-utils/session-stubs.js";
 import type { SessionOutboundMessage } from "../../messages.js";
 import {
   GLOBAL_PROVIDER_SNAPSHOT_KEY,
   type ProviderSnapshotManager,
+  type ProviderSnapshot,
+  type ProviderSnapshotTransition,
 } from "../../agent/provider-snapshot-manager.js";
 import type { ProviderSnapshotEntry } from "../../agent/agent-sdk-types.js";
-import type { ProviderUsageService } from "../../../services/quota-fetcher/service.js";
 import { expandProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
 
-type SnapshotChangeHandler = (entries: ProviderSnapshotEntry[], cwd: string) => void;
+type SnapshotChangeHandler = (transition: ProviderSnapshotTransition) => void;
 
 interface MakeOptions {
   visibleProviders?: Set<string>;
   supportsCustomModeIcons?: boolean;
   supportsCompactProviderSnapshots?: boolean;
-  snapshot?: { [K in keyof ProviderSnapshotManager]?: unknown };
-  usage?: { [K in keyof ProviderUsageService]?: unknown };
+  snapshot?: Partial<ProviderSnapshotManager>;
   host?: Partial<ProviderCatalogSessionHost>;
 }
 
@@ -51,6 +51,11 @@ function makeSubsystem(options: MakeOptions = {}) {
     emit: (msg) => emitted.push(msg),
     isProviderVisibleToClient: (provider) => visible.has(provider),
     supportsCustomModeIcons: () => options.supportsCustomModeIcons ?? false,
+    supportsProviderSnapshotReferences: () => false,
+    publishSnapshot: (project) => {
+      const message = project();
+      if (message) emitted.push(message);
+    },
     supportsCompactProviderSnapshots: () => options.supportsCompactProviderSnapshots ?? false,
     listProviderAvailability: async () => [],
     listDraftFeatures: async () => [],
@@ -66,15 +71,14 @@ function makeSubsystem(options: MakeOptions = {}) {
   const subsystem = new ProviderCatalogSession({
     host,
     providerSnapshotManager,
-    providerUsageService: createStub<ProviderUsageService>(options.usage ?? {}),
     logger: pino({ level: "silent" }),
   });
   function pushSnapshotChange(
-    entries: ProviderSnapshotEntry[],
-    cwd = GLOBAL_PROVIDER_SNAPSHOT_KEY,
+    current: ProviderSnapshot,
+    previous = createProviderSnapshot([], current.cwd),
   ): void {
     if (!changeHandler) throw new Error("start() must run before a snapshot change");
-    changeHandler(entries, cwd);
+    changeHandler({ previous, current });
   }
   return { subsystem, emitted, pushSnapshotChange };
 }
@@ -87,7 +91,7 @@ describe("ProviderCatalogSession", () => {
     });
 
     subsystem.start();
-    pushSnapshotChange(makeEntries());
+    pushSnapshotChange(createProviderSnapshot(makeEntries()));
 
     const push = findByType(emitted, "providers_snapshot_update");
     expect(push?.payload.entries.map((entry) => entry.provider)).toEqual(["codex"]);
@@ -101,11 +105,11 @@ describe("ProviderCatalogSession", () => {
     const { subsystem, emitted, pushSnapshotChange } = makeSubsystem({
       visibleProviders: new Set(["codex"]),
       supportsCustomModeIcons: false,
-      snapshot: { getSnapshot: () => makeEntries() },
+      snapshot: { getSnapshot: () => createProviderSnapshot(makeEntries()) },
     });
 
     subsystem.start();
-    pushSnapshotChange(makeEntries());
+    pushSnapshotChange(createProviderSnapshot(makeEntries()));
     await subsystem.handleGetProvidersSnapshotRequest({
       type: "get_providers_snapshot_request",
       requestId: "g1",
@@ -117,7 +121,7 @@ describe("ProviderCatalogSession", () => {
   });
 
   it("returns the canonical cwd used by snapshot updates", async () => {
-    const getSnapshot = vi.fn((_cwd?: string) => makeEntries());
+    const getSnapshot = vi.fn((cwd?: string) => createProviderSnapshot(makeEntries(), cwd));
     const { subsystem, emitted } = makeSubsystem({
       snapshot: { getSnapshot },
     });
@@ -140,7 +144,7 @@ describe("ProviderCatalogSession", () => {
     });
 
     subsystem.start();
-    pushSnapshotChange(makeEntries());
+    pushSnapshotChange(createProviderSnapshot(makeEntries()));
 
     const push = findByType(emitted, "providers_snapshot_update");
     expect(push?.payload.entries).toEqual([]);
@@ -151,7 +155,7 @@ describe("ProviderCatalogSession", () => {
   it("preserves custom mode icons when the client supports them", async () => {
     const { subsystem, emitted } = makeSubsystem({
       supportsCustomModeIcons: true,
-      snapshot: { getSnapshot: () => makeEntries() },
+      snapshot: { getSnapshot: () => createProviderSnapshot(makeEntries()) },
     });
 
     await subsystem.handleGetProvidersSnapshotRequest({
@@ -184,7 +188,7 @@ describe("ProviderCatalogSession", () => {
     ];
     const { subsystem, emitted } = makeSubsystem({
       supportsCompactProviderSnapshots: true,
-      snapshot: { getSnapshot: () => entries },
+      snapshot: { getSnapshot: () => createProviderSnapshot(entries) },
     });
 
     await subsystem.handleGetProvidersSnapshotRequest({
@@ -221,7 +225,10 @@ describe("ProviderCatalogSession", () => {
     // warmUpSnapshotForCwd is intentionally unstubbed: createStub throws if it is called,
     // so the disabled short-circuit is proven by the absence of a throw.
     const { subsystem, emitted } = makeSubsystem({
-      snapshot: { getSnapshot: () => [{ provider: "codex", status: "loading", enabled: false }] },
+      snapshot: {
+        getSnapshot: () =>
+          createProviderSnapshot([{ provider: "codex", status: "loading", enabled: false }]),
+      },
     });
 
     await subsystem.handleListProviderModelsRequest({
@@ -237,22 +244,23 @@ describe("ProviderCatalogSession", () => {
   it("hides compatibility-only entries from list_provider_models", async () => {
     const { subsystem, emitted } = makeSubsystem({
       snapshot: {
-        getSnapshot: () => [
-          {
-            provider: "codex",
-            status: "ready",
-            enabled: true,
-            models: [
-              { provider: "codex", id: "gpt-5.4", label: "GPT 5.4" },
-              {
-                provider: "codex",
-                id: "gpt-5.4-legacy",
-                label: "GPT 5.4 legacy",
-                isSelectable: false,
-              },
-            ],
-          },
-        ],
+        getSnapshot: () =>
+          createProviderSnapshot([
+            {
+              provider: "codex",
+              status: "ready",
+              enabled: true,
+              models: [
+                { provider: "codex", id: "gpt-5.4", label: "GPT 5.4" },
+                {
+                  provider: "codex",
+                  id: "gpt-5.4-legacy",
+                  label: "GPT 5.4 legacy",
+                  isSelectable: false,
+                },
+              ],
+            },
+          ]),
       },
     });
 
@@ -267,7 +275,9 @@ describe("ProviderCatalogSession", () => {
   });
 
   it("preserves missing cwd as the semantic global snapshot for model list reads", async () => {
-    const getSnapshot = vi.fn(() => [{ provider: "codex", status: "loading", enabled: true }]);
+    const getSnapshot = vi.fn(() =>
+      createProviderSnapshot([{ provider: "codex", status: "loading", enabled: true }]),
+    );
     const warmUpSnapshotForCwd = vi.fn(async () => {});
     const { subsystem } = makeSubsystem({
       snapshot: { getSnapshot, warmUpSnapshotForCwd },
@@ -286,25 +296,6 @@ describe("ProviderCatalogSession", () => {
     });
   });
 
-  it("surfaces a usage-list failure as an rpc_error envelope", async () => {
-    const { subsystem, emitted } = makeSubsystem({
-      usage: {
-        listUsage: async () => {
-          throw new Error("quota service down");
-        },
-      },
-    });
-
-    await subsystem.handleProviderUsageListRequest({
-      type: "provider.usage.list.request",
-      requestId: "u1",
-    });
-
-    const err = findByType(emitted, "rpc_error");
-    expect(err?.payload.code).toBe("provider_usage_list_failed");
-    expect(err?.payload.requestId).toBe("u1");
-  });
-
   it("surfaces a feature-list failure inline, not as an rpc_error", async () => {
     const { subsystem, emitted } = makeSubsystem({
       host: {
@@ -326,3 +317,333 @@ describe("ProviderCatalogSession", () => {
     expect(res?.payload.requestId).toBe("f1");
   });
 });
+
+it("announces shared content without retransmitting models or hashing discovery freshness", async () => {
+  const { ProviderSnapshotManager: Manager } =
+    await import("../../agent/provider-snapshot-manager.js");
+  let probes = 0;
+  let fetches = 0;
+  const manager = new Manager({
+    logger: pino({ level: "silent" }),
+    providerOverrides: Object.fromEntries(
+      ["codex", "claude", "pi", "opencode", "copilot", "omp"].map((provider) => [
+        provider,
+        { enabled: provider === "codex" },
+      ]),
+    ),
+    extraClients: {
+      codex: {
+        provider: "codex",
+        capabilities: {
+          supportsStreaming: false,
+          supportsSessionPersistence: false,
+          supportsDynamicModes: false,
+          supportsMcpServers: false,
+          supportsReasoningStream: false,
+          supportsToolInvocations: false,
+        },
+        async getCatalogCacheKey() {
+          return "host";
+        },
+        async isAvailable() {
+          probes++;
+          return true;
+        },
+        async fetchCatalog() {
+          fetches++;
+          return { models: [{ provider: "codex", id: "astra", label: "Astra" }], modes: [] };
+        },
+        async createSession() {
+          throw new Error("Not used");
+        },
+        async resumeSession() {
+          throw new Error("Not used");
+        },
+      },
+    },
+  });
+  const createSession = (emitted: SessionOutboundMessage[], references: boolean) =>
+    new ProviderCatalogSession({
+      providerSnapshotManager: manager,
+      logger: pino({ level: "silent" }),
+      host: {
+        emit(message) {
+          emitted.push(message);
+        },
+        isProviderVisibleToClient: () => true,
+        supportsCustomModeIcons: () => true,
+        supportsCompactProviderSnapshots: () => true,
+        publishSnapshot: (project) => {
+          const message = project();
+          if (message) emitted.push(message);
+        },
+        supportsProviderSnapshotReferences: () => references,
+        listProviderAvailability: async () => [],
+        listDraftFeatures: async () => [],
+      },
+    });
+  const emitted: SessionOutboundMessage[] = [];
+  const peerMessages: SessionOutboundMessage[] = [];
+  const session = createSession(emitted, true);
+  const peer = createSession(peerMessages, false);
+  try {
+    await Promise.all(
+      [undefined, "/tmp/catalog-a", "/tmp/catalog-b"].map((cwd) =>
+        manager.getProvider({ provider: "codex", cwd, wait: true }),
+      ),
+    );
+    expect({ probes, fetches }).toEqual({ probes: 1, fetches: 1 });
+    session.start();
+    peer.start();
+    await session.handleGetProvidersSnapshotRequest({
+      type: "get_providers_snapshot_request",
+      requestId: "cold",
+    });
+    const first = findByType(emitted, "get_providers_snapshot_response")!.payload;
+    expect(
+      first.compactSnapshot?.entries.find((entry) => entry.provider === "codex")?.fetchedAt,
+    ).toBeUndefined();
+    expect(first.fetchedAt?.codex).toEqual(expect.any(String));
+    await vi.waitFor(() => expect(Date.now()).toBeGreaterThan(Date.parse(first.fetchedAt!.codex!)));
+    emitted.length = 0;
+    await manager.refreshSnapshotForCwd({ cwd: "/tmp/catalog-a", providers: ["codex"] });
+    expect({ probes, fetches }).toEqual({ probes: 2, fetches: 2 });
+    const pushes = emitted.filter((message) => message.type === "providers_snapshot_update");
+    expect(pushes).toHaveLength(3);
+    const peerPushes = peerMessages.filter(
+      (message) => message.type === "providers_snapshot_update",
+    );
+    expect(peerPushes).toHaveLength(3);
+    expect(
+      peerPushes.every(({ payload }) =>
+        payload.compactSnapshot?.entries.some(
+          (entry) => entry.provider === "codex" && entry.models?.[0]?.id === "astra",
+        ),
+      ),
+    ).toBe(true);
+    expect(peerPushes[0]!.payload.snapshotHash).not.toBe(pushes[0]!.payload.snapshotHash);
+    expect(pushes.map(({ payload }) => payload.snapshotHash)).toEqual(
+      Array(3).fill(first.snapshotHash),
+    );
+    expect(
+      pushes.flatMap(({ payload }) => (payload.compactSnapshot ? [payload.compactSnapshot] : [])),
+    ).toEqual([]);
+    expect(pushes.flatMap(({ payload }) => payload.entries)).toEqual([]);
+    await session.handleGetProvidersSnapshotRequest({
+      type: "get_providers_snapshot_request",
+      requestId: "warm",
+      ifNoneMatch: first.snapshotHash,
+    });
+    const warm = findByType(emitted, "get_providers_snapshot_response")!.payload;
+    expect(warm.notModified).toBe(true);
+    expect(warm.compactSnapshot).toBeUndefined();
+    expect(warm.fetchedAt?.codex).toEqual(expect.any(String));
+  } finally {
+    session.dispose();
+    peer.dispose();
+    manager.destroy();
+  }
+});
+
+it.each([false, true])(
+  "conditional hits do not read model bodies (references=%s)",
+  async (references) => {
+    let modelReads = 0;
+    const entries: ProviderSnapshotEntry[] = [
+      {
+        provider: "codex",
+        status: "ready",
+        enabled: true,
+        modes: [{ id: "default", label: "Default", icon: "Sparkles" }],
+        get models() {
+          modelReads++;
+          return [{ provider: "codex", id: "astra", label: "Astra" }];
+        },
+      },
+    ];
+    const snapshot: ProviderSnapshot = {
+      cwd: GLOBAL_PROVIDER_SNAPSHOT_KEY,
+      records: [{ entry: entries[0]!, contentHash: "fixture" }],
+    };
+    const { subsystem, emitted, pushSnapshotChange } = makeSubsystem({
+      supportsCompactProviderSnapshots: true,
+      host: { supportsProviderSnapshotReferences: () => references },
+      snapshot: { getSnapshot: () => snapshot },
+    });
+    subsystem.start();
+    await subsystem.handleGetProvidersSnapshotRequest({
+      type: "get_providers_snapshot_request",
+      requestId: "cold",
+    });
+    const first = findByType(emitted, "get_providers_snapshot_response")!.payload;
+    expect(modelReads).toBeGreaterThan(0);
+    modelReads = 0;
+    await subsystem.handleGetProvidersSnapshotRequest({
+      type: "get_providers_snapshot_request",
+      requestId: "hit",
+      ifNoneMatch: first.snapshotHash,
+    });
+    expect(modelReads).toBe(0);
+    pushSnapshotChange(snapshot);
+    expect(modelReads === 0).toBe(references);
+    subsystem.dispose();
+  },
+);
+
+it.each([false, true])(
+  "snapshot identity follows the client view and its freshness policy (references=%s)",
+  async (references) => {
+    const entries = makeEntries();
+    entries[0]!.fetchedAt = "2026-09-06T10:00:00.000Z";
+    entries[0]!.models = [{ provider: "codex", id: "astra", label: "Astra" }];
+    let snapshot = createProviderSnapshot(entries);
+    const clients = [
+      makeSubsystem({
+        supportsCompactProviderSnapshots: true,
+        host: { supportsProviderSnapshotReferences: () => references },
+        snapshot: { getSnapshot: () => snapshot },
+      }),
+      makeSubsystem({
+        supportsCompactProviderSnapshots: true,
+        host: { supportsProviderSnapshotReferences: () => references },
+        snapshot: { getSnapshot: () => snapshot },
+      }),
+      makeSubsystem({
+        supportsCompactProviderSnapshots: true,
+        supportsCustomModeIcons: true,
+        host: { supportsProviderSnapshotReferences: () => references },
+        snapshot: { getSnapshot: () => snapshot },
+      }),
+      makeSubsystem({
+        supportsCompactProviderSnapshots: true,
+        visibleProviders: new Set(["codex", "claude"]),
+        host: { supportsProviderSnapshotReferences: () => references },
+        snapshot: { getSnapshot: () => snapshot },
+      }),
+    ];
+    const read = async (client: ReturnType<typeof makeSubsystem>, ifNoneMatch?: string) => {
+      client.emitted.length = 0;
+      await client.subsystem.handleGetProvidersSnapshotRequest({
+        type: "get_providers_snapshot_request",
+        requestId: "view",
+        ifNoneMatch,
+      });
+      return findByType(client.emitted, "get_providers_snapshot_response")!.payload;
+    };
+    const views = await Promise.all(clients.map((client) => read(client)));
+    expect(views[0]!.snapshotHash).toBe(views[1]!.snapshotHash);
+    expect(views[0]!.compactSnapshot).toEqual(views[1]!.compactSnapshot);
+    expect(new Set(views.map((view) => view.snapshotHash)).size).toBe(3);
+    expect(expandProviderSnapshot(views[0]!.compactSnapshot!)[0]!.modes![0]!.icon).toBe(
+      "ShieldCheck",
+    );
+    expect(expandProviderSnapshot(views[2]!.compactSnapshot!)[0]!.modes![0]!.icon).toBe("Sparkles");
+    expect(
+      expandProviderSnapshot(views[3]!.compactSnapshot!).map((entry) => entry.provider),
+    ).toEqual(["codex", "claude"]);
+    expect(views[0]!.compactSnapshot!.entries[0]!.fetchedAt).toBe(
+      references ? undefined : entries[0]!.fetchedAt,
+    );
+
+    // Hidden provider changes do not invalidate the visible result.
+    snapshot = createProviderSnapshot([
+      entries[0]!,
+      { ...entries[1]!, status: "error", error: "hidden" },
+    ]);
+    expect((await read(clients[0]!, views[0]!.snapshotHash)).notModified).toBe(true);
+    // Same content hash, new embedded timestamp: only reference views can reuse the body.
+    snapshot = createProviderSnapshot([
+      { ...entries[0]!, fetchedAt: "2026-09-06T10:01:00.000Z" },
+      entries[1]!,
+    ]);
+    expect(snapshot.records[0]!.contentHash).toBe(
+      createProviderSnapshot(entries).records[0]!.contentHash,
+    );
+    const fresh = await read(clients[0]!, views[0]!.snapshotHash);
+    expect(fresh.snapshotHash === views[0]!.snapshotHash).toBe(references);
+    expect(fresh.notModified === true).toBe(references);
+    expect(fresh.fetchedAt?.codex).toBe(references ? "2026-09-06T10:01:00.000Z" : undefined);
+
+    snapshot = { ...snapshot, records: snapshot.records.toReversed() };
+    expect((await read(clients[3]!)).snapshotHash).not.toBe(views[3]!.snapshotHash);
+  },
+);
+
+it("reference capability alone preserves full legacy responses and does not alias embedded compact hashes", async () => {
+  const snapshot = createProviderSnapshot(makeEntries());
+  const clients = [
+    makeSubsystem({
+      host: { supportsProviderSnapshotReferences: () => true },
+      snapshot: { getSnapshot: () => snapshot },
+    }),
+    makeSubsystem({
+      supportsCompactProviderSnapshots: true,
+      snapshot: { getSnapshot: () => snapshot },
+    }),
+    makeSubsystem({
+      supportsCompactProviderSnapshots: true,
+      host: { supportsProviderSnapshotReferences: () => true },
+      snapshot: { getSnapshot: () => snapshot },
+    }),
+  ];
+  for (const client of clients) {
+    client.subsystem.start();
+    client.pushSnapshotChange(snapshot);
+    await client.subsystem.handleGetProvidersSnapshotRequest({
+      type: "get_providers_snapshot_request",
+      requestId: "format",
+    });
+    client.subsystem.dispose();
+  }
+  const views = clients.map(
+    ({ emitted }) => findByType(emitted, "get_providers_snapshot_response")!.payload,
+  );
+  expect(views[0]!.snapshotHash).toBeUndefined();
+  expect(views[0]!.entries).toEqual(
+    findByType(clients[0]!.emitted, "providers_snapshot_update")!.payload.entries,
+  );
+  expect(views[0]!.entries).toHaveLength(1);
+  expect(views[1]!.snapshotHash).not.toBe(views[2]!.snapshotHash);
+  expect(expandProviderSnapshot(views[1]!.compactSnapshot!)).toEqual(views[0]!.entries);
+  expect(expandProviderSnapshot(views[2]!.compactSnapshot!)).toEqual(views[0]!.entries);
+});
+
+it.each(["full", "embedded", "references"])(
+  "suppresses hidden-only transitions but publishes visible freshness for %s clients",
+  (format) => {
+    const before = createProviderSnapshot([
+      {
+        provider: "codex",
+        status: "ready",
+        enabled: true,
+        fetchedAt: "2026-09-06T10:00:00.000Z",
+        models: [{ provider: "codex", id: "astra", label: "Astra" }],
+      },
+      { provider: "claude", status: "loading", enabled: true },
+    ]);
+    const hidden = createProviderSnapshot([
+      before.records[0]!.entry,
+      { provider: "claude", status: "error", enabled: true, error: "hidden" },
+    ]);
+    const fresh = createProviderSnapshot([
+      { ...before.records[0]!.entry, fetchedAt: "2026-09-06T10:01:00.000Z" },
+      hidden.records[1]!.entry,
+    ]);
+    const client = makeSubsystem({
+      supportsCompactProviderSnapshots: format !== "full",
+      host: { supportsProviderSnapshotReferences: () => format === "references" },
+    });
+    client.subsystem.start();
+    client.pushSnapshotChange(hidden, before);
+    expect(client.emitted).toEqual([]);
+    client.pushSnapshotChange(fresh, hidden);
+    const update = findByType(client.emitted, "providers_snapshot_update")!.payload;
+    expect(client.emitted).toHaveLength(1);
+    const representedFreshness =
+      update.fetchedAt?.codex ??
+      update.compactSnapshot?.entries[0]?.fetchedAt ??
+      update.entries[0]?.fetchedAt;
+    expect(representedFreshness).toBe("2026-09-06T10:01:00.000Z");
+    client.subsystem.dispose();
+  },
+);
diff --git a/packages/server/src/server/session/provider/provider-catalog-session.ts b/packages/server/src/server/session/provider/provider-catalog-session.ts
index ed7509a916..af04199bca 100644
--- a/packages/server/src/server/session/provider/provider-catalog-session.ts
+++ b/packages/server/src/server/session/provider/provider-catalog-session.ts
@@ -1,15 +1,15 @@
 import type pino from "pino";
 import { createHash } from "node:crypto";
 import { getErrorMessage } from "@getpaseo/protocol/error-utils";
-import {
-  compactProviderSnapshot,
-  type CompactProviderSnapshot,
-} from "@getpaseo/protocol/provider-snapshot-codec";
+import { compactProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
 import type { SessionInboundMessage, SessionOutboundMessage } from "../../messages.js";
 import {
   isGlobalProviderSnapshotKey,
   resolveSnapshotCwd,
+  sameSnapshotRecords,
   type ProviderSnapshotManager,
+  type ProviderSnapshot,
+  type ProviderSnapshotTransition,
 } from "../../agent/provider-snapshot-manager.js";
 import {
   filterSelectableAgentModels,
@@ -19,7 +19,6 @@ import {
   type ProviderSnapshotEntry,
 } from "../../agent/agent-sdk-types.js";
 import type { ProviderAvailability } from "../../agent/agent-manager.js";
-import type { ProviderUsageService } from "../../../services/quota-fetcher/service.js";
 import { expandTilde } from "../../../utils/path.js";
 
 // COMPAT(customModeIcons): the only mode icons known to clients before v0.1.84. Any
@@ -47,6 +46,8 @@ export interface ProviderCatalogSessionHost {
   // COMPAT(customModeIcons): reads clientCapabilities live.
   supportsCustomModeIcons(): boolean;
   supportsCompactProviderSnapshots(): boolean;
+  supportsProviderSnapshotReferences(): boolean;
+  publishSnapshot(project: () => SessionOutboundMessage | null): void;
   listProviderAvailability(): Promise<ProviderAvailability[]>;
   listDraftFeatures(config: AgentSessionConfig): Promise<AgentFeature[]>;
 }
@@ -54,26 +55,12 @@ export interface ProviderCatalogSessionHost {
 export interface ProviderCatalogSessionOptions {
   host: ProviderCatalogSessionHost;
   providerSnapshotManager: ProviderSnapshotManager;
-  providerUsageService: ProviderUsageService;
   logger: pino.Logger;
 }
 
-interface EncodedProviderSnapshot {
-  compactSnapshot: CompactProviderSnapshot;
-  snapshotHash: string;
-}
-
-function encodeProviderSnapshot(entries: ProviderSnapshotEntry[]): EncodedProviderSnapshot {
-  const compactSnapshot = compactProviderSnapshot(entries);
-  const snapshotHash = createHash("sha256")
-    .update(JSON.stringify(compactSnapshot))
-    .digest("base64url");
-  return { compactSnapshot, snapshotHash };
-}
-
 /**
  * A client's provider catalog surface: model / mode / feature listing, the providers
- * snapshot push + pull, provider diagnostics, and usage. The snapshot PUSH (start) and
+ * snapshot push + pull, and provider diagnostics. The snapshot PUSH (start) and
  * every PULL handler gate visibility and downgrade mode icons through the SAME predicates,
  * so an older client sees one consistent provider set across both paths — the COMPAT
  * invariant the shell could only enforce by code proximity before this carve.
@@ -81,45 +68,27 @@ function encodeProviderSnapshot(entries: ProviderSnapshotEntry[]): EncodedProvid
 export class ProviderCatalogSession {
   private readonly host: ProviderCatalogSessionHost;
   private readonly providerSnapshotManager: ProviderSnapshotManager;
-  private readonly providerUsageService: ProviderUsageService;
   private readonly logger: pino.Logger;
   private unsubscribeSnapshotEvents: (() => void) | null = null;
 
   constructor(options: ProviderCatalogSessionOptions) {
     this.host = options.host;
     this.providerSnapshotManager = options.providerSnapshotManager;
-    this.providerUsageService = options.providerUsageService;
     this.logger = options.logger;
   }
 
+  get isObserving(): boolean {
+    return this.unsubscribeSnapshotEvents !== null;
+  }
+
   start(): void {
-    const handleProviderSnapshotChange = (entries: ProviderSnapshotEntry[], cwd: string) => {
-      // COMPAT(providersSnapshot): keep provider visibility gating for older clients.
-      const visibleEntries = entries.filter((entry) =>
-        this.host.isProviderVisibleToClient(entry.provider),
-      );
-      const snapshotCwd = isGlobalProviderSnapshotKey(cwd) ? undefined : cwd;
-      const clientEntries = this.downgradeEntryModesForClient(visibleEntries);
-      if (this.host.supportsCompactProviderSnapshots()) {
-        const encoded = encodeProviderSnapshot(clientEntries);
-        this.host.emit({
-          type: "providers_snapshot_update",
-          payload: {
-            ...(snapshotCwd ? { cwd: snapshotCwd } : {}),
-            entries: [],
-            ...encoded,
-            generatedAt: new Date().toISOString(),
-          },
-        });
-        return;
-      }
-      this.host.emit({
-        type: "providers_snapshot_update",
-        payload: {
-          ...(snapshotCwd ? { cwd: snapshotCwd } : {}),
-          entries: clientEntries,
-          generatedAt: new Date().toISOString(),
-        },
+    if (this.unsubscribeSnapshotEvents) return;
+    const handleProviderSnapshotChange = (transition: ProviderSnapshotTransition) => {
+      this.host.publishSnapshot(() => {
+        const previous = this.visibleSnapshot(transition.previous);
+        const current = this.visibleSnapshot(transition.current);
+        if (sameSnapshotRecords(previous.records, current.records)) return null;
+        return { type: "providers_snapshot_update", payload: this.snapshotPayload(current) };
       });
     };
     this.providerSnapshotManager.on("change", handleProviderSnapshotChange);
@@ -138,20 +107,79 @@ export class ProviderCatalogSession {
   // COMPAT(customModeIcons): rewrite icons unknown to v0.1.83 clients (whose MODE_ICONS
   // map is a closed enum and would render `undefined`, crashing in render). Drop
   // this and the cap gate when floor >= v0.1.84.
-  private downgradeModeIconsForClient<T extends { icon?: string }>(modes: T[]): T[] {
-    if (this.host.supportsCustomModeIcons()) return modes;
+  private downgradeModeIconsForClient<T extends { icon?: string }>(
+    modes: T[],
+    customModeIcons = this.host.supportsCustomModeIcons(),
+  ): T[] {
+    if (customModeIcons) return modes;
     return modes.map((mode) =>
       mode.icon && !LEGACY_MODE_ICONS.has(mode.icon) ? { ...mode, icon: "ShieldCheck" } : mode,
     );
   }
 
-  private downgradeEntryModesForClient<T extends { modes?: { icon?: string }[] }>(
-    entries: T[],
-  ): T[] {
-    if (this.host.supportsCustomModeIcons()) return entries;
-    return entries.map((entry) =>
-      entry.modes ? { ...entry, modes: this.downgradeModeIconsForClient(entry.modes) } : entry,
-    );
+  private visibleSnapshot(snapshot: ProviderSnapshot): ProviderSnapshot {
+    // COMPAT(providersSnapshot): use the shell's current visibility policy for both sides.
+    return {
+      ...snapshot,
+      records: snapshot.records.filter(({ entry }) =>
+        this.host.isProviderVisibleToClient(entry.provider),
+      ),
+    };
+  }
+
+  private snapshotPayload(snapshot: ProviderSnapshot, request?: { ifNoneMatch?: string }) {
+    const { records } = snapshot;
+    const customModeIcons = this.host.supportsCustomModeIcons();
+    const compact = this.host.supportsCompactProviderSnapshots();
+    const references = this.host.supportsProviderSnapshotReferences();
+    const envelope = {
+      ...(!isGlobalProviderSnapshotKey(snapshot.cwd) ? { cwd: snapshot.cwd } : {}),
+      generatedAt: new Date().toISOString(),
+    };
+    const clientEntries = () =>
+      records.map(({ entry }) =>
+        entry.modes && !customModeIcons
+          ? { ...entry, modes: this.downgradeModeIconsForClient(entry.modes, customModeIcons) }
+          : entry,
+      );
+    if (!compact) {
+      return { ...envelope, entries: clientEntries() };
+    }
+
+    // COMPAT(providerSnapshotReferences): added in v0.7.2, remove legacy full
+    // pushes and embedded freshness after 2027-03-06 once the client floor supports references.
+    const snapshotHash = createHash("sha256")
+      .update(
+        JSON.stringify([
+          "paseo.providers-snapshot/1",
+          references ? "references" : "embedded",
+          customModeIcons ? "icons" : "legacy-icons",
+          records.map(({ entry, contentHash }) => [
+            entry.provider,
+            contentHash,
+            references ? null : (entry.fetchedAt ?? null),
+          ]),
+        ]),
+      )
+      .digest("base64url");
+    const fetchedAt = references
+      ? Object.fromEntries(
+          records.flatMap(({ entry }) =>
+            entry.fetchedAt ? [[entry.provider, entry.fetchedAt]] : [],
+          ),
+        )
+      : undefined;
+    const identified = { ...envelope, entries: [], snapshotHash, fetchedAt };
+    if (request && request.ifNoneMatch === snapshotHash) {
+      return { ...identified, notModified: true as const };
+    }
+    if (!request && references) return identified;
+
+    const entries = clientEntries();
+    const content = references
+      ? entries.map(({ fetchedAt: _fetchedAt, ...entry }) => entry)
+      : entries;
+    return { ...identified, compactSnapshot: compactProviderSnapshot(content) };
   }
 
   private emitProviderDisabledResponse(
@@ -290,7 +318,7 @@ export class ProviderCatalogSession {
   ): Promise<ProviderSnapshotEntry | undefined> {
     const manager = this.providerSnapshotManager;
     const findEntry = () =>
-      manager.getSnapshot(cwd).find((candidate) => candidate.provider === provider);
+      manager.getSnapshot(cwd).records.find(({ entry }) => entry.provider === provider)?.entry;
 
     let entry = findEntry();
     if (entry && !entry.enabled) {
@@ -391,37 +419,12 @@ export class ProviderCatalogSession {
   async handleGetProvidersSnapshotRequest(
     msg: Extract<SessionInboundMessage, { type: "get_providers_snapshot_request" }>,
   ): Promise<void> {
-    // COMPAT(providersSnapshot): keep legacy provider-list RPCs alongside snapshot flow.
-    const snapshotCwd = msg.cwd?.trim() ? resolveSnapshotCwd(expandTilde(msg.cwd)) : undefined;
-    const entries = this.providerSnapshotManager
-      .getSnapshot(snapshotCwd)
-      .filter((entry) => this.host.isProviderVisibleToClient(entry.provider));
-    const clientEntries = this.downgradeEntryModesForClient(entries);
-
-    if (this.host.supportsCompactProviderSnapshots()) {
-      const encoded = encodeProviderSnapshot(clientEntries);
-      const notModified = msg.ifNoneMatch === encoded.snapshotHash;
-      this.host.emit({
-        type: "get_providers_snapshot_response",
-        payload: {
-          ...(snapshotCwd ? { cwd: snapshotCwd } : {}),
-          entries: [],
-          ...(!notModified ? { compactSnapshot: encoded.compactSnapshot } : {}),
-          snapshotHash: encoded.snapshotHash,
-          ...(notModified ? { notModified: true } : {}),
-          generatedAt: new Date().toISOString(),
-          requestId: msg.requestId,
-        },
-      });
-      return;
-    }
-
+    const cwd = msg.cwd?.trim() ? resolveSnapshotCwd(expandTilde(msg.cwd)) : undefined;
+    const snapshot = this.visibleSnapshot(this.providerSnapshotManager.getSnapshot(cwd));
     this.host.emit({
       type: "get_providers_snapshot_response",
       payload: {
-        ...(snapshotCwd ? { cwd: snapshotCwd } : {}),
-        entries: clientEntries,
-        generatedAt: new Date().toISOString(),
+        ...this.snapshotPayload(snapshot, { ifNoneMatch: msg.ifNoneMatch }),
         requestId: msg.requestId,
       },
     });
@@ -479,34 +482,6 @@ export class ProviderCatalogSession {
       });
     }
   }
-
-  async handleProviderUsageListRequest(
-    msg: Extract<SessionInboundMessage, { type: "provider.usage.list.request" }>,
-  ): Promise<void> {
-    try {
-      const usage = await this.providerUsageService.listUsage();
-      this.host.emit({
-        type: "provider.usage.list.response",
-        payload: {
-          requestId: msg.requestId,
-          fetchedAt: usage.fetchedAt,
-          providers: usage.providers,
-        },
-      });
-    } catch (error) {
-      const err = error instanceof Error ? error : new Error(String(error));
-      this.logger.error({ err }, "Failed to list provider usage");
-      this.host.emit({
-        type: "rpc_error",
-        payload: {
-          requestId: msg.requestId,
-          requestType: msg.type,
-          error: `Failed to list provider usage: ${err.message}`,
-          code: "provider_usage_list_failed",
-        },
-      });
-    }
-  }
 }
 
 function resolveCatalogRequestCwd(cwd?: string | null): string | undefined {
diff --git a/packages/server/src/server/session/usage/usage-session.test.ts b/packages/server/src/server/session/usage/usage-session.test.ts
new file mode 100644
index 0000000000..2aa65992b8
--- /dev/null
+++ b/packages/server/src/server/session/usage/usage-session.test.ts
@@ -0,0 +1,74 @@
+import pino from "pino";
+import { expect, test } from "vitest";
+import type { SessionOutboundMessage } from "../../messages.js";
+import { UsageSession } from "./usage-session.js";
+
+test("lists reports from usage sources", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const requested: Array<{ forceRefresh?: boolean; reportIds?: string[] }> = [];
+  const entry = {
+    id: "fixture:one",
+    account: {},
+    fetchedAt: "2026-01-01T00:00:00.000Z",
+    sourceId: "fixture",
+    sourceLabel: "Fixture",
+    report: { status: "available" as const, windows: [] },
+  };
+  const usage = new UsageSession({
+    emit: (message) => emitted.push(message),
+    runtime: {
+      async listUsageReports(options) {
+        requested.push({ forceRefresh: options.forceRefresh, reportIds: options.reportIds });
+        options.onReport?.(entry);
+        return [entry];
+      },
+      async listLegacyUsage() {
+        return { fetchedAt: "2026-01-01T00:00:00.000Z", providers: [] };
+      },
+    },
+    logger: pino({ level: "silent" }),
+  });
+
+  await usage.handleListReports({ type: "usage.list_reports.request", requestId: "list" });
+  expect(requested).toEqual([{ forceRefresh: undefined, reportIds: undefined }]);
+  expect(emitted).toEqual([
+    { type: "usage.list_reports.update", payload: { requestId: "list", report: entry } },
+    { type: "usage.list_reports.response", payload: { requestId: "list", error: null } },
+  ]);
+});
+
+test("surfaces a legacy usage-list failure as an rpc_error envelope", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const usage = new UsageSession({
+    emit: (message) => emitted.push(message),
+    runtime: {
+      async listUsageReports() {
+        return [];
+      },
+      async listLegacyUsage(): Promise<never> {
+        throw new Error("quota service down");
+      },
+    },
+    logger: pino({ level: "silent" }),
+  });
+  await usage.handleLegacyList({ type: "provider.usage.list.request", requestId: "u1" });
+  expect(emitted[0]).toMatchObject({
+    type: "rpc_error",
+    payload: { requestId: "u1", code: "provider_usage_list_failed" },
+  });
+});
+
+test("request failures terminate with an error response and no updates", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const usage = new UsageSession({
+    emit: (message) => emitted.push(message),
+    logger: pino({ level: "silent" }),
+  });
+  await usage.handleListReports({ type: "usage.list_reports.request", requestId: "failed" });
+  expect(emitted).toEqual([
+    {
+      type: "usage.list_reports.response",
+      payload: { requestId: "failed", error: "Plugin runtime is unavailable" },
+    },
+  ]);
+});
diff --git a/packages/server/src/server/session/usage/usage-session.ts b/packages/server/src/server/session/usage/usage-session.ts
new file mode 100644
index 0000000000..500c03a088
--- /dev/null
+++ b/packages/server/src/server/session/usage/usage-session.ts
@@ -0,0 +1,77 @@
+import type { ListUsageReportsOptions } from "../../plugins/usage-sources/index.js";
+import type pino from "pino";
+import type { ProviderUsage, UsageReportEntry } from "@getpaseo/protocol/messages";
+import type { SessionInboundMessage, SessionOutboundMessage } from "../../messages.js";
+
+export interface UsageSessionOptions {
+  emit(message: SessionOutboundMessage): void;
+  runtime?: {
+    listUsageReports(options: ListUsageReportsOptions): Promise<UsageReportEntry[]>;
+    listLegacyUsage(): Promise<{ fetchedAt: string; providers: ProviderUsage[] }>;
+  };
+  logger: pino.Logger;
+}
+
+export class UsageSession {
+  constructor(private readonly options: UsageSessionOptions) {}
+
+  async handleListReports(
+    msg: Extract<SessionInboundMessage, { type: "usage.list_reports.request" }>,
+  ): Promise<void> {
+    try {
+      if (!this.options.runtime) throw new Error("Plugin runtime is unavailable");
+      await this.options.runtime.listUsageReports({
+        forceRefresh: msg.forceRefresh,
+        reportIds: msg.reportIds,
+        agentId: msg.agentId,
+        onReport: (report) =>
+          this.options.emit({
+            type: "usage.list_reports.update",
+            payload: { requestId: msg.requestId, report },
+          }),
+      });
+      this.options.emit({
+        type: "usage.list_reports.response",
+        payload: { requestId: msg.requestId, error: null },
+      });
+    } catch (error) {
+      this.options.emit({
+        type: "usage.list_reports.response",
+        payload: {
+          requestId: msg.requestId,
+          error: error instanceof Error ? error.message : String(error),
+        },
+      });
+    }
+  }
+
+  // COMPAT(providerUsageList): added in v0.9.3, remove after 2027-03-26.
+  async handleLegacyList(
+    msg: Extract<SessionInboundMessage, { type: "provider.usage.list.request" }>,
+  ): Promise<void> {
+    try {
+      if (!this.options.runtime) throw new Error("Plugin runtime is unavailable");
+      const usage = await this.options.runtime.listLegacyUsage();
+      this.options.emit({
+        type: "provider.usage.list.response",
+        payload: {
+          requestId: msg.requestId,
+          fetchedAt: usage.fetchedAt,
+          providers: usage.providers,
+        },
+      });
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error));
+      this.options.logger.error({ err }, "Failed to list provider usage");
+      this.options.emit({
+        type: "rpc_error",
+        payload: {
+          requestId: msg.requestId,
+          requestType: msg.type,
+          error: `Failed to list provider usage: ${err.message}`,
+          code: "provider_usage_list_failed",
+        },
+      });
+    }
+  }
+}
diff --git a/packages/server/src/server/session/voice/index.test.ts b/packages/server/src/server/session/voice/index.test.ts
new file mode 100644
index 0000000000..043b759d1e
--- /dev/null
+++ b/packages/server/src/server/session/voice/index.test.ts
@@ -0,0 +1,58 @@
+import { EventEmitter } from "node:events";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { SessionDelivery } from "../owned-subscriptions/index.js";
+import { VoiceSessions } from "./index.js";
+import type { StreamingTranscriptionSession } from "../../speech/speech-provider.js";
+
+test("a failed speech close reports the failure without retaining observation demand", async () => {
+  class BrokenCloseStream extends EventEmitter implements StreamingTranscriptionSession {
+    readonly requiredSampleRate = 16000;
+    async connect() {}
+    appendPcm16() {}
+    commit() {}
+    clear() {}
+    close() {
+      throw new Error("Speech worker close failed");
+    }
+  }
+  const source = {};
+  const delivery = new SessionDelivery(() => {});
+  delivery.attach(source, true);
+  const demands: boolean[] = [];
+  const voice = new VoiceSessions(
+    {
+      sessionId: "failed-speech-close",
+      logger: pino({ level: "silent" }),
+      host: {
+        emit() {},
+        async loadAgent() {
+          throw new Error("Unexpected agent load");
+        },
+        async reloadAgentSession() {
+          throw new Error("Unexpected agent reload");
+        },
+        async sendSpokenInput() {
+          throw new Error("Unexpected spoken input");
+        },
+        async interruptAgentIfRunning() {},
+        hasActiveAgentRun: () => false,
+      },
+      stt: null,
+      tts: null,
+      dictation: { stt: { id: "local", createSession: () => new BrokenCloseStream() } },
+    },
+    delivery,
+    () => demands.push(voice.hasDemand),
+  );
+  const request = {
+    type: "dictation_stream_start" as const,
+    dictationId: "recording",
+    format: "audio/pcm;rate=16000;bits=16",
+  };
+  await delivery.request(source, request, () => voice.handleMessage(request));
+  expect(voice.hasDemand).toBe(true);
+  await expect(delivery.detach(source)).rejects.toThrow();
+  expect(voice.hasDemand).toBe(false);
+  expect(demands.at(-1)).toBe(false);
+});
diff --git a/packages/server/src/server/session/voice/index.ts b/packages/server/src/server/session/voice/index.ts
new file mode 100644
index 0000000000..1832da1c65
--- /dev/null
+++ b/packages/server/src/server/session/voice/index.ts
@@ -0,0 +1,146 @@
+import type { SessionInboundMessage, SessionOutboundMessage } from "../../messages.js";
+import type { OwnedOperation, SessionDelivery } from "../owned-subscriptions/index.js";
+import { VoiceSession, type VoiceSessionOptions } from "./voice-session.js";
+
+type VoiceMessage = Extract<
+  SessionInboundMessage,
+  {
+    type:
+      | "voice_audio_chunk"
+      | "abort_request"
+      | "audio_played"
+      | "set_voice_mode"
+      | "dictation_stream_start"
+      | "dictation_stream_chunk"
+      | "dictation_stream_finish"
+      | "dictation_stream_cancel";
+  }
+>;
+
+interface ActiveVoiceSource {
+  voice: VoiceSession;
+  owner: OwnedOperation;
+  pending: Set<Promise<void>>;
+  closing: boolean;
+}
+
+/** Audio conversations belong to their requesting socket, including bootstrap and finalization. */
+export class VoiceSessions {
+  private readonly sources = new Map<object, ActiveVoiceSource>();
+
+  constructor(
+    private readonly options: VoiceSessionOptions,
+    private readonly delivery: SessionDelivery,
+    private readonly demandChanged: () => void,
+  ) {}
+
+  get hasDemand(): boolean {
+    return [...this.sources.values()].some((source) => !source.closing);
+  }
+
+  isActiveForAgent(agentId: string): boolean {
+    return [...this.sources.values()].some(
+      (source) => !source.closing && source.voice.isActiveForAgent(agentId),
+    );
+  }
+
+  handleMessage(message: VoiceMessage): Promise<void> {
+    const source = this.delivery.currentSource;
+    if (!source) throw new Error("Voice request has no source");
+    const existing = this.sources.get(source);
+    if (existing?.closing) return existing.owner.release().then(() => this.handleMessage(message));
+    const active = existing ?? this.startSource(source);
+    const pending = Promise.resolve().then(() => {
+      return active.closing ? undefined : this.dispatch(active.voice, message);
+    });
+    active.pending.add(pending);
+    const finished = () => {
+      active.pending.delete(pending);
+      this.releaseIdle(active);
+      return undefined;
+    };
+    void pending.then(finished, finished);
+    return pending;
+  }
+
+  private startSource(source: object): ActiveVoiceSource {
+    const owner = this.delivery.operation(isVoiceOutput, async () => {
+      active.closing = true;
+      this.demandChanged();
+      // Cancel input immediately; restore agent configuration after bootstrap has settled.
+      try {
+        active.voice.cancel();
+      } finally {
+        await Promise.allSettled(active.pending);
+        await active.voice.cleanup();
+      }
+      if (this.sources.get(source) === active) this.sources.delete(source);
+    });
+    const active: ActiveVoiceSource = {
+      owner,
+      pending: new Set(),
+      closing: false,
+      voice: new VoiceSession({
+        ...this.options,
+        host: { ...this.options.host, emit: (message) => owner.emit(message) },
+        onIdle: () => this.releaseIdle(active),
+      }),
+    };
+    this.sources.set(source, active);
+    this.demandChanged();
+    return active;
+  }
+
+  private releaseIdle(source: ActiveVoiceSource): void {
+    if (source.closing || source.pending.size > 0 || source.voice.hasDemand) return;
+    void source.owner
+      .release()
+      .catch((error) =>
+        this.options.logger.error({ err: error }, "Failed to release voice source"),
+      );
+  }
+
+  private async dispatch(voice: VoiceSession, message: VoiceMessage): Promise<void> {
+    switch (message.type) {
+      case "voice_audio_chunk":
+        return voice.handleAudioChunk(message);
+      case "abort_request":
+        return voice.handleAbort();
+      case "audio_played":
+        return voice.handleAudioPlayed(message.id);
+      case "set_voice_mode":
+        return voice.handleSetVoiceMode(message.enabled, message.agentId, message.requestId);
+      case "dictation_stream_start":
+        return voice.handleDictationStreamStart(message);
+      case "dictation_stream_chunk":
+        return voice.handleDictationChunk({
+          dictationId: message.dictationId,
+          seq: message.seq,
+          audioBase64: message.audio,
+          format: message.format,
+        });
+      case "dictation_stream_finish":
+        return voice.handleDictationFinish(message.dictationId, message.finalSeq);
+      case "dictation_stream_cancel":
+        return voice.handleDictationCancel(message.dictationId);
+    }
+  }
+}
+
+function isVoiceOutput(message: SessionOutboundMessage): boolean {
+  switch (message.type) {
+    case "audio_output":
+    case "transcription_result":
+    case "voice_input_state":
+    case "set_voice_mode_response":
+    case "dictation_stream_ack":
+    case "dictation_stream_partial":
+    case "dictation_stream_final":
+    case "dictation_stream_error":
+    case "dictation_stream_finish_accepted":
+    case "activity_log":
+      return true;
+    default:
+      return false;
+  }
+}
diff --git a/packages/server/src/server/session/voice/voice-session.test.ts b/packages/server/src/server/session/voice/voice-session.test.ts
index d6232ff4d8..1511d6f2fd 100644
--- a/packages/server/src/server/session/voice/voice-session.test.ts
+++ b/packages/server/src/server/session/voice/voice-session.test.ts
@@ -1,3 +1,5 @@
+import { Readable } from "node:stream";
+import type { VoiceSpeakHandler } from "../../voice-types.js";
 import { EventEmitter } from "node:events";
 import pino from "pino";
 import { describe, expect, test, vi } from "vitest";
@@ -7,6 +9,7 @@ import type { ManagedAgent } from "../../agent/agent-manager.js";
 import type { SessionOutboundMessage } from "../../messages.js";
 import type {
   SpeechToTextProvider,
+  TextToSpeechProvider,
   StreamingTranscriptionCommittedEvent,
   StreamingTranscriptionEvent,
   StreamingTranscriptionSession,
@@ -79,7 +82,8 @@ function createFakeHost(): FakeVoiceHost {
   };
 }
 
-function createVoiceSession() {
+function createVoiceSession(tts: TextToSpeechProvider | null = null) {
+  let speakHandler: VoiceSpeakHandler | undefined;
   const detector = new FakeVoiceTurnDetectionSession();
   const sttSession = new FakeVoiceSttSession();
   const stt: SpeechToTextProvider = {
@@ -96,11 +100,33 @@ function createVoiceSession() {
     logger: pino({ level: "silent" }),
     sessionId: "voice-session-test",
     sttLanguage: "en",
-    tts: null,
+    tts,
+    voiceBridge: {
+      registerVoiceSpeakHandler: (_id, handler) => {
+        speakHandler = handler;
+      },
+    },
     stt,
     voice: { turnDetection },
   });
-  return { voiceSession, detector, sttSession, host };
+  return {
+    voiceSession,
+    detector,
+    sttSession,
+    host,
+    speak: (args: Parameters<VoiceSpeakHandler>[0]) => {
+      if (!speakHandler) throw new Error("Voice speak handler not registered");
+      return speakHandler(args);
+    },
+  };
+}
+
+function isAudioOutput(message: SessionOutboundMessage): boolean {
+  return message.type === "audio_output";
+}
+
+async function waitForAudioOutput(host: FakeVoiceHost): Promise<void> {
+  await vi.waitFor(() => expect(host.emitted.filter(isAudioOutput)).toHaveLength(1));
 }
 
 async function settle(): Promise<void> {
@@ -110,6 +136,71 @@ async function settle(): Promise<void> {
 }
 
 describe("VoiceSession streaming transcription", () => {
+  test("interrupts playback and the agent on speech detection without partial transcripts", async () => {
+    const tts: TextToSpeechProvider = {
+      async synthesizeSpeech() {
+        return { stream: Readable.from([Buffer.from("audio")]), format: "pcm;rate=24000" };
+      },
+    };
+    const { voiceSession, detector, host, speak } = createVoiceSession(tts);
+    const interrupted: string[] = [];
+    async function recordInterruption(agentId: string) {
+      interrupted.push(agentId);
+    }
+    host.interruptAgentIfRunning = recordInterruption;
+    await voiceSession.handleSetVoiceMode(true, VOICE_AGENT_ID);
+    const playback = speak({ text: "A spoken response." });
+    try {
+      await waitForAudioOutput(host);
+      detector.emit("speech_started");
+      await settle();
+      expect(host.emitted).toContainEqual({
+        type: "voice_input_state",
+        payload: { isSpeaking: true },
+      });
+      expect(interrupted).toEqual([VOICE_AGENT_ID]);
+      await playback;
+    } finally {
+      await voiceSession.cleanup();
+      await playback.catch(() => {});
+    }
+  });
+
+  test("session abort stops later audio even when the speak tool supplies its own signal", async () => {
+    const tts: TextToSpeechProvider = {
+      async synthesizeSpeech() {
+        return { stream: Readable.from([Buffer.from("audio")]), format: "pcm;rate=24000" };
+      },
+    };
+    const { voiceSession, host, speak } = createVoiceSession(tts);
+    const external = new AbortController();
+    let abortRequested = false;
+    const emit = host.emit;
+    function acknowledgeLaterAudio(message: SessionOutboundMessage) {
+      emit(message);
+      if (message.type === "audio_output" && abortRequested)
+        voiceSession.handleAudioPlayed(message.payload.id);
+    }
+    host.emit = acknowledgeLaterAudio;
+    await voiceSession.handleSetVoiceMode(true, VOICE_AGENT_ID);
+    const playback = speak({
+      text: "First sentence. Second sentence. Third sentence.",
+      signal: external.signal,
+    });
+    try {
+      await waitForAudioOutput(host);
+      abortRequested = true;
+      await voiceSession.handleAbort();
+      await playback;
+      expect(host.emitted.filter(isAudioOutput)).toHaveLength(1);
+      expect(external.signal.aborted).toBe(false);
+    } finally {
+      external.abort();
+      await voiceSession.cleanup();
+      await playback.catch(() => {});
+    }
+  });
+
   test("surfaces a refused voice-mode agent interruption", async () => {
     const { voiceSession, host } = createVoiceSession();
     host.interruptAgentIfRunning = vi.fn(async () => {
diff --git a/packages/server/src/server/session/voice/voice-session.ts b/packages/server/src/server/session/voice/voice-session.ts
index f6331dba3f..95537dd021 100644
--- a/packages/server/src/server/session/voice/voice-session.ts
+++ b/packages/server/src/server/session/voice/voice-session.ts
@@ -135,6 +135,7 @@ export interface VoiceSessionOptions {
   host: VoiceSessionHost;
   logger: pino.Logger;
   sessionId: string;
+  onIdle?: () => void;
   sttLanguage?: string;
   tts: Resolvable<TextToSpeechProvider | null>;
   stt: Resolvable<SpeechToTextProvider | null>;
@@ -169,6 +170,8 @@ export class VoiceSession {
   private readonly sttLanguage: string;
 
   private abortController: AbortController;
+  private closed = false;
+  private readonly onIdle: (() => void) | undefined;
   private processingPhase: ProcessingPhase = "idle";
 
   private isVoiceMode = false;
@@ -211,6 +214,7 @@ export class VoiceSession {
     const { host, logger, sessionId, sttLanguage, tts, stt, voice, voiceBridge, dictation } =
       options;
     this.host = host;
+    this.onIdle = options.onIdle;
     this.sessionLogger = logger;
     this.sessionId = sessionId;
     this.sttLanguage = sttLanguage ?? "en";
@@ -234,9 +238,20 @@ export class VoiceSession {
       stt: dictation?.stt ?? null,
       language: dictation?.sttLanguage,
       finalTimeoutMs: dictation?.finalTimeoutMs,
+      onIdle: this.onIdle,
     });
   }
 
+  get hasDemand(): boolean {
+    return (
+      this.isVoiceMode ||
+      this.dictationStreamManager.hasDemand ||
+      this.processingPhase !== "idle" ||
+      this.audioBuffer !== null ||
+      this.pendingAudioSegments.length > 0
+    );
+  }
+
   isActiveForAgent(agentId: string): boolean {
     return this.isVoiceMode && this.voiceModeAgentId === agentId;
   }
@@ -374,6 +389,10 @@ export class VoiceSession {
           );
           const refreshedAgentId = await this.enableVoiceModeForAgent(normalizedAgentId);
           this.voiceModeAgentId = refreshedAgentId;
+          if (this.closed) {
+            await this.disableVoiceModeForActiveAgent(true);
+            return;
+          }
           this.sessionLogger.info(
             { agentId: refreshedAgentId, elapsedMs: Date.now() - startedAt },
             "set_voice_mode agent enable complete",
@@ -389,7 +408,7 @@ export class VoiceSession {
           { agentId: this.voiceModeAgentId, elapsedMs: Date.now() - startedAt },
           "set_voice_mode voice turn controller started",
         );
-        this.isVoiceMode = true;
+        this.isVoiceMode = !this.closed;
         this.sessionLogger.info(
           {
             agentId: this.voiceModeAgentId,
@@ -473,6 +492,7 @@ export class VoiceSession {
     const startedAt = Date.now();
     this.sessionLogger.info({ agentId }, "enableVoiceModeForAgent.ensureAgentLoaded.start");
     const existing = await this.host.loadAgent(agentId);
+    if (this.closed) throw new Error("Voice source is closed");
     this.sessionLogger.info(
       { agentId, elapsedMs: Date.now() - startedAt },
       "enableVoiceModeForAgent.ensureAgentLoaded.done",
@@ -516,9 +536,6 @@ export class VoiceSession {
       return;
     }
 
-    this.unregisterVoiceSpeakHandler?.(agentId);
-    this.unregisterVoiceCallerContext?.(agentId);
-
     if (restoreAgentConfig && this.voiceModeBaseConfig) {
       const baseConfig = this.voiceModeBaseConfig;
       try {
@@ -533,6 +550,8 @@ export class VoiceSession {
       }
     }
 
+    this.unregisterVoiceSpeakHandler?.(agentId);
+    this.unregisterVoiceCallerContext?.(agentId);
     this.voiceModeBaseConfig = null;
     this.voiceModeAgentId = null;
   }
@@ -568,13 +587,9 @@ export class VoiceSession {
       sttLanguage: this.sttLanguage,
       callbacks: {
         onSpeechStarted: async () => {
+          // Voice STT providers return final transcripts only. Use the detector's
+          // confirmed speech event so interruption does not wait for transcription.
           this.sessionLogger.debug("Voice VAD speech_started");
-        },
-        onPartialTranscript: async ({ segmentId, transcript }) => {
-          this.sessionLogger.info(
-            { segmentId, transcriptLength: transcript.trim().length },
-            "voice_input_state emitting isSpeaking=true",
-          );
           this.emit({
             type: "voice_input_state",
             payload: {
@@ -583,6 +598,12 @@ export class VoiceSession {
           });
           await this.handleVoiceSpeechStart();
         },
+        onPartialTranscript: async ({ segmentId, transcript }) => {
+          this.sessionLogger.debug(
+            { segmentId, transcriptLength: transcript.trim().length },
+            "Voice partial transcript",
+          );
+        },
         onSpeechStopped: async () => {
           this.handleVoiceSpeechStopped();
           this.setPhase("transcribing");
@@ -636,8 +657,9 @@ export class VoiceSession {
     });
 
     this.sessionLogger.info("startVoiceTurnController connecting controller");
-    await controller.start();
     this.voiceTurnController = controller;
+    await controller.start();
+    if (this.closed) await controller.stop();
     this.sessionLogger.info("startVoiceTurnController connected");
   }
 
@@ -1038,7 +1060,9 @@ export class VoiceSession {
         },
         "Voice speak tool call received by session handler",
       );
-      const abortSignal = signal ?? this.abortController.signal;
+      const abortSignal = signal
+        ? AbortSignal.any([signal, this.abortController.signal])
+        : this.abortController.signal;
       await this.ttsManager.generateAndWaitForPlayback(
         text,
         (msg) => this.emit(msg),
@@ -1191,6 +1215,7 @@ export class VoiceSession {
    */
   private setPhase(phase: ProcessingPhase): void {
     this.processingPhase = phase;
+    if (phase === "idle") this.onIdle?.();
     this.sessionLogger.debug({ phase }, `Phase: ${phase}`);
   }
 
@@ -1238,6 +1263,7 @@ export class VoiceSession {
    * debug persistence before forwarding to the session emitter.
    */
   private emit(msg: SessionOutboundMessage): void {
+    if (this.closed) return;
     if (
       msg.type === "audio_output" &&
       (process.env.TTS_DEBUG_AUDIO_DIR || isPaseoDictationDebugEnabled()) &&
@@ -1289,21 +1315,40 @@ export class VoiceSession {
     this.host.emit(msg);
   }
 
-  /**
-   * Tear down all voice resources.
-   */
-  async cleanup(): Promise<void> {
+  /** Stop input synchronously, including a source disconnected during bootstrap. */
+  cancel(): void {
+    if (this.closed) return;
+    this.closed = true;
     this.abortController.abort();
     this.clearBufferTimeout();
     this.pendingAudioSegments = [];
     this.audioBuffer = null;
-    await this.stopVoiceTurnController();
+    const failures: unknown[] = [];
+    for (const cleanup of [
+      () => this.ttsManager.cleanup(),
+      () => this.sttManager.cleanup(),
+      () => this.dictationStreamManager.cleanupAll(),
+    ]) {
+      try {
+        cleanup();
+      } catch (error) {
+        failures.push(error);
+      }
+    }
+    if (failures.length) throw new AggregateError(failures, "Voice input cleanup failed");
+  }
 
-    this.ttsManager.cleanup();
-    this.sttManager.cleanup();
-    this.dictationStreamManager.cleanupAll();
-
-    await this.disableVoiceModeForActiveAgent(true);
-    this.isVoiceMode = false;
+  /** Restore the agent only after the caller has drained its in-flight requests. */
+  async cleanup(): Promise<void> {
+    try {
+      this.cancel();
+    } finally {
+      try {
+        await this.stopVoiceTurnController();
+      } finally {
+        await this.disableVoiceModeForActiveAgent(true);
+        this.isVoiceMode = false;
+      }
+    }
   }
 }
diff --git a/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.test.ts b/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.test.ts
index 1eb08a7022..04bcb75996 100644
--- a/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.test.ts
+++ b/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.test.ts
@@ -7,7 +7,6 @@ import type {
   WorkspaceGitRuntimeSnapshot,
   WorkspaceGitService,
 } from "../../workspace-git-service.js";
-import type { PersistedWorkspaceRecord } from "../../workspace-registry.js";
 import { createWorkspaceGitObserverService } from "./workspace-git-observer-service.js";
 
 // Watch targets are keyed by resolve(cwd), which is platform-dependent (POSIX vs Windows
@@ -46,10 +45,6 @@ function makeSnapshot(cwd: string, currentBranch: string | null): WorkspaceGitRu
   return { cwd, git: { currentBranch } } as unknown as WorkspaceGitRuntimeSnapshot;
 }
 
-function makeRecord(workspaceId: string): PersistedWorkspaceRecord {
-  return { workspaceId } as unknown as PersistedWorkspaceRecord;
-}
-
 function flushMicrotasks(): Promise<void> {
   return new Promise((done) => setImmediate(done));
 }
@@ -59,12 +54,9 @@ function buildHarness(opts: { emitCwdRejects?: boolean } = {}) {
   const registerCalls: string[] = [];
   const unsubscribeCalls: string[] = [];
   const emitCwdCalls: string[] = [];
-  const emitWorkspaceIdCalls: string[] = [];
   const statusCalls: Array<{ cwd: string; branch: string | null }> = [];
   const branchChanges: Array<[string, string | null, string | null]> = [];
   const warnCalls: unknown[][] = [];
-  const describeCalls: PersistedWorkspaceRecord[] = [];
-  let describeResult: WorkspaceDescriptorPayload | null = null;
 
   const workspaceGitService: Pick<WorkspaceGitService, "registerWorkspace"> = {
     registerWorkspace({ cwd }, listener) {
@@ -81,22 +73,12 @@ function buildHarness(opts: { emitCwdRejects?: boolean } = {}) {
 
   const service = createWorkspaceGitObserverService({
     workspaceGitService,
-    describeWorkspaceRecordWithGitData: async (workspace) => {
-      describeCalls.push(workspace);
-      if (!describeResult) {
-        throw new Error("describeResult not set");
-      }
-      return describeResult;
-    },
     emitWorkspaceUpdateForCwd: async (cwd) => {
       emitCwdCalls.push(cwd);
       if (opts.emitCwdRejects) {
         throw new Error("emit boom");
       }
     },
-    emitWorkspaceUpdateForWorkspaceId: async (workspaceId) => {
-      emitWorkspaceIdCalls.push(workspaceId);
-    },
     emitStatusUpdate: (cwd, snapshot) => {
       statusCalls.push({ cwd, branch: snapshot.git.currentBranch ?? null });
     },
@@ -120,14 +102,9 @@ function buildHarness(opts: { emitCwdRejects?: boolean } = {}) {
     registerCalls,
     unsubscribeCalls,
     emitCwdCalls,
-    emitWorkspaceIdCalls,
     statusCalls,
     branchChanges,
     warnCalls,
-    describeCalls,
-    setDescribeResult: (descriptor: WorkspaceDescriptorPayload) => {
-      describeResult = descriptor;
-    },
   };
 }
 
@@ -267,30 +244,6 @@ describe("git snapshot listener", () => {
   });
 });
 
-describe("shouldSkipUpdate", () => {
-  test("returns false when no observer exists for the workspace", () => {
-    const h = buildHarness();
-    expect(h.service.shouldSkipUpdate("unknown", null)).toBe(false);
-  });
-
-  test("skips a repeat descriptor state and re-emits when it changes", () => {
-    const h = buildHarness();
-    h.service.syncObservers([makeDescriptor({ id: "ws1", workspaceDirectory: WS1 })]);
-    const a = makeDescriptor({ id: "ws1", workspaceDirectory: WS1, name: "main" });
-    const b = makeDescriptor({ id: "ws1", workspaceDirectory: WS1, name: "feature" });
-    expect(h.service.shouldSkipUpdate("ws1", a)).toBe(false);
-    expect(h.service.shouldSkipUpdate("ws1", a)).toBe(true);
-    expect(h.service.shouldSkipUpdate("ws1", b)).toBe(false);
-  });
-
-  test("starts from the descriptor state recorded during observer sync", () => {
-    const h = buildHarness();
-    const descriptor = makeDescriptor({ id: "ws1", workspaceDirectory: WS1, name: "main" });
-    h.service.syncObservers([descriptor]);
-    expect(h.service.shouldSkipUpdate("ws1", descriptor)).toBe(true);
-  });
-});
-
 describe("recordDescriptorState", () => {
   test("does not treat a workspace title as a branch change", () => {
     const h = buildHarness();
@@ -385,26 +338,7 @@ describe("teardown", () => {
     h.service.syncObservers([makeDescriptor({ id: "ws1", workspaceDirectory: WS1 })]);
     h.service.dispose();
     const descriptor = makeDescriptor({ id: "ws1", workspaceDirectory: WS1, name: "main" });
-    expect(h.service.shouldSkipUpdate("ws1", descriptor)).toBe(false);
     h.service.recordDescriptorState("ws1", descriptor);
     expect(h.branchChanges).toEqual([]);
   });
 });
-
-describe("syncObserverForWorkspace / warmGitData", () => {
-  test("describes the record then registers the observer", async () => {
-    const h = buildHarness();
-    h.setDescribeResult(makeDescriptor({ id: "ws1", workspaceDirectory: WS1 }));
-    await h.service.syncObserverForWorkspace(makeRecord("ws1"));
-    expect(h.describeCalls).toEqual([makeRecord("ws1")]);
-    expect(h.registerCalls).toEqual([WS1]);
-  });
-
-  test("warmGitData registers the observer and emits a workspace update", async () => {
-    const h = buildHarness();
-    h.setDescribeResult(makeDescriptor({ id: "ws1", workspaceDirectory: WS1 }));
-    await h.service.warmGitData(makeRecord("ws1"));
-    expect(h.registerCalls).toEqual([WS1]);
-    expect(h.emitWorkspaceIdCalls).toEqual(["ws1"]);
-  });
-});
diff --git a/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.ts b/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.ts
index dfc87b312b..d657c63957 100644
--- a/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.ts
+++ b/packages/server/src/server/session/workspace-git-observer/workspace-git-observer-service.ts
@@ -5,9 +5,6 @@ import type {
   WorkspaceGitRuntimeSnapshot,
   WorkspaceGitService,
 } from "../../workspace-git-service.js";
-import type { PersistedWorkspaceRecord } from "../../workspace-registry.js";
-
-const WORKSPACE_GIT_WATCH_REMOVED_STATE_KEY = "__removed__";
 
 interface WorkspaceGitWatchTarget {
   workspaceIds: Set<string>;
@@ -15,7 +12,6 @@ interface WorkspaceGitWatchTarget {
 
 interface WorkspaceGitWatchState {
   cwd: string;
-  latestDescriptorStateKey: string | null;
   lastBranchName: string | null;
 }
 
@@ -39,11 +35,11 @@ export interface WorkspaceGitObserverMetrics {
  */
 export interface WorkspaceGitObserverService {
   syncObservers(workspaces: Iterable<WorkspaceDescriptorPayload>): void;
-  syncObserverForWorkspace(workspace: PersistedWorkspaceRecord): Promise<void>;
-  warmGitData(workspace: PersistedWorkspaceRecord): Promise<void>;
-  // Check-and-record dedupe gate: returns true when the descriptor state is unchanged
-  // for this workspace, and otherwise advances the recorded state key as a side effect.
-  shouldSkipUpdate(workspaceId: string, workspace: WorkspaceDescriptorPayload | null): boolean;
+  reconcileObservers(
+    workspaces: Iterable<
+      Pick<WorkspaceDescriptorPayload, "id" | "workspaceDirectory" | "workspaceKind">
+    >,
+  ): void;
   recordDescriptorState(workspaceId: string, workspace: WorkspaceDescriptorPayload | null): void;
   handleBranchSnapshot(cwd: string, branchName: string | null): void;
   getMetrics(): WorkspaceGitObserverMetrics;
@@ -53,11 +49,7 @@ export interface WorkspaceGitObserverService {
 
 export function createWorkspaceGitObserverService(deps: {
   workspaceGitService: Pick<WorkspaceGitService, "registerWorkspace">;
-  describeWorkspaceRecordWithGitData: (
-    workspace: PersistedWorkspaceRecord,
-  ) => Promise<WorkspaceDescriptorPayload>;
   emitWorkspaceUpdateForCwd: (cwd: string) => Promise<void>;
-  emitWorkspaceUpdateForWorkspaceId: (workspaceId: string) => Promise<void>;
   emitStatusUpdate: (cwd: string, snapshot: WorkspaceGitRuntimeSnapshot) => void;
   onBranchChanged?: (
     workspaceId: string,
@@ -68,9 +60,7 @@ export function createWorkspaceGitObserverService(deps: {
 }): WorkspaceGitObserverService {
   const {
     workspaceGitService,
-    describeWorkspaceRecordWithGitData,
     emitWorkspaceUpdateForCwd,
-    emitWorkspaceUpdateForWorkspaceId,
     emitStatusUpdate,
     onBranchChanged,
     logger,
@@ -80,16 +70,6 @@ export function createWorkspaceGitObserverService(deps: {
   const workspaceStates = new Map<string, WorkspaceGitWatchState>();
   const subscriptions = new Map<string, () => void>();
 
-  function descriptorStateKey(workspace: WorkspaceDescriptorPayload | null): string {
-    if (!workspace) {
-      return WORKSPACE_GIT_WATCH_REMOVED_STATE_KEY;
-    }
-    return JSON.stringify([
-      workspace.name,
-      workspace.diffStat ? [workspace.diffStat.additions, workspace.diffStat.deletions] : null,
-    ]);
-  }
-
   function rememberDescriptorState(
     workspaceId: string,
     workspace: WorkspaceDescriptorPayload | null,
@@ -98,7 +78,6 @@ export function createWorkspaceGitObserverService(deps: {
     if (!state) {
       return;
     }
-    state.latestDescriptorStateKey = descriptorStateKey(workspace);
     const currentBranch = workspace?.gitRuntime?.currentBranch;
     if (currentBranch !== undefined) {
       state.lastBranchName = currentBranch;
@@ -168,7 +147,6 @@ export function createWorkspaceGitObserverService(deps: {
     if (!workspaceStates.has(options.workspaceId)) {
       workspaceStates.set(options.workspaceId, {
         cwd: normalizedCwd,
-        latestDescriptorStateKey: null,
         lastBranchName: null,
       });
     }
@@ -206,33 +184,20 @@ export function createWorkspaceGitObserverService(deps: {
     }
   }
 
-  async function syncObserverForWorkspace(workspace: PersistedWorkspaceRecord): Promise<void> {
-    const descriptor = await describeWorkspaceRecordWithGitData(workspace);
-    syncObservers([descriptor]);
-  }
-
   return {
+    reconcileObservers(workspaces) {
+      const retained = new Map([...workspaces].map((workspace) => [workspace.id, workspace]));
+      for (const workspaceId of workspaceStates.keys()) {
+        if (!retained.has(workspaceId)) removeForWorkspaceId(workspaceId);
+      }
+      for (const workspace of retained.values()) {
+        syncObserver(workspace.workspaceDirectory, {
+          isGit: workspace.workspaceKind !== "directory",
+          workspaceId: workspace.id,
+        });
+      }
+    },
     syncObservers,
-    syncObserverForWorkspace,
-
-    async warmGitData(workspace) {
-      await syncObserverForWorkspace(workspace);
-      await emitWorkspaceUpdateForWorkspaceId(workspace.workspaceId);
-    },
-
-    shouldSkipUpdate(workspaceId, workspace) {
-      const state = workspaceStates.get(workspaceId);
-      if (!state) {
-        return false;
-      }
-      const nextStateKey = descriptorStateKey(workspace);
-      if (state.latestDescriptorStateKey === nextStateKey) {
-        return true;
-      }
-      state.latestDescriptorStateKey = nextStateKey;
-      return false;
-    },
-
     recordDescriptorState(workspaceId, nextWorkspace) {
       const state = workspaceStates.get(workspaceId);
       const newBranchName = nextWorkspace?.gitRuntime?.currentBranch;
diff --git a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
index 0dee0a08d0..2692250b49 100644
--- a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
+++ b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
@@ -1,9 +1,10 @@
 import os from "node:os";
 import path from "node:path";
-import { mkdirSync, mkdtempSync, rmSync, symlinkSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, statSync, symlinkSync } from "node:fs";
 
 import { afterEach, beforeEach, expect, test } from "vitest";
 
+import { getCheckoutStatus } from "../../../utils/checkout-git.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import {
   createNoGitWorkspaceRuntimeSnapshot,
@@ -16,6 +17,7 @@ import {
   createPersistedWorkspaceRecord,
   type WorkspaceRegistry,
 } from "../../workspace-registry.js";
+import { checkoutLiteFromGitSnapshot } from "../../workspace-registry-model.js";
 import type { CreatePaseoWorktreeWorkflowResult } from "../../worktree-session.js";
 import {
   createWorkspaceProvisioningService,
@@ -31,6 +33,15 @@ const logger = createTestLogger();
 const ARCHIVED_AT = "2026-01-01T00:00:00.000Z";
 const directorySymlinkType = process.platform === "win32" ? "junction" : "dir";
 
+// The real filesystem, so "this directory is gone" is observed rather than modelled.
+async function isDirectory(target: string): Promise<boolean> {
+  try {
+    return statSync(target).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
 let tmpDir: string;
 let gitRoots: Set<string>;
 let gitBranches: Map<string, string | null>;
@@ -106,6 +117,7 @@ beforeEach(async () => {
     workspaceRegistry,
     projectRegistry,
     workspaceGitService: gitService(),
+    isDirectory,
     logger,
   });
 });
@@ -133,6 +145,46 @@ test("fresh non-git directory creates a directory workspace at the exact path",
   expect(workspace.cwd).toBe(dir);
 });
 
+test("background workspace creation preserves hooks, inheritance and durable visibility", async () => {
+  const dir = path.join(tmpDir, "plain");
+  const events: string[] = [];
+  provisioning = createWorkspaceProvisioningService({
+    workspaceRegistry,
+    projectRegistry,
+    workspaceGitService: gitService(),
+    isDirectory,
+    logger,
+    lifecycle: {
+      emit: (name) => {
+        events.push(name);
+      },
+      before: async (_name, request) => request,
+    },
+  });
+  const parent = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    background: true,
+  });
+  const child = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    callerWorkspaceId: parent.workspaceId,
+  });
+  const visible = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    callerWorkspaceId: parent.workspaceId,
+    background: false,
+  });
+  const human = await provisioning.createWorkspaceForDirectory(dir);
+  expect(parent.background).toBe(true);
+  expect(child.background).toBe(true);
+  expect(visible.background).toBe(false);
+  expect(human.background).toBe(false);
+  expect(events).toEqual(Array(4).fill("workspace.created"));
+  const reloaded = new FileBackedWorkspaceRegistry(
+    path.join(tmpDir, "projects", "workspaces.json"),
+    logger,
+  );
+  await reloaded.initialize();
+  expect((await reloaded.get(child.workspaceId))?.background).toBe(true);
+});
+
 test("re-opening an active workspace by exact path returns the same record without duplicating", async () => {
   const repo = path.join(tmpDir, "repo");
   gitRoots.add(repo);
@@ -161,6 +213,7 @@ test("re-opening Windows-equivalent workspace cwd spellings reuses the active an
 
 test("re-opening refreshes mutable checkout metadata without renaming the workspace", async () => {
   const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
   const first = await provisioning.findOrCreateWorkspaceForDirectory(repo);
   await workspaceRegistry.upsert({ ...first, title: "Pinned work" });
   gitRoots.add(repo);
@@ -187,6 +240,7 @@ test("persists manual worktree ownership separately from its workspace kind", as
   const manualWorktreeProvisioning = createWorkspaceProvisioningService({
     workspaceRegistry,
     projectRegistry,
+    isDirectory,
     workspaceGitService: createNoopWorkspaceGitService({
       peekSnapshot: () => null,
       getCheckout: async () => ({
@@ -222,8 +276,33 @@ test("re-opening an archived workspace by its exact path unarchives it and keeps
   expect(reopened.archivedAt).toBeNull();
 });
 
+test("default directory open skips archived background workspaces while explicit recovery preserves their visibility", async () => {
+  const cwd = path.join(tmpDir, "repo");
+  mkdirSync(cwd, { recursive: true });
+  const background = await provisioning.createWorkspaceForDirectory(cwd, undefined, undefined, {
+    background: true,
+  });
+  await workspaceRegistry.archive(background.workspaceId, ARCHIVED_AT);
+
+  const opened = await provisioning.findOrCreateWorkspaceForDirectory(cwd);
+  expect(opened).toMatchObject({ background: false, archivedAt: null });
+  expect(opened.workspaceId).not.toBe(background.workspaceId);
+  const archived = await workspaceRegistry.get(background.workspaceId);
+  expect(archived).toMatchObject({ background: true, archivedAt: ARCHIVED_AT });
+  const recovered = await provisioning.ensureWorkspaceRecordUnarchived(archived!);
+  expect(recovered).toMatchObject({
+    workspaceId: background.workspaceId,
+    background: true,
+    archivedAt: null,
+  });
+  expect((await provisioning.findOrCreateWorkspaceForDirectory(cwd)).workspaceId).toBe(
+    opened.workspaceId,
+  );
+});
+
 test("reopening archived exact-root records restores the fresh Git project", async () => {
   const cwd = path.join(tmpDir, "repo");
+  mkdirSync(cwd, { recursive: true });
   const project = await projectRegistry.getOrCreateActiveByRoot({
     rootPath: cwd,
     kind: "non_git",
@@ -249,6 +328,7 @@ test("reopening archived exact-root records restores the fresh Git project", asy
   const archivedProvisioning = createWorkspaceProvisioningService({
     workspaceRegistry,
     projectRegistry,
+    isDirectory,
     workspaceGitService: createNoopWorkspaceGitService({
       peekSnapshot: () => null,
       getCheckout: async () => ({
@@ -279,6 +359,7 @@ test("reopening archived exact-root records restores the fresh Git project", asy
 
 test("uses one workspace snapshot when reopening an archived workspace", async () => {
   const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
   gitRoots.add(repo);
   const created = await provisioning.findOrCreateWorkspaceForDirectory(repo);
   await workspaceRegistry.archive(created.workspaceId, ARCHIVED_AT);
@@ -300,6 +381,7 @@ test("uses one workspace snapshot when reopening an archived workspace", async (
     workspaceRegistry: snapshotRegistry,
     projectRegistry,
     workspaceGitService: gitService(),
+    isDirectory,
   });
 
   const reopened = await snapshotProvisioning.findOrCreateWorkspaceForDirectory(repo);
@@ -310,6 +392,7 @@ test("uses one workspace snapshot when reopening an archived workspace", async (
 
 test("reopening an archived workspace refreshes placement without renaming it", async () => {
   const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
   gitRoots.add(repo);
   const created = await provisioning.findOrCreateWorkspaceForDirectory(repo);
   await workspaceRegistry.upsert({ ...created, title: "Pinned archived work" });
@@ -430,6 +513,7 @@ test("ensureWorkspaceRecordUnarchived refreshes the latch for a different merged
 
 test("does not unarchive either record when checkout refresh fails", async () => {
   const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
   gitRoots.add(repo);
   const created = await provisioning.findOrCreateWorkspaceForDirectory(repo);
   await projectRegistry.archive(created.projectId, ARCHIVED_AT);
@@ -767,3 +851,136 @@ test.each(["missing", "archived"] as const)(
     expect(await projectRegistry.list()).toEqual(previousProject ? [previousProject] : []);
   },
 );
+
+test("a failed import keeps an archived worktree's placement when its directory is gone", async () => {
+  // The git port here is the production read: getCheckoutStatus against the real
+  // filesystem, so "the worktree directory is gone" is observed, not modelled.
+  const mainRepoRoot = path.join(tmpDir, "main-repo");
+  mkdirSync(mainRepoRoot, { recursive: true });
+  const worktreeCwd = path.join(tmpDir, "worktrees", "feature-example");
+  const project = await projectRegistry.getOrCreateActiveByRoot({
+    rootPath: mainRepoRoot,
+    kind: "git",
+    displayName: "main-repo",
+    timestamp: ARCHIVED_AT,
+  });
+  const archived = createPersistedWorkspaceRecord({
+    workspaceId: "ws-archived-worktree",
+    projectId: project.projectId,
+    cwd: worktreeCwd,
+    kind: "worktree",
+    displayName: "feature/example",
+    branch: "feature/example",
+    worktreeRoot: worktreeCwd,
+    baseBranch: "main",
+    isPaseoOwnedWorktree: true,
+    mainRepoRoot,
+    createdAt: ARCHIVED_AT,
+    updatedAt: ARCHIVED_AT,
+    archivedAt: ARCHIVED_AT,
+  });
+  await workspaceRegistry.upsert(archived);
+  const realCheckoutProvisioning = createWorkspaceProvisioningService({
+    workspaceRegistry,
+    projectRegistry,
+    logger,
+    isDirectory,
+    workspaceGitService: createNoopWorkspaceGitService({
+      peekSnapshot: () => null,
+      getCheckout: async (cwd: string) => {
+        const status = await getCheckoutStatus(cwd, { logger });
+        return checkoutLiteFromGitSnapshot(
+          cwd,
+          status.isGit
+            ? {
+                isGit: true,
+                currentBranch: status.currentBranch,
+                remoteUrl: status.remoteUrl,
+                repoRoot: status.repoRoot,
+                isPaseoOwnedWorktree: status.isPaseoOwnedWorktree,
+                mainRepoRoot: status.mainRepoRoot,
+              }
+            : {
+                isGit: false,
+                currentBranch: null,
+                remoteUrl: null,
+                repoRoot: null,
+                isPaseoOwnedWorktree: false,
+                mainRepoRoot: null,
+              },
+        );
+      },
+    }),
+  });
+
+  await expect(
+    realCheckoutProvisioning.runInImportWorkspace({ cwd: worktreeCwd }, async () => {
+      throw new Error("provider resume failed");
+    }),
+  ).rejects.toThrow("provider resume failed");
+
+  expect(await workspaceRegistry.get(archived.workspaceId)).toMatchObject({
+    kind: "worktree",
+    branch: "feature/example",
+    worktreeRoot: worktreeCwd,
+    mainRepoRoot,
+    isPaseoOwnedWorktree: true,
+  });
+});
+
+test("re-opening an active worktree workspace keeps its placement while the directory is away", async () => {
+  const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
+  gitRoots.add(repo);
+  gitBranches.set(repo, "feature/away");
+  const created = await provisioning.findOrCreateWorkspaceForDirectory(repo);
+  expect(created).toMatchObject({ kind: "local_checkout", branch: "feature/away" });
+  rmSync(repo, { recursive: true, force: true });
+  gitRoots.delete(repo);
+
+  const reopened = await provisioning.findOrCreateWorkspaceForDirectory(repo);
+
+  expect(reopened).toMatchObject({
+    workspaceId: created.workspaceId,
+    kind: "local_checkout",
+    branch: "feature/away",
+  });
+});
+
+test("a directory that goes away while the git read is in flight keeps its placement", async () => {
+  const repo = path.join(tmpDir, "repo");
+  mkdirSync(repo, { recursive: true });
+  gitRoots.add(repo);
+  gitBranches.set(repo, "feature/vanishing");
+  const created = await provisioning.findOrCreateWorkspaceForDirectory(repo);
+  expect(created).toMatchObject({ kind: "local_checkout", branch: "feature/vanishing" });
+  const vanishingProvisioning = createWorkspaceProvisioningService({
+    workspaceRegistry,
+    projectRegistry,
+    isDirectory,
+    logger,
+    workspaceGitService: createNoopWorkspaceGitService({
+      peekSnapshot: () => null,
+      getCheckout: async (cwd: string) => {
+        rmSync(repo, { recursive: true, force: true });
+        return {
+          cwd,
+          isGit: false,
+          currentBranch: null,
+          remoteUrl: null,
+          worktreeRoot: null,
+          isPaseoOwnedWorktree: false,
+          mainRepoRoot: null,
+        };
+      },
+    }),
+  });
+
+  const reopened = await vanishingProvisioning.findOrCreateWorkspaceForDirectory(repo);
+
+  expect(reopened).toMatchObject({
+    workspaceId: created.workspaceId,
+    kind: "local_checkout",
+    branch: "feature/vanishing",
+  });
+});
diff --git a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
index eb9905016d..6dbcabdda6 100644
--- a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
+++ b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
@@ -1,4 +1,7 @@
+import type { PluginLifecycle } from "../../plugins/lifecycle/index.js";
+import { describeHookWorkspace } from "../../plugins/lifecycle/index.js";
 import { basename, resolve } from "node:path";
+import type { ProjectCheckoutLitePayload } from "@getpaseo/protocol/messages";
 import type { Logger } from "pino";
 import {
   generateWorkspaceId,
@@ -23,6 +26,8 @@ export interface ResolveOrCreateWorkspaceIdInput {
   requestedWorkspaceId?: string;
   cwd: string;
   initialTitle: string | null;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface ImportWorkspaceInput {
@@ -38,6 +43,7 @@ export interface ImportWorkspaceResult<T> {
 export interface CreateWorktreeWorkspaceInput {
   sourceCwd: string;
   projectId?: string;
+  workspaceId?: string;
   repoRoot: string;
   cwd: string;
   worktreeRoot: string;
@@ -46,6 +52,8 @@ export interface CreateWorktreeWorkspaceInput {
   title: string | null;
   expectsInitialAgent?: boolean;
   untrustedSource?: UntrustedWorkspaceSource;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface WorkspaceProvisioningService {
@@ -59,7 +67,12 @@ export interface WorkspaceProvisioningService {
     cwd: string,
     title?: string | null,
     projectId?: string,
-    context?: { expectsInitialAgent?: boolean },
+    context?: {
+      expectsInitialAgent?: boolean;
+      workspaceId?: string;
+      background?: boolean;
+      callerWorkspaceId?: string;
+    },
   ): Promise<PersistedWorkspaceRecord>;
   createWorkspaceForWorktree(
     input: CreateWorktreeWorkspaceInput,
@@ -91,10 +104,27 @@ export function createWorkspaceProvisioningService(deps: {
   workspaceRegistry: WorkspaceRegistry;
   projectRegistry: ProjectRegistry;
   workspaceGitService: Pick<WorkspaceGitService, "getCheckout" | "getSnapshot" | "peekSnapshot">;
+  isDirectory: (path: string) => Promise<boolean>;
   logger: Logger;
+  lifecycle?: PluginLifecycle;
 }): WorkspaceProvisioningService {
   const { serverId, workspaceRegistry, projectRegistry, workspaceGitService, logger } = deps;
 
+  /**
+   * Placement facts at a workspace directory, or null when there is nothing
+   * there to read. A git read answers "not a checkout" for a plain directory
+   * and for a directory that is gone, and only the first is evidence that a
+   * worktree stopped being one. That answer therefore counts only while the
+   * directory is there on both sides of the read, so a worktree removed or
+   * unmounted while the read is in flight stays an absence.
+   */
+  async function observeWorkspaceCheckout(cwd: string): Promise<ProjectCheckoutLitePayload | null> {
+    if (!(await deps.isDirectory(cwd))) return null;
+    const checkout = await workspaceGitService.getCheckout(cwd);
+    if (!checkout.isGit && !(await deps.isDirectory(cwd))) return null;
+    return checkout;
+  }
+
   async function runInImportWorkspace<T>(
     input: ImportWorkspaceInput,
     operation: (workspace: PersistedWorkspaceRecord) => Promise<T>,
@@ -194,11 +224,27 @@ export function createWorkspaceProvisioningService(deps: {
     return project;
   }
 
+  async function resolveBackground(input?: {
+    background?: boolean;
+    callerWorkspaceId?: string;
+  }): Promise<boolean> {
+    if (input?.background !== undefined) return input.background;
+    if (!input?.callerWorkspaceId) return false;
+    const callerWorkspace = await workspaceRegistry.get(input.callerWorkspaceId);
+    if (!callerWorkspace) throw new Error(`Caller workspace ${input.callerWorkspaceId} not found`);
+    return callerWorkspace.background;
+  }
+
   async function createWorkspaceForDirectory(
     cwd: string,
     title?: string | null,
     projectId?: string,
-    context?: { expectsInitialAgent?: boolean },
+    context?: {
+      expectsInitialAgent?: boolean;
+      workspaceId?: string;
+      background?: boolean;
+      callerWorkspaceId?: string;
+    },
   ): Promise<PersistedWorkspaceRecord> {
     const normalizedCwd = resolve(cwd);
     const checkout = await workspaceGitService.getCheckout(normalizedCwd);
@@ -208,14 +254,18 @@ export function createWorkspaceProvisioningService(deps: {
         await findOrCreateProjectForDirectory(normalizedCwd);
     const timestamp = new Date().toISOString();
     const workspace = createPersistedWorkspaceRecord({
-      workspaceId: generateWorkspaceId(),
+      workspaceId: context?.workspaceId ?? generateWorkspaceId(),
       projectId: project.projectId,
       ...initialWorkspacePlacement({ source: "checkout", cwd: normalizedCwd, checkout }),
       title: title?.trim() || null,
       createdAt: timestamp,
       updatedAt: timestamp,
+      background: await resolveBackground(context),
     });
-    await workspaceRegistry.upsert(workspace, context);
+    await workspaceRegistry.upsert(workspace, {
+      expectsInitialAgent: context?.expectsInitialAgent,
+    });
+    emitWorkspaceCreated(workspace);
     return workspace;
   }
 
@@ -233,7 +283,7 @@ export function createWorkspaceProvisioningService(deps: {
     });
     const timestamp = new Date().toISOString();
     const workspace = createPersistedWorkspaceRecord({
-      workspaceId: generateWorkspaceId(),
+      workspaceId: input.workspaceId ?? generateWorkspaceId(),
       projectId: project.projectId,
       ...initialWorkspacePlacement({
         source: "created_worktree",
@@ -247,13 +297,19 @@ export function createWorkspaceProvisioningService(deps: {
       createdAt: timestamp,
       updatedAt: timestamp,
       ...(input.untrustedSource ? { untrustedSource: input.untrustedSource } : {}),
+      background: await resolveBackground(input),
     });
     await workspaceRegistry.upsert(workspace, {
       expectsInitialAgent: input.expectsInitialAgent,
     });
+    emitWorkspaceCreated(workspace);
     return workspace;
   }
 
+  function emitWorkspaceCreated(workspace: PersistedWorkspaceRecord): void {
+    deps.lifecycle?.emit("workspace.created", { workspace: describeHookWorkspace(workspace) });
+  }
+
   async function resolveSourceProjectForWorktree(input: {
     sourceCwd: string;
     projectId?: string;
@@ -297,26 +353,19 @@ export function createWorkspaceProvisioningService(deps: {
 
   async function findOrCreateWorkspaceForDirectory(cwd: string): Promise<PersistedWorkspaceRecord> {
     const normalizedCwd = resolve(cwd);
-    const workspaces = await workspaceRegistry.list();
-    const active = workspaces
+    // Path-based discovery selects public work; explicit-ID recovery bypasses this selector.
+    const workspaces = (await workspaceRegistry.list())
       .filter(
-        (workspace) => !workspace.archivedAt && areEquivalentPaths(workspace.cwd, normalizedCwd),
+        (workspace) => !workspace.background && areEquivalentPaths(workspace.cwd, normalizedCwd),
       )
       .sort(
         (left, right) =>
           Date.parse(left.createdAt) - Date.parse(right.createdAt) ||
           left.workspaceId.localeCompare(right.workspaceId),
-      )[0];
+      );
+    const active = workspaces.find((workspace) => !workspace.archivedAt);
     if (active) return refreshWorkspaceRecord(active);
-    const archived = workspaces
-      .filter(
-        (workspace) => workspace.archivedAt && areEquivalentPaths(workspace.cwd, normalizedCwd),
-      )
-      .sort(
-        (left, right) =>
-          Date.parse(left.createdAt) - Date.parse(right.createdAt) ||
-          left.workspaceId.localeCompare(right.workspaceId),
-      )[0];
+    const archived = workspaces.find((workspace) => workspace.archivedAt);
     if (archived) {
       const project = await projectRegistry.get(archived.projectId);
       if (project && !project.archivedAt) return ensureWorkspaceRecordUnarchived(archived);
@@ -332,6 +381,8 @@ export function createWorkspaceProvisioningService(deps: {
     return (
       await createWorkspaceForDirectory(input.cwd, input.initialTitle, undefined, {
         expectsInitialAgent: true,
+        background: input.background,
+        callerWorkspaceId: input.callerWorkspaceId,
       })
     ).workspaceId;
   }
@@ -360,12 +411,12 @@ export function createWorkspaceProvisioningService(deps: {
     const timestamp = new Date().toISOString();
     const checkout =
       workspace.archivedAt || project.archivedAt
-        ? await workspaceGitService.getCheckout(workspace.cwd)
+        ? await observeWorkspaceCheckout(workspace.cwd)
         : null;
     const autoArchivedChangeRequestUrl =
       await resolveRestoredAutoArchiveChangeRequestUrl(workspace);
     let next: PersistedWorkspaceRecord | null = null;
-    if (workspace.archivedAt && checkout) {
+    if (workspace.archivedAt) {
       const placementUpdate = reconcileWorkspacePlacement({
         workspace,
         checkout,
@@ -378,10 +429,11 @@ export function createWorkspaceProvisioningService(deps: {
         updatedAt: timestamp,
       };
     }
-    if (checkout && (project.archivedAt || workspace.archivedAt)) {
-      const projectCheckout = areEquivalentPaths(project.rootPath, workspace.cwd)
-        ? checkout
-        : await workspaceGitService.getCheckout(project.rootPath);
+    if (project.archivedAt || workspace.archivedAt) {
+      const projectCheckout =
+        checkout && areEquivalentPaths(project.rootPath, workspace.cwd)
+          ? checkout
+          : await workspaceGitService.getCheckout(project.rootPath);
       const kind = projectCheckout.isGit ? "git" : "non_git";
       const projectKey = deriveProjectKey({
         rootPath: project.rootPath,
@@ -408,10 +460,10 @@ export function createWorkspaceProvisioningService(deps: {
   async function refreshWorkspaceRecord(
     workspace: PersistedWorkspaceRecord,
   ): Promise<PersistedWorkspaceRecord> {
-    const checkout = await workspaceGitService.getCheckout(workspace.cwd);
+    const checkout = await observeWorkspaceCheckout(workspace.cwd);
     const project = await projectRegistry.get(workspace.projectId);
     if (project && !project.archivedAt) {
-      await refreshProjectKind(project, workspace.cwd, checkout);
+      await refreshProjectKind(project, workspace.cwd, checkout ?? undefined);
     }
     const update = reconcileWorkspacePlacement({
       workspace,
diff --git a/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.test.ts b/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.test.ts
index 91631a5631..964f305eb8 100644
--- a/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.test.ts
+++ b/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.test.ts
@@ -13,8 +13,16 @@ import { join } from "node:path";
 
 import { afterEach, describe, expect, test } from "vitest";
 
-import { createWorktree } from "../../../utils/worktree.js";
+import pino from "pino";
+import { archivePersistedWorkspaceRecord } from "../../workspace-archive-service.js";
+import { getCheckoutStatus } from "../../../utils/checkout-git.js";
 import {
+  readPaseoWorktreeMetadata,
+  writePaseoWorktreeMetadata,
+} from "../../../utils/worktree-metadata.js";
+import { createWorktree, deletePaseoWorktree } from "../../../utils/worktree.js";
+import {
+  FileBackedWorkspaceRegistry,
   createPersistedProjectRecord,
   createPersistedWorkspaceRecord,
   type PersistedProjectRecord,
@@ -286,3 +294,186 @@ function createGitRepository(): { tempDir: string; repoDir: string } {
   execFileSync("git", ["commit", "-m", "initial"], { cwd: repoDir, stdio: "pipe" });
   return { tempDir, repoDir };
 }
+
+async function createBaseRecoveryFixture(baseBranch: string | null) {
+  const { tempDir, repoDir } = createGitRepository();
+  const paseoHome = join(tempDir, "paseo-home");
+  const created = await createWorktree({
+    cwd: repoDir,
+    paseoHome,
+    worktreeSlug: "base-recovery",
+    source: { kind: "branch-off", branchName: "feature", baseBranch: "main" },
+    runSetup: false,
+  });
+  writeFileSync(join(created.worktreePath, "feature.txt"), "feature\n");
+  execFileSync("git", ["add", "."], { cwd: created.worktreePath });
+  execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "feature"], {
+    cwd: created.worktreePath,
+    stdio: "pipe",
+  });
+  const workspace = createWorkspace({
+    workspaceId: "base-recovery",
+    cwd: created.worktreePath,
+    worktreeRoot: created.worktreePath,
+    mainRepoRoot: repoDir,
+    branch: "feature",
+    baseBranch,
+    archivedAt: null,
+  });
+  const project = createProject({ rootPath: repoDir });
+  const registry = new FileBackedWorkspaceRegistry(
+    join(tempDir, "workspaces.json"),
+    pino({ level: "silent" }),
+  );
+  await registry.upsert(workspace);
+  const service = createWorkspaceRecoveryService({
+    paseoHome,
+    getWorkspace: (id) => registry.get(id),
+    getProject: async () => project,
+    isDirectory: async (target) => existsSync(target) && statSync(target).isDirectory(),
+    unarchiveWorkspace: async (record) => {
+      await registry.update(record.workspaceId, (value) => ({ ...value, archivedAt: null }));
+    },
+  });
+  async function archiveAndRemove() {
+    await archivePersistedWorkspaceRecord({
+      workspaceId: workspace.workspaceId,
+      workspaceRegistry: registry,
+    });
+    await deletePaseoWorktree({ cwd: repoDir, worktreePath: workspace.cwd, paseoHome });
+    expect(existsSync(workspace.cwd)).toBe(false);
+  }
+  return { workspace, registry, service, paseoHome, repoDir, tempDir, archiveAndRemove };
+}
+
+test("preserves ordinary checkout behavior when no separate base was recorded", async () => {
+  const fixture = await createBaseRecoveryFixture(null);
+  writePaseoWorktreeMetadata(fixture.workspace.cwd, { baseRefName: "feature" });
+  await fixture.archiveAndRemove();
+  await fixture.service.restore(fixture.workspace.workspaceId);
+  expect((await fixture.registry.get(fixture.workspace.workspaceId))?.baseBranch).toBeNull();
+  expect(
+    await getCheckoutStatus(fixture.workspace.cwd, { paseoHome: fixture.paseoHome }),
+  ).toMatchObject({ currentBranch: "feature", baseRef: "feature" });
+});
+
+test("restores a branchless workspace from its recorded base so work can continue", async () => {
+  const fixture = await createBaseRecoveryFixture("refs/heads/release");
+  execFileSync("git", ["switch", "-c", "release"], { cwd: fixture.repoDir, stdio: "pipe" });
+  writeFileSync(join(fixture.repoDir, "release.txt"), "release\n");
+  execFileSync("git", ["add", "release.txt"], { cwd: fixture.repoDir, stdio: "pipe" });
+  execFileSync("git", ["commit", "-m", "release"], { cwd: fixture.repoDir, stdio: "pipe" });
+  execFileSync("git", ["switch", "main"], { cwd: fixture.repoDir, stdio: "pipe" });
+  await fixture.registry.update(fixture.workspace.workspaceId, (workspace) => ({
+    ...workspace,
+    branch: null,
+  }));
+  await fixture.archiveAndRemove();
+
+  await expect(fixture.service.inspect(fixture.workspace.workspaceId)).resolves.toMatchObject({
+    kind: "recoverable",
+    action: "restore",
+    branch: null,
+  });
+  await expect(fixture.service.restore(fixture.workspace.workspaceId)).resolves.toEqual({
+    workspaceId: fixture.workspace.workspaceId,
+    action: "restore",
+  });
+
+  const checkout = await getCheckoutStatus(fixture.workspace.cwd, { paseoHome: fixture.paseoHome });
+  expect(checkout.currentBranch).toBeTruthy();
+  expect(checkout.currentBranch).not.toBe("feature");
+  expect(
+    execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: fixture.workspace.cwd,
+      encoding: "utf8",
+    }).trim(),
+  ).toBe(
+    execFileSync("git", ["rev-parse", "release"], {
+      cwd: fixture.repoDir,
+      encoding: "utf8",
+    }).trim(),
+  );
+});
+
+test("restores a branchless workspace from the repository default when its base is missing", async () => {
+  const fixture = await createBaseRecoveryFixture("refs/heads/deleted-base");
+  await fixture.registry.update(fixture.workspace.workspaceId, (workspace) => ({
+    ...workspace,
+    branch: null,
+  }));
+  await fixture.archiveAndRemove();
+
+  await expect(fixture.service.restore(fixture.workspace.workspaceId)).resolves.toEqual({
+    workspaceId: fixture.workspace.workspaceId,
+    action: "restore",
+  });
+  expect(
+    execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: fixture.workspace.cwd,
+      encoding: "utf8",
+    }).trim(),
+  ).toBe(
+    execFileSync("git", ["rev-parse", "main"], { cwd: fixture.repoDir, encoding: "utf8" }).trim(),
+  );
+});
+
+test("restores the branch HEAD with a base name when the exact base is missing", async () => {
+  const fixture = await createBaseRecoveryFixture("refs/remotes/upstream/main");
+  const headBeforeArchive = execFileSync("git", ["rev-parse", "HEAD"], {
+    cwd: fixture.workspace.cwd,
+    encoding: "utf8",
+  }).trim();
+  await fixture.archiveAndRemove();
+  await expect(fixture.service.restore(fixture.workspace.workspaceId)).resolves.toEqual({
+    workspaceId: fixture.workspace.workspaceId,
+    action: "restore",
+  });
+  expect(existsSync(fixture.workspace.cwd)).toBe(true);
+  expect((await fixture.registry.get(fixture.workspace.workspaceId))?.archivedAt).toBeNull();
+  const metadata = readPaseoWorktreeMetadata(fixture.workspace.cwd);
+  expect(metadata).toMatchObject({ baseRefName: "main" });
+  expect(metadata?.baseRef).toBeUndefined();
+  expect(
+    execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: fixture.workspace.cwd,
+      encoding: "utf8",
+    }).trim(),
+  ).toBe(headBeforeArchive);
+});
+
+test("restore fetches a deleted local branch from origin and retains its base", async () => {
+  const fixture = await createBaseRecoveryFixture("refs/heads/main");
+  const remote = join(fixture.tempDir, "remote.git");
+  execFileSync("git", ["init", "--bare", remote], { stdio: "pipe" });
+  execFileSync("git", ["remote", "add", "origin", remote], { cwd: fixture.repoDir });
+  execFileSync("git", ["push", "origin", "feature"], { cwd: fixture.repoDir, stdio: "pipe" });
+  await fixture.archiveAndRemove();
+  execFileSync("git", ["branch", "-D", "feature"], { cwd: fixture.repoDir });
+  await fixture.service.restore(fixture.workspace.workspaceId);
+  expect(readPaseoWorktreeMetadata(fixture.workspace.cwd)?.baseRef).toBe("refs/heads/main");
+  expect(
+    await getCheckoutStatus(fixture.workspace.cwd, { paseoHome: fixture.paseoHome }),
+  ).toMatchObject({
+    currentBranch: "feature",
+    baseRef: "main",
+    aheadBehind: { ahead: 1, behind: 0 },
+  });
+});
+
+test("restore rejects a branch checked out elsewhere without inventing another branch", async () => {
+  const fixture = await createBaseRecoveryFixture("refs/heads/main");
+  await fixture.archiveAndRemove();
+  execFileSync("git", ["switch", "feature"], { cwd: fixture.repoDir, stdio: "pipe" });
+  await expect(fixture.service.restore(fixture.workspace.workspaceId)).rejects.toThrow(
+    /already checked out/,
+  );
+  expect(existsSync(fixture.workspace.cwd)).toBe(false);
+  expect((await fixture.registry.get(fixture.workspace.workspaceId))?.archivedAt).not.toBeNull();
+  expect(
+    execFileSync("git", ["branch", "--list", "feature*"], {
+      cwd: fixture.repoDir,
+      encoding: "utf8",
+    }).trim(),
+  ).toBe("* feature");
+});
diff --git a/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.ts b/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.ts
index 1d98a9128c..8b0e9a853a 100644
--- a/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.ts
+++ b/packages/server/src/server/session/workspace-recovery/workspace-recovery-service.ts
@@ -1,5 +1,7 @@
+import { randomUUID } from "node:crypto";
 import { basename } from "node:path";
 
+import { resolveRepositoryDefaultBranch } from "../../../utils/checkout-git.js";
 import { createRealpathAwarePathMatcher } from "../../../utils/path.js";
 import { runGitCommand } from "../../../utils/run-git-command.js";
 import {
@@ -7,6 +9,7 @@ import {
   isPaseoOwnedWorktreeCwd,
   mapWorkspaceCwdToWorktree,
   rollbackCreatedPaseoWorktree,
+  type WorktreeSource,
 } from "../../../utils/worktree.js";
 import { WorktreeRequestError, toWorktreeRequestError } from "../../worktree-errors.js";
 import {
@@ -109,15 +112,6 @@ export function createWorkspaceRecoveryService(deps: {
         message: "The archived workspace directory no longer exists and cannot be recreated.",
       };
     }
-    if (!workspace.branch) {
-      return {
-        kind: "unavailable",
-        workspaceId,
-        reason: "worktree_branch_missing",
-        message: "The archived worktree has no branch recorded, so it cannot be restored.",
-      };
-    }
-
     // COMPAT(worktreeRestoreMissingMainRepoRoot): records created before v0.1.110
     // lack placement ownership; remove the project-root fallback after 2027-01-17.
     const sourceRepoRoot = workspace.mainRepoRoot ?? project.rootPath;
@@ -157,13 +151,13 @@ export function createWorkspaceRecoveryService(deps: {
     workspace: PersistedWorkspaceRecord,
     sourceRepoRoot: string,
   ): Promise<void> {
-    const branch = workspace.branch;
-    if (!branch) {
-      throw new WorktreeRequestError({
-        code: "unknown",
-        message: `Workspace ${workspace.workspaceId} has no branch to restore`,
-      });
-    }
+    const source: WorktreeSource = workspace.branch
+      ? { kind: "restore", branchName: workspace.branch, baseRef: workspace.baseBranch }
+      : {
+          kind: "restore-from-base",
+          branchName: `restored/${randomUUID().slice(0, 8)}`,
+          baseRef: await resolveRecoveryBase(sourceRepoRoot, workspace.baseBranch),
+        };
 
     try {
       await runGitCommand(["worktree", "prune"], { cwd: sourceRepoRoot, timeout: 30_000 });
@@ -189,7 +183,7 @@ export function createWorkspaceRecoveryService(deps: {
       const result = await createWorktree({
         cwd: sourceRepoRoot,
         worktreeSlug: basename(previousWorktreePath),
-        source: { kind: "checkout-branch", branchName: branch },
+        source,
         runSetup: false,
         paseoHome: deps.paseoHome,
         worktreesRoot: deps.worktreesRoot,
@@ -234,6 +228,26 @@ export function createWorkspaceRecoveryService(deps: {
   return { inspect, restore };
 }
 
+async function resolveRecoveryBase(repoRoot: string, recordedBase: string | null): Promise<string> {
+  if (recordedBase) {
+    try {
+      await runGitCommand(["rev-parse", "--verify", `${recordedBase}^{commit}`], { cwd: repoRoot });
+      return recordedBase;
+    } catch {
+      // The saved base was removed; use the repository default for continued work.
+    }
+  }
+  const defaultBranch = await resolveRepositoryDefaultBranch(repoRoot);
+  if (!defaultBranch) {
+    throw new WorktreeRequestError({
+      code: "unknown",
+      message:
+        "The saved base is unavailable and the repository has no default branch to restore from.",
+    });
+  }
+  return defaultBranch;
+}
+
 function createRecoveryPlan(
   input:
     | { action: "unarchive"; workspace: PersistedWorkspaceRecord }
diff --git a/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.test.ts b/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.test.ts
index 0ba8a0169b..aa366a3495 100644
--- a/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.test.ts
+++ b/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.test.ts
@@ -3,7 +3,11 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { pino } from "pino";
 import { afterEach, describe, expect, test } from "vitest";
-import type { SessionOutboundMessage, StartWorkspaceScriptRequest } from "../../messages.js";
+import type {
+  ScriptStatusUpdateMessage,
+  SessionOutboundMessage,
+  StartWorkspaceScriptRequest,
+} from "../../messages.js";
 import { createServiceProxySubsystem, type ServiceProxySubsystem } from "../../service-proxy.js";
 import type { TerminalManager } from "../../../terminal/terminal-manager.js";
 import type {
@@ -82,6 +86,7 @@ interface BuildOptions {
 
 function buildService(options: BuildOptions = {}) {
   const emitted: SessionOutboundMessage[] = [];
+  const published: ScriptStatusUpdateMessage[] = [];
   const spawnCalls: SpawnWorkspaceScriptOptions[] = [];
   const workspace =
     options.workspace === undefined
@@ -108,6 +113,7 @@ function buildService(options: BuildOptions = {}) {
     resolveScriptHealth: null,
     logger,
     emit: (message) => emitted.push(message),
+    publishStatusUpdate: (message) => published.push(message),
     async spawnWorkspaceScript(spawnOptions): Promise<WorktreeScriptResult> {
       spawnCalls.push(spawnOptions);
       if (options.spawnThrows) {
@@ -126,7 +132,7 @@ function buildService(options: BuildOptions = {}) {
     },
   });
 
-  return { service, emitted, spawnCalls };
+  return { service, emitted, published, spawnCalls };
 }
 
 const request: StartWorkspaceScriptRequest = {
@@ -215,10 +221,11 @@ describe("buildSnapshot", () => {
 });
 
 describe("emitStatusUpdate", () => {
-  test("emits one script_status_update carrying the snapshot", async () => {
-    const { service, emitted } = buildService();
+  test("publishes one script_status_update carrying the snapshot", async () => {
+    const { service, emitted, published } = buildService();
     await service.emitStatusUpdate("ws-1", "/tmp/repo");
-    expect(emitted).toEqual([
+    expect(emitted).toEqual([]);
+    expect(published).toEqual([
       { type: "script_status_update", payload: { workspaceId: "ws-1", scripts: [] } },
     ]);
   });
@@ -332,7 +339,7 @@ describe("start", () => {
   });
 
   test("spawns the script with resolved git metadata and reports success", async () => {
-    const { service, emitted, spawnCalls } = buildService();
+    const { service, emitted, published, spawnCalls } = buildService();
     await service.start(request);
 
     expect(spawnCalls).toHaveLength(1);
@@ -345,7 +352,7 @@ describe("start", () => {
       daemonPort: 6767,
       daemonListenHost: "127.0.0.1",
     });
-    expect(emitted).toContainEqual({
+    expect(published).toContainEqual({
       type: "script_status_update",
       payload: { workspaceId: "ws-1", scripts: [] },
     });
diff --git a/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.ts b/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.ts
index 7dee9364f9..d449a48855 100644
--- a/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.ts
+++ b/packages/server/src/server/session/workspace-scripts/workspace-scripts-service.ts
@@ -1,5 +1,6 @@
 import type pino from "pino";
 import type {
+  ScriptStatusUpdateMessage,
   SessionOutboundMessage,
   StartWorkspaceScriptRequest,
   WorkspaceDescriptorPayload,
@@ -31,7 +32,7 @@ type WorkspaceScriptsPayload = WorkspaceDescriptorPayload["scripts"];
 
 /**
  * The service-proxy-backed scripts a workspace exposes: build the scripts payload
- * snapshot, emit a script_status_update to clients, and start a script.
+ * snapshot, publish a script_status_update to every client, and start a script.
  *
  * The workspace descriptor builder, the script-status emission path, and the
  * start-script RPC all funnel through one assembly of buildWorkspaceScriptPayloads'
@@ -66,6 +67,8 @@ export function createWorkspaceScriptsService(deps: {
   globalServicePorts?: PaseoServicePortAllocation;
   logger: pino.Logger;
   emit: (message: SessionOutboundMessage) => void;
+  // Script status is daemon state, so it reaches every client, not only the requester.
+  publishStatusUpdate: (message: ScriptStatusUpdateMessage) => void;
   spawnWorkspaceScript: (options: SpawnWorkspaceScriptOptions) => Promise<WorktreeScriptResult>;
   assertAutomationAllowed: (workspaceId: string) => Promise<void>;
 }): WorkspaceScriptsService {
@@ -83,6 +86,7 @@ export function createWorkspaceScriptsService(deps: {
     globalServicePorts,
     logger,
     emit,
+    publishStatusUpdate,
     spawnWorkspaceScript,
     assertAutomationAllowed,
   } = deps;
@@ -133,7 +137,7 @@ export function createWorkspaceScriptsService(deps: {
       const workspace = await workspaceRegistry.get(workspaceId);
       if (!workspace) return;
       const project = await projectRegistry.get(workspace.projectId);
-      emit({
+      publishStatusUpdate({
         type: "script_status_update",
         payload: { workspaceId, scripts: buildSnapshot(workspace, project) },
       });
diff --git a/packages/server/src/server/snapshot-mutation-ownership.test.ts b/packages/server/src/server/snapshot-mutation-ownership.test.ts
index b08ca5e6d0..2cfe5d3e18 100644
--- a/packages/server/src/server/snapshot-mutation-ownership.test.ts
+++ b/packages/server/src/server/snapshot-mutation-ownership.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 import os from "node:os";
 import path from "node:path";
 import { mkdtempSync, rmSync } from "node:fs";
@@ -99,6 +103,8 @@ describe("snapshot mutation ownership boundary", () => {
 
     const session = asInternals<SessionInternals>(
       new Session({
+        messageReceipts: createMessageReceiptsStub(),
+        creationService: createTestCreationService(),
         clientId: "test-client",
         permissions: OWNER_PERMISSIONS,
         onMessage,
diff --git a/packages/server/src/server/speech/providers/local/models.test.ts b/packages/server/src/server/speech/providers/local/models.test.ts
new file mode 100644
index 0000000000..e40cc25384
--- /dev/null
+++ b/packages/server/src/server/speech/providers/local/models.test.ts
@@ -0,0 +1,70 @@
+import { execFileSync } from "node:child_process";
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  truncateSync,
+  writeFileSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import pino from "pino";
+import { describe, expect, onTestFinished, test } from "vitest";
+
+import {
+  ensureLocalSpeechModels,
+  getLocalSpeechModelDir,
+  listLocalSpeechModels,
+  listMissingLocalSpeechModels,
+} from "./models.js";
+
+const logger = pino({ level: "silent" });
+const modelId = "parakeet-tdt-0.6b-v2-int8";
+const spec = listLocalSpeechModels().find((model) => model.id === modelId)!;
+
+function writeCompleteModel(modelDir: string): void {
+  mkdirSync(modelDir, { recursive: true });
+  for (const file of spec.requiredFiles) {
+    writeFileSync(path.join(modelDir, file), `complete ${file}`.padEnd(64_000, "."));
+  }
+}
+
+function setupModelsDirWithArchive(): { modelsDir: string; modelDir: string; archive: string } {
+  const root = mkdtempSync(path.join(tmpdir(), "paseo-local-models-"));
+  onTestFinished(() => rmSync(root, { recursive: true, force: true }));
+  const sourceRoot = path.join(root, "source");
+  writeCompleteModel(path.join(sourceRoot, spec.extractedDir));
+  const modelsDir = path.join(root, "models");
+  const archive = path.join(
+    modelsDir,
+    ".downloads",
+    path.basename(new URL(spec.archiveUrl).pathname),
+  );
+  mkdirSync(path.dirname(archive), { recursive: true });
+  execFileSync("tar", ["cf", archive, "-C", sourceRoot, spec.extractedDir]);
+  return { modelsDir, modelDir: getLocalSpeechModelDir(modelsDir, modelId), archive };
+}
+
+describe("local speech models", () => {
+  test("reinstalls a model whose extraction was interrupted", async () => {
+    // An interrupted extraction leaves the archive in .downloads and a truncated file in place.
+    const { modelsDir, modelDir, archive } = setupModelsDirWithArchive();
+    writeCompleteModel(modelDir);
+    const encoder = path.join(modelDir, spec.requiredFiles[0]);
+    truncateSync(encoder, 1_000);
+
+    expect(await listMissingLocalSpeechModels({ modelsDir, modelIds: [modelId] })).toEqual([
+      modelId,
+    ]);
+
+    await ensureLocalSpeechModels({ modelsDir, modelIds: [modelId], logger });
+
+    expect(readFileSync(encoder, "utf8")).toBe(
+      `complete ${spec.requiredFiles[0]}`.padEnd(64_000, "."),
+    );
+    expect(existsSync(archive)).toBe(false);
+    expect(await listMissingLocalSpeechModels({ modelsDir, modelIds: [modelId] })).toEqual([]);
+  });
+});
diff --git a/packages/server/src/server/speech/providers/local/models.ts b/packages/server/src/server/speech/providers/local/models.ts
index f6c7cc4e4e..a884be86d7 100644
--- a/packages/server/src/server/speech/providers/local/models.ts
+++ b/packages/server/src/server/speech/providers/local/models.ts
@@ -1,4 +1,8 @@
-import { ensureSherpaOnnxModels, getSherpaOnnxModelDir } from "./sherpa/model-downloader.js";
+import {
+  ensureSherpaOnnxModels,
+  getSherpaOnnxModelDir,
+  isSherpaOnnxModelInstalled,
+} from "./sherpa/model-downloader.js";
 import {
   DEFAULT_LOCAL_STT_MODEL,
   DEFAULT_LOCAL_TTS_MODEL,
@@ -30,6 +34,16 @@ export function getLocalSpeechModelDir(modelsDir: string, modelId: LocalSpeechMo
   return getSherpaOnnxModelDir(modelsDir, modelId);
 }
 
+export async function listMissingLocalSpeechModels(options: {
+  modelsDir: string;
+  modelIds: LocalSpeechModelId[];
+}): Promise<LocalSpeechModelId[]> {
+  const installed = await Promise.all(
+    options.modelIds.map((modelId) => isSherpaOnnxModelInstalled(options.modelsDir, modelId)),
+  );
+  return options.modelIds.filter((_modelId, index) => !installed[index]);
+}
+
 export async function ensureLocalSpeechModels(options: {
   modelsDir: string;
   modelIds: LocalSpeechModelId[];
diff --git a/packages/server/src/server/speech/providers/local/sherpa/model-downloader.test.ts b/packages/server/src/server/speech/providers/local/sherpa/model-downloader.test.ts
index 993c959b4d..bc2e462a53 100644
--- a/packages/server/src/server/speech/providers/local/sherpa/model-downloader.test.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/model-downloader.test.ts
@@ -1,10 +1,21 @@
 import { describe, expect, test } from "vitest";
-import { mkdtempSync, mkdirSync, writeFileSync } from "node:fs";
+import {
+  mkdtempSync,
+  mkdirSync,
+  writeFileSync,
+  readFileSync,
+  rmSync,
+  existsSync,
+  truncateSync,
+  readdirSync,
+} from "node:fs";
+import { execFileSync } from "node:child_process";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import pino from "pino";
 
 import { ensureSherpaOnnxModel, getSherpaOnnxModelDir } from "./model-downloader.js";
+import { getSherpaOnnxModelSpec } from "./model-catalog.js";
 
 function makeTmpDir(): string {
   return mkdtempSync(path.join(tmpdir(), "paseo-speech-models-"));
@@ -13,6 +24,67 @@ function makeTmpDir(): string {
 const logger = pino({ level: "silent" });
 
 describe("sherpa model downloader", () => {
+  test("does not expose a partial model when tar extraction fails", async () => {
+    const root = makeTmpDir();
+    const modelsDir = path.join(root, "models");
+    const spec = getSherpaOnnxModelSpec("kokoro-en-v0_19");
+    const sourceDir = path.join(root, "source", spec.extractedDir);
+    const archive = path.join(
+      modelsDir,
+      ".downloads",
+      path.basename(new URL(spec.archiveUrl).pathname),
+    );
+    try {
+      mkdirSync(sourceDir, { recursive: true });
+      mkdirSync(path.dirname(archive), { recursive: true });
+      writeFileSync(path.join(sourceDir, "model.onnx"), Buffer.alloc(32_768, 1));
+      execFileSync("tar", [
+        "cf",
+        archive,
+        "-C",
+        path.dirname(sourceDir),
+        `${spec.extractedDir}/model.onnx`,
+      ]);
+      truncateSync(archive, 1_024);
+      await expect(ensureSherpaOnnxModel({ modelsDir, modelId: spec.id, logger })).rejects.toThrow(
+        "tar exited",
+      );
+      expect(existsSync(getSherpaOnnxModelDir(modelsDir, spec.id))).toBe(false);
+      expect(existsSync(archive)).toBe(true);
+      expect(readdirSync(modelsDir)).toEqual([".downloads"]);
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  test("repairs a partial legacy extraction when its cached archive remains", async () => {
+    const root = makeTmpDir();
+    const modelsDir = path.join(root, "models");
+    const spec = getSherpaOnnxModelSpec("kokoro-en-v0_19");
+    const sourceDir = path.join(root, "source", spec.extractedDir);
+    const modelDir = getSherpaOnnxModelDir(modelsDir, spec.id);
+    const archive = path.join(
+      modelsDir,
+      ".downloads",
+      path.basename(new URL(spec.archiveUrl).pathname),
+    );
+    try {
+      for (const dir of [sourceDir, modelDir]) {
+        mkdirSync(path.join(dir, "espeak-ng-data"), { recursive: true });
+        for (const filename of ["model.onnx", "voices.bin", "tokens.txt"]) {
+          writeFileSync(path.join(dir, filename), "complete model data");
+        }
+      }
+      mkdirSync(path.dirname(archive), { recursive: true });
+      execFileSync("tar", ["cf", archive, "-C", path.dirname(sourceDir), spec.extractedDir]);
+      writeFileSync(path.join(modelDir, "model.onnx"), "truncated");
+      await ensureSherpaOnnxModel({ modelsDir, modelId: spec.id, logger });
+      expect(readFileSync(path.join(modelDir, "model.onnx"), "utf8")).toBe("complete model data");
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+
   test("getSherpaOnnxModelDir maps modelId to extractedDir", () => {
     const modelsDir = "/tmp/models";
     expect(getSherpaOnnxModelDir(modelsDir, "parakeet-tdt-0.6b-v2-int8")).toContain(
diff --git a/packages/server/src/server/speech/providers/local/sherpa/model-downloader.ts b/packages/server/src/server/speech/providers/local/sherpa/model-downloader.ts
index 8ce21f5e01..cdd286389f 100644
--- a/packages/server/src/server/speech/providers/local/sherpa/model-downloader.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/model-downloader.ts
@@ -90,6 +90,38 @@ async function extractTarArchive(
   });
 }
 
+interface SherpaOnnxModelPaths {
+  modelDir: string;
+  archivePath: string;
+  extractionDir: string;
+}
+
+function getSherpaOnnxModelPaths(
+  modelsDir: string,
+  modelId: SherpaOnnxModelId,
+): SherpaOnnxModelPaths {
+  const spec = getSherpaOnnxModelSpec(modelId);
+  const downloadsDir = path.join(modelsDir, ".downloads");
+  return {
+    modelDir: path.join(modelsDir, spec.extractedDir),
+    archivePath: path.join(downloadsDir, path.basename(new URL(spec.archiveUrl).pathname)),
+    extractionDir: path.join(downloadsDir, `${spec.extractedDir}.extracting`),
+  };
+}
+
+// The archive is removed only as its model moves into place, so a model whose archive is
+// still in .downloads did not finish installing and may hold truncated files.
+export async function isSherpaOnnxModelInstalled(
+  modelsDir: string,
+  modelId: SherpaOnnxModelId,
+): Promise<boolean> {
+  const spec = getSherpaOnnxModelSpec(modelId);
+  const { modelDir, archivePath } = getSherpaOnnxModelPaths(modelsDir, modelId);
+  return (
+    !(await isNonEmptyFile(archivePath)) && (await hasRequiredFiles(modelDir, spec.requiredFiles))
+  );
+}
+
 async function isNonEmptyFile(filePath: string): Promise<boolean> {
   try {
     const s = await stat(filePath);
@@ -110,18 +142,17 @@ export async function ensureSherpaOnnxModel(
   });
 
   const spec = getSherpaOnnxModelSpec(options.modelId);
-  const modelDir = path.join(options.modelsDir, spec.extractedDir);
-  if (await hasRequiredFiles(modelDir, spec.requiredFiles)) {
+  const { modelDir, archivePath, extractionDir } = getSherpaOnnxModelPaths(
+    options.modelsDir,
+    options.modelId,
+  );
+  if (await isSherpaOnnxModelInstalled(options.modelsDir, options.modelId)) {
     return modelDir;
   }
 
   logger.info({ modelsDir: options.modelsDir }, "Starting model download");
 
   try {
-    const downloadsDir = path.join(options.modelsDir, ".downloads");
-    const archiveFilename = path.basename(new URL(spec.archiveUrl).pathname);
-    const archivePath = path.join(downloadsDir, archiveFilename);
-
     if (!(await isNonEmptyFile(archivePath))) {
       await downloadToFile({
         url: spec.archiveUrl,
@@ -138,32 +169,40 @@ export async function ensureSherpaOnnxModel(
       },
       "Extracting model archive",
     );
-    await extractTarArchive(archivePath, options.modelsDir, options.signal);
-
-    logger.info(
-      {
-        modelId: options.modelId,
-        modelDir,
-      },
-      "Verifying downloaded model files",
-    );
-    if (!(await hasRequiredFiles(modelDir, spec.requiredFiles))) {
-      throw new Error(
-        `Downloaded and extracted ${archiveFilename}, but required files are still missing in ${modelDir}.`,
-      );
-    }
-
-    logger.info(
-      {
-        modelId: options.modelId,
-        archivePath,
-      },
-      "Finalizing model artifacts",
-    );
+    // Extract beside the archive and move into place once complete, so an interrupted
+    // extraction never leaves partial files at modelDir.
+    await rm(extractionDir, { recursive: true, force: true });
     try {
-      await rm(archivePath, { force: true });
-    } catch {
-      // ignore
+      await extractTarArchive(archivePath, extractionDir, options.signal);
+      const extractedModelDir = path.join(extractionDir, spec.extractedDir);
+
+      logger.info(
+        {
+          modelId: options.modelId,
+          modelDir,
+        },
+        "Verifying downloaded model files",
+      );
+      if (!(await hasRequiredFiles(extractedModelDir, spec.requiredFiles))) {
+        throw new Error(
+          `Downloaded and extracted ${path.basename(archivePath)}, but required files are missing.`,
+        );
+      }
+
+      logger.info(
+        {
+          modelId: options.modelId,
+          archivePath,
+        },
+        "Finalizing model artifacts",
+      );
+      // A retained archive marks the model as not installed, so remove it before the model
+      // is moved into place. If removal fails, nothing at modelDir looks installed.
+      await rm(modelDir, { recursive: true, force: true });
+      await rm(archivePath, { force: true, maxRetries: 3 });
+      await rename(extractedModelDir, modelDir);
+    } finally {
+      await rm(extractionDir, { recursive: true, force: true });
     }
 
     logger.info({ modelDir }, "Model download completed");
diff --git a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts
index a7f60d2f29..06d4a5b41d 100644
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts
@@ -1,53 +1,141 @@
-import { describe, expect, it, vi, beforeEach } from "vitest";
+import { afterEach, describe, expect, it } from "vitest";
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import pino from "pino";
+import { SherpaOnnxTTS } from "./sherpa-tts.js";
 
-const generate = vi.fn();
-const free = vi.fn();
+const directories: string[] = [];
+afterEach(() => {
+  for (const directory of directories.splice(0))
+    rmSync(directory, { recursive: true, force: true });
+});
 
-vi.mock("node:fs", () => ({
-  existsSync: vi.fn(() => true),
-}));
+function createTts(numThreads?: number, beforeGenerate?: () => Promise<void>) {
+  const modelDir = mkdtempSync(join(tmpdir(), "paseo-tts-"));
+  directories.push(modelDir);
+  for (const name of ["model.onnx", "voices.bin", "tokens.txt"])
+    writeFileSync(join(modelDir, name), "");
+  mkdirSync(join(modelDir, "espeak-ng-data"));
+  let nativeConfig: unknown;
+  const requests: unknown[] = [];
+  const released: boolean[] = [];
+  const tts = new SherpaOnnxTTS(
+    { preset: "kokoro-en-v0_19", modelDir, numThreads },
+    pino({ level: "silent" }),
+    () => ({
+      OfflineTts: class {
+        sampleRate = 24000;
+        free() {
+          released.push(true);
+        }
+        constructor(config: unknown) {
+          nativeConfig = config;
+        }
+        async generateAsync(request: unknown) {
+          await beforeGenerate?.();
+          return this.generate(request);
+        }
+        generate(request: unknown) {
+          requests.push(request);
+          return { samples: Float32Array.from([0, 0.5, -0.5, 0.25]), sampleRate: 24000 };
+        }
+      },
+    }),
+  );
+  return { tts, requests, nativeConfig, released };
+}
 
-vi.mock("./sherpa-onnx-node-loader.js", () => ({
-  loadSherpaOnnxNode: () => ({
-    OfflineTts: class {
-      public readonly sampleRate = 24000;
+async function yieldNativeQueue(): Promise<void> {
+  await new Promise<void>((resolve) => setImmediate(resolve));
+}
 
-      generate = generate;
-      free = free;
-    },
-  }),
-}));
+function holdNativeSynthesis() {
+  const pending: Array<() => void> = [];
+  function wait() {
+    return new Promise<void>((resolve) => pending.push(resolve));
+  }
+  return { pending, wait };
+}
 
 describe("SherpaOnnxTTS", () => {
-  beforeEach(() => {
-    generate.mockReset();
-    free.mockReset();
-  });
-
-  it("disables external buffers when calling sherpa generate", async () => {
-    generate.mockReturnValue({
-      samples: Float32Array.from([0, 0.5, -0.5, 0.25]),
-      sampleRate: 24000,
-    });
-
-    const { SherpaOnnxTTS } = await import("./sherpa-tts.js");
-    const tts = new SherpaOnnxTTS(
-      {
-        preset: "kokoro-en-v0_19",
-        modelDir: "/tmp/fake-model",
-      },
-      pino({ level: "silent" }),
-    );
-
+  it("requests Electron-compatible copied samples and returns PCM audio", async () => {
+    const { tts, requests } = createTts();
     const result = await tts.synthesizeSpeech("hello");
-
-    expect(generate).toHaveBeenCalledWith({
-      text: "hello",
-      sid: 0,
-      speed: 1,
-      enableExternalBuffer: false,
-    });
+    expect(requests).toEqual([{ text: "hello", sid: 0, speed: 1, enableExternalBuffer: false }]);
     expect(result.format).toBe("pcm;rate=24000");
+    const chunks: Buffer[] = [];
+    for await (const chunk of result.stream) chunks.push(chunk);
+    expect(Buffer.concat(chunks).length).toBe(8);
   });
+
+  it("keeps the event loop available and serializes native synthesis", async () => {
+    const { pending, wait } = holdNativeSynthesis();
+    const { tts, requests } = createTts(undefined, wait);
+    const first = tts.synthesizeSpeech("first");
+    const second = tts.synthesizeSpeech("second");
+    try {
+      await yieldNativeQueue();
+      expect(requests).toEqual([]);
+      expect(pending).toHaveLength(1);
+      pending.shift()!();
+      const audio = await first;
+      audio.stream.destroy();
+      await yieldNativeQueue();
+      expect(requests).toHaveLength(1);
+      expect(pending).toHaveLength(1);
+      pending.shift()!();
+      (await second).stream.destroy();
+      expect(requests.map((request) => (request as { text: string }).text)).toEqual([
+        "first",
+        "second",
+      ]);
+    } finally {
+      for (const release of pending) release();
+      await Promise.allSettled([first, second]);
+      tts.free();
+    }
+  });
+
+  it("continues queued synthesis after a native failure", async () => {
+    let attempts = 0;
+    const { tts, requests } = createTts(undefined, async () => {
+      attempts += 1;
+      if (attempts === 1) throw new Error("generation failed");
+    });
+    const first = tts.synthesizeSpeech("first");
+    const second = tts.synthesizeSpeech("second");
+    await expect(first).rejects.toThrow("generation failed");
+    (await second).stream.destroy();
+    expect(requests).toEqual([{ text: "second", sid: 0, speed: 1, enableExternalBuffer: false }]);
+    tts.free();
+  });
+
+  it("waits for active native synthesis before freeing and drops queued synthesis", async () => {
+    const { pending, wait } = holdNativeSynthesis();
+    const { tts, requests, released } = createTts(undefined, wait);
+    const first = tts.synthesizeSpeech("first");
+    const second = tts.synthesizeSpeech("second");
+    const rejected = expect(second).rejects.toThrow("TTS provider closed");
+    await yieldNativeQueue();
+    tts.free();
+    expect(released).toEqual([]);
+    pending.shift()!();
+    (await first).stream.destroy();
+    await rejected;
+    await yieldNativeQueue();
+    expect(requests).toHaveLength(1);
+    expect(released).toEqual([true]);
+    await expect(tts.synthesizeSpeech("third")).rejects.toThrow("TTS provider closed");
+  });
+
+  it.each([undefined, 4])(
+    "passes the requested thread count at the native model boundary (%s)",
+    (threads) => {
+      const { nativeConfig } = createTts(threads);
+      expect(nativeConfig).toMatchObject({ model: { numThreads: threads ?? 2, provider: "cpu" } });
+      expect(nativeConfig).not.toHaveProperty("numThreads");
+      expect(nativeConfig).not.toHaveProperty("provider");
+    },
+  );
 });
diff --git a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts
index e212ba6afa..a078f81f51 100644
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts
@@ -25,12 +25,12 @@ function assertFileExists(filePath: string, label: string): void {
 
 interface SherpaOfflineTtsNative {
   sampleRate?: number;
-  generate: (args: {
+  generateAsync: (args: {
     text: string;
     sid: number;
     speed: number;
     enableExternalBuffer: boolean;
-  }) => { samples?: Float32Array | number[]; sampleRate?: number } | undefined;
+  }) => Promise<{ samples?: Float32Array | number[]; sampleRate?: number } | undefined>;
   free?: () => void;
 }
 
@@ -39,13 +39,22 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
   private readonly speakerId: number;
   private readonly speed: number;
   private readonly logger: pino.Logger;
+  private synthesisQueue: Promise<void> = Promise.resolve();
+  private closed = false;
 
-  constructor(config: SherpaTtsConfig, logger: pino.Logger) {
+  constructor(
+    config: SherpaTtsConfig,
+    logger: pino.Logger,
+    loadNative: () => Pick<
+      ReturnType<typeof loadSherpaOnnxNode>,
+      "OfflineTts"
+    > = loadSherpaOnnxNode,
+  ) {
     this.logger = logger.child({ module: "speech", provider: "local", component: "tts" });
     this.speakerId = config.speakerId ?? 0;
     this.speed = config.speed ?? 1.0;
 
-    const sherpa = loadSherpaOnnxNode();
+    const sherpa = loadNative();
     if (typeof sherpa.OfflineTts !== "function") {
       throw new Error("sherpa-onnx-node OfflineTts is unavailable");
     }
@@ -61,6 +70,9 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
     assertFileExists(dataDir, "TTS espeak-ng dataDir");
 
     const modelConfig = {
+      // The native parser reads these under model, despite the upstream JS typedef.
+      numThreads: config.numThreads ?? 2,
+      provider: "cpu",
       kokoro: {
         model: modelPath,
         voices: voicesPath,
@@ -72,8 +84,6 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
 
     const offlineTtsConfig = {
       model: modelConfig,
-      numThreads: config.numThreads ?? 2,
-      provider: "cpu",
       maxNumSentences: 1,
     };
 
@@ -92,8 +102,22 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
       throw new Error("Cannot synthesize empty text");
     }
 
-    const audio = this.tts.generate({
-      text: trimmed,
+    // The native handle is not reentrant. Keep prefetch off the worker event loop
+    // while allowing only one generation at a time on this model.
+    const result = this.synthesisQueue.then(() => this.generateSpeech(trimmed));
+    this.synthesisQueue = result.then(
+      () => undefined,
+      () => undefined,
+    );
+    return result;
+  }
+
+  private async generateSpeech(text: string): Promise<SpeechStreamResult> {
+    if (this.closed) {
+      throw new Error("TTS provider closed");
+    }
+    const audio = await this.tts.generateAsync({
+      text,
       sid: this.speakerId,
       speed: this.speed,
       // Electron rejects native external-backed typed arrays. Request a copied buffer
@@ -138,10 +162,19 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
   }
 
   free(): void {
-    try {
-      this.tts?.free?.();
-    } catch {
-      // ignore
+    if (this.closed) {
+      return;
     }
+    this.closed = true;
+    // Let the active native call finish before releasing its handle. Queued
+    // calls observe closed and never enter native code.
+    void this.synthesisQueue.then(() => {
+      try {
+        this.tts.free?.();
+      } catch {
+        // ignore
+      }
+      return undefined;
+    });
   }
 }
diff --git a/packages/server/src/server/speech/providers/local/worker-process.local.e2e.test.ts b/packages/server/src/server/speech/providers/local/worker-process.local.e2e.test.ts
index 9634a7533e..278b8112da 100644
--- a/packages/server/src/server/speech/providers/local/worker-process.local.e2e.test.ts
+++ b/packages/server/src/server/speech/providers/local/worker-process.local.e2e.test.ts
@@ -5,7 +5,7 @@ import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { expect, test } from "vitest";
+import { expect, onTestFinished, test } from "vitest";
 
 import { parsePcm16MonoWav, wordSimilarity } from "../../../test-utils/dictation-e2e.js";
 import { ensureSherpaOnnxModels } from "./sherpa/model-downloader.js";
@@ -30,7 +30,7 @@ function hasParakeetModel(dir: string): boolean {
 }
 
 function fixturePath(fileName: string): string {
-  return path.resolve(process.cwd(), "..", "app", "e2e", "fixtures", fileName);
+  return path.resolve(process.cwd(), "..", "app", "e2e", "support", "fixtures", fileName);
 }
 
 function resolveWorkerUrl(): URL {
@@ -68,6 +68,10 @@ function forkWorker(): ChildProcess {
     stdio: ["ignore", "ignore", "pipe", "ipc"],
   });
   worker.setMaxListeners(100);
+  onTestFinished(() => {
+    if (worker.connected) worker.disconnect();
+    if (!worker.killed) worker.kill();
+  });
   return worker;
 }
 
@@ -92,75 +96,133 @@ workerSpeechTest(
       messages.push(message);
     });
 
-    try {
-      const config: LocalSpeechWorkerConfig = {
-        modelsDir,
-        voiceSttModel: "parakeet-tdt-0.6b-v2-int8",
-        dictationSttModel: "parakeet-tdt-0.6b-v2-int8",
-        voiceTtsModel: "kokoro-en-v0_19",
-      };
-      const sessionId = randomUUID();
+    const config: LocalSpeechWorkerConfig = {
+      modelsDir,
+      voiceSttModel: "parakeet-tdt-0.6b-v2-int8",
+      dictationSttModel: "parakeet-tdt-0.6b-v2-int8",
+      voiceTtsModel: "kokoro-en-v0_19",
+    };
+    const sessionId = randomUUID();
 
-      await sendRequest(
-        worker,
-        messages,
-        {
-          type: "session.create",
-          config,
-          sessionId,
-          kind: "dictationStt",
-        },
-        () => stderr,
+    await sendRequest(
+      worker,
+      messages,
+      {
+        type: "session.create",
+        config,
+        sessionId,
+        kind: "dictationStt",
+      },
+      () => stderr,
+    );
+
+    const wav = await readFile(fixturePath("recording.wav"));
+    const { sampleRate, pcm16 } = parsePcm16MonoWav(wav);
+    expect(sampleRate).toBe(16000);
+
+    const chunkBytes = 3200;
+    const appendPromises: Promise<unknown>[] = [];
+    for (let offset = 0; offset < pcm16.length; offset += chunkBytes) {
+      const audio = pcm16.subarray(offset, Math.min(pcm16.length, offset + chunkBytes));
+      appendPromises.push(
+        sendRequest(
+          worker,
+          messages,
+          {
+            type: "session.append",
+            sessionId,
+            audio: bufferToWorkerBytes(audio),
+          },
+          () => stderr,
+        ),
       );
-
-      const wav = await readFile(fixturePath("recording.wav"));
-      const { sampleRate, pcm16 } = parsePcm16MonoWav(wav);
-      expect(sampleRate).toBe(16000);
-
-      const chunkBytes = 3200;
-      const appendPromises: Promise<unknown>[] = [];
-      for (let offset = 0; offset < pcm16.length; offset += chunkBytes) {
-        const audio = pcm16.subarray(offset, Math.min(pcm16.length, offset + chunkBytes));
-        appendPromises.push(
-          sendRequest(
-            worker,
-            messages,
-            {
-              type: "session.append",
-              sessionId,
-              audio: bufferToWorkerBytes(audio),
-            },
-            () => stderr,
-          ),
-        );
-      }
-      await Promise.all(appendPromises);
-
-      await sendRequest(
-        worker,
-        messages,
-        {
-          type: "session.commit",
-          sessionId,
-        },
-        () => stderr,
-      );
-
-      const finalTranscript = await waitForFinalTranscript(worker, messages, sessionId, stderr);
-      const baseline = await readFile(fixturePath("recording.baseline.txt"), "utf8");
-      expect(wordSimilarity(finalTranscript, baseline)).toBeGreaterThan(0.45);
-    } finally {
-      if (worker.connected) {
-        worker.disconnect();
-      }
-      if (!worker.killed) {
-        worker.kill();
-      }
     }
+    await Promise.all(appendPromises);
+
+    await sendRequest(
+      worker,
+      messages,
+      {
+        type: "session.commit",
+        sessionId,
+      },
+      () => stderr,
+    );
+
+    const finalTranscript = await waitForFinalTranscript(worker, messages, sessionId, stderr);
+    const baseline = await readFile(fixturePath("recording.baseline.txt"), "utf8");
+    expect(wordSimilarity(finalTranscript, baseline)).toBeGreaterThan(0.45);
   },
   120_000,
 );
 
+test("delivers audio and serves control requests while later TTS is synthesizing", async () => {
+  const worker = forkWorker();
+  const messages: LocalSpeechWorkerToParentMessage[] = [];
+  let stderr = "";
+  worker.stderr?.on("data", (chunk) => {
+    stderr += String(chunk);
+  });
+  worker.on("message", (message: LocalSpeechWorkerToParentMessage) => messages.push(message));
+  const config: LocalSpeechWorkerConfig = {
+    modelsDir,
+    voiceSttModel: "parakeet-tdt-0.6b-v2-int8",
+    dictationSttModel: "parakeet-tdt-0.6b-v2-int8",
+    voiceTtsModel: "kokoro-en-v0_19",
+  };
+  await sendRequest(
+    worker,
+    messages,
+    { type: "tts.synthesize", config, text: "Ready." },
+    () => stderr,
+  );
+  const completed: string[] = [];
+  const first = sendRequest(
+    worker,
+    messages,
+    {
+      type: "tts.synthesize",
+      config,
+      text: "I found the issue.",
+    },
+    () => stderr,
+  ).then(() => completed.push("first"));
+  const second = sendRequest(
+    worker,
+    messages,
+    {
+      type: "tts.synthesize",
+      config,
+      text: "The voice feature is slow because it waits for the whole sentence to finish generating before sending any audio to your phone, so I am checking whether we can start playback earlier while the rest is still being synthesized.",
+    },
+    () => stderr,
+  ).then(() => completed.push("second"));
+  await sendRequest(
+    worker,
+    messages,
+    {
+      type: "session.close",
+      sessionId: "responsiveness-probe",
+    },
+    () => stderr,
+  );
+  expect(completed).toEqual([]);
+  await first;
+  expect(completed).toEqual(["first"]);
+  await sendRequest(
+    worker,
+    messages,
+    {
+      type: "session.close",
+      sessionId: "responsiveness-probe",
+    },
+    () => stderr,
+  );
+  expect(completed).toEqual(["first"]);
+  await second;
+  expect(completed).toEqual(["first", "second"]);
+}, 120_000);
+
 type RequestInput = LocalSpeechWorkerRequest extends infer Request
   ? Request extends LocalSpeechWorkerRequest
     ? Omit<Request, "requestId">
diff --git a/packages/server/src/server/speech/speech-runtime.test.ts b/packages/server/src/server/speech/speech-runtime.test.ts
index 428ecd27aa..c9c21b3e89 100644
--- a/packages/server/src/server/speech/speech-runtime.test.ts
+++ b/packages/server/src/server/speech/speech-runtime.test.ts
@@ -36,8 +36,7 @@ vi.mock("./providers/openai/runtime.js", () => ({
 
 vi.mock("./providers/local/models.js", () => ({
   ensureLocalSpeechModels: ensureLocalSpeechModelsMock,
-  getLocalSpeechModelDir: vi.fn(() => ""),
-  listLocalSpeechModels: vi.fn(() => []),
+  listMissingLocalSpeechModels: vi.fn(async ({ modelIds }: { modelIds: string[] }) => modelIds),
 }));
 
 function createStubStt(id: string): SpeechToTextProvider {
diff --git a/packages/server/src/server/speech/speech-runtime.ts b/packages/server/src/server/speech/speech-runtime.ts
index 6e56a9e955..932f87c077 100644
--- a/packages/server/src/server/speech/speech-runtime.ts
+++ b/packages/server/src/server/speech/speech-runtime.ts
@@ -1,14 +1,8 @@
-import { stat } from "node:fs/promises";
-import { join } from "node:path";
 import type { Logger } from "pino";
 
 import type { PaseoOpenAIConfig, PaseoSpeechConfig } from "../bootstrap.js";
 import type { LocalSpeechModelId } from "./providers/local/config.js";
-import {
-  ensureLocalSpeechModels,
-  getLocalSpeechModelDir,
-  listLocalSpeechModels,
-} from "./providers/local/models.js";
+import { ensureLocalSpeechModels, listMissingLocalSpeechModels } from "./providers/local/models.js";
 import { initializeLocalSpeechServices } from "./providers/local/runtime.js";
 import {
   getOpenAiSpeechAvailability,
@@ -76,48 +70,6 @@ function resolveRequestedSpeechProviders(
   };
 }
 
-async function hasRequiredLocalModelFile(filePath: string): Promise<boolean> {
-  try {
-    const fileStat = await stat(filePath);
-    if (fileStat.isDirectory()) {
-      return true;
-    }
-    return fileStat.isFile() && fileStat.size > 0;
-  } catch {
-    return false;
-  }
-}
-
-async function findMissingRequiredLocalModels(params: {
-  modelsDir: string | null;
-  requiredModelIds: LocalSpeechModelId[];
-}): Promise<LocalSpeechModelId[]> {
-  const { modelsDir, requiredModelIds } = params;
-  if (!modelsDir || requiredModelIds.length === 0) {
-    return [];
-  }
-
-  const specsById = new Map(listLocalSpeechModels().map((model) => [model.id, model]));
-  const missing = new Set<LocalSpeechModelId>();
-
-  const checks = await Promise.all(
-    requiredModelIds.map(async (modelId) => {
-      const spec = specsById.get(modelId);
-      if (!spec) return { modelId, missing: true };
-      const modelDir = getLocalSpeechModelDir(modelsDir, modelId);
-      const filePresence = await Promise.all(
-        spec.requiredFiles.map((relPath) => hasRequiredLocalModelFile(join(modelDir, relPath))),
-      );
-      return { modelId, missing: !filePresence.every((present) => present) };
-    }),
-  );
-  for (const check of checks) {
-    if (check.missing) missing.add(check.modelId);
-  }
-
-  return Array.from(missing);
-}
-
 function joinModelIds(modelIds: LocalSpeechModelId[]): string {
   if (modelIds.length === 0) {
     return "none";
@@ -493,10 +445,12 @@ export function createSpeechService(params: {
   };
 
   const refreshMissingLocalModels = async (): Promise<void> => {
-    missingLocalModelIds = await findMissingRequiredLocalModels({
-      modelsDir: localModelConfig?.modelsDir ?? null,
-      requiredModelIds: localModelConfig?.defaultModelIds ?? [],
-    });
+    missingLocalModelIds = localModelConfig
+      ? await listMissingLocalSpeechModels({
+          modelsDir: localModelConfig.modelsDir,
+          modelIds: localModelConfig.defaultModelIds,
+        })
+      : [];
   };
 
   const reconcileServices = async (): Promise<void> => {
diff --git a/packages/server/src/server/test-utils/daemon-test-context.ts b/packages/server/src/server/test-utils/daemon-test-context.ts
index 44c6f28457..c872a686dd 100644
--- a/packages/server/src/server/test-utils/daemon-test-context.ts
+++ b/packages/server/src/server/test-utils/daemon-test-context.ts
@@ -43,7 +43,7 @@ export async function createDaemonTestContext(
     url: `ws://127.0.0.1:${daemon.port}/ws`,
   });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
+  await client.fetchAgents({ subscribe: {} });
 
   return {
     daemon,
diff --git a/packages/server/src/server/test-utils/fake-agent-client.ts b/packages/server/src/server/test-utils/fake-agent-client.ts
index 4d16f0302e..1c7127d144 100644
--- a/packages/server/src/server/test-utils/fake-agent-client.ts
+++ b/packages/server/src/server/test-utils/fake-agent-client.ts
@@ -58,13 +58,18 @@ interface FakeAgentSessionOptions {
   sessionId?: string;
   memoryMarker?: string | null;
   closeSession?: () => Promise<void>;
-  onStartTurn?: (prompt: AgentPromptInput) => void;
+  onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
+  beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
+  historyEvents?: readonly AgentStreamEvent[];
 }
 
 export interface TestAgentClientOptions {
+  beforeCreateSession?: (config: AgentSessionConfig) => Promise<void>;
   closeSession?: () => Promise<void>;
-  onStartTurn?: (prompt: AgentPromptInput) => void;
+  onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
+  beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
   supportsMcpServers?: boolean;
+  historyEvents?: readonly AgentStreamEvent[];
 }
 
 function createDeferred<T>(): Deferred<T> {
@@ -336,7 +341,9 @@ class FakeAgentSession implements AgentSession {
   private activeForegroundTurnId: string | null = null;
 
   private readonly closeSession: (() => Promise<void>) | undefined;
-  private readonly onStartTurn: ((prompt: AgentPromptInput) => void) | undefined;
+  private readonly onStartTurn: TestAgentClientOptions["onStartTurn"];
+  private readonly beforeTurnComplete: ((prompt: AgentPromptInput) => Promise<void>) | undefined;
+  private readonly historyEvents: readonly AgentStreamEvent[] | undefined;
 
   constructor(options: FakeAgentSessionOptions) {
     this.capabilities = {
@@ -349,6 +356,8 @@ class FakeAgentSession implements AgentSession {
     this.memoryMarker = options.memoryMarker ?? null;
     this.closeSession = options.closeSession;
     this.onStartTurn = options.onStartTurn;
+    this.beforeTurnComplete = options.beforeTurnComplete;
+    this.historyEvents = options.historyEvents;
     this.historyPath = path.join(
       tmpdir(),
       "paseo-fake-provider-history",
@@ -439,7 +448,7 @@ class FakeAgentSession implements AgentSession {
 
     const turnId = `fake-turn-${this.nextTurnOrdinal++}`;
     this.activeForegroundTurnId = turnId;
-    this.onStartTurn?.(prompt);
+    this.onStartTurn?.(prompt, this.config);
 
     void this.emitTurnEvents(prompt);
 
@@ -737,6 +746,16 @@ class FakeAgentSession implements AgentSession {
       await this.appendHistoryEvent(turnStarted);
       this.notifySubscribers(turnStarted);
 
+      if (textPrompt === "Emit a provider child") {
+        const child: AgentStreamEvent = {
+          type: "provider_subagent",
+          provider: this.providerName,
+          event: { type: "upsert", id: "fixture-child", title: "Fixture child", status: "running" },
+        };
+        await this.appendHistoryEvent(child);
+        this.notifySubscribers(child);
+      }
+
       if (textPrompt.toLowerCase().includes("emit a turn failure")) {
         const failed: AgentStreamEvent = {
           type: "turn_failed",
@@ -788,6 +807,7 @@ class FakeAgentSession implements AgentSession {
         this.notifySubscribers(assistantChunkB);
       }
 
+      await this.beforeTurnComplete?.(prompt);
       const completed: AgentStreamEvent = {
         type: "turn_completed",
         provider: this.providerName,
@@ -801,6 +821,10 @@ class FakeAgentSession implements AgentSession {
   }
 
   async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    if (this.historyEvents) {
+      yield* this.historyEvents;
+      return;
+    }
     let contents: string;
     try {
       contents = await readFile(this.historyPath, "utf8");
@@ -1202,12 +1226,15 @@ class FakeAgentClient implements AgentClient {
     config: AgentSessionConfig,
     _launchContext?: AgentLaunchContext,
   ): Promise<AgentSession> {
+    await this.options.beforeCreateSession?.(config);
     return new FakeAgentSession({
       providerName: this.provider,
       config: { ...config },
       supportsMcpServers: this.options.supportsMcpServers,
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
+      beforeTurnComplete: this.options.beforeTurnComplete,
+      historyEvents: this.options.historyEvents,
     });
   }
 
@@ -1233,6 +1260,8 @@ class FakeAgentClient implements AgentClient {
       memoryMarker: typeof marker === "string" ? marker : null,
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
+      beforeTurnComplete: this.options.beforeTurnComplete,
+      historyEvents: this.options.historyEvents,
     });
   }
 
diff --git a/packages/server/src/server/test-utils/paseo-daemon.test.ts b/packages/server/src/server/test-utils/paseo-daemon.test.ts
new file mode 100644
index 0000000000..4ee417c221
--- /dev/null
+++ b/packages/server/src/server/test-utils/paseo-daemon.test.ts
@@ -0,0 +1,61 @@
+import { existsSync } from "node:fs";
+import { mkdtemp, readdir, rm, writeFile } from "node:fs/promises";
+import net from "node:net";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, test, vi } from "vitest";
+
+import { createTestPaseoDaemon } from "./paseo-daemon.js";
+
+describe("createTestPaseoDaemon", () => {
+  const cleanups: Array<() => Promise<void>> = [];
+
+  afterEach(async () => {
+    vi.unstubAllEnvs();
+    await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
+  });
+
+  test("keeps a caller-owned home when startup on a taken port fails", async () => {
+    const paseoHomeRoot = await mkdtemp(path.join(os.tmpdir(), "paseo-owned-home-"));
+    cleanups.push(() => rm(paseoHomeRoot, { recursive: true, force: true }));
+    const ownedFile = path.join(paseoHomeRoot, "owned-by-caller");
+    await writeFile(ownedFile, "keep");
+    const takenPort = await occupyPort(cleanups);
+
+    await expect(
+      createTestPaseoDaemon({
+        listenPort: takenPort,
+        paseoHomeRoot,
+        staticDir: path.join(paseoHomeRoot, "static"),
+        cleanup: false,
+        mcpEnabled: false,
+      }),
+    ).rejects.toMatchObject({ code: "EADDRINUSE" });
+
+    expect(existsSync(ownedFile)).toBe(true);
+  }, 60_000);
+
+  test("removes the directories it created when startup on a taken port fails", async () => {
+    const scratchTmp = await mkdtemp(path.join(os.tmpdir(), "paseo-daemon-scratch-"));
+    cleanups.push(() => rm(scratchTmp, { recursive: true, force: true }));
+    for (const name of ["TMPDIR", "TMP", "TEMP"]) vi.stubEnv(name, scratchTmp);
+    const takenPort = await occupyPort(cleanups);
+
+    await expect(
+      createTestPaseoDaemon({ listenPort: takenPort, cleanup: false, mcpEnabled: false }),
+    ).rejects.toMatchObject({ code: "EADDRINUSE" });
+
+    expect(await readdir(scratchTmp)).toEqual([]);
+  }, 60_000);
+});
+
+async function occupyPort(cleanups: Array<() => Promise<void>>): Promise<number> {
+  const server = net.createServer();
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  cleanups.push(() => new Promise<void>((resolve) => server.close(() => resolve())));
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    throw new Error("Port holder did not bind a TCP port");
+  }
+  return address.port;
+}
diff --git a/packages/server/src/server/test-utils/paseo-daemon.ts b/packages/server/src/server/test-utils/paseo-daemon.ts
index 9cdce46865..91b125328c 100644
--- a/packages/server/src/server/test-utils/paseo-daemon.ts
+++ b/packages/server/src/server/test-utils/paseo-daemon.ts
@@ -1,3 +1,4 @@
+import { BuiltinPluginLoader } from "../plugins/builtin/index.js";
 import os from "node:os";
 import path from "node:path";
 import { mkdir, mkdtemp, rm } from "node:fs/promises";
@@ -20,6 +21,7 @@ interface TestPaseoDaemonOptions {
   downloadTokenTtlMs?: number;
   corsAllowedOrigins?: string[];
   listen?: string;
+  listenPort?: number;
   logger?: Parameters<typeof createPaseoDaemon>[1];
   mcpEnabled?: boolean;
   mcpDebug?: boolean;
@@ -49,6 +51,7 @@ interface TestPaseoDaemonOptions {
   agentProfiles?: AgentProfile[];
   autoArchiveAfterMerge?: boolean;
   pluginsEnabled?: PaseoDaemonConfig["pluginsEnabled"];
+  builtinPlugins?: BuiltinPluginLoader;
   plugins?: PaseoDaemonConfig["plugins"];
 }
 
@@ -97,9 +100,11 @@ export async function createTestPaseoDaemon(
   let lastError: unknown;
 
   for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    const { config, paseoHomeRoot, paseoHome, staticDir } = await prepareTestDaemonConfig(options);
+    const { config, paseoHomeRoot, paseoHome, staticDir, createdDirs } =
+      await prepareTestDaemonConfig(options);
     const logger = options.logger ?? pino({ level: "silent" });
     const daemon = await createPaseoDaemon(config, logger, {
+      builtinPlugins: options.builtinPlugins ?? new BuiltinPluginLoader(undefined, []),
       serverFeatureOverrides: {
         daemonStatusRpc: options.daemonStatusRpcCapability,
         relayConfig: options.relayConfigCapability,
@@ -117,10 +122,7 @@ export async function createTestPaseoDaemon(
         await daemon.agentManager.flush().catch(() => undefined);
         if (options.cleanup ?? true) {
           await new Promise((r) => setTimeout(r, 50));
-          await Promise.all([
-            rm(paseoHomeRoot, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }),
-            rm(staticDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }),
-          ]);
+          await removeDirs([paseoHomeRoot, staticDir]);
         }
       };
 
@@ -135,10 +137,8 @@ export async function createTestPaseoDaemon(
     } catch (error) {
       lastError = error;
       await daemon.stop().catch(() => undefined);
-      await Promise.all([
-        rm(paseoHomeRoot, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }),
-        rm(staticDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }),
-      ]);
+      // A failed attempt removes only what it created: a caller-supplied home keeps its serverId.
+      await removeDirs(createdDirs);
 
       if (
         (!isAddressInUseError(error) && !isStartupTimeoutError(error)) ||
@@ -157,19 +157,33 @@ interface PreparedTestDaemonConfig {
   paseoHomeRoot: string;
   paseoHome: string;
   staticDir: string;
+  createdDirs: string[];
+}
+
+async function removeDirs(dirs: string[]): Promise<void> {
+  await Promise.all(
+    dirs.map((dir) => rm(dir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 })),
+  );
+}
+
+async function createTempDir(prefix: string, createdDirs: string[]): Promise<string> {
+  const dir = await mkdtemp(path.join(os.tmpdir(), prefix));
+  createdDirs.push(dir);
+  return dir;
 }
 
 async function prepareTestDaemonConfig(
   options: TestPaseoDaemonOptions,
 ): Promise<PreparedTestDaemonConfig> {
-  const paseoHomeRoot =
-    options.paseoHomeRoot ?? (await mkdtemp(path.join(os.tmpdir(), "paseo-home-")));
+  const createdDirs: string[] = [];
+  const paseoHomeRoot = options.paseoHomeRoot ?? (await createTempDir("paseo-home-", createdDirs));
   const paseoHome = path.join(paseoHomeRoot, ".paseo");
   await mkdir(paseoHome, { recursive: true });
-  const staticDir = options.staticDir ?? (await mkdtemp(path.join(os.tmpdir(), "paseo-static-")));
+  const staticDir = options.staticDir ?? (await createTempDir("paseo-static-", createdDirs));
   const listenHost = options.listen ?? "127.0.0.1";
+  const listenPort = options.listenPort ?? 0;
   const config: PaseoDaemonConfig = {
-    listen: `${listenHost}:0`,
+    listen: `${listenHost}:${listenPort}`,
     paseoHome,
     daemonVersion: options.daemonVersion,
     desktopManaged: options.desktopManaged,
@@ -204,7 +218,7 @@ async function prepareTestDaemonConfig(
     pluginsEnabled: options.pluginsEnabled,
     plugins: options.plugins,
   };
-  return { config, paseoHomeRoot, paseoHome, staticDir };
+  return { config, paseoHomeRoot, paseoHome, staticDir, createdDirs };
 }
 
 function isAddressInUseError(error: unknown): boolean {
diff --git a/packages/server/src/server/test-utils/session-stubs.ts b/packages/server/src/server/test-utils/session-stubs.ts
index 46db4e1749..50c0ee3c76 100644
--- a/packages/server/src/server/test-utils/session-stubs.ts
+++ b/packages/server/src/server/test-utils/session-stubs.ts
@@ -1,24 +1,21 @@
-import { vi } from "vitest";
+import pino from "pino";
+import { randomUUID } from "node:crypto";
+import { afterEach, vi } from "vitest";
+import { rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { CreationService } from "../creation/index.js";
 
 import { getAgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";
 
-import type {
-  AgentMode,
-  AgentModelDefinition,
-  AgentProvider,
-  ProviderSnapshotEntry,
-} from "../agent/agent-sdk-types.js";
-import type {
-  AgentManagerProviderState,
-  ProviderDiagnosticResult,
-  ResolvedProviderCreateConfig,
+import type { ProviderSnapshotEntry } from "../agent/agent-sdk-types.js";
+import type { ProviderSnapshot } from "../agent/provider-snapshot-manager.js";
+import {
+  GLOBAL_PROVIDER_SNAPSHOT_KEY,
+  ProviderSnapshotManager,
 } from "../agent/provider-snapshot-manager.js";
-import { ProviderSnapshotManager } from "../agent/provider-snapshot-manager.js";
 import type { SessionOptions } from "../session.js";
-import type {
-  HubExecutionAgentValidationIssue,
-  SessionOutboundMessage,
-} from "@getpaseo/protocol/messages";
+import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 import { asInternals, createStub } from "./class-mocks.js";
 
 // ---------------------------------------------------------------------------
@@ -36,7 +33,11 @@ export function asSessionLogger(stub: {
 export function asAgentManager(stub: {
   [K in keyof SessionOptions["agentManager"]]?: unknown;
 }): SessionOptions["agentManager"] {
-  return createStub<SessionOptions["agentManager"]>(stub);
+  return createStub<SessionOptions["agentManager"]>({
+    listProviderSubagentActivity: () => [],
+    getRetiredInternalAgent: () => null,
+    ...stub,
+  });
 }
 
 export function asAgentStorage(stub: {
@@ -99,15 +100,15 @@ export function asWorkspaceGitService(stub: {
 }
 
 export function asServiceProxy(stub: {
-  [K in keyof SessionOptions["serviceProxy"]]?: unknown;
-}): SessionOptions["serviceProxy"] {
-  return createStub<SessionOptions["serviceProxy"]>(stub);
+  [K in keyof NonNullable<SessionOptions["serviceProxy"]>]?: unknown;
+}): NonNullable<SessionOptions["serviceProxy"]> {
+  return createStub<NonNullable<SessionOptions["serviceProxy"]>>(stub);
 }
 
 export function asWorkspaceScriptRuntimeStore(stub: {
-  [K in keyof SessionOptions["scriptRuntimeStore"]]?: unknown;
-}): SessionOptions["scriptRuntimeStore"] {
-  return createStub<SessionOptions["scriptRuntimeStore"]>(stub);
+  [K in keyof NonNullable<SessionOptions["scriptRuntimeStore"]>]?: unknown;
+}): NonNullable<SessionOptions["scriptRuntimeStore"]> {
+  return createStub<NonNullable<SessionOptions["scriptRuntimeStore"]>>(stub);
 }
 
 // ---------------------------------------------------------------------------
@@ -148,74 +149,96 @@ export function findByType<T extends SessionOutboundMessage["type"]>(
 // ---------------------------------------------------------------------------
 
 export interface ProviderSnapshotManagerSpies {
-  getSnapshot: ReturnType<typeof vi.fn<[cwd?: string], ProviderSnapshotEntry[]>>;
-  refreshSnapshotForCwd: ReturnType<typeof vi.fn<[unknown], Promise<void>>>;
-  refreshSettingsSnapshot: ReturnType<typeof vi.fn<[unknown], Promise<void>>>;
-  warmUpSnapshotForCwd: ReturnType<typeof vi.fn<[unknown], Promise<void>>>;
-  listRegisteredProviderIds: ReturnType<typeof vi.fn<[], AgentProvider[]>>;
-  hasProvider: ReturnType<typeof vi.fn<[AgentProvider], boolean>>;
-  getProviderLabel: ReturnType<typeof vi.fn<[AgentProvider], string>>;
-  getAgentManagerProviderState: ReturnType<typeof vi.fn<[], AgentManagerProviderState>>;
-  listProviders: ReturnType<typeof vi.fn<[unknown], Promise<ProviderSnapshotEntry[]>>>;
-  getProvider: ReturnType<typeof vi.fn<[unknown], Promise<ProviderSnapshotEntry>>>;
+  getSnapshot: ReturnType<typeof vi.fn<ProviderSnapshotManager["getSnapshot"]>>;
+  refreshSnapshotForCwd: ReturnType<typeof vi.fn<ProviderSnapshotManager["refreshSnapshotForCwd"]>>;
+  refreshSettingsSnapshot: ReturnType<
+    typeof vi.fn<ProviderSnapshotManager["refreshSettingsSnapshot"]>
+  >;
+  warmUpSnapshotForCwd: ReturnType<typeof vi.fn<ProviderSnapshotManager["warmUpSnapshotForCwd"]>>;
+  listRegisteredProviderIds: ReturnType<
+    typeof vi.fn<ProviderSnapshotManager["listRegisteredProviderIds"]>
+  >;
+  hasProvider: ReturnType<typeof vi.fn<ProviderSnapshotManager["hasProvider"]>>;
+  getProviderLabel: ReturnType<typeof vi.fn<ProviderSnapshotManager["getProviderLabel"]>>;
+  getAgentManagerProviderState: ReturnType<
+    typeof vi.fn<ProviderSnapshotManager["getAgentManagerProviderState"]>
+  >;
+  listProviders: ReturnType<typeof vi.fn<ProviderSnapshotManager["listProviders"]>>;
+  getProvider: ReturnType<typeof vi.fn<ProviderSnapshotManager["getProvider"]>>;
   validateAgentConfiguration: ReturnType<
-    typeof vi.fn<[unknown], Promise<HubExecutionAgentValidationIssue[]>>
+    typeof vi.fn<ProviderSnapshotManager["validateAgentConfiguration"]>
   >;
-  listModels: ReturnType<typeof vi.fn<[unknown], Promise<AgentModelDefinition[]>>>;
-  listModes: ReturnType<typeof vi.fn<[unknown], Promise<AgentMode[]>>>;
-  resolveCreateConfig: ReturnType<typeof vi.fn<[unknown], Promise<ResolvedProviderCreateConfig>>>;
-  resolveDefaultModel: ReturnType<typeof vi.fn<[unknown], Promise<string | undefined>>>;
-  getProviderDiagnostic: ReturnType<
-    typeof vi.fn<[AgentProvider], Promise<ProviderDiagnosticResult>>
+  listModels: ReturnType<typeof vi.fn<ProviderSnapshotManager["listModels"]>>;
+  listModes: ReturnType<typeof vi.fn<ProviderSnapshotManager["listModes"]>>;
+  resolveCreateConfig: ReturnType<typeof vi.fn<ProviderSnapshotManager["resolveCreateConfig"]>>;
+  resolveDefaultModel: ReturnType<typeof vi.fn<ProviderSnapshotManager["resolveDefaultModel"]>>;
+  getProviderDiagnostic: ReturnType<typeof vi.fn<ProviderSnapshotManager["getProviderDiagnostic"]>>;
+  applyMutableProviderConfig: ReturnType<
+    typeof vi.fn<ProviderSnapshotManager["applyMutableProviderConfig"]>
   >;
-  applyMutableProviderConfig: ReturnType<typeof vi.fn<[unknown], AgentManagerProviderState>>;
-  destroy: ReturnType<typeof vi.fn<[], void>>;
+  destroy: ReturnType<typeof vi.fn<ProviderSnapshotManager["destroy"]>>;
 }
 
 export function createProviderSnapshotManagerStub(): {
   manager: ProviderSnapshotManager;
 } & ProviderSnapshotManagerSpies {
-  const getSnapshot = vi.fn<[cwd?: string], ProviderSnapshotEntry[]>(() => []);
-  const refreshSnapshotForCwd = vi.fn<[unknown], Promise<void>>(async () => {});
-  const refreshSettingsSnapshot = vi.fn<[unknown], Promise<void>>(async () => {});
-  const warmUpSnapshotForCwd = vi.fn<[unknown], Promise<void>>(async () => {});
-  const listRegisteredProviderIds = vi.fn<[], AgentProvider[]>(() => []);
-  const hasProvider = vi.fn<[AgentProvider], boolean>(() => false);
-  const getProviderLabel = vi.fn<[AgentProvider], string>((provider) => {
+  const getSnapshot = vi.fn<ProviderSnapshotManager["getSnapshot"]>((cwd) =>
+    createProviderSnapshot([], cwd),
+  );
+  const refreshSnapshotForCwd = vi.fn<ProviderSnapshotManager["refreshSnapshotForCwd"]>(
+    async () => {},
+  );
+  const refreshSettingsSnapshot = vi.fn<ProviderSnapshotManager["refreshSettingsSnapshot"]>(
+    async () => {},
+  );
+  const warmUpSnapshotForCwd = vi.fn<ProviderSnapshotManager["warmUpSnapshotForCwd"]>(
+    async () => {},
+  );
+  const listRegisteredProviderIds = vi.fn<ProviderSnapshotManager["listRegisteredProviderIds"]>(
+    () => [],
+  );
+  const hasProvider = vi.fn<ProviderSnapshotManager["hasProvider"]>(() => false);
+  const getProviderLabel = vi.fn<ProviderSnapshotManager["getProviderLabel"]>((provider) => {
     try {
       return getAgentProviderDefinition(provider).label;
     } catch {
       return provider;
     }
   });
-  const getAgentManagerProviderState = vi.fn<[], AgentManagerProviderState>(() => ({
+  const getAgentManagerProviderState = vi.fn<
+    ProviderSnapshotManager["getAgentManagerProviderState"]
+  >(() => ({
     providerDefinitions: {},
     clients: {},
   }));
-  const listProviders = vi.fn<[unknown], Promise<ProviderSnapshotEntry[]>>(async () => []);
-  const getProvider = vi.fn<[unknown], Promise<ProviderSnapshotEntry>>(async () => {
+  const listProviders = vi.fn<ProviderSnapshotManager["listProviders"]>(async () => []);
+  const getProvider = vi.fn<ProviderSnapshotManager["getProvider"]>(async () => {
     throw new Error("createProviderSnapshotManagerStub: getProvider not stubbed");
   });
-  const validateAgentConfiguration = vi.fn<[unknown], Promise<HubExecutionAgentValidationIssue[]>>(
+  const validateAgentConfiguration = vi.fn<ProviderSnapshotManager["validateAgentConfiguration"]>(
     async () => [],
   );
-  const listModels = vi.fn<[unknown], Promise<AgentModelDefinition[]>>(async () => []);
-  const listModes = vi.fn<[unknown], Promise<AgentMode[]>>(async () => []);
-  const resolveCreateConfig = vi.fn<[unknown], Promise<ResolvedProviderCreateConfig>>(async () => ({
+  const listModels = vi.fn<ProviderSnapshotManager["listModels"]>(async () => []);
+  const listModes = vi.fn<ProviderSnapshotManager["listModes"]>(async () => []);
+  const resolveCreateConfig = vi.fn<ProviderSnapshotManager["resolveCreateConfig"]>(async () => ({
     modeId: undefined,
     featureValues: undefined,
   }));
-  const resolveDefaultModel = vi.fn<[unknown], Promise<string | undefined>>(async () => undefined);
-  const getProviderDiagnostic = vi.fn<[AgentProvider], Promise<ProviderDiagnosticResult>>(
+  const resolveDefaultModel = vi.fn<ProviderSnapshotManager["resolveDefaultModel"]>(
+    async () => undefined,
+  );
+  const getProviderDiagnostic = vi.fn<ProviderSnapshotManager["getProviderDiagnostic"]>(
     async (provider) => ({ provider, diagnostic: "No diagnostic available for this provider." }),
   );
-  const applyMutableProviderConfig = vi.fn<[unknown], AgentManagerProviderState>(() => ({
-    providerDefinitions: {},
-    clients: {},
-  }));
+  const applyMutableProviderConfig = vi.fn<ProviderSnapshotManager["applyMutableProviderConfig"]>(
+    () => ({
+      providerDefinitions: {},
+      clients: {},
+    }),
+  );
   const on = vi.fn();
   const off = vi.fn();
-  const destroy = vi.fn<[], void>();
+  const destroy = vi.fn<ProviderSnapshotManager["destroy"]>();
   const stub = {
     getSnapshot,
     refreshSnapshotForCwd,
@@ -263,3 +286,36 @@ export function createProviderSnapshotManagerStub(): {
     destroy,
   };
 }
+
+export function createMessageReceiptsStub(): SessionOptions["messageReceipts"] {
+  return {
+    send: (input) => input.send(),
+  };
+}
+
+export function createProviderSnapshot(
+  entries: ProviderSnapshotEntry[],
+  cwd = GLOBAL_PROVIDER_SNAPSHOT_KEY,
+): ProviderSnapshot {
+  return {
+    cwd,
+    records: entries.map((entry) => {
+      const { fetchedAt: _fetchedAt, ...content } = entry;
+      return { entry, contentHash: JSON.stringify(content) };
+    }),
+  };
+}
+
+const creationDirectories: string[] = [];
+afterEach(async () => {
+  await Promise.all(
+    creationDirectories
+      .splice(0)
+      .map((directory) => rm(directory, { recursive: true, force: true })),
+  );
+});
+export function createTestCreationService(): SessionOptions["creationService"] {
+  const directory = join(tmpdir(), `session-creation-${randomUUID()}`);
+  creationDirectories.push(directory);
+  return new CreationService(directory, pino({ level: "silent" }));
+}
diff --git a/packages/server/src/server/test-utils/versioned-daemon.ts b/packages/server/src/server/test-utils/versioned-daemon.ts
new file mode 100644
index 0000000000..f8763e0d6f
--- /dev/null
+++ b/packages/server/src/server/test-utils/versioned-daemon.ts
@@ -0,0 +1,36 @@
+// Browser compatibility tests run a real daemon in a separate Node runtime.
+//
+// argv: <daemonVersion> [port] [paseoHomeRoot]
+// A fixed port and a caller-owned home let a test stop this daemon and start a
+// replacement under the same endpoint and serverId.
+import path from "node:path";
+import { createTestPaseoDaemon } from "./paseo-daemon.js";
+
+const [, , daemonVersion, portArg, paseoHomeRoot] = process.argv;
+const listenPort = portArg ? Number(portArg) : 0;
+if (!Number.isInteger(listenPort) || listenPort < 0) {
+  throw new Error(`Invalid versioned daemon port: ${portArg ?? ""}`);
+}
+
+const daemon = await createTestPaseoDaemon({
+  daemonVersion,
+  ...(listenPort > 0 ? { listenPort } : {}),
+  ...(paseoHomeRoot
+    ? {
+        paseoHomeRoot,
+        staticDir: path.join(paseoHomeRoot, "static"),
+        // The caller removes the home so a replacement daemon keeps the same serverId.
+        cleanup: false,
+      }
+    : {}),
+  pluginsEnabled: true,
+  mcpEnabled: false,
+  corsAllowedOrigins: ["*"],
+});
+const response = await fetch(`http://127.0.0.1:${daemon.port}/api/status`);
+const { serverId } = await response.json();
+process.send?.({ port: daemon.port, serverId });
+process.once("SIGTERM", async () => {
+  await daemon.close();
+  process.exit(0);
+});
diff --git a/packages/server/src/server/test-utils/workspace-git-service-stub.ts b/packages/server/src/server/test-utils/workspace-git-service-stub.ts
index eca511c72e..53b8a44c1e 100644
--- a/packages/server/src/server/test-utils/workspace-git-service-stub.ts
+++ b/packages/server/src/server/test-utils/workspace-git-service-stub.ts
@@ -55,6 +55,7 @@ export function createNoopWorkspaceGitService(
     suggestBranchesForCwd: async () => [],
     listStashes: async () => [],
     listWorktrees: async () => [],
+    invalidateWorktrees: () => {},
     getProjectSlug: async (cwd: string) => {
       const snapshot = createNoGitWorkspaceRuntimeSnapshot(cwd);
       return deriveProjectSlug(cwd, snapshot.git.isGit ? snapshot.git.remoteUrl : null);
@@ -95,6 +96,7 @@ export function createNoopWorkspaceGitService(
         nativeTrackedFileCount: 0,
         pendingEventCount: 0,
         pendingReconciliationWorkCount: 0,
+        pendingClassificationCount: 0,
         reconciliationInFlightCount: 0,
         reconciliationCount: 0,
         scopedReconciliationCount: 0,
diff --git a/packages/server/src/server/utils/diff-highlighter.test.ts b/packages/server/src/server/utils/diff-highlighter.test.ts
index cc6754c50b..56f77fc706 100644
--- a/packages/server/src/server/utils/diff-highlighter.test.ts
+++ b/packages/server/src/server/utils/diff-highlighter.test.ts
@@ -190,6 +190,34 @@ index 1234567..abcdefg 100644
 `;
 
 describe("parseDiff", () => {
+  it.each(["-- comment", "++ marker"])(
+    "preserves hunk content resembling patch headers: %s",
+    (content) => {
+      const files = parseDiff(`diff --git a/example.txt b/example.txt
+index 1234567..abcdefg 100644
+--- a/example.txt
++++ b/example.txt
+@@ -1 +1 @@
+-${content} before
++${content} after
+`);
+
+      expect(files).toHaveLength(1);
+      expect(files[0]).toMatchObject({
+        path: "example.txt",
+        isNew: false,
+        isDeleted: false,
+        additions: 1,
+        deletions: 1,
+      });
+      expect(files[0].hunks[0].lines).toEqual([
+        { type: "header", content: "@@ -1 +1 @@" },
+        { type: "remove", content: `${content} before` },
+        { type: "add", content: `${content} after` },
+      ]);
+    },
+  );
+
   it("parses a simple diff with one hunk", () => {
     const files = parseDiff(SIMPLE_DIFF);
 
diff --git a/packages/server/src/server/utils/diff-highlighter.ts b/packages/server/src/server/utils/diff-highlighter.ts
index 4f7f800dc9..97d68d1fcd 100644
--- a/packages/server/src/server/utils/diff-highlighter.ts
+++ b/packages/server/src/server/utils/diff-highlighter.ts
@@ -79,16 +79,6 @@ function extractPathFromDiffHeader(lines: string[]): string {
   return "unknown";
 }
 
-function isMetadataLine(line: string): boolean {
-  return (
-    line.startsWith("index ") ||
-    line.startsWith("--- ") ||
-    line.startsWith("+++ ") ||
-    line.startsWith("new file mode") ||
-    line.startsWith("deleted file mode")
-  );
-}
-
 function parseHunkHeader(line: string): DiffHunk | null {
   const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
   if (!hunkMatch) return null;
@@ -116,8 +106,6 @@ function parseSectionBody(lines: string[]): ParsedSectionBody {
   for (let i = 1; i < lines.length; i++) {
     const line = lines[i];
 
-    if (isMetadataLine(line)) continue;
-
     const newHunk = parseHunkHeader(line);
     if (newHunk) {
       if (currentHunk) hunks.push(currentHunk);
@@ -332,30 +320,30 @@ export async function highlightDiffWithFileContent(
     return file;
   }
 
-  const reconstructedTokens = buildReconstructedTokenLookups(file);
-  let newTokensByLine = reconstructedTokens.newTokensByLine;
-  let oldTokensByLine = reconstructedTokens.oldTokensByLine;
-
-  if (typeof options.oldFileContent === "string") {
-    oldTokensByLine =
-      buildFullFileTokenLookup(options.oldFileContent, file.path) ?? oldTokensByLine;
-  }
-
+  let newTokensByLine: Map<number, HighlightToken[]> | null = null;
+  const oldTokensByLine =
+    typeof options.oldFileContent === "string"
+      ? buildFullFileTokenLookup(options.oldFileContent, file.path)
+      : null;
   if (typeof options.newFileContent === "string") {
-    newTokensByLine =
-      buildFullFileTokenLookup(options.newFileContent, file.path) ?? newTokensByLine;
+    newTokensByLine = buildFullFileTokenLookup(options.newFileContent, file.path);
+  } else {
+    try {
+      const fileContent = await readFile(resolve(cwd, file.path), "utf-8");
+      newTokensByLine = buildFullFileTokenLookup(fileContent, file.path);
+    } catch {
+      // Deleted or unavailable files use reconstructed tokens below.
+    }
+  }
+
+  if (newTokensByLine && oldTokensByLine)
     return applyTokensToHunks(file, newTokensByLine, oldTokensByLine);
-  }
-
-  const filePath = resolve(cwd, file.path);
-  try {
-    const fileContent = await readFile(filePath, "utf-8");
-    newTokensByLine = buildFullFileTokenLookup(fileContent, file.path) ?? newTokensByLine;
-  } catch {
-    // If file read fails (deleted file, etc.), fall back to reconstructed new-side tokens.
-  }
-
-  return applyTokensToHunks(file, newTokensByLine, oldTokensByLine);
+  const reconstructedTokens = buildReconstructedTokenLookups(file);
+  return applyTokensToHunks(
+    file,
+    newTokensByLine ?? reconstructedTokens.newTokensByLine,
+    oldTokensByLine ?? reconstructedTokens.oldTokensByLine,
+  );
 }
 
 function applyTokensToHunks(
diff --git a/packages/server/src/server/voice-local-agent.e2e.test.ts b/packages/server/src/server/voice-local-agent.e2e.test.ts
index 9dbe49d74a..c78759459a 100644
--- a/packages/server/src/server/voice-local-agent.e2e.test.ts
+++ b/packages/server/src/server/voice-local-agent.e2e.test.ts
@@ -31,8 +31,10 @@ function makeErrorHandler(reject: (error: Error) => void) {
   };
 }
 
-function makeSpeakToolHandler(resolve: (value: string) => void) {
-  return (msg: SessionMessage<"agent_stream">) => {
+function makeSpeakToolHandler(
+  resolve: (value: string) => void,
+): Parameters<DaemonTestContext["client"]["subscribeAgentTimeline"]>[1] {
+  return (msg) => {
     if (msg.type !== "agent_stream") return;
     if (msg.payload.event.type !== "timeline") return;
     const item = msg.payload.event.item;
@@ -131,7 +133,10 @@ function waitForSignal<T>(
     });
 
     const speakToolPromise = waitForSignal<string>(120000, (resolve, reject) => {
-      const offStream = ctx.client.on("agent_stream", makeSpeakToolHandler(resolve));
+      const offStream = ctx.client.subscribeAgentTimeline(
+        targetAgent.id,
+        makeSpeakToolHandler(resolve),
+      );
       const offError = ctx.client.on("activity_log", makeErrorHandler(reject));
       return () => {
         offStream();
diff --git a/packages/server/src/server/voice-roundtrip.e2e.test.ts b/packages/server/src/server/voice-roundtrip.e2e.test.ts
index 8808421b3d..97096c9938 100644
--- a/packages/server/src/server/voice-roundtrip.e2e.test.ts
+++ b/packages/server/src/server/voice-roundtrip.e2e.test.ts
@@ -225,7 +225,7 @@ for (const targetProvider of [
       const timelineToolAgentIds = new Set<string>();
       const activityErrors: string[] = [];
 
-      const offStream = ctx.client.on("agent_stream", (message) => {
+      const offStream = ctx.client.subscribeAgentTimeline(voiceAgentId, (message) => {
         if (message.type !== "agent_stream") {
           return;
         }
diff --git a/packages/server/src/server/web-ui.ts b/packages/server/src/server/web-ui.ts
index e7135a9eab..b59896c159 100644
--- a/packages/server/src/server/web-ui.ts
+++ b/packages/server/src/server/web-ui.ts
@@ -250,6 +250,22 @@ function serializeInlineScriptJson(value: unknown): string {
     .replace(/&/g, "\\u0026");
 }
 
+/**
+ * A Host header carries no port when the client used the scheme's default one,
+ * which is what every browser sends to a proxy terminating TLS on 443. The app
+ * parses `listen` with parseHostPort, which requires an explicit port and
+ * rejects the value outright, so the hint has to spell the port out.
+ */
+function hasExplicitPort(host: string): boolean {
+  if (host.startsWith("[")) {
+    // IPv6 literals are bracketed: [::1] has no port, [::1]:443 does.
+    const end = host.indexOf("]");
+    return end !== -1 && /^:\d{1,5}$/.test(host.slice(end + 1));
+  }
+  const colon = host.indexOf(":");
+  return colon !== -1 && colon === host.lastIndexOf(":") && /^\d{1,5}$/.test(host.slice(colon + 1));
+}
+
 function injectConnectionHint(
   html: string,
   req: Parameters<RequestHandler>[0],
@@ -257,8 +273,16 @@ function injectConnectionHint(
 ): string {
   const host = typeof req.headers.host === "string" ? req.headers.host : "";
   const useTls = req.protocol === "https";
+  let listen = host;
+  if (host && !hasExplicitPort(host)) {
+    let defaultPort = 80;
+    if (useTls) {
+      defaultPort = 443;
+    }
+    listen = `${host}:${defaultPort}`;
+  }
   const hint = {
-    listen: host,
+    listen,
     useTls,
     label,
   };
diff --git a/packages/server/src/server/websocket-server.browser-tools.test.ts b/packages/server/src/server/websocket-server.browser-tools.test.ts
index ba83e979d1..df0b02ad43 100644
--- a/packages/server/src/server/websocket-server.browser-tools.test.ts
+++ b/packages/server/src/server/websocket-server.browser-tools.test.ts
@@ -139,10 +139,11 @@ describe("WebSocketServer browser tools wiring", () => {
   it("keeps browser automation registered when a browser host client resumes", async () => {
     const harness = await startBrowserToolsDaemonHarness();
     const clientId = "browser-host-client-1";
-    await harness.connectBrowserHostClient({
+    const originalBrowserHost = await harness.connectBrowserHostClient({
       clientId,
       capabilities: browserHostCapabilities(),
     });
+    await originalBrowserHost.disconnect();
 
     const resumedBrowserHost = await harness.connectBrowserHostClient({
       clientId,
@@ -182,6 +183,7 @@ describe("WebSocketServer browser tools wiring", () => {
     await browserHost.nextBrowserRequest();
     expect(harness.broker.getPendingRequestCount()).toBe(1);
 
+    await browserHost.disconnect();
     await harness.connectBrowserHostClient({
       clientId,
       capabilities: browserHostCapabilities(["list_tabs"]),
@@ -225,6 +227,11 @@ async function startBrowserToolsDaemonHarness(): Promise<BrowserToolsDaemonHarne
       });
 
       await client.connect();
+      const capability = (options.capabilities ?? browserHostCapabilities())[
+        CLIENT_CAPS.browserHost
+      ] as { hostKind: "desktop app"; supportedCommands: BrowserAutomationCommandName[] };
+      const observation = client.registerBrowserHost(capability);
+      await observation.ready;
 
       return {
         clientId: clientId ?? "",
@@ -232,6 +239,7 @@ async function startBrowserToolsDaemonHarness(): Promise<BrowserToolsDaemonHarne
         respondToBrowserRequest: (response) =>
           client.sendBrowserAutomationExecuteResponse(response),
         async disconnect() {
+          await observation.release();
           requests.close();
           clients.delete(client);
           await client.close();
diff --git a/packages/server/src/server/websocket-server.notifications.test.ts b/packages/server/src/server/websocket-server.notifications.test.ts
index 15f4aa38d2..8ff692d580 100644
--- a/packages/server/src/server/websocket-server.notifications.test.ts
+++ b/packages/server/src/server/websocket-server.notifications.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "./session/owned-subscriptions/index.js";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { Server as HTTPServer } from "http";
 import type pino from "pino";
@@ -191,9 +192,15 @@ function connectClient(
   options: { subscribed?: boolean } = {},
 ) {
   const ws = createOpenSocket();
+  const delivery = new SessionDelivery(() => {});
+  delivery.attach(ws, false);
   asInternals<WebSocketServerInternals>(server).sessions.set(ws, {
     kind: "trusted",
-    session: createSessionWithActivity(activity, options.subscribed ?? true),
+    session: {
+      ...createSessionWithActivity(activity, options.subscribed ?? true),
+      delivery,
+      wantsSourceNotification: () => true,
+    },
     clientId: "client-test",
     appVersion: null,
     connectionLogger: createLogger(),
diff --git a/packages/server/src/server/websocket-server.relay-reconnect.test.ts b/packages/server/src/server/websocket-server.relay-reconnect.test.ts
index 3839263f52..25acb9946b 100644
--- a/packages/server/src/server/websocket-server.relay-reconnect.test.ts
+++ b/packages/server/src/server/websocket-server.relay-reconnect.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "./session/owned-subscriptions/index.js";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import type { Server as HTTPServer } from "http";
 import type pino from "pino";
@@ -17,6 +18,7 @@ import {
   TerminalStreamOpcode,
 } from "@getpaseo/protocol/terminal-stream-protocol";
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
+import { APPLICATION_SOCKET_LEASE_MS } from "./websocket/physical-socket.js";
 
 type SocketListener = (...args: unknown[]) => void;
 
@@ -46,15 +48,27 @@ const sessionMock = vi.hoisted(() => {
   const instances: MockSession[] = [];
 
   class MockSession {
-    cleanup = vi.fn(async () => {});
+    readonly delivery = new SessionDelivery((source, message) => {
+      const send = this.args.onMessageToSource as (source: object, message: unknown) => void;
+      send(source, message);
+    });
+    cleanup = vi.fn(async () => {
+      await this.delivery.close();
+    });
     handleMessage = vi.fn(async () => {});
     handleBinaryFrame = vi.fn((_frame: unknown) => {});
     supports = vi.fn((capability: string) => this.args.clientCapabilities?.[capability] === true);
-    updateClientCapabilities = vi.fn((capabilities: Record<string, unknown> | null) => {
-      this.args.clientCapabilities = capabilities;
+    updateClientCapabilities = vi.fn(
+      (capabilities: Record<string, unknown> | null, source: object) => {
+        this.args.clientCapabilities = capabilities;
+        this.delivery.attach(source, capabilities?.owned_subscriptions === true);
+      },
+    );
+    clearAgentTimelineSubscription = vi.fn((source: object) => {
+      void this.delivery.detach(source);
     });
-    clearAgentTimelineSubscription = vi.fn();
     getClientActivity = vi.fn(() => null);
+    wantsSourceEvent = (source: object) => !this.delivery.isModern(source);
     getSessionId = vi.fn(() => "mock-session-id");
     getPermissions = vi.fn(() => this.args.permissions as string[]);
     allowsInbound = vi.fn(() => true);
@@ -228,6 +242,7 @@ function createServer(options?: {
   speechReadiness?: SpeechReadinessSnapshot | null;
   logger?: ReturnType<typeof createLogger>;
   startPaused?: boolean;
+  auth?: { password: string; localCredential: () => string | null };
 }) {
   const speechReadiness = options?.speechReadiness ?? null;
   const daemonConfigStore = {
@@ -258,7 +273,7 @@ function createServer(options?: {
     null,
     { allowedOrigins: new Set(), startPaused: options?.startPaused },
     createWorkspaceAutoNameStub(),
-    undefined,
+    options?.auth,
     speechReadiness
       ? {
           resolveStt: () => null,
@@ -412,7 +427,7 @@ async function attachRelayAndHello(params: {
 }) {
   await params.server.attachExternalSocket(params.socket, { transport: "relay" });
   params.socket.emit("message", JSON.stringify(createHelloMessage(params.clientId)));
-  expect(params.socket.sent.length).toBeGreaterThan(0);
+  await vi.waitFor(() => expect(params.socket.sent.length).toBeGreaterThan(0));
   const envelope = parseSentEnvelope(params.socket.sent[0]);
   expect(envelope.type).toBe("session");
   const serverInfo = parseServerInfoStatusPayload(envelope.message?.payload);
@@ -431,7 +446,7 @@ async function attachDirectAndHello(params: {
     createDirectRequest(),
   );
   params.socket.emit("message", JSON.stringify(createHelloMessage(params.clientId)));
-  expect(params.socket.sent.length).toBeGreaterThan(0);
+  await vi.waitFor(() => expect(params.socket.sent.length).toBeGreaterThan(0));
   const envelope = parseSentEnvelope(params.socket.sent[0]);
   expect(envelope.type).toBe("session");
   const serverInfo = parseServerInfoStatusPayload(envelope.message?.payload);
@@ -471,6 +486,96 @@ function holdSessionCleanup(session: (typeof sessionMock.instances)[number]): {
 }
 
 describe("relay external socket reconnect behavior", () => {
+  test("closes only a hello socket when post-admission setup throws", async () => {
+    const server = createServer();
+    class ThrowOnceSocket extends MockSocket {
+      private firstClose = true;
+      override close(code?: number, reason?: string): void {
+        if (this.firstClose) {
+          this.firstClose = false;
+          throw new Error("socket close failed during hello");
+        }
+        super.close(code, reason);
+      }
+    }
+    const failed = new ThrowOnceSocket();
+    try {
+      await server.attachExternalSocket(failed, { transport: "relay" });
+      failed.emit("message", JSON.stringify(createHelloMessage("plugin:not-a-plugin")));
+      await vi.waitFor(() => expect(failed.readyState).toBe(3));
+      const initiallyFailed = new ThrowOnceSocket();
+      await server.attachExternalSocket(
+        initiallyFailed,
+        { transport: "relay" },
+        null,
+        createHelloMessage("plugin:initially-invalid"),
+      );
+      await vi.waitFor(() => expect(initiallyFailed.readyState).toBe(3));
+      const healthy = new MockSocket();
+      await attachRelayAndHello({ server, socket: healthy, clientId: "still-running" });
+    } finally {
+      await server.close();
+    }
+  });
+
+  test("does not log malformed pre-admission credential frames", async () => {
+    const logger = createLogger();
+    const server = createServer({ logger });
+    const socket = new MockSocket();
+    try {
+      await server.attachExternalSocket(socket, { transport: "relay" });
+      socket.emit("message", '{"type":"hello","auth":{"kind":"password","password":"log-secret"},');
+      await vi.waitFor(() => expect(socket.readyState).toBe(3));
+      expect(JSON.stringify(logger.error.mock.calls)).not.toContain("log-secret");
+    } finally {
+      await server.close();
+    }
+  });
+  test("admits a hello password and an old relay hello, but rejects a wrong password", async () => {
+    const server = createServer({
+      auth: {
+        password: "$2b$12$OLxyuuP9uLK30Uzc4wQX0O6liuU/Q1t5P2b0Ebf36mULvpVK3DRZW",
+        localCredential: () => "local-token",
+      },
+    });
+    try {
+      const passwordSocket = new MockSocket();
+      await server.attachExternalSocket(passwordSocket, { transport: "relay" });
+      passwordSocket.emit(
+        "message",
+        JSON.stringify({
+          ...createHelloMessage("relay-password"),
+          auth: { kind: "password", password: "correct-password" },
+        }),
+      );
+      await vi.waitFor(() => expect(sentServerInfoEnvelopes(passwordSocket)).toHaveLength(1));
+
+      const legacySocket = new MockSocket();
+      await server.attachExternalSocket(legacySocket, { transport: "relay" });
+      legacySocket.emit("message", JSON.stringify(createHelloMessage("relay-legacy")));
+      await vi.waitFor(() => expect(sentServerInfoEnvelopes(legacySocket)).toHaveLength(1));
+
+      const wrongSocket = new MockSocket();
+      await server.attachExternalSocket(wrongSocket, { transport: "relay" });
+      wrongSocket.emit(
+        "message",
+        JSON.stringify({
+          ...createHelloMessage("relay-wrong"),
+          auth: { kind: "password", password: "wrong" },
+        }),
+      );
+      await vi.waitFor(() => expect(wrongSocket.readyState).toBe(3));
+      expect(wrongSocket.sent).toContain(
+        JSON.stringify({
+          type: "hello.rejected",
+          reason: "incorrect_password",
+          accepts: ["password"],
+        }),
+      );
+    } finally {
+      await server.close();
+    }
+  });
   beforeEach(() => {
     sessionMock.instances.length = 0;
     vi.useFakeTimers();
@@ -521,7 +626,7 @@ describe("relay external socket reconnect behavior", () => {
     const secondAttachment = await server.attachPluginSocket("exclusive", secondSocket);
     secondSocket.emit("message", JSON.stringify(createHelloMessage("plugin:exclusive")));
 
-    expect(sessionMock.instances).toHaveLength(2);
+    await vi.waitFor(() => expect(sessionMock.instances).toHaveLength(2));
     firstSocket.emit("close", 1000, "plugin stopped");
     await firstAttachment.closed;
     expect(sessionMock.instances[0]?.cleanup).toHaveBeenCalledOnce();
@@ -533,13 +638,40 @@ describe("relay external socket reconnect behavior", () => {
     await server.close();
   });
 
+  test("keeps a plugin socket whose heartbeat stalls past the application lease", async () => {
+    const server = createServer();
+    const socket = new MockSocket();
+    await server.attachPluginSocket("stalled", socket);
+    socket.emit("message", JSON.stringify(createHelloMessage("plugin:stalled")));
+    await vi.waitFor(() => expect(sentServerInfoEnvelopes(socket)).toHaveLength(1));
+    socket.emit("message", JSON.stringify({ type: "ping" }));
+
+    // Event loop starved past the lease: no further ping arrives.
+    await vi.advanceTimersByTimeAsync(APPLICATION_SOCKET_LEASE_MS * 2);
+
+    expect(socket.readyState).toBe(1);
+    await server.close();
+  });
+
+  test("still reaps an ordinary socket whose heartbeat stalls past the application lease", async () => {
+    const server = createServer();
+    const socket = new MockSocket();
+    await attachRelayAndHello({ server, socket, clientId: "cid-stalled" });
+    socket.emit("message", JSON.stringify({ type: "ping" }));
+
+    await vi.advanceTimersByTimeAsync(APPLICATION_SOCKET_LEASE_MS * 2);
+
+    expect(socket.readyState).toBe(3);
+    await server.close();
+  });
+
   test("rejects ordinary sockets that claim the reserved plugin client id", async () => {
     const server = createServer();
     const socket = new MockSocket();
     await server.attachExternalSocket(socket, { transport: "relay" });
     socket.emit("message", JSON.stringify(createHelloMessage("plugin:not-a-plugin")));
 
-    expect(socket.readyState).toBe(3);
+    await vi.waitFor(() => expect(socket.readyState).toBe(3));
     expect(sessionMock.instances).toHaveLength(0);
     await server.close();
   });
@@ -557,7 +689,7 @@ describe("relay external socket reconnect behavior", () => {
         }),
       ),
     );
-    expect(sessionMock.instances).toHaveLength(1);
+    await vi.waitFor(() => expect(sessionMock.instances).toHaveLength(1));
     const session = sessionMock.instances[0];
     expect(session.args.clientCapabilities).toEqual({
       [CLIENT_CAPS.reasoningMergeEnum]: true,
@@ -605,7 +737,7 @@ describe("relay external socket reconnect behavior", () => {
     const pluginSocket = new MockSocket();
     const attachment = await server.attachPluginSocket("startup", pluginSocket);
     pluginSocket.emit("message", JSON.stringify(createHelloMessage("plugin:startup")));
-    expect(sessionMock.instances).toHaveLength(1);
+    await vi.waitFor(() => expect(sessionMock.instances).toHaveLength(1));
 
     server.beginAcceptingConnections();
     const readySocket = new MockSocket();
@@ -696,6 +828,7 @@ describe("relay external socket reconnect behavior", () => {
       { principalId: "hub:daemon-1", permissions: ["hub.execute"] },
     );
     hubSocket.emit("message", JSON.stringify(createHelloMessage(clientId)));
+    await vi.waitFor(() => expect(hubSocket.sent.length).toBeGreaterThan(0));
     const hubEnvelope = parseSentEnvelope(hubSocket.sent[0]);
     const hubInfo = parseServerInfoStatusPayload(hubEnvelope.message?.payload);
 
@@ -742,6 +875,7 @@ describe("relay external socket reconnect behavior", () => {
       relayConnectionId: "relay-conn-1",
     });
     socket.emit("message", JSON.stringify(createHelloMessage("cid-control-log")));
+    await vi.waitFor(() => expect(sentServerInfoEnvelopes(socket)).toHaveLength(1));
     socket.emit(
       "message",
       JSON.stringify({
@@ -889,7 +1023,7 @@ describe("relay external socket reconnect behavior", () => {
           payload: {
             requestId: "failing-provider-diagnostic",
             requestType: "provider_diagnostic_request",
-            error: "Invalid message",
+            error: "Invalid message: handler exploded",
             code: "invalid_message",
           },
         },
@@ -1008,6 +1142,7 @@ describe("relay external socket reconnect behavior", () => {
     expect(serverInfo.features?.canonicalSubmittedPrompts).toBe(true);
     expect(serverInfo.features?.providersSnapshotCwd).toBe(true);
     expect(serverInfo.features?.pluginLogs).toBe(true);
+    expect(serverInfo.features?.workspaceMarkUnread).toBe(true);
     expect(serverInfo.features?.["terminal-input-mode-replay"]).toBe(true);
     expect(serverInfo.features?.["terminal-size-ownership"]).toBe(true);
     expect(serverInfo.features?.agentTurnIdentity).toBeUndefined();
diff --git a/packages/server/src/server/websocket-server.terminal-notifications.test.ts b/packages/server/src/server/websocket-server.terminal-notifications.test.ts
index 0f4e7f25ff..3f77a0482e 100644
--- a/packages/server/src/server/websocket-server.terminal-notifications.test.ts
+++ b/packages/server/src/server/websocket-server.terminal-notifications.test.ts
@@ -1,3 +1,4 @@
+import { SessionDelivery } from "./session/owned-subscriptions/index.js";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { Server as HTTPServer } from "http";
 import type pino from "pino";
@@ -194,9 +195,13 @@ function createOpenSocket() {
 
 function connectClient(server: VoiceAssistantWebSocketServer, subscribed = true) {
   const ws = createOpenSocket();
+  const delivery = new SessionDelivery(() => {});
+  delivery.attach(ws, false);
   asInternals<{ sessions: Map<unknown, unknown> }>(server).sessions.set(ws, {
     kind: "trusted",
     session: {
+      delivery,
+      wantsSourceNotification: () => true,
       getClientActivity: vi.fn(() => null),
       subscribesToTerminalDirectory: vi.fn(async () => subscribed),
     },
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 8cf4af4e2e..219e04b0c2 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -1,7 +1,11 @@
+import { stat } from "node:fs/promises";
+import type { CreationSnapshot } from "@getpaseo/protocol/messages";
+import { CreationService } from "./creation/index.js";
+import { MessageReceipts } from "./message-receipts/index.js";
 import { WebSocket, WebSocketServer } from "ws";
 import type { IncomingMessage, Server as HTTPServer } from "http";
 import { join } from "path";
-import { hostname as getHostname } from "node:os";
+import { getHostName } from "./host-name.js";
 import { randomUUID } from "node:crypto";
 import { monitorEventLoopDelay } from "node:perf_hooks";
 import type { AgentManager, AgentMetricsSnapshot } from "./agent/agent-manager.js";
@@ -16,6 +20,7 @@ import type { CheckoutDiffManager, CheckoutDiffMetrics } from "./checkout-diff-m
 import type { DaemonConfigStore, MutableDaemonConfig } from "./daemon-config-store.js";
 import {
   type ServerInfoStatusPayload,
+  type ScriptStatusUpdateMessage,
   type SessionOutboundMessage,
   type WorkspaceSetupSnapshot,
   type WSHelloMessage,
@@ -74,28 +79,25 @@ import {
 import { createGitHubService } from "../services/github-service.js";
 import type { ForgeService } from "../services/forge-service.js";
 import {
+  extractHttpBearerToken,
   extractWsBearerProtocol,
   extractWsBearerToken,
-  isBearerTokenValid,
+  isBearerTokenValidAsync,
   type DaemonAuthConfig,
 } from "./auth.js";
+import { resolveSessionAdmission } from "./session-admission-auth.js";
 import {
   WebSocketRuntimeMetricsWindow,
   type WebSocketRuntimeCounters,
   type WebSocketRuntimeDiagnosticSnapshot,
 } from "./websocket/runtime-metrics.js";
-import { ProviderUsageService } from "../services/quota-fetcher/service.js";
 import { getProcessMemoryDiagnostics, getProcessUptimeSeconds } from "./process-diagnostics.js";
 import {
   CLIENT_SHUTDOWN_RPC_REASON,
   normalizeClientRestartRpcReason,
 } from "./lifecycle-reasons.js";
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
-import type { BrowserAutomationExecuteResponse } from "@getpaseo/protocol/browser-automation/rpc-schemas";
-import {
-  BrowserAutomationHostCapabilitySchema,
-  type BrowserAutomationHostCapability,
-} from "@getpaseo/protocol/browser-automation/capabilities";
+
 import type { BrowserToolsBroker } from "./browser-tools/broker.js";
 import type { DaemonRuntimeConfig } from "./session/daemon/daemon-session.js";
 import { DirectorySyncService } from "./directory-sync/index.js";
@@ -130,7 +132,8 @@ interface PendingConnection {
   connectionLogger: pino.Logger;
   helloTimeout: ReturnType<typeof setTimeout> | null;
   identity: WebSocketConnectionIdentity;
-  admission: SessionAdmission;
+  admission: SessionAdmission | null;
+  authenticating: boolean;
 }
 
 interface WebSocketConnectionIdentity {
@@ -243,6 +246,7 @@ function createFallbackWorkspaceGitService(): WorkspaceGitService {
     suggestBranchesForCwd: async () => [],
     listStashes: async () => [],
     listWorktrees: async () => [],
+    invalidateWorktrees: () => {},
     getProjectSlug: async (cwd: string) => {
       const snapshot = createFallbackWorkspaceGitSnapshot(cwd);
       return deriveProjectSlug(cwd, snapshot.git.isGit ? snapshot.git.remoteUrl : null);
@@ -282,6 +286,7 @@ function createFallbackWorkspaceGitService(): WorkspaceGitService {
         nativeTrackedFileCount: 0,
         pendingEventCount: 0,
         pendingReconciliationWorkCount: 0,
+        pendingClassificationCount: 0,
         reconciliationInFlightCount: 0,
         reconciliationCount: 0,
         scopedReconciliationCount: 0,
@@ -417,15 +422,6 @@ function bufferFromWsData(data: Buffer | ArrayBuffer | Buffer[] | string): Buffe
   return Buffer.from(data);
 }
 
-function getBrowserHostCapability(
-  capabilities: Record<string, unknown> | null,
-): BrowserAutomationHostCapability | null {
-  const parsed = BrowserAutomationHostCapabilitySchema.safeParse(
-    capabilities?.[CLIENT_CAPS.browserHost],
-  );
-  return parsed.success ? parsed.data : null;
-}
-
 export interface WebSocketLike {
   readyState: number;
   bufferedAmount?: number;
@@ -462,11 +458,6 @@ interface PluginSessionConnection extends SessionConnectionBase {
 
 type SessionConnection = ReconnectableSessionConnection | PluginSessionConnection;
 
-interface BrowserToolsRegistration {
-  capabilitySignature: string;
-  unregister: () => void;
-}
-
 interface SocketSessionOptions {
   clientId: string;
   appVersion: string | null;
@@ -477,7 +468,7 @@ interface SocketSessionOptions {
   onMessageToSource?: (source: object, message: SessionOutboundMessage) => void;
   onBinaryMessage?: (frame: Uint8Array) => void;
   onBinaryMessageToSource?: (source: object, frame: Uint8Array) => Promise<void>;
-  getTransportBufferedAmount?: () => number | null;
+  getTransportBufferedAmount?: (source?: object) => number | null;
   onLifecycleIntent?: (intent: SessionLifecycleIntent) => void;
   hubExecutionAgents?: HubExecutionAgents;
   hubRelationships?: HubRelationshipManagement;
@@ -546,6 +537,8 @@ export class VoiceAssistantWebSocketServer {
   private readonly daemonRuntimeConfig: DaemonRuntimeConfig | undefined;
   private readonly agentManager: AgentManager;
   private readonly agentStorage: AgentStorage;
+  private readonly messageReceipts: MessageReceipts;
+  private readonly creationService: CreationService;
   private readonly projectRegistry: ProjectRegistry;
   private readonly workspaceRegistry: WorkspaceRegistry;
   private readonly workspaceLabelService: WorkspaceLabelService | null;
@@ -556,6 +549,8 @@ export class VoiceAssistantWebSocketServer {
   private readonly workspaceAutoName: WorkspaceAutoName;
   private readonly downloadTokenStore: DownloadTokenStore;
   private readonly paseoHome: string;
+  private readonly passwordHash: string | undefined;
+  private readonly credentialSource: DaemonAuthConfig | undefined;
   private readonly worktreesRoot: string | undefined;
   private readonly daemonConfigStore: DaemonConfigStore;
   private readonly pushNotifications: PushNotifications;
@@ -590,11 +585,9 @@ export class VoiceAssistantWebSocketServer {
   private eventLoopDelayMonitor: ReturnType<typeof monitorEventLoopDelay> | null = null;
   private unsubscribeSpeechReadiness: (() => void) | null = null;
   private unsubscribeDaemonConfigChange: (() => void) | null = null;
-  private readonly providerUsageService: ProviderUsageService;
   private unsubscribeTerminalActivity: (() => void) | null = null;
   private readonly browserToolsBroker: BrowserToolsBroker | null;
   private readonly hubRelationships: HubRelationshipManagement | null;
-  private readonly browserToolsRegistrations = new Map<string, BrowserToolsRegistration>();
   private connectionLifecycle: "starting" | "accepting" | "stopping" = "accepting";
   private readonly advertiseDaemonStatusRpc: boolean;
   private readonly advertiseRelayConfig: boolean;
@@ -602,6 +595,25 @@ export class VoiceAssistantWebSocketServer {
   private readonly pluginRuntime: SessionOptions["pluginRuntime"];
   private readonly orchestrationSkills: SessionOptions["orchestrationSkills"];
 
+  private async validateCompletedCreation(snapshot: CreationSnapshot): Promise<void> {
+    if (snapshot.workspace && snapshot.kind === "workspace") {
+      const workspace = await this.workspaceRegistry.get(snapshot.workspace.id);
+      if (!workspace) throw new Error("Previously created workspace no longer exists");
+      const directory = await stat(workspace.cwd).catch(() => null);
+      if (!directory?.isDirectory())
+        throw Object.assign(new Error(`Directory not found: ${workspace.cwd}`), {
+          code: "directory_not_found",
+        });
+    }
+    if (
+      snapshot.agentId &&
+      !this.agentManager.getAgent(snapshot.agentId) &&
+      !(await this.agentStorage.get(snapshot.agentId))
+    ) {
+      throw new Error("Previously created agent no longer exists");
+    }
+  }
+
   constructor(
     server: HTTPServer,
     logger: pino.Logger,
@@ -659,6 +671,7 @@ export class VoiceAssistantWebSocketServer {
       throw new MissingDaemonVersionError();
     }
     this.daemonVersion = daemonVersion.trim();
+    this.credentialSource = auth;
     this.daemonRuntimeConfig = daemonRuntimeConfig;
     this.browserToolsBroker = browserToolsBroker ?? null;
     this.hubRelationships = hubRelationships ?? null;
@@ -666,6 +679,13 @@ export class VoiceAssistantWebSocketServer {
     this.orchestrationSkills = orchestrationSkills;
     this.agentManager = agentManager;
     this.agentStorage = agentStorage;
+    this.messageReceipts = new MessageReceipts(join(paseoHome, "agent-requests"));
+    this.creationService = new CreationService(
+      join(paseoHome, "creations"),
+      this.logger.child({ module: "creation" }),
+      (snapshot) => this.validateCompletedCreation(snapshot),
+      join(paseoHome, "agent-requests"),
+    );
     this.projectRegistry = projectRegistry ?? createNoopProjectRegistry();
     this.workspaceRegistry = workspaceRegistry ?? createNoopWorkspaceRegistry();
     this.workspaceLabelService = workspaceLabelService ?? null;
@@ -680,6 +700,7 @@ export class VoiceAssistantWebSocketServer {
     this.workspaceAutoName = workspaceAutoName;
     this.downloadTokenStore = downloadTokenStore;
     this.paseoHome = paseoHome;
+    this.passwordHash = auth?.password;
     this.worktreesRoot = daemonRuntimeConfig?.worktreesRoot;
     this.daemonConfigStore = daemonConfigStore;
     this.mcpBaseUrl = mcpBaseUrl;
@@ -733,10 +754,6 @@ export class VoiceAssistantWebSocketServer {
       });
     });
 
-    this.providerUsageService = new ProviderUsageService({
-      logger: this.logger,
-    });
-
     this.wss = this.createWebSocketServer(server, wsConfig, auth);
     this.startRuntimeMetricsInterval();
     this.startApplicationSocketLeaseInterval();
@@ -900,23 +917,39 @@ export class VoiceAssistantWebSocketServer {
     request: IncomingMessage,
     password: string | undefined,
   ): Promise<void> {
-    if (password) {
-      const requestMetadata = extractSocketRequestMetadata(request);
+    // Header validation is asynchronous. Buffer frames until the socket has a
+    // pending hello handler so an eager client cannot lose its first message.
+    ws.pause();
+    try {
+      // COMPAT(headerAuth): added in v0.9.1, remove after 2027-03-24.
       const protocol = extractWsBearerProtocol(request.headers["sec-websocket-protocol"]);
-      const token = extractWsBearerToken(protocol);
-      const isAuthorized = isBearerTokenValid({ password, token });
-      if (!isAuthorized) {
-        const reason = token === null ? "Password required" : "Incorrect password";
-        this.logger.warn(
-          { ...requestMetadata, hasToken: token !== null },
-          "Rejected WebSocket connection with invalid daemon password",
-        );
-        ws.close(WS_CLOSE_DAEMON_AUTH_FAILED, reason);
-        return;
+      const token =
+        extractHttpBearerToken(request.headers.authorization) ?? extractWsBearerToken(protocol);
+      const hasHeaderCredential = token !== null;
+      if (password && hasHeaderCredential) {
+        const requestMetadata = extractSocketRequestMetadata(request);
+        const isAuthorized = await isBearerTokenValidAsync({ password, token });
+        if (!isAuthorized) {
+          const reason = "Incorrect password";
+          this.logger.warn(
+            { ...requestMetadata, hasToken: true },
+            "Rejected WebSocket connection with invalid daemon password",
+          );
+          ws.close(WS_CLOSE_DAEMON_AUTH_FAILED, reason);
+          return;
+        }
       }
-    }
 
-    await this.attachSocket(ws, request);
+      await this.attachSocket(
+        ws,
+        request,
+        undefined,
+        false,
+        hasHeaderCredential ? OWNER_SESSION_ADMISSION : null,
+      );
+    } finally {
+      ws.resume();
+    }
   }
 
   public broadcast(message: WSOutboundMessage): void {
@@ -947,6 +980,12 @@ export class VoiceAssistantWebSocketServer {
     }
   }
 
+  public publishScriptStatusUpdate(message: ScriptStatusUpdateMessage): void {
+    for (const session of this.listSessions()) {
+      session.emitServerMessage(message);
+    }
+  }
+
   public publishSpeechReadiness(readiness: SpeechReadinessSnapshot | null): void {
     this.updateServerCapabilities(buildServerCapabilities({ readiness }));
   }
@@ -963,7 +1002,7 @@ export class VoiceAssistantWebSocketServer {
   public async attachExternalSocket(
     ws: WebSocketLike,
     metadata?: ExternalSocketMetadata,
-    admission: SessionAdmission = OWNER_SESSION_ADMISSION,
+    admission: SessionAdmission | null = null,
     initialHello?: WSHelloMessage,
   ): Promise<void> {
     if (metadata?.transport === "relay") {
@@ -986,7 +1025,7 @@ export class VoiceAssistantWebSocketServer {
     this.pluginSocketIds.set(ws, pluginId);
     this.pluginSocketCleanup.set(ws, resolve);
     try {
-      await this.attachSocket(ws, undefined, undefined, true);
+      await this.attachSocket(ws, undefined, undefined, true, OWNER_SESSION_ADMISSION);
     } catch (error) {
       this.pluginSocketIds.delete(ws);
       this.finishPluginSocketCleanup(ws);
@@ -1000,14 +1039,13 @@ export class VoiceAssistantWebSocketServer {
     permissions: readonly DaemonPermission[],
   ): void {
     for (const pending of this.pendingConnections.values()) {
-      if (pending.admission.principalId === principalId) {
+      if (pending.admission?.principalId === principalId) {
         pending.admission = { ...pending.admission, permissions };
       }
     }
     for (const connection of new Set(this.externalSessionsByKey.values())) {
       if (connection.principalId === principalId) {
         connection.session.setPermissions(permissions);
-        this.syncBrowserToolsClientRegistration(connection);
       }
     }
   }
@@ -1100,18 +1138,38 @@ export class VoiceAssistantWebSocketServer {
     this.sessions.clear();
     this.socketIdentities.clear();
     this.externalSessionsByKey.clear();
-    for (const clientId of this.browserToolsRegistrations.keys()) {
-      this.unregisterBrowserToolsClient(clientId);
-    }
     this.wss.close();
   }
 
   private sendToClient(ws: WebSocketLike, message: WSOutboundMessage): void {
-    this.sendMessageToSockets([ws], message);
+    this.sendMessageToSockets([ws], message, true);
   }
 
-  private sendMessageToSockets(sockets: Iterable<WebSocketLike>, message: WSOutboundMessage): void {
-    const writableSockets = [...sockets].filter((ws) => this.ensureOutboundCapacity(ws, 0));
+  private sendMessageToSockets(
+    sockets: Iterable<WebSocketLike>,
+    message: WSOutboundMessage,
+    reportRejection = false,
+  ): void {
+    const writableSockets = [...sockets].filter((ws) => {
+      if (
+        message.type === "session" &&
+        this.sessions.get(ws)?.session.delivery.permits(ws, message.message) !== true
+      ) {
+        this.incrementRuntimeCounter("applicationJsonRejected");
+        // Legacy broadcasts intentionally exclude modern sockets. Targeted failures are bugs.
+        if (reportRejection)
+          this.logger.warn(
+            {
+              messageType: message.message.type,
+              status:
+                message.message.type === "status" ? message.message.payload.status : undefined,
+            },
+            "ws_application_delivery_denied",
+          );
+        return false;
+      }
+      return this.ensureOutboundCapacity(ws, 0);
+    });
     if (writableSockets.length === 0) {
       return;
     }
@@ -1132,13 +1190,24 @@ export class VoiceAssistantWebSocketServer {
     }
   }
 
-  private sendBinaryToClient(ws: WebSocketLike, frame: Uint8Array): void {
+  private sendBinaryToClient(ws: WebSocketLike, frame: Uint8Array, reportRejection = true): void {
+    if (!this.sessions.get(ws)?.session.delivery.permitsBinary(ws, frame)) {
+      this.incrementRuntimeCounter("applicationBinaryRejected");
+      if (reportRejection)
+        this.logger.warn({ bytes: frame.byteLength }, "ws_application_binary_delivery_denied");
+      return;
+    }
     this.sendFrameToClient(ws, frame, outboundFrameByteLength(frame), () => {
       this.runtimeMetrics.recordOutboundBinaryFrame(ws.bufferedAmount);
     });
   }
 
   private async sendBinaryToClientAndWait(ws: WebSocketLike, frame: Uint8Array): Promise<void> {
+    if (!this.sessions.get(ws)?.session.delivery.permitsBinary(ws, frame)) {
+      this.incrementRuntimeCounter("applicationBinaryRejected");
+      this.logger.warn({ bytes: frame.byteLength }, "ws_application_binary_delivery_denied");
+      return;
+    }
     try {
       const sent = await sendBoundedPhysicalFrameAndWait({
         socket: ws,
@@ -1229,7 +1298,7 @@ export class VoiceAssistantWebSocketServer {
 
   private sendBinaryToConnection(connection: SessionConnection, frame: Uint8Array): void {
     for (const ws of connection.sockets) {
-      this.sendBinaryToClient(ws, frame);
+      this.sendBinaryToClient(ws, frame, false);
     }
   }
 
@@ -1238,7 +1307,7 @@ export class VoiceAssistantWebSocketServer {
     request?: unknown,
     metadata?: ExternalSocketMetadata,
     allowDuringStartup = false,
-    admission: SessionAdmission = OWNER_SESSION_ADMISSION,
+    admission: SessionAdmission | null = null,
     initialHello?: WSHelloMessage,
   ): Promise<void> {
     if (
@@ -1263,6 +1332,7 @@ export class VoiceAssistantWebSocketServer {
       helloTimeout: null,
       identity,
       admission,
+      authenticating: false,
     };
     const timeout = setTimeout(() => {
       if (this.pendingConnections.get(ws) !== pending) {
@@ -1294,9 +1364,7 @@ export class VoiceAssistantWebSocketServer {
       },
       "Client connected; awaiting hello",
     );
-    if (initialHello) {
-      this.handleHello({ ws, message: initialHello, pending });
-    }
+    if (initialHello) await this.handleHelloSafely({ ws, message: initialHello, pending });
   }
 
   private createSessionConnection(params: {
@@ -1342,10 +1410,11 @@ export class VoiceAssistantWebSocketServer {
         }
         await this.sendBinaryToClientAndWait(source as WebSocketLike, frame);
       },
-      getTransportBufferedAmount: () => {
+      getTransportBufferedAmount: (source) => {
         if (!connection) {
           return null;
         }
+        if (source) return (source as WebSocketLike).bufferedAmount ?? null;
         // Relay-attached sockets are a WebSocketLike that doesn't expose
         // bufferedAmount. Return null when no socket gives a signal so the
         // terminal fallback can't mistake "no signal" for "client keeping up";
@@ -1379,12 +1448,13 @@ export class VoiceAssistantWebSocketServer {
       lifecycle.kind === "ephemeral-plugin"
         ? { ...base, lifecycle: "ephemeral-plugin", pluginId: lifecycle.pluginId }
         : { ...base, lifecycle: "reconnectable", externalDisconnectCleanupTimeout: null };
-    session.updateClientCapabilities(clientCapabilities, ws);
+    session.updateClientCapabilities(clientCapabilities, ws, appVersion);
     return connection;
   }
 
   private createSocketSession(options: SocketSessionOptions): Session {
     return new Session({
+      browserToolsBroker: this.browserToolsBroker,
       clientId: options.clientId,
       appVersion: options.appVersion,
       clientCapabilities: options.clientCapabilities,
@@ -1403,12 +1473,15 @@ export class VoiceAssistantWebSocketServer {
           ),
         );
       },
+      publishScriptStatusUpdate: (message) => this.publishScriptStatusUpdate(message),
       downloadTokenStore: this.downloadTokenStore,
       pushNotifications: this.pushNotifications,
       paseoHome: this.paseoHome,
       worktreesRoot: this.worktreesRoot,
       agentManager: this.agentManager,
       agentStorage: this.agentStorage,
+      messageReceipts: this.messageReceipts,
+      creationService: this.creationService,
       projectRegistry: this.projectRegistry,
       workspaceRegistry: this.workspaceRegistry,
       workspaceLabelService: this.workspaceLabelService ?? undefined,
@@ -1427,7 +1500,6 @@ export class VoiceAssistantWebSocketServer {
       tts: () => this.speech?.resolveTts() ?? null,
       terminalManager: this.terminalManager,
       providerSnapshotManager: this.providerSnapshotManager,
-      providerUsageService: this.providerUsageService,
       hubExecutionAgents: options.hubExecutionAgents,
       hubRelationships: options.hubRelationships,
       serviceProxy: this.serviceProxy ?? undefined,
@@ -1444,6 +1516,8 @@ export class VoiceAssistantWebSocketServer {
       },
       voiceBridge: {
         registerVoiceSpeakHandler: (agentId, handler) => {
+          if (this.voiceSpeakHandlers.has(agentId))
+            throw new Error("Voice mode is already active for this agent");
           this.voiceSpeakHandlers.set(agentId, handler);
         },
         unregisterVoiceSpeakHandler: (agentId) => {
@@ -1485,14 +1559,14 @@ export class VoiceAssistantWebSocketServer {
     return pending;
   }
 
-  private handleHello(params: {
+  private async handleHello(params: {
     ws: WebSocketLike;
     message: WSHelloMessage;
     pending: PendingConnection;
-  }): void {
+  }): Promise<void> {
     const { ws, message, pending } = params;
 
-    if (message.protocolVersion !== WS_PROTOCOL_VERSION) {
+    if (message.protocolVersion < 1) {
       this.clearPendingConnection(ws);
       pending.connectionLogger.warn(
         {
@@ -1501,14 +1575,13 @@ export class VoiceAssistantWebSocketServer {
         },
         "Rejected hello due to protocol version mismatch",
       );
-      try {
-        ws.close(WS_CLOSE_INCOMPATIBLE_PROTOCOL, "Incompatible protocol version");
-      } catch {
-        // ignore close errors
-      }
+      await this.rejectHello(ws, message, "incompatible_protocol");
       return;
     }
 
+    pending.authenticating = true;
+    if (!pending.admission && !(await this.admitPendingHello(ws, message, pending))) return;
+
     const clientId = message.clientId.trim();
     if (clientId.length === 0) {
       this.clearPendingConnection(ws);
@@ -1534,11 +1607,13 @@ export class VoiceAssistantWebSocketServer {
     }
 
     this.clearPendingConnection(ws);
+    const admitted = pending.admission;
+    if (!admitted) throw new Error("Admitted hello has no session admission");
     pending.identity.clientId = clientId;
     if (message.appVersion) {
       pending.identity.appVersion = message.appVersion;
     }
-    const sessionKey = sessionConnectionKey(pending.admission.principalId, clientId);
+    const sessionKey = sessionConnectionKey(admitted.principalId, clientId);
     const existing = pluginId ? undefined : this.externalSessionsByKey.get(sessionKey);
     if (existing) {
       this.resumeSession({ ws, message, pending, existing });
@@ -1554,14 +1629,13 @@ export class VoiceAssistantWebSocketServer {
       clientCapabilities: message.capabilities ?? null,
       connectionLogger,
       lifecycle: pluginId ? { kind: "ephemeral-plugin", pluginId } : { kind: "reconnectable" },
-      admission: pending.admission,
+      admission: admitted,
     });
     this.sessions.set(ws, connection);
     if (connection.lifecycle === "reconnectable") {
       this.externalSessionsByKey.set(sessionKey, connection);
     }
     pending.identity.sessionId = connection.session.getSessionId();
-    this.syncBrowserToolsClientRegistration(connection);
     this.sendToClient(ws, this.createServerInfoMessage(connection.session));
     connection.connectionLogger.info(
       {
@@ -1573,6 +1647,93 @@ export class VoiceAssistantWebSocketServer {
     );
   }
 
+  private handleHelloSafely(params: {
+    ws: WebSocketLike;
+    message: WSHelloMessage;
+    pending: PendingConnection;
+  }): Promise<void> {
+    return this.handleHello(params).catch((error: unknown) => {
+      try {
+        this.handleRawMessageError({
+          ws: params.ws,
+          data: "",
+          error,
+          log: params.pending.connectionLogger,
+        });
+      } catch {
+        // The error reporter must not turn a connection failure into a process failure.
+      } finally {
+        try {
+          params.ws.close(WS_CLOSE_INVALID_HELLO, "Invalid hello");
+        } catch {
+          // The transport may already be closed.
+        }
+      }
+    });
+  }
+
+  private async admitPendingHello(
+    ws: WebSocketLike,
+    message: WSHelloMessage,
+    pending: PendingConnection,
+  ): Promise<boolean> {
+    if (pending.admission) return true;
+    try {
+      const resolved = await resolveSessionAdmission({
+        credential: message.auth,
+        passwordHash: this.passwordHash,
+        localCredential: this.credentialSource?.localCredential?.() ?? null,
+        transport: pending.identity.transport === "relay" ? "relay" : "direct",
+      });
+      if (this.pendingConnections.get(ws) !== pending) return false;
+      if ("rejection" in resolved) {
+        this.clearPendingConnection(ws);
+        await this.rejectHello(ws, message, resolved.rejection);
+        return false;
+      }
+      pending.admission = resolved.admission;
+      return true;
+    } catch (error) {
+      pending.connectionLogger.error({ err: error }, "Failed to resolve hello credential");
+      if (this.pendingConnections.get(ws) === pending) {
+        this.clearPendingConnection(ws);
+        await this.rejectHello(ws, message, "incorrect_password");
+      }
+      return false;
+    }
+  }
+
+  private async rejectHello(
+    ws: WebSocketLike,
+    hello: WSHelloMessage,
+    reason: "password_required" | "incorrect_password" | "incompatible_protocol",
+  ): Promise<void> {
+    // Older clients discard unknown frames, then use the close code and reason.
+    // They never send hello.auth, so avoid sending an unknown envelope to them.
+    if (hello.auth || hello.capabilities?.[CLIENT_CAPS.helloRejection] === true) {
+      try {
+        await ws.send(JSON.stringify({ type: "hello.rejected", reason, accepts: ["password"] }));
+      } catch {
+        // The close reason remains the compatibility signal.
+      }
+    }
+    const closeReason = {
+      password_required: "Password required",
+      incorrect_password: "Incorrect password",
+      incompatible_protocol: "Incompatible protocol version",
+    }[reason];
+    try {
+      ws.close(
+        reason === "incompatible_protocol"
+          ? WS_CLOSE_INCOMPATIBLE_PROTOCOL
+          : WS_CLOSE_DAEMON_AUTH_FAILED,
+        closeReason,
+      );
+    } catch {
+      // Ignore a transport that closed while the rejection was sent.
+    }
+  }
+
   private resumeSession(params: {
     ws: WebSocketLike;
     message: WSHelloMessage;
@@ -1594,18 +1755,16 @@ export class VoiceAssistantWebSocketServer {
     // COMPAT(selectiveAgentTimeline): added in v0.1.106. Every capable resumed
     // hello resets membership before server_info so stale retained-session
     // state cannot leak. Remove after 2027-01-12.
-    existing.session.updateClientCapabilities(newClientCapabilities, ws);
+    existing.session.updateClientCapabilities(newClientCapabilities, ws, newAppVersion);
     if (
       JSON.stringify(existing.clientCapabilities ?? null) !==
       JSON.stringify(newClientCapabilities ?? null)
     ) {
       existing.clientCapabilities = newClientCapabilities;
-      this.syncBrowserToolsClientRegistration(existing);
     }
     existing.sockets.add(ws);
     this.sessions.set(ws, existing);
     pending.identity.sessionId = existing.session.getSessionId();
-    this.syncBrowserToolsClientRegistration(existing);
     this.sendToClient(ws, this.createServerInfoMessage(existing.session));
     pending.connectionLogger.info(
       {
@@ -1620,14 +1779,22 @@ export class VoiceAssistantWebSocketServer {
   private buildServerInfoStatusPayload(session: Session): ServerInfoStatusPayload {
     return {
       status: "server_info",
+      protocolVersion: WS_PROTOCOL_VERSION,
       serverId: this.serverId,
-      hostname: getHostname(),
+      hostname: getHostName(),
       version: this.daemonVersion,
       permissions: session.getPermissions(),
       // COMPAT(desktopManaged): added in v0.1.X, remove optional parsing after 2027-01-16.
       desktopManaged: this.daemonRuntimeConfig?.desktopManaged === true,
       ...(this.serverCapabilities ? { capabilities: this.serverCapabilities } : {}),
       features: {
+        usageSources: true,
+        ownedSubscriptions: true,
+        agentRequestReceipts: true,
+        workspaceRequestReceipts: true,
+        creationLifecycle: true,
+        hubAgentRpc: true,
+        backgroundWorkspaces: true,
         // COMPAT(directorySync): added in v0.3.x, remove gate after 2027-02-12.
         directorySync: true,
         // COMPAT(workspaceLabels): added in v0.5.0, remove after 2027-08-14.
@@ -1670,9 +1837,12 @@ export class VoiceAssistantWebSocketServer {
         plugins: true,
         pluginManagement: true,
         pluginGitManagement: true,
+        pluginSourceInstallation: true,
+        pluginSourceUpdates: true,
         pluginLogs: true,
         // COMPAT(pluginThemes): added in v0.5.0, remove gate after 2027-08-20.
         pluginThemes: true,
+        pluginSettings: true,
         pluginTimelineItems: true,
         // COMPAT(skillManagement): added in v0.4.0, remove gate after 2027-08-16.
         skillManagement: true,
@@ -1682,6 +1852,7 @@ export class VoiceAssistantWebSocketServer {
         "terminal-input-mode-replay": true,
         // COMPAT(terminalSizeOwnership): added in v0.2.6, remove gate after 2027-02-02.
         "terminal-size-ownership": true,
+        workspaceTerminals: true,
         // COMPAT(rewind): added in v0.1.X, drop the gate when floor >= v0.1.X.
         rewind: true,
         // COMPAT(agentTimelinePromptIndex): added in v0.2.X, drop the gate when floor >= v0.2.X.
@@ -1720,8 +1891,14 @@ export class VoiceAssistantWebSocketServer {
         agentForkContextCursor: true,
         // COMPAT(providerSubagents): added in v0.1.107, remove gate after 2027-01-12.
         providerSubagents: true,
+        // COMPAT(projectedSubagentTimeline): added after v0.8.0, remove gates after 2027-03-14; retain advertisement.
+        projectedSubagentTimeline: true,
+        // COMPAT(providerSubagentNesting): added in v0.7, remove gate after 2027-03-04.
+        providerSubagentNesting: true,
         // COMPAT(workspacePinning): added in v0.1.107, remove gate after 2027-01-12.
         workspacePinning: true,
+        // COMPAT(workspaceMarkUnread): added in v0.5.0, remove after 2027-08-20.
+        workspaceMarkUnread: true,
         // COMPAT(hubRelationship): added in v0.1.X, drop the gate when floor >= v0.1.X.
         hubRelationship: true,
         // COMPAT(projectGithubClone): added in v0.1.108, remove gate after 2027-01-15.
@@ -1745,8 +1922,10 @@ export class VoiceAssistantWebSocketServer {
         forgeProviders: true,
         // COMPAT(selectiveAgentTimeline): added in v0.1.106, remove after 2027-01-12.
         selectiveAgentTimeline: true,
+        explicitEventSubscriptions: true,
         // COMPAT(canonicalSubmittedPrompts): added in v0.2.6, remove gate after 2027-01-30.
         canonicalSubmittedPrompts: true,
+        agentMessageProvenance: true,
         // COMPAT(stableProjectIdentity): added in v0.1.109, remove gate after 2027-01-15.
         stableProjectIdentity: true,
         // COMPAT(workspaceScriptManagement): added in v0.1.105, remove gate after 2027-01-10.
@@ -1789,7 +1968,16 @@ export class VoiceAssistantWebSocketServer {
 
   private broadcastCapabilitiesUpdate(): void {
     for (const connection of new Set(this.sessions.values())) {
-      this.sendToConnection(connection, this.createServerInfoMessage(connection.session));
+      if (
+        ![...connection.sockets].some((socket) =>
+          connection.session.wantsSourceEvent(socket, "status.server_info"),
+        )
+      )
+        continue;
+      connection.session.publish({
+        type: "status",
+        payload: this.buildServerInfoStatusPayload(connection.session),
+      });
     }
   }
 
@@ -1881,7 +2069,6 @@ export class VoiceAssistantWebSocketServer {
     this.socketIdentities.delete(ws);
 
     if (connection.sockets.size === 0) {
-      this.unregisterBrowserToolsClient(connection);
       if (connection.lifecycle === "ephemeral-plugin") {
         this.pluginSocketIds.delete(ws);
         await this.cleanupConnection(connection, "Plugin session disconnected");
@@ -1959,7 +2146,6 @@ export class VoiceAssistantWebSocketServer {
         this.externalSessionsByKey.delete(connection.sessionKey);
       }
     }
-    this.unregisterBrowserToolsClient(connection);
 
     connection.connectionLogger.trace(
       { clientId: connection.clientId, totalSessions: this.sessions.size },
@@ -1968,54 +2154,6 @@ export class VoiceAssistantWebSocketServer {
     await connection.session.cleanup();
   }
 
-  private syncBrowserToolsClientRegistration(connection: SessionConnection): void {
-    if (!this.browserToolsBroker) {
-      return;
-    }
-    const registrationKey = connection.sessionKey;
-    if (!connection.session.allowsPermission("workspace.write")) {
-      this.unregisterBrowserToolsClient(registrationKey);
-      return;
-    }
-    const browserHostCapability = getBrowserHostCapability(connection.clientCapabilities);
-    if (!browserHostCapability) {
-      this.unregisterBrowserToolsClient(registrationKey);
-      return;
-    }
-    const capabilitySignature = JSON.stringify(browserHostCapability);
-    const existing = this.browserToolsRegistrations.get(registrationKey);
-    if (existing?.capabilitySignature === capabilitySignature) {
-      return;
-    }
-    if (existing) {
-      this.browserToolsRegistrations.delete(registrationKey);
-      existing.unregister();
-    }
-
-    const unregister = this.browserToolsBroker.registerClient({
-      id: connection.principalId === "owner" ? connection.clientId : registrationKey,
-      hostKind: browserHostCapability.hostKind,
-      supportedCommands: browserHostCapability.supportedCommands,
-      sendBrowserAutomationRequest: (request) => {
-        this.sendToConnection(connection, wrapSessionMessage(request));
-      },
-    });
-    this.browserToolsRegistrations.set(registrationKey, {
-      capabilitySignature,
-      unregister,
-    });
-  }
-
-  private unregisterBrowserToolsClient(connection: SessionConnection | string): void {
-    const registrationKey = typeof connection === "string" ? connection : connection.sessionKey;
-    const registration = this.browserToolsRegistrations.get(registrationKey);
-    if (!registration) {
-      return;
-    }
-    this.browserToolsRegistrations.delete(registrationKey);
-    registration.unregister();
-  }
-
   private handleInvalidInboundMessage(args: {
     ws: WebSocketLike;
     parsed: unknown;
@@ -2058,35 +2196,13 @@ export class VoiceAssistantWebSocketServer {
       "WS inbound message validation failed",
     );
 
-    if (requestInfo) {
-      this.sendToClient(
-        ws,
-        wrapSessionMessage({
-          type: "rpc_error",
-          payload: {
-            requestId: requestInfo.requestId,
-            requestType: requestInfo.requestType,
-            error: isUnknownSchema
-              ? `Unknown request, try upgrading the daemon (currently v${this.daemonVersion})`
-              : "Invalid message",
-            code: isUnknownSchema ? "unknown_schema" : "invalid_message",
-          },
-        }),
-      );
-      return;
-    }
-
-    const errorMessage = `Invalid message: ${parsedMessage.error.message}`;
-    this.sendToClient(
-      ws,
-      wrapSessionMessage({
-        type: "status",
-        payload: {
-          status: "error",
-          message: errorMessage,
-        },
-      }),
-    );
+    activeConnection?.session.delivery.protocolFailure(ws, {
+      ...requestInfo,
+      error: isUnknownSchema
+        ? `Unknown request, try upgrading the daemon (currently v${this.daemonVersion})`
+        : `Invalid message: ${parsedMessage.error.message}`,
+      code: isUnknownSchema ? "unknown_schema" : "invalid_message",
+    });
   }
 
   private maybeHandleBinaryFrame(params: {
@@ -2115,7 +2231,7 @@ export class VoiceAssistantWebSocketServer {
       }
       return true;
     }
-    void Promise.resolve(activeConnection.session.handleBinaryFrame(decodedFrame)).catch(
+    void Promise.resolve(activeConnection.session.handleBinaryFrame(decodedFrame, ws)).catch(
       (error: unknown) => {
         this.handleRawMessageError({
           ws,
@@ -2134,8 +2250,8 @@ export class VoiceAssistantWebSocketServer {
     pendingConnection: PendingConnection;
   }): void {
     const { ws, message, pendingConnection } = params;
-    if (message.type === "hello") {
-      this.handleHello({
+    if (message.type === "hello" && !pendingConnection.authenticating) {
+      void this.handleHelloSafely({
         ws,
         message,
         pending: pendingConnection,
@@ -2205,16 +2321,16 @@ export class VoiceAssistantWebSocketServer {
       const message = parsedMessage.data;
       this.recordInboundMessageType(message.type);
 
-      if (message.type === "ping") {
-        this.applicationSocketLease.claim(ws);
+      if (message.type === "ping" && activeConnection) {
+        // A plugin socket is IPC to a child this daemon already supervises, not
+        // an abandonable application socket.
+        if (!this.pluginSocketIds.has(ws)) {
+          this.applicationSocketLease.claim(ws);
+        }
         this.sendToClient(ws, { type: "pong" });
         return;
       }
 
-      if (message.type === "recording_state") {
-        return;
-      }
-
       if (pendingConnection) {
         this.handlePendingConnectionMessage({
           ws,
@@ -2224,6 +2340,10 @@ export class VoiceAssistantWebSocketServer {
         return;
       }
 
+      if (message.type === "recording_state") {
+        return;
+      }
+
       if (!activeConnection) {
         this.incrementRuntimeCounter("missingConnectionForMessage");
         this.logger.error("No connection found for websocket");
@@ -2274,15 +2394,6 @@ export class VoiceAssistantWebSocketServer {
         "ws_control_rpc_received",
       );
     }
-    if (message.message.type === "browser.automation.execute.response") {
-      if (!activeConnection.session.allowsInbound(message.message)) {
-        await activeConnection.session.handleMessage(message.message, ws);
-        return;
-      }
-      this.browserToolsBroker?.receiveResponse(message.message as BrowserAutomationExecuteResponse);
-      return;
-    }
-
     const startMs = performance.now();
     await activeConnection.session.handleMessage(message.message, ws);
     const durationMs = performance.now() - startMs;
@@ -2308,21 +2419,8 @@ export class VoiceAssistantWebSocketServer {
   }): void {
     const { ws, data, error, log } = params;
     const err = error instanceof Error ? error : new Error(String(error));
-    const { rawPayload, parsedPayload } = this.decodeRawMessagePayloadForError(data);
-
-    const trimmedRawPayload =
-      typeof rawPayload === "string" && rawPayload.length > 2000
-        ? `${rawPayload.slice(0, 2000)}... (truncated)`
-        : rawPayload;
-
-    log.error(
-      {
-        err,
-        rawPayload: trimmedRawPayload,
-        parsedPayload,
-      },
-      "Failed to parse/handle message",
-    );
+    // Inbound frames can contain hello.auth.password or session secrets.
+    log.error({ errorName: err.name }, "Failed to parse/handle message");
 
     if (this.pendingConnections.has(ws)) {
       this.clearPendingConnection(ws);
@@ -2334,53 +2432,22 @@ export class VoiceAssistantWebSocketServer {
       return;
     }
 
-    const requestInfo = extractRequestInfoFromUnknownWsInbound(parsedPayload);
-    if (requestInfo) {
-      this.sendToClient(
-        ws,
-        wrapSessionMessage({
-          type: "rpc_error",
-          payload: {
-            requestId: requestInfo.requestId,
-            requestType: requestInfo.requestType,
-            error: "Invalid message",
-            code: "invalid_message",
-          },
-        }),
-      );
-      return;
-    }
-
-    this.sendToClient(
-      ws,
-      wrapSessionMessage({
-        type: "status",
-        payload: {
-          status: "error",
-          message: `Invalid message: ${err.message}`,
-        },
-      }),
+    const requestInfo = extractRequestInfoFromUnknownWsInbound(
+      this.decodeRawMessagePayloadForError(data),
     );
+    this.sessions.get(ws)?.session.delivery.protocolFailure(ws, {
+      ...requestInfo,
+      error: `Invalid message: ${err.message}`,
+      code: "invalid_message",
+    });
   }
 
-  private decodeRawMessagePayloadForError(data: Buffer | ArrayBuffer | Buffer[] | string): {
-    rawPayload: string | null;
-    parsedPayload: unknown;
-  } {
-    let rawPayload: string | null = null;
-    let parsedPayload: unknown = null;
+  private decodeRawMessagePayloadForError(data: Buffer | ArrayBuffer | Buffer[] | string): unknown {
     try {
-      const buffer = bufferFromWsData(data);
-      rawPayload = buffer.toString();
-      parsedPayload = JSON.parse(rawPayload);
-    } catch (payloadError) {
-      rawPayload = rawPayload ?? "<unreadable>";
-      parsedPayload = parsedPayload ?? rawPayload;
-      const payloadErr =
-        payloadError instanceof Error ? payloadError : new Error(String(payloadError));
-      this.logger.error({ err: payloadErr }, "Failed to decode raw payload");
+      return JSON.parse(bufferFromWsData(data).toString());
+    } catch {
+      return null;
     }
-    return { rawPayload, parsedPayload };
   }
 
   private incrementRuntimeCounter(counter: keyof WebSocketRuntimeCounters): void {
@@ -2485,8 +2552,8 @@ export class VoiceAssistantWebSocketServer {
     this.logger.info(loggedMetrics, "ws_runtime_metrics");
   }
 
-  private getClientActivityState(session: Session): ClientPresenceState {
-    const activity = session.getClientActivity();
+  private getClientActivityState(session: Session, source: object): ClientPresenceState {
+    const activity = session.getClientActivity(source);
     if (!activity) {
       return {
         appVisible: false,
@@ -2519,14 +2586,22 @@ export class VoiceAssistantWebSocketServer {
     }> = [];
 
     for (const [ws, connection] of this.sessions) {
-      if (!(await connection.session.subscribesToAgent(agent))) continue;
+      if (
+        connection.session.delivery.isModern(ws)
+          ? !connection.session.wantsSourceEvent(ws, "agent_attention_required")
+          : !(await connection.session.subscribesToAgent(agent, ws))
+      )
+        continue;
       clientEntries.push({
         ws,
-        state: this.getClientActivityState(connection.session),
+        state: this.getClientActivityState(connection.session, ws),
       });
     }
 
-    const allStates = clientEntries.map((e) => e.state);
+    const notificationEntries = clientEntries.filter(({ ws }) =>
+      this.sessions.get(ws)?.session.wantsSourceNotification(ws, "agent_attention_required"),
+    );
+    const allStates = notificationEntries.map((e) => e.state);
     const nowMs = Date.now();
     const assistantMessage = await this.agentManager.getLastAssistantMessage(params.agentId);
     const notification = buildAgentAttentionNotificationPayload({
@@ -2551,8 +2626,10 @@ export class VoiceAssistantWebSocketServer {
       });
     }
 
-    for (const [clientIndex, { ws }] of clientEntries.entries()) {
-      const shouldNotify = clientIndex === plan.inAppRecipientIndex;
+    for (const { ws } of clientEntries) {
+      const shouldNotify =
+        plan.inAppRecipientIndex !== null &&
+        notificationEntries[plan.inAppRecipientIndex]?.ws === ws;
       const timestamp = new Date().toISOString();
       const connection = this.sessions.get(ws);
       const attentionPayload = {
@@ -2563,7 +2640,8 @@ export class VoiceAssistantWebSocketServer {
         notification,
       };
       const message = wrapSessionMessage(
-        connection?.session.supportsForSource(CLIENT_CAPS.selectiveAgentTimeline, ws)
+        connection?.session.delivery.isModern(ws) ||
+          connection?.session.supportsForSource(CLIENT_CAPS.selectiveAgentTimeline, ws)
           ? {
               type: "agent_attention_required",
               payload: attentionPayload,
@@ -2585,7 +2663,9 @@ export class VoiceAssistantWebSocketServer {
             },
       );
 
-      this.sendToClient(ws, message);
+      if (message.type === "session" && this.sessions.get(ws)?.session.delivery.isModern(ws))
+        this.sessions.get(ws)!.session.publishToSource(ws, message.message);
+      else this.sendToClient(ws, message);
     }
   }
 
@@ -2603,20 +2683,28 @@ export class VoiceAssistantWebSocketServer {
 
     for (const [ws, connection] of this.sessions) {
       if (
-        !(await connection.session.subscribesToTerminalDirectory({
-          cwd: params.cwd,
-          ...(params.workspaceId ? { workspaceId: params.workspaceId } : {}),
-        }))
+        connection.session.delivery.isModern(ws)
+          ? !connection.session.wantsSourceEvent(ws, "terminal_attention_required")
+          : !(await connection.session.subscribesToTerminalDirectory(
+              {
+                cwd: params.cwd,
+                ...(params.workspaceId ? { workspaceId: params.workspaceId } : {}),
+              },
+              ws,
+            ))
       ) {
         continue;
       }
       clientEntries.push({
         ws,
-        state: this.getClientActivityState(connection.session),
+        state: this.getClientActivityState(connection.session, ws),
       });
     }
 
-    const allStates = clientEntries.map((e) => e.state);
+    const notificationEntries = clientEntries.filter(({ ws }) =>
+      this.sessions.get(ws)?.session.wantsSourceNotification(ws, "terminal_attention_required"),
+    );
+    const allStates = notificationEntries.map((e) => e.state);
     const nowMs = Date.now();
     const workspaceId = params.workspaceId;
 
@@ -2650,8 +2738,10 @@ export class VoiceAssistantWebSocketServer {
         });
     }
 
-    for (const [clientIndex, { ws }] of clientEntries.entries()) {
-      const shouldNotify = clientIndex === plan.inAppRecipientIndex;
+    for (const { ws } of clientEntries) {
+      const shouldNotify =
+        plan.inAppRecipientIndex !== null &&
+        notificationEntries[plan.inAppRecipientIndex]?.ws === ws;
       const message = wrapSessionMessage({
         type: "terminal_attention_required",
         payload: {
@@ -2665,7 +2755,9 @@ export class VoiceAssistantWebSocketServer {
           shouldNotify,
         },
       });
-      this.sendToClient(ws, message);
+      if (message.type === "session" && this.sessions.get(ws)?.session.delivery.isModern(ws))
+        this.sessions.get(ws)!.session.publishToSource(ws, message.message);
+      else this.sendToClient(ws, message);
     }
   }
 }
diff --git a/packages/server/src/server/websocket/runtime-metrics.ts b/packages/server/src/server/websocket/runtime-metrics.ts
index 8e7c5c6ffd..0031ad69bb 100644
--- a/packages/server/src/server/websocket/runtime-metrics.ts
+++ b/packages/server/src/server/websocket/runtime-metrics.ts
@@ -17,6 +17,8 @@ export interface WebSocketRuntimeCounters {
   relayExternalSocketAttached: number;
   originRejected: number;
   hostRejected: number;
+  applicationJsonRejected: number;
+  applicationBinaryRejected: number;
 }
 
 export interface WebSocketRuntimeMetricsSnapshot {
@@ -232,6 +234,8 @@ function createRuntimeCounters(): WebSocketRuntimeCounters {
     relayExternalSocketAttached: 0,
     originRejected: 0,
     hostRejected: 0,
+    applicationJsonRejected: 0,
+    applicationBinaryRejected: 0,
   };
 }
 
diff --git a/packages/server/src/server/wire-compat.test.ts b/packages/server/src/server/wire-compat.test.ts
index 08cba47149..34abdebc3f 100644
--- a/packages/server/src/server/wire-compat.test.ts
+++ b/packages/server/src/server/wire-compat.test.ts
@@ -1,3 +1,7 @@
+import {
+  createMessageReceiptsStub,
+  createTestCreationService,
+} from "./test-utils/session-stubs.js";
 import pino from "pino";
 import { z } from "zod";
 import { describe, expect, test } from "vitest";
@@ -184,6 +188,7 @@ function createSessionForWireCompatTest(options?: {
   clientCapabilities?: Record<string, unknown> | null;
   directorySync?: DirectorySyncService;
   messages?: SessionOutboundMessage[];
+  onMessageToSource?: SessionOptions["onMessageToSource"];
   rows?: AgentTimelineRow[];
 }): Session {
   const messages = options?.messages ?? [];
@@ -206,10 +211,13 @@ function createSessionForWireCompatTest(options?: {
   ];
 
   const session = new Session({
+    messageReceipts: createMessageReceiptsStub(),
+    creationService: createTestCreationService(),
     clientId: "wire-compat-client",
     permissions: OWNER_PERMISSIONS,
     clientCapabilities: options?.clientCapabilities ?? null,
     onMessage: (message) => messages.push(message),
+    onMessageToSource: options?.onMessageToSource ?? ((_source, message) => messages.push(message)),
     logger: pino({ level: "silent" }),
     downloadTokenStore: {} as SessionOptions["downloadTokenStore"],
     pushNotifications: {} as SessionOptions["pushNotifications"],
@@ -273,6 +281,7 @@ function createSessionForWireCompatTest(options?: {
     terminalManager: null,
   });
 
+  session.updateClientCapabilities(options?.clientCapabilities ?? null, {});
   return session;
 }
 
@@ -338,6 +347,8 @@ describe("wire compatibility", () => {
       {
         type: "project.update",
         payload: {
+          generation: expect.any(String),
+          seq: 1,
           kind: "upsert",
           project: {
             projectId: "project-1",
@@ -352,7 +363,7 @@ describe("wire compatibility", () => {
       },
       {
         type: "project.update",
-        payload: { kind: "remove", projectId: "project-1" },
+        payload: { kind: "remove", projectId: "project-1", generation: expect.any(String), seq: 2 },
       },
     ]);
   });
@@ -541,3 +552,92 @@ describe("wire compatibility", () => {
     });
   });
 });
+
+test("setup progress is adapted per socket without changing the canonical snapshot", async () => {
+  const legacy = {};
+  const capable = {};
+  const modern = {};
+  const modernCapable = {};
+  const delivered = new Map<object, SessionOutboundMessage[]>();
+  const session = createSessionForWireCompatTest({
+    onMessageToSource: (source, message) =>
+      delivered.set(source, [...(delivered.get(source) ?? []), message]),
+  });
+  for (const [source, blocked, owned] of [
+    [legacy, false, false],
+    [capable, true, false],
+    [modern, false, true],
+    [modernCapable, true, true],
+  ] as const) {
+    session.updateClientCapabilities(
+      {
+        explicit_event_subscriptions: true,
+        owned_subscriptions: owned,
+        workspace_setup_blocked: blocked,
+      },
+      source,
+    );
+    await session.handleMessage(
+      {
+        type: "session.events.set_subscription.request",
+        requestId: "setup",
+        events: ["workspace_setup_progress"],
+      },
+      source,
+    );
+    expect(delivered.get(source)).toContainEqual(
+      expect.objectContaining({ type: "session.events.set_subscription.response" }),
+    );
+  }
+  delivered.clear();
+  const message = {
+    type: "workspace_setup_progress" as const,
+    payload: {
+      workspaceId: "fork-workspace",
+      status: "blocked" as const,
+      error: null,
+      detail: {
+        type: "worktree_setup" as const,
+        worktreePath: "/workspace",
+        branchName: "fork",
+        log: "",
+        commands: [],
+      },
+      blockedSource: {
+        kind: "change_request" as const,
+        forge: "github",
+        number: 42,
+        headRepository: "contributor/project",
+      },
+    },
+  };
+  session.publish(message);
+  expect(delivered.get(capable)).toEqual([message]);
+  expect(delivered.get(legacy)).toEqual([
+    {
+      ...message,
+      payload: {
+        ...message.payload,
+        status: "failed",
+        error:
+          "Workspace setup is blocked pending approval of code from a fork pull request. Update Paseo to review and run setup.",
+      },
+    },
+  ]);
+  expect(delivered.get(modernCapable)).toEqual([
+    { ...message, payload: { ...message.payload, subscriptionId: expect.any(String) } },
+  ]);
+  expect(delivered.get(modern)).toEqual([
+    {
+      ...message,
+      payload: {
+        ...message.payload,
+        status: "failed",
+        error: expect.stringContaining("Update Paseo"),
+        subscriptionId: expect.any(String),
+      },
+    },
+  ]);
+  expect(message.payload.status).toBe("blocked");
+  await session.cleanup();
+});
diff --git a/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts b/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
index 7e2b0c2064..87cb758ac5 100644
--- a/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
+++ b/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
@@ -1,10 +1,13 @@
-import { execFileSync, spawn } from "node:child_process";
+import { execFile, execFileSync, spawn } from "node:child_process";
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
 import { afterEach, beforeEach, expect, test } from "vitest";
 
 import { getFullAccessConfig } from "./daemon-e2e/agent-configs.js";
+import { createWorktree } from "../utils/worktree.js";
 import {
   createDaemonTestContext,
   DaemonClient,
@@ -54,6 +57,32 @@ function createGitRepo(): string {
   return repoDir;
 }
 
+async function runCli(args: string[], cwd: string): Promise<string> {
+  const result = await promisify(execFile)(
+    process.execPath,
+    [
+      "--conditions=source",
+      "--import",
+      import.meta.resolve("tsx"),
+      fileURLToPath(new URL("../../../cli/src/index.ts", import.meta.url)),
+      "--host",
+      `127.0.0.1:${ctx.daemon.port}`,
+      ...args,
+    ],
+    {
+      cwd,
+      env: {
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+        ),
+        PASEO_HOME: ctx.daemon.paseoHome,
+      },
+      timeout: 20000,
+    },
+  );
+  return result.stdout;
+}
+
 async function createLocalWorkspace(cwd: string, title: string): Promise<string> {
   const result = await ctx.client.createWorkspace({
     source: { kind: "directory", path: cwd },
@@ -205,8 +234,8 @@ test("archiving a workspace removes it from every subscribed client", async () =
   const removals = collectWorkspaceRemovals(observer);
 
   try {
-    await ctx.client.fetchWorkspaces({ subscribe: { subscriptionId: "workspace-initiator" } });
-    await observer.fetchWorkspaces({ subscribe: { subscriptionId: "workspace-observer" } });
+    await ctx.client.fetchWorkspaces({ subscribe: {} });
+    await observer.fetchWorkspaces({ subscribe: {} });
 
     const archive = await ctx.client.archiveWorkspace(workspaceId);
     await observer.ping({ requestId: "archive-observer-barrier" });
@@ -233,7 +262,7 @@ test("renaming a workspace updates every subscribed client", async () => {
   const titles = collectWorkspaceTitles(observer);
 
   try {
-    await observer.fetchWorkspaces({ subscribe: { subscriptionId: "workspace-observer" } });
+    await observer.fetchWorkspaces({ subscribe: {} });
 
     const renamed = await ctx.client.setWorkspaceTitle(workspaceId, "Renamed workspace");
     await observer.ping({ requestId: "rename-observer-barrier" });
@@ -248,6 +277,78 @@ test("renaming a workspace updates every subscribed client", async () => {
   }
 });
 
+test.each(["worktree", "workspace"] as const)(
+  "%s archive immediately removes the deleted worktree from a warm CLI listing",
+  async (command) => {
+    const repoDir = createGitRepo();
+    const created = await ctx.client.createWorkspace({
+      source: {
+        kind: "worktree",
+        cwd: repoDir,
+        worktreeSlug: "cached-worktree",
+        baseBranch: "main",
+      },
+    });
+    const workspace = created.workspace;
+    if (!workspace?.workspaceDirectory) {
+      throw new Error(created.error ?? "Failed to create worktree workspace");
+    }
+    const worktreePath = workspace.workspaceDirectory;
+    const name = path.basename(worktreePath);
+    const before = JSON.parse(await runCli(["worktree", "ls", "--json"], repoDir));
+    expect(before).toEqual([expect.objectContaining({ name, cwd: worktreePath })]);
+
+    await runCli(
+      [command, "archive", command === "worktree" ? name : workspace.id, "--json"],
+      repoDir,
+    );
+    expect(existsSync(worktreePath)).toBe(false);
+    expect(
+      execFileSync("git", ["worktree", "list", "--porcelain"], { cwd: repoDir }).toString(),
+    ).not.toContain(worktreePath);
+    const after = JSON.parse(await runCli(["worktree", "ls", "--json"], repoDir));
+    console.log(
+      `${command} archive: warm listing=${JSON.stringify(before)}\nimmediate listing=${JSON.stringify(after)}`,
+    );
+    expect(after).toEqual([]);
+  },
+  60000,
+);
+
+test("archiving an unregistered worktree in a bare repo clears the main checkout listing", async () => {
+  const sourceRepo = createGitRepo();
+  const repoRoot = makeTempDir("workspace-archive-bare-");
+  const bareRepo = path.join(repoRoot, "repo.git");
+  const mainCheckout = path.join(repoRoot, "main");
+  execFileSync("git", ["clone", "--bare", sourceRepo, bareRepo], { stdio: "pipe" });
+  execFileSync("git", ["worktree", "add", mainCheckout, "main"], {
+    cwd: bareRepo,
+    stdio: "pipe",
+  });
+  const { worktreePath } = await createWorktree({
+    cwd: mainCheckout,
+    source: { kind: "branch-off", baseBranch: "main", branchName: "cached-bare-worktree" },
+    worktreeSlug: "cached-bare-worktree",
+    runSetup: false,
+    paseoHome: ctx.daemon.paseoHome,
+  });
+  expect(await activeWorkspaceIds()).toEqual(new Set());
+  const name = path.basename(worktreePath);
+  const before = JSON.parse(await runCli(["worktree", "ls", "--json"], mainCheckout));
+  expect(before).toEqual([expect.objectContaining({ name, cwd: worktreePath })]);
+
+  await runCli(["worktree", "archive", name, "--json"], mainCheckout);
+  expect(existsSync(worktreePath)).toBe(false);
+  expect(
+    execFileSync("git", ["worktree", "list", "--porcelain"], { cwd: mainCheckout }).toString(),
+  ).not.toContain(worktreePath);
+  const after = JSON.parse(await runCli(["worktree", "ls", "--json"], mainCheckout));
+  console.log(
+    `bare repo archive: warm listing=${JSON.stringify(before)}\nimmediate listing=${JSON.stringify(after)}`,
+  );
+  expect(after).toEqual([]);
+}, 60000);
+
 test("archiving the last reference to a worktree removes it from disk regardless of the disk flag", async () => {
   const repoDir = createGitRepo();
 
diff --git a/packages/server/src/server/workspace-archive-service.test.ts b/packages/server/src/server/workspace-archive-service.test.ts
index c3b77f7070..d1cfb8ada7 100644
--- a/packages/server/src/server/workspace-archive-service.test.ts
+++ b/packages/server/src/server/workspace-archive-service.test.ts
@@ -140,7 +140,8 @@ function createArchiveDeps(input: ArchiveDepsInput): ArchiveTestDependencies {
     github: createGitHubServiceStub(),
     workspaceGitService: {
       getSnapshot: vi.fn(async () => null),
-    } as unknown as Pick<WorkspaceGitService, "getSnapshot">,
+      invalidateWorktrees: () => {},
+    } as unknown as Pick<WorkspaceGitService, "getSnapshot" | "invalidateWorktrees">,
     agentManager: {
       listAgents: () => [],
       getAgent: () => null,
@@ -617,28 +618,37 @@ describe("archiveByScope", () => {
     expect(deps.emitWorkspaceUpdatesForWorkspaceIds).not.toHaveBeenCalled();
   });
 
-  test("worktree scope removes an owned directory with zero matching records", async () => {
-    const { tempDir, repoDir } = createGitRepo();
-    const paseoHome = path.join(tempDir, ".paseo");
-    const worktree = await createPaseoOwnedWorktree(repoDir, paseoHome, "zero-records");
+  test.each(["intact", "missing"] as const)(
+    "worktree scope removes an owned directory with zero matching records and %s Git administration",
+    async (gitAdministration) => {
+      const { tempDir, repoDir } = createGitRepo();
+      const paseoHome = path.join(tempDir, ".paseo");
+      const worktree = await createPaseoOwnedWorktree(repoDir, paseoHome, "zero-records");
+      if (gitAdministration === "missing") {
+        const gitDir = execFileSync("git", ["rev-parse", "--absolute-git-dir"], {
+          cwd: worktree.worktreePath,
+        })
+          .toString()
+          .trim();
+        rmSync(gitDir, { recursive: true, force: true });
+      }
+      const dependencies = createArchiveDeps({ paseoHome, activeWorkspaces: [] });
+      const invalidateWorktrees = vi.fn();
+      dependencies.workspaceGitService.invalidateWorktrees = invalidateWorktrees;
 
-    const result = await archiveByScope(
-      createArchiveDeps({
-        paseoHome,
-        activeWorkspaces: [],
-      }),
-      {
+      const result = await archiveByScope(dependencies, {
         scope: { kind: "worktree", targetPath: worktree.worktreePath },
         requestId: "req-zero-records",
-      },
-    );
+      });
 
-    assertArchiveResult(result, {
-      archivedWorkspaceIds: [],
-      removedDirectory: true,
-    });
-    expect(existsSync(worktree.worktreePath)).toBe(false);
-  });
+      assertArchiveResult(result, {
+        archivedWorkspaceIds: [],
+        removedDirectory: true,
+      });
+      expect(existsSync(worktree.worktreePath)).toBe(false);
+      expect(invalidateWorktrees).toHaveBeenCalledTimes(1);
+    },
+  );
 
   test("marks archiving, emits an upsert carrying the archiving state, then clears it and emits a remove", async () => {
     const { tempDir, repoDir } = createGitRepo();
diff --git a/packages/server/src/server/workspace-archive-service.ts b/packages/server/src/server/workspace-archive-service.ts
index a02c97eda8..e9e58681a1 100644
--- a/packages/server/src/server/workspace-archive-service.ts
+++ b/packages/server/src/server/workspace-archive-service.ts
@@ -32,7 +32,7 @@ export interface ArchiveDependencies {
   // Base directory that may hold worktrees across repositories.
   paseoWorktreesBaseRoot?: string;
   github: ForgeService;
-  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot">;
+  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "invalidateWorktrees">;
   agentManager: Pick<AgentManager, "listAgents" | "getAgent" | "archiveAgent" | "archiveSnapshot">;
   agentStorage: Pick<AgentStorage, "listByWorkspace">;
   // Resolves the worktree at a path to its workspaceId for archive-by-path. The
@@ -408,6 +408,7 @@ async function maybeRemoveDirectory(
       paseoHome: dependencies.paseoHome,
       worktreesBaseRoot: dependencies.paseoWorktreesBaseRoot,
     });
+    dependencies.workspaceGitService.invalidateWorktrees();
     dependencies.github.invalidate({ cwd: backing.path });
     return true;
   } catch (error) {
@@ -466,7 +467,7 @@ export async function archiveWorkspaceContents(
   const archivedAgents = new Set<string>();
 
   const liveAgents = dependencies.agentManager
-    .listAgents()
+    .listAgents({ includeInternal: true })
     .filter((agent) => agent.workspaceId === workspaceId);
   for (const agent of liveAgents) {
     archivedAgents.add(agent.id);
diff --git a/packages/server/src/server/workspace-create-errors.e2e.test.ts b/packages/server/src/server/workspace-create-errors.e2e.test.ts
index bc42b77596..a5c442fcd6 100644
--- a/packages/server/src/server/workspace-create-errors.e2e.test.ts
+++ b/packages/server/src/server/workspace-create-errors.e2e.test.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "vitest";
-import { rmSync } from "node:fs";
+import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 
@@ -49,3 +49,30 @@ test("workspace.create surfaces each early-reject error branch", async () => {
     rmSync(missingDir, { recursive: true, force: true });
   }
 }, 180000);
+
+test("workspace creation replay rejects a checkout removed after completion", async () => {
+  const daemon = await createTestPaseoDaemon();
+  const directory = mkdtempSync(path.join(tmpdir(), "workspace-replay-"));
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.1.82",
+  });
+  try {
+    await client.connect();
+    const request = {
+      source: { kind: "directory" as const, path: directory },
+      idempotencyKey: "removed-checkout",
+    };
+    const created = await client.createWorkspace(request);
+    expect(created.error).toBeNull();
+    expect(created.workspace).not.toBeNull();
+    rmSync(directory, { recursive: true, force: true });
+    const replayed = await client.createWorkspace(request);
+    expect(replayed.workspace).toBeNull();
+    expect(replayed.errorCode).toBe("directory_not_found");
+  } finally {
+    await client.close().catch(() => undefined);
+    await daemon.close();
+    rmSync(directory, { recursive: true, force: true });
+  }
+}, 180000);
diff --git a/packages/server/src/server/workspace-create-git-fanout.local.e2e.test.ts b/packages/server/src/server/workspace-create-git-fanout.local.e2e.test.ts
index 82f580ef1b..30e7043b64 100644
--- a/packages/server/src/server/workspace-create-git-fanout.local.e2e.test.ts
+++ b/packages/server/src/server/workspace-create-git-fanout.local.e2e.test.ts
@@ -145,10 +145,10 @@ async function startObservedFixture(siblingCount: number): Promise<ReturnType<ty
     appVersion: "0.3.0-beta.2",
   });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "agents" } });
+  await client.fetchAgents({ subscribe: {} });
   await client.fetchWorkspaces({
     page: { limit: 200 },
-    subscribe: { subscriptionId: "workspaces" },
+    subscribe: {},
   });
   return fixture;
 }
@@ -327,11 +327,10 @@ test.each([false, true])(
     stopGitCommandMetrics();
 
     if (hasBaseDiffSubscription) {
-      await client?.subscribeCheckoutDiff(
-        fixture.siblingWorktrees[0] ?? "",
-        { mode: "base", baseRef: "main" },
-        { subscriptionId: "base-diff" },
-      );
+      await client?.observeCheckoutDiff(fixture.siblingWorktrees[0] ?? "", {
+        mode: "base",
+        baseRef: "main",
+      }).ready;
       startGitCommandMetrics();
       await waitForGitCommandMetricsIdle({ quietMs: 1_500, timeoutMs: 30_000 });
       stopGitCommandMetrics();
@@ -427,12 +426,12 @@ test("refreshes every workspace that depends on a changed shared base ref", asyn
   await waitForGitCommandMetricsIdle({ quietMs: 1_500, timeoutMs: 30_000 });
   stopGitCommandMetrics();
 
-  const subscriptionId = "shared-base-ref-diff";
-  const initial = await client?.subscribeCheckoutDiff(
-    changedWorktree,
-    { mode: "base", baseRef: "main" },
-    { subscriptionId },
-  );
+  const subscription = client!.observeCheckoutDiff(changedWorktree, {
+    mode: "base",
+    baseRef: "main",
+  });
+  const initial = await subscription.ready;
+  const subscriptionId = initial.subscriptionId;
   expect(initial?.files.map((file) => file.path)).toEqual(["README.md"]);
   startGitCommandMetrics();
   await waitForGitCommandMetricsIdle({ quietMs: 1_500, timeoutMs: 30_000 });
@@ -460,7 +459,7 @@ test("refreshes every workspace that depends on a changed shared base ref", asyn
     status: 2,
     "symbolic-ref": 3,
   });
-  client?.unsubscribeCheckoutDiff(subscriptionId);
+  await subscription.release();
 }, 120_000);
 
 test("records the Git command ledger for repository metadata business rules", async () => {
@@ -627,7 +626,7 @@ test("workspace archive is admitted while 52 sibling observations hydrate", asyn
     appVersion: "0.3.0-beta.2",
   });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "agents" } });
+  await client.fetchAgents({ subscribe: {} });
   const created = await client.createWorkspace({
     source: {
       kind: "worktree",
@@ -644,7 +643,7 @@ test("workspace archive is admitted while 52 sibling observations hydrate", asyn
 
   await client.fetchWorkspaces({
     page: { limit: 200 },
-    subscribe: { subscriptionId: "workspaces" },
+    subscribe: {},
   });
   expect(snapshotGitCommandRuntimeMetrics().pending).toBeGreaterThan(0);
   const archiveStartedAt = Date.now();
@@ -670,10 +669,10 @@ test("workspace create is admitted while 100 sibling observations hydrate", asyn
     appVersion: "0.3.0-beta.2",
   });
   await client.connect();
-  await client.fetchAgents({ subscribe: { subscriptionId: "agents" } });
+  await client.fetchAgents({ subscribe: {} });
   const snapshot = await client.fetchWorkspaces({
     page: { limit: 200 },
-    subscribe: { subscriptionId: "workspaces" },
+    subscribe: {},
   });
   expect(snapshot.entries).toHaveLength(SIBLING_COUNT);
   expect(snapshotGitCommandRuntimeMetrics().pending).toBeGreaterThan(0);
diff --git a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
index a63d2e4a82..b377c22374 100644
--- a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
+++ b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
@@ -1,8 +1,8 @@
 import { execFileSync } from "node:child_process";
-import { mkdtempSync, rmSync } from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, test } from "vitest";
+import { expect, onTestFinished, test } from "vitest";
 
 import { DaemonClient } from "./test-utils/index.js";
 import { createTestPaseoDaemon } from "./test-utils/paseo-daemon.js";
@@ -64,6 +64,48 @@ test("workspace.create worktree source forwards action=checkout + refName into t
   }
 }, 180000);
 
+test("existing branch changes remain visible after archive and restore", async () => {
+  const daemon = await createTestPaseoDaemon();
+  const { repoDir, tempRoot } = createGitRepoWithBranch();
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.11.2",
+  });
+  onTestFinished(async () => {
+    await client.close().catch(() => undefined);
+    await daemon.close();
+    rmSync(tempRoot, { recursive: true, force: true });
+  });
+  runGit(repoDir, "switch", "feature/existing-branch");
+  commitFile(repoDir, "feature.txt", "feature change\n");
+  runGit(repoDir, "switch", "main");
+  await client.connect();
+  const created = await client.createWorkspace({
+    source: {
+      kind: "worktree",
+      cwd: repoDir,
+      action: "checkout",
+      refName: "feature/existing-branch",
+    },
+  });
+  expect(created.error).toBeNull();
+  const workspace = created.workspace!;
+  const cwd = workspace.workspaceDirectory;
+  const head = runGit(cwd, "rev-parse", "HEAD");
+  const before = await client.getCheckoutDiff(cwd, { mode: "base" });
+  expect(before.error).toBeNull();
+  expect(before.files.map((file) => file.path)).toEqual(["feature.txt"]);
+  expect((await client.getCheckoutStatus(cwd)).baseRef).toBe("main");
+  expect((await client.archiveWorkspace(workspace.id)).error).toBeNull();
+  expect(existsSync(cwd)).toBe(false);
+  await client.restoreWorkspace(workspace.id);
+  expect(runGit(cwd, "rev-parse", "HEAD")).toBe(head);
+  expect((await client.getCheckoutStatus(cwd)).baseRef).toBe("main");
+  const after = await client.getCheckoutDiff(cwd, { mode: "base" });
+  expect(after.error).toBeNull();
+  expect(after.files.map((file) => file.path)).toEqual(["feature.txt"]);
+}, 180000);
+
 test("workspace.create keeps a branch-off name separate from its worktree slug", async () => {
   const daemon = await createTestPaseoDaemon();
   const { repoDir, tempRoot } = createGitRepoWithBranch();
@@ -258,3 +300,173 @@ test("workspace.create suffixes an occupied checkout branch", async () => {
     rmSync(tempRoot, { recursive: true, force: true });
   }
 }, 180000);
+
+function runGit(cwd: string, ...args: string[]): string {
+  return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" }).trim();
+}
+function commitFile(cwd: string, name: string, content: string): void {
+  writeFileSync(path.join(cwd, name), content);
+  runGit(cwd, "add", name);
+  runGit(cwd, "-c", "commit.gpgsign=false", "commit", "-m", name);
+}
+
+test.each([
+  ["refs/heads/main", "refs/remotes/origin/main"],
+  ["refs/remotes/origin/main", "refs/heads/main"],
+])(
+  "restore preserves %s through comparison, update and local merge",
+  async (baseRef, conflictingRef) => {
+    const workspace = await createRestorableWorkspace(baseRef);
+    await archiveAndRestoreWorkspace(workspace);
+    await expectRestoredComparison(workspace, conflictingRef);
+    await updateFromOriginalBase(workspace);
+    await expectMergeIntoLocalBase(workspace);
+  },
+  180000,
+);
+
+test("restore preserves upstream comparison and update but rejects a missing local merge target", async () => {
+  const workspace = await createRestorableWorkspace("refs/remotes/upstream/main");
+  await archiveAndRestoreWorkspace(workspace);
+  await expectRestoredComparison(workspace, "refs/heads/main");
+  await updateFromOriginalBase(workspace);
+  await expectMissingLocalMergeTarget(workspace);
+}, 180000);
+
+async function createRestorableWorkspace(baseRef: string) {
+  const daemon = await createTestPaseoDaemon();
+  const { repoDir, tempRoot } = createGitRepoWithBranch();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion: "0.8.0" });
+  onTestFinished(async () => {
+    await client.close().catch(() => undefined);
+    await daemon.close();
+    rmSync(tempRoot, { recursive: true, force: true });
+  });
+  createDivergentBases(repoDir);
+  await client.connect();
+  const created = await client.createWorkspace({
+    source: {
+      kind: "worktree",
+      cwd: repoDir,
+      action: "branch-off",
+      baseBranch: baseRef,
+      branchName: "feature/restore",
+      worktreeSlug: "restore-base",
+    },
+  });
+  expect(created.error).toBeNull();
+  const workspace = created.workspace!;
+  const cwd = workspace.workspaceDirectory;
+  commitFile(cwd, "feature.txt", "feature change\n");
+  const head = runGit(cwd, "rev-parse", "HEAD");
+  await client.checkoutRefresh(cwd);
+  const before = await client.getCheckoutDiff(cwd, { mode: "base", baseRef: "main" });
+  expect(before.error).toBeNull();
+  expect(before.files.map((file) => file.path)).toEqual(["feature.txt"]);
+  expect((await client.getCheckoutStatus(cwd)).baseRef).toBe("main");
+  return { client, daemon, repoDir, workspace, cwd, head, before, baseRef };
+}
+
+type RestorableWorkspace = Awaited<ReturnType<typeof createRestorableWorkspace>>;
+
+function createDivergentBases(repoDir: string): void {
+  const root = runGit(repoDir, "rev-parse", "HEAD");
+  // Same displayed name, three different commit streams.
+  commitFile(repoDir, "local.txt", "local base\n");
+  runGit(repoDir, "switch", "--detach", root);
+  commitFile(repoDir, "origin.txt", "origin base\n");
+  runGit(repoDir, "update-ref", "refs/remotes/origin/main", "HEAD");
+  runGit(repoDir, "switch", "--detach", root);
+  commitFile(repoDir, "upstream.txt", "upstream base\n");
+  runGit(repoDir, "update-ref", "refs/remotes/upstream/main", "HEAD");
+  runGit(repoDir, "switch", "main");
+}
+
+async function archiveAndRestoreWorkspace({ client, workspace, cwd }: RestorableWorkspace) {
+  expect((await client.archiveWorkspace(workspace.id)).error).toBeNull();
+  expect(existsSync(cwd)).toBe(false);
+  expect(await client.inspectWorkspaceRecovery(workspace.id)).toMatchObject({ action: "restore" });
+  await client.restoreWorkspace(workspace.id);
+}
+
+async function expectRestoredComparison(
+  { client, daemon, workspace, cwd, head, before, baseRef }: RestorableWorkspace,
+  conflictingRef: string,
+) {
+  const restoredStatus = await client.getCheckoutStatus(cwd);
+  await client.checkoutRefresh(cwd);
+  const after = await client.getCheckoutDiff(cwd, {
+    mode: "base",
+    baseRef: restoredStatus.baseRef ?? undefined,
+  });
+  expect(after.error).toBeNull();
+  expect(after.files).toEqual(before.files);
+  expect(runGit(cwd, "rev-parse", "HEAD")).toBe(head);
+  expect(runGit(cwd, "branch", "--show-current")).toBe("feature/restore");
+  expect(await client.getCheckoutStatus(cwd)).toMatchObject({
+    baseRef: "main",
+    aheadBehind: { ahead: 1, behind: 0 },
+  });
+  const history = await client.listCheckoutCommits(cwd);
+  expect(history.baseRef).toBe(baseRef);
+  expect(history.commits.filter((commit) => !commit.isOnBase).map((commit) => commit.sha)).toEqual([
+    head,
+  ]);
+  expect((await client.getCommitFileDiff(cwd, head, "feature.txt")).file?.path).toBe("feature.txt");
+  const records = JSON.parse(
+    readFileSync(path.join(daemon.paseoHome, "projects/workspaces.json"), "utf8"),
+  );
+  expect(
+    records.find((record: { workspaceId: string }) => record.workspaceId === workspace.id)
+      .baseBranch,
+  ).toBe(baseRef);
+  expect(
+    (await client.getCheckoutDiff(cwd, { mode: "base", baseRef: conflictingRef })).error?.message,
+  ).toContain("Base ref mismatch");
+}
+
+async function updateFromOriginalBase({ client, repoDir, cwd, baseRef }: RestorableWorkspace) {
+  // Advance only the chosen base; Update must not merge a same-named alternative.
+  runGit(repoDir, "switch", "--detach", baseRef);
+  commitFile(repoDir, "base-update.txt", `${baseRef}\n`);
+  const baseUpdate = runGit(repoDir, "rev-parse", "HEAD");
+  runGit(repoDir, "update-ref", baseRef, baseUpdate);
+  runGit(repoDir, "switch", "main");
+  await client.checkoutRefresh(cwd);
+  expect(await client.getCheckoutStatus(cwd)).toMatchObject({
+    aheadBehind: { ahead: 1, behind: 1 },
+  });
+  expect((await client.checkoutMergeFromBase(cwd, { baseRef: "main" })).error).toBeNull();
+  expect(readFileSync(path.join(cwd, "base-update.txt"), "utf8")).toBe(`${baseRef}\n`);
+  expect(runGit(cwd, "merge-base", baseUpdate, "HEAD")).toBe(baseUpdate);
+  expect(
+    (await client.getCheckoutDiff(cwd, { mode: "base", baseRef: "main" })).files.map(
+      (file) => file.path,
+    ),
+  ).toEqual(["feature.txt"]);
+}
+
+async function expectMergeIntoLocalBase({ client, cwd, repoDir }: RestorableWorkspace) {
+  expect(
+    (
+      await client.checkoutMerge(cwd, {
+        baseRef: "main",
+        strategy: "merge",
+        requireCleanTarget: true,
+      })
+    ).error,
+  ).toBeNull();
+  expect(runGit(repoDir, "show", "main:feature.txt")).toBe("feature change");
+}
+
+async function expectMissingLocalMergeTarget({ client, cwd }: RestorableWorkspace) {
+  expect(
+    (
+      await client.checkoutMerge(cwd, {
+        baseRef: "main",
+        strategy: "merge",
+        requireCleanTarget: true,
+      })
+    ).error?.message,
+  ).toContain("No local merge target is recorded");
+}
diff --git a/packages/server/src/server/workspace-directory.test.ts b/packages/server/src/server/workspace-directory.test.ts
index 3f2a150b99..e317b5427d 100644
--- a/packages/server/src/server/workspace-directory.test.ts
+++ b/packages/server/src/server/workspace-directory.test.ts
@@ -82,6 +82,7 @@ class WorkspaceStatus {
       workspaceDirectory: workspace.cwd,
       projectKind: "git",
       workspaceKind: workspace.kind,
+      background: workspace.background,
       name: workspace.displayName,
       archivingAt: null,
       status: "done",
@@ -571,7 +572,9 @@ describe("WorkspaceDirectory empty projects", () => {
         workspaceDirectory: workspace.cwd,
         projectKind: "non_git",
         workspaceKind: workspace.kind,
+        background: workspace.background,
         name: workspace.displayName,
+        ...(workspace.internal ? { background: true } : {}),
         archivingAt: null,
         status: "done",
         activityAt: null,
@@ -644,4 +647,88 @@ describe("WorkspaceDirectory empty projects", () => {
 
     expect(result.emptyProjects.map((p) => p.projectId)).toEqual(["empty"]);
   });
+
+  test("hides background workspaces and counts their project as empty unless includeBackground", async () => {
+    const directory = makeDirectory({
+      projects: [project({ projectId: "hidden-only" })],
+      workspaces: [
+        {
+          workspaceId: "ws-internal",
+          projectId: "hidden-only",
+          cwd: "/workspace/hidden-only",
+          kind: "directory",
+          displayName: "helper",
+          createdAt: NOW,
+          updatedAt: NOW,
+          archivedAt: null,
+          background: true,
+        },
+      ],
+    });
+
+    const hidden = await directory.listFetchEntries({
+      type: "fetch_workspaces_request",
+      requestId: "r1",
+      filter: { query: "helper" },
+    });
+    expect(hidden.entries).toEqual([]);
+    expect(hidden.emptyProjects.map((p) => p.projectId)).toEqual(["hidden-only"]);
+
+    const shown = await directory.listFetchEntries({
+      type: "fetch_workspaces_request",
+      requestId: "r2",
+      filter: { includeBackground: true },
+    });
+    expect(shown.entries.map((entry) => entry.id)).toEqual(["ws-internal"]);
+    expect(shown.emptyProjects).toEqual([]);
+  });
+});
+
+test("Git observation targets exclude archived records without hydrating app descriptors", async () => {
+  const workspace = (
+    id: string,
+    projectId: string,
+    archivedAt: string | null = null,
+  ): PersistedWorkspaceRecord => ({
+    workspaceId: id,
+    projectId,
+    cwd: `/workspace/${id}`,
+    kind: "local_checkout",
+    displayName: id,
+    createdAt: NOW,
+    updatedAt: NOW,
+    archivedAt,
+  });
+  const project = (id: string, archivedAt: string | null = null): PersistedProjectRecord => ({
+    projectId: id,
+    rootPath: `/workspace/${id}`,
+    kind: "git",
+    displayName: id,
+    customName: null,
+    createdAt: NOW,
+    updatedAt: NOW,
+    archivedAt,
+  });
+  const unexpectedHydration = async (): Promise<never> => {
+    throw new Error("Watcher reconciliation hydrated app data");
+  };
+  const directory = new WorkspaceDirectory({
+    logger: createTestLogger(),
+    projectRegistry: { list: async () => [project("active"), project("archived", NOW)] },
+    workspaceRegistry: {
+      list: async () => [
+        workspace("observed", "active"),
+        workspace("hidden", "active", NOW),
+        workspace("hidden-project", "archived"),
+      ],
+    },
+    listAgentPayloads: unexpectedHydration,
+    listProviderSubagentActivity: unexpectedHydration,
+    listTerminalActivityContributions: unexpectedHydration,
+    buildWorkspaceDescriptor: unexpectedHydration,
+    isProviderVisibleToClient: () => true,
+  });
+  expect(await directory.listObservationTargets()).toEqual([
+    { id: "observed", workspaceDirectory: "/workspace/observed", workspaceKind: "local_checkout" },
+  ]);
 });
diff --git a/packages/server/src/server/workspace-directory.ts b/packages/server/src/server/workspace-directory.ts
index a50713e16f..8ccb4fa341 100644
--- a/packages/server/src/server/workspace-directory.ts
+++ b/packages/server/src/server/workspace-directory.ts
@@ -153,12 +153,24 @@ export function workspaceIdsForProjects(
   return Array.from(workspaceIds);
 }
 
+function activeWorkspaceRecords(
+  workspaces: PersistedWorkspaceRecord[],
+  projects: PersistedProjectRecord[],
+): PersistedWorkspaceRecord[] {
+  const archivedProjects = new Set(
+    projects.filter((project) => project.archivedAt).map((project) => project.projectId),
+  );
+  return workspaces.filter(
+    (workspace) => !workspace.archivedAt && !archivedProjects.has(workspace.projectId),
+  );
+}
+
 export class WorkspaceDirectory {
   private readonly archivingByWorkspaceId = new Map<string, string>();
   /**
    * Per-workspace last-seen winning bucket + entered-at. Persists across
    * `buildDescriptorMap` calls inside the daemon process; reset on cold start.
-   * Server-internal; never crosses the wire.
+   * Server-private; never crosses the wire.
    */
   private readonly bucketHistoryByWorkspaceId = new Map<string, WorkspaceBucketHistoryEntry>();
 
@@ -223,12 +235,7 @@ export class WorkspaceDirectory {
         .filter((project) => !project.archivedAt)
         .map((project) => [project.projectId, project] as const),
     );
-    const archivedProjectIds = new Set(
-      persistedProjects.filter((project) => project.archivedAt).map((project) => project.projectId),
-    );
-    const activeRecords = persistedWorkspaces.filter(
-      (workspace) => !workspace.archivedAt && !archivedProjectIds.has(workspace.projectId),
-    );
+    const activeRecords = activeWorkspaceRecords(persistedWorkspaces, persistedProjects);
     const descriptorsByWorkspaceId = new Map<string, WorkspaceDescriptorPayload>();
     const workspaceIds = options.workspaceIds ? new Set(options.workspaceIds) : null;
     const activeWorkspaceIds = new Set(activeRecords.map((workspace) => workspace.workspaceId));
@@ -550,14 +557,20 @@ export class WorkspaceDirectory {
   // Project parents that have no active workspaces. The wire field is the
   // sidebar projection bucket for projects whose workspace list is currently
   // empty; it is not a separate domain record.
-  async listEmptyProjects(): Promise<WorkspaceProjectDescriptor[]> {
+  async listEmptyProjects(options?: {
+    includeBackground?: boolean;
+  }): Promise<WorkspaceProjectDescriptor[]> {
     const [persistedWorkspaces, persistedProjects] = await Promise.all([
       this.deps.workspaceRegistry.list(),
       this.deps.projectRegistry.list(),
     ]);
+    // A project whose only workspaces are hidden reads as empty to that caller.
     const projectIdsWithActiveWorkspaces = new Set(
       persistedWorkspaces
-        .filter((workspace) => !workspace.archivedAt)
+        .filter(
+          (workspace) =>
+            !workspace.archivedAt && (options?.includeBackground === true || !workspace.background),
+        )
         .map((workspace) => workspace.projectId),
     );
     return persistedProjects
@@ -575,6 +588,22 @@ export class WorkspaceDirectory {
       }));
   }
 
+  async listObservationTargets(): Promise<
+    Pick<WorkspaceDescriptorPayload, "id" | "workspaceDirectory" | "workspaceKind">[]
+  > {
+    const [workspaces, projects] = await Promise.all([
+      this.deps.workspaceRegistry.list(),
+      this.deps.projectRegistry.list(),
+    ]);
+    return activeWorkspaceRecords(workspaces, projects).map((workspace) => ({
+      id: workspace.workspaceId,
+      workspaceDirectory: workspace.cwd,
+      workspaceKind: workspace.kind,
+    }));
+  }
+
+  // Every active workspace, background ones included. Callers that answer a
+  // listing go through matchesFilter so background workspaces stay opt-in.
   async listDescriptors(): Promise<WorkspaceDescriptorPayload[]> {
     return Array.from(
       (
@@ -590,6 +619,13 @@ export class WorkspaceDirectory {
     filter: FetchWorkspacesRequestFilter | undefined;
   }): boolean {
     const { workspace, filter } = input;
+    if (
+      workspace.background &&
+      filter?.includeBackground !== true &&
+      filter?.query !== workspace.id
+    ) {
+      return false;
+    }
     if (!filter) {
       return true;
     }
@@ -645,7 +681,7 @@ export class WorkspaceDirectory {
     const projectIdFilter = filter?.projectId?.trim();
     const emptyProjects = cursorToken
       ? []
-      : (await this.listEmptyProjects()).filter(
+      : (await this.listEmptyProjects({ includeBackground: filter?.includeBackground })).filter(
           (project) => !projectIdFilter || project.projectId === projectIdFilter,
         );
 
@@ -693,7 +729,7 @@ function groupAgentsByWorkspaceId(
   return byWorkspaceId;
 }
 
-function resolveWorkspaceRootAgent(
+export function resolveWorkspaceRootAgent(
   agent: AgentSnapshotPayload,
   activeAgentsById: ReadonlyMap<string, AgentSnapshotPayload>,
 ): AgentSnapshotPayload | null {
diff --git a/packages/server/src/server/workspace-git-service.observation.integration.test.ts b/packages/server/src/server/workspace-git-service.observation.integration.test.ts
index eb54262b7b..a98dcda0fd 100644
--- a/packages/server/src/server/workspace-git-service.observation.integration.test.ts
+++ b/packages/server/src/server/workspace-git-service.observation.integration.test.ts
@@ -1,13 +1,14 @@
 import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import type pino from "pino";
+import pino from "pino";
 import { afterEach, expect, test, vi } from "vitest";
 import type { CheckoutSnapshotFacts, CheckoutStatusGit } from "../utils/checkout-git.js";
 import { CheckoutDiffManager } from "./checkout-diff-manager.js";
 import { createFileObserver } from "./file-observer/index.js";
 import { WorkspaceGitServiceImpl } from "./workspace-git-service.js";
-import type { FileChange, SubscribeToFileChanges } from "./file-observer/index.js";
+import type { FileChange, FileObserver, SubscribeToFileChanges } from "./file-observer/index.js";
 
 function createLogger(): pino.Logger {
   const logger = {
@@ -413,3 +414,90 @@ test("recursive observation updates tracked state and prunes ignored storms", as
   expect(getCheckoutDiff).not.toHaveBeenCalled();
   expect(service.getMetrics().workspaceRefreshQueuedCount).toBe(0);
 }, 30_000);
+
+test("a late Git-ignored tree is pruned while tracked changes still notify consumers", async () => {
+  const tempDir = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-real-ignore-")));
+  const repoDir = path.join(tempDir, "repo");
+  mkdirSync(repoDir);
+  const git = (...args: string[]) =>
+    execFileSync("git", args, { cwd: repoDir, encoding: "utf8" }).trim();
+  git("init", "-q");
+  writeFileSync(path.join(repoDir, ".gitignore"), "node_modules/\n");
+  const trackedPath = path.join(repoDir, "tracked.txt");
+  writeFileSync(trackedPath, "before\n");
+  git("add", ".gitignore", "tracked.txt");
+  git("-c", "user.name=Test", "-c", "user.email=test@localhost", "commit", "-qm", "fixture");
+
+  const observer = createFileObserver();
+  const ignoredDir = path.join(repoDir, "node_modules");
+  const completedIgnoreUpdates: string[][] = [];
+  let notifications = 0;
+  let expectTrackedEdit = false;
+  let trackedBatchReachedConsumer = false;
+  // Observe the real subscription without replacing Git, filesystem, or watcher behavior.
+  const fileObserver: FileObserver = {
+    subscribe: async (directory, callback, options) => {
+      const realSubscription = await observer.subscribe(
+        directory,
+        (error, events) => {
+          const includesTrackedEdit =
+            expectTrackedEdit && events.some((e) => e.path === trackedPath);
+          const before = notifications;
+          callback(error, events);
+          if (includesTrackedEdit && notifications > before) trackedBatchReachedConsumer = true;
+        },
+        options,
+      );
+      return {
+        updateIgnore: async (paths) => {
+          await realSubscription.updateIgnore(paths);
+          completedIgnoreUpdates.push([...paths]);
+        },
+        unsubscribe: () => realSubscription.unsubscribe(),
+      };
+    },
+    getDiagnostics: () => observer.getDiagnostics(),
+    close: () => observer.close(),
+  };
+  const service = new WorkspaceGitServiceImpl({
+    logger: pino({ enabled: false }),
+    paseoHome: path.join(tempDir, "home"),
+    fileObserver,
+  });
+  let subscription: Awaited<ReturnType<typeof service.requestWorkingTreeWatch>> | undefined;
+  try {
+    subscription = await service.requestWorkingTreeWatch(repoDir, () => {
+      notifications += 1;
+    });
+    for (let index = 0; index < 20; index += 1) {
+      const directory = path.join(ignoredDir, `dependency-${index}`);
+      mkdirSync(directory, { recursive: true });
+      writeFileSync(path.join(directory, "index.js"), "first");
+    }
+    expect(git("ls-files", "-o", "-i", "--directory", "--exclude-standard")).toBe("node_modules/");
+    await expect
+      .poll(() => completedIgnoreUpdates.some((paths) => paths.includes(ignoredDir)), {
+        timeout: 5_000,
+      })
+      .toBe(true);
+
+    const atIgnoreBoundary = observer.getDiagnostics();
+    for (let index = 0; index < 20; index += 1) {
+      writeFileSync(path.join(ignoredDir, `dependency-${index}`, "second.js"), "second");
+    }
+    expectTrackedEdit = true;
+    writeFileSync(trackedPath, "after\n");
+    await expect.poll(() => trackedBatchReachedConsumer, { timeout: 5_000 }).toBe(true);
+    const afterTrackedEdit = observer.getDiagnostics();
+    expect(afterTrackedEdit.nativeHandleCount).toBe(atIgnoreBoundary.nativeHandleCount);
+    expect(afterTrackedEdit.nativeTrackedFileCount).toBe(atIgnoreBoundary.nativeTrackedFileCount);
+    expect(
+      afterTrackedEdit.nativeClassificationCount - atIgnoreBoundary.nativeClassificationCount,
+    ).toBeLessThanOrEqual(1);
+  } finally {
+    subscription?.unsubscribe();
+    await service.dispose();
+    await observer.close();
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+}, 15_000);
diff --git a/packages/server/src/server/workspace-git-service.observation.test.ts b/packages/server/src/server/workspace-git-service.observation.test.ts
index 8469d300c9..8285304570 100644
--- a/packages/server/src/server/workspace-git-service.observation.test.ts
+++ b/packages/server/src/server/workspace-git-service.observation.test.ts
@@ -1,4 +1,5 @@
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 import type pino from "pino";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import type { CheckoutSnapshotFacts, CheckoutStatusGit } from "../utils/checkout-git.js";
@@ -8,6 +9,8 @@ import { WorkspaceGitServiceImpl } from "./workspace-git-service.js";
 
 const REPO_CWD = path.resolve("/tmp/paseo-observation-repo");
 const GIT_DIR = path.join(REPO_CWD, ".git");
+// Checkout observation must not depend on installed forge CLIs or host-auth probes.
+const REMOTE_URL = pathToFileURL(path.join(REPO_CWD, "remote.git")).href;
 const WORKTREE_A = path.resolve("/tmp/paseo-observation-worktree-a");
 const WORKTREE_B = path.resolve("/tmp/paseo-observation-worktree-b");
 
@@ -145,6 +148,50 @@ function getWatcherSubscribeCallCount(
     .length;
 }
 
+// Recovery backoff ladder: base 30s, doubling each attempt, capped at 300s
+// (base * 2 ** 4). Mirrors WATCH_RECOVERY_BASE_DELAY_MS /
+// WATCH_RECOVERY_MAX_BACKOFF_STEPS / WATCH_RECOVERY_MAX_DELAY_MS in
+// workspace-git-service.ts.
+const WATCH_RECOVERY_LADDER_DELAYS_MS = [30_000, 60_000, 120_000, 240_000, 300_000, 300_000];
+
+/**
+ * Drives a watch target (working tree or repository metadata) through six
+ * recovery cycles, proving three things about `advanceWatchRecoveryLadder`:
+ *  - recovery keeps retrying well past the old cap of 3 attempts (this walks
+ *    it to 6, i.e. 7 total subscriptions),
+ *  - the delay between attempts follows 30s/60s/120s/240s and then plateaus
+ *    at 300s rather than growing without bound, and
+ *  - a recovered subscription that emits an event (proving it is live) and
+ *    then errors again immediately — before surviving the 300s durability
+ *    window — does NOT reset the ladder back to the 30s base. Each "advance
+ *    by 30s only" check below would observe a premature retry if a reset had
+ *    happened.
+ */
+async function driveWatchRecoveryLadder(
+  watcher: ReturnType<typeof createWatcherHarness>,
+  directory: string,
+): Promise<void> {
+  for (const [index, delayMs] of WATCH_RECOVERY_LADDER_DELAYS_MS.entries()) {
+    const expectedCallCount = index + 2;
+    if (delayMs > 30_000) {
+      await vi.advanceTimersByTimeAsync(30_000);
+      // Not yet reset to the 30s base: no new attempt after only 30s.
+      expect(getWatcherSubscribeCallCount(watcher, directory)).toBe(expectedCallCount - 1);
+      await vi.advanceTimersByTimeAsync(delayMs - 30_000);
+    } else {
+      await vi.advanceTimersByTimeAsync(delayMs);
+    }
+    await vi.waitFor(() => {
+      expect(getWatcherSubscribeCallCount(watcher, directory)).toBe(expectedCallCount);
+    });
+    const recoveredWatcher = getWatcherRecordsForDirectory(watcher, directory)[index + 1];
+    recoveredWatcher?.callback(null, [
+      { path: path.join(directory, `recovered-${index + 1}.txt`), type: "update" },
+    ]);
+    recoveredWatcher?.callback(new Error(`recovered watcher stopped ${index + 1}`), []);
+  }
+}
+
 function createService(
   watcher: ReturnType<typeof createWatcherHarness>,
   overrides?: Record<string, unknown>,
@@ -216,6 +263,35 @@ describe("WorkspaceGitService checkout observation", () => {
     vi.useRealTimers();
   });
 
+  test("waits for the initial watcher inventory before building a cold diff", async () => {
+    const watcher = createWatcherHarness();
+    const inventoryFinished = createDeferred<void>();
+    let builds = 0;
+    const service = createService(watcher, {
+      subscribe: async (...args: Parameters<typeof watcher.subscribe>) => {
+        await inventoryFinished.promise;
+        return watcher.subscribe(...args);
+      },
+      getCheckoutDiff: async () => {
+        builds += 1;
+        return { diff: "", structured: [] };
+      },
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, () => {});
+    try {
+      const read = service.getCheckoutDiff(REPO_CWD, { mode: "uncommitted" });
+      await flushPromises();
+      expect(builds).toBe(0);
+      inventoryFinished.resolve();
+      await read;
+      expect(builds).toBe(1);
+    } finally {
+      inventoryFinished.resolve();
+      subscription.unsubscribe();
+      await service.dispose();
+    }
+  });
+
   test("dispose waits for file observation to finish closing", async () => {
     const watcher = createWatcherHarness();
     const closeFinished = createDeferred<void>();
@@ -500,7 +576,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
       currentBranch: "feature",
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
       resolvedBaseRef: "main",
       comparisonBaseRef: "origin/main",
     }));
@@ -525,7 +601,7 @@ describe("WorkspaceGitService checkout observation", () => {
           currentBranch: "feature",
           baseRef: "main",
           hasRemote: true,
-          remoteUrl: "https://example.com/repo.git",
+          remoteUrl: REMOTE_URL,
         }),
       ),
       hasOriginRemote: vi.fn(async () => true),
@@ -569,7 +645,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
       currentBranch: "feature",
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
       resolvedBaseRef: "main",
       comparisonBaseRef: "origin/main",
     }));
@@ -626,7 +702,7 @@ describe("WorkspaceGitService checkout observation", () => {
       const releaseFetch = createDeferred<void>();
       const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
         ...createCheckoutFacts(cwd),
-        remoteUrl: "https://example.com/repo.git",
+        remoteUrl: REMOTE_URL,
       }));
       const runGitFetch = vi.fn(async (_cwd, observer) => {
         if (phase === "before") {
@@ -681,7 +757,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const releaseFetch = createDeferred<void>();
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
     }));
     const getCheckoutRefDerivedState = vi.fn();
     const service = createService(watcher, {
@@ -731,7 +807,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
       currentBranch: "feature",
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
       resolvedBaseRef: "main",
       comparisonBaseRef: "origin/main",
     }));
@@ -791,7 +867,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
       currentBranch: "feature",
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
       resolvedBaseRef: "main",
       comparisonBaseRef: "origin/main",
     }));
@@ -820,7 +896,7 @@ describe("WorkspaceGitService checkout observation", () => {
           currentBranch: "feature",
           baseRef: "main",
           hasRemote: true,
-          remoteUrl: "https://example.com/repo.git",
+          remoteUrl: REMOTE_URL,
         }),
       ),
       hasOriginRemote: vi.fn(async () => true),
@@ -864,7 +940,7 @@ describe("WorkspaceGitService checkout observation", () => {
     const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
       ...createCheckoutFacts(cwd),
       currentBranch: "feature",
-      remoteUrl: "https://example.com/repo.git",
+      remoteUrl: REMOTE_URL,
       resolvedBaseRef: "main",
       comparisonBaseRef: "origin/main",
     }));
@@ -875,7 +951,7 @@ describe("WorkspaceGitService checkout observation", () => {
           currentBranch: "feature",
           baseRef: "main",
           hasRemote: true,
-          remoteUrl: "https://example.com/repo.git",
+          remoteUrl: REMOTE_URL,
         }),
       ),
       hasOriginRemote: vi.fn(async () => true),
@@ -889,9 +965,13 @@ describe("WorkspaceGitService checkout observation", () => {
     });
     const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
     await fetchSnapshotRead.promise;
+    // Observation setup also reads facts. Wait for the initial snapshot to be
+    // published before injecting an event that must produce a second refresh.
     await vi.waitFor(() => {
-      expect(getCheckoutSnapshotFacts).toHaveBeenCalledTimes(1);
+      expect(service.peekSnapshot(REPO_CWD)?.git.currentBranch).toBe("feature");
+      expect(service.getMetrics().workspaceRefreshInFlightCount).toBe(0);
     });
+    expect(getCheckoutSnapshotFacts).toHaveBeenCalledTimes(1);
 
     await vi.waitFor(() => {
       expect(getWatcherRecordsForDirectory(watcher, GIT_DIR)).toHaveLength(1);
@@ -916,27 +996,44 @@ describe("WorkspaceGitService checkout observation", () => {
 
   test("origin/main refreshes a main checkout without configured upstream", async () => {
     const watcher = createWatcherHarness();
-    const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => ({
-      ...createCheckoutFacts(cwd),
-      currentBranch: "main",
-      remoteUrl: "https://example.com/repo.git",
-      resolvedBaseRef: "main",
-      comparisonBaseRef: null,
-      branchRemoteName: null,
-      branchMergeRef: null,
-      upstreamStatus: null,
+    const releaseInitialFacts = createDeferred<void>();
+    const getCheckoutSnapshotFacts = vi.fn(async (cwd: string) => {
+      await releaseInitialFacts.promise;
+      return {
+        ...createCheckoutFacts(cwd),
+        currentBranch: "main",
+        remoteUrl: REMOTE_URL,
+        resolvedBaseRef: "main",
+        comparisonBaseRef: null,
+        branchRemoteName: null,
+        branchMergeRef: null,
+        upstreamStatus: null,
+      };
+    });
+    const runGitFetch = vi.fn(async () => ({
+      changes: [],
+      nonRemoteRefsChanged: false,
+      error: null,
     }));
-    const service = createService(watcher, { getCheckoutSnapshotFacts });
+    const service = createService(watcher, { getCheckoutSnapshotFacts, runGitFetch });
     const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
     await vi.waitFor(() => {
       expect(getCheckoutSnapshotFacts).toHaveBeenCalledTimes(1);
     });
 
-    watcher.records
-      .find((record) => record.directory === GIT_DIR)
-      ?.callback(null, [
-        { path: path.join(GIT_DIR, "refs", "remotes", "origin", "main"), type: "update" },
-      ]);
+    releaseInitialFacts.resolve();
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, GIT_DIR)).toHaveLength(1);
+      expect(service.getMetrics().workspaceRefreshInFlightCount).toBe(0);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+      expect(service.getMetrics().fetchInFlightCount).toBe(0);
+      expect(runGitFetch).toHaveBeenCalledTimes(1);
+    });
+    expect(getCheckoutSnapshotFacts).toHaveBeenCalledTimes(1);
+    const repoWatcher = getWatcherRecordsForDirectory(watcher, GIT_DIR)[0]!;
+    repoWatcher.callback(null, [
+      { path: path.join(GIT_DIR, "refs", "remotes", "origin", "main"), type: "update" },
+    ]);
     await vi.advanceTimersByTimeAsync(1_000);
     await vi.waitFor(() => {
       expect(getCheckoutSnapshotFacts).toHaveBeenCalledTimes(2);
@@ -1459,6 +1556,87 @@ describe("WorkspaceGitService checkout observation", () => {
     service.dispose();
   });
 
+  test("degraded polling backs off while the snapshot is unchanged and resets on a change", async () => {
+    // A repository large enough to defeat the recursive watcher makes every degraded refresh
+    // expensive, so a fixed cadence keeps the daemon shelling out Git on an untouched workspace.
+    const watcher = createWatcherHarness({ failDirectories: new Set([REPO_CWD]) });
+    let isDirty = false;
+    const getCheckoutStatus = vi.fn(async (cwd: string) => createCheckoutStatus(cwd, { isDirty }));
+    const service = createService(watcher, { getCheckoutStatus });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+
+    await vi.waitFor(() => {
+      expect(service.getMetrics().workingTreeWatchTargetCount).toBe(1);
+      expect(getCheckoutStatus).toHaveBeenCalledTimes(1);
+    });
+
+    // Quiet ticks at 5s, 10s, 20s, 40s, then the 60s ceiling.
+    for (const [elapsedMs, expectedCalls] of [
+      [5_000, 2],
+      [10_000, 3],
+      [20_000, 4],
+      [40_000, 5],
+      [60_000, 6],
+      [60_000, 7],
+    ] as const) {
+      await vi.advanceTimersByTimeAsync(elapsedMs);
+      expect(getCheckoutStatus).toHaveBeenCalledTimes(expectedCalls);
+    }
+
+    // A fixed 5s cadence would have run 39 polls over the same 195s.
+    expect(getCheckoutStatus.mock.calls.length).toBeLessThan(10);
+
+    // A real change snaps the loop back to the base interval.
+    isDirty = true;
+    await vi.advanceTimersByTimeAsync(60_000);
+    expect(getCheckoutStatus).toHaveBeenCalledTimes(8);
+    await vi.advanceTimersByTimeAsync(5_000);
+    expect(getCheckoutStatus).toHaveBeenCalledTimes(9);
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("degraded repository-metadata polling backs off and resets on a change", async () => {
+    // Only the Git-directory watcher fails, so the metadata fallback is the one poll loop running.
+    const watcher = createWatcherHarness({ failDirectories: new Set([GIT_DIR]) });
+    let isDirty = false;
+    const getCheckoutStatus = vi.fn(async (cwd: string) => createCheckoutStatus(cwd, { isDirty }));
+    const service = createService(watcher, { getCheckoutStatus });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+
+    await vi.waitFor(() => {
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+      expect(service.getMetrics().workspaceRefreshInFlightCount).toBe(0);
+    });
+    const callsBeforePolling = getCheckoutStatus.mock.calls.length;
+    function pollCount(): number {
+      return getCheckoutStatus.mock.calls.length - callsBeforePolling;
+    }
+
+    // Quiet ticks at 5s, 10s, 20s, 40s, then the 60s ceiling.
+    for (const [elapsedMs, expectedPolls] of [
+      [5_000, 1],
+      [10_000, 2],
+      [20_000, 3],
+      [40_000, 4],
+      [60_000, 5],
+      [60_000, 6],
+    ] as const) {
+      await vi.advanceTimersByTimeAsync(elapsedMs);
+      expect(pollCount()).toBe(expectedPolls);
+    }
+
+    isDirty = true;
+    await vi.advanceTimersByTimeAsync(60_000);
+    expect(pollCount()).toBe(7);
+    await vi.advanceTimersByTimeAsync(5_000);
+    expect(pollCount()).toBe(8);
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
   test("non-Git fallback promotes an externally initialized checkout", async () => {
     const watcher = createWatcherHarness();
     let isGit = false;
@@ -1672,17 +1850,17 @@ describe("WorkspaceGitService checkout observation", () => {
       expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
     });
     const statusCallsAfterSetup = getCheckoutStatus.mock.calls.length;
-    await vi.advanceTimersByTimeAsync(5_000);
-    await vi.waitFor(() => {
-      expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAfterSetup);
-    });
-    await vi.advanceTimersByTimeAsync(24_000);
+    await vi.advanceTimersByTimeAsync(29_000);
     expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(1);
     await vi.advanceTimersByTimeAsync(1_000);
     await vi.waitFor(() => {
       expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(2);
     });
     expect(erroredUnsubscribe).toHaveBeenCalledTimes(1);
+    // Recovery schedules a debounced refresh. Advance the fake clock past the debounce
+    // explicitly; vi.waitFor alone runs out of real time before it on a slow runner.
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAfterSetup);
 
     subscription.unsubscribe();
     service.dispose();
@@ -1752,7 +1930,7 @@ describe("WorkspaceGitService checkout observation", () => {
     service.dispose();
   });
 
-  test("watcher recovery remains capped when recovered subscriptions emit events before failing", async () => {
+  test("watcher recovery keeps retrying past the old attempt cap and the ladder does not reset on immediate re-failure", async () => {
     const watcher = createWatcherHarness();
     const getCheckoutStatus = vi.fn(async (cwd: string) => createCheckoutStatus(cwd));
     const service = createService(watcher, {
@@ -1767,50 +1945,27 @@ describe("WorkspaceGitService checkout observation", () => {
     const checkoutWatcher = getWatcherRecordsForDirectory(watcher, REPO_CWD)[0];
 
     checkoutWatcher?.callback(new Error("watcher stopped"), []);
-    await vi.advanceTimersByTimeAsync(30_000);
-    await vi.waitFor(() => {
-      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(2);
-    });
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[1]?.callback(null, [
-      { path: path.join(REPO_CWD, "recovered-1.txt"), type: "update" },
-    ]);
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[1]?.callback(
-      new Error("recovered watcher stopped"),
-      [],
-    );
-    await vi.advanceTimersByTimeAsync(60_000);
-    await vi.waitFor(() => {
-      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(3);
-    });
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[2]?.callback(null, [
-      { path: path.join(REPO_CWD, "recovered-2.txt"), type: "update" },
-    ]);
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[2]?.callback(
-      new Error("recovered watcher stopped again"),
-      [],
-    );
-    await vi.advanceTimersByTimeAsync(120_000);
-    await vi.waitFor(() => {
-      expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(4);
-    });
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[3]?.callback(null, [
-      { path: path.join(REPO_CWD, "recovered-3.txt"), type: "update" },
-    ]);
-    getWatcherRecordsForDirectory(watcher, REPO_CWD)[3]?.callback(
-      new Error("last recovered watcher stopped"),
-      [],
-    );
+    await driveWatchRecoveryLadder(watcher, REPO_CWD);
 
-    const statusCallsAtCap = getCheckoutStatus.mock.calls.length;
+    // Past the old cap of 3 recovery attempts (4 total subscriptions), the
+    // service keeps retrying instead of giving up permanently.
+    expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(
+      WATCH_RECOVERY_LADDER_DELAYS_MS.length + 1,
+    );
+    const statusCallsAfterLadder = getCheckoutStatus.mock.calls.length;
     await vi.advanceTimersByTimeAsync(300_000);
-    expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(4);
-    expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAtCap);
+    await vi.waitFor(() => {
+      expect(getWatcherSubscribeCallCount(watcher, REPO_CWD)).toBe(
+        WATCH_RECOVERY_LADDER_DELAYS_MS.length + 2,
+      );
+    });
+    expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAfterLadder);
 
     subscription.unsubscribe();
     service.dispose();
   });
 
-  test("repository watcher recovery remains capped after recovered subscriptions emit events", async () => {
+  test("repository watcher recovery keeps retrying past the old attempt cap and the ladder does not reset on immediate re-failure", async () => {
     const watcher = createWatcherHarness();
     const getCheckoutStatus = vi.fn(async (cwd: string) => createCheckoutStatus(cwd));
     const service = createService(watcher, {
@@ -1826,21 +1981,21 @@ describe("WorkspaceGitService checkout observation", () => {
       new Error("repository watcher stopped"),
       [],
     );
+    await driveWatchRecoveryLadder(watcher, GIT_DIR);
 
-    for (const [recoveryIndex, delayMs] of [30_000, 60_000, 120_000].entries()) {
-      await vi.advanceTimersByTimeAsync(delayMs);
-      await vi.waitFor(() => {
-        expect(getWatcherRecordsForDirectory(watcher, GIT_DIR)).toHaveLength(recoveryIndex + 2);
-      });
-      const recoveredWatcher = getWatcherRecordsForDirectory(watcher, GIT_DIR)[recoveryIndex + 1];
-      recoveredWatcher?.callback(null, [{ path: path.join(GIT_DIR, "HEAD"), type: "update" }]);
-      recoveredWatcher?.callback(new Error("recovered repository watcher stopped"), []);
-    }
-
-    const statusCallsAtCap = getCheckoutStatus.mock.calls.length;
+    // Past the old cap of 3 recovery attempts (4 total subscriptions), the
+    // service keeps retrying instead of giving up permanently.
+    expect(getWatcherSubscribeCallCount(watcher, GIT_DIR)).toBe(
+      WATCH_RECOVERY_LADDER_DELAYS_MS.length + 1,
+    );
+    const statusCallsAfterLadder = getCheckoutStatus.mock.calls.length;
     await vi.advanceTimersByTimeAsync(300_000);
-    expect(getWatcherSubscribeCallCount(watcher, GIT_DIR)).toBe(4);
-    expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAtCap);
+    await vi.waitFor(() => {
+      expect(getWatcherSubscribeCallCount(watcher, GIT_DIR)).toBe(
+        WATCH_RECOVERY_LADDER_DELAYS_MS.length + 2,
+      );
+    });
+    expect(getCheckoutStatus.mock.calls.length).toBeGreaterThan(statusCallsAfterLadder);
 
     subscription.unsubscribe();
     service.dispose();
@@ -1946,6 +2101,441 @@ describe("WorkspaceGitService checkout observation", () => {
     service.dispose();
   });
 
+  test("pruneKnownDirectories case-folds a Windows-shaped watch root", () => {
+    // `pruneKnownDirectories` only needs to fold case when the watch root
+    // *looks* like a Windows path (drive letter or UNC) — see
+    // `looksLikeDefiniteWindowsPath` in `../utils/path.js`, the same rule
+    // `isPathInsideRoot`/`isRealpathInsideRoot` used before this method was
+    // rewritten from realpath comparisons to string prefixes (see the
+    // class-level comment on `pruneKnownDirectories`). macOS's real
+    // filesystem is already case-insensitive, so a test built from real
+    // directories on disk would pass whether or not that fold logic
+    // exists — a synthetic Windows-shaped root exercises the comparison
+    // logic itself instead of relying on host filesystem behavior.
+    //
+    // Driven directly against the private target rather than through
+    // `registerWorkspace`, for two independent reasons, both checked before
+    // settling on this shape:
+    //
+    // 1. Reachability: `registerWorkspace` resolves `cwd` through
+    //    `node:path`'s `resolve()` before anything else runs, and on this
+    //    POSIX test host that rewrites a drive-letter path into an ordinary
+    //    POSIX one, destroying the shape this test depends on. This step can
+    //    be routed around — mocking `git rev-parse --show-toplevel`'s stdout
+    //    lets `target.watchPath` carry the raw Windows-shaped string, since
+    //    `parseGitRevParsePath` does not call `resolve()` — but
+    //    `loadIgnoredDirs` then calls `resolve(rootPath, rel)` on that same
+    //    watch path to build `ignoredDirectories`, which on POSIX prefixes it
+    //    with `process.cwd()` and breaks the shared prefix the fold logic
+    //    compares against. Two independent `resolve()` calls, each assuming
+    //    host-platform semantics, block the public path from both sides.
+    // 2. Observability: even granting reachability, `knownDirectories` has
+    //    exactly one reader outside this method — the Set-lookup fast path in
+    //    `noteWorkingTreeDirectories` — and that method's fallback branch
+    //    re-derives ignored-ness via `isPathInsideRoot`, which already folds
+    //    case correctly on its own. Verified by deleting this method's fold
+    //    logic (forcing `foldCase = false`) and running this file plus the
+    //    integration suite: only this test failed. No public-surface
+    //    assertion distinguishes a correctly pruned directory from one left
+    //    stale, because the redundant check downstream produces the same
+    //    outcome either way.
+    const service = createService(createWatcherHarness());
+    const target = {
+      watchPath: "C:/Users/dev/Repo",
+      knownDirectories: new Set<string>(["C:/Users/dev/Repo/Deps/package-a"]),
+      ignoredDirectories: new Set<string>(["C:/Users/dev/Repo/deps"]),
+    };
+
+    (
+      service as unknown as { pruneKnownDirectories: (t: typeof target) => void }
+    ).pruneKnownDirectories(target);
+
+    expect(target.knownDirectories.has("C:/Users/dev/Repo/Deps/package-a")).toBe(false);
+
+    service.dispose();
+  });
+
+  test("a previously unseen directory refreshes the ignore set", async () => {
+    const watcher = createWatcherHarness();
+    // A fresh worktree has no ignored directories on disk yet.
+    let ignoredDirectories = "";
+    const runGitCommand = vi.fn(async (args: string[]) => ({
+      stdout: args[0] === "rev-parse" ? `${REPO_CWD}\n` : ignoredDirectories,
+      stderr: "",
+      truncated: false,
+      exitCode: 0,
+      signal: null,
+    }));
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    expect(checkoutWatcher?.ignore).not.toContain(path.join(REPO_CWD, "deps"));
+
+    // Dependencies get installed. No .gitignore is touched.
+    ignoredDirectories = "deps/\n";
+    checkoutWatcher?.callback(null, [
+      { path: path.join(REPO_CWD, "deps", "package-a", "index.js"), type: "create" },
+    ]);
+    await vi.advanceTimersByTimeAsync(2_000);
+
+    await vi.waitFor(() => {
+      expect(checkoutWatcher?.updateIgnore).toHaveBeenCalledWith(
+        expect.arrayContaining([path.join(REPO_CWD, "deps")]),
+      );
+    });
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("a failed ignore refresh does not permanently mark a directory known", async () => {
+    // Regression for the failure path reintroducing the original #4558 bug:
+    // `noteWorkingTreeDirectories` marks a newly seen directory known and
+    // schedules a debounced refresh, but `loadIgnoredDirs` deliberately keeps
+    // the previous ignore set when `git ls-files` fails (a transient failure
+    // must not un-ignore the whole dependency tree). If that success/failure
+    // distinction is not carried back, the directory stays "known" forever
+    // with the fast-path Set lookup in `noteWorkingTreeDirectories` skipping
+    // it on every later event — so no refresh is ever attempted again and
+    // the directory is watched forever, same as before #4558 was fixed.
+    const watcher = createWatcherHarness();
+    let ignoredDirectories = "";
+    let lsFilesCallCount = 0;
+    const runGitCommand = vi.fn(async (args: string[]) => {
+      if (args[0] === "rev-parse") {
+        return { stdout: `${REPO_CWD}\n`, stderr: "", truncated: false, exitCode: 0, signal: null };
+      }
+      lsFilesCallCount += 1;
+      // The seed load at registration (call 1) succeeds. The refresh
+      // triggered by the newly discovered "deps" directory (call 2) fails
+      // transiently.
+      if (lsFilesCallCount === 2) {
+        throw new Error("git ls-files timed out");
+      }
+      return {
+        stdout: ignoredDirectories,
+        stderr: "",
+        truncated: false,
+        exitCode: 0,
+        signal: null,
+      };
+    });
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    expect(lsFilesCallCount).toBe(1);
+
+    // Dependencies get installed. No .gitignore is touched, so this only
+    // schedules a refresh via directory discovery — the one wired to fail.
+    ignoredDirectories = "deps/\n";
+    checkoutWatcher?.callback(null, [
+      { path: path.join(REPO_CWD, "deps", "package-a", "index.js"), type: "create" },
+    ]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount).toBe(2);
+    });
+    // The failed refresh must not have applied "deps" to the live watcher.
+    expect(checkoutWatcher?.updateIgnore).not.toHaveBeenCalled();
+
+    // A later write under the same directory. If the directory were left
+    // permanently "known" by the failed refresh, `noteWorkingTreeDirectories`
+    // would silently skip it here and no second refresh would ever happen.
+    checkoutWatcher?.callback(null, [
+      { path: path.join(REPO_CWD, "deps", "package-a", "index2.js"), type: "create" },
+    ]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount).toBe(3);
+      expect(checkoutWatcher?.updateIgnore).toHaveBeenCalledWith(
+        expect.arrayContaining([path.join(REPO_CWD, "deps")]),
+      );
+    });
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("repeat writes in known directories do not re-run git ls-files", async () => {
+    const watcher = createWatcherHarness();
+    let ignoredDirectories = "";
+    const runGitCommand = vi.fn(async (args: string[]) => ({
+      stdout: args[0] === "rev-parse" ? `${REPO_CWD}\n` : ignoredDirectories,
+      stderr: "",
+      truncated: false,
+      exitCode: 0,
+      signal: null,
+    }));
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    // Registration itself performs one ls-files call to seed the ignore set. Measure the
+    // burst's effect as a delta from this baseline, not an absolute count, so the assertion
+    // cannot pass vacuously off of setup's own call.
+    const lsFilesAtSetup = runGitCommand.mock.calls.filter(
+      (call) => call[0][0] === "ls-files",
+    ).length;
+
+    // One burst in a new directory: one debounced refresh, not one per event.
+    ignoredDirectories = "deps/\n";
+    for (let index = 0; index < 500; index += 1) {
+      checkoutWatcher?.callback(null, [
+        { path: path.join(REPO_CWD, "deps", `module-${index}.js`), type: "create" },
+      ]);
+    }
+    await vi.advanceTimersByTimeAsync(3_000);
+    const lsFilesAfterBurst = runGitCommand.mock.calls.filter(
+      (call) => call[0][0] === "ls-files",
+    ).length;
+    // The burst must have refreshed the ignore set at least once...
+    expect(lsFilesAfterBurst - lsFilesAtSetup).toBeGreaterThanOrEqual(1);
+    // ...but debounced into at most 2 calls, not one per event. (The brief's original absolute
+    // bound was <= 3 total calls with a baseline of 1 from setup, i.e. at most 2 burst-triggered
+    // refreshes — preserve that numeric intent here as a delta.)
+    expect(lsFilesAfterBurst - lsFilesAtSetup).toBeLessThanOrEqual(2);
+
+    // The directory is known now. Further writes trigger nothing.
+    for (let index = 0; index < 200; index += 1) {
+      checkoutWatcher?.callback(null, [
+        { path: path.join(REPO_CWD, "src", `file-${index}.ts`), type: "update" },
+      ]);
+    }
+    await vi.advanceTimersByTimeAsync(3_000);
+    const lsFilesAtEnd = runGitCommand.mock.calls.filter(
+      (call) => call[0][0] === "ls-files",
+    ).length;
+    expect(lsFilesAtEnd).toBeLessThanOrEqual(lsFilesAfterBurst + 1);
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("a deleted known directory is dropped, so a later event under it re-runs git ls-files", async () => {
+    // Regression for the finding that `knownDirectories` only ever grows:
+    // nothing previously removed an entry once its directory was deleted
+    // from disk, so a long-lived daemon over a churning tree (deps
+    // installed and removed, build output cycling) would accumulate
+    // tombstones for the life of the target and slow every future
+    // `pruneKnownDirectories` pass. `removeDeletedKnownDirectories` must
+    // drop a directory (and anything nested under it) once a `delete`
+    // event reports the directory path itself — proven here by making a
+    // write reappear under the same path afterward and asserting it costs
+    // a fresh `git ls-files` refresh rather than being silently skipped by
+    // the known-directory fast path.
+    const watcher = createWatcherHarness();
+    const runGitCommand = vi.fn(async (args: string[]) => ({
+      stdout: args[0] === "rev-parse" ? `${REPO_CWD}\n` : "",
+      stderr: "",
+      truncated: false,
+      exitCode: 0,
+      signal: null,
+    }));
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    const lsFilesCallCount = () =>
+      runGitCommand.mock.calls.filter((call) => call[0][0] === "ls-files").length;
+    const lsFilesAtSetup = lsFilesCallCount();
+
+    const depsDir = path.join(REPO_CWD, "deps");
+    // First sight of `deps`: marks it known and schedules one debounced refresh.
+    checkoutWatcher?.callback(null, [{ path: path.join(depsDir, "index.js"), type: "create" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAtSetup);
+    });
+    const lsFilesAfterDepsDiscovery = lsFilesCallCount();
+
+    // A nested directory under `deps` becomes known too. A directory delete
+    // does not guarantee a delete event for everything beneath it, so
+    // removal must drop this along with `deps` itself.
+    const nestedDir = path.join(depsDir, "nested");
+    checkoutWatcher?.callback(null, [{ path: path.join(nestedDir, "index.js"), type: "create" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAfterDepsDiscovery);
+    });
+    const lsFilesAfterNestedDiscovery = lsFilesCallCount();
+
+    // Steady state: another write in a known directory triggers nothing.
+    checkoutWatcher?.callback(null, [{ path: path.join(depsDir, "index2.js"), type: "update" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(lsFilesCallCount()).toBe(lsFilesAfterNestedDiscovery);
+
+    // `deps` (the parent) is deleted from disk. The watcher reports the
+    // directory path itself, not just files under it.
+    checkoutWatcher?.callback(null, [{ path: depsDir, type: "delete" }]);
+
+    // A write reappears directly under `deps`. If the delete had not
+    // dropped it from `knownDirectories`, the known-directory fast path
+    // would skip this event and no refresh would run.
+    checkoutWatcher?.callback(null, [
+      { path: path.join(depsDir, "reinstalled.js"), type: "create" },
+    ]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAfterNestedDiscovery);
+    });
+    const lsFilesAfterDepsRediscovery = lsFilesCallCount();
+
+    // The formerly nested `deps/nested` must have been dropped too, even
+    // though only `deps` itself received a delete event.
+    checkoutWatcher?.callback(null, [
+      { path: path.join(nestedDir, "reinstalled.js"), type: "create" },
+    ]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAfterDepsRediscovery);
+    });
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("a large event batch refreshes ignored roots without scanning every new directory", async () => {
+    const watcher = createWatcherHarness();
+    const runGitCommand = vi.fn(async (args: string[]) => ({
+      stdout: args[0] === "rev-parse" ? `${REPO_CWD}\n` : "",
+      stderr: "",
+      truncated: false,
+      exitCode: 0,
+      signal: null,
+    }));
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    const lsFilesCallCount = () =>
+      runGitCommand.mock.calls.filter((call) => call[0][0] === "ls-files").length;
+    const lsFilesAtSetup = lsFilesCallCount();
+
+    // Establish one directory as known and steady before the flood.
+    const markerDir = path.join(REPO_CWD, "marker");
+    checkoutWatcher?.callback(null, [{ path: path.join(markerDir, "file.js"), type: "create" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAtSetup);
+    });
+    const lsFilesAfterMarker = lsFilesCallCount();
+
+    // Steady state: another write under the marker directory triggers nothing.
+    checkoutWatcher?.callback(null, [{ path: path.join(markerDir, "file2.js"), type: "update" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(lsFilesCallCount()).toBe(lsFilesAfterMarker);
+
+    // A single discovery refreshes Git's complete ignored-directory inventory.
+    // The other directories in this batch need not enter the known cache.
+    const floodEvents = Array.from({ length: 50_000 }, (_, index) => ({
+      path: path.join(REPO_CWD, "gen", `d${index}`, "file.js"),
+      type: "create" as const,
+    }));
+    checkoutWatcher?.callback(null, floodEvents);
+    await vi.advanceTimersByTimeAsync(2_000);
+    await vi.waitFor(() => {
+      expect(lsFilesCallCount()).toBeGreaterThan(lsFilesAfterMarker);
+    });
+    const lsFilesAfterFlood = lsFilesCallCount();
+
+    // The flood must not evict an unrelated known directory by processing
+    // every entry before the cap is checked. Its later edit stays on the
+    // cache fast path and does not trigger a redundant Git refresh.
+    checkoutWatcher?.callback(null, [{ path: path.join(markerDir, "file3.js"), type: "create" }]);
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(lsFilesCallCount()).toBe(lsFilesAfterFlood);
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
+  test("watcher recovery keeps retrying after repeated failures", async () => {
+    // The initial subscribe must succeed so the target starts out healthy; only subscribe
+    // attempts made *after* that (i.e. recovery attempts) should fail. `failDirectories` is
+    // read live on every `subscribe()` call, so mutating it after registration is enough —
+    // no need to fork the harness.
+    const failDirectories = new Set<string>();
+    const watcher = createWatcherHarness({ failDirectories });
+    let ignoredDirectories = "node_modules/\n";
+    const runGitCommand = vi.fn(async (args: string[]) => ({
+      stdout: args[0] === "rev-parse" ? `${REPO_CWD}\n` : ignoredDirectories,
+      stderr: "",
+      truncated: false,
+      exitCode: 0,
+      signal: null,
+    }));
+    const service = createService(watcher, {
+      getWorkspaceGitSelfHealPhaseMs: () => 1_000,
+      runGitCommand,
+    });
+    const subscription = service.registerWorkspace({ cwd: REPO_CWD }, vi.fn());
+    await vi.waitFor(() => {
+      expect(getWatcherRecordsForDirectory(watcher, REPO_CWD)).toHaveLength(1);
+      expect(service.getMetrics().workspaceObservationSetupInFlightCount).toBe(0);
+    });
+    const checkoutWatcher = watcher.records.find((record) => record.directory === REPO_CWD);
+    const subscribeCallsBeforeFailure = getWatcherSubscribeCallCount(watcher, REPO_CWD);
+
+    // From here on, every further subscribe attempt for this directory fails — a watcher that
+    // cannot be re-established (permission error, unmounted volume, etc).
+    failDirectories.add(REPO_CWD);
+
+    // Force the live subscription to fail and enter recovery. A rejected updateIgnore is the
+    // most direct trigger: it nulls target.subscription and schedules recovery.
+    checkoutWatcher?.updateIgnore.mockRejectedValueOnce(new Error("update failed"));
+    ignoredDirectories = "node_modules/\nbuild/\n";
+    checkoutWatcher?.callback(null, [{ path: path.join(REPO_CWD, ".gitignore"), type: "update" }]);
+
+    // Recovery backs off at WATCH_RECOVERY_BASE_DELAY_MS * 2**(attempt-1) with base 30_000ms,
+    // landing at 30s, 60s, 120s, 240s for the first 4 attempts (WATCH_RECOVERY_MAX_BACKOFF_STEPS
+    // caps the exponent at 4, and WATCH_RECOVERY_MAX_DELAY_MS's 300s ceiling doesn't bind until
+    // the 5th). A 4th recovery attempt needs the first four delays to have elapsed:
+    // 30_000 + 60_000 + 120_000 + 240_000 = 450_000ms. Advance past that with headroom.
+    await vi.advanceTimersByTimeAsync(500_000);
+
+    const subscribeCallsAfterRecoveryWindow = getWatcherSubscribeCallCount(watcher, REPO_CWD);
+    // 1 initial success + 3 capped recovery attempts = 4 total. A 5th call would prove recovery
+    // keeps retrying past the hard cap instead of giving up on this target forever.
+    expect(subscribeCallsAfterRecoveryWindow).toBeGreaterThan(subscribeCallsBeforeFailure + 3);
+
+    subscription.unsubscribe();
+    service.dispose();
+  });
+
   test("removing an ignored directory updates the watcher without replacement", async () => {
     const watcher = createWatcherHarness();
     let ignoredDirectories = "node_modules/\nbuild/\n";
diff --git a/packages/server/src/server/workspace-git-service.primitive.test.ts b/packages/server/src/server/workspace-git-service.primitive.test.ts
index 65eb4a0ad5..ce052cdd7c 100644
--- a/packages/server/src/server/workspace-git-service.primitive.test.ts
+++ b/packages/server/src/server/workspace-git-service.primitive.test.ts
@@ -1819,6 +1819,46 @@ describe("WorkspaceGitServiceImpl D2 read methods", () => {
     service.dispose();
   });
 
+  test("invalidating worktrees discards warm listings across checkout roots and in-flight reads", async () => {
+    const worktrees = [
+      {
+        path: "/tmp/paseo-home/worktrees/repo/feature",
+        createdAt: "2026-04-12T00:00:00.000Z",
+        branchName: "feature",
+      },
+    ];
+    const readStarted = createDeferred<void>();
+    const oldRead = createDeferred<typeof worktrees>();
+    const alternateCheckout = resolvePath("/tmp/alternate-checkout");
+    let reads = 0;
+    const service = createService({
+      listPaseoWorktrees: async () => {
+        reads += 1;
+        if (reads <= 2) return worktrees;
+        if (reads === 3) {
+          readStarted.resolve();
+          return oldRead.promise;
+        }
+        return [];
+      },
+    });
+    try {
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual(worktrees);
+      await expect(service.listWorktrees(alternateCheckout)).resolves.toEqual(worktrees);
+      const pending = service.listWorktrees(REPO_CWD, { force: true, reason: "test" });
+      await readStarted.promise;
+      service.invalidateWorktrees();
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual([]);
+      await expect(service.listWorktrees(alternateCheckout)).resolves.toEqual([]);
+      oldRead.resolve(worktrees);
+      await expect(pending).resolves.toEqual(worktrees);
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual([]);
+    } finally {
+      oldRead.resolve(worktrees);
+      await service.dispose();
+    }
+  });
+
   test("listWorktrees shares one repo-root scoped read across sibling workspace cwds", async () => {
     const tempDir = realpathSync(mkdtempSync(join(tmpdir(), "workspace-git-service-")));
     const repoDir = join(tempDir, "repo");
diff --git a/packages/server/src/server/workspace-git-service.ts b/packages/server/src/server/workspace-git-service.ts
index fc1d211f33..2f3483cb6f 100644
--- a/packages/server/src/server/workspace-git-service.ts
+++ b/packages/server/src/server/workspace-git-service.ts
@@ -1,7 +1,8 @@
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
-import { basename, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { LRUCache } from "lru-cache";
+import { CheckoutDiffCache } from "./checkout-diff-cache.js";
 import pLimit from "p-limit";
 import type pino from "pino";
 import type { ProjectCheckoutLitePayload } from "@getpaseo/protocol/messages";
@@ -44,7 +45,9 @@ import { parseGitRevParsePath } from "../utils/git-rev-parse-path.js";
 import {
   createRealpathAwarePathMatcher,
   getRealpathAwareRelativePath,
+  isPathInsideRoot,
   isRealpathInsideRoot,
+  looksLikeDefiniteWindowsPath,
 } from "../utils/path.js";
 import {
   createRunGitCommand,
@@ -83,19 +86,45 @@ const FORGE_PR_STATUS_POLL_FAST_INTERVAL_MS = 20_000;
 const FORGE_PR_STATUS_POLL_SLOW_INTERVAL_MS = 120_000;
 const FORGE_PR_STATUS_POLL_ERROR_BACKOFF_CAP_MS = 300_000;
 const DEGRADED_GIT_POLL_INTERVAL_MS = 5_000;
+// Degraded polling shells out a full Git refresh per tick, and the repositories that defeat the
+// recursive watcher are the ones where that refresh is expensive. At a fixed cadence the daemon
+// therefore burns a core forever on a workspace nobody has touched. Double the gap after every
+// tick that produced an identical snapshot, and drop back to the base interval as soon as one
+// does not. Explicit reads still force a refresh, so this only bounds background discovery of
+// changes made outside Paseo.
+const DEGRADED_GIT_POLL_MAX_INTERVAL_MS = 60_000;
+// A dependency install creates directories for minutes. Collapse the burst into
+// a couple of `git ls-files` runs rather than one per event.
+const WORKING_TREE_IGNORE_REFRESH_QUIET_MS = 300;
+const WORKING_TREE_IGNORE_REFRESH_MAX_DELAY_MS = 2_000;
+// `knownDirectories` is a memoisation of the fast path in
+// `noteWorkingTreeDirectories`, not authoritative state — every entry is
+// rediscoverable from a later watcher event under the same path. Deletion
+// handling (`removeDeletedKnownDirectories`) keeps it close to the live
+// directory count, but this cap is the backstop for what that cannot cover
+// (a missed or coalesced delete event, a backend quirk): clearing the whole
+// set outright on overflow is always safe, since the only cost is one extra
+// `git ls-files` refresh the next time a directory under this root is
+// touched again. Set well below `MAX_TRACKED_ENTRIES` (250_000, the
+// native-recursive.ts cap on combined file+directory entries per watched
+// root) because directories are a minority of any tracked tree, and the
+// observer itself already fails into polling before a single root's
+// combined entry count could approach that cap.
+const WORKING_TREE_KNOWN_DIRECTORIES_MAX = 50_000;
 // Keep whole workspace pipelines below the lower-level Git process pool so daemon control work
 // retains subprocess and event-loop headroom during large workspace reconciliation bursts.
 export const WORKSPACE_GIT_REFRESH_CONCURRENCY = 4;
 export const WORKSPACE_GIT_OBSERVATION_SETUP_CONCURRENCY = 2;
 export const WORKSPACE_GIT_WATCHER_SUBSCRIBE_TIMEOUT_MS = 10_000;
 const WATCH_RECOVERY_BASE_DELAY_MS = 30_000;
-const WATCH_RECOVERY_MAX_ATTEMPTS = 3;
+// Giving up permanently leaves polling as the only behaviour until a daemon
+// restart, which kills running agents. Back off, but keep trying.
+const WATCH_RECOVERY_MAX_DELAY_MS = 300_000;
+const WATCH_RECOVERY_MAX_BACKOFF_STEPS = 4;
 // Auxiliary reads may reuse cached values within this window; snapshots do not expire on read.
 const WORKSPACE_GIT_AUXILIARY_READ_TTL_MS = 15_000;
 // Non-forced refresh triggers share this minimum gap to absorb watcher/self-heal bursts; force bypasses it.
 const WORKSPACE_GIT_INTERNAL_MIN_GAP_MS = 2_000;
-// Heavy values (multi-MB highlighted diffs); cap aggressively. Ephemeral worktree cwds would otherwise pile up forever.
-const WORKSPACE_GIT_CHECKOUT_DIFF_CACHE_MAX = 64;
 // Small values (booleans, short strings, small arrays); generous cap.
 const WORKSPACE_GIT_AUXILIARY_CACHE_MAX = 256;
 
@@ -212,6 +241,7 @@ export interface WorkspaceGitService {
     cwdOrRepoRoot: string,
     options?: WorkspaceGitReadOptions,
   ): Promise<WorkspaceGitWorktreeInfo[]>;
+  invalidateWorktrees(): void;
   getProjectSlug(cwd: string, options?: WorkspaceGitReadOptions): Promise<string>;
   resolveRepoRoot(cwd: string, options?: WorkspaceGitReadOptions): Promise<string>;
   resolveDefaultBranch(cwdOrRepoRoot: string, options?: WorkspaceGitReadOptions): Promise<string>;
@@ -420,6 +450,7 @@ interface RepoGitTarget {
   subscription: FileObserverSubscription | null;
   fallbackPolling: boolean;
   fallbackPollTimer: NodeJS.Timeout | null;
+  fallbackPollQuietTickCount: number;
   recovery: WatchRecoveryState;
   intervalId: NodeJS.Timeout | null;
   fetchInFlight: boolean;
@@ -445,12 +476,41 @@ interface WorkingTreeWatchTarget {
   repoRoot: string | null;
   subscription: FileObserverSubscription | null;
   ignoredDirectories: Set<string>;
+  // What the live subscription actually accepted, as of the last successful
+  // `updateIgnore`/subscribe — the full resolved ignore list (the watch root's
+  // `.git` plus gitignore-derived `ignoredDirectories`), not just
+  // `ignoredDirectories`. The resolved list can move ahead of this (a fresh
+  // `git ls-files` result) while the subscription still runs on the old set;
+  // comparing against this field instead of the last-computed value keeps a
+  // skipped update from latching forever.
+  appliedIgnoreList: string[];
   ignoredDirectoriesRefreshPromise: Promise<void> | null;
   ignoredDirectoriesRefreshRequested: boolean;
+  // Bounded two ways so a long-lived daemon over a churning tree cannot grow
+  // this without limit: `removeDeletedKnownDirectories` drops an entry (and
+  // anything nested under it) once its own path is reported deleted, and
+  // `enforceKnownDirectoriesCap` clears the whole set outright past
+  // `WORKING_TREE_KNOWN_DIRECTORIES_MAX`. See both for why clearing is safe.
+  knownDirectories: Set<string>;
+  // Directories added to `knownDirectories` since the last ignore-list
+  // refresh that actually completed (successfully or not). A failed refresh
+  // (`loadIgnoredDirs` falling back to the previous set) must not leave a
+  // newly seen directory permanently marked known — that would silently
+  // reintroduce the original "watched forever" bug through the failure path.
+  // `replaceWorkingTreeIgnoredDirectories` rolls this set back into
+  // `knownDirectories` on failure so a later event under the same directory
+  // is treated as unseen again and re-arms the refresh; on success it is
+  // simply cleared, since a successful refresh reflects the full current
+  // ignore state and `pruneKnownDirectories` already removes anything that
+  // turned out to be ignored.
+  pendingKnownDirectories: Set<string>;
+  ignoreRefreshTimer: NodeJS.Timeout | null;
+  ignoreRefreshDeadlineMs: number | null;
   aliases: Set<string>;
   workspaceKeys: Set<string>;
   fallbackPolling: boolean;
   fallbackPollTimer: NodeJS.Timeout | null;
+  fallbackPollQuietTickCount: number;
   recovery: WatchRecoveryState;
   listeners: Set<() => void>;
   closed: boolean;
@@ -459,6 +519,13 @@ interface WorkingTreeWatchTarget {
 interface WatchRecoveryState {
   attemptCount: number;
   timer: NodeJS.Timeout | null;
+  // Set when a subscription is accepted, cleared when it is scheduled for
+  // recovery. `attemptCount` only resets to 0 once the subscription this
+  // replaces is proven to have survived at least `WATCH_RECOVERY_MAX_DELAY_MS`
+  // — otherwise a filesystem that accepts `subscribe()` but errors on first
+  // use (SMB/NFS, Docker virtiofs, some FUSE) resets the ladder on every
+  // attempt and the backoff never engages.
+  establishedAt: number | null;
 }
 
 function setsEqual(left: ReadonlySet<string>, right: ReadonlySet<string>): boolean {
@@ -566,10 +633,7 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     string,
     WorkspaceGitAuxiliaryReadCacheEntry<string>
   >({ max: WORKSPACE_GIT_AUXILIARY_CACHE_MAX });
-  private readonly checkoutDiffCache = new LRUCache<
-    string,
-    WorkspaceGitAuxiliaryReadCacheEntry<CheckoutDiffResult>
-  >({ max: WORKSPACE_GIT_CHECKOUT_DIFF_CACHE_MAX });
+  private readonly checkoutDiffCache = new CheckoutDiffCache(() => this.deps.now().getTime());
   private watcherErrorCallbackCount = 0;
   constructor(options: WorkspaceGitServiceOptions) {
     this.logger = options.logger.child({ module: "workspace-git-service" });
@@ -726,7 +790,7 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     return this.workspaceTargets.get(cwd)?.latestSnapshot ?? null;
   }
 
-  getCheckoutDiff(
+  async getCheckoutDiff(
     cwd: string,
     options: CheckoutDiffCompare,
     readOptions?: WorkspaceGitReadOptions,
@@ -734,13 +798,20 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     this.assertNotDisposed();
     const normalizedCwd = resolve(cwd);
     const normalizedOptions = this.normalizeCheckoutDiffOptions(options);
-    const key = this.buildCheckoutDiffCacheKey(normalizedCwd, normalizedOptions);
-    return this.readAuxiliaryCache(this.checkoutDiffCache, key, readOptions, () =>
-      this.deps.getCheckoutDiff(normalizedCwd, normalizedOptions, {
-        paseoHome: this.paseoHome,
-        worktreesRoot: this.worktreesRoot,
-      }),
-    );
+    // Initial inventory events cover the watcher setup gap. Process them before
+    // starting a cold diff, rather than invalidating that build halfway through.
+    await this.workspaceTargets.get(normalizedCwd)?.observationSetupPromise;
+    this.assertNotDisposed();
+    return this.checkoutDiffCache.read({
+      cwd: normalizedCwd,
+      compare: normalizedOptions,
+      ...readOptions,
+      load: () =>
+        this.deps.getCheckoutDiff(normalizedCwd, normalizedOptions, {
+          paseoHome: this.paseoHome,
+          worktreesRoot: this.worktreesRoot,
+        }),
+    });
   }
 
   private normalizeCheckoutDiffOptions(options: CheckoutDiffCompare): CheckoutDiffCompare {
@@ -754,26 +825,8 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     };
   }
 
-  private buildCheckoutDiffCacheKey(cwd: string, options: CheckoutDiffCompare): string {
-    // Diff content varies by compare signature. Keep the cache per exact diff read shape so
-    // hot diff panes coalesce while base refs and rendering options never share stale patches.
-    return JSON.stringify([
-      "checkout-diff",
-      cwd,
-      options.mode,
-      options.mode === "base" ? (options.baseRef ?? null) : null,
-      options.ignoreWhitespace === true,
-      options.includeStructured === true,
-    ]);
-  }
-
   private invalidateCheckoutDiffCache(cwd: string, mode: CheckoutDiffCompare["mode"]): void {
-    for (const key of this.checkoutDiffCache.keys()) {
-      const [kind, cachedCwd, cachedMode] = JSON.parse(key) as unknown[];
-      if (kind === "checkout-diff" && cachedCwd === cwd && cachedMode === mode) {
-        this.checkoutDiffCache.delete(key);
-      }
-    }
+    this.checkoutDiffCache.invalidate(cwd, mode);
   }
 
   validateBranchRef(
@@ -866,6 +919,13 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       : (snapshot.git.repoRoot ?? resolve(cwd));
   }
 
+  invalidateWorktrees(): void {
+    this.assertNotDisposed();
+    // Checkout paths can cache the same list under different roots, including bare repos.
+    // Detach in-flight reads too, so a pre-mutation result cannot refill the cache.
+    this.worktreeListCache.clear();
+  }
+
   async resolveDefaultBranch(
     cwdOrRepoRoot: string,
     options?: WorkspaceGitReadOptions,
@@ -1289,20 +1349,28 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     watchPath: string,
     repoRoot: string | null,
   ): Promise<WorkingTreeWatchTarget> {
-    const ignoredDirectories = repoRoot ? await this.loadIgnoredDirs(watchPath) : new Set<string>();
+    const ignoredDirectories = repoRoot
+      ? (await this.loadIgnoredDirs(watchPath)).ignored
+      : new Set<string>();
     const target: WorkingTreeWatchTarget = {
       cwd,
       watchPath,
       repoRoot,
       subscription: null,
       ignoredDirectories,
+      appliedIgnoreList: [],
       ignoredDirectoriesRefreshPromise: null,
       ignoredDirectoriesRefreshRequested: false,
+      knownDirectories: new Set(),
+      pendingKnownDirectories: new Set(),
+      ignoreRefreshTimer: null,
+      ignoreRefreshDeadlineMs: null,
       aliases: new Set([cwd]),
       workspaceKeys: new Set(),
       fallbackPolling: false,
       fallbackPollTimer: null,
-      recovery: { attemptCount: 0, timer: null },
+      fallbackPollQuietTickCount: 0,
+      recovery: { attemptCount: 0, timer: null, establishedAt: null },
       listeners: new Set(),
       closed: false,
     };
@@ -1405,11 +1473,18 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     }
   }
 
+  // Shared by startWorkingTreeSubscription and
+  // replaceWorkingTreeIgnoredDirectories's applied-vs-desired gate so both
+  // compute the same resolved ignore list.
+  private workingTreeIgnoreList(target: WorkingTreeWatchTarget): string[] {
+    return [join(target.watchPath, ".git"), ...target.ignoredDirectories];
+  }
+
   private async startWorkingTreeSubscription(
     target: WorkingTreeWatchTarget,
     options?: { replaceFallback?: boolean },
   ): Promise<boolean> {
-    const ignore = [join(target.watchPath, ".git"), ...target.ignoredDirectories];
+    const ignore = this.workingTreeIgnoreList(target);
     let watcherErrored = false;
     let subscribeSettled = false;
     const markSubscribeSettled = () => {
@@ -1441,8 +1516,11 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
           if (watcherErrored) {
             return;
           }
+          const discovered = this.noteWorkingTreeDirectories(target, events);
           if (events.some((event) => basename(event.path) === ".gitignore")) {
             void this.refreshWorkingTreeIgnoredDirectories(target);
+          } else if (discovered) {
+            this.scheduleWorkingTreeIgnoreRefresh(target);
           }
           if (!this.hasRelevantWorkingTreeEvent(target, events)) {
             return;
@@ -1465,6 +1543,13 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
         return false;
       }
       target.subscription = subscription;
+      target.appliedIgnoreList = ignore;
+      // Do not reset `attemptCount` here — `subscribe()` resolving proves
+      // nothing about the watcher's health on a filesystem where it errors on
+      // first use. Record when this subscription was established instead;
+      // `scheduleWorkingTreeWatchRecovery` only resets the ladder once this
+      // one has survived long enough to prove itself durable.
+      target.recovery.establishedAt = this.deps.now().getTime();
       if (options?.replaceFallback && target.repoRoot !== null) {
         target.fallbackPolling = false;
         if (target.fallbackPollTimer) {
@@ -1491,6 +1576,25 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     }
   }
 
+  private degradedPollDelayMs(quietTickCount: number): number {
+    return Math.min(
+      DEGRADED_GIT_POLL_MAX_INTERVAL_MS,
+      DEGRADED_GIT_POLL_INTERVAL_MS * 2 ** quietTickCount,
+    );
+  }
+
+  // A refresh that throws is swallowed by refreshWorkspaceTarget and leaves the fingerprint
+  // alone, so it reads as a quiet tick and widens the gap. That is the intended outcome: a
+  // repository whose Git commands keep failing is the last one to retry every 5 seconds.
+  private async refreshDegradedPollTarget(
+    workspaceTarget: WorkspaceGitTarget,
+    request: WorkspaceGitRefreshRequest,
+  ): Promise<boolean> {
+    const fingerprintBefore = workspaceTarget.latestFingerprint;
+    await this.refreshWorkspaceTarget(workspaceTarget, request);
+    return workspaceTarget.latestFingerprint !== fingerprintBefore;
+  }
+
   private startWorkingTreeWatchFallback(
     target: WorkingTreeWatchTarget,
     reason: WorkingTreeWatchFallbackReason,
@@ -1499,19 +1603,20 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       return;
     }
     target.fallbackPolling = true;
+    target.fallbackPollQuietTickCount = 0;
     const { cwd } = target;
     const poll = async () => {
       target.fallbackPollTimer = null;
       if (target.closed || this.workingTreeWatchTargets.get(target.cwd) !== target) {
         return;
       }
-      await Promise.all(
+      const changes = await Promise.all(
         Array.from(target.workspaceKeys, async (workspaceKey) => {
           const workspaceTarget = this.workspaceTargets.get(workspaceKey);
           if (!workspaceTarget) {
-            return;
+            return false;
           }
-          await this.refreshWorkspaceTarget(workspaceTarget, {
+          const changed = await this.refreshDegradedPollTarget(workspaceTarget, {
             force: false,
             refreshStructure: target.repoRoot === null,
             refreshWorktree: true,
@@ -1525,11 +1630,18 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
             workspaceTarget.observationSetupComplete = false;
             this.scheduleWorkspaceObservationSetup(workspaceTarget);
           }
+          return changed;
         }),
       );
       this.notifyWorkingTreeConsumers(target);
       if (!target.closed && (target.subscription === null || target.repoRoot === null)) {
-        target.fallbackPollTimer = setTimeout(poll, DEGRADED_GIT_POLL_INTERVAL_MS);
+        target.fallbackPollQuietTickCount = changes.some(Boolean)
+          ? 0
+          : target.fallbackPollQuietTickCount + 1;
+        target.fallbackPollTimer = setTimeout(
+          poll,
+          this.degradedPollDelayMs(target.fallbackPollQuietTickCount),
+        );
       } else {
         target.fallbackPolling = false;
       }
@@ -1539,6 +1651,7 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       {
         cwd,
         intervalMs: DEGRADED_GIT_POLL_INTERVAL_MS,
+        maxIntervalMs: DEGRADED_GIT_POLL_MAX_INTERVAL_MS,
         reason,
       },
       "Working tree watcher unavailable; using bounded polling fallback",
@@ -1555,17 +1668,38 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     this.startWorkingTreeWatchFallback(target, reason);
   }
 
-  private scheduleWorkingTreeWatchRecovery(target: WorkingTreeWatchTarget): void {
+  /**
+   * Advances the recovery backoff ladder and returns the delay to wait
+   * before the next attempt. `attemptCount` only resets to 0 here, and only
+   * when the subscription being replaced was established long enough ago to
+   * have proven itself durable (>= `WATCH_RECOVERY_MAX_DELAY_MS`) — otherwise
+   * a filesystem that accepts `subscribe()` but errors immediately on every
+   * attempt (SMB/NFS, Docker virtiofs, some FUSE) would reset the ladder to 0
+   * on every cycle and the backoff would never engage. Shared by the
+   * working-tree and repo-metadata recovery paths so both apply the same
+   * rule.
+   */
+  private advanceWatchRecoveryLadder(recovery: WatchRecoveryState): number {
     if (
-      target.closed ||
-      target.subscription ||
-      target.recovery.timer ||
-      target.recovery.attemptCount >= WATCH_RECOVERY_MAX_ATTEMPTS
+      recovery.establishedAt !== null &&
+      this.deps.now().getTime() - recovery.establishedAt >= WATCH_RECOVERY_MAX_DELAY_MS
     ) {
+      recovery.attemptCount = 0;
+    }
+    recovery.establishedAt = null;
+    recovery.attemptCount += 1;
+    return Math.min(
+      WATCH_RECOVERY_BASE_DELAY_MS *
+        2 ** Math.min(recovery.attemptCount - 1, WATCH_RECOVERY_MAX_BACKOFF_STEPS),
+      WATCH_RECOVERY_MAX_DELAY_MS,
+    );
+  }
+
+  private scheduleWorkingTreeWatchRecovery(target: WorkingTreeWatchTarget): void {
+    if (target.closed || target.subscription || target.recovery.timer) {
       return;
     }
-    target.recovery.attemptCount += 1;
-    const delayMs = WATCH_RECOVERY_BASE_DELAY_MS * 2 ** (target.recovery.attemptCount - 1);
+    const delayMs = this.advanceWatchRecoveryLadder(target.recovery);
     target.recovery.timer = setTimeout(() => {
       target.recovery.timer = null;
       void this.recoverWorkingTreeWatch(target);
@@ -1607,6 +1741,214 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     await this.refreshWorkingTreeIgnoredDirectories(target);
   }
 
+  /**
+   * `git ls-files` reports ignored directories only once they exist, so the
+   * ignore set must be re-read when new directory topology appears — not only
+   * when the rules change. Keyed on `dirname` because FSEvents coalescing makes
+   * the directory's own creation event unreliable; a file inside it proves it
+   * exists either way.
+   */
+  private noteWorkingTreeDirectories(
+    target: WorkingTreeWatchTarget,
+    events: FileChange[],
+  ): boolean {
+    if (target.repoRoot === null) {
+      return false;
+    }
+    this.removeDeletedKnownDirectories(target, events);
+    const gitDir = join(target.watchPath, ".git");
+    // `matchesWatchPath` is realpath-aware because it compares an event-reported
+    // directory against `target.watchPath` itself — a config-time root that can
+    // legitimately differ from the watcher's reported form (e.g. a symlinked
+    // temp dir). It is now gated behind the plain Set lookup below, so it only
+    // runs for a directory this target has never seen before, not on every
+    // event.
+    const matchesWatchPath = createRealpathAwarePathMatcher(target.watchPath);
+    // One new directory is enough: the scheduled Git query inventories every
+    // ignored directory that exists by then. Stop before a large event batch
+    // multiplies containment checks across all its new directories.
+    for (const event of events) {
+      const directory = dirname(event.path);
+      // Cheap Set lookup first — the steady-state case where the directory is
+      // already known must never reach the realpath-aware matcher below.
+      if (target.knownDirectories.has(directory) || matchesWatchPath(directory)) {
+        continue;
+      }
+      // `directory` and `gitDir`/`ignoredDirectory` all derive from the same
+      // `target.watchPath` used to build this subscription, and `directory`
+      // itself is the same `dirname(event.path)` value already trusted as a
+      // plain string key by `target.knownDirectories.has()` above — no realpath
+      // resolution needed for containment among values from this one source.
+      if (!isPathInsideRoot(target.watchPath, directory)) {
+        continue;
+      }
+      if (isPathInsideRoot(gitDir, directory)) {
+        continue;
+      }
+      let ignored = false;
+      for (const ignoredDirectory of target.ignoredDirectories) {
+        if (isPathInsideRoot(ignoredDirectory, directory)) {
+          ignored = true;
+          break;
+        }
+      }
+      if (ignored) {
+        continue;
+      }
+      target.knownDirectories.add(directory);
+      target.pendingKnownDirectories.add(directory);
+      this.enforceKnownDirectoriesCap(target);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * `knownDirectories` only ever grows in the loop above — nothing
+   * previously dropped an entry once its directory was deleted from disk,
+   * so a long-lived daemon over a tree that creates and deletes directories
+   * (build output, temp dirs, a churning dependency tree) would accumulate
+   * tombstones for the life of the target and slow every future
+   * `pruneKnownDirectories` pass along with it. `FileChange` events arrive
+   * for files too, and a delete of `dir/file.txt` does not mean `dir` is
+   * gone, so this only acts once the deleted path is itself confirmed a
+   * known directory — a cheap `Set.has()` first, so the common case (a file
+   * delete) costs one lookup and returns, same as the fast path this method
+   * feeds into. A directory delete does not guarantee a delete event for
+   * everything beneath it (coalescing, an `rm -rf` of a populated tree), so
+   * once a deleted path is confirmed known, this drops the whole known
+   * subtree the same way `pruneKnownDirectories` drops a newly ignored one —
+   * the deleted path is the containment root here instead of an ignored
+   * root.
+   */
+  private removeDeletedKnownDirectories(
+    target: WorkingTreeWatchTarget,
+    events: FileChange[],
+  ): void {
+    if (target.knownDirectories.size === 0) {
+      return;
+    }
+    for (const event of events) {
+      if (event.type !== "delete" || !target.knownDirectories.has(event.path)) {
+        continue;
+      }
+      for (const directory of target.knownDirectories) {
+        if (!isPathInsideRoot(event.path, directory)) {
+          continue;
+        }
+        target.knownDirectories.delete(directory);
+        // Not required for correctness — both refresh outcomes tolerate a
+        // stale entry that no longer resolves to anything live: a
+        // successful refresh clears `pendingKnownDirectories` outright, and
+        // a failed one's `rearmPendingKnownDirectories` no-ops a delete of
+        // an already-absent key. Dropping it here keeps
+        // `pendingKnownDirectories` a subset of `knownDirectories` at all
+        // times instead of "true except right after a deletion."
+        target.pendingKnownDirectories.delete(directory);
+      }
+    }
+  }
+
+  /**
+   * See `WORKING_TREE_KNOWN_DIRECTORIES_MAX` for why clearing on overflow is
+   * always safe. Runs only when this batch discovered at least one new
+   * directory, since that is the only way `knownDirectories` grows.
+   */
+  private enforceKnownDirectoriesCap(target: WorkingTreeWatchTarget): void {
+    if (target.knownDirectories.size <= WORKING_TREE_KNOWN_DIRECTORIES_MAX) {
+      return;
+    }
+    target.knownDirectories.clear();
+    target.pendingKnownDirectories.clear();
+  }
+
+  private scheduleWorkingTreeIgnoreRefresh(target: WorkingTreeWatchTarget): void {
+    if (this.disposed || target.closed || target.repoRoot === null) {
+      return;
+    }
+    const now = this.deps.now().getTime();
+    target.ignoreRefreshDeadlineMs ??= now + WORKING_TREE_IGNORE_REFRESH_MAX_DELAY_MS;
+    if (target.ignoreRefreshTimer) {
+      clearTimeout(target.ignoreRefreshTimer);
+    }
+    const delayMs = Math.max(
+      0,
+      Math.min(WORKING_TREE_IGNORE_REFRESH_QUIET_MS, target.ignoreRefreshDeadlineMs - now),
+    );
+    target.ignoreRefreshTimer = setTimeout(() => {
+      target.ignoreRefreshTimer = null;
+      target.ignoreRefreshDeadlineMs = null;
+      void this.refreshWorkingTreeIgnoredDirectories(target);
+    }, delayMs);
+  }
+
+  /**
+   * String-prefix containment, not `isRealpathInsideRoot`: every entry on
+   * both sides is a plain path built from `target.watchPath` by this same
+   * class (`dirname(event.path)` for `knownDirectories`, `resolve(watchPath,
+   * ...)` for `ignoredDirectories` in `loadIgnoredDirs`) — no realpath
+   * divergence to reconcile, per the same reasoning as
+   * `noteWorkingTreeDirectories`. Normalizing each ignored root once up front
+   * instead of recomputing per pair turns a 30k-known x 40-ignored scan from
+   * ~26s of synchronous realpath syscalls into a bounded number of cheap
+   * string comparisons.
+   *
+   * Case-folding still needs to happen for a Windows-looking root, same as
+   * `isPathInsideRoot`/`isRealpathInsideRoot` in `../utils/path.js` — a
+   * case-insensitive filesystem can report a known directory whose case
+   * diverges from the git-reported ignored root. Since both sides derive
+   * from the single `target.watchPath` for this target, whether to fold is
+   * one decision for the whole call (`looksLikeDefiniteWindowsPath`
+   * reused from `../utils/path.js`, not reimplemented here), not a per-pair
+   * one — so it costs nothing beyond the already-precomputed prefixes.
+   */
+  private pruneKnownDirectories(target: WorkingTreeWatchTarget): void {
+    if (target.ignoredDirectories.size === 0) {
+      return;
+    }
+    const foldCase = looksLikeDefiniteWindowsPath(target.watchPath);
+    const comparable = (path: string) =>
+      foldCase ? path.replaceAll("\\", "/").toLowerCase() : path;
+    const ignoredPrefixes: string[] = [];
+    const foldedIgnoredExact = foldCase ? new Set<string>() : null;
+    for (const ignoredDirectory of target.ignoredDirectories) {
+      const ignored = comparable(ignoredDirectory);
+      ignoredPrefixes.push(`${ignored}/`);
+      foldedIgnoredExact?.add(ignored);
+    }
+    for (const directory of target.knownDirectories) {
+      const comparableDirectory = comparable(directory);
+      const comparableDirectoryWithSep = `${comparableDirectory}/`;
+      const isIgnored =
+        (foldedIgnoredExact ?? target.ignoredDirectories).has(comparableDirectory) ||
+        ignoredPrefixes.some((prefix) => comparableDirectoryWithSep.startsWith(prefix));
+      if (isIgnored) {
+        target.knownDirectories.delete(directory);
+      }
+    }
+  }
+
+  /**
+   * Undoes the "mark known" side effect of `noteWorkingTreeDirectories` for
+   * every directory discovered since the last refresh that actually
+   * completed, because this refresh did not — it fell back to the previous
+   * ignore set (see `loadIgnoredDirs`). Leaving them in `knownDirectories`
+   * would make the steady-state Set-lookup fast path in
+   * `noteWorkingTreeDirectories` skip them forever, even though this refresh
+   * never determined whether they are ignored. Removing them here re-arms
+   * discovery: the next event under any of them is treated as unseen again,
+   * so `noteWorkingTreeDirectories` schedules another refresh attempt.
+   */
+  private rearmPendingKnownDirectories(target: WorkingTreeWatchTarget): void {
+    if (target.pendingKnownDirectories.size === 0) {
+      return;
+    }
+    for (const directory of target.pendingKnownDirectories) {
+      target.knownDirectories.delete(directory);
+    }
+    target.pendingKnownDirectories.clear();
+  }
+
   private hasRelevantWorkingTreeEvent(
     target: WorkingTreeWatchTarget,
     events: FileChange[],
@@ -1664,31 +2006,57 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
   private async replaceWorkingTreeIgnoredDirectories(
     target: WorkingTreeWatchTarget,
   ): Promise<void> {
-    const ignoredDirectories = await this.loadIgnoredDirs(target.watchPath);
-    if (target.closed || this.haveSamePaths(target.ignoredDirectories, ignoredDirectories)) {
+    const { ignored: ignoredDirectories, failed } = await this.loadIgnoredDirs(
+      target.watchPath,
+      target.ignoredDirectories,
+    );
+    if (target.closed) {
       return;
     }
-
-    target.ignoredDirectories = ignoredDirectories;
+    if (failed) {
+      // A failed `git ls-files` must not leave directories discovered since
+      // the last completed refresh permanently marked known — see the
+      // `pendingKnownDirectories` field comment. Re-arm them so the next
+      // event under any of them is treated as unseen again and schedules
+      // another refresh attempt.
+      this.rearmPendingKnownDirectories(target);
+    } else {
+      target.pendingKnownDirectories.clear();
+    }
+    if (!this.haveSamePaths(target.ignoredDirectories, ignoredDirectories)) {
+      target.ignoredDirectories = ignoredDirectories;
+      this.pruneKnownDirectories(target);
+    }
     if (target.fallbackPolling) {
       return;
     }
     const subscription = target.subscription;
-    if (subscription) {
-      try {
-        await subscription.updateIgnore([join(target.watchPath, ".git"), ...ignoredDirectories]);
-      } catch (error) {
-        target.subscription = null;
-        if (!target.closed && !target.fallbackPolling) {
-          this.startWorkingTreeWatchFallback(target, "watcher_update_failed");
-          this.scheduleWorkingTreeWatchRecovery(target);
-        }
-        this.logger.warn(
-          { err: error, cwd: target.cwd },
-          "Failed to update working tree watcher ignore paths",
-        );
-        return;
+    if (!subscription) {
+      return;
+    }
+    // Compare against the resolved list the live subscription actually
+    // accepted (`appliedIgnoreList`), not what git last reported
+    // (`ignoredDirectories` alone) — the comparison and the value passed to
+    // `updateIgnore` have to be the same array, or a skipped update would
+    // otherwise latch forever.
+    const next = this.workingTreeIgnoreList(target);
+    if (this.haveSamePaths(new Set(target.appliedIgnoreList), new Set(next))) {
+      return;
+    }
+    try {
+      await subscription.updateIgnore(next);
+      target.appliedIgnoreList = next;
+    } catch (error) {
+      target.subscription = null;
+      if (!target.closed && !target.fallbackPolling) {
+        this.startWorkingTreeWatchFallback(target, "watcher_update_failed");
+        this.scheduleWorkingTreeWatchRecovery(target);
       }
+      this.logger.warn(
+        { err: error, cwd: target.cwd },
+        "Failed to update working tree watcher ignore paths",
+      );
+      return;
     }
     if (target.closed || target.fallbackPolling) {
       return;
@@ -1785,7 +2153,8 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       subscription: null,
       fallbackPolling: false,
       fallbackPollTimer: null,
-      recovery: { attemptCount: 0, timer: null },
+      fallbackPollQuietTickCount: 0,
+      recovery: { attemptCount: 0, timer: null, establishedAt: null },
       intervalId: null,
       fetchInFlight: false,
       bufferedFetchMetadataEvents: [],
@@ -1916,6 +2285,10 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
         return false;
       }
       target.subscription = subscription;
+      // See `advanceWatchRecoveryLadder`: do not reset `attemptCount` on
+      // subscribe success alone, only record when this subscription was
+      // established.
+      target.recovery.establishedAt = this.deps.now().getTime();
       if (options?.replaceFallback) {
         target.fallbackPolling = false;
         if (target.fallbackPollTimer) {
@@ -1956,16 +2329,10 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
   }
 
   private scheduleRepoMetadataWatchRecovery(target: RepoGitTarget): void {
-    if (
-      target.closed ||
-      target.subscription ||
-      target.recovery.timer ||
-      target.recovery.attemptCount >= WATCH_RECOVERY_MAX_ATTEMPTS
-    ) {
+    if (target.closed || target.subscription || target.recovery.timer) {
       return;
     }
-    target.recovery.attemptCount += 1;
-    const delayMs = WATCH_RECOVERY_BASE_DELAY_MS * 2 ** (target.recovery.attemptCount - 1);
+    const delayMs = this.advanceWatchRecoveryLadder(target.recovery);
     target.recovery.timer = setTimeout(() => {
       target.recovery.timer = null;
       void this.recoverRepoMetadataWatch(target);
@@ -2287,17 +2654,18 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       return;
     }
     target.fallbackPolling = true;
+    target.fallbackPollQuietTickCount = 0;
     const poll = async () => {
       target.fallbackPollTimer = null;
       if (target.closed || this.repoTargets.get(target.repoGitRoot) !== target) {
         return;
       }
       const workingTreeTargets = new Set<WorkingTreeWatchTarget>();
-      await Promise.all(
+      const changes = await Promise.all(
         Array.from(target.workspaceKeys, async (workspaceKey) => {
           const workspaceTarget = this.workspaceTargets.get(workspaceKey);
           if (!workspaceTarget) {
-            return;
+            return false;
           }
           this.invalidateCheckoutDiffCache(workspaceTarget.cwd, "base");
           if (workspaceTarget.latestFacts?.isGit) {
@@ -2307,7 +2675,7 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
           if (workingTreeTarget) {
             workingTreeTargets.add(workingTreeTarget);
           }
-          await this.refreshWorkspaceTarget(workspaceTarget, {
+          return await this.refreshDegradedPollTarget(workspaceTarget, {
             force: false,
             refreshStructure: true,
             refreshWorktree: true,
@@ -2324,7 +2692,13 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
         this.notifyWorkingTreeConsumers(workingTreeTarget);
       }
       if (!target.closed && target.subscription === null) {
-        target.fallbackPollTimer = setTimeout(poll, DEGRADED_GIT_POLL_INTERVAL_MS);
+        target.fallbackPollQuietTickCount = changes.some(Boolean)
+          ? 0
+          : target.fallbackPollQuietTickCount + 1;
+        target.fallbackPollTimer = setTimeout(
+          poll,
+          this.degradedPollDelayMs(target.fallbackPollQuietTickCount),
+        );
       } else {
         target.fallbackPolling = false;
       }
@@ -2585,7 +2959,28 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
     target.forgePrStatusPollKey = null;
   }
 
-  private async loadIgnoredDirs(rootPath: string): Promise<Set<string>> {
+  /**
+   * `previous` is what the caller should get back on failure. `runGitCommand`
+   * rejects on any non-zero exit or timeout, and a timeout is plausible under
+   * exactly the churn storm this ignore-refresh path targets. Returning an
+   * empty set on failure would read to the caller as "nothing is ignored" —
+   * indistinguishable from a real, freshly-computed empty result — and
+   * `replaceWorkingTreeIgnoredDirectories` treats its return value as
+   * authoritative, replacing `target.ignoredDirectories` and re-ingesting
+   * every directory that was previously ignored. Returning the previous set
+   * instead means a failed refresh leaves the watcher's ignore state
+   * unchanged rather than un-ignoring the entire dependency tree.
+   *
+   * `failed` lets the caller distinguish "ran fresh and happened to match
+   * `previous`" from "the git command itself failed" — the two are
+   * indistinguishable by comparing sets alone, but `replaceWorkingTreeIgnoredDirectories`
+   * needs to know which one happened to decide whether directories newly
+   * marked known since the last refresh can be trusted or must be re-armed.
+   */
+  private async loadIgnoredDirs(
+    rootPath: string,
+    previous: Set<string> = new Set(),
+  ): Promise<{ ignored: Set<string>; failed: boolean }> {
     const ignored = new Set<string>();
     try {
       const result = await this.deps.runGitCommand(
@@ -2603,13 +2998,14 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
         ignored.add(resolve(rootPath, rel));
       }
     } catch (error) {
-      this.logger.debug(
+      this.logger.warn(
         { err: error, rootPath },
-        "Failed to load gitignore directories; falling back to name-based skip only",
+        "Failed to load gitignore directories; keeping previous ignore set",
       );
+      return { ignored: previous, failed: true };
     }
 
-    return ignored;
+    return { ignored, failed: false };
   }
 
   private async refreshWorkspaceTarget(
@@ -3347,6 +3743,11 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       clearTimeout(target.recovery.timer);
       target.recovery.timer = null;
     }
+    if (target.ignoreRefreshTimer) {
+      clearTimeout(target.ignoreRefreshTimer);
+      target.ignoreRefreshTimer = null;
+    }
+    target.ignoreRefreshDeadlineMs = null;
 
     if (target.subscription) {
       const subscription = target.subscription;
diff --git a/packages/server/src/server/workspace-labels/internal/service.ts b/packages/server/src/server/workspace-labels/internal/service.ts
index f560959833..aad0ea2047 100644
--- a/packages/server/src/server/workspace-labels/internal/service.ts
+++ b/packages/server/src/server/workspace-labels/internal/service.ts
@@ -55,6 +55,12 @@ export class WorkspaceLabelService {
     await this.catalog.initialize();
   }
 
+  async list(
+    cursor?: WorkspaceLabelCursor,
+  ): Promise<ReturnType<WorkspaceLabelSequence["synchronize"]>> {
+    return this.exclusive(async () => this.sequence.synchronize(await this.catalog.list(), cursor));
+  }
+
   async subscribe(input: {
     cursor?: WorkspaceLabelCursor;
     onChange: (change: WorkspaceLabelChange & { generation: string; seq: number }) => void;
diff --git a/packages/server/src/server/workspace-reconciliation-observation.test.ts b/packages/server/src/server/workspace-reconciliation-observation.test.ts
index a5fa20c97f..8977641bab 100644
--- a/packages/server/src/server/workspace-reconciliation-observation.test.ts
+++ b/packages/server/src/server/workspace-reconciliation-observation.test.ts
@@ -6,6 +6,7 @@ import { afterEach, describe, expect, test } from "vitest";
 
 import { createTestLogger } from "../test-utils/test-logger.js";
 import { areEquivalentPaths } from "../utils/path.js";
+import { deriveProjectKey } from "./project-key.js";
 import {
   createPersistedProjectRecord,
   createPersistedWorkspaceRecord,
@@ -336,6 +337,14 @@ class ObservedPlacements {
         projectId: spec.id,
         rootPath,
         kind: "non_git",
+        // Seeded records already carry the key reconciliation derives, so a fixture's
+        // first pass reports only what its test is about.
+        projectKey: deriveProjectKey({
+          rootPath,
+          remoteUrl: null,
+          worktreeRoot: null,
+          mainRepoRoot: null,
+        }),
         displayName: spec.id,
         createdAt: TIMESTAMP,
         updatedAt: TIMESTAMP,
@@ -473,7 +482,11 @@ describe("observed workspace placement", () => {
 
   test("archives missing workspace directories on the periodic pass", async () => {
     const observed = new ObservedPlacements([
-      { id: "project-one", root: "repo", workspaces: [{ id: "workspace-one", cwd: "repo" }] },
+      {
+        id: "project-one",
+        root: "repo",
+        workspaces: [{ id: "workspace-one", cwd: "repo/worktree-one" }],
+      },
     ]);
     await observed.start();
     await observed.deleteWorkspaceDirectory("workspace-one");
@@ -487,7 +500,11 @@ describe("observed workspace placement", () => {
 
   test("preserves a periodic full pass queued behind metadata reconciliation", async () => {
     const observed = new ObservedPlacements([
-      { id: "project-one", root: "repo", workspaces: [{ id: "workspace-one", cwd: "repo" }] },
+      {
+        id: "project-one",
+        root: "repo",
+        workspaces: [{ id: "workspace-one", cwd: "repo/worktree-one" }],
+      },
     ]);
     await observed.start();
     const metadataRead = observed.holdNextReconciliation();
diff --git a/packages/server/src/server/workspace-reconciliation-service.test.ts b/packages/server/src/server/workspace-reconciliation-service.test.ts
index 1a885378db..52c7d41065 100644
--- a/packages/server/src/server/workspace-reconciliation-service.test.ts
+++ b/packages/server/src/server/workspace-reconciliation-service.test.ts
@@ -598,6 +598,11 @@ describe("WorkspaceReconciliationService", () => {
   });
 
   test("archives workspaces whose directories no longer exist", async () => {
+    const projectRoot = realpathSync(
+      mkdtempSync(path.join(tmpdir(), "reconcile-missing-workspace-")),
+    );
+    const missingWorkspace = path.join(projectRoot, "missing-workspace");
+    tempDirs.push(projectRoot);
     const { projects, workspaces, projectRegistry, workspaceRegistry } = createTestRegistries();
     const archivedWorkspaceIds: string[] = [];
 
@@ -605,7 +610,8 @@ describe("WorkspaceReconciliationService", () => {
       "p1",
       createPersistedProjectRecord({
         projectId: "p1",
-        rootPath: "/tmp/does-not-exist-reconcile-test",
+        rootPath: projectRoot,
+        projectKey: canonicalLocalProjectKey(projectRoot),
         kind: "non_git",
         displayName: "ghost",
         createdAt: timestamp,
@@ -617,7 +623,7 @@ describe("WorkspaceReconciliationService", () => {
       createPersistedWorkspaceRecord({
         workspaceId: "w1",
         projectId: "p1",
-        cwd: "/tmp/does-not-exist-reconcile-test",
+        cwd: missingWorkspace,
         kind: "directory",
         displayName: "ghost",
         createdAt: timestamp,
@@ -640,7 +646,7 @@ describe("WorkspaceReconciliationService", () => {
       {
         kind: "workspace_archived",
         workspaceId: "w1",
-        directory: "/tmp/does-not-exist-reconcile-test",
+        directory: missingWorkspace,
         reason: "directory_missing",
       },
     ]);
@@ -648,12 +654,59 @@ describe("WorkspaceReconciliationService", () => {
     expect(workspaces.get("w1")?.archivedAt).toEqual(expect.any(String));
   });
 
+  test("keeps workspaces whose project root is missing with them", async () => {
+    const mountParent = realpathSync(mkdtempSync(path.join(tmpdir(), "reconcile-unmounted-")));
+    tempDirs.push(mountParent);
+    // The external volume is not mounted, so nothing under it resolves.
+    const projectRoot = path.join(mountParent, "ExternalSSD", "repo");
+    const { projects, workspaces, projectRegistry, workspaceRegistry } = createTestRegistries();
+
+    projects.set(
+      "p1",
+      createPersistedProjectRecord({
+        projectId: "p1",
+        rootPath: projectRoot,
+        kind: "non_git",
+        displayName: "repo",
+        createdAt: timestamp,
+        updatedAt: timestamp,
+      }),
+    );
+    workspaces.set(
+      "w1",
+      createPersistedWorkspaceRecord({
+        workspaceId: "w1",
+        projectId: "p1",
+        cwd: projectRoot,
+        kind: "directory",
+        displayName: "repo",
+        createdAt: timestamp,
+        updatedAt: timestamp,
+      }),
+    );
+
+    const service = new WorkspaceReconciliationService({
+      projectRegistry,
+      workspaceRegistry,
+      logger: createTestLogger(),
+    });
+
+    const result = await service.runOnce();
+
+    expect(result.changesApplied).toEqual([]);
+    expect(workspaces.get("w1")?.archivedAt).toBeNull();
+  });
+
   test("keeps a project active after all its workspaces are archived", async () => {
+    const projectRoot = realpathSync(mkdtempSync(path.join(tmpdir(), "reconcile-orphan-project-")));
+    const missingWorkspace = path.join(projectRoot, "missing-workspace");
+    tempDirs.push(projectRoot);
     const { projects, workspaces, projectRegistry, workspaceRegistry } = createTestRegistries();
 
     const project = createPersistedProjectRecord({
       projectId: "p1",
-      rootPath: "/tmp/does-not-exist-reconcile-orphan",
+      rootPath: projectRoot,
+      projectKey: canonicalLocalProjectKey(projectRoot),
       kind: "non_git",
       displayName: "orphan",
       createdAt: timestamp,
@@ -665,7 +718,7 @@ describe("WorkspaceReconciliationService", () => {
       createPersistedWorkspaceRecord({
         workspaceId: "w1",
         projectId: "p1",
-        cwd: "/tmp/does-not-exist-reconcile-orphan",
+        cwd: missingWorkspace,
         kind: "directory",
         displayName: "orphan",
         createdAt: timestamp,
@@ -685,16 +738,17 @@ describe("WorkspaceReconciliationService", () => {
       {
         kind: "workspace_archived",
         workspaceId: "w1",
-        directory: "/tmp/does-not-exist-reconcile-orphan",
+        directory: missingWorkspace,
         reason: "directory_missing",
       },
     ]);
     expect(workspaces.get("w1")).toEqual({
       workspaceId: "w1",
       projectId: "p1",
-      cwd: "/tmp/does-not-exist-reconcile-orphan",
+      cwd: missingWorkspace,
       kind: "directory",
       displayName: "orphan",
+      background: false,
       title: null,
       pinnedAt: null,
       branch: null,
@@ -1382,13 +1436,17 @@ describe("WorkspaceReconciliationService", () => {
   });
 
   test("calls onChanges callback when changes are applied", async () => {
+    const projectRoot = realpathSync(mkdtempSync(path.join(tmpdir(), "reconcile-callback-")));
+    const missingWorkspace = path.join(projectRoot, "missing-workspace");
+    tempDirs.push(projectRoot);
     const { projects, workspaces, projectRegistry, workspaceRegistry } = createTestRegistries();
 
     projects.set(
       "p1",
       createPersistedProjectRecord({
         projectId: "p1",
-        rootPath: "/tmp/does-not-exist-callback-test",
+        rootPath: projectRoot,
+        projectKey: canonicalLocalProjectKey(projectRoot),
         kind: "non_git",
         displayName: "ghost",
         createdAt: timestamp,
@@ -1400,7 +1458,7 @@ describe("WorkspaceReconciliationService", () => {
       createPersistedWorkspaceRecord({
         workspaceId: "w1",
         projectId: "p1",
-        cwd: "/tmp/does-not-exist-callback-test",
+        cwd: missingWorkspace,
         kind: "directory",
         displayName: "ghost",
         createdAt: timestamp,
@@ -1422,13 +1480,16 @@ describe("WorkspaceReconciliationService", () => {
       {
         kind: "workspace_archived",
         workspaceId: "w1",
-        directory: "/tmp/does-not-exist-callback-test",
+        directory: missingWorkspace,
         reason: "directory_missing",
       },
     ]);
   });
 
   test("logs reconciliation changes with affected paths and reasons", async () => {
+    const projectRoot = realpathSync(mkdtempSync(path.join(tmpdir(), "reconcile-log-")));
+    const missingWorkspace = path.join(projectRoot, "missing-workspace");
+    tempDirs.push(projectRoot);
     const { projects, workspaces, projectRegistry, workspaceRegistry } = createTestRegistries();
     const { logger, infoRecords } = createCapturingLogger();
 
@@ -1436,7 +1497,8 @@ describe("WorkspaceReconciliationService", () => {
       "p1",
       createPersistedProjectRecord({
         projectId: "p1",
-        rootPath: "/tmp/does-not-exist-log-test",
+        rootPath: projectRoot,
+        projectKey: canonicalLocalProjectKey(projectRoot),
         kind: "non_git",
         displayName: "ghost",
         createdAt: timestamp,
@@ -1448,7 +1510,7 @@ describe("WorkspaceReconciliationService", () => {
       createPersistedWorkspaceRecord({
         workspaceId: "w1",
         projectId: "p1",
-        cwd: "/tmp/does-not-exist-log-test",
+        cwd: missingWorkspace,
         kind: "directory",
         displayName: "ghost",
         createdAt: timestamp,
@@ -1473,7 +1535,7 @@ describe("WorkspaceReconciliationService", () => {
             {
               kind: "workspace_archived",
               workspaceId: "w1",
-              directory: "/tmp/does-not-exist-log-test",
+              directory: missingWorkspace,
               reason: "directory_missing",
             },
           ]),
diff --git a/packages/server/src/server/workspace-reconciliation-service.ts b/packages/server/src/server/workspace-reconciliation-service.ts
index 59d2f9c124..eb79dbacd2 100644
--- a/packages/server/src/server/workspace-reconciliation-service.ts
+++ b/packages/server/src/server/workspace-reconciliation-service.ts
@@ -227,6 +227,14 @@ export class WorkspaceReconciliationService {
       workspace,
       state: this.inspectDirectory(workspace.cwd),
     }));
+    // Project roots are read after the workspace directories, so a volume that
+    // goes away mid-pass leaves its project unreachable rather than its workspaces
+    // alone. The skew can only withhold an archive, never produce one.
+    const reachableProjectIds = new Set(
+      activeProjects
+        .filter((project) => this.inspectDirectory(project.rootPath) === "directory")
+        .map((project) => project.projectId),
+    );
 
     const workspacesByProject = new Map<string, PersistedWorkspaceRecord[]>();
     for (const { workspace, state } of workspaceDirectoryStates) {
@@ -236,9 +244,16 @@ export class WorkspaceReconciliationService {
       workspacesByProject.set(workspace.projectId, list);
     }
 
-    // 1. Archive workspaces whose directories no longer exist
+    // 1. Archive workspaces whose directories no longer exist, but only when the
+    //    project they belong to is still reachable. A missing project root means the
+    //    whole location is unavailable - an unmounted volume, an offline share, a disk
+    //    that has not appeared yet - and absence there proves nothing about the
+    //    workspace. Projects already persist through that; their workspaces do too.
     const missingWorkspaces = workspaceDirectoryStates
-      .filter(({ state }) => state === "missing")
+      .filter(
+        ({ workspace, state }) =>
+          state === "missing" && reachableProjectIds.has(workspace.projectId),
+      )
       .map(({ workspace }) => workspace);
     await Promise.all(
       missingWorkspaces.map(async (workspace) => {
@@ -265,7 +280,7 @@ export class WorkspaceReconciliationService {
     //    Projects persist until explicitly removed, even when they currently have
     //    zero active workspaces, so they still reconcile their own metadata.
     await this.reconcileGitMetadataForProjects(
-      activeProjects.filter((project) => this.inspectDirectory(project.rootPath) === "directory"),
+      activeProjects.filter((project) => reachableProjectIds.has(project.projectId)),
       workspacesByProject,
       changes,
     );
diff --git a/packages/server/src/server/workspace-registry-model.test.ts b/packages/server/src/server/workspace-registry-model.test.ts
index 1f51a0c4a1..a4ad29568c 100644
--- a/packages/server/src/server/workspace-registry-model.test.ts
+++ b/packages/server/src/server/workspace-registry-model.test.ts
@@ -87,6 +87,31 @@ describe("workspace placement", () => {
     });
   });
 
+  test("keeps the recorded placement when nothing was read at the workspace directory", () => {
+    const workspace = createPersistedWorkspaceRecord({
+      workspaceId: "workspace-one",
+      projectId: "project-one",
+      cwd: "/repo-feature",
+      kind: "worktree",
+      displayName: "feature/placement",
+      branch: "feature/placement",
+      worktreeRoot: "/repo-feature",
+      baseBranch: "main",
+      isPaseoOwnedWorktree: true,
+      mainRepoRoot: "/repo",
+      createdAt: "2026-03-01T00:00:00.000Z",
+      updatedAt: "2026-03-01T00:00:00.000Z",
+    });
+
+    const update = reconcileWorkspacePlacement({
+      workspace,
+      checkout: null,
+      updatedAt: "2026-03-02T00:00:00.000Z",
+    });
+
+    expect(update).toBeNull();
+  });
+
   test("updates live placement while preserving its durable name and base branch", () => {
     const workspace = createPersistedWorkspaceRecord({
       workspaceId: "workspace-one",
diff --git a/packages/server/src/server/workspace-registry-model.ts b/packages/server/src/server/workspace-registry-model.ts
index acc4d49538..181ec96eae 100644
--- a/packages/server/src/server/workspace-registry-model.ts
+++ b/packages/server/src/server/workspace-registry-model.ts
@@ -109,12 +109,17 @@ export function initialWorkspacePlacement(
 /**
  * Applies live placement facts without rewriting the workspace's durable name
  * or its creation-time base branch.
+ *
+ * A null checkout is an absence, not an observation: nothing was read at the
+ * workspace directory, so the recorded placement stands. Only a directory that
+ * is there can show that a worktree stopped being one.
  */
 export function reconcileWorkspacePlacement(input: {
   workspace: PersistedWorkspaceRecord;
-  checkout: ProjectCheckoutLitePayload;
+  checkout: ProjectCheckoutLitePayload | null;
   updatedAt: string;
 }): WorkspacePlacementUpdate | null {
+  if (!input.checkout) return null;
   const observed = initialWorkspacePlacement({
     source: "checkout",
     cwd: input.workspace.cwd,
diff --git a/packages/server/src/server/workspace-registry.test.ts b/packages/server/src/server/workspace-registry.test.ts
index 80c328ce7b..04ffc1d7ac 100644
--- a/packages/server/src/server/workspace-registry.test.ts
+++ b/packages/server/src/server/workspace-registry.test.ts
@@ -28,6 +28,21 @@ describe("resolveWorkspaceName", () => {
     );
   });
 
+  test("createPersistedWorkspaceRecord defaults background to false and preserves explicit intent", () => {
+    const base = {
+      workspaceId: "ws-1",
+      projectId: "proj-1",
+      cwd: "/tmp/repo",
+      kind: "local_checkout" as const,
+      displayName: "main",
+      createdAt: "2026-03-01T00:00:00.000Z",
+      updatedAt: "2026-03-01T00:00:00.000Z",
+    };
+    expect(createPersistedWorkspaceRecord(base).background).toBe(false);
+    expect(createPersistedWorkspaceRecord({ ...base, background: false }).background).toBe(false);
+    expect(createPersistedWorkspaceRecord({ ...base, background: true }).background).toBe(true);
+  });
+
   test("resolveWorkspaceDisplayName applies the same rule over the persisted record", () => {
     const record = createPersistedWorkspaceRecord({
       workspaceId: "ws-1",
diff --git a/packages/server/src/server/workspace-registry.ts b/packages/server/src/server/workspace-registry.ts
index b4b8d5cdd5..417af353fe 100644
--- a/packages/server/src/server/workspace-registry.ts
+++ b/packages/server/src/server/workspace-registry.ts
@@ -75,9 +75,9 @@ const PersistedWorkspaceRecordSchema = z.object({
   // archive and recovery do not need the directory to still exist in order to
   // recover placement.
   worktreeRoot: z.string().nullable().default(null),
-  // The base branch the worktree was created from (normalized like worktree.json's
-  // baseRefName). Only worktree workspaces carry a base branch; checkout-branch
-  // worktrees and directory/local_checkout workspaces leave it null.
+  // Comparison base preserved across worktree deletion and restore. New branch-off
+  // workspaces store the resolved ref (e.g. refs/remotes/upstream/main); legacy and
+  // PR checkout records may contain a bare branch name. Ordinary checkouts use null.
   baseBranch: z
     .string()
     .nullable()
@@ -102,6 +102,8 @@ const PersistedWorkspaceRecordSchema = z.object({
     .transform((value) => value ?? null),
   labels: z.array(z.string()).optional(),
   untrustedSource: UntrustedWorkspaceSourceSchema.optional(),
+  // Public discovery visibility. Contents retain their ordinary lifecycle.
+  background: z.boolean().optional().default(false),
 });
 
 export type PersistedProjectRecord = z.infer<typeof PersistedProjectRecordSchema>;
@@ -684,9 +686,12 @@ export function createPersistedWorkspaceRecord(input: {
   pinnedAt?: string | null;
   labels?: string[];
   untrustedSource?: UntrustedWorkspaceSource;
+  background?: boolean;
 }): PersistedWorkspaceRecord {
+  const { background, ...rest } = input;
   return PersistedWorkspaceRecordSchema.parse({
-    ...input,
+    ...rest,
+    background: background ?? false,
     title: input.title ?? null,
     branch: input.branch ?? null,
     worktreeRoot: input.worktreeRoot ?? null,
diff --git a/packages/server/src/server/workspace-same-cwd-isolation.e2e.test.ts b/packages/server/src/server/workspace-same-cwd-isolation.e2e.test.ts
index 58bf79c66b..139f8a3795 100644
--- a/packages/server/src/server/workspace-same-cwd-isolation.e2e.test.ts
+++ b/packages/server/src/server/workspace-same-cwd-isolation.e2e.test.ts
@@ -374,6 +374,7 @@ test("local workspace auto-title does not broadcast provider snapshot warm-up to
 
   try {
     await client.connect();
+    await client.observeEvents(["providers_snapshot_update"]).ready;
     await client.getProvidersSnapshot({ cwd });
     await expect
       .poll(
diff --git a/packages/server/src/server/worktree-bootstrap.posix.test.ts b/packages/server/src/server/worktree-bootstrap.posix.test.ts
index a0a796c83d..41de520d09 100644
--- a/packages/server/src/server/worktree-bootstrap.posix.test.ts
+++ b/packages/server/src/server/worktree-bootstrap.posix.test.ts
@@ -422,12 +422,12 @@ describe.skipIf(isPlatform("win32"))("worktree-bootstrap POSIX-only", () => {
             api: {
               type: "service",
               command:
-                "node -e \"const fs=require('fs'); fs.writeFileSync('api-env.json', JSON.stringify(process.env)); setTimeout(()=>{}, 30000)\"",
+                "node -e \"const fs=require('fs'); fs.writeFileSync('api-env.json.tmp', JSON.stringify(process.env)); fs.renameSync('api-env.json.tmp', 'api-env.json'); setTimeout(()=>{}, 30000)\"",
             },
             web: {
               type: "service",
               command:
-                "node -e \"const fs=require('fs'); fs.writeFileSync('web-env.json', JSON.stringify(process.env)); setTimeout(()=>{}, 30000)\"",
+                "node -e \"const fs=require('fs'); fs.writeFileSync('web-env.json.tmp', JSON.stringify(process.env)); fs.renameSync('web-env.json.tmp', 'web-env.json'); setTimeout(()=>{}, 30000)\"",
             },
           },
         }),
diff --git a/packages/server/src/server/worktree-core.ts b/packages/server/src/server/worktree-core.ts
index f4b51e0554..c66e91c5dd 100644
--- a/packages/server/src/server/worktree-core.ts
+++ b/packages/server/src/server/worktree-core.ts
@@ -5,7 +5,7 @@ import {
   createWorktree,
   slugify,
   validateBranchSlug,
-  type WorktreeConfig,
+  type CreatedWorktree,
 } from "../utils/worktree.js";
 import {
   resolveWorktreeCreationIntent,
@@ -41,7 +41,7 @@ export interface CreateWorktreeCoreDeps {
 }
 
 export interface CreateWorktreeCoreResult {
-  worktree: WorktreeConfig;
+  worktree: CreatedWorktree;
   intent: WorktreeCreationIntent;
   repoRoot: string;
   created: boolean;
diff --git a/packages/server/src/server/worktree-session.test.ts b/packages/server/src/server/worktree-session.test.ts
index 384a74a54d..b146c59f31 100644
--- a/packages/server/src/server/worktree-session.test.ts
+++ b/packages/server/src/server/worktree-session.test.ts
@@ -115,7 +115,6 @@ function createWorkflowForRequestTest(options: {
         emit: () => {},
         sessionLogger: createLogger(),
         terminalManager: null,
-        archiveWorkspaceRecord: async () => {},
         serviceProxy: null,
         scriptRuntimeStore: null,
         getDaemonTcpPort: null,
@@ -366,6 +365,7 @@ function createPaseoWorktreeForTest(options: {
     projectRegistry,
     workspaceRegistry,
     workspaceGitService,
+    isDirectory: async () => true,
     logger: createLogger(),
   });
 
@@ -488,7 +488,6 @@ describe("create-agent worktree setup boundary", () => {
           emit: (message) => emitted.push(message),
           sessionLogger: createLogger(),
           terminalManager: createTerminalManagerStub().manager,
-          archiveWorkspaceRecord: async () => {},
           serviceProxy: null,
           scriptRuntimeStore: null,
           getDaemonTcpPort: null,
@@ -539,7 +538,6 @@ describe("create-agent worktree setup boundary", () => {
           emit: (message) => workspaceSetupEvents.push(message),
           sessionLogger: createLogger(),
           terminalManager: null,
-          archiveWorkspaceRecord: async () => {},
           serviceProxy: null,
           scriptRuntimeStore: null,
           getDaemonTcpPort: null,
@@ -713,7 +711,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: () => {},
         sessionLogger: createLogger(),
         terminalManager: null,
-        archiveWorkspaceRecord: async () => {},
       },
       {
         requestCwd: sourceWorkspaceCwd,
@@ -758,7 +755,6 @@ describe("runWorktreeSetupInBackground", () => {
     const logger = createLogger();
     const terminalManager = createTerminalManagerStub();
     const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-    const archiveWorkspaceRecord = vi.fn(async () => {});
 
     await runWorktreeSetupInBackground(
       {
@@ -769,7 +765,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: (message) => emitted.push(message),
         sessionLogger: logger,
         terminalManager: terminalManager.manager,
-        archiveWorkspaceRecord,
       },
       {
         requestCwd: repoDir,
@@ -827,11 +822,10 @@ describe("runWorktreeSetupInBackground", () => {
     });
 
     expect(terminalManager.terminals).toHaveLength(0);
-    expect(archiveWorkspaceRecord).not.toHaveBeenCalled();
     expect(emitWorkspaceUpdateForWorkspaceId).toHaveBeenCalledWith("42");
   });
 
-  test("archives the pending workspace and emits a failed snapshot when setup cannot start", async () => {
+  test("keeps the workspace available and emits a failed snapshot when setup cannot start", async () => {
     const { tempDir, repoDir } = createGitRepo();
     cleanupPaths.push(tempDir);
 
@@ -856,7 +850,6 @@ describe("runWorktreeSetupInBackground", () => {
     const snapshots = new Map<string, unknown>();
     const logger = createLogger();
     const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-    const archiveWorkspaceRecord = vi.fn(async () => {});
     const workspaceId = "ws-broken-feature";
 
     await runWorktreeSetupInBackground(
@@ -868,7 +861,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: (message) => emitted.push(message),
         sessionLogger: logger,
         terminalManager: null,
-        archiveWorkspaceRecord,
       },
       {
         requestCwd: repoDir,
@@ -900,7 +892,8 @@ describe("runWorktreeSetupInBackground", () => {
       status: "failed",
       error: expect.stringMatching(/Failed to parse paseo\.json at .*paseo\.json/),
     });
-    expect(archiveWorkspaceRecord).toHaveBeenCalledWith(workspaceId);
+    expect(existsSync(worktreePath)).toBe(true);
+    expect(existsSync(path.join(worktreePath, "paseo.json"))).toBe(true);
     expect(emitWorkspaceUpdateForWorkspaceId).toHaveBeenCalledWith(workspaceId);
   });
 
@@ -931,7 +924,6 @@ describe("runWorktreeSetupInBackground", () => {
       const snapshots = new Map<string, unknown>();
       const logger = createLogger();
       const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-      const archiveWorkspaceRecord = vi.fn(async () => {});
 
       await runWorktreeSetupInBackground(
         {
@@ -942,7 +934,6 @@ describe("runWorktreeSetupInBackground", () => {
           emit: (message) => emitted.push(message),
           sessionLogger: logger,
           terminalManager: null,
-          archiveWorkspaceRecord,
         },
         {
           requestCwd: repoDir,
@@ -1055,7 +1046,6 @@ describe("runWorktreeSetupInBackground", () => {
     const logger = createLogger();
     const terminalManager = createTerminalManagerStub();
     const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-    const archiveWorkspaceRecord = vi.fn(async () => {});
 
     await runWorktreeSetupInBackground(
       {
@@ -1066,7 +1056,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: (message) => emitted.push(message),
         sessionLogger: logger,
         terminalManager: terminalManager.manager,
-        archiveWorkspaceRecord,
       },
       {
         requestCwd: repoDir,
@@ -1115,7 +1104,6 @@ describe("runWorktreeSetupInBackground", () => {
       status: "completed",
       error: null,
     });
-    expect(archiveWorkspaceRecord).not.toHaveBeenCalled();
     expect(emitWorkspaceUpdateForWorkspaceId).toHaveBeenCalledWith("44");
   });
 
@@ -1150,7 +1138,6 @@ describe("runWorktreeSetupInBackground", () => {
       },
     });
     const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-    const archiveWorkspaceRecord = vi.fn(async () => {});
 
     await runWorktreeSetupInBackground(
       {
@@ -1161,7 +1148,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: (message) => emitted.push(message),
         sessionLogger: logger,
         terminalManager: terminalManager.manager,
-        archiveWorkspaceRecord,
       },
       {
         requestCwd: repoDir,
@@ -1201,7 +1187,6 @@ describe("runWorktreeSetupInBackground", () => {
       status: "completed",
       error: null,
     });
-    expect(archiveWorkspaceRecord).not.toHaveBeenCalled();
     expect(emitWorkspaceUpdateForWorkspaceId).toHaveBeenCalledWith("45");
   });
 
@@ -1232,7 +1217,6 @@ describe("runWorktreeSetupInBackground", () => {
     const logger = createLogger();
     const terminalManager = createTerminalManagerStub();
     const emitWorkspaceUpdateForWorkspaceId = vi.fn(async () => {});
-    const archiveWorkspaceRecord = vi.fn(async () => {});
 
     await runWorktreeSetupInBackground(
       {
@@ -1243,7 +1227,6 @@ describe("runWorktreeSetupInBackground", () => {
         emit: (message) => emitted.push(message),
         sessionLogger: logger,
         terminalManager: terminalManager.manager,
-        archiveWorkspaceRecord,
       },
       {
         requestCwd: repoDir,
@@ -1264,7 +1247,6 @@ describe("runWorktreeSetupInBackground", () => {
       status: "completed",
       error: null,
     });
-    expect(archiveWorkspaceRecord).not.toHaveBeenCalled();
     expect(emitWorkspaceUpdateForWorkspaceId).toHaveBeenCalledWith("46");
   });
 
@@ -1426,7 +1408,6 @@ describe("runWorktreeSetupInBackground", () => {
       emit: (message: SessionOutboundMessage) => emitted.push(message),
       sessionLogger: createLogger(),
       terminalManager: terminalManager.manager,
-      archiveWorkspaceRecord: vi.fn(async () => {}),
       serviceProxy: null,
       scriptRuntimeStore: null,
       getDaemonTcpPort: null,
@@ -1904,6 +1885,7 @@ describe("handleCreatePaseoWorktreeRequest", () => {
           requestCwd: repoDir,
           worktree: {
             branchName: "response-after-create",
+            comparisonBaseRef: "refs/heads/main",
             worktreePath: registeredWorktreePath,
           },
           shouldBootstrap: true,
@@ -2035,6 +2017,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2106,6 +2089,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2182,6 +2166,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2258,6 +2243,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
       workspaceGitService: {
         getSnapshot: vi.fn(async () => null),
         listWorktrees: vi.fn(async () => []),
+        invalidateWorktrees: () => {},
       },
       agentManager: {
         listAgents: () => [],
diff --git a/packages/server/src/server/worktree-session.ts b/packages/server/src/server/worktree-session.ts
index c693bc5380..cdb0119b64 100644
--- a/packages/server/src/server/worktree-session.ts
+++ b/packages/server/src/server/worktree-session.ts
@@ -4,6 +4,7 @@ import { basename } from "node:path";
 import type { AgentSessionConfig } from "./agent/agent-sdk-types.js";
 import {
   type GitSetupOptions,
+  type CreateAgentWorktreeTarget,
   type FirstAgentContext,
   type ChangeRequestCheckoutSource,
   type SessionInboundMessage,
@@ -108,7 +109,6 @@ interface CreatePaseoWorktreeInBackgroundDependencies {
   emit: EmitSessionMessage;
   sessionLogger: Logger;
   terminalManager: TerminalManager | null;
-  archiveWorkspaceRecord: (workspaceId: string) => Promise<void>;
   serviceProxy: ServiceProxySubsystem | null;
   scriptRuntimeStore: WorkspaceScriptRuntimeStore | null;
   getDaemonTcpPort: (() => number | null) | null;
@@ -321,7 +321,42 @@ function validateNormalizedGitOptions(input: ValidateNormalizedGitOptionsInput):
   }
 }
 
-export function normalizeGitOptions(
+export function normalizeAgentCreationGitOptions(
+  gitOptions?: GitSetupOptions,
+  legacyWorktreeName?: string,
+  worktree?: CreateAgentWorktreeTarget,
+): NormalizedGitOptions | null {
+  if (worktree && gitOptions) {
+    throw new Error("create_agent_request worktree cannot be combined with git options");
+  }
+  if (worktree) {
+    switch (worktree.mode) {
+      case "branch-off":
+        gitOptions = {
+          createWorktree: true,
+          createNewBranch: true,
+          newBranchName: worktree.newBranch,
+          baseBranch: worktree.base,
+          action: "branch-off",
+          refName: worktree.base,
+        };
+        break;
+      case "checkout-branch":
+        gitOptions = { createWorktree: true, action: "checkout", refName: worktree.branch };
+        break;
+      case "checkout-pr":
+        gitOptions = {
+          createWorktree: true,
+          action: "checkout",
+          githubPrNumber: worktree.prNumber,
+        };
+        break;
+    }
+  }
+  return normalizeGitOptions(gitOptions, legacyWorktreeName);
+}
+
+function normalizeGitOptions(
   gitOptions?: GitSetupOptions,
   legacyWorktreeName?: string,
 ): NormalizedGitOptions | null {
@@ -466,7 +501,10 @@ export async function handlePaseoWorktreeArchiveRequest(
     "emitWorkspaceUpdatesForWorkspaceIds" | "workspaceGitService"
   > & {
     emit: EmitSessionMessage;
-    workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "listWorktrees">;
+    workspaceGitService: Pick<
+      WorkspaceGitService,
+      "getSnapshot" | "listWorktrees" | "invalidateWorktrees"
+    >;
     emitWorkspaceUpdatesForWorkspaceIds: (workspaceIds: Iterable<string>) => Promise<void>;
   },
   msg: Extract<SessionInboundMessage, { type: "paseo_worktree_archive_request" }>,
@@ -825,7 +863,6 @@ export async function runWorktreeSetupInBackground(
 ): Promise<void> {
   let worktree: WorktreeConfig = options.worktree;
   let setupResults: WorktreeSetupCommandResult[] = [];
-  let setupStarted = false;
   const progressAccumulator = createWorktreeSetupProgressAccumulator();
   const workspaceId = options.workspaceId;
 
@@ -862,7 +899,6 @@ export async function runWorktreeSetupInBackground(
         const workspaceCwd = options.workspaceCwd ?? worktree.worktreePath;
         const setupCommands = getWorktreeSetupCommands(workspaceCwd);
         if (setupCommands.length === 0) {
-          setupStarted = true;
           emitSetupProgress("completed", null);
         } else {
           const runtimeEnv = await resolveWorktreeRuntimeEnv({
@@ -874,7 +910,6 @@ export async function runWorktreeSetupInBackground(
             cwd: workspaceCwd,
             env: runtimeEnv,
           });
-          setupStarted = true;
           setupResults = await runWorktreeSetupCommands({
             worktreePath: workspaceCwd,
             branchName: worktree.branchName,
@@ -906,10 +941,6 @@ export async function runWorktreeSetupInBackground(
       const message = error instanceof Error ? error.message : String(error);
       emitSetupProgress("failed", message);
 
-      if (!setupStarted) {
-        await dependencies.archiveWorkspaceRecord(options.workspaceId);
-      }
-
       dependencies.sessionLogger.error(
         {
           err: error,
@@ -917,7 +948,6 @@ export async function runWorktreeSetupInBackground(
           repoRoot: options.repoRoot,
           worktreeSlug: worktree.branchName,
           worktreePath: worktree.worktreePath,
-          setupStarted,
         },
         "Background worktree setup failed",
       );
diff --git a/packages/server/src/server/worktree/commands.ts b/packages/server/src/server/worktree/commands.ts
index cedc5013c9..4f76cb1887 100644
--- a/packages/server/src/server/worktree/commands.ts
+++ b/packages/server/src/server/worktree/commands.ts
@@ -93,7 +93,10 @@ export interface ArchiveCommandDependencies extends Omit<
   ArchiveDependencies,
   "workspaceGitService"
 > {
-  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "listWorktrees">;
+  workspaceGitService: Pick<
+    WorkspaceGitService,
+    "getSnapshot" | "listWorktrees" | "invalidateWorktrees"
+  >;
 }
 
 export interface ArchiveCommandInput {
diff --git a/packages/server/src/services/github-service.test.ts b/packages/server/src/services/github-service.test.ts
index 194a0c7487..ab71115f36 100644
--- a/packages/server/src/services/github-service.test.ts
+++ b/packages/server/src/services/github-service.test.ts
@@ -25,6 +25,7 @@ const EXPECTED_GITHUB_ERROR_BACKOFF_CAP_MS = 300_000;
 const CURRENT_PR_STATUS_BASE_FIELDS =
   "number,url,title,state,isDraft,baseRefName,headRefName,headRefOid,mergedAt,reviewDecision,mergeable,headRepositoryOwner";
 const CURRENT_PR_STATUS_FIELDS = `${CURRENT_PR_STATUS_BASE_FIELDS},statusCheckRollup`;
+const FORK_PR_QUERY = "state=all&per_page=100&head=forkOwner%3Afeature%2Ffork";
 
 interface RunnerCall {
   args: string[];
@@ -3324,34 +3325,33 @@ describe("ForgeService", () => {
         name: "parentRepo",
         parent: { owner: { login: "parentOwner" }, name: "parentRepo" },
       }),
-      JSON.stringify([
-        {
-          number: 41,
-          url: "https://github.com/parentOwner/parentRepo/pull/41",
-          title: "Wrong fork owner",
-          state: "OPEN",
-          isDraft: false,
-          baseRefName: "main",
-          headRefName: "feature/fork",
-          mergedAt: null,
-          statusCheckRollup: [],
-          reviewDecision: "REVIEW_REQUIRED",
-          headRepositoryOwner: { login: "otherFork" },
-        },
-        {
-          number: 42,
-          url: "https://github.com/parentOwner/parentRepo/pull/42",
-          title: "Real fork PR",
-          state: "OPEN",
-          isDraft: false,
-          baseRefName: "main",
-          headRefName: "feature/fork",
-          mergedAt: null,
-          statusCheckRollup: [],
-          reviewDecision: "REVIEW_REQUIRED",
-          headRepositoryOwner: { login: "forkOwner" },
-        },
-      ]),
+      JSON.stringify([{ number: 41 }, { number: 42 }]),
+      JSON.stringify({
+        number: 41,
+        url: "https://github.com/parentOwner/parentRepo/pull/41",
+        title: "Wrong fork owner",
+        state: "OPEN",
+        isDraft: false,
+        baseRefName: "main",
+        headRefName: "feature/fork",
+        mergedAt: null,
+        statusCheckRollup: [],
+        reviewDecision: "REVIEW_REQUIRED",
+        headRepositoryOwner: { login: "otherFork" },
+      }),
+      JSON.stringify({
+        number: 42,
+        url: "https://github.com/parentOwner/parentRepo/pull/42",
+        title: "Real fork PR",
+        state: "OPEN",
+        isDraft: false,
+        baseRefName: "main",
+        headRefName: "feature/fork",
+        mergedAt: null,
+        statusCheckRollup: [],
+        reviewDecision: "REVIEW_REQUIRED",
+        headRepositoryOwner: { login: "forkOwner" },
+      }),
     ]);
     const service = createGitHubService({
       runner: runner.runner,
@@ -3371,27 +3371,182 @@ describe("ForgeService", () => {
       title: "Real fork PR",
       headRefName: "feature/fork",
     });
-    expect(runner.calls.slice(0, 3).map((call) => call.args)).toEqual([
+    expect(runner.calls.slice(0, 5).map((call) => call.args)).toEqual([
       ["pr", "view", "--json", CURRENT_PR_STATUS_FIELDS],
       ["repo", "view", "--json", "owner,name,parent"],
-      [
-        "pr",
-        "list",
-        "--repo",
-        "parentOwner/parentRepo",
-        "--state",
-        "all",
-        "--head",
-        "forkOwner:feature/fork",
-        "--limit",
-        "10",
-        "--json",
-        CURRENT_PR_STATUS_FIELDS,
-      ],
+      ["api", `repos/parentOwner/parentRepo/pulls?${FORK_PR_QUERY}`],
+      ["pr", "view", "41", "--repo", "parentOwner/parentRepo", "--json", CURRENT_PR_STATUS_FIELDS],
+      ["pr", "view", "42", "--repo", "parentOwner/parentRepo", "--json", CURRENT_PR_STATUS_FIELDS],
     ]);
   });
 
-  it("retries scoped PR list without statusCheckRollup when token permissions are insufficient", async () => {
+  it("reads the fork PR carrying the checked-out commit past newer attempts on the branch", async () => {
+    const checkoutSha = "3333333333333333333333333333333333333333";
+    const viewed: number[] = [];
+    const runner: GitHubCommandRunner = async (args) => {
+      if (args[0] === "repo" && args[1] === "view") {
+        return {
+          stdout: JSON.stringify({
+            owner: { login: "forkOwner" },
+            name: "parentRepo",
+            parent: { owner: { login: "parentOwner" }, name: "parentRepo" },
+          }),
+          stderr: "",
+        };
+      }
+      if (args[0] === "api") {
+        // Newest first, and the checkout is sitting on the oldest attempt.
+        return {
+          stdout: JSON.stringify([
+            { number: 50, head: { sha: "5".repeat(40) } },
+            { number: 49, head: { sha: "4".repeat(40) } },
+            { number: 48, head: { sha: "8".repeat(40) } },
+            { number: 47, head: { sha: checkoutSha } },
+          ]),
+          stderr: "",
+        };
+      }
+      if (args[0] === "pr" && args[1] === "view" && /^\d+$/.test(args[2] ?? "")) {
+        const number = Number(args[2]);
+        viewed.push(number);
+        return {
+          stdout: currentPullRequestJson({
+            number,
+            url: `https://github.com/parentOwner/parentRepo/pull/${number}`,
+            state: "CLOSED",
+            headRefOid: number === 47 ? checkoutSha : `${number}`.repeat(20),
+            headRepositoryOwner: { login: "forkOwner" },
+          }),
+          stderr: "",
+        };
+      }
+      throw noPullRequestError(args);
+    };
+    const service = createGitHubService({
+      runner,
+      resolveGhPath: async () => "/usr/bin/gh",
+      now: () => 100,
+    });
+
+    const status = await service.getCurrentPullRequestStatus({
+      cwd: "/repo",
+      headRef: "feature/fork",
+      headSha: checkoutSha,
+    });
+
+    expect(status).toMatchObject({
+      number: 47,
+      repoOwner: "parentOwner",
+      repoName: "parentRepo",
+    });
+    expect(viewed).toContain(47);
+    expect(viewed).toHaveLength(3);
+  });
+
+  it("propagates a failed fork PR lookup instead of reporting no pull request", async () => {
+    const rateLimitError = new GitHubCommandError({
+      args: ["api", "repos/parentOwner/parentRepo/pulls"],
+      cwd: "/repo",
+      exitCode: 1,
+      stderr: "API rate limit exceeded",
+    });
+    const runner = createScriptedRunner([
+      { error: noPullRequestError() },
+      JSON.stringify({
+        owner: { login: "forkOwner" },
+        name: "parentRepo",
+        parent: { owner: { login: "parentOwner" }, name: "parentRepo" },
+      }),
+      { error: rateLimitError },
+    ]);
+    const service = createGitHubService({
+      runner: runner.runner,
+      resolveGhPath: async () => "/usr/bin/gh",
+      now: () => 100,
+    });
+
+    await expect(
+      service.getCurrentPullRequestStatus({ cwd: "/repo", headRef: "feature/fork" }),
+    ).rejects.toThrow(GitHubCommandError);
+  });
+
+  it("resolves a fork PR whose branch name is crowded in the parent repository", async () => {
+    // Mirrors what `gh` really does: `pr list --head` matches the string
+    // against headRefName, so an "owner:branch" head never matches, and a
+    // popular branch name fills the candidate page with other forks' PRs.
+    const calls: RunnerCall[] = [];
+    function parentRepoPullRequest(
+      number: number,
+      headRepositoryOwner: string,
+    ): Record<string, unknown> {
+      return {
+        number,
+        url: `https://github.com/parentOwner/parentRepo/pull/${number}`,
+        title: `PR ${number}`,
+        state: "OPEN",
+        isDraft: false,
+        baseRefName: "main",
+        headRefName: "main",
+        headRefOid: `${number}`.padStart(40, "0"),
+        mergedAt: null,
+        statusCheckRollup: [],
+        reviewDecision: "REVIEW_REQUIRED",
+        headRepositoryOwner: { login: headRepositoryOwner },
+      };
+    }
+    const crowd = Array.from({ length: 10 }, (_, index) =>
+      parentRepoPullRequest(100 + index, `otherFork${index}`),
+    );
+    const runner: GitHubCommandRunner = async (args, options) => {
+      calls.push({ args, cwd: options.cwd });
+      if (args[0] === "repo" && args[1] === "view") {
+        return {
+          stdout: JSON.stringify({
+            owner: { login: "forkOwner" },
+            name: "parentRepo",
+            parent: { owner: { login: "parentOwner" }, name: "parentRepo" },
+          }),
+          stderr: "",
+        };
+      }
+      if (args[0] === "pr" && args[1] === "view" && args[2] === "4984") {
+        return { stdout: JSON.stringify(parentRepoPullRequest(4984, "forkOwner")), stderr: "" };
+      }
+      if (args[0] === "pr" && args[1] === "view") {
+        throw noPullRequestError(args);
+      }
+      if (args[0] === "pr" && args[1] === "list") {
+        const headRef = args[args.indexOf("--head") + 1];
+        const limit = Number(args[args.indexOf("--limit") + 1]);
+        const matching = crowd.filter((candidate) => candidate.headRefName === headRef);
+        return { stdout: JSON.stringify(matching.slice(0, limit)), stderr: "" };
+      }
+      if (args[0] === "api" && args[1]?.startsWith("repos/")) {
+        expect(args[1]).toContain("head=forkOwner%3Amain");
+        return { stdout: JSON.stringify([{ number: 4984 }]), stderr: "" };
+      }
+      return { stdout: "{}", stderr: "" };
+    };
+    const service = createGitHubService({
+      runner,
+      resolveGhPath: async () => "/usr/bin/gh",
+      now: () => 100,
+    });
+
+    const status = await service.getCurrentPullRequestStatus({
+      cwd: "/repo",
+      headRef: "main",
+    });
+
+    expect(status).toMatchObject({
+      number: 4984,
+      repoOwner: "parentOwner",
+      repoName: "parentRepo",
+      headRefName: "main",
+    });
+  });
+
+  it("retries the fork PR view without statusCheckRollup when token permissions are insufficient", async () => {
     const runner = createScriptedRunner([
       currentPullRequestJson({
         number: 7,
@@ -3404,36 +3559,30 @@ describe("ForgeService", () => {
         name: "parentRepo",
         parent: { owner: { login: "parentOwner" }, name: "parentRepo" },
       }),
+      JSON.stringify([{ number: 42 }]),
       {
         error: statusCheckRollupPermissionError([
           "pr",
-          "list",
+          "view",
+          "42",
           "--repo",
           "parentOwner/parentRepo",
-          "--state",
-          "all",
-          "--head",
-          "forkOwner:feature/fork",
           "--json",
           CURRENT_PR_STATUS_FIELDS,
-          "--limit",
-          "10",
         ]),
       },
-      JSON.stringify([
-        {
-          number: 42,
-          url: "https://github.com/parentOwner/parentRepo/pull/42",
-          title: "Real fork PR",
-          state: "OPEN",
-          isDraft: false,
-          baseRefName: "main",
-          headRefName: "feature/fork",
-          mergedAt: null,
-          reviewDecision: "REVIEW_REQUIRED",
-          headRepositoryOwner: { login: "forkOwner" },
-        },
-      ]),
+      JSON.stringify({
+        number: 42,
+        url: "https://github.com/parentOwner/parentRepo/pull/42",
+        title: "Real fork PR",
+        state: "OPEN",
+        isDraft: false,
+        baseRefName: "main",
+        headRefName: "feature/fork",
+        mergedAt: null,
+        reviewDecision: "REVIEW_REQUIRED",
+        headRepositoryOwner: { login: "forkOwner" },
+      }),
     ]);
     const service = createGitHubService({
       runner: runner.runner,
@@ -3454,34 +3603,17 @@ describe("ForgeService", () => {
       checks: [],
       checksStatus: "none",
     });
-    expect(runner.calls.slice(0, 4).map((call) => call.args)).toEqual([
+    expect(runner.calls.slice(0, 5).map((call) => call.args)).toEqual([
       ["pr", "view", "--json", CURRENT_PR_STATUS_FIELDS],
       ["repo", "view", "--json", "owner,name,parent"],
+      ["api", `repos/parentOwner/parentRepo/pulls?${FORK_PR_QUERY}`],
+      ["pr", "view", "42", "--repo", "parentOwner/parentRepo", "--json", CURRENT_PR_STATUS_FIELDS],
       [
         "pr",
-        "list",
+        "view",
+        "42",
         "--repo",
         "parentOwner/parentRepo",
-        "--state",
-        "all",
-        "--head",
-        "forkOwner:feature/fork",
-        "--limit",
-        "10",
-        "--json",
-        CURRENT_PR_STATUS_FIELDS,
-      ],
-      [
-        "pr",
-        "list",
-        "--repo",
-        "parentOwner/parentRepo",
-        "--state",
-        "all",
-        "--head",
-        "forkOwner:feature/fork",
-        "--limit",
-        "10",
         "--json",
         CURRENT_PR_STATUS_BASE_FIELDS,
       ],
@@ -3629,21 +3761,20 @@ describe("ForgeService", () => {
         name: "repo",
         parent: { owner: { login: "parentOwner" }, name: "repo" },
       }),
-      JSON.stringify([
-        {
-          number: 88,
-          url: "https://github.com/parentOwner/repo/pull/88",
-          title: "Fork-only PR",
-          state: "OPEN",
-          isDraft: false,
-          baseRefName: "main",
-          headRefName: "feature/fork",
-          mergedAt: null,
-          statusCheckRollup: [],
-          reviewDecision: null,
-          headRepositoryOwner: { login: "forkOwner" },
-        },
-      ]),
+      JSON.stringify([{ number: 88 }]),
+      JSON.stringify({
+        number: 88,
+        url: "https://github.com/parentOwner/repo/pull/88",
+        title: "Fork-only PR",
+        state: "OPEN",
+        isDraft: false,
+        baseRefName: "main",
+        headRefName: "feature/fork",
+        mergedAt: null,
+        statusCheckRollup: [],
+        reviewDecision: null,
+        headRepositoryOwner: { login: "forkOwner" },
+      }),
     ]);
     const service = createGitHubService({
       runner: runner.runner,
@@ -3662,7 +3793,7 @@ describe("ForgeService", () => {
       repoName: "repo",
       headRefName: "feature/fork",
     });
-    expect(runner.calls[2]?.args).toContain("forkOwner:feature/fork");
+    expect(runner.calls[2]?.args).toEqual(["api", `repos/parentOwner/repo/pulls?${FORK_PR_QUERY}`]);
   });
 
   it("propagates DNS errors while resolving the current PR view", async () => {
diff --git a/packages/server/src/services/github-service.ts b/packages/server/src/services/github-service.ts
index 4e857d5062..b6de0cbd6e 100644
--- a/packages/server/src/services/github-service.ts
+++ b/packages/server/src/services/github-service.ts
@@ -117,6 +117,11 @@ export const GITHUB_POLL_ALIGNMENT_MS = 5_000;
 const GITHUB_GRAPHQL_RESERVE_RATIO = 0.4;
 const GITHUB_GRAPHQL_RESET_GRACE_MS = 1_000;
 const BATCH_PR_CANDIDATE_LIMIT = 10;
+// How many of a fork branch's own pull requests are read in full. One is the
+// normal case; the rest are earlier attempts on the same branch, and the one
+// carrying the checkout's head commit is read whichever attempt it belongs to.
+const FORK_PR_VIEW_LIMIT = 3;
+const FORK_PR_PAGE_SIZE = 100;
 const FROZEN_PR_CHECKS_CACHE_MAX_ENTRIES = 512;
 const GITHUB_ENV = {
   GIT_TERMINAL_PROMPT: "0",
@@ -457,6 +462,16 @@ const GitHubRepoViewSchema = z.object({
     .optional(),
 });
 
+const ForkPullRequestRefsSchema = z.array(
+  z.object({
+    number: z.number(),
+    head: z
+      .object({ sha: z.string().catch("") })
+      .nullable()
+      .optional(),
+  }),
+);
+
 const PullRequestCheckoutTargetSchema = z.object({
   data: z.object({
     repository: z.object({
@@ -2964,8 +2979,6 @@ async function resolveCurrentPullRequestView(options: {
     return viewMatch.status;
   }
 
-  let listHeadRef = options.headRef;
-  let listRepo: string | undefined;
   let headRepositoryOwner = options.headRepositoryOwner;
 
   if (!headRepositoryOwner) {
@@ -2977,17 +2990,19 @@ async function resolveCurrentPullRequestView(options: {
       return null;
     }
     if (parentOwner && parentName) {
-      listHeadRef = `${forkOwner}:${options.headRef}`;
-      listRepo = `${parentOwner}/${parentName}`;
+      return resolveForkPullRequestView({
+        ...options,
+        forkOwner,
+        repo: `${parentOwner}/${parentName}`,
+      });
     }
     headRepositoryOwner = forkOwner;
   }
 
   const candidates = await listCurrentPullRequestCandidates({
     cwd: options.cwd,
-    headRef: listHeadRef,
+    headRef: options.headRef,
     run: options.run,
-    repo: listRepo,
   });
   const match = pickPullRequestCandidate({
     candidates,
@@ -2998,6 +3013,77 @@ async function resolveCurrentPullRequestView(options: {
   return match?.status ?? null;
 }
 
+// A fork checkout's pull request lives in the parent repository, where only
+// its head repository tells it apart from every other fork's pull request on
+// the same branch name. `gh pr list --head` cannot ask that question: it
+// forwards the whole value as a head branch name, so "owner:branch" matches
+// nothing (cli/cli#10945), and the bare branch name loses a common name like
+// `main` among the other forks crowding the candidate page. The REST pulls
+// endpoint is the only lookup that takes a head repository, so it names the
+// pull requests and the ordinary view path reads each one's status.
+async function resolveForkPullRequestView(options: {
+  cwd: string;
+  headRef: string;
+  headSha?: string;
+  forkOwner: string;
+  repo: string;
+  run: (args: string[], options: GitHubCommandRunnerOptions) => Promise<string>;
+}): Promise<CurrentPullRequestStatus | null> {
+  const numbers = await listForkPullRequestNumbers(options);
+  const candidates = await Promise.all(
+    numbers.map((number) =>
+      tryCurrentPullRequestView({
+        cwd: options.cwd,
+        headRef: options.headRef,
+        run: options.run,
+        args: ["pr", "view", String(number), "--repo", options.repo],
+      }),
+    ),
+  );
+  const match = pickPullRequestCandidate({
+    candidates: candidates.filter(
+      (candidate): candidate is ResolvedPullRequestCandidate => candidate !== null,
+    ),
+    headRef: options.headRef,
+    headSha: options.headSha,
+    headRepositoryOwner: options.forkOwner,
+  });
+  return match?.status ?? null;
+}
+
+// The endpoint answers with the fork branch's pull requests, newest first, so
+// a branch reused for several attempts can carry the checkout's head commit on
+// an older one. Those are read first, and the rest of the window is filled
+// newest-first, so the full read stays bounded without dropping the attempt the
+// checkout is actually sitting on.
+async function listForkPullRequestNumbers(options: {
+  cwd: string;
+  headRef: string;
+  headSha?: string;
+  forkOwner: string;
+  repo: string;
+  run: (args: string[], options: GitHubCommandRunnerOptions) => Promise<string>;
+}): Promise<number[]> {
+  const query = new URLSearchParams({
+    state: "all",
+    per_page: String(FORK_PR_PAGE_SIZE),
+    head: `${options.forkOwner}:${options.headRef}`,
+  });
+  const args = ["api", `repos/${options.repo}/pulls?${query.toString()}`];
+  const stdout = await options.run(args, { cwd: options.cwd });
+  const refs = parseGitHubJsonOutput(stdout, ForkPullRequestRefsSchema, {
+    args,
+    cwd: options.cwd,
+    emptyFallback: "[]",
+  });
+  function carriesHeadSha(ref: (typeof refs)[number]): boolean {
+    return options.headSha !== undefined && ref.head?.sha === options.headSha;
+  }
+  return [...refs.filter(carriesHeadSha), ...refs.filter((ref) => !carriesHeadSha(ref))]
+    .slice(0, FORK_PR_VIEW_LIMIT)
+    .map((ref) => ref.number);
+}
+
 async function addCurrentPullRequestGithubFacts(options: {
   cwd: string;
   status: CurrentPullRequestStatus | null;
@@ -3057,16 +3143,18 @@ async function loadPullRequestGithubFacts(options: {
 async function tryCurrentPullRequestView(options: {
   cwd: string;
   headRef: string;
+  args?: string[];
   run: (args: string[], options: GitHubCommandRunnerOptions) => Promise<string>;
 }): Promise<ResolvedPullRequestCandidate | null> {
+  const args = options.args ?? ["pr", "view"];
   try {
     const stdout = await runCurrentPullRequestStatusCommand({
       cwd: options.cwd,
       run: options.run,
-      args: ["pr", "view"],
+      args,
     });
     return parseCurrentPullRequestCandidate(stdout, options.headRef, {
-      args: ["pr", "view", "--json", CURRENT_PR_STATUS_FIELDS],
+      args: [...args, "--json", CURRENT_PR_STATUS_FIELDS],
       cwd: options.cwd,
     });
   } catch (error) {
@@ -3081,13 +3169,8 @@ async function listCurrentPullRequestCandidates(options: {
   cwd: string;
   headRef: string;
   run: (args: string[], options: GitHubCommandRunnerOptions) => Promise<string>;
-  repo?: string;
 }): Promise<ResolvedPullRequestCandidate[]> {
-  const args = ["pr", "list"];
-  if (options.repo) {
-    args.push("--repo", options.repo);
-  }
-  args.push("--state", "all", "--head", options.headRef, "--limit", "10");
+  const args = ["pr", "list", "--state", "all", "--head", options.headRef, "--limit", "10"];
   try {
     const stdout = await runCurrentPullRequestStatusCommand({
       cwd: options.cwd,
diff --git a/packages/server/src/services/gitlab-service.test.ts b/packages/server/src/services/gitlab-service.test.ts
index c74224e444..371198e447 100644
--- a/packages/server/src/services/gitlab-service.test.ts
+++ b/packages/server/src/services/gitlab-service.test.ts
@@ -1328,6 +1328,132 @@ describe("createGitLabService", () => {
     );
   });
 
+  it("finds a merge request by number even when its title and description omit it", async () => {
+    const { service } = makeService((args) => {
+      // GitLab text search does not search the IID. Model both API behaviors.
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] === "api" && args[1].includes("iids[]=14")) {
+        return ok(JSON.stringify([OPEN_MR]));
+      }
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: " 14 ",
+      kinds: ["change_request"],
+    });
+    expect(result.items).toEqual([
+      expect.objectContaining({
+        kind: "change_request",
+        number: 14,
+        title: OPEN_MR.title,
+        headRefName: OPEN_MR.source_branch,
+        baseRefName: OPEN_MR.target_branch,
+      }),
+    ]);
+  });
+
+  it("finds issues by number through the same search interface", async () => {
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] === "api" && args[1].includes("iids[]=7")) {
+        return ok(JSON.stringify([OPEN_ISSUE]));
+      }
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: "7",
+      kinds: ["issue"],
+    });
+    expect(result.items).toEqual([
+      expect.objectContaining({ kind: "issue", number: 7, title: OPEN_ISSUE.title }),
+    ]);
+  });
+
+  it.each([
+    { kind: "change_request" as const, item: OPEN_MR },
+    { kind: "issue" as const, item: OPEN_ISSUE },
+  ])(
+    "preserves numeric text matches after the exact $kind number, without duplicates",
+    async ({ kind, item }) => {
+      const textMatches = [
+        {
+          ...item,
+          iid: 90,
+          title: `References ${item.iid}`,
+          updated_at: "2026-07-01T00:00:00.000Z",
+        },
+        item,
+        {
+          ...item,
+          iid: 91,
+          description: `References ${item.iid}`,
+          updated_at: "2026-06-30T00:00:00.000Z",
+        },
+      ];
+      const { service } = makeService((args) => {
+        if (args.includes("--search")) return ok(JSON.stringify(textMatches));
+        if (args[0] === "api") return ok(JSON.stringify([item]));
+        throw new Error(`unexpected glab args: ${args.join(" ")}`);
+      });
+      const result = await service.searchIssuesAndPrs({
+        cwd: "/repo",
+        query: String(item.iid),
+        limit: 2,
+        kinds: [kind],
+      });
+      expect(
+        result.items.map((resultItem) => ({ kind: resultItem.kind, number: resultItem.number })),
+      ).toEqual([
+        { kind, number: item.iid },
+        { kind, number: 90 },
+      ]);
+    },
+  );
+
+  it.each([
+    { kind: "change_request" as const, item: OPEN_MR },
+    { kind: "issue" as const, item: OPEN_ISSUE },
+  ])("keeps $kind text matches when the queried number is not open", async ({ kind, item }) => {
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) {
+        return ok(JSON.stringify([{ ...item, description: "References 2024" }]));
+      }
+      if (args[0] === "api") return ok("[]");
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: "2024",
+      kinds: [kind],
+    });
+    expect(result.items.map(({ number }) => number)).toEqual([item.iid]);
+  });
+
+  it("keeps closed and missing merge requests out of number search results", async () => {
+    const closedMr = { ...OPEN_MR, state: "closed" };
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] !== "api") throw new Error(`unexpected glab args: ${args.join(" ")}`);
+      const endpoint = new URL(args[1], "https://gitlab.example.com/api/v4/");
+      const matches =
+        endpoint.searchParams.get("iids[]") === String(closedMr.iid) &&
+        endpoint.searchParams.get("state") !== "opened";
+      return ok(JSON.stringify(matches ? [closedMr] : []));
+    });
+    for (const query of ["14", "999999"]) {
+      const result = await service.searchIssuesAndPrs({
+        cwd: "/repo",
+        query,
+        limit: 10,
+        kinds: ["change_request"],
+      });
+      expect(result.authState).toBe("authenticated");
+      expect(result.items).toEqual([]);
+    }
+  });
+
   it("searches issues and merge requests and maps them to neutral results", async () => {
     const { service, calls } = makeService((args) => {
       if (args[0] === "issue") return ok(JSON.stringify([OPEN_ISSUE]));
diff --git a/packages/server/src/services/gitlab-service.ts b/packages/server/src/services/gitlab-service.ts
index f0b166cdda..1fff0e2a02 100644
--- a/packages/server/src/services/gitlab-service.ts
+++ b/packages/server/src/services/gitlab-service.ts
@@ -882,6 +882,31 @@ function throwFirstNonGlabAuthSearchRejection(results: PromiseSettledResult<unkn
   }
 }
 
+function buildGitLabListArgs({
+  kind,
+  input,
+}: {
+  kind: "mr" | "issue";
+  input: ListPullRequestsOptions | ListIssuesOptions;
+}): string[] {
+  const query = input.query?.trim();
+  // issue list uses -O for JSON; its -F flag controls details/ids/urls.
+  // mr list uses -F for JSON instead.
+  const args = [kind, "list", kind === "mr" ? "-F" : "-O", "json"];
+  if (query) {
+    args.push("--search", query);
+  }
+  if (typeof input.limit === "number") {
+    args.push("-P", String(input.limit));
+  }
+  return args;
+}
+
+function gitLabNumberQuery(query: string | undefined): string | null {
+  const trimmed = query?.trim();
+  return trimmed && /^\d+$/.test(trimmed) ? trimmed : null;
+}
+
 export function createGitLabService(options: CreateGitLabServiceOptions = {}): ForgeService {
   const runner = options.runner ?? runGlabCommand;
   const resolveGlab = createCachedCliPathResolver(options.resolveGlabPath ?? resolveGlabPath);
@@ -1057,42 +1082,51 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
     }
   }
 
+  async function runList<T extends { iid: number }>({
+    kind,
+    input,
+    schema,
+  }: {
+    kind: "mr" | "issue";
+    input: ListPullRequestsOptions | ListIssuesOptions;
+    schema: z.ZodType<T[]>;
+  }): Promise<T[]> {
+    const textSearch = runJson(buildGitLabListArgs({ kind, input }), { cwd: input.cwd }, schema);
+    const numberQuery = gitLabNumberQuery(input.query);
+    if (!numberQuery) return textSearch;
+
+    // GitLab text search omits IIDs, so supplement it with an open-item lookup.
+    const resource = kind === "mr" ? "merge_requests" : "issues";
+    const [numberMatches, textMatches] = await Promise.all([
+      runJson(
+        ["api", `projects/:id/${resource}?state=opened&iids[]=${numberQuery}`],
+        { cwd: input.cwd },
+        schema,
+      ),
+      textSearch,
+    ]);
+    const seen = new Set<number>();
+    const items = [...numberMatches, ...textMatches].filter((item) => {
+      if (seen.has(item.iid)) return false;
+      seen.add(item.iid);
+      return true;
+    });
+    return typeof input.limit === "number" ? items.slice(0, input.limit) : items;
+  }
+
   async function runMergeRequestList(
     input: ListPullRequestsOptions,
   ): Promise<PullRequestSummary[]> {
-    const args = ["mr", "list", "-F", "json"];
-    const query = input.query?.trim();
-    if (query) {
-      args.push("--search", query);
-    }
-    if (typeof input.limit === "number") {
-      args.push("-P", String(input.limit));
-    }
-    const mergeRequests = await runJson(
-      args,
-      { cwd: input.cwd },
-      z.array(GitLabMergeRequestSchema),
-    );
+    const mergeRequests = await runList({
+      kind: "mr",
+      input,
+      schema: z.array(GitLabMergeRequestSchema),
+    });
     return mergeRequests.map(toPullRequestSummary);
   }
 
-  /**
-   * `glab issue list` toggles JSON output with `-O/--output` (text|json); its
-   * `-F/--output-format` flag means something else (details|ids|urls) and
-   * silently falls back to the human-readable table for an unknown value. This
-   * differs from `glab mr list`, where `-F/--output` is the JSON toggle. Using
-   * the wrong flag here would emit a text table that fails JSON parsing.
-   */
   async function runIssueList(input: ListIssuesOptions): Promise<IssueSummary[]> {
-    const args = ["issue", "list", "-O", "json"];
-    const query = input.query?.trim();
-    if (query) {
-      args.push("--search", query);
-    }
-    if (typeof input.limit === "number") {
-      args.push("-P", String(input.limit));
-    }
-    const issues = await runJson(args, { cwd: input.cwd }, z.array(GitLabIssueSchema));
+    const issues = await runList({ kind: "issue", input, schema: z.array(GitLabIssueSchema) });
     return issues.map(toIssueSummary);
   }
 
@@ -1359,9 +1393,16 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
           });
         }
       }
-      items.sort(
-        (left, right) => parseOptionalTime(right.updatedAt) - parseOptionalTime(left.updatedAt),
-      );
+      const numberQuery = gitLabNumberQuery(input.query);
+      items.sort((left, right) => {
+        if (numberQuery) {
+          const numberMatchOrder =
+            Number(right.number === Number(numberQuery)) -
+            Number(left.number === Number(numberQuery));
+          if (numberMatchOrder !== 0) return numberMatchOrder;
+        }
+        return parseOptionalTime(right.updatedAt) - parseOptionalTime(left.updatedAt);
+      });
 
       return {
         items,
diff --git a/packages/server/src/services/quota-fetcher/manifest.ts b/packages/server/src/services/quota-fetcher/manifest.ts
deleted file mode 100644
index 11578eccd5..0000000000
--- a/packages/server/src/services/quota-fetcher/manifest.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type {
-  ProviderUsageFetcher,
-  ProviderUsageFetcherFactoryOptions,
-  ProviderUsageFetcherManifestEntry,
-} from "./provider.js";
-import { ClaudeQuotaProvider } from "./providers/claude.js";
-import { CodexQuotaProvider } from "./providers/codex.js";
-import { CopilotQuotaProvider } from "./providers/copilot.js";
-import { CursorQuotaProvider } from "./providers/cursor.js";
-import { GrokQuotaProvider } from "./providers/grok.js";
-import { KimiQuotaProvider } from "./providers/kimi.js";
-import { MiniMaxQuotaProvider } from "./providers/minimax.js";
-import { ZaiQuotaProvider } from "./providers/zai.js";
-
-export const PROVIDER_USAGE_FETCHERS: readonly ProviderUsageFetcherManifestEntry[] = [
-  {
-    providerId: "claude",
-    create: (options) =>
-      new ClaudeQuotaProvider({
-        logger: options.logger,
-        fetch: options.fetch,
-      }),
-  },
-  {
-    providerId: "codex",
-    create: (options) =>
-      new CodexQuotaProvider({
-        logger: options.logger,
-        fetch: options.fetch,
-      }),
-  },
-  {
-    providerId: "copilot",
-    create: (options) => new CopilotQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-  {
-    providerId: "cursor",
-    create: (options) => new CursorQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-  {
-    providerId: "zai",
-    create: (options) => new ZaiQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-  {
-    providerId: "grok",
-    create: (options) => new GrokQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-  {
-    providerId: "kimi",
-    create: (options) => new KimiQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-  {
-    providerId: "minimax",
-    create: (options) => new MiniMaxQuotaProvider({ logger: options.logger, fetch: options.fetch }),
-  },
-];
-
-export function createProviderUsageFetchers(
-  options: ProviderUsageFetcherFactoryOptions,
-): ProviderUsageFetcher[] {
-  return PROVIDER_USAGE_FETCHERS.map((entry) => entry.create(options));
-}
diff --git a/packages/server/src/services/quota-fetcher/provider.ts b/packages/server/src/services/quota-fetcher/provider.ts
deleted file mode 100644
index c8b6687cec..0000000000
--- a/packages/server/src/services/quota-fetcher/provider.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { Logger } from "pino";
-import type { ProviderUsage } from "../../server/messages.js";
-
-export type ProviderApiFetch = typeof fetch;
-
-export interface ProviderUsageFetcher {
-  readonly providerId: string;
-  readonly displayName: string;
-  fetchUsage(): Promise<ProviderUsage>;
-}
-
-export interface ProviderUsageFetcherFactoryOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-}
-
-export interface ProviderUsageFetcherManifestEntry {
-  readonly providerId: string;
-  create(options: ProviderUsageFetcherFactoryOptions): ProviderUsageFetcher;
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/claude-keychain.test.ts b/packages/server/src/services/quota-fetcher/providers/claude-keychain.test.ts
deleted file mode 100644
index 0f6be01f32..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/claude-keychain.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { claudeKeychainAccount, readClaudeKeychainCredentials } from "./claude.js";
-
-const SERVICE = "Claude Code-credentials";
-
-afterEach(() => {
-  vi.unstubAllEnvs();
-});
-
-describe("claudeKeychainAccount", () => {
-  it("uses a supported username verbatim", () => {
-    expect(claudeKeychainAccount("thomas.benoit")).toBe("thomas.benoit");
-  });
-
-  it("falls back to claude-code-user when the username carries a rejected character", () => {
-    expect(claudeKeychainAccount("first.last@example.com")).toBe("claude-code-user");
-  });
-
-  it("reads the username from $USER when no account is given", () => {
-    vi.stubEnv("USER", "ci-runner");
-    expect(claudeKeychainAccount()).toBe("ci-runner");
-
-    vi.stubEnv("USER", "first.last@example.com");
-    expect(claudeKeychainAccount()).toBe("claude-code-user");
-  });
-});
-
-describe("readClaudeKeychainCredentials", () => {
-  it("looks the item up by account and stops there when it exists", async () => {
-    const run = vi.fn(async () => JSON.stringify({ claudeAiOauth: { accessToken: "at_fresh" } }));
-
-    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
-
-    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_fresh" } });
-    expect(run).toHaveBeenCalledTimes(1);
-    expect(run).toHaveBeenCalledWith([
-      "find-generic-password",
-      "-a",
-      "claude-code-user",
-      "-w",
-      "-s",
-      SERVICE,
-    ]);
-  });
-
-  it("falls back to the account-less lookup when no item matches the account", async () => {
-    const run = vi.fn(async (args: string[]) =>
-      args.includes("-a") ? null : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
-    );
-
-    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
-
-    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_legacy" } });
-    expect(run).toHaveBeenNthCalledWith(2, ["find-generic-password", "-w", "-s", SERVICE]);
-  });
-
-  it("falls through when the account item carries no access token", async () => {
-    const run = vi.fn(async (args: string[]) =>
-      args.includes("-a")
-        ? JSON.stringify({ claudeAiOauth: { subscriptionType: "team" } })
-        : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
-    );
-
-    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
-
-    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_legacy" } });
-    expect(run).toHaveBeenCalledTimes(2);
-  });
-
-  it("is null when the Keychain holds no item at all", async () => {
-    const run = vi.fn(async () => null);
-
-    expect(await readClaudeKeychainCredentials(run, "claude-code-user")).toBeNull();
-  });
-
-  it("tries the next lookup when the item does not parse", async () => {
-    const run = vi.fn(async (args: string[]) =>
-      args.includes("-a")
-        ? "not-json"
-        : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
-    );
-
-    expect(await readClaudeKeychainCredentials(run, "claude-code-user")).toEqual({
-      claudeAiOauth: { accessToken: "at_legacy" },
-    });
-  });
-});
diff --git a/packages/server/src/services/quota-fetcher/providers/claude.ts b/packages/server/src/services/quota-fetcher/providers/claude.ts
deleted file mode 100644
index 75d6ed74dd..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/claude.ts
+++ /dev/null
@@ -1,480 +0,0 @@
-import { execFile } from "node:child_process";
-import { existsSync, promises as fs } from "node:fs";
-import { homedir, userInfo } from "node:os";
-import { join } from "node:path";
-import { promisify } from "node:util";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type {
-  ProviderUsage,
-  ProviderUsageDetail,
-  ProviderUsageWindow,
-} from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import {
-  ApiNumberSchema,
-  fetchProviderApi,
-  toneFromUsedPct,
-  unavailableUsage,
-  windowFromUsedPct,
-} from "../usage.js";
-
-const execFileAsync = promisify(execFile);
-const CLAUDE_KEYCHAIN_TIMEOUT_MS = 2_000;
-const CLAUDE_OAUTH_BETA = "oauth-2025-04-20";
-const CLAUDE_KEYCHAIN_SERVICE = "Claude Code-credentials";
-
-const ClaudeCredentialsSchema = z.object({
-  claudeAiOauth: z
-    .object({
-      accessToken: z.string().optional(),
-      refreshToken: z.string().optional(),
-      subscriptionType: z.string().optional(),
-      rateLimitTier: z.string().optional(),
-    })
-    .optional(),
-});
-
-const ClaudeUsageWindowSchema = z.object({
-  utilization: ApiNumberSchema,
-  resets_at: z.string().nullish(),
-});
-
-// Model- and surface-scoped weekly limits live in a `limits[]` array rather than a
-// top-level `seven_day_<model>` key. Entries are validated one at a time (see
-// scopedLimitsFromResponse) so a single malformed or newly-shaped entry cannot take down
-// the windows that already parsed from the top-level keys.
-const ClaudeScopeLabelSchema = z
-  .object({ id: z.string().nullish(), display_name: z.string().nullish() })
-  .nullish();
-
-const ClaudeLimitSchema = z.object({
-  kind: z.string(),
-  percent: ApiNumberSchema.nullish(),
-  resets_at: z.string().nullish(),
-  scope: z.object({ model: ClaudeScopeLabelSchema, surface: ClaudeScopeLabelSchema }).nullish(),
-});
-
-const ClaudeUsageResponseSchema = z.object({
-  five_hour: ClaudeUsageWindowSchema.nullish(),
-  seven_day: ClaudeUsageWindowSchema.nullish(),
-  seven_day_opus: ClaudeUsageWindowSchema.nullish(),
-  seven_day_omelette: ClaudeUsageWindowSchema.nullish(),
-  // Deliberately permissive: an additive section must never regress the top-level
-  // windows, so shape validation happens per entry rather than here.
-  limits: z.array(z.unknown()).nullish(),
-  extra_usage: z
-    .object({
-      is_enabled: z.boolean().optional(),
-    })
-    .nullish(),
-});
-
-type ClaudeCredentials = z.infer<typeof ClaudeCredentialsSchema>;
-type ClaudeUsageResponse = z.infer<typeof ClaudeUsageResponseSchema>;
-type ClaudeLimit = z.infer<typeof ClaudeLimitSchema>;
-
-const SCOPED_WEEKLY_KIND = "weekly_scoped";
-
-interface ClaudeCredentialRecord {
-  oauth: { accessToken: string } & NonNullable<ClaudeCredentials["claudeAiOauth"]>;
-}
-
-interface ClaudeQuotaProviderOptions {
-  logger: Logger;
-  claudeHome?: string;
-  claudeKeychainReader?: () => Promise<unknown | null>;
-  platform?: typeof process.platform;
-  fetch?: ProviderApiFetch;
-}
-
-function buildClaudePlan(
-  subscriptionType: string | undefined,
-  rateLimitTier: string | undefined,
-): string | null {
-  if (!subscriptionType) return null;
-  const label = subscriptionType.charAt(0).toUpperCase() + subscriptionType.slice(1);
-  const tier = rateLimitTier?.split("_").pop();
-  return tier ? `${label} ${tier}` : label;
-}
-
-/**
- * A weekly limit scoped to one model or one surface, normalized away from whichever
- * shape of the response described it.
- *
- * The API describes the same limit two ways during the migration: a legacy top-level
- * `seven_day_<model>` key, and an entry in `limits[]`. Everything downstream works on
- * this one representation so the two shapes are reconciled exactly once, in
- * `reconcileScopedLimits`, rather than at each place a window is built.
- */
-interface ScopedLimit {
-  dimension: "model" | "surface";
-  /** The API's own identifier. Null on every response observed so far. */
-  id: string | null;
-  /** Display name, or the id when the API sends no display name. */
-  name: string;
-  usedPct: number | null;
-  resetsAt: string | null;
-}
-
-// Windows that describe no particular model or surface.
-const UNSCOPED_WINDOWS: ReadonlyArray<{
-  field: "five_hour" | "seven_day";
-  id: string;
-  label: string;
-}> = [
-  { field: "five_hour", id: "five_hour", label: "Session" },
-  { field: "seven_day", id: "weekly", label: "Weekly" },
-];
-
-// Scoped windows from before `limits[]` existed. Declaring the dimension here is what
-// stops a *surface* named "Omelette" from being mistaken for the legacy Omelette *model*
-// window: these keys are model-scoped by definition.
-const LEGACY_SCOPED_WINDOWS: ReadonlyArray<{
-  field: "seven_day_opus" | "seven_day_omelette";
-  name: string;
-}> = [
-  { field: "seven_day_opus", name: "Opus" },
-  { field: "seven_day_omelette", name: "Omelette" },
-];
-
-/** Fold a name down to the characters an id is allowed to carry. */
-function normalizeName(name: string): string {
-  return name
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "_")
-    .replace(/^_+|_+$/g, "");
-}
-
-/**
- * Whether two descriptions denote the same limit. This is the single definition of
- * identity for scoped limits; nothing else may compare them, and in particular nothing
- * may compare display labels, which are presentation rather than identity.
- *
- * - Different dimensions are never the same limit, so a surface and a model sharing a
- *   name stay apart.
- * - When both sides carry the API's own id, that id decides, so `fable-pro` and
- *   `fable_pro` stay apart.
- * - Otherwise fall back to the normalized name, which is the only link available between
- *   a legacy key (never has an id) and its `limits[]` counterpart.
- */
-function isSameLimit(a: ScopedLimit, b: ScopedLimit): boolean {
-  if (a.dimension !== b.dimension) return false;
-  if (a.id && b.id) return a.id === b.id;
-  return normalizeName(a.name) === normalizeName(b.name);
-}
-
-/**
- * Merge the legacy and `limits[]` descriptions into one limit per identity.
- *
- * A `limits[]` entry wins on identity because that is the representation the API is
- * migrating towards, so a limit keeps the same window id whichever shape carried it.
- * Its values are nullable though, so each field falls back to the legacy twin instead of
- * discarding a number the response did contain.
- */
-function reconcileScopedLimits(
-  legacy: ScopedLimit[],
-  fromLimitsArray: ScopedLimit[],
-): ScopedLimit[] {
-  const reconciled = [...legacy];
-  for (const limit of fromLimitsArray) {
-    const index = reconciled.findIndex((candidate) => isSameLimit(candidate, limit));
-    if (index === -1) {
-      reconciled.push(limit);
-      continue;
-    }
-    const twin = reconciled[index];
-    reconciled[index] = {
-      ...limit,
-      usedPct: limit.usedPct ?? twin?.usedPct ?? null,
-      resetsAt: limit.resetsAt ?? twin?.resetsAt ?? null,
-    };
-  }
-  return reconciled;
-}
-
-function scopedLimitFromLegacy(
-  spec: (typeof LEGACY_SCOPED_WINDOWS)[number],
-  window: z.infer<typeof ClaudeUsageWindowSchema>,
-): ScopedLimit {
-  return {
-    dimension: "model",
-    id: null,
-    name: spec.name,
-    usedPct: window.utilization,
-    resetsAt: window.resets_at ?? null,
-  };
-}
-
-/** The scope of a `limits[]` entry, or null when it names nothing renderable. */
-function scopedLimitFromEntry(limit: ClaudeLimit): ScopedLimit | null {
-  for (const dimension of ["model", "surface"] as const) {
-    const entry = limit.scope?.[dimension];
-    const id = entry?.id?.trim() || null;
-    const name = entry?.display_name?.trim() || id;
-    if (name) {
-      return {
-        dimension,
-        id,
-        name,
-        usedPct: limit.percent ?? null,
-        resetsAt: limit.resets_at ?? null,
-      };
-    }
-  }
-  return null;
-}
-
-// The client uses window ids as React keys, so they must be stable across refreshes and
-// unique within a response. An API-supplied id is already an identifier and is used
-// verbatim (ids elsewhere carry punctuation too, e.g. MiniMax's `interval_MiniMax-M2.7`);
-// only a name fallback is normalized. Normalizing an id would collapse `fable-pro` and
-// `fable_pro` into one window.
-function scopedWindowId(limit: ScopedLimit): string {
-  return `weekly_${limit.dimension}_${limit.id ?? normalizeName(limit.name)}`;
-}
-
-// Backstop for the one residual case identity cannot rule out: an entry whose verbatim id
-// equals another entry's normalized name. Suffix rather than drop, because a missing bar
-// is the bug this change exists to fix.
-function uniqueWindowId(candidate: string, taken: Set<string>): string {
-  if (!taken.has(candidate)) return candidate;
-  for (let suffix = 2; ; suffix += 1) {
-    const next = `${candidate}_${suffix}`;
-    if (!taken.has(next)) return next;
-  }
-}
-
-function legacyScopedLimits(resp: ClaudeUsageResponse): ScopedLimit[] {
-  const limits: ScopedLimit[] = [];
-  for (const spec of LEGACY_SCOPED_WINDOWS) {
-    const window = resp[spec.field];
-    if (window) limits.push(scopedLimitFromLegacy(spec, window));
-  }
-  return limits;
-}
-
-function unscopedWindows(resp: ClaudeUsageResponse): ProviderUsageWindow[] {
-  const windows: ProviderUsageWindow[] = [];
-  for (const spec of UNSCOPED_WINDOWS) {
-    const window = resp[spec.field];
-    if (!window) continue;
-    windows.push(
-      windowFromUsedPct({
-        id: spec.id,
-        label: spec.label,
-        utilizationPct: window.utilization,
-        resetsAt: window.resets_at ?? null,
-        tone: toneFromUsedPct(window.utilization),
-      }),
-    );
-  }
-  return windows;
-}
-
-function scopedWindows(limits: ScopedLimit[]): ProviderUsageWindow[] {
-  const taken = new Set<string>();
-  return limits.map((limit) => {
-    const id = uniqueWindowId(scopedWindowId(limit), taken);
-    taken.add(id);
-    // Emitted even at 0% and inactive: a zero bar answers "how much of this model have I
-    // used", and the bar must not come and go between refreshes.
-    return windowFromUsedPct({
-      id,
-      label: `Weekly \u00b7 ${limit.name}`,
-      utilizationPct: limit.usedPct,
-      resetsAt: limit.resetsAt,
-      tone: toneFromUsedPct(limit.usedPct),
-    });
-  });
-}
-
-type ClaudeKeychainCommandRunner = (args: string[]) => Promise<string | null>;
-
-// Keep this in sync with Claude Code's Keychain account derivation.
-const CLAUDE_KEYCHAIN_ACCOUNT_PATTERN = /^[a-zA-Z0-9._-]+$/;
-const CLAUDE_KEYCHAIN_FALLBACK_ACCOUNT = "claude-code-user";
-
-export function claudeKeychainAccount(
-  user: string = process.env["USER"] || userInfo().username,
-): string {
-  return CLAUDE_KEYCHAIN_ACCOUNT_PATTERN.test(user) ? user : CLAUDE_KEYCHAIN_FALLBACK_ACCOUNT;
-}
-
-async function runSecurityCommand(args: string[]): Promise<string | null> {
-  try {
-    const { stdout } = await execFileAsync("security", args, {
-      timeout: CLAUDE_KEYCHAIN_TIMEOUT_MS,
-    });
-    return stdout.trim() || null;
-  } catch {
-    return null;
-  }
-}
-
-/** Read Claude Code's account-specific Keychain item, then try the legacy lookup. */
-export async function readClaudeKeychainCredentials(
-  run: ClaudeKeychainCommandRunner = runSecurityCommand,
-  account: string = claudeKeychainAccount(),
-): Promise<unknown | null> {
-  const lookups = [
-    ["find-generic-password", "-a", account, "-w", "-s", CLAUDE_KEYCHAIN_SERVICE],
-    ["find-generic-password", "-w", "-s", CLAUDE_KEYCHAIN_SERVICE],
-  ];
-
-  for (const args of lookups) {
-    const raw = await run(args);
-    if (!raw) continue;
-    let parsed: unknown;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    const creds = ClaudeCredentialsSchema.safeParse(parsed);
-    if (creds.success && creds.data.claudeAiOauth?.accessToken) return parsed;
-  }
-  return null;
-}
-
-export class ClaudeQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "claude";
-  readonly displayName = "Claude";
-
-  private readonly logger: Logger;
-  private readonly claudeHome: string;
-  private readonly readKeychainCredentials: () => Promise<unknown | null>;
-  private readonly platform: typeof process.platform;
-  private readonly fetchApi: ProviderApiFetch;
-
-  constructor(options: ClaudeQuotaProviderOptions) {
-    this.logger = options.logger.child({ module: "claude-quota-provider" });
-    this.claudeHome =
-      options.claudeHome || process.env["CLAUDE_HOME"] || join(homedir(), ".claude");
-    this.readKeychainCredentials = options.claudeKeychainReader ?? readClaudeKeychainCredentials;
-    this.platform = options.platform ?? process.platform;
-    this.fetchApi = options.fetch ?? fetch;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const credentials = await this.readCredentials();
-    if (!credentials) {
-      return unavailableUsage(this);
-    }
-
-    const { oauth } = credentials;
-    const plan = buildClaudePlan(oauth.subscriptionType, oauth.rateLimitTier);
-    const resp = await this.callClaudeApi(oauth.accessToken);
-
-    if (resp === "NEEDS_AUTH") {
-      // Read-only on credentials; the Claude CLI owns refresh. See docs/providers.md.
-      return unavailableUsage(this);
-    }
-
-    const scoped = reconcileScopedLimits(
-      legacyScopedLimits(resp),
-      this.scopedLimitsFromResponse(resp.limits),
-    );
-    const windows = [...unscopedWindows(resp), ...scopedWindows(scoped)];
-
-    if (windows.length === 0) {
-      // The response parsed but described nothing. That silence is how the previous
-      // shape change went unnoticed, so make it greppable. `warn` and not `debug`
-      // because file logging defaults to `info`.
-      this.logger.warn("Claude usage response parsed but produced no windows");
-    }
-
-    const details: ProviderUsageDetail[] = [];
-    const extraUsageEnabled = resp.extra_usage?.is_enabled;
-    if (extraUsageEnabled !== undefined) {
-      details.push({
-        id: "extra_usage",
-        label: "Extra usage",
-        value: extraUsageEnabled ? "Enabled" : "Disabled",
-      });
-    }
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: plan,
-      windows,
-      balances: [],
-      details,
-      error: null,
-    };
-  }
-
-  /**
-   * Scoped limits carried by `limits[]`.
-   *
-   * Entries are validated one at a time so a single malformed or newly-shaped entry
-   * cannot fail the whole response and take the windows that already parsed with it.
-   */
-  private scopedLimitsFromResponse(limits: ClaudeUsageResponse["limits"]): ScopedLimit[] {
-    if (!limits) return [];
-
-    const parsed: ScopedLimit[] = [];
-    for (const entry of limits) {
-      const result = ClaudeLimitSchema.safeParse(entry);
-      if (!result.success) {
-        this.logger.warn({ err: result.error }, "Skipping unparseable Claude usage limit entry");
-        continue;
-      }
-      if (result.data.kind !== SCOPED_WEEKLY_KIND) continue;
-
-      const limit = scopedLimitFromEntry(result.data);
-      if (!limit) {
-        this.logger.warn("Skipping scoped Claude usage limit with no resolvable scope name");
-        continue;
-      }
-      parsed.push(limit);
-    }
-    return parsed;
-  }
-
-  private async readCredentials(): Promise<ClaudeCredentialRecord | null> {
-    const credPath = join(this.claudeHome, ".credentials.json");
-    const fileCredentials = await this.readCredentialFile(credPath);
-    return (
-      fileCredentials ?? (this.platform === "darwin" ? await this.readKeychainCredential() : null)
-    );
-  }
-
-  private async readCredentialFile(path: string): Promise<ClaudeCredentialRecord | null> {
-    if (!existsSync(path)) return null;
-    try {
-      return this.toCredentialRecord(
-        ClaudeCredentialsSchema.parse(JSON.parse(await fs.readFile(path, "utf8"))),
-      );
-    } catch {
-      return null;
-    }
-  }
-
-  private async readKeychainCredential(): Promise<ClaudeCredentialRecord | null> {
-    const parsed = ClaudeCredentialsSchema.safeParse(await this.readKeychainCredentials());
-    return parsed.success ? this.toCredentialRecord(parsed.data) : null;
-  }
-
-  private toCredentialRecord(
-    credentials: z.infer<typeof ClaudeCredentialsSchema>,
-  ): ClaudeCredentialRecord | null {
-    const oauth = credentials.claudeAiOauth;
-    return oauth?.accessToken ? { oauth: { ...oauth, accessToken: oauth.accessToken } } : null;
-  }
-
-  private async callClaudeApi(token: string): Promise<ClaudeUsageResponse | "NEEDS_AUTH"> {
-    const res = await fetchProviderApi(this.fetchApi, "https://api.anthropic.com/api/oauth/usage", {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        Accept: "application/json",
-        "anthropic-beta": CLAUDE_OAUTH_BETA,
-      },
-    });
-    if (res.status === 401 || res.status === 403) return "NEEDS_AUTH";
-    if (!res.ok) throw new Error(`Claude usage API returned ${res.status}`);
-    return ClaudeUsageResponseSchema.parse(await res.json());
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/codex.ts b/packages/server/src/services/quota-fetcher/providers/codex.ts
deleted file mode 100644
index 78a1f7d26b..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/codex.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { existsSync, promises as fs } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type {
-  ProviderUsage,
-  ProviderUsageBalance,
-  ProviderUsageWindow,
-} from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import {
-  ApiNumberSchema,
-  balanceToneFromRemaining,
-  toneFromUsedPct,
-  fetchProviderApi,
-  unavailableUsage,
-  windowFromUsedPct,
-} from "../usage.js";
-
-const CodexAuthSchema = z.object({
-  tokens: z
-    .object({
-      access_token: z.string().optional(),
-      refresh_token: z.string().optional(),
-      account_id: z.string().optional(),
-    })
-    .optional(),
-});
-
-const CodexWindowSchema = z.object({
-  used_percent: ApiNumberSchema.optional(),
-  reset_at: ApiNumberSchema.optional(),
-});
-
-const CodexUsageResponseSchema = z.object({
-  plan_type: z.string().optional(),
-  email: z.string().optional(),
-  rate_limit: z
-    .object({
-      primary_window: CodexWindowSchema.nullish(),
-      secondary_window: CodexWindowSchema.nullish(),
-    })
-    .nullish(),
-  code_review_rate_limit: z
-    .object({
-      primary_window: CodexWindowSchema.nullish(),
-    })
-    .nullish(),
-  credits: z
-    .object({
-      has_credits: z.boolean().optional(),
-      unlimited: z.boolean().optional(),
-      balance: ApiNumberSchema.optional(),
-    })
-    .nullish(),
-});
-
-type CodexAuth = z.infer<typeof CodexAuthSchema>;
-type CodexWindow = z.infer<typeof CodexWindowSchema>;
-type CodexUsageResponse = z.infer<typeof CodexUsageResponseSchema>;
-
-interface CodexQuotaProviderOptions {
-  logger: Logger;
-  codexHome?: string;
-  fetch?: ProviderApiFetch;
-}
-
-function codexWindow(
-  window: CodexWindow | null | undefined,
-): { usedPct: number; resetsAt: string | null } | null {
-  if (!window) return null;
-  return {
-    usedPct: window.used_percent ?? 0,
-    resetsAt: window.reset_at != null ? new Date(window.reset_at * 1000).toISOString() : null,
-  };
-}
-
-export class CodexQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "codex";
-  readonly displayName = "Codex";
-
-  private readonly codexHome: string;
-  private readonly fetchApi: ProviderApiFetch;
-
-  constructor(options: CodexQuotaProviderOptions) {
-    this.codexHome = options.codexHome || process.env["CODEX_HOME"] || join(homedir(), ".codex");
-    this.fetchApi = options.fetch ?? fetch;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const auth = await this.readCodexAuth();
-    const accessToken = auth?.tokens?.access_token;
-    if (!auth || !accessToken) {
-      return unavailableUsage(this);
-    }
-
-    const { account_id } = auth.tokens ?? {};
-    const resp = await this.callCodexApi(accessToken, account_id);
-
-    if (resp === "NEEDS_AUTH") {
-      // Read-only on credentials; the Codex CLI owns refresh. See docs/providers.md.
-      return unavailableUsage(this);
-    }
-
-    return this.toUsage(resp);
-  }
-
-  private toUsage(resp: CodexUsageResponse): ProviderUsage {
-    const session = codexWindow(resp.rate_limit?.primary_window);
-    const weekly = codexWindow(resp.rate_limit?.secondary_window);
-    const codeReview = codexWindow(resp.code_review_rate_limit?.primary_window);
-    const windows: ProviderUsageWindow[] = [];
-
-    if (session) {
-      windows.push(
-        windowFromUsedPct({
-          id: "session",
-          label: "Session",
-          utilizationPct: session.usedPct,
-          resetsAt: session.resetsAt,
-          tone: toneFromUsedPct(session.usedPct),
-        }),
-      );
-    }
-    if (weekly) {
-      windows.push(
-        windowFromUsedPct({
-          id: "weekly",
-          label: "Weekly",
-          utilizationPct: weekly.usedPct,
-          resetsAt: weekly.resetsAt,
-          tone: toneFromUsedPct(weekly.usedPct),
-        }),
-      );
-    }
-    if (codeReview) {
-      windows.push(
-        windowFromUsedPct({
-          id: "code_review",
-          label: "Code review",
-          utilizationPct: codeReview.usedPct,
-          resetsAt: codeReview.resetsAt,
-          tone: toneFromUsedPct(codeReview.usedPct),
-        }),
-      );
-    }
-
-    const balances: ProviderUsageBalance[] = [];
-    if (resp.credits?.balance !== undefined) {
-      balances.push({
-        id: "credits",
-        label: "Credits",
-        remaining: resp.credits.balance,
-        unit: "usd",
-        tone: balanceToneFromRemaining(resp.credits.balance),
-      });
-    }
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: resp.plan_type ?? null,
-      windows,
-      balances,
-      details: [],
-      error: null,
-    };
-  }
-
-  private async readCodexAuth(): Promise<CodexAuth | null> {
-    const candidates = [
-      ...(process.env["CODEX_HOME"] ? [join(process.env["CODEX_HOME"], "auth.json")] : []),
-      join(homedir(), ".config", "codex", "auth.json"),
-      join(this.codexHome, "auth.json"),
-    ];
-    for (const path of candidates) {
-      if (!existsSync(path)) continue;
-      try {
-        const auth = CodexAuthSchema.parse(JSON.parse(await fs.readFile(path, "utf8")));
-        if (auth.tokens?.access_token) return auth;
-      } catch {
-        continue;
-      }
-    }
-    return null;
-  }
-
-  private async callCodexApi(
-    token: string,
-    accountId?: string,
-  ): Promise<CodexUsageResponse | "NEEDS_AUTH"> {
-    const headers: Record<string, string> = {
-      Authorization: `Bearer ${token}`,
-      Accept: "application/json",
-      "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)",
-    };
-    if (accountId) headers["ChatGPT-Account-Id"] = accountId;
-
-    const res = await fetchProviderApi(
-      this.fetchApi,
-      "https://chatgpt.com/backend-api/wham/usage",
-      {
-        headers,
-      },
-    );
-    if (res.status === 401 || res.status === 403) return "NEEDS_AUTH";
-    if (!res.ok) throw new Error(`Codex usage API returned ${res.status}`);
-    const text = await res.text();
-    if (text.trim().startsWith("<")) return "NEEDS_AUTH";
-    return CodexUsageResponseSchema.parse(JSON.parse(text));
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/copilot.ts b/packages/server/src/services/quota-fetcher/providers/copilot.ts
deleted file mode 100644
index f8b4f3183e..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/copilot.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { existsSync, promises as fs } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type { ProviderUsage, ProviderUsageDetail } from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import { ApiOptionalStringSchema, fetchProviderApi, unavailableUsage } from "../usage.js";
-
-const CopilotUsageResponseSchema = z.object({
-  copilot_plan: ApiOptionalStringSchema,
-  quota_reset_date: ApiOptionalStringSchema,
-});
-
-interface CopilotQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-}
-
-async function readGithubCliToken(): Promise<string | null> {
-  const candidates: string[] = [];
-  if (process.env["APPDATA"]) {
-    candidates.push(join(process.env["APPDATA"], "GitHub CLI", "hosts.yml"));
-  }
-  candidates.push(join(homedir(), ".config", "gh", "hosts.yml"));
-
-  for (const path of candidates) {
-    if (!existsSync(path)) continue;
-    try {
-      const raw = await fs.readFile(path, "utf8");
-      const match = raw.match(/oauth_token:\s*["']?([a-zA-Z0-9_-]+)["']?/);
-      if (match?.[1]) return match[1];
-    } catch {
-      continue;
-    }
-  }
-  return null;
-}
-
-export class CopilotQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "copilot";
-  readonly displayName = "GitHub Copilot";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-
-  constructor(options: CopilotQuotaProviderOptions) {
-    this.logger = options.logger;
-    this.fetchApi = options.fetch ?? fetch;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const token =
-      process.env["COPILOT_TOKEN"] ||
-      process.env["GITHUB_TOKEN"] ||
-      process.env["GITHUB_PAT"] ||
-      (await readGithubCliToken());
-
-    if (!token) return unavailableUsage(this);
-
-    const res = await fetchProviderApi(
-      this.fetchApi,
-      "https://api.github.com/copilot_internal/user",
-      {
-        headers: {
-          Authorization: `token ${token}`,
-          Accept: "application/json",
-          "Editor-Version": "vscode/1.96.2",
-          "Editor-Plugin-Version": "copilot-chat/0.26.7",
-          "User-Agent": "GitHubCopilotChat/0.26.7",
-          "X-Github-Api-Version": "2025-04-01",
-        },
-      },
-    );
-
-    if (!res.ok) {
-      this.logger.debug({ status: res.status }, "Copilot usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const resp = CopilotUsageResponseSchema.parse(await res.json());
-    const details: ProviderUsageDetail[] = resp.quota_reset_date
-      ? [{ id: "reset", label: "Quota reset", value: resp.quota_reset_date }]
-      : [];
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: resp.copilot_plan || null,
-      windows: [],
-      balances: [],
-      details,
-      error: null,
-    };
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/cursor.ts b/packages/server/src/services/quota-fetcher/providers/cursor.ts
deleted file mode 100644
index fb1cf94939..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/cursor.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type { ProviderUsage, ProviderUsageBalance } from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import {
-  ApiNullableNumberSchema,
-  toneFromUsedPct,
-  usedPctOf,
-  fetchProviderApi,
-  toIsoStringOrNull,
-  unavailableUsage,
-} from "../usage.js";
-
-// Cursor desktop stores auth in VS Code's ItemTable (state.vscdb). Modern builds keep
-// the access token as a plain JWT string under `cursorAuth/accessToken`; older builds
-// kept a JSON blob under `cursorAuthStatus`. Read it with node:sqlite so we don't
-// depend on a `sqlite3` CLI, which isn't installed by default on Windows (or on many
-// Linux hosts) — a missing binary silently rendered Cursor usage unavailable.
-// Headless hosts (VPS, cursor-agent only) have no desktop db; their session lives in
-// ~/.config/cursor/auth.json instead.
-const CURSOR_ACCESS_TOKEN_KEY = "cursorAuth/accessToken";
-const CURSOR_LEGACY_AUTH_KEY = "cursorAuthStatus";
-
-// @types/node@20 predates the node:sqlite typings; declare the slice we use.
-interface CursorStateStatement {
-  get(...params: unknown[]): Record<string, unknown> | undefined;
-}
-interface CursorStateDatabase {
-  prepare(sql: string): CursorStateStatement;
-  close(): void;
-}
-interface NodeSqliteModule {
-  DatabaseSync: new (path: string, options?: { readOnly?: boolean }) => CursorStateDatabase;
-}
-
-const CursorBillingCycleTimestampSchema = z.preprocess(
-  (value) => (typeof value === "string" || typeof value === "number" ? value : null),
-  z.union([z.string(), z.number()]).nullable(),
-);
-
-const CursorUsageResponseSchema = z.object({
-  planUsage: z
-    .object({
-      totalSpend: ApiNullableNumberSchema,
-      includedSpend: ApiNullableNumberSchema,
-      bonusSpend: ApiNullableNumberSchema,
-      remaining: ApiNullableNumberSchema,
-      limit: ApiNullableNumberSchema,
-    })
-    .nullish(),
-  billingCycleStart: CursorBillingCycleTimestampSchema,
-  billingCycleEnd: CursorBillingCycleTimestampSchema,
-});
-
-const CursorAuthStatusSchema = z.object({
-  accessToken: z.string().optional(),
-});
-
-type CursorUsageResponse = z.infer<typeof CursorUsageResponseSchema>;
-
-interface CursorQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-  homeDir?: string;
-}
-
-function parseCursorBillingCycleTimestamp(
-  value: CursorUsageResponse["billingCycleStart"],
-): string | null {
-  if (value === null) return null;
-
-  const raw = String(value).trim();
-  if (!raw) return null;
-
-  const numeric = Number(raw);
-  if (Number.isFinite(numeric)) {
-    const timestampMs = Math.abs(numeric) < 10_000_000_000 ? numeric * 1000 : numeric;
-    return toIsoStringOrNull(timestampMs);
-  }
-
-  return toIsoStringOrNull(new Date(raw).getTime());
-}
-
-function centsToDollars(value: number | null): number | null {
-  return value === null ? null : value / 100;
-}
-
-function readItemTableValue(db: CursorStateDatabase, key: string): string | null {
-  const row = db.prepare("SELECT value FROM ItemTable WHERE key = ?").get(key);
-  const value = row?.["value"];
-  if (typeof value === "string") return value;
-  if (value instanceof Uint8Array) return Buffer.from(value).toString("utf8");
-  return null;
-}
-
-function cursorTokenFromDb(db: CursorStateDatabase): string | null {
-  const modern = readItemTableValue(db, CURSOR_ACCESS_TOKEN_KEY)?.trim();
-  if (modern) return modern;
-
-  const legacy = readItemTableValue(db, CURSOR_LEGACY_AUTH_KEY);
-  if (legacy) {
-    try {
-      const parsed = CursorAuthStatusSchema.parse(JSON.parse(legacy));
-      if (parsed.accessToken) return parsed.accessToken;
-    } catch {
-      // ignore a malformed legacy blob
-    }
-  }
-  return null;
-}
-
-async function readCursorTokenFromSqlite(homeDir: string, logger: Logger): Promise<string | null> {
-  const dbPaths: string[] = [];
-  if (process.env["APPDATA"]) {
-    dbPaths.push(join(process.env["APPDATA"], "Cursor", "User", "globalStorage", "state.vscdb"));
-  }
-  dbPaths.push(
-    join(
-      homeDir,
-      "Library",
-      "Application Support",
-      "Cursor",
-      "User",
-      "globalStorage",
-      "state.vscdb",
-    ),
-  );
-  dbPaths.push(join(homeDir, ".config", "Cursor", "User", "globalStorage", "state.vscdb"));
-
-  // Held in a variable so TypeScript skips module resolution: @types/node@20 has no
-  // node:sqlite typings yet, while the runtime (Node 22+ / Electron) provides it.
-  const sqliteSpecifier: string = "node:sqlite";
-  let sqlite: NodeSqliteModule;
-  try {
-    sqlite = (await import(sqliteSpecifier)) as unknown as NodeSqliteModule;
-  } catch (err) {
-    logger.debug({ err }, "node:sqlite unavailable; cannot read Cursor state.vscdb");
-    return null; // runtime without node:sqlite
-  }
-
-  for (const path of dbPaths) {
-    if (!existsSync(path)) continue;
-    let db: CursorStateDatabase | undefined;
-    try {
-      db = new sqlite.DatabaseSync(path, { readOnly: true });
-      const token = cursorTokenFromDb(db);
-      if (token) return token;
-    } catch (err) {
-      // Locked/permission/corrupt/schema failures all land here; log so an
-      // unavailable Cursor card is diagnosable, then try the next candidate.
-      logger.debug({ err, path }, "Failed to read Cursor token from state.vscdb");
-    } finally {
-      db?.close();
-    }
-  }
-  return null;
-}
-
-async function readCursorTokenFromAuthJson(
-  homeDir: string,
-  logger: Logger,
-): Promise<string | null> {
-  const path = join(homeDir, ".config", "cursor", "auth.json");
-  if (!existsSync(path)) return null;
-  try {
-    const parsed = CursorAuthStatusSchema.parse(JSON.parse(await readFile(path, "utf8")));
-    return parsed.accessToken?.trim() || null;
-  } catch (err) {
-    logger.debug({ err, path }, "Failed to read Cursor token from auth.json");
-    return null;
-  }
-}
-
-export class CursorQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "cursor";
-  readonly displayName = "Cursor";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-  private readonly homeDir: string;
-
-  constructor(options: CursorQuotaProviderOptions) {
-    this.logger = options.logger;
-    this.fetchApi = options.fetch ?? fetch;
-    this.homeDir = options.homeDir ?? homedir();
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const token =
-      process.env["CURSOR_ACCESS_TOKEN"] ||
-      process.env["CURSOR_TOKEN"] ||
-      (await readCursorTokenFromSqlite(this.homeDir, this.logger)) ||
-      (await readCursorTokenFromAuthJson(this.homeDir, this.logger));
-
-    if (!token) return unavailableUsage(this);
-
-    const res = await fetchProviderApi(
-      this.fetchApi,
-      "https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage",
-      {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "application/json",
-          "Connect-Protocol-Version": "1",
-        },
-        body: JSON.stringify({}),
-      },
-    );
-
-    if (!res.ok) {
-      this.logger.debug({ status: res.status }, "Cursor usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const resp = CursorUsageResponseSchema.parse(await res.json());
-    const billingCycleEnd = parseCursorBillingCycleTimestamp(resp.billingCycleEnd);
-    const balances: ProviderUsageBalance[] = [];
-    if (resp.planUsage) {
-      const totalSpend = centsToDollars(resp.planUsage.totalSpend);
-      const remaining = centsToDollars(resp.planUsage.remaining);
-      const limit = centsToDollars(resp.planUsage.limit);
-      balances.push({
-        id: "plan_usage",
-        label: "Plan usage",
-        used: totalSpend,
-        remaining,
-        limit,
-        unit: "usd",
-        resetsAt: billingCycleEnd,
-        tone: toneFromUsedPct(usedPctOf(totalSpend, limit)),
-      });
-    }
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: null,
-      windows: [],
-      balances,
-      details: [],
-      error: null,
-    };
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/grok.ts b/packages/server/src/services/quota-fetcher/providers/grok.ts
deleted file mode 100644
index 83e7fde837..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/grok.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import { existsSync, promises as fs } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type {
-  ProviderUsage,
-  ProviderUsageBalance,
-  ProviderUsageWindow,
-} from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import {
-  ApiNumberSchema,
-  ApiOptionalStringSchema,
-  toneFromUsedPct,
-  usedPctOf,
-  fetchProviderApi,
-  unavailableUsage,
-  windowFromUsedPct,
-} from "../usage.js";
-
-const GrokUsageResponseSchema = z.object({
-  config: z
-    .object({
-      monthlyLimit: z
-        .object({
-          val: ApiNumberSchema.optional(),
-        })
-        .nullish(),
-      used: z
-        .object({
-          val: ApiNumberSchema.optional(),
-        })
-        .nullish(),
-      creditUsagePercent: ApiNumberSchema.optional(),
-      currentPeriod: z
-        .object({
-          type: ApiOptionalStringSchema,
-          end: ApiOptionalStringSchema,
-        })
-        .nullish(),
-    })
-    .nullish(),
-  usage: z
-    .object({
-      creditUsage: ApiNumberSchema.optional(),
-    })
-    .nullish(),
-});
-
-interface GrokQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-  /** Override home directory (tests). Production uses os.homedir(). */
-  homeDir?: string;
-}
-
-/** Resolve a Grok CLI token from ~/.grok/auth.json (legacy or current nested shape). */
-export function extractGrokTokenFromAuth(auth: unknown): string | null {
-  if (auth == null || typeof auth !== "object" || Array.isArray(auth)) return null;
-  const record = auth as Record<string, unknown>;
-
-  const topLevel = record["access_token"];
-  if (typeof topLevel === "string" && topLevel.length > 0) {
-    return topLevel;
-  }
-
-  const entries = Object.entries(record);
-  const preferred = entries.filter(([key]) => key.startsWith("https://auth.x.ai::"));
-  const candidates = preferred.length > 0 ? preferred : entries;
-
-  for (const [, value] of candidates) {
-    if (value == null || typeof value !== "object" || Array.isArray(value)) continue;
-    const nestedKey = (value as Record<string, unknown>)["key"];
-    if (typeof nestedKey === "string" && nestedKey.length > 0) {
-      return nestedKey;
-    }
-  }
-
-  return null;
-}
-
-function grokMonthlyCreditBalance(
-  response: z.infer<typeof GrokUsageResponseSchema>,
-): ProviderUsageBalance | null {
-  const limit = response.config?.monthlyLimit?.val ?? null;
-  const used = response.config?.used?.val ?? response.usage?.creditUsage ?? null;
-  if (limit === null && used === null) return null;
-  return {
-    id: "monthly_credits",
-    label: "Monthly credits",
-    used,
-    remaining: limit !== null && used !== null ? Math.max(0, limit - used) : null,
-    limit,
-    unit: "credits",
-    tone: toneFromUsedPct(usedPctOf(used, limit)),
-  };
-}
-
-function grokUsageWindow(
-  response: z.infer<typeof GrokUsageResponseSchema>,
-): ProviderUsageWindow | null {
-  const percent = response.config?.creditUsagePercent;
-  if (typeof percent !== "number") return null;
-  const period = response.config?.currentPeriod;
-  const weekly = (period?.type ?? "").toUpperCase().includes("WEEKLY");
-  return windowFromUsedPct({
-    id: weekly ? "weekly" : "monthly",
-    label: weekly ? "Weekly" : "Monthly",
-    utilizationPct: percent,
-    resetsAt: period?.end ?? null,
-    tone: toneFromUsedPct(percent),
-  });
-}
-
-export class GrokQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "grok";
-  readonly displayName = "Grok";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-  private readonly homeDir: string | undefined;
-
-  constructor(options: GrokQuotaProviderOptions) {
-    this.logger = options.logger;
-    this.fetchApi = options.fetch ?? fetch;
-    this.homeDir = options.homeDir;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const token =
-      process.env["GROK_API_KEY"] || process.env["GROK_TOKEN"] || (await this.readGrokToken());
-
-    if (!token) return unavailableUsage(this);
-
-    // The Grok CLI's /usage uses ?format=credits; without it, unified-billing accounts
-    // get a zeroed legacy monthly shape (monthlyLimit.val 0) instead of real usage.
-    const res = await fetchProviderApi(
-      this.fetchApi,
-      "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "X-XAI-Token-Auth": "xai-grok-cli",
-          Accept: "application/json",
-        },
-      },
-    );
-
-    if (!res.ok) {
-      this.logger.debug({ status: res.status }, "Grok usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const resp = GrokUsageResponseSchema.parse(await res.json());
-    const balance = grokMonthlyCreditBalance(resp);
-    const window = grokUsageWindow(resp);
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: null,
-      windows: window ? [window] : [],
-      balances: balance ? [balance] : [],
-      details: [],
-      error: null,
-    };
-  }
-
-  private async readGrokToken(): Promise<string | null> {
-    // homeDir override is for tests: Windows os.homedir() ignores $HOME (uses USERPROFILE).
-    const path = join(this.homeDir ?? homedir(), ".grok", "auth.json");
-    if (!existsSync(path)) return null;
-    try {
-      return extractGrokTokenFromAuth(JSON.parse(await fs.readFile(path, "utf8")));
-    } catch {
-      return null;
-    }
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/minimax.ts b/packages/server/src/services/quota-fetcher/providers/minimax.ts
deleted file mode 100644
index 21e0f05810..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/minimax.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import { existsSync, promises as fs } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { Logger } from "pino";
-import { z } from "zod";
-import type { ProviderUsage, ProviderUsageWindow } from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import {
-  ApiNumberSchema,
-  ApiOptionalStringSchema,
-  fetchProviderApi,
-  unavailableUsage,
-  windowFromUsedPct,
-} from "../usage.js";
-
-const MINIMAX_GLOBAL_BASE_URL = "https://api.minimax.io";
-const MINIMAX_CN_BASE_URL = "https://api.minimaxi.com";
-const MINIMAX_CREDENTIALS_PATH = join(homedir(), ".mmx", "credentials.json");
-const MINIMAX_CONFIG_PATH = join(homedir(), ".mmx", "config.json");
-
-const MiniMaxModelRemainSchema = z.object({
-  model_name: ApiOptionalStringSchema,
-  start_time: ApiNumberSchema.optional(),
-  end_time: ApiNumberSchema.optional(),
-  remains_time: ApiNumberSchema.optional(),
-  current_interval_total_count: ApiNumberSchema.optional(),
-  current_interval_usage_count: ApiNumberSchema.optional(),
-  current_interval_remaining_percent: ApiNumberSchema.optional(),
-  current_weekly_total_count: ApiNumberSchema.optional(),
-  current_weekly_usage_count: ApiNumberSchema.optional(),
-  current_weekly_remaining_percent: ApiNumberSchema.optional(),
-  current_interval_status: ApiNumberSchema.optional(),
-  current_weekly_status: ApiNumberSchema.optional(),
-  weekly_start_time: ApiNumberSchema.optional(),
-  weekly_end_time: ApiNumberSchema.optional(),
-  weekly_remains_time: ApiNumberSchema.optional(),
-  weekly_boost_permille: ApiNumberSchema.optional(),
-});
-
-const MiniMaxQuotaResponseSchema = z.object({
-  model_remains: z.array(MiniMaxModelRemainSchema).optional(),
-});
-
-const MiniMaxCredentialsSchema = z.object({
-  access_token: z.string().optional(),
-  refresh_token: z.string().optional(),
-  expires_at: ApiOptionalStringSchema,
-  resource_url: ApiOptionalStringSchema,
-});
-
-const MiniMaxConfigSchema = z.object({
-  api_key: z.string().optional(),
-  region: z.string().optional(),
-  base_url: ApiOptionalStringSchema,
-  oauth: MiniMaxCredentialsSchema.optional(),
-});
-
-type MiniMaxModelRemain = z.infer<typeof MiniMaxModelRemainSchema>;
-
-interface MiniMaxResolvedAuth {
-  token: string;
-  baseUrl: string;
-}
-
-interface MiniMaxQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-  configPath?: string;
-  credentialsPath?: string;
-  env?: NodeJS.ProcessEnv;
-  now?: () => number;
-}
-
-function resolveBaseUrl(input: { baseUrl?: string; region?: string }): string {
-  const explicit = input.baseUrl;
-  if (explicit && explicit.startsWith("http")) return explicit;
-  if (input.region === "cn") return MINIMAX_CN_BASE_URL;
-  return MINIMAX_GLOBAL_BASE_URL;
-}
-
-function computeUsedPct(
-  remaining: number | null | undefined,
-  total: number | null | undefined,
-): number | null {
-  if (typeof remaining !== "number" || typeof total !== "number") return null;
-  if (!Number.isFinite(total) || total <= 0) return null;
-  if (!Number.isFinite(remaining)) return null;
-  const used = total - remaining;
-  return Math.max(0, Math.min(100, (used / total) * 100));
-}
-
-function epochMsToIso(value: number | null | undefined): string | null {
-  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return null;
-  return new Date(value).toISOString();
-}
-
-function toneForStatus(status: number | null | undefined): ProviderUsageWindow["tone"] {
-  if (status === 2) return "danger";
-  if (status === 3) return "default";
-  return "ok";
-}
-
-function toIntervalWindow(
-  modelName: string,
-  model: MiniMaxModelRemain,
-): ProviderUsageWindow | null {
-  const total = model.current_interval_total_count ?? null;
-  const used = model.current_interval_usage_count ?? null;
-  const remainingPercent = model.current_interval_remaining_percent ?? null;
-  const usedPct =
-    typeof remainingPercent === "number" && Number.isFinite(remainingPercent)
-      ? Math.max(0, Math.min(100, 100 - remainingPercent))
-      : computeUsedPct(
-          typeof total === "number" && typeof used === "number" ? total - used : null,
-          total,
-        );
-  if (usedPct === null) return null;
-  return windowFromUsedPct({
-    id: `interval_${modelName}`,
-    label: `${modelName} · Interval`,
-    utilizationPct: usedPct,
-    resetsAt: epochMsToIso(model.end_time),
-    tone: toneForStatus(model.current_interval_status),
-  });
-}
-
-function toWeeklyWindow(modelName: string, model: MiniMaxModelRemain): ProviderUsageWindow | null {
-  const total = model.current_weekly_total_count ?? null;
-  const used = model.current_weekly_usage_count ?? null;
-  const remainingPercent = model.current_weekly_remaining_percent ?? null;
-  let usedPct: number | null = null;
-  if (typeof remainingPercent === "number" && Number.isFinite(remainingPercent)) {
-    usedPct = Math.max(0, Math.min(100, 100 - remainingPercent));
-  } else if (typeof total === "number" && typeof used === "number") {
-    usedPct = computeUsedPct(total - used, total);
-  }
-  if (usedPct === null) return null;
-  return windowFromUsedPct({
-    id: `weekly_${modelName}`,
-    label: `${modelName} · Weekly`,
-    utilizationPct: usedPct,
-    resetsAt: epochMsToIso(model.weekly_end_time),
-    tone: toneForStatus(model.current_weekly_status),
-  });
-}
-
-export class MiniMaxQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "minimax";
-  readonly displayName = "MiniMax";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-  private readonly configPath: string;
-  private readonly credentialsPath: string;
-  private readonly env: NodeJS.ProcessEnv;
-  private readonly now: () => number;
-
-  constructor(options: MiniMaxQuotaProviderOptions) {
-    this.logger = options.logger;
-    this.fetchApi = options.fetch ?? fetch;
-    this.configPath = options.configPath ?? MINIMAX_CONFIG_PATH;
-    this.credentialsPath = options.credentialsPath ?? MINIMAX_CREDENTIALS_PATH;
-    this.env = options.env ?? process.env;
-    this.now = options.now ?? Date.now;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const auth = await this.resolveAuth();
-    if (!auth) return unavailableUsage(this);
-
-    const res = await fetchProviderApi(this.fetchApi, `${auth.baseUrl}/v1/token_plan/remains`, {
-      headers: {
-        Authorization: `Bearer ${auth.token}`,
-        Accept: "application/json",
-      },
-    });
-
-    if (!res.ok) {
-      this.logger.debug({ status: res.status }, "MiniMax usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const resp = MiniMaxQuotaResponseSchema.parse(await res.json());
-    const models = resp.model_remains ?? [];
-
-    const windows: ProviderUsageWindow[] = [];
-    for (const model of models) {
-      const name = model.model_name ?? "token-plan";
-      const intervalWindow = toIntervalWindow(name, model);
-      if (intervalWindow) windows.push(intervalWindow);
-      const weeklyWindow = toWeeklyWindow(name, model);
-      if (weeklyWindow) windows.push(weeklyWindow);
-    }
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: windows.length > 0 ? "available" : "unavailable",
-      planLabel: null,
-      windows,
-      balances: [],
-      details: [],
-      error: null,
-    };
-  }
-
-  private async resolveAuth(): Promise<MiniMaxResolvedAuth | null> {
-    const envToken = this.env["MINIMAX_API_KEY"];
-    if (envToken) {
-      const envBase = this.env["MINIMAX_BASE_URL"];
-      return {
-        token: envToken,
-        baseUrl: resolveBaseUrl({ baseUrl: envBase }),
-      };
-    }
-
-    const credentials = await this.readCredentials();
-    if (credentials?.access_token && !this.isExpired(credentials.expires_at)) {
-      return {
-        token: credentials.access_token,
-        baseUrl: resolveBaseUrl({ baseUrl: credentials.resource_url }),
-      };
-    }
-
-    const config = await this.readConfig();
-    if (config?.api_key) {
-      return {
-        token: config.api_key,
-        baseUrl: resolveBaseUrl({
-          baseUrl: config.base_url,
-          region: config.region,
-        }),
-      };
-    }
-
-    if (config?.oauth?.access_token && !this.isExpired(config.oauth.expires_at)) {
-      return {
-        token: config.oauth.access_token,
-        baseUrl: resolveBaseUrl({
-          baseUrl: config.oauth.resource_url ?? config.base_url,
-          region: config.region,
-        }),
-      };
-    }
-
-    return null;
-  }
-
-  private isExpired(expiresAt: string | null | undefined): boolean {
-    if (!expiresAt) return false;
-    const parsed = Date.parse(expiresAt);
-    if (!Number.isFinite(parsed)) return false;
-    return parsed <= this.now();
-  }
-
-  private async readCredentials(): Promise<z.infer<typeof MiniMaxCredentialsSchema> | null> {
-    if (!existsSync(this.credentialsPath)) return null;
-    try {
-      const raw = JSON.parse(await fs.readFile(this.credentialsPath, "utf8"));
-      return MiniMaxCredentialsSchema.parse(raw);
-    } catch {
-      return null;
-    }
-  }
-
-  private async readConfig(): Promise<z.infer<typeof MiniMaxConfigSchema> | null> {
-    if (!existsSync(this.configPath)) return null;
-    try {
-      const raw = JSON.parse(await fs.readFile(this.configPath, "utf8"));
-      return MiniMaxConfigSchema.parse(raw);
-    } catch {
-      return null;
-    }
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/providers/zai.ts b/packages/server/src/services/quota-fetcher/providers/zai.ts
deleted file mode 100644
index e8884cf2c4..0000000000
--- a/packages/server/src/services/quota-fetcher/providers/zai.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { Logger } from "pino";
-import { z } from "zod";
-import type { ProviderUsage, ProviderUsageDetail } from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
-import { ApiOptionalStringSchema, fetchProviderApi, unavailableUsage } from "../usage.js";
-
-const ZaiUsageResponseSchema = z.object({
-  data: z
-    .array(
-      z.object({
-        productName: ApiOptionalStringSchema,
-        status: ApiOptionalStringSchema,
-        purchaseTime: ApiOptionalStringSchema,
-        valid: ApiOptionalStringSchema,
-      }),
-    )
-    .optional(),
-});
-
-interface ZaiQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-}
-
-export class ZaiQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "zai";
-  readonly displayName = "Z.ai";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-
-  constructor(options: ZaiQuotaProviderOptions) {
-    this.logger = options.logger;
-    this.fetchApi = options.fetch ?? fetch;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const token = process.env["ZAI_API_KEY"] || process.env["GLM_API_KEY"];
-    if (!token) return unavailableUsage(this);
-
-    const res = await fetchProviderApi(
-      this.fetchApi,
-      "https://api.z.ai/api/biz/subscription/list",
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          Accept: "application/json",
-        },
-      },
-    );
-
-    if (!res.ok) {
-      this.logger.debug({ status: res.status }, "Z.ai usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const resp = ZaiUsageResponseSchema.parse(await res.json());
-    const sub = resp.data?.[0];
-    if (!sub) return unavailableUsage(this);
-
-    const details: ProviderUsageDetail[] = [];
-    if (sub.status) details.push({ id: "status", label: "Status", value: sub.status });
-    if (sub.valid) details.push({ id: "valid", label: "Valid", value: sub.valid });
-    if (sub.purchaseTime) {
-      details.push({ id: "purchase_time", label: "Purchased", value: sub.purchaseTime });
-    }
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: sub.productName || null,
-      windows: [],
-      balances: [],
-      details,
-      error: null,
-    };
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/service.test.ts b/packages/server/src/services/quota-fetcher/service.test.ts
deleted file mode 100644
index 2c254678fd..0000000000
--- a/packages/server/src/services/quota-fetcher/service.test.ts
+++ /dev/null
@@ -1,1883 +0,0 @@
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { mkdtempSync, rmSync } from "node:fs";
-import { createRequire } from "node:module";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { ProviderUsage } from "../../server/messages.js";
-import type { ProviderUsageFetcher } from "./provider.js";
-import { ClaudeQuotaProvider } from "./providers/claude.js";
-import { CodexQuotaProvider } from "./providers/codex.js";
-import { CopilotQuotaProvider } from "./providers/copilot.js";
-import { CursorQuotaProvider } from "./providers/cursor.js";
-import { GrokQuotaProvider } from "./providers/grok.js";
-import { KimiQuotaProvider } from "./providers/kimi.js";
-import { MiniMaxQuotaProvider } from "./providers/minimax.js";
-import { ZaiQuotaProvider } from "./providers/zai.js";
-import { ProviderUsageService } from "./service.js";
-
-function writeClaudeCredentials(
-  dir: string,
-  accessToken: string,
-  refreshToken = "rt_test",
-  subscriptionType = "pro",
-  rateLimitTier = "default_1x",
-): void {
-  writeFileSync(
-    join(dir, ".credentials.json"),
-    JSON.stringify({
-      claudeAiOauth: { accessToken, refreshToken, subscriptionType, rateLimitTier },
-    }),
-  );
-}
-
-function writeCodexAuth(dir: string, accessToken: string, refreshToken = "rt_codex"): void {
-  writeFileSync(
-    join(dir, "auth.json"),
-    JSON.stringify({ tokens: { access_token: accessToken, refresh_token: refreshToken } }),
-  );
-}
-
-function kimiCredentialPath(dir: string): string {
-  return join(dir, "credentials", "kimi-code.json");
-}
-
-function writeKimiCredentials(dir: string, accessToken: string, overrides: object = {}): void {
-  mkdirSync(join(dir, "credentials"), { recursive: true });
-  writeFileSync(
-    kimiCredentialPath(dir),
-    JSON.stringify({
-      access_token: accessToken,
-      refresh_token: "rt_kimi",
-      expires_at: 1_798_812_800,
-      expires_in: 900,
-      scope: "kimi-code",
-      token_type: "Bearer",
-      ...overrides,
-    }),
-  );
-}
-
-// node:sqlite has no @types/node@20 typings; require it with a narrow local type.
-const testRequire = createRequire(import.meta.url);
-interface TestSqliteDb {
-  exec(sql: string): void;
-  prepare(sql: string): { run(...params: unknown[]): void };
-  close(): void;
-}
-
-// Cursor builds have stored ItemTable values as both TEXT and BLOB. Keys map to the
-// real layouts: a plain modern token or the legacy JSON object.
-function writeCursorStateDb(homeDir: string, rows: Record<string, string | Uint8Array>): void {
-  const dir = join(homeDir, ".config", "Cursor", "User", "globalStorage");
-  mkdirSync(dir, { recursive: true });
-  const { DatabaseSync } = testRequire("node:sqlite") as {
-    DatabaseSync: new (path: string) => TestSqliteDb;
-  };
-  const db = new DatabaseSync(join(dir, "state.vscdb"));
-  db.exec("CREATE TABLE IF NOT EXISTS ItemTable (key TEXT UNIQUE ON CONFLICT REPLACE, value BLOB)");
-  const insert = db.prepare("INSERT INTO ItemTable (key, value) VALUES (?, ?)");
-  for (const [key, value] of Object.entries(rows)) {
-    insert.run(key, value);
-  }
-  db.close();
-}
-
-function writeCursorAuthJson(homeDir: string, accessToken: string): void {
-  const dir = join(homeDir, ".config", "cursor");
-  mkdirSync(dir, { recursive: true });
-  writeFileSync(join(dir, "auth.json"), JSON.stringify({ accessToken }));
-}
-
-function writeGrokAuth(home: string, auth: Record<string, unknown>): void {
-  mkdirSync(join(home, ".grok"), { recursive: true });
-  writeFileSync(join(home, ".grok", "auth.json"), JSON.stringify(auth));
-}
-
-function writeMiniMaxConfig(dir: string, payload: Record<string, unknown>): void {
-  mkdirSync(join(dir, ".mmx"), { recursive: true });
-  writeFileSync(join(dir, ".mmx", "config.json"), JSON.stringify(payload));
-}
-
-function writeMiniMaxCredentials(
-  dir: string,
-  accessToken: string,
-  expiresAt?: string,
-  resourceUrl?: string,
-): void {
-  mkdirSync(join(dir, ".mmx"), { recursive: true });
-  const payload: Record<string, unknown> = { access_token: accessToken };
-  if (expiresAt !== undefined) payload["expires_at"] = expiresAt;
-  if (resourceUrl !== undefined) payload["resource_url"] = resourceUrl;
-  writeFileSync(join(dir, ".mmx", "credentials.json"), JSON.stringify(payload));
-}
-
-function makeClaudeResponse(
-  overrides: Partial<{
-    five_hour: { utilization: number | string; resets_at: string };
-    seven_day: { utilization: number | string; resets_at: string };
-    seven_day_opus: { utilization: number | string; resets_at: string };
-  }> = {},
-) {
-  return {
-    five_hour: { utilization: 11, resets_at: "2026-06-01T21:00:00Z" },
-    seven_day: { utilization: 1, resets_at: "2026-06-04T00:00:00Z" },
-    seven_day_opus: { utilization: 0.5, resets_at: "2026-06-04T00:00:00Z" },
-    ...overrides,
-  };
-}
-
-function makeCodexResponse(overrides: object = {}) {
-  return {
-    plan_type: "plus",
-    email: "user@example.com",
-    rate_limit: {
-      primary_window: { used_percent: 42, reset_at: 1_748_812_800 },
-      secondary_window: { used_percent: 8, reset_at: 1_749_072_000 },
-    },
-    ...overrides,
-  };
-}
-
-function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
-  return vi.fn(async (url: RequestInfo | URL) => {
-    const key = url.toString();
-    const handler = handlers.get(key);
-    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
-    return handler();
-  }) as unknown as typeof fetch;
-}
-
-function jsonResponse(body: unknown, status = 200): Response {
-  return new Response(JSON.stringify(body), {
-    status,
-    headers: { "Content-Type": "application/json" },
-  });
-}
-
-function createLogger() {
-  const logger = {
-    debug: vi.fn(),
-    warn: vi.fn(),
-    info: vi.fn(),
-    error: vi.fn(),
-    child: () => logger,
-  };
-  return logger as never;
-}
-
-function usageFetcher(usage: ProviderUsage): ProviderUsageFetcher {
-  return {
-    providerId: usage.providerId,
-    displayName: usage.displayName,
-    fetchUsage: async () => usage,
-  };
-}
-
-function findProvider(result: { providers: ProviderUsage[] }, providerId: string): ProviderUsage {
-  const provider = result.providers.find((candidate) => candidate.providerId === providerId);
-  if (!provider) {
-    throw new Error(`Missing provider ${providerId}`);
-  }
-  return provider;
-}
-
-describe("ProviderUsageService", () => {
-  it("returns arbitrary registered providers and windows as normalized usage data", async () => {
-    const service = new ProviderUsageService({
-      logger: createLogger(),
-      now: () => Date.parse("2026-06-19T00:00:00.000Z"),
-      fetchers: [
-        usageFetcher({
-          providerId: "glm",
-          displayName: "GLM coding plan",
-          status: "available",
-          planLabel: "GLM coding plan",
-          windows: [
-            {
-              id: "biweekly",
-              label: "Biweekly",
-              usedPct: 23,
-              remainingPct: 77,
-              resetsAt: "2026-07-03T00:00:00.000Z",
-            },
-          ],
-        }),
-      ],
-    });
-
-    await expect(service.listUsage()).resolves.toEqual({
-      fetchedAt: "2026-06-19T00:00:00.000Z",
-      providers: [
-        {
-          providerId: "glm",
-          displayName: "GLM coding plan",
-          status: "available",
-          planLabel: "GLM coding plan",
-          windows: [
-            {
-              id: "biweekly",
-              label: "Biweekly",
-              usedPct: 23,
-              remainingPct: 77,
-              resetsAt: "2026-07-03T00:00:00.000Z",
-            },
-          ],
-        },
-      ],
-    });
-  });
-
-  it("caches usage until forced to refresh", async () => {
-    let now = Date.parse("2026-06-19T00:00:00.000Z");
-    let calls = 0;
-    const service = new ProviderUsageService({
-      logger: createLogger(),
-      now: () => now,
-      cacheTtlMs: 60_000,
-      fetchers: [
-        {
-          providerId: "claude",
-          displayName: "Claude",
-          fetchUsage: async () => {
-            calls += 1;
-            return {
-              providerId: "claude",
-              displayName: "Claude",
-              status: "available",
-              planLabel: "Max 20x",
-              windows: [{ id: "session", label: "Session", usedPct: calls }],
-            };
-          },
-        },
-      ],
-    });
-
-    const first = await service.listUsage();
-    now += 30_000;
-    const cached = await service.listUsage();
-    const refreshed = await service.listUsage({ forceRefresh: true });
-
-    expect(calls).toBe(2);
-    expect(cached).toBe(first);
-    expect(refreshed.providers[0]?.windows[0]?.usedPct).toBe(2);
-  });
-
-  it("deduplicates concurrent cache misses", async () => {
-    let calls = 0;
-    let resolveUsage: ((usage: ProviderUsage) => void) | null = null;
-    const service = new ProviderUsageService({
-      logger: createLogger(),
-      now: () => Date.parse("2026-06-19T00:00:00.000Z"),
-      fetchers: [
-        {
-          providerId: "claude",
-          displayName: "Claude",
-          fetchUsage: () => {
-            calls += 1;
-            return new Promise<ProviderUsage>((resolve) => {
-              resolveUsage = resolve;
-            });
-          },
-        },
-      ],
-    });
-
-    const first = service.listUsage();
-    const second = service.listUsage();
-
-    expect(calls).toBe(1);
-    resolveUsage?.({
-      providerId: "claude",
-      displayName: "Claude",
-      status: "available",
-      planLabel: "Max 20x",
-      windows: [{ id: "session", label: "Session", usedPct: 12 }],
-    });
-
-    const [firstResult, secondResult] = await Promise.all([first, second]);
-    expect(firstResult).toBe(secondResult);
-    expect(calls).toBe(1);
-  });
-
-  it("isolates one provider error without dropping other providers", async () => {
-    const service = new ProviderUsageService({
-      logger: createLogger(),
-      now: () => Date.parse("2026-06-19T00:00:00.000Z"),
-      fetchers: [
-        {
-          providerId: "claude",
-          displayName: "Claude",
-          fetchUsage: async () => {
-            throw new Error("Claude auth expired");
-          },
-        },
-        usageFetcher({
-          providerId: "codex",
-          displayName: "Codex",
-          status: "available",
-          planLabel: "Pro 20x",
-          windows: [{ id: "weekly", label: "Weekly", usedPct: 29 }],
-        }),
-      ],
-    });
-
-    await expect(service.listUsage()).resolves.toEqual({
-      fetchedAt: "2026-06-19T00:00:00.000Z",
-      providers: [
-        {
-          providerId: "claude",
-          displayName: "Claude",
-          status: "error",
-          planLabel: null,
-          windows: [],
-          balances: [],
-          details: [],
-          error: "Claude auth expired",
-        },
-        {
-          providerId: "codex",
-          displayName: "Codex",
-          status: "available",
-          planLabel: "Pro 20x",
-          windows: [{ id: "weekly", label: "Weekly", usedPct: 29 }],
-        },
-      ],
-    });
-  });
-});
-
-describe("real provider usage fetchers", () => {
-  let claudeHome: string;
-  let codexHome: string;
-  let homeDir: string;
-  let fetchApi: typeof fetch;
-  let originalEnv: Record<string, string | undefined>;
-
-  beforeEach(() => {
-    claudeHome = mkdtempSync(join(tmpdir(), "usage-test-claude-"));
-    codexHome = mkdtempSync(join(tmpdir(), "usage-test-codex-"));
-    homeDir = mkdtempSync(join(tmpdir(), "usage-test-home-"));
-    fetchApi = mockFetch(new Map());
-    originalEnv = { ...process.env };
-    process.env["HOME"] = homeDir;
-
-    for (const key of [
-      "APPDATA",
-      "COPILOT_TOKEN",
-      "GITHUB_TOKEN",
-      "GITHUB_PAT",
-      "CURSOR_ACCESS_TOKEN",
-      "CURSOR_TOKEN",
-      "ZAI_API_KEY",
-      "GLM_API_KEY",
-      "GROK_API_KEY",
-      "GROK_TOKEN",
-      "KIMI_TOKEN",
-      "KIMI_API_KEY",
-      "KIMI_CODE_HOME",
-      "CODEX_HOME",
-      "MINIMAX_API_KEY",
-      "MINIMAX_BASE_URL",
-    ]) {
-      delete process.env[key];
-    }
-  });
-
-  afterEach(() => {
-    rmSync(claudeHome, { recursive: true, force: true });
-    rmSync(codexHome, { recursive: true, force: true });
-    rmSync(homeDir, { recursive: true, force: true });
-    for (const key in originalEnv) {
-      process.env[key] = originalEnv[key];
-    }
-    for (const key of Object.keys(process.env)) {
-      if (!(key in originalEnv)) {
-        delete process.env[key];
-      }
-    }
-  });
-
-  function service(
-    options: {
-      platform?: typeof process.platform;
-      keychain?: () => Promise<unknown | null>;
-      kimiHomeDir?: string;
-      cursorHomeDir?: string;
-      miniMaxConfigPath?: string;
-      miniMaxCredentialsPath?: string;
-    } = {},
-  ) {
-    const logger = createLogger();
-    const fetchThroughTestDouble = ((url: RequestInfo | URL, init?: RequestInit) =>
-      fetchApi(url, init)) as typeof fetch;
-    return new ProviderUsageService({
-      logger,
-      now: () => Date.parse("2026-06-19T00:00:00.000Z"),
-      fetchers: [
-        new ClaudeQuotaProvider({
-          logger,
-          claudeHome,
-          claudeKeychainReader: options.keychain ?? (async () => null),
-          platform: options.platform,
-          fetch: fetchThroughTestDouble,
-        }),
-        new CodexQuotaProvider({ logger, codexHome, fetch: fetchThroughTestDouble }),
-        new CopilotQuotaProvider({ logger, fetch: fetchThroughTestDouble }),
-        new CursorQuotaProvider({
-          logger,
-          fetch: fetchThroughTestDouble,
-          homeDir: options.cursorHomeDir,
-        }),
-        new ZaiQuotaProvider({ logger, fetch: fetchThroughTestDouble }),
-        new GrokQuotaProvider({
-          logger,
-          fetch: fetchThroughTestDouble,
-          // Match Kimi: inject temp HOME so nested auth-file tests work on Windows
-          // (os.homedir() uses USERPROFILE there and ignores process.env.HOME).
-          homeDir,
-        }),
-        new KimiQuotaProvider({
-          logger,
-          fetch: fetchThroughTestDouble,
-          // Never leave this undefined: the provider would fall back to os.homedir() and
-          // read — and now write — the developer's real Kimi credentials.
-          homeDir: options.kimiHomeDir ?? homeDir,
-        }),
-        new MiniMaxQuotaProvider({
-          logger,
-          fetch: fetchThroughTestDouble,
-          configPath: options.miniMaxConfigPath ?? join(homeDir, ".mmx", "config.json"),
-          credentialsPath:
-            options.miniMaxCredentialsPath ?? join(homeDir, ".mmx", "credentials.json"),
-        }),
-      ],
-      cacheTtlMs: 0,
-    });
-  }
-
-  it("fetches Claude usage, coerces API numbers, and attaches HTTP timeout signals", async () => {
-    writeClaudeCredentials(claudeHome, "at_valid");
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.anthropic.com/api/oauth/usage",
-          () =>
-            jsonResponse(
-              makeClaudeResponse({
-                five_hour: { utilization: "11", resets_at: "2026-06-01T21:00:00Z" },
-              }),
-            ),
-        ],
-      ]),
-    );
-
-    const result = await service().listUsage();
-    const claude = findProvider(result, "claude");
-
-    expect(claude).toMatchObject({
-      status: "available",
-      planLabel: "Pro 1x",
-      windows: expect.arrayContaining([
-        expect.objectContaining({ id: "five_hour", usedPct: 11 }),
-        expect.objectContaining({ id: "weekly", usedPct: 1 }),
-        expect.objectContaining({ id: "weekly_model_opus", usedPct: 0.5 }),
-      ]),
-    });
-    expect(fetchApi).toHaveBeenCalledWith(
-      "https://api.anthropic.com/api/oauth/usage",
-      expect.objectContaining({ signal: expect.any(AbortSignal) }),
-    );
-  });
-
-  it("accepts a null Claude resets_at when a window has no scheduled reset", async () => {
-    writeClaudeCredentials(claudeHome, "at_valid");
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.anthropic.com/api/oauth/usage",
-          () =>
-            jsonResponse({
-              five_hour: { utilization: 0, resets_at: null },
-              seven_day: { utilization: 1, resets_at: "2026-06-04T00:00:00Z" },
-            }),
-        ],
-      ]),
-    );
-
-    const result = await service().listUsage();
-    const claude = findProvider(result, "claude");
-
-    expect(claude).toMatchObject({
-      status: "available",
-      windows: expect.arrayContaining([
-        expect.objectContaining({ id: "five_hour", usedPct: 0, resetsAt: null }),
-        expect.objectContaining({ id: "weekly", usedPct: 1 }),
-      ]),
-    });
-  });
-
-  it("returns unavailable Claude usage when credentials are missing", async () => {
-    fetchApi = vi.fn() as never;
-
-    const result = await service().listUsage();
-    const claude = findProvider(result, "claude");
-
-    expect(claude.status).toBe("unavailable");
-    expect(fetchApi).not.toHaveBeenCalled();
-  });
-
-  it("returns unavailable on 401 without refreshing or rewriting credentials", async () => {
-    writeClaudeCredentials(claudeHome, "at_expired", "rt_valid");
-    const credPath = join(claudeHome, ".credentials.json");
-    const before = readFileSync(credPath, "utf8");
-    let usageCalls = 0;
-    fetchApi = vi.fn(async (url: RequestInfo | URL) => {
-      const endpoint = url.toString();
-      if (endpoint === "https://api.anthropic.com/api/oauth/usage") {
-        usageCalls += 1;
-        return new Response(null, { status: 401 });
-      }
-      // The read-only fetcher must never hit the OAuth token endpoint.
-      throw new Error(`Unmocked: ${endpoint}`);
-    }) as never;
-
-    const result = await service().listUsage();
-
-    expect(findProvider(result, "claude").status).toBe("unavailable");
-    expect(usageCalls).toBe(1);
-    // The credentials file must be left untouched for the Claude CLI to own.
-    expect(readFileSync(credPath, "utf8")).toBe(before);
-  });
-
-  it("does not refresh Claude tokens read from the macOS Keychain", async () => {
-    const usageFetch = vi.fn(async () => new Response(null, { status: 401 }));
-    fetchApi = usageFetch as never;
-
-    const result = await service({
-      platform: "darwin",
-      keychain: async () => ({
-        claudeAiOauth: {
-          accessToken: "at_expired",
-          refreshToken: "rt_valid",
-        },
-      }),
-    }).listUsage();
-
-    expect(findProvider(result, "claude").status).toBe("unavailable");
-    expect(usageFetch).toHaveBeenCalledTimes(1);
-    expect(usageFetch).toHaveBeenCalledWith(
-      "https://api.anthropic.com/api/oauth/usage",
-      expect.objectContaining({
-        headers: expect.objectContaining({ Authorization: "Bearer at_expired" }),
-      }),
-    );
-  });
-
-  it("fetches Codex windows and coerces string credit balances", async () => {
-    writeCodexAuth(codexHome, "at_codex_valid");
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://chatgpt.com/backend-api/wham/usage",
-          () =>
-            jsonResponse(
-              makeCodexResponse({
-                code_review_rate_limit: null,
-                credits: { balance: "0" },
-              }),
-            ),
-        ],
-      ]),
-    );
-
-    const result = await service().listUsage();
-    const codex = findProvider(result, "codex");
-
-    expect(codex).toMatchObject({
-      status: "available",
-      planLabel: "plus",
-      windows: expect.arrayContaining([
-        expect.objectContaining({ id: "session", usedPct: 42 }),
-        expect.objectContaining({ id: "weekly", usedPct: 8 }),
-      ]),
-      balances: [expect.objectContaining({ id: "credits", remaining: 0 })],
-    });
-  });
-
-  it("treats a Codex HTML usage response as auth failure", async () => {
-    writeCodexAuth(codexHome, "at_codex_stale");
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://chatgpt.com/backend-api/wham/usage",
-          () => new Response("<html>Login</html>", { status: 200 }),
-        ],
-      ]),
-    );
-
-    const result = await service().listUsage();
-
-    expect(findProvider(result, "codex").status).toBe("unavailable");
-  });
-
-  it("returns unavailable on 401 without refreshing or rewriting auth.json", async () => {
-    // Regression: the fetcher used to refresh the token and rewrite auth.json
-    // through a schema that dropped id_token (and OPENAI_API_KEY/last_refresh),
-    // leaving the file unparseable by the Codex CLI and forcing a re-login.
-    const authPath = join(codexHome, "auth.json");
-    writeFileSync(
-      authPath,
-      JSON.stringify({
-        OPENAI_API_KEY: null,
-        tokens: {
-          id_token: "id_codex",
-          access_token: "at_codex_stale",
-          refresh_token: "rt_codex_valid",
-          account_id: "acct_codex",
-        },
-        last_refresh: "2026-07-04T20:35:00Z",
-      }),
-    );
-    const before = readFileSync(authPath, "utf8");
-    let usageCalls = 0;
-    fetchApi = vi.fn(async (url: RequestInfo | URL) => {
-      const endpoint = url.toString();
-      if (endpoint === "https://chatgpt.com/backend-api/wham/usage") {
-        usageCalls += 1;
-        return new Response(null, { status: 401 });
-      }
-      // The read-only fetcher must never hit the OAuth token endpoint.
-      throw new Error(`Unmocked: ${endpoint}`);
-    }) as never;
-
-    const result = await service().listUsage();
-
-    expect(findProvider(result, "codex").status).toBe("unavailable");
-    expect(usageCalls).toBe(1);
-    // The auth file must be left byte-for-byte untouched for the Codex CLI to own.
-    expect(readFileSync(authPath, "utf8")).toBe(before);
-  });
-
-  it("fetches Copilot usage from COPILOT_TOKEN", async () => {
-    process.env["COPILOT_TOKEN"] = "copilot_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.github.com/copilot_internal/user",
-          () =>
-            jsonResponse({
-              copilot_plan: "business",
-              quota_reset_date: "2026-07-01T00:00:00Z",
-            }),
-        ],
-      ]),
-    );
-
-    const copilot = findProvider(await service().listUsage(), "copilot");
-
-    expect(copilot).toMatchObject({
-      status: "available",
-      planLabel: "business",
-      details: [{ id: "reset", label: "Quota reset", value: "2026-07-01T00:00:00Z" }],
-    });
-  });
-
-  it("fetches Cursor usage and normalizes malformed billing dates to null", async () => {
-    process.env["CURSOR_ACCESS_TOKEN"] = "cursor_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage",
-          () =>
-            jsonResponse({
-              planUsage: {
-                totalSpend: "1500",
-                includedSpend: "1000",
-                bonusSpend: "500",
-                remaining: "2500",
-                limit: "4000",
-              },
-              billingCycleStart: "2026-01-14T12:42:14.000Z",
-              billingCycleEnd: "not-a-date",
-            }),
-        ],
-      ]),
-    );
-
-    const cursor = findProvider(await service().listUsage(), "cursor");
-
-    expect(cursor).toMatchObject({
-      status: "available",
-      balances: [
-        expect.objectContaining({
-          id: "plan_usage",
-          used: 15,
-          remaining: 25,
-          limit: 40,
-          resetsAt: null,
-        }),
-      ],
-    });
-  });
-
-  it("reads the Cursor token from the modern cursorAuth/accessToken key in state.vscdb", async () => {
-    writeCursorStateDb(homeDir, { "cursorAuth/accessToken": "cursor_state_jwt" });
-    let authorization: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        planUsage: {
-          totalSpend: "1500",
-          includedSpend: "1000",
-          bonusSpend: "500",
-          remaining: "2500",
-          limit: "4000",
-        },
-        billingCycleStart: "2026-01-14T12:42:14.000Z",
-        billingCycleEnd: "2026-02-14T12:42:14.000Z",
-      });
-    }) as unknown as typeof fetch;
-
-    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
-
-    expect(authorization).toBe("Bearer cursor_state_jwt");
-    expect(cursor).toMatchObject({
-      status: "available",
-      balances: [expect.objectContaining({ id: "plan_usage", used: 15, remaining: 25, limit: 40 })],
-    });
-  });
-
-  it("falls back to the legacy cursorAuthStatus JSON blob when the modern key is absent", async () => {
-    writeCursorStateDb(homeDir, {
-      cursorAuthStatus: Buffer.from(JSON.stringify({ accessToken: "cursor_legacy_jwt" }), "utf8"),
-    });
-    let authorization: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        planUsage: { totalSpend: "0", remaining: "100", limit: "100" },
-        billingCycleStart: null,
-        billingCycleEnd: null,
-      });
-    }) as unknown as typeof fetch;
-
-    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
-
-    expect(authorization).toBe("Bearer cursor_legacy_jwt");
-    expect(cursor.status).toBe("available");
-  });
-
-  it("reads the Cursor token from cursor-agent ~/.config/cursor/auth.json when desktop state is absent", async () => {
-    writeCursorAuthJson(homeDir, "cursor_cli_jwt");
-    let authorization: string | null = null;
-    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        planUsage: {
-          totalSpend: "1500",
-          includedSpend: "1000",
-          bonusSpend: "500",
-          remaining: "2500",
-          limit: "4000",
-        },
-        billingCycleStart: "2026-01-14T12:42:14.000Z",
-        billingCycleEnd: "2026-02-14T12:42:14.000Z",
-      });
-    }) as unknown as typeof fetch;
-
-    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
-
-    expect(authorization).toBe("Bearer cursor_cli_jwt");
-    expect(cursor).toMatchObject({
-      status: "available",
-      balances: [expect.objectContaining({ id: "plan_usage", used: 15, remaining: 25, limit: 40 })],
-    });
-  });
-
-  it("prefers the desktop state.vscdb token over cursor-agent auth.json", async () => {
-    writeCursorStateDb(homeDir, { "cursorAuth/accessToken": "cursor_desktop_jwt" });
-    writeCursorAuthJson(homeDir, "cursor_cli_jwt");
-    let authorization: string | null = null;
-    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        planUsage: { totalSpend: "0", remaining: "100", limit: "100" },
-        billingCycleStart: null,
-        billingCycleEnd: null,
-      });
-    }) as unknown as typeof fetch;
-
-    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
-
-    expect(authorization).toBe("Bearer cursor_desktop_jwt");
-    expect(cursor.status).toBe("available");
-  });
-
-  it("logs a debug diagnostic and stays unavailable when state.vscdb is unreadable", async () => {
-    const dir = join(homeDir, ".config", "Cursor", "User", "globalStorage");
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(join(dir, "state.vscdb"), "not a sqlite database");
-    const logger = createLogger();
-    const provider = new CursorQuotaProvider({
-      logger,
-      fetch: (() => {
-        throw new Error("usage API should not be called without a token");
-      }) as unknown as typeof fetch,
-      homeDir,
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.status).toBe("unavailable");
-    expect((logger as unknown as { debug: ReturnType<typeof vi.fn> }).debug).toHaveBeenCalledWith(
-      expect.objectContaining({ path: expect.stringContaining("state.vscdb") }),
-      expect.stringContaining("Failed to read Cursor token"),
-    );
-  });
-
-  it("fetches Z.ai usage from ZAI_API_KEY", async () => {
-    process.env["ZAI_API_KEY"] = "zai_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.z.ai/api/biz/subscription/list",
-          () =>
-            jsonResponse({
-              data: [
-                {
-                  productName: "GLM Coding Max",
-                  status: "VALID",
-                  purchaseTime: "2026-01-12 16:55:13",
-                  valid: "2026-02-12 16:55:13-2026-03-12 16:55:13",
-                },
-              ],
-            }),
-        ],
-      ]),
-    );
-
-    const zai = findProvider(await service().listUsage(), "zai");
-
-    expect(zai).toMatchObject({
-      status: "available",
-      planLabel: "GLM Coding Max",
-      details: expect.arrayContaining([{ id: "status", label: "Status", value: "VALID" }]),
-    });
-  });
-
-  it("fetches Grok usage and preserves zero values", async () => {
-    process.env["GROK_API_KEY"] = "grok_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
-          () =>
-            jsonResponse({
-              config: { monthlyLimit: { val: 0 }, used: { val: 0 } },
-            }),
-        ],
-      ]),
-    );
-
-    const grok = findProvider(await service().listUsage(), "grok");
-
-    expect(grok).toMatchObject({
-      status: "available",
-      balances: [
-        expect.objectContaining({
-          id: "monthly_credits",
-          used: 0,
-          remaining: 0,
-          limit: 0,
-        }),
-      ],
-    });
-  });
-
-  it("fetches Grok usage from live billing shape (config.used.val)", async () => {
-    process.env["GROK_API_KEY"] = "grok_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
-          () =>
-            jsonResponse({
-              config: {
-                monthlyLimit: { val: 150000 },
-                used: { val: 37886 },
-                billingPeriodStart: "2026-07-01T00:00:00+00:00",
-                billingPeriodEnd: "2026-08-01T00:00:00+00:00",
-              },
-            }),
-        ],
-      ]),
-    );
-
-    const grok = findProvider(await service().listUsage(), "grok");
-
-    expect(grok).toMatchObject({
-      status: "available",
-      balances: [
-        expect.objectContaining({
-          id: "monthly_credits",
-          used: 37886,
-          remaining: 112114,
-          limit: 150000,
-          unit: "credits",
-        }),
-      ],
-    });
-  });
-
-  it("fetches Grok usage with nested ~/.grok/auth.json key token", async () => {
-    writeGrokAuth(homeDir, {
-      "https://auth.x.ai::test-user-id": {
-        key: "nested_jwt_token",
-        refresh_token: "rt_nested",
-        expires_at: "2026-08-01T00:00:00Z",
-        user_id: "test-user-id",
-        email: "user@example.com",
-      },
-    });
-
-    let authorization: string | null = null;
-    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        config: {
-          monthlyLimit: { val: 100 },
-          used: { val: 25 },
-        },
-      });
-    }) as typeof fetch;
-
-    const grok = findProvider(await service().listUsage(), "grok");
-
-    expect(authorization).toBe("Bearer nested_jwt_token");
-    expect(grok).toMatchObject({
-      status: "available",
-      balances: [
-        expect.objectContaining({
-          id: "monthly_credits",
-          used: 25,
-          remaining: 75,
-          limit: 100,
-        }),
-      ],
-    });
-  });
-
-  it("still accepts legacy Grok usage.creditUsage when config.used is absent", async () => {
-    process.env["GROK_API_KEY"] = "grok_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
-          () =>
-            jsonResponse({
-              config: { monthlyLimit: { val: 50 } },
-              usage: { creditUsage: 10 },
-            }),
-        ],
-      ]),
-    );
-
-    const grok = findProvider(await service().listUsage(), "grok");
-
-    expect(grok).toMatchObject({
-      status: "available",
-      balances: [
-        expect.objectContaining({
-          id: "monthly_credits",
-          used: 10,
-          remaining: 40,
-          limit: 50,
-        }),
-      ],
-    });
-  });
-
-  it("fetches Grok unified-billing usage as a weekly window", async () => {
-    process.env["GROK_API_KEY"] = "grok_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
-          () =>
-            jsonResponse({
-              config: {
-                currentPeriod: {
-                  type: "USAGE_PERIOD_TYPE_WEEKLY",
-                  start: "2026-08-24T09:41:40.001370+00:00",
-                  end: "2026-08-31T09:41:40.001370+00:00",
-                },
-                creditUsagePercent: 76.0,
-                isUnifiedBillingUser: true,
-                billingPeriodStart: "2026-08-24T09:41:40.001370+00:00",
-                billingPeriodEnd: "2026-08-31T09:41:40.001370+00:00",
-              },
-            }),
-        ],
-      ]),
-    );
-
-    const grok = findProvider(await service().listUsage(), "grok");
-
-    expect(grok).toMatchObject({
-      status: "available",
-      windows: [
-        {
-          id: "weekly",
-          label: "Weekly",
-          usedPct: 76,
-          remainingPct: 24,
-          resetsAt: "2026-08-31T09:41:40.001370+00:00",
-          tone: "warning",
-        },
-      ],
-      balances: [],
-    });
-  });
-
-  it("fetches Kimi usage from KIMI_TOKEN", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.kimi.com/coding/v1/usages",
-          () =>
-            jsonResponse({
-              usage: {
-                limit: "100",
-                remaining: "74",
-                resetTime: "2026-02-11T17:32:50Z",
-              },
-            }),
-        ],
-      ]),
-    );
-
-    const kimi = findProvider(await service().listUsage(), "kimi");
-
-    expect(kimi).toMatchObject({
-      status: "available",
-      windows: [
-        expect.objectContaining({
-          id: "coding_usage",
-          usedPct: 26,
-          remainingPct: 74,
-          resetsAt: "2026-02-11T17:32:50Z",
-        }),
-      ],
-    });
-  });
-
-  it("fetches Kimi usage from the CLI credential home", async () => {
-    writeKimiCredentials(join(homeDir, ".kimi-code"), "kimi_cli_token");
-    let requestedUrl: string | null = null;
-    let authorization: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
-      requestedUrl = url.toString();
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        usage: {
-          limit: "200",
-          remaining: "150",
-          resetTime: "2026-06-23T05:12:17Z",
-        },
-      });
-    }) as unknown as typeof fetch;
-
-    const kimi = findProvider(await service({ kimiHomeDir: homeDir }).listUsage(), "kimi");
-
-    expect(requestedUrl).toBe("https://api.kimi.com/coding/v1/usages");
-    expect(authorization).toBe("Bearer kimi_cli_token");
-    expect(kimi).toMatchObject({
-      status: "available",
-      windows: [
-        expect.objectContaining({
-          id: "coding_usage",
-          usedPct: 25,
-          remainingPct: 75,
-          resetsAt: "2026-06-23T05:12:17Z",
-        }),
-      ],
-    });
-  });
-
-  it("reads Kimi credentials whose optional fields are null", async () => {
-    writeKimiCredentials(join(homeDir, ".kimi-code"), "kimi_cli_token", {
-      expires_at: null,
-      expires_in: null,
-      scope: null,
-      token_type: null,
-    });
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.kimi.com/coding/v1/usages",
-          () => jsonResponse({ usage: { limit: "100", remaining: "60" } }),
-        ],
-      ]),
-    );
-
-    const kimi = findProvider(await service({ kimiHomeDir: homeDir }).listUsage(), "kimi");
-
-    expect(kimi.status).toBe("available");
-  });
-
-  it("returns unavailable on 401 without refreshing or rewriting the credential file", async () => {
-    writeKimiCredentials(join(homeDir, ".kimi-code"), "at_kimi_expired");
-    const credPath = kimiCredentialPath(join(homeDir, ".kimi-code"));
-    const before = readFileSync(credPath, "utf8");
-    let usageCalls = 0;
-    fetchApi = vi.fn(async (url: RequestInfo | URL) => {
-      const endpoint = url.toString();
-      if (endpoint === "https://api.kimi.com/coding/v1/usages") {
-        usageCalls += 1;
-        return new Response(null, { status: 401 });
-      }
-      // The read-only fetcher must never hit the OAuth token endpoint.
-      throw new Error(`Unmocked: ${endpoint}`);
-    }) as never;
-
-    const result = await service({ kimiHomeDir: homeDir }).listUsage();
-
-    expect(findProvider(result, "kimi").status).toBe("unavailable");
-    expect(usageCalls).toBe(1);
-    // The credentials file must be left untouched for the Kimi CLI to own.
-    expect(readFileSync(credPath, "utf8")).toBe(before);
-  });
-
-  it("does not refresh Kimi tokens read from the environment", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    const usageFetch = vi.fn(async () => new Response(null, { status: 401 }));
-    fetchApi = usageFetch as never;
-
-    const result = await service().listUsage();
-
-    expect(findProvider(result, "kimi").status).toBe("unavailable");
-    expect(usageFetch).toHaveBeenCalledTimes(1);
-  });
-
-  it("does not refresh Kimi tokens on a 403", async () => {
-    writeKimiCredentials(join(homeDir, ".kimi-code"), "at_kimi_forbidden");
-    const usageFetch = vi.fn(async () => new Response(null, { status: 403 }));
-    fetchApi = usageFetch as never;
-
-    const result = await service({ kimiHomeDir: homeDir }).listUsage();
-
-    expect(findProvider(result, "kimi").status).toBe("unavailable");
-    expect(usageFetch).toHaveBeenCalledTimes(1);
-  });
-
-  it("fetches MiniMax usage from MINIMAX_API_KEY against the global endpoint", async () => {
-    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
-    let requestedUrl: string | null = null;
-    let authorization: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
-      requestedUrl = url.toString();
-      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
-      return jsonResponse({
-        model_remains: [
-          {
-            model_name: "MiniMax-M2.7",
-            end_time: Date.parse("2026-06-19T05:00:00.000Z"),
-            weekly_end_time: Date.parse("2026-06-26T00:00:00.000Z"),
-            current_interval_total_count: 1000,
-            current_interval_usage_count: 250,
-            current_interval_remaining_percent: 75,
-            current_weekly_total_count: 5000,
-            current_weekly_usage_count: 1200,
-            current_weekly_remaining_percent: 76,
-          },
-        ],
-      });
-    }) as unknown as typeof fetch;
-
-    const miniMax = findProvider(await service().listUsage(), "minimax");
-
-    expect(requestedUrl).toBe("https://api.minimax.io/v1/token_plan/remains");
-    expect(authorization).toBe("Bearer minimax_test_token");
-    expect(miniMax).toMatchObject({
-      status: "available",
-      windows: expect.arrayContaining([
-        expect.objectContaining({
-          id: "interval_MiniMax-M2.7",
-          label: "MiniMax-M2.7 · Interval",
-          usedPct: 25,
-          remainingPct: 75,
-          resetsAt: "2026-06-19T05:00:00.000Z",
-        }),
-        expect.objectContaining({
-          id: "weekly_MiniMax-M2.7",
-          label: "MiniMax-M2.7 · Weekly",
-          usedPct: 24,
-          remainingPct: 76,
-          resetsAt: "2026-06-26T00:00:00.000Z",
-        }),
-      ]),
-    });
-  });
-
-  it("returns unavailable MiniMax usage when no credentials are configured", async () => {
-    fetchApi = vi.fn() as never;
-
-    const miniMax = findProvider(await service().listUsage(), "minimax");
-
-    expect(miniMax.status).toBe("unavailable");
-    expect(fetchApi).not.toHaveBeenCalled();
-  });
-
-  it("reads MiniMax OAuth credentials from the CLI credentials file", async () => {
-    writeMiniMaxCredentials(
-      homeDir,
-      "minimax_oauth_token",
-      "2030-01-01T00:00:00.000Z",
-      "https://account.example.com",
-    );
-    let requestedUrl: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL) => {
-      requestedUrl = url.toString();
-      return jsonResponse({ model_remains: [] });
-    }) as unknown as typeof fetch;
-
-    await service().listUsage();
-
-    expect(requestedUrl).toBe("https://account.example.com/v1/token_plan/remains");
-  });
-
-  it("falls back to MiniMax api_key in the CLI config file", async () => {
-    writeMiniMaxConfig(homeDir, {
-      api_key: "minimax_config_key",
-      region: "cn",
-    });
-    let requestedUrl: string | null = null;
-    fetchApi = (async (url: RequestInfo | URL) => {
-      requestedUrl = url.toString();
-      return jsonResponse({ model_remains: [] });
-    }) as unknown as typeof fetch;
-
-    const miniMax = findProvider(await service().listUsage(), "minimax");
-
-    expect(requestedUrl).toBe("https://api.minimaxi.com/v1/token_plan/remains");
-    expect(miniMax.status).toBe("unavailable");
-  });
-
-  it("marks exhausted MiniMax interval windows with a danger tone", async () => {
-    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
-    fetchApi = mockFetch(
-      new Map([
-        [
-          "https://api.minimax.io/v1/token_plan/remains",
-          () =>
-            jsonResponse({
-              model_remains: [
-                {
-                  model_name: "MiniMax-M2.7",
-                  end_time: Date.parse("2026-06-19T05:00:00.000Z"),
-                  weekly_end_time: Date.parse("2026-06-26T00:00:00.000Z"),
-                  current_interval_total_count: 100,
-                  current_interval_usage_count: 100,
-                  current_interval_remaining_percent: 0,
-                  current_interval_status: 2,
-                  current_weekly_total_count: 100,
-                  current_weekly_usage_count: 10,
-                  current_weekly_remaining_percent: 90,
-                  current_weekly_status: 1,
-                },
-              ],
-            }),
-        ],
-      ]),
-    );
-
-    const miniMax = findProvider(await service().listUsage(), "minimax");
-
-    expect(miniMax).toMatchObject({
-      status: "available",
-      windows: expect.arrayContaining([
-        expect.objectContaining({
-          id: "interval_MiniMax-M2.7",
-          usedPct: 100,
-          tone: "danger",
-        }),
-        expect.objectContaining({
-          id: "weekly_MiniMax-M2.7",
-          tone: "ok",
-        }),
-      ]),
-    });
-  });
-});
-
-// Regression for #2320: providers hardcoded `tone: "ok"`, which suppressed the client's
-// own thresholds (window-bar.tsx reads `window.tone ?? deriveTone(usedPct)`), so a bar
-// stayed green at 99%. Codex escalated to "warning" but could never reach "danger".
-describe("usage bars escalate as they fill", () => {
-  let claudeHome: string;
-  let codexHome: string;
-
-  beforeEach(() => {
-    claudeHome = mkdtempSync(join(tmpdir(), "paseo-tone-claude-"));
-    codexHome = mkdtempSync(join(tmpdir(), "paseo-tone-codex-"));
-  });
-
-  afterEach(() => {
-    rmSync(claudeHome, { recursive: true, force: true });
-    rmSync(codexHome, { recursive: true, force: true });
-  });
-
-  function claudeAt(utilization: number) {
-    writeClaudeCredentials(claudeHome, "at_valid");
-    return new ClaudeQuotaProvider({
-      logger: createLogger(),
-      claudeHome,
-      claudeKeychainReader: async () => null,
-      fetch: mockFetch(
-        new Map([
-          [
-            "https://api.anthropic.com/api/oauth/usage",
-            () =>
-              jsonResponse({
-                seven_day: { utilization, resets_at: "2026-06-04T00:00:00Z" },
-              }),
-          ],
-        ]),
-      ),
-    }).fetchUsage();
-  }
-
-  it.each([
-    [10, "ok"],
-    [75, "warning"],
-    [99, "danger"],
-  ])("a Claude window at %s%% is %s", async (utilization, tone) => {
-    const usage = await claudeAt(utilization);
-    expect(usage.windows).toEqual([expect.objectContaining({ id: "weekly", tone })]);
-  });
-
-  it("a Codex window can reach danger, not just warning", async () => {
-    writeCodexAuth(codexHome, "at_codex");
-    const usage = await new CodexQuotaProvider({
-      logger: createLogger(),
-      codexHome,
-      fetch: mockFetch(
-        new Map([
-          [
-            "https://chatgpt.com/backend-api/wham/usage",
-            () =>
-              jsonResponse(
-                makeCodexResponse({
-                  rate_limit: {
-                    primary_window: { used_percent: 12, reset_at: 1_748_812_800 },
-                    secondary_window: { used_percent: 96, reset_at: 1_749_072_000 },
-                  },
-                }),
-              ),
-          ],
-        ]),
-      ),
-    }).fetchUsage();
-
-    expect(usage.windows).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ id: "session", tone: "ok" }),
-        expect.objectContaining({ id: "weekly", tone: "danger" }),
-      ]),
-    );
-  });
-});
-
-// Model- and surface-scoped weekly limits arrive in a `limits[]` array rather than the
-// top-level `seven_day_*` keys, which now return null on most accounts.
-describe("ClaudeQuotaProvider scoped weekly limits", () => {
-  let claudeHome: string;
-
-  beforeEach(() => {
-    claudeHome = mkdtempSync(join(tmpdir(), "paseo-claude-limits-"));
-  });
-
-  afterEach(() => {
-    rmSync(claudeHome, { recursive: true, force: true });
-  });
-
-  function fableLimit(overrides: Record<string, unknown> = {}) {
-    return {
-      kind: "weekly_scoped",
-      group: "weekly",
-      percent: 0,
-      severity: "normal",
-      resets_at: "2026-06-04T00:00:00Z",
-      is_active: false,
-      scope: { model: { id: null, display_name: "Fable" }, surface: null },
-      ...overrides,
-    };
-  }
-
-  function claudeProvider(body: unknown) {
-    writeClaudeCredentials(claudeHome, "at_valid");
-    const logger = createLogger() as unknown as { warn: ReturnType<typeof vi.fn> };
-    const provider = new ClaudeQuotaProvider({
-      logger: logger as never,
-      claudeHome,
-      claudeKeychainReader: async () => null,
-      fetch: mockFetch(
-        new Map([["https://api.anthropic.com/api/oauth/usage", () => jsonResponse(body)]]),
-      ),
-    });
-    return { provider, logger };
-  }
-
-  it("renders a scoped weekly limit as its own window", async () => {
-    const { provider } = claudeProvider({
-      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [fableLimit()],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toContainEqual(
-      expect.objectContaining({ id: "weekly_model_fable", label: "Weekly · Fable" }),
-    );
-  });
-
-  it("renders a scoped window that is at zero and inactive", async () => {
-    const { provider } = claudeProvider({
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [fableLimit({ percent: 0, is_active: false })],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toContainEqual(
-      expect.objectContaining({ id: "weekly_model_fable", usedPct: 0, remainingPct: 100 }),
-    );
-  });
-
-  it("ignores session and all-models entries so they do not duplicate the top-level windows", async () => {
-    const { provider } = claudeProvider({
-      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [
-        { kind: "session", percent: 6, resets_at: "2026-06-01T21:00:00Z", scope: null },
-        { kind: "weekly_all", percent: 23, resets_at: "2026-06-04T00:00:00Z", scope: null },
-        fableLimit(),
-      ],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows.map((window) => window.id)).toEqual([
-      "five_hour",
-      "weekly",
-      "weekly_model_fable",
-    ]);
-  });
-
-  it("labels a surface-scoped limit from its surface name", async () => {
-    const { provider } = claudeProvider({
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [
-        fableLimit({ scope: { model: null, surface: { id: "code", display_name: "Code" } } }),
-      ],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toContainEqual(
-      expect.objectContaining({ id: "weekly_surface_code", label: "Weekly · Code" }),
-    );
-  });
-
-  it("skips a scoped limit with no resolvable label rather than rendering an unlabelled bar", async () => {
-    const { provider, logger } = claudeProvider({
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [fableLimit({ scope: { model: { id: null, display_name: null }, surface: null } })],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows.map((window) => window.id)).toEqual(["weekly"]);
-    expect(logger.warn).toHaveBeenCalled();
-  });
-
-  // Regression: an additive section must never take down data that already parsed.
-  it("keeps the top-level windows when a limits entry is malformed", async () => {
-    const { provider, logger } = claudeProvider({
-      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
-      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
-      limits: [{ percent: "not-a-kind" }, fableLimit()],
-    });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.status).toBe("available");
-    expect(usage.windows.map((window) => window.id)).toEqual([
-      "five_hour",
-      "weekly",
-      "weekly_model_fable",
-    ]);
-    expect(logger.warn).toHaveBeenCalled();
-  });
-
-  it("warns when a successful response describes no windows at all", async () => {
-    const { provider, logger } = claudeProvider({ limits: [] });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toEqual([]);
-    expect(logger.warn).toHaveBeenCalledWith(
-      "Claude usage response parsed but produced no windows",
-    );
-  });
-});
-/**
- * The reconciliation matrix.
- *
- * Four review rounds on PR #2303 each found a different hole in how the two
- * representations of one scoped limit get combined, because each fix was tested against
- * the case that was reported rather than the space of cases. This walks the space:
- * every combination of which representation carries the limit, whether the `limits[]`
- * entry supplies values, and whether the two descriptions denote the same limit at all.
- */
-describe("ClaudeQuotaProvider scoped limit reconciliation", () => {
-  let claudeHome: string;
-
-  beforeEach(() => {
-    claudeHome = mkdtempSync(join(tmpdir(), "paseo-claude-matrix-"));
-  });
-
-  afterEach(() => {
-    rmSync(claudeHome, { recursive: true, force: true });
-  });
-
-  const RESETS = "2026-06-04T00:00:00Z";
-
-  function scoped(scope: unknown, percent: number | null = 30, resetsAt: string | null = RESETS) {
-    return { kind: "weekly_scoped", percent, resets_at: resetsAt, scope };
-  }
-
-  const model = (name: string | null, id: string | null = null) => ({
-    model: { id, display_name: name },
-    surface: null,
-  });
-  const surface = (name: string | null, id: string | null = null) => ({
-    model: null,
-    surface: { id, display_name: name },
-  });
-
-  async function windowsFor(body: Record<string, unknown>) {
-    writeClaudeCredentials(claudeHome, "at_valid");
-    const usage = await new ClaudeQuotaProvider({
-      logger: createLogger(),
-      claudeHome,
-      claudeKeychainReader: async () => null,
-      fetch: mockFetch(
-        new Map([["https://api.anthropic.com/api/oauth/usage", () => jsonResponse(body)]]),
-      ),
-    }).fetchUsage();
-    return usage.windows;
-  }
-
-  it("which representation carries the limit: legacy only", async () => {
-    const windows = await windowsFor({
-      seven_day_omelette: { utilization: 12, resets_at: RESETS },
-    });
-    expect(windows).toEqual([
-      expect.objectContaining({
-        id: "weekly_model_omelette",
-        label: "Weekly · Omelette",
-        usedPct: 12,
-      }),
-    ]);
-  });
-
-  it("which representation carries the limit: limits[] only", async () => {
-    const windows = await windowsFor({ limits: [scoped(model("Fable"), 2)] });
-    expect(windows).toEqual([
-      expect.objectContaining({
-        id: "weekly_model_fable",
-        label: "Weekly · Fable",
-        usedPct: 2,
-      }),
-    ]);
-  });
-
-  it("which representation carries the limit: both, same limit — one bar, scoped identity", async () => {
-    const windows = await windowsFor({
-      seven_day_omelette: { utilization: 12, resets_at: RESETS },
-      limits: [scoped(model("Omelette"), 30)],
-    });
-    expect(windows).toEqual([
-      expect.objectContaining({ id: "weekly_model_omelette", usedPct: 30 }),
-    ]);
-  });
-
-  it("which representation carries the limit: both, different limits — two bars", async () => {
-    const windows = await windowsFor({
-      seven_day_opus: { utilization: 8, resets_at: RESETS },
-      limits: [scoped(model("Fable"), 2)],
-    });
-    expect(windows.map((w) => w.id)).toEqual(["weekly_model_opus", "weekly_model_fable"]);
-  });
-
-  it("which representation carries the limit: neither", async () => {
-    const windows = await windowsFor({ seven_day: { utilization: 23, resets_at: RESETS } });
-    expect(windows.map((w) => w.id)).toEqual(["weekly"]);
-  });
-
-  const legacy = { seven_day_omelette: { utilization: 12, resets_at: RESETS } };
-
-  it("value fallback when the scoped entry is sparse: scoped values win when present", async () => {
-    const windows = await windowsFor({
-      ...legacy,
-      limits: [scoped(model("Omelette"), 30, "2026-06-09T00:00:00Z")],
-    });
-    expect(windows[0]).toMatchObject({ usedPct: 30, resetsAt: "2026-06-09T00:00:00Z" });
-  });
-
-  it("value fallback when the scoped entry is sparse: percentage falls back per field", async () => {
-    const windows = await windowsFor({
-      ...legacy,
-      limits: [scoped(model("Omelette"), null, "2026-06-09T00:00:00Z")],
-    });
-    expect(windows[0]).toMatchObject({ usedPct: 12, resetsAt: "2026-06-09T00:00:00Z" });
-  });
-
-  it("value fallback when the scoped entry is sparse: reset time falls back per field", async () => {
-    const windows = await windowsFor({
-      ...legacy,
-      limits: [scoped(model("Omelette"), 30, null)],
-    });
-    expect(windows[0]).toMatchObject({ usedPct: 30, resetsAt: RESETS });
-  });
-
-  it("value fallback when the scoped entry is sparse: both fall back when the scoped entry only names the limit", async () => {
-    const windows = await windowsFor({
-      ...legacy,
-      limits: [scoped(model("Omelette"), null, null)],
-    });
-    expect(windows[0]).toMatchObject({ usedPct: 12, resetsAt: RESETS });
-  });
-
-  it("value fallback when the scoped entry is sparse: stays empty when neither side has a value", async () => {
-    const windows = await windowsFor({ limits: [scoped(model("Fable"), null, null)] });
-    expect(windows[0]).toMatchObject({ id: "weekly_model_fable", usedPct: null });
-  });
-
-  it("identity: a surface never matches a legacy model window of the same name", async () => {
-    const windows = await windowsFor({
-      seven_day_omelette: { utilization: 12, resets_at: RESETS },
-      limits: [scoped(surface("Omelette"), 30)],
-    });
-    expect(windows.map((w) => w.id)).toEqual(["weekly_model_omelette", "weekly_surface_omelette"]);
-    expect(windows[0]).toMatchObject({ usedPct: 12 });
-    expect(windows[1]).toMatchObject({ usedPct: 30 });
-  });
-
-  it("identity: a model and a surface of the same name stay apart", async () => {
-    const windows = await windowsFor({
-      limits: [scoped(model("Code"), 4), scoped(surface("Code"), 9)],
-    });
-    expect(windows.map((w) => w.id)).toEqual(["weekly_model_code", "weekly_surface_code"]);
-  });
-
-  it("identity: ids decide when both sides have one", async () => {
-    const windows = await windowsFor({
-      limits: [
-        scoped(model("Fable-Pro", "fable-pro"), 4),
-        scoped(model("Fable_Pro", "fable_pro"), 9),
-      ],
-    });
-    expect(windows.map((w) => w.id)).toEqual(["weekly_model_fable-pro", "weekly_model_fable_pro"]);
-  });
-
-  it("identity: names decide when ids are absent, so indistinguishable entries merge", async () => {
-    const windows = await windowsFor({
-      limits: [scoped(model("Fable Pro"), 4), scoped(model("Fable-Pro"), 9)],
-    });
-    expect(windows).toEqual([
-      expect.objectContaining({ id: "weekly_model_fable_pro", usedPct: 9 }),
-    ]);
-  });
-
-  it("identity: a renamed scope keeps its id when the API supplies one", async () => {
-    const before = await windowsFor({ limits: [scoped(model("Fable", "fable"), 2)] });
-    const after = await windowsFor({ limits: [scoped(model("Fable 5", "fable"), 2)] });
-    expect(before[0]?.id).toBe("weekly_model_fable");
-    expect(after[0]?.id).toBe("weekly_model_fable");
-    expect(after[0]?.label).toBe("Weekly · Fable 5");
-  });
-
-  it("identity: a limit keeps one id whichever representation carries it", async () => {
-    const viaLegacy = await windowsFor({
-      seven_day_omelette: { utilization: 12, resets_at: RESETS },
-    });
-    const viaLimits = await windowsFor({ limits: [scoped(model("Omelette"), 12)] });
-    expect(viaLegacy[0]?.id).toBe(viaLimits[0]?.id);
-  });
-
-  it("ordering and unscoped windows: puts session and weekly ahead of the scoped bars", async () => {
-    const windows = await windowsFor({
-      five_hour: { utilization: 6, resets_at: RESETS },
-      seven_day: { utilization: 23, resets_at: RESETS },
-      seven_day_opus: { utilization: 8, resets_at: RESETS },
-      limits: [
-        { kind: "session", percent: 6, resets_at: RESETS, scope: null },
-        { kind: "weekly_all", percent: 23, resets_at: RESETS, scope: null },
-        scoped(model("Fable"), 2),
-      ],
-    });
-    expect(windows.map((w) => w.id)).toEqual([
-      "five_hour",
-      "weekly",
-      "weekly_model_opus",
-      "weekly_model_fable",
-    ]);
-  });
-});
-
-describe("KimiQuotaProvider usage windows", () => {
-  afterEach(() => {
-    delete process.env["KIMI_TOKEN"];
-    vi.restoreAllMocks();
-  });
-
-  it("normalizes weekly and enforced rolling usage windows", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    const fetchApi = vi.fn(async () =>
-      jsonResponse({
-        limited: true,
-        usage: {
-          limit: "100",
-          used: "61",
-          remaining: "39",
-          resetTime: "2026-08-05T00:01:45Z",
-        },
-        limits: [
-          {
-            window: {
-              duration: 300,
-              timeUnit: "TIME_UNIT_MINUTE",
-            },
-            detail: {
-              limit: "100",
-              used: "100",
-              resetTime: "2026-07-31T17:01:45Z",
-            },
-          },
-        ],
-      }),
-    );
-    const provider = new KimiQuotaProvider({ logger: createLogger(), fetch: fetchApi });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage).toMatchObject({
-      status: "available",
-      windows: [
-        {
-          id: "coding_usage",
-          label: "Weekly limit",
-          usedPct: 61,
-          remainingPct: 39,
-          resetsAt: "2026-08-05T00:01:45Z",
-          tone: "ok",
-        },
-        {
-          id: "coding_limit_300_time_unit_minute",
-          label: "5-hour limit",
-          usedPct: 100,
-          remainingPct: 0,
-          resetsAt: "2026-07-31T17:01:45Z",
-          tone: "danger",
-        },
-      ],
-    });
-  });
-
-  it("keeps valid windows when another limits entry is malformed", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    const logger = createLogger() as unknown as { debug: ReturnType<typeof vi.fn> };
-    const fetchApi = vi.fn(async () =>
-      jsonResponse({
-        usage: {
-          limit: "100",
-          remaining: "75",
-          resetTime: "2026-08-05T00:01:45Z",
-        },
-        limits: [
-          { window: { duration: "invalid" }, detail: {} },
-          {
-            window: { duration: 300, timeUnit: "TIME_UNIT_MINUTE" },
-            detail: { limit: "100", remaining: "50" },
-          },
-        ],
-      }),
-    );
-    const provider = new KimiQuotaProvider({ logger: logger as never, fetch: fetchApi });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toHaveLength(2);
-    expect(usage.windows[1]).toMatchObject({
-      label: "5-hour limit",
-      usedPct: 50,
-      remainingPct: 50,
-    });
-    expect(logger.debug).toHaveBeenCalledWith(
-      { index: 0 },
-      "Ignoring malformed Kimi usage limit window",
-    );
-  });
-
-  it("accepts direct limit fields, alternate reset keys, and provider labels", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    const fetchApi = vi.fn(async () =>
-      jsonResponse({
-        usage: null,
-        limits: [
-          {
-            name: "Burst quota",
-            limit: "80",
-            remaining: "20",
-            reset_at: "2026-08-01T00:00:00Z",
-          },
-        ],
-      }),
-    );
-    const provider = new KimiQuotaProvider({ logger: createLogger(), fetch: fetchApi });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows).toEqual([
-      expect.objectContaining({
-        id: "coding_limit_burst_quota",
-        label: "Burst quota",
-        usedPct: 75,
-        remainingPct: 25,
-        resetsAt: "2026-08-01T00:00:00Z",
-      }),
-    ]);
-  });
-
-  it("keeps window ids unique when Kimi returns duplicate limit descriptors", async () => {
-    process.env["KIMI_TOKEN"] = "kimi_test_token";
-    const duplicate = {
-      window: { duration: 300, timeUnit: "TIME_UNIT_MINUTE" },
-      detail: { limit: "100", used: "10" },
-    };
-    const fetchApi = vi.fn(async () => jsonResponse({ limits: [duplicate, duplicate] }));
-    const provider = new KimiQuotaProvider({ logger: createLogger(), fetch: fetchApi });
-
-    const usage = await provider.fetchUsage();
-
-    expect(usage.windows.map((window) => window.id)).toEqual([
-      "coding_limit_300_time_unit_minute",
-      "coding_limit_300_time_unit_minute_2",
-    ]);
-  });
-});
diff --git a/packages/server/src/services/quota-fetcher/service.ts b/packages/server/src/services/quota-fetcher/service.ts
deleted file mode 100644
index dde20fb245..0000000000
--- a/packages/server/src/services/quota-fetcher/service.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type { Logger } from "pino";
-import type { ProviderUsage } from "../../server/messages.js";
-import { createProviderUsageFetchers } from "./manifest.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "./provider.js";
-import { unavailableUsage } from "./usage.js";
-
-export interface ProviderUsageServiceOptions {
-  logger: Logger;
-  fetchers?: ProviderUsageFetcher[];
-  fetch?: ProviderApiFetch;
-  cacheTtlMs?: number;
-  now?: () => number;
-}
-
-export interface ProviderUsageListResult {
-  fetchedAt: string;
-  providers: ProviderUsage[];
-}
-
-const DEFAULT_PROVIDER_USAGE_CACHE_TTL_MS = 5 * 60 * 1000;
-
-export class ProviderUsageService {
-  private readonly logger: Logger;
-  private readonly fetchers: ProviderUsageFetcher[];
-  private readonly cacheTtlMs: number;
-  private readonly now: () => number;
-  private cached: { fetchedAtMs: number; result: ProviderUsageListResult } | null = null;
-  private inFlight: Promise<ProviderUsageListResult> | null = null;
-
-  constructor(options: ProviderUsageServiceOptions) {
-    this.logger = options.logger.child({ module: "provider-usage-service" });
-    this.fetchers =
-      options.fetchers ??
-      createProviderUsageFetchers({
-        logger: this.logger,
-        fetch: options.fetch,
-      });
-    this.cacheTtlMs = options.cacheTtlMs ?? DEFAULT_PROVIDER_USAGE_CACHE_TTL_MS;
-    this.now = options.now ?? Date.now;
-  }
-
-  async listUsage(options?: { forceRefresh?: boolean }): Promise<ProviderUsageListResult> {
-    const nowMs = this.now();
-    if (
-      !options?.forceRefresh &&
-      this.cached &&
-      nowMs - this.cached.fetchedAtMs < this.cacheTtlMs
-    ) {
-      return this.cached.result;
-    }
-
-    if (this.inFlight) {
-      return this.inFlight;
-    }
-
-    const request = this.fetchFreshUsage(nowMs);
-    this.inFlight = request;
-    try {
-      return await request;
-    } finally {
-      if (this.inFlight === request) {
-        this.inFlight = null;
-      }
-    }
-  }
-
-  private async fetchFreshUsage(nowMs: number): Promise<ProviderUsageListResult> {
-    const settled = await Promise.allSettled(this.fetchers.map((fetcher) => fetcher.fetchUsage()));
-    const providers = settled.map((result, index) => {
-      const fetcher = this.fetchers[index];
-      if (result.status === "fulfilled") {
-        return result.value;
-      }
-      this.logger.debug(
-        { err: result.reason, providerId: fetcher.providerId },
-        "Provider usage fetch failed",
-      );
-      return unavailableUsage({
-        providerId: fetcher.providerId,
-        displayName: fetcher.displayName,
-        error: result.reason instanceof Error ? result.reason.message : String(result.reason),
-      });
-    });
-
-    const result = { fetchedAt: new Date(nowMs).toISOString(), providers };
-    this.cached = { fetchedAtMs: nowMs, result };
-    return result;
-  }
-}
diff --git a/packages/server/src/services/quota-fetcher/usage.test.ts b/packages/server/src/services/quota-fetcher/usage.test.ts
deleted file mode 100644
index 8e37583e30..0000000000
--- a/packages/server/src/services/quota-fetcher/usage.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { balanceToneFromRemaining, toneFromUsedPct, usedPctOf } from "./usage.js";
-
-describe("toneFromUsedPct", () => {
-  // Thresholds must match deriveTone in the app's provider-usage/tone.ts, which is what
-  // the client applies when a window arrives without a tone.
-  it.each([
-    [0, "ok"],
-    [69.9, "ok"],
-    [70, "warning"],
-    [90, "warning"],
-    [90.1, "danger"],
-    [100, "danger"],
-    [150, "danger"],
-  ])("%s%% used is %s", (usedPct, expected) => {
-    expect(toneFromUsedPct(usedPct)).toBe(expected);
-  });
-
-  it("is neutral when the percentage is unknown", () => {
-    expect(toneFromUsedPct(null)).toBe("default");
-    expect(toneFromUsedPct(undefined)).toBe("default");
-  });
-});
-
-describe("usedPctOf", () => {
-  it("computes a percentage of the limit", () => {
-    expect(usedPctOf(15.79, 42.5)).toBeCloseTo(37.15, 2);
-  });
-
-  it("is unknown when either side is missing", () => {
-    expect(usedPctOf(null, 100)).toBeNull();
-    expect(usedPctOf(50, null)).toBeNull();
-  });
-
-  // A zero limit would divide to Infinity and render as a full red bar.
-  it("is unknown when the limit is zero or negative", () => {
-    expect(usedPctOf(50, 0)).toBeNull();
-    expect(usedPctOf(50, -1)).toBeNull();
-  });
-});
-
-describe("balanceToneFromRemaining", () => {
-  // Kept for balances with no limit, where no percentage can be computed. It only
-  // escalates at exhaustion, which is why anything with a limit should use
-  // toneFromUsedPct instead.
-  it("stays ok until nothing is left", () => {
-    expect(balanceToneFromRemaining(0.01)).toBe("ok");
-    expect(balanceToneFromRemaining(0)).toBe("danger");
-    expect(balanceToneFromRemaining(null)).toBe("default");
-  });
-});
diff --git a/packages/server/src/services/quota-fetcher/usage.ts b/packages/server/src/services/quota-fetcher/usage.ts
deleted file mode 100644
index fa766f5778..0000000000
--- a/packages/server/src/services/quota-fetcher/usage.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { z } from "zod";
-import type {
-  ProviderUsage,
-  ProviderUsageBalance,
-  ProviderUsageTone,
-  ProviderUsageWindow,
-} from "../../server/messages.js";
-import type { ProviderApiFetch } from "./provider.js";
-
-const PROVIDER_HTTP_TIMEOUT_MS = 15_000;
-
-export const ApiNumberSchema = z.coerce.number().finite();
-export const ApiNullableNumberSchema = z.preprocess(
-  (value) => (value == null ? null : value),
-  ApiNumberSchema.nullable(),
-);
-export const ApiOptionalStringSchema = z.preprocess(
-  (value) => (value == null ? undefined : value),
-  z.coerce.string().optional(),
-);
-
-export function fetchProviderApi(
-  fetchApi: ProviderApiFetch,
-  input: RequestInfo | URL,
-  init: RequestInit = {},
-): Promise<Response> {
-  return fetchApi(input, {
-    ...init,
-    signal: init.signal ?? AbortSignal.timeout(PROVIDER_HTTP_TIMEOUT_MS),
-  });
-}
-
-export function unavailableUsage(provider: {
-  providerId: string;
-  displayName: string;
-  error?: string | null;
-}): ProviderUsage {
-  return {
-    providerId: provider.providerId,
-    displayName: provider.displayName,
-    status: provider.error ? "error" : "unavailable",
-    planLabel: null,
-    windows: [],
-    balances: [],
-    details: [],
-    error: provider.error ?? null,
-  };
-}
-
-export function windowFromUsedPct(input: {
-  id: string;
-  label: string;
-  utilizationPct: number | null | undefined;
-  resetsAt?: string | null;
-  tone?: ProviderUsageWindow["tone"];
-}): ProviderUsageWindow {
-  const usedPct = typeof input.utilizationPct === "number" ? input.utilizationPct : null;
-  const window: ProviderUsageWindow = {
-    id: input.id,
-    label: input.label,
-    usedPct,
-    remainingPct: usedPct === null ? null : Math.max(0, 100 - usedPct),
-    resetsAt: input.resetsAt ?? null,
-  };
-  if (input.tone) {
-    window.tone = input.tone;
-  }
-  return window;
-}
-
-/**
- * The tone scale for anything measured against a known limit, windows and balances alike.
- *
- * Thresholds match `deriveTone` in the app's provider-usage/tone.ts, which is what the
- * client falls back to when a window arrives without a tone. Healthy is "ok" rather than
- * "default" because that is what every provider setting a tone has always sent, and it is
- * what the bars render today below their thresholds.
- */
-export function toneFromUsedPct(usedPct: number | null | undefined): ProviderUsageTone {
-  if (typeof usedPct !== "number") return "default";
-  if (usedPct > 90) return "danger";
-  if (usedPct >= 70) return "warning";
-  return "ok";
-}
-
-/**
- * Tone for a balance with no known limit, where a percentage cannot be computed and the
- * only signal is whether anything is left. Prefer `toneFromUsedPct` when a limit exists:
- * this one stays "ok" until the balance is completely spent.
- */
-export function balanceToneFromRemaining(
-  remaining: number | null | undefined,
-): ProviderUsageBalance["tone"] {
-  if (typeof remaining !== "number") return "default";
-  if (remaining <= 0) return "danger";
-  return "ok";
-}
-
-/** Percentage of a limit consumed, or null when either side is unknown. */
-export function usedPctOf(
-  used: number | null | undefined,
-  limit: number | null | undefined,
-): number | null {
-  if (typeof used !== "number" || typeof limit !== "number" || limit <= 0) return null;
-  return (used / limit) * 100;
-}
-
-export function toIsoStringOrNull(timestampMs: number): string | null {
-  const date = new Date(timestampMs);
-  return Number.isFinite(date.getTime()) ? date.toISOString() : null;
-}
diff --git a/packages/server/src/terminal/agent-hooks/claude/claude.ts b/packages/server/src/terminal/agent-hooks/claude/claude.ts
index 35bfa9eca5..82ddcf770d 100644
--- a/packages/server/src/terminal/agent-hooks/claude/claude.ts
+++ b/packages/server/src/terminal/agent-hooks/claude/claude.ts
@@ -40,8 +40,8 @@ function isIdlePrompt(raw: string | null): boolean {
   try {
     const notification = JSON.parse(raw) as unknown;
     if (!notification || typeof notification !== "object") return false;
-    const payload = notification as { matcher?: unknown; reason?: unknown };
-    return payload.matcher === "idle_prompt" || payload.reason === "idle_prompt";
+    const payload = notification as { notification_type?: unknown };
+    return payload.notification_type === "idle_prompt";
   } catch {
     return false;
   }
diff --git a/packages/server/src/terminal/agent-hooks/opencode/opencode-plugin.ts b/packages/server/src/terminal/agent-hooks/opencode/opencode-plugin.ts
index 5fce566cd5..1a76e17a44 100644
--- a/packages/server/src/terminal/agent-hooks/opencode/opencode-plugin.ts
+++ b/packages/server/src/terminal/agent-hooks/opencode/opencode-plugin.ts
@@ -1,37 +1,72 @@
 import type { AgentHookPluginFileInstallStrategy } from "../agent-hook-installer.js";
 
+// Both generations discover the same file. Their loaders select the entrypoint:
+// OpenCode 1 calls server(); OpenCode 2 calls setup(). Keep their event contracts
+// separate: V1 publishes status snapshots, V2 publishes execution transitions.
 export const OPENCODE_PLUGIN_SOURCE = [
-  "const STATUS_EVENTS = {",
+  "const V1_STATUS_EVENTS = {",
   '  busy: "session.status.busy",',
   '  retry: "session.status.retry",',
   '  idle: "session.status.idle",',
   "};",
   "",
-  "function paseoEventFor(event) {",
-  '  if (event?.type === "permission.asked") return "permission.asked";',
-  '  if (event?.type === "permission.replied") return "permission.replied";',
-  '  if (event?.type !== "session.status") return null;',
-  "  return STATUS_EVENTS[event?.properties?.status?.type] ?? null;",
+  "const V2_EVENTS = {",
+  '  "session.execution.started": "session.status.busy",',
+  '  "session.execution.succeeded": "session.status.idle",',
+  '  "session.execution.failed": "session.status.idle",',
+  '  "session.execution.interrupted": "session.status.idle",',
+  '  "permission.asked": "permission.asked",',
+  '  "permission.replied": "permission.replied",',
+  "};",
+  "",
+  "function paseoEventForV1(event) {",
+  "  const type = event.type;",
+  '  if (type === "permission.asked") return "permission.asked";',
+  '  if (type === "permission.replied") return "permission.replied";',
+  '  if (type !== "session.status") return null;',
+  "  return V1_STATUS_EVENTS[event.properties.status.type] ?? null;",
   "}",
   "",
+  // CLI processes can finish out of order, especially for immediate failures.
+  // Both entrypoints enqueue reports so an older busy report cannot overwrite idle.
+  "let pendingHook = Promise.resolve();",
+  "",
   "function runPaseoHook(event) {",
   "  if (!process.env.PASEO_TERMINAL_ID) return;",
-  "  try {",
-  '    const child = Bun.spawn(["paseo", "hooks", "opencode", event], {',
-  '      stdin: "ignore",',
-  '      stdout: "ignore",',
-  '      stderr: "ignore",',
-  "    });",
-  "    void child.exited.catch(() => {});",
-  "  } catch {}",
+  "  pendingHook = pendingHook.then(async () => {",
+  "    try {",
+  '      const child = Bun.spawn(["paseo", "hooks", "opencode", event], {',
+  '        stdin: "ignore",',
+  '        stdout: "ignore",',
+  '        stderr: "ignore",',
+  "      });",
+  "      await child.exited;",
+  "    } catch {}",
+  "  });",
+  "  return pendingHook;",
   "}",
   "",
-  "export default async () => ({",
-  "  event: async ({ event }) => {",
-  "    const paseoEvent = paseoEventFor(event);",
-  "    if (paseoEvent) runPaseoHook(paseoEvent);",
+  "export default {",
+  '  id: "paseo-terminal-activity",',
+  "  server() {",
+  "    return {",
+  "      event: async ({ event }) => {",
+  "        const paseoEvent = paseoEventForV1(event);",
+  "        if (paseoEvent) await runPaseoHook(paseoEvent);",
+  "      },",
+  "    };",
   "  },",
-  "});",
+  "  setup(ctx) {",
+  "    const controller = new AbortController();",
+  "    void (async () => {",
+  "      for await (const event of ctx.event.subscribe({ signal: controller.signal })) {",
+  "        const paseoEvent = V2_EVENTS[event.type];",
+  "        if (paseoEvent) await runPaseoHook(paseoEvent);",
+  "      }",
+  "    })().catch(() => {});",
+  "    return () => controller.abort();",
+  "  },",
+  "};",
   "",
 ].join("\n");
 
diff --git a/packages/server/src/terminal/agent-hooks/opencode/opencode.test.ts b/packages/server/src/terminal/agent-hooks/opencode/opencode.test.ts
index 6ba28b22ee..7379e5e9d3 100644
--- a/packages/server/src/terminal/agent-hooks/opencode/opencode.test.ts
+++ b/packages/server/src/terminal/agent-hooks/opencode/opencode.test.ts
@@ -1,6 +1,9 @@
 import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { addAbortSignal, PassThrough, Readable } from "node:stream";
+import { finished } from "node:stream/promises";
+import { runInNewContext } from "node:vm";
 import { afterEach, describe, expect, it } from "vitest";
 import {
   agentHooksAreInstalled,
@@ -40,18 +43,123 @@ describe("OpenCode terminal agent hooks", () => {
     expect(agentHooksAreInstalled(opencodeAgentHookProvider, { configDir })).toBe(true);
   });
 
-  it("writes the plugin that maps OpenCode bus events to paseo hook events", () => {
-    const configDir = createTempDir("paseo-opencode-config-source-");
-    const { configPath } = installAgentHooks(opencodeAgentHookProvider, { configDir });
-    const source = readFileSync(configPath, "utf8");
+  it.each(["succeeded", "failed", "interrupted"])(
+    "reports OpenCode 2 execution start and %s as running then idle",
+    async (outcome) => {
+      const { plugin, commands } = loadInstalledPlugin();
+      const events = Readable.from([
+        { type: "session.execution.started", data: { sessionID: "session-1" } },
+        { type: `session.execution.${outcome}`, data: { sessionID: "session-1" } },
+      ]);
 
-    expect(source).toContain('busy: "session.status.busy"');
-    expect(source).toContain('retry: "session.status.retry"');
-    expect(source).toContain('idle: "session.status.idle"');
-    expect(source).toContain('event?.type === "permission.asked"');
-    expect(source).toContain('event?.type === "permission.replied"');
-    expect(source).toContain('Bun.spawn(["paseo", "hooks", "opencode", event]');
-    expect(source).toContain("PASEO_TERMINAL_ID");
+      const dispose = plugin.setup({ event: { subscribe: () => events } });
+      await finished(events);
+      dispose();
+
+      expect(commands).toEqual([
+        ["paseo", "hooks", "opencode", "session.status.busy"],
+        ["paseo", "hooks", "opencode", "session.status.idle"],
+      ]);
+    },
+  );
+
+  it("reports OpenCode 1 status and permission events through server()", async () => {
+    const { plugin, commands } = loadInstalledPlugin();
+    const hooks = plugin.server();
+    for (const event of [
+      { type: "session.status", properties: { status: { type: "busy" } } },
+      { type: "permission.asked" },
+      { type: "permission.replied" },
+      { type: "session.status", properties: { status: { type: "retry" } } },
+      { type: "session.status", properties: { status: { type: "idle" } } },
+      { type: "session.execution.started", data: { sessionID: "session-1" } },
+      { type: "message.updated" },
+    ]) {
+      await hooks.event({ event });
+    }
+
+    expect(plugin.id).toBe("paseo-terminal-activity");
+    expect(commands).toEqual([
+      ["paseo", "hooks", "opencode", "session.status.busy"],
+      ["paseo", "hooks", "opencode", "permission.asked"],
+      ["paseo", "hooks", "opencode", "permission.replied"],
+      ["paseo", "hooks", "opencode", "session.status.retry"],
+      ["paseo", "hooks", "opencode", "session.status.idle"],
+    ]);
+  });
+
+  it("reports OpenCode 2 permission events and ignores V1 status snapshots", async () => {
+    const { plugin, commands } = loadInstalledPlugin();
+    const events = Readable.from([
+      { type: "permission.asked", data: { sessionID: "session-1" } },
+      { type: "permission.replied", data: { sessionID: "session-1" } },
+      { type: "session.status", properties: { status: { type: "busy" } } },
+      { type: "session.text.delta", data: { sessionID: "session-1" } },
+    ]);
+
+    const dispose = plugin.setup({ event: { subscribe: () => events } });
+    await finished(events);
+    dispose();
+
+    expect(commands).toEqual([
+      ["paseo", "hooks", "opencode", "permission.asked"],
+      ["paseo", "hooks", "opencode", "permission.replied"],
+    ]);
+  });
+
+  it("preserves activity order when the host dispatches events concurrently", async () => {
+    let finishFirstHook = () => {};
+    const firstExit = new Promise<number>((resolve) => {
+      finishFirstHook = () => resolve(0);
+    });
+    const { plugin, commands } = loadInstalledPlugin("terminal-1", firstExit);
+    const hooks = plugin.server();
+
+    const working = hooks.event({
+      event: { type: "session.status", properties: { status: { type: "busy" } } },
+    });
+    const idle = hooks.event({
+      event: { type: "session.status", properties: { status: { type: "idle" } } },
+    });
+    await Promise.resolve();
+    expect(commands).toEqual([["paseo", "hooks", "opencode", "session.status.busy"]]);
+
+    finishFirstHook();
+    await Promise.all([working, idle]);
+    expect(commands).toEqual([
+      ["paseo", "hooks", "opencode", "session.status.busy"],
+      ["paseo", "hooks", "opencode", "session.status.idle"],
+    ]);
+  });
+
+  it("stops the OpenCode 2 subscription when unloaded", async () => {
+    const { plugin, commands } = loadInstalledPlugin();
+    const events = new PassThrough({ objectMode: true });
+    const closed = finished(events);
+    const dispose = plugin.setup({
+      event: { subscribe: ({ signal }) => addAbortSignal(signal, events) },
+    });
+
+    dispose();
+
+    await expect(closed).rejects.toMatchObject({ name: "AbortError" });
+    expect(commands).toEqual([]);
+  });
+
+  it("keeps both generations inert outside Paseo terminals", async () => {
+    const { plugin, commands } = loadInstalledPlugin("");
+    await plugin.server().event({
+      event: { type: "session.status", properties: { status: { type: "busy" } } },
+    });
+    const events = Readable.from([
+      { type: "session.execution.started", data: { sessionID: "session-1" } },
+      { type: "permission.asked", data: { sessionID: "session-1" } },
+    ]);
+    const dispose = plugin.setup({ event: { subscribe: () => events } });
+    await finished(events);
+    dispose();
+
+    expect(commands).toEqual([]);
   });
 
   it("uninstalls the OpenCode plugin file", () => {
@@ -121,3 +229,39 @@ describe("OpenCode terminal agent hooks", () => {
     ).resolves.toBe(state);
   });
 });
+
+interface OpenCodeEvent {
+  type: string;
+  properties?: { status: { type: string } };
+  data?: { sessionID: string };
+}
+
+interface InstalledPlugin {
+  id: string;
+  server(): { event(input: { event: OpenCodeEvent }): Promise<void> };
+  setup(context: {
+    event: { subscribe(options: { signal: AbortSignal }): AsyncIterable<OpenCodeEvent> };
+  }): () => void;
+}
+
+function loadInstalledPlugin(terminalId = "terminal-1", exited = Promise.resolve(0)) {
+  const configDir = createTempDir("paseo-opencode-runtime-");
+  const { configPath } = installAgentHooks(opencodeAgentHookProvider, { configDir });
+  const source = readFileSync(configPath, "utf8");
+  const commands: string[][] = [];
+  // Supply the host runtime at the script boundary; execute the installed source.
+  const plugin: InstalledPlugin = runInNewContext(
+    source.replace("export default", "globalThis.plugin ="),
+    {
+      AbortController,
+      process: { env: { PASEO_TERMINAL_ID: terminalId } },
+      Bun: {
+        spawn(command: string[]) {
+          commands.push(command);
+          return { exited };
+        },
+      },
+    },
+  );
+  return { plugin, commands };
+}
diff --git a/packages/server/src/terminal/terminal-session-controller.resize.test.ts b/packages/server/src/terminal/terminal-session-controller.resize.test.ts
index 63181b2482..c84b03cab7 100644
--- a/packages/server/src/terminal/terminal-session-controller.resize.test.ts
+++ b/packages/server/src/terminal/terminal-session-controller.resize.test.ts
@@ -5,7 +5,12 @@ import {
   encodeTerminalResizePayload,
   type TerminalStreamFrame,
 } from "@getpaseo/protocol/binary-frames/index";
-import type { SessionOutboundMessage, TerminalState } from "@getpaseo/protocol/messages";
+import { SessionDelivery } from "../server/session/owned-subscriptions/index.js";
+import type {
+  SessionInboundMessage,
+  SessionOutboundMessage,
+  TerminalState,
+} from "@getpaseo/protocol/messages";
 import type pino from "pino";
 
 import { TerminalSessionController } from "./terminal-session-controller.js";
@@ -80,44 +85,57 @@ describe("terminal session controller size ownership", () => {
     const { terminalManager, appliedSizes } = createFixture();
     const controllerA = createController(terminalManager);
     const controllerB = createController(terminalManager);
+    const sourceA = {};
+    const sourceB = {};
+    const ownership = new SessionDelivery(() => {});
+    // Legacy binary resize and attach sizing remain source scoped.
+    const dispatch = (
+      controller: TerminalSessionController,
+      source: object,
+      message: SessionInboundMessage,
+    ) =>
+      ownership.request(source, message, async () => {
+        await controller.dispatch(message, ownership);
+      });
 
-    controllerA.dispatch({
+    await dispatch(controllerA, sourceA, {
       type: "terminal_input",
       terminalId: "terminal-1",
       message: { type: "resize", rows: 30, cols: 100, intent: "claim" },
     });
-    controllerA.dispatch({
+    await dispatch(controllerA, sourceA, {
       type: "terminal_input",
       terminalId: "terminal-1",
       message: { type: "resize", rows: 31, cols: 101, intent: "update" },
     });
-    controllerB.dispatch({
+    await dispatch(controllerB, sourceB, {
       type: "terminal_input",
       terminalId: "terminal-1",
       message: { type: "resize", rows: 32, cols: 102, intent: "update" },
     });
 
-    await controllerB.dispatch({
+    await dispatch(controllerB, sourceB, {
       type: "subscribe_terminal_request",
       terminalId: "terminal-1",
       requestId: "subscribe-b",
       restore: { mode: "live" },
     });
-    controllerB.handleBinaryFrame(resizeFrame({ rows: 33, cols: 103, intent: "claim" }));
-    controllerA.dispatch({
+    controllerB.handleBinaryFrame(resizeFrame({ rows: 33, cols: 103, intent: "claim" }), sourceB);
+    await dispatch(controllerA, sourceA, {
       type: "terminal_input",
       terminalId: "terminal-1",
       message: { type: "resize", rows: 34, cols: 104, intent: "update" },
     });
 
-    await controllerA.dispatch({
+    await dispatch(controllerA, sourceA, {
       type: "subscribe_terminal_request",
       terminalId: "terminal-1",
       requestId: "subscribe-a",
       restore: { mode: "live", size: { rows: 35, cols: 105 } },
     });
-    controllerB.handleBinaryFrame(resizeFrame({ rows: 36, cols: 106, intent: "update" }));
+    controllerB.handleBinaryFrame(resizeFrame({ rows: 36, cols: 106, intent: "update" }), sourceB);
 
+    await ownership.close();
     expect(appliedSizes).toEqual(["100x30", "101x31", "103x33", "105x35"]);
   });
 });
diff --git a/packages/server/src/terminal/terminal-session-controller.test.ts b/packages/server/src/terminal/terminal-session-controller.test.ts
index 16ff7b64e6..b438af8381 100644
--- a/packages/server/src/terminal/terminal-session-controller.test.ts
+++ b/packages/server/src/terminal/terminal-session-controller.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test, vi } from "vitest";
-import type pino from "pino";
+import pino from "pino";
 
-import type { SessionOutboundMessage } from "../server/messages.js";
+import type { SessionInboundMessage, SessionOutboundMessage } from "../server/messages.js";
 import {
   TerminalStreamOpcode,
   decodeTerminalStreamFrame,
@@ -9,11 +9,41 @@ import {
 } from "@getpaseo/protocol/binary-frames/index";
 import type { TerminalCell, TerminalState } from "@getpaseo/protocol/messages";
 import type { ServerMessage, TerminalSession, TerminalStateSnapshot } from "./terminal.js";
-import { TerminalSessionController } from "./terminal-session-controller.js";
+import {
+  TerminalSessionController,
+  type TerminalSessionControllerOptions,
+} from "./terminal-session-controller.js";
+import { SessionDelivery } from "../server/session/owned-subscriptions/index.js";
 import type { TerminalManager, TerminalsChangedEvent } from "./terminal-manager.js";
 import { isSameOrDescendantPath } from "../server/path-utils.js";
 import { PluginSessionSocket } from "../server/plugins/session-socket.js";
 
+function createController(
+  options: TerminalSessionControllerOptions & { emitBinary(frame: Uint8Array): void },
+) {
+  const source = {};
+  const ownership = new SessionDelivery(
+    (_source, message) => options.emit(message),
+    (_source, frame) => options.emitBinary(frame),
+  );
+  ownership.attach(source, false);
+  const controller = new TerminalSessionController({
+    ...options,
+    emit: (message) => {
+      if (!ownership.reply(message)) options.emit(message);
+    },
+  });
+  return {
+    start: () => controller.start(),
+    dispatch: (message: SessionInboundMessage) =>
+      ownership.request(source, message, async () => {
+        await controller.dispatch(message, ownership);
+      }),
+    hasDirectorySubscription: (input: { cwd: string; workspaceId?: string }) =>
+      controller.hasDirectorySubscription(input),
+  };
+}
+
 function deferred<T>(): {
   promise: Promise<T>;
   resolve: (value: T) => void;
@@ -102,7 +132,7 @@ describe("terminal-session-controller restore", () => {
       subscribeTerminalActivity: vi.fn(() => vi.fn()),
       subscribeTerminalWorkspaceContributionChanged: vi.fn(() => vi.fn()),
     };
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: (bytes) => {
@@ -218,7 +248,7 @@ describe("terminal-session-controller legacy terminal creation", () => {
       subscribeTerminalActivity: vi.fn(() => vi.fn()),
       subscribeTerminalWorkspaceContributionChanged: vi.fn(() => vi.fn()),
     };
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: vi.fn(),
@@ -293,14 +323,14 @@ describe("terminal-session-controller legacy terminal creation", () => {
       subscribeTerminalActivity: vi.fn(() => vi.fn()),
       subscribeTerminalWorkspaceContributionChanged: vi.fn(() => vi.fn()),
     };
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: vi.fn(),
       hasBinaryChannel: () => true,
       isPathWithinRoot: isSameOrDescendantPath,
       sessionLogger: createLogger(),
-      listTerminalWorkspaceRefs: async () => [],
+      listTerminalWorkspaceRefs: async () => [{ workspaceId: "ws-1", cwd: "/work/repo" }],
     });
 
     await controller.dispatch({
@@ -329,7 +359,7 @@ async function waitForCoalescerFlush(): Promise<void> {
 
 describe("terminal-session-controller wrap-flag gating", () => {
   function setup(clientSupportsWrapReflow?: () => boolean): {
-    controller: TerminalSessionController;
+    controller: ReturnType<typeof createController>;
     getTerminalState: ReturnType<typeof vi.fn>;
   } {
     const terminal: TerminalSession = {
@@ -379,7 +409,7 @@ describe("terminal-session-controller wrap-flag gating", () => {
       subscribeTerminalActivity: vi.fn(() => vi.fn()),
       subscribeTerminalWorkspaceContributionChanged: vi.fn(() => vi.fn()),
     } as unknown as TerminalManager;
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: vi.fn(),
       emitBinary: vi.fn(),
@@ -391,7 +421,7 @@ describe("terminal-session-controller wrap-flag gating", () => {
     return { controller, getTerminalState };
   }
 
-  async function subscribe(controller: TerminalSessionController): Promise<void> {
+  async function subscribe(controller: ReturnType<typeof createController>): Promise<void> {
     await controller.dispatch({
       type: "subscribe_terminal_request",
       terminalId: "term-1",
@@ -457,7 +487,7 @@ describe("terminal-session-controller subdirectory aggregation", () => {
     };
 
     const outboundMessages: SessionOutboundMessage[] = [];
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: vi.fn(),
@@ -521,7 +551,7 @@ describe("terminal-session-controller subdirectory aggregation", () => {
       subscribeTerminalWorkspaceContributionChanged: vi.fn(() => vi.fn()),
     };
     const outboundMessages: SessionOutboundMessage[] = [];
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: vi.fn(),
@@ -548,7 +578,13 @@ describe("terminal-session-controller subdirectory aggregation", () => {
         payload: {
           cwd: rootCwd,
           terminals: [
-            { id: "root-term", name: "Terminal 1", workspaceId: "ws-test", activity: null },
+            {
+              id: "root-term",
+              name: "Terminal 1",
+              cwd: rootCwd,
+              workspaceId: "ws-test",
+              activity: null,
+            },
           ],
           requestId: "req-root",
         },
@@ -558,7 +594,13 @@ describe("terminal-session-controller subdirectory aggregation", () => {
         payload: {
           cwd: worktreeCwd,
           terminals: [
-            { id: "worktree-term", name: "Feature", workspaceId: "ws-test", activity: null },
+            {
+              id: "worktree-term",
+              name: "Feature",
+              cwd: worktreeCwd,
+              workspaceId: "ws-test",
+              activity: null,
+            },
           ],
           requestId: "req-worktree",
         },
@@ -605,7 +647,7 @@ describe("terminal-session-controller workspace-scoped subscriptions", () => {
     };
 
     const outboundMessages: SessionOutboundMessage[] = [];
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: (message) => outboundMessages.push(message),
       emitBinary: vi.fn(),
@@ -702,7 +744,7 @@ describe("terminal-session-controller backpressure snapshot fallback", () => {
     } as unknown as TerminalManager;
 
     const frames: TerminalStreamFrame[] = [];
-    const controller = new TerminalSessionController({
+    const controller = createController({
       terminalManager,
       emit: vi.fn(),
       emitBinary: (bytes) => {
@@ -795,3 +837,442 @@ describe("terminal-session-controller backpressure snapshot fallback", () => {
     expect(frames.some((frame) => frame.opcode === TerminalStreamOpcode.Snapshot)).toBe(true);
   });
 });
+
+function exitFixture(readSnapshot: () => Promise<TerminalStateSnapshot | null>, backedUp = false) {
+  const outputs = new Set<(message: ServerMessage) => void>();
+  const exits = new Set<Parameters<TerminalSession["onExit"]>[0]>();
+  const terminal: TerminalSession = {
+    id: "exit-terminal",
+    name: "Terminal",
+    cwd: "/unused",
+    workspaceId: "workspace",
+    send() {},
+    subscribe(listener) {
+      outputs.add(listener);
+      return () => {
+        outputs.delete(listener);
+      };
+    },
+    onExit(listener) {
+      exits.add(listener);
+      return () => {
+        exits.delete(listener);
+      };
+    },
+    onCommandFinished: () => () => {},
+    onTitleChange: () => () => {},
+    onActivityChange: () => () => {},
+    getSize: () => ({ rows: 1, cols: 80 }),
+    getState: () => terminalState("snapshot"),
+    getStateSnapshot: () => ({ state: terminalState("snapshot"), revision: 0 }),
+    getReplayPreamble: () => "",
+    getTitle: () => undefined,
+    getActivity: () => null,
+    setActivity() {},
+    clearActivityAttention: () => false,
+    setTitle() {},
+    getExitInfo: () => null,
+    kill() {},
+    async killAndWait() {},
+  };
+  const manager: TerminalManager = {
+    getTerminal: () => terminal,
+    getTerminalState: readSnapshot,
+    getTerminals: async () => [terminal],
+    createTerminal: async () => terminal,
+    registerCwdEnv() {},
+    validateTerminalActivityToken: () => "unknown",
+    setTerminalTitle: () => true,
+    setTerminalActivity: async () => true,
+    clearTerminalAttention: async () => false,
+    killTerminal() {},
+    async killTerminalAndWait() {},
+    captureTerminal: async () => ({ lines: [], totalLines: 0 }),
+    listDirectories: () => [],
+    killAll() {},
+    subscribeTerminalsChanged: () => () => {},
+    subscribeTerminalActivity: () => () => {},
+    subscribeTerminalWorkspaceContributionChanged: () => () => {},
+  };
+  const frames: Array<{
+    source: object;
+    message?: SessionOutboundMessage;
+    binary?: TerminalStreamFrame;
+  }> = [];
+  const delivery = new SessionDelivery(
+    (source, message) => frames.push({ source, message }),
+    (source, bytes) => {
+      const binary = decodeTerminalStreamFrame(bytes);
+      if (binary) frames.push({ source, binary });
+    },
+  );
+  const controller = new TerminalSessionController({
+    terminalManager: manager,
+    emit: (message) => {
+      delivery.reply(message);
+    },
+    hasBinaryChannel: () => true,
+    isPathWithinRoot: () => false,
+    sessionLogger: pino({ level: "silent" }),
+    getClientBufferedAmount: () => (backedUp ? 8 * 1024 * 1024 : 0),
+  });
+  return {
+    frames,
+    delivery,
+    controller,
+    outputs,
+    exits,
+    subscribe: async (source: object, modern: boolean, requestId: string) => {
+      delivery.attach(source, modern);
+      const request = {
+        type: "subscribe_terminal_request" as const,
+        terminalId: terminal.id,
+        requestId,
+      };
+      await delivery.request(source, request, async () => {
+        await controller.dispatch(request, delivery);
+      });
+      const reply = frames.find(
+        (row) =>
+          row.message?.type === "subscribe_terminal_response" &&
+          row.message.payload.requestId === requestId,
+      )?.message;
+      if (reply?.type !== "subscribe_terminal_response" || reply.payload.error !== null)
+        throw new Error("Missing stream acknowledgement");
+      return { source, slot: reply.payload.slot, id: reply.payload.subscriptionId };
+    },
+    output: (data: string, revision: number) => {
+      for (const listener of outputs) listener({ type: "output", data, revision });
+    },
+    exit: () => {
+      for (const listener of exits) listener({ exitCode: 0, signal: null, lastOutputLines: [] });
+    },
+  };
+}
+
+describe("terminal output before natural exit", () => {
+  test.each([true, false])(
+    "flushes each observer's final bytes before exit (modern=%s)",
+    async (modern) => {
+      vi.useFakeTimers();
+      const f = exitFixture(async () => ({ state: terminalState("snapshot"), revision: 0 }));
+      try {
+        const source = {};
+        const owners = [
+          await f.subscribe(source, modern, "first"),
+          await f.subscribe(modern ? source : {}, modern, "second"),
+        ];
+        await vi.advanceTimersByTimeAsync(0);
+        f.output("FIRST-OUTPUT", 1);
+        await vi.advanceTimersByTimeAsync(5);
+        f.output("FINAL-BYTES", 2);
+        f.exit();
+        await vi.advanceTimersByTimeAsync(0);
+        for (const owner of owners) {
+          const ordered = f.frames.filter(
+            (row) =>
+              row.source === owner.source &&
+              (row.binary?.slot === owner.slot ||
+                (row.message?.type === "terminal_stream_exit" &&
+                  row.message.payload.subscriptionId === owner.id)),
+          );
+          expect(ordered.map((row) => row.binary?.opcode ?? row.message?.type)).toEqual([
+            TerminalStreamOpcode.Snapshot,
+            TerminalStreamOpcode.Output,
+            TerminalStreamOpcode.Output,
+            "terminal_stream_exit",
+          ]);
+          expect(Buffer.from(ordered[2].binary!.payload).toString()).toBe("FINAL-BYTES");
+        }
+        if (modern) expect(new Set(owners.map((owner) => owner.id)).size).toBe(2);
+        expect(f.delivery.registrationCount).toBe(0);
+        expect(f.controller.getMetrics().streamSubscriptionCount).toBe(0);
+        expect(f.outputs.size + f.exits.size).toBe(0);
+      } finally {
+        await f.delivery.close();
+        vi.useRealTimers();
+      }
+    },
+  );
+
+  test("waits for bootstrap snapshot and flushes buffered bytes without starting backpressure work", async () => {
+    vi.useFakeTimers();
+    const snapshot = deferred<TerminalStateSnapshot | null>();
+    let reads = 0;
+    const f = exitFixture(() => {
+      reads++;
+      return snapshot.promise;
+    }, true);
+    try {
+      await f.subscribe({}, true, "bootstrap");
+      f.output("x".repeat(300 * 1024), 1);
+      f.output("FINAL-BYTES", 2);
+      f.exit();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(f.frames.map((row) => row.message?.type)).toEqual(["subscribe_terminal_response"]);
+      snapshot.resolve({ state: terminalState("snapshot"), revision: 0 });
+      await vi.advanceTimersByTimeAsync(0);
+      expect(f.frames.slice(1).map((row) => row.binary?.opcode ?? row.message?.type)).toEqual([
+        TerminalStreamOpcode.Snapshot,
+        TerminalStreamOpcode.Output,
+        "terminal_stream_exit",
+      ]);
+      expect(Buffer.from(f.frames[2].binary!.payload).toString()).toBe(
+        "x".repeat(300 * 1024) + "FINAL-BYTES",
+      );
+      expect(reads).toBe(1);
+      expect(f.delivery.registrationCount).toBe(0);
+    } finally {
+      snapshot.resolve(null);
+      await f.delivery.close();
+      vi.useRealTimers();
+    }
+  });
+
+  test.each([true, false, "rejected"])(
+    "finishes an in-flight backpressure snapshot (available=%s)",
+    async (available) => {
+      vi.useFakeTimers();
+      const snapshot = deferred<TerminalStateSnapshot | null>();
+      let reads = 0;
+      const f = exitFixture(
+        async () =>
+          ++reads === 1 ? { state: terminalState("initial"), revision: 0 } : snapshot.promise,
+        true,
+      );
+      try {
+        await f.subscribe({}, true, "pressure");
+        await vi.advanceTimersByTimeAsync(0);
+        f.output("x".repeat(300 * 1024), 1);
+        await vi.advanceTimersByTimeAsync(5);
+        expect(reads).toBe(2);
+        f.output("FINAL-BYTES", 2);
+        f.exit();
+        await vi.advanceTimersByTimeAsync(0);
+        expect(f.frames.some((row) => row.message?.type === "terminal_stream_exit")).toBe(false);
+        if (available === "rejected") snapshot.reject(new Error("Snapshot failed during exit"));
+        else
+          snapshot.resolve(
+            available ? { state: terminalState("pressure-snapshot"), revision: 1 } : null,
+          );
+        await vi.advanceTimersByTimeAsync(0);
+        const output = f.frames
+          .filter((row) => row.binary?.opcode === TerminalStreamOpcode.Output)
+          .map((row) => Buffer.from(row.binary!.payload).toString())
+          .join("");
+        expect(output).toBe((available === true ? "" : "x".repeat(300 * 1024)) + "FINAL-BYTES");
+        expect(f.frames.at(-1)?.message?.type).toBe("terminal_stream_exit");
+        expect(f.delivery.registrationCount).toBe(0);
+        expect(reads).toBe(2);
+      } finally {
+        snapshot.resolve(null);
+        await f.delivery.close();
+        vi.useRealTimers();
+      }
+    },
+  );
+
+  test("release during exit's pending snapshot suppresses late delivery", async () => {
+    vi.useFakeTimers();
+    const snapshot = deferred<TerminalStateSnapshot | null>();
+    const f = exitFixture(() => snapshot.promise);
+    const source = {};
+    try {
+      const owner = await f.subscribe(source, true, "pending");
+      f.output("FINAL-BYTES", 1);
+      f.exit();
+      const request = {
+        type: "subscription.release.request" as const,
+        requestId: "release",
+        subscriptionId: owner.id!,
+      };
+      const release = f.delivery.request(source, request, () => f.delivery.release(owner.id!));
+      snapshot.resolve({ state: terminalState("snapshot"), revision: 0 });
+      await release;
+      await vi.advanceTimersByTimeAsync(0);
+      expect(f.frames.map((row) => row.message?.type)).toEqual(["subscribe_terminal_response"]);
+      expect(f.delivery.registrationCount).toBe(0);
+      expect(f.outputs.size + f.exits.size).toBe(0);
+    } finally {
+      snapshot.resolve(null);
+      await f.delivery.close();
+      vi.useRealTimers();
+    }
+  });
+
+  test("explicit release discards only that observer's trailing output", async () => {
+    vi.useFakeTimers();
+    const f = exitFixture(async () => ({ state: terminalState("snapshot"), revision: 0 }));
+    const source = {};
+    try {
+      const a = await f.subscribe(source, true, "a");
+      const b = await f.subscribe(source, true, "b");
+      await vi.advanceTimersByTimeAsync(0);
+      f.output("FINAL-BYTES", 1);
+      const request = {
+        type: "subscription.release.request" as const,
+        requestId: "release",
+        subscriptionId: a.id!,
+      };
+      await f.delivery.request(source, request, () => f.delivery.release(a.id!));
+      f.exit();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(
+        f.frames.some(
+          (row) =>
+            row.binary &&
+            row.binary.slot === a.slot &&
+            row.binary.opcode === TerminalStreamOpcode.Output,
+        ),
+      ).toBe(false);
+      expect(
+        f.frames.some(
+          (row) =>
+            row.binary &&
+            row.binary.slot === b.slot &&
+            row.binary.opcode === TerminalStreamOpcode.Output &&
+            Buffer.from(row.binary.payload).toString() === "FINAL-BYTES",
+        ),
+      ).toBe(true);
+      expect(f.delivery.registrationCount).toBe(0);
+    } finally {
+      await f.delivery.close();
+      vi.useRealTimers();
+    }
+  });
+});
+
+describe("terminal snapshot failure", () => {
+  test.each(["initial", "backpressure"])(
+    "releases only the failed observer after %s rejection",
+    async (phase) => {
+      vi.useFakeTimers();
+      let reads = 0;
+      const f = exitFixture(async () => {
+        if (++reads === (phase === "backpressure" ? 2 : 1))
+          throw new Error("Terminal worker request timed out: getTerminalState");
+        return { state: terminalState("healthy"), revision: 0 };
+      }, phase === "backpressure");
+      try {
+        const source = {};
+        const failed = await f.subscribe(source, true, "failed");
+        await vi.advanceTimersByTimeAsync(0);
+        if (phase === "backpressure") {
+          f.output("x".repeat(300 * 1024), 1);
+          await vi.advanceTimersByTimeAsync(5);
+        }
+        const healthy = await f.subscribe(source, true, "healthy");
+        await vi.advanceTimersByTimeAsync(0);
+        f.output("SIBLING-ALIVE", 2);
+        await vi.advanceTimersByTimeAsync(5);
+        expect(f.delivery.registrationCount).toBe(1);
+        expect(f.controller.getMetrics().streamSubscriptionCount).toBe(1);
+        expect(f.outputs.size).toBe(1);
+        expect(f.exits.size).toBe(1);
+        expect(
+          f.frames
+            .filter((row) => row.message?.type === "terminal_stream_exit")
+            .map((row) => row.message),
+        ).toEqual([
+          {
+            type: "terminal_stream_exit",
+            payload: {
+              terminalId: "exit-terminal",
+              subscriptionId: failed.id,
+              error: "Terminal worker request timed out: getTerminalState",
+            },
+          },
+        ]);
+        expect(
+          f.frames.some(
+            (row) =>
+              row.binary?.slot === healthy.slot &&
+              row.binary?.opcode === TerminalStreamOpcode.Output &&
+              Buffer.from(row.binary.payload).toString() === "SIBLING-ALIVE",
+          ),
+        ).toBe(true);
+        f.exit();
+        await vi.advanceTimersByTimeAsync(0);
+        expect(f.frames.at(-1)?.message).toEqual({
+          type: "terminal_stream_exit",
+          payload: {
+            terminalId: "exit-terminal",
+            subscriptionId: healthy.id,
+          },
+        });
+        expect(f.delivery.registrationCount).toBe(0);
+        expect(f.outputs.size + f.exits.size).toBe(0);
+      } finally {
+        await f.delivery.close();
+        vi.useRealTimers();
+      }
+    },
+  );
+
+  test("release during pending rejection suppresses the failure and completes cleanup", async () => {
+    const snapshot = deferred<TerminalStateSnapshot | null>();
+    const f = exitFixture(() => snapshot.promise);
+    const source = {};
+    try {
+      const owner = await f.subscribe(source, true, "pending");
+      f.output("BUFFERED", 1);
+      const request = {
+        type: "subscription.release.request" as const,
+        requestId: "release",
+        subscriptionId: owner.id!,
+      };
+      const release = f.delivery.request(source, request, () => f.delivery.release(owner.id!));
+      snapshot.reject(new Error("Terminal worker request timed out: getTerminalState"));
+      await release;
+      expect(f.frames.map((row) => row.message?.type)).toEqual(["subscribe_terminal_response"]);
+      expect(f.delivery.registrationCount).toBe(0);
+      expect(f.controller.getMetrics().streamSubscriptionCount).toBe(0);
+      expect(f.outputs.size + f.exits.size).toBe(0);
+    } finally {
+      snapshot.resolve(null);
+      await f.delivery.close();
+    }
+  });
+});
+
+test.each([false, true])(
+  "legacy snapshot failure retries without reporting a live PTY exited (backpressure=%s)",
+  async (backpressure) => {
+    vi.useFakeTimers();
+    let reads = 0;
+    const f = exitFixture(async () => {
+      if (++reads === (backpressure ? 2 : 1)) throw new Error("Snapshot unavailable");
+      return { state: terminalState("recovered"), revision: 0 };
+    }, backpressure);
+    try {
+      await f.subscribe({}, false, "legacy-recovery");
+      await vi.advanceTimersByTimeAsync(0);
+      if (backpressure) {
+        f.output("x".repeat(300 * 1024), 1);
+        await vi.advanceTimersByTimeAsync(5);
+      }
+      expect(f.frames.filter((row) => row.message?.type === "terminal_stream_exit")).toEqual([]);
+      f.output("RECOVERED-OUTPUT", 2);
+      for (const listener of f.outputs) listener({ type: "snapshotReady", revision: 2 });
+      await vi.advanceTimersByTimeAsync(5);
+      expect(reads).toBe(backpressure ? 3 : 2);
+      expect(f.frames.some((row) => row.binary?.opcode === TerminalStreamOpcode.Snapshot)).toBe(
+        true,
+      );
+      f.exit();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(f.frames.filter((row) => row.message?.type === "terminal_stream_exit")).toHaveLength(
+        1,
+      );
+      expect(f.frames.at(-1)?.message).toEqual({
+        type: "terminal_stream_exit",
+        payload: { terminalId: "exit-terminal" },
+      });
+      expect(f.delivery.registrationCount).toBe(0);
+      expect(f.outputs.size + f.exits.size).toBe(0);
+    } finally {
+      await f.delivery.close();
+      vi.useRealTimers();
+    }
+  },
+);
diff --git a/packages/server/src/terminal/terminal-session-controller.ts b/packages/server/src/terminal/terminal-session-controller.ts
index 50c4109d06..4f46dbc88c 100644
--- a/packages/server/src/terminal/terminal-session-controller.ts
+++ b/packages/server/src/terminal/terminal-session-controller.ts
@@ -1,4 +1,8 @@
 import type pino from "pino";
+import type {
+  OwnedSubscription,
+  SessionDelivery,
+} from "../server/session/owned-subscriptions/index.js";
 import type {
   CaptureTerminalRequest,
   CreateTerminalRequest,
@@ -39,6 +43,14 @@ import { terminalSubscriptionKey } from "@getpaseo/protocol/terminal-subscriptio
 
 const MAX_TERMINAL_STREAM_SLOTS = 256;
 
+interface TerminalDirectorySubscription {
+  cwd: string;
+  workspaceId: string | undefined;
+  owner: OwnedSubscription;
+  refresh: Promise<void> | null;
+  pending: boolean;
+}
+
 interface BufferedTerminalOutput {
   data: string;
   revision?: number;
@@ -47,9 +59,14 @@ interface BufferedTerminalOutput {
 interface ActiveTerminalStream {
   terminalId: string;
   slot: number;
+  owner: OwnedSubscription;
+  snapshotTask?: Promise<void>;
+  snapshotOutput?: Buffer;
+  exiting: boolean;
   unsubscribe: () => void;
   needsSnapshot: boolean;
   snapshotInFlight: boolean;
+  retrySnapshotErrors: boolean;
   readyRevision?: number;
   restore?: TerminalRestoreOptions;
   bufferedOutputs: BufferedTerminalOutput[];
@@ -65,7 +82,6 @@ interface SnapshotSendResult {
 export interface TerminalSessionControllerOptions {
   terminalManager: TerminalManager | null;
   emit: (msg: SessionOutboundMessage) => void;
-  emitBinary: (frame: Uint8Array) => void;
   hasBinaryChannel: () => boolean;
   isPathWithinRoot: (rootPath: string, candidatePath: string) => boolean;
   sessionLogger: pino.Logger;
@@ -74,7 +90,7 @@ export interface TerminalSessionControllerOptions {
   // Whether the connected client can reflow restored snapshots. When true the
   // daemon attaches per-row soft-wrap flags to snapshots; otherwise it omits them
   // so old (strict-schema) clients still parse the snapshot.
-  clientSupportsWrapReflow?: () => boolean;
+  clientSupportsWrapReflow?: (source: object) => boolean;
   // Current max bytes queued on the client's transport(s) but not yet sent.
   // Drives the snapshot catch-up fallback: a keeping-up client reports ~0 and
   // keeps streaming; a backed-up client trips the snapshot path. Defaults to a
@@ -82,7 +98,7 @@ export interface TerminalSessionControllerOptions {
   // stream.
   // Bytes queued on the client transport but not yet sent, or null when the
   // transport exposes no backpressure signal (e.g. the multiplexed relay socket).
-  getClientBufferedAmount?: () => number | null;
+  getClientBufferedAmount?: (source: object) => number | null;
 }
 
 interface TerminalWorkspaceRef {
@@ -123,34 +139,22 @@ const TERMINAL_MESSAGE_TYPES: ReadonlySet<TerminalDispatchableMessage["type"]> =
 export class TerminalSessionController {
   private readonly terminalManager: TerminalManager | null;
   private readonly emit: (msg: SessionOutboundMessage) => void;
-  private readonly emitBinary: (frame: Uint8Array) => void;
   private readonly hasBinaryChannel: () => boolean;
   private readonly isPathWithinRoot: (rootPath: string, candidatePath: string) => boolean;
   private readonly sessionLogger: pino.Logger;
   private readonly listTerminalWorkspaceRefs: () => Promise<readonly TerminalWorkspaceRef[]>;
   private readonly listTerminalWorkspaceRoots: () => Promise<readonly string[]>;
-  private readonly clientSupportsWrapReflow: () => boolean;
-  private readonly getClientBufferedAmount: () => number | null;
-  private readonly terminalSizeOwner = {};
+  private readonly clientSupportsWrapReflow: (source: object) => boolean;
+  private readonly getClientBufferedAmount: (source: object) => number | null;
 
-  // A subscription is scoped to a (cwd, workspaceId) pair, keyed by
-  // terminalSubscriptionKey: two workspaces sharing a cwd subscribe and unsub
-  // independently, and each only receives its own workspace's terminals. The
-  // workspaceId is absent for old clients, which key to the cwd alone.
-  private readonly subscribedDirectories = new Map<
-    string,
-    { cwd: string; workspaceId: string | undefined }
-  >();
+  private readonly subscribedDirectories = new Map<string, TerminalDirectorySubscription>();
   private unsubscribeTerminalsChanged: (() => void) | null = null;
-  private readonly exitSubscriptions = new Map<string, () => void>();
   private readonly activeStreams = new Map<number, ActiveTerminalStream>();
-  private readonly idToSlot = new Map<string, number>();
   private nextSlot = 0;
 
   constructor(options: TerminalSessionControllerOptions) {
     this.terminalManager = options.terminalManager;
     this.emit = options.emit;
-    this.emitBinary = options.emitBinary;
     this.hasBinaryChannel = options.hasBinaryChannel;
     this.isPathWithinRoot = options.isPathWithinRoot;
     this.sessionLogger = options.sessionLogger;
@@ -163,9 +167,7 @@ export class TerminalSessionController {
   }
 
   start(): void {
-    if (!this.terminalManager) {
-      return;
-    }
+    if (!this.terminalManager || this.unsubscribeTerminalsChanged) return;
     this.unsubscribeTerminalsChanged = this.terminalManager.subscribeTerminalsChanged((event) => {
       void this.handleTerminalsChanged(event);
     });
@@ -178,9 +180,16 @@ export class TerminalSessionController {
     };
   }
 
-  async hasDirectorySubscription(input: { cwd: string; workspaceId?: string }): Promise<boolean> {
+  async hasDirectorySubscription(
+    input: { cwd: string; workspaceId?: string },
+    source?: object,
+  ): Promise<boolean> {
+    const subscriptions = [...this.subscribedDirectories.values()].filter(
+      (subscription) => !source || subscription.owner.source === source,
+    );
+    if (subscriptions.length === 0) return false;
     const workspaceRoots = await this.listTerminalWorkspaceRoots();
-    return Array.from(this.subscribedDirectories.values()).some((subscription) => {
+    return subscriptions.some((subscription) => {
       if (
         subscription.workspaceId !== undefined &&
         subscription.workspaceId !== input.workspaceId
@@ -191,28 +200,28 @@ export class TerminalSessionController {
     });
   }
 
-  dispatch(msg: SessionInboundMessage): Promise<void> | undefined {
+  dispatch(msg: SessionInboundMessage, ownership: SessionDelivery): Promise<void> | undefined {
     if (!isTerminalMessage(msg)) {
       return undefined;
     }
     switch (msg.type) {
       case "subscribe_terminals_request":
-        this.handleSubscribeTerminalsRequest(msg);
-        return undefined;
+        return this.handleSubscribeTerminalsRequest(msg, ownership);
       case "unsubscribe_terminals_request":
-        this.handleUnsubscribeTerminalsRequest(msg);
-        return undefined;
+        return ownership.releaseLegacySlot(
+          `terminal-directory:${terminalSubscriptionKey(msg.cwd, msg.workspaceId)}`,
+        );
       case "list_terminals_request":
         return this.handleListTerminalsRequest(msg);
       case "create_terminal_request":
         return this.handleCreateTerminalRequest(msg);
       case "subscribe_terminal_request":
-        return this.handleSubscribeTerminalRequest(msg);
+        return this.handleSubscribeTerminalRequest(msg, ownership);
       case "unsubscribe_terminal_request":
-        this.handleUnsubscribeTerminalRequest(msg);
-        return undefined;
+        return ownership.releaseLegacySlot(`terminal-output:${msg.terminalId}`);
       case "terminal_input":
-        this.handleTerminalInput(msg);
+        if (!ownership.currentSource) throw new Error("Terminal input requires a source");
+        this.handleTerminalInput(msg, ownership.currentSource);
         return undefined;
       case "kill_terminal_request":
         return this.handleKillTerminalRequest(msg);
@@ -225,9 +234,9 @@ export class TerminalSessionController {
     }
   }
 
-  handleBinaryFrame(frame: TerminalStreamFrame): void {
+  handleBinaryFrame(frame: TerminalStreamFrame, source: object): void {
     const activeStream = this.activeStreams.get(frame.slot);
-    if (!activeStream || !this.terminalManager) {
+    if (!activeStream || activeStream.owner.source !== source || !this.terminalManager) {
       return;
     }
     const terminal = this.terminalManager.getTerminal(activeStream.terminalId);
@@ -254,7 +263,7 @@ export class TerminalSessionController {
         if (!resize) {
           return;
         }
-        applyTerminalSize(terminal, this.terminalSizeOwner, resize);
+        applyTerminalSize(terminal, source, resize);
         return;
       }
 
@@ -289,52 +298,13 @@ export class TerminalSessionController {
     }
     this.subscribedDirectories.clear();
 
-    for (const unsubscribeExit of this.exitSubscriptions.values()) {
-      unsubscribeExit();
+    for (const stream of this.activeStreams.values()) {
+      void stream.owner
+        .release()
+        .catch((error) =>
+          this.sessionLogger.warn({ err: error }, "Failed to release terminal stream"),
+        );
     }
-    this.exitSubscriptions.clear();
-
-    for (const terminalId of Array.from(this.idToSlot.keys())) {
-      this.detachStream(terminalId, { emitExit: false });
-    }
-  }
-
-  private ensureExitSubscription(terminal: TerminalSession): void {
-    if (this.exitSubscriptions.has(terminal.id)) {
-      return;
-    }
-    const unsubscribeExit = terminal.onExit(() => {
-      this.handleTerminalExited(terminal.id);
-    });
-    this.exitSubscriptions.set(terminal.id, unsubscribeExit);
-  }
-
-  private handleTerminalExited(terminalId: string): void {
-    const unsubscribeExit = this.exitSubscriptions.get(terminalId);
-    if (unsubscribeExit) {
-      unsubscribeExit();
-      this.exitSubscriptions.delete(terminalId);
-    }
-    this.detachStream(terminalId, { emitExit: true });
-  }
-
-  private emitTerminalsChangedSnapshot(input: {
-    cwd: string;
-    terminals: Array<{
-      id: string;
-      name: string;
-      workspaceId: string;
-      title?: string;
-      activity: TerminalActivity | null;
-    }>;
-  }): void {
-    this.emit({
-      type: "terminals_changed",
-      payload: {
-        cwd: input.cwd,
-        terminals: input.terminals,
-      },
-    });
   }
 
   private toTerminalInfo(
@@ -371,47 +341,78 @@ export class TerminalSessionController {
     }
   }
 
-  private handleSubscribeTerminalsRequest(msg: SubscribeTerminalsRequest): void {
-    const subscription = { cwd: msg.cwd, workspaceId: msg.workspaceId };
-    this.subscribedDirectories.set(terminalSubscriptionKey(msg.cwd, msg.workspaceId), subscription);
-    void this.emitTerminalsSnapshotForSubscription(subscription);
-  }
-
-  private handleUnsubscribeTerminalsRequest(msg: UnsubscribeTerminalsRequest): void {
-    this.subscribedDirectories.delete(terminalSubscriptionKey(msg.cwd, msg.workspaceId));
-  }
-
-  private async emitTerminalsSnapshotForSubscription(subscription: {
-    cwd: string;
-    workspaceId: string | undefined;
-  }): Promise<void> {
-    const key = terminalSubscriptionKey(subscription.cwd, subscription.workspaceId);
-    if (!this.terminalManager || !this.subscribedDirectories.has(key)) {
-      return;
-    }
+  private async handleSubscribeTerminalsRequest(
+    msg: SubscribeTerminalsRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
+    if (!this.terminalManager) throw new Error("Terminal manager not available");
+    let subscription: TerminalDirectorySubscription | undefined;
+    const owner = ownership.begin(
+      "terminal-directories",
+      undefined,
+      async (id) => {
+        this.subscribedDirectories.delete(id);
+        if (this.subscribedDirectories.size === 0) {
+          this.unsubscribeTerminalsChanged?.();
+          this.unsubscribeTerminalsChanged = null;
+        }
+        await subscription?.refresh?.catch(() => undefined);
+      },
+      `terminal-directory:${terminalSubscriptionKey(msg.cwd, msg.workspaceId)}`,
+    );
+    subscription = {
+      cwd: msg.cwd,
+      workspaceId: msg.workspaceId,
+      owner,
+      refresh: null,
+      pending: false,
+    };
+    this.subscribedDirectories.set(owner.id, subscription);
+    this.start();
     try {
-      const terminals = await this.getTerminalsForWorkspaceRoot(
-        subscription.cwd,
-        subscription.workspaceId,
-      );
-      for (const terminal of terminals) {
-        this.ensureExitSubscription(terminal);
-      }
-      if (!this.subscribedDirectories.has(key)) {
-        return;
-      }
-      this.emitTerminalsChangedSnapshot({
-        cwd: subscription.cwd,
-        terminals: terminals.map((terminal) => this.toTerminalInfo(terminal)),
-      });
+      await this.emitTerminalsSnapshotForSubscription(subscription, msg.requestId);
     } catch (error) {
-      this.sessionLogger.warn(
-        { err: error, cwd: subscription.cwd },
-        "Failed to emit initial terminal snapshot",
-      );
+      await owner.release();
+      throw error;
     }
   }
 
+  private emitTerminalsSnapshotForSubscription(
+    subscription: TerminalDirectorySubscription,
+    requestId?: string,
+  ): Promise<void> {
+    if (subscription.refresh) {
+      subscription.pending = true;
+      return subscription.refresh;
+    }
+    const refresh = (async () => {
+      do {
+        subscription.pending = false;
+        const terminals = await this.getTerminalsForWorkspaceRoot(
+          subscription.cwd,
+          subscription.workspaceId,
+        );
+        if (subscription.owner.signal.aborted) return;
+        subscription.owner.emit({
+          type: "terminals_changed",
+          payload: {
+            cwd: subscription.cwd,
+            workspaceId: subscription.workspaceId,
+            terminals: terminals.map((terminal) => this.toTerminalInfo(terminal)),
+            ...(requestId ? { requestId } : {}),
+          },
+        });
+        requestId = undefined;
+      } while (subscription.pending);
+    })();
+    subscription.refresh = refresh;
+    const settled = () => {
+      subscription.refresh = null;
+    };
+    void refresh.then(settled, settled);
+    return refresh;
+  }
+
   private async handleListTerminalsRequest(msg: ListTerminalsRequest): Promise<void> {
     if (!this.terminalManager) {
       this.emit({
@@ -426,18 +427,23 @@ export class TerminalSessionController {
     }
 
     try {
-      const terminals =
-        typeof msg.cwd === "string"
-          ? await this.getTerminalsForWorkspaceRoot(msg.cwd, msg.workspaceId)
-          : await this.getAllTerminalSessions();
-      for (const terminal of terminals) {
-        this.ensureExitSubscription(terminal);
+      let terminals: TerminalSession[];
+      if (msg.workspaceId !== undefined) {
+        terminals = (await this.getAllTerminalSessions()).filter(
+          (terminal) => terminal.workspaceId === msg.workspaceId,
+        );
+      } else if (typeof msg.cwd === "string") {
+        terminals = await this.getTerminalsForWorkspaceRoot(msg.cwd);
+      } else {
+        terminals = await this.getAllTerminalSessions();
       }
       this.emit({
         type: "list_terminals_response",
         payload: {
           ...(msg.cwd ? { cwd: msg.cwd } : {}),
-          terminals: terminals.map((terminal) => this.toTerminalInfo(terminal)),
+          terminals: terminals.map((terminal) =>
+            Object.assign(this.toTerminalInfo(terminal), { cwd: terminal.cwd }),
+          ),
           requestId: msg.requestId,
         },
       });
@@ -463,7 +469,9 @@ export class TerminalSessionController {
     const terminalsByDirectory = await Promise.all(
       directories.map((cwd) => manager.getTerminals(cwd)),
     );
-    return terminalsByDirectory.flat();
+    return [
+      ...new Map(terminalsByDirectory.flat().map((terminal) => [terminal.id, terminal])).values(),
+    ];
   }
 
   private async getTerminalsForWorkspaceRoot(
@@ -558,6 +566,11 @@ export class TerminalSessionController {
         return;
       }
 
+      const workspaces = await this.listTerminalWorkspaceRefs();
+      if (!workspaces.some((workspace) => workspace.workspaceId === workspaceId)) {
+        throw new Error(`Workspace ${workspaceId} is not active or does not exist`);
+      }
+
       const session = await this.terminalManager.createTerminal({
         cwd: msg.cwd,
         workspaceId,
@@ -567,7 +580,6 @@ export class TerminalSessionController {
         rows: msg.size?.rows,
         cols: msg.size?.cols,
       });
-      this.ensureExitSubscription(session);
       this.emit({
         type: "create_terminal_response",
         payload: {
@@ -647,7 +659,10 @@ export class TerminalSessionController {
     respond(renamed, renamed ? null : "Terminal not found");
   }
 
-  private async handleSubscribeTerminalRequest(msg: SubscribeTerminalRequest): Promise<void> {
+  private async handleSubscribeTerminalRequest(
+    msg: SubscribeTerminalRequest,
+    ownership: SessionDelivery,
+  ): Promise<void> {
     if (!this.terminalManager) {
       this.emit({
         type: "subscribe_terminal_response",
@@ -672,17 +687,32 @@ export class TerminalSessionController {
       });
       return;
     }
-    this.ensureExitSubscription(session);
 
-    if (msg.restore?.size) {
-      applyTerminalSize(session, this.terminalSizeOwner, {
+    let stream: ActiveTerminalStream | undefined;
+    const owner = ownership.begin(
+      "terminal-output",
+      undefined,
+      async () => {
+        if (!stream) return;
+        this.detachRegistration(stream);
+        await stream.snapshotTask;
+      },
+      `terminal-output:${msg.terminalId}`,
+    );
+    // COMPAT(ownedSubscriptions): added in v0.8.0, remove after 2027-03-09 once client floor >= v0.8.0.
+    if (!ownership.isModern(owner.source) && msg.restore?.size) {
+      applyTerminalSize(session, owner.source, {
         ...msg.restore.size,
         intent: "claim",
       });
     }
 
-    const slot = this.bindActiveStream(session, { restore: msg.restore });
+    const slot = this.bindActiveStream(session, owner, {
+      restore: msg.restore,
+      retrySnapshotErrors: !ownership.isModern(owner.source),
+    });
     if (slot === null) {
+      await owner.release();
       this.sessionLogger.warn(
         {
           terminalId: msg.terminalId,
@@ -706,22 +736,17 @@ export class TerminalSessionController {
       payload: {
         terminalId: msg.terminalId,
         slot,
+        subscriptionId: owner.responseId,
         error: null,
         requestId: msg.requestId,
       },
     });
 
-    const activeStream = this.activeStreams.get(slot);
-    if (activeStream) {
-      void this.trySendSnapshot(activeStream);
-    }
+    stream = this.activeStreams.get(slot);
+    if (stream) void this.trySendSnapshot(stream);
   }
 
-  private handleUnsubscribeTerminalRequest(msg: UnsubscribeTerminalRequest): void {
-    this.detachStream(msg.terminalId, { emitExit: false });
-  }
-
-  private handleTerminalInput(msg: TerminalInput): void {
+  private handleTerminalInput(msg: TerminalInput, source: object): void {
     if (!this.terminalManager) {
       return;
     }
@@ -730,10 +755,9 @@ export class TerminalSessionController {
       this.sessionLogger.warn({ terminalId: msg.terminalId }, "Terminal not found for input");
       return;
     }
-    this.ensureExitSubscription(session);
 
     if (msg.message.type === "resize") {
-      applyTerminalSize(session, this.terminalSizeOwner, msg.message);
+      applyTerminalSize(session, source, msg.message);
       return;
     }
 
@@ -746,12 +770,24 @@ export class TerminalSessionController {
   }
 
   private async handleKillTerminalRequest(msg: KillTerminalRequest): Promise<void> {
-    const result = this.killTerminalForClose(msg.terminalId);
+    let success = false;
+    if (this.terminalManager) {
+      try {
+        this.detachStream(msg.terminalId, { emitExit: true });
+        await this.terminalManager.killTerminalAndWait(msg.terminalId);
+        success = true;
+      } catch (error) {
+        this.sessionLogger.error(
+          { err: error, terminalId: msg.terminalId },
+          "Failed to kill terminal",
+        );
+      }
+    }
     this.emit({
       type: "kill_terminal_response",
       payload: {
-        terminalId: result.terminalId,
-        success: result.success,
+        terminalId: msg.terminalId,
+        success,
         requestId: msg.requestId,
       },
     });
@@ -785,8 +821,6 @@ export class TerminalSessionController {
       return;
     }
 
-    this.ensureExitSubscription(session);
-
     try {
       const capture = await this.terminalManager.captureTerminal(msg.terminalId, {
         start: msg.start,
@@ -821,23 +855,13 @@ export class TerminalSessionController {
 
   private bindActiveStream(
     terminal: TerminalSession,
-    options?: { restore?: TerminalRestoreOptions },
+    owner: OwnedSubscription,
+    options: { restore?: TerminalRestoreOptions; retrySnapshotErrors: boolean },
   ): number | null {
     if (!this.hasBinaryChannel()) {
       return null;
     }
 
-    const existingSlot = this.idToSlot.get(terminal.id);
-    if (typeof existingSlot === "number") {
-      const existingStream = this.activeStreams.get(existingSlot);
-      if (existingStream) {
-        existingStream.needsSnapshot = true;
-        existingStream.restore = options?.restore;
-        return existingSlot;
-      }
-      this.idToSlot.delete(terminal.id);
-    }
-
     const slot = this.allocateSlot();
     if (slot === null) {
       return null;
@@ -846,9 +870,12 @@ export class TerminalSessionController {
     const activeStream: ActiveTerminalStream = {
       terminalId: terminal.id,
       slot,
+      owner,
       unsubscribe: () => {},
       needsSnapshot: true,
       snapshotInFlight: false,
+      retrySnapshotErrors: options.retrySnapshotErrors,
+      exiting: false,
       readyRevision: undefined,
       restore: options?.restore,
       bufferedOutputs: [],
@@ -870,17 +897,21 @@ export class TerminalSessionController {
           // (e.g. the multiplexed relay socket); there we can't tell a slow client
           // from a fast one, so fall back unconditionally at the byte threshold to
           // keep a slow relay client from falling unboundedly behind.
-          const clientBufferedAmount = this.getClientBufferedAmount();
+          const clientBufferedAmount = this.getClientBufferedAmount(owner.source);
           if (
+            !activeStream.exiting &&
             activeStream.outputBytesSinceSnapshot > MAX_TERMINAL_OUTPUT_FRAME_BYTES &&
             (clientBufferedAmount === null || clientBufferedAmount > MAX_CLIENT_BUFFERED_BYTES)
           ) {
+            // The snapshot replaces this batch only after it succeeds. If the
+            // terminal disappears during the read, completion still owns these bytes.
+            activeStream.snapshotOutput = payload;
             activeStream.restore = resolveRestoreAfterOutputOverflow(activeStream.restore);
             activeStream.needsSnapshot = true;
             void this.trySendSnapshot(activeStream);
             return;
           }
-          this.emitBinary(
+          activeStream.owner.emitBinary(
             encodeTerminalStreamFrame({
               opcode: TerminalStreamOpcode.Output,
               slot,
@@ -892,9 +923,8 @@ export class TerminalSessionController {
     };
 
     this.activeStreams.set(slot, activeStream);
-    this.idToSlot.set(terminal.id, slot);
 
-    activeStream.unsubscribe = terminal.subscribe(
+    const unsubscribeOutput = terminal.subscribe(
       (message) => {
         if (this.activeStreams.get(slot) !== activeStream) {
           return;
@@ -923,10 +953,24 @@ export class TerminalSessionController {
       },
       { initialSnapshot: resolveTerminalSubscriptionSnapshotMode(options?.restore) },
     );
+    const unsubscribeExit = terminal.onExit(() =>
+      this.detachStream(terminal.id, { emitExit: true }),
+    );
+    activeStream.unsubscribe = () => {
+      unsubscribeOutput();
+      unsubscribeExit();
+    };
     return slot;
   }
 
-  private async trySendSnapshot(activeStream: ActiveTerminalStream): Promise<void> {
+  private trySendSnapshot(activeStream: ActiveTerminalStream): Promise<void> {
+    if (activeStream.snapshotInFlight) return activeStream.snapshotTask ?? Promise.resolve();
+    const task = this.sendSnapshot(activeStream);
+    activeStream.snapshotTask = task;
+    return task;
+  }
+
+  private async sendSnapshot(activeStream: ActiveTerminalStream): Promise<void> {
     if (
       this.activeStreams.get(activeStream.slot) !== activeStream ||
       !activeStream.needsSnapshot ||
@@ -959,15 +1003,40 @@ export class TerminalSessionController {
       if (!snapshotResult.shouldContinue) {
         return;
       }
+      activeStream.snapshotOutput = undefined;
       this.replayTerminalOutputAfterSnapshot(activeStream, terminal, snapshotResult.replayRevision);
       activeStream.needsSnapshot = false;
       activeStream.outputBytesSinceSnapshot = 0;
     } catch (error) {
+      if (this.activeStreams.get(activeStream.slot) !== activeStream) return;
       this.sessionLogger.warn(
         { err: error, terminalId: activeStream.terminalId },
         "Failed to pull terminal snapshot",
       );
-      activeStream.needsSnapshot = true;
+      // Natural completion owns the buffered final bytes and waits for this read.
+      if (activeStream.exiting) return;
+      // COMPAT(terminalSnapshotErrors): restored in v0.8.0; remove after 2027-03-11 once client floor >= v0.8.0.
+      // Old clients interpret every stream exit as PTY exit. Preserve their
+      // attached stream after failure. Another snapshot notification can retry;
+      // this does not schedule recovery. Source teardown still releases the stream.
+      if (activeStream.retrySnapshotErrors) {
+        activeStream.needsSnapshot = true;
+        return;
+      }
+      activeStream.owner.emit({
+        type: "terminal_stream_exit",
+        payload: {
+          terminalId: activeStream.terminalId,
+          error: error instanceof Error ? error.message : "Unable to read terminal snapshot",
+        },
+      });
+      // Cleanup removes this slot/listeners synchronously, then awaits this task.
+      // Awaiting release here would make the snapshot task wait for itself.
+      void activeStream.owner
+        .release()
+        .catch((releaseError) =>
+          this.sessionLogger.warn({ err: releaseError }, "Failed to release terminal stream"),
+        );
     } finally {
       activeStream.snapshotInFlight = false;
     }
@@ -978,7 +1047,7 @@ export class TerminalSessionController {
     terminalManager: TerminalManager,
   ): Promise<SnapshotSendResult> {
     const snapshot = await terminalManager.getTerminalState(activeStream.terminalId, {
-      includeWrapFlags: this.clientSupportsWrapReflow(),
+      includeWrapFlags: this.clientSupportsWrapReflow(activeStream.owner.source),
     });
     if (this.activeStreams.get(activeStream.slot) !== activeStream) {
       return { shouldContinue: false };
@@ -988,7 +1057,7 @@ export class TerminalSessionController {
       return { shouldContinue: false };
     }
 
-    this.emitBinary(
+    activeStream.owner.emitBinary(
       encodeLegacyTerminalSnapshotFrame({
         slot: activeStream.slot,
         snapshot,
@@ -1012,7 +1081,7 @@ export class TerminalSessionController {
 
     const snapshot = await terminalManager.getTerminalState(activeStream.terminalId, {
       ...snapshotOptions,
-      includeWrapFlags: this.clientSupportsWrapReflow(),
+      includeWrapFlags: this.clientSupportsWrapReflow(activeStream.owner.source),
     });
     if (this.activeStreams.get(activeStream.slot) !== activeStream) {
       return { shouldContinue: false };
@@ -1022,7 +1091,7 @@ export class TerminalSessionController {
       return { shouldContinue: false };
     }
 
-    this.emitBinary(
+    activeStream.owner.emitBinary(
       encodeTerminalRestoreFrame({
         slot: activeStream.slot,
         snapshot,
@@ -1073,33 +1142,44 @@ export class TerminalSessionController {
   }
 
   private detachStream(terminalId: string, options?: { emitExit: boolean }): boolean {
-    const slot = this.idToSlot.get(terminalId);
-    if (typeof slot !== "number") {
-      return false;
+    let detached = false;
+    for (const stream of this.activeStreams.values()) {
+      if (stream.terminalId !== terminalId) continue;
+      detached = true;
+      if (stream.exiting) continue;
+      stream.exiting = true;
+      const completion = options?.emitExit ? this.completeStream(stream) : stream.owner.release();
+      void completion.catch((error) =>
+        this.sessionLogger.warn({ err: error }, "Failed to release terminal stream"),
+      );
     }
-    const activeStream = this.activeStreams.get(slot);
-    if (!activeStream) {
-      this.idToSlot.delete(terminalId);
-      return false;
+    return detached;
+  }
+
+  private async completeStream(stream: ActiveTerminalStream): Promise<void> {
+    // Preserve bootstrap/snapshot ordering. Explicit release can remove this
+    // registration while the read is pending, in which case it discards delivery.
+    await stream.snapshotTask;
+    if (this.activeStreams.get(stream.slot) !== stream) return;
+    if (stream.snapshotOutput) {
+      stream.outputCoalescer.handle(stream.snapshotOutput.toString("utf8"));
+      stream.snapshotOutput = undefined;
     }
-    activeStream.outputCoalescer.flush();
-    activeStream.bufferedOutputs.length = 0;
-    this.activeStreams.delete(slot);
-    this.idToSlot.delete(terminalId);
-    try {
-      activeStream.unsubscribe();
-    } catch (error) {
-      this.sessionLogger.warn({ err: error }, "Failed to unsubscribe terminal stream");
+    for (const output of stream.bufferedOutputs.splice(0)) {
+      stream.outputCoalescer.handle(output.data);
     }
-    if (options?.emitExit) {
-      this.emit({
-        type: "terminal_stream_exit",
-        payload: {
-          terminalId: activeStream.terminalId,
-        },
-      });
-    }
-    return true;
+    // Completion must not turn this final flush into another backpressure read.
+    stream.outputCoalescer.flush();
+    stream.owner.emit({ type: "terminal_stream_exit", payload: { terminalId: stream.terminalId } });
+    await stream.owner.release();
+  }
+
+  private detachRegistration(stream: ActiveTerminalStream): void {
+    this.activeStreams.delete(stream.slot);
+    stream.outputCoalescer.dispose();
+    stream.snapshotOutput = undefined;
+    stream.bufferedOutputs.length = 0;
+    stream.unsubscribe();
   }
 }
 
diff --git a/packages/server/src/terminal/terminal-size-ownership.ts b/packages/server/src/terminal/terminal-size-ownership.ts
index 626ae8a634..788a771a0c 100644
--- a/packages/server/src/terminal/terminal-size-ownership.ts
+++ b/packages/server/src/terminal/terminal-size-ownership.ts
@@ -6,7 +6,7 @@ interface TerminalSizeRequest {
   intent?: "claim" | "update";
 }
 
-const terminalSizeOwners = new WeakMap<TerminalSession, object>();
+const terminalSizeOwners = new WeakMap<TerminalSession, WeakRef<object>>();
 
 export function applyTerminalSize(
   terminal: TerminalSession,
@@ -14,12 +14,12 @@ export function applyTerminalSize(
   request: TerminalSizeRequest,
 ): boolean {
   const intent = resolveTerminalSizeIntent(request.intent);
-  if (intent === "update" && terminalSizeOwners.get(terminal) !== owner) {
+  if (intent === "update" && terminalSizeOwners.get(terminal)?.deref() !== owner) {
     return false;
   }
 
   if (intent === "claim") {
-    terminalSizeOwners.set(terminal, owner);
+    terminalSizeOwners.set(terminal, new WeakRef(owner));
   }
 
   const currentSize = terminal.getSize();
diff --git a/packages/server/src/terminal/terminal.test.ts b/packages/server/src/terminal/terminal.test.ts
index 9881f4bdfd..f83b6b9ba3 100644
--- a/packages/server/src/terminal/terminal.test.ts
+++ b/packages/server/src/terminal/terminal.test.ts
@@ -24,6 +24,8 @@ import {
 } from "node:fs";
 import { spawnSync } from "node:child_process";
 import * as pty from "node-pty";
+import xterm from "@xterm/headless";
+import { renderTerminalSnapshotToAnsi } from "@getpaseo/protocol/terminal-snapshot";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { setImmediate as waitForImmediate, setTimeout as delay } from "node:timers/promises";
@@ -50,6 +52,10 @@ function getLines(state: ReturnType<TerminalSession["getState"]>): string[] {
   return state.grid.map(rowToText);
 }
 
+function rowHasChar(row: TerminalRow, char: string): boolean {
+  return row.some((cell) => cell.char === char);
+}
+
 // Wait for terminal state to match expected lines
 async function waitForLines(
   session: TerminalSession,
@@ -523,6 +529,44 @@ describe("createTerminal", () => {
     expect(withoutFlags.scrollbackWrapped).toBeUndefined();
   });
 
+  it("restores CJK text without injected spaces when a snapshot round-trips through the client", async () => {
+    // Each Hangul syllable is a wide char: xterm stores it as a 2-cell pair
+    // whose second cell has no chars. Capturing that continuation as " " made
+    // every restored syllable three columns wide (paseo#3434).
+    const text = "통합 구현은 전체 테스트를 통과했습니다";
+    const session = trackSession(
+      await createTerminal({
+        workspaceId: "ws-test",
+        cwd: realpathSync(tmpdir()),
+        cols: 80,
+        rows: 10,
+        command: process.execPath,
+        args: [
+          "-e",
+          `process.stdout.write(${JSON.stringify(text)}); setInterval(() => {}, 100000);`,
+        ],
+      }),
+    );
+
+    const state = await waitForState(session, (current) => rowHasChar(current.grid[0], "다"));
+
+    // Replay the snapshot the way the client does on tab switch and read the
+    // row back the way a selection copy would.
+    const restored = new xterm.Terminal({ cols: 80, rows: 10, allowProposedApi: true });
+    try {
+      await new Promise<void>((resolve) =>
+        restored.write(renderTerminalSnapshotToAnsi(state), resolve),
+      );
+      expect(restored.buffer.active.getLine(0)?.translateToString(true)).toBe(text);
+    } finally {
+      restored.dispose();
+    }
+
+    // The continuation cell must stay empty so the restore path can skip it.
+    expect(state.grid[0][0].char).toBe("통");
+    expect(state.grid[0][1].char).toBe("");
+  });
+
   it("captures exit diagnostics from the terminal buffer", async () => {
     const session = trackSession(
       await createTerminal({
diff --git a/packages/server/src/terminal/terminal.ts b/packages/server/src/terminal/terminal.ts
index b9d1b74017..1e708062b8 100644
--- a/packages/server/src/terminal/terminal.ts
+++ b/packages/server/src/terminal/terminal.ts
@@ -580,7 +580,9 @@ function extractCell(terminal: TerminalType, row: number, col: number): Terminal
   const bg = bgMode !== 0 ? cell.getBgColor() : undefined;
 
   return {
-    char: cell.getChars() || " ",
+    // Wide chars (CJK) span two cells; xterm returns "" for the zero-width
+    // continuation. Collapsing it to " " injects a real space on restore.
+    char: cell.getWidth() === 0 ? "" : cell.getChars() || " ",
     fg,
     bg,
     fgMode: fgMode !== 0 ? fgMode : undefined,
@@ -639,7 +641,9 @@ function extractScrollback(
           const fg = fgMode !== 0 ? cell.getFgColor() : undefined;
           const bg = bgMode !== 0 ? cell.getBgColor() : undefined;
           rowCells.push({
-            char: cell.getChars() || " ",
+            // Wide chars (CJK) span two cells; xterm returns "" for the zero-width
+            // continuation. Collapsing it to " " injects a real space on restore.
+            char: cell.getWidth() === 0 ? "" : cell.getChars() || " ",
             fg,
             bg,
             fgMode: fgMode !== 0 ? fgMode : undefined,
diff --git a/packages/server/src/terminal/worker-terminal-manager.test.ts b/packages/server/src/terminal/worker-terminal-manager.test.ts
index 2dc999c0c3..efccd3dfb6 100644
--- a/packages/server/src/terminal/worker-terminal-manager.test.ts
+++ b/packages/server/src/terminal/worker-terminal-manager.test.ts
@@ -510,9 +510,7 @@ it("starts the default shell through the worker and accepts quoted commands", as
 
   session.send({ type: "input", data: `${command}\r` });
 
-  await waitForCondition(() => existsSync(markerPath), 10000);
-
-  expect(readFileSync(markerPath, "utf8")).toBe("shell-ok");
+  await expect.poll(() => readFileSync(markerPath, "utf8"), { timeout: 10000 }).toBe("shell-ok");
 });
 
 it("lists subdirectory terminals when querying the workspace root", async () => {
diff --git a/packages/server/src/utils/checkout-git-batching.test.ts b/packages/server/src/utils/checkout-git-batching.test.ts
index 85bea20c49..18b84bd0c3 100644
--- a/packages/server/src/utils/checkout-git-batching.test.ts
+++ b/packages/server/src/utils/checkout-git-batching.test.ts
@@ -2,39 +2,8 @@ import { execFileSync } from "node:child_process";
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { beforeEach, afterEach, describe, expect, it, vi } from "vitest";
-
-const spawnCounters = vi.hoisted(() => ({
-  trackedTextDiffCalls: 0,
-}));
-
-vi.mock("child_process", async () => {
-  const actual = await vi.importActual<typeof import("child_process")>("child_process");
-  return {
-    ...actual,
-    spawn: (...args: Parameters<typeof actual.spawn>) => {
-      const [command, commandArgs] = args;
-      if (command === "git" && Array.isArray(commandArgs)) {
-        const normalizedArgs = commandArgs.map((arg) => String(arg));
-        // `runGitCommand` always prepends its two config overrides; skip them
-        // to find the actual git subcommand.
-        const subcommandIndex =
-          normalizedArgs[0] === "-c" && normalizedArgs[1] === "core.quotepath=false" ? 4 : 0;
-        const isTrackedTextDiff =
-          normalizedArgs[subcommandIndex] === "diff" &&
-          normalizedArgs.includes("HEAD") &&
-          !normalizedArgs.includes("--numstat") &&
-          !normalizedArgs.includes("--no-index") &&
-          !normalizedArgs.includes("--shortstat") &&
-          !normalizedArgs.includes("--name-status");
-        if (isTrackedTextDiff) {
-          spawnCounters.trackedTextDiffCalls += 1;
-        }
-      }
-      return actual.spawn(...args);
-    },
-  };
-});
+import { beforeEach, afterEach, describe, expect, it } from "vitest";
+import { startGitCommandMetrics, stopGitCommandMetrics } from "@server/utils/run-git-command.js";
 
 import { getCheckoutDiff } from "./checkout-git.js";
 
@@ -70,14 +39,14 @@ describe("checkout git diff batching", () => {
     const setup = initRepoWithTrackedChanges(20);
     tempDir = setup.tempDir;
     repoDir = setup.repoDir;
-    spawnCounters.trackedTextDiffCalls = 0;
   });
 
   afterEach(() => {
     rmSync(tempDir, { recursive: true, force: true });
   });
 
-  it("uses per-file tracked git diff commands for tracked file diffs", async () => {
+  it("collects ordinary tracked patches with one bounded Git command", async () => {
+    startGitCommandMetrics();
     const result = await getCheckoutDiff(repoDir, {
       mode: "uncommitted",
       includeStructured: false,
@@ -85,6 +54,44 @@ describe("checkout git diff batching", () => {
 
     expect(result.diff).toContain("file-0.txt");
     expect(result.diff).toContain("file-19.txt");
-    expect(spawnCounters.trackedTextDiffCalls).toBe(20);
+    const metrics = stopGitCommandMetrics();
+    expect(
+      metrics.commands.filter(({ args }) => args[0] === "diff" && args.includes("--")),
+    ).toHaveLength(1);
+  });
+
+  it("batches committed file contents and preserves the highlighted diff", async () => {
+    execFileSync("git", ["checkout", "-b", "feature"], { cwd: repoDir });
+    execFileSync("git", ["add", "."], { cwd: repoDir });
+    execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "change"], { cwd: repoDir });
+    startGitCommandMetrics();
+    const result = await getCheckoutDiff(repoDir, {
+      mode: "base",
+      baseRef: "main",
+      includeStructured: true,
+    });
+    const metrics = stopGitCommandMetrics();
+    expect(result.structured).toHaveLength(20);
+    expect(result.structured?.every((file) => file.additions === 1 && file.deletions === 1)).toBe(
+      true,
+    );
+    expect(metrics.commands.filter(({ args }) => args[0] === "show")).toHaveLength(0);
+    expect(metrics.commands.filter(({ args }) => args[0] === "cat-file")).toHaveLength(1);
+  });
+
+  it("keeps small neighbors when a patch exceeds the entire batch budget", async () => {
+    writeFileSync(join(repoDir, "file-0.txt"), "x".repeat(9 * 1024 * 1024) + "\n");
+    const result = await getCheckoutDiff(repoDir, {
+      mode: "uncommitted",
+      includeStructured: true,
+    });
+    expect(result.structured).toHaveLength(20);
+    expect(result.structured?.find((file) => file.path === "file-0.txt")).toMatchObject({
+      status: "too_large",
+      hunks: [],
+    });
+    expect(result.structured?.filter((file) => file.status === "ok")).toHaveLength(19);
+    expect(result.diff).toContain("+after-19");
+    expect(result.diff).not.toContain("x".repeat(1_000));
   });
 });
diff --git a/packages/server/src/utils/checkout-git.commits.test.ts b/packages/server/src/utils/checkout-git.commits.test.ts
index 5a006ae0eb..d614e32f9b 100644
--- a/packages/server/src/utils/checkout-git.commits.test.ts
+++ b/packages/server/src/utils/checkout-git.commits.test.ts
@@ -25,7 +25,10 @@ function git(args: string[], cwd?: string): void {
 }
 
 function commit(repoDir: string, message: string): void {
-  git(["-c", "commit.gpgsign=false", "commit", "-m", message], repoDir);
+  git(
+    ["-c", "commit.gpgsign=false", "commit", "--author=Test User <test@test.com>", "-m", message],
+    repoDir,
+  );
 }
 
 function commitFile(repoDir: string, name: string, content: string, message: string): void {
@@ -92,6 +95,30 @@ function addBareRemote(repoDir: string, tempDir: string): string {
 }
 
 describe("listCheckoutCommits", () => {
+  it("keeps fixture authors independent of command-scoped Git configuration", async () => {
+    const overrides = {
+      GIT_CONFIG_COUNT: "1",
+      GIT_CONFIG_KEY_0: "user.name",
+      GIT_CONFIG_VALUE_0: "Other User",
+    };
+    const previous = Object.fromEntries(
+      Object.keys(overrides).map((key) => [key, process.env[key]]),
+    );
+    let repoDir: string;
+    try {
+      Object.assign(process.env, overrides);
+      ({ repoDir } = initRepoOnMain());
+    } finally {
+      for (const [key, value] of Object.entries(previous)) {
+        if (value === undefined) delete process.env[key];
+        else process.env[key] = value;
+      }
+    }
+
+    const { commits } = await listCheckoutCommits({ cwd: repoDir });
+    expect(commits[0]?.authorName).toBe("Test User");
+  });
+
   it("lists recent commits newest-first with on-remote flags and file stats", async () => {
     const { repoDir, tempDir } = initRepoOnMain();
     git(["checkout", "-b", "feature"], repoDir);
diff --git a/packages/server/src/utils/checkout-git.patch-format.test.ts b/packages/server/src/utils/checkout-git.patch-format.test.ts
new file mode 100644
index 0000000000..d30ae1d7ce
--- /dev/null
+++ b/packages/server/src/utils/checkout-git.patch-format.test.ts
@@ -0,0 +1,213 @@
+import { execFileSync } from "node:child_process";
+import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { getCheckoutDiff, getCommitFileDiff } from "./checkout-git.js";
+
+const repos: string[] = [];
+
+afterEach(() => {
+  vi.unstubAllEnvs();
+  for (const repo of repos.splice(0)) rmSync(repo, { recursive: true, force: true });
+});
+
+it.each(["diff.mnemonicPrefix=true", "color.diff=always", "diff.noprefix=true"])(
+  "preserves batched paths, spaces and literal prefix directories with %s",
+  async (config) => {
+    const cwd = createChangedRepo(config);
+    mkdirSync(join(cwd, "a"));
+    for (const name of ["a/literal.txt", "with spaces.txt"]) {
+      writeFileSync(join(cwd, name), "before\n");
+    }
+    git(cwd, "add", "a/literal.txt", "with spaces.txt");
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "add files");
+    for (const name of ["a/literal.txt", "with spaces.txt"]) {
+      writeFileSync(join(cwd, name), "after\n");
+    }
+
+    const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+    expect(result.structured?.map((file) => file.path)).toEqual([
+      "a/literal.txt",
+      "file.txt",
+      "with spaces.txt",
+    ]);
+    for (const file of result.structured ?? []) {
+      expect(file.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+    }
+    expect(git(cwd, "config", "--get", config.split("=")[0]).trim()).toBe(config.split("=")[1]);
+  },
+);
+
+function git(cwd: string, ...args: string[]): string {
+  return execFileSync("git", args, { cwd, encoding: "utf8" });
+}
+
+function createChangedRepo(config: string): string {
+  const cwd = realpathSync.native(mkdtempSync(join(tmpdir(), "checkout-patch-format-")));
+  repos.push(cwd);
+  git(cwd, "init", "-b", "main");
+  git(cwd, "config", "user.name", "Test");
+  git(cwd, "config", "user.email", "test@example.com");
+  writeFileSync(join(cwd, "file.txt"), "before\n");
+  git(cwd, "add", ".");
+  git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
+  git(cwd, "config", ...config.split("="));
+  writeFileSync(join(cwd, "file.txt"), "after\n");
+  return cwd;
+}
+
+function createExternalDiffCommand() {
+  const directory = realpathSync.native(mkdtempSync(join(tmpdir(), "checkout-external-diff-")));
+  repos.push(directory);
+  const script = join(directory, "external-diff.cjs");
+  const marker = join(directory, "invoked");
+  writeFileSync(
+    script,
+    'require("node:fs").writeFileSync(process.argv[2], "invoked");\n' +
+      'process.stdout.write("CUSTOM EXTERNAL DIFF\\n");\n',
+  );
+  const command = [process.execPath, script, marker]
+    .map((argument) => `'${argument.replaceAll("'", "'\\''")}'`)
+    .join(" ");
+  return { command, marker };
+}
+
+function createExternalDiffRepo() {
+  vi.stubEnv("GIT_EXTERNAL_DIFF", undefined);
+  const cwd = createChangedRepo("color.diff=always");
+  const { command, marker } = createExternalDiffCommand();
+  git(cwd, "config", "diff.external", command);
+  expect(git(cwd, "diff", "HEAD", "--", "file.txt")).toBe("CUSTOM EXTERNAL DIFF\n");
+  expect(existsSync(marker)).toBe(true);
+  rmSync(marker);
+  return { cwd, command, marker };
+}
+
+function expectStandardPatch(result: Awaited<ReturnType<typeof getCheckoutDiff>>) {
+  expect(result.structured).toMatchObject([
+    {
+      path: "file.txt",
+      additions: 1,
+      deletions: 1,
+      status: "ok",
+      hunks: [
+        {
+          lines: [
+            { type: "header", content: "@@ -1 +1 @@" },
+            { type: "remove", content: "before" },
+            { type: "add", content: "after" },
+          ],
+        },
+      ],
+    },
+  ]);
+}
+
+it("returns Git patch hunks when a repository configures an external diff command", async () => {
+  const { cwd, command, marker } = createExternalDiffRepo();
+
+  const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(git(cwd, "config", "--get", "diff.external").trim()).toBe(command);
+});
+
+it("returns Git patch hunks against the base branch with an external diff command", async () => {
+  const { cwd, command, marker } = createExternalDiffRepo();
+  git(cwd, "checkout", "-b", "feature");
+  git(cwd, "add", ".");
+  git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+
+  const result = await getCheckoutDiff(cwd, {
+    mode: "base",
+    baseRef: "main",
+    includeStructured: true,
+  });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(git(cwd, "config", "--get", "diff.external").trim()).toBe(command);
+});
+
+it("returns Git patch hunks when GIT_EXTERNAL_DIFF configures the external command", async () => {
+  const cwd = createChangedRepo("color.diff=always");
+  const { command, marker } = createExternalDiffCommand();
+  vi.stubEnv("GIT_EXTERNAL_DIFF", command);
+  expect(git(cwd, "diff", "HEAD", "--", "file.txt")).toBe("CUSTOM EXTERNAL DIFF\n");
+  expect(existsSync(marker)).toBe(true);
+  rmSync(marker);
+
+  const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(process.env.GIT_EXTERNAL_DIFF).toBe(command);
+});
+
+describe.each(["diff.mnemonicPrefix=true", "color.diff=always"])(
+  "patch format with %s",
+  (config) => {
+    it("returns displayable uncommitted diff lines with their file counts", async () => {
+      const cwd = createChangedRepo(config);
+      const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+      expect(result.structured).toHaveLength(1);
+      expect(result.structured?.[0]).toMatchObject({
+        path: "file.txt",
+        additions: 1,
+        deletions: 1,
+      });
+      expect(result.structured?.[0].hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+    });
+
+    it("returns displayable committed changes against the base branch", async () => {
+      const cwd = createChangedRepo(config);
+      git(cwd, "checkout", "-b", "feature");
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      const result = await getCheckoutDiff(cwd, {
+        mode: "base",
+        baseRef: "main",
+        includeStructured: true,
+      });
+
+      expect(result.structured?.[0]).toMatchObject({
+        path: "file.txt",
+        additions: 1,
+        deletions: 1,
+      });
+      expect(result.structured?.[0].hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([expect.objectContaining({ type: "add", content: "after" })]),
+      );
+    });
+
+    it("returns displayable lines when opening an individual commit file", async () => {
+      const cwd = createChangedRepo(config);
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      const file = await getCommitFileDiff({
+        cwd,
+        sha: git(cwd, "rev-parse", "HEAD").trim(),
+        path: "file.txt",
+      });
+
+      expect(file).toMatchObject({ path: "file.txt", additions: 1, deletions: 1 });
+      expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([expect.objectContaining({ type: "add", content: "after" })]),
+      );
+    });
+  },
+);
diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index 45c0aff7c1..21791fa49e 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -523,6 +523,7 @@ describe("checkout git utilities", () => {
 
   it("honors commit signing configuration", async () => {
     execFileSync("git", ["config", "commit.gpgsign", "true"], { cwd: repoDir });
+    execFileSync("git", ["config", "gpg.format", "openpgp"], { cwd: repoDir });
     execFileSync("git", ["config", "gpg.program", process.execPath], { cwd: repoDir });
     writeFileSync(join(repoDir, "file.txt"), "signed\n");
 
@@ -538,10 +539,129 @@ describe("checkout git utilities", () => {
     });
 
     expect(diff.structured).toContainEqual(
-      expect.objectContaining({ path: "renamed.txt", oldPath: "file.txt" }),
+      expect.objectContaining({
+        path: "renamed.txt",
+        oldPath: "file.txt",
+        additions: 0,
+        deletions: 0,
+        hunks: [],
+      }),
     );
   });
 
+  it.each([
+    { mode: "uncommitted", oldPath: "to-rename.txt", path: "renamed.txt" },
+    { mode: "base", oldPath: "to-rename.txt", path: "renamed.txt" },
+    { mode: "uncommitted", oldPath: "old [file].txt", path: "new [file].txt" },
+  ] as const)(
+    "shows only the edited line of a rename ($mode, $path)",
+    async ({ mode, oldPath, path }) => {
+      const original = Array.from({ length: 12 }, (_, index) => `line ${index + 1}`);
+      commitFile(repoDir, oldPath, original.join("\n") + "\n", "file to rename");
+      if (mode === "base") {
+        execFileSync("git", ["checkout", "-b", "feature/rename"], { cwd: repoDir });
+      }
+      execFileSync("git", ["mv", oldPath, path], { cwd: repoDir });
+      const edited = [...original];
+      edited[5] = "edited line 6";
+      writeFileSync(join(repoDir, path), edited.join("\n") + "\n");
+      execFileSync("git", ["add", path], { cwd: repoDir });
+
+      expect(
+        execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+      ).toMatch(/R\d+\t/);
+      if (mode === "base") {
+        execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "rename and edit"], {
+          cwd: repoDir,
+        });
+      }
+
+      const diff = await getCheckoutDiff(repoDir, {
+        mode,
+        ...(mode === "base" ? { baseRef: "main" } : {}),
+        includeStructured: true,
+      });
+
+      expect(diff.structured).toEqual([
+        expect.objectContaining({
+          path,
+          oldPath,
+          isNew: false,
+          isDeleted: false,
+          additions: 1,
+          deletions: 1,
+          status: "ok",
+        }),
+      ]);
+      expect(diff.diff).toContain(`rename from ${oldPath}`);
+      expect(diff.diff).toContain(`rename to ${path}`);
+      expect(diff.diff).toContain("-line 6\n+edited line 6");
+      expect(diff.diff).not.toContain("new file mode");
+    },
+  );
+
+  it("includes a changed copy source only once in the diff", async () => {
+    const original =
+      Array.from({ length: 12 }, (_, index) => `line ${index + 1}`).join("\n") + "\n";
+    commitFile(repoDir, "source.txt", original, "copy source");
+    execFileSync("git", ["config", "diff.renames", "copies"], { cwd: repoDir });
+    writeFileSync(join(repoDir, "copy.txt"), original);
+    writeFileSync(join(repoDir, "source.txt"), original.replace("line 6", "edited line 6"));
+    execFileSync("git", ["add", "copy.txt", "source.txt"], { cwd: repoDir });
+    expect(
+      execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+    ).toContain("C100\tsource.txt\tcopy.txt");
+
+    const diff = await getCheckoutDiff(repoDir, {
+      mode: "uncommitted",
+      includeStructured: true,
+    });
+    expect(diff.structured).toEqual([
+      expect.objectContaining({
+        path: "copy.txt",
+        oldPath: "source.txt",
+        additions: 0,
+        deletions: 0,
+      }),
+      expect.objectContaining({ path: "source.txt", additions: 1, deletions: 1 }),
+    ]);
+    expect(diff.diff.match(/^diff --git a\/source.txt b\/source.txt$/gm)).toHaveLength(1);
+    expect(diff.diff).toContain("copy from source.txt");
+    expect(diff.diff).toContain("copy to copy.txt");
+  });
+
+  it("keeps a small copy patch when its edited source exceeds the patch limit", async () => {
+    const original =
+      Array.from({ length: 12 }, (_, index) => `line ${index + 1}`).join("\n") + "\n";
+    commitFile(repoDir, "source.txt", original, "copy source");
+    execFileSync("git", ["config", "diff.renames", "copies"], { cwd: repoDir });
+    writeFileSync(join(repoDir, "copy.txt"), original);
+    writeFileSync(join(repoDir, "source.txt"), original + "added source line\n".repeat(80_000));
+    execFileSync("git", ["add", "copy.txt", "source.txt"], { cwd: repoDir });
+    expect(
+      execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+    ).toContain("C100\tsource.txt\tcopy.txt");
+
+    const diff = await getCheckoutDiff(repoDir, {
+      mode: "uncommitted",
+      includeStructured: true,
+    });
+    expect(diff.structured).toEqual([
+      expect.objectContaining({
+        path: "copy.txt",
+        oldPath: "source.txt",
+        additions: 0,
+        deletions: 0,
+        hunks: [],
+        status: "ok",
+      }),
+      expect.objectContaining({ path: "source.txt", status: "too_large", hunks: [] }),
+    ]);
+    expect(diff.diff).toContain("copy from source.txt");
+    expect(diff.diff).toContain("copy to copy.txt");
+    expect(diff.diff).not.toContain("+added source line");
+  });
+
   it("reads the origin URL once when collecting facts for an origin-tracking branch", async () => {
     setupRemoteTrackingMain(repoDir, tempDir);
 
@@ -991,9 +1111,9 @@ const x = 1;
   });
 
   it("does not report local-only no-track worktree commits as ahead of origin", async () => {
-    setupRemoteTrackingMain(repoDir, tempDir);
-    commitFile(repoDir, "second.txt", "second\n", "second commit");
-    execFileSync("git", ["push"], { cwd: repoDir });
+    // This case needs a remote base ref, not a second clone or extra base history.
+    execFileSync("git", ["remote", "add", "origin", repoDir], { cwd: repoDir });
+    execFileSync("git", ["fetch", "origin", "main:refs/remotes/origin/main"], { cwd: repoDir });
 
     const worktree = await createLegacyWorktreeForTest({
       branchName: "fresh-feature",
@@ -1007,6 +1127,7 @@ const x = 1;
     const status = await getCheckoutStatus(worktree.worktreePath, { paseoHome });
     expect(status).toMatchObject({
       isGit: true,
+      hasRemote: true,
       isPaseoOwnedWorktree: true,
       baseRef: "main",
       aheadBehind: { ahead: 1, behind: 0 },
@@ -1506,9 +1627,12 @@ const x = 1;
     expect(diff.diff).toContain("# generated.js: diff too large omitted");
     expect(diff.diff).toContain(`-export const value = "old";`);
     expect(diff.diff).toContain(`+export const value = "new";`);
-    expect(commands).toContain("diff --numstat HEAD");
-    expect(commands).toContain("diff HEAD -- generated.js");
-    expect(commands).toContain("diff HEAD -- small.ts");
+    expect(commands).toContain(
+      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ --numstat HEAD",
+    );
+    expect(commands).toContain(
+      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ HEAD -- :(literal)generated.js :(literal)small.ts",
+    );
     expect(metrics.maxConcurrent).toBeLessThanOrEqual(8);
   });
 
@@ -2992,6 +3116,36 @@ const x = 1;
     });
   });
 
+  it.each([
+    "git@github.com:contributor/paseo.git",
+    "https://github.com/contributor/paseo.git",
+    "ssh://git@github.com/contributor/paseo.git",
+  ])("preserves fork PR identity with branch.remote=%s", async (branchRemote) => {
+    execFileSync("git", ["remote", "add", "origin", "git@github.com:getpaseo/paseo.git"], {
+      cwd: repoDir,
+    });
+    execFileSync("git", ["checkout", "-b", "topic"], { cwd: repoDir });
+    execFileSync("git", ["config", "branch.topic.remote", branchRemote], {
+      cwd: repoDir,
+    });
+    execFileSync("git", ["config", "branch.topic.pushRemote", branchRemote], {
+      cwd: repoDir,
+    });
+    execFileSync("git", ["config", "branch.topic.merge", "refs/heads/topic"], {
+      cwd: repoDir,
+    });
+    const headSha = execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: repoDir,
+      encoding: "utf8",
+    }).trim();
+
+    expect(await readPullRequestLookupTargetFromFacts(repoDir, paseoHome)).toEqual({
+      headRef: "topic",
+      headRepositoryOwner: "contributor",
+      headSha,
+    });
+  });
+
   it("does not attach an owner when the tracked remote is the same GitHub repository", async () => {
     execFileSync("git", ["checkout", "-b", "local-feature"], { cwd: repoDir });
     execFileSync("git", ["remote", "add", "origin", "git@github.com:getpaseo/paseo.git"], {
@@ -3546,6 +3700,7 @@ const x = 1;
       cwd: repoDir,
     });
     execFileSync("git", ["config", "commit.gpgsign", "true"], { cwd: repoDir });
+    execFileSync("git", ["config", "gpg.format", "openpgp"], { cwd: repoDir });
     execFileSync("git", ["config", "gpg.program", process.execPath], { cwd: repoDir });
 
     await expect(mergeToBase(repoDir, { baseRef: "main", mode: "squash" })).rejects.toThrow(
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index d20a41616e..ee3571504d 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -1,6 +1,7 @@
 import { resolve, dirname, basename } from "path";
 import { existsSync, realpathSync } from "fs";
 import { open as openFile, readFile, stat as statFile } from "fs/promises";
+import { setImmediate } from "node:timers/promises";
 import { TTLCache } from "@isaacs/ttlcache";
 import type { CheckoutCommit, CheckoutCommitFile } from "@getpaseo/protocol/messages";
 import { parseGitHubRemoteIdentity, parseGitRemoteLocation } from "@getpaseo/protocol/git-remote";
@@ -29,6 +30,7 @@ import {
 } from "../services/forge-cli-command.js";
 import { parseGitRevParsePath, resolveGitRevParsePath } from "./git-rev-parse-path.js";
 import { runGitCommand, type RunGitCommand } from "./run-git-command.js";
+import { readGitFileContents } from "./git-file-contents.js";
 import { isPaseoOwnedWorktreeCwd, resolvePaseoWorktreesBaseRoot } from "./worktree.js";
 import {
   branchNameFromRef,
@@ -634,12 +636,20 @@ function normalizeNumstatPath(pathField: string): string {
   return pathField;
 }
 
+// Parsed patches need a stable wire format regardless of terminal presentation settings.
+const GIT_PATCH_FORMAT_ARGS = ["--no-ext-diff", "--no-color", "--src-prefix=a/", "--dst-prefix=b/"];
+
 function buildGitDiffArgs(args: { ignoreWhitespace?: boolean; extra: string[] }): string[] {
-  return ["diff", ...(args.ignoreWhitespace ? ["-w"] : []), ...args.extra];
+  return [
+    "diff",
+    ...GIT_PATCH_FORMAT_ARGS,
+    ...(args.ignoreWhitespace ? ["-w"] : []),
+    ...args.extra,
+  ];
 }
 
 const TRACKED_DIFF_NUMSTAT_MAX_BYTES = 2 * 1024 * 1024; // 2MB
-const TRACKED_DIFF_BATCH_SIZE = 8;
+const TRACKED_DIFF_BATCH_SIZE = 64;
 const EMPTY_TREE_OBJECT_ID = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 
 function isUnbornHeadDiffError(error: unknown): boolean {
@@ -711,12 +721,19 @@ async function getTrackedDiffTextForPath(input: {
   cwd: string;
   refsForDiff: CheckoutDiffRefs;
   path: string;
+  oldPath?: string;
   ignoreWhitespace: boolean;
 }): Promise<{ path: string; text: string; truncated: boolean }> {
+  const paths = input.oldPath ? [input.oldPath, input.path] : [input.path];
   const result = await runGitCommand(
     buildGitDiffArgs({
       ignoreWhitespace: input.ignoreWhitespace,
-      extra: [...getCheckoutDiffRefArgs(input.refsForDiff), "--", input.path],
+      extra: [
+        ...(input.oldPath ? ["--diff-filter=RC"] : []),
+        ...getCheckoutDiffRefArgs(input.refsForDiff),
+        "--",
+        ...paths.map((path) => `:(literal)${path}`),
+      ],
     }),
     {
       cwd: input.cwd,
@@ -725,13 +742,76 @@ async function getTrackedDiffTextForPath(input: {
     },
   );
 
+  // A source path can participate in another rename/copy in the same request.
+  // Return only the requested destination; the filter keeps source edits out of its budget.
+  let text = result.stdout;
+  if (input.oldPath && !result.truncated) {
+    text = result.stdout
+      .split(/(?=^diff --git )/m)
+      .filter((section) => {
+        const hunkStart = section.indexOf("\n@@ ");
+        const header = hunkStart < 0 ? section : section.slice(0, hunkStart);
+        return parseDiff(header)[0]?.path === input.path;
+      })
+      .join("");
+  }
   return {
     path: input.path,
-    text: result.stdout,
+    text,
     truncated: result.truncated,
   };
 }
 
+async function getTrackedDiffTexts(input: {
+  cwd: string;
+  refsForDiff: CheckoutDiffRefs;
+  paths: string[];
+  ignoreWhitespace: boolean;
+}): Promise<Array<{ path: string; text: string; truncated: boolean }>> {
+  if (input.paths.length === 0) return [];
+  if (input.paths.length === 1)
+    return [await getTrackedDiffTextForPath({ ...input, path: input.paths[0] })];
+  const result = await runGitCommand(
+    buildGitDiffArgs({
+      ignoreWhitespace: input.ignoreWhitespace,
+      extra: [
+        ...getCheckoutDiffRefArgs(input.refsForDiff),
+        "--",
+        ...input.paths.map((path) => `:(literal)${path}`),
+      ],
+    }),
+    { cwd: input.cwd, envOverlay: READ_ONLY_GIT_ENV, maxOutputBytes: 8 * PER_FILE_DIFF_MAX_BYTES },
+  );
+  const files = new Map<string, { path: string; text: string; truncated: boolean }>();
+  if (!result.truncated) {
+    for (const text of result.stdout.split(/(?=^diff --git )/m).filter(Boolean)) {
+      // Only identify the file here. Oversized bodies must not reach the parser.
+      const hunkStart = text.indexOf("\n@@ ");
+      const file = parseDiff(hunkStart < 0 ? text : text.slice(0, hunkStart))[0];
+      if (!file || !input.paths.includes(file.path)) break;
+      files.set(file.path, {
+        path: file.path,
+        text,
+        truncated: Buffer.byteLength(text) > PER_FILE_DIFF_MAX_BYTES,
+      });
+    }
+    // Empty patches are valid when whitespace is ignored. Every emitted section
+    // must be accounted for before accepting a combined command.
+    if (
+      [...files.values()].reduce((length, file) => length + file.text.length, 0) ===
+      result.stdout.length
+    ) {
+      return input.paths.map((path) => files.get(path) ?? { path, text: "", truncated: false });
+    }
+  }
+  // Bound oversized output without letting one large file hide its neighbors.
+  const middle = Math.ceil(input.paths.length / 2);
+  return [
+    ...(await getTrackedDiffTexts({ ...input, paths: input.paths.slice(0, middle) })),
+    ...(await getTrackedDiffTexts({ ...input, paths: input.paths.slice(middle) })),
+  ];
+}
+
 export class NotGitRepoError extends Error {
   readonly cwd: string;
   readonly code = "NOT_GIT_REPO";
@@ -1107,13 +1187,16 @@ export function parseWorktreeList(output: string): GitWorktreeEntry[] {
 
 async function getWorktreePathForBranch(cwd: string, branchName: string): Promise<string | null> {
   try {
-    const { stdout } = await runGitCommand(["worktree", "list", "--porcelain"], {
-      cwd,
-      envOverlay: READ_ONLY_GIT_ENV,
-    });
-    const entries = parseWorktreeList(stdout);
     const ref = branchName.startsWith("refs/heads/") ? branchName : `refs/heads/${branchName}`;
-    return entries.find((entry) => entry.branchRef === ref)?.path ?? null;
+    const { stdout } = await runGitCommand(
+      ["for-each-ref", "--format=%(refname)%00%(worktreepath)%00", ref],
+      { cwd, envOverlay: READ_ONLY_GIT_ENV },
+    );
+    for (const record of stdout.split("\0\n")) {
+      const [reference, worktreePath] = record.split("\0");
+      if (reference === ref) return worktreePath || null;
+    }
+    return null;
   } catch {
     return null;
   }
@@ -1317,6 +1400,23 @@ async function getGitConfigValue(
   }
 }
 
+async function resolveGitRemoteUrl({
+  cwd,
+  remote,
+  context,
+}: {
+  cwd: string;
+  remote: string;
+  context?: CheckoutContext;
+}): Promise<string | null> {
+  const configuredUrl = await getGitConfigValue(cwd, `remote.${remote}.url`, context);
+  if (configuredUrl) {
+    return configuredUrl;
+  }
+  // Branch remote settings accept repository URLs as well as configured remote names.
+  return parseGitRemoteLocation(remote) ? remote : null;
+}
+
 async function getGitRemotePushUrl(
   cwd: string,
   remoteName: string,
@@ -1381,7 +1481,7 @@ async function resolvePullRequestStatusLookupTarget(
   }
 
   const [branchRemoteUrl, originRemoteUrl, resolvedBaseRef] = await Promise.all([
-    branchRemoteName ? getGitConfigValue(cwd, `remote.${branchRemoteName}.url`, context) : null,
+    branchRemoteName ? resolveGitRemoteUrl({ cwd, remote: branchRemoteName, context }) : null,
     getGitConfigValue(cwd, "remote.origin.url", context),
     getResolvedBaseRefForCwd(cwd, context),
   ]);
@@ -1491,11 +1591,15 @@ export async function resolveRepositoryDefaultBranch(
         );
         return localName;
       } catch {
+        await getRunGitCommand(context)(["show-ref", "--verify", "--quiet", ref], {
+          cwd: repoRoot,
+          envOverlay: READ_ONLY_GIT_ENV,
+        });
         return remoteShort;
       }
     }
   } catch {
-    // ignore
+    // A stale origin/HEAD must fall through to the available local branches.
   }
 
   const { stdout } = await getRunGitCommand(context)(["branch", "--format=%(refname:short)"], {
@@ -1898,7 +2002,7 @@ async function resolvePullRequestLookupTargetFromPushConfig(
 
   const [pushRefspec, pushRemoteUrl, originRemoteUrl, resolvedBaseRef] = await Promise.all([
     getGitConfigValue(cwd, `remote.${pushRemoteName}.push`, context),
-    getGitConfigValue(cwd, `remote.${pushRemoteName}.url`, context),
+    resolveGitRemoteUrl({ cwd, remote: pushRemoteName, context }),
     knownOriginRemoteUrl === null ? getGitConfigValue(cwd, "remote.origin.url", context) : null,
     knownResolvedBaseRef === null ? getResolvedBaseRefForCwd(cwd, context) : null,
   ]);
@@ -2006,7 +2110,7 @@ export async function getCheckoutSnapshotFacts(
         getGitConfigValue(cwd, `branch.${inspected.currentBranch}.merge`, context),
         branchRemoteName === "origin"
           ? inspected.remoteUrl
-          : getGitConfigValue(cwd, `remote.${branchRemoteName}.url`, context),
+          : resolveGitRemoteUrl({ cwd, remote: branchRemoteName, context }),
       ]);
     }
   }
@@ -2562,7 +2666,7 @@ export async function getCommitFileDiff({
   path: string;
 }): Promise<ParsedDiffFile | null> {
   const { stdout } = await runGitCommand(
-    ["show", sha, "--format=", "--diff-merges=first-parent", "--", path],
+    ["show", sha, "--format=", "--diff-merges=first-parent", ...GIT_PATCH_FORMAT_ARGS, "--", path],
     {
       cwd,
       envOverlay: READ_ONLY_GIT_ENV,
@@ -2978,13 +3082,23 @@ async function buildHighlightedTrackedDiffFile(input: {
   change: CheckoutFileChange;
   parsedFile: ParsedDiffFile;
   refsForDiff: CheckoutDiffRefs;
+  contents?: Map<string, string | null>;
 }): Promise<ParsedDiffFile> {
   const { cwd, change, parsedFile, refsForDiff } = input;
   const refPath = change.oldPath ?? change.path;
-  const [oldFileContent, newFileContent] = await Promise.all([
-    change.isNew ? null : readGitFileContentAtRef(cwd, refsForDiff.baseRef, refPath),
-    refsForDiff.targetRef ? readGitFileContentAtRef(cwd, refsForDiff.targetRef, change.path) : null,
-  ]);
+  const [oldFileContent, newFileContent] = input.contents
+    ? [
+        change.isNew ? null : input.contents.get(`${refsForDiff.baseRef}:${refPath}`),
+        refsForDiff.targetRef
+          ? input.contents.get(`${refsForDiff.targetRef}:${change.path}`)
+          : null,
+      ]
+    : await Promise.all([
+        change.isNew ? null : readGitFileContentAtRef(cwd, refsForDiff.baseRef, refPath),
+        refsForDiff.targetRef
+          ? readGitFileContentAtRef(cwd, refsForDiff.targetRef, change.path)
+          : null,
+      ]);
   const highlightedFile = await highlightDiffWithFileContent(parsedFile, cwd, {
     oldFileContent,
     newFileContent,
@@ -3012,6 +3126,19 @@ function isWhitespaceOnlyTrackedChange(input: {
   );
 }
 
+function readTrackedDiffContents(
+  cwd: string,
+  changes: CheckoutFileChange[],
+  refs: CheckoutDiffRefs,
+): Promise<Map<string, string | null> | null> {
+  const specs: string[] = [];
+  for (const change of changes) {
+    if (!change.isNew) specs.push(`${refs.baseRef}:${change.oldPath ?? change.path}`);
+    if (refs.targetRef) specs.push(`${refs.targetRef}:${change.path}`);
+  }
+  return readGitFileContents(cwd, specs);
+}
+
 async function appendStructuredTrackedDiffs(
   input: AppendStructuredTrackedDiffsInput,
 ): Promise<boolean> {
@@ -3030,54 +3157,68 @@ async function appendStructuredTrackedDiffs(
   const parsedTrackedFiles = trackedDiffText.length > 0 ? parseDiff(trackedDiffText) : [];
   const parsedTrackedByPath = new Map(parsedTrackedFiles.map((file) => [file.path, file]));
 
-  for (const change of trackedChanges) {
-    const placeholder = trackedPlaceholderByPath.get(change.path);
-    if (placeholder) {
-      const file = buildPlaceholderParsedDiffFile(change, {
-        status: placeholder.status,
-        stat: placeholder.stat,
-      });
+  for (let start = 0; start < trackedChanges.length; start += TRACKED_DIFF_BATCH_SIZE) {
+    const changes = trackedChanges.slice(start, start + TRACKED_DIFF_BATCH_SIZE);
+    const contents = await readTrackedDiffContents(
+      cwd,
+      changes.filter(
+        (change) =>
+          !trackedPlaceholderByPath.has(change.path) && parsedTrackedByPath.has(change.path),
+      ),
+      refsForDiff,
+    );
+    for (const change of changes) {
+      const placeholder = trackedPlaceholderByPath.get(change.path);
+      if (placeholder) {
+        const file = buildPlaceholderParsedDiffFile(change, {
+          status: placeholder.status,
+          stat: placeholder.stat,
+        });
+        if (!appendStructuredFile(structured, file)) {
+          return false;
+        }
+        appendTrackedPlaceholderComment(change, placeholder.status);
+        continue;
+      }
+
+      const stat = trackedNumstatByPath.get(change.path) ?? null;
+      const parsedFile = parsedTrackedByPath.get(change.path);
+      if (parsedFile) {
+        const file = await buildHighlightedTrackedDiffFile({
+          cwd,
+          change,
+          parsedFile,
+          refsForDiff,
+          contents: contents ?? undefined,
+        });
+        if (!appendStructuredFile(structured, file)) {
+          return false;
+        }
+        // Batched blobs remove the per-file I/O pause; keep serving other daemon work.
+        await setImmediate();
+        continue;
+      }
+
+      // `git diff -w --name-status` can still report a modified path even when the
+      // whitespace-filtered patch and numstat are both empty. Skip emitting a
+      // structured placeholder in that case so whitespace-only edits truly disappear.
+      if (isWhitespaceOnlyTrackedChange({ change, stat, ignoreWhitespace })) {
+        continue;
+      }
+
+      const file = {
+        path: change.path,
+        ...(change.oldPath ? { oldPath: change.oldPath } : {}),
+        isNew: change.isNew,
+        isDeleted: change.isDeleted,
+        additions: stat?.additions ?? 0,
+        deletions: stat?.deletions ?? 0,
+        hunks: [],
+        status: "ok",
+      } satisfies ParsedDiffFile;
       if (!appendStructuredFile(structured, file)) {
         return false;
       }
-      appendTrackedPlaceholderComment(change, placeholder.status);
-      continue;
-    }
-
-    const stat = trackedNumstatByPath.get(change.path) ?? null;
-    const parsedFile = parsedTrackedByPath.get(change.path);
-    if (parsedFile) {
-      const file = await buildHighlightedTrackedDiffFile({
-        cwd,
-        change,
-        parsedFile,
-        refsForDiff,
-      });
-      if (!appendStructuredFile(structured, file)) {
-        return false;
-      }
-      continue;
-    }
-
-    // `git diff -w --name-status` can still report a modified path even when the
-    // whitespace-filtered patch and numstat are both empty. Skip emitting a
-    // structured placeholder in that case so whitespace-only edits truly disappear.
-    if (isWhitespaceOnlyTrackedChange({ change, stat, ignoreWhitespace })) {
-      continue;
-    }
-
-    const file = {
-      path: change.path,
-      ...(change.oldPath ? { oldPath: change.oldPath } : {}),
-      isNew: change.isNew,
-      isDeleted: change.isDeleted,
-      additions: stat?.additions ?? 0,
-      deletions: stat?.deletions ?? 0,
-      hunks: [],
-      status: "ok",
-    } satisfies ParsedDiffFile;
-    if (!appendStructuredFile(structured, file)) {
-      return false;
     }
   }
 
@@ -3196,18 +3337,35 @@ async function processTrackedChanges(
 
   let trackedDiffText = "";
   let trackedDiffBytes = 0;
+  const oldPathByPath = new Map(
+    trackedChanges
+      .filter((change) => change.oldPath)
+      .map((change) => [change.path, change.oldPath]),
+  );
   for (let start = 0; start < trackedDiffPaths.length; start += TRACKED_DIFF_BATCH_SIZE) {
     const paths = trackedDiffPaths.slice(start, start + TRACKED_DIFF_BATCH_SIZE);
-    const trackedDiffs = await Promise.all(
-      paths.map((path) =>
-        getTrackedDiffTextForPath({
-          cwd,
-          refsForDiff,
-          path,
-          ignoreWhitespace,
-        }),
-      ),
+    // Rename/copy detection needs both paths.
+    const ordinary = await getTrackedDiffTexts({
+      cwd,
+      refsForDiff,
+      paths: paths.filter((path) => !oldPathByPath.has(path)),
+      ignoreWhitespace,
+    });
+    const renamed = await Promise.all(
+      paths
+        .filter((path) => oldPathByPath.has(path))
+        .map((path) =>
+          getTrackedDiffTextForPath({
+            cwd,
+            refsForDiff,
+            path,
+            oldPath: oldPathByPath.get(path),
+            ignoreWhitespace,
+          }),
+        ),
     );
+    const byPath = new Map([...ordinary, ...renamed].map((file) => [file.path, file]));
+    const trackedDiffs = paths.map((path) => byPath.get(path)!);
 
     for (const fileDiff of trackedDiffs) {
       if (fileDiff.truncated) {
diff --git a/packages/server/src/utils/directory-suggestions.test.ts b/packages/server/src/utils/directory-suggestions.test.ts
index 2b24ca2174..711a721e48 100644
--- a/packages/server/src/utils/directory-suggestions.test.ts
+++ b/packages/server/src/utils/directory-suggestions.test.ts
@@ -1,3 +1,4 @@
+import { createHook } from "node:async_hooks";
 import { execFileSync } from "node:child_process";
 import {
   mkdtempSync,
@@ -12,6 +13,7 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { isPlatform } from "../test-utils/platform.js";
+import { startPathContainmentMetrics, stopPathContainmentMetrics } from "./path.js";
 import { startGitCommandMetrics, stopGitCommandMetrics } from "./run-git-command.js";
 import {
   searchDirectoryEntries,
@@ -169,6 +171,26 @@ describe("searchDirectoryEntries", () => {
     );
   });
 
+  it.skipIf(isWindows)(
+    "prunes a symlink whose target is inside a Git-ignored directory",
+    async () => {
+      initGitRepo(searchRoot, "generated/\n");
+      mkdirSync(path.join(searchRoot, "generated", "output"), { recursive: true });
+      symlinkSync(path.join(searchRoot, "generated", "output"), path.join(searchRoot, "linked"));
+
+      await expect(
+        searchDirectoryEntries({
+          root: searchRoot,
+          query: "linked",
+          pathFormat: "relative",
+          includeFiles: false,
+          includeDirectories: true,
+          respectGitIgnore: true,
+        }),
+      ).resolves.toEqual([]);
+    },
+  );
+
   it("configures raw blank queries independently from explicit root aliases", async () => {
     const rootEntries = [
       { path: "projects", kind: "directory" as const },
@@ -675,6 +697,105 @@ describe("absolute directory-path configuration", () => {
   });
 });
 
+describe("home search with excluded discovery paths", () => {
+  let homeDir: string;
+  let libraryDir: string;
+
+  beforeEach(() => {
+    homeDir = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-excluded-")));
+    libraryDir = path.join(homeDir, "Library");
+    mkdirSync(path.join(libraryDir, "sub", "match-me"), { recursive: true });
+    mkdirSync(path.join(homeDir, "projects", "other"), { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+  });
+
+  function searchHome(query: string) {
+    return searchDirectoryEntries({
+      root: homeDir,
+      query,
+      pathFormat: "absolute",
+      includeDirectories: true,
+      includeFiles: false,
+      pathQueryPolicy: "rooted",
+      rootAliases: ["~"],
+      blankQueryBehavior: "none",
+      confidentResultScanThreshold: 5_000,
+      excludedDiscoveryPaths: [libraryDir],
+    }).then((entries) => entries.map((entry) => entry.path));
+  }
+
+  it("does not discover entries inside an excluded path", async () => {
+    await expect(searchHome("match")).resolves.toEqual([]);
+    await expect(searchHome("~")).resolves.toEqual([path.join(homeDir, "projects")]);
+  });
+
+  it("excludes by path, so a nested directory with the same name is still discovered", async () => {
+    const nested = path.join(homeDir, "projects", "game", "Library", "match-me");
+    mkdirSync(nested, { recursive: true });
+
+    await expect(searchHome("match")).resolves.toEqual([nested]);
+  });
+
+  // POSIX-only: creates and follows a symlink fixture.
+  it.skipIf(isWindows)("does not discover an excluded path through a symlink", async () => {
+    symlinkSync(path.join(libraryDir, "sub"), path.join(homeDir, "link"), "dir");
+
+    await expect(searchHome("match")).resolves.toEqual([]);
+  });
+
+  it("resolves an exact typed path inside an excluded path", async () => {
+    await expect(searchHome("~/Library/sub/match-me")).resolves.toEqual([
+      path.join(libraryDir, "sub", "match-me"),
+    ]);
+  });
+
+  it("lists one level when browsing inside an excluded path", async () => {
+    await expect(searchHome("~/Library/")).resolves.toEqual([
+      libraryDir,
+      path.join(libraryDir, "sub"),
+    ]);
+    await expect(searchHome("~/Library/su")).resolves.toEqual([path.join(libraryDir, "sub")]);
+  });
+});
+
+describe("rooted queries with a typed parent", () => {
+  let homeDir: string;
+
+  beforeEach(() => {
+    homeDir = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-typed-parent-")));
+    mkdirSync(path.join(homeDir, "Developer", "pasta"), { recursive: true });
+    mkdirSync(path.join(homeDir, "Archive", "Developer", "pasta"), { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+  });
+
+  it("walks only under the typed parent when it exists", async () => {
+    await expect(
+      searchAbsoluteDirectoryPaths({ homeDir, query: "~/Developer/pas" }),
+    ).resolves.toEqual([path.join(homeDir, "Developer", "pasta")]);
+  });
+
+  it("matches the whole tree when the typed parent does not exist", async () => {
+    await expect(searchAbsoluteDirectoryPaths({ homeDir, query: "~/Devel/pas" })).resolves.toEqual([
+      path.join(homeDir, "Developer", "pasta"),
+      path.join(homeDir, "Archive", "Developer", "pasta"),
+    ]);
+  });
+
+  it("returns the typed directory first", async () => {
+    mkdirSync(path.join(homeDir, "Developer", "pasta-extra"));
+
+    const results = await searchAbsoluteDirectoryPaths({ homeDir, query: "~/Developer/pasta" });
+
+    expect(results[0]).toBe(path.join(homeDir, "Developer", "pasta"));
+  });
+});
+
 describe("relative typed-entry configuration", () => {
   let tempRoot: string;
   let workspaceDir: string;
@@ -756,22 +877,13 @@ describe("relative typed-entry configuration", () => {
   });
 
   it("suffix mode resolves exact workspace file paths before broad traversal", async () => {
-    const targetPath = path.join(
-      workspaceDir,
-      "packages",
-      "server",
-      "src",
-      "services",
-      "quota-fetcher",
-      "providers",
-      "local.ts",
-    );
+    const targetPath = path.join(workspaceDir, "plugins", "usage-sources", "providers", "local.ts");
     mkdirSync(path.dirname(targetPath), { recursive: true });
     writeFileSync(targetPath, "");
 
     const results = await searchRelativeDirectoryEntries({
       cwd: workspaceDir,
-      query: "packages/server/src/services/quota-fetcher/providers/local.ts",
+      query: "plugins/usage-sources/providers/local.ts",
       limit: 20,
       includeFiles: true,
       includeDirectories: false,
@@ -781,7 +893,7 @@ describe("relative typed-entry configuration", () => {
 
     expect(results).toEqual([
       {
-        path: "packages/server/src/services/quota-fetcher/providers/local.ts",
+        path: "plugins/usage-sources/providers/local.ts",
         kind: "file",
       },
     ]);
@@ -953,3 +1065,124 @@ describe("relative typed-entry configuration", () => {
     expect(results).toEqual([{ path: "blankpage/editor", kind: "directory" }]);
   });
 });
+
+// Reading a tree is cheap; re-deriving each entry's path state is not. A scan that asks whether
+// every ancestor of every entry is inside the root, or is Git-ignored, costs multiples of the
+// read and is what made large home directories exceed the client request timeout.
+describe("home-tree scan cost", () => {
+  const DEPTH = 8;
+  const CHAINS = 40;
+  let scanRoot: string;
+
+  beforeEach(() => {
+    scanRoot = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-scan-cost-")));
+    for (let chain = 0; chain < CHAINS; chain += 1) {
+      const segments: string[] = [];
+      for (let level = 0; level < DEPTH; level += 1) segments.push(`c${chain}l${level}`);
+      mkdirSync(path.join(scanRoot, ...segments), { recursive: true });
+    }
+  });
+
+  afterEach(() => {
+    rmSync(scanRoot, { recursive: true, force: true });
+  });
+
+  // Nothing matches, so the scan walks the whole tree instead of stopping at a confident result.
+  function scanWholeTree() {
+    return searchAbsoluteDirectoryPaths({
+      homeDir: scanRoot,
+      query: "nomatch",
+      maxDepth: DEPTH + 4,
+    });
+  }
+
+  async function countContainmentChecks(run: () => Promise<unknown>): Promise<number> {
+    startPathContainmentMetrics();
+    await run();
+    return stopPathContainmentMetrics();
+  }
+
+  it("derives no containment for a tree that cannot leave the root", async () => {
+    const checks = await countContainmentChecks(scanWholeTree);
+
+    expect({ checks, scanned: CHAINS * DEPTH }).toEqual({ checks: 0, scanned: 320 });
+  });
+
+  it.skipIf(isWindows)(
+    "derives containment for symlinked entries, which can leave the root",
+    async () => {
+      const outside = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-scan-away-")));
+      symlinkSync(outside, path.join(scanRoot, "escape"), "dir");
+
+      const checks = await countContainmentChecks(scanWholeTree);
+
+      expect({ checked: checks > 0, escaped: (await scanWholeTree()).includes(outside) }).toEqual({
+        checked: true,
+        escaped: false,
+      });
+      rmSync(outside, { recursive: true, force: true });
+    },
+  );
+});
+
+// Every pending fs call holds one of libuv's shared threadpool threads (4 by default). A read that
+// never returns, such as one on a hung network mount, keeps its thread, so searches that pile up
+// while the user types must not be able to take every thread from the rest of the daemon.
+describe("filesystem threads held by concurrent searches", () => {
+  const SEARCHES = 8;
+  let scanRoot: string;
+
+  beforeEach(() => {
+    scanRoot = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-scan-threads-")));
+    for (let branch = 0; branch < 20; branch += 1) {
+      mkdirSync(path.join(scanRoot, `b${branch}`, "inner", "leaf"), { recursive: true });
+    }
+  });
+
+  afterEach(() => {
+    rmSync(scanRoot, { recursive: true, force: true });
+  });
+
+  async function peakPendingFilesystemRequests(run: () => Promise<unknown>): Promise<number> {
+    const pending = new Set<number>();
+    let peak = 0;
+    const hook = createHook({
+      init(asyncId, type) {
+        if (type !== "FSREQPROMISE" && type !== "FSREQCALLBACK") return;
+        pending.add(asyncId);
+        peak = Math.max(peak, pending.size);
+      },
+      before(asyncId) {
+        pending.delete(asyncId);
+      },
+    });
+    hook.enable();
+    try {
+      await run();
+    } finally {
+      hook.disable();
+    }
+    return peak;
+  }
+
+  function searchWhileTyping() {
+    const queries = Array.from({ length: SEARCHES }, (_, index) => `nomatch${index}`);
+    return Promise.all(
+      queries.map((query) => searchAbsoluteDirectoryPaths({ homeDir: scanRoot, query })),
+    );
+  }
+
+  it("leaves threadpool threads free for the rest of the daemon", async () => {
+    const peak = await peakPendingFilesystemRequests(searchWhileTyping);
+
+    expect(peak).toBeLessThanOrEqual(2);
+  });
+
+  // Searches over one tree walk it in the same order, so searches stuck on one unreadable folder
+  // must hold one thread between them and leave the other for unrelated searches.
+  it("shares one filesystem request among searches waiting on the same path", async () => {
+    const peak = await peakPendingFilesystemRequests(searchWhileTyping);
+
+    expect(peak).toBe(1);
+  });
+});
diff --git a/packages/server/src/utils/directory-suggestions.ts b/packages/server/src/utils/directory-suggestions.ts
index aa24c4a6b9..e0443475bc 100644
--- a/packages/server/src/utils/directory-suggestions.ts
+++ b/packages/server/src/utils/directory-suggestions.ts
@@ -1,6 +1,7 @@
 import type { Dirent, Stats } from "node:fs";
-import { readdir, realpath, stat } from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import path from "node:path";
+import pLimit from "p-limit";
 import { scorePathMatch, type MatchScore } from "@getpaseo/protocol/search/text-match";
 import { isPathInsideRoot } from "./path.js";
 import { runGitCommand } from "./run-git-command.js";
@@ -32,6 +33,9 @@ export interface SearchDirectoryEntriesOptions {
   maxEntriesScanned?: number;
   confidentResultScanThreshold?: number;
   respectGitIgnore?: boolean;
+  // Absolute paths that discovery never walks into. A path the caller types explicitly still
+  // resolves, and browsing inside one lists a single level at a time.
+  excludedDiscoveryPaths?: readonly string[];
 }
 
 interface QueryPlan {
@@ -46,6 +50,7 @@ interface ChildEntry {
   name: string;
   resolvedPath: string;
   kind: DirectorySuggestionKind;
+  viaSymlink: boolean;
 }
 
 interface RawChildEntry {
@@ -53,6 +58,11 @@ interface RawChildEntry {
   kind: DirectorySuggestionKind | "symlink";
 }
 
+interface WalkStart {
+  visiblePath: string;
+  resolvedPath: string;
+}
+
 interface TraversedEntry extends ChildEntry {
   visiblePath: string;
   depth: number;
@@ -101,10 +111,42 @@ const NO_SEGMENT_INDEX = Number.MAX_SAFE_INTEGER;
 const NO_MATCH_OFFSET = Number.MAX_SAFE_INTEGER;
 const NO_FUZZY_SCORE = Number.MAX_SAFE_INTEGER;
 const NO_MATCH_TIER = 5;
+
+// Each pending fs call holds one of libuv's shared threadpool threads (4 by default), and a read on
+// a hung mount or a protected folder never returns. Searches pile up while the user types, so they
+// share two threads and leave the rest of the pool to the daemon. Searches over one tree walk it
+// in the same order and stop at the same stuck folder, so they share its pending call and hold one
+// thread between them instead of both.
+const filesystemCalls = pLimit(2);
+const pendingFilesystemCalls = new Map<string, Promise<unknown>>();
+
+function sharedFilesystemCall<T>(key: string, call: () => Promise<T>): Promise<T> {
+  const pending = pendingFilesystemCalls.get(key);
+  if (pending) return pending as Promise<T>;
+  const started = filesystemCalls(call).finally(() => pendingFilesystemCalls.delete(key));
+  pendingFilesystemCalls.set(key, started);
+  return started;
+}
+
+function readdir(directory: string): Promise<Dirent[]> {
+  return sharedFilesystemCall(`readdir:${directory}`, () =>
+    fs.readdir(directory, { withFileTypes: true }),
+  );
+}
+
+function realpath(target: string): Promise<string> {
+  return sharedFilesystemCall(`realpath:${target}`, () => fs.realpath(target));
+}
+
+function stat(target: string): Promise<Stats> {
+  return sharedFilesystemCall(`stat:${target}`, () => fs.stat(target));
+}
+
 export const WORKSPACE_SEARCH_HIDDEN_DIRECTORIES = [
   ".agents",
   ".claude",
   ".codex",
+  ".cursor",
   ".github",
   ".opencode",
   ".paseo",
@@ -141,29 +183,64 @@ export async function searchDirectoryEntries(
   const gitIgnoredPaths = options.respectGitIgnore
     ? await loadGitIgnoredPaths(root)
     : new Set<string>();
-  const input = buildSearchInput(options, root, gitIgnoredPaths);
+  const excludedDiscoveryPaths = await resolveExistingPaths(options.excludedDiscoveryPaths ?? []);
+  const input = buildSearchInput(options, root, gitIgnoredPaths, excludedDiscoveryPaths);
   if (!input) return [];
 
   const exact =
-    input.plan.browseExactPath || (input.matchMode === "suffix" && input.plan.isPathQuery)
+    input.plan.browseExactPath ||
+    (input.plan.isPathQuery && (input.matchMode === "suffix" || resolvesTypedPath(input)))
       ? await findExactEntry(input)
       : null;
   if (exact && input.limit === 1) return [exact];
 
-  const browsesRoot = input.plan.isPathQuery && !input.plan.normalizedQuery;
-  const browsesAbsoluteParent = input.plan.browseExactPath === true;
-  const ranked =
-    browsesRoot || browsesAbsoluteParent ? await searchChildren(input) : await searchTree(input);
+  const ranked = await searchCandidates(input);
   const results = sortAndFormat(ranked, input.root, input.pathFormat).slice(0, input.limit);
   return exact
     ? [exact, ...results.filter((entry) => !sameEntry(entry, exact))].slice(0, input.limit)
     : results;
 }
 
+async function searchCandidates(input: SearchInput): Promise<RankedEntry[]> {
+  const browsesRoot = input.plan.isPathQuery && !input.plan.normalizedQuery;
+  const browsesAbsoluteParent = input.plan.browseExactPath === true;
+  if (browsesRoot || browsesAbsoluteParent) return searchChildren(input);
+  if (!resolvesTypedPath(input) || !input.plan.parentPart) return searchTree(input);
+
+  // A typed parent such as `~/Developer/pas` anchors the walk under `~/Developer`. A parent that
+  // does not exist falls back to matching the typed path against the whole tree.
+  const typedParent = await resolveTypedParent(input);
+  if (!typedParent) return searchTree(input);
+  if (isInsideExcludedPath(typedParent.resolvedPath, input)) return searchChildren(input);
+  return searchTree(input, typedParent);
+}
+
+// Only a rooted query under the rooted policy names a location. Under the slashes policy a query
+// with a slash is still a fragment that may match anywhere in the tree.
+function resolvesTypedPath(input: SearchInput): boolean {
+  return input.pathQueryPolicy === "rooted" && input.plan.isPathQuery;
+}
+
+async function resolveTypedParent(input: SearchInput): Promise<WalkStart | null> {
+  const visiblePath = path.resolve(input.root, input.plan.parentPart);
+  const resolvedPath = await realpath(visiblePath).catch(() => null);
+  if (!resolvedPath || !isPathInsideRoot(input.root, resolvedPath)) return null;
+  const info = await stat(resolvedPath).catch(() => null);
+  return info?.isDirectory() ? { visiblePath, resolvedPath } : null;
+}
+
+async function resolveExistingPaths(paths: readonly string[]): Promise<Set<string>> {
+  const resolved = await Promise.all(
+    paths.map((candidate) => realpath(path.resolve(candidate)).catch(() => null)),
+  );
+  return new Set(resolved.filter((candidate): candidate is string => candidate !== null));
+}
+
 function buildSearchInput(
   options: SearchDirectoryEntriesOptions,
   root: string,
   gitIgnoredPaths: Set<string>,
+  excludedDiscoveryPaths: Set<string>,
 ): SearchInput | null {
   const includeDirectories = options.includeDirectories ?? true;
   const includeFiles = options.includeFiles ?? false;
@@ -185,6 +262,7 @@ function buildSearchInput(
     includeDirectories,
     includeFiles,
     matchMode: options.matchMode ?? "fuzzy",
+    pathQueryPolicy: options.pathQueryPolicy ?? "slashes",
     pathFormat: options.pathFormat,
     hiddenDirectoryNames: new Set(options.traversableHiddenDirectoryNames ?? []),
     limit: normalizeLimit(options.limit),
@@ -192,6 +270,7 @@ function buildSearchInput(
     maxEntriesScanned: options.maxEntriesScanned ?? DEFAULT_MAX_ENTRIES_SCANNED,
     confidentResultScanThreshold: options.confidentResultScanThreshold,
     gitIgnoredPaths,
+    excludedDiscoveryPaths,
   };
 }
 
@@ -219,6 +298,7 @@ interface SearchInput {
   includeDirectories: boolean;
   includeFiles: boolean;
   matchMode: DirectorySuggestionMatchMode;
+  pathQueryPolicy: PathQueryPolicy;
   pathFormat: DirectorySuggestionPathFormat;
   hiddenDirectoryNames: Set<string>;
   limit: number;
@@ -226,6 +306,7 @@ interface SearchInput {
   maxEntriesScanned: number;
   confidentResultScanThreshold: number | undefined;
   gitIgnoredPaths: Set<string>;
+  excludedDiscoveryPaths: Set<string>;
 }
 
 async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
@@ -233,9 +314,13 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
   const parent = await realpath(visibleParent).catch(() => null);
   if (!parent || !isPathInsideRoot(input.root, parent)) return [];
   if (isGitIgnoredPath(parent, input)) return [];
+  // Browsing inside an excluded path is explicit: the caller typed it, so list what is there.
+  const discoveryInput = isInsideExcludedPath(parent, input)
+    ? { ...input, excludedDiscoveryPaths: new Set<string>() }
+    : input;
   const entries = await readChildren(parent);
   return entries.flatMap((entry) => {
-    if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, input))
+    if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, discoveryInput))
       return [];
     const candidate: TraversedEntry = {
       ...entry,
@@ -246,17 +331,20 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
   });
 }
 
-async function searchTree(input: SearchInput): Promise<RankedEntry[]> {
+async function searchTree(
+  input: SearchInput,
+  start: WalkStart = { visiblePath: input.root, resolvedPath: input.root },
+): Promise<RankedEntry[]> {
   if (!(input.maxEntriesScanned > 0)) return [];
-  const roots = (await readChildren(input.root)).filter((entry) =>
-    isPathInsideRoot(input.root, entry.resolvedPath),
+  const roots = (await readChildren(start.resolvedPath)).filter((entry) =>
+    staysInsideRoot(entry, input.root),
   );
-  const visited = new Set<string>([input.root]);
+  const visited = new Set<string>([start.resolvedPath]);
   const branches = roots.flatMap((entry) =>
     shouldDiscover(entry, input)
       ? [
           walkBranch(
-            { ...entry, visiblePath: path.join(input.root, entry.name), depth: 1 },
+            { ...entry, visiblePath: path.join(start.visiblePath, entry.name), depth: 1 },
             input,
             visited,
           ),
@@ -294,7 +382,7 @@ async function* walkBranch(
     return;
   visited.add(entry.resolvedPath);
   const children = (await readChildren(entry.resolvedPath)).filter((child) =>
-    isPathInsideRoot(input.root, child.resolvedPath),
+    staysInsideRoot(child, input.root),
   );
   const branches = children.flatMap((child) =>
     shouldDiscover(child, input)
@@ -329,8 +417,15 @@ async function* roundRobin<T>(branches: Array<AsyncGenerator<T>>): AsyncGenerato
   }
 }
 
+// Only a symlink can resolve outside the tree being walked. Every other child is its parent's
+// path plus a name, and the parent was already proved inside the root.
+function staysInsideRoot(entry: ChildEntry, root: string): boolean {
+  return !entry.viaSymlink || isPathInsideRoot(root, entry.resolvedPath);
+}
+
 function shouldDiscover(entry: ChildEntry, input: SearchInput): boolean {
-  if (isGitIgnoredPath(entry.resolvedPath, input)) return false;
+  if (isNewlyGitIgnored(entry, input)) return false;
+  if (isNewlyExcluded(entry, input)) return false;
   if (entry.kind === "file") {
     return input.includeFiles && !entry.name.startsWith(".");
   }
@@ -339,6 +434,29 @@ function shouldDiscover(entry: ChildEntry, input: SearchInput): boolean {
   return input.hiddenDirectoryNames.has(entry.name);
 }
 
+// Traversal only descends through entries that already passed this check, so every ancestor of
+// a named child is known discoverable and only the entry itself can be newly ignored. A symlink
+// resolves to a path with different ancestors, so it still needs the full walk.
+function isNewlyGitIgnored(entry: ChildEntry, input: SearchInput): boolean {
+  if (entry.viaSymlink) return isGitIgnoredPath(entry.resolvedPath, input);
+  return input.gitIgnoredPaths.has(entry.resolvedPath);
+}
+
+// Same reasoning as Git-ignored paths: only a symlink can land inside an excluded path without
+// first passing through it by name.
+function isNewlyExcluded(entry: ChildEntry, input: SearchInput): boolean {
+  if (input.excludedDiscoveryPaths.size === 0) return false;
+  if (entry.viaSymlink) return isInsideExcludedPath(entry.resolvedPath, input);
+  return input.excludedDiscoveryPaths.has(entry.resolvedPath);
+}
+
+function isInsideExcludedPath(absolutePath: string, input: SearchInput): boolean {
+  for (const excludedPath of input.excludedDiscoveryPaths) {
+    if (isPathInsideRoot(excludedPath, absolutePath)) return true;
+  }
+  return false;
+}
+
 function isGitIgnoredPath(absolutePath: string, input: SearchInput): boolean {
   let candidate = absolutePath;
   while (candidate !== input.root && isPathInsideRoot(input.root, candidate)) {
@@ -640,7 +758,7 @@ async function readChildren(directory: string): Promise<ChildEntry[]> {
   ) {
     rawEntries = cached.entries;
   } else {
-    const dirents = await readdir(directory, { withFileTypes: true }).catch(() => [] as Dirent[]);
+    const dirents = await readdir(directory).catch(() => [] as Dirent[]);
     rawEntries = dirents
       .map(toRawChildEntry)
       .filter((entry): entry is RawChildEntry => entry !== null)
@@ -712,14 +830,14 @@ function toRawChildEntry(dirent: Dirent): RawChildEntry | null {
 async function resolveChild(directory: string, entry: RawChildEntry): Promise<ChildEntry | null> {
   const visiblePath = path.join(directory, entry.name);
   if (entry.kind !== "symlink") {
-    return { name: entry.name, resolvedPath: visiblePath, kind: entry.kind };
+    return { name: entry.name, resolvedPath: visiblePath, kind: entry.kind, viaSymlink: false };
   }
 
   const resolvedPath = await realpath(visiblePath).catch(() => null);
   if (!resolvedPath) return null;
   const info = await stat(resolvedPath).catch(() => null);
   const kind = getEntryKind(info);
-  return kind ? { name: entry.name, resolvedPath, kind } : null;
+  return kind ? { name: entry.name, resolvedPath, kind, viaSymlink: true } : null;
 }
 
 function getEntryKind(info: Stats | null): DirectorySuggestionKind | null {
@@ -728,10 +846,9 @@ function getEntryKind(info: Stats | null): DirectorySuggestionKind | null {
   return null;
 }
 
+// Reads already reject stale entries by expiry and by directory metadata, so this only has to
+// bound the map. Sweeping it for expired keys would cost a full pass on every cache miss.
 function pruneCache(): void {
-  if (directoryListCache.size <= DIRECTORY_LIST_CACHE_MAX_ENTRIES) return;
-  for (const [key, entry] of directoryListCache)
-    if (entry.expiresAt <= Date.now()) directoryListCache.delete(key);
   while (directoryListCache.size > DIRECTORY_LIST_CACHE_MAX_ENTRIES) {
     const key = directoryListCache.keys().next().value;
     if (!key) return;
diff --git a/packages/server/src/utils/git-file-contents.test.ts b/packages/server/src/utils/git-file-contents.test.ts
new file mode 100644
index 0000000000..7b25686e65
--- /dev/null
+++ b/packages/server/src/utils/git-file-contents.test.ts
@@ -0,0 +1,53 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { readGitFileContents } from "@server/utils/git-file-contents.js";
+import { runGitCommand, runGitCommandBytes } from "@server/utils/run-git-command.js";
+
+let cwd: string;
+beforeEach(() => {
+  cwd = mkdtempSync(join(tmpdir(), "git-contents-"));
+  execFileSync("git", ["init", "-q"], { cwd });
+});
+afterEach(() => rmSync(cwd, { recursive: true, force: true }));
+
+test("batch byte framing survives Unicode, invalid UTF-8, and missing objects", async () => {
+  const text = Buffer.concat([Buffer.from("中文👩‍💻\n"), Buffer.from([0xff]), Buffer.from("\n")]);
+  const { stdout: oid } = await runGitCommand(["hash-object", "-w", "--stdin"], {
+    cwd,
+    input: text,
+  });
+  const ref = oid.trim();
+  const empty = execFileSync("git", ["hash-object", "-w", "--stdin"], { cwd, input: "" })
+    .toString()
+    .trim();
+  const contents = await readGitFileContents(cwd, [ref, "HEAD:missing", empty, ref]);
+  expect(contents).toEqual(
+    new Map([
+      [ref, text.toString("utf8")],
+      ["HEAD:missing", null],
+      [empty, ""],
+    ]),
+  );
+  const raw = await runGitCommandBytes(["cat-file", "blob", ref], { cwd });
+  expect(raw.stdout.equals(text)).toBe(true);
+});
+
+test("oversized output stays bounded and requests the existing per-file path", async () => {
+  writeFileSync(join(cwd, "big"), Buffer.alloc(20 * 1024 * 1024, 97));
+  const oid = execFileSync("git", ["hash-object", "-w", "big"], { cwd }).toString().trim();
+  expect(await readGitFileContents(cwd, [oid])).toBeNull();
+  const limited = await runGitCommandBytes(["cat-file", "--batch"], {
+    cwd,
+    input: oid + "\n",
+    maxOutputBytes: 100,
+  });
+  expect(limited.truncated).toBe(true);
+  expect(limited.stdout.length).toBe(100);
+});
+
+test("newline paths do not become extra batch requests", async () => {
+  expect(await readGitFileContents(cwd, ["HEAD:with\nnewline"])).toBeNull();
+});
diff --git a/packages/server/src/utils/git-file-contents.ts b/packages/server/src/utils/git-file-contents.ts
new file mode 100644
index 0000000000..e42d3c6c83
--- /dev/null
+++ b/packages/server/src/utils/git-file-contents.ts
@@ -0,0 +1,48 @@
+import { runGitCommandBytes } from "./run-git-command.js";
+
+// Match the existing git-show ceiling. Oversized batches use bounded per-file reads.
+const MAX_CONTENT_BYTES = 20 * 1024 * 1024;
+
+/** Null means the batch cannot preserve per-file read semantics within its budget. */
+export async function readGitFileContents(
+  cwd: string,
+  specs: string[],
+): Promise<Map<string, string | null> | null> {
+  const unique = [...new Set(specs)];
+  if (unique.length === 0) return new Map();
+  // The line-based batch protocol cannot represent embedded newlines.
+  if (unique.some((spec) => spec.includes("\n"))) return null;
+  const result = await runGitCommandBytes(["cat-file", "--batch"], {
+    cwd,
+    input: unique.join("\n") + "\n",
+    envOverlay: { GIT_OPTIONAL_LOCKS: "0", LC_ALL: "C" },
+    maxOutputBytes: MAX_CONTENT_BYTES,
+  });
+  if (result.truncated) return null;
+  const contents = new Map<string, string | null>();
+  let offset = 0;
+  for (const spec of unique) {
+    const end = result.stdout.indexOf(10, offset);
+    if (end < 0) throw new Error("Incomplete git object header");
+    const header = result.stdout.subarray(offset, end).toString("utf8");
+    offset = end + 1;
+    if (header === `${spec} missing`) {
+      contents.set(spec, null);
+      continue;
+    }
+    const match = /^[a-f0-9]+ blob (\d+)$/.exec(header);
+    // Submodules and other non-blob objects retain git-show behavior.
+    if (!match) return null;
+    const size = Number(match[1]);
+    if (
+      !Number.isSafeInteger(size) ||
+      offset + size >= result.stdout.length ||
+      result.stdout[offset + size] !== 10
+    )
+      throw new Error("Invalid git object length");
+    contents.set(spec, result.stdout.subarray(offset, offset + size).toString("utf8"));
+    offset += size + 1;
+  }
+  if (offset !== result.stdout.length) throw new Error("Unexpected git object output");
+  return contents;
+}
diff --git a/packages/server/src/utils/git-rev-parse-path.test.ts b/packages/server/src/utils/git-rev-parse-path.test.ts
new file mode 100644
index 0000000000..7614b7dec8
--- /dev/null
+++ b/packages/server/src/utils/git-rev-parse-path.test.ts
@@ -0,0 +1,26 @@
+import { resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+import { parseGitRevParsePath, resolveGitRevParsePath } from "./git-rev-parse-path.js";
+
+describe("Git path output", () => {
+  it.each(["\n", "\r\n", ""])("preserves path whitespace with delimiter %j", (delimiter) => {
+    expect(parseGitRevParsePath(`/repo ${delimiter}`)).toBe("/repo ");
+    expect(parseGitRevParsePath(` relative path ${delimiter}`)).toBe(" relative path ");
+  });
+
+  it.each([
+    "",
+    "\n",
+    "\r\n",
+    "--path-format=absolute\n",
+    "--path-format=absolute\n/repo\n",
+    "/repo\n/another\n",
+    "/repo\n\n",
+  ])("rejects invalid output %j", (output) => {
+    expect(parseGitRevParsePath(output)).toBeNull();
+  });
+
+  it("resolves a relative path without stripping its trailing space", () => {
+    expect(resolveGitRevParsePath("/base", "repo \n")).toBe(resolve("/base", "repo "));
+  });
+});
diff --git a/packages/server/src/utils/git-rev-parse-path.ts b/packages/server/src/utils/git-rev-parse-path.ts
index b799815056..2f027d5020 100644
--- a/packages/server/src/utils/git-rev-parse-path.ts
+++ b/packages/server/src/utils/git-rev-parse-path.ts
@@ -1,18 +1,9 @@
 import { resolve } from "node:path";
 
 export function parseGitRevParsePath(stdout: string): string | null {
-  const trimmed = stdout.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  const lines = trimmed.split(/\r?\n/);
-  if (lines.length !== 1) {
-    return null;
-  }
-
-  const path = lines[0]?.trim() ?? "";
-  if (!path || path.startsWith("--")) {
+  // Remove Git's record delimiter, not whitespace belonging to the path.
+  const path = stdout.replace(/\r?\n$/, "");
+  if (!path || /[\r\n]/.test(path) || path.startsWith("--")) {
     return null;
   }
 
diff --git a/packages/server/src/utils/path.test.ts b/packages/server/src/utils/path.test.ts
index f72f5d82b2..bb279d6c2f 100644
--- a/packages/server/src/utils/path.test.ts
+++ b/packages/server/src/utils/path.test.ts
@@ -42,6 +42,35 @@ describe("path equivalence", () => {
     );
   });
 
+  test.each([
+    { root: "/repo", candidate: "/repo/..notes.txt", inside: true },
+    { root: "/repo", candidate: "/repo/..drafts/notes.md", inside: true },
+    { root: "/repo", candidate: "/repo/...drafts/notes.md", inside: true },
+    { root: "/repo", candidate: "/repo/docs/..notes.txt", inside: true },
+    { root: "/repo", candidate: "/repo", inside: true },
+    { root: "/repo", candidate: "/repo/../sibling/notes.md", inside: false },
+    { root: "/repo", candidate: "/repo/..drafts/../../outside.txt", inside: false },
+    { root: "/repo", candidate: "/repo-other/notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "c:/repo/..notes.txt", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\..drafts\\notes.md", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\...drafts\\notes.md", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\..\\sibling\\notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "C:\\Repo-other\\notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "D:\\Repo\\..notes.txt", inside: false },
+    {
+      root: String.raw`\\server\share\repo`,
+      candidate: String.raw`\\server\share\repo\..drafts\notes.md`,
+      inside: true,
+    },
+    {
+      root: String.raw`\\?\C:\Repo`,
+      candidate: "C:\\Repo\\..notes.txt",
+      inside: true,
+    },
+  ])("checks named path containment for $candidate", ({ root, candidate, inside }) => {
+    expect(isPathInsideRoot(root, candidate)).toBe(inside);
+  });
+
   test("preserves the casing of Windows relative suffixes", () => {
     expect(getRealpathAwareRelativePath("C:\\Repo\\.git", "c:\\repo\\.git\\HEAD")).toBe("HEAD");
     expect(
diff --git a/packages/server/src/utils/path.ts b/packages/server/src/utils/path.ts
index d5f0d30c8c..a0ec908fbb 100644
--- a/packages/server/src/utils/path.ts
+++ b/packages/server/src/utils/path.ts
@@ -58,7 +58,22 @@ export function createRealpathAwarePathMatcher(target: string): (candidate: stri
   };
 }
 
+let pathContainmentChecks: number | null = null;
+
+// Containment is re-derived from scratch on every call. A tree walk that asks it per entry, or
+// per ancestor of every entry, costs more than reading the tree does, so tests count the calls.
+export function startPathContainmentMetrics(): void {
+  pathContainmentChecks = 0;
+}
+
+export function stopPathContainmentMetrics(): number {
+  const checks = pathContainmentChecks ?? 0;
+  pathContainmentChecks = null;
+  return checks;
+}
+
 export function isPathInsideRoot(root: string, candidate: string): boolean {
+  if (pathContainmentChecks !== null) pathContainmentChecks += 1;
   return getRelativePathInsideRoot(root, candidate) !== null;
 }
 
@@ -99,10 +114,11 @@ function getRelativePathInsideRoot(root: string, candidate: string): string | nu
   const normalizedCandidate = normalizePathForComparison(candidate, compareAsWindows);
   const comparableRelative = platformPath.relative(normalizedRoot, normalizedCandidate);
 
-  if (
-    comparableRelative !== "" &&
-    (comparableRelative.startsWith("..") || platformPath.isAbsolute(comparableRelative))
-  ) {
+  const isOutsideRoot =
+    comparableRelative === ".." ||
+    comparableRelative.startsWith(`..${platformPath.sep}`) ||
+    platformPath.isAbsolute(comparableRelative);
+  if (isOutsideRoot) {
     return null;
   }
 
@@ -138,7 +154,15 @@ function shouldCompareAsWindows(left: string, right: string): boolean {
   return looksLikeDefiniteWindowsPath(left) || looksLikeDefiniteWindowsPath(right);
 }
 
-function looksLikeDefiniteWindowsPath(value: string): boolean {
+/**
+ * True when `value`'s shape identifies it as a Windows path (drive letter,
+ * `\\?\` device namespace, or UNC), independent of the host platform. Callers
+ * that fold case for Windows-looking paths (this module's own comparisons,
+ * and `pruneKnownDirectories` in `workspace-git-service.ts`, which needs the
+ * same decision without paying for a realpath syscall) must all agree on this
+ * one rule — do not reimplement the pattern.
+ */
+export function looksLikeDefiniteWindowsPath(value: string): boolean {
   return (
     /^[a-zA-Z]:[\\/]/u.test(value) ||
     /^[/\\]{2}\?[/\\]/u.test(value) ||
diff --git a/packages/server/src/utils/run-git-command.ts b/packages/server/src/utils/run-git-command.ts
index aca69555ee..bdf7bc1f32 100644
--- a/packages/server/src/utils/run-git-command.ts
+++ b/packages/server/src/utils/run-git-command.ts
@@ -46,6 +46,7 @@ export function configureGitProcessPolicy(policy: GitProcessPolicy): void {
 
 export interface GitCommandOptions {
   cwd: string;
+  input?: string | Buffer;
   env?: ProcessEnvRecord;
   envOverlay?: ProcessEnvRecord;
   logger?: Pick<Logger, "trace">;
@@ -54,8 +55,8 @@ export interface GitCommandOptions {
   acceptExitCodes?: number[];
 }
 
-export interface GitCommandResult {
-  stdout: string;
+export interface GitCommandResult<Output = string> {
+  stdout: Output;
   stderr: string;
   truncated: boolean;
   exitCode: number | null;
@@ -263,6 +264,23 @@ function runGitCommandWithProvenance(
   options: GitCommandOptions,
   provenance?: string,
 ): Promise<GitCommandResult> {
+  return executeGitCommand(args, options, (output) => output.toString("utf8"), provenance);
+}
+
+/** Binary stdout preserves cat-file byte framing before text decoding. */
+export function runGitCommandBytes(
+  args: string[],
+  options: GitCommandOptions,
+): Promise<GitCommandResult<Buffer>> {
+  return executeGitCommand(args, options, (output) => output);
+}
+
+function executeGitCommand<Output>(
+  args: string[],
+  options: GitCommandOptions,
+  decode: (output: Buffer) => Output,
+  provenance?: string,
+): Promise<GitCommandResult<Output>> {
   const metricsState = submitGitCommandMetric(args, options.cwd);
   const commandTrace = submitGitCommandTrace(args, options.cwd, {
     active: gitProcessScheduler.activeCount,
@@ -274,7 +292,7 @@ function runGitCommandWithProvenance(
     const exited = new Promise<void>((resolve) => {
       releaseProcessSlot = resolve;
     });
-    const resultPromise = new Promise<GitCommandResult>((resolve, reject) => {
+    const resultPromise = new Promise<GitCommandResult<Output>>((resolve, reject) => {
       startGitCommandTrace(commandTrace, {
         active: gitProcessScheduler.activeCount,
         pending: gitProcessScheduler.pendingCount,
@@ -385,7 +403,7 @@ function runGitCommandWithProvenance(
             cwd: options.cwd,
             envOverlay,
             shell: false,
-            stdio: ["ignore", "pipe", "pipe"],
+            stdio: [options.input === undefined ? "ignore" : "pipe", "pipe", "pipe"],
           },
         );
         spawnGitCommandTrace(commandTrace, child.pid);
@@ -465,12 +483,23 @@ function runGitCommandWithProvenance(
         }
       });
 
+      if (options.input !== undefined) {
+        child.stdin!.on("error", (error: NodeJS.ErrnoException) => {
+          // A command may close stdin when it exits or reaches the output limit.
+          if (error.code !== "EPIPE") {
+            processError = error;
+            child.kill("SIGKILL");
+          }
+        });
+        child.stdin!.end(options.input);
+      }
+
       child.on("exit", markProcessExited);
 
       child.on("close", (exitCode, signal) => {
         markProcessExited(exitCode, signal);
-        const result: GitCommandResult = {
-          stdout: Buffer.concat(stdoutChunks).toString("utf8"),
+        const result: GitCommandResult<Output> = {
+          stdout: decode(Buffer.concat(stdoutChunks)),
           stderr: Buffer.concat(stderrChunks).toString("utf8"),
           truncated,
           exitCode,
diff --git a/packages/server/src/utils/spawn.launch-regression.test.ts b/packages/server/src/utils/spawn.launch-regression.test.ts
index 847214c624..4943e68990 100644
--- a/packages/server/src/utils/spawn.launch-regression.test.ts
+++ b/packages/server/src/utils/spawn.launch-regression.test.ts
@@ -126,10 +126,15 @@ async function runFixture(params: {
   command: string;
   args: string[];
   shell?: boolean;
+  env?: NodeJS.ProcessEnv;
 }): Promise<SpawnResult> {
   const child = spawnProcess(params.command, params.args, {
     env: {
       ...process.env,
+      ...params.env,
+      // Terminal color settings must not add Node warnings to the argv fixture's stderr.
+      NO_COLOR: undefined,
+      FORCE_COLOR: undefined,
       PASEO_EXPECTED_ARGV_JSON: JSON.stringify(["--config", JSON_ARG]),
     },
     stdio: ["ignore", "pipe", "pipe"],
@@ -216,6 +221,8 @@ async function findAndLaunch(fixture: LaunchFixture): Promise<{
     const child = spawnProcess(found, fixture.args, {
       env: {
         ...process.env,
+        NO_COLOR: undefined,
+        FORCE_COLOR: undefined,
         PASEO_EXPECTED_ARGV_JSON: fixture.expectedArgvJson,
         PASEO_ARGV_SLICE_FROM: String(fixture.sliceFrom),
       },
@@ -331,18 +338,25 @@ describe.runIf(isPlatform("win32"))("Windows spawn launch regression", () => {
 });
 
 describe.skipIf(isPlatform("win32"))("spawn launch regression smoke", () => {
-  test("direct launch with a space-containing executable works on this platform", async () => {
-    const fixture = makeFixture();
+  test.each([
+    { colors: "inherited", env: {} },
+    { colors: "conflicting", env: { NO_COLOR: "1", FORCE_COLOR: "1" } },
+  ])(
+    "direct launch with a space-containing executable works with $colors colors",
+    async ({ env }) => {
+      const fixture = makeFixture();
 
-    const result = await runFixture({
-      command: fixture.fakeDaemonNode,
-      args: [fixture.assertScript, ...fixture.expectedArgs],
-      shell: false,
-    });
+      const result = await runFixture({
+        command: fixture.fakeDaemonNode,
+        args: [fixture.assertScript, ...fixture.expectedArgs],
+        shell: false,
+        env,
+      });
 
-    expect(result.error).toBeNull();
-    expect(result.code).toBe(0);
-    expect(result.stderr).toBe("");
-    expect(result.stdout.trim()).toBe("ARGV_OK");
-  });
+      expect(result.error).toBeNull();
+      expect(result.code).toBe(0);
+      expect(result.stderr).toBe("");
+      expect(result.stdout.trim()).toBe("ARGV_OK");
+    },
+  );
 });
diff --git a/packages/server/src/utils/spawn.ts b/packages/server/src/utils/spawn.ts
index 8fac115f00..b26104c63e 100644
--- a/packages/server/src/utils/spawn.ts
+++ b/packages/server/src/utils/spawn.ts
@@ -1,15 +1,6 @@
-import { execFile, spawn, type ChildProcess, type SpawnOptions } from "node:child_process";
-import { extname } from "node:path";
-import { promisify } from "node:util";
-
+import type { ChildProcess, SpawnOptions } from "node:child_process";
+import { spawnProcess as spawnCli, execCommand as execCli } from "@getpaseo/plugin/server";
 import { createExternalCommandProcessEnv, type ProcessEnvRecord } from "../server/paseo-env.js";
-import {
-  isWindowsCommandScript,
-  quoteWindowsArgument,
-  quoteWindowsCommand,
-} from "./windows-command.js";
-
-const execFileAsync = promisify(execFile);
 
 interface ExternalEnvOptions {
   baseEnv?: ProcessEnvRecord;
@@ -35,23 +26,6 @@ interface ExecCommandResult {
   stderr: string;
 }
 
-function hasPathSeparator(value: string): boolean {
-  return value.includes("/") || value.includes("\\");
-}
-
-function shouldUseWindowsShell(
-  command: string,
-  requestedShell?: boolean | string,
-): boolean | string {
-  if (isWindowsCommandScript(command)) {
-    return true;
-  }
-  if (requestedShell !== undefined) {
-    return requestedShell;
-  }
-  return process.platform === "win32" && !hasPathSeparator(command) && !extname(command);
-}
-
 export function spawnProcess(
   command: string,
   args: string[],
@@ -59,12 +33,6 @@ export function spawnProcess(
 ): ChildProcess {
   const { baseEnv, env, envOverlay, ...spawnOptions } = options ?? {};
   const resolvedBaseEnv = env ?? baseEnv ?? process.env;
-  const isWindows = process.platform === "win32";
-  const shell = shouldUseWindowsShell(command, spawnOptions.shell);
-
-  const shouldQuoteForShell = isWindows && shell !== false;
-  const resolvedCommand = shouldQuoteForShell ? quoteWindowsCommand(command) : command;
-  const resolvedArgs = shouldQuoteForShell ? args.map(quoteWindowsArgument) : args;
   const childEnv =
     options?.envMode === "internal"
       ? ({ ...resolvedBaseEnv, ...envOverlay } as NodeJS.ProcessEnv)
@@ -74,12 +42,10 @@ export function spawnProcess(
           ...(envOverlay ? [envOverlay] : []),
         );
 
-  return spawn(resolvedCommand, resolvedArgs, {
+  return spawnCli(command, args, {
     ...spawnOptions,
     env: childEnv,
-    shell,
     signal: options?.signal,
-    windowsHide: true,
   });
 }
 
@@ -90,11 +56,6 @@ export async function execCommand(
 ): Promise<ExecCommandResult> {
   const { baseEnv, env, envOverlay } = options ?? {};
   const resolvedBaseEnv = env ?? baseEnv ?? process.env;
-  const isWindows = process.platform === "win32";
-  const shell = shouldUseWindowsShell(command, options?.shell);
-  const shouldQuoteForShell = isWindows && shell !== false;
-  const resolvedCommand = shouldQuoteForShell ? quoteWindowsCommand(command) : command;
-  const resolvedArgs = shouldQuoteForShell ? args.map(quoteWindowsArgument) : args;
   const childEnv =
     options?.envMode === "internal"
       ? ({ ...resolvedBaseEnv, ...envOverlay } as NodeJS.ProcessEnv)
@@ -104,14 +65,14 @@ export async function execCommand(
           ...(envOverlay ? [envOverlay] : []),
         );
 
-  return execFileAsync(resolvedCommand, resolvedArgs, {
+  return execCli(command, args, {
     cwd: options?.cwd,
     env: childEnv,
+    shell: options?.shell,
     encoding: options?.encoding ?? "utf8",
+    signal: options?.signal,
     killSignal: options?.killSignal,
     timeout: options?.timeout,
     maxBuffer: options?.maxBuffer,
-    shell,
-    windowsHide: true,
   }) as Promise<ExecCommandResult>;
 }
diff --git a/packages/server/src/utils/worktree-metadata.ts b/packages/server/src/utils/worktree-metadata.ts
index e07691ba1c..b977f7952b 100644
--- a/packages/server/src/utils/worktree-metadata.ts
+++ b/packages/server/src/utils/worktree-metadata.ts
@@ -162,6 +162,10 @@ export function getPaseoWorktreeMetadataPath(worktreeRoot: string): string {
   return join(gitDir, "paseo", "worktree.json");
 }
 
+export function isQualifiedRef(ref: string): boolean {
+  return ref.trim().startsWith("refs/");
+}
+
 const REMOTE_TRACKING_PREFIX = "refs/remotes/";
 
 /**
diff --git a/packages/server/src/utils/worktree.posix.test.ts b/packages/server/src/utils/worktree.posix.test.ts
index 5673c1412a..2b9181bb77 100644
--- a/packages/server/src/utils/worktree.posix.test.ts
+++ b/packages/server/src/utils/worktree.posix.test.ts
@@ -265,6 +265,38 @@ describe.skipIf(isPlatform("win32"))("worktree POSIX-only", () => {
       });
     });
 
+    it.each([false, true])(
+      "shows committed changes for an existing branch (already checked out: %s)",
+      async (alreadyCheckedOut) => {
+        execFileSync("git", ["checkout", "-b", "feature/existing"], { cwd: repoDir });
+        writeFileSync(join(repoDir, "file.txt"), "feature change\n");
+        execFileSync("git", ["add", "file.txt"], { cwd: repoDir });
+        execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "feature change"], {
+          cwd: repoDir,
+        });
+        if (!alreadyCheckedOut) {
+          execFileSync("git", ["checkout", "main"], { cwd: repoDir });
+        }
+
+        const result = await createWorktreePrimitive({
+          cwd: repoDir,
+          worktreeSlug: "existing-feature",
+          source: { kind: "checkout-branch", branchName: "feature/existing" },
+          runSetup: false,
+          paseoHome,
+        });
+        const status = await getCheckoutStatus(result.worktreePath, { paseoHome });
+        const diff = await getCheckoutDiff(result.worktreePath, { mode: "base" }, { paseoHome });
+        expect(diff.diff).toContain("+feature change");
+        expect(status).toMatchObject({
+          isGit: true,
+          baseRef: "main",
+          aheadBehind: { ahead: 1, behind: 0 },
+        });
+        expect(result.comparisonBaseRef).toBe("main");
+      },
+    );
+
     it("checks out an existing local branch that is not checked out elsewhere", async () => {
       execFileSync("git", ["branch", "dev"], { cwd: repoDir });
 
@@ -284,15 +316,65 @@ describe.skipIf(isPlatform("win32"))("worktree POSIX-only", () => {
         .trim();
       expect(currentBranch).toBe("dev");
 
+      // baseRefName must be the repo's default branch, not the checked-out branch
+      // itself — otherwise the diff panel compares the branch against itself and
+      // always shows no changes.
       const metadataPath = getPaseoWorktreeMetadataPath(result.worktreePath);
       const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
       expect(metadata).toMatchObject({
         version: 1,
-        baseRefName: "dev",
+        baseRefName: "main",
         changeRequestLookupTarget: { headRef: "dev", localBranchName: "dev" },
       });
     });
 
+    it("shows committed changes when origin HEAD points to a deleted default branch", async () => {
+      execFileSync("git", ["branch", "-m", "main", "master"], { cwd: repoDir });
+      execFileSync(
+        "git",
+        ["symbolic-ref", "refs/remotes/origin/HEAD", "refs/remotes/origin/main"],
+        { cwd: repoDir },
+      );
+      execFileSync("git", ["checkout", "-b", "feature/stale-default"], { cwd: repoDir });
+      writeFileSync(join(repoDir, "file.txt"), "feature change\n");
+      execFileSync("git", ["add", "file.txt"], { cwd: repoDir });
+      execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "feature change"], {
+        cwd: repoDir,
+      });
+      execFileSync("git", ["checkout", "master"], { cwd: repoDir });
+      const created = await createWorktreePrimitive({
+        cwd: repoDir,
+        worktreeSlug: "stale-default",
+        source: { kind: "checkout-branch", branchName: "feature/stale-default" },
+        runSetup: false,
+        paseoHome,
+      });
+      const diff = await getCheckoutDiff(created.worktreePath, { mode: "base" }, { paseoHome });
+      expect(diff.diff).toContain("+feature change");
+      expect(created.comparisonBaseRef).toBe("master");
+    });
+
+    it("falls back to the currently checked out branch when no default branch can be resolved", async () => {
+      // No origin remote and no local main/master — resolveRepositoryDefaultBranch
+      // can't find a default branch, so the fix must fall back to whatever is
+      // currently checked out in the main repo (here: "develop").
+      execFileSync("git", ["branch", "-m", "main", "develop"], { cwd: repoDir });
+      execFileSync("git", ["branch", "feature-x"], { cwd: repoDir });
+
+      const result = await createLegacyWorktreeForTest({
+        cwd: repoDir,
+        worktreeSlug: "feature-x-worktree",
+        source: { kind: "checkout-branch", branchName: "feature-x" },
+        runSetup: true,
+        paseoHome,
+      });
+
+      expect(existsSync(result.worktreePath)).toBe(true);
+      const metadataPath = getPaseoWorktreeMetadataPath(result.worktreePath);
+      const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
+      expect(metadata).toMatchObject({ version: 1, baseRefName: "develop" });
+    });
+
     it("checks out an existing local branch whose name contains uppercase letters and dots", async () => {
       execFileSync("git", ["branch", "release/1.1.15"], { cwd: repoDir });
 
diff --git a/packages/server/src/utils/worktree.test.ts b/packages/server/src/utils/worktree.test.ts
index 4769bed7d0..479d4cfeab 100644
--- a/packages/server/src/utils/worktree.test.ts
+++ b/packages/server/src/utils/worktree.test.ts
@@ -20,6 +20,7 @@ import {
   writeFileSync,
 } from "fs";
 import { join } from "path";
+import { createServer, type AddressInfo, type Socket } from "net";
 import { tmpdir } from "os";
 import { createRealpathAwarePathMatcher } from "./path";
 
@@ -52,6 +53,21 @@ function createLegacyWorktreeForTest(
   });
 }
 
+// A remote that accepts connections and never answers, like a VPN-only host while off the VPN.
+async function startSilentRemote(): Promise<{ url: string; close: () => Promise<void> }> {
+  const connections = new Set<Socket>();
+  const server = createServer((socket) => connections.add(socket));
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const { port } = server.address() as AddressInfo;
+  return {
+    url: `http://127.0.0.1:${port}/repo.git`,
+    close: () => {
+      for (const socket of connections) socket.destroy();
+      return new Promise<void>((resolve) => server.close(() => resolve()));
+    },
+  };
+}
+
 describe("paseo worktree manager", () => {
   let tempDir: string;
   let repoDir: string;
@@ -263,6 +279,103 @@ describe("paseo worktree manager", () => {
 
     expect(existsSync(created.worktreePath)).toBe(false);
   });
+
+  describe("branch-off from a remote-tracking base", () => {
+    function git(args: string[], cwd: string): string {
+      return execFileSync("git", ["-c", "commit.gpgsign=false", ...args], {
+        cwd,
+        encoding: "utf8",
+      }).trim();
+    }
+
+    // The repo caches <remote>/main at "initial" while the remote itself moves one commit ahead,
+    // as when nothing has fetched since someone else pushed.
+    function pushPastCachedRemoteRef(remoteName: string): string {
+      const remoteDir = join(tempDir, "remote.git");
+      git(["clone", "--bare", "-q", repoDir, remoteDir], tempDir);
+      git(["remote", "add", remoteName, remoteDir], repoDir);
+      git(["fetch", "-q", remoteName], repoDir);
+
+      const pusherDir = join(tempDir, "pusher");
+      git(["clone", "-q", remoteDir, pusherDir], tempDir);
+      git(["config", "user.email", "test@test.com"], pusherDir);
+      git(["config", "user.name", "Test"], pusherDir);
+      writeFileSync(join(pusherDir, "file.txt"), "pushed after the last fetch\n");
+      git(["commit", "-q", "-am", "remote ahead"], pusherDir);
+      git(["push", "-q", "origin", "HEAD:main"], pusherDir);
+      return git(["rev-parse", "HEAD"], pusherDir);
+    }
+
+    it("starts the new branch at the remote tip, not the cached origin/main", async () => {
+      const remoteTip = pushPastCachedRemoteRef("origin");
+      const fetchRefspecs = git(["config", "--get-all", "remote.origin.fetch"], repoDir);
+
+      const created = await createLegacyWorktreeForTest({
+        branchName: "from-remote-tip",
+        cwd: repoDir,
+        baseBranch: "origin/main",
+        worktreeSlug: "from-remote-tip",
+        paseoHome,
+      });
+
+      expect(git(["rev-parse", "HEAD"], created.worktreePath)).toBe(remoteTip);
+      expect(git(["config", "--get-all", "remote.origin.fetch"], repoDir)).toBe(fetchRefspecs);
+    });
+
+    it("refreshes a base on a remote other than origin", async () => {
+      const remoteTip = pushPastCachedRemoteRef("team/upstream");
+
+      const created = await createLegacyWorktreeForTest({
+        branchName: "from-upstream-tip",
+        cwd: repoDir,
+        baseBranch: "refs/remotes/team/upstream/main",
+        worktreeSlug: "from-upstream-tip",
+        paseoHome,
+      });
+
+      expect(git(["rev-parse", "HEAD"], created.worktreePath)).toBe(remoteTip);
+    });
+
+    it("branches from the cached ref when the remote is unreachable", async () => {
+      pushPastCachedRemoteRef("origin");
+      const cachedTip = git(["rev-parse", "refs/remotes/origin/main"], repoDir);
+      git(["remote", "set-url", "origin", join(tempDir, "missing.git")], repoDir);
+
+      const created = await createLegacyWorktreeForTest({
+        branchName: "from-cached-ref",
+        cwd: repoDir,
+        baseBranch: "origin/main",
+        worktreeSlug: "from-cached-ref",
+        paseoHome,
+      });
+
+      expect(git(["rev-parse", "HEAD"], created.worktreePath)).toBe(cachedTip);
+    });
+
+    it("branches from the cached ref when the remote accepts but never answers", async () => {
+      pushPastCachedRemoteRef("origin");
+      const cachedTip = git(["rev-parse", "refs/remotes/origin/main"], repoDir);
+      const silentRemote = await startSilentRemote();
+      git(["remote", "set-url", "origin", silentRemote.url], repoDir);
+
+      try {
+        const startedAt = Date.now();
+        const created = await createLegacyWorktreeForTest({
+          branchName: "from-silent-remote",
+          cwd: repoDir,
+          baseBranch: "origin/main",
+          worktreeSlug: "from-silent-remote",
+          paseoHome,
+        });
+
+        // Clients give up on a create request after 60s, so the fallback has to land well before.
+        expect(Date.now() - startedAt).toBeLessThan(30_000);
+        expect(git(["rev-parse", "HEAD"], created.worktreePath)).toBe(cachedTip);
+      } finally {
+        await silentRemote.close();
+      }
+    }, 45_000);
+  });
 });
 
 describe("slugify", () => {
diff --git a/packages/server/src/utils/worktree.ts b/packages/server/src/utils/worktree.ts
index 987867c0d3..f454a7225a 100644
--- a/packages/server/src/utils/worktree.ts
+++ b/packages/server/src/utils/worktree.ts
@@ -31,6 +31,7 @@ import { PaseoConfigSchema, type PaseoConfig } from "@getpaseo/protocol/paseo-co
 import {
   createPaseoWorktreeChangeRequestHint,
   normalizeBaseRefName,
+  isQualifiedRef,
   type PaseoWorktreeChangeRequestHint,
   readPaseoWorktreeMetadata,
   readPaseoWorktreeRuntimePort,
@@ -38,6 +39,7 @@ import {
   writePaseoWorktreeRuntimeMetadata,
 } from "./worktree-metadata.js";
 import { runGitCommand } from "./run-git-command.js";
+import { getCurrentBranch, resolveRepositoryDefaultBranch } from "./checkout-git.js";
 import { spawnProcess } from "./spawn.js";
 import { resolvePaseoHome } from "../server/paseo-home.js";
 import { createExternalProcessEnv } from "../server/paseo-env.js";
@@ -57,6 +59,10 @@ export interface WorktreeConfig {
   worktreePath: string;
 }
 
+export interface CreatedWorktree extends WorktreeConfig {
+  comparisonBaseRef: string | null;
+}
+
 export interface WorktreeRuntimeEnv {
   [key: string]: string;
   PASEO_SOURCE_CHECKOUT_PATH: string;
@@ -180,6 +186,8 @@ export interface WorktreeCheckoutRef {
 export type WorktreeSource =
   | { kind: "branch-off"; baseBranch: string; branchName: string }
   | { kind: "checkout-branch"; branchName: string }
+  | { kind: "restore"; branchName: string; baseRef: string | null }
+  | { kind: "restore-from-base"; baseRef: string; branchName: string }
   | {
       kind: "checkout-change-request";
       forge: string;
@@ -1216,7 +1224,7 @@ export const createWorktree = async ({
   runSetup,
   paseoHome,
   worktreesRoot,
-}: CreateWorktreeOptions): Promise<WorktreeConfig> => {
+}: CreateWorktreeOptions): Promise<CreatedWorktree> => {
   const sourcePlan = await resolveWorktreeSourcePlan({ cwd, source, desiredSlug: worktreeSlug });
   let worktreePath = join(await getPaseoWorktreesRoot(cwd, paseoHome, worktreesRoot), worktreeSlug);
   mkdirSync(dirname(worktreePath), { recursive: true });
@@ -1272,6 +1280,7 @@ export const createWorktree = async ({
   return {
     branchName: sourcePlan.branchName,
     worktreePath,
+    comparisonBaseRef: sourcePlan.metadataBaseRef ?? sourcePlan.metadataBaseRefName,
   };
 };
 
@@ -1302,50 +1311,98 @@ interface WorktreeSourcePlan {
   };
 }
 
+async function resolveRestoredWorktreeSourcePlan(
+  cwd: string,
+  source: Extract<WorktreeSource, { kind: "restore" }>,
+): Promise<WorktreeSourcePlan> {
+  await validateGitBranchName(cwd, source.branchName);
+  await ensureLocalBranch(cwd, source.branchName);
+  if (await isBranchCheckedOut(cwd, source.branchName)) {
+    throw new BranchAlreadyCheckedOutError(source.branchName);
+  }
+  let exactBase: string | undefined;
+  if (source.baseRef && isQualifiedRef(source.baseRef)) {
+    try {
+      exactBase = await resolveBaseBranchForWorktree(cwd, source.baseRef);
+    } catch {
+      // Restore the saved branch even when its comparison ref no longer exists.
+    }
+  }
+  return {
+    branchName: source.branchName,
+    metadataBaseRefName: normalizeRequiredBaseBranch(source.baseRef ?? source.branchName),
+    ...(exactBase ? { metadataBaseRef: exactBase } : {}),
+    changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
+      headRef: source.branchName,
+      localBranchName: source.branchName,
+    }),
+    addArguments: [source.branchName],
+  };
+}
+
+async function resolveRestoredWorktreeFromBasePlan(
+  cwd: string,
+  source: Extract<WorktreeSource, { kind: "restore-from-base" }>,
+): Promise<WorktreeSourcePlan> {
+  await validateGitBranchName(cwd, source.branchName);
+  const baseRef = await resolveBaseBranchForWorktree(cwd, source.baseRef);
+  const branchName = await resolveUniqueLocalBranchName(cwd, source.branchName);
+  return {
+    branchName,
+    metadataBaseRefName: normalizeRequiredBaseBranch(source.baseRef),
+    metadataBaseRef: baseRef,
+    addArguments: ["-b", branchName, "--no-track", baseRef],
+  };
+}
+
+async function resolveBranchOffWorktreeSourcePlan(
+  cwd: string,
+  source: Extract<WorktreeSource, { kind: "branch-off" }>,
+  desiredSlug: string,
+): Promise<WorktreeSourcePlan> {
+  const branchName = source.branchName;
+  await validateGitBranchName(cwd, branchName);
+  const normalizedBaseBranch = normalizeRequiredBaseBranch(source.baseBranch);
+  const resolvedBaseBranch = await resolveBaseBranchForWorktree(cwd, source.baseBranch);
+  const branchExists = await localBranchExists(cwd, branchName);
+  const base = branchExists ? branchName : resolvedBaseBranch;
+  await refreshRemoteTrackingBaseRef(cwd, base);
+  const candidateBranch = branchExists ? desiredSlug : branchName;
+  const newBranchName = await resolveUniqueLocalBranchName(cwd, candidateBranch);
+
+  return {
+    branchName: newBranchName,
+    metadataBaseRefName: normalizedBaseBranch,
+    metadataBaseRef: resolvedBaseBranch,
+    changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
+      headRef: newBranchName,
+      localBranchName: newBranchName,
+    }),
+    addArguments: ["-b", newBranchName, "--no-track", base],
+  };
+}
+
 async function resolveWorktreeSourcePlan({
   cwd,
   source,
   desiredSlug,
 }: ResolveWorktreeSourcePlanOptions): Promise<WorktreeSourcePlan> {
   switch (source.kind) {
-    case "branch-off": {
-      const branchName = source.branchName;
-      await validateGitBranchName(cwd, branchName);
-      const normalizedBaseBranch = normalizeRequiredBaseBranch(source.baseBranch);
-      const resolvedBaseBranch = await resolveBaseBranchForWorktree(cwd, source.baseBranch);
-      const branchExists = await localBranchExists(cwd, branchName);
-      const base = branchExists ? branchName : resolvedBaseBranch;
-      const candidateBranch = branchExists ? desiredSlug : branchName;
-      const newBranchName = await resolveUniqueLocalBranchName(cwd, candidateBranch);
-
-      return {
-        branchName: newBranchName,
-        metadataBaseRefName: normalizedBaseBranch,
-        metadataBaseRef: resolvedBaseBranch,
-        changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
-          headRef: newBranchName,
-          localBranchName: newBranchName,
-        }),
-        addArguments: ["-b", newBranchName, "--no-track", base],
-      };
-    }
+    case "branch-off":
+      return resolveBranchOffWorktreeSourcePlan(cwd, source, desiredSlug);
+    case "restore":
+      return resolveRestoredWorktreeSourcePlan(cwd, source);
+    case "restore-from-base":
+      return resolveRestoredWorktreeFromBasePlan(cwd, source);
     case "checkout-branch": {
       await validateGitBranchName(cwd, source.branchName);
-      if (!(await localBranchExists(cwd, source.branchName))) {
-        try {
-          await runGitCommand(["fetch", "origin", `${source.branchName}:${source.branchName}`], {
-            cwd,
-            timeout: 120_000,
-          });
-        } catch {
-          throw new UnknownBranchError({ branchName: source.branchName, cwd });
-        }
-      }
+      await ensureLocalBranch(cwd, source.branchName);
+      const baseRef = await resolveCheckoutBranchBaseRef(cwd, source.branchName);
       if (await isBranchCheckedOut(cwd, source.branchName)) {
         const branchName = await resolveUniqueLocalBranchName(cwd, source.branchName);
         return {
           branchName,
-          metadataBaseRefName: source.branchName,
+          metadataBaseRefName: baseRef,
           changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
             headRef: branchName,
             localBranchName: branchName,
@@ -1356,7 +1413,7 @@ async function resolveWorktreeSourcePlan({
 
       return {
         branchName: source.branchName,
-        metadataBaseRefName: source.branchName,
+        metadataBaseRefName: baseRef,
         changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
           headRef: source.branchName,
           localBranchName: source.branchName,
@@ -1611,6 +1668,21 @@ function normalizeRequiredBaseBranch(baseBranch: string): string {
   return normalizedBaseBranch;
 }
 
+// The checked-out branch itself isn't a base to diff against — resolve the
+// repository's default branch so the diff panel has a real comparison target.
+// If the default branch can't be determined (no origin/HEAD, no local
+// main/master — e.g. a local-only repo based on "develop"), fall back to
+// whichever branch is currently checked out in the main repo, since that's
+// almost always the branch this one was intended to be compared against.
+async function resolveCheckoutBranchBaseRef(cwd: string, branchName: string): Promise<string> {
+  const defaultBranch = await resolveRepositoryDefaultBranch(cwd);
+  if (defaultBranch) {
+    return defaultBranch;
+  }
+  const currentBranch = await getCurrentBranch(cwd);
+  return currentBranch && currentBranch !== branchName ? currentBranch : branchName;
+}
+
 async function resolveBaseBranchForWorktree(
   cwd: string,
   requestedBaseBranch: string,
@@ -1618,7 +1690,7 @@ async function resolveBaseBranchForWorktree(
   const requested = requestedBaseBranch.trim();
   const normalized = normalizeRequiredBaseBranch(requested);
   let exactRef: string | null = null;
-  if (requested.startsWith("refs/")) {
+  if (isQualifiedRef(requested)) {
     exactRef = requested;
   } else if (requested.startsWith("origin/")) {
     exactRef = `refs/remotes/${requested}`;
@@ -1629,7 +1701,7 @@ async function resolveBaseBranchForWorktree(
       await runGitCommand(["rev-parse", "--verify", exactRef], { cwd });
       return exactRef;
     } catch {
-      throw new Error(`Base branch not found: ${normalized}`);
+      throw new Error(`Base branch not found: ${exactRef}`);
     }
   }
 
@@ -1645,6 +1717,55 @@ async function resolveBaseBranchForWorktree(
   throw new Error(`Base branch not found: ${normalized}`);
 }
 
+// Clients give up on a create request after 60s. A remote that accepts the connection and never
+// answers (a VPN-only host while off the VPN) must fall back to the cached ref well before that.
+const REMOTE_BASE_REFRESH_TIMEOUT_MS = 15_000;
+
+// A remote-tracking base is only as fresh as the last fetch, and the background fetch only runs
+// while a workspace of the repository is observed. Refresh the one base branch so the new branch
+// starts at the remote tip; when the fetch fails (offline, auth) the cached ref is still usable.
+async function refreshRemoteTrackingBaseRef(cwd: string, baseRef: string): Promise<void> {
+  if (!baseRef.startsWith("refs/remotes/")) {
+    return;
+  }
+  try {
+    // Remote names may contain slashes, so the owning remote is looked up rather than parsed.
+    const { stdout } = await runGitCommand(["remote"], { cwd });
+    const remoteName = stdout
+      .split("\n")
+      .map((name) => name.trim())
+      .find((name) => name.length > 0 && baseRef.startsWith(`refs/remotes/${name}/`));
+    if (!remoteName) {
+      return;
+    }
+    const remoteBranch = baseRef.slice(`refs/remotes/${remoteName}/`.length);
+    // No refspec is added to remote.<name>.fetch: one left behind breaks later fetches once the
+    // branch is deleted on the remote.
+    await runGitCommand(["fetch", remoteName, `+refs/heads/${remoteBranch}:${baseRef}`], {
+      cwd,
+      envOverlay: { GIT_TERMINAL_PROMPT: "0" },
+      timeout: REMOTE_BASE_REFRESH_TIMEOUT_MS,
+      acceptExitCodes: [0, 1, 128],
+    });
+  } catch {
+    // The fetch timed out; branch from the cached ref.
+  }
+}
+
+async function ensureLocalBranch(cwd: string, branchName: string): Promise<void> {
+  if (await localBranchExists(cwd, branchName)) {
+    return;
+  }
+  try {
+    await runGitCommand(["fetch", "origin", `${branchName}:${branchName}`], {
+      cwd,
+      timeout: 120_000,
+    });
+  } catch {
+    throw new UnknownBranchError({ branchName, cwd });
+  }
+}
+
 async function localBranchExists(cwd: string, branchName: string): Promise<boolean> {
   try {
     await runGitCommand(["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], {
diff --git a/packages/website/README.md b/packages/website/README.md
new file mode 100644
index 0000000000..5a938ca2f4
--- /dev/null
+++ b/packages/website/README.md
@@ -0,0 +1,22 @@
+# Paseo website
+
+## Plugin install counts
+
+Clients report an install by resolving a plugin with `X-Paseo-Install: 1` or
+`?intent=install`, using `/api/plugins/resolve/<owner>/<slug>` or
+`/plugins/<owner>/<slug>.json`. Ordinary resolves do not count. These numbers
+measure install intent, not successful artifact installation or npm downloads.
+
+The worker requires Cloudflare's `CF-Connecting-IP` header to count a report.
+It stores the plugin ID plus a SHA-256 hash of the IP in a `WEBSITE_CACHE` KV key
+with a one hour TTL, never the raw IP. An existing key skips the count; repeats
+do not extend the hour. Missing or empty IP headers do not count.
+
+Accepted reports increment the existing all-time total and UTC daily buckets in
+`WEBSITE_CACHE`. Daily buckets retain 60 days and supply the website's seven-day
+and thirty-day rankings. `/api/plugins/installs` still returns plugin IDs mapped
+to all-time totals. The [registry build](https://github.com/getpaseo/plugins/blob/main/scripts/build.ts)
+reads that endpoint into the published plugin details and index; the website
+reads windowed counts from KV through its five-minute cache. Existing counts
+remain intact. The KV guard is advisory: concurrent requests and KV propagation
+are not serialized.
diff --git a/packages/website/e2e/download-thanks.spec.ts b/packages/website/e2e/download-thanks.spec.ts
new file mode 100644
index 0000000000..bc33f8f087
--- /dev/null
+++ b/packages/website/e2e/download-thanks.spec.ts
@@ -0,0 +1,47 @@
+import { expect, test, type Page } from "playwright/test";
+
+const APPLE_SILICON_DMG = /\/getpaseo\/paseo\/releases\/download\/v[^/]+\/Paseo-[^/]+-arm64\.dmg$/;
+
+async function openDownloadPage(page: Page) {
+  // Serve a stand-in file so the test never downloads a real release.
+  await page.route(APPLE_SILICON_DMG, (route) =>
+    route.fulfill({
+      status: 200,
+      headers: {
+        "content-type": "application/octet-stream",
+        "content-disposition": "attachment; filename=Paseo.dmg",
+      },
+      body: "dmg",
+    }),
+  );
+  await page.goto("/download");
+}
+
+async function clickAppleSilicon(page: Page) {
+  await page.getByRole("link", { name: "Apple Silicon", exact: true }).click();
+}
+
+test("a download button opens the thanks page and requests the file", async ({ page }) => {
+  await openDownloadPage(page);
+
+  const fileRequest = page.waitForRequest(APPLE_SILICON_DMG);
+  await clickAppleSilicon(page);
+
+  await fileRequest;
+  await expect(page).toHaveURL(/\/download\/thanks\?file=/);
+  await expect(page.getByRole("heading", { name: "Thanks for downloading Paseo" })).toBeVisible();
+  await expect(page.getByRole("link", { name: "Try again" })).toHaveAttribute(
+    "href",
+    APPLE_SILICON_DMG,
+  );
+});
+
+test("the thanks page starts a browser download", async ({ page, browserName }) => {
+  test.skip(browserName === "webkit", "WebKit reports no download event for a stubbed response");
+  await openDownloadPage(page);
+
+  const download = page.waitForEvent("download");
+  await clickAppleSilicon(page);
+
+  expect((await download).url()).toMatch(APPLE_SILICON_DMG);
+});
diff --git a/packages/website/e2e/mockups.spec.ts b/packages/website/e2e/mockups.spec.ts
new file mode 100644
index 0000000000..8b0ba65857
--- /dev/null
+++ b/packages/website/e2e/mockups.spec.ts
@@ -0,0 +1,61 @@
+import { expect, test, type Locator, type Page } from "playwright/test";
+
+const desktopName =
+  "Paseo desktop app with coding agents, a conversation, and a code diff open side by side";
+
+async function openHomepage(page: Page) {
+  await page.setViewportSize({ width: 1512, height: 930 });
+  await page.goto("/");
+  await expect(page.getByRole("button", { name: "Build", exact: true })).toBeVisible();
+}
+
+async function viewPhones(page: Page) {
+  await page.getByRole("img", { name: "Paseo agent chat", exact: true }).scrollIntoViewIfNeeded();
+}
+
+async function expectScreenContentInsidePhone(page: Page, name: string, time: string) {
+  const phone = page.getByRole("img", { name, exact: true });
+  const clock = phone.getByText(time, { exact: true });
+  await expect(clock).toBeVisible();
+  await expect(async () => {
+    const frame = await phone.boundingBox();
+    const content = await clock.boundingBox();
+    expect(frame).not.toBeNull();
+    expect(content).not.toBeNull();
+    if (!frame || !content) throw new Error("Phone screen is not rendered");
+    expect(content.x).toBeGreaterThanOrEqual(frame.x);
+    expect(content.y).toBeGreaterThanOrEqual(frame.y);
+    expect(content.x + content.width).toBeLessThanOrEqual(frame.x + frame.width);
+    expect(content.y + content.height).toBeLessThanOrEqual(frame.y + frame.height);
+  }).toPass({ timeout: 5000 });
+}
+
+async function cornerProportion(mockup: Locator) {
+  return mockup.evaluate((element) => {
+    const radius = getComputedStyle(element).borderTopLeftRadius.split(" ")[0];
+    if (radius.endsWith("%")) return Number.parseFloat(radius) / 100;
+    return Number.parseFloat(radius) / element.getBoundingClientRect().width;
+  });
+}
+
+async function resizeToPhone(page: Page) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.getByRole("img", { name: desktopName, exact: true }).scrollIntoViewIfNeeded();
+}
+
+test("the three phone mockups show their screen content", async ({ page }) => {
+  await openHomepage(page);
+  await viewPhones(page);
+  await expectScreenContentInsidePhone(page, "Paseo workspace drawer", "18:54");
+  await expectScreenContentInsidePhone(page, "Paseo agent chat", "18:53");
+  await expectScreenContentInsidePhone(page, "Paseo diff view", "18:55");
+});
+
+test("desktop mockup corners shrink in proportion on a phone", async ({ page }) => {
+  await openHomepage(page);
+  const mockup = page.getByRole("img", { name: desktopName, exact: true });
+  const desktopCorner = await cornerProportion(mockup);
+  expect(desktopCorner).toBeGreaterThan(0);
+  await resizeToPhone(page);
+  await expect.poll(() => cornerProportion(mockup)).toBeCloseTo(desktopCorner, 3);
+});
diff --git a/packages/website/e2e/overview.fixture.json b/packages/website/e2e/overview.fixture.json
new file mode 100644
index 0000000000..2553fe83c6
--- /dev/null
+++ b/packages/website/e2e/overview.fixture.json
@@ -0,0 +1,32 @@
+{
+  "id": "security/overview",
+  "name": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "description": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "artifact": {
+    "kind": "npm",
+    "package": "@alhassanaraouf/paseo-base2tone-theme",
+    "version": "0.1.2",
+    "resolved": "https://registry.npmjs.org/@alhassanaraouf/paseo-base2tone-theme/-/paseo-base2tone-theme-0.1.2.tgz",
+    "integrity": "sha512-baP+qh3MlPgwACvt72XjrULjbDHARofzHfxyGGVVl22iw6qVnMzyfBJXi4exgtplvD/yPqf/XlsqD8wTqHB+lg=="
+  },
+  "license": "MIT",
+  "repository": {
+    "url": "javascript:alert(1)"
+  },
+  "categories": ["themes"],
+  "author": {
+    "github": "security",
+    "name": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">"
+  },
+  "media": [
+    "data:image/svg+xml,<svg onload=\"globalThis.__overviewExecuted=1\"/>",
+    "http://example.com/image.png"
+  ],
+  "submittedAt": "2026-09-24T00:00:00.000Z",
+  "reviewedAt": "2026-10-03T00:00:00.000Z",
+  "publishedAt": "2026-09-24T17:12:05.467Z",
+  "updatedAt": "2026-10-03T00:00:00.000Z",
+  "installs": 0,
+  "readme": "## Overview security\n\n</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "icon": "data:image/png;base64,AAAA"
+}
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
new file mode 100644
index 0000000000..6eb9f7d816
--- /dev/null
+++ b/packages/website/e2e/plugins.spec.ts
@@ -0,0 +1,782 @@
+import securityPlugin from "./overview.fixture.json" with { type: "json" };
+import { expect, test, type Page, type Locator } from "playwright/test";
+import registry from "./registry.fixture.json" with { type: "json" };
+import { CATEGORIES } from "../src/plugins/categories";
+
+async function openPlugins(page: Page) {
+  await page.goto("/plugins");
+  await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
+}
+
+function pluginCards(page: Page, section: string): Locator {
+  return page
+    .getByRole("region", { name: section })
+    .getByRole("link")
+    .filter({ hasNotText: /^See all$/ });
+}
+
+test("scrolls mobile plugin carousels without widening the page", async ({ page }) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openPlugins(page);
+  await expectPageWithinViewport(page);
+  await scrollPluginCarousel(page, "Featured");
+  await scrollPluginCarousel(page, "What’s new");
+  await expectPageWithinViewport(page);
+});
+
+// Graphite's fixture description ends in raw README HTML with an unbreakable srcset URL.
+test("keeps browse grids within a phone's width when a description has an unbreakable word", async ({
+  page,
+}) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.goto("/plugins/all");
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expectPageWithinViewport(page);
+});
+
+async function expectPageWithinViewport(page: Page) {
+  expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(
+    await page.evaluate(() => document.documentElement.clientWidth),
+  );
+  await page.evaluate(() => window.scrollTo({ left: 1000, behavior: "instant" }));
+  expect(await page.evaluate(() => window.scrollX)).toBe(0);
+}
+
+async function scrollPluginCarousel(page: Page, section: string) {
+  const cards = pluginCards(page, section);
+  // The cards share a non-semantic scrolling container.
+  const strip = cards.first().locator("..");
+  await strip.evaluate((element) =>
+    element.scrollIntoView({ block: "center", behavior: "instant" }),
+  );
+  expect(await strip.evaluate((element) => element.scrollWidth)).toBeGreaterThan(
+    await strip.evaluate((element) => element.clientWidth),
+  );
+  await expect(cards.last()).not.toBeInViewport();
+  await strip.evaluate((element) =>
+    element.scrollTo({ left: element.scrollWidth, behavior: "instant" }),
+  );
+  await expect(cards.last()).toBeInViewport({ ratio: 1 });
+  await expect(cards.first()).not.toBeInViewport();
+}
+
+test("browses from the directory into a category, a plugin, and its author", async ({
+  page,
+  context,
+}) => {
+  // WebKit has no clipboard permission to grant; record what the page writes instead.
+  await context.addInitScript(() => {
+    Object.defineProperty(navigator, "clipboard", {
+      configurable: true,
+      value: {
+        writeText: (text: string) => {
+          (window as unknown as { __copied?: string }).__copied = text;
+          return Promise.resolve();
+        },
+      },
+    });
+  });
+  await openPlugins(page);
+
+  await page.getByRole("region", { name: "Categories" }).getByRole("link", { name: /Git/ }).click();
+  await expect(page).toHaveURL(/\/plugins\/category\/git$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Git/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+
+  await page.getByRole("link", { name: /Fresh Worktrees/ }).click();
+  await expect(page).toHaveURL(/\/plugins\/omercnet\/fresh-worktrees$/);
+  await expect(page.getByRole("heading", { name: "Fresh Worktrees" })).toHaveCount(1);
+  await expect(page.getByText("paseo plugin add omercnet/fresh-worktrees")).toHaveCount(1);
+  await expect(
+    page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
+  ).toBeVisible();
+  await page.getByRole("button", { name: "Copy to clipboard" }).click();
+  await expect
+    .poll(() => page.evaluate(() => (window as unknown as { __copied?: string }).__copied))
+    .toBe("paseo plugin add omercnet/fresh-worktrees");
+  await expect(page.getByRole("link", { name: "Git", exact: true })).toHaveAttribute(
+    "href",
+    "/plugins/category/git",
+  );
+  // The source is a folder in a monorepo; issues are filed on the repository.
+  await expect(page.getByRole("link", { name: "Report a bug" })).toHaveAttribute(
+    "href",
+    "https://github.com/omercnet/paseo-plugins/issues/new",
+  );
+
+  await page.getByRole("link", { name: "Omer Cohen" }).click();
+  await expect(page).toHaveURL(/\/plugins\/omercnet$/);
+  await expect(page.getByRole("heading", { level: 1, name: "Omer Cohen" })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Agent Monitor/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Defer/ })).toHaveCount(0);
+});
+
+test("ranks plugins on browse pages by installs in a window, by newest, or by latest update", async ({
+  page,
+}) => {
+  await page.goto("/plugins/all");
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: "Most installed" })).toHaveAttribute(
+    "aria-current",
+    "page",
+  );
+  await page.getByRole("link", { name: "This month" }).click();
+  await expect(page).toHaveURL(/\/plugins\/all\?window=month$/);
+  await expect(page.getByRole("link", { name: "This month" })).toHaveAttribute(
+    "aria-current",
+    "true",
+  );
+
+  await page.getByRole("link", { name: "Newest" }).click();
+  await expect(page).toHaveURL(/\/plugins\/all\?sort=new$/);
+  await expect(page.getByRole("navigation", { name: "Time window" })).toHaveCount(0);
+  await expect(page.getByRole("main").getByRole("link", { name: /Base2Tone/ })).toContainText(
+    "ago",
+  );
+
+  await page.getByRole("link", { name: "Recently updated" }).click();
+  await expect(page).toHaveURL(/\/plugins\/all\?sort=updated$/);
+  await expect(page.getByRole("heading", { level: 1 })).toHaveText(/^All plugins\s*2$/);
+  await expect(page.getByRole("main").getByRole("link", { name: /Defer|OMP/ })).toHaveText([
+    /Defer/,
+    /OMP/,
+  ]);
+});
+
+test("shows each plugin's author with their avatar on browse cards", async ({ page }) => {
+  await page.goto("/plugins/all");
+  const card = page.getByRole("main").getByRole("link", { name: /Defer/ });
+  await expect(card).toContainText("Tom Gringauz");
+  await expect(card.locator('img[src="https://github.com/tomgrin10.png?size=80"]')).toHaveCount(1);
+});
+
+test("filters by search and clears to all plugins", async ({ page }) => {
+  await page.goto("/");
+  await openPlugins(page);
+
+  await submitSearch(page, "graphite");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite$/);
+  await expect(
+    page.getByRole("heading", { level: 1, name: /^Results for “graphite”/ }),
+  ).toBeVisible();
+  await expect(page.getByRole("main").getByRole("link", { name: /Graphite/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+
+  await searchPlugins(page, "zzzz-nothing");
+  await expect(page.getByText("No plugins match.")).toBeVisible();
+  await page.getByRole("link", { name: "Clear filters" }).click();
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("");
+});
+
+test("keeps the directory's ranking window when searching", async ({ page }) => {
+  await page.goto("/plugins?window=month");
+  await submitSearch(page, "graphite");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite&window=month$/);
+  await expect(page.getByRole("link", { name: "This month" })).toHaveAttribute(
+    "aria-current",
+    "true",
+  );
+});
+
+test("searches for a term typed before the page finished loading", async ({ page }) => {
+  const loadScripts = await holdScripts(page);
+  await page.goto("/plugins?window=month", { waitUntil: "domcontentloaded" });
+  await searchPlugins(page, "graphite");
+  await loadScripts();
+  await expect(page.getByRole("button", { name: "Clear search" })).toBeVisible();
+  await page.keyboard.press("Enter");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite&window=month$/);
+});
+
+test("filters browse results for a term typed before the page finished loading", async ({
+  page,
+}) => {
+  await page.goto("/");
+  const loadScripts = await holdScripts(page);
+  await page.goto("/plugins/all", { waitUntil: "domcontentloaded" });
+  const entries = await historyLength(page);
+  await searchPlugins(page, "gra");
+  await loadScripts();
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+  expect(await historyLength(page)).toBe(entries + 1);
+
+  await page.goBack();
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+});
+
+test("clears the search with the clear button", async ({ page }) => {
+  await page.goto("/plugins/all");
+  const searchbox = page.getByRole("searchbox", { name: "Search plugins" });
+  const clear = page.getByRole("button", { name: "Clear search" });
+  await expect(clear).toHaveCount(0);
+
+  await searchPlugins(page, "graphite");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite$/);
+  await clear.click();
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(searchbox).toHaveValue("");
+  await expect(searchbox).toBeFocused();
+  await expect(clear).toHaveCount(0);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+});
+
+test("searches from the directory on submit, and Back returns to the directory", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await openPlugins(page);
+  const entries = await historyLength(page);
+
+  await typeSearch(page, "gra");
+  await expect(page).toHaveURL(/\/plugins$/);
+  expect(await historyLength(page)).toBe(entries);
+
+  await page.keyboard.press("Enter");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  expect(await historyLength(page)).toBe(entries + 1);
+
+  await page.goBack();
+  await expect(page).toHaveURL(/\/plugins$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
+});
+
+test("filters browse results as you type in one history entry", async ({ page }) => {
+  await page.goto("/");
+  await page.goto("/plugins/all");
+  const entries = await historyLength(page);
+
+  await typeSearch(page, "gra");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("main").getByRole("link", { name: /Graphite/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+  expect(await historyLength(page)).toBe(entries + 1);
+
+  await page.goBack();
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("");
+
+  await page.goForward();
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("gra");
+
+  await page.reload();
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("gra");
+});
+
+test("keeps old category links working", async ({ page }) => {
+  await page.goto("/plugins?category=git&sort=new");
+  await expect(page).toHaveURL(/\/plugins\/category\/git\?sort=new$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Git/ })).toBeVisible();
+});
+
+test("explains a plugin that is not listed", async ({ page }) => {
+  await page.goto("/plugins/acme/does-not-exist");
+  await expect(page.getByRole("heading", { level: 1, name: "Plugin not found" })).toBeVisible();
+  await page.getByRole("link", { name: "Browse all plugins" }).click();
+  await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
+});
+
+test.describe("search engine visits without JavaScript", () => {
+  test.use({ javaScriptEnabled: false });
+
+  test("reads directory, category, author, and complete plugin HTML with page metadata", async ({
+    page,
+  }) => {
+    await openPlugins(page);
+    await expect(page.getByRole("link", { name: /Base2Tone/ }).first()).toBeVisible();
+    await expectPageMetadata(page, "Plugins – Extend Paseo with community plugins", "/plugins");
+
+    await page.goto("/plugins/category/git");
+    await expect(page.getByRole("link", { name: /Fresh Worktrees/ })).toBeVisible();
+    await expectPageMetadata(page, "Git – Paseo plugins", "/plugins/category/git");
+
+    await page.goto("/plugins/omercnet");
+    await expect(page.getByRole("heading", { level: 1, name: "Omer Cohen" })).toBeVisible();
+    await expect(page.getByRole("link", { name: /Fresh Worktrees/ }).first()).toBeVisible();
+    await expectPageMetadata(page, "Omer Cohen – Paseo plugins", "/plugins/omercnet");
+
+    const response = await page.goto("/plugins/omercnet/fresh-worktrees");
+    expect(response?.status()).toBe(200);
+    expect(response?.headers()["cache-control"]).toBe("private, no-store");
+    expect(response?.headers()["x-robots-tag"]).toBeUndefined();
+    await expect(page.getByText("paseo plugin add omercnet/fresh-worktrees")).toBeVisible();
+    await expect(
+      page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
+    ).toBeVisible();
+    await expectPageMetadata(
+      page,
+      "Fresh Worktrees – Paseo plugin",
+      "/plugins/omercnet/fresh-worktrees",
+    );
+    await expect(page.locator('meta[property="og:image"]')).toHaveAttribute(
+      "content",
+      "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-behind.png",
+    );
+    await expect(page.locator('meta[name="description"]')).toHaveAttribute(
+      "content",
+      "Fast-forwards clean local base branches before Paseo creates branch-off worktrees",
+    );
+    await expect(page.locator('meta[name="robots"]')).toHaveCount(0);
+
+    await page.goto("/plugins/tomgrin10/graphite");
+    await expectPageMetadata(page, "Graphite – Paseo plugin", "/plugins/tomgrin10/graphite");
+    await expect(page.locator('meta[property="og:image"]')).toHaveAttribute(
+      "content",
+      "https://paseo.sh/og-image.png",
+    );
+  });
+
+  test("renders search results and submits the search form", async ({ page }) => {
+    await page.goto("/plugins/all?q=graphite");
+    await expect(
+      page.getByRole("heading", { level: 1, name: /^Results for “graphite”/ }),
+    ).toBeVisible();
+    await expect(page.getByRole("main").getByRole("link", { name: /Graphite/ })).toBeVisible();
+    await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+
+    await page.goto("/plugins/category/git");
+    await searchPlugins(page, "fresh");
+    await page.keyboard.press("Enter");
+    await expect(page).toHaveURL(/\/plugins\/category\/git\?q=fresh$/);
+    await expect(
+      page.getByRole("heading", { level: 1, name: /^Results for “fresh” in Git/ }),
+    ).toBeVisible();
+    await expect(page.getByRole("link", { name: /Fresh Worktrees/ })).toBeVisible();
+    await page.getByRole("link", { name: "Clear", exact: true }).click();
+    await expect(page).toHaveURL(/\/plugins\/category\/git$/);
+  });
+
+  test("returns real 404 pages for unknown plugins, authors, and categories", async ({ page }) => {
+    const plugin = await page.goto("/plugins/acme/does-not-exist");
+    expect(plugin?.status()).toBe(404);
+    await expect(page.getByRole("heading", { name: "Plugin not found" })).toBeVisible();
+    await expect(page).toHaveTitle("Plugin not found – Paseo");
+    const author = await page.goto("/plugins/does-not-exist");
+    expect(author?.status()).toBe(404);
+    await expect(page.getByRole("heading", { name: "Author not found" })).toBeVisible();
+    await expect(page).toHaveTitle("Author not found – Paseo");
+    const category = await page.goto("/plugins/category/does-not-exist");
+    expect(category?.status()).toBe(404);
+    await expect(page.getByRole("heading", { name: "Category not found" })).toBeVisible();
+    await expect(page).toHaveTitle("Category not found – Paseo");
+  });
+
+  test("redirects old category links permanently", async ({ request }) => {
+    const response = await request.get("/plugins?category=git", { maxRedirects: 0 });
+    expect(response.status()).toBe(301);
+    expect(response.headers().location).toMatch(/\/plugins\/category\/git$/);
+    const search = await request.get("/plugins?q=graphite", { maxRedirects: 0 });
+    expect(search.status()).toBe(301);
+    expect(search.headers().location).toMatch(/\/plugins\/all\?q=graphite$/);
+    const windowed = await request.get("/plugins?q=graphite&window=month", { maxRedirects: 0 });
+    expect(windowed.headers().location).toMatch(/\/plugins\/all\?q=graphite&window=month$/);
+  });
+
+  test("discovers plugin, category, and author URLs through robots and the sitemap index", async ({
+    request,
+  }) => {
+    const robots = await request.get("/robots.txt");
+    expect(await robots.text()).toContain("Sitemap: https://paseo.sh/sitemap-index.xml");
+    const index = await request.get("/sitemap-index.xml");
+    expect(await index.text()).toContain("https://paseo.sh/sitemap-plugins.xml");
+    const plugins = await request.get("/sitemap-plugins.xml");
+    expect(plugins.status()).toBe(200);
+    expect(plugins.headers()["content-type"]).toContain("application/xml");
+    const sitemap = await plugins.text();
+    expect(sitemap).toContain("<loc>https://paseo.sh/plugins/all</loc>");
+    expect(sitemap).toContain("<loc>https://paseo.sh/plugins/category/git</loc>");
+    expect(sitemap).toContain("<loc>https://paseo.sh/plugins/omercnet</loc>");
+    expect(sitemap).toContain("<loc>https://paseo.sh/plugins/omercnet/fresh-worktrees</loc>");
+  });
+});
+
+/** Holds the page's scripts so typing lands before hydration; the returned function loads them. */
+async function holdScripts(page: Page): Promise<() => Promise<void>> {
+  let release!: () => void;
+  const held = new Promise<void>((resolve) => (release = resolve));
+  await page.route(/\.js($|\?)/, async (route) => {
+    await held;
+    await route.continue();
+  });
+  return async () => {
+    release();
+    await page.waitForLoadState("load");
+  };
+}
+
+async function searchPlugins(page: Page, term: string) {
+  await page.getByRole("searchbox", { name: "Search plugins" }).fill(term);
+}
+
+async function submitSearch(page: Page, term: string) {
+  await searchPlugins(page, term);
+  await page.keyboard.press("Enter");
+}
+
+async function typeSearch(page: Page, term: string) {
+  await page.getByRole("searchbox", { name: "Search plugins" }).pressSequentially(term);
+}
+
+async function historyLength(page: Page): Promise<number> {
+  return page.evaluate(() => window.history.length);
+}
+
+async function expectPageMetadata(page: Page, title: string, path: string) {
+  await expect(page).toHaveTitle(title);
+  await expect(page.locator('link[rel="canonical"]')).toHaveAttribute(
+    "href",
+    `https://paseo.sh${path}`,
+  );
+  await expect(page.locator('meta[property="og:title"]')).toHaveAttribute("content", title);
+  await expect(page.locator('meta[property="og:url"]')).toHaveAttribute(
+    "content",
+    `https://paseo.sh${path}`,
+  );
+  await expect(page.locator('meta[property="og:type"]')).toHaveAttribute("content", "website");
+  await expect(page.locator('meta[name="twitter:card"]')).toHaveAttribute(
+    "content",
+    "summary_large_image",
+  );
+  const description = await page.locator('meta[name="description"]').getAttribute("content");
+  expect(description).toBeTruthy();
+  await expect(page.locator('meta[property="og:description"]')).toHaveAttribute(
+    "content",
+    description!,
+  );
+}
+
+test("links the directory from the site navigation", async ({ page }) => {
+  await page.goto("/");
+  await expect(
+    page.getByRole("navigation").getByRole("link", { name: "Plugins", exact: true }),
+  ).toHaveAttribute("href", "/plugins");
+  await expect(
+    page.getByRole("contentinfo").getByRole("link", { name: "Plugins", exact: true }),
+  ).toHaveAttribute("href", "/plugins");
+  await expect(page.getByRole("link", { name: "Browse plugins" })).toHaveAttribute(
+    "href",
+    "/plugins",
+  );
+  const response = await page.goto("/plugins");
+  expect(response?.status()).toBe(200);
+  await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
+});
+
+// External deployments own their registry contents; these assertions use the local fixture.
+test.describe("registry fixture layout", () => {
+  test.skip(Boolean(process.env.WEBSITE_TEST_URL), "Requires the local registry fixture");
+
+  test("uses density-aware card thumbnails and keeps detail screenshots original", async ({
+    page,
+  }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "alhassanaraouf/base2tone")!;
+    const source = plugin.media[0];
+    await openPlugins(page);
+    await expectThumbnailCard(
+      page.getByRole("region", { name: "What’s new" }).getByRole("link", { name: /Base2Tone/ }),
+      source,
+      plugin.id,
+    );
+    await page.goto("/plugins/all");
+    const card = page.getByRole("main").getByRole("link", { name: /Base2Tone/ });
+    await expectThumbnailCard(card, source, plugin.id);
+    await card.click();
+    await expect(
+      page.getByRole("img", { name: "Base2Tone screenshot 1", exact: true }),
+    ).toHaveAttribute("src", source);
+  });
+
+  test("shows images and videos as gallery tiles in registry order and opens each in the viewer", async ({
+    page,
+  }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "omercnet/dracula")!;
+    const [firstImage, video] = plugin.media;
+    await page.goto(`/plugins/${plugin.id}`);
+    const tiles = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+    await expect(tiles).toHaveCount(3);
+    const layout = await tiles.evaluateAll(galleryTiles);
+    expect(layout.map((tile) => tile.href)).toEqual(plugin.media);
+    expect(new Set(layout.map((tile) => tile.size)).size).toBe(1);
+    const preview = tiles.nth(1).locator("video");
+    await expect(preview).toHaveAttribute("preload", "metadata");
+    await expect(preview).not.toHaveAttribute("controls");
+    await expect(preview).not.toHaveAttribute("autoplay");
+    expect(await preview.evaluate((element: HTMLVideoElement) => element.muted)).toBe(true);
+
+    const viewer = page.getByRole("dialog");
+    await tiles.nth(1).click();
+    const playing = viewer.getByLabel("Dracula video 2");
+    await expect(playing).toHaveAttribute("src", video);
+    await expect(playing).toHaveAttribute("controls", "");
+    await expect.poll(() => playing.evaluate(isPaused)).toBe(false);
+    // The fixture video is 320x240, so it has to scale up to fill the viewer.
+    await expect.poll(() => playing.evaluate(viewerFill)).toBeCloseTo(1, 2);
+    await page.keyboard.press("Escape");
+    await expect(viewer).toBeHidden();
+    await expect(page.locator("dialog video")).toHaveCount(0);
+
+    await tiles.first().click();
+    await expect(viewer.getByRole("img", { name: "Dracula screenshot 1" })).toHaveAttribute(
+      "src",
+      firstImage,
+    );
+    await viewer.getByRole("button", { name: "Close" }).click();
+    await expect(viewer).toBeHidden();
+    expect(page.context().pages()).toHaveLength(1);
+
+    const newTab = page.context().waitForEvent("page");
+    await tiles.first().click({ modifiers: ["ControlOrMeta"] });
+    await expect(await newTab).toHaveURL(firstImage);
+    await expect(viewer).toBeHidden();
+  });
+
+  test("peeks the next gallery tile at the strip's edge, and fills the row with two", async ({
+    page,
+  }) => {
+    // Wide screens show two tiles and part of the third; phones show one and part of the second.
+    for (const [width, expected] of [
+      [1280, [1, 1, "peeks"]],
+      [375, [1, "peeks", 0]],
+    ] as const) {
+      await page.setViewportSize({ width, height: 720 });
+      await page.goto("/plugins/omercnet/dracula");
+      const three = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+      const shares = await three.evaluateAll(visibleShares);
+      expect(shares.map((share) => (share > 0.1 && share < 0.5 ? "peeks" : share))).toEqual(
+        expected,
+      );
+    }
+
+    await page.setViewportSize({ width: 1280, height: 720 });
+    await page.goto("/plugins/gpambrozio/herald");
+    const two = page.getByRole("link", { name: /^Herald screenshot \d$/ });
+    expect(await two.evaluateAll(visibleShares)).toEqual([1, 1]);
+  });
+
+  test("steps through the viewer with arrow keys and buttons, wrapping at the ends", async ({
+    page,
+  }) => {
+    await page.goto("/plugins/omercnet/dracula");
+    const tiles = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+    const viewer = page.getByRole("dialog");
+    const shows = (name: string) =>
+      expect(
+        viewer.getByRole("img", { name, exact: true }).or(viewer.getByLabel(name, { exact: true })),
+      ).toBeVisible();
+
+    await tiles.nth(1).click();
+    await expect.poll(() => viewer.getByLabel("Dracula video 2").evaluate(isPaused)).toBe(false);
+    await page.keyboard.press("ArrowRight");
+    await shows("Dracula screenshot 3");
+    await expect(page.locator("dialog video")).toHaveCount(0);
+    await page.keyboard.press("ArrowRight");
+    await shows("Dracula screenshot 1");
+    await viewer.getByRole("img").click();
+    await page.keyboard.press("ArrowLeft");
+    await shows("Dracula screenshot 3");
+
+    await viewer.getByRole("button", { name: "Previous" }).click();
+    await shows("Dracula video 2");
+    await viewer.getByRole("button", { name: "Next" }).click();
+    await shows("Dracula screenshot 3");
+    await viewer.getByRole("button", { name: "Next" }).click();
+    await shows("Dracula screenshot 1");
+    await page.keyboard.press("Escape");
+    await expect(viewer).toBeHidden();
+  });
+
+  test("keeps a video that fails to load visible in the viewer", async ({ page }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "gpambrozio/launchd-jobs")!;
+    await page.route(plugin.media[0], (route) => route.abort());
+    await page.goto(`/plugins/${plugin.id}`);
+    await page.getByRole("link", { name: "launchd Jobs video 1" }).click();
+    const video = page.getByRole("dialog").getByLabel("launchd Jobs video 1");
+    await expect(video).toBeVisible();
+    await expect(video).toHaveCSS("opacity", "1");
+    await expect(page.getByRole("button", { name: "Next" })).toHaveCount(0);
+  });
+
+  test("shows the plugin tile on cards when its media has no image", async ({ page }) => {
+    await page.goto("/plugins/all");
+    const card = page.getByRole("main").getByRole("link", { name: /launchd Jobs/ });
+    // The only image is the author's avatar.
+    await expect(card.locator("img, video")).toHaveCount(1);
+    await expect(card.locator('img[src^="https://github.com/gpambrozio.png"]')).toHaveCount(1);
+    await card.click();
+    await expect(
+      page.getByRole("link", { name: "launchd Jobs video 1" }).locator("video"),
+    ).toHaveAttribute(
+      "src",
+      registry.plugins.find((entry) => entry.id === "gpambrozio/launchd-jobs")!.media[0],
+    );
+  });
+
+  test("features listed plugins above What's new in the registry's order", async ({ page }) => {
+    await openPlugins(page);
+    await expect(page.getByRole("heading", { level: 2 }).first()).toHaveText("Featured");
+    const featured = page.getByRole("region", { name: "Featured" });
+    await expect(featured).toContainText("A selection of hand picked plugins");
+    await expect(pluginCards(page, "Featured")).toHaveText([/Dracula/, /Herald/, /launchd Jobs/]);
+  });
+
+  test("lists the nine categories in order with counts, and the newest plugins first", async ({
+    page,
+  }) => {
+    await openPlugins(page);
+    const categories = page.getByRole("region", { name: "Categories" });
+    await expect(categories.getByRole("link")).toHaveText(
+      CATEGORIES.map((category) => new RegExp(`^${category.label}\\s*\\d+$`)),
+    );
+    await expect(categories.getByRole("link", { name: /Extras/ })).toContainText("0");
+    await expect(pluginCards(page, "What’s new")).toHaveText([
+      /Base2Tone/,
+      /Sayr/,
+      /PromptKit/,
+      /Defer/,
+    ]);
+  });
+
+  test("lists only plugins updated since they were listed under Recently updated", async ({
+    page,
+  }) => {
+    await openPlugins(page);
+    await expect(pluginCards(page, "Recently updated")).toHaveText([/Defer/, /OMP/]);
+    await page
+      .getByRole("region", { name: "Recently updated" })
+      .getByRole("link", { name: "See all" })
+      .click();
+    await expect(page).toHaveURL(/\/plugins\/all\?sort=updated$/);
+  });
+});
+
+function galleryTiles(links: Element[]) {
+  return links.map((link) => ({
+    href: link.getAttribute("href"),
+    size: `${link.clientWidth}x${link.clientHeight}`,
+  }));
+}
+
+/** How much of each tile's width the gallery strip shows, rounded to hundredths. */
+function visibleShares(links: Element[]) {
+  const strip = links[0].parentElement!.getBoundingClientRect();
+  return links.map((link) => {
+    const tile = link.getBoundingClientRect();
+    const shown = Math.min(tile.right, strip.right) - Math.max(tile.left, strip.left);
+    return Math.round((Math.max(shown, 0) / tile.width) * 100) / 100;
+  });
+}
+
+/** The share of the viewer's room the media fills along its limiting axis; 1 fills it. */
+function viewerFill(media: HTMLElement) {
+  const box = media.getBoundingClientRect();
+  return Math.max(box.width / (window.innerWidth * 0.9), box.height / (window.innerHeight * 0.85));
+}
+
+function isPaused(video: HTMLVideoElement) {
+  return video.paused;
+}
+
+async function expectThumbnailCard(card: Locator, source: string, id: string) {
+  // Card screenshots are decorative and hidden from the accessibility tree.
+  const image = card.locator("img").first();
+  const path = (width: number) =>
+    `/plugins/thumb/${width}/${encodeURIComponent(source)}?plugin=${encodeURIComponent(id)}`;
+  await expect(image).toHaveAttribute("src", path(592));
+  await expect(image).toHaveAttribute("srcset", `${path(592)} 1x, ${path(1184)} 2x`);
+  await expect(image).toHaveAttribute("loading", "lazy");
+  await expect(image).toHaveAttribute("decoding", "async");
+  await image.scrollIntoViewIfNeeded();
+  await expect
+    .poll(
+      () =>
+        image.evaluate((element: HTMLImageElement) => element.complete && element.naturalWidth > 0),
+      { timeout: 15_000 },
+    )
+    .toBe(true);
+  const box = await image.evaluate((element) => {
+    const rect = element.parentElement!.getBoundingClientRect();
+    return { width: rect.width, height: rect.height };
+  });
+  expect(box.width).toBeGreaterThan(0);
+  expect(box.width / box.height).toBeCloseTo(1.6, 2);
+}
+
+test("keeps author content inert through SSR and hydration", async ({
+  page,
+  request,
+}, testInfo) => {
+  await verifyPluginOverviewResponse(request);
+  await openUntrustedPlugin(page);
+  await expectPluginOverviewSafe(page);
+  await page.reload();
+  await expectPluginOverviewSafe(page);
+  await testInfo.attach("plugin-overview", {
+    body: await page.screenshot(),
+    contentType: "image/png",
+  });
+});
+
+async function verifyPluginOverviewResponse(request: import("playwright/test").APIRequestContext) {
+  const response = await request.get("/plugins/security/overview");
+  expect(response.status()).toBe(200);
+  const html = await response.text();
+  expect(html).not.toContain("<script>globalThis.__overviewExecuted=1</script>");
+  expect(html).toContain("\\x3C/script>");
+}
+
+async function openUntrustedPlugin(page: Page) {
+  await page.goto("/plugins/security/overview");
+  await expect(page.getByRole("heading", { name: "Overview security", exact: true })).toBeVisible();
+}
+
+async function expectPluginOverviewSafe(page: Page) {
+  expect(
+    await page.evaluate(() => (globalThis as { __overviewExecuted?: number }).__overviewExecuted),
+  ).toBeUndefined();
+  // Security assertions inspect every emitted attribute, including inaccessible injected elements.
+  const violations = await page.locator(".docs-prose").evaluate((root) => {
+    const bad: string[] = [];
+    for (const element of root.querySelectorAll("*")) {
+      if (
+        ["SCRIPT", "IFRAME", "SVG", "FORM", "INPUT", "META", "BASE", "STYLE"].includes(
+          element.tagName,
+        )
+      )
+        bad.push(element.tagName);
+      for (const attr of element.attributes) {
+        if (/^on|^style$|^srcdoc$/i.test(attr.name)) bad.push(attr.name);
+        if (["href", "src"].includes(attr.name) && !attr.value.startsWith("https://"))
+          bad.push(attr.value);
+      }
+      if (
+        element.tagName === "A" &&
+        (element.getAttribute("rel") !== "noopener noreferrer nofollow" ||
+          element.getAttribute("target") !== "_blank")
+      )
+        bad.push("unsafe anchor");
+    }
+    return bad;
+  });
+  expect(violations).toEqual([]);
+  await expect(page.getByRole("link", { name: "Source", exact: true })).toHaveCount(0);
+  await expect(page.getByRole("link", { name: "Report a bug" })).toHaveCount(0);
+  await expect(page.getByRole("img", { name: /screenshot/ })).toHaveCount(0);
+  await expect(page.getByRole("heading", { level: 1 })).toHaveText(securityPlugin.name);
+  await expect(
+    page.getByRole("link", { name: securityPlugin.author.name, exact: true }),
+  ).toHaveAttribute("href", "/plugins/security");
+  await expect(page.locator('meta[name="description"]')).toHaveAttribute(
+    "content",
+    securityPlugin.description,
+  );
+}
diff --git a/packages/website/e2e/registry-server.mjs b/packages/website/e2e/registry-server.mjs
new file mode 100644
index 0000000000..228f3dd859
--- /dev/null
+++ b/packages/website/e2e/registry-server.mjs
@@ -0,0 +1,25 @@
+import { createServer } from "node:http";
+import registry from "./registry.fixture.json" with { type: "json" };
+
+import securityPlugin from "./overview.fixture.json" with { type: "json" };
+
+import overviewCorpus from "../../protocol/tests/fixtures/plugin-overview.json" with { type: "json" };
+securityPlugin.readme +=
+  "\n\n" +
+  overviewCorpus
+    .map(({ markdown }) => markdown + "\n\n```html\n" + markdown + "\n```")
+    .join("\n\n");
+
+// Serve the published registry contract so SSR and browser navigation use the same data.
+createServer((request, response) => {
+  response.setHeader("Content-Type", "application/json");
+  if (request.url === "/index.json") {
+    response.end(JSON.stringify(registry));
+    return;
+  }
+  const plugin = [securityPlugin, ...registry.plugins].find(
+    (entry) => request.url === `/plugins/${entry.id}.json`,
+  );
+  response.statusCode = plugin ? 200 : 404;
+  response.end(JSON.stringify(plugin ?? { error: "Plugin not found" }));
+}).listen(8188, "127.0.0.1");
diff --git a/packages/website/e2e/registry.fixture.json b/packages/website/e2e/registry.fixture.json
new file mode 100644
index 0000000000..4ad4eabf1b
--- /dev/null
+++ b/packages/website/e2e/registry.fixture.json
@@ -0,0 +1,638 @@
+{
+  "schemaVersion": 1,
+  "registry": {
+    "name": "Paseo plugins",
+    "url": "https://plugins.paseo.sh"
+  },
+  "generatedAt": "2026-10-04T15:55:47.882Z",
+  "featured": [
+    "omercnet/dracula",
+    "gpambrozio/herald",
+    "acme/not-published",
+    "gpambrozio/launchd-jobs"
+  ],
+  "categories": [
+    {
+      "slug": "daemon-management",
+      "label": "Daemon management",
+      "description": "Manage hosts, daemon jobs, resources, approvals, and MCP servers."
+    },
+    {
+      "slug": "themes",
+      "label": "Themes",
+      "description": "Change the app color scheme."
+    },
+    {
+      "slug": "providers",
+      "label": "Providers",
+      "description": "Connect coding agents, ACP servers, and model routers, with account and quota fallback."
+    },
+    {
+      "slug": "orchestration",
+      "label": "Orchestration",
+      "description": "Coordinate agents, delegate work, and send messages across hosts."
+    },
+    {
+      "slug": "git",
+      "label": "Git",
+      "description": "Work with branches, worktrees, pull requests, stacks, diffs, and reviews."
+    },
+    {
+      "slug": "workspaces",
+      "label": "Workspaces",
+      "description": "Add workspace panels and tabs for boards, browsers, documents, and terminals."
+    },
+    {
+      "slug": "sidebar",
+      "label": "Sidebar",
+      "description": "Add sidebar items and panels for usage, notifications, pricing, and links."
+    },
+    {
+      "slug": "extras",
+      "label": "Extras",
+      "description": "Add presence, pets, puzzles, wellbeing reminders, and demos."
+    },
+    {
+      "slug": "utils",
+      "label": "Utils",
+      "description": "Extend the composer and timeline with commands, prompts, skills, and small helpers."
+    }
+  ],
+  "plugins": [
+    {
+      "id": "alhassanaraouf/base2tone",
+      "name": "Base2Tone",
+      "description": "Base2Tone theme for Paseo, ported from the Obsidian theme deathau/Base2Tone-For-Obsidian.md.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@alhassanaraouf/paseo-base2tone-theme",
+        "version": "0.1.2",
+        "resolved": "https://registry.npmjs.org/@alhassanaraouf/paseo-base2tone-theme/-/paseo-base2tone-theme-0.1.2.tgz",
+        "integrity": "sha512-baP+qh3MlPgwACvt72XjrULjbDHARofzHfxyGGVVl22iw6qVnMzyfBJXi4exgtplvD/yPqf/XlsqD8wTqHB+lg=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/alhassanaraouf/paseo-themes/tree/HEAD/packages/paseo-base2tone-theme"
+      },
+      "categories": ["themes"],
+      "author": {
+        "npm": "alhassanaraouf",
+        "name": "alhassanaraouf",
+        "github": "alhassanaraouf"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/alhassanaraouf/paseo-themes/main/packages/paseo-base2tone-theme/preview.png"
+      ],
+      "submittedAt": "2026-09-24T00:00:00.000Z",
+      "reviewedAt": "2026-09-24T00:00:00.000Z",
+      "publishedAt": "2026-09-24T00:00:00.000Z",
+      "updatedAt": "2026-09-24T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Base2Tone\n\n## Behavior\n\nBase2Tone theme for Paseo, ported from the Obsidian theme deathau/Base2Tone-For-Obsidian.md."
+    },
+    {
+      "id": "dorasto/sayr",
+      "name": "Sayr",
+      "description": "A paseo plugin for viewing and managing your Sayr tasks",
+      "artifact": {
+        "kind": "npm",
+        "package": "@sayrio/paseo-plugin",
+        "version": "0.2.0",
+        "resolved": "https://registry.npmjs.org/@sayrio/paseo-plugin/-/paseo-plugin-0.2.0.tgz",
+        "integrity": "sha512-LPmVkEPWl8Km6US4zQAzhqSbGm7lBDwCjgNoysOhCsDiRy0jbtDKYRg1XVgwwUkoEwhF1EdZHCPwIuT8IizyWQ=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/dorasto/sayr/tree/HEAD/packages/paseo-plugin",
+        "commit": "e70919b89df3cf9e95c18242939193a79c7593b1"
+      },
+      "categories": ["workspaces"],
+      "author": {
+        "npm": "trent-001",
+        "name": "Tom Lundy",
+        "github": "dorasto"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/dorasto/sayr/main/packages/paseo-plugin/assets/sayr-plguin-1.png",
+        "https://raw.githubusercontent.com/dorasto/sayr/main/packages/paseo-plugin/assets/paseo-plugin-2.png"
+      ],
+      "submittedAt": "2026-09-22T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Sayr\n\n## Behavior\n\nA paseo plugin for viewing and managing your Sayr tasks"
+    },
+    {
+      "id": "gpambrozio/github-board",
+      "name": "GitHub Board",
+      "description": "Paseo plugin: a GitHub sidebar board of your issues, draft and open pull requests, and discussions",
+      "artifact": {
+        "kind": "npm",
+        "package": "@gpambrozio/paseo-github-board",
+        "version": "0.10.0",
+        "resolved": "https://registry.npmjs.org/@gpambrozio/paseo-github-board/-/paseo-github-board-0.10.0.tgz",
+        "integrity": "sha512-G6LxSsbt4Kt36yWEB2rXUxOwNLFsA4DbF20ViroVqaicMPjaw5H4JUWXjzEZAxWJT+0DlH12/TtqN4I0sNoQtg=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/gpambrozio/paseo-plugins/tree/HEAD/github-board",
+        "commit": "530a66c592e20915169b5e67a35de8793f71ec60"
+      },
+      "categories": ["git"],
+      "author": {
+        "npm": "gpambrozio",
+        "name": "gpambrozio",
+        "github": "gpambrozio"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/github-board/docs/screenshot.png",
+        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/github-board/docs/detail-panel.png"
+      ],
+      "submittedAt": "2026-09-19T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# GitHub Board\n\n## Behavior\n\nPaseo plugin: a GitHub sidebar board of your issues, draft and open pull requests, and discussions"
+    },
+    {
+      "id": "gpambrozio/herald",
+      "name": "Herald",
+      "description": "Paseo plugin: speaks one sentence when an agent needs you, and lists everything waiting in a sidebar panel",
+      "artifact": {
+        "kind": "npm",
+        "package": "@gpambrozio/paseo-herald",
+        "version": "0.5.1",
+        "resolved": "https://registry.npmjs.org/@gpambrozio/paseo-herald/-/paseo-herald-0.5.1.tgz",
+        "integrity": "sha512-rXdlaxgRlYP3nmZrvbG29sQeluz5JC7TPuJDgKzyh9itDH1AvZYGjLgGp9XZGKxdBBhaGxgGAFhDh+VTL8h9dw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/gpambrozio/paseo-plugins/tree/HEAD/herald",
+        "commit": "b658d0ab58735959e46d12660ae179c002cdadda"
+      },
+      "categories": ["sidebar"],
+      "author": {
+        "npm": "gpambrozio",
+        "name": "gpambrozio",
+        "github": "gpambrozio"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/herald/docs/panel.png",
+        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/herald/docs/timeline-card.png"
+      ],
+      "submittedAt": "2026-09-19T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Herald\n\n## Behavior\n\nPaseo plugin: speaks one sentence when an agent needs you, and lists everything waiting in a sidebar panel"
+    },
+    {
+      "id": "gpambrozio/launchd-jobs",
+      "name": "launchd Jobs",
+      "description": "Paseo plugin: schedule shell commands on your Mac through launchd, from a sidebar panel",
+      "artifact": {
+        "kind": "npm",
+        "package": "@gpambrozio/paseo-launchd-jobs",
+        "version": "0.5.0",
+        "resolved": "https://registry.npmjs.org/@gpambrozio/paseo-launchd-jobs/-/paseo-launchd-jobs-0.5.0.tgz",
+        "integrity": "sha512-H6CQnalMdyQjW9ta9ZT40qEPJsREgNFSEAH8EC4sJXdz2Hz9tIsInSUmm2bDcgfY3D3HFffUrwf1mmeevi/wUA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/gpambrozio/paseo-plugins/tree/HEAD/launchd-jobs",
+        "commit": "08e75003b287208ef804f3d31b2fda2597f69dce"
+      },
+      "categories": ["daemon-management"],
+      "author": {
+        "npm": "gpambrozio",
+        "name": "gpambrozio",
+        "github": "gpambrozio"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/web-platform-tests/wpt/master/media/movie_5.mp4"
+      ],
+      "submittedAt": "2026-09-19T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# launchd Jobs\n\n## Behavior\n\nPaseo plugin: schedule shell commands on your Mac through launchd, from a sidebar panel"
+    },
+    {
+      "id": "gpambrozio/model-pricing",
+      "name": "Model Pricing",
+      "description": "Paseo plugin: a sidebar table of what every model costs, across Anthropic, OpenAI, Fireworks AI, Ollama Cloud and OpenRouter",
+      "artifact": {
+        "kind": "npm",
+        "package": "@gpambrozio/paseo-model-pricing",
+        "version": "0.3.0",
+        "resolved": "https://registry.npmjs.org/@gpambrozio/paseo-model-pricing/-/paseo-model-pricing-0.3.0.tgz",
+        "integrity": "sha512-jLfC6iCLOwNACiili8nw3/qmBymoj6YHitMeGCa2RggiMdUhT6n+INRsSjoTs2kNzeYMftMfQ3MZJXeLLF1opA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/gpambrozio/paseo-plugins/tree/HEAD/model-pricing",
+        "commit": "08e75003b287208ef804f3d31b2fda2597f69dce"
+      },
+      "categories": ["sidebar"],
+      "author": {
+        "npm": "gpambrozio",
+        "name": "gpambrozio",
+        "github": "gpambrozio"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/model-pricing/docs/screenshot.png"
+      ],
+      "submittedAt": "2026-09-19T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Model Pricing\n\n## Behavior\n\nPaseo plugin: a sidebar table of what every model costs, across Anthropic, OpenAI, Fireworks AI, Ollama Cloud and OpenRouter"
+    },
+    {
+      "id": "gpambrozio/skills",
+      "name": "Skills",
+      "description": "Paseo plugin: lists the skills an agent can use, shows where each comes from, renders its SKILL.md, and invokes it",
+      "artifact": {
+        "kind": "npm",
+        "package": "@gpambrozio/paseo-skills",
+        "version": "0.4.0",
+        "resolved": "https://registry.npmjs.org/@gpambrozio/paseo-skills/-/paseo-skills-0.4.0.tgz",
+        "integrity": "sha512-zMgP2U/vrRsLkKhoQICkN52+YoDy2WkkYymEDmruduKxf4Dq99Ct8Pk3xqJyAzijq2oprMFYLbj/wT6XepBLeA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/gpambrozio/paseo-plugins/tree/HEAD/skills",
+        "commit": "d04187ee60ca3702ca5843803567600427102d99"
+      },
+      "categories": ["utils"],
+      "author": {
+        "npm": "gpambrozio",
+        "name": "gpambrozio",
+        "github": "gpambrozio"
+      },
+      "media": [],
+      "submittedAt": "2026-09-19T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Skills\n\n## Behavior\n\nPaseo plugin: lists the skills an agent can use, shows where each comes from, renders its SKILL.md, and invokes it"
+    },
+    {
+      "id": "hungcuong9125/prompt-kit",
+      "name": "PromptKit",
+      "description": "PromptKit - rewrite and transform prompts directly from the Paseo composer.",
+      "artifact": {
+        "kind": "npm",
+        "package": "paseo-prompt-kit",
+        "version": "0.6.0",
+        "resolved": "https://registry.npmjs.org/paseo-prompt-kit/-/paseo-prompt-kit-0.6.0.tgz",
+        "integrity": "sha512-eiagOY1OokDx2iihfe3Vjh2dgKKP6IsBKbJYbfhM+TXw3aU7duV/rs/TUnBSeeWAk0cEsVg2Jd+EkeaPM8IJdA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/hungcuong9125/paseo-prompt-kit"
+      },
+      "categories": ["utils"],
+      "author": {
+        "npm": "hungcuong9125",
+        "name": "hungcuong9125",
+        "github": "hungcuong9125"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/hungcuong9125/paseo-prompt-kit/main/docs/images/settings-provider-cli.png",
+        "https://raw.githubusercontent.com/hungcuong9125/paseo-prompt-kit/main/docs/images/settings-direct-api.png"
+      ],
+      "submittedAt": "2026-09-22T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# PromptKit\n\n## Behavior\n\nPromptKit - rewrite and transform prompts directly from the Paseo composer."
+    },
+    {
+      "id": "omercnet/agent-monitor",
+      "name": "Agent Monitor",
+      "description": "A Paseo plugin that provides a host-wide agent triage roster.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-agent-monitor",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-agent-monitor/-/paseo-agent-monitor-1.2.0.tgz",
+        "integrity": "sha512-dY7/3f49sPMVwb+Wr7iUsw4jCoQWRX2UF9Li+uU8yJdN0cj4BvTsz4GDiR3OsKk8zJ1/o01DSRi1e4uDRS3TmA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/agent-monitor",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["orchestration"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/agent-monitor/docs/images/agent-monitor-roster.png",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/agent-monitor/docs/images/agent-monitor-settings.png"
+      ],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Agent Monitor\n\n## Behavior\n\nA Paseo plugin that provides a host-wide agent triage roster."
+    },
+    {
+      "id": "omercnet/beads",
+      "name": "Beads",
+      "description": "A dependency-aware Beads work queue for each Paseo workspace.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-beads",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-beads/-/paseo-beads-1.2.0.tgz",
+        "integrity": "sha512-UkI1SNP73RUrW0ap4qOx2Jv1GCxkrw4HIMrWOFCS3FDoPg2jw06DqHC8Jf34psaFglxXKWLAOkfL2wEZJhlUFw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/paseo-beads",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["workspaces"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-beads/docs/images/paseo-beads-wide.png",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-beads/docs/images/paseo-beads-compact.png"
+      ],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Beads\n\n## Behavior\n\nA dependency-aware Beads work queue for each Paseo workspace."
+    },
+    {
+      "id": "omercnet/dracula",
+      "name": "Dracula",
+      "description": "Dracula Classic and Alucard Classic themes for Paseo.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-dracula",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-dracula/-/paseo-dracula-1.2.0.tgz",
+        "integrity": "sha512-I3yUiFIvaIe3jdvuQ1tZyngsfgukaUJwEQza2XYkEaB8yIA0pplZehqJLvqqmA403cjNXdVtsdW7umPtmnycqw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/paseo-dracula",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["themes"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-dracula/screenshot.png",
+        "https://raw.githubusercontent.com/web-platform-tests/wpt/master/media/movie_5.webm",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-dracula/screenshot-alucard.png"
+      ],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Dracula\n\n## Behavior\n\nDracula Classic and Alucard Classic themes for Paseo."
+    },
+    {
+      "id": "omercnet/fresh-worktrees",
+      "name": "Fresh Worktrees",
+      "description": "Fast-forwards clean local base branches before Paseo creates branch-off worktrees",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-fresh-worktrees",
+        "version": "2.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-fresh-worktrees/-/paseo-fresh-worktrees-2.2.0.tgz",
+        "integrity": "sha512-WRarzdfTbrZ36JfzmvX9HfnIYh6Pp+GV9TkoeVwM7I6f1MAEZ4gzPEmT51lWuUyMGvwTs2HFB7LthCa+VYs7IA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/fresh-worktrees",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["git"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-behind.png",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-settings.png"
+      ],
+      "submittedAt": "2026-09-18T00:00:00.000Z",
+      "reviewedAt": "2026-09-18T00:00:00.000Z",
+      "publishedAt": "2026-09-18T00:00:00.000Z",
+      "updatedAt": "2026-09-18T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Fresh Worktrees\n\n## Behavior\n\nFast-forwards clean local base branches before Paseo creates branch-off worktrees"
+    },
+    {
+      "id": "omercnet/omp",
+      "name": "OMP",
+      "description": "Paseo integration for OMP, including its direct provider and workspace tooling.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-omp",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-omp/-/paseo-omp-1.2.0.tgz",
+        "integrity": "sha512-ueZede5D34hoNrdF4y6DBaomErA+hHcv+bcz0Sd6eArQKqF8L6ecKXdBe2tEZd3Ev8uQwxMHuiDQhMBx3q6gOw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/paseo-omp",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["providers"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/plugin-manager.png",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/workspace-settings.png"
+      ],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-10-03T09:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-10-03T09:00:00.000Z",
+      "installs": 0,
+      "readme": "# OMP\n\n## Behavior\n\nPaseo integration for OMP, including its direct provider and workspace tooling."
+    },
+    {
+      "id": "omercnet/pr-radar",
+      "name": "PR Radar",
+      "description": "A viewer-aware delivery queue for pull requests linked to Paseo workspaces.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-pr-radar",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-pr-radar/-/paseo-pr-radar-1.2.0.tgz",
+        "integrity": "sha512-sk+zuzTGZ5Vmri2toic3z3uChm4d6kEShSr/UjkqfOTeILrsZVDHUc+XKX/CtZIQazT/vWvbgZ115+KUiAonCw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/pr-radar",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["git"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# PR Radar\n\n## Behavior\n\nA viewer-aware delivery queue for pull requests linked to Paseo workspaces."
+    },
+    {
+      "id": "omercnet/shared-browser",
+      "name": "Shared Browser",
+      "description": "One real Chromium session per Paseo workspace, shared live across every connected client.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-shared-browser",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-shared-browser/-/paseo-shared-browser-1.2.0.tgz",
+        "integrity": "sha512-ddvtkBSzHLFzyTRZFixO1y+QXOKW0of8Uo3PSkETRhW5xhd9ep0jqsJJF9JSfWLt1ouvVa5K8zFXic/EBzQ8lw=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/paseo-shared-browser",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["workspaces"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-shared-browser/docs/images/shared-browser-wide.png",
+        "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-shared-browser/docs/images/shared-browser-compact.png"
+      ],
+      "submittedAt": "2026-09-18T00:00:00.000Z",
+      "reviewedAt": "2026-09-18T00:00:00.000Z",
+      "publishedAt": "2026-09-18T00:00:00.000Z",
+      "updatedAt": "2026-09-18T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Shared Browser\n\n## Behavior\n\nOne real Chromium session per Paseo workspace, shared live across every connected client."
+    },
+    {
+      "id": "omercnet/tell-agent",
+      "name": "Tell Agent",
+      "description": "Send messages to agents in other workspaces on the same Paseo host.",
+      "artifact": {
+        "kind": "npm",
+        "package": "@omercnet/paseo-tell-agent",
+        "version": "1.2.0",
+        "resolved": "https://registry.npmjs.org/@omercnet/paseo-tell-agent/-/paseo-tell-agent-1.2.0.tgz",
+        "integrity": "sha512-4XqL1RK1x3TQLoRRKTkZfDxytJbUCEnu2em5pbPDpsGQ5Gv6VN1h07mBci9iW8s2FbNINohNcIBdUaAMTXdOHA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/omercnet/paseo-plugins/tree/HEAD/tell-agent",
+        "commit": "d7b3e654f364b5be72edf6fd1d914a3750b53082"
+      },
+      "categories": ["orchestration"],
+      "author": {
+        "npm": "omercnet",
+        "name": "Omer Cohen",
+        "github": "omercnet"
+      },
+      "media": [],
+      "submittedAt": "2026-09-17T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Tell Agent\n\n## Behavior\n\nSend messages to agents in other workspaces on the same Paseo host."
+    },
+    {
+      "id": "tomgrin10/defer",
+      "name": "Defer",
+      "description": "Defer messages to Paseo coding agents until a chosen time or usage-window reset.",
+      "artifact": {
+        "kind": "npm",
+        "package": "paseo-defer",
+        "version": "2.1.9",
+        "resolved": "https://registry.npmjs.org/paseo-defer/-/paseo-defer-2.1.9.tgz",
+        "integrity": "sha512-xBBf4TUC8zkTh9WMzQRRDt0alRAYPRCmUdBnBI1ZEkatUFC4i9MxFHgaTY939xij99dASM/261IWqctcKsQppQ=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/tomgrin10/paseo-defer"
+      },
+      "categories": ["utils"],
+      "author": {
+        "npm": "tomgrin10",
+        "name": "Tom Gringauz",
+        "github": "tomgrin10"
+      },
+      "media": [
+        "https://raw.githubusercontent.com/tomgrin10/paseo-defer/main/docs/defer-popover.png"
+      ],
+      "submittedAt": "2026-09-22T00:00:00.000Z",
+      "reviewedAt": "2026-10-03T15:00:00.000Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
+      "updatedAt": "2026-10-03T15:00:00.000Z",
+      "installs": 0,
+      "readme": "# Defer\n\n## Behavior\n\nDefer messages to Paseo coding agents until a chosen time or usage-window reset."
+    },
+    {
+      "id": "tomgrin10/graphite",
+      "name": "Graphite",
+      "description": "Workspace-native Graphite stack status and PR action radar for Paseo. <p align=\"center\">   <picture>     <source media=\"(prefers-color-scheme: dark)\" srcset=\"https://raw.githubusercontent.com/xpufx/paseo/main/plugins/slash/docs/screenshots/slash-logo-for-dark-bg.png\">     <source media=\"(prefers-color-scheme: light)\" srcset",
+      "artifact": {
+        "kind": "npm",
+        "package": "paseo-graphite",
+        "version": "0.2.4",
+        "resolved": "https://registry.npmjs.org/paseo-graphite/-/paseo-graphite-0.2.4.tgz",
+        "integrity": "sha512-aAFvh+118c5mmSQ3sTsDKO8Is7g1ZU8m2+0fisr8nFrgPMu0m2mokPJnM/LaIqQc3Zaaak1chB6M6k0dWOPeIA=="
+      },
+      "license": "MIT",
+      "repository": {
+        "url": "https://github.com/tomgrin10/paseo-graphite"
+      },
+      "categories": ["git"],
+      "author": {
+        "npm": "tomgrin10",
+        "name": "Tom Gringauz",
+        "github": "tomgrin10"
+      },
+      "media": [],
+      "submittedAt": "2026-09-22T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
+      "installs": 0,
+      "readme": "# Graphite\n\n## Behavior\n\nWorkspace-native Graphite stack status and PR action radar for Paseo."
+    }
+  ]
+}
diff --git a/packages/website/package.json b/packages/website/package.json
index 18a246dbc0..1677b3c0fc 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.7.2",
+  "version": "0.11.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,11 +8,14 @@
     "build": "vite build",
     "preview": "vite preview",
     "typecheck": "tsgo --noEmit",
-    "deploy": "npm run build && wrangler deploy"
+    "deploy": "npm run build && wrangler deploy",
+    "test:e2e": "playwright test"
   },
   "dependencies": {
     "@cloudflare/vite-plugin": "^1.29.1",
     "@cloudflare/workers-types": "^4.20260317.1",
+    "@fontsource-variable/geist": "^5.3.0",
+    "@getpaseo/protocol": "*",
     "@tanstack/react-router": "^1.170.16",
     "@tanstack/react-start": "^1.168.26",
     "framer-motion": "^12.35.2",
@@ -35,6 +38,7 @@
     "@types/react": "^19.1.6",
     "@types/react-dom": "^19.1.5",
     "@vitejs/plugin-react": "^4.5.1",
+    "parse5": "^7.3.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.3",
     "vite-tsconfig-paths": "^5.1.4",
diff --git a/packages/website/playwright.config.ts b/packages/website/playwright.config.ts
new file mode 100644
index 0000000000..a80b84abd8
--- /dev/null
+++ b/packages/website/playwright.config.ts
@@ -0,0 +1,29 @@
+import { defineConfig, devices } from "playwright/test";
+
+const baseURL = process.env.WEBSITE_TEST_URL ?? "http://127.0.0.1:8187";
+
+export default defineConfig({
+  testDir: "./e2e",
+  workers: 1,
+  use: { baseURL, screenshot: "only-on-failure", trace: "retain-on-failure" },
+  projects: [
+    { name: "chromium", use: { ...devices["Desktop Chrome"] } },
+    { name: "webkit", use: { ...devices["Desktop Safari"] } },
+  ],
+  webServer: process.env.WEBSITE_TEST_URL
+    ? undefined
+    : [
+        {
+          command: "node e2e/registry-server.mjs",
+          url: "http://127.0.0.1:8188/index.json",
+        },
+        {
+          command: "npm run build && npm run preview -- --host 127.0.0.1 --port 8187 --strictPort",
+          url: baseURL,
+          env: {
+            CLOUDFLARE_INCLUDE_PROCESS_ENV: "true",
+            PLUGINS_REGISTRY_URL: "http://127.0.0.1:8188",
+          },
+        },
+      ],
+});
diff --git a/packages/website/public/robots.txt b/packages/website/public/robots.txt
new file mode 100644
index 0000000000..75001ce745
--- /dev/null
+++ b/packages/website/public/robots.txt
@@ -0,0 +1,4 @@
+User-agent: *
+Allow: /
+
+Sitemap: https://paseo.sh/sitemap-index.xml
diff --git a/packages/website/public/schemas/paseo.config.v1.json b/packages/website/public/schemas/paseo.config.v1.json
index c8dc40a75c..415d307ca0 100644
--- a/packages/website/public/schemas/paseo.config.v1.json
+++ b/packages/website/public/schemas/paseo.config.v1.json
@@ -1,188 +1,270 @@
 {
-  "$ref": "#/definitions/PaseoConfigV1",
-  "definitions": {
-    "PaseoConfigV1": {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string"
+    },
+    "version": {
+      "type": "number",
+      "const": 1
+    },
+    "daemon": {
       "type": "object",
       "properties": {
-        "$schema": {
+        "listen": {
           "type": "string"
         },
-        "version": {
-          "type": "number",
-          "const": 1
+        "hostnames": {
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
-        "daemon": {
+        "allowedHosts": {
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
+        },
+        "trustedProxies": {
+          "description": "Express trusted proxy setting for X-Forwarded-* headers. Defaults to [\"loopback\"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.",
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
+        },
+        "mcp": {
           "type": "object",
           "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "injectIntoAgents": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": {}
+        },
+        "browserTools": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": {}
+        },
+        "git": {
+          "type": "object",
+          "properties": {
+            "maxProcessesPerSecond": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            },
+            "maxProcessConcurrency": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            }
+          },
+          "additionalProperties": false
+        },
+        "autoArchiveAfterMerge": {
+          "type": "boolean"
+        },
+        "enableTerminalAgentHooks": {
+          "type": "boolean"
+        },
+        "appendSystemPrompt": {
+          "type": "string"
+        },
+        "terminalProfiles": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              },
+              "command": {
+                "type": "string"
+              },
+              "args": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "icon": {
+                "type": "string"
+              }
+            },
+            "required": ["id", "name", "command"],
+            "additionalProperties": {}
+          }
+        },
+        "agentProfiles": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              },
+              "icon": {
+                "type": "string"
+              },
+              "color": {
+                "type": "string"
+              },
+              "provider": {
+                "type": "string"
+              },
+              "model": {
+                "type": "string"
+              },
+              "modeId": {
+                "type": "string"
+              },
+              "thinkingOptionId": {
+                "type": "string"
+              },
+              "featureValues": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "notes": {
+                "type": "string"
+              }
+            },
+            "required": ["id", "name", "provider"],
+            "additionalProperties": {}
+          }
+        },
+        "cors": {
+          "type": "object",
+          "properties": {
+            "allowedOrigins": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "relay": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "endpoint": {
+              "type": "string"
+            },
+            "publicEndpoint": {
+              "type": "string"
+            },
+            "useTls": {
+              "type": "boolean"
+            },
+            "publicUseTls": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "serviceProxy": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "description": "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+              "type": "boolean"
+            },
             "listen": {
+              "description": "Optional service-only listener address. Presence enables the standalone service proxy listener.",
               "type": "string"
             },
-            "hostnames": {
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "allowedHosts": {
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "trustedProxies": {
-              "description": "Express trusted proxy setting for X-Forwarded-* headers. Defaults to [\"loopback\"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.",
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "mcp": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "injectIntoAgents": {
-                  "type": "boolean"
-                }
-              },
-              "additionalProperties": true
-            },
-            "git": {
-              "type": "object",
-              "properties": {
-                "maxProcessesPerSecond": {
-                  "type": "integer",
-                  "exclusiveMinimum": 0
-                },
-                "maxProcessConcurrency": {
-                  "type": "integer",
-                  "exclusiveMinimum": 0
-                }
-              },
-              "additionalProperties": false
-            },
-            "autoArchiveAfterMerge": {
-              "type": "boolean"
-            },
-            "enableTerminalAgentHooks": {
-              "type": "boolean"
-            },
-            "appendSystemPrompt": {
-              "type": "string"
-            },
-            "cors": {
-              "type": "object",
-              "properties": {
-                "allowedOrigins": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              },
-              "additionalProperties": false
-            },
-            "relay": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "endpoint": {
-                  "type": "string"
-                },
-                "publicEndpoint": {
-                  "type": "string"
-                },
-                "useTls": {
-                  "type": "boolean"
-                },
-                "publicUseTls": {
-                  "type": "boolean"
-                }
-              },
-              "additionalProperties": false
-            },
-            "serviceProxy": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "description": "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
-                  "type": "boolean"
-                },
-                "listen": {
-                  "description": "Optional service-only listener address. Presence enables the standalone service proxy listener.",
-                  "type": "string"
-                },
-                "publicBaseUrl": {
-                  "description": "Optional public base URL for service host aliases.",
-                  "type": "string",
-                  "format": "uri"
-                }
-              },
-              "additionalProperties": false
-            },
-            "auth": {
-              "type": "object",
-              "properties": {
-                "password": {
-                  "type": "string",
-                  "pattern": "^\\$2[aby]\\$\\d{2}\\$[./A-Za-z0-9]{53}$"
-                }
-              },
-              "additionalProperties": false
+            "publicBaseUrl": {
+              "description": "Optional public base URL for service host aliases.",
+              "type": "string",
+              "format": "uri"
             }
           },
           "additionalProperties": false
         },
-        "app": {
+        "auth": {
           "type": "object",
           "properties": {
-            "baseUrl": {
-              "type": "string"
+            "password": {
+              "type": "string",
+              "pattern": "^\\$2[aby]\\$\\d{2}\\$[./A-Za-z0-9]{53}$"
             }
           },
           "additionalProperties": false
-        },
-        "worktrees": {
+        }
+      },
+      "additionalProperties": false
+    },
+    "app": {
+      "type": "object",
+      "properties": {
+        "baseUrl": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "providers": {
+      "type": "object",
+      "properties": {
+        "openai": {
           "type": "object",
           "properties": {
-            "root": {
+            "apiKey": {
               "type": "string",
               "minLength": 1
-            }
-          },
-          "additionalProperties": false
-        },
-        "providers": {
-          "type": "object",
-          "properties": {
-            "openai": {
+            },
+            "baseUrl": {
+              "type": "string",
+              "minLength": 1
+            },
+            "stt": {
               "type": "object",
               "properties": {
                 "apiKey": {
@@ -192,42 +274,18 @@
                 "baseUrl": {
                   "type": "string",
                   "minLength": 1
-                },
-                "stt": {
-                  "type": "object",
-                  "properties": {
-                    "apiKey": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "baseUrl": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "tts": {
-                  "type": "object",
-                  "properties": {
-                    "apiKey": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "baseUrl": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
                 }
               },
               "additionalProperties": false
             },
-            "local": {
+            "tts": {
               "type": "object",
               "properties": {
-                "modelsDir": {
+                "apiKey": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "baseUrl": {
                   "type": "string",
                   "minLength": 1
                 }
@@ -237,241 +295,466 @@
           },
           "additionalProperties": false
         },
-        "agents": {
+        "local": {
           "type": "object",
           "properties": {
-            "providers": {
-              "type": "object",
-              "additionalProperties": {
+            "modelsDir": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "pluginRegistries": {
+      "type": "object",
+      "propertyNames": {
+        "type": "string"
+      },
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "authorization": {
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        "required": ["authorization"]
+      }
+    },
+    "pluginsEnabled": {
+      "type": "boolean"
+    },
+    "plugins": {
+      "type": "object",
+      "propertyNames": {
+        "type": "string",
+        "pattern": "^[a-z][a-z0-9-]*$"
+      },
+      "additionalProperties": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "source": {
+                "type": "string",
+                "const": "directory"
+              },
+              "path": {
+                "type": "string",
+                "minLength": 1
+              },
+              "enabled": {
+                "type": "boolean"
+              }
+            },
+            "required": ["source", "path"],
+            "additionalProperties": false
+          }
+        ]
+      }
+    },
+    "worktrees": {
+      "type": "object",
+      "properties": {
+        "root": {
+          "type": "string",
+          "minLength": 1
+        },
+        "servicePorts": {
+          "type": "object",
+          "properties": {
+            "range": {
+              "type": "string",
+              "pattern": "^(\\d{1,5})-(\\d{1,5})$"
+            },
+            "portScript": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "agents": {
+      "type": "object",
+      "properties": {
+        "providers": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "extends": {
+                "type": "string"
+              },
+              "label": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "command": {
+                "minItems": 1,
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "env": {
                 "type": "object",
-                "properties": {
-                  "extends": {
-                    "type": "string"
-                  },
-                  "label": {
-                    "type": "string"
-                  },
-                  "description": {
-                    "type": "string"
-                  },
-                  "command": {
-                    "type": "array",
-                    "items": {
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "options": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "params": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "models": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
                       "type": "string",
                       "minLength": 1
                     },
-                    "minItems": 1
-                  },
-                  "env": {
-                    "type": "object",
-                    "additionalProperties": {
+                    "label": {
+                      "type": "string",
+                      "minLength": 1
+                    },
+                    "description": {
                       "type": "string"
-                    }
-                  },
-                  "models": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "id": {
-                          "type": "string",
-                          "minLength": 1
-                        },
-                        "label": {
-                          "type": "string",
-                          "minLength": 1
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "isDefault": {
-                          "type": "boolean"
-                        },
-                        "thinkingOptions": {
-                          "type": "array",
-                          "items": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "label": {
-                                "type": "string"
-                              },
-                              "description": {
-                                "type": "string"
-                              },
-                              "isDefault": {
-                                "type": "boolean"
-                              }
-                            },
-                            "required": ["id", "label"],
-                            "additionalProperties": false
+                    },
+                    "isDefault": {
+                      "type": "boolean"
+                    },
+                    "thinkingOptions": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          },
+                          "label": {
+                            "type": "string"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "isDefault": {
+                            "type": "boolean"
                           }
-                        }
-                      },
-                      "required": ["id", "label"],
-                      "additionalProperties": false
+                        },
+                        "required": ["id", "label"]
+                      }
                     }
                   },
-                  "additionalModels": {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/agents/properties/providers/additionalProperties/properties/models/items"
-                    }
-                  },
-                  "disallowedTools": {
-                    "type": "array",
-                    "items": {
+                  "required": ["id", "label"]
+                }
+              },
+              "additionalModels": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "minLength": 1
+                    },
+                    "label": {
+                      "type": "string",
+                      "minLength": 1
+                    },
+                    "description": {
                       "type": "string"
+                    },
+                    "isDefault": {
+                      "type": "boolean"
+                    },
+                    "thinkingOptions": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          },
+                          "label": {
+                            "type": "string"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "isDefault": {
+                            "type": "boolean"
+                          }
+                        },
+                        "required": ["id", "label"]
+                      }
                     }
                   },
+                  "required": ["id", "label"]
+                }
+              },
+              "disallowedTools": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "paseoTools": {
+                "type": "object",
+                "properties": {
                   "enabled": {
                     "type": "boolean"
                   },
-                  "order": {
-                    "type": "number"
+                  "disabledTools": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "order": {
+                "type": "number"
+              }
+            }
+          }
+        },
+        "catalogRefreshTimeoutMs": {
+          "type": "integer",
+          "exclusiveMinimum": 0,
+          "maximum": 2147483647
+        },
+        "metadataGeneration": {
+          "type": "object",
+          "properties": {
+            "providers": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "provider": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "model": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "thinkingOptionId": {
+                    "type": "string",
+                    "minLength": 1
                   }
                 },
+                "required": ["provider"],
                 "additionalProperties": false
               }
-            },
-            "catalogRefreshTimeoutMs": {
-              "type": "integer",
-              "exclusiveMinimum": 0,
-              "maximum": 2147483647
             }
           },
           "additionalProperties": false
         },
-        "features": {
+        "skills": {
           "type": "object",
           "properties": {
-            "dictation": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "stt": {
+            "selection": {
+              "oneOf": [
+                {
                   "type": "object",
                   "properties": {
-                    "provider": {
-                      "allOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["openai", "local"]
-                        }
-                      ]
-                    },
-                    "model": {
+                    "mode": {
                       "type": "string",
-                      "minLength": 1
-                    },
-                    "language": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "confidenceThreshold": {
-                      "type": "number"
+                      "const": "all"
                     }
                   },
+                  "required": ["mode"],
                   "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "mode": {
+                      "type": "string",
+                      "const": "custom"
+                    },
+                    "skills": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "required": ["mode", "skills"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "features": {
+      "type": "object",
+      "properties": {
+        "dictation": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "stt": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "language": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "confidenceThreshold": {
+                  "type": "number"
                 }
               },
               "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        "voiceMode": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
             },
-            "voiceMode": {
+            "llm": {
               "type": "object",
               "properties": {
-                "enabled": {
-                  "type": "boolean"
+                "provider": {
+                  "type": "string"
                 },
-                "llm": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "type": "string"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "stt": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "language": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "turnDetection": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "tts": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "voice": {
-                      "type": "string",
-                      "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
-                    },
-                    "speakerId": {
-                      "type": "integer"
-                    },
-                    "speed": {
-                      "type": "number"
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              },
-              "additionalProperties": false
-            },
-            "webUi": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "distDir": {
+                "model": {
                   "type": "string",
                   "minLength": 1
                 }
               },
               "additionalProperties": false
+            },
+            "stt": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "language": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "additionalProperties": false
+            },
+            "turnDetection": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "tts": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "voice": {
+                  "type": "string",
+                  "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
+                },
+                "speakerId": {
+                  "type": "integer",
+                  "minimum": -9007199254740991,
+                  "maximum": 9007199254740991
+                },
+                "speed": {
+                  "type": "number"
+                }
+              },
+              "additionalProperties": false
             }
           },
           "additionalProperties": false
         },
-        "log": {
+        "webUi": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "distDir": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "log": {
+      "type": "object",
+      "properties": {
+        "level": {
+          "type": "string",
+          "enum": ["trace", "debug", "info", "warn", "error", "fatal"]
+        },
+        "format": {
+          "type": "string",
+          "enum": ["pretty", "json"]
+        },
+        "console": {
           "type": "object",
           "properties": {
             "level": {
@@ -481,42 +764,32 @@
             "format": {
               "type": "string",
               "enum": ["pretty", "json"]
+            }
+          },
+          "additionalProperties": false
+        },
+        "file": {
+          "type": "object",
+          "properties": {
+            "level": {
+              "type": "string",
+              "enum": ["trace", "debug", "info", "warn", "error", "fatal"]
             },
-            "console": {
+            "path": {
+              "type": "string",
+              "minLength": 1
+            },
+            "rotate": {
               "type": "object",
               "properties": {
-                "level": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/level"
-                },
-                "format": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/format"
-                }
-              },
-              "additionalProperties": false
-            },
-            "file": {
-              "type": "object",
-              "properties": {
-                "level": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/level"
-                },
-                "path": {
+                "maxSize": {
                   "type": "string",
                   "minLength": 1
                 },
-                "rotate": {
-                  "type": "object",
-                  "properties": {
-                    "maxSize": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "maxFiles": {
-                      "type": "integer",
-                      "exclusiveMinimum": 0
-                    }
-                  },
-                  "additionalProperties": false
+                "maxFiles": {
+                  "type": "integer",
+                  "exclusiveMinimum": 0,
+                  "maximum": 9007199254740991
                 }
               },
               "additionalProperties": false
@@ -528,5 +801,6 @@
       "additionalProperties": false
     }
   },
-  "$schema": "http://json-schema.org/draft-07/schema#"
+  "additionalProperties": false,
+  "title": "PaseoConfigV1"
 }
diff --git a/packages/website/public/sitemap-index.xml b/packages/website/public/sitemap-index.xml
new file mode 100644
index 0000000000..ae15d8df3b
--- /dev/null
+++ b/packages/website/public/sitemap-index.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap><loc>https://paseo.sh/sitemap.xml</loc></sitemap>
+  <sitemap><loc>https://paseo.sh/sitemap-plugins.xml</loc></sitemap>
+</sitemapindex>
diff --git a/packages/website/src/assets/agent-icons/agoragentic.svg b/packages/website/src/assets/agent-icons/agoragentic.svg
new file mode 100644
index 0000000000..b1372e6835
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/agoragentic.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <circle cx="8" cy="8" r="7" stroke="currentColor" stroke-width="1.5"/>
+  <path d="M5.5 10.5L8 4L10.5 10.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+  <line x1="6.25" y1="8.75" x2="9.75" y2="8.75" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/amp.svg b/packages/website/src/assets/agent-icons/amp.svg
new file mode 100644
index 0000000000..314881aff8
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/amp.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9197 13.61L17.3816 26.566L14.242 27.4049L11.2645 16.2643L0.119926 13.2906L0.957817 10.15L13.9197 13.61Z" fill="currentColor"/>
+<path d="M13.7391 16.0892L4.88169 24.9056L2.58872 22.6019L11.4461 13.7865L13.7391 16.0892Z" fill="currentColor"/>
+<path d="M18.9386 8.58315L22.4005 21.5392L19.2609 22.3781L16.2833 11.2374L5.13879 8.26381L5.97668 5.12318L18.9386 8.58315Z" fill="currentColor"/>
+<path d="M23.9803 3.55632L27.4422 16.5124L24.3025 17.3512L21.325 6.21062L10.1805 3.23698L11.0183 0.0963593L23.9803 3.55632Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/auggie.svg b/packages/website/src/assets/agent-icons/auggie.svg
new file mode 100644
index 0000000000..215107744a
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/auggie.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">
+  <path fill="currentColor" d="M9.972 13.193h2.577q.187 0 .277-.09t.091-.294V10.47q0-.324.133-.59.135-.27.36-.424a1 1 0 0 1 .099-.06 1 1 0 0 1-.1-.058 1.1 1.1 0 0 1-.359-.424 1.3 1.3 0 0 1-.133-.59v-2.33q0-.202-.091-.293t-.277-.089H9.972a.38.38 0 0 1-.294-.124.4.4 0 0 1-.108-.281q.002-.176.131-.293a.46.46 0 0 1 .313-.111h2.775c.36 0 .642.097.836.288q.293.29.294.832V8.24q0 .39.152.562.148.168.555.178a.4.4 0 0 1 .27.128.41.41 0 0 1 .104.287.44.44 0 0 1-.1.282.34.34 0 0 1-.277.132c-.266.006-.452.066-.55.177q-.151.174-.152.573v2.318c0 .235-.043.44-.128.607a.85.85 0 0 1-.389.387 1.3 1.3 0 0 1-.534.124V14h-2.854a.45.45 0 0 1-.315-.118.38.38 0 0 1-.129-.286q0-.164.109-.282a.38.38 0 0 1 .293-.123zM1.103 9.108a.4.4 0 0 1 .276-.128q.4-.008.55-.177.15-.173.151-.562V5.923q.002-.543.294-.832c.195-.191.477-.288.836-.288h2.775q.188 0 .313.111a.37.37 0 0 1 .131.293.4.4 0 0 1-.108.281.38.38 0 0 1-.293.123H3.45q-.186 0-.277.09t-.092.292v2.33c0 .213-.044.413-.133.59a1.1 1.1 0 0 1-.359.424 1 1 0 0 1-.1.059 1 1 0 0 1 .1.059q.225.156.359.423t.133.59v2.34q0 .203.092.293.088.09.277.089h2.577a.38.38 0 0 1 .294.123q.108.12.108.281a.38.38 0 0 1-.13.286.45.45 0 0 1-.314.118l-2.775-.003a1.4 1.4 0 0 1-.613-.126.87.87 0 0 1-.388-.387 1.34 1.34 0 0 1-.129-.608v-2.318q0-.4-.151-.572-.151-.168-.55-.177a.35.35 0 0 1-.278-.132.42.42 0 0 1-.102-.28q0-.173.103-.287"/>
+  <path fill="currentColor" d="M5.437 10.36a.986.986 0 0 1-.994-.975c0-.538.446-.976.994-.976s.994.438.994.976a.986.986 0 0 1-.994.976M10.562 8.41c.548 0 .994.437.994.975a.986.986 0 0 1-.994.976.986.986 0 0 1-.994-.976c0-.538.446-.976.994-.976M8.74 2c.37 0 .446.15.446.275v.034q0 .034-.009.201-.01.162-.017.549-.018.378-.044 1.06c0 .106-.065.233-.375.233-.311 0-.376-.126-.376-.23l-.07-1.835v-.003c0-.13.078-.284.446-.284M7.256 2c.369 0 .446.15.446.275v.034q0 .034-.01.201-.007.162-.017.549-.017.378-.043 1.06c0 .106-.065.233-.376.233-.31 0-.375-.126-.375-.23l-.07-1.835v-.003C6.81 2.154 6.887 2 7.256 2"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/autohand.svg b/packages/website/src/assets/agent-icons/autohand.svg
new file mode 100644
index 0000000000..f3bc983c4d
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/autohand.svg
@@ -0,0 +1,26 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.66949 9.56637C4.66949 8.92122 4.13288 8.39823 3.47094 8.39823C2.809 8.39823 2.2724 8.92122 2.2724 9.56637C2.2724 10.2115 2.809 10.7345 3.47094 10.7345V11C2.65856 11 2 10.3581 2 9.56637C2 8.7746 2.65856 8.13274 3.47094 8.13274C4.28332 8.13274 4.94189 8.7746 4.94189 9.56637C4.94189 10.3581 4.28332 11 3.47094 11V10.7345C4.13288 10.7345 4.66949 10.2115 4.66949 9.56637Z" fill="currentColor"/>
+<path d="M3.90678 9.59292C3.90678 9.81286 3.72385 9.99115 3.49818 9.99115C3.27252 9.99115 3.08959 9.81286 3.08959 9.59292C3.08959 9.37298 3.27252 9.19469 3.49818 9.19469C3.72385 9.19469 3.90678 9.37298 3.90678 9.59292Z" fill="currentColor"/>
+<path d="M3.8523 9.59292C3.8523 9.40231 3.69376 9.24779 3.49818 9.24779C3.30261 9.24779 3.14407 9.40231 3.14407 9.59292C3.14407 9.78353 3.30261 9.93805 3.49818 9.93805V9.99115C3.27252 9.99115 3.08959 9.81286 3.08959 9.59292C3.08959 9.37298 3.27252 9.19469 3.49818 9.19469C3.72385 9.19469 3.90678 9.37298 3.90678 9.59292C3.90678 9.81286 3.72385 9.99115 3.49818 9.99115V9.93805C3.69376 9.93805 3.8523 9.78353 3.8523 9.59292Z" fill="currentColor"/>
+<path d="M4.66949 6.43363C4.66949 5.78848 4.13288 5.26549 3.47094 5.26549C2.809 5.26549 2.2724 5.78848 2.2724 6.43363C2.2724 7.07878 2.809 7.60177 3.47094 7.60177V7.86726C2.65856 7.86726 2 7.2254 2 6.43363C2 5.64186 2.65856 5 3.47094 5C4.28332 5 4.94189 5.64186 4.94189 6.43363C4.94189 7.2254 4.28332 7.86726 3.47094 7.86726V7.60177C4.13288 7.60177 4.66949 7.07878 4.66949 6.43363Z" fill="currentColor"/>
+<path d="M3.90678 6.46018C3.90678 6.68011 3.72385 6.85841 3.49818 6.85841C3.27252 6.85841 3.08959 6.68011 3.08959 6.46018C3.08959 6.24024 3.27252 6.06195 3.49818 6.06195C3.72385 6.06195 3.90678 6.24024 3.90678 6.46018Z" fill="currentColor"/>
+<path d="M3.8523 6.46018C3.8523 6.26957 3.69376 6.11504 3.49818 6.11504C3.30261 6.11504 3.14407 6.26957 3.14407 6.46018C3.14407 6.65079 3.30261 6.80531 3.49818 6.80531V6.85841C3.27252 6.85841 3.08959 6.68011 3.08959 6.46018C3.08959 6.24024 3.27252 6.06195 3.49818 6.06195C3.72385 6.06195 3.90678 6.24024 3.90678 6.46018C3.90678 6.68011 3.72385 6.85841 3.49818 6.85841V6.80531C3.69376 6.80531 3.8523 6.65079 3.8523 6.46018Z" fill="currentColor"/>
+<path d="M8.04722 9.56637C8.04722 8.92122 7.51061 8.39823 6.84867 8.39823C6.18673 8.39823 5.65012 8.92122 5.65012 9.56637C5.65012 10.2115 6.18673 10.7345 6.84867 10.7345V11C6.03629 11 5.37772 10.3581 5.37772 9.56637C5.37772 8.7746 6.03629 8.13274 6.84867 8.13274C7.66105 8.13274 8.31961 8.7746 8.31961 9.56637C8.31961 10.3581 7.66105 11 6.84867 11V10.7345C7.51061 10.7345 8.04722 10.2115 8.04722 9.56637Z" fill="currentColor"/>
+<path d="M7.2845 9.59292C7.2845 9.81286 7.10157 9.99115 6.87591 9.99115C6.65025 9.99115 6.46731 9.81286 6.46731 9.59292C6.46731 9.37298 6.65025 9.19469 6.87591 9.19469C7.10157 9.19469 7.2845 9.37298 7.2845 9.59292Z" fill="currentColor"/>
+<path d="M7.23002 9.59292C7.23002 9.40231 7.07148 9.24779 6.87591 9.24779C6.68033 9.24779 6.52179 9.40231 6.52179 9.59292C6.52179 9.78353 6.68033 9.93805 6.87591 9.93805V9.99115C6.65025 9.99115 6.46731 9.81286 6.46731 9.59292C6.46731 9.37298 6.65025 9.19469 6.87591 9.19469C7.10157 9.19469 7.2845 9.37298 7.2845 9.59292C7.2845 9.81286 7.10157 9.99115 6.87591 9.99115V9.93805C7.07148 9.93805 7.23002 9.78353 7.23002 9.59292Z" fill="currentColor"/>
+<path d="M8.04722 6.43363C8.04722 5.78848 7.51061 5.26549 6.84867 5.26549C6.18673 5.26549 5.65012 5.78848 5.65012 6.43363C5.65012 7.07878 6.18673 7.60177 6.84867 7.60177V7.86726C6.03629 7.86726 5.37772 7.2254 5.37772 6.43363C5.37772 5.64186 6.03629 5 6.84867 5C7.66105 5 8.31961 5.64186 8.31961 6.43363C8.31961 7.2254 7.66105 7.86726 6.84867 7.86726V7.60177C7.51061 7.60177 8.04722 7.07878 8.04722 6.43363Z" fill="currentColor"/>
+<path d="M7.2845 6.46018C7.2845 6.68011 7.10157 6.85841 6.87591 6.85841C6.65025 6.85841 6.46731 6.68011 6.46731 6.46018C6.46731 6.24024 6.65025 6.06195 6.87591 6.06195C7.10157 6.06195 7.2845 6.24024 7.2845 6.46018Z" fill="currentColor"/>
+<path d="M7.23002 6.46018C7.23002 6.26957 7.07148 6.11504 6.87591 6.11504C6.68033 6.11504 6.52179 6.26957 6.52179 6.46018C6.52179 6.65079 6.68033 6.80531 6.87591 6.80531V6.85841C6.65025 6.85841 6.46731 6.68011 6.46731 6.46018C6.46731 6.24024 6.65025 6.06195 6.87591 6.06195C7.10157 6.06195 7.2845 6.24024 7.2845 6.46018C7.2845 6.68011 7.10157 6.85841 6.87591 6.85841V6.80531C7.07148 6.80531 7.23002 6.65079 7.23002 6.46018Z" fill="currentColor"/>
+<path d="M11.207 9.56637C11.207 8.92122 10.6704 8.39823 10.0085 8.39823C9.34653 8.39823 8.80993 8.92122 8.80993 9.56637C8.80993 10.2115 9.34653 10.7345 10.0085 10.7345V11C9.19609 11 8.53753 10.3581 8.53753 9.56637C8.53753 8.7746 9.19609 8.13274 10.0085 8.13274C10.8209 8.13274 11.4794 8.7746 11.4794 9.56637C11.4794 10.3581 10.8209 11 10.0085 11V10.7345C10.6704 10.7345 11.207 10.2115 11.207 9.56637Z" fill="currentColor"/>
+<path d="M10.4443 9.59292C10.4443 9.81286 10.2614 9.99115 10.0357 9.99115C9.81005 9.99115 9.62712 9.81286 9.62712 9.59292C9.62712 9.37298 9.81005 9.19469 10.0357 9.19469C10.2614 9.19469 10.4443 9.37298 10.4443 9.59292Z" fill="currentColor"/>
+<path d="M10.3898 9.59292C10.3898 9.40231 10.2313 9.24779 10.0357 9.24779C9.84014 9.24779 9.6816 9.40231 9.6816 9.59292C9.6816 9.78353 9.84014 9.93805 10.0357 9.93805V9.99115C9.81005 9.99115 9.62712 9.81286 9.62712 9.59292C9.62712 9.37298 9.81005 9.19469 10.0357 9.19469C10.2614 9.19469 10.4443 9.37298 10.4443 9.59292C10.4443 9.81286 10.2614 9.99115 10.0357 9.99115V9.93805C10.2313 9.93805 10.3898 9.78353 10.3898 9.59292Z" fill="currentColor"/>
+<path d="M11.207 6.43363C11.207 5.78848 10.6704 5.26549 10.0085 5.26549C9.34653 5.26549 8.80993 5.78848 8.80993 6.43363C8.80993 7.07878 9.34653 7.60177 10.0085 7.60177V7.86726C9.19609 7.86726 8.53753 7.2254 8.53753 6.43363C8.53753 5.64186 9.19609 5 10.0085 5C10.8209 5 11.4794 5.64186 11.4794 6.43363C11.4794 7.2254 10.8209 7.86726 10.0085 7.86726V7.60177C10.6704 7.60177 11.207 7.07878 11.207 6.43363Z" fill="currentColor"/>
+<path d="M10.4443 6.46018C10.4443 6.68011 10.2614 6.85841 10.0357 6.85841C9.81005 6.85841 9.62712 6.68011 9.62712 6.46018C9.62712 6.24024 9.81005 6.06195 10.0357 6.06195C10.2614 6.06195 10.4443 6.24024 10.4443 6.46018Z" fill="currentColor"/>
+<path d="M10.3898 6.46018C10.3898 6.26957 10.2313 6.11504 10.0357 6.11504C9.84014 6.11504 9.6816 6.26957 9.6816 6.46018C9.6816 6.65079 9.84014 6.80531 10.0357 6.80531V6.85841C9.81005 6.85841 9.62712 6.68011 9.62712 6.46018C9.62712 6.24024 9.81005 6.06195 10.0357 6.06195C10.2614 6.06195 10.4443 6.24024 10.4443 6.46018C10.4443 6.68011 10.2614 6.85841 10.0357 6.85841V6.80531C10.2313 6.80531 10.3898 6.65079 10.3898 6.46018Z" fill="currentColor"/>
+<path d="M14.5847 9.56637C14.5847 8.92122 14.0481 8.39823 13.3862 8.39823C12.7243 8.39823 12.1877 8.92122 12.1877 9.56637C12.1877 10.2115 12.7243 10.7345 13.3862 10.7345V11C12.5738 11 11.9153 10.3581 11.9153 9.56637C11.9153 8.7746 12.5738 8.13274 13.3862 8.13274C14.1986 8.13274 14.8571 8.7746 14.8571 9.56637C14.8571 10.3581 14.1986 11 13.3862 11V10.7345C14.0481 10.7345 14.5847 10.2115 14.5847 9.56637Z" fill="currentColor"/>
+<path d="M13.822 9.59292C13.822 9.81286 13.6391 9.99115 13.4134 9.99115C13.1878 9.99115 13.0048 9.81286 13.0048 9.59292C13.0048 9.37298 13.1878 9.19469 13.4134 9.19469C13.6391 9.19469 13.822 9.37298 13.822 9.59292Z" fill="currentColor"/>
+<path d="M13.7676 9.59292C13.7676 9.40231 13.609 9.24779 13.4134 9.24779C13.2179 9.24779 13.0593 9.40231 13.0593 9.59292C13.0593 9.78353 13.2179 9.93805 13.4134 9.93805V9.99115C13.1878 9.99115 13.0048 9.81286 13.0048 9.59292C13.0048 9.37298 13.1878 9.19469 13.4134 9.19469C13.6391 9.19469 13.822 9.37298 13.822 9.59292C13.822 9.81286 13.6391 9.99115 13.4134 9.99115V9.93805C13.609 9.93805 13.7676 9.78353 13.7676 9.59292Z" fill="currentColor"/>
+<path d="M14.5847 6.43363C14.5847 5.78848 14.0481 5.26549 13.3862 5.26549C12.7243 5.26549 12.1877 5.78848 12.1877 6.43363C12.1877 7.07878 12.7243 7.60177 13.3862 7.60177V7.86726C12.5738 7.86726 11.9153 7.2254 11.9153 6.43363C11.9153 5.64186 12.5738 5 13.3862 5C14.1986 5 14.8571 5.64186 14.8571 6.43363C14.8571 7.2254 14.1986 7.86726 13.3862 7.86726V7.60177C14.0481 7.60177 14.5847 7.07878 14.5847 6.43363Z" fill="currentColor"/>
+<path d="M13.822 6.46018C13.822 6.68011 13.6391 6.85841 13.4134 6.85841C13.1878 6.85841 13.0048 6.68011 13.0048 6.46018C13.0048 6.24024 13.1878 6.06195 13.4134 6.06195C13.6391 6.06195 13.822 6.24024 13.822 6.46018Z" fill="currentColor"/>
+<path d="M13.7676 6.46018C13.7676 6.26957 13.609 6.11504 13.4134 6.11504C13.2179 6.11504 13.0593 6.26957 13.0593 6.46018C13.0593 6.65079 13.2179 6.80531 13.4134 6.80531V6.85841C13.1878 6.85841 13.0048 6.68011 13.0048 6.46018C13.0048 6.24024 13.1878 6.06195 13.4134 6.06195C13.6391 6.06195 13.822 6.24024 13.822 6.46018C13.822 6.68011 13.6391 6.85841 13.4134 6.85841V6.80531C13.609 6.80531 13.7676 6.65079 13.7676 6.46018Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/cline.svg b/packages/website/src/assets/agent-icons/cline.svg
new file mode 100644
index 0000000000..aeeafbc61e
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/cline.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 92 96" fill="currentColor">
+  <path d="M65.45 16.3c10.89 0 19.71 8.86 19.71 19.8v6.6l5.74 11.46a4.48 4.48 0 0 1-.01 3.6L85.16 69.1v6.6c0 10.94-8.83 19.8-19.71 19.8H26.02c-10.89 0-19.71-8.86-19.71-19.8v-6.6L.45 57.8a4.48 4.48 0 0 1-.01-3.67L6.31 42.7v-6.6c0-10.94 8.83-19.8 19.71-19.8h39.43zm-2.52 5.7H29.19c-9.32 0-16.87 7.56-16.87 16.88v5.62l-4.88 9.46a4.48 4.48 0 0 0 .01 3.68l4.87 9.36v5.62c0 9.32 7.55 16.88 16.87 16.88h33.74c9.32 0 16.87-7.55 16.87-16.88V67l4.77-9.39a4.48 4.48 0 0 0 0-3.61L79.8 44.5v-5.62C79.8 29.56 72.25 22 62.93 22z" fill-rule="nonzero"/>
+  <circle cx="45.73" cy="11" r="11"/>
+  <rect stroke="currentColor" stroke-width="8" x="31" y="44.5" width="5" height="22" rx="2.5"/>
+  <rect stroke="currentColor" stroke-width="8" x="55" y="44.5" width="5" height="22" rx="2.5"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/codebuddy.svg b/packages/website/src/assets/agent-icons/codebuddy.svg
new file mode 100644
index 0000000000..d1f4b1d74f
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/codebuddy.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0.7 0.6 19.3 19.3">
+  <path fill="currentColor" d="M12.13 1.25c.15-.14.16-.14.28-.15.18 0 .36.08.64.34.68.62 1.61 1.89 2.2 2.97l.22.42.32.16c.3.16.81.48 1.02.65.09.08.11.08.21.04.45-.18 1.09.05 1.65.6.51.49 1 1.33 1.18 2.03.03.11.06.36.07.54.04.64-.16 1.14-.55 1.37-.08.04-.08.06-.08.26.02.95-.23 1.89-.74 2.82-.58 1.04-1.6 2.11-2.98 3.12-.74.55-2.5 1.58-3.3 1.95-1.9.86-3.43 1.2-4.76 1.03-.79-.09-1.69-.41-2.22-.77-.14-.1-.16-.1-.27-.07-.57.16-1.31-.18-1.94-.88-.25-.28-.66-.98-.79-1.35-.3-.87-.25-1.65.16-2.12.11-.12.09-.33.09-.33-.04-.33-.05-.82-.04-1.14v-.3l-.43-.79c-.68-1.23-1.12-2.25-1.28-3.04-.09-.43-.09-.62.02-.77.07-.09.28-.18.54-.22.66-.12 2.09-.01 3.69.27l.16.03.36-.32c.61-.54 1.01-.84 1.75-1.31.77-.48 1.64-.89 2.62-1.2l.32-.1.17-.46c.62-1.65 1.25-2.86 1.71-3.27h0Zm-5.19 8.45c-.7.41-1.05.61-1.3.84-1.04.93-1.43 2.39-.99 3.71.11.33.31.68.71 1.39.41.71.61 1.06.83 1.32.92 1.05 2.37 1.45 3.68 1 .32-.11.68-.31 1.38-.72l4.02-2.34c.7-.41 1.05-.61 1.3-.84 1.04-.93 1.43-2.39.99-3.71-.11-.33-.31-.68-.71-1.39s-.61-1.06-.83-1.32c-.92-1.05-2.37-1.45-3.68-1-.32.11-.67.31-1.38.72l-4.02 2.34Z"/>
+  <path fill="currentColor" fill-opacity="0.4" d="M8.02 12.13c.38-.22.87-.09 1.09.29l.86 1.5c.22.38.09.88-.29 1.09-.38.22-.86.09-1.09-.29l-.86-1.5c-.22-.38-.09-.87.29-1.09Z"/>
+  <path fill="currentColor" fill-opacity="0.4" d="M12.31 9.64c.38-.22.87-.09 1.09.29l.86 1.5c.22.38.09.87-.29 1.09s-.87.09-1.09-.29l-.86-1.5c-.22-.38-.09-.88.29-1.09Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/copilot.svg b/packages/website/src/assets/agent-icons/copilot.svg
new file mode 100644
index 0000000000..626d33badc
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/copilot.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99816 14.2779C12.0678 14.2779 14.9997 11.6274 14.9997 10.9574V9.3189C14.939 8.77306 14.4165 7.82349 13.6074 7.48636C13.5959 7.42498 13.5859 7.36153 13.5756 7.29542C13.5506 7.13548 13.5231 6.95977 13.4649 6.75954C13.6409 6.31508 13.6873 5.81187 13.6873 5.31135C13.6873 4.54947 13.5757 3.76321 13.0811 3.13712C12.5745 2.4959 11.7737 2.15372 10.6972 2.03411C9.64215 1.91688 8.71828 2.06409 8.12157 2.70342C8.07827 2.74981 8.0345 2.79812 7.99655 2.84746C7.95861 2.79812 7.91805 2.74981 7.87475 2.70342C7.27804 2.06409 6.35416 1.91688 5.29908 2.03411C4.22263 2.15372 3.42181 2.4959 2.91521 3.13712C2.42057 3.76321 2.30905 4.54947 2.30905 5.31135C2.30905 5.81187 2.35539 6.31508 2.53142 6.75954C2.47323 6.95977 2.44574 7.13542 2.42072 7.29536C2.41037 7.3615 2.40044 7.42496 2.38893 7.48636C1.57983 7.82349 1.05728 8.77306 0.996582 9.3189V10.9574C0.996582 11.6274 3.92849 14.2779 7.99816 14.2779ZM10.5523 3.33859C9.63863 3.23707 9.25001 3.41798 9.0811 3.59896C8.90273 3.79007 8.76738 4.19254 8.86971 5.0112C8.94909 5.64627 9.13423 6.08757 9.41018 6.36929C9.67188 6.63645 10.0966 6.8426 10.8435 6.8426C11.6506 6.8426 11.9631 6.66867 12.1051 6.51046C12.2619 6.33577 12.3748 6.00462 12.3748 5.31135C12.3748 4.64141 12.2675 4.22455 12.0513 3.95077C11.8469 3.69214 11.4446 3.43773 10.5523 3.33859ZM6.91639 3.59896C6.74748 3.41798 6.35886 3.23707 5.44518 3.33859C4.55289 3.43773 4.15058 3.69214 3.94624 3.95077C3.72994 4.22455 3.62271 4.64141 3.62271 5.31135C3.62271 6.00462 3.73563 6.33577 3.89239 6.51046C4.03436 6.66867 4.34693 6.8426 5.15396 6.8426C5.90092 6.8426 6.32561 6.63645 6.58731 6.36929C6.86326 6.08757 7.0484 5.64627 7.12778 5.0112C7.23011 4.19254 7.09476 3.79007 6.91639 3.59896ZM7.99818 12.9788C9.99307 12.9788 12.0088 12.0076 12.3748 11.7248V8.00133L12.3546 7.90026C11.9257 8.08369 11.4142 8.1551 10.8435 8.1551C9.84049 8.1551 9.04148 7.86851 8.47257 7.28773C8.28092 7.09208 8.12536 6.87308 7.99978 6.6378C7.8742 6.87308 7.71544 7.09208 7.52378 7.28773C6.95488 7.86851 6.15587 8.1551 5.15283 8.1551C4.58212 8.1551 4.07068 8.08369 3.6418 7.90026L3.62158 8.00133V11.7248C3.98755 12.0076 6.00329 12.9788 7.99818 12.9788Z" fill="currentColor"/>
+<path d="M6.46854 9.0301C6.83097 9.0301 7.12479 9.32391 7.12479 9.68635V10.9988C7.12479 11.3613 6.83097 11.6551 6.46854 11.6551C6.1061 11.6551 5.81229 11.3613 5.81229 10.9988V9.68635C5.81229 9.32391 6.1061 9.0301 6.46854 9.0301Z" fill="currentColor"/>
+<path d="M10.1873 9.68635C10.1873 9.32391 9.89347 9.0301 9.53104 9.0301C9.1686 9.0301 8.87479 9.32391 8.87479 9.68635V10.9988C8.87479 11.3613 9.1686 11.6551 9.53104 11.6551C9.89347 11.6551 10.1873 11.3613 10.1873 10.9988V9.68635Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/cortex-code.svg b/packages/website/src/assets/agent-icons/cortex-code.svg
new file mode 100644
index 0000000000..28f87a258e
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/cortex-code.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 362 362" overflow="hidden">
+  <path fill="currentColor" fill-rule="evenodd" d="M1562.63,107.07h-4.18v5.15h4.18c1.94,0,3.21-.87,3.21-2.53,0-1.75-1.17-2.62-3.21-2.62ZM1553.3,102.31h9.42c5.15,0,8.55,2.82,8.55,7.19,0,2.72-1.36,4.76-3.4,6.02l3.69,5.34v1.07h-5.34l-3.59-5.15h-4.18v5.15h-5.15v-19.62ZM1579.63,112.51c0-10.49-6.99-18.46-17.68-18.46s-17.49,7.58-17.49,18.46,6.99,18.46,17.49,18.46,17.68-7.97,17.68-18.46ZM1584,112.51c0,12.34-8.26,22.63-22.05,22.63s-21.86-10.39-21.86-22.63,8.16-22.63,21.86-22.63,22.05,10.3,22.05,22.63ZM348.21,156.4l-42.55,24.61,42.55,24.54c10.75,6.22,14.42,19.9,8.21,30.67-6.2,10.7-19.92,14.37-30.63,8.18l-76.21-44c-5.08-2.96-8.61-7.59-10.18-12.8-.74-2.4-1.09-4.87-1-7.31.04-1.76.3-3.53.79-5.29,1.52-5.48,5.1-10.38,10.39-13.46l76.21-43.97c10.71-6.19,24.43-2.51,30.63,8.22,6.22,10.72,2.54,24.41-8.21,30.61ZM307.93,275.68l-76.19-43.94c-4.09-2.38-8.63-3.3-12.99-2.93-11.62.83-20.75,10.53-20.75,22.34v87.98c0,12.4,10,22.45,22.42,22.45s22.45-10.05,22.45-22.45v-49.21l42.66,24.63c10.72,6.23,24.43,2.54,30.61-8.17,6.17-10.74,2.53-24.5-8.21-30.7ZM220.01,189.61l-31.67,31.63c-.91.93-2.65,1.69-3.98,1.69h-9.31c-1.28,0-3.06-.76-3.98-1.69l-31.66-31.63c-.91-.89-1.64-2.68-1.64-3.94v-9.33c0-1.29.73-3.09,1.64-3.99l31.66-31.63c.92-.93,2.7-1.66,3.98-1.66h9.31c1.29,0,3.07.73,3.98,1.66l31.67,31.63c.9.9,1.63,2.7,1.63,3.99v9.33c0,1.26-.73,3.05-1.63,3.94ZM194.7,180.83c0-1.28-.77-3.06-1.68-4l-9.17-9.13c-.9-.9-2.68-1.65-3.96-1.65h-.36c-1.28,0-3.05.75-3.94,1.65l-9.17,9.13c-.92.95-1.62,2.73-1.62,4v.36c0,1.26.7,3.03,1.62,3.95l9.17,9.16c.9.9,2.67,1.65,3.94,1.65h.36c1.28,0,3.06-.75,3.96-1.65l9.17-9.16c.9-.92,1.68-2.68,1.68-3.95v-.36ZM51.48,86.28l76.21,43.99c4.09,2.35,8.64,3.29,13.01,2.93,11.6-.86,20.75-10.58,20.75-22.37V22.84c0-12.37-10.06-22.41-22.42-22.41s-22.45,10.05-22.45,22.41v49.23l-42.7-24.66c-10.71-6.2-24.4-2.53-30.61,8.2-6.19,10.76-2.53,24.47,8.2,30.67ZM218.75,133.19c4.36.36,8.9-.57,12.99-2.93l76.19-43.99c10.74-6.2,14.38-19.91,8.21-30.67-6.18-10.72-19.89-14.4-30.61-8.2l-42.66,24.66V22.84c0-12.37-10.03-22.41-22.45-22.41s-22.42,10.05-22.42,22.41v87.98c0,11.8,9.13,21.51,20.75,22.37ZM140.71,228.8c-4.38-.37-8.92.54-13.01,2.93l-76.21,43.94c-10.72,6.2-14.38,19.96-8.2,30.7,6.22,10.71,19.91,14.4,30.61,8.17l42.7-24.63v49.21c0,12.4,10.03,22.45,22.45,22.45s22.42-10.05,22.42-22.45v-87.98c0-11.81-9.16-21.51-20.75-22.34ZM120.04,187.6c.76-2.4,1.08-4.87,1.02-7.31-.09-1.76-.32-3.53-.82-5.29-1.51-5.48-5.08-10.38-10.44-13.46l-76.15-43.97c-10.75-6.19-24.45-2.51-30.63,8.22-6.23,10.72-2.55,24.41,8.2,30.61l42.55,24.61-42.55,24.54c-10.75,6.22-14.41,19.9-8.2,30.67,6.17,10.7,19.88,14.37,30.63,8.18l76.15-44c5.14-2.96,8.63-7.59,10.23-12.8Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/corust.svg b/packages/website/src/assets/agent-icons/corust.svg
new file mode 100644
index 0000000000..9f30636cb0
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/corust.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 12 12">
+  <g transform="matrix(0.00160555,0,0,-0.0014599,-0.26812129,11.08482)" fill="currentColor">
+    <path d="m 297,6493 c -4,-3 -7,-1357 -7,-3008 0,-2390 3,-3005 12,-3012 13,-10 1199,-9 1224,1 11,4 13,61 10,295 -2,159 -7,294 -10,299 -4,7 -112,11 -312,11 -168,0 -309,3 -314,6 -12,7 -13,4775 -2,4792 6,10 85,13 317,15 l 310,3 v 600 l -611,3 c -336,1 -614,-1 -617,-5 z"/>
+    <path d="m 6287,6493 c -4,-3 -7,-136 -7,-294 0,-219 3,-290 13,-296 6,-4 152,-10 322,-13 l 310,-5 3,-2394 c 1,-1545 -1,-2398 -8,-2405 -6,-6 -127,-9 -316,-7 -246,2 -309,0 -315,-11 -5,-7 -9,-145 -9,-305 V 470 l 23,-1 c 158,-4 1192,-2 1200,3 14,9 22,5964 7,6002 l -10,26 h -603 c -332,0 -607,-3 -610,-7 z"/>
+    <g transform="matrix(1.0249,0,0,1.0566,-429.39,51.322)">
+      <path d="m 2476.7,5111.6 c -64.95,-6.2305 -71.077,-28.66 -73.528,-325.23 -3.6765,-261.68 4.9018,-351.4 36.764,-371.34 7.3528,-4.9844 583.32,-12.461 1276.9,-16.199 l 1262.2,-6.2306 73.528,-34.891 c 191.17,-90.966 300.24,-292.84 284.31,-527.1 -15.931,-223.05 -134.8,-392.52 -314.95,-449.85 -61.274,-19.938 -133.58,-21.184 -727.93,-18.692 -607.83,3.7384 -661.75,2.4922 -682.59,-17.446 -22.058,-19.938 -23.284,-43.614 -23.284,-331.47 0,-190.65 4.9019,-320.25 12.255,-335.2 11.029,-21.184 26.96,-23.676 123.77,-23.676 h 110.29 l 66.176,-63.552 c 36.764,-34.891 125,-125.86 198.53,-201.87 72.303,-76.013 322.3,-333.96 555.14,-571.96 l 424.01,-434.89 519.6,3.7383 c 390.93,2.4922 520.83,7.4767 520.83,18.692 0,7.4766 -223.04,249.22 -496.32,534.58 -562.49,589.41 -666.66,701.56 -660.53,707.79 2.451,2.4922 52.695,8.7227 111.52,13.707 322.3,24.922 593.13,194.39 790.43,495.95 129.9,199.38 187.5,391.28 196.08,660.44 8.5783,245.48 -14.706,368.85 -116.42,600.63 -123.77,286.61 -328.43,492.21 -596.8,601.87 -232.84,95.95 -167.89,92.212 -1574.7,93.458 -691.17,1.2462 -1274.5,1.2462 -1295.3,-1.2461 z"/>
+      <path d="m 2430.1,3942.7 c -24.509,-18.692 -24.509,-33.645 -24.509,-1254.8 0,-1163.9 1.2255,-1238.6 22.058,-1271 l 20.833,-33.645 h 337 c 289.21,0 338.23,2.4922 354.16,19.938 18.382,17.446 19.608,145.79 18.382,1267.3 -1.2255,1115.3 -2.4509,1251.1 -19.608,1271 -18.382,18.692 -50.244,21.184 -351.71,21.184 -276.96,-1.2461 -335.78,-3.7383 -356.61,-19.938 z"/>
+    </g>
+  </g>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/crow.svg b/packages/website/src/assets/agent-icons/crow.svg
new file mode 100644
index 0000000000..1169116cd9
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/crow.svg
@@ -0,0 +1,9 @@
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 366 368"
+   xmlns="http://www.w3.org/2000/svg">
+  <path
+     fill="currentColor"
+     d="m 26,275.93574 c 0.65,-9.32 8.46,-15.43 15,-20.96 15.43,-13.04 35.67,-21.92 53,-32.71 20.67,-12.88 61.58,-40.31 80,-55.03 0,0 21,-18.39 21,-18.39 0,0 28,-23.91 28,-23.91 10,-8.33 14.1,-11.65 25,-18.92 7.42,-4.94 19.07,-12.550001 24.52,-19.330001 7.17,-8.93 4.16,-18.82 -4.53,-25.45 -5.67,-4.32 -23.5,-8.94 -30.99,-10.66 -3.1,-0.72 -11.45,-1.57 -13.38,-3.62 -3.22,-3.43 1.67,-6.99 4.38,-8.45 6.61,-3.54 17.51,-5.73 25,-5.82 0,0 4,0 4,0 16.51,-0.2 18.85,-12.47 40,-11.99 9.26,0.21 21.16,2.48 29,7.54 7.87,5.07 12.2,11.73 17.05,19.45 6.31,10.05 12.35,21.16 14.49,33 1.42,7.88 -0.45,13.62 -0.54,21.000001 -0.28,24.26 6.68,37.92 -2.44,63 -5.9,16.24 -14.87,35.36 -23.98,50 -9.34,15 -20.81,30.64 -35.58,40.64 0,0 -16,9.36 -16,9.36 -3.3,1.9 -6.18,2.94 -6.64,7.04 -0.68,2.83 -0.16,7.11 0,9.96 0,0 1.29,8 1.29,8 1.62,5.16 8.51,12.15 12.35,16 3.36,3.37 6.84,7.82 12,7.89 4.2,0.06 8.14,-2.87 12,-4.44 5.24,-2.13 11.35,-3.55 17,-3.94 6.33,-0.43 17.05,1.85 14,10.49 -2.84,-3.54 -6.09,-6.36 -11,-5.57 -2.47,0.4 -10.06,3.6 -8.09,7.08 1.19,2.08 7.67,3.01 10.09,3.88 6.26,2.25 10.83,5.76 14,11.61 0,0 -17,-6.33 -17,-6.33 -9.74,-2.08 -18.73,0.62 -28,3.33 5.49,3.71 8.06,5.51 12,11 -8.23,-1.96 -13.6,-7.46 -26,-6.96 -9.64,0.39 -11.89,4.13 -27,3.96 -9.42,-0.11 -17.78,-4.36 -27,-3.96 -9.45,0.41 -13.16,5.64 -21,8.96 3.16,-14.88 19.73,-16 32,-16 -7.31,-10.21 -20.46,-18.11 -23.28,-26 -0.7,-1.97 -0.69,-3.94 -0.71,-6 0,0 0,-14 0,-14 0.23,-2.35 1.13,-5.62 0,-7.73 -1.66,-2.77 -8.94,-4.64 -12.01,-5.55 -20.1,-5.96 -24.58,-0.84 -43,2.01 0,0 -14,2.11 -14,2.11 -9.78,1.06 -18.83,0.92 -28,5.02 0,0 -15,7.88 -15,7.88 -16.76,8.6 -42.02,22.27 -59,27.93 -9.14,3.04 -16.2,6.24 -26,6.33 0,0 5,-10 5,-10 -3.92,0.18 -15.76,3.08 -17.92,-0.51 -2.44,-4.07 5.28,-9.01 7.92,-10.91 0,0 36,-24.58 36,-24.58 0,0 -19,3.25 -19,3.25 z m 227,1.75 c -2.98,0.84 -11.45,3.61 -12.96,6.27 -0.95,1.89 -0.18,5.54 0,7.73 0.04,2.47 -0.13,4.56 0.61,7 1.52,5.07 11.84,17.33 16.35,19.88 3.38,1.91 15.93,0.11 20,-0.88 -4.12,-8.71 -16.66,-15.05 -21.99,-24 -3.43,-5.75 -0.8,-10.06 -2.01,-16 z" />
+</svg>
diff --git a/packages/website/src/assets/agent-icons/deepagents.svg b/packages/website/src/assets/agent-icons/deepagents.svg
new file mode 100644
index 0000000000..abd818ec47
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/deepagents.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 128 128">
+  <path fill="currentColor" d="M40.1024 85.0722C47.6207 77.5537 51.8469 67.3453 51.8469 56.7136C51.8469 46.0818 47.617 35.8734 40.1024 28.355L11.7446 0C4.22995 7.5185 0 17.7269 0 28.3586C0 38.9903 4.22995 49.1987 11.7446 56.7172L40.0987 85.0722H40.1024Z"/>
+  <path fill="currentColor" d="M99.4385 87.698C91.9239 80.1832 81.7121 75.9531 71.0844 75.9531C60.4566 75.9531 50.2448 80.1832 42.7266 87.698L71.0844 116.057C78.599 123.571 88.8107 127.802 99.4421 127.802C110.074 127.802 120.282 123.571 127.8 116.057L99.4421 87.698H99.4385Z"/>
+  <path fill="currentColor" d="M11.8146 115.987C19.3329 123.502 29.541 127.732 40.1724 127.732V87.6289H0.0664062C0.0700559 98.2606 4.29635 108.469 11.8146 115.987Z"/>
+  <path fill="currentColor" d="M110.387 45.7684C102.869 38.2535 92.6608 34.0198 82.0258 34.0234C71.3943 34.0234 61.1863 38.2535 53.668 45.772L82.0258 74.1306L110.387 45.7684Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/dimcode.svg b/packages/website/src/assets/agent-icons/dimcode.svg
new file mode 100644
index 0000000000..1fa31ce884
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/dimcode.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.12109 11.0078H1.99902V5.49316H3.12109V11.0078ZM3.7041 5.49316C4.91979 5.49316 5.31142 5.57449 5.80762 5.7373C6.50208 5.97365 6.85299 6.40958 6.86133 7.04492V9.45605C6.86125 10.207 6.37767 10.6797 5.41016 10.874C4.95546 10.9633 4.69632 11.0078 3.7041 11.0078V10.6064C4.72131 10.6064 4.95994 10.5507 5.34863 10.4404C5.91072 10.2671 6.19576 9.93907 6.2041 9.45605V7.04492C6.20402 6.4883 5.83211 6.13886 5.08789 5.99707C4.74057 5.93405 4.58897 5.89978 3.7041 5.89453V5.49316ZM9.16797 5.49316V11.0078H8.0459V5.49316H9.16797ZM14 6.79297V11.0078H12.8779V8.0791L13.8877 6.79297H14ZM14 5.49316V5.7373L11.3594 8.97852H10.7852L9.74219 6.94531V6.07812H9.86719L11.0723 8.33203L13.4258 5.49316H14Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/dirac.svg b/packages/website/src/assets/agent-icons/dirac.svg
new file mode 100644
index 0000000000..4fbb06ceea
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/dirac.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
+  <text x="8" y="10" text-anchor="middle" font-size="10.5" font-family="Georgia, serif" font-style="italic" fill="currentColor">δ</text>
+  <line x1="1" y1="14" x2="15" y2="14" stroke="currentColor" stroke-opacity="0.4" stroke-width="1" stroke-linecap="round"/>
+  <line x1="8" y1="14" x2="8" y2="12" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
+  <circle cx="8" cy="11.5" r="0.7" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/factory-droid.svg b/packages/website/src/assets/agent-icons/factory-droid.svg
new file mode 100644
index 0000000000..5c6fb8d1ff
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/factory-droid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 900 900" fill="none"><path fill="currentColor" d="M622.037 192.524a10.58 10.58 0 0 1-4.056-2.001 10.573 10.573 0 0 1-3.98-7.89 10.595 10.595 0 0 1 .804-4.452c20.214-49.194 29.134-88.555 14.74-105.033-38.123-43.716-191.004 43.219-239.75 72.663a10.596 10.596 0 0 1-10.841.041 10.576 10.576 0 0 1-4.396-5.07c-20.491-49.089-42.031-83.233-63.865-84.714-57.871-3.96-104.516 165.624-118.17 220.895a10.574 10.574 0 0 1-1.993 4.057 10.572 10.572 0 0 1-7.884 3.977 10.586 10.586 0 0 1-4.447-.802c-49.194-20.215-88.572-29.134-105.033-14.74-43.717 38.123 43.202 191.005 72.644 239.75a10.553 10.553 0 0 1 1.454 4.279 10.573 10.573 0 0 1-6.481 10.958c-49.072 20.491-83.216 42.031-84.715 63.864-3.944 57.871 165.624 104.516 220.913 118.171a10.566 10.566 0 0 1 5.658 3.601 10.57 10.57 0 0 1 2.355 6.281 10.58 10.58 0 0 1-.799 4.442c-20.214 49.194-29.134 88.572-14.739 105.033 38.121 43.717 191.021-43.202 239.767-72.644a10.566 10.566 0 0 1 15.238 5.027c20.489 49.072 42.013 83.216 63.862 84.715 57.871 3.944 104.516-165.624 118.153-220.913a10.603 10.603 0 0 1 9.895-8.021 10.566 10.566 0 0 1 4.449.808c49.193 20.214 88.553 29.116 105.032 14.738 43.718-38.121-43.219-191.022-72.663-239.767a10.602 10.602 0 0 1 1.326-12.655 10.604 10.604 0 0 1 3.703-2.582c49.089-20.49 83.233-42.031 84.714-63.863 3.96-57.871-165.624-104.516-220.895-118.153Zm-66.394-55.478c11.123 19.938-46.196 152.797-88.83 245.724a8.36 8.36 0 0 1-8.239 4.855 8.374 8.374 0 0 1-7.412-6.043c-17.219-60.42-36.899-131.411-57.957-191.675a10.557 10.557 0 0 1 4.924-12.759c52.586-28.721 142.568-66.86 157.514-40.102ZM303.635 153.49c21.953 6.233 75.365 140.709 110.92 236.564a8.364 8.364 0 0 1-2.394 9.249 8.364 8.364 0 0 1-9.504.978c-54.943-30.493-119.013-66.824-176.522-94.546a10.565 10.565 0 0 1-5.528-12.501c16.926-57.44 53.532-148.095 83.028-139.744ZM137.064 343.322c19.921-11.123 152.795 46.197 245.707 88.83a8.369 8.369 0 0 1-1.189 15.652c-60.401 17.219-131.411 36.899-191.675 57.957a10.552 10.552 0 0 1-12.742-4.925c-28.668-52.584-66.876-142.568-40.101-157.514Zm16.443 252.009c6.217-21.953 140.709-75.365 236.564-110.921a8.368 8.368 0 0 1 10.227 11.898c-30.511 54.945-66.842 119.014-94.563 176.507a10.548 10.548 0 0 1-5.229 5.075 10.544 10.544 0 0 1-7.271.468c-57.441-16.822-148.095-53.531-139.728-83.027ZM343.34 761.902c-11.14-19.922 46.197-152.796 88.829-245.707a8.383 8.383 0 0 1 5.713-4.66 8.38 8.38 0 0 1 7.182 1.664 8.371 8.371 0 0 1 2.758 4.184c17.217 60.403 36.898 131.412 57.957 191.675a10.558 10.558 0 0 1-4.942 12.743c-52.568 28.668-142.568 66.875-157.445 40.101h-.052Zm252.009-16.443c-21.971-6.216-75.383-140.709-110.939-236.564a8.37 8.37 0 0 1 11.916-10.228c54.926 30.494 119.014 66.842 176.506 94.563a10.538 10.538 0 0 1 5.527 12.502c-16.909 57.526-53.515 148.094-83.01 139.727Zm166.57-189.834c-19.938 11.141-152.796-46.197-245.724-88.83a8.367 8.367 0 0 1-2.993-12.892 8.378 8.378 0 0 1 4.182-2.759c60.419-17.218 131.41-36.899 191.675-57.958a10.577 10.577 0 0 1 12.758 4.943c28.652 52.568 66.86 142.569 40.102 157.496Zm-16.444-252.009c-6.232 21.971-140.709 75.383-236.562 110.94a8.371 8.371 0 0 1-10.229-11.917c30.495-54.926 66.825-119.012 94.547-176.505a10.555 10.555 0 0 1 12.5-5.528c57.441 16.909 148.096 53.516 139.744 83.01Z"/></svg>
diff --git a/packages/website/src/assets/agent-icons/fast-agent.svg b/packages/website/src/assets/agent-icons/fast-agent.svg
new file mode 100644
index 0000000000..a07fab2886
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/fast-agent.svg
@@ -0,0 +1,293 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360" width="16" height="16">
+  <g fill="currentColor">
+    <circle cx="100.50" cy="40.50" r="4.50"/>
+    <circle cx="112.50" cy="40.50" r="4.50"/>
+    <circle cx="124.50" cy="40.50" r="4.50"/>
+    <circle cx="136.50" cy="40.50" r="4.50"/>
+    <circle cx="148.50" cy="40.50" r="4.50"/>
+    <circle cx="76.50" cy="52.50" r="4.50"/>
+    <circle cx="88.50" cy="52.50" r="4.50"/>
+    <circle cx="100.50" cy="52.50" r="4.50"/>
+    <circle cx="136.50" cy="52.50" r="4.50"/>
+    <circle cx="148.50" cy="52.50" r="4.50"/>
+    <circle cx="160.50" cy="52.50" r="4.50"/>
+    <circle cx="64.50" cy="64.50" r="4.50"/>
+    <circle cx="76.50" cy="64.50" r="4.50"/>
+    <circle cx="88.50" cy="64.50" r="4.50"/>
+    <circle cx="100.50" cy="64.50" r="4.50"/>
+    <circle cx="136.50" cy="64.50" r="4.50"/>
+    <circle cx="148.50" cy="64.50" r="4.50"/>
+    <circle cx="160.50" cy="64.50" r="4.50"/>
+    <circle cx="172.50" cy="64.50" r="4.50"/>
+    <circle cx="52.50" cy="76.50" r="4.50"/>
+    <circle cx="64.50" cy="76.50" r="4.50"/>
+    <circle cx="76.50" cy="76.50" r="4.50"/>
+    <circle cx="88.50" cy="76.50" r="4.50"/>
+    <circle cx="100.50" cy="76.50" r="4.50"/>
+    <circle cx="136.50" cy="76.50" r="4.50"/>
+    <circle cx="148.50" cy="76.50" r="4.50"/>
+    <circle cx="160.50" cy="76.50" r="4.50"/>
+    <circle cx="52.50" cy="88.50" r="4.50"/>
+    <circle cx="64.50" cy="88.50" r="4.50"/>
+    <circle cx="76.50" cy="88.50" r="4.50"/>
+    <circle cx="88.50" cy="88.50" r="4.50"/>
+    <circle cx="100.50" cy="88.50" r="4.50"/>
+    <circle cx="148.50" cy="88.50" r="4.50"/>
+    <circle cx="52.50" cy="100.50" r="4.50"/>
+    <circle cx="64.50" cy="100.50" r="4.50"/>
+    <circle cx="76.50" cy="100.50" r="4.50"/>
+    <circle cx="88.50" cy="100.50" r="4.50"/>
+    <circle cx="100.50" cy="100.50" r="4.50"/>
+    <circle cx="52.50" cy="112.50" r="4.50"/>
+    <circle cx="64.50" cy="112.50" r="4.50"/>
+    <circle cx="76.50" cy="112.50" r="4.50"/>
+    <circle cx="88.50" cy="112.50" r="4.50"/>
+    <circle cx="100.50" cy="112.50" r="4.50"/>
+    <circle cx="52.50" cy="124.50" r="4.50"/>
+    <circle cx="64.50" cy="124.50" r="4.50"/>
+    <circle cx="76.50" cy="124.50" r="4.50"/>
+    <circle cx="88.50" cy="124.50" r="4.50"/>
+    <circle cx="100.50" cy="124.50" r="4.50"/>
+    <circle cx="232.50" cy="124.50" r="4.50"/>
+    <circle cx="244.50" cy="124.50" r="4.50"/>
+    <circle cx="256.50" cy="124.50" r="4.50"/>
+    <circle cx="28.50" cy="136.50" r="4.50"/>
+    <circle cx="40.50" cy="136.50" r="4.50"/>
+    <circle cx="52.50" cy="136.50" r="4.50"/>
+    <circle cx="64.50" cy="136.50" r="4.50"/>
+    <circle cx="76.50" cy="136.50" r="4.50"/>
+    <circle cx="88.50" cy="136.50" r="4.50"/>
+    <circle cx="100.50" cy="136.50" r="4.50"/>
+    <circle cx="112.50" cy="136.50" r="4.50"/>
+    <circle cx="124.50" cy="136.50" r="4.50"/>
+    <circle cx="196.50" cy="136.50" r="4.50"/>
+    <circle cx="208.50" cy="136.50" r="4.50"/>
+    <circle cx="220.50" cy="136.50" r="4.50"/>
+    <circle cx="232.50" cy="136.50" r="4.50"/>
+    <circle cx="244.50" cy="136.50" r="4.50"/>
+    <circle cx="256.50" cy="136.50" r="4.50"/>
+    <circle cx="268.50" cy="136.50" r="4.50"/>
+    <circle cx="280.50" cy="136.50" r="4.50"/>
+    <circle cx="28.50" cy="148.50" r="4.50"/>
+    <circle cx="40.50" cy="148.50" r="4.50"/>
+    <circle cx="52.50" cy="148.50" r="4.50"/>
+    <circle cx="64.50" cy="148.50" r="4.50"/>
+    <circle cx="76.50" cy="148.50" r="4.50"/>
+    <circle cx="88.50" cy="148.50" r="4.50"/>
+    <circle cx="100.50" cy="148.50" r="4.50"/>
+    <circle cx="112.50" cy="148.50" r="4.50"/>
+    <circle cx="124.50" cy="148.50" r="4.50"/>
+    <circle cx="172.50" cy="148.50" r="4.50"/>
+    <circle cx="184.50" cy="148.50" r="4.50"/>
+    <circle cx="196.50" cy="148.50" r="4.50"/>
+    <circle cx="256.50" cy="148.50" r="4.50"/>
+    <circle cx="268.50" cy="148.50" r="4.50"/>
+    <circle cx="280.50" cy="148.50" r="4.50"/>
+    <circle cx="292.50" cy="148.50" r="4.50"/>
+    <circle cx="52.50" cy="160.50" r="4.50"/>
+    <circle cx="64.50" cy="160.50" r="4.50"/>
+    <circle cx="76.50" cy="160.50" r="4.50"/>
+    <circle cx="88.50" cy="160.50" r="4.50"/>
+    <circle cx="100.50" cy="160.50" r="4.50"/>
+    <circle cx="160.50" cy="160.50" r="4.50"/>
+    <circle cx="172.50" cy="160.50" r="4.50"/>
+    <circle cx="184.50" cy="160.50" r="4.50"/>
+    <circle cx="196.50" cy="160.50" r="4.50"/>
+    <circle cx="256.50" cy="160.50" r="4.50"/>
+    <circle cx="268.50" cy="160.50" r="4.50"/>
+    <circle cx="280.50" cy="160.50" r="4.50"/>
+    <circle cx="292.50" cy="160.50" r="4.50"/>
+    <circle cx="304.50" cy="160.50" r="4.50"/>
+    <circle cx="52.50" cy="172.50" r="4.50"/>
+    <circle cx="64.50" cy="172.50" r="4.50"/>
+    <circle cx="76.50" cy="172.50" r="4.50"/>
+    <circle cx="88.50" cy="172.50" r="4.50"/>
+    <circle cx="100.50" cy="172.50" r="4.50"/>
+    <circle cx="160.50" cy="172.50" r="4.50"/>
+    <circle cx="172.50" cy="172.50" r="4.50"/>
+    <circle cx="184.50" cy="172.50" r="4.50"/>
+    <circle cx="196.50" cy="172.50" r="4.50"/>
+    <circle cx="208.50" cy="172.50" r="4.50"/>
+    <circle cx="256.50" cy="172.50" r="4.50"/>
+    <circle cx="268.50" cy="172.50" r="4.50"/>
+    <circle cx="280.50" cy="172.50" r="4.50"/>
+    <circle cx="292.50" cy="172.50" r="4.50"/>
+    <circle cx="304.50" cy="172.50" r="4.50"/>
+    <circle cx="52.50" cy="184.50" r="4.50"/>
+    <circle cx="64.50" cy="184.50" r="4.50"/>
+    <circle cx="76.50" cy="184.50" r="4.50"/>
+    <circle cx="88.50" cy="184.50" r="4.50"/>
+    <circle cx="100.50" cy="184.50" r="4.50"/>
+    <circle cx="160.50" cy="184.50" r="4.50"/>
+    <circle cx="172.50" cy="184.50" r="4.50"/>
+    <circle cx="184.50" cy="184.50" r="4.50"/>
+    <circle cx="196.50" cy="184.50" r="4.50"/>
+    <circle cx="208.50" cy="184.50" r="4.50"/>
+    <circle cx="256.50" cy="184.50" r="4.50"/>
+    <circle cx="268.50" cy="184.50" r="4.50"/>
+    <circle cx="280.50" cy="184.50" r="4.50"/>
+    <circle cx="292.50" cy="184.50" r="4.50"/>
+    <circle cx="304.50" cy="184.50" r="4.50"/>
+    <circle cx="52.50" cy="196.50" r="4.50"/>
+    <circle cx="64.50" cy="196.50" r="4.50"/>
+    <circle cx="76.50" cy="196.50" r="4.50"/>
+    <circle cx="88.50" cy="196.50" r="4.50"/>
+    <circle cx="100.50" cy="196.50" r="4.50"/>
+    <circle cx="172.50" cy="196.50" r="4.50"/>
+    <circle cx="184.50" cy="196.50" r="4.50"/>
+    <circle cx="196.50" cy="196.50" r="4.50"/>
+    <circle cx="256.50" cy="196.50" r="4.50"/>
+    <circle cx="268.50" cy="196.50" r="4.50"/>
+    <circle cx="280.50" cy="196.50" r="4.50"/>
+    <circle cx="292.50" cy="196.50" r="4.50"/>
+    <circle cx="304.50" cy="196.50" r="4.50"/>
+    <circle cx="52.50" cy="208.50" r="4.50"/>
+    <circle cx="64.50" cy="208.50" r="4.50"/>
+    <circle cx="76.50" cy="208.50" r="4.50"/>
+    <circle cx="88.50" cy="208.50" r="4.50"/>
+    <circle cx="100.50" cy="208.50" r="4.50"/>
+    <circle cx="244.50" cy="208.50" r="4.50"/>
+    <circle cx="256.50" cy="208.50" r="4.50"/>
+    <circle cx="268.50" cy="208.50" r="4.50"/>
+    <circle cx="280.50" cy="208.50" r="4.50"/>
+    <circle cx="292.50" cy="208.50" r="4.50"/>
+    <circle cx="304.50" cy="208.50" r="4.50"/>
+    <circle cx="52.50" cy="220.50" r="4.50"/>
+    <circle cx="64.50" cy="220.50" r="4.50"/>
+    <circle cx="76.50" cy="220.50" r="4.50"/>
+    <circle cx="88.50" cy="220.50" r="4.50"/>
+    <circle cx="100.50" cy="220.50" r="4.50"/>
+    <circle cx="220.50" cy="220.50" r="4.50"/>
+    <circle cx="232.50" cy="220.50" r="4.50"/>
+    <circle cx="256.50" cy="220.50" r="4.50"/>
+    <circle cx="268.50" cy="220.50" r="4.50"/>
+    <circle cx="280.50" cy="220.50" r="4.50"/>
+    <circle cx="292.50" cy="220.50" r="4.50"/>
+    <circle cx="304.50" cy="220.50" r="4.50"/>
+    <circle cx="52.50" cy="232.50" r="4.50"/>
+    <circle cx="64.50" cy="232.50" r="4.50"/>
+    <circle cx="76.50" cy="232.50" r="4.50"/>
+    <circle cx="88.50" cy="232.50" r="4.50"/>
+    <circle cx="100.50" cy="232.50" r="4.50"/>
+    <circle cx="196.50" cy="232.50" r="4.50"/>
+    <circle cx="208.50" cy="232.50" r="4.50"/>
+    <circle cx="220.50" cy="232.50" r="4.50"/>
+    <circle cx="256.50" cy="232.50" r="4.50"/>
+    <circle cx="268.50" cy="232.50" r="4.50"/>
+    <circle cx="280.50" cy="232.50" r="4.50"/>
+    <circle cx="292.50" cy="232.50" r="4.50"/>
+    <circle cx="304.50" cy="232.50" r="4.50"/>
+    <circle cx="52.50" cy="244.50" r="4.50"/>
+    <circle cx="64.50" cy="244.50" r="4.50"/>
+    <circle cx="76.50" cy="244.50" r="4.50"/>
+    <circle cx="88.50" cy="244.50" r="4.50"/>
+    <circle cx="100.50" cy="244.50" r="4.50"/>
+    <circle cx="184.50" cy="244.50" r="4.50"/>
+    <circle cx="196.50" cy="244.50" r="4.50"/>
+    <circle cx="208.50" cy="244.50" r="4.50"/>
+    <circle cx="256.50" cy="244.50" r="4.50"/>
+    <circle cx="268.50" cy="244.50" r="4.50"/>
+    <circle cx="280.50" cy="244.50" r="4.50"/>
+    <circle cx="292.50" cy="244.50" r="4.50"/>
+    <circle cx="304.50" cy="244.50" r="4.50"/>
+    <circle cx="52.50" cy="256.50" r="4.50"/>
+    <circle cx="64.50" cy="256.50" r="4.50"/>
+    <circle cx="76.50" cy="256.50" r="4.50"/>
+    <circle cx="88.50" cy="256.50" r="4.50"/>
+    <circle cx="100.50" cy="256.50" r="4.50"/>
+    <circle cx="172.50" cy="256.50" r="4.50"/>
+    <circle cx="184.50" cy="256.50" r="4.50"/>
+    <circle cx="196.50" cy="256.50" r="4.50"/>
+    <circle cx="208.50" cy="256.50" r="4.50"/>
+    <circle cx="256.50" cy="256.50" r="4.50"/>
+    <circle cx="268.50" cy="256.50" r="4.50"/>
+    <circle cx="280.50" cy="256.50" r="4.50"/>
+    <circle cx="292.50" cy="256.50" r="4.50"/>
+    <circle cx="304.50" cy="256.50" r="4.50"/>
+    <circle cx="52.50" cy="268.50" r="4.50"/>
+    <circle cx="64.50" cy="268.50" r="4.50"/>
+    <circle cx="76.50" cy="268.50" r="4.50"/>
+    <circle cx="88.50" cy="268.50" r="4.50"/>
+    <circle cx="100.50" cy="268.50" r="4.50"/>
+    <circle cx="160.50" cy="268.50" r="4.50"/>
+    <circle cx="172.50" cy="268.50" r="4.50"/>
+    <circle cx="184.50" cy="268.50" r="4.50"/>
+    <circle cx="196.50" cy="268.50" r="4.50"/>
+    <circle cx="256.50" cy="268.50" r="4.50"/>
+    <circle cx="268.50" cy="268.50" r="4.50"/>
+    <circle cx="280.50" cy="268.50" r="4.50"/>
+    <circle cx="292.50" cy="268.50" r="4.50"/>
+    <circle cx="304.50" cy="268.50" r="4.50"/>
+    <circle cx="52.50" cy="280.50" r="4.50"/>
+    <circle cx="64.50" cy="280.50" r="4.50"/>
+    <circle cx="76.50" cy="280.50" r="4.50"/>
+    <circle cx="88.50" cy="280.50" r="4.50"/>
+    <circle cx="100.50" cy="280.50" r="4.50"/>
+    <circle cx="160.50" cy="280.50" r="4.50"/>
+    <circle cx="172.50" cy="280.50" r="4.50"/>
+    <circle cx="184.50" cy="280.50" r="4.50"/>
+    <circle cx="196.50" cy="280.50" r="4.50"/>
+    <circle cx="208.50" cy="280.50" r="4.50"/>
+    <circle cx="256.50" cy="280.50" r="4.50"/>
+    <circle cx="268.50" cy="280.50" r="4.50"/>
+    <circle cx="280.50" cy="280.50" r="4.50"/>
+    <circle cx="292.50" cy="280.50" r="4.50"/>
+    <circle cx="304.50" cy="280.50" r="4.50"/>
+    <circle cx="52.50" cy="292.50" r="4.50"/>
+    <circle cx="64.50" cy="292.50" r="4.50"/>
+    <circle cx="76.50" cy="292.50" r="4.50"/>
+    <circle cx="88.50" cy="292.50" r="4.50"/>
+    <circle cx="100.50" cy="292.50" r="4.50"/>
+    <circle cx="160.50" cy="292.50" r="4.50"/>
+    <circle cx="172.50" cy="292.50" r="4.50"/>
+    <circle cx="184.50" cy="292.50" r="4.50"/>
+    <circle cx="196.50" cy="292.50" r="4.50"/>
+    <circle cx="208.50" cy="292.50" r="4.50"/>
+    <circle cx="220.50" cy="292.50" r="4.50"/>
+    <circle cx="232.50" cy="292.50" r="4.50"/>
+    <circle cx="244.50" cy="292.50" r="4.50"/>
+    <circle cx="256.50" cy="292.50" r="4.50"/>
+    <circle cx="268.50" cy="292.50" r="4.50"/>
+    <circle cx="280.50" cy="292.50" r="4.50"/>
+    <circle cx="292.50" cy="292.50" r="4.50"/>
+    <circle cx="304.50" cy="292.50" r="4.50"/>
+    <circle cx="52.50" cy="304.50" r="4.50"/>
+    <circle cx="64.50" cy="304.50" r="4.50"/>
+    <circle cx="76.50" cy="304.50" r="4.50"/>
+    <circle cx="88.50" cy="304.50" r="4.50"/>
+    <circle cx="100.50" cy="304.50" r="4.50"/>
+    <circle cx="160.50" cy="304.50" r="4.50"/>
+    <circle cx="172.50" cy="304.50" r="4.50"/>
+    <circle cx="184.50" cy="304.50" r="4.50"/>
+    <circle cx="196.50" cy="304.50" r="4.50"/>
+    <circle cx="208.50" cy="304.50" r="4.50"/>
+    <circle cx="220.50" cy="304.50" r="4.50"/>
+    <circle cx="232.50" cy="304.50" r="4.50"/>
+    <circle cx="256.50" cy="304.50" r="4.50"/>
+    <circle cx="268.50" cy="304.50" r="4.50"/>
+    <circle cx="280.50" cy="304.50" r="4.50"/>
+    <circle cx="292.50" cy="304.50" r="4.50"/>
+    <circle cx="304.50" cy="304.50" r="4.50"/>
+    <circle cx="316.50" cy="304.50" r="4.50"/>
+    <circle cx="328.50" cy="304.50" r="4.50"/>
+    <circle cx="28.50" cy="316.50" r="4.50"/>
+    <circle cx="40.50" cy="316.50" r="4.50"/>
+    <circle cx="52.50" cy="316.50" r="4.50"/>
+    <circle cx="64.50" cy="316.50" r="4.50"/>
+    <circle cx="76.50" cy="316.50" r="4.50"/>
+    <circle cx="88.50" cy="316.50" r="4.50"/>
+    <circle cx="100.50" cy="316.50" r="4.50"/>
+    <circle cx="112.50" cy="316.50" r="4.50"/>
+    <circle cx="124.50" cy="316.50" r="4.50"/>
+    <circle cx="172.50" cy="316.50" r="4.50"/>
+    <circle cx="184.50" cy="316.50" r="4.50"/>
+    <circle cx="196.50" cy="316.50" r="4.50"/>
+    <circle cx="208.50" cy="316.50" r="4.50"/>
+    <circle cx="220.50" cy="316.50" r="4.50"/>
+    <circle cx="268.50" cy="316.50" r="4.50"/>
+    <circle cx="280.50" cy="316.50" r="4.50"/>
+    <circle cx="292.50" cy="316.50" r="4.50"/>
+    <circle cx="304.50" cy="316.50" r="4.50"/>
+    <circle cx="316.50" cy="316.50" r="4.50"/>
+  </g>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/gemini.svg b/packages/website/src/assets/agent-icons/gemini.svg
new file mode 100644
index 0000000000..588d89c52a
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/gemini.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M11.04 19.32Q12 21.51 12 24q0-2.49.93-4.68.96-2.19 2.58-3.81t3.81-2.55Q21.51 12 24 12q-2.49 0-4.68-.93a12.3 12.3 0 0 1-3.81-2.58 12.3 12.3 0 0 1-2.58-3.81Q12 2.49 12 0q0 2.49-.96 4.68-.93 2.19-2.55 3.81a12.3 12.3 0 0 1-3.81 2.58Q2.49 12 0 12q2.49 0 4.68.96 2.19.93 3.81 2.55t2.55 3.81"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/glm.svg b/packages/website/src/assets/agent-icons/glm.svg
new file mode 100644
index 0000000000..d552d2a3d0
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/glm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" fill-rule="evenodd"><title>Z.ai</title><path d="M8.07 1.333L6.618 3.302H.435L1.887 1.333h6.184zM15.503 12.699L14.052 14.667h-6.161l1.449-1.968h6.163zM16 1.333L6.176 14.667H0L9.824 1.333H16z"/></svg>
diff --git a/packages/website/src/assets/agent-icons/goose.svg b/packages/website/src/assets/agent-icons/goose.svg
new file mode 100644
index 0000000000..c492885426
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/goose.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M20.9093 19.3861L19.5185 18.2413C18.7624 17.619 18.1189 16.8713 17.6157 16.0313C16.9205 14.8706 15.9599 13.8912 14.8133 13.1735L14.2533 12.8475C14.0614 12.7141 13.9276 12.5062 13.9086 12.2716C13.8963 12.1204 13.9326 11.9852 14.0171 11.8662C14.3087 11.4553 15.896 9.74698 16.1722 9.51845C16.528 9.22442 16.9243 8.97987 17.2921 8.69986C17.3443 8.66 17.3968 8.62035 17.4485 8.57989C17.4503 8.57808 17.4529 8.57668 17.4545 8.57508C17.5725 8.48195 17.6838 8.383 17.7724 8.26563C18.2036 7.76631 18.195 7.3443 18.195 7.3443C18.195 7.3443 18.1954 7.3439 18.1956 7.3437C18.1497 7.23133 17.9847 6.88163 17.6492 6.71759C17.9458 6.71178 18.2805 6.82294 18.4323 6.97156C18.6148 6.68534 18.7328 6.49967 18.9162 6.18762C18.9599 6.11352 18.9831 5.97652 18.8996 5.89981C18.8996 5.89981 18.8992 5.89981 18.8988 5.89981C18.8988 5.89981 18.8988 5.8994 18.8988 5.899C18.8972 5.8974 18.8952 5.8962 18.8936 5.8946C18.892 5.893 18.891 5.89119 18.8892 5.88939C18.8892 5.88939 18.8888 5.88939 18.8884 5.88939C18.8884 5.88939 18.8884 5.88899 18.8884 5.88859C18.885 5.88518 18.8812 5.88258 18.8776 5.87938C18.8754 5.87717 18.8736 5.87457 18.8716 5.87217C18.8692 5.87016 18.8665 5.86836 18.8643 5.86616C18.8609 5.86275 18.8587 5.85855 18.8551 5.85534C18.8551 5.85534 18.8545 5.85514 18.8543 5.85534C18.8543 5.85534 18.8543 5.85494 18.8543 5.85454C18.8527 5.85294 18.8507 5.85174 18.8491 5.85013C18.8475 5.84853 18.8463 5.84653 18.8447 5.84493C18.8447 5.84493 18.8441 5.84473 18.8439 5.84493C18.8439 5.84493 18.8439 5.84453 18.8439 5.84413C18.7672 5.7606 18.6302 5.78384 18.5561 5.8275C18.1503 6.06625 17.7555 6.32322 17.3996 6.54855C17.3996 6.54855 16.9778 6.53973 16.4783 6.97116C16.3607 7.05989 16.2618 7.17125 16.1688 7.28902C16.167 7.29082 16.1654 7.29322 16.164 7.29503C16.1234 7.3465 16.0837 7.39898 16.0441 7.45145C15.7639 7.81939 15.5195 8.21556 15.2255 8.57128C14.9971 8.84768 13.2887 10.4348 12.8777 10.7264C12.7587 10.8109 12.6237 10.8474 12.4723 10.835C12.2379 10.8161 12.0298 10.6821 11.8965 10.4903L11.5704 9.93024C10.8527 8.78318 9.87332 7.82299 8.71264 7.12778C7.87262 6.62466 7.12514 5.98092 6.50264 5.22503L5.35778 3.83421C5.3013 3.76571 5.19314 3.77693 5.15268 3.85585C5.02249 4.10941 4.77393 4.64479 4.58346 5.36483C4.57885 5.38186 4.58286 5.39988 4.59407 5.4135C4.83082 5.69952 5.37901 6.32983 6.03196 6.863C6.07742 6.90005 6.04017 6.97336 5.98369 6.95774C5.42047 6.80432 4.87288 6.55796 4.46308 6.34805C4.42964 6.33103 4.38918 6.35226 4.38437 6.38951C4.32068 6.89985 4.30425 7.46027 4.37155 8.05112C4.37355 8.07035 4.38577 8.08697 4.4036 8.09479C4.87088 8.29808 5.61816 8.59311 6.40269 8.78078C6.45958 8.7944 6.45777 8.87632 6.40029 8.88733C5.78941 9.0023 5.14968 9.02794 4.62973 9.02113C4.59327 9.02073 4.56643 9.05518 4.57625 9.09023C4.6806 9.45896 4.822 9.8339 5.00847 10.2115C5.08559 10.3811 5.16951 10.5475 5.25944 10.7104C5.27486 10.7382 5.3047 10.7548 5.33655 10.7534C5.76577 10.7324 6.28452 10.6871 6.80608 10.595C6.89501 10.5794 6.94268 10.6964 6.86757 10.7466C6.51345 10.9834 6.13571 11.1873 5.7844 11.3551C5.73733 11.3777 5.72211 11.4378 5.75315 11.4797C5.96186 11.7625 6.19139 12.0301 6.44075 12.2794C6.44075 12.2794 7.66853 13.5441 7.70198 13.6432C8.41841 12.9096 9.59612 12.0964 10.8966 11.3864C9.15488 12.8036 8.18387 13.8499 7.69517 14.4444L7.35447 14.9225C7.17742 15.1708 7.02379 15.4346 6.89541 15.7112C6.46579 16.6356 5.75756 18.5051 5.75756 18.5051C5.70328 18.6515 5.74754 18.7959 5.84168 18.89C5.84388 18.8922 5.84609 18.8944 5.84849 18.8964C5.85069 18.8986 5.8527 18.901 5.8549 18.9032C5.94924 18.9976 6.09345 19.0416 6.23986 18.9874C6.23986 18.9874 8.10897 18.2791 9.03371 17.8495C9.31031 17.7211 9.57429 17.5673 9.82245 17.3905L10.349 17.0153C10.6278 16.8166 11.0096 16.8483 11.2517 17.0904L12.4655 18.3042C12.7148 18.5535 12.9824 18.7831 13.2652 18.9918C13.3073 19.0226 13.3672 19.0076 13.3898 18.9605C13.5579 18.6094 13.7618 18.2313 13.9983 17.8774C14.0486 17.8022 14.1657 17.8501 14.1499 17.9388C14.0576 18.4606 14.0127 18.9794 13.9915 19.4084C13.9899 19.44 14.0067 19.4701 14.0345 19.4855C14.1972 19.5756 14.3636 19.6595 14.5335 19.7364C14.911 19.9229 15.2862 20.0645 15.6547 20.1687C15.6897 20.1785 15.7242 20.1516 15.7238 20.1152C15.7168 19.595 15.7424 18.9553 15.8576 18.3446C15.8684 18.2869 15.9503 18.2851 15.9641 18.3422C16.1516 19.127 16.4466 19.8742 16.6501 20.3413C16.6579 20.3591 16.6744 20.3712 16.6938 20.3734C17.2847 20.4407 17.8451 20.4242 18.3554 20.3606C18.3929 20.3559 18.4141 20.3155 18.3969 20.2818C18.187 19.872 17.9406 19.3241 17.7872 18.7612C17.7718 18.7046 17.8449 18.6675 17.8819 18.713C18.4151 19.3659 19.0454 19.9141 19.3314 20.1508C19.345 20.1621 19.3633 20.1659 19.3801 20.1615C20.1003 19.9712 20.6357 19.7226 20.8891 19.5922C20.968 19.5518 20.9792 19.4436 20.9107 19.3871L20.9093 19.3861Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/grok.svg b/packages/website/src/assets/agent-icons/grok.svg
new file mode 100644
index 0000000000..35db840319
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/grok.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">
+  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>
+  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/junie.svg b/packages/website/src/assets/agent-icons/junie.svg
new file mode 100644
index 0000000000..54ce5ff9a9
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/junie.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40" fill="none">
+  <path d="M25 15H35V16.75C35 29 30.5001 35 16.5001 35H15V25H16.5001C22.6251 25 25 22.875 25 16.75V15Z" fill="currentColor"/>
+  <rect x="5" y="15" width="10" height="10" fill="currentColor"/>
+  <rect x="15" y="5" width="10" height="10" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/kilo.svg b/packages/website/src/assets/agent-icons/kilo.svg
new file mode 100644
index 0000000000..8af6e96f34
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/kilo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">
+  <path fill="currentColor" d="M27.9998324,34.6666921h6.6666279v5.3333023h-8.3809037l-3.6190266-3.6190266v-8.3809037h5.3333023v6.6666279ZM39.9997627,26.2857884l-3.6190266-3.6190266h-8.3809037v5.3333023h6.6666279v6.6666279h5.3333023v-8.3809037ZM17.3332326,22.6667578h-5.3333023v5.3333023h5.3333023v-5.3333023ZM0,36.3809638l3.6190266,3.6190266h13.714206v-5.3333023H5.3333023v-11.9999302H0v13.714206ZM33.9600959,11.9999247V3.619021L30.3410693-.0000056h-7.6745392v5.3333023h5.9602634v6.6666279h-5.9602634v5.3333023h17.3332326v-5.3333023h-6.0396668ZM5.3333023,0H0v17.3332326h5.3333023v-5.9999651h6.6666279v5.9999651h5.3333023v-5.9999651l-5.3333023-5.3333023h-6.6666279V0ZM17.3332326,0h-5.3333023v5.9999651h5.3333023V0Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/kimi.svg b/packages/website/src/assets/agent-icons/kimi.svg
new file mode 100644
index 0000000000..4f7547cf79
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/kimi.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M19.514 7.342C19.711 7.862 19.814 8.413 19.816 8.969C19.816 12.494 15.998 14.697 12.946 12.934C11.529 12.116 10.657 10.605 10.657 8.969C10.657 5.646 14.085 3.431 17.115 4.793C15.26 3.373 12.99 2.607 10.655 2.612C4.772 2.614 0.005 7.381 0 13.265C0.002 19.148 4.772 23.918 10.655 23.92C16.538 23.916 21.306 19.147 21.31 13.265C21.312 11.155 20.687 9.095 19.514 7.342ZM14.841 4.666C14.841 8.191 18.657 10.395 21.709 8.632C23.127 7.814 24 6.302 24 4.666C24 1.14 20.184-1.061 17.13 0.699C15.714 1.519 14.841 3.03 14.841 4.666"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/minion-code.svg b/packages/website/src/assets/agent-icons/minion-code.svg
new file mode 100644
index 0000000000..eb3d8eb31d
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/minion-code.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect fill="none" stroke="currentColor" stroke-width="1.1" x="4.5" y="2.5" width="7" height="10" rx="3.5"/>
+  <line stroke="currentColor" stroke-width="1" x1="3" y1="5.5" x2="13" y2="5.5"/>
+  <circle fill="none" stroke="currentColor" stroke-width="1" cx="6.5" cy="5.5" r="1.6"/>
+  <circle fill="none" stroke="currentColor" stroke-width="1" cx="9.5" cy="5.5" r="1.6"/>
+  <circle fill="currentColor" cx="6.8" cy="5.6" r="0.55"/>
+  <circle fill="currentColor" cx="9.8" cy="5.6" r="0.55"/>
+  <path fill="none" stroke="currentColor" stroke-width="0.6" stroke-linecap="round" d="M7 8.3 Q8 9 9 8.3"/>
+  <path fill="none" stroke="currentColor" stroke-width="0.9" stroke-linecap="round" d="M4.5 8 L3 9.5"/>
+  <path fill="none" stroke="currentColor" stroke-width="0.9" stroke-linecap="round" d="M11.5 8 L13 9.5"/>
+  <line stroke="currentColor" stroke-width="0.7" x1="5" y1="9.5" x2="11" y2="9.5"/>
+  <line stroke="currentColor" stroke-width="0.9" x1="6.5" y1="12.5" x2="6.5" y2="14"/>
+  <line stroke="currentColor" stroke-width="0.9" x1="9.5" y1="12.5" x2="9.5" y2="14"/>
+  <line stroke="currentColor" stroke-width="0.9" stroke-linecap="round" x1="6.5" y1="14" x2="5.5" y2="14"/>
+  <line stroke="currentColor" stroke-width="0.9" stroke-linecap="round" x1="9.5" y1="14" x2="10.5" y2="14"/>
+  <line stroke="currentColor" stroke-width="0.7" stroke-linecap="round" x1="8" y1="2.5" x2="7.3" y2="0.8"/>
+  <line stroke="currentColor" stroke-width="0.7" stroke-linecap="round" x1="8" y1="2.5" x2="8" y2="0.5"/>
+  <line stroke="currentColor" stroke-width="0.7" stroke-linecap="round" x1="8" y1="2.5" x2="8.7" y2="0.8"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/mistral-vibe.svg b/packages/website/src/assets/agent-icons/mistral-vibe.svg
new file mode 100644
index 0000000000..b13631b96d
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/mistral-vibe.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.8147 5.35803H5.35791V8.46914H8.8147V5.35803Z" fill="currentColor"/>
+<path d="M22.6419 5.35803H19.1851V8.46914H22.6419V5.35803Z" fill="currentColor"/>
+<path d="M15.7283 15.7284H12.2715V18.8395H15.7283V15.7284Z" fill="currentColor"/>
+<path d="M8.8147 15.7284H5.35791V18.8395H8.8147V15.7284Z" fill="currentColor"/>
+<path d="M22.6419 15.7284H19.1851V18.8395H22.6419V15.7284Z" fill="currentColor"/>
+<path d="M12.2715 8.81482H5.35791V11.9259H12.2715V8.81482Z" fill="currentColor"/>
+<path d="M12.2718 19.1852H1.90137V22.2963H12.2718V19.1852Z" fill="currentColor"/>
+<path d="M26.0989 19.1852H15.7285V22.2963H26.0989V19.1852Z" fill="currentColor"/>
+<path d="M22.6419 12.2716H5.35791V15.3827H22.6419V12.2716Z" fill="currentColor"/>
+<path d="M22.6421 8.81482H15.7285V11.9259H22.6421V8.81482Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/nova.svg b/packages/website/src/assets/agent-icons/nova.svg
new file mode 100644
index 0000000000..5e19f58879
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/nova.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1"/>
+  <circle cx="8" cy="8" r="4.5" fill="none" stroke="currentColor" stroke-width="0.3" opacity="0.5"/>
+  <line x1="8" y1="8" x2="13.5" y2="13.5" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+  <polygon points="14.5,14.5 12.3,13.5 13.5,12.3" fill="currentColor"/>
+  <line x1="8" y1="8" x2="2.5" y2="2.5" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+  <polygon points="1.5,1.5 3.7,2.5 2.5,3.7" fill="currentColor"/>
+  <circle cx="8" cy="8" r="1.3" fill="currentColor"/>
+  <circle cx="8" cy="8" r="0.6" fill="none" stroke="currentColor" stroke-width="0.5" opacity="0.7"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/poolside.svg b/packages/website/src/assets/agent-icons/poolside.svg
new file mode 100644
index 0000000000..91de4c46d4
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/poolside.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.63653 5.50522L2.18735 5.28559C2.09852 5.46726 2.12787 5.68456 2.26172 5.83616C2.39558 5.98775 2.60757 6.04379 2.79884 5.97814L2.63653 5.50522ZM5.83578 6.94285L5.3732 7.13265L5.5645 7.59886L6.02919 7.40392L5.83578 6.94285ZM10.7441 9.44034L10.2614 9.57083L10.393 10.0573L10.8784 9.92198L10.7441 9.44034ZM2.5 8.24963C2.4998 7.97349 2.27577 7.74979 1.99963 7.75C1.72349 7.75021 1.4998 7.97423 1.5 8.25037L2.5 8.24963ZM13.4143 10.7751C12.0197 13.6273 8.57701 14.8089 5.72485 13.4143L5.28559 14.3126C8.63389 15.9498 12.6754 14.5627 14.3126 11.2144L13.4143 10.7751ZM3.08571 5.72485C4.48031 2.87269 7.92299 1.69111 10.7751 3.08571L11.2144 2.18735C7.86611 0.550151 3.82455 1.93728 2.18735 5.28559L3.08571 5.72485ZM10.7751 3.08571C13.6273 4.48031 14.8089 7.92299 13.4143 10.7751L14.3126 11.2144C15.9498 7.86611 14.5627 3.82455 11.2144 2.18735L10.7751 3.08571ZM2.79884 5.97814C3.02201 5.90155 3.54835 5.84926 4.09141 6.00587C4.61256 6.15616 5.10736 6.48476 5.3732 7.13265L6.29835 6.75304C5.89213 5.76303 5.11508 5.26032 4.3685 5.04503C3.64385 4.83605 2.9066 4.8839 2.47422 5.0323L2.79884 5.97814ZM6.02919 7.40392C6.25314 7.30998 6.55771 7.25841 6.85281 7.36034C7.13062 7.45631 7.49214 7.72014 7.78743 8.4398L8.71257 8.0602C8.3358 7.14195 7.79046 6.62626 7.17931 6.41515C6.58544 6.21001 6.01893 6.32381 5.64236 6.48177L6.02919 7.40392ZM6.26827 7.19375C6.80493 6.26869 8.18817 4.18684 11.1653 3.10654L10.8242 2.16652C7.53166 3.36127 5.99463 5.67263 5.40329 6.69195L6.26827 7.19375ZM14.3364 10.8325C14.1845 10.39 13.7564 9.79897 13.14 9.37995C12.504 8.94759 11.6302 8.67426 10.6099 8.9587L10.8784 9.92198C11.5634 9.73102 12.1368 9.90713 12.5779 10.207C13.0385 10.5201 13.3174 10.9441 13.3905 11.1571L14.3364 10.8325ZM11.2268 9.30984C11.1236 8.92833 10.8783 8.39265 10.3638 8.02453C9.82769 7.6409 9.08331 7.49864 8.11574 7.76836L8.38426 8.73164C9.1221 8.52595 9.53979 8.66454 9.78189 8.83777C10.0457 9.02651 10.1946 9.32371 10.2614 9.57083L11.2268 9.30984ZM11.216 9.60556C11.6225 8.44463 12.4244 5.47936 11.4712 2.48487L10.5183 2.78819C11.3726 5.47172 10.6545 8.18331 10.2722 9.27512L11.216 9.60556ZM7.80082 8.03037L5.05604 13.6438L5.9544 14.0831L8.69918 8.46963L7.80082 8.03037ZM5.72485 13.4143C3.68742 12.4181 2.50158 10.3763 2.5 8.24963L1.5 8.25037C1.50185 10.7441 2.89229 13.1424 5.28559 14.3126L5.72485 13.4143Z" fill="currentColor"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/qoder.svg b/packages/website/src/assets/agent-icons/qoder.svg
new file mode 100644
index 0000000000..417d83693d
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/qoder.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="currentColor" d="M8 1C4.134 1 1 4.134 1 8s3.134 7 7 7c1.5 0 2.9-.47 4.05-1.28l1.12 1.12a.75.75 0 1 0 1.06-1.06l-1.12-1.12A6.97 6.97 0 0 0 15 8c0-3.866-3.134-7-7-7Zm0 2c2.761 0 5 2.239 5 5s-2.239 5-5 5-5-2.239-5-5 2.239-5 5-5Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/qwen-code.svg b/packages/website/src/assets/agent-icons/qwen-code.svg
new file mode 100644
index 0000000000..6a33da557a
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/qwen-code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141.38 140" width="16" height="16"><path fill="currentColor" d="m140.93 85-16.35-28.33-1.93-3.34 8.66-15a3.323 3.323 0 0 0 0-3.34l-9.62-16.67c-.3-.51-.72-.93-1.22-1.22s-1.07-.45-1.67-.45H82.23l-8.66-15a3.33 3.33 0 0 0-2.89-1.67H51.43c-.59 0-1.17.16-1.66.45-.5.29-.92.71-1.22 1.22L32.19 29.98l-1.92 3.33H12.96c-.59 0-1.17.16-1.66.45-.5.29-.93.71-1.22 1.22L.45 51.66a3.323 3.323 0 0 0 0 3.34l18.28 31.67-8.66 15a3.32 3.32 0 0 0 0 3.34l9.62 16.67c.3.51.72.93 1.22 1.22s1.07.45 1.67.45h36.56l8.66 15a3.35 3.35 0 0 0 2.89 1.67h19.25a3.34 3.34 0 0 0 2.89-1.67l18.28-31.67h17.32c.6 0 1.17-.16 1.67-.45s.92-.71 1.22-1.22l9.62-16.67a3.323 3.323 0 0 0 0-3.34ZM51.44 3.33 61.07 20l-9.63 16.66h76.98l-9.62 16.66H45.67l-11.54-20zM57.21 120H22.58l9.63-16.67h19.25l-38.5-66.67h19.25l9.62 16.67L68.78 100l-11.55 20Zm61.59-33.34-9.62-16.67-38.49 66.67-9.63-16.67 9.63-16.66 26.94-46.67h23.1l17.32 30z"/></svg>
diff --git a/packages/website/src/assets/agent-icons/sigit.svg b/packages/website/src/assets/agent-icons/sigit.svg
new file mode 100644
index 0000000000..334fc95cba
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/sigit.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" standalone="no" ?>
+<svg
+    version="1.0"
+    xmlns="http://www.w3.org/2000/svg"
+    width="16"
+    height="16"
+    viewBox="0 0 1024 1024"
+    preserveAspectRatio="xMidYMid meet"
+>
+
+<g
+        transform="translate(0,1024) scale(0.1,-0.1)"
+        fill="currentColor"
+        stroke="none"
+    >
+<path
+            d="M6428 6358 c-104 -8 -227 -38 -314 -78 -73 -33 -196 -115 -239 -160
+-18 -19 -39 -30 -56 -30 -26 0 -27 1 -18 32 5 18 9 52 9 76 0 34 -6 49 -34 80
+l-34 37 -319 3 c-412 3 -383 18 -447 -236 -20 -78 -36 -154 -36 -168 0 -14 -5
+-35 -12 -47 -6 -12 -21 -60 -33 -107 l-22 -85 -22 43 c-47 91 -179 184 -310
+218 -146 37 -375 34 -536 -7 -203 -51 -365 -175 -443 -339 -68 -143 -109 -304
+-114 -445 l-2 -70 -127 5 c-70 3 -125 2 -123 -1 5 -8 -27 -21 -34 -14 -3 3 0
+5 7 5 7 0 9 5 6 10 -4 6 -11 8 -16 5 -5 -4 -15 -3 -21 2 -7 4 -17 8 -23 8 -5
+0 -10 7 -10 15 0 13 -142 15 -1205 18 -663 1 -1212 -1 -1220 -5 -8 -3 -19 -5
+-25 -4 -5 1 1 -8 15 -21 13 -13 29 -22 34 -20 5 2 3 -4 -4 -14 -13 -15 -15
+-14 -24 5 -5 13 -15 20 -24 16 -7 -3 -157 -5 -333 -5 l-319 0 0 -2540 0 -2540
+5120 0 5120 0 0 2540 0 2540 -685 1 c-377 1 -689 2 -694 3 -16 2 -25 16 -10
+16 11 0 11 2 -1 10 -8 5 -10 10 -4 10 5 0 16 -6 23 -12 11 -10 13 -10 7 0 -5
+8 1 12 18 12 14 0 27 -1 29 -2 1 -2 13 7 27 20 13 12 30 22 37 22 8 0 11 5 8
+10 -3 6 -2 10 2 10 5 0 9 8 9 18 1 9 18 82 38 161 20 79 36 158 36 176 0 42
+-38 97 -75 109 -17 6 -31 11 -32 11 -1 1 5 23 13 50 20 68 20 137 -2 169 -27
+43 -64 56 -155 56 -73 0 -80 2 -74 18 4 9 9 42 12 72 3 44 0 62 -17 88 -38 61
+-57 63 -396 60 l-304 -3 0 38 c0 29 -8 46 -34 75 l-34 37 -313 3 c-215 2 -321
+-1 -340 -8 -50 -21 -68 -52 -100 -177 l-31 -121 -28 16 c-16 9 -35 30 -43 47
+-23 48 -102 130 -168 174 -132 88 -315 126 -531 109z m296 -148 c43 -11 101
+-32 129 -47 67 -37 145 -115 170 -172 41 -92 33 -253 -25 -493 l-21 -88 -275
+0 -274 0 4 23 c3 12 22 91 42 175 25 102 36 170 34 205 -3 51 -4 52 -39 61
+-57 14 -98 -15 -128 -89 -36 -89 -321 -1238 -328 -1321 -5 -66 -4 -72 18 -88
+54 -38 118 -7 159 78 28 58 122 403 113 419 -2 4 -27 7 -54 7 -43 0 -50 3 -46
+18 3 9 20 79 38 154 l33 137 75 7 c79 7 558 1 566 -8 3 -3 -58 -260 -136 -572
+l-141 -566 -174 0 -174 0 0 29 c0 15 -3 49 -6 74 l-7 46 -61 -55 c-33 -30 -94
+-72 -135 -92 -74 -37 -76 -37 -201 -37 -126 0 -126 0 -202 38 -203 100 -254
+266 -179 592 66 287 235 944 271 1050 72 215 132 298 289 403 144 97 262 130
+462 131 95 1 145 -4 203 -19z m-1046 -37 c-3 -10 -18 -71 -33 -135 l-29 -118
+-273 0 c-213 0 -271 3 -268 13 2 6 13 50 25 97 11 46 25 101 31 122 l10 38
+271 0 c253 0 270 -1 266 -17z m2240 0 c-3 -10 -18 -71 -33 -135 l-29 -118
+-273 0 c-213 0 -271 3 -268 13 2 6 13 50 25 97 11 46 25 101 31 122 l10 38
+271 0 c253 0 270 -1 266 -17z m722 -139 c0 -3 -13 -59 -30 -124 -16 -65 -30
+-126 -30 -134 0 -13 13 -16 65 -16 45 0 65 -4 65 -12 0 -13 -31 -146 -51 -220
+l-10 -38 -72 0 -73 0 -132 -532 c-73 -293 -132 -552 -132 -574 0 -47 11 -54
+93 -54 26 0 47 -3 47 -7 0 -5 -15 -66 -33 -138 l-33 -130 -165 -3 c-326 -6
+-421 26 -459 155 -17 55 2 146 155 761 69 277 125 508 125 513 0 5 -25 9 -55
+9 l-55 0 7 28 c3 15 18 74 33 132 l26 105 59 5 59 5 34 138 34 137 264 0 c145
+0 264 -3 264 -6z m-4147 -223 c137 -36 218 -93 257 -183 27 -63 24 -128 -12
+-278 l-24 -95 -232 -3 c-143 -1 -232 1 -232 7 0 5 9 47 20 93 35 145 26 178
+-49 178 -65 0 -117 -79 -128 -195 -9 -104 10 -126 222 -252 211 -127 273 -191
+290 -305 14 -94 -44 -332 -112 -458 -105 -195 -319 -301 -607 -300 -253 1
+-438 89 -476 225 -17 61 -8 193 21 318 l22 97 234 0 233 0 -5 -22 c-3 -13 -14
+-61 -25 -108 -11 -47 -20 -106 -20 -132 0 -40 4 -50 25 -64 31 -20 85 -12 120
+19 32 28 64 120 72 203 8 82 7 82 -202 224 -178 120 -243 177 -277 242 -72
+138 33 532 175 650 70 59 97 75 175 105 101 38 184 51 328 52 99 1 149 -4 207
+-18z m1087 -20 c0 -7 -408 -1652 -426 -1718 l-6 -23 -269 0 c-173 0 -269 4
+-269 10 0 6 97 399 216 875 l216 865 269 0 c148 0 269 -4 269 -9z m2240 -1 c0
+-5 -97 -397 -215 -871 -118 -474 -215 -863 -215 -865 0 -2 -121 -4 -270 -4
+-174 0 -270 4 -270 10 0 6 97 399 216 875 l216 865 269 0 c166 0 269 -4 269
+-10z m1040 -742 c0 -5 -5 -6 -11 -2 -8 4 -9 -1 -4 -17 4 -13 4 -21 0 -17 -4 4
+-9 21 -11 39 -3 27 -2 30 11 19 8 -7 15 -17 15 -22z m-8192 4 c2 -7 -5 -12
+-15 -11 -12 0 -14 2 -4 6 11 5 11 7 0 15 -12 8 -12 9 0 6 8 -3 17 -10 19 -16z
+m1840 -1329 c-311 -2 -824 -2 -1140 0 -315 1 -60 2 567 2 627 0 885 -1 573 -2z
+m619 1 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z"
+        />
+<path
+            d="M900 6270 c0 -11 6 -20 14 -20 7 0 16 -9 19 -20 5 -20 12 -20 1803
+-18 1731 3 1799 4 1802 21 3 12 -4 20 -17 24 -12 3 -21 12 -21 19 0 12 -274
+14 -1800 14 -1793 0 -1800 0 -1800 -20z"
+        />
+<path
+            d="M900 6005 c0 -15 6 -25 14 -25 7 0 16 -9 19 -20 5 -20 12 -20 1334
+-18 l1328 3 3 23 c3 17 -2 22 -17 22 -14 0 -21 6 -21 20 0 20 -7 20 -1330 20
+l-1330 0 0 -25z"
+        />
+<path
+            d="M737 5713 c-12 -12 -7 -43 7 -43 7 0 16 -9 19 -20 5 -20 12 -20 1323
+-18 1248 3 1319 4 1322 21 2 9 -4 20 -14 24 -10 3 -26 15 -35 24 -17 17 -83
+18 -1317 19 -714 0 -1302 -3 -1305 -7z"
+        />
+<path
+            d="M1953 5412 c-1265 -2 -1273 -2 -1273 -22 0 -11 6 -20 14 -20 7 0 16
+-9 19 -20 5 -20 12 -20 1298 -18 1242 3 1294 4 1297 21 3 12 -4 20 -17 24 -12
+3 -21 11 -21 18 0 7 -10 14 -22 16 -13 2 -596 3 -1295 1z"
+        />
+<path d="M9010 5130 c-12 -7 -10 -9 7 -7 12 0 19 5 17 9 -6 10 -6 10 -24 -2z" />
+<path
+            d="M3180 5109 c0 -5 5 -7 10 -4 6 3 10 8 10 11 0 2 -4 4 -10 4 -5 0 -10
+-5 -10 -11z"
+        />
+</g>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/stakpak.svg b/packages/website/src/assets/agent-icons/stakpak.svg
new file mode 100644
index 0000000000..64425076ed
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/stakpak.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="currentColor" d="M6.53 4.412h5.883v3.587H9.471v3.588H3.588V7.999H6.53Z"/>
+</svg>
diff --git a/packages/website/src/assets/agent-icons/vtcode.svg b/packages/website/src/assets/agent-icons/vtcode.svg
new file mode 100644
index 0000000000..5ae616428c
--- /dev/null
+++ b/packages/website/src/assets/agent-icons/vtcode.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path d="M0.5 5.5L2.5 8 0.5 10.5" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+  <text x="3.2" y="11.5" font-family="'SF Mono', 'Fira Code', 'Consolas', monospace" font-size="10" font-weight="600" letter-spacing="-0.5" fill="currentColor">VT</text>
+</svg>
diff --git a/packages/website/src/components/agent-icons.tsx b/packages/website/src/components/agent-icons.tsx
index 7b6b66146d..fda21cf176 100644
--- a/packages/website/src/components/agent-icons.tsx
+++ b/packages/website/src/components/agent-icons.tsx
@@ -1,4 +1,4 @@
-// Agent provider brand marks, shared by the landing page and the Hub page.
+// Agent provider brand marks, shared by the landing page, the Hub page, and /agents.
 
 import type * as React from "react";
 
@@ -82,3 +82,51 @@ export function PiIcon(props: React.SVGProps<SVGSVGElement>) {
     </svg>
   );
 }
+
+export function OmpIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="4 4 56 56"
+      fill="currentColor"
+      aria-hidden="true"
+      {...props}
+    >
+      <path d="M10 14h44v9H43v33h-9V23h-9v22h-9V23H10z" />
+    </svg>
+  );
+}
+
+export function MuseCodeIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="currentColor"
+      aria-hidden="true"
+      {...props}
+    >
+      <path
+        transform="scale(0.24)"
+        d="M24.6257 16.1214C28.2365 16.1214 30.8187 18.9408 30.8187 23.3643C30.8185 27.7868 30.1055 31.7765 28.9225 40.2466C28.0743 46.1813 26.62 55.2418 26.0132 59.0088C27.1782 56.7815 29.9074 51.5757 30.3914 50.5982C36.1081 39.061 42.0657 28.7544 43.7826 26.0254C46.0594 22.382 48.062 20.9229 51.1597 20.9229C52.7685 20.923 54.6826 21.7357 55.6315 22.819C56.9178 24.2895 57.1859 26.6602 57.1411 29.244C57.0738 33.2073 56.5599 39.5264 55.8553 46.5698C55.5416 49.7057 54.9365 56.1066 54.5288 60.4004C58.1883 53.8532 64.9609 41.8109 67.6921 37.6058C70.0727 33.9402 72.466 31.5797 75.6836 31.5796C78.4595 31.5796 81.8809 33.5416 81.6772 38.7573C81.3774 46.4556 80.2673 63.2232 79.7607 70.7479C83.1662 65.7913 87.6377 58.4543 89.3148 55.6966C91.0104 52.908 92.75 50.6542 95.3898 50.5778C98.0987 50.4995 99.913 52.341 99.9959 55.1839C100.078 58.0277 98.3835 61.2256 96.1344 64.856C93.6937 68.7957 90.9621 73.0123 87.6383 76.9491C84.3148 80.8856 81.2604 83.8782 76.5991 83.8786C72.4243 83.8786 69.4869 81.1043 69.283 76.0254C69.1768 73.364 69.6804 67.6405 70.0602 63.1673C70.5 57.9875 71.0315 52.9861 71.403 49.6786C67.7337 56.3979 60.0101 70.4676 56.5348 75.9603C53.1343 81.3339 51.4774 83.2269 47.8882 83.2275C44.2977 83.2275 42.7226 80.6416 42.6717 76.7497C42.6142 72.5285 45.7852 47.1821 46.8587 38.737C45.1183 42.4616 40.839 51.6056 38.1551 57.0435C35.5587 62.3055 31.204 71.3978 28.0436 76.6357C25.7668 80.4094 23.2092 83.2273 19.4173 83.2275C15.6252 83.2275 13.4847 80.6784 13.4847 76.5788C13.4847 72.4794 14.6716 65.6492 15.9465 57.1777C16.5839 53.0781 17.3108 48.6133 18.1315 43.8761C18.7324 40.448 19.7764 34.4169 20.4183 30.7129C17.502 35.2539 12.2536 43.4278 10.6567 45.8903C8.88113 48.6291 7.28747 50.626 4.64681 50.6266C1.7329 50.6266 0.000532901 48.3522 0 45.7113C0 43.0703 1.34323 41.0344 3.52376 37.4512C6.32403 32.8465 11.3578 26.57 14.1154 23.2747C17.3656 19.3912 20.6139 16.1219 24.6257 16.1214Z"
+      />
+    </svg>
+  );
+}
+
+export function AntigravityIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="currentColor"
+      aria-hidden="true"
+      {...props}
+    >
+      <path
+        transform="translate(12 12) scale(0.24) translate(-55.738 -56.945)"
+        d="M89.6992 93.695C94.3659 97.195 101.366 94.8617 94.9492 88.445C75.6992 69.7783 79.7825 18.445 55.8659 18.445C31.9492 18.445 36.0325 69.7783 16.7825 88.445C9.78251 95.445 17.3658 97.195 22.0325 93.695C40.1159 81.445 38.9492 59.8617 55.8659 59.8617C72.7825 59.8617 71.6159 81.445 89.6992 93.695Z"
+      />
+    </svg>
+  );
+}
diff --git a/packages/website/src/components/agent-page-icon.tsx b/packages/website/src/components/agent-page-icon.tsx
new file mode 100644
index 0000000000..e0f7a2601e
--- /dev/null
+++ b/packages/website/src/components/agent-page-icon.tsx
@@ -0,0 +1,57 @@
+// The mark for any agent page. Only /agents needs every agent's mark, so the
+// vendored SVG set lives here instead of in agent-icons, keeping it out of the
+// homepage and agent landing page bundles.
+
+import { Bot } from "lucide-react";
+import type * as React from "react";
+import {
+  AntigravityIcon,
+  ClaudeCodeIcon,
+  CodexIcon,
+  CursorIcon,
+  MuseCodeIcon,
+  OmpIcon,
+  OpenCodeIcon,
+  PiIcon,
+} from "~/components/agent-icons";
+const AGENT_PAGE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
+  "claude-code": ClaudeCodeIcon,
+  codex: CodexIcon,
+  opencode: OpenCodeIcon,
+  pi: PiIcon,
+  omp: OmpIcon,
+  cursor: CursorIcon,
+  "muse-code": MuseCodeIcon,
+  antigravity: AntigravityIcon,
+};
+
+// Marks vendored from the app's ACP provider catalog, named by agent page slug.
+const VENDORED_AGENT_PAGE_SVGS = import.meta.glob("../assets/agent-icons/*.svg", {
+  eager: true,
+  query: "?raw",
+  import: "default",
+}) as Record<string, string>;
+
+const VENDORED_AGENT_PAGE_MARKUP = new Map(
+  Object.entries(VENDORED_AGENT_PAGE_SVGS).map(([path, svg]) => [
+    path.slice(path.lastIndexOf("/") + 1, -".svg".length),
+    { __html: svg },
+  ]),
+);
+
+/** The mark for an agent page, falling back to a generic bot for agents without one. */
+export function AgentPageIcon({ slug, className }: { slug: string; className?: string }) {
+  const Icon = AGENT_PAGE_ICONS[slug];
+  if (Icon) return <Icon className={className} />;
+  const markup = VENDORED_AGENT_PAGE_MARKUP.get(slug);
+  if (markup) {
+    return (
+      <span
+        aria-hidden="true"
+        className={`inline-flex [&>svg]:h-full [&>svg]:w-full ${className ?? ""}`}
+        dangerouslySetInnerHTML={markup}
+      />
+    );
+  }
+  return <Bot className={className} strokeWidth={1.5} aria-hidden="true" />;
+}
diff --git a/packages/website/src/components/alternative-page.tsx b/packages/website/src/components/alternative-page.tsx
index ec583fefaf..3322f869e1 100644
--- a/packages/website/src/components/alternative-page.tsx
+++ b/packages/website/src/components/alternative-page.tsx
@@ -32,7 +32,9 @@ function AlternativePageContent({ slug }: { slug: string }) {
 
   return (
     <SiteShell width="default">
-      <DocsMarkdown>{page.content}</DocsMarkdown>
+      <div className="comparison-prose">
+        <DocsMarkdown>{page.content}</DocsMarkdown>
+      </div>
     </SiteShell>
   );
 }
diff --git a/packages/website/src/components/brand-icons.tsx b/packages/website/src/components/brand-icons.tsx
index 0b48a9d5fe..4e964be8e5 100644
--- a/packages/website/src/components/brand-icons.tsx
+++ b/packages/website/src/components/brand-icons.tsx
@@ -44,3 +44,39 @@ export function SlackIcon(props: React.SVGProps<SVGSVGElement>) {
     </svg>
   );
 }
+
+export function OpenCollectiveIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 39.98 40.05"
+      fill="currentColor"
+      {...props}
+    >
+      <path d="M32.76 19.97c0 2.53-.73 4.94-2 6.94l5.14 5.16c2.5-3.36 4.08-7.57 4.08-12.1 0-4.5-1.57-8.7-4.08-12.08l-5.13 5.16c1.26 2 2 4.3 2 6.93z" />
+      <path d="M20 32.8c-7.02 0-12.78-5.78-12.78-12.83 0-7.04 5.76-12.82 12.77-12.82 2.6 0 4.9.73 6.9 2.1l5.13-5.15C28.68 1.58 24.5 0 20 0 9 0 0 8.94 0 20.08s9 19.97 20 19.97c4.6 0 8.8-1.57 12.14-4.1L27 30.8c-1.98 1.26-4.4 2-7 2z" />
+    </svg>
+  );
+}
+
+export function BuyMeACoffeeIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" {...props}>
+      <path d="M20.216 6.415l-.132-.666c-.119-.598-.388-1.163-1.001-1.379-.197-.069-.42-.098-.57-.241-.152-.143-.196-.366-.231-.572-.065-.378-.125-.756-.192-1.133-.057-.325-.102-.69-.25-.987-.195-.4-.597-.634-.996-.788a5.723 5.723 0 00-.626-.194c-1-.263-2.05-.36-3.077-.416a25.834 25.834 0 00-3.7.062c-.915.083-1.88.184-2.75.5-.318.116-.646.256-.888.501-.297.302-.393.77-.177 1.146.154.267.415.456.692.58.36.162.737.284 1.123.366 1.075.238 2.189.331 3.287.37 1.218.05 2.437.01 3.65-.118.299-.033.598-.073.896-.119.352-.054.578-.513.474-.834-.124-.383-.457-.531-.834-.473-.466.074-.96.108-1.382.146-1.177.08-2.358.082-3.536.006a22.228 22.228 0 01-1.157-.107c-.086-.01-.18-.025-.258-.036-.243-.036-.484-.08-.724-.13-.111-.027-.111-.185 0-.212h.005c.277-.06.557-.108.838-.147h.002c.131-.009.263-.032.394-.048a25.076 25.076 0 013.426-.12c.674.019 1.347.067 2.017.144l.228.031c.267.04.533.088.798.145.392.085.895.113 1.07.542.055.137.08.288.111.431l.319 1.484a.237.237 0 01-.199.284h-.003c-.037.006-.075.01-.112.015a36.704 36.704 0 01-4.743.295 37.059 37.059 0 01-4.699-.304c-.14-.017-.293-.042-.417-.06-.326-.048-.649-.108-.973-.161-.393-.065-.768-.032-1.123.161-.29.16-.527.404-.675.701-.154.316-.199.66-.267 1-.069.34-.176.707-.135 1.056.087.753.613 1.365 1.37 1.502a39.69 39.69 0 0011.343.376.483.483 0 01.535.53l-.071.697-1.018 9.907c-.041.41-.047.832-.125 1.237-.122.637-.553 1.028-1.182 1.171-.577.131-1.165.2-1.756.205-.656.004-1.31-.025-1.966-.022-.699.004-1.556-.06-2.095-.58-.475-.458-.54-1.174-.605-1.793l-.731-7.013-.322-3.094c-.037-.351-.286-.695-.678-.678-.336.015-.718.3-.678.679l.228 2.185.949 9.112c.147 1.344 1.174 2.068 2.446 2.272.742.12 1.503.144 2.257.156.966.016 1.942.053 2.892-.122 1.408-.258 2.465-1.198 2.616-2.657.34-3.332.683-6.663 1.024-9.995l.215-2.087a.484.484 0 01.39-.426c.402-.078.787-.212 1.074-.518.455-.488.546-1.124.385-1.766zm-1.478.772c-.145.137-.363.201-.578.233-2.416.359-4.866.54-7.308.46-1.748-.06-3.477-.254-5.207-.498-.17-.024-.353-.055-.47-.18-.22-.236-.111-.71-.054-.995.052-.26.152-.609.463-.646.484-.057 1.046.148 1.526.22.577.088 1.156.159 1.737.212 2.48.226 5.002.19 7.472-.14.45-.06.899-.13 1.345-.21.399-.072.84-.206 1.08.206.166.281.188.657.162.974a.544.544 0 01-.169.364zm-6.159 3.9c-.862.37-1.84.788-3.109.788a5.884 5.884 0 01-1.569-.217l.877 9.004c.065.78.717 1.38 1.5 1.38 0 0 1.243.065 1.658.065.447 0 1.786-.065 1.786-.065.783 0 1.434-.6 1.499-1.38l.94-9.95a3.996 3.996 0 00-1.322-.238c-.826 0-1.491.284-2.26.613z" />
+    </svg>
+  );
+}
+
+export function RedditIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="currentColor"
+      aria-hidden="true"
+      {...props}
+    >
+      <path d="M12 0C5.373 0 0 5.373 0 12c0 3.314 1.343 6.314 3.515 8.485l-2.286 2.286C.775 23.225 1.097 24 1.738 24H12c6.627 0 12-5.373 12-12S18.627 0 12 0Zm4.388 3.199c1.104 0 1.999.895 1.999 1.999 0 1.105-.895 2-1.999 2-.946 0-1.739-.657-1.947-1.539v.002c-1.147.162-2.032 1.15-2.032 2.341v.007c1.776.067 3.4.567 4.686 1.363.473-.363 1.064-.58 1.707-.58 1.547 0 2.802 1.254 2.802 2.802 0 1.117-.655 2.081-1.601 2.531-.088 3.256-3.637 5.876-7.997 5.876-4.361 0-7.905-2.617-7.998-5.87-.954-.447-1.614-1.415-1.614-2.538 0-1.548 1.255-2.802 2.803-2.802.645 0 1.239.218 1.712.585 1.275-.79 2.881-1.291 4.64-1.365v-.01c0-1.663 1.263-3.034 2.88-3.207.188-.911.993-1.595 1.959-1.595Zm-8.085 8.376c-.784 0-1.459.78-1.506 1.797-.047 1.016.64 1.429 1.426 1.429.786 0 1.371-.369 1.418-1.385.047-1.017-.553-1.841-1.338-1.841Zm7.406 0c-.786 0-1.385.824-1.338 1.841.047 1.017.634 1.385 1.418 1.385.785 0 1.473-.413 1.426-1.429-.046-1.017-.721-1.797-1.506-1.797Zm-3.703 4.013c-.974 0-1.907.048-2.77.135-.147.015-.241.168-.183.305.483 1.154 1.622 1.964 2.953 1.964 1.33 0 2.47-.81 2.953-1.964.057-.137-.037-.29-.184-.305-.863-.087-1.795-.135-2.769-.135Z" />
+    </svg>
+  );
+}
diff --git a/packages/website/src/components/breadcrumbs.tsx b/packages/website/src/components/breadcrumbs.tsx
new file mode 100644
index 0000000000..240f34047b
--- /dev/null
+++ b/packages/website/src/components/breadcrumbs.tsx
@@ -0,0 +1,32 @@
+import { Link } from "@tanstack/react-router";
+import { ChevronRight } from "lucide-react";
+
+export interface BreadcrumbItem {
+  label: string;
+  /** Internal path. The last item is the current page and has no href. */
+  href?: string;
+}
+
+export function Breadcrumbs({ items }: { items: BreadcrumbItem[] }) {
+  return (
+    <nav aria-label="Breadcrumb" className="not-prose mb-6">
+      <ol className="flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
+        {items.map((item, index) => {
+          const last = index === items.length - 1;
+          return (
+            <li key={`${item.href ?? ""}#${item.label}`} className="flex items-center gap-2">
+              {index > 0 && <ChevronRight size={14} className="text-border" />}
+              {item.href && !last ? (
+                <Link to={item.href} className="hover:text-foreground transition-colors">
+                  {item.label}
+                </Link>
+              ) : (
+                <span className={last ? "text-foreground" : undefined}>{item.label}</span>
+              )}
+            </li>
+          );
+        })}
+      </ol>
+    </nav>
+  );
+}
diff --git a/packages/website/src/components/docs-breadcrumbs.tsx b/packages/website/src/components/docs-breadcrumbs.tsx
index 7b82e7b4fb..0da4f4472a 100644
--- a/packages/website/src/components/docs-breadcrumbs.tsx
+++ b/packages/website/src/components/docs-breadcrumbs.tsx
@@ -1,5 +1,5 @@
-import { Link } from "@tanstack/react-router";
-import { ChevronRight } from "lucide-react";
+import { useMemo } from "react";
+import { type BreadcrumbItem, Breadcrumbs } from "~/components/breadcrumbs";
 import { type Doc, type DocsNavNode, getDocBreadcrumbGroups } from "~/docs";
 
 interface DocsBreadcrumbsProps {
@@ -8,27 +8,13 @@ interface DocsBreadcrumbsProps {
 }
 
 export function DocsBreadcrumbs({ doc, tree }: DocsBreadcrumbsProps) {
-  const groups = getDocBreadcrumbGroups(doc, tree);
-
-  return (
-    <nav aria-label="Breadcrumb" className="not-prose mb-6">
-      <ol className="flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
-        <li>
-          <Link to="/docs" className="hover:text-foreground transition-colors">
-            Docs
-          </Link>
-        </li>
-        {groups.map((group) => (
-          <li key={group.label} className="flex items-center gap-2">
-            <ChevronRight size={14} className="text-border" />
-            <span>{group.label}</span>
-          </li>
-        ))}
-        <li className="flex items-center gap-2">
-          <ChevronRight size={14} className="text-border" />
-          <span className="text-foreground">{doc.frontmatter.nav}</span>
-        </li>
-      </ol>
-    </nav>
+  const items = useMemo<BreadcrumbItem[]>(
+    () => [
+      { label: "Docs", href: "/docs" },
+      ...getDocBreadcrumbGroups(doc, tree).map((group) => ({ label: group.label })),
+      { label: doc.frontmatter.nav },
+    ],
+    [doc, tree],
   );
+  return <Breadcrumbs items={items} />;
 }
diff --git a/packages/website/src/components/faq-item.tsx b/packages/website/src/components/faq-item.tsx
index 217e4d1281..7813f9ddbf 100644
--- a/packages/website/src/components/faq-item.tsx
+++ b/packages/website/src/components/faq-item.tsx
@@ -3,12 +3,14 @@ import type { ReactNode } from "react";
 export function FAQItem({ question, children }: { question: string; children: ReactNode }) {
   return (
     <details className="group">
-      <summary className="font-medium text-sm cursor-pointer list-none flex items-start gap-2 -ml-4">
-        <span className="font-mono text-white/40 flex-shrink-0 group-open:hidden">+</span>
-        <span className="font-mono text-white/40 flex-shrink-0 hidden group-open:inline">−</span>
+      <summary className="font-medium text-sm cursor-pointer list-none grid grid-cols-[1.25rem_1fr] items-baseline">
+        <span className="font-mono text-lg leading-none text-white/40 group-open:hidden">+</span>
+        <span className="font-mono text-lg leading-none text-white/40 hidden group-open:inline">
+          −
+        </span>
         {question}
       </summary>
-      <div className="text-sm text-muted-foreground space-y-2 mt-2 prose">{children}</div>
+      <div className="text-sm text-muted-foreground space-y-2 mt-2 pl-5 prose">{children}</div>
     </details>
   );
 }
diff --git a/packages/website/src/components/hero-mockup.tsx b/packages/website/src/components/hero-mockup.tsx
index 4204a8d036..eeffc41d79 100644
--- a/packages/website/src/components/hero-mockup.tsx
+++ b/packages/website/src/components/hero-mockup.tsx
@@ -7,22 +7,12 @@ import {
   MOCKUP_STATES,
   type MockupStateId,
   MockupWindow,
+  ScaledMockup,
 } from "~/components/mockup";
 
 const ALT =
   "Paseo desktop app with coding agents, a conversation, and a code diff open side by side";
 
-const ASPECT_STYLE = { aspectRatio: `${DESIGN_WIDTH} / ${DESIGN_HEIGHT}` };
-
-// `tan(atan2(a, b))` is the CSS way to divide one length by another, so the scale
-// factor tracks the container with no JS, no layout thrash, and a correct
-// server-rendered first paint.
-const SCALE_STYLE = {
-  width: DESIGN_WIDTH,
-  height: DESIGN_HEIGHT,
-  transform: `scale(tan(atan2(100cqw, ${DESIGN_WIDTH}px)))`,
-};
-
 const PILL_TRANSITION = { duration: 0.34, ease: [0.22, 0.61, 0.36, 1] as const };
 
 export function HeroMockup() {
@@ -42,21 +32,15 @@ export function HeroMockup() {
         ))}
       </div>
 
-      <div className="overflow-hidden rounded-xl ring-1 ring-white/10 sm:rounded-2xl">
-        {/* The window is authored at DESIGN_WIDTH and scaled to fit the hero column. */}
-        <div className="w-full [container-type:inline-size]">
-          <div
-            className="relative w-full overflow-hidden rounded-xl sm:rounded-2xl"
-            style={ASPECT_STYLE}
-            role="img"
-            aria-label={ALT}
-          >
-            <div className="absolute top-0 left-0 origin-top-left" style={SCALE_STYLE}>
-              <MockupWindow state={state} />
-            </div>
-          </div>
-        </div>
-      </div>
+      <ScaledMockup
+        width={DESIGN_WIDTH}
+        height={DESIGN_HEIGHT}
+        borderRadius={18}
+        label={ALT}
+        className="ring-1 ring-white/10"
+      >
+        <MockupWindow state={state} />
+      </ScaledMockup>
     </div>
   );
 }
diff --git a/packages/website/src/components/landing-page.tsx b/packages/website/src/components/landing-page.tsx
index 638609fcf1..a5b573a1d6 100644
--- a/packages/website/src/components/landing-page.tsx
+++ b/packages/website/src/components/landing-page.tsx
@@ -1,17 +1,24 @@
+import { PLUGINS_LINKED } from "~/plugins/launch";
 import * as React from "react";
 import {
   ArrowRight,
+  Blocks,
   Bot,
-  BookOpen,
   Braces,
+  Compass,
   ExternalLink,
+  Gem,
   GitFork,
+  LayoutPanelLeft,
   Laptop,
+  Lock,
+  Merge,
   Monitor,
   Puzzle,
   Smartphone,
   Terminal,
   Users,
+  Workflow,
   type LucideIcon,
 } from "lucide-react";
 import {
@@ -67,16 +74,20 @@ import { isMobilePlatform } from "~/platform";
 import { useRelease, useVisitorPlatform } from "~/routes/__root";
 import { HeroMockup } from "~/components/hero-mockup";
 import {
+  AntigravityIcon,
   ClaudeCodeIcon,
   CodexIcon,
   CursorIcon,
+  MuseCodeIcon,
+  OmpIcon,
   OpenCodeIcon,
   PiIcon,
 } from "~/components/agent-icons";
 import { DiscordIcon, GitHubIcon, SlackIcon } from "~/components/brand-icons";
-import { ClaudeIcon, MobileChat, MobileDiff, MobileSidebar, PhoneFrame } from "~/components/mockup";
+import { MobileChat, MobileDiff, MobileSidebar, PhoneFrame } from "~/components/mockup";
 import { FAQItem } from "~/components/faq-item";
 import { SiteFooter } from "~/components/site-footer";
+import { SponsorSection, SponsorsSection } from "~/components/sponsorship";
 import { SiteHeader } from "~/components/site-header";
 import "~/styles.css";
 
@@ -122,7 +133,9 @@ export function LandingPage({ title, subtitle }: LandingPageProps) {
             <AutomationSection />
             <ExtensibleSection />
             <FAQ />
-            <SponsorCTA />
+            <PhilosophySection />
+            <SponsorSection />
+            <SponsorsSection />
           </div>
         </main>
         <SiteFooter />
@@ -150,14 +163,18 @@ function Hero({ title, subtitle }: { title: React.ReactNode; subtitle: React.Rea
   );
 }
 
-const CLAUDE_CODE_BADGE_ICON = <ClaudeCodeIcon className="h-6 w-6" />;
-const CODEX_BADGE_ICON = <CodexIcon className="h-6 w-6" />;
-const OPENCODE_BADGE_ICON = <OpenCodeIcon className="h-6 w-6" />;
-const PI_BADGE_ICON = <PiIcon className="h-6 w-6" />;
-const CURSOR_BADGE_ICON = <CursorIcon className="h-6 w-6" />;
+const FEATURED_AGENTS = [
+  { name: "Claude Code", Icon: ClaudeCodeIcon },
+  { name: "Codex", Icon: CodexIcon },
+  { name: "OpenCode", Icon: OpenCodeIcon },
+  { name: "Pi", Icon: PiIcon },
+  { name: "OMP", Icon: OmpIcon },
+  { name: "Cursor", Icon: CursorIcon },
+  { name: "Muse Code", Icon: MuseCodeIcon },
+  { name: "Antigravity", Icon: AntigravityIcon },
+] as const;
 
-const FEATURED_AGENT_COUNT = 5;
-const ADDITIONAL_AGENT_COUNT = AGENT_PAGES.length - FEATURED_AGENT_COUNT;
+const ADDITIONAL_AGENT_COUNT = AGENT_PAGES.length - FEATURED_AGENTS.length;
 
 const SOCIAL_PROOF_TWEETS = [
   {
@@ -241,7 +258,7 @@ const SOCIAL_PROOF_ROWS = [
 
 type SocialProofTweet = (typeof SOCIAL_PROOF_TWEETS)[number];
 
-function AgentBadge({ name, icon }: { name: string; icon: React.ReactNode }) {
+function AgentBadge({ name, Icon }: (typeof FEATURED_AGENTS)[number]) {
   const [hovered, setHovered] = React.useState(false);
   const handleMouseEnter = React.useCallback(() => setHovered(true), []);
   const handleMouseLeave = React.useCallback(() => setHovered(false), []);
@@ -252,7 +269,7 @@ function AgentBadge({ name, icon }: { name: string; icon: React.ReactNode }) {
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
     >
-      {icon}
+      <Icon className="h-6 w-6" />
       <AnimatePresence>
         {hovered && (
           <motion.span
@@ -416,30 +433,22 @@ function SocialProofCard({ tweet, inert }: { tweet: SocialProofTweet; inert?: bo
   );
 }
 
-const PROVIDER_ICON_CLASS = "h-5 w-5 sm:h-7 sm:w-7";
-
 function MultiProviderSection() {
-  const providers = [
-    { name: "Claude Code", icon: <ClaudeIcon className={PROVIDER_ICON_CLASS} /> },
-    { name: "Codex", icon: <CodexIcon className={PROVIDER_ICON_CLASS} /> },
-    { name: "OpenCode", icon: <OpenCodeIcon className={PROVIDER_ICON_CLASS} /> },
-    { name: "Pi", icon: <PiIcon className={PROVIDER_ICON_CLASS} /> },
-    { name: "Cursor", icon: <CursorIcon className={PROVIDER_ICON_CLASS} /> },
-  ];
-
   return (
     <FeatureSection
       title="Works with your tools"
       description="Bring your subscriptions, skills and configuration"
     >
       <div className="grid grid-cols-2 gap-2 sm:grid-cols-3 sm:gap-4">
-        {providers.map((p) => (
+        {FEATURED_AGENTS.map((agent) => (
           <div
-            key={p.name}
+            key={agent.name}
             className="flex items-center justify-center gap-2 rounded-xl border border-white/10 bg-white/[0.03] px-3 py-3 sm:gap-3 sm:px-5 sm:py-4"
           >
-            <span className="shrink-0 text-white/80">{p.icon}</span>
-            <span className="truncate text-sm font-medium sm:text-base">{p.name}</span>
+            <span className="shrink-0 text-white/80">
+              <agent.Icon className="h-5 w-5 sm:h-7 sm:w-7" />
+            </span>
+            <span className="truncate text-sm font-medium sm:text-base">{agent.name}</span>
           </div>
         ))}
         <a
@@ -468,7 +477,7 @@ function TurnkeySection() {
             <div className="space-y-0.5">
               <h3 className="text-xl font-medium text-white/90">Desktop app</h3>
               <p className="max-w-lg text-sm leading-relaxed text-white/50">
-                The one click experience, download the app and it just works
+                The one click experience, download the app and it just works, no server required
               </p>
             </div>
           </div>
@@ -478,8 +487,8 @@ function TurnkeySection() {
           <div className="grid gap-4 md:grid-cols-3">
             <TurnkeyExtensionCard
               icon={Smartphone}
-              title="Mobile and web"
-              description="Connect to the same workspaces from any client"
+              title="Mobile"
+              description="Full client and native, not a WebView"
               ctaHref="/download"
               ctaLabel="Download"
             />
@@ -784,67 +793,166 @@ function SdkAutomationExample() {
 
 function ExtensibleSection() {
   return (
-    <FeatureSection title="Make it yours" description="Extend Paseo to work just the way you want">
-      <div className="grid gap-4 md:grid-cols-2">
-        <ExtensibleCard
-          icon={Puzzle}
-          title="Plugins"
-          description="Plugins can add server-side functionality and modify the client with custom components. They work across all clients, including mobile"
-          href="/docs/plugins"
-          linkLabel="Plugin documentation"
-          linkIcon="book"
-        />
-        <ExtensibleCard
-          icon={GitFork}
-          title="Fork the repo"
-          description="Paseo is licensed under Apache 2.0. You can inspect the implementation, fork the project, and adapt it to your workflow or organization"
-          href="https://github.com/getpaseo/paseo"
-          linkLabel="View the repository"
-          linkIcon="github"
-          external
-        />
+    <FeatureSection
+      title="Extend it with plugins"
+      description="Add new panels and functionality that work in desktop, web and mobile"
+    >
+      <div className="overflow-hidden rounded-2xl border border-white/10 bg-white/[0.02]">
+        <div className="flex flex-col gap-6 border-b border-white/10 p-6 sm:flex-row sm:items-center sm:justify-between md:p-8">
+          <div className="flex items-center gap-4">
+            <div className="rounded-xl border border-white/10 bg-white/[0.06] p-3 text-muted-foreground">
+              <Puzzle className="h-6 w-6" strokeWidth={1.5} />
+            </div>
+            <h3 className="text-xl font-medium text-white/90">Plugins</h3>
+          </div>
+          <div className="flex shrink-0 items-center gap-3">
+            <a
+              href={PLUGINS_BROWSE.href}
+              {...(PLUGINS_BROWSE.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+              className="inline-flex items-center gap-1.5 rounded-full bg-foreground px-3 py-1.5 text-xs text-background transition-colors hover:bg-foreground/90"
+            >
+              Browse plugins
+              <ArrowRight className="h-3.5 w-3.5" />
+            </a>
+            <a
+              href="/docs/plugins"
+              className="inline-flex items-center gap-1.5 rounded-full border border-white/12 px-3 py-1.5 text-xs text-white/80 transition-colors hover:bg-white/10"
+            >
+              Plugin docs
+            </a>
+          </div>
+        </div>
+
+        <div className="p-6 md:p-8">
+          <div className="grid gap-4 md:grid-cols-3">
+            {PLUGIN_CAPABILITIES.map((capability) => (
+              <PluginCapabilityCard key={capability.title} {...capability} />
+            ))}
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-3 border-t border-white/10 px-6 py-5 sm:flex-row sm:items-center sm:justify-between md:px-8">
+          <p className="text-sm text-white/45">Paseo is Apache 2.0.</p>
+          <a
+            href="https://github.com/getpaseo/paseo"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="inline-flex shrink-0 items-center gap-2 text-sm text-muted-foreground transition-colors hover:text-foreground"
+          >
+            <GitFork className="h-4 w-4" strokeWidth={1.5} />
+            Fork the repo
+            <ExternalLink className="h-3.5 w-3.5 opacity-70" />
+          </a>
+        </div>
       </div>
     </FeatureSection>
   );
 }
 
-function ExtensibleCard({
+const PLUGINS_BROWSE = PLUGINS_LINKED
+  ? { href: "/plugins", external: false }
+  : { href: "https://paseo.cafe", external: true };
+
+const PLUGIN_CAPABILITIES: ReadonlyArray<{
+  icon: LucideIcon;
+  title: string;
+  description: string;
+}> = [
+  {
+    icon: LayoutPanelLeft,
+    title: "UI",
+    description: "Screens, workspace panels, sidebar items, slash commands, and themes",
+  },
+  {
+    icon: Workflow,
+    title: "Agent lifecycle",
+    description:
+      "Change configuration, environment, and MCP servers. Answer permissions. Follow up when a turn ends",
+  },
+  {
+    icon: Bot,
+    title: "Providers",
+    description: "Add a coding agent as a provider, used the same way as the built-in ones",
+  },
+];
+
+function PluginCapabilityCard({
   icon: Icon,
   title,
   description,
-  href,
-  linkLabel,
-  linkIcon,
-  external = false,
 }: {
   icon: LucideIcon;
   title: string;
   description: string;
-  href: string;
-  linkLabel: string;
-  linkIcon?: "book" | "github";
-  external?: boolean;
 }) {
   return (
-    <div className="flex min-h-64 flex-col rounded-xl border border-white/10 bg-white/[0.025] p-6">
-      <div className="mb-8 text-muted-foreground">
-        <Icon className="h-6 w-6" strokeWidth={1.5} />
+    <div className="flex flex-col rounded-xl border border-white/10 bg-white/[0.025] p-5">
+      <div className="mb-5 text-muted-foreground">
+        <Icon className="h-5 w-5" strokeWidth={1.5} />
       </div>
-      <h3 className="text-lg font-medium text-white/85">{title}</h3>
+      <h3 className="font-medium text-white/85">{title}</h3>
       <p className="mt-2 text-sm leading-relaxed text-white/45">{description}</p>
-      <a
-        href={href}
-        {...(external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
-        className="mt-auto inline-flex items-center gap-2 pt-6 text-sm text-muted-foreground transition-colors hover:text-foreground"
-      >
-        {linkIcon === "book" ? <BookOpen className="h-4 w-4" /> : null}
-        {linkIcon === "github" ? <GitHubIcon className="h-4 w-4" /> : null}
-        {linkLabel}
-      </a>
     </div>
   );
 }
 
+const PRINCIPLES: ReadonlyArray<{ icon: LucideIcon; title: string; description: string }> = [
+  {
+    icon: Lock,
+    title: "Private",
+    description: "No telemetry, tracking, or forced login. Code stays on your machine.",
+  },
+  {
+    icon: Compass,
+    title: "Independent",
+    description: "Paseo doesn't answer to investors. Its users guide what gets built.",
+  },
+  {
+    icon: Gem,
+    title: "Polished",
+    description: "Install the app and start working. No need to know what a daemon is.",
+  },
+  {
+    icon: Merge,
+    title: "Unified",
+    description: "Every coding agent, used the same way. Switch providers any time.",
+  },
+  {
+    icon: Blocks,
+    title: "Composable",
+    description: "Run agents on your laptop or a server, and connect from any device.",
+  },
+  {
+    icon: Puzzle,
+    title: "Extensible",
+    description: "If Paseo doesn't fit how you work, change it with a plugin or fork.",
+  },
+];
+
+function PhilosophySection() {
+  return (
+    <FeatureSection
+      title="Philosophy"
+      description="What Paseo stands for, and what every feature is built on"
+    >
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+        {PRINCIPLES.map((principle) => (
+          <div
+            key={principle.title}
+            className="rounded-xl border border-white/10 bg-white/[0.025] p-5"
+          >
+            <div className="flex items-center gap-3">
+              <principle.icon className="h-5 w-5 text-extra-muted-foreground" strokeWidth={1.5} />
+              <h3 className="font-medium text-white/85">{principle.title}</h3>
+            </div>
+            <p className="mt-3 text-sm leading-relaxed text-white/45">{principle.description}</p>
+          </div>
+        ))}
+      </div>
+    </FeatureSection>
+  );
+}
+
 function GetStarted() {
   const platform = useVisitorPlatform();
   return (
@@ -866,11 +974,9 @@ function GetStarted() {
       <div className="flex flex-wrap items-center justify-center gap-x-2 gap-y-1 pt-6">
         <span className="text-xs text-muted-foreground">Supports</span>
         <div className="flex items-center gap-1">
-          <AgentBadge name="Claude Code" icon={CLAUDE_CODE_BADGE_ICON} />
-          <AgentBadge name="Codex" icon={CODEX_BADGE_ICON} />
-          <AgentBadge name="OpenCode" icon={OPENCODE_BADGE_ICON} />
-          <AgentBadge name="Pi" icon={PI_BADGE_ICON} />
-          <AgentBadge name="Cursor" icon={CURSOR_BADGE_ICON} />
+          {FEATURED_AGENTS.map((agent) => (
+            <AgentBadge key={agent.name} name={agent.name} Icon={agent.Icon} />
+          ))}
         </div>
         <a
           href="/agents"
@@ -892,7 +998,7 @@ function DesktopDownloadButton({ platform }: { platform: DesktopPlatform }) {
   const download = getDesktopDownload(useRelease(), platform);
   const Icon = download.icon;
   return (
-    <a href={download.href} target="_blank" rel="noopener noreferrer" className={PRIMARY_CTA_CLASS}>
+    <a href={download.href} className={PRIMARY_CTA_CLASS}>
       <Icon className="h-4 w-4" />
       Download for {download.label}
     </a>
@@ -1114,10 +1220,15 @@ function FAQ() {
         </FAQItem>
         <FAQItem question="What agents does it support?">
           Paseo supports many providers. It has custom implementations for Claude, Codex, OpenCode,
-          Pi, and OMP, and supports many more via ACP. See the full list here:{" "}
+          Pi, OMP, Antigravity, and Muse Code, and supports many more via ACP. See the full list
+          here:{" "}
           <a href="/agents" className="underline hover:text-white/80">
             all supported providers
           </a>
+          . See{" "}
+          <a href="/docs/muse-code" className="underline hover:text-white/80">
+            Muse Code setup and limitations
+          </a>
           .
         </FAQItem>
         <FAQItem question="How does Paseo run providers?">
@@ -1168,45 +1279,3 @@ function FAQ() {
     </motion.div>
   );
 }
-
-function SponsorCTA() {
-  return (
-    <motion.div
-      initial={FADE_IN_UP}
-      whileInView={FADE_IN}
-      viewport={VIEWPORT_60}
-      transition={EASE_OUT_05}
-      className="rounded-xl bg-white/5 border border-white/10 p-8 md:p-10 text-left space-y-4 max-w-xl mx-auto"
-    >
-      <div className="text-sm text-muted-foreground leading-relaxed space-y-3">
-        <p>Paseo is an independent open source project for running coding agents.</p>
-        <p>Its guiding principle is optionality and freedom of choice.</p>
-        <p>
-          I wanted to use any provider without being locked into any ecosystem, run it on my own
-          infrastructure, access it from anywhere, and have it be fully automatable.
-        </p>
-        <p>I am hoping that you will enjoy Paseo as much as I do.</p>
-        <p>If you like Paseo, sponsorship is the best way to support continued development.</p>
-        <p>- Mo</p>
-      </div>
-      <div className="pt-2">
-        <a
-          href="/sponsor"
-          className="inline-flex items-center gap-2 rounded-lg bg-white/10 border border-white/20 px-5 py-2.5 text-sm font-medium text-white hover:bg-white/15 transition-colors"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="16"
-            height="16"
-            viewBox="0 0 24 24"
-            fill="currentColor"
-            className="text-pink-400"
-          >
-            <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-          </svg>
-          Sponsor Paseo
-        </a>
-      </div>
-    </motion.div>
-  );
-}
diff --git a/packages/website/src/components/mockup/index.ts b/packages/website/src/components/mockup/index.ts
index cc4a842aa5..71ffed8b8d 100644
--- a/packages/website/src/components/mockup/index.ts
+++ b/packages/website/src/components/mockup/index.ts
@@ -6,3 +6,4 @@ export { MobileDiff } from "./mobile/diff";
 export { MobileSidebar } from "./mobile/sidebar";
 export { DEFAULT_MOCKUP_STATE, MOCKUP_STATES, type MockupStateId } from "./states";
 export { MockupWindow } from "./window";
+export { ScaledMockup } from "./scaled-mockup";
diff --git a/packages/website/src/components/mockup/mobile/frame.tsx b/packages/website/src/components/mockup/mobile/frame.tsx
index a4ccd4f07d..8449321037 100644
--- a/packages/website/src/components/mockup/mobile/frame.tsx
+++ b/packages/website/src/components/mockup/mobile/frame.tsx
@@ -1,20 +1,10 @@
-// The iPhone frame every mobile mockup sits inside. Authored at a fixed
-// "design" size — iPhone 17 Pro points, 402 x 874 — and scaled to whatever
-// width its column gives it. The scale is pure CSS (`tan(atan2(100cqw, …))`,
-// the same trick the desktop hero uses), so the frame stays crisp at any width
-// with no JS and a correct server-rendered first paint.
-
 import type * as React from "react";
+import { ScaledMockup } from "../scaled-mockup";
 
 export const PHONE_W = 402;
 export const PHONE_H = 874;
 
 const FRAME_ASPECT = { aspectRatio: `${PHONE_W} / ${PHONE_H}` };
-const SCREEN_SCALE = {
-  width: PHONE_W,
-  height: PHONE_H,
-  transform: `scale(tan(atan2(100cqw, ${PHONE_W}px)))`,
-};
 type PhoneDepth = "front" | "left" | "right";
 
 const SLAB_STYLE: Record<Exclude<PhoneDepth, "front">, React.CSSProperties> = {
@@ -122,8 +112,8 @@ export function PhoneFrame({
       )}
 
       <div className="absolute inset-0 overflow-hidden rounded-[13.5%/6.2%] border-[3px] border-black bg-black shadow-[inset_0_0_0_1px_rgba(255,255,255,0.14)] outline outline-[1px] outline-white/25">
-        <div className="absolute -inset-[3px] [container-type:inline-size]">
-          <div className="absolute top-0 left-0 origin-top-left" style={SCREEN_SCALE}>
+        <div className="absolute -inset-[3px]">
+          <ScaledMockup width={PHONE_W} height={PHONE_H}>
             <div className="relative flex h-[874px] w-[402px] flex-col overflow-hidden bg-mock-surface0 text-mock-fg antialiased">
               <StatusBar time={time} />
               <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden">
@@ -131,7 +121,7 @@ export function PhoneFrame({
               </div>
               <HomeIndicator />
             </div>
-          </div>
+          </ScaledMockup>
         </div>
         <div className="pointer-events-none absolute inset-0 z-20" style={GLASS_STYLE} />
       </div>
diff --git a/packages/website/src/components/mockup/scaled-mockup.tsx b/packages/website/src/components/mockup/scaled-mockup.tsx
new file mode 100644
index 0000000000..4a30de8917
--- /dev/null
+++ b/packages/website/src/components/mockup/scaled-mockup.tsx
@@ -0,0 +1,61 @@
+import { useLayoutEffect, useMemo, useRef, useState, type ReactNode } from "react";
+
+interface ScaledMockupProps {
+  width: number;
+  height: number;
+  children: ReactNode;
+  label?: string;
+  borderRadius?: number;
+  className?: string;
+}
+
+export function ScaledMockup({
+  width,
+  height,
+  children,
+  label,
+  borderRadius = 0,
+  className = "",
+}: ScaledMockupProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [scale, setScale] = useState(0);
+
+  useLayoutEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    // Measure layout width, not the transformed bounds of the tilted phones.
+    setScale(container.clientWidth / width);
+    const observer = new ResizeObserver(([entry]) => {
+      setScale(entry.contentRect.width / width);
+    });
+    observer.observe(container);
+    return () => observer.disconnect();
+  }, [width]);
+
+  const frameStyle = useMemo(
+    () => ({
+      aspectRatio: `${width} / ${height}`,
+      borderRadius: `${(borderRadius / width) * 100}% / ${(borderRadius / height) * 100}%`,
+    }),
+    [width, height, borderRadius],
+  );
+  const surfaceStyle = useMemo(
+    () => ({ width, height, transform: `scale(${scale})` }),
+    [width, height, scale],
+  );
+
+  return (
+    <div
+      ref={containerRef}
+      role={label ? "img" : undefined}
+      aria-label={label}
+      className={`relative w-full overflow-hidden ${className}`}
+      style={frameStyle}
+    >
+      <div className="absolute top-0 left-0 origin-top-left" style={surfaceStyle}>
+        {children}
+      </div>
+    </div>
+  );
+}
diff --git a/packages/website/src/components/mockup/titlebar.tsx b/packages/website/src/components/mockup/titlebar.tsx
index 6f3b91032f..de99f4db76 100644
--- a/packages/website/src/components/mockup/titlebar.tsx
+++ b/packages/website/src/components/mockup/titlebar.tsx
@@ -64,7 +64,7 @@ export function TitleBar({ state }: { state: MockupStateId }) {
         {shipping ? (
           <>
             <GithubGlyph size={13} />
-            Merge PR (squash)
+            Merge PR
           </>
         ) : (
           <>
diff --git a/packages/website/src/components/site-footer.tsx b/packages/website/src/components/site-footer.tsx
index f73192c98a..198a60c9ce 100644
--- a/packages/website/src/components/site-footer.tsx
+++ b/packages/website/src/components/site-footer.tsx
@@ -1,19 +1,25 @@
+import { PLUGINS_LINKED } from "~/plugins/launch";
 import { getAlternativePages } from "~/data/alternative-pages";
 import { appStoreUrl, playStoreUrl, webAppUrl } from "~/downloads";
 
 interface SiteFooterProps {
-  width?: "default" | "prose";
+  width?: "default" | "prose" | "wide";
 }
 
+const WIDTH_CLASSES: Record<NonNullable<SiteFooterProps["width"]>, string> = {
+  prose: "max-w-prose p-6 md:p-12 md:pt-0",
+  default: "max-w-5xl p-6 md:p-20 md:pt-0",
+  wide: "max-w-7xl p-6 md:p-20 md:pt-0",
+};
+
 export function SiteFooter({ width = "default" }: SiteFooterProps) {
-  const widthClasses =
-    width === "prose" ? "max-w-prose p-6 md:p-12 md:pt-0" : "max-w-5xl p-6 md:p-20 md:pt-0";
+  const widthClasses = WIDTH_CLASSES[width];
   const alternatives = getAlternativePages();
   return (
-    <footer className={`${widthClasses} mx-auto`}>
+    <footer className={`${widthClasses} mx-auto mt-12 md:mt-16`}>
       <div className="border-t border-white/10 pt-8 pb-4 grid grid-cols-2 sm:grid-cols-5 gap-8 text-sm">
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Product</p>
+          <p className="text-extra-muted-foreground">Product</p>
           <div className="space-y-2">
             <a
               href="/blog"
@@ -27,6 +33,14 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
             >
               Docs
             </a>
+            {PLUGINS_LINKED && (
+              <a
+                href="/plugins"
+                className="block text-muted-foreground hover:text-foreground transition-colors"
+              >
+                Plugins
+              </a>
+            )}
             <a
               href="/changelog"
               className="block text-muted-foreground hover:text-foreground transition-colors"
@@ -66,7 +80,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Agents</p>
+          <p className="text-extra-muted-foreground">Agents</p>
           <div className="space-y-2">
             <a
               href="/claude-code"
@@ -86,6 +100,18 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
             >
               OpenCode
             </a>
+            <a
+              href="/antigravity"
+              className="block text-muted-foreground hover:text-foreground transition-colors"
+            >
+              Antigravity
+            </a>
+            <a
+              href="/muse-code"
+              className="block text-muted-foreground hover:text-foreground transition-colors"
+            >
+              Muse Code
+            </a>
             <a
               href="/agents"
               className="block text-muted-foreground hover:text-foreground transition-colors"
@@ -95,7 +121,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Alternatives</p>
+          <p className="text-extra-muted-foreground">Alternatives</p>
           <div className="space-y-2">
             {alternatives.map((page) => (
               <a
@@ -109,7 +135,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Community</p>
+          <p className="text-extra-muted-foreground">Community</p>
           <div className="space-y-2">
             <a
               href="https://discord.gg/jz8T2uahpH"
@@ -138,7 +164,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Download</p>
+          <p className="text-extra-muted-foreground">Download</p>
           <div className="space-y-2">
             <a
               href={appStoreUrl}
diff --git a/packages/website/src/components/site-header.tsx b/packages/website/src/components/site-header.tsx
index 3cb62ac09d..fc70e11f39 100644
--- a/packages/website/src/components/site-header.tsx
+++ b/packages/website/src/components/site-header.tsx
@@ -1,3 +1,4 @@
+import { PLUGINS_LINKED } from "~/plugins/launch";
 import "~/styles.css";
 import { DiscordIcon, GitHubIcon } from "~/components/brand-icons";
 import { useStars } from "~/routes/__root";
@@ -11,6 +12,14 @@ export function SiteHeader() {
         <span className="text-lg font-medium">Paseo</span>
       </a>
       <div className="flex flex-wrap items-center justify-center gap-4">
+        {PLUGINS_LINKED && (
+          <a
+            href="/plugins"
+            className="text-sm text-muted-foreground hover:text-foreground transition-colors"
+          >
+            Plugins
+          </a>
+        )}
         <a
           href="/blog"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
diff --git a/packages/website/src/components/site-shell.tsx b/packages/website/src/components/site-shell.tsx
index 2bbd1f89a4..2c0a38f795 100644
--- a/packages/website/src/components/site-shell.tsx
+++ b/packages/website/src/components/site-shell.tsx
@@ -4,16 +4,21 @@ import { SiteHeader } from "~/components/site-header";
 
 interface SiteShellProps {
   children: ReactNode;
-  width: "default" | "prose";
+  width: "default" | "prose" | "wide";
 }
 
+const MAIN_CLASSES: Record<SiteShellProps["width"], string> = {
+  prose: "max-w-prose p-6 md:p-12 mx-auto",
+  default: "max-w-5xl p-6 md:p-20 mx-auto",
+  wide: "max-w-7xl p-6 md:p-20 mx-auto",
+};
+
 export function SiteShell({ children, width }: SiteShellProps) {
-  const mainClasses =
-    width === "prose" ? "max-w-prose p-6 md:p-12 mx-auto" : "max-w-5xl p-6 md:p-20 mx-auto";
+  const mainClasses = MAIN_CLASSES[width];
   return (
     <div className="min-h-screen bg-background">
       <main className={mainClasses}>
-        <div className="mb-12">
+        <div className="mb-20">
           <SiteHeader />
         </div>
         {children}
diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
new file mode 100644
index 0000000000..05a04362de
--- /dev/null
+++ b/packages/website/src/components/sponsorship.tsx
@@ -0,0 +1,281 @@
+import { ArrowRight, Check, ExternalLink } from "lucide-react";
+import { BuyMeACoffeeIcon, GitHubIcon, OpenCollectiveIcon } from "~/components/brand-icons";
+import {
+  BUY_ME_A_COFFEE_URL,
+  GITHUB_SPONSORS_URL,
+  HOMEPAGE_SPONSORS,
+  HOMEPAGE_SPOT_PRICE,
+  OPEN_COLLECTIVE_URL,
+  SPONSOR_CONTACT_EMAIL,
+  SPONSOR_SPOT_CHECKOUT_URL,
+  openSpotCount,
+} from "~/data/sponsors";
+
+function SectionHeading({
+  as: Heading,
+  title,
+  description,
+  badge,
+}: {
+  as: "h1" | "h2";
+  title: string;
+  description?: string;
+  badge?: string;
+}) {
+  return (
+    <div className="mb-12 space-y-2">
+      <div className="flex items-center gap-3">
+        <Heading className="text-3xl font-medium tracking-tight">{title}</Heading>
+        {badge ? (
+          <span className="rounded-full bg-emerald-400/10 px-2 py-1 text-xs text-emerald-300">
+            {badge}
+          </span>
+        ) : null}
+      </div>
+      {description ? (
+        <p className="max-w-lg text-base text-pretty text-muted-foreground">{description}</p>
+      ) : null}
+    </div>
+  );
+}
+
+const MAINTAINER_LINK = (
+  <a
+    href="https://github.com/boudra"
+    target="_blank"
+    rel="noopener noreferrer"
+    className="underline hover:text-white/80"
+  >
+    Mo
+  </a>
+);
+
+export function FounderNote() {
+  return (
+    <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
+      <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
+      <p>
+        It is maintained by one person, full time, and shaped by the community. There are no
+        investors, no board and no company behind it. I have turned down funding offers to keep it
+        that way.
+      </p>
+      <p>
+        The community helps Paseo grow through feedback, testing, bug reports, code contributions
+        and plugins. Your sponsorship helps me keep improving and maintaining it.
+      </p>
+      <p>
+        A tool that sits between you and your code, your keys and your machines has to stay neutral,
+        and that gets hard once someone else owns a return on it. Funding creates pressure to
+        monetize, and that pressure changes what gets built.
+      </p>
+      <p>
+        Paseo is self-funded: the work is paid for by sponsorship and by{" "}
+        <a href="/hub" className="underline hover:text-white/90">
+          Paseo Hub
+        </a>
+        , an optional hosted service. Your support is what lets me keep working on it.
+      </p>
+      <p className="text-white/50">{MAINTAINER_LINK}, maintainer</p>
+    </div>
+  );
+}
+
+interface BackingOption {
+  href: string;
+  name: string;
+  icon: React.ComponentType<{ className?: string }>;
+  external: boolean;
+}
+
+const BACKING_OPTIONS: ReadonlyArray<BackingOption> = [
+  {
+    href: GITHUB_SPONSORS_URL,
+    name: "GitHub Sponsors",
+    icon: GitHubIcon,
+    external: true,
+  },
+  {
+    href: OPEN_COLLECTIVE_URL,
+    name: "Open Collective",
+    icon: OpenCollectiveIcon,
+    external: true,
+  },
+  {
+    href: BUY_ME_A_COFFEE_URL,
+    name: "Buy Me a Coffee",
+    icon: BuyMeACoffeeIcon,
+    external: true,
+  },
+  {
+    href: "/sponsor#spot",
+    name: "Sponsor as a company",
+    icon: SpotIcon,
+    external: false,
+  },
+];
+
+function SpotIcon({ className }: { className?: string }) {
+  return (
+    <span
+      aria-hidden="true"
+      className={`inline-block rounded-md border border-dashed border-current ${className ?? ""}`}
+    />
+  );
+}
+
+export function BackingOptions() {
+  return (
+    <div className="grid gap-3 md:grid-cols-2">
+      {BACKING_OPTIONS.map((option) => (
+        <a
+          key={option.href}
+          href={option.href}
+          {...(option.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+          className="flex items-center gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-4 transition-colors hover:border-white/20 hover:bg-white/[0.05]"
+        >
+          <option.icon className="h-6 w-6 shrink-0 text-white/60" />
+          <p className="flex items-center gap-1.5 font-medium text-white">
+            {option.name}
+            {option.external ? (
+              <ExternalLink className="h-3.5 w-3.5 text-white/40" />
+            ) : (
+              <ArrowRight className="h-3.5 w-3.5 text-white/40" />
+            )}
+          </p>
+        </a>
+      ))}
+    </div>
+  );
+}
+
+function SponsorLogoRow() {
+  return (
+    <ul className="grid grid-cols-2 gap-4">
+      {HOMEPAGE_SPONSORS.map((sponsor) => (
+        <li key={sponsor.href}>
+          <a
+            href={sponsor.href}
+            target="_blank"
+            rel="noopener noreferrer sponsored"
+            className="flex h-32 items-center justify-center rounded-xl border border-white/10 bg-white/[0.02] px-6 transition-colors hover:border-white/20 hover:bg-white/[0.05]"
+          >
+            <img src={sponsor.logo} alt={sponsor.name} className="max-h-10 max-w-full opacity-80" />
+          </a>
+        </li>
+      ))}
+    </ul>
+  );
+}
+
+const SPOT_FEATURES: ReadonlyArray<string> = [
+  "Your logo on the homepage of paseo.sh, around 70,000 visitors a month",
+  "Your logo in the GitHub README, around 30,000 visitors a month",
+  "An announcement in the Discord, around 2,000 members",
+  "A mention in the changelog",
+];
+
+export function SponsorSpotSection() {
+  const open = openSpotCount();
+  return (
+    <section id="spot" className="scroll-mt-8">
+      <SectionHeading
+        as="h2"
+        title="Sponsor as a company"
+        description="If your team relies on Paseo, a monthly sponsorship funds its development directly. As a thank you, your logo goes on the homepage and in the README."
+      />
+      <div className="space-y-8">
+        <div className="flex items-end gap-2">
+          <span className="text-4xl font-medium tracking-tight">{HOMEPAGE_SPOT_PRICE}</span>
+          <span className="mb-1 text-sm text-white/45">a month</span>
+        </div>
+        <ul className="grid max-w-2xl gap-3 text-white/70">
+          {SPOT_FEATURES.map((feature) => (
+            <li key={feature} className="flex items-start gap-2.5">
+              <Check aria-hidden="true" className="mt-1 size-4 shrink-0 text-emerald-300" />
+              <span>{feature}</span>
+            </li>
+          ))}
+        </ul>
+        <div className="flex flex-col items-start gap-4 sm:flex-row sm:items-center">
+          {open > 0 ? (
+            <a
+              href={SPONSOR_SPOT_CHECKOUT_URL}
+              className="inline-flex items-center rounded-md bg-white px-5 py-2.5 text-sm font-medium text-black transition-colors hover:bg-white/90"
+            >
+              Become a sponsor
+            </a>
+          ) : null}
+          <a
+            href={`mailto:${SPONSOR_CONTACT_EMAIL}`}
+            className="text-sm text-white/60 underline transition-colors hover:text-white/90"
+          >
+            {open > 0 ? "Or email me first" : "Email me to hear when a spot opens"}
+          </a>
+        </div>
+      </div>
+    </section>
+  );
+}
+
+/** The /sponsor page's first section: the note and the ways to back the work. */
+export function SponsorPaseoSection() {
+  return (
+    <section>
+      <SectionHeading as="h1" title="Sponsor Paseo" />
+      <div className="space-y-10">
+        <FounderNote />
+        <BackingOptions />
+      </div>
+    </section>
+  );
+}
+
+/** Homepage: a short version of the note with the same links as /sponsor. */
+export function SponsorSection() {
+  return (
+    <section>
+      <SectionHeading as="h2" title="Sponsor Paseo" />
+      <div className="space-y-10">
+        <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
+          <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
+          <p>
+            It is maintained by one person, full time, and shaped by the community. There are no
+            investors and no company behind it. I have turned down funding to keep it that way. A
+            tool that sits between you and your code, your keys and your machines has to stay
+            neutral, and funding creates pressure to monetize.
+          </p>
+          <p>
+            Paseo is self-funded through sponsorship and{" "}
+            <a href="/hub" className="underline hover:text-white/90">
+              Paseo Hub
+            </a>
+            . Your support is what lets me keep working on it.
+          </p>
+          <p className="text-white/50">{MAINTAINER_LINK}, maintainer</p>
+        </div>
+        <BackingOptions />
+      </div>
+    </section>
+  );
+}
+
+/** Homepage: the companies sponsoring Paseo. Renders nothing until there is one. */
+export function SponsorsSection() {
+  if (HOMEPAGE_SPONSORS.length === 0) return null;
+  return (
+    <section>
+      <SectionHeading as="h2" title="Sponsors" />
+      <div className="space-y-4">
+        <SponsorLogoRow />
+        {openSpotCount() > 0 ? (
+          <a
+            href="/sponsor#spot"
+            className="inline-block text-sm text-white/50 underline transition-colors hover:text-white/80"
+          >
+            Become a sponsor
+          </a>
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/packages/website/src/content/alternatives/claude-desktop.md b/packages/website/src/content/alternatives/claude-desktop.md
index 5c1b2a7c48..13a403301c 100644
--- a/packages/website/src/content/alternatives/claude-desktop.md
+++ b/packages/website/src/content/alternatives/claude-desktop.md
@@ -9,7 +9,7 @@ order: 55
 
 Claude Desktop is Anthropic's app for Claude Chat, Cowork, and Claude Code on macOS, Windows, and Linux.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -31,7 +31,7 @@ Claude Desktop is the Anthropic-controlled host application. Claude Code can run
 
 Claude Desktop runs Claude Code.
 
-Paseo runs Claude Code too, plus Codex, OpenCode, and Pi natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
+Paseo runs Claude Code too, plus Codex, OpenCode, Pi, Antigravity, and Muse Code natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
 
 ## Application plugins
 
@@ -45,7 +45,7 @@ Both Claude Desktop and Paseo are available on macOS, Windows, and Linux.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 Claude has iOS and Android apps. Dispatch can start local Claude Code work through an active Claude Desktop host or start a cloud session on Anthropic's infrastructure.
 
@@ -84,7 +84,7 @@ paseo schedule create --cron "0 9 * * 1" "audit the codebase"
 
 Both tools support parallel coding sessions, including Git worktrees.
 
-Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web.fix-auth.my-app.localhost` and `web.add-search.my-app.localhost` instead of port collisions.
+Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web--fix-auth--my-app.localhost` and `web--add-search--my-app.localhost` instead of port collisions.
 
 ## Voice
 
@@ -94,25 +94,31 @@ Claude supports voice in Claude's own mobile and app surfaces. Claude Code itsel
 
 ## Comparison
 
-|                              | Paseo                                                           | Claude Desktop                       |
-| ---------------------------- | --------------------------------------------------------------- | ------------------------------------ |
-| License                      | Open source (Apache-2.0)                                        | Not published as open source         |
-| Desktop platforms            | macOS, Linux, Windows                                           | macOS, Linux, Windows                |
-| Mobile coding workflow       | Native Paseo workspace on iOS and Android                       | Dispatch and Cowork in Claude mobile |
-| Coding agents                | Claude Code, Codex, OpenCode, Pi + 30+ via ACP catalog + custom | Claude Code                          |
-| Product account required     | No                                                              | Claude account                       |
-| Cloud agent                  | Cloud waitlist                                                  | Claude Cowork and remote sessions    |
-| Required cloud connection    | No                                                              | Claude account and services          |
-| Machines you control         | Laptop, workstation, VM, server, or home lab                    | Local machine or SSH host            |
-| Git worktrees                | Yes                                                             | Yes                                  |
-| Per-worktree dev server URLs | Yes                                                             | No                                   |
-| Split panes and tabs         | Yes                                                             | Yes                                  |
-| In-app terminal              | Yes                                                             | Yes                                  |
-| In-app browser / preview     | Yes                                                             | Yes                                  |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                        | PR monitoring and merge workflows    |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                         | Claude Code CLI                      |
-| Remote transport             | Direct connection or end-to-end encrypted relay                 | Anthropic Remote and cloud services  |
-| Application plugins          | Server code and native client components                        | No                                   |
-| Self-hosted control plane    | Daemon, web client, and relay                                   | No                                   |
+|                              | Paseo                                                                                              | Claude Desktop                                   |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
+| License                      | Open source (Apache-2.0)                                                                           | Not published as open source                     |
+| Account required             | No                                                                                                 | Claude account                                   |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                      |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Claude app (Dispatch and Cowork)                 |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (Claude Code CLI)                            |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (SSH host, Anthropic-managed cloud sessions) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Anthropic Remote                                 |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                |
+| SSH access                   | Yes                                                                                                | Yes                                              |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code                                      |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                              |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                                |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                                |
+| Editor                       | Yes                                                                                                | Yes (file editor)                                |
+| Terminals                    | Yes                                                                                                | Yes                                              |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                              |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | PR monitoring and merge workflows                |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (live app preview)                           |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                               |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (scheduled tasks)                            |
+| Plan usage                   | Yes                                                                                                | -                                                |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                               |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Yes (in Claude's mobile and app surfaces)        |
+| Telemetry                    | None                                                                                               | -                                                |
 
 See also: [Paseo vs Codex App](/alternatives/codex-app), [Paseo vs OpenCode Desktop](/alternatives/opencode-desktop), [Paseo vs Conductor](/alternatives/conductor).
diff --git a/packages/website/src/content/alternatives/codex-app.md b/packages/website/src/content/alternatives/codex-app.md
index e6e2063d41..7f985af7f8 100644
--- a/packages/website/src/content/alternatives/codex-app.md
+++ b/packages/website/src/content/alternatives/codex-app.md
@@ -9,7 +9,7 @@ order: 54
 
 OpenAI provides Codex through the ChatGPT desktop app on macOS, Windows, and Linux, with local, worktree, cloud, and remote workflows.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -31,7 +31,7 @@ OpenAI provides local, worktree, remote, and cloud Codex workflows through its C
 
 Codex App runs Codex.
 
-Paseo runs Codex too, plus Claude Code, OpenCode, and Pi natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
+Paseo runs Codex too, plus Claude Code, OpenCode, Pi, Antigravity, and Muse Code natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
 
 ## Application plugins
 
@@ -45,7 +45,7 @@ OpenAI's desktop app and Paseo are available on macOS, Windows, and Linux.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 ChatGPT Remote can start and continue Codex chats, approve actions, and review outputs from iOS and Android through a connected desktop host.
 
@@ -55,7 +55,7 @@ Both tools support Git worktrees for parallel work.
 
 Codex App creates Codex-managed worktrees under `$CODEX_HOME/worktrees` and supports local environment setup scripts and project actions through `.codex` configuration.
 
-Paseo creates worktrees under `$PASEO_HOME/worktrees`, runs setup and teardown hooks from `paseo.json`, and gives each worktree its own dev server URLs like `web.fix-auth.my-app.localhost` so parallel services don't fight for ports.
+Paseo creates worktrees under `$PASEO_HOME/worktrees`, runs setup and teardown hooks from `paseo.json`, and gives each worktree its own dev server URLs like `web--fix-auth--my-app.localhost` so parallel services don't fight for ports.
 
 ## GitHub and review
 
@@ -88,23 +88,31 @@ Paseo supports dictation and realtime voice mode. Speech-to-text and text-to-spe
 
 ## Comparison
 
-|                                 | Paseo                                                           | Codex App                                            |
-| ------------------------------- | --------------------------------------------------------------- | ---------------------------------------------------- |
-| License                         | Open source (Apache-2.0)                                        | Codex CLI is open source; application is proprietary |
-| Desktop platforms               | macOS, Linux, Windows                                           | macOS, Linux, Windows                                |
-| Mobile coding workflow          | Native Paseo workspace on iOS and Android                       | ChatGPT Remote on iOS and Android                    |
-| Providers                       | Codex, Claude Code, OpenCode, Pi + 30+ via ACP catalog + custom | Codex                                                |
-| Product account required        | No                                                              | OpenAI account                                       |
-| Required Paseo cloud connection | No                                                              | Not applicable                                       |
-| Git worktrees                   | Yes                                                             | Yes                                                  |
-| Per-worktree dev server URLs    | Yes                                                             | No                                                   |
-| In-app terminal                 | Yes                                                             | Yes                                                  |
-| In-app browser                  | Yes                                                             | Yes                                                  |
-| GitHub workflow in app          | Commit, push, PR, checks, reviews, merge                        | Commit, push, PR                                     |
-| CLI                             | Run, `--host`, ls, send, schedule, loop                         | Codex CLI                                            |
-| Remote transport                | Direct connection or end-to-end encrypted relay                 | OpenAI Remote                                        |
-| Application plugins             | Server code and native client components                        | No                                                   |
-| Voice                           | Dictation and realtime voice                                    | Dictation                                            |
-| Self-hosted control plane       | Daemon, web client, and relay                                   | No                                                   |
+|                              | Paseo                                                                                              | Codex App                                            |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Codex CLI is open source; application is proprietary |
+| Account required             | No                                                                                                 | OpenAI account                                       |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                          |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | ChatGPT app (Remote)                                 |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (Codex CLI)                                      |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (connected host, OpenAI-managed cloud)           |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | OpenAI Remote                                        |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                    |
+| SSH access                   | Yes                                                                                                | -                                                    |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Codex                                                |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                  |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                                    |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                                    |
+| Editor                       | Yes                                                                                                | -                                                    |
+| Terminals                    | Yes                                                                                                | Yes                                                  |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                  |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | Commit, push, PR                                     |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes                                                  |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                                   |
+| Schedules and heartbeats     | Yes                                                                                                | -                                                    |
+| Plan usage                   | Yes                                                                                                | -                                                    |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                                   |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation                                            |
+| Telemetry                    | None                                                                                               | -                                                    |
 
 See also: [Paseo vs Claude Desktop](/alternatives/claude-desktop), [Paseo vs OpenCode Desktop](/alternatives/opencode-desktop), [all supported providers](/agents).
diff --git a/packages/website/src/content/alternatives/conductor.md b/packages/website/src/content/alternatives/conductor.md
index d34cbbfc6e..553d4e4d28 100644
--- a/packages/website/src/content/alternatives/conductor.md
+++ b/packages/website/src/content/alternatives/conductor.md
@@ -9,7 +9,7 @@ order: 50
 
 Conductor is a proprietary macOS app for running Claude Code, Codex, Cursor, and OpenCode in parallel Git worktrees and managed cloud workspaces.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -27,7 +27,7 @@ Conductor runs local workspaces through its macOS app and cloud workspaces in ma
 
 ## Providers
 
-Paseo runs Claude Code, Codex, OpenCode, and Pi natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
+Paseo runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
 
 Conductor supports Claude Code, Codex, Cursor, and OpenCode.
 
@@ -67,11 +67,11 @@ Conductor lists its API as a Pro feature but does not document a user-facing CLI
 
 Both tools isolate parallel agents in git worktrees.
 
-Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web.fix-auth.my-app.localhost` and `web.add-search.my-app.localhost` instead of port collisions.
+Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web--fix-auth--my-app.localhost` and `web--add-search--my-app.localhost` instead of port collisions.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps today. Conductor lists its mobile app as coming soon under the Pro plan.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. Conductor lists its mobile app as coming soon under the Pro plan.
 
 ## Voice
 
@@ -79,21 +79,31 @@ Paseo supports local speech-to-text and text-to-speech. Conductor does not curre
 
 ## Comparison
 
-|                              | Paseo                                                           | Conductor                            |
-| ---------------------------- | --------------------------------------------------------------- | ------------------------------------ |
-| License                      | Open source (Apache-2.0)                                        | Closed source                        |
-| Platforms                    | macOS, Linux, Windows                                           | macOS only                           |
-| Native mobile                | iOS, Android                                                    | Coming soon under Pro                |
-| Providers                    | Claude Code, Codex, OpenCode, Pi + 30+ via ACP catalog + custom | Claude Code, Codex, Cursor, OpenCode |
-| Git worktrees                | Yes                                                             | Yes                                  |
-| Per-worktree dev server URLs | Yes                                                             | —                                    |
-| Split panes and tabs         | Yes                                                             | —                                    |
-| In-app terminal              | Yes                                                             | Yes                                  |
-| In-app browser               | Yes                                                             | —                                    |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                        | Yes                                  |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                         | —                                    |
-| Application plugins          | Server code and native client components                        | No                                   |
-| Local voice                  | Yes                                                             | Not documented                       |
-| Self-hosted daemon           | Yes                                                             | —                                    |
+|                              | Paseo                                                                                              | Conductor                               |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | --------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Closed source                           |
+| Account required             | No                                                                                                 | Yes                                     |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS only)                        |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Coming soon under Pro                   |
+| CLI                          | Yes (everything the app does)                                                                      | API under Pro                           |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | No (managed cloud workspaces under Pro) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                       |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | No                                      |
+| SSH access                   | Yes                                                                                                | No                                      |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code, Codex, Cursor, OpenCode    |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                       |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                       |
+| Editor                       | Yes                                                                                                | -                                       |
+| Terminals                    | Yes                                                                                                | Yes                                     |
+| Diff review                  | Yes (comments go to the agent)                                                                     | -                                       |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub                                  |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | -                                       |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | -                                       |
+| Schedules and heartbeats     | Yes                                                                                                | -                                       |
+| Plan usage                   | Yes                                                                                                | -                                       |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                      |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | -                                       |
+| Telemetry                    | None                                                                                               | -                                       |
 
 See also: [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/content/alternatives/happy-coder.md b/packages/website/src/content/alternatives/happy-coder.md
index 5d33aee27a..0c5bbd1b32 100644
--- a/packages/website/src/content/alternatives/happy-coder.md
+++ b/packages/website/src/content/alternatives/happy-coder.md
@@ -9,7 +9,7 @@ order: 53
 
 Happy Coder connects Claude Code and Codex sessions across its macOS, web, iOS, and Android apps. It wraps the agent CLI on your laptop and syncs sessions over an end-to-end encrypted relay. Open source under MIT.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -37,11 +37,11 @@ Paseo's app handles commit, push, opening PRs, watching checks and reviews, and
 
 ## Mobile
 
-Both tools ship native iOS and Android apps.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. Happy Coder also ships native iOS and Android apps.
 
 ## Providers
 
-Paseo runs Claude Code, Codex, OpenCode, and Pi natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
+Paseo runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
 
 Happy Coder runs Claude Code and Codex.
 
@@ -53,7 +53,7 @@ Happy Coder does not document an application extension API for adding both serve
 
 ## Worktrees and services
 
-Paseo runs each agent in its own git worktree. Each worktree gets its own dev server URL like `web.fix-auth.my-app.localhost`, so parallel agents don't fight for the same port.
+Paseo runs each agent in its own git worktree. Each worktree gets its own dev server URL like `web--fix-auth--my-app.localhost`, so parallel agents don't fight for the same port.
 
 Happy Coder can start an agent in a selected machine path, including an existing Git worktree. It does not currently create or manage the worktree lifecycle.
 
@@ -79,21 +79,31 @@ Both products support voice interaction. Paseo can run speech-to-text and text-t
 
 ## Comparison
 
-|                              | Paseo                                                           | Happy Coder                 |
-| ---------------------------- | --------------------------------------------------------------- | --------------------------- |
-| License                      | Open source (Apache-2.0)                                        | Open source (MIT)           |
-| Desktop app                  | macOS, Linux, Windows                                           | macOS                       |
-| Native mobile                | iOS, Android                                                    | iOS, Android                |
-| Architecture                 | Daemon owns agent lifecycle                                     | Wraps the agent CLI         |
-| Providers                    | Claude Code, Codex, OpenCode, Pi + 30+ via ACP catalog + custom | Claude Code, Codex          |
-| Split workspace              | Yes                                                             | Yes                         |
-| In-app terminal              | Yes                                                             | Yes                         |
-| In-app browser / preview     | Yes                                                             | Yes                         |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                        | —                           |
-| Managed Git worktrees        | Yes                                                             | Existing worktree paths     |
-| Per-worktree dev server URLs | Yes                                                             | —                           |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                         | Launch and control sessions |
-| Application plugins          | Server code and native client components                        | No                          |
-| Voice                        | Local or configured cloud speech                                | Yes                         |
+|                              | Paseo                                                                                              | Happy Coder                                     |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ----------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                               |
+| Account required             | No                                                                                                 | -                                               |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS)                                     |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (native)                                    |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (launch and control sessions)               |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | -                                               |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Yes (end-to-end encrypted)                      |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                               |
+| SSH access                   | Yes                                                                                                | -                                               |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code, Codex                              |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Existing worktree paths, no worktree management |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (wraps the agent CLI)                       |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                               |
+| Editor                       | Yes                                                                                                | -                                               |
+| Terminals                    | Yes                                                                                                | Yes                                             |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                             |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | -                                               |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (previews)                                  |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | -                                               |
+| Schedules and heartbeats     | Yes                                                                                                | -                                               |
+| Plan usage                   | Yes                                                                                                | -                                               |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Yes                                             |
+| Telemetry                    | None                                                                                               | -                                               |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/openchamber.md b/packages/website/src/content/alternatives/openchamber.md
index 50a9ddb70a..bec7765588 100644
--- a/packages/website/src/content/alternatives/openchamber.md
+++ b/packages/website/src/content/alternatives/openchamber.md
@@ -29,7 +29,7 @@ Paseo's daemon launches each provider through its own native harness or through
 
 OpenChamber uses OpenCode as its agent runtime. OpenCode can connect to many model providers, and OpenChamber also offers integrations for subscriptions such as Claude.
 
-Paseo is multi-provider at the agent-harness layer. It runs Claude Code, Codex, OpenCode, and Pi natively, plus 30+ agents through its ACP catalog and any custom CLI agent. See [all supported providers](/agents).
+Paseo is multi-provider at the agent-harness layer. It runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code natively, plus 30+ agents through its ACP catalog and any custom CLI agent. See [all supported providers](/agents).
 
 ## Application plugins
 
@@ -51,26 +51,35 @@ OpenChamber's CLI runs and manages its server, remote access, and updates. Its A
 
 ## Mobile and voice
 
-Both tools provide iOS and Android clients and support dictation and spoken replies. Paseo uses a React Native mobile interface. OpenChamber packages its web interface with Capacitor and adds native integrations around the WebView.
+Both tools provide iOS and Android clients and support dictation and spoken replies. The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. OpenChamber packages its web interface with Capacitor and adds native integrations around the WebView.
 
 ## Comparison
 
-|                              | Paseo                                                           | OpenChamber                      |
-| ---------------------------- | --------------------------------------------------------------- | -------------------------------- |
-| License                      | Open source (Apache-2.0)                                        | Open source (MIT)                |
-| Desktop platforms            | macOS, Linux, Windows                                           | macOS, Linux, Windows            |
-| Mobile implementation        | React Native                                                    | Capacitor WebView                |
-| Agent harnesses              | Claude Code, Codex, OpenCode, Pi + 30+ via ACP catalog + custom | OpenCode                         |
-| Application plugins          | Server code and native client components                        | No                               |
-| Split panes and tabs         | Yes                                                             | Workspace views                  |
-| In-app terminal              | Yes                                                             | Yes                              |
-| In-app browser               | Yes                                                             | Yes                              |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                        | Issue, PR, checks, review, merge |
-| Git worktrees                | Yes                                                             | Yes                              |
-| Per-worktree dev server URLs | Yes                                                             | Preview and port detection       |
-| Automation                   | CLI, SDK, MCP                                                   | Server CLI, Agent Control Tool   |
-| Schedules                    | Yes                                                             | Yes                              |
-| Voice                        | Local dictation and realtime voice                              | Dictation and spoken replies     |
-| Self-hosted daemon           | Yes                                                             | Yes                              |
+|                              | Paseo                                                                                              | OpenChamber                                    |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                              |
+| Account required             | No                                                                                                 | -                                              |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                    |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (Capacitor WebView)                        |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (runs and manages the server)              |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (server on another machine)                |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                              |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                              |
+| SSH access                   | Yes                                                                                                | -                                              |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | OpenCode                                       |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees, multi-run comparisons)     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                              |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (Agent Control Tool, OpenCode agents only) |
+| Editor                       | Yes                                                                                                | -                                              |
+| Terminals                    | Yes                                                                                                | Yes                                            |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                            |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub (issue, PR, checks, review, merge)      |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (previews)                                 |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Preview and port detection                     |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (schedules)                                |
+| Plan usage                   | Yes                                                                                                | -                                              |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                             |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation and spoken replies                   |
+| Telemetry                    | None                                                                                               | -                                              |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/content/alternatives/opencode-desktop.md b/packages/website/src/content/alternatives/opencode-desktop.md
index 02fbe71e71..d80d969aa5 100644
--- a/packages/website/src/content/alternatives/opencode-desktop.md
+++ b/packages/website/src/content/alternatives/opencode-desktop.md
@@ -9,7 +9,7 @@ order: 56
 
 OpenCode Desktop is the desktop app for OpenCode. It is available in beta for macOS, Windows, and Linux.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -29,7 +29,7 @@ OpenCode Desktop is the desktop app for OpenCode. OpenCode is available as a ter
 
 OpenCode is a multi-model coding agent. It can connect to many LLM providers through its own provider system, including OpenCode Zen, local models, and API providers.
 
-Paseo is multi-provider at the agent harness layer. It runs OpenCode, Claude Code, Codex, and Pi natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
+Paseo is multi-provider at the agent harness layer. It runs OpenCode, Claude Code, Codex, Pi, Antigravity, and Muse Code natively, plus 30+ more agents through the in-app catalog including GitHub Copilot, Cursor, Gemini CLI, and Amp. Paseo speaks the [Agent Client Protocol](https://agentclientprotocol.com), so any ACP agent works. Custom providers run any CLI agent. See [all supported providers](/agents).
 
 ## Application plugins
 
@@ -43,7 +43,7 @@ Paseo ships on macOS, Linux, and Windows. OpenCode provides beta desktop builds
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 OpenCode Desktop is a desktop app. OpenCode also has web and share-link workflows, but not a native mobile app.
 
@@ -78,7 +78,7 @@ paseo schedule create --cron "0 9 * * 1" "audit the codebase"
 
 ## Worktrees and services
 
-Paseo runs each agent in its own Git worktree. Each worktree gets its own dev server URL like `web.fix-auth.my-app.localhost`, so parallel agents don't fight for ports.
+Paseo runs each agent in its own Git worktree. Each worktree gets its own dev server URL like `web--fix-auth--my-app.localhost`, so parallel agents don't fight for ports.
 
 OpenCode supports multi-session work on the same project. If you want worktree isolation around OpenCode sessions, Paseo can provide that by launching OpenCode inside Paseo workspaces.
 
@@ -94,23 +94,31 @@ Paseo supports dictation and realtime voice mode. Speech-to-text and text-to-spe
 
 ## Comparison
 
-|                              | Paseo                                                           | OpenCode Desktop                |
-| ---------------------------- | --------------------------------------------------------------- | ------------------------------- |
-| License                      | Open source (Apache-2.0)                                        | Open source (MIT)               |
-| Desktop platforms            | macOS, Linux, Windows                                           | macOS, Linux, Windows           |
-| Native mobile                | iOS, Android                                                    | No                              |
-| Agent harnesses              | Claude Code, Codex, OpenCode, Pi + 30+ via ACP catalog + custom | OpenCode                        |
-| Multi-model support          | Through supported agent harnesses                               | Through OpenCode providers      |
-| Git worktrees                | Yes                                                             | No built-in worktree manager    |
-| Per-worktree dev server URLs | Yes                                                             | No                              |
-| Split panes and tabs         | Yes                                                             | Desktop sessions                |
-| In-app terminal              | Yes                                                             | OpenCode terminal workflow      |
-| In-app browser               | Yes                                                             | No                              |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                        | GitHub integration              |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                         | OpenCode CLI                    |
-| MCP server for orchestration | Yes                                                             | MCP support inside OpenCode     |
-| Application plugins          | Server code and native client components                        | No                              |
-| Local voice                  | Yes                                                             | No                              |
-| Self-hosted daemon           | Yes                                                             | OpenCode server / local runtime |
+|                              | Paseo                                                                                              | OpenCode Desktop                                |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ----------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                               |
+| Account required             | No                                                                                                 | -                                               |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (beta, macOS, Linux, Windows)               |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | No                                              |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (OpenCode CLI)                              |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | OpenCode server                                 |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                               |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                               |
+| SSH access                   | Yes                                                                                                | -                                               |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | OpenCode (many model providers)                 |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Multiple sessions, no built-in worktree manager |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                               |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | MCP support inside OpenCode                     |
+| Editor                       | Yes                                                                                                | -                                               |
+| Terminals                    | Yes                                                                                                | OpenCode terminal workflow                      |
+| Diff review                  | Yes (comments go to the agent)                                                                     | -                                               |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub, GitLab integrations                     |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | No                                              |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                              |
+| Schedules and heartbeats     | Yes                                                                                                | -                                               |
+| Plan usage                   | Yes                                                                                                | -                                               |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | No                                              |
+| Telemetry                    | None                                                                                               | -                                               |
 
 See also: [Paseo vs Codex App](/alternatives/codex-app), [Paseo vs Claude Desktop](/alternatives/claude-desktop), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/orca.md b/packages/website/src/content/alternatives/orca.md
new file mode 100644
index 0000000000..c939d49645
--- /dev/null
+++ b/packages/website/src/content/alternatives/orca.md
@@ -0,0 +1,119 @@
+---
+title: Orca Alternative for Agentic Development
+description: Paseo is an open source agentic development environment with parallel worktrees, an editor, terminals, diffs, pull requests, and a built-in browser.
+nav: Orca
+order: 57
+---
+
+# Paseo vs Orca
+
+Orca is an MIT-licensed desktop app for running terminal coding agents in parallel Git worktrees. It includes a mobile companion app, SSH worktrees, remote Orca servers, an embedded browser, and a CLI.
+
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
+
+![Paseo desktop and mobile app](/hero-mockup.png)
+
+## The main difference
+
+Orca is built around terminals. Each agent runs in a terminal pane, and an experimental Chat UI can show supported agents as a chat transcript. Orca ships a broad set of built-in tools around those terminals.
+
+Paseo is built around agent chat. The app ships what every developer uses: editor, terminals, diffs, pull requests, and a browser. Features only some teams need, like issue boards or cloud VMs, are plugins you install, so nothing you do not use is in the way.
+
+Orca is made by Stably AI, a venture-funded company (Y Combinator). Paseo is independent and open source.
+
+## Architecture and remote machines
+
+The Paseo desktop app starts and manages a local daemon automatically. That daemon owns the agents and workspaces, so other clients can connect to the same development environment. Desktop, web, mobile, and CLI clients connect to it directly, over SSH, or through the optional end-to-end encrypted relay. Run the daemon on your laptop, a VM, a home server, or in Docker, and connect to any of them from any client. See [connectivity](/docs/connectivity).
+
+Orca runs inside its desktop app by default and reaches other machines in two ways. SSH worktrees keep the Orca runtime on your laptop and run selected worktrees and terminals on a remote host. Remote Orca Servers, in beta, run Orca desktop or `orca serve` on another machine and let clients pair to it. Orca's documentation recommends Tailscale or another private network for Remote Orca Servers.
+
+## Mobile and the relay
+
+Both tools have iOS and Android apps.
+
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. They are on the App Store and Google Play. To connect from your phone, enable the relay and scan a QR code. The daemon connects outbound to the relay and your phone meets it there, so you do not need a VPN, port forwarding, SSH, or an account. Traffic is end-to-end encrypted, and the [relay server](https://github.com/getpaseo/paseo-relay) is open source. You can also connect directly over Tailscale.
+
+Orca's mobile companion is in beta, on the App Store for iOS and as an APK download for Android. It can reply to agents, open sessions as a terminal or Chat UI, commit changes, and create workspaces on the paired desktop. Orca Relay, also in beta, connects the phone when it is not on the same network as the desktop and requires signing in to an Orca account. Without Orca Relay, the phone needs a LAN or Tailscale path to the desktop.
+
+## Chat
+
+Paseo's main interface is a chat with the agent on desktop, web, and mobile. Paseo runs supported providers through structured harnesses, so messages, tool calls, permission requests, modes, slash commands, and file attachments come from the agent's own protocol.
+
+Orca's main interface is the agent's terminal. Its Chat UI is an experimental view over the same terminal session and is turned on under **Settings → Experimental**. It decodes transcripts for Claude, Codex, Grok, and OMP, and the terminal remains the source of truth.
+
+## Providers
+
+Orca runs any CLI agent in a terminal and lists more than 30 supported agents.
+
+Paseo runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code through native structured harnesses, plus 30+ agents through its ACP catalog and any custom CLI agent. See [all supported providers](/agents).
+
+## Application plugins
+
+[Paseo plugins](/docs/plugins) extend Paseo itself. A plugin can add workspace panels, sidebar items, Command Center items, slash commands, composer pills, settings screens, themes, attachment sources, and agent providers. Its server code runs beside the daemon, and its client code runs in every connected client: desktop, browser, iOS, and Android.
+
+Community plugins are listed at [paseo.sh/plugins](/plugins).
+
+Orca has an experimental plugin system that is off by default. Orca plugins can add desktop panels rendered in a sandboxed frame, commands, keybindings, language packs, VM recipes, and agent profiles, and can be installed from git marketplaces. Plugin workers run on the desktop computer, and Orca does not document plugin surfaces in its mobile app.
+
+## Scope
+
+Orca includes many tools in the core app: a Monaco code editor, Design Mode for sending page elements from its browser to an agent, computer use, Linear and Jira boards, agent account switching with usage tracking, and per-workspace cloud VM recipes. If you want these in one app without extensions, Orca provides them.
+
+Paseo includes an editor, terminals, diff review with comments that go to the agent, pull requests on GitHub, GitLab, Gitea, Forgejo, and Codeberg, a browser with an element picker and agent browser tools, plan usage, schedules, and heartbeats. Boards and cloud VMs are what a plugin adds.
+
+## Workspaces and review
+
+Both tools provide Git worktrees, split panes, terminals, diff review, an in-app browser, pull-request workflows, and scheduled agent runs.
+
+Paseo has diff review with comments that go to the agent and opens pull requests on GitHub, GitLab, Gitea, Forgejo, and Codeberg. It also gives each worktree its own service URL, such as `web--fix-auth--my-app.localhost`, so parallel development servers do not compete for ports. Orca has port forwarding for SSH worktrees and pull requests on GitLab, Bitbucket, Azure DevOps, and Gitea as well as GitHub.
+
+## Automation
+
+Paseo exposes workspace and agent operations through its CLI, TypeScript SDK, and MCP server:
+
+```bash
+paseo run --provider codex "implement OAuth"
+paseo --host ssh://user@devbox run --cwd /srv/app "run the test suite"
+paseo ls
+paseo send <agent-id> "add tests"
+paseo schedule create --cron "0 9 * * 1" "audit the codebase"
+```
+
+Orca's CLI creates worktrees, drives its browser, and manages automations. Orca installs skills so agents can call the same commands.
+
+## Accounts and telemetry
+
+Paseo does not require an account and does not collect telemetry.
+
+Orca does not require an account for local use. Orca Relay and shared artifacts require an Orca account. Packaged Orca builds send anonymous usage telemetry, which you can turn off.
+
+## Comparison
+
+|                              | Paseo                                                                                              | Orca                                                    |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                                       |
+| Account required             | No                                                                                                 | No for local use, Orca account for relay                |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                             |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (companion app, beta)                               |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (worktrees, browser, automations)                   |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (SSH worktrees, Remote Orca Server in beta)         |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Yes (beta, Orca account required)                       |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | Yes (LAN, Tailscale)                                    |
+| SSH access                   | Yes                                                                                                | Yes (SSH worktrees)                                     |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Any CLI agent in a terminal, 30+ listed                 |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (main interface, experimental Chat UI)              |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (agents call the Orca CLI through installed skills) |
+| Editor                       | Yes                                                                                                | Yes (Monaco)                                            |
+| Terminals                    | Yes                                                                                                | Yes                                                     |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                     |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub, GitLab, Bitbucket, Azure DevOps, Gitea          |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (Design Mode)                                       |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Port forwarding for SSH worktrees                       |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (scheduled agent runs)                              |
+| Plan usage                   | Yes                                                                                                | Yes (usage tracking, account switching)                 |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | Experimental, desktop only                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation                                               |
+| Telemetry                    | None                                                                                               | Anonymous usage data, opt-out                           |
+
+See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/superset.md b/packages/website/src/content/alternatives/superset.md
index a3996213d8..30877bc79e 100644
--- a/packages/website/src/content/alternatives/superset.md
+++ b/packages/website/src/content/alternatives/superset.md
@@ -37,7 +37,7 @@ Superset requires a Superset account and GitHub sign-in when opening the app. It
 
 Superset supports many CLI-based coding agents and lets you add custom terminal agents.
 
-Paseo runs Claude Code, Codex, OpenCode, and Pi through native structured harnesses, plus 30+ agents through its ACP catalog and any custom CLI agent. See [all supported providers](/agents).
+Paseo runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code through native structured harnesses, plus 30+ agents through its ACP catalog and any custom CLI agent. See [all supported providers](/agents).
 
 ## Application plugins
 
@@ -51,7 +51,7 @@ Both tools provide Git worktrees, split panes, terminals, diff review, an in-app
 
 Paseo gives supported providers a structured chat interface with modes, slash commands, tool calls, and file attachments. Superset can run any CLI agent in terminal panes and adds lifecycle status for supported agents.
 
-Paseo also gives each worktree its own service URL, such as `web.fix-auth.my-app.localhost`, so parallel development servers do not compete for ports.
+Paseo also gives each worktree its own service URL, such as `web--fix-auth--my-app.localhost`, so parallel development servers do not compete for ports.
 
 ## Automation
 
@@ -65,23 +65,31 @@ Superset has a free individual tier. Team features, remote access, and integrati
 
 ## Comparison
 
-|                              | Paseo                                    | Superset                               |
-| ---------------------------- | ---------------------------------------- | -------------------------------------- |
-| License                      | Open source (Apache-2.0)                 | Source-available (Elastic License 2.0) |
-| Desktop platforms            | macOS, Linux, Windows                    | macOS, experimental Linux              |
-| Native mobile                | iOS, Android                             | Coming soon                            |
-| Account required             | No                                       | Yes, with GitHub sign-in               |
-| Agent harnesses              | Native, ACP, and custom CLI              | CLI agents                             |
-| Application plugins          | Server code and native client components | No                                     |
-| Split panes and tabs         | Yes                                      | Yes                                    |
-| In-app terminal              | Yes                                      | Yes                                    |
-| In-app browser               | Yes                                      | Yes                                    |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge | Yes                                    |
-| Git worktrees                | Yes                                      | Yes                                    |
-| Per-worktree dev server URLs | Yes                                      | Port detection                         |
-| Automation                   | CLI, SDK, MCP                            | CLI, SDK, MCP                          |
-| Schedules                    | Yes                                      | Yes                                    |
-| Local voice                  | Dictation and realtime voice             | No documented voice support            |
-| Self-hosted daemon           | Yes                                      | Host server                            |
+|                              | Paseo                                                                                              | Superset                                                              |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Source-available (Elastic License 2.0)                                |
+| Account required             | No                                                                                                 | Yes, with GitHub sign-in                                              |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, experimental Linux)                                       |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Coming soon                                                           |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (plus SDK and MCP server)                                         |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (host server, remote access through Superset cloud on paid plans) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Superset cloud services (paid plans)                                  |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                                     |
+| SSH access                   | Yes                                                                                                | -                                                                     |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | CLI agents, custom terminal agents                                    |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                                   |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (lifecycle status for supported agents)                           |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (CLI, SDK, and MCP server create workspaces and launch agents)    |
+| Editor                       | Yes                                                                                                | -                                                                     |
+| Terminals                    | Yes                                                                                                | Yes                                                                   |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                                   |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub                                                                |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes                                                                   |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Port detection                                                        |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (schedules)                                                       |
+| Plan usage                   | Yes                                                                                                | -                                                                     |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                                                    |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | -                                                                     |
+| Telemetry                    | None                                                                                               | -                                                                     |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs OpenChamber](/alternatives/openchamber), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/data/agent-pages.ts b/packages/website/src/data/agent-pages.ts
index 5c25a6510a..ee54dc8dea 100644
--- a/packages/website/src/data/agent-pages.ts
+++ b/packages/website/src/data/agent-pages.ts
@@ -43,14 +43,14 @@ export const AGENT_PAGES = [
       "Open source mobile and desktop app for OpenCode. Launch agents on your machine, watch them work, ship code from anywhere. Self-hosted.",
   },
   {
-    slug: "copilot",
-    name: "GitHub Copilot",
-    title: "Open source app for GitHub Copilot",
+    slug: "pi",
+    name: "Pi Agent",
+    title: "Open source app for the Pi coding agent",
     subtitle:
-      "Drive GitHub Copilot from your phone or desktop. Same account, same machine, ship without sitting down at your desk.",
-    metaTitle: "GitHub Copilot Mobile and Desktop App, Open Source",
+      "Run the Pi coding agent on your machine, drive it from your phone or desktop. Self-hosted and open source.",
+    metaTitle: "Pi Agent Mobile and Desktop App, Open Source",
     metaDescription:
-      "Open source mobile and desktop app for GitHub Copilot. Launch sessions on your machine, monitor progress, merge from anywhere.",
+      "Open source mobile and desktop app for the Pi coding agent. Launch sessions on your machine, monitor progress, merge from anywhere. Self-hosted.",
   },
   {
     slug: "omp",
@@ -62,16 +62,6 @@ export const AGENT_PAGES = [
     metaDescription:
       "Open source mobile and desktop app for OMP (Oh My Pi). Launch sessions on your machine, monitor progress, merge from anywhere. Self-hosted.",
   },
-  {
-    slug: "pi",
-    name: "Pi Agent",
-    title: "Open source app for the Pi coding agent",
-    subtitle:
-      "Run the Pi coding agent on your machine, drive it from your phone or desktop. Self-hosted and open source.",
-    metaTitle: "Pi Agent Mobile and Desktop App, Open Source",
-    metaDescription:
-      "Open source mobile and desktop app for the Pi coding agent. Launch sessions on your machine, monitor progress, merge from anywhere. Self-hosted.",
-  },
   {
     slug: "cursor",
     name: "Cursor",
@@ -82,6 +72,36 @@ export const AGENT_PAGES = [
     metaDescription:
       "Open source mobile and desktop app for Cursor. Launch tasks on your machine, monitor output, review diffs, and merge from anywhere. Self-hosted.",
   },
+  {
+    slug: "muse-code",
+    name: "Muse Code",
+    title: "Open source app for Muse Code",
+    subtitle:
+      "Run Meta's Muse Code on your machine, drive it from your phone or desktop. Choose models, review tool calls, and answer approvals from anywhere.",
+    metaTitle: "Muse Code Mobile and Desktop App, Open Source",
+    metaDescription:
+      "Open source mobile and desktop app for Meta Muse Code. Run your installed Muse CLI, watch streamed turns, and answer approvals. See setup and version limitations in the docs.",
+  },
+  {
+    slug: "antigravity",
+    name: "Antigravity",
+    title: "Open source app for Antigravity",
+    subtitle:
+      "Run your installed Antigravity CLI on your machine and drive it from your phone or desktop.",
+    metaTitle: "Antigravity Mobile and Desktop App, Open Source",
+    metaDescription:
+      "Run your installed Antigravity CLI through Paseo. Watch agents work and review changes from your phone or desktop. Self-hosted, your code stays on your machine.",
+  },
+  {
+    slug: "copilot",
+    name: "GitHub Copilot",
+    title: "Open source app for GitHub Copilot",
+    subtitle:
+      "Drive GitHub Copilot from your phone or desktop. Same account, same machine, ship without sitting down at your desk.",
+    metaTitle: "GitHub Copilot Mobile and Desktop App, Open Source",
+    metaDescription:
+      "Open source mobile and desktop app for GitHub Copilot. Launch sessions on your machine, monitor progress, merge from anywhere.",
+  },
   {
     slug: "gemini",
     name: "Gemini CLI",
diff --git a/packages/website/src/data/sponsors.ts b/packages/website/src/data/sponsors.ts
new file mode 100644
index 0000000000..22466c09d1
--- /dev/null
+++ b/packages/website/src/data/sponsors.ts
@@ -0,0 +1,42 @@
+/**
+ * Homepage sponsor spots. This file is the inventory: the site shows one open
+ * placeholder for every spot not listed in `HOMEPAGE_SPONSORS`.
+ *
+ * Approving a sponsor means three edits, or the site promises something it does
+ * not deliver:
+ *
+ * 1. Add the entry below and drop its logo in `public/sponsors/`.
+ * 2. Add the logo under the `## Sponsors` marker in `README.md`,
+ *    `README.zh-CN.md`, `README.ja.md` and `README.ko.md`, in this same order.
+ * 3. Remove all of it when the subscription ends.
+ *
+ * The Stripe payment link caps itself at `HOMEPAGE_SPOT_COUNT` completed
+ * checkouts, and a checkout you decline and refund still counts against that
+ * cap. When you refund one, raise the link's completed-session limit by one, or
+ * the page will offer a spot the link refuses to sell.
+ */
+export interface HomepageSponsor {
+  name: string;
+  href: string;
+  /** Path under `public/`, e.g. `/sponsors/acme.svg`. Keep logos monochrome white. */
+  logo: string;
+}
+
+export const HOMEPAGE_SPONSORS: ReadonlyArray<HomepageSponsor> = [];
+
+export const HOMEPAGE_SPOT_COUNT = 4;
+export const HOMEPAGE_SPOT_PRICE = "$500";
+
+/** Stripe Payment Link for the monthly spot subscription. */
+export const SPONSOR_SPOT_CHECKOUT_URL = "https://buy.stripe.com/8x24gBczR7LNaokcve2sM00";
+
+export const SPONSOR_CONTACT_EMAIL = "hello@paseo.sh";
+
+export const GITHUB_SPONSORS_URL = "https://github.com/sponsors/boudra";
+export const OPEN_COLLECTIVE_URL =
+  "https://opencollective.com/paseo-ai/donate?interval=month&amount=10&contributeAs=me";
+export const BUY_ME_A_COFFEE_URL = "https://buymeacoffee.com/paseo";
+
+export function openSpotCount(): number {
+  return Math.max(0, HOMEPAGE_SPOT_COUNT - HOMEPAGE_SPONSORS.length);
+}
diff --git a/packages/website/src/docs.ts b/packages/website/src/docs.ts
index c9211c4064..a2076aff20 100644
--- a/packages/website/src/docs.ts
+++ b/packages/website/src/docs.ts
@@ -157,15 +157,15 @@ export function getDoc(slug: string): Doc | undefined {
   return getDocs().find((d) => d.slug === slug);
 }
 
-const legacyPluginDocRedirects: Readonly<Record<string, string>> = {
-  "/docs/plugins/reference": "/docs/plugins/v0.7/reference",
-  "/docs/plugins/reference.md": "/docs/plugins/v0.7/reference.md",
-  "/docs/plugins/migration": "/docs/plugins/v0.8/migration",
-  "/docs/plugins/migration.md": "/docs/plugins/v0.8/migration.md",
-};
-
 export function getLegacyDocsRedirect(pathname: string): string | undefined {
-  return legacyPluginDocRedirects[pathname];
+  const match =
+    /^\/docs\/plugins\/v0\.[78](?:(\.md)|\/(index|reference|providers|migration)(\.md)?)?\/?$/.exec(
+      pathname,
+    );
+  if (!match) return undefined;
+  const page = match[2] && match[2] !== "index" ? `/${match[2]}` : "";
+  const extension = match[1] || match[3] ? ".md" : "";
+  return `/docs/plugins${page}${extension}`;
 }
 
 function formatLabel(segment: string): string {
diff --git a/packages/website/src/downloads.test.ts b/packages/website/src/downloads.test.ts
new file mode 100644
index 0000000000..3b6130234a
--- /dev/null
+++ b/packages/website/src/downloads.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest";
+import { parseReleaseAssetUrl } from "./downloads";
+
+describe("parseReleaseAssetUrl", () => {
+  it("accepts a Paseo release file", () => {
+    const url =
+      "https://github.com/getpaseo/paseo/releases/download/v0.10.3/Paseo-0.10.3-arm64.dmg";
+    expect(parseReleaseAssetUrl(url)).toBe(url);
+  });
+
+  it("rejects a path that climbs into another repository's releases", () => {
+    expect(
+      parseReleaseAssetUrl(
+        "https://github.com/getpaseo/paseo/releases/download/v1/../../../../evil/repo/releases/download/v1/app.dmg",
+      ),
+    ).toBeNull();
+    expect(
+      parseReleaseAssetUrl(
+        "https://github.com/getpaseo/paseo/releases/download/v1/%2e%2e/%2e%2e/%2e%2e/%2e%2e/evil/repo/app.dmg",
+      ),
+    ).toBeNull();
+  });
+
+  it("rejects other hosts and malformed values", () => {
+    expect(
+      parseReleaseAssetUrl(
+        "https://github.com.evil.test/getpaseo/paseo/releases/download/v1/a.dmg",
+      ),
+    ).toBeNull();
+    expect(
+      parseReleaseAssetUrl("http://github.com/getpaseo/paseo/releases/download/v1/a.dmg"),
+    ).toBeNull();
+    expect(parseReleaseAssetUrl("not a url")).toBeNull();
+    expect(parseReleaseAssetUrl(undefined)).toBeNull();
+  });
+});
diff --git a/packages/website/src/downloads.tsx b/packages/website/src/downloads.tsx
index cce40a7791..0f55f99acf 100644
--- a/packages/website/src/downloads.tsx
+++ b/packages/website/src/downloads.tsx
@@ -27,6 +27,27 @@ export function downloadUrls(release: ReleaseAssetInfo) {
   };
 }
 
+const RELEASE_ASSETS_ORIGIN = "https://github.com";
+const RELEASE_ASSETS_PATH = "/getpaseo/paseo/releases/download/";
+
+/**
+ * The release file a thanks-page link asks for, or null when it is not one of
+ * ours. Parsing normalizes `..` segments, so a link cannot climb out of this
+ * repo's releases into another repo's.
+ */
+export function parseReleaseAssetUrl(value: unknown): string | null {
+  if (typeof value !== "string" || !URL.canParse(value)) return null;
+  const url = new URL(value);
+  if (url.origin !== RELEASE_ASSETS_ORIGIN) return null;
+  if (!url.pathname.startsWith(RELEASE_ASSETS_PATH)) return null;
+  return url.href;
+}
+
+/** Download buttons link here; the thanks page starts the download itself. */
+export function thanksPageHref(fileUrl: string): string {
+  return `/download/thanks?${new URLSearchParams({ file: fileUrl })}`;
+}
+
 export const appStoreUrl = "https://apps.apple.com/app/paseo-pocket-engineer/id6758887924";
 export const playStoreUrl = "https://play.google.com/store/apps/details?id=sh.paseo";
 export const webAppUrl = "https://app.paseo.sh";
@@ -44,11 +65,11 @@ export function getDesktopDownload(
   const urls = downloadUrls(release);
   switch (platform) {
     case "windows":
-      return { label: "Windows", href: urls.windowsExeX64, icon: WindowsIcon };
+      return { label: "Windows", href: thanksPageHref(urls.windowsExeX64), icon: WindowsIcon };
     case "linux":
-      return { label: "Linux", href: urls.linuxAppImage, icon: LinuxIcon };
+      return { label: "Linux", href: thanksPageHref(urls.linuxAppImage), icon: LinuxIcon };
     case "mac":
-      return { label: "Mac", href: urls.macAppleSilicon, icon: AppleIcon };
+      return { label: "Mac", href: thanksPageHref(urls.macAppleSilicon), icon: AppleIcon };
   }
 }
 
diff --git a/packages/website/src/hub-plans.fixture.json b/packages/website/src/hub-plans.fixture.json
new file mode 100644
index 0000000000..feef9e8750
--- /dev/null
+++ b/packages/website/src/hub-plans.fixture.json
@@ -0,0 +1,66 @@
+{
+  "plans": [
+    {
+      "slug": "free",
+      "name": "Free",
+      "billing": {
+        "model": "per_unit",
+        "unit": {
+          "key": "seat",
+          "label": "seat"
+        }
+      },
+      "included": {
+        "seats": 1,
+        "executionsPerMonth": 50
+      },
+      "features": [
+        {
+          "key": "daemon-location",
+          "label": "Daemons run on your machines",
+          "tooltip": null
+        }
+      ],
+      "prices": [
+        {
+          "interval": "monthly",
+          "intervalCount": 1,
+          "unitAmount": 0,
+          "currency": "usd",
+          "tooltip": null
+        }
+      ]
+    },
+    {
+      "slug": "hosted",
+      "name": "Pro",
+      "billing": {
+        "model": "per_unit",
+        "unit": {
+          "key": "seat",
+          "label": "seat"
+        }
+      },
+      "included": {
+        "seats": null,
+        "executionsPerMonth": null
+      },
+      "features": [
+        {
+          "key": "hub-operation",
+          "label": "Paseo operates Hub",
+          "tooltip": null
+        }
+      ],
+      "prices": [
+        {
+          "interval": "monthly",
+          "intervalCount": 1,
+          "unitAmount": 1500,
+          "currency": "usd",
+          "tooltip": "Seats are Hub members and pending invitations. People who only trigger agents through GitHub, Slack, or Discord do not count as seats."
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/website/src/hub-plans.test.ts b/packages/website/src/hub-plans.test.ts
new file mode 100644
index 0000000000..9d0db494ff
--- /dev/null
+++ b/packages/website/src/hub-plans.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+// The documented `GET /api/billing/plans` response, copied from getpaseo/hub docs/public-api.md.
+import documentedResponse from "./hub-plans.fixture.json" with { type: "json" };
+import { formatPlanPrice, parseHubPlansResponse, planPriceQualifier } from "./hub-plans";
+
+describe("parseHubPlansResponse", () => {
+  it("reads Free and Pro, their monthly prices, and the figures each includes", () => {
+    const plans = parseHubPlansResponse(documentedResponse);
+
+    expect(plans.free.name).toBe("Free");
+    expect(plans.free.included).toEqual({ seats: 1, executionsPerMonth: 50 });
+    expect(plans.free.price.unitAmount).toBe(0);
+    expect(plans.free.features).toEqual([
+      { key: "daemon-location", label: "Daemons run on your machines", tooltip: null },
+    ]);
+
+    expect(plans.paid.slug).toBe("hosted");
+    expect(plans.paid.name).toBe("Pro");
+    expect(plans.paid.included).toEqual({ seats: null, executionsPerMonth: null });
+    expect(plans.paid.price.unitAmount).toBe(1500);
+    expect(plans.paid.price.currency).toBe("usd");
+    expect(plans.paid.billing.unit.label).toBe("seat");
+  });
+
+  it("rejects a catalog that omits the free plan", () => {
+    const withoutFree = {
+      plans: documentedResponse.plans.filter((plan) => plan.slug !== "free"),
+    };
+
+    expect(() => parseHubPlansResponse(withoutFree)).toThrow('Hub plan "free" is unavailable');
+  });
+
+  it("rejects the pre-included plan shape instead of rendering a plan with no figures", () => {
+    const withoutIncluded = {
+      plans: documentedResponse.plans.map(({ included: _included, ...plan }) => plan),
+    };
+
+    expect(() => parseHubPlansResponse(withoutIncluded)).toThrow(
+      "Invalid Hub plan included figures",
+    );
+  });
+
+  it("rejects a plan that has no monthly price", () => {
+    const annualOnly = structuredClone(documentedResponse);
+    for (const plan of annualOnly.plans) {
+      if (plan.slug !== "hosted") continue;
+      for (const price of plan.prices) price.interval = "annual";
+    }
+
+    expect(() => parseHubPlansResponse(annualOnly)).toThrow(
+      'Hub plan "hosted" has no monthly price',
+    );
+  });
+});
+
+describe("plan price copy", () => {
+  it("shows Free as $0 a month and Pro as $15 per seat a month", () => {
+    const plans = parseHubPlansResponse(documentedResponse);
+
+    expect(formatPlanPrice(plans.free.price)).toBe("$0");
+    expect(planPriceQualifier(plans.free)).toBe("/ month");
+    expect(formatPlanPrice(plans.paid.price)).toBe("$15");
+    expect(planPriceQualifier(plans.paid)).toBe("per seat / month");
+  });
+});
diff --git a/packages/website/src/hub-plans.ts b/packages/website/src/hub-plans.ts
index 27521b2338..ca888ee5da 100644
--- a/packages/website/src/hub-plans.ts
+++ b/packages/website/src/hub-plans.ts
@@ -3,16 +3,28 @@ import { createServerFn } from "@tanstack/react-start";
 const HUB_PLANS_URL =
   import.meta.env.VITE_HUB_PLANS_URL ?? "https://hub.paseo.sh/api/billing/plans";
 
-export interface HubHostedOffer {
+/** The two catalog slugs the page renders. `hosted` is displayed as whatever `name` says. */
+const FREE_SLUG = "free";
+const PAID_SLUG = "hosted";
+
+export interface HubPlanOffer {
+  slug: string;
   name: string;
   billing: {
     model: "per_unit";
     unit: { key: string; label: string };
   };
+  /** What the plan gives, as figures. `null` is unlimited. */
+  included: { seats: number | null; executionsPerMonth: number | null };
   features: Array<{ key: string; label: string; tooltip: string | null }>;
   price: HubBillingPrice & { interval: "monthly" };
 }
 
+export interface HubPlans {
+  free: HubPlanOffer;
+  paid: HubPlanOffer;
+}
+
 interface HubBillingPrice {
   interval: "monthly" | "annual";
   intervalCount: number;
@@ -21,49 +33,78 @@ interface HubBillingPrice {
   tooltip: string | null;
 }
 
-interface HubBillingPlan extends Omit<HubHostedOffer, "price"> {
-  slug: string;
+interface HubBillingPlan extends Omit<HubPlanOffer, "price"> {
   prices: HubBillingPrice[];
 }
 
-export function parseHostedOfferResponse(value: unknown): HubHostedOffer {
+export function parseHubPlansResponse(value: unknown): HubPlans {
   if (!isRecord(value) || !Array.isArray(value["plans"])) throw new Error("Invalid Hub plans");
-  const hosted = value["plans"].map(parsePlan).find((plan) => plan.slug === "hosted");
-  const price = hosted?.prices.find(isMonthlyPrice);
-  if (hosted === undefined || price === undefined) throw new Error("Hosted Hub is unavailable");
+  const plans = value["plans"].map(parsePlan);
   return {
-    name: hosted.name,
-    billing: hosted.billing,
-    features: hosted.features,
-    price,
+    free: selectOffer(plans, FREE_SLUG),
+    paid: selectOffer(plans, PAID_SLUG),
   };
 }
 
-export const getHostedOffer = createServerFn({ method: "GET" }).handler(async () => {
+export const getHubPlans = createServerFn({ method: "GET" }).handler(async () => {
   const response = await fetch(HUB_PLANS_URL, {
     headers: { accept: "application/json" },
     signal: AbortSignal.timeout(5_000),
   });
   if (!response.ok) throw new Error(`Hub plans request failed (${response.status})`);
-  return parseHostedOfferResponse(await response.json());
+  return parseHubPlansResponse(await response.json());
 });
 
+/** The plan's monthly figure in its own currency, e.g. "$15". */
+export function formatPlanPrice(price: HubPlanOffer["price"]): string {
+  return new Intl.NumberFormat("en", {
+    style: "currency",
+    currency: price.currency.toUpperCase(),
+    minimumFractionDigits: 0,
+  }).format(price.unitAmount / 100);
+}
+
+/** What the figure is for: "per seat / month" when each seat is charged, "/ month" when the
+ * plan costs nothing, since a free plan has no per-seat charge to describe. */
+export function planPriceQualifier(plan: HubPlanOffer): string {
+  const period = plan.price.intervalCount === 1 ? "month" : `${plan.price.intervalCount} months`;
+  if (plan.price.unitAmount === 0) return `/ ${period}`;
+  return `per ${plan.billing.unit.label} / ${period}`;
+}
+
+function selectOffer(plans: readonly HubBillingPlan[], slug: string): HubPlanOffer {
+  const plan = plans.find((candidate) => candidate.slug === slug);
+  if (plan === undefined) throw new Error(`Hub plan "${slug}" is unavailable`);
+  const price = plan.prices.find(isMonthlyPrice);
+  if (price === undefined) throw new Error(`Hub plan "${slug}" has no monthly price`);
+  return {
+    slug: plan.slug,
+    name: plan.name,
+    billing: plan.billing,
+    included: plan.included,
+    features: plan.features,
+    price,
+  };
+}
+
 function parsePlan(value: unknown): HubBillingPlan {
   if (!isRecord(value) || typeof value["slug"] !== "string" || typeof value["name"] !== "string")
     throw new Error("Invalid Hub plan");
   const billing = parseBilling(value["billing"]);
+  const included = parseIncluded(value["included"]);
   if (!Array.isArray(value["features"]) || !Array.isArray(value["prices"]))
     throw new Error("Invalid Hub plan presentation");
   return {
     slug: value["slug"],
     name: value["name"],
     billing,
+    included,
     features: value["features"].map(parseFeature),
     prices: value["prices"].map(parsePrice),
   };
 }
 
-function parseBilling(value: unknown): HubHostedOffer["billing"] {
+function parseBilling(value: unknown): HubPlanOffer["billing"] {
   if (!isRecord(value) || value["model"] !== "per_unit" || !isRecord(value["unit"]))
     throw new Error("Invalid Hub plan billing model");
   const unit = value["unit"];
@@ -75,7 +116,17 @@ function parseBilling(value: unknown): HubHostedOffer["billing"] {
   };
 }
 
-function parseFeature(value: unknown): HubHostedOffer["features"][number] {
+function parseIncluded(value: unknown): HubPlanOffer["included"] {
+  if (
+    !isRecord(value) ||
+    !isNullableCount(value["seats"]) ||
+    !isNullableCount(value["executionsPerMonth"])
+  )
+    throw new Error("Invalid Hub plan included figures");
+  return { seats: value["seats"], executionsPerMonth: value["executionsPerMonth"] };
+}
+
+function parseFeature(value: unknown): HubPlanOffer["features"][number] {
   if (
     !isRecord(value) ||
     typeof value["key"] !== "string" ||
@@ -121,3 +172,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 function isNullableString(value: unknown): value is string | null {
   return value === null || typeof value === "string";
 }
+
+function isNullableCount(value: unknown): value is number | null {
+  return value === null || (typeof value === "number" && Number.isInteger(value) && value >= 0);
+}
diff --git a/packages/website/src/llms.ts b/packages/website/src/llms.ts
index 2baf14a399..32a1f6dcac 100644
--- a/packages/website/src/llms.ts
+++ b/packages/website/src/llms.ts
@@ -6,13 +6,15 @@ const SITE_URL = "https://paseo.sh";
 
 const PRODUCT_PREAMBLE = `# Paseo
 
-> Mobile and desktop app for monitoring and controlling your local AI coding agents from anywhere. Your dev environment, in your pocket.
+> Open source agentic development environment for desktop, mobile, web, and CLI.
 
-Paseo is an open source application that lets you run AI coding agents on your own machine and drive them from your phone, desktop, browser, or terminal. Your code stays local — Paseo connects directly to your real development environment instead of running agents in someone else's cloud.
+Paseo is a full agentic development environment. For agent-driven development, it replaces your IDE: run coding agents, edit files, review diffs and pull requests, run tests in terminals, and check your app in the built-in desktop browser. Arrange agents, files, terminals, and browser tabs in split panes within a workspace.
 
-A self-hosted daemon manages agent lifecycle, exposes a WebSocket API, and ships with an MCP server so other agents can talk to it. Native apps for iOS, Android, macOS, Windows, Linux, and the web let you launch sessions, watch them work, review diffs, and ship from anywhere. A Docker-style CLI ("paseo run", "paseo ls", "paseo logs", "paseo wait") gives you scripting access. An end-to-end encrypted relay lets the mobile app reach your daemon over the public internet without exposing it.
+Run many agents in parallel, each in its own git worktree and branch. Choose a provider and model for each task, inspect the results, and decide what to merge. Agents can also create worktrees, launch other agents, and communicate with them through Paseo's orchestration tools.
 
-Paseo supports every major coding agent: Claude Code, Codex, GitHub Copilot, OpenCode, Cursor, Gemini, Cline, Goose, Amp, Aider, and 30+ others. Each agent runs as its own process; Paseo handles I/O, persistence, git worktree isolation, schedules, and skills.
+Agents run on your own machines with your existing tools, configuration, and credentials. Work from desktop, the full native iOS and Android app, a web browser, or the CLI. The desktop app starts its local daemon automatically. For remote work, run the daemon on another machine and connect directly or through the optional end-to-end encrypted relay.
+
+Paseo supports Claude Code, Codex, GitHub Copilot, OpenCode, Pi, Antigravity, Muse Code, and additional ACP-compatible agents. The CLI, TypeScript SDK, and MCP tools expose agent and workspace operations for automation. Plugins extend providers, workflows, and the app's interface.
 
 Distribution: native apps for Mac, Windows, Linux, iOS, and Android; web app; Homebrew; npm. Source: Apache-2.0 at https://github.com/getpaseo/paseo. Marketing site: https://paseo.sh.
 `;
diff --git a/packages/website/src/meta.ts b/packages/website/src/meta.ts
index a604f256f9..330b83611f 100644
--- a/packages/website/src/meta.ts
+++ b/packages/website/src/meta.ts
@@ -1,6 +1,6 @@
 const SITE_ORIGIN = "https://paseo.sh";
 
-export function pageMeta(title: string, description: string, path: string) {
+export function pageMeta(title: string, description: string, path: string, image?: string) {
   const url = `${SITE_ORIGIN}${path}`;
   return {
     meta: [
@@ -9,6 +9,12 @@ export function pageMeta(title: string, description: string, path: string) {
       { property: "og:title", content: title },
       { property: "og:description", content: description },
       { property: "og:url", content: url },
+      ...(image
+        ? [
+            { property: "og:image", content: image },
+            { name: "twitter:image", content: image },
+          ]
+        : []),
       { name: "twitter:title", content: title },
       { name: "twitter:description", content: description },
     ],
diff --git a/packages/website/src/plugin-docs-navigation.test.ts b/packages/website/src/plugin-docs-navigation.test.ts
index 1d44644b46..e2cef31fd4 100644
--- a/packages/website/src/plugin-docs-navigation.test.ts
+++ b/packages/website/src/plugin-docs-navigation.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
-import { buildDocsNavTree, getDocs, getLegacyDocsRedirect } from "./docs";
+import { buildDocsNavTree, getDoc, getDocs, getLegacyDocsRedirect } from "./docs";
 
-describe("versioned plugin documentation", () => {
-  it("keeps current and preview releases together in the Plugins navigation", () => {
+describe("plugin documentation", () => {
+  it("groups current guides by task without version navigation", () => {
     const plugins = buildDocsNavTree(getDocs()).find(
       (node) => node.type === "category" && node.label === "Plugins",
     );
@@ -10,34 +10,32 @@ describe("versioned plugin documentation", () => {
     expect(plugins).toMatchObject({
       type: "category",
       children: [
-        { type: "page", label: "Versions", href: "/docs/plugins" },
-        {
-          type: "group",
-          label: "Paseo v0.7 — Current",
-          href: "/docs/plugins/v0.7",
-          children: [{ type: "page", label: "Reference", href: "/docs/plugins/v0.7/reference" }],
-        },
-        {
-          type: "group",
-          label: "Paseo v0.8 — Preview",
-          href: "/docs/plugins/v0.8",
-          children: [
-            { type: "page", label: "Reference", href: "/docs/plugins/v0.8/reference" },
-            { type: "page", label: "Migration", href: "/docs/plugins/v0.8/migration" },
-          ],
-        },
+        { type: "page", label: "Quickstart", href: "/docs/plugins" },
+        { type: "page", label: "Publishing", href: "/docs/plugins/publishing" },
+        { type: "page", label: "Provider plugins", href: "/docs/plugins/providers" },
+        { type: "page", label: "Migration", href: "/docs/plugins/migration" },
+        { type: "page", label: "Reference", href: "/docs/plugins/reference" },
       ],
     });
   });
 
-  it("keeps existing plugin documentation URLs working", () => {
-    expect(getLegacyDocsRedirect("/docs/plugins/reference")).toBe("/docs/plugins/v0.7/reference");
-    expect(getLegacyDocsRedirect("/docs/plugins/reference.md")).toBe(
-      "/docs/plugins/v0.7/reference.md",
-    );
-    expect(getLegacyDocsRedirect("/docs/plugins/migration")).toBe("/docs/plugins/v0.8/migration");
-    expect(getLegacyDocsRedirect("/docs/plugins/migration.md")).toBe(
-      "/docs/plugins/v0.8/migration.md",
-    );
+  it.each(["v0.7", "v0.8"])("redirects %s links to existing current pages", (version) => {
+    for (const page of ["", "/index", "/reference", "/providers", "/migration"]) {
+      const target = `/docs/plugins${page === "/index" ? "" : page}`;
+      expect(getDoc(target.slice("/docs/".length))).toBeDefined();
+      for (const extension of ["", ".md"]) {
+        const source = `/docs/plugins/${version}${page}${extension}`;
+        expect(getLegacyDocsRedirect(source)).toBe(`${target}${extension}`);
+        expect(getLegacyDocsRedirect(`${source}/`)).toBe(`${target}${extension}`);
+      }
+    }
+  });
+
+  it("serves canonical pages without redirect loops", () => {
+    for (const page of ["", "/publishing", "/reference", "/providers", "/migration"]) {
+      expect(getLegacyDocsRedirect(`/docs/plugins${page}`)).toBeUndefined();
+      expect(getLegacyDocsRedirect(`/docs/plugins${page}.md`)).toBeUndefined();
+    }
+    expect(getLegacyDocsRedirect("/docs/plugins/v0.8/unknown")).toBeUndefined();
   });
 });
diff --git a/packages/website/src/plugins/author-link.tsx b/packages/website/src/plugins/author-link.tsx
new file mode 100644
index 0000000000..3a2be803f3
--- /dev/null
+++ b/packages/website/src/plugins/author-link.tsx
@@ -0,0 +1,52 @@
+import { Link } from "@tanstack/react-router";
+import { type ReactNode, useMemo } from "react";
+import { type Author, authorAvatarUrl } from "./registry";
+
+const SIZE_CLASS = {
+  xs: "h-4 w-4 text-[8px]",
+  sm: "h-5 w-5 text-[10px]",
+  lg: "h-14 w-14 text-xl",
+} as const;
+
+export function AuthorAvatar({ author, size }: { author: Author; size: keyof typeof SIZE_CLASS }) {
+  const url = authorAvatarUrl(author);
+  const className = `flex flex-shrink-0 items-center justify-center overflow-hidden rounded-full border border-white/10 bg-white/[0.06] font-medium text-white/60 ${SIZE_CLASS[size]}`;
+  if (url) {
+    return (
+      <span className={className}>
+        <img src={url} alt="" loading="lazy" className="h-full w-full object-cover" />
+      </span>
+    );
+  }
+  return (
+    <span aria-hidden className={className}>
+      {author.name.charAt(0).toUpperCase()}
+    </span>
+  );
+}
+
+const DEFAULT_CLASS =
+  "inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground transition-colors";
+
+/** Link to the author's plugin list. Renders avatar and name unless children are given. */
+export function AuthorLink({
+  author,
+  className = DEFAULT_CLASS,
+  children,
+}: {
+  author: Author;
+  className?: string;
+  children?: ReactNode;
+}) {
+  const params = useMemo(() => ({ owner: author.username }), [author.username]);
+  return (
+    <Link to="/plugins/$owner" params={params} className={className}>
+      {children ?? (
+        <>
+          <AuthorAvatar author={author} size="sm" />
+          {author.name}
+        </>
+      )}
+    </Link>
+  );
+}
diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
new file mode 100644
index 0000000000..38b6393662
--- /dev/null
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -0,0 +1,250 @@
+import { useMemo } from "react";
+import { SiteShell } from "~/components/site-shell";
+import { ContributeLinks } from "./contribute-links";
+import type { InstallCounts } from "./installs";
+import { type BrowseQuery, browseHref } from "./links";
+import { InstallCount } from "./install-count";
+import { PLUGIN_GRID_CLASS, PluginCard } from "./plugin-card";
+import { PluginSearch } from "./plugin-search";
+import { PluginSection } from "./section";
+import {
+  addedAgo,
+  CATEGORIES,
+  type CategorySlug,
+  getCategory,
+  getPluginsInCategory,
+  mostInstalled,
+  newestFirst,
+  type Plugin,
+  recentlyUpdated,
+  searchPlugins,
+  updatedAgo,
+} from "./registry";
+import { WindowSwitch } from "./window-switch";
+
+const NAV_BASE =
+  "flex items-center justify-between gap-3 rounded-md px-2.5 py-1.5 text-sm transition-colors";
+const NAV_ON = `${NAV_BASE} bg-white/[0.06] text-white`;
+const NAV_OFF = `${NAV_BASE} text-muted-foreground hover:text-foreground`;
+const CHIP_BASE =
+  "inline-flex flex-shrink-0 items-center rounded-full border px-3 py-1.5 text-xs transition-colors";
+const CHIP_ON = `${CHIP_BASE} border-white/20 bg-white/[0.07] text-white`;
+const CHIP_OFF = `${CHIP_BASE} border-white/10 text-muted-foreground`;
+const TAB_BASE = "-mb-px border-b pb-2 text-sm transition-colors";
+const TAB_ON = `${TAB_BASE} border-white text-white`;
+const TAB_OFF = `${TAB_BASE} border-transparent text-muted-foreground hover:text-foreground`;
+const CLEAR_CLASS =
+  "text-sm text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+
+/** All plugins or one category: sidebar, Most installed / Newest / Recently updated tabs, and the card grid. */
+export function BrowsePage({
+  plugins,
+  installs,
+  now,
+  query,
+}: {
+  plugins: Plugin[];
+  installs: Record<string, InstallCounts>;
+  now: string;
+  query: BrowseQuery;
+}) {
+  const category = query.category ? getCategory(query.category) : null;
+  const ordered = sortPlugins(plugins, installs, query);
+  // Search ranks by relevance; the tab's order breaks ties.
+  const matches = query.q ? searchPlugins(ordered, query.q) : ordered;
+  const results = category ? getPluginsInCategory(matches, category.slug) : matches;
+  const title = category?.label ?? "All plugins";
+  const clearHref = browseHref({ ...query, q: undefined });
+  return (
+    <SiteShell width="wide">
+      <div className="lg:flex lg:gap-12">
+        <aside className="mb-8 lg:mb-0 lg:w-48 lg:flex-shrink-0">
+          <PluginSearch scope={query} live className="mb-4 lg:mb-6" />
+          <CategoryNav plugins={matches} query={query} />
+        </aside>
+        <div className="min-w-0 flex-1">
+          <div className="mb-6 flex items-baseline justify-between gap-4">
+            <h1 className="text-3xl font-medium tracking-tight">
+              {query.q ? `Results for “${query.q}”${category ? ` in ${title}` : ""}` : title}
+              <span className="ml-3 align-middle text-sm font-normal tabular-nums text-extra-muted-foreground">
+                {results.length}
+              </span>
+            </h1>
+            {query.q && (
+              <a href={clearHref} className={CLEAR_CLASS}>
+                Clear
+              </a>
+            )}
+          </div>
+          <PluginSection>
+            <SortTabs query={query} />
+            {results.length === 0 && query.q && (
+              <div className="rounded-xl border border-white/10 bg-white/[0.03] px-4 py-10 text-center">
+                <p className="text-sm text-muted-foreground">No plugins match.</p>
+                <a
+                  href={clearHref}
+                  className="mt-2 inline-block text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground"
+                >
+                  Clear filters
+                </a>
+              </div>
+            )}
+            {results.length === 0 && !query.q && (
+              <p className="text-sm text-muted-foreground">
+                {query.sort === "updated"
+                  ? "No plugins have been updated since they were listed."
+                  : "No plugins in this category yet."}
+              </p>
+            )}
+            {results.length > 0 && (
+              <div className={PLUGIN_GRID_CLASS}>
+                {results.map((plugin) => (
+                  <PluginCard key={plugin.id} plugin={plugin}>
+                    <CardDetail plugin={plugin} installs={installs} now={now} query={query} />
+                  </PluginCard>
+                ))}
+              </div>
+            )}
+          </PluginSection>
+        </div>
+      </div>
+    </SiteShell>
+  );
+}
+
+function sortPlugins(
+  plugins: Plugin[],
+  installs: Record<string, InstallCounts>,
+  query: BrowseQuery,
+): Plugin[] {
+  if (query.sort === "new") return newestFirst(plugins);
+  if (query.sort === "updated") return recentlyUpdated(plugins);
+  return mostInstalled(plugins, installs, query.window);
+}
+
+/** What the card shows beside the author: the date the tab sorts by, or the install count. */
+function CardDetail({
+  plugin,
+  installs,
+  now,
+  query,
+}: {
+  plugin: Plugin;
+  installs: Record<string, InstallCounts>;
+  now: string;
+  query: BrowseQuery;
+}) {
+  if (query.sort === "new") return addedAgo(plugin, now);
+  if (query.sort === "updated") return updatedAgo(plugin, now);
+  return <InstallCount count={installs[plugin.id]?.[query.window] ?? 0} />;
+}
+
+interface NavEntry {
+  href: string;
+  label: string;
+  chip: string;
+  /** Absent for all plugins. */
+  slug?: CategorySlug;
+  count: number;
+}
+
+/** Category sidebar on wide screens, a row of chips on narrow ones. Counts follow the search. */
+function CategoryNav({ plugins, query }: { plugins: Plugin[]; query: BrowseQuery }) {
+  const entries: NavEntry[] = [
+    {
+      href: browseHref({ ...query, category: undefined }),
+      label: "All plugins",
+      chip: "All",
+      count: plugins.length,
+    },
+    ...CATEGORIES.map((category) => ({
+      href: browseHref({ ...query, category: category.slug }),
+      label: category.label,
+      chip: category.label,
+      slug: category.slug,
+      count: getPluginsInCategory(plugins, category.slug).length,
+    })),
+  ];
+  return (
+    <>
+      <nav aria-label="Categories" className="-ml-2.5 hidden lg:block">
+        {entries.map((entry, index) => (
+          <div key={entry.label}>
+            <a
+              href={entry.href}
+              aria-current={query.category === entry.slug ? "page" : undefined}
+              className={query.category === entry.slug ? NAV_ON : NAV_OFF}
+            >
+              {entry.label}
+              <span className="text-xs tabular-nums text-extra-muted-foreground">
+                {entry.count}
+              </span>
+            </a>
+            {index === 0 && <div className="my-3 h-px bg-white/10" />}
+          </div>
+        ))}
+        <div className="my-3 h-px bg-white/10" />
+        <div className="flex flex-col gap-1.5 px-2.5">
+          <ContributeLinks />
+        </div>
+      </nav>
+      <nav aria-label="Categories" className="-mx-6 flex gap-2 overflow-x-auto px-6 pb-1 lg:hidden">
+        {entries.map((entry) => (
+          <a
+            key={entry.label}
+            href={entry.href}
+            aria-current={query.category === entry.slug ? "page" : undefined}
+            className={query.category === entry.slug ? CHIP_ON : CHIP_OFF}
+          >
+            {entry.chip}
+          </a>
+        ))}
+      </nav>
+    </>
+  );
+}
+
+function SortTabs({ query }: { query: BrowseQuery }) {
+  const windowHrefs = useMemo(
+    () => ({
+      week: browseHref({ ...query, window: "week" }),
+      month: browseHref({ ...query, window: "month" }),
+      all: browseHref({ ...query, window: "all" }),
+    }),
+    [query],
+  );
+  const windowSwitch = query.sort === "installs" && (
+    <WindowSwitch current={query.window} hrefs={windowHrefs} />
+  );
+  return (
+    <div>
+      <div className="flex items-baseline justify-between gap-6 border-b border-white/10">
+        <div className="flex gap-6">
+          <a
+            href={browseHref({ ...query, sort: "installs" })}
+            aria-current={query.sort === "installs" ? "page" : undefined}
+            className={query.sort === "installs" ? TAB_ON : TAB_OFF}
+          >
+            Most installed
+          </a>
+          <a
+            href={browseHref({ ...query, sort: "new" })}
+            aria-current={query.sort === "new" ? "page" : undefined}
+            className={query.sort === "new" ? TAB_ON : TAB_OFF}
+          >
+            Newest
+          </a>
+          <a
+            href={browseHref({ ...query, sort: "updated" })}
+            aria-current={query.sort === "updated" ? "page" : undefined}
+            className={query.sort === "updated" ? TAB_ON : TAB_OFF}
+          >
+            Recently updated
+          </a>
+        </div>
+        {windowSwitch && <div className="hidden pb-2 sm:block">{windowSwitch}</div>}
+      </div>
+      {windowSwitch && <div className="mt-4 sm:hidden">{windowSwitch}</div>}
+    </div>
+  );
+}
diff --git a/packages/website/src/plugins/categories.ts b/packages/website/src/plugins/categories.ts
new file mode 100644
index 0000000000..96fc836bf4
--- /dev/null
+++ b/packages/website/src/plugins/categories.ts
@@ -0,0 +1,52 @@
+export const CATEGORIES = [
+  {
+    slug: "daemon-management",
+    label: "Daemon management",
+    description: "Manage hosts, daemon jobs, resources, approvals, and MCP servers.",
+  },
+  {
+    slug: "themes",
+    label: "Themes",
+    description: "Change the app color scheme.",
+  },
+  {
+    slug: "providers",
+    label: "Providers",
+    description:
+      "Connect coding agents, ACP servers, and model routers, with account and quota fallback.",
+  },
+  {
+    slug: "orchestration",
+    label: "Orchestration",
+    description: "Coordinate agents, delegate work, and send messages across hosts.",
+  },
+  {
+    slug: "git",
+    label: "Git",
+    description: "Work with branches, worktrees, pull requests, stacks, diffs, and reviews.",
+  },
+  {
+    slug: "workspaces",
+    label: "Workspaces",
+    description: "Add workspace panels and tabs for boards, browsers, documents, and terminals.",
+  },
+  {
+    slug: "sidebar",
+    label: "Sidebar",
+    description: "Add sidebar items and panels for usage, notifications, pricing, and links.",
+  },
+  {
+    slug: "extras",
+    label: "Extras",
+    description: "Add presence, pets, puzzles, wellbeing reminders, and demos.",
+  },
+  {
+    slug: "utils",
+    label: "Utils",
+    description:
+      "Extend the composer and timeline with commands, prompts, skills, and small helpers.",
+  },
+] as const;
+
+export type CategorySlug = (typeof CATEGORIES)[number]["slug"];
+export type Category = (typeof CATEGORIES)[number];
diff --git a/packages/website/src/plugins/contribute-links.tsx b/packages/website/src/plugins/contribute-links.tsx
new file mode 100644
index 0000000000..705615770d
--- /dev/null
+++ b/packages/website/src/plugins/contribute-links.tsx
@@ -0,0 +1,57 @@
+import { DOCS_URL, SUBMIT_URL } from "./links";
+
+const LINK_CLASS =
+  "text-sm text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+const PRIMARY_BUTTON_CLASS =
+  "inline-flex items-center justify-center rounded-lg bg-foreground px-4 py-2 text-sm font-medium text-background transition-colors hover:bg-foreground/90";
+const SECONDARY_BUTTON_CLASS =
+  "inline-flex items-center justify-center rounded-lg border border-white/12 px-4 py-2 text-sm text-white transition-colors hover:bg-white/10";
+
+/** "Read the docs" and "Submit a plugin", as two quiet links. */
+export function ContributeLinks() {
+  return (
+    <>
+      <a href={DOCS_URL} className={LINK_CLASS}>
+        Read the docs
+      </a>
+      <a href={SUBMIT_URL} className={LINK_CLASS}>
+        Submit a plugin
+      </a>
+    </>
+  );
+}
+
+/** "Submit a plugin" and "Read the docs", as a primary and a secondary button. */
+export function ContributeButtons() {
+  return (
+    <>
+      <a href={SUBMIT_URL} className={PRIMARY_BUTTON_CLASS}>
+        Submit a plugin
+      </a>
+      <a href={DOCS_URL} className={SECONDARY_BUTTON_CLASS}>
+        Read the docs
+      </a>
+    </>
+  );
+}
+
+/** Closing section of the directory: what a plugin can do, with Submit and Read the docs buttons. */
+export function ContributeSection() {
+  return (
+    <section
+      aria-labelledby="build-your-own"
+      className="mt-20 rounded-xl border border-white/10 bg-white/[0.03] px-6 py-8 text-center sm:px-8"
+    >
+      <h2 id="build-your-own" className="text-lg font-medium">
+        Build your own plugin
+      </h2>
+      <p className="mx-auto mt-2 max-w-lg text-sm text-muted-foreground">
+        Plugins add themes, workspace panels, slash commands, and agent hooks to Paseo. Write one
+        with the plugin docs, then submit it to get it listed here.
+      </p>
+      <div className="mt-6 flex flex-wrap justify-center gap-3">
+        <ContributeButtons />
+      </div>
+    </section>
+  );
+}
diff --git a/packages/website/src/plugins/hero.tsx b/packages/website/src/plugins/hero.tsx
new file mode 100644
index 0000000000..0683a0d6e0
--- /dev/null
+++ b/packages/website/src/plugins/hero.tsx
@@ -0,0 +1,37 @@
+import { ContributeButtons } from "./contribute-links";
+import type { BrowseQuery } from "./links";
+import { PluginSearch } from "./plugin-search";
+
+interface PluginsHeroProps {
+  pluginCount: number;
+  authorCount: number;
+  /** Where the search box sends its term. */
+  searchScope: BrowseQuery;
+}
+
+function plural(count: number, word: string): string {
+  return `${count} ${word}${count === 1 ? "" : "s"}`;
+}
+
+/** Header of the plugin directory: title, counts, and copy, then the contribute buttons and search. */
+export function PluginsHero({ pluginCount, authorCount, searchScope }: PluginsHeroProps) {
+  return (
+    <header>
+      <h1 className="flex flex-wrap items-baseline gap-x-3 gap-y-1">
+        <span className="text-3xl font-medium tracking-tight">Plugins</span>
+        <span className="text-sm font-normal tabular-nums text-extra-muted-foreground">
+          {plural(pluginCount, "plugin")} by {plural(authorCount, "author")}
+        </span>
+      </h1>
+      <p className="mt-3 max-w-xl text-sm leading-relaxed text-muted-foreground">
+        Browse community plugins that extend Paseo with new functionality.
+      </p>
+      <div className="mt-6 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex flex-wrap gap-3">
+          <ContributeButtons />
+        </div>
+        <PluginSearch scope={searchScope} className="w-full sm:w-64" />
+      </div>
+    </header>
+  );
+}
diff --git a/packages/website/src/plugins/index.ts b/packages/website/src/plugins/index.ts
new file mode 100644
index 0000000000..d0c892ed8c
--- /dev/null
+++ b/packages/website/src/plugins/index.ts
@@ -0,0 +1,2 @@
+export * from "./registry";
+export { getRegistry, getRegistryPlugin } from "./loader";
diff --git a/packages/website/src/plugins/install-count.tsx b/packages/website/src/plugins/install-count.tsx
new file mode 100644
index 0000000000..198905ddea
--- /dev/null
+++ b/packages/website/src/plugins/install-count.tsx
@@ -0,0 +1,13 @@
+import { Download } from "lucide-react";
+import { formatInstalls } from "./registry";
+
+/** An install count as a download icon and the number; inherits the surrounding text style. */
+export function InstallCount({ count }: { count: number }) {
+  return (
+    <span className="relative inline-flex items-center gap-1 tabular-nums">
+      <Download aria-hidden className="h-3 w-3" />
+      {formatInstalls(count)}
+      <span className="sr-only">installs</span>
+    </span>
+  );
+}
diff --git a/packages/website/src/plugins/installs.ts b/packages/website/src/plugins/installs.ts
new file mode 100644
index 0000000000..78b4294639
--- /dev/null
+++ b/packages/website/src/plugins/installs.ts
@@ -0,0 +1,93 @@
+// Install counts live in the website KV. The all-time counter predates the daily record and
+// stays the "All time" number; the daily record keeps the last 60 days for the shorter windows.
+export type InstallWindow = "week" | "month" | "all";
+export type InstallCounts = Record<InstallWindow, number>;
+/** UTC day (YYYY-MM-DD) to installs that day. */
+export type DailyInstalls = Record<string, number>;
+
+const DAY_MS = 24 * 60 * 60 * 1000;
+const DAYS_KEPT = 60;
+const WINDOW_DAYS = { week: 7, month: 30 } as const;
+
+const totalKey = (id: string) => `plugin-installs:${id}`;
+const dailyKey = (id: string) => `plugin-installs-daily:${id}`;
+
+export async function recordClientInstall({
+  cache,
+  id,
+  ip,
+}: {
+  cache: KVNamespace;
+  id: string;
+  ip: string | null;
+}): Promise<void> {
+  if (!ip) return;
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(ip));
+  const hash = Array.from(new Uint8Array(digest), (byte) =>
+    byte.toString(16).padStart(2, "0"),
+  ).join("");
+  const key = `plugin-installs-client:${id}:${hash}`;
+  if ((await cache.get(key)) !== null) return;
+  await cache.put(key, "1", { expirationTtl: 3600 });
+  await recordInstall(cache, id, new Date());
+}
+
+export async function recordInstall(cache: KVNamespace, id: string, now: Date): Promise<void> {
+  const [total, daily] = await Promise.all([cache.get(totalKey(id)), readDaily(cache, id)]);
+  await Promise.all([
+    cache.put(totalKey(id), String(Number(total ?? 0) + 1)),
+    cache.put(dailyKey(id), JSON.stringify(addInstall(daily, now))),
+  ]);
+}
+
+export async function readInstallCounts(
+  cache: KVNamespace | null,
+  ids: string[],
+  now: Date,
+): Promise<Record<string, InstallCounts>> {
+  const entries = await Promise.all(
+    ids.map(async (id) => {
+      if (!cache) return [id, countInstalls({}, 0, now)] as const;
+      const [total, daily] = await Promise.all([cache.get(totalKey(id)), readDaily(cache, id)]);
+      return [id, countInstalls(daily, Number(total ?? 0), now)] as const;
+    }),
+  );
+  return Object.fromEntries(entries);
+}
+
+export function addInstall(daily: DailyInstalls, now: Date): DailyInstalls {
+  const oldest = utcDay(now, DAYS_KEPT - 1);
+  const kept = Object.fromEntries(Object.entries(daily).filter(([day]) => day >= oldest));
+  const today = utcDay(now, 0);
+  kept[today] = (kept[today] ?? 0) + 1;
+  return kept;
+}
+
+export function countInstalls(daily: DailyInstalls, total: number, now: Date): InstallCounts {
+  return {
+    week: installsSince(daily, utcDay(now, WINDOW_DAYS.week - 1)),
+    month: installsSince(daily, utcDay(now, WINDOW_DAYS.month - 1)),
+    all: total,
+  };
+}
+
+function installsSince(daily: DailyInstalls, oldest: string): number {
+  return Object.entries(daily).reduce(
+    (sum, [day, count]) => (day >= oldest ? sum + count : sum),
+    0,
+  );
+}
+
+function utcDay(now: Date, daysBefore: number): string {
+  return new Date(now.getTime() - daysBefore * DAY_MS).toISOString().slice(0, 10);
+}
+
+async function readDaily(cache: KVNamespace, id: string): Promise<DailyInstalls> {
+  const value: unknown = await cache.get(dailyKey(id), { type: "json" });
+  if (typeof value !== "object" || value === null) return {};
+  return Object.fromEntries(
+    Object.entries(value).filter(
+      (entry): entry is [string, number] => typeof entry[1] === "number",
+    ),
+  );
+}
diff --git a/packages/website/src/plugins/launch.ts b/packages/website/src/plugins/launch.ts
new file mode 100644
index 0000000000..bfe0d00385
--- /dev/null
+++ b/packages/website/src/plugins/launch.ts
@@ -0,0 +1 @@
+export const PLUGINS_LINKED = true;
diff --git a/packages/website/src/plugins/links.ts b/packages/website/src/plugins/links.ts
new file mode 100644
index 0000000000..18eab1535f
--- /dev/null
+++ b/packages/website/src/plugins/links.ts
@@ -0,0 +1,48 @@
+import type { CategorySlug } from "./categories";
+import type { InstallWindow } from "./installs";
+
+export const DOCS_URL = "/docs/plugins";
+export const SUBMIT_URL =
+  "https://github.com/getpaseo/plugins/issues/new?template=submit-plugin.yml";
+
+export type BrowseSort = "installs" | "new" | "updated";
+export interface BrowseQuery {
+  /** Absent for all plugins. */
+  category?: CategorySlug;
+  sort: BrowseSort;
+  window: InstallWindow;
+  /** Search term; absent when not searching. */
+  q?: string;
+}
+
+export const DEFAULT_WINDOW: InstallWindow = "week";
+
+export function parseWindow(value: unknown): InstallWindow | undefined {
+  return value === "month" || value === "all" ? value : undefined;
+}
+export function parseSearchTerm(value: unknown): string | undefined {
+  return typeof value === "string" && value.trim() ? value : undefined;
+}
+export function parseSort(value: unknown): BrowseSort | undefined {
+  return value === "new" || value === "updated" ? value : undefined;
+}
+
+export function pluginHref(id: string): string {
+  return `/plugins/${id}`;
+}
+export function categoryHref(category: CategorySlug): string {
+  return `/plugins/category/${category}`;
+}
+export function browseHref({ category, sort, window, q }: BrowseQuery): string {
+  const path = category ? categoryHref(category) : "/plugins/all";
+  const params = new URLSearchParams();
+  if (q) params.set("q", q);
+  if (sort !== "installs") params.set("sort", sort);
+  else if (window !== DEFAULT_WINDOW) params.set("window", window);
+  const search = params.toString();
+  return search ? `${path}?${search}` : path;
+}
+/** The directory's Most installed section in a time window. */
+export function mostInstalledHref(window: InstallWindow): string {
+  return `/plugins${window === DEFAULT_WINDOW ? "" : `?window=${window}`}#most-installed`;
+}
diff --git a/packages/website/src/plugins/loader.ts b/packages/website/src/plugins/loader.ts
new file mode 100644
index 0000000000..ebc9bf8272
--- /dev/null
+++ b/packages/website/src/plugins/loader.ts
@@ -0,0 +1,30 @@
+import { createServerFn } from "@tanstack/react-start";
+import { env } from "cloudflare:workers";
+import { getWebsiteCacheContext } from "~/cloudflare-cache";
+import {
+  loadInstallCounts,
+  loadRegistryIndex,
+  loadRegistryPlugin,
+  type RegistryEnvironment,
+} from "./published";
+
+function registryBase(): string {
+  return (env as RegistryEnvironment).PLUGINS_REGISTRY_URL ?? "https://getpaseo.github.io/plugins";
+}
+/** Listed plugins in index order, featured plugin IDs, install counts per window, and the server's clock. */
+export const getRegistry = createServerFn({ method: "GET" }).handler(async () => {
+  const context = getWebsiteCacheContext();
+  const [index, installs] = await Promise.all([
+    loadRegistryIndex(registryBase(), context),
+    loadInstallCounts(registryBase(), context),
+  ]);
+  return {
+    plugins: index.plugins,
+    featured: index.featured,
+    installs,
+    now: new Date().toISOString(),
+  };
+});
+export const getRegistryPlugin = createServerFn({ method: "GET" })
+  .validator((id: string) => id)
+  .handler(({ data }) => loadRegistryPlugin(registryBase(), data, getWebsiteCacheContext()));
diff --git a/packages/website/src/plugins/media-gallery.tsx b/packages/website/src/plugins/media-gallery.tsx
new file mode 100644
index 0000000000..ac25a6f53e
--- /dev/null
+++ b/packages/website/src/plugins/media-gallery.tsx
@@ -0,0 +1,231 @@
+import { pluginOverviewPolicy, pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+import { pluginMediaKind } from "@getpaseo/protocol/plugin-registry";
+import { ChevronLeft, ChevronRight, Play, X } from "lucide-react";
+import {
+  type CSSProperties,
+  type KeyboardEvent,
+  type MouseEvent,
+  type SyntheticEvent,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+
+const TILE_CLASS =
+  "relative block aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%]";
+// Two tiles fill the row; with more, a third peeks at the right edge to show the strip scrolls.
+const FILLING_TILE_CLASS = `${TILE_CLASS} md:w-[calc(50%-0.375rem)]`;
+const PEEKING_TILE_CLASS = `${TILE_CLASS} md:w-[42%]`;
+// The viewer's room: media never exceeds this box, which leaves a margin around it.
+const VIEW_WIDTH = "90vw";
+const VIEW_HEIGHT = "85vh";
+const VIEW_CLASS = "max-h-[85vh] max-w-[90vw] rounded-lg object-contain";
+const VIEWER_BUTTON_CLASS =
+  "fixed rounded-full bg-black/60 p-2 text-white transition-colors hover:bg-black/80";
+const ARROW_STEPS: Partial<Record<string, number>> = { ArrowLeft: -1, ArrowRight: 1 };
+
+interface MediaItem {
+  url: string;
+  kind: "image" | "video";
+  /** Image alt text, or the video's accessible name. */
+  label: string;
+}
+
+/** Plugin media in registry order. Each tile opens the viewer; without JavaScript it links to the file. */
+export function MediaGallery({ name, media }: { name: string; media: string[] }) {
+  const dialog = useRef<HTMLDialogElement>(null);
+  const entries = useMemo(
+    () => media.map((url, index) => mediaEntry(name, url, index)),
+    [name, media],
+  );
+  const items = useMemo(() => entries.filter((entry) => typeof entry !== "string"), [entries]);
+  const [viewing, setViewing] = useState<number | null>(null);
+  const item = viewing === null ? undefined : items[viewing];
+  const open = useCallback(
+    (opened: MediaItem) => {
+      setViewing(items.indexOf(opened));
+      dialog.current?.showModal();
+    },
+    [items],
+  );
+  const close = useCallback(() => dialog.current?.close(), []);
+  // Unmounting the viewed media stops a playing video.
+  const handleClose = useCallback(() => setViewing(null), []);
+  const closeOnBackdrop = useCallback((event: MouseEvent<HTMLDialogElement>) => {
+    if (event.target === event.currentTarget) event.currentTarget.close();
+  }, []);
+  const step = useCallback(
+    (by: number) =>
+      setViewing((index) => (index === null ? null : (index + by + items.length) % items.length)),
+    [items.length],
+  );
+  const showPrevious = useCallback(() => step(-1), [step]);
+  const showNext = useCallback(() => step(1), [step]);
+  // Captured so arrow keys move between items even while a focused video would seek.
+  const stepWithArrowKeys = useCallback(
+    (event: KeyboardEvent<HTMLDialogElement>) => {
+      const by = ARROW_STEPS[event.key];
+      if (by === undefined || items.length < 2) return;
+      event.preventDefault();
+      step(by);
+    },
+    [items.length, step],
+  );
+
+  if (media.length === 0) return null;
+  const tileClass = items.length > 2 ? PEEKING_TILE_CLASS : FILLING_TILE_CLASS;
+  return (
+    <>
+      <div className="-mx-6 mt-10 flex gap-3 overflow-x-auto px-6 md:mx-0 md:px-0">
+        {entries.map((entry) =>
+          typeof entry === "string" ? (
+            <p key={entry}>{entry}</p>
+          ) : (
+            <MediaTile key={entry.url} item={entry} className={tileClass} onOpen={open} />
+          ),
+        )}
+      </div>
+      {/* Focusable so arrow keys still reach it after a click on non-focusable media. */}
+      <dialog
+        ref={dialog}
+        tabIndex={-1}
+        aria-label={item?.label}
+        onClose={handleClose}
+        onClick={closeOnBackdrop}
+        onKeyDownCapture={stepWithArrowKeys}
+        className="m-auto overflow-visible bg-transparent p-0 outline-none backdrop:bg-black/80"
+      >
+        {item?.kind === "image" && (
+          <img key={viewing} src={item.url} alt={item.label} className={VIEW_CLASS} />
+        )}
+        {item?.kind === "video" && <ViewerVideo key={viewing} url={item.url} label={item.label} />}
+        {items.length > 1 && (
+          <>
+            <button
+              type="button"
+              aria-label="Previous"
+              onClick={showPrevious}
+              className={`${VIEWER_BUTTON_CLASS} left-4 top-1/2 -translate-y-1/2`}
+            >
+              <ChevronLeft className="h-5 w-5" />
+            </button>
+            <button
+              type="button"
+              aria-label="Next"
+              onClick={showNext}
+              className={`${VIEWER_BUTTON_CLASS} right-4 top-1/2 -translate-y-1/2`}
+            >
+              <ChevronRight className="h-5 w-5" />
+            </button>
+          </>
+        )}
+        <button
+          type="button"
+          aria-label="Close"
+          onClick={close}
+          className={`${VIEWER_BUTTON_CLASS} right-4 top-4`}
+        >
+          <X className="h-5 w-5" />
+        </button>
+      </dialog>
+    </>
+  );
+}
+
+/** A registry media entry as a gallery item, or the raw entry when it is not a safe URL. */
+function mediaEntry(name: string, url: string, index: number): MediaItem | string {
+  const source = pluginOverviewUrl(url);
+  if (!source) return url;
+  const kind = pluginMediaKind(source);
+  return {
+    url: source,
+    kind,
+    label: `${name} ${kind === "video" ? "video" : "screenshot"} ${index + 1}`,
+  };
+}
+
+/** Fills the viewer's room at the video's aspect ratio, scaling small sources up. */
+function ViewerVideo({ url, label }: { url: string; label: string }) {
+  const [aspectRatio, setAspectRatio] = useState<number | null>(null);
+  const readAspectRatio = useCallback((event: SyntheticEvent<HTMLVideoElement>) => {
+    const { videoWidth, videoHeight } = event.currentTarget;
+    setAspectRatio(videoWidth / videoHeight);
+  }, []);
+  const style = useMemo<CSSProperties | undefined>(
+    () =>
+      aspectRatio === null
+        ? undefined
+        : { aspectRatio, width: `min(${VIEW_WIDTH}, ${VIEW_HEIGHT} * ${aspectRatio})` },
+    [aspectRatio],
+  );
+  return (
+    <video
+      src={url}
+      aria-label={label}
+      controls
+      autoPlay
+      playsInline
+      onLoadedMetadata={readAspectRatio}
+      style={style}
+      className={VIEW_CLASS}
+    />
+  );
+}
+
+function MediaTile({
+  item,
+  className,
+  onOpen,
+}: {
+  item: MediaItem;
+  className: string;
+  onOpen: (item: MediaItem) => void;
+}) {
+  const { url, kind, label } = item;
+  const handleClick = useCallback(
+    (event: MouseEvent<HTMLAnchorElement>) => {
+      // Modified clicks keep the link's own behavior, such as opening the file in a new tab.
+      if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+      event.preventDefault();
+      onOpen(item);
+    },
+    [onOpen, item],
+  );
+  return (
+    <a
+      href={url}
+      {...pluginOverviewPolicy.link}
+      aria-label={kind === "video" ? label : undefined}
+      onClick={handleClick}
+      className={className}
+    >
+      {kind === "image" ? (
+        <img
+          src={url}
+          alt={label}
+          loading="lazy"
+          className="h-full w-full object-cover object-top"
+        />
+      ) : (
+        <>
+          <video
+            src={url}
+            preload="metadata"
+            muted
+            playsInline
+            className="h-full w-full object-cover object-top"
+          />
+          <span
+            aria-hidden
+            className="absolute inset-0 flex items-center justify-center bg-black/10"
+          >
+            <span className="rounded-full bg-black/60 p-3 text-white">
+              <Play className="h-5 w-5 fill-current" />
+            </span>
+          </span>
+        </>
+      )}
+    </a>
+  );
+}
diff --git a/packages/website/src/plugins/not-found.tsx b/packages/website/src/plugins/not-found.tsx
new file mode 100644
index 0000000000..f07a363b12
--- /dev/null
+++ b/packages/website/src/plugins/not-found.tsx
@@ -0,0 +1,21 @@
+import { Link } from "@tanstack/react-router";
+import { Breadcrumbs } from "~/components/breadcrumbs";
+import { SiteShell } from "~/components/site-shell";
+
+const NOT_FOUND_CRUMBS = [{ label: "Plugins", href: "/plugins" }, { label: "Not found" }];
+
+export function PluginsNotFound({ title, children }: { title: string; children: string }) {
+  return (
+    <SiteShell width="default">
+      <Breadcrumbs items={NOT_FOUND_CRUMBS} />
+      <h1 className="text-3xl font-medium tracking-tight mb-4">{title}</h1>
+      <p className="text-lg text-white/70 leading-relaxed max-w-2xl">
+        {children}{" "}
+        <Link to="/plugins" className="underline hover:text-white">
+          Browse all plugins
+        </Link>
+        .
+      </p>
+    </SiteShell>
+  );
+}
diff --git a/packages/website/src/plugins/overview.test.tsx b/packages/website/src/plugins/overview.test.tsx
new file mode 100644
index 0000000000..45bccecb37
--- /dev/null
+++ b/packages/website/src/plugins/overview.test.tsx
@@ -0,0 +1,147 @@
+import registry from "../../e2e/registry.fixture.json";
+import { PluginTile } from "./plugin-tile";
+import { PluginCard } from "./plugin-card";
+import { authorAvatarUrl, getAuthor, type Plugin } from "./registry";
+import React, { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { parseFragment, type DefaultTreeAdapterMap } from "parse5";
+import { describe, expect, it } from "vitest";
+import corpus from "../../../protocol/tests/fixtures/plugin-overview.json";
+import { PluginOverview } from "./overview";
+
+type Element = DefaultTreeAdapterMap["element"];
+function elements(html: string): Element[] {
+  const result: Element[] = [];
+  function visit(node: DefaultTreeAdapterMap["node"]) {
+    if ("tagName" in node) result.push(node);
+    if ("childNodes" in node) node.childNodes.forEach(visit);
+  }
+  visit(parseFragment(html));
+  return result;
+}
+function render(markdown: string) {
+  return renderToStaticMarkup(<PluginOverview>{markdown}</PluginOverview>);
+}
+function attribute(element: Element, name: string) {
+  return element.attrs.find((attr) => attr.name === name)?.value;
+}
+function imageSources(html: string) {
+  return elements(html)
+    .filter((node) => node.tagName === "img")
+    .map((node) => attribute(node, "src"));
+}
+/** Cards show the author's GitHub avatar beside the plugin's own images. */
+function avatarUrl(plugin: Plugin) {
+  return authorAvatarUrl(getAuthor(plugin));
+}
+const allowedTags = new Set([
+  "div",
+  "p",
+  "br",
+  "hr",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "blockquote",
+  "ul",
+  "ol",
+  "li",
+  "strong",
+  "em",
+  "del",
+  "pre",
+  "code",
+  "a",
+  "img",
+  "table",
+  "thead",
+  "tbody",
+  "tr",
+  "th",
+  "td",
+]);
+
+describe("plugin overview security corpus", () => {
+  it.each(corpus)("$name", ({ markdown, links, images }) => {
+    const nodes = elements(render(markdown));
+    expect(
+      nodes.filter((node) => !allowedTags.has(node.tagName)).map((node) => node.tagName),
+    ).toEqual([]);
+    expect(
+      nodes.flatMap((node) => node.attrs).filter((attr) => /^on|^style$|^srcdoc$/i.test(attr.name)),
+    ).toEqual([]);
+    const anchors = nodes.filter((node) => node.tagName === "a");
+    expect(anchors.map((node) => attribute(node, "href"))).toEqual(links);
+    for (const anchor of anchors) {
+      expect(attribute(anchor, "rel")).toBe("noopener noreferrer nofollow");
+      expect(attribute(anchor, "target")).toBe("_blank");
+    }
+    expect(
+      nodes.filter((node) => node.tagName === "img").map((node) => attribute(node, "src")),
+    ).toEqual(images);
+  });
+
+  it.each(corpus)("preserves $name inside code spans and fences", ({ markdown }) => {
+    for (const code of [
+      `\`${markdown.replaceAll("\n", " ")}\``,
+      `\`\`\`html\n${markdown}\n\`\`\``,
+    ]) {
+      const nodes = elements(render(code));
+      expect(
+        nodes.filter((node) => ["a", "img", "script", "iframe", "svg"].includes(node.tagName)),
+      ).toEqual([]);
+      const text = nodes
+        .filter((node) => node.tagName === "code")
+        .flatMap((node) => node.childNodes)
+        .map((child) => ("value" in child ? child.value : ""))
+        .join("");
+      expect(text.trim()).toBe(
+        code.startsWith("```html") ? markdown : markdown.replaceAll("\n", " "),
+      );
+    }
+  });
+
+  it("keeps long untrusted input inert", () => {
+    const nodes = elements(
+      render("a".repeat(100_000) + "\n\n" + "[click](javascript:alert(1)) ".repeat(1_000)),
+    );
+    expect(nodes.filter((node) => ["a", "img", "script"].includes(node.tagName))).toEqual([]);
+  });
+});
+
+describe("registry images", () => {
+  it.each([
+    "http://example.com/x",
+    "data:image/png;base64,AAAA",
+    "javascript:alert(1)",
+    "vbscript:msgbox(1)",
+    "./icon.png",
+    "//example.com/x",
+  ])("does not load %s in cards or icons", (url) => {
+    const plugin = { ...registry.plugins[0], icon: url, media: [url] } as Plugin;
+    for (const component of [
+      createElement(PluginTile, { plugin, size: "sm" }),
+      createElement(PluginCard, { plugin }),
+    ]) {
+      expect(
+        imageSources(renderToStaticMarkup(component)).filter((src) => src !== avatarUrl(plugin)),
+      ).toEqual([]);
+    }
+  });
+});
+
+it("uses the first HTTPS screenshot when an earlier screenshot is rejected", () => {
+  const source = "https://example.com/screenshot.png";
+  const plugin = {
+    ...registry.plugins[0],
+    icon: undefined,
+    media: ["data:image/png;base64,AAAA", source],
+  } as Plugin;
+  expect(imageSources(renderToStaticMarkup(createElement(PluginCard, { plugin })))).toEqual([
+    source,
+    avatarUrl(plugin),
+  ]);
+});
diff --git a/packages/website/src/plugins/overview.tsx b/packages/website/src/plugins/overview.tsx
new file mode 100644
index 0000000000..8fc680f9a9
--- /dev/null
+++ b/packages/website/src/plugins/overview.tsx
@@ -0,0 +1,56 @@
+import type { ReactNode } from "react";
+import ReactMarkdown, { type Components } from "react-markdown";
+import remarkGfm from "remark-gfm";
+import { pluginOverviewPolicy, pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+
+/** A rejected destination leaves its label as text, without even an empty anchor. */
+export function PluginContentLink({
+  href,
+  children,
+  className,
+}: {
+  href?: string;
+  children: ReactNode;
+  className?: string;
+}) {
+  const destination = pluginOverviewUrl(href);
+  return destination ? (
+    <a href={destination} {...pluginOverviewPolicy.link} className={className}>
+      {children}
+    </a>
+  ) : (
+    children
+  );
+}
+
+const allowedElements = [...pluginOverviewPolicy.elements];
+const remarkPlugins = [remarkGfm];
+
+const components: Components = {
+  a: ({ href, children }) => <PluginContentLink href={href}>{children}</PluginContentLink>,
+  img: ({ src, alt }) => {
+    const source = pluginOverviewUrl(typeof src === "string" ? src : undefined);
+    return source ? <img src={source} alt={alt ?? ""} loading="lazy" /> : alt;
+  },
+  // GFM alignment otherwise becomes an inline style in react-markdown.
+  th: ({ children }) => <th>{children}</th>,
+  td: ({ children }) => <td>{children}</td>,
+};
+
+/** Untrusted overviews do not inherit documentation directives, anchors, or HTML highlighters. */
+export function PluginOverview({ children }: { children: string }) {
+  return (
+    <div className="docs-prose">
+      <ReactMarkdown
+        skipHtml={!pluginOverviewPolicy.rawHtml}
+        allowedElements={allowedElements}
+        unwrapDisallowed
+        remarkPlugins={remarkPlugins}
+        urlTransform={pluginOverviewUrl}
+        components={components}
+      >
+        {children}
+      </ReactMarkdown>
+    </div>
+  );
+}
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
new file mode 100644
index 0000000000..c46b9f553a
--- /dev/null
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -0,0 +1,96 @@
+import type { ReactNode } from "react";
+import { AuthorAvatar } from "./author-link";
+import { InstallCount } from "./install-count";
+import { pluginCardScreenshot } from "./thumbnails";
+import { pluginHref } from "./links";
+import { PluginTile } from "./plugin-tile";
+import { firstMediaImage, getAuthor, getCategory, type Plugin } from "./registry";
+
+export const PLUGIN_GRID_CLASS =
+  "grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4";
+
+/** First allowed image, or the plugin tile on a quiet backdrop when there is none. */
+function PluginShot({ plugin }: { plugin: Plugin }) {
+  const url = firstMediaImage(plugin);
+  return (
+    <div
+      aria-hidden
+      className="aspect-[16/10] overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] transition-colors group-hover:border-white/20"
+    >
+      {url ? (
+        <img
+          {...pluginCardScreenshot(plugin.id, url)}
+          alt=""
+          loading="lazy"
+          decoding="async"
+          className="h-full w-full object-cover object-left-top"
+        />
+      ) : (
+        <div className="flex h-full w-full items-center justify-center bg-[radial-gradient(circle_at_30%_20%,rgba(35,153,86,0.12),transparent_60%)]">
+          <PluginTile plugin={plugin} size="lg" />
+        </div>
+      )}
+    </div>
+  );
+}
+
+/**
+ * Gallery card, in three rows under the screenshot: tile and name, description, then author and
+ * `children`, such as when the plugin was added or its install count.
+ */
+export function PluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
+  const author = getAuthor(plugin);
+  return (
+    // Grid items size to their content by default; min-w-0 keeps the card in its column.
+    <a href={pluginHref(plugin.id)} className="group block min-w-0">
+      <PluginShot plugin={plugin} />
+      <div className="mt-3 flex items-center gap-2">
+        <PluginTile plugin={plugin} size="xs" />
+        <p className="min-w-0 truncate text-sm font-medium text-white">{plugin.name}</p>
+      </div>
+      <p className="mt-2 line-clamp-2 min-h-10 break-words text-xs leading-5 text-muted-foreground">
+        {plugin.description}
+      </p>
+      <p className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-extra-muted-foreground">
+        <AuthorAvatar author={author} size="xs" />
+        <span className="truncate">{author.name}</span>
+        {children !== undefined && (
+          <>
+            <span aria-hidden>·</span>
+            <span className="flex-shrink-0">{children}</span>
+          </>
+        )}
+      </p>
+    </a>
+  );
+}
+
+/** Ranked row for the directory's Most installed list. */
+export function PluginRankRow({
+  plugin,
+  rank,
+  installs,
+}: {
+  plugin: Plugin;
+  rank: number;
+  installs: number;
+}) {
+  return (
+    <a
+      href={pluginHref(plugin.id)}
+      className="flex items-center gap-3 rounded-lg px-4 py-2.5 transition-colors hover:bg-white/[0.04]"
+    >
+      <span className="text-sm tabular-nums text-extra-muted-foreground">{rank}</span>
+      <PluginTile plugin={plugin} size="sm" />
+      <div className="min-w-0 flex-1">
+        <p className="truncate text-sm text-white">{plugin.name}</p>
+        <p className="truncate text-xs text-extra-muted-foreground">
+          {getCategory(plugin.categories[0])?.label}
+        </p>
+      </div>
+      <span className="text-xs text-muted-foreground">
+        <InstallCount count={installs} />
+      </span>
+    </a>
+  );
+}
diff --git a/packages/website/src/plugins/plugin-search.tsx b/packages/website/src/plugins/plugin-search.tsx
new file mode 100644
index 0000000000..400341d5a4
--- /dev/null
+++ b/packages/website/src/plugins/plugin-search.tsx
@@ -0,0 +1,112 @@
+import { useNavigate, useRouter } from "@tanstack/react-router";
+import { Search, X } from "lucide-react";
+import { type ChangeEvent, type FormEvent, useCallback, useEffect, useRef, useState } from "react";
+import { type BrowseQuery, browseHref, DEFAULT_WINDOW, parseSearchTerm } from "./links";
+
+const ICON_CLASS = "h-3.5 w-3.5 text-extra-muted-foreground";
+
+/**
+ * Search box for the plugin pages. Submitting opens the browse page for the term, keeping
+ * `scope`'s category and sort. With `live`, typing filters in place instead: the first character
+ * of a query pushes one history entry and later edits replace it, so Back leaves the search.
+ * Without JavaScript the form submits the same URL.
+ */
+export function PluginSearch({
+  scope,
+  live = false,
+  className,
+}: {
+  scope: BrowseQuery;
+  live?: boolean;
+  className?: string;
+}) {
+  const navigate = useNavigate();
+  const router = useRouter();
+  const input = useRef<HTMLInputElement>(null);
+  const [term, setTerm] = useState(scope.q ?? "");
+  // Back and Forward between results of the same page keep this box mounted; show their term.
+  useEffect(
+    () =>
+      router.history.subscribe(({ location, action }) => {
+        if (action.type === "PUSH" || action.type === "REPLACE") return;
+        setTerm(parseSearchTerm(new URLSearchParams(location.search).get("q")) ?? "");
+      }),
+    [router],
+  );
+  const show = useCallback(
+    (next: string, { replace }: { replace: boolean }) => {
+      void navigate({ href: browseHref({ ...scope, q: next.trim() ? next : undefined }), replace });
+    },
+    [navigate, scope],
+  );
+  const edit = useCallback(
+    (next: string) => {
+      setTerm(next);
+      if (live) show(next, { replace: Boolean(term.trim()) });
+    },
+    [live, show, term],
+  );
+  // A term typed before the page hydrated is in the box but not in state; adopt it. Once hydrated,
+  // the box always matches state, so this does nothing.
+  useEffect(() => {
+    const typed = input.current?.value ?? "";
+    if (typed !== term) edit(typed);
+  }, [edit, term]);
+  const handleChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => edit(event.target.value),
+    [edit],
+  );
+  const handleClear = useCallback(() => {
+    edit("");
+    input.current?.focus();
+  }, [edit]);
+  const handleSubmit = useCallback(
+    (event: FormEvent) => {
+      event.preventDefault();
+      // Live results already show the term.
+      if (!live) show(term, { replace: false });
+    },
+    [live, show, term],
+  );
+  return (
+    <form
+      role="search"
+      method="get"
+      action={browseHref({ ...scope, q: undefined, sort: "installs", window: DEFAULT_WINDOW })}
+      onSubmit={handleSubmit}
+      className={className}
+    >
+      {scope.sort !== "installs" && <input type="hidden" name="sort" value={scope.sort} />}
+      {scope.sort === "installs" && scope.window !== DEFAULT_WINDOW && (
+        <input type="hidden" name="window" value={scope.window} />
+      )}
+      <div className="relative">
+        <Search
+          className={`pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 ${ICON_CLASS}`}
+        />
+        <input
+          ref={input}
+          type="search"
+          name="q"
+          value={term}
+          onChange={handleChange}
+          placeholder="Search plugins"
+          aria-label="Search plugins"
+          // Typing on the directory lands here; keep the caret in the box.
+          autoFocus={Boolean(scope.q)}
+          className="w-full rounded-lg border border-white/10 bg-white/[0.03] py-1.5 pl-8 pr-8 text-sm text-foreground placeholder:text-extra-muted-foreground focus:border-white/20 focus:outline-none [&::-webkit-search-cancel-button]:appearance-none"
+        />
+        {term && (
+          <button
+            type="button"
+            onClick={handleClear}
+            aria-label="Clear search"
+            className="absolute right-1.5 top-1/2 -translate-y-1/2 rounded p-1 transition-colors hover:bg-white/[0.06]"
+          >
+            <X className={ICON_CLASS} />
+          </button>
+        )}
+      </div>
+    </form>
+  );
+}
diff --git a/packages/website/src/plugins/plugin-tile.tsx b/packages/website/src/plugins/plugin-tile.tsx
new file mode 100644
index 0000000000..5e2dc9c31b
--- /dev/null
+++ b/packages/website/src/plugins/plugin-tile.tsx
@@ -0,0 +1,24 @@
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+import type { Plugin } from "./registry";
+
+const SIZE_CLASS = {
+  xs: "h-6 w-6 rounded-md text-xs",
+  sm: "h-9 w-9 rounded-lg text-sm",
+  lg: "h-14 w-14 rounded-xl text-xl",
+} as const;
+
+/** PNG icon with a letter tile when no icon is published. */
+export function PluginTile({ plugin, size }: { plugin: Plugin; size: keyof typeof SIZE_CLASS }) {
+  return (
+    <div
+      aria-hidden
+      className={`flex flex-shrink-0 items-center justify-center border border-white/10 bg-white/[0.06] font-medium text-white/80 ${SIZE_CLASS[size]}`}
+    >
+      {pluginOverviewUrl(plugin.icon) ? (
+        <img src={plugin.icon} alt="" className="h-full w-full rounded-[inherit] object-cover" />
+      ) : (
+        plugin.name.charAt(0).toUpperCase()
+      )}
+    </div>
+  );
+}
diff --git a/packages/website/src/plugins/published.ts b/packages/website/src/plugins/published.ts
new file mode 100644
index 0000000000..b57d16ec2a
--- /dev/null
+++ b/packages/website/src/plugins/published.ts
@@ -0,0 +1,127 @@
+import {
+  PluginRegistryIdSchema,
+  PluginRegistryIndexSchema,
+  PublishedPluginDetailSchema,
+} from "@getpaseo/protocol/plugin-registry";
+import { getBlockingColdCache, type WebsiteCacheContext } from "../github-cache";
+import { handlePluginThumbnailRequest } from "./thumbnails";
+import { CATEGORIES } from "./categories";
+import { type InstallCounts, readInstallCounts, recordClientInstall } from "./installs";
+export interface RegistryEnvironment {
+  PLUGINS_REGISTRY_URL?: string;
+  WEBSITE_CACHE?: KVNamespace;
+}
+async function documentAt(base: string, path: string): Promise<unknown> {
+  const response = await fetch(`${base.replace(/\/+$/, "")}/${path}`);
+  if (response.status === 404) return null;
+  if (!response.ok) throw new Error(`Plugin registry returned ${response.status}`);
+  return response.json();
+}
+export function loadRegistryIndex(base: string, context: WebsiteCacheContext) {
+  return getBlockingColdCache({
+    context,
+    key: `plugins:index:v1:${base}`,
+    isValue: (value): value is ReturnType<typeof PluginRegistryIndexSchema.parse> =>
+      PluginRegistryIndexSchema.safeParse(value).success,
+    fetchFresh: async () => PluginRegistryIndexSchema.parse(await documentAt(base, "index.json")),
+  });
+}
+/** Install counts per window for every listed plugin, refreshed with the index cache. */
+export async function loadInstallCounts(base: string, context: WebsiteCacheContext) {
+  const index = await loadRegistryIndex(base, context);
+  const ids = index.plugins.map((plugin) => plugin.id);
+  return getBlockingColdCache({
+    context,
+    key: `plugins:installs:v1:${base}`,
+    isValue: (value): value is Record<string, InstallCounts> =>
+      typeof value === "object" &&
+      value !== null &&
+      Object.values(value).every((counts) => typeof counts?.all === "number"),
+    fetchFresh: () => readInstallCounts(context.cache, ids, new Date()),
+  });
+}
+export async function loadRegistryPlugin(base: string, id: string, context: WebsiteCacheContext) {
+  if (!PluginRegistryIdSchema.safeParse(id).success) return null;
+  return getBlockingColdCache({
+    context,
+    key: `plugins:detail:v1:${base}:${id}`,
+    isValue: (value): value is ReturnType<typeof PublishedPluginDetailSchema.parse> | null =>
+      value === null || PublishedPluginDetailSchema.safeParse(value).success,
+    fetchFresh: async () => {
+      const raw = await documentAt(base, `plugins/${id}.json`);
+      if (raw === null) return null;
+      const plugin = PublishedPluginDetailSchema.parse(raw);
+      if (plugin.id !== id) throw new Error("Plugin registry returned a different ID");
+      return plugin;
+    },
+  });
+}
+export async function handlePluginRegistryRequest(
+  request: Request,
+  env: RegistryEnvironment,
+  context: WebsiteCacheContext,
+): Promise<Response | null> {
+  const url = new URL(request.url);
+  if (request.method !== "GET") return null;
+  const base = env.PLUGINS_REGISTRY_URL ?? "https://getpaseo.github.io/plugins";
+  if (url.pathname.startsWith("/plugins/thumb/")) {
+    const index = await loadRegistryIndex(base, context);
+    return handlePluginThumbnailRequest(request, index.plugins);
+  }
+  if (url.hostname === "plugins.paseo.sh" && url.pathname === "/index.json")
+    return Response.json(await loadRegistryIndex(base, context));
+  if (url.pathname === "/sitemap-plugins.xml") {
+    const index = await loadRegistryIndex(base, context);
+    // IDs are validated owner/slug strings, so these paths contain no XML metacharacters.
+    const paths = new Set<string>(["/plugins", "/plugins/all"]);
+    for (const category of CATEGORIES) {
+      if (index.plugins.some((plugin) => plugin.categories.includes(category.slug)))
+        paths.add(`/plugins/category/${category.slug}`);
+    }
+    for (const plugin of index.plugins) {
+      paths.add(`/plugins/${plugin.id.split("/")[0]}`);
+      paths.add(`/plugins/${plugin.id}`);
+    }
+    const urls = [...paths].sort().map((path) => `<url><loc>https://paseo.sh${path}</loc></url>`);
+    return new Response(
+      `<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">${urls.join("")}</urlset>`,
+      {
+        headers: {
+          "content-type": "application/xml; charset=utf-8",
+          "cache-control": "public, max-age=300",
+        },
+      },
+    );
+  }
+  if (url.pathname === "/api/plugins/installs") {
+    const index = await loadRegistryIndex(base, context);
+    const counts = await readInstallCounts(
+      context.cache,
+      index.plugins.map((plugin) => plugin.id),
+      new Date(),
+    );
+    return Response.json(
+      Object.fromEntries(Object.entries(counts).map(([id, count]) => [id, count.all])),
+    );
+  }
+  const match =
+    /^\/api\/plugins\/resolve\/([^/]+\/[^/]+)$/.exec(url.pathname) ??
+    /^\/plugins\/([^/]+\/[^/]+)\.json$/.exec(url.pathname);
+  if (!match) return null;
+  const id = match[1];
+  const plugin = await loadRegistryPlugin(base, id, context);
+  if (!plugin) return Response.json({ error: "Plugin not found" }, { status: 404 });
+  if (
+    request.headers.get("X-Paseo-Install") === "1" ||
+    url.searchParams.get("intent") === "install"
+  ) {
+    const cache = context.cache;
+    if (cache)
+      context.waitUntil(
+        recordClientInstall({ cache, id, ip: request.headers.get("CF-Connecting-IP") }).catch(
+          () => undefined,
+        ),
+      );
+  }
+  return Response.json(plugin);
+}
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
new file mode 100644
index 0000000000..d8f343b266
--- /dev/null
+++ b/packages/website/src/plugins/registry.test.ts
@@ -0,0 +1,352 @@
+import { createHash } from "node:crypto";
+import { createServer } from "node:http";
+import { describe, expect, it } from "vitest";
+import {
+  addedAgo,
+  featuredPlugins,
+  formatInstalls,
+  installCommand,
+  mostInstalled,
+  newestFirst,
+  type Plugin,
+  readmeBody,
+  recentlyUpdated,
+  reportBugUrl,
+  searchPlugins,
+  updatedAgo,
+} from "./registry";
+import { readInstallCounts, recordInstall } from "./installs";
+import { handlePluginRegistryRequest, loadRegistryIndex, loadRegistryPlugin } from "./published";
+const plugin: Plugin = {
+  id: "acme/example",
+  name: "Example",
+  description: "An example",
+  categories: ["themes"],
+  author: { github: "acme" },
+  repository: { url: "https://github.com/acme/example" },
+  artifact: {
+    kind: "npm",
+    package: "paseo-example",
+    version: "1.2.3",
+    resolved: "https://registry.npmjs.org/example.tgz",
+    integrity: "sha512-YWJj",
+  },
+  media: [],
+  submittedAt: "2026-10-03",
+  reviewedAt: "2026-10-03",
+  updatedAt: "2026-10-03",
+  publishedAt: "2026-10-03",
+  installs: 42,
+};
+describe("plugin registry", () => {
+  it("loads a directory and a detail from a static HTTP registry", async () => {
+    const index = {
+      schemaVersion: 1,
+      registry: { name: "Internal", url: "https://example.test" },
+      categories: [],
+      plugins: [plugin],
+      featured: [plugin.id],
+      generatedAt: "2026-10-03",
+    };
+    const detail = { ...plugin, readme: "# Example" };
+    const server = createServer((request, response) => {
+      const value = request.url === "/index.json" ? index : detail;
+      response.end(JSON.stringify(value));
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing address");
+    const base = `http://127.0.0.1:${address.port}`;
+    const context = { cache: null, waitUntil: () => undefined };
+    try {
+      expect(await loadRegistryIndex(base, context)).toEqual(index);
+      expect(await loadRegistryPlugin(base, plugin.id, context)).toEqual(detail);
+      await expect(loadRegistryPlugin(base, "acme/wrong", context)).rejects.toThrow("different ID");
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+  it("features listed plugins once each, in the registry's order, dropping IDs that are not listed", () => {
+    const listed = [
+      { ...plugin, id: "acme/first" },
+      { ...plugin, id: "acme/second" },
+      { ...plugin, id: "acme/third" },
+    ];
+    const featured = ["acme/third", "acme/not-published", "acme/first", "acme/third"];
+    expect(featuredPlugins(listed, featured).map((p) => p.id)).toEqual([
+      "acme/third",
+      "acme/first",
+    ]);
+    expect(featuredPlugins(listed, ["acme/not-published"])).toEqual([]);
+  });
+  it("lists what's new by first listing time, so neither a slow review nor an update moves a plugin", () => {
+    const listedFirst = {
+      ...plugin,
+      id: "acme/listed-first",
+      submittedAt: "2026-09-30T00:00:00.000Z",
+      publishedAt: "2026-09-30T06:00:00.000Z",
+      reviewedAt: "2026-10-02T00:00:00.000Z",
+      updatedAt: "2026-10-02T00:00:00.000Z",
+    };
+    const listedLater = {
+      ...plugin,
+      id: "acme/listed-later",
+      submittedAt: "2026-09-02T00:00:00.000Z",
+      publishedAt: "2026-09-30T08:00:00.000Z",
+      reviewedAt: "2026-09-30T08:00:00.000Z",
+      updatedAt: "2026-09-30T08:00:00.000Z",
+    };
+    expect(newestFirst([listedFirst, listedLater]).map((p) => p.id)).toEqual([
+      "acme/listed-later",
+      "acme/listed-first",
+    ]);
+    const now = "2026-10-03T12:00:00.000Z";
+    expect(addedAgo(listedLater, now)).toBe("3d ago");
+    expect(updatedAgo(listedFirst, now)).toBe("yesterday");
+  });
+  it("lists only plugins updated after their first listing as recently updated, latest update first", () => {
+    const bumped = {
+      ...plugin,
+      id: "acme/bumped",
+      publishedAt: "2026-09-10T00:00:00.000Z",
+      updatedAt: "2026-10-01T09:00:00.000Z",
+    };
+    const bumpedLater = {
+      ...plugin,
+      id: "acme/bumped-later",
+      publishedAt: "2026-09-20T00:00:00.000Z",
+      updatedAt: "2026-10-01T17:00:00.000Z",
+    };
+    const neverUpdated = {
+      ...plugin,
+      id: "acme/never-updated",
+      publishedAt: "2026-10-02T00:00:00.000Z",
+      updatedAt: "2026-10-02T00:00:00.000Z",
+    };
+    expect(recentlyUpdated([bumped, neverUpdated, bumpedLater]).map((p) => p.id)).toEqual([
+      "acme/bumped-later",
+      "acme/bumped",
+    ]);
+  });
+  it("orders by first listing time and by installs in a window, keeping index order for ties", () => {
+    const older = { ...plugin, id: "acme/older", publishedAt: "2026-09-01" };
+    const twin = { ...plugin, id: "acme/twin" };
+    expect(newestFirst([older, plugin, twin]).map((p) => p.id)).toEqual([
+      "acme/example",
+      "acme/twin",
+      "acme/older",
+    ]);
+    const installs = {
+      "acme/example": { week: 1, month: 5, all: 9 },
+      "acme/older": { week: 3, month: 3, all: 3 },
+      "acme/twin": { week: 1, month: 1, all: 1 },
+    };
+    expect(mostInstalled([plugin, older, twin], installs, "week").map((p) => p.id)).toEqual([
+      "acme/older",
+      "acme/example",
+      "acme/twin",
+    ]);
+    expect(mostInstalled([plugin, older, twin], installs, "month")[0].id).toBe("acme/example");
+  });
+  it("counts installs this week, this month, and all time from the daily record", async () => {
+    const cache = memoryKv();
+    const day = (date: string) => new Date(`${date}T12:00:00.000Z`);
+    await cache.put("plugin-installs:acme/example", "40");
+    await recordInstall(cache, "acme/example", day("2026-07-01"));
+    await recordInstall(cache, "acme/example", day("2026-09-10"));
+    await recordInstall(cache, "acme/example", day("2026-09-30"));
+    await recordInstall(cache, "acme/example", day("2026-10-04"));
+    expect(await readInstallCounts(cache, ["acme/example"], day("2026-10-04"))).toEqual({
+      "acme/example": { week: 2, month: 3, all: 44 },
+    });
+    expect(
+      Object.keys(JSON.parse((await cache.get("plugin-installs-daily:acme/example")) ?? "{}")),
+    ).toEqual(["2026-09-10", "2026-09-30", "2026-10-04"]);
+  });
+  it("counts repeated install reports from the same IP once per hour", async () => {
+    let now = Date.now();
+    const cache = memoryKv(() => now);
+    const headers = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, headers);
+    now += 3_599_000;
+    await resolvePlugin(cache, headers);
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 1, month: 1, all: 1 },
+    });
+    now += 1_000;
+    await resolvePlugin(cache, headers);
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 2, month: 2, all: 2 },
+    });
+  });
+  it("counts different IPs and plugins independently, including query install intent", async () => {
+    const cache = memoryKv();
+    const first = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, first);
+    await resolvePlugin(cache, { "CF-Connecting-IP": "2001:db8::1" }, { query: "?intent=install" });
+    await resolvePlugin(cache, first, { id: "acme/other" });
+    await resolvePlugin(cache, first, { query: "?intent=install" });
+    await resolvePlugin(cache, first, { id: "acme/other", staticDetail: true });
+    expect(await readInstallCounts(cache, [plugin.id, "acme/other"], new Date())).toEqual({
+      [plugin.id]: { week: 2, month: 2, all: 2 },
+      "acme/other": { week: 1, month: 1, all: 1 },
+    });
+    const hash = createHash("sha256").update(first["CF-Connecting-IP"]).digest("hex");
+    expect(await cache.get(`plugin-installs-client:${plugin.id}:${hash}`)).toBe("1");
+    expect(JSON.stringify([...cache.values])).not.toContain("192.0.2.1");
+    expect(JSON.stringify([...cache.values])).not.toContain("2001:db8::1");
+  });
+  it("does not count without a Cloudflare IP or install intent", async () => {
+    const cache = memoryKv();
+    await resolvePlugin(cache, { "X-Paseo-Install": "1", "X-Forwarded-For": "192.0.2.1" });
+    await resolvePlugin(cache, {}, { query: "?intent=install" });
+    await resolvePlugin(cache, { "X-Paseo-Install": "1", "CF-Connecting-IP": "" });
+    await resolvePlugin(cache, { "CF-Connecting-IP": "192.0.2.1" });
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 0, month: 0, all: 0 },
+    });
+    expect([...cache.values.keys()].filter((key) => key.startsWith("plugin-installs"))).toEqual([]);
+  });
+  it("preserves historical totals and the installs endpoint response", async () => {
+    const cache = memoryKv();
+    await cache.put(`plugin-installs:${plugin.id}`, "40");
+    const headers = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, headers);
+    await resolvePlugin(cache, headers);
+    const base = "https://registry.example.test";
+    await cache.put(
+      `plugins:index:v1:${base}`,
+      JSON.stringify({
+        fetchedAt: Date.now(),
+        value: {
+          schemaVersion: 1,
+          registry: { name: "Internal", url: base },
+          categories: [],
+          plugins: [plugin],
+          featured: [],
+          generatedAt: "2026-10-03",
+        },
+      }),
+    );
+    const response = await handlePluginRegistryRequest(
+      new Request("https://paseo.sh/api/plugins/installs"),
+      { PLUGINS_REGISTRY_URL: base },
+      { cache, waitUntil: () => undefined },
+    );
+    expect(response?.status).toBe(200);
+    expect(await response?.json()).toEqual({ [plugin.id]: 41 });
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 1, month: 1, all: 41 },
+    });
+  });
+  it("searches name, description, ID, and author, ignoring case", () => {
+    const other = {
+      ...plugin,
+      id: "zed/other",
+      name: "Other",
+      description: "Unrelated",
+      author: { github: "zed" },
+    };
+    const plugins = [plugin, other];
+    expect(searchPlugins(plugins, "EXAMPLE").map((p) => p.id)).toEqual(["acme/example"]);
+    expect(searchPlugins(plugins, "unrelated").map((p) => p.id)).toEqual(["zed/other"]);
+    expect(searchPlugins(plugins, "zed/").map((p) => p.id)).toEqual(["zed/other"]);
+    expect(searchPlugins(plugins, "acme").map((p) => p.id)).toEqual(["acme/example"]);
+    expect(searchPlugins(plugins, "  ")).toEqual(plugins);
+    expect(searchPlugins(plugins, "nothing")).toEqual([]);
+  });
+  it("ranks name, then author, then description matches, keeping the given order on ties", () => {
+    const named = (id: string, name: string, description: string, github = "acme"): Plugin => ({
+      ...plugin,
+      id,
+      name,
+      description,
+      author: { github },
+    });
+    // Given in install order: description-only matches first, the exact name last.
+    const plugins = [
+      named("acme/editor", "Remote Editor", "Composer pill to open a workspace"),
+      named("acme/kit", "PromptKit", "Rewrite prompts"),
+      named("omp/tools", "Tools", "Helpers", "omp"),
+      named("acme/history", "History", "Inspect raw composer records"),
+      named("acme/omp", "OMP", "Paseo integration for OMP"),
+    ];
+    expect(searchPlugins(plugins, "omp").map((p) => p.id)).toEqual([
+      "acme/omp",
+      "acme/kit",
+      "omp/tools",
+      "acme/editor",
+      "acme/history",
+    ]);
+    expect(searchPlugins(plugins, "prompt").map((p) => p.id)).toEqual(["acme/kit"]);
+    expect(searchPlugins(plugins, "tools omp").map((p) => p.id)).toEqual(["omp/tools"]);
+  });
+
+  it("strips the README title and quoted description that the page already shows", () => {
+    expect(readmeBody("# Example\n\n> An example\n> plugin\n\n## Usage\n")).toBe("## Usage\n");
+    expect(readmeBody("## Usage\n\n> Note\n")).toBe("## Usage\n\n> Note\n");
+    expect(readmeBody("# Example\n\n> [!WARNING]\n> Needs Docker\n\n## Usage\n")).toBe(
+      "> [!WARNING]\n> Needs Docker\n\n## Usage\n",
+    );
+  });
+  it("offers a registry install command", () => {
+    expect(installCommand(plugin)).toBe("paseo plugin add acme/example");
+    expect(formatInstalls(1250)).toBe("1.3k");
+  });
+  it("reports bugs on the source repository's GitHub issue tracker", () => {
+    const at = (url: string) => reportBugUrl({ ...plugin, repository: { url } });
+    expect(at("https://github.com/acme/example")).toBe(
+      "https://github.com/acme/example/issues/new",
+    );
+    expect(at("https://github.com/acme/plugins.git")).toBe(
+      "https://github.com/acme/plugins/issues/new",
+    );
+    expect(at("https://github.com/acme/plugins/tree/HEAD/packages/example")).toBe(
+      "https://github.com/acme/plugins/issues/new",
+    );
+    expect(at("https://gitlab.com/acme/example")).toBeUndefined();
+    expect(at("javascript:alert(1)")).toBeUndefined();
+  });
+});
+
+/** In-memory stand-in for the website KV namespace, covering the calls the counter makes. */
+function memoryKv(now = Date.now): KVNamespace & { values: Map<string, string> } {
+  const values = new Map<string, string>();
+  const expiresAt = new Map<string, number>();
+  const kv = {
+    values,
+    get: async (key: string, options?: { type?: string }) => {
+      if (now() >= (expiresAt.get(key) ?? Infinity)) values.delete(key);
+      const value = values.get(key) ?? null;
+      return options?.type === "json" && value !== null ? JSON.parse(value) : value;
+    },
+    put: async (key: string, value: string, options?: { expirationTtl?: number }) => {
+      values.set(key, value);
+      expiresAt.set(key, options?.expirationTtl ? now() + options.expirationTtl * 1000 : Infinity);
+    },
+  };
+  return kv as unknown as KVNamespace & { values: Map<string, string> };
+}
+
+async function resolvePlugin(
+  cache: KVNamespace,
+  headers: HeadersInit,
+  { id = plugin.id, query = "", staticDetail = false } = {},
+): Promise<void> {
+  const base = "https://registry.example.test";
+  const detail = { ...plugin, id, readme: "# Example" };
+  await cache.put(
+    `plugins:detail:v1:${base}:${id}`,
+    JSON.stringify({ fetchedAt: Date.now(), value: detail }),
+  );
+  const pending: Promise<unknown>[] = [];
+  const path = staticDetail ? `/plugins/${id}.json` : `/api/plugins/resolve/${id}`;
+  const response = await handlePluginRegistryRequest(
+    new Request(`https://paseo.sh${path}${query}`, { headers }),
+    { PLUGINS_REGISTRY_URL: base },
+    { cache, waitUntil: (promise) => pending.push(promise) },
+  );
+  expect(response?.status).toBe(200);
+  expect(await response?.json()).toEqual(detail);
+  await Promise.all(pending);
+}
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
new file mode 100644
index 0000000000..7d99cb6789
--- /dev/null
+++ b/packages/website/src/plugins/registry.ts
@@ -0,0 +1,168 @@
+import type { z } from "zod";
+import {
+  isGitHubHost,
+  parseGitHubRemoteIdentity,
+  parseGitRemoteLocation,
+} from "@getpaseo/protocol/git-remote";
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+import { pluginMediaKind, type PublishedPluginSchema } from "@getpaseo/protocol/plugin-registry";
+import { scoreTextFields } from "@getpaseo/protocol/search/text-match";
+import { CATEGORIES, type Category, type CategorySlug } from "./categories";
+import type { InstallCounts, InstallWindow } from "./installs";
+export { CATEGORIES, type Category, type CategorySlug };
+export type { InstallCounts, InstallWindow };
+export type Plugin = z.infer<typeof PublishedPluginSchema>;
+export interface Author {
+  username: string;
+  name: string;
+  github: string;
+  npm?: string;
+}
+const DAY_MS = 24 * 60 * 60 * 1000;
+export function getCategory(slug: string): Category | null {
+  return CATEGORIES.find((category) => category.slug === slug) ?? null;
+}
+/** The plugin's first HTTPS image, for cards and link previews; videos never stand in for one. */
+export function firstMediaImage(plugin: Plugin): string | undefined {
+  return plugin.media.find((url) => pluginOverviewUrl(url) && pluginMediaKind(url) === "image");
+}
+export function getPluginsInCategory(plugins: Plugin[], slug: string): Plugin[] {
+  return plugins.filter((plugin) => plugin.categories.includes(slug));
+}
+/** The namespace segment of the plugin ID. It is the route param for the plugin and its author. */
+export function pluginOwner(plugin: Plugin): string {
+  return plugin.id.split("/")[0];
+}
+export function getAuthor(plugin: Plugin): Author {
+  const { author } = plugin;
+  return {
+    username: pluginOwner(plugin),
+    github: author.github,
+    name: author.name ?? author.github,
+    npm: author.npm,
+  };
+}
+export function getPluginsByAuthor(plugins: Plugin[], owner: string): Plugin[] {
+  return plugins.filter((plugin) => pluginOwner(plugin) === owner);
+}
+export function installCommand(plugin: Plugin): string {
+  return `paseo plugin add ${plugin.id}`;
+}
+export function pluginVersion(plugin: Plugin): string {
+  return plugin.artifact.kind === "npm"
+    ? plugin.artifact.version
+    : plugin.artifact.commit.slice(0, 12);
+}
+export function npmUrl(plugin: Plugin): string | undefined {
+  return plugin.artifact.kind === "npm"
+    ? `https://www.npmjs.com/package/${plugin.artifact.package}`
+    : undefined;
+}
+/** A new issue on the plugin's GitHub repository; absent when the source is hosted elsewhere. */
+export function reportBugUrl(plugin: Plugin): string | undefined {
+  const location = parseGitRemoteLocation(plugin.repository.url);
+  if (!location || !isGitHubHost(location.host)) return undefined;
+  // A monorepo source points at the plugin's folder; issues belong to the repository.
+  const repository = parseGitHubRemoteIdentity(location.path.split("/").slice(0, 2).join("/"));
+  return repository ? `https://github.com/${repository.repo}/issues/new` : undefined;
+}
+export function authorNpmUrl(author: Author): string | undefined {
+  return author.npm ? `https://www.npmjs.com/~${author.npm}` : undefined;
+}
+export function authorGitHubUrl(author: Author): string {
+  return `https://github.com/${author.github}`;
+}
+export function authorAvatarUrl(author: Author): string {
+  return `https://github.com/${author.github}.png?size=80`;
+}
+export function formatInstalls(count: number): string {
+  if (count < 1000) return String(count);
+  const k = count / 1000;
+  return `${k % 1 === 0 ? k.toFixed(0) : k.toFixed(1)}k`;
+}
+/** Fields a search term can hit, best first: a name match outranks an author match, which outranks a description match. */
+function searchFieldGroups(plugin: Plugin): string[][] {
+  const author = getAuthor(plugin);
+  const name = [plugin.name, plugin.id.split("/")[1]];
+  const owner = [author.name, author.github, plugin.id];
+  return [name, owner, [plugin.description], [...name, ...owner, plugin.description]];
+}
+interface SearchRank {
+  field: number;
+  tier: number;
+}
+function searchRank(plugin: Plugin, term: string): SearchRank | null {
+  const groups = searchFieldGroups(plugin);
+  for (let field = 0; field < groups.length; field += 1) {
+    const score = scoreTextFields(term, groups[field], { subsequence: false });
+    if (score) return { field, tier: score.tier };
+  }
+  return null;
+}
+/**
+ * Plugins whose name, author, ID, or description contains every word of the term, ignoring case.
+ * Name matches come first, then author, then description; within each, exact words beat partial
+ * ones, and equal matches keep the given order.
+ */
+export function searchPlugins(plugins: Plugin[], term: string): Plugin[] {
+  if (!term.trim()) return plugins;
+  return plugins
+    .flatMap((plugin) => {
+      const rank = searchRank(plugin, term);
+      return rank ? [{ plugin, rank }] : [];
+    })
+    .sort((a, b) => a.rank.field - b.rank.field || a.rank.tier - b.rank.tier)
+    .map(({ plugin }) => plugin);
+}
+/** The featured IDs that name a listed plugin, in the registry's order, each once. */
+export function featuredPlugins(plugins: Plugin[], featured: string[]): Plugin[] {
+  const byId = new Map(plugins.map((plugin) => [plugin.id, plugin]));
+  return [...new Set(featured)].flatMap((id) => byId.get(id) ?? []);
+}
+/**
+ * Most recently listed first. A slow review does not push a plugin down, and an update does not
+ * bring it back up. Equal times keep index order.
+ */
+export function newestFirst(plugins: Plugin[]): Plugin[] {
+  return [...plugins].sort((a, b) => Date.parse(b.publishedAt) - Date.parse(a.publishedAt));
+}
+/** Plugins with a version approved after their first listing, most recent update first. */
+export function recentlyUpdated(plugins: Plugin[]): Plugin[] {
+  return plugins
+    .filter((plugin) => Date.parse(plugin.updatedAt) > Date.parse(plugin.publishedAt))
+    .sort((a, b) => Date.parse(b.updatedAt) - Date.parse(a.updatedAt));
+}
+/** Most installs in the window first; equal counts keep index order. */
+export function mostInstalled(
+  plugins: Plugin[],
+  installs: Record<string, InstallCounts>,
+  window: InstallWindow,
+): Plugin[] {
+  const count = (plugin: Plugin) => installs[plugin.id]?.[window] ?? 0;
+  return [...plugins].sort((a, b) => count(b) - count(a));
+}
+/** How long ago the plugin was first listed, relative to the loader's clock. */
+export function addedAgo(plugin: Plugin, now: string): string {
+  return ago(plugin.publishedAt, now);
+}
+/** How long ago the plugin's current version was approved, relative to the loader's clock. */
+export function updatedAgo(plugin: Plugin, now: string): string {
+  return ago(plugin.updatedAt, now);
+}
+function ago(date: string, now: string): string {
+  const days = Math.floor((Date.parse(now) - Date.parse(date)) / DAY_MS);
+  if (days <= 0) return "today";
+  if (days === 1) return "yesterday";
+  if (days < 14) return `${days}d ago`;
+  return `${Math.round(days / 7)}w ago`;
+}
+/**
+ * A README usually opens with the plugin's name and quoted description; the page shows both.
+ * A leading GitHub alert (`> [!WARNING]`) is a note for the reader and stays.
+ */
+export function readmeBody(readme: string): string {
+  return readme
+    .replace(/^\s*#\s[^\n]*\n+/, "")
+    .replace(/^(?!>\s*\[!)(>[^\n]*\n)+\n*/, "")
+    .trimStart();
+}
diff --git a/packages/website/src/plugins/section.tsx b/packages/website/src/plugins/section.tsx
new file mode 100644
index 0000000000..690a758fde
--- /dev/null
+++ b/packages/website/src/plugins/section.tsx
@@ -0,0 +1,35 @@
+import type { ReactNode } from "react";
+
+/** A block of a plugins page: its header, then its content one fixed gap below. */
+export function PluginSection({
+  id,
+  labelledBy,
+  className = "",
+  children,
+}: {
+  id?: string;
+  labelledBy?: string;
+  className?: string;
+  children: ReactNode;
+}) {
+  return (
+    <section id={id} aria-labelledby={labelledBy} className={`flex flex-col gap-8 ${className}`}>
+      {children}
+    </section>
+  );
+}
+
+/** A section's title with its trailing controls on one baseline. */
+export function PluginSectionHeader({ children }: { children: ReactNode }) {
+  return (
+    <div className="flex flex-wrap items-baseline justify-between gap-x-4 gap-y-2">{children}</div>
+  );
+}
+
+export function PluginSectionTitle({ id, children }: { id: string; children: ReactNode }) {
+  return (
+    <h2 id={id} className="text-lg font-medium">
+      {children}
+    </h2>
+  );
+}
diff --git a/packages/website/src/plugins/thumbnails.test.ts b/packages/website/src/plugins/thumbnails.test.ts
new file mode 100644
index 0000000000..aaaaf47418
--- /dev/null
+++ b/packages/website/src/plugins/thumbnails.test.ts
@@ -0,0 +1,258 @@
+import { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it } from "vitest";
+import { handlePluginThumbnailRequest, pluginCardScreenshot } from "./thumbnails";
+import { PluginCard } from "./plugin-card";
+import type { Plugin } from "./registry";
+
+const source = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/preview.png";
+const video = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/demo.mp4";
+const plugin: Plugin = {
+  id: "acme/example",
+  name: "Example",
+  description: "An example",
+  categories: ["themes"],
+  author: { github: "acme" },
+  repository: { url: "https://github.com/acme/example" },
+  artifact: {
+    kind: "npm",
+    package: "paseo-example",
+    version: "1.2.3",
+    resolved: "https://registry.npmjs.org/example.tgz",
+    integrity: "sha512-YWJj",
+  },
+  media: [source],
+  submittedAt: "2026-10-03",
+  reviewedAt: "2026-10-03",
+  updatedAt: "2026-10-03",
+  publishedAt: "2026-10-03",
+  installs: 42,
+};
+
+const avatar = 'src="https://github.com/acme.png?size=80"';
+
+describe("plugin card thumbnails", () => {
+  it("uses the first image in the plugin's media, skipping a leading video", () => {
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, media: [video, source] } }),
+    );
+    expect(html).toContain(`/plugins/thumb/592/${encodeURIComponent(source)}?`);
+    expect(html).not.toContain(encodeURIComponent(video));
+  });
+
+  it("shows the plugin tile when the media has no image", () => {
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, media: [video] } }),
+    );
+    expect(html.match(/<img [^>]*>/g)).toEqual([expect.stringContaining(avatar)]);
+    expect(html).not.toContain("<video");
+    expect(html).toContain(">E</div>");
+  });
+
+  it("keeps a screenshot on an unsupported host visible at its original URL", () => {
+    const screenshot = "https://example.com/preview.png";
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, media: [screenshot] } }),
+    );
+    expect(html).toContain(`src="${screenshot}"`);
+    expect(html).not.toContain("/plugins/thumb/");
+  });
+
+  it("shows the author's avatar and name beside the card detail", () => {
+    const html = renderToStaticMarkup(createElement(PluginCard, { plugin }, "today"));
+    expect(html).toContain(avatar);
+    expect(html).toMatch(/>acme<\/span><span aria-hidden="true">·<\/span><span[^>]*>today<\/span>/);
+  });
+
+  it("renders a thumbnail instead of downloading the original screenshot", () => {
+    const html = renderToStaticMarkup(createElement(PluginCard, { plugin }, "today"));
+    expect(html).toContain(
+      `src="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample"`,
+    );
+    expect(html).toContain(
+      `srcSet="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample 1x, /plugins/thumb/1184/${encodeURIComponent(source)}?plugin=acme%2Fexample 2x"`,
+    );
+    expect(html).toContain('loading="lazy"');
+    expect(html).toContain('decoding="async"');
+  });
+});
+
+function thumbnailRequest(
+  sourceUrl = source,
+  width = 592,
+  id = plugin.id,
+  accept = "image/avif,image/webp",
+) {
+  return new Request(
+    `https://paseo.sh/plugins/thumb/${width}/${encodeURIComponent(sourceUrl)}?plugin=${encodeURIComponent(id)}`,
+    { headers: { accept } },
+  );
+}
+
+function imageResponse(body: string, headers: Record<string, string> = {}) {
+  return new Response(body, { headers: { "content-type": "image/png", ...headers } });
+}
+
+// A typed fetch dependency, returning real Responses without patching the global fetch.
+function imageFetch(...responses: (Response | Error)[]) {
+  const calls: { input: Parameters<typeof fetch>[0]; init: Parameters<typeof fetch>[1] }[] = [];
+  const fetchImage: typeof fetch = async (input, init) => {
+    calls.push({ input, init });
+    const response = responses.shift();
+    if (!response) throw new Error("Unexpected fetch");
+    if (response instanceof Error) throw response;
+    return response;
+  };
+  return { calls, fetchImage };
+}
+
+describe("thumbnail route", () => {
+  it("sandboxes an SVG fallback when opened as a document on the website origin", async () => {
+    const svg =
+      '<svg xmlns="http://www.w3.org/2000/svg"><script>alert(document.domain)</script></svg>';
+    const upstream = imageFetch(
+      new Response("unsupported", { status: 415 }),
+      imageResponse(svg, { "content-type": "image/svg+xml" }),
+    );
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(await response.text()).toBe(svg);
+    expect(response.headers.get("content-security-policy")).toBe("sandbox");
+    expect(response.headers.get("x-content-type-options")).toBe("nosniff");
+  });
+
+  it.each([
+    [592, source, "image/avif,image/webp", "avif"],
+    [592, source, "image/avif;q=0,image/webp", "webp"],
+    [592, source, "image/avif;q=0,image/webp;q=0", undefined],
+    [
+      1184,
+      "https://raw.githubusercontent.com/acme/example/abc123/preview.png",
+      "image/webp",
+      "webp",
+    ],
+    [592, source, "image/png,image/*;q=0.8", undefined],
+  ] as const)(
+    "transforms a registered screenshot at %s from %s for %s",
+    async (width, screenshot, accept, format) => {
+      const upstream = imageFetch(imageResponse("thumbnail"));
+      const response = await handlePluginThumbnailRequest(
+        thumbnailRequest(screenshot, width, plugin.id, accept),
+        [{ ...plugin, media: [screenshot] }],
+        upstream.fetchImage,
+      );
+      expect(upstream.calls).toEqual([
+        {
+          input: screenshot,
+          init: {
+            cf: { image: { width, fit: "scale-down", format, quality: 80 } },
+          },
+        },
+      ]);
+      expect(response.status).toBe(200);
+      expect(await response.text()).toBe("thumbnail");
+      expect(response.headers.get("content-type")).toBe("image/png");
+      expect(response.headers.get("cache-control")).toBe("public, max-age=31536000, immutable");
+      expect(response.headers.get("vary")).toBe("Accept");
+    },
+  );
+
+  it.each([
+    ["Cloudflare error", () => new Response("error 9401", { status: 403 })],
+    [
+      "non-image success",
+      () => new Response("<html>unavailable</html>", { headers: { "content-type": "text/html" } }),
+    ],
+    ["Cf-Resized error", () => imageResponse("error", { "cf-resized": "err=9401" })],
+    ["network exception", () => new Error("Transform unavailable")],
+  ] as const)("proxies the original with immutable caching on %s", async (_, failure) => {
+    const upstream = imageFetch(failure(), imageResponse("original"));
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(upstream.calls.map((call) => call.input)).toEqual([source, source]);
+    expect(upstream.calls[1].init).toBeUndefined();
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe("original");
+    expect(response.headers.get("cache-control")).toBe("public, max-age=31536000, immutable");
+  });
+
+  it.each([
+    ["arbitrary width", thumbnailRequest(source, 593), [plugin], 400],
+    ["unlisted source on allowed host", thumbnailRequest(source + "?different"), [plugin], 404],
+    ["wrong plugin ID", thumbnailRequest(source, 592, "acme/other"), [plugin], 404],
+    [
+      "missing plugin ID",
+      new Request(`https://paseo.sh/plugins/thumb/592/${encodeURIComponent(source)}`),
+      [plugin],
+      404,
+    ],
+    ["removed plugin", thumbnailRequest(), [], 404],
+    ["listed video", thumbnailRequest(video), [{ ...plugin, media: [video, source] }], 404],
+    ["malformed encoding", new Request("https://paseo.sh/plugins/thumb/592/%ZZ"), [plugin], 400],
+    ["malformed URL", thumbnailRequest("not a URL"), [plugin], 400],
+    ...[
+      "https://example.com/preview.png",
+      "https://cdn.jsdelivr.net.evil.test/preview.png",
+      "http://cdn.jsdelivr.net/preview.png",
+      "https://user:pass@cdn.jsdelivr.net/preview.png",
+      "https://cdn.jsdelivr.net:8080/preview.png",
+    ].map(
+      (url) =>
+        [
+          "disallowed registered source",
+          thumbnailRequest(url),
+          [{ ...plugin, media: [url] }],
+          400,
+        ] satisfies [string, Request, Plugin[], number],
+    ),
+  ] satisfies [string, Request, Plugin[], number][])(
+    "rejects %s without fetching an image",
+    async (_, request, plugins, status) => {
+      const upstream = imageFetch();
+      const response = await handlePluginThumbnailRequest(
+        request,
+        [...plugins],
+        upstream.fetchImage,
+      );
+      expect(response.status).toBe(status);
+      expect(upstream.calls).toEqual([]);
+      expect(response.headers.get("cache-control")).toBeNull();
+    },
+  );
+
+  it.each([
+    () => new Response("missing", { status: 404 }),
+    () => new Response("<html>error</html>", { headers: { "content-type": "text/html" } }),
+    () => new Error("Origin unavailable"),
+  ])("does not cache a failed original for a year", async (failure) => {
+    const upstream = imageFetch(new Response("transform error", { status: 502 }), failure());
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(response.status).toBe(502);
+    expect(response.headers.get("cache-control")).toBe("no-store");
+  });
+
+  it("round-trips screenshot URL punctuation through the card URL", async () => {
+    const screenshot = source + "?name=a&other=b#preview";
+    const upstream = imageFetch(imageResponse("thumbnail"));
+    const request = new Request(
+      "https://paseo.sh" + pluginCardScreenshot(plugin.id, screenshot).src,
+    );
+    const response = await handlePluginThumbnailRequest(
+      request,
+      [{ ...plugin, media: [screenshot] }],
+      upstream.fetchImage,
+    );
+    expect(response.status).toBe(200);
+    expect(upstream.calls[0].input).toBe(screenshot);
+  });
+});
diff --git a/packages/website/src/plugins/thumbnails.ts b/packages/website/src/plugins/thumbnails.ts
new file mode 100644
index 0000000000..1d5b0304ce
--- /dev/null
+++ b/packages/website/src/plugins/thumbnails.ts
@@ -0,0 +1,119 @@
+import { pluginMediaKind } from "@getpaseo/protocol/plugin-registry";
+import type { Plugin } from "./registry";
+
+// The single-column grid reaches 591px just below sm (640px minus 48px padding).
+const CARD_WIDTH = 592;
+const WIDTHS = new Set([CARD_WIDTH, CARD_WIDTH * 2]);
+const SOURCE_HOSTS = new Set(["cdn.jsdelivr.net", "raw.githubusercontent.com"]);
+
+export function pluginCardScreenshot(id: string, source: string): { src: string; srcSet?: string } {
+  if (!parseSource(source)) return { src: source };
+  return {
+    src: pluginThumbnailUrl(id, source, 1),
+    srcSet: `${pluginThumbnailUrl(id, source, 1)} 1x, ${pluginThumbnailUrl(id, source, 2)} 2x`,
+  };
+}
+
+function pluginThumbnailUrl(id: string, source: string, scale: 1 | 2): string {
+  return `/plugins/thumb/${CARD_WIDTH * scale}/${encodeURIComponent(source)}?plugin=${encodeURIComponent(id)}`;
+}
+
+/** Only images listed in the plugin's media are eligible for transformation or original fallback. */
+export async function handlePluginThumbnailRequest(
+  request: Request,
+  plugins: Plugin[],
+  fetchImage: typeof fetch = fetch,
+): Promise<Response> {
+  const url = new URL(request.url);
+  const match = /^\/plugins\/thumb\/(\d+)\/([^/]+)$/.exec(url.pathname);
+  if (!match || !WIDTHS.has(Number(match[1])))
+    return new Response("Invalid thumbnail width or source", { status: 400 });
+
+  let decoded: string;
+  try {
+    decoded = decodeURIComponent(match[2]);
+  } catch {
+    return new Response("Invalid thumbnail source", { status: 400 });
+  }
+  const source = parseSource(decoded);
+  if (!source) return new Response("Invalid thumbnail source", { status: 400 });
+
+  const plugin = plugins.find((entry) => entry.id === url.searchParams.get("plugin"));
+  if (!plugin?.media.includes(source) || pluginMediaKind(source) !== "image")
+    return new Response("Screenshot not found", { status: 404 });
+
+  const format = negotiatedFormat(request.headers.get("accept") ?? "");
+  let response: Response | undefined;
+  try {
+    response = await fetchImage(source, {
+      cf: { image: { width: Number(match[1]), fit: "scale-down", format, quality: 80 } },
+    });
+  } catch {
+    // An unavailable transformation must not prevent fetching the original.
+  }
+  if (!response || !isImage(response) || /err=/i.test(response.headers.get("cf-resized") ?? "")) {
+    await response?.body?.cancel();
+    try {
+      response = await fetchImage(source);
+    } catch {
+      return unavailableImage();
+    }
+  }
+  if (!isImage(response)) {
+    await response.body?.cancel();
+    return unavailableImage();
+  }
+  return new Response(response.body, {
+    headers: {
+      "content-type": response.headers.get("content-type")!,
+      "cache-control": "public, max-age=31536000, immutable",
+      vary: "Accept",
+      // Originals can be SVGs. Keep direct navigation from executing them on our origin.
+      "content-security-policy": "sandbox",
+      "x-content-type-options": "nosniff",
+    },
+  });
+}
+
+function isImage(response: Response): boolean {
+  return response.ok && /^image\//i.test(response.headers.get("content-type") ?? "");
+}
+
+function unavailableImage(): Response {
+  return new Response("Screenshot unavailable", {
+    status: 502,
+    headers: { "cache-control": "no-store" },
+  });
+}
+
+function parseSource(source: string): string | null {
+  try {
+    const url = new URL(source);
+    if (
+      url.protocol !== "https:" ||
+      !SOURCE_HOSTS.has(url.hostname) ||
+      url.username ||
+      url.password ||
+      url.port
+    )
+      return null;
+    return source;
+  } catch {
+    return null;
+  }
+}
+
+function negotiatedFormat(accept: string): "avif" | "webp" | undefined {
+  // The Worker API requires explicit negotiation; only the URL API accepts format=auto.
+  const accepted = new Map(
+    accept
+      .toLowerCase()
+      .split(",")
+      .map((range) => {
+        const [type, ...parameters] = range.split(";").map((part) => part.trim());
+        const quality = parameters.find((parameter) => parameter.startsWith("q="));
+        return [type, quality === undefined ? 1 : Number(quality.slice(2))] as const;
+      }),
+  );
+  return (["avif", "webp"] as const).find((format) => (accepted.get(`image/${format}`) ?? 0) > 0);
+}
diff --git a/packages/website/src/plugins/window-switch.tsx b/packages/website/src/plugins/window-switch.tsx
new file mode 100644
index 0000000000..c4098f097f
--- /dev/null
+++ b/packages/website/src/plugins/window-switch.tsx
@@ -0,0 +1,35 @@
+import type { InstallWindow } from "./installs";
+
+const WINDOWS: { value: InstallWindow; label: string }[] = [
+  { value: "week", label: "This week" },
+  { value: "month", label: "This month" },
+  { value: "all", label: "All time" },
+];
+
+/** Plain text time-window switch for install rankings. */
+export function WindowSwitch({
+  current,
+  hrefs,
+}: {
+  current: InstallWindow;
+  hrefs: Record<InstallWindow, string>;
+}) {
+  return (
+    <nav aria-label="Time window" className="flex items-baseline gap-4 text-sm">
+      {WINDOWS.map((option) => (
+        <a
+          key={option.value}
+          href={hrefs[option.value]}
+          aria-current={option.value === current ? "true" : undefined}
+          className={
+            option.value === current
+              ? "text-foreground"
+              : "text-extra-muted-foreground transition-colors hover:text-muted-foreground"
+          }
+        >
+          {option.label}
+        </a>
+      ))}
+    </nav>
+  );
+}
diff --git a/packages/website/src/routeTree.gen.ts b/packages/website/src/routeTree.gen.ts
index 35720a501e..46b5da4363 100644
--- a/packages/website/src/routeTree.gen.ts
+++ b/packages/website/src/routeTree.gen.ts
@@ -22,6 +22,7 @@ import { Route as PiRouteImport } from "./routes/pi";
 import { Route as OpencodeRouteImport } from "./routes/opencode";
 import { Route as OmpRouteImport } from "./routes/omp";
 import { Route as NovaRouteImport } from "./routes/nova";
+import { Route as MuseCodeRouteImport } from "./routes/muse-code";
 import { Route as MistralVibeRouteImport } from "./routes/mistral-vibe";
 import { Route as MinionCodeRouteImport } from "./routes/minion-code";
 import { Route as KimiRouteImport } from "./routes/kimi";
@@ -54,21 +55,29 @@ import { Route as ChangelogRouteImport } from "./routes/changelog";
 import { Route as BlogRouteImport } from "./routes/blog";
 import { Route as AutohandRouteImport } from "./routes/autohand";
 import { Route as AuggieRouteImport } from "./routes/auggie";
+import { Route as AntigravityRouteImport } from "./routes/antigravity";
 import { Route as AmpRouteImport } from "./routes/amp";
 import { Route as AgoragenticRouteImport } from "./routes/agoragentic";
 import { Route as AgentsRouteImport } from "./routes/agents";
 import { Route as IndexRouteImport } from "./routes/index";
+import { Route as PluginsIndexRouteImport } from "./routes/plugins/index";
 import { Route as DocsIndexRouteImport } from "./routes/docs/index";
 import { Route as BlogIndexRouteImport } from "./routes/blog/index";
+import { Route as PluginsAllRouteImport } from "./routes/plugins/all";
+import { Route as PluginsOwnerRouteImport } from "./routes/plugins/$owner";
+import { Route as DownloadThanksRouteImport } from "./routes/download_.thanks";
 import { Route as DocsSplatRouteImport } from "./routes/docs/$";
 import { Route as BlogSplatRouteImport } from "./routes/blog/$";
 import { Route as AlternativesSupersetRouteImport } from "./routes/alternatives/superset";
+import { Route as AlternativesOrcaRouteImport } from "./routes/alternatives/orca";
 import { Route as AlternativesOpencodeDesktopRouteImport } from "./routes/alternatives/opencode-desktop";
 import { Route as AlternativesOpenchamberRouteImport } from "./routes/alternatives/openchamber";
 import { Route as AlternativesHappyCoderRouteImport } from "./routes/alternatives/happy-coder";
 import { Route as AlternativesConductorRouteImport } from "./routes/alternatives/conductor";
 import { Route as AlternativesCodexAppRouteImport } from "./routes/alternatives/codex-app";
 import { Route as AlternativesClaudeDesktopRouteImport } from "./routes/alternatives/claude-desktop";
+import { Route as PluginsCategorySlugRouteImport } from "./routes/plugins/category/$slug";
+import { Route as PluginsOwnerSlugRouteImport } from "./routes/plugins/$owner_.$slug";
 
 const VtcodeRoute = VtcodeRouteImport.update({
   id: "/vtcode",
@@ -135,6 +144,11 @@ const NovaRoute = NovaRouteImport.update({
   path: "/nova",
   getParentRoute: () => rootRouteImport,
 } as any);
+const MuseCodeRoute = MuseCodeRouteImport.update({
+  id: "/muse-code",
+  path: "/muse-code",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const MistralVibeRoute = MistralVibeRouteImport.update({
   id: "/mistral-vibe",
   path: "/mistral-vibe",
@@ -295,6 +309,11 @@ const AuggieRoute = AuggieRouteImport.update({
   path: "/auggie",
   getParentRoute: () => rootRouteImport,
 } as any);
+const AntigravityRoute = AntigravityRouteImport.update({
+  id: "/antigravity",
+  path: "/antigravity",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const AmpRoute = AmpRouteImport.update({
   id: "/amp",
   path: "/amp",
@@ -315,6 +334,11 @@ const IndexRoute = IndexRouteImport.update({
   path: "/",
   getParentRoute: () => rootRouteImport,
 } as any);
+const PluginsIndexRoute = PluginsIndexRouteImport.update({
+  id: "/plugins/",
+  path: "/plugins/",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const DocsIndexRoute = DocsIndexRouteImport.update({
   id: "/",
   path: "/",
@@ -325,6 +349,21 @@ const BlogIndexRoute = BlogIndexRouteImport.update({
   path: "/",
   getParentRoute: () => BlogRoute,
 } as any);
+const PluginsAllRoute = PluginsAllRouteImport.update({
+  id: "/plugins/all",
+  path: "/plugins/all",
+  getParentRoute: () => rootRouteImport,
+} as any);
+const PluginsOwnerRoute = PluginsOwnerRouteImport.update({
+  id: "/plugins/$owner",
+  path: "/plugins/$owner",
+  getParentRoute: () => rootRouteImport,
+} as any);
+const DownloadThanksRoute = DownloadThanksRouteImport.update({
+  id: "/download_/thanks",
+  path: "/download/thanks",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const DocsSplatRoute = DocsSplatRouteImport.update({
   id: "/$",
   path: "/$",
@@ -340,6 +379,11 @@ const AlternativesSupersetRoute = AlternativesSupersetRouteImport.update({
   path: "/alternatives/superset",
   getParentRoute: () => rootRouteImport,
 } as any);
+const AlternativesOrcaRoute = AlternativesOrcaRouteImport.update({
+  id: "/alternatives/orca",
+  path: "/alternatives/orca",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const AlternativesOpencodeDesktopRoute =
   AlternativesOpencodeDesktopRouteImport.update({
     id: "/alternatives/opencode-desktop",
@@ -372,12 +416,23 @@ const AlternativesClaudeDesktopRoute =
     path: "/alternatives/claude-desktop",
     getParentRoute: () => rootRouteImport,
   } as any);
+const PluginsCategorySlugRoute = PluginsCategorySlugRouteImport.update({
+  id: "/plugins/category/$slug",
+  path: "/plugins/category/$slug",
+  getParentRoute: () => rootRouteImport,
+} as any);
+const PluginsOwnerSlugRoute = PluginsOwnerSlugRouteImport.update({
+  id: "/plugins/$owner_/$slug",
+  path: "/plugins/$owner/$slug",
+  getParentRoute: () => rootRouteImport,
+} as any);
 
 export interface FileRoutesByFullPath {
   "/": typeof IndexRoute;
   "/agents": typeof AgentsRoute;
   "/agoragentic": typeof AgoragenticRoute;
   "/amp": typeof AmpRoute;
+  "/antigravity": typeof AntigravityRoute;
   "/auggie": typeof AuggieRoute;
   "/autohand": typeof AutohandRoute;
   "/blog": typeof BlogRouteWithChildren;
@@ -410,6 +465,7 @@ export interface FileRoutesByFullPath {
   "/kimi": typeof KimiRoute;
   "/minion-code": typeof MinionCodeRoute;
   "/mistral-vibe": typeof MistralVibeRoute;
+  "/muse-code": typeof MuseCodeRoute;
   "/nova": typeof NovaRoute;
   "/omp": typeof OmpRoute;
   "/opencode": typeof OpencodeRoute;
@@ -429,17 +485,25 @@ export interface FileRoutesByFullPath {
   "/alternatives/happy-coder": typeof AlternativesHappyCoderRoute;
   "/alternatives/openchamber": typeof AlternativesOpenchamberRoute;
   "/alternatives/opencode-desktop": typeof AlternativesOpencodeDesktopRoute;
+  "/alternatives/orca": typeof AlternativesOrcaRoute;
   "/alternatives/superset": typeof AlternativesSupersetRoute;
   "/blog/$": typeof BlogSplatRoute;
   "/docs/$": typeof DocsSplatRoute;
+  "/download/thanks": typeof DownloadThanksRoute;
+  "/plugins/$owner": typeof PluginsOwnerRoute;
+  "/plugins/all": typeof PluginsAllRoute;
   "/blog/": typeof BlogIndexRoute;
   "/docs/": typeof DocsIndexRoute;
+  "/plugins/": typeof PluginsIndexRoute;
+  "/plugins/$owner/$slug": typeof PluginsOwnerSlugRoute;
+  "/plugins/category/$slug": typeof PluginsCategorySlugRoute;
 }
 export interface FileRoutesByTo {
   "/": typeof IndexRoute;
   "/agents": typeof AgentsRoute;
   "/agoragentic": typeof AgoragenticRoute;
   "/amp": typeof AmpRoute;
+  "/antigravity": typeof AntigravityRoute;
   "/auggie": typeof AuggieRoute;
   "/autohand": typeof AutohandRoute;
   "/changelog": typeof ChangelogRoute;
@@ -470,6 +534,7 @@ export interface FileRoutesByTo {
   "/kimi": typeof KimiRoute;
   "/minion-code": typeof MinionCodeRoute;
   "/mistral-vibe": typeof MistralVibeRoute;
+  "/muse-code": typeof MuseCodeRoute;
   "/nova": typeof NovaRoute;
   "/omp": typeof OmpRoute;
   "/opencode": typeof OpencodeRoute;
@@ -489,11 +554,18 @@ export interface FileRoutesByTo {
   "/alternatives/happy-coder": typeof AlternativesHappyCoderRoute;
   "/alternatives/openchamber": typeof AlternativesOpenchamberRoute;
   "/alternatives/opencode-desktop": typeof AlternativesOpencodeDesktopRoute;
+  "/alternatives/orca": typeof AlternativesOrcaRoute;
   "/alternatives/superset": typeof AlternativesSupersetRoute;
   "/blog/$": typeof BlogSplatRoute;
   "/docs/$": typeof DocsSplatRoute;
+  "/download/thanks": typeof DownloadThanksRoute;
+  "/plugins/$owner": typeof PluginsOwnerRoute;
+  "/plugins/all": typeof PluginsAllRoute;
   "/blog": typeof BlogIndexRoute;
   "/docs": typeof DocsIndexRoute;
+  "/plugins": typeof PluginsIndexRoute;
+  "/plugins/$owner/$slug": typeof PluginsOwnerSlugRoute;
+  "/plugins/category/$slug": typeof PluginsCategorySlugRoute;
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport;
@@ -501,6 +573,7 @@ export interface FileRoutesById {
   "/agents": typeof AgentsRoute;
   "/agoragentic": typeof AgoragenticRoute;
   "/amp": typeof AmpRoute;
+  "/antigravity": typeof AntigravityRoute;
   "/auggie": typeof AuggieRoute;
   "/autohand": typeof AutohandRoute;
   "/blog": typeof BlogRouteWithChildren;
@@ -533,6 +606,7 @@ export interface FileRoutesById {
   "/kimi": typeof KimiRoute;
   "/minion-code": typeof MinionCodeRoute;
   "/mistral-vibe": typeof MistralVibeRoute;
+  "/muse-code": typeof MuseCodeRoute;
   "/nova": typeof NovaRoute;
   "/omp": typeof OmpRoute;
   "/opencode": typeof OpencodeRoute;
@@ -552,11 +626,18 @@ export interface FileRoutesById {
   "/alternatives/happy-coder": typeof AlternativesHappyCoderRoute;
   "/alternatives/openchamber": typeof AlternativesOpenchamberRoute;
   "/alternatives/opencode-desktop": typeof AlternativesOpencodeDesktopRoute;
+  "/alternatives/orca": typeof AlternativesOrcaRoute;
   "/alternatives/superset": typeof AlternativesSupersetRoute;
   "/blog/$": typeof BlogSplatRoute;
   "/docs/$": typeof DocsSplatRoute;
+  "/download_/thanks": typeof DownloadThanksRoute;
+  "/plugins/$owner": typeof PluginsOwnerRoute;
+  "/plugins/all": typeof PluginsAllRoute;
   "/blog/": typeof BlogIndexRoute;
   "/docs/": typeof DocsIndexRoute;
+  "/plugins/": typeof PluginsIndexRoute;
+  "/plugins/$owner_/$slug": typeof PluginsOwnerSlugRoute;
+  "/plugins/category/$slug": typeof PluginsCategorySlugRoute;
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath;
@@ -565,6 +646,7 @@ export interface FileRouteTypes {
     | "/agents"
     | "/agoragentic"
     | "/amp"
+    | "/antigravity"
     | "/auggie"
     | "/autohand"
     | "/blog"
@@ -597,6 +679,7 @@ export interface FileRouteTypes {
     | "/kimi"
     | "/minion-code"
     | "/mistral-vibe"
+    | "/muse-code"
     | "/nova"
     | "/omp"
     | "/opencode"
@@ -616,17 +699,25 @@ export interface FileRouteTypes {
     | "/alternatives/happy-coder"
     | "/alternatives/openchamber"
     | "/alternatives/opencode-desktop"
+    | "/alternatives/orca"
     | "/alternatives/superset"
     | "/blog/$"
     | "/docs/$"
+    | "/download/thanks"
+    | "/plugins/$owner"
+    | "/plugins/all"
     | "/blog/"
-    | "/docs/";
+    | "/docs/"
+    | "/plugins/"
+    | "/plugins/$owner/$slug"
+    | "/plugins/category/$slug";
   fileRoutesByTo: FileRoutesByTo;
   to:
     | "/"
     | "/agents"
     | "/agoragentic"
     | "/amp"
+    | "/antigravity"
     | "/auggie"
     | "/autohand"
     | "/changelog"
@@ -657,6 +748,7 @@ export interface FileRouteTypes {
     | "/kimi"
     | "/minion-code"
     | "/mistral-vibe"
+    | "/muse-code"
     | "/nova"
     | "/omp"
     | "/opencode"
@@ -676,17 +768,25 @@ export interface FileRouteTypes {
     | "/alternatives/happy-coder"
     | "/alternatives/openchamber"
     | "/alternatives/opencode-desktop"
+    | "/alternatives/orca"
     | "/alternatives/superset"
     | "/blog/$"
     | "/docs/$"
+    | "/download/thanks"
+    | "/plugins/$owner"
+    | "/plugins/all"
     | "/blog"
-    | "/docs";
+    | "/docs"
+    | "/plugins"
+    | "/plugins/$owner/$slug"
+    | "/plugins/category/$slug";
   id:
     | "__root__"
     | "/"
     | "/agents"
     | "/agoragentic"
     | "/amp"
+    | "/antigravity"
     | "/auggie"
     | "/autohand"
     | "/blog"
@@ -719,6 +819,7 @@ export interface FileRouteTypes {
     | "/kimi"
     | "/minion-code"
     | "/mistral-vibe"
+    | "/muse-code"
     | "/nova"
     | "/omp"
     | "/opencode"
@@ -738,11 +839,18 @@ export interface FileRouteTypes {
     | "/alternatives/happy-coder"
     | "/alternatives/openchamber"
     | "/alternatives/opencode-desktop"
+    | "/alternatives/orca"
     | "/alternatives/superset"
     | "/blog/$"
     | "/docs/$"
+    | "/download_/thanks"
+    | "/plugins/$owner"
+    | "/plugins/all"
     | "/blog/"
-    | "/docs/";
+    | "/docs/"
+    | "/plugins/"
+    | "/plugins/$owner_/$slug"
+    | "/plugins/category/$slug";
   fileRoutesById: FileRoutesById;
 }
 export interface RootRouteChildren {
@@ -750,6 +858,7 @@ export interface RootRouteChildren {
   AgentsRoute: typeof AgentsRoute;
   AgoragenticRoute: typeof AgoragenticRoute;
   AmpRoute: typeof AmpRoute;
+  AntigravityRoute: typeof AntigravityRoute;
   AuggieRoute: typeof AuggieRoute;
   AutohandRoute: typeof AutohandRoute;
   BlogRoute: typeof BlogRouteWithChildren;
@@ -782,6 +891,7 @@ export interface RootRouteChildren {
   KimiRoute: typeof KimiRoute;
   MinionCodeRoute: typeof MinionCodeRoute;
   MistralVibeRoute: typeof MistralVibeRoute;
+  MuseCodeRoute: typeof MuseCodeRoute;
   NovaRoute: typeof NovaRoute;
   OmpRoute: typeof OmpRoute;
   OpencodeRoute: typeof OpencodeRoute;
@@ -801,7 +911,14 @@ export interface RootRouteChildren {
   AlternativesHappyCoderRoute: typeof AlternativesHappyCoderRoute;
   AlternativesOpenchamberRoute: typeof AlternativesOpenchamberRoute;
   AlternativesOpencodeDesktopRoute: typeof AlternativesOpencodeDesktopRoute;
+  AlternativesOrcaRoute: typeof AlternativesOrcaRoute;
   AlternativesSupersetRoute: typeof AlternativesSupersetRoute;
+  DownloadThanksRoute: typeof DownloadThanksRoute;
+  PluginsOwnerRoute: typeof PluginsOwnerRoute;
+  PluginsAllRoute: typeof PluginsAllRoute;
+  PluginsIndexRoute: typeof PluginsIndexRoute;
+  PluginsOwnerSlugRoute: typeof PluginsOwnerSlugRoute;
+  PluginsCategorySlugRoute: typeof PluginsCategorySlugRoute;
 }
 
 declare module "@tanstack/react-router" {
@@ -897,6 +1014,13 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof NovaRouteImport;
       parentRoute: typeof rootRouteImport;
     };
+    "/muse-code": {
+      id: "/muse-code";
+      path: "/muse-code";
+      fullPath: "/muse-code";
+      preLoaderRoute: typeof MuseCodeRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
     "/mistral-vibe": {
       id: "/mistral-vibe";
       path: "/mistral-vibe";
@@ -1121,6 +1245,13 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof AuggieRouteImport;
       parentRoute: typeof rootRouteImport;
     };
+    "/antigravity": {
+      id: "/antigravity";
+      path: "/antigravity";
+      fullPath: "/antigravity";
+      preLoaderRoute: typeof AntigravityRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
     "/amp": {
       id: "/amp";
       path: "/amp";
@@ -1149,6 +1280,13 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof IndexRouteImport;
       parentRoute: typeof rootRouteImport;
     };
+    "/plugins/": {
+      id: "/plugins/";
+      path: "/plugins";
+      fullPath: "/plugins/";
+      preLoaderRoute: typeof PluginsIndexRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
     "/docs/": {
       id: "/docs/";
       path: "/";
@@ -1163,6 +1301,27 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof BlogIndexRouteImport;
       parentRoute: typeof BlogRoute;
     };
+    "/plugins/all": {
+      id: "/plugins/all";
+      path: "/plugins/all";
+      fullPath: "/plugins/all";
+      preLoaderRoute: typeof PluginsAllRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/plugins/$owner": {
+      id: "/plugins/$owner";
+      path: "/plugins/$owner";
+      fullPath: "/plugins/$owner";
+      preLoaderRoute: typeof PluginsOwnerRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/download_/thanks": {
+      id: "/download_/thanks";
+      path: "/download/thanks";
+      fullPath: "/download/thanks";
+      preLoaderRoute: typeof DownloadThanksRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
     "/docs/$": {
       id: "/docs/$";
       path: "/$";
@@ -1184,6 +1343,13 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof AlternativesSupersetRouteImport;
       parentRoute: typeof rootRouteImport;
     };
+    "/alternatives/orca": {
+      id: "/alternatives/orca";
+      path: "/alternatives/orca";
+      fullPath: "/alternatives/orca";
+      preLoaderRoute: typeof AlternativesOrcaRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
     "/alternatives/opencode-desktop": {
       id: "/alternatives/opencode-desktop";
       path: "/alternatives/opencode-desktop";
@@ -1226,6 +1392,20 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof AlternativesClaudeDesktopRouteImport;
       parentRoute: typeof rootRouteImport;
     };
+    "/plugins/category/$slug": {
+      id: "/plugins/category/$slug";
+      path: "/plugins/category/$slug";
+      fullPath: "/plugins/category/$slug";
+      preLoaderRoute: typeof PluginsCategorySlugRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/plugins/$owner_/$slug": {
+      id: "/plugins/$owner_/$slug";
+      path: "/plugins/$owner/$slug";
+      fullPath: "/plugins/$owner/$slug";
+      preLoaderRoute: typeof PluginsOwnerSlugRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
   }
 }
 
@@ -1258,6 +1438,7 @@ const rootRouteChildren: RootRouteChildren = {
   AgentsRoute: AgentsRoute,
   AgoragenticRoute: AgoragenticRoute,
   AmpRoute: AmpRoute,
+  AntigravityRoute: AntigravityRoute,
   AuggieRoute: AuggieRoute,
   AutohandRoute: AutohandRoute,
   BlogRoute: BlogRouteWithChildren,
@@ -1290,6 +1471,7 @@ const rootRouteChildren: RootRouteChildren = {
   KimiRoute: KimiRoute,
   MinionCodeRoute: MinionCodeRoute,
   MistralVibeRoute: MistralVibeRoute,
+  MuseCodeRoute: MuseCodeRoute,
   NovaRoute: NovaRoute,
   OmpRoute: OmpRoute,
   OpencodeRoute: OpencodeRoute,
@@ -1309,7 +1491,14 @@ const rootRouteChildren: RootRouteChildren = {
   AlternativesHappyCoderRoute: AlternativesHappyCoderRoute,
   AlternativesOpenchamberRoute: AlternativesOpenchamberRoute,
   AlternativesOpencodeDesktopRoute: AlternativesOpencodeDesktopRoute,
+  AlternativesOrcaRoute: AlternativesOrcaRoute,
   AlternativesSupersetRoute: AlternativesSupersetRoute,
+  DownloadThanksRoute: DownloadThanksRoute,
+  PluginsOwnerRoute: PluginsOwnerRoute,
+  PluginsAllRoute: PluginsAllRoute,
+  PluginsIndexRoute: PluginsIndexRoute,
+  PluginsOwnerSlugRoute: PluginsOwnerSlugRoute,
+  PluginsCategorySlugRoute: PluginsCategorySlugRoute,
 };
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)
diff --git a/packages/website/src/routes/agents.tsx b/packages/website/src/routes/agents.tsx
index 884752b622..94395c7a0d 100644
--- a/packages/website/src/routes/agents.tsx
+++ b/packages/website/src/routes/agents.tsx
@@ -1,7 +1,7 @@
 import { createFileRoute, Link } from "@tanstack/react-router";
-import { CursorFieldProvider } from "~/components/butterfly";
-import { SiteFooter } from "~/components/site-footer";
-import { SiteHeader } from "~/components/site-header";
+import { ExternalLink } from "lucide-react";
+import { AgentPageIcon } from "~/components/agent-page-icon";
+import { SiteShell } from "~/components/site-shell";
 import { AGENT_PAGES } from "~/data/agent-pages";
 import { pageMeta } from "~/meta";
 import "~/styles.css";
@@ -10,56 +10,53 @@ export const Route = createFileRoute("/agents")({
   head: () =>
     pageMeta(
       "Supported agents – Every coding agent Paseo runs",
-      "Run Claude Code, Codex, Copilot, OpenCode, Cursor CLI, Gemini CLI, and dozens more coding agents from your phone. Self-hosted, your code stays on your machine.",
+      "Run Claude Code, Codex, OpenCode, Pi, OMP, Cursor, Muse Code, Antigravity, and dozens more coding agents from your phone. Self-hosted, your code stays on your machine.",
       "/agents",
     ),
   component: AgentsPage,
 });
 
+const LINK_CLASS = "underline hover:text-white";
+
 function AgentsPage() {
   return (
-    <CursorFieldProvider>
-      <div className="bg-background">
-        <div className="p-6 md:px-32 md:pt-20 max-w-7xl mx-auto">
-          <nav className="mb-16">
-            <SiteHeader />
-          </nav>
-          <header className="space-y-4 max-w-2xl">
-            <h1 className="text-3xl md:text-5xl font-medium tracking-tight">
-              Every agent Paseo supports
-            </h1>
-            <p className="text-white/70 text-lg leading-relaxed">
-              Paseo runs the native CLI for {AGENT_PAGES.length} coding agents — your skills, your
-              config, your MCP servers, all intact. Drive any of them from your phone.
-            </p>
-          </header>
-        </div>
+    <SiteShell width="default">
+      <h1 className="text-3xl font-medium tracking-tight mb-4">Supported agents</h1>
+      <p className="text-lg text-white/70 leading-relaxed max-w-2xl">
+        Paseo supports many agents natively, it can run any{" "}
+        <a href="/docs/custom-providers#acp-providers" className={LINK_CLASS}>
+          ACP agent
+        </a>{" "}
+        and you can implement new providers via{" "}
+        <a href="/docs/plugins/providers" className={LINK_CLASS}>
+          plugins
+        </a>
+        .
+      </p>
+      <a
+        href="/docs/supported-providers"
+        target="_blank"
+        rel="noopener noreferrer"
+        className="mt-3 inline-flex items-center gap-1 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground"
+      >
+        Docs
+        <ExternalLink className="h-3 w-3" />
+      </a>
 
-        <main className="px-6 md:px-32 pb-24 max-w-7xl mx-auto">
-          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
-            {AGENT_PAGES.map((agent) => (
-              <Link
-                key={agent.slug}
-                to={`/${agent.slug}`}
-                className="block rounded-xl border border-white/10 bg-white/[0.02] p-5 hover:border-white/20 hover:bg-white/[0.04] transition-colors"
-              >
-                <h2 className="font-medium text-white">{agent.name}</h2>
-                <p className="mt-1 text-sm text-white/60 leading-relaxed">{agent.subtitle}</p>
-              </Link>
-            ))}
-          </div>
-
-          <p className="mt-10 text-sm text-white/50">
-            Want to add another?{" "}
-            <a href="/docs/custom-providers" className="underline hover:text-white/80">
-              Configure any ACP-compatible agent
-            </a>{" "}
-            in <code className="font-mono text-white/60">~/.paseo/config.json</code>.
-          </p>
-        </main>
-
-        <SiteFooter />
+      <div className="mt-16 grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
+        {AGENT_PAGES.map((agent) => (
+          <Link
+            key={agent.slug}
+            to={`/${agent.slug}`}
+            className="flex items-center gap-3 rounded-xl border border-white/10 bg-white/[0.03] px-4 py-3 hover:border-white/20 hover:bg-white/[0.05] transition-colors"
+          >
+            <AgentPageIcon slug={agent.slug} className="h-5 w-5 shrink-0 text-white/80" />
+            <span className="min-w-0 text-sm font-medium leading-snug text-white">
+              {agent.name}
+            </span>
+          </Link>
+        ))}
       </div>
-    </CursorFieldProvider>
+    </SiteShell>
   );
 }
diff --git a/packages/website/src/routes/alternatives/orca.tsx b/packages/website/src/routes/alternatives/orca.tsx
new file mode 100644
index 0000000000..b88dac091f
--- /dev/null
+++ b/packages/website/src/routes/alternatives/orca.tsx
@@ -0,0 +1,4 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { alternativeRouteOptions } from "~/components/alternative-page";
+
+export const Route = createFileRoute("/alternatives/orca")(alternativeRouteOptions("orca"));
diff --git a/packages/website/src/routes/antigravity.tsx b/packages/website/src/routes/antigravity.tsx
new file mode 100644
index 0000000000..3d821de7b9
--- /dev/null
+++ b/packages/website/src/routes/antigravity.tsx
@@ -0,0 +1,4 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { agentRouteOptions } from "~/components/agent-route";
+
+export const Route = createFileRoute("/antigravity")(agentRouteOptions("antigravity"));
diff --git a/packages/website/src/routes/download.tsx b/packages/website/src/routes/download.tsx
index 5efed4de4b..b7f7331d2f 100644
--- a/packages/website/src/routes/download.tsx
+++ b/packages/website/src/routes/download.tsx
@@ -8,6 +8,7 @@ import {
   downloadUrls,
   appStoreUrl,
   playStoreUrl,
+  thanksPageHref,
   webAppUrl,
   AppleIcon,
   AndroidIcon,
@@ -86,10 +87,13 @@ function Download() {
 
         <div className="divide-y divide-border">
           <PlatformRow icon={AppleIcon} label="macOS">
-            <PillGroup>
-              <DownloadPill href={urls.macAppleSilicon} label="Apple Silicon" />
-              <DownloadPill href={urls.macIntel} label="Intel" />
-            </PillGroup>
+            <div className="flex flex-col items-start gap-2 sm:items-end">
+              <PillGroup>
+                <DownloadPill href={thanksPageHref(urls.macAppleSilicon)} label="Apple Silicon" />
+                <DownloadPill href={thanksPageHref(urls.macIntel)} label="Intel" />
+              </PillGroup>
+              <span className="text-xs text-muted-foreground">Requires macOS 13 or newer</span>
+            </div>
           </PlatformRow>
 
           {!onBeta && (
@@ -101,18 +105,20 @@ function Download() {
           <PlatformRow icon={WindowsIcon} label="Windows">
             <PillGroup>
               <DownloadPill
-                href={urls.windowsExeX64}
+                href={thanksPageHref(urls.windowsExeX64)}
                 label={urls.windowsExeArm64 ? "Intel / x64" : "Download"}
               />
-              {urls.windowsExeArm64 && <DownloadPill href={urls.windowsExeArm64} label="ARM64" />}
+              {urls.windowsExeArm64 && (
+                <DownloadPill href={thanksPageHref(urls.windowsExeArm64)} label="ARM64" />
+              )}
             </PillGroup>
           </PlatformRow>
 
           <PlatformRow icon={LinuxIcon} label="Linux">
             <PillGroup>
-              <DownloadPill href={urls.linuxAppImage} label="AppImage" />
-              <DownloadPill href={urls.linuxDeb} label="DEB" />
-              <DownloadPill href={urls.linuxRpm} label="RPM" />
+              <DownloadPill href={thanksPageHref(urls.linuxAppImage)} label="AppImage" />
+              <DownloadPill href={thanksPageHref(urls.linuxDeb)} label="DEB" />
+              <DownloadPill href={thanksPageHref(urls.linuxRpm)} label="RPM" />
             </PillGroup>
           </PlatformRow>
         </div>
@@ -129,7 +135,7 @@ function Download() {
           <PlatformRow icon={AndroidIcon} label="Android">
             <PillGroup>
               {!onBeta && <DownloadPill href={playStoreUrl} label="Play Store" external />}
-              <DownloadPill href={urls.androidApk} label="APK" />
+              <DownloadPill href={thanksPageHref(urls.androidApk)} label="APK" />
             </PillGroup>
           </PlatformRow>
 
@@ -301,8 +307,7 @@ function DownloadPill({
   return (
     <a
       href={href}
-      target="_blank"
-      rel="noopener noreferrer"
+      {...(external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
       className="inline-flex items-center justify-center rounded-full bg-foreground px-4 py-1.5 text-sm font-medium text-background hover:bg-foreground/85 transition-colors"
     >
       {label}
diff --git a/packages/website/src/routes/download_.thanks.tsx b/packages/website/src/routes/download_.thanks.tsx
new file mode 100644
index 0000000000..8bbd99a121
--- /dev/null
+++ b/packages/website/src/routes/download_.thanks.tsx
@@ -0,0 +1,95 @@
+import { useEffect } from "react";
+import { createFileRoute } from "@tanstack/react-router";
+import { DiscordIcon, GitHubIcon, RedditIcon } from "~/components/brand-icons";
+import { SiteShell } from "~/components/site-shell";
+import { SponsorSection } from "~/components/sponsorship";
+import { parseReleaseAssetUrl } from "~/downloads";
+import { pageMeta } from "~/meta";
+import "~/styles.css";
+
+interface ThanksSearch {
+  file?: string;
+}
+
+export const Route = createFileRoute("/download_/thanks")({
+  validateSearch: (search: Record<string, unknown>): ThanksSearch => {
+    const file = parseReleaseAssetUrl(search.file);
+    return file ? { file } : {};
+  },
+  head: () =>
+    pageMeta(
+      "Thanks for downloading Paseo",
+      "Your Paseo download is starting. Join the community on Discord, GitHub, and Reddit, or sponsor Paseo.",
+      "/download/thanks",
+    ),
+  component: DownloadThanks,
+});
+
+const COMMUNITY = [
+  {
+    name: "Discord",
+    icon: <DiscordIcon className="h-6 w-6" />,
+    body: "Get help and share feedback.",
+    href: "https://discord.gg/jz8T2uahpH",
+  },
+  {
+    name: "GitHub",
+    icon: <GitHubIcon className="h-6 w-6" />,
+    body: "Star, report issues, contribute.",
+    href: "https://github.com/getpaseo/paseo",
+  },
+  {
+    name: "Reddit",
+    icon: <RedditIcon className="h-6 w-6" />,
+    body: "Workflows and questions.",
+    href: "https://www.reddit.com/r/PaseoAI/",
+  },
+];
+
+function DownloadThanks() {
+  const { file } = Route.useSearch();
+
+  useEffect(() => {
+    if (file) window.location.assign(file);
+  }, [file]);
+
+  return (
+    <SiteShell width="default">
+      <h1 className="text-3xl font-medium tracking-tight mb-4">Thanks for downloading Paseo</h1>
+      <p className="text-lg text-white/70 leading-relaxed max-w-2xl">
+        Get help, share feedback, and follow along.
+      </p>
+      {file && (
+        <p className="text-white/40 text-sm mt-3">
+          Download didn&apos;t start?{" "}
+          <a href={file} className="underline hover:text-white/80">
+            Try again
+          </a>
+        </p>
+      )}
+
+      <div className="space-y-20 mt-16">
+        <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
+          {COMMUNITY.map((item) => (
+            <a
+              key={item.name}
+              href={item.href}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="flex items-start gap-3 rounded-xl border border-white/10 bg-white/[0.03] px-5 py-4 transition-colors hover:border-white/20 hover:bg-white/[0.05]"
+            >
+              <span className="flex text-white/80">{item.icon}</span>
+              <span className="min-w-0">
+                <span className="block font-medium [text-box:trim-start_cap_alphabetic]">
+                  {item.name}
+                </span>
+                <span className="block text-xs text-muted-foreground">{item.body}</span>
+              </span>
+            </a>
+          ))}
+        </div>
+        <SponsorSection />
+      </div>
+    </SiteShell>
+  );
+}
diff --git a/packages/website/src/routes/hub.tsx b/packages/website/src/routes/hub.tsx
index ffc61d8d55..51f055b9fb 100644
--- a/packages/website/src/routes/hub.tsx
+++ b/packages/website/src/routes/hub.tsx
@@ -12,7 +12,13 @@ import { DiscordIcon, GitHubIcon, SlackIcon } from "~/components/brand-icons";
 import { AGENT_PAGES } from "~/data/agent-pages";
 import { FAQItem } from "~/components/faq-item";
 import { SiteShell } from "~/components/site-shell";
-import { getHostedOffer, type HubHostedOffer } from "~/hub-plans";
+import {
+  formatPlanPrice,
+  getHubPlans,
+  planPriceQualifier,
+  type HubPlanOffer,
+  type HubPlans,
+} from "~/hub-plans";
 import { pageMeta } from "~/meta";
 
 export const Route = createFileRoute("/hub")({
@@ -24,9 +30,9 @@ export const Route = createFileRoute("/hub")({
     ),
   loader: async () => {
     try {
-      return { hosted: await getHostedOffer() };
+      return { plans: await getHubPlans() };
     } catch {
-      return { hosted: null };
+      return { plans: null };
     }
   },
   component: Hub,
@@ -37,7 +43,7 @@ const HOSTED_HUB_URL = "https://hub.paseo.sh";
 const LINK_CLASS = "underline hover:text-white/80";
 
 function Hub() {
-  const { hosted } = Route.useLoaderData();
+  const { plans } = Route.useLoaderData();
   return (
     <SiteShell width="default">
       <h1 className="text-3xl font-medium tracking-tight mb-4">Paseo Hub</h1>
@@ -50,7 +56,7 @@ function Hub() {
         <Triggers />
         <Agents />
         <Shape />
-        <Pricing hosted={hosted} />
+        <Pricing plans={plans} />
         <FaqSection />
       </div>
     </SiteShell>
@@ -80,8 +86,8 @@ const SELF_HOSTED_FEATURES: readonly PlanFeature[] = [
     tooltip: null,
   },
 ];
-function Pricing({ hosted }: { hosted: HubHostedOffer | null }) {
-  if (hosted === null) {
+function Pricing({ plans }: { plans: HubPlans | null }) {
+  if (plans === null) {
     return (
       <section className="space-y-6" aria-labelledby="pricing-heading">
         <div className="space-y-2">
@@ -104,15 +110,10 @@ function Pricing({ hosted }: { hosted: HubHostedOffer | null }) {
 
   return (
     <section className="space-y-6" aria-labelledby="pricing-heading">
-      <div className="space-y-2">
-        <h2 id="pricing-heading" className="text-xl font-medium">
-          Choose how to run Hub
-        </h2>
-        <p className="max-w-2xl leading-relaxed text-white/70">
-          Both options use Paseo daemons to run agents on your machines.
-        </p>
-      </div>
-      <div className="grid gap-4 md:grid-cols-2">
+      <h2 id="pricing-heading" className="text-xl font-medium">
+        Choose how to run Hub
+      </h2>
+      <div className="grid gap-4 md:grid-cols-3">
         <PlanCard
           name="Self-hosted"
           price="Free"
@@ -123,13 +124,22 @@ function Pricing({ hosted }: { hosted: HubHostedOffer | null }) {
           actionLabel="Self-host Hub"
         />
         <PlanCard
-          name={hosted.name}
-          price={formatPrice(hosted.price)}
-          priceQualifier={`per ${hosted.billing.unit.label} / ${formatBillingPeriod(hosted.price)}`}
-          priceTooltip={hosted.price.tooltip}
-          features={hosted.features}
+          name={plans.free.name}
+          price={formatPlanPrice(plans.free.price)}
+          priceQualifier={planPriceQualifier(plans.free)}
+          priceTooltip={plans.free.price.tooltip}
+          features={planFeatures(plans.free)}
           actionHref={HOSTED_HUB_URL}
-          actionLabel="Start free trial"
+          actionLabel="Get started"
+        />
+        <PlanCard
+          name={plans.paid.name}
+          price={formatPlanPrice(plans.paid.price)}
+          priceQualifier={planPriceQualifier(plans.paid)}
+          priceTooltip={plans.paid.price.tooltip}
+          features={planFeatures(plans.paid)}
+          actionHref={HOSTED_HUB_URL}
+          actionLabel="Get started"
           featured
         />
       </div>
@@ -137,6 +147,33 @@ function Pricing({ hosted }: { hosted: HubHostedOffer | null }) {
   );
 }
 
+/** The figures the plan includes, ahead of the prose the catalog wrote for it. */
+function planFeatures(plan: HubPlanOffer): readonly PlanFeature[] {
+  return [
+    {
+      key: "included-executions",
+      label: formatAllowance(plan.included.executionsPerMonth),
+      tooltip: null,
+    },
+    {
+      key: "included-seats",
+      label: formatSeats(plan.included.seats, plan.billing.unit.label),
+      tooltip: null,
+    },
+    ...plan.features,
+  ];
+}
+
+function formatAllowance(executionsPerMonth: number | null): string {
+  if (executionsPerMonth === null) return "Unlimited agent runs";
+  return `${executionsPerMonth.toLocaleString("en")} agent runs a month`;
+}
+
+function formatSeats(seats: number | null, unitLabel: string): string {
+  if (seats === null) return `Unlimited ${unitLabel}s`;
+  return `${seats.toLocaleString("en")} ${seats === 1 ? unitLabel : `${unitLabel}s`}`;
+}
+
 function PlanCard({
   name,
   price,
@@ -181,7 +218,7 @@ function PlanCard({
       )}
       <a
         href={actionHref}
-        className={`mt-8 rounded-md px-4 py-2 text-center text-sm font-medium transition-colors ${featured ? "bg-white text-black hover:bg-white/90" : "border border-white/15 text-white/80 hover:border-white/25 hover:text-white"}`}
+        className={`rounded-md px-4 py-2 text-center text-sm font-medium transition-colors mt-8 ${featured ? "bg-white text-black hover:bg-white/90" : "border border-white/15 text-white/80 hover:border-white/25 hover:text-white"}`}
       >
         {actionLabel}
       </a>
@@ -203,18 +240,6 @@ function InfoTip({ text }: { text: string }) {
   );
 }
 
-function formatPrice(price: HubHostedOffer["price"]): string {
-  return new Intl.NumberFormat("en", {
-    style: "currency",
-    currency: price.currency.toUpperCase(),
-    minimumFractionDigits: 0,
-  }).format(price.unitAmount / 100);
-}
-
-function formatBillingPeriod(price: HubHostedOffer["price"]): string {
-  return price.intervalCount === 1 ? "month" : `${price.intervalCount} months`;
-}
-
 const TRIGGER_SURFACES = [
   { name: "GitHub", icon: <GitHubIcon className="h-6 w-6" />, body: "Issues, PRs, and reviews." },
   { name: "Slack", icon: <SlackIcon className="h-6 w-6" />, body: "Channels and threads." },
@@ -586,7 +611,8 @@ function FaqSection() {
           <a href={HOSTED_HUB_URL} className={LINK_CLASS}>
             sign in to Hosted Hub
           </a>{" "}
-          to start a free trial.
+          for a free account. When you want more agent runs or more seats, upgrade from Billing
+          inside Hub.
         </FAQItem>
       </div>
     </section>
diff --git a/packages/website/src/routes/index.tsx b/packages/website/src/routes/index.tsx
index 38806673f9..5f0bc664ae 100644
--- a/packages/website/src/routes/index.tsx
+++ b/packages/website/src/routes/index.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute("/")({
   head: () =>
     pageMeta(
       "Paseo – Run Claude Code, Codex, Copilot, OpenCode from anywhere",
-      "Self-hosted daemon for Claude Code, Codex, Copilot, OpenCode, and Pi. Agents run on your machine with your full dev environment. Connect from phone, desktop, or web.",
+      "Open source app for Claude Code, Codex, OpenCode, Pi, and 30+ more coding agents. Run many agents in parallel on your machines. Editor, terminals, diffs, pull requests, and a browser in one window. One download on desktop. The full app on iOS and Android.",
       "/",
     ),
   component: Home,
@@ -17,16 +17,19 @@ function Home() {
     <LandingPage
       title={
         <>
-          The control plane
+          The agentic development
           <br />
-          for coding agents
+          environment
         </>
       }
       subtitle={
         <>
-          Run any coding agent from anywhere.
+          Run many coding agents at once,
+          <br className="sm:hidden" />
+          <span className="hidden sm:inline"> </span>
+          on any machine.
           <br />
-          Self-hosted, multi-provider, open source
+          From your desk and from your phone.
         </>
       }
     />
diff --git a/packages/website/src/routes/muse-code.tsx b/packages/website/src/routes/muse-code.tsx
new file mode 100644
index 0000000000..1a936492a9
--- /dev/null
+++ b/packages/website/src/routes/muse-code.tsx
@@ -0,0 +1,4 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { agentRouteOptions } from "~/components/agent-route";
+
+export const Route = createFileRoute("/muse-code")(agentRouteOptions("muse-code"));
diff --git a/packages/website/src/routes/plugins/$owner.tsx b/packages/website/src/routes/plugins/$owner.tsx
new file mode 100644
index 0000000000..89c4f185ef
--- /dev/null
+++ b/packages/website/src/routes/plugins/$owner.tsx
@@ -0,0 +1,93 @@
+import { PluginContentLink } from "~/plugins/overview";
+import { createFileRoute, notFound } from "@tanstack/react-router";
+import { ExternalLink } from "lucide-react";
+import { useMemo } from "react";
+import { type BreadcrumbItem, Breadcrumbs } from "~/components/breadcrumbs";
+import { SiteShell } from "~/components/site-shell";
+import { pageMeta } from "~/meta";
+import {
+  authorGitHubUrl,
+  authorNpmUrl,
+  getAuthor,
+  getRegistry,
+  getPluginsByAuthor,
+  mostInstalled,
+  pluginOwner,
+} from "~/plugins";
+import { AuthorAvatar } from "~/plugins/author-link";
+import { PluginsNotFound } from "~/plugins/not-found";
+import { InstallCount } from "~/plugins/install-count";
+import { PluginCard } from "~/plugins/plugin-card";
+import "~/styles.css";
+
+export const Route = createFileRoute("/plugins/$owner")({
+  loader: async ({ params }) => {
+    const registry = await getRegistry();
+    const first = registry.plugins.find((plugin) => pluginOwner(plugin) === params.owner);
+    if (!first) throw notFound();
+    return { plugins: registry.plugins, installs: registry.installs, author: getAuthor(first) };
+  },
+  head: ({ params, loaderData }) =>
+    pageMeta(
+      loaderData ? `${loaderData.author.name} – Paseo plugins` : "Author not found – Paseo",
+      loaderData ? `Paseo plugins published by ${loaderData.author.name}.` : "Author not found.",
+      `/plugins/${params.owner}`,
+    ),
+  component: AuthorPage,
+  notFoundComponent: () => (
+    <PluginsNotFound title="Author not found">
+      Nobody with that GitHub owner has a plugin listed.
+    </PluginsNotFound>
+  ),
+});
+
+const LINK_CLASS =
+  "inline-flex items-center gap-1 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+
+function AuthorPage() {
+  const { plugins: allPlugins, installs, author } = Route.useLoaderData();
+  const crumbs = useMemo<BreadcrumbItem[]>(
+    () => [{ label: "Plugins", href: "/plugins" }, { label: author.name }],
+    [author],
+  );
+
+  const plugins = mostInstalled(getPluginsByAuthor(allPlugins, author.username), installs, "all");
+  const github = authorGitHubUrl(author);
+
+  return (
+    <SiteShell width="default">
+      <Breadcrumbs items={crumbs} />
+      <div className="flex items-start gap-4">
+        <AuthorAvatar author={author} size="lg" />
+        <div className="space-y-2">
+          <h1 className="text-3xl font-medium tracking-tight">{author.name}</h1>
+          <p className="text-sm text-muted-foreground">
+            {plugins.length} {plugins.length === 1 ? "plugin" : "plugins"}
+          </p>
+          <div className="flex items-center gap-4 pt-1">
+            {authorNpmUrl(author) && (
+              <PluginContentLink href={authorNpmUrl(author)} className={LINK_CLASS}>
+                npm
+                <ExternalLink className="h-3 w-3" />
+              </PluginContentLink>
+            )}
+            {github && (
+              <PluginContentLink href={github} className={LINK_CLASS}>
+                GitHub
+                <ExternalLink className="h-3 w-3" />
+              </PluginContentLink>
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div className="mt-12 grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3">
+        {plugins.map((plugin) => (
+          <PluginCard key={plugin.id} plugin={plugin}>
+            <InstallCount count={installs[plugin.id]?.all ?? 0} />
+          </PluginCard>
+        ))}
+      </div>
+    </SiteShell>
+  );
+}
diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
new file mode 100644
index 0000000000..b3d02177aa
--- /dev/null
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -0,0 +1,114 @@
+import { createFileRoute, notFound } from "@tanstack/react-router";
+import { ExternalLink } from "lucide-react";
+import { GitHubIcon } from "~/components/brand-icons";
+import { CodeBlock } from "~/components/code-block";
+import { PluginOverview, PluginContentLink } from "~/plugins/overview";
+import { SiteShell } from "~/components/site-shell";
+import { pageMeta } from "~/meta";
+import {
+  firstMediaImage,
+  getAuthor,
+  getCategory,
+  getRegistry,
+  getRegistryPlugin,
+  installCommand,
+  npmUrl,
+  pluginVersion,
+  readmeBody,
+  reportBugUrl,
+} from "~/plugins";
+import { AuthorAvatar, AuthorLink } from "~/plugins/author-link";
+import { InstallCount } from "~/plugins/install-count";
+import { categoryHref } from "~/plugins/links";
+import { MediaGallery } from "~/plugins/media-gallery";
+import { PluginsNotFound } from "~/plugins/not-found";
+import "~/styles.css";
+
+export const Route = createFileRoute("/plugins/$owner_/$slug")({
+  loader: async ({ params }) => {
+    const [registry, plugin] = await Promise.all([
+      getRegistry(),
+      getRegistryPlugin({ data: `${params.owner}/${params.slug}` }),
+    ]);
+    if (!plugin) throw notFound();
+    return { plugin, installs: registry.installs[plugin.id]?.all ?? 0 };
+  },
+  head: ({ params, loaderData }) =>
+    pageMeta(
+      loaderData?.plugin ? `${loaderData.plugin.name} – Paseo plugin` : "Plugin not found – Paseo",
+      loaderData?.plugin?.description ?? "Plugin not found.",
+      `/plugins/${params.owner}/${params.slug}`,
+      loaderData?.plugin && firstMediaImage(loaderData.plugin),
+    ),
+  component: PluginPage,
+  notFoundComponent: () => (
+    <PluginsNotFound title="Plugin not found">
+      There is no plugin listed at this address.
+    </PluginsNotFound>
+  ),
+});
+
+const META_LINK_CLASS =
+  "inline-flex items-center gap-1 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+const REPORT_BUG_CLASS =
+  "inline-flex items-center gap-2 rounded-lg border border-white/12 px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-white/10 hover:text-foreground";
+const AUTHOR_LINK_CLASS =
+  "inline-flex items-center gap-1.5 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+
+function PluginPage() {
+  const { plugin, installs } = Route.useLoaderData();
+  const category = getCategory(plugin.categories[0]);
+  const author = getAuthor(plugin);
+  const npm = npmUrl(plugin);
+  const reportBug = reportBugUrl(plugin);
+
+  return (
+    <SiteShell width="default">
+      <a href="/plugins" className="text-sm text-muted-foreground hover:text-foreground">
+        ← Plugins
+      </a>
+      <h1 className="mt-4 text-3xl font-medium tracking-tight">{plugin.name}</h1>
+      <p className="mt-3 text-lg leading-relaxed text-white/70">{plugin.description}</p>
+      <div className="mt-6 flex flex-wrap items-center gap-3">
+        <div className="w-fit max-w-full">
+          <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
+        </div>
+        {reportBug && (
+          <PluginContentLink href={reportBug} className={REPORT_BUG_CLASS}>
+            <GitHubIcon className="h-4 w-4" />
+            Report a bug
+          </PluginContentLink>
+        )}
+      </div>
+      <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">
+        <AuthorLink author={author} className={AUTHOR_LINK_CLASS}>
+          <AuthorAvatar author={author} size="xs" />
+          {author.name}
+        </AuthorLink>
+        {category && (
+          <a href={categoryHref(category.slug)} className={META_LINK_CLASS}>
+            {category.label}
+          </a>
+        )}
+        <InstallCount count={installs} />
+        <span className="font-mono">{pluginVersion(plugin)}</span>
+        <PluginContentLink href={plugin.repository.url} className={META_LINK_CLASS}>
+          Source
+          <ExternalLink className="h-3 w-3" />
+        </PluginContentLink>
+        {npm && (
+          <PluginContentLink href={npm} className={META_LINK_CLASS}>
+            npm
+            <ExternalLink className="h-3 w-3" />
+          </PluginContentLink>
+        )}
+      </div>
+
+      <MediaGallery name={plugin.name} media={plugin.media} />
+
+      <div className="mt-10 border-t border-white/10 pt-10">
+        <PluginOverview>{readmeBody(plugin.readme)}</PluginOverview>
+      </div>
+    </SiteShell>
+  );
+}
diff --git a/packages/website/src/routes/plugins/all.tsx b/packages/website/src/routes/plugins/all.tsx
new file mode 100644
index 0000000000..81715f0957
--- /dev/null
+++ b/packages/website/src/routes/plugins/all.tsx
@@ -0,0 +1,43 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { useMemo } from "react";
+import { pageMeta } from "~/meta";
+import { getRegistry } from "~/plugins";
+import { BrowsePage } from "~/plugins/browse-page";
+import {
+  type BrowseQuery,
+  DEFAULT_WINDOW,
+  parseSearchTerm,
+  parseSort,
+  parseWindow,
+} from "~/plugins/links";
+import "~/styles.css";
+
+export const Route = createFileRoute("/plugins/all")({
+  validateSearch: (search: Record<string, unknown>): Omit<Partial<BrowseQuery>, "category"> => ({
+    sort: parseSort(search.sort),
+    window: parseWindow(search.window),
+    q: parseSearchTerm(search.q),
+  }),
+  head: () =>
+    pageMeta(
+      "All plugins – Paseo plugins",
+      "Every community plugin for Paseo, by installs or newest first.",
+      "/plugins/all",
+    ),
+  loader: () => getRegistry(),
+  component: AllPluginsPage,
+});
+
+function AllPluginsPage() {
+  const { plugins, installs, now } = Route.useLoaderData();
+  const search = Route.useSearch();
+  const query = useMemo<BrowseQuery>(
+    () => ({
+      sort: search.sort ?? "installs",
+      window: search.window ?? DEFAULT_WINDOW,
+      q: search.q,
+    }),
+    [search.sort, search.window, search.q],
+  );
+  return <BrowsePage plugins={plugins} installs={installs} now={now} query={query} />;
+}
diff --git a/packages/website/src/routes/plugins/category/$slug.tsx b/packages/website/src/routes/plugins/category/$slug.tsx
new file mode 100644
index 0000000000..53234bc528
--- /dev/null
+++ b/packages/website/src/routes/plugins/category/$slug.tsx
@@ -0,0 +1,52 @@
+import { createFileRoute, notFound } from "@tanstack/react-router";
+import { useMemo } from "react";
+import { pageMeta } from "~/meta";
+import { getCategory, getRegistry } from "~/plugins";
+import { BrowsePage } from "~/plugins/browse-page";
+import {
+  type BrowseQuery,
+  DEFAULT_WINDOW,
+  parseSearchTerm,
+  parseSort,
+  parseWindow,
+} from "~/plugins/links";
+import { PluginsNotFound } from "~/plugins/not-found";
+import "~/styles.css";
+
+export const Route = createFileRoute("/plugins/category/$slug")({
+  validateSearch: (search: Record<string, unknown>): Omit<Partial<BrowseQuery>, "category"> => ({
+    sort: parseSort(search.sort),
+    window: parseWindow(search.window),
+    q: parseSearchTerm(search.q),
+  }),
+  loader: async ({ params }) => {
+    const category = getCategory(params.slug);
+    if (!category) throw notFound();
+    return { ...(await getRegistry()), category };
+  },
+  head: ({ params, loaderData }) =>
+    pageMeta(
+      loaderData ? `${loaderData.category.label} – Paseo plugins` : "Category not found – Paseo",
+      loaderData?.category.description ?? "Category not found.",
+      `/plugins/category/${params.slug}`,
+    ),
+  component: CategoryPage,
+  notFoundComponent: () => (
+    <PluginsNotFound title="Category not found">There is no plugin category here.</PluginsNotFound>
+  ),
+});
+
+function CategoryPage() {
+  const { plugins, installs, now, category } = Route.useLoaderData();
+  const search = Route.useSearch();
+  const query = useMemo<BrowseQuery>(
+    () => ({
+      category: category.slug,
+      sort: search.sort ?? "installs",
+      window: search.window ?? DEFAULT_WINDOW,
+      q: search.q,
+    }),
+    [category.slug, search.sort, search.window, search.q],
+  );
+  return <BrowsePage plugins={plugins} installs={installs} now={now} query={query} />;
+}
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
new file mode 100644
index 0000000000..613afc375c
--- /dev/null
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -0,0 +1,248 @@
+import { createFileRoute, redirect } from "@tanstack/react-router";
+import {
+  Blocks,
+  Boxes,
+  ChevronRight,
+  GitBranch,
+  LayoutPanelLeft,
+  type LucideIcon,
+  Network,
+  Palette,
+  Server,
+  Sparkles,
+  Wrench,
+} from "lucide-react";
+import { useMemo } from "react";
+import { SiteShell } from "~/components/site-shell";
+import { pageMeta } from "~/meta";
+import {
+  addedAgo,
+  CATEGORIES,
+  type CategorySlug,
+  featuredPlugins,
+  getCategory,
+  getPluginsInCategory,
+  getRegistry,
+  type InstallWindow,
+  mostInstalled,
+  newestFirst,
+  pluginOwner,
+  recentlyUpdated,
+  updatedAgo,
+} from "~/plugins";
+import { ContributeSection } from "~/plugins/contribute-links";
+import { PluginsHero } from "~/plugins/hero";
+import {
+  type BrowseQuery,
+  browseHref,
+  categoryHref,
+  DEFAULT_WINDOW,
+  mostInstalledHref,
+  parseSearchTerm,
+  parseSort,
+  parseWindow,
+} from "~/plugins/links";
+import { InstallCount } from "~/plugins/install-count";
+import { PluginCard, PluginRankRow } from "~/plugins/plugin-card";
+import { PluginSection, PluginSectionHeader, PluginSectionTitle } from "~/plugins/section";
+import { WindowSwitch } from "~/plugins/window-switch";
+import "~/styles.css";
+
+const NEW_COUNT = 4;
+const TOP_COUNT = 6;
+
+const CATEGORY_ICONS: Record<CategorySlug, LucideIcon> = {
+  "daemon-management": Server,
+  themes: Palette,
+  providers: Boxes,
+  orchestration: Network,
+  git: GitBranch,
+  workspaces: Blocks,
+  sidebar: LayoutPanelLeft,
+  extras: Sparkles,
+  utils: Wrench,
+};
+
+// Card sections: a swipeable row on phones, a grid from `sm` up.
+const CARD_ROW_CLASS =
+  "-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 *:w-[70%] *:flex-shrink-0 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 sm:*:w-auto lg:grid-cols-4";
+const SEE_ALL_CLASS =
+  "inline-flex items-center gap-0.5 text-sm text-muted-foreground transition-colors hover:text-foreground";
+
+export const Route = createFileRoute("/plugins/")({
+  validateSearch: (search: Record<string, unknown>): { window?: InstallWindow } => {
+    const window = parseWindow(search.window);
+    return window ? { window } : {};
+  },
+  beforeLoad: ({ location }) => {
+    // Keep links from before browse pages existed: /plugins?q=<term>&category=<slug>&sort=new.
+    const params = new URLSearchParams(location.searchStr);
+    const category = getCategory(params.get("category") ?? "");
+    const sort = parseSort(params.get("sort")) ?? "installs";
+    const window = parseWindow(params.get("window")) ?? DEFAULT_WINDOW;
+    const q = parseSearchTerm(params.get("q"));
+    if (category || sort !== "installs" || q)
+      throw redirect({
+        href: browseHref({ category: category?.slug, sort, window, q }),
+        statusCode: 301,
+      });
+  },
+  head: () =>
+    pageMeta(
+      "Plugins – Extend Paseo with community plugins",
+      "Themes, providers, panels, and automations built by the Paseo community. Install any of them with one command.",
+      "/plugins",
+    ),
+  loader: () => getRegistry(),
+  component: PluginsPage,
+});
+
+function PluginsPage() {
+  const { plugins, featured: featuredIds, installs, now } = Route.useLoaderData();
+  const window = Route.useSearch().window ?? DEFAULT_WINDOW;
+  const featured = featuredPlugins(plugins, featuredIds);
+  const newest = newestFirst(plugins).slice(0, NEW_COUNT);
+  const updated = recentlyUpdated(plugins).slice(0, NEW_COUNT);
+  const top = mostInstalled(plugins, installs, window).slice(0, TOP_COUNT);
+  const windowHrefs = useMemo(
+    () => ({
+      week: mostInstalledHref("week"),
+      month: mostInstalledHref("month"),
+      all: mostInstalledHref("all"),
+    }),
+    [],
+  );
+  const searchScope = useMemo<BrowseQuery>(() => ({ sort: "installs", window }), [window]);
+  const authorCount = new Set(plugins.map(pluginOwner)).size;
+
+  return (
+    <SiteShell width="default">
+      <PluginsHero
+        pluginCount={plugins.length}
+        authorCount={authorCount}
+        searchScope={searchScope}
+      />
+
+      <div className="mt-16 flex flex-col gap-14">
+        {featured.length > 0 && (
+          <PluginSection labelledBy="featured">
+            <PluginSectionHeader>
+              <div>
+                <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
+                <p className="text-sm text-muted-foreground">A selection of hand picked plugins</p>
+              </div>
+              <a
+                href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })}
+                className={SEE_ALL_CLASS}
+              >
+                See all
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
+            <div className={CARD_ROW_CLASS}>
+              {featured.map((plugin) => (
+                <PluginCard key={plugin.id} plugin={plugin}>
+                  <InstallCount count={installs[plugin.id]?.all ?? 0} />
+                </PluginCard>
+              ))}
+            </div>
+          </PluginSection>
+        )}
+
+        <PluginSection labelledBy="whats-new">
+          <PluginSectionHeader>
+            <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
+            <a href={browseHref({ sort: "new", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+              See all
+              <ChevronRight className="h-3.5 w-3.5" />
+            </a>
+          </PluginSectionHeader>
+          <div className={CARD_ROW_CLASS}>
+            {newest.map((plugin) => (
+              <PluginCard key={plugin.id} plugin={plugin}>
+                {addedAgo(plugin, now)}
+              </PluginCard>
+            ))}
+          </div>
+        </PluginSection>
+
+        {updated.length > 0 && (
+          <PluginSection labelledBy="recently-updated">
+            <PluginSectionHeader>
+              <PluginSectionTitle id="recently-updated">Recently updated</PluginSectionTitle>
+              <a
+                href={browseHref({ sort: "updated", window: DEFAULT_WINDOW })}
+                className={SEE_ALL_CLASS}
+              >
+                See all
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
+            <div className={CARD_ROW_CLASS}>
+              {updated.map((plugin) => (
+                <PluginCard key={plugin.id} plugin={plugin}>
+                  {updatedAgo(plugin, now)}
+                </PluginCard>
+              ))}
+            </div>
+          </PluginSection>
+        )}
+
+        <PluginSection labelledBy="categories">
+          <PluginSectionTitle id="categories">Categories</PluginSectionTitle>
+          <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
+            {CATEGORIES.map((category) => {
+              const Icon = CATEGORY_ICONS[category.slug];
+              return (
+                <a
+                  key={category.slug}
+                  href={categoryHref(category.slug)}
+                  className="flex items-center gap-3 rounded-xl border border-white/10 bg-white/[0.03] px-3.5 py-3.5 transition-colors hover:border-white/20 hover:bg-white/[0.05] sm:px-4"
+                >
+                  <Icon className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
+                  <span className="min-w-0 flex-1 text-sm leading-tight text-white">
+                    {category.label}
+                  </span>
+                  <span className="text-xs tabular-nums text-extra-muted-foreground">
+                    {getPluginsInCategory(plugins, category.slug).length}
+                  </span>
+                </a>
+              );
+            })}
+          </div>
+        </PluginSection>
+
+        <PluginSection
+          id="most-installed"
+          labelledBy="most-installed-title"
+          className="scroll-mt-8"
+        >
+          <PluginSectionHeader>
+            <PluginSectionTitle id="most-installed-title">
+              <a
+                href={browseHref({ sort: "installs", window })}
+                className="group inline-flex items-center gap-1"
+              >
+                Most installed
+                <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
+              </a>
+            </PluginSectionTitle>
+            <WindowSwitch current={window} hrefs={windowHrefs} />
+          </PluginSectionHeader>
+          <div className="-mx-4 grid gap-x-8 md:grid-cols-2">
+            {top.map((plugin, index) => (
+              <PluginRankRow
+                key={plugin.id}
+                plugin={plugin}
+                rank={index + 1}
+                installs={installs[plugin.id]?.[window] ?? 0}
+              />
+            ))}
+          </div>
+        </PluginSection>
+      </div>
+
+      <ContributeSection />
+    </SiteShell>
+  );
+}
diff --git a/packages/website/src/routes/sponsor.tsx b/packages/website/src/routes/sponsor.tsx
index f4f7aaa943..651f61dd21 100644
--- a/packages/website/src/routes/sponsor.tsx
+++ b/packages/website/src/routes/sponsor.tsx
@@ -1,12 +1,13 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { SiteShell } from "~/components/site-shell";
+import { SponsorPaseoSection, SponsorSpotSection } from "~/components/sponsorship";
 import { pageMeta } from "~/meta";
 
 export const Route = createFileRoute("/sponsor")({
   head: () =>
     pageMeta(
       "Sponsor Paseo",
-      "Support the independent open-source project behind Paseo. Built by Mo, funded by the community.",
+      "Paseo is an independent project used by tens of thousands of developers daily, maintained by one person, shaped by the community, with no investors. Sponsor the work on GitHub Sponsors, Open Collective or Buy Me a Coffee, or sponsor it as a company.",
       "/sponsor",
     ),
   component: Sponsor,
@@ -15,120 +16,10 @@ export const Route = createFileRoute("/sponsor")({
 function Sponsor() {
   return (
     <SiteShell width="default">
-      <h1 className="text-3xl font-medium tracking-tight mb-8">Sponsor</h1>
-
-      {/* Founder note */}
-      <div className="space-y-6 text-white/70 leading-relaxed max-w-2xl">
-        <p className="font-medium">
-          Hey, I&apos;m{" "}
-          <a
-            href="https://github.com/boudra"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="underline hover:text-white/80"
-          >
-            Mo
-          </a>
-          .
-        </p>
-
-        <p>
-          Paseo started as a personal project: I wanted to run coding agents from anywhere without
-          giving up control of my code, my keys, or my workflow.
-        </p>
-
-        <p>
-          I work on Paseo full-time. It&apos;s an independent, self-funded open-source project. I
-          don&apos;t have investors, a board, or a big team. I&apos;m just shipping software the
-          best I know how and hope it&apos;s useful to other people.
-        </p>
-
-        <p>
-          Sponsorship is what makes that sustainable. It lets me stay focused on the product instead
-          of chasing monetization, and it sends a clear signal that independent, open-source tools
-          have a place in developer workflows.
-        </p>
-
-        <p>Thank you.</p>
+      <div className="space-y-24">
+        <SponsorPaseoSection />
+        <SponsorSpotSection />
       </div>
-
-      {/* Sponsor links */}
-      <section className="mt-12 space-y-4">
-        <h2 className="text-xl font-medium">Support Paseo</h2>
-
-        <div className="flex flex-col sm:flex-row gap-4">
-          <a
-            href="https://github.com/sponsors/boudra"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="flex items-center gap-4 rounded-xl border border-white/10 bg-white/[0.03] p-5 hover:border-white/20 hover:bg-white/[0.05] transition-colors"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="32"
-              height="32"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              className="text-white/60"
-            >
-              <path d="M12 0C5.37 0 0 5.484 0 12.252c0 5.418 3.438 10.013 8.205 11.637.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.738-4.042-1.61-4.042-1.61-.546-1.403-1.333-1.776-1.333-1.776-1.089-.756.084-.741.084-.741 1.205.087 1.838 1.262 1.838 1.262 1.07 1.87 2.809 1.33 3.495 1.017.108-.79.417-1.33.76-1.636-2.665-.31-5.467-1.35-5.467-6.005 0-1.327.465-2.413 1.235-3.262-.124-.31-.535-1.556.117-3.243 0 0 1.008-.33 3.3 1.248a11.2 11.2 0 0 1 3.003-.404c1.02.005 2.045.138 3.003.404 2.29-1.578 3.297-1.248 3.297-1.248.653 1.687.242 2.933.118 3.243.77.85 1.233 1.935 1.233 3.262 0 4.667-2.807 5.692-5.48 5.995.43.38.823 1.133.823 2.285 0 1.65-.015 2.98-.015 3.386 0 .315.218.694.825.576C20.565 22.26 24 17.667 24 12.252 24 5.484 18.627 0 12 0z" />
-            </svg>
-            <div>
-              <p className="font-medium text-white">GitHub Sponsors</p>
-            </div>
-          </a>
-
-          <a
-            href="https://opencollective.com/paseo-ai/donate?interval=month&amount=10&contributeAs=me"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="flex items-center gap-4 rounded-xl border border-white/10 bg-white/[0.03] p-5 hover:border-white/20 hover:bg-white/[0.05] transition-colors"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="32"
-              height="32"
-              viewBox="0 0 39.98 40.05"
-              className="text-white/60"
-            >
-              <path
-                d="M32.76 19.97c0 2.53-.73 4.94-2 6.94l5.14 5.16c2.5-3.36 4.08-7.57 4.08-12.1 0-4.5-1.57-8.7-4.08-12.08l-5.13 5.16c1.26 2 2 4.3 2 6.93z"
-                fill="currentColor"
-              />
-              <path
-                d="M20 32.8c-7.02 0-12.78-5.78-12.78-12.83 0-7.04 5.76-12.82 12.77-12.82 2.6 0 4.9.73 6.9 2.1l5.13-5.15C28.68 1.58 24.5 0 20 0 9 0 0 8.94 0 20.08s9 19.97 20 19.97c4.6 0 8.8-1.57 12.14-4.1L27 30.8c-1.98 1.26-4.4 2-7 2z"
-                fill="currentColor"
-              />
-            </svg>
-            <div>
-              <p className="font-medium text-white">Open Collective</p>
-            </div>
-          </a>
-
-          <a
-            href="https://buymeacoffee.com/paseo"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="flex items-center gap-4 rounded-xl border border-white/10 bg-white/[0.03] p-5 hover:border-white/20 hover:bg-white/[0.05] transition-colors"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="32"
-              height="32"
-              viewBox="0 0 24 24"
-              className="text-white/60"
-            >
-              <path
-                d="M20.216 6.415l-.132-.666c-.119-.598-.388-1.163-1.001-1.379-.197-.069-.42-.098-.57-.241-.152-.143-.196-.366-.231-.572-.065-.378-.125-.756-.192-1.133-.057-.325-.102-.69-.25-.987-.195-.4-.597-.634-.996-.788a5.723 5.723 0 00-.626-.194c-1-.263-2.05-.36-3.077-.416a25.834 25.834 0 00-3.7.062c-.915.083-1.88.184-2.75.5-.318.116-.646.256-.888.501-.297.302-.393.77-.177 1.146.154.267.415.456.692.58.36.162.737.284 1.123.366 1.075.238 2.189.331 3.287.37 1.218.05 2.437.01 3.65-.118.299-.033.598-.073.896-.119.352-.054.578-.513.474-.834-.124-.383-.457-.531-.834-.473-.466.074-.96.108-1.382.146-1.177.08-2.358.082-3.536.006a22.228 22.228 0 01-1.157-.107c-.086-.01-.18-.025-.258-.036-.243-.036-.484-.08-.724-.13-.111-.027-.111-.185 0-.212h.005c.277-.06.557-.108.838-.147h.002c.131-.009.263-.032.394-.048a25.076 25.076 0 013.426-.12c.674.019 1.347.067 2.017.144l.228.031c.267.04.533.088.798.145.392.085.895.113 1.07.542.055.137.08.288.111.431l.319 1.484a.237.237 0 01-.199.284h-.003c-.037.006-.075.01-.112.015a36.704 36.704 0 01-4.743.295 37.059 37.059 0 01-4.699-.304c-.14-.017-.293-.042-.417-.06-.326-.048-.649-.108-.973-.161-.393-.065-.768-.032-1.123.161-.29.16-.527.404-.675.701-.154.316-.199.66-.267 1-.069.34-.176.707-.135 1.056.087.753.613 1.365 1.37 1.502a39.69 39.69 0 0011.343.376.483.483 0 01.535.53l-.071.697-1.018 9.907c-.041.41-.047.832-.125 1.237-.122.637-.553 1.028-1.182 1.171-.577.131-1.165.2-1.756.205-.656.004-1.31-.025-1.966-.022-.699.004-1.556-.06-2.095-.58-.475-.458-.54-1.174-.605-1.793l-.731-7.013-.322-3.094c-.037-.351-.286-.695-.678-.678-.336.015-.718.3-.678.679l.228 2.185.949 9.112c.147 1.344 1.174 2.068 2.446 2.272.742.12 1.503.144 2.257.156.966.016 1.942.053 2.892-.122 1.408-.258 2.465-1.198 2.616-2.657.34-3.332.683-6.663 1.024-9.995l.215-2.087a.484.484 0 01.39-.426c.402-.078.787-.212 1.074-.518.455-.488.546-1.124.385-1.766zm-1.478.772c-.145.137-.363.201-.578.233-2.416.359-4.866.54-7.308.46-1.748-.06-3.477-.254-5.207-.498-.17-.024-.353-.055-.47-.18-.22-.236-.111-.71-.054-.995.052-.26.152-.609.463-.646.484-.057 1.046.148 1.526.22.577.088 1.156.159 1.737.212 2.48.226 5.002.19 7.472-.14.45-.06.899-.13 1.345-.21.399-.072.84-.206 1.08.206.166.281.188.657.162.974a.544.544 0 01-.169.364zm-6.159 3.9c-.862.37-1.84.788-3.109.788a5.884 5.884 0 01-1.569-.217l.877 9.004c.065.78.717 1.38 1.5 1.38 0 0 1.243.065 1.658.065.447 0 1.786-.065 1.786-.065.783 0 1.434-.6 1.499-1.38l.94-9.95a3.996 3.996 0 00-1.322-.238c-.826 0-1.491.284-2.26.613z"
-                fill="currentColor"
-              />
-            </svg>
-            <div>
-              <p className="font-medium text-white">Buy Me a Coffee</p>
-            </div>
-          </a>
-        </div>
-      </section>
     </SiteShell>
   );
 }
diff --git a/packages/website/src/server-entry.ts b/packages/website/src/server-entry.ts
index 9fb921833a..775e8348ea 100644
--- a/packages/website/src/server-entry.ts
+++ b/packages/website/src/server-entry.ts
@@ -1,4 +1,6 @@
-import startEntry from "@tanstack/react-start/server-entry";
+import { handlePluginRegistryRequest } from "~/plugins/published";
+import type { Register } from "@tanstack/react-router";
+import type { RequestHandler } from "@tanstack/react-start/server";
 import { getAndroidVersionCode } from "~/android-version";
 import { getCanonicalRedirect } from "~/canonical-url";
 import { getDoc, getLegacyDocsRedirect } from "~/docs";
@@ -7,6 +9,7 @@ import { buildLlmsTxt } from "~/llms";
 
 interface WebsiteEnv {
   WEBSITE_CACHE?: KVNamespace;
+  PLUGINS_REGISTRY_URL?: string;
 }
 
 function markdownResponse(body: string): Response {
@@ -59,10 +62,31 @@ function variesByUserAgent(pathname: string, response: Response): boolean {
   return response.headers.get("content-type")?.includes("text/html") ?? false;
 }
 
+// A static import of TanStack Start's server handler breaks every SSR hot reload on
+// Vite 7 with "createStartHandler is not a function". Importing it at request time
+// avoids the race. Remove once the website is on a Vite release with vitejs/vite#22369.
+// https://github.com/TanStack/router/issues/7285
+let cachedStartFetch: RequestHandler<Register> | null = null;
+
+async function getStartFetch(): Promise<RequestHandler<Register>> {
+  if (!cachedStartFetch) {
+    const { createStartHandler, defaultStreamHandler } =
+      await import("@tanstack/react-start/server");
+    cachedStartFetch = createStartHandler(defaultStreamHandler);
+  }
+  return cachedStartFetch;
+}
+
 export default {
   async fetch(request: Request, env: WebsiteEnv, context: ExecutionContext): Promise<Response> {
     const url = new URL(request.url);
 
+    const pluginResponse = await handlePluginRegistryRequest(request, env, {
+      cache: env.WEBSITE_CACHE ?? null,
+      waitUntil: (promise) => context.waitUntil(promise),
+    });
+    if (pluginResponse) return pluginResponse;
+
     const environment = import.meta.env.DEV ? "development" : "production";
     const canonicalRedirect = getCanonicalRedirect(url, environment);
     if (canonicalRedirect) {
@@ -105,7 +129,8 @@ export default {
       return markdownResponse(doc.content);
     }
 
-    const response = await startEntry.fetch(request);
+    const startFetch = await getStartFetch();
+    const response = await startFetch(request);
     return variesByUserAgent(url.pathname, response) ? withoutSharedCaching(response) : response;
   },
 };
diff --git a/packages/website/src/styles.css b/packages/website/src/styles.css
index 64a7e52870..bae421ff22 100644
--- a/packages/website/src/styles.css
+++ b/packages/website/src/styles.css
@@ -1,4 +1,5 @@
 @import "tailwindcss";
+@import "@fontsource-variable/geist";
 
 * {
   scrollbar-color: var(--color-scrollbar-handle) transparent;
@@ -405,6 +406,12 @@
   font-weight: 400;
 }
 
+.docs-prose img {
+  max-width: 100%;
+  border-radius: 0.5rem;
+  border: 1px solid var(--color-border);
+}
+
 .docs-prose p {
   margin-top: 1rem;
   margin-bottom: 1rem;
@@ -497,6 +504,24 @@
   background-color: rgba(255, 255, 255, 0.02);
 }
 
+/* Comparison tables: the browser would size each column by its longest cell,
+   so the two product columns get equal width regardless of content. */
+.comparison-prose table {
+  display: table;
+  table-layout: fixed;
+}
+
+.comparison-prose th,
+.comparison-prose td {
+  overflow-wrap: anywhere;
+  hyphens: auto;
+}
+
+.comparison-prose th:first-child,
+.comparison-prose td:first-child {
+  width: max(22%, 7.5rem);
+}
+
 .docs-prose pre {
   background-color: var(--color-card) !important;
   border: 1px solid var(--color-border);
@@ -660,6 +685,8 @@
 }
 
 @theme {
+  --font-sans: "Geist Variable", ui-sans-serif, system-ui, sans-serif;
+
   --color-background: #101615;
   --color-foreground: #fafafa;
   --color-muted: #1a1f1e;
diff --git a/packages/website/vite.config.ts b/packages/website/vite.config.ts
index f9260acf49..46dbc554de 100644
--- a/packages/website/vite.config.ts
+++ b/packages/website/vite.config.ts
@@ -80,6 +80,11 @@ function discoverBlogRoutes(): string[] {
   return ["/blog", ...slugs.map((slug) => `/blog/${slug}`)];
 }
 
+// Author and detail URLs are served by /sitemap-plugins.xml as the registry changes.
+function discoverPluginRoutes(): string[] {
+  return ["/plugins"];
+}
+
 const sitemapPages = [
   "/",
   "/agents",
@@ -90,6 +95,7 @@ const sitemapPages = [
   "/terms",
   ...discoverAgentRoutes(),
   ...discoverAlternativeRoutes(),
+  ...discoverPluginRoutes(),
   ...discoverDocsRoutes(),
   ...discoverBlogRoutes(),
 ].map((routePath) => ({
diff --git a/packages/website/wrangler.toml b/packages/website/wrangler.toml
index 089a22089e..48db01ed78 100644
--- a/packages/website/wrangler.toml
+++ b/packages/website/wrangler.toml
@@ -7,6 +7,7 @@ main = "./src/server-entry.ts"
 routes = [
   { pattern = "paseo.sh", custom_domain = true },
   { pattern = "www.paseo.sh", custom_domain = true },
+  { pattern = "plugins.paseo.sh", custom_domain = true },
 ]
 
 [observability]
diff --git a/patches/react-native+0.81.5.patch b/patches/react-native+0.81.5.patch
deleted file mode 100644
index 41c0d868f0..0000000000
--- a/patches/react-native+0.81.5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
-index f708543..26df5e0 100644
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
-+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
-@@ -29,6 +29,7 @@ import android.view.ViewGroup;
- import android.view.accessibility.AccessibilityNodeInfo;
- import android.widget.OverScroller;
- import android.widget.ScrollView;
-+import android.widget.TextView;
- import androidx.annotation.NonNull;
- import androidx.annotation.Nullable;
- import androidx.core.view.ViewCompat;
-@@ -425,12 +426,23 @@ public class ReactScrollView extends ScrollView
-    */
-   @Override
-   public void requestChildFocus(View child, View focused) {
--    if (focused != null) {
-+    if (focused != null && shouldScrollToFocusedChild(focused)) {
-       scrollToChild(focused);
-     }
-     super.requestChildFocus(child, focused);
-   }
- 
-+  private boolean shouldScrollToFocusedChild(View focused) {
-+    if (getScaleY() >= 0 || !focused.isInTouchMode() || !(focused instanceof TextView)) {
-+      return true;
-+    }
-+
-+    // Selectable text takes focus when tapped. In inverted lists, scrolling to that focus uses
-+    // untransformed coordinates and unexpectedly moves the timeline.
-+    TextView textView = (TextView) focused;
-+    return !textView.isTextSelectable() || textView.onCheckIsTextEditor();
-+  }
-+
-   private int getScrollDelta(View descendent) {
-     descendent.getDrawingRect(mTempRect);
-     offsetDescendantRectToMyCoords(descendent, mTempRect);
diff --git a/plugin-examples/agent-configuration/README.md b/plugin-examples/agent-configuration/README.md
new file mode 100644
index 0000000000..189afe6cfd
--- /dev/null
+++ b/plugin-examples/agent-configuration/README.md
@@ -0,0 +1,26 @@
+# Agent configuration
+
+Changes new Codex agents through `server.before("agent.create", ...)`:
+
+- Sets `config.providerOptions.sandbox_mode` to `workspace-write`.
+- Sets `config.providerOptions.approval_policy` to `on-request`.
+- Adds the `company` server to `config.mcpServers`.
+- Preserves other configuration, provider options, MCP servers, and environment overrides.
+
+Replace `https://tools.example.com/mcp` in `index.server.ts` with your MCP server URL before using
+this example. The URL is a placeholder. The `company` entry replaces an existing server with that name.
+
+Install on a daemon with plugins enabled:
+
+```bash
+paseo plugin install /absolute/path/to/plugin-examples/agent-configuration
+```
+
+The callback receives the request after earlier plugins have transformed it. The nested spreads
+preserve their settings; the explicit values replace only the named fields. Paseo validates and saves
+the resulting configuration before starting the agent. Existing agents are unchanged.
+
+See the [lifecycle reference](../../public-docs/plugins/reference.md#lifecycle-hooks) for ordering
+and callback shapes. [Lifecycle actions](../lifecycle-actions) demonstrates provider switching and
+environment injection. Its provider-switch callback clears provider options when changing Codex to
+Claude, so use these examples separately when trying the Codex-specific settings.
diff --git a/plugin-examples/agent-configuration/index.server.ts b/plugin-examples/agent-configuration/index.server.ts
new file mode 100644
index 0000000000..1f86e63a67
--- /dev/null
+++ b/plugin-examples/agent-configuration/index.server.ts
@@ -0,0 +1,30 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+
+export default function contribute(server: PluginServerContext) {
+  server.before("agent.create", ({ request }) => {
+    if (request.config.provider !== "codex") {
+      return request;
+    }
+
+    return {
+      ...request,
+      config: {
+        ...request.config,
+        providerOptions: {
+          ...request.config.providerOptions,
+          sandbox_mode: "workspace-write",
+          approval_policy: "on-request",
+        },
+        mcpServers: {
+          ...request.config.mcpServers,
+          company: {
+            type: "http",
+            url: "https://tools.example.com/mcp",
+          },
+        },
+      },
+    };
+  });
+
+  return () => {};
+}
diff --git a/plugin-examples/agent-configuration/paseo-plugin.json b/plugin-examples/agent-configuration/paseo-plugin.json
new file mode 100644
index 0000000000..1a049eda62
--- /dev/null
+++ b/plugin-examples/agent-configuration/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "agent-configuration",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/buttons/README.md b/plugin-examples/buttons/README.md
new file mode 100644
index 0000000000..111be3b08d
--- /dev/null
+++ b/plugin-examples/buttons/README.md
@@ -0,0 +1,41 @@
+# Header buttons and composer pills
+
+Install this directory as a plugin, open an agent, and choose **Button examples: action** in the
+Command Center. One header button and one composer pill appear. Choose another mode to update
+those same registrations. Switching agents moves the example to that agent's workspace and composer.
+
+| Command Center command                | Header                                | Composer                        | Try                                                                                                                   |
+| ------------------------------------- | ------------------------------------- | ------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| **Button examples: action**           | Refresh icon only                     | Refresh icon and label          | Refresh reads the workspace from the daemon and updates the label and tooltip. Paseo owns pending and error feedback. |
+| **Button examples: menu**             | Wrench, Tools, chevron                | Wrench and Tools                | Refresh, a separator, custom details, a Display submenu, and a disabled item.                                         |
+| **Button examples: popover**          | Reactive status dot, Details, chevron | Reactive status dot and Details | Workspace data updates through `useWorkspace`; Done closes the surface.                                               |
+| **Button examples: hide / show**      | Hide or restore the button            | Hide or restore the pill        | Visibility changes through `registration.update({ visible })`.                                                        |
+| **Button examples: disable / enable** | Disable or enable the button          | Disable or enable the pill      | Disabled state changes through `registration.update({ disabled })`.                                                   |
+
+On compact layouts the header button is borderless and icon-only. Menus and custom content open
+bottom sheets. Composer pills keep their icon and label, without a chevron, on every layout.
+
+The example contributes one header button at a time. Additional actions live under the named
+**Tools** button; the example does not add a three-dot control or trigger plugin overflow.
+
+| Action                                                        | Menu                                      | Custom content                                             | Compact sheet                                                   |
+| ------------------------------------------------------------- | ----------------------------------------- | ---------------------------------------------------------- | --------------------------------------------------------------- |
+| ![Action in the header and composer](screenshots/actions.png) | ![Named Tools menu](screenshots/menu.png) | ![Custom status icon and popover](screenshots/popover.png) | ![Composer content as a compact sheet](screenshots/compact.png) |
+
+The client entry owns the active example. [client/examples.tsx](client/examples.tsx) contains the
+descriptors, updates, and React content. Return `.remove()` cleanup when the example moves or stops.
+See the [button reference](../../public-docs/plugins/reference.md#button-descriptor) and
+[composer migration](../../public-docs/plugins/migration.md#composer-pills).
+
+From the repository root, `npm run typecheck --workspace=@getpaseo/plugin` checks this example
+against the SDK. Existing plugin projects must update `@getpaseo/plugin` before running their own
+`npm run typecheck` to detect the old `Component`/`onPress` pill shape and callable cleanup handle.
+
+The browser regression installs this exact directory in an isolated daemon and exercises both
+layouts, updates, and cleanup:
+
+```sh
+npm run test:e2e --workspace=@getpaseo/app -- e2e/browser/plugin-button-example.spec.ts
+```
+
+The captures use Chromium at desktop and phone widths; native iOS and Android were not exercised.
diff --git a/plugin-examples/buttons/client/examples.tsx b/plugin-examples/buttons/client/examples.tsx
new file mode 100644
index 0000000000..63002a3b57
--- /dev/null
+++ b/plugin-examples/buttons/client/examples.tsx
@@ -0,0 +1,210 @@
+import {
+  type PluginButton,
+  type PluginButtonContentProps,
+  type PluginButtonIconProps,
+  type PluginClientContext,
+  useWorkspace,
+} from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { Pressable, Text, View } from "react-native";
+
+export type ButtonMode = "action" | "menu" | "popover";
+
+const composerPresentation = {
+  action: { title: "Refresh context", label: "Refresh" },
+  menu: { title: "Composer tools", label: "Tools" },
+  popover: { title: "Context details", label: "Details" },
+};
+
+function WorkspaceStatusIcon({ workspaceId, size, color, theme }: PluginButtonIconProps) {
+  const status = useWorkspace(workspaceId, (workspace) => workspace.status);
+  let fill = color;
+  if (status === "failed") fill = theme.colors.statusDanger;
+  else if (status === "needs_input") fill = theme.colors.statusWarning;
+  else if (status === "done") fill = theme.colors.statusSuccess;
+  const style = useMemo(
+    () => ({ width: size, height: size, borderRadius: size / 2, backgroundColor: fill }),
+    [size, fill],
+  );
+  return <View style={style} />;
+}
+
+function WorkspaceDetails({ workspaceId, theme, close }: PluginButtonContentProps) {
+  const workspace = useWorkspace(workspaceId, ({ name, projectDisplayName, status, diffStat }) => ({
+    name,
+    projectDisplayName,
+    status,
+    diffStat,
+  }));
+  const styles = useMemo(
+    () => ({
+      body: { gap: 12 },
+      title: { color: theme.colors.foreground, fontSize: 18 },
+      text: { color: theme.colors.foreground },
+      detail: { color: theme.colors.foregroundMuted },
+      button: { padding: 8, borderRadius: 6, backgroundColor: theme.colors.surface2 },
+    }),
+    [theme],
+  );
+  return (
+    <View style={styles.body}>
+      <Text style={styles.title}>Workspace details</Text>
+      <Text style={styles.text}>{workspace?.name}</Text>
+      <Text style={styles.detail}>{workspace?.projectDisplayName}</Text>
+      <Text style={styles.detail}>Status: {workspace?.status}</Text>
+      {workspace?.diffStat ? (
+        <Text style={styles.detail}>
+          +{workspace.diffStat.additions} / −{workspace.diffStat.deletions} lines
+        </Text>
+      ) : null}
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel="Close workspace details"
+        onPress={close}
+        style={styles.button}
+      >
+        <Text style={styles.text}>Done</Text>
+      </Pressable>
+    </View>
+  );
+}
+
+export function createButtonExamples(
+  client: PluginClientContext,
+  workspaceId: string,
+  agentId: string,
+) {
+  let mode: ButtonMode = "action";
+  let refreshes = 0;
+
+  async function refreshWorkspace() {
+    // Return the real operation's promise: Paseo supplies pending, double-press prevention, and errors.
+    await client.paseo.workspaces.ref(workspaceId).refresh();
+    refreshes += 1;
+    if (mode === "action") {
+      header.update({ title: `Refresh workspace (${refreshes})` });
+      pill.update({ label: `Refreshed · ${refreshes}` });
+    }
+  }
+
+  function button(next: ButtonMode): PluginButton {
+    if (next === "action")
+      return {
+        title: "Refresh workspace",
+        icon: "RefreshCw",
+        label: undefined, // The header is icon-only. The composer supplies its own label below.
+        behavior: { kind: "action", onPress: refreshWorkspace },
+      };
+    if (next === "popover")
+      return {
+        title: "Workspace details",
+        icon: WorkspaceStatusIcon,
+        label: "Details",
+        behavior: { kind: "popover", Content: WorkspaceDetails },
+      };
+    return {
+      title: "Workspace tools",
+      icon: "Wrench",
+      label: "Tools",
+      behavior: {
+        kind: "menu",
+        items: [
+          {
+            kind: "item",
+            id: "refresh",
+            title: "Refresh workspace",
+            icon: "RefreshCw",
+            behavior: { kind: "action", onPress: refreshWorkspace },
+          },
+          { kind: "separator", id: "details-divider" },
+          {
+            kind: "item",
+            id: "details",
+            title: "Workspace details",
+            icon: WorkspaceStatusIcon,
+            behavior: { kind: "popover", Content: WorkspaceDetails },
+          },
+          {
+            kind: "item",
+            id: "display",
+            title: "Display",
+            icon: "Eye",
+            behavior: {
+              kind: "menu",
+              items: [
+                {
+                  kind: "item",
+                  id: "hide",
+                  title: "Hide example buttons",
+                  icon: "EyeOff",
+                  behavior: {
+                    kind: "action",
+                    onPress() {
+                      setVisible(false);
+                    },
+                  },
+                },
+                {
+                  kind: "item",
+                  id: "disable",
+                  title: "Disable example buttons",
+                  behavior: {
+                    kind: "action",
+                    onPress() {
+                      setDisabled(true);
+                    },
+                  },
+                },
+              ],
+            },
+          },
+          {
+            kind: "item",
+            id: "publish",
+            title: "Publish (unavailable in example)",
+            icon: "Upload",
+            disabled: true,
+            behavior: { kind: "action", onPress() {} },
+          },
+        ],
+      },
+    };
+  }
+
+  function composerButton(next: ButtonMode): PluginButton {
+    return {
+      ...button(next),
+      ...composerPresentation[next],
+    };
+  }
+
+  const header = client.addHeaderButton({ id: "example", workspaceId, button: button(mode) });
+  const pill = client.addComposerPill({
+    id: "example",
+    workspaceId,
+    agentId,
+    button: composerButton(mode),
+  });
+
+  function setVisible(visible: boolean) {
+    header.update({ visible });
+    pill.update({ visible });
+  }
+  function setDisabled(disabled: boolean) {
+    header.update({ disabled });
+    pill.update({ disabled });
+  }
+  return {
+    setMode(next: ButtonMode) {
+      mode = next;
+      header.update({ ...button(next), visible: true, disabled: false });
+      pill.update({ ...composerButton(next), visible: true, disabled: false });
+    },
+    setVisible,
+    setDisabled,
+    remove() {
+      header.remove();
+      pill.remove();
+    },
+  };
+}
diff --git a/plugin-examples/buttons/index.client.tsx b/plugin-examples/buttons/index.client.tsx
new file mode 100644
index 0000000000..3ce77939f1
--- /dev/null
+++ b/plugin-examples/buttons/index.client.tsx
@@ -0,0 +1,61 @@
+import type { PluginAgentCommandContext, PluginClientContext } from "@getpaseo/plugin/client";
+import { createButtonExamples, type ButtonMode } from "./client/examples";
+
+export default function contribute(client: PluginClientContext) {
+  // Keep one example active at a time, including when switching agents or workspaces.
+  let current:
+    | {
+        workspaceId: string;
+        agentId: string;
+        buttons: ReturnType<typeof createButtonExamples>;
+      }
+    | undefined;
+
+  function buttonsFor({ workspace, agent }: PluginAgentCommandContext) {
+    if (current?.workspaceId !== workspace.id || current.agentId !== agent.id) {
+      current?.buttons.remove();
+      current = {
+        workspaceId: workspace.id,
+        agentId: agent.id,
+        buttons: createButtonExamples(client, workspace.id, agent.id),
+      };
+    }
+    return current.buttons;
+  }
+
+  for (const mode of ["action", "menu", "popover"] satisfies ButtonMode[]) {
+    client.addCommandCenterItem({
+      id: `show-${mode}`,
+      title: `Button examples: ${mode}`,
+      icon: "MousePointerClick",
+      context: "agent",
+      onSelect(context) {
+        buttonsFor(context).setMode(mode);
+      },
+    });
+  }
+  for (const visible of [false, true]) {
+    client.addCommandCenterItem({
+      id: visible ? "show" : "hide",
+      title: `Button examples: ${visible ? "show" : "hide"}`,
+      icon: visible ? "Eye" : "EyeOff",
+      context: "agent",
+      onSelect(context) {
+        buttonsFor(context).setVisible(visible);
+      },
+    });
+  }
+  for (const disabled of [true, false]) {
+    client.addCommandCenterItem({
+      id: disabled ? "disable" : "enable",
+      title: `Button examples: ${disabled ? "disable" : "enable"}`,
+      icon: "MousePointerClick",
+      context: "agent",
+      onSelect(context) {
+        buttonsFor(context).setDisabled(disabled);
+      },
+    });
+  }
+
+  return () => current?.buttons.remove();
+}
diff --git a/plugin-examples/buttons/paseo-plugin.json b/plugin-examples/buttons/paseo-plugin.json
new file mode 100644
index 0000000000..bbe0dd6cf5
--- /dev/null
+++ b/plugin-examples/buttons/paseo-plugin.json
@@ -0,0 +1,4 @@
+{
+  "id": "button-examples",
+  "requirements": { "paseo": ">=0.8.0" }
+}
diff --git a/plugin-examples/buttons/screenshots/actions.png b/plugin-examples/buttons/screenshots/actions.png
new file mode 100644
index 0000000000..24364b84f5
Binary files /dev/null and b/plugin-examples/buttons/screenshots/actions.png differ
diff --git a/plugin-examples/buttons/screenshots/compact.png b/plugin-examples/buttons/screenshots/compact.png
new file mode 100644
index 0000000000..35c3e76f6f
Binary files /dev/null and b/plugin-examples/buttons/screenshots/compact.png differ
diff --git a/plugin-examples/buttons/screenshots/menu.png b/plugin-examples/buttons/screenshots/menu.png
new file mode 100644
index 0000000000..313c09bda9
Binary files /dev/null and b/plugin-examples/buttons/screenshots/menu.png differ
diff --git a/plugin-examples/buttons/screenshots/popover.png b/plugin-examples/buttons/screenshots/popover.png
new file mode 100644
index 0000000000..4910790d24
Binary files /dev/null and b/plugin-examples/buttons/screenshots/popover.png differ
diff --git a/plugin-examples/catppuccin/index.client.ts b/plugin-examples/catppuccin/index.client.ts
index 3dd78f6882..da65198710 100644
--- a/plugin-examples/catppuccin/index.client.ts
+++ b/plugin-examples/catppuccin/index.client.ts
@@ -1,4 +1,4 @@
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 
 export default function contribute(client: PluginClientContext) {
   client.addTheme({
diff --git a/plugin-examples/catppuccin/paseo-plugin.json b/plugin-examples/catppuccin/paseo-plugin.json
index b7946e39e2..0ebf66ed4e 100644
--- a/plugin-examples/catppuccin/paseo-plugin.json
+++ b/plugin-examples/catppuccin/paseo-plugin.json
@@ -1,3 +1,6 @@
 {
-  "id": "catppuccin"
+  "id": "catppuccin",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
 }
diff --git a/plugin-examples/hosts/client/hosts.tsx b/plugin-examples/hosts/client/hosts.tsx
new file mode 100644
index 0000000000..096843ed9a
--- /dev/null
+++ b/plugin-examples/hosts/client/hosts.tsx
@@ -0,0 +1,59 @@
+import {
+  getPaseoClient,
+  useHosts,
+  usePaseo,
+  type PluginSurfaceProps,
+} from "@getpaseo/plugin/client";
+import { useCallback, useMemo, useState } from "react";
+import { Pressable, Text, View } from "react-native";
+
+export function Hosts({ theme }: PluginSurfaceProps) {
+  const hosts = useHosts();
+  const selected = usePaseo();
+  const [result, setResult] = useState("");
+  const list = useCallback(
+    async (serverId?: string) => {
+      try {
+        const client = serverId ? getPaseoClient(serverId) : selected;
+        const { entries } = await client.agents.list();
+        setResult(`${serverId ?? "Selected host"}: ${entries.length} agents`);
+      } catch (error) {
+        setResult(error instanceof Error ? error.message : String(error));
+      }
+    },
+    [selected],
+  );
+  const styles = useMemo(
+    () => ({
+      root: { padding: 16, gap: 12, backgroundColor: theme.colors.surface0 },
+      text: { color: theme.colors.foreground },
+    }),
+    [theme],
+  );
+  const listSelected = useCallback(() => {
+    void list();
+  }, [list]);
+  const rows = hosts.map((host) => ({
+    serverId: host.serverId,
+    label: host.label,
+    status: host.status,
+    onPress() {
+      void list(host.serverId);
+    },
+  }));
+  return (
+    <View style={styles.root}>
+      <Pressable accessibilityRole="button" onPress={listSelected}>
+        <Text style={styles.text}>List selected host agents</Text>
+      </Pressable>
+      {rows.map((host) => (
+        <Pressable key={host.serverId} accessibilityRole="button" onPress={host.onPress}>
+          <Text style={styles.text}>
+            {host.label}: {host.status}
+          </Text>
+        </Pressable>
+      ))}
+      <Text style={styles.text}>{result}</Text>
+    </View>
+  );
+}
diff --git a/plugin-examples/hosts/index.client.tsx b/plugin-examples/hosts/index.client.tsx
new file mode 100644
index 0000000000..76480eac00
--- /dev/null
+++ b/plugin-examples/hosts/index.client.tsx
@@ -0,0 +1,15 @@
+import { useCallback } from "react";
+import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { Hosts } from "./client/hosts";
+
+function HostsItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  const open = useCallback(() => openScreen({ screenId: "main" }), [openScreen]);
+  return <SidebarRow icon="Server" active={currentScreen?.screenId === "main"} onPress={open} />;
+}
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({ id: "main", title: "Host agents", Component: Hosts });
+  client.addSidebarHeaderItem({ id: "hosts", title: "Host agents", Component: HostsItem });
+  return () => {};
+}
diff --git a/plugin-examples/hosts/paseo-plugin.json b/plugin-examples/hosts/paseo-plugin.json
new file mode 100644
index 0000000000..b642ae50ae
--- /dev/null
+++ b/plugin-examples/hosts/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "host-agents", "requirements": { "paseo": ">=0.8.0" } }
diff --git a/plugin-examples/inline-thinking/client/thinking.tsx b/plugin-examples/inline-thinking/client/thinking.tsx
index c24f210f21..88bf4d6903 100644
--- a/plugin-examples/inline-thinking/client/thinking.tsx
+++ b/plugin-examples/inline-thinking/client/thinking.tsx
@@ -1,5 +1,5 @@
-import type { PluginTimelineItemProps } from "@getpaseo/plugin";
-import { useRevealedText } from "@getpaseo/plugin/react-native";
+import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
+import { useRevealedText } from "@getpaseo/plugin/client/react-native";
 import { useMemo } from "react";
 import { Text } from "react-native";
 import { z } from "zod";
diff --git a/plugin-examples/inline-thinking/index.client.tsx b/plugin-examples/inline-thinking/index.client.tsx
index f78b646761..f93c0a894b 100644
--- a/plugin-examples/inline-thinking/index.client.tsx
+++ b/plugin-examples/inline-thinking/index.client.tsx
@@ -1,4 +1,4 @@
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { InlineThinking, inlineThinkingSchema } from "./client/thinking";
 
 export default function contribute(client: PluginClientContext) {
diff --git a/plugin-examples/inline-thinking/paseo-plugin.json b/plugin-examples/inline-thinking/paseo-plugin.json
index e9d5e76ab1..eade794f02 100644
--- a/plugin-examples/inline-thinking/paseo-plugin.json
+++ b/plugin-examples/inline-thinking/paseo-plugin.json
@@ -1,3 +1,6 @@
 {
-  "id": "inline-thinking"
+  "id": "inline-thinking",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
 }
diff --git a/plugin-examples/lifecycle-actions/README.md b/plugin-examples/lifecycle-actions/README.md
new file mode 100644
index 0000000000..689ed2908f
--- /dev/null
+++ b/plugin-examples/lifecycle-actions/README.md
@@ -0,0 +1,36 @@
+# Lifecycle actions
+
+Small callbacks using the existing SDK:
+
+- Send `Try again.` when the latest output contains `out of credits`.
+- Decline a shell request matching `rm -rf`; approve exactly `git status`; leave other requests alone.
+- Inject `PASEO_HOOK_CREATE_EXAMPLE=created` on creation and `PASEO_HOOK_OPEN_EXAMPLE=opened` on each session opening.
+- Change requested Codex agents to Claude Haiku before creation.
+- Create a worktree when a directory creation request is titled `Isolated lifecycle example`.
+
+This is a demonstration plugin: installing it enables all these behaviors on its host. Install it
+alongside `lifecycle-logger` on a test daemon with plugins enabled:
+
+```bash
+paseo plugin install /absolute/path/to/plugin-examples/lifecycle-actions
+paseo plugin install /absolute/path/to/plugin-examples/lifecycle-logger
+paseo plugin logs lifecycle-logger
+```
+
+Outside the Paseo repository, `server/inspect.ts` needs `@getpaseo/protocol` installed for its
+type imports. Add it to your plugin development dependencies at the same version as
+`@getpaseo/plugin` before installing this example.
+
+Copy the callbacks you need into your own plugin. The follow-up example sends a new message; it does
+not replay attachments or undo previous tool effects. If the provider keeps returning the matching
+phrase, it keeps sending follow-ups. Add limits or delay in your plugin when your workflow needs them.
+The command regex illustrates a policy; it does not parse shell syntax or cover every deletion command.
+
+`server/inspect.ts` joins provider text chunks and excludes earlier turns and the current user prompt
+from the phrase match. The failing-first regression test records the split text observed with a real
+Claude agent.
+
+See [agent configuration](../agent-configuration) for a focused example that injects MCP servers and
+changes Codex sandbox and approval options while preserving other settings.
+
+See the [lifecycle reference](../../public-docs/plugins/reference.md#lifecycle-hooks) for the API.
diff --git a/plugin-examples/lifecycle-actions/index.server.ts b/plugin-examples/lifecycle-actions/index.server.ts
new file mode 100644
index 0000000000..44ee2cecff
--- /dev/null
+++ b/plugin-examples/lifecycle-actions/index.server.ts
@@ -0,0 +1,95 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { latestOutputText, shellCommand } from "./server/inspect";
+
+export default function contribute(server: PluginServerContext) {
+  server.before("workspace.create", ({ request }) => {
+    if (request.title === "Isolated lifecycle example" && request.source.kind === "directory") {
+      return {
+        ...request,
+        source: {
+          kind: "worktree",
+          cwd: request.source.path,
+          action: "branch-off",
+          branchName: "lifecycle-example",
+        },
+      };
+    }
+    return request;
+  });
+
+  server.on("agent.turn_ended", async (event, context) => {
+    if (event.outcome.kind === "canceled") {
+      return;
+    }
+    const text = latestOutputText(event.timeline);
+    if (/out of credits/i.test(text)) {
+      const agent = context.paseo.agents.ref(event.agent.id);
+      console.log("Sending a follow-up after out of credits", event.agent.id);
+      await agent.send("Try again.");
+    }
+  });
+
+  server.on("agent.permission_requested", async (event, context) => {
+    const command = shellCommand(event.request);
+    if (command === null) {
+      return;
+    }
+
+    const agent = context.paseo.agents.ref(event.agent.id);
+    if (/\brm\s+-rf\b/.test(command)) {
+      await agent.respondToPermission({
+        requestId: event.request.id,
+        response: {
+          behavior: "deny",
+          message: "Recursive deletion is blocked by the example plugin.",
+        },
+      });
+      return;
+    }
+
+    if (command.trim() === "git status") {
+      await agent.respondToPermission({
+        requestId: event.request.id,
+        response: { behavior: "allow" },
+      });
+    }
+  });
+
+  server.before("agent.create", ({ request }) => {
+    return {
+      ...request,
+      env: {
+        ...request.env,
+        PASEO_HOOK_CREATE_EXAMPLE: "created",
+      },
+    };
+  });
+
+  server.before("agent.create", ({ request }) => {
+    if (request.config.provider === "codex") {
+      return {
+        ...request,
+        config: {
+          ...request.config,
+          provider: "claude",
+          model: "haiku",
+          modeId: "default",
+          providerOptions: undefined,
+        },
+      };
+    }
+    return request;
+  });
+
+  server.before("agent.session_open", ({ request }) => {
+    return {
+      ...request,
+      env: {
+        ...request.env,
+        PASEO_HOOK_OPEN_EXAMPLE: "opened",
+      },
+    };
+  });
+
+  return () => {};
+}
diff --git a/plugin-examples/lifecycle-actions/paseo-plugin.json b/plugin-examples/lifecycle-actions/paseo-plugin.json
new file mode 100644
index 0000000000..fe578fae6d
--- /dev/null
+++ b/plugin-examples/lifecycle-actions/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "lifecycle-actions",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/lifecycle-actions/server/inspect.test.ts b/plugin-examples/lifecycle-actions/server/inspect.test.ts
new file mode 100644
index 0000000000..5a70cc4476
--- /dev/null
+++ b/plugin-examples/lifecycle-actions/server/inspect.test.ts
@@ -0,0 +1,20 @@
+import { expect, test } from "vitest";
+import { latestOutputText } from "./inspect";
+
+test("matches provider text split across timeline chunks without matching old turns or user prompts", () => {
+  const output = latestOutputText([
+    { type: "user_message", text: "An older request" },
+    { type: "assistant_message", text: "old out of credits" },
+    { type: "user_message", text: "The user mentions out of credits" },
+    { type: "assistant_message", text: "out", messageId: "reply" },
+    { type: "assistant_message", text: " of credits", messageId: "reply" },
+  ]);
+  expect(output).toBe("out of credits");
+  expect(
+    latestOutputText([
+      { type: "assistant_message", text: "out of credits" },
+      { type: "user_message", text: "Try again." },
+      { type: "assistant_message", text: "Done" },
+    ]),
+  ).toBe("Done");
+});
diff --git a/plugin-examples/lifecycle-actions/server/inspect.ts b/plugin-examples/lifecycle-actions/server/inspect.ts
new file mode 100644
index 0000000000..8df057c2dc
--- /dev/null
+++ b/plugin-examples/lifecycle-actions/server/inspect.ts
@@ -0,0 +1,28 @@
+import type { AgentPermissionRequest, AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+
+export function latestOutputText(timeline: readonly AgentTimelineItem[]): string {
+  let output = "";
+  for (const item of timeline) {
+    if (item.type === "user_message") {
+      output = "";
+    } else if ("text" in item && typeof item.text === "string") {
+      output += item.text;
+    } else {
+      output += JSON.stringify(item) + "\n";
+    }
+  }
+  return output;
+}
+
+export function shellCommand(request: AgentPermissionRequest): string | null {
+  if (!request.input) {
+    return null;
+  }
+  if (typeof request.input.command === "string") {
+    return request.input.command;
+  }
+  if (typeof request.input.cmd === "string") {
+    return request.input.cmd;
+  }
+  return null;
+}
diff --git a/plugin-examples/lifecycle-logger/README.md b/plugin-examples/lifecycle-logger/README.md
new file mode 100644
index 0000000000..d6c00b8032
--- /dev/null
+++ b/plugin-examples/lifecycle-logger/README.md
@@ -0,0 +1,31 @@
+# Lifecycle logger
+
+Registers all eleven server lifecycle hooks and logs their data as JSON. It observes agent creation,
+session opening, turns, permissions, archive, and workspace creation/archive. Before hooks return
+the request unchanged. Environment values are redacted; prompts and timeline content are logged.
+
+Install it on a daemon where plugins are enabled:
+
+```bash
+paseo plugin install /absolute/path/to/plugin-examples/lifecycle-logger
+paseo plugin logs lifecycle-logger
+```
+
+The same entries appear in the target daemon's `daemon.log`. The plugin log viewer retains a bounded
+tail; use the daemon log for longer captures. Log lines are capped at 16 KiB, so a large timeline can
+be truncated.
+
+See the [lifecycle reference](../../public-docs/plugins/reference.md#lifecycle-hooks) for callback
+shapes and delivery rules. The real-provider test in
+`packages/server/src/server/plugins/lifecycle.real.e2e.test.ts` runs both examples on an isolated daemon
+and saves evidence under `.dev/lifecycle-proof/`.
+
+Run it from `packages/server` on Linux with Claude configured:
+
+```bash
+npx vitest run src/server/plugins/lifecycle.real.e2e.test.ts --bail=1
+```
+
+The test uses real provider calls and a temporary daemon home. Its failure check uses Linux `/proc`
+to identify and terminate only its own Claude subprocess. The credits check asks the real agent to
+emit the matching phrase; it does not exhaust an account's credits.
diff --git a/plugin-examples/lifecycle-logger/index.server.ts b/plugin-examples/lifecycle-logger/index.server.ts
new file mode 100644
index 0000000000..0f5fd4ed95
--- /dev/null
+++ b/plugin-examples/lifecycle-logger/index.server.ts
@@ -0,0 +1,57 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { logHook } from "./server/log";
+
+export default function contribute(server: PluginServerContext) {
+  server.before("workspace.create", ({ request }) => {
+    logHook("before workspace.create", { request });
+    return request;
+  });
+
+  server.on("workspace.created", (event) => {
+    logHook("workspace.created", event);
+  });
+
+  server.on("workspace.archived", (event) => {
+    logHook("workspace.archived", event);
+  });
+
+  server.before("agent.create", ({ request }) => {
+    logHook("before agent.create", { request });
+    return request;
+  });
+
+  server.before("agent.session_open", ({ request }) => {
+    logHook("before agent.session_open", { request });
+    return request;
+  });
+
+  server.on("agent.created", (event) => {
+    logHook("agent.created", event);
+  });
+
+  server.on("agent.closed", (event) => {
+    logHook("agent.closed", event);
+  });
+
+  server.on("agent.turn_started", (event) => {
+    logHook("agent.turn_started", event);
+  });
+
+  server.on("agent.turn_ended", (event) => {
+    logHook("agent.turn_ended", event);
+  });
+
+  server.on("agent.permission_requested", (event) => {
+    logHook("agent.permission_requested", event);
+  });
+
+  server.on("agent.permission_resolved", (event) => {
+    logHook("agent.permission_resolved", event);
+  });
+
+  server.on("agent.archived", (event) => {
+    logHook("agent.archived", event);
+  });
+
+  return () => {};
+}
diff --git a/plugin-examples/lifecycle-logger/paseo-plugin.json b/plugin-examples/lifecycle-logger/paseo-plugin.json
new file mode 100644
index 0000000000..8385fbf14c
--- /dev/null
+++ b/plugin-examples/lifecycle-logger/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "lifecycle-logger",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/lifecycle-logger/server/log.ts b/plugin-examples/lifecycle-logger/server/log.ts
new file mode 100644
index 0000000000..e6557700c0
--- /dev/null
+++ b/plugin-examples/lifecycle-logger/server/log.ts
@@ -0,0 +1,14 @@
+export function logHook(hook: string, data: unknown): void {
+  const entry = { hook, timestamp: new Date().toISOString(), data };
+  const line = JSON.stringify(entry, (key, value: unknown) => {
+    if (key === "env" && value !== null && typeof value === "object") {
+      const redacted: Record<string, string> = {};
+      for (const name of Object.keys(value)) {
+        redacted[name] = "[redacted]";
+      }
+      return redacted;
+    }
+    return value;
+  });
+  console.log(line);
+}
diff --git a/plugin-examples/linear/README.md b/plugin-examples/linear/README.md
index 2a227bf71c..c21c52f1d0 100644
--- a/plugin-examples/linear/README.md
+++ b/plugin-examples/linear/README.md
@@ -9,21 +9,16 @@ Set a personal API key in the daemon environment:
 export LINEAR_API_KEY="lin_api_..."
 ```
 
-Register the extension in `$PASEO_HOME/config.json`:
+Start your daemon with that environment variable set. Then turn on **Enable plugins** in
+**Settings → Plugins** and install the example:
 
-```json
-{
-  "pluginsEnabled": true,
-  "plugins": {
-    "linear": {
-      "source": "directory",
-      "path": "/absolute/path/to/paseo/plugin-examples/linear"
-    }
-  }
-}
+```bash
+paseo plugin add /absolute/path/to/paseo/plugin-examples/linear
+paseo plugin ls linear
 ```
 
-Restart the development daemon after changing its environment or plugin configuration.
+Use `paseo plugin reload linear` after source edits. Changing the API key requires restarting the
+daemon with the new environment; installing or reloading plugin source does not.
 
 The split entry point demonstrates the complete attachment-source pattern:
 
diff --git a/plugin-examples/linear/index.client.ts b/plugin-examples/linear/index.client.ts
index 3985ff8c91..6b25651fc0 100644
--- a/plugin-examples/linear/index.client.ts
+++ b/plugin-examples/linear/index.client.ts
@@ -1,4 +1,4 @@
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { issueAttachments } from "./shared/issues";
 
 export default function contribute(client: PluginClientContext) {
diff --git a/plugin-examples/linear/index.server.ts b/plugin-examples/linear/index.server.ts
index 841d26dd93..544ab0081c 100644
--- a/plugin-examples/linear/index.server.ts
+++ b/plugin-examples/linear/index.server.ts
@@ -1,4 +1,4 @@
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { searchIssues } from "./server/issues";
 import { searchIssuesRpc } from "./shared/issues";
 
diff --git a/plugin-examples/linear/paseo-plugin.json b/plugin-examples/linear/paseo-plugin.json
index c8fa978d91..383edd9b25 100644
--- a/plugin-examples/linear/paseo-plugin.json
+++ b/plugin-examples/linear/paseo-plugin.json
@@ -1,3 +1,6 @@
 {
-  "id": "linear"
+  "id": "linear",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
 }
diff --git a/plugin-examples/local-plugin/client/main.tsx b/plugin-examples/local-plugin/client/main.tsx
index 8bea0bf554..749012e0a9 100644
--- a/plugin-examples/local-plugin/client/main.tsx
+++ b/plugin-examples/local-plugin/client/main.tsx
@@ -1,74 +1,81 @@
 import { useMutation } from "@tanstack/react-query";
 import {
-  Icon,
   type PluginClientContext,
-  type PluginComposerPillProps,
+  type PluginButtonRegistration,
   type PluginWorkspacePanelProps,
-  useAgent,
   useRpc,
   useWorkspace,
-} from "@getpaseo/plugin";
+} from "@getpaseo/plugin/client";
 import { useCallback, useMemo } from "react";
 import { Pressable, Text, View } from "react-native";
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
 import { incrementRpc } from "../shared/increment";
 
-export function OpenCounterPill({ theme, workspaceId, agentId }: PluginComposerPillProps) {
-  const workspace = useWorkspace(workspaceId, ({ name }) => ({ name }));
-  const agent = useAgent(agentId, ({ title }) => ({ title }));
-  const textStyle = useMemo(() => ({ color: theme.colors.foregroundMuted }), [theme]);
-  return (
-    <>
-      <Icon name="Blocks" size={14} color={theme.colors.foregroundMuted} />
-      <Text style={textStyle} numberOfLines={1}>
-        {agent?.title ?? workspace?.name ?? "Counter"}
-      </Text>
-    </>
-  );
-}
-
 export function contributeClient(client: PluginClientContext) {
-  const pills = new Map<string, () => void>();
+  const pills = new Map<string, PluginButtonRegistration>();
   let stopped = false;
+  const lifetime = new AbortController();
   const register = (agent: { id: string; workspaceId?: string | null }) => {
     if (stopped || !agent.workspaceId) return;
-    pills.get(agent.id)?.();
+    pills.get(agent.id)?.remove();
     const workspaceId = agent.workspaceId;
     const remove = client.addComposerPill({
       id: "open-counter",
-      title: "Open plugin counter",
       workspaceId,
       agentId: agent.id,
-      Component: OpenCounterPill,
-      onPress() {
-        client.openPanel("counter", { workspaceId });
+      button: {
+        title: "Open plugin counter",
+        icon: "Blocks",
+        label: "Counter",
+        behavior: {
+          kind: "action",
+          onPress() {
+            client.openPanel("counter", { workspaceId });
+          },
+        },
       },
     });
     pills.set(agent.id, remove);
   };
   const remove = (agentId: string) => {
-    pills.get(agentId)?.();
+    pills.get(agentId)?.remove();
     pills.delete(agentId);
   };
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
-    if (update.kind === "remove") remove(update.agentId);
-    else register(update.agent);
-  });
   void client.paseo.agents
-    .list()
-    .then(({ entries }) => {
-      for (const { agent } of entries) register(agent);
+    .list({ subscribe: {}, signal: lifetime.signal })
+    .then(({ subscription }) => {
+      subscription.subscribe({
+        snapshot: ({ entries }) => {
+          for (const pill of pills.values()) pill.remove();
+          pills.clear();
+          for (const { agent } of entries) register(agent);
+        },
+        update: (message) => {
+          if (message.type !== "agent_update") return;
+          const update = message.payload;
+          if (update.kind === "remove") remove(update.agentId);
+          else register(update.agent);
+        },
+      });
       return undefined;
     })
-    .catch(() => undefined);
+    .catch((error) => {
+      if (!stopped) console.error("Agent observation failed", error);
+    });
   return () => {
     stopped = true;
-    unsubscribe();
-    for (const dispose of pills.values()) dispose();
+    lifetime.abort();
+    for (const pill of pills.values()) pill.remove();
     pills.clear();
   };
 }
 
-export function ExamplePanel({ theme, layout, workspaceId }: PluginWorkspacePanelProps) {
+export function ExamplePanel({
+  theme,
+  layout,
+  workspaceId,
+  navigation,
+}: PluginWorkspacePanelProps) {
   const workspace = useWorkspace(workspaceId, ({ name }) => ({ name }));
   const callIncrement = useRpc(incrementRpc);
   const { data, error, isPending, mutate } = useMutation({ mutationFn: callIncrement });
@@ -93,9 +100,20 @@ export function ExamplePanel({ theme, layout, workspaceId }: PluginWorkspacePane
     mutate({ value });
   }, [mutate, value]);
 
+  const openBrowser = navigation?.openBrowser;
+  const handleOpenBrowser = useCallback(() => {
+    openBrowser?.({ url: "https://paseo.sh/docs/plugins", workspaceId });
+  }, [openBrowser, workspaceId]);
+
   return (
     <View style={styles.screen}>
       <Text style={styles.title}>Workspace plugin panel</Text>
+      <ExternalLink href="https://paseo.sh/docs/plugins">Plugin documentation</ExternalLink>
+      {openBrowser ? (
+        <Pressable accessibilityRole="button" onPress={handleOpenBrowser} style={styles.button}>
+          <Text style={styles.buttonText}>Read in workspace browser</Text>
+        </Pressable>
+      ) : null}
       <Text style={styles.detail}>{workspace?.name}</Text>
       <Text style={styles.detail}>{data?.handledBy ?? "The RPC has not run yet."}</Text>
       <Pressable
diff --git a/plugin-examples/local-plugin/index.client.tsx b/plugin-examples/local-plugin/index.client.tsx
index 5eee9b545d..4a95c337fc 100644
--- a/plugin-examples/local-plugin/index.client.tsx
+++ b/plugin-examples/local-plugin/index.client.tsx
@@ -1,4 +1,4 @@
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { contributeClient, ExamplePanel } from "./client/main";
 
 export default function contribute(client: PluginClientContext) {
diff --git a/plugin-examples/local-plugin/index.server.ts b/plugin-examples/local-plugin/index.server.ts
index 3b703a617c..c0176ac40e 100644
--- a/plugin-examples/local-plugin/index.server.ts
+++ b/plugin-examples/local-plugin/index.server.ts
@@ -1,4 +1,4 @@
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { increment } from "./server/increment";
 import { incrementRpc } from "./shared/increment";
 
diff --git a/plugin-examples/local-plugin/paseo-plugin.json b/plugin-examples/local-plugin/paseo-plugin.json
index d1a1b37435..a53074de39 100644
--- a/plugin-examples/local-plugin/paseo-plugin.json
+++ b/plugin-examples/local-plugin/paseo-plugin.json
@@ -1,3 +1,6 @@
 {
-  "id": "local-example"
+  "id": "local-example",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
 }
diff --git a/plugin-examples/modal-ui/LICENSE b/plugin-examples/modal-ui/LICENSE
new file mode 100644
index 0000000000..2f5903143b
--- /dev/null
+++ b/plugin-examples/modal-ui/LICENSE
@@ -0,0 +1,211 @@
+Copyright (c) 2025-present Mohamed Boudra
+
+Portions of this software are licensed as follows:
+
+* Third-party components incorporated into Paseo remain licensed under
+  the licenses provided by their respective copyright holders.
+* Except for those third-party components, Paseo is licensed under the
+  Apache License, Version 2.0, reproduced below.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugin-examples/modal-ui/README.md b/plugin-examples/modal-ui/README.md
new file mode 100644
index 0000000000..380ad99950
--- /dev/null
+++ b/plugin-examples/modal-ui/README.md
@@ -0,0 +1,49 @@
+# Modal UI example
+
+Install on a Paseo host with npm source installation support and npm available:
+
+```sh
+paseo plugin install npm:@getpaseo/plugin-example-modal-ui@0.1.1
+```
+
+In host **Settings → Plugins**, paste the same `npm:` identifier into **Plugin source**.
+Enable plugins, then open **Modal examples** from the sidebar or a workspace tab.
+Choose **Open Form**, type into **Paste here**, and watch the **Input:** text update.
+The installed plugin ID is `modal-ui-example`. Host Settings shows the package identity and
+installed version. With reviewed-update support, run `paseo plugin update modal-ui-example --check`
+to check for a newer version, then `paseo plugin update modal-ui-example` to review and approve it.
+An explicit install version selects the initial content; later updates still check the latest release.
+
+The package ships the existing TypeScript entry and client sources. Paseo compiles them through
+its directory plugin loader; no package build or preparation command is required. React,
+React Native, and `@getpaseo/plugin` are peer contracts supplied by the host. npm is needed for
+installation, not loading or reloading. You can also install this directory while developing.
+See the [source reference](https://paseo.sh/docs/plugins/reference#plugin-sources)
+for supported identifiers and preparation rules.
+
+The examples demonstrate default and custom padding, a full-width body, author-owned ScrollView and
+FlatList scrolling, horizontal tabs, and clipboard actions with a keyboard-aware input. See the
+[host UI reference](https://paseo.sh/docs/plugins/reference#host-ui) for the API contract.
+
+The browser regression installs this exact example in an isolated daemon:
+
+```sh
+cd packages/app
+npx playwright test e2e/browser/plugin-modal-body.spec.ts --project=browser --workers=1
+```
+
+On Android, open each example and drag up on its content to expand the sheet, then scroll the list.
+In FlatList, expand before using **Jump to last row**; row 100 should be visible. At the top of either
+list, drag down on a row to dismiss the sheet. In Form,
+press **Copy text**, long-press the input, and choose **Paste**. The input should contain
+“Copied from Paseo”. With the system keyboard enabled, focusing the input should keep it visible.
+
+Run the [native sheet regression](https://github.com/getpaseo/paseo/blob/main/packages/app/e2e/mobile/modal-sheet/README.md) to check body
+dismissal, list scrolling and horizontal tabs together.
+
+These captures show Android copy/paste and custom padding on browser and wide native layouts.
+Android API 35 and Chromium were exercised; iOS and Electron were not tested.
+
+| Android copy/paste                                               | Browser custom padding                                      | Wide Android custom padding                                               |
+| ---------------------------------------------------------------- | ----------------------------------------------------------- | ------------------------------------------------------------------------- |
+| ![Android copy and OS paste](screenshots/android-copy-paste.png) | ![Browser custom padding](screenshots/web-custom-inset.png) | ![Wide Android custom padding](screenshots/android-wide-custom-inset.png) |
diff --git a/plugin-examples/modal-ui/client/examples.tsx b/plugin-examples/modal-ui/client/examples.tsx
new file mode 100644
index 0000000000..bbd0c8c0e8
--- /dev/null
+++ b/plugin-examples/modal-ui/client/examples.tsx
@@ -0,0 +1,205 @@
+import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
+import {
+  Modal,
+  ScrollView,
+  FlatList,
+  TextInput,
+  copyText,
+  useToast,
+} from "@getpaseo/plugin/client/react-native";
+import { useCallback, useMemo, useRef, useState } from "react";
+import {
+  Pressable,
+  Text,
+  View,
+  StyleSheet,
+  type StyleProp,
+  type ViewStyle,
+  type TextStyle,
+  type FlatList as NativeFlatList,
+} from "react-native";
+
+const modes = [
+  "Form",
+  "Custom inset",
+  "Full bleed",
+  "ScrollView",
+  "FlatList",
+  "Horizontal",
+] as const;
+type Mode = (typeof modes)[number];
+const rows = Array.from({ length: 100 }, (_, index) => index + 1);
+const tabs = ["Overview", "Configuration", "Activity", "Permissions", "System logs"];
+const styles = StyleSheet.create({
+  screen: { flex: 1, padding: 16, gap: 12 },
+  button: { padding: 12, borderWidth: 1, borderRadius: 6 },
+  fill: { flex: 1, minHeight: 0 },
+  customInset: { padding: 8, paddingBottom: 40, gap: 16 },
+  fullBleed: { padding: 0, gap: 0 },
+  row: { height: 56, padding: 16, borderBottomWidth: 1 },
+  form: { gap: 16 },
+  input: { borderWidth: 1, padding: 12, borderRadius: 6 },
+  tabs: { flexGrow: 0, flexShrink: 0 },
+  tab: { padding: 18, minWidth: 160 },
+});
+
+export function ModalExamples({ theme }: Pick<PluginSurfaceProps, "theme">) {
+  const [mode, setMode] = useState<Mode | null>(null);
+  const [input, setInput] = useState("");
+  const [selected, setSelected] = useState("");
+  const list = useRef<NativeFlatList<number>>(null);
+  const toast = useToast();
+  const color = useMemo(() => ({ color: theme.colors.foreground }), [theme]);
+  const body = useMemo(() => ({ backgroundColor: theme.colors.surface2 }), [theme]);
+  const button = useMemo(() => [styles.button, { borderColor: theme.colors.border }], [theme]);
+  const rowStyle = useMemo(() => [styles.row, { borderColor: theme.colors.border }], [theme]);
+  const inputStyle = useMemo(
+    () => [styles.input, color, { borderColor: theme.colors.border }],
+    [color, theme],
+  );
+
+  const copy = useCallback(async () => {
+    try {
+      await copyText("Copied from Paseo");
+      toast.show("Text copied", { variant: "success" });
+    } catch {
+      toast.error("Could not copy text. Select the text and use Copy.");
+    }
+  }, [toast]);
+
+  const row = useCallback(
+    (item: number) => {
+      return (
+        <ChoiceButton
+          key={item}
+          value={`Row ${item}`}
+          label={`Row ${item}`}
+          style={rowStyle}
+          textStyle={color}
+          onSelect={setSelected}
+        />
+      );
+    },
+    [rowStyle, color],
+  );
+  const renderRow = useCallback(({ item }: { item: number }) => row(item), [row]);
+  const close = useCallback((open: boolean) => {
+    if (!open) setMode(null);
+  }, []);
+  const jumpToEnd = useCallback(() => list.current?.scrollToEnd({ animated: false }), []);
+  const screen = useMemo(() => [styles.screen, body], [body]);
+
+  let contentStyle: StyleProp<ViewStyle> = styles.fullBleed;
+  if (mode === "Form") contentStyle = undefined;
+  if (mode === "Custom inset") contentStyle = styles.customInset;
+
+  const form = (
+    <View style={styles.form} testID="modal-example-form">
+      <Text selectable style={color}>
+        Paseo clipboard example
+      </Text>
+      <Pressable accessibilityRole="button" style={button} onPress={copy}>
+        <Text style={color}>Copy text</Text>
+      </Pressable>
+      <TextInput
+        accessibilityLabel="Paste here"
+        placeholder="Paste here"
+        placeholderTextColor={theme.colors.foregroundMuted}
+        style={inputStyle}
+        value={input}
+        onChangeText={setInput}
+      />
+      <Text style={color}>Input: {input || "empty"}</Text>
+    </View>
+  );
+
+  return (
+    <View style={screen}>
+      <Text style={color}>Modal body examples</Text>
+      {modes.map((example) => (
+        <ChoiceButton<Mode>
+          key={example}
+          value={example}
+          label={`Open ${example}`}
+          style={button}
+          textStyle={color}
+          onSelect={setMode}
+        />
+      ))}
+      <Text style={color}>Selected: {selected || "none"}</Text>
+      <Modal title={`Modal example: ${mode ?? "Form"}`} open={mode !== null} onOpenChange={close}>
+        <Modal.Content
+          style={body}
+          contentContainerStyle={contentStyle}
+          scrollable={mode !== "ScrollView" && mode !== "FlatList"}
+        >
+          {mode === "Form" || mode === "Custom inset" ? form : null}
+          {mode === "Full bleed" ? rows.map(row) : null}
+          {mode === "ScrollView" ? (
+            <ScrollView style={styles.fill} keyboardShouldPersistTaps="handled">
+              {rows.map(row)}
+            </ScrollView>
+          ) : null}
+          {mode === "FlatList" ? (
+            <>
+              <Pressable accessibilityRole="button" style={button} onPress={jumpToEnd}>
+                <Text style={color}>Jump to last row</Text>
+              </Pressable>
+              <FlatList
+                ref={list}
+                style={styles.fill}
+                data={rows}
+                keyExtractor={String}
+                renderItem={renderRow}
+                getItemLayout={getRowLayout}
+              />
+            </>
+          ) : null}
+          {mode === "Horizontal" ? (
+            <>
+              <ScrollView horizontal style={styles.tabs}>
+                {tabs.map((tab) => (
+                  <ChoiceButton
+                    key={tab}
+                    value={tab}
+                    label={tab}
+                    style={styles.tab}
+                    textStyle={color}
+                    onSelect={setSelected}
+                  />
+                ))}
+              </ScrollView>
+              {form}
+              {rows.slice(0, 20).map(row)}
+            </>
+          ) : null}
+        </Modal.Content>
+      </Modal>
+    </View>
+  );
+}
+
+function getRowLayout(_: unknown, index: number) {
+  return { index, length: 56, offset: index * 56 };
+}
+
+function ChoiceButton<Value extends string>({
+  value,
+  label,
+  style,
+  textStyle,
+  onSelect,
+}: {
+  value: Value;
+  label: string;
+  style: StyleProp<ViewStyle>;
+  textStyle: StyleProp<TextStyle>;
+  onSelect(value: Value): void;
+}) {
+  const select = useCallback(() => onSelect(value), [onSelect, value]);
+  return (
+    <Pressable accessibilityRole="button" style={style} onPress={select}>
+      <Text style={textStyle}>{label}</Text>
+    </Pressable>
+  );
+}
diff --git a/plugin-examples/modal-ui/index.client.tsx b/plugin-examples/modal-ui/index.client.tsx
new file mode 100644
index 0000000000..287d3bdffa
--- /dev/null
+++ b/plugin-examples/modal-ui/index.client.tsx
@@ -0,0 +1,29 @@
+import { useCallback } from "react";
+import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { ModalExamples } from "./client/examples";
+
+function ModalExamplesItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  const open = useCallback(() => openScreen({ screenId: "main" }), [openScreen]);
+  return (
+    <SidebarRow icon="PanelsTopLeft" active={currentScreen?.screenId === "main"} onPress={open} />
+  );
+}
+
+export default function contribute(plugin: PluginClientContext) {
+  plugin.addScreen({ id: "main", title: "Modal examples", Component: ModalExamples });
+  plugin.addSidebarHeaderItem({
+    id: "main",
+    title: "Modal examples",
+    Component: ModalExamplesItem,
+  });
+  plugin.addWorkspacePanel({
+    id: "examples",
+    title: "Modal examples",
+    icon: "PanelsTopLeft",
+    context: "workspace",
+    locations: ["workspace", "explorer"],
+    Component: ModalExamples,
+  });
+  return () => {};
+}
diff --git a/plugin-examples/modal-ui/package.json b/plugin-examples/modal-ui/package.json
new file mode 100644
index 0000000000..e07935b35f
--- /dev/null
+++ b/plugin-examples/modal-ui/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "@getpaseo/plugin-example-modal-ui",
+  "version": "0.1.1",
+  "description": "Interactive Paseo plugin example for modal forms, scrolling, and clipboard actions",
+  "homepage": "https://paseo.sh/docs/plugins",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/getpaseo/paseo.git",
+    "directory": "plugin-examples/modal-ui"
+  },
+  "files": [
+    "paseo-plugin.json",
+    "index.client.tsx",
+    "client/",
+    "screenshots/",
+    "LICENSE"
+  ],
+  "type": "module",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
+  "peerDependencies": {
+    "@getpaseo/plugin": ">=0.8.0",
+    "react": ">=19",
+    "react-native": ">=0.81"
+  }
+}
diff --git a/plugin-examples/modal-ui/paseo-plugin.json b/plugin-examples/modal-ui/paseo-plugin.json
new file mode 100644
index 0000000000..854a535736
--- /dev/null
+++ b/plugin-examples/modal-ui/paseo-plugin.json
@@ -0,0 +1,7 @@
+{
+  "id": "modal-ui-example",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  },
+  "description": "Interactive modal forms, scrolling lists, and clipboard examples"
+}
diff --git a/plugin-examples/modal-ui/screenshots/android-copy-paste.png b/plugin-examples/modal-ui/screenshots/android-copy-paste.png
new file mode 100644
index 0000000000..ee5da20bf8
Binary files /dev/null and b/plugin-examples/modal-ui/screenshots/android-copy-paste.png differ
diff --git a/plugin-examples/modal-ui/screenshots/android-wide-custom-inset.png b/plugin-examples/modal-ui/screenshots/android-wide-custom-inset.png
new file mode 100644
index 0000000000..0346fdc9cc
Binary files /dev/null and b/plugin-examples/modal-ui/screenshots/android-wide-custom-inset.png differ
diff --git a/plugin-examples/modal-ui/screenshots/web-custom-inset.png b/plugin-examples/modal-ui/screenshots/web-custom-inset.png
new file mode 100644
index 0000000000..513dc104c9
Binary files /dev/null and b/plugin-examples/modal-ui/screenshots/web-custom-inset.png differ
diff --git a/plugin-examples/provider-acp-transformer/README.md b/plugin-examples/provider-acp-transformer/README.md
new file mode 100644
index 0000000000..50c54e37c8
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/README.md
@@ -0,0 +1,11 @@
+# ACP provider transformer example
+
+This server plugin registers an ACP command through `runAcpProvider()`. The helper owns ACP process
+and SDK details behind Paseo's callback-based provider connection.
+
+`server/vendor-edit.ts` shows the intended extension seam: a focused transformer converts one
+vendor tool payload into Paseo's ordinary file-edit shape. It does not translate the whole event
+stream.
+
+Replace the placeholder `example-acp --stdio` command with an installed ACP agent before enabling
+the plugin.
diff --git a/plugin-examples/provider-acp-transformer/icon.svg b/plugin-examples/provider-acp-transformer/icon.svg
new file mode 100644
index 0000000000..841eef3aee
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/icon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M4 7h16M4 17h16" />
+  <path d="m8 3-4 4 4 4m8 2 4 4-4 4" />
+</svg>
diff --git a/plugin-examples/provider-acp-transformer/index.server.ts b/plugin-examples/provider-acp-transformer/index.server.ts
new file mode 100644
index 0000000000..bf63ffbc94
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/index.server.ts
@@ -0,0 +1,17 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { runAcpProvider } from "@getpaseo/plugin/server/acp";
+import { vendorEditTransformer } from "./server/vendor-edit.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(
+    runAcpProvider({
+      id: "example-acp",
+      label: "Example ACP",
+      description: "An ACP command adapted to Paseo's provider boundary",
+      icon: "icon.svg",
+      command: ["example-acp", "--stdio"],
+      transformers: [vendorEditTransformer],
+    }),
+  );
+  return () => {};
+}
diff --git a/plugin-examples/provider-acp-transformer/paseo-plugin.json b/plugin-examples/provider-acp-transformer/paseo-plugin.json
new file mode 100644
index 0000000000..9aee2c4cc4
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "provider-acp-transformer-example",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/provider-acp-transformer/server/vendor-edit.test.ts b/plugin-examples/provider-acp-transformer/server/vendor-edit.test.ts
new file mode 100644
index 0000000000..e570e94974
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/server/vendor-edit.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+import { vendorEditTransformer } from "./vendor-edit.js";
+
+describe("vendorEditTransformer", () => {
+  it("normalizes only the vendor edit payload", () => {
+    const transformed = vendorEditTransformer.toolCall?.(
+      {
+        id: "edit-1",
+        name: "vendor_file_edit",
+        title: "Edit file",
+        status: "completed",
+        input: { path: "src/app.ts", before: "old", after: "new" },
+        output: null,
+        locations: [],
+      },
+      { sessionId: "session-1" },
+    );
+
+    expect(transformed).toMatchObject({
+      kind: "edit",
+      input: { filePath: "src/app.ts", oldString: "old", newString: "new" },
+    });
+  });
+
+  it("preserves a vendor edit with a malformed payload", () => {
+    const toolCall = {
+      id: "edit-1",
+      name: "vendor_file_edit",
+      title: "Edit file",
+      status: "completed" as const,
+      input: { path: "src/app.ts", before: "old" },
+      output: null,
+      locations: [],
+    };
+
+    const transformed = vendorEditTransformer.toolCall?.(toolCall, {
+      sessionId: "session-1",
+    });
+
+    expect(transformed).toBe(toolCall);
+  });
+});
diff --git a/plugin-examples/provider-acp-transformer/server/vendor-edit.ts b/plugin-examples/provider-acp-transformer/server/vendor-edit.ts
new file mode 100644
index 0000000000..87229ca667
--- /dev/null
+++ b/plugin-examples/provider-acp-transformer/server/vendor-edit.ts
@@ -0,0 +1,25 @@
+import type { AcpTransformer } from "@getpaseo/plugin/server/acp";
+import { z } from "zod";
+
+const vendorEditInputSchema = z.object({
+  path: z.string(),
+  before: z.string(),
+  after: z.string(),
+});
+
+export const vendorEditTransformer: AcpTransformer = {
+  toolCall(toolCall) {
+    if (toolCall.name !== "vendor_file_edit") return toolCall;
+    const input = vendorEditInputSchema.safeParse(toolCall.input);
+    if (!input.success) return toolCall;
+    return {
+      ...toolCall,
+      kind: "edit",
+      input: {
+        filePath: input.data.path,
+        oldString: input.data.before,
+        newString: input.data.after,
+      },
+    };
+  },
+};
diff --git a/plugin-examples/provider-direct/README.md b/plugin-examples/provider-direct/README.md
new file mode 100644
index 0000000000..8bd5921330
--- /dev/null
+++ b/plugin-examples/provider-direct/README.md
@@ -0,0 +1,12 @@
+# Direct provider example
+
+This plugin implements `ProviderRegistration` directly. It demonstrates connection negotiation,
+catalog and session listing, session creation, prompt and command disposition, settings,
+persistence and replay, archive actions, and an ordinary child session.
+
+The provider emits versioned `provider-result` timeline items for its root and child sessions.
+`index.client.tsx` registers the Zod schema and React Native renderer for those items. The server
+and client share only the item kind and schema under `shared/`.
+
+The provider receives Paseo host tools through `config.mcpServers`; it does not receive a second
+callback tool API.
diff --git a/plugin-examples/provider-direct/client/provider-result.tsx b/plugin-examples/provider-direct/client/provider-result.tsx
new file mode 100644
index 0000000000..2a37e6f4d7
--- /dev/null
+++ b/plugin-examples/provider-direct/client/provider-result.tsx
@@ -0,0 +1,32 @@
+import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+import type { z } from "zod";
+import { providerResultSchema } from "../shared/provider-result";
+
+type ProviderResultData = z.output<typeof providerResultSchema>;
+
+export function ProviderResult({ item, theme }: PluginTimelineItemProps<ProviderResultData>) {
+  const styles = useMemo(
+    () => ({
+      card: {
+        gap: 4,
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: 10,
+        padding: 12,
+        backgroundColor: theme.colors.surface1,
+      },
+      label: { color: theme.colors.accent, fontWeight: "600" as const },
+      detail: { color: theme.colors.foreground },
+    }),
+    [theme],
+  );
+
+  return (
+    <View style={styles.card}>
+      <Text style={styles.label}>{item.data.label}</Text>
+      <Text style={styles.detail}>{item.data.detail}</Text>
+    </View>
+  );
+}
diff --git a/plugin-examples/provider-direct/icon.svg b/plugin-examples/provider-direct/icon.svg
new file mode 100644
index 0000000000..0da745c896
--- /dev/null
+++ b/plugin-examples/provider-direct/icon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M5 5h14v14H5z" />
+  <path d="m9 9 6 6m0-6-6 6" />
+</svg>
diff --git a/plugin-examples/provider-direct/index.client.tsx b/plugin-examples/provider-direct/index.client.tsx
new file mode 100644
index 0000000000..a1e8ca87b2
--- /dev/null
+++ b/plugin-examples/provider-direct/index.client.tsx
@@ -0,0 +1,13 @@
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { ProviderResult } from "./client/provider-result";
+import { providerResultKind, providerResultSchema } from "./shared/provider-result";
+
+export default function contribute(client: PluginClientContext) {
+  client.addTimelineRenderer({
+    kind: providerResultKind,
+    version: 1,
+    schema: providerResultSchema,
+    Component: ProviderResult,
+  });
+  return () => {};
+}
diff --git a/plugin-examples/provider-direct/index.server.ts b/plugin-examples/provider-direct/index.server.ts
new file mode 100644
index 0000000000..d877d897d6
--- /dev/null
+++ b/plugin-examples/provider-direct/index.server.ts
@@ -0,0 +1,7 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createDirectExampleProvider } from "./server/provider";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(createDirectExampleProvider());
+  return () => {};
+}
diff --git a/plugin-examples/provider-direct/paseo-plugin.json b/plugin-examples/provider-direct/paseo-plugin.json
new file mode 100644
index 0000000000..c4c6259d53
--- /dev/null
+++ b/plugin-examples/provider-direct/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "provider-direct-example",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/provider-direct/server/provider.test.ts b/plugin-examples/provider-direct/server/provider.test.ts
new file mode 100644
index 0000000000..db7282df86
--- /dev/null
+++ b/plugin-examples/provider-direct/server/provider.test.ts
@@ -0,0 +1,169 @@
+import type { ProviderEvent } from "@getpaseo/plugin/server/provider";
+import { describe, expect, it } from "vitest";
+import { createDirectExampleProvider } from "./provider.js";
+
+describe("direct provider example", () => {
+  it("fails steering when no turn is active without creating a turn", async () => {
+    const connection = await createDirectExampleProvider().connect({
+      versions: [1],
+      capabilities: ["prompt.command", "prompt.message", "prompt.steer"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send({
+      type: "session.open",
+      requestId: "open-1",
+      sessionId: "session-1",
+      config: { cwd: "/repo", env: {}, mcpServers: {}, settings: {}, persist: false },
+      history: "skip",
+    });
+    const turnEventsBefore = events.filter((event) => event.type === "session.turn").length;
+
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-1",
+      prompt: {
+        clientMessageId: "steer-1",
+        delivery: "steer",
+        input: { type: "command", name: "reset", arguments: "" },
+      },
+    });
+
+    expect(events).toContainEqual({
+      type: "session.prompt_result",
+      sessionId: "session-1",
+      clientMessageId: "steer-1",
+      result: { type: "failed", error: { message: "There is no active turn to steer" } },
+    });
+    expect(events.filter((event) => event.type === "session.turn")).toHaveLength(turnEventsBefore);
+    expect(events).not.toContainEqual(expect.objectContaining({ type: "session.notice" }));
+    await connection.close();
+  });
+
+  it("demonstrates settings, commands, persistence, and provider-rendered timeline items", async () => {
+    const connection = await createDirectExampleProvider().connect({
+      versions: [1],
+      capabilities: [
+        "prompt.message",
+        "prompt.command",
+        "session.configure",
+        "session.persistence",
+        "session.subsession",
+        "timeline.plugin",
+      ],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send({
+      type: "session.open",
+      requestId: "open-complete",
+      sessionId: "session-complete",
+      config: {
+        cwd: "/repo",
+        env: { EXAMPLE: "1" },
+        systemPrompt: "Be useful",
+        mcpServers: {},
+        model: "example-1",
+        mode: "build",
+        settings: { concise: true, voice: "calm" },
+        providerOptions: { privateValue: 1 },
+        persist: true,
+      },
+      history: "skip",
+    });
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.config",
+        config: expect.objectContaining({
+          settings: expect.arrayContaining([
+            expect.objectContaining({ id: "concise", value: true }),
+            expect.objectContaining({ id: "voice", value: "calm" }),
+          ]),
+        }),
+      }),
+    );
+    expect(events).toContainEqual(expect.objectContaining({ type: "session.commands" }));
+
+    await connection.send({
+      type: "session.configure",
+      requestId: "configure-complete",
+      sessionId: "session-complete",
+      changes: { settings: { voice: "direct" } },
+    });
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-complete",
+      prompt: {
+        clientMessageId: "command-1",
+        delivery: "auto",
+        input: { type: "command", name: "reset", arguments: "" },
+      },
+    });
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-complete",
+      prompt: {
+        clientMessageId: "message-1",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "hello" }] },
+      },
+    });
+
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "session.prompt_result",
+        clientMessageId: "command-1",
+        result: { type: "completed" },
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({ type: "user_message", clientMessageId: "message-1" }),
+      }),
+    );
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        sessionId: "session-complete",
+        item: expect.objectContaining({ type: "plugin", kind: "provider-result" }),
+      }),
+    );
+    const child = events.find(
+      (event): event is Extract<ProviderEvent, { type: "session.opened" }> =>
+        event.type === "session.opened" && event.parentSessionId === "session-complete",
+    );
+    expect(child?.sessionId).toMatch(/^[0-9a-f-]{36}$/u);
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        sessionId: child?.sessionId,
+        item: expect.objectContaining({ type: "plugin", kind: "provider-result" }),
+      }),
+    );
+    expect(events).toContainEqual(expect.objectContaining({ type: "session.persistence" }));
+    await connection.close();
+  });
+
+  it("rejects calls after the example connection closes", async () => {
+    const connection = await createDirectExampleProvider().connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+
+    await connection.close();
+
+    await expect(
+      connection.send({ type: "catalog", requestId: "catalog-after-close" }),
+    ).rejects.toThrow("Provider connection is closed");
+    await expect(
+      connection.send({
+        type: "session.open",
+        requestId: "open-after-close",
+        sessionId: "closed-session",
+        config: { cwd: "/repo", env: {}, mcpServers: {}, settings: {}, persist: false },
+        history: "skip",
+      }),
+    ).rejects.toThrow("Provider connection is closed");
+  });
+});
diff --git a/plugin-examples/provider-direct/server/provider.ts b/plugin-examples/provider-direct/server/provider.ts
new file mode 100644
index 0000000000..31ea177dd6
--- /dev/null
+++ b/plugin-examples/provider-direct/server/provider.ts
@@ -0,0 +1,401 @@
+import {
+  negotiateProviderCapabilities,
+  requireProviderCapabilities,
+  type ProviderConfigState,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderPersistence,
+  type ProviderRegistration,
+  type ProviderSessionConfig,
+} from "@getpaseo/plugin/server/provider";
+import { randomUUID } from "node:crypto";
+import { providerResultKind } from "../shared/provider-result.js";
+
+const CAPABILITIES = [
+  "prompt.message",
+  "prompt.command",
+  "prompt.steer",
+  "session.archive",
+  "session.configure",
+  "session.list",
+  "session.persistence",
+  "session.subsession",
+  "session.unarchive",
+  "timeline.plugin",
+] as const;
+
+interface ExampleSession {
+  config: ProviderSessionConfig;
+  persistence: ProviderPersistence;
+  turn: number;
+  activeTurnId: string | null;
+}
+
+export function createDirectExampleProvider(): ProviderRegistration {
+  return {
+    id: "direct-example",
+    label: "Direct provider example",
+    description: "A complete provider implemented directly against Paseo's provider boundary",
+    icon: "icon.svg",
+    async connect(request) {
+      if (!request.versions.includes(1)) throw new Error("Provider protocol version 1 is required");
+      return createConnection(negotiateProviderCapabilities(request.capabilities, CAPABILITIES));
+    },
+  };
+}
+
+function createConnection(capabilities: readonly string[]): ProviderConnection {
+  const listeners = new Set<(event: ProviderEvent) => void>();
+  const sessions = new Map<string, ExampleSession>();
+  const archived = new Set<string>();
+  let closed = false;
+  const emit = (event: ProviderEvent) => {
+    if (closed) return;
+    for (const listener of listeners) listener(event);
+  };
+
+  return {
+    version: 1,
+    capabilities,
+    async send(input) {
+      if (closed) throw new Error("Provider connection is closed");
+      validateAdmission(input, { sessions, capabilities });
+      queueMicrotask(() => {
+        if (!closed) dispatch(input, { sessions, archived, emit, capabilities });
+      });
+    },
+    onEvent(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    async close() {
+      if (closed) return;
+      closed = true;
+      sessions.clear();
+      listeners.clear();
+    },
+  };
+}
+
+function validateAdmission(
+  input: ProviderInput,
+  state: Pick<ExampleState, "sessions" | "capabilities">,
+): void {
+  if (input.type === "session.open") {
+    if (state.sessions.has(input.sessionId)) {
+      throw new Error(`Session already exists: ${input.sessionId}`);
+    }
+    requireProviderCapabilities(state.capabilities, input);
+    return;
+  }
+  if (!("sessionId" in input)) {
+    requireProviderCapabilities(state.capabilities, input);
+    return;
+  }
+  const session = state.sessions.get(input.sessionId);
+  if (!session) throw new Error(`Unknown session: ${input.sessionId}`);
+  requireProviderCapabilities(state.capabilities, input);
+}
+
+interface ExampleState {
+  sessions: Map<string, ExampleSession>;
+  archived: Set<string>;
+  emit(event: ProviderEvent): void;
+  capabilities: readonly string[];
+}
+
+function dispatch(input: ProviderInput, state: ExampleState): void {
+  switch (input.type) {
+    case "catalog":
+      state.emit({
+        type: "catalog",
+        requestId: input.requestId,
+        catalog: {
+          models: [{ id: "example-1", label: "Example 1" }],
+          modes: [{ id: "build", label: "Build" }],
+          defaultModel: "example-1",
+          defaultMode: "build",
+        },
+      });
+      return;
+    case "sessions":
+      state.emit({
+        type: "sessions",
+        requestId: input.requestId,
+        sessions: [...state.sessions.values()].map((session) => ({
+          persistence: session.persistence,
+          cwd: session.config.cwd,
+          title: session.config.title,
+        })),
+      });
+      return;
+    case "session.open":
+      openSession(input, state);
+      return;
+    case "session.prompt":
+      promptSession(input, state);
+      return;
+    case "session.configure":
+      configureSession(input, state);
+      return;
+    case "session.interrupt":
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    case "session.permission":
+      state.emit({
+        type: "session.permission_resolved",
+        sessionId: input.sessionId,
+        permissionId: input.permissionId,
+      });
+      return;
+    case "session.revert":
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    case "session.archive":
+      state.archived.add(persistenceKey(input.persistence));
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    case "session.unarchive":
+      state.archived.delete(persistenceKey(input.persistence));
+      state.emit({ type: "request.completed", requestId: input.requestId });
+      return;
+    case "session.close":
+      state.sessions.delete(input.sessionId);
+      state.emit({ type: "session.closed", sessionId: input.sessionId });
+      state.emit({ type: "request.completed", requestId: input.requestId });
+  }
+}
+
+function openSession(
+  input: Extract<ProviderInput, { type: "session.open" }>,
+  state: ExampleState,
+): void {
+  const persistence = input.persistence ?? {
+    version: 1,
+    data: { nativeSessionId: `example:${input.sessionId}` },
+  };
+  const session: ExampleSession = {
+    config: input.config,
+    persistence,
+    turn: 0,
+    activeTurnId: null,
+  };
+  state.sessions.set(input.sessionId, session);
+  state.emit({
+    type: "session.opened",
+    requestId: input.requestId,
+    sessionId: input.sessionId,
+    capabilities: state.capabilities,
+    restoration: "core",
+    persistence,
+    title: input.config.title,
+    cwd: input.config.cwd,
+  });
+  state.emit({ type: "session.config", sessionId: input.sessionId, config: configState(session) });
+  state.emit({
+    type: "session.commands",
+    sessionId: input.sessionId,
+    commands: [{ name: "reset", description: "Reset the example provider state" }],
+  });
+  if (input.history === "replay" && input.persistence) {
+    state.emit({
+      type: "timeline.item",
+      sessionId: input.sessionId,
+      item: { type: "assistant_message", id: "replayed-1", text: "Restored from persistence" },
+    });
+  }
+  state.emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+}
+
+function promptSession(
+  input: Extract<ProviderInput, { type: "session.prompt" }>,
+  state: ExampleState,
+): void {
+  const session = requireSession(state, input.sessionId);
+  if (input.prompt.delivery === "steer") {
+    if (!session.activeTurnId) {
+      state.emit({
+        type: "session.prompt_result",
+        sessionId: input.sessionId,
+        clientMessageId: input.prompt.clientMessageId,
+        result: { type: "failed", error: { message: "There is no active turn to steer" } },
+      });
+      return;
+    }
+    state.emit({
+      type: "session.prompt_result",
+      sessionId: input.sessionId,
+      clientMessageId: input.prompt.clientMessageId,
+      result: { type: "steer", turnId: session.activeTurnId },
+    });
+    return;
+  }
+
+  if (input.prompt.input.type === "command") {
+    if (input.prompt.input.name !== "reset") {
+      state.emit({
+        type: "session.prompt_result",
+        sessionId: input.sessionId,
+        clientMessageId: input.prompt.clientMessageId,
+        result: { type: "failed", error: { message: "Unknown command" } },
+      });
+      return;
+    }
+    session.turn = 0;
+    state.emit({
+      type: "session.notice",
+      sessionId: input.sessionId,
+      notice: { id: "reset", severity: "info", title: "Example state reset" },
+    });
+    state.emit({
+      type: "session.prompt_result",
+      sessionId: input.sessionId,
+      clientMessageId: input.prompt.clientMessageId,
+      result: { type: "completed" },
+    });
+    return;
+  }
+
+  session.turn += 1;
+  const turnId = `turn-${session.turn}`;
+  session.activeTurnId = turnId;
+  const text = input.prompt.input.content
+    .filter((part) => part.type === "text")
+    .map((part) => part.text)
+    .join("\n");
+  state.emit({
+    type: "timeline.item",
+    sessionId: input.sessionId,
+    item: {
+      type: "user_message",
+      id: `user-${session.turn}`,
+      text,
+      clientMessageId: input.prompt.clientMessageId,
+    },
+  });
+  state.emit({
+    type: "session.prompt_result",
+    sessionId: input.sessionId,
+    clientMessageId: input.prompt.clientMessageId,
+    result: { type: "turn", turnId },
+  });
+  state.emit({ type: "session.turn", sessionId: input.sessionId, turnId, state: "started" });
+  state.emit({
+    type: "timeline.item",
+    sessionId: input.sessionId,
+    item: { type: "assistant_message", id: `assistant-${session.turn}`, text: `Echo: ${text}` },
+  });
+  state.emit({
+    type: "timeline.item",
+    sessionId: input.sessionId,
+    item: {
+      type: "plugin",
+      id: `provider-result-${session.turn}`,
+      pluginId: "provider-direct-example",
+      kind: providerResultKind,
+      version: 1,
+      data: { label: "Provider result", detail: `Echoed turn ${session.turn}` },
+    },
+  });
+  publishChild(input.sessionId, session.turn, state);
+  session.persistence = {
+    version: 1,
+    data: { nativeSessionId: `example:${input.sessionId}`, turns: session.turn },
+  };
+  state.emit({
+    type: "session.persistence",
+    sessionId: input.sessionId,
+    persistence: session.persistence,
+  });
+  state.emit({ type: "session.turn", sessionId: input.sessionId, turnId, state: "completed" });
+  session.activeTurnId = null;
+}
+
+function publishChild(parentSessionId: string, turn: number, state: ExampleState): void {
+  const sessionId = randomUUID();
+  state.emit({
+    type: "session.opened",
+    sessionId,
+    parentSessionId,
+    capabilities: [],
+    restoration: "parent",
+    title: "Example child",
+    cwd: requireSession(state, parentSessionId).config.cwd,
+  });
+  state.emit({
+    type: "timeline.item",
+    sessionId,
+    item: {
+      type: "plugin",
+      id: `child-result-${turn}`,
+      pluginId: "provider-direct-example",
+      kind: providerResultKind,
+      version: 1,
+      data: { label: "Child result", detail: "Completed" },
+    },
+  });
+  state.emit({ type: "session.ready", sessionId });
+}
+
+function configureSession(
+  input: Extract<ProviderInput, { type: "session.configure" }>,
+  state: ExampleState,
+): void {
+  const session = requireSession(state, input.sessionId);
+  const changes = input.changes;
+  session.config = {
+    ...session.config,
+    model: changes.model === null ? undefined : (changes.model ?? session.config.model),
+    mode: changes.mode === null ? undefined : (changes.mode ?? session.config.mode),
+    thinkingOption:
+      changes.thinkingOption === null
+        ? undefined
+        : (changes.thinkingOption ?? session.config.thinkingOption),
+    settings: changes.settings
+      ? { ...session.config.settings, ...changes.settings }
+      : session.config.settings,
+  };
+  state.emit({ type: "session.config", sessionId: input.sessionId, config: configState(session) });
+  state.emit({ type: "request.completed", requestId: input.requestId });
+}
+
+function configState(session: ExampleSession): ProviderConfigState {
+  return {
+    model: session.config.model ?? "example-1",
+    mode: session.config.mode ?? "build",
+    thinkingOption: session.config.thinkingOption,
+    models: [{ id: "example-1", label: "Example 1" }],
+    modes: [{ id: "build", label: "Build" }],
+    thinkingOptions: [],
+    settings: [
+      {
+        type: "toggle",
+        id: "concise",
+        label: "Concise responses",
+        value: session.config.settings.concise === true,
+      },
+      {
+        type: "select",
+        id: "voice",
+        label: "Voice",
+        value:
+          typeof session.config.settings.voice === "string" ? session.config.settings.voice : null,
+        options: [
+          { label: "Calm", value: "calm" },
+          { label: "Direct", value: "direct" },
+        ],
+      },
+    ],
+  };
+}
+
+function requireSession(state: ExampleState, sessionId: string): ExampleSession {
+  const session = state.sessions.get(sessionId);
+  if (!session) throw new Error(`Unknown session: ${sessionId}`);
+  return session;
+}
+
+function persistenceKey(persistence: ProviderPersistence): string {
+  return JSON.stringify(persistence);
+}
diff --git a/plugin-examples/provider-direct/shared/provider-result.ts b/plugin-examples/provider-direct/shared/provider-result.ts
new file mode 100644
index 0000000000..40ba0324bb
--- /dev/null
+++ b/plugin-examples/provider-direct/shared/provider-result.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const providerResultKind = "provider-result";
+
+export const providerResultSchema = z.object({
+  label: z.string(),
+  detail: z.string(),
+});
diff --git a/plugin-examples/settings/README.md b/plugin-examples/settings/README.md
new file mode 100644
index 0000000000..45a896d63e
--- /dev/null
+++ b/plugin-examples/settings/README.md
@@ -0,0 +1,14 @@
+# Settings example
+
+Install this directory with `paseo plugin install /absolute/path/to/plugin-examples/settings`.
+Open Settings → Plugins → settings-example → Display, or run **Configure agent monitor** in Command Center.
+
+The select and switch save immediately. The title editor keeps a draft and its original revision,
+so another client's save produces a conflict instead of overwriting its changes. Close and reopen
+the editor to discard the draft and use the latest settings.
+
+Every UI component is a plain named import. The custom preview shares the same values without
+using a form wrapper. Values are shared by clients connected to the same host.
+
+The same screen on [Android](screenshots/android.png), [Electron](screenshots/electron.png),
+and [compact web](screenshots/web-compact.png).
diff --git a/plugin-examples/settings/client/display-settings.tsx b/plugin-examples/settings/client/display-settings.tsx
new file mode 100644
index 0000000000..36999c7a45
--- /dev/null
+++ b/plugin-examples/settings/client/display-settings.tsx
@@ -0,0 +1,149 @@
+import { useCallback, useMemo, useState } from "react";
+import { Text, View } from "react-native";
+import { useSettings, type PluginSurfaceProps } from "@getpaseo/plugin/client";
+import type { SettingsState } from "@getpaseo/plugin/client";
+import {
+  SettingsAction,
+  SettingsCard,
+  SettingsInput,
+  SettingsRow,
+  SettingsSection,
+  SettingsSelect,
+  SettingsSwitch,
+} from "@getpaseo/plugin/client/ui";
+import { preferences } from "../shared/preferences";
+
+const grouping = [
+  { label: "Project", value: "project" },
+  { label: "Workspace", value: "workspace" },
+  { label: "None", value: "none" },
+] as const;
+type Preferences = Extract<SettingsState<typeof preferences.schema>, { status: "ready" }>;
+
+function TitleEditor({ settings, onClose }: { settings: Preferences; onClose(): void }) {
+  // Keep the draft's revision so another client's save produces a conflict.
+  const [draft, setDraft] = useState(() => ({
+    values: settings.values,
+    revision: settings.revision,
+  }));
+  const changeTitle = useCallback(
+    (title: string) =>
+      setDraft((current) => ({ ...current, values: { ...current.values, title } })),
+    [],
+  );
+  const saveTitle = useCallback(async () => {
+    if (await settings.save(draft.values, draft.revision)) onClose();
+  }, [settings, draft, onClose]);
+  return (
+    <SettingsCard>
+      <SettingsInput
+        label="Monitor title"
+        initialValue={draft.values.title}
+        onChangeText={changeTitle}
+        disabled={settings.saving}
+        error={settings.saveError}
+      />
+      <SettingsAction
+        label="Title changes"
+        actionLabel="Save title"
+        disabled={settings.saving}
+        onPress={saveTitle}
+      />
+      <SettingsAction
+        label="Discard title changes"
+        actionLabel="Discard"
+        disabled={settings.saving}
+        onPress={onClose}
+      />
+    </SettingsCard>
+  );
+}
+
+function DisplayControls({
+  settings,
+  theme,
+}: {
+  settings: Preferences;
+  theme: PluginSurfaceProps["theme"];
+}) {
+  const style = useMemo(() => ({ color: theme.colors.foreground }), [theme]);
+  const [editingTitle, setEditingTitle] = useState(false);
+  const closeTitle = useCallback(() => {
+    setEditingTitle(false);
+    void settings.reload();
+  }, [settings]);
+  const toggleTitle = useCallback(() => setEditingTitle((value) => !value), []);
+  const changeGrouping = useCallback(
+    (groupBy: Preferences["values"]["groupBy"]) => {
+      void settings.save({ ...settings.values, groupBy }, settings.revision);
+    },
+    [settings],
+  );
+  const changeMetadata = useCallback(
+    (showMetadata: boolean) => {
+      void settings.save({ ...settings.values, showMetadata }, settings.revision);
+    },
+    [settings],
+  );
+  return (
+    <SettingsSection title="Display">
+      <SettingsCard>
+        <SettingsSelect
+          label="Group agents by"
+          value={settings.values.groupBy}
+          options={grouping}
+          disabled={settings.saving}
+          onValueChange={changeGrouping}
+        />
+        <SettingsSwitch
+          label="Show metadata"
+          value={settings.values.showMetadata}
+          disabled={settings.saving}
+          onValueChange={changeMetadata}
+        />
+        <SettingsAction
+          label="Monitor title"
+          actionLabel={editingTitle ? "Close editor" : "Edit title"}
+          disabled={settings.saving}
+          onPress={toggleTitle}
+        />
+      </SettingsCard>
+      {editingTitle ? <TitleEditor settings={settings} onClose={closeTitle} /> : null}
+      {settings.saveError && !editingTitle ? (
+        <Text accessibilityRole="alert" style={style}>
+          {settings.saveError}
+        </Text>
+      ) : null}
+      <SettingsRow label="Preview">
+        <View>
+          <Text style={style}>{settings.values.title}</Text>
+          <Text style={style}>Grouped by {settings.values.groupBy}</Text>
+          <Text style={style}>
+            {settings.values.showMetadata ? "Metadata visible" : "Metadata hidden"}
+          </Text>
+        </View>
+      </SettingsRow>
+    </SettingsSection>
+  );
+}
+
+export function DisplaySettings({ theme }: PluginSurfaceProps) {
+  const settings = useSettings(preferences);
+  const style = useMemo(() => ({ color: theme.colors.foreground }), [theme]);
+  if (settings.status === "loading") return <Text style={style}>Loading settings…</Text>;
+  if (settings.status !== "ready")
+    return (
+      <SettingsSection title="Display">
+        <Text style={style}>{settings.error}</Text>
+        <SettingsAction label="Try again" actionLabel="Reload" onPress={settings.reload} />
+        {settings.status === "invalid" ? (
+          <SettingsAction
+            label="Restore default settings"
+            actionLabel="Reset"
+            onPress={settings.reset}
+          />
+        ) : null}
+      </SettingsSection>
+    );
+  return <DisplayControls settings={settings} theme={theme} />;
+}
diff --git a/plugin-examples/settings/index.client.tsx b/plugin-examples/settings/index.client.tsx
new file mode 100644
index 0000000000..7e7a2dfedc
--- /dev/null
+++ b/plugin-examples/settings/index.client.tsx
@@ -0,0 +1,21 @@
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { DisplaySettings } from "./client/display-settings";
+
+export default function contribute(client: PluginClientContext) {
+  client.addSettingsScreen({
+    id: "display",
+    title: "Display",
+    icon: "SlidersHorizontal",
+    Component: DisplaySettings,
+  });
+  client.addCommandCenterItem({
+    id: "settings",
+    title: "Configure agent monitor",
+    icon: "Settings",
+    context: "global",
+    onSelect({ openSettings }) {
+      openSettings("display");
+    },
+  });
+  return () => {};
+}
diff --git a/plugin-examples/settings/index.server.ts b/plugin-examples/settings/index.server.ts
new file mode 100644
index 0000000000..1dd653a091
--- /dev/null
+++ b/plugin-examples/settings/index.server.ts
@@ -0,0 +1,7 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { preferences } from "./shared/preferences";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerSettings(preferences);
+  return () => {};
+}
diff --git a/plugin-examples/settings/paseo-plugin.json b/plugin-examples/settings/paseo-plugin.json
new file mode 100644
index 0000000000..4fae276fe8
--- /dev/null
+++ b/plugin-examples/settings/paseo-plugin.json
@@ -0,0 +1,6 @@
+{
+  "id": "settings-example",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
+}
diff --git a/plugin-examples/settings/screenshots/android.png b/plugin-examples/settings/screenshots/android.png
new file mode 100644
index 0000000000..41e09458c7
Binary files /dev/null and b/plugin-examples/settings/screenshots/android.png differ
diff --git a/plugin-examples/settings/screenshots/electron.png b/plugin-examples/settings/screenshots/electron.png
new file mode 100644
index 0000000000..0a22ed26b4
Binary files /dev/null and b/plugin-examples/settings/screenshots/electron.png differ
diff --git a/plugin-examples/settings/screenshots/web-compact.png b/plugin-examples/settings/screenshots/web-compact.png
new file mode 100644
index 0000000000..d0b5174d66
Binary files /dev/null and b/plugin-examples/settings/screenshots/web-compact.png differ
diff --git a/plugin-examples/settings/shared/preferences.ts b/plugin-examples/settings/shared/preferences.ts
new file mode 100644
index 0000000000..f001cae934
--- /dev/null
+++ b/plugin-examples/settings/shared/preferences.ts
@@ -0,0 +1,13 @@
+import { defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+
+export const preferences = defineSettings({
+  id: "display",
+  scope: "host",
+  version: 1,
+  schema: z.object({
+    groupBy: z.enum(["project", "workspace", "none"]).default("project"),
+    showMetadata: z.boolean().default(true),
+    title: z.string().trim().min(1, "Enter a title").max(40).default("Agent monitor"),
+  }),
+});
diff --git a/plugin-examples/timeline-items/client/pi-tasks.tsx b/plugin-examples/timeline-items/client/pi-tasks.tsx
index 4d7329a18a..f9b68edc62 100644
--- a/plugin-examples/timeline-items/client/pi-tasks.tsx
+++ b/plugin-examples/timeline-items/client/pi-tasks.tsx
@@ -1,4 +1,4 @@
-import type { PluginTimelineItemProps } from "@getpaseo/plugin";
+import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
 import { useMemo } from "react";
 import { Text, View } from "react-native";
 import type { z } from "zod";
diff --git a/plugin-examples/timeline-items/client/transform-pi-tasks.ts b/plugin-examples/timeline-items/client/transform-pi-tasks.ts
new file mode 100644
index 0000000000..b41a2a003c
--- /dev/null
+++ b/plugin-examples/timeline-items/client/transform-pi-tasks.ts
@@ -0,0 +1,72 @@
+import type { PluginTimelineTransformerContribution } from "@getpaseo/plugin/client";
+import { z } from "zod";
+import { piTaskListSchema } from "../shared/pi-tasks";
+
+const rpivDetailsSchema = z.object({
+  tasks: z.array(
+    z
+      .object({
+        subject: z.string(),
+        status: z.enum(["pending", "in_progress", "completed", "deleted"]),
+      })
+      .passthrough(),
+  ),
+});
+
+const piExampleDetailsSchema = z.object({
+  todos: z.array(
+    z
+      .object({
+        id: z.number().int().optional(),
+        text: z.string(),
+        done: z.boolean(),
+      })
+      .passthrough(),
+  ),
+});
+
+type PiTask = z.output<typeof piTaskListSchema>["tasks"][number];
+type ToolCallTransformer = PluginTimelineTransformerContribution<"tool_call">["transform"];
+
+function replacement(tasks: PiTask[]) {
+  if (tasks.length === 0) return;
+  return {
+    items: [
+      {
+        type: "plugin" as const,
+        kind: "pi-task-list",
+        version: 1,
+        data: { tasks },
+      },
+    ],
+  };
+}
+
+export const transformPiTodoToolCall: ToolCallTransformer = ({ item }) => {
+  if (item.name !== "todo" || item.detail.type !== "unknown") {
+    return;
+  }
+
+  const result = item.detail.output;
+  if (!result || typeof result !== "object" || Array.isArray(result)) return;
+  const details = Reflect.get(result, "details");
+
+  const rpiv = rpivDetailsSchema.safeParse(details);
+  if (rpiv.success) {
+    return replacement(
+      rpiv.data.tasks.flatMap((task): PiTask[] =>
+        task.status === "deleted" ? [] : [{ text: task.subject, status: task.status }],
+      ),
+    );
+  }
+
+  const piExample = piExampleDetailsSchema.safeParse(details);
+  if (piExample.success) {
+    return replacement(
+      piExample.data.todos.map((todo) => ({
+        text: todo.text,
+        status: todo.done ? "completed" : "pending",
+      })),
+    );
+  }
+};
diff --git a/plugin-examples/timeline-items/index.client.tsx b/plugin-examples/timeline-items/index.client.tsx
index 09724b095b..9e8c488320 100644
--- a/plugin-examples/timeline-items/index.client.tsx
+++ b/plugin-examples/timeline-items/index.client.tsx
@@ -1,6 +1,7 @@
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { PiTaskList } from "./client/pi-tasks";
-import { piTaskListSchema, transformPiTodoToolCall } from "./shared/pi-tasks";
+import { piTaskListSchema } from "./shared/pi-tasks";
+import { transformPiTodoToolCall } from "./client/transform-pi-tasks";
 
 export default function contribute(client: PluginClientContext) {
   client.addTimelineTransformer({
diff --git a/plugin-examples/timeline-items/paseo-plugin.json b/plugin-examples/timeline-items/paseo-plugin.json
index 8778b30780..bdcfe32470 100644
--- a/plugin-examples/timeline-items/paseo-plugin.json
+++ b/plugin-examples/timeline-items/paseo-plugin.json
@@ -1,3 +1,6 @@
 {
-  "id": "pi-tasks-timeline"
+  "id": "pi-tasks-timeline",
+  "requirements": {
+    "paseo": ">=0.8.0"
+  }
 }
diff --git a/plugin-examples/timeline-items/pi-tasks.test.ts b/plugin-examples/timeline-items/pi-tasks.test.ts
index 80fbbcd579..8007365cd0 100644
--- a/plugin-examples/timeline-items/pi-tasks.test.ts
+++ b/plugin-examples/timeline-items/pi-tasks.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { transformPiTodoToolCall } from "./shared/pi-tasks";
+import { transformPiTodoToolCall } from "./client/transform-pi-tasks";
 
 function completedTodo(output: unknown) {
   return {
diff --git a/plugin-examples/timeline-items/shared/pi-tasks.ts b/plugin-examples/timeline-items/shared/pi-tasks.ts
index 0e7c7c739c..91c60617f1 100644
--- a/plugin-examples/timeline-items/shared/pi-tasks.ts
+++ b/plugin-examples/timeline-items/shared/pi-tasks.ts
@@ -1,31 +1,7 @@
-import type { PluginTimelineTransformerContribution } from "@getpaseo/plugin";
 import { z } from "zod";
 
 const taskStatusSchema = z.enum(["pending", "in_progress", "completed"]);
 
-const rpivDetailsSchema = z.object({
-  tasks: z.array(
-    z
-      .object({
-        subject: z.string(),
-        status: z.enum(["pending", "in_progress", "completed", "deleted"]),
-      })
-      .passthrough(),
-  ),
-});
-
-const piExampleDetailsSchema = z.object({
-  todos: z.array(
-    z
-      .object({
-        id: z.number().int().optional(),
-        text: z.string(),
-        done: z.boolean(),
-      })
-      .passthrough(),
-  ),
-});
-
 export const piTaskListSchema = z.object({
   tasks: z.array(
     z.object({
@@ -34,49 +10,3 @@ export const piTaskListSchema = z.object({
     }),
   ),
 });
-
-type PiTask = z.output<typeof piTaskListSchema>["tasks"][number];
-type ToolCallTransformer = PluginTimelineTransformerContribution<"tool_call">["transform"];
-
-function replacement(tasks: PiTask[]) {
-  if (tasks.length === 0) return;
-  return {
-    items: [
-      {
-        type: "plugin" as const,
-        kind: "pi-task-list",
-        version: 1,
-        data: { tasks },
-      },
-    ],
-  };
-}
-
-export const transformPiTodoToolCall: ToolCallTransformer = ({ item }) => {
-  if (item.name !== "todo" || item.detail.type !== "unknown") {
-    return;
-  }
-
-  const result = item.detail.output;
-  if (!result || typeof result !== "object" || Array.isArray(result)) return;
-  const details = Reflect.get(result, "details");
-
-  const rpiv = rpivDetailsSchema.safeParse(details);
-  if (rpiv.success) {
-    return replacement(
-      rpiv.data.tasks.flatMap((task): PiTask[] =>
-        task.status === "deleted" ? [] : [{ text: task.subject, status: task.status }],
-      ),
-    );
-  }
-
-  const piExample = piExampleDetailsSchema.safeParse(details);
-  if (piExample.success) {
-    return replacement(
-      piExample.data.todos.map((todo) => ({
-        text: todo.text,
-        status: todo.done ? "completed" : "pending",
-      })),
-    );
-  }
-};
diff --git a/plugins/antigravity-provider/icon.svg b/plugins/antigravity-provider/icon.svg
new file mode 100644
index 0000000000..0576d92a87
--- /dev/null
+++ b/plugins/antigravity-provider/icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+  <path transform="translate(12 12) scale(0.24) translate(-55.738 -56.945)" d="M89.6992 93.695C94.3659 97.195 101.366 94.8617 94.9492 88.445C75.6992 69.7783 79.7825 18.445 55.8659 18.445C31.9492 18.445 36.0325 69.7783 16.7825 88.445C9.78251 95.445 17.3658 97.195 22.0325 93.695C40.1159 81.445 38.9492 59.8617 55.8659 59.8617C72.7825 59.8617 71.6159 81.445 89.6992 93.695Z"/>
+</svg>
diff --git a/plugins/antigravity-provider/index.server.ts b/plugins/antigravity-provider/index.server.ts
new file mode 100644
index 0000000000..661fa8445d
--- /dev/null
+++ b/plugins/antigravity-provider/index.server.ts
@@ -0,0 +1,7 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createAntigravityProvider } from "./server/provider.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(createAntigravityProvider());
+  return () => {};
+}
diff --git a/plugins/antigravity-provider/paseo-plugin.json b/plugins/antigravity-provider/paseo-plugin.json
new file mode 100644
index 0000000000..ce6b2834f2
--- /dev/null
+++ b/plugins/antigravity-provider/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "antigravity-provider", "requirements": { "paseo": ">=0.10.0" } }
diff --git a/plugins/antigravity-provider/server/internal/catalog.ts b/plugins/antigravity-provider/server/internal/catalog.ts
new file mode 100644
index 0000000000..b68c87f178
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/catalog.ts
@@ -0,0 +1,74 @@
+import type {
+  ProviderCatalog,
+  ProviderLaunch,
+  ProviderModel,
+  ProviderMode,
+  ProviderStatus,
+} from "@getpaseo/plugin/server/provider";
+import { probe } from "./process.js";
+import { AntigravityError } from "./wire.js";
+
+const modes: readonly ProviderMode[] = [
+  {
+    id: "full-access",
+    icon: "ShieldOff",
+    colorTier: "dangerous",
+    label: "Full access",
+    description:
+      "Antigravity cannot ask for permission when another app drives it. Paseo starts it with --dangerously-skip-permissions.",
+    isUnattended: true,
+  },
+];
+
+export async function getCatalog(launch: ProviderLaunch, cwd?: string): Promise<ProviderCatalog> {
+  const output = await probe({ launch, args: ["models"], cwd });
+  const models: ProviderModel[] = [];
+  for (const line of output.trim().split(/\r?\n/)) {
+    const [id, label, ...extra] = line.split("\t");
+    if (!id || !label || extra.length > 0)
+      throw new AntigravityError("Invalid `agy models` output", "INVALID_CATALOG");
+    if (models.some((model) => model.id === id))
+      throw new AntigravityError(`Duplicate Antigravity model: ${id}`, "INVALID_CATALOG");
+    models.push({ id, label });
+  }
+  return { models, modes, thinkingOptions: [], defaultMode: "full-access" };
+}
+
+export async function getStatus(launch: ProviderLaunch): Promise<ProviderStatus> {
+  try {
+    const version = (await probe({ launch, args: ["--version"] })).trim();
+    const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version);
+    if (!match)
+      return {
+        available: false,
+        diagnostic: "Could not read the Antigravity version. Update `agy` to 1.1.15 or later.",
+      };
+    const [, major, minor, patch] = match.map(Number);
+    const supported = major > 1 || (major === 1 && (minor > 1 || (minor === 1 && patch >= 15)));
+    if (!supported)
+      return {
+        available: false,
+        diagnostic: `Antigravity ${version} is unsupported. Update \`agy\` to 1.1.15 or later.`,
+      };
+    await getCatalog(launch);
+    return { available: true };
+  } catch (error) {
+    if (!(error instanceof AntigravityError)) throw error;
+    return { available: false, diagnostic: error.message };
+  }
+}
+
+export function validateSelection(
+  config: { model?: string; mode?: string; thinkingOption?: string },
+  catalog: ProviderCatalog,
+): void {
+  if (config.model && !catalog.models.some((model) => model.id === config.model))
+    throw new AntigravityError(`Unknown Antigravity model: ${config.model}`, "INVALID_MODEL");
+  if (config.mode && !catalog.modes.some((mode) => mode.id === config.mode))
+    throw new AntigravityError(`Unknown Antigravity mode: ${config.mode}`, "INVALID_MODE");
+  if (config.thinkingOption)
+    throw new AntigravityError(
+      "Antigravity effort is selected through the model ID",
+      "UNSUPPORTED_THINKING",
+    );
+}
diff --git a/plugins/antigravity-provider/server/internal/process.ts b/plugins/antigravity-provider/server/internal/process.ts
new file mode 100644
index 0000000000..c87a17aadb
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/process.ts
@@ -0,0 +1,224 @@
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
+import { spawnProcess } from "@getpaseo/plugin/server";
+import { signalProcess } from "./signals.js";
+import { createInterface } from "node:readline";
+import type { ProviderLaunch, ProviderSessionConfig } from "@getpaseo/plugin/server/provider";
+import {
+  AntigravityError,
+  decodeFrame,
+  diagnostic,
+  encodePrompt,
+  type Frame,
+  type Init,
+} from "./wire.js";
+
+interface DriverOptions {
+  launch: ProviderLaunch;
+  config: ProviderSessionConfig;
+  conversationId: string | null;
+  onFrame(frame: Frame): void;
+  onExit(error: AntigravityError): void;
+}
+
+export interface Driver {
+  ready: Promise<Init>;
+  selection: string;
+  prompt(text: string): Promise<void>;
+  stop(reason: "interrupt" | "close"): Promise<void>;
+}
+
+export function selection(config: ProviderSessionConfig): string {
+  return JSON.stringify([config.model, config.mode]);
+}
+
+function driverArgs(options: DriverOptions): string[] {
+  const { config, conversationId } = options;
+  const args = [
+    ...options.launch.args,
+    "--input-format",
+    "stream-json",
+    "--output-format",
+    "stream-json",
+    "--add-dir",
+    config.cwd,
+    "--disable-slash-commands",
+    "--dangerously-skip-permissions",
+  ];
+  if (config.model) args.push("--model", config.model);
+  if (conversationId) args.push("--conversation", conversationId);
+  return args;
+}
+
+export function startDriver(options: DriverOptions): Driver {
+  const child = spawnProcess(options.launch.command, driverArgs(options), {
+    cwd: options.config.cwd,
+    env: { ...options.launch.env, ...options.config.env },
+    detached: process.platform !== "win32",
+    stdio: "pipe",
+  });
+  const lines = createInterface({ input: child.stdout });
+  let cleanup = Promise.resolve();
+  let stderr = "";
+  let state: "starting" | "ready" | "stopping" | "exited" = "starting";
+  let resolveReady: (init: Init) => void;
+  let rejectReady: (error: Error) => void;
+  const ready = new Promise<Init>((resolve, reject) => {
+    resolveReady = resolve;
+    rejectReady = reject;
+  });
+  let resolveExit: () => void;
+  const exited = new Promise<void>((resolve) => {
+    resolveExit = resolve;
+  });
+  const startupDeadline = setTimeout(
+    () =>
+      fail(
+        new AntigravityError("Antigravity did not initialize within 30 seconds", "STARTUP_TIMEOUT"),
+      ),
+    30_000,
+  );
+  child.stderr.on("data", (chunk: Buffer) => {
+    stderr = (stderr + chunk.toString()).slice(-8192);
+  });
+  child.stdin.on("error", (error: Error) =>
+    fail(new AntigravityError(error.message, "STDIN_ERROR")),
+  );
+  child.on("error", (error: Error) => fail(new AntigravityError(error.message, "SPAWN_ERROR")));
+  child.on("close", (code, signal) => {
+    clearTimeout(startupDeadline);
+    lines.close();
+    const error = new AntigravityError(
+      diagnostic(stderr.trim() || `Antigravity exited (${signal || code})`),
+      "PROCESS_EXIT",
+    );
+    if (state === "starting") rejectReady(error);
+    if (state === "ready") options.onExit(error);
+    state = "exited";
+    resolveExit();
+  });
+  lines.on("line", (line) => {
+    if (!line.trim() || state === "exited" || state === "stopping") return;
+    let decoded: Frame;
+    try {
+      decoded = decodeFrame(line);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      fail(new AntigravityError(`Invalid Antigravity output: ${message}`, "INVALID_FRAME"));
+      return;
+    }
+    if (state === "starting") {
+      if (decoded.event === "init") {
+        clearTimeout(startupDeadline);
+        state = "ready";
+        resolveReady(decoded);
+      } else if (decoded.event === "result") {
+        fail(new AntigravityError(diagnostic(decoded.result.error), "STARTUP_ERROR"));
+      }
+      return;
+    }
+    options.onFrame(decoded);
+  });
+
+  function fail(failure: AntigravityError): void {
+    clearTimeout(startupDeadline);
+    if (state === "starting") rejectReady(failure);
+    if (state === "ready") options.onExit(failure);
+    if (state === "exited" || state === "stopping") return;
+    state = "stopping";
+    cleanup = Promise.resolve(signalGroup(child, "SIGKILL"));
+    // The stop operation awaits cleanup and owns reporting its failure.
+    void cleanup.catch(() => undefined);
+  }
+
+  return {
+    ready,
+    selection: selection(options.config),
+    prompt(text) {
+      if (state !== "ready")
+        return Promise.reject(new AntigravityError("Antigravity is not ready"));
+      return new Promise<void>((resolve, reject) => {
+        child.stdin.write(encodePrompt(text), (error) => {
+          if (error) reject(error);
+          else resolve();
+        });
+      });
+    },
+    async stop(reason) {
+      if (process.platform === "win32") await cleanup;
+      if (state === "exited") return;
+      if (state === "starting") rejectReady(new AntigravityError("Antigravity startup canceled"));
+      clearTimeout(startupDeadline);
+      state = "stopping";
+      if (process.platform === "win32") {
+        // Node signal emulation kills only the leader; taskkill must see the live tree.
+        cleanup = Promise.resolve(signalGroup(child, "SIGKILL"));
+        await cleanup;
+        await exited;
+        return;
+      }
+      if (reason === "close") child.stdin.end();
+      else signalGroup(child, "SIGINT");
+      const terminate = setTimeout(() => signalGroup(child, "SIGTERM"), 1000);
+      const kill = setTimeout(() => signalGroup(child, "SIGKILL"), 2000);
+      await exited;
+      clearTimeout(terminate);
+      clearTimeout(kill);
+      // A tool can keep running after its CLI leader exits.
+      signalGroup(child, "SIGKILL");
+    },
+  };
+}
+
+function signalGroup(
+  child: ChildProcessWithoutNullStreams,
+  signal: NodeJS.Signals,
+): void | Promise<void> {
+  if (!child.pid) return;
+  return signalProcess({ platform: process.platform, pid: child.pid, signal });
+}
+
+interface ProbeOptions {
+  launch: ProviderLaunch;
+  args: string[];
+  cwd?: string;
+}
+export function probe(options: ProbeOptions): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const child = spawnProcess(options.launch.command, [...options.launch.args, ...options.args], {
+      env: options.launch.env,
+      cwd: options.cwd,
+      stdio: "pipe",
+      detached: process.platform !== "win32",
+    });
+    let stdout = "";
+    let stderr = "";
+    const deadline = setTimeout(() => {
+      const termination = Promise.resolve(signalGroup(child, "SIGKILL"));
+      void termination.then(() => {
+        reject(new AntigravityError("Antigravity discovery timed out", "PROBE_TIMEOUT"));
+        return undefined;
+      }, reject);
+    }, 10_000);
+    child.stdout.on("data", (chunk: Buffer) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk: Buffer) => {
+      stderr = (stderr + chunk.toString()).slice(-8192);
+    });
+    child.on("error", (error: Error) => {
+      clearTimeout(deadline);
+      reject(new AntigravityError(error.message, "SPAWN_ERROR"));
+    });
+    child.on("close", (code) => {
+      clearTimeout(deadline);
+      if (code === 0) resolve(stdout);
+      else
+        reject(
+          new AntigravityError(
+            diagnostic(stderr.trim() || `agy exited with code ${code}`),
+            "PROBE_ERROR",
+          ),
+        );
+    });
+  });
+}
diff --git a/plugins/antigravity-provider/server/internal/prompt.ts b/plugins/antigravity-provider/server/internal/prompt.ts
new file mode 100644
index 0000000000..07f4298b35
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/prompt.ts
@@ -0,0 +1,64 @@
+import { randomUUID } from "node:crypto";
+import { chmod, mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type { ProviderPrompt } from "@getpaseo/plugin/server/provider";
+import { AntigravityError } from "./wire.js";
+
+interface EncodedPrompt {
+  text: string;
+  nativeText: string;
+}
+
+export class PromptFiles {
+  private directory: string | null = null;
+
+  async encode(prompt: ProviderPrompt): Promise<EncodedPrompt> {
+    if (
+      prompt.input.type !== "message" ||
+      prompt.delivery === "steer" ||
+      prompt.outputSchema !== undefined
+    )
+      throw new AntigravityError("Antigravity supports messages only");
+    const parts = prompt.input.content.map((part) => {
+      if (part.type === "text") return part;
+      if (part.type === "image") return { ...part, extension: imageExtension(part.mimeType) };
+      throw new AntigravityError("Antigravity supports text and image content only");
+    });
+    const text: string[] = [];
+    const native: string[] = [];
+    for (const part of parts) {
+      if (part.type === "text") {
+        text.push(part.text);
+        native.push(part.text);
+      } else if (part.type === "image") {
+        const extension = part.extension;
+        if (this.directory === null) {
+          this.directory = await mkdtemp(path.join(os.tmpdir(), "paseo-antigravity-images-"));
+          await chmod(this.directory, 0o700);
+        }
+        const file = path.join(this.directory, `${randomUUID()}.${extension}`);
+        await writeFile(file, Buffer.from(part.data, "base64"), { flag: "wx", mode: 0o600 });
+        await chmod(file, 0o600);
+        native.push(`Attached image: ${file}`);
+      }
+    }
+    return { text: text.join("\n"), nativeText: native.join("\n") };
+  }
+
+  async close(): Promise<void> {
+    if (this.directory !== null) {
+      await rm(this.directory, { recursive: true, force: true });
+      this.directory = null;
+    }
+  }
+}
+
+function imageExtension(mimeType: string): string {
+  const match = /^image\/([a-z0-9][a-z0-9.+-]*)$/i.exec(mimeType);
+  if (!match) throw new AntigravityError(`Expected an image MIME type, received ${mimeType}`);
+  const subtype = match[1].toLowerCase();
+  if (subtype === "jpeg") return "jpg";
+  if (subtype === "svg+xml") return "svg";
+  return subtype;
+}
diff --git a/plugins/antigravity-provider/server/internal/session.ts b/plugins/antigravity-provider/server/internal/session.ts
new file mode 100644
index 0000000000..caf2a62eeb
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/session.ts
@@ -0,0 +1,397 @@
+import { randomUUID } from "node:crypto";
+import { z } from "zod";
+import type {
+  ProviderCatalog,
+  ProviderConfigChanges,
+  ProviderEvent,
+  ProviderPersistence,
+  ProviderPrompt,
+  ProviderSessionConfig,
+  ProviderLaunch,
+  ProviderTimelineItem,
+  ProviderUsage,
+} from "@getpaseo/plugin/server/provider";
+import { startDriver, selection, type Driver } from "./process.js";
+import { validateSelection } from "./catalog.js";
+import { PromptFiles } from "./prompt.js";
+import { toolItem } from "./timeline.js";
+import { AntigravityError, diagnostic, type Frame, type Step } from "./wire.js";
+
+const persistenceSchema = z
+  .object({ version: z.literal(1), data: z.object({ conversationId: z.string().min(1) }).strict() })
+  .strict();
+interface Turn {
+  id: string;
+  text: Map<number, string>;
+  usageSteps: Set<number>;
+  tools: Map<string, Extract<ProviderTimelineItem, { type: "tool_call" }>>;
+  usage: Required<Pick<ProviderUsage, "inputTokens" | "outputTokens" | "cachedInputTokens">>;
+}
+type State =
+  | { type: "dormant" }
+  | { type: "starting"; driver: Driver }
+  | { type: "idle"; driver: Driver }
+  | { type: "running"; driver: Driver; turn: Turn }
+  | { type: "stopping"; driver: Driver }
+  | { type: "closed" };
+interface SessionOptions {
+  id: string;
+  config: ProviderSessionConfig;
+  launch: ProviderLaunch;
+  catalog(): ProviderCatalog;
+  persistence?: ProviderPersistence;
+  emit(event: ProviderEvent): void;
+}
+
+export class Session {
+  private state: State = { type: "dormant" };
+  private config: ProviderSessionConfig;
+  private conversationId: string | null;
+  private firstMessage: boolean;
+  private readonly promptFiles = new PromptFiles();
+  private readonly reportedDenials = new Map<string, number>();
+
+  constructor(private readonly options: SessionOptions) {
+    this.config = { ...options.config, mode: options.config.mode ?? "full-access" };
+    this.conversationId = options.persistence
+      ? persistenceSchema.parse(options.persistence).data.conversationId
+      : null;
+    this.firstMessage = this.conversationId === null;
+    validateSelection(this.config, options.catalog());
+  }
+
+  async open(requestId: string, capabilities: readonly string[]): Promise<void> {
+    await this.ensureDriver();
+    this.emit({
+      type: "session.opened",
+      requestId,
+      sessionId: this.options.id,
+      capabilities,
+      restoration: "core",
+      persistence: this.config.persist ? this.persistence() : undefined,
+      cwd: this.config.cwd,
+      title: this.config.title,
+    });
+    this.publishFullAccessNotice();
+    this.publishConfig();
+    this.emit({ type: "session.commands", sessionId: this.options.id, commands: [] });
+    this.emit({ type: "session.ready", requestId, sessionId: this.options.id });
+  }
+
+  async prompt(prompt: ProviderPrompt): Promise<void> {
+    if (this.state.type === "running")
+      throw new AntigravityError(
+        "Antigravity already has an active turn; wait for it to finish",
+        "TURN_ACTIVE",
+      );
+    const { text, nativeText } = await this.promptFiles.encode(prompt);
+    await this.ensureDriver();
+    if (this.state.type !== "idle") throw new AntigravityError("Antigravity session is not ready");
+    const driver = this.state.driver;
+    const turn: Turn = {
+      id: randomUUID(),
+      text: new Map(),
+      usageSteps: new Set(),
+      tools: new Map(),
+      usage: { inputTokens: 0, outputTokens: 0, cachedInputTokens: 0 },
+    };
+    this.state = { type: "running", driver, turn };
+    this.emit({
+      type: "session.prompt_result",
+      sessionId: this.options.id,
+      clientMessageId: prompt.clientMessageId,
+      result: { type: "turn", turnId: turn.id },
+    });
+    this.emit({
+      type: "session.turn",
+      sessionId: this.options.id,
+      turnId: turn.id,
+      state: "started",
+    });
+    this.item({
+      type: "user_message",
+      id: prompt.clientMessageId,
+      clientMessageId: prompt.clientMessageId,
+      text,
+    });
+    const driverText =
+      this.firstMessage && this.config.systemPrompt
+        ? `${this.config.systemPrompt}\n\n${nativeText}`
+        : nativeText;
+    try {
+      await driver.prompt(driverText);
+      this.firstMessage = false;
+    } catch (error) {
+      if (!(error instanceof Error)) throw error;
+      this.failTurn(new AntigravityError(error.message));
+      await driver.stop("interrupt");
+    }
+  }
+
+  configure(changes: ProviderConfigChanges): void {
+    const config = {
+      ...this.config,
+      model: changes.model === null ? undefined : (changes.model ?? this.config.model),
+      mode: changes.mode === null ? "full-access" : (changes.mode ?? this.config.mode),
+      thinkingOption:
+        changes.thinkingOption === null
+          ? undefined
+          : (changes.thinkingOption ?? this.config.thinkingOption),
+    };
+    if (changes.settings && Object.keys(changes.settings).length > 0)
+      throw new AntigravityError("Antigravity has no configurable settings");
+    validateSelection(config, this.options.catalog());
+    this.config = config;
+    this.publishConfig();
+  }
+
+  async interrupt(): Promise<void> {
+    if (this.state.type !== "running") return;
+    const { driver, turn } = this.state;
+    this.state = { type: "stopping", driver };
+    await driver.stop("interrupt");
+    this.finishTools(turn, "canceled");
+    this.emit({
+      type: "session.turn",
+      sessionId: this.options.id,
+      turnId: turn.id,
+      state: "canceled",
+    });
+    this.state = { type: "dormant" };
+  }
+
+  async close(): Promise<void> {
+    const state = this.state;
+    this.state = { type: "closed" };
+    try {
+      if (state.type !== "dormant" && state.type !== "closed") await state.driver.stop("close");
+    } finally {
+      await this.promptFiles.close();
+    }
+    if (state.type === "running") {
+      this.finishTools(state.turn, "canceled");
+      this.emit({
+        type: "session.turn",
+        sessionId: this.options.id,
+        turnId: state.turn.id,
+        state: "canceled",
+      });
+    }
+  }
+
+  private publishFullAccessNotice(): void {
+    this.emit({
+      type: "session.notice",
+      sessionId: this.options.id,
+      notice: {
+        id: `${this.options.id}:full-access`,
+        severity: "warning",
+        title: "Antigravity is running with full access",
+        description:
+          "Antigravity's CLI cannot ask for permission when another app drives it, so Paseo starts it with --dangerously-skip-permissions. Every tool call, including shell commands, runs without asking.",
+      },
+    });
+  }
+
+  private async ensureDriver(): Promise<void> {
+    if (this.state.type === "closed") throw new AntigravityError("Antigravity session is closed");
+    if (this.state.type === "stopping") {
+      await this.state.driver.stop("interrupt");
+      this.state = { type: "dormant" };
+    }
+    if (this.state.type === "idle" && this.state.driver.selection !== selection(this.config)) {
+      const driver = this.state.driver;
+      this.state = { type: "stopping", driver };
+      await driver.stop("close");
+      this.state = { type: "dormant" };
+    }
+    if (this.state.type !== "dormant") return;
+    this.reportedDenials.clear();
+    const driver = startDriver({
+      launch: this.options.launch,
+      config: this.config,
+      conversationId: this.conversationId,
+      onFrame: (frame) => this.accept(frame),
+      onExit: (error) => this.failTurn(error),
+    });
+    this.state = { type: "starting", driver };
+    try {
+      const init = await driver.ready;
+      if (this.conversationId !== null && init.conversation_id !== this.conversationId)
+        throw new AntigravityError(
+          "Antigravity restored a different conversation",
+          "INVALID_RESUME",
+        );
+      this.conversationId = init.conversation_id;
+      this.state = { type: "idle", driver };
+      if (this.config.persist)
+        this.emit({
+          type: "session.persistence",
+          sessionId: this.options.id,
+          persistence: this.persistence(),
+        });
+    } catch (error) {
+      this.state = { type: "dormant" };
+      await driver.stop("interrupt");
+      throw error;
+    }
+  }
+
+  private accept(frame: Frame): void {
+    if (this.state.type !== "running") return;
+    const { turn, driver } = this.state;
+    if (frame.event === "step_update") {
+      this.acceptStep(frame.step_update, turn);
+      return;
+    }
+    if (frame.event !== "result") return;
+    const result = frame.result;
+    const denied = takeNewDenials(result.denied_actions, this.reportedDenials);
+    if (denied.length > 0) {
+      this.emit({
+        type: "session.notice",
+        sessionId: this.options.id,
+        notice: {
+          id: `${turn.id}:denied`,
+          severity: "warning",
+          title: denialNoticeTitle(denied),
+          description: "Antigravity's own policy denied it.",
+        },
+      });
+    }
+    if (result.status === "ERROR") {
+      const canceled = result.error === "interrupted";
+      this.finishTools(turn, canceled ? "canceled" : "failed");
+      this.retire(driver);
+      this.emit({
+        type: "session.turn",
+        sessionId: this.options.id,
+        turnId: turn.id,
+        state: canceled ? "canceled" : "failed",
+        error: { message: diagnostic(result.error) },
+      });
+    } else {
+      this.finishTools(turn, "completed");
+      this.state = { type: "idle", driver };
+      this.emit({
+        type: "session.turn",
+        sessionId: this.options.id,
+        turnId: turn.id,
+        state: "completed",
+      });
+    }
+  }
+
+  private acceptStep(step: Step, turn: Turn): void {
+    const id = `${turn.id}:${step.step_index}`;
+    if (step.step_type === "agent_response") {
+      const previous = turn.text.get(step.step_index) || "";
+      const text = previous + step.text_delta;
+      turn.text.set(step.step_index, text);
+      if (step.text_delta) this.item({ type: "assistant_message", id, messageId: id, text });
+      if (step.state === "DONE" && step.usage && !turn.usageSteps.has(step.step_index)) {
+        turn.usageSteps.add(step.step_index);
+        turn.usage.inputTokens += step.usage.input_tokens;
+        turn.usage.outputTokens += step.usage.output_tokens;
+        turn.usage.cachedInputTokens += step.usage.cache_read_tokens;
+        this.emit({
+          type: "session.usage",
+          sessionId: this.options.id,
+          turnId: turn.id,
+          usage: { ...turn.usage },
+        });
+      }
+    } else if (step.step_type === "tool" || step.step_type === "subagent") {
+      const item = toolItem(step, id);
+      turn.tools.set(id, item);
+      this.item(item);
+    }
+  }
+
+  private failTurn(error: AntigravityError): void {
+    const state = this.state;
+    if (state.type !== "running" && state.type !== "idle") return;
+    this.retire(state.driver);
+    if (state.type === "running") {
+      this.finishTools(state.turn, "failed");
+      this.emit({
+        type: "session.turn",
+        sessionId: this.options.id,
+        turnId: state.turn.id,
+        state: "failed",
+        error: { message: error.message, code: error.code },
+      });
+    } else
+      this.emit({
+        type: "session.runtime_failed",
+        sessionId: this.options.id,
+        error: { message: error.message, code: error.code },
+      });
+  }
+
+  private retire(driver: Driver): void {
+    this.state = { type: "stopping", driver };
+    void driver.stop("interrupt").then(() => {
+      if (this.state.type === "stopping" && this.state.driver === driver)
+        this.state = { type: "dormant" };
+      return undefined;
+    });
+  }
+
+  private finishTools(turn: Turn, status: "completed" | "failed" | "canceled"): void {
+    for (const item of turn.tools.values()) {
+      if (item.status !== "running") continue;
+      if (status === "failed") this.item({ ...item, status, error: "Antigravity turn failed" });
+      else this.item({ ...item, status, error: null });
+    }
+  }
+
+  private persistence(): ProviderPersistence {
+    if (this.conversationId === null) throw new AntigravityError("Antigravity has no conversation");
+    return { version: 1, data: { conversationId: this.conversationId } };
+  }
+
+  private publishConfig(): void {
+    this.emit({
+      type: "session.config",
+      sessionId: this.options.id,
+      config: {
+        model: this.config.model,
+        mode: this.config.mode || "full-access",
+        models: this.options.catalog().models,
+        modes: this.options.catalog().modes,
+        thinkingOptions: [],
+        settings: [],
+      },
+    });
+  }
+  private item(item: ProviderTimelineItem): void {
+    this.emit({ type: "timeline.item", sessionId: this.options.id, item });
+  }
+  private emit(event: ProviderEvent): void {
+    this.options.emit(event);
+  }
+}
+
+// Native results contain every denial since this driver started, including repeated actions.
+function takeNewDenials(
+  actions: Extract<Frame, { event: "result" }>["result"]["denied_actions"],
+  reported: Map<string, number>,
+) {
+  const counts = new Map<string, number>();
+  const fresh = actions.filter((action) => {
+    const key = JSON.stringify([action.action, action.display_name]);
+    const count = (counts.get(key) ?? 0) + 1;
+    counts.set(key, count);
+    return count > (reported.get(key) ?? 0);
+  });
+  for (const [key, count] of counts) reported.set(key, Math.max(count, reported.get(key) ?? 0));
+  return fresh;
+}
+
+function denialNoticeTitle(
+  actions: Extract<Frame, { event: "result" }>["result"]["denied_actions"],
+): string {
+  if (actions.length > 1) return `${actions.length} actions denied`;
+  return actions[0].action === "command" ? "Shell command denied" : "Action denied";
+}
diff --git a/plugins/antigravity-provider/server/internal/signals.ts b/plugins/antigravity-provider/server/internal/signals.ts
new file mode 100644
index 0000000000..f7f5b64eab
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/signals.ts
@@ -0,0 +1,37 @@
+import { execCommand } from "@getpaseo/plugin/server";
+
+interface SignalOptions {
+  platform: NodeJS.Platform;
+  pid: number;
+  signal: NodeJS.Signals;
+}
+
+type SignalPlan =
+  | { type: "group"; pid: number; signal: NodeJS.Signals }
+  | { type: "tree"; command: "taskkill"; args: string[] };
+
+export function signalPlan(options: SignalOptions): SignalPlan {
+  if (options.platform === "win32") {
+    return { type: "tree", command: "taskkill", args: ["/PID", String(options.pid), "/T", "/F"] };
+  }
+  return { type: "group", pid: -options.pid, signal: options.signal };
+}
+
+export function signalProcess(options: SignalOptions): void | Promise<void> {
+  const plan = signalPlan(options);
+  if (plan.type === "tree") return killTree(plan);
+  try {
+    process.kill(plan.pid, plan.signal);
+  } catch (error) {
+    if (!(error instanceof Error && "code" in error && error.code === "ESRCH")) throw error;
+  }
+}
+
+async function killTree(plan: Extract<SignalPlan, { type: "tree" }>): Promise<void> {
+  try {
+    await execCommand(plan.command, plan.args, { shell: false });
+  } catch (error) {
+    // taskkill reports an already-exited PID with exit code 128.
+    if (!(error instanceof Error && "code" in error && error.code === 128)) throw error;
+  }
+}
diff --git a/plugins/antigravity-provider/server/internal/timeline.ts b/plugins/antigravity-provider/server/internal/timeline.ts
new file mode 100644
index 0000000000..22cc81c643
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/timeline.ts
@@ -0,0 +1,55 @@
+import type {
+  ProviderTimelineItem,
+  ProviderToolCallDetail,
+} from "@getpaseo/plugin/server/provider";
+import type { Step } from "./wire.js";
+
+export function toolItem(
+  step: Step,
+  id: string,
+): Extract<ProviderTimelineItem, { type: "tool_call" }> {
+  const detail = toolDetail(step);
+  const name = step.tool_name || "Antigravity tool";
+  const metadata = step.subagent_info ? { subagents: step.subagent_info.subagents } : undefined;
+  const base = { type: "tool_call" as const, id, callId: id, name, detail, metadata };
+  if (step.state === "ERROR") {
+    const error =
+      step.tool_info && step.tool_info.error
+        ? step.tool_info.error.message
+        : "Antigravity tool failed";
+    return { ...base, status: "failed", error };
+  }
+  const status = step.state === "ACTIVE" ? "running" : "completed";
+  return { ...base, status, error: null };
+}
+
+function toolDetail(step: Step): ProviderToolCallDetail {
+  if (step.subagent_info) {
+    const child = step.subagent_info.subagents[0];
+    if (child)
+      return {
+        type: "sub_agent",
+        subAgentType: child.type_name,
+        description: child.initial_prompt,
+        childSessionId: child.conversation_id === null ? undefined : child.conversation_id,
+        log: child.log_uri,
+      };
+  }
+  const info = step.tool_info;
+  if (!info) return { type: "plain_text", label: step.tool_name, text: "" };
+  const path = info.parameters.AbsolutePath || info.parameters.TargetFile;
+  if (info.name === "run_command" && typeof info.parameters.CommandLine === "string") {
+    return { type: "shell", command: info.parameters.CommandLine, output: info.output };
+  }
+  if (info.name === "view_file" && typeof path === "string")
+    return { type: "read", filePath: path, content: info.output };
+  if (info.name === "write_to_file" && typeof path === "string")
+    return { type: "write", filePath: path };
+  if (
+    (info.name === "replace_file_content" || info.name === "multi_replace_file_content") &&
+    typeof path === "string"
+  )
+    return { type: "edit", filePath: path };
+  // Native frames summarize writes; they do not carry the file contents or diff.
+  return { type: "unknown", input: info.parameters, output: info.error || info.output };
+}
diff --git a/plugins/antigravity-provider/server/internal/wire.ts b/plugins/antigravity-provider/server/internal/wire.ts
new file mode 100644
index 0000000000..eef417c83c
--- /dev/null
+++ b/plugins/antigravity-provider/server/internal/wire.ts
@@ -0,0 +1,85 @@
+import { z } from "zod";
+
+const usage = z.object({
+  input_tokens: z.number().nonnegative(),
+  output_tokens: z.number().nonnegative(),
+  cache_read_tokens: z.number().nonnegative().default(0),
+});
+const tool = z.object({
+  name: z.string(),
+  parameters: z.record(z.string(), z.json()).default({}),
+  output: z.string().default(""),
+  error: z.object({ type: z.string(), message: z.string() }).nullable().default(null),
+});
+const child = z.object({
+  type_name: z.string(),
+  role: z.string().default(""),
+  initial_prompt: z.string().default(""),
+  conversation_id: z.string().nullable().default(null),
+  log_uri: z.string().default(""),
+  workspace_uris: z.array(z.string()).default([]),
+});
+const frame = z.discriminatedUnion("event", [
+  z.object({
+    event: z.literal("init"),
+    conversation_id: z.string().min(1),
+    init: z.object({ model: z.string().nullable().default(null) }),
+  }),
+  z.object({
+    event: z.literal("step_update"),
+    step_update: z.object({
+      conversation_id: z.string(),
+      step_index: z.number().int().nonnegative(),
+      state: z.enum(["ACTIVE", "DONE", "ERROR"]),
+      step_type: z.string(),
+      text_delta: z.string().default(""),
+      tool_name: z.string().default(""),
+      tool_info: tool.nullable().default(null),
+      subagent_info: z
+        .object({ subagents: z.array(child) })
+        .nullable()
+        .default(null),
+      usage: usage.nullable().default(null),
+    }),
+  }),
+  z.object({
+    event: z.literal("result"),
+    result: z.object({
+      conversation_id: z.string(),
+      status: z.enum(["SUCCESS", "ERROR"]),
+      response: z.string().default(""),
+      error: z.string().default("Antigravity turn failed"),
+      denied_actions: z
+        .array(z.object({ action: z.string(), display_name: z.string() }))
+        .default([]),
+    }),
+  }),
+]);
+export type Frame = z.infer<typeof frame>;
+export type Step = Extract<Frame, { event: "step_update" }>["step_update"];
+export type Init = Extract<Frame, { event: "init" }>;
+
+export function decodeFrame(line: string): Frame {
+  return frame.parse(JSON.parse(line));
+}
+
+export function encodePrompt(text: string): string {
+  return `${JSON.stringify({ event: "user", message: { content: text } })}\n`;
+}
+
+export class AntigravityError extends Error {
+  constructor(
+    message: string,
+    readonly code = "ANTIGRAVITY_ERROR",
+  ) {
+    super(message);
+    this.name = "AntigravityError";
+  }
+}
+
+export function diagnostic(message: string): string {
+  if (/auth|sign.in|log.in/i.test(message)) {
+    return "Antigravity authentication failed. Run `agy` and sign in, then retry.";
+  }
+  return message;
+}
diff --git a/plugins/antigravity-provider/server/provider.test.ts b/plugins/antigravity-provider/server/provider.test.ts
new file mode 100644
index 0000000000..631f10a6fe
--- /dev/null
+++ b/plugins/antigravity-provider/server/provider.test.ts
@@ -0,0 +1,791 @@
+import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  PROVIDER_CAPABILITIES,
+  ProviderEventSchema,
+  type ProviderConnection,
+  type ProviderContent,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderLaunch,
+  type ProviderPersistence,
+} from "@getpaseo/plugin/server/provider";
+import { signalPlan } from "./internal/signals.js";
+import { createAntigravityProvider } from "./provider.js";
+
+const temporary: string[] = [];
+const connections: ProviderConnection[] = [];
+const fake = fileURLToPath(new URL("../test/agy.mjs", import.meta.url));
+const provider = createAntigravityProvider();
+
+it("publishes a monochrome, theme-aware provider icon", async () => {
+  const icon = await readFile(new URL("../icon.svg", import.meta.url), "utf8");
+  expect(icon).toContain('viewBox="0 0 24 24"');
+  expect(icon).toContain('fill="currentColor"');
+  expect(icon).not.toMatch(/#[\da-f]{3,8}\b|rgba?\(|hsla?\(|url\(/i);
+  expect(icon).not.toMatch(/<(?:style|mask|defs|linearGradient|radialGradient)\b|\bid=/i);
+  expect([...icon.matchAll(/\b(?:fill|stroke)="([^"]+)"/g)].map((match) => match[1])).toEqual([
+    "currentColor",
+  ]);
+});
+
+afterEach(async () => {
+  await Promise.all(connections.splice(0).map((connection) => connection.close()));
+  await Promise.all(
+    temporary.splice(0).map((directory) => rm(directory, { recursive: true, force: true })),
+  );
+});
+
+async function harness(env: Record<string, string> = {}) {
+  const cwd = await mkdtemp(path.join(os.tmpdir(), "antigravity-test-"));
+  temporary.push(cwd);
+  const log = path.join(cwd, "argv.ndjson");
+  const launch: ProviderLaunch = {
+    command: process.execPath,
+    args: [fake, "--launch-prefix"],
+    env: { AGY_TEST_LOG: log, ...env },
+  };
+  const connection = await provider.connect({
+    versions: [1],
+    capabilities: PROVIDER_CAPABILITIES,
+    launch,
+  });
+  connections.push(connection);
+  const events: ProviderEvent[] = [];
+  connection.onEvent((event) => {
+    ProviderEventSchema.parse(event);
+    events.push(event);
+  });
+  async function wait(predicate: (event: ProviderEvent) => boolean) {
+    await expect.poll(() => events.some(predicate), { timeout: 5000, interval: 10 }).toBe(true);
+    const event = events.find(predicate);
+    if (!event) throw new Error("Expected event missing");
+    return event;
+  }
+  async function request(input: ProviderInput) {
+    await connection.send(input);
+    if ("requestId" in input)
+      await wait(
+        (event) =>
+          "requestId" in event &&
+          event.requestId === input.requestId &&
+          (event.type === "request.completed" ||
+            event.type === "request.failed" ||
+            event.type === "session.ready" ||
+            event.type === "catalog"),
+      );
+  }
+  async function open(restored?: ProviderPersistence, sessionId = "s") {
+    await request({
+      type: "session.open",
+      requestId: `open-${events.length}`,
+      sessionId,
+      persistence: restored,
+      history: "replay",
+      config: {
+        cwd,
+        env: { AGY_SESSION_VALUE: "session-overlay" },
+        settings: {},
+        mcpServers: {},
+        persist: true,
+        systemPrompt: "SYSTEM PREFIX",
+      },
+    });
+  }
+  async function message(content: ProviderContent[], sessionId = "s") {
+    const clientMessageId = `prompt-${events.length}`;
+    await connection.send({
+      type: "session.prompt",
+      sessionId,
+      prompt: {
+        clientMessageId,
+        delivery: "auto",
+        input: { type: "message", content },
+      },
+    });
+    await wait(
+      (event) =>
+        event.type === "session.prompt_result" && event.clientMessageId === clientMessageId,
+    );
+    return clientMessageId;
+  }
+  function prompt(text: string) {
+    return message([{ type: "text", text }]);
+  }
+  async function completed(clientMessageId: string) {
+    const result = events.find(
+      (event) =>
+        event.type === "session.prompt_result" && event.clientMessageId === clientMessageId,
+    );
+    if (!result || result.type !== "session.prompt_result" || result.result.type !== "turn")
+      throw new Error("Prompt was not admitted");
+    const turnId = result.result.turnId;
+    return wait(
+      (event) =>
+        event.type === "session.turn" && event.turnId === turnId && event.state !== "started",
+    );
+  }
+  async function records() {
+    return (await readFile(log, "utf8"))
+      .trim()
+      .split("\n")
+      .map((line) => JSON.parse(line));
+  }
+  function persistence() {
+    const opened = events.find((event) => event.type === "session.opened");
+    if (!opened || opened.type !== "session.opened" || !opened.persistence)
+      throw new Error("Missing persistence");
+    return opened.persistence;
+  }
+  return {
+    connection,
+    events,
+    launch,
+    cwd,
+    wait,
+    request,
+    open,
+    prompt,
+    message,
+    completed,
+    records,
+    persistence,
+  };
+}
+
+it("streams complete text snapshots, prefixes the system prompt only once and preserves launch argv/env", async () => {
+  const h = await harness();
+  expect(h.connection.capabilities).toEqual([
+    "prompt.message",
+    "prompt.image",
+    "session.configure",
+    "session.persistence",
+  ]);
+  await h.open();
+  await h.completed(await h.prompt("HELLO"));
+  await h.completed(await h.prompt("HELLO AGAIN"));
+  const text = h.events.filter(
+    (event) => event.type === "timeline.item" && event.item.type === "assistant_message",
+  );
+  expect(
+    text.map((event) =>
+      event.type === "timeline.item" && event.item.type === "assistant_message"
+        ? event.item.text
+        : "",
+    ),
+  ).toEqual(["PHASE0_HELLO", "PHASE0_HELLO\n", "PHASE0_HELLO", "PHASE0_HELLO\n"]);
+  const records = await h.records();
+  expect(records.find((entry) => entry.args.includes("--input-format")).args).toEqual([
+    "--launch-prefix",
+    "--input-format",
+    "stream-json",
+    "--output-format",
+    "stream-json",
+    "--add-dir",
+    h.cwd,
+    "--disable-slash-commands",
+    "--dangerously-skip-permissions",
+  ]);
+  expect(records.find((entry) => entry.args.includes("--input-format")).env).toBe(
+    "session-overlay",
+  );
+  expect(
+    records.filter((entry) => entry.input).map((entry) => entry.input.message.content),
+  ).toEqual(["SYSTEM PREFIX\n\nHELLO", "HELLO AGAIN"]);
+});
+
+it("maps tools and emits one denial notice for a SUCCESS result", async () => {
+  const h = await harness();
+  await h.open();
+  // This capture contains three distinct native results, one for each submitted prompt.
+  await h.completed(await h.prompt("TOOLS"));
+  await h.completed(await h.prompt("TOOLS"));
+  const result = await h.completed(await h.prompt("TOOLS"));
+  expect(result).toMatchObject({ type: "session.turn", state: "completed" });
+  const tools = h.events.filter(
+    (event) => event.type === "timeline.item" && event.item.type === "tool_call",
+  );
+  expect(tools).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        item: expect.objectContaining({
+          name: "view_file",
+          status: "completed",
+          detail: expect.objectContaining({ type: "read" }),
+        }),
+      }),
+      expect.objectContaining({
+        item: expect.objectContaining({
+          name: "write_to_file",
+          status: "completed",
+          detail: expect.objectContaining({ type: "write" }),
+        }),
+      }),
+      expect.objectContaining({
+        item: expect.objectContaining({
+          name: "run_command",
+          status: "failed",
+          detail: expect.objectContaining({ type: "shell", command: "printf PHASE0_SHELL" }),
+        }),
+      }),
+    ]),
+  );
+  const notices = h.events.filter(
+    (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+  );
+  expect(notices).toHaveLength(1);
+  expect(notices[0]).toMatchObject({
+    notice: {
+      title: "Shell command denied",
+      description: "Antigravity's own policy denied it.",
+    },
+  });
+});
+
+it("reports only new process denials across replayed turns and resets after respawn", async () => {
+  const h = await harness();
+  await h.open();
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  expect(
+    h.events.filter(
+      (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+    ),
+  ).toHaveLength(1);
+  const followupStart = h.events.length;
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  const followup = h.events.slice(followupStart);
+  expect(
+    followup.some(
+      (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+    ),
+  ).toBe(false);
+  expect(followup).toContainEqual(
+    expect.objectContaining({
+      type: "timeline.item",
+      item: expect.objectContaining({ type: "assistant_message", text: "FOLLOWUP_OK\n" }),
+    }),
+  );
+  await h.request({
+    type: "session.configure",
+    sessionId: "s",
+    requestId: "mode",
+    changes: { model: "gemini-3.8-flash-low" },
+  });
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  expect(
+    h.events.filter(
+      (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+    ),
+  ).toHaveLength(2);
+  expect(
+    (await h.records()).filter((entry) => entry.args?.includes("--input-format")),
+  ).toHaveLength(2);
+});
+
+it("counts repeated native action denials without exposing tool identifiers", async () => {
+  const h = await harness({ AGY_TEST_DENIAL_COUNTS: "2,2,3" });
+  await h.open();
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  const notices = h.events.filter(
+    (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+  );
+  expect(notices).toHaveLength(1);
+  expect(notices[0]).toMatchObject({
+    notice: {
+      title: "2 actions denied",
+      description: "Antigravity's own policy denied it.",
+    },
+  });
+  await h.completed(await h.prompt("DENIAL_REPLAY"));
+  expect(
+    h.events.filter(
+      (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+    ),
+  ).toHaveLength(2);
+  expect(
+    h.events.findLast(
+      (event) => event.type === "session.notice" && event.notice.id !== "s:full-access",
+    ),
+  ).toMatchObject({
+    notice: { title: "Shell command denied" },
+  });
+});
+
+it("accounts DONE generation usage once without adding cumulative results, including resume", async () => {
+  const h = await harness();
+  await h.open();
+  await h.completed(await h.prompt("MULTI"));
+  await h.completed(await h.prompt("MULTI"));
+  const usages = h.events.filter((event) => event.type === "session.usage");
+  expect(
+    usages.map((event) => (event.type === "session.usage" ? event.usage.inputTokens : null)),
+  ).toEqual([11263, 11604]);
+  const persistence = h.persistence();
+  await h.request({ type: "session.close", sessionId: "s", requestId: "close" });
+  await h.open(persistence);
+  await h.completed(await h.prompt("RESUME"));
+  expect(h.events.filter((event) => event.type === "session.usage")).toHaveLength(3);
+  expect(h.events.findLast((event) => event.type === "session.usage")).toMatchObject({
+    usage: { inputTokens: 11815 },
+  });
+});
+
+it("maps subagent steps to a tool carrying the child conversation ID", async () => {
+  const h = await harness();
+  await h.open();
+  await h.completed(await h.prompt("SUBAGENT"));
+  expect(h.events).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          name: "invoke_subagent",
+          status: "completed",
+          detail: expect.objectContaining({
+            type: "sub_agent",
+            childSessionId: "b6f02329-7415-49a7-a9a9-1cd09e898d26",
+          }),
+        }),
+      }),
+    ]),
+  );
+});
+
+it.each(["HANG", "TOOL_HANG"])(
+  "interrupts %s, settles canceled, and respawns the same conversation",
+  async (text) => {
+    const h = await harness();
+    await h.open();
+    const message = await h.prompt(text);
+    await h.wait(
+      (event) =>
+        event.type === "timeline.item" &&
+        (event.item.type === "assistant_message" || event.item.type === "tool_call"),
+    );
+    await h.request({ type: "session.interrupt", requestId: "interrupt", sessionId: "s" });
+    expect(await h.completed(message)).toMatchObject({ state: "canceled" });
+    await h.completed(await h.prompt("HELLO"));
+    const records = await h.records();
+    const launches = records.filter((entry) => entry.args && entry.args.includes("--input-format"));
+    expect(launches).toHaveLength(2);
+    expect(launches[1].args.slice(-2)).toEqual([
+      "--conversation",
+      "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda",
+    ]);
+    // Windows taskkill terminates the tree without invoking the CLI's signal handlers.
+    expect(records.filter((entry) => entry.signal)).toEqual(
+      process.platform === "win32" ? [] : [{ signal: "SIGINT" }],
+    );
+    const canceled = h.events.filter(
+      (event) => event.type === "session.turn" && event.state === "canceled",
+    );
+    expect(canceled).toHaveLength(1);
+  },
+);
+
+it("stops an unresponsive driver and still respawns the conversation", async () => {
+  const h = await harness({ AGY_TEST_IGNORE_SIGNALS: "yes" });
+  await h.open();
+  const message = await h.prompt("HANG");
+  await h.wait(
+    (event) => event.type === "timeline.item" && event.item.type === "assistant_message",
+  );
+  await h.request({ type: "session.interrupt", requestId: "interrupt-timeout", sessionId: "s" });
+  expect(await h.completed(message)).toMatchObject({ state: "canceled" });
+  expect((await h.records()).filter((entry) => entry.signal)).toEqual(
+    process.platform === "win32" ? [] : [{ signal: "SIGINT" }, { signal: "SIGTERM" }],
+  );
+  await h.completed(await h.prompt("HELLO"));
+});
+
+it("rejects plan and keeps the full-access selection without respawning", async () => {
+  const h = await harness();
+  await h.open();
+  await h.request({
+    type: "session.configure",
+    requestId: "plan",
+    sessionId: "s",
+    changes: { mode: "plan" },
+  });
+  expect(h.events).toContainEqual(
+    expect.objectContaining({
+      type: "request.failed",
+      requestId: "plan",
+      error: { code: "INVALID_MODE", message: "Unknown Antigravity mode: plan" },
+    }),
+  );
+  await h.request({
+    type: "session.configure",
+    requestId: "full",
+    sessionId: "s",
+    changes: { mode: "full-access" },
+  });
+  await h.completed(await h.prompt("HELLO"));
+  expect(
+    (await h.records()).filter((entry) => entry.args?.includes("--input-format")),
+  ).toHaveLength(1);
+});
+
+it("emits one full-access warning per open, none on respawn, and one again on resume", async () => {
+  const h = await harness();
+  await h.open();
+  const warning = {
+    type: "session.notice",
+    sessionId: "s",
+    notice: {
+      id: "s:full-access",
+      severity: "warning",
+      title: "Antigravity is running with full access",
+      description:
+        "Antigravity's CLI cannot ask for permission when another app drives it, so Paseo starts it with --dangerously-skip-permissions. Every tool call, including shell commands, runs without asking.",
+    },
+  };
+  const opened = h.events.findIndex((event) => event.type === "session.opened");
+  expect(h.events[opened + 1]).toEqual(warning);
+  expect(h.events.slice(0, opened).some((event) => event.type === "session.notice")).toBe(false);
+  await h.completed(await h.prompt("HELLO"));
+  await h.request({
+    type: "session.configure",
+    requestId: "model",
+    sessionId: "s",
+    changes: { model: "gemini-3.8-flash-low" },
+  });
+  await h.completed(await h.prompt("HELLO"));
+  expect(h.events.filter((event) => event.type === "session.notice")).toEqual([warning]);
+  const launches = (await h.records()).filter((entry) => entry.args?.includes("--input-format"));
+  expect(launches).toHaveLength(2);
+  for (const launch of launches) {
+    expect(launch.args).toContain("--dangerously-skip-permissions");
+    expect(launch.args).not.toContain("--mode");
+  }
+  const persistence = h.persistence();
+  await h.connection.close();
+  const resumed = await harness();
+  await resumed.open(persistence);
+  await resumed.completed(await resumed.prompt("RESUME"));
+  expect(resumed.events.filter((event) => event.type === "session.notice")).toEqual([warning]);
+});
+
+it("defers model and mode changes until the next prompt, then respawns with validated flags", async () => {
+  const h = await harness();
+  await h.open();
+  await h.request({
+    type: "session.configure",
+    requestId: "change",
+    sessionId: "s",
+    changes: { model: "gemini-3.8-flash-low", mode: "full-access" },
+  });
+  expect(
+    (await h.records()).filter((entry) => entry.args && entry.args.includes("--input-format")),
+  ).toHaveLength(1);
+  await h.completed(await h.prompt("HELLO"));
+  const launches = (await h.records()).filter(
+    (entry) => entry.args && entry.args.includes("--input-format"),
+  );
+  expect(launches).toHaveLength(2);
+  expect(launches[1].args.slice(-4)).toEqual([
+    "--model",
+    "gemini-3.8-flash-low",
+    "--conversation",
+    "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda",
+  ]);
+  await h.request({
+    type: "session.configure",
+    requestId: "invalid",
+    sessionId: "s",
+    changes: { model: "unknown" },
+  });
+  expect(h.events).toContainEqual(
+    expect.objectContaining({
+      type: "request.failed",
+      requestId: "invalid",
+      error: expect.objectContaining({ code: "INVALID_MODEL" }),
+    }),
+  );
+});
+
+it("resumes after connection close without replay or another system prefix", async () => {
+  const first = await harness();
+  await first.open();
+  await first.completed(await first.prompt("HELLO"));
+  const persistence = first.persistence();
+  await first.connection.close();
+  const second = await harness();
+  await second.open(persistence);
+  expect(second.events.filter((event) => event.type === "timeline.item")).toEqual([]);
+  await second.completed(await second.prompt("RESUME"));
+  expect(
+    (await second.records())
+      .filter((entry) => entry.input)
+      .map((entry) => entry.input.message.content),
+  ).toEqual(["RESUME"]);
+});
+
+it.each(["auth", "exit", "stderr"])(
+  "reports startup %s without waiting for init forever",
+  async (startup) => {
+    const h = await harness({ AGY_TEST_STARTUP: startup });
+    await h.open();
+    expect(h.events.filter((event) => event.type === "session.ready")).toEqual([]);
+    const failure = h.events.find((event) => event.type === "request.failed");
+    expect(failure).toMatchObject({
+      type: "request.failed",
+      error: {
+        message: expect.stringMatching(startup === "exit" ? /exited/ : /Run `agy` and sign in/),
+      },
+    });
+  },
+);
+
+it("rejects mid-turn steering and reports a busy message without queueing a second native turn", async () => {
+  const h = await harness();
+  await h.open();
+  await h.prompt("HANG");
+  const second = await h.prompt("SECOND");
+  expect(
+    h.events.find(
+      (event) => event.type === "session.prompt_result" && event.clientMessageId === second,
+    ),
+  ).toMatchObject({
+    type: "session.prompt_result",
+    result: { type: "failed", error: { code: "TURN_ACTIVE" } },
+  });
+  await expect(
+    h.connection.send({
+      type: "session.prompt",
+      sessionId: "s",
+      prompt: {
+        clientMessageId: "steer",
+        delivery: "steer",
+        input: { type: "message", content: [{ type: "text", text: "x" }] },
+      },
+    }),
+  ).rejects.toThrow(/prompt.steer/);
+});
+
+describe("discovery", () => {
+  it("reuses one discovered catalog for two opens and configure, and refreshes explicit catalog requests", async () => {
+    const h = await harness();
+    await h.open();
+    await h.open(undefined, "second");
+    await h.request({
+      type: "session.configure",
+      requestId: "configure-cached",
+      sessionId: "second",
+      changes: { model: "gemini-3.8-flash-low" },
+    });
+    expect(
+      (await h.records()).filter((entry) => entry.args && entry.args.includes("models")),
+    ).toHaveLength(1);
+    await h.request({ type: "catalog", requestId: "refresh" });
+    expect(
+      (await h.records()).filter((entry) => entry.args && entry.args.includes("models")),
+    ).toHaveLength(2);
+  });
+  it.each(["1.1.15", "1.2.12", "1.2.13"])("accepts driver-capable version %s", async (version) => {
+    const h = await harness({ AGY_TEST_VERSION: version });
+    expect(await provider.status?.({ launch: h.launch })).toEqual({ available: true });
+  });
+
+  it("parses tab-separated catalog and exposes only full access without thinking options", async () => {
+    const h = await harness();
+    await h.request({ type: "catalog", requestId: "catalog" });
+    const event = h.events[0];
+    expect(event).toMatchObject({
+      type: "catalog",
+      catalog: {
+        models: expect.arrayContaining([
+          { id: "gemini-3.8-flash-low", label: "Gemini 3.8 Flash (Low)" },
+        ]),
+        thinkingOptions: [],
+        defaultMode: "full-access",
+      },
+    });
+    if (event.type !== "catalog") throw new Error("Missing catalog");
+    expect(event.catalog.models).toHaveLength(11);
+    expect(event.catalog.modes).toEqual([
+      {
+        id: "full-access",
+        label: "Full access",
+        icon: "ShieldOff",
+        colorTier: "dangerous",
+        isUnattended: true,
+        description:
+          "Antigravity cannot ask for permission when another app drives it. Paseo starts it with --dangerously-skip-permissions.",
+      },
+    ]);
+  });
+  it("reports missing, old, unauthenticated and available launches", async () => {
+    expect(await provider.status?.({})).toMatchObject({
+      available: false,
+      diagnostic: expect.stringContaining("agy not found"),
+    });
+    const missing = await harness();
+    expect(
+      await provider.status?.({
+        launch: { ...missing.launch, command: path.join(missing.cwd, "missing-agy") },
+      }),
+    ).toMatchObject({ available: false, diagnostic: expect.stringContaining("ENOENT") });
+    const old = await harness({ AGY_TEST_VERSION: "1.1.14" });
+    expect(await provider.status?.({ launch: old.launch })).toMatchObject({
+      available: false,
+      diagnostic: expect.stringContaining("1.1.15"),
+    });
+    const unauthenticated = await harness({ AGY_TEST_AUTH: "missing" });
+    expect(await provider.status?.({ launch: unauthenticated.launch })).toEqual({
+      available: false,
+      diagnostic: "Antigravity authentication failed. Run `agy` and sign in, then retry.",
+    });
+    const authenticated = await harness();
+    expect(await provider.status?.({ launch: authenticated.launch })).toEqual({ available: true });
+  });
+  it("keys catalog caching by the complete effective launch without exposing env values", async () => {
+    const h = await harness();
+    const key = await provider.getCatalogCacheKey?.({ scope: "global", launch: h.launch });
+    expect(key).toMatch(/^[a-f0-9]{64}$/);
+    expect(
+      await provider.getCatalogCacheKey?.({
+        scope: "workspace",
+        cwd: h.cwd,
+        force: true,
+        launch: h.launch,
+      }),
+    ).toBe(key);
+    expect(
+      await provider.getCatalogCacheKey?.({
+        scope: "global",
+        launch: { ...h.launch, args: [...h.launch.args, "changed"] },
+      }),
+    ).not.toBe(key);
+    expect(
+      await provider.getCatalogCacheKey?.({
+        scope: "global",
+        launch: { ...h.launch, env: { ...h.launch.env, HOME: "different" } },
+      }),
+    ).not.toBe(key);
+  });
+});
+
+describe("process signal plans", () => {
+  it.each(["SIGINT", "SIGTERM", "SIGKILL"] as const)("kills the Windows tree for %s", (signal) => {
+    expect(signalPlan({ platform: "win32", pid: 123, signal })).toEqual({
+      type: "tree",
+      command: "taskkill",
+      args: ["/PID", "123", "/T", "/F"],
+    });
+  });
+  it.each(["SIGINT", "SIGTERM", "SIGKILL"] as const)(
+    "preserves POSIX group signal %s",
+    (signal) => {
+      expect(signalPlan({ platform: "linux", pid: 123, signal })).toEqual({
+        type: "group",
+        pid: -123,
+        signal,
+      });
+    },
+  );
+});
+
+describe("image prompts", () => {
+  it.each(["session", "connection"])(
+    "encodes mixed content as private session files and cleans up on %s close",
+    async (close) => {
+      const h = await harness();
+      await h.open();
+      const png = await readFile(
+        new URL("../test/fixtures/image-file-external.png", import.meta.url),
+      );
+      const jpeg = Buffer.from("image file bytes");
+      await h.completed(
+        await h.message([
+          { type: "text", text: "Describe these images." },
+          { type: "image", data: png.toString("base64"), mimeType: "image/png" },
+          { type: "text", text: "Compare them." },
+          { type: "image", data: jpeg.toString("base64"), mimeType: "image/jpeg" },
+        ]),
+      );
+      const sent = (await h.records()).find((entry) => entry.input).input.message.content;
+      const lines = sent.split("\n");
+      const pngPath = lines[3].slice("Attached image: ".length);
+      const jpegPath = lines[5].slice("Attached image: ".length);
+      expect(sent).toBe(
+        `SYSTEM PREFIX\n\nDescribe these images.\nAttached image: ${pngPath}\nCompare them.\nAttached image: ${jpegPath}`,
+      );
+      expect(path.isAbsolute(pngPath)).toBe(true);
+      expect(path.extname(pngPath)).toBe(".png");
+      expect(path.extname(jpegPath)).toBe(".jpg");
+      expect(path.dirname(pngPath)).toBe(path.dirname(jpegPath));
+      expect(path.dirname(pngPath)).not.toBe(h.cwd);
+      expect(await readFile(pngPath)).toEqual(png);
+      expect(await readFile(jpegPath)).toEqual(jpeg);
+      if (process.platform !== "win32") {
+        expect((await stat(path.dirname(pngPath))).mode & 0o777).toBe(0o700);
+        expect((await stat(pngPath)).mode & 0o777).toBe(0o600);
+        expect((await stat(jpegPath)).mode & 0o777).toBe(0o600);
+      }
+      const args = (await h.records()).find((entry) => entry.args?.includes("--input-format")).args;
+      expect(args.filter((arg: string) => arg === "--add-dir")).toHaveLength(1);
+      if (close === "connection") await h.connection.close();
+      else await h.request({ type: "session.close", requestId: "close-images", sessionId: "s" });
+      await expect(stat(path.dirname(pngPath))).rejects.toMatchObject({ code: "ENOENT" });
+    },
+  );
+
+  it("keeps image-only prompts in distinct session directories until each session closes", async () => {
+    const h = await harness();
+    await h.open();
+    await h.open(undefined, "other");
+    const content: ProviderContent[] = [
+      { type: "image", data: "aW1hZ2U=", mimeType: "image/webp" },
+    ];
+    await h.completed(await h.message(content));
+    await h.completed(await h.message(content));
+    await h.completed(await h.message(content, "other"));
+    const paths = (await h.records())
+      .filter((entry) => entry.input)
+      .map((entry) => entry.input.message.content.split("Attached image: ")[1]);
+    expect(new Set(paths).size).toBe(3);
+    expect(path.dirname(paths[0])).toBe(path.dirname(paths[1]));
+    expect(path.dirname(paths[0])).not.toBe(path.dirname(paths[2]));
+    expect(paths.every((file: string) => path.extname(file) === ".webp")).toBe(true);
+    await h.request({ type: "session.close", requestId: "close-first", sessionId: "s" });
+    await expect(stat(path.dirname(paths[0]))).rejects.toMatchObject({ code: "ENOENT" });
+    expect(await readFile(paths[2], "utf8")).toBe("image");
+    await h.connection.close();
+    await expect(stat(path.dirname(paths[2]))).rejects.toMatchObject({ code: "ENOENT" });
+  });
+
+  it("rejects a non-image MIME type before writing to native stdin", async () => {
+    const h = await harness();
+    await h.open();
+    const id = await h.message([{ type: "image", data: "dGV4dA==", mimeType: "text/plain" }]);
+    expect(
+      h.events.find(
+        (event) => event.type === "session.prompt_result" && event.clientMessageId === id,
+      ),
+    ).toMatchObject({
+      result: { type: "failed", error: { message: expect.stringContaining("image MIME type") } },
+    });
+    expect((await h.records()).filter((entry) => entry.input)).toHaveLength(0);
+  });
+});
+
+it.runIf(process.platform === "win32")(
+  "launches an Antigravity command shim for probes and conversation startup",
+  async () => {
+    const h = await harness();
+    const shim = path.join(h.cwd, "agy launcher.cmd");
+    await writeFile(shim, `@echo off\r\n"${process.execPath}" "${fake}" %*\r\n`);
+    h.launch.command = shim;
+    h.launch.args = ["--launch-prefix"];
+    expect(await provider.status!({ launch: h.launch })).toEqual({ available: true });
+    await h.open();
+    expect(await h.wait((event) => event.type === "session.opened")).toMatchObject({
+      sessionId: "s",
+    });
+  },
+);
diff --git a/plugins/antigravity-provider/server/provider.ts b/plugins/antigravity-provider/server/provider.ts
new file mode 100644
index 0000000000..88c73c7faa
--- /dev/null
+++ b/plugins/antigravity-provider/server/provider.ts
@@ -0,0 +1,171 @@
+import { createHash } from "node:crypto";
+import {
+  negotiateProviderCapabilities,
+  requireProviderCapabilities,
+  type ProviderCatalog,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderLaunch,
+  type ProviderRegistration,
+} from "@getpaseo/plugin/server/provider";
+import { getCatalog, getStatus } from "./internal/catalog.js";
+import { Session } from "./internal/session.js";
+import { AntigravityError } from "./internal/wire.js";
+
+const capabilities = [
+  "prompt.message",
+  "prompt.image",
+  "session.configure",
+  "session.persistence",
+] as const;
+
+export function createAntigravityProvider(): ProviderRegistration {
+  return {
+    id: "antigravity",
+    label: "Antigravity",
+    icon: "icon.svg",
+    command: ["agy"],
+    description: "Antigravity CLI on your host",
+    async status({ launch }) {
+      if (!launch)
+        return {
+          available: false,
+          diagnostic: "agy not found on PATH. Install Antigravity, then run `agy` and sign in.",
+        };
+      return getStatus(launch);
+    },
+    async getCatalogCacheKey({ launch }) {
+      if (!launch) return undefined;
+      const env = Object.entries(launch.env).sort(([left], [right]) => left.localeCompare(right));
+      return createHash("sha256")
+        .update(JSON.stringify([launch.command, launch.args, env]))
+        .digest("hex");
+    },
+    async connect(request) {
+      if (!request.versions.includes(1))
+        throw new AntigravityError("Provider protocol version 1 is required");
+      if (!request.launch)
+        throw new AntigravityError("The daemon must supply the Antigravity launch");
+      const negotiated = negotiateProviderCapabilities(request.capabilities, capabilities);
+      return createConnection(request.launch, negotiated);
+    },
+  };
+}
+
+function createConnection(
+  launch: ProviderLaunch,
+  negotiated: readonly string[],
+): ProviderConnection {
+  const sessions = new Map<string, Session>();
+  const listeners = new Set<(event: ProviderEvent) => void>();
+  let discovered: ProviderCatalog | null = null;
+  let closed = false;
+  let pending = Promise.resolve();
+
+  function emit(event: ProviderEvent): void {
+    if (closed) return;
+    for (const listener of listeners) listener(event);
+  }
+  function catalog(): ProviderCatalog {
+    if (discovered === null)
+      throw new AntigravityError("Antigravity catalog has not been discovered");
+    return discovered;
+  }
+  function session(id: string): Session {
+    const found = sessions.get(id);
+    if (!found) throw new AntigravityError(`Unknown Antigravity session: ${id}`);
+    return found;
+  }
+  async function dispatch(input: ProviderInput): Promise<void> {
+    switch (input.type) {
+      case "catalog":
+        discovered = await getCatalog(launch, input.cwd);
+        emit({
+          type: "catalog",
+          requestId: input.requestId,
+          catalog: catalog(),
+        });
+        return;
+      case "session.open": {
+        if (sessions.has(input.sessionId))
+          throw new AntigravityError(`Session already exists: ${input.sessionId}`);
+        if (discovered === null) discovered = await getCatalog(launch, input.config.cwd);
+        const opened = new Session({
+          id: input.sessionId,
+          config: input.config,
+          persistence: input.persistence,
+          catalog,
+          launch,
+          emit,
+        });
+        sessions.set(input.sessionId, opened);
+        try {
+          await opened.open(input.requestId, negotiated);
+        } catch (error) {
+          sessions.delete(input.sessionId);
+          await opened.close();
+          throw error;
+        }
+        return;
+      }
+      case "session.prompt":
+        await session(input.sessionId).prompt(input.prompt);
+        return;
+      case "session.configure":
+        session(input.sessionId).configure(input.changes);
+        break;
+      case "session.interrupt":
+        await session(input.sessionId).interrupt();
+        break;
+      case "session.close": {
+        await session(input.sessionId).close();
+        sessions.delete(input.sessionId);
+        emit({ type: "session.closed", sessionId: input.sessionId });
+        break;
+      }
+      default:
+        throw new AntigravityError(`Unsupported Antigravity operation: ${input.type}`);
+    }
+    emit({ type: "request.completed", requestId: input.requestId });
+  }
+  function failed(input: ProviderInput, error: unknown): void {
+    const message = error instanceof Error ? error.message : String(error);
+    const code = error instanceof AntigravityError ? error.code : "ANTIGRAVITY_ERROR";
+    if (input.type === "session.prompt")
+      emit({
+        type: "session.prompt_result",
+        sessionId: input.sessionId,
+        clientMessageId: input.prompt.clientMessageId,
+        result: { type: "failed", error: { message, code } },
+      });
+    else if ("requestId" in input)
+      emit({ type: "request.failed", requestId: input.requestId, error: { message, code } });
+  }
+  return {
+    version: 1,
+    capabilities: negotiated,
+    async send(input) {
+      if (closed) throw new AntigravityError("Antigravity connection is closed");
+      requireProviderCapabilities(negotiated, input);
+      pending = pending
+        .then(async () => {
+          if (!closed) await dispatch(input);
+          return undefined;
+        })
+        .catch((error) => failed(input, error));
+    },
+    onEvent(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    async close() {
+      if (closed) return;
+      closed = true;
+      await pending;
+      await Promise.all([...sessions.values()].map((opened) => opened.close()));
+      sessions.clear();
+      listeners.clear();
+    },
+  };
+}
diff --git a/plugins/antigravity-provider/test/agy.mjs b/plugins/antigravity-provider/test/agy.mjs
new file mode 100644
index 0000000000..91b0531b56
--- /dev/null
+++ b/plugins/antigravity-provider/test/agy.mjs
@@ -0,0 +1,102 @@
+import { readFileSync, appendFileSync } from "node:fs";
+import { createInterface } from "node:readline";
+
+const args = process.argv.slice(2);
+const log = process.env.AGY_TEST_LOG;
+function record(value) {
+  if (log) appendFileSync(log, `${JSON.stringify(value)}\n`);
+}
+record({ args, pid: process.pid, env: process.env.AGY_SESSION_VALUE });
+function fixture(name, stream = "stdout") {
+  return readFileSync(new URL(`./fixtures/${name}.${stream}.ndjson`, import.meta.url), "utf8")
+    .trim()
+    .split("\n")
+    .filter(Boolean)
+    .map((line) => JSON.parse(line).data);
+}
+if (args.includes("--version")) {
+  process.stdout.write(`${process.env.AGY_TEST_VERSION || "1.2.13"}\n`);
+  process.exit(0);
+}
+if (args.includes("models")) {
+  if (process.env.AGY_TEST_AUTH === "missing") {
+    process.stderr.write(fixture("models-unauthenticated", "stderr").join("\n"));
+    process.exit(1);
+  }
+  process.stdout.write(fixture("models-api-key").join("\n") + "\n");
+  process.exit(0);
+}
+if (process.env.AGY_TEST_STARTUP === "auth") {
+  process.stderr.write(fixture("not-signed-in", "stderr").join("\n"));
+  process.stdout.write(JSON.stringify(fixture("not-signed-in")[0]) + "\n");
+  process.exit(1);
+}
+if (process.env.AGY_TEST_STARTUP === "exit") process.exit(3);
+if (process.env.AGY_TEST_STARTUP === "stderr") {
+  process.stderr.write("Error: authentication required. Run 'agy' to log in, then retry.\n");
+  process.exit(1);
+}
+const resumeIndex = args.indexOf("--conversation");
+const conversationId =
+  resumeIndex >= 0 ? args[resumeIndex + 1] : fixture("text-turn")[0].conversation_id;
+let denialResults = 0;
+function emit(frame) {
+  const converted = structuredClone(frame);
+  if (converted.conversation_id !== undefined) converted.conversation_id = conversationId;
+  if (converted.step_update) converted.step_update.conversation_id = conversationId;
+  if (converted.result) {
+    converted.result.conversation_id = conversationId;
+    if (process.env.AGY_TEST_DENIAL_COUNTS && converted.result.denied_actions?.length) {
+      converted.result.denied_actions = Array.from(
+        { length: Number(process.env.AGY_TEST_DENIAL_COUNTS.split(",")[denialResults++]) },
+        () => converted.result.denied_actions[0],
+      );
+    }
+  }
+  process.stdout.write(JSON.stringify(converted) + "\n");
+}
+const init = fixture("text-turn")[0];
+if (args.includes("--model")) init.init.model = args[args.indexOf("--model") + 1];
+emit(init);
+let interrupted = null;
+const turns = new Map();
+const lines = createInterface({ input: process.stdin });
+lines.on("line", (line) => {
+  const input = JSON.parse(line);
+  record({ input });
+  const text = input.message.content;
+  let name = "text-turn";
+  if (text.includes("Attached image: ")) name = "image-file-external";
+  if (text.includes("TOOLS")) name = "tools-default";
+  if (text.includes("DENIAL_REPLAY")) name = "denial-replay";
+  if (text.includes("SUBAGENT")) name = "subagent";
+  if (text.includes("MULTI")) name = "multi-turn-reasoning";
+  if (text.includes("RESUME")) name = "resume";
+  if (text.includes("HANG")) name = "sigint-mid-text";
+  if (text.includes("TOOL_HANG")) name = "sigint-mid-tool";
+  const frames = fixture(name).slice(1);
+  if (name.startsWith("sigint")) {
+    interrupted = frames[frames.length - 1];
+    for (const frame of frames.slice(0, -1)) emit(frame);
+    return;
+  }
+  const count = frames.filter((frame) => frame.event === "result").length;
+  const ordinal = (turns.get(name) || 0) % count;
+  turns.set(name, ordinal + 1);
+  let resultCount = 0;
+  for (const frame of frames) {
+    if (resultCount === ordinal) emit(frame);
+    if (frame.event === "result") resultCount += 1;
+  }
+});
+process.on("SIGINT", () => {
+  record({ signal: "SIGINT" });
+  if (process.env.AGY_TEST_IGNORE_SIGNALS === "yes") return;
+  if (interrupted) emit(interrupted);
+  process.exit(1);
+});
+process.on("SIGTERM", () => {
+  record({ signal: "SIGTERM" });
+  if (process.env.AGY_TEST_IGNORE_SIGNALS !== "yes") process.exit(1);
+});
+lines.on("close", () => process.exit(0));
diff --git a/plugins/antigravity-provider/test/fixtures/README.md b/plugins/antigravity-provider/test/fixtures/README.md
new file mode 100644
index 0000000000..b4b1ef264f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/README.md
@@ -0,0 +1,100 @@
+# agy 1.2.13 stream-json captures
+
+`denial-replay.stdout.ndjson` replays two turns from one real 1.2.13 process: a denied shell
+command, then a text-only answer whose result retains the first denial. The replay clock is
+synthetic; frames retain the native cumulative denial payload.
+
+Captured on Linux x86_64 on 2026-09-29. These are observations from the supplied binary, not guarantees for the Google sign-in route. No product code or capture drivers are included.
+
+Each row names a capture prefix. Its `.stdin.ndjson`, `.stdout.ndjson`, `.stderr.ndjson`, and `.capture.ndjson` companions keep the streams separate; empty streams are empty files. Every line wraps the exact decoded JSON frame or text line in `{t_ms, stream, data}`. `t_ms` is milliseconds since construction immediately before spawn. Capture annotations record launch arguments, configuration, signals, EOF, timeouts, and exit code; they are not CLI output. Line references refer to the indicated file, starting at 1.
+
+Commands below run from `<WORKSPACE>`. `<AGY>` expands to `<HOME>/.local/opt/agy/1.2.13/agy` in the real installation home; the child uses a separate isolated `<HOME>` for state. All captures remove inherited credential/provider environment variables, set `HOME`, `XDG_CONFIG_HOME=<HOME>/.config`, `XDG_CACHE_HOME=<HOME>/.cache`, `XDG_DATA_HOME=<HOME>/.local/share`, `BROWSER=/bin/true`, and loopback-only `NO_PROXY`/`no_proxy`. Neither PATH nor shell rc files changed. Resume rows reuse the original isolated HOME.
+
+For rows marked **API**, the environment also contains `GEMINI_API_KEY=<DUMMY_KEY>` and `GOOGLE_GEMINI_BASE_URL=http://127.0.0.1:<PORT>`, and `<HOME>/.gemini/antigravity-cli/settings.json` contains `{"modelProvider":"gemini"}`. **Env only** sets those two variables without the setting; **None** has neither. The loopback translator reused the prior QA route and forwarded real requests to a paid upstream model. Its credential was read programmatically inside the temporary proxy, with later captures passing it through the proxy environment. It was never passed to agy or recorded. The translator maps all requested Gemini models to one upstream Gemini model: request routing and CLI selection are verified, native model identity/quality is not.
+
+The translator emits text, function calls, thought parts and usage. Its usage mapping does not populate Gemini thinking/cache counts, so observed zero `thinking_tokens`/`cache_read_tokens` does not prove native zeros. No dedicated reasoning frames appeared, including the matched high-effort probe.
+
+`<HOME>`, `<WORKSPACE>`, `<CAPTURE>`, `<PORT>`, `<DUMMY_KEY>`, and `<REDACTED_REFERENCE>` are redactions. Unrelated project/model names and help examples are redacted without removing frames. Delta chunk boundaries remain; a path split across deltas can have a different placeholder spelling than the complete result. UUIDs are retained for conversation correlation.
+
+| Fixture prefix              | Exact argv (redacted)                                                                                                                                                                                                      | Auth     | Demonstrates                                                                                                                                                | agy           |
+| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| `agents`                    | `<AGY> agents`                                                                                                                                                                                                             | API      | Available agents listing is plain text.                                                                                                                     | 1.2.13        |
+| `api-key-env-only`          | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | Env only | Dummy key and custom endpoint alone do not select API-key auth.                                                                                             | 1.2.13        |
+| `api-key-settings`          | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | API      | modelProvider=gemini yields init; missing event input is rejected.                                                                                          | 1.2.13        |
+| `cwd-without-add-dir`       | `<AGY> --input-format stream-json --output-format stream-json --dangerously-skip-permissions`                                                                                                                              | API      | Without add-dir, model-issued pwd returned launch cwd; required tool Cwd is not exposed by this wire frame.                                                 | 1.2.13        |
+| `effort-unsupported-family` | `<AGY> --input-format stream-json --output-format stream-json --model '<REDACTED_REFERENCE>' --effort high`                                                                                                                | API      | Unsupported non-Gemini family rejects effort; model reference redacted.                                                                                     | 1.2.13        |
+| `effort-encoded-match`      | `<AGY> --input-format stream-json --output-format stream-json --model gemini-3.8-flash-high --effort high`                                                                                                                 | API      | Matching high effort accepted; arithmetic turn; no thought delta observed.                                                                                  | 1.2.13        |
+| `effort-encoded-mismatch`   | `<AGY> --input-format stream-json --output-format stream-json --model gemini-3.8-flash-high --effort low`                                                                                                                  | API      | High-suffixed model conflicts with effort=low; no init.                                                                                                     | 1.2.13        |
+| `effort-mismatch`           | `<AGY> --input-format stream-json --output-format stream-json --model gemini-3.1-pro-preview --effort low`                                                                                                                 | API      | Unlisted preview ID does not support effort; startup ERROR.                                                                                                 | 1.2.13        |
+| `help`                      | `<AGY> --help`                                                                                                                                                                                                             | None     | Launch flags and subcommands; help is on stderr.                                                                                                            | 1.2.13        |
+| `image-content`             | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands`                                                                                                                                    | API      | Image source block rejected: only text blocks supported.                                                                                                    | 1.2.13        |
+| `mcp-add-http`              | `<AGY> mcp add phase0 'http://127.0.0.1:<PORT>/mcp'`                                                                                                                                                                       | None     | Writes .gemini/config/mcp_config.json; file content recorded in capture annotations.                                                                        | 1.2.13        |
+| `mcp-add`                   | `<AGY> mcp add phase0 --url 'http://127.0.0.1:<PORT>/mcp'`                                                                                                                                                                 | None     | Invalid --url syntax rejected; no configuration written.                                                                                                    | 1.2.13        |
+| `mcp-global`                | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | Global HTTP server discovered; strict tool call fails because arguments is a string.                                                                        | 1.2.13        |
+| `mcp-help`                  | `<AGY> mcp add --help`                                                                                                                                                                                                     | None     | MCP add syntax, HTTP transport, headers/env; flags precede name.                                                                                            | 1.2.13        |
+| `mcp-list`                  | `<AGY> mcp list`                                                                                                                                                                                                           | None     | Model-free empty server list, exit 0.                                                                                                                       | 1.2.13        |
+| `mcp-project-config`        | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | Workspace .gemini/config.json mcpServers not discovered in this probe.                                                                                      | 1.2.13        |
+| `mcp-project-isolated`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --dangerously-skip-permissions`                                                                                                      | API      | Project MCP discovery; no global MCP config before/after; strict arguments error.                                                                           | 1.2.13        |
+| `mcp-project`               | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | Project .agents/mcp_config.json discovers HTTP server; strict call rejects string arguments; later translator 502 retained.                                 | 1.2.13        |
+| `mcp-second-add-dir`        | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands --dangerously-skip-permissions --add-dir '<WORKSPACE>' --add-dir '<CAPTURE>/owned'`                                                 | API      | Discovers project MCP from the owned directory; strict arguments fail. Shell uses owned directory and writes occur in both directories.                     | 1.2.13        |
+| `mcp-owned-first-add-dir`   | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands --dangerously-skip-permissions --add-dir '<CAPTURE>/owned' --add-dir '<WORKSPACE>'`                                                 | API      | Reversing argv does not restore command working directory; owned directory remains the shell default.                                                       | 1.2.13        |
+| `mcp-owned-cwd`             | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands --dangerously-skip-permissions --add-dir '<WORKSPACE>'`, launched in `<CAPTURE>/owned` through a symlink                            | API      | Discovers owned project MCP, but shell and initial read resolve against owned cwd; writes occur in both directories.                                        | 1.2.13        |
+| `mcp-agent-file`            | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands --dangerously-skip-permissions --add-dir '<WORKSPACE>' --agent '<CAPTURE>/owned/agent.md'`                                          | API      | Direct external agent filename falls back to default; no MCP discovery. Shell/read/write use workspace.                                                     | 1.2.13        |
+| `mcp-agent-definition`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<CAPTURE>/owned' --add-dir '<WORKSPACE>' --agent phase2 --dangerously-skip-permissions`                                                           | API      | Nested Markdown definition with inline mcpServers is not found; default agent, no MCP server.                                                               | 1.2.13        |
+| `mcp-agent-discovered`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<CAPTURE>/owned' --add-dir '<WORKSPACE>' --agent phase2 --dangerously-skip-permissions`                                                           | API      | Flat Markdown definition plus agents.json manifest is also not found; default agent, no MCP server.                                                         | 1.2.13        |
+| `image-file-external`       | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands`                                                                                                            | API      | Default mode reads an external image path with view_file and correctly describes its pixels, without an extra add-dir.                                      | 1.2.13        |
+| `model-switch-invalid`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --conversation b966b16a-caf4-448a-bb24-0e34956022b0 --model gemini-3.1-flash-lite-preview`                                           | API      | Unlisted model ID rejected before init.                                                                                                                     | 1.2.13        |
+| `model-switch-network`      | `<AGY> --input-format stream-json --output-format stream-json --conversation b966b16a-caf4-448a-bb24-0e34956022b0 --model gemini-3.8-flash-low`                                                                            | API      | Listed model respawn plus actual Gemini request path in capture annotations; COBALT preserved.                                                              | 1.2.13        |
+| `model-switch-resume`       | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --conversation b966b16a-caf4-448a-bb24-0e34956022b0 --model gemini-3.1-flash-high`                                                   | API      | Another unlisted model ID rejected before init.                                                                                                             | 1.2.13        |
+| `model-switch-valid`        | `<AGY> --input-format stream-json --output-format stream-json --conversation b966b16a-caf4-448a-bb24-0e34956022b0 --model gemini-3.8-flash-low`                                                                            | API      | Listed low-effort model accepted on same conversation; COBALT preserved.                                                                                    | 1.2.13        |
+| `models-api-key`            | `<AGY> models`                                                                                                                                                                                                             | API      | Authenticated catalog is tab-separated model ID and display label.                                                                                          | 1.2.13        |
+| `models-unauthenticated`    | `<AGY> models`                                                                                                                                                                                                             | None     | Models requires auth; no catalog on stdout.                                                                                                                 | 1.2.13        |
+| `multi-turn-reasoning`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands`                                                                                                            | API      | Two text turns with arithmetic; per-generation and cumulative usage. No thought delta observed.                                                             | 1.2.13        |
+| `not-signed-in`             | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | None     | No credentials: result ERROR, no init, exit 1.                                                                                                              | 1.2.13        |
+| `project-skill`             | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands`                                                                                                            | API      | Project skill read via view_file; marker reply. No distinct skill event.                                                                                    | 1.2.13        |
+| `question-auto-denial`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>'`                                                                                                                                     | API      | Requested ask_question becomes unknown DONE step, auto-skipped; no question payload on wire.                                                                | 1.2.13        |
+| `resume-after-interrupt`    | `<AGY> --input-format stream-json --output-format stream-json --conversation a2c2132f-0f10-400b-a142-74f82230f449`                                                                                                         | API      | Same interrupted conversation resumes and accepts another turn.                                                                                             | 1.2.13        |
+| `resume`                    | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --conversation b966b16a-caf4-448a-bb24-0e34956022b0`                                                        | API      | Remembered COBALT after respawn; no old steps replayed.                                                                                                     | 1.2.13        |
+| `schema-prompt`             | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | API      | Unknown prompt event ignored with stderr warning; no turn.                                                                                                  | 1.2.13        |
+| `schema-user-message`       | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | API      | Decoding a string message fails before event dispatch.                                                                                                      | 1.2.13        |
+| `schema-user`               | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | API      | String message rejected; message must be an object.                                                                                                         | 1.2.13        |
+| `sigint-mid-text`           | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | SIGINT after first text delta: interrupted result and exit 1.                                                                                               | 1.2.13        |
+| `sigint-mid-tool`           | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --dangerously-skip-permissions`                                                                                                      | API      | SIGINT while run_command ACTIVE: interrupted result and exit 1.                                                                                             | 1.2.13        |
+| `sigterm`                   | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | SIGTERM after user_input: interrupted result and exit 1.                                                                                                    | 1.2.13        |
+| `slash-disabled`            | `<AGY> --input-format stream-json --output-format stream-json --disable-slash-commands`                                                                                                                                    | API      | /help sent literally to model; normal turn with built-in skill reads.                                                                                       | 1.2.13        |
+| `slash-enabled`             | `<AGY> --input-format stream-json --output-format stream-json`                                                                                                                                                             | API      | /help rejected in driver mode; result ERROR and exit 2.                                                                                                     | 1.2.13        |
+| `stdin-close-mid-turn`      | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | EOF after user_input: active turn finishes successfully, exit 0.                                                                                            | 1.2.13        |
+| `stdin-mid-turn`            | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | Second prompt after first user_input queues a separate turn; two results.                                                                                   | 1.2.13        |
+| `subagent`                  | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --dangerously-skip-permissions`                                                                                                      | API      | Define/invoke child; subagent_info contains child ID/log URI/workspaces; child reply reaches parent.                                                        | 1.2.13        |
+| `text-block`                | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>'`                                                                                                                                     | API      | Array of text content blocks accepted.                                                                                                                      | 1.2.13        |
+| `text-turn`                 | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>'`                                                                                                                                     | API      | event=user, message.content string; streaming text and final usage.                                                                                         | 1.2.13        |
+| `tools-accept-edits`        | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --mode accept-edits`                                                                                        | API      | Read, create, edit allowed; shell auto-denied. Result SUCCESS includes denied_actions. No permission request.                                               | 1.2.13        |
+| `tools-default`             | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands`                                                                                                            | API      | Read, create, edit allowed; shell auto-denied. Result SUCCESS includes denied_actions. No permission request.                                               | 1.2.13        |
+| `tools-plan`                | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --mode plan`                                                                                                | API      | Read, create, edit allowed; shell auto-denied. Result SUCCESS includes denied_actions. No permission request.                                               | 1.2.13        |
+| `tools-sandbox`             | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --sandbox`                                                                                                  | API      | Read, create, edit allowed; shell auto-denied. Result SUCCESS includes denied_actions. No permission request.                                               | 1.2.13        |
+| `tools-skip-permissions`    | `<AGY> --input-format stream-json --output-format stream-json --add-dir '<WORKSPACE>' --disable-slash-commands --dangerously-skip-permissions`                                                                             | API      | Read, create, edit and shell succeed; permission_mode=always-proceed.                                                                                       | 1.2.13        |
+| `version`                   | `<AGY> --version`                                                                                                                                                                                                          | None     | Installed binary reports 1.2.13.                                                                                                                            | 1.2.13        |
+| `mcp-http.requests.ndjson`  | `node <CAPTURE>/mcp-server.mjs` alongside the MCP argv above                                                                                                                                                               | None     | Actual HTTP JSON-RPC requests to a strict SDK server; `params.arguments` is a string. Server implements initialize, tools/list, and echo.                   | 1.2.13 client |
+| `state-inspection.ndjson`   | `HOME=<HOME> strace -f -e trace=file -o <CAPTURE>/files.trace <AGY> --input-format stream-json --output-format stream-json`; `python3 <CAPTURE>/finalize.py`; `firecrawl scrape <OFFICIAL_MANIFEST_URL> --format markdown` | None     | Binary checksum, isolated state accesses, read-only SQLite listings, written file contents, and manifest retrieval caveat. Inspection data, not agy stdout. | 1.2.13        |
+
+`project-skill` used `<WORKSPACE>/.agents/skills/phase0-marker/SKILL.md` with name `phase0-marker`, description “Return the Phase 0 marker when requested,” and instructions “Respond with PHASE0_SKILL_MARKER. No tools are needed after reading this skill.”
+
+Each tools capture begins with `input.txt` containing `PHASE0_READ_MARKER`, then requests create→replace from `PHASE0_WRITE` to `PHASE0_EDIT`, then `printf PHASE0_SHELL`. `state-inspection.ndjson` records the resulting files. These successful writes disprove an enforced read-only boundary for default/plan on this credential route. `--sandbox` alone still denies the shell at permission policy, so OS sandbox enforcement is unverified.
+
+## MCP discovery
+
+Phase 0 project setup (`mcp-project` and `mcp-project-isolated`) places `{"mcpServers":{"phase0":{"serverUrl":"http://127.0.0.1:<PORT>/mcp"}}}` in `<WORKSPACE>/.agents/mcp_config.json`. `mcp-project-config` instead uses `<WORKSPACE>/.gemini/config.json`; that file did not expose the server. HTTP calls send string arguments and fail strict validation.
+
+Phase 2 places the same HTTP configuration, named `phase2`, in a plugin-owned `<CAPTURE>/owned/.agents/mcp_config.json`. Both add-dir orders discover it, as does launching in the owned directory and adding the real workspace. All three turns execute shell `pwd` in the owned directory. The file turns read the workspace marker but also write `output.txt` into the owned directory. These routes fail the requirement that tools resolve against the user's workspace. Reordering arguments did not change the observed shell cwd; the precise directory selection rule is unverified.
+
+The external `--agent` file, nested agent definition, and flat definition with an `agents.json` manifest contain inline `mcpServers`. Native logs record “not found, falling back to default” for each. These experiments do not establish that every agent definition format is unsupported. `parity-inspection.ndjson` records their definitions and log evidence. Searching the tested binary's strings found no `AGY_MCP`, `MCP_CONFIG`, `AGY_CONFIG`, or `ANTIGRAVITY_CONFIG` override; no environment discovery route was verified.
+
+No tested MCP route satisfies both discovery and workspace ownership. MCP implementation stopped at this gate: no relay or MCP capability change was added. Images and the daemon e2e continued independently. No global MCP configuration exists in the isolated homes, and no configuration was written into the user repository.
+
+## Image file fallback
+
+`image-file-external.png` contains a red triangle on the left and a blue circle on the lower right, against white. The prompt supplies only its path and asks for visible shapes and colors. `image-file-external.stdout.ndjson:4–5` records a successful `view_file`; the result describes the pixels correctly. The native function response supplies bytes at `functionResponse.parts[].inlineData`. The temporary translator was corrected to forward these nested parts to the model; forwarding top-level parts alone dropped the image. `parity-inspection.ndjson` records the image hash and response-part location.
+
+This verifies one default-mode CLI turn reading a file outside the workspace without an extra add-dir. A later isolated-daemon run attached the same image through the provider and returned the same shapes and colors after a successful `view_file`. The provider advertises `prompt.image`; MCP remains outside the parity implementation.
+
+Unverified: Google login behaviour; native reasoning/cached-token accounting; filesystem/network isolation under sandbox plus approved commands; exhaustive tool policy; other agent definition formats or environment MCP overrides; child transcript streaming beyond parent metadata; a stable public conversation-list command. No fresh login was created. The fetched official manifest returned 1.2.12 while this binary reports 1.2.13; the checksum identifies the tested binary, but that response does not establish its release provenance.
diff --git a/plugins/antigravity-provider/test/fixtures/agents.capture.ndjson b/plugins/antigravity-provider/test/fixtures/agents.capture.ndjson
new file mode 100644
index 0000000000..cc01e91070
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/agents.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "agents"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 309, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/agents.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/agents.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/agents.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/agents.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/agents.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/agents.stdout.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-env-only.capture.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-env-only.capture.ndjson
new file mode 100644
index 0000000000..9c7a770416
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-env-only.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 452, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-env-only.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-env-only.stderr.ndjson
new file mode 100644
index 0000000000..d315088707
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-env-only.stderr.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 288, "stream": "stderr", "data": "Error: authentication required. Run 'agy' to log in, then retry."}
+{"t_ms": 288, "stream": "stderr", "data": "error: authentication failed or timed out"}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-env-only.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-env-only.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-env-only.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-env-only.stdout.ndjson
new file mode 100644
index 0000000000..60cc38245f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-env-only.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 288, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "authentication failed or timed out", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-settings.capture.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-settings.capture.ndjson
new file mode 100644
index 0000000000..1c03483e72
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-settings.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 525, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-settings.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-settings.stderr.ndjson
new file mode 100644
index 0000000000..1c47437a40
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-settings.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 374, "stream": "stderr", "data": "error: stream input message is missing the \"event\" field"}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-settings.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-settings.stdin.ndjson
new file mode 100644
index 0000000000..97362f53ed
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-settings.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 373, "stream": "stdin", "data": {"type": "user", "message": {"role": "user", "content": "Reply with PHASE0_HELLO. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/api-key-settings.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/api-key-settings.stdout.ndjson
new file mode 100644
index 0000000000..567b1fc1f1
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/api-key-settings.stdout.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 373, "stream": "stdout", "data": {"event": "init", "conversation_id": "e629b41a-decf-4212-a9fb-3809e8f21122", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 374, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "e629b41a-decf-4212-a9fb-3809e8f21122", "status": "ERROR", "response": "", "error": "stream input message is missing the \"event\" field", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.capture.ndjson b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.capture.ndjson
new file mode 100644
index 0000000000..78eedeec6f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 5003, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdin.ndjson
new file mode 100644
index 0000000000..52514739aa
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 318, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use run_command to run pwd, WaitMsBeforeAsync 1000. Report the output."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdout.ndjson
new file mode 100644
index 0000000000..469cdadcca
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/cwd-without-add-dir.stdout.ndjson
@@ -0,0 +1,11 @@
+{"t_ms": 318, "stream": "stdout", "data": {"event": "init", "conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 347, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3066, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.698205516, "usage": {"input_tokens": 11255, "output_tokens": 138, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11393}}}}
+{"t_ms": 3066, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 3066, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.006078385, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<WORKSPACE>\r\n"}}}}
+{"t_ms": 4626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The output"}}}
+{"t_ms": 4678, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of running "}}}
+{"t_ms": 4704, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`pwd` is:\n\n```text\n<CAPTURE>/works"}}}
+{"t_ms": 4729, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pace\n```"}}}
+{"t_ms": 4881, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.824928838, "usage": {"input_tokens": 11382, "output_tokens": 24, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11406}}}}
+{"t_ms": 4881, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "3cea6151-badf-4b4a-ad58-bf3c0b02db25", "status": "SUCCESS", "response": "The output of running `pwd` is:\n\n```text\n<WORKSPACE>\n```\n", "duration_seconds": 4.555206291, "num_turns": 1, "usage": {"input_tokens": 22637, "output_tokens": 162, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 22799}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/denial-replay.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/denial-replay.stdout.ndjson
new file mode 100644
index 0000000000..b667b505cc
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/denial-replay.stdout.ndjson
@@ -0,0 +1,11 @@
+{"t_ms":0,"stream":"stdout","data":{"event":"init","conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","init":{"cwd":"/tmp/agy-p3/workspace","tools":["ask_custom_permission","ask_permission","ask_question","browser_click_element","browser_drag_pixel_to_pixel","browser_get_dom","browser_get_network_request","browser_input","browser_list_network_requests","browser_mouse_down","browser_mouse_up","browser_move_mouse","browser_press_key","browser_refresh_page","browser_resize_window","browser_scroll","browser_scroll_dom","browser_select_option","browser_subagent","call_mcp_tool","capture_browser_console_logs","capture_browser_screenshot","click_browser_pixel","command_status","define_subagent","delete_knowledge","execute_browser_javascript","find_by_name","finish","generate_image","grep_search","invoke_subagent","list_browser_pages","list_dir","list_permissions","list_resources","manage_inbox","manage_subagents","manage_task","multi_replace_file_content","notebook_edit","notebook_execution","open_browser_url","read_browser_page","read_resource","read_url_content","replace_file_content","run_command","schedule","search_web","sed_file","send_command_input","send_message","view_file","wait","wait_5_seconds","write_to_file"],"permission_mode":"request-review"}}}
+{"t_ms":1,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":0,"state":"DONE","step_type":"user_input"}}}
+{"t_ms":2,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":1,"state":"DONE","step_type":"agent_response","duration_seconds":2.86246236,"usage":{"input_tokens":11252,"output_tokens":163,"thinking_tokens":0,"cache_read_tokens":0,"total_tokens":11415}}}}
+{"t_ms":3,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":2,"state":"ACTIVE","step_type":"tool","tool_name":"run_command","tool_info":{"name":"run_command","parameters":{"CommandLine":"printf AGY_DENIAL_PROBE"}}}}}
+{"t_ms":4,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":2,"state":"ERROR","step_type":"tool","tool_name":"run_command","duration_seconds":0.002264915,"tool_info":{"name":"run_command","parameters":{"CommandLine":"printf AGY_DENIAL_PROBE"},"error":{"type":"TOOL_ERROR","message":"permission check failed for command \"printf AGY_DENIAL_PROBE\": user denied permission to run command:\nprintf AGY_DENIAL_PROBE\nDo not attempt to circumvent this denial by rephrasing the command, using alternative tools/scripts (e.g. python, sh, curl), or accessing the same target resource. Proceed without performing this action."}}}}}
+{"t_ms":5,"stream":"stdout","data":{"event":"result","result":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","status":"SUCCESS","response":"","duration_seconds":2.890969963,"num_turns":1,"usage":{"input_tokens":11252,"output_tokens":163,"thinking_tokens":0,"cache_read_tokens":0,"total_tokens":11415},"denied_actions":[{"action":"command","display_name":"RunCommand"}]}}}
+{"t_ms":6,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":3,"state":"DONE","step_type":"user_input"}}}
+{"t_ms":7,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":4,"state":"ACTIVE","step_type":"agent_response","text_delta":"FOLLOWUP"}}}
+{"t_ms":8,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":4,"state":"ACTIVE","step_type":"agent_response","text_delta":"_OK"}}}
+{"t_ms":9,"stream":"stdout","data":{"event":"step_update","step_update":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","step_index":4,"state":"DONE","step_type":"agent_response","text_delta":"\n","duration_seconds":2.11565723,"usage":{"input_tokens":11533,"output_tokens":4,"thinking_tokens":0,"cache_read_tokens":0,"total_tokens":11537}}}}
+{"t_ms":10,"stream":"stdout","data":{"event":"result","result":{"conversation_id":"e8243164-64d5-4419-9dbb-c0733300b557","status":"SUCCESS","response":"FOLLOWUP_OK\n","duration_seconds":5.028454184,"num_turns":2,"usage":{"input_tokens":22785,"output_tokens":167,"thinking_tokens":0,"cache_read_tokens":0,"total_tokens":22952},"denied_actions":[{"action":"command","display_name":"RunCommand"}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-match.capture.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.capture.ndjson
new file mode 100644
index 0000000000..89227b65a3
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--model", "gemini-3.8-flash-high", "--effort", "high"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4787, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdin.ndjson
new file mode 100644
index 0000000000..817c98ad5b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 296, "stream": "stdin", "data": {"event": "user", "message": {"content": "Solve 143*127. Think carefully before answering. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdout.ndjson
new file mode 100644
index 0000000000..e56f554df9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-match.stdout.ndjson
@@ -0,0 +1,19 @@
+{"t_ms": 295, "stream": "stdout", "data": {"event": "init", "conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "init": {"model": "gemini-3.8-flash-high", "cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 323, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3877, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "**18,161**\n\n### Step-by-"}}}
+{"t_ms": 3903, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Step Breakdo"}}}
+{"t_ms": 3928, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wn:\nUsing the difference"}}}
+{"t_ms": 3953, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of squares "}}}
+{"t_ms": 3979, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "formula $("}}}
+{"t_ms": 4055, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "a + b)(a - b) = a^2 - b^2$:\n- $143 ="}}}
+{"t_ms": 4081, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " 135"}}}
+{"t_ms": 4132, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " + 8$\n- $127"}}}
+{"t_ms": 4157, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " = 135 - 8$\n\n$$143"}}}
+{"t_ms": 4259, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " \\times 127 = 135^2 - 8^"}}}
+{"t_ms": 4284, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2$$\n$$135"}}}
+{"t_ms": 4385, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "^2 = 18,225$$\n$$8^2 = 64"}}}
+{"t_ms": 4411, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$$\n$$18,22"}}}
+{"t_ms": 4462, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "5 - 64 = \\ma"}}}
+{"t_ms": 4487, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "thbf{18,161}$$"}}}
+{"t_ms": 4640, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 4.300859666, "usage": {"input_tokens": 10982, "output_tokens": 553, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11535}}}}
+{"t_ms": 4640, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "a090b266-2ea9-418c-bb02-c3267268b67b", "status": "SUCCESS", "response": "**18,161**\n\n### Step-by-Step Breakdown:\nUsing the difference of squares formula $(a + b)(a - b) = a^2 - b^2$:\n- $143 = 135 + 8$\n- $127 = 135 - 8$\n\n$$143 \\times 127 = 135^2 - 8^2$$\n$$135^2 = 18,225$$\n$$8^2 = 64$$\n$$18,225 - 64 = \\mathbf{18,161}$$\n", "duration_seconds": 4.326461265, "num_turns": 1, "usage": {"input_tokens": 10982, "output_tokens": 553, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11535}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.capture.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.capture.ndjson
new file mode 100644
index 0000000000..22f8817b70
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--model", "gemini-3.8-flash-high", "--effort", "low"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 5006, "stream": "capture", "data": {"timeout_waiting_for": "init", "seconds": 5}}
+{"t_ms": 5006, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stderr.ndjson
new file mode 100644
index 0000000000..1807a73321
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 296, "stream": "stderr", "data": "error: invalid model selection (--model \"gemini-3.8-flash-high\" --effort \"low\"): --model gemini-3.8-flash-high conflicts with --effort=low"}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stdout.ndjson
new file mode 100644
index 0000000000..b9669aaaf4
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-encoded-mismatch.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 296, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "invalid model selection (--model \"gemini-3.8-flash-high\" --effort \"low\"): --model gemini-3.8-flash-high conflicts with --effort=low", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-mismatch.capture.ndjson b/plugins/antigravity-provider/test/fixtures/effort-mismatch.capture.ndjson
new file mode 100644
index 0000000000..fbee5c5bc5
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-mismatch.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--model", "gemini-3.1-pro-preview", "--effort", "low"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 415, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-mismatch.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/effort-mismatch.stderr.ndjson
new file mode 100644
index 0000000000..6072d28192
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-mismatch.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 298, "stream": "stderr", "data": "error: invalid model selection (--model \"gemini-3.1-pro-preview\" --effort \"low\"): --effort is not supported for model \"gemini-3.1-pro-preview\""}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-mismatch.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/effort-mismatch.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/effort-mismatch.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/effort-mismatch.stdout.ndjson
new file mode 100644
index 0000000000..c0baa6d698
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-mismatch.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 298, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "invalid model selection (--model \"gemini-3.1-pro-preview\" --effort \"low\"): --effort is not supported for model \"gemini-3.1-pro-preview\"", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.capture.ndjson b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.capture.ndjson
new file mode 100644
index 0000000000..47eee607d9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--model", "<REDACTED_REFERENCE>", "--effort", "high"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 358, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stderr.ndjson
new file mode 100644
index 0000000000..f19c83a09b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 287, "stream": "stderr", "data": "error: invalid model selection (--model \"<REDACTED_REFERENCE>\" --effort \"high\"): --effort is not supported for model \"<REDACTED_REFERENCE>\""}
diff --git a/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stdout.ndjson
new file mode 100644
index 0000000000..b85109a9a9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/effort-unsupported-family.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 287, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "invalid model selection (--model \"<REDACTED_REFERENCE>\" --effort \"high\"): --effort is not supported for model \"<REDACTED_REFERENCE>\"", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/help.capture.ndjson b/plugins/antigravity-provider/test/fixtures/help.capture.ndjson
new file mode 100644
index 0000000000..6e88cd1f4f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/help.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--help"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 209, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/help.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/help.stderr.ndjson
new file mode 100644
index 0000000000..3a8e68bf4b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/help.stderr.ndjson
@@ -0,0 +1,39 @@
+{"t_ms": 195, "stream": "stderr", "data": "Usage of agy:"}
+{"t_ms": 195, "stream": "stderr", "data": "  --add-dir                       Add a directory to the workspace (repeatable) (default [])"}
+{"t_ms": 195, "stream": "stderr", "data": "  --agent                         Agent for the current CLI session"}
+{"t_ms": 195, "stream": "stderr", "data": "  -c                              Short alias for --continue"}
+{"t_ms": 195, "stream": "stderr", "data": "  --continue                      Continue the most recent conversation"}
+{"t_ms": 195, "stream": "stderr", "data": "  --conversation                  Resume a previous conversation by ID"}
+{"t_ms": 195, "stream": "stderr", "data": "  --dangerously-skip-permissions  Auto-approve all tool permission requests without prompting"}
+{"t_ms": 195, "stream": "stderr", "data": "  --disable-slash-commands        Disable slash command and skill expansion in print mode"}
+{"t_ms": 195, "stream": "stderr", "data": "  --effort                        Reasoning effort for the current CLI session (low|medium|high|max)"}
+{"t_ms": 195, "stream": "stderr", "data": "  -i                              Short alias for --prompt-interactive"}
+{"t_ms": 195, "stream": "stderr", "data": "  --input-format                  Input format for print mode (text, stream-json). stream-json reads one NDJSON message per line from stdin and runs a turn for each; it requires --output-format stream-json (default text)"}
+{"t_ms": 195, "stream": "stderr", "data": "  --json-schema                   Optional JSON schema string or path to a schema file to enforce structured output (for stream-json, only applicable to the final result)"}
+{"t_ms": 195, "stream": "stderr", "data": "  --log-file                      Override CLI log file path"}
+{"t_ms": 196, "stream": "stderr", "data": "  --mode                          Set the agent execution mode for this session (accept-edits, plan)"}
+{"t_ms": 196, "stream": "stderr", "data": "  --model                         Model for the current CLI session"}
+{"t_ms": 196, "stream": "stderr", "data": "  --new-project                   Create a new project for this session"}
+{"t_ms": 196, "stream": "stderr", "data": "  --output-format                 Output format for print mode (text, json, stream-json) (default text)"}
+{"t_ms": 196, "stream": "stderr", "data": "  -p                              Short alias for --print"}
+{"t_ms": 196, "stream": "stderr", "data": "  --print                         Run a single prompt non-interactively and print the response"}
+{"t_ms": 196, "stream": "stderr", "data": "  --print-timeout                 Optional time limit for print mode; 0 waits until the turn completes (default 0s)"}
+{"t_ms": 196, "stream": "stderr", "data": "  --project                       Project ID or project name for the current CLI session"}
+{"t_ms": 196, "stream": "stderr", "data": "  --prompt                        Alias for --print"}
+{"t_ms": 196, "stream": "stderr", "data": "  --prompt-interactive            Run an initial prompt interactively and continue the session"}
+{"t_ms": 196, "stream": "stderr", "data": "  --remote-control                Create a remote connection for the CLI session on start up"}
+{"t_ms": 196, "stream": "stderr", "data": "  --sandbox                       Run in a sandbox with terminal restrictions enabled"}
+{"t_ms": 196, "stream": "stderr", "data": ""}
+{"t_ms": 196, "stream": "stderr", "data": "Available subcommands:"}
+{"t_ms": 196, "stream": "stderr", "data": "  agent           List available agents"}
+{"t_ms": 196, "stream": "stderr", "data": "  agents          List available agents"}
+{"t_ms": 196, "stream": "stderr", "data": "  changelog       Show changelog and release notes"}
+{"t_ms": 196, "stream": "stderr", "data": "  help            Show help for subcommands"}
+{"t_ms": 196, "stream": "stderr", "data": "  install         Configure environment paths and shell settings"}
+{"t_ms": 196, "stream": "stderr", "data": "  mcp             Manage MCP servers (add, remove, list, enable, disable)"}
+{"t_ms": 196, "stream": "stderr", "data": "  mic-serve       Serve this machine's microphone to a CLI on another host"}
+{"t_ms": 196, "stream": "stderr", "data": "  models          List available models"}
+{"t_ms": 196, "stream": "stderr", "data": "  plugin          Manage plugins (install, uninstall, list, enable, disable)"}
+{"t_ms": 196, "stream": "stderr", "data": "  plugins         Alias for plugin"}
+{"t_ms": 196, "stream": "stderr", "data": "  remote-control  Manage the remote-control background daemon (start, status, stop)"}
+{"t_ms": 196, "stream": "stderr", "data": "  update          Update CLI"}
diff --git a/plugins/antigravity-provider/test/fixtures/help.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/help.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/help.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/help.stdout.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/image-content.capture.ndjson b/plugins/antigravity-provider/test/fixtures/image-content.capture.ndjson
new file mode 100644
index 0000000000..a2351ec906
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-content.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 383, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/image-content.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/image-content.stderr.ndjson
new file mode 100644
index 0000000000..3224b28fcc
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-content.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 294, "stream": "stderr", "data": "error: stream input content block type \"image\" is not supported (only \"text\")"}
diff --git a/plugins/antigravity-provider/test/fixtures/image-content.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/image-content.stdin.ndjson
new file mode 100644
index 0000000000..fd1966ad02
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-content.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 294, "stream": "stdin", "data": {"event": "user", "message": {"content": [{"type": "text", "text": "Describe this image."}, {"type": "image", "source": {"type": "base64", "media_type": "image/png", "data": "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aN1sAAAAASUVORK5CYII="}}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/image-content.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/image-content.stdout.ndjson
new file mode 100644
index 0000000000..07cb4f0703
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-content.stdout.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 294, "stream": "stdout", "data": {"event": "init", "conversation_id": "71e19e79-63e3-4a7b-b628-822e69618edc", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 294, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "71e19e79-63e3-4a7b-b628-822e69618edc", "status": "ERROR", "response": "", "error": "stream input content block type \"image\" is not supported (only \"text\")", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/image-file-external.capture.ndjson b/plugins/antigravity-provider/test/fixtures/image-file-external.capture.ndjson
new file mode 100644
index 0000000000..90d75443bc
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-file-external.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/image-file-external-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 7877, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/image-file-external.png b/plugins/antigravity-provider/test/fixtures/image-file-external.png
new file mode 100644
index 0000000000..de622fdd72
Binary files /dev/null and b/plugins/antigravity-provider/test/fixtures/image-file-external.png differ
diff --git a/plugins/antigravity-provider/test/fixtures/image-file-external.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/image-file-external.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/image-file-external.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/image-file-external.stdin.ndjson
new file mode 100644
index 0000000000..8dcd1a238a
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-file-external.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 320, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use view_file to open the attached image at <CAPTURE>/owned/attachment.png. Describe the shapes and colors visible. Do not use shell or code to infer the pixels."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/image-file-external.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/image-file-external.stdout.ndjson
new file mode 100644
index 0000000000..77f1580b85
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/image-file-external.stdout.ndjson
@@ -0,0 +1,14 @@
+{"t_ms": 320, "stream": "stdout", "data": {"event": "init", "conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 347, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4057, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.704260379, "usage": {"input_tokens": 11275, "output_tokens": 384, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11659}}}}
+{"t_ms": 4057, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/attachment.png"}}}}}
+{"t_ms": 4057, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003012462, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/attachment.png"}}}}}
+{"t_ms": 7530, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Based on the image at [/"}}}
+{"t_ms": 7555, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p2/o"}}}
+{"t_ms": 7581, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wned/attachment.png](fil"}}}
+{"t_ms": 7606, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e:///tmp/agy"}}}
+{"t_ms": 7631, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "-p2/owned/attachment.png"}}}
+{"t_ms": 7657, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "), here are "}}}
+{"t_ms": 7682, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "the visible shapes and colors:\n\n- **Red Triangl"}}}
+{"t_ms": 7708, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "e**: A solid red triangle positioned on the left side, pointing upwards.\n- **Blue Circle**: A solid blue circle positioned on the lower right side.\n- **Background**: Solid white.\n", "duration_seconds": 3.629267516, "usage": {"input_tokens": 13749, "output_tokens": 170, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13919}}}}
+{"t_ms": 7708, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "0c498203-4202-446f-8df1-dfa8f16cb19d", "status": "SUCCESS", "response": "Based on the image at [<CAPTURE>/owned/attachment.png](file://<CAPTURE>/owned/attachment.png), here are the visible shapes and colors:\n\n- **Red Triangle**: A solid red triangle positioned on the left side, pointing upwards.\n- **Blue Circle**: A solid blue circle positioned on the lower right side.\n- **Background**: Solid white.\n", "duration_seconds": 7.367115828, "num_turns": 1, "usage": {"input_tokens": 25024, "output_tokens": 554, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 25578}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add-http.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add-http.capture.ndjson
new file mode 100644
index 0000000000..c04b13268d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-add-http.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "mcp", "add", "phase0", "http://127.0.0.1:<PORT>/mcp"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 68, "stream": "capture", "data": {"written_file": "<HOME>/.gemini/config/mcp_config.json", "content": {"mcpServers": {"phase0": {"disabled": false, "serverUrl": "http://127.0.0.1:<PORT>/mcp"}}}}}
+{"t_ms": 69, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add-http.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add-http.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add-http.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add-http.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add-http.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add-http.stdout.ndjson
new file mode 100644
index 0000000000..05d385caa8
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-add-http.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 63, "stream": "stdout", "data": "Added MCP server \"phase0\" (http)"}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add.capture.ndjson
new file mode 100644
index 0000000000..d115585bec
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-add.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "mcp", "add", "phase0", "--url", "http://127.0.0.1:<PORT>/mcp"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 82, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add.stderr.ndjson
new file mode 100644
index 0000000000..81181df217
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-add.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 76, "stream": "stderr", "data": "Error: invalid command \"--url\": flags must come before the server name (usage: mcp add [flags] <name> <commandOrUrl> [args...])"}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-add.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-add.stdout.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.capture.ndjson
new file mode 100644
index 0000000000..0885d233a5
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<CAPTURE>/owned", "--add-dir", "<WORKSPACE>", "--agent", "phase2", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/mcp-agent-definition-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 6091, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdin.ndjson
new file mode 100644
index 0000000000..8daf16fd52
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 311, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase2 MCP echo tool with text PHASE2_DISCOVERY. Then use run_command pwd and report the workspace directory. Do not choose a different directory."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdout.ndjson
new file mode 100644
index 0000000000..854e8701ce
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-definition.stdout.ndjson
@@ -0,0 +1,15 @@
+{"t_ms": 311, "stream": "stdout", "data": {"event": "init", "conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "init": {"cwd": "<WORKSPACE>", "agent": "phase2", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 340, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4006, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.658926744, "usage": {"input_tokens": 11286, "output_tokens": 361, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11647}}}}
+{"t_ms": 4006, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 4006, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.008819631, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<CAPTURE>/owned\r\n"}}}}
+{"t_ms": 5473, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The "}}}
+{"t_ms": 5603, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`phase2 MCP echo tool` is not availa"}}}
+{"t_ms": 5626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ble in the tool definiti"}}}
+{"t_ms": 5652, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ons provided"}}}
+{"t_ms": 5678, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " in this"}}}
+{"t_ms": 5856, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " environment.\n\nRunning `"}}}
+{"t_ms": 5881, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pwd` in the workspace re"}}}
+{"t_ms": 5907, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ports the directory:\n`/t"}}}
+{"t_ms": 5932, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "mp/agy-p2/owned`\n", "duration_seconds": 1.928095705, "usage": {"input_tokens": 11417, "output_tokens": 43, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11460}}}}
+{"t_ms": 5932, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7240f716-f2bd-4641-b210-a4a282a756f7", "status": "SUCCESS", "response": "The `phase2 MCP echo tool` is not available in the tool definitions provided in this environment.\n\nRunning `pwd` in the workspace reports the directory:\n`<CAPTURE>/owned`\n", "duration_seconds": 5.61440038, "num_turns": 1, "usage": {"input_tokens": 22703, "output_tokens": 404, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23107}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.capture.ndjson
new file mode 100644
index 0000000000..c5d6ddd6fd
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<CAPTURE>/owned", "--add-dir", "<WORKSPACE>", "--agent", "phase2", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/mcp-agent-discovered-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 5524, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdin.ndjson
new file mode 100644
index 0000000000..d8cfdf92de
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 324, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase2 MCP echo tool with text PHASE2_DISCOVERY. Then use run_command pwd and report the workspace directory. Do not choose a different directory."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdout.ndjson
new file mode 100644
index 0000000000..a275715465
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-discovered.stdout.ndjson
@@ -0,0 +1,19 @@
+{"t_ms": 324, "stream": "stdout", "data": {"event": "init", "conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "init": {"cwd": "<WORKSPACE>", "agent": "phase2", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 356, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3842, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.487178538, "usage": {"input_tokens": 11279, "output_tokens": 433, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11712}}}}
+{"t_ms": 3842, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 3867, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.008305961, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<CAPTURE>/owned\r\n"}}}}
+{"t_ms": 5050, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "1."}}}
+{"t_ms": 5177, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " **MCP Echo "}}}
+{"t_ms": 5203, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Tool**: There is no MCP "}}}
+{"t_ms": 5228, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`echo` tool "}}}
+{"t_ms": 5254, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "registered or available "}}}
+{"t_ms": 5279, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "in the current environme"}}}
+{"t_ms": 5304, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nt/tool definit"}}}
+{"t_ms": 5330, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ions.\n2. **Workspace Dir"}}}
+{"t_ms": 5355, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ectory**: Ra"}}}
+{"t_ms": 5381, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "n `pwd` in the current w"}}}
+{"t_ms": 5406, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orkspace directory and o"}}}
+{"t_ms": 5432, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "btained:\n   ```\n   /tmp/"}}}
+{"t_ms": 5457, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "agy-p2/owned\n   ```\n", "duration_seconds": 1.60141087, "usage": {"input_tokens": 11407, "output_tokens": 62, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11469}}}}
+{"t_ms": 5457, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b4d0a25b-bb0a-4495-84af-247f689ba6ad", "status": "SUCCESS", "response": "1. **MCP Echo Tool**: There is no MCP `echo` tool registered or available in the current environment/tool definitions.\n2. **Workspace Directory**: Ran `pwd` in the current workspace directory and obtained:\n   ```\n   <CAPTURE>/owned\n   ```\n", "duration_seconds": 5.118791831, "num_turns": 1, "usage": {"input_tokens": 22686, "output_tokens": 495, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23181}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-file.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.capture.ndjson
new file mode 100644
index 0000000000..57d8da6b18
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands", "--dangerously-skip-permissions", "--add-dir", "<WORKSPACE>", "--agent", "<CAPTURE>/owned/agent.md"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/mcp-agent-file-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 12172, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdin.ndjson
new file mode 100644
index 0000000000..21feb61a76
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 305, "stream": "stdin", "data": {"event": "user", "message": {"content": "First call the phase2 MCP echo tool with text PHASE2_DISCOVERY. If unavailable say MCP_UNAVAILABLE. Then use shell pwd, read input.txt and write output.txt containing PHASE2_WRITE. Use the workspace default directory, without me supplying absolute paths. Report the exact paths used."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdout.ndjson
new file mode 100644
index 0000000000..3d172dbe90
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-agent-file.stdout.ndjson
@@ -0,0 +1,39 @@
+{"t_ms": 305, "stream": "stdout", "data": {"event": "init", "conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "init": {"cwd": "<WORKSPACE>", "agent": "<CAPTURE>/owned/agent.md", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 334, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4780, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 4.446916168, "usage": {"input_tokens": 11298, "output_tokens": 523, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11821}}}}
+{"t_ms": 4780, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 4780, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.007696421, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<WORKSPACE>\r\n"}}}}
+{"t_ms": 6843, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.062108191, "usage": {"input_tokens": 11436, "output_tokens": 47, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11483}}}}
+{"t_ms": 6843, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 6869, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 4, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002313647, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "1 lines, 23 bytes"}}}}
+{"t_ms": 8781, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.919162211, "usage": {"input_tokens": 11654, "output_tokens": 79, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11733}}}}
+{"t_ms": 8781, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 8781, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003384418, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 11046, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "MCP_"}}}
+{"t_ms": 11224, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "UNAVAILABLE\n\n### Execution Summary\n\n"}}}
+{"t_ms": 11249, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "1. **MCP Ech"}}}
+{"t_ms": 11275, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o Tool Check**:\n"}}}
+{"t_ms": 11402, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "   - Status: MCP echo to"}}}
+{"t_ms": 11427, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ol was not a"}}}
+{"t_ms": 11452, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "vailable in the active e"}}}
+{"t_ms": 11478, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nvironment tools (`MCP_U"}}}
+{"t_ms": 11504, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "NAVAILABLE`).\n\n2. **Work"}}}
+{"t_ms": 11529, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing Directory (`pwd`)**:"}}}
+{"t_ms": 11554, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n   - Output"}}}
+{"t_ms": 11580, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ": `<WORKSPACE>"}}}
+{"t_ms": 11605, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`\n\n3. **Read File**:"}}}
+{"t_ms": 11630, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n   - Path: "}}}
+{"t_ms": 11656, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "[input.txt](file:///tmp/"}}}
+{"t_ms": 11681, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p2/works"}}}
+{"t_ms": 11706, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pace/"}}}
+{"t_ms": 11732, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "input.txt)\n "}}}
+{"t_ms": 11757, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "  - Content: `PHASE2_WOR"}}}
+{"t_ms": 11783, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "KSPACE_MARKER`\n\n4. **Wri"}}}
+{"t_ms": 11808, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tten"}}}
+{"t_ms": 11859, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " File**:\n   "}}}
+{"t_ms": 11885, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "- Path: [output.txt](fil"}}}
+{"t_ms": 11910, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e://<CAPTURE>/workspac"}}}
+{"t_ms": 11936, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e/output.txt)\n   - C"}}}
+{"t_ms": 11961, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ontent: `PHASE2_WRITE`"}}}
+{"t_ms": 12037, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "step_index": 7, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.264948634, "usage": {"input_tokens": 11821, "output_tokens": 155, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11976}}}}
+{"t_ms": 12063, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "a6983f10-58bf-4679-bd90-b66865c3bf93", "status": "SUCCESS", "response": "MCP_UNAVAILABLE\n\n### Execution Summary\n\n1. **MCP Echo Tool Check**:\n   - Status: MCP echo tool was not available in the active environment tools (`MCP_UNAVAILABLE`).\n\n2. **Working Directory (`pwd`)**:\n   - Output: `<WORKSPACE>`\n\n3. **Read File**:\n   - Path: [input.txt](file://<WORKSPACE>/input.txt)\n   - Content: `PHASE2_WORKSPACE_MARKER`\n\n4. **Written File**:\n   - Path: [output.txt](file://<WORKSPACE>/output.txt)\n   - Content: `PHASE2_WRITE`\n", "duration_seconds": 11.727995605, "num_turns": 1, "usage": {"input_tokens": 46209, "output_tokens": 804, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 47013}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-global.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-global.capture.ndjson
new file mode 100644
index 0000000000..452d5e7036
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-global.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 9237, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-global.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-global.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-global.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-global.stdin.ndjson
new file mode 100644
index 0000000000..cf779b2f3b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-global.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 300, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase0 MCP echo tool with text PHASE0_MCP. Do not use shell. If unavailable say UNAVAILABLE."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-global.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-global.stdout.ndjson
new file mode 100644
index 0000000000..06b16f0005
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-global.stdout.ndjson
@@ -0,0 +1,14 @@
+{"t_ms": 300, "stream": "stdout", "data": {"event": "init", "conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 328, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3784, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.433302844, "usage": {"input_tokens": 11924, "output_tokens": 406, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12330}}}}
+{"t_ms": 3784, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}}}}}
+{"t_ms": 3784, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003012222, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 5749, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.966909166, "usage": {"input_tokens": 12221, "output_tokens": 63, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12284}}}}
+{"t_ms": 5749, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 5749, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.004579062, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 7536, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.781658824, "usage": {"input_tokens": 12407, "output_tokens": 60, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12467}}}}
+{"t_ms": 7536, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 7536, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 6, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.003570676, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 8744, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "UNAVAILABLE"}}}
+{"t_ms": 9073, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "step_index": 7, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.522542972, "usage": {"input_tokens": 12590, "output_tokens": 2, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12592}}}}
+{"t_ms": 9073, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "status": "SUCCESS", "response": "UNAVAILABLE\n", "duration_seconds": 8.74880144, "num_turns": 1, "usage": {"input_tokens": 49142, "output_tokens": 531, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 49673}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-help.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-help.capture.ndjson
new file mode 100644
index 0000000000..64ea60355d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-help.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "mcp", "add", "--help"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 75, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-help.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-help.stderr.ndjson
new file mode 100644
index 0000000000..93f2f5abb9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-help.stderr.ndjson
@@ -0,0 +1,28 @@
+{"t_ms": 69, "stream": "stderr", "data": "Usage: agy mcp add [flags] <name> <commandOrUrl> [args...]"}
+{"t_ms": 69, "stream": "stderr", "data": ""}
+{"t_ms": 69, "stream": "stderr", "data": "Add or update an MCP server configuration"}
+{"t_ms": 69, "stream": "stderr", "data": ""}
+{"t_ms": 69, "stream": "stderr", "data": "Flags:"}
+{"t_ms": 69, "stream": "stderr", "data": "  -H        Short alias for --header (default [])"}
+{"t_ms": 69, "stream": "stderr", "data": "  -e        Short alias for --env (default [])"}
+{"t_ms": 69, "stream": "stderr", "data": "  --env     Environment variable KEY=value (repeatable) (default [])"}
+{"t_ms": 69, "stream": "stderr", "data": "  -h        Show help"}
+{"t_ms": 69, "stream": "stderr", "data": "  --header  HTTP header Key: Value (repeatable) (default [])"}
+{"t_ms": 69, "stream": "stderr", "data": "  --help    Show help"}
+{"t_ms": 69, "stream": "stderr", "data": "  -t        Short alias for --type (default stdio)"}
+{"t_ms": 69, "stream": "stderr", "data": "  --type    Server type: 'stdio' or 'http' (default stdio)"}
+{"t_ms": 69, "stream": "stderr", "data": ""}
+{"t_ms": 69, "stream": "stderr", "data": "Arguments:"}
+{"t_ms": 69, "stream": "stderr", "data": "  <name>          Unique name for the server."}
+{"t_ms": 69, "stream": "stderr", "data": "  <commandOrUrl>  Executable for a stdio server, or the URL for an http server."}
+{"t_ms": 69, "stream": "stderr", "data": "  [args...]       Arguments passed to the stdio command."}
+{"t_ms": 69, "stream": "stderr", "data": ""}
+{"t_ms": 69, "stream": "stderr", "data": "Notes:"}
+{"t_ms": 69, "stream": "stderr", "data": "  Flags must come before <name>; a flag placed after it is rejected."}
+{"t_ms": 69, "stream": "stderr", "data": "  http/https URLs are detected automatically, so --type is usually unnecessary."}
+{"t_ms": 69, "stream": "stderr", "data": "  Use -- before the command to pass a command or args that begin with '-'."}
+{"t_ms": 69, "stream": "stderr", "data": ""}
+{"t_ms": 69, "stream": "stderr", "data": "Examples:"}
+{"t_ms": 69, "stream": "stderr", "data": "  agy mcp add fs npx -y <REDACTED_REFERENCE> /work"}
+{"t_ms": 69, "stream": "stderr", "data": "  agy mcp add --header \"<HEADER_NAME>: <HEADER_VALUE>\" api https://example.com/mcp"}
+{"t_ms": 69, "stream": "stderr", "data": "  agy mcp add --env <ENV_NAME>=<ENV_VALUE> gh -- docker run -i <REDACTED_REFERENCE>"}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-help.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-help.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-help.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-help.stdout.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-http.requests.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-http.requests.ndjson
new file mode 100644
index 0000000000..ebe28a2ddb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-http.requests.ndjson
@@ -0,0 +1,20 @@
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 1, "method": "server/discover", "params": {"_meta": {"io.modelcontextprotocol/clientCapabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}, "io.modelcontextprotocol/clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "io.modelcontextprotocol/protocolVersion": "2026-07-28"}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 2, "method": "initialize", "params": {"clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "protocolVersion": "2025-11-25", "capabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "method": "notifications/roots/list_changed", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "method": "notifications/initialized", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 3, "method": "tools/list", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "method": "notifications/roots/list_changed", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 4, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/e21f27e1-de55-4f15-a93f-9f70d726915e", "antigravity.google/conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "progressToken": "88c11f68-c1b5-46f7-ae6d-1cb662c4ca0c:4"}, "name": "echo", "arguments": "{\"text\": \"PHASE0_MCP\"}"}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 5, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/e21f27e1-de55-4f15-a93f-9f70d726915e", "antigravity.google/conversation_id": "e21f27e1-de55-4f15-a93f-9f70d726915e", "progressToken": "88c11f68-c1b5-46f7-ae6d-1cb662c4ca0c:6"}, "name": "echo", "arguments": "{\"text\":\"PHASE0_MCP\"}"}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 1, "method": "server/discover", "params": {"_meta": {"io.modelcontextprotocol/clientCapabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}, "io.modelcontextprotocol/clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "io.modelcontextprotocol/protocolVersion": "2026-07-28"}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 2, "method": "initialize", "params": {"clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "protocolVersion": "2025-11-25", "capabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "method": "notifications/initialized", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 3, "method": "tools/list", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 4, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/89273b5a-77cd-4d4b-ac80-4475b2c751d0", "antigravity.google/conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "progressToken": "c009d4b2-d4f6-44f3-9a29-1b0092eb123f:4"}, "name": "echo", "arguments": "{\"text\":\"PHASE0_MCP\"}"}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 5, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/89273b5a-77cd-4d4b-ac80-4475b2c751d0", "antigravity.google/conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "progressToken": "c009d4b2-d4f6-44f3-9a29-1b0092eb123f:6"}, "name": "echo", "arguments": "{\"text\": \"PHASE0_MCP\"}"}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 1, "method": "server/discover", "params": {"_meta": {"io.modelcontextprotocol/clientCapabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}, "io.modelcontextprotocol/clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "io.modelcontextprotocol/protocolVersion": "2026-07-28"}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 2, "method": "initialize", "params": {"clientInfo": {"name": "antigravity-client", "version": "v1.0.0"}, "protocolVersion": "2025-11-25", "capabilities": {"elicitation": {"form": {}, "url": {}}, "roots": {"listChanged": true}}}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "method": "notifications/initialized", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 3, "method": "tools/list", "params": {}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 4, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "antigravity.google/conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "progressToken": "d3dee97c-770c-4268-86af-baa39125d7c0:4"}, "name": "echo", "arguments": "{\"text\":\"PHASE0_MCP\"}"}}}}
+{"stream": "http_request", "data": {"direction": "server_to_mcp", "message": {"jsonrpc": "2.0", "id": 5, "method": "tools/call", "params": {"_meta": {"antigravity.google/artifacts_dir": "<HOME>/.gemini/antigravity-cli/brain/0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "antigravity.google/conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "progressToken": "d3dee97c-770c-4268-86af-baa39125d7c0:6"}, "name": "echo", "arguments": "null"}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-list.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-list.capture.ndjson
new file mode 100644
index 0000000000..a7a6d66835
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-list.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "mcp", "list"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 71, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-list.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-list.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-list.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-list.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-list.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-list.stdout.ndjson
new file mode 100644
index 0000000000..644935d9f8
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-list.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 65, "stream": "stdout", "data": "No MCP servers configured."}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.capture.ndjson
new file mode 100644
index 0000000000..ec822f7c19
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands", "--dangerously-skip-permissions", "--add-dir", "<WORKSPACE>"], "cwd": "<CAPTURE>/owned-parent/workspace", "home": "<CAPTURE>/mcp-owned-cwd-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}, "cwd_realpath": "<CAPTURE>/owned"}}
+{"t_ms": 21316, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdin.ndjson
new file mode 100644
index 0000000000..4606a29d9d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 299, "stream": "stdin", "data": {"event": "user", "message": {"content": "First call the phase2 MCP echo tool with text PHASE2_DISCOVERY. If unavailable say MCP_UNAVAILABLE. Then use shell pwd, read input.txt and write output.txt containing PHASE2_WRITE. Use the workspace default directory, without me supplying absolute paths. Report the exact paths used."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdout.ndjson
new file mode 100644
index 0000000000..fd49e1756a
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-cwd.stdout.ndjson
@@ -0,0 +1,95 @@
+{"t_ms": 299, "stream": "stdout", "data": {"event": "init", "conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "init": {"cwd": "<CAPTURE>/owned", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 353, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4289, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.923817807, "usage": {"input_tokens": 11986, "output_tokens": 312, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12298}}}}
+{"t_ms": 4289, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-owned-cwd-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}}}}}
+{"t_ms": 4289, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003110546, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-owned-cwd-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 6028, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.727561556, "usage": {"input_tokens": 12292, "output_tokens": 64, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12356}}}}
+{"t_ms": 6028, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}}}}}
+{"t_ms": 6028, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.003994388, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 7764, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.73152143, "usage": {"input_tokens": 12479, "output_tokens": 63, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12542}}}}
+{"t_ms": 7764, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}}}}}
+{"t_ms": 7764, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 6, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.003571568, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 9626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.8600456250000001, "usage": {"input_tokens": 12665, "output_tokens": 70, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12735}}}}
+{"t_ms": 9626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 9626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.005713043, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<CAPTURE>/owned\r\n"}}}}
+{"t_ms": 11152, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 9, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.5154668610000002, "usage": {"input_tokens": 12800, "output_tokens": 47, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12847}}}}
+{"t_ms": 11152, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 10, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}}}}}
+{"t_ms": 11152, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 10, "state": "ERROR", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002729213, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}, "error": {"type": "TOOL_ERROR", "message": "declaring permissions: cortex tool view_file: convert tool call for permissions: model output error: invalid tool call error (invalid_args) failed to read file: stat <CAPTURE>/owned/input.txt: no such file or directory"}}}}}
+{"t_ms": 13856, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.6989989100000003, "usage": {"input_tokens": 12961, "output_tokens": 48, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13009}}}}
+{"t_ms": 13856, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 13856, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 12, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002359752, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "1 lines, 23 bytes"}}}}
+{"t_ms": 15999, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 13, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.144108405, "usage": {"input_tokens": 13180, "output_tokens": 78, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13258}}}}
+{"t_ms": 15999, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 14, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 15999, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 14, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.004225731, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 17563, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 15, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.5609718259999998, "usage": {"input_tokens": 13346, "output_tokens": 79, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13425}}}}
+{"t_ms": 17563, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 16, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 17563, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 16, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003200805, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 18830, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "### Phase"}}}
+{"t_ms": 19110, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " 2 MCP Tool Call\nThe `ph"}}}
+{"t_ms": 19134, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ase2` MCP server was cal"}}}
+{"t_ms": 19160, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "led with `ec"}}}
+{"t_ms": 19185, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ho`, but tool execution "}}}
+{"t_ms": 19211, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "returned a p"}}}
+{"t_ms": 19237, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "arameter parsing error (`invalid_typ"}}}
+{"t_ms": 19262, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e: expected record, rece"}}}
+{"t_ms": 19288, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ived string`"}}}
+{"t_ms": 19314, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " when passing arguments)"}}}
+{"t_ms": 19339, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ". Therefore:"}}}
+{"t_ms": 19365, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " **MCP_UNAVAILABLE** (or"}}}
+{"t_ms": 19390, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " encounterin"}}}
+{"t_ms": 19416, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "g invocation schema incompatibilitie"}}}
+{"t_ms": 19441, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s).\n\n---\n\n### Shell `pwd"}}}
+{"t_ms": 19466, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`\nExecuted `"}}}
+{"t_ms": 19492, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pwd` in the default comm"}}}
+{"t_ms": 19517, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "and working "}}}
+{"t_ms": 19544, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "directory:\n- **Default CWD:** `/tmp/"}}}
+{"t_ms": 19570, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p2/owned`\n\n---\n\n### "}}}
+{"t_ms": 19595, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "File Operati"}}}
+{"t_ms": 19621, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ons\n1. **Read `input.txt"}}}
+{"t_ms": 19646, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`:**\n   - Attempted: [`<CAPTURE>/o"}}}
+{"t_ms": 19672, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wned/input.t"}}}
+{"t_ms": 19698, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "xt`](file://<CAPTURE>/"}}}
+{"t_ms": 19723, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "owned/"}}}
+{"t_ms": 19774, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "input.txt) (not present)\n   - Read f"}}}
+{"t_ms": 19799, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rom:"}}}
+{"t_ms": 19879, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [`<WORKSPACE>"}}}
+{"t_ms": 19905, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/input.txt`](file:///tmp"}}}
+{"t_ms": 19930, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/agy-p2/work"}}}
+{"t_ms": 19956, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "space/input.txt)\n   - Content: `PHAS"}}}
+{"t_ms": 19981, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "E2_WORKSPACE"}}}
+{"t_ms": 20006, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "_MARKER`\n\n2. **Wrote `ou"}}}
+{"t_ms": 20032, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tput.txt`:**\n"}}}
+{"t_ms": 20083, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "   - Written"}}}
+{"t_ms": 20109, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " to: [`/tmp/"}}}
+{"t_ms": 20134, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p2/owned/output.txt`"}}}
+{"t_ms": 20160, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "](file:///tmp/agy-p"}}}
+{"t_ms": 20185, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2/owned/output.txt) (def"}}}
+{"t_ms": 20211, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ault CWD)\n   - Also writ"}}}
+{"t_ms": 20237, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ten to:"}}}
+{"t_ms": 20364, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [`/tmp/agy-"}}}
+{"t_ms": 20389, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "p2/workspace/output.txt`"}}}
+{"t_ms": 20415, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "](file://<CAPTURE>/wor"}}}
+{"t_ms": 20440, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "kspace/outpu"}}}
+{"t_ms": 20465, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t.txt) ("}}}
+{"t_ms": 20491, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "active workspace directo"}}}
+{"t_ms": 20517, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ry)\n   - Content: `PHASE"}}}
+{"t_ms": 20542, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2_WRITE`\n\n---\n\n### Exact"}}}
+{"t_ms": 20568, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Paths Used\n"}}}
+{"t_ms": 20644, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "- **Shell CWD:** `/tmp/a"}}}
+{"t_ms": 20671, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "gy-p2/owned`\n- **Input p"}}}
+{"t_ms": 20695, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ath:**"}}}
+{"t_ms": 20747, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [`<WORKSPACE>"}}}
+{"t_ms": 20773, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/input.txt`](file:///tmp"}}}
+{"t_ms": 20799, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/agy-p2/workspace/input."}}}
+{"t_ms": 20824, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "txt"}}}
+{"t_ms": 20850, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ")\n- **Output path:** [`/"}}}
+{"t_ms": 20876, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p2/o"}}}
+{"t_ms": 20901, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wned/output.txt`](file:/"}}}
+{"t_ms": 20927, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "//"}}}
+{"t_ms": 20952, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p2/o"}}}
+{"t_ms": 20978, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wned/output.txt) &"}}}
+{"t_ms": 21105, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [`<WORKSPACE>"}}}
+{"t_ms": 21131, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/output.txt`"}}}
+{"t_ms": 21156, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "](file://<CAPTURE>/wor"}}}
+{"t_ms": 21181, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "step_index": 17, "state": "DONE", "step_type": "agent_response", "text_delta": "kspace/output.txt)\n", "duration_seconds": 3.625222904, "usage": {"input_tokens": 13513, "output_tokens": 439, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13952}}}}
+{"t_ms": 21207, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "09af3250-b019-4549-80fe-e2fb138a02be", "status": "SUCCESS", "response": "### Phase 2 MCP Tool Call\nThe `phase2` MCP server was called with `echo`, but tool execution returned a parameter parsing error (`invalid_type: expected record, received string` when passing arguments). Therefore: **MCP_UNAVAILABLE** (or encountering invocation schema incompatibilities).\n\n---\n\n### Shell `pwd`\nExecuted `pwd` in the default command working directory:\n- **Default CWD:** `<CAPTURE>/owned`\n\n---\n\n### File Operations\n1. **Read `input.txt`:**\n   - Attempted: [`<CAPTURE>/owned/input.txt`](file://<CAPTURE>/owned/input.txt) (not present)\n   - Read from: [`<WORKSPACE>/input.txt`](file://<WORKSPACE>/input.txt)\n   - Content: `PHASE2_WORKSPACE_MARKER`\n\n2. **Wrote `output.txt`:**\n   - Written to: [`<CAPTURE>/owned/output.txt`](file://<CAPTURE>/owned/output.txt) (default CWD)\n   - Also written to: [`<WORKSPACE>/output.txt`](file://<WORKSPACE>/output.txt) (active workspace directory)\n   - Content: `PHASE2_WRITE`\n\n---\n\n### Exact Paths Used\n- **Shell CWD:** `<CAPTURE>/owned`\n- **Input path:** [`<WORKSPACE>/input.txt`](file://<WORKSPACE>/input.txt)\n- **Output path:** [`<CAPTURE>/owned/output.txt`](file://<CAPTURE>/owned/output.txt) & [`<WORKSPACE>/output.txt`](file://<WORKSPACE>/output.txt)\n", "duration_seconds": 20.876486639, "num_turns": 1, "usage": {"input_tokens": 115222, "output_tokens": 1200, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 116422}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.capture.ndjson
new file mode 100644
index 0000000000..ea2081bbd9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands", "--dangerously-skip-permissions", "--add-dir", "<CAPTURE>/owned", "--add-dir", "<WORKSPACE>"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/mcp-owned-first-add-dir-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 23197, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdin.ndjson
new file mode 100644
index 0000000000..1cb2727caa
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 307, "stream": "stdin", "data": {"event": "user", "message": {"content": "First call the phase2 MCP echo tool with text PHASE2_DISCOVERY. If unavailable say MCP_UNAVAILABLE. Then use shell pwd, read input.txt and write output.txt containing PHASE2_WRITE. Use the workspace default directory, without me supplying absolute paths. Report the exact paths used."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdout.ndjson
new file mode 100644
index 0000000000..8f9424660b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-owned-first-add-dir.stdout.ndjson
@@ -0,0 +1,60 @@
+{"t_ms": 307, "stream": "stdout", "data": {"event": "init", "conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 373, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3416, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.021318824, "usage": {"input_tokens": 12003, "output_tokens": 294, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12297}}}}
+{"t_ms": 3416, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-owned-first-add-dir-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}}}}}
+{"t_ms": 3416, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.004082433, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-owned-first-add-dir-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 5132, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.7174826109999999, "usage": {"input_tokens": 12318, "output_tokens": 64, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12382}}}}
+{"t_ms": 5133, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}}}}}
+{"t_ms": 5133, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.005855559, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 9981, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 4.850317858, "usage": {"input_tokens": 12505, "output_tokens": 68, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12573}}}}
+{"t_ms": 9982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 10007, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.005511565, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<CAPTURE>/owned\r\n"}}}}
+{"t_ms": 11982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.9862325090000001, "usage": {"input_tokens": 12638, "output_tokens": 47, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12685}}}}
+{"t_ms": 11982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}}}}}
+{"t_ms": 11982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 8, "state": "ERROR", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002185687, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}, "error": {"type": "TOOL_ERROR", "message": "declaring permissions: cortex tool view_file: convert tool call for permissions: model output error: invalid tool call error (invalid_args) failed to read file: stat <CAPTURE>/owned/input.txt: no such file or directory"}}}}}
+{"t_ms": 13701, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 9, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.704119444, "usage": {"input_tokens": 12799, "output_tokens": 51, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12850}}}}
+{"t_ms": 13701, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 10, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 13701, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 10, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003250577, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "1 lines, 23 bytes"}}}}
+{"t_ms": 15580, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.85800527, "usage": {"input_tokens": 13021, "output_tokens": 82, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13103}}}}
+{"t_ms": 15580, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 15580, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 12, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.005710137, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 17976, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 13, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.381626267, "usage": {"input_tokens": 13191, "output_tokens": 82, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13273}}}}
+{"t_ms": 17976, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 14, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 17976, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 14, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.002994941, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 21806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "1"}}}
+{"t_ms": 21908, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ". **MCP Tool Call (`phas"}}}
+{"t_ms": 21939, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e2` / `echo`):**\n   - At"}}}
+{"t_ms": 21971, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tempt"}}}
+{"t_ms": 22074, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ed to invoke"}}}
+{"t_ms": 22099, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " `phase2` `echo` with te"}}}
+{"t_ms": 22127, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "xt `PHASE2_DISCOVERY`. T"}}}
+{"t_ms": 22159, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "he MCP tool returned"}}}
+{"t_ms": 22213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " an interface/parameter "}}}
+{"t_ms": 22249, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "error (`Invalid input: e"}}}
+{"t_ms": 22268, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "xpected record, received"}}}
+{"t_ms": 22293, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " string`), i"}}}
+{"t_ms": 22319, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ndicating the tool could not process"}}}
+{"t_ms": 22349, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " the call: `"}}}
+{"t_ms": 22375, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "MCP_UNAVAILABLE`.\n\n2. **"}}}
+{"t_ms": 22402, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Shell `pwd`:**\n   - Defa"}}}
+{"t_ms": 22430, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ult working "}}}
+{"t_ms": 22458, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "directory: `/tmp/"}}}
+{"t_ms": 22509, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p2/owned`\n\n3. **File"}}}
+{"t_ms": 22535, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Operations "}}}
+{"t_ms": 22569, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "& Exact Paths:**\n   - **"}}}
+{"t_ms": 22594, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Input File Read:**"}}}
+{"t_ms": 22619, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [input.txt](file://<CAPTURE>/work"}}}
+{"t_ms": 22645, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "space/input."}}}
+{"t_ms": 22671, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "txt) (content: `PHASE2_"}}}
+{"t_ms": 22726, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "WORKSPACE_MARKER`)\n   - "}}}
+{"t_ms": 22751, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "**Output Files Written:*"}}}
+{"t_ms": 22776, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "*\n     - [ou"}}}
+{"t_ms": 22807, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tput.txt](file://<CAPTURE>/owne"}}}
+{"t_ms": 22833, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "d/output.txt) (content: "}}}
+{"t_ms": 22859, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`PHASE2_WRITE`)\n     -"}}}
+{"t_ms": 22911, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [output.txt](file:///tm"}}}
+{"t_ms": 22937, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "p/agy-p2/workspace/outpu"}}}
+{"t_ms": 22964, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t.txt) (content: `PHASE2"}}}
+{"t_ms": 22990, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "_WRITE`)"}}}
+{"t_ms": 23043, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "step_index": 15, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 5.067703746, "usage": {"input_tokens": 13361, "output_tokens": 225, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13586}}}}
+{"t_ms": 23043, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "acddb85b-55c5-462f-bbea-5a5bce323030", "status": "SUCCESS", "response": "1. **MCP Tool Call (`phase2` / `echo`):**\n   - Attempted to invoke `phase2` `echo` with text `PHASE2_DISCOVERY`. The MCP tool returned an interface/parameter error (`Invalid input: expected record, received string`), indicating the tool could not process the call: `MCP_UNAVAILABLE`.\n\n2. **Shell `pwd`:**\n   - Default working directory: `<CAPTURE>/owned`\n\n3. **File Operations & Exact Paths:**\n   - **Input File Read:** [input.txt](file://<WORKSPACE>/input.txt) (content: `PHASE2_WORKSPACE_MARKER`)\n   - **Output Files Written:**\n     - [output.txt](file://<CAPTURE>/owned/output.txt) (content: `PHASE2_WRITE`)\n     - [output.txt](file://<WORKSPACE>/output.txt) (content: `PHASE2_WRITE`)\n", "duration_seconds": 22.712812313, "num_turns": 1, "usage": {"input_tokens": 101836, "output_tokens": 913, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 102749}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-config.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-config.capture.ndjson
new file mode 100644
index 0000000000..97c48693ea
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-config.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 3445, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-config.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-config.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdin.ndjson
new file mode 100644
index 0000000000..f5fa2b6685
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 297, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase0 MCP echo tool with text PHASE0_MCP. Do not use shell. If unavailable say UNAVAILABLE."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdout.ndjson
new file mode 100644
index 0000000000..c77058cdf8
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-config.stdout.ndjson
@@ -0,0 +1,5 @@
+{"t_ms": 297, "stream": "stdout", "data": {"event": "init", "conversation_id": "0e78dd7a-7278-49b7-8cd6-68b9c0dfe82b", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 325, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0e78dd7a-7278-49b7-8cd6-68b9c0dfe82b", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2917, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0e78dd7a-7278-49b7-8cd6-68b9c0dfe82b", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "UNAVAILABLE"}}}
+{"t_ms": 3272, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0e78dd7a-7278-49b7-8cd6-68b9c0dfe82b", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.949354512, "usage": {"input_tokens": 11261, "output_tokens": 222, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11483}}}}
+{"t_ms": 3298, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "0e78dd7a-7278-49b7-8cd6-68b9c0dfe82b", "status": "SUCCESS", "response": "UNAVAILABLE\n", "duration_seconds": 2.972410821, "num_turns": 1, "usage": {"input_tokens": 11261, "output_tokens": 222, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11483}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.capture.ndjson
new file mode 100644
index 0000000000..c3f823d332
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.capture.ndjson
@@ -0,0 +1,4 @@
+{"t_ms": 0, "stream": "capture", "data": {"setup_file": "<WORKSPACE>/.agents/mcp_config.json", "content": {"mcpServers": {"phase0": {"serverUrl": "http://127.0.0.1:<PORT>/mcp"}}}, "global_mcp_config_exists": false}}
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 9494, "stream": "capture", "data": {"global_mcp_config_exists": true}}
+{"t_ms": 9645, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdin.ndjson
new file mode 100644
index 0000000000..7907cb1235
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 301, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase0 MCP echo tool with text PHASE0_MCP. If it fails report the exact error. No shell."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdout.ndjson
new file mode 100644
index 0000000000..632daa6821
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project-isolated.stdout.ndjson
@@ -0,0 +1,31 @@
+{"t_ms": 301, "stream": "stdout", "data": {"event": "init", "conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 357, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3586, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.20056914, "usage": {"input_tokens": 11979, "output_tokens": 300, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12279}}}}
+{"t_ms": 3587, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}}}}}
+{"t_ms": 3587, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003339143, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 5350, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.765191975, "usage": {"input_tokens": 12284, "output_tokens": 61, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12345}}}}
+{"t_ms": 5350, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 5350, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.004524751, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 7088, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.72463283, "usage": {"input_tokens": 12468, "output_tokens": 53, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12521}}}}
+{"t_ms": 7088, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "null", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 7088, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 6, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.00450856, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "null", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 8903, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The call"}}}
+{"t_ms": 8979, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " to the `pha"}}}
+{"t_ms": 9005, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "se0` MCP `echo` tool fai"}}}
+{"t_ms": 9031, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "led with the following e"}}}
+{"t_ms": 9056, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "xact error:\n"}}}
+{"t_ms": 9082, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n"}}}
+{"t_ms": 9107, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "```json\ncall"}}}
+{"t_ms": 9133, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing \"tools/call\": [\n  {\n"}}}
+{"t_ms": 9158, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "    \"expected\": \"record\""}}}
+{"t_ms": 9185, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ",\n    \"code\""}}}
+{"t_ms": 9210, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ": \"invalid_type\",\n    \"path\": [\n  "}}}
+{"t_ms": 9235, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "    \"params\""}}}
+{"t_ms": 9261, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ",\n      \"arguments\"\n    "}}}
+{"t_ms": 9286, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "],\n    "}}}
+{"t_ms": 9312, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\"message\": \""}}}
+{"t_ms": 9338, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Invalid input: expected "}}}
+{"t_ms": 9363, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "record, rece"}}}
+{"t_ms": 9389, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ived string\"\n  }\n]\n```"}}}
+{"t_ms": 9468, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "step_index": 7, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.395342779, "usage": {"input_tokens": 12644, "output_tokens": 93, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12737}}}}
+{"t_ms": 9494, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "0ff3bbbf-5757-4c2b-95c7-8287283c5f4e", "status": "SUCCESS", "response": "The call to the `phase0` MCP `echo` tool failed with the following exact error:\n\n```json\ncalling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]\n```\n", "duration_seconds": 9.15918287, "num_turns": 1, "usage": {"input_tokens": 49375, "output_tokens": 507, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 49882}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project.capture.ndjson
new file mode 100644
index 0000000000..041597c746
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 30078, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project.stdin.ndjson
new file mode 100644
index 0000000000..de5df7cd48
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 286, "stream": "stdin", "data": {"event": "user", "message": {"content": "Call the phase0 MCP echo tool with text PHASE0_MCP. Do not use shell. If unavailable say UNAVAILABLE."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-project.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-project.stdout.ndjson
new file mode 100644
index 0000000000..323648a229
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-project.stdout.ndjson
@@ -0,0 +1,15 @@
+{"t_ms": 285, "stream": "stdout", "data": {"event": "init", "conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 339, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4401, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 4.075516272, "usage": {"input_tokens": 11933, "output_tokens": 393, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12326}}}}
+{"t_ms": 4401, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}}}}}
+{"t_ms": 4427, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003930268, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/mcp/phase0/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 6440, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.013674566, "usage": {"input_tokens": 12234, "output_tokens": 63, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12297}}}}
+{"t_ms": 6441, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 6441, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.003539628, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 9031, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.5843047, "usage": {"input_tokens": 12420, "output_tokens": 64, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12484}}}}
+{"t_ms": 9031, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}}}}}
+{"t_ms": 9031, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 6, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.002964553, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\": \"PHASE0_MCP\"}", "ServerName": "phase0", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 24041, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 7, "state": "DONE", "step_type": "error_message", "duration_seconds": 0}}}
+{"t_ms": 29423, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 8, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "UNAVAILABLE"}}}
+{"t_ms": 29980, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "step_index": 8, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.922531311, "usage": {"input_tokens": 12607, "output_tokens": 2, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12609}}}}
+{"t_ms": 29980, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "89273b5a-77cd-4d4b-ac80-4475b2c751d0", "status": "ERROR", "response": "UNAVAILABLE\n", "error": "API error (attempt 1): Error 502, Message: , Status: 502 Bad Gateway, Details: []", "duration_seconds": 29.671957293, "num_turns": 1, "usage": {"input_tokens": 49194, "output_tokens": 522, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 49716}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.capture.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.capture.ndjson
new file mode 100644
index 0000000000..d42fd1a128
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands", "--dangerously-skip-permissions", "--add-dir", "<WORKSPACE>", "--add-dir", "<CAPTURE>/owned"], "cwd": "<WORKSPACE>", "home": "<CAPTURE>/mcp-second-add-dir-home", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 18531, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdin.ndjson
new file mode 100644
index 0000000000..eeddbbd260
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 308, "stream": "stdin", "data": {"event": "user", "message": {"content": "First call the phase2 MCP echo tool with text PHASE2_DISCOVERY. If unavailable say MCP_UNAVAILABLE. Then use shell pwd, read input.txt and write output.txt containing PHASE2_WRITE. Use the workspace default directory, without me supplying absolute paths. Report the exact paths used."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdout.ndjson
new file mode 100644
index 0000000000..274627ad6b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/mcp-second-add-dir.stdout.ndjson
@@ -0,0 +1,71 @@
+{"t_ms": 308, "stream": "stdout", "data": {"event": "init", "conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 386, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4340, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.94876824, "usage": {"input_tokens": 11996, "output_tokens": 440, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12436}}}}
+{"t_ms": 4340, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-second-add-dir-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}}}}}
+{"t_ms": 4340, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003707182, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/mcp-second-add-dir-home/.gemini/antigravity-cli/mcp/phase2/echo.json"}, "output": "1 lines, 184 bytes"}}}}
+{"t_ms": 6080, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.730381429, "usage": {"input_tokens": 12306, "output_tokens": 64, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12370}}}}
+{"t_ms": 6080, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "call_mcp_tool", "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}}}}}
+{"t_ms": 6080, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 4, "state": "ERROR", "step_type": "tool", "tool_name": "call_mcp_tool", "duration_seconds": 0.005173122, "tool_info": {"name": "call_mcp_tool", "parameters": {"Arguments": "{\"text\":\"PHASE2_DISCOVERY\"}", "ServerName": "phase2", "ToolName": "echo"}, "error": {"type": "TOOL_ERROR", "message": "calling \"tools/call\": [\n  {\n    \"expected\": \"record\",\n    \"code\": \"invalid_type\",\n    \"path\": [\n      \"params\",\n      \"arguments\"\n    ],\n    \"message\": \"Invalid input: expected record, received string\"\n  }\n]"}}}}}
+{"t_ms": 7982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.901210495, "usage": {"input_tokens": 12493, "output_tokens": 68, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12561}}}}
+{"t_ms": 7982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}}}}}
+{"t_ms": 7982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.006768796, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "pwd"}, "output": "<CAPTURE>/owned\r\n"}}}}
+{"t_ms": 9669, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.692085483, "usage": {"input_tokens": 12626, "output_tokens": 48, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12674}}}}
+{"t_ms": 9669, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}}}}}
+{"t_ms": 9669, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 8, "state": "ERROR", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.001462294, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<CAPTURE>/owned/input.txt"}, "error": {"type": "TOOL_ERROR", "message": "declaring permissions: cortex tool view_file: convert tool call for permissions: model output error: invalid tool call error (invalid_args) failed to read file: stat <CAPTURE>/owned/input.txt: no such file or directory"}}}}}
+{"t_ms": 11257, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 9, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.561062696, "usage": {"input_tokens": 12788, "output_tokens": 51, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12839}}}}
+{"t_ms": 11257, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 10, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 11257, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 10, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002866119, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "1 lines, 23 bytes"}}}}
+{"t_ms": 13169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.9176663440000001, "usage": {"input_tokens": 13010, "output_tokens": 84, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13094}}}}
+{"t_ms": 13170, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 13170, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 12, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003297375, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/output.txt"}}}}}
+{"t_ms": 15284, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 13, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.118805123, "usage": {"input_tokens": 13182, "output_tokens": 84, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13266}}}}
+{"t_ms": 15284, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 14, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 15284, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 14, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003384669, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<CAPTURE>/owned/output.txt"}}}}}
+{"t_ms": 16695, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "### MCP"}}}
+{"t_ms": 16797, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Tool Execut"}}}
+{"t_ms": 16823, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ion\n- Calling the `phase"}}}
+{"t_ms": 16848, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2` MCP `echo` tool faile"}}}
+{"t_ms": 16874, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "d with an"}}}
+{"t_ms": 17102, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " argument validation error from the "}}}
+{"t_ms": 17128, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "server schem"}}}
+{"t_ms": 17153, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "a interface:\n  `MCP_UNAV"}}}
+{"t_ms": 17178, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "AILABLE` (er"}}}
+{"t_ms": 17204, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ror: `Invalid input: expected record"}}}
+{"t_ms": 17229, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ", received s"}}}
+{"t_ms": 17255, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tring`)\n\n---\n\n### Shell "}}}
+{"t_ms": 17281, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`pwd` & Workspace File O"}}}
+{"t_ms": 17306, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "perations\n- "}}}
+{"t_ms": 17331, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "**Current Working Directory (`pwd`):"}}}
+{"t_ms": 17356, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "** `/tmp/agy"}}}
+{"t_ms": 17382, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "-p2/owned`\n- **Read file"}}}
+{"t_ms": 17407, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ":** [input.txt](file://<CAPTURE>/w"}}}
+{"t_ms": 17433, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orkspace/inp"}}}
+{"t_ms": 17459, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ut.txt) (Content: `PHASE"}}}
+{"t_ms": 17484, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2_WORKSPACE_"}}}
+{"t_ms": 17509, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "MARK"}}}
+{"t_ms": 17535, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ER`)\n- **Written file:**"}}}
+{"t_ms": 17560, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [output.txt"}}}
+{"t_ms": 17586, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "](file://<CAPTURE>/wor"}}}
+{"t_ms": 17611, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "kspace/outpu"}}}
+{"t_ms": 17637, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t"}}}
+{"t_ms": 17738, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".txt) (and m"}}}
+{"t_ms": 17764, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "irrored to [output.txt]("}}}
+{"t_ms": 17789, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "file:///tmp/"}}}
+{"t_ms": 17814, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p2/owned/output.txt)"}}}
+{"t_ms": 17840, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ") containing "}}}
+{"t_ms": 17941, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`PHASE2_WRITE`\n\n### Exac"}}}
+{"t_ms": 17966, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t Paths Used\n- Default C"}}}
+{"t_ms": 17992, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ommand Worki"}}}
+{"t_ms": 18017, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ng Directory: `/tmp/agy-"}}}
+{"t_ms": 18043, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "p2/owned"}}}
+{"t_ms": 18069, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`\n- Workspac"}}}
+{"t_ms": 18095, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e Read Path: `/tmp/agy-p"}}}
+{"t_ms": 18120, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "2/workspace/"}}}
+{"t_ms": 18145, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "input.txt`\n- Output Writ"}}}
+{"t_ms": 18171, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ten"}}}
+{"t_ms": 18196, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Paths:\n  - `<CAPTURE>"}}}
+{"t_ms": 18222, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/workspace/o"}}}
+{"t_ms": 18247, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "utput.txt`\n  - `/tmp"}}}
+{"t_ms": 18273, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/agy-p2/owned/output.txt`"}}}
+{"t_ms": 18450, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "step_index": 15, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.1541972400000002, "usage": {"input_tokens": 13354, "output_tokens": 262, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13616}}}}
+{"t_ms": 18450, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "2005ea86-6c72-484e-95fb-99a1c0fed68f", "status": "SUCCESS", "response": "### MCP Tool Execution\n- Calling the `phase2` MCP `echo` tool failed with an argument validation error from the server schema interface:\n  `MCP_UNAVAILABLE` (error: `Invalid input: expected record, received string`)\n\n---\n\n### Shell `pwd` & Workspace File Operations\n- **Current Working Directory (`pwd`):** `<CAPTURE>/owned`\n- **Read file:** [input.txt](file://<WORKSPACE>/input.txt) (Content: `PHASE2_WORKSPACE_MARKER`)\n- **Written file:** [output.txt](file://<WORKSPACE>/output.txt) (and mirrored to [output.txt](file://<CAPTURE>/owned/output.txt)) containing `PHASE2_WRITE`\n\n### Exact Paths Used\n- Default Command Working Directory: `<CAPTURE>/owned`\n- Workspace Read Path: `<WORKSPACE>/input.txt`\n- Output Written Paths:\n  - `<WORKSPACE>/output.txt`\n  - `<CAPTURE>/owned/output.txt`\n", "duration_seconds": 18.127914828, "num_turns": 1, "usage": {"input_tokens": 101755, "output_tokens": 1101, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 102856}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-invalid.capture.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.capture.ndjson
new file mode 100644
index 0000000000..d9a08ce530
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--conversation", "b966b16a-caf4-448a-bb24-0e34956022b0", "--model", "gemini-3.1-flash-lite-preview"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4004, "stream": "capture", "data": {"timeout_waiting_for": "init", "seconds": 4}}
+{"t_ms": 4005, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stderr.ndjson
new file mode 100644
index 0000000000..244d1ac13e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stderr.ndjson
@@ -0,0 +1,13 @@
+{"t_ms": 296, "stream": "stderr", "data": "error: invalid model selection (--model \"gemini-3.1-flash-lite-preview\" --effort \"\"): model gemini-3.1-flash-lite-preview is not recognized as a known model or custom model in settings"}
+{"t_ms": 296, "stream": "stderr", "data": "Available models:"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.8 Flash (High)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.8 Flash (Medium)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.8 Flash (Low)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.7 Flash (High)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.7 Flash (Medium)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.7 Flash (Low)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.6 Flash (High)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.6 Flash (Medium)"}
+{"t_ms": 296, "stream": "stderr", "data": "  Gemini 3.6 Flash (Low)"}
+{"t_ms": 297, "stream": "stderr", "data": "  Gemini 3.1 Pro (High)"}
+{"t_ms": 297, "stream": "stderr", "data": "  Gemini 3.1 Pro (Low)"}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stdout.ndjson
new file mode 100644
index 0000000000..1ad10e7494
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-invalid.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 297, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "invalid model selection (--model \"gemini-3.1-flash-lite-preview\" --effort \"\"): model gemini-3.1-flash-lite-preview is not recognized as a known model or custom model in settings\nAvailable models:\n  Gemini 3.8 Flash (High)\n  Gemini 3.8 Flash (Medium)\n  Gemini 3.8 Flash (Low)\n  Gemini 3.7 Flash (High)\n  Gemini 3.7 Flash (Medium)\n  Gemini 3.7 Flash (Low)\n  Gemini 3.6 Flash (High)\n  Gemini 3.6 Flash (Medium)\n  Gemini 3.6 Flash (Low)\n  Gemini 3.1 Pro (High)\n  Gemini 3.1 Pro (Low)", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-network.capture.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-network.capture.ndjson
new file mode 100644
index 0000000000..243104c416
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-network.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 1, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--conversation", "b966b16a-caf4-448a-bb24-0e34956022b0", "--model", "gemini-3.8-flash-low"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 2405, "stream": "capture", "data": {"translator_http": {"request": 6, "path": "/v1beta/models/gemini-3.8-flash:streamGenerateContent?alt=sse", "model": "google/gemini-3.7-flash", "roles": ["system", "user", "assistant", "user", "assistant", "user", "user", "assistant", "user", "user", "assistant", "user", "user"], "tools": ["view_file", "run_command", "manage_task", "send_message", "schedule", "invoke_subagent", "define_subagent", "manage_subagents", "write_to_file", "replace_file_content", "generate_image", "read_url_content", "search_web", "ask_question"], "usage": {"prompt_tokens": 12105, "completion_tokens": 12, "total_tokens": 12117, "cost": 0.00912375, "is_byok": false, "prompt_tokens_details": {"cached_tokens": 0, "cache_write_tokens": 0, "audio_tokens": 0, "video_tokens": 0}, "cost_details": {"upstream_inference_cost": 0.00912375, "upstream_inference_prompt_cost": 0.00907875, "upstream_inference_completions_cost": 4.5e-05}, "completion_tokens_details": {"reasoning_tokens": 0, "image_tokens": 0, "audio_tokens": 0}}, "toolCalls": [], "status": 200}}}
+{"t_ms": 2572, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-network.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-network.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-network.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-network.stdin.ndjson
new file mode 100644
index 0000000000..eb33e7913d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-network.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 439, "stream": "stdin", "data": {"event": "user", "message": {"content": "What secret word did I give you? No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-network.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-network.stdout.ndjson
new file mode 100644
index 0000000000..e1f755f3f2
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-network.stdout.ndjson
@@ -0,0 +1,8 @@
+{"t_ms": 439, "stream": "stdout", "data": {"event": "init", "conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "init": {"model": "gemini-3.8-flash-low", "cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 560, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 560, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 11, "state": "DONE", "step_type": "system_message", "duration_seconds": 9.9025e-05}}}
+{"t_ms": 2045, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 12, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The secret"}}}
+{"t_ms": 2070, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 12, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " word you ga"}}}
+{"t_ms": 2096, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 12, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ve me is **COBALT**."}}}
+{"t_ms": 2405, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 12, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.873175086, "usage": {"input_tokens": 12105, "output_tokens": 12, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12117}}}}
+{"t_ms": 2405, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "status": "SUCCESS", "response": "The secret word you gave me is **COBALT**.\n", "duration_seconds": 282.68791325, "num_turns": 5, "usage": {"input_tokens": 58633, "output_tokens": 505, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 59138}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-resume.capture.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-resume.capture.ndjson
new file mode 100644
index 0000000000..961223783a
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-resume.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--conversation", "b966b16a-caf4-448a-bb24-0e34956022b0", "--model", "gemini-3.1-flash-high"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4004, "stream": "capture", "data": {"timeout_waiting_for": "init", "seconds": 4}}
+{"t_ms": 4004, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-resume.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-resume.stderr.ndjson
new file mode 100644
index 0000000000..2666337e77
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-resume.stderr.ndjson
@@ -0,0 +1,13 @@
+{"t_ms": 239, "stream": "stderr", "data": "error: invalid model selection (--model \"gemini-3.1-flash-high\" --effort \"\"): model gemini-3.1-flash-high is not recognized as a known model or custom model in settings"}
+{"t_ms": 239, "stream": "stderr", "data": "Available models:"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.8 Flash (High)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.8 Flash (Medium)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.8 Flash (Low)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.7 Flash (High)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.7 Flash (Medium)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.7 Flash (Low)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.6 Flash (High)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.6 Flash (Medium)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.6 Flash (Low)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.1 Pro (High)"}
+{"t_ms": 239, "stream": "stderr", "data": "  Gemini 3.1 Pro (Low)"}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-resume.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-resume.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-resume.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-resume.stdout.ndjson
new file mode 100644
index 0000000000..3556e4c951
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-resume.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 239, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "invalid model selection (--model \"gemini-3.1-flash-high\" --effort \"\"): model gemini-3.1-flash-high is not recognized as a known model or custom model in settings\nAvailable models:\n  Gemini 3.8 Flash (High)\n  Gemini 3.8 Flash (Medium)\n  Gemini 3.8 Flash (Low)\n  Gemini 3.7 Flash (High)\n  Gemini 3.7 Flash (Medium)\n  Gemini 3.7 Flash (Low)\n  Gemini 3.6 Flash (High)\n  Gemini 3.6 Flash (Medium)\n  Gemini 3.6 Flash (Low)\n  Gemini 3.1 Pro (High)\n  Gemini 3.1 Pro (Low)", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-valid.capture.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-valid.capture.ndjson
new file mode 100644
index 0000000000..9d44fc439e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-valid.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--conversation", "b966b16a-caf4-448a-bb24-0e34956022b0", "--model", "gemini-3.8-flash-low"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4608, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-valid.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-valid.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdin.ndjson
new file mode 100644
index 0000000000..f1fb9508ac
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 296, "stream": "stdin", "data": {"event": "user", "message": {"content": "What secret word did I give you? No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdout.ndjson
new file mode 100644
index 0000000000..70dbf755eb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/model-switch-valid.stdout.ndjson
@@ -0,0 +1,7 @@
+{"t_ms": 296, "stream": "stdout", "data": {"event": "init", "conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "init": {"model": "gemini-3.8-flash-low", "cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 342, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 7, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 342, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 8, "state": "DONE", "step_type": "system_message", "duration_seconds": 4.783e-05}}}
+{"t_ms": 3891, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The secret"}}}
+{"t_ms": 4018, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " word you gave me is **COBALT**."}}}
+{"t_ms": 4473, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 4.143724393, "usage": {"input_tokens": 11846, "output_tokens": 12, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11858}}}}
+{"t_ms": 4499, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "status": "SUCCESS", "response": "The secret word you gave me is **COBALT**.\n", "duration_seconds": 129.476794036, "num_turns": 4, "usage": {"input_tokens": 46528, "output_tokens": 493, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 47021}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/models-api-key.capture.ndjson b/plugins/antigravity-provider/test/fixtures/models-api-key.capture.ndjson
new file mode 100644
index 0000000000..2db201ce59
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/models-api-key.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "models"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 360, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/models-api-key.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/models-api-key.stderr.ndjson
new file mode 100644
index 0000000000..31ed588249
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/models-api-key.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 247, "stream": "stderr", "data": "Fetching available models..."}
diff --git a/plugins/antigravity-provider/test/fixtures/models-api-key.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/models-api-key.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/models-api-key.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/models-api-key.stdout.ndjson
new file mode 100644
index 0000000000..ece429fc4b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/models-api-key.stdout.ndjson
@@ -0,0 +1,11 @@
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.8-flash-high\tGemini 3.8 Flash (High)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.8-flash-medium\tGemini 3.8 Flash (Medium)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.8-flash-low\tGemini 3.8 Flash (Low)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.7-flash-high\tGemini 3.7 Flash (High)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.7-flash-medium\tGemini 3.7 Flash (Medium)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.7-flash-low\tGemini 3.7 Flash (Low)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.6-flash-high\tGemini 3.6 Flash (High)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.6-flash-medium\tGemini 3.6 Flash (Medium)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.6-flash-low\tGemini 3.6 Flash (Low)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.1-pro-high\tGemini 3.1 Pro (High)"}
+{"t_ms": 248, "stream": "stdout", "data": "gemini-3.1-pro-low\tGemini 3.1 Pro (Low)"}
diff --git a/plugins/antigravity-provider/test/fixtures/models-unauthenticated.capture.ndjson b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.capture.ndjson
new file mode 100644
index 0000000000..b91f7dfb82
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "models"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 567, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stderr.ndjson
new file mode 100644
index 0000000000..0bcbc4745c
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stderr.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 404, "stream": "stderr", "data": "Fetching available models..."}
+{"t_ms": 404, "stream": "stderr", "data": "Error: Please sign in to view available models. Launch the CLI without arguments to sign in."}
diff --git a/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/models-unauthenticated.stdout.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.capture.ndjson b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.capture.ndjson
new file mode 100644
index 0000000000..56e04c0abe
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 6732, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdin.ndjson
new file mode 100644
index 0000000000..4210a3f1b6
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdin.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 304, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Remember the secret word COBALT. Solve 17*23 with reasoning, then reply with the answer. No tools."}}}
+{"t_ms": 4752, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "What secret word did I give you? Reply with only that word. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdout.ndjson
new file mode 100644
index 0000000000..dd2a346d75
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/multi-turn-reasoning.stdout.ndjson
@@ -0,0 +1,51 @@
+{"t_ms": 304, "stream": "stdout", "data": {"event": "init", "conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 332, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3128, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "I have noted"}}}
+{"t_ms": 3153, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " and remembe"}}}
+{"t_ms": 3178, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "red the secret word **CO"}}}
+{"t_ms": 3203, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "BALT**.\n\n###"}}}
+{"t_ms": 3229, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Reasoning"}}}
+{"t_ms": 3280, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " for $17 \\ti"}}}
+{"t_ms": 3306, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "mes 23$:\n\nWe can solve $"}}}
+{"t_ms": 3332, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "17 \\times 23$ using the "}}}
+{"t_ms": 3357, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "difference o"}}}
+{"t_ms": 3382, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "f"}}}
+{"t_ms": 3459, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " squares ide"}}}
+{"t_ms": 3484, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ntity, $(a - b)(a + b) ="}}}
+{"t_ms": 3510, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " a^2 - b^2$:\n\n1. Rewrite"}}}
+{"t_ms": 3535, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " the"}}}
+{"t_ms": 3688, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " terms centered around 20:\n   $$17 ="}}}
+{"t_ms": 3713, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " 20 - 3$$\n  "}}}
+{"t_ms": 3738, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " $$23"}}}
+{"t_ms": 3814, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " = 20 + 3$$\n\n2. Apply th"}}}
+{"t_ms": 3840, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e difference"}}}
+{"t_ms": 3865, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of squares formula:\n   "}}}
+{"t_ms": 3891, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$$17 \\times "}}}
+{"t_ms": 3917, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "23 = (20 - 3)(20 + 3) = 2"}}}
+{"t_ms": 3942, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "0^2 - 3"}}}
+{"t_ms": 4069, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "^2$$\n\n3. Cal"}}}
+{"t_ms": 4094, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "culate the squares:\n   $"}}}
+{"t_ms": 4119, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$20^2 = 400$"}}}
+{"t_ms": 4145, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$\n   "}}}
+{"t_ms": 4170, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$$3^2 = 9$$\n"}}}
+{"t_ms": 4221, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n4. Subtract"}}}
+{"t_ms": 4246, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ":\n   $$400 -"}}}
+{"t_ms": 4271, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " 9 = 3"}}}
+{"t_ms": 4323, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "91$$\n\n*(Alte"}}}
+{"t_ms": 4348, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rnatively, v"}}}
+{"t_ms": 4398, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ia partial p"}}}
+{"t_ms": 4424, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "roducts: $17"}}}
+{"t_ms": 4474, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " \\times 20 ="}}}
+{"t_ms": 4499, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " 340$, and $"}}}
+{"t_ms": 4550, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "17 \\times 3 "}}}
+{"t_ms": 4575, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "= 51$; then "}}}
+{"t_ms": 4600, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$340 + 51 = "}}}
+{"t_ms": 4650, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "391$.)*\n\n---"}}}
+{"t_ms": 4675, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n\n**Answer:*"}}}
+{"t_ms": 4726, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "* **391**"}}}
+{"t_ms": 4752, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 4.392588837, "usage": {"input_tokens": 11263, "output_tokens": 466, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11729}}}}
+{"t_ms": 4752, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "status": "SUCCESS", "response": "I have noted and remembered the secret word **COBALT**.\n\n### Reasoning for $17 \\times 23$:\n\nWe can solve $17 \\times 23$ using the difference of squares identity, $(a - b)(a + b) = a^2 - b^2$:\n\n1. Rewrite the terms centered around 20:\n   $$17 = 20 - 3$$\n   $$23 = 20 + 3$$\n\n2. Apply the difference of squares formula:\n   $$17 \\times 23 = (20 - 3)(20 + 3) = 20^2 - 3^2$$\n\n3. Calculate the squares:\n   $$20^2 = 400$$\n   $$3^2 = 9$$\n\n4. Subtract:\n   $$400 - 9 = 391$$\n\n*(Alternatively, via partial products: $17 \\times 20 = 340$, and $17 \\times 3 = 51$; then $340 + 51 = 391$.)*\n\n---\n\n**Answer:** **391**\n", "duration_seconds": 4.414417492, "num_turns": 1, "usage": {"input_tokens": 11263, "output_tokens": 466, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11729}}}}
+{"t_ms": 4785, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 2, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 6345, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "COBALT"}}}
+{"t_ms": 6573, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.784280065, "usage": {"input_tokens": 11604, "output_tokens": 3, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11607}}}}
+{"t_ms": 6573, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "status": "SUCCESS", "response": "COBALT\n", "duration_seconds": 6.242840924, "num_turns": 2, "usage": {"input_tokens": 22867, "output_tokens": 469, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23336}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/not-signed-in.capture.ndjson b/plugins/antigravity-provider/test/fixtures/not-signed-in.capture.ndjson
new file mode 100644
index 0000000000..a77dc1e4ee
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/not-signed-in.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 520, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/not-signed-in.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/not-signed-in.stderr.ndjson
new file mode 100644
index 0000000000..9304e8b2ee
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/not-signed-in.stderr.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 360, "stream": "stderr", "data": "Error: authentication required. Run 'agy' to log in, then retry."}
+{"t_ms": 360, "stream": "stderr", "data": "error: authentication failed or timed out"}
diff --git a/plugins/antigravity-provider/test/fixtures/not-signed-in.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/not-signed-in.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/not-signed-in.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/not-signed-in.stdout.ndjson
new file mode 100644
index 0000000000..760f2dbe68
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/not-signed-in.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 360, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "", "status": "ERROR", "response": "", "error": "authentication failed or timed out", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/parity-inspection.ndjson b/plugins/antigravity-provider/test/fixtures/parity-inspection.ndjson
new file mode 100644
index 0000000000..18c16ef484
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/parity-inspection.ndjson
@@ -0,0 +1,10 @@
+{"t_ms": 0, "stream": "inspection", "data": {"type": "configuration", "file": "<CAPTURE>/owned/.agents/mcp_config.json", "content": {"mcpServers": {"phase2": {"serverUrl": "http://127.0.0.1:<PORT>/mcp"}}}}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "isolation", "global_mcp_config_exists": {"mcp-second-add-dir": true, "mcp-owned-cwd": true, "mcp-owned-first-add-dir": true, "mcp-agent-file": true, "mcp-agent-definition": true, "mcp-agent-discovered": true, "image-file-external": true}}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "agent_definition", "file": "<CAPTURE>/owned/agent.md", "content": "---\nname: phase2\ndescription: Session adapter\nmcpServers: {\"phase2\": {\"serverUrl\": \"http://127.0.0.1:<PORT>/mcp\"}}\n---\nWork in the current workspace.\n"}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "agent_definition", "file": "<CAPTURE>/owned/.agents/agents/phase2.md", "content": "---\nname: phase2\ndescription: Session adapter\nmainAgent: true\nworkdir: <WORKSPACE>\nmcpServers: {\"phase2\": {\"serverUrl\": \"http://127.0.0.1:<PORT>/mcp\"}}\n---\n# Identity\nWork in the current workspace.\n"}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "agent_manifest", "file": "<CAPTURE>/owned/.agents/agents.json", "content": {"entries": [{"path": "<CAPTURE>/owned/.agents/agents"}]}}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "native_log", "capture": "mcp-agent-file", "line": "W0929 21:29:08.043649       1 session.go:94] Agent \"<CAPTURE>/owned/agent.md\" not found, falling back to default"}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "native_log", "capture": "mcp-agent-definition", "line": "W0929 21:30:59.337788       1 session.go:94] Agent \"phase2\" not found, falling back to default"}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "native_log", "capture": "mcp-agent-discovered", "line": "W0929 21:33:13.643983       1 session.go:94] Agent \"phase2\" not found, falling back to default"}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "translator_image_part", "function": "view_file", "location": "functionResponse.parts[].inlineData", "mimeType": "image/png", "forwarded": true}}
+{"t_ms": 0, "stream": "inspection", "data": {"type": "image", "fixture": "image-file-external.png", "sha256": "abd9ec3ff865aa30218d6184eadff4c0fc1c55d6ada251909d6b4554d64d5336", "expected": "Red triangle on the left, blue circle on the lower right, white background."}}
diff --git a/plugins/antigravity-provider/test/fixtures/project-skill.capture.ndjson b/plugins/antigravity-provider/test/fixtures/project-skill.capture.ndjson
new file mode 100644
index 0000000000..c7e091ebe3
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/project-skill.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 5673, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/project-skill.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/project-skill.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/project-skill.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/project-skill.stdin.ndjson
new file mode 100644
index 0000000000..2380ec6f8e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/project-skill.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 361, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use the phase0-marker skill now."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/project-skill.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/project-skill.stdout.ndjson
new file mode 100644
index 0000000000..d2a8a0b936
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/project-skill.stdout.ndjson
@@ -0,0 +1,9 @@
+{"t_ms": 361, "stream": "stdout", "data": {"event": "init", "conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 415, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.389284511, "usage": {"input_tokens": 11270, "output_tokens": 246, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11516}}}}
+{"t_ms": 3806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/.agents/skills/phase0-marker/SKILL.md"}}}}}
+{"t_ms": 3806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003649634, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/.agents/skills/phase0-marker/SKILL.md"}, "output": "6 lines, 163 bytes"}}}}
+{"t_ms": 5190, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE"}}}
+{"t_ms": 5216, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "0_SKILL_MARKER"}}}
+{"t_ms": 5572, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.7500252870000002, "usage": {"input_tokens": 11562, "output_tokens": 9, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11571}}}}
+{"t_ms": 5572, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "a145f6cf-b974-4ddb-b7eb-58bca63a0092", "status": "SUCCESS", "response": "PHASE0_SKILL_MARKER\n", "duration_seconds": 5.185824959, "num_turns": 1, "usage": {"input_tokens": 22832, "output_tokens": 255, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23087}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/question-auto-denial.capture.ndjson b/plugins/antigravity-provider/test/fixtures/question-auto-denial.capture.ndjson
new file mode 100644
index 0000000000..f2e339bb07
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/question-auto-denial.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 7149, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/question-auto-denial.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/question-auto-denial.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdin.ndjson
new file mode 100644
index 0000000000..b53fbe5176
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 298, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use ask_question to ask me which color I prefer, red or blue. Do not choose for me."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdout.ndjson
new file mode 100644
index 0000000000..352ea75867
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/question-auto-denial.stdout.ndjson
@@ -0,0 +1,14 @@
+{"t_ms": 298, "stream": "stdout", "data": {"event": "init", "conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 325, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4334, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.994201944, "usage": {"input_tokens": 11258, "output_tokens": 297, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11555}}}}
+{"t_ms": 4334, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 2, "state": "DONE", "step_type": "unknown", "duration_seconds": 0.00288314}}}
+{"t_ms": 6347, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "You"}}}
+{"t_ms": 6676, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " skipped ans"}}}
+{"t_ms": 6702, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "wering the question. Let"}}}
+{"t_ms": 6728, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " me know if you'd like t"}}}
+{"t_ms": 6753, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o choose a c"}}}
+{"t_ms": 6778, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "olor or if there's anyth"}}}
+{"t_ms": 6804, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing else I can help you "}}}
+{"t_ms": 6829, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "with!"}}}
+{"t_ms": 7057, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.727510169, "usage": {"input_tokens": 11366, "output_tokens": 31, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11397}}}}
+{"t_ms": 7057, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "e81b4d91-ca0f-4bf9-9841-d44ec1f48997", "status": "SUCCESS", "response": "You skipped answering the question. Let me know if you'd like to choose a color or if there's anything else I can help you with!\n", "duration_seconds": 6.748385314, "num_turns": 1, "usage": {"input_tokens": 22624, "output_tokens": 328, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 22952}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.capture.ndjson b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.capture.ndjson
new file mode 100644
index 0000000000..381dc3897e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--conversation", "a2c2132f-0f10-400b-a142-74f82230f449"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 2531, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdin.ndjson
new file mode 100644
index 0000000000..40ea297e7f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 357, "stream": "stdin", "data": {"event": "user", "message": {"content": "Reply with PHASE0_RECOVERED. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdout.ndjson
new file mode 100644
index 0000000000..8b3e527418
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume-after-interrupt.stdout.ndjson
@@ -0,0 +1,7 @@
+{"t_ms": 357, "stream": "stdout", "data": {"event": "init", "conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 386, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 2, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 412, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 3, "state": "DONE", "step_type": "system_message", "duration_seconds": 6.4942e-05}}}
+{"t_ms": 2228, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 4, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_RECOV"}}}
+{"t_ms": 2253, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 4, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ERED"}}}
+{"t_ms": 2380, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 4, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.9710905699999999, "usage": {"input_tokens": 11524, "output_tokens": 65, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11589}}}}
+{"t_ms": 2380, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "status": "SUCCESS", "response": "PHASE0_RECOVERED\n", "duration_seconds": 216.301687963, "num_turns": 2, "usage": {"input_tokens": 11524, "output_tokens": 65, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11589}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume.capture.ndjson b/plugins/antigravity-provider/test/fixtures/resume.capture.ndjson
new file mode 100644
index 0000000000..4caec009da
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--conversation", "b966b16a-caf4-448a-bb24-0e34956022b0"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 2317, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/resume.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/resume.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/resume.stdin.ndjson
new file mode 100644
index 0000000000..e91cc571bd
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 288, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "What secret word did I give you? No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/resume.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/resume.stdout.ndjson
new file mode 100644
index 0000000000..d685e83cfb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/resume.stdout.ndjson
@@ -0,0 +1,8 @@
+{"t_ms": 288, "stream": "stdout", "data": {"event": "init", "conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 333, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 333, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 5, "state": "DONE", "step_type": "system_message", "duration_seconds": 4.3562e-05}}}
+{"t_ms": 1969, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 6, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The secret"}}}
+{"t_ms": 2045, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 6, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " word you gave me is **C"}}}
+{"t_ms": 2070, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 6, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "OBALT**."}}}
+{"t_ms": 2172, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "step_index": 6, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.821180269, "usage": {"input_tokens": 11815, "output_tokens": 12, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11827}}}}
+{"t_ms": 2172, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "status": "SUCCESS", "response": "The secret word you gave me is **COBALT**.\n", "duration_seconds": 8.574573367, "num_turns": 3, "usage": {"input_tokens": 34682, "output_tokens": 481, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 35163}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-prompt.capture.ndjson b/plugins/antigravity-provider/test/fixtures/schema-prompt.capture.ndjson
new file mode 100644
index 0000000000..9964112608
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-prompt.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 30706, "stream": "capture", "data": {"timeout_waiting_for": "result", "seconds": 30}}
+{"t_ms": 30794, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-prompt.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/schema-prompt.stderr.ndjson
new file mode 100644
index 0000000000..0a830c1e99
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-prompt.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 677, "stream": "stderr", "data": "warning: ignoring unsupported stream input message event \"prompt\""}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-prompt.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/schema-prompt.stdin.ndjson
new file mode 100644
index 0000000000..2831eab45f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-prompt.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 677, "stream": "stdin", "data": {"event": "prompt", "prompt": "Reply PHASE0_HELLO."}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-prompt.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/schema-prompt.stdout.ndjson
new file mode 100644
index 0000000000..1b83a4d41e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-prompt.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 676, "stream": "stdout", "data": {"event": "init", "conversation_id": "11a830e0-80b1-4f55-ab34-0670be20a722", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user-message.capture.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user-message.capture.ndjson
new file mode 100644
index 0000000000..8db1f98058
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user-message.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 490, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user-message.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user-message.stderr.ndjson
new file mode 100644
index 0000000000..30d0fa5adb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user-message.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 386, "stream": "stderr", "data": "error: failed to decode stream input: json: cannot unmarshal string into Go struct field streamInputMessage.message of type printmode.streamInputUserMessage"}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user-message.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user-message.stdin.ndjson
new file mode 100644
index 0000000000..cbedcbaceb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user-message.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 383, "stream": "stdin", "data": {"event": "user_message", "message": "Reply PHASE0_HELLO."}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user-message.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user-message.stdout.ndjson
new file mode 100644
index 0000000000..333d3a9b8d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user-message.stdout.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 383, "stream": "stdout", "data": {"event": "init", "conversation_id": "b70d4858-e4ed-469c-84d6-8fec25ceb1cb", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 386, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b70d4858-e4ed-469c-84d6-8fec25ceb1cb", "status": "ERROR", "response": "", "error": "failed to decode stream input: json: cannot unmarshal string into Go struct field streamInputMessage.message of type printmode.streamInputUserMessage", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user.capture.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user.capture.ndjson
new file mode 100644
index 0000000000..205f7c638b
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 426, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user.stderr.ndjson
new file mode 100644
index 0000000000..7ae241a87e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 342, "stream": "stderr", "data": "error: failed to decode stream input: json: cannot unmarshal string into Go struct field streamInputMessage.message of type printmode.streamInputUserMessage"}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user.stdin.ndjson
new file mode 100644
index 0000000000..5523b07666
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 338, "stream": "stdin", "data": {"event": "user", "message": "Reply PHASE0_HELLO."}}
diff --git a/plugins/antigravity-provider/test/fixtures/schema-user.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/schema-user.stdout.ndjson
new file mode 100644
index 0000000000..324e16471e
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/schema-user.stdout.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 338, "stream": "stdout", "data": {"event": "init", "conversation_id": "f57811d9-3f9d-42cc-870a-ffdaa85ba608", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 342, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "f57811d9-3f9d-42cc-870a-ffdaa85ba608", "status": "ERROR", "response": "", "error": "failed to decode stream input: json: cannot unmarshal string into Go struct field streamInputMessage.message of type printmode.streamInputUserMessage", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-text.capture.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.capture.ndjson
new file mode 100644
index 0000000000..744e6a79b1
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 2000, "stream": "capture", "data": {"signal": "SIGINT", "trigger": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "# The Architecture of In"}}}
+{"t_ms": 2141, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stderr.ndjson
new file mode 100644
index 0000000000..49b703e524
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 2025, "stream": "stderr", "data": "error: interrupted"}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdin.ndjson
new file mode 100644
index 0000000000..06c4053234
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 310, "stream": "stdin", "data": {"event": "user", "message": {"content": "Write a long 2000-word essay on prime numbers. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdout.ndjson
new file mode 100644
index 0000000000..63b9bd96f1
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-text.stdout.ndjson
@@ -0,0 +1,4 @@
+{"t_ms": 309, "stream": "stdout", "data": {"event": "init", "conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 337, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2000, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "# The Architecture of In"}}}
+{"t_ms": 2025, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "a2c2132f-0f10-400b-a142-74f82230f449", "status": "ERROR", "response": "# The Architecture of In", "error": "interrupted", "duration_seconds": 1.690084523, "num_turns": 1, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.capture.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.capture.ndjson
new file mode 100644
index 0000000000..d4774ef9e5
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4486, "stream": "capture", "data": {"signal": "SIGINT", "trigger": {"conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "sleep 30; printf FINISHED"}}}}}
+{"t_ms": 4716, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stderr.ndjson
new file mode 100644
index 0000000000..40ea382edb
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 4489, "stream": "stderr", "data": "error: interrupted"}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdin.ndjson
new file mode 100644
index 0000000000..7d34666611
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 371, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use run_command to run sleep 30; printf FINISHED in <WORKSPACE>, WaitMsBeforeAsync 1000. Wait until it finishes."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdout.ndjson
new file mode 100644
index 0000000000..ea8cee886f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigint-mid-tool.stdout.ndjson
@@ -0,0 +1,5 @@
+{"t_ms": 371, "stream": "stdout", "data": {"event": "init", "conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 399, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4086, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.660004339, "usage": {"input_tokens": 11272, "output_tokens": 247, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11519}}}}
+{"t_ms": 4086, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "sleep 30; printf FINISHED"}}}}}
+{"t_ms": 4489, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "b3c8b9d6-c0ca-4444-8fd3-8bc86de8e6ba", "status": "ERROR", "response": "", "error": "interrupted", "duration_seconds": 4.114884661, "num_turns": 1, "usage": {"input_tokens": 11272, "output_tokens": 247, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11519}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigterm.capture.ndjson b/plugins/antigravity-provider/test/fixtures/sigterm.capture.ndjson
new file mode 100644
index 0000000000..eafb4b76ed
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigterm.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 316, "stream": "capture", "data": {"signal": "SIGTERM", "trigger": {"conversation_id": "21c82404-cd16-4781-a827-eb7186d61b7e", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 467, "stream": "capture", "data": {"exit_code": 1}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigterm.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/sigterm.stderr.ndjson
new file mode 100644
index 0000000000..ee58454e54
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigterm.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 341, "stream": "stderr", "data": "error: interrupted"}
diff --git a/plugins/antigravity-provider/test/fixtures/sigterm.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/sigterm.stdin.ndjson
new file mode 100644
index 0000000000..27e2a28a9c
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigterm.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 289, "stream": "stdin", "data": {"event": "user", "message": {"content": "Write a long essay on prime numbers. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/sigterm.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/sigterm.stdout.ndjson
new file mode 100644
index 0000000000..1fe0f471e1
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/sigterm.stdout.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 289, "stream": "stdout", "data": {"event": "init", "conversation_id": "21c82404-cd16-4781-a827-eb7186d61b7e", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 316, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "21c82404-cd16-4781-a827-eb7186d61b7e", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 341, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "21c82404-cd16-4781-a827-eb7186d61b7e", "status": "ERROR", "response": "", "error": "interrupted", "duration_seconds": 0, "num_turns": 1, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-disabled.capture.ndjson b/plugins/antigravity-provider/test/fixtures/slash-disabled.capture.ndjson
new file mode 100644
index 0000000000..72dc5418fc
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-disabled.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 9267, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-disabled.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/slash-disabled.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/slash-disabled.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/slash-disabled.stdin.ndjson
new file mode 100644
index 0000000000..fc08c01367
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-disabled.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 292, "stream": "stdin", "data": {"event": "user", "message": {"content": "/help"}}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-disabled.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/slash-disabled.stdout.ndjson
new file mode 100644
index 0000000000..5050830bb3
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-disabled.stdout.ndjson
@@ -0,0 +1,84 @@
+{"t_ms": 291, "stream": "stdout", "data": {"event": "init", "conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 318, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3215, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.874473262, "usage": {"input_tokens": 11225, "output_tokens": 193, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11418}}}}
+{"t_ms": 3215, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/builtin/skills/antigravity_guide/SKILL.md"}}}}}
+{"t_ms": 3215, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003097441, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/builtin/skills/antigravity_guide/SKILL.md"}, "output": "56 lines, 3023 bytes"}}}}
+{"t_ms": 5737, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.513209521, "usage": {"input_tokens": 12487, "output_tokens": 73, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12560}}}}
+{"t_ms": 5737, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 4, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/builtin/skills/antigravity_guide/references/cli.md"}}}}}
+{"t_ms": 5737, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 4, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.003075841, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<HOME>/.gemini/antigravity-cli/builtin/skills/antigravity_guide/references/cli.md"}, "output": "42 lines, 1686 bytes"}}}}
+{"t_ms": 6974, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Here is"}}}
+{"t_ms": 7051, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " a quick guide to using "}}}
+{"t_ms": 7076, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "**Antigravit"}}}
+{"t_ms": 7101, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "y (AGY)** and its availa"}}}
+{"t_ms": 7127, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ble slash"}}}
+{"t_ms": 7177, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " commands:\n\n### Available Slash Comm"}}}
+{"t_ms": 7203, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ands\n\n* **/p"}}}
+{"t_ms": 7228, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "lan** – Initiates deta"}}}
+{"t_ms": 7254, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "iled step-by"}}}
+{"t_ms": 7279, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "-step planning and archi"}}}
+{"t_ms": 7305, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tecture desi"}}}
+{"t_ms": 7330, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "gn"}}}
+{"t_ms": 7356, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " before making code changes.\n* **/gr"}}}
+{"t_ms": 7381, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ill-me** –"}}}
+{"t_ms": 7407, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Starts an interactive i"}}}
+{"t_ms": 7432, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nterview/rev"}}}
+{"t_ms": 7458, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "iew session to refine re"}}}
+{"t_ms": 7483, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "quirements and"}}}
+{"t_ms": 7535, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " architectural decisions"}}}
+{"t_ms": 7560, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".\n* **/goal*"}}}
+{"t_ms": 7586, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "* – Sets a high-level,"}}}
+{"t_ms": 7611, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " long-running goal where"}}}
+{"t_ms": 7637, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " the agent w"}}}
+{"t_ms": 7662, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orks autonomously and"}}}
+{"t_ms": 7763, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " thoroughly "}}}
+{"t_ms": 7789, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "until completion.\n* **/s"}}}
+{"t_ms": 7814, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "chedule** "}}}
+{"t_ms": 7840, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "– Sets up one-shot tim"}}}
+{"t_ms": 7865, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ers or recur"}}}
+{"t_ms": 7890, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ring cron jobs for periodic checks a"}}}
+{"t_ms": 7916, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nd background tasks.\n* *"}}}
+{"t_ms": 7941, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "*/browser** "}}}
+{"t_ms": 7966, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "– Directs browser auto"}}}
+{"t_ms": 7992, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "mation, test"}}}
+{"t_ms": 8017, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing, and web research wo"}}}
+{"t_ms": 8042, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rkflows.\n* **/learn** "}}}
+{"t_ms": 8068, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "– Teaches the agent pr"}}}
+{"t_ms": 8094, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "eferences, project rules"}}}
+{"t_ms": 8119, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ", or recurri"}}}
+{"t_ms": 8144, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ng setup procedures to p"}}}
+{"t_ms": 8169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ersist across future ses"}}}
+{"t_ms": 8195, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "sions.\n\n---\n"}}}
+{"t_ms": 8220, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n### What I Can Help You"}}}
+{"t_ms": 8246, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " With\n\n*"}}}
+{"t_ms": 8271, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " **Code Exploration & Ed"}}}
+{"t_ms": 8296, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "iting**: Sea"}}}
+{"t_ms": 8322, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rch codebase, view/edit "}}}
+{"t_ms": 8347, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "files, run tests, and de"}}}
+{"t_ms": 8372, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "bug issues.\n"}}}
+{"t_ms": 8398, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "* **Ref"}}}
+{"t_ms": 8500, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "actoring & F"}}}
+{"t_ms": 8525, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "eature Development**: Pl"}}}
+{"t_ms": 8550, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "an, implemen"}}}
+{"t_ms": 8576, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t, and verify multi-file"}}}
+{"t_ms": 8601, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " features.\n*"}}}
+{"t_ms": 8626, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " **Automation & Subagent"}}}
+{"t_ms": 8652, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s**: Run concurrent task"}}}
+{"t_ms": 8677, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s"}}}
+{"t_ms": 8703, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ", terminal c"}}}
+{"t_ms": 8728, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ommands, or "}}}
+{"t_ms": 8754, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "delegate complex tasks t"}}}
+{"t_ms": 8779, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o subagents.\n* **Customi"}}}
+{"t_ms": 8804, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "zations**: C"}}}
+{"t_ms": 8830, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "onfigure [skills](file:/"}}}
+{"t_ms": 8855, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/<CAPTURE>/slash-disab"}}}
+{"t_ms": 8881, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "led-home/.gemini/antigra"}}}
+{"t_ms": 8906, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "vity-cli/builtin/skills/"}}}
+{"t_ms": 8931, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-customiz"}}}
+{"t_ms": 8957, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ations/SKILL.md), wor"}}}
+{"t_ms": 8982, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "kspace rules"}}}
+{"t_ms": 9007, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ", hooks, and MCP servers"}}}
+{"t_ms": 9033, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".\n\nLet me kn"}}}
+{"t_ms": 9058, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ow what you would like t"}}}
+{"t_ms": 9085, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o work on!"}}}
+{"t_ms": 9136, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "step_index": 5, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.416356468, "usage": {"input_tokens": 13315, "output_tokens": 309, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13624}}}}
+{"t_ms": 9162, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "84f9a66c-abf4-49f9-81bc-07fe9d6ef1a6", "status": "SUCCESS", "response": "Here is a quick guide to using **Antigravity (AGY)** and its available slash commands:\n\n### Available Slash Commands\n\n* **/plan** – Initiates detailed step-by-step planning and architecture design before making code changes.\n* **/grill-me** – Starts an interactive interview/review session to refine requirements and architectural decisions.\n* **/goal** – Sets a high-level, long-running goal where the agent works autonomously and thoroughly until completion.\n* **/schedule** – Sets up one-shot timers or recurring cron jobs for periodic checks and background tasks.\n* **/browser** – Directs browser automation, testing, and web research workflows.\n* **/learn** – Teaches the agent preferences, project rules, or recurring setup procedures to persist across future sessions.\n\n---\n\n### What I Can Help You With\n\n* **Code Exploration & Editing**: Search codebase, view/edit files, run tests, and debug issues.\n* **Refactoring & Feature Development**: Plan, implement, and verify multi-file features.\n* **Automation & Subagents**: Run concurrent tasks, terminal commands, or delegate complex tasks to subagents.\n* **Customizations**: Configure [skills](file://<HOME>/.gemini/antigravity-cli/builtin/skills/agy-customizations/SKILL.md), workspace rules, hooks, and MCP servers.\n\nLet me know what you would like to work on!\n", "duration_seconds": 8.84160525, "num_turns": 1, "usage": {"input_tokens": 37027, "output_tokens": 575, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 37602}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-enabled.capture.ndjson b/plugins/antigravity-provider/test/fixtures/slash-enabled.capture.ndjson
new file mode 100644
index 0000000000..852d00e9cd
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-enabled.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 483, "stream": "capture", "data": {"exit_code": 2}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-enabled.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/slash-enabled.stderr.ndjson
new file mode 100644
index 0000000000..cf7c668f40
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-enabled.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 375, "stream": "stderr", "data": "error: /help is answered by the CLI itself and is unavailable with --input-format stream-json; run it as its own --print /help invocation"}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-enabled.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/slash-enabled.stdin.ndjson
new file mode 100644
index 0000000000..73da2a88d2
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-enabled.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 374, "stream": "stdin", "data": {"event": "user", "message": {"content": "/help"}}}
diff --git a/plugins/antigravity-provider/test/fixtures/slash-enabled.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/slash-enabled.stdout.ndjson
new file mode 100644
index 0000000000..072ae3c437
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/slash-enabled.stdout.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 374, "stream": "stdout", "data": {"event": "init", "conversation_id": "ca3eefcf-2a10-470a-ac64-81f29d305c40", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 375, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "ca3eefcf-2a10-470a-ac64-81f29d305c40", "status": "ERROR", "response": "", "error": "/help is answered by the CLI itself and is unavailable with --input-format stream-json; run it as its own --print /help invocation", "duration_seconds": 0, "num_turns": 0, "usage": {"input_tokens": 0, "output_tokens": 0, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 0}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/state-inspection.ndjson b/plugins/antigravity-provider/test/fixtures/state-inspection.ndjson
new file mode 100644
index 0000000000..2155c5cd9f
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/state-inspection.ndjson
@@ -0,0 +1,6 @@
+{"stream": "inspection", "data": {"command": "python3 <CAPTURE>/finalize.py", "sha256": "574b0234656c44564f3ff3b013225c86f14ae79b67d0f3b45f6aaf1b1625440e", "version_fixture": "version.stdout.ndjson:1", "operation": "hashlib.sha256(<AGY> bytes)"}}
+{"stream": "inspection", "data": {"command": "HOME=<HOME> strace -f -e trace=file -o <CAPTURE>/files.trace <HOME>/.local/opt/agy/1.2.13/agy --input-format stream-json --output-format stream-json", "accessed_state_paths": ["<HOME>/.gemini/antigravity-cli/antigravity-oauth-token", "<HOME>/.gemini/antigravity-cli/conversation_summaries.db", "<HOME>/.gemini/antigravity-cli/conversations", "<HOME>/.gemini/antigravity-cli/mcp_config.json", "<HOME>/.gemini/antigravity-cli/secplugins/config.json", "<HOME>/.gemini/antigravity-cli/settings.json", "<HOME>/.gemini/antigravity/conversations", "<HOME>/.gemini/config/config.json", "<HOME>/.gemini/config/mcp_config.json"], "outside_isolated_home_gemini_accesses": []}}
+{"stream": "inspection", "data": {"command": "python3 <CAPTURE>/finalize.py", "database": "<HOME>/.gemini/antigravity-cli/conversation_summaries.db", "query": "SELECT conversation_id,title,preview,step_count,last_modified_time,workspace_uris,project_id,agent_name,parent_conversation_id,app_data_dir FROM conversation_summaries", "rows": [{"conversation_id": "b966b16a-caf4-448a-bb24-0e34956022b0", "title": "Secret Word Arithmetic Calculation", "preview": "Secret Word Arithmetic Calculation", "step_count": 13, "last_modified_time": "2026-09-29 18:42:36.36116556+00:00", "workspace_uris": "[\"file://<WORKSPACE>\"]", "project_id": "default-cli-project", "agent_name": "", "parent_conversation_id": "", "app_data_dir": "antigravity-cli"}]}}
+{"stream": "inspection", "data": {"database": "<HOME>/.gemini/antigravity-cli/conversations/b966b16a-caf4-448a-bb24-0e34956022b0.db", "query": "SELECT name FROM sqlite_master WHERE type='table'", "tables": ["trajectory_meta", "steps", "gen_metadata", "executor_metadata", "parent_references", "trajectory_metadata_blob", "battle_mode_infos"], "steps_count": 13, "note": "Step payloads and metadata are binary blobs; no transcript decoder verified."}}
+{"stream": "inspection", "data": {"command": "python3 <CAPTURE>/finalize.py", "workspace_files": {"sandbox.txt": "PHASE0_EDIT\n", "skip-permissions.txt": "PHASE0_EDIT\n", "plan.txt": "PHASE0_EDIT\n", "accept-edits.txt": "PHASE0_EDIT\n", "default.txt": "PHASE0_EDIT\n", "input.txt": "PHASE0_READ_MARKER\n"}}}
+{"stream": "inspection", "data": {"command": "firecrawl scrape <OFFICIAL_MANIFEST_URL> --format markdown", "retrieved_manifest": "```json\n{\n  \"version\": \"1.2.12\",\n  \"url\": \"https://storage.googleapis.com/antigravity-public/antigravity-cli/1.2.12-5784551402897408/linux-x64/cli_linux_x64.tar.gz\",\n  \"sha512\": \"d5f0fe7433cb7c43ea878c07627a4fdb82d218f3bef5e6436266f5d9fdd2df145523453b9be0c4250391a64a007f5f42f7faff797bc2b2d502e7efb4874e383a\"\n}\n\n```\n", "note": "Fetch returned 1.2.12; supplied binary reports 1.2.13. Release provenance is not established by this manifest response."}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.capture.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.capture.ndjson
new file mode 100644
index 0000000000..be57e05c35
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.capture.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 319, "stream": "capture", "data": {"stdin_close": true}}
+{"t_ms": 2576, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdin.ndjson
new file mode 100644
index 0000000000..de27d4d5db
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 292, "stream": "stdin", "data": {"event": "user", "message": {"content": "Reply with PHASE0_EOF. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdout.ndjson
new file mode 100644
index 0000000000..88c41c8b1d
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-close-mid-turn.stdout.ndjson
@@ -0,0 +1,5 @@
+{"t_ms": 292, "stream": "stdout", "data": {"event": "init", "conversation_id": "4a95b7fd-ae73-4b99-9c00-25d7c37f0250", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 319, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "4a95b7fd-ae73-4b99-9c00-25d7c37f0250", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2230, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "4a95b7fd-ae73-4b99-9c00-25d7c37f0250", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_EOF"}}}
+{"t_ms": 2459, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "4a95b7fd-ae73-4b99-9c00-25d7c37f0250", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.123780285, "usage": {"input_tokens": 11253, "output_tokens": 80, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11333}}}}
+{"t_ms": 2459, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "4a95b7fd-ae73-4b99-9c00-25d7c37f0250", "status": "SUCCESS", "response": "PHASE0_EOF\n", "duration_seconds": 2.146186078, "num_turns": 1, "usage": {"input_tokens": 11253, "output_tokens": 80, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11333}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.capture.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.capture.ndjson
new file mode 100644
index 0000000000..12fb5138b4
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 9564, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdin.ndjson
new file mode 100644
index 0000000000..326c02c7d0
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdin.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 971, "stream": "stdin", "data": {"event": "user", "message": {"content": "Write a 500-word essay about primes. No tools."}}}
+{"t_ms": 997, "stream": "stdin", "data": {"event": "user", "message": {"content": "Reply with exactly PHASE0_QUEUED. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdout.ndjson
new file mode 100644
index 0000000000..bf80956e6a
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/stdin-mid-turn.stdout.ndjson
@@ -0,0 +1,179 @@
+{"t_ms": 971, "stream": "stdout", "data": {"event": "init", "conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 997, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3035, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "### The Indivisible Atom"}}}
+{"t_ms": 3061, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s of Arithme"}}}
+{"t_ms": 3087, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tic\n\nIn the vast landsca"}}}
+{"t_ms": 3112, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pe of mathem"}}}
+{"t_ms": 3137, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "atics, prime numbers sta"}}}
+{"t_ms": 3162, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nd as"}}}
+{"t_ms": 3213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " fundamental building bl"}}}
+{"t_ms": 3238, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ocks—the i"}}}
+{"t_ms": 3263, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ndivisible atoms of arit"}}}
+{"t_ms": 3289, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "hmetic. Defi"}}}
+{"t_ms": 3314, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ned simply as integers g"}}}
+{"t_ms": 3339, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "reater than "}}}
+{"t_ms": 3365, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "one that are divisible o"}}}
+{"t_ms": 3390, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nly by one"}}}
+{"t_ms": 3441, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " and themselves, primes possess an e"}}}
+{"t_ms": 3466, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "lemental pur"}}}
+{"t_ms": 3491, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ity. Yet beneath this de"}}}
+{"t_ms": 3517, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ceptive simplicity lies "}}}
+{"t_ms": 3542, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "one of the d"}}}
+{"t_ms": 3567, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "eepest, most beautiful m"}}}
+{"t_ms": 3592, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ysteries in "}}}
+{"t_ms": 3618, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "human"}}}
+{"t_ms": 3668, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " inquiry: an"}}}
+{"t_ms": 3694, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " unending dance between "}}}
+{"t_ms": 3719, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "order and ch"}}}
+{"t_ms": 3744, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "aos, predictability and "}}}
+{"t_ms": 3770, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "randomness.\n"}}}
+{"t_ms": 3795, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\nThe fascination with pr"}}}
+{"t_ms": 3820, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "imes stretches back to antiquity. In"}}}
+{"t_ms": 3846, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " approximate"}}}
+{"t_ms": 3871, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ly 300 BCE, the ancient "}}}
+{"t_ms": 3897, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Greek mathem"}}}
+{"t_ms": 3922, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "atician Euclid formulate"}}}
+{"t_ms": 3947, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "d one of history’s mos"}}}
+{"t_ms": 3972, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t elegant proofs in his "}}}
+{"t_ms": 3998, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "*Elements*, demonstratin"}}}
+{"t_ms": 4023, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "g that the s"}}}
+{"t_ms": 4048, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "upply of prime numbers i"}}}
+{"t_ms": 4074, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s infinite. "}}}
+{"t_ms": 4099, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "If one assumes a finite "}}}
+{"t_ms": 4124, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "list of primes, multiply"}}}
+{"t_ms": 4150, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing them tog"}}}
+{"t_ms": 4175, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ether and adding one yields a new nu"}}}
+{"t_ms": 4201, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "mber that is"}}}
+{"t_ms": 4226, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " either prime itself or "}}}
+{"t_ms": 4251, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "divisible by"}}}
+{"t_ms": 4277, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " a prime not on the orig"}}}
+{"t_ms": 4303, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "inal list. Euclid’s pr"}}}
+{"t_ms": 4328, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "oof establis"}}}
+{"t_ms": 4354, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "hed an eternal truth: no matter how "}}}
+{"t_ms": 4379, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "far we trave"}}}
+{"t_ms": 4404, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "l along the number line,"}}}
+{"t_ms": 4430, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " new primes will continu"}}}
+{"t_ms": 4455, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e to emerge."}}}
+{"t_ms": 4481, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n\nDespite their infinite"}}}
+{"t_ms": 4583, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " nature, primes become i"}}}
+{"t_ms": 4608, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ncreasingly sparse as nu"}}}
+{"t_ms": 4633, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "mbers grow l"}}}
+{"t_ms": 4659, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "arger. For centuries, th"}}}
+{"t_ms": 4684, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "eir distribu"}}}
+{"t_ms": 4709, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tion appeared entirely e"}}}
+{"t_ms": 4734, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rratic, defying simple formulas. It "}}}
+{"t_ms": 4760, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "was not unti"}}}
+{"t_ms": 4785, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "l the nineteenth century"}}}
+{"t_ms": 4810, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " that Carl F"}}}
+{"t_ms": 4836, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "riedrich Gauss and Adrie"}}}
+{"t_ms": 4861, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "n-Marie Legendre conject"}}}
+{"t_ms": 4886, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ured the Pri"}}}
+{"t_ms": 4912, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "me Number Theorem, later"}}}
+{"t_ms": 4937, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " proven in 1896 by Jacqu"}}}
+{"t_ms": 4963, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "es Hadamard and Charles "}}}
+{"t_ms": 4988, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "Jean de la V"}}}
+{"t_ms": 5013, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "allée Poussin. The theo"}}}
+{"t_ms": 5038, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rem revealed a breathtak"}}}
+{"t_ms": 5064, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ing macrosco"}}}
+{"t_ms": 5089, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pic regularity: the probabi"}}}
+{"t_ms": 5114, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "lity that a "}}}
+{"t_ms": 5140, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "randomly chosen integer "}}}
+{"t_ms": 5165, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "$N$ is prime is inversel"}}}
+{"t_ms": 5190, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "y proportion"}}}
+{"t_ms": 5216, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "al to its natural logari"}}}
+{"t_ms": 5241, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "thm, $\\ln"}}}
+{"t_ms": 5292, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "(N)$. While individual p"}}}
+{"t_ms": 5317, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rimes appear"}}}
+{"t_ms": 5343, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " almost randomly, their "}}}
+{"t_ms": 5368, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "collective b"}}}
+{"t_ms": 5393, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ehavior follows a remark"}}}
+{"t_ms": 5418, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ably smooth "}}}
+{"t_ms": 5444, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "logarithmic curve.\n\nThis"}}}
+{"t_ms": 5469, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " duality between"}}}
+{"t_ms": 5495, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " local chaos and global "}}}
+{"t_ms": 5520, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "harmony is epitomized by"}}}
+{"t_ms": 5546, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " the Riemann"}}}
+{"t_ms": 5571, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Hypothesis, proposed by"}}}
+{"t_ms": 5596, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " Bernhard Riemann in 185"}}}
+{"t_ms": 5622, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "9. By"}}}
+{"t_ms": 5673, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " extending t"}}}
+{"t_ms": 5698, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "he zeta function into th"}}}
+{"t_ms": 5723, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e complex pl"}}}
+{"t_ms": 5749, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ane, Riemann connected t"}}}
+{"t_ms": 5774, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "he distribution of prime"}}}
+{"t_ms": 5799, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s directly t"}}}
+{"t_ms": 5825, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o the non-trivial zeros "}}}
+{"t_ms": 5850, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "of this func"}}}
+{"t_ms": 5875, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tion. Widely regarded as the most"}}}
+{"t_ms": 5900, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " famous unsolved problem"}}}
+{"t_ms": 5926, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " in mathemat"}}}
+{"t_ms": 5952, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ics, the Riemann Hypothe"}}}
+{"t_ms": 5977, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "sis asserts "}}}
+{"t_ms": 6002, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "that all these non-trivi"}}}
+{"t_ms": 6028, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "al zeros lie"}}}
+{"t_ms": 6053, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " on a"}}}
+{"t_ms": 6104, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " single critical line. I"}}}
+{"t_ms": 6129, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "f true, it would unlock "}}}
+{"t_ms": 6154, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "a profound h"}}}
+{"t_ms": 6180, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "armonic symphony governi"}}}
+{"t_ms": 6205, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ng the exact fluctuation"}}}
+{"t_ms": 6230, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "s of prime n"}}}
+{"t_ms": 6256, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "umbers.\n\nBeyond"}}}
+{"t_ms": 6332, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " their aesthetic allure in pure math"}}}
+{"t_ms": 6357, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ematics, pri"}}}
+{"t_ms": 6383, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "me numbers have quietly "}}}
+{"t_ms": 6408, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "become the b"}}}
+{"t_ms": 6434, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "edrock of modern technological civil"}}}
+{"t_ms": 6459, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ization. In "}}}
+{"t_ms": 6485, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "the 1970s, the developme"}}}
+{"t_ms": 6510, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "nt of asymmetric public-"}}}
+{"t_ms": 6535, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "key cryptogr"}}}
+{"t_ms": 6561, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "aphy—most notably the "}}}
+{"t_ms": 6586, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "RSA algorithm—transfor"}}}
+{"t_ms": 6611, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "med prime numbers into i"}}}
+{"t_ms": 6637, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ndispensable digital gua"}}}
+{"t_ms": 6662, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rdians. The "}}}
+{"t_ms": 6687, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "security of global comme"}}}
+{"t_ms": 6713, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rce, secure "}}}
+{"t_ms": 6738, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "communication, and onlin"}}}
+{"t_ms": 6763, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e privacy re"}}}
+{"t_ms": 6789, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "sts upon a computational asymmetry: "}}}
+{"t_ms": 6814, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "multiplying two large pr"}}}
+{"t_ms": 6839, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ime numbers "}}}
+{"t_ms": 6865, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "together is nearly insta"}}}
+{"t_ms": 6890, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ntaneous, bu"}}}
+{"t_ms": 6915, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t factoring their astron"}}}
+{"t_ms": 6941, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "omical product back into"}}}
+{"t_ms": 6966, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " its constit"}}}
+{"t_ms": 6991, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "uent primes is virtually"}}}
+{"t_ms": 7017, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " impossible "}}}
+{"t_ms": 7042, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "with classical computing resources.\n"}}}
+{"t_ms": 7067, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\nPrime numbe"}}}
+{"t_ms": 7093, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rs represent a sublime i"}}}
+{"t_ms": 7118, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ntersection of philosoph"}}}
+{"t_ms": 7143, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "y, abstract "}}}
+{"t_ms": 7169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "theory, and practical ut"}}}
+{"t_ms": 7194, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ility. They "}}}
+{"t_ms": 7219, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "remind us that the most "}}}
+{"t_ms": 7245, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "basic structures in natu"}}}
+{"t_ms": 7270, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "re often harbor the deep"}}}
+{"t_ms": 7295, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "est questions. As mathem"}}}
+{"t_ms": 7320, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "aticians con"}}}
+{"t_ms": 7346, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tinue to explore unresol"}}}
+{"t_ms": 7371, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ved enigmas "}}}
+{"t_ms": 7397, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "like the Twin Prime Conjecture or th"}}}
+{"t_ms": 7422, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e Goldbach Conjecture, p"}}}
+{"t_ms": 7448, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rimes remain"}}}
+{"t_ms": 7473, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " an enduring testament t"}}}
+{"t_ms": 7498, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "o the infini"}}}
+{"t_ms": 7524, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "te richness waiting to b"}}}
+{"t_ms": 7549, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e uncovered within the s"}}}
+{"t_ms": 7574, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "implest conc"}}}
+{"t_ms": 7600, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "epts."}}}
+{"t_ms": 7650, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 6.647623906, "usage": {"input_tokens": 11252, "output_tokens": 639, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11891}}}}
+{"t_ms": 7650, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "status": "SUCCESS", "response": "### The Indivisible Atoms of Arithmetic\n\nIn the vast landscape of mathematics, prime numbers stand as fundamental building blocks—the indivisible atoms of arithmetic. Defined simply as integers greater than one that are divisible only by one and themselves, primes possess an elemental purity. Yet beneath this deceptive simplicity lies one of the deepest, most beautiful mysteries in human inquiry: an unending dance between order and chaos, predictability and randomness.\n\nThe fascination with primes stretches back to antiquity. In approximately 300 BCE, the ancient Greek mathematician Euclid formulated one of history’s most elegant proofs in his *Elements*, demonstrating that the supply of prime numbers is infinite. If one assumes a finite list of primes, multiplying them together and adding one yields a new number that is either prime itself or divisible by a prime not on the original list. Euclid’s proof established an eternal truth: no matter how far we travel along the number line, new primes will continue to emerge.\n\nDespite their infinite nature, primes become increasingly sparse as numbers grow larger. For centuries, their distribution appeared entirely erratic, defying simple formulas. It was not until the nineteenth century that Carl Friedrich Gauss and Adrien-Marie Legendre conjectured the Prime Number Theorem, later proven in 1896 by Jacques Hadamard and Charles Jean de la Vallée Poussin. The theorem revealed a breathtaking macroscopic regularity: the probability that a randomly chosen integer $N$ is prime is inversely proportional to its natural logarithm, $\\ln(N)$. While individual primes appear almost randomly, their collective behavior follows a remarkably smooth logarithmic curve.\n\nThis duality between local chaos and global harmony is epitomized by the Riemann Hypothesis, proposed by Bernhard Riemann in 1859. By extending the zeta function into the complex plane, Riemann connected the distribution of primes directly to the non-trivial zeros of this function. Widely regarded as the most famous unsolved problem in mathematics, the Riemann Hypothesis asserts that all these non-trivial zeros lie on a single critical line. If true, it would unlock a profound harmonic symphony governing the exact fluctuations of prime numbers.\n\nBeyond their aesthetic allure in pure mathematics, prime numbers have quietly become the bedrock of modern technological civilization. In the 1970s, the development of asymmetric public-key cryptography—most notably the RSA algorithm—transformed prime numbers into indispensable digital guardians. The security of global commerce, secure communication, and online privacy rests upon a computational asymmetry: multiplying two large prime numbers together is nearly instantaneous, but factoring their astronomical product back into its constituent primes is virtually impossible with classical computing resources.\n\nPrime numbers represent a sublime intersection of philosophy, abstract theory, and practical utility. They remind us that the most basic structures in nature often harbor the deepest questions. As mathematicians continue to explore unresolved enigmas like the Twin Prime Conjecture or the Goldbach Conjecture, primes remain an enduring testament to the infinite richness waiting to be uncovered within the simplest concepts.\n", "duration_seconds": 6.674385393, "num_turns": 1, "usage": {"input_tokens": 11252, "output_tokens": 639, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11891}}}}
+{"t_ms": 7677, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 2, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 9187, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE"}}}
+{"t_ms": 9213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "0_QUEUED"}}}
+{"t_ms": 9466, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.793731176, "usage": {"input_tokens": 11913, "output_tokens": 6, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11919}}}}
+{"t_ms": 9466, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "956514b0-986c-4168-8130-c6251328d6fb", "status": "SUCCESS", "response": "PHASE0_QUEUED\n", "duration_seconds": 8.483804893, "num_turns": 2, "usage": {"input_tokens": 23165, "output_tokens": 645, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23810}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/subagent.capture.ndjson b/plugins/antigravity-provider/test/fixtures/subagent.capture.ndjson
new file mode 100644
index 0000000000..854c3c3eba
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/subagent.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 13163, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/subagent.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/subagent.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/subagent.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/subagent.stdin.ndjson
new file mode 100644
index 0000000000..0814f42805
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/subagent.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 291, "stream": "stdin", "data": {"event": "user", "message": {"content": "Use define_subagent to define a small subagent named phase0-counter that answers arithmetic only, then invoke_subagent to ask it 2+2. Report its answer. Do not use shell."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/subagent.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/subagent.stdout.ndjson
new file mode 100644
index 0000000000..cec633cda7
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/subagent.stdout.ndjson
@@ -0,0 +1,23 @@
+{"t_ms": 291, "stream": "stdout", "data": {"event": "init", "conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 319, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3924, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.580501478, "usage": {"input_tokens": 11252, "output_tokens": 188, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11440}}}}
+{"t_ms": 3924, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "define_subagent", "tool_info": {"name": "define_subagent", "parameters": {"description": "A subagent specialized in answering arithmetic questions only.", "name": "phase0-counter"}}}}}
+{"t_ms": 3924, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "define_subagent", "duration_seconds": 0.003321972, "tool_info": {"name": "define_subagent", "parameters": {"description": "A subagent specialized in answering arithmetic questions only.", "name": "phase0-counter"}, "output": "Subagent \"phase0-counter\" defined successfully. It can now be invoked via invoke_subagent."}}}}
+{"t_ms": 6541, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 3, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.634297625, "usage": {"input_tokens": 11433, "output_tokens": 79, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11512}}}}
+{"t_ms": 6541, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 4, "state": "ACTIVE", "step_type": "subagent", "tool_name": "invoke_subagent", "subagent_info": {"subagents": [{"type_name": "phase0-counter", "role": "Arithmetic Assistant", "initial_prompt": "What is 2+2?"}]}}}}
+{"t_ms": 6565, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 4, "state": "DONE", "step_type": "subagent", "tool_name": "invoke_subagent", "duration_seconds": 0.01034356, "subagent_info": {"subagents": [{"type_name": "phase0-counter", "role": "Arithmetic Assistant", "initial_prompt": "What is 2+2?", "conversation_id": "b6f02329-7415-49a7-a9a9-1cd09e898d26", "log_uri": "file://<HOME>/.gemini/antigravity-cli/brain/b6f02329-7415-49a7-a9a9-1cd09e898d26/.system_generated/logs/transcript.jsonl", "workspace_uris": ["file://<WORKSPACE>"]}]}}}}
+{"t_ms": 8527, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "I"}}}
+{"t_ms": 8679, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " have define"}}}
+{"t_ms": 8704, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "d the subagent `phase0-c"}}}
+{"t_ms": 8730, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ounter` and "}}}
+{"t_ms": 8755, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "invoked it with the ques"}}}
+{"t_ms": 8780, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tion \"What"}}}
+{"t_ms": 8806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " is 2+2?\". Awaiting its "}}}
+{"t_ms": 8831, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "response."}}}
+{"t_ms": 9135, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 5, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.58161986, "usage": {"input_tokens": 11739, "output_tokens": 31, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11770}}}}
+{"t_ms": 9715, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 6, "state": "DONE", "step_type": "system_message", "duration_seconds": 3.6749e-05}}}
+{"t_ms": 12484, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The `phase0-"}}}
+{"t_ms": 12510, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "counter` sub"}}}
+{"t_ms": 12610, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 7, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agent answered: **4**."}}}
+{"t_ms": 13042, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "step_index": 7, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.329676969, "usage": {"input_tokens": 11886, "output_tokens": 74, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11960}}}}
+{"t_ms": 13068, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "eceffa7f-bbef-47d0-a3cf-3daeaf20a829", "status": "SUCCESS", "response": "I have defined the subagent `phase0-counter` and invoked it with the question \"What is 2+2?\". Awaiting its response.\nThe `phase0-counter` subagent answered: **4**.\n", "duration_seconds": 12.746450429, "num_turns": 1, "usage": {"input_tokens": 46310, "output_tokens": 372, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 46682}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-block.capture.ndjson b/plugins/antigravity-provider/test/fixtures/text-block.capture.ndjson
new file mode 100644
index 0000000000..b1f7ab6455
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-block.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 4102, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-block.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/text-block.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/text-block.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/text-block.stdin.ndjson
new file mode 100644
index 0000000000..faeb98b247
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-block.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 2020, "stream": "stdin", "data": {"event": "user", "message": {"content": [{"type": "text", "text": "Reply with PHASE0_BLOCK. No tools."}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-block.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/text-block.stdout.ndjson
new file mode 100644
index 0000000000..ee7a7ec32a
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-block.stdout.ndjson
@@ -0,0 +1,5 @@
+{"t_ms": 2020, "stream": "stdout", "data": {"event": "init", "conversation_id": "0757bec3-d263-4f90-bf34-7510d638d8c5", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 2051, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0757bec3-d263-4f90-bf34-7510d638d8c5", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3939, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0757bec3-d263-4f90-bf34-7510d638d8c5", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_BLOCK"}}}
+{"t_ms": 3990, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "0757bec3-d263-4f90-bf34-7510d638d8c5", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.932265932, "usage": {"input_tokens": 11235, "output_tokens": 62, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11297}}}}
+{"t_ms": 3990, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "0757bec3-d263-4f90-bf34-7510d638d8c5", "status": "SUCCESS", "response": "PHASE0_BLOCK\n", "duration_seconds": 1.959296182, "num_turns": 1, "usage": {"input_tokens": 11235, "output_tokens": 62, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11297}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-turn.capture.ndjson b/plugins/antigravity-provider/test/fixtures/text-turn.capture.ndjson
new file mode 100644
index 0000000000..1b006f8ab9
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-turn.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 2911, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-turn.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/text-turn.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/text-turn.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/text-turn.stdin.ndjson
new file mode 100644
index 0000000000..389b97dece
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-turn.stdin.ndjson
@@ -0,0 +1 @@
+{"t_ms": 294, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Reply with exactly PHASE0_HELLO. No tools."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/text-turn.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/text-turn.stdout.ndjson
new file mode 100644
index 0000000000..89fc8a7677
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/text-turn.stdout.ndjson
@@ -0,0 +1,5 @@
+{"t_ms": 294, "stream": "stdout", "data": {"event": "init", "conversation_id": "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 351, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2544, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda", "step_index": 1, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_HELLO"}}}
+{"t_ms": 2746, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda", "step_index": 1, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.413995705, "usage": {"input_tokens": 11235, "output_tokens": 78, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11313}}}}
+{"t_ms": 2772, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "e5cf1e2d-c715-4328-8e67-4a85c8dc3cda", "status": "SUCCESS", "response": "PHASE0_HELLO\n", "duration_seconds": 2.445370438, "num_turns": 1, "usage": {"input_tokens": 11235, "output_tokens": 78, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11313}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-accept-edits.capture.ndjson b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.capture.ndjson
new file mode 100644
index 0000000000..d7c50c17a4
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--mode", "accept-edits"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 16127, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stderr.ndjson
new file mode 100644
index 0000000000..30cf90e622
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 15954, "stream": "stderr", "data": "jetski: no output produced — a tool required the \"command\" permission that headless mode cannot prompt for, so it was auto-denied. Add an allow-rule under permissions.allow in settings.json (e.g. command(<target>)). Alternatively, re-run with --dangerously-skip-permissions to auto-approve all tools."}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdin.ndjson
new file mode 100644
index 0000000000..4d89737919
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdin.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 288, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use view_file to read <WORKSPACE>/input.txt. Report its contents. Do not use a shell."}}}
+{"t_ms": 5150, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use write_to_file to create <WORKSPACE>/accept-edits.txt with PHASE0_WRITE. Then use replace_file_content to change PHASE0_WRITE to PHASE0_EDIT. No shell. Do not ask me questions."}}}
+{"t_ms": 13611, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use run_command exactly once to run printf PHASE0_SHELL in <WORKSPACE>. Report the output. Do not ask me questions."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdout.ndjson
new file mode 100644
index 0000000000..57d50ad776
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-accept-edits.stdout.ndjson
@@ -0,0 +1,40 @@
+{"t_ms": 288, "stream": "stdout", "data": {"event": "init", "conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 315, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2807, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.468344855, "usage": {"input_tokens": 11272, "output_tokens": 149, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11421}}}}
+{"t_ms": 2807, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 2807, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002720597, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "2 lines, 19 bytes"}}}}
+{"t_ms": 4820, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The contents"}}}
+{"t_ms": 4870, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of [<CAPTURE>/workspa"}}}
+{"t_ms": 4896, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ce/input.txt"}}}
+{"t_ms": 4921, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "](file:///tmp"}}}
+{"t_ms": 4972, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/agy-p0/work"}}}
+{"t_ms": 4998, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "space/input.txt) are:\n\n```\nPHASE0_RE"}}}
+{"t_ms": 5023, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "AD_MARKER\n``"}}}
+{"t_ms": 5048, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`"}}}
+{"t_ms": 5150, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.360276704, "usage": {"input_tokens": 11494, "output_tokens": 47, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11541}}}}
+{"t_ms": 5150, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "status": "SUCCESS", "response": "The contents of [<WORKSPACE>/input.txt](file://<WORKSPACE>/input.txt) are:\n\n```\nPHASE0_READ_MARKER\n```\n", "duration_seconds": 4.857244426, "num_turns": 1, "usage": {"input_tokens": 22766, "output_tokens": 196, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 22962}}}}
+{"t_ms": 5176, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 8771, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.600197654, "usage": {"input_tokens": 11663, "output_tokens": 419, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12082}}}}
+{"t_ms": 8771, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/accept-edits.txt"}}}}}
+{"t_ms": 8771, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003051666, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/accept-edits.txt"}}}}}
+{"t_ms": 11213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.42873306, "usage": {"input_tokens": 11846, "output_tokens": 129, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11975}}}}
+{"t_ms": 11213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "replace_file_content", "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/accept-edits.txt"}}}}}
+{"t_ms": 11213, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "replace_file_content", "duration_seconds": 0.003025767, "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/accept-edits.txt"}}}}}
+{"t_ms": 12799, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The file"}}}
+{"t_ms": 12900, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [<WORKSPACE>/"}}}
+{"t_ms": 12926, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "accept-edits"}}}
+{"t_ms": 12951, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".txt](file:///"}}}
+{"t_ms": 13002, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p0/w"}}}
+{"t_ms": 13027, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orkspace/accept-edits.tx"}}}
+{"t_ms": 13053, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t) has been "}}}
+{"t_ms": 13078, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "created with `PHASE0"}}}
+{"t_ms": 13155, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "_WRITE` and then updated"}}}
+{"t_ms": 13180, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " to `PHASE0_"}}}
+{"t_ms": 13206, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "EDIT`."}}}
+{"t_ms": 13611, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.385314949, "usage": {"input_tokens": 12152, "output_tokens": 59, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12211}}}}
+{"t_ms": 13611, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "status": "SUCCESS", "response": "The file [<WORKSPACE>/accept-edits.txt](file://<WORKSPACE>/accept-edits.txt) has been created with `PHASE0_WRITE` and then updated to `PHASE0_EDIT`.\n", "duration_seconds": 13.300599177, "num_turns": 2, "usage": {"input_tokens": 58427, "output_tokens": 803, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 59230}}}}
+{"t_ms": 13638, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 15928, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.302666458, "usage": {"input_tokens": 12310, "output_tokens": 98, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12408}}}}
+{"t_ms": 15928, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}}}}}
+{"t_ms": 15954, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "step_index": 12, "state": "ERROR", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.002216645, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}, "error": {"type": "TOOL_ERROR", "message": "permission check failed for command \"printf PHASE0_SHELL\": user denied permission to run command:\nprintf PHASE0_SHELL\nDo not attempt to circumvent this denial by rephrasing the command, using alternative tools/scripts (e.g. python, sh, curl), or accessing the same target resource. Proceed without performing this action."}}}}}
+{"t_ms": 15954, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "c38f8e92-993c-453c-9774-035e82a1108b", "status": "SUCCESS", "response": "", "duration_seconds": 15.639601905, "num_turns": 3, "usage": {"input_tokens": 70737, "output_tokens": 901, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 71638}, "denied_actions": [{"action": "command", "display_name": "RunCommand"}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-default.capture.ndjson b/plugins/antigravity-provider/test/fixtures/tools-default.capture.ndjson
new file mode 100644
index 0000000000..8c57e4e549
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-default.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 21620, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-default.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/tools-default.stderr.ndjson
new file mode 100644
index 0000000000..4e24b2cb59
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-default.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 21540, "stream": "stderr", "data": "jetski: no output produced — a tool required the \"command\" permission that headless mode cannot prompt for, so it was auto-denied. Add an allow-rule under permissions.allow in settings.json (e.g. command(<target>)). Alternatively, re-run with --dangerously-skip-permissions to auto-approve all tools."}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-default.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/tools-default.stdin.ndjson
new file mode 100644
index 0000000000..371a7bda84
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-default.stdin.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 297, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use view_file to read <WORKSPACE>/input.txt. Report its contents. Do not use a shell."}}}
+{"t_ms": 6781, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use write_to_file to create <WORKSPACE>/default.txt with PHASE0_WRITE. Then use replace_file_content to change PHASE0_WRITE to PHASE0_EDIT. No shell. Do not ask me questions."}}}
+{"t_ms": 17022, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use run_command exactly once to run printf PHASE0_SHELL in <WORKSPACE>. Report the output. Do not ask me questions."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-default.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/tools-default.stdout.ndjson
new file mode 100644
index 0000000000..dedb01d707
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-default.stdout.ndjson
@@ -0,0 +1,41 @@
+{"t_ms": 297, "stream": "stdout", "data": {"event": "init", "conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 326, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 4079, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.738430576, "usage": {"input_tokens": 11257, "output_tokens": 149, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11406}}}}
+{"t_ms": 4079, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 4079, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002338062, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "2 lines, 19 bytes"}}}}
+{"t_ms": 6096, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The contents"}}}
+{"t_ms": 6223, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of [`<CAPTURE>/worksp"}}}
+{"t_ms": 6248, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ace/input.tx"}}}
+{"t_ms": 6274, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t`](file:///tmp/agy"}}}
+{"t_ms": 6350, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "-p0/workspace/input.txt) are:\n\n```te"}}}
+{"t_ms": 6375, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "xt\nPHASE0_RE"}}}
+{"t_ms": 6400, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "AD_MARKER"}}}
+{"t_ms": 6451, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n```"}}}
+{"t_ms": 6781, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.698156575, "usage": {"input_tokens": 11478, "output_tokens": 49, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11527}}}}
+{"t_ms": 6781, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "status": "SUCCESS", "response": "The contents of [`<WORKSPACE>/input.txt`](file://<WORKSPACE>/input.txt) are:\n\n```text\nPHASE0_READ_MARKER\n```\n", "duration_seconds": 6.466229654, "num_turns": 1, "usage": {"input_tokens": 22735, "output_tokens": 198, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 22933}}}}
+{"t_ms": 6807, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 10766, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.966197803, "usage": {"input_tokens": 11646, "output_tokens": 171, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11817}}}}
+{"t_ms": 10766, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/default.txt"}}}}}
+{"t_ms": 10791, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003040074, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/default.txt"}}}}}
+{"t_ms": 13910, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.136362179, "usage": {"input_tokens": 11813, "output_tokens": 116, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11929}}}}
+{"t_ms": 13911, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "replace_file_content", "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/default.txt"}}}}}
+{"t_ms": 13911, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "replace_file_content", "duration_seconds": 0.003396671, "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/default.txt"}}}}}
+{"t_ms": 15904, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "I"}}}
+{"t_ms": 16032, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " have create"}}}
+{"t_ms": 16057, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "d [`<CAPTURE>/workspac"}}}
+{"t_ms": 16083, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "e/default.txt`](file:///"}}}
+{"t_ms": 16159, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p0/w"}}}
+{"t_ms": 16184, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orkspace/default.txt) wi"}}}
+{"t_ms": 16210, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "th `PHASE0_WRITE` and th"}}}
+{"t_ms": 16235, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "en updated i"}}}
+{"t_ms": 16261, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t to"}}}
+{"t_ms": 16286, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " `PHASE0_EDI"}}}
+{"t_ms": 16312, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "T` using `replace_file_c"}}}
+{"t_ms": 16337, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ontent`."}}}
+{"t_ms": 17022, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.099484037, "usage": {"input_tokens": 12103, "output_tokens": 61, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12164}}}}
+{"t_ms": 17022, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "status": "SUCCESS", "response": "I have created [`<WORKSPACE>/default.txt`](file://<WORKSPACE>/default.txt) with `PHASE0_WRITE` and then updated it to `PHASE0_EDIT` using `replace_file_content`.\n", "duration_seconds": 16.710782303, "num_turns": 2, "usage": {"input_tokens": 58297, "output_tokens": 546, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 58843}}}}
+{"t_ms": 17049, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 21540, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 4.490021482, "usage": {"input_tokens": 12263, "output_tokens": 370, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12633}}}}
+{"t_ms": 21540, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}}}}}
+{"t_ms": 21540, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "step_index": 12, "state": "ERROR", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.002821636, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}, "error": {"type": "TOOL_ERROR", "message": "permission check failed for command \"printf PHASE0_SHELL\": user denied permission to run command:\nprintf PHASE0_SHELL\nDo not attempt to circumvent this denial by rephrasing the command, using alternative tools/scripts (e.g. python, sh, curl), or accessing the same target resource. Proceed without performing this action."}}}}}
+{"t_ms": 21540, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "6d13e726-1498-4995-aa81-7a0851679fb3", "status": "SUCCESS", "response": "", "duration_seconds": 21.23332446, "num_turns": 3, "usage": {"input_tokens": 70560, "output_tokens": 916, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 71476}, "denied_actions": [{"action": "command", "display_name": "RunCommand"}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-plan.capture.ndjson b/plugins/antigravity-provider/test/fixtures/tools-plan.capture.ndjson
new file mode 100644
index 0000000000..4a1151d083
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-plan.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--mode", "plan"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 16560, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-plan.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/tools-plan.stderr.ndjson
new file mode 100644
index 0000000000..be57aac639
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-plan.stderr.ndjson
@@ -0,0 +1,4 @@
+{"t_ms": 292, "stream": "stderr", "data": "warning: --mode plan has no effect while slash command expansion is disabled."}
+{"t_ms": 6705, "stream": "stderr", "data": "warning: --mode plan has no effect while slash command expansion is disabled."}
+{"t_ms": 13456, "stream": "stderr", "data": "warning: --mode plan has no effect while slash command expansion is disabled."}
+{"t_ms": 16400, "stream": "stderr", "data": "jetski: no output produced — a tool required the \"command\" permission that headless mode cannot prompt for, so it was auto-denied. Add an allow-rule under permissions.allow in settings.json (e.g. command(<target>)). Alternatively, re-run with --dangerously-skip-permissions to auto-approve all tools."}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-plan.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/tools-plan.stdin.ndjson
new file mode 100644
index 0000000000..c4d09c8ae7
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-plan.stdin.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 292, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use view_file to read <WORKSPACE>/input.txt. Report its contents. Do not use a shell."}}}
+{"t_ms": 6705, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use write_to_file to create <WORKSPACE>/plan.txt with PHASE0_WRITE. Then use replace_file_content to change PHASE0_WRITE to PHASE0_EDIT. No shell. Do not ask me questions."}}}
+{"t_ms": 13455, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use run_command exactly once to run printf PHASE0_SHELL in <WORKSPACE>. Report the output. Do not ask me questions."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-plan.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/tools-plan.stdout.ndjson
new file mode 100644
index 0000000000..473540451c
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-plan.stdout.ndjson
@@ -0,0 +1,36 @@
+{"t_ms": 292, "stream": "stdout", "data": {"event": "init", "conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 319, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3576, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 3.249717435, "usage": {"input_tokens": 11253, "output_tokens": 339, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11592}}}}
+{"t_ms": 3576, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 3576, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002425685, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "2 lines, 19 bytes"}}}}
+{"t_ms": 6197, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The contents"}}}
+{"t_ms": 6324, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of [`<WORKSPACE>/input.tx"}}}
+{"t_ms": 6349, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t`](file:///"}}}
+{"t_ms": 6374, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/"}}}
+{"t_ms": 6451, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p0/workspace/input.txt) are:\n\n``"}}}
+{"t_ms": 6476, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`\nPHASE0_REA"}}}
+{"t_ms": 6502, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "D_MARKER\n```"}}}
+{"t_ms": 6705, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 3.109263873, "usage": {"input_tokens": 11475, "output_tokens": 48, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11523}}}}
+{"t_ms": 6705, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "status": "SUCCESS", "response": "The contents of [`<WORKSPACE>/input.txt`](file://<WORKSPACE>/input.txt) are:\n\n```\nPHASE0_READ_MARKER\n```\n", "duration_seconds": 6.388206511, "num_turns": 1, "usage": {"input_tokens": 22728, "output_tokens": 387, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 23115}}}}
+{"t_ms": 6732, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 9502, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.757462001, "usage": {"input_tokens": 11642, "output_tokens": 166, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11808}}}}
+{"t_ms": 9502, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/plan.txt"}}}}}
+{"t_ms": 9502, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003883221, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/plan.txt"}}}}}
+{"t_ms": 11716, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.227570207, "usage": {"input_tokens": 11811, "output_tokens": 118, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11929}}}}
+{"t_ms": 11716, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "replace_file_content", "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/plan.txt"}}}}}
+{"t_ms": 11742, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "replace_file_content", "duration_seconds": 0.002974983, "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/plan.txt"}}}}}
+{"t_ms": 13151, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "[`<WORKSPACE>/"}}}
+{"t_ms": 13176, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "plan.txt`](file:///tmp/"}}}
+{"t_ms": 13252, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "agy-p0/workspace/plan.tx"}}}
+{"t_ms": 13278, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t) was created with `PHA"}}}
+{"t_ms": 13303, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "SE0_WRITE` and then upda"}}}
+{"t_ms": 13329, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ted to `PHASE0_EDIT` usi"}}}
+{"t_ms": 13354, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ng `replace_file_content"}}}
+{"t_ms": 13379, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "`."}}}
+{"t_ms": 13455, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.716582968, "usage": {"input_tokens": 12103, "output_tokens": 59, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12162}}}}
+{"t_ms": 13455, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "status": "SUCCESS", "response": "[`<WORKSPACE>/plan.txt`](file://<WORKSPACE>/plan.txt) was created with `PHASE0_WRITE` and then updated to `PHASE0_EDIT` using `replace_file_content`.\n", "duration_seconds": 13.142130621, "num_turns": 2, "usage": {"input_tokens": 58284, "output_tokens": 730, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 59014}}}}
+{"t_ms": 13482, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 16400, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.913339623, "usage": {"input_tokens": 12261, "output_tokens": 74, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12335}}}}
+{"t_ms": 16400, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}}}}}
+{"t_ms": 16400, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "step_index": 12, "state": "ERROR", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.002793073, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}, "error": {"type": "TOOL_ERROR", "message": "permission check failed for command \"printf PHASE0_SHELL\": user denied permission to run command:\nprintf PHASE0_SHELL\nDo not attempt to circumvent this denial by rephrasing the command, using alternative tools/scripts (e.g. python, sh, curl), or accessing the same target resource. Proceed without performing this action."}}}}}
+{"t_ms": 16400, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e1cdc94-5651-4941-b053-7e2afe73d01e", "status": "SUCCESS", "response": "", "duration_seconds": 16.097866635, "num_turns": 3, "usage": {"input_tokens": 70545, "output_tokens": 804, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 71349}, "denied_actions": [{"action": "command", "display_name": "RunCommand"}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-sandbox.capture.ndjson b/plugins/antigravity-provider/test/fixtures/tools-sandbox.capture.ndjson
new file mode 100644
index 0000000000..b845d3e735
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-sandbox.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--sandbox"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 13022, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-sandbox.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stderr.ndjson
new file mode 100644
index 0000000000..624a99a74c
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stderr.ndjson
@@ -0,0 +1 @@
+{"t_ms": 12723, "stream": "stderr", "data": "jetski: no output produced — a tool required the \"command\" permission that headless mode cannot prompt for, so it was auto-denied. Add an allow-rule under permissions.allow in settings.json (e.g. command(<target>)). Alternatively, re-run with --dangerously-skip-permissions to auto-approve all tools."}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdin.ndjson
new file mode 100644
index 0000000000..9ebac338e8
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdin.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 320, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use view_file to read <WORKSPACE>/input.txt. Report its contents. Do not use a shell."}}}
+{"t_ms": 4959, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use write_to_file to create <WORKSPACE>/sandbox.txt with PHASE0_WRITE. Then use replace_file_content to change PHASE0_WRITE to PHASE0_EDIT. No shell. Do not ask me questions."}}}
+{"t_ms": 10581, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use run_command exactly once to run printf PHASE0_SHELL in <WORKSPACE>. Report the output. Do not ask me questions."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdout.ndjson
new file mode 100644
index 0000000000..6d63907468
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-sandbox.stdout.ndjson
@@ -0,0 +1,40 @@
+{"t_ms": 319, "stream": "stdout", "data": {"event": "init", "conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "request-review"}}}
+{"t_ms": 346, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 3169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.806171145, "usage": {"input_tokens": 12031, "output_tokens": 307, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12338}}}}
+{"t_ms": 3169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 3169, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002973019, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "2 lines, 19 bytes"}}}}
+{"t_ms": 4705, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The contents"}}}
+{"t_ms": 4755, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of [input.txt](file:///"}}}
+{"t_ms": 4781, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p0/w"}}}
+{"t_ms": 4806, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "orkspace/input"}}}
+{"t_ms": 4857, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".txt) are:\n\n"}}}
+{"t_ms": 4882, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "```text\nPHASE0_READ_MARK"}}}
+{"t_ms": 4908, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ER\n```"}}}
+{"t_ms": 4959, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.791180207, "usage": {"input_tokens": 12253, "output_tokens": 39, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12292}}}}
+{"t_ms": 4959, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "status": "SUCCESS", "response": "The contents of [input.txt](file://<WORKSPACE>/input.txt) are:\n\n```text\nPHASE0_READ_MARKER\n```\n", "duration_seconds": 4.624371092, "num_turns": 1, "usage": {"input_tokens": 24284, "output_tokens": 346, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 24630}}}}
+{"t_ms": 4986, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 6674, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 1.678518989, "usage": {"input_tokens": 12411, "output_tokens": 78, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12489}}}}
+{"t_ms": 6674, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/sandbox.txt"}}}}}
+{"t_ms": 6674, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.002765401, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/sandbox.txt"}}}}}
+{"t_ms": 8939, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.278065329, "usage": {"input_tokens": 12577, "output_tokens": 118, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12695}}}}
+{"t_ms": 8939, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "replace_file_content", "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/sandbox.txt"}}}}}
+{"t_ms": 8965, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "replace_file_content", "duration_seconds": 0.002992846, "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/sandbox.txt"}}}}}
+{"t_ms": 10124, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "### Summary"}}}
+{"t_ms": 10251, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of Changes\n\n1. **Created File**: Us"}}}
+{"t_ms": 10276, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ed `write_to"}}}
+{"t_ms": 10302, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "_file` to create"}}}
+{"t_ms": 10378, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " [sandbox.tx"}}}
+{"t_ms": 10403, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t](file://<CAPTURE>/wo"}}}
+{"t_ms": 10428, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "rkspace/sandbox.txt) wit"}}}
+{"t_ms": 10454, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "h the conten"}}}
+{"t_ms": 10479, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "t `PHASE0_WRITE`.\n2. **Updated Con"}}}
+{"t_ms": 10504, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tent**: Used `replace_fi"}}}
+{"t_ms": 10530, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "le_content` to replace `"}}}
+{"t_ms": 10555, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_WRITE` with `PHAS"}}}
+{"t_ms": 10581, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "E0_EDIT`.\n", "duration_seconds": 1.630993868, "usage": {"input_tokens": 12869, "output_tokens": 83, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12952}}}}
+{"t_ms": 10581, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "status": "SUCCESS", "response": "### Summary of Changes\n\n1. **Created File**: Used `write_to_file` to create [sandbox.txt](file://<WORKSPACE>/sandbox.txt) with the content `PHASE0_WRITE`.\n2. **Updated Content**: Used `replace_file_content` to replace `PHASE0_WRITE` with `PHASE0_EDIT`.\n", "duration_seconds": 10.25241531, "num_turns": 2, "usage": {"input_tokens": 62141, "output_tokens": 625, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 62766}}}}
+{"t_ms": 10608, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 12723, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.117119481, "usage": {"input_tokens": 13051, "output_tokens": 80, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 13131}}}}
+{"t_ms": 12723, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}}}}}
+{"t_ms": 12723, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "step_index": 12, "state": "ERROR", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.00280781, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}, "error": {"type": "TOOL_ERROR", "message": "permission check failed for command \"printf PHASE0_SHELL\": user denied permission to run command:\nprintf PHASE0_SHELL\nDo not attempt to circumvent this denial by rephrasing the command, using alternative tools/scripts (e.g. python, sh, curl), or accessing the same target resource. Proceed without performing this action."}}}}}
+{"t_ms": 12723, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "75d9e35e-6354-48a9-b055-d0dd752c47b9", "status": "SUCCESS", "response": "", "duration_seconds": 12.395964579, "num_turns": 3, "usage": {"input_tokens": 75192, "output_tokens": 705, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 75897}, "denied_actions": [{"action": "command", "display_name": "RunCommand"}]}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.capture.ndjson b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.capture.ndjson
new file mode 100644
index 0000000000..dd49b19784
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--input-format", "stream-json", "--output-format", "stream-json", "--add-dir", "<WORKSPACE>", "--disable-slash-commands", "--dangerously-skip-permissions"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": {"modelProvider": "gemini"}, "env": {"GEMINI_API_KEY": "<DUMMY_KEY>", "GOOGLE_GEMINI_BASE_URL": "http://127.0.0.1:<PORT>"}}}
+{"t_ms": 17771, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdin.ndjson
new file mode 100644
index 0000000000..f91311bcf7
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdin.ndjson
@@ -0,0 +1,3 @@
+{"t_ms": 292, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use view_file to read <WORKSPACE>/input.txt. Report its contents. Do not use a shell."}}}
+{"t_ms": 5051, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use write_to_file to create <WORKSPACE>/skip-permissions.txt with PHASE0_WRITE. Then use replace_file_content to change PHASE0_WRITE to PHASE0_EDIT. No shell. Do not ask me questions."}}}
+{"t_ms": 11704, "stream": "stdin", "data": {"event": "user", "message": {"role": "user", "content": "Use run_command exactly once to run printf PHASE0_SHELL in <WORKSPACE>. Report the output. Do not ask me questions."}}}
diff --git a/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdout.ndjson
new file mode 100644
index 0000000000..9d2f1fbafa
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/tools-skip-permissions.stdout.ndjson
@@ -0,0 +1,42 @@
+{"t_ms": 291, "stream": "stdout", "data": {"event": "init", "conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "init": {"cwd": "<WORKSPACE>", "tools": ["ask_custom_permission", "ask_permission", "ask_question", "browser_click_element", "browser_drag_pixel_to_pixel", "browser_get_dom", "browser_get_network_request", "browser_input", "browser_list_network_requests", "browser_mouse_down", "browser_mouse_up", "browser_move_mouse", "browser_press_key", "browser_refresh_page", "browser_resize_window", "browser_scroll", "browser_scroll_dom", "browser_select_option", "browser_subagent", "call_mcp_tool", "capture_browser_console_logs", "capture_browser_screenshot", "click_browser_pixel", "command_status", "define_subagent", "delete_knowledge", "execute_browser_javascript", "find_by_name", "finish", "generate_image", "grep_search", "invoke_subagent", "list_browser_pages", "list_dir", "list_permissions", "list_resources", "manage_inbox", "manage_subagents", "manage_task", "multi_replace_file_content", "notebook_edit", "notebook_execution", "open_browser_url", "read_browser_page", "read_resource", "read_url_content", "replace_file_content", "run_command", "schedule", "search_web", "sed_file", "send_command_input", "send_message", "view_file", "wait", "wait_5_seconds", "write_to_file"], "permission_mode": "always-proceed"}}}
+{"t_ms": 318, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 0, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 2658, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 1, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.317552401, "usage": {"input_tokens": 11263, "output_tokens": 150, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11413}}}}
+{"t_ms": 2658, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 2, "state": "ACTIVE", "step_type": "tool", "tool_name": "view_file", "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}}}}}
+{"t_ms": 2658, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 2, "state": "DONE", "step_type": "tool", "tool_name": "view_file", "duration_seconds": 0.002646148, "tool_info": {"name": "view_file", "parameters": {"AbsolutePath": "<WORKSPACE>/input.txt"}, "output": "2 lines, 19 bytes"}}}}
+{"t_ms": 4645, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The contents"}}}
+{"t_ms": 4721, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " of [input.txt](file:///"}}}
+{"t_ms": 4746, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "tmp/agy-p0/workspace/inp"}}}
+{"t_ms": 4772, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ut"}}}
+{"t_ms": 4848, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": ".txt) are:\n\n```\nPHASE0_READ_MARKER\n`"}}}
+{"t_ms": 4873, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "``"}}}
+{"t_ms": 5025, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 3, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 2.386909321, "usage": {"input_tokens": 11484, "output_tokens": 38, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11522}}}}
+{"t_ms": 5051, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "status": "SUCCESS", "response": "The contents of [input.txt](file://<WORKSPACE>/input.txt) are:\n\n```\nPHASE0_READ_MARKER\n```\n", "duration_seconds": 4.732286256, "num_turns": 1, "usage": {"input_tokens": 22747, "output_tokens": 188, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 22935}}}}
+{"t_ms": 5078, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 4, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 7346, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 5, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.260780071, "usage": {"input_tokens": 11643, "output_tokens": 152, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11795}}}}
+{"t_ms": 7346, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 6, "state": "ACTIVE", "step_type": "tool", "tool_name": "write_to_file", "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/skip-permissions.txt"}}}}}
+{"t_ms": 7346, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 6, "state": "DONE", "step_type": "tool", "tool_name": "write_to_file", "duration_seconds": 0.003788063, "tool_info": {"name": "write_to_file", "parameters": {"TargetFile": "<WORKSPACE>/skip-permissions.txt"}}}}}
+{"t_ms": 10113, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 7, "state": "DONE", "step_type": "agent_response", "duration_seconds": 2.769162417, "usage": {"input_tokens": 11812, "output_tokens": 117, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 11929}}}}
+{"t_ms": 10113, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 8, "state": "ACTIVE", "step_type": "tool", "tool_name": "replace_file_content", "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/skip-permissions.txt"}}}}}
+{"t_ms": 10113, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 8, "state": "DONE", "step_type": "tool", "tool_name": "replace_file_content", "duration_seconds": 0.004067275, "tool_info": {"name": "replace_file_content", "parameters": {"TargetFile": "<WORKSPACE>/skip-permissions.txt"}}}}}
+{"t_ms": 11349, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "I have"}}}
+{"t_ms": 11450, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " created [skip-permissio"}}}
+{"t_ms": 11476, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ns.txt](file"}}}
+{"t_ms": 11501, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "://<WORKSPACE>"}}}
+{"t_ms": 11526, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "/skip"}}}
+{"t_ms": 11552, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "-permissions.txt) with `"}}}
+{"t_ms": 11577, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "PHASE0_WRITE` and then u"}}}
+{"t_ms": 11603, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "pdated its c"}}}
+{"t_ms": 11628, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ontent to `PHASE0_EDIT` using `repla"}}}
+{"t_ms": 11653, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ce_file_cont"}}}
+{"t_ms": 11678, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "ent`."}}}
+{"t_ms": 11704, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 9, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.563629905, "usage": {"input_tokens": 12105, "output_tokens": 56, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12161}}}}
+{"t_ms": 11704, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "status": "SUCCESS", "response": "I have created [skip-permissions.txt](file://<WORKSPACE>/skip-permissions.txt) with `PHASE0_WRITE` and then updated its content to `PHASE0_EDIT` using `replace_file_content`.\n", "duration_seconds": 11.386053268, "num_turns": 2, "usage": {"input_tokens": 58307, "output_tokens": 513, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 58820}}}}
+{"t_ms": 11731, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 10, "state": "DONE", "step_type": "user_input"}}}
+{"t_ms": 16142, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 11, "state": "DONE", "step_type": "agent_response", "duration_seconds": 4.411191659, "usage": {"input_tokens": 12260, "output_tokens": 390, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12650}}}}
+{"t_ms": 16143, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 12, "state": "ACTIVE", "step_type": "tool", "tool_name": "run_command", "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}}}}}
+{"t_ms": 16143, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 12, "state": "DONE", "step_type": "tool", "tool_name": "run_command", "duration_seconds": 0.007492259, "tool_info": {"name": "run_command", "parameters": {"CommandLine": "printf PHASE0_SHELL"}, "output": "PHASE0_SHELL"}}}}
+{"t_ms": 17501, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 13, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "The command"}}}
+{"t_ms": 17578, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 13, "state": "ACTIVE", "step_type": "agent_response", "text_delta": " output is:\n"}}}
+{"t_ms": 17603, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 13, "state": "ACTIVE", "step_type": "agent_response", "text_delta": "\n```\nPHASE0_SHELL\n```"}}}
+{"t_ms": 17680, "stream": "stdout", "data": {"event": "step_update", "step_update": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "step_index": 13, "state": "DONE", "step_type": "agent_response", "text_delta": "\n", "duration_seconds": 1.518696431, "usage": {"input_tokens": 12396, "output_tokens": 16, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 12412}}}}
+{"t_ms": 17680, "stream": "stdout", "data": {"event": "result", "result": {"conversation_id": "7e55929a-de5b-4564-af80-76cff39e16f9", "status": "SUCCESS", "response": "The command output is:\n\n```\nPHASE0_SHELL\n```\n", "duration_seconds": 17.367491474, "num_turns": 3, "usage": {"input_tokens": 82963, "output_tokens": 919, "thinking_tokens": 0, "cache_read_tokens": 0, "total_tokens": 83882}}}}
diff --git a/plugins/antigravity-provider/test/fixtures/version.capture.ndjson b/plugins/antigravity-provider/test/fixtures/version.capture.ndjson
new file mode 100644
index 0000000000..ac8e605e77
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/version.capture.ndjson
@@ -0,0 +1,2 @@
+{"t_ms": 0, "stream": "capture", "data": {"argv": ["<HOME>/.local/opt/agy/1.2.13/agy", "--version"], "cwd": "<WORKSPACE>", "home": "<HOME>", "settings": null, "env": {}}}
+{"t_ms": 284, "stream": "capture", "data": {"exit_code": 0}}
diff --git a/plugins/antigravity-provider/test/fixtures/version.stderr.ndjson b/plugins/antigravity-provider/test/fixtures/version.stderr.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/version.stdin.ndjson b/plugins/antigravity-provider/test/fixtures/version.stdin.ndjson
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/antigravity-provider/test/fixtures/version.stdout.ndjson b/plugins/antigravity-provider/test/fixtures/version.stdout.ndjson
new file mode 100644
index 0000000000..ce8e23e783
--- /dev/null
+++ b/plugins/antigravity-provider/test/fixtures/version.stdout.ndjson
@@ -0,0 +1 @@
+{"t_ms": 269, "stream": "stdout", "data": "1.2.13"}
diff --git a/plugins/claude-usage-source/icon.svg b/plugins/claude-usage-source/icon.svg
new file mode 100644
index 0000000000..b8c36572e5
--- /dev/null
+++ b/plugins/claude-usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4.709 15.955l4.72-2.647.08-.23-.08-.128H9.2l-.79-.048-2.698-.073-2.339-.097-2.266-.122-.571-.121L0 11.784l.055-.352.48-.321.686.06 1.52.103 2.278.158 1.652.097 2.449.255h.389l.055-.157-.134-.098-.103-.097-2.358-1.596-2.552-1.688-1.336-.972-.724-.491-.364-.462-.158-1.008.656-.722.881.06.225.061.893.686 1.908 1.476 2.491 1.833.365.304.145-.103.019-.073-.164-.274-1.355-2.446-1.446-2.49-.644-1.032-.17-.619a2.97 2.97 0 01-.104-.729L6.283.134 6.696 0l.996.134.42.364.62 1.414 1.002 2.229 1.555 3.03.456.898.243.832.091.255h.158V9.01l.128-1.706.237-2.095.23-2.695.08-.76.376-.91.747-.492.584.28.48.685-.067.444-.286 1.851-.559 2.903-.364 1.942h.212l.243-.242.985-1.306 1.652-2.064.73-.82.85-.904.547-.431h1.033l.76 1.129-.34 1.166-1.064 1.347-.881 1.142-1.264 1.7-.79 1.36.073.11.188-.02 2.856-.606 1.543-.28 1.841-.315.833.388.091.395-.328.807-1.969.486-2.309.462-3.439.813-.042.03.049.061 1.549.146.662.036h1.622l3.02.225.79.522.474.638-.079.485-1.215.62-1.64-.389-3.829-.91-1.312-.329h-.182v.11l1.093 1.068 2.006 1.81 2.509 2.33.127.578-.322.455-.34-.049-2.205-1.657-.851-.747-1.926-1.62h-.128v.17l.444.649 2.345 3.521.122 1.08-.17.353-.608.213-.668-.122-1.374-1.925-1.415-2.167-1.143-1.943-.14.08-.674 7.254-.316.37-.729.28-.607-.461-.322-.747.322-1.476.389-1.924.315-1.53.286-1.9.17-.632-.012-.042-.14.018-1.434 1.967-2.18 2.945-1.726 1.845-.414.164-.717-.37.067-.662.401-.589 2.388-3.036 1.44-1.882.93-1.086-.006-.158h-.055L4.132 18.56l-1.13.146-.487-.456.061-.746.231-.243 1.908-1.312-.006.006z"/></svg>
diff --git a/plugins/claude-usage-source/index.server.ts b/plugins/claude-usage-source/index.server.ts
new file mode 100644
index 0000000000..4c97771bfa
--- /dev/null
+++ b/plugins/claude-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { discover, fetchUsage } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "claude",
+    label: "Claude",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => discover(scope),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/claude-usage-source/paseo-plugin.json b/plugins/claude-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..f4e639a515
--- /dev/null
+++ b/plugins/claude-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "claude-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/claude-usage-source/server/keychain.test.ts b/plugins/claude-usage-source/server/keychain.test.ts
new file mode 100644
index 0000000000..dd6c58f77a
--- /dev/null
+++ b/plugins/claude-usage-source/server/keychain.test.ts
@@ -0,0 +1,192 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { claudeKeychainAccount, readClaudeKeychainCredentials } from "./usage.js";
+
+const SERVICE = "Claude Code-credentials";
+
+afterEach(() => {
+  vi.unstubAllEnvs();
+});
+
+describe("claudeKeychainAccount", () => {
+  it("uses a supported username verbatim", () => {
+    expect(claudeKeychainAccount("thomas.benoit")).toBe("thomas.benoit");
+  });
+
+  it("falls back to claude-code-user when the username carries a rejected character", () => {
+    expect(claudeKeychainAccount("first.last@example.com")).toBe("claude-code-user");
+  });
+
+  it("reads the username from $USER when no account is given", () => {
+    vi.stubEnv("USER", "ci-runner");
+    expect(claudeKeychainAccount()).toBe("ci-runner");
+
+    vi.stubEnv("USER", "first.last@example.com");
+    expect(claudeKeychainAccount()).toBe("claude-code-user");
+  });
+});
+
+describe("readClaudeKeychainCredentials", () => {
+  it("looks the item up by account and stops there when it exists", async () => {
+    const run = vi.fn(async () => JSON.stringify({ claudeAiOauth: { accessToken: "at_fresh" } }));
+
+    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
+
+    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_fresh" } });
+    expect(run).toHaveBeenCalledTimes(1);
+    expect(run).toHaveBeenCalledWith([
+      "find-generic-password",
+      "-a",
+      "claude-code-user",
+      "-w",
+      "-s",
+      SERVICE,
+    ]);
+  });
+
+  it("falls back to the account-less lookup when no item matches the account", async () => {
+    const run = vi.fn(async (args: string[]) =>
+      args.includes("-a") ? null : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
+    );
+
+    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
+
+    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_legacy" } });
+    expect(run).toHaveBeenNthCalledWith(2, ["find-generic-password", "-w", "-s", SERVICE]);
+  });
+
+  it("falls through when the account item carries no access token", async () => {
+    const run = vi.fn(async (args: string[]) =>
+      args.includes("-a")
+        ? JSON.stringify({ claudeAiOauth: { subscriptionType: "team" } })
+        : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
+    );
+
+    const credentials = await readClaudeKeychainCredentials(run, "claude-code-user");
+
+    expect(credentials).toEqual({ claudeAiOauth: { accessToken: "at_legacy" } });
+    expect(run).toHaveBeenCalledTimes(2);
+  });
+
+  it("is null when the Keychain holds no item at all", async () => {
+    const run = vi.fn(async () => null);
+
+    expect(await readClaudeKeychainCredentials(run, "claude-code-user")).toBeNull();
+  });
+
+  it("tries the next lookup when the item does not parse", async () => {
+    const run = vi.fn(async (args: string[]) =>
+      args.includes("-a")
+        ? "not-json"
+        : JSON.stringify({ claudeAiOauth: { accessToken: "at_legacy" } }),
+    );
+
+    expect(await readClaudeKeychainCredentials(run, "claude-code-user")).toEqual({
+      claudeAiOauth: { accessToken: "at_legacy" },
+    });
+  });
+});
+
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { discover, fetchUsage } from "./usage.js";
+import { inputSchema } from "../shared/input.js";
+
+function fixtureFetch(expectedToken: string): typeof fetch {
+  return vi.fn(async (_url: RequestInfo | URL, init?: RequestInit) => {
+    expect(init?.headers).toMatchObject({ Authorization: `Bearer ${expectedToken}` });
+    return new Response(
+      JSON.stringify({
+        account: { uuid: "fixture-account" },
+        organization: { uuid: "fixture-org" },
+        five_hour: { utilization: 12 },
+      }),
+      { status: 200 },
+    );
+  }) as unknown as typeof fetch;
+}
+
+describe("Claude credential routes", () => {
+  it("reads the explicit Claude credential file", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "claude-usage-input-"));
+    try {
+      writeFileSync(
+        join(dir, ".credentials.json"),
+        JSON.stringify({ claudeAiOauth: { accessToken: "fixture-file" } }),
+      );
+      expect(
+        (
+          await fetchUsage(
+            { route: { store: "claude", path: join(dir, ".credentials.json") } },
+            fixtureFetch("fixture-file"),
+          )
+        ).status,
+      ).toBe("available");
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+  it("discovery reads the configured credential file", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "claude-usage-default-"));
+    try {
+      writeFileSync(
+        join(dir, ".credentials.json"),
+        JSON.stringify({ claudeAiOauth: { accessToken: "fixture-default" } }),
+      );
+      const accounts = await discover(
+        { kind: "global" },
+        { home: dir, env: { CLAUDE_CONFIG_DIR: dir }, platform: "linux" },
+        fixtureFetch("fixture-default"),
+      );
+      expect(accounts).toEqual([
+        {
+          key: "fixture-account.fixture-org",
+          harness: "Claude",
+          input: { route: { store: "claude", path: join(dir, ".credentials.json") } },
+        },
+      ]);
+      expect(
+        (await fetchUsage(inputSchema.parse(accounts[0]!.input), fixtureFetch("fixture-default")))
+          .status,
+      ).toBe("available");
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+  it("throws without fetching when the routed file has no credentials", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "claude-empty-config-"));
+    try {
+      const fetchApi = vi.fn() as unknown as typeof fetch;
+      await expect(
+        fetchUsage({ route: { store: "claude", path: join(dir, ".credentials.json") } }, fetchApi, {
+          platform: "linux",
+        }),
+      ).rejects.toThrow("Claude login store no longer exists");
+      expect(fetchApi).not.toHaveBeenCalled();
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("Claude Keychain token usage", () => {
+  it("returns unavailable on 401 without attempting refresh", async () => {
+    const run = vi.fn(async () =>
+      JSON.stringify({
+        claudeAiOauth: { accessToken: "fixture-expired", refreshToken: "fixture-refresh" },
+      }),
+    );
+    const credentials = await readClaudeKeychainCredentials(run, "fixture-account");
+    const fetchApi = vi.fn(
+      async () => new Response(null, { status: 401 }),
+    ) as unknown as typeof fetch;
+    const report = await fetchUsage({ route: { store: "keychain" } }, fetchApi, {
+      platform: "darwin",
+      claudeHome: "/nonexistent-paseo-test-home",
+      readKeychainCredentials: async () => credentials,
+    });
+    expect(report.status).toBe("unavailable");
+    expect(fetchApi).toHaveBeenCalledTimes(1);
+    expect(run).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/plugins/claude-usage-source/server/stores.test.ts b/plugins/claude-usage-source/server/stores.test.ts
new file mode 100644
index 0000000000..093fbf114f
--- /dev/null
+++ b/plugins/claude-usage-source/server/stores.test.ts
@@ -0,0 +1,300 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+
+let home: string;
+beforeEach(async () => {
+  home = await mkdtemp(join(tmpdir(), "usage-stores-"));
+});
+afterEach(async () => {
+  await rm(home, { recursive: true, force: true });
+});
+function lookup(env: NodeJS.ProcessEnv = {}) {
+  return { home, env, platform: "linux" as const, now: () => 1000 };
+}
+async function json(path: string, value: unknown) {
+  const { dirname } = await import("node:path");
+  await mkdir(dirname(path), { recursive: true });
+  await writeFile(path, JSON.stringify(value));
+}
+async function profile(_url: RequestInfo | URL, init?: RequestInit) {
+  expect(new Headers(init?.headers).get("Authorization")).toMatch(/^Bearer fixture-/);
+  return new Response(
+    JSON.stringify({ account: { uuid: "pi-account" }, organization: { uuid: "pi-org" } }),
+  );
+}
+async function accountIdentity(
+  input: Parameters<typeof fetchUsage>[0],
+  env: NodeJS.ProcessEnv = {},
+) {
+  const accounts = await discover({ kind: "global" }, lookup(env), profile);
+  const account = accounts.find(
+    (candidate) => JSON.stringify(candidate.input) === JSON.stringify(input),
+  );
+  if (!account) throw new Error("Expected discovered login");
+  return { key: account.key, ...(account.label ? { label: account.label } : {}) };
+}
+async function logins(options: Parameters<typeof discover>[1]) {
+  return (await discover({ kind: "global" }, options, profile)).map(
+    (account) => account.input as Parameters<typeof fetchUsage>[0],
+  );
+}
+async function database(path: string) {
+  await mkdir((await import("node:path")).dirname(path), { recursive: true });
+  const db = new DatabaseSync(path);
+  // Create the fixture with one durable commit instead of one per row.
+  db.exec("BEGIN");
+  db.exec(
+    "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
+  );
+  const insert = db.prepare("INSERT INTO auth_credentials VALUES (?, ?, ?, ?, ?)");
+  insert.run(
+    1,
+    "anthropic",
+    "oauth",
+    JSON.stringify({ access: "fixture-omp", accountId: "omp-account", expires: 2000 }),
+    null,
+  );
+  insert.run(
+    2,
+    "anthropic",
+    "oauth",
+    JSON.stringify({ access: "fixture-expired", expires: 500 }),
+    null,
+  );
+  insert.run(
+    3,
+    "anthropic",
+    "oauth",
+    JSON.stringify({ access: "fixture-disabled", expires: 2000 }),
+    "revoked",
+  );
+  insert.run(
+    4,
+    "anthropic",
+    "api_key",
+    JSON.stringify({ access: "fixture-key", expires: 2000 }),
+    null,
+  );
+  insert.run(5, "anthropic", "oauth", "invalid", null);
+  db.exec("COMMIT");
+  db.close();
+}
+
+test("Pi uses its own OAuth identity and re-reads rotated tokens without writing", async () => {
+  const path = join(home, ".pi", "agent", "auth.json");
+  await json(path, {
+    anthropic: { type: "oauth", access: "fixture-first", accountId: "pi-account" },
+  });
+  await json(join(home, ".claude.json"), {
+    oauthAccount: { accountUuid: "other", organizationUuid: "other-org" },
+  });
+  const inputs = await logins(lookup());
+  expect(inputs).toHaveLength(1);
+  expect(await accountIdentity(inputs[0]!)).toEqual({ key: "pi-account.pi-org" });
+  await json(path, {
+    anthropic: { type: "oauth", access: "fixture-rotated", accountId: "pi-account" },
+  });
+  const before = await readFile(path, "utf8");
+  expect(
+    (
+      await fetchUsage(
+        inputs[0]!,
+        async (_url, init) => {
+          expect(new Headers(init?.headers).get("Authorization")).toBe("Bearer fixture-rotated");
+          return new Response("{}", { status: 401 });
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+  expect(await readFile(path, "utf8")).toBe(before);
+});
+
+test("Pi honors directory override and ignores API keys and malformed files", async () => {
+  const directory = join(home, "custom-pi");
+  const env = { PI_CODING_AGENT_DIR: directory };
+  const path = join(directory, "auth.json");
+  await json(path, { anthropic: { type: "oauth", access: "fixture-pi", accountId: "pi-account" } });
+  expect(await logins(lookup(env))).toEqual([{ route: { store: "pi", path } }]);
+  await json(path, { anthropic: { type: "api_key", key: "fixture-key" } });
+  expect(await logins(lookup(env))).toEqual([]);
+  await writeFile(path, "broken");
+  expect(await logins(lookup(env))).toEqual([]);
+});
+
+test("expired Pi tokens are unavailable without calling usage or refreshing", async () => {
+  await json(join(home, ".pi", "agent", "auth.json"), {
+    anthropic: { type: "oauth", access: "fixture-expired", accountId: "pi-account", expires: 500 },
+  });
+  const [input] = await logins(lookup());
+  expect(
+    (
+      await fetchUsage(
+        input!,
+        async () => {
+          throw new Error("must not fetch expired token");
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+});
+
+for (const location of ["default", "profile", "xdg", "override", "config"]) {
+  test(`OMP discovers enabled OAuth rows including expired logins in ${location} store read-only`, async () => {
+    let path = join(home, ".omp", "agent", "agent.db");
+    let env: NodeJS.ProcessEnv = { OMP_AUTH_BROKER_URL: "https://broker.test" };
+    if (location === "profile") {
+      env.OMP_PROFILE = "work";
+      path = join(home, ".omp", "profiles", "work", "agent", "agent.db");
+    }
+    if (location === "xdg") {
+      env.XDG_DATA_HOME = join(home, "data");
+      env.PI_PROFILE = "work";
+      path = join(home, "data", "omp", "profiles", "work", "agent.db");
+    }
+    if (location === "override") {
+      env.PI_CODING_AGENT_DIR = join(home, "custom");
+      path = join(home, "custom", "agent.db");
+    }
+    if (location === "config") {
+      env.PI_CONFIG_DIR = "custom-config";
+      path = join(home, "custom-config", "agent", "agent.db");
+    }
+    await database(path);
+    const before = await readFile(path);
+    const inputs = await logins(lookup(env));
+    expect(inputs).toEqual([
+      { route: { store: "omp", path, credentialId: 1 } },
+      { route: { store: "omp", path, credentialId: 2 } },
+    ]);
+    expect(await accountIdentity(inputs[0]!, env)).toEqual({ key: "pi-account.pi-org" });
+    expect(
+      (
+        await fetchUsage(
+          inputs[0]!,
+          async (_url, init) => {
+            expect(new Headers(init?.headers).get("Authorization")).toBe("Bearer fixture-omp");
+            return new Response("{}", { status: 401 });
+          },
+          lookup(env),
+        )
+      ).status,
+    ).toBe("unavailable");
+    expect(await readFile(path)).toEqual(before);
+  });
+}
+
+test("missing SQLite skips only OMP", async () => {
+  await database(join(home, ".omp", "agent", "agent.db"));
+  await json(join(home, ".pi", "agent", "auth.json"), {
+    anthropic: { type: "oauth", access: "fixture-pi" },
+  });
+  const inputs = await logins({ ...lookup(), sqlite: () => undefined });
+  expect(inputs).toEqual([
+    { route: { store: "pi", path: join(home, ".pi", "agent", "auth.json") } },
+  ]);
+});
+
+test("Claude Keychain login replaces the fallback file", async () => {
+  await json(join(home, ".claude", ".credentials.json"), {
+    claudeAiOauth: { accessToken: "fixture-file", expiresAt: 500 },
+  });
+  const inputs = await logins({
+    ...lookup(),
+    platform: "darwin",
+    env: { USER: "fixture-user" },
+    readKeychainCredentials: async () => ({ claudeAiOauth: { accessToken: "fixture-keychain" } }),
+  });
+  expect(inputs).toEqual([
+    { route: { store: "keychain", service: "Claude Code-credentials", account: "fixture-user" } },
+  ]);
+});
+
+test("Claude account metadata alone does not discover a login", async () => {
+  await json(join(home, ".claude.json"), {
+    oauthAccount: { accountUuid: "old", organizationUuid: "old-org" },
+  });
+  expect(await logins(lookup())).toEqual([]);
+});
+
+test("keychain identity belongs to its token even when Claude Code metadata names another account", async () => {
+  await json(join(home, ".claude.json"), {
+    oauthAccount: { accountUuid: "stale", organizationUuid: "stale-org" },
+  });
+  const [identity] = await discover(
+    { kind: "global" },
+    {
+      ...lookup(),
+      platform: "darwin",
+      env: { USER: "fixture-user" },
+      readKeychainCredentials: async () => ({
+        claudeAiOauth: { accessToken: "fixture-keychain-other" },
+      }),
+    },
+    profile,
+  );
+  expect(identity).toEqual({
+    key: "pi-account.pi-org",
+    harness: "Claude",
+    input: {
+      route: { store: "keychain", service: "Claude Code-credentials", account: "fixture-user" },
+    },
+  });
+});
+
+test("OMP fetch re-reads its row after rotation and skips a newly disabled login", async () => {
+  const path = join(home, ".omp", "agent", "agent.db");
+  await database(path);
+  const [input] = await logins(lookup());
+  const db = new DatabaseSync(path);
+  db.prepare("UPDATE auth_credentials SET data = ? WHERE id = 1").run(
+    JSON.stringify({ access: "fixture-rotated-omp", accountId: "omp-account", expires: 2000 }),
+  );
+  expect(
+    (
+      await fetchUsage(
+        input!,
+        async (_url, init) => {
+          expect(new Headers(init?.headers).get("Authorization")).toBe(
+            "Bearer fixture-rotated-omp",
+          );
+          return new Response("{}", { status: 401 });
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+  db.prepare("UPDATE auth_credentials SET disabled_cause = 'revoked' WHERE id = 1").run();
+  db.close();
+  await expect(
+    fetchUsage(
+      input!,
+      async () => {
+        throw new Error("must not fetch");
+      },
+      lookup(),
+    ),
+  ).rejects.toThrow("login store no longer exists");
+});
+
+test("Claude discovery honors CLAUDE_CONFIG_DIR", async () => {
+  const directory = join(home, "configured-claude");
+  const ignoredDirectory = join(home, "other-home");
+  await json(join(directory, ".credentials.json"), {
+    claudeAiOauth: { accessToken: "fixture-configured" },
+  });
+  await json(join(ignoredDirectory, ".credentials.json"), {
+    claudeAiOauth: { accessToken: "fixture-other" },
+  });
+  const inputs = await logins(
+    lookup({ CLAUDE_CONFIG_DIR: directory, CLAUDE_HOME: ignoredDirectory }),
+  );
+  expect(inputs).toEqual([
+    { route: { store: "claude", path: join(directory, ".credentials.json") } },
+  ]);
+});
diff --git a/plugins/claude-usage-source/server/stores.ts b/plugins/claude-usage-source/server/stores.ts
new file mode 100644
index 0000000000..5da17a1e51
--- /dev/null
+++ b/plugins/claude-usage-source/server/stores.ts
@@ -0,0 +1,131 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { z } from "zod";
+import { routeSchema } from "../shared/input.js";
+
+export interface StoreLookup {
+  home?: string;
+  env?: NodeJS.ProcessEnv;
+  platform?: NodeJS.Platform;
+  now?: () => number;
+  sqlite?: () => Sqlite | undefined;
+}
+interface Database {
+  prepare(sql: string): { all(...args: string[]): unknown[] };
+  close(): void;
+}
+export interface Sqlite {
+  DatabaseSync: new (path: string, options: { readOnly: boolean }) => Database;
+}
+export const oauthSchema = z.object({
+  access: z.string().min(1),
+  accountId: z.string().optional(),
+  expires: z.number().optional(),
+});
+const rowSchema = z.object({ id: z.number().int().positive(), data: z.string() });
+export type Route = z.infer<typeof routeSchema>;
+
+export async function readJson(path: string): Promise<unknown> {
+  try {
+    return JSON.parse(await readFile(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+export function piAuthPath(lookup: StoreLookup): string {
+  const home = lookup.home ?? homedir();
+  const env = lookup.env ?? process.env;
+  const configured = env.PI_CODING_AGENT_DIR?.trim();
+  if (!configured) return join(home, ".pi", "agent", "auth.json");
+  if (configured === "~") return join(home, "auth.json");
+  const directory = configured.startsWith("~/")
+    ? join(home, configured.slice(2))
+    : resolve(configured);
+  return join(directory, "auth.json");
+}
+
+function ompDatabasePath(lookup: StoreLookup): string {
+  const home = lookup.home ?? homedir();
+  const env = lookup.env ?? process.env;
+  const platform = lookup.platform ?? process.platform;
+  const profile = (env.OMP_PROFILE ?? env.PI_PROFILE)?.trim() || "default";
+  const base = join(home, env.PI_CONFIG_DIR || ".omp");
+  const configRoot = profile === "default" ? base : join(base, "profiles", profile);
+  const defaultAgentDir = join(configRoot, "agent");
+  const agentDir =
+    profile === "default" && env.PI_CODING_AGENT_DIR
+      ? resolve(env.PI_CODING_AGENT_DIR)
+      : defaultAgentDir;
+  if (
+    (platform === "linux" || platform === "darwin") &&
+    agentDir === defaultAgentDir &&
+    env.XDG_DATA_HOME
+  ) {
+    const xdgBase = join(env.XDG_DATA_HOME, "omp");
+    const xdgRoot = profile === "default" ? xdgBase : join(xdgBase, "profiles", profile);
+    if (existsSync(xdgRoot)) return join(xdgRoot, "agent.db");
+  }
+  return join(agentDir, "agent.db");
+}
+
+function builtinSqlite(): Sqlite | undefined {
+  // Node 20 must still compile/load the plugin; only OMP needs this newer builtin.
+  const parsed = z
+    .object({
+      DatabaseSync: z.custom<Sqlite["DatabaseSync"]>((value) => typeof value === "function"),
+    })
+    .safeParse(process.getBuiltinModule?.("node:sqlite"));
+  return parsed.success ? parsed.data : undefined;
+}
+
+function ompRows(path: string, lookup: StoreLookup) {
+  let db: Database | undefined;
+  try {
+    const sqlite = (lookup.sqlite ?? builtinSqlite)();
+    if (!sqlite) return [];
+    db = new sqlite.DatabaseSync(path, { readOnly: true });
+    const rows = db
+      .prepare(
+        "SELECT id, data FROM auth_credentials WHERE provider = ? AND credential_type = 'oauth' AND disabled_cause IS NULL ORDER BY id",
+      )
+      .all("anthropic");
+    return rows.flatMap((value) => {
+      const row = rowSchema.safeParse(value);
+      if (!row.success) return [];
+      try {
+        const oauth = oauthSchema.parse(JSON.parse(row.data.data));
+        return [{ id: row.data.id, oauth }];
+      } catch {
+        return [];
+      }
+    });
+  } catch {
+    return [];
+  } finally {
+    db?.close();
+  }
+}
+
+export function discoverOmp(lookup: StoreLookup): Route[] {
+  const path = ompDatabasePath(lookup);
+  return ompRows(path, lookup).map(({ id }) => ({ store: "omp", path, credentialId: id }));
+}
+
+export function readOmp(route: Extract<Route, { store: "omp" }>, lookup: StoreLookup) {
+  return ompRows(route.path, lookup).find((row) => row.id === route.credentialId)?.oauth ?? null;
+}
+
+export async function readHarness(
+  route: Extract<Route, { path: string }>,
+  lookup: StoreLookup = {},
+) {
+  if (route.store === "omp") return readOmp(route, lookup);
+  const provider = "anthropic";
+  const parsed = z.record(z.string(), z.unknown()).safeParse(await readJson(route.path));
+  if (!parsed.success) return null;
+  const oauth = oauthSchema.extend({ type: z.literal("oauth") }).safeParse(parsed.data[provider]);
+  return oauth.success ? oauth.data : null;
+}
diff --git a/plugins/claude-usage-source/server/usage.test.ts b/plugins/claude-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..29e78a54e9
--- /dev/null
+++ b/plugins/claude-usage-source/server/usage.test.ts
@@ -0,0 +1,1136 @@
+import { isDeepStrictEqual } from "node:util";
+import { readFileSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { fetchUsage, discover } from "./usage.js";
+import { inputSchema, type UsageInput } from "../shared/input.js";
+import { hashAccountKey, type UsageReport } from "@getpaseo/plugin/server/usage";
+
+function credentialInput(directory: string): UsageInput {
+  return { route: { store: "claude", path: join(directory, ".credentials.json") } };
+}
+
+function writeClaudeCredentials(
+  dir: string,
+  accessToken: string,
+  refreshToken = "rt_test",
+  subscriptionType = "pro",
+  rateLimitTier = "default_1x",
+): void {
+  writeFileSync(
+    join(dir, ".credentials.json"),
+    JSON.stringify({
+      claudeAiOauth: { accessToken, refreshToken, subscriptionType, rateLimitTier },
+    }),
+  );
+}
+
+function makeClaudeResponse(
+  overrides: Partial<{
+    five_hour: { utilization: number | string; resets_at: string };
+    seven_day: { utilization: number | string; resets_at: string };
+    seven_day_opus: { utilization: number | string; resets_at: string };
+  }> = {},
+) {
+  return {
+    five_hour: { utilization: 11, resets_at: "2026-06-01T21:00:00Z" },
+    seven_day: { utilization: 1, resets_at: "2026-06-04T00:00:00Z" },
+    seven_day_opus: { utilization: 0.5, resets_at: "2026-06-04T00:00:00Z" },
+    ...overrides,
+  };
+}
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200, headers: Record<string, string> = {}): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json", ...headers },
+  });
+}
+
+describe("claude usage source", () => {
+  let claudeHome: string;
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    claudeHome = mkdtempSync(join(tmpdir(), "usage-claude-"));
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    process.env["CLAUDE_CONFIG_DIR"] = claudeHome;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(claudeHome, { recursive: true, force: true });
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchUsage(credentialInput(claudeHome), (url, init) =>
+          fetchApi(url, init),
+        );
+        return {
+          providers: [
+            {
+              providerId: "claude",
+              ...report,
+              error: report.error ?? null,
+              planLabel: report.planLabel ?? null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Claude usage, coerces API numbers, and attaches HTTP timeout signals", async () => {
+    writeClaudeCredentials(claudeHome, "at_valid");
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.anthropic.com/api/oauth/usage",
+          () =>
+            jsonResponse(
+              makeClaudeResponse({
+                five_hour: { utilization: "11", resets_at: "2026-06-01T21:00:00Z" },
+              }),
+            ),
+        ],
+      ]),
+    );
+
+    const result = await service().listUsage();
+    const claude = findProvider(result, "claude");
+
+    expect(claude).toMatchObject({
+      status: "available",
+      planLabel: "Pro 1x",
+      windows: expect.arrayContaining([
+        expect.objectContaining({ id: "five_hour", usedPct: 11 }),
+        expect.objectContaining({ id: "weekly", usedPct: 1 }),
+        expect.objectContaining({ id: "weekly_model_opus", usedPct: 0.5 }),
+      ]),
+    });
+    expect(fetchApi).toHaveBeenCalledWith(
+      "https://api.anthropic.com/api/oauth/usage",
+      expect.objectContaining({ signal: expect.any(AbortSignal) }),
+    );
+  });
+
+  it("accepts a null Claude resets_at when a window has no scheduled reset", async () => {
+    writeClaudeCredentials(claudeHome, "at_valid");
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.anthropic.com/api/oauth/usage",
+          () =>
+            jsonResponse({
+              five_hour: { utilization: 0, resets_at: null },
+              seven_day: { utilization: 1, resets_at: "2026-06-04T00:00:00Z" },
+            }),
+        ],
+      ]),
+    );
+
+    const result = await service().listUsage();
+    const claude = findProvider(result, "claude");
+
+    expect(claude).toMatchObject({
+      status: "available",
+      windows: expect.arrayContaining([
+        expect.objectContaining({ id: "five_hour", usedPct: 0, resetsAt: null }),
+        expect.objectContaining({ id: "weekly", usedPct: 1 }),
+      ]),
+    });
+  });
+
+  it.each(["empty home", "unrelated files"])(
+    "discovers no Claude logins in %s",
+    async (scenario) => {
+      if (scenario === "unrelated files") writeFileSync(join(homeDir, "unrelated.json"), "{}");
+      expect(
+        await discover({ kind: "global" }, { home: homeDir, env: {}, platform: "linux" }),
+      ).toEqual([]);
+    },
+  );
+
+  it("returns unavailable on 401 without refreshing or rewriting credentials", async () => {
+    writeClaudeCredentials(claudeHome, "at_expired", "rt_valid");
+    const credPath = join(claudeHome, ".credentials.json");
+    const before = readFileSync(credPath, "utf8");
+    let usageCalls = 0;
+    fetchApi = vi.fn(async (url: RequestInfo | URL) => {
+      const endpoint = url.toString();
+      if (endpoint === "https://api.anthropic.com/api/oauth/usage") {
+        usageCalls += 1;
+        return new Response(null, { status: 401 });
+      }
+      // The read-only fetcher must never hit the OAuth token endpoint.
+      throw new Error(`Unmocked: ${endpoint}`);
+    }) as never;
+
+    const result = await service().listUsage();
+
+    expect(findProvider(result, "claude").status).toBe("unavailable");
+    expect(usageCalls).toBe(1);
+    // The credentials file must be left untouched for the Claude CLI to own.
+    expect(readFileSync(credPath, "utf8")).toBe(before);
+  });
+});
+
+describe("usage bars escalate as they fill", () => {
+  let claudeHome: string;
+
+  beforeEach(() => {
+    claudeHome = mkdtempSync(join(tmpdir(), "paseo-tone-claude-"));
+  });
+
+  afterEach(() => {
+    rmSync(claudeHome, { recursive: true, force: true });
+  });
+
+  function claudeAt(utilization: number) {
+    writeClaudeCredentials(claudeHome, "at_valid");
+    process.env["CLAUDE_CONFIG_DIR"] = claudeHome;
+    return fetchUsage(
+      credentialInput(claudeHome),
+      mockFetch(
+        new Map([
+          [
+            "https://api.anthropic.com/api/oauth/usage",
+            () => jsonResponse({ seven_day: { utilization, resets_at: "2026-06-04T00:00:00Z" } }),
+          ],
+        ]),
+      ),
+    );
+  }
+
+  it.each([
+    [10, "ok"],
+    [75, "warning"],
+    [99, "danger"],
+  ])("a Claude window at %s%% is %s", async (utilization, tone) => {
+    const usage = await claudeAt(utilization);
+    expect(usage.windows).toEqual([expect.objectContaining({ id: "weekly", tone })]);
+  });
+});
+
+describe("Claude usage source scoped weekly limits", () => {
+  beforeEach(() => {
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+  });
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+  let claudeHome: string;
+
+  beforeEach(() => {
+    claudeHome = mkdtempSync(join(tmpdir(), "paseo-claude-limits-"));
+  });
+
+  afterEach(() => {
+    rmSync(claudeHome, { recursive: true, force: true });
+  });
+
+  function fableLimit(overrides: Record<string, unknown> = {}) {
+    return {
+      kind: "weekly_scoped",
+      group: "weekly",
+      percent: 0,
+      severity: "normal",
+      resets_at: "2026-06-04T00:00:00Z",
+      is_active: false,
+      scope: { model: { id: null, display_name: "Fable" }, surface: null },
+      ...overrides,
+    };
+  }
+
+  function claudeProvider(body: unknown) {
+    writeClaudeCredentials(claudeHome, "at_valid");
+    process.env["CLAUDE_CONFIG_DIR"] = claudeHome;
+    const fetchApi = mockFetch(
+      new Map([["https://api.anthropic.com/api/oauth/usage", () => jsonResponse(body)]]),
+    );
+    return { provider: { fetchUsage: () => fetchUsage(credentialInput(claudeHome), fetchApi) } };
+  }
+
+  it("renders a scoped weekly limit as its own window", async () => {
+    const { provider } = claudeProvider({
+      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [fableLimit()],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows).toContainEqual(
+      expect.objectContaining({ id: "weekly_model_fable", label: "Weekly · Fable" }),
+    );
+  });
+
+  it("summarizes the session and weekly windows by default, not scoped ones", async () => {
+    const { provider } = claudeProvider({
+      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [fableLimit()],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows.map((window) => [window.id, window.summary ?? false])).toEqual([
+      ["five_hour", true],
+      ["weekly", true],
+      ["weekly_model_fable", false],
+    ]);
+  });
+
+  it("gives every window a short label for tight spaces", async () => {
+    const { provider } = claudeProvider({
+      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [fableLimit()],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows.map((window) => [window.id, window.shortLabel])).toEqual([
+      ["five_hour", "5h"],
+      ["weekly", "wk"],
+      ["weekly_model_fable", "wk Fable"],
+    ]);
+  });
+
+  it("renders a scoped window that is at zero and inactive", async () => {
+    const { provider } = claudeProvider({
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [fableLimit({ percent: 0, is_active: false })],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows).toContainEqual(
+      expect.objectContaining({ id: "weekly_model_fable", usedPct: 0, remainingPct: 100 }),
+    );
+  });
+
+  it("ignores session and all-models entries so they do not duplicate the top-level windows", async () => {
+    const { provider } = claudeProvider({
+      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [
+        { kind: "session", percent: 6, resets_at: "2026-06-01T21:00:00Z", scope: null },
+        { kind: "weekly_all", percent: 23, resets_at: "2026-06-04T00:00:00Z", scope: null },
+        fableLimit(),
+      ],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows.map((window) => window.id)).toEqual([
+      "five_hour",
+      "weekly",
+      "weekly_model_fable",
+    ]);
+  });
+
+  it("labels a surface-scoped limit from its surface name", async () => {
+    const { provider } = claudeProvider({
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [
+        fableLimit({ scope: { model: null, surface: { id: "code", display_name: "Code" } } }),
+      ],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows).toContainEqual(
+      expect.objectContaining({ id: "weekly_surface_code", label: "Weekly · Code" }),
+    );
+  });
+
+  it("skips a scoped limit with no resolvable label rather than rendering an unlabelled bar", async () => {
+    const { provider } = claudeProvider({
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [fableLimit({ scope: { model: { id: null, display_name: null }, surface: null } })],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows.map((window) => window.id)).toEqual(["weekly"]);
+    expect(console.warn).toHaveBeenCalled();
+  });
+
+  // Regression: an additive section must never take down data that already parsed.
+  it("keeps the top-level windows when a limits entry is malformed", async () => {
+    const { provider } = claudeProvider({
+      five_hour: { utilization: 6, resets_at: "2026-06-01T21:00:00Z" },
+      seven_day: { utilization: 23, resets_at: "2026-06-04T00:00:00Z" },
+      limits: [{ percent: "not-a-kind" }, fableLimit()],
+    });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.status).toBe("available");
+    expect(usage.windows.map((window) => window.id)).toEqual([
+      "five_hour",
+      "weekly",
+      "weekly_model_fable",
+    ]);
+    expect(console.warn).toHaveBeenCalled();
+  });
+
+  it("warns when a successful response describes no windows at all", async () => {
+    const { provider } = claudeProvider({ limits: [] });
+
+    const usage = await provider.fetchUsage();
+
+    expect(usage.windows).toEqual([]);
+    expect(console.warn).toHaveBeenCalledWith(
+      "Claude usage response parsed but produced no windows",
+    );
+  });
+});
+/**
+ * The reconciliation matrix.
+ *
+ * Four review rounds on PR #2303 each found a different hole in how the two
+ * representations of one scoped limit get combined, because each fix was tested against
+ * the case that was reported rather than the space of cases. This walks the space:
+ * every combination of which representation carries the limit, whether the `limits[]`
+ * entry supplies values, and whether the two descriptions denote the same limit at all.
+ */
+
+describe("Claude usage source scoped limit reconciliation", () => {
+  let claudeHome: string;
+
+  beforeEach(() => {
+    claudeHome = mkdtempSync(join(tmpdir(), "paseo-claude-matrix-"));
+  });
+
+  afterEach(() => {
+    rmSync(claudeHome, { recursive: true, force: true });
+  });
+
+  const RESETS = "2026-06-04T00:00:00Z";
+
+  function scoped(scope: unknown, percent: number | null = 30, resetsAt: string | null = RESETS) {
+    return { kind: "weekly_scoped", percent, resets_at: resetsAt, scope };
+  }
+
+  const model = (name: string | null, id: string | null = null) => ({
+    model: { id, display_name: name },
+    surface: null,
+  });
+  const surface = (name: string | null, id: string | null = null) => ({
+    model: null,
+    surface: { id, display_name: name },
+  });
+
+  async function windowsFor(body: Record<string, unknown>) {
+    writeClaudeCredentials(claudeHome, "at_valid");
+    process.env["CLAUDE_CONFIG_DIR"] = claudeHome;
+    const usage = await fetchUsage(
+      credentialInput(claudeHome),
+      mockFetch(new Map([["https://api.anthropic.com/api/oauth/usage", () => jsonResponse(body)]])),
+    );
+    return usage.windows;
+  }
+
+  it("which representation carries the limit: legacy only", async () => {
+    const windows = await windowsFor({
+      seven_day_omelette: { utilization: 12, resets_at: RESETS },
+    });
+    expect(windows).toEqual([
+      expect.objectContaining({
+        id: "weekly_model_omelette",
+        label: "Weekly · Omelette",
+        usedPct: 12,
+      }),
+    ]);
+  });
+
+  it("which representation carries the limit: limits[] only", async () => {
+    const windows = await windowsFor({ limits: [scoped(model("Fable"), 2)] });
+    expect(windows).toEqual([
+      expect.objectContaining({
+        id: "weekly_model_fable",
+        label: "Weekly · Fable",
+        usedPct: 2,
+      }),
+    ]);
+  });
+
+  it("which representation carries the limit: both, same limit — one bar, scoped identity", async () => {
+    const windows = await windowsFor({
+      seven_day_omelette: { utilization: 12, resets_at: RESETS },
+      limits: [scoped(model("Omelette"), 30)],
+    });
+    expect(windows).toEqual([
+      expect.objectContaining({ id: "weekly_model_omelette", usedPct: 30 }),
+    ]);
+  });
+
+  it("which representation carries the limit: both, different limits — two bars", async () => {
+    const windows = await windowsFor({
+      seven_day_opus: { utilization: 8, resets_at: RESETS },
+      limits: [scoped(model("Fable"), 2)],
+    });
+    expect(windows.map((w) => w.id)).toEqual(["weekly_model_opus", "weekly_model_fable"]);
+  });
+
+  it("which representation carries the limit: neither", async () => {
+    const windows = await windowsFor({ seven_day: { utilization: 23, resets_at: RESETS } });
+    expect(windows.map((w) => w.id)).toEqual(["weekly"]);
+  });
+
+  const legacy = { seven_day_omelette: { utilization: 12, resets_at: RESETS } };
+
+  it("value fallback when the scoped entry is sparse: scoped values win when present", async () => {
+    const windows = await windowsFor({
+      ...legacy,
+      limits: [scoped(model("Omelette"), 30, "2026-06-09T00:00:00Z")],
+    });
+    expect(windows[0]).toMatchObject({ usedPct: 30, resetsAt: "2026-06-09T00:00:00Z" });
+  });
+
+  it("value fallback when the scoped entry is sparse: percentage falls back per field", async () => {
+    const windows = await windowsFor({
+      ...legacy,
+      limits: [scoped(model("Omelette"), null, "2026-06-09T00:00:00Z")],
+    });
+    expect(windows[0]).toMatchObject({ usedPct: 12, resetsAt: "2026-06-09T00:00:00Z" });
+  });
+
+  it("value fallback when the scoped entry is sparse: reset time falls back per field", async () => {
+    const windows = await windowsFor({
+      ...legacy,
+      limits: [scoped(model("Omelette"), 30, null)],
+    });
+    expect(windows[0]).toMatchObject({ usedPct: 30, resetsAt: RESETS });
+  });
+
+  it("value fallback when the scoped entry is sparse: both fall back when the scoped entry only names the limit", async () => {
+    const windows = await windowsFor({
+      ...legacy,
+      limits: [scoped(model("Omelette"), null, null)],
+    });
+    expect(windows[0]).toMatchObject({ usedPct: 12, resetsAt: RESETS });
+  });
+
+  it("value fallback when the scoped entry is sparse: stays empty when neither side has a value", async () => {
+    const windows = await windowsFor({ limits: [scoped(model("Fable"), null, null)] });
+    expect(windows[0]).toMatchObject({ id: "weekly_model_fable", usedPct: null });
+  });
+
+  it("identity: a surface never matches a legacy model window of the same name", async () => {
+    const windows = await windowsFor({
+      seven_day_omelette: { utilization: 12, resets_at: RESETS },
+      limits: [scoped(surface("Omelette"), 30)],
+    });
+    expect(windows.map((w) => w.id)).toEqual(["weekly_model_omelette", "weekly_surface_omelette"]);
+    expect(windows[0]).toMatchObject({ usedPct: 12 });
+    expect(windows[1]).toMatchObject({ usedPct: 30 });
+  });
+
+  it("identity: a model and a surface of the same name stay apart", async () => {
+    const windows = await windowsFor({
+      limits: [scoped(model("Code"), 4), scoped(surface("Code"), 9)],
+    });
+    expect(windows.map((w) => w.id)).toEqual(["weekly_model_code", "weekly_surface_code"]);
+  });
+
+  it("identity: ids decide when both sides have one", async () => {
+    const windows = await windowsFor({
+      limits: [
+        scoped(model("Fable-Pro", "fable-pro"), 4),
+        scoped(model("Fable_Pro", "fable_pro"), 9),
+      ],
+    });
+    expect(windows.map((w) => w.id)).toEqual(["weekly_model_fable-pro", "weekly_model_fable_pro"]);
+  });
+
+  it("identity: names decide when ids are absent, so indistinguishable entries merge", async () => {
+    const windows = await windowsFor({
+      limits: [scoped(model("Fable Pro"), 4), scoped(model("Fable-Pro"), 9)],
+    });
+    expect(windows).toEqual([
+      expect.objectContaining({ id: "weekly_model_fable_pro", usedPct: 9 }),
+    ]);
+  });
+
+  it("identity: a renamed scope keeps its id when the API supplies one", async () => {
+    const before = await windowsFor({ limits: [scoped(model("Fable", "fable"), 2)] });
+    const after = await windowsFor({ limits: [scoped(model("Fable 5", "fable"), 2)] });
+    expect(before[0]?.id).toBe("weekly_model_fable");
+    expect(after[0]?.id).toBe("weekly_model_fable");
+    expect(after[0]?.label).toBe("Weekly · Fable 5");
+  });
+
+  it("identity: a limit keeps one id whichever representation carries it", async () => {
+    const viaLegacy = await windowsFor({
+      seven_day_omelette: { utilization: 12, resets_at: RESETS },
+    });
+    const viaLimits = await windowsFor({ limits: [scoped(model("Omelette"), 12)] });
+    expect(viaLegacy[0]?.id).toBe(viaLimits[0]?.id);
+  });
+
+  it("ordering and unscoped windows: puts session and weekly ahead of the scoped bars", async () => {
+    const windows = await windowsFor({
+      five_hour: { utilization: 6, resets_at: RESETS },
+      seven_day: { utilization: 23, resets_at: RESETS },
+      seven_day_opus: { utilization: 8, resets_at: RESETS },
+      limits: [
+        { kind: "session", percent: 6, resets_at: RESETS, scope: null },
+        { kind: "weekly_all", percent: 23, resets_at: RESETS, scope: null },
+        scoped(model("Fable"), 2),
+      ],
+    });
+    expect(windows.map((w) => w.id)).toEqual([
+      "five_hour",
+      "weekly",
+      "weekly_model_opus",
+      "weekly_model_fable",
+    ]);
+  });
+});
+
+it("discovery uses the credential token profile instead of stale Claude config", async () => {
+  const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+  const directory = await mkdtemp(join(tmpdir(), "claude-identity-"));
+  try {
+    await writeFile(
+      join(directory, ".claude.json"),
+      JSON.stringify({
+        oauthAccount: {
+          accountUuid: "account-uuid",
+          organizationUuid: "org-uuid",
+          emailAddress: "test@example.com",
+        },
+      }),
+    );
+    writeClaudeCredentials(directory, "fixture-local-account");
+    expect(
+      await accountFor(
+        credentialInput(directory),
+        async () =>
+          jsonResponse({
+            account: { uuid: "token-account", email: "token@example.test" },
+            organization: { uuid: "token-org" },
+          }),
+        Date.now,
+        { home: directory, claudeHome: directory },
+      ),
+    ).toEqual({
+      key: "token-account.token-org",
+      label: "token@example.test",
+    });
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+it("Claude credentials without account metadata use a cached OAuth profile identity", async () => {
+  let calls = 0;
+  const fetchProfile: typeof fetch = async () => {
+    calls++;
+    return new Response(
+      JSON.stringify({
+        account: { uuid: "account-uuid", email: "test@example.com" },
+        organization: { uuid: "org-uuid" },
+      }),
+      { status: 200 },
+    );
+  };
+  const lookup = tokenLookup("fixture-claude-token");
+  expect(
+    await accountFor(credentialInput(lookup.claudeHome), fetchProfile, Date.now, lookup),
+  ).toEqual({
+    key: "account-uuid.org-uuid",
+    label: "test@example.com",
+  });
+  expect(
+    await accountFor(credentialInput(lookup.claudeHome), fetchProfile, Date.now, lookup),
+  ).toEqual({
+    key: "account-uuid.org-uuid",
+    label: "test@example.com",
+  });
+  expect(calls).toBe(1);
+});
+
+it("identifies the same credential route that fetch uses when oauthAccount is absent", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "claude-credential-identity-"));
+  try {
+    writeClaudeCredentials(directory, "fixture-credential-token");
+    writeFileSync(join(directory, ".claude.json"), JSON.stringify({}));
+    let usageRequested = false;
+    await fetchUsage(
+      credentialInput(directory),
+      async () => {
+        usageRequested = true;
+        return new Response(null, { status: 401 });
+      },
+      { claudeHome: directory },
+    );
+    expect(usageRequested).toBe(true);
+    let profileRequested = false;
+    const account = await accountFor(
+      credentialInput(directory),
+      async () => {
+        profileRequested = true;
+        return jsonResponse({
+          account: { uuid: "account-uuid", email: "owner@example.test" },
+          organization: { uuid: "org-uuid" },
+        });
+      },
+      Date.now,
+      { claudeHome: directory, home: directory },
+    );
+    expect(profileRequested).toBe(true);
+    expect(account).toEqual({ key: "account-uuid.org-uuid", label: "owner@example.test" });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+it("expires cached token profiles after five minutes", async () => {
+  let now = 0;
+  let calls = 0;
+  const fetchProfile: typeof fetch = async () => {
+    calls++;
+    return jsonResponse({ account: { uuid: "account-uuid" }, organization: { uuid: "org-uuid" } });
+  };
+  const lookup = tokenLookup("ttl-fixture-token");
+  const input = credentialInput(lookup.claudeHome);
+  await accountFor(input, fetchProfile, () => now, lookup);
+  await accountFor(input, fetchProfile, () => now, lookup);
+  expect(calls).toBe(1);
+  now = 300_001;
+  await accountFor(input, fetchProfile, () => now, lookup);
+  expect(calls).toBe(2);
+});
+
+it("discovery and fetch share the explicit macOS keychain route", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "claude-keychain-identity-"));
+  try {
+    const lookup = {
+      platform: "darwin" as const,
+      env: { USER: "fixture", CLAUDE_CONFIG_DIR: directory },
+      claudeHome: directory,
+      home: directory,
+      readKeychainCredentials: async () => ({
+        claudeAiOauth: { accessToken: "keychain-fixture-token" },
+      }),
+    };
+    let usageRequested = false;
+    await fetchUsage(
+      {
+        route: {
+          store: "keychain",
+          account: "fixture",
+          service: `Claude Code-credentials-${hashAccountKey(directory).slice(0, 8)}`,
+        },
+      },
+      async () => {
+        usageRequested = true;
+        return new Response(null, { status: 401 });
+      },
+      lookup,
+    );
+    expect(usageRequested).toBe(true);
+    const account = await accountFor(
+      {
+        route: {
+          store: "keychain",
+          account: "fixture",
+          service: `Claude Code-credentials-${hashAccountKey(directory).slice(0, 8)}`,
+        },
+      },
+      async () =>
+        jsonResponse({
+          account: { uuid: "keychain-account" },
+          organization: { uuid: "keychain-org" },
+        }),
+      Date.now,
+      lookup,
+    );
+    expect(account).toEqual({ key: "keychain-account.keychain-org" });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+it("discovery and fetch share the explicit Claude credential route", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "claude-home-identity-"));
+  try {
+    writeClaudeCredentials(directory, "home-fixture-token");
+    const lookup = { claudeHome: directory, home: directory };
+    let usageRequested = false;
+    await fetchUsage(
+      credentialInput(directory),
+      async () => {
+        usageRequested = true;
+        return new Response(null, { status: 401 });
+      },
+      lookup,
+    );
+    expect(usageRequested).toBe(true);
+    const identity = await accountFor(
+      credentialInput(directory),
+      async () =>
+        jsonResponse({
+          account: { uuid: "home-account" },
+          organization: { uuid: "home-org" },
+        }),
+      Date.now,
+      lookup,
+    );
+    expect(identity).toEqual({ key: "home-account.home-org" });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+it("bounds cached profiles across many token rotations", async () => {
+  let calls = 0;
+  const fetchProfile: typeof fetch = async () => {
+    calls++;
+    return jsonResponse({ account: { uuid: "account" }, organization: { uuid: "org" } });
+  };
+  for (let index = 0; index < 129; index++) {
+    const lookup = tokenLookup(`rotation-fixture-${index}`);
+    await accountFor(credentialInput(lookup.claudeHome), fetchProfile, Date.now, lookup);
+  }
+  const lookup = tokenLookup("rotation-fixture-0");
+  await accountFor(credentialInput(lookup.claudeHome), fetchProfile, Date.now, lookup);
+  expect(calls).toBe(130);
+});
+
+it("discovery input requires a route and rejects raw credentials", () => {
+  expect(inputSchema.safeParse({ accessToken: "unused" }).success).toBe(false);
+  expect(inputSchema.safeParse({ configDir: "/unused" }).success).toBe(false);
+  expect(() => inputSchema.parse({})).toThrow();
+});
+
+const tokenDirectories: string[] = [];
+afterEach(() => {
+  for (const directory of tokenDirectories.splice(0))
+    rmSync(directory, { recursive: true, force: true });
+});
+function tokenLookup(accessToken: string) {
+  const directory = mkdtempSync(join(tmpdir(), "claude-profile-token-"));
+  tokenDirectories.push(directory);
+  writeClaudeCredentials(directory, accessToken);
+  return { claudeHome: directory, home: directory };
+}
+
+it("discovers a Pi OAuth login independently of the CLI login", async () => {
+  const { mkdir, mkdtemp, writeFile, rm } = await import("node:fs/promises");
+  const directory = await mkdtemp(join(tmpdir(), "usage-pi-discovery-"));
+  try {
+    await mkdir(join(directory, ".pi", "agent"), { recursive: true });
+    await writeFile(
+      join(directory, ".pi", "agent", "auth.json"),
+      JSON.stringify({
+        anthropic: { type: "oauth", access: "fixture-pi", accountId: "pi-account" },
+      }),
+    );
+    const inputs = await discover(
+      { kind: "global" },
+      { home: directory, env: {}, platform: "linux" },
+    );
+    expect(inputs.map((account) => account.input)).toContainEqual({
+      route: { store: "pi", path: join(directory, ".pi", "agent", "auth.json") },
+    });
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+it("keeps an expired Keychain login without calling the network and prefers Keychain over the fallback file", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "claude-expired-"));
+  try {
+    writeClaudeCredentials(directory, "stale-file");
+    const lookup = {
+      home: directory,
+      claudeHome: directory,
+      env: { USER: "fixture" },
+      platform: "darwin" as const,
+      now: () => 10_800_000,
+      readKeychainCredentials: async () => ({
+        claudeAiOauth: { accessToken: "expired-keychain", expiresAt: 0 },
+      }),
+    };
+    let calls = 0;
+    const network: typeof fetch = async () => {
+      calls++;
+      throw new Error("must not call network");
+    };
+    const accounts = await discover({ kind: "global" }, lookup, network);
+    expect(accounts).toEqual([
+      {
+        key: expect.stringMatching(/^[a-f0-9]{64}$/),
+        harness: "Claude",
+        input: {
+          route: { store: "keychain", service: "Claude Code-credentials", account: "fixture" },
+        },
+      },
+    ]);
+    expect(await fetchUsage(accounts[0]!.input as UsageInput, network, lookup)).toEqual({
+      status: "unavailable",
+      problem: { kind: "expired", expiresAt: "1970-01-01T00:00:00.000Z", refreshedBy: "claude" },
+    });
+    expect(calls).toBe(0);
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+async function accountFor(
+  input: UsageInput,
+  fetchApi: typeof fetch,
+  now: () => number,
+  lookup: Parameters<typeof discover>[0] = {},
+) {
+  const accounts = await discover({ kind: "global" }, { ...lookup, now }, fetchApi);
+  const account = accounts.find((candidate) => isDeepStrictEqual(candidate.input, input));
+  if (!account) throw new Error("Expected discovered login");
+  return { key: account.key, ...(account.label ? { label: account.label } : {}) };
+}
+it.each([401, 403])("fetch reports rejected usage HTTP %i", async (status) => {
+  const lookup = tokenLookup(`usage-rejection-${status}`);
+  expect(
+    await fetchUsage(
+      credentialInput(lookup.claudeHome),
+      async () => new Response(null, { status }),
+      lookup,
+    ),
+  ).toEqual({
+    status: "unavailable",
+    problem: { kind: "rejected", status, refreshedBy: "claude" },
+  });
+});
+
+it.each([401, 403])("a rejected profile HTTP %i keeps a locator-keyed account", async (status) => {
+  const lookup = tokenLookup(`profile-rejection-${status}`);
+  const api: typeof fetch = async () => new Response(null, { status });
+  const accounts = await discover({ kind: "global" }, lookup, api);
+  expect(accounts).toEqual([
+    {
+      key: expect.stringMatching(/^[a-f0-9]{64}$/),
+      harness: "Claude",
+      input: credentialInput(lookup.claudeHome),
+    },
+  ]);
+  let fetches = 0;
+  expect(
+    await fetchUsage(
+      credentialInput(lookup.claudeHome),
+      async () => {
+        fetches++;
+        throw new Error("profile already rejected");
+      },
+      lookup,
+    ),
+  ).toEqual({
+    status: "unavailable",
+    problem: { kind: "rejected", status, refreshedBy: "claude" },
+  });
+  expect(fetches).toBe(0);
+});
+
+it.each([
+  { failure: "HTTP 500", networkError: false, error: "Claude usage API returned 500" },
+  { failure: "a network error", networkError: true, error: "Network unavailable" },
+])(
+  "keeps a locator-keyed login when the profile fails with $failure",
+  async ({ networkError, error }) => {
+    const lookup = tokenLookup(`profile-failure-${networkError}`);
+    const input = credentialInput(lookup.claudeHome);
+    const api: typeof fetch = async () => {
+      if (networkError) throw new Error(error);
+      return new Response(null, { status: 500 });
+    };
+    const accounts = await discover({ kind: "global" }, lookup, api);
+    expect(accounts).toEqual([
+      { key: hashAccountKey(JSON.stringify(input.route)), harness: "Claude", input },
+    ]);
+    await expect(fetchUsage(accounts[0]!.input as UsageInput, api, lookup)).rejects.toThrow(error);
+  },
+);
+
+it("says when a rate-limited login can retry and does not call the API before then", async () => {
+  let now = Date.parse("2026-10-04T21:00:00Z");
+  const lookup = { ...tokenLookup("rate-limited-token"), now: () => now };
+  const input = credentialInput(lookup.claudeHome);
+  let usageCalls = 0;
+  const api: typeof fetch = async () => {
+    usageCalls += 1;
+    if (usageCalls > 1) return jsonResponse(makeClaudeResponse());
+    return jsonResponse(
+      { error: { type: "rate_limit_error", message: "Rate limited. Please try again later." } },
+      429,
+      { "Retry-After": "2240" },
+    );
+  };
+
+  await expect(fetchUsage(input, api, lookup)).rejects.toThrow(
+    "Rate limited by Claude. Try again in 38m.",
+  );
+  now += 30 * 60_000;
+  await expect(fetchUsage(input, api, lookup)).rejects.toThrow(
+    "Rate limited by Claude. Try again in 8m.",
+  );
+  expect(usageCalls).toBe(1);
+
+  now += 8 * 60_000;
+  expect((await fetchUsage(input, api, lookup)).status).toBe("available");
+  expect(usageCalls).toBe(2);
+});
+
+it("re-reads a refreshed login at the original locator", async () => {
+  const lookup = tokenLookup("expiring-token");
+  writeFileSync(
+    join(lookup.claudeHome, ".credentials.json"),
+    JSON.stringify({ claudeAiOauth: { accessToken: "expiring-token", expiresAt: 0 } }),
+  );
+  const [account] = await discover({ kind: "global" }, lookup, async () => {
+    throw new Error("expired token must not fetch");
+  });
+  expect(await fetchUsage(account!.input as UsageInput, fetch, lookup)).toEqual({
+    status: "unavailable",
+    problem: { kind: "expired", expiresAt: "1970-01-01T00:00:00.000Z", refreshedBy: "claude" },
+  });
+  writeClaudeCredentials(lookup.claudeHome, "rotated-token");
+  const report = await fetchUsage(
+    account!.input as UsageInput,
+    async (_url, init) => {
+      expect(new Headers(init?.headers).get("Authorization")).toBe("Bearer rotated-token");
+      return jsonResponse(makeClaudeResponse());
+    },
+    lookup,
+  );
+  expect(report.status).toBe("available");
+});
+
+it("session discovery reads only its Claude home and excludes foreign sessions", async () => {
+  const home = mkdtempSync(join(tmpdir(), "claude-session-scope-"));
+  try {
+    writeClaudeCredentials(home, "scoped-unique-token");
+    const scope = {
+      kind: "session" as const,
+      provider: "claude",
+      env: { HOME: home, CLAUDE_CONFIG_DIR: home },
+    };
+    const calls: string[] = [];
+    const api: typeof fetch = async (url) => {
+      calls.push(String(url));
+      return jsonResponse({
+        account: { uuid: "session-account", email: "session@example.test" },
+        organization: { uuid: "org" },
+      });
+    };
+    const lookup = { platform: "linux" as const, home: "/unused-default-home", env: {} };
+    const accounts = await discover(scope, lookup, api);
+    expect(accounts).toEqual([
+      {
+        key: "session-account.org",
+        label: "session@example.test",
+        harness: "Claude",
+        input: credentialInput(home),
+      },
+    ]);
+    await discover(scope, lookup, api);
+    expect(calls).toEqual(["https://api.anthropic.com/api/oauth/profile"]);
+    for (const env of [
+      { CLAUDE_CODE_USE_BEDROCK: "1" },
+      { CLAUDE_CODE_USE_VERTEX: "1" },
+      { ANTHROPIC_BASE_URL: "https://other.test" },
+    ]) {
+      expect(await discover({ ...scope, env: { ...scope.env, ...env } }, lookup, api)).toEqual([]);
+    }
+    expect(await discover({ ...scope, provider: "codex" }, lookup, api)).toEqual([]);
+    expect(
+      await discover(
+        { ...scope, env: { ...scope.env, CLAUDE_CONFIG_DIR: join(home, "missing") } },
+        lookup,
+        api,
+      ),
+    ).toEqual([]);
+  } finally {
+    rmSync(home, { recursive: true, force: true });
+  }
+});
+
+it("session Keychain input retains the selected config-directory locator through fetch", async () => {
+  const reads: string[] = [];
+  const scope = {
+    kind: "session" as const,
+    provider: "claude",
+    env: { HOME: "/fixture", USER: "fixture-user", CLAUDE_CONFIG_DIR: "/fixture/work" },
+  };
+  const service = `Claude Code-credentials-${hashAccountKey(scope.env.CLAUDE_CONFIG_DIR).slice(0, 8)}`;
+  const lookup = {
+    platform: "darwin" as const,
+    readKeychainCredentials: async (selected: string, account: string) => {
+      reads.push(`${selected}:${account}`);
+      return { claudeAiOauth: { accessToken: "scoped-keychain-fixture" } };
+    },
+  };
+  const accounts = await discover(scope, lookup, async () =>
+    jsonResponse({ account: { uuid: "keychain-scoped" }, organization: { uuid: "org" } }),
+  );
+  expect(accounts).toHaveLength(1);
+  const input = inputSchema.parse(accounts[0]?.input);
+  expect(input.route).toEqual({ store: "keychain", service, account: "fixture-user" });
+  await fetchUsage(input, async () => jsonResponse(makeClaudeResponse()), {
+    ...lookup,
+    env: { CLAUDE_CONFIG_DIR: "/somewhere-else" },
+  });
+  expect(reads).toEqual(Array(3).fill(`${service}:fixture-user`));
+});
diff --git a/plugins/claude-usage-source/server/usage.ts b/plugins/claude-usage-source/server/usage.ts
new file mode 100644
index 0000000000..9efade2062
--- /dev/null
+++ b/plugins/claude-usage-source/server/usage.ts
@@ -0,0 +1,698 @@
+import { discoverOmp, piAuthPath, readHarness, type StoreLookup } from "./stores.js";
+import type { UsageInput } from "../shared/input.js";
+import { execFile } from "node:child_process";
+import { existsSync, promises as fs } from "node:fs";
+import { homedir, userInfo } from "node:os";
+import { join } from "node:path";
+import { promisify } from "node:util";
+import { z } from "zod";
+import {
+  hashAccountKey,
+  toneFromUsedPct,
+  unavailable,
+  type UsageAccount,
+  type UsageScope,
+  windowFromUsedPct,
+  type UsageReport,
+  type UsageWindow,
+  type UsageDetail,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiNumberSchema = z.coerce.number().finite();
+
+const execFileAsync = promisify(execFile);
+const CLAUDE_KEYCHAIN_TIMEOUT_MS = 2_000;
+const CLAUDE_OAUTH_BETA = "oauth-2025-04-20";
+const CLAUDE_KEYCHAIN_SERVICE = "Claude Code-credentials";
+
+const ClaudeCredentialsSchema = z.object({
+  claudeAiOauth: z
+    .object({
+      accessToken: z.string().optional(),
+      expiresAt: z.number().optional(),
+      refreshToken: z.string().optional(),
+      subscriptionType: z.string().optional(),
+      rateLimitTier: z.string().optional(),
+    })
+    .optional(),
+});
+
+const ClaudeUsageWindowSchema = z.object({
+  utilization: ApiNumberSchema,
+  resets_at: z.string().nullish(),
+});
+
+// Model- and surface-scoped weekly limits live in a `limits[]` array rather than a
+// top-level `seven_day_<model>` key. Entries are validated one at a time (see
+// scopedLimitsFromResponse) so a single malformed or newly-shaped entry cannot take down
+// the windows that already parsed from the top-level keys.
+const ClaudeScopeLabelSchema = z
+  .object({ id: z.string().nullish(), display_name: z.string().nullish() })
+  .nullish();
+
+const ClaudeLimitSchema = z.object({
+  kind: z.string(),
+  percent: ApiNumberSchema.nullish(),
+  resets_at: z.string().nullish(),
+  scope: z.object({ model: ClaudeScopeLabelSchema, surface: ClaudeScopeLabelSchema }).nullish(),
+});
+
+const ClaudeUsageResponseSchema = z.object({
+  five_hour: ClaudeUsageWindowSchema.nullish(),
+  seven_day: ClaudeUsageWindowSchema.nullish(),
+  seven_day_opus: ClaudeUsageWindowSchema.nullish(),
+  seven_day_omelette: ClaudeUsageWindowSchema.nullish(),
+  // Deliberately permissive: an additive section must never regress the top-level
+  // windows, so shape validation happens per entry rather than here.
+  limits: z.array(z.unknown()).nullish(),
+  extra_usage: z
+    .object({
+      is_enabled: z.boolean().optional(),
+    })
+    .nullish(),
+});
+
+type ClaudeCredentials = z.infer<typeof ClaudeCredentialsSchema>;
+type ClaudeUsageResponse = z.infer<typeof ClaudeUsageResponseSchema>;
+type ClaudeLimit = z.infer<typeof ClaudeLimitSchema>;
+
+const SCOPED_WEEKLY_KIND = "weekly_scoped";
+
+interface ClaudeCredentialRecord {
+  expires?: number;
+  oauth: { accessToken: string } & NonNullable<ClaudeCredentials["claudeAiOauth"]>;
+}
+
+function buildClaudePlan(
+  subscriptionType: string | undefined,
+  rateLimitTier: string | undefined,
+): string | null {
+  if (!subscriptionType) return null;
+  const label = subscriptionType.charAt(0).toUpperCase() + subscriptionType.slice(1);
+  const tier = rateLimitTier?.split("_").pop();
+  return tier ? `${label} ${tier}` : label;
+}
+
+/**
+ * A weekly limit scoped to one model or one surface, normalized away from whichever
+ * shape of the response described it.
+ *
+ * The API describes the same limit two ways during the migration: a legacy top-level
+ * `seven_day_<model>` key, and an entry in `limits[]`. Everything downstream works on
+ * this one representation so the two shapes are reconciled exactly once, in
+ * `reconcileScopedLimits`, rather than at each place a window is built.
+ */
+interface ScopedLimit {
+  dimension: "model" | "surface";
+  /** The API's own identifier. Null on every response observed so far. */
+  id: string | null;
+  /** Display name, or the id when the API sends no display name. */
+  name: string;
+  usedPct: number | null;
+  resetsAt: string | null;
+}
+
+// Windows that describe no particular model or surface.
+const UNSCOPED_WINDOWS: ReadonlyArray<{
+  field: "five_hour" | "seven_day";
+  id: string;
+  label: string;
+  shortLabel: string;
+  summary: boolean;
+}> = [
+  { field: "five_hour", id: "five_hour", label: "Session", shortLabel: "5h", summary: true },
+  { field: "seven_day", id: "weekly", label: "Weekly", shortLabel: "wk", summary: true },
+];
+
+// Scoped windows from before `limits[]` existed. Declaring the dimension here is what
+// stops a *surface* named "Omelette" from being mistaken for the legacy Omelette *model*
+// window: these keys are model-scoped by definition.
+const LEGACY_SCOPED_WINDOWS: ReadonlyArray<{
+  field: "seven_day_opus" | "seven_day_omelette";
+  name: string;
+}> = [
+  { field: "seven_day_opus", name: "Opus" },
+  { field: "seven_day_omelette", name: "Omelette" },
+];
+
+/** Fold a name down to the characters an id is allowed to carry. */
+function normalizeName(name: string): string {
+  return name
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "_")
+    .replace(/^_+|_+$/g, "");
+}
+
+/**
+ * Whether two descriptions denote the same limit. This is the single definition of
+ * identity for scoped limits; nothing else may compare them, and in particular nothing
+ * may compare display labels, which are presentation rather than identity.
+ *
+ * - Different dimensions are never the same limit, so a surface and a model sharing a
+ *   name stay apart.
+ * - When both sides carry the API's own id, that id decides, so `fable-pro` and
+ *   `fable_pro` stay apart.
+ * - Otherwise fall back to the normalized name, which is the only link available between
+ *   a legacy key (never has an id) and its `limits[]` counterpart.
+ */
+function isSameLimit(a: ScopedLimit, b: ScopedLimit): boolean {
+  if (a.dimension !== b.dimension) return false;
+  if (a.id && b.id) return a.id === b.id;
+  return normalizeName(a.name) === normalizeName(b.name);
+}
+
+/**
+ * Merge the legacy and `limits[]` descriptions into one limit per identity.
+ *
+ * A `limits[]` entry wins on identity because that is the representation the API is
+ * migrating towards, so a limit keeps the same window id whichever shape carried it.
+ * Its values are nullable though, so each field falls back to the legacy twin instead of
+ * discarding a number the response did contain.
+ */
+function reconcileScopedLimits(
+  legacy: ScopedLimit[],
+  fromLimitsArray: ScopedLimit[],
+): ScopedLimit[] {
+  const reconciled = [...legacy];
+  for (const limit of fromLimitsArray) {
+    const index = reconciled.findIndex((candidate) => isSameLimit(candidate, limit));
+    if (index === -1) {
+      reconciled.push(limit);
+      continue;
+    }
+    const twin = reconciled[index];
+    reconciled[index] = {
+      ...limit,
+      usedPct: limit.usedPct ?? twin?.usedPct ?? null,
+      resetsAt: limit.resetsAt ?? twin?.resetsAt ?? null,
+    };
+  }
+  return reconciled;
+}
+
+function scopedLimitFromLegacy(
+  spec: (typeof LEGACY_SCOPED_WINDOWS)[number],
+  window: z.infer<typeof ClaudeUsageWindowSchema>,
+): ScopedLimit {
+  return {
+    dimension: "model",
+    id: null,
+    name: spec.name,
+    usedPct: window.utilization,
+    resetsAt: window.resets_at ?? null,
+  };
+}
+
+/** The scope of a `limits[]` entry, or null when it names nothing renderable. */
+function scopedLimitFromEntry(limit: ClaudeLimit): ScopedLimit | null {
+  for (const dimension of ["model", "surface"] as const) {
+    const entry = limit.scope?.[dimension];
+    const id = entry?.id?.trim() || null;
+    const name = entry?.display_name?.trim() || id;
+    if (name) {
+      return {
+        dimension,
+        id,
+        name,
+        usedPct: limit.percent ?? null,
+        resetsAt: limit.resets_at ?? null,
+      };
+    }
+  }
+  return null;
+}
+
+// The client uses window ids as React keys, so they must be stable across refreshes and
+// unique within a response. An API-supplied id is already an identifier and is used
+// verbatim (ids elsewhere carry punctuation too, e.g. MiniMax's `interval_MiniMax-M2.7`);
+// only a name fallback is normalized. Normalizing an id would collapse `fable-pro` and
+// `fable_pro` into one window.
+function scopedWindowId(limit: ScopedLimit): string {
+  return `weekly_${limit.dimension}_${limit.id ?? normalizeName(limit.name)}`;
+}
+
+// Backstop for the one residual case identity cannot rule out: an entry whose verbatim id
+// equals another entry's normalized name. Suffix rather than drop, because a missing bar
+// is the bug this change exists to fix.
+function uniqueWindowId(candidate: string, taken: Set<string>): string {
+  if (!taken.has(candidate)) return candidate;
+  for (let suffix = 2; ; suffix += 1) {
+    const next = `${candidate}_${suffix}`;
+    if (!taken.has(next)) return next;
+  }
+}
+
+function legacyScopedLimits(resp: ClaudeUsageResponse): ScopedLimit[] {
+  const limits: ScopedLimit[] = [];
+  for (const spec of LEGACY_SCOPED_WINDOWS) {
+    const window = resp[spec.field];
+    if (window) limits.push(scopedLimitFromLegacy(spec, window));
+  }
+  return limits;
+}
+
+function unscopedWindows(resp: ClaudeUsageResponse): UsageWindow[] {
+  const windows: UsageWindow[] = [];
+  for (const spec of UNSCOPED_WINDOWS) {
+    const window = resp[spec.field];
+    if (!window) continue;
+    windows.push(
+      windowFromUsedPct({
+        id: spec.id,
+        label: spec.label,
+        shortLabel: spec.shortLabel,
+        summary: spec.summary,
+        utilizationPct: window.utilization,
+        resetsAt: window.resets_at ?? null,
+        tone: toneFromUsedPct(window.utilization),
+      }),
+    );
+  }
+  return windows;
+}
+
+function scopedWindows(limits: ScopedLimit[]): UsageWindow[] {
+  const taken = new Set<string>();
+  return limits.map((limit) => {
+    const id = uniqueWindowId(scopedWindowId(limit), taken);
+    taken.add(id);
+    // Emitted even at 0% and inactive: a zero bar answers "how much of this model have I
+    // used", and the bar must not come and go between refreshes.
+    return windowFromUsedPct({
+      id,
+      label: `Weekly \u00b7 ${limit.name}`,
+      shortLabel: `wk ${limit.name}`,
+      utilizationPct: limit.usedPct,
+      resetsAt: limit.resetsAt,
+      tone: toneFromUsedPct(limit.usedPct),
+    });
+  });
+}
+
+type ClaudeKeychainCommandRunner = (args: string[]) => Promise<string | null>;
+
+// Keep this in sync with Claude Code's Keychain account derivation.
+const CLAUDE_KEYCHAIN_ACCOUNT_PATTERN = /^[a-zA-Z0-9._-]+$/;
+const CLAUDE_KEYCHAIN_FALLBACK_ACCOUNT = "claude-code-user";
+
+export function claudeKeychainAccount(
+  user: string = process.env["USER"] || userInfo().username,
+): string {
+  return CLAUDE_KEYCHAIN_ACCOUNT_PATTERN.test(user) ? user : CLAUDE_KEYCHAIN_FALLBACK_ACCOUNT;
+}
+
+async function runSecurityCommand(args: string[]): Promise<string | null> {
+  try {
+    const { stdout } = await execFileAsync("security", args, {
+      timeout: CLAUDE_KEYCHAIN_TIMEOUT_MS,
+    });
+    return stdout.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+/** Read Claude Code's account-specific Keychain item, then try the legacy lookup. */
+export async function readClaudeKeychainCredentials(
+  run: ClaudeKeychainCommandRunner = runSecurityCommand,
+  account: string = claudeKeychainAccount(),
+  service: string = CLAUDE_KEYCHAIN_SERVICE,
+): Promise<unknown | null> {
+  const lookups = [
+    ["find-generic-password", "-a", account, "-w", "-s", service],
+    ["find-generic-password", "-w", "-s", service],
+  ];
+
+  for (const args of lookups) {
+    const raw = await run(args);
+    if (!raw) continue;
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    const creds = ClaudeCredentialsSchema.safeParse(parsed);
+    if (creds.success && creds.data.claudeAiOauth?.accessToken) return parsed;
+  }
+  return null;
+}
+
+interface ClaudeCredentialLookup extends StoreLookup {
+  readKeychainCredentials?: (service: string, account: string) => Promise<unknown | null>;
+  claudeHome?: string;
+}
+
+function claudeCredentialPath(lookup: ClaudeCredentialLookup): string {
+  const home = lookup.home ?? homedir();
+  const env = lookup.env ?? process.env;
+  const claudeHome = lookup.claudeHome ?? env.CLAUDE_CONFIG_DIR ?? join(home, ".claude");
+  return join(claudeHome, ".credentials.json");
+}
+
+async function keychainCredentialRecord(
+  lookup: ClaudeCredentialLookup,
+  route = claudeKeychainRoute(lookup),
+): Promise<ClaudeCredentialRecord | null> {
+  if ((lookup.platform ?? process.platform) !== "darwin") return null;
+  const parsed = ClaudeCredentialsSchema.safeParse(
+    await (lookup.readKeychainCredentials
+      ? lookup.readKeychainCredentials(route.service, route.account)
+      : readClaudeKeychainCredentials(undefined, route.account, route.service)),
+  );
+  return parsed.success ? toCredentialRecord(parsed.data) : null;
+}
+
+export async function discover(
+  scope: UsageScope,
+  lookup: ClaudeCredentialLookup = {},
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageAccount[]> {
+  if (scope.kind === "session")
+    lookup = {
+      ...lookup,
+      env: scope.env,
+      home: scope.env.HOME || scope.env.USERPROFILE || homedir(),
+    };
+  const candidates =
+    scope.kind === "global" ? await globalRoutes(lookup) : await sessionRoutes(scope, lookup);
+  const accounts: UsageAccount[] = [];
+  for (const input of candidates) {
+    const credentials = await resolveClaudeCredentials(input, lookup);
+    if (!credentials) continue;
+    const harness = { pi: "Pi", omp: "OMP", claude: "Claude", keychain: "Claude" }[
+      input.route.store
+    ];
+    const fallback = { key: hashAccountKey(JSON.stringify(input.route)), harness, input };
+    if (credentials.expires !== undefined && credentials.expires <= (lookup.now ?? Date.now)()) {
+      accounts.push(fallback);
+      continue;
+    }
+    try {
+      const profile = await readProfile(
+        credentials.oauth.accessToken,
+        fetchApi,
+        lookup.now ?? Date.now,
+      );
+      accounts.push("status" in profile ? fallback : { ...profile, harness, input });
+    } catch {
+      // Keep the login visible; fetching usage reports the vendor failure.
+      accounts.push(fallback);
+    }
+  }
+  return accounts;
+}
+
+function claudeKeychainRoute(lookup: ClaudeCredentialLookup) {
+  const env = lookup.env ?? process.env;
+  const configDir = env.CLAUDE_CONFIG_DIR;
+  // macOS still uses Keychain with CLAUDE_CONFIG_DIR, with an entry keyed to that directory:
+  // https://code.claude.com/docs/en/authentication#credential-management
+  // Verified in @anthropic-ai/claude-code 2.1.59, package/cli.js: _c() appends the first
+  // 8 SHA-256 hex characters of HA() (the NFC-normalized config directory).
+  const suffix = configDir ? `-${hashAccountKey(configDir.normalize("NFC")).slice(0, 8)}` : "";
+  return {
+    store: "keychain" as const,
+    service: `${CLAUDE_KEYCHAIN_SERVICE}${suffix}`,
+    account: claudeKeychainAccount(env.USER),
+  };
+}
+
+async function claudeRoute(lookup: ClaudeCredentialLookup): Promise<UsageInput> {
+  const route = claudeKeychainRoute(lookup);
+  return (await keychainCredentialRecord(lookup, route))
+    ? { route }
+    : { route: { store: "claude", path: claudeCredentialPath(lookup) } };
+}
+
+async function globalRoutes(lookup: ClaudeCredentialLookup): Promise<UsageInput[]> {
+  return [
+    await claudeRoute(lookup),
+    { route: { store: "pi", path: piAuthPath(lookup) } },
+    ...discoverOmp(lookup).map((route) => ({ route })),
+  ];
+}
+
+async function sessionRoutes(
+  scope: Extract<UsageScope, { kind: "session" }>,
+  lookup: ClaudeCredentialLookup,
+): Promise<UsageInput[]> {
+  if (scope.provider === "claude") {
+    const env = scope.env;
+    const foreign =
+      env.ANTHROPIC_BASE_URL &&
+      env.ANTHROPIC_BASE_URL.replace(/\/+$/, "") !== "https://api.anthropic.com";
+    if (enabled(env.CLAUDE_CODE_USE_BEDROCK) || enabled(env.CLAUDE_CODE_USE_VERTEX) || foreign)
+      return [];
+    return [await claudeRoute(lookup)];
+  }
+  if (!scope.model?.startsWith("anthropic/")) return [];
+  if (scope.provider === "pi") return [{ route: { store: "pi", path: piAuthPath(lookup) } }];
+  if (scope.provider === "omp") return discoverOmp(lookup).map((route) => ({ route }));
+  return [];
+}
+
+function enabled(value: string | undefined): boolean {
+  return value === "1" || value?.toLowerCase() === "true" || value?.toLowerCase() === "yes";
+}
+
+/** Re-read the selected login; the harness owns token refresh. */
+export async function resolveClaudeCredentials(
+  input: UsageInput,
+  lookup: ClaudeCredentialLookup = {},
+): Promise<ClaudeCredentialRecord | null> {
+  const route = input.route;
+  if (route.store === "claude") return readCredentialFile(route.path);
+  if (route.store === "keychain")
+    return keychainCredentialRecord(lookup, {
+      store: "keychain",
+      service: route.service ?? CLAUDE_KEYCHAIN_SERVICE,
+      account: route.account ?? claudeKeychainAccount(),
+    });
+  const oauth = await readHarness(route, lookup);
+  return oauth ? { oauth: { accessToken: oauth.access }, expires: oauth.expires } : null;
+}
+
+async function readCredentialFile(path: string): Promise<ClaudeCredentialRecord | null> {
+  if (!existsSync(path)) return null;
+  try {
+    return toCredentialRecord(
+      ClaudeCredentialsSchema.parse(JSON.parse(await fs.readFile(path, "utf8"))),
+    );
+  } catch {
+    return null;
+  }
+}
+
+function toCredentialRecord(credentials: ClaudeCredentials): ClaudeCredentialRecord | null {
+  const oauth = credentials.claudeAiOauth;
+  return oauth?.accessToken
+    ? { oauth: { ...oauth, accessToken: oauth.accessToken }, expires: oauth.expiresAt }
+    : null;
+}
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+  credentialLookup: ClaudeCredentialLookup = {},
+): Promise<UsageReport> {
+  /**
+   * Scoped limits carried by `limits[]`.
+   *
+   * Entries are validated one at a time so a single malformed or newly-shaped entry
+   * cannot fail the whole response and take the windows that already parsed with it.
+   */
+  function scopedLimitsFromResponse(limits: ClaudeUsageResponse["limits"]): ScopedLimit[] {
+    if (!limits) return [];
+
+    const parsed: ScopedLimit[] = [];
+    for (const entry of limits) {
+      const result = ClaudeLimitSchema.safeParse(entry);
+      if (!result.success) {
+        console.warn({ err: result.error }, "Skipping unparseable Claude usage limit entry");
+        continue;
+      }
+      if (result.data.kind !== SCOPED_WEEKLY_KIND) continue;
+
+      const limit = scopedLimitFromEntry(result.data);
+      if (!limit) {
+        console.warn("Skipping scoped Claude usage limit with no resolvable scope name");
+        continue;
+      }
+      parsed.push(limit);
+    }
+    return parsed;
+  }
+
+  async function callClaudeApi(token: string, now: number): Promise<ClaudeUsageResponse | number> {
+    for (const [key, until] of rateLimitedUntil) {
+      if (until <= now) rateLimitedUntil.delete(key);
+    }
+    const tokenKey = hashAccountKey(token);
+    const limitedUntil = rateLimitedUntil.get(tokenKey);
+    if (limitedUntil !== undefined && limitedUntil > now)
+      throw rateLimitedError(limitedUntil - now);
+    rateLimitedUntil.delete(tokenKey);
+
+    const res = await fetchApi("https://api.anthropic.com/api/oauth/usage", {
+      signal: AbortSignal.timeout(15_000),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: "application/json",
+        "anthropic-beta": CLAUDE_OAUTH_BETA,
+      },
+    });
+    if (res.status === 401 || res.status === 403) return res.status;
+    if (res.status === 429) {
+      const waitMs = retryAfterMs(res.headers.get("retry-after"), now);
+      if (waitMs !== null) rateLimitedUntil.set(tokenKey, now + waitMs);
+      throw rateLimitedError(waitMs);
+    }
+    if (!res.ok) throw new Error(`Claude usage API returned ${res.status}`);
+    return ClaudeUsageResponseSchema.parse(await res.json());
+  }
+
+  const credentials = await resolveClaudeCredentials(input, credentialLookup);
+  if (!credentials) throw new Error("Claude login store no longer exists");
+  const refreshedBy =
+    input.route.store === "claude" || input.route.store === "keychain"
+      ? "claude"
+      : input.route.store;
+  if (
+    credentials.expires !== undefined &&
+    credentials.expires <= (credentialLookup.now ?? Date.now)()
+  )
+    return unavailable({
+      kind: "expired",
+      expiresAt: new Date(credentials.expires).toISOString(),
+      refreshedBy,
+    });
+  const profile = await cachedProfile(
+    credentials.oauth.accessToken,
+    (credentialLookup.now ?? Date.now)(),
+  );
+  if (profile && "status" in profile)
+    return unavailable({ kind: "rejected", status: profile.status, refreshedBy });
+
+  const { oauth } = credentials;
+  const plan = buildClaudePlan(oauth.subscriptionType, oauth.rateLimitTier);
+  const resp = await callClaudeApi(oauth.accessToken, (credentialLookup.now ?? Date.now)());
+
+  if (typeof resp === "number") return unavailable({ kind: "rejected", status: resp, refreshedBy });
+
+  const scoped = reconcileScopedLimits(
+    legacyScopedLimits(resp),
+    scopedLimitsFromResponse(resp.limits),
+  );
+  const windows = [...unscopedWindows(resp), ...scopedWindows(scoped)];
+
+  if (windows.length === 0) {
+    // The response parsed but described nothing. That silence is how the previous
+    // shape change went unnoticed, so make it greppable. `warn` and not `debug`
+    // because file logging defaults to `info`.
+    console.warn("Claude usage response parsed but produced no windows");
+  }
+
+  const details: UsageDetail[] = [];
+  const extraUsageEnabled = resp.extra_usage?.is_enabled;
+  if (extraUsageEnabled !== undefined) {
+    details.push({
+      id: "extra_usage",
+      label: "Extra usage",
+      value: extraUsageEnabled ? "Enabled" : "Disabled",
+    });
+  }
+
+  return {
+    status: "available",
+    planLabel: plan ?? undefined,
+    windows,
+    balances: [],
+    details,
+  };
+}
+
+// A 429 from the usage endpoint carries Retry-After, observed in the tens of minutes. Until it
+// passes, a fetch (including a forced Refresh) answers from here instead of calling again.
+const rateLimitedUntil = new Map<string, number>();
+
+function retryAfterMs(header: string | null, now: number): number | null {
+  if (!header) return null;
+  const seconds = Number(header);
+  if (Number.isFinite(seconds)) return Math.max(0, seconds * 1000);
+  const at = Date.parse(header);
+  return Number.isNaN(at) ? null : Math.max(0, at - now);
+}
+
+function rateLimitedError(waitMs: number | null): Error {
+  const when = waitMs === null ? "later" : `in ${formatWait(waitMs)}`;
+  return new Error(`Rate limited by Claude. Try again ${when}.`);
+}
+
+function formatWait(ms: number): string {
+  const minutes = Math.max(1, Math.ceil(ms / 60_000));
+  return minutes < 60 ? `${minutes}m` : `${Math.ceil(minutes / 60)}h`;
+}
+
+// The OAuth usage endpoint meters the active organization selected by the token.
+type ClaudeIdentity = { key: string; label?: string } | { status: number };
+const PROFILE_TTL_MS = 300_000;
+const PROFILE_CACHE_LIMIT = 128;
+const profileCache = new Map<string, { at: number; result: Promise<ClaudeIdentity> }>();
+
+function cachedProfile(token: string, now: number): Promise<ClaudeIdentity> | undefined {
+  pruneProfileCache(now);
+  return profileCache.get(hashAccountKey(token))?.result;
+}
+
+function pruneProfileCache(now: number): void {
+  for (const [key, entry] of profileCache) {
+    if (now - entry.at >= PROFILE_TTL_MS) profileCache.delete(key);
+  }
+}
+
+async function readProfile(
+  token: string,
+  fetchApi: typeof fetch,
+  now: () => number,
+): Promise<ClaudeIdentity> {
+  const tokenHash = hashAccountKey(token);
+  pruneProfileCache(now());
+  const pending = profileCache.get(tokenHash);
+  if (pending) return pending.result;
+  while (profileCache.size >= PROFILE_CACHE_LIMIT) {
+    const oldest = profileCache.keys().next().value;
+    if (oldest === undefined) break;
+    profileCache.delete(oldest);
+  }
+  const request = (async () => {
+    const response = await fetchApi("https://api.anthropic.com/api/oauth/profile", {
+      signal: AbortSignal.timeout(15_000),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: "application/json",
+        "anthropic-beta": CLAUDE_OAUTH_BETA,
+      },
+    });
+    if (response.status === 401 || response.status === 403) return { status: response.status };
+    if (!response.ok) throw new Error(`Claude profile API returned ${response.status}`);
+    const profile = z
+      .object({
+        account: z.object({ uuid: z.string().min(1), email: z.string().optional() }),
+        organization: z.object({ uuid: z.string().min(1) }),
+      })
+      .parse(await response.json());
+    const account = profile.account;
+    return {
+      key: `${account.uuid}.${profile.organization.uuid}`,
+      ...(account.email ? { label: account.email } : {}),
+    };
+  })();
+  profileCache.set(tokenHash, { at: now(), result: request });
+  try {
+    return await request;
+  } catch (error) {
+    if (profileCache.get(tokenHash)?.result === request) profileCache.delete(tokenHash);
+    throw error;
+  }
+}
diff --git a/plugins/claude-usage-source/shared/input.ts b/plugins/claude-usage-source/shared/input.ts
new file mode 100644
index 0000000000..b82c69cfde
--- /dev/null
+++ b/plugins/claude-usage-source/shared/input.ts
@@ -0,0 +1,21 @@
+import { z } from "zod";
+
+export const routeSchema = z.discriminatedUnion("store", [
+  z.object({ store: z.enum(["claude", "pi"]), path: z.string().min(1) }).strict(),
+  z
+    .object({
+      store: z.literal("omp"),
+      path: z.string().min(1),
+      credentialId: z.number().int().positive(),
+    })
+    .strict(),
+  z
+    .object({
+      store: z.literal("keychain"),
+      service: z.string().optional(),
+      account: z.string().optional(),
+    })
+    .strict(),
+]);
+export const inputSchema = z.object({ route: routeSchema }).strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/codex-usage-source/icon.svg b/plugins/codex-usage-source/icon.svg
new file mode 100644
index 0000000000..5d9e2fec39
--- /dev/null
+++ b/plugins/codex-usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" fill-rule="evenodd"><path d="M21.55 10.004a5.416 5.416 0 00-.478-4.501c-1.217-2.09-3.662-3.166-6.05-2.66A5.59 5.59 0 0010.831 1C8.39.995 6.224 2.546 5.473 4.838A5.553 5.553 0 001.76 7.496a5.487 5.487 0 00.691 6.5 5.416 5.416 0 00.477 4.502c1.217 2.09 3.662 3.165 6.05 2.66A5.586 5.586 0 0013.168 23c2.443.006 4.61-1.546 5.361-3.84a5.553 5.553 0 003.715-2.66 5.488 5.488 0 00-.693-6.497v.001zm-8.381 11.558a4.199 4.199 0 01-2.675-.954c.034-.018.093-.05.132-.074l4.44-2.53a.71.71 0 00.364-.623v-6.176l1.877 1.069c.02.01.033.029.036.05v5.115c-.003 2.274-1.87 4.118-4.174 4.123zM4.192 17.78a4.059 4.059 0 01-.498-2.763c.032.02.09.055.131.078l4.44 2.53c.225.13.504.13.73 0l5.42-3.088v2.138a.068.068 0 01-.027.057L9.9 19.288c-1.999 1.136-4.552.46-5.707-1.51h-.001zM3.023 8.216A4.15 4.15 0 015.198 6.41l-.002.151v5.06a.711.711 0 00.364.624l5.42 3.087-1.876 1.07a.067.067 0 01-.063.005l-4.489-2.559c-1.995-1.14-2.679-3.658-1.53-5.63h.001zm15.417 3.54l-5.42-3.088L14.896 7.6a.067.067 0 01.063-.006l4.489 2.557c1.998 1.14 2.683 3.662 1.529 5.633a4.163 4.163 0 01-2.174 1.807V12.38a.71.71 0 00-.363-.623zm1.867-2.773a6.04 6.04 0 00-.132-.078l-4.44-2.53a.731.731 0 00-.729 0l-5.42 3.088V7.325a.068.068 0 01.027-.057L14.1 4.713c2-1.137 4.555-.46 5.707 1.513.487.833.664 1.809.499 2.757h.001zm-11.741 3.81l-1.877-1.068a.065.065 0 01-.036-.051V6.559c.001-2.277 1.873-4.122 4.181-4.12.976 0 1.92.338 2.671.954-.034.018-.092.05-.131.073l-4.44 2.53a.71.71 0 00-.365.623l-.003 6.173v.002zm1.02-2.168L12 9.25l2.414 1.375v2.75L12 14.75l-2.415-1.375v-2.75z"/></svg>
diff --git a/plugins/codex-usage-source/index.server.ts b/plugins/codex-usage-source/index.server.ts
new file mode 100644
index 0000000000..8d38c15ebf
--- /dev/null
+++ b/plugins/codex-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { discover, fetchUsage } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "codex",
+    label: "Codex",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => discover(scope),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/codex-usage-source/paseo-plugin.json b/plugins/codex-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..f86baa137a
--- /dev/null
+++ b/plugins/codex-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "codex-usage-source", "requirements": { "paseo": ">=0.11.0" } }
diff --git a/plugins/codex-usage-source/server/stores.test.ts b/plugins/codex-usage-source/server/stores.test.ts
new file mode 100644
index 0000000000..335985bacd
--- /dev/null
+++ b/plugins/codex-usage-source/server/stores.test.ts
@@ -0,0 +1,262 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+
+let home: string;
+beforeEach(async () => {
+  home = await mkdtemp(join(tmpdir(), "usage-stores-"));
+});
+afterEach(async () => {
+  await rm(home, { recursive: true, force: true });
+});
+function lookup(env: NodeJS.ProcessEnv = {}) {
+  return { home, env, platform: "linux" as const, now: () => 1000 };
+}
+async function json(path: string, value: unknown) {
+  const { dirname } = await import("node:path");
+  await mkdir(dirname(path), { recursive: true });
+  await writeFile(path, JSON.stringify(value));
+}
+async function accountIdentity(
+  input: Parameters<typeof fetchUsage>[0],
+  env: NodeJS.ProcessEnv = {},
+) {
+  const accounts = await discover({ kind: "global" }, lookup(env));
+  const account = accounts.find(
+    (candidate) => JSON.stringify(candidate.input) === JSON.stringify(input),
+  );
+  if (!account) throw new Error("Expected discovered login");
+  return { key: account.key, ...(account.label ? { label: account.label } : {}) };
+}
+async function logins(options: Parameters<typeof discover>[1]) {
+  return (await discover({ kind: "global" }, options)).map(
+    (account) => account.input as Parameters<typeof fetchUsage>[0],
+  );
+}
+async function database(path: string) {
+  await mkdir((await import("node:path")).dirname(path), { recursive: true });
+  const { DatabaseSync } = await import("node:sqlite");
+  const db = new DatabaseSync(path);
+  // Create the fixture with one durable commit instead of one per row.
+  db.exec("BEGIN");
+  db.exec(
+    "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
+  );
+  const insert = db.prepare("INSERT INTO auth_credentials VALUES (?, ?, ?, ?, ?)");
+  insert.run(
+    1,
+    "openai-codex",
+    "oauth",
+    JSON.stringify({ access: "fixture-omp", accountId: "omp-account", expires: 2000 }),
+    null,
+  );
+  insert.run(
+    2,
+    "openai-codex",
+    "oauth",
+    JSON.stringify({ access: "fixture-expired", expires: 500 }),
+    null,
+  );
+  insert.run(
+    3,
+    "openai-codex",
+    "oauth",
+    JSON.stringify({ access: "fixture-disabled", expires: 2000 }),
+    "revoked",
+  );
+  insert.run(
+    4,
+    "openai-codex",
+    "api_key",
+    JSON.stringify({ access: "fixture-key", expires: 2000 }),
+    null,
+  );
+  insert.run(5, "openai-codex", "oauth", "invalid", null);
+  db.exec("COMMIT");
+  db.close();
+}
+
+test("Pi uses its own OAuth identity and re-reads rotated tokens without writing", async () => {
+  const path = join(home, ".pi", "agent", "auth.json");
+  await json(path, {
+    "openai-codex": { type: "oauth", access: "fixture-first", accountId: "pi-account" },
+  });
+  await json(join(home, ".claude.json"), {
+    oauthAccount: { accountUuid: "other", organizationUuid: "other-org" },
+  });
+  const inputs = await logins(lookup());
+  expect(inputs).toHaveLength(1);
+  expect(await accountIdentity(inputs[0]!)).toEqual({ key: "pi-account" });
+  await json(path, {
+    "openai-codex": { type: "oauth", access: "fixture-rotated", accountId: "pi-account" },
+  });
+  const before = await readFile(path, "utf8");
+  expect(
+    (
+      await fetchUsage(
+        inputs[0]!,
+        async (_url, init) => {
+          expect(new Headers(init?.headers).get("Authorization")).toBe("Bearer fixture-rotated");
+          return new Response("{}", { status: 401 });
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+  expect(await readFile(path, "utf8")).toBe(before);
+});
+
+test("Pi honors directory override and ignores API keys and malformed files", async () => {
+  const directory = join(home, "custom-pi");
+  const env = { PI_CODING_AGENT_DIR: directory };
+  const path = join(directory, "auth.json");
+  await json(path, {
+    "openai-codex": { type: "oauth", access: "fixture-pi", accountId: "pi-account" },
+  });
+  expect(await logins(lookup(env))).toEqual([{ route: { store: "pi", path } }]);
+  await json(path, { "openai-codex": { type: "api_key", key: "fixture-key" } });
+  expect(await logins(lookup(env))).toEqual([]);
+  await writeFile(path, "broken");
+  expect(await logins(lookup(env))).toEqual([]);
+});
+
+test("expired Pi tokens are unavailable without calling usage or refreshing", async () => {
+  await json(join(home, ".pi", "agent", "auth.json"), {
+    "openai-codex": {
+      type: "oauth",
+      access: "fixture-expired",
+      accountId: "pi-account",
+      expires: 500,
+    },
+  });
+  const [input] = await logins(lookup());
+  expect(
+    (
+      await fetchUsage(
+        input!,
+        async () => {
+          throw new Error("must not fetch expired token");
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+});
+
+for (const location of ["default", "profile", "xdg", "override", "config"]) {
+  test(`OMP discovers enabled live OAuth rows in ${location} store read-only`, async () => {
+    let path = join(home, ".omp", "agent", "agent.db");
+    let env: NodeJS.ProcessEnv = { OMP_AUTH_BROKER_URL: "https://broker.test" };
+    if (location === "profile") {
+      env.OMP_PROFILE = "work";
+      path = join(home, ".omp", "profiles", "work", "agent", "agent.db");
+    }
+    if (location === "xdg") {
+      env.XDG_DATA_HOME = join(home, "data");
+      env.PI_PROFILE = "work";
+      path = join(home, "data", "omp", "profiles", "work", "agent.db");
+    }
+    if (location === "override") {
+      env.PI_CODING_AGENT_DIR = join(home, "custom");
+      path = join(home, "custom", "agent.db");
+    }
+    if (location === "config") {
+      env.PI_CONFIG_DIR = "custom-config";
+      path = join(home, "custom-config", "agent", "agent.db");
+    }
+    await database(path);
+    const before = await readFile(path);
+    const inputs = await logins(lookup(env));
+    expect(inputs).toEqual([
+      { route: { store: "omp", path, credentialId: 1 } },
+      { route: { store: "omp", path, credentialId: 2 } },
+    ]);
+    expect(await accountIdentity(inputs[0]!, env)).toEqual({ key: "omp-account" });
+    expect(
+      (
+        await fetchUsage(
+          inputs[0]!,
+          async (_url, init) => {
+            expect(new Headers(init?.headers).get("Authorization")).toBe("Bearer fixture-omp");
+            return new Response("{}", { status: 401 });
+          },
+          lookup(env),
+        )
+      ).status,
+    ).toBe("unavailable");
+    expect(await readFile(path)).toEqual(before);
+  });
+}
+
+test("missing SQLite skips only OMP", async () => {
+  await database(join(home, ".omp", "agent", "agent.db"));
+  await json(join(home, ".pi", "agent", "auth.json"), {
+    "openai-codex": { type: "oauth", access: "fixture-pi" },
+  });
+  const inputs = await logins({ ...lookup(), sqlite: () => undefined });
+  expect(inputs).toEqual([
+    { route: { store: "pi", path: join(home, ".pi", "agent", "auth.json") } },
+  ]);
+});
+
+test("Codex and OpenCode discover accounts in preference order with XDG and CODEX_HOME", async () => {
+  const codex = join(home, "codex");
+  const data = join(home, "data");
+  const env = { CODEX_HOME: codex, XDG_DATA_HOME: data };
+  await json(join(codex, "auth.json"), {
+    tokens: { access_token: "fixture-codex", account_id: "same" },
+  });
+  // Codex CLI never reads ~/.config/codex.
+  await json(join(home, ".config", "codex", "auth.json"), {
+    tokens: { access_token: "fixture-config", account_id: "same" },
+  });
+  await json(join(home, ".codex", "auth.json"), {
+    tokens: { access_token: "fixture-legacy", account_id: "same" },
+  });
+  await json(join(data, "opencode", "auth.json"), {
+    openai: { type: "oauth", access: "fixture-open", accountId: "same" },
+  });
+  const inputs = await logins(lookup(env));
+  expect(inputs.map((input) => input.route.store)).toEqual(["codex", "codex", "opencode"]);
+  for (const input of inputs) expect(await accountIdentity(input, env)).toEqual({ key: "same" });
+  await json(join(data, "opencode", "auth.json"), { openai: { type: "api", key: "fixture-key" } });
+  expect(await logins(lookup(env))).toHaveLength(2);
+});
+
+test("OMP fetch re-reads its row after rotation and skips a newly disabled login", async () => {
+  const path = join(home, ".omp", "agent", "agent.db");
+  await database(path);
+  const [input] = await logins(lookup());
+  const { DatabaseSync } = await import("node:sqlite");
+  const db = new DatabaseSync(path);
+  db.prepare("UPDATE auth_credentials SET data = ? WHERE id = 1").run(
+    JSON.stringify({ access: "fixture-rotated-omp", accountId: "omp-account", expires: 2000 }),
+  );
+  expect(
+    (
+      await fetchUsage(
+        input!,
+        async (_url, init) => {
+          expect(new Headers(init?.headers).get("Authorization")).toBe(
+            "Bearer fixture-rotated-omp",
+          );
+          return new Response("{}", { status: 401 });
+        },
+        lookup(),
+      )
+    ).status,
+  ).toBe("unavailable");
+  db.prepare("UPDATE auth_credentials SET disabled_cause = 'revoked' WHERE id = 1").run();
+  db.close();
+  await expect(
+    fetchUsage(
+      input!,
+      async () => {
+        throw new Error("must not fetch");
+      },
+      lookup(),
+    ),
+  ).rejects.toThrow("login store no longer exists");
+});
diff --git a/plugins/codex-usage-source/server/stores.ts b/plugins/codex-usage-source/server/stores.ts
new file mode 100644
index 0000000000..7f997d7841
--- /dev/null
+++ b/plugins/codex-usage-source/server/stores.ts
@@ -0,0 +1,131 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { z } from "zod";
+import { routeSchema } from "../shared/input.js";
+
+export interface StoreLookup {
+  home?: string;
+  env?: NodeJS.ProcessEnv;
+  platform?: NodeJS.Platform;
+  now?: () => number;
+  sqlite?: () => Sqlite | undefined;
+}
+interface Database {
+  prepare(sql: string): { all(...args: string[]): unknown[] };
+  close(): void;
+}
+export interface Sqlite {
+  DatabaseSync: new (path: string, options: { readOnly: boolean }) => Database;
+}
+export const oauthSchema = z.object({
+  access: z.string().min(1),
+  accountId: z.string().optional(),
+  expires: z.number().optional(),
+});
+const rowSchema = z.object({ id: z.number().int().positive(), data: z.string() });
+export type Route = z.infer<typeof routeSchema>;
+
+export async function readJson(path: string): Promise<unknown> {
+  try {
+    return JSON.parse(await readFile(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+export function piAuthPath(lookup: StoreLookup): string {
+  const home = lookup.home ?? homedir();
+  const env = lookup.env ?? process.env;
+  const configured = env.PI_CODING_AGENT_DIR?.trim();
+  if (!configured) return join(home, ".pi", "agent", "auth.json");
+  if (configured === "~") return join(home, "auth.json");
+  const directory = configured.startsWith("~/")
+    ? join(home, configured.slice(2))
+    : resolve(configured);
+  return join(directory, "auth.json");
+}
+
+function ompDatabasePath(lookup: StoreLookup): string {
+  const home = lookup.home ?? homedir();
+  const env = lookup.env ?? process.env;
+  const platform = lookup.platform ?? process.platform;
+  const profile = (env.OMP_PROFILE ?? env.PI_PROFILE)?.trim() || "default";
+  const base = join(home, env.PI_CONFIG_DIR || ".omp");
+  const configRoot = profile === "default" ? base : join(base, "profiles", profile);
+  const defaultAgentDir = join(configRoot, "agent");
+  const agentDir =
+    profile === "default" && env.PI_CODING_AGENT_DIR
+      ? resolve(env.PI_CODING_AGENT_DIR)
+      : defaultAgentDir;
+  if (
+    (platform === "linux" || platform === "darwin") &&
+    agentDir === defaultAgentDir &&
+    env.XDG_DATA_HOME
+  ) {
+    const xdgBase = join(env.XDG_DATA_HOME, "omp");
+    const xdgRoot = profile === "default" ? xdgBase : join(xdgBase, "profiles", profile);
+    if (existsSync(xdgRoot)) return join(xdgRoot, "agent.db");
+  }
+  return join(agentDir, "agent.db");
+}
+
+function builtinSqlite(): Sqlite | undefined {
+  // Node 20 must still compile/load the plugin; only OMP needs this newer builtin.
+  const parsed = z
+    .object({
+      DatabaseSync: z.custom<Sqlite["DatabaseSync"]>((value) => typeof value === "function"),
+    })
+    .safeParse(process.getBuiltinModule?.("node:sqlite"));
+  return parsed.success ? parsed.data : undefined;
+}
+
+function ompRows(path: string, lookup: StoreLookup) {
+  let db: Database | undefined;
+  try {
+    const sqlite = (lookup.sqlite ?? builtinSqlite)();
+    if (!sqlite) return [];
+    db = new sqlite.DatabaseSync(path, { readOnly: true });
+    const rows = db
+      .prepare(
+        "SELECT id, data FROM auth_credentials WHERE provider = ? AND credential_type = 'oauth' AND disabled_cause IS NULL ORDER BY id",
+      )
+      .all("openai-codex");
+    return rows.flatMap((value) => {
+      const row = rowSchema.safeParse(value);
+      if (!row.success) return [];
+      try {
+        const oauth = oauthSchema.parse(JSON.parse(row.data.data));
+        return [{ id: row.data.id, oauth }];
+      } catch {
+        return [];
+      }
+    });
+  } catch {
+    return [];
+  } finally {
+    db?.close();
+  }
+}
+
+export function discoverOmp(lookup: StoreLookup): Route[] {
+  const path = ompDatabasePath(lookup);
+  return ompRows(path, lookup).map(({ id }) => ({ store: "omp", path, credentialId: id }));
+}
+
+export function readOmp(route: Extract<Route, { store: "omp" }>, lookup: StoreLookup) {
+  return ompRows(route.path, lookup).find((row) => row.id === route.credentialId)?.oauth ?? null;
+}
+
+export async function readHarness(
+  route: Extract<Route, { path: string }>,
+  lookup: StoreLookup = {},
+) {
+  if (route.store === "omp") return readOmp(route, lookup);
+  const provider = route.store === "opencode" ? "openai" : "openai-codex";
+  const parsed = z.record(z.string(), z.unknown()).safeParse(await readJson(route.path));
+  if (!parsed.success) return null;
+  const oauth = oauthSchema.extend({ type: z.literal("oauth") }).safeParse(parsed.data[provider]);
+  return oauth.success ? oauth.data : null;
+}
diff --git a/plugins/codex-usage-source/server/usage.test.ts b/plugins/codex-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..4cdefa2bcd
--- /dev/null
+++ b/plugins/codex-usage-source/server/usage.test.ts
@@ -0,0 +1,467 @@
+import { UsageSourceRegistry } from "../../../packages/server/src/server/plugins/usage-sources/index.js";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { fetchUsage, discover } from "./usage.js";
+
+import { inputSchema, type CodexUsageInput } from "../shared/input.js";
+
+function authInput(directory: string): CodexUsageInput {
+  return { route: { store: "codex", path: join(directory, "auth.json") } };
+}
+
+let fixtureHome: string;
+beforeEach(async () => {
+  fixtureHome = await mkdtemp(join(tmpdir(), "usage-codex-default-"));
+  process.env["CODEX_HOME"] = fixtureHome;
+  await writeAuth("fixture-supplied");
+});
+
+async function writeAuth(accessToken: string, accountId?: string) {
+  await writeFile(
+    join(fixtureHome, "auth.json"),
+    JSON.stringify({ tokens: { access_token: accessToken, account_id: accountId } }),
+  );
+}
+
+const originalHome = process.env["CODEX_HOME"];
+afterEach(async () => {
+  await rm(fixtureHome, { recursive: true, force: true });
+  if (originalHome === undefined) delete process.env["CODEX_HOME"];
+  else process.env["CODEX_HOME"] = originalHome;
+});
+
+function response(headers: HeadersInit, accountId?: string): Promise<Response> {
+  const request = new Headers(headers);
+  expect(request.get("Authorization")).toMatch(/^Bearer fixture-/);
+  expect(request.get("ChatGPT-Account-Id")).toBe(accountId ?? null);
+  return Promise.resolve(
+    new Response(
+      JSON.stringify({
+        plan_type: "plus",
+        rate_limit: {
+          primary_window: { used_percent: 30, limit_window_seconds: 18000, reset_at: 1700000000 },
+        },
+      }),
+      { status: 200 },
+    ),
+  );
+}
+
+test("explicit route reads Codex auth and preserves the usage request", async () => {
+  const home = await mkdtemp(join(tmpdir(), "usage-codex-"));
+  try {
+    process.env["CODEX_HOME"] = home;
+    await writeFile(
+      join(home, "auth.json"),
+      JSON.stringify({
+        tokens: { access_token: "fixture-default", account_id: "account-default" },
+      }),
+    );
+    const report = await fetchUsage(authInput(home), (_url, init) =>
+      response(init?.headers ?? {}, "account-default"),
+    );
+    expect(report).toMatchObject({
+      status: "available",
+      planLabel: "plus",
+      windows: [{ id: "five_hour", usedPct: 30 }],
+    });
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+});
+
+test("discovery input requires a route and rejects raw credentials", () => {
+  for (const input of [
+    { codexHome: "/unused" },
+    { accessToken: "unused" },
+    { accessToken: "unused", accountId: "unused" },
+  ]) {
+    expect(inputSchema.safeParse(input).success).toBe(false);
+  }
+  expect(() => inputSchema.parse({})).toThrow();
+});
+
+test("discovery returns a key when fetch finds Codex token credentials", async () => {
+  await writeAuth("fixture-supplied", "account-supplied");
+  await fetchUsage(authInput(fixtureHome), (_url, init) =>
+    response(init?.headers ?? {}, "account-supplied"),
+  );
+  expect(await accountFor(authInput(fixtureHome))).toEqual({ key: "account-supplied" });
+});
+
+test("coerces credit balance and marks a 96 percent window dangerous", async () => {
+  const report = await fetchUsage(
+    authInput(fixtureHome),
+    async () =>
+      new Response(
+        JSON.stringify({
+          rate_limit: {
+            primary_window: { used_percent: 12, limit_window_seconds: 18000 },
+            secondary_window: { used_percent: 96, limit_window_seconds: 604800 },
+          },
+          credits: { balance: "0" },
+        }),
+        { status: 200 },
+      ),
+  );
+  expect(report.windows).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({ id: "five_hour", tone: "ok" }),
+      expect.objectContaining({ id: "weekly", tone: "danger" }),
+    ]),
+  );
+  expect(report.balances).toEqual([
+    expect.objectContaining({ remaining: 0, unit: "credits", tone: "danger" }),
+  ]);
+});
+
+test("summarizes the session and weekly windows by default, not code review", async () => {
+  const report = await fetchUsage(
+    authInput(fixtureHome),
+    async () =>
+      new Response(
+        JSON.stringify({
+          rate_limit: {
+            primary_window: { used_percent: 12, limit_window_seconds: 18000 },
+            secondary_window: { used_percent: 40, limit_window_seconds: 604800 },
+          },
+          code_review_rate_limit: { primary_window: { used_percent: 5 } },
+        }),
+        { status: 200 },
+      ),
+  );
+  expect(report.windows.map((window) => [window.id, window.summary ?? false])).toEqual([
+    ["five_hour", true],
+    ["weekly", true],
+    ["code_review:unknown_primary", false],
+  ]);
+});
+
+test("HTML usage body is an error", async () => {
+  await expect(
+    fetchUsage(authInput(fixtureHome), async () => new Response("<html>Login</html>")),
+  ).rejects.toThrow("Codex usage API returned HTML");
+});
+
+test("401 leaves auth.json byte for byte unchanged and makes no refresh request", async () => {
+  const home = await mkdtemp(join(tmpdir(), "usage-codex-"));
+  try {
+    process.env["CODEX_HOME"] = home;
+    const authPath = join(home, "auth.json");
+    const before = JSON.stringify({
+      OPENAI_API_KEY: null,
+      tokens: {
+        id_token: "fixture-id",
+        access_token: "fixture-stale",
+        refresh_token: "fixture-refresh",
+        account_id: "fixture-account",
+      },
+      last_refresh: "2026-07-04T20:35:00Z",
+    });
+    await writeFile(authPath, before);
+    let calls = 0;
+    const report = await fetchUsage(authInput(home), async (url) => {
+      expect(String(url)).toBe("https://chatgpt.com/backend-api/wham/usage");
+      calls++;
+      return new Response(null, { status: 401 });
+    });
+    expect(report.status).toBe("unavailable");
+    expect(calls).toBe(1);
+    expect(await readFile(authPath, "utf8")).toBe(before);
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+});
+
+test("auth account claim survives token rotation", async () => {
+  const token = (suffix: string) =>
+    `header.${Buffer.from(JSON.stringify({ "https://api.openai.com/auth": { chatgpt_account_id: "work-id" }, suffix })).toString("base64url")}.signature`;
+  await writeAuth(token("first"));
+  expect(await accountFor(authInput(fixtureHome))).toEqual({ key: "work-id" });
+  await writeAuth(token("second"));
+  expect(await accountFor(authInput(fixtureHome))).toEqual({ key: "work-id" });
+  await writeAuth("opaque-token");
+  expect(await accountFor(authInput(fixtureHome))).toEqual({
+    key: expect.stringMatching(/^[a-f0-9]{64}$/),
+  });
+});
+
+test("discovery reads an email label from auth id_token when access token has no profile", async () => {
+  const home = await mkdtemp(join(tmpdir(), "usage-codex-label-"));
+  try {
+    process.env["CODEX_HOME"] = home;
+    const idToken = `header.${Buffer.from(JSON.stringify({ email: "id-owner@example.test" })).toString("base64url")}.signature`;
+    await writeFile(
+      join(home, "auth.json"),
+      JSON.stringify({
+        tokens: { account_id: "account-id", access_token: "opaque-token", id_token: idToken },
+      }),
+    );
+    expect(await accountFor(authInput(home))).toEqual({
+      key: "account-id",
+      label: "id-owner@example.test",
+    });
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+});
+
+test("discovers a Pi OAuth login independently of the CLI login", async () => {
+  const directory = await mkdtemp(join(tmpdir(), "usage-pi-discovery-"));
+  try {
+    await mkdir(join(directory, ".pi", "agent"), { recursive: true });
+    await writeFile(
+      join(directory, ".pi", "agent", "auth.json"),
+      JSON.stringify({
+        "openai-codex": { type: "oauth", access: "fixture-pi", accountId: "pi-account" },
+      }),
+    );
+    const inputs = await discover(
+      { kind: "global" },
+      { home: directory, env: {}, platform: "linux" },
+    );
+    expect(inputs.map((account) => account.input)).toContainEqual({
+      route: { store: "pi", path: join(directory, ".pi", "agent", "auth.json") },
+    });
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+async function accountFor(input: CodexUsageInput) {
+  const accounts = await discover(
+    { kind: "global" },
+    {
+      home: fixtureHome,
+      env: {
+        CODEX_HOME:
+          input.route.store === "codex"
+            ? (await import("node:path")).dirname(input.route.path)
+            : fixtureHome,
+      },
+      platform: "linux",
+    },
+  );
+  const account = accounts.find(
+    (candidate) => JSON.stringify(candidate.input) === JSON.stringify(input),
+  );
+  if (!account) throw new Error("Expected discovered login");
+  return { key: account.key, ...(account.label ? { label: account.label } : {}) };
+}
+
+test.each(["empty home", "unrelated files"])(
+  "discovers no Codex accounts in %s",
+  async (scenario) => {
+    const home = await mkdtemp(join(tmpdir(), "codex-no-login-"));
+    try {
+      if (scenario === "unrelated files") await writeFile(join(home, "unrelated.json"), "{}");
+      expect(await discover({ kind: "global" }, { home, env: {}, platform: "linux" })).toEqual([]);
+    } finally {
+      await rm(home, { recursive: true, force: true });
+    }
+  },
+);
+
+test.each([401, 403])("reports a Codex login rejected with HTTP %i", async (status) => {
+  expect(
+    await fetchUsage(authInput(fixtureHome), async () => new Response(null, { status })),
+  ).toEqual({ status: "unavailable", problem: { kind: "rejected", status, refreshedBy: "codex" } });
+});
+
+// Issue #4165: the primary slot contains the only weekly window.
+test("names a seven-day-only primary window from its reported duration", async () => {
+  const report = await fetchUsage(authInput(fixtureHome), async () =>
+    Response.json({
+      rate_limit: {
+        primary_window: { used_percent: 1, limit_window_seconds: 604800 },
+        secondary_window: null,
+      },
+    }),
+  );
+  expect(report).toMatchObject({
+    status: "available",
+    windows: [{ id: "weekly", label: "Weekly", shortLabel: "wk", usedPct: 1 }],
+  });
+});
+
+test("reports every named additional limit with its own duration identity", async () => {
+  const report = await fetchUsage(authInput(fixtureHome), async () =>
+    Response.json({
+      additional_rate_limits: [
+        {
+          limit_name: "GPT-5.3-Codex-Spark",
+          metered_feature: "codex_bengalfox",
+          rate_limit: {
+            primary_window: { used_percent: 0, limit_window_seconds: 18000 },
+            secondary_window: { used_percent: 0, limit_window_seconds: 604800 },
+          },
+        },
+        {
+          limit_name: "Another limit",
+          metered_feature: "another",
+          rate_limit: {
+            primary_window: { used_percent: 4, limit_window_seconds: 7200 },
+          },
+        },
+      ],
+    }),
+  );
+  expect(report).toMatchObject({
+    status: "available",
+    windows: [
+      {
+        id: "limit:codex_bengalfox:five_hour",
+        label: "GPT-5.3-Codex-Spark · 5-hour",
+        shortLabel: "GPT-5.3-Codex-Spark 5h",
+      },
+      {
+        id: "limit:codex_bengalfox:weekly",
+        label: "GPT-5.3-Codex-Spark · Weekly",
+        shortLabel: "GPT-5.3-Codex-Spark wk",
+      },
+      { id: "limit:another:7200s", label: "Another limit · 2-hour" },
+    ],
+  });
+});
+
+test("a weekly pin means weekly after the provider moves it between slots", async () => {
+  const { resolvePinnedUsage } = await import("../../../packages/app/src/usage/pinned.js");
+  const preferences = {
+    displayAs: "used" as const,
+    serverId: null,
+    pins: [{ sourceId: "codex", windowId: "weekly" }],
+  };
+  for (const primaryWeekly of [false, true]) {
+    const weekly = { used_percent: 11, limit_window_seconds: 604800 };
+    const report = await fetchUsage(authInput(fixtureHome), async () =>
+      Response.json({
+        rate_limit: {
+          primary_window: primaryWeekly ? weekly : { used_percent: 4, limit_window_seconds: 18000 },
+          secondary_window: primaryWeekly ? null : weekly,
+        },
+      }),
+    );
+    const entry = {
+      id: "codex:account",
+      sourceId: "codex",
+      sourceLabel: "Codex",
+      account: { key: "account" },
+      fetchedAt: "2026-10-02T00:00:00Z",
+      report,
+    };
+    expect(resolvePinnedUsage([entry], preferences)).toMatchObject([
+      { windows: [{ key: "codex:account/weekly", percentText: "11%", shortLabel: "wk" }] },
+    ]);
+    // The old slot ID is ambiguous: do not silently retarget a saved Session pin.
+    expect(
+      resolvePinnedUsage([entry], {
+        ...preferences,
+        pins: [{ sourceId: "codex", windowId: "session" }],
+      }),
+    ).toEqual([]);
+  }
+});
+
+test("unknown lengths and code review never get a duration from their slot", async () => {
+  const report = await fetchUsage(authInput(fixtureHome), async () =>
+    Response.json({
+      rate_limit: {
+        primary_window: { used_percent: 11 },
+        secondary_window: { used_percent: 22, limit_window_seconds: null },
+      },
+      code_review_rate_limit: {
+        primary_window: { used_percent: 3, limit_window_seconds: 604800 },
+        secondary_window: { used_percent: 4, limit_window_seconds: 18000 },
+      },
+    }),
+  );
+  expect(report).toMatchObject({
+    windows: [
+      { id: "unknown_primary", label: "Primary limit", shortLabel: "" },
+      { id: "unknown_secondary", label: "Secondary limit", shortLabel: "" },
+      { id: "code_review:weekly", label: "Code review · Weekly", shortLabel: "Code review wk" },
+      { id: "code_review:five_hour", label: "Code review · 5-hour", shortLabel: "Code review 5h" },
+    ],
+  });
+});
+
+test("session discovery isolates CODEX_HOME and excludes foreign routes", async () => {
+  const home = await mkdtemp(join(tmpdir(), "codex-session-scope-"));
+  try {
+    await writeFile(
+      join(home, "auth.json"),
+      JSON.stringify({ tokens: { access_token: "session-token", account_id: "session-account" } }),
+    );
+    const scope = {
+      kind: "session" as const,
+      provider: "codex",
+      env: { HOME: home, CODEX_HOME: home },
+    };
+    const accounts = await discover(scope, { home: "/unused-default-home", env: {} });
+    expect(accounts).toHaveLength(1);
+    expect(accounts[0]?.input).toEqual(authInput(home));
+    expect(
+      await discover({ ...scope, env: { ...scope.env, OPENAI_BASE_URL: "https://other.test" } }),
+    ).toEqual([]);
+    expect(await discover({ ...scope, provider: "claude" })).toEqual([]);
+    expect(
+      await discover({ ...scope, env: { HOME: home, CODEX_HOME: join(home, "missing") } }),
+    ).toEqual([]);
+  } finally {
+    await rm(home, { recursive: true, force: true });
+  }
+});
+
+test("#6155: real Codex and OpenCode stores share an account but keep agent failures separate", async () => {
+  await writeAuth("fixture-codex", "same-account");
+  const data = join(fixtureHome, "data");
+  await mkdir(join(data, "opencode"), { recursive: true });
+  await writeFile(
+    join(data, "opencode", "auth.json"),
+    JSON.stringify({
+      openai: { type: "oauth", access: "fixture-opencode", accountId: "same-account", expires: 0 },
+    }),
+  );
+  const env = { HOME: fixtureHome, CODEX_HOME: fixtureHome, XDG_DATA_HOME: data };
+  const lookup = { home: fixtureHome, env, platform: "linux" as const, now: () => 1_000 };
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => id === "agent",
+    usageSession: () => ({ provider: "codex", env, sessionKey: "launch" }),
+  });
+  registry.register({
+    id: "codex",
+    label: "Codex",
+    discover: (scope) => discover(scope, lookup),
+    fetch: (input) =>
+      fetchUsage(inputSchema.parse(input), async () => new Response(null, { status: 401 }), lookup),
+  });
+  const [host] = await registry.listReports();
+  expect(host?.loginErrors).toEqual([
+    {
+      harness: "Codex",
+      report: {
+        status: "unavailable",
+        problem: { kind: "rejected", status: 401, refreshedBy: "codex" },
+      },
+    },
+    {
+      harness: "OpenCode",
+      report: {
+        status: "unavailable",
+        problem: {
+          kind: "expired",
+          expiresAt: "1970-01-01T00:00:00.000Z",
+          refreshedBy: "opencode",
+        },
+      },
+    },
+  ]);
+  const [agent] = await registry.listReports({ agentId: "agent" });
+  expect(agent?.report).toEqual({
+    status: "unavailable",
+    problem: { kind: "rejected", status: 401, refreshedBy: "codex" },
+  });
+  expect(agent?.loginErrors).toEqual([host!.loginErrors![0]]);
+});
diff --git a/plugins/codex-usage-source/server/usage.ts b/plugins/codex-usage-source/server/usage.ts
new file mode 100644
index 0000000000..0b211726c6
--- /dev/null
+++ b/plugins/codex-usage-source/server/usage.ts
@@ -0,0 +1,302 @@
+import { discoverOmp, piAuthPath, readHarness, readJson, type StoreLookup } from "./stores.js";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import {
+  balanceToneFromRemaining,
+  hashAccountKey,
+  unavailable,
+  type UsageAccount,
+  type UsageScope,
+  toneFromUsedPct,
+  windowFromReportedDuration,
+  type UsageReport,
+  type UsageWindow,
+} from "@getpaseo/plugin/server/usage";
+import { z } from "zod";
+import type { CodexUsageInput } from "../shared/input.js";
+
+const authSchema = z.object({
+  tokens: z
+    .object({
+      access_token: z.string().optional(),
+      account_id: z.string().optional(),
+      id_token: z.string().optional(),
+    })
+    .optional(),
+});
+const number = z.coerce.number().finite();
+const windowSchema = z.object({
+  used_percent: number.optional(),
+  reset_at: number.optional(),
+  limit_window_seconds: number.nullish(),
+});
+const rateLimitSchema = z.object({
+  primary_window: windowSchema.nullish(),
+  secondary_window: windowSchema.nullish(),
+});
+const responseSchema = z.object({
+  plan_type: z.string().optional(),
+  email: z.string().optional(),
+  rate_limit: rateLimitSchema.nullish(),
+  additional_rate_limits: z
+    .array(
+      z.object({
+        limit_name: z.string().optional(),
+        metered_feature: z.string().optional(),
+        rate_limit: rateLimitSchema.nullish(),
+      }),
+    )
+    .nullish(),
+  code_review_rate_limit: rateLimitSchema.nullish(),
+  credits: z.object({ balance: number.optional() }).nullish(),
+});
+
+interface Auth {
+  token: string;
+  accountId?: string;
+  idToken?: string;
+  expires?: number;
+}
+
+export async function discover(
+  scope: UsageScope,
+  lookup: StoreLookup = {},
+): Promise<UsageAccount[]> {
+  if (scope.kind === "session")
+    lookup = {
+      ...lookup,
+      env: scope.env,
+      home: scope.env.HOME || scope.env.USERPROFILE || homedir(),
+    };
+  const candidates = scope.kind === "global" ? globalRoutes(lookup) : sessionRoutes(scope, lookup);
+  const present: UsageAccount[] = [];
+  for (const input of candidates) {
+    const auth = await readAuth(input, lookup);
+    if (auth)
+      present.push({ ...accountIdentity(auth, input), harness: harnessLabel(input), input });
+  }
+  return present;
+}
+
+function globalRoutes(lookup: StoreLookup): CodexUsageInput[] {
+  const env = lookup.env ?? process.env;
+  const home = lookup.home ?? homedir();
+  const paths = [
+    ...(env.CODEX_HOME ? [join(env.CODEX_HOME, "auth.json")] : []),
+    join(home, ".codex", "auth.json"),
+  ];
+  const candidates: CodexUsageInput[] = [...new Set(paths)].map((path) => ({
+    route: { store: "codex", path },
+  }));
+  candidates.push(
+    {
+      route: {
+        store: "opencode",
+        path: join(env.XDG_DATA_HOME || join(home, ".local", "share"), "opencode", "auth.json"),
+      },
+    },
+    { route: { store: "pi", path: piAuthPath(lookup) } },
+    ...discoverOmp(lookup).map((route) => ({ route })),
+  );
+  return candidates;
+}
+
+function sessionRoutes(
+  scope: Extract<UsageScope, { kind: "session" }>,
+  lookup: StoreLookup,
+): CodexUsageInput[] {
+  const env = scope.env;
+  const home = lookup.home ?? homedir();
+  if (scope.provider === "codex") {
+    if (env.OPENAI_BASE_URL) return [];
+    return [
+      {
+        route: { store: "codex", path: join(env.CODEX_HOME || join(home, ".codex"), "auth.json") },
+      },
+    ];
+  }
+  if (!scope.model?.startsWith("openai/")) return [];
+  if (scope.provider === "pi") return [{ route: { store: "pi", path: piAuthPath(lookup) } }];
+  if (scope.provider === "omp") return discoverOmp(lookup).map((route) => ({ route }));
+  if (scope.provider === "opencode")
+    return [
+      {
+        route: {
+          store: "opencode",
+          path: join(env.XDG_DATA_HOME || join(home, ".local", "share"), "opencode", "auth.json"),
+        },
+      },
+    ];
+  return [];
+}
+
+export async function readAuth(
+  input: CodexUsageInput,
+  lookup: StoreLookup = {},
+): Promise<Auth | null> {
+  const route = input.route;
+  if (route.store !== "codex") {
+    const oauth = await readHarness(route, lookup);
+    return oauth
+      ? { token: oauth.access, accountId: oauth.accountId, expires: oauth.expires }
+      : null;
+  }
+  const auth = authSchema.safeParse(await readJson(route.path));
+  if (!auth.success || !auth.data.tokens?.access_token) return null;
+  return {
+    token: auth.data.tokens.access_token,
+    accountId: auth.data.tokens.account_id,
+    idToken: auth.data.tokens.id_token,
+  };
+}
+
+function usageWindows({
+  rateLimit,
+  scope,
+  summary = false,
+}: {
+  rateLimit: z.infer<typeof rateLimitSchema> | null | undefined;
+  scope?: { id: string; label: string };
+  summary?: boolean;
+}): UsageWindow[] {
+  if (!rateLimit) return [];
+  return (["primary_window", "secondary_window"] as const).flatMap((slot) => {
+    const value = rateLimit[slot];
+    if (!value) return [];
+    const primary = slot === "primary_window";
+    // Codex does not always report a length. A slot is then only an unknown limit,
+    // never evidence of a five-hour or weekly period.
+    return [
+      windowFromReportedDuration({
+        durationSeconds: value.limit_window_seconds ?? null,
+        unknown: {
+          id: primary ? "unknown_primary" : "unknown_secondary",
+          label: primary ? "Primary limit" : "Secondary limit",
+          shortLabel: "",
+        },
+        scope,
+        summary,
+        utilizationPct: value.used_percent,
+        resetsAt: value.reset_at != null ? new Date(value.reset_at * 1000).toISOString() : null,
+        tone: toneFromUsedPct(value.used_percent),
+      }),
+    ];
+  });
+}
+
+export async function fetchUsage(
+  input: CodexUsageInput,
+  fetchApi: typeof fetch = fetch,
+  lookup: StoreLookup = {},
+): Promise<UsageReport> {
+  const auth = await readAuth(input, lookup);
+  if (!auth) throw new Error("Codex login store no longer exists");
+  const refreshedBy = input.route.store;
+  if (auth.expires !== undefined && auth.expires <= (lookup.now ?? Date.now)())
+    return unavailable({
+      kind: "expired",
+      expiresAt: new Date(auth.expires).toISOString(),
+      refreshedBy,
+    });
+  const headers: Record<string, string> = {
+    Authorization: `Bearer ${auth.token}`,
+    Accept: "application/json",
+    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)",
+  };
+  if (auth.accountId) headers["ChatGPT-Account-Id"] = auth.accountId;
+  const response = await fetchApi("https://chatgpt.com/backend-api/wham/usage", {
+    headers,
+    signal: AbortSignal.timeout(15_000),
+  });
+  if (response.status === 401 || response.status === 403)
+    return unavailable({ kind: "rejected", status: response.status, refreshedBy });
+  if (!response.ok) throw new Error(`Codex usage API returned ${response.status}`);
+  const text = await response.text();
+  if (text.trim().startsWith("<")) throw new Error("Codex usage API returned HTML");
+  const usage = responseSchema.parse(JSON.parse(text));
+  const windows = [
+    ...usageWindows({ rateLimit: usage.rate_limit, summary: true }),
+    ...(usage.additional_rate_limits ?? []).flatMap((limit) => {
+      const identity = limit.metered_feature || limit.limit_name;
+      if (!identity) return []; // An unnamed limit has no stable quota identity.
+      return usageWindows({
+        rateLimit: limit.rate_limit,
+        scope: {
+          id: `limit:${encodeURIComponent(identity)}`,
+          label: limit.limit_name || identity,
+        },
+      });
+    }),
+    ...usageWindows({
+      rateLimit: usage.code_review_rate_limit,
+      scope: { id: "code_review", label: "Code review" },
+    }),
+  ];
+  const balance = usage.credits?.balance;
+  return {
+    status: "available",
+    planLabel: usage.plan_type,
+    windows,
+    balances:
+      balance === undefined
+        ? []
+        : [
+            {
+              id: "credits",
+              label: "Credits",
+              remaining: balance,
+              unit: "credits",
+              tone: balanceToneFromRemaining(balance),
+            },
+          ],
+    details: [],
+  };
+}
+
+/** JWT claims are decoded locally; no token or email becomes an account key. */
+function jwtClaims(token: string | undefined): Record<string, unknown> | null {
+  try {
+    const payload = token?.split(".")[1];
+    return payload
+      ? (JSON.parse(Buffer.from(payload, "base64url").toString("utf8")) as Record<string, unknown>)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function claimObject(
+  claims: Record<string, unknown> | null,
+  name: string,
+): Record<string, unknown> | null {
+  const value = claims?.[name];
+  return value && typeof value === "object" ? (value as Record<string, unknown>) : null;
+}
+
+function claimString(value: unknown): string | null {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+
+function accountIdentity(auth: Auth, input: CodexUsageInput): { key: string; label?: string } {
+  const access = jwtClaims(auth.token);
+  const id = jwtClaims(auth.idToken);
+  const accessAuth = claimObject(access, "https://api.openai.com/auth");
+  const idAuth = claimObject(id, "https://api.openai.com/auth");
+  const key =
+    auth.accountId ??
+    claimString(accessAuth?.["chatgpt_account_id"]) ??
+    claimString(access?.["chatgpt_account_id"]) ??
+    claimString(idAuth?.["chatgpt_account_id"]);
+
+  const label =
+    claimString(claimObject(access, "https://api.openai.com/profile")?.["email"]) ??
+    claimString(access?.["email"]) ??
+    claimString(claimObject(id, "https://api.openai.com/profile")?.["email"]) ??
+    claimString(id?.["email"]);
+  return { key: key ?? hashAccountKey(JSON.stringify(input.route)), ...(label ? { label } : {}) };
+}
+
+function harnessLabel(input: CodexUsageInput): string {
+  const labels = { codex: "Codex", opencode: "OpenCode", pi: "Pi", omp: "OMP" };
+  return labels[input.route.store];
+}
diff --git a/plugins/codex-usage-source/shared/input.ts b/plugins/codex-usage-source/shared/input.ts
new file mode 100644
index 0000000000..864af1c194
--- /dev/null
+++ b/plugins/codex-usage-source/shared/input.ts
@@ -0,0 +1,14 @@
+import { z } from "zod";
+
+export const routeSchema = z.discriminatedUnion("store", [
+  z.object({ store: z.enum(["codex", "opencode", "pi"]), path: z.string().min(1) }).strict(),
+  z
+    .object({
+      store: z.literal("omp"),
+      path: z.string().min(1),
+      credentialId: z.number().int().positive(),
+    })
+    .strict(),
+]);
+export const inputSchema = z.object({ route: routeSchema }).strict();
+export type CodexUsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/copilot-usage-source/icon.svg b/plugins/copilot-usage-source/icon.svg
new file mode 100644
index 0000000000..7bbea5de3a
--- /dev/null
+++ b/plugins/copilot-usage-source/icon.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416" fill="currentColor"><path d="M181.33 266.143c0-11.497 9.32-20.818 20.818-20.818 11.498 0 20.819 9.321 20.819 20.818v38.373c0 11.497-9.321 20.818-20.819 20.818-11.497 0-20.818-9.32-20.818-20.818v-38.373zM308.807 245.325c-11.477 0-20.798 9.321-20.798 20.818v38.373c0 11.497 9.32 20.818 20.798 20.818 11.497 0 20.818-9.32 20.818-20.818v-38.373c0-11.497-9.32-20.818-20.818-20.818z"
+        fill-rule="nonzero"/><path d="M512.002 246.393v57.384c-.02 7.411-3.696 14.638-9.67 19.011C431.767 374.444 344.695 416 256 416c-98.138 0-196.379-56.542-246.33-93.21-5.975-4.374-9.65-11.6-9.671-19.012v-57.384a35.347 35.347 0 016.857-20.922l15.583-21.085c8.336-11.312 20.757-14.31 33.98-14.31 4.988-56.953 16.794-97.604 45.024-127.354C155.194 5.77 226.56 0 256 0c29.441 0 100.807 5.77 154.557 62.722 28.19 29.75 40.036 70.401 45.025 127.354 13.263 0 25.602 2.936 33.958 14.31l15.583 21.127c4.476 6.077 6.878 13.345 6.878 20.88zm-97.666-26.075c-.677-13.058-11.292-18.19-22.338-21.824-11.64 7.309-25.848 10.183-39.46 10.183-14.454 0-41.432-3.47-63.872-25.869-5.667-5.625-9.527-14.454-12.155-24.247a212.902 212.902 0 00-20.469-1.088c-6.098 0-13.099.349-20.551 1.088-2.628 9.793-6.509 18.622-12.155 24.247-22.4 22.4-49.418 25.87-63.872 25.87-13.612 0-27.86-2.855-39.501-10.184-11.005 3.613-21.558 8.828-22.277 21.824-1.17 24.555-1.272 49.11-1.375 73.645-.041 12.318-.082 24.658-.288 36.976.062 7.166 4.374 13.818 10.882 16.774 52.97 24.124 103.045 36.278 149.137 36.278 46.01 0 96.085-12.154 149.014-36.278 6.508-2.956 10.84-9.608 10.881-16.774.637-36.832.124-73.809-1.642-110.62h.041zM107.521 168.97c8.643 8.623 24.966 14.392 42.56 14.392 13.448 0 39.03-2.874 60.156-24.329 9.28-8.951 15.05-31.35 14.413-54.079-.657-18.231-5.769-33.28-13.448-39.665-8.315-7.371-27.203-10.574-48.33-8.644-22.399 2.238-41.267 9.588-50.875 19.833-20.798 22.728-16.323 80.317-4.476 92.492zm130.556-56.008c.637 3.51.965 7.35 1.273 11.517 0 2.875 0 5.77-.308 8.952 6.406-.636 11.847-.636 16.959-.636s10.553 0 16.959.636c-.329-3.182-.329-6.077-.329-8.952.329-4.167.657-8.007 1.294-11.517-6.735-.637-12.812-.965-17.924-.965s-11.21.328-17.924.965zm49.275-8.008c-.637 22.728 5.133 45.128 14.413 54.08 21.105 21.454 46.708 24.328 60.155 24.328 17.596 0 33.918-5.769 42.561-14.392 11.847-12.175 16.322-69.764-4.476-92.492-9.608-10.245-28.476-17.595-50.875-19.833-21.127-1.93-40.015 1.273-48.33 8.644-7.679 6.385-12.791 21.434-13.448 39.665z"/></svg>
diff --git a/plugins/copilot-usage-source/index.server.ts b/plugins/copilot-usage-source/index.server.ts
new file mode 100644
index 0000000000..d5e965d759
--- /dev/null
+++ b/plugins/copilot-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "copilot",
+    label: "GitHub Copilot",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/copilot-usage-source/paseo-plugin.json b/plugins/copilot-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..ab6addf629
--- /dev/null
+++ b/plugins/copilot-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "copilot-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/copilot-usage-source/server/usage.test.ts b/plugins/copilot-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..8333f28828
--- /dev/null
+++ b/plugins/copilot-usage-source/server/usage.test.ts
@@ -0,0 +1,173 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("copilot usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "copilot",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Copilot usage from COPILOT_TOKEN", async () => {
+    process.env["COPILOT_TOKEN"] = "copilot_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.github.com/copilot_internal/user",
+          () =>
+            jsonResponse({
+              copilot_plan: "business",
+              quota_reset_date: "2026-07-01T00:00:00Z",
+            }),
+        ],
+      ]),
+    );
+
+    const copilot = findProvider(await service().listUsage(), "copilot");
+
+    expect(copilot).toMatchObject({
+      status: "available",
+      planLabel: "business",
+      details: [{ id: "reset", label: "Quota reset", value: "2026-07-01T00:00:00Z" }],
+    });
+  });
+});
+
+it("discovery returns a locator when fetch finds copilot credentials", async () => {
+  const previous = process.env["COPILOT_TOKEN"];
+  try {
+    process.env["COPILOT_TOKEN"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "COPILOT_TOKEN" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["COPILOT_TOKEN"];
+    else process.env["COPILOT_TOKEN"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["COPILOT_TOKEN"];
+  try {
+    process.env["COPILOT_TOKEN"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "COPILOT_TOKEN" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["COPILOT_TOKEN"];
+    else process.env["COPILOT_TOKEN"] = previous;
+  }
+});
diff --git a/plugins/copilot-usage-source/server/usage.ts b/plugins/copilot-usage-source/server/usage.ts
new file mode 100644
index 0000000000..78ae61bc9f
--- /dev/null
+++ b/plugins/copilot-usage-source/server/usage.ts
@@ -0,0 +1,82 @@
+import type { UsageInput } from "../shared/input.js";
+import { promises as fs } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  unavailable,
+  type UsageAccount,
+  type UsageReport,
+  type UsageDetail,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiOptionalStringSchema = z.preprocess(
+  (value) => (value == null ? undefined : value),
+  z.coerce.string().optional(),
+);
+
+const CopilotUsageResponseSchema = z.object({
+  copilot_plan: ApiOptionalStringSchema,
+  quota_reset_date: ApiOptionalStringSchema,
+});
+
+async function readToken(input: UsageInput): Promise<string | undefined> {
+  if (input.store === "env") return process.env[input.locator];
+  try {
+    const raw = await fs.readFile(input.locator, "utf8");
+    return raw.match(/oauth_token:\s*["']?([a-zA-Z0-9_-]+)["']?/)?.[1];
+  } catch {
+    return undefined;
+  }
+}
+
+export async function discover(): Promise<UsageAccount[]> {
+  const candidates: UsageInput[] = ["COPILOT_TOKEN", "GITHUB_TOKEN", "GITHUB_PAT"].map(
+    (locator) => ({ store: "env", locator }),
+  );
+  if (process.env.APPDATA)
+    candidates.push({
+      store: "file",
+      locator: join(process.env.APPDATA, "GitHub CLI", "hosts.yml"),
+    });
+  candidates.push({ store: "file", locator: join(homedir(), ".config", "gh", "hosts.yml") });
+  for (const input of candidates) if (await readToken(input)) return [{ key: "default", input }];
+  return [];
+}
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const token = await readToken(input);
+  if (!token) throw new Error("Copilot login store no longer exists");
+
+  const res = await fetchApi("https://api.github.com/copilot_internal/user", {
+    signal: AbortSignal.timeout(15_000),
+    headers: {
+      Authorization: `token ${token}`,
+      Accept: "application/json",
+      "Editor-Version": "vscode/1.96.2",
+      "Editor-Plugin-Version": "copilot-chat/0.26.7",
+      "User-Agent": "GitHubCopilotChat/0.26.7",
+      "X-Github-Api-Version": "2025-04-01",
+    },
+  });
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`Copilot usage API returned ${res.status}`);
+
+  const resp = CopilotUsageResponseSchema.parse(await res.json());
+  const details: UsageDetail[] = resp.quota_reset_date
+    ? [{ id: "reset", label: "Quota reset", value: resp.quota_reset_date }]
+    : [];
+
+  return {
+    status: "available",
+    planLabel: resp.copilot_plan || undefined,
+    windows: [],
+    balances: [],
+    details,
+  };
+}
diff --git a/plugins/copilot-usage-source/shared/input.ts b/plugins/copilot-usage-source/shared/input.ts
new file mode 100644
index 0000000000..4be5cce316
--- /dev/null
+++ b/plugins/copilot-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.enum(["env", "file"]),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/cursor-usage-source/icon.svg b/plugins/cursor-usage-source/icon.svg
new file mode 100644
index 0000000000..4ca0c2501b
--- /dev/null
+++ b/plugins/cursor-usage-source/icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 466.73 532.09">
+  <path fill="currentColor" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>
+</svg>
diff --git a/plugins/cursor-usage-source/index.server.ts b/plugins/cursor-usage-source/index.server.ts
new file mode 100644
index 0000000000..5b19939833
--- /dev/null
+++ b/plugins/cursor-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "cursor",
+    label: "Cursor",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/cursor-usage-source/paseo-plugin.json b/plugins/cursor-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..311fd28ee4
--- /dev/null
+++ b/plugins/cursor-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "cursor-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/cursor-usage-source/server/usage.test.ts b/plugins/cursor-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..21cca3b192
--- /dev/null
+++ b/plugins/cursor-usage-source/server/usage.test.ts
@@ -0,0 +1,319 @@
+import { mkdirSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { createRequire } from "node:module";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+// node:sqlite has no @types/node@20 typings; require it with a narrow local type.
+const testRequire = createRequire(import.meta.url);
+interface TestSqliteDb {
+  exec(sql: string): void;
+  prepare(sql: string): { run(...params: unknown[]): void };
+  close(): void;
+}
+
+// Cursor builds have stored ItemTable values as both TEXT and BLOB. Keys map to the
+// real layouts: a plain modern token or the legacy JSON object.
+function writeCursorStateDb(homeDir: string, rows: Record<string, string | Uint8Array>): void {
+  const dir = join(homeDir, ".config", "Cursor", "User", "globalStorage");
+  mkdirSync(dir, { recursive: true });
+  const { DatabaseSync } = testRequire("node:sqlite") as {
+    DatabaseSync: new (path: string) => TestSqliteDb;
+  };
+  const db = new DatabaseSync(join(dir, "state.vscdb"));
+  db.exec("CREATE TABLE IF NOT EXISTS ItemTable (key TEXT UNIQUE ON CONFLICT REPLACE, value BLOB)");
+  const insert = db.prepare("INSERT INTO ItemTable (key, value) VALUES (?, ?)");
+  for (const [key, value] of Object.entries(rows)) {
+    insert.run(key, value);
+  }
+  db.close();
+}
+
+function writeCursorAuthJson(homeDir: string, accessToken: string): void {
+  const dir = join(homeDir, ".config", "cursor");
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(join(dir, "auth.json"), JSON.stringify({ accessToken }));
+}
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("cursor usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "cursor",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Cursor usage and normalizes malformed billing dates to null", async () => {
+    process.env["CURSOR_ACCESS_TOKEN"] = "cursor_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage",
+          () =>
+            jsonResponse({
+              planUsage: {
+                totalSpend: "1500",
+                includedSpend: "1000",
+                bonusSpend: "500",
+                remaining: "2500",
+                limit: "4000",
+              },
+              billingCycleStart: "2026-01-14T12:42:14.000Z",
+              billingCycleEnd: "not-a-date",
+            }),
+        ],
+      ]),
+    );
+
+    const cursor = findProvider(await service().listUsage(), "cursor");
+
+    expect(cursor).toMatchObject({
+      status: "available",
+      balances: [
+        expect.objectContaining({
+          id: "plan_usage",
+          used: 15,
+          remaining: 25,
+          limit: 40,
+          resetsAt: null,
+        }),
+      ],
+    });
+  });
+
+  it("reads the Cursor token from the modern cursorAuth/accessToken key in state.vscdb", async () => {
+    writeCursorStateDb(homeDir, { "cursorAuth/accessToken": "cursor_state_jwt" });
+    let authorization: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        planUsage: {
+          totalSpend: "1500",
+          includedSpend: "1000",
+          bonusSpend: "500",
+          remaining: "2500",
+          limit: "4000",
+        },
+        billingCycleStart: "2026-01-14T12:42:14.000Z",
+        billingCycleEnd: "2026-02-14T12:42:14.000Z",
+      });
+    }) as unknown as typeof fetch;
+
+    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
+
+    expect(authorization).toBe("Bearer cursor_state_jwt");
+    expect(cursor).toMatchObject({
+      status: "available",
+      balances: [expect.objectContaining({ id: "plan_usage", used: 15, remaining: 25, limit: 40 })],
+    });
+  });
+
+  it("falls back to the legacy cursorAuthStatus JSON blob when the modern key is absent", async () => {
+    writeCursorStateDb(homeDir, {
+      cursorAuthStatus: Buffer.from(JSON.stringify({ accessToken: "cursor_legacy_jwt" }), "utf8"),
+    });
+    let authorization: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        planUsage: { totalSpend: "0", remaining: "100", limit: "100" },
+        billingCycleStart: null,
+        billingCycleEnd: null,
+      });
+    }) as unknown as typeof fetch;
+
+    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
+
+    expect(authorization).toBe("Bearer cursor_legacy_jwt");
+    expect(cursor.status).toBe("available");
+  });
+
+  it("reads the Cursor token from cursor-agent ~/.config/cursor/auth.json when desktop state is absent", async () => {
+    writeCursorAuthJson(homeDir, "cursor_cli_jwt");
+    let authorization: string | null = null;
+    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        planUsage: {
+          totalSpend: "1500",
+          includedSpend: "1000",
+          bonusSpend: "500",
+          remaining: "2500",
+          limit: "4000",
+        },
+        billingCycleStart: "2026-01-14T12:42:14.000Z",
+        billingCycleEnd: "2026-02-14T12:42:14.000Z",
+      });
+    }) as unknown as typeof fetch;
+
+    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
+
+    expect(authorization).toBe("Bearer cursor_cli_jwt");
+    expect(cursor).toMatchObject({
+      status: "available",
+      balances: [expect.objectContaining({ id: "plan_usage", used: 15, remaining: 25, limit: 40 })],
+    });
+  });
+
+  it("prefers the desktop state.vscdb token over cursor-agent auth.json", async () => {
+    writeCursorStateDb(homeDir, { "cursorAuth/accessToken": "cursor_desktop_jwt" });
+    writeCursorAuthJson(homeDir, "cursor_cli_jwt");
+    let authorization: string | null = null;
+    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        planUsage: { totalSpend: "0", remaining: "100", limit: "100" },
+        billingCycleStart: null,
+        billingCycleEnd: null,
+      });
+    }) as unknown as typeof fetch;
+
+    const cursor = findProvider(await service({ cursorHomeDir: homeDir }).listUsage(), "cursor");
+
+    expect(authorization).toBe("Bearer cursor_desktop_jwt");
+    expect(cursor.status).toBe("available");
+  });
+
+  it("omits unreadable state.vscdb", async () => {
+    const directory = join(homeDir, ".config", "Cursor", "User", "globalStorage");
+    mkdirSync(directory, { recursive: true });
+    writeFileSync(join(directory, "state.vscdb"), "invalid database");
+    expect(await discover()).toEqual([]);
+  });
+});
+
+it("discovery returns a locator when fetch finds cursor credentials", async () => {
+  const previous = process.env["CURSOR_ACCESS_TOKEN"];
+  try {
+    process.env["CURSOR_ACCESS_TOKEN"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "CURSOR_ACCESS_TOKEN" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["CURSOR_ACCESS_TOKEN"];
+    else process.env["CURSOR_ACCESS_TOKEN"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["CURSOR_ACCESS_TOKEN"];
+  try {
+    process.env["CURSOR_ACCESS_TOKEN"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "CURSOR_ACCESS_TOKEN" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["CURSOR_ACCESS_TOKEN"];
+    else process.env["CURSOR_ACCESS_TOKEN"] = previous;
+  }
+});
diff --git a/plugins/cursor-usage-source/server/usage.ts b/plugins/cursor-usage-source/server/usage.ts
new file mode 100644
index 0000000000..d313b1d739
--- /dev/null
+++ b/plugins/cursor-usage-source/server/usage.ts
@@ -0,0 +1,240 @@
+import type { UsageInput } from "../shared/input.js";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  toneFromUsedPct,
+  usedPctOf,
+  unavailable,
+  type UsageAccount,
+  type UsageReport,
+  type UsageBalance,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiNumberSchema = z.coerce.number().finite();
+const ApiNullableNumberSchema = z.preprocess(
+  (value) => (value == null ? null : value),
+  ApiNumberSchema.nullable(),
+);
+function toIsoStringOrNull(timestampMs: number): string | null {
+  const date = new Date(timestampMs);
+  return Number.isFinite(date.getTime()) ? date.toISOString() : null;
+}
+
+// Cursor desktop stores auth in VS Code's ItemTable (state.vscdb). Modern builds keep
+// the access token as a plain JWT string under `cursorAuth/accessToken`; older builds
+// kept a JSON blob under `cursorAuthStatus`. Read it with node:sqlite so we don't
+// depend on a `sqlite3` CLI, which isn't installed by default on Windows (or on many
+// Linux hosts) — a missing binary silently rendered Cursor usage unavailable.
+// Headless hosts (VPS, cursor-agent only) have no desktop db; their session lives in
+// ~/.config/cursor/auth.json instead.
+const CURSOR_ACCESS_TOKEN_KEY = "cursorAuth/accessToken";
+const CURSOR_LEGACY_AUTH_KEY = "cursorAuthStatus";
+
+// @types/node@20 predates the node:sqlite typings; declare the slice we use.
+interface CursorStateStatement {
+  get(...params: unknown[]): Record<string, unknown> | undefined;
+}
+interface CursorStateDatabase {
+  prepare(sql: string): CursorStateStatement;
+  close(): void;
+}
+interface NodeSqliteModule {
+  DatabaseSync: new (path: string, options?: { readOnly?: boolean }) => CursorStateDatabase;
+}
+
+const CursorBillingCycleTimestampSchema = z.preprocess(
+  (value) => (typeof value === "string" || typeof value === "number" ? value : null),
+  z.union([z.string(), z.number()]).nullable(),
+);
+
+const CursorUsageResponseSchema = z.object({
+  planUsage: z
+    .object({
+      totalSpend: ApiNullableNumberSchema,
+      includedSpend: ApiNullableNumberSchema,
+      bonusSpend: ApiNullableNumberSchema,
+      remaining: ApiNullableNumberSchema,
+      limit: ApiNullableNumberSchema,
+    })
+    .nullish(),
+  billingCycleStart: CursorBillingCycleTimestampSchema,
+  billingCycleEnd: CursorBillingCycleTimestampSchema,
+});
+
+const CursorAuthStatusSchema = z.object({
+  accessToken: z.string().optional(),
+});
+
+type CursorUsageResponse = z.infer<typeof CursorUsageResponseSchema>;
+
+function parseCursorBillingCycleTimestamp(
+  value: CursorUsageResponse["billingCycleStart"],
+): string | null {
+  if (value === null) return null;
+
+  const raw = String(value).trim();
+  if (!raw) return null;
+
+  const numeric = Number(raw);
+  if (Number.isFinite(numeric)) {
+    const timestampMs = Math.abs(numeric) < 10_000_000_000 ? numeric * 1000 : numeric;
+    return toIsoStringOrNull(timestampMs);
+  }
+
+  return toIsoStringOrNull(new Date(raw).getTime());
+}
+
+function centsToDollars(value: number | null): number | null {
+  return value === null ? null : value / 100;
+}
+
+function readItemTableValue(db: CursorStateDatabase, key: string): string | null {
+  const row = db.prepare("SELECT value FROM ItemTable WHERE key = ?").get(key);
+  const value = row?.["value"];
+  if (typeof value === "string") return value;
+  if (value instanceof Uint8Array) return Buffer.from(value).toString("utf8");
+  return null;
+}
+
+function cursorTokenFromDb(db: CursorStateDatabase): string | null {
+  const modern = readItemTableValue(db, CURSOR_ACCESS_TOKEN_KEY)?.trim();
+  if (modern) return modern;
+
+  const legacy = readItemTableValue(db, CURSOR_LEGACY_AUTH_KEY);
+  if (legacy) {
+    try {
+      const parsed = CursorAuthStatusSchema.parse(JSON.parse(legacy));
+      if (parsed.accessToken) return parsed.accessToken;
+    } catch {
+      // ignore a malformed legacy blob
+    }
+  }
+  return null;
+}
+
+async function readCursorTokenFromSqlite(path: string): Promise<string | null> {
+  // Held in a variable so TypeScript skips module resolution: @types/node@20 has no
+  // node:sqlite typings yet, while the runtime (Node 22+ / Electron) provides it.
+  const sqliteSpecifier: string = "node:sqlite";
+  let sqlite: NodeSqliteModule;
+  try {
+    sqlite = (await import(sqliteSpecifier)) as unknown as NodeSqliteModule;
+  } catch {
+    return null; // runtime without node:sqlite
+  }
+
+  if (!existsSync(path)) return null;
+  let db: CursorStateDatabase | undefined;
+  try {
+    db = new sqlite.DatabaseSync(path, { readOnly: true });
+    return cursorTokenFromDb(db);
+  } catch {
+    return null;
+  } finally {
+    db?.close();
+  }
+}
+
+async function readCursorTokenFromAuthJson(path: string): Promise<string | null> {
+  if (!existsSync(path)) return null;
+  try {
+    const parsed = CursorAuthStatusSchema.parse(JSON.parse(await readFile(path, "utf8")));
+    return parsed.accessToken?.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const token = await readToken(input);
+  if (!token) throw new Error("Cursor login store no longer exists");
+
+  const res = await fetchApi(
+    "https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage",
+    {
+      signal: AbortSignal.timeout(15_000),
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+        "Connect-Protocol-Version": "1",
+      },
+      body: JSON.stringify({}),
+    },
+  );
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`Cursor usage API returned ${res.status}`);
+
+  const resp = CursorUsageResponseSchema.parse(await res.json());
+  const billingCycleEnd = parseCursorBillingCycleTimestamp(resp.billingCycleEnd);
+  const balances: UsageBalance[] = [];
+  if (resp.planUsage) {
+    const totalSpend = centsToDollars(resp.planUsage.totalSpend);
+    const remaining = centsToDollars(resp.planUsage.remaining);
+    const limit = centsToDollars(resp.planUsage.limit);
+    balances.push({
+      id: "plan_usage",
+      label: "Plan usage",
+      used: totalSpend,
+      remaining,
+      limit,
+      unit: "usd",
+      resetsAt: billingCycleEnd,
+      tone: toneFromUsedPct(usedPctOf(totalSpend, limit)),
+    });
+  }
+
+  return {
+    status: "available",
+    planLabel: undefined,
+    windows: [],
+    balances,
+    details: [],
+  };
+}
+
+async function readToken(input: UsageInput): Promise<string | undefined> {
+  if (input.store === "env") return process.env[input.locator];
+  const token =
+    input.store === "sqlite"
+      ? await readCursorTokenFromSqlite(input.locator)
+      : await readCursorTokenFromAuthJson(input.locator);
+  return token ?? undefined;
+}
+export async function discover(): Promise<UsageAccount[]> {
+  const home = homedir();
+  const candidates: UsageInput[] = ["CURSOR_ACCESS_TOKEN", "CURSOR_TOKEN"].map((locator) => ({
+    store: "env",
+    locator,
+  }));
+  if (process.env.APPDATA)
+    candidates.push({
+      store: "sqlite",
+      locator: join(process.env.APPDATA, "Cursor", "User", "globalStorage", "state.vscdb"),
+    });
+  candidates.push(
+    ...[
+      join(
+        home,
+        "Library",
+        "Application Support",
+        "Cursor",
+        "User",
+        "globalStorage",
+        "state.vscdb",
+      ),
+      join(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb"),
+    ].map((locator) => ({ store: "sqlite" as const, locator })),
+    { store: "file", locator: join(home, ".config", "cursor", "auth.json") },
+  );
+  for (const input of candidates) if (await readToken(input)) return [{ key: "default", input }];
+  return [];
+}
diff --git a/plugins/cursor-usage-source/shared/input.ts b/plugins/cursor-usage-source/shared/input.ts
new file mode 100644
index 0000000000..016179eba1
--- /dev/null
+++ b/plugins/cursor-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.enum(["env", "file", "sqlite"]),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/grok-usage-source/icon.svg b/plugins/grok-usage-source/icon.svg
new file mode 100644
index 0000000000..6352f5e8e1
--- /dev/null
+++ b/plugins/grok-usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 8V4H8"/><rect width="16" height="12" x="4" y="8" rx="2"/><path d="M2 14h2M20 14h2M9 13v2M15 13v2"/></svg>
diff --git a/plugins/grok-usage-source/index.server.ts b/plugins/grok-usage-source/index.server.ts
new file mode 100644
index 0000000000..d3c37b9c15
--- /dev/null
+++ b/plugins/grok-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "grok",
+    label: "Grok",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/grok-usage-source/paseo-plugin.json b/plugins/grok-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..2fbdcc5f14
--- /dev/null
+++ b/plugins/grok-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "grok-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/grok-usage-source/server/usage.test.ts b/plugins/grok-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..8086b48176
--- /dev/null
+++ b/plugins/grok-usage-source/server/usage.test.ts
@@ -0,0 +1,371 @@
+import { mkdirSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+function writeGrokAuth(home: string, auth: Record<string, unknown>): void {
+  mkdirSync(join(home, ".grok"), { recursive: true });
+  writeFileSync(join(home, ".grok", "auth.json"), JSON.stringify(auth));
+}
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("grok usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "grok",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Grok usage and preserves zero values", async () => {
+    process.env["GROK_API_KEY"] = "grok_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
+          () =>
+            jsonResponse({
+              config: { monthlyLimit: { val: 0 }, used: { val: 0 } },
+            }),
+        ],
+      ]),
+    );
+
+    const grok = findProvider(await service().listUsage(), "grok");
+
+    expect(grok).toMatchObject({
+      status: "available",
+      balances: [
+        expect.objectContaining({
+          id: "monthly_credits",
+          used: 0,
+          remaining: 0,
+          limit: 0,
+        }),
+      ],
+    });
+  });
+
+  it("fetches Grok usage from live billing shape (config.used.val)", async () => {
+    process.env["GROK_API_KEY"] = "grok_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
+          () =>
+            jsonResponse({
+              config: {
+                monthlyLimit: { val: 150000 },
+                used: { val: 37886 },
+                billingPeriodStart: "2026-07-01T00:00:00+00:00",
+                billingPeriodEnd: "2026-08-01T00:00:00+00:00",
+              },
+            }),
+        ],
+      ]),
+    );
+
+    const grok = findProvider(await service().listUsage(), "grok");
+
+    expect(grok).toMatchObject({
+      status: "available",
+      balances: [
+        expect.objectContaining({
+          id: "monthly_credits",
+          used: 37886,
+          remaining: 112114,
+          limit: 150000,
+          unit: "credits",
+        }),
+      ],
+    });
+  });
+
+  it("fetches Grok usage with nested ~/.grok/auth.json key token", async () => {
+    writeGrokAuth(homeDir, {
+      "https://auth.x.ai::test-user-id": {
+        key: "nested_jwt_token",
+        refresh_token: "rt_nested",
+        expires_at: "2026-08-01T00:00:00Z",
+        user_id: "test-user-id",
+        email: "user@example.com",
+      },
+    });
+
+    let authorization: string | null = null;
+    fetchApi = (async (_url: RequestInfo | URL, init?: RequestInit) => {
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        config: {
+          monthlyLimit: { val: 100 },
+          used: { val: 25 },
+        },
+      });
+    }) as typeof fetch;
+
+    const grok = findProvider(await service().listUsage(), "grok");
+
+    expect(authorization).toBe("Bearer nested_jwt_token");
+    expect(grok).toMatchObject({
+      status: "available",
+      balances: [
+        expect.objectContaining({
+          id: "monthly_credits",
+          used: 25,
+          remaining: 75,
+          limit: 100,
+        }),
+      ],
+    });
+  });
+
+  it("still accepts legacy Grok usage.creditUsage when config.used is absent", async () => {
+    process.env["GROK_API_KEY"] = "grok_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
+          () =>
+            jsonResponse({
+              config: { monthlyLimit: { val: 50 } },
+              usage: { creditUsage: 10 },
+            }),
+        ],
+      ]),
+    );
+
+    const grok = findProvider(await service().listUsage(), "grok");
+
+    expect(grok).toMatchObject({
+      status: "available",
+      balances: [
+        expect.objectContaining({
+          id: "monthly_credits",
+          used: 10,
+          remaining: 40,
+          limit: 50,
+        }),
+      ],
+    });
+  });
+
+  it("fetches Grok unified-billing usage as a weekly window", async () => {
+    process.env["GROK_API_KEY"] = "grok_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://cli-chat-proxy.grok.com/v1/billing?format=credits",
+          () =>
+            jsonResponse({
+              config: {
+                currentPeriod: {
+                  type: "USAGE_PERIOD_TYPE_WEEKLY",
+                  start: "2026-08-24T09:41:40.001370+00:00",
+                  end: "2026-08-31T09:41:40.001370+00:00",
+                },
+                creditUsagePercent: 76.0,
+                isUnifiedBillingUser: true,
+                billingPeriodStart: "2026-08-24T09:41:40.001370+00:00",
+                billingPeriodEnd: "2026-08-31T09:41:40.001370+00:00",
+              },
+            }),
+        ],
+      ]),
+    );
+
+    const grok = findProvider(await service().listUsage(), "grok");
+
+    expect(grok).toMatchObject({
+      status: "available",
+      windows: [
+        {
+          id: "weekly",
+          label: "Weekly",
+          usedPct: 76,
+          remainingPct: 24,
+          resetsAt: "2026-08-31T09:41:40.001370+00:00",
+          tone: "warning",
+        },
+      ],
+      balances: [],
+    });
+  });
+});
+
+it("discovery returns a locator when fetch finds grok credentials", async () => {
+  const previous = process.env["GROK_TOKEN"];
+  try {
+    process.env["GROK_TOKEN"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "GROK_TOKEN" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["GROK_TOKEN"];
+    else process.env["GROK_TOKEN"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["GROK_TOKEN"];
+  try {
+    process.env["GROK_TOKEN"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "GROK_TOKEN" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["GROK_TOKEN"];
+    else process.env["GROK_TOKEN"] = previous;
+  }
+});
+
+it.each([undefined, "USAGE_PERIOD_TYPE_DAILY", "USAGE_PERIOD_TYPE_UNKNOWN_WEEKLY"])(
+  "does not invent a monthly period for %s",
+  async (type) => {
+    const directory = mkdtempSync(join(tmpdir(), "grok-period-"));
+    try {
+      const locator = join(directory, "auth.json");
+      writeFileSync(locator, JSON.stringify({ access_token: "fixture" }));
+      const report = await fetchUsage({ store: "file", locator }, async () =>
+        Response.json({ config: { creditUsagePercent: 11, currentPeriod: { type } } }),
+      );
+      expect(report).toMatchObject({
+        status: "available",
+        windows: [
+          {
+            id: type ? `period:${type}` : "period:unknown",
+            label: type ?? "Current period",
+            shortLabel: "",
+          },
+        ],
+      });
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  },
+);
+
+it("does not call credits monthly when no monthly limit was reported", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "grok-credits-"));
+  try {
+    const locator = join(directory, "auth.json");
+    writeFileSync(locator, JSON.stringify({ access_token: "fixture" }));
+    const report = await fetchUsage({ store: "file", locator }, async () =>
+      Response.json({ config: { used: { val: 11 } } }),
+    );
+    expect(report).toMatchObject({
+      status: "available",
+      balances: [{ id: "credits", label: "Credits", used: 11 }],
+    });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
diff --git a/plugins/grok-usage-source/server/usage.ts b/plugins/grok-usage-source/server/usage.ts
new file mode 100644
index 0000000000..5a57ca7ddd
--- /dev/null
+++ b/plugins/grok-usage-source/server/usage.ts
@@ -0,0 +1,168 @@
+import type { UsageInput } from "../shared/input.js";
+import { promises as fs } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  toneFromUsedPct,
+  usedPctOf,
+  unavailable,
+  type UsageAccount,
+  windowFromUsedPct,
+  type UsageReport,
+  type UsageWindow,
+  type UsageBalance,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiNumberSchema = z.coerce.number().finite();
+const ApiOptionalStringSchema = z.preprocess(
+  (value) => (value == null ? undefined : value),
+  z.coerce.string().optional(),
+);
+
+const GrokUsageResponseSchema = z.object({
+  config: z
+    .object({
+      monthlyLimit: z
+        .object({
+          val: ApiNumberSchema.optional(),
+        })
+        .nullish(),
+      used: z
+        .object({
+          val: ApiNumberSchema.optional(),
+        })
+        .nullish(),
+      creditUsagePercent: ApiNumberSchema.optional(),
+      currentPeriod: z
+        .object({
+          type: ApiOptionalStringSchema,
+          end: ApiOptionalStringSchema,
+        })
+        .nullish(),
+    })
+    .nullish(),
+  usage: z
+    .object({
+      creditUsage: ApiNumberSchema.optional(),
+    })
+    .nullish(),
+});
+
+/** Resolve a Grok CLI token from ~/.grok/auth.json (legacy or current nested shape). */
+export function extractGrokTokenFromAuth(auth: unknown): string | null {
+  if (auth == null || typeof auth !== "object" || Array.isArray(auth)) return null;
+  const record = auth as Record<string, unknown>;
+
+  const topLevel = record["access_token"];
+  if (typeof topLevel === "string" && topLevel.length > 0) {
+    return topLevel;
+  }
+
+  const entries = Object.entries(record);
+  const preferred = entries.filter(([key]) => key.startsWith("https://auth.x.ai::"));
+  const candidates = preferred.length > 0 ? preferred : entries;
+
+  for (const [, value] of candidates) {
+    if (value == null || typeof value !== "object" || Array.isArray(value)) continue;
+    const nestedKey = (value as Record<string, unknown>)["key"];
+    if (typeof nestedKey === "string" && nestedKey.length > 0) {
+      return nestedKey;
+    }
+  }
+
+  return null;
+}
+
+function grokCreditBalance(response: z.infer<typeof GrokUsageResponseSchema>): UsageBalance | null {
+  const limit = response.config?.monthlyLimit?.val ?? null;
+  const used = response.config?.used?.val ?? response.usage?.creditUsage ?? null;
+  if (limit === null && used === null) return null;
+  return {
+    // Only the named monthly allowance establishes a monthly credit bucket.
+    id: limit === null ? "credits" : "monthly_credits",
+    label: limit === null ? "Credits" : "Monthly credits",
+    used,
+    remaining: limit !== null && used !== null ? Math.max(0, limit - used) : null,
+    limit,
+    unit: "credits",
+    tone: toneFromUsedPct(usedPctOf(used, limit)),
+  };
+}
+
+function grokUsageWindow(response: z.infer<typeof GrokUsageResponseSchema>): UsageWindow | null {
+  const percent = response.config?.creditUsagePercent;
+  if (typeof percent !== "number") return null;
+  const period = response.config?.currentPeriod;
+  const names = {
+    USAGE_PERIOD_TYPE_WEEKLY: { id: "weekly", label: "Weekly", shortLabel: "wk" },
+    USAGE_PERIOD_TYPE_MONTHLY: { id: "monthly", label: "Monthly", shortLabel: "mo" },
+  };
+  // An absent or unfamiliar enum does not establish a monthly duration.
+  const name = names[period?.type as keyof typeof names] ?? {
+    id: `period:${period?.type || "unknown"}`,
+    label: period?.type || "Current period",
+    shortLabel: "",
+  };
+  return windowFromUsedPct({
+    ...name,
+    utilizationPct: percent,
+    resetsAt: period?.end ?? null,
+    tone: toneFromUsedPct(percent),
+  });
+}
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const token = await readToken(input);
+  if (!token) throw new Error("Grok login store no longer exists");
+
+  // The Grok CLI's /usage uses ?format=credits; without it, unified-billing accounts
+  // get a zeroed legacy monthly shape (monthlyLimit.val 0) instead of real usage.
+  const res = await fetchApi("https://cli-chat-proxy.grok.com/v1/billing?format=credits", {
+    signal: AbortSignal.timeout(15_000),
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "X-XAI-Token-Auth": "xai-grok-cli",
+      Accept: "application/json",
+    },
+  });
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`Grok usage API returned ${res.status}`);
+
+  const resp = GrokUsageResponseSchema.parse(await res.json());
+  const balance = grokCreditBalance(resp);
+  const window = grokUsageWindow(resp);
+
+  return {
+    status: "available",
+    planLabel: undefined,
+    windows: window ? [window] : [],
+    balances: balance ? [balance] : [],
+    details: [],
+  };
+}
+
+async function readToken(input: UsageInput): Promise<string | undefined> {
+  if (input.store === "env") return process.env[input.locator];
+  try {
+    return (
+      extractGrokTokenFromAuth(JSON.parse(await fs.readFile(input.locator, "utf8"))) ?? undefined
+    );
+  } catch {
+    return undefined;
+  }
+}
+export async function discover(): Promise<UsageAccount[]> {
+  const candidates: UsageInput[] = ["GROK_API_KEY", "GROK_TOKEN"].map((locator) => ({
+    store: "env",
+    locator,
+  }));
+  candidates.push({ store: "file", locator: join(homedir(), ".grok", "auth.json") });
+  for (const input of candidates) if (await readToken(input)) return [{ key: "default", input }];
+  return [];
+}
diff --git a/plugins/grok-usage-source/shared/input.ts b/plugins/grok-usage-source/shared/input.ts
new file mode 100644
index 0000000000..4be5cce316
--- /dev/null
+++ b/plugins/grok-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.enum(["env", "file"]),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/kimi-usage-source/icon.svg b/plugins/kimi-usage-source/icon.svg
new file mode 100644
index 0000000000..4f7547cf79
--- /dev/null
+++ b/plugins/kimi-usage-source/icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M19.514 7.342C19.711 7.862 19.814 8.413 19.816 8.969C19.816 12.494 15.998 14.697 12.946 12.934C11.529 12.116 10.657 10.605 10.657 8.969C10.657 5.646 14.085 3.431 17.115 4.793C15.26 3.373 12.99 2.607 10.655 2.612C4.772 2.614 0.005 7.381 0 13.265C0.002 19.148 4.772 23.918 10.655 23.92C16.538 23.916 21.306 19.147 21.31 13.265C21.312 11.155 20.687 9.095 19.514 7.342ZM14.841 4.666C14.841 8.191 18.657 10.395 21.709 8.632C23.127 7.814 24 6.302 24 4.666C24 1.14 20.184-1.061 17.13 0.699C15.714 1.519 14.841 3.03 14.841 4.666"/>
+</svg>
diff --git a/plugins/kimi-usage-source/index.server.ts b/plugins/kimi-usage-source/index.server.ts
new file mode 100644
index 0000000000..a18da096a3
--- /dev/null
+++ b/plugins/kimi-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "kimi",
+    label: "Kimi",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/kimi-usage-source/paseo-plugin.json b/plugins/kimi-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..c81434ce3b
--- /dev/null
+++ b/plugins/kimi-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "kimi-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/kimi-usage-source/server/usage.test.ts b/plugins/kimi-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..a67e416272
--- /dev/null
+++ b/plugins/kimi-usage-source/server/usage.test.ts
@@ -0,0 +1,468 @@
+import { mkdirSync, readFileSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+function kimiCredentialPath(dir: string): string {
+  return join(dir, "credentials", "kimi-code.json");
+}
+
+function writeKimiCredentials(dir: string, accessToken: string, overrides: object = {}): void {
+  mkdirSync(join(dir, "credentials"), { recursive: true });
+  writeFileSync(
+    kimiCredentialPath(dir),
+    JSON.stringify({
+      access_token: accessToken,
+      refresh_token: "rt_kimi",
+      expires_at: 1_798_812_800,
+      expires_in: 900,
+      scope: "kimi-code",
+      token_type: "Bearer",
+      ...overrides,
+    }),
+  );
+}
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("kimi usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "kimi",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Kimi usage from KIMI_TOKEN", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.kimi.com/coding/v1/usages",
+          () =>
+            jsonResponse({
+              usage: {
+                limit: "100",
+                remaining: "74",
+                resetTime: "2026-02-11T17:32:50Z",
+              },
+            }),
+        ],
+      ]),
+    );
+
+    const kimi = findProvider(await service().listUsage(), "kimi");
+
+    expect(kimi).toMatchObject({
+      status: "available",
+      windows: [
+        expect.objectContaining({
+          id: "coding_usage",
+          usedPct: 26,
+          remainingPct: 74,
+          resetsAt: "2026-02-11T17:32:50Z",
+        }),
+      ],
+    });
+  });
+
+  it("fetches Kimi usage from the CLI credential home", async () => {
+    writeKimiCredentials(join(homeDir, ".kimi-code"), "kimi_cli_token");
+    let requestedUrl: string | null = null;
+    let authorization: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
+      requestedUrl = url.toString();
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        usage: {
+          limit: "200",
+          remaining: "150",
+          resetTime: "2026-06-23T05:12:17Z",
+        },
+      });
+    }) as unknown as typeof fetch;
+
+    const kimi = findProvider(await service({ kimiHomeDir: homeDir }).listUsage(), "kimi");
+
+    expect(requestedUrl).toBe("https://api.kimi.com/coding/v1/usages");
+    expect(authorization).toBe("Bearer kimi_cli_token");
+    expect(kimi).toMatchObject({
+      status: "available",
+      windows: [
+        expect.objectContaining({
+          id: "coding_usage",
+          usedPct: 25,
+          remainingPct: 75,
+          resetsAt: "2026-06-23T05:12:17Z",
+        }),
+      ],
+    });
+  });
+
+  it("reads Kimi credentials whose optional fields are null", async () => {
+    writeKimiCredentials(join(homeDir, ".kimi-code"), "kimi_cli_token", {
+      expires_at: null,
+      expires_in: null,
+      scope: null,
+      token_type: null,
+    });
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.kimi.com/coding/v1/usages",
+          () => jsonResponse({ usage: { limit: "100", remaining: "60" } }),
+        ],
+      ]),
+    );
+
+    const kimi = findProvider(await service({ kimiHomeDir: homeDir }).listUsage(), "kimi");
+
+    expect(kimi.status).toBe("available");
+  });
+
+  it("returns unavailable on 401 without refreshing or rewriting the credential file", async () => {
+    writeKimiCredentials(join(homeDir, ".kimi-code"), "at_kimi_expired");
+    const credPath = kimiCredentialPath(join(homeDir, ".kimi-code"));
+    const before = readFileSync(credPath, "utf8");
+    let usageCalls = 0;
+    fetchApi = vi.fn(async (url: RequestInfo | URL) => {
+      const endpoint = url.toString();
+      if (endpoint === "https://api.kimi.com/coding/v1/usages") {
+        usageCalls += 1;
+        return new Response(null, { status: 401 });
+      }
+      // The read-only fetcher must never hit the OAuth token endpoint.
+      throw new Error(`Unmocked: ${endpoint}`);
+    }) as never;
+
+    const result = await service({ kimiHomeDir: homeDir }).listUsage();
+
+    expect(findProvider(result, "kimi").status).toBe("unavailable");
+    expect(usageCalls).toBe(1);
+    // The credentials file must be left untouched for the Kimi CLI to own.
+    expect(readFileSync(credPath, "utf8")).toBe(before);
+  });
+
+  it("does not refresh Kimi tokens read from the environment", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    const usageFetch = vi.fn(async () => new Response(null, { status: 401 }));
+    fetchApi = usageFetch as never;
+
+    const result = await service().listUsage();
+
+    expect(findProvider(result, "kimi").status).toBe("unavailable");
+    expect(usageFetch).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not refresh Kimi tokens on a 403", async () => {
+    writeKimiCredentials(join(homeDir, ".kimi-code"), "at_kimi_forbidden");
+    const usageFetch = vi.fn(async () => new Response(null, { status: 403 }));
+    fetchApi = usageFetch as never;
+
+    const result = await service({ kimiHomeDir: homeDir }).listUsage();
+
+    expect(findProvider(result, "kimi").status).toBe("unavailable");
+    expect(usageFetch).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe("Kimi usage source usage windows", () => {
+  afterEach(() => {
+    delete process.env["KIMI_TOKEN"];
+    vi.restoreAllMocks();
+  });
+
+  it("normalizes weekly and enforced rolling usage windows", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    const fetchApi = vi.fn(async () =>
+      jsonResponse({
+        limited: true,
+        usage: {
+          limit: "100",
+          used: "61",
+          remaining: "39",
+          resetTime: "2026-08-05T00:01:45Z",
+        },
+        limits: [
+          {
+            window: {
+              duration: 300,
+              timeUnit: "TIME_UNIT_MINUTE",
+            },
+            detail: {
+              limit: "100",
+              used: "100",
+              resetTime: "2026-07-31T17:01:45Z",
+            },
+          },
+        ],
+      }),
+    );
+    const usage = await fetchFirst(fetchApi);
+
+    expect(usage).toMatchObject({
+      status: "available",
+      windows: [
+        {
+          id: "coding_usage",
+          label: "Usage limit",
+          usedPct: 61,
+          remainingPct: 39,
+          resetsAt: "2026-08-05T00:01:45Z",
+          tone: "ok",
+        },
+        {
+          id: "coding_limit_300_time_unit_minute",
+          label: "5-hour limit",
+          usedPct: 100,
+          remainingPct: 0,
+          resetsAt: "2026-07-31T17:01:45Z",
+          tone: "danger",
+        },
+      ],
+    });
+  });
+
+  it("keeps valid windows when another limits entry is malformed", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    const fetchApi = vi.fn(async () =>
+      jsonResponse({
+        usage: {
+          limit: "100",
+          remaining: "75",
+          resetTime: "2026-08-05T00:01:45Z",
+        },
+        limits: [
+          { window: { duration: "invalid" }, detail: {} },
+          {
+            window: { duration: 300, timeUnit: "TIME_UNIT_MINUTE" },
+            detail: { limit: "100", remaining: "50" },
+          },
+        ],
+      }),
+    );
+    const usage = await fetchFirst(fetchApi);
+
+    expect(usage.windows).toHaveLength(2);
+    expect(usage.windows[1]).toMatchObject({
+      label: "5-hour limit",
+      usedPct: 50,
+      remainingPct: 50,
+    });
+  });
+
+  it("accepts direct limit fields, alternate reset keys, and provider labels", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    const fetchApi = vi.fn(async () =>
+      jsonResponse({
+        usage: null,
+        limits: [
+          {
+            name: "Burst quota",
+            limit: "80",
+            remaining: "20",
+            reset_at: "2026-08-01T00:00:00Z",
+          },
+        ],
+      }),
+    );
+    const usage = await fetchFirst(fetchApi);
+
+    expect(usage.windows).toEqual([
+      expect.objectContaining({
+        id: "coding_limit_burst_quota",
+        label: "Burst quota",
+        usedPct: 75,
+        remainingPct: 25,
+        resetsAt: "2026-08-01T00:00:00Z",
+      }),
+    ]);
+  });
+
+  it("keeps window ids unique when Kimi returns duplicate limit descriptors", async () => {
+    process.env["KIMI_TOKEN"] = "kimi_test_token";
+    const duplicate = {
+      window: { duration: 300, timeUnit: "TIME_UNIT_MINUTE" },
+      detail: { limit: "100", used: "10" },
+    };
+    const fetchApi = vi.fn(async () => jsonResponse({ limits: [duplicate, duplicate] }));
+    const usage = await fetchFirst(fetchApi);
+
+    expect(usage.windows.map((window) => window.id)).toEqual([
+      "coding_limit_300_time_unit_minute",
+      "coding_limit_300_time_unit_minute_2",
+    ]);
+  });
+});
+
+it("discovery returns a locator when fetch finds kimi credentials", async () => {
+  const previous = process.env["KIMI_TOKEN"];
+  try {
+    process.env["KIMI_TOKEN"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "KIMI_TOKEN" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["KIMI_TOKEN"];
+    else process.env["KIMI_TOKEN"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["KIMI_TOKEN"];
+  try {
+    process.env["KIMI_TOKEN"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "KIMI_TOKEN" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["KIMI_TOKEN"];
+    else process.env["KIMI_TOKEN"] = previous;
+  }
+});
+
+it("does not invent a weekly duration for unnamed top-level usage", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "kimi-period-"));
+  try {
+    const locator = join(directory, "auth.json");
+    writeFileSync(locator, JSON.stringify({ access_token: "fixture" }));
+    const report = await fetchUsage({ store: "file", locator }, async () =>
+      Response.json({ usage: { limit: "100", remaining: "74" } }),
+    );
+    expect(report).toMatchObject({
+      status: "available",
+      windows: [{ id: "coding_usage", label: "Usage limit" }],
+    });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+it("does not infer a duration from an unfamiliar time-unit name containing HOUR", async () => {
+  const directory = mkdtempSync(join(tmpdir(), "kimi-unit-"));
+  try {
+    const locator = join(directory, "auth.json");
+    writeFileSync(locator, JSON.stringify({ access_token: "fixture" }));
+    const report = await fetchUsage({ store: "file", locator }, async () =>
+      Response.json({
+        limits: [
+          {
+            window: { duration: 2, timeUnit: "TIME_UNIT_NOT_HOUR" },
+            detail: { limit: "100", used: "11" },
+          },
+        ],
+      }),
+    );
+    expect(report).toMatchObject({ status: "available", windows: [{ label: "Limit 1" }] });
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/services/quota-fetcher/providers/kimi.ts b/plugins/kimi-usage-source/server/usage.ts
similarity index 64%
rename from packages/server/src/services/quota-fetcher/providers/kimi.ts
rename to plugins/kimi-usage-source/server/usage.ts
index 1e62fd6eeb..556008990f 100644
--- a/packages/server/src/services/quota-fetcher/providers/kimi.ts
+++ b/plugins/kimi-usage-source/server/usage.ts
@@ -1,18 +1,22 @@
-import { existsSync, promises as fs } from "node:fs";
+import type { UsageInput } from "../shared/input.js";
+import { promises as fs } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import type { Logger } from "pino";
 import { z } from "zod";
-import type { ProviderUsage, ProviderUsageWindow } from "../../../server/messages.js";
-import type { ProviderApiFetch, ProviderUsageFetcher } from "../provider.js";
 import {
-  ApiNumberSchema,
-  ApiOptionalStringSchema,
-  fetchProviderApi,
   toneFromUsedPct,
-  unavailableUsage,
+  unavailable,
+  type UsageAccount,
   windowFromUsedPct,
-} from "../usage.js";
+  type UsageReport,
+  type UsageWindow,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiNumberSchema = z.coerce.number().finite();
+const ApiOptionalStringSchema = z.preprocess(
+  (value) => (value == null ? undefined : value),
+  z.coerce.string().optional(),
+);
 
 const KIMI_USAGE_URL = "https://api.kimi.com/coding/v1/usages";
 
@@ -86,18 +90,18 @@ function durationFrom(value: unknown): number | null {
   return Number.isFinite(duration) && duration > 0 ? duration : null;
 }
 
-function durationLabel(duration: number, timeUnit: string | undefined): string | null {
-  if (!timeUnit) return null;
+function durationLabel(duration: number | null, timeUnit: string | undefined): string | null {
+  if (duration === null || !timeUnit) return null;
 
   const normalizedUnit = timeUnit.replace(/^TIME_UNIT_/i, "").toUpperCase();
-  if (normalizedUnit.includes("MINUTE")) {
+  if (normalizedUnit === "MINUTE") {
     if (duration % 60 === 0) return `${duration / 60}-hour limit`;
     return `${duration}-minute limit`;
   }
-  if (normalizedUnit.includes("HOUR")) return `${duration}-hour limit`;
-  if (normalizedUnit.includes("DAY")) return `${duration}-day limit`;
-  if (normalizedUnit.includes("WEEK")) return `${duration}-week limit`;
-  if (normalizedUnit.includes("SECOND")) return `${duration}-second limit`;
+  if (normalizedUnit === "HOUR") return `${duration}-hour limit`;
+  if (normalizedUnit === "DAY") return `${duration}-day limit`;
+  if (normalizedUnit === "WEEK") return `${duration}-week limit`;
+  if (normalizedUnit === "SECOND") return `${duration}-second limit`;
   return null;
 }
 
@@ -165,7 +169,7 @@ function windowFromFields(input: {
   id: string;
   label: string;
   fields: KimiUsageFields;
-}): ProviderUsageWindow {
+}): UsageWindow {
   const usedPct = usedPctFromFields(input.fields);
   return windowFromUsedPct({
     id: input.id,
@@ -187,12 +191,9 @@ function uniqueWindowId(baseId: string, seenIds: Set<string>): string {
   return id;
 }
 
-function kimiUsageWindowsFromPayload(
-  payload: unknown,
-  logger: Pick<Logger, "debug">,
-): ProviderUsageWindow[] {
+function kimiUsageWindowsFromPayload(payload: unknown): UsageWindow[] {
   const response = KimiUsageResponseSchema.parse(payload);
-  const windows: ProviderUsageWindow[] = [];
+  const windows: UsageWindow[] = [];
   const seenWindowIds = new Set<string>();
   const usage = parseUsageFields(response.usage);
 
@@ -200,7 +201,11 @@ function kimiUsageWindowsFromPayload(
     windows.push(
       windowFromFields({
         id: uniqueWindowId("coding_usage", seenWindowIds),
-        label: explicitUsageLabel(usage) ?? "Weekly limit",
+        // Top-level usage reports no period unless it supplies duration metadata.
+        label:
+          explicitUsageLabel(usage) ??
+          durationLabel(durationFrom(usage.duration), usage.timeUnit) ??
+          "Usage limit",
         fields: usage,
       }),
     );
@@ -210,14 +215,12 @@ function kimiUsageWindowsFromPayload(
   for (const [index, rawLimit] of limits.entries()) {
     const parsedLimit = KimiUsageLimitSchema.safeParse(rawLimit);
     if (!parsedLimit.success) {
-      logger.debug({ index }, "Ignoring malformed Kimi usage limit window");
       continue;
     }
 
     const limit = parsedLimit.data;
     const { fields, metadata } = limitFields(limit);
     if (!hasUsageData(fields)) {
-      logger.debug({ index }, "Ignoring malformed Kimi usage limit window");
       continue;
     }
 
@@ -249,54 +252,13 @@ const KimiAuthSchema = z
 type KimiAuth = z.infer<typeof KimiAuthSchema>;
 type KimiCredentials = KimiAuth & { access_token: string };
 
-interface KimiQuotaProviderOptions {
-  logger: Logger;
-  fetch?: ProviderApiFetch;
-  homeDir?: string;
-}
-
-export class KimiQuotaProvider implements ProviderUsageFetcher {
-  readonly providerId = "kimi";
-  readonly displayName = "Kimi";
-
-  private readonly logger: Logger;
-  private readonly fetchApi: ProviderApiFetch;
-  private readonly homeDir?: string;
-
-  constructor(options: KimiQuotaProviderOptions) {
-    this.logger = options.logger.child({ module: "kimi-quota-provider" });
-    this.fetchApi = options.fetch ?? fetch;
-    this.homeDir = options.homeDir;
-  }
-
-  async fetchUsage(): Promise<ProviderUsage> {
-    const credentials = await this.readCredentials();
-    if (!credentials) return unavailableUsage(this);
-
-    const res = await this.callUsageApi(credentials.access_token);
-
-    if (!res.ok) {
-      // Read-only on credentials; the Kimi CLI owns refresh. See docs/providers.md.
-      this.logger.debug({ status: res.status }, "Kimi usage fetch failed");
-      return unavailableUsage(this);
-    }
-
-    const windows = kimiUsageWindowsFromPayload(await res.json(), this.logger);
-
-    return {
-      providerId: this.providerId,
-      displayName: this.displayName,
-      status: "available",
-      planLabel: null,
-      windows,
-      balances: [],
-      details: [],
-      error: null,
-    };
-  }
-
-  private async callUsageApi(token: string): Promise<Response> {
-    return fetchProviderApi(this.fetchApi, KIMI_USAGE_URL, {
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  async function callUsageApi(token: string): Promise<Response> {
+    return fetchApi(KIMI_USAGE_URL, {
+      signal: AbortSignal.timeout(15_000),
       headers: {
         Authorization: `Bearer ${token}`,
         Accept: "application/json",
@@ -304,39 +266,61 @@ export class KimiQuotaProvider implements ProviderUsageFetcher {
     });
   }
 
-  private async readCredentials(): Promise<KimiCredentials | null> {
-    const environmentToken = process.env["KIMI_TOKEN"] || process.env["KIMI_API_KEY"];
-    if (environmentToken) {
-      return { access_token: environmentToken };
-    }
+  const credentials = await readCredentials(input);
+  if (!credentials) throw new Error("Kimi login store no longer exists");
+  if (credentials.expires_at != null && credentials.expires_at * 1000 <= Date.now())
+    return unavailable({
+      kind: "expired",
+      expiresAt: new Date(credentials.expires_at * 1000).toISOString(),
+    });
 
-    for (const path of this.credentialPaths()) {
-      const credentials = await this.readCredentialFile(path);
-      if (credentials?.access_token) {
-        return { ...credentials, access_token: credentials.access_token };
-      }
-    }
-    return null;
+  const res = await callUsageApi(credentials.access_token);
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`Kimi usage API returned ${res.status}`);
+
+  const windows = kimiUsageWindowsFromPayload(await res.json());
+
+  return {
+    status: "available",
+    planLabel: undefined,
+    windows,
+    balances: [],
+    details: [],
+  };
+}
+
+async function readCredentials(input: UsageInput): Promise<KimiCredentials | undefined> {
+  if (input.store === "env") {
+    const token = process.env[input.locator];
+    return token ? { access_token: token } : undefined;
   }
-
-  private credentialPaths(): string[] {
-    const homeDir = this.homeDir ?? homedir();
-    return [
+  try {
+    const credentials = KimiAuthSchema.parse(JSON.parse(await fs.readFile(input.locator, "utf8")));
+    return credentials.access_token
+      ? { ...credentials, access_token: credentials.access_token }
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+export async function discover(): Promise<UsageAccount[]> {
+  const candidates: UsageInput[] = ["KIMI_TOKEN", "KIMI_API_KEY"].map((locator) => ({
+    store: "env",
+    locator,
+  }));
+  candidates.push(
+    ...[
       join(
-        process.env["KIMI_CODE_HOME"] || join(homeDir, ".kimi-code"),
+        process.env.KIMI_CODE_HOME || join(homedir(), ".kimi-code"),
         "credentials",
         "kimi-code.json",
       ),
-      join(homeDir, ".kimi", "credentials", "kimi-code.json"),
-    ];
-  }
-
-  private async readCredentialFile(path: string): Promise<KimiAuth | null> {
-    if (!existsSync(path)) return null;
-    try {
-      return KimiAuthSchema.parse(JSON.parse(await fs.readFile(path, "utf8")));
-    } catch {
-      return null;
-    }
-  }
+      join(homedir(), ".kimi", "credentials", "kimi-code.json"),
+    ].map((locator) => ({ store: "file" as const, locator })),
+  );
+  for (const input of candidates)
+    if (await readCredentials(input)) return [{ key: "default", input }];
+  return [];
 }
diff --git a/plugins/kimi-usage-source/shared/input.ts b/plugins/kimi-usage-source/shared/input.ts
new file mode 100644
index 0000000000..4be5cce316
--- /dev/null
+++ b/plugins/kimi-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.enum(["env", "file"]),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/minimax-usage-source/icon.svg b/plugins/minimax-usage-source/icon.svg
new file mode 100644
index 0000000000..01cd8219e3
--- /dev/null
+++ b/plugins/minimax-usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z"/></svg>
diff --git a/plugins/minimax-usage-source/index.server.ts b/plugins/minimax-usage-source/index.server.ts
new file mode 100644
index 0000000000..a72a66c949
--- /dev/null
+++ b/plugins/minimax-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "minimax",
+    label: "MiniMax",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/minimax-usage-source/paseo-plugin.json b/plugins/minimax-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..61ecc81c8c
--- /dev/null
+++ b/plugins/minimax-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "minimax-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/minimax-usage-source/server/usage.test.ts b/plugins/minimax-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..57b58418ac
--- /dev/null
+++ b/plugins/minimax-usage-source/server/usage.test.ts
@@ -0,0 +1,378 @@
+import { mkdirSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+function writeMiniMaxConfig(dir: string, payload: Record<string, unknown>): void {
+  mkdirSync(join(dir, ".mmx"), { recursive: true });
+  writeFileSync(join(dir, ".mmx", "config.json"), JSON.stringify(payload));
+}
+
+function writeMiniMaxCredentials(
+  dir: string,
+  accessToken: string,
+  expiresAt?: string,
+  resourceUrl?: string,
+): void {
+  mkdirSync(join(dir, ".mmx"), { recursive: true });
+  const payload: Record<string, unknown> = { access_token: accessToken };
+  if (expiresAt !== undefined) payload["expires_at"] = expiresAt;
+  if (resourceUrl !== undefined) payload["resource_url"] = resourceUrl;
+  writeFileSync(join(dir, ".mmx", "credentials.json"), JSON.stringify(payload));
+}
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("minimax usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "minimax",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches MiniMax usage from MINIMAX_API_KEY against the global endpoint", async () => {
+    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
+    let requestedUrl: string | null = null;
+    let authorization: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL, init?: RequestInit) => {
+      requestedUrl = url.toString();
+      authorization = (init?.headers as Record<string, string> | undefined)?.Authorization ?? null;
+      return jsonResponse({
+        model_remains: [
+          {
+            model_name: "MiniMax-M2.7",
+            end_time: Date.parse("2026-06-19T05:00:00.000Z"),
+            weekly_end_time: Date.parse("2026-06-26T00:00:00.000Z"),
+            current_interval_total_count: 1000,
+            current_interval_usage_count: 250,
+            current_interval_remaining_percent: 75,
+            current_weekly_total_count: 5000,
+            current_weekly_usage_count: 1200,
+            current_weekly_remaining_percent: 76,
+          },
+        ],
+      });
+    }) as unknown as typeof fetch;
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(requestedUrl).toBe("https://api.minimax.io/v1/token_plan/remains");
+    expect(authorization).toBe("Bearer minimax_test_token");
+    expect(miniMax).toMatchObject({
+      status: "available",
+      windows: expect.arrayContaining([
+        expect.objectContaining({
+          id: "interval_MiniMax-M2.7",
+          label: "MiniMax-M2.7 · Interval",
+          usedPct: 25,
+          remainingPct: 75,
+          resetsAt: "2026-06-19T05:00:00.000Z",
+        }),
+        expect.objectContaining({
+          id: "weekly_MiniMax-M2.7",
+          label: "MiniMax-M2.7 · Weekly",
+          usedPct: 24,
+          remainingPct: 76,
+          resetsAt: "2026-06-26T00:00:00.000Z",
+        }),
+      ]),
+    });
+  });
+
+  it("omits MiniMax when no credentials are configured", async () => {
+    expect(await discover()).toEqual([]);
+  });
+
+  it("reads MiniMax OAuth credentials from the CLI credentials file", async () => {
+    writeMiniMaxCredentials(
+      homeDir,
+      "minimax_oauth_token",
+      "2030-01-01T00:00:00.000Z",
+      "https://account.example.com",
+    );
+    let requestedUrl: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL) => {
+      requestedUrl = url.toString();
+      return jsonResponse({ model_remains: [] });
+    }) as unknown as typeof fetch;
+
+    await service().listUsage();
+
+    expect(requestedUrl).toBe("https://account.example.com/v1/token_plan/remains");
+  });
+
+  it("falls back to MiniMax api_key in the CLI config file", async () => {
+    writeMiniMaxConfig(homeDir, {
+      api_key: "minimax_config_key",
+      region: "cn",
+    });
+    let requestedUrl: string | null = null;
+    fetchApi = (async (url: RequestInfo | URL) => {
+      requestedUrl = url.toString();
+      return jsonResponse({ model_remains: [] });
+    }) as unknown as typeof fetch;
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(requestedUrl).toBe("https://api.minimaxi.com/v1/token_plan/remains");
+    expect(miniMax.status).toBe("unavailable");
+  });
+
+  it("reports MiniMax accounts with no active token plan as unavailable", async () => {
+    writeMiniMaxConfig(homeDir, { api_key: "minimax_config_key", region: "cn" });
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.minimaxi.com/v1/token_plan/remains",
+          () =>
+            jsonResponse({
+              model_remains: null,
+              base_resp: { status_code: 2062, status_msg: "no active token plan subscription" },
+            }),
+        ],
+      ]),
+    );
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(miniMax).toMatchObject({
+      status: "unavailable",
+      problem: { kind: "no_quota" },
+      error: null,
+    });
+  });
+
+  it("reports a null MiniMax token plan as unavailable even without base_resp", async () => {
+    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.minimax.io/v1/token_plan/remains",
+          () => jsonResponse({ model_remains: null }),
+        ],
+      ]),
+    );
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(miniMax).toMatchObject({
+      status: "unavailable",
+      problem: { kind: "no_quota" },
+      error: null,
+    });
+  });
+
+  it("still reads MiniMax windows when base_resp reports success", async () => {
+    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.minimax.io/v1/token_plan/remains",
+          () =>
+            jsonResponse({
+              base_resp: { status_code: 0, status_msg: "success" },
+              model_remains: [
+                {
+                  model_name: "MiniMax-M2.7",
+                  end_time: Date.parse("2026-06-19T05:00:00.000Z"),
+                  current_interval_total_count: 100,
+                  current_interval_usage_count: 25,
+                  current_interval_remaining_percent: 75,
+                },
+              ],
+            }),
+        ],
+      ]),
+    );
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(miniMax).toMatchObject({
+      status: "available",
+      windows: expect.arrayContaining([
+        expect.objectContaining({ id: "interval_MiniMax-M2.7", usedPct: 25 }),
+      ]),
+    });
+  });
+
+  it("marks exhausted MiniMax interval windows with a danger tone", async () => {
+    process.env["MINIMAX_API_KEY"] = "minimax_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.minimax.io/v1/token_plan/remains",
+          () =>
+            jsonResponse({
+              model_remains: [
+                {
+                  model_name: "MiniMax-M2.7",
+                  end_time: Date.parse("2026-06-19T05:00:00.000Z"),
+                  weekly_end_time: Date.parse("2026-06-26T00:00:00.000Z"),
+                  current_interval_total_count: 100,
+                  current_interval_usage_count: 100,
+                  current_interval_remaining_percent: 0,
+                  current_interval_status: 2,
+                  current_weekly_total_count: 100,
+                  current_weekly_usage_count: 10,
+                  current_weekly_remaining_percent: 90,
+                  current_weekly_status: 1,
+                },
+              ],
+            }),
+        ],
+      ]),
+    );
+
+    const miniMax = findProvider(await service().listUsage(), "minimax");
+
+    expect(miniMax).toMatchObject({
+      status: "available",
+      windows: expect.arrayContaining([
+        expect.objectContaining({
+          id: "interval_MiniMax-M2.7",
+          usedPct: 100,
+          tone: "danger",
+        }),
+        expect.objectContaining({
+          id: "weekly_MiniMax-M2.7",
+          tone: "ok",
+        }),
+      ]),
+    });
+  });
+});
+
+it("discovery returns a locator when fetch finds minimax credentials", async () => {
+  const previous = process.env["MINIMAX_API_KEY"];
+  try {
+    process.env["MINIMAX_API_KEY"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "MINIMAX_API_KEY" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["MINIMAX_API_KEY"];
+    else process.env["MINIMAX_API_KEY"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["MINIMAX_API_KEY"];
+  try {
+    process.env["MINIMAX_API_KEY"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "MINIMAX_API_KEY" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["MINIMAX_API_KEY"];
+    else process.env["MINIMAX_API_KEY"] = previous;
+  }
+});
diff --git a/plugins/minimax-usage-source/server/usage.ts b/plugins/minimax-usage-source/server/usage.ts
new file mode 100644
index 0000000000..7bf602cff1
--- /dev/null
+++ b/plugins/minimax-usage-source/server/usage.ts
@@ -0,0 +1,252 @@
+import type { UsageInput } from "../shared/input.js";
+import { promises as fs } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  unavailable,
+  type UsageAccount,
+  windowFromUsedPct,
+  type UsageReport,
+  type UsageWindow,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiNumberSchema = z.coerce.number().finite();
+const ApiOptionalStringSchema = z.preprocess(
+  (value) => (value == null ? undefined : value),
+  z.coerce.string().optional(),
+);
+
+const MINIMAX_GLOBAL_BASE_URL = "https://api.minimax.io";
+const MINIMAX_CN_BASE_URL = "https://api.minimaxi.com";
+
+const MiniMaxModelRemainSchema = z.object({
+  model_name: ApiOptionalStringSchema,
+  start_time: ApiNumberSchema.optional(),
+  end_time: ApiNumberSchema.optional(),
+  remains_time: ApiNumberSchema.optional(),
+  current_interval_total_count: ApiNumberSchema.optional(),
+  current_interval_usage_count: ApiNumberSchema.optional(),
+  current_interval_remaining_percent: ApiNumberSchema.optional(),
+  current_weekly_total_count: ApiNumberSchema.optional(),
+  current_weekly_usage_count: ApiNumberSchema.optional(),
+  current_weekly_remaining_percent: ApiNumberSchema.optional(),
+  current_interval_status: ApiNumberSchema.optional(),
+  current_weekly_status: ApiNumberSchema.optional(),
+  weekly_start_time: ApiNumberSchema.optional(),
+  weekly_end_time: ApiNumberSchema.optional(),
+  weekly_remains_time: ApiNumberSchema.optional(),
+  weekly_boost_permille: ApiNumberSchema.optional(),
+});
+
+/**
+ * MiniMax reports application-level failures inside a 200 response: `base_resp.status_code`
+ * is non-zero and `model_remains` comes back as null. An account with no token plan
+ * subscription is the common case (status 2062), so both shapes are normal input here.
+ */
+const MiniMaxBaseRespSchema = z.object({
+  status_code: ApiNumberSchema.optional(),
+  status_msg: ApiOptionalStringSchema,
+});
+
+const MiniMaxQuotaResponseSchema = z.object({
+  model_remains: z.array(MiniMaxModelRemainSchema).nullish(),
+  base_resp: MiniMaxBaseRespSchema.nullish(),
+});
+
+const MiniMaxCredentialsSchema = z.object({
+  access_token: z.string().optional(),
+  refresh_token: z.string().optional(),
+  expires_at: ApiOptionalStringSchema,
+  resource_url: ApiOptionalStringSchema,
+});
+
+const MiniMaxConfigSchema = z.object({
+  api_key: z.string().optional(),
+  region: z.string().optional(),
+  base_url: ApiOptionalStringSchema,
+  oauth: MiniMaxCredentialsSchema.optional(),
+});
+
+type MiniMaxModelRemain = z.infer<typeof MiniMaxModelRemainSchema>;
+
+interface MiniMaxResolvedAuth {
+  token: string;
+  baseUrl: string;
+}
+
+function resolveBaseUrl(input: { baseUrl?: string; region?: string }): string {
+  const explicit = input.baseUrl;
+  if (explicit && explicit.startsWith("http")) return explicit;
+  if (input.region === "cn") return MINIMAX_CN_BASE_URL;
+  return MINIMAX_GLOBAL_BASE_URL;
+}
+
+function computeUsedPct(
+  remaining: number | null | undefined,
+  total: number | null | undefined,
+): number | null {
+  if (typeof remaining !== "number" || typeof total !== "number") return null;
+  if (!Number.isFinite(total) || total <= 0) return null;
+  if (!Number.isFinite(remaining)) return null;
+  const used = total - remaining;
+  return Math.max(0, Math.min(100, (used / total) * 100));
+}
+
+function epochMsToIso(value: number | null | undefined): string | null {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return null;
+  return new Date(value).toISOString();
+}
+
+function toneForStatus(status: number | null | undefined): UsageWindow["tone"] {
+  if (status === 2) return "danger";
+  if (status === 3) return "default";
+  return "ok";
+}
+
+function toIntervalWindow(modelName: string, model: MiniMaxModelRemain): UsageWindow | null {
+  const total = model.current_interval_total_count ?? null;
+  const used = model.current_interval_usage_count ?? null;
+  const remainingPercent = model.current_interval_remaining_percent ?? null;
+  const usedPct =
+    typeof remainingPercent === "number" && Number.isFinite(remainingPercent)
+      ? Math.max(0, Math.min(100, 100 - remainingPercent))
+      : computeUsedPct(
+          typeof total === "number" && typeof used === "number" ? total - used : null,
+          total,
+        );
+  if (usedPct === null) return null;
+  return windowFromUsedPct({
+    id: `interval_${modelName}`,
+    label: `${modelName} · Interval`,
+    utilizationPct: usedPct,
+    resetsAt: epochMsToIso(model.end_time),
+    tone: toneForStatus(model.current_interval_status),
+  });
+}
+
+function toWeeklyWindow(modelName: string, model: MiniMaxModelRemain): UsageWindow | null {
+  const total = model.current_weekly_total_count ?? null;
+  const used = model.current_weekly_usage_count ?? null;
+  const remainingPercent = model.current_weekly_remaining_percent ?? null;
+  let usedPct: number | null = null;
+  if (typeof remainingPercent === "number" && Number.isFinite(remainingPercent)) {
+    usedPct = Math.max(0, Math.min(100, 100 - remainingPercent));
+  } else if (typeof total === "number" && typeof used === "number") {
+    usedPct = computeUsedPct(total - used, total);
+  }
+  if (usedPct === null) return null;
+  return windowFromUsedPct({
+    id: `weekly_${modelName}`,
+    label: `${modelName} · Weekly`,
+    utilizationPct: usedPct,
+    resetsAt: epochMsToIso(model.weekly_end_time),
+    tone: toneForStatus(model.current_weekly_status),
+  });
+}
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const auth = await readAuth(input);
+  if (!auth) throw new Error("MiniMax login store no longer exists");
+  if (auth.expiresAt && Date.parse(auth.expiresAt) <= Date.now())
+    return unavailable({ kind: "expired", expiresAt: new Date(auth.expiresAt).toISOString() });
+
+  const res = await fetchApi(`${auth.baseUrl}/v1/token_plan/remains`, {
+    signal: AbortSignal.timeout(15_000),
+    headers: {
+      Authorization: `Bearer ${auth.token}`,
+      Accept: "application/json",
+    },
+  });
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`MiniMax usage API returned ${res.status}`);
+
+  const resp = MiniMaxQuotaResponseSchema.parse(await res.json());
+
+  const statusCode = resp.base_resp?.status_code;
+  if (typeof statusCode === "number" && statusCode !== 0) {
+    return unavailable({
+      kind: "no_quota",
+      detail: resp.base_resp?.status_msg ?? "No active coding plan",
+    });
+  }
+
+  const models = resp.model_remains ?? [];
+
+  const windows: UsageWindow[] = [];
+  for (const model of models) {
+    const name = model.model_name ?? "token-plan";
+    const intervalWindow = toIntervalWindow(name, model);
+    if (intervalWindow) windows.push(intervalWindow);
+    const weeklyWindow = toWeeklyWindow(name, model);
+    if (weeklyWindow) windows.push(weeklyWindow);
+  }
+
+  if (windows.length === 0)
+    return unavailable({ kind: "no_quota", detail: "No active coding plan" });
+  return {
+    status: "available",
+    planLabel: undefined,
+    windows,
+    balances: [],
+    details: [],
+  };
+}
+
+async function readAuth(
+  input: UsageInput,
+): Promise<(MiniMaxResolvedAuth & { expiresAt?: string }) | undefined> {
+  if (input.store === "env") {
+    const token = process.env[input.locator];
+    return token
+      ? { token, baseUrl: resolveBaseUrl({ baseUrl: process.env.MINIMAX_BASE_URL }) }
+      : undefined;
+  }
+  try {
+    const raw: unknown = JSON.parse(await fs.readFile(input.locator, "utf8"));
+    if (input.store === "credentials") {
+      const credentials = MiniMaxCredentialsSchema.parse(raw);
+      return credentials.access_token
+        ? {
+            token: credentials.access_token,
+            baseUrl: resolveBaseUrl({ baseUrl: credentials.resource_url }),
+            expiresAt: credentials.expires_at ?? undefined,
+          }
+        : undefined;
+    }
+    const config = MiniMaxConfigSchema.parse(raw);
+    if (config.api_key)
+      return {
+        token: config.api_key,
+        baseUrl: resolveBaseUrl({ baseUrl: config.base_url, region: config.region }),
+      };
+    return config.oauth?.access_token
+      ? {
+          token: config.oauth.access_token,
+          baseUrl: resolveBaseUrl({
+            baseUrl: config.oauth.resource_url ?? config.base_url,
+            region: config.region,
+          }),
+          expiresAt: config.oauth.expires_at ?? undefined,
+        }
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+export async function discover(): Promise<UsageAccount[]> {
+  const candidates: UsageInput[] = [
+    { store: "env", locator: "MINIMAX_API_KEY" },
+    { store: "credentials", locator: join(homedir(), ".mmx", "credentials.json") },
+    { store: "config", locator: join(homedir(), ".mmx", "config.json") },
+  ];
+  const accounts: UsageAccount[] = [];
+  for (const input of candidates)
+    if (await readAuth(input)) accounts.push({ key: "default", input });
+  return accounts;
+}
diff --git a/plugins/minimax-usage-source/shared/input.ts b/plugins/minimax-usage-source/shared/input.ts
new file mode 100644
index 0000000000..22e12a603f
--- /dev/null
+++ b/plugins/minimax-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.enum(["env", "credentials", "config"]),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/plugins/muse-provider/icon.svg b/plugins/muse-provider/icon.svg
new file mode 100644
index 0000000000..4d0eb0cf45
--- /dev/null
+++ b/plugins/muse-provider/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path transform="scale(0.24)" d="M24.6257 16.1214C28.2365 16.1214 30.8187 18.9408 30.8187 23.3643C30.8185 27.7868 30.1055 31.7765 28.9225 40.2466C28.0743 46.1813 26.62 55.2418 26.0132 59.0088C27.1782 56.7815 29.9074 51.5757 30.3914 50.5982C36.1081 39.061 42.0657 28.7544 43.7826 26.0254C46.0594 22.382 48.062 20.9229 51.1597 20.9229C52.7685 20.923 54.6826 21.7357 55.6315 22.819C56.9178 24.2895 57.1859 26.6602 57.1411 29.244C57.0738 33.2073 56.5599 39.5264 55.8553 46.5698C55.5416 49.7057 54.9365 56.1066 54.5288 60.4004C58.1883 53.8532 64.9609 41.8109 67.6921 37.6058C70.0727 33.9402 72.466 31.5797 75.6836 31.5796C78.4595 31.5796 81.8809 33.5416 81.6772 38.7573C81.3774 46.4556 80.2673 63.2232 79.7607 70.7479C83.1662 65.7913 87.6377 58.4543 89.3148 55.6966C91.0104 52.908 92.75 50.6542 95.3898 50.5778C98.0987 50.4995 99.913 52.341 99.9959 55.1839C100.078 58.0277 98.3835 61.2256 96.1344 64.856C93.6937 68.7957 90.9621 73.0123 87.6383 76.9491C84.3148 80.8856 81.2604 83.8782 76.5991 83.8786C72.4243 83.8786 69.4869 81.1043 69.283 76.0254C69.1768 73.364 69.6804 67.6405 70.0602 63.1673C70.5 57.9875 71.0315 52.9861 71.403 49.6786C67.7337 56.3979 60.0101 70.4676 56.5348 75.9603C53.1343 81.3339 51.4774 83.2269 47.8882 83.2275C44.2977 83.2275 42.7226 80.6416 42.6717 76.7497C42.6142 72.5285 45.7852 47.1821 46.8587 38.737C45.1183 42.4616 40.839 51.6056 38.1551 57.0435C35.5587 62.3055 31.204 71.3978 28.0436 76.6357C25.7668 80.4094 23.2092 83.2273 19.4173 83.2275C15.6252 83.2275 13.4847 80.6784 13.4847 76.5788C13.4847 72.4794 14.6716 65.6492 15.9465 57.1777C16.5839 53.0781 17.3108 48.6133 18.1315 43.8761C18.7324 40.448 19.7764 34.4169 20.4183 30.7129C17.502 35.2539 12.2536 43.4278 10.6567 45.8903C8.88113 48.6291 7.28747 50.626 4.64681 50.6266C1.7329 50.6266 0.000532901 48.3522 0 45.7113C0 43.0703 1.34323 41.0344 3.52376 37.4512C6.32403 32.8465 11.3578 26.57 14.1154 23.2747C17.3656 19.3912 20.6139 16.1219 24.6257 16.1214Z"/></svg>
diff --git a/plugins/muse-provider/index.server.ts b/plugins/muse-provider/index.server.ts
new file mode 100644
index 0000000000..3ee054adce
--- /dev/null
+++ b/plugins/muse-provider/index.server.ts
@@ -0,0 +1,13 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createMuseProvider } from "./server/provider.js";
+
+import { Usage } from "./server/usage.js";
+
+export default function contribute(
+  server: Pick<PluginServerContext, "registerProvider" | "registerUsageSource">,
+) {
+  const usage = new Usage();
+  server.registerUsageSource(usage.registration());
+  server.registerProvider(createMuseProvider(usage));
+  return () => {};
+}
diff --git a/plugins/muse-provider/paseo-plugin.json b/plugins/muse-provider/paseo-plugin.json
new file mode 100644
index 0000000000..6b632ab2bc
--- /dev/null
+++ b/plugins/muse-provider/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "muse-provider", "requirements": { "paseo": ">=0.11.0" } }
diff --git a/plugins/muse-provider/server/catalog.ts b/plugins/muse-provider/server/catalog.ts
new file mode 100644
index 0000000000..5e603a9eda
--- /dev/null
+++ b/plugins/muse-provider/server/catalog.ts
@@ -0,0 +1,88 @@
+import type { ProviderCatalog, ProviderLaunch } from "@getpaseo/plugin/server/provider";
+import type { z } from "zod";
+import { createHash } from "node:crypto";
+import { MspConnection } from "./connection.js";
+import { catalogSchema, effortSchema } from "./wire.js";
+
+export const modes = [
+  { id: "onRequest", label: "Default", icon: "ShieldCheck", colorTier: "safe" },
+  { id: "promptUnmatched", label: "Ask", icon: "ShieldAlert", colorTier: "moderate" },
+  { id: "denyUnmatched", label: "Strict", icon: "ShieldCheck", colorTier: "safe" },
+  {
+    id: "allowAll",
+    label: "Full access",
+    icon: "ShieldOff",
+    colorTier: "dangerous",
+    isUnattended: true,
+  },
+];
+export const efforts = effortSchema.options.filter((effort) => effort !== "none");
+
+export function launchKey(launch: ProviderLaunch): string {
+  // Hash values so credential-dependent cache identity never exposes credentials.
+  const routingKeys = Object.keys(launch.env)
+    .filter((key) => /^(META_|MUSE_|XDG_|HOME$|PATH$|HTTP_PROXY$|HTTPS_PROXY$|NO_PROXY$)/.test(key))
+    .sort();
+  const environment = routingKeys.map((key) => [key, launch.env[key]]);
+  return createHash("sha256")
+    .update(JSON.stringify([launch.command, launch.args, environment]))
+    .digest("hex");
+}
+
+export class Catalog {
+  private readonly cache = new Map<string, { expires: number; catalog: ProviderCatalog }>();
+  private readonly hosts = new Set<MspConnection>();
+  private closed = false;
+  async read(launch: ProviderLaunch): Promise<ProviderCatalog> {
+    if (this.closed) throw new Error("Muse catalogue is closed");
+    const key = launchKey(launch);
+    const cached = this.cache.get(key);
+    if (cached && cached.expires > Date.now()) return cached.catalog;
+    const host = new MspConnection({ launch, timeoutMs: 5000 });
+    this.hosts.add(host);
+    try {
+      await host.initialize();
+      const response = await host.request("model/list", {}, catalogSchema);
+      const catalog = presentCatalog(response);
+      if (!this.closed) {
+        if (this.cache.size >= 8) this.cache.delete(this.cache.keys().next().value!);
+        this.cache.set(key, { expires: Date.now() + 60000, catalog });
+      }
+      return catalog;
+    } finally {
+      await host.close();
+      this.hosts.delete(host);
+    }
+  }
+  async close(): Promise<void> {
+    this.closed = true;
+    this.cache.clear();
+    await Promise.all([...this.hosts].map((host) => host.close()));
+  }
+}
+
+export function presentCatalog(response: z.infer<typeof catalogSchema>): ProviderCatalog {
+  const models = response.models.map((model) => {
+    const supported = model.variants.length > 0 ? model.variants : efforts;
+    return {
+      id: model.modelId,
+      label: model.displayLabel,
+      isDefault: model.isDefault,
+      contextWindowMaxTokens: model.contextLimit ?? undefined,
+      thinkingOptions: supported.map((id) => ({
+        id,
+        label: id,
+        isDefault: id === model.defaultReasoningEffort,
+      })),
+      defaultThinkingOptionId: model.defaultReasoningEffort ?? undefined,
+      metadata: { providerId: model.providerId },
+    };
+  });
+  const defaultModel = models.find((model) => model.isDefault);
+  return {
+    models,
+    modes,
+    defaultMode: "onRequest",
+    defaultModel: defaultModel?.id,
+  };
+}
diff --git a/plugins/muse-provider/server/children.ts b/plugins/muse-provider/server/children.ts
new file mode 100644
index 0000000000..69e0f4a855
--- /dev/null
+++ b/plugins/muse-provider/server/children.ts
@@ -0,0 +1,94 @@
+import type { ProviderEvent } from "@getpaseo/plugin/server/provider";
+import { MspConnection, type Notification } from "./connection.js";
+import { Timeline } from "./timeline.js";
+import {
+  childSessionSchema,
+  pageSchema,
+  itemNotificationSchema,
+  notificationSchema,
+  deltaSchema,
+  type WireItem,
+} from "./wire.js";
+
+interface Child {
+  timeline: Timeline;
+  cursor: string | undefined;
+}
+export class Children {
+  private readonly children = new Map<string, Child>();
+  constructor(
+    private readonly host: MspConnection,
+    private readonly parentId: string,
+    private readonly cwd: string,
+    private readonly emit: (event: ProviderEvent) => void,
+  ) {}
+
+  async update(item: WireItem): Promise<void> {
+    if (
+      !item.childSessionId ||
+      !(
+        item.kind === "subagent" ||
+        item.kind === "workflow" ||
+        item.tool === "workflow" ||
+        item.tool.startsWith("subagent_")
+      )
+    )
+      return;
+    const id = item.childSessionId;
+    if (!this.children.has(id)) {
+      const { session } = await this.host.request(
+        "session/read",
+        { sessionId: id },
+        childSessionSchema,
+      );
+      this.emit({
+        type: "session.opened",
+        sessionId: id,
+        parentSessionId: this.parentId,
+        toolCallId: item.callId ?? item.itemId,
+        capabilities: [],
+        restoration: "parent",
+        cwd: session.workspaceRoot ?? this.cwd,
+        title: session.title,
+      });
+      this.children.set(id, {
+        timeline: new Timeline(this.host, id, id, this.emit),
+        cursor: undefined,
+      });
+    }
+    await this.page(id);
+  }
+  async notify(id: string, event: Notification): Promise<void> {
+    const child = this.children.get(id);
+    if (!child) return;
+    if (["item/started", "item/updated", "item/completed"].includes(event.method)) {
+      const { item } = itemNotificationSchema.parse(event.params);
+      await child.timeline.fold(item);
+    } else if (event.method === "item/delta") child.timeline.delta(deltaSchema.parse(event.params));
+  }
+  async refresh(): Promise<void> {
+    for (const id of this.children.keys()) await this.page(id);
+  }
+  private async page(id: string): Promise<void> {
+    const child = this.children.get(id)!;
+    let next: string | null;
+    do {
+      const page = await this.host.request(
+        "view/page",
+        { sessionId: id, cursor: child.cursor, limit: 1000, direction: "forward" },
+        pageSchema,
+      );
+      for (const event of page.events) {
+        await this.notify(id, event);
+        const envelope = notificationSchema.parse(event.params);
+        if (envelope.viewCursor) child.cursor = envelope.viewCursor;
+      }
+      next = page.nextCursor;
+      if (next !== null) child.cursor = next;
+    } while (next !== null);
+  }
+  close(): void {
+    for (const sessionId of this.children.keys()) this.emit({ type: "session.closed", sessionId });
+    this.children.clear();
+  }
+}
diff --git a/plugins/muse-provider/server/commands.ts b/plugins/muse-provider/server/commands.ts
new file mode 100644
index 0000000000..df62f72537
--- /dev/null
+++ b/plugins/muse-provider/server/commands.ts
@@ -0,0 +1,56 @@
+import type { ProviderEvent, ProviderPrompt } from "@getpaseo/plugin/server/provider";
+import type { TurnStartParams } from "./msp.js";
+import { MspConnection } from "./connection.js";
+import { ackSchema, skillsSchema } from "./wire.js";
+import { MuseError } from "./errors.js";
+
+export class Commands {
+  private selectors = new Set<string>();
+  constructor(
+    private readonly host: MspConnection,
+    private readonly sessionId: string,
+    private readonly id: string,
+    private readonly emit: (event: ProviderEvent) => void,
+  ) {}
+
+  async refresh(): Promise<void> {
+    const { skills } = await this.host.request(
+      "skill/list",
+      { sessionId: this.sessionId },
+      skillsSchema,
+    );
+    this.selectors = new Set(skills.map((skill) => skill.selector));
+    this.emit({
+      type: "session.commands",
+      sessionId: this.id,
+      commands: [
+        { name: "compact", description: "Compact conversation context" },
+        ...skills
+          .filter((skill) => skill.selector !== "compact")
+          .map((skill) => ({
+            name: skill.selector,
+            description: skill.description,
+            argumentHint: skill.argumentHint,
+          })),
+      ],
+    });
+  }
+  async compact(prompt: ProviderPrompt): Promise<boolean> {
+    if (prompt.input.type !== "command" || prompt.input.name !== "compact") return false;
+    await this.host.command("session/compact", { sessionId: this.sessionId }, ackSchema);
+    this.emit({
+      type: "session.prompt_result",
+      sessionId: this.id,
+      clientMessageId: prompt.clientMessageId,
+      result: { type: "completed" },
+    });
+    return true;
+  }
+  input(
+    command: Extract<ProviderPrompt["input"], { type: "command" }>,
+  ): TurnStartParams["input"][number] {
+    if (!this.selectors.has(command.name))
+      throw new MuseError("unknownCommand", `Muse skill is unavailable: ${command.name}`);
+    return { type: "skill", selector: command.name, arguments: command.arguments };
+  }
+}
diff --git a/plugins/muse-provider/server/connection.ts b/plugins/muse-provider/server/connection.ts
new file mode 100644
index 0000000000..3fca09ef5e
--- /dev/null
+++ b/plugins/muse-provider/server/connection.ts
@@ -0,0 +1,220 @@
+import type { ProviderLaunch } from "@getpaseo/plugin/server/provider";
+import { spawnProcess, terminateProcess } from "@getpaseo/plugin/server";
+import { randomBytes } from "node:crypto";
+import { createInterface } from "node:readline";
+import { setTimeout as delay } from "node:timers/promises";
+import { z } from "zod";
+import { MuseError, classifyExit } from "./errors.js";
+import { frameSchema, initializedSchema, fingerprint } from "./wire.js";
+
+export function commandId(): string {
+  const bytes = randomBytes(16);
+  bytes.writeUIntBE(Date.now(), 0, 6);
+  bytes[6] = 0x70 | (bytes[6]! & 0x0f);
+  bytes[8] = 0x80 | (bytes[8]! & 0x3f);
+  const hex = bytes.toString("hex");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+
+interface PendingRequest {
+  resolve(value: unknown): void;
+  reject(error: Error): void;
+  timer: ReturnType<typeof setTimeout>;
+}
+export interface Notification {
+  method: string;
+  params: unknown;
+}
+
+export class MspConnection {
+  private readonly child;
+  private readonly pending = new Map<string | number, PendingRequest>();
+  private readonly listeners = new Set<(notification: Notification) => void>();
+  private readonly exitListeners = new Set<(error: MuseError) => void>();
+  private sequence = 0;
+  private stderr = "";
+  private failure: MuseError | null = null;
+  private closing = false;
+  private closeResult: Promise<void> | null = null;
+  private readonly exited: Promise<void>;
+
+  constructor(
+    private readonly options: {
+      launch: ProviderLaunch;
+      cwd?: string;
+      timeoutMs?: number;
+      startupTimeoutMs?: number;
+      serveArgs?: string[];
+    },
+  ) {
+    const { launch, cwd } = options;
+    this.child = spawnProcess(
+      launch.command,
+      [...launch.args, "serve", ...(options.serveArgs ?? [])],
+      {
+        env: launch.env,
+        cwd,
+        stdio: "pipe",
+      },
+    );
+    this.child.stderr.setEncoding("utf8");
+    this.child.stderr.on("data", (chunk: string) => {
+      this.stderr = (this.stderr + chunk).slice(-8192);
+    });
+    const lines = createInterface({ input: this.child.stdout });
+    lines.on("line", (line) => {
+      try {
+        this.receive(frameSchema.parse(JSON.parse(line)));
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        this.fail(new MuseError("invalidFrame", `Invalid MSP frame: ${message}`));
+        void this.close().catch(() => {});
+      }
+    });
+    this.child.stdin.on("error", () => {
+      /* Process exit owns the diagnostic and pending requests. */
+    });
+    this.child.on("error", (error) => this.fail(new MuseError("spawn", error.message)));
+    this.exited = new Promise((resolve) => {
+      this.child.once("close", (code, signal) => {
+        lines.close();
+        this.fail(classifyExit(code, signal, this.stderr));
+        resolve();
+      });
+    });
+  }
+
+  async initialize(): Promise<void> {
+    const response = await this.request(
+      "initialize",
+      {
+        clientInfo: { name: "paseo", version: "1" },
+        capabilities: {
+          experimentalApi: true,
+          requestedCapabilities: ["sessionMcp", "sessionListStream"],
+        },
+      },
+      initializedSchema,
+      this.options.startupTimeoutMs ?? 30000,
+    );
+    if (response.schema.fingerprint !== fingerprint) {
+      process.stderr.write(
+        `Muse MSP fingerprint mismatch: expected ${fingerprint}, received ${response.schema.fingerprint}\n`,
+      );
+    }
+    this.write({ jsonrpc: "2.0", method: "initialized", params: {} });
+  }
+
+  onNotification(listener: (notification: Notification) => void): () => void {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  }
+  onExit(listener: (error: MuseError) => void): () => void {
+    this.exitListeners.add(listener);
+    return () => this.exitListeners.delete(listener);
+  }
+  async command<T, P extends object>(method: string, params: P, schema: z.ZodType<T>): Promise<T> {
+    const id =
+      "commandId" in params && typeof params.commandId === "string"
+        ? params.commandId
+        : commandId();
+    const input = { ...params, commandId: id };
+    for (let attempt = 0; ; attempt++) {
+      try {
+        return await this.request(method, input, schema);
+      } catch (error) {
+        const retryable =
+          error instanceof MuseError && ["overloaded", "backpressured"].includes(error.kind);
+        if (!retryable || attempt === 2) throw error;
+        await delay(100 * (attempt + 1));
+      }
+    }
+  }
+  async request<T>(
+    method: string,
+    params: object,
+    schema: z.ZodType<T>,
+    timeoutMs = this.options.timeoutMs ?? 10000,
+  ): Promise<T> {
+    if (this.failure) throw this.failure;
+    if (this.closing) throw new MuseError("closed", "Muse host is closing");
+    const id = ++this.sequence;
+    const response = await new Promise<unknown>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pending.delete(id);
+        reject(new MuseError("timeout", `Muse ${method} timed out`));
+      }, timeoutMs);
+      this.pending.set(id, { resolve, reject, timer });
+      this.write({ jsonrpc: "2.0", id, method, params });
+    });
+    return schema.parse(response);
+  }
+  close(): Promise<void> {
+    if (this.closeResult) return this.closeResult;
+    this.closing = true;
+    this.closeResult = this.finishClose();
+    return this.closeResult;
+  }
+  private async finishClose(): Promise<void> {
+    this.child.stdin.end();
+    const drained = await Promise.race([
+      this.exited.then(() => true),
+      delay(1000, undefined, { ref: false }).then(() => false),
+    ]);
+    if (drained) return;
+    await terminateProcess(this.child);
+    const stopped = await Promise.race([
+      this.exited.then(() => true),
+      delay(5000, undefined, { ref: false }).then(() => false),
+    ]);
+    if (!stopped) throw new MuseError("timeout", "Muse host did not close after termination");
+  }
+  private write(frame: object): void {
+    this.child.stdin.write(JSON.stringify(frame) + "\n");
+  }
+  private receive(frame: z.infer<typeof frameSchema>): void {
+    if (frame.method) {
+      if (frame.id !== undefined) {
+        if (["approval/request", "userInput/request"].includes(frame.method)) {
+          this.write({ jsonrpc: "2.0", id: frame.id, result: {} });
+        } else {
+          this.write({
+            jsonrpc: "2.0",
+            id: frame.id,
+            error: { code: -32601, message: "Unsupported server request" },
+          });
+        }
+        return;
+      }
+      for (const listener of this.listeners)
+        listener({ method: frame.method, params: frame.params });
+      return;
+    }
+    if (frame.id === undefined) throw new MuseError("invalidFrame", "MSP response has no id");
+    if (frame.id === null) {
+      if (!frame.error) throw new MuseError("invalidFrame", "MSP result has a null id");
+      this.fail(new MuseError(frame.error.data?.kind ?? "rpc", frame.error.message));
+      void this.close().catch(() => {});
+      return;
+    }
+    const pending = this.pending.get(frame.id);
+    if (!pending) return;
+    clearTimeout(pending.timer);
+    this.pending.delete(frame.id);
+    if (frame.error) {
+      let kind = frame.error.data?.kind ?? "rpc";
+      if (frame.error.code === -32020) kind = "sessionNotFound";
+      pending.reject(new MuseError(kind, frame.error.message, undefined, frame.error.data?.reason));
+    } else pending.resolve(frame.result);
+  }
+  private fail(error: MuseError): void {
+    if (this.failure) return;
+    this.failure = error;
+    for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
+      pending.reject(error);
+    }
+    this.pending.clear();
+    if (!this.closing) for (const listener of this.exitListeners) listener(error);
+  }
+}
diff --git a/plugins/muse-provider/server/errors.ts b/plugins/muse-provider/server/errors.ts
new file mode 100644
index 0000000000..86f6254af6
--- /dev/null
+++ b/plugins/muse-provider/server/errors.ts
@@ -0,0 +1,81 @@
+import type { ProviderError, ProviderLaunch } from "@getpaseo/plugin/server/provider";
+import path from "node:path";
+
+export class MuseError extends Error {
+  constructor(
+    readonly kind: string,
+    message: string,
+    readonly diagnostic?: string,
+    readonly reason?: string,
+  ) {
+    super(message);
+    this.name = "MuseError";
+  }
+  toProviderError(): ProviderError {
+    return { code: this.kind, message: this.message, diagnostic: this.diagnostic };
+  }
+}
+
+export function classifyExit(
+  code: number | null,
+  signal: string | null,
+  stderr: string,
+): MuseError {
+  const kinds: Record<number, string> = {
+    0: "cleanExit",
+    2: "usage",
+    3: "credentials",
+    4: "leaseHeld",
+    5: "surfaceOff",
+  };
+  const kind = code === null ? "crash" : (kinds[code] ?? "crash");
+  return new MuseError(kind, `Muse host exited (${code ?? signal}). ${stderr}`);
+}
+
+function isUnavailableReviewer(message: string): boolean {
+  return message.includes("automated reviewer is unavailable");
+}
+
+export function actionableError(error: unknown, launch: ProviderLaunch): ProviderError {
+  if (!(error instanceof Error)) return { code: "muse", message: String(error) };
+  // Muse 1.4.1 reports this profile failure as internal, without a specific error kind.
+  if (
+    error instanceof MuseError &&
+    error.kind === "internal" &&
+    isUnavailableReviewer(error.message)
+  ) {
+    const configHome = launch.env.XDG_CONFIG_HOME ?? path.join(launch.env.HOME ?? "~", ".config");
+    return {
+      code: "defaultProfileUnavailable",
+      message: `Change permissions.default_profile in ${path.join(configHome, "muse/settings.json")}: the automated reviewer is unavailable on this host.`,
+    };
+  }
+  if (error instanceof MuseError && error.reason === "compaction_unavailable") {
+    return {
+      code: error.kind,
+      message:
+        "Muse cannot compact this session with its current model configuration. Ensure Muse has a context limit for the selected model (context_compaction.provider_context_limit_tokens).",
+      diagnostic: error.message,
+    };
+  }
+  if (error instanceof MuseError && error.kind === "sessionNotFound") {
+    return { code: error.kind, message: "This Muse session no longer exists. Create a new agent." };
+  }
+  if (error instanceof MuseError && error.kind === "authRequired") {
+    return { code: error.kind, message: "Run `muse login` or set META_API_KEY." };
+  }
+  // Muse 1.4.1 reports this bootstrap failure as internal, without a specific error kind.
+  if (
+    error instanceof MuseError &&
+    error.kind === "internal" &&
+    error.message.includes("UnsafePath")
+  ) {
+    const dataHome = launch.env.XDG_DATA_HOME ?? path.join(launch.env.HOME ?? "~", ".local/share");
+    return {
+      code: "unsafePath",
+      message: `Muse data directory ${path.join(dataHome, "muse")} requires mode 0700. Set its permissions before retrying.`,
+    };
+  }
+  if (error instanceof MuseError) return error.toProviderError();
+  return { code: "muse", message: error.message };
+}
diff --git a/plugins/muse-provider/server/msp.d.ts b/plugins/muse-provider/server/msp.d.ts
new file mode 100644
index 0000000000..8f2180932d
--- /dev/null
+++ b/plugins/muse-provider/server/msp.d.ts
@@ -0,0 +1,2690 @@
+// Vendored from Muse Code 1.4.1 via muse schema generate-ts.
+// Stable fingerprint: sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f
+// Muse Session Protocol (MSP) v1 TypeScript declarations.
+// STABLE surface only; experimental twin: experimental/msp.d.ts.
+// Generated by tbh-protocol (spec 206) from the same schema model as
+// the JSON Schema bundle (INV-017). Do not edit by hand.
+
+export interface ApprovalAmendment {
+  durability: ApprovalAmendmentDurability;
+  rulePreview: string;
+}
+
+export type ApprovalAmendmentDurability = "session" | "localPersistent" | (string & {});
+
+export interface ApprovalChange {
+  choiceId?: string;
+  decision?: ApprovalDecision;
+  executable?: boolean;
+  kind: string;
+  reason?: string;
+  reparsed?: boolean;
+  requirementId?: ApprovalRequirementRef;
+  status?: ApprovalPersistenceStatus;
+}
+
+export interface ApprovalChoice {
+  acceptsFeedback?: boolean;
+  choiceId: string;
+  decision: ApprovalDecision;
+  label: string;
+  rulePreview?: string;
+  scope: ApprovalChoiceScope;
+}
+
+export type ApprovalChoiceScope = "once" | "session" | "localPersistent" | (string & {});
+
+/** `approval/decide` params (tdd SS5.4): the decision. A standard SS3 command — requires the session loaded on this host, requires `commandId`, durable intake before ack, value-identical replay. */
+export interface ApprovalDecideParams {
+  /** The approval being decided. */
+  approvalId: string;
+  /** One of the current `availableChoices`; else -32052. */
+  choiceId: string;
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** Free-text guidance delivered to the model with the denial. Only valid on choices with `acceptsFeedback`. Never persisted in the durable audit record (live steer only), so it is absent from `approval/resolved` (tdd SS5.4). Omitted and explicit `null` both mean "no feedback" (#23468). */
+  feedback?: string | null;
+  /** Must equal the approval's `currentRequirementId`. The multi-stage race guard: a decision aimed at stage 1 can never accidentally satisfy stage 2, and a stale value is -32053 (tdd SS5.4). */
+  requirementId: ApprovalRequirementRef;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `approval/decide` result (tdd SS5.4). Admission-ack rules still apply: the authoritative outcome is `approval/resolved` / `approval/updated` on the view stream. */
+export interface ApprovalDecideResult {
+  /** The approval this decision was applied to. */
+  approvalId: string;
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** `false` when the choice satisfied a stage but further requirements remain (the approval stays pending and an updated `approval/request` follows); `true` when this decision produced the terminal `DecisionApplied` (tdd SS5.4). */
+  terminal: boolean;
+}
+
+export type ApprovalDecision =
+  | "approved"
+  | "approvedForSession"
+  | "approvedPolicyAmendment"
+  | "denied"
+  | "deniedPolicyAmendment"
+  | "timedOut"
+  | "abort"
+  | (string & {});
+
+/** `approval/listPending` params (tdd SS5.7): the pull dual of the re-issued requests. A log-fold read — no lease, works on loaded and unloaded sessions, never subscribes. */
+export interface ApprovalListPendingParams {
+  /** The session to read. */
+  sessionId: string;
+}
+
+/** `approval/listPending` result (tdd SS5.7). Ordering is by opening `viewCursor`; empty arrays when nothing is pending. The result is point-in-time — to act on it race-safely, `approval/decide` carries the `requirementId` guard regardless of how the client learned the state. */
+export interface ApprovalListPendingResult {
+  /** Exactly the `approval/request` params of tdd SS5.3, one per pending approval. */
+  approvals: ApprovalRequestParams[];
+  /** Exactly the `userInput/request` params of tdd SS5.10, one per pending prompt. */
+  userInputs: UserInputRequestParams[];
+}
+
+/** The approval enforcement modes (tdd SS5.12, camelCased `ApprovalBackendMode`). **Closed** by design (D-006, select-never-create): a client selects a preconfigured mode and can never construct one; widening this enum is a deliberate, gate-visible protocol change. */
+export type ApprovalMode = "allowAll" | "promptUnmatched" | "onRequest" | "denyUnmatched";
+
+/** Whether a mode change did anything (tdd SS5.12), mirroring `ApprovalReconfigureApplyOutcome`. Apply failures are `commandRejected`. */
+export type ApprovalModeApplyOutcome = "completed" | "noop" | (string & {});
+
+/** How an approval mode took effect (tdd SS5.12, the effective-mode projection's `source` vocabulary). Open. */
+export type ApprovalModeSource = "startup" | "replay" | "approvalReconfigure" | (string & {});
+
+export interface ApprovalOrigin {
+  command?: string;
+  kind: string;
+  url?: string;
+}
+
+export type ApprovalPersistenceStatus = "succeeded" | "failed" | (string & {});
+
+export type ApprovalPolicyResult = "allow" | "deny" | (string & {});
+
+/** Full params shared by `approval/request` and `approval/requested`. */
+export interface ApprovalRequestParams {
+  approvalId: string;
+  availableChoices: ApprovalChoice[];
+  currentRequirementId: ApprovalRequirementRef;
+  itemId: string;
+  judgeEscalated: boolean;
+  protectedWrite: boolean;
+  rawArgs: string;
+  sessionId: string;
+  sourceRange: SourceRange;
+  /** Present only for a child (native subagent) approval projected onto the parent session's plane (ADR 36182); parent-own approvals omit it. */
+  subagentOrigin?: ApprovalSubagentOrigin;
+  subject: ApprovalSubject;
+  taskId: string;
+  toolCallId: string;
+  toolName: string;
+  turnId: string;
+  viewCursor: string;
+}
+
+/** Approval-stage token carried in SS5 params and stale-requirement errors. */
+export interface ApprovalRequirementRef {
+  approvalId: string;
+  sourceIndex: number;
+}
+
+/** Winning terminal returned to a losing `approval/decide` command. */
+export interface ApprovalResolutionSummary {
+  decision: string;
+  resolvedBy: string;
+  viewCursor: string;
+}
+
+export type ApprovalResolvedBy = "user" | "policy" | "llmJudge" | (string & {});
+
+/** `approval/resolved` params: the first durable terminal decision. */
+export interface ApprovalResolvedParams {
+  amendment?: ApprovalAmendment;
+  approvalId: string;
+  decidedByCommandId?: string;
+  decision: ApprovalDecision;
+  itemId: string;
+  policyResult: ApprovalPolicyResult;
+  resolvedBy: ApprovalResolvedBy;
+  sessionId: string;
+  sourceRange: SourceRange;
+  stageEvidence: ApprovalStageEvidence[];
+  /** Present only for a child (native subagent) approval projected onto the parent session's plane (ADR 36182); parent-own approvals omit it. */
+  subagentOrigin?: ApprovalSubagentOrigin;
+  turnId: string;
+  viewCursor: string;
+}
+
+export interface ApprovalStage {
+  argv: string[];
+  argvComplete: boolean;
+  position: number;
+  requirementId: ApprovalRequirementRef;
+  resolution: ApprovalStageResolution;
+  suggestedPrefix?: ApprovalSuggestedPrefix;
+  totalStages: number;
+}
+
+export interface ApprovalStageEvidence {
+  argv: string[];
+  position: number;
+  requirementId: ApprovalRequirementRef;
+  resolution: ApprovalStageResolution;
+  totalStages: number;
+}
+
+export interface ApprovalStageResolution {
+  argvPrefix?: string[];
+  diagnostic?: string;
+  kind: string;
+}
+
+/** Child (native subagent) provenance for an approval projected onto the PARENT session's approval plane (#36182 / ADR 36182): identifies the originating child run/agent so a client can attribute the prompt. Omitted (`skip_serializing_if`) on the parent's own approvals, so pre-existing parent frames stay byte-identical. */
+export interface ApprovalSubagentOrigin {
+  /** The child run that parked on this approval. */
+  childRunId: string;
+  /** The child session stream id whose records carry this approval. */
+  childSessionId: string;
+  /** The originating child's subagent id, from the parent session's durable subagent control records. */
+  subagentId: string;
+}
+
+/** Open approval subject union. Unknown kinds are rendered generically and never auto-approved by clients (tdd SS5.2). */
+export interface ApprovalSubject {
+  access?: string;
+  command?: string;
+  host?: string;
+  /** Open discriminator: `shell | fileAccess | network | unixSocket | process | tool`. */
+  kind: string;
+  origin?: ApprovalOrigin;
+  path?: string;
+  port?: number;
+  protocol?: string;
+  stages?: ApprovalStage[];
+  target?: string;
+  toolName?: string;
+  workspaceRoot?: string;
+}
+
+export interface ApprovalSuggestedPrefix {
+  argvPrefix: string[];
+  label: string;
+}
+
+/** `approval/updated` params: the refreshed pending view plus one change. */
+export interface ApprovalUpdatedParams {
+  approvalId: string;
+  availableChoices: ApprovalChoice[];
+  change: ApprovalChange;
+  currentRequirementId: ApprovalRequirementRef;
+  sessionId: string;
+  sourceRange: SourceRange;
+  /** Present only for a child (native subagent) approval projected onto the parent session's plane (ADR 36182); parent-own approvals omit it. */
+  subagentOrigin?: ApprovalSubagentOrigin;
+  subject: ApprovalSubject;
+  viewCursor: string;
+}
+
+/** One attention flag (tdd SS2.4, ADR 31983 D3): a pending server-initiated request class parked on the session. Open on the wire — clients MUST ignore unknown values; future attention kinds are additive. */
+export type AttentionFlag = "approvalPending" | "inputPending" | (string & {});
+
+/** Who durably backgrounded a task (tdd SS4.5.5, `TaskBackgroundedInitiator`). Open — runtime vocabulary. */
+export type BackgroundInitiator = "user" | "timeout" | (string & {});
+
+/** The latest branch observation in the snapshot (tdd SS4.6.4, SS4.9.1). */
+export interface BranchState {
+  /** The observed branch; `null` on a detached-HEAD observation. */
+  branch: string | null;
+  /** The detected version-control system; absent when none was detected. */
+  vcs?: Vcs;
+  /** The observed workspace root. */
+  workspaceRoot: string;
+}
+
+/** A grantable capability name (SS1.4.4). Open: the reserved `rawLog` entry joins this domain as an additive open-enum extension when SS6 un-defers (#13929, Scenario 5 AS-3) — closed would make that a retype. */
+export type CapabilityName = "userShell" | "sessionMcp" | "sessionListStream" | (string & {});
+
+/** The client's requested capability posture (SS1.4.1). Every member defaults; an absent `capabilities` object means all defaults. */
+export interface ClientCapabilities {
+  /** Opt into experimental methods, fields, and variants (default `false`). */
+  experimentalApi?: boolean;
+  /** Exact notification method names the client declines; no wildcards; unknown names accepted and ignored; the protected set (SS1.7) cannot be opted out. */
+  optOutNotificationMethods?: string[];
+  /** Names from the capability registry. Unknown entries are not an error and simply do not appear in `grantedCapabilities` — which is why this is a list of free strings rather than of registry names. */
+  requestedCapabilities?: string[];
+  /** Whether this client can render a `userInput/request` dialog and answer it (SS5.10). **Absent means capable** (D-047): a client that predates the member keeps today's contract, so no existing client changes its handshake. `false` makes the host withhold `userInput/request` toward this client — the D-027 additive-optional-field + withheld-method convention.  Deliberately NOT a `requestedCapabilities` name: that registry records operations a host GRANTS (SS1.4.4), and whether a client can draw a dialog is a fact about the client, never a privilege the host hands out. */
+  userInputDialogs?: boolean;
+}
+
+/** Client identification inside `initialize` params (SS1.4.1). Diagnostics and telemetry attribution only; never an authority claim (SS1.10). */
+export interface ClientInfo {
+  /** Machine identifier, `[a-z0-9_]+` (SS1.4.1). */
+  name: string;
+  /** Human display name. */
+  title?: string;
+  /** Client version string. */
+  version: string;
+}
+
+/** The uniform SS3.1.2 command acknowledgement: admission only, never an outcome. `session/compact` alone may answer `"noop"`; every other command answers `"accepted"`. */
+export interface CommandAcceptedResult {
+  /** Echo of the client-minted UUIDv7 `commandId` (SS3.1.1). */
+  commandId: string;
+  /** `"accepted"` for every admitted command (SS3.1.2; closed vocabulary). */
+  status: CommandAckStatus;
+}
+
+/** The ack-status vocabulary (`tdd.md` SS3.1/SS3.1.2): `"accepted"` for every admitted command; `session/compact` alone may answer `"noop"`. Closed: SS3.1.2 names exactly these two values, so SDK clients get a discriminated type and validation catches a wrong status (PR #21550 review) — and a client that received a third value would have been told nothing it can act on, unlike [`TurnStartDisposition`], where "acked, not otherwise classified" is a usable reading. */
+export type CommandAckStatus = "accepted" | "noop";
+
+/** The SS3.1.2 ack `status`: `accepted` for every admitted command. `session/compact` is the one method that may additionally answer `noop` ([`crate::method::runtime::CompactStatus`]); no other command uses another status (tdd SS3.1.2). */
+export type CommandStatus = "accepted" | (string & {});
+
+/** `session/compact`'s ack status (tdd SS3.7): the one method that may answer `noop` in addition to the SS3.1.2 `accepted`. A noop is a success, not an error, and it is durably settled like any other outcome. */
+export type CompactStatus = "accepted" | "noop" | (string & {});
+
+/** Compaction outcome (tdd SS4.5.10, the SS3.7 vocabulary). Open. */
+export type CompactionOutcome = "compacted" | "noop" | "failed" | "cancelled" | (string & {});
+
+/** What initiated a compaction (tdd SS4.5.10). Open. */
+export type CompactionTrigger = "manual" | "auto" | (string & {});
+
+/** Context pressure level (tdd SS4.6.6): hard threshold first, both inclusive `>=`. Open. */
+export type ContextPressureLevel = "normal" | "warning" | "blocked" | (string & {});
+
+/** The SS4.9.1 snapshot `contextUsage` block: the latest `(windowTokens, usedTokens, pressure)` triple; the snapshot member is `null` until the fold's generation chain holds a tracked anchor AND the current basis is present (absent is never fabricated). */
+export interface ContextUsage {
+  /** Server-computed pressure level. */
+  pressure: ContextPressureLevel;
+  /** Counted-once occupancy at the latest provider-reported fact. */
+  usedTokens: number;
+  /** The effective context-window size; absent when the basis has no limit. */
+  windowTokens?: number;
+}
+
+/** Session running totals of counted-once usage (tdd SS4.6.5). */
+export interface CumulativeTokenUsage {
+  /** Output tokens, session total. */
+  outputTokens: number;
+  /** Counted-once prompt tokens, session total. */
+  promptTokens: number;
+  /** Counted-once totals, session total. */
+  totalTokens: number;
+}
+
+/** The effective approval-mode projection (`EffectiveApprovalModeState`, tdd SS5.12): the same object `session/setApprovalMode` returns as `effectiveMode` and the `Session` object carries as `approvalMode`. */
+export interface EffectiveApprovalModeState {
+  /** The command that last set it; `null` when no command did. */
+  lastCommandId: string | null;
+  /** The mode in effect. */
+  mode: ApprovalMode;
+  /** How the mode took effect. */
+  source: ApprovalModeSource;
+}
+
+/** The latest effective-model fact in the snapshot (tdd SS4.9.1). */
+export interface EffectiveModel {
+  /** The selected model. */
+  modelId: string;
+  /** The selected provider; `null` when the selection names none. */
+  providerId: string | null;
+  /** What drove the selection. */
+  source: ModelChangeSource;
+}
+
+/** The optional `error.data` object (SS1.6). All members additive-optional; `kind` is always present when `data` is. */
+export interface ErrorData {
+  /** The next provable UTF-8 boundary on a misaligned text-media `item/readOutput` read (`-32602` `invalidParams`, FR-016b/D-17214-2): absent when no boundary is provable from the stored bytes ahead. */
+  alignedNextOffset?: number;
+  /** The rejected anchor value on `notFound`/`missingAnchor` and the `-32042` boundary arms (SS4.7.3, SS4.11); on `-32042` it is served as an explicit `null` when the request named no concrete anchor (spec 208 FM-005). */
+  anchor?: string | null;
+  /** Approval identity on SS5 errors. */
+  approvalId?: string;
+  /** The stored output's availability on `outputUnavailable` — the durable `ToolOutputAvailability` value, read-time-derived when the durable record still says `available` (SS4.5.5; spec 208 FM-008). */
+  availability?: string;
+  /** The missing capability, on `capabilityRequired` errors. Typed on the grantable registry, so `rawLog` is outside the v1 domain and joins it as an additive open-enum extension when SS6 un-defers (TEST-009). */
+  capability?: CapabilityName;
+  /** The configured command-admission bound, on `backpressured` errors. */
+  capacity?: number;
+  /** Rejected server-minted choice on `approvalChoiceInvalid`. */
+  choiceId?: string;
+  /** The rejected command's identifier, on `commandRejected` errors. The ratified v1 contract pairs it with `reason` (specs/13929-msp-activation/tdd.md SS3.6 admission-failure table and its `-32030` example), so a client can settle the exact command it sent without parsing the message string. */
+  commandId?: string;
+  /** Current stage token on `approvalRequirementStale`. */
+  currentRequirementId?: ApprovalRequirementRef;
+  /** SS1.5.1 descriptor, on `experimentalRequired` errors. */
+  descriptor?: string;
+  /** Free-form additive detail. */
+  details?: Record<string, unknown>;
+  /** The oldest servable view position on `viewTruncated` (`-32040`, SS4.11); served as an explicit `null` when nothing before the head is servable — the null is present on the wire, never a dropped key (spec 208 FM-005 / Scenario 6.2). */
+  earliestCursor?: string | null;
+  /** The item whose stored output was requested, on the `item/readOutput` arms (`notFound`, `outputUnavailable`, and the misaligned-offset `invalidParams`). */
+  itemId?: string;
+  /** The stable camelCase category clients branch on. */
+  kind: ErrorKind;
+  /** Rejected inclusive fork boundary on `forkBoundaryInvalid`. */
+  lastTurnId?: string;
+  /** The latest installed boundary's view cursor on the `-32042` arms — always present in the `-32042` JSON and explicitly `null` when no boundary exists (SS4.11, FM-004). */
+  latestBoundaryCursor?: string | null;
+  /** The exceeded byte limit, on `inputTooLarge` errors. */
+  limitBytes?: number;
+  /** The requested `outputRef.id`, on the same `item/readOutput` arms. */
+  outputRef?: string;
+  /** Candidate retained paths on `sessionAmbiguous`. */
+  paths?: string[];
+  /** Failure detail vocabulary (e.g. `"missingAnchor"` on `notFound` for a missing view-cursor anchor). */
+  reason?: string;
+  /** Winning resolution on `approvalAlreadyResolved`. */
+  resolution?: ApprovalResolutionSummary;
+  /** Whether retrying can succeed (e.g. `overloaded`). When present, overrides the error table row's `retryable` default for this code. */
+  retryable?: boolean;
+  /** The rejected skill selector on `skillNotFound` (`-32032`, SS3.22.4). */
+  selector?: string;
+  /** Session identity on errors whose lookup is session-scoped. */
+  sessionId?: string;
+  /** Winning settlement on `userInputAlreadySettled`. */
+  settlement?: UserInputSettlementSummary;
+  /** User-input prompt identity on SS5.10 errors. */
+  userInputId?: string;
+  /** The blocked view position on `pageEventTooLarge` errors. */
+  viewCursor?: string;
+}
+
+/** A stable `error.data.kind` category (SS1.6): camelCase, the value clients branch on. Open: SS2–SS5 lanes add kinds additively as their methods land (Appendix B already registers them), and the spec's edge-case rule makes a new `kind` additive only because this domain is declared open. */
+export type ErrorKind =
+  | "parseError"
+  | "invalidRequest"
+  | "notInitialized"
+  | "alreadyInitialized"
+  | "methodNotFound"
+  | "invalidParams"
+  | "experimentalRequired"
+  | "internal"
+  | "pageEventTooLarge"
+  | "outputResultTooLarge"
+  | "overloaded"
+  | "inputTooLarge"
+  | "capabilityRequired"
+  | "notFound"
+  | "interrupted"
+  | "cancelled"
+  | "sessionNotFound"
+  | "sessionInUse"
+  | "sessionAmbiguous"
+  | "forkBoundaryInvalid"
+  | "sessionNotLoaded"
+  | "sessionStreamMismatch"
+  | "commandRejected"
+  | "backpressured"
+  | "skillNotFound"
+  | "viewTruncated"
+  | "outputUnavailable"
+  | "boundaryPruned"
+  | "boundaryUnusable"
+  | "noBoundary"
+  | "approvalNotFound"
+  | "approvalAlreadyResolved"
+  | "approvalChoiceInvalid"
+  | "approvalRequirementStale"
+  | "approvalReviewerUnavailable"
+  | "userInputNotFound"
+  | "userInputAlreadySettled"
+  | "userInputAnswerInvalid"
+  | (string & {});
+
+/** The `error` member of an error response (SS1.2 §2.4). */
+export interface ErrorObject {
+  /** Registry code (Appendix B). Typed as a plain integer on the wire; the value domain is the registry below (INV-018). */
+  code: number;
+  /** Structured detail; carries `kind` when present. */
+  data?: ErrorData;
+  /** Human-readable message. Never a branch point (SS1.6). */
+  message: string;
+}
+
+/** An error response frame (SS1.2 §2.4). Exactly one of `result` or `error` appears on a response; this type is the `error` half. */
+export interface ErrorResponse {
+  /** The error payload (Appendix B registry). */
+  error: ErrorObject;
+  /** Echo of the request id; `null` **only** for an unrecoverable parse error whose offending id could not be recovered (SS1.3). Always serialized, so `None` renders as `null` rather than being omitted — required-but-nullable (see [`require_nullable_id`]). */
+  id: RequestId | null;
+  /** The literal `"2.0"`. */
+  jsonrpc: JsonRpcVersion;
+}
+
+/** Where a fork cuts the source history (tdd SS2.5.3). Turn ids are used instead of counts because ids stay stable across compaction and concurrent appends while indices do not. */
+export interface ForkCutPoint {
+  /** The last completed turn to copy, inclusive. Naming an in-progress or unknown turn fails `forkBoundaryInvalid`. */
+  lastTurnId: string;
+}
+
+/** Fork provenance folded from the durable `session.fork.created` record (`ForkProvenance`, tdd SS2.4). */
+export interface ForkProvenance {
+  /** The `commandId` of the `session/fork` that created it. */
+  commandId: string;
+  /** An **opaque provenance string** preserved verbatim from the durable record. Display-only — not one of the SS6.2 cursor families: clients MUST NOT parse it and no method accepts it (tdd SS2.4). */
+  cutCursor: string;
+  /** Whether the fork named an explicit cut point. */
+  cutExplicit: boolean;
+  /** The source session this fork was cut from. */
+  sessionId: string;
+}
+
+/** The session goal block (tdd SS4.6.2, mirrors the runtime's goal state, camelCased). `status` and `percentComplete` are carried **verbatim** — out-of-contract status strings and >100 percents pass through; display clamping is the renderer's job. */
+export interface Goal {
+  /** Current work description, when present. */
+  currentWork?: string;
+  /** Next work description, when present. */
+  nextWork?: string;
+  /** The goal objective text. */
+  objective: string;
+  /** Percent complete, verbatim (>100 passes through). */
+  percentComplete: number;
+  /** Goal status, verbatim from the durable goal state (free string by design: out-of-contract values pass through). */
+  status: string;
+}
+
+/** `goal/clear` params (tdd SS3.18). An `objective` here is an unknown field and rejects `-32602 invalidParams` — the bare verbs carry exactly this pair. */
+export interface GoalClearParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** The shared SS3.18 goal ack, admission-only: all five verbs answer this one shape (the tdd's "Shared contract"), differing only in when `turnId` is present. */
+export interface GoalCommandResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** Present by exactly the four SS3.18 result cases: an idle wake carries the fresh goal turn's id; a busy `set`/`edit`/`resume` carries the admission-time active turn's id (a routing fact, not a delivery promise); `pause`/`clear` never carry it; an idle admission whose resulting goal is not unfinished parks the notification and carries none. **Additive-optional**: absent means "no turn named", never fabricated. */
+  turnId?: string;
+}
+
+/** `goal/edit` params (tdd SS3.18): replace the current goal's objective. Same shape as `goal/set`; the verbs differ in their `missing_goal` precondition, not their payload. */
+export interface GoalEditParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The replacement objective; same trim/non-empty rule as `goal/set`. */
+  objective: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `goal/pause` params (tdd SS3.18); shape as `goal/clear`. */
+export interface GoalPauseParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `goal/resume` params (tdd SS3.18); shape as `goal/clear`. */
+export interface GoalResumeParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `goal/set` params (tdd SS3.18): set the session's goal objective. */
+export interface GoalSetParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The objective text; required, non-empty after Unicode-whitespace trim (the trimmed text is the payload). Empty-after-trim is `-32602 invalidParams` (tdd SS3.18). */
+  objective: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** What history a lifecycle result actually served (tdd SS2.5.2). Open on the client side: report-what-was-served means a client treats an unknown mode as "page it yourself". */
+export type HistoryMode = "anchoredSnapshot" | "inline" | "snapshot" | "none" | (string & {});
+
+/** Why a result served `history.mode: "none"` — spec 208 FM-005's typed unavailability (tdd SS2.5.2; D-050). Open on the client side: an absent (older server) or unknown (newer server) value decodes conservatively as an unknown reason, and `viewCursor` text never substitutes for it (spec 208 INV-19734-1). */
+export type HistoryNoneReason =
+  | "excluded"
+  | "cursorSuffix"
+  | "historyBudget"
+  | "projectionUnavailable"
+  | "projectionReadLimit"
+  | (string & {});
+
+/** The `history` request preference of `session/resume` (tdd SS2.5.2). The forced values downgrade `anchored` → `inline` → `snapshot` → `none`; under `auto` the full rung order is anchoredSnapshot → inline → snapshot → elided snapshot → none. */
+export type HistoryPreference = "auto" | "inline" | "snapshot" | "anchored";
+
+/** Disposition when a turn is already running (tdd SS3.2). The wire default is `queue`: an SDK caller who has not looked at session state should not silently mutate an in-flight turn. */
+export type IfBusy = "queue" | "steer" | "replace";
+
+/** `initialize` request params (SS1.4.1). */
+export interface InitializeParams {
+  /** Capability posture; absent means all defaults. */
+  capabilities?: ClientCapabilities;
+  /** Client identification. */
+  clientInfo: ClientInfo;
+}
+
+/** The `initialize` result (SS1.4.1). */
+export interface InitializeResult {
+  /** Echo of the effective negotiated experimental setting. */
+  experimentalApi: boolean;
+  /** Subset of the requested capabilities, plus policy-implicit grants. Fixed for the connection lifetime (INV-009). */
+  grantedCapabilities: CapabilityName[];
+  /** Absolute path of the muse home directory. */
+  museHome: string;
+  /** Server runtime platform family. */
+  platformFamily: PlatformFamily;
+  /** Server operating system. */
+  platformOs: PlatformOs;
+  /** Envelope schema version and stable-surface fingerprint. */
+  schema: SchemaInfo;
+  /** Server identification. */
+  serverInfo: ServerInfo;
+  /** Whether this host persists its sessions (SS2.13). Optional so the addition is additive under SS1.5.4; a v1 host always sends it, and a client reads absent as `durable` because no server that omits it has the ephemeral profile. */
+  sessionDurability?: SessionDurability;
+  /** Exact user-agent string presented to upstream model providers. */
+  userAgent: string;
+}
+
+/** One transcript item at one revision (tdd SS4.4.1 common fields plus the per-kind fields of SS4.5.2–4.5.10, all optional and owned by the kind their doc names). `item/started`, `item/updated`, and `item/completed` carry the full object; `item/delta` appends to it by field path. */
+export interface Item {
+  /** `subagent`: agent definition path. */
+  agentPath?: string;
+  /** `toolCall`: the approval that gated this call (tdd SS5); join key for the approval view events. */
+  approvalId?: string;
+  /** `toolCall`: the model-authored argument JSON, **verbatim**; clients parse. Verbatim keeps the fold byte-deterministic and survives model-emitted almost-JSON (tdd SS4.5.5). */
+  args?: string;
+  /** `userMessage`: image attachment metadata only — base64 payloads are not echoed back on the view (tdd SS4.5.2). */
+  attachments?: MessageAttachment[];
+  /** `toolCall`: `true` once the task was durably backgrounded; delivered via `item/updated`. */
+  background?: boolean;
+  /** `toolCall`: who backgrounded the task; absent on pre-split records — never inferred (tdd SS4.5.5). */
+  backgroundInitiator?: BackgroundInitiator;
+  /** `toolCall`: the provider call id (`call_...`), opaque. */
+  callId?: string;
+  /** `subagent`/`reminderChild`: the child's own session id, readable via `session/read`/`view/page` — child transcript drill-down without a second protocol (tdd SS4.5.7). */
+  childSessionId?: string;
+  /** `reminderChild`: parent-session-dir-relative child log path; absent when no filesystem log. */
+  childSessionLogPath?: string;
+  /** `workflow`: folded per-child state, keyed by `(childId, attempt)`, re-emitted whole on every change — the item `revision` is the ordering guard (tdd SS4.5.8). */
+  children?: WorkflowChild[];
+  /** `userMessage`/`userShell`: the submitting command — multi-client UIs de-duplicate their local echo on it. */
+  commandId?: string;
+  /** `userShell`: the command text as submitted. */
+  commandText?: string;
+  /** `subagent`: camelCased `SubagentControlStatus` (open enum); `status` stays the generic item vocabulary. */
+  controlStatus?: SubagentControlStatus;
+  /** `subagent`: nesting depth. */
+  depth?: number;
+  /** `userMessage`: presentation form (tdd SS3.2); absent when the client sent none. */
+  displayText?: string;
+  /** `userShell`/`subagent`: observed wall-clock duration. */
+  durationMs?: number;
+  /** `workflow`: launched entry identity. */
+  entryId?: string;
+  /** `userShell`: the process exit code, when it exited by code. */
+  exitCode?: number;
+  /** `userShell`: the terminating signal NUMBER, when signalled (e.g. 9) — the durable payload verbatim; nothing maps numbers to names, and the fold never invents one. */
+  exitSignal?: number;
+  /** `toolCall`: machine-readable failure class (`TaskFailureKind`, snake_case verbatim — durable runtime vocabulary, the SS1.6 casing exemption). */
+  failureKind?: string;
+  /** `toolCall`/`subagent`: `Failed`/`Rejected`/`Cancelled` reason text, verbatim. */
+  failureReason?: string;
+  /** Server-provided one-line human summary any kind MAY carry, for generic rendering of kinds a client does not recognize; new kinds SHOULD carry it during their first release cycle (tdd SS4.10). */
+  fallbackText?: string;
+  /** `reminderChild`: the reminder generation. */
+  generationId?: number;
+  /** Bare UUIDv7; the item's identity across its whole lifecycle. Identity rule (tdd SS4.4.1): the task id for task-backed kinds (`toolCall`, `subagent`), the pre-minted commit `message_id` for delta-streamed kinds (`agentMessage`, `reasoning`), and the opening durable record's event id for everything else. Opaque to clients. */
+  itemId: string;
+  /** The item kind (open enum): clients MUST render unknown kinds generically — kind name plus `status` plus `fallbackText` (tdd SS4.10). */
+  kind: ItemKind;
+  /** `workflow`: the reconciled terminal message, set on completion. */
+  message?: string;
+  /** `toolCall`: rich content the model saw beyond text; base64 is not inlined on the view (tdd SS4.5.5). */
+  modelVisibleContent?: ModelVisibleContent[];
+  /** `subagent`: objective as spawned. */
+  objective?: string;
+  /** `compaction`: terminal only — folds installed/fallback status. */
+  outcome?: CompactionOutcome;
+  /** `toolCall`/`userShell`: stored-output reference; fetch the full bytes via `item/readOutput` (served by #208). */
+  outputRef?: OutputRef;
+  /** `toolCall`: stored structured-patch reference (`kind: "tool_patch"`, `mediaType: "application/json"`); the body is fetched via `item/readOutput` with `patchRef.id`, and the ref survives the SS2.5.2 elided-snapshot rung exactly like `outputRef` without ever being an elision trigger (tdd SS2.5.2, SS4.5.5; #33025). */
+  patchRef?: OutputRef;
+  /** `toolCall`: server-authored edit-family diff summary (#33025) — always beside `patchRef`; absent = no diff available (tdd SS4.5.5). */
+  patchSummary?: PatchSummary;
+  /** `reasoning`: provider reasoning item id (e.g. `rs_...`), for provider-side correlation. */
+  providerItemId?: string;
+  /** `compaction`: noop/failure reason, verbatim (snake_case durable vocabulary, e.g. `"no_compactable_history"`). */
+  reason?: string;
+  /** RFC3339 timestamp of the item's driving durable record. Absent on ephemeral-opened items until first durable re-emission (tdd SS4.4.1). */
+  recordedAt?: string;
+  /** `reminderChild`: the reminder agent's id. */
+  reminderAgentId?: string;
+  /** `subagent`: the result envelope from `ResultReady` (tdd SS4.5.7). */
+  result?: SubagentResult;
+  /** `workflow`: set on resumed launches. */
+  resumeFromRunId?: string;
+  /** `userMessage`: `true` after an accepted retract (tdd SS4.5.1); re-emitted via `item/updated`. */
+  retracted?: boolean;
+  /** Integer >= 1, strictly monotonic per item; apply rule is replace-iff-higher. `item/delta` never bumps it (tdd SS4.4.1). */
+  revision: number;
+  /** `subagent`: role as spawned. */
+  role?: string;
+  /** `workflow`: launched script identity. */
+  scriptId?: string;
+  /** Open enum; terminal = anything other than `"inProgress"`. Unknown values MUST be treated as terminal-unknown and rendered generically (tdd SS4.4.1). */
+  status: ItemStatus;
+  /** `userMessage`: `true` when injected mid-turn via `turn/steer` or `ifBusy: "steer"`; absent otherwise. */
+  steered?: boolean;
+  /** `compaction`: summarizer strategy (installed only). */
+  strategyId?: string;
+  /** `subagent`: durable child identity (`subagent_id`). */
+  subagentId?: string;
+  /** `compaction`: opaque provenance string naming the compaction boundary. A compaction-anchored read anchor since D-029 (2026-08-12): accepted by `session/resume` and `view/page` (wire shape and validation are the #208 lane's). Still opaque — clients relay it, never parse it (tdd SS4.5.10). */
+  summarizedThrough?: string;
+  /** `reasoning`: one entry per summary part; part *n* streams via `item/delta` field `"summary.n"` (part boundary = index change). */
+  summary?: string[];
+  /** `reminderChild`: the linked task id. */
+  taskId?: string;
+  /** `userMessage`: the prompt text as submitted. `agentMessage`: the accumulated reply, streamed via `item/delta` field `"text"`. `reasoning`: raw committed reasoning text where the provider exposes it (never streamed in v1, tdd SS4.5.4). */
+  text?: string;
+  /** `compaction`: token budget snapshot after, when measured. */
+  tokensAfter?: number;
+  /** `compaction`: token budget snapshot before, when measured. */
+  tokensBefore?: number;
+  /** `toolCall`: tool name. */
+  tool?: string;
+  /** `compaction`: what initiated the compaction. */
+  trigger?: CompactionTrigger;
+  /** `workflow`: camelCased `WorkflowLaunchTriggerSource`, verbatim (durable runtime vocabulary, e.g. `"modelProposal"`). */
+  triggerSource?: string;
+  /** `true` when the server's per-surface text budget saturated a streamed surface (`agentMessage.text`, `reasoning.summary[*]`, `toolCall.visibleOutput`, `userShell.visibleOutput`); the durable full text remains in the log (tdd SS4.5.4). */
+  truncated?: boolean;
+  /** The owning turn (== the submitting `commandId` for fresh turns, tdd SS3.1.4). `null` only for `userShell` — the one kind outside a turn (tdd SS4.5.6). */
+  turnId?: string | null;
+  /** `subagent`: **transitive** observed usage — the child and its own descendants; updated in place, absent until first observation; never folded into `session/tokenUsage.cumulative` (tdd SS4.6.5). */
+  usage?: TokenUsage;
+  /** `toolCall`/`userShell`: bounded transcript-visible result text (budget per tdd SS4.5.4); streams via `item/delta` field `"output"`. */
+  visibleOutput?: string;
+  /** `subagent`/`workflow`: the owning durable workflow run id (opaque string — not a UUID family). */
+  workflowRunId?: string;
+}
+
+/** `item/completed` params (tdd SS4.3): the item reached its terminal state — the authoritative final object. Always cites a durable `sourceRange` (tdd SS4.2). Clients MUST accept `item/completed` for an `itemId` they never saw `item/started` for (single-shot kinds; after a gap fill; tdd SS4.4.1). */
+export interface ItemCompletedParams {
+  /** The full item at its terminal revision. */
+  item: Item;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `item/delta` params (tdd SS4.3.1): a UTF-8-safe streaming append to an open item's field. Ephemeral-sourced by definition: this params object has **no** `sourceRange` member at all (spec 14653 INV-009 — the schema enforces the exemption). Deltas never bump `revision`. */
+export interface ItemDeltaParams {
+  /** The appended text; concatenation of a field path's deltas in cursor order equals that field's value on `item/completed` unless the surface saturated (spec 14653 INV-005). */
+  delta: string;
+  /** Dotted field path the append targets (`"summary.0"`, `"output"`, ...); absent means `"text"` (tdd SS4.3.1). */
+  field?: string;
+  /** The open item being appended to. */
+  itemId: string;
+  /** The owning session. */
+  sessionId: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** The nine v1 item kinds (tdd SS4.5.2–4.5.10). Open: a new kind is additive evolution, and clients MUST render unknown kinds generically (tdd SS4.10). */
+export type ItemKind =
+  | "userMessage"
+  | "agentMessage"
+  | "reasoning"
+  | "toolCall"
+  | "userShell"
+  | "subagent"
+  | "workflow"
+  | "reminderChild"
+  | "compaction"
+  | (string & {});
+
+/** The `item/readOutput` content encoding (tdd SS4.7.4). Closed: text media is ALWAYS `utf8` and binary media `base64`; a third value would change the client's decode contract. */
+export type ItemReadOutputEncoding = "utf8" | "base64";
+
+/** `item/readOutput` params (tdd SS4.7.4): byte-ranged fetch of stored full output that the view truncated — the `outputRef` fetch path SS3.9 and SS4.5.5 owe. Read-only; works on loaded and unloaded sessions; no lease. */
+export interface ItemReadOutputParams {
+  /** The item whose stored output is fetched. */
+  itemId: string;
+  /** STORED bytes requested; default and max 6 MiB (tdd SS4.7.4). A value above the max is served at the max. */
+  lengthBytes?: number;
+  /** STORED-byte offset to start from; 0 when omitted. STORED bytes are a property of the output, not of a transport (tdd SS4.7.4). */
+  offsetBytes?: number;
+  /** The `outputRef.id` from the item (never the `uri`; the uri is display/provenance). */
+  outputRef: string;
+  /** The session the item belongs to. */
+  sessionId: string;
+}
+
+/** `item/readOutput` result (tdd SS4.7.4): one stored-byte page. */
+export interface ItemReadOutputResult {
+  /** STORED bytes served in THIS response (not the output's total; that is `outputRef.byteLen` on the item). The next page's `offsetBytes` is `offsetBytes + byteLen` — short-serving and advancing are separate, so paging never skips or double-reads a byte (tdd SS4.7.4). */
+  byteLen: number;
+  /** The served range, decoded per `encoding`. */
+  content: string;
+  /** How `content` encodes the stored bytes. */
+  encoding: ItemReadOutputEncoding;
+  /** `true` when this range reached the end of the stored output. */
+  eof: boolean;
+  /** The stored output's media type (e.g. `text/plain`). */
+  mediaType: string;
+  /** The STORED-byte offset this response actually served from. */
+  offsetBytes: number;
+}
+
+/** `item/started` params (tdd SS4.3): a new item opened on the transcript. `sourceRange` is absent when the item opens on an ephemeral record (the delta-streamed kinds); the item's authoritative open is re-stated by its durable-sourced `item/completed` (tdd SS4.2). */
+export interface ItemStartedParams {
+  /** The full item at revision 1. */
+  item: Item;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from; absent on an ephemeral-sourced open (spec 14653 INV-009). */
+  sourceRange?: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** Item status (tdd SS4.4.1). Open; terminal = anything other than `"inProgress"`, and unknown values are terminal-unknown, rendered generically. */
+export type ItemStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "cancelled"
+  | "rejected"
+  | "timedOut"
+  | (string & {});
+
+/** `item/updated` params (tdd SS4.4.2): an open item changed non-terminally in a way deltas cannot express — the full item re-emitted at a higher revision (apply rule: replace iff higher). */
+export interface ItemUpdatedParams {
+  /** The full item at a higher revision. */
+  item: Item;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** The literal `"2.0"` every frame carries (SS1.2). */
+export type JsonRpcVersion = "2.0";
+
+/** `userMessage` image attachment metadata (tdd SS4.5.2): metadata only — the durable bytes live in the log and are reachable on the raw altitude. */
+export interface MessageAttachment {
+  /** Pixel height, when known. */
+  height?: number;
+  /** The image media type (e.g. `"image/png"`). */
+  mediaType: string;
+  /** Attachment type, `"image"` in v1 (free string: attachment vocabulary grows additively with the runtime's intake surface). */
+  type: string;
+  /** Pixel width, when known. */
+  width?: number;
+}
+
+/** One visible catalog row (tdd SS3.10). Catalog rows marked hidden never reach the wire, so a client cannot select one. */
+export interface ModelCatalogEntry {
+  /** Context limit; `null` when the catalog source declared nothing. */
+  contextLimit: number | null;
+  /** Cost block; `null` when the catalog source declared nothing. */
+  cost: ModelCost | null;
+  /** The row's catalog default. Optional only for decoding older hosts; a present value is never null and is always a member of `variants`. Absent under `"unknown"` (ADR 33400 D2). */
+  defaultReasoningEffort?: ReasoningEffort;
+  /** Description; `null` when the catalog source declared nothing. */
+  description: string | null;
+  /** Presentation label. */
+  displayLabel: string;
+  /** Marks the session's effective model when `sessionId` was supplied. May be false for every row — a client MUST NOT assume exactly one. */
+  isActive: boolean;
+  /** Marks the catalog's default row. May be false for every row. */
+  isDefault: boolean;
+  /** The selectable model id. */
+  modelId: string;
+  /** Output limit; `null` when the catalog source declared nothing. */
+  outputLimit: number | null;
+  /** Provider profile; `null` when the catalog source declared nothing. */
+  profileId: string | null;
+  /** Provider routing. */
+  providerId: string;
+  /** Described selectable tiers, a same-order subset of `variants`. Optional only for decoding older hosts; a present value is never null. Absent under `"unknown"` (ADR 33400 D2). */
+  reasoningEffortVariants?: ModelDescribedReasoningEffort[];
+  /** Release date; `null` when the catalog source declared nothing. */
+  releaseDate: string | null;
+  /** Complete ordered selectable efforts. Optional only for decoding older hosts; a present value is never null. Current hosts always send it. */
+  variants?: ModelReasoningEffortVariants;
+}
+
+/** Where a model catalog came from (tdd SS3.10). **Open**: an unrecognized value is an unknown source, not an error. */
+export type ModelCatalogSource =
+  | "providerCatalog"
+  | "fakeCatalog"
+  | "unresolvedCatalog"
+  | "bundledCatalog"
+  | "configCatalog"
+  | (string & {});
+
+/** What drove a model selection (tdd SS4.6.1). Open. */
+export type ModelChangeSource = "user" | "default" | "policy" | (string & {});
+
+/** Per-1M-token catalog cost, carried **verbatim** for display and never rounded or re-formatted by the host (tdd SS3.10). Cost arithmetic stays client-local view math. */
+export interface ModelCost {
+  /** Cached-input cost, a decimal string. */
+  cached: string;
+  /** Currency; nullable — today's catalogs are USD. */
+  currency: string | null;
+  /** Input cost, a decimal string. */
+  input: string;
+  /** Output cost, a decimal string. */
+  output: string;
+}
+
+/** One described reasoning-effort tier of a `model/list` row (tdd SS3.10, ADR 33400 D2): a selectable tier plus the catalog's display string for it when declared. */
+export interface ModelDescribedReasoningEffort {
+  /** The catalog's per-tier display string; absent when the catalog declared none. Optional only for decoding; a present value is never null. */
+  description?: string;
+  /** The tier, in the closed D-024 vocabulary. */
+  tier: ReasoningEffort;
+}
+
+/** `model/list` params (tdd SS3.10): the discovery half of the model-picker gesture. **A query, not a command** — no `commandId`, no durable intake record, no view event. */
+export interface ModelListParams {
+  /** When present, the row matching that session's effective model is flagged `isActive`. When absent, no row is active — a client may list before it has a session (tdd SS3.10). */
+  sessionId?: string;
+}
+
+/** `model/list` result (tdd SS3.10). A snapshot at call time: v1 has no catalog subscription. `models` MAY be empty — a build shipped with no bundled models is a supported configuration. */
+export interface ModelListResult {
+  /** Visible rows only, newest `releaseDate` first. */
+  models: ModelCatalogEntry[];
+  /** The catalog's profile; `null` when none. */
+  profileId: string | null;
+  /** The catalog's provider. */
+  providerId: string;
+  /** Where the catalog came from — how a client tells a live provider catalog from a test fake and labels it honestly. */
+  source: ModelCatalogSource;
+}
+
+/** A complete ordered effort set, or an explicit unknown capability. */
+export type ModelReasoningEffortVariants = ReasoningEffort[] | UnknownModelReasoningEffortVariants;
+
+/** A model selection (tdd SS3.8). Empty strings are normalized to absent. */
+export interface ModelSelection {
+  /** Presentation label. */
+  displayLabel?: string;
+  /** Catalog model id. Required. */
+  modelId: string;
+  /** Provider profile. Omitted and explicit `null` both mean "no profile" (#23468). */
+  profileId?: string | null;
+  /** Provider routing. */
+  providerId?: string;
+}
+
+/** Rich content the model saw beyond text (tdd SS4.5.5, `ModelVisibleToolContent`): metadata only — fetch bytes via `item/readOutput` when an `outputRef` exists. */
+export interface ModelVisibleContent {
+  /** Pixel height, when known. */
+  height?: number;
+  /** The content media type. */
+  mediaType: string;
+  /** The recorded content path. */
+  path: string;
+  /** The tool that produced the content. */
+  sourceToolName: string;
+  /** Content type, `"image"` in v1 (free string, grows with the durable vocabulary). */
+  type: string;
+  /** Pixel width, when known. */
+  width?: number;
+}
+
+/** A notification frame, either direction (SS1.2 §2.2). No `id`; a notification is never answered. */
+export interface Notification {
+  /** Emission time in Unix milliseconds, recorded once at emission; server→client notifications only (SS1.2.5). Optional on the wire so decoders tolerate older servers. */
+  emittedAtMs?: number;
+  /** The literal `"2.0"`. */
+  jsonrpc: JsonRpcVersion;
+  /** Notification method name. */
+  method: string;
+  /** Method-specific parameters; omitted entirely when empty. */
+  params?: Record<string, unknown>;
+}
+
+/** Stored-output reference (tdd SS4.5.5): the camelCased fold of the durable `ToolOutputRef`. The fetch path is `item/readOutput` (#208). */
+export interface OutputRef {
+  /** Whether the bytes are servable (tdd SS4.5.5). */
+  availability: OutputRefAvailability;
+  /** Stored byte length. */
+  byteLen: number;
+  /** Content digest (e.g. `"sha256:..."`), when recorded. */
+  digest?: string;
+  /** The stored output's durable id. */
+  id: string;
+  /** The stored output's kind, verbatim durable vocabulary (e.g. `"tool_output"`; snake_case per the SS1.6 casing exemption). */
+  kind: string;
+  /** Media type, when recorded. */
+  mediaType?: string;
+  /** Stored path, when recorded. */
+  path?: string;
+  /** The stored output's URI. */
+  uri: string;
+}
+
+/** Whether a stored output's bytes are servable (tdd SS4.5.5). Open — durable runtime vocabulary may grow additively. */
+export type OutputRefAvailability =
+  | "available"
+  | "missing"
+  | "unsupported"
+  | "accessFailed"
+  | (string & {});
+
+/** Server-authored edit-family diff summary (tdd SS4.5.5, #33025): `files` counts the stored patch document's file entries; `added` and `removed` are the total `+`/`-` prefixed LINE counts summed over the stored patch's hunks across all files — line counts, never hunk or byte counts. Rides the `toolCall` item beside `patchRef`; the body is fetched via `item/readOutput` with `patchRef.id`. */
+export interface PatchSummary {
+  /** Total `+`-prefixed line count across all files' hunks. */
+  added: number;
+  /** File entries in the stored patch document. */
+  files: number;
+  /** Total `-`-prefixed line count across all files' hunks. */
+  removed: number;
+}
+
+/** A pending approval in the snapshot: the SS2.5.2 pointer shape plus the gated `itemId` when one exists (tdd SS4.9.1). */
+export interface PendingApprovalPointer {
+  /** The pending approval's id. */
+  approvalId: string;
+  /** The parked item, when one exists. */
+  itemId?: string;
+  /** The cursor the approval opened at. */
+  viewCursor: string;
+}
+
+/** The `pendingRequests` discriminator (tdd SS2.5.2). Open enum, v1 values `approval` and `userInput`. */
+export type PendingRequestKind = "approval" | "userInput" | (string & {});
+
+/** A late-joiner pointer at an unsettled server-initiated request (tdd SS2.5.2, SS2.2.1). The full payloads arrive as re-issued server-to-client requests right after a `session/resume` response (tdd SS5.6); `session/read` never re-issues them (tdd SS2.5.5).  **A second E4 instance, RULED with E4 (#22785, owner, 2026-08-26): the flat discriminated-object precedent is accepted for this type too, on the `ApprovalSubject` precedent, with the serialized JSON unchanged. A strict union node kind may be funded later; if it is, it must cover both this type and `TurnInputPart`.** SS2.5.2 ratifies two kind-discriminated entry shapes (`{kind: "approval", approvalId, viewCursor}` / `{kind: "userInput", userInputId, viewCursor}`); this is one flat object with both ids optional, so the published schema accepts `{"kind":"approval","userInputId":…}` and an entry carrying no id at all. The v1 model names no object-variant union (the `ApprovalSubject` precedent, followed for `TurnInputPart`), and this instance differs from that one in a way the ruling should see: `kind` here is an OPEN enum, where `TurnInputPart.type` is closed. */
+export interface PendingRequestPointer {
+  /** Present on an `approval` entry. */
+  approvalId?: string;
+  /** The discriminator; v1 values `approval` and `userInput`. */
+  kind: PendingRequestKind;
+  /** Present on a `userInput` entry. */
+  userInputId?: string;
+  /** The cursor the request opened at. */
+  viewCursor: string;
+}
+
+/** A pending user-input prompt in the snapshot (tdd SS4.9.1, SS5.10). */
+export interface PendingUserInputPointer {
+  /** The parked item, when one exists. */
+  itemId?: string;
+  /** The pending prompt's id. */
+  userInputId: string;
+  /** The cursor the prompt opened at. */
+  viewCursor: string;
+}
+
+/** The server runtime's platform family (SS1.4.1); may differ from the client's. Closed: SS1.4.1 fixes the value set, so widening it is a deliberate, gate-visible protocol change rather than a silent addition (a later `Closed`→`Open` flip is itself additive, data-model.md §5.2). */
+export type PlatformFamily = "unix" | "windows";
+
+/** The server's operating system (SS1.4.1). Closed, for the same reason as [`PlatformFamily`]. */
+export type PlatformOs = "macos" | "linux" | "windows";
+
+/** The reasoning-effort tier sampled at submission (tdd SS3.2, SS3.3). The **same closed tier vocabulary** on both the fresh-turn and steer lanes, spelled identically; invalid tiers are invalid params. `none` is a tier of the vocabulary (ask for no reasoning), not a way to say "unset". */
+export type ReasoningEffort =
+  | "none"
+  | "minimal"
+  | "low"
+  | "medium"
+  | "high"
+  | "xhigh"
+  | "max"
+  | "ultra";
+
+/** What drove a reasoning-effort default change (tdd SS4.6.9). Open; v1's only producer is `user` (an accepted `session/setReasoningEffort`). */
+export type ReasoningEffortChangeSource = "user" | "default" | "policy" | (string & {});
+
+/** The snapshot's standing session-default reasoning effort (tdd SS4.9.1, ADR 31255 D1): the fold of the latest completed `runtime.reasoning_effort_reconfigure` fact — the same pair `session/reasoningEffortChanged` carries. */
+export interface ReasoningEffortState {
+  /** The standing default tier — the closed SS3.2 vocabulary, spelled identically to `turn/start.reasoningEffort`. */
+  reasoningEffort: ReasoningEffort;
+  /** Which actor class set the default. */
+  source: ReasoningEffortChangeSource;
+}
+
+/** One end of a [`SourceRange`]: a record's event id and its sequence number within the stream (tdd SS4.2). */
+export interface RecordPosition {
+  /** The record's event id. */
+  id: string;
+  /** The record's sequence number within its stream. */
+  sequence: number;
+}
+
+/** A request frame, either direction (SS1.2 §2.1). */
+export interface Request {
+  /** Client-chosen id, unique among that client's in-flight requests. */
+  id: RequestId;
+  /** The literal `"2.0"`. */
+  jsonrpc: JsonRpcVersion;
+  /** Slash-namespaced camelCase method name. */
+  method: string;
+  /** Method-specific parameters; omitted entirely when empty, never `null`. */
+  params?: Record<string, unknown>;
+  /** W3C trace passthrough (SS1.8); requests only. */
+  trace?: TraceContext;
+}
+
+/** A request id (SS1.3): client-chosen string or integer. `1` and `"1"` do not compare equal; each direction owns its own id space. */
+export type RequestId = number | string;
+
+/** The SS5.3.3 presentation receipt — the client's response to a server-initiated request (`approval/request`, `userInput/request`).  The response acknowledges presentation only ("a surface showed or will show this"): it changes no state, the server uses it for diagnostics alone, and the decision/answer travels as a command (`approval/decide`, `userInput/answer`). An error response or a dropped connection means this connection could not present the request; the approval or prompt stays pending and the request is re-issued on the next subscribe (SS5.6). There is no dismiss-without-deciding on the wire. */
+export interface RequestReceipt {}
+
+/** The `schema` pair in [`InitializeResult`] (SS1.4.1, SS1.5.3). `version` is the wire **envelope** schema version — distinct from the session-view `schemaVersion`, the raw-log `schema_version`, and the 0.x/1.0 stability posture, which is not on the wire at all (INV-006a). */
+export interface SchemaInfo {
+  /** `sha256:<64 lower hex>` content hash of this server binary's stable-surface bundle (INV-003). A mismatch is a warning condition, not an error (SS1.4.1). */
+  fingerprint: string;
+  /** Envelope schema version; `1` in v1, expected to stay `1` for a long time (SS1.4.1). */
+  version: number;
+}
+
+/** Server identification inside [`InitializeResult`]. */
+export interface ServerInfo {
+  /** Server name. */
+  name: string;
+  /** Server version string. */
+  version: string;
+}
+
+/** The session object every lifecycle method returns or lists (tdd SS2.4).  Additive-optional evolution applies: clients must ignore unknown fields. */
+export interface Session {
+  /** The `turnId` of the current foreground turn when `status` is `running`, and `null` when the session is idle (tdd SS2.4).  **Required-nullable, per the owner ruling on #22946** ("approve required-nullable", review comment `r3863946961`, 2026-08-26). Both production writers hard-code `"activeTurnId": null` (`session/start/commit_load.rs` for `session/start`, `session/snapshot.rs` feeding resume/read/list/fork) and nothing strips it, so this is what the binary emits and what SS2.4's example spells. The optional-absent shape published it as plain `string` and REJECTED every idle `Session` frame the host sent — the #19923 defect class this PR exists to close.  E5's original evidence for optional-absent ("every committed transcript shows the omission") was wrong: those transcripts are hand-authored fixtures, not host recordings. They are corrected in the same change under the ruling's SS1.5 `regenerationJustification`. */
+  activeTurnId: string | null;
+  /** The folded effective approval mode. **Additive-optional**: a Session object that omits it means the host has not folded a mode, which is why the index-derived `session/list` entry may legitimately omit it (tdd SS2.4, SS5.12). */
+  approvalMode?: EffectiveApprovalModeState;
+  /** Attention flags (tdd SS2.4, ADR 31983 D3). **Additive-optional**, present only when at least one flag is set; absence is a NON-assertion (nothing pending, or the loaded session's pending source declined to answer). Loaded sessions only: a `notLoaded` row omits it even while its durable pending set is non-empty. */
+  attention?: AttentionFlag[];
+  /** Derived workspace branch (tdd SS2.14.1, #27598) — the index's last derived value; the live-change signal stays `session/branchChanged` (SS4.6.4). **Additive-optional**, omitted when underivable. */
+  branch?: string;
+  /** RFC3339. For a fork this is the fork session id's UUIDv7 mint instant (tdd SS2.4). */
+  createdAt: string;
+  /** Derived first-user-prompt preview (tdd SS2.14.1, #27598). **Additive-optional**, omitted when underivable. */
+  firstUserPrompt?: string;
+  /** `null` for root sessions; fork provenance otherwise (tdd SS2.4). */
+  forkedFrom: ForkProvenance | null;
+  /** Content-activity recency, RFC3339 (tdd SS2.4, ADR 31983 D5). **Additive-optional**: omitted when no content record exists. Never advanced by lifecycle bookkeeping (the resume marker, re-stamps) or a fork's copied seed-replay records, and never precedes `createdAt`. */
+  lastActivityAt?: string;
+  /** The winning metadata fold's model; `null` when that record omits it. */
+  modelId: string | null;
+  /** The durable allocated session name (tdd SS2.4/SS2.14.1, #27598; ADR 27598 D2/D4). **Additive-optional**: present when the serving path holds an allocated name, omitted otherwise — absent is never fabricated. Authoritative and renameable via `session/rename`. */
+  name?: string;
+  /** Absolute path of the session's durable log; non-nullable. Under the ephemeral session profile it is the **empty string**, meaning "no durable log exists" (tdd SS2.13.2) — the one value a client must not hand to a filesystem call. */
+  path: string;
+  /** The winning metadata fold's provider; `null` when that record omits it. */
+  providerId: string | null;
+  /** The session identity. */
+  sessionId: string;
+  /** Load state as this host knows it; `session/list` reports `notLoaded` for sessions loaded by *other* hosts (tdd SS2.4). */
+  status: SessionStatus;
+  /** Derived display title (tdd SS2.14.1, #27598): a heuristic that may evolve — its carriage, not its derivation, is the contract. **Additive-optional**, omitted when underivable. */
+  title?: string;
+  /** Completed-turn count from the session view fold (tdd SS2.4). */
+  turnCount: number;
+  /** RFC3339; never precedes `createdAt` (tdd SS2.4). */
+  updatedAt: string;
+  /** The winning metadata fold's workspace root; `null` when that record omits it — absent is never fabricated (tdd SS2.4). */
+  workspaceRoot: string | null;
+}
+
+/** `session/approvalModeChanged` params (tdd SS5.12): the fold of the durable approval-mode reconfigure audit fact — every accepted change writes one; a mode flip without an audit fact is a runtime bug by design. */
+export interface SessionApprovalModeChangedParams {
+  /** The requesting client's `clientInfo.name` (tdd SS1.4.1), recorded on the audit fact. */
+  clientName: string;
+  /** The command that changed it. */
+  commandId: string;
+  /** The mode now in effect. */
+  mode: ApprovalMode;
+  /** The owning session. */
+  sessionId: string;
+  /** How the mode took effect. */
+  source: ApprovalModeSource;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/branchChanged` params (tdd SS4.6.4): a durable workspace-branch observation landed. */
+export interface SessionBranchChangedParams {
+  /** The observed branch; `null` on a detached-HEAD observation — a fact, not "unchanged" (tdd SS4.6.4). */
+  branch?: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** The detected version-control system; absent when no repository was detected. */
+  vcs?: Vcs;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+  /** The observed workspace root. */
+  workspaceRoot: string;
+}
+
+/** `session/closed` params (tdd SS2.6.2; enrolled by #33065): a loaded session was unloaded from this host, broadcast to every initialized connection. After it, the session is `notLoaded`; the log remains on disk and `session/resume` reloads it. A crash emits nothing — only the two orderly unload paths do, and both write the durable `SessionEnd` record first. */
+export interface SessionClosedParams {
+  /** Which orderly unload path fired. */
+  reason: SessionClosedReason;
+  /** The unloaded session. */
+  sessionId: string;
+  /** The final view head; a client that stores it can later `session/resume {cursor}` and receive exactly the (empty) suffix. An **opaque** view cursor: clients relay it, never parse it (tdd SS4.1).  **Required-nullable**: the producers always write the member and write `null` when the final fold failed at unload (`session/idle.rs`, `serve/shutdown.rs`; PR #16779 review) — the host defines no cursor values of its own and never invents one, and the subscriber still learns the session closed. */
+  viewCursor: string | null;
+}
+
+/** The SS2.6.2 closed-reason vocabulary. Server-produced and published OPEN by owner ruling — the #33065 menu-B pick (PR #33201 comment 5638727249, recorded in the enrollment decision record), which settles that this notification reason enum publishes open rather than resting on E2's result-vocabulary rule by analogy. A crash is deliberately not a reason, because a crash emits no notification at all. */
+export type SessionClosedReason = "idle" | "hostShutdown" | (string & {});
+
+/** `session/compact` params (tdd SS3.7): manually compact the session's conversation context — the `/compact` gesture. Compaction runs asynchronously; the ack is admission only. */
+export interface SessionCompactParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The run whose context to compact. Omit and the server resolves the session's current/latest run; a session with no resolvable run rejects with `commandRejected` reason `missing_run` (tdd SS3.7). Any syntactically valid UUID: a turn from an older session may carry a v4 or v5 id. A malformed id is `invalidParams`. */
+  turnId?: string;
+}
+
+/** `session/compact` result (tdd SS3.7). Failures *after* admission (`summarizer_failed`, `install_rejected`, `cancelled`) are not wire errors — they arrive as the compaction's terminal view event. */
+export interface SessionCompactResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Why the command was a noop, e.g. `no_compactable_history`. Present on a `noop` status (tdd SS3.7). */
+  reason?: string;
+  /** Admission status, or `noop`. */
+  status: CompactStatus;
+}
+
+/** The open configuration extension object shared by `session/start` and `session/resume` (ADR 32760 D1).  Unknown keys are ignored on the wire, never rejected (tdd SS1.5.4, spec 206 INV-015; D-052 resolving [#23456](https://github.com/mslsrc/tbh/issues/23456)): the live decoder is D-042's tolerant path, and TEST-024 keeps every exported bundle free of `additionalProperties: false`. The Rust typed model's `deny_unknown_fields` is internal and never exported — the #22785 E6b closedness export applies nowhere, and the `x-msp-closed` opt-in mechanism stays inert. Recognized `mcpServers` values are typed and validated before they leave the wire boundary. */
+export interface SessionConfig {
+  /** Native MCP servers added only to this session runtime. */
+  mcpServers?: Record<string, SessionMcpServerConfig>;
+}
+
+/** `session/contextUsage` params (tdd SS4.6.6, #14405): context-window pressure — the counted-once occupancy at the latest provider-reported durable fact, joined with the host's pressure basis. Replace wholesale; emitted only when the `(windowTokens, usedTokens, pressure)` triple changes value (identical adoptions emit nothing). */
+export interface SessionContextUsageParams {
+  /** Server-computed pressure level over the basis thresholds. */
+  pressure: ContextPressureLevel;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Counted-once prompt tokens (#8803) plus output tokens of the driving record, saturating — the honest occupancy floor. */
+  usedTokens: number;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+  /** The effective context-window size from the host's pressure basis; absent when the basis has no limit — the limit part is omitted, never invented (tdd SS4.6.6). */
+  windowTokens?: number;
+}
+
+/** The persisted deletion terminal, separate from admission (SS3.24). The shared schema is one object. Actual failed producers send both optional fields; completed producers omit both. Clients enforce those obligations before interpreting a known outcome. Preserve unknown strings without treating them as successful completion. */
+export interface SessionDeleteCompletedParams {
+  /** Idempotency key of the original deletion command. */
+  commandId: string;
+  /** Deletion result; an unknown value leaves the command pending. */
+  outcome: SessionDeleteOutcome;
+  /** Erasure evidence for a failed result; omitted for a completed result. */
+  physicalChange?: SessionDeletePhysicalChange;
+  /** Required for a failed result and omitted for a completed result. */
+  reason?: SessionDeleteFailureReason;
+  /** Session named by the original deletion command. */
+  sessionId: string;
+}
+
+/** Stable deletion-failure vocabulary known to this version (SS3.24). The server emits only these values. Future reason strings remain an open result vocabulary; consumers cannot infer completion from any reason. */
+export type SessionDeleteFailureReason =
+  | "ownershipUnavailable"
+  | "sharedSource"
+  | "writerBusy"
+  | "unsafeSource"
+  | "sourceChanged"
+  | "quiescenceFailed"
+  | "cancelled"
+  | "storageFailure"
+  | "cleanupIncomplete"
+  | "unsupportedLayout"
+  | (string & {});
+
+/** Known terminal outcomes. A future outcome cannot authorize success or exit. */
+export type SessionDeleteOutcome = "completed" | "failed" | (string & {});
+
+/** `session/delete` params. The host validates a non-nil legacy-valid UUID target and a UUID-v7 command identity before admission. Unknown members are ignored and do not enter the normalized command identity (SS1.5.4). */
+export interface SessionDeleteParams {
+  /** UUID-v7 idempotency key for this deletion command. */
+  commandId: string;
+  /** Non-nil UUID of the session selected for deletion. */
+  sessionId: string;
+}
+
+/** The failed attempt's immutable snapshot of persisted physical evidence. `possible` is recorded before a detach/unlink, `confirmed` after a proved owned effect. A failure never resets that evidence merely because the session path is absent. Unknown strings remain representable; consumers must treat them conservatively as `possible`. */
+export type SessionDeletePhysicalChange = "none" | "possible" | "confirmed" | (string & {});
+
+/** Whether this host writes its sessions to disk (SS1.4.1, SS2.13). A property of the host process, fixed at construction and identical for every session and every connection it serves — never requested, granted, or negotiated, which is why it is not a capability. Open: the unrepresented degraded state (#14401) has candidate resolutions that add a third value here, so closed would make that a breaking change. */
+export type SessionDurability = "durable" | "ephemeral" | (string & {});
+
+/** `session/fork` params (tdd SS2.5.3). */
+export interface SessionForkParams {
+  /** The SS2.5 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** Copy history through a completed turn, inclusive. Omitted means "all completed turns" (tdd SS2.5.3). */
+  cutPoint?: ForkCutPoint;
+  /** Skip inline history in the result and page it later — same as `session/resume` (tdd SS2.5.3). */
+  excludeItems?: boolean;
+  /** The source session. */
+  sessionId: string;
+}
+
+/** `session/fork` result (tdd SS2.5.3): the `session/resume` envelope for the **new** session, whose `session.forkedFrom` carries the provenance. */
+export interface SessionForkResult {
+  /** The served history. */
+  history: SessionHistory;
+  /** The late-joiner pointer set. */
+  pendingRequests: PendingRequestPointer[];
+  /** The new fork session, carrying `forkedFrom` provenance. */
+  session: Session;
+  /** The new session's view head. */
+  viewCursor: string;
+}
+
+/** `session/goalChanged` params (tdd SS4.6.2): the projected goal block's value changed — identical adoptions emit nothing (the change gate), and an explicit `null` clears. Replace wholesale; `null` never means unchanged. */
+export interface SessionGoalChangedParams {
+  /** The full current goal block, or `null` to clear. */
+  goal?: Goal;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** The `history` envelope shared by `session/resume`, `session/fork`, and `session/read` (tdd SS2.5.2). */
+export interface SessionHistory {
+  /** The full folded item array when `mode` is `inline`; `null` otherwise. */
+  items: Item[] | null;
+  /** What was actually served — never what was asked for (tdd SS2.5.2). */
+  mode: HistoryMode;
+  /** Why no history was served — sent exactly when `mode` is `"none"` (tdd SS2.5.2; D-050, spec 208 INV-19734-1). */
+  noneReason?: HistoryNoneReason;
+  /** The folded view state when `mode` is `snapshot` or `anchoredSnapshot`; `null` otherwise. */
+  snapshot: ViewSnapshot | null;
+}
+
+/** `session/listChanged` params (#33084, ADR 33084 D3): one changed row of the `session/list` shape — the full SS2.4 Session object as the answering host's list face serves it at emission (the ADR 29243 live-overlaid row), a replace, never a delta. Emitted only on connections that negotiated the `sessionListStream` capability at `initialize` (ADR 33084 D2); row birth stays on `session/started`, unload pairs with `session/closed`. */
+export interface SessionListChangedParams {
+  /** The served list row for the changed session. */
+  session: Session;
+}
+
+/** `session/list` params (tdd SS2.5.4). Read-only; never touches leases. */
+export interface SessionListParams {
+  /** Opaque page cursor from a prior result. Page cursors are a distinct opaque-string family from view cursors and stream cursors, valid only for re-issuing the same listing (tdd SS2.5.4). Omitted and explicit `null` both mean "first page" (#23468). */
+  cursor?: string | null;
+  /** Page size; default 50, max 200 — the cap is published under #22785 E6c (owner-ruled 2026-08-26). Maximum 200. */
+  limit?: number;
+  /** Only sessions with log activity after this RFC3339 instant. */
+  updatedAfter?: string;
+  /** Only sessions whose metadata workspace root equals this path. */
+  workspaceRoot?: string;
+}
+
+/** `session/list` result (tdd SS2.5.4). Ordering is `updatedAt` descending. */
+export interface SessionListResult {
+  /** The next page's cursor; `null` on the last page. */
+  nextCursor: string | null;
+  /** The page of stored sessions. */
+  sessions: Session[];
+}
+
+/** One native MCP server supplied at session construction (ADR 32760 D1).  **Closed union** (#33295 owner ruling A1, extending D-033/D-050 to `oneOf`): a validator MUST reject an undeclared `transport` arm — the server fails `session/start` decode on an unknown transport, and a future transport arrives as an explicit schema addition. */
+export type SessionMcpServerConfig =
+  | {
+      /** Ordered child arguments. */ args?: string[];
+      /** Executable name or path. Configuration diagnostics never echo it. */ command: string;
+      /** Explicit child environment additions. */ env?: Record<string, string>;
+      /** Stdio framing mode; defaults to automatic detection. */ framing?: SessionMcpStdioFraming;
+      /** Required/optional startup posture; defaults to required. */ mode?: SessionMcpServerMode;
+      transport: "stdio";
+    }
+  | {
+      /** Explicit request headers. */ headers?: Record<string, string>;
+      /** Required/optional startup posture; defaults to required. */ mode?: SessionMcpServerMode;
+      transport: "streamableHttp";
+      /** HTTP(S) endpoint. Configuration diagnostics never echo it. */ url: string;
+    };
+
+/** Startup failure posture for a session MCP server. */
+export type SessionMcpServerMode = "required" | "optional";
+
+/** Stdio framing choices exposed by session MCP configuration. */
+export type SessionMcpStdioFraming = "auto" | "contentLength" | "lineDelimitedJson";
+
+/** `session/modelChanged` params (tdd SS4.6.1): a durable model-selection record landed (tdd SS3.8). */
+export interface SessionModelChangedParams {
+  /** The selected model. */
+  modelId: string;
+  /** The selected provider; `null` when the selection names none. */
+  providerId?: string;
+  /** The owning session. */
+  sessionId: string;
+  /** What drove the selection. */
+  source: ModelChangeSource;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/modelRouteUnserved` params (#25603, ADR 25603 D1, spec 5469 Amendment 16): an accepted `login.credential_update` installed a provider that cannot serve the session's STANDING model route. Disclosure only — the standing selection is unchanged (no `session/modelChanged` fires) and the repair path is a routable `session/setModel`. Folded from the durable `runtime.provider_reconfigure.standing_route_unserved` record; additive — clients that predate it skip the unknown method. */
+export interface SessionModelRouteUnservedParams {
+  /** The command whose accepted swap installed the provider. */
+  commandId: string;
+  /** The provider id the swap installed. */
+  installedProviderId: string;
+  /** The standing (still bound, now unroutable) model. */
+  modelId: string;
+  /** The standing model's provider; `null` when the selection names none. */
+  providerId?: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/nameChanged` params (tdd SS4.6.7, #27598): the fold of ANY durable session-name record — the FIRST-NAMING automatic allocate as well as an accepted `session/rename` (or the same in-process runtime command). Replace-wholesale like every SS4.6 sibling. */
+export interface SessionNameChangedParams {
+  /** The new canonical name now in effect. */
+  name: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/read` params (tdd SS2.5.5): read one stored session **without attaching** — no writer lease, no load, no subscription, no `SessionResumed` record. */
+export interface SessionReadParams {
+  /** Metadata-only unless you ask: `false` carries the folded item history. Same name and polarity as `session/resume`/`session/fork`; only the default differs — here it is `true` (tdd SS2.5.5). */
+  excludeItems?: boolean;
+  /** The session to read. */
+  sessionId: string;
+}
+
+/** `session/read` result (tdd SS2.5.5). The `viewCursor` is the fold head at read time — a point-in-time read, immediately stale if a foreign host is appending. */
+export interface SessionReadResult {
+  /** The served history. */
+  history: SessionHistory;
+  /** The same pointer shape as `session/resume`. Because `session/read` never subscribes this is a point-in-time log read only: no requests are re-issued after it (tdd SS2.5.5). */
+  pendingRequests: PendingRequestPointer[];
+  /** The session as folded point-in-time. */
+  session: Session;
+  /** The fold head at read time. */
+  viewCursor: string;
+}
+
+/** `session/reasoningEffortChanged` params (tdd SS4.6.9, ADR 31255 D1): a durable reasoning-effort reconfigure record landed (tdd SS3.21). Replace wholesale, latest wins; the snapshot carries the latest value (SS4.9.1). */
+export interface SessionReasoningEffortChangedParams {
+  /** The new session default: the closed eight-string tier vocabulary of tdd SS3.2, spelled identically. */
+  reasoningEffort: ReasoningEffort;
+  /** The owning session. */
+  sessionId: string;
+  /** What drove the change. */
+  source: ReasoningEffortChangeSource;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/rename` params (tdd SS2.14.2, #27598): set or change the durable allocated session name through the runtime `session_name` command. One writer; withheld under the ephemeral profile. */
+export interface SessionRenameParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The requested name; the runtime's normalization and validation apply. */
+  name: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `session/rename` result (tdd SS2.14.2, #27598): `name` is the canonical (normalized) name the durable record settled. */
+export interface SessionRenameResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** The settled canonical name. Omitted on the `RecoveryPending` arm, which answers `{commandId, status: "accepted"}` and delivers the name via `session/nameChanged` / `Session.name` (tdd SS2.14.2). */
+  name?: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** `session/resume` params (tdd SS2.5.2). */
+export interface SessionResumeParams {
+  /** The SS2.5 idempotency handle (UUIDv7). A resume that loads a session writes a durable `SessionResumed` record. */
+  commandId: string;
+  /** The same open construction-time extension object as `session/start`. */
+  config?: SessionConfig;
+  /** A view cursor previously observed by this client — or an observed `summarizedThrough` compaction anchor (tdd SS4.5.10, D-029). When present the server returns only the suffix and `history.mode` is `none` (tdd SS2.5.2). Omitted and explicit `null` both mean "no cursor" (#23468). */
+  cursor?: string | null;
+  /** Return only session metadata and live resume state; page history separately with `view/page`. Default `false` (tdd SS2.5.2). */
+  excludeItems?: boolean;
+  /** History mode preference, default `auto`. A PREFERENCE, not a budget override: when the requested mode does not fit the history budget the server downgrades it and `history.mode` reports what was actually served (tdd SS2.5.2). Ignored when `cursor` or `excludeItems` makes it moot. */
+  history?: HistoryPreference;
+  /** The session to load. */
+  sessionId: string;
+}
+
+/** `session/resume` result (tdd SS2.5.2). */
+export interface SessionResumeResult {
+  /** The served history. */
+  history: SessionHistory;
+  /** The late-joiner pointer set; empty when nothing is pending. */
+  pendingRequests: PendingRequestPointer[];
+  /** The loaded session. */
+  session: Session;
+  /** The session view head; the connection is subscribed after it. A still-loaded session a prior `view/unsubscribe` detached is RE-ATTACHED by this resume (spec 208 FR-002a, #28920): live delivery resumes from this head. Explicit-cursor re-attach with `(after, head]` engine replay stays `view/subscribe` (SS4.7.1). */
+  viewCursor: string;
+}
+
+/** `session/setApprovalMode` params (tdd SS5.12): switch the session's approval enforcement mode mid-session. A standard SS3 command.  **Select, never create.** A client may *select* a mode the host's configuration already defines; it may not construct one, supply inline rules, or otherwise describe a policy on the wire — which is why [`ApprovalMode`] is closed. */
+export interface SessionSetApprovalModeParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The preconfigured mode to select. The requesting actor is recorded from the connection's `clientInfo.name` (tdd SS1.4.1). */
+  mode: ApprovalMode;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `session/setApprovalMode` result (tdd SS5.12). Applies next-action — an in-flight tool action's pending approval is not retroactively decided by a mode change. */
+export interface SessionSetApprovalModeResult {
+  /** Whether the change did anything. */
+  applyOutcome: ApprovalModeApplyOutcome;
+  /** Echoes the client's id. */
+  commandId: string;
+  /** The folded effective-mode projection — the same object the `Session` carries as `approvalMode` (tdd SS2.4, SS5.12). */
+  effectiveMode: EffectiveApprovalModeState;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** `session/setModel` params (tdd SS3.8): the model-picker gesture. The selection is durable and applies to subsequent model calls. */
+export interface SessionSetModelParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The selection. */
+  model: ModelSelection;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `session/setModel` result (tdd SS3.8). If a turn is running the selection is admitted now and applied at the next model-call boundary; the ack does not wait for that boundary. */
+export interface SessionSetModelResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** `session/setReasoningEffort` params (tdd SS3.21, ADR 31255 D1): set the session's standing reasoning-effort default. A turn carrying its own `reasoningEffort` overrides it for that turn only; the default overrides the host's configured default. Same accept/reject and `commandId` idempotency shape as `session/setModel` (SS3.8). */
+export interface SessionSetReasoningEffortParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The new session default: the closed eight-string tier vocabulary `turn/start` carries (SS3.2), spelled identically. Invalid tiers are invalid params. A default of `max` rides provider requests verbatim, never clamped (ADR 28621 D8, ADR 31131 D1). */
+  reasoningEffort: ReasoningEffort;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `session/setReasoningEffort` result (tdd SS3.21). The default is durable on ack and applies to turns launched after admission; a running turn keeps the request options it already resolved. */
+export interface SessionSetReasoningEffortResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** `session/start` params (tdd SS2.5.1). */
+export interface SessionStartParams {
+  /** The session's starting approval mode; server default when omitted or explicit `null` — both spellings select the default (#23468). Select, never create — the value names a mode the host's configuration already defines (tdd SS2.5.1, SS5.12). This is the only surface that declares a non-interactive run's policy (tdd SS5.11, D-008). */
+  approvalMode?: ApprovalMode | null;
+  /** The SS2.5 idempotency handle (UUIDv7). Required; the server never mints one. */
+  commandId: string;
+  /** Reserved for per-session overrides owned by a future Configuration section. Issue #32760 admits only its `mcpServers` member. */
+  config?: SessionConfig;
+  /** Initial model; server default when omitted. */
+  modelId?: string;
+  /** Initial provider routing; server default when omitted or explicit `null` — both spellings select the default (#23468). */
+  providerId?: string | null;
+  /** Exact identity for this new root session. When omitted the server mints a UUIDv7. This field never selects an existing session: a retained or reserved id is rejected `commandRejected` with reason `session_id_conflict` (tdd SS2.5.1). */
+  sessionId?: string;
+  /** Absolute path, folded into the first metadata record. */
+  workspaceRoot?: string;
+  /** The session's initial runtime workspace-root set: ordered absolute canonical existing directory paths; the first root is the CWD and plays the primary-root role; every root receives the ADR 11237 `:workspace_roots` rules; extra roots grant no Project Trust. When `workspaceRoot` is also present the two must name the same folder, compared on canonical forms (the raw `workspaceRoot` is canonicalized first; ADR 37313 D9), or the request is invalid params, and so is explicit `null` (the D-049 null-tolerant set is closed and excludes this member). Omitted preserves single-root behavior (tdd SS2.5.1, ADR 37313, #37313). */
+  workspaceRoots?: string[];
+}
+
+/** `session/start` result (tdd SS2.5.1). */
+export interface SessionStartResult {
+  /** The new session. */
+  session: Session;
+  /** The session view head after the start fold; the connection is subscribed and receives every view event after this cursor. A deduplicated retry returns this same result (tdd SS2.5.1). */
+  viewCursor: string;
+}
+
+/** `session/started` params (tdd SS2.6.1; enrolled by #33065): a session became newly loaded on this host via `session/start` or `session/fork` (never `session/resume` — Appendix C, OQ-F), broadcast to every initialized connection.  The one member is the same `$defs/Session` object the `session/start`/`session/fork` results carry, so the broadcast and the result describe one fact through one type — the host builds the broadcast payload as a `$defs/Session` — the fresh-start arm reuses the result's `session` member, the start-replay arm builds the live attach snapshot — and the emission is parity-gated against this type at the producer (`session-server` prod-assembly capture) and over the committed transcript corpus (conformance `session_lifecycle_enrollment`). */
+export interface SessionStartedParams {
+  /** The newly loaded session, as of the start/fork fold. */
+  session: Session;
+}
+
+/** A session's load state (tdd SS2.4). */
+export type SessionStatus = "notLoaded" | "idle" | "running" | (string & {});
+
+/** `session/statusChanged` params (tdd SS4.6.10, ADR 31983 D2): a loaded session's projected `(status, attention)` value flipped. A command-plane broadcast — delivered to every connection regardless of its view subscription set, never gated, no `sourceRange`; the same facts live on the Session object, which is how a client seeds its table (no initial burst on connect). */
+export interface SessionStatusChangedParams {
+  /** Attention flags after the transition; present only when at least one flag is set (tdd SS2.4, ADR 31983 D3). */
+  attention?: AttentionFlag[];
+  /** The owning session. */
+  sessionId: string;
+  /** Load state after the transition (the closed SS2.4 enum, unchanged). */
+  status: SessionStatus;
+  /** The causing record's view cursor (ADR 31983 D4). Required-nullable: `null` exactly when the paired `session/closed`'s cursor is `null` (the unload fold-failure arm); a definite cursor everywhere else. */
+  viewCursor: string | null;
+}
+
+/** `session/todoListChanged` params (tdd SS4.6.3): a `TodoSnapshotUpdated` record landed. Replace the whole list on every event; an empty `items` array is a cleared list, not a no-op. */
+export interface SessionTodoListChangedParams {
+  /** The full todo list, replaced wholesale. */
+  items: TodoItem[];
+  /** The snapshot revision. Diagnostics only, never an ordering guard — `viewCursor` orders (tdd SS4.6.3). */
+  revision: number;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** The tool that produced the snapshot, verbatim. */
+  sourceTool: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/tokenUsage` params (tdd SS4.6.5): one per model completion that reports usage. Carries the raw counters verbatim plus the server-derived counted-once `promptTokens`/`totalTokens` (#8803: clients display and sum these and never re-derive the provider's cache convention) and the session `cumulative` block. Accumulate-only: `cumulative` never goes backward. */
+export interface SessionTokenUsageParams {
+  /** Session running totals at this cursor; the fold owns the accumulation. Subagent/workflow-child usage is never folded in — it rides the owning items (tdd SS4.6.5). */
+  cumulative: CumulativeTokenUsage;
+  /** Model-call wall time, when measured. */
+  durationMs?: number;
+  /** Provider finish reason when reported (open vocabulary, verbatim). */
+  finishReason?: string;
+  /** The effective model that produced this usage; `null` on pre-schema records — never back-filled, an unpriced leg (tdd SS4.6.5). */
+  modelId?: string;
+  /** Prompt tokens counted exactly once under the provider's cache convention (#8803). Server-derived; deterministic — the provider is in the log. */
+  promptTokens: number;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** `promptTokens + outputTokens` — the honest per-completion total. */
+  totalTokens: number;
+  /** The turn whose model call completed. */
+  turnId: string;
+  /** Raw counters verbatim from the durable record. */
+  usage: TokenUsage;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `session/userShell` params (tdd SS3.9): run a user-initiated shell command in the session's workspace — the TUI's `!` escape hatch. **Capability-gated**: the connection must negotiate `userShell` at `initialize`, and the whole justification is the SS1.10 spawn boundary. */
+export interface SessionUserShellParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The shell command to run. */
+  commandText: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `session/userShell` result (tdd SS3.9): immediate. The shell runs off the command worker so a long command cannot stall the command plane; the output arrives as the `userShell` item's terminal view event. */
+export interface SessionUserShellResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** The view-health state (tdd SS2.5.2 companion). Open enum (`x-msp-openness: open`): a client MUST ignore an unrecognized value. v1 emits only `Unavailable`; openness itself reserves additive room for a future re-arm (ADR 32557 D1 names it `healthy`) and for the #14401 durable-degraded axis, so no never-emitted token is baked onto the stable surface now. */
+export type SessionViewHealth = "unavailable" | (string & {});
+
+/** `session/viewHealthChanged` params (ADR 32557; #32557): the named session's live view stream became unavailable, and why.  Best-effort: ordered after already-queued view frames and may be dropped (for example when the connection is closing), so a client MUST NOT assume a guaranteed push and still reads `history.noneReason` on its next resume/read (FM-005). */
+export interface SessionViewHealthChangedParams {
+  /** The new view-health state. In v1 the host emits only `Unavailable`. */
+  health: SessionViewHealth;
+  /** Why the view is unavailable — the SAME typed `HistoryNoneReason` vocabulary the pull path stamps on `history.noneReason` (tdd SS2.5.2, D-050), so a client reuses one handler for push and pull. `projectionUnavailable` in v1; present only when `health` is `Unavailable`. Open on the client side: an unknown reason decodes conservatively and renders generically. */
+  noneReason?: HistoryNoneReason;
+  /** The session whose live view health changed. */
+  sessionId: string;
+}
+
+/** One typed-invocable shortcut spelling (tdd SS3.22.1). A plugin skill may contribute two rows: its bare-name winner and its qualified `<pluginId>:<skillId>` form. */
+export interface SkillCatalogEntry {
+  /** Present when the skill declares an argument hint. */
+  argumentHint?: string;
+  /** The skill's palette summary. */
+  description: string;
+  /** The skill display name the first-party palette shows. */
+  displayName: string;
+  /** The owning plugin's identifier; present when `source` is `plugin`. */
+  pluginId?: string;
+  /** The shortcut token without the leading slash — bare (`fix-bug`) or plugin-qualified (`acme:deploy`) — the exact value a `skill` input part submits. Unique within one response. */
+  selector: string;
+  /** Where the skill comes from. */
+  source: SkillSource;
+}
+
+/** `skill/changed` params (tdd SS3.22.2): the session's user-invocable set changed; clients re-issue `skill/list`. Advisory — the host may coalesce bursts and guarantees no ordering relative to view events (ADR 32471 D3). */
+export interface SkillChangedParams {
+  /** The session whose set changed. */
+  sessionId: string;
+}
+
+/** `skill/list` params (tdd SS3.22.1). Per-session because skill scope follows the session's workspace and plugin state. */
+export interface SkillListParams {
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `skill/list` result (tdd SS3.22.1): one row per typed-invocable shortcut spelling — exactly the invocations the first-party typed dispatch accepts (spec 11352 INV-007 predicate and the shared shortcut layer's name resolution, both by call-through; ADR 32471 D2). */
+export interface SkillListResult {
+  /** The session's user-invocable skill rows. */
+  skills: SkillCatalogEntry[];
+}
+
+/** A skill row's source scope (tdd SS3.22.1): the projection of the skills crate's `SkillsSourceScope`. Open (server-produced result vocabulary, the #22785 enum-openness rule): a future scope value is additive. */
+export type SkillSource = "bundled" | "user" | "project" | "plugin" | (string & {});
+
+/** The compaction boundary an anchored snapshot is anchored at (tdd SS2.5.2). */
+export interface SnapshotAnchor {
+  /** The view cursor of the boundary's `compaction` event. */
+  boundaryCursor: string;
+  /** The boundary's opaque compaction anchor (tdd SS4.5.10). */
+  summarizedThrough: string;
+}
+
+/** The complete folded view at the snapshot cursor (tdd SS4.9.1).  Additive-optional evolution applies exactly as everywhere else; unknown members MUST be ignored, and preserved if re-serialized.  **One served site does not satisfy this type today, escalated under #22785 (E8).** The genesis snapshot rung serves `state: {"items": [...]}` alone (`tbh-session-view-serve`'s `materialized_fold.rs`, the `select_genesis_history` call), while the anchored rung serves the full folded state. A schema-validating client resuming with `{"history": "snapshot"}` against the real fold therefore sees the other required members missing. The fix is a serving change in the #208/#14653 lane (serialize the `SessionViewState` the genesis path already folds, as the anchored path does) plus its own RED against the real fold; it is not a shape change here, because SS4.9.1 ratifies this shape. */
+export interface SnapshotState {
+  /** The running foreground turn; `null` when none is running. */
+  activeTurn: TurnRef | null;
+  /** The effective approval mode at this cursor — the same object the `Session` carries (tdd SS2.4, SS5.12). */
+  approvalMode: EffectiveApprovalModeState;
+  /** Latest branch observation; `null` when no fact has landed. */
+  branch: BranchState | null;
+  /** The latest `(windowTokens, usedTokens, pressure)` triple. SS4.9.1 says "`null`/absent" and SS4.9.2's worked example OMITS the member; the binary omits it too, so this is the absent arm — the four siblings above are present-null in the same frame. INV-017 admits one or the other, never both; escalated under #22785. */
+  contextUsage?: ContextUsage;
+  /** Latest effective model; `null` when no fact has landed. */
+  effectiveModel: EffectiveModel | null;
+  /** Latest goal block; `null` when no fact has landed. */
+  goal: Goal | null;
+  /** Every item, in first-opened order, each at its latest revision at the snapshot cursor. One schema per kind, shared with the notification item object — which is what makes snapshot+suffix a pure splice (tdd SS4.9.1). */
+  items: Item[];
+  /** The settled canonical session name; `null` when the session was never named (#27598, tdd SS4.9.1 / SS2.14). Folds the same durable `session/nameChanged` record `Session.name` reports. */
+  name?: string;
+  /** The pending-approval half of the pending set. */
+  pendingApprovals: PendingApprovalPointer[];
+  /** The pending-user-input half of the pending set. */
+  pendingUserInputs: PendingUserInputPointer[];
+  /** Admitted-but-not-launched submits, in launch order (tdd SS3.1.4). */
+  queuedTurns: TurnRef[];
+  /** The latest session-default reasoning effort with its source; ABSENT until a set lands (tdd SS4.9.1 `reasoningEffort`, ADR 31255 D1 — the `contextUsage` absent arm, never present-null). */
+  reasoningEffort?: ReasoningEffortState;
+  /** Latest todo list; `null` when no fact has landed. */
+  todoList: TodoListState | null;
+  /** The `cumulative` block of the last `session/tokenUsage` event; zeroes when none (tdd SS4.9.1). */
+  tokenUsage: CumulativeTokenUsage;
+  /** Completed-turn count at this cursor. */
+  turnCount: number;
+}
+
+/** The inclusive raw-record range a durable-sourced view event folded from (tdd SS4.2) — the reconciliation token: re-folding the cited records from the canonical fold state immediately before `first` — appended host-death terminals seed from the end-of-records state — reproduces the event (tdd SS7.5; spec 14653 T041/INV-009). In v1 it is an **opaque provenance token**: no wire method reads what it points at (the SS6 raw-log altitude is deferred, #13929).  Ephemeral-sourced events (`item/delta`, and an `item/started` that opens on an ephemeral record) carry no `sourceRange` — ephemeral records may be evicted by retention (tdd SS4.2; spec 14653 INV-009). */
+export interface SourceRange {
+  /** The first record of the inclusive range. */
+  first: RecordPosition;
+  /** The last record of the inclusive range; equal to `first` for an event folded from one record. */
+  last: RecordPosition;
+  /** The stream the folded records live on (run stream, or the session stream's mirror of task/approval/subagent-control records — whichever the fold actually consumed, tdd SS4.2). */
+  stream: StreamRef;
+}
+
+/** One raw stream named by a [`SourceRange`] (tdd SS4.2). */
+export interface StreamRef {
+  /** The stream id. */
+  id: string;
+  /** The stream kind, verbatim raw-log vocabulary (e.g. `"run"`, `"session"`). A free string, not an enum: `sourceRange` is an opaque provenance token in v1 and the raw stream vocabulary is the deferred SS6 altitude's to freeze (#13929). */
+  kind: string;
+}
+
+/** Subagent control status (tdd SS4.5.7, camelCased `SubagentControlStatus`). Open; the generic item `status` is the terminal authority. */
+export type SubagentControlStatus =
+  | "accepted"
+  | "starting"
+  | "running"
+  | "resultReady"
+  | "closing"
+  | "closed"
+  | "recoveryPending"
+  | "manualReconciliation"
+  | (string & {});
+
+/** Params for `subagent/sendMessage` and `subagent/followupTask` (SS3.16): a child target plus the input body. */
+export interface SubagentInputParams {
+  /** The note/task text: trimmed with Unicode-whitespace semantics, rejected when empty after trimming, delivered trimmed with multibyte content byte-for-byte intact (SS3.16). */
+  body: string;
+  /** Client-minted UUIDv7 command id (SS3.1.1). */
+  commandId: string;
+  /** Target session (UUIDv7 string; SS3 preamble). */
+  sessionId: string;
+  /** Durable child id (the SS4.5.7 item's `subagentId`; opaque string). */
+  subagentId: string;
+}
+
+/** Params for `subagent/interrupt`, `subagent/stop`, and `subagent/close` (SS3.16): a child target plus an optional human-readable reason that is preserved on the durable effect record. */
+export interface SubagentOwnerReasonParams {
+  /** Client-minted UUIDv7 command id (SS3.1.1). */
+  commandId: string;
+  /** Optional reason, preserved on the durable owner-command record. */
+  reason?: string;
+  /** Target session (UUIDv7 string; SS3 preamble). */
+  sessionId: string;
+  /** Durable child id (the SS4.5.7 item's `subagentId`; opaque string). */
+  subagentId: string;
+}
+
+/** A subagent's result envelope (tdd SS4.5.7, `SubagentResultEnvelope`). */
+export interface SubagentResult {
+  /** Artifact references, verbatim. */
+  artifactRefs: string[];
+  /** Error kind, verbatim durable vocabulary, when the child failed. */
+  errorKind?: string;
+  /** Evidence references, verbatim. */
+  evidenceRefs: string[];
+  /** Structured result data, verbatim, when present. */
+  structuredData?: Record<string, unknown>;
+  /** Bounded result summary (<=512 chars, runtime-enforced). */
+  summary: string;
+  /** Result text (<=32 KiB), when present. */
+  text?: string;
+}
+
+/** Params for `subagent/resume`, `subagent/reopen`, and `subagent/readResult` (SS3.16): the bare child target. */
+export interface SubagentTargetParams {
+  /** Client-minted UUIDv7 command id (SS3.1.1). */
+  commandId: string;
+  /** Target session (UUIDv7 string; SS3 preamble). */
+  sessionId: string;
+  /** Durable child id (the SS4.5.7 item's `subagentId`; opaque string). */
+  subagentId: string;
+}
+
+/** The one usage payload shape: the `usage/read` result's `usage` member and the `usage/changed` params (ADR 32563 D2/D3). The numbers are point-in-time — `observedAtMs` is the host's arrival stamp, so a client renders "as of", never implies live data (spec 18742 US-FR-004). */
+export interface SubscriptionUsage {
+  /** When the host RECEIVED this observation (frame arrival or mint request-send), epoch milliseconds. */
+  observedAtMs: number;
+  /** The provider's subscription tier id, verbatim. */
+  tier: string;
+  /** The rolling weekly block. */
+  weekly: SubscriptionUsageWeekly;
+  /** The current window. */
+  window: SubscriptionUsageWindow;
+}
+
+/** The rolling weekly block: same semantics as [`SubscriptionUsageWindow`] without a duration (ADR 32563 D2). */
+export interface SubscriptionUsageWeekly {
+  /** When the weekly window resets, epoch milliseconds. */
+  resetsAtMs: number;
+  /** Percent of the weekly budget used (integer ≥ 0, may exceed 100). */
+  usedPercent: number;
+}
+
+/** The current usage window (the provider's 5-hour-class block): verbatim provider percentages with the reset stamp normalized to epoch milliseconds (ADR 32563 D2). */
+export interface SubscriptionUsageWindow {
+  /** When the window resets, epoch milliseconds. */
+  resetsAtMs: number;
+  /** Percent of the window's budget used: an integer ≥ 0, verbatim from the provider — over-quota values above 100 are valid. */
+  usedPercent: number;
+  /** The window's length in minutes (> 0). */
+  windowDurationMins: number;
+}
+
+/** A success response frame (SS1.2 §2.3). */
+export interface SuccessResponse {
+  /** Echo of the request id. */
+  id: RequestId;
+  /** The literal `"2.0"`. */
+  jsonrpc: JsonRpcVersion;
+  /** Always a JSON object, possibly `{}`, never a bare scalar — so every result can grow additive-optional members (SS1.2). */
+  result: Record<string, unknown>;
+}
+
+/** `task/background` params (tdd §3.13): durably send a running foreground tool task to the background. */
+export interface TaskBackgroundParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The task to background, exactly as the view names it: the `toolCall` item's `itemId` IS the task id (SS4.5.5). */
+  taskId: string;
+}
+
+/** The `task/background` / `task/stop` ack (tdd §3.13/§3.14): admission-only, echoing the targeted task. */
+export interface TaskCommandResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** Echoes the targeted task id. */
+  taskId: string;
+}
+
+/** `task/stopAll` params (tdd §3.15): stop every stoppable background workload live at admission. */
+export interface TaskStopAllParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** The `task/stopAll` ack (tdd §3.15): always `accepted`, including over an empty set — a blanket stop over nothing is a satisfied gesture. The ack deliberately carries no stopped-task list; count the kills from the view. */
+export interface TaskStopAllResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** `task/stop` params (tdd §3.14): stop one named background task. Required target, never "whichever is loudest" — §3.15 is the blanket verb. */
+export interface TaskStopParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The task to stop, the `toolCall` item's `itemId` (SS4.5.5). */
+  taskId: string;
+}
+
+/** One todo entry (tdd SS4.6.3). */
+export interface TodoItem {
+  /** Present-tense active form, when the tool supplied one. */
+  activeForm?: string;
+  /** The todo status (camelCased runtime `TodoStatus`). */
+  status: TodoStatus;
+  /** The todo text. */
+  text: string;
+}
+
+/** The latest todo-list fact in the snapshot (tdd SS4.6.3, SS4.9.1). */
+export interface TodoListState {
+  /** The full todo list. */
+  items: TodoItem[];
+  /** The snapshot revision. Diagnostics only, never an ordering guard. */
+  revision: number;
+  /** The tool that produced the snapshot, verbatim. */
+  sourceTool: string;
+}
+
+/** Todo status (tdd SS4.6.3): closed in the runtime, wire-open. */
+export type TodoStatus = "pending" | "inProgress" | "completed" | "cancelled" | (string & {});
+
+/** Raw token counters, verbatim from the durable record (tdd SS4.6.5, the runtime's `Usage`, camelCased). Not directly summable across providers — sum the counted-once derivations instead (#8803). */
+export interface TokenUsage {
+  /** Cache read tokens, only when the provider distinguishes writes/reads. */
+  cacheReadTokens?: number;
+  /** Cache write tokens, only when the provider distinguishes writes/reads. */
+  cacheWriteTokens?: number;
+  /** Provider-reported cache tokens (inside or beside `inputTokens`, provider-convention-dependent — the reason `promptTokens` exists). */
+  cachedTokens: number;
+  /** Provider-reported input tokens. */
+  inputTokens: number;
+  /** Provider-reported output tokens. */
+  outputTokens: number;
+  /** Output tokens spent on reasoning, when the provider reports it. */
+  reasoningTokens: number;
+}
+
+/** Optional W3C trace context, on requests in both directions only — never on responses or notifications (SS1.8). */
+export interface TraceContext {
+  /** W3C `traceparent` string; receivers that do not trace ignore it. */
+  traceparent?: string;
+  /** W3C `tracestate` string. */
+  tracestate?: string;
+}
+
+/** `turn/cancel` params (tdd SS3.5): plain cancellation on the normal command lane. Same shape as `turn/interrupt`, **without** `retract` — pairing a retract with a plain cancel is durably rejected `not_paired_interrupt`. */
+export interface TurnCancelParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The exact turn to cancel; omit to target the current foreground turn. Any syntactically valid UUID: a turn from an older session may carry a v4 or v5 id. A malformed id is `invalidParams`. */
+  turnId?: string;
+}
+
+/** `turn/cancel` result (tdd SS3.5): identical envelope to `turn/interrupt`. */
+export interface TurnCancelResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The cancelled turn. */
+  turnId: string;
+}
+
+/** `turn/completed` params (tdd SS4.5.1): the run's durable terminal record landed. */
+export interface TurnCompletedParams {
+  /** Turn duration; absent means unmeasured, never fabricated. */
+  durationMs?: number;
+  /** Present iff `terminal` is `"failed"` (tdd SS4.5.1): mid-turn failures reach the client here — never as a JSON-RPC error. */
+  error?: TurnError;
+  /** The runtime's free-text terminal reason, verbatim. Display and diagnostics only; never branch on it. */
+  reason?: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** The turn terminal (open enum). */
+  terminal: TurnTerminal;
+  /** Time to first token, when measured. */
+  timeToFirstTokenMs?: number;
+  /** The terminated turn. */
+  turnId: string;
+  /** The turn's aggregate token usage, summed across the turn's model completions (same shape as `session/tokenUsage.usage`). */
+  usage?: TokenUsage;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** The settled turn-failure object (tdd SS4.5.1): `{kind, message, retryable}`. */
+export interface TurnError {
+  /** The failure class (open camelCase enum grounded in the runtime's terminal failure classification). */
+  kind: TurnErrorKind;
+  /** Human-readable failure text. */
+  message: string;
+  /** The server's judgment that resubmitting the same input may succeed. */
+  retryable: boolean;
+}
+
+/** Turn failure classes (tdd SS4.5.1, `TerminalErrorKind` plus the model-task failure class). Open. */
+export type TurnErrorKind =
+  | "stepLimit"
+  | "configError"
+  | "projectionError"
+  | "logError"
+  | "workflowLaunchError"
+  | "environmentError"
+  | "modelError"
+  | "launchError"
+  | "authRequired"
+  | (string & {});
+
+/** One ordered content part of a turn submission (tdd SS3.2). File mentions are text, not a part type: write `@relative/path` in a text part. A structured `mention` part is reserved and currently rejected, and an unknown part type is `invalidParams` (tdd SS3.1.2, SS3.2) — which is what closes [`TurnInputPartType`].  Modelled as a discriminated flat object rather than a Rust `enum`, the convention [`crate::view::approval::ApprovalSubject`] already established for a wire union in this crate: the v1 schema model names no object-variant union shape and fails closed on one. The serialized JSON is the tdd shape either way; what a flat object cannot express is "`mediaType` is required exactly when `type` is `image`".  **RULED (#22785 E4, owner, 2026-08-26): the precedent is accepted.** A strict union node kind may be funded later as a follow-up; if it is, it must cover [`crate::method::lifecycle::PendingRequestPointer`] too. `height` may only appear together with `width`. `width` may only appear together with `height`. */
+export interface TurnInputPart {
+  /** Free-text skill arguments, optional on a `skill` part — the wire twin of what the TUI accepts after the shortcut token (tdd SS3.22.3). */
+  arguments?: string;
+  /** Base64 payload, required on an `image` part. Invalid base64 or an empty payload is rejected with invalid params. */
+  base64Data?: string;
+  /** Pixel height; must be provided together with `width` or not at all (tdd SS3.2, #22785 E6c). */
+  height?: number;
+  /** Media type, required on an `image` part. */
+  mediaType?: string;
+  /** The skill to invoke, required on a `skill` part (tdd SS3.2, SS3.22.3; ADR 32471 D4): a bare or plugin-qualified shortcut token from `skill/list`. The HOST resolves and expands; an unknown selector is the typed `-32032 skillNotFound` request error. */
+  selector?: string;
+  /** User prompt text, on a `text` part. Multiple text parts are joined in order into the turn's prompt. */
+  text?: string;
+  /** The part type. */
+  type: TurnInputPartType;
+  /** Pixel width; must be provided together with `height` or not at all (tdd SS3.2). Published as a `dependentRequired` pair under #22785 E6c. */
+  width?: number;
+}
+
+/** The `type` discriminator of a turn input part (tdd SS3.2). Closed: an unknown part type is `invalidParams` (tdd SS3.1.2). */
+export type TurnInputPartType = "text" | "image" | "skill";
+
+/** `turn/interrupt` params (tdd SS3.4): the "user pressed stop" gesture, on the runtime's priority lane. */
+export interface TurnInterruptParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** Pair a retract intent with the interrupt: if the turn is cancelled before any assistant output committed, the submission is durably retracted (view event `turn/retracted`) so the client may restore the prompt text. A rejected retract does not undo the interrupt. Default `false` (tdd SS3.4). */
+  retract?: boolean;
+  /** The target session. */
+  sessionId: string;
+  /** The exact turn to interrupt. Omit to target the session's current foreground turn, resolved at admission; prefer passing the explicit id when you have one (tdd SS3.4). Any syntactically valid UUID: a turn from an older session may carry a v4 or v5 id. A malformed id is `invalidParams`. */
+  turnId?: string;
+}
+
+/** `turn/interrupt` result (tdd SS3.4). Acceptance means the interrupt was admitted, **not** that the turn is already stopped: the turn is over when you fold its `turn/completed` with terminal `cancelled`. */
+export interface TurnInterruptResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The interrupted turn. */
+  turnId: string;
+}
+
+/** A turn named by the snapshot's active/queued lists (tdd SS4.9.1). */
+export interface TurnRef {
+  /** The `commandId` of the submit that minted it. */
+  commandId: string;
+  /** The turn's id, pre-minted per tdd SS3.1.4. */
+  turnId: string;
+}
+
+/** `turn/retracted` params (tdd SS4.5.1): an interrupt-paired retract was durably accepted. The retracted user-message item is re-emitted via `item/updated` with `retracted: true`. */
+export interface TurnRetractedParams {
+  /** The retracted submission's command id. */
+  commandId: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** The turn whose submission was retracted. */
+  turnId: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `turn/retryScheduled` params (tdd SS4.5.1, spec 14412; D-026): a durable turn retry-scheduled fact folded — the failing model attempt's scheduled retry is observable BEFORE the turn terminates, so a streaming client can render "attempt N/M · retrying in Ss · reason" instead of dead air. Non-terminal: it never resolves a turn-wait (tdd SS3.1.4). The delay is the recorded scheduled backoff, never an absolute fire time — clients derive any countdown locally. `sourceRange` cites the session stream's mirror of the task-lifecycle record (tdd SS4.2). */
+export interface TurnRetryScheduledParams {
+  /** The attempt that failed (producer-normalized, >= 1). */
+  attempt: number;
+  /** The turn's model-retry chain bound. */
+  maxAttempts: number;
+  /** The attempt about to run (producer contract: attempt < nextAttempt <= maxAttempts; not a schema constraint). */
+  nextAttempt: number;
+  /** The recorded stopping reason through the shared task-detail normalization (non-empty; capped at 160 characters). */
+  reason: string;
+  /** The scheduled backoff delay in milliseconds, verbatim from the durable fact. */
+  retryDelayMs: number;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable record this event folded from (the session stream's mirror of the retry-scheduled task status; `first == last`). */
+  sourceRange: SourceRange;
+  /** The running turn whose model attempt is being retried. */
+  turnId: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** What `turn/start` did with the input (tdd SS3.2). Resolves OQ-H in v1: since `queue` is the default `ifBusy`, clients need to distinguish these without folding history. */
+export type TurnStartDisposition = "started" | "queued" | "steered" | (string & {});
+
+/** `turn/start.providerRequestOptions` is deliberately absent: **RULED (#22785 E3, owner, 2026-08-26) to stay off the published schema.** The schema is the contract, and a free-form-object node kind is revisited only if the experimental field graduates. `turn/start` params (tdd SS3.2). */
+export interface TurnStartParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). The fresh turn's `turnId` derives from it (tdd SS3.1.4). */
+  commandId: string;
+  /** Presentation form of the prompt for transcripts. Durable; carried on the resulting user-message view item. Never model-visible (tdd SS3.2). */
+  displayText?: string;
+  /** Disposition when a turn is already running; default `queue`. */
+  ifBusy?: IfBusy;
+  /** Ordered content parts; required and non-empty. */
+  input: TurnInputPart[];
+  /** Reasoning tier sampled at submission for this turn. */
+  reasoningEffort?: ReasoningEffort;
+  /** The target session. */
+  sessionId: string;
+  /** A sticky REPLACEMENT of the session's runtime workspace-root set, binding at this turn's launch and persisting for subsequent turns until replaced again — unlike `reasoningEffort`, which is this-turn-only. Same shape and validation as `session/start.workspaceRoots`; invalid params on an explicit `ifBusy: "steer"` submit and so is explicit `null` (the D-049 null-tolerant set is closed); omitted means "unchanged", never "reset" (tdd SS3.2, ADR 37313 D3, #37313). */
+  workspaceRoots?: string[];
+}
+
+/** `turn/start` result (tdd SS3.2). */
+export interface TurnStartResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** What happened to the input. */
+  disposition: TurnStartDisposition;
+  /** `true` iff `disposition` is `started`; retained as the boolean shorthand — `disposition` is authoritative (tdd SS3.2). */
+  startedNewTurn: boolean;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The turn that will carry (or absorbed) this input. Authoritative: always take it from the ack rather than deriving it (tdd SS3.2). */
+  turnId: string;
+}
+
+/** `turn/started` params (tdd SS4.5.1): a foreground turn began running — fresh submits immediately, queued submits at their launch boundary, never steered submits. */
+export interface TurnStartedParams {
+  /** The submitting command; `turnId == commandId` for fresh turns (tdd SS3.1.4). */
+  commandId: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from. */
+  sourceRange: SourceRange;
+  /** The started turn. */
+  turnId: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** `turn/steer` params (tdd SS3.3): exact-target steering into the currently running turn. */
+export interface TurnSteerParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The turn you believe is running. Closes the race where the turn completes or is replaced between your read and your steer: input meant for turn A can never leak into turn B (tdd SS3.3). Any syntactically valid UUID: a turn from an older session may carry a v4 or v5 id. A malformed id is `invalidParams`; an id that is not the running turn is refused. */
+  expectedTurnId: string;
+  /** Same content parts as `turn/start`. */
+  input: TurnInputPart[];
+  /** Reasoning tier for the model calls this steer's input reaches. Applies forward, never backward; absent means unspecified, not "reset" (tdd SS3.3, D-024). */
+  reasoningEffort?: ReasoningEffort;
+  /** The target session. */
+  sessionId: string;
+}
+
+/** `turn/steer` result (tdd SS3.3). */
+export interface TurnSteerResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The running turn that absorbed the input. */
+  turnId: string;
+}
+
+/** Turn terminal vocabulary (tdd SS4.5.1): exactly the runtime's `RunTerminalKind` — closed in the runtime, wire-open for evolution. */
+export type TurnTerminal = "completed" | "failed" | "cancelled" | (string & {});
+
+/** `turn/unqueue` params (tdd SS3.6): reclaim a queued submit before it launches. It is **not** a stop — a reclaim that arrives after its target launched is durably rejected, never silently upgraded into a cancel. */
+export interface TurnUnqueueParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The queued turn to reclaim, exactly as the queueing `turn/start`'s ack minted it and as snapshot `queuedTurns` lists it. Required, and never "whichever is newest" (tdd SS3.6). Any syntactically valid UUID: a turn from an older session may carry a v4 or v5 id. A malformed id is `invalidParams`. */
+  turnId: string;
+}
+
+/** `turn/unqueue` result (tdd SS3.6). Admission only — but for this command admission *is* the race: an admitted reclaim implies the turn will not launch. The authoritative removal is the `turn/unqueued` view event. */
+export interface TurnUnqueueResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The reclaimed turn. */
+  turnId: string;
+}
+
+/** `turn/unqueued` params (tdd SS3.6, SS4.5.1): a queued submit's reclaim durably won; its pre-minted turn never runs. Carries the reclaimed `turnId` and the `commandId` of the `turn/start` that queued it, so a client can restore the submission's text exactly as for `turn/retracted`. No `turn/started`/`turn/completed` is ever emitted for this `turnId` (SDK turn-waits settle on this event too, tdd SS3.1.4). `sourceRange` cites the SESSION stream's reclaim record — a reclaimed turn never had a run stream. */
+export interface TurnUnqueuedParams {
+  /** The `commandId` of the `turn/start` that queued the reclaimed turn. */
+  commandId: string;
+  /** The owning session. */
+  sessionId: string;
+  /** The durable records this event folded from (the session stream's reclaim record). */
+  sourceRange: SourceRange;
+  /** The reclaimed turn: pre-minted at admission, never launched. */
+  turnId: string;
+  /** Opaque, strictly monotonic view cursor (tdd SS4.1). */
+  viewCursor: string;
+}
+
+/** One element of a `view/page` result's `events` array: an **unframed view notification** exactly as tdd SS4.2.1 defines it — the nested pair `{"method", "params"}`, which is the live notification minus `jsonrpc` and `emittedAtMs`, with nothing lifted out of `params` and nothing spliced into it. SS4.2.1 is the single normative definition; SS4.7.3 and SS7.4 both cite it, so the two surfaces cannot drift. */
+export interface UnframedViewNotification {
+  /** The event type — the live notification's method name, retained because the type lives only in the notification name and would otherwise be lost (tdd SS4.2.1). */
+  method: string;
+  /** The notification's params object, verbatim. */
+  params: UnframedViewNotificationParams;
+}
+
+/** The `params` of an unframed view notification (tdd SS4.2.1, SS4.2).  Declares the SS4.2 base members every view notification carries, and stays **open** for the event-specific fields SS4.5/SS4.6/SS5 add per event type. The v1 schema model names no method-correlated union (the SS4.7.3 `events` element's `params` arm is selected by its sibling `method`), so the per-event arms cannot be expressed here without one; enumerating them as an uncorrelated union would additionally exclude `turn/unqueued`, whose notification row is another lane's ratified deferral (#207/#14407) — a published schema that rejects a real page element is the exact #19923 defect this PR exists to close. Recorded as a Design delta on #22785.  `sourceRange` is required here and not optional: `view/page` serves durable-sourced events only (tdd SS4.7.3), and durable-sourced is *defined* as carrying a `sourceRange` — the SS4.2 ephemeral-sourced exemption applies to `item/delta`, which `view/page` never replays. */
+export interface UnframedViewNotificationParams {
+  /** The owning session (tdd SS4.2). */
+  sessionId: string;
+  /** The durable records this event folded from (tdd SS4.2, SS6.8). */
+  sourceRange: SourceRange;
+  /** The event's opaque, strictly monotonic view cursor. It stays **inside** `params`, where every live notification already carries it (tdd SS4.2.1) — nothing is spliced beside `method`. */
+  viewCursor: string;
+}
+
+/** The only scalar alternative to a known effort array. Kept as a closed singleton so arbitrary strings and uppercase spellings fail decoding. */
+export type UnknownModelReasoningEffortVariants = "unknown";
+
+/** `usage/read` result: `{usage?}` — omitted, never `null`, when the host has observed nothing (ADR 32563 D2: truthful absence, no "nothing observed" error). */
+export interface UsageReadResult {
+  /** The last-observed subscription usage window, when one exists. */
+  usage?: SubscriptionUsage;
+}
+
+export interface UserInputAnswer {
+  freeText?: string;
+  note?: string;
+  questionId: string;
+  selectedLabel?: string;
+  selectedLabels?: string[];
+}
+
+/** `userInput/answer` params (tdd SS5.10.2): answer every question.  Each answer carries `questionId` then exactly one of `selectedLabel` (single mode), `selectedLabels` (multiple mode, within min/max bounds), or `freeText` (<=500 chars); plus an optional `note` (<=500). Answers that do not match the prompt fail -32057 `userInputAnswerInvalid`. Image `attachments` are a **reserved** field in v1, rejected if sent, because the blob-upload path they reference is reserved in tdd SS3.2. */
+export interface UserInputAnswerParams {
+  /** One entry per question. */
+  answers: UserInputAnswer[];
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The prompt being answered. */
+  userInputId: string;
+}
+
+/** `userInput/answer` result (tdd SS5.10.2). */
+export interface UserInputAnswerResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The prompt this answer settled. */
+  userInputId: string;
+}
+
+/** `userInput/cancel` params (tdd SS5.10.2): decline to answer; the tool call resolves with a cancelled result the model sees. */
+export interface UserInputCancelParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** Why the prompt was declined. */
+  reason?: string;
+  /** The target session. */
+  sessionId: string;
+  /** The prompt being declined. */
+  userInputId: string;
+}
+
+/** `userInput/cancel` result (tdd SS5.10.2). */
+export interface UserInputCancelResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The prompt this cancellation settled. */
+  userInputId: string;
+}
+
+export interface UserInputClarification {
+  content: string;
+  format: string;
+}
+
+/** `userInput/clarify` params (tdd SS5.10.2): answer with a free-form clarification instead of the structured options — the "let me explain" path; the model receives the clarification text and re-decides. */
+export interface UserInputClarifyParams {
+  /** `format` is `"text"` in v1 (open); `content` is <=500 chars. */
+  clarification: UserInputClarification;
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The prompt being clarified. */
+  userInputId: string;
+}
+
+/** `userInput/clarify` result (tdd SS5.10.2). */
+export interface UserInputClarifyResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+  /** The prompt this clarification settled. */
+  userInputId: string;
+}
+
+export interface UserInputOption {
+  description?: string;
+  label: string;
+  preview?: UserInputOptionPreview;
+}
+
+export interface UserInputOptionPreview {
+  content: string;
+  format: string;
+}
+
+export type UserInputOutcome =
+  | "answered"
+  | "cancelled"
+  | "interrupted"
+  | "clarified"
+  | "timedOut"
+  | "aborted"
+  | (string & {});
+
+export interface UserInputQuestion {
+  header: string;
+  id: string;
+  options: UserInputOption[];
+  question: string;
+  selection: UserInputSelection;
+}
+
+/** Full params shared by `userInput/request` and `userInput/requested`. */
+export interface UserInputRequestParams {
+  autoResolutionMs?: number;
+  itemId: string;
+  questions: UserInputQuestion[];
+  sessionId: string;
+  sourceRange?: SourceRange;
+  toolCallId: string;
+  toolName: string;
+  turnId: string;
+  userInputId: string;
+  viewCursor: string;
+}
+
+export interface UserInputSelection {
+  maxSelections?: number;
+  minSelections?: number;
+  mode: UserInputSelectionMode;
+}
+
+export type UserInputSelectionMode = "single" | "multiple";
+
+/** `userInput/settled` params: the first durable prompt settlement. */
+export interface UserInputSettledParams {
+  answers: UserInputAnswer[];
+  clarification: UserInputClarification | null;
+  decidedByCommandId: string | null;
+  outcome: UserInputOutcome;
+  reason: string | null;
+  sessionId: string;
+  sourceRange: SourceRange;
+  userInputId: string;
+  viewCursor: string;
+}
+
+/** Winning terminal returned to a late user-input command. */
+export interface UserInputSettlementSummary {
+  outcome: string;
+  viewCursor: string;
+}
+
+/** Version-control system of a branch observation (tdd SS4.6.4). Open. */
+export type Vcs = "git" | "sapling" | (string & {});
+
+/** `view/gap` params (spec 208 SS4.8, FM-001): push delivery dropped events, and this names the hole.  The bracket is deferred (D-16487-2): it flushes at the subscription's next ACCEPTED delivery, never at enqueue time, so `next` always names an event whose own delivery is proven. A run of consecutive undelivered events coalesces into one bracket keeping the FIRST range's `after` (D-16487-1). The gap rides the protected reserved queue, so no wire-interleaving order against neighbouring deliveries is promised — the cursors carry the semantics (INV-002, D-16487-3).  On receipt a client may take either sanctioned recovery (D-030, FR-013): splice-fill — buffer live events at cursors >= `next`, page `(after, next)` forward, discard the overlap, splice — or re-anchor through the anchored read surface. The server requires neither, cannot distinguish clients by their choice, and holds no partial-fill state. */
+export interface ViewGapParams {
+  /** The last cursor delivered before the hole — the exclusive lower bound of the undelivered range. An **opaque** view cursor: clients relay it, never parse it (tdd SS4.1). */
+  after: string;
+  /** The first cursor delivered after the hole — the exclusive upper bound of the undelivered range, and the position delivery continues from. An **opaque** view cursor: clients relay it, never parse it (tdd SS4.1). */
+  next: string;
+  /** The session whose subscription dropped events. */
+  sessionId: string;
+}
+
+/** The `view/page` request-mode anchor (tdd SS4.7.3). Declared **open**: the tdd spells it "open string enum, v1 value `latestCompaction`". */
+export type ViewPageAnchor = "latestCompaction" | (string & {});
+
+/** The `view/page` paging direction (tdd SS4.7.3). Closed: the tdd spells exactly two values and a third would change the paging contract. */
+export type ViewPageDirection = "forward" | "backward";
+
+/** `view/page` params (tdd SS4.7.3): cursor-paged reads of the session view. */
+export interface ViewPageParams {
+  /** The cold-client request mode (D-029; spec 208 FR-008), resolved at call time to the latest installed compaction boundary. The one named exception to the SS4.1 observed-only rule. */
+  anchor?: ViewPageAnchor;
+  /** The exclusive anchor. Forward: the page starts strictly after it; omitted means from the beginning of the view. Backward: the page ends strictly before it; omitted means from the head. Mutually exclusive with `anchor` (tdd SS4.7.3; spec 208 FR-008a). */
+  cursor?: string;
+  /** Paging direction; `forward` when omitted. */
+  direction?: ViewPageDirection;
+  /** Maximum events to return, 1–1000. The server MAY return fewer (tdd SS4.7.3's short-serve rule).  The 1–1000 range is ratified and now **published**: #22785 E6c is owner-ruled, so the model carries the bound and the bundle renders `minimum`/`maximum` instead of a bare `integer`. Range 1–1000 inclusive. */
+  limit: number;
+  /** The session to page. */
+  sessionId: string;
+}
+
+/** The `resolvedAnchor` echo (tdd SS4.7.3): subsequent pages pass ordinary cursors, so the anchor never needs re-resolving. */
+export interface ViewPageResolvedAnchor {
+  /** The view cursor of the resolved boundary's `compaction` event. */
+  boundaryCursor: string;
+}
+
+/** `view/page` result (tdd SS4.7.3). */
+export interface ViewPageResult {
+  /** The page's events, always ascending by `viewCursor` in both directions. Durable-sourced only; pages are contiguous and can never skip a cursor. */
+  events: UnframedViewNotification[];
+  /** The anchor for the next page in the same direction: forward, the last event's cursor; backward, the first's. `null` at the end of the view in that direction — never omitted. */
+  nextCursor: string | null;
+  /** The resolution echo, present exactly when the request used `anchor` (tdd SS4.7.3; spec 208 FR-008). */
+  resolvedAnchor?: ViewPageResolvedAnchor;
+}
+
+/** The `snapshot` object returned by `session/resume` / `session/read` (tdd SS4.9). */
+export interface ViewSnapshot {
+  /** Present exactly when `history.mode` is `anchoredSnapshot` (tdd SS2.5.2). */
+  anchor?: SnapshotAnchor;
+  /** Snapshot schema version. A client whose generated types are older than this must fall back to inline/paged history (tdd SS4.9.2, SS2.5.2). */
+  schemaVersion: number;
+  /** The complete folded view at `viewCursor` (tdd SS4.9.1). */
+  state: SnapshotState;
+  /** The cursor the state is folded at; every event after it streams as the suffix (tdd SS4.9). */
+  viewCursor: string;
+}
+
+/** `view/subscribe` params (tdd SS4.7.1): attach this connection's live view subscription for a session at an explicit cursor — the fine-grained counterpart of the SS2 auto-subscribe, and the gap-free re-attachment path after `view/unsubscribe`. It never loads a session, takes no lease, writes nothing. */
+export interface ViewSubscribeParams {
+  /** Resume cursor. When present, the server replays `(after, head]` as ordinary view notifications before any live event — one gapless cursor sequence. Omitted means "from now": no historical replay (tdd SS4.7.1). */
+  after?: string;
+  /** The session to follow. */
+  sessionId: string;
+}
+
+/** `view/subscribe` result (tdd SS4.7.1). */
+export interface ViewSubscribeResult {
+  /** The view head at subscribe time; the client knows it is live once cursors pass it. */
+  viewCursor: string;
+}
+
+/** `view/unsubscribe` params (tdd SS4.7.2): remove this connection from the session's view subscription set — the protocol's single unsubscribe operation, at the altitude that owns subscriptions (tdd SS2.5.6 points here). It does not unload the session; unloading is the idle policy (tdd SS2.8). */
+export interface ViewUnsubscribeParams {
+  /** The session to stop following. */
+  sessionId: string;
+}
+
+/** `view/unsubscribe` result (tdd SS4.7.2): the empty object. Idempotent — unsubscribing while not subscribed returns `{}`. */
+export interface ViewUnsubscribeResult {}
+
+/** `workflow/cancel` params (tdd SS3.19): cancel a live workflow run. */
+export interface WorkflowCancelParams {
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The run to cancel, exactly as the `workflow` item names it (SS4.5.8); required, non-empty. */
+  workflowRunId: string;
+}
+
+/** One workflow child's folded state (tdd SS4.5.8, `WorkflowChildLifecycleFact`), keyed by `(childId, attempt)`. */
+export interface WorkflowChild {
+  /** The attempt number. */
+  attempt: number;
+  /** The child's id within the run. */
+  childId: string;
+  /** The child's observed duration, when recorded. */
+  durationMs?: number;
+  /** The child's display label, when recorded. */
+  label?: string;
+  /** The child's phase, when recorded. */
+  phase?: string;
+  /** The child's recorded result reference, verbatim, when present — an opaque string, matching the durable owner. */
+  resultRef?: string;
+  /** camelCased `WorkflowChildLifecycleStatus`, verbatim (durable runtime vocabulary). */
+  status: string;
+  /** The child's terminal, turn vocabulary (tdd SS4.5.8). */
+  terminal?: TurnTerminal;
+  /** The child's observed usage, when recorded. */
+  usage?: TokenUsage;
+}
+
+/** Which control to apply to the child's current attempt (tdd SS3.20). Closed on the wire: an unknown value is `-32602 invalidParams`. */
+export type WorkflowChildAction = "skip" | "retry";
+
+/** `workflow/childControl` params (tdd SS3.20): skip or retry one workflow child, keyed by the `(childId, attempt)` pair the `workflow` item's `children[]` carries. */
+export interface WorkflowChildControlParams {
+  /** The control to apply. */
+  action: WorkflowChildAction;
+  /** The child's CURRENT attempt (integer >= 1). A stale value rejects `"stale_attempt"`; re-read the item and re-key — never guess. Minimum 1. */
+  attempt: number;
+  /** The child, from the item's `children[]`; required, non-empty. */
+  childId: string;
+  /** The SS3.1.1 idempotency handle (UUIDv7). */
+  commandId: string;
+  /** The target session. */
+  sessionId: string;
+  /** The run owning the child (SS4.5.8); required, non-empty. */
+  workflowRunId: string;
+}
+
+/** The shared SS3.19/SS3.20 admission-only ack: deliberately bare `{commandId, status}` — settlement arrives as the workflow item's view events, never through the ack. */
+export interface WorkflowControlResult {
+  /** Echoes the client's id. */
+  commandId: string;
+  /** Admission status. */
+  status: CommandStatus;
+}
+
+/** Every wire method in this schema (SS1.9 index). */
+export type MspMethod =
+  | "initialize"
+  | "subagent/sendMessage"
+  | "subagent/followupTask"
+  | "subagent/interrupt"
+  | "subagent/stop"
+  | "subagent/resume"
+  | "subagent/reopen"
+  | "subagent/close"
+  | "subagent/readResult"
+  | "session/start"
+  | "session/resume"
+  | "session/fork"
+  | "session/list"
+  | "session/read"
+  | "turn/start"
+  | "turn/steer"
+  | "turn/interrupt"
+  | "turn/cancel"
+  | "turn/unqueue"
+  | "session/compact"
+  | "session/delete"
+  | "session/setModel"
+  | "session/rename"
+  | "session/setReasoningEffort"
+  | "session/userShell"
+  | "model/list"
+  | "skill/list"
+  | "task/background"
+  | "task/stop"
+  | "task/stopAll"
+  | "goal/set"
+  | "goal/edit"
+  | "goal/clear"
+  | "goal/pause"
+  | "goal/resume"
+  | "workflow/cancel"
+  | "workflow/childControl"
+  | "view/subscribe"
+  | "view/unsubscribe"
+  | "view/page"
+  | "item/readOutput"
+  | "approval/decide"
+  | "approval/listPending"
+  | "session/setApprovalMode"
+  | "userInput/answer"
+  | "userInput/cancel"
+  | "userInput/clarify"
+  | "usage/read";
+/** Every wire notification in this schema (SS1.9 index). */
+export type MspNotification =
+  | "initialized"
+  | "session/started"
+  | "session/closed"
+  | "session/deleteCompleted"
+  | "skill/changed"
+  | "turn/started"
+  | "turn/completed"
+  | "turn/retracted"
+  | "turn/retryScheduled"
+  | "turn/unqueued"
+  | "item/started"
+  | "item/updated"
+  | "item/delta"
+  | "item/completed"
+  | "view/gap"
+  | "approval/requested"
+  | "approval/updated"
+  | "approval/resolved"
+  | "userInput/requested"
+  | "userInput/settled"
+  | "session/modelChanged"
+  | "session/reasoningEffortChanged"
+  | "session/statusChanged"
+  | "session/goalChanged"
+  | "session/todoListChanged"
+  | "session/branchChanged"
+  | "session/tokenUsage"
+  | "session/contextUsage"
+  | "session/approvalModeChanged"
+  | "session/modelRouteUnserved"
+  | "session/nameChanged"
+  | "session/viewHealthChanged"
+  | "session/listChanged"
+  | "usage/changed";
+/** Every server-initiated wire request in this schema (SS5.3/SS5.10.1 index). */
+export type MspServerRequest = "approval/request" | "userInput/request";
+/** Every error `data.kind` in this schema's error table (SS1.6) — each code's primary kind plus its override kinds. */
+export type MspErrorDataKind =
+  | "parseError"
+  | "invalidRequest"
+  | "notInitialized"
+  | "alreadyInitialized"
+  | "methodNotFound"
+  | "experimentalRequired"
+  | "invalidParams"
+  | "internal"
+  | "pageEventTooLarge"
+  | "outputResultTooLarge"
+  | "overloaded"
+  | "inputTooLarge"
+  | "capabilityRequired"
+  | "notFound"
+  | "interrupted"
+  | "cancelled"
+  | "sessionNotFound"
+  | "sessionInUse"
+  | "sessionAmbiguous"
+  | "forkBoundaryInvalid"
+  | "sessionNotLoaded"
+  | "sessionStreamMismatch"
+  | "commandRejected"
+  | "backpressured"
+  | "skillNotFound"
+  | "viewTruncated"
+  | "outputUnavailable"
+  | "boundaryPruned"
+  | "boundaryUnusable"
+  | "noBoundary"
+  | "approvalNotFound"
+  | "approvalAlreadyResolved"
+  | "approvalChoiceInvalid"
+  | "approvalRequirementStale"
+  | "approvalReviewerUnavailable"
+  | "userInputNotFound"
+  | "userInputAlreadySettled"
+  | "userInputAnswerInvalid";
diff --git a/plugins/muse-provider/server/options.ts b/plugins/muse-provider/server/options.ts
new file mode 100644
index 0000000000..27621dace6
--- /dev/null
+++ b/plugins/muse-provider/server/options.ts
@@ -0,0 +1,32 @@
+import { z } from "zod";
+import { MuseError } from "./errors.js";
+
+const optionsSchema = z
+  .object({
+    sandbox: z
+      .object({
+        enabled: z.boolean().default(false),
+        network: z.enum(["proxy-only", "restricted", "enabled"]).default("proxy-only"),
+      })
+      .strict()
+      .prefault({}),
+    trustWorkspace: z.boolean().default(true),
+  })
+  .strict();
+
+export function serveArgs(providerOptions: unknown): string[] {
+  const parsed = optionsSchema.safeParse(providerOptions === undefined ? {} : providerOptions);
+  if (!parsed.success) {
+    const errors = parsed.error.issues
+      .map((issue) => `${["providerOptions", ...issue.path].join(".")}: ${issue.message}`)
+      .join("; ");
+    throw new MuseError("invalidProviderOptions", `Invalid Muse providerOptions: ${errors}`);
+  }
+  const { sandbox, trustWorkspace } = parsed.data;
+  return [
+    "--sandbox-network",
+    sandbox.network,
+    ...(sandbox.enabled ? [] : ["--disable-sandbox"]),
+    ...(trustWorkspace ? ["--trust-workspace"] : []),
+  ];
+}
diff --git a/plugins/muse-provider/server/provider.ts b/plugins/muse-provider/server/provider.ts
new file mode 100644
index 0000000000..8d9a3ddfea
--- /dev/null
+++ b/plugins/muse-provider/server/provider.ts
@@ -0,0 +1,215 @@
+import {
+  negotiateProviderCapabilities,
+  requireProviderCapabilities,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderInput,
+  type ProviderLaunch,
+  type ProviderRegistration,
+  type ProviderStatus,
+} from "@getpaseo/plugin/server/provider";
+import { serveArgs } from "./options.js";
+import { Usage } from "./usage.js";
+import { execCommand } from "@getpaseo/plugin/server";
+import { Catalog, launchKey } from "./catalog.js";
+import { MspConnection } from "./connection.js";
+import { MuseError, actionableError } from "./errors.js";
+import { Sessions } from "./sessions.js";
+import { Session } from "./session.js";
+import { accountSchema } from "./wire.js";
+
+const capabilities = [
+  "prompt.message",
+  "prompt.command",
+  "prompt.image",
+  "prompt.steer",
+  "session.configure",
+  "session.persistence",
+  "permission",
+  "session.list",
+] as const;
+
+export function createMuseProvider(usage: Usage): ProviderRegistration {
+  return {
+    id: "muse",
+    label: "Muse Code",
+    icon: "icon.svg",
+    command: ["muse"],
+    async getCatalogCacheKey(options) {
+      return launchKey(requireLaunch(options.launch));
+    },
+    async status({ launch }) {
+      if (!launch)
+        return { available: false, diagnostic: "Install Muse Code and ensure `muse` is on PATH." };
+      usage.remember(launch);
+      return status(launch);
+    },
+    async connect(request) {
+      if (!request.versions.includes(1))
+        throw new MuseError("protocol", "Provider protocol version 1 is required");
+      usage.remember(requireLaunch(request.launch));
+      return connect(
+        requireLaunch(request.launch),
+        negotiateProviderCapabilities(request.capabilities, capabilities),
+        usage,
+      );
+    },
+  };
+}
+function requireLaunch(launch: ProviderLaunch | undefined): ProviderLaunch {
+  if (!launch) throw new MuseError("missingLaunch", "Muse requires a daemon-resolved executable");
+  return launch;
+}
+async function status(launch: ProviderLaunch): Promise<ProviderStatus> {
+  let host: MspConnection | undefined;
+  try {
+    const { stdout: versionText } = await execCommand(
+      launch.command,
+      [...launch.args, "--version"],
+      {
+        env: launch.env,
+        timeout: 3000,
+        maxBuffer: 8192,
+      },
+    );
+    const match = /\b(\d+)\.(\d+)\.(\d+)\b/.exec(versionText);
+    if (!match) return { available: false, diagnostic: "Muse returned an unrecognized version." };
+    const major = Number(match[1]);
+    const minor = Number(match[2]);
+    if (major < 1 || (major === 1 && minor < 3))
+      return { available: false, diagnostic: `Update Muse Code: found ${match[0]}, need ≥1.3.0` };
+    // Leave room for the version probe, account read and cleanup within the status RPC deadline.
+    host = new MspConnection({ launch, timeoutMs: 3000, startupTimeoutMs: 20000 });
+    await host.initialize();
+    const account = await host.request("account/read", {}, accountSchema);
+    if (account.state === "loggedOut")
+      return { available: false, diagnostic: "Run `muse login` or set META_API_KEY" };
+    return { available: true };
+  } catch (error) {
+    return { available: false, diagnostic: actionableError(error, launch).message };
+  } finally {
+    await host?.close();
+  }
+}
+function connect(
+  launch: ProviderLaunch,
+  negotiated: readonly string[],
+  usage: Usage,
+): ProviderConnection {
+  const listeners = new Set<(event: ProviderEvent) => void>();
+  const sessions = new Map<string, Session>();
+  const catalog = new Catalog();
+  const imports = new Sessions();
+  let closed = false;
+  function emit(event: ProviderEvent): void {
+    if (!closed) for (const listener of listeners) listener(event);
+  }
+  async function dispatch(input: ProviderInput): Promise<void> {
+    if (input.type === "sessions") {
+      emit({
+        type: "sessions",
+        requestId: input.requestId,
+        sessions: await imports.list(launch, input),
+      });
+      return;
+    }
+    if (input.type === "catalog") {
+      emit({ type: "catalog", requestId: input.requestId, catalog: await catalog.read(launch) });
+      return;
+    }
+    if (input.type === "session.open") {
+      if (sessions.has(input.sessionId))
+        throw new MuseError("duplicateSession", "Muse session is already open");
+      const session = new Session({
+        id: input.sessionId,
+        config: input.config,
+        launch,
+        emit,
+        capabilities: negotiated,
+        serveArgs: serveArgs(input.config.providerOptions),
+      });
+      sessions.set(input.sessionId, session);
+      try {
+        await session.open(input);
+        usage.attach(
+          input.sessionId,
+          { ...launch, env: { ...launch.env, ...input.config.env } },
+          () => session.readUsage(),
+        );
+      } catch (error) {
+        sessions.delete(input.sessionId);
+        await session.close();
+        throw error;
+      }
+      return;
+    }
+    if (!("sessionId" in input))
+      throw new MuseError("unsupported", `Muse does not support ${input.type}`);
+    const session = sessions.get(input.sessionId);
+    if (!session) throw new MuseError("unknownSession", "Muse session is not open");
+    switch (input.type) {
+      case "session.prompt":
+        await session.prompt(input.prompt);
+        return;
+      case "session.configure":
+        await session.configure(input.changes);
+        break;
+      case "session.permission":
+        await session.answer(input.permissionId, input.response);
+        return;
+      case "session.interrupt":
+        await session.interrupt();
+        break;
+      case "session.close":
+        await session.close();
+        sessions.delete(input.sessionId);
+        usage.detach(input.sessionId);
+        emit({ type: "session.closed", sessionId: input.sessionId });
+        break;
+      default:
+        throw new MuseError("unsupported", `Muse does not support ${input.type}`);
+    }
+    if ("requestId" in input) emit({ type: "request.completed", requestId: input.requestId });
+  }
+  function failed(input: ProviderInput, failure: unknown): void {
+    const error = actionableError(failure, launch);
+    if (input.type === "session.prompt")
+      emit({
+        type: "session.prompt_result",
+        sessionId: input.sessionId,
+        clientMessageId: input.prompt.clientMessageId,
+        result: { type: "failed", error },
+      });
+    else if ("requestId" in input)
+      emit({ type: "request.failed", requestId: input.requestId, error });
+    else if ("sessionId" in input)
+      emit({ type: "session.runtime_failed", sessionId: input.sessionId, error });
+  }
+  return {
+    version: 1,
+    capabilities: negotiated,
+    async send(input) {
+      if (closed) throw new MuseError("closed", "Muse connection is closed");
+      requireProviderCapabilities(negotiated, input);
+      queueMicrotask(() => {
+        if (!closed) void dispatch(input).catch((error: unknown) => failed(input, error));
+      });
+    },
+    onEvent(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    async close() {
+      if (closed) return;
+      closed = true;
+      await Promise.all([
+        catalog.close(),
+        imports.close(),
+        ...[...sessions.values()].map((session) => session.close()),
+      ]);
+      for (const id of sessions.keys()) usage.detach(id);
+      sessions.clear();
+      listeners.clear();
+    },
+  };
+}
diff --git a/plugins/muse-provider/server/questions.ts b/plugins/muse-provider/server/questions.ts
new file mode 100644
index 0000000000..cf05f358b9
--- /dev/null
+++ b/plugins/muse-provider/server/questions.ts
@@ -0,0 +1,86 @@
+import type { ProviderEvent, ProviderPermissionResponse } from "@getpaseo/plugin/server/provider";
+import type { z } from "zod";
+import { MspConnection } from "./connection.js";
+import { MuseError } from "./errors.js";
+import { ackSchema, questionSchema, questionAnswersSchema, settledQuestionSchema } from "./wire.js";
+
+export class Questions {
+  private readonly pending = new Map<string, z.infer<typeof questionSchema>>();
+  private readonly settled = new Set<string>();
+  constructor(
+    private readonly host: MspConnection,
+    private readonly sessionId: string,
+    private readonly id: string,
+    private readonly emit: (event: ProviderEvent) => void,
+  ) {}
+
+  requested(input: unknown): void {
+    const request = questionSchema.parse(input);
+    if (this.settled.has(request.userInputId)) return;
+    this.pending.set(request.userInputId, request);
+    this.emit({
+      type: "session.permission",
+      sessionId: this.id,
+      request: {
+        id: request.userInputId,
+        name: request.toolName,
+        kind: "question",
+        input: {
+          questions: request.questions.map((question) => ({
+            id: question.id,
+            header: question.header,
+            question: question.question,
+            options: question.options,
+            multiSelect: question.selection.mode === "multiple",
+            allowOther: true,
+            allowEmpty: question.selection.minSelections === 0,
+          })),
+        },
+      },
+    });
+  }
+  resolved(input: unknown): void {
+    const { userInputId } = settledQuestionSchema.parse(input);
+    this.settled.add(userInputId);
+    this.pending.delete(userInputId);
+    this.emit({
+      type: "session.permission_resolved",
+      sessionId: this.id,
+      permissionId: userInputId,
+    });
+  }
+  async answer(id: string, response: ProviderPermissionResponse): Promise<boolean> {
+    const request = this.pending.get(id);
+    if (!request) return false;
+    if (response.behavior === "deny") {
+      await this.host.command(
+        "userInput/cancel",
+        { sessionId: this.sessionId, userInputId: id, reason: response.message },
+        ackSchema,
+      );
+      return true;
+    }
+    const supplied = questionAnswersSchema.parse(response.updatedInput);
+    const answers = request.questions.map((question) => {
+      const text = supplied.answers[question.header];
+      if (text === undefined) throw new MuseError("missingAnswer", `Answer ${question.header}`);
+      if (question.selection.mode === "single")
+        return question.options.some((option) => option.label === text)
+          ? { questionId: question.id, selectedLabel: text }
+          : { questionId: question.id, freeText: text };
+      const labels = text
+        .split(",")
+        .map((label) => label.trim())
+        .filter(Boolean);
+      if (labels.every((label) => question.options.some((option) => option.label === label)))
+        return { questionId: question.id, selectedLabels: labels };
+      return { questionId: question.id, freeText: text };
+    });
+    await this.host.command(
+      "userInput/answer",
+      { sessionId: this.sessionId, userInputId: id, answers },
+      ackSchema,
+    );
+    return true;
+  }
+}
diff --git a/plugins/muse-provider/server/recovery.ts b/plugins/muse-provider/server/recovery.ts
new file mode 100644
index 0000000000..0218ef47c4
--- /dev/null
+++ b/plugins/muse-provider/server/recovery.ts
@@ -0,0 +1,45 @@
+import type { z } from "zod";
+import { MspConnection, type Notification } from "./connection.js";
+import { pageSchema } from "./wire.js";
+
+// Two minutes accommodates slow model/tool work; polling repairs a lost live view without cancelling it.
+const SILENCE_MS = 2 * 60 * 1000;
+export class Recovery {
+  private timer: ReturnType<typeof setTimeout> | undefined;
+  private active = false;
+  private closed = false;
+  private cursor: string;
+  constructor(
+    private readonly host: MspConnection,
+    private readonly sessionId: string,
+    cursor: string,
+    private readonly apply: (event: Notification) => Promise<void>,
+    private readonly onSilent: () => void,
+  ) {
+    this.cursor = cursor;
+  }
+
+  activity(cursor: string | undefined, active: boolean): void {
+    if (cursor !== undefined) this.cursor = cursor;
+    this.active = active;
+    clearTimeout(this.timer);
+    if (active && !this.closed) this.timer = setTimeout(this.onSilent, SILENCE_MS);
+  }
+  async backfill(after = this.cursor): Promise<void> {
+    let cursor: string | null = after;
+    do {
+      const page: z.infer<typeof pageSchema> = await this.host.request(
+        "view/page",
+        { sessionId: this.sessionId, cursor, direction: "forward", limit: 1000 },
+        pageSchema,
+      );
+      for (const event of page.events) await this.apply(event);
+      cursor = page.nextCursor;
+    } while (cursor !== null && !this.closed);
+    this.activity(undefined, this.active);
+  }
+  close(): void {
+    this.closed = true;
+    clearTimeout(this.timer);
+  }
+}
diff --git a/plugins/muse-provider/server/session.ts b/plugins/muse-provider/server/session.ts
new file mode 100644
index 0000000000..31066c5b04
--- /dev/null
+++ b/plugins/muse-provider/server/session.ts
@@ -0,0 +1,636 @@
+import type {
+  ProviderEvent,
+  ProviderInput,
+  ProviderLaunch,
+  ProviderPersistence,
+  ProviderSessionConfig,
+  ProviderConfigChanges,
+  ProviderPrompt,
+  ProviderPermissionResponse,
+  ProviderMcpServerConfig,
+  ProviderCatalog,
+  ProviderToolCallDetail,
+} from "@getpaseo/plugin/server/provider";
+import type { z } from "zod";
+import { MspConnection, commandId, type Notification } from "./connection.js";
+import { MuseError, actionableError } from "./errors.js";
+import { Timeline, todoItem } from "./timeline.js";
+import { modes, efforts, presentCatalog } from "./catalog.js";
+import {
+  pendingSchema,
+  itemNotificationSchema,
+  approvalResolvedSchema,
+  usageSchema,
+  ackSchema,
+  gapSchema,
+  catalogSchema,
+  approvalModeSchema,
+  approvalSchema,
+  deltaSchema,
+  effortSchema,
+  notificationSchema,
+  persistenceSchema,
+  promptResultSchema,
+  sessionSchema,
+  turnSchema,
+  tokenUsageSchema,
+  contextUsageSchema,
+  type WireItem,
+  type WireApproval,
+} from "./wire.js";
+import type { SessionMcpServerConfig, TurnStartParams } from "./msp.js";
+
+import { Children } from "./children.js";
+import { Recovery } from "./recovery.js";
+import { Questions } from "./questions.js";
+import { Commands } from "./commands.js";
+
+interface SessionOptions {
+  serveArgs: string[];
+  id: string;
+  config: ProviderSessionConfig;
+  launch: ProviderLaunch;
+  emit(event: ProviderEvent): void;
+  capabilities: readonly string[];
+}
+
+interface Live {
+  nativeId: string;
+  timeline: Timeline;
+  children: Children;
+  questions: Questions;
+  commands: Commands;
+  recovery: Recovery;
+}
+
+export class Session {
+  private readonly host: MspConnection;
+  private liveState: Live | undefined;
+  private providerId: string | undefined;
+  private config: ProviderSessionConfig;
+  private catalog: ProviderCatalog = { models: [], modes };
+  private readonly approvals = new Map<string, WireApproval>();
+  private readonly messages = new Map<string, string>();
+  private readonly turns = new Map<string, "active" | "completed">();
+  private notifications: Promise<void> = Promise.resolve();
+  private readonly buffered: Notification[] = [];
+  private opening = true;
+  private closing = false;
+  private firstTurn = true;
+  private interruptCompletion: {
+    turnId: string;
+    resolve(): void;
+    reject(error: Error): void;
+  } | null = null;
+
+  constructor(private readonly options: SessionOptions) {
+    this.config = options.config;
+    this.host = new MspConnection({
+      launch: { ...options.launch, env: { ...options.launch.env, ...options.config.env } },
+      cwd: options.config.cwd,
+      serveArgs: options.serveArgs,
+    });
+    this.host.onNotification((notification) => {
+      if (this.opening) this.buffered.push(notification);
+      else this.enqueue(notification);
+    });
+    this.host.onExit((error) => {
+      if (!this.opening && !this.closing) this.runtimeFailed(error);
+    });
+  }
+
+  async open(input: Extract<ProviderInput, { type: "session.open" }>): Promise<void> {
+    await this.host.initialize();
+    const mcpServers = Object.fromEntries(
+      Object.entries(this.config.mcpServers).map(([id, server]) => [id, mcpServer(server)]),
+    );
+    let response;
+    if (input.persistence) {
+      if (input.persistence.version !== 1)
+        throw new MuseError("invalidPersistence", "Unsupported Muse persistence version");
+      const saved = persistenceSchema.parse(input.persistence.data);
+      // A fresh timeline needs history. MSP cursor resumes return only the suffix,
+      // so even legacy persistence cursors cannot restore this session's projection.
+      response = await this.host.command(
+        "session/resume",
+        { sessionId: saved.sessionId, config: { mcpServers } },
+        sessionSchema,
+      );
+      this.config = {
+        ...this.config,
+        model: this.config.model ?? saved.model,
+        thinkingOption: this.config.thinkingOption ?? saved.thinkingOption,
+      };
+      this.firstTurn = false;
+    } else {
+      response = await this.host.command(
+        "session/start",
+        {
+          workspaceRoot: this.config.cwd,
+          modelId: this.config.model,
+          approvalMode: approvalModeSchema.parse(this.config.mode ?? "onRequest"),
+          config: { mcpServers },
+        },
+        sessionSchema,
+      );
+    }
+    if (!response.viewCursor)
+      throw new MuseError(
+        "emptyViewCursor",
+        "Muse returned an empty resume viewCursor; this session cannot be watched.",
+      );
+    const nativeId = response.session.sessionId;
+    this.liveState = {
+      nativeId,
+      children: new Children(this.host, this.options.id, this.config.cwd, this.options.emit),
+      timeline: new Timeline(
+        this.host,
+        nativeId,
+        this.options.id,
+        this.options.emit,
+        (messageCommandId) => this.messages.get(messageCommandId),
+      ),
+      questions: new Questions(this.host, nativeId, this.options.id, this.options.emit),
+      commands: new Commands(this.host, nativeId, this.options.id, this.options.emit),
+      recovery: new Recovery(
+        this.host,
+        nativeId,
+        response.viewCursor,
+        (event) => this.notify(event),
+        () => {
+          this.notifications = this.notifications
+            .then(async () => {
+              const live = this.live();
+              await live.recovery.backfill();
+              return live.children.refresh();
+            })
+            .catch((error) => this.runtimeFailed(error));
+        },
+      ),
+    };
+    this.providerId = response.session.providerId ?? undefined;
+    this.config = {
+      ...this.config,
+      model: response.session.modelId ?? this.config.model,
+      mode: response.session.approvalMode?.mode ?? this.config.mode ?? "onRequest",
+    };
+    this.options.emit({
+      type: "session.opened",
+      requestId: input.requestId,
+      sessionId: this.options.id,
+      cwd: this.config.cwd,
+      restoration: "core",
+      capabilities: this.options.capabilities,
+      persistence: this.persistence(),
+    });
+    if (input.history === "replay" && response.history?.mode === "inline") {
+      if (!response.history.items)
+        throw new MuseError("invalidHistory", "Muse inline history has no items");
+      for (const item of response.history.items) await this.fold(item);
+    }
+    await this.restorePending(response.pendingRequests);
+    // Inline history precedes suffix events; replayed turn terminals do not own a fresh run.
+    this.opening = false;
+    for (const notification of this.buffered) this.enqueue(notification);
+    this.buffered.length = 0;
+    await this.notifications;
+    await this.readCatalog();
+    await this.live().commands.refresh();
+    this.publishPersistence();
+    this.publishConfig();
+    this.options.emit({
+      type: "session.ready",
+      requestId: input.requestId,
+      sessionId: this.options.id,
+    });
+  }
+
+  private live(): Live {
+    if (!this.liveState) throw new MuseError("sessionNotOpen", "Muse session is not open");
+    return this.liveState;
+  }
+
+  private async restorePending(
+    pointers: z.infer<typeof sessionSchema>["pendingRequests"],
+  ): Promise<void> {
+    if (!pointers.some((pending) => ["approval", "userInput"].includes(pending.kind))) return;
+    const pending = await this.host.request(
+      "approval/listPending",
+      { sessionId: this.live().nativeId },
+      pendingSchema,
+    );
+    for (const approval of pending.approvals) await this.permission(approval);
+    for (const question of pending.userInputs) this.live().questions.requested(question);
+  }
+  private async readCatalog(): Promise<void> {
+    this.catalog = presentCatalog(
+      await this.host.request("model/list", { sessionId: this.live().nativeId }, catalogSchema),
+    );
+    const model = this.config.model ?? this.catalog.defaultModel;
+    const selected = this.catalog.models.find((entry) => entry.id === model);
+    this.config = {
+      ...this.config,
+      model,
+      thinkingOption: this.config.thinkingOption ?? selected?.defaultThinkingOptionId,
+    };
+  }
+
+  async prompt(prompt: ProviderPrompt): Promise<void> {
+    if (await this.live().commands.compact(prompt)) return;
+    const id = commandId();
+    this.messages.set(id, prompt.clientMessageId);
+    const input: TurnStartParams["input"] = [];
+    const text: string[] = [];
+    if (this.firstTurn && this.config.systemPrompt)
+      input.push({
+        type: "text",
+        text: `<system_instructions>\n${this.config.systemPrompt}\n</system_instructions>`,
+      });
+    if (prompt.input.type === "command") {
+      input.push(this.live().commands.input(prompt.input));
+      text.push(
+        `/${prompt.input.name}${prompt.input.arguments ? ` ${prompt.input.arguments}` : ""}`,
+      );
+    } else
+      for (const part of prompt.input.content) {
+        if (part.type === "text") {
+          input.push({ type: "text", text: part.text });
+          text.push(part.text);
+        } else if (part.type === "image")
+          input.push({ type: "image", base64Data: part.data, mediaType: part.mimeType });
+        else throw new MuseError("unsupported", `Muse does not support ${part.type} attachments`);
+      }
+    const params: TurnStartParams = {
+      commandId: id,
+      sessionId: this.live().nativeId,
+      input,
+      displayText: text.join("\n"),
+      ifBusy: prompt.delivery === "steer" ? "steer" : "queue",
+      reasoningEffort: this.config.thinkingOption
+        ? effortSchema.parse(this.config.thinkingOption)
+        : undefined,
+    };
+    const response = await this.host.command("turn/start", params, promptResultSchema);
+    this.firstTurn = false;
+    if (response.disposition === "started" && this.turns.get(response.turnId) !== "completed")
+      this.turns.set(response.turnId, "active");
+    this.live().recovery.activity(undefined, this.activeTurnIds().length > 0);
+    const type = response.disposition === "steered" ? "steer" : "turn";
+    this.options.emit({
+      type: "session.prompt_result",
+      sessionId: this.options.id,
+      clientMessageId: prompt.clientMessageId,
+      result: { type, turnId: response.turnId },
+    });
+  }
+  async configure(changes: ProviderConfigChanges): Promise<void> {
+    if (changes.model !== undefined) {
+      if (!changes.model) throw new MuseError("invalidModel", "Choose a Muse model");
+      await this.host.command(
+        "session/setModel",
+        {
+          sessionId: this.live().nativeId,
+          model: { providerId: this.providerId, modelId: changes.model },
+        },
+        ackSchema,
+      );
+      this.config = { ...this.config, model: changes.model };
+    }
+    // Muse receives configured thinking effort on each turn/start, rather than a session mutation.
+    if (changes.thinkingOption !== undefined) {
+      const thinkingOption =
+        changes.thinkingOption === null ? undefined : effortSchema.parse(changes.thinkingOption);
+      this.config = { ...this.config, thinkingOption };
+    }
+    if (changes.mode !== undefined) {
+      const mode = approvalModeSchema.parse(changes.mode ?? "onRequest");
+      await this.host.command(
+        "session/setApprovalMode",
+        { sessionId: this.live().nativeId, mode },
+        ackSchema,
+      );
+      this.config = { ...this.config, mode };
+    }
+    this.publishConfig();
+    this.publishPersistence();
+  }
+  async answer(permissionId: string, response: ProviderPermissionResponse): Promise<void> {
+    if (await this.live().questions.answer(permissionId, response)) return;
+    const approval = this.approvals.get(permissionId);
+    if (!approval)
+      throw new MuseError("approvalNotFound", "This Muse approval is no longer pending");
+    const choice = response.selectedActionId
+      ? approval.availableChoices.find(
+          (candidate) => candidate.choiceId === response.selectedActionId,
+        )
+      : (approval.availableChoices.find((candidate) =>
+          response.behavior === "allow"
+            ? candidate.decision === "approved" && candidate.scope === "once"
+            : candidate.decision === "denied" && candidate.scope === "once",
+        ) ??
+        (response.behavior === "deny"
+          ? approval.availableChoices.find(
+              (candidate) => candidate.decision === "abort" && candidate.scope === "once",
+            )
+          : undefined));
+    if (!choice)
+      throw new MuseError(
+        "invalidApprovalChoice",
+        "Choose one of Muse's available approval actions",
+      );
+    await this.decide(approval, choice.choiceId);
+  }
+  private async decide(approval: WireApproval, choiceId: string): Promise<void> {
+    await this.host.command(
+      "approval/decide",
+      {
+        sessionId: this.live().nativeId,
+        approvalId: approval.approvalId,
+        choiceId,
+        requirementId: approval.currentRequirementId,
+      },
+      ackSchema,
+    );
+  }
+  async readUsage() {
+    return this.host.request("usage/read", {}, usageSchema);
+  }
+  async interrupt(): Promise<void> {
+    const turnId = this.activeTurnIds().at(-1);
+    if (!turnId) return;
+    let timer: ReturnType<typeof setTimeout>;
+    const completion = new Promise<void>((resolve, reject) => {
+      this.interruptCompletion = { turnId, resolve, reject };
+      timer = setTimeout(() => {
+        this.runtimeFailed(
+          new MuseError(
+            "interruptTimeout",
+            "Muse did not confirm cancellation within 10000ms. Reopen the session before sending another prompt.",
+          ),
+        );
+        void this.host.close();
+      }, 10000);
+    });
+    try {
+      await Promise.all([
+        this.host.command("turn/interrupt", { sessionId: this.live().nativeId, turnId }, ackSchema),
+        completion,
+      ]);
+    } finally {
+      clearTimeout(timer!);
+      this.interruptCompletion = null;
+    }
+  }
+  async close(): Promise<void> {
+    this.closing = true;
+    if (this.liveState) this.live().recovery.close();
+    await this.host.close();
+    await this.notifications;
+    if (this.liveState) this.live().children.close();
+  }
+  private enqueue(notification: Notification): void {
+    this.notifications = this.notifications
+      .then(() => this.notify(notification))
+      .catch((error: unknown) => this.runtimeFailed(error));
+  }
+  private runtimeFailed(error: unknown): void {
+    this.live().recovery.close();
+    this.options.emit({
+      type: "session.runtime_failed",
+      sessionId: this.options.id,
+      error: actionableError(error, this.options.launch),
+    });
+    const interrupt = this.interruptCompletion;
+    if (interrupt) interrupt.reject(error instanceof Error ? error : new Error(String(error)));
+  }
+  private async notify(notification: Notification): Promise<void> {
+    const envelope = notificationSchema.parse(notification.params);
+    if (envelope.sessionId && envelope.sessionId !== this.live().nativeId) {
+      await this.live().children.notify(envelope.sessionId, notification);
+      return;
+    }
+    await this.processNotification(notification);
+    this.live().recovery.activity(envelope.viewCursor, this.activeTurnIds().length > 0);
+  }
+  private async processNotification(notification: Notification): Promise<void> {
+    switch (notification.method) {
+      case "view/gap":
+        // The gap lower bound remains authoritative even if a later live event arrived first.
+        await this.live().recovery.backfill(gapSchema.parse(notification.params).after);
+        break;
+      case "userInput/requested":
+        this.live().questions.requested(notification.params);
+        break;
+      case "userInput/settled":
+        this.live().questions.resolved(notification.params);
+        break;
+      case "session/todoListChanged":
+        this.options.emit({
+          type: "timeline.item",
+          sessionId: this.options.id,
+          item: todoItem(notification.params),
+        });
+        break;
+      case "skill/changed":
+        await this.live().commands.refresh();
+        break;
+      case "item/started":
+      case "item/updated":
+      case "item/completed": {
+        const params = itemNotificationSchema.parse(notification.params);
+        await this.fold(params.item);
+        break;
+      }
+      case "item/delta":
+        this.live().timeline.delta(deltaSchema.parse(notification.params));
+        break;
+      case "approval/requested":
+      case "approval/updated":
+        await this.permission(approvalSchema.parse(notification.params));
+        break;
+      case "approval/resolved": {
+        const params = approvalResolvedSchema.parse(notification.params);
+        this.approvals.delete(params.approvalId);
+        this.options.emit({
+          type: "session.permission_resolved",
+          sessionId: this.options.id,
+          permissionId: params.approvalId,
+        });
+        break;
+      }
+      case "turn/started":
+        this.startTurn(notification.params);
+        break;
+      case "turn/completed":
+        this.completeTurn(notification.params);
+        break;
+      case "session/tokenUsage": {
+        const params = tokenUsageSchema.parse(notification.params);
+        this.options.emit({
+          type: "session.usage",
+          sessionId: this.options.id,
+          usage: {
+            inputTokens: params.cumulative.promptTokens,
+            outputTokens: params.cumulative.outputTokens,
+            cachedInputTokens: params.usage?.cachedTokens,
+          },
+        });
+        break;
+      }
+      case "session/contextUsage": {
+        const params = contextUsageSchema.parse(notification.params);
+        this.options.emit({
+          type: "session.usage",
+          sessionId: this.options.id,
+          usage: {
+            contextWindowUsedTokens: params.usedTokens,
+            contextWindowMaxTokens: params.windowTokens,
+          },
+        });
+        break;
+      }
+    }
+  }
+  private startTurn(input: unknown): void {
+    const params = turnSchema.parse(input);
+    if (
+      params.commandId &&
+      this.messages.has(params.commandId) &&
+      this.turns.get(params.turnId) !== "completed"
+    ) {
+      this.turns.set(params.turnId, "active");
+      this.options.emit({
+        type: "session.turn",
+        sessionId: this.options.id,
+        turnId: params.turnId,
+        state: "started",
+      });
+    }
+  }
+  private activeTurnIds(): string[] {
+    return [...this.turns].filter(([, state]) => state === "active").map(([id]) => id);
+  }
+  private completeTurn(input: unknown): void {
+    const params = turnSchema.parse(input);
+    if (this.turns.get(params.turnId) !== "active") return;
+    this.turns.set(params.turnId, "completed");
+    let state: "completed" | "canceled" | "failed" = "completed";
+    let error;
+    if (params.terminal === "cancelled") state = "canceled";
+    else if (params.error || params.terminal === "failed") {
+      state = "failed";
+      error = params.error
+        ? actionableError(
+            new MuseError(params.error.kind, params.error.message),
+            this.options.launch,
+          )
+        : { message: "Muse turn failed" };
+    }
+    this.options.emit({
+      type: "session.turn",
+      sessionId: this.options.id,
+      turnId: params.turnId,
+      state,
+      error,
+    });
+    if (this.interruptCompletion?.turnId === params.turnId) this.interruptCompletion.resolve();
+  }
+
+  private async fold(item: WireItem): Promise<void> {
+    if (await this.live().timeline.fold(item)) await this.live().children.update(item);
+  }
+  private async permission(approval: WireApproval): Promise<void> {
+    const current = approval.subject.stages.find(
+      (stage) => stage.requirementId.sourceIndex === approval.currentRequirementId?.sourceIndex,
+    );
+    if (current && current.resolution.kind !== "unresolved") return;
+    this.approvals.set(approval.approvalId, approval);
+    if (this.config.mode === "allowAll") {
+      const choice = approval.availableChoices.find(
+        (candidate) => candidate.decision === "approved" && candidate.scope === "once",
+      );
+      if (!choice)
+        throw new MuseError("noAllowOnceChoice", "Muse escalation has no allow-once action");
+      await this.decide(approval, choice.choiceId);
+      return;
+    }
+    let title = approval.toolName;
+    if (current) title = `Stage ${current.position} of ${current.totalStages}`;
+    let detail: ProviderToolCallDetail;
+    const subject = approval.subject;
+    if (subject.kind === "shell")
+      detail = {
+        type: "shell",
+        command: current ? current.argv.join(" ") : subject.command,
+        cwd: subject.workspaceRoot,
+      };
+    else if (subject.kind === "fileAccess") detail = { type: "edit", filePath: subject.path };
+    else
+      detail = {
+        type: "plain_text",
+        label: subject.kind,
+        text: subject.host || subject.path || subject.command,
+      };
+    const actions = approval.availableChoices.map((choice) => {
+      const behavior = choice.decision.startsWith("approved") ? "allow" : "deny";
+      return { id: choice.choiceId, label: choice.label, behavior } as const;
+    });
+    this.options.emit({
+      type: "session.permission",
+      sessionId: this.options.id,
+      request: {
+        id: approval.approvalId,
+        name: approval.toolName,
+        kind: "tool",
+        title,
+        detail,
+        actions,
+      },
+    });
+  }
+  private persistence(): ProviderPersistence {
+    return {
+      version: 1,
+      data: {
+        sessionId: this.live().nativeId,
+        ...(this.config.model ? { model: this.config.model } : {}),
+        ...(this.config.thinkingOption ? { thinkingOption: this.config.thinkingOption } : {}),
+      },
+    };
+  }
+  private publishPersistence(): void {
+    this.options.emit({
+      type: "session.persistence",
+      sessionId: this.options.id,
+      persistence: this.persistence(),
+    });
+  }
+  private publishConfig(): void {
+    this.options.emit({
+      type: "session.config",
+      sessionId: this.options.id,
+      config: {
+        model: this.config.model,
+        mode: this.config.mode,
+        thinkingOption: this.config.thinkingOption,
+        models: this.catalog.models,
+        modes,
+        thinkingOptions:
+          this.catalog.models.find((model) => model.id === this.config.model)?.thinkingOptions ??
+          efforts.map((id) => ({ id, label: id })),
+        settings: [],
+      },
+    });
+  }
+}
+function mcpServer(server: ProviderMcpServerConfig): SessionMcpServerConfig {
+  if (server.type === "stdio")
+    return {
+      transport: "stdio",
+      command: server.command,
+      args: server.args,
+      env: server.env,
+      framing: "lineDelimitedJson",
+    };
+  return { transport: "streamableHttp", url: server.url, headers: server.headers };
+}
diff --git a/plugins/muse-provider/server/sessions.ts b/plugins/muse-provider/server/sessions.ts
new file mode 100644
index 0000000000..a10879e248
--- /dev/null
+++ b/plugins/muse-provider/server/sessions.ts
@@ -0,0 +1,60 @@
+import type { z } from "zod";
+import type {
+  ProviderInput,
+  ProviderLaunch,
+  ProviderSessionSummary,
+} from "@getpaseo/plugin/server/provider";
+import { MspConnection } from "./connection.js";
+import { sessionListSchema } from "./wire.js";
+
+export class Sessions {
+  private readonly hosts = new Set<MspConnection>();
+  async list(
+    launch: ProviderLaunch,
+    input: Extract<ProviderInput, { type: "sessions" }>,
+  ): Promise<ProviderSessionSummary[]> {
+    const host = new MspConnection({ launch });
+    this.hosts.add(host);
+    try {
+      await host.initialize();
+      const summaries: ProviderSessionSummary[] = [];
+      let cursor: string | null = null;
+      do {
+        const page: z.infer<typeof sessionListSchema> = await host.request(
+          "session/list",
+          { workspaceRoot: input.cwd, limit: Math.min(input.limit ?? 50, 200), cursor },
+          sessionListSchema,
+        );
+        for (const session of page.sessions) {
+          if (session.workspaceRoot === null) continue;
+          if (
+            input.query &&
+            !(session.title ?? "").toLowerCase().includes(input.query.toLowerCase())
+          )
+            continue;
+          summaries.push({
+            cwd: session.workspaceRoot,
+            title: session.title,
+            updatedAt: session.updatedAt,
+            persistence: {
+              version: 1,
+              data: {
+                sessionId: session.sessionId,
+                ...(session.modelId === null ? {} : { model: session.modelId }),
+              },
+            },
+          });
+          if (input.limit && summaries.length >= input.limit) return summaries;
+        }
+        cursor = page.nextCursor;
+      } while (cursor !== null);
+      return summaries;
+    } finally {
+      await host.close();
+      this.hosts.delete(host);
+    }
+  }
+  async close(): Promise<void> {
+    await Promise.all([...this.hosts].map((host) => host.close()));
+  }
+}
diff --git a/plugins/muse-provider/server/timeline.ts b/plugins/muse-provider/server/timeline.ts
new file mode 100644
index 0000000000..df786df125
--- /dev/null
+++ b/plugins/muse-provider/server/timeline.ts
@@ -0,0 +1,234 @@
+import { MspConnection } from "./connection.js";
+import { MuseError } from "./errors.js";
+import { todoSchema, outputSchema } from "./wire.js";
+import type { ProviderEvent } from "@getpaseo/plugin/server/provider";
+import type { z } from "zod";
+import type {
+  ProviderTimelineItem,
+  ProviderToolCallDetail,
+} from "@getpaseo/plugin/server/provider";
+import { patchSchema, toolArgsSchema, deltaSchema, type WireItem } from "./wire.js";
+
+export function unifiedDiff(content: string): string {
+  const patch = patchSchema.parse(JSON.parse(content));
+  return patch.files
+    .map((file) => {
+      const hunks = file.hunks.map(
+        (hunk) =>
+          `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@\n${hunk.lines.join("\n")}\n`,
+      );
+      return `--- a/${file.path}\n+++ b/${file.path}\n${hunks.join("")}`;
+    })
+    .join("");
+}
+
+function toolDetail(item: WireItem, patch?: string): ProviderToolCallDetail {
+  const parsed = toolArgsSchema.safeParse(parseArguments(item.args));
+  if (!parsed.success) return { type: "unknown", input: item.args, output: item.visibleOutput };
+  const args = parsed.data;
+  switch (item.tool) {
+    case "workflow":
+    case "subagent_spawn":
+    case "subagent_wait":
+    case "subagent_read_result":
+      return subAgentDetail(item, args);
+    case "shell":
+    case "bash":
+      return {
+        type: "shell",
+        command: item.commandText ?? args.command,
+        output: item.visibleOutput,
+        exitCode: item.exitCode,
+      };
+    case "read_file":
+      return { type: "read", filePath: args.path, content: item.visibleOutput };
+    case "edit_file":
+      return {
+        type: "edit",
+        filePath: args.path,
+        oldString: args.find,
+        newString: args.replace,
+        unifiedDiff: patch,
+      };
+    case "write_file":
+      return { type: "write", filePath: args.path, content: args.content };
+    case "grep":
+    case "glob":
+    case "ls":
+    case "web_search":
+      return {
+        type: "search",
+        query: args.query || args.pattern || args.path,
+        content: item.visibleOutput,
+      };
+    case "web_fetch":
+      return { type: "fetch", url: args.url, result: item.visibleOutput };
+    default:
+      return { type: "unknown", input: item.args, output: item.visibleOutput };
+  }
+}
+function subAgentDetail(
+  item: WireItem,
+  args: z.infer<typeof toolArgsSchema>,
+): ProviderToolCallDetail {
+  return {
+    type: "sub_agent",
+    description: item.objective ?? item.entryId ?? args.objective,
+    subAgentType: item.role ?? args.role,
+    childSessionId: item.childSessionId,
+    log: item.message || item.visibleOutput || item.fallbackText,
+  };
+}
+
+function parseArguments(args: string): unknown {
+  try {
+    return JSON.parse(args);
+  } catch {
+    return args;
+  }
+}
+
+export function timelineItem(
+  item: WireItem,
+  clientMessageId?: string,
+  patch?: string,
+): ProviderTimelineItem {
+  const id = item.itemId;
+  switch (item.kind) {
+    case "userMessage":
+      return { type: "user_message", id, text: item.displayText ?? item.text, clientMessageId };
+    case "agentMessage":
+      return { type: "assistant_message", id, text: item.text };
+    case "reasoning":
+      return { type: "reasoning", id, text: item.summary.join("\n") };
+    case "compaction":
+      return {
+        type: "compaction",
+        id,
+        status: item.status === "inProgress" ? "loading" : "completed",
+        preTokens: item.tokensBefore,
+      };
+    case "workflow":
+    case "subagent":
+    case "toolCall": {
+      return toolCallItem(item, patch);
+    }
+    default:
+      return {
+        type: "tool_call",
+        id,
+        callId: id,
+        name: item.kind,
+        status: "completed",
+        error: null,
+        detail: { type: "plain_text", label: item.kind, text: item.fallbackText },
+      };
+  }
+}
+
+function toolCallItem(item: WireItem, patch?: string): ProviderTimelineItem {
+  const id = item.itemId;
+  const base = {
+    type: "tool_call",
+    id,
+    callId: item.callId ?? id,
+    name: item.kind === "toolCall" ? item.tool : item.kind,
+    detail:
+      item.kind === "subagent" || item.kind === "workflow"
+        ? {
+            type: "sub_agent" as const,
+            subAgentType: item.role,
+            description: item.objective ?? item.entryId,
+            childSessionId: item.childSessionId,
+            log: item.message || item.visibleOutput || item.fallbackText,
+          }
+        : toolDetail(item, patch),
+  } as const;
+  if (item.status === "inProgress") return { ...base, status: "running", error: null };
+  if (item.status === "cancelled") return { ...base, status: "canceled", error: null };
+  if (item.status !== "completed")
+    return { ...base, status: "failed", error: item.failureReason ?? item.status };
+  return { ...base, status: "completed", error: null };
+}
+
+export function appendDelta(
+  previous: WireItem,
+  delta: z.infer<typeof deltaSchema>,
+): WireItem | null {
+  if (delta.field === "text") return { ...previous, text: previous.text + delta.delta };
+  if (delta.field === "output")
+    return { ...previous, visibleOutput: previous.visibleOutput + delta.delta };
+  const match = /^summary\.(\d+)$/.exec(delta.field);
+  if (!match) return null;
+  const index = Number(match[1]);
+  const summary = [...previous.summary];
+  summary[index] = (summary[index] ?? "") + delta.delta;
+  return { ...previous, summary };
+}
+
+export class Timeline {
+  private readonly items = new Map<string, WireItem>();
+  constructor(
+    private readonly host: MspConnection,
+    private readonly nativeId: string,
+    private readonly id: string,
+    private readonly emit: (event: ProviderEvent) => void,
+    private readonly clientMessage: (commandId: string) => string | undefined = () => undefined,
+  ) {}
+  async fold(item: WireItem): Promise<boolean> {
+    // Reminder children are Muse housekeeping, not agent work or navigable subagents.
+    if (item.kind === "reminderChild") return false;
+    const previous = this.items.get(item.itemId);
+    if (previous && previous.revision >= item.revision) return false;
+    let patch;
+    if (item.patchRef && item.status === "completed") {
+      const output = await this.host.request(
+        "item/readOutput",
+        { sessionId: this.nativeId, itemId: item.itemId, outputRef: item.patchRef.id },
+        outputSchema,
+      );
+      if (output.encoding !== "utf8" || !output.eof)
+        throw new MuseError("invalidPatch", "Muse edit patch is not a complete UTF-8 document");
+      patch = unifiedDiff(output.content);
+    }
+    this.items.set(item.itemId, item);
+    this.emit({
+      type: "timeline.item",
+      sessionId: this.id,
+      item: timelineItem(
+        item,
+        item.commandId ? this.clientMessage(item.commandId) : undefined,
+        patch,
+      ),
+      timestamp: item.recordedAt,
+    });
+    return true;
+  }
+  delta(delta: z.infer<typeof deltaSchema>): void {
+    const previous = this.items.get(delta.itemId);
+    if (!previous || previous.status !== "inProgress") return;
+    const item = appendDelta(previous, delta);
+    if (!item) return;
+    this.items.set(item.itemId, item);
+    this.emit({ type: "timeline.item", sessionId: this.id, item: timelineItem(item) });
+  }
+}
+
+export function todoItem(input: unknown): ProviderTimelineItem {
+  const todo = todoSchema.parse(input);
+  return {
+    type: "todo",
+    id: `todo:${todo.viewCursor}`,
+    items: todo.items.map((item) => {
+      let status: "pending" | "in_progress" | "completed" = "pending";
+      if (item.status === "inProgress") status = "in_progress";
+      else if (item.status === "completed") status = "completed";
+      return {
+        text: item.text,
+        completed: item.status === "completed",
+        status,
+        activeForm: item.activeForm,
+      };
+    }),
+  };
+}
diff --git a/plugins/muse-provider/server/usage.ts b/plugins/muse-provider/server/usage.ts
new file mode 100644
index 0000000000..e3915c6ddd
--- /dev/null
+++ b/plugins/muse-provider/server/usage.ts
@@ -0,0 +1,128 @@
+import { homedir } from "node:os";
+import path from "node:path";
+import { z } from "zod";
+import type { UsageSourceRegistration } from "@getpaseo/plugin/server";
+import type { ProviderLaunch } from "@getpaseo/plugin/server/provider";
+import {
+  hashAccountKey,
+  unavailable,
+  windowFromUsedPct,
+  windowFromReportedDuration,
+  toneFromUsedPct,
+} from "@getpaseo/plugin/server/usage";
+
+import { MspConnection } from "./connection.js";
+import { usageSchema } from "./wire.js";
+
+const inputSchema = z.object({ account: z.string() }).strict();
+type Observation = z.infer<typeof usageSchema>;
+
+function accountKey(env: ProviderLaunch["env"]): string {
+  // MSP 1.4.1 has no stable account ID; swapping accounts in one config directory shares a report ID.
+  const configHome = env.XDG_CONFIG_HOME ?? path.join(env.HOME ?? homedir(), ".config");
+  return hashAccountKey(path.resolve(configHome, "muse"));
+}
+
+export class Usage {
+  private readonly launches = new Map<string, ProviderLaunch>();
+  private readonly sessions = new Map<
+    string,
+    { account: string; read: () => Promise<Observation> }
+  >();
+  remember(launch: ProviderLaunch): { account: string } {
+    const key = accountKey(launch.env);
+    this.launches.set(key, launch);
+    return { account: key };
+  }
+  attach(id: string, launch: ProviderLaunch, read: () => Promise<Observation>): void {
+    this.sessions.set(id, { ...this.remember(launch), read });
+  }
+  detach(id: string): void {
+    this.sessions.delete(id);
+  }
+  private async read(account: string, launch: ProviderLaunch): Promise<Observation> {
+    const readers = [...this.sessions.values()].filter((session) => session.account === account);
+    if (readers.length > 0) {
+      const observations = await Promise.all(readers.map((session) => session.read()));
+      const usages = observations.flatMap((observation) =>
+        observation.usage ? [observation.usage] : [],
+      );
+      usages.sort((a, b) => b.observedAtMs - a.observedAtMs);
+      return usages.length > 0 ? { usage: usages[0] } : {};
+    }
+    const host = new MspConnection({ launch });
+    try {
+      await host.initialize();
+      return await host.request("usage/read", {}, usageSchema);
+    } finally {
+      await host.close();
+    }
+  }
+  registration(): UsageSourceRegistration {
+    return {
+      id: "muse",
+      label: "Muse Code",
+      icon: "icon.svg",
+      input: inputSchema,
+      discover: async (scope) => {
+        let accounts: string[];
+        if (scope.kind === "global") {
+          accounts = [...this.launches.keys()];
+        } else {
+          if (scope.provider !== "muse") return [];
+          const account = accountKey(scope.env);
+          accounts = this.launches.has(account) ? [account] : [];
+        }
+        return accounts.map((account) => ({
+          key: account,
+          label: "Muse Code",
+          input: { account },
+        }));
+      },
+      fetch: async (input) => {
+        const { account } = inputSchema.parse(input);
+        const launch = this.launches.get(account);
+        if (!launch) throw new Error("Muse login no longer exists");
+        try {
+          const { usage } = await this.read(account, launch);
+          if (!usage) return unavailable({ kind: "no_quota", detail: "No usage quota reported" });
+          return {
+            status: "available",
+            planLabel: usage.tier,
+            windows: [
+              windowFromReportedDuration({
+                durationSeconds: usage.window.windowDurationMins * 60,
+                unknown: { id: "window", label: "Current window", shortLabel: "" },
+                summary: true,
+                utilizationPct: usage.window.usedPercent,
+                resetsAt: new Date(usage.window.resetsAtMs).toISOString(),
+                tone: toneFromUsedPct(usage.window.usedPercent),
+              }),
+              windowFromUsedPct({
+                id: "weekly",
+                label: "Weekly",
+                shortLabel: "wk",
+                summary: true,
+                utilizationPct: usage.weekly.usedPercent,
+                resetsAt: new Date(usage.weekly.resetsAtMs).toISOString(),
+                tone: toneFromUsedPct(usage.weekly.usedPercent),
+              }),
+            ],
+            details: [
+              {
+                id: "observed",
+                label: "Observed",
+                value: new Date(usage.observedAtMs).toISOString(),
+              },
+            ],
+          };
+        } catch (error) {
+          return {
+            status: "error",
+            error: error instanceof Error ? error.message : String(error),
+          };
+        }
+      },
+    };
+  }
+}
diff --git a/plugins/muse-provider/server/wire.ts b/plugins/muse-provider/server/wire.ts
new file mode 100644
index 0000000000..45aac6fe4f
--- /dev/null
+++ b/plugins/muse-provider/server/wire.ts
@@ -0,0 +1,285 @@
+import { z } from "zod";
+
+export const fingerprint =
+  "sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f";
+export const effortSchema = z.enum([
+  "none",
+  "minimal",
+  "low",
+  "medium",
+  "high",
+  "xhigh",
+  "max",
+  "ultra",
+]);
+export const approvalModeSchema = z.enum([
+  "onRequest",
+  "promptUnmatched",
+  "denyUnmatched",
+  "allowAll",
+]);
+export const itemSchema = z.object({
+  itemId: z.string(),
+  revision: z.number().int(),
+  childSessionId: z.string().optional(),
+  role: z.string().optional(),
+  objective: z.string().optional(),
+  message: z.string().default(""),
+  entryId: z.string().optional(),
+  kind: z.string(),
+  status: z.string(),
+  turnId: z.string().nullable().optional(),
+  commandId: z.string().optional(),
+  recordedAt: z.string().optional(),
+  text: z.string().default(""),
+  displayText: z.string().optional(),
+  summary: z.array(z.string()).default([]),
+  tool: z.string().default(""),
+  args: z.string().default("{}"),
+  callId: z.string().optional(),
+  commandText: z.string().optional(),
+  visibleOutput: z.string().default(""),
+  exitCode: z.number().optional(),
+  fallbackText: z.string().default(""),
+  failureReason: z.string().optional(),
+  patchRef: z.object({ id: z.string() }).optional(),
+  tokensBefore: z.number().optional(),
+});
+export type WireItem = z.infer<typeof itemSchema>;
+export const requirementSchema = z.object({
+  approvalId: z.string(),
+  sourceIndex: z.number().optional(),
+});
+export const choiceSchema = z.object({
+  choiceId: z.string(),
+  decision: z.string(),
+  label: z.string(),
+  scope: z.string(),
+});
+export const approvalSchema = z.object({
+  approvalId: z.string(),
+  currentRequirementId: requirementSchema.optional(),
+  availableChoices: z.array(choiceSchema),
+  toolName: z.string().default("Tool"),
+  subject: z.object({
+    kind: z.string(),
+    command: z.string().default(""),
+    path: z.string().default(""),
+    host: z.string().default(""),
+    workspaceRoot: z.string().optional(),
+    stages: z
+      .array(
+        z.object({
+          position: z.number(),
+          totalStages: z.number(),
+          argv: z.array(z.string()),
+          requirementId: requirementSchema,
+          resolution: z.object({ kind: z.string() }),
+        }),
+      )
+      .default([]),
+  }),
+});
+export type WireApproval = z.infer<typeof approvalSchema>;
+export const notificationSchema = z.object({
+  sessionId: z.string().optional(),
+  viewCursor: z.string().optional(),
+});
+export const frameSchema = z.object({
+  jsonrpc: z.literal("2.0"),
+  id: z.union([z.string(), z.number()]).nullable().optional(),
+  method: z.string().optional(),
+  params: z.unknown().optional(),
+  result: z.unknown().optional(),
+  error: z
+    .object({
+      code: z.number(),
+      message: z.string(),
+      data: z
+        .object({ kind: z.string().optional(), reason: z.string().optional() })
+        .passthrough()
+        .optional(),
+    })
+    .optional(),
+});
+export const initializedSchema = z.object({ schema: z.object({ fingerprint: z.string() }) });
+export const accountSchema = z.object({
+  state: z.string(),
+});
+export const catalogSchema = z.object({
+  models: z.array(
+    z.object({
+      modelId: z.string(),
+      providerId: z.string(),
+      displayLabel: z.string(),
+      contextLimit: z.number().nullable(),
+      isDefault: z.boolean(),
+      defaultReasoningEffort: effortSchema.nullable().optional(),
+      // Validate consumed fields only. Muse's described subset (reasoningEffortVariants)
+      // is presentation metadata; its shape must not gate catalog discovery or session startup.
+      variants: z
+        .union([z.array(effortSchema), z.literal("unknown")])
+        .transform((variants) => (variants === "unknown" ? [] : variants))
+        .default([]),
+    }),
+  ),
+});
+export const sessionSchema = z.object({
+  session: z.object({
+    sessionId: z.string(),
+    modelId: z.string().nullable(),
+    providerId: z.string().nullable(),
+    approvalMode: z.object({ mode: approvalModeSchema }).optional(),
+  }),
+  viewCursor: z.string(),
+  history: z
+    .object({ mode: z.string(), items: z.array(itemSchema).nullable().default([]) })
+    .optional(),
+  pendingRequests: z
+    .array(
+      z.object({ kind: z.string(), approvalId: z.string().optional(), viewCursor: z.string() }),
+    )
+    .default([]),
+});
+export const persistenceSchema = z.object({
+  sessionId: z.string(),
+  model: z.string().optional(),
+  thinkingOption: effortSchema.optional(),
+});
+export const deltaSchema = z.object({
+  itemId: z.string(),
+  field: z.string().default("text"),
+  delta: z.string(),
+});
+export const turnSchema = z.object({
+  turnId: z.string(),
+  commandId: z.string().optional(),
+  terminal: z.string().optional(),
+  error: z.object({ kind: z.string(), message: z.string() }).optional(),
+});
+export const promptResultSchema = z.object({ turnId: z.string(), disposition: z.string() });
+export const outputSchema = z.object({
+  content: z.string(),
+  encoding: z.enum(["utf8", "base64"]),
+  eof: z.boolean(),
+});
+export const patchSchema = z.object({
+  files: z.array(
+    z.object({
+      path: z.string(),
+      hunks: z.array(
+        z.object({
+          oldStart: z.number(),
+          oldLines: z.number(),
+          newStart: z.number(),
+          newLines: z.number(),
+          lines: z.array(z.string()),
+        }),
+      ),
+    }),
+  ),
+});
+export const toolArgsSchema = z.object({
+  objective: z.string().optional(),
+  role: z.string().optional(),
+  command: z.string().default(""),
+  path: z.string().default(""),
+  find: z.string().optional(),
+  replace: z.string().optional(),
+  content: z.string().optional(),
+  query: z.string().default(""),
+  pattern: z.string().default(""),
+  url: z.string().default(""),
+});
+export const tokenUsageSchema = z.object({
+  cumulative: z.object({ promptTokens: z.number(), outputTokens: z.number() }),
+  usage: z.object({ cachedTokens: z.number().optional() }).optional(),
+});
+export const contextUsageSchema = z.object({
+  usedTokens: z.number(),
+  windowTokens: z.number().optional(),
+});
+
+export const ackSchema = z.object({}).passthrough();
+export const skillsSchema = z.object({
+  skills: z.array(
+    z.object({
+      selector: z.string(),
+      description: z.string(),
+      argumentHint: z.string().optional(),
+    }),
+  ),
+});
+export const questionSchema = z.object({
+  userInputId: z.string(),
+  toolName: z.string(),
+  questions: z.array(
+    z.object({
+      id: z.string(),
+      header: z.string(),
+      question: z.string(),
+      options: z.array(z.object({ label: z.string(), description: z.string().default("") })),
+      selection: z.object({
+        mode: z.enum(["single", "multiple"]),
+        minSelections: z.number().optional(),
+        maxSelections: z.number().optional(),
+      }),
+    }),
+  ),
+});
+export const settledQuestionSchema = z.object({ userInputId: z.string() });
+export const questionAnswersSchema = z.object({ answers: z.record(z.string(), z.string()) });
+export const todoSchema = z.object({
+  viewCursor: z.string(),
+  items: z.array(
+    z.object({ text: z.string(), status: z.string(), activeForm: z.string().optional() }),
+  ),
+});
+export const pageSchema = z.object({
+  events: z.array(z.object({ method: z.string(), params: z.record(z.string(), z.unknown()) })),
+  nextCursor: z.string().nullable(),
+});
+export const gapSchema = z.object({ after: z.string(), next: z.string() });
+export const sessionListSchema = z.object({
+  nextCursor: z.string().nullable(),
+  sessions: z.array(
+    z.object({
+      sessionId: z.string(),
+      workspaceRoot: z.string().nullable(),
+      title: z.string().optional(),
+      updatedAt: z.string(),
+      modelId: z.string().nullable(),
+    }),
+  ),
+});
+export const usageSchema = z.object({
+  usage: z
+    .object({
+      observedAtMs: z.number(),
+      tier: z.string(),
+      window: z.object({
+        resetsAtMs: z.number(),
+        usedPercent: z.number(),
+        windowDurationMins: z.number(),
+      }),
+      weekly: z.object({ resetsAtMs: z.number(), usedPercent: z.number() }),
+    })
+    .optional(),
+});
+export const childSessionSchema = z.object({
+  session: z.object({
+    sessionId: z.string(),
+    workspaceRoot: z.string().nullable(),
+    title: z.string().optional(),
+  }),
+  viewCursor: z.string(),
+});
+
+export const itemNotificationSchema = z.object({ item: itemSchema });
+
+export const pendingSchema = z.object({
+  approvals: z.array(approvalSchema),
+  userInputs: z.array(questionSchema).default([]),
+});
+
+export const approvalResolvedSchema = z.object({ approvalId: z.string() });
diff --git a/plugins/muse-provider/test/fake-muse.mjs b/plugins/muse-provider/test/fake-muse.mjs
new file mode 100644
index 0000000000..16cc821b79
--- /dev/null
+++ b/plugins/muse-provider/test/fake-muse.mjs
@@ -0,0 +1,467 @@
+import { appendFileSync, readFileSync } from "node:fs";
+import { createInterface } from "node:readline";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = path.join(path.dirname(fileURLToPath(import.meta.url)), "fixtures");
+const scenario = process.env.MUSE_TEST_SCENARIO || "text-reasoning";
+if (process.argv.includes("--version")) {
+  if (process.env.MUSE_TEST_VERSION_ERROR) {
+    process.stderr.write(process.env.MUSE_TEST_VERSION_ERROR + "\n");
+    process.exit(17);
+  }
+  process.stdout.write(`Muse Code ${process.env.MUSE_TEST_VERSION || "1.4.1"}\n`);
+  process.exit(0);
+}
+if (process.env.MUSE_TEST_STUBBORN) {
+  setInterval(() => {}, 1000);
+  appendFileSync(
+    process.env.MUSE_TEST_REQUESTS,
+    JSON.stringify({ event: "stubbornHost", pid: process.pid }) + "\n",
+  );
+}
+const rows = readFixture(scenario);
+if (process.env.MUSE_TEST_REQUESTS)
+  appendFileSync(
+    process.env.MUSE_TEST_REQUESTS,
+    JSON.stringify({ event: "hostStarted", args: process.argv.slice(2) }) + "\n",
+  );
+const catalogRows = readFixture("catalog-controls");
+const replacements = new Map();
+const counts = new Map();
+const receipts = new Set();
+const lines = createInterface({ input: process.stdin });
+lines.on("line", receive);
+function receive(line) {
+  const parsed = JSON.parse(line);
+  if (parsed.method === "initialize" && process.env.MUSE_TEST_INITIALIZE_DELAY_MS) {
+    setTimeout(() => receiveFrame(line), Number(process.env.MUSE_TEST_INITIALIZE_DELAY_MS));
+    return;
+  }
+  receiveFrame(line);
+}
+function receiveFrame(line) {
+  const frame = JSON.parse(line);
+  if (process.env.MUSE_TEST_REQUESTS)
+    appendFileSync(process.env.MUSE_TEST_REQUESTS, JSON.stringify(frame) + "\n");
+  if (frame.result) {
+    receipts.delete(frame.id);
+    return;
+  }
+  if (controlResponse(frame)) return;
+  if (queuedResponse(frame)) return;
+  const candidates = rows.filter((row) => row.dir === "out" && row.msg.method === frame.method);
+  const count = counts.get(frame.method) || 0;
+  counts.set(frame.method, count + 1);
+  if (retryResponse(frame, count)) return;
+  const request = candidates[count];
+  if (!request)
+    return rpcError(
+      frame,
+      -32601,
+      "unknownMethod",
+      `No fixture request for ${frame.method} #${count}`,
+    );
+  const recorded = request.msg;
+  validateCommand(frame, recorded);
+  const response = rows.find(
+    (row) => row.dir === "in" && row.msg.id === recorded.id && !row.msg.method,
+  );
+  if (!response) throw new Error(`Fixture response absent: ${frame.method}`);
+  const position = rows.indexOf(request);
+  let end = position + 1;
+  while (end < rows.length && !(rows[end].dir === "out" && rows[end].msg.method)) end++;
+  const messages = rows.slice(position + 1, end).filter((row) => row.dir === "in");
+  if (!messages.includes(response)) messages.unshift(response);
+  if (process.env.MUSE_TEST_ACK_LAST && frame.method === "turn/start") {
+    const terminalFirst = messages.filter((row) => row !== response);
+    for (const row of terminalFirst) emitFixtureMessage(row.msg, recorded, frame);
+    setTimeout(() => emitFixtureMessage(response.msg, recorded, frame), 50);
+  } else for (const row of messages) emitFixtureMessage(row.msg, recorded, frame);
+}
+function controlResponse(frame) {
+  if (frame.method === "session/resume" && process.env.MUSE_TEST_HISTORY) {
+    const result = responseFor(readFixture("resume-without-cursor"), "session/resume");
+    result.session.sessionId = frame.params.sessionId;
+    result.history = frame.params.cursor
+      ? { mode: "none", noneReason: "cursorSuffix", items: null, snapshot: null }
+      : {
+          mode: "inline",
+          items: readFileSync(process.env.MUSE_TEST_HISTORY, "utf8")
+            .trim()
+            .split("\n")
+            .map((line) => JSON.parse(line)),
+          snapshot: null,
+        };
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "initialized") return true;
+  if (frame.method === "initialize" && process.env.MUSE_TEST_EXIT) {
+    process.stderr.write("diagnostic tail, not protocol\n");
+    process.exit(Number(process.env.MUSE_TEST_EXIT));
+  }
+  if (frame.method === "initialize" && process.env.MUSE_TEST_NULL_ERROR_ID) {
+    send({
+      jsonrpc: "2.0",
+      id: null,
+      error: { code: -32700, message: "Cannot recover request id", data: { kind: "parseError" } },
+    });
+    return true;
+  }
+  if (process.env.MUSE_TEST_HANG === frame.method) return true;
+  if (frame.method === "session/setReasoningEffort") {
+    respond(frame, { status: "accepted", commandId: frame.params.commandId });
+    return true;
+  }
+  if (frame.method === "account/read") {
+    respond(frame, { credentialRequired: true, state: process.env.MUSE_TEST_ACCOUNT || "envKey" });
+    return true;
+  }
+  if (parityResponse(frame)) return true;
+  if (frame.method === "model/list") {
+    const result = responseFor(catalogRows, "model/list");
+    if (process.env.MUSE_TEST_MODELS) result.models = JSON.parse(process.env.MUSE_TEST_MODELS);
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "session/resume" && process.env.MUSE_TEST_GONE) {
+    rpcError(frame, -32020, "sessionNotFound", "missing");
+    return true;
+  }
+  return false;
+}
+function parityResponse(frame) {
+  if (workflowResponse(frame)) return true;
+  if (frame.method === "view/page") {
+    let result;
+    if (process.env.MUSE_TEST_GAP || process.env.MUSE_TEST_SILENT) {
+      result = {
+        events: replace(
+          rows
+            .filter(
+              (row) =>
+                row.dir === "in" &&
+                row.msg.method &&
+                row.msg.params?.viewCursor &&
+                !row.msg.id &&
+                row.msg.method !== "item/delta",
+            )
+            .map((row) => ({ method: row.msg.method, params: row.msg.params })),
+        ),
+        nextCursor: null,
+      };
+    } else {
+      result = replace(
+        responseFor(
+          readFixture(
+            frame.params.sessionId === "fixture-child" ? "phase3-child-read" : "phase3-controls",
+          ),
+          "view/page",
+        ),
+      );
+      for (const event of result.events) event.params.sessionId = frame.params.sessionId;
+    }
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "session/read") {
+    const result = responseFor(readFixture("phase3-child-read"), "session/read");
+    result.session.sessionId = frame.params.sessionId;
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "usage/read") {
+    const result = process.env.MUSE_TEST_USAGE
+      ? JSON.parse(process.env.MUSE_TEST_USAGE)
+      : responseFor(catalogRows, "usage/read");
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "session/list") {
+    const result = responseFor(catalogRows, "session/list");
+    result.nextCursor = null;
+    if (process.env.MUSE_TEST_NULL_MODEL) {
+      for (const session of result.sessions) session.modelId = null;
+    }
+    respond(frame, result);
+    return true;
+  }
+  if (frame.method === "userInput/cancel" && scenario !== "phase3-cancel") {
+    respond(frame, {
+      status: "accepted",
+      commandId: frame.params.commandId,
+      userInputId: frame.params.userInputId,
+    });
+    send({
+      jsonrpc: "2.0",
+      method: "userInput/settled",
+      params: {
+        sessionId: frame.params.sessionId,
+        userInputId: frame.params.userInputId,
+        outcome: "cancelled",
+      },
+    });
+    return true;
+  }
+  if (frame.method === "session/compact" && process.env.MUSE_TEST_COMPACT) {
+    respond(frame, { status: "accepted", commandId: frame.params.commandId });
+    for (const [revision, status] of [
+      [1, "inProgress"],
+      [2, "completed"],
+    ])
+      send({
+        jsonrpc: "2.0",
+        method: revision === 1 ? "item/started" : "item/completed",
+        params: {
+          sessionId: frame.params.sessionId,
+          item: { itemId: "fixture-compaction", revision, kind: "compaction", status },
+        },
+      });
+    return true;
+  }
+  if (skillResponse(frame)) return true;
+  return false;
+}
+function skillResponse(frame) {
+  if (frame.method === "skill/list") {
+    const skillRows =
+      scenario.startsWith("phase3-") && rows.some((row) => row.msg.method === "skill/list")
+        ? rows
+        : readFixture("skill");
+    const result = responseFor(skillRows, "skill/list");
+    if (process.env.MUSE_TEST_SKILLS_CHANGED && counts.has("skill-read")) result.skills = [];
+    counts.set("skill-read", 1);
+    respond(frame, result);
+    return true;
+  }
+  return false;
+}
+
+function workflowResponse(frame) {
+  if (frame.method === "view/page" && process.env.MUSE_TEST_WORKFLOW) {
+    const result = responseFor(readFixture("phase3-default-workflow"), "view/page");
+    result.events = result.events.filter(
+      (event) => event.params.item?.kind === "workflow" || event.params.item?.tool === "workflow",
+    );
+    for (const event of result.events) event.params.sessionId = frame.params.sessionId;
+    respond(frame, result);
+    return true;
+  }
+  return false;
+}
+
+function queuedResponse(frame) {
+  if (
+    process.env.MUSE_TEST_QUEUE &&
+    frame.method === "turn/start" &&
+    counts.get(frame.method) === 1
+  ) {
+    respond(frame, {
+      turnId: frame.params.commandId,
+      disposition: "queued",
+      startedNewTurn: false,
+    });
+    return true;
+  }
+  return false;
+}
+function retryResponse(frame, count) {
+  if (process.env.MUSE_TEST_RETRY === frame.method && count === 0) {
+    counts.set(frame.method, 0);
+    delete process.env.MUSE_TEST_RETRY;
+    replacements.set("retryCommandId", frame.params.commandId);
+    rpcError(frame, -32001, process.env.MUSE_TEST_RETRY_KIND || "overloaded", "busy");
+    return true;
+  }
+  if (
+    replacements.has("retryCommandId") &&
+    replacements.get("retryCommandId") !== frame.params.commandId
+  )
+    throw new Error("Retry changed commandId");
+  replacements.delete("retryCommandId");
+  return false;
+}
+function validateCommand(frame, recorded) {
+  if (recorded.params.commandId) {
+    if (
+      !/^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(
+        frame.params.commandId,
+      )
+    )
+      throw new Error("Not UUIDv7");
+    replacements.set(recorded.params.commandId, frame.params.commandId);
+  }
+  if (
+    frame.method === "approval/decide" &&
+    recorded.params.requirementId.sourceIndex !== frame.params.requirementId.sourceIndex
+  )
+    throw new Error("Wrong approval stage");
+}
+function emitFixtureMessage(recordedMessage, recorded, frame) {
+  const message = replace(recordedMessage);
+  if (!message.method && message.id === recorded.id) message.id = frame.id;
+  if (
+    message.method === "session/closed" ||
+    (message.method === "session/statusChanged" && message.params.status === "notLoaded")
+  )
+    return;
+  if (frame.method === "session/start" && message.result?.session?.approvalMode)
+    message.result.session.approvalMode.mode = frame.params.approvalMode;
+  applyWireVariants(message);
+  if (message.result?.viewCursor && process.env.MUSE_TEST_EMPTY_CURSOR)
+    message.result.viewCursor = "";
+  applyTestVariants(message);
+  if (parityDelivery(message)) return;
+  if (message.method && message.id !== undefined) receipts.add(message.id);
+  send(message);
+  if (
+    process.env.MUSE_TEST_STALE &&
+    message.method === "item/completed" &&
+    message.params.item.kind === "agentMessage"
+  ) {
+    send({
+      ...message,
+      params: {
+        ...message.params,
+        item: { ...message.params.item, revision: 1, text: "STALE_REVISION" },
+      },
+    });
+  }
+}
+function applyWireVariants(message) {
+  if (
+    message.method === "item/delta" &&
+    message.params?.field === "text" &&
+    process.env.MUSE_TEST_IMPLICIT_TEXT_DELTA
+  ) {
+    delete message.params.field;
+  }
+  if (message.result?.session && process.env.MUSE_TEST_NULL_MODEL) {
+    message.result.session.modelId = null;
+    message.result.session.providerId = null;
+  }
+}
+function parityDelivery(message) {
+  if (process.env.MUSE_TEST_WORKFLOW && message.method === "turn/completed")
+    send({
+      jsonrpc: "2.0",
+      method: "view/gap",
+      params: { sessionId: message.params.sessionId, after: "", next: message.params.viewCursor },
+    });
+  if (
+    process.env.MUSE_TEST_SILENT &&
+    ["item/started", "item/delta", "item/completed", "turn/completed"].includes(message.method) &&
+    message.params.item?.kind !== "userMessage"
+  )
+    return true;
+  if (
+    process.env.MUSE_TEST_GAP &&
+    message.method === "item/completed" &&
+    message.params.item.kind === "agentMessage"
+  ) {
+    send({
+      jsonrpc: "2.0",
+      method: "view/gap",
+      params: {
+        sessionId: message.params.sessionId,
+        after: "fixture-last-cursor",
+        next: message.params.viewCursor,
+      },
+    });
+    return true;
+  }
+  if (process.env.MUSE_TEST_SKILLS_CHANGED && message.method === "turn/completed")
+    send({
+      jsonrpc: "2.0",
+      method: "skill/changed",
+      params: { sessionId: message.params.sessionId },
+    });
+  return false;
+}
+function applyTestVariants(message) {
+  applyParityVariants(message);
+  if (message.method === "turn/completed" && process.env.MUSE_TEST_INTERRUPT_TERMINAL)
+    message.params.terminal = process.env.MUSE_TEST_INTERRUPT_TERMINAL;
+  if (message.params?.availableChoices && process.env.MUSE_TEST_CHOICES)
+    message.params.availableChoices = message.params.availableChoices.toReversed();
+  if (message.method === "turn/completed" && process.env.MUSE_TEST_AUTH_REQUIRED) {
+    message.params.terminal = "failed";
+    message.params.error = { kind: "authRequired", message: "authentication expired" };
+  }
+  if (message.result?.schema && process.env.MUSE_TEST_FINGERPRINT)
+    message.result.schema.fingerprint = process.env.MUSE_TEST_FINGERPRINT;
+  if (message.params?.item?.tool === "read_file" && process.env.MUSE_TEST_TOOL) {
+    message.params.item.tool = process.env.MUSE_TEST_TOOL;
+    message.params.item.args = JSON.stringify({
+      path: "f",
+      query: "needle",
+      url: "https://example.com",
+    });
+  }
+  if (message.params?.item?.tool === "read_file" && process.env.MUSE_TEST_UNKNOWN_KIND) {
+    message.params.item.kind = "futureItem";
+    message.params.item.fallbackText = "New MSP item";
+  }
+}
+function applyParityVariants(message) {
+  if (process.env.MUSE_TEST_CHILD && message.params?.item?.tool === "subagent_spawn") {
+    message.params.item.childSessionId = "fixture-child";
+    if (process.env.MUSE_TEST_CHILD === "workflow") message.params.item.kind = "workflow";
+    if (process.env.MUSE_TEST_CHILD === "dedicated") {
+      message.params.item.kind = "subagent";
+      message.params.item.role = "worker";
+      message.params.item.objective = "Child objective";
+    }
+  }
+  if (message.params?.availableChoices && process.env.MUSE_TEST_DENIED)
+    message.params.availableChoices.push({
+      choiceId: "reject_once",
+      decision: "denied",
+      scope: "once",
+      label: "Reject tool",
+    });
+}
+lines.on("close", () => {
+  if (process.env.MUSE_TEST_REQUESTS)
+    appendFileSync(process.env.MUSE_TEST_REQUESTS, JSON.stringify({ event: "hostClosed" }) + "\n");
+  if (receipts.size) throw new Error("Missing presentation receipt");
+});
+function readFixture(name) {
+  const transcript = readFileSync(path.join(root, name + ".ndjson"), "utf8")
+    .trim()
+    .split("\n")
+    .map((line) => JSON.parse(line));
+  // The duplicate-decision probe is a separate negative action, not part of the approval flow.
+  const duplicateIds = new Set(
+    transcript
+      .filter((row) => row.msg.error?.data?.kind === "approvalAlreadyResolved")
+      .map((row) => row.msg.id),
+  );
+  return transcript.filter((row) => !duplicateIds.has(row.msg.id));
+}
+function responseFor(transcript, method) {
+  const request = transcript.find((row) => row.dir === "out" && row.msg.method === method);
+  return transcript.find(
+    (row) => row.dir === "in" && row.msg.id === request.msg.id && !row.msg.method,
+  ).msg.result;
+}
+function replace(value) {
+  if (typeof value === "string") return replacements.get(value) || value;
+  if (Array.isArray(value)) return value.map(replace);
+  if (value && typeof value === "object")
+    return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, replace(entry)]));
+  return value;
+}
+function send(frame) {
+  if (frame.method === "item/completed" && process.env.MUSE_TEST_HISTORY) {
+    appendFileSync(process.env.MUSE_TEST_HISTORY, JSON.stringify(frame.params.item) + "\n");
+  }
+  process.stdout.write(JSON.stringify(frame) + "\n");
+}
+function respond(frame, result) {
+  send({ jsonrpc: "2.0", id: frame.id, result });
+}
+function rpcError(frame, code, kind, message) {
+  send({ jsonrpc: "2.0", id: frame.id, error: { code, message, data: { kind } } });
+}
diff --git a/plugins/muse-provider/test/fixtures/README.md b/plugins/muse-provider/test/fixtures/README.md
new file mode 100644
index 0000000000..b294bf4a0b
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/README.md
@@ -0,0 +1,78 @@
+# Muse MSP fixtures
+
+Captured on Linux on 2026-09-29 from Muse Code **1.4.1 (1.4.1-R4503.1)**,
+build `35815c253477406321e3f5595195becc25e3907a`.
+
+- Stable handshake fingerprint: `sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f`.
+- Experimental export fingerprint: `sha256:b359d70b581b0ea471d35a7770d3039fdd35f19a46a2d42b43fd4b1674d52c8a`.
+- Schema version: `1`. Both `sessionMcp` and `sessionListStream` were granted.
+
+Each line is `{ "dir": "out" | "in", "msg": <JSON-RPC message> }`.
+`out` means client to host; `in` means host to client. IDs, timestamps, cursors,
+revisions, deltas, and event order are retained. Replay consumers should treat IDs
+and cursors as opaque and compare behavior rather than wall-clock values.
+The skill catalogs retain only the test selectors `phase0` and `muse-parity-*`; unrelated personal,
+bundled, and installed-plugin skill rows were removed. No credentials are included.
+
+A throwaway driver launched `muse serve` with isolated `XDG_CONFIG_HOME` and
+`XDG_DATA_HOME`. Model turns used a custom Responses endpoint, an environment key,
+`providerId: "meta"`, and `modelId: "meta/muse-spark-1.3"`. The settings pinned the
+endpoint's `auth: "bearer"`, the default provider/model, and permission profile
+`:ask-me` with its own `schema_version: 1`. The sandbox and default `proxy-only`
+network policy remained enabled. Workspace trust was enabled for project skills.
+The approval judge was disabled for staged approval probes so decisions reached
+the client. The driver and local server remain outside the repository.
+
+| File                             | Recorded behavior                                                                                                                                                                      |
+| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `text-reasoning.ndjson`          | Session start, rational-sum prompt, public reasoning summary, streamed assistant text, token usage, terminal.                                                                          |
+| `tools-edit.ndjson`              | Read `f`, run `wc -l f`, replace `beta` with `gamma`; fetch the JSON patch through `patchRef` and `item/readOutput`.                                                                   |
+| `staged-approval.ndjson`         | `wc -l f && rm -rf f`: safe first stage, held second stage, receipt and decision, terminal resolution. Also records a duplicate decision rejected as already resolved.                 |
+| `multi-stage-approval.ndjson`    | `wc -l f && rm -rf f && rm -rf g`: successive decisions return `terminal: false`, then `true`; both files are removed.                                                                 |
+| `interrupt.ndjson`               | Interrupt a running shell sleep; tool reconciliation and `turn/completed` with `terminal: "cancelled"`.                                                                                |
+| `steer.ndjson`                   | Submit `ifBusy: "steer"` during a shell sleep; accepted as `steered`, and the original turn replies with the replacement marker.                                                       |
+| `resume-source.ndjson`           | Complete a marker turn, then kill the host process before starting either resume probe.                                                                                                |
+| `resume-without-cursor.ndjson`   | New host returns inline history and runs a fresh turn recalling the marker.                                                                                                            |
+| `resume-with-cursor.ndjson`      | New host returns `history.mode: "none"`, replays the cursor suffix, then completes a fresh marker turn.                                                                                |
+| `resume-reasoning.ndjson`        | New host resumes the steering session, including its reasoning history, and completes another text turn.                                                                               |
+| `subagent.ndjson`                | Native spawn/wait/read-result tool calls return a child result marker and an evidence log path. This build emits `toolCall`, without a dedicated `subagent` item.                      |
+| `skill.ndjson`                   | Discover the project skill and invoke its selector through a structured skill input part.                                                                                              |
+| `image-followup.ndjson`          | Send a valid 16×16 PNG, then complete a text-only marker turn in the same session. Image-description accuracy is not asserted.                                                         |
+| `catalog-controls.ndjson`        | Model catalog, environment-key account state, empty subscription usage, paginated sessions, approval mode change, valid model selection, and rejection of a model outside the catalog. |
+| `mcp-stdio.ndjson`               | Admit a session-scoped stdio server. Model attempts fail with an unknown-tool routing error and no marker is returned; this is a failure fixture.                                      |
+| `auto-review-unavailable.ndjson` | Selecting `:auto-review` as the default profile rejects session start because the automated reviewer is unavailable.                                                                   |
+| `unsafe-path.ndjson`             | Group-writable data directory rejects session start with `UnsafePath`.                                                                                                                 |
+| `initialize-history.ndjson`      | Handshake against 322 retained session logs (7,713,541 bytes); three measured launches took 155–160 ms.                                                                                |
+
+The project skill body was “Reply with exactly SKILL_PHASE0_OK. Do not use tools.”
+The injected stdio server implemented `initialize`, `tools/list`, and `tools/call`,
+advertised `verification_echo` with an empty-object input schema, and returned
+`MCP_PHASE0_OK` as text. The host registered `mcp__verification__verification_echo`,
+but the model route attempted the unqualified `verification_echo`; the marker
+was never delivered. Keep this distinction when testing MCP support.
+
+Phase 3 captures use the same build and isolated custom route. Sandbox and network
+remain at their defaults. `phase3-user-skill` omits workspace trust;
+`phase3-project-skill` enables it. Native subagent captures enable
+`MUSE_EXPERIMENTAL_SDK_ENABLED=on`; the default workflow capture reads the session
+from a daemon run that omitted the flag. Its workflow child IDs are internal
+activity IDs, not MSP `childSessionId` values.
+
+| File                             | Recorded behavior                                                                                                                    |
+| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `phase3-controls.ndjson`         | Two todo entries, a single-choice question, an answer and matching settlement, retained view paging, empty subscription usage.       |
+| `phase3-cancel.ndjson`           | Question cancellation and matching cancelled settlement.                                                                             |
+| `phase3-child-read.ndjson`       | Read and page an actual native child session, returning its assistant marker.                                                        |
+| `phase3-default-workflow.ndjson` | Read and page the default daemon run: workflow revisions 1–7, child activity, and `MUSE_PARITY_CHILD_OK`; no `childSessionId`.       |
+| `phase3-user-skill.ndjson`       | User-scoped skill catalog and structured invocation, returning `MUSE_PARITY_USER_OK` with trust off.                                 |
+| `phase3-project-skill.ndjson`    | Project-scoped skill catalog and invocation, returning `MUSE_PARITY_PROJECT_OK` with trust on.                                       |
+| `phase3-compact.ndjson`          | Resume a completed session; manual compaction rejects with `compaction_unavailable`.                                                 |
+| `phase3-compact-history.ndjson`  | Resume three completed turns; catalog context limit is null and compaction still rejects.                                            |
+| `phase3-compact-limit.ndjson`    | Same session and route with only a configured context limit; compaction is admitted and completes, reducing 22,192 tokens to 21,322. |
+
+The subprocess fixture host also generates schema-based variants for dedicated
+subagent items, explicit child-session linkage, nonempty subscription windows,
+`skill/changed`, deny choices, lost events, watchdog silence, and late admission.
+These variants test protocol behavior; they are not claimed as real-host captures.
+The workflow replay triggers a generated gap to page the recorded default run.
+Disk edits in a live host did not emit `skill/changed` during a 15-second probe.
diff --git a/plugins/muse-provider/test/fixtures/auto-review-unavailable.ndjson b/plugins/muse-provider/test/fixtures/auto-review-unavailable.ndjson
new file mode 100644
index 0000000000..3d6f6a8e83
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/auto-review-unavailable.ndjson
@@ -0,0 +1,5 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee48-a7c2-73c7-aab0-d5550547b265","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"error":{"code":-32603,"data":{"kind":"internal"},"message":"internal error: compose session permission profile: permission profile ':auto-review' cannot be used: the automated reviewer is unavailable on this host"},"id":2,"jsonrpc":"2.0"}}
diff --git a/plugins/muse-provider/test/fixtures/catalog-controls.ndjson b/plugins/muse-provider/test/fixtures/catalog-controls.ndjson
new file mode 100644
index 0000000000..da27f307fd
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/catalog-controls.ndjson
@@ -0,0 +1,26 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee4b-835a-7889-ae06-b9fa4195949d","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321462,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:52:01.38362Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:52:01.383624Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:52:01.38362Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:52:01.383624Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321467,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee4b-835a-7889-ae06-b9fa4195949d","mode":"onRequest","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","source":"approvalReconfigure","sourceRange":{"first":{"id":"61222bfc-8a69-487e-b930-ca6fa2befef2","sequence":5},"last":{"id":"61222bfc-8a69-487e-b930-ca6fa2befef2","sequence":5},"stream":{"id":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","kind":"session"}},"viewCursor":"v:01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"model/list","params":{"sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"models":[{"contextLimit":null,"cost":null,"defaultReasoningEffort":"high","description":null,"displayLabel":"meta/muse-spark-1.3","isActive":true,"isDefault":false,"modelId":"meta/muse-spark-1.3","outputLimit":null,"profileId":null,"providerId":"meta","reasoningEffortVariants":[],"releaseDate":null,"variants":["minimal","low","medium","high","xhigh"]}],"profileId":"tbh","providerId":"meta","source":"bundledCatalog"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"account/read","params":{}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"credentialRequired":true,"label":"META_API_KEY","state":"envKey"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"usage/read","params":{}}}
+{"dir":"in","msg":{"id":5,"jsonrpc":"2.0","result":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":6,"method":"session/list","params":{"workspaceRoot":"/tmp/muse-phase0/repo","limit":2}}}
+{"dir":"in","msg":{"id":6,"jsonrpc":"2.0","result":{"nextCursor":"p:k:1790704314916673:01a0ee49-ff75-70e2-83fc-3169de40b80c:f509d55a","sessions":[{"activeTurnId":null,"createdAt":"2026-09-29T17:52:01.38362Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:52:01.460992Z","workspaceRoot":"/tmp/muse-phase0/repo"},{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:50:22.069281Z","firstUserPrompt":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"notLoaded","title":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","turnCount":1,"updatedAt":"2026-09-29T17:51:54.916673Z","workspaceRoot":"/tmp/muse-phase0/repo"}]}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":7,"method":"session/setApprovalMode","params":{"commandId":"01a0ee4b-83bc-79d0-a6ac-ea983740fbf0","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","mode":"promptUnmatched"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321487,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee4b-83bc-79d0-a6ac-ea983740fbf0","mode":"promptUnmatched","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","source":"approvalReconfigure","sourceRange":{"first":{"id":"60934282-4249-4369-a638-a18b304d1969","sequence":11},"last":{"id":"60934282-4249-4369-a638-a18b304d1969","sequence":11},"stream":{"id":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","kind":"session"}},"viewCursor":"v:01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6:2"}}}
+{"dir":"in","msg":{"id":7,"jsonrpc":"2.0","result":{"applyOutcome":"completed","commandId":"01a0ee4b-83bc-79d0-a6ac-ea983740fbf0","effectiveMode":{"lastCommandId":"01a0ee4b-83bc-79d0-a6ac-ea983740fbf0","mode":"promptUnmatched","source":"approvalReconfigure"},"status":"accepted"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":8,"method":"session/setModel","params":{"commandId":"01a0ee4b-83bc-7705-a57e-c9666c4b4a38","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","model":{"providerId":"meta","modelId":"meta/muse-spark-1.3"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321491,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"createdAt":"2026-09-29T17:52:01.38362Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:52:01.488381Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":8,"jsonrpc":"2.0","result":{"commandId":"01a0ee4b-83bc-7705-a57e-c9666c4b4a38","status":"accepted"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":9,"method":"session/setModel","params":{"commandId":"01a0ee4b-83bc-7795-aaca-393dc487425c","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","model":{"providerId":"meta","modelId":"meta/muse-spark-1.2"}}}}
+{"dir":"in","msg":{"error":{"code":-32030,"data":{"commandId":"01a0ee4b-83bc-7795-aaca-393dc487425c","kind":"commandRejected","reason":"invalid_model","retryable":false},"message":"session/setModel command 01a0ee4b-83bc-7795-aaca-393dc487425c rejected: invalid_model: model is not in the catalog"},"id":9,"jsonrpc":"2.0"}}
+{"dir":"in","msg":{"emittedAtMs":1790704321500,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","viewCursor":"v:01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6:2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321500,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"notLoaded","viewCursor":"v:01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6:2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704321500,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"createdAt":"2026-09-29T17:52:01.38362Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-8364-7aa1-9ba3-c251d4cf0cb6","status":"notLoaded","turnCount":0,"updatedAt":"2026-09-29T17:52:01.491211Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/image-followup.ndjson b/plugins/muse-provider/test/fixtures/image-followup.ndjson
new file mode 100644
index 0000000000..653b9fbfed
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/image-followup.ndjson
@@ -0,0 +1,51 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee48-14b3-790c-ab3a-39c72c612044","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096526,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:48:16.44578Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:48:16.445784Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:48:16.44578Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:48:16.445784Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096532,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee48-14b3-790c-ab3a-39c72c612044","mode":"onRequest","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","source":"approvalReconfigure","sourceRange":{"first":{"id":"f4ffd6ba-aa84-4544-837d-869e523de6c4","sequence":5},"last":{"id":"f4ffd6ba-aa84-4544-837d-869e523de6c4","sequence":5},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee48-1515-7274-aba9-149303b45e94","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","input":[{"type":"text","text":"Describe this image in one short sentence. Do not use tools."},{"type":"image","mediaType":"image/png","base64Data":"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAF0lEQVR4nGP4z8BAEiJN9aiGUQ1DSgMAkPn/Afnh+ngAAAAASUVORK5CYII="}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096535,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"e602d5e4-82d2-4572-8428-f508f63f9def","sequence":15},"last":{"id":"e602d5e4-82d2-4572-8428-f508f63f9def","sequence":15},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee48-1515-7274-aba9-149303b45e94","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096544,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"running","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096545,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-1515-7274-aba9-149303b45e94","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"22ddcfee-c052-4512-b13a-16ddf7c359b5","sequence":17},"last":{"id":"22ddcfee-c052-4512-b13a-16ddf7c359b5","sequence":17},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"turnId":"01a0ee48-1515-7274-aba9-149303b45e94","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096545,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"attachments":[{"height":16,"mediaType":"image/png","type":"image","width":16}],"commandId":"01a0ee48-1515-7274-aba9-149303b45e94","itemId":"62642c88-dc30-4c0a-9063-845411f2b8ea","kind":"userMessage","recordedAt":"2026-09-29T17:48:16.536455Z","revision":1,"status":"completed","text":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"22ddcfee-c052-4512-b13a-16ddf7c359b5","sequence":17},"last":{"id":"22ddcfee-c052-4512-b13a-16ddf7c359b5","sequence":17},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096545,"jsonrpc":"2.0","method":"item/updated","params":{"item":{"attachments":[{"height":16,"mediaType":"image/png","type":"image","width":16}],"commandId":"01a0ee48-1515-7274-aba9-149303b45e94","displayText":"Describe this image in one short sentence. Do not use tools.[Image #1]","itemId":"62642c88-dc30-4c0a-9063-845411f2b8ea","kind":"userMessage","recordedAt":"2026-09-29T17:48:16.537125Z","revision":2,"status":"completed","text":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"24f5f31b-abad-4786-9a0c-3ca420a4fa9d","sequence":19},"last":{"id":"24f5f31b-abad-4786-9a0c-3ca420a4fa9d","sequence":19},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096545,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"3691347e-482d-48ab-8914-7531c20e686c","fallbackText":"Reminder child session","generationId":1,"itemId":"86e3dc92-0522-443c-a8c2-a256279ed41f","kind":"reminderChild","recordedAt":"2026-09-29T17:48:16.544809Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-151f-74c0-ba8d-a9ce7cc3ba5a","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"86e3dc92-0522-443c-a8c2-a256279ed41f","sequence":36},"last":{"id":"86e3dc92-0522-443c-a8c2-a256279ed41f","sequence":36},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704096550,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee48-1515-7274-aba9-149303b45e94","createdAt":"2026-09-29T17:48:16.44578Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:48:16.545087Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704102811,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"192f882e-3314-4a38-ac9c-7ba2e2a7b1ab","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:6.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704102811,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Describing a low-resolution image in one short sentence under direct-answer constraints.","field":"summary.0","itemId":"192f882e-3314-4a38-ac9c-7ba2e2a7b1ab","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:6.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103089,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"192f882e-3314-4a38-ac9c-7ba2e2a7b1ab","kind":"reasoning","providerItemId":"rs_6abbf9e2991c9b5a23f64316:rs_01a0ee481e9472efa2a19d22b36af83a","recordedAt":"2026-09-29T17:48:23.089292Z","revision":2,"status":"completed","summary":["Describing a low-resolution image in one short sentence under direct-answer constraints."],"turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"e6ac2c82-8772-4f2c-97b6-8919ade00a40","sequence":49},"last":{"id":"e6ac2c82-8772-4f2c-97b6-8919ade00a40","sequence":49},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103090,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"688360ec-f735-4d27-9461-495d7aac777d","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:7.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103090,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"The image is a tiny, blur","field":"text","itemId":"688360ec-f735-4d27-9461-495d7aac777d","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:7.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103090,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"ry gray square.","field":"text","itemId":"688360ec-f735-4d27-9461-495d7aac777d","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:7.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103139,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"688360ec-f735-4d27-9461-495d7aac777d","kind":"agentMessage","recordedAt":"2026-09-29T17:48:23.139316Z","revision":2,"status":"completed","text":"The image is a tiny, blurry gray square.","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"dce7d692-009d-46fd-94f8-91714848dd2a","sequence":51},"last":{"id":"dce7d692-009d-46fd-94f8-91714848dd2a","sequence":51},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103151,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":219,"promptTokens":38151,"totalTokens":38370},"durationMs":6602,"modelId":"meta/muse-spark-1.3","promptTokens":38151,"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"fdcff71b-90b0-4acb-b6fe-c7f9b8c3fb6b","sequence":54},"last":{"id":"fdcff71b-90b0-4acb-b6fe-c7f9b8c3fb6b","sequence":54},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"totalTokens":38370,"turnId":"01a0ee48-1515-7274-aba9-149303b45e94","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38151,"outputTokens":219,"reasoningTokens":179},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103152,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"3691347e-482d-48ab-8914-7531c20e686c","fallbackText":"Reminder child session","generationId":1,"itemId":"86e3dc92-0522-443c-a8c2-a256279ed41f","kind":"reminderChild","recordedAt":"2026-09-29T17:48:23.152017Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee48-151f-74c0-ba8d-a9ce7cc3ba5a","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"86e3dc92-0522-443c-a8c2-a256279ed41f","sequence":36},"last":{"id":"fa2b6f88-a391-484e-8fd9-3691601ac5e4","sequence":56},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704103154,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"16262f58-6c4c-4d2b-8097-48bbe0cb3596","childSessionLogPath":"subagent/16262f58-6c4c-4d2b-8097-48bbe0cb3596/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"11032c1c-b9c0-4cb9-aa82-bfc56e21071e","kind":"reminderChild","recordedAt":"2026-09-29T17:48:23.154514Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-2ef1-7450-9ba1-f78bfe6dd324","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"11032c1c-b9c0-4cb9-aa82-bfc56e21071e","sequence":65},"last":{"id":"11032c1c-b9c0-4cb9-aa82-bfc56e21071e","sequence":65},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107897,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"16262f58-6c4c-4d2b-8097-48bbe0cb3596","childSessionLogPath":"subagent/16262f58-6c4c-4d2b-8097-48bbe0cb3596/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"11032c1c-b9c0-4cb9-aa82-bfc56e21071e","kind":"reminderChild","recordedAt":"2026-09-29T17:48:27.897303Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-2ef1-7450-9ba1-f78bfe6dd324","turnId":"01a0ee48-1515-7274-aba9-149303b45e94"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"11032c1c-b9c0-4cb9-aa82-bfc56e21071e","sequence":65},"last":{"id":"e7c51564-f38c-4f0b-bc78-23d1c87dd0dc","sequence":67},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107898,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107900,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":11362,"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"61602f64-1c16-4cd1-bf19-75b72ee45561","sequence":70},"last":{"id":"61602f64-1c16-4cd1-bf19-75b72ee45561","sequence":70},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":6275,"turnId":"01a0ee48-1515-7274-aba9-149303b45e94","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:13"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/start","params":{"commandId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","input":[{"type":"text","text":"Reply with exactly AFTER_IMAGE_OK. Do not use tools."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107900,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"33c0c528-c953-4b80-a3a8-c12574a3485b","sequence":71},"last":{"id":"33c0c528-c953-4b80-a3a8-c12574a3485b","sequence":71},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:14","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107900,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:16.443351Z","firstUserPrompt":"Describe this image in one short sentence. Do not use tools.[Image #1]","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","title":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnCount":1,"updatedAt":"2026-09-29T17:48:27.898637Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107927,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"running","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107928,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"8700751a-c26e-40a5-bdeb-3f9ac3f3a3d0","sequence":77},"last":{"id":"8700751a-c26e-40a5-bdeb-3f9ac3f3a3d0","sequence":77},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107928,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","itemId":"845bb8ae-13c0-4319-98e0-2dd2d879261a","kind":"userMessage","recordedAt":"2026-09-29T17:48:27.905665Z","revision":1,"status":"completed","text":"Reply with exactly AFTER_IMAGE_OK. Do not use tools.","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"8700751a-c26e-40a5-bdeb-3f9ac3f3a3d0","sequence":77},"last":{"id":"8700751a-c26e-40a5-bdeb-3f9ac3f3a3d0","sequence":77},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107928,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"8eb73549-16d3-411f-a0ba-22800a1c1b54","fallbackText":"Reminder child session","generationId":1,"itemId":"282c904c-d54f-467b-93e2-5b9480a166c5","kind":"reminderChild","recordedAt":"2026-09-29T17:48:27.917031Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-418b-7751-9429-a631c780d400","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"282c904c-d54f-467b-93e2-5b9480a166c5","sequence":95},"last":{"id":"282c904c-d54f-467b-93e2-5b9480a166c5","sequence":95},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704107928,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","branch":"main","createdAt":"2026-09-29T17:48:16.443351Z","firstUserPrompt":"Describe this image in one short sentence. Do not use tools.[Image #1]","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"running","title":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnCount":1,"updatedAt":"2026-09-29T17:48:27.920765Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111517,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"32b4ec22-d9f6-473f-a024-3f83e998425f","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:17.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111517,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"AFTER_IMAGE_OK","field":"text","itemId":"32b4ec22-d9f6-473f-a024-3f83e998425f","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:17.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111606,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"32b4ec22-d9f6-473f-a024-3f83e998425f","kind":"agentMessage","recordedAt":"2026-09-29T17:48:31.605848Z","revision":2,"status":"completed","text":"AFTER_IMAGE_OK","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"bbc74b47-606f-4003-8633-6112d1530645","sequence":108},"last":{"id":"bbc74b47-606f-4003-8633-6112d1530645","sequence":108},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111610,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":253,"promptTokens":76520,"totalTokens":76773},"durationMs":3689,"modelId":"meta/muse-spark-1.3","promptTokens":38369,"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"61c466ae-5b9e-46ac-b77b-7d79ccdb95ee","sequence":111},"last":{"id":"61c466ae-5b9e-46ac-b77b-7d79ccdb95ee","sequence":111},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"totalTokens":38403,"turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38369,"outputTokens":34,"reasoningTokens":20},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111612,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"a5b9e5ef-4db4-4de9-b43b-1709104635f9","childSessionLogPath":"subagent/a5b9e5ef-4db4-4de9-b43b-1709104635f9/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"cbe47e00-7517-4e1b-82d5-ed95bf1e7c4f","kind":"reminderChild","recordedAt":"2026-09-29T17:48:31.612212Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-4ffa-7d20-8d06-65214075eec3","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"cbe47e00-7517-4e1b-82d5-ed95bf1e7c4f","sequence":118},"last":{"id":"cbe47e00-7517-4e1b-82d5-ed95bf1e7c4f","sequence":118},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116018,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"8eb73549-16d3-411f-a0ba-22800a1c1b54","fallbackText":"Reminder child session","generationId":1,"itemId":"282c904c-d54f-467b-93e2-5b9480a166c5","kind":"reminderChild","recordedAt":"2026-09-29T17:48:36.017946Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee48-418b-7751-9429-a631c780d400","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"282c904c-d54f-467b-93e2-5b9480a166c5","sequence":95},"last":{"id":"5f3e4559-d00b-4404-88cc-bfb702ba426d","sequence":120},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116018,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"a5b9e5ef-4db4-4de9-b43b-1709104635f9","childSessionLogPath":"subagent/a5b9e5ef-4db4-4de9-b43b-1709104635f9/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"cbe47e00-7517-4e1b-82d5-ed95bf1e7c4f","kind":"reminderChild","recordedAt":"2026-09-29T17:48:36.018337Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-4ffa-7d20-8d06-65214075eec3","turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434"},"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"cbe47e00-7517-4e1b-82d5-ed95bf1e7c4f","sequence":118},"last":{"id":"60cf2710-1caa-4385-9b24-38d9cffb0b52","sequence":121},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116020,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116021,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":8114,"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","sourceRange":{"first":{"id":"98be3596-abf4-4650-9eea-20f3c3788dff","sequence":127},"last":{"id":"98be3596-abf4-4650-9eea-20f3c3788dff","sequence":127},"stream":{"id":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3611,"turnId":"01a0ee48-417c-7e7e-a5ce-124c68cfc434","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116021,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:16.443351Z","firstUserPrompt":"Describe this image in one short sentence. Do not use tools.[Image #1]","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"idle","title":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnCount":2,"updatedAt":"2026-09-29T17:48:36.019856Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116224,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116224,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"notLoaded","viewCursor":"v:01a0ee48-14bb-7c82-8d96-069dbc09cf11:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704116224,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:16.443351Z","firstUserPrompt":"Describe this image in one short sentence. Do not use tools.[Image #1]","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-14bb-7c82-8d96-069dbc09cf11/session.jsonl","providerId":"meta","sessionId":"01a0ee48-14bb-7c82-8d96-069dbc09cf11","status":"notLoaded","title":"Describe this image in one short sentence. Do not use tools.[Image #1]","turnCount":2,"updatedAt":"2026-09-29T17:48:36.019856Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/initialize-history.ndjson b/plugins/muse-provider/test/fixtures/initialize-history.ndjson
new file mode 100644
index 0000000000..9fe32e2cc6
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/initialize-history.ndjson
@@ -0,0 +1,3 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
diff --git a/plugins/muse-provider/test/fixtures/interrupt.ndjson b/plugins/muse-provider/test/fixtures/interrupt.ndjson
new file mode 100644
index 0000000000..591f0148ab
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/interrupt.ndjson
@@ -0,0 +1,28 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee46-2c0f-7cba-a683-2424f20f00b7","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971433,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:46:11.353718Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-2c17-73c1-935d-9963d05b7f69/session.jsonl","providerId":"meta","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:46:11.353722Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:46:11.353718Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-2c17-73c1-935d-9963d05b7f69/session.jsonl","providerId":"meta","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:46:11.353722Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971439,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee46-2c0f-7cba-a683-2424f20f00b7","mode":"onRequest","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","source":"approvalReconfigure","sourceRange":{"first":{"id":"c5a5a50e-b360-485b-a2d9-1083a885b24a","sequence":5},"last":{"id":"c5a5a50e-b360-485b-a2d9-1083a885b24a","sequence":5},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","input":[{"type":"text","text":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971442,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"39a5a9a9-3fad-4ad0-9eed-6bd5f4cc5f12","sequence":15},"last":{"id":"39a5a9a9-3fad-4ad0-9eed-6bd5f4cc5f12","sequence":15},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971449,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"running","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971450,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"32c5743a-d7bc-42e6-8675-7ed4a2e2796d","sequence":17},"last":{"id":"32c5743a-d7bc-42e6-8675-7ed4a2e2796d","sequence":17},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971450,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","itemId":"ba26432c-5367-4d56-a1af-da45202f42a2","kind":"userMessage","recordedAt":"2026-09-29T17:46:11.442978Z","revision":1,"status":"completed","text":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"},"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"32c5743a-d7bc-42e6-8675-7ed4a2e2796d","sequence":17},"last":{"id":"32c5743a-d7bc-42e6-8675-7ed4a2e2796d","sequence":17},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971450,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"18b1f3a2-c46a-4a36-88a3-f5a8eb1e78b1","fallbackText":"Reminder child session","generationId":1,"itemId":"24231a9c-6230-4ef4-b7ce-39710d296461","kind":"reminderChild","recordedAt":"2026-09-29T17:46:11.450333Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee46-2c78-7610-8396-67c912009ca1","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"},"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"24231a9c-6230-4ef4-b7ce-39710d296461","sequence":35},"last":{"id":"24231a9c-6230-4ef4-b7ce-39710d296461","sequence":35},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703971455,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","createdAt":"2026-09-29T17:46:11.353718Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-2c17-73c1-935d-9963d05b7f69/session.jsonl","providerId":"meta","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:46:11.450604Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703974977,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":165,"promptTokens":38143,"totalTokens":38308},"durationMs":3523,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38143,"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"0511cfd0-3bb6-400c-85e3-8e01f9dd5e29","sequence":51},"last":{"id":"0511cfd0-3bb6-400c-85e3-8e01f9dd5e29","sequence":51},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"totalTokens":38308,"turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38143,"outputTokens":165,"reasoningTokens":54},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703974980,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","callId":"call_01a0ee46375976599e7796d9cb6263a3","itemId":"01a0ee46-3a42-76f2-8fe8-f64de143cb33","kind":"toolCall","recordedAt":"2026-09-29T17:46:14.980372Z","revision":1,"status":"inProgress","tool":"bash","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"},"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"4eabdc2b-0f6c-47ef-87d3-8d42ba628567","sequence":53},"last":{"id":"e240d66b-2bc9-417d-9c0f-e7547a261e4f","sequence":59},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:7"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/interrupt","params":{"commandId":"01a0ee46-3e2c-792b-abd7-c755e457c361","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0ee46-3e2c-792b-abd7-c755e457c361","status":"accepted","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976031,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","callId":"call_01a0ee46375976599e7796d9cb6263a3","failureReason":"cancelled by tool cancellation","itemId":"01a0ee46-3a42-76f2-8fe8-f64de143cb33","kind":"toolCall","recordedAt":"2026-09-29T17:46:16.031124Z","revision":2,"status":"cancelled","tool":"bash","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","visibleOutput":"{\n  \"chunk_id\": \"exec-1-1\",\n  \"command\": \"sleep 12\",\n  \"description\": \"Sleep for twelve seconds\",\n  \"terminal_status\": \"cancelled\",\n  \"terminal_reason\": \"cancelled by tool cancellation\",\n  \"output\": \"\",\n  \"original_output_bytes\": 0,\n  \"original_output_tokens\": 0,\n  \"truncated\": false\n}"},"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"4eabdc2b-0f6c-47ef-87d3-8d42ba628567","sequence":53},"last":{"id":"851e1513-f831-4d52-a1ef-f7caf0016653","sequence":64},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976032,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"18b1f3a2-c46a-4a36-88a3-f5a8eb1e78b1","failureReason":"main run cancelled","fallbackText":"Reminder child session","generationId":1,"itemId":"24231a9c-6230-4ef4-b7ce-39710d296461","kind":"reminderChild","recordedAt":"2026-09-29T17:46:16.032366Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee46-2c78-7610-8396-67c912009ca1","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c"},"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"24231a9c-6230-4ef4-b7ce-39710d296461","sequence":35},"last":{"id":"fcd59a42-cd98-4dc3-b572-0ad06cb83bd3","sequence":68},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976032,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"idle","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976033,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":4589,"reason":"cancelled after tool result reconciliation","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"13edc96a-f33d-4343-b40b-e4632258bdb0","sequence":70},"last":{"id":"13edc96a-f33d-4343-b40b-e4632258bdb0","sequence":70},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"terminal":"cancelled","turnId":"01a0ee46-2c70-7ee7-a0d9-c5b4a4efd05c","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976033,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","sourceRange":{"first":{"id":"91e843be-9782-495d-8ca9-3032d4715a70","sequence":71},"last":{"id":"91e843be-9782-495d-8ca9-3032d4715a70","sequence":71},"stream":{"id":"01a0ee46-2c17-73c1-935d-9963d05b7f69","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:11","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976033,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:11.351253Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-2c17-73c1-935d-9963d05b7f69/session.jsonl","providerId":"meta","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"idle","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:46:16.032578Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976246,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976246,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"notLoaded","viewCursor":"v:01a0ee46-2c17-73c1-935d-9963d05b7f69:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703976246,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:11.351253Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-2c17-73c1-935d-9963d05b7f69/session.jsonl","providerId":"meta","sessionId":"01a0ee46-2c17-73c1-935d-9963d05b7f69","status":"notLoaded","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:46:16.033681Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/mcp-stdio.ndjson b/plugins/muse-provider/test/fixtures/mcp-stdio.ndjson
new file mode 100644
index 0000000000..e23f22335e
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/mcp-stdio.ndjson
@@ -0,0 +1,97 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee49-ff6d-7f97-aa43-f75434037271","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest","config":{"mcpServers":{"verification":{"transport":"stdio","command":"python3","args":["/tmp/muse-phase0/mcp-echo.py"],"framing":"lineDelimitedJson"}}}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222151,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:50:22.071649Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:50:22.071653Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:50:22.071649Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:50:22.071653Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222158,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee49-ff6d-7f97-aa43-f75434037271","mode":"onRequest","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","source":"approvalReconfigure","sourceRange":{"first":{"id":"356fbc67-a2da-4c63-80e5-c40479aeecb7","sequence":5},"last":{"id":"356fbc67-a2da-4c63-80e5-c40479aeecb7","sequence":5},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","input":[{"type":"text","text":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222160,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"68cf6e02-29e6-4783-b564-e17feb742fae","sequence":24},"last":{"id":"68cf6e02-29e6-4783-b564-e17feb742fae","sequence":24},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222168,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"running","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222169,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ae50c494-8740-4906-a3d1-27a0681f234c","sequence":26},"last":{"id":"ae50c494-8740-4906-a3d1-27a0681f234c","sequence":26},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222169,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","itemId":"8b14c48f-e6c3-4b66-9357-62707a02c3a6","kind":"userMessage","recordedAt":"2026-09-29T17:50:22.161705Z","revision":1,"status":"completed","text":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ae50c494-8740-4906-a3d1-27a0681f234c","sequence":26},"last":{"id":"ae50c494-8740-4906-a3d1-27a0681f234c","sequence":26},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222176,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"5ca0b9af-8b82-4259-b8de-eedcf562beb1","fallbackText":"Reminder child session","generationId":1,"itemId":"950ac8c1-ae7d-4bb0-945a-8ce2e29117b6","kind":"reminderChild","recordedAt":"2026-09-29T17:50:22.176196Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee49-ffde-70f1-9cd1-38c8b29f0681","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"950ac8c1-ae7d-4bb0-945a-8ce2e29117b6","sequence":47},"last":{"id":"950ac8c1-ae7d-4bb0-945a-8ce2e29117b6","sequence":47},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704222180,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","createdAt":"2026-09-29T17:50:22.071649Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:50:22.162618Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704225869,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":89,"promptTokens":36599,"totalTokens":36688},"durationMs":3688,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":36599,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"96546ee0-6886-4ba5-828f-e1e02f68cfc6","sequence":63},"last":{"id":"96546ee0-6886-4ba5-828f-e1e02f68cfc6","sequence":63},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":36688,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":36599,"outputTokens":89,"reasoningTokens":26},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704225872,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"5ca0b9af-8b82-4259-b8de-eedcf562beb1","fallbackText":"Reminder child session","generationId":1,"itemId":"950ac8c1-ae7d-4bb0-945a-8ce2e29117b6","kind":"reminderChild","recordedAt":"2026-09-29T17:50:25.872231Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee49-ffde-70f1-9cd1-38c8b29f0681","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"950ac8c1-ae7d-4bb0-945a-8ce2e29117b6","sequence":47},"last":{"id":"93323499-a386-4fb0-a957-7b853bf6ddac","sequence":71},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704225874,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"b31cbc74-b9fb-4f55-9a83-16da4f98ff47","fallbackText":"Reminder child session","generationId":2,"itemId":"6bddd0b0-df0c-484e-b709-e90fedf82a8b","kind":"reminderChild","recordedAt":"2026-09-29T17:50:25.874457Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-0e51-7c50-97ea-3c9a62bbeb66","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"6bddd0b0-df0c-484e-b709-e90fedf82a8b","sequence":80},"last":{"id":"6bddd0b0-df0c-484e-b709-e90fedf82a8b","sequence":80},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704231107,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":216,"promptTokens":73402,"totalTokens":73618},"durationMs":5229,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":36803,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"f2c46170-263a-4b44-99c9-4d71be6d8143","sequence":96},"last":{"id":"f2c46170-263a-4b44-99c9-4d71be6d8143","sequence":96},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":36930,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":36593,"cacheWriteTokens":0,"cachedTokens":36593,"inputTokens":36803,"outputTokens":127,"reasoningTokens":63},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704234936,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":344,"promptTokens":110447,"totalTokens":110791},"durationMs":3820,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":37045,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"4c9d9d20-7cff-4f69-83b9-8ee9f3e3eb3b","sequence":121},"last":{"id":"4c9d9d20-7cff-4f69-83b9-8ee9f3e3eb3b","sequence":121},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":37173,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":36721,"cacheWriteTokens":0,"cachedTokens":36721,"inputTokens":37045,"outputTokens":128,"reasoningTokens":64},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704234941,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"b31cbc74-b9fb-4f55-9a83-16da4f98ff47","fallbackText":"Reminder child session","generationId":2,"itemId":"6bddd0b0-df0c-484e-b709-e90fedf82a8b","kind":"reminderChild","recordedAt":"2026-09-29T17:50:34.941058Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-0e51-7c50-97ea-3c9a62bbeb66","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"6bddd0b0-df0c-484e-b709-e90fedf82a8b","sequence":80},"last":{"id":"efa65401-33e1-4953-870a-b3d50f38201c","sequence":129},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704234943,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"4a7bc4ed-8a9d-4c64-bc58-5974a231ec3e","fallbackText":"Reminder child session","generationId":3,"itemId":"14dce19f-806f-49ea-a642-27f1add14e6b","kind":"reminderChild","recordedAt":"2026-09-29T17:50:34.943414Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-31be-77d3-97a0-b02176f1901a","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"14dce19f-806f-49ea-a642-27f1add14e6b","sequence":138},"last":{"id":"14dce19f-806f-49ea-a642-27f1add14e6b","sequence":138},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704238997,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":490,"promptTokens":147735,"totalTokens":148225},"durationMs":4049,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":37288,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"fa304ed0-f74c-4ed3-9cec-fc6ffa00ba8a","sequence":154},"last":{"id":"fa304ed0-f74c-4ed3-9cec-fc6ffa00ba8a","sequence":154},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":37434,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":37288,"outputTokens":146,"reasoningTokens":73},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704245514,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":731,"promptTokens":185285,"totalTokens":186016},"durationMs":6492,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":37550,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"72cddfc7-d0e3-408f-9d27-adf1b38dbe80","sequence":179},"last":{"id":"72cddfc7-d0e3-408f-9d27-adf1b38dbe80","sequence":179},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":37791,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":37233,"cacheWriteTokens":0,"cachedTokens":37233,"inputTokens":37550,"outputTokens":241,"reasoningTokens":177},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704245518,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"4a7bc4ed-8a9d-4c64-bc58-5974a231ec3e","fallbackText":"Reminder child session","generationId":3,"itemId":"14dce19f-806f-49ea-a642-27f1add14e6b","kind":"reminderChild","recordedAt":"2026-09-29T17:50:45.518533Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-31be-77d3-97a0-b02176f1901a","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"14dce19f-806f-49ea-a642-27f1add14e6b","sequence":138},"last":{"id":"434082ce-4c9c-435e-b36a-86e5ea22bab2","sequence":187},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704245521,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"7d4ba2ac-40d4-43ef-a51c-91a99ba79385","fallbackText":"Reminder child session","generationId":4,"itemId":"c6b536ce-e60f-4b52-b2de-3da223242d7e","kind":"reminderChild","recordedAt":"2026-09-29T17:50:45.520815Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-5b0f-7590-9d47-9da4390df674","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"c6b536ce-e60f-4b52-b2de-3da223242d7e","sequence":196},"last":{"id":"c6b536ce-e60f-4b52-b2de-3da223242d7e","sequence":196},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704250703,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"1b23c527-97c0-419e-b58d-8d503292c6da","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:16.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704250703,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Correcting tool recipient format to use default namespace and single call per message.","field":"summary.0","itemId":"1b23c527-97c0-419e-b58d-8d503292c6da","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:16.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704255209,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"1b23c527-97c0-419e-b58d-8d503292c6da","kind":"reasoning","providerItemId":"rs_6abbfa7637a483bc11064bbe:rs_01a0ee4a5fe17414beae1c6817909f9e","recordedAt":"2026-09-29T17:50:55.209309Z","revision":2,"status":"completed","summary":["Correcting tool recipient format to use default namespace and single call per message."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"12a3e665-f587-4433-bc7b-0fc35e721177","sequence":209},"last":{"id":"12a3e665-f587-4433-bc7b-0fc35e721177","sequence":209},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704255767,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1235,"promptTokens":223192,"totalTokens":224427},"durationMs":10242,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":37907,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"45183575-0909-4350-9042-34bcd986d704","sequence":214},"last":{"id":"45183575-0909-4350-9042-34bcd986d704","sequence":214},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":38411,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":37489,"cacheWriteTokens":0,"cachedTokens":37489,"inputTokens":37907,"outputTokens":504,"reasoningTokens":417},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704255771,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"7d4ba2ac-40d4-43ef-a51c-91a99ba79385","fallbackText":"Reminder child session","generationId":4,"itemId":"c6b536ce-e60f-4b52-b2de-3da223242d7e","kind":"reminderChild","recordedAt":"2026-09-29T17:50:55.770844Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-5b0f-7590-9d47-9da4390df674","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"c6b536ce-e60f-4b52-b2de-3da223242d7e","sequence":196},"last":{"id":"706650ff-b21b-4d98-ad2a-bd2793833c08","sequence":222},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704255773,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"03cc87ac-f323-4150-9cf2-c17c1e5a10d5","fallbackText":"Reminder child session","generationId":5,"itemId":"6cf23922-e14c-40a5-ac69-7750a1f53dfb","kind":"reminderChild","recordedAt":"2026-09-29T17:50:55.77316Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-831b-7291-990a-db63e7fb951a","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"6cf23922-e14c-40a5-ac69-7750a1f53dfb","sequence":231},"last":{"id":"6cf23922-e14c-40a5-ac69-7750a1f53dfb","sequence":231},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704260441,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"54fea1ca-2a35-46ca-80be-ae6bbe8640e2","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:20.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704260441,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Adjusting the tool call recipient format from muse to default mcp verification namespace.","field":"summary.0","itemId":"54fea1ca-2a35-46ca-80be-ae6bbe8640e2","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:20.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704264663,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"54fea1ca-2a35-46ca-80be-ae6bbe8640e2","kind":"reasoning","providerItemId":"rs_6abbfa807d7a3c13a2b24a99:rs_01a0ee4a87827736b5af6b96ba7ee8f0","recordedAt":"2026-09-29T17:51:04.662652Z","revision":2,"status":"completed","summary":["Adjusting the tool call recipient format from muse to default mcp verification namespace."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"24295be2-fb95-4aa6-9ed2-eddd54703f68","sequence":244},"last":{"id":"24295be2-fb95-4aa6-9ed2-eddd54703f68","sequence":244},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704265001,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1786,"promptTokens":261700,"totalTokens":263486},"durationMs":9224,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38508,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ea636237-3757-4ab4-afea-fc6cf3edb4e0","sequence":249},"last":{"id":"ea636237-3757-4ab4-afea-fc6cf3edb4e0","sequence":249},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":39059,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38508,"outputTokens":551,"reasoningTokens":461},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704265005,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"03cc87ac-f323-4150-9cf2-c17c1e5a10d5","fallbackText":"Reminder child session","generationId":5,"itemId":"6cf23922-e14c-40a5-ac69-7750a1f53dfb","kind":"reminderChild","recordedAt":"2026-09-29T17:51:05.004993Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-831b-7291-990a-db63e7fb951a","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"6cf23922-e14c-40a5-ac69-7750a1f53dfb","sequence":231},"last":{"id":"22ed2499-d899-4c63-84c8-22a8d6672824","sequence":257},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704265007,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"ac62eb71-a002-4270-8e3a-25ff0f0773f1","fallbackText":"Reminder child session","generationId":6,"itemId":"5b6224bb-3a17-402e-9422-43716854c99f","kind":"reminderChild","recordedAt":"2026-09-29T17:51:05.007287Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-a72d-7f62-9c0e-2af665756771","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"5b6224bb-3a17-402e-9422-43716854c99f","sequence":266},"last":{"id":"5b6224bb-3a17-402e-9422-43716854c99f","sequence":266},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704269558,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"d27db2ad-4734-441c-9775-a6b6089bdfb5","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:24.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704269558,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Correcting the tool invocation name to mcp__verification__verification_echo after misrouting.","field":"summary.0","itemId":"d27db2ad-4734-441c-9775-a6b6089bdfb5","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:24.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704269788,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"d27db2ad-4734-441c-9775-a6b6089bdfb5","kind":"reasoning","providerItemId":"rs_6abbfa89f29054f8cb46439b:rs_01a0ee4aaa0a726fb9de1f2874785d88","recordedAt":"2026-09-29T17:51:09.78848Z","revision":2,"status":"completed","summary":["Correcting the tool invocation name to mcp__verification__verification_echo after misrouting."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"0e03b0b6-7bbe-40e8-bfbb-232ef7b07597","sequence":279},"last":{"id":"0e03b0b6-7bbe-40e8-bfbb-232ef7b07597","sequence":279},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:25"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704269826,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":2069,"promptTokens":300855,"totalTokens":302924},"durationMs":4815,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":39155,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"9c74fed5-eaf7-41c7-8e28-1f12e4c1575c","sequence":283},"last":{"id":"9c74fed5-eaf7-41c7-8e28-1f12e4c1575c","sequence":283},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":39438,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":38385,"cacheWriteTokens":0,"cachedTokens":38385,"inputTokens":39155,"outputTokens":283,"reasoningTokens":215},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:26"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704273632,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"5f0a933d-76c4-45f3-a7eb-580d1dbe6fd9","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:26.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704273632,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Identifying a recipient formatting error and correcting the tool call header to use the valid default namespace.","field":"summary.0","itemId":"5f0a933d-76c4-45f3-a7eb-580d1dbe6fd9","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:26.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704276401,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"5f0a933d-76c4-45f3-a7eb-580d1dbe6fd9","kind":"reasoning","providerItemId":"rs_6abbfa8e85b93bd6201545ef:rs_01a0ee4abccb70efa27f3573318309f6","recordedAt":"2026-09-29T17:51:16.401006Z","revision":2,"status":"completed","summary":["Identifying a recipient formatting error and correcting the tool call header to use the valid default namespace."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"47a12323-0ed4-4b27-8f03-6b66b8895930","sequence":305},"last":{"id":"47a12323-0ed4-4b27-8f03-6b66b8895930","sequence":305},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:27"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704276673,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":2480,"promptTokens":340387,"totalTokens":342867},"durationMs":6837,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":39532,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"eda82807-0801-4ba3-bff5-d05c277acf07","sequence":310},"last":{"id":"eda82807-0801-4ba3-bff5-d05c277acf07","sequence":310},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":39943,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":39153,"cacheWriteTokens":0,"cachedTokens":39153,"inputTokens":39532,"outputTokens":411,"reasoningTokens":322},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:28"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704276677,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"ac62eb71-a002-4270-8e3a-25ff0f0773f1","fallbackText":"Reminder child session","generationId":6,"itemId":"5b6224bb-3a17-402e-9422-43716854c99f","kind":"reminderChild","recordedAt":"2026-09-29T17:51:16.677407Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-a72d-7f62-9c0e-2af665756771","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"5b6224bb-3a17-402e-9422-43716854c99f","sequence":266},"last":{"id":"547b3d14-3fc5-4e6d-af3e-c06d7489c3e2","sequence":318},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:29"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704276680,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"10fc93c2-00df-4c06-8faa-85f1ca5d0c4a","fallbackText":"Reminder child session","generationId":7,"itemId":"ecfec1a1-50f0-41b2-a182-02c7abba169a","kind":"reminderChild","recordedAt":"2026-09-29T17:51:16.679786Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4a-d4c6-7de2-9c72-4bd8e0679a9b","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ecfec1a1-50f0-41b2-a182-02c7abba169a","sequence":327},"last":{"id":"ecfec1a1-50f0-41b2-a182-02c7abba169a","sequence":327},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:30"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704282675,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"e03fcbc6-d28b-4782-b601-e5ab3173f0b8","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:30.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704282675,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Adjusting the recipient identifier to match the session tool name by changing the to= field.","field":"summary.0","itemId":"e03fcbc6-d28b-4782-b601-e5ab3173f0b8","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:30.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704290578,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Switching the invoke name to the correct tool function and emitting the proper call format.","field":"summary.0","itemId":"e03fcbc6-d28b-4782-b601-e5ab3173f0b8","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:30.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704293289,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"e03fcbc6-d28b-4782-b601-e5ab3173f0b8","kind":"reasoning","providerItemId":"rs_6abbfa957c5905a580234079:rs_01a0ee4ad974758a8d721d5433593d36","recordedAt":"2026-09-29T17:51:33.288684Z","revision":2,"status":"completed","summary":["Adjusting the recipient identifier to match the session tool name by changing the to= field.Switching the invoke name to the correct tool function and emitting the proper call format."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"e623e93f-e459-4eda-8f0d-13e66fb6ced9","sequence":341},"last":{"id":"e623e93f-e459-4eda-8f0d-13e66fb6ced9","sequence":341},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:31"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704293385,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":3250,"promptTokens":380424,"totalTokens":383674},"durationMs":16700,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":40037,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"e1f583cd-fa38-4a7e-b877-09481a25ff97","sequence":345},"last":{"id":"e1f583cd-fa38-4a7e-b877-09481a25ff97","sequence":345},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":40807,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":39409,"cacheWriteTokens":0,"cachedTokens":39409,"inputTokens":40037,"outputTokens":770,"reasoningTokens":680},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:32"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704293389,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"10fc93c2-00df-4c06-8faa-85f1ca5d0c4a","fallbackText":"Reminder child session","generationId":7,"itemId":"ecfec1a1-50f0-41b2-a182-02c7abba169a","kind":"reminderChild","recordedAt":"2026-09-29T17:51:33.389095Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4a-d4c6-7de2-9c72-4bd8e0679a9b","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ecfec1a1-50f0-41b2-a182-02c7abba169a","sequence":327},"last":{"id":"200e6040-860b-4734-82d8-b0ac53e2f6e3","sequence":353},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704293391,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"ee0d6f9d-3224-4269-9470-453691b7b36f","fallbackText":"Reminder child session","generationId":8,"itemId":"d758af60-1585-4c7c-9e18-c05f14212e0b","kind":"reminderChild","recordedAt":"2026-09-29T17:51:33.391427Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4b-160e-7120-b2a1-6d7c9e2a15c5","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"d758af60-1585-4c7c-9e18-c05f14212e0b","sequence":362},"last":{"id":"d758af60-1585-4c7c-9e18-c05f14212e0b","sequence":362},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:34"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297931,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"bc432b76-93a1-4890-ab02-a7849f94b2d1","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:34.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297931,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Analyzing why the recipient is fixed and considering alternative addressing methods.","field":"summary.0","itemId":"bc432b76-93a1-4890-ab02-a7849f94b2d1","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:34.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302395,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"bc432b76-93a1-4890-ab02-a7849f94b2d1","kind":"reasoning","providerItemId":"rs_6abbfaa68c4866b6e8014972:rs_01a0ee4b1b82768992c4b4dbd733e67f","recordedAt":"2026-09-29T17:51:42.395133Z","revision":2,"status":"completed","summary":["Analyzing why the recipient is fixed and considering alternative addressing methods."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"ab6d3e6a-49e7-4857-bb08-8059aa7707ee","sequence":375},"last":{"id":"ab6d3e6a-49e7-4857-bb08-8059aa7707ee","sequence":375},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:35"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302618,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":3825,"promptTokens":421303,"totalTokens":425128},"durationMs":9222,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":40879,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"c2f6467e-c1db-46dc-9fa6-fa749ac33929","sequence":380},"last":{"id":"c2f6467e-c1db-46dc-9fa6-fa749ac33929","sequence":380},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":41454,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":39921,"cacheWriteTokens":0,"cachedTokens":39921,"inputTokens":40879,"outputTokens":575,"reasoningTokens":491},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:36"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302621,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"ee0d6f9d-3224-4269-9470-453691b7b36f","fallbackText":"Reminder child session","generationId":8,"itemId":"d758af60-1585-4c7c-9e18-c05f14212e0b","kind":"reminderChild","recordedAt":"2026-09-29T17:51:42.621717Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4b-160e-7120-b2a1-6d7c9e2a15c5","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"d758af60-1585-4c7c-9e18-c05f14212e0b","sequence":362},"last":{"id":"dfc529d7-ffd6-4257-b5db-09d38024dd59","sequence":388},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:37"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302624,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"269f5880-80ac-41f9-b348-61a343176893","fallbackText":"Reminder child session","generationId":9,"itemId":"e77dc995-fea7-42ef-989f-8848321157ea","kind":"reminderChild","recordedAt":"2026-09-29T17:51:42.624086Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4b-3a1e-7463-bccf-274eaea2d105","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"e77dc995-fea7-42ef-989f-8848321157ea","sequence":397},"last":{"id":"e77dc995-fea7-42ef-989f-8848321157ea","sequence":397},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:38"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704307256,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"7cb4a150-6b50-4ba5-b8b7-cd7457bea6a7","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:38.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704307256,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Breaking the repeated incorrect tool-call pattern by explicitly typing the default namespace function name character by character.","field":"summary.0","itemId":"7cb4a150-6b50-4ba5-b8b7-cd7457bea6a7","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:38.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704310664,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"7cb4a150-6b50-4ba5-b8b7-cd7457bea6a7","kind":"reasoning","providerItemId":"rs_6abbfaaf5ff9ac4cd0b5413b:rs_01a0ee4b3cf17487a3f42807a4cf2d32","recordedAt":"2026-09-29T17:51:50.664198Z","revision":2,"status":"completed","summary":["Breaking the repeated incorrect tool-call pattern by explicitly typing the default namespace function name character by character."],"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"56692ccd-4cbe-493e-944d-5e03707a8832","sequence":410},"last":{"id":"56692ccd-4cbe-493e-944d-5e03707a8832","sequence":410},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:39"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704310949,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":4130,"promptTokens":462855,"totalTokens":466985},"durationMs":8320,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":41552,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"fc809e7f-738f-4fb2-8990-d231a92b3dee","sequence":414},"last":{"id":"fc809e7f-738f-4fb2-8990-d231a92b3dee","sequence":414},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":41857,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":40817,"cacheWriteTokens":0,"cachedTokens":40817,"inputTokens":41552,"outputTokens":305,"reasoningTokens":236},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:40"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704310953,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"269f5880-80ac-41f9-b348-61a343176893","fallbackText":"Reminder child session","generationId":9,"itemId":"e77dc995-fea7-42ef-989f-8848321157ea","kind":"reminderChild","recordedAt":"2026-09-29T17:51:50.953035Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4b-3a1e-7463-bccf-274eaea2d105","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"e77dc995-fea7-42ef-989f-8848321157ea","sequence":397},"last":{"id":"24356eb4-6215-4702-8e43-e50d9b975511","sequence":422},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:41"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704310955,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"6b57a3c2-dcbd-490e-a2ed-56107a04c4ea","fallbackText":"Reminder child session","generationId":10,"itemId":"a757ea2c-e547-432b-a470-b71f7c83dcf4","kind":"reminderChild","recordedAt":"2026-09-29T17:51:50.955406Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4b-5aaa-7ac1-a9bc-425cfedf8c15","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"a757ea2c-e547-432b-a470-b71f7c83dcf4","sequence":431},"last":{"id":"a757ea2c-e547-432b-a470-b71f7c83dcf4","sequence":431},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704313774,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704313774,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"I could not retrieve the marker.\n\n","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704313774,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"I attempted to call `mcp__verification__verification_echo`","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704313774,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" with empty arguments","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704313774,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `{","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314078,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"}` multiple times, but each attempt","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314078,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" was routed to the","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314079,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" wrong tool identifier","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314079,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" (`muse.verification_echo`","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314079,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" instead of `default.mcp__verification__verification_echo`)","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314386,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" and returned `","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314386,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"tool unavailable: unknown tool`.","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314386,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" I","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314386,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" was","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314397,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" unable to","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314456,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" correct","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314515,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" the routing,","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314577,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" so no marker was ever","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314642,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" returned.\n\nNo marker to","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314706,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" report","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314770,"jsonrpc":"2.0","method":"item/delta","params":{"delta":".","field":"text","itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:42.21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314867,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"ee2ae138-5529-4ff3-b271-6f92065dcf0d","kind":"agentMessage","recordedAt":"2026-09-29T17:51:54.866963Z","revision":2,"status":"completed","text":"I could not retrieve the marker.\n\nI attempted to call `mcp__verification__verification_echo` with empty arguments `{}` multiple times, but each attempt was routed to the wrong tool identifier (`muse.verification_echo` instead of `default.mcp__verification__verification_echo`) and returned `tool unavailable: unknown tool`. I was unable to correct the routing, so no marker was ever returned.\n\nNo marker to report.","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"add1291a-31e0-4411-98be-80a35374254f","sequence":444},"last":{"id":"add1291a-31e0-4411-98be-80a35374254f","sequence":444},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:43"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314911,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":4299,"promptTokens":494183,"totalTokens":498482},"durationMs":3951,"modelId":"meta/muse-spark-1.3","promptTokens":31328,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"0423908e-828a-45cf-95f8-0fb29d65f6b6","sequence":447},"last":{"id":"0423908e-828a-45cf-95f8-0fb29d65f6b6","sequence":447},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"totalTokens":31497,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","usage":{"cacheReadTokens":8305,"cacheWriteTokens":0,"cachedTokens":8305,"inputTokens":31328,"outputTokens":169,"reasoningTokens":73},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:44"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314914,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"6b57a3c2-dcbd-490e-a2ed-56107a04c4ea","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":10,"itemId":"a757ea2c-e547-432b-a470-b71f7c83dcf4","kind":"reminderChild","recordedAt":"2026-09-29T17:51:54.91425Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee4b-5aaa-7ac1-a9bc-425cfedf8c15","turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1"},"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"a757ea2c-e547-432b-a470-b71f7c83dcf4","sequence":431},"last":{"id":"1cf76c07-17ff-4fef-9fdd-8324d008a71b","sequence":450},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:45"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314914,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"idle","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:46"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314915,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":92752,"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","sourceRange":{"first":{"id":"5bf0ae8a-ac86-437d-acf4-9e4cae7ca219","sequence":452},"last":{"id":"5bf0ae8a-ac86-437d-acf4-9e4cae7ca219","sequence":452},"stream":{"id":"01a0ee49-ff75-70e2-83fc-3169de40b80c","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":28541,"turnId":"01a0ee49-ffce-759b-a6f5-0a15a6623fa1","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:46"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704314916,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:50:22.069281Z","firstUserPrompt":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"idle","title":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","turnCount":1,"updatedAt":"2026-09-29T17:51:54.914491Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704315172,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:47"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704315172,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"notLoaded","viewCursor":"v:01a0ee49-ff75-70e2-83fc-3169de40b80c:47"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704315172,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:50:22.069281Z","firstUserPrompt":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee49-ff75-70e2-83fc-3169de40b80c/session.jsonl","providerId":"meta","sessionId":"01a0ee49-ff75-70e2-83fc-3169de40b80c","status":"notLoaded","title":"Call the tool mcp__verification__verification_echo with empty arguments {}, then reply with the marker it returns. This is a tool invocation test, do not use skills, shell, or subagents.","turnCount":1,"updatedAt":"2026-09-29T17:51:54.916673Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/multi-stage-approval.ndjson b/plugins/muse-provider/test/fixtures/multi-stage-approval.ndjson
new file mode 100644
index 0000000000..ddf84005c6
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/multi-stage-approval.ndjson
@@ -0,0 +1,51 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee4b-2759-73fd-a871-0d2558d2d5ba","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297906,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:51:37.827408Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:51:37.827412Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:51:37.827408Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:51:37.827412Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297912,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee4b-2759-73fd-a871-0d2558d2d5ba","mode":"onRequest","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","source":"approvalReconfigure","sourceRange":{"first":{"id":"460e980f-c22f-4173-945c-5b4e7aaf6125","sequence":5},"last":{"id":"460e980f-c22f-4173-945c-5b4e7aaf6125","sequence":5},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee4b-27b8-7039-abed-754eaf12122c","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","input":[{"type":"text","text":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297915,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"c8098940-10b7-466e-8314-07a94c85831b","sequence":15},"last":{"id":"c8098940-10b7-466e-8314-07a94c85831b","sequence":15},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee4b-27b8-7039-abed-754eaf12122c","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297924,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297925,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee4b-27b8-7039-abed-754eaf12122c","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"4c24b42f-4ccd-41e6-90b8-6c6940fde511","sequence":17},"last":{"id":"4c24b42f-4ccd-41e6-90b8-6c6940fde511","sequence":17},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297925,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee4b-27b8-7039-abed-754eaf12122c","itemId":"f654f052-0f13-4fcd-844d-a454f8dd7299","kind":"userMessage","recordedAt":"2026-09-29T17:51:37.916056Z","revision":1,"status":"completed","text":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"4c24b42f-4ccd-41e6-90b8-6c6940fde511","sequence":17},"last":{"id":"4c24b42f-4ccd-41e6-90b8-6c6940fde511","sequence":17},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297925,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"7d65b0ca-7775-4ff8-b346-7488f99e1672","fallbackText":"Reminder child session","generationId":1,"itemId":"e81fbc29-204f-4ee5-ae6d-d78b936637a3","kind":"reminderChild","recordedAt":"2026-09-29T17:51:37.924053Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4b-27c2-70b0-904b-1e139d270837","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"e81fbc29-204f-4ee5-ae6d-d78b936637a3","sequence":35},"last":{"id":"e81fbc29-204f-4ee5-ae6d-d78b936637a3","sequence":35},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704297929,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","createdAt":"2026-09-29T17:51:37.827408Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:51:37.924312Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300174,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":137,"promptTokens":38164,"totalTokens":38301},"durationMs":2246,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38164,"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"1ec4f1ac-a7ad-412e-ac6e-164b82f6684a","sequence":51},"last":{"id":"1ec4f1ac-a7ad-412e-ac6e-164b82f6684a","sequence":51},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"totalTokens":38301,"turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38164,"outputTokens":137,"reasoningTokens":36},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300176,"jsonrpc":"2.0","method":"session/statusChanged","params":{"attention":["approvalPending"],"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:7"}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","method":"approval/request","params":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"currentRequirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","judgeEscalated":false,"protectedWrite":false,"rawArgs":"{\"command\":\"wc -l f && rm -rf f && rm -rf g\",\"description\":\"Run wc and cleanup test files\"}","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"59dd6969-a7ba-404e-b8ec-e229e81ecc7c","sequence":56},"last":{"id":"59dd6969-a7ba-404e-b8ec-e229e81ecc7c","sequence":56},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f && rm -rf g","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":3},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3},{"argv":["rm","-rf","g"],"argvComplete":true,"position":3,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3}],"workspaceRoot":"/tmp/muse-phase0/repo"},"taskId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","toolCallId":"call_01a0ee4b2e44774096a3a731e986cd1f","toolName":"bash","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300178,"jsonrpc":"2.0","method":"approval/requested","params":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"currentRequirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","judgeEscalated":false,"protectedWrite":false,"rawArgs":"{\"command\":\"wc -l f && rm -rf f && rm -rf g\",\"description\":\"Run wc and cleanup test files\"}","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"59dd6969-a7ba-404e-b8ec-e229e81ecc7c","sequence":56},"last":{"id":"59dd6969-a7ba-404e-b8ec-e229e81ecc7c","sequence":56},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f && rm -rf g","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":3},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3},{"argv":["rm","-rf","g"],"argvComplete":true,"position":3,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3}],"workspaceRoot":"/tmp/muse-phase0/repo"},"taskId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","toolCallId":"call_01a0ee4b2e44774096a3a731e986cd1f","toolName":"bash","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:7"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"result":{}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300178,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","attention":["approvalPending"],"branch":"main","createdAt":"2026-09-29T17:51:37.824904Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","title":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","turnCount":0,"updatedAt":"2026-09-29T17:51:40.176687Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"approval/decide","params":{"commandId":"01a0ee4b-3092-742d-a166-2f6f2bdceef9","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"choiceId":"allow_once"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","commandId":"01a0ee4b-3092-742d-a166-2f6f2bdceef9","status":"accepted","terminal":false}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300188,"jsonrpc":"2.0","method":"approval/updated","params":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"change":{"choiceId":"allow_once","decision":"approved","kind":"stageResolved","requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1}},"currentRequirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"3b8c6655-54b5-4389-a77e-d8cefe86308e","sequence":59},"last":{"id":"3b8c6655-54b5-4389-a77e-d8cefe86308e","sequence":59},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f && rm -rf g","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":3},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"resolution":{"kind":"allowOnce"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3},{"argv":["rm","-rf","g"],"argvComplete":true,"position":3,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3}],"workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:8"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"approval/decide","params":{"commandId":"01a0ee4b-309c-765c-a4a7-3fbbe41fe0a7","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"choiceId":"allow_once"}}}
+{"dir":"in","msg":{"id":5,"jsonrpc":"2.0","result":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","commandId":"01a0ee4b-309c-765c-a4a7-3fbbe41fe0a7","status":"accepted","terminal":true}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300196,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300196,"jsonrpc":"2.0","method":"approval/updated","params":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"change":{"choiceId":"allow_once","decision":"approved","kind":"stageResolved","requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2}},"currentRequirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"cb3ab79b-cb07-4aa6-9c00-cbcc65718efd","sequence":62},"last":{"id":"cb3ab79b-cb07-4aa6-9c00-cbcc65718efd","sequence":62},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f && rm -rf g","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":3},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"resolution":{"kind":"allowOnce"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3},{"argv":["rm","-rf","g"],"argvComplete":true,"position":3,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"resolution":{"kind":"allowOnce"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":3}],"workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300196,"jsonrpc":"2.0","method":"approval/resolved","params":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","decidedByCommandId":"01a0ee4b-309c-765c-a4a7-3fbbe41fe0a7","decision":"approved","itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","policyResult":"allow","resolvedBy":"user","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"57af2582-82bd-4ab6-b653-c70027b2ba51","sequence":63},"last":{"id":"57af2582-82bd-4ab6-b653-c70027b2ba51","sequence":63},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"stageEvidence":[{"argv":["wc","-l","f"],"position":1,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":0},"resolution":{"kind":"knownSafe"},"totalStages":3},{"argv":["rm","-rf","f"],"position":2,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":1},"resolution":{"kind":"allowOnce"},"totalStages":3},{"argv":["rm","-rf","g"],"position":3,"requirementId":{"approvalId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sourceIndex":2},"resolution":{"kind":"allowOnce"},"totalStages":3}],"turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300196,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command\":\"wc -l f && rm -rf f && rm -rf g\",\"description\":\"Run wc and cleanup test files\"}","callId":"call_01a0ee4b2e44774096a3a731e986cd1f","itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","kind":"toolCall","recordedAt":"2026-09-29T17:51:40.192737Z","revision":1,"status":"inProgress","tool":"bash","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"7128a063-cea5-44c4-a53b-7e53758c4747","sequence":53},"last":{"id":"e8d3acc2-2993-4884-98f1-89ab7cb8a4cc","sequence":69},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300196,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","branch":"main","createdAt":"2026-09-29T17:51:37.824904Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"running","title":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","turnCount":0,"updatedAt":"2026-09-29T17:51:40.193007Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300391,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"2 f\n","field":"output","itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:11.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704300397,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command\":\"wc -l f && rm -rf f && rm -rf g\",\"description\":\"Run wc and cleanup test files\"}","callId":"call_01a0ee4b2e44774096a3a731e986cd1f","itemId":"01a0ee4b-308f-7722-bb35-4ae0f509511e","kind":"toolCall","recordedAt":"2026-09-29T17:51:40.396829Z","revision":2,"status":"completed","tool":"bash","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","visibleOutput":"2 f\n"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"7128a063-cea5-44c4-a53b-7e53758c4747","sequence":53},"last":{"id":"e72253f1-0717-4961-9be9-c0643d9003e8","sequence":75},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"3be55728-b271-422f-a970-e657d9ebc73d","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Ran","field":"text","itemId":"3be55728-b271-422f-a970-e657d9ebc73d","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `wc -l f && rm -rf f && rm -rf g`.\n\n","field":"text","itemId":"3be55728-b271-422f-a970-e657d9ebc73d","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Output: `2 f`, both","field":"text","itemId":"3be55728-b271-422f-a970-e657d9ebc73d","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" removed","field":"text","itemId":"3be55728-b271-422f-a970-e657d9ebc73d","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302664,"jsonrpc":"2.0","method":"item/delta","params":{"delta":".","field":"text","itemId":"3be55728-b271-422f-a970-e657d9ebc73d","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:12.6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302694,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"3be55728-b271-422f-a970-e657d9ebc73d","kind":"agentMessage","recordedAt":"2026-09-29T17:51:42.694349Z","revision":2,"status":"completed","text":"Ran `wc -l f && rm -rf f && rm -rf g`.\n\nOutput: `2 f`, both removed.","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"24aa0b7d-5900-44f3-ad7b-93a18f40589f","sequence":92},"last":{"id":"24aa0b7d-5900-44f3-ad7b-93a18f40589f","sequence":92},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302699,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":177,"promptTokens":76575,"totalTokens":76752},"durationMs":2294,"modelId":"meta/muse-spark-1.3","promptTokens":38411,"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"a9b82d76-fa61-4377-bb7c-7b4852fb16fa","sequence":95},"last":{"id":"a9b82d76-fa61-4377-bb7c-7b4852fb16fa","sequence":95},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"totalTokens":38451,"turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38411,"outputTokens":40,"reasoningTokens":4},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704302701,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"e9cd8200-3ae6-4c05-9b90-8fa93366624e","childSessionLogPath":"subagent/e9cd8200-3ae6-4c05-9b90-8fa93366624e/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"8c935164-2dd1-4e63-8c77-4000ae7cd25f","kind":"reminderChild","recordedAt":"2026-09-29T17:51:42.700899Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4b-3a6b-7150-9b36-5ca39c79d737","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"8c935164-2dd1-4e63-8c77-4000ae7cd25f","sequence":102},"last":{"id":"8c935164-2dd1-4e63-8c77-4000ae7cd25f","sequence":102},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305391,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"e9cd8200-3ae6-4c05-9b90-8fa93366624e","childSessionLogPath":"subagent/e9cd8200-3ae6-4c05-9b90-8fa93366624e/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"8c935164-2dd1-4e63-8c77-4000ae7cd25f","kind":"reminderChild","recordedAt":"2026-09-29T17:51:45.390996Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee4b-3a6b-7150-9b36-5ca39c79d737","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"8c935164-2dd1-4e63-8c77-4000ae7cd25f","sequence":102},"last":{"id":"b3961c2a-59cc-4473-98db-6bfe851ca172","sequence":104},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305394,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"7d65b0ca-7775-4ff8-b346-7488f99e1672","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"e81fbc29-204f-4ee5-ae6d-d78b936637a3","kind":"reminderChild","recordedAt":"2026-09-29T17:51:45.394425Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee4b-27c2-70b0-904b-1e139d270837","turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c"},"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"e81fbc29-204f-4ee5-ae6d-d78b936637a3","sequence":35},"last":{"id":"f618d1e6-652f-45ac-94ae-c3dd8c76dac4","sequence":108},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305394,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"idle","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305396,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":7478,"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"34e5421c-2ac8-46ab-9cee-51687d6949e7","sequence":110},"last":{"id":"34e5421c-2ac8-46ab-9cee-51687d6949e7","sequence":110},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":4748,"turnId":"01a0ee4b-27b8-7039-abed-754eaf12122c","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305396,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","sourceRange":{"first":{"id":"ce044ab1-0819-437c-a739-35308701504d","sequence":111},"last":{"id":"ce044ab1-0819-437c-a739-35308701504d","sequence":111},"stream":{"id":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:19","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305396,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:51:37.824904Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"idle","title":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","turnCount":1,"updatedAt":"2026-09-29T17:51:45.395824Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305609,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305609,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"notLoaded","viewCursor":"v:01a0ee4b-2760-76c3-823d-1923d8fa3eff:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704305609,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:51:37.824904Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4b-2760-76c3-823d-1923d8fa3eff/session.jsonl","providerId":"meta","sessionId":"01a0ee4b-2760-76c3-823d-1923d8fa3eff","status":"notLoaded","title":"Run exactly wc -l f && rm -rf f && rm -rf g using the shell tool. f and g are disposable test data and I authorize deleting both. Do not split the command into separate calls.","turnCount":1,"updatedAt":"2026-09-29T17:51:45.395824Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-cancel.ndjson b/plugins/muse-provider/test/fixtures/phase3-cancel.ndjson
new file mode 100644
index 0000000000..5fed9ccc67
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-cancel.ndjson
@@ -0,0 +1,31 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0eecd-a883-7830-adce-ff1d8f8ea6b1","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850653,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:14:10.573964Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:14:10.573968Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:14:10.573964Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:14:10.573968Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850660,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0eecd-a883-7830-adce-ff1d8f8ea6b1","mode":"onRequest","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","source":"approvalReconfigure","sourceRange":{"first":{"id":"44822cdb-f99b-4c51-86db-568779ec0b44","sequence":5},"last":{"id":"44822cdb-f99b-4c51-86db-568779ec0b44","sequence":5},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","input":[{"type":"text","text":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850662,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"dc59d641-9a9f-46a2-a12d-8f0e931e0972","sequence":14},"last":{"id":"dc59d641-9a9f-46a2-a12d-8f0e931e0972","sequence":14},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850672,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850673,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"3afafe68-4d1e-4763-92f3-454123fa0a72","sequence":16},"last":{"id":"3afafe68-4d1e-4763-92f3-454123fa0a72","sequence":16},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850673,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","itemId":"b2e58cf2-134d-474b-8600-70078f6eedf3","kind":"userMessage","recordedAt":"2026-09-29T20:14:10.663347Z","revision":1,"status":"completed","text":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153"},"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"3afafe68-4d1e-4763-92f3-454123fa0a72","sequence":16},"last":{"id":"3afafe68-4d1e-4763-92f3-454123fa0a72","sequence":16},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850673,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"a8641208-06ea-4877-9826-a02092d2640e","fallbackText":"Reminder child session","generationId":1,"itemId":"2d780bf0-60b4-43f9-bc3d-7bffee123ec8","kind":"reminderChild","recordedAt":"2026-09-29T20:14:10.672279Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eecd-a8ee-7590-89ef-6f7b9e6155c4","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153"},"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"2d780bf0-60b4-43f9-bc3d-7bffee123ec8","sequence":33},"last":{"id":"2d780bf0-60b4-43f9-bc3d-7bffee123ec8","sequence":33},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712850677,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","branch":"main","createdAt":"2026-09-29T20:14:10.571498Z","firstUserPrompt":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","title":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","turnCount":0,"updatedAt":"2026-09-29T20:14:10.672647Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875225,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":167,"promptTokens":36540,"totalTokens":36707},"durationMs":24548,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":36540,"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"86332ed8-48ab-4bd0-9dc8-2bc9048ddcc5","sequence":49},"last":{"id":"86332ed8-48ab-4bd0-9dc8-2bc9048ddcc5","sequence":49},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"totalTokens":36707,"turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":36540,"outputTokens":167,"reasoningTokens":51},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875227,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color do you select: Blue or Green?\"}]}","callId":"call_01a0eece06be75a0b6d67cebeb2b9607","itemId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","kind":"toolCall","recordedAt":"2026-09-29T20:14:35.226876Z","revision":1,"status":"inProgress","tool":"request_user_input","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153"},"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"bc82db8e-a87c-4a87-ac44-cc605fc702dd","sequence":51},"last":{"id":"d5ff571f-a1f1-476b-b17c-45b73203db4f","sequence":56},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875227,"jsonrpc":"2.0","method":"session/statusChanged","params":{"attention":["inputPending"],"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:8"}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","method":"userInput/request","params":{"itemId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","questions":[{"header":"Color","id":"color_choice","options":[{"label":"Blue"},{"label":"Green"}],"question":"Which color do you select: Blue or Green?","selection":{"mode":"single"}}],"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"7544bee6-8eb0-42d7-b328-43b48d21cdb8","sequence":57},"last":{"id":"7544bee6-8eb0-42d7-b328-43b48d21cdb8","sequence":57},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"toolCallId":"call_01a0eece06be75a0b6d67cebeb2b9607","toolName":"request_user_input","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","userInputId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875228,"jsonrpc":"2.0","method":"userInput/requested","params":{"itemId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","questions":[{"header":"Color","id":"color_choice","options":[{"label":"Blue"},{"label":"Green"}],"question":"Which color do you select: Blue or Green?","selection":{"mode":"single"}}],"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"7544bee6-8eb0-42d7-b328-43b48d21cdb8","sequence":57},"last":{"id":"7544bee6-8eb0-42d7-b328-43b48d21cdb8","sequence":57},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"toolCallId":"call_01a0eece06be75a0b6d67cebeb2b9607","toolName":"request_user_input","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","userInputId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875228,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","attention":["inputPending"],"branch":"main","createdAt":"2026-09-29T20:14:10.571498Z","firstUserPrompt":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","title":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","turnCount":0,"updatedAt":"2026-09-29T20:14:35.227142Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"result":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"userInput/cancel","params":{"commandId":"01a0eece-08dc-705e-a0ea-94e1f0efa859","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","userInputId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","reason":"QA cancellation"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0eece-08dc-705e-a0ea-94e1f0efa859","status":"accepted","userInputId":"01a0eece-08d9-7463-8bf5-d84cd55598f2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875229,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875230,"jsonrpc":"2.0","method":"userInput/settled","params":{"answers":[],"clarification":null,"decidedByCommandId":"01a0eece-08dc-705e-a0ea-94e1f0efa859","outcome":"cancelled","reason":"QA cancellation","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"83449feb-1427-429a-9e18-74f39d5cc149","sequence":60},"last":{"id":"83449feb-1427-429a-9e18-74f39d5cc149","sequence":60},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"userInputId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875230,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color do you select: Blue or Green?\"}]}","callId":"call_01a0eece06be75a0b6d67cebeb2b9607","itemId":"01a0eece-08d9-7463-8bf5-d84cd55598f2","kind":"toolCall","recordedAt":"2026-09-29T20:14:35.229783Z","revision":2,"status":"completed","tool":"request_user_input","turnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","visibleOutput":"{\"status\":\"cancelled\",\"answers\":[],\"reason\":\"QA cancellation\"}"},"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","sourceRange":{"first":{"id":"bc82db8e-a87c-4a87-ac44-cc605fc702dd","sequence":51},"last":{"id":"06584058-aaa8-49b0-bf90-e4b7baa4b10c","sequence":62},"stream":{"id":"01a0eecd-a88b-7333-84c0-993881d2aa89","kind":"session"}},"viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712875235,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eecd-a8e4-7d6a-a9b7-e007fc955153","branch":"main","createdAt":"2026-09-29T20:14:10.571498Z","firstUserPrompt":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"running","title":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","turnCount":0,"updatedAt":"2026-09-29T20:14:35.229783Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790712910489,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712910489,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"notLoaded","viewCursor":"v:01a0eecd-a88b-7333-84c0-993881d2aa89:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712910489,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:14:10.571498Z","firstUserPrompt":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eecd-a88b-7333-84c0-993881d2aa89/session.jsonl","providerId":"meta","sessionId":"01a0eecd-a88b-7333-84c0-993881d2aa89","status":"notLoaded","title":"Use request_user_input to ask me to select Blue or Green. Do not use other tools and do not infer an answer.","turnCount":0,"updatedAt":"2026-09-29T20:14:35.235291Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-child-read.ndjson b/plugins/muse-provider/test/fixtures/phase3-child-read.ndjson
new file mode 100644
index 0000000000..1bb2732c1d
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-child-read.ndjson
@@ -0,0 +1,7 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/read","params":{"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":null,"mode":"none","noneReason":"excluded","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"branch":"main","createdAt":"2026-09-29T17:47:37.897732Z","firstUserPrompt":"Role: phase0-check Objective: Reply with exactly SUBAGENT_PHASE0_OK. Do not use any tools. Just reply that string.","forkedFrom":null,"lastActivityAt":"2026-09-29T17:47:39.949596Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/subagent/01a0ee47-7e29-7103-97c7-cdde44e26fe8/session.jsonl","providerId":"meta","sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","status":"notLoaded","title":"Role: phase0-check Objective: Reply with exactly SUBAGENT_PHASE0_OK. Do not use any tools. Just reply that string.","turnCount":1,"updatedAt":"2026-09-29T17:47:39.950625Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:6"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"view/page","params":{"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","limit":1000}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"events":[{"method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"5f339f80-f22c-4e3b-93ac-3606f20ff8c3","sequence":8},"last":{"id":"5f339f80-f22c-4e3b-93ac-3606f20ff8c3","sequence":8},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:1","workspaceRoot":"/tmp/muse-phase0/repo"}},{"method":"turn/started","params":{"commandId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"d3ad0f6f-f6e9-4424-aa28-f0d8c0ad7c1c","sequence":12},"last":{"id":"d3ad0f6f-f6e9-4424-aa28-f0d8c0ad7c1c","sequence":12},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"turnId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:2"}},{"method":"item/completed","params":{"item":{"commandId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","itemId":"1760316b-a42f-4a78-85ac-3adfe53e8b38","kind":"userMessage","recordedAt":"2026-09-29T17:47:37.899528Z","revision":1,"status":"completed","text":"Role: phase0-check\nObjective: Reply with exactly SUBAGENT_PHASE0_OK. Do not use any tools. Just reply that string.","turnId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8"},"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"d3ad0f6f-f6e9-4424-aa28-f0d8c0ad7c1c","sequence":12},"last":{"id":"d3ad0f6f-f6e9-4424-aa28-f0d8c0ad7c1c","sequence":12},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:3"}},{"method":"item/completed","params":{"item":{"itemId":"6ce6a79f-6af5-4cdb-a863-b19c74286aa3","kind":"agentMessage","recordedAt":"2026-09-29T17:47:39.943222Z","revision":1,"status":"completed","text":"SUBAGENT_PHASE0_OK","turnId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8"},"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"c74d30ea-603d-4b05-8ae3-82a5f6a8b47a","sequence":36},"last":{"id":"c74d30ea-603d-4b05-8ae3-82a5f6a8b47a","sequence":36},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:4"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":36,"promptTokens":31337,"totalTokens":31373},"durationMs":2047,"modelId":"meta/muse-spark-1.3","promptTokens":31337,"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"db0f2008-7cb6-4a37-aedd-777a37cf1f41","sequence":39},"last":{"id":"db0f2008-7cb6-4a37-aedd-777a37cf1f41","sequence":39},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"totalTokens":31373,"turnId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":31337,"outputTokens":36,"reasoningTokens":20},"viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:5"}},{"method":"turn/completed","params":{"durationMs":2050,"sessionId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","sourceRange":{"first":{"id":"79df4b8a-1e6f-4e38-8f34-01f116927adf","sequence":41},"last":{"id":"79df4b8a-1e6f-4e38-8f34-01f116927adf","sequence":41},"stream":{"id":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":2018,"turnId":"01a0ee47-7e29-7103-97c7-cdde44e26fe8","viewCursor":"v:01a0ee47-7e29-7103-97c7-cdde44e26fe8:6"}}],"nextCursor":null}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-compact-history.ndjson b/plugins/muse-provider/test/fixtures/phase3-compact-history.ndjson
new file mode 100644
index 0000000000..86de887df8
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-compact-history.ndjson
@@ -0,0 +1,13 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase3/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0eee8-fae8-7b30-ab54-9a5eb6d83491","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714641328,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","sourceRange":{"first":{"id":"9e0ef8f8-7a4a-4b21-ba3a-f0a34af844b9","sequence":178},"last":{"id":"9e0ef8f8-7a4a-4b21-ba3a-f0a34af844b9","sequence":178},"stream":{"id":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:30","workspaceRoot":"/tmp/muse-phase3/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":[{"commandId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d","itemId":"018736bd-6ef4-4a90-8784-f75918ac74c4","kind":"userMessage","recordedAt":"2026-09-29T20:41:55.260364Z","revision":1,"status":"completed","text":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"childSessionId":"adc2fe81-1263-4f62-846b-47267e5d1591","fallbackText":"Reminder child session","generationId":1,"itemId":"45902972-48c6-4da7-9019-8af83825b551","kind":"reminderChild","recordedAt":"2026-09-29T20:42:01.025403Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eee7-0f54-7ae2-ad05-f22b86f5256f","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"itemId":"091ca85e-6153-42ff-8e44-c56c295ddc75","kind":"agentMessage","recordedAt":"2026-09-29T20:41:57.783628Z","revision":2,"status":"completed","text":"MUSE_COMPACT_HISTORY_REAL","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"childSessionId":"f0f0256b-db45-4c3e-a1c2-edcec00cb705","fallbackText":"Reminder child session","generationId":1,"itemId":"aa164dc8-fc46-4a2e-8db1-b2cd28187599","kind":"reminderChild","recordedAt":"2026-09-29T20:42:01.026043Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-1924-71b0-b7ff-0952848a9adf","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"commandId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb","itemId":"de385f48-c241-4835-8624-a5b48f706fe1","kind":"userMessage","recordedAt":"2026-09-29T20:42:01.042602Z","revision":1,"status":"completed","text":"In four sentences describe why retained conversation history matters. Use no tools.","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"childSessionId":"08859aaa-8345-4989-89ba-7ccfd008b019","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"ab7cec1a-ddee-4860-84db-0e4259c3b21b","kind":"reminderChild","recordedAt":"2026-09-29T20:42:10.739873Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eee7-2687-7422-91ee-ed94b7c22aa7","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"itemId":"7cdac6d0-a6d7-4f09-86ba-66fbe1303701","kind":"agentMessage","recordedAt":"2026-09-29T20:42:05.447936Z","revision":2,"status":"completed","text":"Retained conversation history preserves context across turns, allowing continuity without restating prior decisions. It enables correction of earlier misunderstandings and consistent application of constraints. It also supports accountability by recording what was requested and decided. Without it, work risks duplication, inconsistency, and loss of user intent.","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"childSessionId":"23291d32-72c0-4f41-b444-a1c0ecb4230e","fallbackText":"Reminder child session","generationId":1,"itemId":"6747c860-107a-4dc1-8989-6cad7b385929","kind":"reminderChild","recordedAt":"2026-09-29T20:42:10.728471Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-3719-7b62-adc7-6ea9d766d0dd","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"commandId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3","itemId":"5d6e5914-101c-480e-831b-db49697f1b67","kind":"userMessage","recordedAt":"2026-09-29T20:42:10.760294Z","revision":1,"status":"completed","text":"Recall the initial marker and explain idempotent revisions in three sentences. Use no tools.","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"childSessionId":"abfb0eb0-f1ba-41b8-adc1-4f6c6a9e249e","fallbackText":"Reminder child session","generationId":1,"itemId":"75545912-10b8-44fb-bffa-d778792b01f5","kind":"reminderChild","recordedAt":"2026-09-29T20:42:14.03744Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eee7-4c62-7831-8a4b-e2a705149ae7","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"itemId":"8b50acd1-7be9-4667-bcf6-15acfa30ba4f","kind":"agentMessage","recordedAt":"2026-09-29T20:42:14.012622Z","revision":2,"status":"completed","text":"The initial marker was MUSE_COMPACT_HISTORY_REAL. Idempotent revisions produce the same final state when applied multiple times. This property makes retries safe and simplifies recovery from partial failures.","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"childSessionId":"9a916726-ea5e-43fe-a568-a49abebab1d2","fallbackText":"Reminder child session","generationId":1,"itemId":"a516f7a0-13e1-4d1a-988c-d012197062d4","kind":"reminderChild","recordedAt":"2026-09-29T20:42:19.813083Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-5895-7201-9330-93b3861ec631","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"}],"mode":"inline","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T20:41:55.106636Z","firstUserPrompt":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","forkedFrom":null,"lastActivityAt":"2026-09-29T20:42:19.813706Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eee7-0ea2-75f1-a4d0-e561e981dab2/session.jsonl","providerId":"meta","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"idle","title":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnCount":3,"updatedAt":"2026-09-29T20:44:01.188729Z","workspaceRoot":"/tmp/muse-phase3/repo"},"viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:30"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"model/list","params":{"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"models":[{"contextLimit":null,"cost":null,"defaultReasoningEffort":"high","description":null,"displayLabel":"meta/muse-spark-1.3","isActive":true,"isDefault":false,"modelId":"meta/muse-spark-1.3","outputLimit":null,"profileId":null,"providerId":"meta","reasoningEffortVariants":[],"releaseDate":null,"variants":["minimal","low","medium","high","xhigh"]}],"profileId":"tbh","providerId":"meta","source":"bundledCatalog"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"session/compact","params":{"commandId":"01a0eee8-fbf9-74d6-a0f0-12ca5298334d","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"error":{"code":-32030,"data":{"commandId":"01a0eee8-fbf9-74d6-a0f0-12ca5298334d","kind":"commandRejected","reason":"compaction_unavailable","retryable":false},"message":"session/compact command 01a0eee8-fbf9-74d6-a0f0-12ca5298334d rejected: compaction_unavailable"},"id":4,"jsonrpc":"2.0"}}
+{"dir":"in","msg":{"emittedAtMs":1790714641411,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:30"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714641411,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"notLoaded","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:30"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714641411,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:41:55.106636Z","firstUserPrompt":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eee7-0ea2-75f1-a4d0-e561e981dab2/session.jsonl","providerId":"meta","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"notLoaded","title":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnCount":3,"updatedAt":"2026-09-29T20:44:01.401464Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-compact-limit.ndjson b/plugins/muse-provider/test/fixtures/phase3-compact-limit.ndjson
new file mode 100644
index 0000000000..ae32fd4b08
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-compact-limit.ndjson
@@ -0,0 +1,15 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase3/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0eee8-fca9-7eae-ac3e-e8a153645684","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714641689,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","sourceRange":{"first":{"id":"77a82c63-4a9e-47cf-9d09-6486ccb966a8","sequence":183},"last":{"id":"77a82c63-4a9e-47cf-9d09-6486ccb966a8","sequence":183},"stream":{"id":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:31","workspaceRoot":"/tmp/muse-phase3/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":[{"commandId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d","itemId":"018736bd-6ef4-4a90-8784-f75918ac74c4","kind":"userMessage","recordedAt":"2026-09-29T20:41:55.260364Z","revision":1,"status":"completed","text":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"childSessionId":"adc2fe81-1263-4f62-846b-47267e5d1591","fallbackText":"Reminder child session","generationId":1,"itemId":"45902972-48c6-4da7-9019-8af83825b551","kind":"reminderChild","recordedAt":"2026-09-29T20:42:01.025403Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eee7-0f54-7ae2-ad05-f22b86f5256f","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"itemId":"091ca85e-6153-42ff-8e44-c56c295ddc75","kind":"agentMessage","recordedAt":"2026-09-29T20:41:57.783628Z","revision":2,"status":"completed","text":"MUSE_COMPACT_HISTORY_REAL","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"childSessionId":"f0f0256b-db45-4c3e-a1c2-edcec00cb705","fallbackText":"Reminder child session","generationId":1,"itemId":"aa164dc8-fc46-4a2e-8db1-b2cd28187599","kind":"reminderChild","recordedAt":"2026-09-29T20:42:01.026043Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-1924-71b0-b7ff-0952848a9adf","turnId":"01a0eee7-0f2b-79c2-aac5-b7e25b191c0d"},{"commandId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb","itemId":"de385f48-c241-4835-8624-a5b48f706fe1","kind":"userMessage","recordedAt":"2026-09-29T20:42:01.042602Z","revision":1,"status":"completed","text":"In four sentences describe why retained conversation history matters. Use no tools.","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"childSessionId":"08859aaa-8345-4989-89ba-7ccfd008b019","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"ab7cec1a-ddee-4860-84db-0e4259c3b21b","kind":"reminderChild","recordedAt":"2026-09-29T20:42:10.739873Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eee7-2687-7422-91ee-ed94b7c22aa7","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"itemId":"7cdac6d0-a6d7-4f09-86ba-66fbe1303701","kind":"agentMessage","recordedAt":"2026-09-29T20:42:05.447936Z","revision":2,"status":"completed","text":"Retained conversation history preserves context across turns, allowing continuity without restating prior decisions. It enables correction of earlier misunderstandings and consistent application of constraints. It also supports accountability by recording what was requested and decided. Without it, work risks duplication, inconsistency, and loss of user intent.","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"childSessionId":"23291d32-72c0-4f41-b444-a1c0ecb4230e","fallbackText":"Reminder child session","generationId":1,"itemId":"6747c860-107a-4dc1-8989-6cad7b385929","kind":"reminderChild","recordedAt":"2026-09-29T20:42:10.728471Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-3719-7b62-adc7-6ea9d766d0dd","turnId":"01a0eee7-25c6-79dd-abcb-de6a6dcb28cb"},{"commandId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3","itemId":"5d6e5914-101c-480e-831b-db49697f1b67","kind":"userMessage","recordedAt":"2026-09-29T20:42:10.760294Z","revision":1,"status":"completed","text":"Recall the initial marker and explain idempotent revisions in three sentences. Use no tools.","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"childSessionId":"abfb0eb0-f1ba-41b8-adc1-4f6c6a9e249e","fallbackText":"Reminder child session","generationId":1,"itemId":"75545912-10b8-44fb-bffa-d778792b01f5","kind":"reminderChild","recordedAt":"2026-09-29T20:42:14.03744Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eee7-4c62-7831-8a4b-e2a705149ae7","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"itemId":"8b50acd1-7be9-4667-bcf6-15acfa30ba4f","kind":"agentMessage","recordedAt":"2026-09-29T20:42:14.012622Z","revision":2,"status":"completed","text":"The initial marker was MUSE_COMPACT_HISTORY_REAL. Idempotent revisions produce the same final state when applied multiple times. This property makes retries safe and simplifies recovery from partial failures.","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},{"childSessionId":"9a916726-ea5e-43fe-a568-a49abebab1d2","fallbackText":"Reminder child session","generationId":1,"itemId":"a516f7a0-13e1-4d1a-988c-d012197062d4","kind":"reminderChild","recordedAt":"2026-09-29T20:42:19.813083Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eee7-5895-7201-9330-93b3861ec631","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"}],"mode":"inline","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T20:41:55.106636Z","firstUserPrompt":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","forkedFrom":null,"lastActivityAt":"2026-09-29T20:42:19.813706Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eee7-0ea2-75f1-a4d0-e561e981dab2/session.jsonl","providerId":"meta","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"idle","title":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnCount":3,"updatedAt":"2026-09-29T20:44:01.597894Z","workspaceRoot":"/tmp/muse-phase3/repo"},"viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:31"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"model/list","params":{"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"models":[{"contextLimit":null,"cost":null,"defaultReasoningEffort":"high","description":null,"displayLabel":"meta/muse-spark-1.3","isActive":true,"isDefault":false,"modelId":"meta/muse-spark-1.3","outputLimit":null,"profileId":null,"providerId":"meta","reasoningEffortVariants":[],"releaseDate":null,"variants":["minimal","low","medium","high","xhigh"]}],"profileId":"tbh","providerId":"meta","source":"bundledCatalog"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"session/compact","params":{"commandId":"01a0eee8-fd71-7a89-a101-56b49f8cfc15","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0eee8-fd71-7a89-a101-56b49f8cfc15","status":"accepted"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714661096,"jsonrpc":"2.0","method":"item/started","params":{"item":{"fallbackText":"Context compaction","itemId":"ef9795b0-bda5-4aa1-ae0e-eaf3a9b2cdd3","kind":"compaction","recordedAt":"2026-09-29T20:44:21.096466Z","revision":1,"status":"inProgress","tokensBefore":22192,"trigger":"manual","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","sourceRange":{"first":{"id":"ef9795b0-bda5-4aa1-ae0e-eaf3a9b2cdd3","sequence":200},"last":{"id":"ef9795b0-bda5-4aa1-ae0e-eaf3a9b2cdd3","sequence":200},"stream":{"id":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","kind":"session"}},"viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:32"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714661096,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"fallbackText":"Context compaction","itemId":"ef9795b0-bda5-4aa1-ae0e-eaf3a9b2cdd3","kind":"compaction","outcome":"compacted","recordedAt":"2026-09-29T20:44:21.096576Z","revision":2,"status":"completed","strategyId":"summary-preserved-suffix/v1","summarizedThrough":"run:01a0eee7-4bc3-7420-a663-157a7ea0eac3:seq:21","tokensAfter":21322,"tokensBefore":22192,"trigger":"manual","turnId":"01a0eee7-4bc3-7420-a663-157a7ea0eac3"},"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","sourceRange":{"first":{"id":"ef9795b0-bda5-4aa1-ae0e-eaf3a9b2cdd3","sequence":200},"last":{"id":"02a190e3-cfbf-4e74-af80-9dce51f83187","sequence":201},"stream":{"id":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","kind":"session"}},"viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714661116,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714661116,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"notLoaded","viewCursor":"v:01a0eee7-0ea2-75f1-a4d0-e561e981dab2:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790714661116,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:41:55.106636Z","firstUserPrompt":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eee7-0ea2-75f1-a4d0-e561e981dab2/session.jsonl","providerId":"meta","sessionId":"01a0eee7-0ea2-75f1-a4d0-e561e981dab2","status":"notLoaded","title":"Remember MUSE_COMPACT_HISTORY_REAL. Reply with the marker only.","turnCount":3,"updatedAt":"2026-09-29T20:44:21.096576Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-compact.ndjson b/plugins/muse-provider/test/fixtures/phase3-compact.ndjson
new file mode 100644
index 0000000000..090217a17b
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-compact.ndjson
@@ -0,0 +1,11 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0eec8-6d41-7072-aef7-5a43e3e9d4f3","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712507811,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"a5a6c352-8740-487f-8c6a-e6bf0063a7a9","sequence":133},"last":{"id":"a5a6c352-8740-487f-8c6a-e6bf0063a7a9","sequence":133},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:22","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":[{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","itemId":"38d5182a-7782-429b-83e7-7abbf478b742","kind":"userMessage","recordedAt":"2026-09-29T20:03:51.040894Z","revision":1,"status":"completed","text":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},{"childSessionId":"ea994a51-a77f-4052-85d7-50112251cccb","failureReason":"main run cancelled","fallbackText":"Reminder child session","generationId":1,"itemId":"b64f0073-af31-4829-82a0-daeb601a87e9","kind":"reminderChild","recordedAt":"2026-09-29T20:05:44.307979Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eec4-3488-7911-aa2c-46f3d9929027","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},{"args":"{\"todos\":[{\"status\":\"in_progress\",\"text\":\"inspect f\"},{\"status\":\"pending\",\"text\":\"report\"}]}","callId":"call_01a0eec4e0b576aabeae2e104585722e","itemId":"01a0eec4-e2b8-72c3-9a10-5c710d5b666f","kind":"toolCall","recordedAt":"2026-09-29T20:04:35.642482Z","revision":2,"status":"completed","tool":"write_todos","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"items\":2,\"ok\":true,\"revision\":1}"},{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color should I proceed with, Blue or Green?\"}]}","callId":"call_01a0eec5357571379191c94326ef7ab8","itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","kind":"toolCall","recordedAt":"2026-09-29T20:04:57.624274Z","revision":2,"status":"completed","tool":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"status\":\"answered\",\"answers\":[{\"id\":\"color_choice\",\"selected_label\":\"Blue\"}]}"},{"itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","kind":"agentMessage","recordedAt":"2026-09-29T20:05:15.287526Z","revision":2,"status":"completed","text":"You chose Blue.\n\nTodos created: inspect f (in progress), report (pending). Awaiting direction to proceed.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},{"childSessionId":"cf7f87cb-f82a-441e-b840-b89cfdc03e18","childSessionLogPath":"subagent/cf7f87cb-f82a-441e-b840-b89cfdc03e18/session.jsonl","failureReason":"main run cancelled","fallbackText":"Reminder child session","generationId":1,"itemId":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","kind":"reminderChild","recordedAt":"2026-09-29T20:05:44.308134Z","reminderAgentId":"verify-reminder","revision":2,"status":"cancelled","taskId":"01a0eec5-7d9c-7f61-b098-af5f30813223","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"}],"mode":"inline","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"lastActivityAt":"2026-09-29T20:05:44.308362Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"idle","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":1,"updatedAt":"2026-09-29T20:08:27.729097Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:22"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"session/compact","params":{"commandId":"01a0eec8-7193-752f-a80c-afb8c437efab","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e"}}}
+{"dir":"in","msg":{"error":{"code":-32030,"data":{"commandId":"01a0eec8-7193-752f-a80c-afb8c437efab","kind":"commandRejected","reason":"compaction_unavailable","retryable":false},"message":"session/compact command 01a0eec8-7193-752f-a80c-afb8c437efab rejected: compaction_unavailable"},"id":3,"jsonrpc":"2.0"}}
+{"dir":"in","msg":{"emittedAtMs":1790712568834,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712568834,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"notLoaded","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712568834,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"notLoaded","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":1,"updatedAt":"2026-09-29T20:08:28.819534Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-controls.ndjson b/plugins/muse-provider/test/fixtures/phase3-controls.ndjson
new file mode 100644
index 0000000000..21d1e56179
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-controls.ndjson
@@ -0,0 +1,51 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0eec4-3418-78cd-a424-b9e3a0c0eccc","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231029,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:03:50.947404Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:03:50.947408Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:03:50.947404Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:03:50.947408Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231037,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0eec4-3418-78cd-a424-b9e3a0c0eccc","mode":"onRequest","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","source":"approvalReconfigure","sourceRange":{"first":{"id":"88f93a5e-cb0a-486c-b9ee-dd11131d68fc","sequence":5},"last":{"id":"88f93a5e-cb0a-486c-b9ee-dd11131d68fc","sequence":5},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","input":[{"type":"text","text":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231040,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"0b878e43-4718-46d0-97e3-6f8277789f2f","sequence":15},"last":{"id":"0b878e43-4718-46d0-97e3-6f8277789f2f","sequence":15},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231049,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231050,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"last":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231050,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","itemId":"38d5182a-7782-429b-83e7-7abbf478b742","kind":"userMessage","recordedAt":"2026-09-29T20:03:51.040894Z","revision":1,"status":"completed","text":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"last":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231050,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"ea994a51-a77f-4052-85d7-50112251cccb","fallbackText":"Reminder child session","generationId":1,"itemId":"b64f0073-af31-4829-82a0-daeb601a87e9","kind":"reminderChild","recordedAt":"2026-09-29T20:03:51.049851Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eec4-3488-7911-aa2c-46f3d9929027","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"b64f0073-af31-4829-82a0-daeb601a87e9","sequence":35},"last":{"id":"b64f0073-af31-4829-82a0-daeb601a87e9","sequence":35},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712231055,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","createdAt":"2026-09-29T20:03:50.947404Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","turnCount":0,"updatedAt":"2026-09-29T20:03:51.050123Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790712275639,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":233,"promptTokens":38162,"totalTokens":38395},"durationMs":44585,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38162,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"5d39893f-b7e3-495d-95e5-cf325a813ee3","sequence":51},"last":{"id":"5d39893f-b7e3-495d-95e5-cf325a813ee3","sequence":51},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38395,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38162,"outputTokens":233,"reasoningTokens":129},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712275641,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"todos\":[{\"status\":\"in_progress\",\"text\":\"inspect f\"},{\"status\":\"pending\",\"text\":\"report\"}]}","callId":"call_01a0eec4e0b576aabeae2e104585722e","itemId":"01a0eec4-e2b8-72c3-9a10-5c710d5b666f","kind":"toolCall","recordedAt":"2026-09-29T20:04:35.641535Z","revision":1,"status":"inProgress","tool":"write_todos","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"15effe29-72a7-490e-8724-cece71174573","sequence":53},"last":{"id":"3b4efa42-5403-4efa-8354-f83a360912ce","sequence":58},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712275642,"jsonrpc":"2.0","method":"session/todoListChanged","params":{"items":[{"status":"inProgress","text":"inspect f"},{"status":"pending","text":"report"}],"revision":1,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"bdffd683-b042-4196-a976-5c1435f7162c","sequence":59},"last":{"id":"bdffd683-b042-4196-a976-5c1435f7162c","sequence":59},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"sourceTool":"write_todos","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712275642,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"todos\":[{\"status\":\"in_progress\",\"text\":\"inspect f\"},{\"status\":\"pending\",\"text\":\"report\"}]}","callId":"call_01a0eec4e0b576aabeae2e104585722e","itemId":"01a0eec4-e2b8-72c3-9a10-5c710d5b666f","kind":"toolCall","recordedAt":"2026-09-29T20:04:35.642482Z","revision":2,"status":"completed","tool":"write_todos","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"items\":2,\"ok\":true,\"revision\":1}"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"15effe29-72a7-490e-8724-cece71174573","sequence":53},"last":{"id":"fe541d1f-abb8-45f7-a2b0-cf7dbdfd69a1","sequence":61},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297619,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":402,"promptTokens":76600,"totalTokens":77002},"durationMs":21970,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38438,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"4674331a-f993-458b-b6aa-e36cc160f2d7","sequence":80},"last":{"id":"4674331a-f993-458b-b6aa-e36cc160f2d7","sequence":80},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38607,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38438,"outputTokens":169,"reasoningTokens":67},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297621,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color should I proceed with, Blue or Green?\"}]}","callId":"call_01a0eec5357571379191c94326ef7ab8","itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","kind":"toolCall","recordedAt":"2026-09-29T20:04:57.621217Z","revision":1,"status":"inProgress","tool":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"2ff469cc-5f3f-44dc-a7ac-1f8f8d8e0409","sequence":82},"last":{"id":"78484e0f-7d0b-48be-8b70-606cf6a718aa","sequence":87},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297621,"jsonrpc":"2.0","method":"session/statusChanged","params":{"attention":["inputPending"],"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:12"}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","method":"userInput/request","params":{"itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","questions":[{"header":"Color","id":"color_choice","options":[{"label":"Blue"},{"label":"Green"}],"question":"Which color should I proceed with, Blue or Green?","selection":{"mode":"single"}}],"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"last":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"toolCallId":"call_01a0eec5357571379191c94326ef7ab8","toolName":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297622,"jsonrpc":"2.0","method":"userInput/requested","params":{"itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","questions":[{"header":"Color","id":"color_choice","options":[{"label":"Blue"},{"label":"Green"}],"question":"Which color should I proceed with, Blue or Green?","selection":{"mode":"single"}}],"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"last":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"toolCallId":"call_01a0eec5357571379191c94326ef7ab8","toolName":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:12"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"result":{}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297622,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","attention":["inputPending"],"branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":0,"updatedAt":"2026-09-29T20:04:57.621488Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"userInput/answer","params":{"commandId":"01a0eec5-3897-757d-af17-a34de5a1cfe4","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","answers":[{"questionId":"color_choice","selectedLabel":"Blue"}]}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0eec5-3897-757d-af17-a34de5a1cfe4","status":"accepted","userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297624,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297624,"jsonrpc":"2.0","method":"userInput/settled","params":{"answers":[{"questionId":"color_choice","selectedLabel":"Blue"}],"clarification":null,"decidedByCommandId":"01a0eec5-3897-757d-af17-a34de5a1cfe4","outcome":"answered","reason":null,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"909310e9-7253-4b4c-963e-2f46628f1aae","sequence":91},"last":{"id":"909310e9-7253-4b4c-963e-2f46628f1aae","sequence":91},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297624,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color should I proceed with, Blue or Green?\"}]}","callId":"call_01a0eec5357571379191c94326ef7ab8","itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","kind":"toolCall","recordedAt":"2026-09-29T20:04:57.624274Z","revision":2,"status":"completed","tool":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"status\":\"answered\",\"answers\":[{\"id\":\"color_choice\",\"selected_label\":\"Blue\"}]}"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"2ff469cc-5f3f-44dc-a7ac-1f8f8d8e0409","sequence":82},"last":{"id":"b7264ba7-6895-475a-a4b8-56bed8767e35","sequence":93},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712297630,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":0,"updatedAt":"2026-09-29T20:04:57.624274Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315201,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315201,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"You","field":"text","itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315201,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" chose Blue.\n\nTodos created: inspect f (","field":"text","itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315201,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"in progress), report (pending). Awaiting direction","field":"text","itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315201,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" to proceed.","field":"text","itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315287,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","kind":"agentMessage","recordedAt":"2026-09-29T20:05:15.287526Z","revision":2,"status":"completed","text":"You chose Blue.\n\nTodos created: inspect f (in progress), report (pending). Awaiting direction to proceed.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"6834f18d-2fc1-4a06-8a21-bfb486bd0338","sequence":110},"last":{"id":"6834f18d-2fc1-4a06-8a21-bfb486bd0338","sequence":110},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315292,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":525,"promptTokens":115255,"totalTokens":115780},"durationMs":17661,"modelId":"meta/muse-spark-1.3","promptTokens":38655,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"a5633a10-4fb0-4873-b47d-4d558bd3c4e5","sequence":113},"last":{"id":"a5633a10-4fb0-4873-b47d-4d558bd3c4e5","sequence":113},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38778,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":38385,"cacheWriteTokens":0,"cachedTokens":38385,"inputTokens":38655,"outputTokens":123,"reasoningTokens":90},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712315294,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"cf7f87cb-f82a-441e-b840-b89cfdc03e18","childSessionLogPath":"subagent/cf7f87cb-f82a-441e-b840-b89cfdc03e18/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","kind":"reminderChild","recordedAt":"2026-09-29T20:05:15.294057Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eec5-7d9c-7f61-b098-af5f30813223","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","sequence":120},"last":{"id":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","sequence":120},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:17"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"view/page","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","limit":1000}}}
+{"dir":"in","msg":{"id":5,"jsonrpc":"2.0","result":{"events":[{"method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0eec4-3418-78cd-a424-b9e3a0c0eccc","mode":"onRequest","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","source":"approvalReconfigure","sourceRange":{"first":{"id":"88f93a5e-cb0a-486c-b9ee-dd11131d68fc","sequence":5},"last":{"id":"88f93a5e-cb0a-486c-b9ee-dd11131d68fc","sequence":5},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:1"}},{"method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"0b878e43-4718-46d0-97e3-6f8277789f2f","sequence":15},"last":{"id":"0b878e43-4718-46d0-97e3-6f8277789f2f","sequence":15},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:2","workspaceRoot":"/tmp/muse-phase0/repo"}},{"method":"turn/started","params":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"last":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:3"}},{"method":"item/completed","params":{"item":{"commandId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","itemId":"38d5182a-7782-429b-83e7-7abbf478b742","kind":"userMessage","recordedAt":"2026-09-29T20:03:51.040894Z","revision":1,"status":"completed","text":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"last":{"id":"8e541f7e-88da-4639-be2d-3e83a2c56a7b","sequence":17},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:4"}},{"method":"item/started","params":{"item":{"childSessionId":"ea994a51-a77f-4052-85d7-50112251cccb","fallbackText":"Reminder child session","generationId":1,"itemId":"b64f0073-af31-4829-82a0-daeb601a87e9","kind":"reminderChild","recordedAt":"2026-09-29T20:03:51.049851Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eec4-3488-7911-aa2c-46f3d9929027","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"b64f0073-af31-4829-82a0-daeb601a87e9","sequence":35},"last":{"id":"b64f0073-af31-4829-82a0-daeb601a87e9","sequence":35},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:5"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":233,"promptTokens":38162,"totalTokens":38395},"durationMs":44585,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38162,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"5d39893f-b7e3-495d-95e5-cf325a813ee3","sequence":51},"last":{"id":"5d39893f-b7e3-495d-95e5-cf325a813ee3","sequence":51},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38395,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38162,"outputTokens":233,"reasoningTokens":129},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:6"}},{"method":"item/started","params":{"item":{"args":"{\"todos\":[{\"status\":\"in_progress\",\"text\":\"inspect f\"},{\"status\":\"pending\",\"text\":\"report\"}]}","callId":"call_01a0eec4e0b576aabeae2e104585722e","itemId":"01a0eec4-e2b8-72c3-9a10-5c710d5b666f","kind":"toolCall","recordedAt":"2026-09-29T20:04:35.641535Z","revision":1,"status":"inProgress","tool":"write_todos","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"15effe29-72a7-490e-8724-cece71174573","sequence":53},"last":{"id":"3b4efa42-5403-4efa-8354-f83a360912ce","sequence":58},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:7"}},{"method":"session/todoListChanged","params":{"items":[{"status":"inProgress","text":"inspect f"},{"status":"pending","text":"report"}],"revision":1,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"bdffd683-b042-4196-a976-5c1435f7162c","sequence":59},"last":{"id":"bdffd683-b042-4196-a976-5c1435f7162c","sequence":59},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"sourceTool":"write_todos","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:8"}},{"method":"item/completed","params":{"item":{"args":"{\"todos\":[{\"status\":\"in_progress\",\"text\":\"inspect f\"},{\"status\":\"pending\",\"text\":\"report\"}]}","callId":"call_01a0eec4e0b576aabeae2e104585722e","itemId":"01a0eec4-e2b8-72c3-9a10-5c710d5b666f","kind":"toolCall","recordedAt":"2026-09-29T20:04:35.642482Z","revision":2,"status":"completed","tool":"write_todos","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"items\":2,\"ok\":true,\"revision\":1}"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"15effe29-72a7-490e-8724-cece71174573","sequence":53},"last":{"id":"fe541d1f-abb8-45f7-a2b0-cf7dbdfd69a1","sequence":61},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:9"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":402,"promptTokens":76600,"totalTokens":77002},"durationMs":21970,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38438,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"4674331a-f993-458b-b6aa-e36cc160f2d7","sequence":80},"last":{"id":"4674331a-f993-458b-b6aa-e36cc160f2d7","sequence":80},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38607,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38438,"outputTokens":169,"reasoningTokens":67},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:10"}},{"method":"item/started","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color should I proceed with, Blue or Green?\"}]}","callId":"call_01a0eec5357571379191c94326ef7ab8","itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","kind":"toolCall","recordedAt":"2026-09-29T20:04:57.621217Z","revision":1,"status":"inProgress","tool":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"2ff469cc-5f3f-44dc-a7ac-1f8f8d8e0409","sequence":82},"last":{"id":"78484e0f-7d0b-48be-8b70-606cf6a718aa","sequence":87},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:11"}},{"method":"userInput/requested","params":{"itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","questions":[{"header":"Color","id":"color_choice","options":[{"label":"Blue"},{"label":"Green"}],"question":"Which color should I proceed with, Blue or Green?","selection":{"mode":"single"}}],"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"last":{"id":"54c9e4de-cba8-49c1-aced-1721ba3731a8","sequence":88},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"toolCallId":"call_01a0eec5357571379191c94326ef7ab8","toolName":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:12"}},{"method":"userInput/settled","params":{"answers":[{"questionId":"color_choice","selectedLabel":"Blue"}],"clarification":null,"decidedByCommandId":"01a0eec5-3897-757d-af17-a34de5a1cfe4","outcome":"answered","reason":null,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"909310e9-7253-4b4c-963e-2f46628f1aae","sequence":91},"last":{"id":"909310e9-7253-4b4c-963e-2f46628f1aae","sequence":91},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"userInputId":"01a0eec5-3894-7a91-9762-e13cf06c117f","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:13"}},{"method":"item/completed","params":{"item":{"args":"{\"questions\":[{\"header\":\"Color\",\"id\":\"color_choice\",\"options\":[{\"label\":\"Blue\"},{\"label\":\"Green\"}],\"question\":\"Which color should I proceed with, Blue or Green?\"}]}","callId":"call_01a0eec5357571379191c94326ef7ab8","itemId":"01a0eec5-3894-7a91-9762-e13cf06c117f","kind":"toolCall","recordedAt":"2026-09-29T20:04:57.624274Z","revision":2,"status":"completed","tool":"request_user_input","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","visibleOutput":"{\"status\":\"answered\",\"answers\":[{\"id\":\"color_choice\",\"selected_label\":\"Blue\"}]}"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"2ff469cc-5f3f-44dc-a7ac-1f8f8d8e0409","sequence":82},"last":{"id":"b7264ba7-6895-475a-a4b8-56bed8767e35","sequence":93},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:14"}},{"method":"item/completed","params":{"item":{"itemId":"e187c684-c3d9-45e8-bbae-c1507cc9e8d1","kind":"agentMessage","recordedAt":"2026-09-29T20:05:15.287526Z","revision":2,"status":"completed","text":"You chose Blue.\n\nTodos created: inspect f (in progress), report (pending). Awaiting direction to proceed.","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"6834f18d-2fc1-4a06-8a21-bfb486bd0338","sequence":110},"last":{"id":"6834f18d-2fc1-4a06-8a21-bfb486bd0338","sequence":110},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:15"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":525,"promptTokens":115255,"totalTokens":115780},"durationMs":17661,"modelId":"meta/muse-spark-1.3","promptTokens":38655,"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"a5633a10-4fb0-4873-b47d-4d558bd3c4e5","sequence":113},"last":{"id":"a5633a10-4fb0-4873-b47d-4d558bd3c4e5","sequence":113},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"totalTokens":38778,"turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","usage":{"cacheReadTokens":38385,"cacheWriteTokens":0,"cachedTokens":38385,"inputTokens":38655,"outputTokens":123,"reasoningTokens":90},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:16"}},{"method":"item/started","params":{"item":{"childSessionId":"cf7f87cb-f82a-441e-b840-b89cfdc03e18","childSessionLogPath":"subagent/cf7f87cb-f82a-441e-b840-b89cfdc03e18/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","kind":"reminderChild","recordedAt":"2026-09-29T20:05:15.294057Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eec5-7d9c-7f61-b098-af5f30813223","turnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda"},"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","sourceRange":{"first":{"id":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","sequence":120},"last":{"id":"9da8e5a6-f48f-4cfb-b8ed-79ea0d71f842","sequence":120},"stream":{"id":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","kind":"session"}},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:17"}}],"nextCursor":null}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":6,"method":"session/read","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e"}}}
+{"dir":"in","msg":{"id":6,"jsonrpc":"2.0","result":{"history":{"items":null,"mode":"none","noneReason":"excluded","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":"01a0eec4-347d-7a14-a97f-3fd6be129dda","approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"lastActivityAt":"2026-09-29T20:05:15.294057Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"running","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":0,"updatedAt":"2026-09-29T20:05:15.294321Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:17"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":7,"method":"session/compact","params":{"commandId":"01a0eec5-e331-73ef-ab77-595e061742b7","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e"}}}
+{"dir":"in","msg":{"error":{"code":-32030,"data":{"commandId":"01a0eec5-e331-73ef-ab77-595e061742b7","kind":"commandRejected","reason":"run_active","retryable":false},"message":"session/compact command 01a0eec5-e331-73ef-ab77-595e061742b7 rejected: run_active"},"id":7,"jsonrpc":"2.0"}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":8,"method":"usage/read","params":{}}}
+{"dir":"in","msg":{"id":8,"jsonrpc":"2.0","result":{}}}
+{"dir":"in","msg":{"emittedAtMs":1790712344524,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712344524,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"notLoaded","viewCursor":"v:01a0eec4-3420-7d50-bfdb-bc7f1701193e:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790712344524,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:03:50.94472Z","firstUserPrompt":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0eec4-3420-7d50-bfdb-bc7f1701193e/session.jsonl","providerId":"meta","sessionId":"01a0eec4-3420-7d50-bfdb-bc7f1701193e","status":"notLoaded","title":"Use todo_write to create two todos: inspect f (in progress) and report (pending). Then use ask_user_question to ask me to choose Blue or Green before proceeding. Do not infer my answer.","turnCount":0,"updatedAt":"2026-09-29T20:05:41.304053Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-default-workflow.ndjson b/plugins/muse-provider/test/fixtures/phase3-default-workflow.ndjson
new file mode 100644
index 0000000000..751619557f
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-default-workflow.ndjson
@@ -0,0 +1,7 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-parity/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/read","params":{"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":null,"mode":"none","noneReason":"excluded","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T20:20:38.31556Z","firstUserPrompt":"Reply exactly MUSE_PARITY_READY. Do not use tools.","forkedFrom":null,"lastActivityAt":"2026-09-29T20:29:35.688075Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-parity/data/muse/sessions/2026/09/29/01a0eed3-932b-73e3-af13-d270ac13c13e/session.jsonl","providerId":"meta","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","status":"notLoaded","title":"Reply exactly MUSE_PARITY_READY. Do not use tools.","turnCount":4,"updatedAt":"2026-09-29T20:29:35.688075Z","workspaceRoot":"/tmp/muse-parity/repo"},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:55"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"view/page","params":{"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","limit":1000}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"events":[{"method":"session/approvalModeChanged","params":{"clientName":"paseo","commandId":"01a0eed3-931c-7e09-940b-a18c476535fc","mode":"onRequest","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","source":"approvalReconfigure","sourceRange":{"first":{"id":"e5f590d4-1e22-4de3-87e2-2fce1890b73e","sequence":5},"last":{"id":"e5f590d4-1e22-4de3-87e2-2fce1890b73e","sequence":5},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:1"}},{"method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"3e7b25da-ae59-4948-bf34-dbcc64cc6ed4","sequence":27},"last":{"id":"3e7b25da-ae59-4948-bf34-dbcc64cc6ed4","sequence":27},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:2","workspaceRoot":"/tmp/muse-parity/repo"}},{"method":"turn/started","params":{"commandId":"01a0eed3-9490-7d1f-9d49-37a21c167827","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"621ad9a3-090f-4de3-bcc1-04bde2eb4275","sequence":29},"last":{"id":"621ad9a3-090f-4de3-bcc1-04bde2eb4275","sequence":29},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:3"}},{"method":"item/completed","params":{"item":{"commandId":"01a0eed3-9490-7d1f-9d49-37a21c167827","itemId":"13033301-7a88-4975-b649-6b625d06f6c2","kind":"userMessage","recordedAt":"2026-09-29T20:20:38.67983Z","revision":1,"status":"completed","text":"Reply exactly MUSE_PARITY_READY. Do not use tools.","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"621ad9a3-090f-4de3-bcc1-04bde2eb4275","sequence":29},"last":{"id":"621ad9a3-090f-4de3-bcc1-04bde2eb4275","sequence":29},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:4"}},{"method":"item/started","params":{"item":{"childSessionId":"cec38684-5da4-4884-a207-ef7834c0c389","fallbackText":"Reminder child session","generationId":1,"itemId":"5e203ac7-881e-4731-b6dc-a887c5763cce","kind":"reminderChild","recordedAt":"2026-09-29T20:20:38.697965Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed3-94a8-7051-a7b4-675143c10378","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"5e203ac7-881e-4731-b6dc-a887c5763cce","sequence":47},"last":{"id":"5e203ac7-881e-4731-b6dc-a887c5763cce","sequence":47},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:5"}},{"method":"item/completed","params":{"item":{"itemId":"c77e54d5-dd15-40a3-a5e0-0d978d17f3c2","kind":"agentMessage","recordedAt":"2026-09-29T20:20:40.835405Z","revision":2,"status":"completed","text":"MUSE_PARITY_READY","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"96c261f4-c700-4559-86c8-9b550158256c","sequence":60},"last":{"id":"96c261f4-c700-4559-86c8-9b550158256c","sequence":60},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:6"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":28,"promptTokens":42376,"totalTokens":42404},"durationMs":2138,"modelId":"meta/muse-spark-1.3","promptTokens":42376,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"6a7ec8a7-2079-4ae2-a891-fcb2f8a07ec8","sequence":63},"last":{"id":"6a7ec8a7-2079-4ae2-a891-fcb2f8a07ec8","sequence":63},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"totalTokens":42404,"turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":42376,"outputTokens":28,"reasoningTokens":13},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:7"}},{"method":"item/started","params":{"item":{"childSessionId":"3d09af71-0bcc-4b94-ba8f-5acf92f259fe","fallbackText":"Reminder child session","generationId":1,"itemId":"74a8a721-4c79-4f69-8ff6-45ed99f86cad","kind":"reminderChild","recordedAt":"2026-09-29T20:20:40.843309Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eed3-9d0a-7591-bea5-563258797d0b","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"74a8a721-4c79-4f69-8ff6-45ed99f86cad","sequence":70},"last":{"id":"74a8a721-4c79-4f69-8ff6-45ed99f86cad","sequence":70},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:8"}},{"method":"item/completed","params":{"item":{"childSessionId":"3d09af71-0bcc-4b94-ba8f-5acf92f259fe","fallbackText":"Reminder child session","generationId":1,"itemId":"74a8a721-4c79-4f69-8ff6-45ed99f86cad","kind":"reminderChild","recordedAt":"2026-09-29T20:21:07.122102Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eed3-9d0a-7591-bea5-563258797d0b","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"74a8a721-4c79-4f69-8ff6-45ed99f86cad","sequence":70},"last":{"id":"4516461e-5fa2-439d-9b4e-8ad009827cef","sequence":72},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:9"}},{"method":"item/completed","params":{"item":{"childSessionId":"cec38684-5da4-4884-a207-ef7834c0c389","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"5e203ac7-881e-4731-b6dc-a887c5763cce","kind":"reminderChild","recordedAt":"2026-09-29T20:21:07.124683Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eed3-94a8-7051-a7b4-675143c10378","turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"5e203ac7-881e-4731-b6dc-a887c5763cce","sequence":47},"last":{"id":"127a52d4-8345-4b21-8b2b-2de5acd43aa9","sequence":76},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:10"}},{"method":"turn/completed","params":{"durationMs":28445,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"24aabfdb-72c9-4bf7-9bb6-0ea2d464e1b3","sequence":78},"last":{"id":"24aabfdb-72c9-4bf7-9bb6-0ea2d464e1b3","sequence":78},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":2101,"turnId":"01a0eed3-9490-7d1f-9d49-37a21c167827","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:11"}},{"method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"ce7e1c0f-ddda-4972-b534-bc92924685f8","sequence":82},"last":{"id":"ce7e1c0f-ddda-4972-b534-bc92924685f8","sequence":82},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:12","workspaceRoot":"/tmp/muse-parity/repo"}},{"method":"turn/started","params":{"commandId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"4e92c557-fea3-4adb-b9f1-a219e2766de2","sequence":83},"last":{"id":"4e92c557-fea3-4adb-b9f1-a219e2766de2","sequence":83},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:13"}},{"method":"item/completed","params":{"item":{"commandId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646","itemId":"fc181aa2-5c85-4575-9c3a-a651ab9478c5","kind":"userMessage","recordedAt":"2026-09-29T20:22:43.338938Z","revision":1,"status":"completed","text":"/muse-parity-user","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"4e92c557-fea3-4adb-b9f1-a219e2766de2","sequence":83},"last":{"id":"4e92c557-fea3-4adb-b9f1-a219e2766de2","sequence":83},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:14"}},{"method":"item/started","params":{"item":{"childSessionId":"fad33bda-d96d-4fa3-88ae-f81530005c1c","fallbackText":"Reminder child session","generationId":1,"itemId":"0ee04e13-90e5-4cb2-af03-b6652be140bb","kind":"reminderChild","recordedAt":"2026-09-29T20:22:43.34489Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed5-7b90-78c1-9bb3-3e0964c21058","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"0ee04e13-90e5-4cb2-af03-b6652be140bb","sequence":101},"last":{"id":"0ee04e13-90e5-4cb2-af03-b6652be140bb","sequence":101},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:15"}},{"method":"item/completed","params":{"item":{"itemId":"1fb15644-4718-4e8f-9de1-07c7a2aed493","kind":"agentMessage","recordedAt":"2026-09-29T20:22:46.666881Z","revision":2,"status":"completed","text":"MUSE_PARITY_USER_OK","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"285cf5ec-9f46-4432-8783-3a26bf8f227d","sequence":114},"last":{"id":"285cf5ec-9f46-4432-8783-3a26bf8f227d","sequence":114},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:16"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":69,"promptTokens":84939,"totalTokens":85008},"durationMs":3323,"modelId":"meta/muse-spark-1.3","promptTokens":42563,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"04716cb9-ff28-4cdb-92ed-673336fe8e6c","sequence":117},"last":{"id":"04716cb9-ff28-4cdb-92ed-673336fe8e6c","sequence":117},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"totalTokens":42604,"turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646","usage":{"cacheReadTokens":42353,"cacheWriteTokens":0,"cachedTokens":42353,"inputTokens":42563,"outputTokens":41,"reasoningTokens":25},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:17"}},{"method":"item/started","params":{"item":{"childSessionId":"a1cb2525-f5b0-47b2-a1ff-78e559d92aaf","fallbackText":"Reminder child session","generationId":1,"itemId":"5edfc05e-e503-416c-8b57-fdae2bb628be","kind":"reminderChild","recordedAt":"2026-09-29T20:22:46.672229Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eed5-888f-7e03-88be-47ead1dc0403","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"5edfc05e-e503-416c-8b57-fdae2bb628be","sequence":124},"last":{"id":"5edfc05e-e503-416c-8b57-fdae2bb628be","sequence":124},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:18"}},{"method":"item/completed","params":{"item":{"childSessionId":"fad33bda-d96d-4fa3-88ae-f81530005c1c","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"0ee04e13-90e5-4cb2-af03-b6652be140bb","kind":"reminderChild","recordedAt":"2026-09-29T20:23:49.319829Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eed5-7b90-78c1-9bb3-3e0964c21058","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"0ee04e13-90e5-4cb2-af03-b6652be140bb","sequence":101},"last":{"id":"6a3021bc-7c2f-4578-8f7c-ca8fbc48d075","sequence":128},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:19"}},{"method":"item/completed","params":{"item":{"childSessionId":"a1cb2525-f5b0-47b2-a1ff-78e559d92aaf","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"5edfc05e-e503-416c-8b57-fdae2bb628be","kind":"reminderChild","recordedAt":"2026-09-29T20:23:49.319989Z","reminderAgentId":"verify-reminder","revision":2,"status":"cancelled","taskId":"01a0eed5-888f-7e03-88be-47ead1dc0403","turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"5edfc05e-e503-416c-8b57-fdae2bb628be","sequence":124},"last":{"id":"a0001d86-c30d-4f13-899c-0c5754bc371e","sequence":129},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:20"}},{"method":"turn/completed","params":{"durationMs":65981,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"281374ab-9801-41bf-a86e-48f4ae38a114","sequence":132},"last":{"id":"281374ab-9801-41bf-a86e-48f4ae38a114","sequence":132},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3284,"turnId":"01a0eed5-7b87-763f-98b5-aa3bcf41b646","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:21"}},{"method":"turn/started","params":{"commandId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"020df195-c790-42c0-9620-334ad004ceb2","sequence":138},"last":{"id":"020df195-c790-42c0-9620-334ad004ceb2","sequence":138},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:22"}},{"method":"item/completed","params":{"item":{"commandId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","itemId":"94a3b885-3b56-4ccb-b78d-36a0871fb9ad","kind":"userMessage","recordedAt":"2026-09-29T20:25:34.132571Z","revision":1,"status":"completed","text":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply MUSE_PARITY_CHILD_OK without tools. Wait for it and read its result. Then report the exact result.","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"020df195-c790-42c0-9620-334ad004ceb2","sequence":138},"last":{"id":"020df195-c790-42c0-9620-334ad004ceb2","sequence":138},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:23"}},{"method":"item/started","params":{"item":{"childSessionId":"bc91fcc4-0b2f-431b-a95d-3bc02197624e","fallbackText":"Reminder child session","generationId":1,"itemId":"e79c416d-2da6-4ebb-8f48-bfb821a04033","kind":"reminderChild","recordedAt":"2026-09-29T20:25:34.141088Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed8-16bb-7bd3-9e27-ffdecd0dd526","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"e79c416d-2da6-4ebb-8f48-bfb821a04033","sequence":155},"last":{"id":"e79c416d-2da6-4ebb-8f48-bfb821a04033","sequence":155},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:24"}},{"method":"item/completed","params":{"item":{"itemId":"6c408c57-e8c2-4361-a23f-96492e13ec5f","kind":"reasoning","providerItemId":"rs_6abc1ec2d96d7e128bf2443f:rs_01a0eed827c4737aa8620c2f582a17a2","recordedAt":"2026-09-29T20:25:45.516664Z","revision":2,"status":"completed","summary":["Evaluating the native subagent spawn via workflow tool and output constraint.Selecting the workflow tool as the first step to spawn the native subagent."],"turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"24e4ccb9-18f2-40d1-b630-2ed9a5ba91ad","sequence":169},"last":{"id":"24e4ccb9-18f2-40d1-b630-2ed9a5ba91ad","sequence":169},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:25"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":817,"promptTokens":127591,"totalTokens":128408},"durationMs":12002,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":42652,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"ef2bd965-531c-4f07-9957-c0c481c7627c","sequence":174},"last":{"id":"ef2bd965-531c-4f07-9957-c0c481c7627c","sequence":174},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"totalTokens":43400,"turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","usage":{"cacheReadTokens":42481,"cacheWriteTokens":0,"cachedTokens":42481,"inputTokens":42652,"outputTokens":748,"reasoningTokens":558},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:26"}},{"method":"item/started","params":{"item":{"args":"{\"args\":null,\"name\":\"spawn parity child\",\"script\":\"export default async function workflow(host) { const result = await host.agent({ input: \\\"Reply exactly MUSE_PARITY_CHILD_OK. Do not use tools.\\\" }); return { status: \\\"ok\\\", ref: result.ref, text: result.text }; }\"}","callId":"call_01a0eed8426e710da463d6b58a683556","itemId":"01a0eed8-45a3-7a90-bd9f-dd7825ca7d73","kind":"toolCall","recordedAt":"2026-09-29T20:25:46.147985Z","revision":1,"status":"inProgress","tool":"workflow","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"a918854d-ea32-4bc2-8d4a-335312d095a8","sequence":176},"last":{"id":"b516abf5-88df-4487-9bee-5f90f988e3a8","sequence":182},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:27"}},{"method":"item/completed","params":{"item":{"args":"{\"args\":null,\"name\":\"spawn parity child\",\"script\":\"export default async function workflow(host) { const result = await host.agent({ input: \\\"Reply exactly MUSE_PARITY_CHILD_OK. Do not use tools.\\\" }); return { status: \\\"ok\\\", ref: result.ref, text: result.text }; }\"}","callId":"call_01a0eed8426e710da463d6b58a683556","itemId":"01a0eed8-45a3-7a90-bd9f-dd7825ca7d73","kind":"toolCall","recordedAt":"2026-09-29T20:25:46.154672Z","revision":2,"status":"completed","tool":"workflow","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","visibleOutput":"{\"args\":null,\"entryId\":\"spawn parity child\",\"hostApiVersion\":\"v1\",\"maxParallelAgents\":14,\"message\":\"Workflow launched: the workflow runs in the background and its completion is delivered to this conversation. Do not call workflow again while this owner is live. The persisted script lives at /tmp/muse-workflow-session-QQ6yi5/workflows/scripts/01a0eed8-45a4-7553-95ac-4b2d977782c7.js. To iterate after this owner ends (completion, failure, or reported recovery), edit that file and call workflow again with {\\\"name\\\": \\\"spawn parity child\\\", \\\"scriptPath\\\": \\\"/tmp/muse-workflow-session-QQ6yi5/workflows/scripts/01a0eed8-45a4-7553-95ac-4b2d977782c7.js\\\", \\\"resumeFromRunId\\\": \\\"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556\\\"} instead of resending inline script; a resume re-executes the script from the top and reuses only the longest unchanged completed call prefix, so completed agent() calls before your first change replay from the journal instead of re-running. Runtime admission (policy, caps, duplicates) may still reject a resume. To stop this run before it completes, call work_stop with work_id = work.v1.workflow.sha256.7ef8923b4c9481e5fd18eda03337c24e338bc27c81453b74d45b34372050dec6.\",\"policy\":{\"caps\":\"caps:generated-js-workflow\",\"childLimit\":14,\"id\":\"policy:standard\"},\"scriptBytes\":210,\"scriptHash\":\"sha256:8a896fd97908248633764a409ec0ba5a17a0df3cf01d0fff31ecd6023ad9e8a1\",\"scriptPath\":\"/tmp/muse-workflow-session-QQ6yi5/workflows/scripts/01a0eed8-45a4-7553-95ac-4b2d977782c7.js\",\"status\":\"launched\",\"taskId\":\"01a0eed8-45a4-7553-95ac-4b2d977782c7\",\"tokenBudget\":null,\"workId\":\"work.v1.workflow.sha256.7ef8923b4c9481e5fd18eda03337c24e338bc27c81453b74d45b34372050dec6\",\"workflowRunId\":\"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556\",\"workflowRunIdDescription\":\"Internal opaque control handle for Workflow calls only. Pass this exact value only as resumeFromRunId; never repeat it in user-facing prose.\"}"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"a918854d-ea32-4bc2-8d4a-335312d095a8","sequence":176},"last":{"id":"447a11b5-a5aa-474e-bcda-3e6f013de031","sequence":186},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:28"}},{"method":"item/started","params":{"item":{"children":[],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:25:46.154908Z","revision":1,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:29"}},{"method":"item/completed","params":{"item":{"childSessionId":"bc91fcc4-0b2f-431b-a95d-3bc02197624e","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"e79c416d-2da6-4ebb-8f48-bfb821a04033","kind":"reminderChild","recordedAt":"2026-09-29T20:25:46.164296Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eed8-16bb-7bd3-9e27-ffdecd0dd526","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"e79c416d-2da6-4ebb-8f48-bfb821a04033","sequence":155},"last":{"id":"d30ba6fe-0058-4c76-bdcd-db8442f4f8a3","sequence":199},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:30"}},{"method":"turn/completed","params":{"durationMs":12032,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"0959cbda-3c7e-4d82-a400-7f344204e6e4","sequence":201},"last":{"id":"0959cbda-3c7e-4d82-a400-7f344204e6e4","sequence":201},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":6515,"turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:31"}},{"method":"item/updated","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","status":"scheduled"}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:25:46.168395Z","revision":2,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"8d852df5-bab8-467e-a534-00466a62eb73","sequence":203},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:32"}},{"method":"item/updated","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","status":"started"}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:25:46.176812Z","revision":3,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"4feba775-86a0-4dcb-be62-e922a6f2cb1b","sequence":215},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:33"}},{"method":"item/updated","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","status":"usage","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":36383,"outputTokens":246,"reasoningTokens":184}}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:26:03.529253Z","revision":4,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"6a319567-897f-4423-8808-54683c29d18b","sequence":217},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:34"}},{"method":"item/updated","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","durationMs":17340,"resultRef":"subagent-result://01a0eed8-45b6-7810-a015-af925aa86416/task/4d18b0eb-a557-5a5f-b101-1fde09ebd4e2#5","status":"completed"}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:26:03.529999Z","revision":5,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"437d1f27-fb59-4905-aad5-d90c2e45d0af","sequence":220},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:35"}},{"method":"item/updated","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","durationMs":17340,"resultRef":"subagent-result://01a0eed8-45b6-7810-a015-af925aa86416/task/4d18b0eb-a557-5a5f-b101-1fde09ebd4e2#5","status":"terminal","terminal":"completed"}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","recordedAt":"2026-09-29T20:26:03.530175Z","revision":6,"scriptId":"generated.workflow.spawn_parity_child","status":"inProgress","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"feef6547-fed1-467b-aa1d-50714586bebd","sequence":221},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:36"}},{"method":"item/completed","params":{"item":{"children":[{"attempt":1,"childId":"01a0eed8-45b6-7810-a015-af925aa86416","durationMs":17340,"resultRef":"subagent-result://01a0eed8-45b6-7810-a015-af925aa86416/task/4d18b0eb-a557-5a5f-b101-1fde09ebd4e2#5","status":"terminal","terminal":"completed"}],"entryId":"spawn parity child","fallbackText":"Workflow: model-chosen generated workflow","itemId":"31dba18d-857b-4162-afc0-7883f5aebc0e","kind":"workflow","message":"<workflow-launch-reconciled>{\"agents_activity\":[{\"agent\":\"01a0eed8-45b6-7810-a015-af925aa86416\",\"duration_ms\":17340,\"tool_calls\":0}],\"call_id\":\"call_01a0eed8426e710da463d6b58a683556\",\"child_work_started\":true,\"deferred_to_background\":false,\"final_summary\":{\"status\":\"completed\",\"summary\":\"MUSE_PARITY_CHILD_OK\"},\"final_summary_instruction\":\"Use final_summary.summary as the completed workflow output.\",\"latest_failure\":null,\"launch_admitted\":true,\"launch_command_id\":\"2fdf4f42-54b3-4f4e-8b7c-2e5b88c0df4d\",\"production_owner_loop_started\":true,\"provider_or_tool_io_started\":true,\"route\":\"runtime command admission -> production owner loop\",\"type\":\"workflow_launch_reconciled\",\"workspace_handoffs\":[{\"agent\":\"01a0eed8-45b6-7810-a015-af925aa86416\",\"description\":\"Subagent workspace: shared\"}]}</workflow-launch-reconciled>","recordedAt":"2026-09-29T20:26:03.535398Z","revision":7,"scriptId":"generated.workflow.spawn_parity_child","status":"completed","triggerSource":"guidanceAuto","turnId":"01a0eed8-16b2-77b8-ae22-9455e0b6804a","workflowRunId":"workflow-run-model-tool-call_01a0eed8426e710da463d6b58a683556"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"31dba18d-857b-4162-afc0-7883f5aebc0e","sequence":187},"last":{"id":"a3221d26-4614-4c00-b599-f7a0a33e21f6","sequence":223},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:37"}},{"method":"turn/started","params":{"commandId":"01a0eed8-8990-7271-9e30-32ac5633d609","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"b0f895bf-adcd-4057-a01e-b5c9bdeff3bf","sequence":229},"last":{"id":"b0f895bf-adcd-4057-a01e-b5c9bdeff3bf","sequence":229},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"turnId":"01a0eed8-8990-7271-9e30-32ac5633d609","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:38"}},{"method":"item/started","params":{"item":{"childSessionId":"4ed57256-2cd8-4626-9920-4717fc722540","fallbackText":"Reminder child session","generationId":1,"itemId":"39e56ac4-800d-42fc-9c7d-3930ba386e6a","kind":"reminderChild","recordedAt":"2026-09-29T20:26:03.549717Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed8-899c-7df1-b4cd-51819d9a5ef7","turnId":"01a0eed8-8990-7271-9e30-32ac5633d609"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"39e56ac4-800d-42fc-9c7d-3930ba386e6a","sequence":246},"last":{"id":"39e56ac4-800d-42fc-9c7d-3930ba386e6a","sequence":246},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:39"}},{"method":"item/completed","params":{"item":{"itemId":"fd03f853-b1b6-4e17-9027-93b822ab461f","kind":"agentMessage","recordedAt":"2026-09-29T20:26:06.821505Z","revision":2,"status":"completed","text":"MUSE_PARITY_CHILD_OK","turnId":"01a0eed8-8990-7271-9e30-32ac5633d609"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"002a4c90-a9d5-4af5-9964-9471e2ae2c93","sequence":259},"last":{"id":"002a4c90-a9d5-4af5-9964-9471e2ae2c93","sequence":259},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:40"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":925,"promptTokens":172385,"totalTokens":173310},"durationMs":3274,"modelId":"meta/muse-spark-1.3","promptTokens":44794,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"4803220f-dc93-4ef2-8997-681916e54764","sequence":262},"last":{"id":"4803220f-dc93-4ef2-8997-681916e54764","sequence":262},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"totalTokens":44902,"turnId":"01a0eed8-8990-7271-9e30-32ac5633d609","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":44794,"outputTokens":108,"reasoningTokens":92},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:41"}},{"method":"item/started","params":{"item":{"childSessionId":"12ef4c41-c0c1-43fd-8488-7a8518a5a72b","fallbackText":"Reminder child session","generationId":1,"itemId":"d9fb16ad-4169-49f7-b13f-01a9190f23f1","kind":"reminderChild","recordedAt":"2026-09-29T20:26:06.828633Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eed8-966c-73e0-af5c-2ddb56432d01","turnId":"01a0eed8-8990-7271-9e30-32ac5633d609"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"d9fb16ad-4169-49f7-b13f-01a9190f23f1","sequence":269},"last":{"id":"d9fb16ad-4169-49f7-b13f-01a9190f23f1","sequence":269},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:42"}},{"method":"item/completed","params":{"item":{"childSessionId":"12ef4c41-c0c1-43fd-8488-7a8518a5a72b","fallbackText":"Reminder child session","generationId":1,"itemId":"d9fb16ad-4169-49f7-b13f-01a9190f23f1","kind":"reminderChild","recordedAt":"2026-09-29T20:26:12.073884Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eed8-966c-73e0-af5c-2ddb56432d01","turnId":"01a0eed8-8990-7271-9e30-32ac5633d609"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"d9fb16ad-4169-49f7-b13f-01a9190f23f1","sequence":269},"last":{"id":"83355680-dff1-4c14-84e7-b1e2fbabfdd7","sequence":271},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:43"}},{"method":"item/completed","params":{"item":{"childSessionId":"4ed57256-2cd8-4626-9920-4717fc722540","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"39e56ac4-800d-42fc-9c7d-3930ba386e6a","kind":"reminderChild","recordedAt":"2026-09-29T20:26:12.075841Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eed8-899c-7df1-b4cd-51819d9a5ef7","turnId":"01a0eed8-8990-7271-9e30-32ac5633d609"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"39e56ac4-800d-42fc-9c7d-3930ba386e6a","sequence":246},"last":{"id":"1395704d-186b-42cb-81c9-1b196b799db1","sequence":275},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:44"}},{"method":"turn/completed","params":{"durationMs":8538,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"10ca1fba-6e0b-4878-bf32-dffbd98da848","sequence":277},"last":{"id":"10ca1fba-6e0b-4878-bf32-dffbd98da848","sequence":277},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3005,"turnId":"01a0eed8-8990-7271-9e30-32ac5633d609","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:45"}},{"method":"turn/started","params":{"commandId":"01a0eedb-985c-7976-95be-bd698ad7c26f","sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"c396b9cf-5aaa-4575-ad13-3ea92f45c7d9","sequence":283},"last":{"id":"c396b9cf-5aaa-4575-ad13-3ea92f45c7d9","sequence":283},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:46"}},{"method":"item/completed","params":{"item":{"commandId":"01a0eedb-985c-7976-95be-bd698ad7c26f","itemId":"35ac342e-8c07-49b5-b49b-cbc94b77550a","kind":"userMessage","recordedAt":"2026-09-29T20:29:23.935493Z","revision":1,"status":"completed","text":"Use the native subagent_spawn tool (not workflow) to spawn one child in shared placement, with the objective to reply MUSE_NATIVE_CHILD_OK without tools. Then use subagent_wait and subagent_read_result. Do not fabricate a child response. If those three tools are unavailable, report that fact and stop.","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"c396b9cf-5aaa-4575-ad13-3ea92f45c7d9","sequence":283},"last":{"id":"c396b9cf-5aaa-4575-ad13-3ea92f45c7d9","sequence":283},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:47"}},{"method":"item/started","params":{"item":{"childSessionId":"40841c92-f7f0-49d0-be79-e9f8b49840ae","fallbackText":"Reminder child session","generationId":1,"itemId":"88f27e2d-73f0-4cef-8df9-136407dfccbc","kind":"reminderChild","recordedAt":"2026-09-29T20:29:23.949687Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eedb-986c-7af3-85f1-1969b4bf35e8","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"88f27e2d-73f0-4cef-8df9-136407dfccbc","sequence":300},"last":{"id":"88f27e2d-73f0-4cef-8df9-136407dfccbc","sequence":300},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:48"}},{"method":"item/completed","params":{"item":{"itemId":"4a5cdd4a-85eb-4cc7-8caa-0e1e074765b6","kind":"reasoning","providerItemId":"rs_6abc1fa9318445219611407e:rs_01a0eedbadf67749aa0fe24c380cefed","recordedAt":"2026-09-29T20:29:32.463434Z","revision":2,"status":"completed","summary":["Checking that requested subagent tools are unavailable and ruling out alternatives."],"turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"c2e789ef-79d2-4315-ad7a-69eb1647db73","sequence":313},"last":{"id":"c2e789ef-79d2-4315-ad7a-69eb1647db73","sequence":313},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:49"}},{"method":"item/completed","params":{"item":{"itemId":"48382df7-a7f2-4905-b7a5-1e1f38e72e39","kind":"agentMessage","recordedAt":"2026-09-29T20:29:32.781524Z","revision":2,"status":"completed","text":"Those three tools are unavailable: no `subagent_spawn`, `subagent_wait`, or `subagent_read_result` in this session. Stopping without spawning.","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"2ea66af3-381a-4c98-877b-b42ca42b7fcc","sequence":315},"last":{"id":"2ea66af3-381a-4c98-877b-b42ca42b7fcc","sequence":315},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:50"}},{"method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1228,"promptTokens":217357,"totalTokens":218585},"durationMs":8856,"modelId":"meta/muse-spark-1.3","promptTokens":44972,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"3ef736cb-c187-4840-9626-b02a570d41a7","sequence":318},"last":{"id":"3ef736cb-c187-4840-9626-b02a570d41a7","sequence":318},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"totalTokens":45275,"turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f","usage":{"cacheReadTokens":42609,"cacheWriteTokens":0,"cachedTokens":42609,"inputTokens":44972,"outputTokens":303,"reasoningTokens":243},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:51"}},{"method":"item/started","params":{"item":{"childSessionId":"24e649bd-9271-4204-ad6d-1ef9afae2148","fallbackText":"Reminder child session","generationId":1,"itemId":"df7811bb-bb7c-4a3d-9014-917e213aaac0","kind":"reminderChild","recordedAt":"2026-09-29T20:29:32.809722Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eedb-bb09-7771-a0a4-706b31da0407","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"df7811bb-bb7c-4a3d-9014-917e213aaac0","sequence":325},"last":{"id":"df7811bb-bb7c-4a3d-9014-917e213aaac0","sequence":325},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:52"}},{"method":"item/completed","params":{"item":{"childSessionId":"24e649bd-9271-4204-ad6d-1ef9afae2148","fallbackText":"Reminder child session","generationId":1,"itemId":"df7811bb-bb7c-4a3d-9014-917e213aaac0","kind":"reminderChild","recordedAt":"2026-09-29T20:29:35.684855Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eedb-bb09-7771-a0a4-706b31da0407","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"df7811bb-bb7c-4a3d-9014-917e213aaac0","sequence":325},"last":{"id":"d9bf6a05-53e3-46f4-ba20-16d911fe33f2","sequence":327},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:53"}},{"method":"item/completed","params":{"item":{"childSessionId":"40841c92-f7f0-49d0-be79-e9f8b49840ae","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"88f27e2d-73f0-4cef-8df9-136407dfccbc","kind":"reminderChild","recordedAt":"2026-09-29T20:29:35.687891Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0eedb-986c-7af3-85f1-1969b4bf35e8","turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f"},"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"88f27e2d-73f0-4cef-8df9-136407dfccbc","sequence":300},"last":{"id":"aec8adeb-28ee-4d80-a48a-63d15b1bb509","sequence":331},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:54"}},{"method":"turn/completed","params":{"durationMs":11752,"sessionId":"01a0eed3-932b-73e3-af13-d270ac13c13e","sourceRange":{"first":{"id":"0a61a65a-910b-4a3e-8f89-fa7b709a1fef","sequence":333},"last":{"id":"0a61a65a-910b-4a3e-8f89-fa7b709a1fef","sequence":333},"stream":{"id":"01a0eed3-932b-73e3-af13-d270ac13c13e","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":8175,"turnId":"01a0eedb-985c-7976-95be-bd698ad7c26f","viewCursor":"v:01a0eed3-932b-73e3-af13-d270ac13c13e:55"}}],"nextCursor":null}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-project-skill.ndjson b/plugins/muse-provider/test/fixtures/phase3-project-skill.ndjson
new file mode 100644
index 0000000000..5030cf7712
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-project-skill.ndjson
@@ -0,0 +1,34 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase3/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0eed7-ce1c-7a41-a57e-8b7af8ece3f2","workspaceRoot":"/tmp/muse-phase3/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515636,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:25:15.558112Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-ce23-75e2-b14d-7e7261cde078/session.jsonl","providerId":"meta","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:25:15.558116Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:25:15.558112Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-ce23-75e2-b14d-7e7261cde078/session.jsonl","providerId":"meta","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:25:15.558116Z","workspaceRoot":"/tmp/muse-phase3/repo"},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515643,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0eed7-ce1c-7a41-a57e-8b7af8ece3f2","mode":"onRequest","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","source":"approvalReconfigure","sourceRange":{"first":{"id":"c5190deb-8c15-4324-8cab-bcc21767d0f2","sequence":5},"last":{"id":"c5190deb-8c15-4324-8cab-bcc21767d0f2","sequence":5},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"skill/list","params":{"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"skills":[{"description":"Muse parity project skill","displayName":"muse-parity-project","selector":"muse-parity-project","source":"project"},{"description":"Muse parity user skill","displayName":"muse-parity-user","selector":"muse-parity-user","source":"user"}]}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/start","params":{"commandId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","input":[{"type":"skill","selector":"muse-parity-project","arguments":"QA"}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515652,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"8e8dbc61-209b-4238-a059-0e84b658d2ce","sequence":14},"last":{"id":"8e8dbc61-209b-4238-a059-0e84b658d2ce","sequence":14},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:2","workspaceRoot":"/tmp/muse-phase3/repo"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515660,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"running","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515661,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"15fad29e-01e3-44eb-8c62-d1c6f42a15fd","sequence":15},"last":{"id":"15fad29e-01e3-44eb-8c62-d1c6f42a15fd","sequence":15},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515661,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","itemId":"e682051f-db33-497f-b64a-984279221acc","kind":"userMessage","recordedAt":"2026-09-29T20:25:15.653086Z","revision":1,"status":"completed","text":"/muse-parity-project QA","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"15fad29e-01e3-44eb-8c62-d1c6f42a15fd","sequence":15},"last":{"id":"15fad29e-01e3-44eb-8c62-d1c6f42a15fd","sequence":15},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515661,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"048a0237-11cc-4e2e-910e-a15d8a4c0b8a","fallbackText":"Reminder child session","generationId":1,"itemId":"a05c1a91-8de9-4107-af6a-11b60b9e51d5","kind":"reminderChild","recordedAt":"2026-09-29T20:25:15.661569Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed7-ce8c-7d13-a2d7-bdaeba350f66","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"a05c1a91-8de9-4107-af6a-11b60b9e51d5","sequence":34},"last":{"id":"a05c1a91-8de9-4107-af6a-11b60b9e51d5","sequence":34},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515666,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","createdAt":"2026-09-29T20:25:15.558112Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-ce23-75e2-b14d-7e7261cde078/session.jsonl","providerId":"meta","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"running","turnCount":0,"updatedAt":"2026-09-29T20:25:15.66081Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517353,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"6e5ecd1e-53fe-4a9b-be7b-ceeaa7aca348","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:5.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517353,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"MUSE_PARITY","field":"text","itemId":"6e5ecd1e-53fe-4a9b-be7b-ceeaa7aca348","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:5.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517597,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"_PROJECT_OK","field":"text","itemId":"6e5ecd1e-53fe-4a9b-be7b-ceeaa7aca348","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:5.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517642,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"6e5ecd1e-53fe-4a9b-be7b-ceeaa7aca348","kind":"agentMessage","recordedAt":"2026-09-29T20:25:17.642147Z","revision":2,"status":"completed","text":"MUSE_PARITY_PROJECT_OK","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"da4ee9f0-e30b-4312-97e1-7ad4bf3e0ba6","sequence":47},"last":{"id":"da4ee9f0-e30b-4312-97e1-7ad4bf3e0ba6","sequence":47},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517646,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":30,"promptTokens":38319,"totalTokens":38349},"durationMs":1980,"modelId":"meta/muse-spark-1.3","promptTokens":38319,"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"65b08952-8f7e-4f00-b9dd-7e549d0a711e","sequence":50},"last":{"id":"65b08952-8f7e-4f00-b9dd-7e549d0a711e","sequence":50},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"totalTokens":38349,"turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38319,"outputTokens":30,"reasoningTokens":14},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713517648,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"6d2f855f-101e-4114-adf5-3672b6d749b9","childSessionLogPath":"subagent/6d2f855f-101e-4114-adf5-3672b6d749b9/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"c05b349f-2b67-4550-a142-0d408f3cf37f","kind":"reminderChild","recordedAt":"2026-09-29T20:25:17.648165Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eed7-d64e-7e33-8f45-142f02afde1d","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"c05b349f-2b67-4550-a142-0d408f3cf37f","sequence":57},"last":{"id":"c05b349f-2b67-4550-a142-0d408f3cf37f","sequence":57},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529181,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"048a0237-11cc-4e2e-910e-a15d8a4c0b8a","fallbackText":"Reminder child session","generationId":1,"itemId":"a05c1a91-8de9-4107-af6a-11b60b9e51d5","kind":"reminderChild","recordedAt":"2026-09-29T20:25:29.181248Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eed7-ce8c-7d13-a2d7-bdaeba350f66","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"a05c1a91-8de9-4107-af6a-11b60b9e51d5","sequence":34},"last":{"id":"f1d3ebd8-0f87-43b9-aefa-c8cd4f39faa6","sequence":59},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529181,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"6d2f855f-101e-4114-adf5-3672b6d749b9","childSessionLogPath":"subagent/6d2f855f-101e-4114-adf5-3672b6d749b9/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"c05b349f-2b67-4550-a142-0d408f3cf37f","kind":"reminderChild","recordedAt":"2026-09-29T20:25:29.181659Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eed7-d64e-7e33-8f45-142f02afde1d","turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83"},"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"c05b349f-2b67-4550-a142-0d408f3cf37f","sequence":57},"last":{"id":"d879311c-d5a9-43a3-94a6-dff55ae38a7b","sequence":60},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529183,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"idle","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529184,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":13530,"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"4a0e2be3-61af-4a7e-a49a-3da3bd98791e","sequence":66},"last":{"id":"4a0e2be3-61af-4a7e-a49a-3da3bd98791e","sequence":66},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":1700,"turnId":"01a0eed7-ce81-7503-ab0a-30ce06f2ea83","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:11"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"usage/read","params":{}}}
+{"dir":"in","msg":{"id":5,"jsonrpc":"2.0","result":{}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529184,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","sourceRange":{"first":{"id":"08e62d29-771c-4cf4-b186-34fb91ec6810","sequence":67},"last":{"id":"08e62d29-771c-4cf4-b186-34fb91ec6810","sequence":67},"stream":{"id":"01a0eed7-ce23-75e2-b14d-7e7261cde078","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:12","workspaceRoot":"/tmp/muse-phase3/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529184,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:25:15.555669Z","firstUserPrompt":"/muse-parity-project QA","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-ce23-75e2-b14d-7e7261cde078/session.jsonl","providerId":"meta","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"idle","title":"/muse-parity-project QA","turnCount":1,"updatedAt":"2026-09-29T20:25:29.183321Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529442,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529442,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"notLoaded","viewCursor":"v:01a0eed7-ce23-75e2-b14d-7e7261cde078:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713529442,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:25:15.555669Z","firstUserPrompt":"/muse-parity-project QA","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-ce23-75e2-b14d-7e7261cde078/session.jsonl","providerId":"meta","sessionId":"01a0eed7-ce23-75e2-b14d-7e7261cde078","status":"notLoaded","title":"/muse-parity-project QA","turnCount":1,"updatedAt":"2026-09-29T20:25:29.184532Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/phase3-user-skill.ndjson b/plugins/muse-provider/test/fixtures/phase3-user-skill.ndjson
new file mode 100644
index 0000000000..3deee1b6a4
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/phase3-user-skill.ndjson
@@ -0,0 +1,32 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase3/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0eed7-6eae-71dd-aa98-bd57366a4d2a","workspaceRoot":"/tmp/muse-phase3/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491207,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:24:51.128331Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-6eb5-7490-b19e-7053a0a27c2d/session.jsonl","providerId":"meta","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:24:51.128335Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T20:24:51.128331Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-6eb5-7490-b19e-7053a0a27c2d/session.jsonl","providerId":"meta","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"idle","turnCount":0,"updatedAt":"2026-09-29T20:24:51.128335Z","workspaceRoot":"/tmp/muse-phase3/repo"},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491215,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0eed7-6eae-71dd-aa98-bd57366a4d2a","mode":"onRequest","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","source":"approvalReconfigure","sourceRange":{"first":{"id":"903ccb69-7421-43e4-bb85-b661fc9ef2a5","sequence":5},"last":{"id":"903ccb69-7421-43e4-bb85-b661fc9ef2a5","sequence":5},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"skill/list","params":{"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"skills":[{"description":"Muse parity user skill","displayName":"muse-parity-user","selector":"muse-parity-user","source":"user"}]}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/start","params":{"commandId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","input":[{"type":"skill","selector":"muse-parity-user","arguments":"QA"}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491224,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"54e74beb-b4e8-40d0-bb11-52abd1345cf1","sequence":13},"last":{"id":"54e74beb-b4e8-40d0-bb11-52abd1345cf1","sequence":13},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"vcs":"git","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:2","workspaceRoot":"/tmp/muse-phase3/repo"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491232,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"running","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491233,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"ab071d7e-7b44-401a-b8ec-32f213c94289","sequence":14},"last":{"id":"ab071d7e-7b44-401a-b8ec-32f213c94289","sequence":14},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491233,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","itemId":"2efada29-ee84-4446-b6af-2bbbb76c6424","kind":"userMessage","recordedAt":"2026-09-29T20:24:51.22541Z","revision":1,"status":"completed","text":"/muse-parity-user QA","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"ab071d7e-7b44-401a-b8ec-32f213c94289","sequence":14},"last":{"id":"ab071d7e-7b44-401a-b8ec-32f213c94289","sequence":14},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491233,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"c775da07-e090-47c0-9f14-212a29534484","fallbackText":"Reminder child session","generationId":1,"itemId":"ec3c57ce-caae-4973-965d-93161ff55b81","kind":"reminderChild","recordedAt":"2026-09-29T20:24:51.233206Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0eed7-6f1f-7fc0-b779-a0458b794384","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"ec3c57ce-caae-4973-965d-93161ff55b81","sequence":32},"last":{"id":"ec3c57ce-caae-4973-965d-93161ff55b81","sequence":32},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713491238,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","createdAt":"2026-09-29T20:24:51.128331Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-6eb5-7490-b19e-7053a0a27c2d/session.jsonl","providerId":"meta","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"running","turnCount":0,"updatedAt":"2026-09-29T20:24:51.232727Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790713494252,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"c5507091-bdd1-4701-be9d-1f0ab4b75b3e","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:5.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713494252,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"MUSE_PARITY_USER_OK","field":"text","itemId":"c5507091-bdd1-4701-be9d-1f0ab4b75b3e","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:5.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713494323,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"c5507091-bdd1-4701-be9d-1f0ab4b75b3e","kind":"agentMessage","recordedAt":"2026-09-29T20:24:54.322754Z","revision":2,"status":"completed","text":"MUSE_PARITY_USER_OK","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"98e5bb9a-cc37-4e94-8bc5-90ebd1bad851","sequence":45},"last":{"id":"98e5bb9a-cc37-4e94-8bc5-90ebd1bad851","sequence":45},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713494328,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":32,"promptTokens":36717,"totalTokens":36749},"durationMs":3091,"modelId":"meta/muse-spark-1.3","promptTokens":36717,"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"475129b6-1e12-4d19-b3b8-7d8cf5ef1f71","sequence":48},"last":{"id":"475129b6-1e12-4d19-b3b8-7d8cf5ef1f71","sequence":48},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"totalTokens":36749,"turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":36717,"outputTokens":32,"reasoningTokens":16},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713494330,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"230378ce-377b-4d2c-8020-10cf2449b75b","fallbackText":"Reminder child session","generationId":1,"itemId":"35da6de8-83a9-4e23-a1f9-f05c5f78103c","kind":"reminderChild","recordedAt":"2026-09-29T20:24:54.330297Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0eed7-7b38-71e0-b90b-3ebc7af2ad1f","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"35da6de8-83a9-4e23-a1f9-f05c5f78103c","sequence":55},"last":{"id":"35da6de8-83a9-4e23-a1f9-f05c5f78103c","sequence":55},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515146,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"c775da07-e090-47c0-9f14-212a29534484","fallbackText":"Reminder child session","generationId":1,"itemId":"ec3c57ce-caae-4973-965d-93161ff55b81","kind":"reminderChild","recordedAt":"2026-09-29T20:25:15.146156Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0eed7-6f1f-7fc0-b779-a0458b794384","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"ec3c57ce-caae-4973-965d-93161ff55b81","sequence":32},"last":{"id":"d5dc841a-1273-4a41-90b4-71fb1582f087","sequence":57},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515147,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"230378ce-377b-4d2c-8020-10cf2449b75b","fallbackText":"Reminder child session","generationId":1,"itemId":"35da6de8-83a9-4e23-a1f9-f05c5f78103c","kind":"reminderChild","recordedAt":"2026-09-29T20:25:15.146691Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0eed7-7b38-71e0-b90b-3ebc7af2ad1f","turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d"},"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"35da6de8-83a9-4e23-a1f9-f05c5f78103c","sequence":55},"last":{"id":"5fe97bca-2f1c-4a08-88fe-e5ff9c313bdc","sequence":58},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515148,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"idle","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515150,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":23923,"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","sourceRange":{"first":{"id":"e862f004-df27-443a-95c7-2984e9702037","sequence":64},"last":{"id":"e862f004-df27-443a-95c7-2984e9702037","sequence":64},"stream":{"id":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3026,"turnId":"01a0eed7-6f16-7497-ab8e-8bd0733e2f6d","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515150,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:24:51.125765Z","firstUserPrompt":"/muse-parity-user QA","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-6eb5-7490-b19e-7053a0a27c2d/session.jsonl","providerId":"meta","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"idle","title":"/muse-parity-user QA","turnCount":1,"updatedAt":"2026-09-29T20:25:15.148441Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"usage/read","params":{}}}
+{"dir":"in","msg":{"id":5,"jsonrpc":"2.0","result":{}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515404,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515404,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"notLoaded","viewCursor":"v:01a0eed7-6eb5-7490-b19e-7053a0a27c2d:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790713515404,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T20:24:51.125765Z","firstUserPrompt":"/muse-parity-user QA","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase3/data/muse/sessions/2026/09/29/01a0eed7-6eb5-7490-b19e-7053a0a27c2d/session.jsonl","providerId":"meta","sessionId":"01a0eed7-6eb5-7490-b19e-7053a0a27c2d","status":"notLoaded","title":"/muse-parity-user QA","turnCount":1,"updatedAt":"2026-09-29T20:25:15.148441Z","workspaceRoot":"/tmp/muse-phase3/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/resume-reasoning.ndjson b/plugins/muse-provider/test/fixtures/resume-reasoning.ndjson
new file mode 100644
index 0000000000..548bf8ea2d
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/resume-reasoning.ndjson
@@ -0,0 +1,27 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0ee4c-4bb3-7e83-ad09-930d246e0d31","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372759,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"c262c112-2245-4975-a0d3-de21a8f19459","sequence":166},"last":{"id":"c262c112-2245-4975-a0d3-de21a8f19459","sequence":166},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:26","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":[{"commandId":"01a0ee46-ea2b-72e5-aada-1408802a3242","itemId":"bee9b543-239a-4c82-96c7-c482cf3c23ff","kind":"userMessage","recordedAt":"2026-09-29T17:47:00.014911Z","revision":1,"status":"completed","text":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"childSessionId":"dfb4300f-9488-4b4e-99a5-7b29d322952d","fallbackText":"Reminder child session","generationId":1,"itemId":"25799bf7-f24a-4eed-9953-f39079152e48","kind":"reminderChild","recordedAt":"2026-09-29T17:47:13.76483Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee46-ea35-7300-9f57-faffb63ca778","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","background":true,"backgroundInitiator":"timeout","callId":"call_01a0ee46f61c7482b289e8bb6aee0f02","itemId":"01a0ee46-f8c9-7db3-ac02-f2b78cfc7c56","kind":"toolCall","recordedAt":"2026-09-29T17:47:15.961748Z","revision":3,"status":"completed","tool":"bash","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","visibleOutput":"{\n  \"chunk_id\": \"exec-1-1\",\n  \"command\": \"sleep 12\",\n  \"description\": \"Sleep for twelve seconds\",\n  \"execution_state\": \"background_running\",\n  \"session_id\": 1,\n  \"work_id\": \"work.v1.managed_bash.sha256.10c46069f6af08edd1e9a61d87aea3c93ab0bf6df4d8fe5d5ab2efe16c2aa63e\",\n  \"model_guidance\": \"The command is still running in the background and the UI already shows its status. Do not poll for completion: the final output is delivered to you automatically as runtime context and wakes you even after you end the turn. Exception: when a runtime overdue notice names a still-running session, you may inspect it or terminate it with bash_input now. Do not narrate that it started, is running, shows current output, will continue, or has an internal session_id unless the user explicitly asks or you have substantive next work. If there is nothing else to do, end the turn without extra status text. Managed sessions end when your agent session ends: a deliverable process that must keep running after your final answer needs a detached `setsid -f` start instead (where setsid exists \u2014 Linux).\",\n  \"output\": \"\",\n  \"original_output_bytes\": 0,\n  \"original_output_tokens\": 0,\n  \"truncated\": false\n}"},{"commandId":"01a0ee46-fcb3-78ab-a15d-29882a94f6d1","itemId":"591cef15-1dd4-5a6d-ad43-d21def93699b","kind":"userMessage","recordedAt":"2026-09-29T17:47:13.762324Z","revision":1,"status":"completed","steered":true,"text":"Change the final reply to STEERED_PHASE0_OK and do not say ORIGINAL_DONE.","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"childSessionId":"4ba6a4a2-695b-4e19-b93f-399028c26c85","fallbackText":"Reminder child session","generationId":2,"itemId":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","kind":"reminderChild","recordedAt":"2026-09-29T17:47:40.516146Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee47-1fe5-72a0-84bd-4c9e9446ed0d","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","kind":"reasoning","providerItemId":"rs_6abbf9a31753fbc1f4c04388:rs_01a0ee47259e73e49456486349db6e0e","recordedAt":"2026-09-29T17:47:40.272906Z","revision":2,"status":"completed","summary":["Evaluating conflicting instructions and stop-signal guidance while waiting for the background command to finish.Resolving instruction precedence while deferring the reply until the background command completes.Deferring the final reply while waiting for the background command to complete."],"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"args":"{}","callId":"call_01a0ee4786c270bdb312bdd0ddf75a64","itemId":"01a0ee47-885e-7440-9a65-b3f7d88924a2","kind":"toolCall","recordedAt":"2026-09-29T17:47:40.51315Z","revision":2,"status":"completed","tool":"work_list","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","visibleOutput":"{\"items\":[],\"next_after_work_id\":null}"},{"childSessionId":"c03ed820-1aea-441c-8b83-c56e0a21f749","fallbackText":"Reminder child session","generationId":3,"itemId":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","kind":"reminderChild","recordedAt":"2026-09-29T17:47:50.732258Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee47-8865-7b53-b394-8d0a49863634","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"itemId":"b7f0225d-5758-4365-987d-4931bba57bb2","kind":"agentMessage","recordedAt":"2026-09-29T17:47:45.116004Z","revision":2,"status":"completed","text":"STEERED_PHASE0_OK","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},{"childSessionId":"61d34ee6-0447-4424-b6f6-6606ed0465c2","childSessionLogPath":"subagent/61d34ee6-0447-4424-b6f6-6606ed0465c2/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","kind":"reminderChild","recordedAt":"2026-09-29T17:47:50.732876Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee47-9a61-72d2-887f-7286aa2c2eb5","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"}],"mode":"inline","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"lastActivityAt":"2026-09-29T17:47:50.73531Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:52:52.675916Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:26"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","input":[{"type":"text","text":"Reply exactly RESUMED_REASONING_OK. Do not use tools."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372768,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"8d9c2ef7-22ea-4bf5-9135-c58fc18e9f2e","sequence":172},"last":{"id":"8d9c2ef7-22ea-4bf5-9135-c58fc18e9f2e","sequence":172},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:27","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372776,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"running","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:28"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372777,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"9daff9ed-dd93-4ce5-85a0-f1072bf5493a","sequence":174},"last":{"id":"9daff9ed-dd93-4ce5-85a0-f1072bf5493a","sequence":174},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:28"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372777,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","itemId":"ee63b441-2b31-4c36-b32b-c171b72a70f8","kind":"userMessage","recordedAt":"2026-09-29T17:52:52.76929Z","revision":1,"status":"completed","text":"Reply exactly RESUMED_REASONING_OK. Do not use tools.","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"9daff9ed-dd93-4ce5-85a0-f1072bf5493a","sequence":174},"last":{"id":"9daff9ed-dd93-4ce5-85a0-f1072bf5493a","sequence":174},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:29"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372777,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"f5a6a72e-b5f6-4ea6-9145-99fcf846a384","fallbackText":"Reminder child session","generationId":1,"itemId":"3c846322-d54d-4b29-adcf-297cae49bd3b","kind":"reminderChild","recordedAt":"2026-09-29T17:52:52.774658Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4c-4c26-7ec2-b0f7-97d33cd212d2","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"3c846322-d54d-4b29-adcf-297cae49bd3b","sequence":189},"last":{"id":"3c846322-d54d-4b29-adcf-297cae49bd3b","sequence":189},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:30"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704372777,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"running","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:52:52.776079Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704375471,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"8f6cd252-a989-4ae1-ad3a-0a3bd6641c7d","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:30.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704375471,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"RESUMED_REASONING_OK","field":"text","itemId":"8f6cd252-a989-4ae1-ad3a-0a3bd6641c7d","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:30.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704375471,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"8f6cd252-a989-4ae1-ad3a-0a3bd6641c7d","kind":"agentMessage","recordedAt":"2026-09-29T17:52:55.471707Z","revision":2,"status":"completed","text":"RESUMED_REASONING_OK","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"6d43268c-d4ee-4d95-945c-eb14edbca40f","sequence":202},"last":{"id":"6d43268c-d4ee-4d95-945c-eb14edbca40f","sequence":202},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:31"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704375477,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1826,"promptTokens":155365,"totalTokens":157191},"durationMs":2700,"modelId":"meta/muse-spark-1.3","promptTokens":38087,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"e738e874-b4fa-41c7-97a0-78035ef44398","sequence":205},"last":{"id":"e738e874-b4fa-41c7-97a0-78035ef44398","sequence":205},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"totalTokens":38119,"turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38087,"outputTokens":32,"reasoningTokens":15},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:32"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704375477,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"80e453a6-e7d8-4f68-be48-f9247eb569c4","fallbackText":"Reminder child session","generationId":1,"itemId":"d94cbdd9-6923-4c0b-ab29-7204b1311944","kind":"reminderChild","recordedAt":"2026-09-29T17:52:55.477459Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4c-56b5-71e3-8670-cc1c134ef4c1","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"d94cbdd9-6923-4c0b-ab29-7204b1311944","sequence":212},"last":{"id":"d94cbdd9-6923-4c0b-ab29-7204b1311944","sequence":212},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381132,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"f5a6a72e-b5f6-4ea6-9145-99fcf846a384","fallbackText":"Reminder child session","generationId":1,"itemId":"3c846322-d54d-4b29-adcf-297cae49bd3b","kind":"reminderChild","recordedAt":"2026-09-29T17:53:01.131905Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4c-4c26-7ec2-b0f7-97d33cd212d2","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"3c846322-d54d-4b29-adcf-297cae49bd3b","sequence":189},"last":{"id":"9119fc4f-bbad-4f4b-b598-e6dec79b58e4","sequence":214},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:34"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381132,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"80e453a6-e7d8-4f68-be48-f9247eb569c4","fallbackText":"Reminder child session","generationId":1,"itemId":"d94cbdd9-6923-4c0b-ab29-7204b1311944","kind":"reminderChild","recordedAt":"2026-09-29T17:53:01.132067Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee4c-56b5-71e3-8670-cc1c134ef4c1","turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"d94cbdd9-6923-4c0b-ab29-7204b1311944","sequence":212},"last":{"id":"8c77fcc2-590b-4357-9362-06eb4d178210","sequence":215},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:35"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381132,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:36"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381133,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":8363,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"cbd0c517-6488-4cad-8943-00f10f14ad1e","sequence":221},"last":{"id":"cbd0c517-6488-4cad-8943-00f10f14ad1e","sequence":221},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":2702,"turnId":"01a0ee4c-4c1f-79fb-a26a-4f18cbcf2827","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:36"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381134,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":2,"updatedAt":"2026-09-29T17:53:01.132363Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381377,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:37"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381377,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"notLoaded","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:37"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704381377,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"notLoaded","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":2,"updatedAt":"2026-09-29T17:53:01.133883Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/resume-source.ndjson b/plugins/muse-provider/test/fixtures/resume-source.ndjson
new file mode 100644
index 0000000000..8676d15e45
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/resume-source.ndjson
@@ -0,0 +1,26 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee48-370c-77f6-a1d7-ea885b8777bf","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105319,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:48:25.238493Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:48:25.238497Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:48:25.238493Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:48:25.238497Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105325,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee48-370c-77f6-a1d7-ea885b8777bf","mode":"onRequest","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","source":"approvalReconfigure","sourceRange":{"first":{"id":"1114a956-7136-4272-8928-65125b088788","sequence":5},"last":{"id":"1114a956-7136-4272-8928-65125b088788","sequence":5},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","input":[{"type":"text","text":"Reply exactly RESUME_MARKER_OK without tools."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105327,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"186af8df-b20d-481a-bdf5-592206b9239f","sequence":15},"last":{"id":"186af8df-b20d-481a-bdf5-592206b9239f","sequence":15},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105335,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105336,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"3e854976-f69f-406b-8f8d-783610940ff2","sequence":17},"last":{"id":"3e854976-f69f-406b-8f8d-783610940ff2","sequence":17},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105336,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","itemId":"21b34e05-d5c5-492b-b166-b261039b69b1","kind":"userMessage","recordedAt":"2026-09-29T17:48:25.328624Z","revision":1,"status":"completed","text":"Reply exactly RESUME_MARKER_OK without tools.","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"3e854976-f69f-406b-8f8d-783610940ff2","sequence":17},"last":{"id":"3e854976-f69f-406b-8f8d-783610940ff2","sequence":17},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105336,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"76293abd-9c8a-4a09-8edf-377e9e17bf81","fallbackText":"Reminder child session","generationId":1,"itemId":"1275560b-0426-4de0-91c2-e76c1698e73b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:25.335588Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-3776-7a82-b1bc-b843d01dbbf3","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"1275560b-0426-4de0-91c2-e76c1698e73b","sequence":35},"last":{"id":"1275560b-0426-4de0-91c2-e76c1698e73b","sequence":35},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704105340,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","createdAt":"2026-09-29T17:48:25.238493Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:48:25.335835Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704108467,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"141a95ec-0b8f-47fe-9e95-c3cfcc50b8a5","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:5.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704108467,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"RESUME_MARKER_OK","field":"text","itemId":"141a95ec-0b8f-47fe-9e95-c3cfcc50b8a5","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:5.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704108508,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"141a95ec-0b8f-47fe-9e95-c3cfcc50b8a5","kind":"agentMessage","recordedAt":"2026-09-29T17:48:28.508252Z","revision":2,"status":"completed","text":"RESUME_MARKER_OK","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"4dd2a6ba-ca4e-43f0-a652-abe5fa688f28","sequence":48},"last":{"id":"4dd2a6ba-ca4e-43f0-a652-abe5fa688f28","sequence":48},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704108518,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":27,"promptTokens":38130,"totalTokens":38157},"durationMs":3178,"modelId":"meta/muse-spark-1.3","promptTokens":38130,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"95501ca7-8eb6-4e73-9b15-33a440a26899","sequence":51},"last":{"id":"95501ca7-8eb6-4e73-9b15-33a440a26899","sequence":51},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"totalTokens":38157,"turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","usage":{"cacheReadTokens":8433,"cacheWriteTokens":0,"cachedTokens":8433,"inputTokens":38130,"outputTokens":27,"reasoningTokens":12},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704108520,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"e9f3e28f-f760-4a06-8127-543e89e5ca72","childSessionLogPath":"subagent/e9f3e28f-f760-4a06-8127-543e89e5ca72/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","kind":"reminderChild","recordedAt":"2026-09-29T17:48:28.520288Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-43e7-7921-8a10-bbfc1f118cdc","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","sequence":58},"last":{"id":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","sequence":58},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110815,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"e9f3e28f-f760-4a06-8127-543e89e5ca72","childSessionLogPath":"subagent/e9f3e28f-f760-4a06-8127-543e89e5ca72/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","kind":"reminderChild","recordedAt":"2026-09-29T17:48:30.814728Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-43e7-7921-8a10-bbfc1f118cdc","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","sequence":58},"last":{"id":"89cebb28-940c-4f03-975b-08a31fb6130b","sequence":60},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110818,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"76293abd-9c8a-4a09-8edf-377e9e17bf81","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"1275560b-0426-4de0-91c2-e76c1698e73b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:30.818129Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee48-3776-7a82-b1bc-b843d01dbbf3","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"1275560b-0426-4de0-91c2-e76c1698e73b","sequence":35},"last":{"id":"d87d7ad7-417f-4517-bcd2-c9df575e485d","sequence":64},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110818,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110819,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":5489,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"a16b76fe-60d7-4208-9c2c-d74d1f03e264","sequence":66},"last":{"id":"a16b76fe-60d7-4208-9c2c-d74d1f03e264","sequence":66},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3139,"turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110819,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"d1b814a6-7e5a-4dab-8018-97c1116890e6","sequence":67},"last":{"id":"d1b814a6-7e5a-4dab-8018-97c1116890e6","sequence":67},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:12","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704110819,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":1,"updatedAt":"2026-09-29T17:48:30.819204Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/resume-with-cursor.ndjson b/plugins/muse-provider/test/fixtures/resume-with-cursor.ndjson
new file mode 100644
index 0000000000..a11c4d0aba
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/resume-with-cursor.ndjson
@@ -0,0 +1,40 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0ee48-763e-7f15-afc7-4727ca9099e9","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","cursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"64388c89-c4e0-409e-8a86-3cdecafea128","sequence":69},"last":{"id":"64388c89-c4e0-409e-8a86-3cdecafea128","sequence":69},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:13","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"8d5ce3e0-18d8-4a82-9374-08d6d6ca7b8f","sequence":75},"last":{"id":"8d5ce3e0-18d8-4a82-9374-08d6d6ca7b8f","sequence":75},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:14","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"last":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","itemId":"a54df7ca-e35f-42f5-884f-2ced92241bc2","kind":"userMessage","recordedAt":"2026-09-29T17:48:31.26526Z","revision":1,"status":"completed","text":"What marker did you just reply? Reply only that marker, without tools.","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"last":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"ba7d5afb-1ee2-445f-a7bc-acdaa35e2149","fallbackText":"Reminder child session","generationId":1,"itemId":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:31.269224Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-4ea4-7fb0-8d4e-b9f2584e3354","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"last":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"d8ae849a-116e-4574-8f0b-54d5679e2f49","kind":"agentMessage","recordedAt":"2026-09-29T17:48:34.030457Z","revision":2,"status":"completed","text":"RESUME_MARKER_OK","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"9e2ea853-13bd-487e-ae14-9d525846a585","sequence":105},"last":{"id":"9e2ea853-13bd-487e-ae14-9d525846a585","sequence":105},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":80,"promptTokens":73806,"totalTokens":73886},"durationMs":2763,"modelId":"meta/muse-spark-1.3","promptTokens":35676,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"083d7c06-b769-4c3d-8dbe-4b024476e0ef","sequence":108},"last":{"id":"083d7c06-b769-4c3d-8dbe-4b024476e0ef","sequence":108},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"totalTokens":35729,"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","usage":{"cacheReadTokens":18033,"cacheWriteTokens":0,"cachedTokens":18033,"inputTokens":35676,"outputTokens":53,"reasoningTokens":38},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"3944baa3-651a-4816-9825-fcb67f059596","fallbackText":"Reminder child session","generationId":1,"itemId":"2651312c-6d68-406c-8fc7-18b2dc964083","kind":"reminderChild","recordedAt":"2026-09-29T17:48:34.034676Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-5972-77e2-8d85-c6afaf347ed8","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"last":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"ba7d5afb-1ee2-445f-a7bc-acdaa35e2149","fallbackText":"Reminder child session","generationId":1,"itemId":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:41.074443Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee48-4ea4-7fb0-8d4e-b9f2584e3354","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"last":{"id":"cf508ab3-de8d-44ba-a0e6-84b54d031627","sequence":117},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"3944baa3-651a-4816-9825-fcb67f059596","fallbackText":"Reminder child session","generationId":1,"itemId":"2651312c-6d68-406c-8fc7-18b2dc964083","kind":"reminderChild","recordedAt":"2026-09-29T17:48:41.074657Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-5972-77e2-8d85-c6afaf347ed8","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"last":{"id":"bf9401ff-ae66-47cb-a7e4-0305000df728","sequence":118},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":9809,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"08714520-df9a-42d2-8919-baf78f39b8aa","sequence":124},"last":{"id":"08714520-df9a-42d2-8919-baf78f39b8aa","sequence":124},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":2697,"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"dd04e5a6-68ca-457b-9ef1-c169cfbb84f5","sequence":125},"last":{"id":"dd04e5a6-68ca-457b-9ef1-c169cfbb84f5","sequence":125},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:24","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121503,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"cfa5b0f8-0cd4-4849-9496-58a47d39e026","sequence":128},"last":{"id":"cfa5b0f8-0cd4-4849-9496-58a47d39e026","sequence":128},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:25","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":null,"mode":"none","noneReason":"cursorSuffix","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"lastActivityAt":"2026-09-29T17:48:41.075126Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":2,"updatedAt":"2026-09-29T17:48:41.422766Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:25"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121509,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"cfa5b0f8-0cd4-4849-9496-58a47d39e026","sequence":128},"last":{"id":"cfa5b0f8-0cd4-4849-9496-58a47d39e026","sequence":128},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:25","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","input":[{"type":"text","text":"What marker did you just reply? Reply only that marker, without tools."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121510,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2ee1047a-6a1f-4b43-898b-6e5834143d11","sequence":134},"last":{"id":"2ee1047a-6a1f-4b43-898b-6e5834143d11","sequence":134},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:26","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121518,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:27"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121519,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"0dc78b21-3a29-43ff-ad87-74d725e5253b","sequence":136},"last":{"id":"0dc78b21-3a29-43ff-ad87-74d725e5253b","sequence":136},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:27"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121519,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","itemId":"64f515a8-60db-47a1-b9f8-84cc1e226145","kind":"userMessage","recordedAt":"2026-09-29T17:48:41.511669Z","revision":1,"status":"completed","text":"What marker did you just reply? Reply only that marker, without tools.","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"0dc78b21-3a29-43ff-ad87-74d725e5253b","sequence":136},"last":{"id":"0dc78b21-3a29-43ff-ad87-74d725e5253b","sequence":136},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:28"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121519,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"461905f8-cc17-4cbe-a1c1-050cf0836e6b","fallbackText":"Reminder child session","generationId":1,"itemId":"29bb3839-3044-488c-8553-9f9e4b238249","kind":"reminderChild","recordedAt":"2026-09-29T17:48:41.514846Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-76aa-76b0-b00a-1e778326da40","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"29bb3839-3044-488c-8553-9f9e4b238249","sequence":151},"last":{"id":"29bb3839-3044-488c-8553-9f9e4b238249","sequence":151},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:29"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121519,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":2,"updatedAt":"2026-09-29T17:48:41.516193Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704125163,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"0db738b7-658c-476c-8835-c84c6ddecd54","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:29.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704125163,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"RESUME_MARKER_OK","field":"text","itemId":"0db738b7-658c-476c-8835-c84c6ddecd54","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:29.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704125256,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"0db738b7-658c-476c-8835-c84c6ddecd54","kind":"agentMessage","recordedAt":"2026-09-29T17:48:45.256357Z","revision":2,"status":"completed","text":"RESUME_MARKER_OK","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"d973348a-bea5-4a57-8214-ec2bba989f5d","sequence":164},"last":{"id":"d973348a-bea5-4a57-8214-ec2bba989f5d","sequence":164},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:30"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704125260,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":123,"promptTokens":109558,"totalTokens":109681},"durationMs":3744,"modelId":"meta/muse-spark-1.3","promptTokens":35752,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2fcc5b33-1c74-455c-a4cf-c45c83514ce2","sequence":167},"last":{"id":"2fcc5b33-1c74-455c-a4cf-c45c83514ce2","sequence":167},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"totalTokens":35795,"turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","usage":{"cacheReadTokens":35185,"cacheWriteTokens":0,"cachedTokens":35185,"inputTokens":35752,"outputTokens":43,"reasoningTokens":28},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:31"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704125260,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"cd242dac-6012-404d-b95a-4de310c201f7","fallbackText":"Reminder child session","generationId":1,"itemId":"8a3e4e65-1300-41a0-8b12-e22be2b81b83","kind":"reminderChild","recordedAt":"2026-09-29T17:48:45.260754Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-854c-7311-8e8d-e215dad84b7a","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"8a3e4e65-1300-41a0-8b12-e22be2b81b83","sequence":174},"last":{"id":"8a3e4e65-1300-41a0-8b12-e22be2b81b83","sequence":174},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:32"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128411,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"cd242dac-6012-404d-b95a-4de310c201f7","fallbackText":"Reminder child session","generationId":1,"itemId":"8a3e4e65-1300-41a0-8b12-e22be2b81b83","kind":"reminderChild","recordedAt":"2026-09-29T17:48:48.411846Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-854c-7311-8e8d-e215dad84b7a","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"8a3e4e65-1300-41a0-8b12-e22be2b81b83","sequence":174},"last":{"id":"f97a5fcb-0c3c-475f-99b0-e2f024fb5bc1","sequence":176},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:33"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128414,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"461905f8-cc17-4cbe-a1c1-050cf0836e6b","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"29bb3839-3044-488c-8553-9f9e4b238249","kind":"reminderChild","recordedAt":"2026-09-29T17:48:48.41459Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee48-76aa-76b0-b00a-1e778326da40","turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"29bb3839-3044-488c-8553-9f9e4b238249","sequence":151},"last":{"id":"d5d80db2-a75e-42f6-9e02-af7eee6c0b03","sequence":180},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:34"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128414,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:35"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128415,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":6903,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"c9ab8973-00a7-4cdc-9779-bde0590469b0","sequence":182},"last":{"id":"c9ab8973-00a7-4cdc-9779-bde0590469b0","sequence":182},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3651,"turnId":"01a0ee48-76a5-7393-a8c3-e14e089b52f0","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:35"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128416,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":3,"updatedAt":"2026-09-29T17:48:48.414748Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128629,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:36"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128629,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"notLoaded","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:36"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704128629,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"notLoaded","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":3,"updatedAt":"2026-09-29T17:48:48.41637Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/resume-without-cursor.ndjson b/plugins/muse-provider/test/fixtures/resume-without-cursor.ndjson
new file mode 100644
index 0000000000..3a1c0184db
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/resume-without-cursor.ndjson
@@ -0,0 +1,28 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/resume","params":{"commandId":"01a0ee48-4e3d-7dab-ac35-df9392bc6f4d","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111255,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"64388c89-c4e0-409e-8a86-3cdecafea128","sequence":69},"last":{"id":"64388c89-c4e0-409e-8a86-3cdecafea128","sequence":69},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:13","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"history":{"items":[{"commandId":"01a0ee48-376d-7cff-a66c-5e1ac7035295","itemId":"21b34e05-d5c5-492b-b166-b261039b69b1","kind":"userMessage","recordedAt":"2026-09-29T17:48:25.328624Z","revision":1,"status":"completed","text":"Reply exactly RESUME_MARKER_OK without tools.","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},{"childSessionId":"76293abd-9c8a-4a09-8edf-377e9e17bf81","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"1275560b-0426-4de0-91c2-e76c1698e73b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:30.818129Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee48-3776-7a82-b1bc-b843d01dbbf3","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},{"itemId":"141a95ec-0b8f-47fe-9e95-c3cfcc50b8a5","kind":"agentMessage","recordedAt":"2026-09-29T17:48:28.508252Z","revision":2,"status":"completed","text":"RESUME_MARKER_OK","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"},{"childSessionId":"e9f3e28f-f760-4a06-8127-543e89e5ca72","childSessionLogPath":"subagent/e9f3e28f-f760-4a06-8127-543e89e5ca72/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"bebe2029-2f83-4cbb-9ac5-6da291835a0c","kind":"reminderChild","recordedAt":"2026-09-29T17:48:30.814728Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-43e7-7921-8a10-bbfc1f118cdc","turnId":"01a0ee48-376d-7cff-a66c-5e1ac7035295"}],"mode":"inline","snapshot":null},"pendingRequests":[],"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"replay"},"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"lastActivityAt":"2026-09-29T17:48:30.818304Z","modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":1,"updatedAt":"2026-09-29T17:48:31.178029Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:13"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","input":[{"type":"text","text":"What marker did you just reply? Reply only that marker, without tools."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111264,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"8d5ce3e0-18d8-4a82-9374-08d6d6ca7b8f","sequence":75},"last":{"id":"8d5ce3e0-18d8-4a82-9374-08d6d6ca7b8f","sequence":75},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:14","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111274,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111275,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"last":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111275,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","itemId":"a54df7ca-e35f-42f5-884f-2ced92241bc2","kind":"userMessage","recordedAt":"2026-09-29T17:48:31.26526Z","revision":1,"status":"completed","text":"What marker did you just reply? Reply only that marker, without tools.","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"last":{"id":"263cb24d-ea39-436e-a27d-933e5c8c63b9","sequence":77},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111275,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"ba7d5afb-1ee2-445f-a7bc-acdaa35e2149","fallbackText":"Reminder child session","generationId":1,"itemId":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:31.269224Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-4ea4-7fb0-8d4e-b9f2584e3354","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"last":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704111275,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"running","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":1,"updatedAt":"2026-09-29T17:48:31.270933Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704113963,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"d8ae849a-116e-4574-8f0b-54d5679e2f49","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:17.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704113963,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"RESUME_MARKER_OK","field":"text","itemId":"d8ae849a-116e-4574-8f0b-54d5679e2f49","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:17.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704114030,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"d8ae849a-116e-4574-8f0b-54d5679e2f49","kind":"agentMessage","recordedAt":"2026-09-29T17:48:34.030457Z","revision":2,"status":"completed","text":"RESUME_MARKER_OK","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"9e2ea853-13bd-487e-ae14-9d525846a585","sequence":105},"last":{"id":"9e2ea853-13bd-487e-ae14-9d525846a585","sequence":105},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704114034,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":80,"promptTokens":73806,"totalTokens":73886},"durationMs":2763,"modelId":"meta/muse-spark-1.3","promptTokens":35676,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"083d7c06-b769-4c3d-8dbe-4b024476e0ef","sequence":108},"last":{"id":"083d7c06-b769-4c3d-8dbe-4b024476e0ef","sequence":108},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"totalTokens":35729,"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","usage":{"cacheReadTokens":18033,"cacheWriteTokens":0,"cachedTokens":18033,"inputTokens":35676,"outputTokens":53,"reasoningTokens":38},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704114034,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"3944baa3-651a-4816-9825-fcb67f059596","fallbackText":"Reminder child session","generationId":1,"itemId":"2651312c-6d68-406c-8fc7-18b2dc964083","kind":"reminderChild","recordedAt":"2026-09-29T17:48:34.034676Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee48-5972-77e2-8d85-c6afaf347ed8","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"last":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121074,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"ba7d5afb-1ee2-445f-a7bc-acdaa35e2149","fallbackText":"Reminder child session","generationId":1,"itemId":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","kind":"reminderChild","recordedAt":"2026-09-29T17:48:41.074443Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee48-4ea4-7fb0-8d4e-b9f2584e3354","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"a16c82ca-103a-48ee-97e5-04bf9f49da6b","sequence":92},"last":{"id":"cf508ab3-de8d-44ba-a0e6-84b54d031627","sequence":117},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121074,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"3944baa3-651a-4816-9825-fcb67f059596","fallbackText":"Reminder child session","generationId":1,"itemId":"2651312c-6d68-406c-8fc7-18b2dc964083","kind":"reminderChild","recordedAt":"2026-09-29T17:48:41.074657Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee48-5972-77e2-8d85-c6afaf347ed8","turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d"},"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"2651312c-6d68-406c-8fc7-18b2dc964083","sequence":115},"last":{"id":"bf9401ff-ae66-47cb-a7e4-0305000df728","sequence":118},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121075,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121076,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":9809,"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"08714520-df9a-42d2-8919-baf78f39b8aa","sequence":124},"last":{"id":"08714520-df9a-42d2-8919-baf78f39b8aa","sequence":124},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":2697,"turnId":"01a0ee48-4e9f-7119-afdc-f5793f43307d","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121076,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","sourceRange":{"first":{"id":"dd04e5a6-68ca-457b-9ef1-c169cfbb84f5","sequence":125},"last":{"id":"dd04e5a6-68ca-457b-9ef1-c169cfbb84f5","sequence":125},"stream":{"id":"01a0ee48-3713-70a0-bab7-ab463b7bc580","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:24","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121076,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"idle","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":2,"updatedAt":"2026-09-29T17:48:41.076013Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121279,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121279,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"notLoaded","viewCursor":"v:01a0ee48-3713-70a0-bab7-ab463b7bc580:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704121279,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:48:25.236035Z","firstUserPrompt":"Reply exactly RESUME_MARKER_OK without tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee48-3713-70a0-bab7-ab463b7bc580/session.jsonl","providerId":"meta","sessionId":"01a0ee48-3713-70a0-bab7-ab463b7bc580","status":"notLoaded","title":"Reply exactly RESUME_MARKER_OK without tools.","turnCount":2,"updatedAt":"2026-09-29T17:48:41.076013Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/skill.ndjson b/plugins/muse-provider/test/fixtures/skill.ndjson
new file mode 100644
index 0000000000..147579d231
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/skill.ndjson
@@ -0,0 +1,31 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee45-d4b5-7b36-adce-a396e7f9286f","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949070,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:45:48.992273Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-d4bd-77d2-98a0-79c6a1333e80/session.jsonl","providerId":"meta","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:45:48.992277Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:45:48.992273Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-d4bd-77d2-98a0-79c6a1333e80/session.jsonl","providerId":"meta","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:45:48.992277Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949078,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee45-d4b5-7b36-adce-a396e7f9286f","mode":"onRequest","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","source":"approvalReconfigure","sourceRange":{"first":{"id":"7ac702ca-483a-4aed-821f-2262a0f48943","sequence":5},"last":{"id":"7ac702ca-483a-4aed-821f-2262a0f48943","sequence":5},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"skill/list","params":{"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"skills":[{"description":"Reply with the Phase 0 skill marker.","displayName":"phase0","selector":"phase0","source":"project"}]}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/start","params":{"commandId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","input":[{"type":"skill","selector":"phase0"}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949087,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"5ec98360-5a49-4413-bbdc-e423513d09ec","sequence":14},"last":{"id":"5ec98360-5a49-4413-bbdc-e423513d09ec","sequence":14},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949095,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"running","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949096,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"f8fbf545-2d43-4311-bf8c-dc367f670464","sequence":15},"last":{"id":"f8fbf545-2d43-4311-bf8c-dc367f670464","sequence":15},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949096,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","itemId":"5dbcaf15-bef5-49bf-8569-5242008ac198","kind":"userMessage","recordedAt":"2026-09-29T17:45:49.087991Z","revision":1,"status":"completed","text":"/phase0","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"f8fbf545-2d43-4311-bf8c-dc367f670464","sequence":15},"last":{"id":"f8fbf545-2d43-4311-bf8c-dc367f670464","sequence":15},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949096,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"24712ab9-77e4-450a-98b1-cfb455e64a99","fallbackText":"Reminder child session","generationId":1,"itemId":"3e9a8a07-f7ed-400f-aecd-45413565ff84","kind":"reminderChild","recordedAt":"2026-09-29T17:45:49.096505Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-d527-7133-8954-a78cbe078b40","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"3e9a8a07-f7ed-400f-aecd-45413565ff84","sequence":34},"last":{"id":"3e9a8a07-f7ed-400f-aecd-45413565ff84","sequence":34},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703949101,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","createdAt":"2026-09-29T17:45:48.992273Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-d4bd-77d2-98a0-79c6a1333e80/session.jsonl","providerId":"meta","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:45:49.096262Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952151,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"59a7cac6-9558-4ff9-a029-6871aa0f250f","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:5.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952151,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"SKILL_PHASE0","field":"text","itemId":"59a7cac6-9558-4ff9-a029-6871aa0f250f","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:5.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952151,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"_OK","field":"text","itemId":"59a7cac6-9558-4ff9-a029-6871aa0f250f","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:5.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952208,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"59a7cac6-9558-4ff9-a029-6871aa0f250f","kind":"agentMessage","recordedAt":"2026-09-29T17:45:52.208437Z","revision":2,"status":"completed","text":"SKILL_PHASE0_OK","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"f6ce5178-aab1-4205-a5cf-07a01992991d","sequence":47},"last":{"id":"f6ce5178-aab1-4205-a5cf-07a01992991d","sequence":47},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952212,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":28,"promptTokens":38273,"totalTokens":38301},"durationMs":3111,"modelId":"meta/muse-spark-1.3","promptTokens":38273,"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"38e7ce9f-4de8-4e5b-9051-e4f3cbabeb07","sequence":50},"last":{"id":"38e7ce9f-4de8-4e5b-9051-e4f3cbabeb07","sequence":50},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"totalTokens":38301,"turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38273,"outputTokens":28,"reasoningTokens":13},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703952214,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"e36de071-1e04-472d-aa8a-8ceddb5de660","childSessionLogPath":"subagent/e36de071-1e04-472d-aa8a-8ceddb5de660/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"c787e6af-1d6d-44b6-892e-2e8bc714b3b3","kind":"reminderChild","recordedAt":"2026-09-29T17:45:52.214263Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-e154-7511-a5d1-c318a04ffaca","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"c787e6af-1d6d-44b6-892e-2e8bc714b3b3","sequence":57},"last":{"id":"c787e6af-1d6d-44b6-892e-2e8bc714b3b3","sequence":57},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703958991,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"24712ab9-77e4-450a-98b1-cfb455e64a99","fallbackText":"Reminder child session","generationId":1,"itemId":"3e9a8a07-f7ed-400f-aecd-45413565ff84","kind":"reminderChild","recordedAt":"2026-09-29T17:45:58.991191Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee45-d527-7133-8954-a78cbe078b40","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"3e9a8a07-f7ed-400f-aecd-45413565ff84","sequence":34},"last":{"id":"f5852563-4e6c-497f-a014-b9f510fd8a08","sequence":59},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703958991,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"e36de071-1e04-472d-aa8a-8ceddb5de660","childSessionLogPath":"subagent/e36de071-1e04-472d-aa8a-8ceddb5de660/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"c787e6af-1d6d-44b6-892e-2e8bc714b3b3","kind":"reminderChild","recordedAt":"2026-09-29T17:45:58.991586Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee45-e154-7511-a5d1-c318a04ffaca","turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e"},"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"c787e6af-1d6d-44b6-892e-2e8bc714b3b3","sequence":57},"last":{"id":"49c39143-103a-4ff6-9da9-5f460199aad5","sequence":60},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703958993,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"idle","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703958994,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":9905,"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","sourceRange":{"first":{"id":"0085e82d-1273-4721-a949-b0616fc6e059","sequence":66},"last":{"id":"0085e82d-1273-4721-a949-b0616fc6e059","sequence":66},"stream":{"id":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":3063,"turnId":"01a0ee45-d51c-7adf-a4fc-c0c3e6b0a03e","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703958994,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:45:48.989825Z","firstUserPrompt":"/phase0","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-d4bd-77d2-98a0-79c6a1333e80/session.jsonl","providerId":"meta","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"idle","title":"/phase0","turnCount":1,"updatedAt":"2026-09-29T17:45:58.993139Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703959207,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703959207,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"notLoaded","viewCursor":"v:01a0ee45-d4bd-77d2-98a0-79c6a1333e80:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703959207,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:45:48.989825Z","firstUserPrompt":"/phase0","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-d4bd-77d2-98a0-79c6a1333e80/session.jsonl","providerId":"meta","sessionId":"01a0ee45-d4bd-77d2-98a0-79c6a1333e80","status":"notLoaded","title":"/phase0","turnCount":1,"updatedAt":"2026-09-29T17:45:58.994348Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/staged-approval.ndjson b/plugins/muse-provider/test/fixtures/staged-approval.ndjson
new file mode 100644
index 0000000000..6c64f9be72
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/staged-approval.ndjson
@@ -0,0 +1,51 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee45-3a70-7681-ab97-ddf447f594a0","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909575,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:45:09.4981Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:45:09.498104Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:45:09.4981Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:45:09.498104Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909580,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee45-3a70-7681-ab97-ddf447f594a0","mode":"onRequest","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","source":"approvalReconfigure","sourceRange":{"first":{"id":"63699ada-6377-4996-8f16-591c59e31615","sequence":5},"last":{"id":"63699ada-6377-4996-8f16-591c59e31615","sequence":5},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","input":[{"type":"text","text":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909582,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"f5b00d5c-101c-4114-b6d4-6fd185b3a9e7","sequence":15},"last":{"id":"f5b00d5c-101c-4114-b6d4-6fd185b3a9e7","sequence":15},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909590,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909591,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"8d53885c-d5ed-4da6-826f-c2718d3107ba","sequence":17},"last":{"id":"8d53885c-d5ed-4da6-826f-c2718d3107ba","sequence":17},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909591,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","itemId":"c1c58c19-3efe-486b-83b4-7059c81e4abc","kind":"userMessage","recordedAt":"2026-09-29T17:45:09.583635Z","revision":1,"status":"completed","text":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"8d53885c-d5ed-4da6-826f-c2718d3107ba","sequence":17},"last":{"id":"8d53885c-d5ed-4da6-826f-c2718d3107ba","sequence":17},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909591,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"8d237cca-8a96-414d-b5a0-b922372b1111","fallbackText":"Reminder child session","generationId":1,"itemId":"604107b6-dcf2-4ac8-9c20-85adace9a056","kind":"reminderChild","recordedAt":"2026-09-29T17:45:09.590882Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-3ad5-7ae3-b92b-6080ffbaed08","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"604107b6-dcf2-4ac8-9c20-85adace9a056","sequence":35},"last":{"id":"604107b6-dcf2-4ac8-9c20-85adace9a056","sequence":35},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909595,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","createdAt":"2026-09-29T17:45:09.4981Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:45:09.591134Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915208,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":301,"promptTokens":38156,"totalTokens":38457},"durationMs":5613,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38156,"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"adcc2a9f-a1ab-428f-b213-1c3dc1d19282","sequence":51},"last":{"id":"adcc2a9f-a1ab-428f-b213-1c3dc1d19282","sequence":51},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"totalTokens":38457,"turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38156,"outputTokens":301,"reasoningTokens":201},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915210,"jsonrpc":"2.0","method":"session/statusChanged","params":{"attention":["approvalPending"],"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:7"}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","method":"approval/request","params":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"currentRequirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","judgeEscalated":false,"protectedWrite":false,"rawArgs":"{\"command\":\"wc -l f && rm -rf f\",\"description\":\"Count lines then remove file\"}","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"5e822176-0464-43c4-9419-4355b481f8a2","sequence":56},"last":{"id":"5e822176-0464-43c4-9419-4355b481f8a2","sequence":56},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":2},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":2}],"workspaceRoot":"/tmp/muse-phase0/repo"},"taskId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","toolCallId":"call_01a0ee454ed276abb13fb5bc95951f53","toolName":"bash","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915211,"jsonrpc":"2.0","method":"approval/requested","params":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"currentRequirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","judgeEscalated":false,"protectedWrite":false,"rawArgs":"{\"command\":\"wc -l f && rm -rf f\",\"description\":\"Count lines then remove file\"}","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"5e822176-0464-43c4-9419-4355b481f8a2","sequence":56},"last":{"id":"5e822176-0464-43c4-9419-4355b481f8a2","sequence":56},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":2},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"resolution":{"kind":"unresolved"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":2}],"workspaceRoot":"/tmp/muse-phase0/repo"},"taskId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","toolCallId":"call_01a0ee454ed276abb13fb5bc95951f53","toolName":"bash","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915211,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","attention":["approvalPending"],"branch":"main","createdAt":"2026-09-29T17:45:09.495708Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","title":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","turnCount":0,"updatedAt":"2026-09-29T17:45:15.210247Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"result":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"approval/decide","params":{"commandId":"01a0ee45-50cb-7347-a392-c2c3f12add59","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"choiceId":"allow_once"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","commandId":"01a0ee45-50cb-7347-a392-c2c3f12add59","status":"accepted","terminal":true}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915221,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915221,"jsonrpc":"2.0","method":"approval/updated","params":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","availableChoices":[{"choiceId":"allow_once","decision":"approved","label":"Allow once","scope":"once"},{"choiceId":"allow_local_prefix","decision":"approvedPolicyAmendment","label":"Always allow in this workspace: rm ...","rulePreview":"Always allow in this workspace: rm ...","scope":"localPersistent"},{"acceptsFeedback":true,"choiceId":"abort","decision":"abort","label":"Reject","scope":"once"}],"change":{"choiceId":"allow_once","decision":"approved","kind":"stageResolved","requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1}},"currentRequirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"8fb0dc1b-0325-49f0-90c7-127e642863ba","sequence":59},"last":{"id":"8fb0dc1b-0325-49f0-90c7-127e642863ba","sequence":59},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"subject":{"command":"wc -l f && rm -rf f","kind":"shell","stages":[{"argv":["wc","-l","f"],"argvComplete":true,"position":1,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":0},"resolution":{"kind":"knownSafe"},"suggestedPrefix":{"argvPrefix":["wc"],"label":"Always allow in this workspace: wc ..."},"totalStages":2},{"argv":["rm","-rf","f"],"argvComplete":true,"position":2,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"resolution":{"kind":"allowOnce"},"suggestedPrefix":{"argvPrefix":["rm"],"label":"Always allow in this workspace: rm ..."},"totalStages":2}],"workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915221,"jsonrpc":"2.0","method":"approval/resolved","params":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","decidedByCommandId":"01a0ee45-50cb-7347-a392-c2c3f12add59","decision":"approved","itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","policyResult":"allow","resolvedBy":"user","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"6b80bd39-abfc-45fb-9c9b-4dd995ede7af","sequence":60},"last":{"id":"6b80bd39-abfc-45fb-9c9b-4dd995ede7af","sequence":60},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"stageEvidence":[{"argv":["wc","-l","f"],"position":1,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":0},"resolution":{"kind":"knownSafe"},"totalStages":2},{"argv":["rm","-rf","f"],"position":2,"requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"resolution":{"kind":"allowOnce"},"totalStages":2}],"turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915221,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command\":\"wc -l f && rm -rf f\",\"description\":\"Count lines then remove file\"}","callId":"call_01a0ee454ed276abb13fb5bc95951f53","itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","kind":"toolCall","recordedAt":"2026-09-29T17:45:15.217346Z","revision":1,"status":"inProgress","tool":"bash","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"a1c326a1-b2f7-460d-9bf0-42fbc0e7b995","sequence":53},"last":{"id":"47723f89-a36b-4c4d-8011-63ae936b976a","sequence":66},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915221,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","branch":"main","createdAt":"2026-09-29T17:45:09.495708Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"running","title":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","turnCount":0,"updatedAt":"2026-09-29T17:45:15.21762Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":5,"method":"approval/decide","params":{"commandId":"01a0ee45-50d5-73ff-a6a1-b8db5e9cdf2f","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","requirementId":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sourceIndex":1},"choiceId":"allow_once"}}}
+{"dir":"in","msg":{"error":{"code":-32051,"data":{"approvalId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","kind":"approvalAlreadyResolved","resolution":{"decision":"approved","resolvedBy":"user","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:9"},"retryable":false},"message":"approval 01a0ee45-50c8-7b92-a88f-04a4dfa119a5 is already resolved"},"id":5,"jsonrpc":"2.0"}}
+{"dir":"in","msg":{"emittedAtMs":1790703915429,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"2 f\n","field":"output","itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:10.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915442,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command\":\"wc -l f && rm -rf f\",\"description\":\"Count lines then remove file\"}","callId":"call_01a0ee454ed276abb13fb5bc95951f53","itemId":"01a0ee45-50c8-7b92-a88f-04a4dfa119a5","kind":"toolCall","recordedAt":"2026-09-29T17:45:15.442455Z","revision":2,"status":"completed","tool":"bash","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","visibleOutput":"2 f\n"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"a1c326a1-b2f7-460d-9bf0-42fbc0e7b995","sequence":53},"last":{"id":"d11e7d23-dde1-48ac-8775-6afbc5b1eaa4","sequence":74},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915444,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"8d237cca-8a96-414d-b5a0-b922372b1111","fallbackText":"Reminder child session","generationId":1,"itemId":"604107b6-dcf2-4ac8-9c20-85adace9a056","kind":"reminderChild","recordedAt":"2026-09-29T17:45:15.444591Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee45-3ad5-7ae3-b92b-6080ffbaed08","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"604107b6-dcf2-4ac8-9c20-85adace9a056","sequence":35},"last":{"id":"8db47bbe-b881-4efb-8e30-4838586ce540","sequence":77},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703915447,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"d461ee5e-a0e2-482d-a91c-604217650af2","fallbackText":"Reminder child session","generationId":2,"itemId":"553828b6-6f65-405e-b5d9-06e5a9ad24e9","kind":"reminderChild","recordedAt":"2026-09-29T17:45:15.447283Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-51b5-78a1-bd60-165e8384cd55","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"553828b6-6f65-405e-b5d9-06e5a9ad24e9","sequence":86},"last":{"id":"553828b6-6f65-405e-b5d9-06e5a9ad24e9","sequence":86},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918084,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"619a0511-ea64-4544-93c9-897f38af1eff","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918084,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Ran `wc -l f &&","field":"text","itemId":"619a0511-ea64-4544-93c9-897f38af1eff","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918084,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" rm -rf f` in one call.","field":"text","itemId":"619a0511-ea64-4544-93c9-897f38af1eff","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918084,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" Output:","field":"text","itemId":"619a0511-ea64-4544-93c9-897f38af1eff","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918084,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `2 f`, file removed","field":"text","itemId":"619a0511-ea64-4544-93c9-897f38af1eff","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918087,"jsonrpc":"2.0","method":"item/delta","params":{"delta":".","field":"text","itemId":"619a0511-ea64-4544-93c9-897f38af1eff","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:13.6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918160,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"619a0511-ea64-4544-93c9-897f38af1eff","kind":"agentMessage","recordedAt":"2026-09-29T17:45:18.159688Z","revision":2,"status":"completed","text":"Ran `wc -l f && rm -rf f` in one call. Output: `2 f`, file removed.","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"faf6c080-8731-4b2c-a2ff-f058cad984a1","sequence":99},"last":{"id":"faf6c080-8731-4b2c-a2ff-f058cad984a1","sequence":99},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918163,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":343,"promptTokens":76718,"totalTokens":77061},"durationMs":2710,"modelId":"meta/muse-spark-1.3","promptTokens":38562,"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"3450d708-ea81-4155-b2fb-9dbb5333a0b4","sequence":102},"last":{"id":"3450d708-ea81-4155-b2fb-9dbb5333a0b4","sequence":102},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"totalTokens":38604,"turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38562,"outputTokens":42,"reasoningTokens":7},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703918166,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"b4b12de3-0d11-44c5-9302-d74629e69534","childSessionLogPath":"subagent/b4b12de3-0d11-44c5-9302-d74629e69534/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"fe97c426-62a1-4a4d-bacb-da431469b75a","kind":"reminderChild","recordedAt":"2026-09-29T17:45:18.165735Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-5c54-7e70-bf0e-8fa21d3c8752","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"fe97c426-62a1-4a4d-bacb-da431469b75a","sequence":109},"last":{"id":"fe97c426-62a1-4a4d-bacb-da431469b75a","sequence":109},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925286,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"d461ee5e-a0e2-482d-a91c-604217650af2","fallbackText":"Reminder child session","generationId":2,"itemId":"553828b6-6f65-405e-b5d9-06e5a9ad24e9","kind":"reminderChild","recordedAt":"2026-09-29T17:45:25.286272Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee45-51b5-78a1-bd60-165e8384cd55","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"553828b6-6f65-405e-b5d9-06e5a9ad24e9","sequence":86},"last":{"id":"763bb712-8197-4268-a6e7-1af1d539d9b8","sequence":111},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925287,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"b4b12de3-0d11-44c5-9302-d74629e69534","childSessionLogPath":"subagent/b4b12de3-0d11-44c5-9302-d74629e69534/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"fe97c426-62a1-4a4d-bacb-da431469b75a","kind":"reminderChild","recordedAt":"2026-09-29T17:45:25.286817Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee45-5c54-7e70-bf0e-8fa21d3c8752","turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29"},"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"fe97c426-62a1-4a4d-bacb-da431469b75a","sequence":109},"last":{"id":"ee0b2877-bfe6-4039-ae8a-482001756652","sequence":112},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925289,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"idle","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925290,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":15705,"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","sourceRange":{"first":{"id":"a099c7f2-2b2c-41d0-a222-25a4cca243e9","sequence":118},"last":{"id":"a099c7f2-2b2c-41d0-a222-25a4cca243e9","sequence":118},"stream":{"id":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":8501,"turnId":"01a0ee45-3acc-7f17-a996-8de3b5463c29","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925292,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:45:09.495708Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"idle","title":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","turnCount":1,"updatedAt":"2026-09-29T17:45:25.28908Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925526,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925526,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"notLoaded","viewCursor":"v:01a0ee45-3a77-7df1-84fe-f1348f74bb7b:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703925526,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:45:09.495708Z","firstUserPrompt":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee45-3a77-7df1-84fe-f1348f74bb7b/session.jsonl","providerId":"meta","sessionId":"01a0ee45-3a77-7df1-84fe-f1348f74bb7b","status":"notLoaded","title":"Run exactly wc -l f && rm -rf f using the shell tool. f is disposable test data and I authorize deleting it. Do not split the command into separate calls.","turnCount":1,"updatedAt":"2026-09-29T17:45:25.292511Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/steer.ndjson b/plugins/muse-provider/test/fixtures/steer.ndjson
new file mode 100644
index 0000000000..82ec68832c
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/steer.ndjson
@@ -0,0 +1,48 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee46-e9cd-7cf5-a45a-e477a82cb206","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020005,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:46:59.927363Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:46:59.927367Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:46:59.927363Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:46:59.927367Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020011,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee46-e9cd-7cf5-a45a-e477a82cb206","mode":"onRequest","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","source":"approvalReconfigure","sourceRange":{"first":{"id":"cad43b46-1d52-43d2-9841-35b41ae09a9e","sequence":5},"last":{"id":"cad43b46-1d52-43d2-9841-35b41ae09a9e","sequence":5},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee46-ea2b-72e5-aada-1408802a3242","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","input":[{"type":"text","text":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020014,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"556e8486-0c1c-4b21-b2f1-07aaa518795b","sequence":15},"last":{"id":"556e8486-0c1c-4b21-b2f1-07aaa518795b","sequence":15},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee46-ea2b-72e5-aada-1408802a3242","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020022,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"running","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020023,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee46-ea2b-72e5-aada-1408802a3242","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"720ff452-b375-47ab-b2c5-5000bd6e271f","sequence":17},"last":{"id":"720ff452-b375-47ab-b2c5-5000bd6e271f","sequence":17},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020023,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee46-ea2b-72e5-aada-1408802a3242","itemId":"bee9b543-239a-4c82-96c7-c482cf3c23ff","kind":"userMessage","recordedAt":"2026-09-29T17:47:00.014911Z","revision":1,"status":"completed","text":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"720ff452-b375-47ab-b2c5-5000bd6e271f","sequence":17},"last":{"id":"720ff452-b375-47ab-b2c5-5000bd6e271f","sequence":17},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020023,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"dfb4300f-9488-4b4e-99a5-7b29d322952d","fallbackText":"Reminder child session","generationId":1,"itemId":"25799bf7-f24a-4eed-9953-f39079152e48","kind":"reminderChild","recordedAt":"2026-09-29T17:47:00.023027Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee46-ea35-7300-9f57-faffb63ca778","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"25799bf7-f24a-4eed-9953-f39079152e48","sequence":35},"last":{"id":"25799bf7-f24a-4eed-9953-f39079152e48","sequence":35},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704020029,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","createdAt":"2026-09-29T17:46:59.927363Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:47:00.023289Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704023752,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":173,"promptTokens":38144,"totalTokens":38317},"durationMs":3724,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38144,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"f4bb27f0-964e-4bea-910e-1893ca61433f","sequence":50},"last":{"id":"f4bb27f0-964e-4bea-910e-1893ca61433f","sequence":50},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"totalTokens":38317,"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38144,"outputTokens":173,"reasoningTokens":82},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704023755,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","callId":"call_01a0ee46f61c7482b289e8bb6aee0f02","itemId":"01a0ee46-f8c9-7db3-ac02-f2b78cfc7c56","kind":"toolCall","recordedAt":"2026-09-29T17:47:03.755423Z","revision":1,"status":"inProgress","tool":"bash","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"b11864b4-ec2c-46a8-a5b4-fd5594b69c40","sequence":52},"last":{"id":"c425da72-50aa-45ea-a37c-0f76f78dca96","sequence":58},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:7"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"turn/start","params":{"commandId":"01a0ee46-fcb3-78ab-a15d-29882a94f6d1","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","input":[{"type":"text","text":"Change the final reply to STEERED_PHASE0_OK and do not say ORIGINAL_DONE."}],"reasoningEffort":"low","ifBusy":"steer"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"commandId":"01a0ee46-fcb3-78ab-a15d-29882a94f6d1","disposition":"steered","startedNewTurn":false,"status":"accepted","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704033759,"jsonrpc":"2.0","method":"item/updated","params":{"item":{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","background":true,"backgroundInitiator":"timeout","callId":"call_01a0ee46f61c7482b289e8bb6aee0f02","itemId":"01a0ee46-f8c9-7db3-ac02-f2b78cfc7c56","kind":"toolCall","recordedAt":"2026-09-29T17:47:13.759048Z","revision":2,"status":"inProgress","tool":"bash","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"b11864b4-ec2c-46a8-a5b4-fd5594b69c40","sequence":52},"last":{"id":"5b5abfae-b315-4f40-8a8a-a0fffdf228ab","sequence":63},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704033762,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee46-fcb3-78ab-a15d-29882a94f6d1","itemId":"591cef15-1dd4-5a6d-ad43-d21def93699b","kind":"userMessage","recordedAt":"2026-09-29T17:47:13.762324Z","revision":1,"status":"completed","steered":true,"text":"Change the final reply to STEERED_PHASE0_OK and do not say ORIGINAL_DONE.","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"fa12e860-f32c-4e3e-906d-56085eeb1f35","sequence":69},"last":{"id":"fa12e860-f32c-4e3e-906d-56085eeb1f35","sequence":69},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704033765,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"dfb4300f-9488-4b4e-99a5-7b29d322952d","fallbackText":"Reminder child session","generationId":1,"itemId":"25799bf7-f24a-4eed-9953-f39079152e48","kind":"reminderChild","recordedAt":"2026-09-29T17:47:13.76483Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee46-ea35-7300-9f57-faffb63ca778","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"25799bf7-f24a-4eed-9953-f39079152e48","sequence":35},"last":{"id":"046a34dc-7454-4b2a-8493-e1bbfb3787b1","sequence":70},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704033767,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"4ba6a4a2-695b-4e19-b93f-399028c26c85","fallbackText":"Reminder child session","generationId":2,"itemId":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","kind":"reminderChild","recordedAt":"2026-09-29T17:47:13.767204Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee47-1fe5-72a0-84bd-4c9e9446ed0d","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","sequence":79},"last":{"id":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","sequence":79},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704035962,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command\":\"sleep 12\",\"description\":\"Sleep for twelve seconds\",\"yield_time_ms\":15000}","background":true,"backgroundInitiator":"timeout","callId":"call_01a0ee46f61c7482b289e8bb6aee0f02","itemId":"01a0ee46-f8c9-7db3-ac02-f2b78cfc7c56","kind":"toolCall","recordedAt":"2026-09-29T17:47:15.961748Z","revision":3,"status":"completed","tool":"bash","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","visibleOutput":"{\n  \"chunk_id\": \"exec-1-1\",\n  \"command\": \"sleep 12\",\n  \"description\": \"Sleep for twelve seconds\",\n  \"execution_state\": \"background_running\",\n  \"session_id\": 1,\n  \"work_id\": \"work.v1.managed_bash.sha256.10c46069f6af08edd1e9a61d87aea3c93ab0bf6df4d8fe5d5ab2efe16c2aa63e\",\n  \"model_guidance\": \"The command is still running in the background and the UI already shows its status. Do not poll for completion: the final output is delivered to you automatically as runtime context and wakes you even after you end the turn. Exception: when a runtime overdue notice names a still-running session, you may inspect it or terminate it with bash_input now. Do not narrate that it started, is running, shows current output, will continue, or has an internal session_id unless the user explicitly asks or you have substantive next work. If there is nothing else to do, end the turn without extra status text. Managed sessions end when your agent session ends: a deliverable process that must keep running after your final answer needs a detached `setsid -f` start instead (where setsid exists \u2014 Linux).\",\n  \"output\": \"\",\n  \"original_output_bytes\": 0,\n  \"original_output_tokens\": 0,\n  \"truncated\": false\n}"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"b11864b4-ec2c-46a8-a5b4-fd5594b69c40","sequence":52},"last":{"id":"b38c5bba-fdd1-48dc-887b-aea06d3fd832","sequence":93},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704037136,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:12.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704037136,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Evaluating conflicting instructions and stop-signal guidance while waiting for the background command to finish.","field":"summary.0","itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:12.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704040852,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Resolving instruction precedence while deferring the reply until the background command completes.","field":"summary.0","itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:12.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704051512,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Deferring the final reply while waiting for the background command to complete.","field":"summary.0","itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:12.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060273,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"f802477d-5ebb-4a3d-b573-1624f746f95d","kind":"reasoning","providerItemId":"rs_6abbf9a31753fbc1f4c04388:rs_01a0ee47259e73e49456486349db6e0e","recordedAt":"2026-09-29T17:47:40.272906Z","revision":2,"status":"completed","summary":["Evaluating conflicting instructions and stop-signal guidance while waiting for the background command to finish.Resolving instruction precedence while deferring the reply until the background command completes.Deferring the final reply while waiting for the background command to complete."],"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"e32149f5-e659-45dd-8958-b4c6843dabdc","sequence":99},"last":{"id":"e32149f5-e659-45dd-8958-b4c6843dabdc","sequence":99},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060510,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1755,"promptTokens":76806,"totalTokens":78561},"durationMs":26738,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38662,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"5cf0de05-1b2e-4bc2-ba58-4ffe9c82880e","sequence":104},"last":{"id":"5cf0de05-1b2e-4bc2-ba58-4ffe9c82880e","sequence":104},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"totalTokens":40244,"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38662,"outputTokens":1582,"reasoningTokens":1460},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060512,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{}","callId":"call_01a0ee4786c270bdb312bdd0ddf75a64","itemId":"01a0ee47-885e-7440-9a65-b3f7d88924a2","kind":"toolCall","recordedAt":"2026-09-29T17:47:40.51204Z","revision":1,"status":"inProgress","tool":"work_list","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"13fa7e2b-a127-4fde-a079-7b4d23b898ea","sequence":106},"last":{"id":"5eb996c4-c5d4-4d22-8ad4-42f8fd8dbb06","sequence":111},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060513,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{}","callId":"call_01a0ee4786c270bdb312bdd0ddf75a64","itemId":"01a0ee47-885e-7440-9a65-b3f7d88924a2","kind":"toolCall","recordedAt":"2026-09-29T17:47:40.51315Z","revision":2,"status":"completed","tool":"work_list","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","visibleOutput":"{\"items\":[],\"next_after_work_id\":null}"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"13fa7e2b-a127-4fde-a079-7b4d23b898ea","sequence":106},"last":{"id":"3ab45430-c979-4535-abde-ce61ba59853e","sequence":115},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060516,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"4ba6a4a2-695b-4e19-b93f-399028c26c85","fallbackText":"Reminder child session","generationId":2,"itemId":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","kind":"reminderChild","recordedAt":"2026-09-29T17:47:40.516146Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee47-1fe5-72a0-84bd-4c9e9446ed0d","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"e2deeff1-ddc1-46c5-b053-fdc0c7a12ad2","sequence":79},"last":{"id":"cb6695e4-cf54-43e4-ada1-14b9ef7c71ac","sequence":119},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060518,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"c03ed820-1aea-441c-8b83-c56e0a21f749","fallbackText":"Reminder child session","generationId":3,"itemId":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","kind":"reminderChild","recordedAt":"2026-09-29T17:47:40.5186Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee47-8865-7b53-b394-8d0a49863634","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","sequence":128},"last":{"id":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","sequence":128},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065046,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"b7f0225d-5758-4365-987d-4931bba57bb2","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:18.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065046,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"STE","field":"text","itemId":"b7f0225d-5758-4365-987d-4931bba57bb2","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:18.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065046,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"ERED_PHASE0_OK","field":"text","itemId":"b7f0225d-5758-4365-987d-4931bba57bb2","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:18.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065116,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"b7f0225d-5758-4365-987d-4931bba57bb2","kind":"agentMessage","recordedAt":"2026-09-29T17:47:45.116004Z","revision":2,"status":"completed","text":"STEERED_PHASE0_OK","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"e1501975-6d9d-4bcc-8a10-1eeab8c32515","sequence":141},"last":{"id":"e1501975-6d9d-4bcc-8a10-1eeab8c32515","sequence":141},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065120,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":1794,"promptTokens":117278,"totalTokens":119072},"durationMs":4597,"modelId":"meta/muse-spark-1.3","promptTokens":40472,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"27e5e8e1-9717-4880-94dc-242e6b68066d","sequence":144},"last":{"id":"27e5e8e1-9717-4880-94dc-242e6b68066d","sequence":144},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"totalTokens":40511,"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","usage":{"cacheReadTokens":38641,"cacheWriteTokens":0,"cachedTokens":38641,"inputTokens":40472,"outputTokens":39,"reasoningTokens":23},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065124,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"61d34ee6-0447-4424-b6f6-6606ed0465c2","childSessionLogPath":"subagent/61d34ee6-0447-4424-b6f6-6606ed0465c2/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","kind":"reminderChild","recordedAt":"2026-09-29T17:47:45.123439Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee47-9a61-72d2-887f-7286aa2c2eb5","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","sequence":151},"last":{"id":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","sequence":151},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070732,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"c03ed820-1aea-441c-8b83-c56e0a21f749","fallbackText":"Reminder child session","generationId":3,"itemId":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","kind":"reminderChild","recordedAt":"2026-09-29T17:47:50.732258Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee47-8865-7b53-b394-8d0a49863634","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"6873949c-68f0-43f2-90d8-ffbe78d1d4e6","sequence":128},"last":{"id":"45ba20b8-3c61-471b-839b-5e0cfef94794","sequence":153},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070733,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"61d34ee6-0447-4424-b6f6-6606ed0465c2","childSessionLogPath":"subagent/61d34ee6-0447-4424-b6f6-6606ed0465c2/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","kind":"reminderChild","recordedAt":"2026-09-29T17:47:50.732876Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee47-9a61-72d2-887f-7286aa2c2eb5","turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242"},"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"411ee9ec-dfbd-4d09-ab8d-1b25ee41a63d","sequence":151},"last":{"id":"fa37cfae-9a82-4a2f-8122-0bb32bb8db89","sequence":154},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070735,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070736,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":50720,"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","sourceRange":{"first":{"id":"76a1169b-330c-4651-982a-a04b2216a51a","sequence":162},"last":{"id":"76a1169b-330c-4651-982a-a04b2216a51a","sequence":162},"stream":{"id":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":17121,"turnId":"01a0ee46-ea2b-72e5-aada-1408802a3242","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070737,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"idle","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:47:50.73531Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070981,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:25"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070981,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"notLoaded","viewCursor":"v:01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c:25"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704070981,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:46:59.924858Z","firstUserPrompt":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c/session.jsonl","providerId":"meta","sessionId":"01a0ee46-e9d4-7cd3-a63d-a4f14aa76b6c","status":"notLoaded","title":"Run bash command sleep 12; then respond ORIGINAL_DONE. Do not respond before the command finishes.","turnCount":1,"updatedAt":"2026-09-29T17:47:50.73673Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/subagent.ndjson b/plugins/muse-provider/test/fixtures/subagent.ndjson
new file mode 100644
index 0000000000..492dcb65da
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/subagent.ndjson
@@ -0,0 +1,39 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee47-6e08-74bb-ab1c-255f4a0b7265","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053858,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:47:33.779618Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/session.jsonl","providerId":"meta","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:47:33.779622Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:47:33.779618Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/session.jsonl","providerId":"meta","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:47:33.779622Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053864,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee47-6e08-74bb-ab1c-255f4a0b7265","mode":"onRequest","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","source":"approvalReconfigure","sourceRange":{"first":{"id":"d25de24f-0d5f-43c9-8d6a-e54e053d44d9","sequence":5},"last":{"id":"d25de24f-0d5f-43c9-8d6a-e54e053d44d9","sequence":5},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","input":[{"type":"text","text":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053866,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"2cc8f016-2f0a-4f3c-8881-2b4c06768dab","sequence":15},"last":{"id":"2cc8f016-2f0a-4f3c-8881-2b4c06768dab","sequence":15},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053874,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"running","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053875,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"6ab6a53a-2592-4f64-957f-d9818f839f83","sequence":17},"last":{"id":"6ab6a53a-2592-4f64-957f-d9818f839f83","sequence":17},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053875,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","itemId":"9beb70f4-128a-4cb2-a963-ed233310f65d","kind":"userMessage","recordedAt":"2026-09-29T17:47:33.867478Z","revision":1,"status":"completed","text":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply.","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"6ab6a53a-2592-4f64-957f-d9818f839f83","sequence":17},"last":{"id":"6ab6a53a-2592-4f64-957f-d9818f839f83","sequence":17},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053875,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"c4256697-9620-414f-816a-dc40d7a841fd","fallbackText":"Reminder child session","generationId":1,"itemId":"b084f7ab-fbdf-4518-9977-31762244876b","kind":"reminderChild","recordedAt":"2026-09-29T17:47:33.874739Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee47-6e71-74c2-914d-8f271c569480","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"b084f7ab-fbdf-4518-9977-31762244876b","sequence":35},"last":{"id":"b084f7ab-fbdf-4518-9977-31762244876b","sequence":35},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704053879,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","createdAt":"2026-09-29T17:47:33.779618Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/session.jsonl","providerId":"meta","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:47:33.875003Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704057890,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":228,"promptTokens":38151,"totalTokens":38379},"durationMs":4011,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38151,"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"1cf8600c-b6bc-456e-bdf4-c3720e8dba73","sequence":51},"last":{"id":"1cf8600c-b6bc-456e-bdf4-c3720e8dba73","sequence":51},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"totalTokens":38379,"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38151,"outputTokens":228,"reasoningTokens":93},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704057892,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command_id\":\"phase0-spawn-001\",\"objective\":\"Reply with exactly SUBAGENT_PHASE0_OK. Do not use any tools. Just reply that string.\",\"role\":\"phase0-check\"}","callId":"call_01a0ee477a5c70d6bc8d03c09354a9f2","itemId":"01a0ee47-7e22-7180-a4d7-8b56df20594b","kind":"toolCall","recordedAt":"2026-09-29T17:47:37.892273Z","revision":1,"status":"inProgress","tool":"subagent_spawn","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"91df9584-990e-4c44-9f90-3356aa275cba","sequence":53},"last":{"id":"5e054b86-aced-4f10-b87e-e3510b88deff","sequence":58},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704057902,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command_id\":\"phase0-spawn-001\",\"objective\":\"Reply with exactly SUBAGENT_PHASE0_OK. Do not use any tools. Just reply that string.\",\"role\":\"phase0-check\"}","callId":"call_01a0ee477a5c70d6bc8d03c09354a9f2","itemId":"01a0ee47-7e22-7180-a4d7-8b56df20594b","kind":"toolCall","recordedAt":"2026-09-29T17:47:37.901973Z","revision":2,"status":"completed","tool":"subagent_spawn","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","visibleOutput":"{\"status\":\"accepted\",\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\",\"work_id\":\"work.v2.native_subagent.sha256.03a275518974905bd23efc729849ff7f5da968b6c0005148f5e45bdfe2d1c0fe\",\"agent_path\":\"main/phase0-check/1\",\"task_ref\":\"task/01a0ee47-7e25-79f1-b301-611082261a4d#0\"}"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"91df9584-990e-4c44-9f90-3356aa275cba","sequence":53},"last":{"id":"f714d6f0-da93-41a7-b272-998f544b35ac","sequence":73},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704059703,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":386,"promptTokens":76683,"totalTokens":77069},"durationMs":1797,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38532,"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"8271b4b1-cc9b-483b-b9ff-fbc08cc309b9","sequence":93},"last":{"id":"8271b4b1-cc9b-483b-b9ff-fbc08cc309b9","sequence":93},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"totalTokens":38690,"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38532,"outputTokens":158,"reasoningTokens":6},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704059704,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command_id\":\"phase0-wait-001\",\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\",\"timeout_ms\":60000,\"wait_for\":\"result_ready\"}","callId":"call_01a0ee4782007630be7ceef1865c1ec5","itemId":"01a0ee47-8538-7c40-9c16-ef12645a1e6b","kind":"toolCall","recordedAt":"2026-09-29T17:47:39.704685Z","revision":1,"status":"inProgress","tool":"subagent_wait","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"1fc77f96-4d8d-4707-bb35-4402df88d4d2","sequence":95},"last":{"id":"55633f00-93c6-49b4-a592-f9ef36aa3f77","sequence":100},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704060108,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command_id\":\"phase0-wait-001\",\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\",\"timeout_ms\":60000,\"wait_for\":\"result_ready\"}","callId":"call_01a0ee4782007630be7ceef1865c1ec5","itemId":"01a0ee47-8538-7c40-9c16-ef12645a1e6b","kind":"toolCall","recordedAt":"2026-09-29T17:47:40.108735Z","revision":2,"status":"completed","tool":"subagent_wait","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","visibleOutput":"{\"status\":\"ready\",\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\",\"task_ref\":\"task/01a0ee47-7e25-79f1-b301-611082261a4d#5\",\"summary\":\"SUBAGENT_PHASE0_OK\",\"workspace\":{\"placement\":\"shared\",\"setup\":\"active\",\"parent_changes\":\"not_recorded\"},\"evidence_refs\":[\"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/subagent/01a0ee47-7e29-7103-97c7-cdde44e26fe8/session.jsonl\"]}"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"1fc77f96-4d8d-4707-bb35-4402df88d4d2","sequence":95},"last":{"id":"b9435d1c-259c-4332-845c-506b7826a5aa","sequence":110},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704063713,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":519,"promptTokens":115569,"totalTokens":116088},"durationMs":3600,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38886,"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"0d10d7f3-8f3f-4e4e-b3e9-b68fab3d5083","sequence":130},"last":{"id":"0d10d7f3-8f3f-4e4e-b3e9-b68fab3d5083","sequence":130},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"totalTokens":39019,"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","usage":{"cacheReadTokens":38513,"cacheWriteTokens":0,"cachedTokens":38513,"inputTokens":38886,"outputTokens":133,"reasoningTokens":29},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704063714,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\"}","callId":"call_01a0ee4792417281be28207c410311af","itemId":"01a0ee47-94e1-7ac0-a1b6-6bd1dc882dff","kind":"toolCall","recordedAt":"2026-09-29T17:47:43.713973Z","revision":1,"status":"inProgress","tool":"subagent_read_result","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"5e2881f2-1072-4ce0-995e-30afb15179f1","sequence":132},"last":{"id":"864e7062-a1b7-44a6-983c-21580d0978f8","sequence":137},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704063715,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\"}","callId":"call_01a0ee4792417281be28207c410311af","itemId":"01a0ee47-94e1-7ac0-a1b6-6bd1dc882dff","kind":"toolCall","recordedAt":"2026-09-29T17:47:43.714985Z","revision":2,"status":"completed","tool":"subagent_read_result","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","visibleOutput":"{\"status\":\"ready\",\"subagent_id\":\"01a0ee47-7e25-79f1-b301-6130c0406a84\",\"task_ref\":\"task/01a0ee47-7e25-79f1-b301-611082261a4d#5\",\"summary\":\"SUBAGENT_PHASE0_OK\",\"workspace\":{\"placement\":\"shared\",\"setup\":\"active\",\"parent_changes\":\"not_recorded\"},\"evidence_refs\":[\"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/subagent/01a0ee47-7e29-7103-97c7-cdde44e26fe8/session.jsonl\"]}"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"5e2881f2-1072-4ce0-995e-30afb15179f1","sequence":132},"last":{"id":"4012cf01-f19e-4a6b-ad34-4e629c95b9cf","sequence":141},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065625,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"952ce848-7d20-4b67-b4fa-57d2c468a5a3","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:14.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065625,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Subagent replied","field":"text","itemId":"952ce848-7d20-4b67-b4fa-57d2c468a5a3","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:14.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065625,"jsonrpc":"2.0","method":"item/delta","params":{"delta":": SUBAGENT_PHASE0_OK.","field":"text","itemId":"952ce848-7d20-4b67-b4fa-57d2c468a5a3","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:14.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065675,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"952ce848-7d20-4b67-b4fa-57d2c468a5a3","kind":"agentMessage","recordedAt":"2026-09-29T17:47:45.674937Z","revision":2,"status":"completed","text":"Subagent replied: SUBAGENT_PHASE0_OK.","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"ec545d73-530a-443e-89eb-9ca0d190ef81","sequence":158},"last":{"id":"ec545d73-530a-443e-89eb-9ca0d190ef81","sequence":158},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065679,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":545,"promptTokens":154786,"totalTokens":155331},"durationMs":1961,"modelId":"meta/muse-spark-1.3","promptTokens":39217,"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"f284c974-86d8-4e39-ac2a-3c5ecd3b1a64","sequence":161},"last":{"id":"f284c974-86d8-4e39-ac2a-3c5ecd3b1a64","sequence":161},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"totalTokens":39243,"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","usage":{"cacheReadTokens":38769,"cacheWriteTokens":0,"cachedTokens":38769,"inputTokens":39217,"outputTokens":26,"reasoningTokens":5},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704065680,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"5032f8b0-4581-45f5-839f-d90c0cb3124f","childSessionLogPath":"subagent/5032f8b0-4581-45f5-839f-d90c0cb3124f/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"9e970659-4d27-4fc2-9e4d-b1948d81024f","kind":"reminderChild","recordedAt":"2026-09-29T17:47:45.680658Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee47-9c90-7712-ba14-50c3bbf3b9b8","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"9e970659-4d27-4fc2-9e4d-b1948d81024f","sequence":168},"last":{"id":"9e970659-4d27-4fc2-9e4d-b1948d81024f","sequence":168},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068834,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"5032f8b0-4581-45f5-839f-d90c0cb3124f","childSessionLogPath":"subagent/5032f8b0-4581-45f5-839f-d90c0cb3124f/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"9e970659-4d27-4fc2-9e4d-b1948d81024f","kind":"reminderChild","recordedAt":"2026-09-29T17:47:48.833854Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee47-9c90-7712-ba14-50c3bbf3b9b8","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"9e970659-4d27-4fc2-9e4d-b1948d81024f","sequence":168},"last":{"id":"75117c11-f653-4576-a9cf-cd0baf59f2b0","sequence":170},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068836,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"c4256697-9620-414f-816a-dc40d7a841fd","failureReason":"main run completed","fallbackText":"Reminder child session","generationId":1,"itemId":"b084f7ab-fbdf-4518-9977-31762244876b","kind":"reminderChild","recordedAt":"2026-09-29T17:47:48.836755Z","reminderAgentId":"skill-reminder","revision":2,"status":"cancelled","taskId":"01a0ee47-6e71-74c2-914d-8f271c569480","turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082"},"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"b084f7ab-fbdf-4518-9977-31762244876b","sequence":35},"last":{"id":"f4fdf463-ff2e-4ed1-8729-11d708a15078","sequence":174},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068837,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"idle","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068838,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":14969,"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"1955daa1-9552-42d8-94a5-73cb1d5d4814","sequence":176},"last":{"id":"1955daa1-9552-42d8-94a5-73cb1d5d4814","sequence":176},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":11758,"turnId":"01a0ee47-6e68-7456-ad6f-dde465d1d082","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068838,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","sourceRange":{"first":{"id":"f0a5ae9a-f3f7-4c2e-b48b-e339e54c4d3b","sequence":177},"last":{"id":"f0a5ae9a-f3f7-4c2e-b48b-e339e54c4d3b","sequence":177},"stream":{"id":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:21","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704068838,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:47:33.777159Z","firstUserPrompt":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/session.jsonl","providerId":"meta","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"idle","title":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply.","turnCount":1,"updatedAt":"2026-09-29T17:47:48.838179Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704069093,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704069093,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"notLoaded","viewCursor":"v:01a0ee47-6e10-72d3-a976-b9df658f7c2f:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704069093,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:47:33.777159Z","firstUserPrompt":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee47-6e10-72d3-a976-b9df658f7c2f/session.jsonl","providerId":"meta","sessionId":"01a0ee47-6e10-72d3-a976-b9df658f7c2f","status":"notLoaded","title":"Spawn one native subagent in this same workspace, without a worktree. Ask it to reply SUBAGENT_PHASE0_OK without tools; wait for it and report its reply.","turnCount":1,"updatedAt":"2026-09-29T17:47:48.838179Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/text-reasoning.ndjson b/plugins/muse-provider/test/fixtures/text-reasoning.ndjson
new file mode 100644
index 0000000000..e8a4ce16ea
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/text-reasoning.ndjson
@@ -0,0 +1,53 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee4c-c4f9-74f4-a4d0-8ceb8ed7bd42","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403795,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:53:23.716151Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4c-c501-7d50-9020-effa9f9956e1/session.jsonl","providerId":"meta","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:53:23.716155Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:53:23.716151Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4c-c501-7d50-9020-effa9f9956e1/session.jsonl","providerId":"meta","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:53:23.716155Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403800,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee4c-c4f9-74f4-a4d0-8ceb8ed7bd42","mode":"onRequest","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","source":"approvalReconfigure","sourceRange":{"first":{"id":"f4333176-5846-4643-9db4-716ab148a77a","sequence":5},"last":{"id":"f4333176-5846-4643-9db4-716ab148a77a","sequence":5},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","input":[{"type":"text","text":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools."}],"reasoningEffort":"high"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403803,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"e859ea8a-7b97-468e-af6c-789485c6fb0b","sequence":15},"last":{"id":"e859ea8a-7b97-468e-af6c-789485c6fb0b","sequence":15},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403812,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"running","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403813,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"3294e229-d417-4d6d-b543-31f3a7c72916","sequence":17},"last":{"id":"3294e229-d417-4d6d-b543-31f3a7c72916","sequence":17},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403813,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","itemId":"bf516640-ee66-4e83-b101-dc3bae7fd763","kind":"userMessage","recordedAt":"2026-09-29T17:53:23.804051Z","revision":1,"status":"completed","text":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools.","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"3294e229-d417-4d6d-b543-31f3a7c72916","sequence":17},"last":{"id":"3294e229-d417-4d6d-b543-31f3a7c72916","sequence":17},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403813,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"a9db8dd6-6066-4a8b-a41f-04fdfdefdb1a","fallbackText":"Reminder child session","generationId":1,"itemId":"278bcded-5c29-40a1-b034-152609dd21f2","kind":"reminderChild","recordedAt":"2026-09-29T17:53:23.812033Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4c-c562-7052-9445-a86270ea242d","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"278bcded-5c29-40a1-b034-152609dd21f2","sequence":35},"last":{"id":"278bcded-5c29-40a1-b034-152609dd21f2","sequence":35},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704403817,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","createdAt":"2026-09-29T17:53:23.716151Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4c-c501-7d50-9020-effa9f9956e1/session.jsonl","providerId":"meta","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:53:23.812401Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704409177,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"f3c7d3fc-1644-46c3-b63c-74e0c7dee6c3","kind":"reasoning","revision":1,"status":"inProgress","summary":[""],"turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:5.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704409177,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Computing the rational sum by finding a common denominator and reducing the fraction to lowest terms via gcd.","field":"summary.0","itemId":"f3c7d3fc-1644-46c3-b63c-74e0c7dee6c3","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:5.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"f3c7d3fc-1644-46c3-b63c-74e0c7dee6c3","kind":"reasoning","providerItemId":"rs_6abbfb16a0d4c4cc026a42b8:rs_01a0ee4ccf75761a913c4cb237470fa4","recordedAt":"2026-09-29T17:53:30.349608Z","revision":2,"status":"completed","summary":["Computing the rational sum by finding a common denominator and reducing the fraction to lowest terms via gcd."],"turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"b1446d39-8f36-461d-9c53-d8aac56413c2","sequence":48},"last":{"id":"b1446d39-8f36-461d-9c53-d8aac56413c2","sequence":48},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Sum with","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" common","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" denominator 60,","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410350,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" the LCM of 1 through","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410804,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" 6:\n\n* 1 = 60/60\n* 1/","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410804,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"2 = 30/60\n* 1/3 = 20/","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410804,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"60\n* 1/4 = 15/60\n* 1","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410804,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"/5 = 12/60\n* 1/6 = 10","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410804,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"/60\n\nSum:\n\n","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410888,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"`(","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410888,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"60+30+20+15+12+10)/60 = 147","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410888,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"/60`\n\nReduce:","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410888,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `147 = 3 \u00d7 7 \u00d7 7`,","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704410888,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `60 = 2\u00b2 \u00d7 3 \u00d7 5`, so `","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.15"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411146,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"gcd(147,60)","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411146,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" = 3`.\n\nDivide numerator and denominator by 3:\n\n`147/60","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411146,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" = 49/20`\n\n`49 = ","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411146,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"7\u00b2` shares","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411146,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" no prime","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411347,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" factor with `20 = 2\u00b2 \u00d7 5`, so `gcd =","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411347,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" 1`. It","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411347,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" is in lowest terms.","field":"text","itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:6.23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411393,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"4fdf781c-c6d0-415a-82ba-dc0ad189d8f6","kind":"agentMessage","recordedAt":"2026-09-29T17:53:31.392919Z","revision":2,"status":"completed","text":"Sum with common denominator 60, the LCM of 1 through 6:\n\n* 1 = 60/60\n* 1/2 = 30/60\n* 1/3 = 20/60\n* 1/4 = 15/60\n* 1/5 = 12/60\n* 1/6 = 10/60\n\nSum:\n\n`(60+30+20+15+12+10)/60 = 147/60`\n\nReduce: `147 = 3 \u00d7 7 \u00d7 7`, `60 = 2\u00b2 \u00d7 3 \u00d7 5`, so `gcd(147,60) = 3`.\n\nDivide numerator and denominator by 3:\n\n`147/60 = 49/20`\n\n`49 = 7\u00b2` shares no prime factor with `20 = 2\u00b2 \u00d7 5`, so `gcd = 1`. It is in lowest terms.","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"8e63bac4-b43a-435e-82e1-a0b124c9e62e","sequence":50},"last":{"id":"8e63bac4-b43a-435e-82e1-a0b124c9e62e","sequence":50},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411420,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":663,"promptTokens":38169,"totalTokens":38832},"durationMs":7603,"modelId":"meta/muse-spark-1.3","promptTokens":38169,"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"8533c05b-113f-4e1d-bd04-da179512d45c","sequence":53},"last":{"id":"8533c05b-113f-4e1d-bd04-da179512d45c","sequence":53},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"totalTokens":38832,"turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38169,"outputTokens":663,"reasoningTokens":436},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704411422,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"75c1e857-db03-45ea-bc69-9c66f590634a","childSessionLogPath":"subagent/75c1e857-db03-45ea-bc69-9c66f590634a/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"0cfc2b21-d637-420a-8a3b-f32640a7a031","kind":"reminderChild","recordedAt":"2026-09-29T17:53:31.422285Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee4c-e31d-75d3-8673-7cb9024888ba","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"0cfc2b21-d637-420a-8a3b-f32640a7a031","sequence":60},"last":{"id":"0cfc2b21-d637-420a-8a3b-f32640a7a031","sequence":60},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417085,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"a9db8dd6-6066-4a8b-a41f-04fdfdefdb1a","fallbackText":"Reminder child session","generationId":1,"itemId":"278bcded-5c29-40a1-b034-152609dd21f2","kind":"reminderChild","recordedAt":"2026-09-29T17:53:37.085045Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee4c-c562-7052-9445-a86270ea242d","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"278bcded-5c29-40a1-b034-152609dd21f2","sequence":35},"last":{"id":"82867c05-0d13-41a5-a5f6-5c907e85d4a6","sequence":62},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417085,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"75c1e857-db03-45ea-bc69-9c66f590634a","childSessionLogPath":"subagent/75c1e857-db03-45ea-bc69-9c66f590634a/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"0cfc2b21-d637-420a-8a3b-f32640a7a031","kind":"reminderChild","recordedAt":"2026-09-29T17:53:37.085573Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee4c-e31d-75d3-8673-7cb9024888ba","turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e"},"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"0cfc2b21-d637-420a-8a3b-f32640a7a031","sequence":60},"last":{"id":"41276a5f-1e51-4b0e-8ff5-cd305e2d3a8b","sequence":63},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417087,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"idle","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417088,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":13283,"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"6b97d3d3-e4e3-4c05-a150-58f4bfcfd494","sequence":69},"last":{"id":"6b97d3d3-e4e3-4c05-a150-58f4bfcfd494","sequence":69},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":5373,"turnId":"01a0ee4c-c559-75de-a972-7a91dbe59a8e","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417088,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","sourceRange":{"first":{"id":"63b58fad-d6e6-4872-8899-802fef5da84a","sequence":70},"last":{"id":"63b58fad-d6e6-4872-8899-802fef5da84a","sequence":70},"stream":{"id":"01a0ee4c-c501-7d50-9020-effa9f9956e1","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:13","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417088,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:53:23.713788Z","firstUserPrompt":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4c-c501-7d50-9020-effa9f9956e1/session.jsonl","providerId":"meta","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"idle","title":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools.","turnCount":1,"updatedAt":"2026-09-29T17:53:37.088503Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417302,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417302,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"notLoaded","viewCursor":"v:01a0ee4c-c501-7d50-9020-effa9f9956e1:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790704417302,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:53:23.713788Z","firstUserPrompt":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee4c-c501-7d50-9020-effa9f9956e1/session.jsonl","providerId":"meta","sessionId":"01a0ee4c-c501-7d50-9020-effa9f9956e1","status":"notLoaded","title":"Think through the exact rational sum 1 + 1/2 + 1/3 + 1/4 + 1/5 + 1/6. Explain how you reduce it to lowest terms. Do not use tools.","turnCount":1,"updatedAt":"2026-09-29T17:53:37.088503Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/tools-edit.ndjson b/plugins/muse-provider/test/fixtures/tools-edit.ndjson
new file mode 100644
index 0000000000..ffbf1a0474
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/tools-edit.ndjson
@@ -0,0 +1,48 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee44-d5f5-7f3c-af67-65a9dd4daa28","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","providerId":"meta","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883853,"jsonrpc":"2.0","method":"session/started","params":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:44:43.775629Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/session.jsonl","providerId":"meta","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:44:43.775633Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"id":2,"jsonrpc":"2.0","result":{"session":{"activeTurnId":null,"approvalMode":{"lastCommandId":null,"mode":"onRequest","source":"startup"},"createdAt":"2026-09-29T17:44:43.775629Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/session.jsonl","providerId":"meta","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"idle","turnCount":0,"updatedAt":"2026-09-29T17:44:43.775633Z","workspaceRoot":"/tmp/muse-phase0/repo"},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883859,"jsonrpc":"2.0","method":"session/approvalModeChanged","params":{"clientName":"paseo_phase0","commandId":"01a0ee44-d5f5-7f3c-af67-65a9dd4daa28","mode":"onRequest","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","source":"approvalReconfigure","sourceRange":{"first":{"id":"683cb0f0-a3c9-4d42-b63c-3578223e7bc8","sequence":5},"last":{"id":"683cb0f0-a3c9-4d42-b63c-3578223e7bc8","sequence":5},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:1"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":3,"method":"turn/start","params":{"commandId":"01a0ee44-d653-785e-adc8-47d6ec011d01","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","input":[{"type":"text","text":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how."}],"reasoningEffort":"low"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883862,"jsonrpc":"2.0","method":"session/branchChanged","params":{"branch":"main","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"4bdcc395-645e-46b7-be84-51368193c171","sequence":15},"last":{"id":"4bdcc395-645e-46b7-be84-51368193c171","sequence":15},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"vcs":"git","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:2","workspaceRoot":"/tmp/muse-phase0/repo"}}}
+{"dir":"in","msg":{"id":3,"jsonrpc":"2.0","result":{"commandId":"01a0ee44-d653-785e-adc8-47d6ec011d01","disposition":"started","startedNewTurn":true,"status":"accepted","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883870,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"running","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883871,"jsonrpc":"2.0","method":"turn/started","params":{"commandId":"01a0ee44-d653-785e-adc8-47d6ec011d01","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"abb7e5c5-d1ca-4e11-bd29-3c6ff5d8dbed","sequence":17},"last":{"id":"abb7e5c5-d1ca-4e11-bd29-3c6ff5d8dbed","sequence":17},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883871,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"commandId":"01a0ee44-d653-785e-adc8-47d6ec011d01","itemId":"ff708436-2703-4465-aa17-9124f646bf18","kind":"userMessage","recordedAt":"2026-09-29T17:44:43.862842Z","revision":1,"status":"completed","text":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how.","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"abb7e5c5-d1ca-4e11-bd29-3c6ff5d8dbed","sequence":17},"last":{"id":"abb7e5c5-d1ca-4e11-bd29-3c6ff5d8dbed","sequence":17},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883871,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"5030ca0e-e58a-4637-9362-565d8540a2f1","fallbackText":"Reminder child session","generationId":1,"itemId":"985bd509-b773-4afa-ba0b-b64c712d0faf","kind":"reminderChild","recordedAt":"2026-09-29T17:44:43.870303Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee44-d65c-7732-9968-9dad2d9d011b","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"985bd509-b773-4afa-ba0b-b64c712d0faf","sequence":35},"last":{"id":"985bd509-b773-4afa-ba0b-b64c712d0faf","sequence":35},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703883874,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","createdAt":"2026-09-29T17:44:43.775629Z","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/session.jsonl","providerId":"meta","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"running","turnCount":0,"updatedAt":"2026-09-29T17:44:43.870564Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703888257,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":195,"promptTokens":38167,"totalTokens":38362},"durationMs":4383,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38167,"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"a7bcb728-487d-449b-a74d-65ae91e96cc0","sequence":51},"last":{"id":"a7bcb728-487d-449b-a74d-65ae91e96cc0","sequence":51},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"totalTokens":38362,"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","usage":{"cacheReadTokens":0,"cacheWriteTokens":0,"cachedTokens":0,"inputTokens":38167,"outputTokens":195,"reasoningTokens":118},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703888260,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"path\":\"f\"}","callId":"call_01a0ee44e5c972c4884239d3e1bcbd3a","itemId":"01a0ee44-e782-7200-948a-362a4b67f285","kind":"toolCall","recordedAt":"2026-09-29T17:44:48.260042Z","revision":1,"status":"inProgress","tool":"read_file","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"87892a5b-2955-49e4-8309-390eab4b22bb","sequence":53},"last":{"id":"23208824-203c-4333-8f37-845803185f53","sequence":59},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703888261,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"path\":\"f\"}","callId":"call_01a0ee44e5c972c4884239d3e1bcbd3a","itemId":"01a0ee44-e782-7200-948a-362a4b67f285","kind":"toolCall","recordedAt":"2026-09-29T17:44:48.26126Z","revision":2,"status":"completed","tool":"read_file","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","visibleOutput":"Read text file `f`.\n1|alpha\n2|beta"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"87892a5b-2955-49e4-8309-390eab4b22bb","sequence":53},"last":{"id":"d156c74d-f444-4d33-964e-0a20747b6269","sequence":63},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:8"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703891355,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":280,"promptTokens":76571,"totalTokens":76851},"durationMs":3087,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38404,"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"347b7cd4-0568-4fd3-9b66-94fe93d55b97","sequence":82},"last":{"id":"347b7cd4-0568-4fd3-9b66-94fe93d55b97","sequence":82},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"totalTokens":38489,"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","usage":{"cacheReadTokens":38129,"cacheWriteTokens":0,"cachedTokens":38129,"inputTokens":38404,"outputTokens":85,"reasoningTokens":10},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:9"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703891384,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"command\":\"wc -l f\",\"description\":\"Count lines in f\"}","callId":"call_01a0ee44ec9671c6a49f55dfb23d281c","itemId":"01a0ee44-f3b6-73b0-8b51-208d485e3bb1","kind":"toolCall","recordedAt":"2026-09-29T17:44:51.384253Z","revision":1,"status":"inProgress","tool":"bash","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"9217711f-2891-44a6-aa59-672b82cc28dd","sequence":84},"last":{"id":"a88ea66b-2b42-4699-a692-c76225a52c71","sequence":90},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:10"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703891596,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"2 f\n","field":"output","itemId":"01a0ee44-f3b6-73b0-8b51-208d485e3bb1","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:10.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703891609,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"command\":\"wc -l f\",\"description\":\"Count lines in f\"}","callId":"call_01a0ee44ec9671c6a49f55dfb23d281c","itemId":"01a0ee44-f3b6-73b0-8b51-208d485e3bb1","kind":"toolCall","recordedAt":"2026-09-29T17:44:51.609218Z","revision":2,"status":"completed","tool":"bash","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","visibleOutput":"2 f\n"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"9217711f-2891-44a6-aa59-672b82cc28dd","sequence":84},"last":{"id":"0750216b-86d9-44cc-80d0-2d625f89607c","sequence":96},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:11"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895007,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":376,"promptTokens":115160,"totalTokens":115536},"durationMs":3390,"finishReason":"tool_calls","modelId":"meta/muse-spark-1.3","promptTokens":38589,"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"dc40a59d-2cb8-4f6c-9205-f94f5932849a","sequence":115},"last":{"id":"dc40a59d-2cb8-4f6c-9205-f94f5932849a","sequence":115},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"totalTokens":38685,"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","usage":{"cacheReadTokens":38385,"cacheWriteTokens":0,"cachedTokens":38385,"inputTokens":38589,"outputTokens":96,"reasoningTokens":11},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:12"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895010,"jsonrpc":"2.0","method":"item/started","params":{"item":{"args":"{\"find\":\"beta\",\"path\":\"f\",\"replace\":\"gamma\"}","callId":"call_01a0ee44fb02709dab9e9c41d70ac7ed","itemId":"01a0ee45-01e0-7bf1-bd88-cc71f76d61df","kind":"toolCall","recordedAt":"2026-09-29T17:44:55.010008Z","revision":1,"status":"inProgress","tool":"edit_file","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"ee0c7dc8-42e6-44e9-8278-9b39521f1d69","sequence":117},"last":{"id":"8f6f6999-597e-4d8d-9be4-fe3c8dddf814","sequence":123},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:13"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895014,"jsonrpc":"2.0","method":"item/updated","params":{"item":{"args":"{\"find\":\"beta\",\"path\":\"f\",\"replace\":\"gamma\"}","callId":"call_01a0ee44fb02709dab9e9c41d70ac7ed","itemId":"01a0ee45-01e0-7bf1-bd88-cc71f76d61df","kind":"toolCall","patchRef":{"availability":"available","byteLen":146,"id":"tool_patch-01a0ee45-01e0-7bf1-bd88-cc71f76d61df-call_01a0ee44fb02709dab9e9c41d70ac7ed","kind":"tool_patch","mediaType":"application/json","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/tool-outputs/01a0ee45-01e0-7bf1-bd88-cc71f76d61df/call_01a0ee44fb02709dab9e9c41d70ac7ed-tool_patch.json","uri":"tool-output://local/01a0ee45-01e0-7bf1-bd88-cc71f76d61df/call_01a0ee44fb02709dab9e9c41d70ac7ed-tool_patch.json"},"patchSummary":{"added":1,"files":1,"removed":1},"recordedAt":"2026-09-29T17:44:55.013611Z","revision":2,"status":"inProgress","tool":"edit_file","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"ee0c7dc8-42e6-44e9-8278-9b39521f1d69","sequence":117},"last":{"id":"d1f092a9-296c-4fa0-b2bd-f30acb4be9a4","sequence":126},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:14"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895014,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"args":"{\"find\":\"beta\",\"path\":\"f\",\"replace\":\"gamma\"}","callId":"call_01a0ee44fb02709dab9e9c41d70ac7ed","itemId":"01a0ee45-01e0-7bf1-bd88-cc71f76d61df","kind":"toolCall","patchRef":{"availability":"available","byteLen":146,"id":"tool_patch-01a0ee45-01e0-7bf1-bd88-cc71f76d61df-call_01a0ee44fb02709dab9e9c41d70ac7ed","kind":"tool_patch","mediaType":"application/json","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/tool-outputs/01a0ee45-01e0-7bf1-bd88-cc71f76d61df/call_01a0ee44fb02709dab9e9c41d70ac7ed-tool_patch.json","uri":"tool-output://local/01a0ee45-01e0-7bf1-bd88-cc71f76d61df/call_01a0ee44fb02709dab9e9c41d70ac7ed-tool_patch.json"},"patchSummary":{"added":1,"files":1,"removed":1},"recordedAt":"2026-09-29T17:44:55.014313Z","revision":3,"status":"completed","tool":"edit_file","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","visibleOutput":"edited\nchanged lines: line 2\n--- original\n+++ updated\n@@\n-beta\n+gamma\n"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"ee0c7dc8-42e6-44e9-8278-9b39521f1d69","sequence":117},"last":{"id":"7137aaae-6f00-4dd7-9e2a-9acc258065c0","sequence":128},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:15"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":4,"method":"item/readOutput","params":{"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","itemId":"01a0ee45-01e0-7bf1-bd88-cc71f76d61df","outputRef":"tool_patch-01a0ee45-01e0-7bf1-bd88-cc71f76d61df-call_01a0ee44fb02709dab9e9c41d70ac7ed"}}}
+{"dir":"in","msg":{"id":4,"jsonrpc":"2.0","result":{"byteLen":146,"content":"{\"files\":[{\"hunks\":[{\"lines\":[\" alpha\",\"-beta\",\"+gamma\"],\"newLines\":2,\"newStart\":1,\"oldLines\":2,\"oldStart\":1}],\"path\":\"/tmp/muse-phase0/repo/f\"}]}","encoding":"utf8","eof":true,"mediaType":"application/json","offsetBytes":0}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895021,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"5030ca0e-e58a-4637-9362-565d8540a2f1","fallbackText":"Reminder child session","generationId":1,"itemId":"985bd509-b773-4afa-ba0b-b64c712d0faf","kind":"reminderChild","recordedAt":"2026-09-29T17:44:55.016202Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee44-d65c-7732-9968-9dad2d9d011b","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"985bd509-b773-4afa-ba0b-b64c712d0faf","sequence":35},"last":{"id":"e0f8e9f0-ba40-4d69-bbc7-4988a886ba7e","sequence":131},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:16"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703895021,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"b36c1604-2739-4a03-a07d-82b4fb168b7d","fallbackText":"Reminder child session","generationId":2,"itemId":"7ef38f5d-2cd7-4687-89e9-feea7e217953","kind":"reminderChild","recordedAt":"2026-09-29T17:44:55.018596Z","reminderAgentId":"skill-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-01e9-7e92-8620-cdf44b6991f9","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"7ef38f5d-2cd7-4687-89e9-feea7e217953","sequence":140},"last":{"id":"7ef38f5d-2cd7-4687-89e9-feea7e217953","sequence":140},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898911,"jsonrpc":"2.0","method":"item/started","params":{"item":{"itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","kind":"agentMessage","revision":1,"status":"inProgress","text":"","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.1"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898911,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"Done.","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.2"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898912,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" `f","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.3"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898914,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"` had","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.4"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898915,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" 2 lines;","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.5"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898915,"jsonrpc":"2.0","method":"item/delta","params":{"delta":" changed line ","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.6"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703898915,"jsonrpc":"2.0","method":"item/delta","params":{"delta":"2 from `beta` to `gamma`.\n","field":"text","itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:17.7"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703899040,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"itemId":"26e5b2e9-c43a-405e-95ef-8257bde46f50","kind":"agentMessage","recordedAt":"2026-09-29T17:44:59.040413Z","revision":2,"status":"completed","text":"Done. `f` had 2 lines; changed line 2 from `beta` to `gamma`.\n","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"2b1e63fb-20a2-418f-8c98-1daa937716ff","sequence":153},"last":{"id":"2b1e63fb-20a2-418f-8c98-1daa937716ff","sequence":153},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:18"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703899043,"jsonrpc":"2.0","method":"session/tokenUsage","params":{"cumulative":{"outputTokens":411,"promptTokens":153895,"totalTokens":154306},"durationMs":4020,"modelId":"meta/muse-spark-1.3","promptTokens":38735,"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"2ccdeaa2-2479-4caf-a4ef-2fe922495ce7","sequence":156},"last":{"id":"2ccdeaa2-2479-4caf-a4ef-2fe922495ce7","sequence":156},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"totalTokens":38770,"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","usage":{"cacheReadTokens":38513,"cacheWriteTokens":0,"cachedTokens":38513,"inputTokens":38735,"outputTokens":35,"reasoningTokens":3},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:19"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703899045,"jsonrpc":"2.0","method":"item/started","params":{"item":{"childSessionId":"b201e8a1-b697-4956-b1a7-9310a260252f","childSessionLogPath":"subagent/b201e8a1-b697-4956-b1a7-9310a260252f/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"dd0891c7-01b5-452a-bac2-6f85575fee74","kind":"reminderChild","recordedAt":"2026-09-29T17:44:59.045654Z","reminderAgentId":"verify-reminder","revision":1,"status":"inProgress","taskId":"01a0ee45-11a4-7f53-8ade-12c0fc9f640e","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"dd0891c7-01b5-452a-bac2-6f85575fee74","sequence":163},"last":{"id":"dd0891c7-01b5-452a-bac2-6f85575fee74","sequence":163},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:20"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909058,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"b36c1604-2739-4a03-a07d-82b4fb168b7d","fallbackText":"Reminder child session","generationId":2,"itemId":"7ef38f5d-2cd7-4687-89e9-feea7e217953","kind":"reminderChild","recordedAt":"2026-09-29T17:45:09.058336Z","reminderAgentId":"skill-reminder","revision":2,"status":"completed","taskId":"01a0ee45-01e9-7e92-8620-cdf44b6991f9","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"7ef38f5d-2cd7-4687-89e9-feea7e217953","sequence":140},"last":{"id":"553a6f63-835e-4e0b-b9ec-a1c72ec585ae","sequence":165},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:21"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909058,"jsonrpc":"2.0","method":"item/completed","params":{"item":{"childSessionId":"b201e8a1-b697-4956-b1a7-9310a260252f","childSessionLogPath":"subagent/b201e8a1-b697-4956-b1a7-9310a260252f/session.jsonl","fallbackText":"Reminder child session","generationId":1,"itemId":"dd0891c7-01b5-452a-bac2-6f85575fee74","kind":"reminderChild","recordedAt":"2026-09-29T17:45:09.058728Z","reminderAgentId":"verify-reminder","revision":2,"status":"completed","taskId":"01a0ee45-11a4-7f53-8ade-12c0fc9f640e","turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01"},"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"dd0891c7-01b5-452a-bac2-6f85575fee74","sequence":163},"last":{"id":"10879eda-a61a-464c-a90a-63739193e835","sequence":166},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:22"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909060,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"idle","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909061,"jsonrpc":"2.0","method":"turn/completed","params":{"durationMs":25197,"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","sourceRange":{"first":{"id":"ab6af672-ea4d-4220-b826-7fcbacdaca74","sequence":172},"last":{"id":"ab6af672-ea4d-4220-b826-7fcbacdaca74","sequence":172},"stream":{"id":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","kind":"session"}},"terminal":"completed","timeToFirstTokenMs":15049,"turnId":"01a0ee44-d653-785e-adc8-47d6ec011d01","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:23"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909062,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:44:43.773195Z","firstUserPrompt":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/session.jsonl","providerId":"meta","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"idle","title":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how.","turnCount":1,"updatedAt":"2026-09-29T17:45:09.060175Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909275,"jsonrpc":"2.0","method":"session/closed","params":{"reason":"hostShutdown","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909275,"jsonrpc":"2.0","method":"session/statusChanged","params":{"sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"notLoaded","viewCursor":"v:01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7:24"}}}
+{"dir":"in","msg":{"emittedAtMs":1790703909275,"jsonrpc":"2.0","method":"session/listChanged","params":{"session":{"activeTurnId":null,"branch":"main","createdAt":"2026-09-29T17:44:43.773195Z","firstUserPrompt":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how.","forkedFrom":null,"modelId":"meta/muse-spark-1.3","path":"/tmp/muse-phase0/data/muse/sessions/2026/09/29/01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7/session.jsonl","providerId":"meta","sessionId":"01a0ee44-d5fc-73a0-8cf8-14a3faa5b4d7","status":"notLoaded","title":"Use read_file to read f. Then use bash to run wc -l f. Then use edit_file or apply_patch to change beta to gamma in f. Report the result. Use the requested tools rather than explaining how.","turnCount":1,"updatedAt":"2026-09-29T17:45:09.061536Z","workspaceRoot":"/tmp/muse-phase0/repo"}}}}
diff --git a/plugins/muse-provider/test/fixtures/unsafe-path.ndjson b/plugins/muse-provider/test/fixtures/unsafe-path.ndjson
new file mode 100644
index 0000000000..39cf6d7470
--- /dev/null
+++ b/plugins/muse-provider/test/fixtures/unsafe-path.ndjson
@@ -0,0 +1,5 @@
+{"dir":"out","msg":{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"clientInfo":{"name":"paseo_phase0","version":"0.0.0"},"capabilities":{"experimentalApi":true,"requestedCapabilities":["sessionMcp","sessionListStream"]}}}}
+{"dir":"in","msg":{"id":1,"jsonrpc":"2.0","result":{"experimentalApi":true,"grantedCapabilities":["sessionMcp","sessionListStream"],"museHome":"/tmp/muse-phase0/unsafe-data/muse","platformFamily":"unix","platformOs":"linux","schema":{"fingerprint":"sha256:e0e163db6ccf00dbe68402ce55d6319b3edc33c421f31e9583b587b2de8a118f","version":1},"serverInfo":{"name":"muse","version":"1.4.1"},"sessionDurability":"durable","userAgent":"muse-build/1.4.1 (non-interactive; linux-x86_64; build 35815c253477406321e3f5595195becc25e3907a)"}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","method":"initialized","params":{}}}
+{"dir":"out","msg":{"jsonrpc":"2.0","id":2,"method":"session/start","params":{"commandId":"01a0ee48-f86c-7ea7-ac90-917475456565","workspaceRoot":"/tmp/muse-phase0/repo","modelId":"meta/muse-spark-1.3","approvalMode":"onRequest"}}}
+{"dir":"in","msg":{"error":{"code":-32603,"data":{"commandId":"01a0ee48-f86c-7ea7-ac90-917475456565","kind":"internal"},"message":"session/start: read surviving deletion authority: deletion registry authority is unavailable: UnsafePath"},"id":2,"jsonrpc":"2.0"}}
diff --git a/plugins/muse-provider/test/provider.test.ts b/plugins/muse-provider/test/provider.test.ts
new file mode 100644
index 0000000000..4868634d70
--- /dev/null
+++ b/plugins/muse-provider/test/provider.test.ts
@@ -0,0 +1,1745 @@
+import { execFile } from "node:child_process";
+import { UsageSourceRegistry } from "../../../packages/server/src/server/plugins/usage-sources/index.js";
+import { Usage as MuseUsage } from "../server/usage.js";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { setTimeout as delay } from "node:timers/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { afterEach, expect, test, vi } from "vitest";
+import {
+  PROVIDER_CAPABILITIES,
+  ProviderEventSchema,
+  type ProviderConnection,
+  type ProviderEvent,
+  type ProviderRegistration,
+  type ProviderLaunch,
+  type ProviderInput,
+} from "@getpaseo/plugin/server/provider";
+import type { UsageSourceRegistration } from "@getpaseo/plugin/server";
+import { execCommand } from "@getpaseo/plugin/server";
+import contribute from "../index.server.js";
+
+const connections: ProviderConnection[] = [];
+const roots: string[] = [];
+afterEach(async () => {
+  vi.useRealTimers();
+  await Promise.all(connections.splice(0).map((connection) => connection.close()));
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+function registration(
+  registerUsageSource = (_source: UsageSourceRegistration) => {},
+): ProviderRegistration {
+  let provider: ProviderRegistration | undefined;
+  const server = {
+    registerUsageSource,
+    registerProvider(value: ProviderRegistration) {
+      provider = value;
+    },
+  };
+  contribute(server);
+  if (!provider) throw new Error("Provider was not registered");
+  return provider;
+}
+async function harness(
+  scenario = "text-reasoning",
+  env: Record<string, string> = {},
+  providerOptions?: Record<string, unknown>,
+) {
+  const root = await mkdtemp(path.join(os.tmpdir(), "muse-provider-test-"));
+  roots.push(root);
+  const requests = path.join(root, "requests.ndjson");
+  const launch: ProviderLaunch = {
+    command: process.execPath,
+    args: [fileURLToPath(new URL("./fake-muse.mjs", import.meta.url))],
+    env: { MUSE_TEST_SCENARIO: scenario, MUSE_TEST_REQUESTS: requests, ...env },
+  };
+  await writeFile(requests, "");
+  let usageSource!: UsageSourceRegistration;
+  const provider = registration((source) => {
+    usageSource = source;
+  });
+  const connection = await provider.connect({
+    launch,
+    versions: [1],
+    capabilities: PROVIDER_CAPABILITIES,
+  });
+  connections.push(connection);
+  const events: ProviderEvent[] = [];
+  connection.onEvent((event) => {
+    events.push(ProviderEventSchema.parse(event));
+  });
+  async function wait(
+    predicate: (event: ProviderEvent) => boolean,
+    from = 0,
+  ): Promise<ProviderEvent> {
+    const deadline = Date.now() + 5000;
+    while (Date.now() < deadline) {
+      const event = events.slice(from).find(predicate);
+      if (event) return event;
+      await delay(10);
+    }
+    throw new Error(`Missing event; received ${JSON.stringify(events)}`);
+  }
+  async function send(input: ProviderInput) {
+    const from = events.length;
+    await connection.send(input);
+    return from;
+  }
+  async function open(
+    persistence?: Extract<ProviderInput, { type: "session.open" }>["persistence"],
+    mode = "onRequest",
+    model: string | null = "meta/muse-spark-1.3",
+  ) {
+    await send({
+      type: "session.open",
+      requestId: "open",
+      sessionId: "paseo-session",
+      config: {
+        cwd: root,
+        providerOptions,
+        env: {},
+        settings: {},
+        mcpServers: {},
+        persist: true,
+        mode,
+        model: model ?? undefined,
+        thinkingOption: "high",
+        systemPrompt: "Test instructions",
+      },
+      persistence,
+      history: "replay",
+    });
+    return wait((event) => event.type === "session.ready" || event.type === "request.failed");
+  }
+  async function prompt(delivery: "auto" | "steer" = "auto", image = false) {
+    return send({
+      type: "session.prompt",
+      sessionId: "paseo-session",
+      prompt: {
+        clientMessageId: `client-${events.length}`,
+        delivery,
+        input: {
+          type: "message",
+          content: image
+            ? [
+                { type: "text", text: "hello" },
+                { type: "image", mimeType: "image/png", data: "image-bytes" },
+              ]
+            : [{ type: "text", text: "hello" }],
+        },
+      },
+    });
+  }
+  async function recorded() {
+    return (await readFile(requests, "utf8"))
+      .trim()
+      .split("\n")
+      .filter(Boolean)
+      .map((line) => JSON.parse(line));
+  }
+  return {
+    provider,
+    launch,
+    connection,
+    events,
+    wait,
+    send,
+    open,
+    prompt,
+    recorded,
+    root,
+    usageSource,
+  };
+}
+
+test("registration exposes Muse with a daemon-resolved command", () => {
+  expect(registration()).toMatchObject({
+    id: "muse",
+    label: "Muse Code",
+    command: ["muse"],
+    icon: "icon.svg",
+  });
+});
+test("catalog uses model effort variants, modes, and bounded cached discovery", async () => {
+  const h = await harness("catalog-controls");
+  await h.send({ type: "catalog", requestId: "catalog-1" });
+  const catalogEvent = await h.wait((candidate) => candidate.type === "catalog");
+  expect(catalogEvent).toMatchObject({
+    catalog: {
+      models: [
+        {
+          id: "meta/muse-spark-1.3",
+          label: "meta/muse-spark-1.3",
+          defaultThinkingOptionId: "high",
+          thinkingOptions: [
+            { id: "minimal" },
+            { id: "low" },
+            { id: "medium" },
+            { id: "high" },
+            { id: "xhigh" },
+          ],
+        },
+      ],
+      defaultMode: "onRequest",
+      modes: [
+        { id: "onRequest" },
+        { id: "promptUnmatched" },
+        { id: "denyUnmatched" },
+        { id: "allowAll", isUnattended: true },
+      ],
+    },
+  });
+  await h.send({ type: "catalog", requestId: "catalog-2" });
+  await h.wait((event) => event.type === "catalog" && event.requestId === "catalog-2");
+  expect((await h.recorded()).filter((frame) => frame.method === "model/list")).toHaveLength(1);
+});
+test("text and reasoning stream, completion overwrites deltas, user echo retains client identity", async () => {
+  const h = await harness();
+  expect(await h.open()).toMatchObject({ type: "session.ready" });
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(h.events).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({ type: "reasoning" }),
+      }),
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          type: "user_message",
+          clientMessageId: expect.stringMatching(/^client-/),
+        }),
+      }),
+    ]),
+  );
+  const frames = await h.recorded();
+  expect(frames.find((frame) => frame.method === "turn/start").params).toMatchObject({
+    ifBusy: "queue",
+    reasoningEffort: "high",
+    displayText: "hello",
+    input: [
+      { type: "text", text: "<system_instructions>\nTest instructions\n</system_instructions>" },
+      { type: "text", text: "hello" },
+    ],
+  });
+  expect(h.events.findLast((event) => event.type === "session.persistence")).toMatchObject({
+    persistence: { version: 1, data: { model: "meta/muse-spark-1.3", thinkingOption: "high" } },
+  });
+});
+test("tool calls classify read, shell, and edit with fetched JSON patch converted to unified diff", async () => {
+  const h = await harness("tools-edit");
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(h.events).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          detail: expect.objectContaining({ type: "read", filePath: "f" }),
+        }),
+      }),
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          detail: expect.objectContaining({ type: "shell", command: "wc -l f", output: "2 f\n" }),
+        }),
+      }),
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          detail: expect.objectContaining({
+            type: "edit",
+            unifiedDiff: expect.stringContaining("@@ -1,2 +1,2 @@\n alpha\n-beta\n+gamma\n"),
+          }),
+        }),
+      }),
+    ]),
+  );
+});
+
+test("multi-stage approvals surface Stage 2 then Stage 3 and send the current requirement guard", async () => {
+  const h = await harness("multi-stage-approval");
+  await h.open();
+  await h.prompt();
+  const first = await h.wait((event) => event.type === "session.permission");
+  expect(first).toMatchObject({
+    request: {
+      title: "Stage 2 of 3",
+      detail: { type: "shell", command: "rm -rf f" },
+      actions: [
+        { id: "allow_once", behavior: "allow" },
+        { id: "allow_local_prefix", behavior: "allow" },
+        { id: "abort", behavior: "deny" },
+      ],
+    },
+  });
+  if (first.type !== "session.permission") throw new Error("Expected approval");
+  const from = await h.send({
+    type: "session.permission",
+    sessionId: "paseo-session",
+    permissionId: first.request.id,
+    response: { behavior: "allow", selectedActionId: first.request.actions![0]!.id },
+  });
+  const second = await h.wait((event) => event.type === "session.permission", from);
+  expect(second).toMatchObject({
+    request: { title: "Stage 3 of 3", detail: { command: "rm -rf g" } },
+  });
+  await h.send({
+    type: "session.permission",
+    sessionId: "paseo-session",
+    permissionId: first.request.id,
+    response: { behavior: "allow", selectedActionId: first.request.actions![0]!.id },
+  });
+  await h.wait((event) => event.type === "session.permission_resolved");
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(
+    (await h.recorded())
+      .filter((frame) => frame.method === "approval/decide")
+      .map((frame) => frame.params.requirementId.sourceIndex),
+  ).toEqual([1, 2]);
+});
+test("Full access automatically answers every escalated stage with the published allow-once choice", async () => {
+  const h = await harness("multi-stage-approval");
+  await h.open(undefined, "allowAll");
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(h.events.filter((event) => event.type === "session.permission")).toEqual([]);
+  expect(
+    (await h.recorded())
+      .filter((frame) => frame.method === "approval/decide")
+      .map((frame) => frame.params.choiceId),
+  ).toEqual(["allow_once", "allow_once"]);
+});
+test("interrupt awaits cancelled terminal and reconciles the tool", async () => {
+  const h = await harness("interrupt");
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.prompt_result");
+  await h.send({ type: "session.interrupt", sessionId: "paseo-session", requestId: "interrupt" });
+  await h.wait((event) => event.type === "request.completed" && event.requestId === "interrupt");
+  const terminalIndex = h.events.findIndex(
+    (event) => event.type === "session.turn" && event.state === "canceled",
+  );
+  expect(terminalIndex).toBeGreaterThan(-1);
+  expect(
+    h.events.findIndex(
+      (event) => event.type === "request.completed" && event.requestId === "interrupt",
+    ),
+  ).toBeGreaterThan(terminalIndex);
+});
+test("a fresh connection restores earlier messages from persisted session state", async () => {
+  const original = await harness();
+  const historyPath = path.join(original.root, "native-history.ndjson");
+  original.launch.env.MUSE_TEST_HISTORY = historyPath;
+  await original.open();
+  await original.prompt();
+  await original.wait((event) => event.type === "session.turn" && event.state === "completed");
+  const messages = [
+    ...new Map(
+      original.events
+        .filter((event) => event.type === "timeline.item")
+        .map((event) => event.item)
+        .filter((item) => item.type === "user_message" || item.type === "assistant_message")
+        .map((item) => [item.id, item] as const),
+    ).values(),
+  ];
+  expect(messages.map((item) => item.type)).toEqual(["user_message", "assistant_message"]);
+  const saved = original.events.findLast((event) => event.type === "session.persistence");
+  if (!saved) throw new Error("Expected session persistence");
+  const persistencePath = path.join(original.root, "persistence.json");
+  // Older daemon records carry a view cursor even though their timeline is not durable.
+  await writeFile(
+    persistencePath,
+    JSON.stringify({
+      ...saved.persistence,
+      data: { ...saved.persistence.data, cursor: saved.persistence.data.cursor ?? "v:old:7" },
+    }),
+  );
+  await original.connection.close();
+  const reopened = await harness("text-reasoning", { MUSE_TEST_HISTORY: historyPath });
+  expect(await reopened.open(JSON.parse(await readFile(persistencePath, "utf8")))).toMatchObject({
+    type: "session.ready",
+  });
+  const restored = reopened.events
+    .filter((event) => event.type === "timeline.item")
+    .map((event) => event.item)
+    .filter((item) => item.type === "user_message" || item.type === "assistant_message");
+  expect(restored.map((item) => ({ type: item.type, text: item.text }))).toEqual(
+    messages.map((item) => ({ type: item.type, text: item.text })),
+  );
+  const reopenedState = reopened.events.findLast((event) => event.type === "session.persistence");
+  expect(reopenedState?.persistence.data).not.toHaveProperty("cursor");
+  expect(reopened.events.filter((event) => event.type === "session.turn")).toEqual([]);
+  await reopened.prompt();
+  await reopened.wait((event) => event.type === "session.turn" && event.state === "completed");
+});
+
+for (const cursor of [undefined, "v:old:7"]) {
+  test(`resume ${cursor ? "with a legacy persistence cursor" : "without a persistence cursor"} replays inline history`, async () => {
+    const h = await harness("resume-without-cursor");
+    await h.open({
+      version: 1,
+      data: { sessionId: "saved-session", ...(cursor ? { cursor } : {}) },
+    });
+    expect(h.events.filter((event) => event.type === "session.turn")).toEqual([]);
+    const history = h.events.filter((event) => event.type === "timeline.item");
+    expect(history).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          item: expect.objectContaining({ type: "assistant_message", text: "RESUME_MARKER_OK" }),
+        }),
+      ]),
+    );
+    await h.prompt();
+    await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+    expect(
+      h.events.filter((event) => event.type === "session.turn" && event.state === "completed"),
+    ).toHaveLength(1);
+    expect(
+      (await h.recorded()).find((frame) => frame.method === "session/resume").params,
+    ).toMatchObject({ sessionId: "saved-session" });
+    expect(
+      (await h.recorded()).find((frame) => frame.method === "session/resume").params,
+    ).not.toHaveProperty("cursor");
+  });
+}
+test("steer sends ifBusy steer and joins the running turn", async () => {
+  const h = await harness("steer");
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.prompt_result");
+  const from = await h.prompt("steer");
+  expect(await h.wait((event) => event.type === "session.prompt_result", from)).toMatchObject({
+    result: { type: "steer" },
+  });
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(
+    (await h.recorded()).filter((frame) => frame.method === "turn/start")[1].params.ifBusy,
+  ).toBe("steer");
+});
+test("image turn sends a native image and the subsequent text turn succeeds", async () => {
+  const h = await harness("image-followup");
+  await h.open();
+  await h.prompt("auto", true);
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  const from = await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed", from);
+  const turns = (await h.recorded()).filter((frame) => frame.method === "turn/start");
+  expect(turns[0].params.input).toContainEqual({
+    type: "image",
+    mediaType: "image/png",
+    base64Data: "image-bytes",
+  });
+  expect(turns[1].params.input).toEqual([{ type: "text", text: "hello" }]);
+});
+for (const source of ["live", "history", "backfill"]) {
+  test(`reminder housekeeping emits no timeline items or child sessions from ${source}`, async () => {
+    const scenario = source === "history" ? "resume-without-cursor" : "text-reasoning";
+    const frames = (
+      await readFile(new URL(`./fixtures/${scenario}.ndjson`, import.meta.url), "utf8")
+    )
+      .trim()
+      .split("\n")
+      .map((line) => JSON.parse(line));
+    const reminderIds = new Set<string>(
+      frames
+        .flatMap(({ msg }) =>
+          msg.params?.item ? [msg.params.item] : (msg.result?.history?.items ?? []),
+        )
+        .filter((item) => item?.kind === "reminderChild")
+        .map((item) => item.itemId),
+    );
+    expect(reminderIds.size).toBeGreaterThan(0);
+    const h = await harness(scenario, source === "backfill" ? { MUSE_TEST_GAP: "1" } : {});
+    await h.open(
+      source === "history" ? { version: 1, data: { sessionId: "saved-session" } } : undefined,
+    );
+    await h.prompt();
+    await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+    expect(
+      h.events.filter((event) => event.type === "timeline.item" && reminderIds.has(event.item.id)),
+    ).toEqual([]);
+    expect(
+      h.events.filter((event) => event.type === "session.opened").map((event) => event.sessionId),
+    ).toEqual(["paseo-session"]);
+    expect((await h.recorded()).filter((frame) => frame.method === "session/read")).toEqual([]);
+  });
+}
+for (const [scenario, code, guidance] of [
+  ["auto-review-unavailable", "defaultProfileUnavailable", "permissions.default_profile"],
+  ["unsafe-path", "unsafePath", path.join("/test-data", "muse")],
+]) {
+  test(`${scenario} is a typed actionable construction error`, async () => {
+    const h = await harness(scenario, { XDG_DATA_HOME: "/test-data" });
+    expect(await h.open()).toMatchObject({
+      type: "request.failed",
+      error: { code, message: expect.stringContaining(guidance!) },
+    });
+  });
+}
+for (const [code, kind] of [
+  [0, "cleanExit"],
+  [2, "usage"],
+  [3, "credentials"],
+  [4, "leaseHeld"],
+  [5, "surfaceOff"],
+  [17, "crash"],
+]) {
+  test(`exit ${code} is classified ${kind} with stderr diagnostics`, async () => {
+    const h = await harness("text-reasoning", { MUSE_TEST_EXIT: String(code) });
+    expect(await h.open()).toMatchObject({
+      type: "request.failed",
+      error: { code: kind, message: expect.stringContaining("diagnostic tail, not protocol") },
+    });
+  });
+}
+for (const [env, expected] of [
+  [
+    { MUSE_TEST_VERSION: "1.2.9" },
+    { available: false, diagnostic: "Update Muse Code: found 1.2.9, need ≥1.3.0" },
+  ],
+  [
+    { MUSE_TEST_ACCOUNT: "loggedOut" },
+    { available: false, diagnostic: "Run `muse login` or set META_API_KEY" },
+  ],
+  [{ MUSE_TEST_ACCOUNT: "envKey" }, { available: true }],
+  [{ MUSE_TEST_ACCOUNT: "apiKey" }, { available: true }],
+  [{ MUSE_TEST_ACCOUNT: "accountLogin" }, { available: true }],
+] as const) {
+  test(`status checks version and credential state ${JSON.stringify(env)}`, async () => {
+    const h = await harness("catalog-controls", env);
+    expect(await h.provider.status!({ launch: h.launch })).toEqual(expected);
+  });
+}
+test("status preserves the version-probe command and stderr diagnostic", async () => {
+  const h = await harness("catalog-controls", {
+    MUSE_TEST_VERSION_ERROR: "Muse version probe could not read its installation metadata",
+  });
+  // Compare against the original execFile callback: wrapping in MuseError only changed its kind.
+  const previousDiagnostic = await new Promise<string>((resolve, reject) => {
+    execFile(h.launch.command, [...h.launch.args, "--version"], { env: h.launch.env }, (error) => {
+      if (error) resolve(error.message);
+      else reject(new Error("Expected the version probe to fail"));
+    });
+  });
+  const status = await h.provider.status!({ launch: h.launch });
+  expect(status).toEqual({ available: false, diagnostic: previousDiagnostic });
+  expect(status.diagnostic).toContain("--version");
+  expect(status.diagnostic).toContain(
+    "Muse version probe could not read its installation metadata",
+  );
+  expect(await h.recorded()).toEqual([]);
+});
+test("status reports a missing executable", async () => {
+  const h = await harness();
+  expect(
+    await h.provider.status!({ launch: { ...h.launch, command: "/missing/muse" } }),
+  ).toMatchObject({ available: false, diagnostic: expect.stringContaining("ENOENT") });
+});
+test("overloaded retry reuses UUIDv7 commandId", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_RETRY: "turn/start" });
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  const turns = (await h.recorded()).filter((frame) => frame.method === "turn/start");
+  expect(turns).toHaveLength(2);
+  expect(turns[0].params.commandId).toBe(turns[1].params.commandId);
+});
+test("missing saved session refuses to start fresh", async () => {
+  const h = await harness("resume-without-cursor", { MUSE_TEST_GONE: "1" });
+  expect(await h.open({ version: 1, data: { sessionId: "gone" } })).toMatchObject({
+    type: "request.failed",
+    error: {
+      code: "sessionNotFound",
+      message: "This Muse session no longer exists. Create a new agent.",
+    },
+  });
+  expect((await h.recorded()).filter((frame) => frame.method === "session/start")).toEqual([]);
+});
+test("empty resume viewCursor is a typed error", async () => {
+  const h = await harness("resume-without-cursor", { MUSE_TEST_EMPTY_CURSOR: "1" });
+  expect(await h.open({ version: 1, data: { sessionId: "saved" } })).toMatchObject({
+    type: "request.failed",
+    error: { code: "emptyViewCursor" },
+  });
+});
+test("catalogue identity includes command and routing credentials without exposing them", async () => {
+  const h = await harness();
+  const first = await h.provider.getCatalogCacheKey!({ scope: "global", launch: h.launch });
+  const second = await h.provider.getCatalogCacheKey!({
+    scope: "global",
+    launch: { ...h.launch, env: { ...h.launch.env, META_API_KEY: "secret" } },
+  });
+  expect(first).not.toBe(second);
+  expect(second).not.toContain("secret");
+});
+
+test("configure reports the effective model, approval mode, and per-turn effort", async () => {
+  const h = await harness("catalog-controls");
+  await h.open();
+  const from = await h.send({
+    type: "session.configure",
+    requestId: "configure",
+    sessionId: "paseo-session",
+    changes: { model: "meta/muse-spark-1.3", mode: "promptUnmatched", thinkingOption: "low" },
+  });
+  await h.wait((event) => event.type === "request.completed" && event.requestId === "configure");
+  expect(h.events.slice(from)).toContainEqual(
+    expect.objectContaining({
+      type: "session.config",
+      config: expect.objectContaining({
+        model: "meta/muse-spark-1.3",
+        mode: "promptUnmatched",
+        thinkingOption: "low",
+        models: [expect.objectContaining({ id: "meta/muse-spark-1.3" })],
+      }),
+    }),
+  );
+});
+test("CLI-style allow response selects a published allow action without a supplied id", async () => {
+  const h = await harness("staged-approval");
+  await h.open();
+  await h.prompt();
+  const permissionEvent = await h.wait((candidate) => candidate.type === "session.permission");
+  if (permissionEvent.type !== "session.permission") throw new Error("Expected approval");
+  await h.send({
+    type: "session.permission",
+    sessionId: "paseo-session",
+    permissionId: permissionEvent.request.id,
+    response: { behavior: "allow" },
+  });
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(
+    (await h.recorded()).find((frame) => frame.method === "approval/decide").params.choiceId,
+  ).toBe("allow_once");
+});
+test("closing cancels a catalogue host instead of waiting for a stalled request", async () => {
+  const h = await harness("catalog-controls", { MUSE_TEST_HANG: "model/list" });
+  await h.send({ type: "catalog", requestId: "catalog" });
+  await expect
+    .poll(async () => (await h.recorded()).some((frame) => frame.method === "model/list"))
+    .toBe(true);
+  await h.connection.close();
+  expect(h.events.filter((event) => event.type === "catalog")).toEqual([]);
+  expect(await h.recorded()).toContainEqual({ event: "hostClosed" });
+});
+
+for (const retryKind of ["overloaded", "backpressured"]) {
+  test(`${retryKind} session construction retries with the same UUIDv7`, async () => {
+    const h = await harness("text-reasoning", {
+      MUSE_TEST_RETRY: "session/start",
+      MUSE_TEST_RETRY_KIND: retryKind,
+    });
+    expect(await h.open()).toMatchObject({ type: "session.ready" });
+    const attempts = (await h.recorded()).filter((frame) => frame.method === "session/start");
+    expect(attempts).toHaveLength(2);
+    expect(attempts[0].params.commandId).toBe(attempts[1].params.commandId);
+  });
+}
+test("higher-revision item completion replaces streamed text and ignores stale snapshots", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_STALE: "1" });
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  const assistant = h.events.filter(
+    (event) => event.type === "timeline.item" && event.item.type === "assistant_message",
+  );
+  expect(assistant.length).toBeGreaterThan(2);
+  expect(assistant.at(-1)).toMatchObject({
+    item: { text: expect.stringContaining("`147/60 = 49/20`") },
+  });
+  expect(assistant).not.toContainEqual(
+    expect.objectContaining({ item: expect.objectContaining({ text: "STALE_REVISION" }) }),
+  );
+  expect(h.events).toContainEqual(
+    expect.objectContaining({
+      type: "timeline.item",
+      item: {
+        type: "reasoning",
+        id: "f3c7d3fc-1644-46c3-b63c-74e0c7dee6c3",
+        text: "Computing the rational sum by finding a common denominator and reducing the fraction to lowest terms via gcd.",
+      },
+    }),
+  );
+});
+test("ordinary subagent tool calls render sub_agent details without inventing child identity", async () => {
+  const h = await harness("subagent");
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(h.events).toContainEqual(
+    expect.objectContaining({
+      type: "timeline.item",
+      item: expect.objectContaining({
+        name: "subagent_read_result",
+        status: "completed",
+        detail: expect.objectContaining({
+          type: "sub_agent",
+          log: expect.stringContaining("SUBAGENT_PHASE0_OK"),
+        }),
+      }),
+    }),
+  );
+});
+for (const [variants, expected] of [
+  [
+    ["low", "high"],
+    ["low", "high"],
+  ],
+  ["unknown", ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"]],
+  [[], ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"]],
+] as const) {
+  test(`catalogue effort discovery with variants ${JSON.stringify(variants)}`, async () => {
+    const model = {
+      modelId: "test-model",
+      providerId: "meta",
+      displayLabel: "Test model",
+      contextLimit: 123456,
+      isDefault: true,
+      variants,
+      defaultReasoningEffort: "high",
+    };
+    const h = await harness("catalog-controls", { MUSE_TEST_MODELS: JSON.stringify([model]) });
+    await h.send({ type: "catalog", requestId: "models" });
+    const result = await h.wait((event) => event.type === "catalog");
+    expect(result).toMatchObject({
+      catalog: {
+        defaultModel: "test-model",
+        models: [
+          { contextWindowMaxTokens: 123456, thinkingOptions: expected.map((id) => ({ id })) },
+        ],
+      },
+    });
+  });
+}
+test("catalogue loads models whose effort tiers carry descriptions", async () => {
+  const deepest = "Use this for deepest analysis and complex fixes.";
+  const row = (modelId: string, isDefault: boolean) => ({
+    modelId,
+    providerId: "meta",
+    displayLabel: modelId,
+    contextLimit: 1000000,
+    isDefault,
+    defaultReasoningEffort: "max",
+    variants: ["minimal", "low", "medium", "high", "xhigh", "max"],
+    reasoningEffortVariants: isDefault ? [] : [{ tier: "xhigh", description: deepest }],
+  });
+  const models = [
+    row("muse-spark-1.3", true),
+    row("muse-spark-1.3-contributor", false),
+    row("muse-spark-1.2", false),
+    row("muse-spark-1.2-contributor", false),
+  ];
+  const h = await harness("catalog-controls", { MUSE_TEST_MODELS: JSON.stringify(models) });
+  await h.send({ type: "catalog", requestId: "models" });
+  const result = await h.wait(
+    (event) => event.type === "catalog" || event.type === "request.failed",
+  );
+  const offered = [
+    { id: "minimal" },
+    { id: "low" },
+    { id: "medium" },
+    { id: "high" },
+    { id: "xhigh" },
+    { id: "max", isDefault: true },
+  ];
+  expect(result).toMatchObject({
+    type: "catalog",
+    catalog: {
+      defaultModel: "muse-spark-1.3",
+      models: [
+        { id: "muse-spark-1.3", defaultThinkingOptionId: "max" },
+        { id: "muse-spark-1.3-contributor", thinkingOptions: offered },
+        { id: "muse-spark-1.2", thinkingOptions: offered },
+        { id: "muse-spark-1.2-contributor", thinkingOptions: offered },
+      ],
+    },
+  });
+});
+for (const [configuredModel, catalogModels, expectedModel] of [
+  ["configured-model", [], "configured-model"],
+  [
+    "",
+    [
+      {
+        modelId: "catalog-model",
+        providerId: "meta",
+        displayLabel: "Catalog model",
+        contextLimit: null,
+        isDefault: true,
+        variants: ["high"],
+      },
+    ],
+    "catalog-model",
+  ],
+  ["", [], undefined],
+] as const) {
+  test(`null session model preserves ${expectedModel ?? "unset model"}`, async () => {
+    const h = await harness("text-reasoning", {
+      MUSE_TEST_NULL_MODEL: "1",
+      MUSE_TEST_MODELS: JSON.stringify(catalogModels),
+    });
+    expect(await h.open(undefined, "onRequest", configuredModel || null)).toEqual({
+      type: "session.ready",
+      requestId: "open",
+      sessionId: "paseo-session",
+    });
+    const config = await h.wait((event) => event.type === "session.config");
+    if (config.type !== "session.config") throw new Error("Expected session config");
+    expect(config.config.model).toBe(expectedModel);
+    const saved = h.events.findLast((event) => event.type === "session.persistence");
+    if (!saved) throw new Error("Expected persistence");
+    expect(saved.persistence.data.model).toBe(expectedModel);
+    await h.prompt();
+    await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  });
+}
+test("session startup accepts described catalog efforts and publishes the complete list", async () => {
+  const model = {
+    modelId: "meta/muse-spark-1.3",
+    providerId: "meta",
+    displayLabel: "Muse Spark",
+    contextLimit: null,
+    isDefault: true,
+    defaultReasoningEffort: "max",
+    variants: ["minimal", "low", "medium", "high", "xhigh", "max"],
+    reasoningEffortVariants: [{ tier: "xhigh", description: "Deepest analysis" }],
+  };
+  const h = await harness("text-reasoning", { MUSE_TEST_MODELS: JSON.stringify([model]) });
+  expect(await h.open()).toEqual({
+    type: "session.ready",
+    requestId: "open",
+    sessionId: "paseo-session",
+  });
+  expect(await h.wait((event) => event.type === "session.config")).toMatchObject({
+    config: {
+      models: [{ id: model.modelId, defaultThinkingOptionId: "max" }],
+      thinkingOptions: model.variants.map((id) => ({ id, isDefault: id === "max" })),
+    },
+  });
+  await h.send({
+    type: "session.configure",
+    requestId: "choose-max",
+    sessionId: "paseo-session",
+    changes: { thinkingOption: "max" },
+  });
+  await h.wait((event) => event.type === "request.completed" && event.requestId === "choose-max");
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(
+    (await h.recorded()).find((frame) => frame.method === "turn/start").params.reasoningEffort,
+  ).toBe("max");
+});
+for (const metadata of [
+  "unknown",
+  [{ tier: "future-tier", description: { text: "Future metadata" } }],
+]) {
+  test(`catalog ignores unused effort descriptions ${JSON.stringify(metadata)}`, async () => {
+    const model = {
+      modelId: "test-model",
+      providerId: "meta",
+      displayLabel: "Muse Spark",
+      contextLimit: null,
+      isDefault: true,
+      defaultReasoningEffort: "high",
+      variants: ["low", "high"],
+      reasoningEffortVariants: metadata,
+    };
+    const h = await harness("catalog-controls", { MUSE_TEST_MODELS: JSON.stringify([model]) });
+    await h.send({ type: "catalog", requestId: "models" });
+    expect(
+      await h.wait((event) => event.type === "catalog" || event.type === "request.failed"),
+    ).toMatchObject({
+      type: "catalog",
+      catalog: {
+        models: [
+          { id: model.modelId, thinkingOptions: [{ id: "low" }, { id: "high", isDefault: true }] },
+        ],
+      },
+    });
+  });
+}
+test("status accepts future credential states and drains its maintenance host", async () => {
+  const h = await harness("catalog-controls", { MUSE_TEST_ACCOUNT: "futureCredential" });
+  expect(await h.provider.status!({ launch: h.launch })).toEqual({ available: true });
+  expect(await h.recorded()).toContainEqual({ event: "hostClosed" });
+});
+
+for (const [tool, detail] of [
+  ["grep", "search"],
+  ["glob", "search"],
+  ["ls", "search"],
+  ["web_search", "search"],
+  ["web_fetch", "fetch"],
+  ["custom_tool", "unknown"],
+]) {
+  test(`${tool} tool calls use ${detail} detail`, async () => {
+    const h = await harness("tools-edit", { MUSE_TEST_TOOL: tool! });
+    await h.open();
+    await h.prompt();
+    await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+    expect(h.events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline.item",
+        item: expect.objectContaining({
+          name: tool,
+          status: "completed",
+          detail: expect.objectContaining({ type: detail }),
+        }),
+      }),
+    );
+  });
+}
+test("a future item kind uses fallbackText without breaking turn completion", async () => {
+  const h = await harness("tools-edit", { MUSE_TEST_UNKNOWN_KIND: "1" });
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.turn" && event.state === "completed");
+  expect(h.events).toContainEqual(
+    expect.objectContaining({
+      type: "timeline.item",
+      item: expect.objectContaining({
+        name: "futureItem",
+        detail: { type: "plain_text", label: "futureItem", text: "New MSP item" },
+      }),
+    }),
+  );
+});
+test("fingerprint mismatch is logged but does not prevent opening", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_FINGERPRINT: "sha256:unverified" });
+  expect(await h.open()).toMatchObject({ type: "session.ready" });
+});
+for (const restoring of [false, true]) {
+  test(`MCP servers map to MSP stdio and streamableHttp on ${restoring ? "resume" : "start"}`, async () => {
+    const h = await harness(restoring ? "resume-without-cursor" : "text-reasoning");
+    await h.send({
+      type: "session.open",
+      sessionId: "paseo-session",
+      requestId: "mcp",
+      persistence: restoring
+        ? { version: 1, data: { sessionId: "saved-session", cursor: "v:old:7" } }
+        : undefined,
+      history: "replay",
+      config: {
+        cwd: h.root,
+        env: {},
+        persist: true,
+        settings: {},
+        mcpServers: {
+          stdio: {
+            type: "stdio",
+            command: "test-server",
+            args: ["--serve"],
+            env: { TEST_ENV: "yes" },
+          },
+          paseo: {
+            type: "http",
+            url: "http://localhost/mcp/agents",
+            headers: { Authorization: "Bearer test-token" },
+          },
+        },
+      },
+    });
+    await h.wait((event) => event.type === "session.ready");
+    expect(
+      (await h.recorded()).find(
+        (frame) => frame.method === (restoring ? "session/resume" : "session/start"),
+      ).params.config.mcpServers,
+    ).toEqual({
+      stdio: {
+        transport: "stdio",
+        command: "test-server",
+        args: ["--serve"],
+        env: { TEST_ENV: "yes" },
+        framing: "lineDelimitedJson",
+      },
+      paseo: {
+        transport: "streamableHttp",
+        url: "http://localhost/mcp/agents",
+        headers: { Authorization: "Bearer test-token" },
+      },
+    });
+  });
+}
+
+test("authRequired turn errors retain their kind and explain login recovery", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_AUTH_REQUIRED: "1" });
+  await h.open();
+  await h.prompt();
+  expect(
+    await h.wait((event) => event.type === "session.turn" && event.state === "failed"),
+  ).toMatchObject({
+    error: { code: "authRequired", message: "Run `muse login` or set META_API_KEY." },
+  });
+});
+test("status bounds a stalled account read and closes the host", async () => {
+  const h = await harness("catalog-controls", { MUSE_TEST_HANG: "account/read" });
+  expect(await h.provider.status!({ launch: h.launch })).toEqual({
+    available: false,
+    diagnostic: "Muse account/read timed out",
+  });
+  expect(await h.recorded()).toContainEqual({ event: "hostClosed" });
+});
+
+test("interrupt targets the running turn when another prompt is queued", async () => {
+  const h = await harness("interrupt", { MUSE_TEST_QUEUE: "1" });
+  await h.open();
+  await h.prompt();
+  await h.wait((event) => event.type === "session.prompt_result");
+  const from = await h.prompt();
+  await h.wait((event) => event.type === "session.prompt_result", from);
+  await h.send({
+    type: "session.interrupt",
+    sessionId: "paseo-session",
+    requestId: "interrupt-queued",
+  });
+  await h.wait(
+    (event) => event.type === "request.completed" && event.requestId === "interrupt-queued",
+  );
+  const requests = await h.recorded();
+  const active = requests.find((frame) => frame.method === "turn/start");
+  expect(requests.find((frame) => frame.method === "turn/interrupt").params.turnId).toBe(
+    active.params.commandId,
+  );
+});
+
+for (const terminal of ["completed", "failed"]) {
+  test(`interrupt resolves when its targeted turn independently ends ${terminal}`, async () => {
+    const h = await harness("interrupt", { MUSE_TEST_INTERRUPT_TERMINAL: terminal });
+    await h.open();
+    await h.prompt();
+    await h.wait((event) => event.type === "session.prompt_result");
+    await h.send({
+      type: "session.interrupt",
+      sessionId: "paseo-session",
+      requestId: "racing-interrupt",
+    });
+    await h.wait((event) => event.type === "session.turn" && event.state === terminal);
+    await h.wait(
+      (event) => event.type === "request.completed" && event.requestId === "racing-interrupt",
+    );
+    expect(h.events.filter((event) => event.type === "request.failed")).toEqual([]);
+  });
+}
+for (const [behavior, choiceId] of [
+  ["allow", "allow_once"],
+  ["deny", "abort"],
+] as const) {
+  test(`CLI ${behavior} prefers the plain once choice over a broader fixture grant`, async () => {
+    const h = await harness("staged-approval", { MUSE_TEST_CHOICES: "reverse" });
+    await h.open();
+    await h.prompt();
+    const permission = await h.wait((event) => event.type === "session.permission");
+    if (permission.type !== "session.permission") throw new Error("Expected permission");
+    await h.send({
+      type: "session.permission",
+      sessionId: "paseo-session",
+      permissionId: permission.request.id,
+      response: { behavior },
+    });
+    await expect
+      .poll(
+        async () =>
+          (await h.recorded()).find((frame) => frame.method === "approval/decide")?.params.choiceId,
+      )
+      .toBe(choiceId);
+  });
+}
+
+test("CLI deny rejects a tool without aborting when denied/once is offered", async () => {
+  const h = await harness("staged-approval", { MUSE_TEST_DENIED: "1" });
+  await h.open();
+  await h.prompt();
+  const permission = await h.wait((event) => event.type === "session.permission");
+  if (permission.type !== "session.permission") throw new Error("Expected permission");
+  await h.send({
+    type: "session.permission",
+    sessionId: "paseo-session",
+    permissionId: permission.request.id,
+    response: { behavior: "deny" },
+  });
+  await expect
+    .poll(
+      async () =>
+        (await h.recorded()).find((frame) => frame.method === "approval/decide")?.params.choiceId,
+    )
+    .toBe("reject_once");
+});
+
+test("skills publish commands and command prompts submit structured skill parts", async () => {
+  const h = await harness("skill");
+  await h.open();
+  expect(await h.wait((e) => e.type === "session.commands")).toMatchObject({
+    commands: expect.arrayContaining([
+      expect.objectContaining({ name: "phase0", description: expect.any(String) }),
+      expect.objectContaining({ name: "compact", description: expect.any(String) }),
+    ]),
+  });
+  await h.send({
+    type: "session.prompt",
+    sessionId: "paseo-session",
+    prompt: {
+      clientMessageId: "skill-client",
+      delivery: "auto",
+      input: { type: "command", name: "phase0", arguments: "argument text" },
+    },
+  });
+  await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+  expect((await h.recorded()).find((f) => f.method === "turn/start").params).toMatchObject({
+    input: expect.arrayContaining([
+      { type: "skill", selector: "phase0", arguments: "argument text" },
+    ]),
+    displayText: "/phase0 argument text",
+  });
+});
+
+test("skill changes refresh the session command catalog", async () => {
+  const h = await harness("skill", { MUSE_TEST_SKILLS_CHANGED: "1" });
+  await h.open();
+  const from = await h.prompt();
+  expect(await h.wait((e) => e.type === "session.commands", from)).toMatchObject({
+    commands: [{ name: "compact", description: "Compact conversation context" }],
+  });
+  expect((await h.recorded()).filter((f) => f.method === "skill/list")).toHaveLength(2);
+});
+for (const mode of ["answer", "cancel"] as const) {
+  test(`todo and question ${mode} replay through the provider interface`, async () => {
+    const h = await harness(mode === "answer" ? "phase3-controls" : "phase3-cancel");
+    await h.open();
+    await h.prompt();
+    if (mode === "answer")
+      expect(
+        await h.wait((e) => e.type === "timeline.item" && e.item.type === "todo"),
+      ).toMatchObject({
+        item: {
+          items: [
+            { text: "inspect f", completed: false, status: "in_progress" },
+            { text: "report", completed: false, status: "pending" },
+          ],
+        },
+      });
+    const permission = await h.wait(
+      (e) => e.type === "session.permission" && e.request.kind === "question",
+    );
+    if (permission.type !== "session.permission") throw new Error("Expected question");
+    expect(permission.request.input).toMatchObject({
+      questions: [
+        { header: "Color", options: [{ label: "Blue" }, { label: "Green" }], multiSelect: false },
+      ],
+    });
+    await h.send({
+      type: "session.permission",
+      sessionId: "paseo-session",
+      permissionId: permission.request.id,
+      response:
+        mode === "answer"
+          ? { behavior: "allow", updatedInput: { answers: { Color: "Blue" } } }
+          : { behavior: "deny", message: "QA cancellation" },
+    });
+    await h.wait(
+      (e) => e.type === "session.permission_resolved" && e.permissionId === permission.request.id,
+    );
+    const frame = (await h.recorded()).find(
+      (f) => f.method === (mode === "answer" ? "userInput/answer" : "userInput/cancel"),
+    );
+    expect(frame.params.userInputId).toBe(permission.request.id);
+    if (mode === "answer")
+      expect(frame.params.answers).toEqual([{ questionId: "color_choice", selectedLabel: "Blue" }]);
+    expect((await h.recorded()).some((f) => f.result && Object.keys(f.result).length === 0)).toBe(
+      true,
+    );
+  });
+}
+for (const variant of ["tool", "dedicated", "workflow"]) {
+  test(`${variant} subagent opens only the supplied child and pages its real transcript`, async () => {
+    const h = await harness("subagent", { MUSE_TEST_CHILD: variant });
+    await h.open();
+    await h.prompt();
+    expect(
+      await h.wait((e) => e.type === "session.opened" && e.sessionId === "fixture-child"),
+    ).toMatchObject({
+      parentSessionId: "paseo-session",
+      restoration: "parent",
+      toolCallId: expect.any(String),
+    });
+    expect(
+      await h.wait(
+        (e) =>
+          e.type === "timeline.item" &&
+          e.sessionId === "fixture-child" &&
+          e.item.type === "assistant_message",
+      ),
+    ).toMatchObject({ item: { text: "SUBAGENT_PHASE0_OK" } });
+    await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+    expect(
+      h.events.filter((e) => e.type === "session.opened" && e.sessionId === "fixture-child"),
+    ).toHaveLength(1);
+    expect(
+      (await h.recorded())
+        .filter((f) => f.method === "session/read")
+        .map((f) => f.params.sessionId),
+    ).toEqual(["fixture-child"]);
+    expect(
+      h.events.filter(
+        (e) =>
+          e.type === "timeline.item" &&
+          e.sessionId === "fixture-child" &&
+          e.item.type === "assistant_message",
+      ),
+    ).toHaveLength(1);
+  });
+}
+test("gap backfill repairs a missing completion without duplicating item revisions", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_GAP: "1" });
+  await h.open();
+  await h.prompt();
+  await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+  const frames = (await h.recorded()).filter((f) => f.method === "view/page");
+  expect(frames.map((f) => f.params.cursor)).toEqual(["fixture-last-cursor"]);
+  const messages = h.events.filter(
+    (e) => e.type === "timeline.item" && e.item.type === "assistant_message",
+  );
+  expect(messages.at(-1)).toMatchObject({ item: { text: expect.stringContaining("49/20") } });
+  expect(h.events.filter((e) => e.type === "session.turn" && e.state === "completed")).toHaveLength(
+    1,
+  );
+});
+test("silent active turns page after two minutes and stop polling on recovered terminal", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_SILENT: "1" });
+  await h.open();
+  vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+  await h.prompt();
+  await h.wait((e) => e.type === "session.prompt_result");
+  await vi.advanceTimersByTimeAsync(119999);
+  expect((await h.recorded()).filter((f) => f.method === "view/page")).toEqual([]);
+  await vi.advanceTimersByTimeAsync(1);
+  await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+  await vi.advanceTimersByTimeAsync(240000);
+  expect((await h.recorded()).filter((f) => f.method === "view/page")).toHaveLength(1);
+});
+test("session readiness accepts initialization beyond the old event polling window", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_INITIALIZE_DELAY_MS: "3500" });
+  expect(await h.open()).toMatchObject({ type: "session.ready" });
+  expect((await h.recorded()).find((frame) => frame.event === "hostStarted").args).toEqual([
+    "serve",
+    "--sandbox-network",
+    "proxy-only",
+    "--disable-sandbox",
+    "--trust-workspace",
+  ]);
+}, 10000);
+
+test("default launch disables sandbox and trusts workspace", async () => {
+  const h = await harness();
+  await h.open();
+  expect((await h.recorded()).find((f) => f.event === "hostStarted").args).toEqual([
+    "serve",
+    "--sandbox-network",
+    "proxy-only",
+    "--disable-sandbox",
+    "--trust-workspace",
+  ]);
+});
+test.each([
+  [{ sandbox: { enabled: true } }, ["--sandbox-network", "proxy-only", "--trust-workspace"]],
+  [{ trustWorkspace: false }, ["--sandbox-network", "proxy-only", "--disable-sandbox"]],
+  [
+    { sandbox: { network: "restricted" } },
+    ["--sandbox-network", "restricted", "--disable-sandbox", "--trust-workspace"],
+  ],
+  [
+    { sandbox: { network: "enabled" } },
+    ["--sandbox-network", "enabled", "--disable-sandbox", "--trust-workspace"],
+  ],
+  [
+    { sandbox: { enabled: true, network: "proxy-only" }, trustWorkspace: false },
+    ["--sandbox-network", "proxy-only"],
+  ],
+])("provider options %j control launch flags", async (params, args) => {
+  const h = await harness("text-reasoning", {}, params);
+  await h.open();
+  expect((await h.recorded()).find((f) => f.event === "hostStarted").args).toEqual([
+    "serve",
+    ...args,
+  ]);
+});
+test.each([
+  [{ sandbox: { enabled: "true" } }, "sandbox.enabled"],
+  [{ sandbox: { network: "invalid" } }, "sandbox.network"],
+  [{ trustWorkspace: 1 }, "trustWorkspace"],
+  [{ unexpected: true }, "unexpected"],
+])("invalid provider options %j fail session creation clearly", async (options, field) => {
+  const h = await harness("text-reasoning", {}, options);
+  const event = await h.open();
+  expect(event).toMatchObject({
+    type: "request.failed",
+    error: { code: "invalidProviderOptions" },
+  });
+  if (event.type !== "request.failed") throw new Error("Expected failure");
+  expect(event.error.message).toContain("Invalid Muse providerOptions");
+  expect(event.error.message).toContain(field);
+  expect(await h.recorded()).toEqual([]);
+});
+test("resuming a session reapplies its provider options to the new host", async () => {
+  const h = await harness(
+    "resume-without-cursor",
+    {},
+    {
+      sandbox: { enabled: true, network: "restricted" },
+      trustWorkspace: false,
+    },
+  );
+  await h.open({ version: 1, data: { sessionId: "saved-session" } });
+  const saved = h.events.find((e) => e.type === "session.opened");
+  if (saved?.type !== "session.opened" || !saved.persistence)
+    throw new Error("Expected persistence");
+  await h.send({ type: "session.close", sessionId: "paseo-session", requestId: "close" });
+  await h.wait((e) => e.type === "session.closed");
+  const from = h.events.length;
+  await h.open(saved.persistence);
+  await h.wait((e) => e.type === "session.ready", from);
+  const frames = await h.recorded();
+  expect(frames.filter((f) => f.event === "hostStarted").map((f) => f.args)).toEqual([
+    ["serve", "--sandbox-network", "restricted"],
+    ["serve", "--sandbox-network", "restricted"],
+  ]);
+  expect(frames.some((f) => f.method === "session/resume")).toBe(true);
+});
+test("an uncorrelated MSP parse error keeps the provider diagnostic", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_NULL_ERROR_ID: "1" });
+  expect(await h.open()).toMatchObject({
+    type: "request.failed",
+    error: { code: "parseError", message: "Cannot recover request id" },
+  });
+});
+test("text deltas with an omitted field stream as text", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_IMPLICIT_TEXT_DELTA: "1" });
+  await h.open();
+  await h.wait((e) => e.type === "session.ready");
+  await h.prompt();
+  await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+  expect(
+    h.events.some(
+      (e) =>
+        e.type === "timeline.item" &&
+        e.item.type === "assistant_message" &&
+        e.item.text === "Sum with",
+    ),
+  ).toBe(true);
+});
+test("sessions with a null model import and resume without a null persistence model", async () => {
+  const h = await harness("resume-without-cursor", { MUSE_TEST_NULL_MODEL: "1" });
+  await h.send({
+    type: "sessions",
+    requestId: "null-list",
+    cwd: "/tmp/muse-phase0/repo",
+    limit: 2,
+  });
+  const listed = await h.wait((e) => e.type === "sessions");
+  if (listed.type !== "sessions") throw new Error("Expected sessions");
+  expect(listed.sessions).toHaveLength(2);
+  expect(listed.sessions[0]!.persistence.data.model).toBeUndefined();
+  await h.open(listed.sessions[0]!.persistence);
+  await h.wait((e) => e.type === "session.ready");
+  expect(
+    h.events.some((e) => e.type === "session.config" && e.config.model === "meta/muse-spark-1.3"),
+  ).toBe(true);
+});
+test("sessions list filters workspace and imported persistence opens via resume", async () => {
+  const h = await harness("resume-without-cursor");
+  await h.send({
+    type: "sessions",
+    requestId: "import-list",
+    cwd: "/tmp/muse-phase0/repo",
+    limit: 2,
+  });
+  const listed = await h.wait((e) => e.type === "sessions");
+  if (listed.type !== "sessions") throw new Error("Expected sessions");
+  expect(listed.sessions).toHaveLength(2);
+  expect((await h.recorded()).find((f) => f.method === "session/list").params.workspaceRoot).toBe(
+    "/tmp/muse-phase0/repo",
+  );
+  await h.open(listed.sessions[0]!.persistence);
+  expect((await h.recorded()).filter((f) => f.method === "session/start")).toEqual([]);
+  expect((await h.recorded()).find((f) => f.method === "session/resume").params.sessionId).toBe(
+    listed.sessions[0]!.persistence.data.sessionId,
+  );
+});
+for (const fixture of ["phase3-compact", "phase3-compact-history", "phase3-compact-limit"]) {
+  test(`${fixture} routes compact and exposes the recorded outcome`, async () => {
+    const h = await harness(fixture);
+    const rows = (
+      await readFile(
+        fileURLToPath(new URL(`./fixtures/${fixture}.ndjson`, import.meta.url)),
+        "utf8",
+      )
+    )
+      .trim()
+      .split("\n")
+      .map((line) => JSON.parse(line));
+    const nativeId = rows.find((row) => row.msg.method === "session/resume").msg.params.sessionId;
+    await h.open({ version: 1, data: { sessionId: nativeId } });
+    await h.send({
+      type: "session.prompt",
+      sessionId: "paseo-session",
+      prompt: {
+        clientMessageId: "compact",
+        delivery: "auto",
+        input: { type: "command", name: "compact", arguments: "" },
+      },
+    });
+    if (fixture === "phase3-compact-limit") {
+      expect(await h.wait((e) => e.type === "session.prompt_result")).toMatchObject({
+        result: { type: "completed" },
+      });
+      expect(
+        await h.wait(
+          (e) =>
+            e.type === "timeline.item" &&
+            e.item.type === "compaction" &&
+            e.item.status === "completed",
+        ),
+      ).toMatchObject({ item: { preTokens: 22192 } });
+    } else
+      expect(await h.wait((e) => e.type === "session.prompt_result")).toMatchObject({
+        result: {
+          type: "failed",
+          error: {
+            code: "commandRejected",
+            message: expect.stringContaining("context_compaction.provider_context_limit_tokens"),
+          },
+        },
+      });
+    expect((await h.recorded()).filter((f) => f.method === "turn/start")).toEqual([]);
+  });
+}
+for (const usage of [
+  {},
+  {
+    usage: {
+      observedAtMs: 1700000000000,
+      tier: "Pro",
+      window: { usedPercent: 75, resetsAtMs: 1700018000000, windowDurationMins: 300 },
+      weekly: { usedPercent: 105, resetsAtMs: 1700604800000 },
+    },
+  },
+]) {
+  test(`usage source presents ${"usage" in usage ? "subscription windows" : "real route absence"} from discovered accounts`, async () => {
+    const h = await harness("catalog-controls", { MUSE_TEST_USAGE: JSON.stringify(usage) });
+    await h.open();
+    const inputs = await h.usageSource.discover({ kind: "global" });
+    expect(inputs).toHaveLength(1);
+    const account = inputs[0]!;
+    expect(account).toEqual({
+      key: expect.stringMatching(/^[a-f0-9]{64}$/),
+      label: "Muse Code",
+      input: { account: account.key },
+    });
+    const report = await h.usageSource.fetch(account.input);
+    if ("usage" in usage)
+      expect(report).toMatchObject({
+        status: "available",
+        planLabel: "Pro",
+        windows: [
+          {
+            id: "five_hour",
+            label: "5-hour",
+            usedPct: 75,
+            remainingPct: 25,
+            tone: "warning",
+          },
+          { id: "weekly", usedPct: 105, remainingPct: 0, tone: "danger" },
+        ],
+      });
+    else
+      expect(report).toEqual({
+        status: "unavailable",
+        problem: { kind: "no_quota", detail: "No usage quota reported" },
+      });
+    expect((await h.recorded()).filter((f) => f.method === "usage/read")).toHaveLength(1);
+  });
+}
+
+test("a terminal before turn admission does not start an idle watchdog", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_ACK_LAST: "1" });
+  await h.open();
+  vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+  await h.prompt();
+  await h.wait((e) => e.type === "session.prompt_result");
+  await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+  await vi.advanceTimersByTimeAsync(120000);
+  await delay(30);
+  expect((await h.recorded()).filter((f) => f.method === "view/page")).toEqual([]);
+});
+test("admitted compact publishes compaction progress and completes the command without a turn", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_COMPACT: "1" });
+  await h.open();
+  await h.send({
+    type: "session.prompt",
+    sessionId: "paseo-session",
+    prompt: {
+      clientMessageId: "compact-admitted",
+      delivery: "auto",
+      input: { type: "command", name: "compact", arguments: "" },
+    },
+  });
+  expect(await h.wait((e) => e.type === "session.prompt_result")).toMatchObject({
+    result: { type: "completed" },
+  });
+  await h.wait(
+    (e) =>
+      e.type === "timeline.item" && e.item.type === "compaction" && e.item.status === "completed",
+  );
+  expect(
+    h.events
+      .filter((e) => e.type === "timeline.item" && e.item.type === "compaction")
+      .map((e) => e.type === "timeline.item" && e.item),
+  ).toEqual([
+    { type: "compaction", id: "fixture-compaction", status: "loading" },
+    { type: "compaction", id: "fixture-compaction", status: "completed" },
+  ]);
+  expect((await h.recorded()).filter((f) => f.method === "turn/start")).toEqual([]);
+});
+
+test("default workflow children render structured tool details from the real no-flag run", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_WORKFLOW: "1" });
+  await h.open();
+  await h.prompt();
+  const event = await h.wait(
+    (e) =>
+      e.type === "timeline.item" &&
+      e.item.type === "tool_call" &&
+      e.item.name === "workflow" &&
+      e.item.detail.type === "sub_agent" &&
+      e.item.detail.log?.includes("MUSE_PARITY_CHILD_OK") === true,
+  );
+  expect(event).toMatchObject({ item: { status: "completed", detail: { type: "sub_agent" } } });
+  expect(h.events.filter((e) => e.type === "session.opened")).toHaveLength(1);
+  const workflows = h.events.filter(
+    (e) => e.type === "timeline.item" && e.item.type === "tool_call" && e.item.name === "workflow",
+  );
+  expect(workflows.length).toBeGreaterThan(1);
+  for (const workflow of workflows)
+    expect(workflow).toMatchObject({ item: { detail: { type: "sub_agent" } } });
+});
+
+for (const source of ["user", "project"] as const) {
+  test(`real ${source} skill catalog and command replay with explicit workspace trust`, async () => {
+    const h = await harness(`phase3-${source}-skill`, {}, { trustWorkspace: source === "project" });
+    await h.open();
+    expect(await h.wait((e) => e.type === "session.commands")).toMatchObject({
+      commands: expect.arrayContaining([
+        expect.objectContaining({ name: `muse-parity-${source}` }),
+      ]),
+    });
+    await h.send({
+      type: "session.prompt",
+      sessionId: "paseo-session",
+      prompt: {
+        clientMessageId: "real-skill",
+        delivery: "auto",
+        input: { type: "command", name: `muse-parity-${source}`, arguments: "QA" },
+      },
+    });
+    await h.wait((e) => e.type === "session.turn" && e.state === "completed");
+    expect(h.events).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "timeline.item",
+          item: expect.objectContaining({
+            type: "assistant_message",
+            text: `MUSE_PARITY_${source.toUpperCase()}_OK`,
+          }),
+        }),
+      ]),
+    );
+    const recorded = await h.recorded();
+    expect(recorded.find((f) => f.method === "turn/start").params.input).toContainEqual({
+      type: "skill",
+      selector: `muse-parity-${source}`,
+      arguments: "QA",
+    });
+    expect(recorded.find((f) => f.event === "hostStarted").args.includes("--trust-workspace")).toBe(
+      source === "project",
+    );
+  });
+}
+
+test("usage identity follows the resolved config directory across credential and route changes", async () => {
+  const identities: string[] = [];
+  for (const [config, token, route] of [
+    ["/usage/config", "token-a", "route-a"],
+    ["/usage/config", "token-b", "route-b"],
+    ["/usage/other", "token-b", "route-b"],
+  ]) {
+    const h = await harness("catalog-controls", {
+      XDG_CONFIG_HOME: config!,
+      META_API_KEY: token!,
+      META_BASE_URL: route!,
+    });
+    await h.open();
+    const inputs = await h.usageSource.discover({ kind: "global" });
+    expect(inputs).toHaveLength(1);
+    identities.push(inputs[0]!.key);
+  }
+  expect(identities[0]).toBe(identities[1]);
+  expect(identities[2]).not.toBe(identities[0]);
+});
+
+test.each(["no sessions", "unrelated environment"])("Muse discovery is empty with %s", async () => {
+  const { Usage } = await import("../server/usage.js");
+  expect(await new Usage().registration().discover({ kind: "global" })).toEqual([]);
+});
+
+test("Muse window identity follows the reported duration instead of assuming five hours", async () => {
+  const h = await harness("catalog-controls", {
+    MUSE_TEST_USAGE: JSON.stringify({
+      usage: {
+        observedAtMs: 1700000000000,
+        tier: "Pro",
+        window: { usedPercent: 11, resetsAtMs: 1700018000000, windowDurationMins: 120 },
+        weekly: { usedPercent: 22, resetsAtMs: 1700604800000 },
+      },
+    }),
+  });
+  await h.open();
+  const [account] = await h.usageSource.discover({ kind: "global" });
+  expect(await h.usageSource.fetch(account!.input)).toMatchObject({
+    status: "available",
+    windows: [
+      { id: "7200s", label: "2-hour", shortLabel: "2h" },
+      { id: "weekly", label: "Weekly", shortLabel: "wk" },
+    ],
+  });
+});
+
+test("status accepts initialization slower than the account deadline without isolating history", async () => {
+  const h = await harness("catalog-controls", { MUSE_TEST_INITIALIZE_DELAY_MS: "3500" });
+  expect(await h.provider.status!({ launch: h.launch })).toEqual({ available: true });
+  expect(await h.recorded()).toContainEqual({ event: "hostClosed" });
+}, 10000);
+
+for (const extension of ["cmd", "bat"]) {
+  test.runIf(process.platform === "win32")(
+    `launches the discovered Muse .${extension} for status, catalog and sessions`,
+    async () => {
+      const h = await harness("catalog-controls");
+      const shim = path.join(h.root, `muse launcher.${extension}`);
+      await writeFile(shim, `@echo off\r\n"${process.execPath}" "${h.launch.args[0]}" %*\r\n`);
+      h.launch.command = shim;
+      h.launch.args = [];
+      expect(await h.provider.status!({ launch: h.launch })).toEqual({ available: true });
+      await h.send({ type: "catalog", requestId: "shim-catalog" });
+      expect(await h.wait((event) => event.type === "catalog")).toMatchObject({
+        requestId: "shim-catalog",
+      });
+      await h.open();
+      expect(await h.wait((event) => event.type === "session.opened")).toMatchObject({
+        sessionId: "paseo-session",
+      });
+    },
+    20000,
+  );
+}
+
+test("force-stops a Muse host that ignores stdin EOF", async () => {
+  const h = await stubbornHostHarness();
+  try {
+    const result = await Promise.race([
+      h.provider.status!({ launch: h.launch }),
+      delay(10000).then(() => {
+        throw new Error("Muse status did not finish closing its host");
+      }),
+    ]);
+    expect(result).toEqual({ available: true });
+    const hosts = (await h.recorded()).filter((row) => row.event === "stubbornHost");
+    expect(hosts).toHaveLength(1);
+    expect(() => process.kill(hosts[0].pid, 0)).toThrow();
+  } finally {
+    await cleanupStubbornHosts(h);
+  }
+}, 15000);
+
+test("closes the whole Muse host after an uncorrelated MSP error", async () => {
+  const h = await stubbornHostHarness({ MUSE_TEST_NULL_ERROR_ID: "1" });
+  try {
+    const result = await h.provider.status!({ launch: h.launch });
+    expect(result).toEqual({ available: false, diagnostic: "Cannot recover request id" });
+    const recorded = await h.recorded();
+    expect(recorded.some((row) => row.event === "hostClosed")).toBe(true);
+    const hosts = recorded.filter((row) => row.event === "stubbornHost");
+    expect(hosts).toHaveLength(1);
+    expect(() => process.kill(hosts[0].pid, 0)).toThrow();
+  } finally {
+    await cleanupStubbornHosts(h);
+  }
+}, 15000);
+
+async function stubbornHostHarness(env: Record<string, string> = {}) {
+  const h = await harness("catalog-controls", { MUSE_TEST_STUBBORN: "1", ...env });
+  if (process.platform === "win32") {
+    const shim = path.join(h.root, "stubborn muse.cmd");
+    await writeFile(shim, `@echo off\r\n"${process.execPath}" "${h.launch.args[0]}" %*\r\n`);
+    h.launch.command = shim;
+    h.launch.args = [];
+  }
+  return h;
+}
+async function cleanupStubbornHosts(h: Awaited<ReturnType<typeof harness>>) {
+  // Keep a failing Windows regression from leaving its deliberately stubborn child alive.
+  for (const host of (await h.recorded()).filter((row) => row.event === "stubbornHost")) {
+    if (process.platform === "win32") {
+      await execCommand("taskkill.exe", ["/PID", String(host.pid), "/T", "/F"], {
+        shell: false,
+      }).catch(() => {});
+    } else {
+      try {
+        process.kill(host.pid, "SIGKILL");
+      } catch {}
+    }
+  }
+}
+
+test("Muse reports belong only to the session's account and remain available globally", async () => {
+  const usage = new MuseUsage();
+  const homeEnv = { HOME: "/usage/home" };
+  const configEnv = { HOME: "/usage/home", XDG_CONFIG_HOME: "/usage/work" };
+  const accountIds = [homeEnv, configEnv].map((env, index) => {
+    const launch = { command: "muse", args: [], env };
+    usage.attach(`session-${index}`, launch, async () => ({
+      usage: {
+        observedAtMs: 1700000000000,
+        tier: "Pro",
+        window: { usedPercent: 11, resetsAtMs: 1700018000000, windowDurationMins: 120 },
+        weekly: { usedPercent: 22, resetsAtMs: 1700604800000 },
+      },
+    }));
+    return `muse:${usage.remember(launch).account}`;
+  });
+  const sessions = new Map([
+    ["claude", { provider: "claude", env: homeEnv, sessionKey: "claude" }],
+    ["codex", { provider: "codex", env: configEnv, sessionKey: "codex" }],
+    ["muse-home", { provider: "muse", env: homeEnv, sessionKey: "muse-home" }],
+    ["muse-work", { provider: "muse", env: configEnv, sessionKey: "muse-work" }],
+    ["muse-unknown", { provider: "muse", env: { HOME: "/usage/unknown" }, sessionKey: "unknown" }],
+  ]);
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => sessions.has(id),
+    usageSession: (id) => sessions.get(id) ?? null,
+  });
+  registry.register(usage.registration());
+
+  expect((await registry.listReports()).map((report) => report.id)).toEqual(accountIds);
+  expect(await registry.listReports({ agentId: "claude" })).toEqual([]);
+  expect(await registry.listReports({ agentId: "codex" })).toEqual([]);
+  for (const [index, agentId] of ["muse-home", "muse-work"].entries()) {
+    const reports = await registry.listReports({ agentId });
+    expect(reports.map((report) => report.id)).toEqual([accountIds[index]]);
+    expect(reports[0]!.report.status).toBe("available");
+  }
+  expect(await registry.listReports({ agentId: "muse-unknown" })).toEqual([]);
+  expect((await registry.listReports()).map((report) => report.id)).toEqual(accountIds);
+});
diff --git a/plugins/opencode-go-usage-source/icon.svg b/plugins/opencode-go-usage-source/icon.svg
new file mode 100644
index 0000000000..7e76235008
--- /dev/null
+++ b/plugins/opencode-go-usage-source/icon.svg
@@ -0,0 +1,6 @@
+<svg width="54" height="30" viewBox="0 0 54 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24 30H0V0H24V6H6V24H18V18H12V12H24V30Z" fill="currentColor"/>
+<path d="M12 18H18V24H6V12H12V18Z" fill="currentColor" fill-opacity="0.4"/>
+<path d="M48 12V24H36V12H48Z" fill="currentColor" fill-opacity="0.4"/>
+<path d="M54 30H30V0H54V30ZM36 24H48V6H36V24Z" fill="currentColor"/>
+</svg>
diff --git a/plugins/opencode-go-usage-source/index.server.ts b/plugins/opencode-go-usage-source/index.server.ts
new file mode 100644
index 0000000000..b707c26858
--- /dev/null
+++ b/plugins/opencode-go-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { discover, fetchUsage } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "opencode-go",
+    label: "OpenCode Go",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/opencode-go-usage-source/paseo-plugin.json b/plugins/opencode-go-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..587e662d4f
--- /dev/null
+++ b/plugins/opencode-go-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "opencode-go-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/opencode-go-usage-source/server/usage.test.ts b/plugins/opencode-go-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..72fbe0ee13
--- /dev/null
+++ b/plugins/opencode-go-usage-source/server/usage.test.ts
@@ -0,0 +1,104 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+
+import { inputSchema } from "../shared/input.js";
+
+let fixtureDirectory: string;
+let fixturePath: string;
+beforeEach(async () => {
+  fixtureDirectory = await mkdtemp(join(tmpdir(), "go-default-"));
+  fixturePath = join(fixtureDirectory, "auth.json");
+  await writeFile(
+    fixturePath,
+    JSON.stringify({ "opencode-go": { type: "api", key: "fixture-secret" } }),
+  );
+});
+afterEach(async () => {
+  await rm(fixtureDirectory, { recursive: true, force: true });
+});
+
+test("discovery input rejects an explicit API key", () => {
+  expect(inputSchema.safeParse({ apiKey: "unused" }).success).toBe(false);
+  expect(() => inputSchema.parse({})).toThrow();
+});
+
+const upstreamResponse = {
+  usage: {
+    rolling: { status: "ok", percent: 21, resetsAt: "2026-09-26T20:00:00.000Z" },
+    weekly: { status: "ok", percent: 42, resetsAt: "2026-09-28T00:00:00.000Z" },
+    monthly: { status: "rate-limited", percent: 100, resetsAt: "2026-10-01T00:00:00.000Z" },
+  },
+};
+
+test("discovers and fetches the default key from read-only auth.json", async () => {
+  const directory = await mkdtemp(join(tmpdir(), "paseo-go-usage-"));
+  const path = join(directory, "auth.json");
+  const content = JSON.stringify({ "opencode-go": { type: "api", key: "fixture-key" } });
+  try {
+    await writeFile(path, content);
+    expect(await discover(path)).toEqual([
+      { key: expect.stringMatching(/^[a-f0-9]{64}$/), input: { path } },
+    ]);
+    const requests: Array<{ url: string; authorization: string | null }> = [];
+    const fetchApi = async (url: string | URL | Request, init?: RequestInit) => {
+      requests.push({
+        url: String(url),
+        authorization: new Headers(init?.headers).get("Authorization"),
+      });
+      return Response.json(upstreamResponse);
+    };
+    const report = await fetchUsage({ path }, fetchApi as typeof fetch);
+    expect(requests).toEqual([
+      { url: "https://opencode.ai/zen/go/v1/usage", authorization: "Bearer fixture-key" },
+    ]);
+    expect(report.status).toBe("available");
+    expect(report.windows.map((window) => [window.id, window.usedPct, window.resetsAt])).toEqual([
+      ["rolling", 21, "2026-09-26T20:00:00.000Z"],
+      ["weekly", 42, "2026-09-28T00:00:00.000Z"],
+      ["monthly", 100, "2026-10-01T00:00:00.000Z"],
+    ]);
+    // The rolling window's length is not reported, so its percent stands without a name.
+    expect(report.windows.map((window) => window.shortLabel)).toEqual(["", "wk", "mo"]);
+    // The current upstream endpoint returns windows only; do not invent balances.
+    expect(report.balances).toBeUndefined();
+    expect(await readFile(path, "utf8")).toBe(content);
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+test("omits default discovery when auth.json lacks an OpenCode Go API key", async () => {
+  const directory = await mkdtemp(join(tmpdir(), "paseo-go-usage-"));
+  const path = join(directory, "auth.json");
+  try {
+    await writeFile(path, JSON.stringify({ openai: { type: "oauth", access: "other-token" } }));
+    expect(await discover(path)).toEqual([]);
+    await expect(
+      fetchUsage({ path }, async () => {
+        throw new Error("must not fetch");
+      }),
+    ).rejects.toThrow("login store no longer exists");
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+test.each([401, 403])("maps HTTP %i to unavailable", async (status) => {
+  const report = await fetchUsage(
+    { path: fixturePath },
+    async () => new Response(null, { status }),
+  );
+  expect(report).toEqual({
+    status: "unavailable",
+    problem: { kind: "rejected", status, refreshedBy: "opencode" },
+  });
+});
+
+test.each(["missing file", "unrelated file"])("discovers no accounts for %s", async (scenario) => {
+  const path = join(fixtureDirectory, "missing.json");
+  if (scenario === "unrelated file") await writeFile(path, "{}");
+  expect(await discover(path)).toEqual([]);
+});
diff --git a/plugins/opencode-go-usage-source/server/usage.ts b/plugins/opencode-go-usage-source/server/usage.ts
new file mode 100644
index 0000000000..cd2905ca2e
--- /dev/null
+++ b/plugins/opencode-go-usage-source/server/usage.ts
@@ -0,0 +1,85 @@
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import {
+  hashAccountKey,
+  unavailable,
+  type UsageAccount,
+  toneFromUsedPct,
+  windowFromUsedPct,
+  type UsageReport,
+} from "@getpaseo/plugin/server/usage";
+import type { Input } from "../shared/input.js";
+
+const authSchema = z
+  .object({
+    "opencode-go": z
+      .object({ type: z.literal("api"), key: z.string().min(1) })
+      .passthrough()
+      .optional(),
+  })
+  .passthrough();
+const windowSchema = z.object({
+  status: z.enum(["ok", "rate-limited"]),
+  percent: z.number().finite(),
+  resetsAt: z.iso.datetime(),
+});
+const responseSchema = z.object({
+  usage: z.object({ rolling: windowSchema, weekly: windowSchema, monthly: windowSchema }),
+});
+
+function authPath(env: NodeJS.ProcessEnv = process.env): string {
+  return join(
+    env.XDG_DATA_HOME || join(env.HOME || homedir(), ".local", "share"),
+    "opencode",
+    "auth.json",
+  );
+}
+
+export async function readDefaultKey(path = authPath()): Promise<string | null> {
+  try {
+    const auth = authSchema.parse(JSON.parse(await readFile(path, "utf8")));
+    return auth["opencode-go"]?.key ?? null;
+  } catch {
+    return null;
+  }
+}
+
+export async function discover(path = authPath()): Promise<UsageAccount[]> {
+  return (await readDefaultKey(path)) ? [{ key: hashAccountKey(path), input: { path } }] : [];
+}
+
+export async function fetchUsage(
+  input: Input,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const apiKey = await readDefaultKey(input.path);
+  if (!apiKey) throw new Error("OpenCode Go login store no longer exists");
+  const response = await fetchApi("https://opencode.ai/zen/go/v1/usage", {
+    headers: { Authorization: `Bearer ${apiKey}`, Accept: "application/json" },
+    signal: AbortSignal.timeout(15_000),
+  });
+  if (response.status === 401 || response.status === 403)
+    return unavailable({ kind: "rejected", status: response.status, refreshedBy: "opencode" });
+  if (!response.ok) throw new Error(`OpenCode Go usage API returned ${response.status}`);
+  const data = responseSchema.parse(await response.json());
+  const windows = (
+    [
+      // The rolling window's length is not reported, so its percent stands without a name.
+      ["rolling", "Rolling", "", data.usage.rolling],
+      ["weekly", "Weekly", "wk", data.usage.weekly],
+      ["monthly", "Monthly", "mo", data.usage.monthly],
+    ] as const
+  ).map(([id, label, shortLabel, value]) =>
+    windowFromUsedPct({
+      id,
+      label,
+      shortLabel,
+      utilizationPct: value.percent,
+      resetsAt: value.resetsAt,
+      tone: toneFromUsedPct(value.percent),
+    }),
+  );
+  return { status: "available", planLabel: "Go", windows };
+}
diff --git a/plugins/opencode-go-usage-source/shared/input.ts b/plugins/opencode-go-usage-source/shared/input.ts
new file mode 100644
index 0000000000..6e3ffd1719
--- /dev/null
+++ b/plugins/opencode-go-usage-source/shared/input.ts
@@ -0,0 +1,3 @@
+import { z } from "zod";
+export const inputSchema = z.object({ path: z.string().min(1) }).strict();
+export type Input = z.infer<typeof inputSchema>;
diff --git a/plugins/package.json b/plugins/package.json
new file mode 100644
index 0000000000..4bd6ca429b
--- /dev/null
+++ b/plugins/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@getpaseo/builtin-plugins",
+  "version": "0.11.2",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsgo -p tsconfig.json --noEmit",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@getpaseo/plugin": "*",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@types/node": "^20.9.0",
+    "vitest": "^4.1.6"
+  }
+}
diff --git a/plugins/tsconfig.json b/plugins/tsconfig.json
new file mode 100644
index 0000000000..83e35ddb4b
--- /dev/null
+++ b/plugins/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "target": "ES2022",
+    "lib": ["ES2023", "DOM"],
+    "types": ["node", "vitest/globals"],
+    "incremental": false,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules", "**/*.test.ts"]
+}
diff --git a/plugins/zai-usage-source/icon.svg b/plugins/zai-usage-source/icon.svg
new file mode 100644
index 0000000000..d552d2a3d0
--- /dev/null
+++ b/plugins/zai-usage-source/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" fill-rule="evenodd"><title>Z.ai</title><path d="M8.07 1.333L6.618 3.302H.435L1.887 1.333h6.184zM15.503 12.699L14.052 14.667h-6.161l1.449-1.968h6.163zM16 1.333L6.176 14.667H0L9.824 1.333H16z"/></svg>
diff --git a/plugins/zai-usage-source/index.server.ts b/plugins/zai-usage-source/index.server.ts
new file mode 100644
index 0000000000..830afc8c29
--- /dev/null
+++ b/plugins/zai-usage-source/index.server.ts
@@ -0,0 +1,15 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { inputSchema } from "./shared/input.js";
+import { fetchUsage, discover } from "./server/usage.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "zai",
+    label: "Z.ai",
+    icon: "icon.svg",
+    input: inputSchema,
+    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    fetch: fetchUsage,
+  });
+  return () => {};
+}
diff --git a/plugins/zai-usage-source/paseo-plugin.json b/plugins/zai-usage-source/paseo-plugin.json
new file mode 100644
index 0000000000..4b65f4a4e3
--- /dev/null
+++ b/plugins/zai-usage-source/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "zai-usage-source", "requirements": { "paseo": ">=0.9.2" } }
diff --git a/plugins/zai-usage-source/server/usage.test.ts b/plugins/zai-usage-source/server/usage.test.ts
new file mode 100644
index 0000000000..d63602cd73
--- /dev/null
+++ b/plugins/zai-usage-source/server/usage.test.ts
@@ -0,0 +1,179 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { discover, fetchUsage } from "./usage.js";
+import type { UsageReport } from "@getpaseo/plugin/server/usage";
+
+function mockFetch(handlers: Map<string, () => Response>): typeof fetch {
+  return vi.fn(async (url: RequestInfo | URL) => {
+    const key = url.toString();
+    const handler = handlers.get(key);
+    if (!handler) throw new Error(`Unmocked fetch: ${key}`);
+    return handler();
+  }) as unknown as typeof fetch;
+}
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "Content-Type": "application/json" },
+  });
+}
+
+describe("zai usage source", () => {
+  let homeDir: string;
+  let fetchApi: typeof fetch;
+  let originalEnv: Record<string, string | undefined>;
+  beforeEach(() => {
+    homeDir = mkdtempSync(join(tmpdir(), "usage-home-"));
+    originalEnv = { ...process.env };
+    process.env["HOME"] = homeDir;
+    process.env["USERPROFILE"] = homeDir;
+    for (const key of [
+      "APPDATA",
+      "COPILOT_TOKEN",
+      "GITHUB_TOKEN",
+      "GITHUB_PAT",
+      "CURSOR_ACCESS_TOKEN",
+      "CURSOR_TOKEN",
+      "ZAI_API_KEY",
+      "GLM_API_KEY",
+      "GROK_API_KEY",
+      "GROK_TOKEN",
+      "KIMI_TOKEN",
+      "KIMI_API_KEY",
+      "KIMI_CODE_HOME",
+      "MINIMAX_API_KEY",
+      "MINIMAX_BASE_URL",
+    ])
+      delete process.env[key];
+    fetchApi = mockFetch(new Map());
+  });
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+    for (const key of Object.keys(process.env)) if (!(key in originalEnv)) delete process.env[key];
+    for (const key in originalEnv) process.env[key] = originalEnv[key];
+  });
+  function service(
+    _options: {
+      platform?: typeof process.platform;
+      keychain?: () => Promise<unknown | null>;
+      cursorHomeDir?: string;
+      kimiHomeDir?: string;
+    } = {},
+  ) {
+    return {
+      listUsage: async () => {
+        const report = await fetchFirst((url, init) => fetchApi(url, init));
+        return {
+          providers: [
+            {
+              providerId: "zai",
+              ...report,
+              error: report.status === "error" ? report.error : null,
+              planLabel: report.status === "available" ? (report.planLabel ?? null) : null,
+            },
+          ],
+        };
+      },
+    };
+  }
+  function findProvider(
+    result: { providers: Array<{ providerId: string } & UsageReport> },
+    id: string,
+  ) {
+    const report = result.providers.find((item) => item.providerId === id);
+    if (!report) throw new Error(`Missing usage source ${id}`);
+    return report;
+  }
+  it("fetches Z.ai usage from ZAI_API_KEY", async () => {
+    process.env["ZAI_API_KEY"] = "zai_test_token";
+    fetchApi = mockFetch(
+      new Map([
+        [
+          "https://api.z.ai/api/biz/subscription/list",
+          () =>
+            jsonResponse({
+              data: [
+                {
+                  productName: "GLM Coding Max",
+                  status: "VALID",
+                  purchaseTime: "2026-01-12 16:55:13",
+                  valid: "2026-02-12 16:55:13-2026-03-12 16:55:13",
+                },
+              ],
+            }),
+        ],
+      ]),
+    );
+
+    const zai = findProvider(await service().listUsage(), "zai");
+
+    expect(zai).toMatchObject({
+      status: "available",
+      planLabel: "GLM Coding Max",
+      details: expect.arrayContaining([{ id: "status", label: "Status", value: "VALID" }]),
+    });
+  });
+});
+
+it("discovery returns a locator when fetch finds zai credentials", async () => {
+  const previous = process.env["ZAI_API_KEY"];
+  try {
+    process.env["ZAI_API_KEY"] = "fixture-token";
+    let requested = false;
+    await fetchFirst(async () => {
+      requested = true;
+      return new Response(null, { status: 401 });
+    });
+    expect(requested).toBe(true);
+    expect(await discover()).toEqual([
+      { key: "default", input: { store: "env", locator: "ZAI_API_KEY" } },
+    ]);
+  } finally {
+    if (previous === undefined) delete process.env["ZAI_API_KEY"];
+    else process.env["ZAI_API_KEY"] = previous;
+  }
+});
+
+describe("account discovery", () => {
+  it.each(["empty home", "unrelated files"])("returns no accounts for %s", async (scenario) => {
+    const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+    const directory = await mkdtemp(join(tmpdir(), "usage-empty-"));
+    const original = { ...process.env };
+    try {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      process.env.HOME = directory;
+      process.env.USERPROFILE = directory;
+      if (scenario === "unrelated files") await writeFile(join(directory, "unrelated.json"), "{}");
+      expect(await discover()).toEqual([]);
+    } finally {
+      for (const key of Object.keys(process.env)) delete process.env[key];
+      Object.assign(process.env, original);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
+
+async function fetchFirst(fetchApi: typeof fetch) {
+  const accounts = await discover();
+  const account = accounts[0];
+  if (!account) throw new Error("No configured account");
+  return fetchUsage(account.input as Parameters<typeof fetchUsage>[0], fetchApi);
+}
+
+it.each([401, 403])("reports an existing login rejected with HTTP %i", async (status) => {
+  const previous = process.env["ZAI_API_KEY"];
+  try {
+    process.env["ZAI_API_KEY"] = "fixture-rejected-login";
+    const report = await fetchUsage(
+      { store: "env", locator: "ZAI_API_KEY" },
+      async () => new Response(null, { status }),
+    );
+    expect(report).toEqual({ status: "unavailable", problem: { kind: "rejected", status } });
+  } finally {
+    if (previous === undefined) delete process.env["ZAI_API_KEY"];
+    else process.env["ZAI_API_KEY"] = previous;
+  }
+});
diff --git a/plugins/zai-usage-source/server/usage.ts b/plugins/zai-usage-source/server/usage.ts
new file mode 100644
index 0000000000..9c07fa6d4e
--- /dev/null
+++ b/plugins/zai-usage-source/server/usage.ts
@@ -0,0 +1,72 @@
+import type { UsageInput } from "../shared/input.js";
+import { z } from "zod";
+import {
+  unavailable,
+  type UsageAccount,
+  type UsageReport,
+  type UsageDetail,
+} from "@getpaseo/plugin/server/usage";
+
+const ApiOptionalStringSchema = z.preprocess(
+  (value) => (value == null ? undefined : value),
+  z.coerce.string().optional(),
+);
+
+const ZaiUsageResponseSchema = z.object({
+  data: z
+    .array(
+      z.object({
+        productName: ApiOptionalStringSchema,
+        status: ApiOptionalStringSchema,
+        purchaseTime: ApiOptionalStringSchema,
+        valid: ApiOptionalStringSchema,
+      }),
+    )
+    .optional(),
+});
+
+export async function fetchUsage(
+  input: UsageInput,
+  fetchApi: typeof fetch = fetch,
+): Promise<UsageReport> {
+  const token = process.env[input.locator];
+  if (!token) throw new Error("Z.ai login store no longer exists");
+
+  const res = await fetchApi("https://api.z.ai/api/biz/subscription/list", {
+    signal: AbortSignal.timeout(15_000),
+    headers: {
+      Authorization: `Bearer ${token}`,
+      Accept: "application/json",
+    },
+  });
+
+  if (res.status === 401 || res.status === 403)
+    return unavailable({ kind: "rejected", status: res.status });
+  if (!res.ok) throw new Error(`Z.ai usage API returned ${res.status}`);
+
+  const resp = ZaiUsageResponseSchema.parse(await res.json());
+  const sub = resp.data?.[0];
+  if (!sub) return unavailable({ kind: "no_quota", detail: "No active coding plan" });
+
+  const details: UsageDetail[] = [];
+  if (sub.status) details.push({ id: "status", label: "Status", value: sub.status });
+  if (sub.valid) details.push({ id: "valid", label: "Valid", value: sub.valid });
+  if (sub.purchaseTime) {
+    details.push({ id: "purchase_time", label: "Purchased", value: sub.purchaseTime });
+  }
+
+  return {
+    status: "available",
+    planLabel: sub.productName || undefined,
+    windows: [],
+    balances: [],
+    details,
+  };
+}
+
+export async function discover(): Promise<UsageAccount[]> {
+  for (const locator of ["ZAI_API_KEY", "GLM_API_KEY"]) {
+    if (process.env[locator]) return [{ key: "default", input: { store: "env", locator } }];
+  }
+  return [];
+}
diff --git a/plugins/zai-usage-source/shared/input.ts b/plugins/zai-usage-source/shared/input.ts
new file mode 100644
index 0000000000..0d34ddf4e4
--- /dev/null
+++ b/plugins/zai-usage-source/shared/input.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+export const inputSchema = z
+  .object({
+    store: z.literal("env"),
+    locator: z.string().min(1),
+  })
+  .strict();
+export type UsageInput = z.infer<typeof inputSchema>;
diff --git a/public-docs/agent-profiles.md b/public-docs/agent-profiles.md
new file mode 100644
index 0000000000..e5084c0cd4
--- /dev/null
+++ b/public-docs/agent-profiles.md
@@ -0,0 +1,54 @@
+---
+title: Agent profiles
+description: Save agent settings for one-click selection and use notes to guide delegation for UI work, planning, and reviews.
+nav: Agent profiles
+order: 32
+category: Orchestration
+---
+
+# Agent profiles
+
+Save the settings you use together as a named profile. Choose **UI work**, **Planning**, or **Review** when creating an agent instead of selecting its model, thinking level, and mode each time.
+
+- **For you:** one selection applies the saved provider, model, mode, thinking level, and available feature settings.
+- **For an orchestrating agent:** profile notes explain when to choose those settings for delegated work.
+
+## Create a profile
+
+1. Open **Settings → your host → Agents → Agent profiles**.
+2. Select **New profile** and give it a name, such as **UI work**.
+3. Choose its provider, model, mode, thinking level, and any available features.
+4. Fill in **When to use** with the kind of work this profile should handle.
+5. Select **Save**.
+
+Profiles are saved on that host. The available settings depend on the provider and model you choose.
+
+## Apply settings in one click
+
+When creating an agent, open the model picker and select a saved profile under **Profiles**. Paseo applies its settings together; you can still adjust them before sending your prompt.
+
+Changing a saved profile affects future selections. It does not update agents you already launched.
+
+## Guide delegation with notes
+
+The **When to use** field is the profile's notes. Paseo exposes these notes through its tools so an orchestrating agent can read them before choosing how to launch a worker.
+
+Give each profile a clear specialty:
+
+| Profile  | Example notes                                                                                |
+| -------- | -------------------------------------------------------------------------------------------- |
+| UI work  | Use for components, layout, styling, and visual polish.                                      |
+| Planning | Use for architecture, investigating root causes, and comparing implementation approaches.    |
+| Review   | Use for independent review of diffs, correctness, missing tests, and unnecessary complexity. |
+
+Each profile can use a different provider and model, or different settings for the same model.
+
+After [enabling Paseo tools](/docs/orchestration#get-started), ask:
+
+> Check my Paseo profiles and their notes. Choose one for the settings-page UI change, then use a review profile for an independent review of the diff.
+
+The orchestrator reads the profiles, selects settings for each task, and launches the workers. Notes guide that choice; put the worker's actual assignment in its task prompt.
+
+The bundled [Paseo skill](/docs/skills#paseo-paseo-reference) instructs agents to check profiles and read their notes before delegating. If none fit, it directs the agent to discover configured providers and models and tell you about the fallback.
+
+See [Common workflows](/docs/orchestration-workflows) for delegation examples or the [MCP reference](/docs/mcp#agent-profiles) for the tool interface.
diff --git a/public-docs/cli.md b/public-docs/cli.md
index e0ec925bfe..1c348960b3 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -1,12 +1,12 @@
 ---
-title: CLI
+title: CLI reference
 description: "Paseo CLI reference: manage projects, workspaces, agents, plugins, scripts, schedules, daemons, and permissions from your terminal."
-nav: CLI
-order: 3
-category: Getting started
+nav: CLI reference
+order: 35
+category: Orchestration
 ---
 
-# CLI
+# CLI reference
 
 The Paseo CLI lets you manage agents from your terminal. It's the same interface exposed by the daemon's API, so anything you can do in the app you can do from the command line.
 
@@ -21,8 +21,49 @@ paseo attach <id>                    # Stream agent output
 paseo send <id> "also fix linting"   # Send follow-up task
 paseo logs <id>                      # View agent timeline
 paseo stop <id>                      # Stop an agent
+paseo usage                          # Show account quotas and balances
 ```
 
+## Account usage
+
+Show account quotas and balances from the host's usage sources:
+
+```bash
+paseo usage
+paseo usage ls --refresh
+paseo usage ls --agent <agent-id>
+paseo usage inspect <report-id>
+paseo usage inspect <report-id> --refresh
+```
+
+`paseo usage` is equivalent to `paseo usage ls`. The summary groups windows and balances by account, with report IDs, source and account labels, status, and fetch timestamps. Missing values appear as `-`; unavailable and failed reports include their reasons.
+
+Copy the full report ID from the list into `inspect` to see reset times, balances and units, plan details, supplied forecasts, and login failures with recovery instructions. Report IDs require exact matches.
+
+`--agent` selects the account quota associated with an agent. It does not measure that agent's token consumption or cost. Use the full agent ID, and do not combine `--agent` with `inspect`.
+
+Queries use the host's five-minute cache when available. Add `--refresh` to bypass it. Use `--host` or `--home` to [select a daemon](#select-one-daemon). Hosts without usage-source support return an update message.
+
+### Usage in scripts
+
+```bash
+paseo usage ls --json
+paseo usage inspect <report-id> --json
+paseo usage ls --quiet
+```
+
+List JSON is always an array, including `[]` when no reports are returned. Inspect JSON is one report entry. Each entry includes `id`, `sourceId`, `sourceLabel`, `account`, `fetchedAt`, and a nested `report`. Read `report.status` before accessing its data:
+
+| Status        | Fields                                                                 |
+| ------------- | ---------------------------------------------------------------------- |
+| `available`   | `windows`, with optional `planLabel`, `balances`, and `details`        |
+| `unavailable` | `problem`, describing expired or rejected credentials or missing quota |
+| `error`       | `error`, the failure message                                           |
+
+Entries may also include `loginErrors`. Structured output preserves numeric values and optional fields. Standard `--format yaml`, `--no-headers`, and `--no-color` options are supported; `--quiet` prints full report IDs.
+
+A completed query exits with status `0`, including when individual reports are unavailable or failed. Connection or request failures, unsupported hosts, unknown report IDs, and conflicting selectors exit with status `1` and write the error to stderr. Human output says **No usage reports returned** for an empty result; this does not establish whether account discovery succeeded for every source.
+
 ## Provider diagnostics
 
 Ask the daemon to inspect the provider environment it actually uses:
@@ -42,7 +83,8 @@ Use `paseo run` to start a new agent with a task:
 ```bash
 paseo run "implement user authentication"
 paseo run --provider codex "refactor the API layer"
-paseo run --background "run the focused test suite"
+paseo run --no-wait "run the focused test suite"
+paseo run --output-schema schema.json "name this branch"
 paseo run --new-workspace worktree --worktree-mode branch-off --new-branch feature/x --base origin/main "implement feature X"
 paseo run --workspace <workspace-id> "review the current diff"
 paseo run --output-schema schema.json "extract release notes"
@@ -55,9 +97,14 @@ Worktree creation accepts `--worktree-mode branch-off|checkout-branch|checkout-p
 
 When an existing Paseo agent runs the same command, Paseo recognizes it through `PASEO_AGENT_ID`. Without explicit placement, the new agent becomes its subagent in the same workspace. `--workspace` can place that subagent elsewhere without changing its parent.
 
-Use `--output-schema` to return only matching JSON output. You can pass a schema file path or an inline JSON schema object. This mode cannot be used with `--background`.
+Use `--output-schema` to return only matching JSON output. You can pass a schema file path or an inline JSON schema object. This mode cannot be used with `--no-wait`.
 
-By default, `paseo run` waits for completion. Use `--background` to return immediately while the agent keeps running.
+By default, `paseo run` waits for completion. Use `--no-wait` to return immediately while the agent keeps running, the same flag `paseo send` takes.
+
+The old `run --background` and `-d` aliases still mean `--no-wait`. They are deprecated, hidden
+from help, and print a warning to stderr. Use `--no-wait` in scripts. Workspace visibility is
+selected separately with `workspace create --background`; this release does not repurpose
+`run --background`.
 
 ## Projects
 
@@ -116,10 +163,23 @@ paseo workspace create \
   --pr-number 2186
 ```
 
+Add `--background` to hide a workspace from default discovery. Its agents and terminals keep
+ordinary history, persistence, hooks, and restart recovery. `--no-background` explicitly overrides
+caller-workspace inheritance; omission inherits when run by a Paseo agent and defaults to false
+from a human shell. Visibility is creation-only.
+
+```bash
+paseo workspace create --isolation local --background --path /path/to/repo
+paseo run --workspace <workspace-id> --no-wait "review the checkout flow"
+```
+
+Exact workspace and agent IDs remain accessible regardless of listing visibility.
+
 Then list, use, rename, or archive it:
 
 ```bash
 paseo workspace ls
+paseo workspace ls --background               # Also include background workspaces
 paseo run --workspace <workspace-id> "implement authentication"
 paseo workspace rename <workspace-id> "Auth rework"
 paseo workspace rename <workspace-id> --reset   # back to the branch or directory name
@@ -128,6 +188,25 @@ paseo workspace archive <workspace-id>
 
 Add `--forge <name>` to PR checkout when Paseo cannot infer the forge from the source checkout. See [Git worktrees](/docs/worktrees) for setup hooks and services.
 
+## Terminals
+
+Use the workspace ID when multiple workspaces share a directory:
+
+```bash
+paseo terminal create --workspace <workspace-id> --name Development
+paseo terminal ls --workspace <workspace-id> --json
+paseo terminal send-keys <terminal-id> -l "echo ready"
+paseo terminal send-keys <terminal-id> Enter
+paseo terminal capture <terminal-id>
+paseo terminal kill <terminal-id>
+```
+
+Creation defaults to the workspace directory. Add `--cwd <absolute-path>` to change the process directory while keeping that workspace as the owner. Unknown and archived workspace IDs fail.
+
+Without `--workspace`, creation opens the project at `--cwd` or the current directory and reuses its oldest active workspace. Listing without `--workspace` filters by `--cwd` or the current directory and can include multiple workspaces. `ls --all` lists every terminal on the host and cannot be combined with directory or workspace filters.
+
+Create and list results include `id`, `name`, `cwd`, and `workspaceId`. Use `--json` for structured output and the global `--host` option to target another daemon. These commands require a host that supports the [workspace terminal API](/docs/sdk/reference#clientterminals); older hosts return an update message.
+
 ## Workspace scripts
 
 List, start, and stop the scripts configured in a workspace's `paseo.json`:
@@ -154,10 +233,9 @@ paseo plugin install /absolute/path/to/plugin
 paseo plugin add owner/repository
 paseo plugin add https://gitlab.com/group/repository.git --ref main
 paseo plugin add owner/monorepo:plugins/review
-paseo plugin status
+paseo plugin ls [id]
 paseo plugin update my-plugin
 paseo plugin update --all
-paseo plugin ls
 paseo plugin reload my-plugin
 paseo plugin logs my-plugin
 paseo plugin disable my-plugin
@@ -166,18 +244,20 @@ paseo plugin remove my-plugin
 ```
 
 GitHub shorthand checks an existing host directory first. Append `:<directory>` for a plugin in a
-monorepo. `paseo plugin logs <id>` returns the plugin's recent daemon-side stdout and stderr. Add `--json` for
-structured entries, or run `paseo --host <target> plugin logs <id>` for another daemon. See the
-[Plugin reference](/docs/plugins/v0.7/reference) for installation, trust, lifecycle, and log-retention
+monorepo. `paseo plugin ls [id]` does not contact the remote. `paseo plugin logs <id>` returns the
+plugin's recent daemon-side stdout and stderr. Add `--json` for structured entries, or run
+`paseo --host <target> plugin logs <id>` for another daemon. See the
+[Plugin reference](/docs/plugins/reference) for installation, trust, lifecycle, and log-retention
 behavior.
 
 ## Listing agents
 
 ```bash
-paseo ls                    # Running agents in current directory
-paseo ls -a                 # Include completed/stopped agents
-paseo ls -g                 # All directories
-paseo ls -a -g --json       # Full list as JSON
+paseo ls                    # Non-archived agents in active workspaces
+paseo ls -a                 # Also include archived agents
+paseo ls -g                 # Non-archived agents across all workspaces
+paseo ls -a -g --json       # All agents, including archived, as JSON
+paseo ls --background       # Also include agents in background workspaces
 ```
 
 ## Streaming output
@@ -194,6 +274,8 @@ Agent IDs can be shortened, `abc` works if it's unambiguous.
 
 Send follow-up tasks to a running or idle agent:
 
+Use the recipient's agent ID from `paseo ls`, or [copy it from the agent's tab](/docs/orchestration-workflows#send-a-prompt-to-another-agent).
+
 ```bash
 paseo send <id> "now run the tests"
 paseo send <id> --image screenshot.png "what's wrong here?"
@@ -255,42 +337,83 @@ Detaching is an explicit lifecycle action, not a creation flag. The agent keeps
 
 ## Daemon management
 
+Define an instance once, then start its saved configuration:
+
 ```bash
-paseo daemon start             # Start the daemon
-paseo daemon start --web-ui    # Start and serve the bundled web UI
-paseo daemon status            # Check status
-paseo reload                    # Reload config.json (top-level alias)
-paseo daemon reload             # Reload config.json
-paseo daemon stop              # Stop the daemon
+paseo daemon config set daemon.listen 127.0.0.1:6799 --home ~/paseo-test
+paseo daemon config set daemon.relay.enabled false --home ~/paseo-test
+paseo daemon start --home ~/paseo-test
+paseo project ls --home ~/paseo-test
+paseo daemon restart --home ~/paseo-test
+paseo daemon stop --home ~/paseo-test
 ```
 
-Reload validates the whole file, applies runtime-safe changes, and reports `appliedPaths`, `restartRequiredPaths`, and `overrideControlledPaths`. Human output prints `paseo daemon restart` only when a changed setting needs it. Use `--json` or `--format yaml` for the structured result. Run `paseo --host <target> reload` to reload a remote daemon's own configuration file. An older host that does not support reload returns an update-host error.
+`start` runs in the background and reports the actual listening address and supervisor PID. It accepts only home selection and `--timeout <seconds>` (default 600). If waiting times out, the supervisor remains running: use the printed status, log, and stop instructions. A worker that exits before becoming ready makes startup fail.
 
-Use `PASEO_HOME` to run multiple isolated daemon instances.
+`restart` requests a replacement worker from the existing supervisor. It rereads the file and retains the supervisor's original environment and arguments. Success confirms a different ready worker, following a changed address for a home target. It never starts a stopped daemon or refreshes the supervisor binary. A timeout reports whether the request was acknowledged; it does not prove why reconnection failed.
+
+`stop --home` waits for that local supervisor to exit. On POSIX it signals the supervisor without contacting a TCP endpoint. On Windows it uses the ready daemon's shutdown RPC; an unbound instance requires explicit `--force`. `--force` permits forced process-tree cleanup after the graceful timeout (default 15 seconds). `stop --host` only reports **shutdown requested**; remote process exit is not verified. A service manager may start another instance after the captured supervisor exits.
+
+`status` separates local supervisor state, its published endpoint, the configured address, and RPC reachability. A stopped home is never probed at its configured address. An unbound live supervisor is **not ready**. If an authenticated local connection remains open but status details time out, the result stays `reachable` with a note explaining the unavailable details. Worker and provider fields are omitted. An explicit `--host` query still fails when its status request fails.
+
+`reload` validates the file, applies runtime-safe changes, and reports `appliedPaths`, `restartRequiredPaths`, and `overrideControlledPaths`. It never implicitly restarts. Use `--json` or `--format yaml` for structured results. An older host lacking the capability reports that it needs an update.
+
+The root aliases `start`, `status`, `restart`, `reload`, and `pair` use the same commands as `daemon`. Root `run` and `stop` remain agent operations.
+
+### Foreground deployments and migration
+
+Use environment overrides with the foreground deployment command:
+
+```bash
+PASEO_LISTEN=127.0.0.1:6799 PASEO_RELAY_ENABLED=false paseo daemon run --home ~/paseo-test
+```
+
+It stays attached until the supervisor exits or you cancel, without a readiness timeout. Worker restart retains these launch inputs. Stop and relaunch the deployment to change them. If the home already has a live supervisor, `run` returns `already_running` without owning or launching a foreground process.
+
+Managed `start` ignores inherited daemon-setting overrides, including `PORT`, `PASEO_LISTEN`, relay, voice, and web UI settings. It preserves provider credentials and executable/runtime controls. `start --foreground` is removed; use `daemon run`. Former start/restart configuration flags such as `--port`, `--no-relay`, and `--web-ui` fail before side effects, with the corresponding `config set` migration. See [configuration edits](/docs/configuration#apply-changes).
+
+### Select one daemon
+
+Every daemon-connected CLI command accepts global `--home` or `--host`, before or after the command. A home selects a local supervisor's published endpoint; a host selects an explicit endpoint. There is no configured-address or default-port fallback.
+
+| Selectors                                  | Result                                                 |
+| ------------------------------------------ | ------------------------------------------------------ |
+| `--home`                                   | That local home, overriding both environment selectors |
+| `--host`                                   | That endpoint, overriding both environment selectors   |
+| Both flags, or conflicting duplicate flags | `TARGET_AMBIGUOUS`                                     |
+| Only `PASEO_HOME` or only `PASEO_HOST`     | The corresponding target                               |
+| Both environment selectors, without a flag | `TARGET_AMBIGUOUS`                                     |
+| Neither                                    | Default local home, `~/.paseo`                         |
+
+Local-only `start`, `daemon run`, `config`, `onboard`, and `set-password` reject explicit `--host` and ignore `PASEO_HOST`. Endpoint operations retain TCP, Unix socket, Windows pipe, SSH, and pairing-offer transports. A host-side CLI controlling a container needs `--host` or `PASEO_HOST`.
 
 ## Hub
 
 ```bash
 paseo hub login [url]          # Approve and store organization-scoped CLI access
-paseo hub init                 # Guided setup: scaffold and deploy a starter bundle here
+paseo hub init                 # Create and optionally deploy a starter trigger here
 paseo hub connect [url]        # Enroll this daemon using CLI access
-paseo hub projects             # List projects in the authenticated organization
+paseo hub projects             # List legacy projects in the authenticated organization
 paseo hub status               # Show the current Hub relationship
+paseo hub permissions list     # Show what this Hub may do on this daemon
+paseo hub permissions grant hub.execute    # Let Hub automations run agents here
+paseo hub permissions revoke hub.execute   # Take it back
 paseo hub disconnect           # End it
-paseo hub deploy -p <project>  # Discover, validate, and activate a Hub bundle
-paseo hub deploy -p <project> --dry-run # Validate without activating
+paseo hub deploy               # Validate and install .paseo/triggers/*.yml
+paseo hub deploy --dry-run     # Validate without installing
+paseo hub deploy -p <project>   # Deploy an existing legacy project bundle
 paseo hub logout               # Remove the active stored CLI login
 ```
 
-Run deploy from the project root. It reads `.paseo/hub.yml`, every direct `.paseo/workflows/*.yml` file, and referenced `.paseo/workflows/partials/*` files in deterministic path order. It does not search parents, accept an alternate resource path, or flatten the bundle into monolithic YAML.
+Run deploy from the repository root. By default it reads every direct `.paseo/triggers/*.yml` file in deterministic path order. It validates all triggers before installing them one at a time. If an installation fails after earlier ones succeeded, the error lists the installed files. `--dry-run` only validates; it does not create or activate revisions.
 
-Pass `-p, --project <slug>` to select the target project. `--dry-run` performs the same discovery and server validation without recording or activating a revision. Both outputs include the resolved Hub, project, and discovered workflow count.
+Pass `-p, --project <slug>` for an existing legacy bundle: `.paseo/hub.yml`, direct `.paseo/workflows/*.yml` files, and referenced workflow partials. See [Deploy from the CLI](/docs/hub/configuration#deploy-from-the-cli).
 
-`login` opens the Hub approval page and stores a durable organization-scoped CLI credential under `PASEO_HOME`. In an interactive terminal it then asks whether to connect this daemon and whether to initialize and deploy a starter workflow, both defaulting to yes. Declining the connection prints `paseo hub connect <origin>; then paseo hub init`, because the connection alone does not produce a bundle; declining only the starter prints `paseo hub init`. `--json` and non-TTY login remain login-only and never prompt. The stored login is separate from the daemon relationship created by `connect`.
+`login` opens the Hub approval page and stores a durable organization-scoped CLI credential under `PASEO_HOME`. In an interactive terminal it offers to connect this daemon, then separately asks whether to allow Hub automations to run agents. Connection defaults to yes; execution permission defaults to no. It then links to Hub's **Triggers** page and prints `paseo hub init` for setup as code. `--json` and non-TTY login remain login-only and never prompt. The stored login is separate from the daemon relationship created by `connect`.
 
-`init` runs the same guided setup on its own and requires a TTY. It connects the daemon, uses the organization's only project or asks which one, and lists the Hub app connections that can back a starter workflow. One usable connection is selected automatically; with several, you choose a **Trigger connection**. If none is ready, setup sends you to **Hub → Apps** and stops before selecting an agent or writing files.
+`init` requires a TTY. It signs in and connects the daemon as needed, then lists the organization's app connections that can back a starter trigger. One usable connection is selected automatically; with several, you choose a **Trigger connection**. If none is ready, setup sends you to **Hub → Apps** and stops before selecting an agent or writing files.
 
-Setup then asks which agent provider, model, and mode the starter should run, choosing from what the connected daemon reports. A provider is offered only when the daemon has it enabled with a selectable model. Suggested model and mode entries are the daemon's defaults; no provider is suggested merely because it appears first. The mode question is skipped for providers that expose no modes and asked explicitly when the daemon has modes but no default. Finally, setup asks for the identity that gates the chosen connection: a GitHub username, a Slack member ID, or a Discord user ID. It writes `.paseo/hub.yml` and `.paseo/workflows/<provider>-help.yml`, validates them against Hub, and deploys. An existing `.paseo/` directory is replaced only after you confirm. See the [generated starter bundle](/docs/hub/configuration#generated-starter-bundle).
+Setup asks which agent provider, model, and mode to run. Providers must be enabled and expose both a selectable model and an execution mode. Suggested model and mode entries are the daemon's defaults; a mode is still selected explicitly when there is no default. Hub validates the choice against the daemon before deploying, and accepts only Claude, Codex, and OpenCode for its unattended runs. `deploy` applies the same checks, so it needs the named daemon connected. Setup then asks for the identity allowed to trigger the bot: a GitHub username, Slack member ID, or Discord user ID. It validates the trigger, writes `.paseo/triggers/<provider>-help.yml`, and asks whether to deploy. Replacing that file requires confirmation; existing legacy bundles and other trigger files are preserved. See the [generated starter trigger](/docs/hub/configuration#generated-starter-trigger).
 
 Interactive logout checks the same-origin daemon relationship and asks whether to disconnect before deleting the login. Declining removes only the login. JSON and noninteractive logout never prompt or disconnect implicitly; `--disconnect-daemon` is the explicit automation path, and `--force` applies to that daemon disconnection. If a requested disconnection fails, the login is preserved.
 
@@ -307,12 +430,12 @@ The global `--host` option accepts either a local target (`host:port`, a unix so
 Get an offer URL from the daemon you want to control:
 
 ```bash
-paseo daemon pair          # asks before enabling relay, then prints the QR and link
+paseo daemon pair          # prints the QR and link when relay is enabled
 paseo daemon pair --relay  # enables relay without prompting
 paseo daemon pair --json   # structured output; never prompts
 ```
 
-Relay is off for new installations. In non-interactive or JSON mode, a disabled relay returns a `RELAY_DISABLED` error; pass `--relay` to provide explicit consent. Relay pairing is end-to-end encrypted. See [Security](/docs/security).
+Relay is off for new installations. A disabled relay returns a `RELAY_DISABLED` error; pass `--relay` to provide explicit consent. For a stopped home, pairing is labelled offline; `--relay` saves relay enablement and the offer includes a start instruction. A live but unreachable home never falls back to an offline identity. Relay pairing is end-to-end encrypted. See [Security](/docs/security).
 
 Use it from anywhere:
 
@@ -329,7 +452,7 @@ The CLI is designed to be used by agents themselves. You can instruct an agent t
 
 ```bash
 # Agent A spawns Agent B and waits for it
-agent_id=$(paseo run --background --quiet --title api-agent "implement the API")
+agent_id=$(paseo run --no-wait --quiet --title api-agent "implement the API")
 paseo wait "$agent_id"
 paseo logs "$agent_id" --tail 5
 ```
diff --git a/public-docs/community.md b/public-docs/community.md
index 1658ca6130..33ba212056 100644
--- a/public-docs/community.md
+++ b/public-docs/community.md
@@ -10,6 +10,13 @@ category: Getting started
 
 These projects are related to Paseo and built by the community.
 
+## Plugin directory
+
+[paseo.cafe](https://paseo.cafe) is a community-run directory of Paseo plugins. Listings are generated
+from each plugin's public repository, so it is the fastest way to see what people are building and to
+publish your own. It is independent of the Paseo project and nothing on it is reviewed or endorsed by
+us, so read a plugin's source before installing it.
+
 ## Tools and integrations
 
 | Project                                                                                      | What it does                                                                                                                         |
@@ -23,7 +30,8 @@ These projects are related to Paseo and built by the community.
 
 ## Hosting and infrastructure
 
-| Project                                                            | What it does                                                                                         |
-| ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- |
-| [Paseo Self-hosted](https://github.com/blockfeed/paseo-selfhosted) | Packages the Paseo web UI and a local daemon as a Docker deployment.                                 |
-| [Devbox Fleet](https://github.com/omrihaviv/devbox-fleet)          | Provisions and maintains per-developer GCP devboxes with Paseo, coding agents, and Tailscale access. |
+| Project                                                                     | What it does                                                                                                                                                             |
+| --------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [Paseo Self-hosted](https://github.com/blockfeed/paseo-selfhosted)          | Packages the Paseo web UI and a local daemon as a Docker deployment.                                                                                                     |
+| [Devbox Fleet](https://github.com/omrihaviv/devbox-fleet)                   | Provisions and maintains per-developer GCP devboxes with Paseo, coding agents, and Tailscale access.                                                                     |
+| [Paseo Vercel Sandbox](https://github.com/vercel-labs/paseo-vercel-sandbox) | Creates persistent Vercel Sandboxes running a Paseo daemon with Codex, Claude Code, OpenCode, or Pi through Vercel AI Gateway. Pair each sandbox as a remote Paseo host. |
diff --git a/public-docs/configuration.md b/public-docs/configuration.md
index a220420ee4..a11c4c69ba 100644
--- a/public-docs/configuration.md
+++ b/public-docs/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: Configuration
-description: Configure Paseo via config.json, environment variables, and CLI overrides.
+description: Configure managed instances and foreground deployments.
 nav: Configuration
 order: 40
 category: Configuration
@@ -8,7 +8,7 @@ category: Configuration
 
 # Configuration
 
-Paseo loads configuration from a single JSON file in your Paseo home directory, with optional environment variable and CLI overrides.
+Managed instances load their configuration from the home’s `config.json` and defaults. Foreground deployments can override that file with environment variables.
 
 ## Where config lives
 
@@ -18,18 +18,13 @@ By default, Paseo uses `~/.paseo` as its home directory. The configuration file
 ~/.paseo/config.json
 ```
 
-You can change the home directory by setting `PASEO_HOME` or passing `--home` to `paseo daemon start`.
+You can change the home directory by setting `PASEO_HOME` or selecting `--home` on a CLI command.
 
 ## Precedence
 
-Paseo merges configuration in this order:
+Managed `start` and Desktop use defaults, then `config.json`. Inherited daemon-setting environment variables are removed from their launches.
 
-1. Defaults
-2. `config.json`
-3. Environment variables
-4. CLI flags
-
-Lists append across sources (for example, `hostnames` and `cors.allowedOrigins`).
+Foreground `paseo daemon run`, Docker, and direct supervisor launches apply environment variables after the file. Existing legacy supervisor flags retain their precedence across worker restart. Changing deployment overrides requires stopping and relaunching that deployment. Lists append across sources, including hostnames and CORS origins.
 
 ## Example
 
@@ -51,7 +46,19 @@ Minimal example that configures listening address, hostnames, and MCP:
 
 ## Apply changes
 
-After saving `config.json`, reload it:
+Edit the selected file through the CLI:
+
+```bash
+paseo daemon config get daemon.listen --home ~/paseo-test
+paseo daemon config set daemon.listen 127.0.0.1:6800 --home ~/paseo-test
+paseo daemon config unset features.webUi.enabled --home ~/paseo-test
+```
+
+`get [path]` reports configured values and labels missing fields unset. It does not create a home. `set` parses JSON, otherwise treats the input as a string; `--string` forces a literal string. `--json` selects output format. Use whole-object JSON for dynamic keys containing dots. Unknown paths, invalid values, and invalid existing files are rejected without writing. Passwords use `set-password`.
+
+A successful edit saves the validated file, then reloads once if the instance is reachable. Output distinguishes applied changes, restart requirements, and deployment overrides. A stopped/unbound/unreachable instance reports **saved; not applied**. A failed reload reports **saved; reload failed** with a nonzero exit; the file remains saved. Edits never implicitly restart.
+
+After editing `config.json` directly, reload it:
 
 ```bash
 paseo reload
@@ -69,7 +76,7 @@ New homes keep relay disabled when you remove `daemon.relay.enabled`. A daemon w
 
 Listen addresses, authentication, relay endpoints and TLS, worktree allocation, service-proxy addresses, the bundled web UI, logging, speech, voice, credentials, and local model settings require a restart. Reload applies other valid edits in the same file before reporting those paths.
 
-Environment variables and daemon start flags remain authoritative. Reload reports a changed file setting under `overrideControlledPaths` when a launch override prevents it from taking effect. This includes startup settings such as listen addresses, passwords, relay endpoints and TLS, service-proxy and web UI settings, logging, speech, and voice configuration. List settings such as hostnames and CORS origins still append across sources, so values from `config.json` continue to apply. Remove the override and restart the daemon if you want the file value to become authoritative.
+Deployment environment variables and legacy supervisor flags remain authoritative. Reload reports a changed file setting under `overrideControlledPaths` when a launch override prevents it from taking effect. This includes startup settings such as listen addresses, passwords, relay endpoints and TLS, service-proxy and web UI settings, logging, speech, and voice configuration. List settings such as hostnames and CORS origins still append across sources, so values from `config.json` continue to apply. Stop and relaunch the deployment without the override to make the file value authoritative.
 
 ## Agent providers
 
@@ -104,13 +111,14 @@ The daemon can serve the browser web client from the same HTTP server. This is e
 Enable it from the CLI:
 
 ```bash
-paseo daemon start --web-ui
+paseo daemon config set features.webUi.enabled true
+paseo daemon start
 ```
 
 Or set the environment variable:
 
 ```bash
-PASEO_WEB_UI_ENABLED=true paseo daemon start
+PASEO_WEB_UI_ENABLED=true paseo daemon run
 ```
 
 Or persist it in `config.json`:
@@ -133,7 +141,7 @@ Daemon logging uses separate console and file sinks by default:
 
 - Console: `info` and above
 - File (`$PASEO_HOME/daemon.log`): `trace` and above
-- File rotation: `10m` max file size, `2` retained files total (active + 1 rotated)
+- File rotation: `10m` max file size, `3` rotated files kept alongside the active file
 
 ```json
 {
@@ -147,7 +155,7 @@ Daemon logging uses separate console and file sinks by default:
       "path": "daemon.log",
       "rotate": {
         "maxSize": "10m",
-        "maxFiles": 2
+        "maxFiles": 3
       }
     }
   }
@@ -225,7 +233,7 @@ Set the persisted value in `config.json`:
 }
 ```
 
-`PASEO_RELAY_ENABLED=true|false` overrides the persisted value for that daemon launch. The matching `paseo daemon start --relay` and `--no-relay` flags have the same authority. Remove the launch override before changing relay from Paseo Desktop or `paseo daemon pair --relay`.
+`PASEO_RELAY_ENABLED=true|false` overrides the file for a foreground deployment. Managed `start` uses the file. End and relaunch a deployment to remove its override before changing relay from the app or `paseo daemon pair --relay`.
 
 ## Common env vars
 
diff --git a/public-docs/connectivity.md b/public-docs/connectivity.md
index 425e605fd1..89dd596d95 100644
--- a/public-docs/connectivity.md
+++ b/public-docs/connectivity.md
@@ -43,9 +43,11 @@ Set a different remote daemon port with `daemonPort`:
 paseo --host 'ssh://user@host?daemonPort=7777' ls -a
 ```
 
-Put `--host` before the command. `paseo daemon status` checks only the local daemon; use `paseo --host ssh://user@host ls` to verify a remote connection. `paseo --host ssh://user@host run --cwd /path/on/remote ...` requires a working directory that exists on the remote host.
+Put `--host` before the command. `paseo daemon status` observes the default local home; use `paseo --host ssh://user@host daemon status` to query a remote daemon. `paseo --host ssh://user@host run --cwd /path/on/remote ...` requires a working directory that exists on the remote host.
 
-In Paseo Desktop, open **Settings → Add host → Remote SSH** and enter the same `ssh://` destination.
+In Paseo Desktop, open **Settings → Add host → Remote SSH** and enter the same `ssh://` destination, including `:port` or `?daemonPort=` when those differ from the defaults.
+
+If the remote daemon has a password, enter it in **Daemon password**; it is stored with the host and sent on every connection, the same as a direct connection's password. SSH login itself stays key-based — Paseo never prompts for an SSH password.
 
 ## Paseo relay
 
@@ -123,6 +125,7 @@ If the host was already paired through the relay, Paseo adds the direct connecti
 
 - **SSH authentication failed:** Run `ssh user@host` in a terminal and fix the key, agent, host key, or `~/.ssh/config` entry there. Paseo does not prompt for SSH passwords.
 - **SSH connects but Paseo is refused:** Run `paseo daemon status` on the remote host. SSH transport does not start the daemon.
+- **SSH connects but Paseo reports "Password required":** The remote daemon is password-protected. Remove the SSH connection from the host and add it again, this time entering the daemon password in **Daemon password**.
 - **Connection timed out:** Check that Tailscale is connected on both devices and that you used the daemon machine's Tailscale IP.
 - **Connection refused:** Run `paseo daemon status` and confirm the daemon is running on the configured IP and port.
 - **Config change has no effect:** Run `paseo reload`. `daemon.listen` is a startup setting, so restart when the command reports it.
diff --git a/public-docs/custom-providers.md b/public-docs/custom-providers.md
index ae66bca850..8cc80add18 100644
--- a/public-docs/custom-providers.md
+++ b/public-docs/custom-providers.md
@@ -18,10 +18,31 @@ Everything beyond the [supported providers](/docs/supported-providers) lives und
 
 Run `paseo reload` after editing the file. Provider changes apply to future launches without restarting the daemon.
 
-Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`). Every custom entry needs `extends` (a first-class provider ID or `"acp"`) and a `label`.
+Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`). A new custom provider needs `extends` (a first-class provider ID or `"acp"`) and a `label`.
+To override a bundled provider plugin, use its provider ID and omit `extends`. For
+[Muse Code](/docs/muse-code), set command or environment overrides under `agents.providers.muse`.
 
 The examples below are a quick tour. The full, up-to-date reference is on GitHub: [docs/custom-providers.md](https://github.com/getpaseo/paseo/blob/main/docs/custom-providers.md).
 
+## Provider options
+
+Set defaults in `agents.providers.<id>.options`:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "pi": { "options": { "rpcTimeoutMs": 90000 } }
+    }
+  }
+}
+```
+
+Override defaults for one agent with SDK `config.options` (wire
+`providerOptions`). The provider validates and applies the resulting record.
+See [Provider options](/docs/sdk/provider-options) for the two layers, deep-merge
+rule, persistence behavior, and provider-specific examples.
+
 ## Extending a first-class provider
 
 ```json
@@ -192,4 +213,4 @@ Any agent that speaks [ACP](https://agentclientprotocol.com) over stdio can be a
 
 ## Full reference
 
-For the complete field reference (`extends`, `label`, `command`, `env`, `models`, `additionalModels`, `disallowedTools`, `enabled`, `order`), model and thinking-option schemas, and deeper examples for each plan, see [docs/custom-providers.md](https://github.com/getpaseo/paseo/blob/main/docs/custom-providers.md) on GitHub.
+For the complete field reference (`extends`, `label`, `command`, `env`, `options`, `models`, `additionalModels`, `disallowedTools`, `paseoTools`, `enabled`, `order`), model and thinking-option schemas, and deeper examples for each plan, see [docs/custom-providers.md](https://github.com/getpaseo/paseo/blob/main/docs/custom-providers.md) on GitHub. See [Limit Paseo tools by provider](/docs/mcp#limit-paseo-tools-by-provider) for `paseoTools` configuration.
diff --git a/public-docs/docker.md b/public-docs/docker.md
index be533e66a2..6f19da692a 100644
--- a/public-docs/docker.md
+++ b/public-docs/docker.md
@@ -39,7 +39,9 @@ The image:
 - stores daemon state under `/home/paseo/.paseo`
 - runs the daemon and launched agents as the non-root `paseo` user
 
-The image does not bundle agent CLIs such as Claude Code, Codex, OpenCode, Copilot, or Pi. Add the agents you use with a small child image.
+The image does not bundle agent CLIs such as Claude Code, Codex, OpenCode, Copilot, Pi, or Muse Code. Add the agents you use with a small child image.
+
+Host-side CLI commands select the container explicitly, for example `paseo project ls --host 127.0.0.1:6767`. Without an endpoint selector the CLI looks for a local home’s supervisor. Container environment settings are deployment overrides; worker restart preserves them. Your container manager owns full supervisor replacement.
 
 ## Docker Compose
 
diff --git a/public-docs/hub/api.md b/public-docs/hub/api.md
index cfc0bbc7eb..303a3ffa2d 100644
--- a/public-docs/hub/api.md
+++ b/public-docs/hub/api.md
@@ -1,6 +1,6 @@
 ---
 title: Hub public API
-description: Use organization credentials to list projects, validate or install configuration, dispatch runs, and enroll daemons.
+description: Use organization credentials to install triggers, manage legacy configuration, dispatch runs, and enroll daemons.
 nav: Public API
 order: 79
 category: Hub
@@ -8,7 +8,7 @@ category: Hub
 
 # Hub public API
 
-The Hub public API lets automation operate on projects and daemons in one
+The Hub public API lets automation operate on triggers, projects, and daemons in one
 organization. Set the Hub origin in `PASEO_HUB_URL` below, for example
 `https://hub.example.com`.
 
@@ -37,13 +37,13 @@ organization is not accessible through the key.
 
 Each key has one or more selectable scopes:
 
-| Scope                    | Operation                                           |
-| ------------------------ | --------------------------------------------------- |
-| `projects:read`          | List active projects in the organization.           |
-| `configuration:validate` | Validate configuration without changing Hub state.  |
-| `configuration:install`  | Replace and activate a project's configuration.     |
-| `runs:dispatch`          | Dispatch a configured manual trigger for a project. |
-| `daemons:enroll`         | Issue a short-lived daemon enrollment token.        |
+| Scope                    | Operation                                                             |
+| ------------------------ | --------------------------------------------------------------------- |
+| `projects:read`          | List active projects in the organization.                             |
+| `configuration:validate` | Validate triggers or legacy configuration without changing Hub state. |
+| `configuration:install`  | Install triggers or replace a legacy project's configuration.         |
+| `runs:dispatch`          | Dispatch a configured manual trigger for a project.                   |
+| `daemons:enroll`         | Issue a short-lived daemon enrollment token.                          |
 
 API keys do not grant dashboard access. They cannot manage connections,
 projects, or organization members.
@@ -65,6 +65,34 @@ API failures use RFC 9457 problem details. Missing, invalid, or revoked credenti
 
 A valid key without the scope required by an endpoint returns `403` in the same format.
 
+## Trigger validation and installation
+
+`paseo hub deploy --dry-run` validates each `.paseo/triggers/*.yml` file through `POST /api/v1/triggers/validate`. `paseo hub deploy` validates all files first, then installs each through `POST /api/v1/triggers/install`.
+
+Both endpoints accept one self-contained document:
+
+```json
+{
+  "yaml": "name: manual-task\nenabled: true\non:\n  manual.run: {}\nrun:\n  target: { daemon: my-macbook, cwd: /workspace }\n  agent: { provider: codex, model: gpt-5, mode: full-access }\n  prompt: Complete the task and call hub.finish_execution.\n  max_runtime: 1h\n  idle_timeout: 5m\n"
+}
+```
+
+Use a daemon slug and agent runtime available in your organization. Both operations ask the named daemon to check the agent, so it has to be connected and hold `hub.execute`; an agent it cannot run is a field issue rather than a failed first run. See [Saving checks the agent against the daemon](/docs/hub/triggers#saving-checks-the-agent-against-the-daemon). Validation requires `configuration:validate` and returns `200` with `{ "name": "manual-task", "valid": true }`.
+
+Installation requires `configuration:install`. It creates or updates the organization's trigger by the YAML `name` and returns `201`:
+
+```json
+{
+  "triggerId": "00000000-0000-4000-8000-000000000001",
+  "name": "manual-task",
+  "revisionId": "00000000-0000-4000-8000-000000000002",
+  "version": 1,
+  "active": true
+}
+```
+
+Invalid YAML or an unknown organization resource returns `422` with field issues. Each installation is a separate request; a later failure does not undo earlier successful installs. See [Deploy from the CLI](/docs/hub/configuration#deploy-from-the-cli).
+
 ## Project list
 
 `GET /api/v1/projects` returns active projects in the bearer credential's organization. `paseo hub projects` renders the projects as a table. With `--json`, it returns `{ "origin": "...", "projects": [...] }` so even an empty result records the resolved Hub.
@@ -81,7 +109,7 @@ A valid key without the scope required by an endpoint returns `403` in the same
 }
 ```
 
-## Configuration validation
+## Legacy configuration validation
 
 `POST /api/v1/configurations/validate` accepts the same `projectSlug` and complete `files` bundle as configuration install. It performs the same compilation and resource resolution without recording a revision or changing the active configuration.
 
@@ -94,9 +122,9 @@ On success, Hub returns `200`:
 }
 ```
 
-`paseo hub deploy --dry-run` calls this endpoint with the identical locally resolved payload that a deployment would send.
+`paseo hub deploy --project <slug> --dry-run` calls this endpoint with the identical locally resolved payload that a deployment would send.
 
-## Configuration install
+## Legacy configuration install
 
 `configuration:install` validates the supplied canonical bundle, stores the exact authored files, and activates a new revision.
 
@@ -157,7 +185,7 @@ curl --fail-with-body -sS -X POST "$PASEO_HUB_URL/api/v1/configurations/install"
   --data @configuration-install.json
 ```
 
-`paseo hub deploy -p <project>` calls this endpoint with the discovered local bundle. The command uses an exact-origin stored login when flags and environment credentials are absent. See [Deploy from the CLI](/docs/hub/configuration#deploy-from-the-cli).
+`paseo hub deploy -p <project>` selects this legacy endpoint with the discovered local bundle. The command uses an exact-origin stored login when flags and environment credentials are absent. See [Deploy from the CLI](/docs/hub/configuration#deploy-from-the-cli).
 
 ## Manual run dispatch
 
diff --git a/public-docs/hub/configuration/hub-yml.md b/public-docs/hub/configuration/hub-yml.md
index ffc046ef25..91b71782d9 100644
--- a/public-docs/hub/configuration/hub-yml.md
+++ b/public-docs/hub/configuration/hub-yml.md
@@ -90,17 +90,17 @@ An environment is a complete named object. A step selects its name; objects are
 
 Each agent is one complete provider configuration:
 
-| Field              | Required | Notes                                                            |
-| ------------------ | -------- | ---------------------------------------------------------------- |
-| `provider`         | yes      | Provider ID.                                                     |
-| `model`            | no       | Provider model ID.                                               |
-| `mode`             | no       | Paseo mode ID.                                                   |
-| `thinkingOptionId` | no       | Provider thinking option.                                        |
-| `options`          | no       | JSON-safe provider-native options, preserving names and nesting. |
+| Field              | Required | Notes                                                                  |
+| ------------------ | -------- | ---------------------------------------------------------------------- |
+| `provider`         | yes      | Provider ID. Hub runs unattended, so `claude`, `codex`, or `opencode`. |
+| `model`            | no       | Provider model ID.                                                     |
+| `mode`             | no       | Paseo mode ID.                                                         |
+| `thinkingOptionId` | no       | Provider thinking option.                                              |
+| `options`          | no       | JSON-safe provider-native options, preserving names and nesting.       |
 
 A named selection preserves the complete object, including structured options. Named agents have no parent, patch, or per-step override.
 
-Hub passes `model`, `mode`, `thinkingOptionId`, and `options` to the Paseo daemon without renaming or flattening provider fields. The selected daemon validates them against its current provider schema; Hub does not translate provider-native options.
+Hub passes `model`, `mode`, `thinkingOptionId`, and `options` to the Paseo daemon without renaming or flattening provider fields. The selected daemon validates them against its current provider schema when the trigger is saved or deployed, so a value it does not offer is refused then rather than at the first run; Hub does not translate provider-native options. See [Saving checks the agent against the daemon](/docs/hub/triggers#saving-checks-the-agent-against-the-daemon).
 
 ## Workflow files
 
@@ -188,20 +188,21 @@ An environment or dynamic named-agent expression must have a finite set of possi
 
 ### Steps
 
-| Field           | Required | Notes                                                                                    |
-| --------------- | -------- | ---------------------------------------------------------------------------------------- |
-| `id`            | yes      | Unique within the workflow.                                                              |
-| `environment`   | yes      | Literal environment name or finite expression resolving to one.                          |
-| `max_runtime`   | yes      | Step hard limit.                                                                         |
-| `idle_timeout`  | yes      | Idle limit no longer than `max_runtime`.                                                 |
-| `agent`         | yes      | Named agent, finite expression selecting a named agent, or complete static inline agent. |
-| `prompt`        | yes      | Ordered `text` and `include` blocks.                                                     |
-| `if`            | no       | Expression deciding whether the step runs.                                               |
-| `env`           | no       | Environment variables from connection values.                                            |
-| `output.schema` | no       | JSON Schema for structured step output.                                                  |
-| `allow_outputs` | no       | Provider output capabilities with optional `max` and `required`.                         |
-| `auto_archive`  | no       | Archive the agent after the step ends.                                                   |
-| `github`        | no       | Explicit GitHub authority for this step.                                                 |
+| Field             | Required | Notes                                                                                                                |
+| ----------------- | -------- | -------------------------------------------------------------------------------------------------------------------- |
+| `id`              | yes      | Unique within the workflow.                                                                                          |
+| `environment`     | yes      | Literal environment name or finite expression resolving to one.                                                      |
+| `max_runtime`     | yes      | Step hard limit.                                                                                                     |
+| `idle_timeout`    | yes      | Idle limit no longer than `max_runtime`.                                                                             |
+| `startup_timeout` | no       | Step startup waiting budget. See [startup timeout](/docs/hub/configuration#startup-timeout) for defaults and limits. |
+| `agent`           | yes      | Named agent, finite expression selecting a named agent, or complete static inline agent.                             |
+| `prompt`          | yes      | Ordered `text` and `include` blocks.                                                                                 |
+| `if`              | no       | Expression deciding whether the step runs.                                                                           |
+| `env`             | no       | Environment variables from connection values.                                                                        |
+| `output.schema`   | no       | JSON Schema for structured step output.                                                                              |
+| `allow_outputs`   | no       | Provider output capabilities with optional `max` and `required`.                                                     |
+| `auto_archive`    | no       | Archive the agent after the step ends.                                                                               |
+| `github`          | no       | Explicit GitHub authority for this step.                                                                             |
 
 An inline agent is static and complete:
 
@@ -255,3 +256,27 @@ Keep `environments` in `hub.yml`, convert the environment list to a named map, a
 Hub does not read TOML or a monolithic `triggers` section, and the CLI does not rewrite either format.
 
 See [Workflows](/docs/hub/workflows) for complete routing examples.
+
+## Agent continuation
+
+Self-contained dashboard trigger documents accept `run.continuation`:
+
+| Value                                                    | Behavior                                                                                                                |
+| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `{mode: conversation}`                                   | Default. Reuse the project's agent for the event's conversation; create a new agent when the event has no conversation. |
+| `{mode: key, key: "support-${{ paseo.inputs.ticket }}"}` | Reuse the project's agent for the evaluated custom key.                                                                 |
+| `{mode: new}`                                            | Create a new agent for each arrival.                                                                                    |
+
+Keys use the existing expression syntax and must resolve to a non-empty string of at most 512 characters. Custom keys and provider conversation identities occupy separate namespaces. The same key in different projects does not share an agent.
+
+An existing session keeps its daemon, agent configuration, target, environment, and tool contracts. Changing those settings for the same key fails with an explanation; choose a different key or **New agent**. Prompts and output destinations belong to each arrival and may change. A worktree branch is chosen when the session is first created and reused on later arrivals.
+
+A follow-up steers the active agent without extending its runtime deadline or credential expiry. With a `run.github` grant or connection token in `run.env`, follow-ups share the active agent’s credentials. Once all requests finish, Hub revokes leased tokens; the next arrival starts a new agent with fresh credentials. Agents without temporary credentials can be reused after completion.
+
+### Upgrading
+
+Upgrade the connected Paseo daemons before enabling the new Hub version. Hub requires the daemon's ordinary agent RPC and request receipt capabilities; an older host produces an actionable dispatch error.
+
+Hub's database migration adds sessions and nullable execution associations. Existing executions retain their saved launch contract and execution-specific MCP endpoint until they finish. New arrivals for existing self-contained trigger documents use the conversation default. Historical agents are not backfilled into sessions.
+
+Legacy multi-step workflow bundles keep their existing behavior. Converting one to a self-contained trigger writes `mode: new` explicitly; change it in the editor when ready to reuse agents.
diff --git a/public-docs/hub/configuration/index.md b/public-docs/hub/configuration/index.md
index 6df97c29e1..202fb4d05d 100644
--- a/public-docs/hub/configuration/index.md
+++ b/public-docs/hub/configuration/index.md
@@ -1,6 +1,6 @@
 ---
 title: Hub configuration
-description: Configuration bundles, GitHub sync, CLI deployment, and revisions.
+description: Generate, edit, and deploy organization triggers from your repository.
 nav: Configuration
 order: 70
 category: Hub
@@ -8,98 +8,92 @@ category: Hub
 
 # Hub configuration
 
-A project configuration is one versioned bundle:
+Each organization trigger is one self-contained YAML file. Keep triggers in your repository and deploy them with `paseo hub deploy`:
 
 ```text
 .paseo/
-├── hub.yml
-└── workflows/
-    ├── <workflow>.yml
-    └── partials/
-        └── <partial>.md
+└── triggers/
+    └── <trigger>.yml
 ```
 
-`hub.yml` owns named environments and agents. Each direct-child workflow file owns one trigger and its ordered inline steps. Prompt partials referenced by those workflows live below `workflows/partials/`. Workflow discovery is fixed by convention; there is no manifest or include list.
+## Generated starter trigger
 
-[single-repo-team-bot](https://github.com/getpaseo/hub/tree/main/examples/single-repo-team-bot) is a complete bundle in this shape: Discord, Slack, and GitHub workflows running a classifier and a worker on shared partials. Copy `.paseo/` into your repository and replace the placeholders its README lists.
+Run `paseo hub init` from the repository the agent should work in. Setup selects an app connection and an available agent runtime, asks which user may trigger it, validates the result, and writes one file. It then asks whether to deploy. Interactive `paseo hub login` connects the daemon and points to this command; it does not write trigger files.
 
-## Generated starter bundle
-
-`paseo hub init`, and the guided setup that interactive `paseo hub login` offers, write two files for the directory you run them in:
+For a Slack connection named `my-team`, the generated document looks like this:
 
 ```yaml
-# .paseo/hub.yml
-environments:
-  my-macbook:
-    kind: daemon
+# .paseo/triggers/slack-help.yml
+name: slack-help
+enabled: true
+on:
+  slack.mention:
+    connection: my-team
+    filters:
+      from_users: [U01234567]
+max_runtime: 2h
+run:
+  target:
     daemon: my-macbook
     cwd: /Users/you/code/your-repo
-agents:
-  starter:
+  agent:
     provider: codex
     model: gpt-5
     mode: full-access
+  continuation:
+    mode: conversation
+  max_runtime: 90m
+  idle_timeout: 10m
+  prompt: |
+    Answer with hub.reply, then complete this request and call hub.finish_execution when done.
+
+    <user-prompt>
+    ${{ paseo.prompt }}
+    </user-prompt>
+  outputs:
+    slack.reply:
+      max: 1
+      required: true
 ```
 
-The environment is named after the connected daemon and points at the directory setup ran in. `provider`, `model`, and `mode` are the runtime you chose from what that daemon reported, so the starter agent is a complete selection before its first run. `mode` is omitted for a provider that exposes none.
+`connection` is the app connection's slug in your organization. `target.daemon` is the connected daemon's slug and `target.cwd` is the absolute directory where you ran setup. `agent` contains the provider, model, and execution mode you selected from the daemon. The mode is required.
+
+`continuation.mode: conversation` keeps follow-ups in the same provider conversation on the same agent. The prompt asks the agent to reply and then call `hub.finish_execution`; replying alone does not finish the execution.
+
+A Discord starter uses `discord.mention`, your Discord user ID, and `discord.reply`. A GitHub starter uses `github.issue_comment`, restricts the repository to the current GitHub remote, and requires both `@paseo` and your GitHub username. GitHub's starter has no explicit reply output declaration.
+
+Setup asks before replacing the selected trigger file. It preserves other triggers and any existing legacy bundle. Read [Hub security](/docs/hub/security) before widening `from_users` or the agent's authority.
+
+## Startup timeout
+
+Hub waits up to **two minutes** for agent startup, including worktree creation, provider startup, and initial prompt acceptance. For a slower machine, set `run.startup_timeout` in the trigger YAML:
 
 ```yaml
-# .paseo/workflows/slack-help.yml
-name: slack-help
-on: slack.mention
-max_runtime: 2h
-filters:
-  workspace: T01234567
-  from_users:
-    - U01234567
-steps:
-  - id: work
-    environment: my-macbook
-    max_runtime: 90m
-    idle_timeout: 10m
-    agent: starter
-    prompt:
-      - text: |
-          Answer with hub.reply, then complete this request and call hub.finish_execution when done.
-
-          <user-prompt>
-          ${{ paseo.prompt }}
-          </user-prompt>
-    allow_outputs:
-      - type: slack.reply
-        max: 1
-        required: true
+name: inspect
+on:
+  manual.run: {}
+run:
+  target: { daemon: devbox, cwd: /workspace/project }
+  agent: { provider: codex, mode: full-access }
+  startup_timeout: 5m
+  prompt: Inspect this repository and summarize its current state.
 ```
 
-`filters` carries the identity each provider matches on: the Slack team and member ID above, the Discord guild and user ID for a Discord starter, and `owner/name` plus your login for GitHub.
-
-A Discord starter is `discord-help.yml` and carries `discord.reply`, the counterpart of the `slack.reply` above. A GitHub starter is `github-help.yml` and declares no reply output; GitHub has no reply capability, so a step that must comment needs a [`github` block](/docs/hub/github) instead.
-
-The generated workflow allows one user in one workspace. Read [Hub security](/docs/hub/security) before widening it.
-
-## Sources
-
-A configuration comes from one source:
-
-- **GitHub source**: the complete `.paseo` bundle on the repository's default branch.
-- **Manual source**: source files edited and activated in the dashboard.
-- **CLI/API install**: a complete bundle sent with organization authority.
-
-The **Configuration** tab shows the active revision, source files, and latest synchronization attempt.
+Use a positive duration in `ms`, `s`, `m`, or `h`, up to `24h`. Omitting the field uses `2m`. The existing `max_runtime` and `idle_timeout` limits still apply during startup and can expire sooner. This setting changes Hub's waiting budget; provider-specific timeouts remain in effect.
 
 ## Deploy from the CLI
 
-Run from the project root:
+Run from the repository root:
 
 ```sh
 paseo hub login https://hub.example.com
-paseo hub deploy -p my-project --dry-run
-paseo hub deploy -p my-project
+paseo hub deploy --dry-run
+paseo hub deploy
 ```
 
-Both commands discover `.paseo/hub.yml`, every direct `.paseo/workflows/*.yml` file, and each referenced file below `.paseo/workflows/partials/`. Files are sent in deterministic path order through the same bundle request. Dry-run calls server-side validation and does not create or activate a revision.
+Both deploy commands discover direct `.paseo/triggers/*.yml` files in deterministic path order. The CLI rejects nested files, `.yaml` extensions, symlinked trigger paths, and unreadable files. It does not search parent directories.
 
-The CLI rejects missing resource or workflow files, `.yaml` workflow extensions, nested workflow files, unsafe partial paths, symlinked bundle paths, and unreadable files before contacting Hub. Errors name paths but never print file contents or credentials.
+Dry-run validates each document against Hub without storing a revision. Deployment validates all documents first, then installs them one at a time through the organization trigger API. Installation creates or updates a trigger by its YAML `name`. If a later install fails, the error lists the files already installed; those revisions remain active. Errors name paths without printing file contents or credentials.
 
 Origin precedence:
 
@@ -116,6 +110,21 @@ Credential precedence:
 
 Flags and environment keys are not stored. Endpoint and credential behavior is unchanged between deploy and dry-run.
 
+## Legacy project bundles
+
+Existing project bundles use `.paseo/hub.yml`, direct `.paseo/workflows/*.yml` files, and referenced files below `.paseo/workflows/partials/`. `hub.yml` owns named environments and agents; each workflow owns its trigger and ordered steps.
+
+Select the legacy deployment path explicitly:
+
+```sh
+paseo hub deploy --project my-project --dry-run
+paseo hub deploy --project my-project
+```
+
+These commands send the complete bundle through the project configuration API. Dry-run validates without recording or activating a revision. `paseo hub init` does not create or migrate these bundles.
+
+The following source and revision behavior applies to legacy project bundles.
+
 ## GitHub sync
 
 A push to the configuration repository's default branch starts a sync:
diff --git a/public-docs/hub/daemons.md b/public-docs/hub/daemons.md
index a9cc81267d..94496f0822 100644
--- a/public-docs/hub/daemons.md
+++ b/public-docs/hub/daemons.md
@@ -8,7 +8,7 @@ category: Hub
 
 # Daemons in Hub
 
-A daemon is one of your machines running the Paseo daemon. Enroll it once with your Hub organization, then any project can reference it.
+A daemon is one of your machines running the Paseo daemon. Enroll it once with your Hub organization, then triggers can reference it.
 
 ## Connect
 
@@ -20,7 +20,7 @@ paseo hub login https://hub.example.com
 
 The CLI prints a URL and a verification code and opens your browser. The approved login is stored under `PASEO_HOME`.
 
-In an interactive terminal, login then offers to finish setup: whether to connect this daemon, and whether to initialize and deploy a starter workflow. Both default to yes. Declining the connection prints `paseo hub connect <origin>; then paseo hub init`, since connecting alone leaves the project without a workflow. Declining only the starter prints `paseo hub init`. `--json` or non-TTY login only logs in. [Quickstart](/docs/hub/quickstart) walks through the questions.
+In an interactive terminal, login offers to connect this daemon and separately asks whether to allow Hub automations to run agents. Connection defaults to yes; execution permission defaults to no. It then links to **Triggers** and prints `paseo hub init` for creating a starter trigger as code. `--json` or non-TTY login only logs in. [Quickstart](/docs/hub/quickstart) walks through connection and initialization.
 
 Enroll the daemon on its own when you declined, or when the machine is already logged in:
 
@@ -65,6 +65,18 @@ paseo hub logout --disconnect-daemon           # remove both identities
 paseo hub logout --disconnect-daemon --force   # drop local authority when Hub is unreachable
 ```
 
+## Let Hub run agents on it
+
+Enrolling a daemon does not let Hub start agents on it. That is the separate `hub.execute` permission, which login asks about and defaults to no. Grant it from the machine at any time:
+
+```sh
+paseo hub permissions list
+paseo hub permissions grant hub.execute
+paseo hub permissions revoke hub.execute
+```
+
+Until it is granted, Hub keeps the daemon for identity and presence only. The Daemons page shows it as **Connected only** with the grant command, and Home's checklist reads **Cannot run agents**. [Hub security](/docs/hub/security#choose-daemon-authority) covers what the permission allows once granted.
+
 ## Reference it from configuration
 
 ```yaml
@@ -107,6 +119,6 @@ If Hub loses the create response, or the daemon restarts mid-execution, Hub rese
 | Offline           | Enrolled but not currently connected           |
 | Revoked           | Access removed from Hub                        |
 
-An event that arrives while a daemon is offline fails dispatch with `daemon_not_connected`. Nothing is queued for later. The event is in the project's Activity, and the trigger has to fire again.
+An event that arrives while a daemon is offline fails dispatch with `daemon_not_connected`. Nothing is queued for later. The event is in the project's Activity, and the trigger has to fire again. An offline daemon also blocks saving a trigger that changes its target or agent, because Hub checks that agent against it; see [Saving checks the agent against the daemon](/docs/hub/triggers#saving-checks-the-agent-against-the-daemon).
 
 Revoking from **Daemons → Revoke daemon** ends the relationship from Hub's side. The daemon keeps running your local agents.
diff --git a/public-docs/hub/github.md b/public-docs/hub/github.md
index 51b9a0e28b..c31abe4b56 100644
--- a/public-docs/hub/github.md
+++ b/public-docs/hub/github.md
@@ -37,7 +37,7 @@ steps:
           ${{ paseo.prompt }}
 ```
 
-The agent can use `git` and `gh` within the declared repositories and permissions. Hub mints the token when the step starts and revokes it when execution ends.
+The agent can use `git` and `gh` within the declared repositories and permissions. See [agent continuation](/docs/hub/configuration/hub-yml#agent-continuation) for the token lifecycle when requests continue an agent.
 
 ## Fields
 
@@ -73,4 +73,4 @@ env:
   SOME_TOKEN: "${{ paseo.connections.some-connection.token }}"
 ```
 
-Hub resolves the value for the step and does not persist it. See [Hub security](/docs/hub/security) for provider and host boundaries.
+Hub resolves the value when it prepares the agent's environment. See [Hub security](/docs/hub/security) for provider and host boundaries.
diff --git a/public-docs/hub/hosted.md b/public-docs/hub/hosted.md
index dfe37d1582..b2aba6b2b6 100644
--- a/public-docs/hub/hosted.md
+++ b/public-docs/hub/hosted.md
@@ -8,8 +8,8 @@ category: Hub
 
 # Hosted Hub
 
-[Paseo Hub](https://hub.paseo.sh) is the managed service. Sign in or create an account to start a free trial.
+[Paseo Hub](https://hub.paseo.sh) is the managed service. Create an account and your organization starts on the Free plan: one seat, a monthly allowance of agent runs, no card, and no expiry. Upgrade to Pro from **Billing** in Hub when you want unlimited runs, more seats, or invitations. The [Hub page](/hub) carries the current price and the figures each plan includes.
 
-To start now, [run Hub yourself](/docs/hub/self-hosting). Projects, configuration, triggers, daemons, and activity use the same model in both forms. The managed service owns its GitHub App, Slack app, and Discord application; a self-hosted Hub uses apps you create and control.
+Signing in opens **Home**, the same four-step checklist the [quickstart](/docs/hub/quickstart) walks through: connect an app, connect a daemon, create a trigger, run it.
 
-Pricing and included features are also shown on the [Hub page](/hub).
+To start now, [run Hub yourself](/docs/hub/self-hosting). Projects, configuration, triggers, daemons, and activity use the same model in both forms. The managed service owns its GitHub App, Slack app, and Discord application; a self-hosted Hub uses apps you create and control, and has no plans or billing at all.
diff --git a/public-docs/hub/index.md b/public-docs/hub/index.md
index f7bc1a6ae0..2165f067c7 100644
--- a/public-docs/hub/index.md
+++ b/public-docs/hub/index.md
@@ -20,7 +20,7 @@ A daemon runs agents on one machine, for you. Paseo Hub is the layer above your
 What that gives you today:
 
 - Agents that start on their own, from activity in GitHub, Slack, and Discord.
-- Configuration that lives in a repository and deploys when you push.
+- Triggers you can keep in a repository and deploy from the CLI.
 - A record of everything that arrived, what it matched, and what ran.
 - One place for your team to see all of it.
 
@@ -28,16 +28,15 @@ Your daemons keep running agents where they always did. Hub decides when to ask
 
 ## What lives in your repository
 
-Guided setup creates a project resource file for environments and agents, plus one safe starter workflow:
+`paseo hub init` creates one self-contained starter trigger:
 
 ```text
 .paseo/
-├── hub.yml
-└── workflows/
+└── triggers/
     └── slack-help.yml
 ```
 
-Guided setup deploys the bundle, and mentioning the bot starts an agent on your machine. [Quickstart](/docs/hub/quickstart) runs it end to end; the [generated starter bundle](/docs/hub/configuration#generated-starter-bundle) shows what it wrote, and [Workflows](/docs/hub/workflows) covers routing, prompt partials, and provider-specific replies.
+The file names the app connection, allowed user, daemon, working directory, agent runtime, prompt, and outputs. Setup validates it and asks whether to deploy. Mentioning the bot then starts an agent on your machine. [Quickstart](/docs/hub/quickstart) runs it end to end; the [generated starter trigger](/docs/hub/configuration#generated-starter-trigger) shows what setup wrote.
 
 ## Reading order
 
@@ -56,4 +55,4 @@ If a workflow accepts requests from GitHub, Slack, Discord, or the API, read [Hu
 
 Start on your machine with the embedded database, then add PostgreSQL or a public deployment only when you need them. [Self-hosting](/docs/hub/self-hosting) covers each step.
 
-[Hosted Hub](/docs/hub/hosted) uses the same projects, workflows, daemons, and activity model. [Sign in to start a free trial](https://hub.paseo.sh).
+[Hosted Hub](/docs/hub/hosted) uses the same triggers, daemons, and activity model. [Create a free account](https://hub.paseo.sh); it needs no card and does not expire.
diff --git a/public-docs/hub/quickstart.md b/public-docs/hub/quickstart.md
index 1f9031c1c0..55e1746a88 100644
--- a/public-docs/hub/quickstart.md
+++ b/public-docs/hub/quickstart.md
@@ -8,7 +8,7 @@ category: Hub
 
 # Hub quickstart
 
-Run Hub on your machine, connect it to Slack without a public server, and answer a mention with an agent in your repository. Hub's browser setup hands off to your terminal, and guided setup writes and deploys the workflow for you.
+Run Hub on your machine, connect it to Slack without a public server, and answer a mention with an agent in your repository. Hub's browser setup hands off to your terminal, and `paseo hub init` writes and deploys a starter trigger for you.
 
 You need [Paseo installed and running](/docs), Node.js, and a Slack workspace where you can create an app.
 
@@ -20,7 +20,9 @@ npx @getpaseo/hub
 
 Open the address it prints, normally <http://localhost:3000>, and create the operator account Hub asks for.
 
-The first run needs no database, Docker, environment variables, or API keys. Hub creates an embedded database, your organization, and a **Default** project. You never create a project by hand.
+The first run needs no database, Docker, environment variables, or API keys. Hub creates an embedded database and your organization.
+
+Hub opens **Home**, a checklist of the four things that have to be true before a mention starts an agent: connect an app, connect a daemon, create a trigger, run it. The steps below are those four. Home derives each one from what your organization actually has, prints the command the next step needs, and collapses once all four are done.
 
 ## 2. Connect Slack
 
@@ -42,37 +44,41 @@ GitHub and Discord can wait. Their setup stays available under **Apps**.
 paseo hub login http://localhost:3000
 ```
 
-Run it on the machine where your code lives, in the repository the agent should work in. Guided setup records that directory as the workflow's working directory.
+Run it on the machine where your code lives, in the repository the agent should work in. Run the initializer below from that directory so it becomes the trigger's working directory.
 
-Approve the login in the browser tab that opens. Leave the Hub tab open: it watches for the daemon and shows **Daemon connected** by itself. **Continue** and **Do this later** both land in the Default project.
+Approve the login in the browser tab that opens. Leave the Hub tab open: it watches for the daemon and shows **Daemon connected** by itself. Choose **Continue** when the daemon is connected.
 
-## 4. Answer the setup questions
+## 4. Create the starter trigger
 
-Your terminal confirms the login, then picks up where the browser left off. Most questions arrive with a default or a suggested answer; only your Slack member ID has to be typed.
+After approving login, answer **Yes** to **Connect this daemon to Paseo Hub?** and **Allow Hub automations to run agents on this daemon?**. Execution permission defaults to no, so enable it explicitly for this setup. If you answered no, Home shows the daemon as connected but unable to run agents, with the command that fixes it: `paseo hub permissions grant hub.execute`.
 
-| Question                                  | What it wants                                                                           |
-| ----------------------------------------- | --------------------------------------------------------------------------------------- |
-| Connect this daemon to this Hub?          | Yes. This enrolls the machine you are on.                                               |
-| Initialize and deploy a starter workflow? | Yes.                                                                                    |
-| Starter agent provider, model, and mode   | What your daemon reports it can run. Suggested model and mode entries are its defaults. |
-| Your Slack member ID                      | `U01234567`, the only account allowed to trigger the bot.                               |
+Then run:
 
-Setup lists the app connections ready for this workflow. Because you connected one Slack workspace in step 2, it selects that connection automatically instead of asking you to choose Slack. If several usable connections exist, setup asks for the **Trigger connection**. If none is ready, it sends you to **Hub → Apps** and stops before asking about the agent or writing files.
+```sh
+paseo hub init
+```
 
-The agent provider list contains only runtimes the daemon can use; it does not suggest one arbitrarily. Suggested model and mode entries are defaults reported by the daemon. A provider that has modes but no default mode is still offered; setup asks you to pick the mode instead of guessing one.
+Choose **Custom endpoint** and confirm `http://localhost:3000`. Setup reuses your login and daemon connection, then lists the app connections ready for this trigger. With one Slack workspace connected, it selects that connection automatically. With several usable connections, choose the **Trigger connection**. If none is ready, setup sends you to **Hub → Apps** and stops before selecting an agent or writing files.
 
-[Find your Slack IDs](/docs/hub/triggers/slack#find-your-slack-ids) has the two clicks that copy your member ID. The Slack workspace comes from the app you connected in step 2, so setup does not ask for it.
+| Question                                | What it wants                                                                                 |
+| --------------------------------------- | --------------------------------------------------------------------------------------------- |
+| Starter agent provider, model, and mode | Claude, Codex, or OpenCode on your daemon. Suggested model and mode entries are its defaults. |
+| Your Slack member ID                    | `U01234567`, the only account allowed to trigger the bot.                                     |
+| Deploy now?                             | Yes, to activate this trigger in Hub.                                                         |
 
-Setup then validates the bundle, writes it, and deploys:
+Providers must expose a selectable model and execution mode. If there is no default mode, choose the one the agent should use. Hub runs agents unattended, so it accepts only Claude, Codex, and OpenCode, and it checks the model, mode, and options against your daemon before deploying. Another provider, or a value the daemon does not offer, is refused here rather than at the first run.
+
+[Find your Slack IDs](/docs/hub/triggers/slack#find-your-slack-ids) explains how to copy your member ID. The Slack workspace comes from the selected app connection.
+
+Setup validates the trigger and writes:
 
 ```text
 .paseo/
-├── hub.yml
-└── workflows/
+└── triggers/
     └── slack-help.yml
 ```
 
-If `.paseo/` already exists, setup asks before replacing it. Declining the daemon connection prints `paseo hub connect <hub>; then paseo hub init` — both commands, because connecting alone does not create the workflow. Declining only the starter workflow prints `paseo hub init`.
+If `slack-help.yml` already exists, setup asks before replacing that file. Other files remain in place. If you decline deployment, run `paseo hub deploy` from this repository when ready.
 
 ## 5. Mention the bot
 
@@ -82,12 +88,12 @@ In the channel you invited the bot to:
 @Paseo have a look
 ```
 
-Hub starts the agent on your daemon and posts its reply in the Slack thread. The terminal prints the project's Activity URL, where the run appears. If nothing runs, [Activity](/docs/hub/activity) tells a filtered mention from one that never matched a workflow.
+Hub starts the agent on your daemon and posts its reply in the Slack thread. The terminal links to **Triggers**, where you can manage the trigger and inspect its runs. If nothing runs, [Activity](/docs/hub/activity) tells a filtered mention from one that never matched a trigger.
 
 ## Next
 
 - [How Hub works](/docs/hub/concepts) — how an event becomes a workflow run on your daemon.
-- [Generated starter bundle](/docs/hub/configuration#generated-starter-bundle) — the two files setup wrote, field by field.
+- [Generated starter trigger](/docs/hub/configuration#generated-starter-trigger) — the file setup wrote, field by field.
 - [Workflows](/docs/hub/workflows) — routing, prompts, and provider replies.
 - [Hub security](/docs/hub/security) — read this before widening `from_users` or giving an agent GitHub authority.
 
diff --git a/public-docs/hub/security.md b/public-docs/hub/security.md
index e02577f8ee..f2e5d5d2f2 100644
--- a/public-docs/hub/security.md
+++ b/public-docs/hub/security.md
@@ -16,6 +16,17 @@ external event → Hub → daemon → provider process → cwd, filesystem, netw
 
 The host, provider credentials, filesystem, network, and resulting actions remain under your control. See [Paseo security](/docs/security) for daemon authentication, pairing, and relay boundaries.
 
+## Choose daemon authority
+
+Connecting a daemon does not grant Hub permission to run agents. Grant `hub.execute` when you want
+Hub automations to use it. This permission allows Hub to create and continue agents, inspect their
+state and timelines, configure their model, thinking, and provider permission mode, and archive or
+restore workspaces on that daemon. Provider modes can include bypassing approval prompts. It also applies to existing
+agents and workspaces; it is not an isolation boundary around Hub-created work.
+
+Daemon administration, terminal control, and daemon credential permission management require separate permissions.
+You can revoke `hub.execute` without granting Hub the ability to change its own permissions.
+
 ## Treat requests as untrusted
 
 Start with narrow provider filters:
diff --git a/public-docs/hub/triggers/index.md b/public-docs/hub/triggers/index.md
index eb34349b3f..164d1739eb 100644
--- a/public-docs/hub/triggers/index.md
+++ b/public-docs/hub/triggers/index.md
@@ -34,12 +34,57 @@ Field-by-field detail is in the [configuration reference](/docs/hub/configuratio
 
 ## Choose the agent in Hub
 
-When you create or edit a trigger in the Hub dashboard, choose the daemon and enter its working directory first. Hub then asks that daemon for its available providers, models, execution modes, and thinking options. The suggested model and mode are the daemon's defaults.
+When you create or edit a trigger in the Hub dashboard, choose the daemon and enter its working directory first. Hub does not prefill the directory: it is a path on that machine, it has to exist, and only you know which repository the agent should work in. Hub then asks that daemon for its available providers, models, execution modes, and thinking options. The suggested model and mode are the daemon's defaults.
+
+Only daemons that were granted `hub.execute` are offered as targets, and only Claude, Codex, and OpenCode are offered as providers. Hub preapproves its own tools on every run because nobody is at the keyboard to approve them, and those are the providers whose daemon contract accepts that.
 
 Changing the daemon or working directory reloads the choices. If an existing trigger names a model, mode, or thinking option that the daemon no longer reports, Hub marks that value unavailable without replacing it. You can keep the authored value, choose a current value, or switch to YAML editing.
 
 If the daemon is offline or needs a newer Paseo version, the agent selectors show an error and a retry action. The rest of the trigger and its YAML remain editable.
 
+## Saving checks the agent against the daemon
+
+Saving a trigger asks the target daemon to validate the agent it would launch: the provider, model, mode, thinking option, and provider-native options, and every named agent a choice can select. A value the daemon does not offer is refused at save, naming the field, instead of failing on the first run.
+
+```text
+run.agent.mode: Mode 'default' is not available for provider 'opencode'
+```
+
+The check needs the daemon connected. A new trigger, or a change of daemon, working directory, or agent, cannot be saved while its daemon is offline; the refusal names the daemon. Editing the prompt, filters, or limits of an existing trigger saves either way.
+
+The same checks run wherever a trigger is authored: the dashboard form, its YAML mode, `POST /api/v1/triggers/install`, `paseo hub init`, and `paseo hub deploy`.
+
+## Continue the same agent
+
+Dashboard triggers default to **Same conversation**. Messages in the same Slack or Discord thread, events on the same GitHub issue or pull request, and events on the same Linear issue continue the existing agent in that project. An event without a conversation starts a new agent.
+
+If the agent is busy, the new prompt steers its current work. Each arrival keeps its own output limits and completion status. If a reusable workspace is archived, Hub asks Paseo to restore it before sending the prompt.
+
+Choose **Custom key** to group arrivals by an input, or **New agent** to keep them separate. A self-contained trigger document can express the same choice:
+
+```yaml
+name: support
+on:
+  slack.mention:
+    filters:
+      from_users: [U01234567]
+run:
+  target:
+    daemon: laptop
+    cwd: /Users/you/code/support
+  agent:
+    provider: codex
+  continuation:
+    mode: conversation
+  max_runtime: 30m
+  idle_timeout: 5m
+  prompt: Handle this request and call finish_execution when complete.
+```
+
+The [continuation reference](/docs/hub/configuration/hub-yml#agent-continuation) covers keys and agent reuse. The run detail shows whether each arrival created, continued, or restored an agent.
+
+Hub includes an `executionId` in each prompt. When using a continuing agent, pass that ID to `reply` and `finish_execution`. These tools act on that arrival's destination and contract; an old or unrelated execution ID is rejected.
+
 ## Events
 
 | `on`                                  | Fires when                                           |
diff --git a/public-docs/index.md b/public-docs/index.md
index 7bf22016a4..54bd56b7b4 100644
--- a/public-docs/index.md
+++ b/public-docs/index.md
@@ -8,7 +8,7 @@ category: Getting started
 
 # Getting started
 
-Paseo runs your coding agents on your machine and gives you a mobile, desktop, web, and CLI client to drive them from anywhere. Three common ways to install.
+Paseo is an agentic development environment for running coding agents, editing files, reviewing changes, and testing your work. Agents run on your machines; desktop, mobile, web, and CLI clients let you work from anywhere. Choose how to install it below.
 
 ## Desktop app (recommended)
 
@@ -50,6 +50,7 @@ The image runs the daemon and serves the bundled web UI. It does not bundle agen
 
 ## Where next
 
+- [Run parallel tasks](/docs/parallel-development), use separate worktrees, review diffs, and test changes in the desktop app.
 - [Connectivity](/docs/connectivity), connect through the relay or Tailscale.
 - [Docker](/docs/docker), run the daemon and bundled web UI in a container.
 - [Workspaces](/docs/workspaces), the project, workspace, and session model Paseo is built around.
diff --git a/public-docs/mcp.md b/public-docs/mcp.md
index 309f18e260..58e8a2db56 100644
--- a/public-docs/mcp.md
+++ b/public-docs/mcp.md
@@ -2,19 +2,75 @@
 title: MCP reference
 description: Reference for the Paseo tools agents use to manage agents, workspaces, scripts, terminals, and schedules.
 nav: MCP reference
-order: 33
+order: 34
 category: Orchestration
 ---
 
 # MCP reference
 
-This is the complete catalog behind the workflows in [Orchestration](/docs/orchestration) and [Common workflows](/docs/orchestration-workflows). You normally ask for an outcome in natural language and let the agent choose the tools.
+[Enable Paseo tools](/docs/orchestration#get-started) to give agents this catalog. Ask for an outcome in natural language, or use the tool interfaces below.
 
-Paseo can inject these tools into every new agent it launches. Open **Settings → your host → Agents** and turn on **Enable Paseo tools**, or set `daemon.mcp.injectIntoAgents` to `true`.
+## Configuration
 
-Depending on the provider, Paseo delivers the catalog through its native tool interface or MCP. The capabilities are the same either way.
+| Setting                       | Default | Purpose                                            |
+| ----------------------------- | ------- | -------------------------------------------------- |
+| `daemon.mcp.enabled`          | `true`  | Run the MCP server.                                |
+| `daemon.mcp.injectIntoAgents` | `false` | Give agents launched by Paseo access to its tools. |
 
-The MCP server itself is controlled by `daemon.mcp.enabled`. Existing agents may need a reload.
+Depending on the provider, Paseo delivers tools through its native tool interface or MCP. The capabilities are the same. Start a new agent or reload an existing one after changing injection settings.
+
+## Limit Paseo tools by provider
+
+Use provider policies when different agent profiles should receive different Paseo tools. Enable
+tool injection globally, then add `paseoTools` to the exact provider IDs you launch:
+
+```json
+{
+  "$schema": "https://paseo.sh/schemas/paseo.config.v1.json",
+  "version": 1,
+  "daemon": {
+    "mcp": {
+      "enabled": true,
+      "injectIntoAgents": true
+    }
+  },
+  "agents": {
+    "providers": {
+      "codex-lead": {
+        "extends": "codex",
+        "label": "Codex Lead"
+      },
+      "codex-worker": {
+        "extends": "codex",
+        "label": "Codex Worker",
+        "paseoTools": {
+          "disabledTools": ["create_agent", "send_agent_prompt", "kill_agent"]
+        }
+      },
+      "codex-isolated": {
+        "extends": "codex",
+        "label": "Codex Isolated",
+        "paseoTools": {
+          "enabled": false
+        }
+      }
+    }
+  }
+}
+```
+
+Run `paseo reload` after editing `~/.paseo/config.json`, then start a new agent or reload an
+existing one. A running session keeps the catalog it received at launch.
+
+Omitting `paseoTools` enables the complete catalog. Set `enabled` to `false` to remove the catalog,
+or list exact tool IDs in `disabledTools` to remove selected tools. Custom profiles do not inherit
+this policy from `extends`; configure each custom provider ID separately.
+
+Browser tools still require browser tools to be enabled and a connected browser host. The
+voice-only `speak` tool is separate from this policy.
+
+This setting limits the catalog presented to an agent. It is not a security boundary for an agent
+that can access the host through a shell.
 
 ## Mental model
 
@@ -31,27 +87,29 @@ MCP does not expose an agent-detach tool. Detaching is a manual user action in t
 
 ### Agents
 
-| Tool                 | Function                                                                                |
-| -------------------- | --------------------------------------------------------------------------------------- |
-| `create_agent`       | Create an agent, optionally placing it in an existing workspace with `workspaceId`.     |
-| `send_agent_prompt`  | Send a task to a running agent.                                                         |
-| `get_agent_status`   | Return the latest snapshot for an agent.                                                |
-| `list_agents`        | List recent agents as compact metadata.                                                 |
-| `cancel_agent`       | Abort an agent's current run but keep the agent alive.                                  |
-| `archive_agent`      | Soft-delete an agent and remove it from the active list.                                |
-| `kill_agent`         | Terminate an agent session permanently.                                                 |
-| `update_agent`       | Update an agent name, labels, or runtime settings such as mode/model/thinking/features. |
-| `get_agent_activity` | Return recent agent timeline entries as a curated summary.                              |
-| `set_agent_mode`     | Switch an agent's session mode.                                                         |
+| Tool                 | Function                                                                                                                                                       |
+| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create_agent`       | Create an agent, optionally placing it in an existing workspace with `workspaceId`. Use `initialPrompt` to start work; returns without waiting for completion. |
+| `send_agent_prompt`  | Send a prompt using `agentId` and `prompt`; returns without waiting for completion.                                                                            |
+| `get_agent_status`   | Return the latest snapshot for an agent.                                                                                                                       |
+| `list_agents`        | List recent agents as compact metadata; `includeBackground: true` includes background work.                                                                    |
+| `cancel_agent`       | Abort an agent's current run but keep the agent alive.                                                                                                         |
+| `archive_agent`      | Soft-delete an agent and remove it from the active list.                                                                                                       |
+| `kill_agent`         | Terminate an agent session permanently.                                                                                                                        |
+| `update_agent`       | Update an agent name, labels, or runtime settings such as mode/model/thinking/features.                                                                        |
+| `get_agent_activity` | Return recent agent timeline entries as a curated summary.                                                                                                     |
+| `set_agent_mode`     | Switch an agent's session mode.                                                                                                                                |
+
+Paseo agents receive finish, error, and permission notifications by default; set `notifyOnFinish: false` to disable them. External MCP clients use `get_agent_status` and `get_agent_activity` to check results.
 
 ### Workspaces
 
-| Tool                | Function                                                                                              |
-| ------------------- | ----------------------------------------------------------------------------------------------------- |
-| `create_workspace`  | Create a local or worktree-isolated workspace. Worktrees can branch off, check out a branch, or a PR. |
-| `list_workspaces`   | List active workspaces and their directories and isolation.                                           |
-| `rename_workspace`  | Change the user-visible name of the current or specified workspace.                                   |
-| `archive_workspace` | Archive a workspace and the sessions it owns.                                                         |
+| Tool                | Function                                                                                                                                                                                                                                                                                                        |
+| ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create_workspace`  | Create a local or worktree-isolated workspace. Worktrees can branch off, check out a branch, or a PR. `background: true` hides it from default lists and the sidebar while preserving history and access by ID. Omission inherits the calling agent’s workspace setting, or defaults to false without a caller. |
+| `list_workspaces`   | List active workspaces and their directories and isolation. Use `includeBackground: true` to include background workspaces.                                                                                                                                                                                     |
+| `rename_workspace`  | Change the user-visible name of the current or specified workspace.                                                                                                                                                                                                                                             |
+| `archive_workspace` | Archive a workspace and the sessions it owns.                                                                                                                                                                                                                                                                   |
 
 For worktree isolation, `create_workspace` accepts the same useful choices as the app: branch off from a base, check out an existing branch, or check out a pull request. The worktree remains an implementation detail of the workspace lifecycle.
 
@@ -97,6 +155,26 @@ Both use the same cron engine, but they have deliberately different interfaces.
 
 MCP heartbeats are ephemeral: create or delete them. To change one, delete it and create a replacement. Pause, resume, update, inspect, logs, and run-once apply to new-agent schedules only.
 
+### Agent profiles
+
+| Tool            | Function                                                                                                                           |
+| --------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| `list_profiles` | Return the host's saved agent profiles, including their notes and launch settings. Returns an empty list when none are configured. |
+
+Before delegating, read each profile's `notes` and choose the profile the user named or the one that fits the task. See [Agent profiles](/docs/agent-profiles) for setup and example notes.
+
+`create_agent` has no profile parameter and requires a `provider/model` pair. If the profile has no model, call `list_models` for its provider and choose an available model for the task before launching. Apply the chosen profile's values to the launch request:
+
+| Profile field                   | `create_agent` field                                                        |
+| ------------------------------- | --------------------------------------------------------------------------- |
+| `provider` and optional `model` | `provider` as `provider/model`, using the saved or discovered model ID      |
+| `modeId`                        | `settings.modeId`                                                           |
+| `thinkingOptionId`              | `settings.thinkingOptionId`                                                 |
+| `featureValues`                 | `settings.features`                                                         |
+| `notes`                         | Selection guidance for the orchestrator; supply the task in `initialPrompt` |
+
+Omit absent optional settings. If no profile fits, use provider discovery to choose available settings.
+
 ### Providers
 
 | Tool               | Function                                                          |
diff --git a/public-docs/muse-code.md b/public-docs/muse-code.md
new file mode 100644
index 0000000000..83dea4d244
--- /dev/null
+++ b/public-docs/muse-code.md
@@ -0,0 +1,85 @@
+---
+title: Muse Code
+description: Install and configure Muse Code for Paseo.
+nav: Muse Code
+order: 25
+category: Providers
+---
+
+# Muse Code
+
+Run Meta's terminal coding agent in Paseo with your existing Muse installation and credentials.
+
+## Getting started
+
+Install Muse Code on the machine running the Paseo daemon:
+
+```bash
+curl -fsSL https://dev.meta.ai/install.sh | sh
+muse login
+```
+
+Use Muse 1.3.0 or newer. This integration was verified with 1.4.1. For API access, set
+`META_API_KEY` in the daemon's environment instead of logging in. See
+[provider environment overrides](/docs/custom-providers).
+
+In Paseo, select **Muse Code**, then choose a model, approval mode, and reasoning effort.
+Paseo runs `muse serve` and communicates over the Muse Session Protocol (MSP). Your Muse
+configuration determines the available models.
+
+## Provider options
+
+Paseo launches Muse with the sandbox disabled (`--disable-sandbox`) and workspace trust
+on (`--trust-workspace`). Muse can install packages using your npm cache and load project
+rules, skills, and configuration.
+
+Set defaults for every Muse agent in `config.json` on the daemon machine under
+`agents.providers.muse.options`:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "muse": {
+        "options": {
+          "sandbox": { "enabled": true, "network": "proxy-only" },
+          "trustWorkspace": false
+        }
+      }
+    }
+  }
+}
+```
+
+You can also supply per-agent `providerOptions` when creating an agent. The daemon merges
+provider defaults with the per-agent options and delivers the effective `providerOptions`
+to Muse. See [provider options](/docs/sdk/provider-options) for configuration and creation.
+
+Per-agent options are saved with the agent and reapplied when its Muse host opens on refresh
+or resume. Invalid values and unknown keys fail session creation with a `providerOptions`
+error.
+
+| Option            | Default        | Effect                                                                                                                          |
+| ----------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| `sandbox.enabled` | `false`        | Enables Muse's filesystem and network sandbox. Its read-only home directory prevents npm from writing the default cache.        |
+| `sandbox.network` | `"proxy-only"` | Sandbox network policy: `"proxy-only"`, `"restricted"`, or `"enabled"`. With sandbox disabled, Muse allows full network access. |
+| `trustWorkspace`  | `true`         | Lets Muse load project rules, skills, and configuration.                                                                        |
+
+Approval modes control tool decisions separately: **Default**, **Ask**, **Strict**, and
+**Full access**. Full access automatically allows escalated approval stages; it preserves
+the effective provider options. Skills appear in the slash-command menu, alongside `/compact`.
+
+## Limitations in Muse 1.4.1
+
+- **Paseo MCP tools are unavailable.** Muse drops the returned tool namespace before matching
+  an MCP call. This upstream issue must be fixed in Muse before its agents can use Paseo tools.
+- **Compaction needs a model context limit.** If your endpoint does not report one, configure
+  `context_compaction.provider_context_limit_tokens` in Muse for the selected model.
+- **Usage windows appear only when Muse reports them.** An empty `usage/read` response
+  leaves subscription usage unavailable.
+- **Native subagents may need Muse's experimental SDK flag.** Set
+  `MUSE_EXPERIMENTAL_SDK_ENABLED=on` in the provider environment if native subagent tools
+  are missing. Linked child sessions appear only when Muse supplies `childSessionId`.
+
+See [custom providers](/docs/custom-providers) to override the binary or environment under
+`agents.providers.muse`.
diff --git a/public-docs/orchestration-workflows.md b/public-docs/orchestration-workflows.md
index c1b60328ab..e7e5f271c3 100644
--- a/public-docs/orchestration-workflows.md
+++ b/public-docs/orchestration-workflows.md
@@ -1,6 +1,6 @@
 ---
 title: Common orchestration workflows
-description: Copyable prompts for delegating, parallelizing, reviewing, and continuing agent work with Paseo.
+description: Prompts for delegating, parallelizing, reviewing, and continuing agent work with Paseo.
 nav: Common workflows
 order: 31
 category: Orchestration
@@ -8,87 +8,96 @@ category: Orchestration
 
 # Common orchestration workflows
 
-These examples are prompts for your main agent. Change the provider, model, task, and branch names to fit your work.
+[Enable Paseo tools](/docs/orchestration#get-started), then ask your main agent for one of these workflows. Adapt the tasks to your project. [Agent profiles](/docs/agent-profiles) let you save settings and describe which agent to use for each kind of work.
 
 ## Send work to a different model
 
-Keep a strong planner in the main chat and send implementation to a workhorse:
+Keep planning in your main chat and delegate implementation:
 
-```text
-Stay as the orchestrator. Use Paseo to find the available Codex 5.6 model, then
-create a worktree-isolated workspace and launch a subagent there. Ask it to
-implement the parser change and run the focused tests.
-```
+> Use Paseo to check my agent profiles and their notes. Choose one for implementation, create a workspace with worktree isolation, and launch a subagent there to implement the parser change. Have it run the focused tests and report back.
 
-Ask the orchestrator to inspect providers first when you are unsure of the exact model ID. Available models come from your own installed and authenticated CLIs.
+The worker makes the change in its own worktree. If no profile fits, the agent can discover your configured providers and models and tell you what it chose.
 
 ## Fan out research
 
-Read-only work can safely share one workspace:
+Split independent questions between workers:
 
-```text
-Create three Paseo subagents in this workspace. Have one trace the request path,
-one inspect the tests, and one look for related regressions. Do not edit files.
-Synthesize their findings when all three report back.
-```
+> Create three Paseo subagents in this workspace. Have one trace the request path, one inspect the tests, and one look for related regressions. Do not edit files. Synthesize their findings when all three report back.
 
-Each worker appears in the Subagents track, and the orchestrator can keep working while they run.
+The workers share your files and appear in the Subagents track. Your main agent collects their findings into one answer.
 
 ## Parallelize edits without collisions
 
-Give each independent implementation its own worktree-isolated workspace:
+Give each independent change its own worktree:
 
-```text
-Split these two issues between two Paseo subagents. Create a separate workspace
-with worktree isolation from main for each issue, use the best available
-implementation model, and have each agent run the focused checks for its change.
-Summarize both diffs when done.
-```
+> Split these two issues between two Paseo subagents. Create a separate workspace with worktree isolation from main for each issue. Check my profiles for suitable implementation settings, and have each agent run the focused checks for its change. Summarize both diffs when done.
 
-Use the current workspace for collaboration on the same files. Use worktrees when agents may edit independently.
+Each worker edits a separate checkout. You get two changes to inspect, with their check results.
 
 ## Implement, then review
 
-Use different models for making and judging the change:
+Choose different agents for making and judging a change:
 
-```text
-Create a worktree-isolated workspace and launch a worker there to implement this
-feature. When it finishes, create a second subagent in the same workspace to
-review the diff for correctness, missing tests, and unnecessary complexity.
-Bring the review back here.
-```
+> Check my Paseo profiles and their notes for implementation and review. Create a workspace with worktree isolation and launch an implementation worker there. When it finishes, launch an independent reviewer in that workspace to check correctness, missing tests, and unnecessary complexity. Bring the review back here.
 
-The second agent sees the worker's files without sharing its conversation context, which makes the review more independent.
+The reviewer sees the worker's files in a fresh conversation. Use profiles from different providers when you want another model's judgment.
+
+## Send a prompt to another agent
+
+Agents can prompt each other by **agent ID**, the identifier Paseo uses to address a specific agent. They can communicate across workspaces on the same host, including with agents they did not launch.
+
+1. Right-click the receiving agent's tab and select **Copy agent id**.
+2. Paste that ID into your conversation with the sending agent and ask:
+
+> Use Paseo to send this prompt to agent [paste agent ID here]: “Review the parser changes in your workspace and report any missing test cases.”
+
+The receiving agent gets the prompt in its existing conversation. To have it send a separate message back, give it the sender's agent ID too.
+
+Underneath, the agent calls `send_agent_prompt` with the recipient's `agentId` and a `prompt`. Agents can also discover IDs with `list_agents`; the CLI uses [`paseo send <id>`](/docs/cli#sending-messages). For another host, use the [remote CLI workflow](#work-on-another-machine).
 
 ## Check, redirect, or continue work
 
-The orchestrator can inspect a worker and send a follow-up without starting over:
+Send these prompts separately as needed:
 
-```text
-Summarize what the subagents are doing and flag anything blocked.
-```
+> Summarize what the subagents are doing and flag anything blocked.
 
-```text
-Tell the parser worker to add the malformed-input case and rerun its test file.
-```
+You get a progress summary in the main conversation.
 
-```text
-Cancel the UI worker's current turn, but keep the agent so I can redirect it.
-```
+> Tell the parser worker to add the malformed-input case and rerun its test file.
+
+The worker continues in its existing conversation.
+
+> Cancel the UI worker's current turn, but keep the agent so I can redirect it.
+
+The current task stops; the worker remains available for a follow-up.
+
+## Work on another machine
+
+The CLI can target another Paseo host. First [connect it to the remote daemon](/docs/cli#connecting-to-a-remote-daemon) and identify a workspace on that host. The repository and required provider must be available there.
+
+> Use the Paseo CLI with the remote host and workspace I supplied. Launch an agent there to investigate the failing build, inspect its output, and summarize the findings here. Do not change files.
+
+The worker runs on the remote machine. Use the CLI's global `--host` option for that destination; injected Paseo tools operate on the main agent's own host.
 
 ## Keep an agent working with a heartbeat
 
-Use a heartbeat when the current agent should wake itself up, reassess the task, and continue working:
+A heartbeat prompts the same agent periodically, preserving its conversation:
 
-```text
-Use Paseo to create a heartbeat every 10 minutes. Continue this migration in
-small steps, run the focused checks after each step, and stop when the migration
-is complete or after two hours.
-```
+> Use Paseo to create a heartbeat every 10 minutes. Continue this migration in small steps, run the focused checks after each step, and delete the heartbeat when the migration is complete. Set it to expire after two hours.
 
-```text
-Create a heartbeat every 5 minutes to check this deployment. Investigate any
-failure and report meaningful changes in this conversation. Stop after one hour.
-```
+The agent resumes the task on that cadence. For a fresh agent on each run, [create a schedule](/docs/schedules) instead.
 
-A heartbeat returns to the same conversation. For cron-style recurring work such as daily triage, use a [schedule](/docs/schedules). For reusable workflows such as handoffs, committees, advisors, and bounded loops, see [Orchestration skills](/docs/skills).
+## Where the work appears
+
+Open the **Subagents track** near the composer to inspect delegated work.
+
+|              | Paseo subagents                                | Native provider subagents                      |
+| ------------ | ---------------------------------------------- | ---------------------------------------------- |
+| Provider     | Any configured provider                        | Chosen within the parent provider's own system |
+| Workspace    | Current or explicitly selected workspace       | Managed by the provider                        |
+| Conversation | Full agent session you can talk to             | Read-only timeline                             |
+| Controls     | Follow up, change settings, archive, or detach | Lifecycle managed by the provider              |
+
+A Paseo subagent in another workspace still belongs to its parent's track. It also opens as a tab in its own workspace. To make it a top-level agent, detach it in the app or with [`paseo agent detach`](/docs/cli#agent-modes).
+
+See the [MCP reference](/docs/mcp#mental-model) for workspace and parentage rules.
diff --git a/public-docs/orchestration.md b/public-docs/orchestration.md
index aec9b51f9e..cd65e709ce 100644
--- a/public-docs/orchestration.md
+++ b/public-docs/orchestration.md
@@ -1,6 +1,6 @@
 ---
 title: Orchestration
-description: Give any coding agent control of Paseo so it can launch and coordinate agents from other providers.
+description: Coordinate agents across providers and machines, delegate work, and keep tasks moving with schedules and heartbeats.
 nav: Overview
 order: 30
 category: Orchestration
@@ -8,72 +8,65 @@ category: Orchestration
 
 # Orchestration
 
-Paseo orchestration gives a coding agent control of the Paseo daemon. The agent can discover every provider and model you have configured, create workspaces, launch other agents, send them follow-ups, and create heartbeats or schedules. The same work stays visible in the Paseo app.
+Paseo lets your coding agents coordinate other agents, split work across providers and machines, and keep tasks moving automatically.
 
-## Native subagents vs Paseo subagents
+You can also start and supervise each task yourself in the desktop app. [Run parallel tasks in separate worktrees](/docs/parallel-development), inspect their diffs, and test each app in a terminal and browser before choosing what to merge.
 
-The most important difference from native subagents is that **Paseo subagents can cross provider boundaries**.
+## What your agents can do
 
-```text
-Claude Code (Fable 5) => Codex (GPT-5.6)
-Codex (GPT-5.6) => Grok Build
-Cursor => Claude Code (Fable 5)
+- **Choose providers and models:** launch other agents using any provider and model configured on the host.
+- **Delegate and parallelize:** split research, implementation, and review between agents, including agents from different providers.
+- **Communicate with each other:** agents can [send prompts to other agents by ID](/docs/orchestration-workflows#send-a-prompt-to-another-agent) to ask questions, share findings, or request work.
+- **Coordinate ongoing work:** check progress, stop tasks, and collect results.
+- **Create workspaces and worktrees:** give independent changes their own [working directories](/docs/worktrees).
+- **Work across machines:** use the [CLI](/docs/cli#connecting-to-a-remote-daemon) to launch and manage agents on another reachable Paseo host.
+- **Choose by specialty:** use [agent profiles](/docs/agent-profiles) and their notes to select settings for UI work, planning, or reviews.
+- **Create schedules:** run a prompt in a new agent at [specified times](/docs/schedules).
+- **Create heartbeats:** prompt the same agent periodically to [continue its task](/docs/orchestration-workflows#keep-an-agent-working-with-a-heartbeat).
+
+## Get started
+
+Use built-in Paseo tools or the CLI. Both let an agent launch and coordinate workers.
+
+### Built-in Paseo tools (MCP)
+
+Enable Paseo tools so agents running inside Paseo can manage agents and workspaces on their host directly.
+
+1. Open **Settings → your host → Agents**.
+2. Turn on **Enable Paseo tools**. Tool injection is off by default.
+3. Start a new agent, or reload an existing agent so it receives the tools.
+4. Ask:
+
+> Use Paseo to launch a second agent to review this branch. Have it report potential bugs without changing files, then summarize its findings.
+
+The worker appears in the **Subagents track** near the composer. Open it to follow the conversation. Your main agent receives a notification when the worker finishes, and you can keep talking while it works.
+
+See the [MCP reference](/docs/mcp) for tool configuration and the full catalog. [Orchestration skills](/docs/skills) are optional reusable workflows.
+
+### CLI
+
+Agents with shell access can also use the Paseo CLI. This route does not require enabling tool injection. With Paseo installed, a running host, and Codex configured:
+
+```bash
+paseo run --provider codex --no-wait \
+  "Review this branch without changing files"
+paseo ls -a
 ```
 
-Native subagents belong to one provider. Claude Code launches Claude Code subagents; Codex launches Codex subagents. They are useful when the parent provider can handle the whole task itself.
+The first command starts a worker and returns immediately; the second lists archived and background agents as well. When a Paseo agent runs the command, the worker becomes its subagent in the same workspace. From your own terminal, it starts in a new local workspace.
 
-Paseo subagents are full agents managed by the Paseo daemon. The orchestrator can choose any configured provider and model, keep the worker in the current workspace, or place it in another workspace created for the task. Use them when you want one model to plan, another to implement, and another to review.
+See the [CLI reference](/docs/cli) for follow-ups, output, worktrees, and remote hosts.
 
-|                      | Native subagent                           | Paseo subagent                                     |
-| -------------------- | ----------------------------------------- | -------------------------------------------------- |
-| Provider             | Same provider as its parent               | Any provider configured in Paseo                   |
-| Working directory    | Managed by the parent provider            | Current or explicitly selected workspace           |
-| Lifecycle            | Owned by the parent provider              | Managed by Paseo; can receive follow-ups           |
-| Where you inspect it | Read-only timeline in the Subagents track | Full agent session in the Subagents track          |
-| Best for             | Fast, provider-native delegation          | Cross-provider work and explicit workspace control |
+## Pick settings once with profiles
 
-## Try it
+Save a provider, model, thinking level, mode, and available feature settings as an **agent profile**, then select it in one click when creating an agent.
 
-Open **Settings → your host → Agents**, then turn on **Enable Paseo tools**. Start a new agent, or reload an existing one so it receives the tools.
+Add **When to use** notes so an orchestrating agent can choose a profile for the task: UI work, planning, or independent review. [Create profiles and write delegation notes](/docs/agent-profiles).
 
-Then ask naturally:
+## Go further
 
-```text
-Stay as the orchestrator. Use Paseo to find my available Codex models, then
-create a worktree-isolated workspace, then launch a GPT-5.6 subagent there. Ask
-it to implement the parser change, run the focused tests, and report back here.
-```
-
-The orchestrator discovers the provider and model IDs, starts the worker, and receives a notification when it finishes. You can keep talking to the orchestrator in the meantime.
-
-Agent creation has one default: when an agent creates another agent without a workspace ID, the new agent is its subagent in the same workspace. Passing a workspace ID changes where the subagent works, not who its parent is.
-
-## Where the work appears
-
-Spawned work appears in the **Subagents track** above the composer. Open a row to read the live conversation.
-
-Both kinds of subagent appear there:
-
-- **Paseo subagents** open as full agent sessions. You can talk to them directly, change their settings, or archive them.
-- **Native provider subagents** open as read-only timelines. You can inspect their work, but their provider owns their lifecycle.
-
-A cross-workspace subagent still belongs to its parent's Subagents track. Paseo also opens its workspace so the work is not hidden in an otherwise empty workspace. If you want to turn any subagent into a top-level agent, detach it manually in the app or with `paseo agent detach`; detachment is not an agent-creation mode.
-
-If an agent says background work is running but the track is empty, update Paseo. Provider-created subagent timelines require Paseo 0.1.107 or newer.
-
-## Keep an agent working with a heartbeat
-
-A heartbeat sends a prompt back into the same agent on a cron cadence. Use one when the agent should keep reassessing a live task: continue a refactor, babysit CI, watch a deployment, or retry after an external system changes.
-
-Ask the agent directly:
-
-```text
-Use Paseo to create a heartbeat every 10 minutes. Keep checking this PR, fix any
-new CI failures, and stop when all checks pass or after two hours.
-```
-
-The base [`/paseo` orchestration skill](/docs/skills) teaches agents how to create heartbeats, so you only need to ask. A heartbeat continues the current conversation; a [schedule](/docs/schedules) is better for standalone cron-style jobs such as daily triage.
-
-You do not need to name MCP tools in your prompts. Ask for the workflow; the agent uses the tools underneath.
-
-Continue with [Common workflows](/docs/orchestration-workflows) for copyable prompts, [Orchestration skills](/docs/skills) for packaged workflows, or the [MCP reference](/docs/mcp) for the complete tool catalog.
+- [Delegate implementation and get an independent review](/docs/orchestration-workflows#implement-then-review).
+- [Run parallel changes in separate worktrees](/docs/orchestration-workflows#parallelize-edits-without-collisions).
+- [Coordinate work on another machine](/docs/orchestration-workflows#work-on-another-machine).
+- [Create recurring jobs](/docs/schedules) or [continue a task with a heartbeat](/docs/orchestration-workflows#keep-an-agent-working-with-a-heartbeat).
+- [Install reusable orchestration skills](/docs/skills).
diff --git a/public-docs/parallel-development.md b/public-docs/parallel-development.md
new file mode 100644
index 0000000000..4d9c450d25
--- /dev/null
+++ b/public-docs/parallel-development.md
@@ -0,0 +1,52 @@
+---
+title: Run parallel tasks
+description: Run coding agents in separate worktrees, review their diffs, and test each change with terminals and the built-in browser in Paseo.
+nav: Run parallel tasks
+order: 12
+category: Workspaces
+---
+
+# Run parallel tasks
+
+Use Paseo's desktop app to give several coding agents independent tasks, review their changes, and run the results. Each task gets a workspace with its own git worktree and branch, with agents, files, diffs, terminals, and browser tabs together.
+
+Start with the [desktop app](/docs#desktop-app-recommended), a local git repository, and at least one [coding agent installed and authenticated](/docs/supported-providers). The examples below use a repository with an `origin/main` branch.
+
+## Start two tasks
+
+1. Open **New workspace** and select your project.
+2. Set **Isolation** to **New worktree** and choose `origin/main` as the starting ref.
+3. Choose an agent and model, then submit a task, for example: “Add filtering to the project list. Run the relevant tests.”
+4. Create a second workspace with **New worktree** from the same starting ref. Give its agent another task: “Add keyboard navigation to the settings page. Run the relevant tests.”
+
+Both agents run concurrently. Select either workspace in the sidebar to read progress or send a follow-up. Choose the same provider for both tasks or a different provider for each.
+
+Separate worktrees keep their file edits on separate branches. For two alternative implementations of the same feature, give both agents the same task and compare their results before choosing one.
+
+## Review each change
+
+Select a workspace and open **Changes** from the Command Center to inspect its diff. Open **Files** to browse and edit the source. Use split panes to keep the agent conversation beside the code you're reviewing.
+
+Send corrections to that workspace's agent. To get another opinion, use **New agent** in the same workspace and ask it to review the changes without editing files. Agents in the same workspace share its working directory.
+
+## Run and test the app
+
+In the selected workspace, use **New terminal** from the Command Center. Install dependencies and run your project's test or development command there.
+
+Each worktree has its own files, but processes still share the machine's network ports. Assign a different dev-server port to each running copy. For repeatable setup and service ports, configure [worktree setup and scripts](/docs/worktrees#paseojson).
+
+For a web app, use **New browser** and enter that workspace's dev-server URL. Exercise the changed flow, then switch workspaces to test the other implementation. Browser tabs run inside the desktop app.
+
+You can also ask the agent to check the app in those tabs. Enable [browser automation](/docs/browser#enabling), then give it the URL and concrete steps to verify, for example:
+
+> Open http://localhost:3001, filter the project list by name, and verify that clearing the filter restores the full list. Report any failures and take a screenshot of the result.
+
+## Choose what to merge
+
+Review the diff and test results for each workspace. Ask for any remaining changes before committing and opening a pull request for that branch, using your usual Git workflow in the workspace terminal or through its agent.
+
+For independent tasks, review and merge each branch. For competing implementations, choose the version you want to keep. Archive a workspace when you no longer need it; [worktree cleanup](/docs/worktrees#manage-the-workspace) removes the managed directory after its last workspace is archived.
+
+## Let an agent coordinate the tasks
+
+When you want an agent to create the workspaces, launch workers, and collect their results, use [orchestration](/docs/orchestration). The workers appear in Paseo so you can inspect their conversations and changes as they work.
diff --git a/public-docs/plugins/index.md b/public-docs/plugins/index.md
index 552a0476e0..50d9be9826 100644
--- a/public-docs/plugins/index.md
+++ b/public-docs/plugins/index.md
@@ -1,21 +1,315 @@
 ---
-title: Paseo plugin documentation
-description: Choose the plugin API documentation for your Paseo release.
-nav: Versions
+title: Plugin quickstart
+description: Build, install, share, and update a trusted Paseo plugin.
+nav: Quickstart
 order: 44
 category: Plugins
 ---
 
-# Paseo plugin documentation
+# Plugin quickstart
 
-Choose the documentation that matches your Paseo release. The plugin API is experimental and can
-change between releases.
+A plugin is a TypeScript project installed into one Paseo daemon. It can add
+[screens and sidebar items](/docs/plugins/reference#screens-and-sidebar-items),
+[workspace panels](/docs/plugins/reference#workspace-panels),
+[Command Center items](/docs/plugins/reference#command-center-items),
+[slash commands](/docs/plugins/reference#slash-commands),
+[composer pills](/docs/plugins/reference#composer-pills),
+[timeline items](/docs/plugins/reference#timeline-items),
+[themes](/docs/plugins/reference#contribute-a-theme),
+[attachment sources](/docs/plugins/reference#add-a-composer-attachment-source), and
+[daemon-side RPCs](/docs/plugins/reference#add-plugin-specific-backend-behavior). It can also
+[connect a coding agent as a provider](/docs/plugins/providers). Client
+contributions run on every Paseo client connected to that daemon, including mobile.
 
-## [Paseo v0.7 — Current](/docs/plugins/v0.7)
+Browse [published plugins](https://paseo.sh/plugins), then install one on your daemon:
 
-Build and maintain plugins for the latest stable Paseo release.
+```bash
+paseo plugin add owner/slug
+```
 
-## [Paseo v0.8 — Preview](/docs/plugins/v0.8)
+Or paste `owner/slug` into **Settings → Plugins → Plugin source** and select **Install plugin**.
+Paseo installs the registry's reviewed artifact. Use `git:owner/repository` or a full Git URL
+when you want to install directly from a Git repository.
 
-Prepare plugins for the upcoming client and server entry layout. Existing plugin authors should
-follow the [v0.8 migration guide](/docs/plugins/v0.8/migration).
+This guide scaffolds a plugin, runs it, and adds a workspace panel to it.
+
+## Create a plugin
+
+Use an absolute path on the daemon machine:
+
+```bash
+paseo plugin init /absolute/path/to/workspace-plugin
+cd /absolute/path/to/workspace-plugin
+npm install
+```
+
+`init` writes a strict TypeScript project and does not run the package manager. `npm install` adds
+development dependencies for typechecking and tests only; Paseo supplies the plugin SDK, React,
+React Native, TanStack Query, and Zod at runtime.
+
+The scaffold is a working plugin: a screen, opened from the sidebar, with a button that asks the daemon for a
+greeting through an RPC.
+
+```text
+workspace-plugin/
+  paseo-plugin.json      # plugin ID and supported Paseo versions
+  index.client.tsx       # runs in the Paseo app
+  index.server.ts        # runs in a daemon subprocess
+  client/greeting.tsx    # the screen component
+  client/web.ts          # the only file allowed to touch browser APIs
+  server/greeting.ts     # the RPC handler
+  shared/greeting.ts     # the RPC contract, imported by both
+  package.json
+  tsconfig.json
+```
+
+Each entry default-exports one function that registers contributions and returns a cleanup
+function. `index.client.tsx` registers the screen and the sidebar item that opens it:
+
+```tsx
+import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { GreetingScreen } from "./client/greeting";
+
+function GreetingItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  return (
+    <SidebarRow
+      icon="MessageCircle"
+      active={currentScreen?.screenId === "greeting"}
+      onPress={() => openScreen({ screenId: "greeting" })}
+    />
+  );
+}
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({ id: "greeting", title: "Greeting", Component: GreetingScreen });
+  client.addSidebarHeaderItem({ id: "greeting", title: "Greeting", Component: GreetingItem });
+  return () => {};
+}
+```
+
+`index.server.ts` registers the handler for the contract in `shared/greeting.ts`:
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createGreeting } from "./server/greeting";
+import { greetingRpc } from "./shared/greeting";
+
+export default function contribute(server: PluginServerContext) {
+  server.handle(greetingRpc, createGreeting);
+  return () => {};
+}
+```
+
+The directory is the boundary. Code under `client/` compiles only into the app bundle, code under
+`server/` only into the daemon bundle, and `shared/` into both. Importing across that line, adding
+a code file at the root, or importing a `node:` module from client code is a compile error. A
+plugin with no daemon-side work can omit `index.server.ts`; a plugin with no UI can omit
+`index.client.tsx`.
+
+Client code runs on phones as well as in browsers. The project typechecks without the DOM library,
+so `document` and `window` are errors outside `client/web.ts`, which shows how to gate a browser
+API behind `Platform.OS` with a native fallback. See
+[Cross-platform rules](/docs/plugins/reference#cross-platform-rules) before writing UI.
+
+## Install and try it
+
+Plugins are trusted, unsandboxed code: server code and preparation commands run with the daemon
+user's access on the daemon machine, and client code runs inside the Paseo app. Installing a plugin
+means you trust that codebase, its dependencies, and its future updates.
+
+Turn on **Enable plugins** under **Settings → Plugins** on the daemon you are installing into. It is
+the global switch for every plugin on that daemon. It is also the root `pluginsEnabled` field in the
+daemon's `config.json`; after editing the file, apply it with `paseo reload --json`. An automated
+tool must read the current value and get your explicit permission before turning it on.
+
+Then typecheck and install:
+
+```bash
+npm run typecheck
+paseo plugin install /absolute/path/to/workspace-plugin
+paseo plugin ls
+```
+
+Or install the directory from the app:
+
+1. Open **Settings → Plugins** on the target host.
+2. Paste `/absolute/path/to/workspace-plugin` into **Plugin source**.
+3. Select **Install plugin**. The app uses the plugin ID from `paseo-plugin.json`.
+
+The source field also accepts Git repositories, npm packages, and plugin subdirectories. See
+[Plugin sources](/docs/plugins/reference#plugin-sources) for the accepted syntax and resolution
+rules. If the form asks you to update the host, update that host before installing; the existing
+management actions remain available.
+
+Each installed plugin row shows its status and description. Use its switch to enable or disable it,
+and open its three-dot menu for settings, logs, reload, and removal.
+
+`paseo plugin ls` should report the plugin as `running`. Open Paseo, choose **Greeting** in the
+sidebar, and press **Create greeting**. The message comes back from the daemon subprocess through
+the RPC.
+
+If the sidebar item is missing, check that **Enable plugins** is on, the plugin is `running`, and
+the client is viewing the host you installed into. `paseo plugin logs workspace-plugin` shows the
+daemon-side output, including load errors.
+
+## Add a workspace panel
+
+A workspace panel opens as a tab next to agents, terminals, and files. Create `client/overview.tsx`:
+
+```tsx
+import { type PluginWorkspacePanelProps, useWorkspace } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+
+export function WorkspaceOverview({ theme, layout, workspaceId }: PluginWorkspacePanelProps) {
+  const workspace = useWorkspace(workspaceId, ({ name, directory }) => ({
+    name,
+    directory,
+  }));
+  const styles = useMemo(
+    () => ({
+      screen: {
+        flex: 1,
+        padding: layout.compact ? 16 : 24,
+        gap: layout.compact ? 8 : 12,
+        backgroundColor: theme.colors.surface0,
+      },
+      title: { color: theme.colors.foreground, fontSize: layout.compact ? 20 : 24 },
+      label: { color: theme.colors.foregroundMuted },
+      detail: { color: theme.colors.foreground },
+    }),
+    [theme, layout.compact],
+  );
+
+  return (
+    <View style={styles.screen}>
+      <Text style={styles.title}>{workspace?.name}</Text>
+      <Text style={styles.label}>Directory</Text>
+      <Text style={styles.detail}>{workspace?.directory}</Text>
+    </View>
+  );
+}
+```
+
+`useWorkspace` reads the fields the panel renders from the app's cached state, without an RPC and
+without re-rendering when unrelated fields change. Every `Text` takes its color from
+`theme.colors`, and `layout.compact` drives spacing, so the panel works in every Paseo theme and on
+phones. See [Theme and layout](/docs/plugins/reference#theme-and-layout) for the token list.
+
+Register the panel and a Command Center item that opens it by adding to `index.client.tsx`:
+
+```tsx
+import { WorkspaceOverview } from "./client/overview";
+
+// Inside contribute(client), after the existing registrations:
+client.addWorkspacePanel({
+  id: "overview",
+  title: "Workspace overview",
+  icon: "PanelsTopLeft",
+  context: "workspace",
+  locations: ["workspace", "explorer"],
+  Component: WorkspaceOverview,
+});
+client.addCommandCenterItem({
+  id: "open-overview",
+  title: "Open workspace overview",
+  icon: "PanelsTopLeft",
+  context: "workspace",
+  onSelect({ openPanel }) {
+    openPanel("overview");
+  },
+});
+```
+
+`icon` is a [Lucide](https://lucide.dev/icons/) icon name.
+
+## Edit and reload
+
+Source changes take effect only when you reload the plugin:
+
+```bash
+npm run typecheck
+paseo plugin reload workspace-plugin
+```
+
+A reload stops the old plugin, runs its cleanup, compiles the current source, and starts it again.
+A failed reload stays failed and reports its error in `paseo plugin ls`; fix the source and reload
+again.
+
+Open a workspace, press **⌘K** on macOS or **Ctrl+K** on Windows and Linux, and choose **Open
+workspace overview**. The panel opens as a workspace tab.
+
+## Install a published plugin
+
+Install a trusted npm plugin using npm on the daemon host:
+
+```bash
+paseo plugin install npm:@acme/paseo-review@1.2.0
+```
+
+Or paste the same identifier into **Settings → Plugins → Plugin source** and select **Install
+plugin**. The installed row uses the manifest ID and provides the same enable switch, Logs, Reload,
+and Remove actions as a directory plugin. npm is needed for acquisition; subsequent loading and
+reload use the installed files.
+
+See [plugin sources](/docs/plugins/reference#plugin-sources) for identifier syntax. To share your own plugin, follow
+[Publish a plugin](/docs/plugins/publishing).
+
+Plugins published in a Git repository install by explicit Git shorthand or URL:
+
+```bash
+paseo plugin add git:owner/repository
+paseo plugin add https://gitlab.com/group/repository.git
+paseo plugin add git:owner/monorepo:plugins/workspace
+paseo plugin add git:owner/repository --ref main
+```
+
+Append `:relative/path` when the plugin lives below the repository root. `--ref` selects the initial
+Git content once; omitting it installs the default HEAD. See the [source reference](/docs/plugins/reference#plugin-sources) for exact syntax.
+
+```bash
+paseo plugin ls
+paseo plugin update workspace-plugin
+paseo plugin update --all
+```
+
+`ls` reports source identity and the current installed revision without contacting the remote.
+`update` shows a proposed npm or Git revision and asks for approval. npm offers a newer latest
+release; Git offers the current default HEAD, regardless of the initial install selector.
+Use `--check` to preview only or `--yes` to approve without a prompt.
+See the [CLI reference](/docs/plugins/reference#cli-reference) for explicit targets and bulk updates.
+
+## Read backend logs
+
+Daemon-side handlers and cleanup can use normal Node logging:
+
+```ts
+console.log("Refreshing issues");
+console.error("Issue refresh failed", error);
+```
+
+Read the recent output by opening the plugin's three-dot menu under **Settings → Plugins** and
+selecting **Logs**, or use the CLI:
+
+```bash
+paseo plugin logs workspace-plugin
+paseo plugin logs workspace-plugin --json
+```
+
+The tail includes `[paseo]` loading, ready, stopping, and stopped entries, plus compilation and load
+failures, and it survives reloads and crashes. Client-side output stays in the app. See
+[Debug backend output](/docs/plugins/reference#debug-backend-output) for retention and what not to
+log.
+
+## Next
+
+- [Publish a plugin](/docs/plugins/publishing): share through npm, a private registry, or Git.
+- [Build a provider plugin](/docs/plugins/providers): connect an agent directly or through ACP,
+  render provider-owned timeline items, test it, and publish it.
+- [Plugin reference](/docs/plugins/reference): every contribution type, its fields, the runtime
+  modules, hosts, and the CLI.
+- [Migrate a plugin to runtime entries](/docs/plugins/migration): move a plugin written against the
+  single `index.ts` entry, step by step.
+- [TypeScript SDK](/docs/sdk): the workspace, agent, provider, and config API available as `paseo`
+  in client and server code.
diff --git a/public-docs/plugins/v0.8/migration.md b/public-docs/plugins/migration.md
similarity index 58%
rename from public-docs/plugins/v0.8/migration.md
rename to public-docs/plugins/migration.md
index 9cb7ea98c7..7b24b37099 100644
--- a/public-docs/plugins/v0.8/migration.md
+++ b/public-docs/plugins/migration.md
@@ -2,13 +2,13 @@
 title: Migrate a plugin to runtime entries
 description: Mechanical migration from a mixed plugin entry to explicit client and server entries.
 nav: Migration
-order: 48
+order: 47
 category: Plugins
 ---
 
 # Migrate a plugin to runtime entries
 
-> **For the upcoming Paseo v0.8 release.** This migration is not required for Paseo v0.7.
+Use this guide to update plugins written for Paseo 0.7 or earlier to the current client/server entry format, introduced in 0.8.
 
 Give this page to a coding agent with the plugin directory as its working directory. Execute the
 steps in order. Do not keep a compatibility entry.
@@ -67,31 +67,89 @@ is a compile error.
 
 Use this table as the complete registration checklist.
 
-| Old registration and location                                                                 | New registration and location                                                              |
-| --------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
-| `plugin.handle(contract, handler)` in the old root entry                                      | `server.handle(contract, handler)` in `index.server.ts`                                    |
-| `plugin.addSurface(id, Component)` in the old root entry                                      | `client.addSurface(id, Component)` in `index.client.tsx`                                   |
-| `plugin.addSidebarItem(item)` in the old root entry                                           | `client.addSidebarItem(item)` in `index.client.tsx`                                        |
-| `plugin.addWorkspacePanel(panel)` in the old root entry                                       | `client.addWorkspacePanel(panel)` in `index.client.tsx`                                    |
-| `plugin.addCommandCenterItem(item)` in the old root entry                                     | `client.addCommandCenterItem(item)` in `index.client.tsx`                                  |
-| `plugin.addClientSlashCommand(command)` in the old root entry                                 | `client.addSlashCommand(command)` in `index.client.tsx`                                    |
-| `plugin.addClientSide(fn)` in the old root entry                                              | Delete the wrapper and move the body of `fn` into the default client entry function        |
-| `client.addComposerPill(pill)` inside the old client callback                                 | `client.addComposerPill(pill)` inside `index.client.tsx` or an imported `client/` function |
-| `plugin.addAttachmentSource(source)` in the old root entry                                    | `client.addAttachmentSource(source)` in `index.client.tsx`                                 |
-| `plugin.addTheme(theme)` in the old root entry                                                | `client.addTheme(theme)` in `index.client.tsx`                                             |
-| `plugin.addTimelineTransformer(transformer)` in the old root entry                            | `client.addTimelineTransformer(transformer)` in `index.client.tsx`                         |
-| `plugin.addTimelineRenderer(renderer)` in the old root entry                                  | `client.addTimelineRenderer(renderer)` in `index.client.tsx`                               |
-| `import { defineRpc, defineAttachmentSource } from "@getpaseo/plugin/server"` in shared files | `import { defineRpc, defineAttachmentSource } from "@getpaseo/plugin"`                     |
-| `ZodOutput<typeof contract.input>` handler parameter types                                    | `RpcInput<typeof contract>` from `@getpaseo/plugin`; `RpcOutput` for return types          |
+| Old registration and location                                                                 | New registration and location                                                                                               |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
+| `plugin.handle(contract, handler)` in the old root entry                                      | `server.handle(contract, handler)` in `index.server.ts`                                                                     |
+| `plugin.addSurface(id, Component)` in the old root entry                                      | `client.addScreen({ id, title, Component })` in `index.client.tsx`                                                          |
+| `plugin.addSidebarItem({ id, title, icon, surface })` in the old root entry                   | `client.addSidebarHeaderItem({ id, title, Component })` in `index.client.tsx`; see [sidebar items](reference#sidebar-items) |
+| New sidebar footer contribution                                                               | `client.addSidebarFooterItem({ id, title, Component })` in `index.client.tsx`                                               |
+| `plugin.addWorkspacePanel(panel)` in the old root entry                                       | `client.addWorkspacePanel(panel)` in `index.client.tsx`                                                                     |
+| `plugin.addCommandCenterItem(item)` in the old root entry                                     | `client.addCommandCenterItem(item)` in `index.client.tsx`                                                                   |
+| `plugin.addClientSlashCommand(command)` in the old root entry                                 | `client.addSlashCommand(command)` in `index.client.tsx`                                                                     |
+| `plugin.addClientSide(fn)` in the old root entry                                              | Delete the wrapper and move the body of `fn` into the default client entry function                                         |
+| `client.addComposerPill(pill)` inside the old client callback                                 | `client.addComposerPill(pill)` inside `index.client.tsx` or an imported `client/` function                                  |
+| New header contribution                                                                       | `client.addHeaderButton({ id, workspaceId, button })`                                                                       |
+| `plugin.addAttachmentSource(source)` in the old root entry                                    | `client.addAttachmentSource(source)` in `index.client.tsx`                                                                  |
+| New settings screen contribution                                                              | `client.addSettingsScreen(screen)` in `index.client.tsx`; see [settings screens](reference#settings-screens)                |
+| `plugin.addTheme(theme)` in the old root entry                                                | `client.addTheme(theme)` in `index.client.tsx`                                                                              |
+| `plugin.addTimelineTransformer(transformer)` in the old root entry                            | `client.addTimelineTransformer(transformer)` in `index.client.tsx`                                                          |
+| `plugin.addTimelineRenderer(renderer)` in the old root entry                                  | `client.addTimelineRenderer(renderer)` in `index.client.tsx`                                                                |
+| `import { defineRpc, defineAttachmentSource } from "@getpaseo/plugin/server"` in shared files | `import { defineRpc, defineAttachmentSource } from "@getpaseo/plugin"`                                                      |
+| `ZodOutput<typeof contract.input>` handler parameter types                                    | `RpcInput<typeof contract>` from `@getpaseo/plugin`; `RpcOutput` for return types                                           |
 
-Import `PluginClientContext` in the client entry and `PluginServerContext` in the server entry.
-Remove imports of the old context type. `@getpaseo/plugin/server` now exports only handler-side
-types such as `PluginHandlerContext`. Every client `add*` now returns an idempotent removal
-function. Preserve any remover the plugin calls before teardown; Paseo removes outstanding
+Register the screen that replaces an `addSidebarItem` under that item's `id` to keep saved links
+working. A `/plugin/<plugin>/sidebar/<id>` link, and the older `/plugin/<plugin>/<id>`, opens the
+`addSidebarItem` with that `id`, or else the screen with that `id`.
+
+Import `PluginClientContext` from `@getpaseo/plugin/client` and `PluginServerContext` from
+`@getpaseo/plugin/server`. Remove imports of the old context type. Client registrations return idempotent removal functions, except header buttons and composer pills, which return `{ update, remove }` handles. Preserve any remover the plugin calls before teardown; Paseo removes outstanding
 registrations after the entry cleanup runs.
 
+### Composer pills
+
+Update the plugin project's `@getpaseo/plugin` dependency, then run `npm run typecheck`.
+The old contribution is missing the required `button` field, `PluginComposerPillProps` is no longer
+exported, and calling the new registration as a function is a TypeScript error. A project pinned
+to the old SDK still checks against the old contract; installing or reloading a plugin does not
+run TypeScript's type checker.
+
+Replace the pill's `Component` with `button.icon` and `button.label`, move `title` into `button`,
+and move `onPress` into `button.behavior`. Cleanup changes from calling the returned function to
+calling its `.remove()` method.
+
+```tsx
+const pill = client.addComposerPill({
+  id: "review",
+  workspaceId,
+  agentId,
+  button: {
+    title: "Open review",
+    icon: "Scan",
+    label: "Review",
+    behavior: { kind: "action", onPress: openReview },
+  },
+});
+
+pill.update({ label: "Review · 3", visible: true });
+// Client entry cleanup:
+pill.remove();
+```
+
+Move dynamic text from the former component into updates from your model or SDK subscription.
+Custom icon components may still use hooks. Composer pills always show icon and label and never
+show chevrons. See [buttons](./reference.md#button-descriptor) for menus, popovers, and visibility.
+
 ## 4. Separate imports
 
+Move hooks (`usePaseo`, `useRpc`, `useSettings`, `useAgent`, `useWorkspace`) and client contribution
+types from `@getpaseo/plugin` to `@getpaseo/plugin/client`. Move `Icon` to
+`@getpaseo/plugin/client/react-native`. Import server contexts and lifecycle contracts from
+`@getpaseo/plugin/server`. Shared helpers (`defineRpc`, `defineSettings`, `defineAttachmentSource`),
+schemas, and plain data types stay on the root. These rules include type imports. See
+[Runtime modules](reference#runtime-modules) for the complete contract.
+
+Move the remaining SDK subpaths under their runtime owner:
+
+| Old entry                       | 0.8 entry                              |
+| ------------------------------- | -------------------------------------- |
+| `@getpaseo/plugin/react-native` | `@getpaseo/plugin/client/react-native` |
+| `@getpaseo/plugin/ui`           | `@getpaseo/plugin/client/ui`           |
+| `@getpaseo/plugin/provider`     | `@getpaseo/plugin/server/provider`     |
+| `@getpaseo/plugin/acp`          | `@getpaseo/plugin/server/acp`          |
+
+The old entries and the pre-0.8 `@paseo/plugin` scope are removed. `/client/host` is private to
+Paseo's app integration and is never a plugin-author import.
+
 The client entry imports only `client/`, `shared/`, and client-safe packages. The server entry imports
 only `server/`, `shared/`, and server-safe packages. A `node:` import in the client entry or anything
 reachable from it is a compile error. Never import a component into the server entry merely to wire
@@ -101,7 +159,8 @@ its registration; that registration belongs in the client entry.
 
 | Compiler or load error                                                                                                     | Meaning and fix                                                                                                           |
 | -------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `Plugin entry split is required`                                                                                           | The directory still has only the old root entry. Create a runtime entry, move registrations, then delete the old file.    |
+| `This plugin has no requirements.paseo`                                                                                    | Complete the migration and declare the range in step 7.                                                                   |
+| `This plugin was made for an older version of Paseo`                                                                       | The directory still has only the old root entry. Create a runtime entry, move registrations, then delete the old file.    |
 | `Plugin entry points are missing: expected index.client.ts or index.client.tsx and/or index.server.ts or index.server.tsx` | No supported entry exists. Add at least one exact filename.                                                               |
 | `server-only module cannot be imported into the plugin client bundle: <file>`                                              | A client import reaches `server/`. Move the call behind an RPC and import its contract from `shared/`.                    |
 | `client-only module cannot be imported into the plugin server bundle: <file>`                                              | A server import reaches `client/`. Move that registration and import to the client entry.                                 |
@@ -167,7 +226,7 @@ local-plugin/
 
 ```tsx
 // index.client.tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { contributeClient, ExamplePanel } from "./client/main";
 
 export default function contribute(client: PluginClientContext) {
@@ -194,7 +253,7 @@ export default function contribute(client: PluginClientContext) {
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { increment } from "./server/increment";
 import { incrementRpc } from "./shared/increment";
 
@@ -220,7 +279,25 @@ Import path changes inside the moved files:
 calls it directly and returns its cleanup. A plugin whose `addClientSide` callback also registered
 pills or subscriptions keeps that code; only the wrapper goes away.
 
-## 7. Verify the migration
+## 7. Declare the Paseo requirement
+
+After migrating the entries and imports, add the minimum runtime version to `paseo-plugin.json`:
+
+```json
+{
+  "id": "my-plugin",
+  "requirements": { "paseo": ">=0.8.0" }
+}
+```
+
+Keep your existing ID and build commands. Missing `requirements.paseo` means `<0.8.0`, so Paseo 0.8 and later
+reject the plugin even if its files have been moved. Adding the field alone does not migrate the
+code. Update the local `@getpaseo/plugin` development dependency to the version you target and
+reinstall dependencies before typechecking.
+
+See [requirements](reference#requirements) for range and prerelease semantics.
+
+## 8. Verify the migration
 
 Run:
 
diff --git a/public-docs/plugins/providers.md b/public-docs/plugins/providers.md
new file mode 100644
index 0000000000..2f4951669c
--- /dev/null
+++ b/public-docs/plugins/providers.md
@@ -0,0 +1,429 @@
+---
+title: Build a provider plugin
+description: Add a coding agent to Paseo directly or adapt an ACP agent.
+nav: Provider plugins
+order: 46
+category: Plugins
+---
+
+# Build a provider plugin
+
+Start with the [plugin quickstart](/docs/plugins) if you have not built a Paseo plugin before.
+
+A provider plugin connects a coding agent to Paseo without adding it to Paseo core. [Publish the plugin](/docs/plugins/publishing) on npm or in a Git repository so users can
+install it with `paseo plugin install`.
+
+Choose one implementation path:
+
+| Agent                                                             | Path                                                                         |
+| ----------------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| It already implements ACP                                         | Register it with `runAcpProvider()` and add only narrow vendor transformers. |
+| It has a TypeScript SDK, JSON-RPC API, or custom process protocol | Implement `ProviderRegistration` directly.                                   |
+
+The examples are:
+
+- [`provider-direct`](https://github.com/getpaseo/paseo/tree/main/plugin-examples/provider-direct): sessions, settings, prompts, persistence, child sessions, and a provider-owned timeline renderer;
+- [`provider-acp-transformer`](https://github.com/getpaseo/paseo/tree/main/plugin-examples/provider-acp-transformer): an ACP command template with a Zod-validated vendor edit transformer. Replace `example-acp --stdio` with an installed ACP agent before loading it;
+- [`inline-thinking`](https://github.com/getpaseo/paseo/tree/main/plugin-examples/inline-thinking): a renderer-only plugin that does not implement a provider.
+
+## Register a direct provider
+
+Add a server entry:
+
+```ts
+// index.server.ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createProvider } from "./server/provider";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(createProvider());
+  return () => {};
+}
+```
+
+`createProvider()` returns one `ProviderRegistration`:
+
+```ts
+import {
+  negotiateProviderCapabilities,
+  type ProviderRegistration,
+} from "@getpaseo/plugin/server/provider";
+
+const supported = ["prompt.message"] as const;
+
+export function createProvider(): ProviderRegistration {
+  return {
+    id: "my-agent",
+    label: "My agent",
+    icon: "icon.svg",
+    async connect(request) {
+      const capabilities = negotiateProviderCapabilities(request.capabilities, supported);
+      return createConnection(capabilities);
+    },
+  };
+}
+```
+
+The connection has three operations:
+
+- `send(input)` accepts work and returns. Results are events, not return values.
+- `onEvent(listener)` publishes session state and complete timeline snapshots.
+- `close()` stops every session and releases processes, subscriptions, and pending work.
+
+Keep the native SDK, process, and stream inside the connection implementation. Convert its output
+to `ProviderEvent` objects before publishing it.
+
+## Launch the provider CLI
+
+Use `spawnProcess` and `execCommand` from `@getpaseo/plugin/server` for process transports
+and CLI probes. Both handle Windows `.cmd`/`.bat` launchers and quote shell arguments.
+Raw Node `spawn` and `execFile` reject those launchers on Windows.
+
+The daemon supplies `request.launch` with the resolved command, argument prefix, and complete
+environment. Pass that environment explicitly; the helpers do not apply daemon environment policy.
+Keep the process lifecycle and protocol deadlines inside your provider. End stdin for graceful
+shutdown; use `terminateProcess(child)` for a forced stop. It kills the process tree on Windows,
+including the CLI behind a command-script launcher. Bound your final wait for closed streams.
+
+```ts
+import { spawnProcess, execCommand } from "@getpaseo/plugin/server";
+
+const child = spawnProcess(launch.command, [...launch.args, "serve"], {
+  env: launch.env,
+  cwd,
+  stdio: "pipe",
+});
+const { stdout } = await execCommand(launch.command, [...launch.args, "--version"], {
+  env: launch.env,
+  timeout: 5000,
+});
+```
+
+## Return models, modes, and thinking options
+
+Paseo requests the catalog before creating a session. Return the choices needed by the agent form:
+
+```ts
+if (input.type === "catalog") {
+  emit({
+    type: "catalog",
+    requestId: input.requestId,
+    catalog: {
+      models: [
+        { id: "agent-large", label: "Agent Large" },
+        { id: "agent-small", label: "Agent Small" },
+      ],
+      modes: [
+        { id: "build", label: "Build" },
+        { id: "plan", label: "Plan" },
+      ],
+      thinkingOptions: [
+        { id: "standard", label: "Standard" },
+        { id: "extended", label: "Extended" },
+      ],
+      defaultModel: "agent-large",
+      defaultMode: "build",
+      defaultThinkingOption: "standard",
+    },
+  });
+}
+```
+
+Return an empty array for a category the agent does not expose. The selected `model`, `mode`, and
+`thinkingOption` arrive in the session configuration.
+
+The catalog describes choices available before a session exists. Session-specific controls come
+later through `session.config`.
+
+## Open a session
+
+`session.open` contains the complete launch configuration: working directory, environment, system
+prompt, MCP servers, tool policy, model, mode, settings, opaque provider options, and persistence
+preference.
+
+For persisted host-scoped plugin settings, use the handle returned by `server.registerSettings()`.
+Read it in catalog and session callbacks, and subscribe when the provider keeps in-memory
+configuration. See [settings](./reference.md#persisted-values) for the `read()` and `subscribe()`
+contract.
+
+Create the native session with the selected catalog values, then publish its effective state:
+
+```ts
+const nativeSession = await sdk.createSession({
+  cwd: input.config.cwd,
+  model: input.config.model,
+  mode: input.config.mode,
+  thinking: input.config.thinkingOption,
+  systemPrompt: input.config.systemPrompt,
+  env: input.config.env,
+  mcpServers: input.config.mcpServers,
+});
+
+emit({
+  type: "session.opened",
+  requestId: input.requestId,
+  sessionId: input.sessionId,
+  capabilities: ["prompt.message"],
+  restoration: "core",
+  cwd: input.config.cwd,
+});
+emit({
+  type: "session.config",
+  sessionId: input.sessionId,
+  config: {
+    model: nativeSession.model,
+    mode: nativeSession.mode,
+    thinkingOption: nativeSession.thinking,
+    models,
+    modes,
+    thinkingOptions,
+    settings: [],
+  },
+});
+emit({ type: "session.ready", requestId: input.requestId, sessionId: input.sessionId });
+```
+
+`session.config` contains the committed values. Publish what the native agent selected after
+normalization, not a copy of the request.
+
+## Complete the first prompt
+
+Start with message prompts. Advertise `prompt.message`, pass the content to the native agent, and
+publish the resulting lifecycle:
+
+```ts
+const turnId = crypto.randomUUID();
+
+emit({
+  type: "timeline.item",
+  sessionId,
+  item: {
+    type: "user_message",
+    id: `user:${turnId}`,
+    text,
+    clientMessageId: prompt.clientMessageId,
+  },
+});
+emit({
+  type: "session.prompt_result",
+  sessionId,
+  clientMessageId: prompt.clientMessageId,
+  result: { type: "turn", turnId },
+});
+emit({ type: "session.turn", sessionId, turnId, state: "started" });
+
+// Publish complete snapshots as native output changes.
+emit({
+  type: "timeline.item",
+  sessionId,
+  item: { type: "assistant_message", id: `assistant:${turnId}`, text: completeText },
+});
+
+emit({ type: "session.turn", sessionId, turnId, state: "completed" });
+```
+
+Publish exactly one `session.prompt_result` for each `clientMessageId`. Copy `clientMessageId` onto
+the user timeline item so Paseo replaces its optimistic message. Every started turn needs one
+terminal `completed`, `failed`, or `canceled` event.
+
+At this point the provider is usable: users can select a model, open a session, send a message, and
+see the response.
+
+## Add session-specific composer controls
+
+Add `session.configure` only when the native agent has settings users should change after opening a
+session. Publish them in `session.config` as toggle or select controls:
+
+```ts
+emit({
+  type: "session.config",
+  sessionId,
+  config: {
+    model: "agent-large",
+    models: [{ id: "agent-large", label: "Agent Large" }],
+    modes: [],
+    thinkingOptions: [],
+    settings: [
+      {
+        type: "toggle",
+        id: "fast",
+        label: "Fast mode",
+        value: nativeSession.fast,
+      },
+      {
+        type: "select",
+        id: "approval",
+        label: "Approvals",
+        value: nativeSession.approval,
+        options: [
+          { label: "Ask", value: "ask" },
+          { label: "Auto accept", value: "auto" },
+        ],
+      },
+    ],
+  },
+});
+```
+
+Paseo renders these controls in the composer. A user change arrives as `session.configure`; apply it
+and publish the committed `session.config` before `request.completed`. The provider may change the
+available controls at runtime, including after a model change.
+
+`settings` are user-facing controls. `providerOptions` is opaque JSON supplied at session creation
+for provider-specific configuration that Paseo does not render. A provider-specific token budget
+belongs in one of those two places; it is not a dedicated prompt field.
+
+## Add persistence and replay
+
+Advertise `session.persistence` when a native session can be reopened. Open a new native session
+when `session.open.persistence` is absent. Resume the identified native session when it is present.
+Return an opaque persistence value in `session.opened` or `session.persistence`; Paseo stores it
+without inspecting it.
+
+When `history` is `"replay"`, publish the native session's existing `timeline.item` snapshots before
+`session.ready`. Use `history: "skip"` to open without replaying old rows.
+
+Paseo refreshes an agent by closing its current provider session and opening it again with current
+configuration and persistence. Re-read credentials, environment, global configuration, and MCP
+servers during `session.open`. There is no separate reload operation.
+
+Use `restoration: "core"` when Paseo can reopen a session from persistence. A provider-owned child
+uses `restoration: "parent"`; emit it as another `session.opened` event with `parentSessionId` and
+recreate it while restoring the parent.
+
+## Add commands and steering
+
+All user input arrives through `session.prompt`:
+
+- `input.type: "message"` carries text, images, and attachments;
+- `input.type: "command"` carries a selected command and its arguments;
+- `delivery: "steer"` asks you to add input to the active turn;
+- `delivery: "auto"` lets you start a turn or complete a command without one.
+
+Publish `session.commands` to add structured commands to the composer. A command can start a normal
+turn or finish as a side effect with a `completed` prompt result.
+
+Advertise only capabilities you implement. If steering is unsupported, omit `prompt.steer`; Paseo
+can replace the active turn instead.
+
+## Publish timeline items
+
+Publish complete snapshots through `timeline.item`. Reuse an item `id` when updating streamed text,
+a running tool, or a todo list. Paseo derives the live delta and keeps the normal timeline.
+
+Built-in item types cover user and assistant messages, reasoning, tools, todos, errors,
+notifications, and compaction. Use a plugin item when your provider has a presentation that those
+types cannot express:
+
+```ts
+emit({
+  type: "timeline.item",
+  sessionId,
+  item: {
+    type: "plugin",
+    id: "review-42",
+    pluginId: "my-provider-plugin",
+    kind: "review-verdict",
+    version: 1,
+    data: { verdict: "ship", summary: "All checks passed" },
+  },
+});
+```
+
+Register the renderer independently in `index.client.tsx`:
+
+```tsx
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { z } from "zod";
+import { ReviewVerdict } from "./client/review-verdict";
+
+const reviewVerdictSchema = z.object({
+  verdict: z.enum(["ship", "hold"]),
+  summary: z.string(),
+});
+
+export default function contribute(client: PluginClientContext) {
+  client.addTimelineRenderer({
+    kind: "review-verdict",
+    version: 1,
+    schema: reviewVerdictSchema,
+    Component: ReviewVerdict,
+  });
+  return () => {};
+}
+```
+
+The same renderer can display items emitted by a provider, a client timeline transformer, or a
+daemon timeline append. A renderer does not require a provider implementation.
+
+## Adapt an ACP agent
+
+Use the ACP shim when the agent already speaks ACP:
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { runAcpProvider } from "@getpaseo/plugin/server/acp";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(
+    runAcpProvider({
+      id: "vendor-agent",
+      label: "Vendor agent",
+      icon: "icon.svg",
+      command: ["vendor-agent", "acp"],
+    }),
+  );
+  return () => {};
+}
+```
+
+The shim owns the ACP process, capability mapping, session lifecycle, prompts, permissions, and
+timeline conversion. Do not copy that machinery into the plugin.
+
+Use `transformers` only for vendor differences ACP cannot describe. Validate vendor payloads with
+Zod and leave malformed or unrelated values unchanged:
+
+```ts
+import type { AcpTransformer } from "@getpaseo/plugin/server/acp";
+import { z } from "zod";
+
+const editSchema = z.object({
+  path: z.string(),
+  before: z.string(),
+  after: z.string(),
+});
+
+export const vendorEdits: AcpTransformer = {
+  toolCall(toolCall) {
+    if (toolCall.name !== "vendor_file_edit") return toolCall;
+    const input = editSchema.safeParse(toolCall.input);
+    if (!input.success) return toolCall;
+    return {
+      ...toolCall,
+      kind: "edit",
+      input: {
+        filePath: input.data.path,
+        oldString: input.data.before,
+        newString: input.data.after,
+      },
+    };
+  },
+};
+```
+
+## Test and publish
+
+Test the provider against the real agent, not only mocked frames:
+
+1. install the plugin as a directory source;
+2. confirm its SVG, models, modes, and settings appear;
+3. create a session and complete a real prompt;
+4. exercise permissions, steering, cancellation, persistence, and replay when supported;
+5. render every custom timeline item on desktop and mobile-width layouts;
+6. reload and remove the plugin while a session is active and confirm the session terminates.
+
+Follow [Publish a plugin](/docs/plugins/publishing) to distribute the provider through npm or Git.
+Keep agent compatibility and releases in the plugin project.
+
+See the [plugin reference](/docs/plugins/reference#providers) for the exact runtime and SVG
+rules.
diff --git a/public-docs/plugins/publishing.md b/public-docs/plugins/publishing.md
new file mode 100644
index 0000000000..16cde2389a
--- /dev/null
+++ b/public-docs/plugins/publishing.md
@@ -0,0 +1,254 @@
+---
+title: Publish a plugin
+description: Share a Paseo plugin on npm, through a private registry, or from a Git repository.
+nav: Publishing
+order: 45
+category: Plugins
+---
+
+# Publish a plugin
+
+Publish your plugin so other people can install and use it in Paseo. Start with a working
+[plugin project](/docs/plugins), then choose where to share it:
+
+- [Plugin registry](#plugin-registry): share a reviewed artifact users install by `owner/slug`.
+- [npm](#publish-on-npm): publish a package on the public npm registry.
+- [GitHub or Git](#share-through-github-or-git): let users install from a repository.
+
+## Plugin registry
+
+Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
+Users install the reviewed artifact with:
+
+```bash
+paseo plugin add owner/slug
+```
+
+Publish your artifact through npm or Git, then follow the
+[registry submission guide](https://github.com/getpaseo/plugins) to submit it for review.
+Registry installations and updates use the approved revision and plugin path.
+Direct Git installs use explicit `git:owner/repository` shorthand or a full Git URL.
+
+## Publish on npm
+
+The scaffold prepares the package files and development dependencies. You choose the package name
+and release version.
+
+### 1. Set your package name and version
+
+From the plugin directory, set your package details and allow publication. Replace `@acme` with your npm scope:
+
+```bash
+npm pkg set name=@acme/paseo-review version=1.0.0
+npm pkg delete private
+```
+
+### 2. Check and publish
+
+```bash
+npm run typecheck
+npm pack --dry-run
+npm publish --access public
+```
+
+Check the pack output includes any assets you added to the project.
+
+### 3. Test the published plugin
+
+On a daemon host with npm available:
+
+```bash
+paseo plugin install npm:@acme/paseo-review@1.0.0
+```
+
+Users can also paste `npm:@acme/paseo-review` into **Settings → Plugins → Plugin source**.
+
+:::example[Package configuration]
+
+The scaffold includes this `files` list in `package.json`:
+
+```json
+{
+  "files": [
+    "paseo-plugin.json",
+    "OVERVIEW.md",
+    "index.client.ts",
+    "index.client.tsx",
+    "index.server.ts",
+    "index.server.tsx",
+    "client/",
+    "server/",
+    "shared/"
+  ]
+}
+```
+
+- Add any assets stored outside these directories to `files`.
+- Keep the scaffold's SDK and host libraries in `devDependencies`.
+- Add other runtime libraries with `npm install <package>`. Paseo installs their dependencies too.
+- The npm package name identifies the source. The manifest's `id` identifies the installed plugin.
+
+See the [project reference](/docs/plugins/reference#project-files) for entry points and runtime boundaries.
+
+:::
+
+### Plugins with a build step
+
+Paseo compiles TypeScript. An ordinary plugin needs no separate build before publication.
+If your plugin generates files, include the generated output in the package.
+
+**Installation scripts do not run automatically.** If a dependency needs host-specific setup,
+declare a [preparation command](/docs/plugins/reference#cli-reference).
+
+:::example[Generated files and dependencies]
+
+- Generate code and assets before running `npm publish`.
+- Keep generated JavaScript in its runtime directory and import it from the TypeScript entry.
+- Include generated assets in `files`.
+- Keep host-provided modules external when producing your own bundle.
+- Remove Git-only dependency-install commands from the published manifest; npm installation already
+  installs production dependencies.
+
+Paseo skips npm lifecycle scripts during installation, including dependency scripts. For example,
+a native dependency that needs rebuilding requires an explicit preparation command.
+
+:::
+
+:::example[Publish a private package with GitHub Packages]
+
+You can publish a company plugin to GitHub Packages. Follow the npm steps above, using your
+organization's scope, and replace the publish command with:
+
+```bash
+npm publish --registry=https://npm.pkg.github.com
+```
+
+[Configure GitHub authentication and package access](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry)
+before publishing.
+
+To install the plugin, configure npm **on the daemon host, as the user running Paseo**:
+
+1. Add your organization's registry to `~/.npmrc`:
+
+   ```ini
+   @acme:registry=https://npm.pkg.github.com
+   ```
+
+2. Log in with your GitHub username and a personal access token (classic) as the password.
+   The token needs `read:packages` and access to the package.
+
+   ```bash
+   npm login --scope=@acme --auth-type=legacy --registry=https://npm.pkg.github.com
+   ```
+
+3. Install the plugin:
+
+   ```bash
+   paseo plugin install npm:@acme/paseo-review
+   ```
+
+Paseo uses the host's npm registry settings and credentials for installation and updates.
+In the app, enter only the source identifier.
+
+:::
+
+## Icons and screenshots
+
+Declare your display name, icon, screenshots, and demo videos in `paseo-plugin.json`:
+
+```json
+{
+  "id": "review-tools",
+  "name": "Review tools",
+  "description": "Reviews changes before merge",
+  "icon": "assets/icon.png",
+  "media": ["assets/screenshot.png", "https://example.com/review-demo.mp4"],
+  "requirements": { "paseo": ">=0.11.0" }
+}
+```
+
+All three fields are optional. `name` gives the registry and website a display name without
+changing the installation ID. When omitted, the registry falls back to a humanized ID.
+Registry and website display requires the registry builder to read these fields from the pinned
+manifest. That update is a separate follow-up; until it lands, these fields are exposed only
+through the daemon's installed-plugin list.
+`icon` must point to a PNG inside the plugin package. `media` accepts paths to images and videos
+inside the package or HTTPS URLs, in display order. Paths are relative to the manifest; use
+forward slashes and keep them inside the package. See the [manifest reference](/docs/plugins/reference#project-files)
+for validation rules.
+
+Commit local assets alongside the manifest at the pinned revision. For npm, add their directory
+(for example, `assets/`) to `package.json`'s `files` list and verify it with `npm pack --dry-run`.
+The scaffold documents these fields in its manifest's `$comment`; add your display name and
+assets before publishing.
+
+Manifests using these fields fail to install on daemons before 0.11.0. Set
+`requirements.paseo` to `>=0.11.0` or a narrower supported range.
+
+## Your listing page
+
+Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
+It helps someone decide whether to install your plugin; the install command is already at
+the top of that page. A README assumes a GitHub audience and carries installation
+instructions, technical details, and badges. Long, AI-generated READMEs make people read
+past that material to understand what a plugin does.
+
+`OVERVIEW.md` is required to list your plugin in the registry. Commit it beside
+`paseo-plugin.json` in the source repository at the pinned commit. The registry resolves it
+relative to the manifest, under `pluginPath` for monorepos. Include it in the published npm
+package too; the scaffold's `files` list includes it. Replace the scaffold's guidance comment
+with useful facts before publishing.
+
+The repository overview takes precedence over a registry import stopgap. Online validation
+fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
+that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
+requires a repository overview and removes the stopgap in the same PR. A bump without the
+repository overview fails validation. README files do not supply the overview.
+
+Author overviews and registry stopgaps follow the same content contract, in this order.
+Choose headings only when they help; length follows complexity. A theme needs one paragraph.
+
+1. Explain what the plugin is and does in plain terms first.
+2. Explain how it works only when that is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, external tools, or other
+   plugins. Include applicable daemon version and operating system requirements. Setup
+   guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does, what the
+   plugin reads or sends and where, permissions, and known limits.
+
+Use sentence case and plain factual language, with no em dashes. Omit installation commands,
+badges, changelog, contributing or license sections, marketing, and unsupported claims.
+Avoid implementation filler such as empty cleanup functions, catalogs of theme-token fields,
+or lists of absent features. Keep only what helps someone choose the plugin.
+
+If your plugin is an unchanged imported record, you can propose an author-written overview
+to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.md`.
+
+## Share through GitHub or Git
+
+Push the plugin project to a repository. Users can install it with:
+
+```bash
+paseo plugin add git:acme/paseo-review
+```
+
+For another Git host:
+
+```bash
+paseo plugin install git:https://git.example.com/acme/paseo-review.git
+```
+
+If your plugin has runtime npm dependencies, commit `package-lock.json` and add a preparation
+command to `paseo-plugin.json`:
+
+```json
+{
+  "build": [["npm", "ci", "--omit=dev"]]
+}
+```
+
+- `npm ci` installs the versions in the committed lockfile.
+- `--omit=dev` excludes development tools.
+- npm must be available on the daemon host.
+
+Plugins that only use Paseo's host libraries need no preparation command.
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
new file mode 100644
index 0000000000..04c88bdf1a
--- /dev/null
+++ b/public-docs/plugins/reference.md
@@ -0,0 +1,2457 @@
+---
+title: Plugin reference
+description: Local plugin files, client and server runtimes, platform limits, contributions, RPCs, lifecycle, hosts, and CLI commands.
+nav: Reference
+order: 48
+category: Plugins
+---
+
+# Plugin reference
+
+Start with the [plugin quickstart](/docs/plugins) to create your first plugin.
+
+Migrating an existing plugin? Follow the standalone [runtime-entry migration guide](/docs/plugins/migration).
+
+Local plugins are directory sources installed into one Paseo daemon. A plugin can contribute:
+
+- React Native screens and sidebar header and footer items to Paseo clients;
+- workspace and agent panels opened as workspace tabs;
+- global, workspace, and agent actions in the Command Center;
+- slash commands in the message composer;
+- transformed and daemon-pushed agent timeline rows;
+- light and dark themes in Settings → Appearance;
+- schema-validated RPC handlers running beside the daemon;
+- normal Paseo operations through the TypeScript SDK;
+- searchable external resources in the message composer.
+
+Plugin code is trusted and unsandboxed. Client surfaces run in the Paseo app. Backend contributions run in a subprocess with access to the daemon machine, including its files, processes, credentials, and network.
+
+## Project files
+
+`paseo plugin init /absolute/path/to/my-plugin` creates:
+
+```text
+my-plugin/
+  paseo-plugin.json
+  index.client.tsx
+  index.server.ts
+  client/greeting.tsx
+  server/greeting.ts
+  shared/greeting.ts
+  package.json
+  tsconfig.json
+```
+
+The required root manifest is `paseo-plugin.json`:
+
+```json
+{
+  "id": "my-plugin",
+  "description": "Reviews changes before merge",
+  "requirements": { "paseo": ">=0.8.0" }
+}
+```
+
+| Field          | Required | Behavior                                                                                  |
+| -------------- | -------- | ----------------------------------------------------------------------------------------- |
+| `id`           | Yes      | Default installation ID.                                                                  |
+| `name`         | No       | Non-empty display name for the registry and website; independent of the installation ID.  |
+| `icon`         | No       | Relative path to a PNG inside the plugin package.                                         |
+| `media`        | No       | Array of image or video paths inside the package, or HTTPS URLs. An empty array is valid. |
+| `description`  | No       | Non-empty summary shown below the plugin ID in **Settings → Plugins**.                    |
+| `requirements` | No       | Supported Paseo versions, described below.                                                |
+| `build`        | No       | Preparation commands, described in the CLI reference.                                     |
+
+Paths are relative to `paseo-plugin.json`, use forward slashes, and cannot contain `..`
+segments. See [icons and screenshots](/docs/plugins/publishing#icons-and-screenshots) for an example.
+Paseo validates the references without opening local assets or fetching URLs.
+
+Unknown top-level fields are ignored. Known fields still validate, and unknown keys inside
+`requirements` are rejected so a misspelled constraint cannot silently skip a compatibility check.
+Manifests using `name`, `icon`, or `media` require Paseo 0.11.0 or later; older daemons reject
+these fields during installation.
+
+### Requirements
+
+`requirements` is an optional object. Its currently supported key, `paseo`, accepts an npm semver
+range. An omitted `requirements.paseo` means `<0.8.0`: the plugin predates the first breaking
+plugin release. Paseo 0.8 and later reject it with a link to the [migration guide](migration).
+Empty strings, invalid ranges, and unknown manifest requirement keys are rejected.
+
+| Range            | Compatible releases                                                          |
+| ---------------- | ---------------------------------------------------------------------------- |
+| `>=0.8.0`        | 0.8.0 and later releases, including prereleases and future breaking releases |
+| `^0.8.0`         | 0.8.x releases, including prereleases                                        |
+| `>=0.8.3 <0.9.0` | 0.8.3 through the last 0.8 patch, including prereleases                      |
+
+Prerelease Paseo versions also satisfy a range their stable core (`major.minor.patch`) satisfies, so `0.8.0-beta.1` satisfies `>=0.8.0` but not `<0.8.0`.
+
+`paseo plugin init` writes `>=` followed by the current CLI version and pins the matching SDK
+for typechecking. Raise the minimum when adopting a newer API. Add an upper bound when a later
+release is incompatible; a minimum alone does not promise protection from future breaking changes.
+
+The daemon checks its version before installing, running preparation commands, or loading a plugin,
+and checks again on startup, enable, and reload. A rejected update keeps the installed revision.
+Each connected app checks its own version before evaluating client code and shows incompatibility
+in Settings → Plugins. A compatible daemon does not make an older app compatible. A plugin with no
+client entry does not require the connected app to match.
+
+For example: `Plugin "review" requires Paseo >=0.8.0. Your daemon is 0.7.2.` Use a compatible plugin
+revision or update the named runtime. Releases before 0.8 do not understand this manifest field
+and cannot show this new diagnostic.
+
+### Runtime entries
+
+| Entry              | Runtime               | Receives              | Required                                                                        |
+| ------------------ | --------------------- | --------------------- | ------------------------------------------------------------------------------- |
+| `index.client.tsx` | Paseo app, per client | `PluginClientContext` | When the plugin has any UI, callback, theme, or attachment source               |
+| `index.server.ts`  | Daemon subprocess     | `PluginServerContext` | When the plugin contributes handlers, hooks, settings persistence, or providers |
+
+At least one entry is required; both accept `.ts` or `.tsx`. A directory that still has only the
+old `index.ts` fails to load and points at the [migration guide](/docs/plugins/migration).
+
+Plugin, screen, sidebar-item, workspace-panel, Command Center item, attachment-source, and
+slash-command IDs start with a lowercase letter and contain lowercase letters, numbers, or hyphens.
+
+The generated `package.json` installs `@getpaseo/plugin` and the other host modules as development
+dependencies for local typechecking and tests. Paseo supplies their runtime instances. Consumers do
+not install them when adding the plugin.
+
+Every other module lives in one of three directories. Nesting inside them is fine; a module at the
+plugin root is a compile error.
+
+| Directory | Compiled into      | Use it for                                                           |
+| --------- | ------------------ | -------------------------------------------------------------------- |
+| `client/` | App bundle only    | React, React Native, hooks, styles, surfaces, panels, and callbacks. |
+| `server/` | Daemon bundle only | Node APIs, local resources, credentials, and RPC handlers.           |
+| `shared/` | Both               | Zod RPC contracts and plain values imported by both runtimes.        |
+
+## Runtime modules
+
+Paseo builds each bundle from its matching entry. An import from `client/` into the daemon bundle,
+from `server/` into the app bundle, or of a Node module anywhere in the app bundle is a compile
+error. Server imports of React, React Native, or client SDK entries also fail. Shared code imports
+only shared code: no Node, React, runtime-specific SDK entries, or runtime-specific types.
+
+The SDK root (`@getpaseo/plugin`) contains shared data, schemas, and runtime-neutral helpers only.
+Import client contexts and hooks from `/client`, server contexts and lifecycle contracts from
+`/server`, and UI from `/client/react-native` or `/client/ui`. These rules include type imports and transitive
+dependencies. `/client/host` is private to the app host; plugins cannot import it.
+
+### Client runtime
+
+Paseo provides these modules to client code:
+
+| Module                                 | Use it for                                                                                        |
+| -------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `@getpaseo/plugin`                     | Shared data, `defineRpc`, `defineSettings`, `defineAttachmentSource`, `RpcInput`, and `RpcOutput` |
+| `@getpaseo/plugin/client/ui`           | Named, composable settings components                                                             |
+| `@getpaseo/plugin/client/react-native` | Paseo UI components and UI hooks                                                                  |
+| `@getpaseo/plugin/client`              | Client contribution contexts, `usePaseo`, `useRpc`, `useSettings`, and data hooks                 |
+| `@tanstack/react-query`                | Request state and caching                                                                         |
+| `react`                                | Components and hooks                                                                              |
+| `react/jsx-runtime`                    | Compiled JSX                                                                                      |
+| `react-native`                         | Cross-platform UI                                                                                 |
+| `zod`                                  | Shared schemas                                                                                    |
+
+The host owns its paired React and renderer versions. The SDK's React peer range permits patch
+versions for tooling and Node consumers; it does not change the app's pinned React version or
+guarantee compatibility with another host's renderer.
+
+These exact module specifiers use the host's runtime instances. A client bundle that requests another host module fails with `Module "<name>" is not available in plugin client code`.
+
+Do not import `lucide-react-native`, `react-native-svg`, or DOM libraries. Set contribution `icon` fields to a [Lucide icon name](https://lucide.dev/icons/); Paseo validates the name and renders the icon.
+
+### Cross-platform rules
+
+Client code runs on iOS, Android, and in browsers through React Native Web. A component that works
+in your browser and crashes on a phone is the most common plugin bug. The rules:
+
+| Do                                                                         | Do not                                                                      |
+| -------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| `View`, `Text`, `Pressable`, `ScrollView`, `TextInput` from `react-native` | `<div>`, `<span>`, `<button>`, or any HTML element                          |
+| `style` objects built from `theme.colors` and `layout.compact`             | `className`, CSS strings, or hardcoded colors                               |
+| `onPress`                                                                  | `onClick`, `onMouseEnter`, or other DOM handlers                            |
+| `Linking`, `Clipboard`-style React Native APIs                             | `window`, `document`, `localStorage`, `navigator`, `location` in components |
+
+The scaffold's `tsconfig.json` omits the DOM library. Keep DOM globals out of cross-platform
+components; do not add `/// <reference lib="dom" />` or `"DOM"` to `lib`.
+`layout.platform` carries the same value as React Native's `Platform.OS` for rendering decisions.
+
+### Play audio
+
+Call `client.playAudio({ base64, mimeType }): Promise<void>` to play an audio file on the
+current client (browser, Electron, iOS, or Android). Pass the base64 file returned by your
+plugin RPC; no browser globals or platform checks are needed.
+
+```ts
+const audio = await client.rpc(renderSpeech, { text: "Your agent needs you" });
+// renderSpeech returns { base64: string, mimeType: "audio/wav" }.
+await client.playAudio(audio);
+```
+
+The promise resolves when playback finishes and rejects if the file is invalid, playback
+fails, or the plugin unloads. Calls share Paseo's voice playback queue and play in order.
+Unloading a plugin cancels its active and queued audio. Voice playback controls can also
+interrupt that shared queue. Playback does not request microphone permission.
+
+Use PCM WAV or MP3 for portable files. Other codecs depend on the client's decoder.
+MIME parameters are accepted. Pass a complete audio file; raw PCM samples are not supported.
+Browsers require user interaction before allowing sound; handle rejection and offer a
+play button. The function plays on the device running the plugin client, not on the daemon,
+and does not promise delivery while the app is suspended or closed.
+
+### External links and workspace browsers
+
+Use `ExternalLink` to open documentation outside Paseo:
+
+```tsx
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
+
+export function DocumentationLink() {
+  return <ExternalLink href="https://paseo.sh/docs">Open documentation</ExternalLink>;
+}
+```
+
+The component has accessible link semantics and uses the same opener as
+`openExternalUrl(url: string): Promise<void>`:
+
+```ts
+import { openExternalUrl } from "@getpaseo/plugin/client";
+
+export async function openDocumentation() {
+  await openExternalUrl("https://paseo.sh/docs");
+}
+```
+
+Call the function directly from a user interaction so the browser permits a new tab.
+
+| Platform      | External links                     | `navigation.openBrowser`                         |
+| ------------- | ---------------------------------- | ------------------------------------------------ |
+| Electron      | System browser                     | Available; creates a local workspace browser tab |
+| Browser web   | New tab with `noopener,noreferrer` | `undefined`                                      |
+| iOS / Android | OS URL handler                     | `undefined`                                      |
+
+#### ExternalLink props
+
+| Prop                            | Required | Behavior / default                                     |
+| ------------------------------- | -------- | ------------------------------------------------------ |
+| `href: string`                  | Yes      | Absolute HTTP(S) destination                           |
+| `children: ReactNode`           | Yes      | Link text or inline React Native content               |
+| `accessibilityLabel: string`    | No       | Overrides the accessible name derived from the content |
+| `testID: string`                | No       | Test identifier; unset by default                      |
+| `onError(error: unknown): void` | No       | Receives opening errors; defaults to logging them      |
+
+#### Open a workspace browser
+
+Use `navigation.openBrowser` from a surface or panel. Check availability before rendering
+the action. This workspace panel chooses an external link on other platforms:
+
+```tsx
+import type { PluginWorkspacePanelProps } from "@getpaseo/plugin/client";
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
+import { Pressable, Text } from "react-native";
+
+export function DocumentationPanel({ navigation, workspaceId, theme }: PluginWorkspacePanelProps) {
+  const openBrowser = navigation?.openBrowser;
+  const url = "https://paseo.sh/docs";
+
+  if (!openBrowser) {
+    return <ExternalLink href={url}>Open documentation</ExternalLink>;
+  }
+
+  return (
+    <Pressable accessibilityRole="button" onPress={() => openBrowser({ url, workspaceId })}>
+      <Text style={{ color: theme.colors.foreground }}>Open in workspace browser</Text>
+    </Pressable>
+  );
+}
+```
+
+`navigation.openBrowser({ url, workspaceId, serverId? }): void` creates and focuses a new tab.
+It never opens externally as an automatic fallback.
+
+| Option                | Required | Behavior / default                                                |
+| --------------------- | -------- | ----------------------------------------------------------------- |
+| `url: string`         | Yes      | Absolute HTTP(S) destination                                      |
+| `workspaceId: string` | Yes      | Workspace already present in the target host's app workspace list |
+| `serverId: string`    | No       | Defaults to the surface or panel's selected host                  |
+
+To target another host, pass its ID with that host's workspace ID:
+
+```ts
+openBrowser({ url, workspaceId: remoteWorkspaceId, serverId: remoteServerId });
+```
+
+`serverId` selects workspace ownership. The page runs on your local desktop, including
+for remote workspaces; `localhost` URLs refer to that desktop.
+
+#### Errors and refusal
+
+| Condition                                                             | Result                                                                         |
+| --------------------------------------------------------------------- | ------------------------------------------------------------------------------ |
+| External URL is malformed or uses a non-HTTP(S) scheme                | Ignored; `openExternalUrl` resolves without opening anything                   |
+| OS opener fails                                                       | `openExternalUrl` rejects; `ExternalLink` calls `onError` or logs the error    |
+| Browser blocks a new external tab                                     | Cannot be distinguished from a successful `noopener` open                      |
+| In-app browser URL is malformed or uses a non-HTTP(S) scheme          | Throws `Only absolute HTTP(S) URLs are supported.` before creating a tab       |
+| In-app browser workspace ID is empty                                  | Throws `workspaceId is required.` before creating a tab                        |
+| Target host/workspace is unknown or its workspace list has not loaded | Throws `Workspace is unavailable on the requested host.` before creating a tab |
+
+Use the [settings API](#settings-screens) for typed host-scoped persistence across clients.
+Use `openSettings`, `openScreen`, and `openPanel` for your own registered contributions.
+
+### Server runtime
+
+Paseo provides `@getpaseo/plugin`, `@getpaseo/plugin/server`,
+`@getpaseo/plugin/server/provider`, `@getpaseo/plugin/server/acp`, and `zod` to server code. Backend
+contributions run in a daemon subprocess with Node access to the host machine. Keep filesystem,
+process, credential, and other machine-local work under `server/`. A plugin without
+`index.server.ts` starts no subprocess.
+
+### Providers
+
+Follow [Build a provider plugin](/docs/plugins/providers) for direct and ACP implementations,
+session lifecycle, composer settings, timeline renderers, testing, and distribution.
+
+Call `server.registerProvider()` with a `ProviderRegistration` from
+`@getpaseo/plugin/server/provider`. Its connection accepts inputs with `send()` and emits complete state
+snapshots through `onEvent()`. `send()` reports acceptance only; prompt disposition, turns,
+configuration, persistence, permissions, and failures are events.
+
+Use the single `session.prompt` input for messages, structured commands, steering, and command side
+effects. Repeat `clientMessageId` on the live user timeline item and publish exactly one matching
+`session.prompt_result`. Publish provider-created children as sessions with `parentSessionId`.
+
+Provider settings are toggle/select descriptors that Paseo renders in the composer. Keep
+provider-private options under `ProviderSessionConfig.providerOptions` on `session.open`.
+This record includes configured defaults and per-agent overrides; validate and apply it in your
+provider. See [Provider options](/docs/sdk/provider-options) for configuration and merge semantics.
+Host tools arrive as MCP servers in the complete
+session config.
+
+Paseo refreshes an agent by closing its current provider session and opening it with current
+configuration and persistence. Providers re-read external state during `session.open`.
+
+Use `runAcpProvider()` from `@getpaseo/plugin/server/acp` to adapt a command-backed ACP. Add transformer
+hooks only for a vendor's discovery, configuration, notification, or tool-call differences.
+
+`ProviderRegistration.icon` is a file path relative to the plugin directory, such as `icon.svg`.
+It must resolve inside that directory to a regular SVG file no larger than 64 KiB. The SVG must be
+self-contained: scripts, styles, `foreignObject`, event-handler attributes, JavaScript URLs, and
+external `href` or `xlink:href` references are rejected. Fragment references such as `#mark` are
+allowed. Paseo reads and sanitizes the file when the plugin starts; the string is never an inline
+SVG or URL.
+
+### Usage sources
+
+**Requires Paseo 0.11.** Register a source from your server entry with
+`server.registerUsageSource()`. Import its contract and helpers from
+`@getpaseo/plugin/server/usage`.
+
+A source implements two calls:
+
+```ts
+interface UsageAccount {
+  key: string;
+  label?: string;
+  harness?: string;
+  input: JsonValue;
+}
+
+type UsageScope =
+  | { kind: "global" }
+  | { kind: "session"; provider: string; model?: string; env: Record<string, string> };
+
+interface UsageSourceRegistration {
+  id: string;
+  label: string;
+  icon?: string;
+  input: ZodType;
+  discover(scope: UsageScope): Promise<UsageAccount[]>;
+  fetch(input: unknown): Promise<UsageReport>;
+}
+
+type UsageReport =
+  | {
+      status: "available";
+      planLabel?: string;
+      windows: UsageWindow[];
+      balances?: UsageBalance[];
+      details?: UsageDetail[];
+    }
+  | { status: "unavailable"; problem: UsageProblem }
+  | { status: "error"; error: string };
+
+type UsageProblem =
+  | { kind: "expired"; expiresAt: string; refreshedBy?: string }
+  | { kind: "rejected"; status: number; refreshedBy?: string }
+  | { kind: "no_quota"; detail: string };
+```
+
+Session discovery returns only the login that agent runs on. The agent popover uses only those
+inputs; it never tries logins from global discovery or other agents. For any other provider,
+return `[]`. Global discovery lists every account, including expired logins.
+
+Resolve the session account from that session's launch environment. Return `[]` when no login exists.
+Never scan default stores from session discovery or scan agents from global discovery. Discovery is a query, with no agent
+lifecycle hooks. Closed agents have no session scope until resumed.
+
+Inputs name credential stores; never put credentials in inputs or reports. Paseo validates each
+input against your schema before calling `fetch()`. The same key in any scope is the same report;
+fetches share a five-minute cache only when their ordered login inputs match. Each login fetch
+has a 20-second deadline.
+
+Built-in session routes:
+
+| Source                 | Session                                       | Login store                                                                                    |
+| ---------------------- | --------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| Claude                 | `claude`                                      | `CLAUDE_CONFIG_DIR`, or the default; on macOS, the directory's Keychain entry takes precedence |
+| Claude                 | `pi`, `omp` with `anthropic/…` model          | That harness's Anthropic login store                                                           |
+| Codex                  | `codex`                                       | `CODEX_HOME/auth.json`, or the default                                                         |
+| Codex                  | `pi`, `opencode`, `omp` with `openai/…` model | That harness's OpenAI login store                                                              |
+| Muse                   | `muse`                                        | That session's own Muse launch/config                                                          |
+| Other built-in sources | Any                                           | No session discovery                                                                           |
+
+Claude excludes Bedrock, Vertex, and foreign `ANTHROPIC_BASE_URL` sessions. Codex excludes sessions
+with `OPENAI_BASE_URL` set.
+
+Use a stable account key: 1–128 characters from `[A-Za-z0-9._-]`. It identifies the account or
+organization whose quota is metered and survives token rotation. Never use a credential or raw
+email as the key. Use `hashAccountKey()` for sensitive stable identities or a store locator when
+account metadata is unavailable. Labels can name accounts without becoming their identity.
+
+Return logins in preference order and set `harness` to the owning harness's display name, such as
+Codex, OpenCode, Pi, or OMP. The daemon treats inputs as opaque and never derives labels from them.
+
+The host-wide Usage modal groups logins with the same key into one account card and tries them
+concurrently, preferring the discovery order when selecting a result. If any login returns
+`available`, it shows usage with no errors. If all fail, it shows
+every login's error on a separate line with its harness label and its own remedy.
+Discovery failures are logged by the daemon and produce no card.
+
+Window names must come from provider data: an explicit duration, a named API field such as
+`five_hour` or `weekly`, or the provider's own period name. Response slots and reset countdowns
+do not establish duration. When the provider omits it, use a neutral name such as “Rolling” or
+“Primary limit” and explain the missing metadata next to the adapter.
+
+For numeric durations, use `windowFromReportedDuration()` from
+`@getpaseo/plugin/server/usage` (Paseo 0.11+). Pass the reported seconds or `null`, a neutral
+`unknown` identity and name, and an optional stable quota `scope`. The helper derives the ID,
+label, and short label together; it accepts no duration-label override. For named API periods,
+use `windowFromUsedPct()` with names justified by that field.
+
+A window ID identifies a quota scope and period, never its response position, utilization, or
+reset instant. Scope model-specific quotas by the provider's stable feature ID, falling back to
+the reported limit name when no ID exists. Preserve IDs across slot moves and display-name
+changes. Do not alias an old ambiguous ID to a different period: saved pins match source and
+window IDs across all accounts, so users must select the corrected window again.
+
+`summary: true` selects source defaults until the user customizes pins. The app computes one
+effective selection for cards, the sidebar, and toggles. The first edit snapshots those defaults;
+an explicit empty selection stays empty.
+
+Re-read the selected store in `fetch()` so the CLI's token rotations take effect. Never redeem
+refresh tokens or write credential stores: refreshing elsewhere can invalidate the CLI's copy,
+and rewriting parsed files can discard fields you do not model. If the store disappeared after
+discovery, throw; the card shows the error until the next discovery removes it.
+
+Use `unavailable(problem)` to explain why an existing login cannot supply quota. It requires a
+problem; there is no zero-argument form. `expiresAt` is an ISO timestamp. A rejected login carries
+the upstream HTTP status. `refreshedBy` is a CLI name, such as `claude`, `codex`, `opencode`, `omp`, or
+`pi`. Paseo owns the remedy sentence. Do not put instructions or user-facing sentences in that
+field. For `no_quota`, `detail` is displayed verbatim.
+
+```ts
+import { z } from "zod";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { hashAccountKey, unavailable } from "@getpaseo/plugin/server/usage";
+import { findLoginStores, readLogin, readQuota } from "./server/logins";
+
+const input = z.object({ path: z.string() }).strict();
+
+export default function contribute(server: PluginServerContext) {
+  server.registerUsageSource({
+    id: "example-usage",
+    label: "Example",
+    icon: "icon.svg",
+    input,
+    discover: async () =>
+      (await findLoginStores()).map((path) => ({
+        key: hashAccountKey(path),
+        input: { path },
+      })),
+    fetch: async (value) => {
+      const { path } = input.parse(value);
+      const login = await readLogin(path);
+      if (login.expiresAt <= Date.now())
+        return unavailable({
+          kind: "expired",
+          expiresAt: new Date(login.expiresAt).toISOString(),
+          refreshedBy: "example",
+        });
+      return readQuota(login);
+    },
+  });
+  return () => {};
+}
+```
+
+Built-in Claude discovery prefers the macOS Keychain login and uses the Claude Code credential
+file only when Keychain is empty. `CLAUDE_CONFIG_DIR` selects that file's directory. Fresh tokens
+use the OAuth profile's account and organization IDs; expired or rejected profiles use a locator
+hash. Codex prefers Codex CLI, OpenCode, Pi, then OMP and groups by the ChatGPT account ID from stored
+metadata or JWT claims. Pi and OMP logins remain discoverable when expired. OMP requires
+`node:sqlite`.
+
+`usage.list_reports` discovers accounts when called without IDs. With IDs, it refreshes known
+accounts without rediscovering identity. If a store switches accounts, the existing card shows the
+new login's quota until the next discovery. Reports are cached for five minutes; `forceRefresh`
+bypasses that cache. Entries carry `id`, `account.label`, and `fetchedAt`. Failed accounts also carry optional
+`loginErrors` entries with `harness` and each login's failed `report`. Clients gate the feature
+on `server_info.features.usageSources`. The older `provider.usage.list` RPC maps the same reports
+for 0.10 clients and renders problems into its `error` string.
+
+The source icon follows the provider SVG restrictions above.
+
+## Entry point and cleanup
+
+Each present entry default-exports one contribution function and returns cleanup. Client entries
+receive `PluginClientContext`; server entries receive `PluginServerContext`. Client registration methods return idempotent removers, except header buttons and composer pills,
+which return `{ update, remove }` handles. The entry cleanup runs before Paseo removes remaining registrations.
+
+```ts
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { Main } from "./client/main";
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({ id: "main", title: "My plugin", Component: Main });
+  return () => {};
+}
+```
+
+Cleanup can be async. Release timers, watchers, sockets, and other resources created by the plugin. Paseo also removes registrations, unmounts surfaces, rejects pending RPCs, closes the plugin's daemon session, and stops its subprocess on reload, disable, removal, disconnect, or daemon shutdown.
+
+## Lifecycle hooks
+
+In `index.server.ts`:
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+
+export default function contribute(server: PluginServerContext) {
+  server.on("agent.turn_ended", (event) => {
+    console.log(event.agent.id, event.outcome);
+  });
+
+  return () => {};
+}
+```
+
+| Register                        | Callback receives                  | Return                                                       |
+| ------------------------------- | ---------------------------------- | ------------------------------------------------------------ |
+| `server.on(name, callback)`     | `(event, { paseo, signal })`       | `void` or `Promise<void>`                                    |
+| `server.before(name, callback)` | `({ request }, { paseo, signal })` | Modified request, or `undefined` to keep it; async supported |
+
+Hooks run on the daemon while the plugin is enabled, even with no app connected.
+
+### Change configuration and inject an MCP server
+
+Add this callback inside `contribute(server)`. Replace the placeholder URL with your MCP endpoint.
+
+```ts
+server.before("agent.create", ({ request }) => {
+  if (request.config.provider !== "codex") {
+    return request;
+  }
+
+  return {
+    ...request,
+    config: {
+      ...request.config,
+      providerOptions: {
+        ...request.config.providerOptions,
+        sandbox_mode: "workspace-write",
+        approval_policy: "on-request",
+      },
+      mcpServers: {
+        ...request.config.mcpServers,
+        company: {
+          type: "http",
+          url: "https://tools.example.com/mcp",
+        },
+      },
+    },
+  };
+});
+```
+
+| Input                                       | Result                        |
+| ------------------------------------------- | ----------------------------- |
+| `providerOptions.sandbox_mode: "read-only"` | `"workspace-write"`           |
+| `providerOptions.web_search: "disabled"`    | Preserved by the spread       |
+| Existing `mcpServers.search`                | Preserved by the spread       |
+| Existing `mcpServers.company`               | Replaced with the entry above |
+
+The selected provider validates `providerOptions` and must support the configured MCP servers.
+Explicit Codex sandbox and approval options override its mode presets.
+
+### Inject environment variables on every session opening
+
+```ts
+server.before("agent.session_open", ({ request }) => {
+  return {
+    ...request,
+    env: {
+      ...request.env,
+      COMPANY_ENV: "development",
+    },
+  };
+});
+```
+
+This runs on create, resume, refresh, and import. To inject only on creation, set `env` in an
+`agent.create` callback instead.
+
+### Choose workspace isolation
+
+```ts
+server.before("workspace.create", ({ request }) => {
+  if (request.source.kind !== "directory") {
+    return request;
+  }
+
+  return {
+    ...request,
+    source: {
+      kind: "worktree",
+      cwd: request.source.path,
+      action: "branch-off",
+    },
+  };
+});
+```
+
+**Result:** an explicit directory creation request becomes a worktree request. Existing workspaces
+and directory lookup/import operations are unaffected.
+
+### Send a follow-up when a turn ends
+
+Copy [server/inspect.ts](https://github.com/getpaseo/paseo/blob/main/plugin-examples/lifecycle-actions/server/inspect.ts)
+into your plugin. The helper imports types from `@getpaseo/protocol/agent-types`; add
+`@getpaseo/protocol` at the same version as your plugin SDK to your development dependencies
+and install them before loading the plugin. `latestOutputText` joins text chunks after the latest user message.
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { latestOutputText } from "./server/inspect";
+
+export default function contribute(server: PluginServerContext) {
+  server.on("agent.turn_ended", async (event, context) => {
+    if (event.outcome.kind === "canceled") {
+      return;
+    }
+
+    const text = latestOutputText(event.timeline);
+    if (/out of credits/i.test(text)) {
+      await context.paseo.agents.ref(event.agent.id).send("Try again.");
+    }
+  });
+
+  return () => {};
+}
+```
+
+```text
+Turn ends: "out of credits"
+  → plugin sends "Try again."
+  → a new turn starts
+```
+
+This sends a new message with the existing SDK. Persistent matches keep sending follow-ups;
+add limits or delays in your plugin when needed. Attachments and tool effects are not replayed.
+
+### Answer a permission request
+
+Using `shellCommand` from the same [helper file](https://github.com/getpaseo/paseo/blob/main/plugin-examples/lifecycle-actions/server/inspect.ts):
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { shellCommand } from "./server/inspect";
+
+export default function contribute(server: PluginServerContext) {
+  server.on("agent.permission_requested", async (event, context) => {
+    const command = shellCommand(event.request);
+    if (command === null) {
+      return;
+    }
+
+    const agent = context.paseo.agents.ref(event.agent.id);
+    if (/\brm\s+-rf\b/.test(command)) {
+      await agent.respondToPermission({
+        requestId: event.request.id,
+        response: { behavior: "deny", message: "Recursive deletion is blocked." },
+      });
+      return;
+    }
+
+    if (command.trim() === "git status") {
+      await agent.respondToPermission({
+        requestId: event.request.id,
+        response: { behavior: "allow" },
+      });
+    }
+  });
+
+  return () => {};
+}
+```
+
+| Request                  | Result                    |
+| ------------------------ | ------------------------- |
+| `rm -rf build`           | Declined                  |
+| `git status`             | Approved                  |
+| Other command or request | Left pending for the user |
+| Already-resolved request | SDK response fails        |
+
+The regex is an example policy, not a shell parser. Permission requests can also be questions,
+plans, and mode changes; requesting permission does not end the turn.
+
+### Events
+
+| Name                         | Event fields                             | Trigger                                            |
+| ---------------------------- | ---------------------------------------- | -------------------------------------------------- |
+| `agent.created`              | `agent`                                  | Ordinary creation finishes; excludes import/resume |
+| `agent.closed`               | `agent`                                  | A live agent runtime closes                        |
+| `agent.turn_started`         | `agent`, `turnId`                        | Live turn starts                                   |
+| `agent.turn_ended`           | `agent`, `turnId`, `outcome`, `timeline` | Live turn completes, fails, or is canceled         |
+| `agent.permission_requested` | `agent`, `request`                       | Permission or question becomes pending             |
+| `agent.permission_resolved`  | `agent`, `requestId`, `resolution`       | Pending request is answered or cleared             |
+| `agent.archived`             | `agent`, `archivedAt`                    | Archive state is saved                             |
+| `workspace.created`          | `workspace`                              | Record created; directory available                |
+| `workspace.archived`         | `workspace`                              | Archive state is saved                             |
+
+Agent events exclude the daemon's private disposable helpers. Public background workspaces and
+their ordinary agents run the same lifecycle hooks as other workspaces. Archive events can precede
+runtime/worktree cleanup; observe lifecycle completion separately when cleanup matters.
+
+**Shared payload shapes** (`@getpaseo/plugin/server`):
+
+```ts
+interface PluginHookAgent {
+  id: string;
+  workspaceId: string | null;
+  parentAgentId: string | null;
+  provider: string;
+  cwd: string;
+  title: string | null;
+}
+
+interface PluginHookWorkspace {
+  id: string;
+  projectId: string;
+  cwd: string;
+  name: string | null;
+  archivedAt: string | null;
+}
+
+type PluginTurnOutcome =
+  | { kind: "completed" }
+  | { kind: "failed"; error: { message: string; code?: string } }
+  | { kind: "canceled"; reason: string };
+```
+
+| Field        | Shape / meaning                                                                                       |
+| ------------ | ----------------------------------------------------------------------------------------------------- |
+| `turnId`     | Provider-reported `string` or `null`; can repeat after a session reopens                              |
+| `timeline`   | `readonly AgentTimelineItem[]`; complete snapshot including earlier conversation; text may span items |
+| `request`    | SDK `AgentPermissionRequest`; `kind` is `tool`, `plan`, `question`, `mode`, or `other`                |
+| `resolution` | SDK `AgentPermissionResponse`                                                                         |
+| `archivedAt` | Timestamp string                                                                                      |
+
+### Before hooks
+
+| Name                 | Request fields                                                          | Editable                                |
+| -------------------- | ----------------------------------------------------------------------- | --------------------------------------- |
+| `agent.create`       | `config`, optional `env`                                                | Public agent config except `cwd`; `env` |
+| `agent.session_open` | `agentId`, `workspaceId`, `provider`, `cwd`, `reason`, `purpose`, `env` | Only `env`                              |
+| `workspace.create`   | `source`, optional `title`, `firstAgentContext`                         | Entire explicit creation request        |
+
+**`agent.create.config`** uses `AgentSessionConfig`:
+
+| Fields                                        | Constraint                                                                 |
+| --------------------------------------------- | -------------------------------------------------------------------------- |
+| `provider`, `model`                           | Separate fields; changing provider may require changing model/mode/options |
+| `modeId`, `thinkingOptionId`, `featureValues` | Provider-specific selections                                               |
+| `title`, `systemPrompt`                       | Agent configuration                                                        |
+| `providerOptions`                             | Opaque provider-specific options                                           |
+| `mcpServers`, `toolPolicy`                    | MCP configuration and exact-tool preapprovals                              |
+| `cwd`                                         | Cannot change                                                              |
+
+**`agent.session_open` request example:**
+
+```json
+{
+  "agentId": "agent-123",
+  "workspaceId": "workspace-456",
+  "provider": "codex",
+  "cwd": "/projects/shop",
+  "reason": "resume",
+  "purpose": "interactive",
+  "env": { "COMPANY_ENV": "development" }
+}
+```
+
+| Field         | Values                                                                                                                  |
+| ------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `workspaceId` | String or `null`                                                                                                        |
+| `reason`      | `create`, `resume`, `refresh`, `import`                                                                                 |
+| `purpose`     | `interactive`, `history`                                                                                                |
+| `env`         | Launch override map; excludes the daemon's inherited environment. Replace the map to add, replace, or remove overrides. |
+
+### Ordering and returned values
+
+```text
+Creation request
+  → agent.create hooks (plugin-ID order; registration order within each plugin)
+  → resolve defaults and validate provider configuration
+  → derive launch configuration with Paseo runtime tools and daemon prompt
+  → agent.session_open hooks (same ordering; env only)
+  → set PASEO_AGENT_ID and PASEO_AGENT_CWD
+  → open provider session and save agent configuration
+```
+
+| Callback returns                                        | Next callback receives                              |
+| ------------------------------------------------------- | --------------------------------------------------- |
+| `{ ...request, env: { ...request.env, REGION: "eu" } }` | Prior request with `REGION` added/replaced          |
+| `{ ...request, env: { REGION: "eu" } }`                 | Prior request with the entire override map replaced |
+| `undefined`                                             | Unchanged request                                   |
+| Throws or returns invalid data                          | Operation fails; later callbacks do not run         |
+
+No automatic deep merge. Later callbacks can overwrite earlier values. Agent configuration is
+saved; environment overrides are not persisted with it.
+
+### Context and cleanup
+
+| Contract                           | Behavior                                                                                                  |
+| ---------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `context.paseo`                    | Existing SDK connected to this daemon                                                                     |
+| `context.signal`                   | Aborted on invocation timeout or plugin stop; pass to external requests                                   |
+| Input data                         | Detached snapshot; change state through returned requests or SDK commands                                 |
+| Registration result                | Idempotent remover, e.g. `const remove = server.on(...); remove();`                                       |
+| Reload, disable, removal, shutdown | Remaining registrations removed                                                                           |
+| Unknown hook name                  | Registration fails                                                                                        |
+| Hook timeout                       | 30 seconds; aborts the signal. A before hook fails the pending operation; an event handler logs an error. |
+| Event-handler error                | Logged against plugin; original operation continues                                                       |
+| Event delivery                     | Live, best effort; no replay, persistence, or automatic retry                                             |
+| Event concurrency                  | Different events may overlap; callback completion order is not guaranteed                                 |
+
+### Complete examples
+
+| Plugin                                                                                                 | Includes                                                                     |
+| ------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
+| [lifecycle-logger](https://github.com/getpaseo/paseo/tree/main/plugin-examples/lifecycle-logger)       | All eleven hooks; JSON logs with environment values redacted                 |
+| [lifecycle-actions](https://github.com/getpaseo/paseo/tree/main/plugin-examples/lifecycle-actions)     | Follow-ups, permissions, environment, provider switching, worktree selection |
+| [agent-configuration](https://github.com/getpaseo/paseo/tree/main/plugin-examples/agent-configuration) | MCP injection and Codex sandbox/approval options                             |
+
+Read logger output with `paseo plugin logs lifecycle-logger` or the host's `daemon.log`.
+
+## Screens and sidebar items
+
+A screen is a full page of plugin UI. A sidebar item is a component Paseo renders in the sidebar
+header or footer; it decides what a press does. Register the screen, then an item that opens it:
+
+`client/main.tsx`:
+
+```tsx
+import type { PluginScreenProps } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+
+export function Main({ theme, host, layout }: PluginScreenProps) {
+  const styles = useMemo(
+    () => ({
+      screen: {
+        flex: 1,
+        padding: layout.compact ? 16 : 24,
+        backgroundColor: theme.colors.surface0,
+      },
+      title: { color: theme.colors.foreground },
+      detail: { color: theme.colors.foregroundMuted },
+    }),
+    [theme, layout.compact],
+  );
+  return (
+    <View style={styles.screen}>
+      <Text style={styles.title}>{host.label}</Text>
+      <Text style={styles.detail}>{layout.platform}</Text>
+    </View>
+  );
+}
+```
+
+`index.client.tsx`:
+
+```tsx
+import type { PluginClientContext, PluginSidebarItemProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { Main } from "./client/main";
+
+function MainItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  return (
+    <SidebarRow
+      icon="Blocks"
+      active={currentScreen?.screenId === "main"}
+      onPress={() => openScreen({ screenId: "main" })}
+    />
+  );
+}
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({ id: "main", title: "My plugin", Component: Main });
+  client.addSidebarHeaderItem({ id: "main", title: "My plugin", Component: MainItem });
+  return () => {};
+}
+```
+
+`PluginScreenProps` contains:
+
+| Field        | Meaning                                                                                                                                                                                                                                                                                                                           |
+| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `theme`      | Typed `PluginTheme` color tokens for the active Paseo theme.                                                                                                                                                                                                                                                                      |
+| `host`       | Selected host `id` and display `label`.                                                                                                                                                                                                                                                                                           |
+| `layout`     | `compact` and the `ios`, `android`, or `web` platform.                                                                                                                                                                                                                                                                            |
+| `params`     | The params the screen was opened with, as string keys and values. `{}` when none.                                                                                                                                                                                                                                                 |
+| `navigation` | Optional client navigation. `openAgent({ agentId, serverId? })` and `openWorkspace({ workspaceId, serverId? })` open targets on `serverId`, or on the selected host when omitted. `openBrowser({ url, workspaceId, serverId? })` is available only on Electron; see [links and browsers](#external-links-and-workspace-browsers). |
+
+Paseo owns the route, header, close action, host picker, error boundary, and query client. The plugin owns the screen body.
+
+`addScreen({ id, title, Component })` registers a screen. `title` is the screen header's title: a
+string, or a function that takes the screen's params and returns one, so a bot screen can show the
+bot's name. The function runs again when the params change. Registration throws on an empty title
+or one that is neither a string nor a function. A title function that throws or returns an empty
+string shows the screen ID instead; the screen still renders.
+
+`openScreen({ screenId, params })` opens a screen with params, such as the bot a bot screen shows.
+Params live in the screen's URL query, so a reload, back and forward, and a link to the screen keep
+them. Any string key works; values must be strings, and anything else throws. Opening the same
+screen with other params shows the new params.
+
+### Sidebar items
+
+`addSidebarHeaderItem` adds a row to the list at the top of the sidebar. `addSidebarFooterItem`
+adds a row to the footer, between **Add project** and the footer's icon row. The icon row is fixed;
+plugins can't add to it. Both take `{ id, title, Component }`. `title` labels the item in
+Settings > Sidebar, where users reorder and hide items, and is the default label and accessibility
+label of `SidebarRow`. Settings shows a generic plugin icon for these items; a row from the
+deprecated `addSidebarItem` keeps its registered icon.
+
+With the plugin on several hosts, an item renders from the host of the screen the app shows. Off a
+host's screens, it uses the host last picked in one of the plugin's screens or last opened from one
+of its items, else the first host.
+
+`Component` receives `PluginSidebarItemProps`:
+
+| Field                     | Meaning                                                                                       |
+| ------------------------- | --------------------------------------------------------------------------------------------- |
+| `theme`, `host`, `layout` | As in `PluginScreenProps`.                                                                    |
+| `currentScreen`           | `{ screenId, params }` of this plugin's screen open on the item's host, or `null`.            |
+| `openScreen(input)`       | Opens one of this plugin's screens: `{ screenId, params? }`. Unknown screen IDs throw.        |
+| `openPopover(Content)`    | Opens `Content` anchored to the pressed row on wide layouts and as a bottom sheet on compact. |
+
+`Content` receives `theme`, `host`, `layout`, `close()`, and `openScreen(input)`. Opening a screen
+closes the popover.
+
+Render the item with the sidebar kit from `@getpaseo/plugin/client/ui`:
+
+| Component          | Props and behavior                                                                                                                                                                                                                                                                                                    |
+| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `SidebarRow`       | Required `onPress`; optional `icon` (Lucide name or `{ size, color }` component), `label`, `active`, `trailing`, `id`. A full-width row. `trailing` renders beside the row's pressable, so a button in it presses on its own; a press elsewhere in it presses the row. `id` tells rows of one item apart in test IDs. |
+| `SidebarSeparator` | No props. The sidebar's separator line, between groups of rows.                                                                                                                                                                                                                                                       |
+
+A popover anchors to the row that was pressed, whether the press landed on the row or on its
+`trailing` content, so a per-row "More" button opens its popover next to its own row.
+
+```tsx
+import type { PluginSidebarItemProps, PluginPopoverProps } from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
+import { Pressable, Text } from "react-native";
+
+function SyncDetails({ theme, close, openScreen }: PluginPopoverProps) {
+  return (
+    <Pressable onPress={() => openScreen({ screenId: "sync" })}>
+      <Text style={{ color: theme.colors.foreground }}>Open sync history</Text>
+    </Pressable>
+  );
+}
+
+function SyncItem({ openPopover }: PluginSidebarItemProps) {
+  return <SidebarRow icon="RefreshCw" onPress={() => openPopover(SyncDetails)} />;
+}
+
+client.addSidebarFooterItem({ id: "sync", title: "Sync", Component: SyncItem });
+```
+
+An item that throws renders nothing; the rest of the sidebar keeps working.
+
+#### Several rows in one item
+
+An item's `Component` may return a fragment, an array, or `null`, so one item can render a list
+that changes at runtime. Settings lists the item once, and it moves and hides as one block. This
+item shows a row per bot and opens the bot's screen with its ID as a param:
+
+```tsx
+import type {
+  PluginClientContext,
+  PluginScreenProps,
+  PluginSidebarItemProps,
+} from "@getpaseo/plugin/client";
+import { SidebarRow, SidebarSeparator } from "@getpaseo/plugin/client/ui";
+import { Text } from "react-native";
+import { botName, useBots } from "./client/bots";
+
+function BotScreen({ theme, params }: PluginScreenProps) {
+  return <Text style={{ color: theme.colors.foreground }}>Bot {params.botId}</Text>;
+}
+
+function BotsItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  const bots = useBots();
+  const openBotId = currentScreen?.screenId === "bot" ? currentScreen.params.botId : null;
+  return (
+    <>
+      <SidebarSeparator />
+      {bots.map((bot) => (
+        <SidebarRow
+          key={bot.id}
+          id={bot.id}
+          icon="Bot"
+          label={bot.name}
+          active={bot.id === openBotId}
+          onPress={() => openScreen({ screenId: "bot", params: { botId: bot.id } })}
+        />
+      ))}
+    </>
+  );
+}
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({
+    id: "bot",
+    title: (params) => botName(params.botId) ?? "Bot",
+    Component: BotScreen,
+  });
+  client.addSidebarHeaderItem({ id: "bots", title: "Bots", Component: BotsItem });
+  return () => {};
+}
+```
+
+#### Add and remove items at runtime
+
+`addSidebarHeaderItem` and `addSidebarFooterItem` work after the entry returns. Each returns a
+remover; the item appears and disappears without a reload:
+
+```tsx
+let removeAlerts: (() => void) | null = null;
+
+function showAlerts(client: PluginClientContext) {
+  removeAlerts ??= client.addSidebarFooterItem({
+    id: "alerts",
+    title: "Alerts",
+    Component: AlertsItem,
+  });
+}
+
+function hideAlerts() {
+  removeAlerts?.();
+  removeAlerts = null;
+}
+```
+
+## Host UI
+
+Import Paseo-owned UI from `@getpaseo/plugin/client/react-native` in client code. This example
+opens a controlled modal, renders a host icon, and confirms the action with a toast:
+
+```tsx
+import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
+import { Icon, Modal, useToast } from "@getpaseo/plugin/client/react-native";
+import { useState } from "react";
+import { Pressable, Text, View } from "react-native";
+
+export function IssueActions({ theme }: PluginSurfaceProps) {
+  const [open, setOpen] = useState(false);
+  const toast = useToast();
+
+  function saveIssue() {
+    toast.show("Issue saved", { variant: "success" });
+    setOpen(false);
+  }
+
+  return (
+    <View>
+      <Pressable accessibilityRole="button" onPress={() => setOpen(true)}>
+        <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
+          <Icon name="Pencil" size={18} color={theme.colors.foreground} />
+          <Text style={{ color: theme.colors.foreground }}>Edit issue</Text>
+        </View>
+      </Pressable>
+
+      <Modal
+        title="Edit issue"
+        icon={<Icon name="Pencil" size={18} color={theme.colors.foreground} />}
+        open={open}
+        onOpenChange={setOpen}
+      >
+        <Modal.Content>
+          <Pressable accessibilityRole="button" onPress={saveIssue}>
+            <Text style={{ color: theme.colors.foreground }}>Save</Text>
+          </Pressable>
+        </Modal.Content>
+      </Modal>
+    </View>
+  );
+}
+```
+
+### Modal
+
+`Modal` uses a bottom sheet on compact layouts and a centered dialog otherwise. The plugin owns
+the `open` state.
+
+| Prop           | Type                      | Required | Behavior                                     |
+| -------------- | ------------------------- | -------- | -------------------------------------------- |
+| `title`        | `string`                  | Yes      | Labels the modal and its visible header.     |
+| `icon`         | `ReactNode`               | No       | Renders before the title in the header.      |
+| `open`         | `boolean`                 | Yes      | Shows the modal content when `true`.         |
+| `onOpenChange` | `(open: boolean) => void` | Yes      | Receives `false` when the user dismisses it. |
+| `children`     | `ReactNode`               | Yes      | Contains `Modal.Content`.                    |
+
+`Modal.Content` owns the body below the host-rendered header:
+
+| Prop                    | Type                   | Default            | Behavior                                                                          |
+| ----------------------- | ---------------------- | ------------------ | --------------------------------------------------------------------------------- |
+| `children`              | `ReactNode`            | Required           | Body content below the header.                                                    |
+| `style`                 | `StyleProp<ViewStyle>` | —                  | Styles the full body viewport, including empty space. Use for backgrounds.        |
+| `contentContainerStyle` | `StyleProp<ViewStyle>` | Padding 24, gap 16 | Overrides the content layout. Set `padding: 0, gap: 0` for edge-to-edge rows.     |
+| `scrollable`            | `boolean`              | `true`             | The host scrolls the body. Set `false` for a bounded body with your own scroller. |
+
+A plain `Modal.Content` is already padded and scrollable. Avoid adding a second padded wrapper
+unless you want another inset. Body styles leave the host header, drag handle, and dismissal controls
+intact. The host reserves bottom safe-area space on compact native layouts; setting content padding
+to zero removes the decorative inset, not that space. Keyboard clearance is handled separately.
+
+With `scrollable={false}`, the body fills the available sheet height, and the centered dialog uses
+85% of the available height. Use `flex: 1, minHeight: 0` on your list. Default scrolling dialogs stay
+content-sized on wide layouts. Presentation follows window size, including narrow desktop windows
+and wide tablets.
+
+The close button, backdrop, platform back action, web Escape key, and compact sheet gesture dismiss
+the modal. Dismissal calls `onOpenChange(false)`; the plugin must update `open` to close it.
+
+Modal children keep the plugin runtime context. `usePaseo`, `useRpc`, `useWorkspace`, and
+`useAgent` work inside them.
+
+### Scrolling
+
+Import `ScrollView` and `FlatList` from `@getpaseo/plugin/client/react-native` when content can appear in a
+Paseo modal. They accept React Native props and refs and integrate with the sheet's gestures. Outside
+a sheet they use ordinary React Native scrolling. Do not import bottom-sheet libraries directly.
+
+Use one vertical scroll owner: either the default modal body, or your own list with
+`scrollable={false}`. A fixed-height vertical list nested inside the default scrolling body can compete
+with the sheet for gestures on Android. Horizontal scrolling can coexist with the host's vertical body.
+
+Both the default body and SDK lists share native sheet gestures: drag up to expand before scrolling;
+drag down at the top of the list to collapse or dismiss. `scrollable={false}` removes the host's scroll
+container without changing these gestures. Expand the sheet before using list methods such as
+`scrollToEnd`; the sheet locks list offsets below its largest height.
+
+```tsx
+import { FlatList, Modal } from "@getpaseo/plugin/client/react-native";
+import { Text } from "react-native";
+
+// Inside your controlled Modal:
+<Modal.Content
+  scrollable={false}
+  style={{ backgroundColor: theme.colors.surface1 }}
+  contentContainerStyle={{ padding: 0, gap: 0 }}
+>
+  <FlatList
+    style={{ flex: 1, minHeight: 0 }}
+    data={items}
+    keyExtractor={(item) => item.id}
+    renderItem={({ item }) => (
+      <Text style={{ padding: 16, color: theme.colors.foreground }}>{item.title}</Text>
+    )}
+  />
+</Modal.Content>;
+```
+
+For horizontal tabs, place `<ScrollView horizontal style={{ flexGrow: 0 }}>…</ScrollView>` inside the
+default `Modal.Content`. Keep the content's vertical scrolling on the host.
+
+### Copy and paste
+
+`copyText(text): Promise<void>` writes to the clipboard on the device running the app. Call it from a
+user action and await it before reporting success. It rejects if the platform denies copying or the
+clipboard is unavailable; browser permissions and secure-context requirements still apply.
+
+```tsx
+import { copyText, useToast } from "@getpaseo/plugin/client/react-native";
+
+// Inside your component:
+const toast = useToast();
+async function copyResult() {
+  try {
+    await copyText(result);
+    toast.show("Copied", { variant: "success" });
+  } catch {
+    toast.error("Could not copy. Select the text and use Copy.");
+  }
+}
+```
+
+Programmatic copying and native text selection are separate interactions. Use `<Text selectable>`
+for long-press selection and OS Copy. Import `TextInput` from `@getpaseo/plugin/client/react-native` for modal forms. It accepts React Native
+input props and refs, supports OS Paste, and registers focus with the native sheet so the keyboard
+can raise the form. Outside a sheet it uses the ordinary input. A plain React Native input supports
+Paste too, but does not register focus with the sheet; the keyboard can cover it. No clipboard read
+API is needed for OS Paste. Avoid DOM clipboard code in native plugins and the deprecated
+`Clipboard` export from `react-native`.
+
+The runnable [modal UI example](https://github.com/getpaseo/paseo/tree/main/plugin-examples/modal-ui)
+contains a padded form, full-width rows, a virtualized list, horizontal tabs, and a copy/paste input.
+
+### Toasts
+
+`useToast()` returns two methods:
+
+| Method                    | Behavior                                                    |
+| ------------------------- | ----------------------------------------------------------- |
+| `show(message, options?)` | Shows a toast for 2,200 ms unless `durationMs` is supplied. |
+| `error(message)`          | Shows an error toast for 3,200 ms.                          |
+
+`show` accepts these options:
+
+| Option       | Type                                                       | Default     |
+| ------------ | ---------------------------------------------------------- | ----------- |
+| `variant`    | `"default" \| "info" \| "success" \| "warning" \| "error"` | `"default"` |
+| `durationMs` | `number`                                                   | `2200`      |
+
+Showing another toast replaces the currently visible toast. An empty message is ignored.
+
+### Icons
+
+`Icon` renders a [Lucide icon](https://lucide.dev/icons/) from Paseo's installed icon set. Plugin bundles do not import
+`lucide-react-native` or `react-native-svg`.
+
+| Prop    | Type     | Required | Behavior                                        |
+| ------- | -------- | -------- | ----------------------------------------------- |
+| `name`  | `string` | Yes      | Lucide icon name. Unknown names render nothing. |
+| `size`  | `number` | No       | Icon width and height.                          |
+| `color` | `string` | No       | Icon color. Use a plugin theme token.           |
+
+## Timeline items
+
+A plugin can replace an agent timeline entry with its own data and React Native renderer. Both
+registrations are client contributions. Paseo applies the transformer while building the render
+model, including every live streaming update.
+
+```tsx
+import type { PluginClientContext, PluginTimelineItemProps } from "@getpaseo/plugin/client";
+import { Text } from "react-native";
+import { z } from "zod";
+
+const schema = z.object({ label: z.string() });
+
+function Card({ item, theme }: PluginTimelineItemProps<z.output<typeof schema>>) {
+  return <Text style={{ color: theme.colors.foreground }}>{item.data.label}</Text>;
+}
+
+export default function contribute(client: PluginClientContext) {
+  client.addTimelineTransformer({
+    id: "command-card",
+    query: { itemType: "tool_call" },
+    transform({ item, phase }) {
+      return {
+        items: [
+          {
+            type: "plugin",
+            kind: "command-card",
+            version: 1,
+            data: { label: item.name, phase },
+          },
+        ],
+      };
+    },
+  });
+  client.addTimelineRenderer({
+    kind: "command-card",
+    version: 1,
+    schema,
+    Component: Card,
+  });
+  return () => {};
+}
+```
+
+`query.itemType` is the stable, coarse selector. Inspect the selected item inside `transform` for
+provider- or tool-specific recognition. Returning `undefined` keeps the original entry. Returning
+`items` replaces it; an empty array removes it. Item `data` must be JSON-compatible. The `phase`
+input is `"streaming"` for the live assistant message, running tool calls, and loading reasoning;
+it is `"complete"` for committed or fetched messages and finished tools or reasoning.
+Assistant and reasoning callbacks receive the full accumulated text on each update, including
+paragraph separators. Paseo invokes transformers before splitting native Markdown or grouping
+tools in Overview. A claimed assistant message remains one source item throughout streaming;
+return `undefined` until recognizable if the first text is insufficient to identify it.
+Each replacement may set an optional plugin-local `id`; otherwise Paseo uses its index within that
+source item's output.
+
+Renderers receive `agentId`, `item`, `timestamp`, `theme`, `host`, and `layout`. Paseo validates
+`item.data` with the registered schema before rendering. Keep transformers synchronous and
+deterministic. Paseo memoizes results by source-item reference and derives replacement identity from
+the source row, so updates to one streaming item do not remount its renderer. Use the exported
+`useRevealedText(text, phase)` hook when a renderer should pace streaming text like Paseo's built-in
+assistant rows.
+
+### Append a timeline row from the daemon
+
+A server handler can add a plugin-owned row to canonical history:
+
+```ts
+import type { PluginHandlerContext } from "@getpaseo/plugin/server";
+
+async function publishReview(agentId: string, { paseo }: PluginHandlerContext) {
+  await paseo.agents.ref(agentId).timeline.append({
+    type: "plugin",
+    id: "review",
+    kind: "review-result",
+    version: 1,
+    data: { verdict: "ready" },
+  });
+}
+```
+
+| Field     | Type             | Required | Behavior                                                       |
+| --------- | ---------------- | -------- | -------------------------------------------------------------- |
+| `type`    | `"plugin"`       | Yes      | Selects the plugin timeline variant.                           |
+| `id`      | `string`         | Yes      | Stable plugin-local identity. Reusing it replaces the old row. |
+| `kind`    | `string`         | Yes      | Selects the registered renderer.                               |
+| `version` | positive integer | Yes      | Selects the renderer contract version.                         |
+| `data`    | JSON-compatible  | Yes      | Renderer payload, at most 64 KiB after JSON serialization.     |
+
+The daemon stamps `pluginId` from the calling plugin session and rejects this RPC from non-plugin
+sessions. The row appears live, survives timeline refetches, and keeps only the latest value for the
+same plugin and `id`. If its renderer is missing, Paseo shows the existing unavailable row. Daemons
+reject `data` over the limit rather than truncating it. Daemons that support this operation
+advertise `server_info.features.pluginTimelineItems`.
+
+## Theme and layout
+
+Plugin UI runs on desktop, browser, iOS, and Android, across every Paseo theme. `theme` is a typed `PluginTheme` mapped from the active host theme. Color and spacing must come from those props. Hardcoded colors and unstyled `Text` break when the host theme changes.
+
+Recreate styles when `theme` or `layout.compact` changes.
+
+| Key                             | Required for               | Use it for                          |
+| ------------------------------- | -------------------------- | ----------------------------------- |
+| `theme.colors.foreground`       | Every primary `Text`       | Titles and body copy                |
+| `theme.colors.foregroundMuted`  | Secondary `Text`           | Labels and supporting copy          |
+| `theme.colors.surface0`         | Root view                  | Panel background                    |
+| `theme.colors.surface1`         | Raised surfaces            | Cards and panels                    |
+| `theme.colors.surface2`         | Control surfaces           | Inputs and secondary controls       |
+| `theme.colors.border`           | Surface boundaries         | Borders and dividers                |
+| `theme.colors.accent`           | Primary action fills       | Buttons and selected states         |
+| `theme.colors.accentForeground` | Text on an accent fill     | Button labels                       |
+| `theme.colors.statusSuccess`    | Success feedback           | Success messages and indicators     |
+| `theme.colors.statusWarning`    | Warning feedback           | Warning messages and indicators     |
+| `theme.colors.statusDanger`     | Failure copy               | Error messages and destructive text |
+| `layout.compact`                | Padding and stacking       | `true` on mobile and narrow windows |
+| `layout.platform`               | Platform-specific behavior | `ios`, `android`, or `web`          |
+
+Do not hardcode `#000`, `#fff`, or React Native's default text color. Primary copy uses `foreground`. Labels use `foregroundMuted`. Tighten padding when `layout.compact` is true.
+
+Workspace and agent panels receive the same `theme`, `layout`, and optional `navigation` fields.
+
+## Contribute a theme
+
+`addTheme` adds a light or dark theme to Settings → Appearance, listed under the built-ins by its
+`name`. A theme is data, so it needs no component file:
+
+```ts
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+
+export default function contribute(client: PluginClientContext) {
+  client.addTheme({
+    id: "mocha",
+    name: "Catppuccin Mocha",
+    appearance: "dark",
+    colors: {
+      background: "#1e1e2e",
+      foreground: "#cdd6f4",
+      raised: "#313244",
+      control: "#45475a",
+      border: "#45475a",
+      accent: "#cba6f7",
+      mutedForeground: "#a6adc8",
+      ring: "#6c7086",
+    },
+  });
+  return () => {};
+}
+```
+
+Every color is a hex string; anything else fails to load. Paseo expands the palette into the full
+token set the built-in dark themes use, so a contributed theme covers panels, menus, diffs, status
+colors, and the terminal without listing them.
+
+| Color             | Becomes                                                           |
+| ----------------- | ----------------------------------------------------------------- |
+| `background`      | App, workspace, and terminal background                           |
+| `foreground`      | Primary text, terminal foreground and cursor                      |
+| `raised`          | Cards, popovers, and hovered rows                                 |
+| `control`         | Inputs, secondary fills, and the light-theme sidebar              |
+| `border`          | Borders and the highest raised-surface tint                       |
+| `accent`          | Buttons, selection, and focus. Optional; `foreground` if omitted. |
+| `mutedForeground` | Secondary text                                                    |
+| `ring`            | Focus rings, scrollbars, and terminal bright black                |
+
+`appearance` is `"light"` or `"dark"`. Paseo uses it to select the matching surface, status,
+diff, syntax, terminal, and shadow derivation.
+
+Only one contributed theme is active at a time. Selecting one persists the choice; if the plugin is
+later disabled or removed, Paseo falls back to the default theme rather than leaving the app
+unpainted.
+
+Themes need a host that supports them. A client released before `addTheme` cannot evaluate that client entry and reports
+`client.addTheme is not a function`. Update the client.
+
+## Settings screens
+
+Register a component with `client.addSettingsScreen({ id, title, icon, Component })` in
+`index.client.tsx`. It appears under **Settings → Plugins → your plugin** on that host.
+`id` is unique within the installation; `icon` is a Lucide name. Registration returns an
+idempotent remover, and plugin teardown removes remaining screens.
+
+Call `client.openSettings(id)` or a Command Center callback's `openSettings(id)` to open one
+of your own screens. Each installation has its own values and route, even when several hosts
+install the same plugin.
+
+The component receives `PluginSurfaceProps`. Paseo owns the header, back navigation, safe areas,
+scrolling, and the centered settings column. Compact windows push a full-screen detail; wide
+windows keep the settings sidebar. Render content inside that frame using React Native components.
+A disabled or removed plugin leaves an unavailable screen with working Back navigation.
+
+### Named UI components
+
+Import settings components from `@getpaseo/plugin/client/ui`. They work with your own state and RPCs;
+no form wrapper or storage binding is required.
+
+```tsx
+import { useState } from "react";
+import { SettingsCard, SettingsSection, SettingsSwitch } from "@getpaseo/plugin/client/ui";
+
+export function DisplaySettings() {
+  const [visible, setVisible] = useState(true);
+  return (
+    <SettingsSection title="Display">
+      <SettingsCard>
+        <SettingsSwitch label="Show metadata" value={visible} onValueChange={setVisible} />
+      </SettingsCard>
+    </SettingsSection>
+  );
+}
+```
+
+| Component                          | Props and behavior                                                                                                                       |
+| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `SettingsGroup`, `SettingsSection` | Required `title`, `children`; optional `info` tooltip, `trailing` content, `testID`. Own section spacing and headings.                   |
+| `SettingsCard`                     | `children`, optional `testID`. Owns the card surface and dividers between direct children. Give mapped rows stable React keys.           |
+| `SettingsRow`                      | Required `label`; optional `hint`, `error`, `children`, `testID`. Wrap any custom control or content.                                    |
+| `SettingsSwitch`                   | Row props plus required `value: boolean`, `onValueChange`; optional `disabled`.                                                          |
+| `SettingsSelect`                   | Row props plus required string `value`, `options: { label, value }[]`, `onValueChange`; optional `disabled`. Uses Paseo's adaptive menu. |
+| `SettingsInput`                    | Row props plus required `onChangeText`; optional `initialValue`, `placeholder`, `disabled`, `secureTextEntry`, `ref`.                    |
+| `SettingsAction`                   | Row props plus required `actionLabel`, `onPress`; optional `disabled`.                                                                   |
+
+`SettingsInput` owns in-progress text. `initialValue` seeds it when mounted. Its ref exposes
+`focus()`, `blur()`, `getText()`, and `replaceText(text)` for explicit programmatic changes.
+Keep draft text outside persisted values until the user saves. Custom previews and controls
+can sit beside or inside these components.
+
+### Persisted values
+
+Define a settings document in `shared/`:
+
+```ts
+import { defineSettings } from "@getpaseo/plugin";
+import { z } from "zod";
+
+export const preferences = defineSettings({
+  id: "display",
+  scope: "host",
+  version: 1,
+  schema: z.object({ showMetadata: z.boolean().default(true) }),
+});
+```
+
+Register it in `index.server.ts` before returning cleanup. The returned handle lets server code
+read the document and react to changes. A screen using its own data can remain client-only.
+
+```ts
+export default function contribute(server: PluginServerContext) {
+  const settings = server.registerSettings(preferences);
+
+  settings.subscribe((next) => {
+    if (next.status === "ready") {
+      console.log("Settings changed", next.revision);
+    }
+  });
+
+  return () => {};
+}
+```
+
+| Definition field               | Contract                                                                                                                             |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `id`                           | Lowercase identifier matching `[a-z][a-z0-9_-]*`; unique within the installation.                                                    |
+| `scope`                        | Required `"host"`. All authorized clients of that host share the document. No per-user, device-local, or cross-host synchronization. |
+| `version`                      | Required positive integer describing the schema, independent of the write revision.                                                  |
+| `schema`                       | Zod schema for JSON values. Supply defaults so parsing `{}` produces a complete document.                                            |
+| `migrate(values, fromVersion)` | Optional synchronous or asynchronous conversion from an older stored version. Its output must pass the current schema.               |
+
+Call `useSettings(preferences)` in any contributed component. It returns a discriminated state:
+
+| `status`  | Available data                                                           |
+| --------- | ------------------------------------------------------------------------ |
+| `loading` | Read is pending; do not render default values as though they were saved. |
+| `ready`   | Typed `values` and an opaque `revision`.                                 |
+| `invalid` | `error` and `revision`; stored data is preserved.                        |
+| `error`   | `error` from the read/connection.                                        |
+
+The server handle exposes `read()` and `subscribe()`. `read()` returns the same `ready` or
+`invalid` state as the client hook, including the opaque revision. `subscribe()` returns a cleanup
+function and receives a new `ready` state after a successful save, reset, or migration. Invalid
+writes and revision conflicts do not notify subscribers. Listener failures are logged without
+turning a committed write into a failed save.
+
+```ts
+const current = await settings.read();
+if (current.status === "ready") {
+  // Use current.values and current.revision.
+}
+```
+
+Every state also exposes `saving`, `saveError`, and these actions:
+
+- `save(values, revision): Promise<boolean>` validates and saves a complete document. Returns
+  `false` and sets `saveError` on validation, conflict, or transport failure; it does not throw.
+- `reset(): Promise<boolean>` explicitly replaces the document with schema defaults, using the
+  revision loaded by the hook. It can recover invalid stored data.
+- `reload(): Promise<void>` clears the save error and reads again. Your component owns its draft;
+  reloading does not discard that draft automatically.
+
+For an immediate toggle, pass `{ ...settings.values, showMetadata }` and `settings.revision`
+to `save`. For a draft editor, capture both the values and revision when opening it. Keep that
+revision until a save succeeds or the user discards the draft. A stale revision rejects the
+save, preserving both the draft and the newer saved values.
+
+Writes are atomic and validated on the host. Connected clients receive updates without reloading
+the plugin. Values survive daemon restart, plugin reload, disable, and updates. Removing an
+installation deletes its settings. Reinstalling that ID starts from defaults.
+
+A missing document uses schema defaults. Invalid data, failed migrations, and unsupported newer
+versions produce `invalid` without silently resetting the file. Successful migrations persist
+the new version once. These documents are ordinary host-side JSON, not a credential vault.
+Settings RPCs use the existing `daemon.manage` permission for plugin execution.
+
+See the complete [settings example](https://github.com/getpaseo/paseo/tree/main/plugin-examples/settings)
+for immediate controls, a draft editor with validation, custom content, and Command Center navigation.
+
+## Workspace panels
+
+Register one panel for workspace or agent context:
+
+`client/review.tsx`:
+
+```tsx
+import { type PluginAgentPanelProps, useAgent, useWorkspace } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+
+export function ReviewPanel({ theme, layout, workspaceId, agentId }: PluginAgentPanelProps) {
+  const workspaceName = useWorkspace(workspaceId, (workspace) => workspace.name);
+  const agent = useAgent(agentId, ({ id, title }) => ({ id, title }));
+  const styles = useMemo(
+    () => ({
+      screen: {
+        flex: 1,
+        padding: layout.compact ? 16 : 24,
+        backgroundColor: theme.colors.surface0,
+      },
+      title: { color: theme.colors.foreground },
+      detail: { color: theme.colors.foregroundMuted },
+    }),
+    [theme, layout.compact],
+  );
+  return (
+    <View style={styles.screen}>
+      <Text style={styles.title}>{workspaceName}</Text>
+      <Text style={styles.detail}>{agent?.title ?? agent?.id}</Text>
+    </View>
+  );
+}
+```
+
+`index.client.tsx`:
+
+```ts
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { ReviewPanel } from "./client/review";
+
+export default function contribute(client: PluginClientContext) {
+  client.addWorkspacePanel({
+    id: "review",
+    title: "Review",
+    icon: "Scan",
+    context: "agent",
+    locations: ["workspace", "explorer"],
+    Component: ReviewPanel,
+  });
+  return () => {};
+}
+```
+
+`addWorkspacePanel` fields:
+
+| Field       | Required | Meaning                                                       |
+| ----------- | -------- | ------------------------------------------------------------- |
+| `id`        | Yes      | Plugin-local panel ID.                                        |
+| `title`     | Yes      | Workspace-tab title.                                          |
+| `icon`      | Yes      | Lucide icon name.                                             |
+| `context`   | Yes      | `workspace` or `agent`.                                       |
+| `locations` | No       | `workspace` and/or `explorer`. Defaults to `workspace`.       |
+| `Component` | Yes      | React Native component matching the selected context's props. |
+
+A workspace panel receives `PluginWorkspacePanelProps`: `context: "workspace"`, `theme`, `host`, `layout`, and `workspaceId`. An agent panel receives `PluginAgentPanelProps`: `context: "agent"`, the same common fields and `workspaceId`, plus `agentId`.
+
+Read cached state with `useWorkspace(workspaceId, selector)` and `useAgent(agentId, selector)`. A selector is required. Paseo compares its result shallowly, so selecting `{ name, status }` does not re-render when unrelated fields change. Select every field the component renders in one call; do not select the whole snapshot.
+
+Both hooks return `null` when the record is unavailable. Otherwise they run synchronously against normalized client state. Snapshot DTOs and their nested values are deeply readonly and frozen at runtime. Do not call plugin RPC to discover the current workspace or agent. Fetch optional or vendor-specific enrichment after the component renders.
+
+Workspace snapshot fields:
+
+| Field                | Type                                                              |
+| -------------------- | ----------------------------------------------------------------- |
+| `id`                 | `string`                                                          |
+| `projectId`          | `string`                                                          |
+| `projectDisplayName` | `string`                                                          |
+| `projectRootPath`    | `string`                                                          |
+| `directory`          | `string`                                                          |
+| `projectKind`        | `"git" \| "non_git" \| "directory"`                               |
+| `kind`               | `"directory" \| "local_checkout" \| "checkout" \| "worktree"`     |
+| `name`               | `string`                                                          |
+| `title`              | `string \| null`                                                  |
+| `status`             | `"needs_input" \| "failed" \| "running" \| "attention" \| "done"` |
+| `statusEnteredAt`    | ISO timestamp or `null`                                           |
+| `archivingAt`        | ISO timestamp or `null`                                           |
+| `diffStat`           | `{ additions: number; deletions: number } \| null`                |
+
+Agent snapshot fields:
+
+| Field               | Type                                                           |
+| ------------------- | -------------------------------------------------------------- |
+| `id`                | `string`                                                       |
+| `workspaceId`       | `string`                                                       |
+| `provider`          | `string`                                                       |
+| `status`            | `"initializing" \| "idle" \| "running" \| "error" \| "closed"` |
+| `createdAt`         | ISO timestamp                                                  |
+| `updatedAt`         | ISO timestamp                                                  |
+| `lastActivityAt`    | ISO timestamp                                                  |
+| `title`             | `string \| null`                                               |
+| `cwd`               | `string`                                                       |
+| `model`             | `string \| null`                                               |
+| `currentModeId`     | `string \| null`                                               |
+| `thinkingOptionId`  | `string \| null`                                               |
+| `requiresAttention` | `boolean`                                                      |
+| `attentionReason`   | `"finished" \| "error" \| "permission" \| null`                |
+| `parentAgentId`     | `string \| null`                                               |
+| `labels`            | `Record<string, string>`                                       |
+
+Paseo owns tab focus, splitting, closing, persistence, query state, the API/RPC providers, and the render error boundary. A restored tab whose plugin, panel, context, workspace, or agent is unavailable stays open with an unavailable message instead of crashing the workspace.
+
+## Command Center items
+
+Open the Command Center with **⌘K** on macOS or **Ctrl+K** on Windows and Linux, then search for the item title.
+
+Register an action and open a panel from the callback:
+
+```tsx
+import { defineRpc } from "@getpaseo/plugin";
+import { z } from "zod";
+
+const refreshReview = defineRpc({
+  name: "review.refresh",
+  input: z.object({ agentId: z.string(), scope: z.string().optional() }),
+  output: z.object({ refreshed: z.boolean() }),
+});
+
+client.addCommandCenterItem({
+  id: "open-review",
+  title: "Open review",
+  icon: "Scan",
+  keywords: ["inspect"],
+  context: "agent",
+  async onSelect({ paseo, rpc, workspace, agent, openPanel }) {
+    await paseo.workspaces.ref(workspace.id).setTitle(`Review ${agent.id}`);
+    await rpc(refreshReview, { agentId: agent.id });
+    openPanel("review");
+  },
+});
+```
+
+`addCommandCenterItem` fields:
+
+| Field      | Required | Meaning                                        |
+| ---------- | -------- | ---------------------------------------------- |
+| `id`       | Yes      | Plugin-local item ID.                          |
+| `title`    | Yes      | Search result title.                           |
+| `icon`     | Yes      | Lucide icon name.                              |
+| `keywords` | No       | Additional Command Center search terms.        |
+| `context`  | Yes      | `global`, `workspace`, or `agent`.             |
+| `onSelect` | Yes      | Client-side callback for the matching context. |
+
+Global items appear on the installation's selected host. Workspace items appear only when that host has an active cached workspace. Agent items appear only when the focused workspace tab is an agent or an agent-context plugin panel whose cached record belongs to that workspace. Missing context removes the item rather than calling the plugin to discover it.
+
+Every callback receives:
+
+| Field                     | Context             | Meaning                                                                                                         |
+| ------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------- |
+| `context`                 | All                 | Matching discriminator.                                                                                         |
+| `paseo`                   | All                 | Selected host's existing `PaseoApi`.                                                                            |
+| `rpc(contract, input)`    | All                 | Typed call to this installation's daemon-side plugin handler.                                                   |
+| `openScreen(input)`       | All                 | Opens one of this plugin's registered screens: `{ screenId, params? }`.                                         |
+| `workspace`               | Workspace and agent | Synchronous workspace snapshot.                                                                                 |
+| `agent`                   | Agent               | Synchronous matching agent snapshot.                                                                            |
+| `openPanel(id, options?)` | Workspace and agent | Opens a registered panel in the callback's current context. Pass `{ location: "explorer" }` to target Explorer. |
+
+An agent callback may open either an agent panel or a workspace panel. A workspace callback may open only a workspace panel. Unknown screen and panel IDs fail visibly. Use `paseo` for normal workspace, agent, provider, and daemon-config operations. Use `rpc` for plugin-specific filesystem, credential, vendor, or daemon-local work.
+
+## Slash commands
+
+Register a command that runs in the Paseo client when the user submits `/name args` from the
+message composer. The text is never sent to the agent:
+
+```ts
+client.addSlashCommand({
+  name: "review",
+  description: "Run the review bot",
+  argumentHint: "[scope]",
+  context: "agent",
+  async onSubmit({ args, agent, rpc, openPanel }) {
+    await rpc(refreshReview, { agentId: agent.id, scope: args });
+    openPanel("review");
+  },
+});
+```
+
+| Field          | Required | Meaning                                        |
+| -------------- | -------- | ---------------------------------------------- |
+| `name`         | Yes      | Command name without the leading slash.        |
+| `description`  | Yes      | Composer autocomplete description.             |
+| `argumentHint` | Yes      | Short usage hint shown after the command name. |
+| `context`      | Yes      | `"workspace"` or `"agent"`.                    |
+| `onSubmit`     | Yes      | Client callback for the matching context.      |
+
+`onSubmit` receives the matching Command Center callback context plus `args`. For `/review src`,
+`args` is `"src"`; Paseo trims only the remainder's leading and trailing whitespace and leaves
+parsing to the plugin. Paseo owns the autocomplete row, input clearing, and the error toast. It
+does not wait for `onSubmit` or show a pending state; use a composer pill or panel for that.
+
+Precedence is built-in client commands, plugin commands, then provider commands. A lower-precedence
+collision is omitted. Built-in aliases also reserve their names. The first plugin in stable catalog
+order wins a collision between plugins. Commands do not run while the composer has attachments.
+
+## Header buttons
+
+Try the [button example](https://github.com/getpaseo/paseo/tree/main/plugin-examples/buttons) for
+actions, menus, custom icons and content, and visibility updates in both the header and composer.
+It switches one header button between modes; additional actions use a named Tools menu.
+
+`client.addHeaderButton({ id, workspaceId, button })` adds a button before the built-in actions on
+the workspace header's right side. It returns a registration with `update(patch)` and `remove()`.
+
+```tsx
+const review = client.addHeaderButton({
+  id: "review",
+  workspaceId,
+  button: {
+    title: "Open review",
+    icon: "Scan",
+    label: "Review",
+    behavior: {
+      kind: "action",
+      onPress() {
+        client.openPanel("review", { workspaceId });
+      },
+    },
+  },
+});
+
+review.update({ label: "Review · 3" });
+review.update({ visible: false });
+review.update({ visible: true });
+review.remove();
+```
+
+Omit `label` for an icon-only header button. Menus and popovers show a chevron on wide layouts.
+Compact header buttons use icons without labels or chevrons. Paseo moves excess contributions
+into a shared overflow menu. Placement and overflow are host decisions.
+
+## Composer pills
+
+`client.addComposerPill({ id, workspaceId, agentId, button })` uses the same [button descriptor](#button-descriptor)
+and returns the same registration. It targets one agent's composer track alongside Tasks and
+Subagents. Composer pills always show the icon and `label` (or `title` when `label` is omitted).
+They never show a chevron, including for menus and popovers.
+
+```tsx
+const pill = client.addComposerPill({
+  id: "review",
+  workspaceId,
+  agentId,
+  button: {
+    title: "Open review",
+    icon: "Scan",
+    label: "Review",
+    behavior: {
+      kind: "action",
+      onPress() {
+        client.openPanel("review", { workspaceId, agentId });
+      },
+    },
+  },
+});
+```
+
+For pills that follow the agent directory, use an explicit [owned list subscription](/docs/sdk/events#follow-one-agents-status).
+The [local plugin example](https://github.com/getpaseo/paseo/blob/main/plugin-examples/local-plugin/client/main.tsx)
+replaces registrations on each snapshot and aborts the observation during entry cleanup, including pending bootstrap.
+
+## Button descriptor
+
+These contracts are exported from `@getpaseo/plugin/client`.
+
+| Field      | Required | Meaning                                                                 |
+| ---------- | -------- | ----------------------------------------------------------------------- |
+| `title`    | Yes      | Non-empty accessible label, tooltip, and sheet title.                   |
+| `icon`     | Yes      | Lucide name or `ComponentType<PluginButtonIconProps>`.                  |
+| `label`    | No       | Non-empty display text. Omit to use the placement's default.            |
+| `visible`  | No       | Defaults to `true`. False removes the trigger and its layout space.     |
+| `disabled` | No       | Defaults to `false`. Keeps the button visible and prevents interaction. |
+| `behavior` | Yes      | One of the three shapes below.                                          |
+
+```tsx
+type PluginButtonBehavior =
+  | { kind: "action"; onPress(): void | Promise<void> }
+  | { kind: "menu"; items: readonly PluginButtonMenuEntry[] }
+  | { kind: "popover"; Content: React.ComponentType<PluginButtonContentProps> };
+```
+
+An action runs on the client. Paseo marks the button busy until its promise settles, blocks repeated
+presses, and shows failures in a toast. A failed action can be retried. Use the client's `paseo` for
+ordinary operations and `rpc` for plugin-specific backend work.
+
+Menus and popovers open anchored surfaces on wide layouts and bottom sheets on compact layouts.
+The whole trigger opens the surface; there is no split-button behavior.
+
+### Menu entries
+
+A menu contains items and separators. IDs use lowercase letters, digits, and hyphens, start with
+a letter, and are unique within that menu.
+
+```tsx
+const behavior: PluginButtonBehavior = {
+  kind: "menu",
+  items: [
+    {
+      kind: "item",
+      id: "refresh",
+      title: "Refresh review",
+      icon: "RefreshCw",
+      behavior: { kind: "action", onPress: refreshReview },
+    },
+    { kind: "separator", id: "details-divider" },
+    {
+      kind: "item",
+      id: "details",
+      title: "Review details",
+      behavior: { kind: "popover", Content: ReviewDetails },
+    },
+  ],
+};
+```
+
+An item requires `kind: "item"`, `id`, `title`, and `behavior`. Its optional `icon`, `visible`, and
+`disabled` follow the button rules. A separator contains only `kind: "separator"` and `id`.
+Paseo removes leading, trailing, and consecutive separators after filtering hidden items.
+
+Items can use all three behaviors. Nested menus open flyouts on wide layouts and pages with back
+navigation within the same compact sheet. Custom content pages open on selection, never hover.
+Choosing an action closes the menu; opening another page keeps it open.
+
+### Custom icons and popover content
+
+`PluginButtonIconProps` contains `theme`, `host`, `layout`, `size`, `color`, and the target context.
+Render a React Native icon or indicator within the supplied size. Paseo bounds the icon slot and
+owns all pointer interaction. The icon component can use plugin hooks.
+
+`PluginButtonContentProps` contains `theme`, `host`, `layout`, the target context, and `close()`.
+Render the body only; Paseo owns anchoring, scrolling, padding, and sheet presentation. Content can
+use `usePaseo`, `useRpc`, `useWorkspace`, `useAgent`, and the installation's React Query cache.
+
+The target context is one of:
+
+```ts
+{ context: "workspace", workspaceId: string } // Header button
+{ context: "agent", workspaceId: string, agentId: string } // Composer pill
+```
+
+### Updates and lifecycle
+
+Each registration belongs to one plugin installation, placement, workspace, and (for pills) agent.
+`id` is plugin-local within that target and uses the same format as menu IDs. The same ID may be
+used in different targets or placements. Duplicate registration in the same target throws.
+
+`update(patch: Partial<PluginButton>)` changes the descriptor in place, preserving identity and
+order. When changing `behavior`, supply the complete new behavior object. Invalid updates throw
+without changing the existing button. Subscribe to your own model or the client API and call
+`update` to publish reactive changes; mutating the original descriptor does not update the UI.
+
+Hiding or disabling a button closes its surface. Updating its behavior also closes the surface.
+Hiding preserves the registration, so showing it again restores its position. It does not cancel
+an action already in progress.
+
+`remove()` is idempotent. Updates after removal do nothing. Paseo removes outstanding buttons when
+the plugin installation or host connection is torn down. Return cleanup from the client entry for
+your subscriptions, timers, and other resources.
+
+## Use the Paseo SDK
+
+Use `usePaseo()` for ordinary Paseo operations from a surface. It borrows the selected host's existing connection; do not create another client.
+
+`usePaseo()` is your plugin's one Paseo client, the same `client.paseo` your setup receives, in
+every surface. Release what you subscribe to in your cleanup; when the plugin is disabled, reloaded,
+or removed, or its host goes away, Paseo disposes the client and ends every subscription still open.
+
+```tsx
+import { usePaseo } from "@getpaseo/plugin/client";
+import { useEffect, useState } from "react";
+import { Text } from "react-native";
+
+function ProjectChanges() {
+  const paseo = usePaseo();
+  const [changes, setChanges] = useState(0);
+  useEffect(() => {
+    const observation = paseo.observeEvents(["project.update"]);
+    observation.subscribe({ snapshot() {}, update: () => setChanges((count) => count + 1) });
+    return () => void observation.release();
+  }, [paseo]);
+  return <Text>{changes} project changes</Text>;
+}
+```
+
+```tsx
+import { type PluginSurfaceProps, usePaseo } from "@getpaseo/plugin/client";
+import { Pressable, Text } from "react-native";
+
+function PullRequestAction({ theme }: PluginSurfaceProps) {
+  const paseo = usePaseo();
+
+  async function createReviewWorkspace() {
+    const workspace = await paseo.workspaces.create({
+      title: "Review PR 42",
+      source: {
+        kind: "worktree",
+        cwd: "/absolute/path/to/repository",
+        action: "checkout",
+        checkoutSource: { kind: "change_request", forge: "github", number: 42 },
+      },
+    });
+    await workspace.agents.create({
+      config: { provider: "codex/gpt-5.5" },
+      prompt: "Review PR #42.",
+    });
+  }
+
+  return (
+    <Pressable accessibilityRole="button" onPress={() => void createReviewWorkspace()}>
+      <Text style={{ color: theme.colors.foreground }}>Create review workspace</Text>
+    </Pressable>
+  );
+}
+```
+
+The returned API covers projects, workspaces, agents, terminals, providers, and daemon config. See the [SDK API reference](/docs/sdk/reference) for its methods. Connection lifecycle methods are intentionally absent because Paseo owns the connection.
+
+### Discover hosts and target another host
+
+Use `useHosts()` to display configured hosts and `getPaseoClient(serverId)` in an action callback
+to run SDK operations on one of them:
+
+```tsx
+import { getPaseoClient, useHosts, type PluginSurfaceProps } from "@getpaseo/plugin/client";
+import { useMemo, useState, type ReactElement } from "react";
+import { Pressable, Text, View } from "react-native";
+
+export function HostAgents({ theme }: Pick<PluginSurfaceProps, "theme">): ReactElement {
+  const hosts = useHosts();
+  const textStyle = useMemo(() => ({ color: theme.colors.foreground }), [theme]);
+  const [result, setResult] = useState("");
+
+  async function listAgents(serverId: string): Promise<void> {
+    try {
+      const { entries } = await getPaseoClient(serverId).agents.list();
+      setResult(`${entries.length} agents`);
+    } catch (error) {
+      setResult(error instanceof Error ? error.message : String(error));
+    }
+  }
+
+  const rows = hosts.map((host) => ({
+    host,
+    onPress() {
+      void listAgents(host.serverId);
+    },
+  }));
+
+  return (
+    <View>
+      {rows.map(({ host, onPress }) => (
+        <Pressable key={host.serverId} accessibilityRole="button" onPress={onPress}>
+          <Text style={textStyle}>
+            {host.label}: {host.status}
+          </Text>
+        </Pressable>
+      ))}
+      <Text style={textStyle}>{result}</Text>
+    </View>
+  );
+}
+```
+
+`useHosts(): readonly PluginHostSummary[]` includes offline hosts and updates when hosts,
+labels, or statuses change.
+
+| Summary field | Type or values                                               | Meaning                                                      |
+| ------------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| `serverId`    | `string`                                                     | ID to pass to `getPaseoClient`.                              |
+| `label`       | `string`                                                     | Host's display name.                                         |
+| `status`      | `"idle"`, `"connecting"`, `"online"`, `"offline"`, `"error"` | Current app connection status. SDK calls require `"online"`. |
+
+`getPaseoClient(serverId: string): PaseoApi` borrows the host's authenticated app connection.
+Call it in client entry code or callbacks; it opens no socket and does not require the plugin
+on the target daemon. Acquire the API when performing an action to use the current connection.
+
+| Event or condition                                                                       | Result and caller action                                                                                                                                        |
+| ---------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Unknown host ID                                                                          | Throws `Unknown Paseo host: <id>`; never falls through to another host.                                                                                         |
+| Host is not online                                                                       | Throws `Paseo host is disconnected: <id>`, including calls through a retained API. Retry when online.                                                           |
+| Same connection reconnects                                                               | Retained APIs remain usable after reconnection; observations resume automatically.                                                                              |
+| Connection settings change or the app switches connections, including automatic failover | The old API is released. Call `getPaseoClient(serverId)` again and recreate subscriptions.                                                                      |
+| Host is removed                                                                          | Its API is released; the removed ID is unknown.                                                                                                                 |
+| `client.dispose()`                                                                       | Releases that API and its observations. A later getter call returns a fresh API over the app connection. Disposing the old API again leaves the new API usable. |
+| Originating plugin unloads                                                               | All its borrowed APIs and observations are released, including those targeting other hosts. Retained handles cannot outlive the installation.                   |
+| Surface host selection changes                                                           | `usePaseo()` follows the selected host. An explicitly acquired API keeps its original target.                                                                   |
+
+You can also release individual subscriptions through the normal SDK API.
+
+Plugins are trusted app code; cross-host access is intentional. Summaries contain no connection
+URLs or credentials, and borrowed APIs provide no connection lifecycle controls. See the
+[host agents example](https://github.com/getpaseo/paseo/tree/main/plugin-examples/hosts).
+
+## Add plugin-specific backend behavior
+
+Use plugin RPC only for work that is not a normal Paseo operation: reading a vendor API, accessing daemon-local resources, or keeping credentials off the client.
+
+Define one contract with Zod, handle it in the subprocess, and call it from the surface:
+
+`shared/greeting.ts`:
+
+```ts
+import { defineRpc } from "@getpaseo/plugin";
+import { z } from "zod";
+
+export const greeting = defineRpc({
+  name: "greeting.create",
+  input: z.object({ name: z.string() }),
+  output: z.object({ message: z.string() }),
+});
+```
+
+`client/greeting.tsx`:
+
+```tsx
+import { useRpc } from "@getpaseo/plugin/client";
+import { greeting } from "../shared/greeting";
+
+export function GreetingButton() {
+  const createGreeting = useRpc(greeting);
+  // Call createGreeting({ name: "Ada" }) from an event or query.
+  return null;
+}
+```
+
+`server/greeting.ts`:
+
+```ts
+import type { RpcInput } from "@getpaseo/plugin";
+import { greeting } from "../shared/greeting";
+
+export function createGreeting({ name }: RpcInput<typeof greeting>) {
+  return { message: `Hello, ${name}` };
+}
+```
+
+`index.client.tsx`:
+
+```ts
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { GreetingButton } from "./client/greeting";
+
+export default function contribute(client: PluginClientContext) {
+  client.addScreen({ id: "main", title: "Greeting", Component: GreetingButton });
+  return () => {};
+}
+```
+
+`index.server.ts`:
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createGreeting } from "./server/greeting";
+import { greeting } from "./shared/greeting";
+
+export default function contribute(server: PluginServerContext) {
+  server.handle(greeting, createGreeting);
+  return () => {};
+}
+```
+
+Inputs and outputs are validated on both sides. RPC names start with a lowercase letter and contain lowercase letters, numbers, dots, hyphens, or underscores. `useRpc()` returns a typed async function. Use TanStack Query for request state, caching, and mutations.
+
+Backend handlers receive the same `PaseoApi` as `{ paseo }`. Their connection belongs to the subprocess and closes when the plugin stops. It does not subscribe to timelines or catalog events until plugin code subscribes. Follow the [SDK event contract](../../sdk/events.md) for cleanup and timeline replacements. Backend code can use Node APIs and dependencies installed in the plugin directory.
+
+## Debug backend output
+
+Backend contributions can write to stdout and stderr with normal Node logging:
+
+```ts
+console.log("Refreshing issues");
+console.error("Issue refresh failed", error);
+```
+
+Paseo adds `[paseo]` entries when the plugin starts loading, becomes ready, starts stopping, and has
+stopped. It records compilation and load failures as stderr entries, including failures that happen
+before the plugin subprocess starts. Paseo also captures output emitted during initialization, RPC
+handlers, cleanup, and process failure. Protocol traffic uses a separate channel, so `console.log()`
+cannot corrupt plugin RPCs.
+
+Open **Settings → Plugins → Logs** for the plugin, or inspect the same recent tail from the daemon
+CLI:
+
+```bash
+paseo plugin logs my-plugin
+paseo plugin logs my-plugin --json
+paseo --host <url> plugin logs my-plugin
+```
+
+The command returns a snapshot rather than following live output. Refresh the settings view or run
+the command again for newer entries. Each entry includes its timestamp, stdout or stderr stream,
+sequence, and message.
+
+Paseo retains up to 500 entries and 256 KiB per plugin in memory. Individual lines are capped at
+16 KiB. Reload, disable, compilation failure, initialization failure, and process failure retain the
+tail. Removing the plugin clears it, and a daemon restart starts a new tail. Structured copies are
+also written to the daemon log at `$PASEO_HOME/daemon.log`.
+
+Only daemon-side output is captured. Logs from client surfaces remain in the app runtime. Do not log
+credentials, access tokens, or other secrets: connected users can read the retained tail, and the
+daemon log persists it.
+
+## Add a composer attachment source
+
+An attachment source searches external resources and returns a stable text snapshot for an agent prompt. Keep credentials and vendor calls in the backend handler.
+
+`shared/issues.ts`:
+
+```ts
+import { defineAttachmentSource, defineRpc } from "@getpaseo/plugin";
+import { z } from "zod";
+
+export 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(),
+      }),
+    ),
+  }),
+});
+
+export const issues = defineAttachmentSource({
+  id: "issues",
+  title: "Acme issue",
+  icon: "CircleDot",
+  pickerTitle: "Attach Acme issue",
+  searchPlaceholder: "Search by identifier or title",
+  search: searchIssues,
+});
+```
+
+`server/issues.ts`:
+
+```ts
+import type { RpcInput } from "@getpaseo/plugin";
+import { searchIssues } from "../shared/issues";
+
+export function search({ query }: RpcInput<typeof searchIssues>) {
+  return searchAcmeIssues(query);
+}
+```
+
+`index.client.tsx`:
+
+```ts
+import type { PluginClientContext } from "@getpaseo/plugin/client";
+import { issues } from "./shared/issues";
+
+export default function contribute(client: PluginClientContext) {
+  client.addAttachmentSource(issues);
+  return () => {};
+}
+```
+
+`index.server.ts`:
+
+```ts
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { search } from "./server/issues";
+import { searchIssues } from "./shared/issues";
+
+export default function contribute(server: PluginServerContext) {
+  server.handle(searchIssues, search);
+  return () => {};
+}
+```
+
+Paseo owns the composer menu, search picker, selected pill, draft state, and submission. The `text` value is the complete snapshot sent to the agent.
+
+## Hosts and lifecycle
+
+Plugins are installed per daemon. When the same contribution exists on several connected hosts, Paseo shows one sidebar item and adds a host picker. The selected host supplies the bundle, Paseo API, RPC transport, and query cache. Calls never fall through to another host when the selected host is offline.
+
+Attachment sources remain scoped to each composer's host.
+
+Workspace panels and Command Center items stay scoped to the active host and exact cached context.
+Reload replaces their registrations. Disable, removal, host disconnect, and evaluation failure
+remove Command Center items and clear the installation's query state. An already-restored panel tab
+remains as unavailable until its matching contribution returns or the user closes it. Panel render
+failures stay inside the plugin error boundary.
+
+## Plugin sources
+
+Paste one of these source identifiers into **Settings → Plugins**, or pass it to
+`paseo plugin install`. `paseo plugin add <source>` and `paseo plugin install <source>` are aliases.
+The CLI resolves relative directory paths from your current working directory and expands `~`
+to your local home directory, preserving any `:plugin/path` suffix. With `--host`, use an absolute
+path that exists on the daemon host; plugin files are read there and are never uploaded by the CLI.
+Paths entered in Settings resolve relative to the daemon's working directory, and `~` expands to
+the daemon's home directory.
+
+| Source                     | Accepted form                                                              | Example                                       |
+| -------------------------- | -------------------------------------------------------------------------- | --------------------------------------------- |
+| Plugin registry            | `owner/slug` or `host/owner/slug`                                          | `acme/review`                                 |
+| Host directory             | Absolute or relative path on the daemon host                               | `/srv/paseo/plugins/review`                   |
+| GitHub repository          | `git:owner/repository` or `github:owner/repository`                        | `github:acme/paseo-review`                    |
+| Git repository             | `git:<URL or SCP source>`; the prefix is optional for URLs and SCP sources | `git:https://git.example.com/acme/review.git` |
+| npm package                | `npm:<name>[@<version, tag, or range>]`; `npm:` is optional                | `npm:@acme/paseo-review@^1.2.0`               |
+| Plugin below a source root | Append `:relative/plugin/path` to a directory, Git, or npm source          | `github:acme/monorepo:plugins/review`         |
+
+Git URLs use `https://`, `http://`, `ssh://`, `git://`, or `file://`. SCP sources use
+`user@host:path`. `file://` selects Git acquisition, not directory installation.
+
+npm names are lowercase unscoped `name` or scoped `@scope/name`. Each component starts with a
+letter or digit and then contains letters, digits, `.`, `_`, or `-`. After the package name, an
+optional `@` introduces an exact version, distribution tag, or npm semver range. Omitting it means
+`latest`. Quote shell arguments containing spaces or comparison operators. npm aliases, tarball
+URLs, and npm's `file:` specifications are not plugin source identifiers; use a directory or Git
+source for those locations. Use the `npm:` prefix for an unscoped package with both a selector
+and subdirectory (`npm:review@1.2.0:nested`); without it, `user@host:path` is an SCP Git source.
+The package registry validates the selected version, tag, or range.
+
+Paseo resolves an identifier in this order:
+
+1. A bare `owner/slug` is a registry id; local directory sources are `.` or `..`, or start with `./`, `../`, `.\`, `..\`, `/`, `~`, a Windows drive (`C:\` or `C:/`), or a UNC (`\\server\share`) prefix.
+2. Otherwise, recognize `npm:`, `github:`, or `git:` before interpreting a subdirectory suffix.
+   `git://` is a Git URL scheme. An explicit prefix selects acquisition of that kind.
+3. Recognize a final `:relative/plugin/path` only when its suffix contains no empty, `.` or `..`
+   segments. A lone `.` selects the source root. Both `/` and `\` separate suffix segments; use `/`
+   across hosts. URL ports and the separator in an SCP source stay part of the source. A suffix
+   that does not satisfy these rules stays part of the identifier.
+4. Resolve bare `owner/slug` through the default plugin registry and `host/owner/slug` through
+   that registry host. Resolve Git URLs and SCP sources as Git. `github:` requires
+   `owner/repository` shorthand; `git:` accepts it as well as URLs and SCP sources.
+5. Resolve a remaining npm package name with its optional selector through the host's registry.
+   Reject anything else.
+
+The default registry is `https://plugins.paseo.sh`. Browse [published plugins](https://paseo.sh/plugins)
+and install with `paseo plugin add owner/slug`. Registry records own the revision and plugin path.
+Use `git:owner/repository` for explicit GitHub shorthand or a full Git URL.
+Set `PASEO_PLUGIN_REGISTRY` to use a self-hosted default URL, including a path prefix.
+Private registry credentials use `pluginRegistries: { "host": { "authorization": "Bearer token" } }`
+in daemon config. Restart the daemon after changing these startup settings. Credentials go only
+to that registry, never to artifact hosts or redirects. Installed plugins retain their recorded
+source and registry URL when defaults change.
+
+Directory lookup happens on the daemon host. The app uses the `paseo-plugin.json` ID; the CLI
+accepts `--id <runtime-id>` to override it. An existing installation ID is rejected without changing
+its enabled state or files.
+
+```bash
+paseo plugin install /srv/paseo/plugins/review
+paseo plugin install github:acme/paseo-review
+paseo plugin install git:https://git.example.com:8443/acme/monorepo.git:plugins/review --ref main
+paseo plugin install git@git.example.com:acme/review.git
+paseo plugin install file:///srv/repos/monorepo:plugins/review
+paseo plugin install npm:paseo-review@1.2.0
+paseo plugin install npm:@acme/paseo-review@next
+paseo plugin install 'npm:@acme/paseo-review@>=1.2.0 <2.0.0' --id review-staging
+paseo plugin install npm:@acme/plugins@^1.2.0:plugins/review
+```
+
+`--ref` applies only to Git and accepts a branch, tag, or commit for this installation. Without it,
+Paseo installs the remote's default HEAD. Installation selectors do not constrain later updates. The legacy
+`--path relative/plugin/path` option is equivalent to a subdirectory suffix, including for npm.
+
+### npm installation and publishing
+
+Install Node.js with npm on the **daemon host** and make `npm` available on the daemon's `PATH`.
+The daemon uses that host's npm user/global configuration and environment for registry selection
+and authentication, including scope-specific registries. The client does not download packages or
+run npm. Loading, enabling, and reloading an installed plugin do not need npm.
+
+The daemon installs each candidate and its production dependencies in an isolated directory. It
+keeps the complete dependency tree and `package-lock.json` when activating it. The installed
+package and lockfile provide its current version and artifact integrity. A version, tag, or range
+chooses content for this installation only.
+
+For package contents, dependencies, preparation, and private registries, see
+[Publish a plugin](/docs/plugins/publishing).
+
+A failed download, dependency installation, manifest check, preparation command, compilation, or
+activation discards the candidate. Other installed plugins keep running. Removing an npm plugin
+deletes its managed files; removing a directory plugin keeps your source directory.
+
+## CLI reference
+
+```bash
+paseo plugin init /absolute/path/to/plugin
+paseo plugin install /absolute/path/to/plugin
+paseo plugin install /absolute/path/to/plugin --id another-runtime-id
+paseo plugin add owner/slug
+paseo plugin add git:owner/repository
+paseo plugin add https://git.example.com/owner/repository.git --ref main
+paseo plugin add git:owner/monorepo:plugins/review
+paseo plugin ls [id]
+paseo plugin update <id>
+paseo plugin update --all --check
+paseo plugin update --all --yes
+paseo plugin update my-plugin --version 1.2.0
+paseo plugin update my-plugin --ref v2
+paseo plugin reload my-plugin
+paseo plugin logs my-plugin
+paseo plugin disable my-plugin
+paseo plugin enable my-plugin
+paseo plugin remove my-plugin
+```
+
+`ls` and Settings show source identity and the current installed revision without contacting the
+remote. Identity includes the selected subdirectory and excludes installation selectors.
+
+`update <id>` checks for an update, shows the current and proposed revision with available review
+links, and asks for approval. Declining leaves the installed content unchanged.
+
+- npm checks the package's `latest` version. It offers only a newer version; an installed version
+  newer than latest stays installed. Host npm registry/auth configuration governs resolution.
+- Git checks the remote's current default HEAD, regardless of the branch, tag, or commit selected
+  during installation.
+- Directory plugins are skipped; edit the directory and use `reload`.
+
+`--check` only previews, including with an explicit target or `--yes`. `--yes` skips the question.
+`--all` checks each configured plugin and reports independent results; one failure does not stop
+others. Neither flag permits ordinary npm downgrades.
+
+`--version <version|tag|range>` or `--ref <branch|tag|commit>` selects one matching plugin's update
+content and applies it without another question. An explicit npm version can be older. The next
+ordinary update checks latest again. Explicit targets cannot be combined with `--all`.
+JSON and noninteractive ordinary updates require `--yes`.
+
+Approval acquires exactly the reviewed commit or npm artifact. If it is unavailable or the installed
+plugin changed while reviewing, the update fails and asks you to check again. Failed preparation or
+activation retains the previous installation. Manual app update review is not available yet.
+
+Put `--host <url>` before a management command when the target is not the CLI's default daemon. `remove`
+never deletes a directory source; it deletes managed files for Git and npm sources. The install-time
+`--id` is the runtime ID and allows the same directory or repository to be installed more than once.
+
+> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Server code and preparation commands run unsandboxed with the daemon user's access on the daemon host; client contributions run inside Paseo. Dependencies and future updates are part of that decision. With the global `--host` option, commands run on the remote daemon host.
+
+Most plugins should omit `build`. Use it only when the staged checkout must install a dependency
+that Paseo does not provide, generate source or assets, or perform another required preparation
+step:
+
+```json
+{
+  "id": "review",
+  "requirements": { "paseo": ">=0.8.0" },
+  "build": [["npm", "ci", "--omit=dev"]]
+}
+```
+
+`build` is a list of non-empty argv arrays. Paseo runs each executable directly, without a shell,
+from the staged plugin directory after resolving the exact commit and manifest. It never infers a
+package manager or commands from lockfiles. Install and update both run `build` before validation,
+compilation, activation, or replacement. A failing command reports its output, discards the
+candidate, and leaves the installed/running version intact. The daemon log records each command and
+output; with the global `--host` option, execution is on that daemon host.
+
+Run `npm run typecheck` before install or reload. Manage plugin source entries with the CLI or
+Settings; see [Plugin sources](#plugin-sources) for install syntax.
+
+The daemon-wide **Enable plugins** switch lives under **Settings → Plugins**. A configured plugin remains `disabled` until that switch and the plugin's own enabled state are both on.
+
+The switch is the root `pluginsEnabled` field in `config.json`. After changing it, run `paseo reload --json`. Enabling starts every configured plugin whose own `enabled` value is not `false`; disabling tears down all plugins. No daemon restart is required. Manual edits to plugin source entries are not reloaded; use the plugin lifecycle commands for those.
+
+## Load failures
+
+Use `paseo plugin ls` to read the current status and error.
+
+| Symptom                                                               | Check                                                                                                                                              |
+| --------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `This plugin was made for an older version of Paseo`                  | The directory has only an `index.ts` entry. Follow the [migration guide](/docs/plugins/migration).                                                 |
+| `Plugin entry points are missing`                                     | Neither `index.client.tsx` nor `index.server.ts` exists with that exact name.                                                                      |
+| `server-only module cannot be imported into the plugin client bundle` | Client code imports `server/`. Move the work behind an RPC and import its contract from `shared/`.                                                 |
+| `client-only module cannot be imported into the plugin server bundle` | Server code imports `client/`. Register that contribution from `index.client.tsx` instead.                                                         |
+| `Node module cannot be imported into the plugin client bundle`        | Client code imports `node:*`. Move the operation to `server/` and call it through an RPC.                                                          |
+| Sidebar item is missing                                               | The plugin is `running`, the item is not hidden in Settings > Sidebar, its component does not throw, and the client is on the installation's host. |
+| Client module is unavailable                                          | Import only the host-provided client modules listed above.                                                                                         |
+| RPC rejects                                                           | Check both Zod schemas and the daemon-side handler error.                                                                                          |
+| Edited code does not appear                                           | Run `npm run typecheck`, then `paseo plugin reload <id>`.                                                                                          |
+| Reload fails                                                          | Read `paseo plugin ls` and `paseo plugin logs <id>`, fix the source error, then reload; Paseo does not restore the previous bundle.                |
+| Plugin exits unexpectedly                                             | Read `paseo plugin logs <id>` for retained initialization, cleanup, stderr, and final crash output.                                                |
diff --git a/public-docs/plugins/v0.7/index.md b/public-docs/plugins/v0.7/index.md
deleted file mode 100644
index dafe44620a..0000000000
--- a/public-docs/plugins/v0.7/index.md
+++ /dev/null
@@ -1,204 +0,0 @@
----
-title: Plugin quickstart
-description: Build, install, share, and update a trusted Paseo plugin.
-nav: Paseo v0.7 — Current
-order: 45
-category: Plugins
----
-
-# Plugin quickstart
-
-> **For Paseo v0.7.x.** This is the current stable plugin API.
-
-> **Experimental:** The plugin API is still evolving, so expect breaking changes and updates to
-> your plugins as Paseo evolves.
-
-See the [plugin roadmap](https://github.com/getpaseo/paseo/labels/plugins) for planned contribution
-surfaces and their current status.
-
-Paseo plugins add native workspace panels, composer pills, Command Center items, global surfaces, app themes, daemon behavior, and composer attachment sources. They run on every Paseo client connected to the host, including mobile.
-
-> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Server code and Git preparation commands run unsandboxed with the daemon user's access on the daemon host; client contributions run inside Paseo. Dependencies and future updates are part of that decision. With `--host`, commands run on the remote daemon host.
-
-On the target host, open **Settings → Plugins** and turn on **Enable plugins**. This is the global switch for every configured plugin on that daemon.
-
-You can also change the root `pluginsEnabled` field in the daemon's `config.json`, then apply it without restarting:
-
-```bash
-paseo reload --json
-```
-
-Enabling starts configured plugins; disabling tears them down. Automation must inspect the current value first and obtain your explicit permission before changing a disabled or omitted value to `true`.
-
-## Create a plugin
-
-Use an absolute path on the daemon machine:
-
-```bash
-paseo plugin init /absolute/path/to/workspace-plugin
-cd /absolute/path/to/workspace-plugin
-npm install
-```
-
-`init` creates a strict TypeScript project. It does not run the package manager. `npm install`
-installs development dependencies for local typechecking and tests. Paseo supplies the plugin SDK,
-React, React Native, TanStack Query, and Zod at runtime; plugins do not need a `build` hook for these
-modules. `index.ts` registers contributions; client UI lives in `*.client.tsx` files.
-
-Plugins run on desktop, browser, iOS, and Android. Paseo ships several themes. Color every `Text` from `theme.colors.foreground` or `theme.colors.foregroundMuted`, and size layout from `layout.compact`. Hardcoded black text fails in dark themes.
-
-Replace `main.client.tsx` with:
-
-```tsx
-import { type PluginWorkspacePanelProps, useWorkspace } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function WorkspaceOverview({ theme, layout, workspaceId }: PluginWorkspacePanelProps) {
-  const workspace = useWorkspace(workspaceId, ({ name, directory }) => ({
-    name,
-    directory,
-  }));
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        gap: layout.compact ? 8 : 12,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground, fontSize: layout.compact ? 20 : 24 },
-      label: { color: theme.colors.foregroundMuted },
-      detail: { color: theme.colors.foreground },
-    }),
-    [theme, layout.compact],
-  );
-
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{workspace?.name}</Text>
-      <Text style={styles.label}>Directory</Text>
-      <Text style={styles.detail}>{workspace?.directory}</Text>
-    </View>
-  );
-}
-```
-
-Replace `index.ts` with:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { WorkspaceOverview } from "./main.client";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addWorkspacePanel({
-    id: "overview",
-    title: "Workspace overview",
-    icon: "PanelsTopLeft",
-    context: "workspace",
-    locations: ["workspace", "explorer"],
-    Component: WorkspaceOverview,
-  });
-  plugin.addCommandCenterItem({
-    id: "open-overview",
-    title: "Open workspace overview",
-    icon: "PanelsTopLeft",
-    context: "workspace",
-    onSelect({ openPanel }) {
-      openPanel("overview");
-    },
-  });
-  return () => {};
-}
-```
-
-The icon is a [Lucide](https://lucide.dev/icons/) icon name. `*.client.tsx` files can use React Native runtime APIs; Paseo excludes them from the daemon bundle. Panel props contain stable IDs; `useWorkspace` selects the cached fields the component needs without fetching through RPC or re-rendering for unrelated workspace changes. See [Theme and layout](/docs/plugins/v0.7/reference#theme-and-layout) for the required tokens.
-
-## Check and install it
-
-```bash
-npm run typecheck
-paseo plugin install /absolute/path/to/workspace-plugin
-paseo plugin ls
-```
-
-Open a workspace, press **⌘K** on macOS or **Ctrl+K** on Windows and Linux, and choose **Open workspace overview**. It opens as a normal workspace tab. If the item does not appear, confirm that **Enable plugins** is on, the plugin status is `running` in `paseo plugin ls`, and the client is viewing the host where you installed it.
-
-To install a plugin published through GitHub or another Git host:
-
-```bash
-paseo plugin add owner/repository
-paseo plugin add https://gitlab.com/group/repository.git
-paseo plugin add https://git.example.com/owner/repository.git
-paseo plugin add owner/monorepo:plugins/workspace
-paseo plugin add owner/repository --ref main
-```
-
-Append `:relative/path` to the source when the plugin lives below the repository root.
-
-An omitted `--ref` tracks the default branch. Explicit branches track updates; tags and commits are
-pinned. Check and apply updates with:
-
-```bash
-paseo plugin status
-paseo plugin update workspace-plugin
-paseo plugin update --all
-```
-
-Most plugins should omit `build`. Paseo compiles TypeScript and TSX and supplies its runtime modules.
-Declare preparation only when the staged checkout must install another dependency, generate source,
-or perform another required build step:
-
-```json
-{
-  "id": "workspace-plugin",
-  "build": [
-    ["npm", "ci"],
-    ["npm", "run", "build"]
-  ]
-}
-```
-
-Each `build` entry is a non-empty argv array, executed directly without a shell from the staged
-plugin directory. Paseo never chooses a package manager or infers commands from lockfiles. On
-install and update it resolves the exact commit, runs these commands, then validates, compiles, and
-activates the candidate. A failed command discards the candidate and keeps the installed/running
-version. The daemon log records the exact argv and output; `--host` runs them on the remote daemon
-host.
-
-## Edit and reload
-
-Source changes are explicit:
-
-```bash
-npm run typecheck
-paseo plugin reload workspace-plugin
-```
-
-A reload stops the old plugin, runs its cleanup, compiles the current source, and starts it again. A failed reload stays failed and reports its load error; fix the source and reload again.
-
-## Debug backend output
-
-Use normal Node logging in daemon-side handlers and cleanup:
-
-```ts
-console.log("Refreshing issues");
-console.error("Issue refresh failed", error);
-```
-
-Read recent stdout and stderr from **Settings → Plugins → Logs** or the CLI:
-
-```bash
-paseo plugin logs workspace-plugin
-paseo plugin logs workspace-plugin --json
-```
-
-The log tail includes `[paseo]` loading, ready, stopping, and stopped entries, plus compilation and
-load failures. It survives reloads and crashes. Inspect it when a plugin fails to start or an RPC
-rejects. See [Debug backend output](/docs/plugins/v0.7/reference#debug-backend-output) for retention and
-security behavior.
-
-## Next
-
-- [Plugin reference](/docs/plugins/v0.7/reference), add daemon behavior, use the Paseo SDK, contribute themes and attachments, and manage lifecycle.
-- [TypeScript SDK](/docs/sdk), the workspace, agent, provider, and config API exposed inside plugins.
diff --git a/public-docs/plugins/v0.7/reference.md b/public-docs/plugins/v0.7/reference.md
deleted file mode 100644
index 1ff7511fda..0000000000
--- a/public-docs/plugins/v0.7/reference.md
+++ /dev/null
@@ -1,1019 +0,0 @@
----
-title: Plugin reference
-description: Local plugin files, client and server runtimes, platform limits, contributions, RPCs, lifecycle, hosts, and CLI commands.
-nav: Reference
-order: 46
-category: Plugins
----
-
-# Plugin reference
-
-> **For Paseo v0.7.x.** Return to the [v0.7 quickstart](/docs/plugins/v0.7).
-
-Local plugins are directory sources installed into one Paseo daemon. A plugin can contribute:
-
-- React Native surfaces and sidebar items to Paseo clients;
-- workspace and agent panels opened as workspace tabs;
-- global, workspace, and agent actions in the Command Center;
-- client slash commands in the message composer;
-- transformed and daemon-pushed agent timeline rows;
-- dark themes in Settings → Appearance;
-- schema-validated RPC handlers running beside the daemon;
-- normal Paseo operations through the TypeScript SDK;
-- searchable external resources in the message composer.
-
-Plugin code is trusted and unsandboxed. Client surfaces run in the Paseo app. Backend contributions run in a subprocess with access to the daemon machine, including its files, processes, credentials, and network.
-
-## Project files
-
-`paseo plugin init /absolute/path/to/my-plugin` creates:
-
-```text
-my-plugin/
-  paseo-plugin.json
-  index.ts
-  main.client.tsx
-  package.json
-  tsconfig.json
-```
-
-The required root manifest is `paseo-plugin.json`. It contains the default plugin ID:
-
-```json
-{ "id": "my-plugin" }
-```
-
-The entry point is `index.ts` at the plugin root. Plugin, surface, sidebar-item, workspace-panel,
-Command Center item, and attachment-source IDs start with a lowercase letter and contain lowercase
-letters, numbers, or hyphens. Client slash-command names follow the same rule.
-
-The generated `package.json` installs `@getpaseo/plugin` and the other host modules as development
-dependencies for local typechecking and tests. Paseo supplies their runtime instances. Consumers do
-not install them when adding the plugin.
-
-Add runtime-specific files as the plugin grows:
-
-```text
-my-plugin/
-  action.shared.ts
-  action.server.ts
-  panel.client.tsx
-```
-
-| Suffix         | Use it for                                                           |
-| -------------- | -------------------------------------------------------------------- |
-| `*.client.tsx` | React, React Native, hooks, styles, surfaces, panels, and callbacks. |
-| `*.server.ts`  | Node APIs, local resources, credentials, and RPC handlers.           |
-| `*.shared.ts`  | Zod RPC contracts and plain values imported by both runtimes.        |
-
-## Runtime modules
-
-Paseo builds separate client and server bundles from `index.ts`. It rejects imports from `*.server` files into client modules and imports from `*.client` files into server modules. Keep shared modules free of Node and React Native runtime code.
-
-### Client runtime
-
-Paseo provides these modules to client code:
-
-| Module                          | Use it for                            |
-| ------------------------------- | ------------------------------------- |
-| `@getpaseo/plugin`              | Contribution contracts and data hooks |
-| `@getpaseo/plugin/react-native` | Paseo UI components and UI hooks      |
-| `@getpaseo/plugin/server`       | Shared RPC and attachment contracts   |
-| `@tanstack/react-query`         | Request state and caching             |
-| `react`                         | Components and hooks                  |
-| `react/jsx-runtime`             | Compiled JSX                          |
-| `react-native`                  | Cross-platform UI                     |
-| `zod`                           | Shared schemas                        |
-
-These exact module specifiers use the host's runtime instances. A client bundle that requests another host module fails with `Module "<name>" is not available in plugin client code`.
-
-Do not import `lucide-react-native`, `react-native-svg`, or DOM libraries. Set contribution `icon` fields to a [Lucide icon name](https://lucide.dev/icons/); Paseo validates the name and renders the icon.
-
-Client components are React Native components rendered by Paseo. Web clients render them through React Native Web. Browser globals such as `localStorage` and `location` exist only when `layout.platform === "web"`; iOS and Android have no equivalent. Gate any use on that field.
-
-There is no plugin storage API. Browser storage does not persist settings across Paseo clients. There is also no general host navigation API: plugin code cannot open native Paseo routes. Command Center callbacks can only open surfaces and panels registered by the same plugin.
-
-### Server runtime
-
-Paseo provides `@getpaseo/plugin`, `@getpaseo/plugin/server`, and `zod` to server code. Backend contributions run in a daemon subprocess with Node access to the host machine. Keep filesystem, process, credential, and other machine-local work in `*.server.ts` files.
-
-## Entry point and cleanup
-
-`index.ts` wires contributions together and default-exports one contribution function. It must return cleanup, even when it has nothing to clean:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { Main } from "./main.client";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addSurface("main", Main);
-  return () => {};
-}
-```
-
-Cleanup can be async. Release timers, watchers, sockets, and other resources created by the plugin. Paseo also removes registrations, unmounts surfaces, rejects pending RPCs, closes the plugin's daemon session, and stops its subprocess on reload, disable, removal, disconnect, or daemon shutdown.
-
-## Surfaces and sidebar items
-
-Register a component, then point a sidebar item at its surface ID:
-
-`main.client.tsx`:
-
-```tsx
-import type { PluginSurfaceProps } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function Main({ theme, host, layout }: PluginSurfaceProps) {
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground },
-      detail: { color: theme.colors.foregroundMuted },
-    }),
-    [theme, layout.compact],
-  );
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{host.label}</Text>
-      <Text style={styles.detail}>{layout.platform}</Text>
-    </View>
-  );
-}
-```
-
-`index.ts`:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { Main } from "./main.client";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addSurface("main", Main);
-  plugin.addSidebarItem({
-    id: "main",
-    title: "My plugin",
-    icon: "Blocks",
-    surface: "main",
-  });
-  return () => {};
-}
-```
-
-`PluginSurfaceProps` contains:
-
-| Field        | Meaning                                                                                                                      |
-| ------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| `theme`      | Typed `PluginTheme` color tokens for the active Paseo theme.                                                                 |
-| `host`       | Selected host `id` and display `label`.                                                                                      |
-| `layout`     | `compact` and the `ios`, `android`, or `web` platform.                                                                       |
-| `navigation` | Optional client navigation. `openAgent({ agentId })` and `openWorkspace({ workspaceId })` open targets on the selected host. |
-
-Paseo owns the route, header, close action, host picker, error boundary, and query client. The plugin owns the surface body.
-
-## Host UI
-
-Import Paseo-owned UI from `@getpaseo/plugin/react-native` in `*.client.tsx` files. This example
-opens a controlled modal, renders a host icon, and confirms the action with a toast:
-
-```tsx
-import type { PluginSurfaceProps } from "@getpaseo/plugin";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/react-native";
-import { useState } from "react";
-import { Pressable, Text, View } from "react-native";
-
-export function IssueActions({ theme }: PluginSurfaceProps) {
-  const [open, setOpen] = useState(false);
-  const toast = useToast();
-
-  function saveIssue() {
-    toast.show("Issue saved", { variant: "success" });
-    setOpen(false);
-  }
-
-  return (
-    <View>
-      <Pressable accessibilityRole="button" onPress={() => setOpen(true)}>
-        <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
-          <Icon name="Pencil" size={18} color={theme.colors.foreground} />
-          <Text style={{ color: theme.colors.foreground }}>Edit issue</Text>
-        </View>
-      </Pressable>
-
-      <Modal
-        title="Edit issue"
-        icon={<Icon name="Pencil" size={18} color={theme.colors.foreground} />}
-        open={open}
-        onOpenChange={setOpen}
-      >
-        <Modal.Content>
-          <Pressable accessibilityRole="button" onPress={saveIssue}>
-            <Text style={{ color: theme.colors.foreground }}>Save</Text>
-          </Pressable>
-        </Modal.Content>
-      </Modal>
-    </View>
-  );
-}
-```
-
-### Modal
-
-`Modal` uses a bottom sheet on compact layouts and a centered dialog otherwise. The plugin owns
-the `open` state.
-
-| Prop           | Type                      | Required | Behavior                                     |
-| -------------- | ------------------------- | -------- | -------------------------------------------- |
-| `title`        | `string`                  | Yes      | Labels the modal and its visible header.     |
-| `icon`         | `ReactNode`               | No       | Renders before the title in the header.      |
-| `open`         | `boolean`                 | Yes      | Shows the modal content when `true`.         |
-| `onOpenChange` | `(open: boolean) => void` | Yes      | Receives `false` when the user dismisses it. |
-| `children`     | `ReactNode`               | Yes      | Contains `Modal.Content`.                    |
-
-`Modal.Content` owns the body below the host-rendered header:
-
-| Prop       | Type        | Required | Behavior                                      |
-| ---------- | ----------- | -------- | --------------------------------------------- |
-| `children` | `ReactNode` | Yes      | Renders the plugin's React Native UI content. |
-
-The close button, backdrop, platform back action, web Escape key, and compact sheet gesture dismiss
-the modal. Dismissal calls `onOpenChange(false)`; the plugin must update `open` to close it.
-
-Modal children keep the plugin runtime context. `usePaseo`, `useRpc`, `useWorkspace`, and
-`useAgent` work inside them.
-
-### Toasts
-
-`useToast()` returns two methods:
-
-| Method                    | Behavior                                                    |
-| ------------------------- | ----------------------------------------------------------- |
-| `show(message, options?)` | Shows a toast for 2,200 ms unless `durationMs` is supplied. |
-| `error(message)`          | Shows an error toast for 3,200 ms.                          |
-
-`show` accepts these options:
-
-| Option       | Type                                                       | Default     |
-| ------------ | ---------------------------------------------------------- | ----------- |
-| `variant`    | `"default" \| "info" \| "success" \| "warning" \| "error"` | `"default"` |
-| `durationMs` | `number`                                                   | `2200`      |
-
-Showing another toast replaces the currently visible toast. An empty message is ignored.
-
-### Icons
-
-`Icon` renders a [Lucide icon](https://lucide.dev/icons/) from Paseo's installed icon set. Plugin bundles do not import
-`lucide-react-native` or `react-native-svg`.
-
-| Prop    | Type     | Required | Behavior                                        |
-| ------- | -------- | -------- | ----------------------------------------------- |
-| `name`  | `string` | Yes      | Lucide icon name. Unknown names render nothing. |
-| `size`  | `number` | No       | Icon width and height.                          |
-| `color` | `string` | No       | Icon color. Use a plugin theme token.           |
-
-## Timeline items
-
-A plugin can replace an agent timeline entry with its own data and React Native renderer. Both
-registrations are client contributions. Paseo applies the transformer while building the render
-model, including every live streaming update.
-
-```tsx
-import type { PluginContext, PluginTimelineItemProps } from "@getpaseo/plugin";
-import { Text } from "react-native";
-import { z } from "zod";
-
-const schema = z.object({ label: z.string() });
-
-function Card({ item, theme }: PluginTimelineItemProps<z.output<typeof schema>>) {
-  return <Text style={{ color: theme.colors.foreground }}>{item.data.label}</Text>;
-}
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addTimelineTransformer({
-    id: "command-card",
-    query: { itemType: "tool_call" },
-    transform({ item, phase }) {
-      return {
-        items: [
-          {
-            type: "plugin",
-            kind: "command-card",
-            version: 1,
-            data: { label: item.name, phase },
-          },
-        ],
-      };
-    },
-  });
-  plugin.addTimelineRenderer({
-    kind: "command-card",
-    version: 1,
-    schema,
-    Component: Card,
-  });
-  return () => {};
-}
-```
-
-`query.itemType` is the stable, coarse selector. Inspect the selected item inside `transform` for
-provider- or tool-specific recognition. Returning `undefined` keeps the original entry. Returning
-`items` replaces it; an empty array removes it. Item `data` must be JSON-compatible. The `phase`
-input is `"streaming"` for running tool calls and loading reasoning, and `"complete"` otherwise.
-Each replacement may set an optional plugin-local `id`; otherwise Paseo uses its index within that
-source item's output.
-
-Renderers receive `agentId`, `item`, `timestamp`, `theme`, `host`, and `layout`. Paseo validates
-`item.data` with the registered schema before rendering. Keep transformers synchronous and
-deterministic. Paseo memoizes results by source-item reference and derives replacement identity from
-the source row, so updates to one streaming item do not remount its renderer. Use the exported
-`useRevealedText(text, phase)` hook when a renderer should pace streaming text like Paseo's built-in
-assistant rows.
-
-### Append a timeline row from the daemon
-
-A server handler can add a plugin-owned row to canonical history:
-
-```ts
-import type { PluginHandlerContext } from "@getpaseo/plugin";
-
-async function publishReview(agentId: string, { paseo }: PluginHandlerContext) {
-  await paseo.agents.ref(agentId).timeline.append({
-    type: "plugin",
-    id: "review",
-    kind: "review-result",
-    version: 1,
-    data: { verdict: "ready" },
-  });
-}
-```
-
-| Field     | Type             | Required | Behavior                                                       |
-| --------- | ---------------- | -------- | -------------------------------------------------------------- |
-| `type`    | `"plugin"`       | Yes      | Selects the plugin timeline variant.                           |
-| `id`      | `string`         | Yes      | Stable plugin-local identity. Reusing it replaces the old row. |
-| `kind`    | `string`         | Yes      | Selects the registered renderer.                               |
-| `version` | positive integer | Yes      | Selects the renderer contract version.                         |
-| `data`    | JSON-compatible  | Yes      | Renderer payload, at most 64 KiB after JSON serialization.     |
-
-The daemon stamps `pluginId` from the calling plugin session and rejects this RPC from non-plugin
-sessions. The row appears live, survives timeline refetches, and keeps only the latest value for the
-same plugin and `id`. If its renderer is missing, Paseo shows the existing unavailable row. Daemons
-reject `data` over the limit rather than truncating it. Daemons that support this operation
-advertise `server_info.features.pluginTimelineItems`.
-
-## Theme and layout
-
-Plugin UI runs on desktop, browser, iOS, and Android, across every Paseo theme. `theme` is a typed `PluginTheme` mapped from the active host theme. Color and spacing must come from those props. Hardcoded colors and unstyled `Text` break when the host theme changes.
-
-Recreate styles when `theme` or `layout.compact` changes.
-
-| Key                             | Required for               | Use it for                          |
-| ------------------------------- | -------------------------- | ----------------------------------- |
-| `theme.colors.foreground`       | Every primary `Text`       | Titles and body copy                |
-| `theme.colors.foregroundMuted`  | Secondary `Text`           | Labels and supporting copy          |
-| `theme.colors.surface0`         | Root view                  | Panel background                    |
-| `theme.colors.surface1`         | Raised surfaces            | Cards and panels                    |
-| `theme.colors.surface2`         | Control surfaces           | Inputs and secondary controls       |
-| `theme.colors.border`           | Surface boundaries         | Borders and dividers                |
-| `theme.colors.accent`           | Primary action fills       | Buttons and selected states         |
-| `theme.colors.accentForeground` | Text on an accent fill     | Button labels                       |
-| `theme.colors.statusSuccess`    | Success feedback           | Success messages and indicators     |
-| `theme.colors.statusWarning`    | Warning feedback           | Warning messages and indicators     |
-| `theme.colors.statusDanger`     | Failure copy               | Error messages and destructive text |
-| `layout.compact`                | Padding and stacking       | `true` on mobile and narrow windows |
-| `layout.platform`               | Platform-specific behavior | `ios`, `android`, or `web`          |
-
-Do not hardcode `#000`, `#fff`, or React Native's default text color. Primary copy uses `foreground`. Labels use `foregroundMuted`. Tighten padding when `layout.compact` is true.
-
-Workspace and agent panels receive the same `theme`, `layout`, and optional `navigation` fields.
-
-## Contribute a theme
-
-`addTheme` adds a light or dark theme to Settings → Appearance, listed under the built-ins by its `name`. A
-theme is data, so it needs no client file:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addTheme({
-    id: "mocha",
-    name: "Catppuccin Mocha",
-    appearance: "dark",
-    colors: {
-      background: "#1e1e2e",
-      foreground: "#cdd6f4",
-      raised: "#313244",
-      control: "#45475a",
-      border: "#45475a",
-      accent: "#cba6f7",
-      mutedForeground: "#a6adc8",
-      ring: "#6c7086",
-    },
-  });
-  return () => {};
-}
-```
-
-Every color is a hex string; anything else fails to load. Paseo expands the palette into the full
-token set the built-in dark themes use, so a contributed theme covers panels, menus, diffs, status
-colors, and the terminal without listing them.
-
-| Color             | Becomes                                                           |
-| ----------------- | ----------------------------------------------------------------- |
-| `background`      | App, workspace, and terminal background                           |
-| `foreground`      | Primary text, terminal foreground and cursor                      |
-| `raised`          | Cards, popovers, and hovered rows                                 |
-| `control`         | Inputs, secondary fills, and the light-theme sidebar              |
-| `border`          | Borders and the highest raised-surface tint                       |
-| `accent`          | Buttons, selection, and focus. Optional; `foreground` if omitted. |
-| `mutedForeground` | Secondary text                                                    |
-| `ring`            | Focus rings, scrollbars, and terminal bright black                |
-
-`appearance` is `"light"` or `"dark"`. Paseo uses it to select the matching surface, status,
-diff, syntax, terminal, and shadow derivation.
-
-Only one contributed theme is active at a time. Selecting one persists the choice; if the plugin is
-later disabled or removed, Paseo falls back to the default theme rather than leaving the app
-unpainted.
-
-Themes need a host that supports them. A daemon released before `addTheme` compiles the call into
-the plugin's backend bundle, where it does not exist, and the plugin fails to start with
-`plugin.addTheme is not a function`. Update the host.
-
-## Workspace panels
-
-Register one panel for workspace or agent context:
-
-`review.client.tsx`:
-
-```tsx
-import { type PluginAgentPanelProps, useAgent, useWorkspace } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function ReviewPanel({ theme, layout, workspaceId, agentId }: PluginAgentPanelProps) {
-  const workspaceName = useWorkspace(workspaceId, (workspace) => workspace.name);
-  const agent = useAgent(agentId, ({ id, title }) => ({ id, title }));
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground },
-      detail: { color: theme.colors.foregroundMuted },
-    }),
-    [theme, layout.compact],
-  );
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{workspaceName}</Text>
-      <Text style={styles.detail}>{agent?.title ?? agent?.id}</Text>
-    </View>
-  );
-}
-```
-
-`index.ts`:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { ReviewPanel } from "./review.client";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addWorkspacePanel({
-    id: "review",
-    title: "Review",
-    icon: "Scan",
-    context: "agent",
-    locations: ["workspace", "explorer"],
-    Component: ReviewPanel,
-  });
-  return () => {};
-}
-```
-
-`addWorkspacePanel` fields:
-
-| Field       | Required | Meaning                                                       |
-| ----------- | -------- | ------------------------------------------------------------- |
-| `id`        | Yes      | Plugin-local panel ID.                                        |
-| `title`     | Yes      | Workspace-tab title.                                          |
-| `icon`      | Yes      | Lucide icon name.                                             |
-| `context`   | Yes      | `workspace` or `agent`.                                       |
-| `locations` | No       | `workspace` and/or `explorer`. Defaults to `workspace`.       |
-| `Component` | Yes      | React Native component matching the selected context's props. |
-
-A workspace panel receives `PluginWorkspacePanelProps`: `context: "workspace"`, `theme`, `host`, `layout`, and `workspaceId`. An agent panel receives `PluginAgentPanelProps`: `context: "agent"`, the same common fields and `workspaceId`, plus `agentId`.
-
-Read cached state with `useWorkspace(workspaceId, selector)` and `useAgent(agentId, selector)`. A selector is required. Paseo compares its result shallowly, so selecting `{ name, status }` does not re-render when unrelated fields change. Select every field the component renders in one call; do not select the whole snapshot.
-
-Both hooks return `null` when the record is unavailable. Otherwise they run synchronously against normalized client state. Snapshot DTOs and their nested values are deeply readonly and frozen at runtime. Do not call plugin RPC to discover the current workspace or agent. Fetch optional or vendor-specific enrichment after the component renders.
-
-Workspace snapshot fields:
-
-| Field                | Type                                                              |
-| -------------------- | ----------------------------------------------------------------- |
-| `id`                 | `string`                                                          |
-| `projectId`          | `string`                                                          |
-| `projectDisplayName` | `string`                                                          |
-| `projectRootPath`    | `string`                                                          |
-| `directory`          | `string`                                                          |
-| `projectKind`        | `"git" \| "non_git" \| "directory"`                               |
-| `kind`               | `"directory" \| "local_checkout" \| "checkout" \| "worktree"`     |
-| `name`               | `string`                                                          |
-| `title`              | `string \| null`                                                  |
-| `status`             | `"needs_input" \| "failed" \| "running" \| "attention" \| "done"` |
-| `statusEnteredAt`    | ISO timestamp or `null`                                           |
-| `archivingAt`        | ISO timestamp or `null`                                           |
-| `diffStat`           | `{ additions: number; deletions: number } \| null`                |
-
-Agent snapshot fields:
-
-| Field               | Type                                                           |
-| ------------------- | -------------------------------------------------------------- |
-| `id`                | `string`                                                       |
-| `workspaceId`       | `string`                                                       |
-| `provider`          | `string`                                                       |
-| `status`            | `"initializing" \| "idle" \| "running" \| "error" \| "closed"` |
-| `createdAt`         | ISO timestamp                                                  |
-| `updatedAt`         | ISO timestamp                                                  |
-| `lastActivityAt`    | ISO timestamp                                                  |
-| `title`             | `string \| null`                                               |
-| `cwd`               | `string`                                                       |
-| `model`             | `string \| null`                                               |
-| `currentModeId`     | `string \| null`                                               |
-| `thinkingOptionId`  | `string \| null`                                               |
-| `requiresAttention` | `boolean`                                                      |
-| `attentionReason`   | `"finished" \| "error" \| "permission" \| null`                |
-| `parentAgentId`     | `string \| null`                                               |
-| `labels`            | `Record<string, string>`                                       |
-
-Paseo owns tab focus, splitting, closing, persistence, query state, the API/RPC providers, and the render error boundary. A restored tab whose plugin, panel, context, workspace, or agent is unavailable stays open with an unavailable message instead of crashing the workspace.
-
-## Command Center items
-
-Open the Command Center with **⌘K** on macOS or **Ctrl+K** on Windows and Linux, then search for the item title.
-
-Register an action and open a panel from the callback:
-
-```tsx
-import { defineRpc } from "@getpaseo/plugin/server";
-import { z } from "zod";
-
-const refreshReview = defineRpc({
-  name: "review.refresh",
-  input: z.object({ agentId: z.string() }),
-  output: z.object({ refreshed: z.boolean() }),
-});
-
-plugin.addCommandCenterItem({
-  id: "open-review",
-  title: "Open review",
-  icon: "Scan",
-  keywords: ["inspect"],
-  context: "agent",
-  async onSelect({ paseo, rpc, workspace, agent, openPanel }) {
-    await paseo.workspaces.ref(workspace.id).setTitle(`Review ${agent.id}`);
-    await rpc(refreshReview, { agentId: agent.id });
-    openPanel("review");
-  },
-});
-```
-
-`addCommandCenterItem` fields:
-
-| Field      | Required | Meaning                                        |
-| ---------- | -------- | ---------------------------------------------- |
-| `id`       | Yes      | Plugin-local item ID.                          |
-| `title`    | Yes      | Search result title.                           |
-| `icon`     | Yes      | Lucide icon name.                              |
-| `keywords` | No       | Additional Command Center search terms.        |
-| `context`  | Yes      | `global`, `workspace`, or `agent`.             |
-| `onSelect` | Yes      | Client-side callback for the matching context. |
-
-Global items appear on the installation's selected host. Workspace items appear only when that host has an active cached workspace. Agent items appear only when the focused workspace tab is an agent or an agent-context plugin panel whose cached record belongs to that workspace. Missing context removes the item rather than calling the plugin to discover it.
-
-Every callback receives:
-
-| Field                     | Context             | Meaning                                                                                                         |
-| ------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------- |
-| `context`                 | All                 | Matching discriminator.                                                                                         |
-| `paseo`                   | All                 | Selected host's existing `PaseoApi`.                                                                            |
-| `rpc(contract, input)`    | All                 | Typed call to this installation's daemon-side plugin handler.                                                   |
-| `openSurface(id)`         | All                 | Opens one of this plugin's registered global surfaces.                                                          |
-| `workspace`               | Workspace and agent | Synchronous workspace snapshot.                                                                                 |
-| `agent`                   | Agent               | Synchronous matching agent snapshot.                                                                            |
-| `openPanel(id, options?)` | Workspace and agent | Opens a registered panel in the callback's current context. Pass `{ location: "explorer" }` to target Explorer. |
-
-An agent callback may open either an agent panel or a workspace panel. A workspace callback may open only a workspace panel. Unknown surface and panel IDs fail visibly. Use `paseo` for normal workspace, agent, provider, and daemon-config operations. Use `rpc` for plugin-specific filesystem, credential, vendor, or daemon-local work.
-
-## Client slash commands
-
-Register a command that runs entirely in the Paseo client when the user submits it from the message
-composer:
-
-```ts
-plugin.addClientSlashCommand({
-  name: "review",
-  description: "Run the review bot",
-  argumentHint: "[scope]",
-  context: "agent",
-  async onSubmit({ args, agent, rpc, openPanel }) {
-    await rpc(refreshReview, { agentId: agent.id, scope: args });
-    openPanel("review");
-  },
-});
-```
-
-| Field          | Required | Meaning                                        |
-| -------------- | -------- | ---------------------------------------------- |
-| `name`         | Yes      | Command name without the leading slash.        |
-| `description`  | Yes      | Composer autocomplete description.             |
-| `argumentHint` | Yes      | Short usage hint shown after the command name. |
-| `context`      | Yes      | `"workspace"` or `"agent"`.                    |
-| `onSubmit`     | Yes      | Client callback for the matching context.      |
-
-`onSubmit` receives the matching Command Center callback context plus `args`. For `/review src`,
-`args` is `"src"`; Paseo trims only the remainder's leading and trailing whitespace. Paseo owns the
-autocomplete row, input clearing, and error toast. A handled command is never sent to the agent.
-The compiler removes this registration from the plugin's server bundle.
-
-Precedence is built-in client commands, plugin commands, then provider commands. A lower-precedence
-collision is omitted. Built-in aliases also reserve their names. The first plugin in stable catalog
-order wins a collision between plugins. Commands do not run while the composer has attachments.
-
-## Composer pills
-
-Register a headless client entrypoint from `index.ts`:
-
-```ts
-import { contributeClient } from "./review.client";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.addClientSide(contributeClient);
-  return () => {};
-}
-```
-
-The client entrypoint owns pill creation and removal:
-
-```tsx
-import {
-  Icon,
-  type PluginClientContext,
-  type PluginComposerPillProps,
-  useAgent,
-} from "@getpaseo/plugin";
-import { Text } from "react-native";
-
-function ReviewPill({ theme, agentId }: PluginComposerPillProps) {
-  const agent = useAgent(agentId, ({ title }) => ({ title }));
-  return (
-    <>
-      <Icon name="Scan" size={14} color={theme.colors.foregroundMuted} />
-      <Text numberOfLines={1} style={{ color: theme.colors.foregroundMuted, flexShrink: 1 }}>
-        {agent?.title ?? "Review"}
-      </Text>
-    </>
-  );
-}
-
-export function contributeClient(client: PluginClientContext) {
-  const pills = new Map<string, () => void>();
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
-    if (update.kind !== "upsert" || !update.agent.workspaceId) return;
-    const { id: agentId, workspaceId } = update.agent;
-    pills.get(agentId)?.();
-    pills.set(
-      agentId,
-      client.addComposerPill({
-        id: "review",
-        title: "Open review",
-        workspaceId,
-        agentId,
-        Component: ReviewPill,
-        async onPress() {
-          await client.rpc(refreshReview, { agentId });
-          client.openPanel("review", { workspaceId, agentId });
-        },
-      }),
-    );
-  });
-  return () => {
-    unsubscribe();
-    for (const remove of pills.values()) remove();
-  };
-}
-```
-
-`addComposerPill` fields:
-
-| Field         | Required | Meaning                                                    |
-| ------------- | -------- | ---------------------------------------------------------- |
-| `id`          | Yes      | Plugin-local ID within the target agent.                   |
-| `title`       | Yes      | Accessible button label.                                   |
-| `workspaceId` | Yes      | Workspace whose composer track owns the pill.              |
-| `agentId`     | Yes      | Agent whose composer track owns the pill.                  |
-| `Component`   | Yes      | React Native component rendering the pill's icon and text. |
-| `onPress`     | Yes      | Client-side callback.                                      |
-
-`addClientSide` runs once per plugin installation in each connected app. Its context exposes
-`paseo`, typed `rpc`, `openSurface`, explicit-context `openPanel`, and `addComposerPill`.
-`addComposerPill` returns an idempotent removal function. Paseo also removes every outstanding pill
-when the client entrypoint, plugin installation, or host connection is torn down.
-
-Paseo owns the pressable, shared pill chrome, pending state, error reporting, and track-bar
-placement. The component receives `theme`, `host`, `layout`, `workspaceId`, and `agentId`. Read
-current values with `useWorkspace` and `useAgent`. The plugin owns when the pill exists, its icon
-and text, and the callback. `openPanel(id, { workspaceId, agentId? })` opens or focuses a panel
-registered by the same plugin.
-
-## Use the Paseo SDK
-
-Use `usePaseo()` for ordinary Paseo operations from a surface. It borrows the selected host's existing connection; do not create another client.
-
-```tsx
-import { usePaseo } from "@getpaseo/plugin";
-import { Pressable, Text } from "react-native";
-
-function PullRequestAction() {
-  const paseo = usePaseo();
-
-  async function createReviewWorkspace() {
-    const workspace = await paseo.workspaces.create({
-      title: "Review PR 42",
-      source: {
-        kind: "worktree",
-        cwd: "/absolute/path/to/repository",
-        action: "checkout",
-        checkoutSource: { kind: "change_request", forge: "github", number: 42 },
-      },
-    });
-    await workspace.agents.create({
-      config: { provider: "codex/gpt-5.5" },
-      prompt: "Review PR #42.",
-    });
-  }
-
-  return (
-    <Pressable accessibilityRole="button" onPress={() => void createReviewWorkspace()}>
-      <Text>Create review workspace</Text>
-    </Pressable>
-  );
-}
-```
-
-The returned API covers projects, workspaces, agents, providers, and daemon config. See the [SDK API reference](/docs/sdk/reference) for its methods. Connection lifecycle methods are intentionally absent because Paseo owns the connection.
-
-## Add plugin-specific backend behavior
-
-Use plugin RPC only for work that is not a normal Paseo operation: reading a vendor API, accessing daemon-local resources, or keeping credentials off the client.
-
-Define one contract with Zod, handle it in the subprocess, and call it from the surface:
-
-`greeting.shared.ts`:
-
-```ts
-import { defineRpc } from "@getpaseo/plugin/server";
-import { z } from "zod";
-
-export const greeting = defineRpc({
-  name: "greeting.create",
-  input: z.object({ name: z.string() }),
-  output: z.object({ message: z.string() }),
-});
-```
-
-`greeting.client.tsx`:
-
-```tsx
-import { useRpc } from "@getpaseo/plugin";
-import { greeting } from "./greeting.shared";
-
-export function GreetingButton() {
-  const createGreeting = useRpc(greeting);
-  // Call createGreeting({ name: "Ada" }) from an event or query.
-  return null;
-}
-```
-
-`greeting.server.ts`:
-
-```ts
-import type { output as ZodOutput } from "zod";
-import { greeting } from "./greeting.shared";
-
-export function createGreeting({ name }: ZodOutput<typeof greeting.input>) {
-  return { message: `Hello, ${name}` };
-}
-```
-
-`index.ts`:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { GreetingButton } from "./greeting.client";
-import { createGreeting } from "./greeting.server";
-import { greeting } from "./greeting.shared";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.handle(greeting, createGreeting);
-  plugin.addSurface("main", GreetingButton);
-  return () => {};
-}
-```
-
-Inputs and outputs are validated on both sides. RPC names start with a lowercase letter and contain lowercase letters, numbers, dots, hyphens, or underscores. `useRpc()` returns a typed async function. Use TanStack Query for request state, caching, and mutations.
-
-Backend handlers receive the same `PaseoApi` as `{ paseo }`. Their connection belongs to the subprocess and closes when the plugin stops. Backend code can use Node APIs and dependencies installed in the plugin directory.
-
-## Debug backend output
-
-Backend contributions can write to stdout and stderr with normal Node logging:
-
-```ts
-console.log("Refreshing issues");
-console.error("Issue refresh failed", error);
-```
-
-Paseo adds `[paseo]` entries when the plugin starts loading, becomes ready, starts stopping, and has
-stopped. It records compilation and load failures as stderr entries, including failures that happen
-before the plugin subprocess starts. Paseo also captures output emitted during initialization, RPC
-handlers, cleanup, and process failure. Protocol traffic uses a separate channel, so `console.log()`
-cannot corrupt plugin RPCs.
-
-Open **Settings → Plugins → Logs** for the plugin, or inspect the same recent tail from the daemon
-CLI:
-
-```bash
-paseo plugin logs my-plugin
-paseo plugin logs my-plugin --json
-paseo plugin logs my-plugin --host <url>
-```
-
-The command returns a snapshot rather than following live output. Refresh the settings view or run
-the command again for newer entries. Each entry includes its timestamp, stdout or stderr stream,
-sequence, and message.
-
-Paseo retains up to 500 entries and 256 KiB per plugin in memory. Individual lines are capped at
-16 KiB. Reload, disable, compilation failure, initialization failure, and process failure retain the
-tail. Removing the plugin clears it, and a daemon restart starts a new tail. Structured copies are
-also written to the daemon log at `$PASEO_HOME/daemon.log`.
-
-Only daemon-side output is captured. Logs from client surfaces remain in the app runtime. Do not log
-credentials, access tokens, or other secrets: connected users can read the retained tail, and the
-daemon log persists it.
-
-## Add a composer attachment source
-
-An attachment source searches external resources and returns a stable text snapshot for an agent prompt. Keep credentials and vendor calls in the backend handler.
-
-`issues.shared.ts`:
-
-```ts
-import { defineAttachmentSource, defineRpc } from "@getpaseo/plugin/server";
-import { z } from "zod";
-
-export 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(),
-      }),
-    ),
-  }),
-});
-
-export const issues = defineAttachmentSource({
-  id: "issues",
-  title: "Acme issue",
-  icon: "CircleDot",
-  pickerTitle: "Attach Acme issue",
-  searchPlaceholder: "Search by identifier or title",
-  search: searchIssues,
-});
-```
-
-`issues.server.ts`:
-
-```ts
-import type { output as ZodOutput } from "zod";
-import { searchIssues } from "./issues.shared";
-
-export function search({ query }: ZodOutput<typeof searchIssues.input>) {
-  return searchAcmeIssues(query);
-}
-```
-
-`index.ts`:
-
-```ts
-import type { PluginContext } from "@getpaseo/plugin";
-import { search } from "./issues.server";
-import { issues, searchIssues } from "./issues.shared";
-
-export default function contribute(plugin: PluginContext) {
-  plugin.handle(searchIssues, search);
-  plugin.addAttachmentSource(issues);
-  return () => {};
-}
-```
-
-Paseo owns the composer menu, search picker, selected pill, draft state, and submission. The `text` value is the complete snapshot sent to the agent.
-
-## Hosts and lifecycle
-
-Plugins are installed per daemon. When the same contribution exists on several connected hosts, Paseo shows one sidebar item and adds a host picker. The selected host supplies the bundle, Paseo API, RPC transport, and query cache. Calls never fall through to another host when the selected host is offline.
-
-Attachment sources remain scoped to each composer's host.
-
-Workspace panels and Command Center items stay scoped to the active host and exact cached context.
-Reload replaces their registrations. Disable, removal, host disconnect, and evaluation failure
-remove Command Center items and clear the installation's query state. An already-restored panel tab
-remains as unavailable until its matching contribution returns or the user closes it. Panel render
-failures stay inside the plugin error boundary.
-
-## CLI reference
-
-```bash
-paseo plugin init /absolute/path/to/plugin
-paseo plugin install /absolute/path/to/plugin
-paseo plugin install /absolute/path/to/plugin --id another-runtime-id
-paseo plugin add owner/repository
-paseo plugin add https://git.example.com/owner/repository.git --ref main
-paseo plugin add owner/monorepo:plugins/review
-paseo plugin status [id]
-paseo plugin update <id>
-paseo plugin update --all
-paseo plugin ls
-paseo plugin reload my-plugin
-paseo plugin logs my-plugin
-paseo plugin disable my-plugin
-paseo plugin enable my-plugin
-paseo plugin remove my-plugin
-```
-
-Pass `--host <url>` to management commands when the target is not the CLI's default daemon. `remove`
-never deletes a directory source; it deletes the managed checkout for a Git source. The install-time
-`--id` is the runtime ID and allows the same directory or repository to be installed more than once.
-
-> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Server code and Git preparation commands run unsandboxed with the daemon user's access on the daemon host; client contributions run inside Paseo. Dependencies and future updates are part of that decision. With `--host`, commands run on the remote daemon host.
-
-An existing directory wins over `owner/repository` GitHub shorthand. Append `:relative/path` when
-the plugin lives below the repository root. Omit `--ref` to track the default branch. Explicit
-branches track updates; tags and commits stay pinned.
-
-Most plugins should omit `build`. Use it only when the staged checkout must install a dependency
-that Paseo does not provide, generate source or assets, or perform another required preparation
-step:
-
-```json
-{
-  "id": "review",
-  "build": [
-    ["npm", "ci"],
-    ["npm", "run", "build"]
-  ]
-}
-```
-
-`build` is a list of non-empty argv arrays. Paseo runs each executable directly, without a shell,
-from the staged plugin directory after resolving the exact commit and manifest. It never infers a
-package manager or commands from lockfiles. Install and update both run `build` before validation,
-compilation, activation, or replacement. A failing command reports its output, discards the
-candidate, and leaves the installed/running version intact. The daemon log records each command and
-output; with `--host`, execution is on that daemon host.
-
-Run `npm run typecheck` before install or reload. Never edit the daemon config directly.
-
-The daemon-wide **Enable plugins** switch lives under **Settings → Plugins**. A configured plugin remains `disabled` until that switch and the plugin's own enabled state are both on.
-
-The switch is the root `pluginsEnabled` field in `config.json`. After changing it, run `paseo reload --json`. Enabling starts every configured plugin whose own `enabled` value is not `false`; disabling tears down all plugins. No daemon restart is required. Manual edits to plugin source entries are not reloaded—use the plugin lifecycle commands for those.
-
-## Load failures
-
-Use `paseo plugin ls` to read the current status and error.
-
-| Symptom                      | Check                                                                                                                                   |
-| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| Sidebar item is missing      | The plugin is `running`, the item references an existing surface, the icon name is valid, and the client is on the installation's host. |
-| Client module is unavailable | Import only the host-provided client modules listed above.                                                                              |
-| RPC rejects                  | Check both Zod schemas and the daemon-side handler error.                                                                               |
-| Edited code does not appear  | Run `npm run typecheck`, then `paseo plugin reload <id>`.                                                                               |
-| Reload fails                 | Read `paseo plugin ls` and `paseo plugin logs <id>`, fix the source error, then reload; Paseo does not restore the previous bundle.     |
-| Plugin exits unexpectedly    | Read `paseo plugin logs <id>` for retained initialization, cleanup, stderr, and final crash output.                                     |
diff --git a/public-docs/plugins/v0.8/index.md b/public-docs/plugins/v0.8/index.md
deleted file mode 100644
index 8a167bfbac..0000000000
--- a/public-docs/plugins/v0.8/index.md
+++ /dev/null
@@ -1,271 +0,0 @@
----
-title: Plugin quickstart
-description: Build, install, share, and update a trusted Paseo plugin.
-nav: Paseo v0.8 — Preview
-order: 46
-category: Plugins
----
-
-# Plugin quickstart
-
-> **For the upcoming Paseo v0.8 release.** Use the [current v0.7 docs](/docs/plugins/v0.7)
-> unless you are preparing a plugin for v0.8.
-
-> **Experimental:** The plugin API is still evolving, so expect breaking changes and updates to
-> your plugins as Paseo evolves. See the [plugin roadmap](https://github.com/getpaseo/paseo/labels/plugins)
-> for planned contribution surfaces.
-
-A plugin is a TypeScript project installed into one Paseo daemon. It can add
-[surfaces and sidebar items](/docs/plugins/v0.8/reference#surfaces-and-sidebar-items),
-[workspace panels](/docs/plugins/v0.8/reference#workspace-panels),
-[Command Center items](/docs/plugins/v0.8/reference#command-center-items),
-[slash commands](/docs/plugins/v0.8/reference#slash-commands),
-[composer pills](/docs/plugins/v0.8/reference#composer-pills),
-[timeline items](/docs/plugins/v0.8/reference#timeline-items),
-[themes](/docs/plugins/v0.8/reference#contribute-a-theme),
-[attachment sources](/docs/plugins/v0.8/reference#add-a-composer-attachment-source), and
-[daemon-side RPCs](/docs/plugins/v0.8/reference#add-plugin-specific-backend-behavior). Client
-contributions run on every Paseo client connected to that daemon, including mobile.
-
-This guide scaffolds a plugin, runs it, and adds a workspace panel to it.
-
-## Create a plugin
-
-Use an absolute path on the daemon machine:
-
-```bash
-paseo plugin init /absolute/path/to/workspace-plugin
-cd /absolute/path/to/workspace-plugin
-npm install
-```
-
-`init` writes a strict TypeScript project and does not run the package manager. `npm install` adds
-development dependencies for typechecking and tests only; Paseo supplies the plugin SDK, React,
-React Native, TanStack Query, and Zod at runtime.
-
-The scaffold is a working plugin: a sidebar surface with a button that asks the daemon for a
-greeting through an RPC.
-
-```text
-workspace-plugin/
-  paseo-plugin.json      # { "id": "workspace-plugin" }
-  index.client.tsx       # runs in the Paseo app
-  index.server.ts        # runs in a daemon subprocess
-  client/greeting.tsx    # the surface component
-  client/web.ts          # the only file allowed to touch browser APIs
-  server/greeting.ts     # the RPC handler
-  shared/greeting.ts     # the RPC contract, imported by both
-  package.json
-  tsconfig.json
-```
-
-Each entry default-exports one function that registers contributions and returns a cleanup
-function. `index.client.tsx` registers the surface and the sidebar item that opens it:
-
-```tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { GreetingSurface } from "./client/greeting";
-
-export default function contribute(client: PluginClientContext) {
-  client.addSurface("greeting", GreetingSurface);
-  client.addSidebarItem({
-    id: "greeting",
-    title: "Greeting",
-    icon: "MessageCircle",
-    surface: "greeting",
-  });
-  return () => {};
-}
-```
-
-`index.server.ts` registers the handler for the contract in `shared/greeting.ts`:
-
-```ts
-import type { PluginServerContext } from "@getpaseo/plugin";
-import { createGreeting } from "./server/greeting";
-import { greetingRpc } from "./shared/greeting";
-
-export default function contribute(server: PluginServerContext) {
-  server.handle(greetingRpc, createGreeting);
-  return () => {};
-}
-```
-
-The directory is the boundary. Code under `client/` compiles only into the app bundle, code under
-`server/` only into the daemon bundle, and `shared/` into both. Importing across that line, adding
-a code file at the root, or importing a `node:` module from client code is a compile error. A
-plugin with no daemon-side work can omit `index.server.ts`; a plugin with no UI can omit
-`index.client.tsx`.
-
-Client code runs on phones as well as in browsers. The project typechecks without the DOM library,
-so `document` and `window` are errors outside `client/web.ts`, which shows how to gate a browser
-API behind `Platform.OS` with a native fallback. See
-[Cross-platform rules](/docs/plugins/v0.8/reference#cross-platform-rules) before writing UI.
-
-## Install and try it
-
-Plugins are trusted, unsandboxed code: server code and Git preparation commands run with the daemon
-user's access on the daemon machine, and client code runs inside the Paseo app. Installing a plugin
-means you trust that codebase, its dependencies, and its future updates.
-
-Turn on **Enable plugins** under **Settings → Plugins** on the daemon you are installing into. It is
-the global switch for every plugin on that daemon. It is also the root `pluginsEnabled` field in the
-daemon's `config.json`; after editing the file, apply it with `paseo reload --json`. An automated
-tool must read the current value and get your explicit permission before turning it on.
-
-Then typecheck and install:
-
-```bash
-npm run typecheck
-paseo plugin install /absolute/path/to/workspace-plugin
-paseo plugin ls
-```
-
-`paseo plugin ls` should report the plugin as `running`. Open Paseo, choose **Greeting** in the
-sidebar, and press **Create greeting**. The message comes back from the daemon subprocess through
-the RPC.
-
-If the sidebar item is missing, check that **Enable plugins** is on, the plugin is `running`, and
-the client is viewing the host you installed into. `paseo plugin logs workspace-plugin` shows the
-daemon-side output, including load errors.
-
-## Add a workspace panel
-
-A workspace panel opens as a tab next to agents, terminals, and files. Create `client/overview.tsx`:
-
-```tsx
-import { type PluginWorkspacePanelProps, useWorkspace } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function WorkspaceOverview({ theme, layout, workspaceId }: PluginWorkspacePanelProps) {
-  const workspace = useWorkspace(workspaceId, ({ name, directory }) => ({
-    name,
-    directory,
-  }));
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        gap: layout.compact ? 8 : 12,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground, fontSize: layout.compact ? 20 : 24 },
-      label: { color: theme.colors.foregroundMuted },
-      detail: { color: theme.colors.foreground },
-    }),
-    [theme, layout.compact],
-  );
-
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{workspace?.name}</Text>
-      <Text style={styles.label}>Directory</Text>
-      <Text style={styles.detail}>{workspace?.directory}</Text>
-    </View>
-  );
-}
-```
-
-`useWorkspace` reads the fields the panel renders from the app's cached state, without an RPC and
-without re-rendering when unrelated fields change. Every `Text` takes its color from
-`theme.colors`, and `layout.compact` drives spacing, so the panel works in every Paseo theme and on
-phones. See [Theme and layout](/docs/plugins/v0.8/reference#theme-and-layout) for the token list.
-
-Register the panel and a Command Center item that opens it by adding to `index.client.tsx`:
-
-```tsx
-import { WorkspaceOverview } from "./client/overview";
-
-// Inside contribute(client), after the existing registrations:
-client.addWorkspacePanel({
-  id: "overview",
-  title: "Workspace overview",
-  icon: "PanelsTopLeft",
-  context: "workspace",
-  locations: ["workspace", "explorer"],
-  Component: WorkspaceOverview,
-});
-client.addCommandCenterItem({
-  id: "open-overview",
-  title: "Open workspace overview",
-  icon: "PanelsTopLeft",
-  context: "workspace",
-  onSelect({ openPanel }) {
-    openPanel("overview");
-  },
-});
-```
-
-`icon` is a [Lucide](https://lucide.dev/icons/) icon name.
-
-## Edit and reload
-
-Source changes take effect only when you reload the plugin:
-
-```bash
-npm run typecheck
-paseo plugin reload workspace-plugin
-```
-
-A reload stops the old plugin, runs its cleanup, compiles the current source, and starts it again.
-A failed reload stays failed and reports its error in `paseo plugin ls`; fix the source and reload
-again.
-
-Open a workspace, press **⌘K** on macOS or **Ctrl+K** on Windows and Linux, and choose **Open
-workspace overview**. The panel opens as a workspace tab.
-
-## Install a published plugin
-
-Plugins published in a Git repository install by shorthand or URL:
-
-```bash
-paseo plugin add owner/repository
-paseo plugin add https://gitlab.com/group/repository.git
-paseo plugin add owner/monorepo:plugins/workspace
-paseo plugin add owner/repository --ref main
-```
-
-Append `:relative/path` when the plugin lives below the repository root. Without `--ref`, the
-default branch is tracked; a branch tracks updates, while a tag or commit stays pinned.
-
-```bash
-paseo plugin status
-paseo plugin update workspace-plugin
-paseo plugin update --all
-```
-
-Paseo compiles TypeScript itself, so most plugins need no build step. A repository that must
-install a dependency Paseo does not provide, or generate files, declares
-[`build` commands](/docs/plugins/v0.8/reference#cli-reference) in its manifest.
-
-## Read backend logs
-
-Daemon-side handlers and cleanup can use normal Node logging:
-
-```ts
-console.log("Refreshing issues");
-console.error("Issue refresh failed", error);
-```
-
-Read the recent output from **Settings → Plugins → Logs** or the CLI:
-
-```bash
-paseo plugin logs workspace-plugin
-paseo plugin logs workspace-plugin --json
-```
-
-The tail includes `[paseo]` loading, ready, stopping, and stopped entries, plus compilation and load
-failures, and it survives reloads and crashes. Client-side output stays in the app. See
-[Debug backend output](/docs/plugins/v0.8/reference#debug-backend-output) for retention and what not to
-log.
-
-## Next
-
-- [Plugin reference](/docs/plugins/v0.8/reference): every contribution type, its fields, the runtime
-  modules, hosts, and the CLI.
-- [Migrate a plugin to runtime entries](/docs/plugins/v0.8/migration): move a plugin written against the
-  single `index.ts` entry, step by step.
-- [TypeScript SDK](/docs/sdk): the workspace, agent, provider, and config API available as `paseo`
-  in client and server code.
diff --git a/public-docs/plugins/v0.8/reference.md b/public-docs/plugins/v0.8/reference.md
deleted file mode 100644
index 963968166b..0000000000
--- a/public-docs/plugins/v0.8/reference.md
+++ /dev/null
@@ -1,1083 +0,0 @@
----
-title: Plugin reference
-description: Local plugin files, client and server runtimes, platform limits, contributions, RPCs, lifecycle, hosts, and CLI commands.
-nav: Reference
-order: 47
-category: Plugins
----
-
-# Plugin reference
-
-> **For the upcoming Paseo v0.8 release.** Return to the [v0.8 quickstart](/docs/plugins/v0.8).
-
-Migrating an existing plugin? Follow the standalone [runtime-entry migration guide](/docs/plugins/v0.8/migration).
-
-Local plugins are directory sources installed into one Paseo daemon. A plugin can contribute:
-
-- React Native surfaces and sidebar items to Paseo clients;
-- workspace and agent panels opened as workspace tabs;
-- global, workspace, and agent actions in the Command Center;
-- slash commands in the message composer;
-- transformed and daemon-pushed agent timeline rows;
-- light and dark themes in Settings → Appearance;
-- schema-validated RPC handlers running beside the daemon;
-- normal Paseo operations through the TypeScript SDK;
-- searchable external resources in the message composer.
-
-Plugin code is trusted and unsandboxed. Client surfaces run in the Paseo app. Backend contributions run in a subprocess with access to the daemon machine, including its files, processes, credentials, and network.
-
-## Project files
-
-`paseo plugin init /absolute/path/to/my-plugin` creates:
-
-```text
-my-plugin/
-  paseo-plugin.json
-  index.client.tsx
-  index.server.ts
-  client/greeting.tsx
-  server/greeting.ts
-  shared/greeting.ts
-  package.json
-  tsconfig.json
-```
-
-The required root manifest is `paseo-plugin.json`. It contains the default plugin ID:
-
-```json
-{ "id": "my-plugin" }
-```
-
-| Entry              | Runtime               | Receives              | Required                                                          |
-| ------------------ | --------------------- | --------------------- | ----------------------------------------------------------------- |
-| `index.client.tsx` | Paseo app, per client | `PluginClientContext` | When the plugin has any UI, callback, theme, or attachment source |
-| `index.server.ts`  | Daemon subprocess     | `PluginServerContext` | When the plugin handles RPCs                                      |
-
-At least one entry is required; both accept `.ts` or `.tsx`. A directory that still has only the
-old `index.ts` fails to load and points at the [migration guide](/docs/plugins/v0.8/migration).
-
-Plugin, surface, sidebar-item, workspace-panel, Command Center item, attachment-source, and
-slash-command IDs start with a lowercase letter and contain lowercase letters, numbers, or hyphens.
-
-The generated `package.json` installs `@getpaseo/plugin` and the other host modules as development
-dependencies for local typechecking and tests. Paseo supplies their runtime instances. Consumers do
-not install them when adding the plugin.
-
-Every other module lives in one of three directories. Nesting inside them is fine; a module at the
-plugin root is a compile error.
-
-| Directory | Compiled into      | Use it for                                                           |
-| --------- | ------------------ | -------------------------------------------------------------------- |
-| `client/` | App bundle only    | React, React Native, hooks, styles, surfaces, panels, and callbacks. |
-| `server/` | Daemon bundle only | Node APIs, local resources, credentials, and RPC handlers.           |
-| `shared/` | Both               | Zod RPC contracts and plain values imported by both runtimes.        |
-
-## Runtime modules
-
-Paseo builds each bundle from its matching entry. An import from `client/` into the daemon bundle,
-from `server/` into the app bundle, or of a `node:` module anywhere in the app bundle is a compile
-error. Keep `shared/` free of Node and React Native runtime code.
-
-### Client runtime
-
-Paseo provides these modules to client code:
-
-| Module                          | Use it for                                                                                             |
-| ------------------------------- | ------------------------------------------------------------------------------------------------------ |
-| `@getpaseo/plugin`              | Contribution contracts, `defineRpc`, `defineAttachmentSource`, `RpcInput`, `RpcOutput`, and data hooks |
-| `@getpaseo/plugin/react-native` | Paseo UI components and UI hooks                                                                       |
-| `@getpaseo/plugin/server`       | Handler-only types such as `PluginHandlerContext`                                                      |
-| `@tanstack/react-query`         | Request state and caching                                                                              |
-| `react`                         | Components and hooks                                                                                   |
-| `react/jsx-runtime`             | Compiled JSX                                                                                           |
-| `react-native`                  | Cross-platform UI                                                                                      |
-| `zod`                           | Shared schemas                                                                                         |
-
-These exact module specifiers use the host's runtime instances. A client bundle that requests another host module fails with `Module "<name>" is not available in plugin client code`.
-
-Do not import `lucide-react-native`, `react-native-svg`, or DOM libraries. Set contribution `icon` fields to a [Lucide icon name](https://lucide.dev/icons/); Paseo validates the name and renders the icon.
-
-### Cross-platform rules
-
-Client code runs on iOS, Android, and in browsers through React Native Web. A component that works
-in your browser and crashes on a phone is the most common plugin bug. The rules:
-
-| Do                                                                         | Do not                                                                      |
-| -------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
-| `View`, `Text`, `Pressable`, `ScrollView`, `TextInput` from `react-native` | `<div>`, `<span>`, `<button>`, or any HTML element                          |
-| `style` objects built from `theme.colors` and `layout.compact`             | `className`, CSS strings, or hardcoded colors                               |
-| `onPress`                                                                  | `onClick`, `onMouseEnter`, or other DOM handlers                            |
-| `Linking`, `Clipboard`-style React Native APIs                             | `window`, `document`, `localStorage`, `navigator`, `location` in components |
-
-The scaffold's `tsconfig.json` omits the DOM library, so `document` and `window` are type errors
-everywhere by default. The one place browser APIs are allowed is `client/web.ts`. It declares the
-narrow shape of each global it uses, gates every export on `Platform.OS`, and gives native the
-alternative:
-
-`client/web.ts`:
-
-```ts
-import { Linking, Platform } from "react-native";
-
-// This plugin typechecks without the DOM library. Declare only what this module uses.
-declare const window: { open(url: string, target: string, features: string): unknown };
-
-export async function openExternal(url: string): Promise<void> {
-  if (Platform.OS === "web") {
-    window.open(url, "_blank", "noopener,noreferrer");
-    return;
-  }
-  await Linking.openURL(url);
-}
-```
-
-Do not add `/// <reference lib="dom" />` or `"DOM"` to `lib`; either one turns DOM types back on
-for the whole project and hides the next mistake. Components import `openExternal` and never touch
-`window` themselves. `layout.platform` on surface and panel props carries the same value as
-`Platform.OS` for rendering decisions.
-
-There is no plugin storage API. Browser storage does not persist settings across Paseo clients.
-There is also no general host navigation API: plugin code cannot open native Paseo routes. Command
-Center callbacks can only open surfaces and panels registered by the same plugin.
-
-### Server runtime
-
-Paseo provides `@getpaseo/plugin`, `@getpaseo/plugin/server`, and `zod` to server code. Backend contributions run in a daemon subprocess with Node access to the host machine. Keep filesystem, process, credential, and other machine-local work under `server/`. A plugin without `index.server.ts` starts no subprocess.
-
-## Entry point and cleanup
-
-Each present entry default-exports one contribution function and returns cleanup. Client entries
-receive `PluginClientContext`; server entries receive `PluginServerContext`. Every client `add*`
-returns an idempotent remover. The entry cleanup runs before Paseo removes remaining registrations.
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { Main } from "./client/main";
-
-export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", Main);
-  return () => {};
-}
-```
-
-Cleanup can be async. Release timers, watchers, sockets, and other resources created by the plugin. Paseo also removes registrations, unmounts surfaces, rejects pending RPCs, closes the plugin's daemon session, and stops its subprocess on reload, disable, removal, disconnect, or daemon shutdown.
-
-## Surfaces and sidebar items
-
-Register a component, then point a sidebar item at its surface ID:
-
-`client/main.tsx`:
-
-```tsx
-import type { PluginSurfaceProps } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function Main({ theme, host, layout }: PluginSurfaceProps) {
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground },
-      detail: { color: theme.colors.foregroundMuted },
-    }),
-    [theme, layout.compact],
-  );
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{host.label}</Text>
-      <Text style={styles.detail}>{layout.platform}</Text>
-    </View>
-  );
-}
-```
-
-`index.client.tsx`:
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { Main } from "./client/main";
-
-export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", Main);
-  client.addSidebarItem({
-    id: "main",
-    title: "My plugin",
-    icon: "Blocks",
-    surface: "main",
-  });
-  return () => {};
-}
-```
-
-`PluginSurfaceProps` contains:
-
-| Field        | Meaning                                                                                                                      |
-| ------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| `theme`      | Typed `PluginTheme` color tokens for the active Paseo theme.                                                                 |
-| `host`       | Selected host `id` and display `label`.                                                                                      |
-| `layout`     | `compact` and the `ios`, `android`, or `web` platform.                                                                       |
-| `navigation` | Optional client navigation. `openAgent({ agentId })` and `openWorkspace({ workspaceId })` open targets on the selected host. |
-
-Paseo owns the route, header, close action, host picker, error boundary, and query client. The plugin owns the surface body.
-
-## Host UI
-
-Import Paseo-owned UI from `@getpaseo/plugin/react-native` in client code. This example
-opens a controlled modal, renders a host icon, and confirms the action with a toast:
-
-```tsx
-import type { PluginSurfaceProps } from "@getpaseo/plugin";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/react-native";
-import { useState } from "react";
-import { Pressable, Text, View } from "react-native";
-
-export function IssueActions({ theme }: PluginSurfaceProps) {
-  const [open, setOpen] = useState(false);
-  const toast = useToast();
-
-  function saveIssue() {
-    toast.show("Issue saved", { variant: "success" });
-    setOpen(false);
-  }
-
-  return (
-    <View>
-      <Pressable accessibilityRole="button" onPress={() => setOpen(true)}>
-        <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
-          <Icon name="Pencil" size={18} color={theme.colors.foreground} />
-          <Text style={{ color: theme.colors.foreground }}>Edit issue</Text>
-        </View>
-      </Pressable>
-
-      <Modal
-        title="Edit issue"
-        icon={<Icon name="Pencil" size={18} color={theme.colors.foreground} />}
-        open={open}
-        onOpenChange={setOpen}
-      >
-        <Modal.Content>
-          <Pressable accessibilityRole="button" onPress={saveIssue}>
-            <Text style={{ color: theme.colors.foreground }}>Save</Text>
-          </Pressable>
-        </Modal.Content>
-      </Modal>
-    </View>
-  );
-}
-```
-
-### Modal
-
-`Modal` uses a bottom sheet on compact layouts and a centered dialog otherwise. The plugin owns
-the `open` state.
-
-| Prop           | Type                      | Required | Behavior                                     |
-| -------------- | ------------------------- | -------- | -------------------------------------------- |
-| `title`        | `string`                  | Yes      | Labels the modal and its visible header.     |
-| `icon`         | `ReactNode`               | No       | Renders before the title in the header.      |
-| `open`         | `boolean`                 | Yes      | Shows the modal content when `true`.         |
-| `onOpenChange` | `(open: boolean) => void` | Yes      | Receives `false` when the user dismisses it. |
-| `children`     | `ReactNode`               | Yes      | Contains `Modal.Content`.                    |
-
-`Modal.Content` owns the body below the host-rendered header:
-
-| Prop       | Type        | Required | Behavior                                      |
-| ---------- | ----------- | -------- | --------------------------------------------- |
-| `children` | `ReactNode` | Yes      | Renders the plugin's React Native UI content. |
-
-The close button, backdrop, platform back action, web Escape key, and compact sheet gesture dismiss
-the modal. Dismissal calls `onOpenChange(false)`; the plugin must update `open` to close it.
-
-Modal children keep the plugin runtime context. `usePaseo`, `useRpc`, `useWorkspace`, and
-`useAgent` work inside them.
-
-### Toasts
-
-`useToast()` returns two methods:
-
-| Method                    | Behavior                                                    |
-| ------------------------- | ----------------------------------------------------------- |
-| `show(message, options?)` | Shows a toast for 2,200 ms unless `durationMs` is supplied. |
-| `error(message)`          | Shows an error toast for 3,200 ms.                          |
-
-`show` accepts these options:
-
-| Option       | Type                                                       | Default     |
-| ------------ | ---------------------------------------------------------- | ----------- |
-| `variant`    | `"default" \| "info" \| "success" \| "warning" \| "error"` | `"default"` |
-| `durationMs` | `number`                                                   | `2200`      |
-
-Showing another toast replaces the currently visible toast. An empty message is ignored.
-
-### Icons
-
-`Icon` renders a [Lucide icon](https://lucide.dev/icons/) from Paseo's installed icon set. Plugin bundles do not import
-`lucide-react-native` or `react-native-svg`.
-
-| Prop    | Type     | Required | Behavior                                        |
-| ------- | -------- | -------- | ----------------------------------------------- |
-| `name`  | `string` | Yes      | Lucide icon name. Unknown names render nothing. |
-| `size`  | `number` | No       | Icon width and height.                          |
-| `color` | `string` | No       | Icon color. Use a plugin theme token.           |
-
-## Timeline items
-
-A plugin can replace an agent timeline entry with its own data and React Native renderer. Both
-registrations are client contributions. Paseo applies the transformer while building the render
-model, including every live streaming update.
-
-```tsx
-import type { PluginClientContext, PluginTimelineItemProps } from "@getpaseo/plugin";
-import { Text } from "react-native";
-import { z } from "zod";
-
-const schema = z.object({ label: z.string() });
-
-function Card({ item, theme }: PluginTimelineItemProps<z.output<typeof schema>>) {
-  return <Text style={{ color: theme.colors.foreground }}>{item.data.label}</Text>;
-}
-
-export default function contribute(client: PluginClientContext) {
-  client.addTimelineTransformer({
-    id: "command-card",
-    query: { itemType: "tool_call" },
-    transform({ item, phase }) {
-      return {
-        items: [
-          {
-            type: "plugin",
-            kind: "command-card",
-            version: 1,
-            data: { label: item.name, phase },
-          },
-        ],
-      };
-    },
-  });
-  client.addTimelineRenderer({
-    kind: "command-card",
-    version: 1,
-    schema,
-    Component: Card,
-  });
-  return () => {};
-}
-```
-
-`query.itemType` is the stable, coarse selector. Inspect the selected item inside `transform` for
-provider- or tool-specific recognition. Returning `undefined` keeps the original entry. Returning
-`items` replaces it; an empty array removes it. Item `data` must be JSON-compatible. The `phase`
-input is `"streaming"` for running tool calls and loading reasoning, and `"complete"` otherwise.
-Each replacement may set an optional plugin-local `id`; otherwise Paseo uses its index within that
-source item's output.
-
-Renderers receive `agentId`, `item`, `timestamp`, `theme`, `host`, and `layout`. Paseo validates
-`item.data` with the registered schema before rendering. Keep transformers synchronous and
-deterministic. Paseo memoizes results by source-item reference and derives replacement identity from
-the source row, so updates to one streaming item do not remount its renderer. Use the exported
-`useRevealedText(text, phase)` hook when a renderer should pace streaming text like Paseo's built-in
-assistant rows.
-
-### Append a timeline row from the daemon
-
-A server handler can add a plugin-owned row to canonical history:
-
-```ts
-import type { PluginHandlerContext } from "@getpaseo/plugin";
-
-async function publishReview(agentId: string, { paseo }: PluginHandlerContext) {
-  await paseo.agents.ref(agentId).timeline.append({
-    type: "plugin",
-    id: "review",
-    kind: "review-result",
-    version: 1,
-    data: { verdict: "ready" },
-  });
-}
-```
-
-| Field     | Type             | Required | Behavior                                                       |
-| --------- | ---------------- | -------- | -------------------------------------------------------------- |
-| `type`    | `"plugin"`       | Yes      | Selects the plugin timeline variant.                           |
-| `id`      | `string`         | Yes      | Stable plugin-local identity. Reusing it replaces the old row. |
-| `kind`    | `string`         | Yes      | Selects the registered renderer.                               |
-| `version` | positive integer | Yes      | Selects the renderer contract version.                         |
-| `data`    | JSON-compatible  | Yes      | Renderer payload, at most 64 KiB after JSON serialization.     |
-
-The daemon stamps `pluginId` from the calling plugin session and rejects this RPC from non-plugin
-sessions. The row appears live, survives timeline refetches, and keeps only the latest value for the
-same plugin and `id`. If its renderer is missing, Paseo shows the existing unavailable row. Daemons
-reject `data` over the limit rather than truncating it. Daemons that support this operation
-advertise `server_info.features.pluginTimelineItems`.
-
-## Theme and layout
-
-Plugin UI runs on desktop, browser, iOS, and Android, across every Paseo theme. `theme` is a typed `PluginTheme` mapped from the active host theme. Color and spacing must come from those props. Hardcoded colors and unstyled `Text` break when the host theme changes.
-
-Recreate styles when `theme` or `layout.compact` changes.
-
-| Key                             | Required for               | Use it for                          |
-| ------------------------------- | -------------------------- | ----------------------------------- |
-| `theme.colors.foreground`       | Every primary `Text`       | Titles and body copy                |
-| `theme.colors.foregroundMuted`  | Secondary `Text`           | Labels and supporting copy          |
-| `theme.colors.surface0`         | Root view                  | Panel background                    |
-| `theme.colors.surface1`         | Raised surfaces            | Cards and panels                    |
-| `theme.colors.surface2`         | Control surfaces           | Inputs and secondary controls       |
-| `theme.colors.border`           | Surface boundaries         | Borders and dividers                |
-| `theme.colors.accent`           | Primary action fills       | Buttons and selected states         |
-| `theme.colors.accentForeground` | Text on an accent fill     | Button labels                       |
-| `theme.colors.statusSuccess`    | Success feedback           | Success messages and indicators     |
-| `theme.colors.statusWarning`    | Warning feedback           | Warning messages and indicators     |
-| `theme.colors.statusDanger`     | Failure copy               | Error messages and destructive text |
-| `layout.compact`                | Padding and stacking       | `true` on mobile and narrow windows |
-| `layout.platform`               | Platform-specific behavior | `ios`, `android`, or `web`          |
-
-Do not hardcode `#000`, `#fff`, or React Native's default text color. Primary copy uses `foreground`. Labels use `foregroundMuted`. Tighten padding when `layout.compact` is true.
-
-Workspace and agent panels receive the same `theme`, `layout`, and optional `navigation` fields.
-
-## Contribute a theme
-
-`addTheme` adds a light or dark theme to Settings → Appearance, listed under the built-ins by its
-`name`. A theme is data, so it needs no component file:
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-
-export default function contribute(client: PluginClientContext) {
-  client.addTheme({
-    id: "mocha",
-    name: "Catppuccin Mocha",
-    appearance: "dark",
-    colors: {
-      background: "#1e1e2e",
-      foreground: "#cdd6f4",
-      raised: "#313244",
-      control: "#45475a",
-      border: "#45475a",
-      accent: "#cba6f7",
-      mutedForeground: "#a6adc8",
-      ring: "#6c7086",
-    },
-  });
-  return () => {};
-}
-```
-
-Every color is a hex string; anything else fails to load. Paseo expands the palette into the full
-token set the built-in dark themes use, so a contributed theme covers panels, menus, diffs, status
-colors, and the terminal without listing them.
-
-| Color             | Becomes                                                           |
-| ----------------- | ----------------------------------------------------------------- |
-| `background`      | App, workspace, and terminal background                           |
-| `foreground`      | Primary text, terminal foreground and cursor                      |
-| `raised`          | Cards, popovers, and hovered rows                                 |
-| `control`         | Inputs, secondary fills, and the light-theme sidebar              |
-| `border`          | Borders and the highest raised-surface tint                       |
-| `accent`          | Buttons, selection, and focus. Optional; `foreground` if omitted. |
-| `mutedForeground` | Secondary text                                                    |
-| `ring`            | Focus rings, scrollbars, and terminal bright black                |
-
-`appearance` is `"light"` or `"dark"`. Paseo uses it to select the matching surface, status,
-diff, syntax, terminal, and shadow derivation.
-
-Only one contributed theme is active at a time. Selecting one persists the choice; if the plugin is
-later disabled or removed, Paseo falls back to the default theme rather than leaving the app
-unpainted.
-
-Themes need a host that supports them. A client released before `addTheme` cannot evaluate that client entry and reports
-`client.addTheme is not a function`. Update the client.
-
-## Workspace panels
-
-Register one panel for workspace or agent context:
-
-`client/review.tsx`:
-
-```tsx
-import { type PluginAgentPanelProps, useAgent, useWorkspace } from "@getpaseo/plugin";
-import { useMemo } from "react";
-import { Text, View } from "react-native";
-
-export function ReviewPanel({ theme, layout, workspaceId, agentId }: PluginAgentPanelProps) {
-  const workspaceName = useWorkspace(workspaceId, (workspace) => workspace.name);
-  const agent = useAgent(agentId, ({ id, title }) => ({ id, title }));
-  const styles = useMemo(
-    () => ({
-      screen: {
-        flex: 1,
-        padding: layout.compact ? 16 : 24,
-        backgroundColor: theme.colors.surface0,
-      },
-      title: { color: theme.colors.foreground },
-      detail: { color: theme.colors.foregroundMuted },
-    }),
-    [theme, layout.compact],
-  );
-  return (
-    <View style={styles.screen}>
-      <Text style={styles.title}>{workspaceName}</Text>
-      <Text style={styles.detail}>{agent?.title ?? agent?.id}</Text>
-    </View>
-  );
-}
-```
-
-`index.client.tsx`:
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { ReviewPanel } from "./client/review";
-
-export default function contribute(client: PluginClientContext) {
-  client.addWorkspacePanel({
-    id: "review",
-    title: "Review",
-    icon: "Scan",
-    context: "agent",
-    locations: ["workspace", "explorer"],
-    Component: ReviewPanel,
-  });
-  return () => {};
-}
-```
-
-`addWorkspacePanel` fields:
-
-| Field       | Required | Meaning                                                       |
-| ----------- | -------- | ------------------------------------------------------------- |
-| `id`        | Yes      | Plugin-local panel ID.                                        |
-| `title`     | Yes      | Workspace-tab title.                                          |
-| `icon`      | Yes      | Lucide icon name.                                             |
-| `context`   | Yes      | `workspace` or `agent`.                                       |
-| `locations` | No       | `workspace` and/or `explorer`. Defaults to `workspace`.       |
-| `Component` | Yes      | React Native component matching the selected context's props. |
-
-A workspace panel receives `PluginWorkspacePanelProps`: `context: "workspace"`, `theme`, `host`, `layout`, and `workspaceId`. An agent panel receives `PluginAgentPanelProps`: `context: "agent"`, the same common fields and `workspaceId`, plus `agentId`.
-
-Read cached state with `useWorkspace(workspaceId, selector)` and `useAgent(agentId, selector)`. A selector is required. Paseo compares its result shallowly, so selecting `{ name, status }` does not re-render when unrelated fields change. Select every field the component renders in one call; do not select the whole snapshot.
-
-Both hooks return `null` when the record is unavailable. Otherwise they run synchronously against normalized client state. Snapshot DTOs and their nested values are deeply readonly and frozen at runtime. Do not call plugin RPC to discover the current workspace or agent. Fetch optional or vendor-specific enrichment after the component renders.
-
-Workspace snapshot fields:
-
-| Field                | Type                                                              |
-| -------------------- | ----------------------------------------------------------------- |
-| `id`                 | `string`                                                          |
-| `projectId`          | `string`                                                          |
-| `projectDisplayName` | `string`                                                          |
-| `projectRootPath`    | `string`                                                          |
-| `directory`          | `string`                                                          |
-| `projectKind`        | `"git" \| "non_git" \| "directory"`                               |
-| `kind`               | `"directory" \| "local_checkout" \| "checkout" \| "worktree"`     |
-| `name`               | `string`                                                          |
-| `title`              | `string \| null`                                                  |
-| `status`             | `"needs_input" \| "failed" \| "running" \| "attention" \| "done"` |
-| `statusEnteredAt`    | ISO timestamp or `null`                                           |
-| `archivingAt`        | ISO timestamp or `null`                                           |
-| `diffStat`           | `{ additions: number; deletions: number } \| null`                |
-
-Agent snapshot fields:
-
-| Field               | Type                                                           |
-| ------------------- | -------------------------------------------------------------- |
-| `id`                | `string`                                                       |
-| `workspaceId`       | `string`                                                       |
-| `provider`          | `string`                                                       |
-| `status`            | `"initializing" \| "idle" \| "running" \| "error" \| "closed"` |
-| `createdAt`         | ISO timestamp                                                  |
-| `updatedAt`         | ISO timestamp                                                  |
-| `lastActivityAt`    | ISO timestamp                                                  |
-| `title`             | `string \| null`                                               |
-| `cwd`               | `string`                                                       |
-| `model`             | `string \| null`                                               |
-| `currentModeId`     | `string \| null`                                               |
-| `thinkingOptionId`  | `string \| null`                                               |
-| `requiresAttention` | `boolean`                                                      |
-| `attentionReason`   | `"finished" \| "error" \| "permission" \| null`                |
-| `parentAgentId`     | `string \| null`                                               |
-| `labels`            | `Record<string, string>`                                       |
-
-Paseo owns tab focus, splitting, closing, persistence, query state, the API/RPC providers, and the render error boundary. A restored tab whose plugin, panel, context, workspace, or agent is unavailable stays open with an unavailable message instead of crashing the workspace.
-
-## Command Center items
-
-Open the Command Center with **⌘K** on macOS or **Ctrl+K** on Windows and Linux, then search for the item title.
-
-Register an action and open a panel from the callback:
-
-```tsx
-import { defineRpc } from "@getpaseo/plugin";
-import { z } from "zod";
-
-const refreshReview = defineRpc({
-  name: "review.refresh",
-  input: z.object({ agentId: z.string() }),
-  output: z.object({ refreshed: z.boolean() }),
-});
-
-client.addCommandCenterItem({
-  id: "open-review",
-  title: "Open review",
-  icon: "Scan",
-  keywords: ["inspect"],
-  context: "agent",
-  async onSelect({ paseo, rpc, workspace, agent, openPanel }) {
-    await paseo.workspaces.ref(workspace.id).setTitle(`Review ${agent.id}`);
-    await rpc(refreshReview, { agentId: agent.id });
-    openPanel("review");
-  },
-});
-```
-
-`addCommandCenterItem` fields:
-
-| Field      | Required | Meaning                                        |
-| ---------- | -------- | ---------------------------------------------- |
-| `id`       | Yes      | Plugin-local item ID.                          |
-| `title`    | Yes      | Search result title.                           |
-| `icon`     | Yes      | Lucide icon name.                              |
-| `keywords` | No       | Additional Command Center search terms.        |
-| `context`  | Yes      | `global`, `workspace`, or `agent`.             |
-| `onSelect` | Yes      | Client-side callback for the matching context. |
-
-Global items appear on the installation's selected host. Workspace items appear only when that host has an active cached workspace. Agent items appear only when the focused workspace tab is an agent or an agent-context plugin panel whose cached record belongs to that workspace. Missing context removes the item rather than calling the plugin to discover it.
-
-Every callback receives:
-
-| Field                     | Context             | Meaning                                                                                                         |
-| ------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------- |
-| `context`                 | All                 | Matching discriminator.                                                                                         |
-| `paseo`                   | All                 | Selected host's existing `PaseoApi`.                                                                            |
-| `rpc(contract, input)`    | All                 | Typed call to this installation's daemon-side plugin handler.                                                   |
-| `openSurface(id)`         | All                 | Opens one of this plugin's registered global surfaces.                                                          |
-| `workspace`               | Workspace and agent | Synchronous workspace snapshot.                                                                                 |
-| `agent`                   | Agent               | Synchronous matching agent snapshot.                                                                            |
-| `openPanel(id, options?)` | Workspace and agent | Opens a registered panel in the callback's current context. Pass `{ location: "explorer" }` to target Explorer. |
-
-An agent callback may open either an agent panel or a workspace panel. A workspace callback may open only a workspace panel. Unknown surface and panel IDs fail visibly. Use `paseo` for normal workspace, agent, provider, and daemon-config operations. Use `rpc` for plugin-specific filesystem, credential, vendor, or daemon-local work.
-
-## Slash commands
-
-Register a command that runs in the Paseo client when the user submits `/name args` from the
-message composer. The text is never sent to the agent:
-
-```ts
-client.addSlashCommand({
-  name: "review",
-  description: "Run the review bot",
-  argumentHint: "[scope]",
-  context: "agent",
-  async onSubmit({ args, agent, rpc, openPanel }) {
-    await rpc(refreshReview, { agentId: agent.id, scope: args });
-    openPanel("review");
-  },
-});
-```
-
-| Field          | Required | Meaning                                        |
-| -------------- | -------- | ---------------------------------------------- |
-| `name`         | Yes      | Command name without the leading slash.        |
-| `description`  | Yes      | Composer autocomplete description.             |
-| `argumentHint` | Yes      | Short usage hint shown after the command name. |
-| `context`      | Yes      | `"workspace"` or `"agent"`.                    |
-| `onSubmit`     | Yes      | Client callback for the matching context.      |
-
-`onSubmit` receives the matching Command Center callback context plus `args`. For `/review src`,
-`args` is `"src"`; Paseo trims only the remainder's leading and trailing whitespace and leaves
-parsing to the plugin. Paseo owns the autocomplete row, input clearing, and the error toast. It
-does not wait for `onSubmit` or show a pending state; use a composer pill or panel for that.
-
-Precedence is built-in client commands, plugin commands, then provider commands. A lower-precedence
-collision is omitted. Built-in aliases also reserve their names. The first plugin in stable catalog
-order wins a collision between plugins. Commands do not run while the composer has attachments.
-
-## Composer pills
-
-The client entry owns pill creation and removal. This can live directly in `index.client.tsx` or in
-a function it imports from `client/`:
-
-```tsx
-import {
-  Icon,
-  type PluginClientContext,
-  type PluginComposerPillProps,
-  useAgent,
-} from "@getpaseo/plugin";
-import { Text } from "react-native";
-
-function ReviewPill({ theme, agentId }: PluginComposerPillProps) {
-  const agent = useAgent(agentId, ({ title }) => ({ title }));
-  return (
-    <>
-      <Icon name="Scan" size={14} color={theme.colors.foregroundMuted} />
-      <Text numberOfLines={1} style={{ color: theme.colors.foregroundMuted, flexShrink: 1 }}>
-        {agent?.title ?? "Review"}
-      </Text>
-    </>
-  );
-}
-
-export default function contribute(client: PluginClientContext) {
-  const pills = new Map<string, () => void>();
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
-    if (update.kind !== "upsert" || !update.agent.workspaceId) return;
-    const { id: agentId, workspaceId } = update.agent;
-    pills.get(agentId)?.();
-    pills.set(
-      agentId,
-      client.addComposerPill({
-        id: "review",
-        title: "Open review",
-        workspaceId,
-        agentId,
-        Component: ReviewPill,
-        async onPress() {
-          await client.rpc(refreshReview, { agentId });
-          client.openPanel("review", { workspaceId, agentId });
-        },
-      }),
-    );
-  });
-  return () => {
-    unsubscribe();
-    for (const remove of pills.values()) remove();
-  };
-}
-```
-
-`addComposerPill` fields:
-
-| Field         | Required | Meaning                                                    |
-| ------------- | -------- | ---------------------------------------------------------- |
-| `id`          | Yes      | Plugin-local ID within the target agent.                   |
-| `title`       | Yes      | Accessible button label.                                   |
-| `workspaceId` | Yes      | Workspace whose composer track owns the pill.              |
-| `agentId`     | Yes      | Agent whose composer track owns the pill.                  |
-| `Component`   | Yes      | React Native component rendering the pill's icon and text. |
-| `onPress`     | Yes      | Client-side callback.                                      |
-
-The client entry runs once per plugin installation in each connected app. Its context exposes
-`paseo`, typed `rpc`, `openSurface`, explicit-context `openPanel`, and every client registration.
-`addComposerPill` returns an idempotent removal function. Paseo also removes every outstanding pill
-when the plugin installation or host connection is torn down.
-
-Paseo owns the pressable, shared pill chrome, pending state, error reporting, and track-bar
-placement. The component receives `theme`, `host`, `layout`, `workspaceId`, and `agentId`. Read
-current values with `useWorkspace` and `useAgent`. The plugin owns when the pill exists, its icon
-and text, and the callback. `openPanel(id, { workspaceId, agentId? })` opens or focuses a panel
-registered by the same plugin.
-
-## Use the Paseo SDK
-
-Use `usePaseo()` for ordinary Paseo operations from a surface. It borrows the selected host's existing connection; do not create another client.
-
-```tsx
-import { usePaseo } from "@getpaseo/plugin";
-import { Pressable, Text } from "react-native";
-
-function PullRequestAction() {
-  const paseo = usePaseo();
-
-  async function createReviewWorkspace() {
-    const workspace = await paseo.workspaces.create({
-      title: "Review PR 42",
-      source: {
-        kind: "worktree",
-        cwd: "/absolute/path/to/repository",
-        action: "checkout",
-        checkoutSource: { kind: "change_request", forge: "github", number: 42 },
-      },
-    });
-    await workspace.agents.create({
-      config: { provider: "codex/gpt-5.5" },
-      prompt: "Review PR #42.",
-    });
-  }
-
-  return (
-    <Pressable accessibilityRole="button" onPress={() => void createReviewWorkspace()}>
-      <Text>Create review workspace</Text>
-    </Pressable>
-  );
-}
-```
-
-The returned API covers projects, workspaces, agents, providers, and daemon config. See the [SDK API reference](/docs/sdk/reference) for its methods. Connection lifecycle methods are intentionally absent because Paseo owns the connection.
-
-## Add plugin-specific backend behavior
-
-Use plugin RPC only for work that is not a normal Paseo operation: reading a vendor API, accessing daemon-local resources, or keeping credentials off the client.
-
-Define one contract with Zod, handle it in the subprocess, and call it from the surface:
-
-`shared/greeting.ts`:
-
-```ts
-import { defineRpc } from "@getpaseo/plugin";
-import { z } from "zod";
-
-export const greeting = defineRpc({
-  name: "greeting.create",
-  input: z.object({ name: z.string() }),
-  output: z.object({ message: z.string() }),
-});
-```
-
-`client/greeting.tsx`:
-
-```tsx
-import { useRpc } from "@getpaseo/plugin";
-import { greeting } from "../shared/greeting";
-
-export function GreetingButton() {
-  const createGreeting = useRpc(greeting);
-  // Call createGreeting({ name: "Ada" }) from an event or query.
-  return null;
-}
-```
-
-`server/greeting.ts`:
-
-```ts
-import type { RpcInput } from "@getpaseo/plugin";
-import { greeting } from "../shared/greeting";
-
-export function createGreeting({ name }: RpcInput<typeof greeting>) {
-  return { message: `Hello, ${name}` };
-}
-```
-
-`index.client.tsx`:
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { GreetingButton } from "./client/greeting";
-
-export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", GreetingButton);
-  return () => {};
-}
-```
-
-`index.server.ts`:
-
-```ts
-import type { PluginServerContext } from "@getpaseo/plugin";
-import { createGreeting } from "./server/greeting";
-import { greeting } from "./shared/greeting";
-
-export default function contribute(server: PluginServerContext) {
-  server.handle(greeting, createGreeting);
-  return () => {};
-}
-```
-
-Inputs and outputs are validated on both sides. RPC names start with a lowercase letter and contain lowercase letters, numbers, dots, hyphens, or underscores. `useRpc()` returns a typed async function. Use TanStack Query for request state, caching, and mutations.
-
-Backend handlers receive the same `PaseoApi` as `{ paseo }`. Their connection belongs to the subprocess and closes when the plugin stops. Backend code can use Node APIs and dependencies installed in the plugin directory.
-
-## Debug backend output
-
-Backend contributions can write to stdout and stderr with normal Node logging:
-
-```ts
-console.log("Refreshing issues");
-console.error("Issue refresh failed", error);
-```
-
-Paseo adds `[paseo]` entries when the plugin starts loading, becomes ready, starts stopping, and has
-stopped. It records compilation and load failures as stderr entries, including failures that happen
-before the plugin subprocess starts. Paseo also captures output emitted during initialization, RPC
-handlers, cleanup, and process failure. Protocol traffic uses a separate channel, so `console.log()`
-cannot corrupt plugin RPCs.
-
-Open **Settings → Plugins → Logs** for the plugin, or inspect the same recent tail from the daemon
-CLI:
-
-```bash
-paseo plugin logs my-plugin
-paseo plugin logs my-plugin --json
-paseo --host <url> plugin logs my-plugin
-```
-
-The command returns a snapshot rather than following live output. Refresh the settings view or run
-the command again for newer entries. Each entry includes its timestamp, stdout or stderr stream,
-sequence, and message.
-
-Paseo retains up to 500 entries and 256 KiB per plugin in memory. Individual lines are capped at
-16 KiB. Reload, disable, compilation failure, initialization failure, and process failure retain the
-tail. Removing the plugin clears it, and a daemon restart starts a new tail. Structured copies are
-also written to the daemon log at `$PASEO_HOME/daemon.log`.
-
-Only daemon-side output is captured. Logs from client surfaces remain in the app runtime. Do not log
-credentials, access tokens, or other secrets: connected users can read the retained tail, and the
-daemon log persists it.
-
-## Add a composer attachment source
-
-An attachment source searches external resources and returns a stable text snapshot for an agent prompt. Keep credentials and vendor calls in the backend handler.
-
-`shared/issues.ts`:
-
-```ts
-import { defineAttachmentSource, defineRpc } from "@getpaseo/plugin";
-import { z } from "zod";
-
-export 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(),
-      }),
-    ),
-  }),
-});
-
-export const issues = defineAttachmentSource({
-  id: "issues",
-  title: "Acme issue",
-  icon: "CircleDot",
-  pickerTitle: "Attach Acme issue",
-  searchPlaceholder: "Search by identifier or title",
-  search: searchIssues,
-});
-```
-
-`server/issues.ts`:
-
-```ts
-import type { RpcInput } from "@getpaseo/plugin";
-import { searchIssues } from "../shared/issues";
-
-export function search({ query }: RpcInput<typeof searchIssues>) {
-  return searchAcmeIssues(query);
-}
-```
-
-`index.client.tsx`:
-
-```ts
-import type { PluginClientContext } from "@getpaseo/plugin";
-import { issues } from "./shared/issues";
-
-export default function contribute(client: PluginClientContext) {
-  client.addAttachmentSource(issues);
-  return () => {};
-}
-```
-
-`index.server.ts`:
-
-```ts
-import type { PluginServerContext } from "@getpaseo/plugin";
-import { search } from "./server/issues";
-import { searchIssues } from "./shared/issues";
-
-export default function contribute(server: PluginServerContext) {
-  server.handle(searchIssues, search);
-  return () => {};
-}
-```
-
-Paseo owns the composer menu, search picker, selected pill, draft state, and submission. The `text` value is the complete snapshot sent to the agent.
-
-## Hosts and lifecycle
-
-Plugins are installed per daemon. When the same contribution exists on several connected hosts, Paseo shows one sidebar item and adds a host picker. The selected host supplies the bundle, Paseo API, RPC transport, and query cache. Calls never fall through to another host when the selected host is offline.
-
-Attachment sources remain scoped to each composer's host.
-
-Workspace panels and Command Center items stay scoped to the active host and exact cached context.
-Reload replaces their registrations. Disable, removal, host disconnect, and evaluation failure
-remove Command Center items and clear the installation's query state. An already-restored panel tab
-remains as unavailable until its matching contribution returns or the user closes it. Panel render
-failures stay inside the plugin error boundary.
-
-## CLI reference
-
-```bash
-paseo plugin init /absolute/path/to/plugin
-paseo plugin install /absolute/path/to/plugin
-paseo plugin install /absolute/path/to/plugin --id another-runtime-id
-paseo plugin add owner/repository
-paseo plugin add https://git.example.com/owner/repository.git --ref main
-paseo plugin add owner/monorepo:plugins/review
-paseo plugin status [id]
-paseo plugin update <id>
-paseo plugin update --all
-paseo plugin ls
-paseo plugin reload my-plugin
-paseo plugin logs my-plugin
-paseo plugin disable my-plugin
-paseo plugin enable my-plugin
-paseo plugin remove my-plugin
-```
-
-Put `--host <url>` before a management command when the target is not the CLI's default daemon. `remove`
-never deletes a directory source; it deletes the managed checkout for a Git source. The install-time
-`--id` is the runtime ID and allows the same directory or repository to be installed more than once.
-
-> **Trust every plugin you add.** `paseo plugin add` and `paseo plugin install` mean “I trust this codebase.” Server code and Git preparation commands run unsandboxed with the daemon user's access on the daemon host; client contributions run inside Paseo. Dependencies and future updates are part of that decision. With the global `--host` option, commands run on the remote daemon host.
-
-An existing directory wins over `owner/repository` GitHub shorthand. Append `:relative/path` when
-the plugin lives below the repository root. Omit `--ref` to track the default branch. Explicit
-branches track updates; tags and commits stay pinned.
-
-Most plugins should omit `build`. Use it only when the staged checkout must install a dependency
-that Paseo does not provide, generate source or assets, or perform another required preparation
-step:
-
-```json
-{
-  "id": "review",
-  "build": [
-    ["npm", "ci"],
-    ["npm", "run", "build"]
-  ]
-}
-```
-
-`build` is a list of non-empty argv arrays. Paseo runs each executable directly, without a shell,
-from the staged plugin directory after resolving the exact commit and manifest. It never infers a
-package manager or commands from lockfiles. Install and update both run `build` before validation,
-compilation, activation, or replacement. A failing command reports its output, discards the
-candidate, and leaves the installed/running version intact. The daemon log records each command and
-output; with the global `--host` option, execution is on that daemon host.
-
-Run `npm run typecheck` before install or reload. Never edit the daemon config directly.
-
-The daemon-wide **Enable plugins** switch lives under **Settings → Plugins**. A configured plugin remains `disabled` until that switch and the plugin's own enabled state are both on.
-
-The switch is the root `pluginsEnabled` field in `config.json`. After changing it, run `paseo reload --json`. Enabling starts every configured plugin whose own `enabled` value is not `false`; disabling tears down all plugins. No daemon restart is required. Manual edits to plugin source entries are not reloaded; use the plugin lifecycle commands for those.
-
-## Load failures
-
-Use `paseo plugin ls` to read the current status and error.
-
-| Symptom                                                               | Check                                                                                                                                   |
-| --------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `Plugin entry split is required`                                      | The directory has only an `index.ts` entry. Follow the [migration guide](/docs/plugins/v0.8/migration).                                 |
-| `Plugin entry points are missing`                                     | Neither `index.client.tsx` nor `index.server.ts` exists with that exact name.                                                           |
-| `server-only module cannot be imported into the plugin client bundle` | Client code imports `server/` or a `*.server.*` file. Move the work behind an RPC and import its contract from `shared/`.               |
-| `client-only module cannot be imported into the plugin server bundle` | Server code imports `client/` or a `*.client.*` file. Register that contribution from `index.client.tsx` instead.                       |
-| `Node module cannot be imported into the plugin client bundle`        | Client code imports `node:*`. Move the operation to `server/` and call it through an RPC.                                               |
-| Sidebar item is missing                                               | The plugin is `running`, the item references an existing surface, the icon name is valid, and the client is on the installation's host. |
-| Client module is unavailable                                          | Import only the host-provided client modules listed above.                                                                              |
-| RPC rejects                                                           | Check both Zod schemas and the daemon-side handler error.                                                                               |
-| Edited code does not appear                                           | Run `npm run typecheck`, then `paseo plugin reload <id>`.                                                                               |
-| Reload fails                                                          | Read `paseo plugin ls` and `paseo plugin logs <id>`, fix the source error, then reload; Paseo does not restore the previous bundle.     |
-| Plugin exits unexpectedly                                             | Read `paseo plugin logs <id>` for retained initialization, cleanup, stderr, and final crash output.                                     |
diff --git a/public-docs/providers.md b/public-docs/providers.md
index fbf5e0c84c..fc23bff784 100644
--- a/public-docs/providers.md
+++ b/public-docs/providers.md
@@ -8,7 +8,9 @@ category: Providers
 
 # Providers
 
-Paseo doesn't ship its own coding agent. It launches and supervises **existing CLIs you've already installed and authenticated**, Claude Code, Codex, OpenCode, Cursor, Gemini, and the rest. Your subscriptions, your config, your skills, your MCP servers all stay intact. Paseo just gives you a UI, a CLI, a relay, and orchestration on top.
+Paseo runs **existing coding agents you've installed and authenticated** in workspaces with an editor, terminals, diffs, and, on desktop, a browser. Run several agents in parallel, choose a provider for each task, and review their work in the same app. Your subscriptions, config, skills, and MCP servers stay intact.
+
+To try the workflow, [run parallel tasks in separate worktrees](/docs/parallel-development).
 
 ## Mental model
 
@@ -16,7 +18,7 @@ A provider is the contract between Paseo and one external agent CLI: how to laun
 
 ## Two tiers
 
-- **Native support**, Paseo ships a bundled adapter for the major agents (Claude Code, Codex, OpenCode, pi). Auto-discovered when the underlying CLI is installed, with mode metadata and voice support where applicable.
+- **Native support**, Paseo ships a bundled adapter for the major agents (Claude Code, Codex, OpenCode, Pi, [Antigravity](/docs/supported-providers#antigravity), [Muse Code](/docs/muse-code)). Auto-discovered when the underlying CLI is installed, with mode metadata and voice support where applicable.
 - **ACP catalog**, any agent speaking the [Agent Client Protocol](https://agentclientprotocol.com) is supported through a generic adapter. Paseo ships a curated catalog of one-click installs (Cursor, Gemini, GitHub Copilot, Hermes, Kimi, Qwen Code, and 25+ more), and you can add any other ACP agent yourself.
 
 Either way, **you install the underlying CLI**. Paseo runs it.
@@ -24,5 +26,6 @@ Either way, **you install the underlying CLI**. Paseo runs it.
 ## Where to go next
 
 - [Supported providers](/docs/supported-providers), the full list with install links.
-- [Custom providers](/docs/custom-providers), add your own provider, point an existing one at a different endpoint, run multiple profiles, or override the binary in `~/.paseo/config.json`.
+- [Agent profiles](/docs/agent-profiles), save model, mode, and thinking settings together, with notes to guide delegation.
+- [Custom providers](/docs/custom-providers), add your own provider, point an existing one at a different endpoint, configure multiple provider aliases, or override the binary in `~/.paseo/config.json`.
 - [paseo.sh/agents](/agents), per-agent landing page for each supported provider.
diff --git a/public-docs/sdk/agents.md b/public-docs/sdk/agents.md
index 565bedbef8..87d3e993cf 100644
--- a/public-docs/sdk/agents.md
+++ b/public-docs/sdk/agents.md
@@ -105,6 +105,31 @@ const child = await workspace.agents.create({
 
 `parent` establishes parentage. Archiving a parent cascade-archives its children. Call `detach()` first when a child should continue independently.
 
+## Run work in a background workspace
+
+Create a background workspace and its first agent in one call. Put `background` on the
+workspace options and the agent's configuration under `agent`:
+
+```ts
+const cwd = "/Users/me/dev/storefront";
+const workspace = await client.workspaces.create({
+  source: { kind: "directory", path: cwd },
+  background: true,
+  agent: {
+    cwd,
+    config: { provider: "codex/gpt-5.5" },
+    prompt: "Review the checkout flow.",
+  },
+});
+```
+
+The call returns a workspace handle and starts its first agent with the supplied prompt.
+
+Background agents keep their history and survive daemon restarts. Default discovery hides them;
+use `client.agents.list({ filter: { includeBackground: true } })` to include them.
+Exact-ID handles work normally. See [workspace creation](./workspaces.md#create-a-fresh-workspace)
+for defaults and caller inheritance.
+
 ## Request structured output
 
 ```ts
@@ -156,12 +181,17 @@ The handle exposes `status`, `capabilities`, `availableModes`, `pendingPermissio
 
 A handle from `ref()` has observed nothing, so every one of them is `null` until `refresh()`, `run()`, `waitForFinish()`, a timeline refetch, or `subscribe()` delivers a snapshot. Optional values in an observed snapshot also read as `null`. Use `current()` when you need the whole snapshot or need to distinguish those states.
 
-`subscribe()` keeps the properties current, so a long-lived handle can poll them without another RPC:
+`subscribe()` is a local listener. An owned agent-directory observation supplies its updates:
 
 ```ts
 const unsubscribe = agent.subscribe(() => {
   if (agent.status === "error") console.error(agent.lastError);
 });
+const directory = await client.agents.list({ subscribe: {} });
+
+// When this view closes:
+unsubscribe();
+await directory.subscription.release();
 ```
 
 ## List the commands a session loaded
diff --git a/public-docs/sdk/events.md b/public-docs/sdk/events.md
index 36384554e5..9762323dce 100644
--- a/public-docs/sdk/events.md
+++ b/public-docs/sdk/events.md
@@ -8,48 +8,77 @@ category: TypeScript SDK
 
 # SDK events
 
-Subscriptions report changes after they happen. Fetch an initial snapshot first, then apply updates to it.
-
-Every `subscribe()` method returns a local unsubscribe function. It removes your callback; it does not stop or archive the underlying resource.
+Use an owned subscription to fetch a snapshot and follow its changes. On capable daemons, connecting, plain reads, and local directory listeners do not start observation. Each observation gets a new server-issued ID, even when its filter matches another observation.
 
 ## Follow one agent's status
 
-The daemon sends agent-directory updates only after the connection opens an agent-list subscription:
-
 ```ts
-await client.agents.list({
+const directory = await client.agents.list({
   filter: { includeArchived: false },
-  subscribe: { subscriptionId: "issue-board-agents" },
+  subscribe: {},
 });
 
-const agent = client.agents.ref(agentId);
-await agent.refresh();
-
-const unsubscribe = agent.subscribe((update) => {
-  if (update.kind === "upsert") {
-    console.log(update.agent.status);
-  } else {
-    console.log("Agent removed from the active directory");
-  }
+directory.subscription.subscribe({
+  snapshot({ entries }) {
+    const entry = entries.find(({ agent }) => agent.id === agentId);
+    console.log(entry?.agent.status);
+  },
+  update(message) {
+    if (message.type !== "agent_update") return;
+    const update = message.payload;
+    if (update.kind === "upsert" && update.agent.id === agentId) {
+      console.log(update.agent.status);
+    } else if (update.kind === "remove" && update.agentId === agentId) {
+      console.log("Agent removed from this directory");
+    }
+  },
 });
+
+// When this view closes:
+await directory.subscription.release();
 ```
 
-The handle updates its properties and `current()` value before it calls your handler.
+`list({ subscribe: {} })` returns the snapshot, `subscriptionId`, and `subscription`. Omitting `subscribe` returns only a snapshot. Do not supply a subscription ID. The subscription delivers its snapshot before updates and receives a new ID and snapshot after reconnect. Releasing it leaves other observations and the underlying agents intact.
+
+`client.agents.subscribe()` and agent-handle `subscribe()` add local listeners to observations owned by that API instance. They do not request data. Use the returned subscription's callbacks when multiple filtered views need separate updates.
 
 ## Follow timeline events
 
 ```ts
-const unsubscribe = agent.timeline.subscribe(({ event, timestamp }) => {
+const unsubscribe = agent.timeline.subscribe((update) => {
+  const { event } = update;
+  if (event.type === "subscription_restored") {
+    // Live delivery has resumed. Choose whether to fetch missed history.
+    console.log("Reconnected; events may have been missed");
+    return;
+  }
+  if (event.type === "error") {
+    console.error("Timeline observation stopped:", event.error);
+    return;
+  }
+  if (event.type === "replacement") {
+    // Previously fetched history belongs to an old epoch. Fetch the page your UI needs.
+    void agent.timeline.refetch().then((page) => console.log(page.entries));
+    return;
+  }
   if (event.type === "timeline" && event.item.type === "assistant_message") {
     process.stdout.write(event.item.text);
   }
 
   if (event.type === "turn_completed") {
-    console.log(`\nCompleted at ${timestamp}`);
+    console.log("\nTurn completed");
   }
 });
 ```
 
+Await `unsubscribe.ready` before starting work whose events you need to observe. It waits for the initial live subscription (local listener attachment on broadcast-only hosts); initial history is a separate [read](#fetch-timeline-history). Call `unsubscribe()` to release demand, or await `unsubscribe.release()` for teardown.
+
+After reconnect, the same handle receives `{ agentId, subscriptionId, event: { type: "subscription_restored" } }` before subsequent live updates. This is a local SDK notification after membership acknowledgement (local attachment on broadcast-only hosts). The subscription gets a fresh ID. No history is fetched automatically, and missed events are not replayed.
+
+Choose recovery for your consumer: continue live, request a recent page, or call `timeline.refetch({ direction: "after", cursor: { epoch, seq } })` using your saved position. Live delivery continues while your read is pending; buffer or reconcile those events with the returned page by epoch and sequence. Follow `hasNewer` and `endCursor` to read further pages when needed. A live `replacement` invalidates the previous epoch. A failed explicit history read rejects that read and leaves the live subscription active.
+
+Subscription establishment failures deliver `{ agentId, event: { type: "error", error } }` and release the observation. Establish a new subscription when ready to retry. Releasing a subscription stops its callbacks and prevents restoration after reconnect.
+
 Assistant messages can arrive in pieces. Concatenate their text when you need a complete message, or use `run()` and read `lastMessage` when you only need the final reply.
 
 Turn completion comes from `turn_completed`, `turn_failed`, or `turn_canceled`. Do not infer turn completion from an `agent_update` transition to `idle`.
@@ -64,7 +93,7 @@ const page = await agent.timeline.refetch({
 });
 
 for (const entry of page.entries) {
-  console.log(entry.seq, entry.event.type);
+  console.log(entry.seqStart, entry.seqEnd, entry.item.type);
 }
 ```
 
@@ -72,19 +101,19 @@ Use `startCursor`, `endCursor`, `hasOlder`, and `hasNewer` from the result to pa
 
 ## Follow workspace updates
 
-Workspace updates also require a directory subscription:
-
 ```ts
-await client.workspaces.list({
-  subscribe: { subscriptionId: "issue-board-workspaces" },
+const directory = await client.workspaces.list({ subscribe: {} });
+directory.subscription.subscribe({
+  snapshot({ entries }) {
+    console.log(entries);
+  },
+  update(message) {
+    if (message.type === "workspace_update") console.log(message.payload);
+  },
 });
 
-const workspace = client.workspaces.ref(workspaceId);
-const unsubscribe = workspace.subscribe((update) => {
-  if (update.kind === "upsert") {
-    console.log(update.workspace.status);
-  }
-});
+// When this view closes:
+await directory.subscription.release();
 ```
 
 ## Follow provider catalog changes
@@ -97,6 +126,19 @@ const unsubscribe = client.providers.subscribe((update) => {
     ready.map((entry) => entry.provider),
   );
 });
+console.log(await client.providers.snapshot());
+
+// When this view closes:
+unsubscribe();
 ```
 
-Always call the returned unsubscribe functions before discarding the owning object. Call `client.close()` when the application no longer needs the daemon connection.
+Provider and project `subscribe()` calls request their own updates and release that demand on unsubscribe. For an initial project cache, buffer updates while awaiting `client.projects.list()`, then apply them after the snapshot.
+
+Call `client.close()` when the application no longer needs the connection.
+
+## Older daemons
+
+The same methods use the existing connection and legacy delivery behavior. Old directory subscriptions
+share a server slot: a later filtered observation replaces that slot's filter. Handles have local IDs
+and separate callbacks, but independent server filters require an updated daemon. Releasing a handle
+detaches its callbacks; old daemons may continue sending broadcasts.
diff --git a/public-docs/sdk/provider-options.md b/public-docs/sdk/provider-options.md
index a8bd5bad0b..5450890224 100644
--- a/public-docs/sdk/provider-options.md
+++ b/public-docs/sdk/provider-options.md
@@ -8,9 +8,46 @@ category: TypeScript SDK
 
 # Provider options
 
-`config.options` passes settings straight through to the provider CLI. Paseo validates the object against that provider's strict schema before starting the agent, so an unknown or misspelled key fails agent creation instead of silently doing nothing.
+Provider options are an opaque `Record<string, unknown>` passed to the provider.
+The provider decides how to validate and apply it. Claude, Codex, and OpenCode
+use strict schemas: an unknown or misspelled key fails agent creation with a
+message naming the bad key. Providers without option handling ignore the record.
+Pi, OMP, ACP, and plugin providers interpret their own keys.
 
-Options are provider-native. A Codex sandbox key is not a Claude sandbox key. Codex, Claude, and OpenCode accept options; every other provider rejects a non-empty `options`.
+You set options in two places:
+
+- **Provider defaults:** `config.json` → `agents.providers.<id>.options`.
+- **One agent:** `config.options` in `client.agents.create()`. Its wire name is
+  `providerOptions`.
+
+The daemon deep-merges the agent's options over the provider defaults at session
+launch or resume. Plain objects merge recursively; arrays, scalars, and `null`
+replace the base value. Only the agent's own options are stored. Changing
+`config.json` defaults takes effect on the next launch or resume.
+
+For example, set Codex defaults once:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "codex": {
+        "options": {
+          "sandbox_mode": "read-only",
+          "approval_policy": "never",
+          "sandbox_workspace_write": { "network_access": false }
+        }
+      }
+    }
+  }
+}
+```
+
+Then create one agent with `config.options: { sandbox_mode: "workspace-write" }`.
+It receives `workspace-write`, retains `approval_policy: "never"`, and retains
+`sandbox_workspace_write.network_access: false`. With no per-agent options it
+receives the defaults above. Keys are provider-native; use the sections below
+for the options each provider accepts.
 
 Provider options are not a host boundary. They constrain the agent CLI, which runs as your user on your machine. For untrusted work, run the daemon in a container or on a separate machine. See [Security](/docs/security).
 
diff --git a/public-docs/sdk/reference.md b/public-docs/sdk/reference.md
index 869fa06ffd..76490974fe 100644
--- a/public-docs/sdk/reference.md
+++ b/public-docs/sdk/reference.md
@@ -53,9 +53,14 @@ Create a new client after `close()`.
 | `list(options?)`     | `PaseoAgentListResult` | Lists a page of agents. `scope`, `filter`, `sort`, `page`, and `subscribe` match the daemon directory query. |
 | `create(options)`    | `PaseoAgentHandle`     | Creates an agent and a fresh workspace for `cwd`. Requires `config`.                                         |
 | `ref(agentOrId)`     | `PaseoAgentHandle`     | Creates a local handle without fetching.                                                                     |
-| `subscribe(handler)` | Unsubscribe function   | Listens for connection-local agent directory updates. Call `list({ subscribe })` first.                      |
+| `subscribe(handler)` | Unsubscribe function   | Local listener for this API instance. Requires an owned `list({ subscribe: {} })` observation.               |
 
-Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `outputSchema`, `images`, `attachments`, `git`, `worktree`, `autoArchive`, and `labels`.
+`list({ subscribe: {} })` also returns a `subscriptionId` and an owned `subscription`. Its `subscribe({ snapshot, update, error? })` callbacks receive the snapshot before scoped wire updates; `release()` ends that observation. Capable daemons assign the ID and keep observations independent. Older daemons use local IDs and their established shared delivery behavior. Plain lists create no observation. The same contract applies to workspace lists. See [events](./events.md).
+
+Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `outputSchema`, `images`, `attachments`, `git`, `worktree`, `autoArchive`, `background`, and `labels`.
+
+`background` is workspace creation intent. It cannot accompany an existing `workspaceId`.
+See [background workspaces](./workspaces.md) for caller inheritance and inclusive discovery.
 
 `config` accepts:
 
@@ -72,30 +77,31 @@ Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `o
 
 ### Agent handle
 
-| Member                      | Result                            | Behavior                                                                                                |
-| --------------------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `id`                        | `string`                          | Stable daemon agent ID.                                                                                 |
-| `workspaceId`               | `string \| null`                  | Current workspace placement.                                                                            |
-| `cwd`                       | `string \| null`                  | Current working directory.                                                                              |
-| `status`                    | Agent status or `null`            | Current lifecycle status.                                                                               |
-| `capabilities`              | Capability flags or `null`        | What the provider session supports.                                                                     |
-| `availableModes`            | Agent modes or `null`             | Modes the session can switch to.                                                                        |
-| `pendingPermissions`        | Permission requests or `null`     | Requests waiting on an answer.                                                                          |
-| `activeTurn`                | Active turn or `null`             | The turn in flight, with `turnId` and `startedAt`.                                                      |
-| `lastUsage`                 | Usage or `null`                   | Token counts, cost, and context-window use from the last turn.                                          |
-| `lastError`                 | `string \| null`                  | Last error the daemon recorded for the agent.                                                           |
-| `features`                  | Agent features or `null`          | Provider feature toggles and selects with their current values.                                         |
-| `runtimeInfo`               | Runtime info or `null`            | Live provider, session ID, model, thinking option, and mode.                                            |
-| `archivedAt`                | `string \| null`                  | Archive timestamp; `null` while the agent is active.                                                    |
-| `current()`                 | `PaseoAgent \| null`              | Current detailed value observed by this handle; never fetches.                                          |
-| `refresh(requestId?)`       | `PaseoAgentRefetchResult \| null` | Fetches the current agent and project placement.                                                        |
-| `send(text, options?)`      | `Promise<void>`                   | Resolves when the daemon accepts the prompt.                                                            |
-| `run(text, options?)`       | `PaseoAgentRunResult`             | Sends a prompt and waits for that turn. `timeoutMs` controls the wait; it defaults to 10 minutes.       |
-| `waitForFinish(timeoutMs?)` | `PaseoAgentRunResult`             | Waits for the active turn, including an initial prompt. Default timeout: 10 minutes.                    |
-| `commands(options?)`        | `PaseoAgentCommandsResult`        | Asks the live session for its slash commands and skills, including built-in ones. Options: `requestId`. |
-| `subscribe(handler)`        | Unsubscribe function              | Filters agent-directory updates to this ID and refreshes the handle properties.                         |
-| `archive()`                 | `{ archivedAt }`                  | Soft-deletes the agent and closes its runtime.                                                          |
-| `detach()`                  | `Promise<void>`                   | Removes the parent relationship without stopping the agent.                                             |
+| Member                         | Result                            | Behavior                                                                                                |
+| ------------------------------ | --------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `id`                           | `string`                          | Stable daemon agent ID.                                                                                 |
+| `workspaceId`                  | `string \| null`                  | Current workspace placement.                                                                            |
+| `cwd`                          | `string \| null`                  | Current working directory.                                                                              |
+| `status`                       | Agent status or `null`            | Current lifecycle status.                                                                               |
+| `capabilities`                 | Capability flags or `null`        | What the provider session supports.                                                                     |
+| `availableModes`               | Agent modes or `null`             | Modes the session can switch to.                                                                        |
+| `pendingPermissions`           | Permission requests or `null`     | Requests waiting on an answer.                                                                          |
+| `activeTurn`                   | Active turn or `null`             | The turn in flight, with `turnId` and `startedAt`.                                                      |
+| `lastUsage`                    | Usage or `null`                   | Token counts, cost, and context-window use from the last turn.                                          |
+| `lastError`                    | `string \| null`                  | Last error the daemon recorded for the agent.                                                           |
+| `features`                     | Agent features or `null`          | Provider feature toggles and selects with their current values.                                         |
+| `runtimeInfo`                  | Runtime info or `null`            | Live provider, session ID, model, thinking option, and mode.                                            |
+| `archivedAt`                   | `string \| null`                  | Archive timestamp; `null` while the agent is active.                                                    |
+| `current()`                    | `PaseoAgent \| null`              | Current detailed value observed by this handle; never fetches.                                          |
+| `refresh(requestId?)`          | `PaseoAgentRefetchResult \| null` | Fetches the current agent and project placement.                                                        |
+| `send(text, options?)`         | `Promise<void>`                   | Resolves when the daemon accepts the prompt.                                                            |
+| `respondToPermission(options)` | `Promise<void>`                   | Answers a pending permission by `requestId` with an allow or deny `response`.                           |
+| `run(text, options?)`          | `PaseoAgentRunResult`             | Sends a prompt and waits for that turn. `timeoutMs` controls the wait; it defaults to 10 minutes.       |
+| `waitForFinish(timeoutMs?)`    | `PaseoAgentRunResult`             | Waits for the active turn, including an initial prompt. Default timeout: 10 minutes.                    |
+| `commands(options?)`           | `PaseoAgentCommandsResult`        | Asks the live session for its slash commands and skills, including built-in ones. Options: `requestId`. |
+| `subscribe(handler)`           | Unsubscribe function              | Filters agent-directory updates to this ID and refreshes the handle properties.                         |
+| `archive()`                    | `{ archivedAt }`                  | Soft-deletes the agent and closes its runtime.                                                          |
+| `detach()`                     | `Promise<void>`                   | Removes the parent relationship without stopping the agent.                                             |
 
 `workspaceId` through `archivedAt` mirror the last snapshot the handle observed. A handle from `ref()` reads `null` for all of them until `refresh()`, `run()`, `waitForFinish()`, a timeline refetch, or `subscribe()` delivers a snapshot. Optional values in an observed snapshot also read as `null`. Call `current()` when you need the whole snapshot or need to distinguish those states.
 
@@ -107,27 +113,75 @@ Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `o
 
 `agent.timeline.refetch(options?)` fetches a page. Options are `direction`, `cursor`, `limit`, `projection`, and `requestId`.
 
-`agent.timeline.subscribe(handler)` listens for stream events belonging to the agent and returns a local unsubscribe function.
+`agent.timeline.subscribe(handler)` establishes network demand for this agent and restores it after reconnect. Its unsubscribe function releases that demand; await `unsubscribe.ready` for initial daemon acknowledgement before starting work. Delivery is live-only. Reconnect emits a local `subscription_restored` event; request missed history explicitly with `refetch()`. A live replacement invalidates the previous epoch. See the callback shapes, paging and failure behavior in [timeline events](./events.md#follow-timeline-events).
 
 ## `client.projects`
 
-| Method           | Result                   | Behavior                                                                      |
-| ---------------- | ------------------------ | ----------------------------------------------------------------------------- |
-| `list(options?)` | `PaseoProjectListResult` | Lists every registered project, including projects with no active workspaces. |
+| Method               | Result                   | Behavior                                                                                       |
+| -------------------- | ------------------------ | ---------------------------------------------------------------------------------------------- |
+| `list(options?)`     | `PaseoProjectListResult` | Lists every registered project, including projects with no active workspaces.                  |
+| `subscribe(handler)` | Unsubscribe function     | Requests future project updates; unsubscribe releases demand. `list()` supplies initial state. |
+
+See [events](./events.md#follow-provider-catalog-changes) for explicit event observation and cleanup.
 
 ## `client.workspaces`
 
-| Method                   | Result                        | Behavior                                                                          |
-| ------------------------ | ----------------------------- | --------------------------------------------------------------------------------- |
-| `list(options?)`         | `PaseoWorkspaceListResult`    | Lists, filters, pages, or subscribes to the workspace directory.                  |
-| `open(cwd)`              | `PaseoWorkspaceHandle`        | Reuses the active workspace for a directory or creates one.                       |
-| `create(options)`        | `PaseoWorkspaceHandle`        | Always creates a fresh directory-backed or Paseo-worktree workspace.              |
-| `ref(workspaceOrId)`     | `PaseoWorkspaceHandle`        | Creates a local handle.                                                           |
-| `archive(workspaceOrId)` | `PaseoWorkspaceArchiveResult` | Archives without first creating a handle.                                         |
-| `subscribe(handler)`     | Unsubscribe function          | Listens for connection-local workspace updates. Call `list({ subscribe })` first. |
+| Method                   | Result                        | Behavior                                                                                                                 |
+| ------------------------ | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `list(options?)`         | `PaseoWorkspaceListResult`    | Lists, filters, pages, or subscribes to the workspace directory.                                                         |
+| `open(cwd)`              | `PaseoWorkspaceHandle`        | Reuses the active workspace for a directory or creates one.                                                              |
+| `create(options)`        | `PaseoWorkspaceHandle`        | Always creates a fresh directory-backed or Paseo-worktree workspace. `background: true` hides it from default discovery. |
+| `ref(workspaceOrId)`     | `PaseoWorkspaceHandle`        | Creates a local handle.                                                                                                  |
+| `archive(workspaceOrId)` | `PaseoWorkspaceArchiveResult` | Archives without first creating a handle.                                                                                |
+| `subscribe(handler)`     | Unsubscribe function          | Local listener for this API instance. Requires an owned `list({ subscribe: {} })` observation.                           |
+
+`create({ source, agent, background })` creates a workspace and its initial agent together.
+`agent` accepts agent creation options except `worktree`, `git`, `onEvent`, `idempotencyKey`,
+and `requestId`. Set `background` on the workspace options; `agent.background` is rejected.
+See the [combined creation example](./agents.md#run-work-in-a-background-workspace).
 
 A workspace handle exposes `id`, `projectId`, `directory`, `name`, `status`, `current()`, `refresh()`, `setTitle(title)`, `archive()`, and `subscribe()`. Pass `null` to `setTitle` to restore the derived workspace name. Use `workspace.agents.create(options)` to create an agent without repeating the workspace ID or directory.
 
+## `client.terminals`
+
+Terminal operations require a host that supports workspace terminals. An older host receives no terminal request; the SDK throws an update-host error.
+
+| Method              | Result                             | Behavior                                                                           |
+| ------------------- | ---------------------------------- | ---------------------------------------------------------------------------------- |
+| `create(options)`   | `Promise<PaseoTerminalHandle>`     | Creates a terminal owned by the required `workspaceId`.                            |
+| `list(options?)`    | `Promise<PaseoTerminalListResult>` | Returns `{ entries, requestId }`. Omit filters to list all terminals on this host. |
+| `ref(terminalOrId)` | `PaseoTerminalHandle`              | Creates a local handle without fetching or attaching a terminal stream.            |
+
+Creation options:
+
+| Field             | Meaning                                                                                                                  |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `workspaceId`     | Required active workspace ID. Unknown and archived IDs fail.                                                             |
+| `cwd`             | Optional absolute process working directory. Defaults to the workspace directory; changing it does not change ownership. |
+| `name`            | Optional terminal name.                                                                                                  |
+| `command`, `args` | Optional executable and argument array. Omit them to start the default shell.                                            |
+| `size`            | Optional initial viewport: `{ rows, cols }`.                                                                             |
+| `requestId`       | Optional request correlation ID.                                                                                         |
+
+List options are `workspaceId`, `cwd`, and `requestId`. `workspaceId` selects ownership, including terminals started outside the workspace directory. When it is present, `cwd` does not restrict the results. Without an ID, `cwd` filters by workspace root directory. Each entry contains `id`, `workspaceId`, `cwd`, and `name`; `cwd` is the terminal's actual starting directory.
+
+Terminal handles expose:
+
+| Method              | Result                                | Behavior                                                                                         |
+| ------------------- | ------------------------------------- | ------------------------------------------------------------------------------------------------ |
+| `current()`         | `PaseoTerminal \| null`               | Last snapshot from creation, `ref(snapshot)`, or refresh. A handle made from an ID starts empty. |
+| `refresh(options?)` | `Promise<PaseoTerminal \| null>`      | Fetches the terminal snapshot, or `null` when it no longer exists. Accepts `requestId`.          |
+| `write(data)`       | `number`                              | Sends literal text without interpreting key names. Returns the input's UTF-16 length.            |
+| `sendKeys(keys)`    | `number`                              | Expands key tokens and sends the combined input. Returns its UTF-16 length.                      |
+| `capture(options?)` | `Promise<PaseoTerminalCaptureResult>` | Returns `{ terminalId, lines, totalLines, requestId }`.                                          |
+| `kill(requestId?)`  | `Promise<void>`                       | Waits for terminal teardown. Killing an already-removed terminal succeeds.                       |
+
+`sendKeys()` recognizes `Enter`, `Tab`, `Escape`, `Space`, `BSpace`, `C-c`, `C-d`, `C-z`, `C-l`, `C-a`, and `C-e`. Other strings pass through literally. Input methods send without waiting for command execution or acknowledging that the terminal consumed the input.
+
+Capture accepts optional `start`, `end`, `stripAnsi`, and `requestId`. Line bounds are zero-based and inclusive across scrollback and the viewport. Negative bounds count from the end; omitted bounds capture all lines. `stripAnsi` defaults to `true`. A missing terminal returns empty lines.
+
+Use `workspace.terminals.create(options?)` and `workspace.terminals.list(options?)` to supply the workspace ID from a handle. Creation accepts the same options except `workspaceId`; listing accepts only `requestId`. Plugins get these methods through `usePaseo()` and the handler's `paseo` context.
+
 ## `client.providers`
 
 | Method                           | Result                        | Behavior                                                                                                                                                 |
@@ -140,7 +194,8 @@ A workspace handle exposes `id`, `projectId`, `directory`, `name`, `status`, `cu
 | `listModes(provider, options?)`  | Modes result                  | Discovers permission or operating modes.                                                                                                                 |
 | `listFeatures(draftConfig)`      | Features result               | Discovers features for the current draft provider configuration.                                                                                         |
 | `diagnostic(provider)`           | Diagnostic result             | Returns human-readable setup diagnostics.                                                                                                                |
-| `subscribe(handler)`             | Unsubscribe function          | Listens for catalog updates.                                                                                                                             |
+| `listUsage(options?)`            | `PaseoProviderUsageResult`    | Returns normalized subscription windows, balances, and provider details. Rejects with an update-host error when unsupported. Options: `requestId`.       |
+| `subscribe(handler)`             | Unsubscribe function          | Requests future catalog updates; unsubscribe releases demand.                                                                                            |
 
 ## `client.config`
 
diff --git a/public-docs/sdk/workspaces.md b/public-docs/sdk/workspaces.md
index 1bc72c5f02..2bf1dd7ee3 100644
--- a/public-docs/sdk/workspaces.md
+++ b/public-docs/sdk/workspaces.md
@@ -50,8 +50,25 @@ const workspace = await client.workspaces.create({
 });
 ```
 
+Pass `agent` to create the workspace and its first agent in one call. See the
+[combined background workspace example](./agents.md#run-work-in-a-background-workspace).
+Set visibility on the workspace options; `agent.background` is rejected.
+
 You can pass `projectId` in either source when you already have one. Most integrations should omit it; the daemon finds or creates the project from the directory.
 
+Pass `background: true` to hide a workspace from default discovery. Its agents and terminals
+remain durable, with ordinary history, lifecycle hooks, archive, and exact-ID access. The app's
+sidebar offers **Show background** without dropping replicated state.
+
+`background` is creation-only. Omission defaults to false; when `callerAgentId` identifies an agent
+creating a new workspace, omission inherits its workspace's value. Explicit false or true overrides
+inheritance. Agent creation with `workspaceId` rejects explicit background creation intent; configure
+visibility when creating the workspace. SDK/RPC implicit agent creation also accepts `background`
+as workspace creation intent, never as an agent property.
+
+Creation and inclusive discovery require `features.backgroundWorkspaces`; the client rejects an
+unsupported host with an update-host message.
+
 ## Start an agent in a workspace
 
 Create through the workspace handle:
@@ -81,6 +98,22 @@ const agent = await client.agents.create({
 
 The daemon still creates a project and a fresh workspace. Read `agent.workspaceId` when you need the generated workspace ID.
 
+## Start a terminal in a workspace
+
+```ts
+const terminal = await workspace.terminals.create({ name: "Development" });
+terminal.write("echo ready");
+terminal.sendKeys(["Enter"]);
+
+const { lines } = await terminal.capture();
+const { entries } = await workspace.terminals.list();
+await terminal.kill();
+```
+
+Two workspaces may share a directory. The workspace handle supplies the ID that keeps their terminals separate. To use an ID you already have, call `client.workspaces.ref(workspaceId).terminals.create()`.
+
+See the [terminal API reference](/docs/sdk/reference#clientterminals) for command arguments, working-directory overrides, input, and capture options.
+
 ## List workspaces
 
 ```ts
@@ -100,6 +133,11 @@ do {
 } while (cursor);
 ```
 
+Background workspaces are left out unless `filter.includeBackground` is true. Use
+`client.workspaces.list({ filter: { includeBackground: true } })` or
+`client.agents.list({ filter: { includeBackground: true } })`. Workspace descriptors carry
+`background`; agents derive visibility from their workspace and have no separate setting.
+
 ## Refresh and archive a handle
 
 ```ts
diff --git a/public-docs/security.md b/public-docs/security.md
index 982b956829..d1b6ee229a 100644
--- a/public-docs/security.md
+++ b/public-docs/security.md
@@ -121,9 +121,17 @@ The image runs the daemon and launched agents as the non-root `paseo` user, but
 
 See [Docker](/docs/docker) for Compose and reverse proxy examples.
 
+## Linux desktop sandbox
+
+Paseo checks Chromium sandbox availability each time the desktop app launches on Linux. It keeps sandboxing enabled when user namespaces work or an installed sandbox helper is usable. The `.deb` and `.rpm` installers configure that helper.
+
+AppImage and extracted tar archives launch with Chromium's sandbox disabled when neither is available. Use the `.deb` or `.rpm` package if you require Chromium process isolation. Passing `--no-sandbox` explicitly disables it.
+
+Open **Settings → Diagnostics → App Diagnostics** to check the sandbox state and reason. The [desktop log](/docs/troubleshooting#reading-the-logs) records the same decision.
+
 ## Agent authentication
 
-Paseo wraps agent CLIs (Claude Code, Codex, OpenCode) but does not manage their authentication. Each agent provider handles its own credentials:
+Paseo wraps agent CLIs (Claude Code, Codex, OpenCode, Muse Code) but does not manage their authentication. Each agent provider handles its own credentials:
 
 - **Claude Code**, authenticates via Anthropic's OAuth flow, stored in `~/.claude/`
 - **Codex**, uses your OpenAI API key or OAuth session
diff --git a/public-docs/skills.md b/public-docs/skills.md
index c1fae01515..c8ac09c4b6 100644
--- a/public-docs/skills.md
+++ b/public-docs/skills.md
@@ -1,65 +1,55 @@
 ---
 title: Orchestration skills
-description: "Paseo orchestration skills: teach coding agents to spawn, coordinate, and manage other agents using slash commands."
+description: Reusable workflows for handing off tasks, getting a second opinion, and planning with multiple agents.
 nav: Skills
-order: 32
+order: 33
 category: Orchestration
 ---
 
 # Orchestration skills
 
-Paseo ships orchestration skills that teach coding agents how to use Paseo tools and the CLI to spawn, coordinate, and manage other agents. Skills package common workflows as slash commands, so agents know how to orchestrate without you writing the briefing and safety rails each time.
+Skills give your agents reusable instructions for delegation, handoffs, and reviews. You can also [ask for these workflows directly](/docs/orchestration-workflows) without installing skills.
 
-Start with [Orchestration](/docs/orchestration) if you want the mental model, or [Common workflows](/docs/orchestration-workflows) for prompts you can use without installing skills.
+| Skill              | Use it to                                                            |
+| ------------------ | -------------------------------------------------------------------- |
+| `/paseo`           | Look up how to manage agents, workspaces, schedules, and heartbeats. |
+| `/paseo-handoff`   | Transfer a task and its context to another agent.                    |
+| `/paseo-committee` | Get two independent analyses of a difficult problem.                 |
+| `/paseo-advisor`   | Get a second opinion on your current work.                           |
 
 ## Installation
 
-Two ways to install:
+- **In Paseo:** Open **Settings → your host → Agents → Orchestration skills** and choose which skills to install on that host.
+- **From the terminal:** Run `npx skills add getpaseo/paseo` on the machine where your agents run.
 
-- **Paseo app:** Connect to the host, then open Settings → Host → Agents → Orchestration skills. The selected host installs the skills on its own machine.
-- **Manual:** `npx skills add getpaseo/paseo`, this installs to `~/.agents/skills/` and sets up symlinks for each agent.
-
-When a daemon finds installed Paseo skills, it keeps the selected bundled skills up to date on startup without removing deselected directories. Use the host's Orchestration skills card to install, update, choose, or uninstall skills. Removal always asks for confirmation.
+Use the same settings card to update or uninstall skills. The host also refreshes selected installed Paseo skills on startup.
 
 ## `/paseo`, Paseo Reference
 
-The foundational skill. Paseo reference for managing projects, workspaces, and agents. Load it when an agent needs to register a project, create agents, send them prompts, or manage workspace isolation.
+The foundational reference used by the other skills. It teaches agents to check your [agent profiles and their notes](/docs/agent-profiles#guide-delegation-with-notes) before delegating, then apply the selected launch settings. If no profile fits, it directs them to discover available providers and models and tell you about the fallback.
 
-Not typically invoked directly by users, it's a reference that other skills depend on.
-
-```
-/paseo show me the Paseo CLI surface for creating an agent in a worktree-isolated workspace
-```
+> /paseo show me how to create an agent in a workspace with worktree isolation
 
 ## `/paseo-handoff`, Task Handoff
 
-Hands off the current task to another agent with full context. Use it when you say "handoff", "hand off", "hand this to", or want to pass work to another agent.
+Transfer the current task with a briefing: relevant files, progress, decisions, constraints, and acceptance criteria. The skill checks profiles before choosing the receiving agent; you can name the profile you want.
 
-The receiving agent gets a self-contained briefing with the task, context, relevant files, current state, what's been tried, decisions, acceptance criteria, and constraints. Provider comes from orchestration preferences unless you name one. Supports worktree-isolated workspaces when you ask for one.
+> /paseo-handoff hand off the auth fix to an implementation agent in its own worktree
 
-```
-/paseo-handoff hand off the auth fix to codex in a worktree-isolated workspace
-/paseo-handoff hand this to claude opus for review
-```
+The receiving agent gets the context it needs to continue. Ask for a separate worktree when it should edit independently.
 
 ## `/paseo-committee`, Committee Planning
 
-Forms a committee of two high-reasoning agents to step back, do root cause analysis, and produce a plan. Use it when stuck, looping, tunnel-visioning, or facing a hard planning problem.
+Get two agents to analyze a difficult problem independently. The skill checks profile notes for planning and analysis, preferring different provider families when possible.
 
-Committee members do analysis only. They do not edit, create, or delete files. The orchestrating agent synthesizes their plans, implements, then sends the diff back for review.
+> /paseo-committee why are the websocket connections dropping under load?
 
-```
-/paseo-committee why are the websocket connections dropping under load?
-/paseo-committee plan the auth system migration
-```
+Committee members return analyses without editing files. The main agent synthesizes their plans, implements the solution, and sends the diff back for review.
 
 ## `/paseo-advisor`, Advisor
 
-Spins up a single agent as an advisor, a second opinion on the current task. Use it when you say "advisor", "second opinion", "what does X think", or want an outside take without delegating the work itself.
+Get another agent's judgment on a design, diff, or question. The skill chooses a profile whose notes fit the work, or uses the profile you name.
 
-The advisor gives a judgment. You decide what to do. The advisor prompt is analysis-only and ends with a no-edits instruction.
+> /paseo-advisor did I miss anything in this migration plan?
 
-```
-/paseo-advisor did I miss anything in this migration plan?
-/paseo-advisor --provider claude/opus what is the UX risk in this flow?
-```
+The advisor returns a second opinion without editing files.
diff --git a/public-docs/supported-providers.md b/public-docs/supported-providers.md
index f8edad9953..f2b1370b68 100644
--- a/public-docs/supported-providers.md
+++ b/public-docs/supported-providers.md
@@ -18,6 +18,45 @@ Work out of the box once the underlying CLI is installed and authenticated.
 - [Codex](/docs/codex). OpenAI's workspace agent with sandbox controls and optional network access.
 - [OpenCode](https://opencode.ai/). Open-source coding assistant with multi-provider model support.
 - [Pi](https://pi.dev). Minimal terminal-based coding agent with multi-provider LLM support.
+- [Antigravity](#antigravity). Uses your installed `agy` CLI through a built-in provider plugin.
+- [Muse Code](/docs/muse-code). Meta's terminal coding agent, bundled as a provider plugin.
+
+### Antigravity
+
+Install the Antigravity CLI (`agy`) on your daemon host, then run `agy` once to sign in. Pick
+**Antigravity** in Paseo. The provider ships with Paseo; no separate plugin install is required.
+
+**Full access** is the only permission mode. Antigravity cannot ask for permission when another
+app drives it, so Paseo starts `agy` with `--dangerously-skip-permissions`. Every tool call,
+including shell commands, runs without asking. Each session starts with a warning explaining
+this, including when you reopen a chat. Antigravity's own policy can still deny
+an action.
+
+After a daemon restart, Antigravity remembers the conversation, but Paseo's transcript starts
+fresh because `agy` does not replay its history.
+
+This integration uses your installed CLI and sign-in. It is not endorsed by Google.
+
+Paseo MCP tools and steering are unavailable. Your own `agy` MCP servers still work. Attached
+images are passed as file references for the agent to read.
+
+If `agy` is outside your daemon's PATH, override its command in `~/.paseo/config.json`. Use `env`
+for provider-specific environment variables:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "antigravity": {
+        "command": ["/absolute/path/to/agy"],
+        "env": { "EXAMPLE_VARIABLE": "value" }
+      }
+    }
+  }
+}
+```
+
+See [Custom providers](/docs/custom-providers) for command and environment overrides.
 
 ## ACP catalog
 
diff --git a/public-docs/troubleshooting.md b/public-docs/troubleshooting.md
index 77b2497e03..420c3363aa 100644
--- a/public-docs/troubleshooting.md
+++ b/public-docs/troubleshooting.md
@@ -1,6 +1,6 @@
 ---
 title: Troubleshooting
-description: Why Paseo can't find a provider you've installed, and how to fix the PATH and environment mismatches behind most setup issues.
+description: Fix Linux AppImage launch errors, missing providers, and environment mismatches.
 nav: Common problems
 order: 90
 category: Troubleshooting
@@ -8,7 +8,22 @@ category: Troubleshooting
 
 # Troubleshooting
 
-Almost every "it works in my terminal but not in Paseo" problem is the same thing: Paseo and your terminal aren't searching the same `PATH`. This page covers how to spot that and fix it.
+## AppImage won't open on Linux
+
+Make the downloaded AppImage executable, then launch it from a terminal to see any error:
+
+```bash
+chmod +x Paseo-x86_64.AppImage
+./Paseo-x86_64.AppImage
+```
+
+If it reports `error loading libfuse.so.2`, run without FUSE:
+
+```bash
+./Paseo-x86_64.AppImage --appimage-extract-and-run
+```
+
+The Paseo window should open. You can also install the `.deb` on Debian/Ubuntu or the `.rpm` on Fedora from the [download page](https://paseo.sh/download).
 
 ## Paseo can't find my provider
 
diff --git a/public-docs/web-ui.md b/public-docs/web-ui.md
index fd2628ed9f..6fe574e3cd 100644
--- a/public-docs/web-ui.md
+++ b/public-docs/web-ui.md
@@ -20,16 +20,17 @@ The web app ships inside the daemon package, so the UI you serve always matches
 
 ## Enable it
 
-The bundled web UI is off by default. Turn it on when you start the daemon:
+The bundled web UI is off by default. Save the setting, then start the daemon:
 
 ```bash
-paseo daemon start --web-ui
+paseo daemon config set features.webUi.enabled true
+paseo daemon start
 ```
 
-Or with an environment variable:
+Or run a foreground deployment with an environment variable:
 
 ```bash
-PASEO_WEB_UI_ENABLED=true paseo daemon start
+PASEO_WEB_UI_ENABLED=true paseo daemon run
 ```
 
 Or persist it in `config.json` so it survives restarts:
@@ -73,7 +74,8 @@ The rest of this page builds from local to public. **Verify a direct connection
 By default the daemon listens on `127.0.0.1:6767`, reachable only from the same machine. To reach it from other devices, bind it to a network interface:
 
 ```bash
-paseo daemon start --web-ui --listen 0.0.0.0:6767
+paseo daemon config set daemon.listen 0.0.0.0:6767
+paseo daemon start
 ```
 
 > **Anyone who can reach the listening address can use your agents.** Before you bind beyond localhost, set a password and review your host allowlist. The relay pairing path avoids this entirely by keeping the daemon bound to localhost, see [Security](/docs/security).
@@ -83,7 +85,7 @@ Two things to configure when you expose the daemon directly:
 1. **Set a password** so only authorized clients can connect:
 
    ```bash
-   PASEO_PASSWORD=my-secret paseo daemon start --web-ui --listen 0.0.0.0:6767
+   paseo daemon set-password
    ```
 
    See [password authentication](/docs/configuration#password-authentication) for the persistent setup. Password auth controls access; it does not encrypt traffic, put TLS in front of it (below) on any untrusted network.
@@ -91,7 +93,7 @@ Two things to configure when you expose the daemon directly:
 2. **Allow your hostname** so the daemon's DNS-rebinding protection accepts requests for your domain:
 
    ```bash
-   paseo daemon start --web-ui --listen 0.0.0.0:6767 --hostnames ".example.com"
+   paseo daemon config set daemon.hostnames '[".example.com"]'
    ```
 
    See [DNS rebinding protection](/docs/security#dns-rebinding-protection) for how the host allowlist works.
@@ -179,7 +181,7 @@ If your proxy reaches the daemon from another address, as in some Docker, LAN, o
 `PASEO_TRUSTED_PROXIES` accepts the same comma-separated values:
 
 ```bash
-PASEO_TRUSTED_PROXIES=loopback,172.16.0.0/12 paseo daemon start --web-ui
+PASEO_TRUSTED_PROXIES=loopback,172.16.0.0/12 PASEO_WEB_UI_ENABLED=true paseo daemon run
 ```
 
 Only use `trustedProxies: true` when your final trusted proxy overwrites client-supplied `X-Forwarded-*` headers. Otherwise a client could spoof forwarded header values.
@@ -195,7 +197,7 @@ If you don't want to manage a reverse proxy or open ports, a tunnel gives you an
 - **Tailscale Serve** keeps it inside your tailnet, no public exposure, TLS handled for you:
 
   ```bash
-  tailscale serve https / http://127.0.0.1:6767
+  tailscale serve --bg http://127.0.0.1:6767
   ```
 
   Reach it at `https://<your-machine>.<tailnet>.ts.net/`. Only devices on your tailnet can connect.
diff --git a/public-docs/why.md b/public-docs/why.md
index 44ac4a90c9..8b3d0d8531 100644
--- a/public-docs/why.md
+++ b/public-docs/why.md
@@ -1,6 +1,6 @@
 ---
 title: Why Paseo?
-description: What Paseo is, what it isn't, and how it fits into your workflow.
+description: A full agentic development environment for running coding agents, editing files, reviewing changes, and testing your work.
 nav: Why Paseo?
 order: 2
 category: Getting started
@@ -8,38 +8,36 @@ category: Getting started
 
 # Why Paseo?
 
-Paseo is a self-hostable platform for running and orchestrating coding agents. It runs the agent CLIs you already use, on the hardware you already have, and gives you a UI, CLI, and API to drive them from anywhere.
+Paseo is a full agentic development environment. Run coding agents, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. For agent-driven development, Paseo replaces your IDE: take a task from the first prompt through review and testing in one app.
 
-## Architecture
+## Develop in one workspace
 
-- Daemon-client architecture. The daemon manages agents; clients (mobile, desktop, web, CLI) connect locally or over a relay. Remote access isn't an add-on.
-- macOS, Windows, and Linux are all primary targets. None of them are a port or an afterthought.
-- Mobile, desktop, and web are separate native clients. The mobile app is built in React Native, not a webview.
+Open the desktop app, choose a project and an agent, and start working. Keep the conversation, editor, terminal, diffs, and browser together in split panes. Run your app, inspect the result, and ask the agent for changes without leaving the workspace.
 
-## Providers
+The desktop app is available on macOS, Windows, and Linux. It starts and manages its local daemon automatically.
 
-- Bring your own. Use your Claude subscription, your OpenAI account, your own API keys, a self-hosted endpoint. Paseo doesn't proxy model calls.
-- Local voice stack. Speech-to-text and text-to-speech run on-device by default. OpenAI providers are configurable if you want cloud quality.
-- Open source. No telemetry on your code.
+## Run tasks in parallel
 
-## Where agents run
+Give independent tasks their own worktrees and branches. Run several agents at once, inspect each diff, test each implementation, and choose what to merge. Use the same provider for every task or choose a different provider and model for each.
 
-- Your laptop, a homelab, a company server. Same daemon, same client surface.
-- Any directory, git or not. Launch agents, merge locally, review the diff in the app.
-- GitHub PRs, checks, and reviews surface in the app when you want them. Not required.
+Configure [workspace scripts](/docs/worktrees#scripts-and-services) to start development servers with separate ports for each worktree. [Try the parallel development workflow](/docs/parallel-development).
 
-## Parallel work
+## Use your agents and tools
 
-- Splits and panes. Agents, terminals, and browsers side by side in one workspace.
-- Per-worktree services. Each worktree gets allocated ports for dev servers and databases, reachable through proxy URLs like `web.fix-auth.my-app.localhost` so they don't collide.
-- Multiple agents on the same repo via worktrees.
+Paseo runs the coding agents you already use, with your subscriptions, credentials, configuration, skills, and MCP servers. Your agents work with the files and tools on your machine. See [supported providers](/docs/supported-providers).
 
-## Automation
+Dictate tasks or use [voice mode](/docs/voice). Speech-to-text and text-to-speech run locally by default, with cloud providers available in settings.
 
-- The CLI exposes the same surface as the app. Anything in the UI is scriptable.
-- [Paseo tools](/docs/orchestration). Agents can drive Paseo themselves: create isolated workspaces, spawn subagents, open terminals, and send prompts.
-- [Hub](/docs/hub). A service you host that starts agents on your daemon when someone mentions you on GitHub, Slack, or Discord.
+## Continue from another device
 
-## What it isn't
+The daemon owns the running agents and workspaces. The desktop app connects to it locally; mobile, web, and CLI clients connect to the same environment. That separation lets you continue working from another device or run your environment on a server.
 
-Not a hosted agent, not an IDE, not a model provider. Paseo runs the CLIs you already use and stays out of the way.
+Use Paseo entirely on your laptop, or connect to another machine when you need it. The native iOS and Android app gives you agents, files, terminals, and diffs on your phone. The built-in browser runs in the desktop app. [Connect your devices](/docs/connectivity) directly or through the optional end-to-end encrypted relay.
+
+## Automate and extend your workflow
+
+Give agents [Paseo tools](/docs/orchestration) to create worktrees, launch other agents, send prompts, and collect results. Use the [CLI](/docs/cli) or [TypeScript SDK](/docs/sdk) to automate agent and workspace operations.
+
+[Plugins](/docs/plugins) add providers, workspace panels, commands, and workflows. [Hub](/docs/hub) connects external events to agents running on your machines.
+
+Paseo is open source under Apache-2.0, with no telemetry, tracking, or required Paseo account.
diff --git a/public-docs/workspaces.md b/public-docs/workspaces.md
index caf59884c4..2e74935d54 100644
--- a/public-docs/workspaces.md
+++ b/public-docs/workspaces.md
@@ -48,6 +48,8 @@ The workspace is the product concept; a git worktree is one way to isolate its f
 
 ## Creating a workspace
 
+For a desktop walkthrough from starting parallel agents to reviewing and testing their changes, see [Run parallel tasks](/docs/parallel-development).
+
 You can create a workspace in the app or from the CLI:
 
 ```bash
diff --git a/scripts/builtin-plugins-dist.test.mjs b/scripts/builtin-plugins-dist.test.mjs
new file mode 100644
index 0000000000..acaa684a44
--- /dev/null
+++ b/scripts/builtin-plugins-dist.test.mjs
@@ -0,0 +1,83 @@
+import assert from "node:assert/strict";
+import { mkdtemp, readFile, rm, stat } from "node:fs/promises";
+import path from "node:path";
+import os from "node:os";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+import pino from "pino";
+import {
+  builtinPlugins,
+  resolveBuiltinPluginsRoot,
+} from "../packages/server/dist/server/server/plugins/builtin/index.js";
+import { compilePlugin } from "../packages/server/dist/server/server/plugins/compiler.js";
+import { readPluginManifest } from "../packages/server/dist/server/server/plugins/manifest.js";
+import { PluginRuntime } from "../packages/server/dist/server/server/plugins/runtime.js";
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packagedRoot = path.join(repoRoot, "packages/server/dist/server/builtin-plugins");
+
+async function findEntry(directory, names) {
+  for (const name of names) {
+    const entry = path.join(directory, name);
+    if ((await stat(entry).catch(() => null))?.isFile()) return entry;
+  }
+  return null;
+}
+
+test("built output compiles and starts every listed built-in", async () => {
+  assert.equal(resolveBuiltinPluginsRoot(), packagedRoot);
+  const { version } = JSON.parse(
+    await readFile(path.join(repoRoot, "packages/server/package.json"), "utf8"),
+  );
+  const settingsDirectory = await mkdtemp(path.join(os.tmpdir(), "builtin-dist-settings-"));
+  const runtime = new PluginRuntime(pino({ level: "silent" }), version, { settingsDirectory });
+  runtime.bindPaseoSessionHost({
+    async attachPluginSocket(_pluginId, socket) {
+      const closed = new Promise((resolve) => socket.once("close", resolve));
+      socket.on("message", (data) => {
+        if (typeof data !== "string") return;
+        const message = JSON.parse(data);
+        if (message.type !== "hello") return;
+        socket.send(
+          JSON.stringify({
+            type: "session",
+            message: {
+              type: "status",
+              payload: {
+                status: "server_info",
+                serverId: "builtin-dist-test",
+                hostname: "builtin-dist-test",
+                version,
+                features: {},
+              },
+            },
+          }),
+        );
+      });
+      return { closed };
+    },
+  });
+  try {
+    for (const id of builtinPlugins) {
+      const directory = path.join(packagedRoot, id);
+      assert.equal((await readPluginManifest(directory)).id, id);
+      const bundles = await compilePlugin({
+        server: await findEntry(directory, ["index.server.ts", "index.server.tsx"]),
+        client: await findEntry(directory, ["index.client.ts", "index.client.tsx"]),
+      });
+      assert.ok(bundles.serverBundle, `${id} must compile a server bundle`);
+      await runtime.startBuiltinPlugin({ id, directory });
+      assert.ok(runtime.catalog().some((plugin) => plugin.id === id));
+      if (id.endsWith("-usage-source")) {
+        const sourceId = id.slice(0, -"-usage-source".length);
+        assert.ok(
+          runtime.getUsageSourceRegistrations(id).some((source) => source.id === sourceId),
+          `${id} must register usage source ${sourceId}`,
+        );
+      }
+    }
+  } finally {
+    await runtime.stopAll();
+    await rm(settingsDirectory, { recursive: true, force: true });
+  }
+});
diff --git a/scripts/ci-workflow.test.mjs b/scripts/ci-workflow.test.mjs
index 8ba01afbe6..8ea5411026 100644
--- a/scripts/ci-workflow.test.mjs
+++ b/scripts/ci-workflow.test.mjs
@@ -17,6 +17,7 @@ const gatedCiJobs = new Map([
   ["typecheck", { name: "typecheck", contract: "quality" }],
   ["server-tests-ubuntu", { name: "server-tests (ubuntu-latest)", contracts: ["server", "hub"] }],
   ["server-tests-windows", { name: "server-tests (windows-latest)", contracts: ["server", "hub"] }],
+  ["server-tests-macos", { name: "server-tests (macos-14, file observation)", contract: "server" }],
   ["desktop-tests-ubuntu", { name: "desktop-tests (ubuntu-latest)", contract: "desktop" }],
   ["desktop-tests-windows", { name: "desktop-tests (windows-latest)", contract: "desktop" }],
   ["app-tests", { name: "app-tests", contract: "app" }],
@@ -159,7 +160,7 @@ test("PR routing declares stable behavior ownership", () => {
     ],
     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.*"],
+    server: ["plugins/**", "packages/server/**", "packages/app/e2e/support/fixtures/recording.*"],
     desktop: [
       "packages/desktop/**",
       "packages/app/src/desktop/**",
@@ -169,8 +170,27 @@ test("PR routing declares stable behavior ownership", () => {
       "packages/app/package.json",
     ],
     app: ["packages/app/**", "packages/expo-two-way-audio/**"],
-    sdk: ["packages/client/**", "packages/highlight/**", "packages/protocol/**"],
+    sdk: [
+      "packages/plugin/**",
+      "plugin-examples/**",
+      "public-docs/plugins/**",
+      "packages/client/**",
+      "packages/highlight/**",
+      "packages/protocol/**",
+    ],
     browser: [
+      "packages/server/src/server/agent/provider-snapshot-manager.ts",
+      "packages/server/src/server/session/provider/provider-catalog-session.ts",
+      "packages/client/src/compat/normalize-provider-models.ts",
+      "packages/protocol/src/client-capabilities.ts",
+      "packages/server/src/server/agent/provider-registry.ts",
+      "packages/server/src/server/agent/agent-sdk-types.ts",
+      "packages/server/src/server/agent/providers/codex-app-server-agent.ts",
+      "packages/server/src/server/agent/providers/claude/agent.ts",
+      "packages/server/src/server/agent/plugin-provider.ts",
+      "packages/server/src/server/plugins/{index,plugin-process,plugin-process-protocol,runtime}.ts",
+      "packages/server/src/executable-resolution/**",
+      "packages/plugin/src/server/provider.ts",
       "packages/app/src/!(desktop)/**",
       "packages/app/e2e/browser/**",
       "packages/app/e2e/support/**",
@@ -239,6 +259,18 @@ test("browser and desktop tests have exclusive, directory-owned suites", () => {
     "packages/app/package.json",
   ]);
   assert.deepEqual(filters.browser, [
+    "packages/server/src/server/agent/provider-snapshot-manager.ts",
+    "packages/server/src/server/session/provider/provider-catalog-session.ts",
+    "packages/client/src/compat/normalize-provider-models.ts",
+    "packages/protocol/src/client-capabilities.ts",
+    "packages/server/src/server/agent/provider-registry.ts",
+    "packages/server/src/server/agent/agent-sdk-types.ts",
+    "packages/server/src/server/agent/providers/codex-app-server-agent.ts",
+    "packages/server/src/server/agent/providers/claude/agent.ts",
+    "packages/server/src/server/agent/plugin-provider.ts",
+    "packages/server/src/server/plugins/{index,plugin-process,plugin-process-protocol,runtime}.ts",
+    "packages/server/src/executable-resolution/**",
+    "packages/plugin/src/server/provider.ts",
     "packages/app/src/!(desktop)/**",
     "packages/app/e2e/browser/**",
     "packages/app/e2e/support/**",
@@ -250,11 +282,24 @@ test("browser and desktop tests have exclusive, directory-owned suites", () => {
   ]);
 });
 
-test("non-required Docker and Nix workflows avoid runners with workflow path filters", () => {
+test("packaging runs on main without allocating pull-request runners", () => {
   for (const workflowPath of [dockerWorkflowPath, nixWorkflowPath]) {
     const source = readFileSync(workflowPath, "utf8");
     const trigger = source.split("jobs:", 1)[0];
-    assert.match(trigger, /^\s+paths:\s*$/m);
+    assert.match(trigger, /push:\s*\n\s+branches: \[main\]/);
+    assert.doesNotMatch(trigger, /pull_request/);
     assert.doesNotMatch(source, /dorny\/paths-filter/);
   }
 });
+
+test("desktop packaging smokes main pushes and only the pull requests that touch packaging", () => {
+  const source = readFileSync(new URL(".github/workflows/desktop-packages.yml", repoRoot), "utf8");
+  const trigger = source.split("jobs:", 1)[0];
+  assert.match(trigger, /push:\s*\n\s+branches: \[main\]/);
+  assert.match(trigger, /pull_request:\s*\n\s+branches: \[main\]\s*\n\s+paths:/);
+  assert.match(trigger, /- "packages\/desktop\/\*\*"/);
+  assert.doesNotMatch(source, /dorny\/paths-filter/);
+  for (const action of ["actions/checkout", "actions/setup-node", "actions/upload-artifact"]) {
+    assert.match(source, new RegExp(`${action}@[0-9a-f]{40} # v\\d+\\.\\d+\\.\\d+`));
+  }
+});
diff --git a/scripts/github-release.mjs b/scripts/github-release.mjs
index cb166ef189..5c7b7f5988 100644
--- a/scripts/github-release.mjs
+++ b/scripts/github-release.mjs
@@ -1,4 +1,5 @@
 import { execFileSync as nodeExecFileSync } from "node:child_process";
+import { isMainModule } from "./is-main-module.mjs";
 
 function parseJson(output) {
   return JSON.parse(output);
@@ -67,7 +68,7 @@ function parseArgs(argv) {
   return { cleanupDuplicates, repo, tag };
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isMainModule(import.meta.url)) {
   const { cleanupDuplicates, repo, tag } = parseArgs(process.argv.slice(2));
   let release = null;
   for (let attempt = 0; attempt < 5 && !release; attempt += 1) {
diff --git a/scripts/is-main-module.mjs b/scripts/is-main-module.mjs
new file mode 100644
index 0000000000..f71c95f80d
--- /dev/null
+++ b/scripts/is-main-module.mjs
@@ -0,0 +1,10 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+// `import.meta.url === \`file://${process.argv[1]}\`` is false on Windows, where argv[1] is
+// `D:\a\...` and the module URL is `file:///D:/a/...`, so a script guarded that way silently
+// does nothing on a Windows runner. Compare resolved filesystem paths instead.
+export function isMainModule(importMetaUrl, argvPath = process.argv[1]) {
+  if (!argvPath) return false;
+  return fileURLToPath(importMetaUrl) === path.resolve(argvPath);
+}
diff --git a/scripts/is-main-module.test.mjs b/scripts/is-main-module.test.mjs
new file mode 100644
index 0000000000..b4d84882ed
--- /dev/null
+++ b/scripts/is-main-module.test.mjs
@@ -0,0 +1,34 @@
+import assert from "node:assert/strict";
+import path from "node:path";
+import { test } from "node:test";
+import { pathToFileURL } from "node:url";
+import { isMainModule } from "./is-main-module.mjs";
+
+test("matches the executed script on this platform", () => {
+  const scriptPath = path.resolve("scripts", "github-release.mjs");
+  assert.equal(isMainModule(pathToFileURL(scriptPath).href, scriptPath), true);
+});
+
+test("does not match when another module is the entry point", () => {
+  const scriptPath = path.resolve("scripts", "github-release.mjs");
+  const otherPath = path.resolve("scripts", "stamp-rollout.mjs");
+  assert.equal(isMainModule(pathToFileURL(scriptPath).href, otherPath), false);
+});
+
+test("returns false without an argv entry", () => {
+  assert.equal(
+    isMainModule(pathToFileURL(path.resolve("scripts", "x.mjs")).href, undefined),
+    false,
+  );
+});
+
+test("the naive string comparison that broke Windows is not used", () => {
+  const scriptPath = path.resolve("scripts", "github-release.mjs");
+  const url = pathToFileURL(scriptPath).href;
+  // On Windows this naive form is `file://D:\\...` and never equals the module URL.
+  assert.notEqual(
+    `file://${"D:\\a\\paseo\\scripts\\github-release.mjs"}`,
+    "file:///D:/a/paseo/scripts/github-release.mjs",
+  );
+  assert.equal(isMainModule(url, scriptPath), true);
+});
diff --git a/scripts/merge-mac-manifest.mjs b/scripts/merge-mac-manifest.mjs
index 7ebb92957d..51fcc56df5 100644
--- a/scripts/merge-mac-manifest.mjs
+++ b/scripts/merge-mac-manifest.mjs
@@ -1,5 +1,10 @@
 import fs from "node:fs";
 import { dump, load } from "js-yaml";
+import { isMainModule } from "./is-main-module.mjs";
+
+// electron-updater compares this with os.release(), which reports the Darwin
+// kernel version. Darwin 22 is macOS 13 Ventura.
+export const MACOS_MINIMUM_DARWIN_VERSION = "22.0.0";
 
 export function mergeMacManifest(arm64Path, x64Path, outputPath) {
   const arm64 = load(fs.readFileSync(arm64Path, "utf8"));
@@ -7,12 +12,15 @@ export function mergeMacManifest(arm64Path, x64Path, outputPath) {
   const files = [...(arm64.files ?? []), ...(x64.files ?? [])].filter(
     (file, index, all) => all.findIndex((entry) => entry.url === file.url) === index,
   );
-  const output = dump({ ...arm64, files }, { lineWidth: -1, noRefs: true });
+  const output = dump(
+    { ...arm64, files, minimumSystemVersion: MACOS_MINIMUM_DARWIN_VERSION },
+    { lineWidth: -1, noRefs: true },
+  );
   fs.writeFileSync(outputPath, output);
   return output;
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isMainModule(import.meta.url)) {
   const [, , arm64Path, x64Path, outputPath] = process.argv;
   if (!arm64Path || !x64Path || !outputPath) {
     throw new Error("Usage: node scripts/merge-mac-manifest.mjs <arm64.yml> <x64.yml> <out.yml>");
diff --git a/scripts/merge-mac-manifest.test.mjs b/scripts/merge-mac-manifest.test.mjs
index f007b77afd..cd8ceaf957 100644
--- a/scripts/merge-mac-manifest.test.mjs
+++ b/scripts/merge-mac-manifest.test.mjs
@@ -22,6 +22,7 @@ test("preserves unknown fields while merging files by url", () => {
     mergeMacManifest(arm64Path, x64Path, outputPath);
     const output = readFileSync(outputPath, "utf8");
     assert.match(output, /stagingPercentage: 25/);
+    assert.match(output, /minimumSystemVersion: 22\.0\.0/);
     assert.match(output, /url: app-arm64\.zip/);
     assert.match(output, /url: app-x64\.zip/);
   } finally {
diff --git a/scripts/postinstall-patches.mjs b/scripts/postinstall-patches.mjs
index ccfc46ba4e..06d8892c60 100644
--- a/scripts/postinstall-patches.mjs
+++ b/scripts/postinstall-patches.mjs
@@ -12,10 +12,6 @@ const patchedPackages = [
     nodeModulesPath: "node_modules/react-native-markdown-display",
     patchPrefix: "react-native-markdown-display+",
   },
-  {
-    nodeModulesPath: "node_modules/react-native",
-    patchPrefix: "react-native+",
-  },
   // Remove after react-native-unistyles ships
   // https://github.com/jpudysz/react-native-unistyles/pull/1203.
   {
diff --git a/scripts/stamp-rollout.mjs b/scripts/stamp-rollout.mjs
index 2455d6b42d..a655b12e20 100644
--- a/scripts/stamp-rollout.mjs
+++ b/scripts/stamp-rollout.mjs
@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import { dump, load } from "js-yaml";
+import { isMainModule } from "./is-main-module.mjs";
 
 export function stampRollout({ releaseDate, rolloutHours }, paths) {
   if (releaseDate === undefined && rolloutHours === undefined) {
@@ -35,7 +36,7 @@ function parseArgs(argv) {
   return { opts, paths };
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isMainModule(import.meta.url)) {
   const { opts, paths } = parseArgs(process.argv.slice(2));
   if (paths.length === 0 || (opts.releaseDate === undefined && opts.rolloutHours === undefined)) {
     throw new Error(
diff --git a/scripts/sync-fdroid-changelogs.mjs b/scripts/sync-fdroid-changelogs.mjs
index 11690f39ef..8c69107640 100644
--- a/scripts/sync-fdroid-changelogs.mjs
+++ b/scripts/sync-fdroid-changelogs.mjs
@@ -21,6 +21,7 @@ import { fileURLToPath } from "node:url";
 // require it, so the ABI table has exactly one definition across all three callers.
 import { getFdroidVersionCodes as defaultGetFdroidVersionCodes } from "../packages/app/native-release-version.js";
 import { parseChangelogBody, parseChangelogEntries } from "./changelog-utils.mjs";
+import { isMainModule } from "./is-main-module.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const rootDir = path.resolve(__dirname, "..");
@@ -263,6 +264,6 @@ export function syncFdroidChangelogs(argv = process.argv.slice(2), deps = {}) {
   return { contents, version, versionCodes, written };
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isMainModule(import.meta.url)) {
   syncFdroidChangelogs();
 }
diff --git a/scripts/sync-release-notes-from-changelog.mjs b/scripts/sync-release-notes-from-changelog.mjs
index fb1018c181..95c9baec4c 100644
--- a/scripts/sync-release-notes-from-changelog.mjs
+++ b/scripts/sync-release-notes-from-changelog.mjs
@@ -9,6 +9,7 @@ import {
   normalizeReleaseTag,
   parseReleaseVersion,
 } from "./release-version-utils.mjs";
+import { isMainModule } from "./is-main-module.mjs";
 
 function usageAndExit(code = 1) {
   const usage = `
@@ -201,6 +202,6 @@ export function syncReleaseNotes(argv = process.argv.slice(2), deps = {}) {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isMainModule(import.meta.url)) {
   syncReleaseNotes();
 }
diff --git a/scripts/test-support/npm-registry.mts b/scripts/test-support/npm-registry.mts
new file mode 100644
index 0000000000..a0a39e27d9
--- /dev/null
+++ b/scripts/test-support/npm-registry.mts
@@ -0,0 +1,164 @@
+import { execCommand } from "../../packages/server/src/utils/spawn.js";
+import { createHash } from "node:crypto";
+import { createServer } from "node:http";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+interface FixturePackage {
+  name: string;
+  version: string;
+  files: Record<string, string>;
+  dependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+  scripts?: Record<string, string>;
+  tags?: string[];
+}
+
+/** A registry serving real npm-packed artifacts, including integrity and host auth configuration. */
+export async function startNpmRegistry(packages: FixturePackage[]) {
+  const root = await mkdtemp(path.join(tmpdir(), "paseo-npm-registry-"));
+  const artifacts = new Map<string, Buffer>();
+  const manifests = new Map<
+    string,
+    { name: string; versions: Record<string, unknown>; "dist-tags": Record<string, string> }
+  >();
+  const requests: string[] = [];
+  const server = createServer((request, response) => {
+    const url = decodeURIComponent(request.url ?? "");
+    requests.push(url);
+    if (request.headers.authorization !== "Bearer fixture-token") {
+      response.writeHead(401).end(JSON.stringify({ error: "Registry token required" }));
+      return;
+    }
+    const artifact = artifacts.get(url);
+    if (artifact) {
+      response.writeHead(200, { "content-type": "application/octet-stream" }).end(artifact);
+      return;
+    }
+    const manifest = manifests.get(url.slice(1));
+    response.writeHead(manifest ? 200 : 404, { "content-type": "application/json" });
+    response.end(JSON.stringify(manifest ?? { error: "Package not found" }));
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("Expected registry port");
+  const url = `http://127.0.0.1:${address.port}`;
+  const userconfig = path.join(root, "npmrc");
+  await writeFile(
+    userconfig,
+    `registry=${url}/\n//127.0.0.1:${address.port}/:_authToken=fixture-token\ncache=${root}/cache\n`,
+  );
+  try {
+    for (const [index, pkg] of packages.entries()) {
+      const directory = path.join(root, String(index));
+      await mkdir(directory);
+      const manifest = {
+        name: pkg.name,
+        version: pkg.version,
+        dependencies: pkg.dependencies,
+        peerDependencies: pkg.peerDependencies,
+        scripts: pkg.scripts,
+      };
+      await writeFile(path.join(directory, "package.json"), JSON.stringify(manifest));
+      for (const [file, content] of Object.entries(pkg.files)) {
+        await mkdir(path.dirname(path.join(directory, file)), { recursive: true });
+        await writeFile(path.join(directory, file), content);
+      }
+      const { stdout } = await execCommand("npm", ["pack", "--ignore-scripts", "--json"], {
+        cwd: directory,
+      });
+      const packed: Array<{ filename: string }> = JSON.parse(stdout);
+      const artifact = await readFile(path.join(directory, packed[0].filename));
+      const artifactPath = `/artifacts/${index}.tgz`;
+      artifacts.set(artifactPath, artifact);
+      const published = {
+        ...manifest,
+        dist: {
+          tarball: `${url}${artifactPath}`,
+          integrity: `sha512-${createHash("sha512").update(artifact).digest("base64")}`,
+        },
+      };
+      const existing = manifests.get(pkg.name) ?? { name: pkg.name, versions: {}, "dist-tags": {} };
+      const versions = existing.versions;
+      const tags = existing["dist-tags"];
+      versions[pkg.version] = published;
+      for (const tag of pkg.tags ?? ["latest"]) tags[tag] = pkg.version;
+      manifests.set(pkg.name, existing);
+    }
+  } catch (error) {
+    server.closeAllConnections();
+    server.close();
+    await rm(root, { recursive: true, force: true });
+    throw error;
+  }
+  return {
+    url,
+    userconfig,
+    requests,
+    env: { npm_config_userconfig: userconfig },
+    setTag(packageName: string, tag: string, version: string) {
+      const manifest = manifests.get(packageName);
+      if (!manifest?.versions[version])
+        throw new Error(`Unknown fixture package: ${packageName}@${version}`);
+      manifest["dist-tags"][tag] = version;
+    },
+    async close() {
+      server.closeAllConnections();
+      await new Promise<void>((resolve, reject) => {
+        server.close((error) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+          resolve();
+        });
+      });
+      await rm(root, { recursive: true, force: true });
+    },
+  };
+}
+
+export function npmPluginPackages() {
+  const files = {
+    "paseo-plugin.json": JSON.stringify({
+      id: "npm-review",
+      description: "Installed from the npm fixture registry",
+      requirements: { paseo: ">=0.4.0" },
+    }),
+    "index.server.ts": `import value from "paseo-fixture-dependency";
+export default function contribute() {
+  if (value !== "dependency loaded") throw new Error("Dependency did not resolve");
+  console.log(value);
+  return () => {};
+}`,
+  };
+  return [
+    {
+      name: "paseo-fixture-dependency",
+      version: "1.0.0",
+      files: { "index.js": 'module.exports = "dependency loaded";' },
+    },
+    {
+      name: "paseo-fixture-plugin",
+      version: "1.0.0",
+      files,
+      dependencies: { "paseo-fixture-dependency": "1.0.0" },
+      tags: ["stable"],
+    },
+    {
+      name: "paseo-fixture-plugin",
+      version: "1.1.0",
+      files,
+      dependencies: { "paseo-fixture-dependency": "1.0.0" },
+      tags: ["latest", "next"],
+    },
+    {
+      name: "@paseo-fixture/review",
+      version: "2.0.0",
+      files,
+      dependencies: { "paseo-fixture-dependency": "1.0.0" },
+      peerDependencies: { "@getpaseo/plugin": "*" },
+    },
+  ];
+}
diff --git a/scripts/trace-daemon-dist.test.mjs b/scripts/trace-daemon-dist.test.mjs
new file mode 100644
index 0000000000..a2c2149daa
--- /dev/null
+++ b/scripts/trace-daemon-dist.test.mjs
@@ -0,0 +1,46 @@
+import assert from "node:assert/strict";
+import { execFile } from "node:child_process";
+import { cp, mkdtemp, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import test from "node:test";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { promisify } from "node:util";
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const bridgeModule = "packages/server/dist/server/server/agent/providers/opencode/bridge.js";
+
+// Mirrors nix/package.nix's installPhase: copy every traced path into $out.
+async function installTracedDaemon(outRoot) {
+  const { stdout } = await promisify(execFile)(
+    process.execPath,
+    [path.join(repoRoot, "scripts/trace-daemon.mjs")],
+    { cwd: repoRoot, maxBuffer: 64 * 1024 * 1024 },
+  );
+  for (const file of stdout.split("\n").filter(Boolean)) {
+    await cp(path.join(repoRoot, file), path.join(outRoot, file), {
+      recursive: true,
+      verbatimSymlinks: true,
+    });
+  }
+}
+
+test("traced daemon closure ships the OpenCode bridge plugin for every OpenCode version", async () => {
+  const outRoot = await mkdtemp(path.join(os.tmpdir(), "trace-daemon-dist-"));
+  try {
+    await installTracedDaemon(outRoot);
+    const installedBridgeUrl = pathToFileURL(path.join(outRoot, bridgeModule)).href;
+    const { loadOpenCodeBridgePluginArtifact } = await import(installedBridgeUrl);
+
+    for (const version of [1, 2]) {
+      const artifact = await loadOpenCodeBridgePluginArtifact(
+        installedBridgeUrl,
+        undefined,
+        version,
+      );
+      assert.ok(artifact.byteLength > 0, `OpenCode v${version} bridge plugin is empty`);
+    }
+  } finally {
+    await rm(outRoot, { recursive: true, force: true });
+  }
+});
diff --git a/scripts/trace-daemon.mjs b/scripts/trace-daemon.mjs
index 137ca13172..2b6e26c3ea 100644
--- a/scripts/trace-daemon.mjs
+++ b/scripts/trace-daemon.mjs
@@ -13,7 +13,8 @@
 // node_modules populated (the Nix build invokes this post-configHook).
 
 import { nodeFileTrace } from "@vercel/nft";
-import { glob } from "node:fs/promises";
+import { glob, readFile, readdir } from "node:fs/promises";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 
@@ -29,6 +30,47 @@ const { sherpaPlatformPackageName } = await import(
 );
 
 const traceDesktop = process.env.PASEO_TRACE_DESKTOP === "1";
+const terminalModule = "packages/server/dist/server/terminal/terminal.js";
+const sherpaModule =
+  "packages/server/dist/server/server/speech/providers/local/sherpa/sherpa-onnx-node-loader.js";
+const sherpaEnvModule =
+  "packages/server/dist/server/server/speech/providers/local/sherpa/sherpa-runtime-env.js";
+
+// Resolve-only and computed requires need explicit graph edges, not installed
+// paths. Analyze them at their real importer so nft retains the package exports,
+// manifests and workspace symlinks used by Node's resolution.
+const runtimeDependencies = new Map([
+  ["packages/cli/dist/commands/daemon/local-daemon.js", ["@getpaseo/server"]],
+  [terminalModule, ["@getpaseo/cli/bin/paseo", "node-pty/package.json"]],
+  [sherpaModule, ["sherpa-onnx-node"]],
+  [sherpaEnvModule, [`${sherpaPlatformPackageName()}/package.json`]],
+  ...(traceDesktop
+    ? [
+        ["packages/desktop/dist/daemon/runtime-paths.js", ["@getpaseo/server"]],
+        ["packages/desktop/dist/integrations/cli-install/paths.js", ["@getpaseo/cli/bin/paseo"]],
+      ]
+    : []),
+]);
+
+function requireFrom(importer) {
+  return createRequire(path.join(REPO_ROOT, importer));
+}
+
+function resolvedPackageFiles(importer, specifier) {
+  const manifest = requireFrom(importer).resolve(`${specifier}/package.json`);
+  return path.join(path.dirname(manifest), "**");
+}
+
+// Let node-pty select the native build it actually loads. npm hoisting and
+// prebuild/build layout are owned by the package, not this trace. Its Darwin
+// spawn-helper lives beside the selected addon; retain the files in that dir.
+const terminalRequire = requireFrom(terminalModule);
+const ptyLoader = terminalRequire.resolve("node-pty/lib/utils");
+const { dir: ptyNativeDir } = terminalRequire(ptyLoader).loadNativeModule("pty");
+const ptyNativeRoot = path.resolve(path.dirname(ptyLoader), ptyNativeDir);
+const ptyNativeFiles = (await readdir(ptyNativeRoot, { withFileTypes: true }))
+  .filter((entry) => entry.isFile())
+  .map((entry) => path.join(ptyNativeRoot, entry.name));
 
 // Daemon entry points. Workers forked into their own Node processes have
 // independent require trees; nft does not follow fork boundaries, so trace
@@ -53,41 +95,50 @@ const entries = [
 const additionalInputs = [
   // Agent orchestration skill catalog loaded through filesystem paths
   "packages/server/dist/server/skills/**",
+  "packages/server/dist/server/builtin-plugins/**",
   // Shell integration scripts loaded by the terminal manager
   "packages/server/dist/server/terminal/shell-integration/**",
   // Silero VAD ONNX model (sherpa speech provider)
   "packages/server/dist/server/server/speech/providers/local/sherpa/assets/silero_vad.onnx",
-  // OpenCode loads this plugin from a content-addressed runtime copy.
-  "packages/server/dist/server/server/agent/providers/opencode/bridge-plugin.bundle.mjs",
+  // OpenCode loads these plugins from a content-addressed runtime copy, one
+  // bundle per supported OpenCode version (opencode/ and opencode/v2/).
+  "packages/server/dist/server/server/agent/providers/opencode/**/bridge-plugin.bundle.mjs",
   // Server runtime config files (read by path, not require)
   "packages/server/.env.example",
-  // CLI shebang script wrapping dist/index.js
-  "packages/cli/bin/paseo",
-  // node-pty's compiled native addon. nft can't trace it because
-  // node-pty loads it via `require(path.join(__dirname, 'prebuilds/<plat>/pty.node'))`
-  // with a runtime-computed platform suffix. Pin to the host platform —
-  // the Nix derivation builds for one platform at a time and ships only
-  // its own binaries.
-  `node_modules/node-pty/prebuilds/${process.platform}-${process.arch}/**`,
-  // sherpa-onnx-node dynamically resolves a platform-specific native package.
-  // Copy the wrapper plus the host platform package explicitly.
-  "node_modules/sherpa-onnx-node/**",
-  `node_modules/${sherpaPlatformPackageName()}/**`,
+  ...ptyNativeFiles,
+  // Resolve native speech packages from the same modules as the runtime.
+  resolvedPackageFiles(sherpaModule, "sherpa-onnx-node"),
+  resolvedPackageFiles(sherpaEnvModule, sherpaPlatformPackageName()),
   ...(traceDesktop
     ? [
         // The unpackaged Nix launcher resolves these beside desktop/dist.
         "packages/desktop/package.json",
         "packages/desktop/assets/**",
-        // resolveExternalCliEntrypoint() looks up the workspace through this
-        // link at runtime; nft traces the target files but not the link.
-        "node_modules/@getpaseo/cli",
       ]
     : []),
 ];
 
+// Fail at build time if a required runtime edge cannot resolve.
+for (const [importer, specifiers] of runtimeDependencies) {
+  for (const specifier of specifiers) requireFrom(importer).resolve(specifier);
+}
+
 // Trace.
 const { fileList, warnings } = await nodeFileTrace(entries, {
   base: REPO_ROOT,
+  async readFile(file) {
+    let source;
+    try {
+      source = await readFile(file);
+    } catch (error) {
+      if (error.code === "ENOENT" || error.code === "EISDIR") return null;
+      throw error;
+    }
+    const dependencies = runtimeDependencies.get(path.relative(REPO_ROOT, file));
+    if (!dependencies) return source;
+    // These statements exist only in nft's input, never in the shipped code.
+    return `${source}\n${dependencies.map((specifier) => `require(${JSON.stringify(specifier)});`).join("\n")}`;
+  },
   // Tolerate the conditional / dynamic patterns we already audited:
   // sherpa-onnx-${platform}-${arch} package resolution (the host package
   // is copied explicitly above), and a handful of test-only requires that
@@ -127,10 +178,10 @@ const expanded = new Set(fileList);
 for (const pattern of additionalInputs) {
   if (pattern.includes("*")) {
     for await (const file of glob(pattern, { cwd: REPO_ROOT })) {
-      expanded.add(file);
+      expanded.add(path.relative(REPO_ROOT, path.resolve(REPO_ROOT, file)));
     }
   } else {
-    expanded.add(pattern);
+    expanded.add(path.relative(REPO_ROOT, path.resolve(REPO_ROOT, pattern)));
   }
 }
 
diff --git a/scripts/upload-release-assets.mjs b/scripts/upload-release-assets.mjs
new file mode 100644
index 0000000000..d3393968ef
--- /dev/null
+++ b/scripts/upload-release-assets.mjs
@@ -0,0 +1,88 @@
+import { spawnSync } from "node:child_process";
+import { readdirSync, statSync } from "node:fs";
+import path from "node:path";
+
+import { isMainModule } from "./is-main-module.mjs";
+
+// uploads.github.com returns HTTP 500 on large desktop binaries often enough that a
+// release regularly loses a ~50 minute build to one failed asset. Upload each file on
+// its own so a failure does not discard its siblings, and retry that file.
+const DEFAULT_ATTEMPTS = 5;
+const DEFAULT_BACKOFF_MS = 15_000;
+
+function uploadAsset({ release, file, repo }) {
+  const command = process.platform === "win32" ? "gh.exe" : "gh";
+  const result = spawnSync(
+    command,
+    ["release", "upload", release, file, "--clobber", "--repo", repo],
+    { shell: process.platform === "win32", stdio: "inherit" },
+  );
+
+  if (result.error) {
+    console.error(`Failed to start gh: ${result.error.message}`);
+    return 1;
+  }
+
+  return result.status ?? 1;
+}
+
+function wait(delayMs) {
+  return new Promise((resolve) => setTimeout(resolve, delayMs));
+}
+
+export function collectAssets(releaseDir, { readDir = readdirSync, stat = statSync } = {}) {
+  return readDir(releaseDir)
+    .map((name) => path.join(releaseDir, name))
+    .filter((file) => stat(file).isFile() && !file.endsWith(".yml"))
+    .sort();
+}
+
+export async function uploadWithRetry(
+  { release, files, repo },
+  {
+    attempts = DEFAULT_ATTEMPTS,
+    backoffMs = DEFAULT_BACKOFF_MS,
+    upload = uploadAsset,
+    sleep = wait,
+  } = {},
+) {
+  for (const file of files) {
+    let exitCode = 1;
+
+    for (let attempt = 1; attempt <= attempts; attempt += 1) {
+      exitCode = await upload({ release, file, repo });
+      if (exitCode === 0) break;
+
+      if (attempt < attempts) {
+        const delayMs = attempt * backoffMs;
+        console.warn(
+          `Uploading ${path.basename(file)} failed with exit code ${exitCode}; retrying in ${delayMs / 1000}s (${attempt + 1}/${attempts})`,
+        );
+        await sleep(delayMs);
+      }
+    }
+
+    if (exitCode !== 0) {
+      console.error(`::error::Giving up on ${path.basename(file)} after ${attempts} attempts`);
+      return exitCode;
+    }
+  }
+
+  return 0;
+}
+
+if (isMainModule(import.meta.url)) {
+  const [release, releaseDir, repo] = process.argv.slice(2);
+  if (!release || !releaseDir || !repo) {
+    console.error("Usage: node scripts/upload-release-assets.mjs <release> <dir> <repo>");
+    process.exitCode = 2;
+  } else {
+    const files = collectAssets(releaseDir);
+    if (files.length === 0) {
+      console.error(`::error::No release artifacts found in ${releaseDir}`);
+      process.exitCode = 1;
+    } else {
+      process.exitCode = await uploadWithRetry({ release, files, repo });
+    }
+  }
+}
diff --git a/scripts/upload-release-assets.test.mjs b/scripts/upload-release-assets.test.mjs
new file mode 100644
index 0000000000..6f6deaabaf
--- /dev/null
+++ b/scripts/upload-release-assets.test.mjs
@@ -0,0 +1,54 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { collectAssets, uploadWithRetry } from "./upload-release-assets.mjs";
+
+const noSleep = () => Promise.resolve();
+
+test("retries a failing asset and keeps its siblings", async () => {
+  const calls = [];
+  const exitCodes = { "a.dmg": [1, 1, 0], "b.zip": [0] };
+
+  const exitCode = await uploadWithRetry(
+    { release: "rel", files: ["a.dmg", "b.zip"], repo: "getpaseo/paseo" },
+    {
+      sleep: noSleep,
+      upload: ({ file }) => {
+        calls.push(file);
+        return exitCodes[file].shift();
+      },
+    },
+  );
+
+  assert.equal(exitCode, 0);
+  assert.deepEqual(calls, ["a.dmg", "a.dmg", "a.dmg", "b.zip"]);
+});
+
+test("gives up after the attempt limit and reports failure", async () => {
+  let calls = 0;
+
+  const exitCode = await uploadWithRetry(
+    { release: "rel", files: ["a.dmg", "b.zip"], repo: "getpaseo/paseo" },
+    {
+      attempts: 3,
+      sleep: noSleep,
+      upload: () => {
+        calls += 1;
+        return 1;
+      },
+    },
+  );
+
+  assert.equal(exitCode, 1);
+  // Stops at the first unrecoverable file rather than attempting b.zip.
+  assert.equal(calls, 3);
+});
+
+test("collects release files and skips manifests", () => {
+  const files = collectAssets("/release", {
+    readDir: () => ["Paseo.dmg", "beta-mac.yml", "Paseo.zip", "nested"],
+    stat: (file) => ({ isFile: () => !file.endsWith("nested") }),
+  });
+
+  assert.deepEqual(files, ["/release/Paseo.dmg", "/release/Paseo.zip"]);
+});
diff --git a/scripts/validate-desktop-manifests.mjs b/scripts/validate-desktop-manifests.mjs
new file mode 100644
index 0000000000..ace4a4060b
--- /dev/null
+++ b/scripts/validate-desktop-manifests.mjs
@@ -0,0 +1,65 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { load } from "js-yaml";
+import { MACOS_MINIMUM_DARWIN_VERSION } from "./merge-mac-manifest.mjs";
+
+export function validateDesktopManifests({ releaseDate, rolloutHours }, paths) {
+  if (!Number.isFinite(rolloutHours) || rolloutHours < 0) {
+    throw new Error(`expected non-negative rolloutHours, got ${rolloutHours}`);
+  }
+
+  for (const manifestPath of paths) {
+    const manifest = load(fs.readFileSync(manifestPath, "utf8")) ?? {};
+    if (manifest.rolloutHours !== rolloutHours) {
+      throw new Error(
+        `${manifestPath}: rolloutHours=${manifest.rolloutHours}, expected ${rolloutHours}`,
+      );
+    }
+    if (manifest.releaseDate !== releaseDate) {
+      throw new Error(
+        `${manifestPath}: releaseDate=${manifest.releaseDate}, expected ${releaseDate}`,
+      );
+    }
+    if (typeof manifest.version !== "string" || manifest.version.length === 0) {
+      throw new Error(`${manifestPath}: missing or invalid version`);
+    }
+    if (
+      manifestPath.endsWith("-mac.yml") &&
+      manifest.minimumSystemVersion !== MACOS_MINIMUM_DARWIN_VERSION
+    ) {
+      throw new Error(
+        `${manifestPath}: minimumSystemVersion=${manifest.minimumSystemVersion}, expected ${MACOS_MINIMUM_DARWIN_VERSION}`,
+      );
+    }
+  }
+}
+
+function parseArgs(argv) {
+  const paths = [];
+  let releaseDate;
+  let rolloutHours;
+
+  for (let index = 0; index < argv.length; index += 1) {
+    if (argv[index] === "--release-date") {
+      releaseDate = argv[++index];
+    } else if (argv[index] === "--rollout-hours") {
+      rolloutHours = Number(argv[++index]);
+    } else {
+      paths.push(argv[index]);
+    }
+  }
+
+  if (!releaseDate || rolloutHours === undefined || paths.length === 0) {
+    throw new Error(
+      "Usage: node scripts/validate-desktop-manifests.mjs --release-date <date> --rollout-hours <hours> <manifest...>",
+    );
+  }
+
+  return { releaseDate, rolloutHours, paths };
+}
+
+if (process.argv[1] && fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
+  const { releaseDate, rolloutHours, paths } = parseArgs(process.argv.slice(2));
+  validateDesktopManifests({ releaseDate, rolloutHours }, paths);
+}
diff --git a/scripts/validate-desktop-manifests.test.mjs b/scripts/validate-desktop-manifests.test.mjs
new file mode 100644
index 0000000000..2c461ac35d
--- /dev/null
+++ b/scripts/validate-desktop-manifests.test.mjs
@@ -0,0 +1,70 @@
+import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { test } from "vitest";
+import { validateDesktopManifests } from "./validate-desktop-manifests.mjs";
+
+const releaseDate = "2026-09-04T00:00:00.000Z";
+const scriptPath = fileURLToPath(new URL("./validate-desktop-manifests.mjs", import.meta.url));
+
+function withManifest(contents, run) {
+  const dir = mkdtempSync(path.join(tmpdir(), "paseo-validate-desktop-manifest-"));
+  const manifestPath = path.join(dir, "latest-mac.yml");
+  try {
+    writeFileSync(manifestPath, contents);
+    run(manifestPath);
+  } finally {
+    rmSync(dir, { force: true, recursive: true });
+  }
+}
+
+test("accepts a guarded macOS update manifest", () => {
+  withManifest(
+    `version: 0.7.3\nreleaseDate: '${releaseDate}'\nrolloutHours: 36\nminimumSystemVersion: 22.0.0\n`,
+    (manifestPath) => {
+      validateDesktopManifests({ releaseDate, rolloutHours: 36 }, [manifestPath]);
+    },
+  );
+});
+
+test("validates release manifests through the workflow CLI", () => {
+  withManifest(
+    `version: 0.7.3\nreleaseDate: '${releaseDate}'\nrolloutHours: 36\nminimumSystemVersion: 22.0.0\n`,
+    (manifestPath) => {
+      const result = spawnSync(
+        process.execPath,
+        [scriptPath, "--release-date", releaseDate, "--rollout-hours", "36", manifestPath],
+        { encoding: "utf8" },
+      );
+
+      assert.equal(result.status, 0, result.stderr);
+    },
+  );
+});
+
+test("rejects a macOS update manifest without the system floor", () => {
+  withManifest(
+    `version: 0.7.3\nreleaseDate: '${releaseDate}'\nrolloutHours: 36\n`,
+    (manifestPath) => {
+      assert.throws(
+        () => validateDesktopManifests({ releaseDate, rolloutHours: 36 }, [manifestPath]),
+        /minimumSystemVersion=undefined, expected 22\.0\.0/,
+      );
+    },
+  );
+});
+
+test("rejects invalid rollout metadata", () => {
+  withManifest(
+    `version: 0.7.3\nreleaseDate: '${releaseDate}'\nrolloutHours: 24\nminimumSystemVersion: 22.0.0\n`,
+    (manifestPath) => {
+      assert.throws(
+        () => validateDesktopManifests({ releaseDate, rolloutHours: 36 }, [manifestPath]),
+        /rolloutHours=24, expected 36/,
+      );
+    },
+  );
+});
diff --git a/skills/paseo-plugin/SKILL.md b/skills/paseo-plugin/SKILL.md
index 53110b8103..e511a7e12f 100644
--- a/skills/paseo-plugin/SKILL.md
+++ b/skills/paseo-plugin/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: paseo-plugin
-description: Build and manage trusted local Paseo plugins. Use when the user asks to create, edit, install, reload, enable, disable, remove, or troubleshoot a Paseo plugin; add a native surface, sidebar item, or workspace panel; add Command Center items or slash commands; add composer pills or attachment sources; transform, render, or append agent timeline items; contribute a theme; use Paseo from plugin code; or add plugin RPCs.
+description: Build and manage trusted local Paseo plugins. Use when the user asks to create, edit, install, reload, enable, disable, remove, or troubleshoot a Paseo plugin; add lifecycle hooks; transform agent configuration, environment, MCP servers, or workspace creation; automate permissions or turn follow-ups; add a screen, sidebar header or footer item, or workspace panel; add Command Center items or slash commands; add composer pills or attachment sources; transform, render, or append agent timeline items; contribute a theme; use Paseo from plugin code; or add plugin RPCs.
 ---
 
 # Paseo plugins
@@ -14,29 +14,40 @@ Build or manage the requested plugin directly. Use the current public docs to ca
 Fetch [https://paseo.sh/llms.txt](https://paseo.sh/llms.txt) first. Select and fetch the current plugin Markdown pages from that index before changing a plugin:
 
 - [Plugin quickstart](https://paseo.sh/docs/plugins.md) ([browser page](https://paseo.sh/docs/plugins))
-- [Plugin reference](https://paseo.sh/docs/plugins/v0.8/reference.md) ([browser page](https://paseo.sh/docs/plugins/v0.8/reference))
+- [Publishing](https://paseo.sh/docs/plugins/publishing.md): npm package contents, dependencies, Git preparation, and private registries.
+- [Plugin reference](https://paseo.sh/docs/plugins/reference.md) ([browser page](https://paseo.sh/docs/plugins/reference))
 
 Use the deployed docs when they disagree with this skill. Do not send the user away to read them instead of completing the work.
 
-When working in the Paseo repository, also read `docs/plugins.md` and the relevant example under `plugin-examples/`.
+In the Paseo repository, use `public-docs/plugins/reference.md` for the checkout's API, including
+unreleased changes. Use `docs/plugins.md` for maintainer guidance. Complete contracts belong in the
+public docs; this skill indexes the references and examples.
 
 ## What a plugin can contribute
 
 Pick the contribution that matches the request. Each row names the registration, when it fits, and where the full contract lives. Most plugins combine several: a slash command that calls an RPC, which appends a timeline row, which a renderer draws.
 
-| Contribution         | Registration                                     | Use it when                                                                                                   | Reference                                                                                          |
-| -------------------- | ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- |
-| Sidebar surface      | `addSurface` + `addSidebarItem`                  | A full screen of plugin UI reachable from the sidebar                                                         | reference.md → Surfaces and sidebar items; `plugin-examples/local-plugin`                          |
-| Workspace panel      | `addWorkspacePanel`                              | UI that lives as a tab beside agents, terminals, files, and diffs; `locations: ["explorer"]` for the Explorer | reference.md → Workspace panels                                                                    |
-| Command Center item  | `addCommandCenterItem`                           | A global, workspace, or agent action reachable from ⌘K                                                        | reference.md → Command Center items                                                                |
-| Client slash command | `addSlashCommand`                                | A `/command args` in the composer that runs plugin code instead of prompting the agent                        | reference.md → Client slash commands                                                               |
-| Composer pill        | `addComposerPill`                                | A per-agent button in the composer track bar next to Tasks and Subagents                                      | reference.md → Composer pills                                                                      |
-| Timeline transformer | `addTimelineTransformer` + `addTimelineRenderer` | Replace, explode, or hide a built-in timeline item, including while it streams                                | reference.md → Timeline items; `plugin-examples/timeline-items`, `plugin-examples/inline-thinking` |
-| Timeline row         | `paseo.agents.ref(id).timeline.append(...)`      | Push a plugin-owned row into an agent timeline from a server handler and update it later                      | reference.md → Append a timeline row from the daemon                                               |
-| Attachment source    | `client.addAttachmentSource` + `server.handle`   | Let the user attach a searchable external resource, such as an issue, to a prompt                             | reference.md → Add a composer attachment source; `plugin-examples/linear`                          |
-| Theme                | `addTheme`                                       | A light or dark palette under Settings → Appearance                                                           | reference.md → Contribute a theme; `plugin-examples/catppuccin`                                    |
-| Plugin RPC           | `defineRpc` + `server.handle` + `useRpc`         | Daemon-side work that is not a normal Paseo operation: vendor APIs, credentials, local files                  | reference.md → Add plugin-specific backend behavior                                                |
-| Paseo SDK            | `usePaseo()` / handler `{ paseo }`               | Normal Paseo operations: workspaces, agents, providers, config                                                | reference.md → Use the Paseo SDK                                                                   |
+| Contribution              | Registration                                                | Use it when                                                                                                   | Reference                                                                                          |
+| ------------------------- | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- |
+| Screen and sidebar item   | `addScreen` + `addSidebarHeaderItem`/`addSidebarFooterItem` | A full screen of plugin UI, or sidebar header or footer rows that open a screen or popover                    | reference.md → Screens and sidebar items                                                           |
+| Workspace panel           | `addWorkspacePanel`                                         | UI that lives as a tab beside agents, terminals, files, and diffs; `locations: ["explorer"]` for the Explorer | reference.md → Workspace panels                                                                    |
+| Command Center item       | `addCommandCenterItem`                                      | A global, workspace, or agent action reachable from ⌘K                                                        | reference.md → Command Center items                                                                |
+| Client slash command      | `addSlashCommand`                                           | A `/command args` in the composer that runs plugin code instead of prompting the agent                        | reference.md → Slash commands                                                                      |
+| Composer pill             | `addComposerPill`                                           | A per-agent button in the composer track bar next to Tasks and Subagents                                      | reference.md → Composer pills                                                                      |
+| Timeline transformer      | `addTimelineTransformer` + `addTimelineRenderer`            | Replace, explode, or hide a built-in timeline item, including while it streams                                | reference.md → Timeline items; `plugin-examples/timeline-items`, `plugin-examples/inline-thinking` |
+| Timeline row              | `paseo.agents.ref(id).timeline.append(...)`                 | Push a plugin-owned row into an agent timeline from a server handler and update it later                      | reference.md → Append a timeline row from the daemon                                               |
+| Attachment source         | `client.addAttachmentSource` + `server.handle`              | Let the user attach a searchable external resource, such as an issue, to a prompt                             | reference.md → Add a composer attachment source; `plugin-examples/linear`                          |
+| Theme                     | `addTheme`                                                  | A light or dark palette under Settings → Appearance                                                           | reference.md → Contribute a theme; `plugin-examples/catppuccin`                                    |
+| Plugin RPC                | `defineRpc` + `server.handle` + `useRpc`                    | Daemon-side work that is not a normal Paseo operation: vendor APIs, credentials, local files                  | reference.md → Add plugin-specific backend behavior                                                |
+| Lifecycle events          | `server.on`                                                 | Observe agent/workspace lifecycle, inspect ended turns, and answer permission requests                        | [Lifecycle hooks](https://paseo.sh/docs/plugins/reference.md#lifecycle-hooks)                      |
+| Creation and launch hooks | `server.before`                                             | Change agent config, provider options, MCP servers, environment, or workspace isolation before the operation  | [Before hooks](https://paseo.sh/docs/plugins/reference.md#before-hooks)                            |
+| Paseo SDK                 | `usePaseo()` / handler `{ paseo }`                          | Normal Paseo operations: workspaces, agents, providers, config                                                | reference.md → Use the Paseo SDK                                                                   |
+
+| Lifecycle task                                                      | Example                                                                                                |
+| ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| Log all eleven hooks                                                | [lifecycle-logger](https://github.com/getpaseo/paseo/tree/main/plugin-examples/lifecycle-logger)       |
+| Follow-ups, permissions, environment, provider switching, worktrees | [lifecycle-actions](https://github.com/getpaseo/paseo/tree/main/plugin-examples/lifecycle-actions)     |
+| Inject MCP servers and change Codex sandbox/approval options        | [agent-configuration](https://github.com/getpaseo/paseo/tree/main/plugin-examples/agent-configuration) |
 
 ## Create the project
 
@@ -53,6 +64,7 @@ The generated project contains:
 ```text
 my-plugin/
   paseo-plugin.json
+  OVERVIEW.md
   package.json
   tsconfig.json
   index.client.tsx
@@ -62,12 +74,19 @@ my-plugin/
   shared/greeting.ts
 ```
 
-The manifest supplies the default install ID:
+The manifest supplies the default install ID and supported Paseo versions:
 
 ```json
-{ "id": "my-plugin" }
+{ "id": "my-plugin", "requirements": { "paseo": ">=0.8.0" } }
 ```
 
+Keep `requirements.paseo` correct whenever creating or editing a plugin. `init` uses `>=` followed
+by the CLI version. Raise the minimum when adopting newer APIs; add an upper bound when a later
+Paseo release is incompatible. Use npm semver ranges and explicitly include beta versions when
+targeting betas. Missing requirements mean `<0.8.0`; complete the 0.8 entry migration before adding
+`>=0.8.0`. Verify compatibility with both the daemon and the app running client contributions.
+See [requirements](https://paseo.sh/docs/plugins/reference#requirements).
+
 Each runtime has its own optional entry. A plugin must have at least one. Both entries accept
 `.ts` or `.tsx`; use `.tsx` when an entry imports components.
 
@@ -88,7 +107,7 @@ Default-export one contribution function from each entry and return cleanup:
 
 ```tsx
 // index.client.tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 
 export default function contribute(client: PluginClientContext) {
   // Register components and client callbacks here.
@@ -98,7 +117,7 @@ export default function contribute(client: PluginClientContext) {
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 
 export default function contribute(server: PluginServerContext) {
   // Register daemon-side RPC handlers here.
@@ -122,7 +141,7 @@ import {
   type PluginClientContext,
   type PluginWorkspacePanelProps,
   useWorkspace,
-} from "@getpaseo/plugin";
+} from "@getpaseo/plugin/client";
 import { useMemo } from "react";
 import { Text, View } from "react-native";
 
@@ -171,18 +190,24 @@ export default function contribute(client: PluginClientContext) {
 Use `useWorkspace(id, selector)` and `useAgent(id, selector)`. Selectors are required
 and their results use shallow equality. Never select the whole snapshot or add an RPC to discover
 the active workspace or agent. Command callbacks receive the selected host's `paseo`, typed
-`rpc(contract, input)`, `openSurface(id)`, and contextual `openPanel(id)` capabilities.
+`rpc(contract, input)`, `openScreen({ screenId, params? })`, and contextual `openPanel(id)`
+capabilities.
 
-## Add a sidebar surface
+## Add a screen and a sidebar item
 
-Plugin surfaces use React Native primitives and work across desktop, browser, iOS, and Android. Register the surface before its sidebar item. Color text from `theme.colors` and pad from `layout.compact`.
+Plugin screens use React Native primitives and work across desktop, browser, iOS, and Android. A sidebar item, in the header or the footer, is a component: render one or more `SidebarRow`s from `@getpaseo/plugin/client/ui`, with `SidebarSeparator` between groups, and call `openScreen` or `openPopover` from them. A screen's `title` is a string or a function of its `params`; its component receives the `params` it was opened with. Color text from `theme.colors` and pad from `layout.compact`.
 
 ```tsx
-import type { PluginClientContext, PluginSurfaceProps } from "@getpaseo/plugin";
+import type {
+  PluginClientContext,
+  PluginScreenProps,
+  PluginSidebarItemProps,
+} from "@getpaseo/plugin/client";
+import { SidebarRow } from "@getpaseo/plugin/client/ui";
 import { useMemo, useState } from "react";
 import { Pressable, Text, View } from "react-native";
 
-function Counter({ theme, layout }: PluginSurfaceProps) {
+function Counter({ theme, layout }: PluginScreenProps) {
   const [count, setCount] = useState(0);
   const styles = useMemo(
     () => ({
@@ -213,27 +238,31 @@ function Counter({ theme, layout }: PluginSurfaceProps) {
   );
 }
 
+function CounterItem({ currentScreen, openScreen }: PluginSidebarItemProps) {
+  return (
+    <SidebarRow
+      icon="ListPlus"
+      active={currentScreen?.screenId === "main"}
+      onPress={() => openScreen({ screenId: "main" })}
+    />
+  );
+}
+
 export default function contribute(client: PluginClientContext) {
-  client.addSurface("main", Counter);
-  client.addSidebarItem({
-    id: "main",
-    title: "Counter",
-    icon: "ListPlus",
-    surface: "main",
-  });
+  client.addScreen({ id: "main", title: "Counter", Component: Counter });
+  client.addSidebarHeaderItem({ id: "main", title: "Counter", Component: CounterItem });
   return () => {};
 }
 ```
 
-Icons are Lucide icon names. `theme` is a typed `PluginTheme` on every surface and panel. Primary text uses `theme.colors.foreground`; labels use `theme.colors.foregroundMuted`; the root view uses `theme.colors.surface0`. `layout.compact` is true on mobile and narrow windows. Paseo owns the route, header, host picker, close action, error boundary, and per-installation query client.
+Icons are Lucide icon names. `theme` is a typed `PluginTheme` on every screen and panel. Primary text uses `theme.colors.foreground`; labels use `theme.colors.foregroundMuted`; the root view uses `theme.colors.surface0`. `layout.compact` is true on mobile and narrow windows. Paseo owns the route, header, host picker, close action, error boundary, and per-installation query client.
 
-Client code may import `react`, `react-native`, `@tanstack/react-query`, `zod`, `@getpaseo/plugin`, and `@getpaseo/plugin/react-native`. Install dependencies locally for typechecking; Paseo supplies these runtime modules. JSX compiles with the automatic runtime, so no `React` import is needed for JSX. Importing a `node:` module from client code is a compile error.
-
-| Module                          | Use it for                                                                                               |
-| ------------------------------- | -------------------------------------------------------------------------------------------------------- |
-| `@getpaseo/plugin`              | contribution contracts, shared definitions, RPC input/output types, `usePaseo`, `useRpc`, and data hooks |
-| `@getpaseo/plugin/react-native` | Paseo UI: `Icon`, `Modal`, `useToast`, `useRevealedText`                                                 |
-| `@getpaseo/plugin/server`       | handler-only types such as `PluginHandlerContext`                                                        |
+Before writing imports, classify each module as shared, client, or server. Follow the
+[SDK import boundaries](https://paseo.sh/docs/plugins/reference.md#runtime-modules), including
+transitive and type dependencies. The root is shared-only; hooks and client contexts belong to
+`@getpaseo/plugin/client`, server contexts to `/server`, and host UI to `/client/react-native` or `/client/ui`.
+Install dependencies locally for typechecking; Paseo supplies host runtime modules. JSX uses the
+automatic runtime. Do not import `/client/host` from plugin code.
 
 ## Works on mobile
 
@@ -261,10 +290,10 @@ Use the existing Paseo SDK for normal Paseo operations. Use plugin RPC only for
 
 ### Call Paseo from a surface
 
-`usePaseo()` borrows the selected host's current connection. Never create another client inside a surface.
+`usePaseo()` borrows the selected host's current connection. Never create another client inside a surface. It is the plugin's one client in every surface: release your subscriptions in your cleanup; plugin teardown ends the rest.
 
 ```tsx
-import { usePaseo } from "@getpaseo/plugin";
+import { usePaseo } from "@getpaseo/plugin/client";
 
 function PullRequestAction() {
   const paseo = usePaseo();
@@ -321,7 +350,7 @@ export async function createGreeting({ name }: RpcInput<typeof greeting>) {
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { createGreeting } from "./server/greeting";
 import { greeting } from "./shared/greeting";
 
@@ -333,7 +362,7 @@ export default function contribute(server: PluginServerContext) {
 
 ```tsx
 // client/greeting.tsx
-import { useRpc } from "@getpaseo/plugin";
+import { useRpc } from "@getpaseo/plugin/client";
 import { greeting } from "../shared/greeting";
 
 function Greeting() {
@@ -405,7 +434,7 @@ const issues = defineAttachmentSource({
 
 ```ts
 // index.server.ts
-import type { PluginServerContext } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { searchIssues } from "./shared/issues";
 
 export default function contribute(server: PluginServerContext) {
@@ -416,7 +445,7 @@ export default function contribute(server: PluginServerContext) {
 
 ```tsx
 // index.client.tsx
-import type { PluginClientContext } from "@getpaseo/plugin";
+import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { issues } from "./shared/issues";
 
 export default function contribute(client: PluginClientContext) {
@@ -451,34 +480,70 @@ The callback receives the same context as the matching Command Center item plus
 A pill is a per-agent button in the composer track bar next to Tasks and Subagents. Add and remove pills from the client entry lifecycle. `addComposerPill` exists on `PluginClientContext`.
 
 ```tsx
+import type { PluginButtonRegistration, PluginClientContext } from "@getpaseo/plugin/client";
+
 export function contributeClient(client: PluginClientContext) {
-  const pills = new Map<string, () => void>();
-  const unsubscribe = client.paseo.agents.subscribe((update) => {
-    if (update.kind !== "upsert" || !update.agent.workspaceId) return;
-    const { id: agentId, workspaceId } = update.agent;
-    pills.get(agentId)?.();
+  const pills = new Map<string, PluginButtonRegistration>();
+  const lifetime = new AbortController();
+  const register = (agent: { id: string; workspaceId?: string | null }) => {
+    if (lifetime.signal.aborted || !agent.workspaceId) return;
+    const agentId = agent.id;
+    const workspaceId = agent.workspaceId;
+    pills.get(agentId)?.remove();
     pills.set(
       agentId,
       client.addComposerPill({
         id: "review",
-        title: "Open review",
         workspaceId,
         agentId,
-        Component: ReviewPill,
-        async onPress() {
-          client.openPanel("review", { workspaceId, agentId });
+        button: {
+          title: "Open review",
+          icon: "Scan",
+          label: "Review",
+          behavior: {
+            kind: "action",
+            onPress() {
+              client.openPanel("review", { workspaceId, agentId });
+            },
+          },
         },
       }),
     );
-  });
+  };
+  const removeAll = () => {
+    for (const pill of pills.values()) pill.remove();
+    pills.clear();
+  };
+  // An owned list subscription delivers existing agents, then updates, and a fresh snapshot after a reconnect.
+  void client.paseo.agents
+    .list({ subscribe: {}, signal: lifetime.signal })
+    .then(({ subscription }) => {
+      subscription.subscribe({
+        snapshot: ({ entries }) => {
+          removeAll();
+          for (const { agent } of entries) register(agent);
+        },
+        update: (message) => {
+          if (message.type !== "agent_update") return;
+          const update = message.payload;
+          if (update.kind === "upsert") return register(update.agent);
+          pills.get(update.agentId)?.remove();
+          pills.delete(update.agentId);
+        },
+      });
+      return undefined;
+    })
+    .catch((error) => {
+      if (!lifetime.signal.aborted) console.error("Agent observation failed", error);
+    });
   return () => {
-    unsubscribe();
-    for (const remove of pills.values()) remove();
+    lifetime.abort();
+    removeAll();
   };
 }
 ```
 
-Call `contributeClient(client)` from `index.client.tsx`, or move its body into that entry. The component owns its icon and text; Paseo owns the pressable, chrome, pending state, error reporting, and placement. Removal functions are idempotent, and Paseo removes every pill when the plugin, client entrypoint, or host connection is torn down.
+Call `contributeClient(client)` from `index.client.tsx`, or move its body into that entry. The `button` descriptor sets the icon, label, and behavior; Paseo owns the pressable, chrome, pending state, error reporting, and placement. `addComposerPill` returns a registration with `update()` and `remove()`. `remove()` is idempotent, and Paseo removes every pill when the plugin, client entrypoint, or host connection is torn down.
 
 ## Transform and render timeline items
 
@@ -502,7 +567,7 @@ client.addTimelineRenderer({
 });
 ```
 
-Transformers run while the render model is built, on fetched history and on every live update, so `phase` is `"streaming"` for a loading thought or running tool call. Identity comes from the source item, so a streaming item keeps its mounted component; set an output `id` when one source explodes into several items. Transformers must be synchronous and deterministic, `data` must be JSON, and a transformer that throws is logged and skipped. Use `useRevealedText(text, phase)` from `@getpaseo/plugin/react-native` to pace streaming text. `plugin-examples/inline-thinking` replaces the thinking row with inline text; `plugin-examples/timeline-items` replaces a Pi todo tool call with a task card.
+Transformers run while the render model is built, on fetched history and on every live update, so `phase` is `"streaming"` for a loading thought or running tool call. Identity comes from the source item, so a streaming item keeps its mounted component; set an output `id` when one source explodes into several items. Transformers must be synchronous and deterministic, `data` must be JSON, and a transformer that throws is logged and skipped. Use `useRevealedText(text, phase)` from `@getpaseo/plugin/client/react-native` to pace streaming text. `plugin-examples/inline-thinking` replaces the thinking row with inline text; `plugin-examples/timeline-items` replaces a Pi todo tool call with a task card.
 
 ## Append a timeline row from the daemon
 
@@ -572,19 +637,61 @@ If the user asks to disable the global switch, set `pluginsEnabled` to `false`,
 
 Do not edit a local config when the target is a remote daemon. Perform the edit on the daemon machine, or ask the user to use **Settings → Plugins → Enable plugins**. `paseo reload --host <url>` reloads the remote daemon's own file but does not edit it.
 
-When the same sidebar contribution exists on several connected hosts, Paseo shows it once with a host picker. The selected host owns the bundle, SDK calls, RPCs, and query cache. An offline selected host does not fall through to another host. Attachment sources stay scoped to the composer's host.
+When the same screen or sidebar item exists on several connected hosts, Paseo shows it once. The screen header has a host picker; a sidebar item uses the host of the screen on display, else the host last picked in one of the plugin's screens. The selected host owns the bundle, SDK calls, RPCs, and query cache. An offline selected host does not fall through to another host. Attachment sources stay scoped to the composer's host.
+
+## Publishing a listing
+
+Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
+It helps someone decide whether to install your plugin; the install command is already at
+the top of that page. A README assumes a GitHub audience and carries installation
+instructions, technical details, and badges. Long, AI-generated READMEs make people read
+past that material to understand what a plugin does.
+
+`OVERVIEW.md` is required to list your plugin in the registry. Commit it beside
+`paseo-plugin.json` in the source repository at the pinned commit. The registry resolves it
+relative to the manifest, under `pluginPath` for monorepos. Include it in the published npm
+package too; the scaffold's `files` list includes it. Replace the scaffold's guidance comment
+with useful facts before publishing.
+
+The repository overview takes precedence over a registry import stopgap. Online validation
+fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
+that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
+requires a repository overview and removes the stopgap in the same PR. A bump without the
+repository overview fails validation. README files do not supply the overview.
+
+Author overviews and registry stopgaps follow the same content contract, in this order.
+Choose headings only when they help; length follows complexity. A theme needs one paragraph.
+
+1. Explain what the plugin is and does in plain terms first.
+2. Explain how it works only when that is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, external tools, or other
+   plugins. Include applicable daemon version and operating system requirements. Setup
+   guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does, what the
+   plugin reads or sends and where, permissions, and known limits.
+
+Use sentence case and plain factual language, with no em dashes. Omit installation commands,
+badges, changelog, contributing or license sections, marketing, and unsupported claims.
+Avoid implementation filler such as empty cleanup functions, catalogs of theme-token fields,
+or lists of absent features. Keep only what helps someone choose the plugin.
+
+If your plugin is an unchanged imported record, you can propose an author-written overview
+to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.md`.
+
+See [Your listing page](https://paseo.sh/docs/plugins/publishing.md#your-listing-page).
 
 ## Typecheck and manage
 
-Always typecheck before install or reload:
+When editing a plugin, typecheck its source before install or reload:
 
 ```bash
 npm run typecheck
 paseo plugin install /absolute/path/to/plugin
 paseo plugin install /absolute/path/to/plugin --id another-runtime-id
-paseo plugin add owner/repository              # Git source; append :path for a monorepo subdirectory
-paseo plugin add owner/repository --ref main   # branches track, tags and commits pin
-paseo plugin status
+paseo plugin install npm:@acme/paseo-review
+paseo plugin install npm:@acme/paseo-review@1.2.0
+paseo plugin install github:owner/repository
+paseo plugin install github:owner/repository --ref main
 paseo plugin update my-plugin
 paseo plugin ls
 paseo plugin reload my-plugin
@@ -594,11 +701,16 @@ paseo plugin enable my-plugin
 paseo plugin remove my-plugin
 ```
 
-Use `--host <url>` when managing a daemon other than the CLI default. A Git source that must install or generate something declares `build` in `paseo-plugin.json` as a list of argv arrays; Paseo runs them without a shell on install and update and keeps the old version if one fails. Plugin source edits require `paseo plugin reload`; config changes to the global switch require `paseo reload`. A failed plugin reload stays failed; inspect `paseo plugin ls` for the load error and `paseo plugin logs <id>` for subprocess output, fix the source, typecheck, and reload again. `remove` deletes configuration, never the source directory.
+For npm, ensure npm is on the daemon's `PATH`; use that host's registry configuration and credentials. Install selectors choose
+content once; they do not pin updates. `install` and `add` are aliases. Follow the
+[publishing guide](https://paseo.sh/docs/plugins/publishing.md) for Paseo's package contents and
+preparation requirements; standard npm publishing commands apply.
+
+Use `--host <url>` when managing a daemon other than the CLI default. A Git source that must install or generate something declares `build` in `paseo-plugin.json` as a list of argv arrays; Paseo runs them without a shell on install and update and keeps the old version if one fails. Plugin source edits require `paseo plugin reload`; config changes to the global switch require `paseo reload`. A failed plugin reload stays failed; inspect `paseo plugin ls` for the load error and `paseo plugin logs <id>` for subprocess output, fix the source, typecheck, and reload again. `remove` keeps local source directories and deletes managed Git/npm installations.
 
 Do not restart the daemon to load source changes. Restarting it can kill the agent performing the work.
 
-For an old mixed entry, follow the standalone [v0.8 runtime-entry migration guide](https://paseo.sh/docs/plugins/v0.8/migration) mechanically.
+For an old mixed entry, follow the standalone [runtime-entry migration guide](https://paseo.sh/docs/plugins/migration) mechanically.
 
 ## Verify the outcome
 
@@ -612,7 +724,7 @@ After a change:
 
 Common failures:
 
-- Missing sidebar item: wrong host, plugin not `running`, invalid Lucide icon, or sidebar item points to a missing surface.
+- Missing sidebar item: wrong host, plugin not `running`, the item is hidden in Settings > Sidebar, or its component throws (an invalid Lucide icon name throws).
 - Unavailable client module: client bundles can use only the host-provided modules listed above.
 - RPC rejection: input or output failed its Zod schema, or the handler threw. Inspect `paseo plugin logs <id>` for handler output.
 - Plugin exits or reload fails: inspect `paseo plugin ls` for status and `paseo plugin logs <id>` for initialization, cleanup, or crash output.
diff --git a/skills/paseo/SKILL.md b/skills/paseo/SKILL.md
index 280db160fe..11b5f2ff97 100644
--- a/skills/paseo/SKILL.md
+++ b/skills/paseo/SKILL.md
@@ -23,7 +23,11 @@ For a local daemon, `project create` defaults to the current directory and resol
 
 **`create_workspace`** — create a workspace independently of any agent. Required: `isolation` (`local` or `worktree`). Worktree isolation supports `mode: "branch-off" | "checkout-branch" | "checkout-pr"`: use `branchName`/`baseBranch` for a new branch, `branch` for an existing branch, or `prNumber` plus optional `forge`/`projectPath` for a change request. `worktreeSlug` controls the managed path. Returns the workspace descriptor centered on `workspaceId`.
 
-**`list_workspaces`** — list active workspaces.
+`background: true` hides a workspace from default lists and the sidebar while its contents remain durable and accessible; omit `background` to inherit your current workspace’s value (false without a caller), and override it only when the user explicitly asks.
+
+Choose `baseBranch` explicitly: `origin/main` selects the remote-tracking branch; `refs/heads/main` selects local main. Bare `main` prefers local main when it exists, otherwise origin/main. Paseo retains the resolved ref for workspace comparisons, even after rebasing the branch or changing its PR target.
+
+**`list_workspaces`** — list active workspaces, excluding background workspaces unless `includeBackground: true`.
 
 **`archive_workspace`** — `{ workspaceId }`. Archives the workspace, its agents, and its terminals. Local directories remain; Paseo removes an owned worktree only after its final active workspace reference is archived.
 
@@ -59,11 +63,11 @@ Detach is an explicit user action in the subagents track, not an agent tool. A c
 
 Agent-scoped `create_agent` defaults `notifyOnFinish` to true. Set it to `false` only for truly fire-and-forget agents.
 
-**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Agent-scoped prompt calls default to `background: true` and `notifyOnFinish: true`; top-level calls default to blocking with no callback. For a synchronous follow-up, pass `background: false` and use the returned result.
+**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.
 
 **`update_agent`** — `{ agentId, name?, labels?, settings? }`. Use `settings` for runtime changes on an existing agent: `modeId`, `model`, `thinkingOptionId`, and provider-specific `features`. For Codex fast mode, pass `settings: { features: { "fast_mode": true } }`.
 
-**`list_agents`** — filter by `cwd`, `statuses`, `sinceHours`, `includeArchived`.
+**`list_agents`** — filter by `cwd`, `statuses`, `sinceHours`, `includeArchived`; set `includeBackground: true` to include agents in background workspaces.
 
 **`archive_agent`** — `{ agentId }`. Interrupts if running, removes from active list.
 
@@ -104,20 +108,22 @@ Schedules have the full list/inspect/update/pause/resume/run-once/log/delete sur
 
 Agents take time — 10–30+ minutes is routine. Favor asynchronous workflows.
 
-For agent-scoped `create_agent` and background `send_agent_prompt`, leave `notifyOnFinish` omitted or set it to `true` unless the work is truly fire-and-forget. You will get notified when the target agent finishes, errors, or needs permission. Move on to other work. The notification arrives on its own.
+`create_agent` and `send_agent_prompt` return after startup or dispatch acknowledgement in both MCP scopes. Top-level callers have no parent callback; observe completion through status/activity tools or SDK/RPC subscriptions and wait APIs.
 
-Don't poll `list_agents` or `get_agent_status` to "check on" a running agent. The notification will tell you.
+For agent-scoped `create_agent` and `send_agent_prompt`, leave `notifyOnFinish` omitted or set it to `true` unless the work is truly fire-and-forget. You will get notified when the target agent finishes, errors, or needs permission. Move on to other work. The notification arrives on its own.
+
+With finish notifications enabled, don't poll `list_agents` or `get_agent_status` to "check on" a running agent. The notification will tell you.
 
 ## CLI semantics
 
 The CLI and tools use the same ownership semantics even where their syntax differs:
 
 ```bash
-paseo workspace create --isolation worktree --mode branch-off --new-branch fix-x --base main
+paseo workspace create --isolation worktree --mode branch-off --new-branch fix-x --base origin/main
 paseo workspace create --isolation worktree --mode checkout-branch --branch existing-work
 paseo workspace create --isolation worktree --mode checkout-pr --pr-number 42
 paseo run --provider codex/gpt-5.4 --mode full-access --workspace <workspace-id> "<prompt>"
-paseo run --provider codex/gpt-5.4 --mode full-access --new-workspace worktree --worktree-mode branch-off --new-branch fix-x --base main "<prompt>"
+paseo run --provider codex/gpt-5.4 --mode full-access --new-workspace worktree --worktree-mode branch-off --new-branch fix-x --base origin/main "<prompt>"
 paseo send <agent-id> "<follow-up>"
 paseo ls
 paseo schedule create --cron "*/15 * * * *" "ping main build"
diff --git a/vitest.config.ts b/vitest.config.ts
index 77e75f6d6c..47bd965113 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { configDefaults, defineConfig } from "vitest/config";
 
+// React's test APIs require its development build, even in a production shell.
+process.env.NODE_ENV = "test";
+
 const appDir = path.resolve(__dirname, "packages/app");
 const appNodeModules = path.resolve(appDir, "node_modules");
 const rootNodeModules = path.resolve(__dirname, "node_modules");